gentoo resync : 20.03.2021

11702 files changed, 76424 insertions, 117939 deletions

diff --git a/Manifest b/Manifest
index 612a916dcbb8..471830efe3f4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29260 BLAKE2B 6e3fc361539b56399909a5d6f80c25aa874327d42e32e1569e8a208f8c7ea9582b5a2c8fb9a0a401e1a7e093815c18cbcfcf00e80aeb4eb9a4ffc89c04661605 SHA512 f070b638763fc45320aa0d2033eec5828f75118e83b18c720e4c161e3f5c5fafa3a996e844c275cfaaf7056a81fa190c61795f0cab3e476f437d3d924edadc78
-TIMESTAMP 2021-03-12T21:08:39Z
+MANIFEST Manifest.files.gz 29297 BLAKE2B 43170b0d2fae3f698f5674b4f7e06f311f2d76637b561a89efa3da1a799afbd487538da4f3fd28924b4ea52a9bf7fd092f8c211f61c23d67d88c0069448f545b SHA512 d2ee8ec0b8909c39a79fc9f2618c16823b97a443582eb4e63d94d555a40b0c216bbb5aa52bd29f1fbefae6cd90877360822ec528cc6ea4e3ac8dbd54f023a5cd
+TIMESTAMP 2021-03-20T13:38:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBL2FdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBV+tVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDDFA//ajYcIjjGL/iOBTp1JZIHUd5iaPKaIFo6xA/IVZl5BoUjC4eNBPv5GJiQ
-Fbbe0vp/Op4jHvCuWzxj6aoeytkXJnzLZ3M5EVdNx/PKfAK19TyJkLjK+pVnzHn4
-yqoUUVlKb7AcMtCwSldUBVI64iBzgj6HybKlM8WqCdkxiGSh7phPbdWiXS1gxINw
-NT7rbL4JVKQcHq8OS/LLNVn9QPgF83UW4iU1Z1MVhlrCRTBrbgpo0QuYIEc/t+aO
-y9jeMEQqK/g+knDPJbz+4ln+T97VX6I1kgf8uopUn3oLAh2W5TwbzQ/P7jI91wrh
-tu4gubJlIjXawYVlhUyDyOdsJaZyHGSHkqdxZU5C0cWF66CX0V8RPMJrAD/3iWIZ
-lp06WbRWykqEHSb/dnzLPyskzEmvFK4b62mOPaKvgNaog/HqA143uO5YZrLy1OC5
-jqTFrmRtoHQlr/QQMVsOZN60w4Sfr7cMRiOixheByvPHl39SSboOe0QRs04HrlSN
-bFTgfD1wDbW+bSjJzTdk6OEZNRULbJdgOFLQy+mhPCY+dDRXysvdkyTbFV38HunR
-p9WxQ1XCQ3edKWN/0rhAPBHy7i+te0IoUZGkeoEUglwUbKCu/Xal/EVDEqn6pefa
-FCrLwKp7q9xCXrUqg9OJjbop35qAT/Z0/VLlAmVxIfi58q9u7bw=
-=E9Jo
+klCVAA//e802CbDG0uBUlfdesFf+uO9vrvwKBgLhtXXUSTFZ+eDBtIIU490gGYeE
+o/L9HIT3kh6iW+Hk0Aj6r87oAaV6TBqdfsg5mqVL2/iAxFM9ACocUdw/y1KcQS3U
+NtLOBplbvRMVxR2feag3Io6WOxJ6a3vviuN04HzhtkRqOAELHs/LW+Ywl01wTAUp
+Vv7miztoUWrBNre3HQ2HpV/Ha/99CbmFDGaZW3x+29ikpWuSTjgtUoH8AwvdEcno
+CqaGolwF3u/WMbtXIIz1UEzVTwRu7MN/pg9NYx4xixQw5kcRpZ7sxaemiHJSFW4b
+eLFPfwiAPIuuSxt+mOk9iuHu4dIOQsUbT9SFRNkMhFNVo6dvrs2j+HtDHNhIUk7l
+jJ/lHqCtGupBqP9AHUEG8SqJozV3LUjwUOs3ShZpY7fB9BFE73Rk1k+bxmQ4ZMdi
+WQ42Z/ssqzjr17PMU2aks+iL9HBiF2m8S7rR4iR9XCMNJZ3pPs1ADrZeNIO42Sfc
+Z1iG9X9gnvN8RgFfSWMShT/fLdRyoanFIznZRA8aMjIXxZl689Qm6fhj257qNC0d
+n9qzsYqDYun1RNMd3oHIGdk19tr31AU8iTP0/5CvznKqqNayYbzKfXH7QDY30Rt7
+xICiiSRhWLnowV+AJgHyiaxR5PlYdQ+RgPXh/5Mq8TIKp7qTV1U=
+=6Bhk
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d3b9d7549e03..dfe86d7a6e43 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 344b6c041c43..c0a8c9eb324a 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/abrt/Manifest b/acct-group/abrt/Manifest
index c47e5477e6a8..1fc25623528e 100644
--- a/acct-group/abrt/Manifest
+++ b/acct-group/abrt/Manifest
@@ -1,2 +1,2 @@
 EBUILD abrt-0-r1.ebuild 219 BLAKE2B b1ad6c295c0d4973a5f7dcebb33948d34d6de24dcbe7e200ff185bd4892e5761c306bb14518f9679a480511560701e3bdec16166e2466c40eaee38f11ab1b8d4 SHA512 2f5765f53e79df2a91218182261bd2956527c3b956f5f2005982c57748e89c6cfc8c25cddbdff9aa6546672e795399aac652e63eaaa76019a6113855a4eea404
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/abrt/metadata.xml b/acct-group/abrt/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/abrt/metadata.xml
+++ b/acct-group/abrt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/amanda/Manifest b/acct-group/amanda/Manifest
index 22815b77ca0f..072541c938a0 100644
--- a/acct-group/amanda/Manifest
+++ b/acct-group/amanda/Manifest
@@ -1,2 +1,2 @@
 EBUILD amanda-0.ebuild 151 BLAKE2B 7d0bda5bde34d227c754592d99bb94b066de66735d8635ee0e95e4c1928a158937eda6867c3a2d1d17550d92a7b6354143a9d0d52044abe22ba39c8e0fed9a79 SHA512 dd7d28a1c50e181632de11a36197a4d022b742c5edd54ecf7bbece0d4d1a3df536521bb4c9e75012b3a4d95673d81babac3e242aa2383fd263152fd299434db7
-MISC metadata.xml 648 BLAKE2B 438964525d71b19b0d8538d339e9b8e68c99a3ad6032a4ead75d6f6e90fdbbbc1c8f59c921e25ac550c519ec824043e54965a5abc6ecfd9dbfbcfacc8590b1f5 SHA512 9c2f3d4f7217de64250a148dafae4c8e2ad565b2a88ccebfe05a05f3bc349789ed3f06dfa08434018b53e086c4a2a02bb89224b476dd471371b5aa4c4aa38008
+MISC metadata.xml 692 BLAKE2B 5f06529d760770a3d834e6250c8e7131fcfa10920fdc967bbc142e2b214f8d2f5d42cff2a607b1144df082ccd8b1989db6a0b6a874af66b6c24337575aad6c04 SHA512 d86dd8bce59ee9f835095e1884c2c0d251bf872e41846bfbf6bc232ceb8d5c22fed9e0b55daa740196866a803f3d1e800ceaa324f5b97702d8812f69b2b1dd2a
diff --git a/acct-group/amanda/metadata.xml b/acct-group/amanda/metadata.xml
index ccd1d2f092c3..d5107f7573f0 100644
--- a/acct-group/amanda/metadata.xml
+++ b/acct-group/amanda/metadata.xml
@@ -5,15 +5,15 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lists@xunil.at</email>
 		<name>Stefan G. Weichinger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dustin@v.igoro.us</email>
 		<description>Upstream. Please CC on bugs.</description>
 		<name>Dustin J. Mitchell</name>
diff --git a/acct-group/amavis/Manifest b/acct-group/amavis/Manifest
index 59b7340cfd8e..81018d4670df 100644
--- a/acct-group/amavis/Manifest
+++ b/acct-group/amavis/Manifest
@@ -1,2 +1,2 @@
 EBUILD amavis-0-r1.ebuild 194 BLAKE2B d214076083bf76e9ecdd57ae1b5b7e7b481132082c0f405434605efc4c02ec4f9337c66d269693349d5ef4c8af4764d2485337bd4ac54404aa46155bc5612048 SHA512 d39918b9c9436dadb4f4641a634a466603281ca136ca3bd07c2eabcb71eb7e732c575443d0c20f919740de04546eeb1a59b8f56f9fbd693223716e95e7920b2c
-MISC metadata.xml 487 BLAKE2B 1a8533eb43138b0ca04b146e783fe21ce948bb53656cd388783de73359d9da228a902ef439858f51c0a6cd04c255dbb3006525b093c733cef943162c544d347f SHA512 98988fdcca2483cad4773f33c126b0f0a3ea4460656f67e3f82e8076791e9bd589c67bdb430fbda20b5c5eebbb0688d63d4f51382fc52cedbb40073b83f1bc38
+MISC metadata.xml 517 BLAKE2B 24e6606d13d26bb7af91b3bd98193d6d5ee02309cdd018091e8d9e8f238e18d119880fd0a0bc598443203caa0ffac9c47fd2fc5ad69246f6ef83be59c4f83c7b SHA512 9a00adc383504fcd291cee5eb481a25c4088f53157d79a3e4b936070d9eb49e00e67f83f0e183aafe79208f4a99e51f908891e593c3570d5f093a49099cfc7d6
diff --git a/acct-group/amavis/metadata.xml b/acct-group/amavis/metadata.xml
index b90b4f50789d..3126b599b19b 100644
--- a/acct-group/amavis/metadata.xml
+++ b/acct-group/amavis/metadata.xml
@@ -5,11 +5,11 @@
 		<email>antivirus@gentoo.org</email>
 		<name>Gentoo Antivirus Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/amule/Manifest b/acct-group/amule/Manifest
index adae8c6fa508..f7bff56debdb 100644
--- a/acct-group/amule/Manifest
+++ b/acct-group/amule/Manifest
@@ -1,2 +1,2 @@
 EBUILD amule-0-r1.ebuild 184 BLAKE2B df7b0029d23909369fe0580b22d10c2014bc0552ce9f7df6066f42884bb17bec353330399b53bc28bfe6676497d22238d11199c338cd815ae3c19394f9710ac5 SHA512 aef615dcca21ad7f666863197833024dbbffff41a183376b6b2fd636453aaf864ed37a07e06e1cd5e1bc2e539b9bebbe2afdd3fd43ec27ef48c95f95e48e420f
-MISC metadata.xml 364 BLAKE2B 82a4ff6369bd09fc564b3859321f4fb128220d757f0c264e117f9bcdea3bfaef07fd310b8f002bc0be124ef3213da4a65a10c9da4dfdcf1357e01f106bb7c531 SHA512 b48f5be0596960b981da7b959be826657d758add02761189955ce35d25abf5cb768f10995a6d3ab88fff7d1ea8a4a9666a0b2030d624aae4cd06a2ec2484ac8c
+MISC metadata.xml 394 BLAKE2B 3994d7b4d98a6cdaadc6938c16715b866ba0e729189066aa0e974d50c573e1124ce7f5b87d070495145b4b130990b7ff220d9bec9d990a7480676cd2da127289 SHA512 8c4f5d487c8d3dbac76d13c0b41589753477113e44b64b0f49c84f7e1b64c3276f736e94c6e6745047e4ddafbd047badc805a5bcbfac2abe0bd0354b0fc8517f
diff --git a/acct-group/amule/metadata.xml b/acct-group/amule/metadata.xml
index 039cf44c7038..8ecc21d1608c 100644
--- a/acct-group/amule/metadata.xml
+++ b/acct-group/amule/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/anope/Manifest b/acct-group/anope/Manifest
index 5268c31d17ba..0f621c202f95 100644
--- a/acct-group/anope/Manifest
+++ b/acct-group/anope/Manifest
@@ -1,2 +1,2 @@
 EBUILD anope-0-r1.ebuild 189 BLAKE2B bbcb6710a6731e901ce8727b45a569cd70689459a8ce99521f92b35be10d7f314d312595da3faabae94f262e25340120b6b04d97cd5366b9afebbe011a25a0e3 SHA512 1a1a229859c7dc323df42c5e94bacb7c514d22d5bd8557799928d9ac1f62720bdb2f7d776c421197ad51a6b4c9033e996c778b27bea5efbaccf489813bd77ca5
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/anope/metadata.xml b/acct-group/anope/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-group/anope/metadata.xml
+++ b/acct-group/anope/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/asterisk/Manifest b/acct-group/asterisk/Manifest
index e1f662de26e3..1a2f5ae51b2d 100644
--- a/acct-group/asterisk/Manifest
+++ b/acct-group/asterisk/Manifest
@@ -1,2 +1,2 @@
 EBUILD asterisk-0-r1.ebuild 184 BLAKE2B d4748e59cf5bfd1ca1b4411f53308dc13e98a3e332df342e258c4d628e0e3436df7aceb30c85101ae8e9052925e25c6c1f9e8a2062223a975059f2556244d0ac SHA512 042fad7aaa06ff750fda27df9e5d1dfe36a82a35514539e5d6e3918f861854b7194a48e36a512162d3cb228b9ee2437532736ff9820aa394d1c798a04f68fd82
-MISC metadata.xml 357 BLAKE2B de51ce7c286f218d8de4a504c30dea5b9c10bb333149d2d7d15f499124cf5cf9c2e704e3d35b476b01e3d8863b7f055b78d64d791f84ac9b94088ff92fc1ddca SHA512 a690e823e23bd2c6c1f75a33a1c6923beb97bbcdfbfe522b09a3bfe20040e49535bafc41fb00a508a3851a817e5fdda49de73f21109f0dd96599fac12bd77a53
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/acct-group/asterisk/metadata.xml b/acct-group/asterisk/metadata.xml
index 07561453adc6..d06f5db0340a 100644
--- a/acct-group/asterisk/metadata.xml
+++ b/acct-group/asterisk/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/atheme-services/Manifest b/acct-group/atheme-services/Manifest
index a71040573274..aa14d92cddca 100644
--- a/acct-group/atheme-services/Manifest
+++ b/acct-group/atheme-services/Manifest
@@ -1,2 +1,2 @@
 EBUILD atheme-services-0-r1.ebuild 190 BLAKE2B a34f872d9744c87a46a0ea9031d410cea9ab86b3f1923524895cbe89db38c52ade90edd6e758afe14636b16337e014dd0599a6b56e6f3b507993ef26a5d38492 SHA512 e22c67f3001aa23ea12d1bc37a4bf7d759819e720331c40806819073032baa1ea333dc1c403d624f6e33039bca1e4fb682805e068768559df9450e5d581dc9c5
-MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
+MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/acct-group/atheme-services/metadata.xml b/acct-group/atheme-services/metadata.xml
index 2b340d2c9798..cccd8e9eeb02 100644
--- a/acct-group/atheme-services/metadata.xml
+++ b/acct-group/atheme-services/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/automatic/Manifest b/acct-group/automatic/Manifest
index 431469812c24..b487fafc1c79 100644
--- a/acct-group/automatic/Manifest
+++ b/acct-group/automatic/Manifest
@@ -1,2 +1,2 @@
 EBUILD automatic-0.ebuild 151 BLAKE2B 037170834971d20853404a900d94b9609ec431c5e8479b7de9869f5c33531c063ce4640e311b088fe24fb81bea87510c895f6782a89f1a692cba3e8b50723e15 SHA512 bf6b2b457bbc9c6912518c9f103db53aa4febeadc9619e41e3c4cd4b5c12715fdf5d1e5a30ff2971064d05da3b9e28f390171a5d6e6f740ff3448da975de4e5b
-MISC metadata.xml 376 BLAKE2B 5455c81e8cef3eac3dcd4bf8687fe61fb3f2aab49e5685fe3d2fe2b9cbab41158b7cd6d777dcdfcec1e4bf23a8903bc7e800053b92a992150f42a9822fd46d8d SHA512 71861b1caab3679f55fd8033679e4d3fd186649e12ccf3f586123d2171e5cca09bae25978aac38c73c35dafc26dc70397b30709ecc70c39407aeb3f67b1c65ad
+MISC metadata.xml 406 BLAKE2B 5707ac898bdea1cce0702706e11ade10f8968f720f82ccb17403db98c980eef10138890410ec62521c2dc50192edf30a8b467b2f201dbc5a5962cf5b55c81a74 SHA512 b6cd664305ed4dd0ffde21087423f5864c23ae62f8f265b056dbae50ecbcf6f27a1ab185a7d20b89e0afc5611e6e0c3ea987b7dc8a2a57ae98c3956bb4916877
diff --git a/acct-group/automatic/metadata.xml b/acct-group/automatic/metadata.xml
index e2e6278b62a4..0002e1a56764 100644
--- a/acct-group/automatic/metadata.xml
+++ b/acct-group/automatic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/automx2/Manifest b/acct-group/automx2/Manifest
index c2a83019632a..704cbb70dd1e 100644
--- a/acct-group/automx2/Manifest
+++ b/acct-group/automx2/Manifest
@@ -1,2 +1,2 @@
 EBUILD automx2-0-r1.ebuild 192 BLAKE2B 3b16574fc294388ea769db4946b567f1bb3a2e6a8d438db6afbb0c73dec33cb13a08554ca048b3a84305f7b0ed717e6a62cee6b1880dd57196ccc5a3144a0a02 SHA512 6c42f69d2c199318a7966fcbb06c0e0a30e0f9024ec827ccb7e789b19b491d5f376abe333e53a2a268ad87bfed58098305c83339c8f8173c0ec44591578f2ea5
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-group/automx2/metadata.xml b/acct-group/automx2/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-group/automx2/metadata.xml
+++ b/acct-group/automx2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/bitcoin/Manifest b/acct-group/bitcoin/Manifest
index 35a7e2d73c81..884a69709d5c 100644
--- a/acct-group/bitcoin/Manifest
+++ b/acct-group/bitcoin/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitcoin-0-r1.ebuild 227 BLAKE2B 65bb51a72728f881ecd1ef20e551ba599f9d2930c4c749be40b17683473aa550cf673639acadc8c11be439cdeae1d7798f9323a00edd252d75b83b62d24a9900 SHA512 5339f0303ff41df1d62a1ffc60ea2b62f318ff156a98300589cc19f931665559d7912afd00e36220b4ceae58cfe7a79b8027680cbcf2c259d1e651a036542677
-MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
+MISC metadata.xml 404 BLAKE2B 562724169bdcba36f216d118b7b362c5f487880cbcaccf6fdabd3a0dbb6d0d21fdd13bd1eb5080139117328277565ffe9021507b0871ec07b048c531b9c55717 SHA512 8a78e509ece3294c6343fccd856537803407685d2aece1ccfeab336f8b0ea482ff38696d21f8d37bba3b0cf5bd2e6718736d6b5c3180c202f0a387e04fc507f1
diff --git a/acct-group/bitcoin/metadata.xml b/acct-group/bitcoin/metadata.xml
index 65db17a2078a..95e5c0e2b8fd 100644
--- a/acct-group/bitcoin/metadata.xml
+++ b/acct-group/bitcoin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/bitlbee/Manifest b/acct-group/bitlbee/Manifest
index dadcaf68bdd9..f13af04e64d5 100644
--- a/acct-group/bitlbee/Manifest
+++ b/acct-group/bitlbee/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitlbee-0-r1.ebuild 146 BLAKE2B 45428e84c6e372bffbb76a9d1af886cbc176e6e42b4f8685e217d765f859ad1b753bb06e85c7009fa25ee4a1858ea5c91b8419519e28cc448dd5a59be79834cd SHA512 96ba1e542a55002b0e337c947111c0562f3976d5040fb6214e58f1ea9d678672336c10b12c1af892c59079d65b0f62e9c7892fd2ecfe72fbe165000519d3c9cc
-MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
+MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
diff --git a/acct-group/bitlbee/metadata.xml b/acct-group/bitlbee/metadata.xml
index 7c3db330c141..dbebda04b192 100644
--- a/acct-group/bitlbee/metadata.xml
+++ b/acct-group/bitlbee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/boinc/Manifest b/acct-group/boinc/Manifest
index bf011334ced7..e3f7f0b07bd9 100644
--- a/acct-group/boinc/Manifest
+++ b/acct-group/boinc/Manifest
@@ -1,2 +1,2 @@
 EBUILD boinc-0.ebuild 185 BLAKE2B 5460f7bc31d15beba86f16443aeb364fd40b207285fad0f1534878d83eded1a060aef502ebe04b830c49d2908efe6ec47840864a151cadf819a67624aab88976 SHA512 0ea549e2b4dc5ad23aecd49359e78cf294d36c3d1d4ca9099bd7c919caf991b1591699a0411e3b828c850a6263aa48a3ec6f9e6f73d744286ef6cf07dc812052
-MISC metadata.xml 479 BLAKE2B 50a600d88a0206f4c34f3f1dfc69536240de71b92a0e899059b53e3ccf8e9bdf0dbe3293a88ffc6a8fbfc0882648167cfc92ea6f017d438894a5b34b76217a94 SHA512 c7c487eaf4b5f8f5810787be1669c6c9b4c41d4ab5643a8e2307856b094eb2d1fe645b88d51fc8c0583582e0682df0795792be4c7bce480a2fca85d3a52907c0
+MISC metadata.xml 509 BLAKE2B f25a924dc3ccf634503ee837ddefc345ac5579fa873a859a0d4811dc5af75a768318898ddad5643d47cdfecd4b504731c66b74f69c9d2ce8d7eac186c2379c07 SHA512 dfcd6e28cf9fa71a0c96f4d9a82aaffccfddd9cdc49137aed575fa17b8dca227189d92de9ff9a357fa3425d898a2de803079bbbdef36b0cd127f4af20d4f42d3
diff --git a/acct-group/boinc/metadata.xml b/acct-group/boinc/metadata.xml
index 912fdc058f94..18c27965271e 100644
--- a/acct-group/boinc/metadata.xml
+++ b/acct-group/boinc/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/cmd5checkpw/Manifest b/acct-group/cmd5checkpw/Manifest
index 51ce2d2ccdb1..03cb98a7da6c 100644
--- a/acct-group/cmd5checkpw/Manifest
+++ b/acct-group/cmd5checkpw/Manifest
@@ -1,2 +1,2 @@
 EBUILD cmd5checkpw-0-r1.ebuild 151 BLAKE2B b9774fa5138f3fd300ce55dbec30d7fff567a64ed0c1665e372989ffea1b5d8e9144b04b49ff49f0bca2f7bac3eb6d69bc3054c7a3ee2318d3baf76ec14790f8 SHA512 3b2599082e395ebe674d222027afe7bc877c41be1f53c9510c3ab003569d501223f17005a390a362634c43bc1f930861b5bd39a31a1061126be3256018f715b9
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-group/cmd5checkpw/metadata.xml b/acct-group/cmd5checkpw/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-group/cmd5checkpw/metadata.xml
+++ b/acct-group/cmd5checkpw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/colord/Manifest b/acct-group/colord/Manifest
index 382cca37bb42..4beebd45757c 100644
--- a/acct-group/colord/Manifest
+++ b/acct-group/colord/Manifest
@@ -1,2 +1,2 @@
 EBUILD colord-0.ebuild 151 BLAKE2B ca20121e9e263fa0d3462cee443bb37189d59333a400c9c4ce12c31b589337ca0556effb0ac8505710f3c3b406d2a6240085eab46591a739a9b6820d951d577e SHA512 e155830328da665607b939f8d76d7e420b2d3aada13015af3493b4dfdd72521fbcf42552f0c89162e6a1f35fbc7910684fa89c173b08657443b032330056db65
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/colord/metadata.xml b/acct-group/colord/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/colord/metadata.xml
+++ b/acct-group/colord/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/crontab/Manifest b/acct-group/crontab/Manifest
new file mode 100644
index 000000000000..0e48e0a61ba9
--- /dev/null
+++ b/acct-group/crontab/Manifest
@@ -0,0 +1,2 @@
+EBUILD crontab-0.ebuild 151 BLAKE2B f392b8432b249a644a93bd497ffb8cc1bf0c884ff4880d0e8fdd7854772bded383b0521999c885f179f85bd9e89c75fb5b8bd11b6dd930f5148d96ab9f142b25 SHA512 d8efbdab91c6e84f2d789f5d98cf78986012867bdac0db2a72594c45278f3c83d48c5117108db376d9c89858344003af567b5650db85fafb8964780d950db514
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
new file mode 100644
index 000000000000..d8765962fb79
--- /dev/null
+++ b/acct-group/crontab/crontab-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/metadata.xml b/acct-group/crontab/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/crontab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/dbmail/Manifest b/acct-group/dbmail/Manifest
index b90f16e10d40..b2155aee03ab 100644
--- a/acct-group/dbmail/Manifest
+++ b/acct-group/dbmail/Manifest
@@ -1,2 +1,2 @@
 EBUILD dbmail-0.ebuild 151 BLAKE2B 98b775b3e5970380b04fdfa1ad75b2ae2502256de930926a406a31f2f85ef821080d3471f9de3573418281f094f0a210a68513ab6947e32d37316bf1304f77d9 SHA512 0686e1ec9f45f677ec8dc6077669ffe50b932ad1d7d3fae31b308637b9cffc461058dcf45fb8f8787609f9f3da4879810aa293841c7ee97b3d8061fa4625829e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 258 BLAKE2B a542b7d3d6fe41d4d6804f23d3f4eae32151dd6a261fd9c53df59afc03381e2621ef74094f612a796d2bfdcdc994b210f47935bb396e4ceb58e9901ffbdbd50d SHA512 5744904454b157ef1753d1858d293f35e7aa0d9c513a96823f5efc1ea7fde3bcbe2a50ae70f56be9c9c15463b820d45fcdfd52773a58d078252aceb0e93992f6
diff --git a/acct-group/dbmail/metadata.xml b/acct-group/dbmail/metadata.xml
index 7a38bb900964..ff82108a6c99 100644
--- a/acct-group/dbmail/metadata.xml
+++ b/acct-group/dbmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/acct-group/dehydrated/Manifest b/acct-group/dehydrated/Manifest
index cccd70d0c415..966e2d0768e4 100644
--- a/acct-group/dehydrated/Manifest
+++ b/acct-group/dehydrated/Manifest
@@ -1,2 +1,2 @@
 EBUILD dehydrated-0.ebuild 186 BLAKE2B 3a6d7001e2bde0eb1ac13d0d2c6c0c2dff2c1407a67cf864cfc41e56a91af5a352d2d72d6dc1b44ef80be212d186a7ab761f54f7bc82d3387feeb457ed840c0c SHA512 8c363fd226513afc25e67ba1d12a0da8c0d67241bade538d275f99115099a0fa2378f52afe0df084f5d7eee2748f317d35716d71337c66d7a0ca1dec4617292e
-MISC metadata.xml 330 BLAKE2B c81d760282a51be25e323f15d24dc8a84a4c9b5f9474f1e02d99ea782882deb8448863cfab00e4604cfe9c23690fb1da8e4214ca4226117254d4f8cd3ae1976e SHA512 54134569aa4a1a0d3a29e8375b9b90add38c0db08643554cfb3b0e26e6f6f3a6d08a6e2738a607d422341ab811534ac4af36550fd854cbc19ba5ca70614fb30c
+MISC metadata.xml 330 BLAKE2B b7f16afad9b07e8c987493880be658797f291e408d2725eb0a982f1797953969a64e88c93739c2c9514e047b79dc93124a09d7401ed7cf4432ef88b0a9c76fd2 SHA512 f9593d7f50b0b5dbabca4f180d9de2f0b9400f1fc787e2fd2ccadf049a1033dc42ad855d5503be1e3eb6d36835409b2d6b97753e07d1e746bfe40e73013f0581
diff --git a/acct-group/dehydrated/metadata.xml b/acct-group/dehydrated/metadata.xml
index 6f3f53de9753..3dcff5679365 100644
--- a/acct-group/dehydrated/metadata.xml
+++ b/acct-group/dehydrated/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/deluge/Manifest b/acct-group/deluge/Manifest
index 8154bab1ca35..855ee83e04d6 100644
--- a/acct-group/deluge/Manifest
+++ b/acct-group/deluge/Manifest
@@ -1,2 +1,2 @@
 EBUILD deluge-0-r1.ebuild 151 BLAKE2B 6ec42fd230b4181ec62a967daf16a7ed07f6eb378b7c4891c7d19cbfe1dc593dbfd4d11122497902a03a29173b3e9c9f81cb782e17e7df1d9eb37c48e54a7bab SHA512 af541474931d771efedbe5ec3f321ef2c1edb8a3f0d4e094470b2011e87f7220bf05a08f2e68bf2fa600dae468a40628a7d870988cd004a228e8c2d97ac2fefb
-MISC metadata.xml 490 BLAKE2B f81417945b97e13f63cd61f3a6d0f418d91fde8a0136d3b3403510724911b94b5c255f1def50e9b2e16df3c5a703e197994319b0a3a0434eb3b8a9d6ffdd66ef SHA512 4ebf2048147245bf6815013385982715cd191908a8bf94eec566cd1ba0c28d976af03f7dfc52b63dc1bacccfcf538e6cdf074321fe378022d961e557b83ac260
+MISC metadata.xml 520 BLAKE2B 4a1a72b4832ac32fcdfcce16e312465eafb1b6e0957d7a6acae086f72ed983d097465ebfb11959dbfad78b3612f760d99802546d0fbbe51851225b66d8700b0f SHA512 122985a7007d61c27a11b98a8bf7c1268a512ad2edc838e87e87299536cce125dddbd75e035c7a1706cc1bfcbaf82cfb75546e861fea8b503a3a7f3b02882ccb
diff --git a/acct-group/deluge/metadata.xml b/acct-group/deluge/metadata.xml
index f81d723becc1..ab0dde28d5a7 100644
--- a/acct-group/deluge/metadata.xml
+++ b/acct-group/deluge/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>candrews@gentoo.org</email>
 		<name>Craig Andrews</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/acct-group/dirsrv/Manifest b/acct-group/dirsrv/Manifest
index 1e891a503038..92e4a6a942c8 100644
--- a/acct-group/dirsrv/Manifest
+++ b/acct-group/dirsrv/Manifest
@@ -1,2 +1,2 @@
 EBUILD dirsrv-0.ebuild 190 BLAKE2B 368a26f8c1f9ef3327aa8bcae45cc4c419d4719c1a82b0307ac862aed6c8941def326568aea406068ccde0bec694b37a32ac59e59ce0c5b5a75d99e4e15412bb SHA512 fd9f41d1e2f9dacae5831d3b00cb54fab6cd6c801073ee015c9685c9a4e38b9cce0b1b90a60e2ec219156ffdb26985d686531b23d4f7c25d5fbeb83bbe2636d1
-MISC metadata.xml 486 BLAKE2B abb49ca37d64b0a94e8ff656ad9eec42f287a66f19866dfb92b09557b482719d2a026c015764d2433715a65a95544fc57d24e22abad9460c42dc2ddbdf02b560 SHA512 b0e9f028d3238176d03ee5bda33e95c5a77270740205fe91eb509c0ce4663829df757c071e46c2cb83bb1826a52335697f5fd073e509154dd3209b43e2fd8129
+MISC metadata.xml 530 BLAKE2B a5e56eee25b5c1e81a2d136da9eed43b529121a07abd4b31a057312d25500b773b63ad539594a9634763a81716738ef58ab9a6b50b268b5743250089f1feaf0c SHA512 5e69fff6d3239921265e2352d557a6b8904ca47cd8e7529bf0c612526263a0c1e617979d83cd8b1fb1c2b1202e58c7977491d65e184c4681b0040886d236dd94
diff --git a/acct-group/dirsrv/metadata.xml b/acct-group/dirsrv/metadata.xml
index de7f98d8aae8..64cfde49e6f9 100644
--- a/acct-group/dirsrv/metadata.xml
+++ b/acct-group/dirsrv/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chris@christopherpritchard.co.uk</email>
 		<name>Chris Pritchard</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/elasticsearch/Manifest b/acct-group/elasticsearch/Manifest
index dad92c1acb85..43bdea09386b 100644
--- a/acct-group/elasticsearch/Manifest
+++ b/acct-group/elasticsearch/Manifest
@@ -1,2 +1,2 @@
 EBUILD elasticsearch-0-r1.ebuild 193 BLAKE2B e3d11c3bd47b75899a6e4afbf95d867bcd975aaa9c9d90040a509329e9b8b37b29753e7a3c9a907c181ae3ecf07107f2d351c80838f9d6292daff2d53ac69ae9 SHA512 540182eb4cc6dff9552e27618f2bb36d371cdc1b28e440da9b12577444b1ab5f9c5fea69c0a32c8814ac630ea420ca34d0e12e0394e2aca07a751f51e3af4be4
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-group/elasticsearch/metadata.xml b/acct-group/elasticsearch/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-group/elasticsearch/metadata.xml
+++ b/acct-group/elasticsearch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/epmd/Manifest b/acct-group/epmd/Manifest
index db9b7b14864d..85f55783924c 100644
--- a/acct-group/epmd/Manifest
+++ b/acct-group/epmd/Manifest
@@ -1,2 +1,2 @@
 EBUILD epmd-0-r1.ebuild 200 BLAKE2B d300b2a3247f1612784635ce06f0cca3ef48b9f01c49919ec3955620ef63b28434da520ecddedc7c757034b470b614dc17bc03736c29000137f8c78e92b75e98 SHA512 f95a919258e9956e1cac3a5c349de3518b5928b8627e129ec8dd346c4e85a0c42ed9253175848c79c1b3811bae52920554f3424f73da04f6fc317df9d97cd675
-MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
+MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
diff --git a/acct-group/epmd/metadata.xml b/acct-group/epmd/metadata.xml
index 7c3db330c141..dbebda04b192 100644
--- a/acct-group/epmd/metadata.xml
+++ b/acct-group/epmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/fvwm-crystal/Manifest b/acct-group/fvwm-crystal/Manifest
index bab70bf7da3e..0f51905371ae 100644
--- a/acct-group/fvwm-crystal/Manifest
+++ b/acct-group/fvwm-crystal/Manifest
@@ -1,2 +1,2 @@
 EBUILD fvwm-crystal-0-r1.ebuild 146 BLAKE2B 8da45aa0003a8d437293e96de8b439bd008e42e5c18703bbd31b2c0e158a7ab0fd27bb4f06b10c95c6bdcbe5ceb7d560fa12077633f84e354163daab5abfd575 SHA512 e896b338cfa24afc90f7141c96922e47c9f0b9e11721d0cebbe82c15f9b5844689b10677407cf2be1544123d99a83edb6e456a95380e36fe1f7a0ca33a67ce43
-MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5
+MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/acct-group/fvwm-crystal/metadata.xml b/acct-group/fvwm-crystal/metadata.xml
index 16853472f6b4..d095ed4b8f81 100644
--- a/acct-group/fvwm-crystal/metadata.xml
+++ b/acct-group/fvwm-crystal/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/gamemode/Manifest b/acct-group/gamemode/Manifest
index 2309f8716b7f..97d5cff16124 100644
--- a/acct-group/gamemode/Manifest
+++ b/acct-group/gamemode/Manifest
@@ -1,2 +1,2 @@
 EBUILD gamemode-0.ebuild 221 BLAKE2B fb883727b359ae9eaef0a38f6d64bdd404bfca8036d65b6eb14e84b83b26b329ec517b502c40c62e061046990939d53fb2921e3dccde0cf5a4753eb337408585 SHA512 d696dd8fce6e6cf753d763fd150452b2835ed995d557f2357a311678f8bcdb19e952240ce69762763af94e6a92d9386c5e0e88e068fdf59b8a04f2fef17ac57f
-MISC metadata.xml 367 BLAKE2B 65b766163246840517525658e81e83dd8670a95df6421c866e19503c7f07ba9664ce94f35dd356cc41105f9b559ee1ce72d7c76c935c0bc0a327415b3ff156a7 SHA512 6e50491a88bbc7f02bdd2eeae5cac2c62b45d9868fd7e0747f24a224eea2e0bf5a216e3209a53dcb06fc18625d4d4442fd3706f81a859067df24dcc4e2873717
+MISC metadata.xml 397 BLAKE2B 20d2d79ec0a405d0fca9e4da849442129a7916f49441896b03ac020798dbd48d35ffdbe955d4eb87766fdbad212d44ba7309a1b701ee40d2895e23657b34edde SHA512 68520e8ebe14fc170fdf0f6af3e432a1d12ad9751da13aade825f32299a635b7fffc277a0fbcba3dce42ad5f8df336c5012b6e27f9f9ab7bf3bd63c9622a61e3
diff --git a/acct-group/gamemode/metadata.xml b/acct-group/gamemode/metadata.xml
index eea561c5517f..79a2badc8455 100644
--- a/acct-group/gamemode/metadata.xml
+++ b/acct-group/gamemode/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/gatling/Manifest b/acct-group/gatling/Manifest
index f6e9e9fefbba..8eb476c8a093 100644
--- a/acct-group/gatling/Manifest
+++ b/acct-group/gatling/Manifest
@@ -1,2 +1,2 @@
 EBUILD gatling-0-r1.ebuild 180 BLAKE2B f12c244d50cc81d30cdc906d8ccc0eacb4b7e02b3d5178194dbe14ece4dceb1f081642beafc4c55af73ee811fec61e9137bc366ca404ec0dcb696fbdb91f5bd2 SHA512 d6191769820fc8505aca4cdafe9bbbcd83ffcc18f3f44229512e174fbb3e8a40303b419b2ce4016707267887e99b56355ff719ffc6a185400af5dfc47aa815a0
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/acct-group/gatling/metadata.xml b/acct-group/gatling/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/acct-group/gatling/metadata.xml
+++ b/acct-group/gatling/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/acct-group/gdm/Manifest b/acct-group/gdm/Manifest
index 8d89f3759799..47eae0a5148f 100644
--- a/acct-group/gdm/Manifest
+++ b/acct-group/gdm/Manifest
@@ -1,2 +1,2 @@
 EBUILD gdm-0.ebuild 150 BLAKE2B 90ded007a25830e843d6e83df8e63fefd6a438fbbb1d8fc2edf3138bc2f846bb7fa6feb1e1858a5d1cfdfe4ca7eeefeb98949766639020b65b58cc5925656719 SHA512 f55d4a6632f23a9b1d7df9630ccada87dec5545ef805905ce14309b2f7ee398d43162df53e52db44021eac81138fc9181fd424a988c9f013f2d3142b45b7d54d
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/gdm/metadata.xml b/acct-group/gdm/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/gdm/metadata.xml
+++ b/acct-group/gdm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/geoclue/Manifest b/acct-group/geoclue/Manifest
index c7500d5682de..6d6cc9c8d939 100644
--- a/acct-group/geoclue/Manifest
+++ b/acct-group/geoclue/Manifest
@@ -1,2 +1,2 @@
 EBUILD geoclue-0.ebuild 146 BLAKE2B 5616d9151f98d33d5a81ac4585387af2398d3428b29ad225673591776047eb2c93cafa397b54b2a3f52d48886dbc2be4b8fa4df45bd3147b2f22e44e7dd8302e SHA512 85fa0cdabbdb43c55e8aa0176b563ac367d9887e4cef0d1867630de5c38ab64843b297e0d6cf0752baec4ec31fec1dfbce8e19bdf78aa1dfc4569e03ff7d0c56
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/geoclue/metadata.xml b/acct-group/geoclue/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/geoclue/metadata.xml
+++ b/acct-group/geoclue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/graylog/Manifest b/acct-group/graylog/Manifest
index 7ce241f4e6e1..166b15ae9875 100644
--- a/acct-group/graylog/Manifest
+++ b/acct-group/graylog/Manifest
@@ -1,2 +1,2 @@
 EBUILD graylog-0-r1.ebuild 187 BLAKE2B 4c442d1faf427cf0542e78fb9e4b66fbcc568cdc9f72a8527e8c4349e068bb6e1dc1c52f87ad57d3dfb7e664502fb1a4aa4ed919550e3412e4f2e8783b3170bc SHA512 2b17687bbc27c0d8af95c25d0ff8f627a782476677b3e417412d8e7d8578c5522f86b59c8e5408aa854121edb87ea06ddd8442c5597456cf95b8890344c22bb9
-MISC metadata.xml 491 BLAKE2B 1d591f6f575e86589e2fde72536fd6b16833148d2dc0e282ae5d36cfe4ebcb1c68871bea92bb330dbcf5c111b79abc7248a4ed3829ad7a0804793c379fded0cb SHA512 9f5d4ffaca4aedbea6543a69f11f5d6d0a69b99200f9e133c47f043c59ea827d52375203fbcd9e2787f1c0b243837b72f88f33482ed5473c9296b8690e434c57
+MISC metadata.xml 521 BLAKE2B 40acf0e28ee36caa0962287d552d5e4822967618c5da47f7e1d3470c636f1f78766ca3edf08e2afd916192f7633e163f7d3ce411f257b0bc1717254d1703b8c6 SHA512 4be569ec127284f17e4c0137a935bc83524a81d7b9f4eb702b5162a33edf1b64ba48b763a291c6496d6e836a1118c537a274db4aa9ec54f1ae5d78a488a8b78f
diff --git a/acct-group/graylog/metadata.xml b/acct-group/graylog/metadata.xml
index 2d21d06a314e..d5c2b8215a1d 100644
--- a/acct-group/graylog/metadata.xml
+++ b/acct-group/graylog/metadata.xml
@@ -5,11 +5,11 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/greetd/Manifest b/acct-group/greetd/Manifest
index 372cc2a25c01..1f1cb4374cd3 100644
--- a/acct-group/greetd/Manifest
+++ b/acct-group/greetd/Manifest
@@ -1,2 +1,2 @@
 EBUILD greetd-0-r1.ebuild 186 BLAKE2B 8632a04a685200261c382ea717807d2e238836ac3f2073eabb19c45e025435528ad15f966ca99a183f2246a3ec8fb59a865445cf301e85e29442cbe3ac62d04c SHA512 4b2a1180c2a63ee4b7264c106dd9a33b8bf4c3bffb7fda4806b307bdac6fd7ceea6e465a93d6e37a1b11ea0a148f694b083d0140a0fd8a7e4c9fc4bb1badd342
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/acct-group/greetd/metadata.xml b/acct-group/greetd/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/acct-group/greetd/metadata.xml
+++ b/acct-group/greetd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/gvm/Manifest b/acct-group/gvm/Manifest
index 5bdb310f543d..206cf2099bec 100644
--- a/acct-group/gvm/Manifest
+++ b/acct-group/gvm/Manifest
@@ -1,2 +1,2 @@
 EBUILD gvm-0-r1.ebuild 214 BLAKE2B 9f2abda448e10f84fc8e8cbd9b2f6dbf142f54aae3d0d0eb72774076e97516d165fbe3d9bcf4b7e79360cb17b11bd1bd3822a1d80f34b03d73ff834fe2a948f1 SHA512 c2fe11b8cef3ca6ad8301b9b5366d33c1510988207f2747e6541c3dc54cc574b444ba0a445ae3433dfe8c4d7c314e9e6e508580f93ef04d29ce3f2cec5cc13fd
-MISC metadata.xml 366 BLAKE2B e5273e1c5fc201d0e5a24b0d71b72cf491ce8062de669d62308befed1b14dbfe0dc221bab9f2ef1f84acd3cfb85f2a10c0baf7243b9cc133f61a16030429297f SHA512 18c0fe66b4b3c933c504341494c5fb70f112498fae7e46c28a46f94107f86dc14adc20d0342ec569c04aea756c953154e099b3f550eb08bd25611fc17b8a2056
+MISC metadata.xml 396 BLAKE2B a910a5574fc5ce905c80dd00e705a3442d505de6c239fb7bec295dcd52c5b53c4f18210d3d4f9392a4e035431790d5734456f1956e4b3624723826b9d55e0bf8 SHA512 51be4a27666f5dc3c239d78bd874f5cb1ad0b4e5b2a753360eff863b262e9ba567996ca120a4ec23eb0b284ee6d45458c2a0aae3866c120530c328981af09589
diff --git a/acct-group/gvm/metadata.xml b/acct-group/gvm/metadata.xml
index 171524bb54a4..19bcadc6e38b 100644
--- a/acct-group/gvm/metadata.xml
+++ b/acct-group/gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 		</maintainer>
diff --git a/acct-group/i2p/Manifest b/acct-group/i2p/Manifest
index 9f991e9e0eb1..197c9efb17fc 100644
--- a/acct-group/i2p/Manifest
+++ b/acct-group/i2p/Manifest
@@ -1,2 +1,2 @@
 EBUILD i2p-0-r1.ebuild 199 BLAKE2B cf128b05c061e4bf01767db2181bc5f59b77cc9fd135f97a9e9bbf4edc99e07f5114f851615f222b90ed404d53ca3a31c70853094e824b091bb01ab309c78228 SHA512 482824f51a6d4d0c74e18aaebab948221706389272487655dba23d9d83491b9a07aac8611157a170e2514aecaf496b95f854fc7077d31ac7dc4aef92a091ce3a
-MISC metadata.xml 452 BLAKE2B 1addcb65f92e1b13a37c1c9e584b8ad908d5d3148f9d2bdccc7ede5a88b8be9c14f0cb3003a5b31376f6fdbad9515c1ebe6e0055616de4a54c44b45df34e5ae0 SHA512 b95069cd080c6ba33882f3b389f85b85306175fb849c51f4c72ae437bede7b5642f376cf9759b80bf2116e189d72967c8105daa7303eb645feda37a5cc12b098
+MISC metadata.xml 482 BLAKE2B db3075c0323f6fe7e8f926b880708c1a780952216e25c321e9bb5a49a80109cb4d2e25f47fefc183b2e0e566b9a95b463544caff88dc20097d7eaa7432f01fa8 SHA512 ac8acf6f95500547581f3ed9e40d5415669d8e54d98862a77d2ec460c4741a0f416bf8108c27af2fb5be4e002dadf44f4e198e07b1ee02dec84bc62afa0a7ae1
diff --git a/acct-group/i2p/metadata.xml b/acct-group/i2p/metadata.xml
index 13b1587368b0..400ec039fe65 100644
--- a/acct-group/i2p/metadata.xml
+++ b/acct-group/i2p/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>tharvik@gmail.com</email>
 	<name>Valérian Rousset</name>
 </maintainer>
@@ -9,7 +9,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/acct-group/i2pd/Manifest b/acct-group/i2pd/Manifest
index eabccda2958e..f8f926c534bd 100644
--- a/acct-group/i2pd/Manifest
+++ b/acct-group/i2pd/Manifest
@@ -1,2 +1,2 @@
 EBUILD i2pd-0-r1.ebuild 211 BLAKE2B 217d3a4681c74dca3585d41743720c4d57d9e33a6a35d47c6539d443bcf67a1eb910470043a7b1e8bffb5fbe286ea3a00997e472d3840b4f523452d78daa1036 SHA512 cbf2900498de05306f1cc575f2071a480fceff85291e0275571ee6c3d1a0ad9bc64d1c9b8013415f3d41c20cabad32d872b0ba5823d153d06c2d6209abfde251
-MISC metadata.xml 368 BLAKE2B fe12c2012ec5d14b6a09f8aeea4d4763e454d6b0be49282c9eb87173b2bac7a31ae84a5d13c54a9098bed594e4ea7c0b75e7581def7c023c2ad5ee49832b97d7 SHA512 ae14458289e58cc9131e711012a8d286a89fd9ac2363997ce7b451fbd5da459e5334ed7275699d528bce0525a9536e78ca9838f206d9a797875865efa35b17df
+MISC metadata.xml 398 BLAKE2B 61136dca124d04113e5151f8b1012955d1a7a07c07543a29efd16eb611a4b5a71edfad77ee2e7bd98477920edc3171f660882a40bb028d3f06ffda7665de24ba SHA512 059c0c72929c37d258e558e53b5e5f30d543c7d7bd3080fed0223599388c638ad1fdbecbf15a0fb100275c2f86b771dcd56539adee7c8004e6b3fdcc5292f149
diff --git a/acct-group/i2pd/metadata.xml b/acct-group/i2pd/metadata.xml
index 5d25e0368234..54ebb476112c 100644
--- a/acct-group/i2pd/metadata.xml
+++ b/acct-group/i2pd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaikaikai@yandex.ru</email>
 		<name>Alexey Korepanov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/inspircd/Manifest b/acct-group/inspircd/Manifest
index 9fa14d3584e5..100e558a8b30 100644
--- a/acct-group/inspircd/Manifest
+++ b/acct-group/inspircd/Manifest
@@ -1,2 +1,2 @@
 EBUILD inspircd-0-r1.ebuild 169 BLAKE2B 0c0ca44d8d2a3ee7b99bab5692ba52f08dbb8d0e5e929789a6ef7979d475a1b9f6ada85b59a2c1cba7f12579eb4d97992ca86ac592ca30d85c980ea3df51da84 SHA512 8e8f75169fcfd3b7bbdd19afee000c1443a1604c12ae8100d131117fd7bddc544443508bdec30792f38f0d2a4b307e7a412022d27c8b2dd1b44eb6d534cd95d4
-MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
+MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/acct-group/inspircd/metadata.xml b/acct-group/inspircd/metadata.xml
index 2b340d2c9798..cccd8e9eeb02 100644
--- a/acct-group/inspircd/metadata.xml
+++ b/acct-group/inspircd/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/ipfs/Manifest b/acct-group/ipfs/Manifest
index 12b2767d7412..c570b79f66d3 100644
--- a/acct-group/ipfs/Manifest
+++ b/acct-group/ipfs/Manifest
@@ -1,2 +1,2 @@
 EBUILD ipfs-0-r1.ebuild 218 BLAKE2B 48e70745fca2586df57d3f9cc36a5139215b131faf850192c36eb9ec47edc5be7262b5db6619af4881da90d2a758d7cc7a5d8451083285ad0c51dd383f8b9012 SHA512 a3cb974b7226597189bfcf690b83161d0c1934ba633d63b89300c58bf9b653ff74c6cea24b5b6d20448878cb8da8420ba111e6d89d5ca318e87f3a0e9f423569
-MISC metadata.xml 367 BLAKE2B 65b766163246840517525658e81e83dd8670a95df6421c866e19503c7f07ba9664ce94f35dd356cc41105f9b559ee1ce72d7c76c935c0bc0a327415b3ff156a7 SHA512 6e50491a88bbc7f02bdd2eeae5cac2c62b45d9868fd7e0747f24a224eea2e0bf5a216e3209a53dcb06fc18625d4d4442fd3706f81a859067df24dcc4e2873717
+MISC metadata.xml 397 BLAKE2B 20d2d79ec0a405d0fca9e4da849442129a7916f49441896b03ac020798dbd48d35ffdbe955d4eb87766fdbad212d44ba7309a1b701ee40d2895e23657b34edde SHA512 68520e8ebe14fc170fdf0f6af3e432a1d12ad9751da13aade825f32299a635b7fffc277a0fbcba3dce42ad5f8df336c5012b6e27f9f9ab7bf3bd63c9622a61e3
diff --git a/acct-group/ipfs/metadata.xml b/acct-group/ipfs/metadata.xml
index eea561c5517f..79a2badc8455 100644
--- a/acct-group/ipfs/metadata.xml
+++ b/acct-group/ipfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/kibana/Manifest b/acct-group/kibana/Manifest
index eddb00e0a525..0c70231941ce 100644
--- a/acct-group/kibana/Manifest
+++ b/acct-group/kibana/Manifest
@@ -1,2 +1,2 @@
 EBUILD kibana-0-r1.ebuild 186 BLAKE2B 69fb4e21c1b09789c18cec977adea72b4dda37ff7e95fca823e0652664e2fb18bdf0627ca54d9920f1555d83ce3978b38e2e4dcd461e323a6e74b7578a0823ad SHA512 6ddcf5a360bcb844c7f909902a3dc31dc97f7a0858e3b87b7e9319817109581e676334591903ad49f8d73237490758d689058ac3068b8fd19e67fd91d16a66f6
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-group/kibana/metadata.xml b/acct-group/kibana/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-group/kibana/metadata.xml
+++ b/acct-group/kibana/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/knot/Manifest b/acct-group/knot/Manifest
index cc9786af5d4f..33ff67fe6f90 100644
--- a/acct-group/knot/Manifest
+++ b/acct-group/knot/Manifest
@@ -1,2 +1,2 @@
 EBUILD knot-0-r1.ebuild 150 BLAKE2B afcd002f4fb11e4ce7c3a28fd59b26ddbc036b6a17b8e505dce673bf21fbf72b39493401f0e4bdd8aa19135e80c775776d4cfcb3c2aadb5c017904753ad3895b SHA512 8b3877f5d6e398c2f9b02c891cde8ed8f7e7e06bba88118ccc86ea47e9bc74f1974c93f30d3fef0c7e8615c75efe3f59d31f836a791328669343276b07593fb2
-MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
+MISC metadata.xml 405 BLAKE2B 707ae1db24849c15055554e5411e9eef759457fd605d42c9f487f02ad0649538fc1531b11219f88a12b2ec6f6ce9291e7a0ed26ed492740274cb68d3edd4c69b SHA512 8d1ffeabe9690928422089e31eba7b94bb5f0b8e07a94de043def0d7543c97291cc9892d6a594089fba4eca2b382334c84acac34b7f4815b69d8b3ada9b84d15
diff --git a/acct-group/knot/metadata.xml b/acct-group/knot/metadata.xml
index 89aeeb96e865..01b903b2b23b 100644
--- a/acct-group/knot/metadata.xml
+++ b/acct-group/knot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/logstash/Manifest b/acct-group/logstash/Manifest
index bb88898e48e4..8bc7f3db8319 100644
--- a/acct-group/logstash/Manifest
+++ b/acct-group/logstash/Manifest
@@ -1,2 +1,2 @@
 EBUILD logstash-0-r1.ebuild 188 BLAKE2B ed36a4be07db7882f86a99bae2e155926bb5e139ecb8f4a75c7e1f063b4d12596be5ae8bbf026ef1865ae8c313e55d646cb6e99c2b40817cc2d28d70bdc8a9c8 SHA512 507c1b0323222b9b9423cdede2261d2edb5dcedce64a4892ecf49fb09dcf1620efa11e3e2bcacd7a348932a0c5c39b75b347f5616e276a96658ebba8f655338e
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-group/logstash/metadata.xml b/acct-group/logstash/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-group/logstash/metadata.xml
+++ b/acct-group/logstash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/milter-regex/Manifest b/acct-group/milter-regex/Manifest
index 308b2fcd6d5f..a6e02529b923 100644
--- a/acct-group/milter-regex/Manifest
+++ b/acct-group/milter-regex/Manifest
@@ -1,2 +1,2 @@
 EBUILD milter-regex-0-r1.ebuild 200 BLAKE2B 15ed5702911bb43a23a101c18ef136d147e29993ebcee2d003e83a5f57b077ce5166f691383bf94ad6854c197de8e2b04a6b9985e87934645f7fabe812c01d89 SHA512 233156efbadbc807f7e4064479a5cbbe5c3f8527cf635605e1c3372d78ae3351a633f27992fd878edf881d8e475697130cb6b0a3de9cc5da66ca2df0ef487365
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-group/milter-regex/metadata.xml b/acct-group/milter-regex/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-group/milter-regex/metadata.xml
+++ b/acct-group/milter-regex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/minetest/Manifest b/acct-group/minetest/Manifest
index 175b1152ff40..9471f07e773d 100644
--- a/acct-group/minetest/Manifest
+++ b/acct-group/minetest/Manifest
@@ -1,2 +1,2 @@
 EBUILD minetest-0-r1.ebuild 200 BLAKE2B 79bb71a778624c35e295efec8bb1573bd5cd0899abdf9130930a7d9ba9a454e77ea444069f53b56938b48fb3c7ff0c57f502281feced3c8aba5983d46cef2b81 SHA512 f6177b5bb5bf717b555b74eb6e302c1ed1751cee578a86a4eb0a2faabaca5467eed579811b463100053d986a4d19896819e184d44baa6fe0f60b5dbc9f1c3fa7
-MISC metadata.xml 491 BLAKE2B 8441e9b587930bc5d046e54c835c6cbb35025afe3523e24669e33dbb68f1a22731dd10c90939f3cbdf8a2da9298aa6631494ff9917bb66276eeb21c5f516ae41 SHA512 f511c893a3d504dd36a0dc9f339e48d5e6d907a3145cdd182717a9ab5000de5d8a8b22455fc90edf13681e81e797a0ea7f3bb6ec7da7fb22b0902063593672fe
+MISC metadata.xml 521 BLAKE2B 8330c4adb8cb69d54e26bca586a31aba16b3ae36463402118544f544ea83c47ad6e235973c9feecf7b04199877919988fc3cf98d6682f424e568d74f642390e0 SHA512 b666c820aa825ee4ba8536ffd1147c45adb09aa9b224262cda2d6cb5c8c4a11928e6a755317a9096db8050f03f34fdd3b4b6a602e40b286e76738684634ba1e8
diff --git a/acct-group/minetest/metadata.xml b/acct-group/minetest/metadata.xml
index 2c5233e954a8..8a3de9738559 100644
--- a/acct-group/minetest/metadata.xml
+++ b/acct-group/minetest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/mongodb/Manifest b/acct-group/mongodb/Manifest
index fb9b93421366..4f0ee2e91b4d 100644
--- a/acct-group/mongodb/Manifest
+++ b/acct-group/mongodb/Manifest
@@ -1,2 +1,2 @@
 EBUILD mongodb-0-r1.ebuild 187 BLAKE2B aaf15e283ac917d6a293267fd1694cf1bddcbdcdfa3e17509405426a449c2f2d6d82fc4e24ee4429e8366ecf92c965cf7d5831165c444fe2b2743c062c6699c2 SHA512 5558890d1ec1b4978a145c1102fcbfb0a4baccbe0b2f5b098de9ddf7bbe78dc0cdee18578fdfc21a79fa796d7e4c0ad5ed396c0825d8c07649847ff0affb718d
-MISC metadata.xml 475 BLAKE2B 34418e185f3fab848293fd43b5d8915188c8b12861a4c1e98fd1a1d3d85742bca2c245ee3949efa05e248196274d376467f8607dd6638213e23eaad079c37cf6 SHA512 bd34b45eadb36fd0dcbaf4d26dc6a382a6a3e6e383a85e99e1b7e1c84b9d6d1ac34229dcc96ff4aa5d73fbaf8a988e89b62cdaac7b23d6556711eb2639c119e1
+MISC metadata.xml 505 BLAKE2B 24b8fa3f6f8ab5b3c6660ad089a904c947f1efc834b070df6cb6661bd2202435bfd8946b770dd5d394a8e76e2b9479abc6e559608815000b25834668322cc5f2 SHA512 32657f9fb16416723df3c36abb11462b9ca364bd6e4d4f602bef94e6612de36374c25cc313d40ce129f854b34df11822cd488935af3db2e8e2dd2e62a903f5e4
diff --git a/acct-group/mongodb/metadata.xml b/acct-group/mongodb/metadata.xml
index 91e6ec605462..c66a29d26a31 100644
--- a/acct-group/mongodb/metadata.xml
+++ b/acct-group/mongodb/metadata.xml
@@ -5,11 +5,11 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/monitorix/Manifest b/acct-group/monitorix/Manifest
index b3ba35997e48..c38ad24dd709 100644
--- a/acct-group/monitorix/Manifest
+++ b/acct-group/monitorix/Manifest
@@ -1,2 +1,2 @@
 EBUILD monitorix-0-r1.ebuild 188 BLAKE2B 4347eca1e5330bc5f1f2c9d2e516e7af08bbe681ff416249f055f08606a75f9c09b877ede39a66e355c1d08a9a9194da856db99d780ee9b1ed6437a0b2b28e81 SHA512 ecce9a44b19fa8b20da9f2e74d243641d845af8d7ab60222159ce95ca345744cf59beeeaf484983a691d2d5837492835262a149d4fa7d11c5ea7f9ae8c498b63
-MISC metadata.xml 360 BLAKE2B a5d2f7e18dae66369c79b50cd110f8daacd4e6a6efe2a69e3ee90916a4362b360cd27946a2a30f3ee80fdd0fd427e476110f9573667becfca9bf82aba5c9de79 SHA512 5dd38dfd0392789a243ceea17842686062d59c04459a1ff2bacccbc630e8027a59d5380f920227ae444668187a50176d7b8aac0c50c4d71b3b5780c09e8d60b7
+MISC metadata.xml 390 BLAKE2B a9a080cde7aa92ad742924224d675855c938911ce5d1c3fede6354c2dce707e7bed82a716ba18e7b52292e861521148efe0b279ef9e76c394ab7cedada5895c2 SHA512 8bae6f32a806a22568016bf141ed2f085a12d2020920e27f597af744029e878cbee8d0244853ef66b649078c33f8c4a854566154353c24d8d65ea08c7f34db8e
diff --git a/acct-group/monitorix/metadata.xml b/acct-group/monitorix/metadata.xml
index afc56cf98028..77c76f6a7d44 100644
--- a/acct-group/monitorix/metadata.xml
+++ b/acct-group/monitorix/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dwosky@pm.me</email>
 		<name>Pedro Arizmendi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/mosquitto/Manifest b/acct-group/mosquitto/Manifest
index e02798c2d9db..c7571467efb9 100644
--- a/acct-group/mosquitto/Manifest
+++ b/acct-group/mosquitto/Manifest
@@ -1,2 +1,2 @@
 EBUILD mosquitto-0-r1.ebuild 203 BLAKE2B 96dff333d4c3f641940f7a16af6115168305ad14c50c861bb5be3a00539a21fb2f83afcf527fe2a796c0f6ede56527e6c91984629245568aa3d6671afc8321ec SHA512 f0d953d1d855925abf4f747e083efe4a8cadb0bffaca50caa4241c28e780de6fbf5c2ee4093a812609b32fe195f2287d0a271b363c3e796c863898b365c1f7fc
-MISC metadata.xml 246 BLAKE2B d6a06583d1046773ef6fbab7a6e6d170efef20a7e432b4b984e937ce528c02cbc0b8db6c611177afc7497723c19499962dac9b4034ae129157a7c60aadb43567 SHA512 4bc4d1b3813edc829ecc432a9ac1520823b9405e8dbd8ea7d2c5360b8418ff7ed0473e446a936c8dbb8527f7da4180c42fc73c02d9f3e7243643a4185fcf07f2
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-group/mosquitto/metadata.xml b/acct-group/mosquitto/metadata.xml
index c74515c3e34a..b58e8386fcb2 100644
--- a/acct-group/mosquitto/metadata.xml
+++ b/acct-group/mosquitto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/motion/Manifest b/acct-group/motion/Manifest
index 3c5493b60fe1..4ba4419ba635 100644
--- a/acct-group/motion/Manifest
+++ b/acct-group/motion/Manifest
@@ -1,2 +1,2 @@
 EBUILD motion-0-r1.ebuild 146 BLAKE2B 578075e210c48d0089d306ccee22081474383c156386e1b25f2524f98250aa29f82a7091608499a7c6372209718995c1bc75db3af62c516c31511d257cc89d5f SHA512 5b20c9f5a214b8fa077e331707a9f9fa9ba3bbac2b5bfd19c12938d23170a098eeb8bb5c50736a68a919da5d6097e5fa29d03338ad696609a44b4ea50a96a4d0
-MISC metadata.xml 365 BLAKE2B 771727cdaae273cfc8949eb77e62c9302d8b0301aa4bb6b64ac0a3c49e527b19382d1a98e1080fc8f3b16e27afff4ef17526f5ed65ea640e78c03f97a6a817c8 SHA512 d5c9f2d9934bcf9749a3d8e663d8bd256c814e129598301a5e629b57957732675ad3885f75705fc11b9d616d310b082abe52e2b6b461ab31503545a866127203
+MISC metadata.xml 395 BLAKE2B 5d13daeaab25ec32968c856b1f2ba3451ed3c448a17d28a77b47f9950c18658bc45b6d69ef9a4a0618dea67413059c8c69a7feb5bdc077b8882b88f8122a5ca0 SHA512 9e4b587d1e39adb536d6fee6c70780e0608b3147589d9a50859bc587e6f36fefecaefe8e01b998c6afe6a5252e20cab0e76319aea7b8f65deb3ae341c9a1db0c
diff --git a/acct-group/motion/metadata.xml b/acct-group/motion/metadata.xml
index 1152c2457fc9..c1a7e3dc4e08 100644
--- a/acct-group/motion/metadata.xml
+++ b/acct-group/motion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/mythtv/Manifest b/acct-group/mythtv/Manifest
index d920bf3dd633..ad7bdeb87ddc 100644
--- a/acct-group/mythtv/Manifest
+++ b/acct-group/mythtv/Manifest
@@ -1,2 +1,2 @@
 EBUILD mythtv-0-r1.ebuild 205 BLAKE2B 6ec8e3e27a08b26192e1de51b800d478839b609a6d671187a61eec9a3958a0e55b53ff90a055b7810783763b89712b5d2a473c3d5908802d90b05c65e6de8f9c SHA512 2a679c86bb3f914ab48be0eafdb9c62e3a7b38c47a2714695983ff284b1bb2489db9e752619d08b0f313462b3defef66184632c5d8aefd1b84473243bfdb6de8
-MISC metadata.xml 465 BLAKE2B 8a095eabeb00166f353ede69409feabfa9ac96eb4a8442e90824a2530c85341e84b6650ef564519164e2acf876a52d5d1a5ce6888ef56b84115f4f8bcafcc0c5 SHA512 d9998ecfe5be293c6a1d6000021a26e8833d67e8954640eeaa2b70935c9a4f1ea728826292268b3da1431b1321879e599010cb0dd49d6d4547dfced20b89731b
+MISC metadata.xml 495 BLAKE2B 8a5d2b3333b9c6e11348426577067395f36a0990e7b05a8c7c655173fc86b48ee858d71120074025b7766870c80e1dc05b583420d23417fa0010fe4223901992 SHA512 d64f310150f85c861403977c78f57396ba55729c953d1d0da56ffc64809b53d71fe5c281da2ce65ea2040fbe198408e51b5cc4b109bf2ba0acc8f3ac352f5cd1
diff --git a/acct-group/mythtv/metadata.xml b/acct-group/mythtv/metadata.xml
index 00202e3e9a84..604b76cc906c 100644
--- a/acct-group/mythtv/metadata.xml
+++ b/acct-group/mythtv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
+        <maintainer type="person" proxied="yes">
                 <email>thebitpit@austincustomerrands.com</email>
                 <name>Wilson Michaels</name>
         </maintainer>
-        <maintainer type="project">
+        <maintainer type="project" proxied="proxy">
                 <email>proxy-maint@gentoo.org</email>
                 <name>Proxy Maintainers</name>
         </maintainer>
diff --git a/acct-group/ngircd/Manifest b/acct-group/ngircd/Manifest
index 6bd7a1627347..afaf43becf1d 100644
--- a/acct-group/ngircd/Manifest
+++ b/acct-group/ngircd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ngircd-0-r1.ebuild 190 BLAKE2B 14379ac3de7b681361b315f037527e92b0207f0fc3df4aceb0fcbbc0da52060650acb8676c43ad3bd30d06cf50463fd543ad4491b87e03349a086988ae4df8e6 SHA512 4a07a3b2651941f8bf06e233b88ee623fae346de7ff086d1fc70f26f7fe9abed994501456e13b876d8f1d37dd5f678ebf41918a3b9021ea3476c2a07a82a1289
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/ngircd/metadata.xml b/acct-group/ngircd/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-group/ngircd/metadata.xml
+++ b/acct-group/ngircd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/nofiles/Manifest b/acct-group/nofiles/Manifest
index 6763206c2f8a..bd0b469b7fcc 100644
--- a/acct-group/nofiles/Manifest
+++ b/acct-group/nofiles/Manifest
@@ -1,2 +1,2 @@
 EBUILD nofiles-0-r1.ebuild 151 BLAKE2B eef47639de66651b0df1b4832fbfcba730ebbcac4e8377fbe99bda10db4c5a70f7389ee45d79fde4a248e904089e4f1a35014164de2379d1c5ca8a5cfc76bbe6 SHA512 9f57107eb29783f8fe30a8c9781ba335b786c602188a65538132044ccee6f7c96db5d833edc439cf6acd605c85de467e0570a86ac95f7e549efd53d491cc8153
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-group/nofiles/metadata.xml b/acct-group/nofiles/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-group/nofiles/metadata.xml
+++ b/acct-group/nofiles/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/oidentd/Manifest b/acct-group/oidentd/Manifest
index 93501106d83e..4948b65c1879 100644
--- a/acct-group/oidentd/Manifest
+++ b/acct-group/oidentd/Manifest
@@ -1,2 +1,2 @@
 EBUILD oidentd-0-r1.ebuild 151 BLAKE2B f69fab1ece33dca539758678aba81ecdc631ea2485b18c195a4553094bc8b9d97a8067ca263fec520b2ee4e63584bb9f4ea3f2cc52e8f481662a14e9fb9c9281 SHA512 d7e9fc7d5a3220945acbd9aba79eaa1d2c53c09d73d9c3b6c8fe65ff4737b9f078f3123a9580e3f7507a87e26c102a53ffc6659e17c12ba397110ed922a2a1c1
-MISC metadata.xml 362 BLAKE2B c595722a66e2791f5bd9aa268d8668e3e46c8e6d44c9878c2d4e4e013c9a3866336a52aa0faf5cb3bfd60fafea4b8c8bc20bd43102f66cc1ff97e7547ed44bc7 SHA512 e0ac18808a4e07750a5015cdbdef7883b750565058b94fdedd3b45189b3b0daeb593c31daf21a0d58a539d61f7e2116cb1ed1847c46fbca6e11751f57ae16bf6
+MISC metadata.xml 392 BLAKE2B 25b4dcca5d1a6686da9b4b3912829406c1f3c8e105ca1791a8fd295c05f1c5354c90e4bb1c361a4e05ba773473e7f0b88416d31c3865a251fae25b7712cf38d5 SHA512 97a890df289b97fe86cd18b7a154c1357455ce5ad0d7fd0acf855b6c981db40c6c5e00fc26184175df83a4a303ed119889755c88ea204e1ee21f6fcd7fbf2a60
diff --git a/acct-group/oidentd/metadata.xml b/acct-group/oidentd/metadata.xml
index cb9c34b1836a..ea088a99f737 100644
--- a/acct-group/oidentd/metadata.xml
+++ b/acct-group/oidentd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/opendkim/Manifest b/acct-group/opendkim/Manifest
index ce288784f926..5cd9e1b24f50 100644
--- a/acct-group/opendkim/Manifest
+++ b/acct-group/opendkim/Manifest
@@ -1,2 +1,2 @@
 EBUILD opendkim-0-r1.ebuild 184 BLAKE2B 6a3beb733dc0857ffef956d53155ea84f820ef385723fc49cd8291200413fd67ac661bdd08495f819e9e0010ff0669f8dff99d5c909be78dc4d13c04603e14f3 SHA512 d3d6b2d77ada1983b4c76f352cb50a7d5538b0c6e47b6729b5c1b35f638df7d9d9ce33ea99f9a4c8fe21ad316b0d71aa4014e4063b524911088378b4b9481193
-MISC metadata.xml 355 BLAKE2B 5e3838161d4f925e539a0f45d59ffcf03a1ad78f0ca3febe415b3ee1a4308038af6b0912efbdba4d0cadde5bc68dbb0cdbe48f9cb9733454f28771a4a657c5cc SHA512 c3929342f23009641741f498ec0f5c6931b9f964f871b94722c872a5bbf0a15800f9c79e8186b021f2455980efa02996c37d42da1777daae4bac2e1abf6f8087
+MISC metadata.xml 369 BLAKE2B 86f3d2b74fcb82851a0595375c90f5f78da0117789fbfe1fee61f760d58f687b256f596fdc7dec55397b93126646e5014765c440283535e5365ed61ca6233e72 SHA512 c62399a73c5ebb7c6b346ba6a993c9999286975080e88b74e082097ddf270e556b9470ffb6156fa25c7fbedbb9a5d1d3bb70b73fcc289166e31e2b9c6de11359
diff --git a/acct-group/opendkim/metadata.xml b/acct-group/opendkim/metadata.xml
index 49274655a860..1f6b32b95fd1 100644
--- a/acct-group/opendkim/metadata.xml
+++ b/acct-group/opendkim/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/acct-group/openntpd/Manifest b/acct-group/openntpd/Manifest
index 49dfd6b7269c..a8117d0e9a76 100644
--- a/acct-group/openntpd/Manifest
+++ b/acct-group/openntpd/Manifest
@@ -1,2 +1,2 @@
 EBUILD openntpd-0-r1.ebuild 151 BLAKE2B b1acb5b39795218e081cb5f75c2c5a4acae8937bbf11a826a2f874facaee03c5da5ea7fc05c3d4eb3339f6542b497df90d6cf30200f9b542134982ea16507080 SHA512 4ddf4bba82f52e88d8bf87e32f513bddecca9380a517ca7568dfcbff3f3b6d0a1ce2c582133f5fe628e06ccf3c46df6c5fb7a8f4868812e1ccf92c701e4cb058
-MISC metadata.xml 361 BLAKE2B e87dd9324a648e9653e2c9765fce14c381f62e6a0a1ff8a37fba42ed632e3e6b97e3e6ca6b63d72cae77009318d37e2eaf767c072cc378e4304ac79eaee29b8a SHA512 62cbe01f116c560b2c2f5ac9419d8de3c262291cc3a12b529ffc71fd366de0bb1911e5564bd55cb6cbdf9d5548ebe0415c5ed0d5048c5883be17e00554ac33f6
+MISC metadata.xml 391 BLAKE2B 3a5a0425b282fb3bf482c2324a94d313b32ac75c71d8330b6273f768b07b6ae9fe6f3b92e0cc465b1a165e5db7bf7c678f8ceec5805707d53b4677197a43318c SHA512 fd2d57f454b548f2ebac2562fcdb70e76cd608694d7b80e68f8cc05a17c5b24cd84dec14e4cb1b745b0f8b2b6072d06f5bd7d16626a136c84f6c708f2e6155f0
diff --git a/acct-group/openntpd/metadata.xml b/acct-group/openntpd/metadata.xml
index 9c1fc34df050..40f8a7a4302e 100644
--- a/acct-group/openntpd/metadata.xml
+++ b/acct-group/openntpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/oprofile/Manifest b/acct-group/oprofile/Manifest
index e8534ee821a7..832c2143b75a 100644
--- a/acct-group/oprofile/Manifest
+++ b/acct-group/oprofile/Manifest
@@ -1,2 +1,2 @@
 EBUILD oprofile-0-r1.ebuild 210 BLAKE2B 19b343756bbf2af8e1cdc84be3ad8ae55ba3c64a8977184ceba51b54adf4e9050ea8eb6a1591ddbdc3077e13406243979a131a9e365846fff31223dadbded15b SHA512 51b4d81b6571d39e031d7a82868689fdcd80585093be51ba194abd04a20888dce328916063b5a63691d697184890f4470b64486ba16dbdb291017d0f9c16a6b1
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-group/oprofile/metadata.xml b/acct-group/oprofile/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-group/oprofile/metadata.xml
+++ b/acct-group/oprofile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-group/oragono/Manifest b/acct-group/oragono/Manifest
index 0b6be75d9329..555a6f6e22c2 100644
--- a/acct-group/oragono/Manifest
+++ b/acct-group/oragono/Manifest
@@ -1,2 +1,2 @@
 EBUILD oragono-0.ebuild 193 BLAKE2B 7cd01162fcb1ea4ccd306c59673d5b57590e927fd4fcdb0c44f661d34e90ef9963fcc165e6de3fff6927e497fefcdec438e1917aa198d54c44d06a92b1367cc0 SHA512 69e4c35c16e84ef70c76b27d1acc5594e54cad60494ffe99902bae0d0b72f6d3d83fd4eaeea71cd32a97dfb17037b5c1b8b5c9614e204b182b36d45b24ccb6b1
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/oragono/metadata.xml b/acct-group/oragono/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-group/oragono/metadata.xml
+++ b/acct-group/oragono/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/ossec/Manifest b/acct-group/ossec/Manifest
index f2832889af8e..39942b05e9b9 100644
--- a/acct-group/ossec/Manifest
+++ b/acct-group/ossec/Manifest
@@ -1,2 +1,2 @@
 EBUILD ossec-0-r1.ebuild 194 BLAKE2B 6217c683976cb8cc6f5618949736bbbd97f1bf1d097dc24154f3bddc2882227fe933c7dfff2bbbce60f092429c09984862e9dd9e004c125d2067ebde04290f84 SHA512 60e12f1b6663eeb3bb1d489aa95122f0ac8fe099f3077b3de6a012374e3e8e2176ac254751c30b00081a98976291da37ea1a78fc0a3d3622f84e2fae79922707
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-group/ossec/metadata.xml b/acct-group/ossec/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-group/ossec/metadata.xml
+++ b/acct-group/ossec/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/p2p/Manifest b/acct-group/p2p/Manifest
index f5b1fa8590af..59641083f1ae 100644
--- a/acct-group/p2p/Manifest
+++ b/acct-group/p2p/Manifest
@@ -1,2 +1,2 @@
 EBUILD p2p-0.ebuild 184 BLAKE2B bb96c33604a99f1d9ab0fe05b5a8d2d7d4fea24f50d39216eed1c6f2347dc77df60cbd0c097903231bb2f74c49caaf76147cc5e2797711d16004465a2308e597 SHA512 eabb93c889280cf9e48bf67366425dd74774497407d545ade7f95b8181a5f5a574228656d65dfc4961681ef4a1d9c9c49dfeb59d9a2e3305ba4cb8d02b9bc91f
-MISC metadata.xml 376 BLAKE2B 4d4ed08207626087fa81075957fe588de18b3cae28f2ba0e75412a71fb33ffeb7663f8c95ba54b0e8b82d8a75a961f97800b12a8bc5fa915e9e06e945b5f02b9 SHA512 74f6d8e311722a1b609cf6f9fbbeea942f423acff1b52e6f23a84f3f6ebb68c958f59f7f242724f1eb1c334f43cc77abfffacfc88145050b15d7c37c1e6d1e10
+MISC metadata.xml 406 BLAKE2B 9f091e31a13974b357cb9e9d96356226a9cb1a45165f270e2ca8aa9c66d4880e3f15ff67eed42de02a4c899fcbfacd189b0efba024c5faeef03a8d84b7ab1075 SHA512 090d987666a219434572fe92d06023fedcbbadf1066256c0c492136b47d384a338b8f4526cf6fd5f81bd0cdb7549b5274bf24793d331b5ed7d18f4a5f879823e
diff --git a/acct-group/p2p/metadata.xml b/acct-group/p2p/metadata.xml
index d4b2e3c17a9b..1f79b429358a 100644
--- a/acct-group/p2p/metadata.xml
+++ b/acct-group/p2p/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@chuso.net</email>
     <name>Jesus Perez Rey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/plex/Manifest b/acct-group/plex/Manifest
index e9ffb6bbfcf6..567ed9712615 100644
--- a/acct-group/plex/Manifest
+++ b/acct-group/plex/Manifest
@@ -1,2 +1,2 @@
 EBUILD plex-0-r1.ebuild 189 BLAKE2B e86ad24b0cdbeba3d1590d737bf1e22cd2c56e1b13d9754400b68990e28f048bd96ccd11d41942aeb5086e470d84b175c7716099de52d6cf993129ce9fcddbcf SHA512 64677da0c0cb9124e1f49ae6fa19e48486a4310005172c7c52ef30bf0740a445cc7c2f01852556c3d5b05cf1c71bf2f42ea5a0aef29991cb8c39365befe73efd
-MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
+MISC metadata.xml 397 BLAKE2B 18df486062b78ec7dfbdf68a3a2614ac861172e37c6ef47830422b1e3245404e574fe99487f0d69c34cc7bfbf7ac29db856329a268b030f3fc4a42fa2f034f53 SHA512 be52f46cf47c50a65869ab23e0fcd323c459ea79250b7c83800fa0b0dab2d11f24f649c875bc857a5bd28edc80ddc0ff11b4bc94057f65fa64827d6eeea9d16c
diff --git a/acct-group/plex/metadata.xml b/acct-group/plex/metadata.xml
index 8815e575c0e3..14af8f2a1b18 100644
--- a/acct-group/plex/metadata.xml
+++ b/acct-group/plex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ss23@ss23.geek.nz</email>
 		<name>Stephen Shkardoon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/postgrey/Manifest b/acct-group/postgrey/Manifest
index 0b89e1355ea7..8b36c64f04e9 100644
--- a/acct-group/postgrey/Manifest
+++ b/acct-group/postgrey/Manifest
@@ -1,2 +1,2 @@
 EBUILD postgrey-0.ebuild 195 BLAKE2B 7c4891d6c23b7936a72cbfeed40599a3656ca66a3a7c5ad3682153cf43fe52ad9db9be4a4026b91f83c9741f78219c40b499df139917b9d30fa717cf36d22f44 SHA512 1ef8b03c9c7b38cb11f85ebb08bdbb5e749aea13258ee1d9d99c73685859a81f2167d02ccb5ab1f34eb2d50a9238ddb082f5f76996399a3ddd03be456e19b9b7
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/postgrey/metadata.xml b/acct-group/postgrey/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-group/postgrey/metadata.xml
+++ b/acct-group/postgrey/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/privoxy/Manifest b/acct-group/privoxy/Manifest
index 2798c00e58c2..7ed54cc8c451 100644
--- a/acct-group/privoxy/Manifest
+++ b/acct-group/privoxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD privoxy-0-r1.ebuild 204 BLAKE2B 64de3e3733a663bfe5c6a2e7143c5f3d04a0e909926b99d2cbe4b2d00a583a4af4d4732e1d8b1611acd7fd048620758f073d676b7c4a3c1eea7ff94e2cddafe2 SHA512 5028c425b6acb601096ab1acc100b638a81f71bd12b5431758364ea211b5e458cad67293816e8155fe388c6af2841f45a0f2fc7ac69c401e7eb0436de69fd595
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-group/privoxy/metadata.xml b/acct-group/privoxy/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-group/privoxy/metadata.xml
+++ b/acct-group/privoxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-group/pulse-access/Manifest b/acct-group/pulse-access/Manifest
index 36839938699d..ce85d809085d 100644
--- a/acct-group/pulse-access/Manifest
+++ b/acct-group/pulse-access/Manifest
@@ -1,2 +1,2 @@
 EBUILD pulse-access-0.ebuild 151 BLAKE2B acafaf537e4f681967f2844146f98640a66ec78748178ef21a60f8d20ed81761fb526ee55fe75919fb608b7b9f52a82a5bdc8d2f7d4f3e5472c8b77ccef90a1d SHA512 acd9f99ab41aeacdabeced2eb860d21223d1fc87c4ad63ae300261d8b75ab392e96c87a88d02abbfa604e777feec9479d8457c6892894057e6155a5cce7c39f2
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/pulse-access/metadata.xml b/acct-group/pulse-access/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/pulse-access/metadata.xml
+++ b/acct-group/pulse-access/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/pulse/Manifest b/acct-group/pulse/Manifest
index af2dacb96632..fbfdcea23905 100644
--- a/acct-group/pulse/Manifest
+++ b/acct-group/pulse/Manifest
@@ -1,2 +1,2 @@
 EBUILD pulse-0.ebuild 151 BLAKE2B 608cb62b89a61e237617b5fe742c5f3407dc0363ef6154115b155468cca648ed07211479ea1092da16b247131e37ae9d2115e7892f855ec155e9d52251ecc56f SHA512 d8e117f912a87621646e38277405bb13bf0a92cf23d178dde990f0fdfb1c43f7263e9ede5cbd241520cf1410250dabc1b3515ecd9edf5c139468fcd925d4177d
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/pulse/metadata.xml b/acct-group/pulse/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-group/pulse/metadata.xml
+++ b/acct-group/pulse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-group/qmail/Manifest b/acct-group/qmail/Manifest
index 623e5be6d371..ea9dc2d12c9c 100644
--- a/acct-group/qmail/Manifest
+++ b/acct-group/qmail/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmail-0-r1.ebuild 151 BLAKE2B c2ed534c65c644e3956200ea297ce767210c53aa751a8c2e7b324e84ecb02ca5f26a19fd16b612ea3c55529fd0cb8af41617c40231440a99704d2adba0a9f341 SHA512 50add0e6670ca64b3491956be8e792e44449cfa02f0ab330a1f353151a58cc71d7257e04e304d374916a28e63ff85b264af7126cfbe569756ec972f96d683169
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-group/qmail/metadata.xml b/acct-group/qmail/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-group/qmail/metadata.xml
+++ b/acct-group/qmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/radius/Manifest b/acct-group/radius/Manifest
index 698a2cb21c0d..8fa016ab7c8e 100644
--- a/acct-group/radius/Manifest
+++ b/acct-group/radius/Manifest
@@ -1,2 +1,2 @@
 EBUILD radius-0-r1.ebuild 189 BLAKE2B 4e65282da73dd41a44294456141015d186c85adc5b5a9dae7c7058869a4d79afdc5a7b52e8b2ae2484ab669fcad954954c98ae81d331d21bef05d69e4538cfe5 SHA512 1b2e8e1ea7d9c708dd4a490aa5c1a9f9e7ea0a0d2dd658b6ba8882a246ab7fbf4d937f797bc843712842e722776ff0d4ba4d1d964a857a335ac30e174ea5f628
-MISC metadata.xml 364 BLAKE2B 86532d92dd0d8a219a2ab741ce27bfaf6ed29ec37aef0b3785c8b5bc30c3a460c8350909fb2d0d374cbf8f4f1c464a1363f9dcd1b6c526126f187196a424d8ef SHA512 4f57e81d788a73c51e4d8885d8ccdc0ddf6fcd480c41225a6f1042c949781c0872381fd975474521ad6c569b96a6e8ef7bbf71f75bddab41bd7c5b6797a472f5
+MISC metadata.xml 394 BLAKE2B dcd68c80608ba068d7fd48645f3485b79a0af88b7601e2101bd04b8a7bb8ef1120b4d5e1c602738d2e7cb3dd72cfd4887c3e198bed7b7911b02a8dd00cd22f94 SHA512 c688feeee5b067c1b5cfc805b5a60ecc6742015b7a0129e21435b7d948aeacaceec291123a02f12ab80ff1e90f46de128c40ef835c4804af7ecd9c2a584a8cf3
diff --git a/acct-group/radius/metadata.xml b/acct-group/radius/metadata.xml
index 3a673c3423b9..6f3b3cfdf2a6 100644
--- a/acct-group/radius/metadata.xml
+++ b/acct-group/radius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>geaaru@gmail.com</email>
 		<name>Daniele Rondina</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/redmine/Manifest b/acct-group/redmine/Manifest
index f76b93b2c60f..4aeab78c41a4 100644
--- a/acct-group/redmine/Manifest
+++ b/acct-group/redmine/Manifest
@@ -1,2 +1,2 @@
 EBUILD redmine-0-r1.ebuild 151 BLAKE2B 0300c2ef1a4c3659951455937a831f0f62330c9d77135bc2e41f04bbb636695d0adbedb606d96da3092d3adeb8850a80b186db9d5c7eb60718de20cbc624bca8 SHA512 bcf8ac5f65bf52d4af62dbc0044db1c510bc36f80a019dbf7d021216602c195bf365969408d2545bf0547099ee0d36cd97198b18c7ec04399c66e2dae4585684
-MISC metadata.xml 388 BLAKE2B c4aec9163f791cde8ed0bd5f43b924018418931d9f3ba17b6026983b103f1e8fc637066a481dc3f4cccee217d3993e4514084d123c1d98220d6b7d0cbeb555eb SHA512 ebf4f066a28f34e61201fca70e4f08baf24f495096341f804b4d16671d3149d72969d9a138dd3d1003893cd2584a0b66d06d055b4552e206ed4a114e66964f4f
+MISC metadata.xml 418 BLAKE2B 0b47863e2537842f8660a4ae29f79b9fa9dafd4906166591b8e8dacdd414644f572bf296d70cf0fd2d9c753c46978d5a30cb01bdba399187fc849d1576004c54 SHA512 23d6dc8795420c54fe9f39e196cccef0d712b82e75e85bf2ad61b97651c578924cda628ac48b78057f3d51f892a96e5eba3317e9ef123e9f3fa6e5394d82c422
diff --git a/acct-group/redmine/metadata.xml b/acct-group/redmine/metadata.xml
index 3ed2aa9f8eb4..01b8c16fae43 100644
--- a/acct-group/redmine/metadata.xml
+++ b/acct-group/redmine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/rspamd/Manifest b/acct-group/rspamd/Manifest
index b00ceaf330bb..1e0b192ee439 100644
--- a/acct-group/rspamd/Manifest
+++ b/acct-group/rspamd/Manifest
@@ -1,2 +1,2 @@
 EBUILD rspamd-0-r1.ebuild 212 BLAKE2B a978ee58d3930ccd3e8202e423289d0bc1a0cc7643fe180ffb11bfa09f062e8148dd49294502bea10f16245ff94ed0f0dcc81c7d73c8a74113089699a68b67e2 SHA512 4d18a1fd8dc429fe53111a3e8999c7fbef08b0725b6a2d72658bfbc1c24e210741beb95618f65999d4225a33c12e78f19fe71c6bf1f483bd9675c60fc5f1782c
-MISC metadata.xml 488 BLAKE2B d45e11d739abbaebb48c1ffc7652d63542e9b24d91f48292f6a6bb1f20e22ebc584b3ae98dcb58200d7bc5141e386e09897e89b19eec8c38d2a392c5caaac21c SHA512 bedae71b1c6ef0113bc2155f1839deb20a0519ef650358fdec0d7f9f3feae08265a15a031e60958ab04a87ba8c0c49e49ba819fc6035cbc1b7827694d34607e8
+MISC metadata.xml 518 BLAKE2B 85da66ea551dadaadd843606e9dae1cce5ba653e13e03d340ef3ceeab20e14a53228f8b52790fa5cd2cf0a1585b31d1c243118e7509bf7f3d1c83eeaa94202f5 SHA512 e718730ff116d305e0348cb6d3c22bb6ae702d6ba4eac162edbe4ff8ae628ca48a7a4691b488a96531b344281d1f1eb0678bc1a652f09130187fd62a33c5e8a8
diff --git a/acct-group/rspamd/metadata.xml b/acct-group/rspamd/metadata.xml
index ea7ff6741e1a..fddcd31e1a17 100644
--- a/acct-group/rspamd/metadata.xml
+++ b/acct-group/rspamd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c@roessner.co</email>
     <name>Christian Roessner</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/sagan/Manifest b/acct-group/sagan/Manifest
index fbd85332da8c..f86a6b452e94 100644
--- a/acct-group/sagan/Manifest
+++ b/acct-group/sagan/Manifest
@@ -1,2 +1,2 @@
 EBUILD sagan-0.ebuild 202 BLAKE2B 95fca63863e259cfe774bbb45fb941bd56206cb03944936606dff39c7c2405094a878ac5f67cec7baadb3abaa925bf2c13a785ae8b18d5efd4c12ae4c08a6efd SHA512 b7335d23cb10c9b2aac3918d182dac714f53f4ff334c38fd4ce1efa21f655ee41114797908fea06cc161249cbd3883c43db70e5189bce6547886e5ab0837c2d3
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/sagan/metadata.xml b/acct-group/sagan/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/acct-group/sagan/metadata.xml
+++ b/acct-group/sagan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/acct-group/scponly/Manifest b/acct-group/scponly/Manifest
index bf14dfb94eeb..63ab67439250 100644
--- a/acct-group/scponly/Manifest
+++ b/acct-group/scponly/Manifest
@@ -1,2 +1,2 @@
 EBUILD scponly-0-r1.ebuild 183 BLAKE2B 2c995e1a0a49fde7a703114e93377661507410782cdd36320cbe0fae473586adb79177895ec4d7e1a98b7640474636730d913bfe954a5db9cd49c17d9fb72029 SHA512 2900acb88e2e188cefd370a767b8a9372e50464e8fb4fe14d85a8161a321f489c71014680c7a54d9de47f3743515ea0bb736ffbd8de86288623c675e7342deae
-MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5
+MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/acct-group/scponly/metadata.xml b/acct-group/scponly/metadata.xml
index 16853472f6b4..d095ed4b8f81 100644
--- a/acct-group/scponly/metadata.xml
+++ b/acct-group/scponly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/serf/Manifest b/acct-group/serf/Manifest
new file mode 100644
index 000000000000..7e7338a4ec8c
--- /dev/null
+++ b/acct-group/serf/Manifest
@@ -0,0 +1,2 @@
+EBUILD serf-0.ebuild 195 BLAKE2B c16596e3e4fc2c359d0ef88e26aef34f44c759f64f0662212223e4e2f72cdd33d2cc5c387513469a386a89b2a208bdef0bb6ff52bb5491e2d1cb9b99fee039a5 SHA512 7379a298931d34356efcafe8f9227413937de82ff1e6ce32e5f51470c214c2917f2e8d1ef17e8a45a1d6685c306757216ae24093f786acf7b4005c8ec1c44346
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-group/serf/metadata.xml b/acct-group/serf/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-group/serf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/serf/serf-0.ebuild b/acct-group/serf/serf-0.ebuild
new file mode 100644
index 000000000000..00c3f9c40c85
--- /dev/null
+++ b/acct-group/serf/serf-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/sigh/Manifest b/acct-group/sigh/Manifest
index 4d74cf1877dc..b770e36ccfc9 100644
--- a/acct-group/sigh/Manifest
+++ b/acct-group/sigh/Manifest
@@ -1,2 +1,2 @@
 EBUILD sigh-0.ebuild 151 BLAKE2B 0ab7e99af571ef263ead1dd322a5f80f798927fc6551f30d39b7b428369f3688ceb5997a4d303430c027cbfbf101278741cc458a40f03f66078781ef84e21b55 SHA512 84f012812b0f710d47dd84d73ce0da3072ec6178eb5fa44518672bf52e1eac5446853c18c65baf3ff76cc80714753516da2cd85f3dd89b7a95c5a3cebd20993d
-MISC metadata.xml 475 BLAKE2B 8bb668e126092bcf18ba8f3577861ddca556b2811771e9a3e6ae94ba5e548862c003e41f41afdb819c97f5ab25d37ee6ba165ceb71c1fefc96257c43a586a578 SHA512 e73ced717171aaab22791b3f44e4bcb8d580e3ed6f529a7992eb7d73c390aba57f0893ed9724bc8d3a1089111445eb1d148c5808b6a2658a25377769977c0efd
+MISC metadata.xml 505 BLAKE2B 74f6dd63edd85af462b3fd9da502b610cc7a2ea379521561bc2df23d37ea21b2cc00ea8dadc8bf115f54065ee6cf8188e44cfe8ce4f5ae0bd245adcd0104bdbe SHA512 db41c6d8bd242d187f1d3994c40e913755a56f39625ced7b54745d87324006392becb8eaaa80d0cfa1c5f6d5b0738c97b15a2b790ab7f4a3ac34230565f16489
diff --git a/acct-group/sigh/metadata.xml b/acct-group/sigh/metadata.xml
index 53320bd15cf7..758292245aa4 100644
--- a/acct-group/sigh/metadata.xml
+++ b/acct-group/sigh/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c@roessner.co</email>
 		<name>Christian Roessner</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/sks/Manifest b/acct-group/sks/Manifest
index e52b00c005da..5e4d0250809a 100644
--- a/acct-group/sks/Manifest
+++ b/acct-group/sks/Manifest
@@ -1,2 +1,2 @@
 EBUILD sks-0.ebuild 192 BLAKE2B cde6513c6f7e065059acc3a29b9f755e39c2de842503109a0a71e4b54e991ba0ba6ee851008b25f58a1addcb183b08b80a346577b5e624341f6d414dd1391a61 SHA512 0488ed39591f3e880616d7fdb1cf052cc456d0131ed9c45c9cf942ebe30fa88e373f89b3847811a51ceb1870f068e21239e661713f9066b73838de3236487a8c
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/sks/metadata.xml b/acct-group/sks/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/acct-group/sks/metadata.xml
+++ b/acct-group/sks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/acct-group/snapserver/Manifest b/acct-group/snapserver/Manifest
index 19fab025c402..dd75a52abbb1 100644
--- a/acct-group/snapserver/Manifest
+++ b/acct-group/snapserver/Manifest
@@ -1,2 +1,2 @@
 EBUILD snapserver-0.ebuild 198 BLAKE2B 1028bd8dccb6520b37a1de03b2ed964cd7d7f4e7a3aa456ff03af0048c00c4e03814b0cdf79185157e4fc8941276ff46dd9e96ef4f363a7cbb82f512efaacb50 SHA512 eb6169e1a13c0bf7f922d643e2c14c847f790c813602df99358a2b176c75f9cfad68de671cc876bb4099474ce1a44a0fb522659181f06767cf80ddbbff1a6b45
-MISC metadata.xml 368 BLAKE2B f639ed96e35633add84d10523a52912185c7e4a49fcc9564c1f3a2a6378408b026b2a20512a6e6d108f609da0b95afc4cb92776f468ac210627a301d7a2a472f SHA512 ff8acc6235de2a08461210d242742a7289ee267e31fb4258a304372658b9b8ce76bbff622917627a84c16faaec025ca28298a99e6ffc49be240844fb467e27ea
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/acct-group/snapserver/metadata.xml b/acct-group/snapserver/metadata.xml
index bad50768efad..6d821181d635 100644
--- a/acct-group/snapserver/metadata.xml
+++ b/acct-group/snapserver/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/sniproxy/Manifest b/acct-group/sniproxy/Manifest
index 094a6a0a54ff..1b52d30c746c 100644
--- a/acct-group/sniproxy/Manifest
+++ b/acct-group/sniproxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD sniproxy-0.ebuild 151 BLAKE2B 35f8c5e3a14bf946acda2a2a4ad7b640b7038c5fb230fdcb41ece3b715b0813f8aa6d005969fe65f4b536df8df21a590884c229787bef3c1868aca331c1bc562 SHA512 bb8db76e5d95374e5549757bb7931c1f154f01f82fb61c816f0877813ea420b292ad80678c787abfd07221ce268e0ca9485bf7197897e5fc2385ebdbd35373fe
-MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
+MISC metadata.xml 405 BLAKE2B 707ae1db24849c15055554e5411e9eef759457fd605d42c9f487f02ad0649538fc1531b11219f88a12b2ec6f6ce9291e7a0ed26ed492740274cb68d3edd4c69b SHA512 8d1ffeabe9690928422089e31eba7b94bb5f0b8e07a94de043def0d7543c97291cc9892d6a594089fba4eca2b382334c84acac34b7f4815b69d8b3ada9b84d15
diff --git a/acct-group/sniproxy/metadata.xml b/acct-group/sniproxy/metadata.xml
index 89aeeb96e865..01b903b2b23b 100644
--- a/acct-group/sniproxy/metadata.xml
+++ b/acct-group/sniproxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/sobexsrv/Manifest b/acct-group/sobexsrv/Manifest
index d8ee03e4a5c2..09b8b9171006 100644
--- a/acct-group/sobexsrv/Manifest
+++ b/acct-group/sobexsrv/Manifest
@@ -1,2 +1,2 @@
 EBUILD sobexsrv-0.ebuild 203 BLAKE2B 5218b235c505dddcd3c99916f21bbe46963d968312e44d128502fe9fbac8648eef109c4f11832beed6335bff50c691e4abefd942bcffa1ecf10a339acc59189a SHA512 285a5dbe6b3bd07b543445c3b3319e386c3526deba245006f18005e2d2a0d4e57928fb299de2ebabc1345c14845192be3b9c76e94b8ab94384cf8091b15050fc
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-group/sobexsrv/metadata.xml b/acct-group/sobexsrv/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-group/sobexsrv/metadata.xml
+++ b/acct-group/sobexsrv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-group/spamd/Manifest b/acct-group/spamd/Manifest
index 6bb90f8508e2..ea5dbfd9388f 100644
--- a/acct-group/spamd/Manifest
+++ b/acct-group/spamd/Manifest
@@ -1,2 +1,2 @@
 EBUILD spamd-0-r1.ebuild 199 BLAKE2B 0093025869e6c67b61727b0eb7019227598de142f0e1fa21bf51c86acea15f2abecdf2816f392d9dfe4aa10ba06b65345890c24013a478ca3161561e2338de36 SHA512 03532b212f3dc3058e811df44c45e69adce3753beaf40ac96281aa2879105bf18b855f2bc3659d509c2e4ff3bb56f24d8f8900696f897306c2afbc45e6b54e80
-MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
+MISC metadata.xml 430 BLAKE2B fce5e2158fca2765f87a39552d6ee89f017d98079ccf891d3d8505ed002c834596c53349a3d30effff771542ecc6b16cc328fc8cb9baefc0d03318cedf22b4a7 SHA512 db7a13772be3c3fe688d5f2e962efc554f60d2059cbb2ec392012dc9a0dd8dd553b5deba6ce784f9a96543b1ccb99323b26a168e73885401fa7477acfc07abfe
diff --git a/acct-group/spamd/metadata.xml b/acct-group/spamd/metadata.xml
index 265493eecbee..ea85f6051a4a 100644
--- a/acct-group/spamd/metadata.xml
+++ b/acct-group/spamd/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">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/sqlgrey/Manifest b/acct-group/sqlgrey/Manifest
index 9d620dc5106c..5c95e0bd104b 100644
--- a/acct-group/sqlgrey/Manifest
+++ b/acct-group/sqlgrey/Manifest
@@ -1,2 +1,2 @@
 EBUILD sqlgrey-0-r1.ebuild 183 BLAKE2B 09078308be11e29fceccd07fc3925c9e678ea3166928a0f63154a8833aa6a9afce3498a9803d0afc335d2c3f3a93111776fe76a292987f9b904e91e5932846ae SHA512 a4bec61f6bfe1494b2a46c4a9853875fa0549f2ec7f214a6962274e079cc603c87ac9105248adbf0f255b912c57000231e0e223625db6aff2f33b309379f6244
-MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
+MISC metadata.xml 430 BLAKE2B fce5e2158fca2765f87a39552d6ee89f017d98079ccf891d3d8505ed002c834596c53349a3d30effff771542ecc6b16cc328fc8cb9baefc0d03318cedf22b4a7 SHA512 db7a13772be3c3fe688d5f2e962efc554f60d2059cbb2ec392012dc9a0dd8dd553b5deba6ce784f9a96543b1ccb99323b26a168e73885401fa7477acfc07abfe
diff --git a/acct-group/sqlgrey/metadata.xml b/acct-group/sqlgrey/metadata.xml
index 265493eecbee..ea85f6051a4a 100644
--- a/acct-group/sqlgrey/metadata.xml
+++ b/acct-group/sqlgrey/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">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-group/tox/Manifest b/acct-group/tox/Manifest
index 782347294a7c..4789293bd694 100644
--- a/acct-group/tox/Manifest
+++ b/acct-group/tox/Manifest
@@ -1,2 +1,2 @@
 EBUILD tox-0-r1.ebuild 250 BLAKE2B b69c209571bcb7fc76376f409e85e5a4bf596d58b4e45ebf9b901a1905ba315b1334615efc3845d77f65870a90702b127eb4ab0b92ea032c4e770f867f928782 SHA512 0f448b925bfebf2b9a0d5432e58eeabe5d2eee67b9aae14f40fad889d422744fb99f21421af28a0c45219adeef9937cbd970899ee9f72371960bc7081b82010d
-MISC metadata.xml 370 BLAKE2B 8c3531d559fceef9b381b26f8ede241e5960d25121c4902d7da59e39b523d0f1aaf30c994e1def9dd48aa1e44cee5a850106d0588098a7ad474802839619caed SHA512 04014cf50db44890bd3d881fea0fe5d1e16144b71a44f15e01158311fa4b2dd4ee2cd43acc5ae0dbf93dca845245486a6dd294d8a0bcec14cbb4be9cfd5fcd41
+MISC metadata.xml 400 BLAKE2B cde9f8539a59f9e7336b4fb593e30efc494db93dc529f684a1d0982d32cb11795306647e2e15e29118a9b0bee4cf78e7b5239fd5543504c2e0aeea4556bb40d7 SHA512 5b5ec49dea9bef75c42b07215f65b82d9efb889e4713ffba5bb827cd0b9bdbe60831008c1e2790f5f64fac31a6920dcb85d160bea6685ead1cd463403dc72092
diff --git a/acct-group/tox/metadata.xml b/acct-group/tox/metadata.xml
index 5dbf5facde30..c07bc073ffb2 100644
--- a/acct-group/tox/metadata.xml
+++ b/acct-group/tox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>JoMull01@protonmail.com</email>
 		<name>Josiah Mullins</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/tss/Manifest b/acct-group/tss/Manifest
index c3c96b8dac7e..f9ae475b5514 100644
--- a/acct-group/tss/Manifest
+++ b/acct-group/tss/Manifest
@@ -1,2 +1,2 @@
 EBUILD tss-0-r1.ebuild 202 BLAKE2B a04de6601efb2ee966caadd3e4c5f6897dde07d40d6995cd5b3475d21e37bf62a3fdf4524fd93285ee2b0aefc40dc38adc282d20251c48ceb1a1f600b88a9b86 SHA512 0038f0b3f1d8d83d7d2791eef108f9c92f1fe544c25e1b04a135e22b6082a8f026a6cca5c9ac0bbb90b80b4b592f19d773135d064e2d1c17eb186a6f2cab2ef8
-MISC metadata.xml 369 BLAKE2B e7affa4e434355a712d790a03359cba38108553f0d1d6396db9065cad0d1371b28a012318acdee7151ea7565711e69abcbff4382cd0cf3ba1e45c5bcb86867f0 SHA512 b702fac9869c93144ca55d12cdf33c947694ad26a03912f8e5428c7b70d43cea6d64331c03eb59c48622d03358a1d718a9ea8061398ba7b00fdb7b7c4711928c
+MISC metadata.xml 399 BLAKE2B d3c2e40efe608d0831d27d53513a7d32564f16af81293284d17c5620f6be10ad4d2cb7192ff7eac4e7a3e64570e0a12c753b04e6d356e203b9081efca779169c SHA512 cef8835ec1f1c5fec60891f10807ab9687078b75380da019142fd02b878db4e73928155749ed9c7128f57ea907814f81d14e0340c79f4719b0b56b8b77bbe45d
diff --git a/acct-group/tss/metadata.xml b/acct-group/tss/metadata.xml
index 52d5228a45d4..f2b95e147157 100644
--- a/acct-group/tss/metadata.xml
+++ b/acct-group/tss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/ttrssd/Manifest b/acct-group/ttrssd/Manifest
index b90db7ce9ab6..a840a5ffea94 100644
--- a/acct-group/ttrssd/Manifest
+++ b/acct-group/ttrssd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ttrssd-0.ebuild 186 BLAKE2B 5724e778f961f3f86223e43d20fb8ccaedeabd42fd9489680753970ec952a92b9dc8ecfdb4ec9069f984a73781e06928fabadb73a8db91366231e752f024e29d SHA512 0dab9558571e6fa1a25a4b33551e68da79a7f982077fc82011f66ae1c8f895d495335fe8e5babacdb8752dc2ebd40823a0393a7d9f4c48c0c13b278cb703a59d
-MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/acct-group/ttrssd/metadata.xml b/acct-group/ttrssd/metadata.xml
index 3b94165dd3d1..54be7ff7e5d6 100644
--- a/acct-group/ttrssd/metadata.xml
+++ b/acct-group/ttrssd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/acct-group/ubridge/Manifest b/acct-group/ubridge/Manifest
index 359860b12dc4..58c1e6e7d0b1 100644
--- a/acct-group/ubridge/Manifest
+++ b/acct-group/ubridge/Manifest
@@ -1,2 +1,2 @@
 EBUILD ubridge-0-r1.ebuild 187 BLAKE2B d7907dd0015888404d921a85019b989e7a0f408e76a05cd610e6060d6a09b8fd77e0a7e7a0dd6302ca788e4ca5721bd5a60ad7268b60f4ab8b855cb08b0f79a5 SHA512 83cb6b5a8016b949381b1113c9d850e5590a8ca3d29e75c55ec79d25e94cf1a20377c7667d38a9c78fe75ce09d28e74002cd0f7902b83edcf5e33a341eacad34
-MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
+MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/acct-group/ubridge/metadata.xml b/acct-group/ubridge/metadata.xml
index 78e1c2f9528e..84aeb359eebd 100644
--- a/acct-group/ubridge/metadata.xml
+++ b/acct-group/ubridge/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-group/upmpdcli/Manifest b/acct-group/upmpdcli/Manifest
index 7f6f9e5bb2d9..5ca98ce770f4 100644
--- a/acct-group/upmpdcli/Manifest
+++ b/acct-group/upmpdcli/Manifest
@@ -1,2 +1,2 @@
 EBUILD upmpdcli-0.ebuild 179 BLAKE2B e3044b852f3e13f33a7a7dd7bfb8e288979011b24bb12920086e984ae9e152977704c29bc147b2bb8f0171432b8626708832a01406f3adbf07e169f837868723 SHA512 293d269e5d88841a759fe71042c31ed80d485f80c33a271c02b5b3e25c5ecd0ad265cb5e06b9ab9055898dd32e83a8bccd0d8741f1ae62b9055fb0222393ac30
-MISC metadata.xml 220 BLAKE2B ed165601490e20718745ba4844ef1093173b08367736d6f11de34aa7ec79d93f179c7b8170d6043696ea180d9e95da85fb1b3c0a8abef708dfe2907f61b19c18 SHA512 afdeecbd1013d5aa2b8791f78d8dc2d92747ad455a791cc92723a2ae1be5e59c106d85b2141d96375a3e4bd5c8d16ef78345c5f67a65cfd07f4d13d30ced25dd
+MISC metadata.xml 220 BLAKE2B e586df64463b7f35ea7247b3c7d2e80490da4029f458eb675c3a608e2be2a1f705af4d3825ad0ad3d3adfed411df1611738f2b02b5ef02945d5cc6473c47c771 SHA512 70ae3fb3566272104b1edf61ffc3e16b53852e9698b118140505a8e163526ea212448c296cb87e93f2a149f8e08ecaf44949a58933c930ea86c09e888a48060e
diff --git a/acct-group/upmpdcli/metadata.xml b/acct-group/upmpdcli/metadata.xml
index d4fa7b753368..8d87f8851317 100644
--- a/acct-group/upmpdcli/metadata.xml
+++ b/acct-group/upmpdcli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-group/vpopmail/Manifest b/acct-group/vpopmail/Manifest
index 6744319cac80..66c3af28062c 100644
--- a/acct-group/vpopmail/Manifest
+++ b/acct-group/vpopmail/Manifest
@@ -1,2 +1,2 @@
 EBUILD vpopmail-0-r1.ebuild 150 BLAKE2B 388466bd112e73a95baba51483e3b5372b8d9c6a6e7a354df14445feea59b910e15b991c57f4a5da4110bf3365e15aa42f479445e74ab8419fc56310671ffe88 SHA512 06a3012d292fe0029e7686781186df86bd6a9a578b9b2885c968f88f8fb78f84caf4e5308aed3305112b76957ed9cf1ba9628ea9a2e7fdb74338ca921b78c16e
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-group/vpopmail/metadata.xml b/acct-group/vpopmail/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-group/vpopmail/metadata.xml
+++ b/acct-group/vpopmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 01e305da8cdf..52f37c6076ed 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/abrt/Manifest b/acct-user/abrt/Manifest
index e6a81f90797e..c2787cde458b 100644
--- a/acct-user/abrt/Manifest
+++ b/acct-user/abrt/Manifest
@@ -1,2 +1,2 @@
 EBUILD abrt-0-r1.ebuild 262 BLAKE2B e4a197ca53ece29b358ff9243640b1fda3e6c287651a01d6851d2558e4614cc016e44b0111b69d694098e6a02966be81b795dc16ef874296500e4b9f66150b3e SHA512 4c36318837782d4da5ccda27a34acd1a8d1dfa4e479850fec769fe1c88b5b7a6104e40d25ab872d1f898f36a6beb018e67630ab46b8bc38edcbf6b377f6b9c3f
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/abrt/metadata.xml b/acct-user/abrt/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-user/abrt/metadata.xml
+++ b/acct-user/abrt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-user/alias/Manifest b/acct-user/alias/Manifest
index 103398f4b3ee..a432833dd249 100644
--- a/acct-user/alias/Manifest
+++ b/acct-user/alias/Manifest
@@ -1,2 +1,2 @@
 EBUILD alias-0-r1.ebuild 399 BLAKE2B 861b236e499e82e0cddb70529f22d622137a010fb6508b47b8094e636654748ed9b4770b1c43e7575c3b08d09eddd1e6fe030f75d22f3df88512a040122c7f34 SHA512 aff4a8a0eee73d2276277123aae6e0e0fe20366e777aa98f6a0caf13e591408deef1eb4c48a16ee30aa68ff51cec4a89c4eb1f2cd50a6e286a66b743f91b7dec
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/alias/metadata.xml b/acct-user/alias/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/alias/metadata.xml
+++ b/acct-user/alias/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/amanda/Manifest b/acct-user/amanda/Manifest
index f537e6f8735b..71899d7585f3 100644
--- a/acct-user/amanda/Manifest
+++ b/acct-user/amanda/Manifest
@@ -1,2 +1,2 @@
 EBUILD amanda-0.ebuild 231 BLAKE2B b4c12a48da158fb0e2e739525d4e11bc7ee17d166a76c984231cbaf2fb1483fd19033c15f4e5b6da8bc7c9f261bd7a5c493a3894d41c694b72b6e2f606d77554 SHA512 a335b75236e6471d744e6d853bd4303217f81c24a1420058bfd289c51ae2b1d1824e69f60b91cad17f897b3f0bf2186d58c720c9cc07f0d1dc303adce52931ba
-MISC metadata.xml 648 BLAKE2B 438964525d71b19b0d8538d339e9b8e68c99a3ad6032a4ead75d6f6e90fdbbbc1c8f59c921e25ac550c519ec824043e54965a5abc6ecfd9dbfbcfacc8590b1f5 SHA512 9c2f3d4f7217de64250a148dafae4c8e2ad565b2a88ccebfe05a05f3bc349789ed3f06dfa08434018b53e086c4a2a02bb89224b476dd471371b5aa4c4aa38008
+MISC metadata.xml 692 BLAKE2B 5f06529d760770a3d834e6250c8e7131fcfa10920fdc967bbc142e2b214f8d2f5d42cff2a607b1144df082ccd8b1989db6a0b6a874af66b6c24337575aad6c04 SHA512 d86dd8bce59ee9f835095e1884c2c0d251bf872e41846bfbf6bc232ceb8d5c22fed9e0b55daa740196866a803f3d1e800ceaa324f5b97702d8812f69b2b1dd2a
diff --git a/acct-user/amanda/metadata.xml b/acct-user/amanda/metadata.xml
index ccd1d2f092c3..d5107f7573f0 100644
--- a/acct-user/amanda/metadata.xml
+++ b/acct-user/amanda/metadata.xml
@@ -5,15 +5,15 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lists@xunil.at</email>
 		<name>Stefan G. Weichinger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dustin@v.igoro.us</email>
 		<description>Upstream. Please CC on bugs.</description>
 		<name>Dustin J. Mitchell</name>
diff --git a/acct-user/amavis/Manifest b/acct-user/amavis/Manifest
index 582a1c21adce..63b459d8ea05 100644
--- a/acct-user/amavis/Manifest
+++ b/acct-user/amavis/Manifest
@@ -1,2 +1,2 @@
 EBUILD amavis-0-r1.ebuild 274 BLAKE2B e119e1c483488368ffa0ec0f5166d0843242777767c186793cd0eb7e4d6df3057db8dfa5613e3e60c921cf45be2b917fec3c8eab83df58b8504ce9f683276978 SHA512 366133f008e1d270d35ed0437183b927798ac0e8c0c5f522546f350d3cf66b3dc2dd530390282a80db138520d3c8aebba512fff3f8db8995be055267890f6359
-MISC metadata.xml 487 BLAKE2B 1a8533eb43138b0ca04b146e783fe21ce948bb53656cd388783de73359d9da228a902ef439858f51c0a6cd04c255dbb3006525b093c733cef943162c544d347f SHA512 98988fdcca2483cad4773f33c126b0f0a3ea4460656f67e3f82e8076791e9bd589c67bdb430fbda20b5c5eebbb0688d63d4f51382fc52cedbb40073b83f1bc38
+MISC metadata.xml 517 BLAKE2B 24e6606d13d26bb7af91b3bd98193d6d5ee02309cdd018091e8d9e8f238e18d119880fd0a0bc598443203caa0ffac9c47fd2fc5ad69246f6ef83be59c4f83c7b SHA512 9a00adc383504fcd291cee5eb481a25c4088f53157d79a3e4b936070d9eb49e00e67f83f0e183aafe79208f4a99e51f908891e593c3570d5f093a49099cfc7d6
diff --git a/acct-user/amavis/metadata.xml b/acct-user/amavis/metadata.xml
index b90b4f50789d..3126b599b19b 100644
--- a/acct-user/amavis/metadata.xml
+++ b/acct-user/amavis/metadata.xml
@@ -5,11 +5,11 @@
 		<email>antivirus@gentoo.org</email>
 		<name>Gentoo Antivirus Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/amule/Manifest b/acct-user/amule/Manifest
index d3134957ed34..711bd8965489 100644
--- a/acct-user/amule/Manifest
+++ b/acct-user/amule/Manifest
@@ -1,2 +1,2 @@
 EBUILD amule-0-r1.ebuild 228 BLAKE2B 9dfc4f7a80946e66b059a43c5a77e20c0f9fcb587f6c972525e28389bfed66bdc26cf8a1ddccd65f63977f7f8d5dbf706f4f06d9a49506ae2a84a47d2e502c85 SHA512 e0486bccf72cc101beda4fcd4b743381b74699a6b1d986e215067a46e73692ea47fe5990ca8a8562ba5a71dd11c74a4bbaa867f9634ef0cd88fef889c8ce5faf
-MISC metadata.xml 364 BLAKE2B 82a4ff6369bd09fc564b3859321f4fb128220d757f0c264e117f9bcdea3bfaef07fd310b8f002bc0be124ef3213da4a65a10c9da4dfdcf1357e01f106bb7c531 SHA512 b48f5be0596960b981da7b959be826657d758add02761189955ce35d25abf5cb768f10995a6d3ab88fff7d1ea8a4a9666a0b2030d624aae4cd06a2ec2484ac8c
+MISC metadata.xml 394 BLAKE2B 3994d7b4d98a6cdaadc6938c16715b866ba0e729189066aa0e974d50c573e1124ce7f5b87d070495145b4b130990b7ff220d9bec9d990a7480676cd2da127289 SHA512 8c4f5d487c8d3dbac76d13c0b41589753477113e44b64b0f49c84f7e1b64c3276f736e94c6e6745047e4ddafbd047badc805a5bcbfac2abe0bd0354b0fc8517f
diff --git a/acct-user/amule/metadata.xml b/acct-user/amule/metadata.xml
index 039cf44c7038..8ecc21d1608c 100644
--- a/acct-user/amule/metadata.xml
+++ b/acct-user/amule/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/anope/Manifest b/acct-user/anope/Manifest
index 8c0b4a6932ab..33032cf3878c 100644
--- a/acct-user/anope/Manifest
+++ b/acct-user/anope/Manifest
@@ -1,2 +1,2 @@
 EBUILD anope-0-r1.ebuild 233 BLAKE2B ccdda7dd529edcfb22d6e889bfd93d634a501a88689a12e12a24944a550002f4f9e07ffebbe17d521f97d6ffd1e45ee035de936ea0013deb4624f1182f96df92 SHA512 24ceef50af0cf3e3c783fa5f22b48b001ca6be7fb9aba92342cc5474b1b406324e7e621e96bfbb07de3f720d73ea0205a53730e90ff09f494d4a396b9417280b
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/anope/metadata.xml b/acct-user/anope/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-user/anope/metadata.xml
+++ b/acct-user/anope/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/asterisk/Manifest b/acct-user/asterisk/Manifest
index 5759ebe0410e..cf9718c29d24 100644
--- a/acct-user/asterisk/Manifest
+++ b/acct-user/asterisk/Manifest
@@ -1,2 +1,2 @@
 EBUILD asterisk-0-r1.ebuild 239 BLAKE2B d1f0cf845ac2dbbf5b3ee41c62548ea64ad7aad68b4bac28a1dcc558271ac3effab50537d90fe596a90401b1e1117aa5b0eabc60a72d18c57663eec2a88a9ff7 SHA512 3f29d21c7a9d0506de137eef91de34dce3e85ca790dd1fdf495ac340aa8ef4fe471b0e44b1a864a9020038520632bc2e2caeec32f877582897355460c7099358
-MISC metadata.xml 357 BLAKE2B de51ce7c286f218d8de4a504c30dea5b9c10bb333149d2d7d15f499124cf5cf9c2e704e3d35b476b01e3d8863b7f055b78d64d791f84ac9b94088ff92fc1ddca SHA512 a690e823e23bd2c6c1f75a33a1c6923beb97bbcdfbfe522b09a3bfe20040e49535bafc41fb00a508a3851a817e5fdda49de73f21109f0dd96599fac12bd77a53
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/acct-user/asterisk/metadata.xml b/acct-user/asterisk/metadata.xml
index 07561453adc6..d06f5db0340a 100644
--- a/acct-user/asterisk/metadata.xml
+++ b/acct-user/asterisk/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/atheme-services/Manifest b/acct-user/atheme-services/Manifest
index bd6f5ca830a1..1294ee9803e7 100644
--- a/acct-user/atheme-services/Manifest
+++ b/acct-user/atheme-services/Manifest
@@ -1,2 +1,2 @@
 EBUILD atheme-services-0-r1.ebuild 234 BLAKE2B 42fa49814fa5af6f6b03de5d0779321b38527f2c46ca55ea87657b855ead19c841f384f9d375cfd7473daca49a448bb3e5e0f0dc343558504e8703bef0f8295a SHA512 9cc19f82a9c6303174065d4784c993a10562e593c10b186f6319ee995ddb8c719fa02d0d36385944bce8b79d2bf79c19ed86d4774bb07b0dfdbb5f0b875647a1
-MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
+MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/acct-user/atheme-services/metadata.xml b/acct-user/atheme-services/metadata.xml
index 2b340d2c9798..cccd8e9eeb02 100644
--- a/acct-user/atheme-services/metadata.xml
+++ b/acct-user/atheme-services/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/automatic/Manifest b/acct-user/automatic/Manifest
index bfa66de34920..e9b2111607da 100644
--- a/acct-user/automatic/Manifest
+++ b/acct-user/automatic/Manifest
@@ -1,2 +1,2 @@
 EBUILD automatic-0.ebuild 279 BLAKE2B 6e90885e409c508e860889276db428b0ed00b98d99d6ecf7abd31bcab7040960488c8ef9db78cbc59b6ed910bf8864b96ed59245b2ec87da4b7841384cbaf493 SHA512 2c04bb4aa9c909982e7ae6c02d4c0c4aa7daebc0a384c1ca87e166c40563feae242a6ffebaeae9560a86ba4b595db43bd7dda0fab4914f3b1db63de741f2b901
-MISC metadata.xml 376 BLAKE2B 5455c81e8cef3eac3dcd4bf8687fe61fb3f2aab49e5685fe3d2fe2b9cbab41158b7cd6d777dcdfcec1e4bf23a8903bc7e800053b92a992150f42a9822fd46d8d SHA512 71861b1caab3679f55fd8033679e4d3fd186649e12ccf3f586123d2171e5cca09bae25978aac38c73c35dafc26dc70397b30709ecc70c39407aeb3f67b1c65ad
+MISC metadata.xml 406 BLAKE2B 5707ac898bdea1cce0702706e11ade10f8968f720f82ccb17403db98c980eef10138890410ec62521c2dc50192edf30a8b467b2f201dbc5a5962cf5b55c81a74 SHA512 b6cd664305ed4dd0ffde21087423f5864c23ae62f8f265b056dbae50ecbcf6f27a1ab185a7d20b89e0afc5611e6e0c3ea987b7dc8a2a57ae98c3956bb4916877
diff --git a/acct-user/automatic/metadata.xml b/acct-user/automatic/metadata.xml
index e2e6278b62a4..0002e1a56764 100644
--- a/acct-user/automatic/metadata.xml
+++ b/acct-user/automatic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/automx2/Manifest b/acct-user/automx2/Manifest
index f755553f8138..a79c582ca050 100644
--- a/acct-user/automx2/Manifest
+++ b/acct-user/automx2/Manifest
@@ -1,2 +1,2 @@
 EBUILD automx2-0-r1.ebuild 273 BLAKE2B 75c1bae39d36caf84265fb5d5ffb3f8cb9f5a9987aeca75308880b4ee1353bef4c9c2e00d718031459d91a806e6f4f4bcb6b689770f8cb405e97a2bd398f378a SHA512 c2ad681ce1e57e1f8fd3cb2cf659c98028cb5289707c3843eab3e3a54e095b6aef72dc2c63b13c57d9985e1ea48f47b05cb74d74471cfb297ea9bc3fd203e481
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-user/automx2/metadata.xml b/acct-user/automx2/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-user/automx2/metadata.xml
+++ b/acct-user/automx2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/bitcoin/Manifest b/acct-user/bitcoin/Manifest
index bdc650767951..c1399e366365 100644
--- a/acct-user/bitcoin/Manifest
+++ b/acct-user/bitcoin/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitcoin-0-r1.ebuild 246 BLAKE2B 6b573c1424e6043130cb9d8feda9f27be052de6507fa150242813d56ed535322fb1852fd7fbf9983907257d796a05b751316c7f2188388b855a6e34e81db3686 SHA512 1a38f8c22929f6d43abfbf58a855359c906c9566653f728e92425a75edb7ab021820b6f5ceb30fac565bd4188186c130360934a8a8e047e323bb27aad57eab1e
-MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
+MISC metadata.xml 404 BLAKE2B 562724169bdcba36f216d118b7b362c5f487880cbcaccf6fdabd3a0dbb6d0d21fdd13bd1eb5080139117328277565ffe9021507b0871ec07b048c531b9c55717 SHA512 8a78e509ece3294c6343fccd856537803407685d2aece1ccfeab336f8b0ea482ff38696d21f8d37bba3b0cf5bd2e6718736d6b5c3180c202f0a387e04fc507f1
diff --git a/acct-user/bitcoin/metadata.xml b/acct-user/bitcoin/metadata.xml
index 65db17a2078a..95e5c0e2b8fd 100644
--- a/acct-user/bitcoin/metadata.xml
+++ b/acct-user/bitcoin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/bitlbee/Manifest b/acct-user/bitlbee/Manifest
index 520e49285b39..cc05e7cd22fc 100644
--- a/acct-user/bitlbee/Manifest
+++ b/acct-user/bitlbee/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitlbee-0-r1.ebuild 224 BLAKE2B 944019bdf450429d1bf5b9dd6a59e254f2052405ca9e2edbf2c775c65c539987dfa305212c57af57c67093f9ab97199e305ffa9180bf49c43103197f68009d16 SHA512 b79c708a7f517ff96dfda5624c5059acc64fb0fe5e5e2283d451110cf16772702b77d7e39c1bfbc3ab7d5ff0aedcedda4421999943c0a3dda13cdecd6bdbfb8d
-MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
+MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
diff --git a/acct-user/bitlbee/metadata.xml b/acct-user/bitlbee/metadata.xml
index 7c3db330c141..dbebda04b192 100644
--- a/acct-user/bitlbee/metadata.xml
+++ b/acct-user/bitlbee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/boinc/Manifest b/acct-user/boinc/Manifest
index 59c5a4c8c3b3..5b107aecf70d 100644
--- a/acct-user/boinc/Manifest
+++ b/acct-user/boinc/Manifest
@@ -1,2 +1,2 @@
 EBUILD boinc-0.ebuild 291 BLAKE2B 982e184dd3be58e2fc5045e05e574223e23e5445a938c32d1329d38234124b098f0cbcfc6279aececf56c9fc4f65711f3535f2f212f24a48ef6e7fa6e9f9faab SHA512 cc736e27a523776653d1e3080ad500c796be422becb242fd6a66ddac494b855b0135cffe07f78310e2db5e21cf18c8181ebc2dff8df610d3ac8aef938891a305
-MISC metadata.xml 479 BLAKE2B 50a600d88a0206f4c34f3f1dfc69536240de71b92a0e899059b53e3ccf8e9bdf0dbe3293a88ffc6a8fbfc0882648167cfc92ea6f017d438894a5b34b76217a94 SHA512 c7c487eaf4b5f8f5810787be1669c6c9b4c41d4ab5643a8e2307856b094eb2d1fe645b88d51fc8c0583582e0682df0795792be4c7bce480a2fca85d3a52907c0
+MISC metadata.xml 509 BLAKE2B f25a924dc3ccf634503ee837ddefc345ac5579fa873a859a0d4811dc5af75a768318898ddad5643d47cdfecd4b504731c66b74f69c9d2ce8d7eac186c2379c07 SHA512 dfcd6e28cf9fa71a0c96f4d9a82aaffccfddd9cdc49137aed575fa17b8dca227189d92de9ff9a357fa3425d898a2de803079bbbdef36b0cd127f4af20d4f42d3
diff --git a/acct-user/boinc/metadata.xml b/acct-user/boinc/metadata.xml
index 912fdc058f94..18c27965271e 100644
--- a/acct-user/boinc/metadata.xml
+++ b/acct-user/boinc/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/cmd5checkpw/Manifest b/acct-user/cmd5checkpw/Manifest
index eb7f6820c1a1..089172f5f8db 100644
--- a/acct-user/cmd5checkpw/Manifest
+++ b/acct-user/cmd5checkpw/Manifest
@@ -1,2 +1,2 @@
 EBUILD cmd5checkpw-0-r1.ebuild 233 BLAKE2B 4a1358b4eb1c7e009025b5d455eddb49bf98f3cd892f1da66b306c9214065fb7c76aed422702c7abc4b7797ad2f75eab958ee982e2241969bc34664f25d1a002 SHA512 6aae3e8287c8fa27c548b182e6daab8183289aa04da0bfb1ca6d04e86c43ef4cf31b580afaff0b0e8ea4d9ec935566ec6a3dcf2cd81d4e6eebf552052c36d739
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/cmd5checkpw/metadata.xml b/acct-user/cmd5checkpw/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/cmd5checkpw/metadata.xml
+++ b/acct-user/cmd5checkpw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/colord/Manifest b/acct-user/colord/Manifest
index 1a5eb50f2393..6b7b58a98839 100644
--- a/acct-user/colord/Manifest
+++ b/acct-user/colord/Manifest
@@ -1,2 +1,2 @@
 EBUILD colord-0.ebuild 278 BLAKE2B 88b28dabb9fc7cfe116154e3a44ab4a19dcb59f1ff7b7d483dc2e30d27773ee10c3a82053dc7ade2b9bcf5d59f6fce418696541974e6fbaa7de3c0cab8c16348 SHA512 17ab09869356fa1aae526e25e7eb7524ee4fda867ea61d349ebea6f8f70b99abd56fa2b8bcc9bd2016b5269c6eae056043a71035c5f78e51c5585f4a72d0a981
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/colord/metadata.xml b/acct-user/colord/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-user/colord/metadata.xml
+++ b/acct-user/colord/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-user/dbmail/Manifest b/acct-user/dbmail/Manifest
index edca4ad7e6ce..47312269b594 100644
--- a/acct-user/dbmail/Manifest
+++ b/acct-user/dbmail/Manifest
@@ -1,2 +1,2 @@
 EBUILD dbmail-0.ebuild 198 BLAKE2B cf2aae761a05449758e9bf1ed85adbbdd1892c780851f018a28713a92c0459b23e2d2a37cf75ed3fb7ca0baa3b00dafecda47672633a46ee1ad70578ca2ae71a SHA512 fce38395283685c0430ea83ad8f83991eed1ed116d77d44476f79dc211e0b2b1976d09cc7f510dbbef6e109ba3ec616969dadd00e68bc42342347c3400542f50
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 258 BLAKE2B a542b7d3d6fe41d4d6804f23d3f4eae32151dd6a261fd9c53df59afc03381e2621ef74094f612a796d2bfdcdc994b210f47935bb396e4ceb58e9901ffbdbd50d SHA512 5744904454b157ef1753d1858d293f35e7aa0d9c513a96823f5efc1ea7fde3bcbe2a50ae70f56be9c9c15463b820d45fcdfd52773a58d078252aceb0e93992f6
diff --git a/acct-user/dbmail/metadata.xml b/acct-user/dbmail/metadata.xml
index 7a38bb900964..ff82108a6c99 100644
--- a/acct-user/dbmail/metadata.xml
+++ b/acct-user/dbmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/acct-user/dehydrated/Manifest b/acct-user/dehydrated/Manifest
index 217f69ff05a1..b1dffde46cf3 100644
--- a/acct-user/dehydrated/Manifest
+++ b/acct-user/dehydrated/Manifest
@@ -1,2 +1,2 @@
 EBUILD dehydrated-0.ebuild 260 BLAKE2B c53c4c0dbe46d2b5f8770f8bf7bf09f58899c0e46dcca83e4ecdcca8bb7b55b8e346081262d7f4178880ccd36464d08d67f17c437767c73e10b4688d29ceff75 SHA512 30938b6c4957fb99e82727331755f8c3edbd05502e4eaf4f24359d26d589dce0bbcbe7e6f12761fb5ee3505d5c4365b4ff8acc62235136cb0e15a27ddc0d52cc
-MISC metadata.xml 330 BLAKE2B c81d760282a51be25e323f15d24dc8a84a4c9b5f9474f1e02d99ea782882deb8448863cfab00e4604cfe9c23690fb1da8e4214ca4226117254d4f8cd3ae1976e SHA512 54134569aa4a1a0d3a29e8375b9b90add38c0db08643554cfb3b0e26e6f6f3a6d08a6e2738a607d422341ab811534ac4af36550fd854cbc19ba5ca70614fb30c
+MISC metadata.xml 330 BLAKE2B b7f16afad9b07e8c987493880be658797f291e408d2725eb0a982f1797953969a64e88c93739c2c9514e047b79dc93124a09d7401ed7cf4432ef88b0a9c76fd2 SHA512 f9593d7f50b0b5dbabca4f180d9de2f0b9400f1fc787e2fd2ccadf049a1033dc42ad855d5503be1e3eb6d36835409b2d6b97753e07d1e746bfe40e73013f0581
diff --git a/acct-user/dehydrated/metadata.xml b/acct-user/dehydrated/metadata.xml
index 6f3f53de9753..3dcff5679365 100644
--- a/acct-user/dehydrated/metadata.xml
+++ b/acct-user/dehydrated/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/deluge/Manifest b/acct-user/deluge/Manifest
index 5bcf5bbeb5f3..590bfe066c31 100644
--- a/acct-user/deluge/Manifest
+++ b/acct-user/deluge/Manifest
@@ -1,2 +1,2 @@
 EBUILD deluge-0-r1.ebuild 227 BLAKE2B a23328b1439d5b7a8fc3692a7116936037ba8e4d8e094d48f01dd60aa9361c69afc455035a75288a3207e28fedece08e95a0af030ca5021c3139accfea9de286 SHA512 b5bf59b6daa781df5c678d94d7772aca3b449aefe4c924f58730857f756fd9c7c15c08637c74371b44933137320bc9c01522c90dc1a595a8ec684bab6cdb4855
-MISC metadata.xml 490 BLAKE2B f81417945b97e13f63cd61f3a6d0f418d91fde8a0136d3b3403510724911b94b5c255f1def50e9b2e16df3c5a703e197994319b0a3a0434eb3b8a9d6ffdd66ef SHA512 4ebf2048147245bf6815013385982715cd191908a8bf94eec566cd1ba0c28d976af03f7dfc52b63dc1bacccfcf538e6cdf074321fe378022d961e557b83ac260
+MISC metadata.xml 520 BLAKE2B 4a1a72b4832ac32fcdfcce16e312465eafb1b6e0957d7a6acae086f72ed983d097465ebfb11959dbfad78b3612f760d99802546d0fbbe51851225b66d8700b0f SHA512 122985a7007d61c27a11b98a8bf7c1268a512ad2edc838e87e87299536cce125dddbd75e035c7a1706cc1bfcbaf82cfb75546e861fea8b503a3a7f3b02882ccb
diff --git a/acct-user/deluge/metadata.xml b/acct-user/deluge/metadata.xml
index f81d723becc1..ab0dde28d5a7 100644
--- a/acct-user/deluge/metadata.xml
+++ b/acct-user/deluge/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>candrews@gentoo.org</email>
 		<name>Craig Andrews</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/acct-user/dirsrv/Manifest b/acct-user/dirsrv/Manifest
index 510cc02a36e9..2c1ac4a709df 100644
--- a/acct-user/dirsrv/Manifest
+++ b/acct-user/dirsrv/Manifest
@@ -1,2 +1,2 @@
 EBUILD dirsrv-0.ebuild 235 BLAKE2B 7a01da0560f3f958aa5a0f9d4d47a5eb3a8c97f22371322306f4c3192e7afca619cb7a81fc24b7219c0ed4c06a07238bf9c9d39b9e1fddef281d3b19555ee6fa SHA512 25e5666f13f0fce7209533aab077dc59e9d0f66d7a8e156407cd2b8a470360c5b343bdfe5ad8c84cfd6289a36782e2aa48f18bac20230df7153068c87e071d5e
-MISC metadata.xml 486 BLAKE2B abb49ca37d64b0a94e8ff656ad9eec42f287a66f19866dfb92b09557b482719d2a026c015764d2433715a65a95544fc57d24e22abad9460c42dc2ddbdf02b560 SHA512 b0e9f028d3238176d03ee5bda33e95c5a77270740205fe91eb509c0ce4663829df757c071e46c2cb83bb1826a52335697f5fd073e509154dd3209b43e2fd8129
+MISC metadata.xml 530 BLAKE2B a5e56eee25b5c1e81a2d136da9eed43b529121a07abd4b31a057312d25500b773b63ad539594a9634763a81716738ef58ab9a6b50b268b5743250089f1feaf0c SHA512 5e69fff6d3239921265e2352d557a6b8904ca47cd8e7529bf0c612526263a0c1e617979d83cd8b1fb1c2b1202e58c7977491d65e184c4681b0040886d236dd94
diff --git a/acct-user/dirsrv/metadata.xml b/acct-user/dirsrv/metadata.xml
index de7f98d8aae8..64cfde49e6f9 100644
--- a/acct-user/dirsrv/metadata.xml
+++ b/acct-user/dirsrv/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chris@christopherpritchard.co.uk</email>
 		<name>Chris Pritchard</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/elasticsearch/Manifest b/acct-user/elasticsearch/Manifest
index 0d6bc9a085ed..3e5d0930fd27 100644
--- a/acct-user/elasticsearch/Manifest
+++ b/acct-user/elasticsearch/Manifest
@@ -1,2 +1,2 @@
 EBUILD elasticsearch-0-r1.ebuild 310 BLAKE2B 0f96c0cb753183440ad7148b7c515d8f9ab6f183c486e54cb249747b1bf16e16911170d3f0e17ec2f2dcb92b9c623a9da36241ae7cd524d54da742ad641167d7 SHA512 54d4356742d329f1f3343601ee42c183c01fc9f6a7da84bd3fdb1460445aea04b355769892605f7775b8a25d2a70ed074eecc0e9ca98b2843f149eea796b5dcc
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-user/elasticsearch/metadata.xml b/acct-user/elasticsearch/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-user/elasticsearch/metadata.xml
+++ b/acct-user/elasticsearch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/epmd/Manifest b/acct-user/epmd/Manifest
index 4a03fac2508f..7f2fd2fb0254 100644
--- a/acct-user/epmd/Manifest
+++ b/acct-user/epmd/Manifest
@@ -1,2 +1,2 @@
 EBUILD epmd-0-r1.ebuild 243 BLAKE2B b3e3a9017c4f13270152e28d36e0cbee4ac8e23acd92db2f2d24b30d48de55674784e375989a24c512d945abaefb3a3c56cc90d5a9cf1b5c62c30e890029a9e8 SHA512 6b081a1414029a714eab8a4a09d109126ad57362a0e37992b31b75705c2a81018ed5c211b86fba9e5acd006b3609cb96a3218df2bc3cca7c8143b804772a4351
-MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
+MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
diff --git a/acct-user/epmd/metadata.xml b/acct-user/epmd/metadata.xml
index 7c3db330c141..dbebda04b192 100644
--- a/acct-user/epmd/metadata.xml
+++ b/acct-user/epmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/gatling/Manifest b/acct-user/gatling/Manifest
index e5245b0946cc..e7b8ab07a32e 100644
--- a/acct-user/gatling/Manifest
+++ b/acct-user/gatling/Manifest
@@ -1,2 +1,2 @@
 EBUILD gatling-0-r1.ebuild 262 BLAKE2B 17fee8322babc572c3bc7175237b7397ad25922492b6814657c823ad8543fdea26c47408deb115ae522494f7a2c4c7ba410931018fe94e507f2c79f021c451bf SHA512 a68a764a03961c3b56398a9d8eef1e9c371b4534ac9274e57c5ae6aa8b64007335a7dafa875a907803446d57338da16eff590e26238a90e77488d2d585e97606
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/acct-user/gatling/metadata.xml b/acct-user/gatling/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/acct-user/gatling/metadata.xml
+++ b/acct-user/gatling/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/acct-user/gdm/Manifest b/acct-user/gdm/Manifest
index 579f2d6eea56..4f9d856f8794 100644
--- a/acct-user/gdm/Manifest
+++ b/acct-user/gdm/Manifest
@@ -1,2 +1,2 @@
 EBUILD gdm-0.ebuild 262 BLAKE2B df60f339d858c37f7356d3ab6d3facb4616b0cca3ca418cee6a6cc4871ce0f3eda10cf309551d0a7c0a4ae8472c1e131c540da95401c7f99c6bb0e14876adc58 SHA512 44ec68d59ca508c849859f85a644dc2bc6e72a1e15c6a36f501ec4c10e2f9f3f47bc71b1eebdf35ad2bb36e436939218bf1f768dc3bcbb3ca4a59bf8d52411e5
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/gdm/metadata.xml b/acct-user/gdm/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-user/gdm/metadata.xml
+++ b/acct-user/gdm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-user/geoclue/Manifest b/acct-user/geoclue/Manifest
index ee4a405fe11d..1d8fb60e997b 100644
--- a/acct-user/geoclue/Manifest
+++ b/acct-user/geoclue/Manifest
@@ -1,2 +1,2 @@
 EBUILD geoclue-0.ebuild 294 BLAKE2B 11aa9f37c0df56956fef11715ecf7884ff0f5069f978e9df46ae48399c91ed16fdfca6208c17f35514d838678a415fbfba6341e09c9f167ed857cc2914a72315 SHA512 420cbeb863cb23f357f2e9f5f9c10240a34d73586989c25c60b3e3ab819de328ce79a99aa74a3329e92958f86df931bb3ca03f8f85297cb83d8a5d698b325931
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/geoclue/metadata.xml b/acct-user/geoclue/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-user/geoclue/metadata.xml
+++ b/acct-user/geoclue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-user/graylog/Manifest b/acct-user/graylog/Manifest
index 3a8eb48ea3dc..d6739884b197 100644
--- a/acct-user/graylog/Manifest
+++ b/acct-user/graylog/Manifest
@@ -1,2 +1,2 @@
 EBUILD graylog-0-r1.ebuild 232 BLAKE2B 9ab8206f7f5247a8736c6e5ed848648c4f965b88e77ed1991330447c783c8098bff5165a0df64d4e1b3ae279ae517104cd5cb5e598dec6538e84097b7b6a9df6 SHA512 1690e03bdd40cfad8e59bd92272964c040ba841776fc9ae35bf5bf92cff528363a12bc4ce508250cfe7c26a4ddf2125769d29902815bf98bd3c159f1f1cf98b5
-MISC metadata.xml 491 BLAKE2B 1d591f6f575e86589e2fde72536fd6b16833148d2dc0e282ae5d36cfe4ebcb1c68871bea92bb330dbcf5c111b79abc7248a4ed3829ad7a0804793c379fded0cb SHA512 9f5d4ffaca4aedbea6543a69f11f5d6d0a69b99200f9e133c47f043c59ea827d52375203fbcd9e2787f1c0b243837b72f88f33482ed5473c9296b8690e434c57
+MISC metadata.xml 521 BLAKE2B 40acf0e28ee36caa0962287d552d5e4822967618c5da47f7e1d3470c636f1f78766ca3edf08e2afd916192f7633e163f7d3ce411f257b0bc1717254d1703b8c6 SHA512 4be569ec127284f17e4c0137a935bc83524a81d7b9f4eb702b5162a33edf1b64ba48b763a291c6496d6e836a1118c537a274db4aa9ec54f1ae5d78a488a8b78f
diff --git a/acct-user/graylog/metadata.xml b/acct-user/graylog/metadata.xml
index 2d21d06a314e..d5c2b8215a1d 100644
--- a/acct-user/graylog/metadata.xml
+++ b/acct-user/graylog/metadata.xml
@@ -5,11 +5,11 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-user/greetd/Manifest b/acct-user/greetd/Manifest
index 7d5562b28e4e..219600a35cfe 100644
--- a/acct-user/greetd/Manifest
+++ b/acct-user/greetd/Manifest
@@ -1,2 +1,2 @@
 EBUILD greetd-0-r1.ebuild 237 BLAKE2B 2772ef9a59ffdee577ad2dac61aa0c4ba859143f803d2d1f51ce42c42999224b83e8c9ed22e884fd5485dfb73cd2d39af01d6cb4498322a4c2d165c00a256fa9 SHA512 43e09dfb2f6c5297c56ed19ab4c3ee0ba236f05fc81e4e9f3935288a6df7f363b975aff3bfce1614ad3b6f4fe7f1305f6af2ae9dc3c286e752455e941e8d7b24
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/acct-user/greetd/metadata.xml b/acct-user/greetd/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/acct-user/greetd/metadata.xml
+++ b/acct-user/greetd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/gvm/Manifest b/acct-user/gvm/Manifest
index 482864bb2813..8ebc4ca2d38f 100644
--- a/acct-user/gvm/Manifest
+++ b/acct-user/gvm/Manifest
@@ -1,2 +1,2 @@
 EBUILD gvm-0-r1.ebuild 284 BLAKE2B 2f31118a18a69e3717520bb9597e3b56b76bb2c35b9d577b132fffc63b31d75de83266c0b3f035f34fb7c64cbd4cf7cbdc5f4899228ca9267e7c55ed15975be7 SHA512 f46413c09d6857aa61b127f5c078ab20e299f1373ad8c0d6157fbf6cf4f24c35da16b0fa868ae67271dba8709485b559acea54be30559c83acda1d60f54fed49
-MISC metadata.xml 449 BLAKE2B 3fecb33953a69fbc51d95838410a40e56cecb5ef3d5d36fd2a5ba7446f7e0b3f97bbdf4631ebee1d0567eb54bed565b4d15743a62c095eff8ee381dc5789ab9d SHA512 d247b1e1c3b9f8a45c3224caea85518d44691907ed4de068345cac17e66a74c756e33f664801ebd3ec2e946e3a20daaeda38d6eda733e2cdbb76d7411adf997e
+MISC metadata.xml 479 BLAKE2B 9b9375903717ca420ca5233aae8ec07432658d6be6e4c24f82acb722a5fd3eb4cc37df87d85b00ef3f4332dcc147668838eb3ee934a5590237d6bf766ab5fa96 SHA512 83eecc65295d2c70416fe527338ef1c60af1ecc0b47d927463f1a6d2e6bf747d0869f18595e803b59cdcb7d40bb8a96ce7eac853b8929d25ded08bc78b07b230
diff --git a/acct-user/gvm/metadata.xml b/acct-user/gvm/metadata.xml
index c7d72801a35c..4ddcf261071b 100644
--- a/acct-user/gvm/metadata.xml
+++ b/acct-user/gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
+        <maintainer type="person" proxied="yes">
                 <email>jonas.licht@gmail.com</email>
                 <name>Jonas Licht</name>
         </maintainer>
-        <maintainer type="project">
+        <maintainer type="project" proxied="proxy">
                 <email>proxy-maint@gentoo.org</email>
                 <name>Proxy Maintainers</name>
         </maintainer>
diff --git a/acct-user/i2p/Manifest b/acct-user/i2p/Manifest
index 8c97acedd7da..67faecb6f699 100644
--- a/acct-user/i2p/Manifest
+++ b/acct-user/i2p/Manifest
@@ -1,2 +1,2 @@
 EBUILD i2p-0-r1.ebuild 269 BLAKE2B 8ce388f120bfb9cd45b13859c5830fd5821b82d6c899013e5ca4f78c01adb1cbdb07627e425d2ef9da7f89cbe78b3bf912c697b5aa378327efa85db44153f3fa SHA512 2deaddf7b77521c111a6d10ebfb87737957353c40dfd3e6d0e77e0b9e0735445f7a5eab327cb532be2f19c097d64add6b778ffbfa7fc2b37c96a224a99c95b0b
-MISC metadata.xml 452 BLAKE2B 1addcb65f92e1b13a37c1c9e584b8ad908d5d3148f9d2bdccc7ede5a88b8be9c14f0cb3003a5b31376f6fdbad9515c1ebe6e0055616de4a54c44b45df34e5ae0 SHA512 b95069cd080c6ba33882f3b389f85b85306175fb849c51f4c72ae437bede7b5642f376cf9759b80bf2116e189d72967c8105daa7303eb645feda37a5cc12b098
+MISC metadata.xml 482 BLAKE2B db3075c0323f6fe7e8f926b880708c1a780952216e25c321e9bb5a49a80109cb4d2e25f47fefc183b2e0e566b9a95b463544caff88dc20097d7eaa7432f01fa8 SHA512 ac8acf6f95500547581f3ed9e40d5415669d8e54d98862a77d2ec460c4741a0f416bf8108c27af2fb5be4e002dadf44f4e198e07b1ee02dec84bc62afa0a7ae1
diff --git a/acct-user/i2p/metadata.xml b/acct-user/i2p/metadata.xml
index 13b1587368b0..400ec039fe65 100644
--- a/acct-user/i2p/metadata.xml
+++ b/acct-user/i2p/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>tharvik@gmail.com</email>
 	<name>Valérian Rousset</name>
 </maintainer>
@@ -9,7 +9,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/acct-user/i2pd/Manifest b/acct-user/i2pd/Manifest
index 4230c294812d..8135d728b960 100644
--- a/acct-user/i2pd/Manifest
+++ b/acct-user/i2pd/Manifest
@@ -1,2 +1,2 @@
 EBUILD i2pd-0-r1.ebuild 309 BLAKE2B 37544474dd3890fd3583f41adcab24d3623b40ff8c0ba4a31b2a133e29bc90a15b2f3375fb968f0ed3e754b8683746ce8c834ecfc6029782ca533882c8189621 SHA512 417ea30122389c49b7c104d84068c0413040b6dc16b61e5f63f4227a22706f00f971d6b58c1aa76d45e50b35d54614892e0f9cc430ac2f870a396b1fcb3da5e1
-MISC metadata.xml 368 BLAKE2B fe12c2012ec5d14b6a09f8aeea4d4763e454d6b0be49282c9eb87173b2bac7a31ae84a5d13c54a9098bed594e4ea7c0b75e7581def7c023c2ad5ee49832b97d7 SHA512 ae14458289e58cc9131e711012a8d286a89fd9ac2363997ce7b451fbd5da459e5334ed7275699d528bce0525a9536e78ca9838f206d9a797875865efa35b17df
+MISC metadata.xml 398 BLAKE2B 61136dca124d04113e5151f8b1012955d1a7a07c07543a29efd16eb611a4b5a71edfad77ee2e7bd98477920edc3171f660882a40bb028d3f06ffda7665de24ba SHA512 059c0c72929c37d258e558e53b5e5f30d543c7d7bd3080fed0223599388c638ad1fdbecbf15a0fb100275c2f86b771dcd56539adee7c8004e6b3fdcc5292f149
diff --git a/acct-user/i2pd/metadata.xml b/acct-user/i2pd/metadata.xml
index 5d25e0368234..54ebb476112c 100644
--- a/acct-user/i2pd/metadata.xml
+++ b/acct-user/i2pd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaikaikai@yandex.ru</email>
 		<name>Alexey Korepanov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/inspircd/Manifest b/acct-user/inspircd/Manifest
index 7baf0016f2db..d5e092f295fa 100644
--- a/acct-user/inspircd/Manifest
+++ b/acct-user/inspircd/Manifest
@@ -1,2 +1,2 @@
 EBUILD inspircd-0-r1.ebuild 245 BLAKE2B 6a4ab1cdfb63dcc976506b6911e162edcb948c55eaf2c02f96be92785d750335bd4174345cfa1e38fc0ff2c62d229dd9a707d7f10ad15421f87389e5a5509fdd SHA512 23c93b5172423dc98f935dfecd5c329f76d2d2c9bb64b4a321b64aa0b5f3c36f1803c1f1c86a6074e36bcb0c6cb22d256d60aa3836f6f2d46a1250feb650f15c
-MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
+MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/acct-user/inspircd/metadata.xml b/acct-user/inspircd/metadata.xml
index 2b340d2c9798..cccd8e9eeb02 100644
--- a/acct-user/inspircd/metadata.xml
+++ b/acct-user/inspircd/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/ipfs/Manifest b/acct-user/ipfs/Manifest
index de4ddaf23c07..5b16d55c22a6 100644
--- a/acct-user/ipfs/Manifest
+++ b/acct-user/ipfs/Manifest
@@ -1,2 +1,2 @@
 EBUILD ipfs-0-r1.ebuild 316 BLAKE2B 475d1c2e5f10a3087ad209f518a656c0a6c639b17df907e734dcc4ca5b74f9a44e30da164ab60a93554469a536fa4e6ee2703d3a23bc9dcda1633a9e64dd1fed SHA512 911065cdbd6d6858bacb0767cdfba720e5f1646475dbf72bc72bf27c6929c466594246143bcc032fb8e115fc441512d1f55db3b38896ac4b3cadbdcff11c9c79
-MISC metadata.xml 367 BLAKE2B 65b766163246840517525658e81e83dd8670a95df6421c866e19503c7f07ba9664ce94f35dd356cc41105f9b559ee1ce72d7c76c935c0bc0a327415b3ff156a7 SHA512 6e50491a88bbc7f02bdd2eeae5cac2c62b45d9868fd7e0747f24a224eea2e0bf5a216e3209a53dcb06fc18625d4d4442fd3706f81a859067df24dcc4e2873717
+MISC metadata.xml 397 BLAKE2B 20d2d79ec0a405d0fca9e4da849442129a7916f49441896b03ac020798dbd48d35ffdbe955d4eb87766fdbad212d44ba7309a1b701ee40d2895e23657b34edde SHA512 68520e8ebe14fc170fdf0f6af3e432a1d12ad9751da13aade825f32299a635b7fffc277a0fbcba3dce42ad5f8df336c5012b6e27f9f9ab7bf3bd63c9622a61e3
diff --git a/acct-user/ipfs/metadata.xml b/acct-user/ipfs/metadata.xml
index eea561c5517f..79a2badc8455 100644
--- a/acct-user/ipfs/metadata.xml
+++ b/acct-user/ipfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/kibana/Manifest b/acct-user/kibana/Manifest
index a47b6a011d13..dad500d4f7de 100644
--- a/acct-user/kibana/Manifest
+++ b/acct-user/kibana/Manifest
@@ -1,2 +1,2 @@
 EBUILD kibana-0-r1.ebuild 287 BLAKE2B 344cccf7bca13602e7a7c782bce7ab8f5bacc7fe2d80d9d8bff694aea470cda8449c8b394f25eb281875bbf510dae6f5ea0b14ce17154d97ea2fd91ef147ca21 SHA512 9ca7754ad2b47570349bfcdbdd9209553d42782d5ea897f892dba0c3b49e4da62db825de4ba88ab78793993e64e7cb38f3a538ff7702708380344c2b3475b0a5
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-user/kibana/metadata.xml b/acct-user/kibana/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-user/kibana/metadata.xml
+++ b/acct-user/kibana/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/knot/Manifest b/acct-user/knot/Manifest
index e48b63330907..c4e4b5eca4d5 100644
--- a/acct-user/knot/Manifest
+++ b/acct-user/knot/Manifest
@@ -1,2 +1,2 @@
 EBUILD knot-0-r1.ebuild 262 BLAKE2B ee66db55e0086ed6aebffc5aa160db5255bbb2a6dcc4b0dbb0cc8e8be31310d920b4fdef9da3c3f91d72713321b53a1f2947c47160c92a6a5fc7dfaf4b17f22b SHA512 5b78bb7d5b187964389db20269e25b14ebcb78913dedee7c642c031aa72b3965a44ef34bc5be886c5c00e436705588a65835bf62f6363741fb1fe2870a109885
-MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
+MISC metadata.xml 405 BLAKE2B 707ae1db24849c15055554e5411e9eef759457fd605d42c9f487f02ad0649538fc1531b11219f88a12b2ec6f6ce9291e7a0ed26ed492740274cb68d3edd4c69b SHA512 8d1ffeabe9690928422089e31eba7b94bb5f0b8e07a94de043def0d7543c97291cc9892d6a594089fba4eca2b382334c84acac34b7f4815b69d8b3ada9b84d15
diff --git a/acct-user/knot/metadata.xml b/acct-user/knot/metadata.xml
index 89aeeb96e865..01b903b2b23b 100644
--- a/acct-user/knot/metadata.xml
+++ b/acct-user/knot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/logstash/Manifest b/acct-user/logstash/Manifest
index 19874b729c67..e9ad8ea25544 100644
--- a/acct-user/logstash/Manifest
+++ b/acct-user/logstash/Manifest
@@ -1,2 +1,2 @@
 EBUILD logstash-0-r1.ebuild 293 BLAKE2B 09bbcf8c584c2b718581f7b8a5e6ee473dfc44af0cd1e62aa8530fb07d8099eeac21f569d6c9e6f43a1e5e8839dd8091002f18e4c33bc31e1f010127892b6c8f SHA512 dca82fd0a20d3dac218e9e662155ad55ea6cd63e32d79862e3af6b8659a60676992786db888aaa11df7590607214833d6962f61648f0c400431da7945045e79b
-MISC metadata.xml 367 BLAKE2B e097e21e47801881c518a489845a2432b045c4a310c501ba1c6a50ddd0a4cacda3f55cafd5158035bd6a56a2025715557b4bd5cf7ceab84bda4b30b7e2bf4f3c SHA512 5f98a9d303518510edb20966613c7b6e2eaeabe30445d41d2c3563a3cc76368fe59f2e3240545b503de134adbde68bc2f6e77bd2f7da428ea871b18b7008beeb
+MISC metadata.xml 397 BLAKE2B 85596440acb35eda62a643c7ff5d48f51a6966ced81f585372cfb86348ce0b641eaf1c15e56aee9797126981f19e991a84f8a5f4bf9440255d4b1c587edb44bc SHA512 955b92d1c205ac9313fdc24f77d4bd8297a088f814c1685b7408e5cd43643ef375fc97cd878e71c54281c2023d7288bc275af883ad589f6f563acf8899a9cc63
diff --git a/acct-user/logstash/metadata.xml b/acct-user/logstash/metadata.xml
index 90fd593b4cc0..96e8c9b26b25 100644
--- a/acct-user/logstash/metadata.xml
+++ b/acct-user/logstash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/milter-regex/Manifest b/acct-user/milter-regex/Manifest
index 64def059967a..562d953696dd 100644
--- a/acct-user/milter-regex/Manifest
+++ b/acct-user/milter-regex/Manifest
@@ -1,2 +1,2 @@
 EBUILD milter-regex-0-r1.ebuild 252 BLAKE2B 7274e10222867b7f77e28c222d87d0041a3196783dc39ee04c4137e619697c386be910a735e343b2682265a0e5805a89ac0132186118a1014ad2898d7132cb4b SHA512 1960fc8a23f4f3a577421eef45f0ccaef697f576e157e96a3ad8331fe54cbde25268a038e72ee5f9b386bad24babcd7baefdf7580e3d110929a93aa727b674cd
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-user/milter-regex/metadata.xml b/acct-user/milter-regex/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-user/milter-regex/metadata.xml
+++ b/acct-user/milter-regex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/minetest/Manifest b/acct-user/minetest/Manifest
index 8fcf85fbe89b..c4d62af4b2f6 100644
--- a/acct-user/minetest/Manifest
+++ b/acct-user/minetest/Manifest
@@ -1,3 +1,3 @@
 EBUILD minetest-0-r1.ebuild 249 BLAKE2B 506ae0d79347618d84b5f25e86ed4cf8b11efbef7b953d78868ea86995618824563a3f01d770f467c6db1e426543195e63c126d2e440d5ee7cc239cba3d26944 SHA512 d9f3805fe6e9fd8c69233a40853b3752e779ddadbaed95c2e4456d2be5c8a710cd1dc397a17dffb9569f186823f61768b6ded42cd21f9f41da6e90d9f895113e
 EBUILD minetest-1-r1.ebuild 279 BLAKE2B 28b1814d4644e4c2eab068b1d1e59471c290981531a7d7ac4bc6e4bc25a3a900e502904f6b3f8b86809a7a63b523f011f53a0656a41ed9eb6896267378d94c6c SHA512 974c3eb1106438f42301d11289243995a4ae3cca1661e5fcb1267fbcd1b6725f98e6f5760588e1f5e6f1054542242aebbf91ec03a516a14631db5a2928e6ad58
-MISC metadata.xml 491 BLAKE2B 8441e9b587930bc5d046e54c835c6cbb35025afe3523e24669e33dbb68f1a22731dd10c90939f3cbdf8a2da9298aa6631494ff9917bb66276eeb21c5f516ae41 SHA512 f511c893a3d504dd36a0dc9f339e48d5e6d907a3145cdd182717a9ab5000de5d8a8b22455fc90edf13681e81e797a0ea7f3bb6ec7da7fb22b0902063593672fe
+MISC metadata.xml 521 BLAKE2B 8330c4adb8cb69d54e26bca586a31aba16b3ae36463402118544f544ea83c47ad6e235973c9feecf7b04199877919988fc3cf98d6682f424e568d74f642390e0 SHA512 b666c820aa825ee4ba8536ffd1147c45adb09aa9b224262cda2d6cb5c8c4a11928e6a755317a9096db8050f03f34fdd3b4b6a602e40b286e76738684634ba1e8
diff --git a/acct-user/minetest/metadata.xml b/acct-user/minetest/metadata.xml
index 2c5233e954a8..8a3de9738559 100644
--- a/acct-user/minetest/metadata.xml
+++ b/acct-user/minetest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/mongodb/Manifest b/acct-user/mongodb/Manifest
index 9cc043612769..565959507c57 100644
--- a/acct-user/mongodb/Manifest
+++ b/acct-user/mongodb/Manifest
@@ -1,2 +1,2 @@
 EBUILD mongodb-0-r1.ebuild 290 BLAKE2B cf28a1b81945753e527b376fb8e548269160ddce9e09d4f79644dfbf2d6ae61a904414ad4c80b2b817262f96f82efb3cab2807940443bfe3197989d1105ffe4d SHA512 8a9135c178eab42341fcd88e71a7965c1916e90ff37f5f8849bbe14cacf13bee322dff99efa7ec900982fecef7b7cd8acf85885ec5f72e4e3d905f8d76970998
-MISC metadata.xml 475 BLAKE2B 34418e185f3fab848293fd43b5d8915188c8b12861a4c1e98fd1a1d3d85742bca2c245ee3949efa05e248196274d376467f8607dd6638213e23eaad079c37cf6 SHA512 bd34b45eadb36fd0dcbaf4d26dc6a382a6a3e6e383a85e99e1b7e1c84b9d6d1ac34229dcc96ff4aa5d73fbaf8a988e89b62cdaac7b23d6556711eb2639c119e1
+MISC metadata.xml 505 BLAKE2B 24b8fa3f6f8ab5b3c6660ad089a904c947f1efc834b070df6cb6661bd2202435bfd8946b770dd5d394a8e76e2b9479abc6e559608815000b25834668322cc5f2 SHA512 32657f9fb16416723df3c36abb11462b9ca364bd6e4d4f602bef94e6612de36374c25cc313d40ce129f854b34df11822cd488935af3db2e8e2dd2e62a903f5e4
diff --git a/acct-user/mongodb/metadata.xml b/acct-user/mongodb/metadata.xml
index 91e6ec605462..c66a29d26a31 100644
--- a/acct-user/mongodb/metadata.xml
+++ b/acct-user/mongodb/metadata.xml
@@ -5,11 +5,11 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/monitorix/Manifest b/acct-user/monitorix/Manifest
index 875c26e218f4..7c4837f77c9d 100644
--- a/acct-user/monitorix/Manifest
+++ b/acct-user/monitorix/Manifest
@@ -1,2 +1,2 @@
 EBUILD monitorix-0-r1.ebuild 236 BLAKE2B 28a4e45994bdb4eeb08078aa6adc9b3eb9beb3051fce870ee5c47fefaf33d90cbc1c60ac047b7687d405e79cf821daf50a4fd45c857ae96b3bb26116202115bd SHA512 634e23889b5eaf9edb79285401a7ac2274a1524f882ce1c7bef21f83327d45dc8beccfc4f7184aaf6595a229d99a136d87064ca09322c8653549abc35da2805e
-MISC metadata.xml 360 BLAKE2B a5d2f7e18dae66369c79b50cd110f8daacd4e6a6efe2a69e3ee90916a4362b360cd27946a2a30f3ee80fdd0fd427e476110f9573667becfca9bf82aba5c9de79 SHA512 5dd38dfd0392789a243ceea17842686062d59c04459a1ff2bacccbc630e8027a59d5380f920227ae444668187a50176d7b8aac0c50c4d71b3b5780c09e8d60b7
+MISC metadata.xml 390 BLAKE2B a9a080cde7aa92ad742924224d675855c938911ce5d1c3fede6354c2dce707e7bed82a716ba18e7b52292e861521148efe0b279ef9e76c394ab7cedada5895c2 SHA512 8bae6f32a806a22568016bf141ed2f085a12d2020920e27f597af744029e878cbee8d0244853ef66b649078c33f8c4a854566154353c24d8d65ea08c7f34db8e
diff --git a/acct-user/monitorix/metadata.xml b/acct-user/monitorix/metadata.xml
index afc56cf98028..77c76f6a7d44 100644
--- a/acct-user/monitorix/metadata.xml
+++ b/acct-user/monitorix/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dwosky@pm.me</email>
 		<name>Pedro Arizmendi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/mosquitto/Manifest b/acct-user/mosquitto/Manifest
index 338fccfba6f7..95f759041842 100644
--- a/acct-user/mosquitto/Manifest
+++ b/acct-user/mosquitto/Manifest
@@ -1,2 +1,2 @@
 EBUILD mosquitto-0-r1.ebuild 251 BLAKE2B 0da801820587e7252c41e0e1880eed442e1a483e854790c12fac4e66999a68fc71923721bbc58630357f04e13ccbeedc797df26c39972dba8629adc22f5dcfda SHA512 c5f611058e18d9ed366156e19258e02eb9c46af2187f1430242e002da7420a0c1d9b82252f882c9f25de0f89315db95a27af5ee1c232496428ccde60d0bbf0a9
-MISC metadata.xml 246 BLAKE2B d6a06583d1046773ef6fbab7a6e6d170efef20a7e432b4b984e937ce528c02cbc0b8db6c611177afc7497723c19499962dac9b4034ae129157a7c60aadb43567 SHA512 4bc4d1b3813edc829ecc432a9ac1520823b9405e8dbd8ea7d2c5360b8418ff7ed0473e446a936c8dbb8527f7da4180c42fc73c02d9f3e7243643a4185fcf07f2
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-user/mosquitto/metadata.xml b/acct-user/mosquitto/metadata.xml
index c74515c3e34a..b58e8386fcb2 100644
--- a/acct-user/mosquitto/metadata.xml
+++ b/acct-user/mosquitto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/motion/Manifest b/acct-user/motion/Manifest
index 8bdbc0830f6a..98771ea68101 100644
--- a/acct-user/motion/Manifest
+++ b/acct-user/motion/Manifest
@@ -1,2 +1,2 @@
 EBUILD motion-0-r1.ebuild 268 BLAKE2B 8f46b51f52ff016e8c91862eb708e05ae4697c88e60b71b3f32da32538ae1dc7d581a593c6203aec764a52e0e6e36e9c1d3d1ca47e78b288189cfecfc15ae33c SHA512 3db269c8739f01541a6b78124f45bb020ff77372f9f99d496fff22e99723955193d6f43e75fb0abcad41e831ea7d693ce7ee2fc227cbba537a6e57860a58e4d1
-MISC metadata.xml 365 BLAKE2B 771727cdaae273cfc8949eb77e62c9302d8b0301aa4bb6b64ac0a3c49e527b19382d1a98e1080fc8f3b16e27afff4ef17526f5ed65ea640e78c03f97a6a817c8 SHA512 d5c9f2d9934bcf9749a3d8e663d8bd256c814e129598301a5e629b57957732675ad3885f75705fc11b9d616d310b082abe52e2b6b461ab31503545a866127203
+MISC metadata.xml 395 BLAKE2B 5d13daeaab25ec32968c856b1f2ba3451ed3c448a17d28a77b47f9950c18658bc45b6d69ef9a4a0618dea67413059c8c69a7feb5bdc077b8882b88f8122a5ca0 SHA512 9e4b587d1e39adb536d6fee6c70780e0608b3147589d9a50859bc587e6f36fefecaefe8e01b998c6afe6a5252e20cab0e76319aea7b8f65deb3ae341c9a1db0c
diff --git a/acct-user/motion/metadata.xml b/acct-user/motion/metadata.xml
index 1152c2457fc9..c1a7e3dc4e08 100644
--- a/acct-user/motion/metadata.xml
+++ b/acct-user/motion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/mythtv/Manifest b/acct-user/mythtv/Manifest
index ce7ca8a917d8..898a4116e59c 100644
--- a/acct-user/mythtv/Manifest
+++ b/acct-user/mythtv/Manifest
@@ -1,2 +1,2 @@
 EBUILD mythtv-0-r1.ebuild 328 BLAKE2B d643663b87de960ddf934c0c3d8364b9ac63f3103425ef066c7c6536c4f026463383beecb53599c539cac266f8ff67d515eca5723f96d7f97f05c3b7d9a9bdf9 SHA512 4946f8af3e14eee96942486dc8e48da04d11bd6852688b6cfd5ce2fe91c5fb34a3a2d7a09fd242ecc0c40912a3118f96f1b8c97ee27efd17342af0c4f3ae2885
-MISC metadata.xml 381 BLAKE2B 5ffa518c826118aec9b46d3e964d52f21ef19332b0ee956cc153b992eb5c85af27ebebfb6891156262eb19e65b0b47f076d0940b490fadb42f2b04d16889b550 SHA512 4cf06e9cd0ab6bce4c38f2b86c4875864924616746fb18816f647dfb4cacde6e7678c2f7a20c0de94194e9227d6133efded1f81ac2064b7d0532b445cf041b38
+MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/acct-user/mythtv/metadata.xml b/acct-user/mythtv/metadata.xml
index 70e8a88d6f28..7e23aa8c7dd3 100644
--- a/acct-user/mythtv/metadata.xml
+++ b/acct-user/mythtv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thebitpit@austincustomerrands.com</email>
 		<name>Wilson Michaels</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/ngircd/Manifest b/acct-user/ngircd/Manifest
index d092194abf47..ef3ae488a41d 100644
--- a/acct-user/ngircd/Manifest
+++ b/acct-user/ngircd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ngircd-0-r1.ebuild 235 BLAKE2B cfaf08dd4e18736d778a87fc69c9bb97fc32e888401dc5f3dcf2c77d131e61c376414b3059458088e0006649539226dd10ad1491806fd7fc974656d6e5209bd8 SHA512 1c16d85946ebc58cc79aa26c8ed1903bd330eb2e0fd0ef089fd2dc35115bf6beb696eb2d0b81f1173e9be362795e0d9f32459d5ca4b7d795ee4ca7fd459415e9
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/ngircd/metadata.xml b/acct-user/ngircd/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-user/ngircd/metadata.xml
+++ b/acct-user/ngircd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/oidentd/Manifest b/acct-user/oidentd/Manifest
index af3ca73f8790..83d53045ec55 100644
--- a/acct-user/oidentd/Manifest
+++ b/acct-user/oidentd/Manifest
@@ -1,2 +1,2 @@
 EBUILD oidentd-0-r1.ebuild 198 BLAKE2B 34eb82955a942fd447d028cf6b85363db45d940072847b25d62893c75352cd0c667a77f9f8e16390c85856e30efbc294f283c43415ff5c11b5f8b185671e6028 SHA512 4c8b8057009972ce5aaa10bb12711ca98112b7c50f0650d97f4f1b4c1e455bed54ff8ef8d808215ab46a3f4fea48b7393a985d1ec802d91e323b341601781060
-MISC metadata.xml 362 BLAKE2B c595722a66e2791f5bd9aa268d8668e3e46c8e6d44c9878c2d4e4e013c9a3866336a52aa0faf5cb3bfd60fafea4b8c8bc20bd43102f66cc1ff97e7547ed44bc7 SHA512 e0ac18808a4e07750a5015cdbdef7883b750565058b94fdedd3b45189b3b0daeb593c31daf21a0d58a539d61f7e2116cb1ed1847c46fbca6e11751f57ae16bf6
+MISC metadata.xml 392 BLAKE2B 25b4dcca5d1a6686da9b4b3912829406c1f3c8e105ca1791a8fd295c05f1c5354c90e4bb1c361a4e05ba773473e7f0b88416d31c3865a251fae25b7712cf38d5 SHA512 97a890df289b97fe86cd18b7a154c1357455ce5ad0d7fd0acf855b6c981db40c6c5e00fc26184175df83a4a303ed119889755c88ea204e1ee21f6fcd7fbf2a60
diff --git a/acct-user/oidentd/metadata.xml b/acct-user/oidentd/metadata.xml
index cb9c34b1836a..ea088a99f737 100644
--- a/acct-user/oidentd/metadata.xml
+++ b/acct-user/oidentd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/opendkim/Manifest b/acct-user/opendkim/Manifest
index b91d6a81b557..37c0449d80d5 100644
--- a/acct-user/opendkim/Manifest
+++ b/acct-user/opendkim/Manifest
@@ -1,2 +1,2 @@
 EBUILD opendkim-0-r1.ebuild 232 BLAKE2B 56d87519a4242e428d61466b9b5699054c10c58ee41251b31dd09187b1f629f841c5032724be59b2117561dc8b2d55823f1e659dfe7d7df4240a915f970c9569 SHA512 804499e34a9a1e2e8f19b5102f45eea69bc738d6514b5f5198266ea06f49a4ef15aa18851546c1258b36c9ed4b11d041c0cc82173d501dd3e15cf243e9a35b02
-MISC metadata.xml 355 BLAKE2B 5e3838161d4f925e539a0f45d59ffcf03a1ad78f0ca3febe415b3ee1a4308038af6b0912efbdba4d0cadde5bc68dbb0cdbe48f9cb9733454f28771a4a657c5cc SHA512 c3929342f23009641741f498ec0f5c6931b9f964f871b94722c872a5bbf0a15800f9c79e8186b021f2455980efa02996c37d42da1777daae4bac2e1abf6f8087
+MISC metadata.xml 369 BLAKE2B 86f3d2b74fcb82851a0595375c90f5f78da0117789fbfe1fee61f760d58f687b256f596fdc7dec55397b93126646e5014765c440283535e5365ed61ca6233e72 SHA512 c62399a73c5ebb7c6b346ba6a993c9999286975080e88b74e082097ddf270e556b9470ffb6156fa25c7fbedbb9a5d1d3bb70b73fcc289166e31e2b9c6de11359
diff --git a/acct-user/opendkim/metadata.xml b/acct-user/opendkim/metadata.xml
index 49274655a860..1f6b32b95fd1 100644
--- a/acct-user/opendkim/metadata.xml
+++ b/acct-user/opendkim/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/acct-user/openntpd/Manifest b/acct-user/openntpd/Manifest
index 237d1a4c74e4..902d827881f0 100644
--- a/acct-user/openntpd/Manifest
+++ b/acct-user/openntpd/Manifest
@@ -1,2 +1,2 @@
 EBUILD openntpd-0-r1.ebuild 309 BLAKE2B 858a999dd04a60e9520b448ddb3797f5a527064abdab0cac4e54eb88869bd79a95a0114bc7660d6803678f0f30cd32467838baf9590eadd736808a60f42f420a SHA512 49137194f13147070ac8432bc610cc45befc6feca90368a1d0fdd685a05a93b1e0d2bc05cbde823d2d55b088f0d7839cc005c34c0af9c3b07ec49d4fe5c872ff
-MISC metadata.xml 361 BLAKE2B e87dd9324a648e9653e2c9765fce14c381f62e6a0a1ff8a37fba42ed632e3e6b97e3e6ca6b63d72cae77009318d37e2eaf767c072cc378e4304ac79eaee29b8a SHA512 62cbe01f116c560b2c2f5ac9419d8de3c262291cc3a12b529ffc71fd366de0bb1911e5564bd55cb6cbdf9d5548ebe0415c5ed0d5048c5883be17e00554ac33f6
+MISC metadata.xml 391 BLAKE2B 3a5a0425b282fb3bf482c2324a94d313b32ac75c71d8330b6273f768b07b6ae9fe6f3b92e0cc465b1a165e5db7bf7c678f8ceec5805707d53b4677197a43318c SHA512 fd2d57f454b548f2ebac2562fcdb70e76cd608694d7b80e68f8cc05a17c5b24cd84dec14e4cb1b745b0f8b2b6072d06f5bd7d16626a136c84f6c708f2e6155f0
diff --git a/acct-user/openntpd/metadata.xml b/acct-user/openntpd/metadata.xml
index 9c1fc34df050..40f8a7a4302e 100644
--- a/acct-user/openntpd/metadata.xml
+++ b/acct-user/openntpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/oprofile/Manifest b/acct-user/oprofile/Manifest
index ae25e3e4cf5d..a1d763262b69 100644
--- a/acct-user/oprofile/Manifest
+++ b/acct-user/oprofile/Manifest
@@ -1,2 +1,2 @@
 EBUILD oprofile-0-r1.ebuild 254 BLAKE2B 7466e42780d328dc9f97499b6065a66879f2ee771e602a3541d108db7405242ea562363729707d7d45fcb8c2f42660136ce03f86c3cf26bcd5df351e76741bb0 SHA512 cc86ec38f94cc9011e4f0aab84ac749043e67d81ace47e62ec690ebfce312c020acc3c7224c362fda39da9ac7f7ea86ae276d08042c87133af314056774b350c
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-user/oprofile/metadata.xml b/acct-user/oprofile/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-user/oprofile/metadata.xml
+++ b/acct-user/oprofile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-user/oragono/Manifest b/acct-user/oragono/Manifest
index 67be78aa239b..a4d4bab7a810 100644
--- a/acct-user/oragono/Manifest
+++ b/acct-user/oragono/Manifest
@@ -1,2 +1,2 @@
 EBUILD oragono-0.ebuild 239 BLAKE2B 3727dbbaa5e1313a0e328cc0ffa8ccedc1d0ca7449e6300744b5b86c2c655417b68b77745a83473d38ebf78454e564c8a4415929673382e1f07a2aa70e76798b SHA512 642fee402a83672ed6780cb207432347fa0ebf188b3eecc747731c0666dbfb4883417b7a301ebc46206625ace3be3c770e7ec87785318767835c3f6ee30a2e16
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/oragono/metadata.xml b/acct-user/oragono/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-user/oragono/metadata.xml
+++ b/acct-user/oragono/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/ossec/Manifest b/acct-user/ossec/Manifest
index daed8feb983a..e9925aefe9cc 100644
--- a/acct-user/ossec/Manifest
+++ b/acct-user/ossec/Manifest
@@ -1,2 +1,2 @@
 EBUILD ossec-0-r1.ebuild 289 BLAKE2B 5820ea90a2ed2f8e100f8afa0e40b2bef5b80f4af88addeafe3bfb4f88b04c301457fba4a41c8a0b1a9ce5ce98136a2ed1f2d1990f4b5784ffe7679c696f09d9 SHA512 f1ca67bc0db90aeae7259039cc2e6a30a3190c054cd11c3b15b8793feff101d8961471ee488484bc4950b885c3d21934ef1554cd2b2d16fcaa5c3c40bbdb1240
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-user/ossec/metadata.xml b/acct-user/ossec/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-user/ossec/metadata.xml
+++ b/acct-user/ossec/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/ossecm/Manifest b/acct-user/ossecm/Manifest
index ad3c0f65cde5..5a6cfaa268ed 100644
--- a/acct-user/ossecm/Manifest
+++ b/acct-user/ossecm/Manifest
@@ -1,2 +1,2 @@
 EBUILD ossecm-0-r1.ebuild 247 BLAKE2B 288296ef31b602e1dac853b031fab1a5b3277259de84110ff223c3bd1e6f4ae5446c9404347f1b66c980cd0d5fdaf864212d1f0a36c1ab53b017e3bb1d321053 SHA512 cbb873005ab2ac5e17c2c2b2d8640a66d69fb9eede52bbb7ff27961509bf50c81f02cf47d1e850a9067980b4f820c499a8392f122506cdec1b7f05deda538465
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-user/ossecm/metadata.xml b/acct-user/ossecm/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-user/ossecm/metadata.xml
+++ b/acct-user/ossecm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/ossecr/Manifest b/acct-user/ossecr/Manifest
index 804cad27e4ab..7704cd2cf8a1 100644
--- a/acct-user/ossecr/Manifest
+++ b/acct-user/ossecr/Manifest
@@ -1,2 +1,2 @@
 EBUILD ossecr-0-r1.ebuild 239 BLAKE2B a3d0b70d0e176b6fd1bbfa834cb45807dde16139ae9e53646bd87e847b61bcec310f45b6a14b1d3617649b4335adcb55537f8556b8996813ea1bacac86b337fc SHA512 5d633783b8a8f680495fd116270b7b5dcaf2e3faff80bc3048fba5ca5c26f683a46e8864f91c85c6937fc4d2b2e9077e90b4ef4447d8fa66903d2d411d799201
-MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454
+MISC metadata.xml 395 BLAKE2B 179fe01fad48578620d9d77da2d2749c232e600cae858208ef154277ef389f7c7b4ebf66bdb993948a73634780bf3a8ee48fe088f7a5c2ef650c939a55b2e599 SHA512 81a638429473116d9ad6d25a4d33f08f887fbceb864ee1d569dfebcc379e86fbb3db267784451c52bf08d76068eaa588807befcd113b8a7ddb59c74838e2b787
diff --git a/acct-user/ossecr/metadata.xml b/acct-user/ossecr/metadata.xml
index 7f768180ded7..2c2d077c8524 100644
--- a/acct-user/ossecr/metadata.xml
+++ b/acct-user/ossecr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/p2p/Manifest b/acct-user/p2p/Manifest
index dbe79d90bcb0..0c23f9266975 100644
--- a/acct-user/p2p/Manifest
+++ b/acct-user/p2p/Manifest
@@ -1,2 +1,2 @@
 EBUILD p2p-0.ebuild 226 BLAKE2B c2fd54a7797a7b21642a49667bbf388e3feab159b5a7fa004fc58a1bfdfe3b5fc8a7db3bc157c49c871a25e9a2642737d82a2d143028b5722a2ccdecce3ed95d SHA512 32ac4a65866519ae80f285b1d5bc9142e192f0f2c41a462c55090d2513869d82535d0cf78c072a82d550379d09782965043265bac8032a4723d101ead1c4f64c
-MISC metadata.xml 376 BLAKE2B 4d4ed08207626087fa81075957fe588de18b3cae28f2ba0e75412a71fb33ffeb7663f8c95ba54b0e8b82d8a75a961f97800b12a8bc5fa915e9e06e945b5f02b9 SHA512 74f6d8e311722a1b609cf6f9fbbeea942f423acff1b52e6f23a84f3f6ebb68c958f59f7f242724f1eb1c334f43cc77abfffacfc88145050b15d7c37c1e6d1e10
+MISC metadata.xml 406 BLAKE2B 9f091e31a13974b357cb9e9d96356226a9cb1a45165f270e2ca8aa9c66d4880e3f15ff67eed42de02a4c899fcbfacd189b0efba024c5faeef03a8d84b7ab1075 SHA512 090d987666a219434572fe92d06023fedcbbadf1066256c0c492136b47d384a338b8f4526cf6fd5f81bd0cdb7549b5274bf24793d331b5ed7d18f4a5f879823e
diff --git a/acct-user/p2p/metadata.xml b/acct-user/p2p/metadata.xml
index d4b2e3c17a9b..1f79b429358a 100644
--- a/acct-user/p2p/metadata.xml
+++ b/acct-user/p2p/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@chuso.net</email>
     <name>Jesus Perez Rey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-user/plex/Manifest b/acct-user/plex/Manifest
index e1275a02e1fe..ff173ff31826 100644
--- a/acct-user/plex/Manifest
+++ b/acct-user/plex/Manifest
@@ -1,2 +1,2 @@
 EBUILD plex-0-r1.ebuild 278 BLAKE2B 7659458e6d7821b41ef978163542273b0d83558c672514f1d120b907d6850e9f702c9d7f4f7a0e15d527ab113da7f3a8a7289d0d59f90caf03d1ead150fda750 SHA512 e50691af58a4e0e32917353797ebbb7093ce3bd0f6ee6074ad04de5db0dfff6d16bcb632f83c87460e9a9ed1d23aa84c5ededb8a5148d668734480c93484081c
-MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
+MISC metadata.xml 397 BLAKE2B 18df486062b78ec7dfbdf68a3a2614ac861172e37c6ef47830422b1e3245404e574fe99487f0d69c34cc7bfbf7ac29db856329a268b030f3fc4a42fa2f034f53 SHA512 be52f46cf47c50a65869ab23e0fcd323c459ea79250b7c83800fa0b0dab2d11f24f649c875bc857a5bd28edc80ddc0ff11b4bc94057f65fa64827d6eeea9d16c
diff --git a/acct-user/plex/metadata.xml b/acct-user/plex/metadata.xml
index 8815e575c0e3..14af8f2a1b18 100644
--- a/acct-user/plex/metadata.xml
+++ b/acct-user/plex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ss23@ss23.geek.nz</email>
 		<name>Stephen Shkardoon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/postgrey/Manifest b/acct-user/postgrey/Manifest
index d94522e41854..7b435d8abee8 100644
--- a/acct-user/postgrey/Manifest
+++ b/acct-user/postgrey/Manifest
@@ -1,2 +1,2 @@
 EBUILD postgrey-0.ebuild 242 BLAKE2B d6621d74ef9dc47df80efaeae96b6e3e4d16e0f4a74dbc9efc5487ed8fe8835ded74642d37042739b1b98a04166511fcc7686545803ed9821b0fe54a659ea32b SHA512 02ce303963411731740da262cfb0701480036b525568b2fa5127bd7dba822e1ac6b19cb38fd06d44f1b4521dabc656c5a7b386e2e4f63a41a52fc364d305af1f
-MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/postgrey/metadata.xml b/acct-user/postgrey/metadata.xml
index 6356cbc03fb9..979bcc7aec93 100644
--- a/acct-user/postgrey/metadata.xml
+++ b/acct-user/postgrey/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/privoxy/Manifest b/acct-user/privoxy/Manifest
index 0f3403c722eb..c4f71c4238ef 100644
--- a/acct-user/privoxy/Manifest
+++ b/acct-user/privoxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD privoxy-0-r1.ebuild 248 BLAKE2B 0a8b6cabf92c93d74154614617658340a89726af5e693573ff466af664c0e6d8fa5ebdc47281539a72c038593dd39503cf30c5f49fa35cd9c141be30a9d9f1d7 SHA512 de640e59c77b6a1336a9caedacd016ce42314b48fb99c2a35d7aebfd0a6a6af75d5fb62cd5f5c6ce49d16c9e9e224160eb0bcea4b153c89b7adbe17177f01622
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-user/privoxy/metadata.xml b/acct-user/privoxy/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-user/privoxy/metadata.xml
+++ b/acct-user/privoxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-user/pulse/Manifest b/acct-user/pulse/Manifest
index cb4ef05ba584..823c79b5939f 100644
--- a/acct-user/pulse/Manifest
+++ b/acct-user/pulse/Manifest
@@ -1,2 +1,2 @@
 EBUILD pulse-0.ebuild 311 BLAKE2B 9ef945e674872b39940ea9a245996d3bd55c6c7870ea15e10df39921a6b9a4cc4604c213ef5bb0f70499890ae5bbc8d198a2908ae44e6cef2590b52bb32efd7d SHA512 c1ed685899ce34a6703e026534eeea17c70420f176da06b81497c9b09a96096377c334f1605558f0b24f725b00e32b04065122f2ce506563075d1caabe8bbfed
-MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/pulse/metadata.xml b/acct-user/pulse/metadata.xml
index b79c2cda0f30..996e7cacd217 100644
--- a/acct-user/pulse/metadata.xml
+++ b/acct-user/pulse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/acct-user/qmaild/Manifest b/acct-user/qmaild/Manifest
index 3260318cf18c..81a6383225e4 100644
--- a/acct-user/qmaild/Manifest
+++ b/acct-user/qmaild/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmaild-0-r1.ebuild 233 BLAKE2B 27038cc9fb9fc419e3cc2ce623789364ab1835913c5b506df16bea08c2f8e656bdd4e42e08dc7fce631858c0f5fb8b4c83caeb20343d287ee29044fc306b4049 SHA512 98968b7a8ddfd1ef1384de372b3f1f9bf8a2f6652e0ed069f68dbd7e217485766be1193bc709b19dc05319350b5a41e78df60872afd594d8be86582a60ea5ae8
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmaild/metadata.xml b/acct-user/qmaild/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmaild/metadata.xml
+++ b/acct-user/qmaild/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/qmaill/Manifest b/acct-user/qmaill/Manifest
index 752a71999cb6..0b0be406b42f 100644
--- a/acct-user/qmaill/Manifest
+++ b/acct-user/qmaill/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmaill-0-r1.ebuild 235 BLAKE2B dd2ad59231375414f51add32940742362a518a71f9b4f0abdceed14097355071e0f0e872c787442bd6f4ebc57f75f899ac2497489eea2890db20e8a93563e4dc SHA512 bdd80e0bed5689577f7b11b2a5619de755407914531a7bc7dc9678f8df466fcb9ce58def346a6fa87926b27e50e0789328aa6e71acf802e47a1a95daff41750c
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmaill/metadata.xml b/acct-user/qmaill/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmaill/metadata.xml
+++ b/acct-user/qmaill/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/qmailp/Manifest b/acct-user/qmailp/Manifest
index dc192ae570b9..0a758093987c 100644
--- a/acct-user/qmailp/Manifest
+++ b/acct-user/qmailp/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmailp-0-r1.ebuild 233 BLAKE2B 2d96e7ee8b958bfc6418f6c4d83aaa591c13392c2a6f0d44f0172b824430866b5d894d80797dabd0f3ffa162a4f81d91bfe5b49a392596b05e6f753b633a127a SHA512 7505cee64d4ff5c4e26c9dbcea71983ac49a3e83b7ff7f977a99c61ae41f31524cfd56e4fdb8d87373db10b145a01d330098c7a4d9c16f837f6b571d76511dc8
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmailp/metadata.xml b/acct-user/qmailp/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmailp/metadata.xml
+++ b/acct-user/qmailp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/qmailq/Manifest b/acct-user/qmailq/Manifest
index 578d7e0f777f..472e73292566 100644
--- a/acct-user/qmailq/Manifest
+++ b/acct-user/qmailq/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmailq-0-r1.ebuild 231 BLAKE2B 3039f2b284ba5830496778f6cc6008da94bf852f043f0e84918d3be1e168373780c454f1171352ca53a4a9b4fa44fe9c93a4b85feab156c875c27d9c12430eb9 SHA512 6262cbe3d3973692e57e90085c405f74c59a6adcd693d73904553e919eb317572384e0d0dd569af9978a4fd649d444a5f9a97a061a72ddf84a5faaa77e80d72c
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmailq/metadata.xml b/acct-user/qmailq/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmailq/metadata.xml
+++ b/acct-user/qmailq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/qmailr/Manifest b/acct-user/qmailr/Manifest
index f9c79a888aae..6072db28bc54 100644
--- a/acct-user/qmailr/Manifest
+++ b/acct-user/qmailr/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmailr-0-r1.ebuild 249 BLAKE2B a3fad32aa421e2905ab9673d569f400985ea539115e327d087304d418b941ae79837f48df93a075dc2584d42d47ea3c71429dbbc16a51d0802ead9fe683aaaa3 SHA512 f6f699adc85a3f671f1b4edf59c3720f59182d16edf866a9ab4c32806d87be22fa7e132c2cf17d5b7cc07bbd5e6b9fad3e07bec89321c573a185512eb30fa081
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmailr/metadata.xml b/acct-user/qmailr/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmailr/metadata.xml
+++ b/acct-user/qmailr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/qmails/Manifest b/acct-user/qmails/Manifest
index 2d171413dd12..db0d152ad54b 100644
--- a/acct-user/qmails/Manifest
+++ b/acct-user/qmails/Manifest
@@ -1,2 +1,2 @@
 EBUILD qmails-0-r1.ebuild 231 BLAKE2B bda6b7098137baa45a7820073bb045530647fc99941ee4e40ffd99f904e526bdd0fff9121af124c7129e7fc227030ebf6ceb2893748aebfeac950dcba0bcc1c7 SHA512 1746363a9170dc894cc258936afd4766081ffb64ec4e43ce993d99f477ba699f87d9d80945c3fc8fa5666d56699c4fdcac123efbe3f2ab93d4ed4f24fee5b134
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/qmails/metadata.xml b/acct-user/qmails/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/qmails/metadata.xml
+++ b/acct-user/qmails/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/radius/Manifest b/acct-user/radius/Manifest
index 74f83f67a1c4..fffca098164b 100644
--- a/acct-user/radius/Manifest
+++ b/acct-user/radius/Manifest
@@ -1,2 +1,2 @@
 EBUILD radius-0-r1.ebuild 233 BLAKE2B c92dba45cb0be09ed08d2c3c675170ddf3dcd909ffb7c56d60fecdb98bcd4077470a7946d4f630ba271f671fa562496981b0bd8418cd57b188f0419cb2dea2d2 SHA512 9cd75d55de303b1c8cb16a9fe39d975b9020cfdc303f1caac5c77c226b72e8aabec1aafcc8efe3d5c7489bfbce2b5f9b8e3b500ca0c5d2a218f4521f9e12a9c3
-MISC metadata.xml 364 BLAKE2B 86532d92dd0d8a219a2ab741ce27bfaf6ed29ec37aef0b3785c8b5bc30c3a460c8350909fb2d0d374cbf8f4f1c464a1363f9dcd1b6c526126f187196a424d8ef SHA512 4f57e81d788a73c51e4d8885d8ccdc0ddf6fcd480c41225a6f1042c949781c0872381fd975474521ad6c569b96a6e8ef7bbf71f75bddab41bd7c5b6797a472f5
+MISC metadata.xml 394 BLAKE2B dcd68c80608ba068d7fd48645f3485b79a0af88b7601e2101bd04b8a7bb8ef1120b4d5e1c602738d2e7cb3dd72cfd4887c3e198bed7b7911b02a8dd00cd22f94 SHA512 c688feeee5b067c1b5cfc805b5a60ecc6742015b7a0129e21435b7d948aeacaceec291123a02f12ab80ff1e90f46de128c40ef835c4804af7ecd9c2a584a8cf3
diff --git a/acct-user/radius/metadata.xml b/acct-user/radius/metadata.xml
index 3a673c3423b9..6f3b3cfdf2a6 100644
--- a/acct-user/radius/metadata.xml
+++ b/acct-user/radius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>geaaru@gmail.com</email>
 		<name>Daniele Rondina</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/redmine/Manifest b/acct-user/redmine/Manifest
index ec64203e613d..f3823a13fcc5 100644
--- a/acct-user/redmine/Manifest
+++ b/acct-user/redmine/Manifest
@@ -1,2 +1,2 @@
 EBUILD redmine-0-r1.ebuild 236 BLAKE2B 6e45ec678b369c577b9f70a26fc5eb4c2ecca097c7b31c7dc23e1f94fb35ba86ad4e0d9d74ac4fc874be6ede391b08be1058c55ae1cce5c0cd14556e5f9cea93 SHA512 0cb0f1679f7aacdd424756c9d18356301b037cd9fec6bf5a173443dbf9795b47869d0eaed7de23505f6c9f522f99aed06bd927e6361014aa75d316e2c3916b24
-MISC metadata.xml 408 BLAKE2B 3718e2f1fc0f2d461c973a6b8debe752d3e1829908a2becd5cdd9998c77572cb3fc25d53105ca700528ffba60f0dffb9f4a65693fd09b7b97a31791eb54ce770 SHA512 d47a10e95184164168d7a42b2bd91fd7ec24190ef877531233a9bd59f8df65c5123ce84dd540a697a31e4529d4cedf73f1c966accba3b8ec1ed4c4b051f761d8
+MISC metadata.xml 438 BLAKE2B ac438cce464af811b7f5344017c742eda1fd712dc8cff7e5d9c067bbf51eb009964e688e307135ee9317a80b8cd99d3e6bb9003491e6aac327934274c678bb3d SHA512 64e74af92434bd957113489fd8bc59532de7d80d6f2eea5513cabe2600a2b76993b3e83d153858d30ae1a52d7de47b5c375a2440511cd08c22aae444a9d4562c
diff --git a/acct-user/redmine/metadata.xml b/acct-user/redmine/metadata.xml
index 2c1710e359d4..71b8147b8ebb 100644
--- a/acct-user/redmine/metadata.xml
+++ b/acct-user/redmine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">        
+  <maintainer type="project" proxied="proxy">        
     <email>proxy-maint@gentoo.org</email>        
     <name>Proxy Maintainers</name>    
   </maintainer>
diff --git a/acct-user/rspamd/Manifest b/acct-user/rspamd/Manifest
index 9362f9ca5f4f..d0bb545eb753 100644
--- a/acct-user/rspamd/Manifest
+++ b/acct-user/rspamd/Manifest
@@ -1,2 +1,2 @@
 EBUILD rspamd-0-r1.ebuild 257 BLAKE2B 528c6849e445cf5785dd89314209da971a736da5ef56ae5d0890c7f41d6aac84cc4a4bfc474a75262ee93f2452aebc58be9330675d1b93640634d76578eb9456 SHA512 1d340ff2bfdf0031029040d75790b10825209c6da9a7161e376638c362e0a9eb16dc614466c0343bc9b49fa332a15908df58163548b6f8982303c3671600b008
-MISC metadata.xml 488 BLAKE2B d45e11d739abbaebb48c1ffc7652d63542e9b24d91f48292f6a6bb1f20e22ebc584b3ae98dcb58200d7bc5141e386e09897e89b19eec8c38d2a392c5caaac21c SHA512 bedae71b1c6ef0113bc2155f1839deb20a0519ef650358fdec0d7f9f3feae08265a15a031e60958ab04a87ba8c0c49e49ba819fc6035cbc1b7827694d34607e8
+MISC metadata.xml 518 BLAKE2B 85da66ea551dadaadd843606e9dae1cce5ba653e13e03d340ef3ceeab20e14a53228f8b52790fa5cd2cf0a1585b31d1c243118e7509bf7f3d1c83eeaa94202f5 SHA512 e718730ff116d305e0348cb6d3c22bb6ae702d6ba4eac162edbe4ff8ae628ca48a7a4691b488a96531b344281d1f1eb0678bc1a652f09130187fd62a33c5e8a8
diff --git a/acct-user/rspamd/metadata.xml b/acct-user/rspamd/metadata.xml
index ea7ff6741e1a..fddcd31e1a17 100644
--- a/acct-user/rspamd/metadata.xml
+++ b/acct-user/rspamd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c@roessner.co</email>
     <name>Christian Roessner</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-user/sagan/Manifest b/acct-user/sagan/Manifest
index e771ba14946b..55ae724d3fb3 100644
--- a/acct-user/sagan/Manifest
+++ b/acct-user/sagan/Manifest
@@ -1,2 +1,2 @@
 EBUILD sagan-0-r1.ebuild 246 BLAKE2B 63b7cb9412e18b329724e3c17ddd1cb77fdd3e694131d71a26dfa732bd309e1d1592b11bd82e0c048f4177afc04fddce130f33e221ff74c5b6355c77893dae7f SHA512 5ca89924496635c420791707161a2d250839540b9e5c3c9d56db4375d0b27d498a7956e1459c939a1e2dff6bc01db19652a5b1e5bc6063edec39f8b69228c46e
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/sagan/metadata.xml b/acct-user/sagan/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/acct-user/sagan/metadata.xml
+++ b/acct-user/sagan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/acct-user/scponly/Manifest b/acct-user/scponly/Manifest
index 4c7d645c5828..b1fd81027192 100644
--- a/acct-user/scponly/Manifest
+++ b/acct-user/scponly/Manifest
@@ -1,2 +1,2 @@
 EBUILD scponly-0-r1.ebuild 378 BLAKE2B 37f4a81b52b05d83fbd58959a1f869ad8a0040a1e57c1c8edbc5ab1db8b3d46d2b5163cc70f9511662d5e3bc57648eba2df373ce74de8b245162d0c7a960382f SHA512 d18eda238f1cac265c058c0375231f30b94e1fb7a7f48d92471edc61cb989c4e50eb66f095493b60c7dca4320b6eafe27d898cab3eba6654710077242dff3415
-MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5
+MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/acct-user/scponly/metadata.xml b/acct-user/scponly/metadata.xml
index 16853472f6b4..d095ed4b8f81 100644
--- a/acct-user/scponly/metadata.xml
+++ b/acct-user/scponly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/serf/Manifest b/acct-user/serf/Manifest
new file mode 100644
index 000000000000..69dd5188cbff
--- /dev/null
+++ b/acct-user/serf/Manifest
@@ -0,0 +1,2 @@
+EBUILD serf-0.ebuild 264 BLAKE2B 0dbf1c43ac94e621e5e8016a475e8e76b275b7e1d30138aea4786041bb40ffa69e252803ec8b4232758cdb17e91e27e637ce8df4d18c85d4eb502340f6a106a2 SHA512 3637e5e938308a345ecf645ab379a9a3ba0db7c71abfa7fd391347c9d6ab68f6948e4f01dc90888bcb3243b2d93a2dcd381cee72970cce7296e29a1561d714dd
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-user/serf/metadata.xml b/acct-user/serf/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-user/serf/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/serf/serf-0.ebuild b/acct-user/serf/serf-0.ebuild
new file mode 100644
index 000000000000..69ba27af0770
--- /dev/null
+++ b/acct-user/serf/serf-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 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/serf"
+
+ACCT_USER_HOME=/var/lib/serf
+ACCT_USER_GROUPS=( "serf" )
+ACCT_USER_ID="314"
+
+acct-user_add_deps
diff --git a/acct-user/sigh/Manifest b/acct-user/sigh/Manifest
index 0c7aac333e12..f3b9fa9a3224 100644
--- a/acct-user/sigh/Manifest
+++ b/acct-user/sigh/Manifest
@@ -1,2 +1,2 @@
 EBUILD sigh-0.ebuild 198 BLAKE2B c71e87d8818c692471fe73692046c8c84d9f00bfaf744cbeb9702e325f115fd0447199f5c09ca2c8a3dc3ffbbe6b35f98fbbad13494d647999e08fac1adad346 SHA512 b31a67ecacd9892817039947552de8f5d48e137ef7029b2299beedbd4bac1f9b809d94e080c952c0eb6ad2dab3de2637d247565c4c84579cb3ecf4c172e1be51
-MISC metadata.xml 475 BLAKE2B 8bb668e126092bcf18ba8f3577861ddca556b2811771e9a3e6ae94ba5e548862c003e41f41afdb819c97f5ab25d37ee6ba165ceb71c1fefc96257c43a586a578 SHA512 e73ced717171aaab22791b3f44e4bcb8d580e3ed6f529a7992eb7d73c390aba57f0893ed9724bc8d3a1089111445eb1d148c5808b6a2658a25377769977c0efd
+MISC metadata.xml 505 BLAKE2B 74f6dd63edd85af462b3fd9da502b610cc7a2ea379521561bc2df23d37ea21b2cc00ea8dadc8bf115f54065ee6cf8188e44cfe8ce4f5ae0bd245adcd0104bdbe SHA512 db41c6d8bd242d187f1d3994c40e913755a56f39625ced7b54745d87324006392becb8eaaa80d0cfa1c5f6d5b0738c97b15a2b790ab7f4a3ac34230565f16489
diff --git a/acct-user/sigh/metadata.xml b/acct-user/sigh/metadata.xml
index 53320bd15cf7..758292245aa4 100644
--- a/acct-user/sigh/metadata.xml
+++ b/acct-user/sigh/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c@roessner.co</email>
 		<name>Christian Roessner</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/sks/Manifest b/acct-user/sks/Manifest
index 2182e2b2b08a..2d2bdf70d34b 100644
--- a/acct-user/sks/Manifest
+++ b/acct-user/sks/Manifest
@@ -1,2 +1,2 @@
 EBUILD sks-0.ebuild 238 BLAKE2B fbb07018220034f399ee5e4b9ebac259187c3dc46f701f5f0face54805d36c138822b257fbdfcfbae0dfd00c571e2d7e3f70f65a16c525a1e87913b6b6948090 SHA512 96c7193a38df4c6ccaf8739a4951e0c3df39690605d93b4d597346fdd66bc8dc8d215183194d399229a91f6275b381f71dead2e5aecd06dfe9e940cdf98dea93
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/sks/metadata.xml b/acct-user/sks/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/acct-user/sks/metadata.xml
+++ b/acct-user/sks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/acct-user/snapclient/Manifest b/acct-user/snapclient/Manifest
index e87e1af8771d..baa0a1cccef5 100644
--- a/acct-user/snapclient/Manifest
+++ b/acct-user/snapclient/Manifest
@@ -1,2 +1,2 @@
 EBUILD snapclient-0.ebuild 305 BLAKE2B 4815a666e9c1126758f4ae26c34e7474a5392b39d8cdfa81c37fd22a1ac4da7c60487956c0236954fe311051fbd4a176a36003b2c9a0529eaf25950df27d52f6 SHA512 0454400b750cb7b62791b053a83b8992a5940593d708f89209dc82f43341c961c19240633bf3dc033850e4739653f0801b6c029af081a471aac1120ffbf96289
-MISC metadata.xml 368 BLAKE2B f639ed96e35633add84d10523a52912185c7e4a49fcc9564c1f3a2a6378408b026b2a20512a6e6d108f609da0b95afc4cb92776f468ac210627a301d7a2a472f SHA512 ff8acc6235de2a08461210d242742a7289ee267e31fb4258a304372658b9b8ce76bbff622917627a84c16faaec025ca28298a99e6ffc49be240844fb467e27ea
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/acct-user/snapclient/metadata.xml b/acct-user/snapclient/metadata.xml
index bad50768efad..6d821181d635 100644
--- a/acct-user/snapclient/metadata.xml
+++ b/acct-user/snapclient/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/snapserver/Manifest b/acct-user/snapserver/Manifest
index a1094ec95002..0a9750ca300b 100644
--- a/acct-user/snapserver/Manifest
+++ b/acct-user/snapserver/Manifest
@@ -1,2 +1,2 @@
 EBUILD snapserver-0.ebuild 310 BLAKE2B f8505e3dc17a38be5bad5261271118225f969bdef1c9307d2c6dfa6a7da2c082d4b0b73e50d261fd1ea97682d30e06a27d06887b387ca6cabdb9bb43eea09be6 SHA512 cc45c4acb17cc4b194fa902cdd68bfcfc75bb2146d9ef83b9a90f5e2b2fd03b21fce25926cd5f75893dd97262c8ef62164aca6bd70066a56a82d3779d9e9ed20
-MISC metadata.xml 368 BLAKE2B f639ed96e35633add84d10523a52912185c7e4a49fcc9564c1f3a2a6378408b026b2a20512a6e6d108f609da0b95afc4cb92776f468ac210627a301d7a2a472f SHA512 ff8acc6235de2a08461210d242742a7289ee267e31fb4258a304372658b9b8ce76bbff622917627a84c16faaec025ca28298a99e6ffc49be240844fb467e27ea
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/acct-user/snapserver/metadata.xml b/acct-user/snapserver/metadata.xml
index bad50768efad..6d821181d635 100644
--- a/acct-user/snapserver/metadata.xml
+++ b/acct-user/snapserver/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/sndiod/Manifest b/acct-user/sndiod/Manifest
index 0a37a16357de..85089d009232 100644
--- a/acct-user/sndiod/Manifest
+++ b/acct-user/sndiod/Manifest
@@ -1,2 +1,2 @@
 EBUILD sndiod-0.ebuild 227 BLAKE2B f23c38f28eef87235778e1d7d75a1e2c983d932bc943adfd48db0d9ccc7da1c8f66e7fa1759e46a1f7e5fff5007f4b85d1921bca95bbb37851661e1d01971fa9 SHA512 350ffd18a975a992bffc9e2c1ddc76137a868d9c2627a96f354814bdf27e396f169edaca607f6a44229cdfe34e10d7e472be040aeac684edf5b942f21d11c9dd
-MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
+MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/acct-user/sndiod/metadata.xml b/acct-user/sndiod/metadata.xml
index 9df017effeb6..fc3c6c671309 100644
--- a/acct-user/sndiod/metadata.xml
+++ b/acct-user/sndiod/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/sniproxy/Manifest b/acct-user/sniproxy/Manifest
index ebd85edfef44..7c62ac3dae15 100644
--- a/acct-user/sniproxy/Manifest
+++ b/acct-user/sniproxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD sniproxy-0.ebuild 198 BLAKE2B 8245a6d58456047d64afe6e98aca816155ad5cc6235f96d773500b2f034af9977b4600ff0934f6c36d957586beb9d8e2d4c97ec792862dbdf4a22be973b46d62 SHA512 02d651442209696e263bc90b2b6276ff0e616a12f2153b5025ec042876b92fdd626b399951ce2f1b251a2a79f3330bb40c4d47e51d0d526010ab5e8653639d03
-MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
+MISC metadata.xml 405 BLAKE2B 707ae1db24849c15055554e5411e9eef759457fd605d42c9f487f02ad0649538fc1531b11219f88a12b2ec6f6ce9291e7a0ed26ed492740274cb68d3edd4c69b SHA512 8d1ffeabe9690928422089e31eba7b94bb5f0b8e07a94de043def0d7543c97291cc9892d6a594089fba4eca2b382334c84acac34b7f4815b69d8b3ada9b84d15
diff --git a/acct-user/sniproxy/metadata.xml b/acct-user/sniproxy/metadata.xml
index 89aeeb96e865..01b903b2b23b 100644
--- a/acct-user/sniproxy/metadata.xml
+++ b/acct-user/sniproxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/sobexsrv/Manifest b/acct-user/sobexsrv/Manifest
index b6c13f7fa791..dcb70b21405a 100644
--- a/acct-user/sobexsrv/Manifest
+++ b/acct-user/sobexsrv/Manifest
@@ -1,2 +1,2 @@
 EBUILD sobexsrv-0.ebuild 284 BLAKE2B 1cca06cfb4fba9bead35f2555fe43d2c5ef82258701e37fc619082f205f32b25ac0704d6765cebadc0bd88634637467baa5c2568ca6f2d6b3f29930581aa851c SHA512 9638f612d2ee35c2c75f59df1c77d90e10293306d8c444b69cea0951c9530a363576133170c708ed4d1ea69d67c455ba242a8670bf93f8509155b34e0023da10
-MISC metadata.xml 256 BLAKE2B 6b7f874cd70ebb5fa66f94080a8d0decc22ee6361c744d0f0441dfae3fb4b05b5ecdac3b54933462c0027099d7f85070473b6f1073a59893c320cfa838994f62 SHA512 c148fedc62b8258dad36e815f393fd782159b60e9c593a0b6dadda3cb8b9c59ae3edd8a42ae33bfc38daae55ede051a6b36dd251a1d9f353598602a9dcd25ced
+MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/acct-user/sobexsrv/metadata.xml b/acct-user/sobexsrv/metadata.xml
index 45c8b6c75c93..b4a27e94fc24 100644
--- a/acct-user/sobexsrv/metadata.xml
+++ b/acct-user/sobexsrv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/acct-user/spamd/Manifest b/acct-user/spamd/Manifest
index 0280f3e77710..c584d9c474a6 100644
--- a/acct-user/spamd/Manifest
+++ b/acct-user/spamd/Manifest
@@ -1,2 +1,2 @@
 EBUILD spamd-0-r1.ebuild 731 BLAKE2B 0f219605b86301fdd33a1cf0d4a2d45d3f97167de46b1cebaa45c010a1b4faabd42e92b69ef3d39c83bff145889fa6a6abdd66aec236c91758911ce57e4bf5e3 SHA512 ed22f0112627def013342d1998f5580220cd078dd03dcee6801c332dabfda17680176ae9ca9e0ee1e950f3aac897b3a364bc04f6c097a8e9598610972d66e3d3
-MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
+MISC metadata.xml 430 BLAKE2B fce5e2158fca2765f87a39552d6ee89f017d98079ccf891d3d8505ed002c834596c53349a3d30effff771542ecc6b16cc328fc8cb9baefc0d03318cedf22b4a7 SHA512 db7a13772be3c3fe688d5f2e962efc554f60d2059cbb2ec392012dc9a0dd8dd553b5deba6ce784f9a96543b1ccb99323b26a168e73885401fa7477acfc07abfe
diff --git a/acct-user/spamd/metadata.xml b/acct-user/spamd/metadata.xml
index 265493eecbee..ea85f6051a4a 100644
--- a/acct-user/spamd/metadata.xml
+++ b/acct-user/spamd/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">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-user/sqlgrey/Manifest b/acct-user/sqlgrey/Manifest
index e60973e6c5cb..b01193c9f0f6 100644
--- a/acct-user/sqlgrey/Manifest
+++ b/acct-user/sqlgrey/Manifest
@@ -1,2 +1,2 @@
 EBUILD sqlgrey-0-r1.ebuild 266 BLAKE2B a8c08dc3ce0eec728976d5b7c5cec3bd1ff14a8cf42ca72c32b51dbbc9030a0e48689cd27ae062606bee1c631b0fbc6bc96f27d978227ee7adc438a9ff04465b SHA512 416b9c749ba10f7453d2b7aecc4ee69957810c00d421b2369eec1e0fc2873c42df063f8c40805c43f5d0b33c3e99f074cc2b00624d4f9efd9b4aa1632896ffca
-MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
+MISC metadata.xml 430 BLAKE2B fce5e2158fca2765f87a39552d6ee89f017d98079ccf891d3d8505ed002c834596c53349a3d30effff771542ecc6b16cc328fc8cb9baefc0d03318cedf22b4a7 SHA512 db7a13772be3c3fe688d5f2e962efc554f60d2059cbb2ec392012dc9a0dd8dd553b5deba6ce784f9a96543b1ccb99323b26a168e73885401fa7477acfc07abfe
diff --git a/acct-user/sqlgrey/metadata.xml b/acct-user/sqlgrey/metadata.xml
index 265493eecbee..ea85f6051a4a 100644
--- a/acct-user/sqlgrey/metadata.xml
+++ b/acct-user/sqlgrey/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">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/acct-user/tox/Manifest b/acct-user/tox/Manifest
index f4fe6fc7324e..bf8bac510c33 100644
--- a/acct-user/tox/Manifest
+++ b/acct-user/tox/Manifest
@@ -1,2 +1,2 @@
 EBUILD tox-0-r1.ebuild 270 BLAKE2B adab7b62c1f8e01390b55d91621e24ee01e13ffdde29134a6f4c4bcbacba0ba346395ebd52a89fca4f84b445b9e8f23d0ee6a03c53647e4a5801e37ddc102ffe SHA512 f0e7dec78bbe435bc45254121c1d24f3f3bf20c24dfe6d5e4511b97b7c8a11d5796f3fe30d4bcb137ef858876623c507aabf76f2ed2ae0838db50ec83a62f472
-MISC metadata.xml 370 BLAKE2B 8c3531d559fceef9b381b26f8ede241e5960d25121c4902d7da59e39b523d0f1aaf30c994e1def9dd48aa1e44cee5a850106d0588098a7ad474802839619caed SHA512 04014cf50db44890bd3d881fea0fe5d1e16144b71a44f15e01158311fa4b2dd4ee2cd43acc5ae0dbf93dca845245486a6dd294d8a0bcec14cbb4be9cfd5fcd41
+MISC metadata.xml 400 BLAKE2B cde9f8539a59f9e7336b4fb593e30efc494db93dc529f684a1d0982d32cb11795306647e2e15e29118a9b0bee4cf78e7b5239fd5543504c2e0aeea4556bb40d7 SHA512 5b5ec49dea9bef75c42b07215f65b82d9efb889e4713ffba5bb827cd0b9bdbe60831008c1e2790f5f64fac31a6920dcb85d160bea6685ead1cd463403dc72092
diff --git a/acct-user/tox/metadata.xml b/acct-user/tox/metadata.xml
index 5dbf5facde30..c07bc073ffb2 100644
--- a/acct-user/tox/metadata.xml
+++ b/acct-user/tox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>JoMull01@protonmail.com</email>
 		<name>Josiah Mullins</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/tss/Manifest b/acct-user/tss/Manifest
index 47037f28a2fa..26779bac5940 100644
--- a/acct-user/tss/Manifest
+++ b/acct-user/tss/Manifest
@@ -1,2 +1,2 @@
 EBUILD tss-0-r1.ebuild 244 BLAKE2B 45ecfcf0930cf0a341c1e2170bc27d051f7c491fd0e95c4ca002696d3cc07b82ade747bd9846ce632c1edf306f6eba774adbc243e05443d9f0586d304f462f04 SHA512 39a1af5dcc193cfca73e65c505455cf9667b49be02c09ba651ee5d0a2173186a5835fa5169243d1d3dd37659d2a4a65c6fd94588f1636b3d437de0615191438b
-MISC metadata.xml 369 BLAKE2B e7affa4e434355a712d790a03359cba38108553f0d1d6396db9065cad0d1371b28a012318acdee7151ea7565711e69abcbff4382cd0cf3ba1e45c5bcb86867f0 SHA512 b702fac9869c93144ca55d12cdf33c947694ad26a03912f8e5428c7b70d43cea6d64331c03eb59c48622d03358a1d718a9ea8061398ba7b00fdb7b7c4711928c
+MISC metadata.xml 399 BLAKE2B d3c2e40efe608d0831d27d53513a7d32564f16af81293284d17c5620f6be10ad4d2cb7192ff7eac4e7a3e64570e0a12c753b04e6d356e203b9081efca779169c SHA512 cef8835ec1f1c5fec60891f10807ab9687078b75380da019142fd02b878db4e73928155749ed9c7128f57ea907814f81d14e0340c79f4719b0b56b8b77bbe45d
diff --git a/acct-user/tss/metadata.xml b/acct-user/tss/metadata.xml
index 52d5228a45d4..f2b95e147157 100644
--- a/acct-user/tss/metadata.xml
+++ b/acct-user/tss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/acct-user/ttrssd/Manifest b/acct-user/ttrssd/Manifest
index 1cf34db5fed6..ec8ff9304d58 100644
--- a/acct-user/ttrssd/Manifest
+++ b/acct-user/ttrssd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ttrssd-0.ebuild 231 BLAKE2B a051a89c8f058c775ecff1b165fa391a2bd21784031649e272f0aa099ea14b90d087820ac604520c589ef71f399bc8d766c59c53db40fa5e1247d6400d7d8ebc SHA512 ec15ea80ee3bbc6c331cbead869902615ec94ac3e07970a66f6371168bbc6f357412e2e277d31e721be10a47f3182a668f53a3cc52ba5d758fd22a184e4f00db
-MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/acct-user/ttrssd/metadata.xml b/acct-user/ttrssd/metadata.xml
index 3b94165dd3d1..54be7ff7e5d6 100644
--- a/acct-user/ttrssd/metadata.xml
+++ b/acct-user/ttrssd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/acct-user/tvheadend/Manifest b/acct-user/tvheadend/Manifest
index a5e17a885fac..c82737261e0c 100644
--- a/acct-user/tvheadend/Manifest
+++ b/acct-user/tvheadend/Manifest
@@ -1,2 +1,2 @@
 EBUILD tvheadend-0-r1.ebuild 284 BLAKE2B ba491eab275ce324a7d89f7c8397c03cf9110ad43fbf03bb65b9bb72739925f39320941f2d9efc46e45826f0f4f378c249cdab3aa12f270cf2fd3f4543f002f5 SHA512 f214a3cc4eafee1d4749713d225541df2b85c75b791ddebda9c71ac4fb416e94d27d8ff692dcaedf5628752a6975f016b02954b7c175afb359a1b694a7301c99
-MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/acct-user/tvheadend/metadata.xml b/acct-user/tvheadend/metadata.xml
index 3b94165dd3d1..54be7ff7e5d6 100644
--- a/acct-user/tvheadend/metadata.xml
+++ b/acct-user/tvheadend/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/acct-user/upmpdcli/Manifest b/acct-user/upmpdcli/Manifest
index fddbf2886a6e..5062ac8682c2 100644
--- a/acct-user/upmpdcli/Manifest
+++ b/acct-user/upmpdcli/Manifest
@@ -1,2 +1,2 @@
 EBUILD upmpdcli-0.ebuild 226 BLAKE2B f223bd96f4e726267663b6b49ad8787880a8310f070d2bf3af2399ac2026a5f005eff5b302e14f3d3d4b15dc87fd87452542ff9c38d28599b2af289a6a52f802 SHA512 885ccde303d62d6df25cba85bac6ef5244186eb2eec4e8dadab499b8f10ea335290e7454251b3c2a31dd53c3cb7b78e1b1fcdaf736a317c045efe536cd9da4a2
-MISC metadata.xml 220 BLAKE2B ed165601490e20718745ba4844ef1093173b08367736d6f11de34aa7ec79d93f179c7b8170d6043696ea180d9e95da85fb1b3c0a8abef708dfe2907f61b19c18 SHA512 afdeecbd1013d5aa2b8791f78d8dc2d92747ad455a791cc92723a2ae1be5e59c106d85b2141d96375a3e4bd5c8d16ef78345c5f67a65cfd07f4d13d30ced25dd
+MISC metadata.xml 220 BLAKE2B e586df64463b7f35ea7247b3c7d2e80490da4029f458eb675c3a608e2be2a1f705af4d3825ad0ad3d3adfed411df1611738f2b02b5ef02945d5cc6473c47c771 SHA512 70ae3fb3566272104b1edf61ffc3e16b53852e9698b118140505a8e163526ea212448c296cb87e93f2a149f8e08ecaf44949a58933c930ea86c09e888a48060e
diff --git a/acct-user/upmpdcli/metadata.xml b/acct-user/upmpdcli/metadata.xml
index d4fa7b753368..8d87f8851317 100644
--- a/acct-user/upmpdcli/metadata.xml
+++ b/acct-user/upmpdcli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/acct-user/vpopmail/Manifest b/acct-user/vpopmail/Manifest
index 7df6b399b96d..1093c4762108 100644
--- a/acct-user/vpopmail/Manifest
+++ b/acct-user/vpopmail/Manifest
@@ -1,2 +1,2 @@
 EBUILD vpopmail-0-r1.ebuild 259 BLAKE2B 7979697a3b27841574a9489797bdd95ee6e26410e678314a044f6b711004a79c7af6f27abfc7fe6c834c759a546126996f477b6a3296f17adc830dfcf0d43032 SHA512 4a8464ff13af5f0dca49a2d4491f3fac6be23149c84293f093f73af7728ed912a296dd8ee28ff624d9fcddc25d50beeca7a731895c4ba16388f79ed43e1e0fc8
-MISC metadata.xml 362 BLAKE2B f5648e02e548748d7d6213e1095ff84932cd28aa230a55c8232199b581b0e53a5967419522e626f033841e282c885ae4626ce4a835dc67c7eac2437d9cff4d99 SHA512 8c5f244b35e479d5173ab982f3d1e6937a115fe628930fb121a2ccc283be862a5a64f153e296c4902b11008efb1364f900b6bcd3d95db0de164c80ef4e22f923
+MISC metadata.xml 392 BLAKE2B 7770f4cd16e3f81ddc6485fe5faeb9c40aac9c10e8248bbf940c12f483b30cdeb2f21800536f12cddf6c8f4eb0f95a6825fc996b4fa2c612e389716a27e26453 SHA512 41801280b1dce1a1cbb7d8508931f040b48c2369ed368fe869e813aa8ff406233a83bed47cd64e000f1ef94a0e1acc05cde30a163093f956d103374cd9c9ecd1
diff --git a/acct-user/vpopmail/metadata.xml b/acct-user/vpopmail/metadata.xml
index 984c50fcb5cd..067e368964dc 100644
--- a/acct-user/vpopmail/metadata.xml
+++ b/acct-user/vpopmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 68b29019157b..ed8b2a18173d 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index e88f33a2e5f8..54d79e9676ef 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,5 @@
 DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
+DIST accerciser-3.38.0.tar.xz 2006380 BLAKE2B 8a073e3a933386c9ae46d71535a3a49930bf8100d1458ac1875e1bcb69acc13e2331ac568c566ec6b8fe8ff9836155cc2ff20558de0e21942a29a568ff916fa5 SHA512 5740e4acfb00f5842dac8045ca9f10c85cf2ae164f3e0caf63ec303ff104002ace6de591a9b6516c4052ec0da8e48b394647f018b6c8b68a6c5ff77c4fff2904
 EBUILD accerciser-3.36.2.ebuild 1147 BLAKE2B 5ae48b87a8038579c8f1efbacfefbc5e15397d4d469ddef942ca0c9c85a4d413efb5b837063597ca2dfcb32b24829f0bf9a015b707938ae85587aa9e5a258a8f SHA512 3c5b7918d0b04f2e1000ddc2ada420b16380581909b2e5f90ddbfc79e1bed8926f2dece2ff86aef2caabdd6412f2093b2673049e3c711ecabcfab107172755c0
+EBUILD accerciser-3.38.0.ebuild 1159 BLAKE2B a43f4da724072499590589673998670fe8d475d2d9ad1b6f3c0da47854d33465ec4bea1d6decb1eea83799f481924b5fa75e33b1c8c70aab824e02b1d26cabae SHA512 94a9fb0839c322ad85eb29848000dc9b965ea2ddd11a767baac46792bfd8cde93ed9b319356a2413e778802571e4868f62186eea9ea5d32b503e8481e1766ebc
 MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.38.0.ebuild b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
new file mode 100644
index 000000000000..bdad92ae536b
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+	')
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection:=
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index a6ff7f029793..76ab9fdd36de 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,5 +1,5 @@
 DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4
 DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528
 EBUILD at-spi2-atk-2.34.2.ebuild 961 BLAKE2B b83a2ea3ada04488f968a36041ea0eb75fae12a8fc44b29c8c8e8b8b3e95e7506b33cb45fd2ad47231f14a72883423961d95dcbfe8b3a92869606bf3cad80e01 SHA512 46d8158b1e9639c654cdb8146dbdc26393477cb199a85309c9e06265b596d29ebd20f328021a5ad45e3156d916e6d7d2d96fd9f9cf956b21f09ee4d1d5b1790c
-EBUILD at-spi2-atk-2.38.0.ebuild 1017 BLAKE2B 1eb8ed318f7df7790e5b36641269b34b7f6b48df58f8af08cbab4f45f16ff01be9a29b2e8da8a26666918223c41f781900aa9f5047d116e0e74b27f191175456 SHA512 cbee96887483bdd8f66298a7d333b9e39b9b389c9f7b0d6eaaeea7b5ddc128012353fb4a2c0c217c8e4bee2f966a31de022c59827ef2b107804360fa6bd38ea5
+EBUILD at-spi2-atk-2.38.0.ebuild 1016 BLAKE2B 00786b0ab395c80feebff82293f583c339b04524a609c8794e2b29d9751ee9354ce02711e24b741cdb058530fd7e1befe625ee8cadc1e2527a0d0c4713b3fc63 SHA512 ffa8c6f86c5ba9362d2d913a3ec3c9f7111aba0fb89db7972aaf3142a05e96b480be0866dd809e116d02a6e2ac62897617c3237c262bf6d4708a2cce7d5006cd
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
index beffc5ea9f4a..c9814ac68781 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 9c3274b2f63f..54ec10755198 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -4,5 +4,5 @@ DIST at-spi2-core-2.36.0.tar.xz 186824 BLAKE2B a713d413c1ff291bf82107f6bedccd24d
 DIST at-spi2-core-2.38.0.tar.xz 190540 BLAKE2B 6c5c479c279285460a5ff80533d600b5173fe9bedacfa1522bc37da4a305b965cec2c677eaae8be809ed1a5fd8aaef6475fd27b80510efd1c530e46368e954af SHA512 3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1
 EBUILD at-spi2-core-2.34.0.ebuild 1483 BLAKE2B 68cb3833e04c5b655f99e914f50f7f677a3362874162f22e0ffee730f90771f5732f96dcf41118762afc91c57408b8576fa309a365c73bd078e7c6625204dfd2 SHA512 f377331167d7f4d5d35f1da8eeb5fdc7edfb6c0d997495d8acd6ca11a062fed0a8fa7c872e47ff228a48d2710c3252eda20a4bf201d69f9378deee43526c7c1a
 EBUILD at-spi2-core-2.36.0.ebuild 1514 BLAKE2B 7fb47431e23317a265a490710c39d8a238fd02e7387c309056554bfbf3f8a46f6ed519aa54146e6eb3db90b7ab6fd914d86490208eaf231a1ab22b1b7cbfcfcb SHA512 f46ff2f12d1c4a1c09cab0fd3463d3db46b3de143cf19099fbc2f985fab4f7242fd1519602ab081cbf3f00fa3fafdcee9f47878d74da35a050d156bdac2709a0
-EBUILD at-spi2-core-2.38.0.ebuild 1497 BLAKE2B a5b8575de9413cdd4975c4283a62ba871ba578cdc508559434f89fbd491311dc58faa60d838e66cecb1573677949d8bdc81a3cc99b5fca62b5f62a5c6897c976 SHA512 2a78814428f64fd2b8ec8d08a90efdc83b3e9a3b1316827bf1d335a5e5fd54837a05b9aac2f8cc879a3d60fe3cb36636b879c542624f81ed096a9bbf4aad5631
+EBUILD at-spi2-core-2.38.0.ebuild 1496 BLAKE2B 10c261f526ec9a4ef2b2ad4c99baab2c3db82e9899f63120883ad5a5f493e7dbe3dfca95815c542277ff360e2865f5dad9eb2f48703c3c3dae73f88a6eff9b5d SHA512 c96be9d6837274fb244282c8997c4a56c9fd4353f46fce31822e4b43aeb168e56c91ef2769dbcd899d0a0354d4a250d4dfedd91bc302012aca583dc650ebccdd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
index 6c0a90f880c4..50b823e781ab 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-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 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 865a2b9b9dd4..060f1f06ef8a 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -6,4 +6,4 @@ AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
 EBUILD caribou-0.4.21-r2.ebuild 2582 BLAKE2B 7fb7cfc2354bb9f945a23e93b0a4cdd85c1b8d653e4b4387940ea455224fb16794c273b4e1e5a82d01818363bb355f2e6f601122f3342583b2adaa2e44e4d5c6 SHA512 5abec28e094a414a73552a7c36fdfb415f47b7160c41749b484a0bd4ad81aebc66c124945d52798971f37721fc9c1c60874caa0249ca0f7603baa71fd971ea9d
 EBUILD caribou-0.4.21-r3.ebuild 2124 BLAKE2B 5a243dd805976616a57800e77aa6daf9b67fb42db7f2e02a4634309fccd10e8a8a178a85220362117345e28562aa9b644fd165c8d33ebc84274e829fd41a4a21 SHA512 f864de1f93f002a365bebefb18ed9ecc36b827ca871e4834b5ce7d29a8f2b467865215b912b54ae8d95075af753e703c21f68ab625a7eb82da827c519e7b27fc
-MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04
+MISC metadata.xml 839 BLAKE2B 139993feb8299a6fe4d363ec5a11e07128656c7d3f17c2888c76181e54c2ac1f30b3d3159cdab42653a1d04d452e71d41b10eb9380cb92281ba73f6f66d34ccd SHA512 66a2ed68edb2fd15f71a6a4afa566e5fa5b9dff7bdb53f626e6efad4474fb1bde6f9427fe0826b077d2bb48653f915b87afef5fe3ad9c3ebb037178528e2f6bf
diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml
index 5f5d428f0a7f..1972c7141ea5 100644
--- a/app-accessibility/caribou/metadata.xml
+++ b/app-accessibility/caribou/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index b79d3faaad7d..4d0fc03d18b6 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -5,4 +5,4 @@ DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd3231844805
 EBUILD espeakup-0.71-r1.ebuild 1600 BLAKE2B c5d57e7b808c4780442be57b0ceae6467e8d21fe1d7f1549daa445b2992332fd5bf8e17843ef8b99f66b65e18a5d51ea8503248c6bfa25af77bf0fa72179cd55 SHA512 cc107657f59944b98da53e7ec7eb7aedac82432556d2d00a5edd656f5337b50181c17144606128abd1b78872324a076d0a277c7d51c72cb12eb4913fc19117ce
 EBUILD espeakup-0.80.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
 EBUILD espeakup-9999.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
-MISC metadata.xml 598 BLAKE2B 14ae31982e49a4a506ebbe1db0a645fd1de6e7ef8441aa46a3f2a758108c9bdee3e5a58239c9148ac252f068185654f31c7e0267d38ca75d902746de73af7239 SHA512 41a8a023e62a5c3c286fcda70d55c4e3f999703ad021681cbe5f2441057e74e486d92ef023f969e0146d19131b9a73453b2f0dad06c308bb2f3a9123bfa54a48
+MISC metadata.xml 598 BLAKE2B 35b3b3d19a05d23031fc6eaafb3385d2489e9be3e7e1b3f303bb6ef3d4276d04e6dd5309ee65a4678407dc3d27ce0dc194702ddb35c2a325e09e924ad7118c1b SHA512 88dd258de8e3239cc819d36aa4bb8431ba6bfdbbb4e183b42ccdcdedd8bf26b9ca8a682ae024b9e878a0a7f2313f06aa8b499958c86ee136312e8ce529ffb471
diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml
index af3734414e2f..a8b8f95c43cb 100644
--- a/app-accessibility/espeakup/metadata.xml
+++ b/app-accessibility/espeakup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-accessibility/metadata.xml b/app-accessibility/metadata.xml
index e76c80d9abf1..f23c3bbd512a 100644
--- a/app-accessibility/metadata.xml
+++ b/app-accessibility/metadata.xml
@@ -36,4 +36,3 @@
 		komputera osobom niepełnosprawnym.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index c29ec2db40af..f5f810aa3a94 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,4 +1,4 @@
 AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc
 DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
-EBUILD speech-dispatcher-0.9.1.ebuild 2789 BLAKE2B 99574965e7971cb16e5d12c6eaabde743761d64b0f949327e7dee3f6cba232d0df42bc4f4499243e68561f145b7c7290d58604b23a7a53affb52c182ee2b4ecd SHA512 244c309525f520408ccdb2d2791049f4809074391469a48c9c15011531442a3cc2526cd0e6efd536d879c0370d95ec8aef0490a06ad147b51eb84ed3c3688332
+EBUILD speech-dispatcher-0.9.1.ebuild 2827 BLAKE2B 4f7150a3e9a555add31242a143cf076a69eaf2eecc1b04154e44ca7e500639de9b9d58940ca230b8a8ac1e6f1b1b9be11811040d55776b4dc10063063c496ea2 SHA512 95465db6451ff5da483176e5a2cb5294fae151db88052fd3ca563569866462cd52ae63b59c6449210eb8fad2c493b5ed5fcdb52cef96ecdbfb956266e1c6135e
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
index 75a8faa84022..374ad96d24ce 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.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
@@ -87,6 +87,7 @@ src_install() {
 		}
 		python_foreach_impl run_in_build_dir installation
 		python_replicate_script "${ED}"/usr/bin/spd-conf
+		python_foreach_impl python_optimize
 	fi
 
 	find "${D}" -name '*.la' -type f -delete || die
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 43c2d06c0c87..693091cee66d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 525c74e60cec..061f8a2f64c7 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,4 +2,4 @@ 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
 EBUILD abrt-2.14.2.ebuild 3161 BLAKE2B 4106e0fd301e1c8007faef3570cdbe024b2f6e14d6e1dd1e0919c8c0739ec7c48daad5c6163fe88d68eb97074c12bdb70b7628a321fef40662c66b5bd0186275 SHA512 4001b1d60b6559a36947264cc008e9417b9d6bb6cbf353b73d9fc7ca7127c6b6b5260565ebb5c3ffcf021082210169d0ff716151f03843092e3f706f2e1973b9
-MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
+MISC metadata.xml 327 BLAKE2B 856e3ab03170c985b08a7c11282af63794b0447b04d221803badcb19a9145adaa91d7637a6fe864618c469d2dfa7796bb39a3ef5ab2116eb7861f2793961dd0b SHA512 4ab7758c443c8c34f579d9b89e9b2c8aeeaf2b83f8bef397d1d56e24779708e761324eea26c0ef69283c9a018b7e7f82492a534683509040facefa382d9a3acb
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
index a14673b81f96..9ac701abe8f5 100644
--- a/app-admin/abrt/metadata.xml
+++ b/app-admin/abrt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index ac895f75992b..0ae50d507e07 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
 DIST ansible-base-2.10.5.tar.gz 5714628 BLAKE2B 28860023f652866b82fff6441cb5ec928de8a19f04c0d354107882854ada3d3637573e3a933d39aa64b5d3f743dec2adf759aa4fd2e9c051a0f4096a8807c338 SHA512 2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89
+DIST ansible-base-2.10.7.tar.gz 5737915 BLAKE2B f86e7ec00c73b8f644e261d89bb5b665a0c94cba6cb5dd983b7493715f5d5843812a49684f998f92c1b70879c4d134ef803b43a5c129e443fcea3b9b0fa35a18 SHA512 170a159956b577e122421d016ed81fbeda34de8036a6294e70999a8f0c1eebb2406e6f5766b7f2e00fbf06e01d45ee343c98dd74d667f9bedfa8a88c84c805a0
 EBUILD ansible-base-2.10.4.ebuild 1678 BLAKE2B 2dc26769860c9321d58ace714bc121b8e1123029b7cc7d7673ac30e4bfacc8881b182ec117650a7cb981296115fad78ae3854bfec6c84ac7a7e94aaf15a21c16 SHA512 094d4aa1445de9ac7042fffed6bb1977c23e1b050355610b411238c2e9789551a578f9a61b4a897e67c657c5dd91bd63c2d79373bf4f5f76f6cde36086609b20
 EBUILD ansible-base-2.10.5.ebuild 1681 BLAKE2B 64876c226edcf2075dbb7e7333861f82037fa710648fe56beabe17db5113d0e42c2595bccc5f3cca4cffb9603b91cc4adfc50ae2b5b7d1b3150b029c973743ed SHA512 466e1ea16a92dabd4f3b987dedc6017179fbda70c4f61a976792d2756a0b6ad119f924120e7f51167ac11e442fa60198436bbe950e1e33763b7cad2204ab3ccd
+EBUILD ansible-base-2.10.7.ebuild 1681 BLAKE2B 64876c226edcf2075dbb7e7333861f82037fa710648fe56beabe17db5113d0e42c2595bccc5f3cca4cffb9603b91cc4adfc50ae2b5b7d1b3150b029c973743ed SHA512 466e1ea16a92dabd4f3b987dedc6017179fbda70c4f61a976792d2756a0b6ad119f924120e7f51167ac11e442fa60198436bbe950e1e33763b7cad2204ab3ccd
 MISC metadata.xml 1151 BLAKE2B c70e650fe88afd0fb5d5478d0c7624709e119344bfa5866655c2b5b7c8ebde7e4eea61580315b51a762f3b9978681defacea600bc6f4db846080012fe69b78ea SHA512 376ca169d8881ca84918ace897a542ef200979cc48b226b5de29e06f9b7b22790968689fab59cdc5b64aff0715907900451e0a33cf04f88ecb46ca03d1b7213b
diff --git a/app-admin/ansible-base/ansible-base-2.10.7.ebuild b/app-admin/ansible-base/ansible-base-2.10.7.ebuild
new file mode 100644
index 000000000000..276ffa50f036
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.7.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_{7..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${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}]
+	net-misc/sshpass
+	virtual/ssh
+	!<app-admin/ansible-2.10
+"
+# ansible-2.10 or above is needed for the collections
+DEPEND="
+	!<app-admin/ansible-2.10
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=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-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	# disable version checks on upgrade
+	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
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r examples
+}
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
index 074ed68e1a92..2b5b4c3ce6cc 100644
--- a/app-admin/ansible-cmdb/Manifest
+++ b/app-admin/ansible-cmdb/Manifest
@@ -2,4 +2,4 @@ DIST ansible-cmdb-1.28.tar.gz 177437 BLAKE2B d3faa6cccdaa0825318bc9df09ad28b15d1
 DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f
 EBUILD ansible-cmdb-1.28.ebuild 550 BLAKE2B 0cdbdf3e28e1237d712d800a805d16af195bb411c06c419112f84364f0b61f850aed0bca4589805574a43d267b4c5899dfeaaf0c4f230eb88d84c08b97a9fd1c SHA512 b6f5251f73c990bb8d4600c25af051e997dae8e2b1bbd738cb9a2feeb2d815c384074e9a424c7e9657d2ce98036ec9ad5e6381ceb69e9397fcc7abbb9eeb7193
 EBUILD ansible-cmdb-1.30.ebuild 548 BLAKE2B 3139446cbe1c5a7475068f78b3ebeb6a7f11ff40cd4768c142bc5ca976b929009ced9026b6bcb15858f91f281b2872b3d85464a060374fd9ae5a6a53cc1d861e SHA512 94fc4a4692c7e72506957d10ee136d4721008ce0768324c1382f72dbf221f05af46554380f08d62fb257a4a200143b9926be934dc85693c7eb12add15593ab56
-MISC metadata.xml 387 BLAKE2B f48dd031b3cb184e1cbdd0f0189dbe952754a9364fc6f5c8aeab0c6ebac3d0dff590684f36cad3ff02b458df844d80cec134ba3c649b7e7fe67952e39cc46730 SHA512 ed89950e90b14e21945977859a522157daf477ba1ac94b2aed667549e44492929d753864503227880ac6a88ae61632fc5b75d61f732b71ce0b2dc1407603d7ce
+MISC metadata.xml 387 BLAKE2B 7312243cc0c64fd41197fd7dc5dd51ab6802e691a4ad7bde34763bbedacb066e7a137d3d1ea96a3e1fc17ac61fa589a8d20b117d33a196e9a6e26afa71e400c5 SHA512 731b7a731955aeb85236519fba633d77cdede3fd8649df1b3d2e507da76a9eb57752f7bbdcb0cd3a7634522a8403a4f1c0fbf1d50df38227cb16820a6e0a596d
diff --git a/app-admin/ansible-cmdb/metadata.xml b/app-admin/ansible-cmdb/metadata.xml
index cd461e918826..89f0bf1ae558 100644
--- a/app-admin/ansible-cmdb/metadata.xml
+++ b/app-admin/ansible-cmdb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b216b2514ec3..e24305ab21ff 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,6 @@
-DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc
 DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24
-EBUILD ansible-2.10.5.ebuild 1515 BLAKE2B ebca3cc18aac4ff84244e81b091b53aafbcb1c5d7ed4f856487d2248232ad93473450c40e0afd50c9ae21a5281c337d6aaca69a347b0bc18eff55f5196701866 SHA512 0ec8950255baa217ce84651978bb1411c36e4d505914ca5bbf70e6f853d50a22e4bb03ac88b5a860e9944c0aa8ba95ead2b9a71f9afe2416b4127dccdc0e51cf
-EBUILD ansible-2.10.6.ebuild 1518 BLAKE2B c1892761fdd9ff6827d780f403a1cbac41045644f01ead13f2a78d4e36c66ff02163a9a26de309b08e1a24a92003ca2eaacb21cea648bb66037e0fdf99c4bcfa SHA512 1686c8260bb137857dcc8e76dd51d3f8661264d04d92ed2df1b9f52bf19b824b73620c42ba45b17c90490b504084d222b03214e5b921a7e5f502e55588645791
+DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
+EBUILD ansible-2.10.6.ebuild 1515 BLAKE2B ebca3cc18aac4ff84244e81b091b53aafbcb1c5d7ed4f856487d2248232ad93473450c40e0afd50c9ae21a5281c337d6aaca69a347b0bc18eff55f5196701866 SHA512 0ec8950255baa217ce84651978bb1411c36e4d505914ca5bbf70e6f853d50a22e4bb03ac88b5a860e9944c0aa8ba95ead2b9a71f9afe2416b4127dccdc0e51cf
+EBUILD ansible-2.10.7.ebuild 1518 BLAKE2B c1892761fdd9ff6827d780f403a1cbac41045644f01ead13f2a78d4e36c66ff02163a9a26de309b08e1a24a92003ca2eaacb21cea648bb66037e0fdf99c4bcfa SHA512 1686c8260bb137857dcc8e76dd51d3f8661264d04d92ed2df1b9f52bf19b824b73620c42ba45b17c90490b504084d222b03214e5b921a7e5f502e55588645791
 EBUILD ansible-9999.ebuild 1520 BLAKE2B 30643b6c8ace829eceb1207b11af38df6f14e9401f7da120138c1076e46a78f173d7c5dd9cb0f4b12792a8bf4b5754bb8165f2d8029bc97af8a875a6f8e42445 SHA512 1b7304063fd4777f05dc21fddce1889bde9ea9998c2f1daca549a8415ee8bc0b4af707f96d0580b6ae9eb348422ee2fbf48d48b7e5e943b9c965ed44697388c5
 MISC metadata.xml 837 BLAKE2B ace15c05a5ac41dcf4889ed6cbf1b920793af9b67d415b0e51ddb1da179efc1ccf6efb821bc1ea6031283b7896cc5fde309fdff6a7d30b5f4902fec471b901a4 SHA512 dc6e6af5b2c5e14afca5719a4fcb920edff8386c89145895784c8b4ed95942b2313035eb4b7d5c595871b316b21a3119d5f584d9851a643a18f6e6fae3c26506
diff --git a/app-admin/ansible/ansible-2.10.5.ebuild b/app-admin/ansible/ansible-2.10.5.ebuild
deleted file mode 100644
index e0f16be830f7..000000000000
--- a/app-admin/ansible/ansible-2.10.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-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}]
-	net-misc/sshpass
-	virtual/ssh
-	app-admin/ansible-base
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
-	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-python/unittest2[${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/ansible-2.10.6.ebuild b/app-admin/ansible/ansible-2.10.6.ebuild
index c736d9e59be5..e0f16be830f7 100644
--- a/app-admin/ansible/ansible-2.10.6.ebuild
+++ b/app-admin/ansible/ansible-2.10.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
new file mode 100644
index 000000000000..c736d9e59be5
--- /dev/null
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+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}]
+	net-misc/sshpass
+	virtual/ssh
+	app-admin/ansible-base
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	app-admin/ansible-base
+	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-python/unittest2[${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/apachetop/Manifest b/app-admin/apachetop/Manifest
index e1fa39d77608..d383b1348760 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,3 +1,3 @@
 DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
 EBUILD apachetop-0.19.7.ebuild 668 BLAKE2B 0ae03e770fb0b827324687ad574b78d40f33b51f7a378504aaa9f535b214acc1d124d13da2d7b9055f9520d90197e4891acb590c1c3811118a6c0a65f0c6ab99 SHA512 57939a133aeb63182aba31998b982ebd9d86371f7e9d236251ce1bdc8074fe469190d62fdb9b93eaa87020274586c0f49b4ee9bd0ae2b048a124009ffed73634
-MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index 97c6505eb5cf..585b0dc75dda 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	</pkgmetadata>
-
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index e7cd4292a220..afdd0ec657ce 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,20 +1,6 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
-DIST checksec-1.11.1.tar.gz 198151 BLAKE2B 2b45834adb045dbf75a0ffab4f03b2640d068a48df20c628223bcf71c94300cf32ccbce8f47c6dd02b6dd9e12b924e4e7221b68eb781351ced52e09ce0cb3848 SHA512 dd742d6c9bc567b10f8d50f5edd2e1f3439b469ced46da05f53e14c0fe5c90310114564e674afc8c7f55170e07beb6359263e1fd153e4b29f3edb4e88cfbf8c0
-DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
-DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
-DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
-DIST checksec-2.2.0.tar.gz 2241197 BLAKE2B 33e76d1e74188f0944cbce2fcec3daab5a3bbef28802f36252a5bd8de33c96497cafbce0bbe91ce0bb2ccedf9aae1904224b5f68e31772723523179e76b69070 SHA512 a77e5f798ab651c509e0a75c6ca13e556ba354149acbd2e32d54f7a3318fef5f8a05bdb537374868836d5bf3c4d4e86e8354d6202dd1ba0e45a221e2d8688544
-DIST checksec-2.2.1.tar.gz 2241504 BLAKE2B 65d71e4ad589494d34ae0458f4b3e453f6bfb86ec0ce46b5c18b6e5c49e1820b9721b616da22bafe7614fca59473a736058584a488a84b85e9799dbf59f7b3e4 SHA512 7c6474479b51f70a627515a0d770f4d70df0350253547b3b8c1a5be83e2976b127172167ca9890d5e0848627c582adddde5acb2f7b30ff7d12d4a81370b43b0f
-DIST checksec-2.2.2.tar.gz 2241541 BLAKE2B 310553aa419373acc9b86bd25d801a99db0173ef76d8ccfdce4b185102a8ad39a91ade906c521c9caf7989aab1da42c35cbfe5e8fcbea23eafb47f917bb87718 SHA512 d975a9cea60869ddda445515396b67b6ea3c9b33770e711071e1cff684f89b4718b135a3a3c1a88b11b96ccde0df72d6b7924cade0619d24e38db428251d22b0
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
 DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947
-EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
-EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
-EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
-EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea61686f962e7e7d43391ec7512dc6902e8a0a5ba3c7efc1ac8cb549b7ecf0baa5558acba9d4ee969fab635d1eb36a SHA512 974d9f5c147385193d1525bf5cfac3dc7a9c027d0fde69cdbdd33de9ad384c3de624643da737f978c6efb7f121f3c7d71a5152582cc92a767f23ede3b2a74974
-EBUILD checksec-2.2.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
-EBUILD checksec-2.2.1.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
-EBUILD checksec-2.2.2.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 EBUILD checksec-2.2.3.ebuild 757 BLAKE2B f0752c0d0636142ecadf0abd561bebe82ee923570ef55374cfe567776d22785ad99e1ccd1cd5660723a24c0a2a9a9d428f43f3622e5bb472a4347514d8bf7692 SHA512 aa6e146d7ce82d49ada59ffb4f2f327c99608b5b2c164af317d4c0a627f28f10a8760f4b958678f1726fcaa496f87689165185f8a6e9bd2cb0c1cbb297fb7f91
-EBUILD checksec-2.4.0.ebuild 778 BLAKE2B e8cf810c02a192e83b495e39e3e68b2943f557e595fac1784d02bc40d93eab991d804009854a82fd211f8e6ae7e0c2358147cfbfb6cc528904bef6f037253c4e SHA512 63ff633a46c8a4e6bc3bb59f05e59dc8777278b9f2687d6f008b50b0e6d3e358acb0210d1e5e407f27eb7a154696f3a6bfa14b281b05aab346e3bf93a421b7ad
+EBUILD checksec-2.4.0.ebuild 775 BLAKE2B fc42df3c26d7894468d666d7ef0ddb64f1b587e583f7e4205e1b34e3c8f9cd56c83a99b1b0eead177f7425bbb4e9c7afab32c2a9702976b6271b461f1dfe2cd3 SHA512 0979dbf8919bce2be0aebfad319a721d49d723ce7a52cb975ffbaed7d94d3f134551c9fed820ef066ca9f7148e9469d16fe8e2944909fcde806df94729adadcd
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-1.11.1.ebuild b/app-admin/checksec/checksec-1.11.1.ebuild
deleted file mode 100644
index 15b1a89861df..000000000000
--- a/app-admin/checksec/checksec-1.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.7.2-path.patch
-	eapply_user
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.9.0.ebuild b/app-admin/checksec/checksec-1.9.0.ebuild
deleted file mode 100644
index eae3c30567d3..000000000000
--- a/app-admin/checksec/checksec-1.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.7.2-path.patch
-	eapply_user
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.0.1.ebuild b/app-admin/checksec/checksec-2.0.1.ebuild
deleted file mode 100644
index 3dd38365d970..000000000000
--- a/app-admin/checksec/checksec-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-path.patch
-)
-
-src_prepare() {
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-	default
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.1.0.ebuild b/app-admin/checksec/checksec-2.1.0.ebuild
deleted file mode 100644
index 958b02354f83..000000000000
--- a/app-admin/checksec/checksec-2.1.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="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-path.patch
-)
-
-src_prepare() {
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-	default
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.2.0.ebuild b/app-admin/checksec/checksec-2.2.0.ebuild
deleted file mode 100644
index 894f6578719b..000000000000
--- a/app-admin/checksec/checksec-2.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-path.patch
-)
-
-src_prepare() {
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-	default
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.2.1.ebuild b/app-admin/checksec/checksec-2.2.1.ebuild
deleted file mode 100644
index 894f6578719b..000000000000
--- a/app-admin/checksec/checksec-2.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-path.patch
-)
-
-src_prepare() {
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-	default
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.2.2.ebuild b/app-admin/checksec/checksec-2.2.2.ebuild
deleted file mode 100644
index 894f6578719b..000000000000
--- a/app-admin/checksec/checksec-2.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-path.patch
-)
-
-src_prepare() {
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-	default
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-2.4.0.ebuild b/app-admin/checksec/checksec-2.4.0.ebuild
index 96c830f5d229..a879fc2571e9 100644
--- a/app-admin/checksec/checksec-2.4.0.ebuild
+++ b/app-admin/checksec/checksec-2.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 970478bb2d9f..e8745dd0f23f 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,7 @@
-AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f20bec111df0b6c6009f572d57912869ff879f05b55fa18ac4b40736acaeef03b0ec207baac2053937a305649c SHA512 82c7795c33256bd22575d3133ef20dc3a5cbdc4ae68ef7e6fefc3a9295d5e9f0f2d9d912122a5a22e1d6d42cbe1c40cdd3513d9bd7d08db636d96972a622c2a7
-AUX conky-1.10.8-fpermissive.patch 1081 BLAKE2B 637b91609242272617c146db05f1f6a9e6e620aef353850b2d9db329e4b643ebacada6d6239b8fda5be8e315e76cf3f457a6a57ca92e5be0ba559d84de747737 SHA512 15d53485284f27c300df8365f3ed1eae720538a8dbe0ab44b864b12b5819dcb64e0196a87b72afdab77a26ba452521050f47adfa1d9f1d61f8fc8a50e21b2cc7
-AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
-AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
-AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
-AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
 AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605
 AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
-DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
-EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
-EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
+DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
 EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
-MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
+EBUILD conky-1.12.1.ebuild 4713 BLAKE2B 935332c40b024b6df71ac99880c13553057c9df4bd8201363cf931d05e51873c1d01ea3b9622fb2bd59e9e7019a5c3353a12db78dedf58497424478b17613474 SHA512 67fabdf98833dc4f24134ec00f8c05693fd74f255c2678ab0d43d6e6fff5845b10e173e4cf67da7c1362d9e3e0d1fd2943ca8ef168329193cb9313f753ed973f
+MISC metadata.xml 2395 BLAKE2B 1bfdb9319bfa35d0e29edca04bf9f8fe7acba3d6cb9910fba7f632ff35a642cbdfd34cf0e18047eaa851808551f0c91614cbf814609de0c4b6d5cf656909d264 SHA512 4471b583a8fda5692eb18412ab579c1bcc37aff56009fa024ca257862df8ba93f788d3f001d7b9b74307e327f9deac27a2674f6ef48f8273940c2ea88d575813
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
deleted file mode 100644
index 66c0ffbf31c9..000000000000
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar webserver wifi X xmms2"
-
-COMMON_DEPEND="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
-		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
-		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		xmms2? ( media-sound/xmms2 )
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	irc? ( net-libs/libircclient )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/docbook2X
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-pkgconfig.patch
-	"${FILESDIR}"/${P}-libical-3.patch
-	"${FILESDIR}"/${P}-portmon.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-virtual-sinks.patch
-	"${FILESDIR}"/${P}-fpermissive.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
-		cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_X11=ON
-			-DOWN_WINDOW=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XFT=$(usex truetype)
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_XMMS2=$(usex xmms2)
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_XMMS2=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=ON
-		-DRELEASE=ON
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BMPX=OFF
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
deleted file mode 100644
index 3a8ea98b8989..000000000000
--- a/app-admin/conky/conky-1.10.8-r9.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar webserver wifi X xmms2"
-
-COMMON_DEPEND="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
-		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
-		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		xmms2? ( media-sound/xmms2 )
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	irc? ( net-libs/libircclient )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/docbook2X
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-pkgconfig.patch
-	"${FILESDIR}"/${P}-libical-3.patch
-	"${FILESDIR}"/${P}-portmon.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
-		cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_X11=ON
-			-DOWN_WINDOW=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XFT=$(usex truetype)
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_XMMS2=$(usex xmms2)
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_XMMS2=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=ON
-		-DRELEASE=ON
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BMPX=OFF
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/conky/conky-1.12.1.ebuild b/app-admin/conky/conky-1.12.1.ebuild
new file mode 100644
index 000000000000..4534b4f27330
--- /dev/null
+++ b/app-admin/conky/conky-1.12.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
+	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+	vim-syntax weather-metar webserver wifi X xinerama xmms2"
+
+COMMON_DEPEND="
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( media-libs/imlib2[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X] )
+	lua-imlib? ( media-libs/imlib2[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-text/docbook2X dev-libs/libxslt )
+"
+
+REQUIRED_USE="
+	imlib? ( X )
+	lua-cairo? ( X  bundled-toluapp )
+	lua-imlib? ( X  bundled-toluapp )
+	lua-rsvg? ( X  bundled-toluapp )
+	nvidia? ( X )
+	truetype? ( X )
+	xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	xdg_environment_reset
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_ARGB=yes
+			-DBUILD_X11=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DOWN_WINDOW=yes
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/conky/files/conky-1.10.8-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch
deleted file mode 100644
index 2fc49fa9cf25..000000000000
--- a/app-admin/conky/files/conky-1.10.8-clang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- conky-1.10.8/src/linux.cc	2018-02-07 17:16:39.000000000 +0300
-+++ conky-1.10.8.new/src/linux.cc	2020-02-22 00:43:52.336620654 +0300
-@@ -37,6 +37,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h>
-+#include <clocale>
- #include <sys/types.h>
- #include <sys/sysinfo.h>
- #include <sys/stat.h>
---- conky-1.10.8/src/luamm.cc	2020-02-22 00:57:25.847867585 +0300
-+++ conky-1.10.8.new/src/luamm.cc	2020-02-22 00:59:29.820510124 +0300
-@@ -23,6 +23,8 @@
- 
- #include "luamm.hh"
- 
-+#include <cxxabi.h>
-+
- namespace lua {
- 	namespace {
- 
-@@ -57,7 +59,7 @@
- 				lua_pushstring(l, e.what());
- 			}
- 			catch(...) {
--				lua_pushstring(l, ptr->__cxa_exception_type()->name());
-+				lua_pushstring(l, abi::__cxa_current_exception_type()->name());
- 			}
- 			return 1;
- 		}
diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
deleted file mode 100644
index 42abeb831cd6..000000000000
--- a/app-admin/conky/files/conky-1.10.8-fpermissive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- conky-1.10.8/src/conky.cc.orig	2020-08-28 13:17:22.330113596 -0400
-+++ conky-1.10.8/src/conky.cc	2020-08-28 13:19:48.564891015 -0400
-@@ -478,9 +478,9 @@
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true);
- 
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
- 	struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
--	int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-+	MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- 	MHD_destroy_response(response);
- 	if(cls || url || method || version || upload_data || upload_data_size || con_cls) {}	//make compiler happy
- 	return ret;
diff --git a/app-admin/conky/files/conky-1.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
deleted file mode 100644
index 032a6d2ef263..000000000000
--- a/app-admin/conky/files/conky-1.10.8-libical-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer@suse.de>
-Date: Tue, 6 Mar 2018 13:46:31 +0100
-Subject: [PATCH] Add support for libical 3.x (#465)
-
-In libical3, deprecated icaltime_from_timet is removed
-Use icaltime_from_timet_with_zone instead. This function
-exists in libical 2.x so no need to change requirements
----
- src/ical.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ical.cc b/src/ical.cc
-index e4b48511..ef069124 100644
---- a/src/ical.cc
-+++ b/src/ical.cc
-@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
- 	icaltimetype start;
- 
- 	start = icalcomponent_get_dtstart(new_ev);
--	if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
-+	if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
- 		icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
- 		if(rrule) {
- 			icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
- 			icaltimetype nexttime = icalrecur_iterator_next(ritr);
- 			while (!icaltime_is_null_time(nexttime)) {
--				if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
-+				if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
- 					start = nexttime;
- 					break;
- 				}
diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
deleted file mode 100644
index e7b17dd1119a..000000000000
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:26.315879386 +0100
-+++ conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:38.555878656 +0100
-@@ -220,6 +220,15 @@
- install(TARGETS
- 	conky
- 	RUNTIME DESTINATION bin
--	LIBRARY DESTINATION lib
--	ARCHIVE DESTINATION lib
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
-+
-+if(BUILD_PORT_MONITORS)
-+	install(TARGETS
-+	tcp-portmon
-+	RUNTIME DESTINATION bin
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+endif(BUILD_PORT_MONITORS)
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
deleted file mode 100644
index 97e6bd02323f..000000000000
--- a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Reversed patch
-
-From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 12:56:06 -0500
-Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
-
-This should resolve #217.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index c5b39b2f..19ec7b9b 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -129,12 +129,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
- 
- if(BUILD_NCURSES)
-+	pkg_check_modules(NCURSES ncurses)
-+	if(NOT NCURSES_FOUND)
--	include(FindCurses)
--	if(NOT CURSES_FOUND)
- 		message(FATAL_ERROR "Unable to find ncurses library")
-+	endif(NOT NCURSES_FOUND)
-+	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
--	endif(NOT CURSES_FOUND)
--	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
--	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
- endif(BUILD_NCURSES)
- 
- if(BUILD_MYSQL)
diff --git a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
deleted file mode 100644
index c0198ccc4ecf..000000000000
--- a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
-From: Jan Seeger <jan.seeger@thenybble.de>
-Date: Wed, 5 Aug 2020 15:39:20 +0200
-Subject: Fixed crash on virtual sinks.
-
-Taken from upstream commits
-https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
-https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
-
-Signed-off-by: Jan Seeger <jan.seeger@thenybble.de>
----
- src/pulseaudio.cc | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
-index 93226c1b..af814bd6 100644
---- a/src/pulseaudio.cc
-+++ b/src/pulseaudio.cc
-@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
-         pdr->sink_mute = i->mute;
-         pdr->sink_card = i->card;
-         pdr->sink_index = i->index;
--        pdr->sink_active_port_name.assign(i->active_port->name);
--        pdr->sink_active_port_description.assign(i->active_port->description);
-+		if (i->active_port != nullptr) {
-+			pdr->sink_active_port_name.assign(i->active_port->name);
-+			pdr->sink_active_port_description.assign(i->active_port->description);
-+		} else {
-+			pdr->sink_active_port_name.erase();
-+			pdr->sink_active_port_name.erase();
-+		}
-         pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
-         pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
-     }
-@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
-         return;
-     }
- 
--    if(pulseaudio->result.sink_card!=(uint32_t)-1)
-+    if(pulseaudio->result.sink_card!=(uint32_t)-1) {
-         PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
-                                                           pa_card_info_callback, &pulseaudio->result));
-+	}
- 
- 	// get notification when something changes in PA
-     pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
--- 
-2.26.2
-
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index b3835daf4041..1fe89fc39f12 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
 		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
-		<flag name="eve">Enable support for the eve-online skill monitor</flag>
 		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
 		<flag name="iostats">Enable support for per-task I/O statistics</flag>
 		<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 8e86484b7ce2..9223ca240b19 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,11 +5,7 @@ AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad17
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
-DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-DIST conserver-8.2.5.tar.gz 434260 BLAKE2B f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3 SHA512 76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
 EBUILD conserver-8.2.3-r1.ebuild 2355 BLAKE2B 69a01594a73817f9970ae9292709d98fe28c1a704f67edf43cb595be1b251c85da60e40bb7895cffe47275747c73e4ede9e615f5d88dd32ed0ec120df1922ccb SHA512 1ca942d8044bfa96a4cf559c35f3bea6ed823ecb6f75ab540726cd306730778af3d1ed6be4edd5b7c34c4205a9078a5514fbe94a4a6e23557fc854e935589854
-EBUILD conserver-8.2.4-r1.ebuild 2362 BLAKE2B 1332bef8da253cd844a5d4739a08168f0177e4f35164290cbaece881030f3070a9f59a4e58c81c08f147a89cef3c5f080502e59f9e2544bd372b681ce046fe5b SHA512 1747c23444ce723d9e4087914e8f92e487d0bf78a1a962049661e17ce8d9e78afae5fd2190e4ed3868ebb3224611486e039280e7084f6da995bfe9b59f18bc46
-EBUILD conserver-8.2.5-r1.ebuild 2314 BLAKE2B d9c499b8bb6f63dd06fa0b1cf9d3da39fe72a79f7ad6ad8b03bb0cc14f582c25b5d8e8db3cb97ca2c91a64b31eeb878b26f07bdf45c0b8aed98cff463224f6c2 SHA512 03a0f2693df8c77ef2e216b16457ccfd9f2888a964217ff2cacce4f3111f14fdcf4f7d1c636269e11c709650d6b7f24e3186a5ee272d1991324ae58e99cda032
 EBUILD conserver-8.2.6-r1.ebuild 2382 BLAKE2B 0ffad99ee3fc06041600e544ca79d6e475830c2c50768668e507a6e20ca9b9155b4988291607f69a8b5c1b490c1a08fec92561e9cb659de3bb6e6a4d621e075c SHA512 1be3d84c121974754fcb2717cb198fe8849ddfe8406c6a21b8fe625d38e499eaa5b2f186f93770c974a615e3a1de93d678cf8bb0b7a79581a1121bd1cbd13d0d
-MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
+MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d
diff --git a/app-admin/conserver/conserver-8.2.4-r1.ebuild b/app-admin/conserver/conserver-8.2.4-r1.ebuild
deleted file mode 100644
index 0bfcdb4896bb..000000000000
--- a/app-admin/conserver/conserver-8.2.4-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam ssl-cert
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
-RESTRICT="!test? ( test )"
-
-DEPEND="debug? ( dev-libs/dmalloc:= )
-	freeipmi? ( sys-libs/freeipmi:= )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-	pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
-
-PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/^INSTALL_PROGRAM/s:-s::' \
-		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with debug dmalloc)
-		$(use_with ipv6)
-		$(use_with freeipmi)
-		$(use_with kerberos gssapi)
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with tcpd libwrap)
-		--with-cffile=conserver/conserver.cf
-		--with-logfile=/var/log/conserver.log
-		--with-master=localhost
-		--with-pidfile=/run/conserver.pid
-		--with-port=7782
-		--with-pwdfile=conserver/conserver.passwd
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	keepdir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
-	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	einstalldocs
-	docinto examples
-	dodoc -r conserver.cf/samples/.
-
-	if use pam; then
-		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-	fi
-}
-
-src_test() {
-	# hangs without -j1
-	emake -j1 test
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
-			install_cert /etc/ssl/conserver/conserver
-		fi
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.2.5-r1.ebuild b/app-admin/conserver/conserver-8.2.5-r1.ebuild
deleted file mode 100644
index f57c6924689a..000000000000
--- a/app-admin/conserver/conserver-8.2.5-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
-
-inherit autotools pam ssl-cert
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
-RESTRICT="!test? ( test )"
-
-DEPEND="debug? ( dev-libs/dmalloc:= )
-	freeipmi? ( sys-libs/freeipmi:= )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-	pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
-
-src_prepare() {
-	default
-	sed -e '/^INSTALL_PROGRAM/s:-s::' \
-		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with debug dmalloc)
-		$(use_with ipv6)
-		$(use_with freeipmi)
-		$(use_with kerberos gssapi)
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with tcpd libwrap)
-		--with-cffile=conserver/conserver.cf
-		--with-logfile=/var/log/conserver.log
-		--with-master=localhost
-		--with-pidfile=/run/conserver.pid
-		--with-port=7782
-		--with-pwdfile=conserver/conserver.passwd
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	keepdir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
-	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	einstalldocs
-	docinto examples
-	dodoc -r conserver.cf/samples/.
-
-	if use pam; then
-		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-	fi
-}
-
-src_test() {
-	# hangs without -j1
-	emake -j1 test
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
-			install_cert /etc/ssl/conserver/conserver
-		fi
-	fi
-}
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index 3b1ff77779ce..0fd851d30a65 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dan@danweeks.net</email>
 		<name>Dan Weeks</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
index f295cfda33bc..b6479406159e 100644
--- a/app-admin/cronolog/Manifest
+++ b/app-admin/cronolog/Manifest
@@ -9,4 +9,4 @@ AUX 1.6.2-patches/cronolog-strftime.patch 435 BLAKE2B a4f817a743df2a1193609bb16e
 AUX cronolog-1.6.2-umask.patch 2366 BLAKE2B 84134bf197929689edcb95605c89732175004771b8cbe0b7de84b7608444e1b37b447d3f37c5db3645c22d74a6e62d150a85cdb4d6487f92d32632d6646ef2ce SHA512 da3f7d84ce365edce396bc43ec9b469973301c6a28f3eb56b7f019dcb65fb7ceec981f92c1382542d01e4b6e49e32ff4fe283aed9dbc7bb30c6780775acf39b3
 DIST cronolog-1.6.2.tar.gz 133591 BLAKE2B 5a78d0136a834849c6f9fc9f41341808295fe38919ac795d5329c46f353b5fadebc5819031a07c2c2a780d54957d16edb9e8935e15a2ed77eb13a2d6c7d2832d SHA512 786135aaa1359605840effb9a755c500970098ca32c1c4976c62f9d7481d24cecefe223ce8dcc34a139427259a6f3ba1c435c700a72ee07ed68ffc7f2d36e4ea
 EBUILD cronolog-1.6.2-r5.ebuild 539 BLAKE2B d1ce1f7f0e51a85ff4b36fcfbbe270a473d4a6b896e8cffc98e4ff5caf41e42dc3f621303cbab8d5859c2b7f20bc0de0ed83e07304dff2dcdc6c05138da54e3a SHA512 3fbac862e8f8410d5dc69c4efc134838f3070a8b255f655b681a303506ff1ea5d65b532ea12ef543dae1e1edc907e32d32c502c28000f2d29466997b05fc7618
-MISC metadata.xml 719 BLAKE2B aeabc972c2347a9a39d7073165aeebb1b307f81c52db0e294405e10cf903b4058a0d2fbab64cc4f81b1013c6b39fe1ceead0725b32ee9bfee1fa9e307499deee SHA512 d5b5452b8105d8273328ee8ab1c95674686a00862a578f8171c4799791ceb131ac0204693a3d65ce6136d9cbea114f7f899a85669bde9b76b8c8e800a4c4c75f
+MISC metadata.xml 719 BLAKE2B 9e5dc266230fe72af4546d4fca875ef3fd1867f6d8c67b02118f85feb7bc485468ca09e56bfb2510ee7961e8510f44bcb6b11e6ad32fcdcccde329c9d84d784e SHA512 095a7193606734fa744ab84399512fb348740ff3eb47668a7018e68f862b145bad2bc70b567a88232ac49e4925dbcd9b5a941361a785546a736cb357617f139c
diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
index 0e5ed8f4355e..da04f4cd3543 100644
--- a/app-admin/cronolog/metadata.xml
+++ b/app-admin/cronolog/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index e63d6a5d953c..d00f7472e71e 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,9 +1,3 @@
-DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
-DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
-DIST OpenDoas-6.8.tar.gz 32307 BLAKE2B f199e20ccd33ed215b280f325d10c36f1449a605aa25ca92c39b43e6d9118a2c2b09e351712489028a06e9c2c087593888a93bf0377a15d1b710c9d6f659cf81 SHA512 4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb
-EBUILD doas-6.0.ebuild 757 BLAKE2B 6f1834ea1c4e299ab6a589263515894a7ad89810763cdf92bf4a6eecd168f9ee08aeb714828d8874f1c338bd1c8f2144909a3b44673444cba487fc8a87fa5aab SHA512 ac5f759a089d384f82ec637fd969f1b5367acb3f4706599d29a899b566384200c81df71539d4e92a93710424cc8f20c70009b14cb7c0498518ea69b1e9159d5b
-EBUILD doas-6.6.1.ebuild 810 BLAKE2B 5d80c92a11f4bc1d8f8d83d1639d18baec626306e784e1b0936909f28288a4054b3ab635ae8ea30ae3df769df5edf882f05471ab015f9d2c94189515923ced1d SHA512 dad89ad3615ed6d9c8df7c11ac253420ebeaf6abba28da7a1ae25b202d909305f42ab3c5f5d0902b7b5ceaf326f912e853f663f7748a5ef345866e6dfd5cb0f3
 EBUILD doas-6.8.1.ebuild 1325 BLAKE2B 56415a510bf24adbb6eb0939330d767b9c81d60b0f058f23bb81b2d7907aba83dd74f697acc4a450f0dbbdd303edb901cda1eb719f866dc7c5d64391404b49d2 SHA512 b5661cc423a209c959945304e20ed30f531d6399423ead251d2ed9f9ae09f8b6e31d02bbd1f32f226629711b73e8d48d3fa4112ae21e00bc318f1cec31008260
-EBUILD doas-6.8.ebuild 1298 BLAKE2B 76194f60c28e2d39f9e82d36ffd23746c3287a4b1de76dc6201dfb18420d6e0ccbb0f5268816fc733d043544b71bae663e71ea4e9f407bcfc329a9856de600e6 SHA512 9e611fb642b2ed3365ec58e69dd5899953c25176685d9ab2dcf14ba2accf6e326b8022cf5f0f70a89d26da85b1afba7168920e57b2a1173696a00a8222f5ae1a
-MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
+MISC metadata.xml 557 BLAKE2B 69a4a6528247efce28e3da9d035f1c4cdc83854a2ca78b83a75be542e8aad9874ed74fb6e07f5b7811d8fa23d1cf1adb11d9a86a687e4b6649709aef2bbaea56 SHA512 b89cfe499bf3fa4630a29ad3966f538e2c111710e4cfd035c945490394c8577ce1150cdecaff1f1548774d8b219b66b6f7faebc95861e1093edc9445fb5b7ffc
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
deleted file mode 100644
index 08f3406d2f0f..000000000000
--- a/app-admin/doas/doas-6.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 toolchain-funcs
-
-DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
-
-MY_PN=OpenDoas
-MY_P=${MY_PN}-${PV}
-HOMEPAGE="https://github.com/Duncaen/OpenDoas"
-SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm"
-IUSE="pam"
-
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare()
-{
-	default
-	sed -i 's/-Werror //' Makefile || die
-}
-
-src_configure()
-{
-	tc-export CC AR
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_with pam) \
-		|| die
-}
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
deleted file mode 100644
index 45b4cea04e56..000000000000
--- a/app-admin/doas/doas-6.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
-
-MY_PN=OpenDoas
-MY_P=${MY_PN}-${PV}
-HOMEPAGE="https://github.com/Duncaen/OpenDoas"
-SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc"
-IUSE="pam persist"
-
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror //' Makefile || die
-}
-
-src_configure() {
-	tc-export CC AR
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_with pam) \
-		$(use_with persist timestamp) \
-		|| die
-}
diff --git a/app-admin/doas/doas-6.8.ebuild b/app-admin/doas/doas-6.8.ebuild
deleted file mode 100644
index deb04261e4e8..000000000000
--- a/app-admin/doas/doas-6.8.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 toolchain-funcs
-
-MY_PN=OpenDoas
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
-HOMEPAGE="https://github.com/Duncaen/OpenDoas"
-SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc"
-IUSE="pam persist"
-
-BDEPEND="virtual/yacc"
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror //' GNUmakefile || die
-}
-
-src_configure() {
-	tc-export CC AR
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_with pam) \
-		$(use_with persist timestamp) \
-	|| die "Configure failed"
-}
-
-pkg_postinst() {
-	if use persist ; then
-		ewarn "The persist/timestamp feature is disabled by default upstream."
-		ewarn "It may not be as secure as on OpenBSD where proper kernel support exists."
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "By default, doas will deny all actions."
-		elog "You need to create your own custom configuration at ${EROOT}/etc/doas.conf."
-		elog "See https://wiki.gentoo.org/wiki/Doas for guidance."
-	fi
-}
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
index 67799a199867..21e2ba441ba9 100644
--- a/app-admin/doas/metadata.xml
+++ b/app-admin/doas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>felix.janda@posteo.de</email>
 	<name>Felix Janda</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-admin/docker-bench/Manifest b/app-admin/docker-bench/Manifest
index b0579b59e19f..105312167c23 100644
--- a/app-admin/docker-bench/Manifest
+++ b/app-admin/docker-bench/Manifest
@@ -154,4 +154,4 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 EBUILD docker-bench-0.2.2.ebuild 8651 BLAKE2B 508d271b7b7a3e7a66accdce380cc3a531915c20852a5fdda0f1edbb775a3c346304568113a0206c901231c12d50a782dc9586b1944240a8edec46659908a57e SHA512 08902f1e270e2d327a2996e556f09660711c6b6807f4a55cde75e29511f4fc82993ac23f40600ef1db6f8de6b6acd1b2d787d6317f08b421db946e3d2729e0f6
-MISC metadata.xml 338 BLAKE2B 9effd9d636357f6172d82d54167f07ec69a38dfd77e5d03d9aaf6fef6c1c0d2759897e3611fd8fe84be6b6295c54f7d2b497b12c4adf135f47dcc54c7a97e3c3 SHA512 3326aa9dda4d1b907feaaf10c964db5bb6963c5dbc09dfa07339b7ac8cf4a3140ba03351cecb73a4d367587df03ea2e9d0cd6d7e8ee9fd478f2c2a2c16e93e5b
+MISC metadata.xml 338 BLAKE2B 5b0ce10fd5d9260482039f26aa126300f71974d68e69b2b2112e09487a7331c21da8d73a1d7fd73306746039ba2b5f419e47d637322762e251a1e6884f2a076c SHA512 baed9d79b9f698431cd52c95c47d68b03a75ec77c0083b7957c5984b9f87fc76d6513758bd26899d35ab60c7659df180a4f11d237fefbd93f3f7f57edd0dfdcf
diff --git a/app-admin/docker-bench/metadata.xml b/app-admin/docker-bench/metadata.xml
index 55e8d234560f..a2af2a5f7b7a 100644
--- a/app-admin/docker-bench/metadata.xml
+++ b/app-admin/docker-bench/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index 6c8cf67a7172..aac6c975420f 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1,8 +1,4 @@
-DIST doctl-1.55.0.tar.gz 5157504 BLAKE2B 1d3db2ee4ca71a459456e72f035648c5ba73c5372c3369b360e1ee3cc44ec1155295e5f425611c307371f902c7ffed7dbce2f959266f79ecb8f149144fc86596 SHA512 6cea86e184ea25d5a6740d4090148fbe053ce93ebe8f2344f5a2bf62283381ed2a9574862a5ba39f34a52bf85af550313b7dd316a321f31089673f898d37cf78
-DIST doctl-1.56.0.tar.gz 5163349 BLAKE2B 10f169f7ccf31b416509043f42bff3fd60a5618530217b46d2bd0797d70eba914d314b376b5fdd801ba12ee4746e17b4e7a33316d9adcb95403ac3a92152d86e SHA512 4102f58ea0925b110d4ddf2146cdec0a4252881b7724c34c4ef0c86f848b107380d6b425e11a885841d39f52d6cb00bfab5671d663efcfe5ba02dcae8b5975c9
 DIST doctl-1.57.0.tar.gz 5195498 BLAKE2B 17273e9f8f63464aa2ba6c6d48dfabd78b0bdeb7156dc315d1970fb0052710c7a4b37f1d5e2a7a60211f2ab166c0926de438959d853639a8c329ec39b3ee0577 SHA512 0c868c5732a48367a93bf2b884689dbd917ba6690c82516495862546bc31d58d44aab192bd3b3543f951e9fa9b7289e99fbdf828c017af68496b84f1585a5f6b
-EBUILD doctl-1.55.0.ebuild 1052 BLAKE2B 35c7455909cd2473f76475f8018a70f04d39797144dd066317c5169dddda96eff650360ed81bebe770afbfd65f35c72300200b7f87ac4a468a38891861f46dc9 SHA512 a1c6467a53f6367e2ae79c77777fa56f12d9b215b51043adc5729ee4dfb2fdcf00657af4616c0d4a0b28ad6e9652b5ddb3cc0a3a0c4807261d550a3130920de9
-EBUILD doctl-1.56.0.ebuild 1293 BLAKE2B 518183156896035326550d0b8e0054bb83be446cad52cafad07f2bd9a602761e263e0782c5f7eccce9d75863521fc2e99d9f8da74ddf2c490d0f5532367da230 SHA512 bd8c37680fd859bb274f1b489c5953c4190eec0405da2c239c1e523217585d73920bd636a596b1c951a9f5edc916ab2945bb3ecf2c4999d04cacefc819b71d70
 EBUILD doctl-1.57.0.ebuild 1293 BLAKE2B 518183156896035326550d0b8e0054bb83be446cad52cafad07f2bd9a602761e263e0782c5f7eccce9d75863521fc2e99d9f8da74ddf2c490d0f5532367da230 SHA512 bd8c37680fd859bb274f1b489c5953c4190eec0405da2c239c1e523217585d73920bd636a596b1c951a9f5edc916ab2945bb3ecf2c4999d04cacefc819b71d70
 EBUILD doctl-9999.ebuild 1215 BLAKE2B d6aec05a7a515bc9f4073944c1a9267f996fa239e98001909db2b58f2c480c7792a5aaa72375629b384f6d1a983e2e83d35fb868a277b104f2183aa02c1cd565 SHA512 658203b8e3c26b8813409781c197a20964e7f850dc5ac467e222d72cba5004243d766ef4fd8210e89117cf3381f0978eb94a9a4a10492f3b169bec6165db8e28
-MISC metadata.xml 639 BLAKE2B f0d6454d5d90aca55ca539f51583c08c1a6dec8bf79586ce2bdf3140c8fedc20fd22da3db92565c856f507e983de12de6c798bd8116d998f43b06857b1c77a24 SHA512 c21ed1e14490427fb76174e8182bc2b960ea60aafe5f5218eebdb06d04a51497f18cc00e5ea264181440ca80e765f9856c362c0bf01e31531ca8980f5db074b7
+MISC metadata.xml 669 BLAKE2B 80bfcdfec9aa7cbc61cecd673a7a5d486f0a3a2e001b566a7a5a87c7bbacb566f6147562f7ecd2f986623b33593ba48740d4887801c3f460fe3ef5b45a346b4d SHA512 26b5646b73a8eeabdbcb2a4877e9b0b3270d2f93d5ea4a6553aef0c51a5ecd979f8a38622b615779f86416281689ebe0e63e1a2a8d350378eb271e437d6d15e0
diff --git a/app-admin/doctl/doctl-1.55.0.ebuild b/app-admin/doctl/doctl-1.55.0.ebuild
deleted file mode 100644
index 8241168248ab..000000000000
--- a/app-admin/doctl/doctl-1.55.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="A command line tool for DigitalOcean services"
-HOMEPAGE="https://github.com/digitalocean/doctl"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go build ./cmd/... || die "build failed"
-
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
-}
-
-src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
-}
-
-src_install() {
-	einstalldocs
-	dobin doctl
-
-	newbashcomp doctl.bash doctl
-	insinto /usr/share/zsh/site-functions
-	newins doctl.zsh _doctl
-	insinto /usr/share/fish/completion
-	newins doctl.fish doctl
-}
diff --git a/app-admin/doctl/doctl-1.56.0.ebuild b/app-admin/doctl/doctl-1.56.0.ebuild
deleted file mode 100644
index c1ed045f556d..000000000000
--- a/app-admin/doctl/doctl-1.56.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="A command line tool for DigitalOcean services"
-HOMEPAGE="https://github.com/digitalocean/doctl"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
-		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
-		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
-		-X github.com/digitalocean/doctl.Label=release"
-	GOFLAGS="-v -x -mod=vendor" \
-		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
-
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
-}
-
-src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
-}
-
-src_install() {
-	einstalldocs
-	dobin doctl
-
-	newbashcomp doctl.bash doctl
-	insinto /usr/share/zsh/site-functions
-	newins doctl.zsh _doctl
-	insinto /usr/share/fish/completion
-	newins doctl.fish doctl
-}
diff --git a/app-admin/doctl/metadata.xml b/app-admin/doctl/metadata.xml
index 02d7430b53ae..a12cd19ca0c5 100644
--- a/app-admin/doctl/metadata.xml
+++ b/app-admin/doctl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 3fe754b21ea1..7f50a127c416 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -7,4 +7,4 @@ EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d1
 EBUILD eclean-kernel-2.99.1.ebuild 540 BLAKE2B 6e5d79c0587fb0ccabaa654a495e7041905beea21b5988af1d0dbb8ce0725245dc2abafed6acc6afddb389b6d370e6fc186ffd0424995a234b2d3438054a7d93 SHA512 2e08fa860b60a7e1e9599fc39ea0cde8acf6f0d231419a2bfb42456eee30aeef2a08d657d32ccef8b0dd2e38081d3bf6160d274451c6476b396d29e9847d50f5
 EBUILD eclean-kernel-2.99.2.ebuild 541 BLAKE2B a4bf9d96b873cf7e665675806ce8d67907abf9d4284723b4ac4a03835ebe9eedf0d2af606bce8e60a1ff594785cfac42b4d4dd0465b0b0378b150af8375e06b1 SHA512 fa15d2c11bc4961c830cd6a481553e2ef2d31b432d5c51d591ad091b81ca44aafbb8fa04ca542e40016057d16cae506359a07145832a894d505d51d9dd571695
 EBUILD eclean-kernel-9999.ebuild 510 BLAKE2B 1e3771388ec2a99302f336afa5bef7f71475b57dfd3434d6cdc0163d2af3c9ea28cce7a9634cff51303325cd188700439fe22e16723337b43057f995541dc894 SHA512 b3fb9e6d48493fcbdc4a9711f3dcdb3c965d03ebb3c121a6911e97a54d56ed644962e75ce2a13b610c7bc09eac76b04ec6d0849aae1e46c305a01b13f1e82bc5
-MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
+MISC metadata.xml 539 BLAKE2B 4222be67ce7e308c54287c9095fdb05561a5658ba7f0c196af9047c4d84d9f0d6b7d185f80672be46327774ae2c4a68d6cb98617c16046b153143568456e38ec SHA512 84bdfd71640573ac27c292680992c5e0761b36cb63007b76055fc7f9b89dbcd35c0a45029d320cba8f12df97ebe0908a4a072f00e6ab6a3ed2962600efdfeddc
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
index 06f88822457d..40c9c8bbf506 100644
--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 14c28a171cc6..55817611c2bc 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1,3 @@
 DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
-EBUILD entr-4.6.ebuild 574 BLAKE2B 62e54855ee13304a42fc9c3008bba21b5958debbc3f6beeb4dd4444a6b21689baa52b68a4f3e0cfce3cd313c49dfedec4b7c37d103a28a7d2b6819cbbc2c1c45 SHA512 d01cf7128540b816837035b222713937d86da67592d5ae87ffe89a3990741e1c8be565570844f2978b21d287a487a323822b018ed57690afe50873654f9ab474
+EBUILD entr-4.6.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.6.ebuild b/app-admin/entr/entr-4.6.ebuild
index 6440b0ac6005..d0aef7b7af8e 100644
--- a/app-admin/entr/entr-4.6.ebuild
+++ b/app-admin/entr/entr-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index e54c4ccd13d4..c640bc21ed15 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -32,10 +32,7 @@ DIST code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod 37 BLAKE2B 7f1d6b0d3a4466e42d7eef1cc7fb543f9e3614c482fc33462f006a193bbac8f629b55ff4f6046091dd19cc3414517bff8817e43836c9caa68284b580edcc0d78 SHA512 f05b5cedfdb7a281ab89b8150387ddcd695b84617c0355bad4bad1abb7609cec47d3e16bdd3fda172f067ad58e68a120b9abd18a240e5181e94d2912f4b6308d
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip 12973 BLAKE2B 761863ec1f123172069a000a43a5aa2e60a07bae4b8ece617450608603121ac81b12b771f9ae3ab0f3eb9cf14c2d2c23319a31e4f8cd49e93d5e19f5a6dc2c12 SHA512 d39f126bbd0bc0ce86098d3eb4e14ff02d0b6b053cb2e63ba202d5fed007d673ef39d2653d29751ee0b7107e96ad32d48c66944d55815dab4f7b9c778c531c55
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST filebeat-6.8.13.tar.gz 35569151 BLAKE2B 2ede230e537055065b70a79578e775b0ae9da104ab21ed895e4fd2f8d2070d07ab60e33f24c2850cae908a42f0d537a8e24a6256b7a6a5fca9b6897e43f95439 SHA512 39f1ba06e1930ea498c13dda11cd835096adbcd075585672004fdc9e19d96971936e47f9c631ee02f59984c10858cfd914de136ddc356e8c39fe833401b42304
 DIST filebeat-7.10.2.tar.gz 87244727 BLAKE2B 77e5967d4ee6b5390ebe19c3c9de9e5cbf6b8d5ffd1c81e2e72a8c3ae6e1aad146f0b5496816785893a51ea77b1ec3fbd050d9f2b54fd2c95ad2228d5a5b5e04 SHA512 eba0cda8521068f4d15dfb39808695a8de47a568e4d11949746a8f698aaff6825848d5e524bd16b0e555786e277512014dfe33d4daee8c3acef9a9867653c1c3
-DIST filebeat-7.8.1.tar.gz 95430122 BLAKE2B ca79479ae8bec318a69b49fa8ba08c460755b356348ac5aa067ae90ffdd1d4e0c38b05938a80920a2d6886dc08fc0ccda0153c8a3299aafc5d2c2dab4c4fbdec SHA512 ccbf8fbbd2c094400b24e5cf8a40a910c69f4ae1bc858c496118519f5424b03b192f4852620ad1b9b8dc14f627c0d0548127406b015cc2a3d7b624801196ea60
-DIST filebeat-7.9.2.tar.gz 82861097 BLAKE2B 902f124215d4017c65dbb5fca033a7597cca0fede573f6b564bff656e540030eec7536075cd24f28dce31de28bac2508fb492c42eea90fa25f06b2120716b73a SHA512 8e6eba2d201997af21bb268e4708cd9c4fb22a862152dcf45e2720ccb3bf7c1e40907f468ecd4492a0a4c1f2c426bd6077a0739951f7dc42c9b0b12ecc28e90e
 DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
@@ -54,8 +51,6 @@ DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod 154 BLAKE2B c0e49a0b41ded8
 DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip 604954 BLAKE2B a0c7fd40df764e8211c219f8bce5385e46ebb34ee4c547b8902961a772fe0d2843e7c67788a6d6053805a8ab57f8373e5340c3a45b4689328b4c3586d5b74d11 SHA512 ebe0dbdddf9996a736d1d9c4b87bd8c201dd6735e256c28c93302e2a243d23762e5433d57682100abd3f5bbd7d7b4e576425847186a795a0d685989af76d542b
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip 21424 BLAKE2B c22d29ed317c6490a0856a177c7624ca87b3015f6512f4ab330aed250a3742276f2e6fce0e6e20d3cb1660e384c429949321a7fdd949b325f0bbbd2433652d47 SHA512 cd43fd5be17c3e334f8bc4810cd92ddeea02b0ccf550a73e38212536fac21aedf6684b42244edf8dd2dba58eda2aabf0d6c499b2a5de83c05af1ff636f833f76
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
@@ -112,7 +107,6 @@ DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.2017061217410
 DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip 405931 BLAKE2B 462e19a9ef38bce32dadaef71455a82e5cb9bc314228816eb9a0abf2425bd0d450ac2aa152bc57b38aa79d76f0af46790c677043aaca66bbcba02f71d9c782f1 SHA512 adb130c27400012529b74ec93e7d615458eb2df28e9c7507eb6f05969288674a59b5d07edbb51729d304a8016e8054709a16d2663eff4c582f4c05d9ec50a623
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip 15095 BLAKE2B 94141df8d22f3961f193f9c107624666dee96f267a7e0c5bbbe70426433ed86dd9a617184e5ee31e668aed94f5f011a6529ec9a45b065a86bba84c2e81ce5490 SHA512 4b7371bb63b8b32da05ff5c5c2aa6e584f9c406164177b5ccad8165b8f3a4972683a4c0756bdb591d28f6b61f22784a391f443503fc3d8e108f92b8c4b6ce0be
-DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod 32 BLAKE2B 9bf3bf45ceb1891fcb6ecbd977b3968e249d293377508fc645c3fac44f8ebfa0e6aac924836fadc02888ac771c7d641472c2022a31f3c3b068ba94b0dc0e27cb SHA512 678d2ba568fcff09b59e5110b204af334fa1a8357e14194b88d67bc982d4eb3d9c26000fb6f2d51e2a2ce2424681c7ff203b98a5cd3d0fdcb32145a5f05b49e6
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
@@ -123,7 +117,6 @@ DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mo
 DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip 210208 BLAKE2B 9dd3f1a962f3216de6aabe6aa39f74cb817454344918afab9c01c9a0ead3f5721dfbe787ee4b65a7080f2adf0cb9cd82bd688de529fe0708600dc34a71f8480f SHA512 2db3f933081369e6273660658dba52a9e374feb0c0bf8a2052915a76875ade611cc146dff4255e8ecbb55f5982a3fa8a1eb601784dfcc816c86bda590340f328
 DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod 33 BLAKE2B 70b2db5f3e0c688d0365d6e7d53e7fbbcc3a2d79975554baa7b9b32690702ae6c2445999cdf2b7a3f0b833169a3812c4b8096f02795f935c81b8f964f4e34361 SHA512 ea84f042de76554155eb9ffd145c2a631c5b1cc2ada0bf13ec0441a1a78d9fd7a10f17d5d4c5b42a9a118d7dbe4212da3405ea07a3dbfef841ebc41dbabf5389
 DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip 787949 BLAKE2B b3538ab585c5be437f5e4f20bc632b3d89e2a52b9d6aa3a8252518f8089a6d7ccfef00884b28a53ba39b9e058c3d5e35a731d29681b693431e0f86c2076120c4 SHA512 7b2ae93cd883fdd716aa7eeda35df51d624da4c0f06036b48d9e2afe4f6e1e48b0ed60c85d3c6c0350b8d3844ab9357be41c13ef08b052a8018c61cbbf5db145
-DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip 5551171 BLAKE2B 3a6ad27fe06908c831aabe57acc34e25cf2fb85750011d93ea2c77e78c6968c99aa5abc51e373a11ddfd27aae31073463f6c1ca576dc7e39c24bccdd4c06d32c SHA512 92662212b13315cb47d541e2f522c159829a31cf1a81070c9aa7c1a27b238a9cd2481306275267260b19a81a664ec7ce62ed79c21d24455abaf8da1d164b8037
@@ -194,8 +187,6 @@ DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zi
 DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
-DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
-DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip 111763 BLAKE2B 79366ccbda1a9a4346e5fc82cf44a7f37389603306ab9302ac71cec0613a0747c97b035ba5e26631f5818044435e39d3382184b4b8d48afd7e6af4cfe01f6206 SHA512 d770b2590f13c4bd880cd489a25913226983cdc1f07d48cbb76ff72dd472996b62419a35f4011cf0366ac98ef6c78b9c85bdabeb4c9c36cc6070108d107b6e9f
 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
@@ -206,12 +197,10 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod 42 BLAKE2B 09381800dfdb8d9ee9032e2eb53d51bdef9c0bc48fbed60431654485afc510f1af8282d675101a49fca885004998003d73545269a4d12ab14fe1338d49a976c6 SHA512 4118f2e16a9e96f4d68e003b92189b9b17f58fc57700a98fe0feaeb893f406100c5574aca23d40a579d95a67b59e2cd6dfdb4883fde356a868e6bca640961376
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip 624543 BLAKE2B b0d72f4b9e0eec70803fb534f2fa5e1044f89a5d97cea40ac6aa9398b74992cad76bce4c8153a1d0226fcc8fb6fd85fe7d8e098e611073daf3e7ac27e4b5a60e SHA512 149aa16651deba1db2399a721d726ac46160715ed3b940599e36ce7e6950a794b83127c05e20f1247714bcf9ead573b3813bcab06e5cb77a417bfca6930fae2e
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
@@ -226,7 +215,6 @@ DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7
 DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip 429582 BLAKE2B 9022c5ad4658392f0cf3f06bc46402a0b80c30f1745766aa5be6440bb4db2a234b0e4df1813cb6fab3277f904b79791202f37fa983d9d440fac57ef37fb2c5a4 SHA512 b957061b14fe7abad566071213dac12f9abdf0f655b47a5e2c7c998c0e9aa9aca3e49283a1c2250e1abe4fd8d9ad9e185d969c2a0a2fdd3e295fe9eb54002630
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip 276868 BLAKE2B ec236ded34552ba8b1959e75fc58f6b36ab82f9c99e3f23dcf241196441bb4e8c626826175d8f0726c3ac1f8856dcf5e4cad81d70369a54e597f66b8389968a7 SHA512 4940f6aacf5e1a640e30cce9cf8f3797d7811b80b9ff96696ff2eb1c4ff10f25e8090c396ded4bacdc3393289810db3d0e4ed1d6373fb4654336112ef854034f
-DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip 60258 BLAKE2B 833495fd32059bcc757746d77670009145512b327557e48abbb1be3f33d7f540fdf3d221b5cde015d0802a85823d9302e5afd0b10c730d7e7841814dd03336f0 SHA512 bd4fa1d2be064ce6e7a0e8ac3138e7324fa0567f5312806f92a7c9b1ab58aeec5546db054f8f0616ad011fa0022d43dcf9607e53b6b06ae6e30bdce8c5a87231
@@ -278,14 +266,10 @@ DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod 360 BLAKE2B f5688af3801
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip 56280 BLAKE2B a7bcfd957d321d54a6bbc5a3cdb19c4901bb01be0a043b28f1f82b80f56e325748a618b81ab477b20ad323d4f2b0f0b3d310ae694bb5687050c8cc5711b022b4 SHA512 312024d9ae4e62b3d4513c6463c42d2bf41e2d4b1d301ed13e8aa7fb677ea303393ee94ea6d90066608a39f6f2dbc1ac16228c68d7ea55a3e496039f5cc7fe3e
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.mod 360 BLAKE2B f5688af3801d4924feb662c514095d90a03f81be10886651593526275ea2852544253018a9760855c9c5c5e3b7c0442b25a15dd2a750d8da007b04e50ed4894e SHA512 67c5d76c8b70386e01762d0842ed5638887a40a80575d21b1e1b10dd4df24525c1f6ea77d5c6096c9842f22817c9a49fcd14514bd5a238ed1ec3fbef79803838
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.zip 60182 BLAKE2B 67424bded241534aca60800f7724607df17450117f6050ca851e19b6ecc7d1d11beee8458c2d5773b06c882aefa509e889ec971b192f16ec81f00bda082e21c5 SHA512 2e4c699448e5c3899798debcb2ea759d62ed460a4a007d89abb9ce7ed363787c9526413b14dfb291394f31003ed0c49e9d5947c8990d403570a13384790f3ea2
-DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod 38 BLAKE2B d5bbebe1e345d5dcbb2b261d2b7fe76847a525f5a3001881782fb1a1cd2f803315b2af52a221a0d5aa75725c79c67d45287443a8ced59b156980abf0b4eaf965 SHA512 8de7f9e54f95a8628b77f91f991d661877c4d52fc8e8f74f606194d2dbe7003c92e3d9b960f99ecce3da9bcda42e49712a543f8232d67c8b387986bbd8fb13be
-DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip 198635 BLAKE2B 83f075fb88907c6287c82fba2e70297e2636db297ce4892b524c157705b3f301cf720c1661e8fce657a4ca921de8d761ca700a1c57ef51aecef8d641b8703b01 SHA512 ac95bf7f015348118d60347f8e8ea17ba234ed74db063f0b1d75477fc373d94aaf185847ffd730da89d53de512a7b551a8af136eccf95215b495b64fd67add96
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod 441 BLAKE2B 2e98c14f0b7966a38fbd830304fc931794972fb8a541807d803e6dadf83bbd3cc9a1f88624c259b39da6690cc54a393869f73c345bda3902cc63edfc47fdcfc5 SHA512 f9a55e11e92a6a70189c1cdebd4a4aafea8716ff4efa7d9b3c1c63ce8f6b1f2ee44d6278a79f1bfd5cfb6f746d818450a5ca65304fe3bedb0f1f138cca85247d
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip 231939 BLAKE2B f7e0b397504d5f15f91e2495b70c4e0fff2e960a86a5cbfd8c1bf06b288910a62d7de001476996c152d332e896ebaee0b72b07f24e55235bfb5ac4c5f507903b SHA512 5cc8234bb5a8561feeb08c0f14c734798d7aae18d36f4b5ac7908026532007ba44e9efca021b212bda58d76f21c3e60603d29cb900245af38dc16fdd5559fc30
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.mod 364 BLAKE2B 3f8e5c96b96a659a18b7b47ecbacc8c688a9cb5216f8de10f233c84ad3474786f04e3a38f6f76d8bafef6c16ce279cdbf30d2b377a71b00d74aa6dfa6f3b1943 SHA512 57aaf368161836e49f07a5ed802d5ed0436ec9a6aa7847d06d51c5e501d7a9ad35ae7fe29df5117dad71f51efc1312c08f066f2ee563272c746f12a9b06fc880
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.zip 227123 BLAKE2B 81229f03825306f9374d19d8be2561223c0c1f1273d975f571e95a958bbc904f3bb63348879dda5677305adaf1e93fb56e7359183fb397f4aa0284870697adcc SHA512 282b063e127439a754e9cf356c6a24a86a1f99602e4c02046fb88c5cadc0cd1cdb080af9707c647231ff0daf527ea810e0d0f826c5368d9738c61c8642e40546
-DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
-DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip 40569 BLAKE2B c5011769af42cb3d2c1d60fefc7a7f27a436a18ef828c6c79a2d06661f7ea5d80ef90961f12d123b609f3d475d7d523a18904b50629a077ce0673a5c052715aa SHA512 fae11d9a5007de0c3e41533d31fe95b5ffec248e3890389e13d0235117b7393a1c255ca449432e92520ac292d46f27b2853168bfc9d93e67fc96d7491a4a2e7c
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip 40661 BLAKE2B e2ca8335127b6501a8f0975345681d17d7b1bf070291820fcf1bd392703f265b6c64971f991d3a50fe238215cce3193b5bfccea3eff6aa721b43f58939485695 SHA512 3a26196c6d2124cd4d665dc855d82067024511d05ad78ca02e973d11383bd64f891b4b3598f1ea4006943f45555608e65d6eef88e3f3ee7b57a7ce832a3c9194
 DIST github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod 123 BLAKE2B 3793639b4040fb33b58166fdafdaa1663939d5d673554b6f963579396cef76ff832a37cefac6a0a8a62f5fbfac50deb4b46a27e75bce46ce18c04a88f49a6f61 SHA512 6cfc4b638e78112ef20262a1ace9eccbe906a409ff0dc5ac633cd87d3788964fa12c1ecc789ddc3e0093027c6c3423bcfb5d367203d7923d9b6005546dbd39fd
@@ -298,8 +282,6 @@ DIST github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf1
 DIST github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip 55268 BLAKE2B 72f8f0895175ff5d7d50705b9dc2b839464a64fb5ed65ff51663be8c29acb7cbcaba32c4f017456e06f56a092c33dabd005a129111f67af5f262493b09ddb6e4 SHA512 aa9ea82950d6d2c6078b48424c6a034c3fed724042609dd16a7f00717d1a5c33b13749ecf6a88a49453a3dcf4efc60a4fa27ca749fb1e5d1825ceb0d2efa24fb
 DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod 295 BLAKE2B e58f21b5a31f2434ef091613de034b72dd0da2f188784409d68fbcd42926f7bb2c5c8eb0f314afcf51097c0bb7e8aeb0368a097fc87c19a1480220286eaf3d69 SHA512 7b52acc73ff55badee23c274a475775c88271a68e4bc3492e94860f8045d6fe3b00fc1c62edd5b3686cd9e4b437eb4b4242dfc039ae31c8f35055c60bbc6d441
 DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip 48037 BLAKE2B 33ca7e5932ccdad787d4d8b70f04a289fa7c8fdf16629160a40ad4088c89ab35c0fc4dd0f6a890071b356193e6f7916e1ce698beacd92f18849e50eae91e5428 SHA512 2e587f18759ff5e785b3c4012f2db90477c3d6d789dccb7b87e8d4f7b1db97817e90c77f7381ae4b4d5809bf7d697afc44f89c9779ed343f96deb133c0c2d049
-DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod 49 BLAKE2B 352236127621622e9d98caaa768f688fdd50df5cbfc0b741a438a243aedc8288646a555ca20a6edf5ee56c74b3bd4d14b8e7fadfa68bc74df6afc05d89ae2a4b SHA512 5f32bedf6d5cd474f6de1ab798de83b37ceaf38f2e6895b80f057d0ece97a8ed4690e813b3bc8b2c0fa64e8db2672caa49ebd30be2ba4f0cab3fe007475be7dc
-DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip 458731 BLAKE2B 879eabc0e78a111301c7906f6f7b1b2f6476800e2a53732cdb51aea2c82603e7793c7fdf25b6b8440045c9e11502754923100439955716ab22eed13a62044d58 SHA512 ee6d0839f8b55dc99069948506600855b108514fd119fea4c43412139508cb814344948a9a212ebcd87c961d85e665990348607c4c75ecbd6feee236d94f3ad6
 DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.mod 49 BLAKE2B 352236127621622e9d98caaa768f688fdd50df5cbfc0b741a438a243aedc8288646a555ca20a6edf5ee56c74b3bd4d14b8e7fadfa68bc74df6afc05d89ae2a4b SHA512 5f32bedf6d5cd474f6de1ab798de83b37ceaf38f2e6895b80f057d0ece97a8ed4690e813b3bc8b2c0fa64e8db2672caa49ebd30be2ba4f0cab3fe007475be7dc
 DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.zip 461537 BLAKE2B dc386a6ccc8c4a282d7b3e59ba6ad3f2acd1178a2d7ba9fb716fea51e683c4f758d94d0037a65c16bc4447d59b1491bcd2f9ca7c038089339132b7050938f423 SHA512 83b0e5882b84e12daa277defdbc817d43dda855e0963d115329734158db91f7fb4e3db91659d24da916ac3a00fa68e2331634b432bd62c7b5f56287c45d9a8db
 DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod 400 BLAKE2B adfe5b388979c259bc50763c3221a7a2d5b19c828869be74f7b12f410e975e7359f804a9f0718f58c2be7731ccfa4d434ed0c099af4789ccfd435e9beff8fe7a SHA512 fc6b82929472a56b3fd5fce7f67b39a7d222949adc570cab9ad2c1e5715cee3ebc03d86fd8ecddcbf066cd3b2822c19b32dbfe373e93365f098fad17bdae2cac
@@ -313,28 +295,21 @@ DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip 127483 BLAKE2B 7dc0995f7f9
 DIST github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod 116 BLAKE2B 2d92651d2383c73f3bec3975e5234c1346dc707f31dc29f5bcfda4cb623aa037a0df5a2dce4bf2b5fbacc0dec8a6594dc1f5ecb8806dae8d46c3cd2b4ad45e90 SHA512 158fa7771a24db80b5aeebf68528b829654d71e56ef80b5cfdd8a01b43ca25dc76bb27d7bb56a44bd6e3fb39d43695ef8edcf95e0990a970b61b8dfe80e85c65
 DIST github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod 169 BLAKE2B 710a0a9461d763677ab9004dd59c30a1ef9a4a40d395c6599d4df42bd7004554c36b50ffe296c729ed5381f668e491664dc99d7421b5de7aca2cc1d967fe18a9 SHA512 a6f8d3419f9afebd4f2e97dde9cc9e455a441a7d899745e6ae7d1cd40fc55796cb9679b44993b095accace8b4d57300e5136b83af0dabea26f10ca272afbbe3e
 DIST github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip 28984 BLAKE2B 34b72b0cc180fb7f70bbfc3cf9a7897606191e0aacf66b9312828b952405286c6f46c2cb5bc91b2f8226babfa77a15fbb019892553ad253873f82f6989333c50 SHA512 af27eed8b1e8e8ed1ee49299f685c87b4d4adddb84814932ff76c2165020a8a32258f524ca1c07170da1541735d9e311c3904e4d357d0a0e9e1e69c0cbe12e9e
-DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod 34 BLAKE2B 1e42e1bc3a6b6e07f1f79dfb4d4cce05f157733c04b0afd052abfd8ab4740c3dd13a79ce604d4e3c39e83a9bb030843916ab65ce1073dd4909c7152dbe7201f3 SHA512 4e38f6bf1be9c62070d87a9485670cf73dce37af642eb560ddda6724663da17d852465cef3e0c8f0664ca9d479ce30012393d8a375bcb3a593f47cb745ed59f1
-DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip 107227 BLAKE2B 5e29f9ff6b523ac999a74aa4fe0952495a3a63edeb5894783b08056b16bbedcd122ff36f8658d5277711cc45dfb35481b8d3566d7fe4a864c9bc698e7e60c4f4 SHA512 65ebdd1324286abe1dd0dea6e8ca594b7a4ae3114e1847821dc0af545848c3de7c7d2140ff1f62cdaa40a3cb367297e7467b53faf319af58a9773c1600bfb8ed
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod 34 BLAKE2B 1e42e1bc3a6b6e07f1f79dfb4d4cce05f157733c04b0afd052abfd8ab4740c3dd13a79ce604d4e3c39e83a9bb030843916ab65ce1073dd4909c7152dbe7201f3 SHA512 4e38f6bf1be9c62070d87a9485670cf73dce37af642eb560ddda6724663da17d852465cef3e0c8f0664ca9d479ce30012393d8a375bcb3a593f47cb745ed59f1
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip 111274 BLAKE2B f7d8f3c732b9349dc7c324b107764ef1aaa6fbad9668dc1d5b85edf914bfcd76795b7860436761a8a5aa9dc2d6df3a3ceb2653f33b643a02577e736e5afcac27 SHA512 cbe1480fd09a7c14eb5c977ca85f3268da634861075847ffe86bdd1338d1d3b87c3441e9ed00b02400179f2651016cc3b6d9d3396c1c980a47137752dbfa7543
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb
-DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
-DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip 127557 BLAKE2B 1747b001bc860fda3bef9158f85863e56c8751834dda8160e80075efd64079059cd088e6e31c3e951db81823cbd33f4787e55b5afca96795707d20b00d09d2da SHA512 d64c47cb432cdddd39ecbd6f53a431ab34eb1f17e95264302b8708832166f847d81dc650e9a61475389b33e0b5b08f8f7402258d1ae927f4fdbc2cd098326e31
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
-DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22e7cbf1abc36be47d4d272c0e454ac2cb60c55e33976167d75571cc490dd73761e31e597f2a8daa8244ea4d05a55120f6038dd2abcd1bd4cd4 SHA512 ff65ee51114426fd17d1a36b6e7fa5b37d9ec0cec79b6eee9041f3506373582ef0208f33131ab27e0c4d20a13fc9657e55921a704ce5df1ed3bb7ba8f28a9e76
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
-DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip 11358 BLAKE2B 665fb79fe378c76e77d98909a3a0c66ce797c79658f4137a1d903d10bf5a9712b6e2a379337196fdddae3fa5ee72488853c8c5f7394ddb98db9bc14dc42ba44b SHA512 74d67dabde4401ad848eea4dcb16862a136f500c887eb2d785f358d1befdecb38efbd901e2becd6302852477156cd26f1cbd06f9d7aa757e81af934d1c5ffbfd
-DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
@@ -343,7 +318,6 @@ DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip 52308 BLAKE2B 754630f3a08998023a2b1f7b13352108e336cc50972bec1655cd04134be7f7e416e2a68e776fe527e68ba898784f478b2dea79cffab8675ce4b4be213a14234b SHA512 ce216e29595645dc18cf9d68c8720d2490bda1c51d48037f36ef7dc8debffeddf6177978409da8616cc33dae3bc1f746b5d04c6d22bc77265fc19bb376d0883e
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
-DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
@@ -380,12 +354,8 @@ DIST github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip 319486 BLAKE2B e697ce4f9720
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip 11891 BLAKE2B 1e2d9fd70b4c7eb1444efd7a6377e949d9a30456b382c9144aec2ba625b213d66fa0590113a440180d2747870cf228e553f08bdbd16d88f9a255364e2e192578 SHA512 45289b87faa66254507a19679fe604fbeee4d242692a916e0d61c70bbddca00c232f3c06183c76db91c9062072bcc619df0d48f3dfc4d8b0d1c567a2418b9cc6
-DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
-DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip 37788 BLAKE2B c23c30419fd55a14451ffcd5b95ac35ff704ad6d1d0d4b3d344c9e3e0afe3adcc619ee2d99630dd9343229a890d8331183806eaf0e012b8597d7a5d285ec3b57 SHA512 2d8bb8c9051997cf18289857515a09c6a5b2475bdb6a54206bfd1cb213d1e3516d50f3fc8879d69174dc5f91b0b81d23e834095684b39d4d850c0aef5321e3fd
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.0.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
@@ -416,7 +386,6 @@ DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
 DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip 9531 BLAKE2B 17f756f40c12b6ea29962938ef18520d5ca3fc99fe6804b0edc41b63dec17b63740df8d9f1abb028c00f6b5e74b2fb6dcf5c6a09e44ef0ee1a86f2fb2e740239 SHA512 27fc4b487a652c7960ec6e691b78e80adbc3dce7590da3f4e568fae95f583e207a887aa8626ed75da7346a40d47b2bece7c3aa5fda6bc7cd4188673706f616dc
-DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod 37 BLAKE2B 9355e4909ed1e7ea43b9882cdfffdc9c986b9a8febd22659143b53f05b4c7a9b152e01848cacaef750ce4fd7660dbb62ea3e0fec4bc2abb47dfeb566248df33d SHA512 9d10e0f8380c49034398df4cf8c9500a0e1091001f08b9574da6933b861210dc4d518c7e353570618c4d4c432c0162e8fab4b4acd64a2d5360efe456fed4881c
@@ -432,8 +401,6 @@ DIST github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod 362 BLAKE2B cb0cb1
 DIST github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip 411863 BLAKE2B 9d2abf07710e54822bc9e74a1651e1256e89a64301a21d4db1578e39e39dabfb7d9a85f5ba7a8ea52b464701f16368cd299bcf8490ecd708c4739f72ffd51821 SHA512 82f8ce7e442f9409ac589cfcf619db2d5ed4e10dfc5af4ba18fc4a2dcf87e44fe5a89595020dd75f366b63d595e8c8f4baef52e88500ce51d5deafc8e55bfdf2
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
@@ -447,19 +414,16 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod 37 BLAKE2B 889b8d124501cd0e4e911f4778d36265620b7e42c785ffe0c3a80121f8a283bac29eeef29697a90e176a08665b5482a3b45b85c29cc002f1e69ce6586e8730c3 SHA512 907a01931662330c0a6698ae295bd892db2385a82d60a647096a25c33f541c2a7a770bd52ab2358d61e3464ee8fba19307462c7e8471523b950311d6c8e03470
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip 22987 BLAKE2B 9d4930fcf40716fe929b4b41453c904046629f6ad31b0aa539e0d484a8a0427524d4d8949c5f6a47f89ca489a09ac2911742f1d8f6f9bdf20f0701e63273cf7b SHA512 28cf9e2c462c27b9d6324527811a1c8f19126ad9c4aa821fcd93068fa103b6f99dc447c86203560c602ddaf919a0d7ae151bb949b31f06fd9813b0a17df125d2
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
-DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip 561615 BLAKE2B 3abcb01b1c3967ab2af5b514dc18701c306e849aaac9cc005d20a57edd7a325d466df42bba428acfd7ce090d6ae1f709da90f1fdac71af562a50157b4e0c2546 SHA512 04fd29b755fee3b1154c88cb981cf74cd18c0baf519762d04cc546511017dd5c92fc82ded44657a5ea3e37d67e5b1ef584bee854e31a21153731bc530e9524c8
-DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
@@ -469,7 +433,6 @@ DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f78
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip 52079 BLAKE2B c04668f509f8b3bb85f90304bbd60ab871c2dedb9ae91a363e692951d6be27fbca226016aac4dd7eb345face0f8d318fdeb99a68b7f0db6c41759a09aca905b7 SHA512 187e2308e2a487929d71144596f7e0dea1d4e85369eb2ec94e79bfcdd895b3355d0a9ff75f68d0e915f9c45e4140549d1a470f48dbf588a43c472b635c744b28
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
-DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip 606164 BLAKE2B d86b37cf29ebe06722a25ff47450f1ad2994da243216e5694632a3d0b5b74dd9b81bfb9fea9191cea02dbf4bd3baa2aa3162c7af9590526ca79e01fe193239e1 SHA512 c002521fff17e78ea18b8008f9a5553a68dec0f0df641008e5394c8e9e9f1a941b30b48f635497996acd8ec08ac74bd8b38a35e3c32cd6284de8b04cf987dd82
@@ -484,9 +447,6 @@ DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip 35171 BLAKE2B d5f7278b148d56258773ef2b7add6efeaeb98ff9f551b3944e0e418f381a12f9ecefbd0988604d71e076da0d598eaeee123d30e93bdf30370ffac0a26bc33469 SHA512 b2a0b596bbd10fb8393459ddbeb2e4ac59b1ccc30226b158e81bfc9bdf686760d212afedf957ba11e8c4354c2ec3abe75bdc40dffc97d5dc70366c54f209a884
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.zip 15518 BLAKE2B 2ca1e1de9972c287b7e49507330594e02669c67362a6415f491b8c7648c72cbd12c573c114266bf9b5016412c65740b2f5a0ef3efb85ccb6001c6f1861f05870 SHA512 0026c31a9b2edba5da0d9c0a64e5963dd931f134ae3cdf768c8f1cfd8ba15bd7446ba9f4b7ee2b9f5bdd7d1fe1a34e47cab60c001f6f2a0148f22632ad130f64
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
@@ -514,7 +474,6 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f60900d4003da2a3663e77ed131986dcbe209aa13a59198f1fb8b182401c50475b4b39986ac1dee1e165f952bc7de758d141f5cbe028dabd6eca64 SHA512 4ef5c92c16747f375f83866581302be13f9425c9257eb4d73d197cd2b9332f7125b5864a1dbf423a96b1c03ef21ce32ab5cd1837760258a07052be40bd4e6399
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
-DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
@@ -531,8 +490,6 @@ DIST github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod 35 BLAKE2B f55b1c507e5054287bb6637b3c799d7d56342906f680ed3f691be557e93a417204fcc5a9c1a6c62a6081b895ffbd2558d7d2cd5e064672e2cd47472a92b15a30 SHA512 75c03e33527b1b86b6355b533ae18cc7d87df77338d8627602b7af2068fb020c94cffc51c971fcba4338aa166cc6722847e3437a6db1ccf209145314d60bcb45
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip 4359 BLAKE2B 4c85e5d2de711987feacb8cc322135e1ac899c3106f5976d8e397b6b7c6bd10490abd144a0e2429139156b51ddc395cb09bee4d257047062053c9ffa4f57b29e SHA512 d5a90394b45dd5179f285a7c6696277e3624c4011dd7ee9818c6a0a03657162bc1bdbd1a6540d167084a74b06b846fa33926f658017257a52839a01c5dea34ca
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
@@ -547,7 +504,6 @@ DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883
 DIST github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod 43 BLAKE2B c46a08f2554306747a47fccf4319dd74d0e859441911fe99c0dd7c747391c7b96721e82e5b0047dbcf74c9f6544e1ce17b2d9b28c20fde0ea24d9e82a5130049 SHA512 91521b7af79fb614019b2e6add5c3dfb5560a446ae366f552d95ee1cad09b2a6f121b142fc452ff55584917479ff2949896c0a1729f3a03841a65c804e0bc3e7
 DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod 45 BLAKE2B e071beae9a17798a9d03db9a8683db282536a4fd999d9d0715eee723ba995955cf1c4f364631b58fadf446d6d9818d02aa69298d55d339eb38533c096c83960d SHA512 703d71ec5ec222e1c475dbe132870d5aab5061f00ff69604f73fda9a66934fcd7e7f14df52c4ced59580cc8240a83d99709c746f5c833c33913e18a172220bad
 DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip 38409 BLAKE2B 5dbc6a9b85832fc1fef3f3822d3097f6d6dedb53bf16c76952b778704c9c4cefd32f84b40ff7ee0fd903614ebb5ee3df932278fb39565378ecb93c8c73421b79 SHA512 1197a728dc5e23bf620875006f48b497f54587a22b1b82b7f4e5cff7f247e8a4e58a10ed85280515c451541150cca037cbb7a9fa68b0ff95908ebda5c213adbe
-DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod 40 BLAKE2B fcc716fd56980eec2613156eac1c731cd653369416946bf532a2ac27df56a894cd6dcdbaee1f55d6b9bf2b7215cf21c6beae58404e55fa71a666b9958e69f7c5 SHA512 208caa4a93b3f365428dbd324ac42ca09f073c4028e06427c75a1883100eb1de0031aed9a63eb283742efc0d64e7abe644000829e704891362f59dd32da40b45
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
@@ -563,7 +519,6 @@ DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
@@ -601,7 +556,6 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
-DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
@@ -613,7 +567,6 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 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%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
@@ -631,12 +584,9 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99b
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
@@ -662,7 +612,6 @@ DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod 80 BLAKE2B 7dde564f562e2e0498
 DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip 9837 BLAKE2B 8a6545a58eea36974c18a22430b408a81b52b038b950ab15eafd1dbea3ab6c1a96c809e551e0992177b0196b9a022f87aa3398b07d93abad8a527aef8008cb13 SHA512 ed11e504b8ed5b55396a1b05384d471f713fe5a845bc0d74d8690d6bebe94996014043802d0a78976f4e9e0bb5c0cdc6d9582dd168d5fb233c95b55fe5724aac
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
-DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
@@ -677,7 +626,6 @@ DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 2
 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%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod 30 BLAKE2B 67c62902e3335232f71f6319d7bf3b64a39bae4688b6b1aa43f8374ae241a1d73dffd62f8aaca55ddd2ad4c6ddbe2b5ac43dc40fdec25cba0d0040b1bfa14136 SHA512 a708840fe3482dfd1a1602b1a0416a81b91f1972d83fe3f92f10bf02b83f122a822fcae73aba3c98089e48445ef13b33c9f3443ef0ccc245a7e6da0c9424a21e
@@ -757,18 +705,14 @@ DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
-DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
@@ -782,8 +726,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b0
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod 41 BLAKE2B 1cdef4ea755c26327e7bca09e21cec2bf3999c60d52f997fa5a907afa146535c65c921647cc777ed780e2da71c11d29156039bef93cb8480c38a2e88f5e8f6ef SHA512 395ceaf025ef072181eaee098cf6645e300752ad79623e6bfdce86380bbbddf9e1b870a10309b746bfe0dd6a6f63bdc789f482c9577019a0a124c78c73043fac
 DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip 12625 BLAKE2B c85dca7f514c95e22a23df6236b327283dd2fa11ef05b0af19c38bb4548e184313ce3389347e41d51a696d8dfc484854514ed602b1351443ebb7f4e20e6bc262 SHA512 4e492d8404e644e26bbb9e4933595f008276de306a143332c4dfd60b3d2f3fac4c725190e23673c0b995dd9fbf01d289f56cecbf56b12143205f8e9e1c8ca449
-DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
-DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip 665575 BLAKE2B dbc70781128df28ae9ac6b49f9994a0835a645df593233f7dc4e6cb8be23fe055cd7f1e1466c3a2568d311ffb851ccdac63f81b6e68db8f9a9462cbd2c67a99e SHA512 8f4fea74a9b399a1eb923ed7e724381e47b529ca1c6c041143a8f3f22936ff6f80bd7e15b29c85013da37c5add084ad3af687454e92bf492047c3f4e7dcd1660
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip 665575 BLAKE2B 179c2f83888ca4f78103c151e527ff612fb0eb2ca0f5228db2cf0e93ba22374957f4bbad118f6917e2f1523de91c0f88429bd564c2112382d7a21ac1ec1b4afb SHA512 bae9fe03f2daf5b2ac1739967c4c298b5b638b23b9659b4acaa7c26673e091b780e9556f692c248a04f9a58befbb84343813f9d7544acb592cc8373427676961
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod 80 BLAKE2B 239ac891c92ef39240c17f3dbbfcaa7ae9683bdff05e8d67dde1e30597a131267a3d0589f7d2b52085f3947a59ae52a5252f3ee4305235f8d2665ee330cd7171 SHA512 84479e92ffb75572e88de028a7b8d990f0ba3de43c4aba03040a2518b35466684ddd60ecf5175835a113078c9640663b77e131ae9dbded5aec78f7799176d823
@@ -792,19 +734,12 @@ DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod 80 BLAKE2B 7beba8e666585a6dad81f461e24298b8087087429a2112be586d51d774f8f21e7d965394869383a93ed510316f83f83db6547937a9095db8c73f2c0020e22590 SHA512 541cc5adf1c71c2d92b505199fd94d13a7ee4fa4c2158bf562ab7e5249c1c1073444682d71a25f13c19a3835b970a8a525218d53623eb950c2389efa7e69c8e1
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip 314745 BLAKE2B 9e411504eff25262762069d8e2547e848d11c8daffc19a76cd1b92136cc6b8ca4f2d4ceedcabdb968c779005e83f6d89d5f40a075e22b8fd113c098e19757ba0 SHA512 24121e64d81cb3b5a265df493a6abc157bfd75410c46d6adbfc320b929d9f6ac545568db7aff32247bf7dfc39661c984abf7cd23ad64badc4e7ff9c6b141ca3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
-DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip 45499 BLAKE2B da611c24b4f8ac9b5a5dcd44a9dc6f6b7f9151792f12168f893c38b556d208e709288ef2de96dbf12679f2dd1f61dfbfb38d7d7eeec1d7950eef699af29b1dd5 SHA512 7835c8212dca285d794b1ab29970f29045c957c332ec3e0063964766ab2c42efc89a0951276a633d93773c4799012e3104f55dc8fa773244ea3b64528e8f8eaf
-DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.mod 306 BLAKE2B c76617f0e9ec0a42ca37b856fd579e8b6c859b70eb7a07b53332e88d1ac8e07217878826e560edf876e0554d0af92a27e2c53e21b88b80a2cca7bb10ed81a7af SHA512 ccbb2bbea15594c0001bb949e4ed5da08fb55964a0bcf6c8119175e0fa5ec02cf7ccaad8dace4d25a7bd22a7e43e168924d812faed693517d7c45f3ee0e7ea3f
-DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.zip 41448 BLAKE2B 0b6d97501e76d00bcde115840db1bc931192e2535f1a68d14ab68e1f9232ad9848b99f4c6cf706ae46e73739c01b70b03e4b569750f47f2230839e84f71b1373 SHA512 7a2ac4b6b52925379048afe2f72b9919be7add7ac57206fe9964e3806d269644d69235d097459c6cfdbcb46a6679b5bc967b2aef65ef37972c15df4bba18a3a7
-DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.mod 383 BLAKE2B 8df83e25952ddac9c15ce3b7833839721fb0fe8809a0931e5f56d92c89dc3e3734405685b14539592a6ba27edf6b2e505582398291315003712a29db80029df8 SHA512 115efa5e9404787d245c188530502adf1cd1587a7d4048acbd017b2bccb5e5ce4eb179ec96a5b189e6d77c65ae17377a09a5656cdea3443a22757daa5d4d9f30
-DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.zip 36935 BLAKE2B 0684fc86dd1848087ba54e7d7e921b32f615ef90c2391825e99bbb3dd0da6c9af6f70c7e067d45e93deeaaf8561e88d3ca18f7fed2e8536d43f7f5380e1f872b SHA512 0772a790fcb45796ab1ed92a44ed5581363a78fd8400f553afb00a199720254e0e52f65046fb2b08da2859856ddc0505bf83418b5ad10fb123113c5e25b0fe9d
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod 30 BLAKE2B 59a627ac9dc142b90929bb7534aa62c92788a4c3d42cd5498ca6a0333019cc053959d8e9cdcfd6be3ea7e6b996868519bb24e7212e406f30affcb3c075d1c2c8 SHA512 bb77d11f853441e67f924eb79a5307f0c9d7db7cf29752b6d7ab1bbadad8afdbccc6461c4401b66c698df86de7b9f32af593d35768c456964530c99e19881259
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip 11941 BLAKE2B f64e153f3c62f9220f422f1b2e72b4eb77a3dcc009a99a93a2e985bdb8f134d298db36377b05e263ba8e059bbe0aaa9ee6e0ee0a54914f578d2a5ee76ddfeb3d SHA512 b6301d0eb0b0ec015068c9dbf2106109fb258c22010ef71db09bcbc84467fbec83363c3bfa369801f730da74a7779978a86834361d89e4fcee67db7853abfa97
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip 12709 BLAKE2B 871db29f8e8319f5f06ee2846b0c3a3c052e727d4a023f9c094e276f7ddb3b75f9bf0c350008e12211e94fb5e230afa0f0faaa84c2e513fbb26ae2e6254fa92e SHA512 8ebbfa53cbc43de5dcf799e74e7ba57c8bf1d832ce9b085ddb051b12977c54c3f4ecf5acd894189e069d8fb920ba89e6acab4883f0a248cd51be8cba549545b9
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod 42 BLAKE2B 6c481463839f4b6f1e2d162413609f23091c4adb531bfba5eeed80b1c604fa3cc514c097abb72e7ea36a7a07f94fe22909f03fd1420ebe0197d7af7d6f9ee87f SHA512 4ef4c98060e06cde13e9efcd7aeeb47b03960850075f68f2e7d6f9d251f35ac783303a0ece1b8639e254d8c17a6d17a5652c5d5ae4d549be02c32d0eb884473c
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip 17736 BLAKE2B 2c358e3baa5bca3ea87e8db6574f4b8a907dde49d46e8fdb2860c834a165ba96f41e714b0b7bd430ba6dfe0502b0213029cd5c38b0b8b374c6fd2f0c2821966a SHA512 7511306054669300a1206af2cc6772d9c0258cd098274e540da274251c99f40225ab7c38b0d4d959e60bde6adc29608603f01f93e9edf71a21d891eac8c0fbe7
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod 29 BLAKE2B 3edbe2c6139af3cab6c0ac32b935764c9442e84ce2c6861d4908741c2c060bc95292c7d24ef0c439397cc23ccc4817214dd802366aafd6941d9e8c9bb6470aae SHA512 406ab8978f9f53c5c35aedb7416a9dda857aec33d3e7ddad167528efba35034c7eedc235a18b533649a2544fd0d5410a6feb03223cd2be32c8bf3ba84c808708
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip 6351 BLAKE2B 375a6fb8ff47ca013b12c95031317aa394e1e3433e99283896def97b64031cd6fb11a2b45bfb26cca2cb8926bbd8d459731888d36ccec610f3872fb0106b57e3 SHA512 80c71da97f9aa0ecb6d5f72d7f707c42a5b8562d3d94603d5bcf801a8202a46e014f5bff485dc2f88e351da05726e8686d3a2b0702939d3580232905b7a80afa
 DIST github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod 103 BLAKE2B 44cd6f3830a796a1b03d0d573228f3c7a1bc9a8ce49afb68a907e974cbae1c0b0f8c1ec33c0738795a2bc63d51aa93f7bd37f049a4a5f201c1b2ecdeff83a71c SHA512 05d11f62ff3e5d0f276d899c1041e0b5bab7ea0c7380c189bafe40ce35150023b10c280f0880bb00feb01c973bd39b8fc041c3041e0570eb499d359d1f302065
@@ -814,7 +749,6 @@ DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip 1253983 BLAKE2B 54037ddd261a65e88a34214456df6ae52c36bd5367648614a05a3e0031dc5fb17222d3f93630fe0d72789998f7a4deb9b77283b6c5a09326b2f06a655833600b SHA512 f011d603972a3ebf9d57f5b0ba723f5122aedaed383d2506a6a57eb2fd5b5c167792d601294b47ddd54036614f9fd1f9c28cec971d4bd34d0bbede464a7c1eca
 DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod 368 BLAKE2B 7e035da82eeb13c315526358d3e3631a69607f86cbdbe327e271de0e4809f0b7a5226f4c95a9bdbe2e80cf5856c77519ad50160fddc4670f2d61b61adf49b189 SHA512 a386f6131970d53037e4f9698832e74b0c5b0d5ab7c904760702e29b5a581fabb23f9cfc131d9a92b6d34e5ab2c89aff2cfd28c9e5e2eafd514e8467b979794d
 DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip 234015 BLAKE2B c9ec1b2347f34973b893acf7e8247d8e108a36fedf6adb5b775aa7dd23a0cd972bb8905a4f6cba874471974502902d5f6777cb1da3c5d2604b8e9e29f5a13b86 SHA512 d711bd876c6090db0febe5af99dccd81ee7b099eddfd68859f1536b1fd04e4a752f4028ff115452b54119aaa65ee7d6d0903c86d4b798e2c42c088dea3731a41
-DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e
 DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
@@ -866,15 +800,12 @@ DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip 223137 BLAKE2B 55b880703f2b061605954bca3ae21959663c88a8e88deb62373f38228da090a81511bbd0bdf24346e76feba4164b48ec892fc587bbb41de7807c52205db1642b SHA512 3021ddb93de155c5834da694c9528f4c8532c951acfd86b6431302461baf1e097210a7d9cdef8fdeb2a1745842bdeceba4e8d8feaa81dfb8884ba629718feb74
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -904,8 +835,6 @@ DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BL
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip 134147 BLAKE2B f7d43790feeb13035488c2749d41a33f21f66f3d79d89f465918301f8c9bf9045efcbc191aedc6894628b35d9e79c9fb67e5c5109e3644799be747c6c233f322 SHA512 13d1a28e9df57073c8f25a8d86e17525ae17cb461bcb6affd82cc447394c8068d13653e32ecf1282af6c4811680f4883e3d856384480f7d9ad47b320fa76a1d6
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -916,7 +845,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
@@ -939,7 +867,6 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BL
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -963,7 +890,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -973,10 +899,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -997,43 +921,12 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip 2927101 BLAKE2B 0ed9b3d5c567fdb1cd21ece339622c10c11d4a668971e7e6306a4dcaefb93501fa4d327081e25b7beb99c8cd4fc41510e1da76a2569a504b8e4aed18c2c7ee82 SHA512 f8680d8f2709e6d70d080ad4bccaeec40659d831db019061ea6034a9932116e0bd0a20a8d04e38e2e74d0348a25843380b911e6beb3ce966b2112421e801862c
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200216192241-b320d3a0f5a2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200216192241-b320d3a0f5a2.zip 2987716 BLAKE2B ba9889926b41428a984fb9261075257692c010b6b22503a727fe39282b0bb2ee2d04a06b4fb9a64b9c2e84d1744203701ca9577ced536c9a63375bfc7f698e19 SHA512 f10a0c89e2b22666aa7ed8a2db0458fad68d6fe79d5827878fab9bd4b7aa2959c753e70935b0efd584cadde744fe4a2dace15675a3319c0ae96c09b196f8214b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip 2915470 BLAKE2B 76f6f32aa5bfb3e7199b4563938d9a29e0a6f685b3ea4cc00b8c4a98c9e18b51ce82c5a88f0dff801b5f92f172a4711a48bdabd845a0d69a4933b3e46f8aef36 SHA512 e0691c4ed632bb0d17514574ae2ae45706b94ac343d66275e3e3c41b8d12619a6aff6adb719e3fb2ab102b96eecb1cdd1c0655f94384edd1423ec458ccd033c3
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@@ -1095,8 +988,6 @@ DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be521
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
-DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
-DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip 15890 BLAKE2B 0d6487d18e92562c02a2770941af995d18fb9e11ff43d4deca6cf4325a94a1a3af04a3cc324ade8bc349e0dbf1d3d0a00caa199327b99607079479641760f368 SHA512 1ee9d7696e45af565a2b38fb263301bc15176354ad0b0528b41ce1dcce6e5c6df1bcaadaa633d242aa506a9f3a703182149bdd3115c8be07e1263ed53cba7653
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
 DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod 36 BLAKE2B 1f653e0e7fe93701b9e5c212697ee615f635c03fad64811a4741f57b9df6e53a632cd6665c12d2d56b5788639c386ec8461cafb4c5721610787e63b82579c539 SHA512 508e5b91b64eda9f137bdeb45512ca617294a48b9078670938190231eac59f96169462ab6dba748b9344df62479a48588db73c1d211977514f1e9baec3013167
@@ -1111,12 +1002,8 @@ DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
 DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
 DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip 443024 BLAKE2B 7e0457c8405f182908d271470e0c32edc328778dd32aea9f642da550b46f3a867ce673a4037dbefeeca374fb8d00c8539bef005bdcde80cc36b2b8d0e619439e SHA512 f9a64218de18fc71fefbba88e17bb274244740c9deb75354cf80a3f642ff0def456f18bde589df883994441ea6eccebe7174602a6ae239a0807367766e72950f
-DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod 233 BLAKE2B c1fc00ae50a9dc2ae76534d85ed853a215dc9c685867cf9981544739806e10c47e42e14c702a613f0d19ecadb72ba486c7e8f5ba5d62933b66f2ac5dea267657 SHA512 b39a6f26eb0dae87688149c00768ab232cf1615b55f210d69fd10423034e2ace9c48d8e246cc12e235e93e7ef539dc116083107a589b02f565d6e713ccdfecfc
-DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
-DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod 1258 BLAKE2B 3e337c2ac0851d9f7572156b4bbd960943da2e95815f85f3b72e5bb1d011c244aeb81d7e6177c2aca41068ca5bf3075922b9fbdc871e613a4ff92102958c83d8 SHA512 d8cc528d1e6d8e8f1ca6f3da5d74f63bf70ed45e3dbaacaed27065ea666dce1aed2e675a15b22e6faddc9893f8af7704f95276b8249f2209a6402a61fdbabfd1
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
-DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -1138,52 +1025,29 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
 DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod 222 BLAKE2B feaacfa0991b48030344f0b3a95e5bbc2c536db23b42dd54e29a5018bee927bfc2b9eb9473732d983d1aae47d98d5cc1d16ebdfb2cb6718479b66156b8fa5ca3 SHA512 d21a325b837cb099226a68404f6976318a7f0b8af68c023b1eb85436bfc9dd9c877c9ffba87d0f27d5e9aac606121688c069989a0c2f3ba6d2895baa0759d022
 DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip 69738 BLAKE2B d22c39eb97f4f1f591a5de1caf1b3098abe2a904a89dd851fffe170bfd1ed78411113bd3f2f75b547fd32d661cb34133f652449f18e13050d2df9e594ab3484f SHA512 42edffcf1da65083864d4ad866a4bf09bb184f52888e3ae7c2e47e6ff1967916cfe6e777de231a5e5a46f25b658b1c633429b6793584886373b2f8ebef8c5cef
-DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod 562 BLAKE2B 7cbd0ba1e1fe5709aa573ed44a8cb99b35149c9135046e2dce45f609b34bd6d3544caa782ec860a64e8c0fae68a2a75dc25c1995c0b6e487586eae7a9b2b0299 SHA512 7609796c9e3b0873ca0d6319b5b96db829477f4b68f993ce079c5e065c104e4aae9daa50921219d0f5402d6d6852e5f0ccd18f220409dd151d4071fcdc3db6ed
-DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.mod 684 BLAKE2B aac806ec7adf1ccc90520a7cf6d99705bba4ef6b47b938ff1d550fb6b4f475f146f74bb7482fb6a3278f97ef0110b60c266e59b0976b70ac993491329891518e SHA512 2f826088229d972d0285f70d05138ad3f69b205d7675fa20e142cb303adf880426be073cdc64dce7f00b66bc386a7f078352efb80c9a36f42908f13d835c071f
-DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.zip 3143521 BLAKE2B 467c0b1242c22dc6ffc45ed8c0dca8b904833b92995091d21ecb17f0e8040d58d2815b98d34a8a1739fd7987317d42aa6685c254541a5ae17c24de25181b68f5 SHA512 077148431c630f651879cd8c87c09699eeff8db50f7c42e140bd0193a285115b8fbf1e3886d8605d22c36111e929c00f68c926cee66554fa8b4b9100662d68d4
 DIST k8s.io%2Fapi%2F@v%2Fv0.18.3.mod 475 BLAKE2B a3d86842d7c2231528a3b1835d71f2fd8556ffa8e1f714e21a13412a88d9284574d4f2c6aa294728782f79820ef713ef750ad445a898c7a731656e9095c25ead SHA512 a5032f98ab043099c12fda9bc1cfadd4c94887dd4d6e7f2bf073a9c1a6a6def5299f0d130bdb8622370567bcf2fe430100d36a7cd80a36b203451c6b0e8dfd6c
 DIST k8s.io%2Fapi%2F@v%2Fv0.18.3.zip 3442470 BLAKE2B 67b3e3a4a6bbf2d577882fcd5d19e92c5934ebbc34bafe58e3b42b3b7501e33c9f0eee8aaf2aa37c5f19e4d2412afd4566793ce7b9ef186957f946b0deb448ca SHA512 647d7d1ad536fc63944be9efb1dcb545ad34105e761142614c39a3b870e39d20962fbc5ab9cbf2835f02b91242e4966b8088902c15a66f2174c7acbb4c3b65d6
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod 1795 BLAKE2B fcc21db46938f665a6d745882eef885a8d2b0bfe6905b4d750262d33840250393e5331868939bb0c2248a3fa95f7e4558c3d2f73ba8f19b7031ebb803b155722 SHA512 fccfe29b8252ba32795f777cd63ca50d860fa9ef6fd516012e979257d48f705922812e3643d756e8eb61b999018864fafd6f7595b62338b16c08cde5b595b89d
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.mod 1808 BLAKE2B 5f5724d9d364c55cb43ea41eece5b97ac67152895cf1265089d6e57436b55e280eafff7697f147cca49a6814685ef49e4bf048b419e72ddf4d198684f7107035 SHA512 af61ae5877953162d198835cd9532fdb04006edd6f866f9ea17f2423a01b5ea57db0f761a3e353ca18dcbc20a8089456951967345be693571c6cc0e69434cd7f
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.zip 762198 BLAKE2B 8f9bb7c15bd2ca4e19a63f449f80c015f26248a97e279dfda1bc93a05e6bb8da1e93415574638b84dc1cb428b44c0a1992ef1f1dc04284ebf7b1bf78e3f42f96 SHA512 f9e81b5e40eb953901d333602cbb41506d7e4d7f510ccb50b8f60019bf9a5c27dd4ff45b1371ef6d139cd9e00c957e49a61b46da409e2b8c34601cde6e2f24d2
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod 1621 BLAKE2B d900a46836b5db1e3fdfc0cdae750be578f87c9ff2628d15d6438efd04966aa45937d0b7cc1ecec59d3fbe5881a324d2483b8a1794a14fa7d099a75084ad7e8e SHA512 dfb42b8cf1147f96a726a745be420a2e3279f53b72accef3766da6d591d0f217fa620af2d2cf9982d848bfd97a150182d60ac58304ff59b7c8b3ce3b31459137
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip 782966 BLAKE2B 673d032fa72a8c01bb66c510c2ef9a2b634970a0f52762de1066385c622fe524d2fb6169c95974592d5fb489776da637356b0532920ed3c55418b37ac6c778a7 SHA512 5a03934d2de461e349347af92b9e27aa1bf584c527b4914cfbaf93526298e12e73341600bc63259dce4bc0a8b265db6d5dd41e0a3c0dd255361d451df384c397
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod 1817 BLAKE2B 245da700b263b41d318beecf0dbd39a4db7bfcbc341ac28473a737e929413c54c950f6ed50411f04eefe68e050ab7a2a987878a19a8fecacb0c3ec9a00d99437 SHA512 3e221c644f7be31e6e81c7b8dd9caebdd3286d33d9acf0cd1284aa59f56a8d3f6a29d0bcf39acb20d53ddb79a14417a51c0e836c6bf9d19906484fe935fd8413
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip 1528066 BLAKE2B b71d06a4f08956919cd0741467a266839c39c0ca809d8b9f325a5848d4accfa28537b4c8c4a98a59beed0d287c98c85de50588415a5a847075b68adffc0808d8 SHA512 fd776725fd74de3be6dac057c87605a4bd893037b2ca750a0d0be859a6cd7e61dd69a2c11acb3d09dde373969b0bec44dbcf8cdf6739564abba0602a4f603913
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.3.mod 1591 BLAKE2B e3fc6d1a1e5b7a32a4fa890bafabc220b61268cff775331e0a17ef3fba0d0abb25904a54323bb17f983249a6760e920923eeb4616a42cdb32470f38cf15d59f7 SHA512 655d6ced92efdd124b9a23b79fef323a6b388b5ab9801b6cd3cc1a879e0545be76e30763c16204a932e830c56345d7f1c7386024a41ddc7f20d4d8855f5f3039
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.3.zip 2145725 BLAKE2B 71151d14a528af4d250d693a622e5048b142176b9627478b4b5d595468a7aaf2d2f06198b097b3e89c6fe423a679f146a755e37a4485fa9f7bf29d10eb669e99 SHA512 3ef864473f3d1b764da79171f9f4055723dfa03c4bdce6bdcf6c86522d8146d25b743e4c916bb9d64790ba4e10d493c85069b054df501ded74299269d7914b48
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
-DIST k8s.io%2Fklog%2F@v%2Fv0.3.1.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
-DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
-DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip 37555 BLAKE2B e3ed1adffed1382395f69e2be37d933f77e712bc80c76239196dbbab3a43df510ff0b468e15ecd30cc314069c26959f946571074ffc72b96087e0f7bb5709b54 SHA512 df15a9ff5496f18f6f2ef6a0b9269b8e4d59b009d81030bab3030c2ed0dd0c7c341cce666642d2d87122afcd9ee349adae352a704c939a8942a7ac00a55c3adb
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod 27 BLAKE2B 9c24d9586f1fdfa479ef27be1f45780be8e756931657d77cc78236332838e6f792d3c8be027ad96528ac819933444eebaa1b2a84d7f7fe63f3f4529c2543d259 SHA512 cfddbdd6ebaa638a046c7f20a87048946521ce1320a615bdd77ec639dcc3994fc8cdf3375c1dc523691af6eb4c87cc4b2119c228d222df7f449c03271670fd5a
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod 2063 BLAKE2B 25b919ce7a92cb3a01ee155b007fdb6816621a3273d63ec155ab207cfd1ac3b1184cc62cc4d85da79ca05e9be908fc2825ab3d2319db63bc2d08ae3ba4d47873 SHA512 8efc1a6f4a88dcd325b4c6503be1563be99e0e588ef4b0ec177ee2ef61e08014ed231d17e285efd1363bdfa4f16419ab2087d42c8cd8ac305a0a59a487d599a3
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.zip 822693 BLAKE2B 6ab7ada74314c78eee02587fda2357715d9bfa80431e94b9ce9faee1f6cd34ab2e81732f61bfeac9b4e135fc977c4d58b682f450ef10f66b6f26fd1a5eea9b5b SHA512 28774105e826575c8c2cb98e6670eb7ec394258eb8ec15aed493f275ea9d80a6efe58224da43a304efe3d1ff9e87a66d336bb68b0987675c05d72dc1cb30386c
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip 833867 BLAKE2B 964d8c0f8d94aaaf19ce5aef5ecfa512da1db391158f2bb0b42ef16b6e356b443d7e76368879bfae0ae31e5fe7e0cd2e56458461521c0c5bd38d4e5f2cb8b876 SHA512 fb555892a68bd723dfc63da35d9e754fbe5b157b398d924956ba41d7f81b5bc14988ff979c32bf48c1e019c316d414374bf57673f7236f5e26c6898f071ee46e
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
-DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod 20 BLAKE2B 98441f8baf467c4c00918acd9c9e22b0e2368cec17b055ac2c518a12eb8546f0c43930c9fca03855e170f7894e3749a55154e9c9f3f6be1e868b229867522a7f SHA512 1184f14f81034921a81e5526c559cd68d07f244998fa134aabc7015ac6e85a6c2e976657fa2f15d2620bec3601e0674324e663f4480394313c3e08af738f89e1
-DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
-DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.zip 93888 BLAKE2B f02de12146b319d3f1788ce00abcb4d73e1e00b7d372b59722bafafc94ecdec831985228595fc424fdf5125438fe03eaf93e55fe43f379a95180cc5e93348f2e SHA512 6b198501669452d40fbf42de191dae2e0289a9f7d9c8eb299aa1ec010010d3d01f5c34cd184e389b9eb88d27ef3fae8fa14e0c7c6dc05ff5ba79c7f60f4063e0
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 10e6de70852ce1a49e1091f10305e217d873bf92d727ef5c773376eb5bd4fe7ed09f4bba82b59b8fddb7bb67709428f0ff02068bd025df35c196b29abf9d57ff SHA512 f61f3d2c31c00c2c016ebbf48f051920cb461429c8d0e46b2995efa18e5b03cbfaee429c2b545979546ac82cb3439274133f4e898d0d3f2c9e3636d673818f6c
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
-DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.mod 106 BLAKE2B 6c3076bffeea29213131f929aa553c1fd8fbb88e0ff14cfe4b590bbe700e7f34c2dfd8febb7422120e587b8091d8e943cd3a3e1098704fb2488d0e329bbb54f8 SHA512 147be87c647460fe4ba5656f39cd6b427de0de3c385d48384b354aedffe7aa860896ce8e60c29b2599a0d6a05714be44960bbc52bb982e628d2fc14186d43c33
-DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip 21792 BLAKE2B 082463bc51b3020b4480b8fbbba799e6c3aa6311718702e0ab37c6fcab9a4cd094a27b16f02b63239f3ae4e47c654290dc6891abebbe096d4c68116156edcd85 SHA512 4a1b155130c566e2d7d6b19519c3916abeebfd53da0a45fb5e83f29acf432150679228963218cccf70329f777b4e6b1ca4a0d32a4757f5409e6b92636e4ddfd9
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD filebeat-6.8.13.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 EBUILD filebeat-7.10.2.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d512af7c33e8a725a5aec9f6c1c91d031ba8a758a0a8ece56a8405df881a8542c18547ede3cb2ab090dfaf003767e7 SHA512 b170ab66646578d55e94ad2832ca10b4cf52c2e449b4a552c254292be2ac94d4ec5aa35c8146d1c8c8249cedd3ba6dde083803146a5057ed25a14d2a3761d0d4
-EBUILD filebeat-7.8.1.ebuild 55905 BLAKE2B b50831f6da888a6204319de0eb870f9fc1cf08256b21f05b245e939388e40c0caaedd1ccb3ad2287b872a28c014b02c3637bf49b78ff0f995d512f29ce72560a SHA512 2ac4bffb8ce43de76dae510c1f49f395136a9318199200f09087ea93598e52073c506cc61b7c9803c641c8c6665e146906581548f87a10828956115085b74194
-EBUILD filebeat-7.9.2.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
 EBUILD filebeat-7.9.3.ebuild 55140 BLAKE2B b5cf3c10c29f84b63bc35f85eb78871b7fdb18db5048f6aa4f8421f09b50479eb4da290716110de4f2e8b6abae5b1cb1702a032505a95f93bcb0332170ace241 SHA512 694ac3ace92424e7bd1153270d88a9bd204c605d9608e430c101beffa973a1ef2c476f0c2ed0666024ab8040cd99dda15b2a7c092f4a75f888b24232225cec3b
-MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
+MISC metadata.xml 491 BLAKE2B 5653f51e27a38d7a2726ebcbd0d7b6f622e836efdcf5651e87707d9d63e75535e4550c47a53530409bdcbdca37b9885cc7bb8e731e053a9f9ab60d89e16c2cab SHA512 a6b752a75acbdfd9c1a98d7b2abd2eb6026962d6697b536c6452c750ce4014378c7fda650f5049dd1a6d34796f1997678b0c4509d89a0bde55157b22c80fcd82
diff --git a/app-admin/filebeat/filebeat-6.8.13.ebuild b/app-admin/filebeat/filebeat-6.8.13.ebuild
deleted file mode 100644
index 8836479b860d..000000000000
--- a/app-admin/filebeat/filebeat-6.8.13.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.8.1.ebuild b/app-admin/filebeat/filebeat-7.8.1.ebuild
deleted file mode 100644
index 7ce027c621b3..000000000000
--- a/app-admin/filebeat/filebeat-7.8.1.ebuild
+++ /dev/null
@@ -1,1030 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
-	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.51.0"
-	"cloud.google.com/go v0.51.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/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"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.1"
-	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.8.0"
-	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
-	"github.com/Azure/go-amqp v0.12.6"
-	"github.com/Azure/go-amqp v0.12.6/go.mod"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest v12.2.0+incompatible"
-	"github.com/Azure/go-autorest v12.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.4"
-	"github.com/Azure/go-autorest/autorest v0.9.4/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"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/Masterminds/semver v1.4.2"
-	"github.com/Masterminds/semver v1.4.2/go.mod"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-	"github.com/Microsoft/hcsshim v0.8.7"
-	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
-	"github.com/akavel/rsrc v0.8.0"
-	"github.com/akavel/rsrc v0.8.0/go.mod"
-	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
-	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
-	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
-	"github.com/aws/aws-lambda-go v1.6.0"
-	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
-	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
-	"github.com/awslabs/goformation/v4 v4.1.0"
-	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
-	"github.com/blang/semver v3.1.0+incompatible/go.mod"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-	"github.com/containerd/containerd v1.3.3"
-	"github.com/containerd/containerd v1.3.3/go.mod"
-	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
-	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.0.0"
-	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/cucumber/godog v0.8.1"
-	"github.com/cucumber/godog v0.8.1/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
-	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
-	"github.com/devigned/tab v0.1.1/go.mod"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
-	"github.com/docker/distribution v2.7.1+incompatible"
-	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-connections v0.4.0/go.mod"
-	"github.com/docker/go-metrics v0.0.1"
-	"github.com/docker/go-metrics v0.0.1/go.mod"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/go-units v0.4.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/eapache/go-resiliency v1.2.0"
-	"github.com/eapache/go-resiliency v1.2.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
-	"github.com/elastic/ecs v1.5.0"
-	"github.com/elastic/ecs v1.5.0/go.mod"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
-	"github.com/elastic/go-concert v0.0.3"
-	"github.com/elastic/go-concert v0.0.3/go.mod"
-	"github.com/elastic/go-libaudit v0.4.0"
-	"github.com/elastic/go-libaudit v0.4.0/go.mod"
-	"github.com/elastic/go-licenser v0.2.1"
-	"github.com/elastic/go-licenser v0.2.1/go.mod"
-	"github.com/elastic/go-lookslike v0.3.0"
-	"github.com/elastic/go-lookslike v0.3.0/go.mod"
-	"github.com/elastic/go-lumber v0.1.0"
-	"github.com/elastic/go-lumber v0.1.0/go.mod"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
-	"github.com/elastic/go-seccomp-bpf v1.1.0"
-	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
-	"github.com/elastic/go-structform v0.0.6"
-	"github.com/elastic/go-structform v0.0.6/go.mod"
-	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
-	"github.com/elastic/go-sysinfo v1.3.0"
-	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
-	"github.com/elastic/go-txfile v0.0.7"
-	"github.com/elastic/go-txfile v0.0.7/go.mod"
-	"github.com/elastic/go-ucfg v0.7.0/go.mod"
-	"github.com/elastic/go-ucfg v0.8.3"
-	"github.com/elastic/go-ucfg v0.8.3/go.mod"
-	"github.com/elastic/go-windows v1.0.0/go.mod"
-	"github.com/elastic/go-windows v1.0.1"
-	"github.com/elastic/go-windows v1.0.1/go.mod"
-	"github.com/elastic/gosigar v0.10.5"
-	"github.com/elastic/gosigar v0.10.5/go.mod"
-	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec"
-	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/emirpasic/gods v1.12.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.5.0"
-	"github.com/fatih/color v1.5.0/go.mod"
-	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.7.2"
-	"github.com/frankban/quicktest v1.7.2/go.mod"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/gliderlabs/ssh v0.2.2/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-	"github.com/godbus/dbus/v5 v5.0.3"
-	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-	"github.com/godror/godror v0.10.4"
-	"github.com/godror/godror v0.10.4/go.mod"
-	"github.com/gofrs/flock v0.7.1/go.mod"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.0.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github/v28 v28.1.1"
-	"github.com/google/go-github/v28 v28.1.1/go.mod"
-	"github.com/google/go-github/v29 v29.0.2"
-	"github.com/google/go-github/v29 v29.0.2/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
-	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
-	"github.com/gorilla/mux v1.7.2"
-	"github.com/gorilla/mux v1.7.2/go.mod"
-	"github.com/gorilla/websocket v1.4.1"
-	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
-	"github.com/h2non/filetype v1.0.12"
-	"github.com/h2non/filetype v1.0.12/go.mod"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874"
-	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.2"
-	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-	"github.com/hashicorp/go-version v1.0.0"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
-	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
-	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
-	"github.com/joho/godotenv v1.3.0"
-	"github.com/joho/godotenv v1.3.0/go.mod"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
-	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
-	"github.com/jpillora/backoff v1.0.0"
-	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/justinas/nosurf v1.1.0/go.mod"
-	"github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.9.8"
-	"github.com/klauspost/compress v1.9.8/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.8/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/lib/pq v1.0.0/go.mod"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
-	"github.com/magefile/mage v1.9.0"
-	"github.com/magefile/mage v1.9.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mailru/easyjson v0.7.1"
-	"github.com/mailru/easyjson v0.7.1/go.mod"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
-	"github.com/mattn/go-colorable v0.0.8"
-	"github.com/mattn/go-colorable v0.0.8/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
-	"github.com/mattn/go-isatty v0.0.2"
-	"github.com/mattn/go-isatty v0.0.2/go.mod"
-	"github.com/mattn/go-shellwords v1.0.7"
-	"github.com/mattn/go-shellwords v1.0.7/go.mod"
-	"github.com/mattn/go-sqlite3 v1.9.0"
-	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/miekg/dns v1.1.15/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
-	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/morikuni/aec v1.0.0"
-	"github.com/morikuni/aec v1.0.0/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/oklog/ulid v1.3.1"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.5.0/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/ginkgo v1.10.1"
-	"github.com/onsi/ginkgo v1.10.1/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.2.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/onsi/gomega v1.7.0"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
-	"github.com/opencontainers/image-spec v1.0.1/go.mod"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
-	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-	"github.com/opencontainers/runc v1.0.0-rc9"
-	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
-	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
-	"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.4.1+incompatible"
-	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/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/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.6.0/go.mod"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.3/go.mod"
-	"github.com/prometheus/procfs v0.0.5/go.mod"
-	"github.com/prometheus/procfs v0.0.11"
-	"github.com/prometheus/procfs v0.0.11/go.mod"
-	"github.com/prometheus/prometheus v2.5.0+incompatible"
-	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
-	"github.com/rakyll/statik v0.1.6/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
-	"github.com/reviewdog/reviewdog v0.9.17"
-	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
-	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
-	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil v2.19.11+incompatible"
-	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
-	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.1/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/src-d/gcfg v1.4.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"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.0"
-	"github.com/stretchr/testify v1.5.0/go.mod"
-	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
-	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-	"github.com/urso/diag v0.0.0-20200125202105-ffdc32ff5518/go.mod"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
-	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9"
-	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9/go.mod"
-	"github.com/urso/ecslog v0.0.1"
-	"github.com/urso/ecslog v0.0.1/go.mod"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
-	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
-	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a"
-	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a/go.mod"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
-	"github.com/vbatts/tar-split v0.11.1/go.mod"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
-	"github.com/xanzy/go-gitlab v0.22.3"
-	"github.com/xanzy/go-gitlab v0.22.3/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-	"github.com/xdg/stringprep v1.0.0"
-	"github.com/xdg/stringprep v1.0.0/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 v0.0.0-20180618132009-1d523034197f/go.mod"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
-	"go.elastic.co/apm v1.7.2"
-	"go.elastic.co/apm v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmhttp v1.7.2"
-	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
-	"go.elastic.co/fastjson v1.0.0"
-	"go.elastic.co/fastjson v1.0.0/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/goleak v1.0.0"
-	"go.uber.org/goleak v1.0.0/go.mod"
-	"go.uber.org/multierr v1.3.0"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.14.0"
-	"go.uber.org/zap v1.14.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/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"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
-	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/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"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-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-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/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-20200102141924-c96a22e43c9c"
-	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-	"golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2"
-	"golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.15.0"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.3.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5"
-	"google.golang.org/appengine v1.6.5/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.24.0/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-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"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
-	"gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod"
-	"gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod"
-	"gopkg.in/src-d/go-git.v4 v4.13.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/warnings.v0 v0.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/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"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
-	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-S="${WORKDIR}/beats-${PV}"
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.9.2.ebuild b/app-admin/filebeat/filebeat-7.9.2.ebuild
deleted file mode 100644
index d3785a811d9b..000000000000
--- a/app-admin/filebeat/filebeat-7.9.2.ebuild
+++ /dev/null
@@ -1,1034 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
-	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.51.0"
-	"cloud.google.com/go v0.51.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/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"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.1"
-	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.8.0"
-	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
-	"github.com/Azure/go-amqp v0.12.6"
-	"github.com/Azure/go-amqp v0.12.6/go.mod"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.4"
-	"github.com/Azure/go-autorest/autorest v0.9.4/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"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/Masterminds/semver v1.4.2"
-	"github.com/Masterminds/semver v1.4.2/go.mod"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-	"github.com/Microsoft/hcsshim v0.8.7"
-	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/Sirupsen/logrus v1.0.1-0.20170608221441-85b1699d5056/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
-	"github.com/akavel/rsrc v0.8.0"
-	"github.com/akavel/rsrc v0.8.0/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"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
-	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
-	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
-	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
-	"github.com/aws/aws-lambda-go v1.6.0"
-	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
-	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
-	"github.com/awslabs/goformation/v4 v4.1.0"
-	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
-	"github.com/blang/semver v3.1.0+incompatible/go.mod"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
-	"github.com/cloudfoundry/noaa v2.1.0+incompatible"
-	"github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-	"github.com/containerd/containerd v1.3.3"
-	"github.com/containerd/containerd v1.3.3/go.mod"
-	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
-	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.0.0"
-	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/cucumber/godog v0.8.1"
-	"github.com/cucumber/godog v0.8.1/go.mod"
-	"github.com/cyphar/filepath-securejoin v0.2.2"
-	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
-	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
-	"github.com/devigned/tab v0.1.1/go.mod"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
-	"github.com/docker/distribution v2.7.1+incompatible"
-	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-connections v0.4.0/go.mod"
-	"github.com/docker/go-metrics v0.0.1"
-	"github.com/docker/go-metrics v0.0.1/go.mod"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/go-units v0.4.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/eapache/go-resiliency v1.2.0"
-	"github.com/eapache/go-resiliency v1.2.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
-	"github.com/elastic/ecs v1.5.0"
-	"github.com/elastic/ecs v1.5.0/go.mod"
-	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a"
-	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
-	"github.com/elastic/go-concert v0.0.3"
-	"github.com/elastic/go-concert v0.0.3/go.mod"
-	"github.com/elastic/go-libaudit/v2 v2.0.0-20200515221334-92371bef3fb8"
-	"github.com/elastic/go-libaudit/v2 v2.0.0-20200515221334-92371bef3fb8/go.mod"
-	"github.com/elastic/go-licenser v0.3.1"
-	"github.com/elastic/go-licenser v0.3.1/go.mod"
-	"github.com/elastic/go-lookslike v0.3.0"
-	"github.com/elastic/go-lookslike v0.3.0/go.mod"
-	"github.com/elastic/go-lumber v0.1.0"
-	"github.com/elastic/go-lumber v0.1.0/go.mod"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
-	"github.com/elastic/go-seccomp-bpf v1.1.0"
-	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
-	"github.com/elastic/go-structform v0.0.7"
-	"github.com/elastic/go-structform v0.0.7/go.mod"
-	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
-	"github.com/elastic/go-sysinfo v1.3.0"
-	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
-	"github.com/elastic/go-txfile v0.0.7"
-	"github.com/elastic/go-txfile v0.0.7/go.mod"
-	"github.com/elastic/go-ucfg v0.7.0/go.mod"
-	"github.com/elastic/go-ucfg v0.8.3"
-	"github.com/elastic/go-ucfg v0.8.3/go.mod"
-	"github.com/elastic/go-windows v1.0.0/go.mod"
-	"github.com/elastic/go-windows v1.0.1"
-	"github.com/elastic/go-windows v1.0.1/go.mod"
-	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233"
-	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233/go.mod"
-	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec"
-	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
-	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.5.0"
-	"github.com/fatih/color v1.5.0/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.7.2"
-	"github.com/frankban/quicktest v1.7.2/go.mod"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gobuffalo/here v0.6.0"
-	"github.com/gobuffalo/here v0.6.0/go.mod"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-	"github.com/godbus/dbus/v5 v5.0.3"
-	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-	"github.com/godror/godror v0.10.4"
-	"github.com/godror/godror v0.10.4/go.mod"
-	"github.com/gofrs/flock v0.7.1/go.mod"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.2"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github/v28 v28.1.1"
-	"github.com/google/go-github/v28 v28.1.1/go.mod"
-	"github.com/google/go-github/v29 v29.0.2"
-	"github.com/google/go-github/v29 v29.0.2/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.1.0"
-	"github.com/google/gofuzz v1.1.0/go.mod"
-	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
-	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/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-0.20190416172445-c2e93f3ae59f"
-	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.1.0/go.mod"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
-	"github.com/gorilla/mux v1.7.2"
-	"github.com/gorilla/mux v1.7.2/go.mod"
-	"github.com/gorilla/websocket v1.4.1"
-	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
-	"github.com/h2non/filetype v1.0.12"
-	"github.com/h2non/filetype v1.0.12/go.mod"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.6.6"
-	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.2"
-	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-	"github.com/hashicorp/go-version v1.0.0"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
-	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
-	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
-	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
-	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
-	"github.com/joho/godotenv v1.3.0"
-	"github.com/joho/godotenv v1.3.0/go.mod"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
-	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/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"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.8"
-	"github.com/json-iterator/go v1.1.8/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"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/justinas/nosurf v1.1.0/go.mod"
-	"github.com/karrick/godirwalk v1.15.6"
-	"github.com/karrick/godirwalk v1.15.6/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.9.8"
-	"github.com/klauspost/compress v1.9.8/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/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/lib/pq v1.0.0/go.mod"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
-	"github.com/magefile/mage v1.9.0"
-	"github.com/magefile/mage v1.9.0/go.mod"
-	"github.com/magefile/mage v1.10.0"
-	"github.com/magefile/mage v1.10.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mailru/easyjson v0.7.1"
-	"github.com/mailru/easyjson v0.7.1/go.mod"
-	"github.com/markbates/pkger v0.17.0"
-	"github.com/markbates/pkger v0.17.0/go.mod"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
-	"github.com/mattn/go-colorable v0.0.8"
-	"github.com/mattn/go-colorable v0.0.8/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
-	"github.com/mattn/go-isatty v0.0.2"
-	"github.com/mattn/go-isatty v0.0.2/go.mod"
-	"github.com/mattn/go-shellwords v1.0.7"
-	"github.com/mattn/go-shellwords v1.0.7/go.mod"
-	"github.com/mattn/go-sqlite3 v1.9.0"
-	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/miekg/dns v1.1.15/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
-	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/morikuni/aec v1.0.0"
-	"github.com/morikuni/aec v1.0.0/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/oklog/ulid v1.3.1"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.5.0/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.10.1"
-	"github.com/onsi/ginkgo v1.10.1/go.mod"
-	"github.com/onsi/ginkgo v1.11.0"
-	"github.com/onsi/ginkgo v1.11.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.2.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.7.0"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
-	"github.com/opencontainers/image-spec v1.0.1/go.mod"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
-	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-	"github.com/opencontainers/runc v1.0.0-rc9"
-	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
-	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.4.1+incompatible"
-	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
-	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
-	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.6.0/go.mod"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.3/go.mod"
-	"github.com/prometheus/procfs v0.0.5/go.mod"
-	"github.com/prometheus/procfs v0.0.11"
-	"github.com/prometheus/procfs v0.0.11/go.mod"
-	"github.com/prometheus/prometheus v2.5.0+incompatible"
-	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
-	"github.com/rakyll/statik v0.1.6/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
-	"github.com/reviewdog/reviewdog v0.9.17"
-	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
-	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
-	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/shirou/gopsutil v2.19.11+incompatible"
-	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
-	"github.com/shopspring/decimal v1.2.0"
-	"github.com/shopspring/decimal v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.1/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/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.0"
-	"github.com/stretchr/testify v1.5.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
-	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
-	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
-	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
-	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
-	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
-	"github.com/vbatts/tar-split v0.11.1/go.mod"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
-	"github.com/xanzy/go-gitlab v0.22.3"
-	"github.com/xanzy/go-gitlab v0.22.3/go.mod"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-	"github.com/xdg/stringprep v1.0.0"
-	"github.com/xdg/stringprep v1.0.0/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 v0.0.0-20180618132009-1d523034197f/go.mod"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
-	"go.elastic.co/apm v1.7.2"
-	"go.elastic.co/apm v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmhttp v1.7.2"
-	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
-	"go.elastic.co/fastjson v1.0.0"
-	"go.elastic.co/fastjson v1.0.0/go.mod"
-	"go.elastic.co/go-licence-detector v0.4.0"
-	"go.elastic.co/go-licence-detector v0.4.0/go.mod"
-	"go.etcd.io/bbolt v1.3.4"
-	"go.etcd.io/bbolt v1.3.4/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/goleak v1.0.0"
-	"go.uber.org/goleak v1.0.0/go.mod"
-	"go.uber.org/multierr v1.3.0"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.14.0"
-	"go.uber.org/zap v1.14.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/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.3.0"
-	"golang.org/x/mod v0.3.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/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"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sys v0.0.0-20170608164803-0b25a408a500/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-	"golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/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-20190801041406-cbf593c0f2f3/go.mod"
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/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-20200102141924-c96a22e43c9c"
-	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
-	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.15.0"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.3.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5"
-	"google.golang.org/appengine v1.6.5/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.24.0/go.mod"
-	"google.golang.org/grpc v1.25.1/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"google.golang.org/grpc v1.29.1"
-	"google.golang.org/grpc v1.29.1/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.23.0"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"gopkg.in/airbrake/gobrake.v2 v2.0.9/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-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"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/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"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
-	"k8s.io/api v0.18.3"
-	"k8s.io/api v0.18.3/go.mod"
-	"k8s.io/apimachinery v0.18.3"
-	"k8s.io/apimachinery v0.18.3/go.mod"
-	"k8s.io/client-go v0.18.3"
-	"k8s.io/client-go v0.18.3/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
-	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
-	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.2.0"
-	"sigs.k8s.io/yaml v1.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-S="${WORKDIR}/beats-${PV}"
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/metadata.xml b/app-admin/filebeat/metadata.xml
index cd032aa33d27..b32327b2a6d6 100644
--- a/app-admin/filebeat/metadata.xml
+++ b/app-admin/filebeat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest
index 9108f6a0c45c..754ad24935d7 100644
--- a/app-admin/git-credential-gopass/Manifest
+++ b/app-admin/git-credential-gopass/Manifest
@@ -184,4 +184,4 @@ DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 EBUILD git-credential-gopass-1.12.0.ebuild 9985 BLAKE2B 2ef6eaca81b2832849a7a601ce02553391392eb79a65230516e0e8614e7be751d106442aa68ae8aa2d8dae7859718a3604804841308b334947aaa9b370e8d69c SHA512 af0e81b1dca1311fd3a81dbcb53c7e399ea5f5310ead5b72b21ecbea8289e45bee19a6fc0882e28bb044768a9b85e0cc29f75fc8ccb3e4d9e9749d78d9fb0df6
-MISC metadata.xml 342 BLAKE2B 1f99d88fb752f29e0d5d03a959461792c4d6a129e055e642ba2e10cf9f7f7c3f0afef1d239fb1d40d15837be10c9d8a0b1254fb0f2bc3ccc6bd49300b6f9e344 SHA512 2776693f4d693a585852a5078f488ab9b2aaa9e0c4694cd2342992550a761acae013eb2d34b889c6f9b1f42a20543087532b0fe42aba1e8488d984f8e50cdb5f
+MISC metadata.xml 342 BLAKE2B 0182aa365eb89931833c7245170b2b53962f2226d479ddd5f6b6d7aae99bddfa054f76a7772b8716e2071f911f75773a6526d1bf5220f9cf8266b0fa2c416c84 SHA512 7662d3b076fcf6267ea43ec5438e9cb6ab23c6fcc92ef577227c8716cf37195fe7f03021f171a34851b342c6ee8dea95888589ed31573f5eef127ada0bab3a27
diff --git a/app-admin/git-credential-gopass/metadata.xml b/app-admin/git-credential-gopass/metadata.xml
index ad2079f055d6..fc73b077a807 100644
--- a/app-admin/git-credential-gopass/metadata.xml
+++ b/app-admin/git-credential-gopass/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index f54b6a129fbb..2a6145c86e7b 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,3 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
 EBUILD gixy-0.1.20.ebuild 980 BLAKE2B ca8c020efa59870e4b7eb6aacfec5c2991c959671d61a1685f5a5d9376e1d76f7bc9123291f054d25732a0c9a516e1f87ffc88c7cc1a40fb2d387c769da8f98e SHA512 9f0ed0cf7774056075b27ac2fd756123eb6470b5fbb637b9135d0897b6638b42427b386926924df9e7ae74df9eda0efcf2ad787e0a8ca99fb5764036f8b6b890
-MISC metadata.xml 444 BLAKE2B fb47b1ee17f4a0df89ce6505d6461407aa887b8f03142d3ba678e012eb3e391dab5df809f0ef3d5a8bbb6383ad346a545f89a41d8bac5efe8ed7c13910ba305d SHA512 eae18c9de90e1e4f50b4055962469484c9df3b3da127805222151cb10bca1953549a70e3611a464a97aed0bccc5f22945607d3a645a830c953e8fd1cb2f32915
+MISC metadata.xml 474 BLAKE2B e771ac3474a4f83447caa72cfccb3cf7dd9e237982183faaf13a93836b8b5870a6022c591e433cf51a498882be5eb83618308f8ce62a16e2734d2a4638e1b95a SHA512 83e5c17b301370a74b56c07935db4fcbb18520bea70481fc2063123d612fbbf1ebec35d5a47bebab1ef00c791760a20f2a50bbe3fc380a89ad6faf9123e26271
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
index cb7f678034e9..aca54e70bbf2 100644
--- a/app-admin/gixy/metadata.xml
+++ b/app-admin/gixy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index ca7424b64dcd..84d7e5fc54ce 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2
 EBUILD gnome-abrt-1.3.6.ebuild 1158 BLAKE2B cad8b6ffd29eee5d8383512f316688cb6890e5d74c91413c7d44c076704e2422e5e7564e518f13577b48eb62a5b32c9f01df1c3fc3fc59e1d09ed729c6507aed SHA512 d035095657ef1449c146e87ef7b56836f180b2a4ecd33352343858a9d4cfa56fe91cec0254edc033d79998a4c78c37adadbc5930a76605cb92ebc6b7efbe199c
-MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
+MISC metadata.xml 333 BLAKE2B 1207865e26d4788f381ecb07b1c2d83cfa845ff4e3ccd6476d7c319ae14fcbce62ac5a0c868f60eba27a7451b577a33427b44ea2784bd63e5670f7d0971a47de SHA512 242ba1baed89b8710643a23de1ae61848cb3565696e11b1347696cdc16f14616827582031c7e94a2bf7614051af0f9f388cf4d5596373e50abf52ad393ba8c73
diff --git a/app-admin/gnome-abrt/metadata.xml b/app-admin/gnome-abrt/metadata.xml
index fec665753243..627b3dcdb1b4 100644
--- a/app-admin/gnome-abrt/metadata.xml
+++ b/app-admin/gnome-abrt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-admin/go-updater/Manifest b/app-admin/go-updater/Manifest
index fb04fd37753b..6e01a34dc012 100644
--- a/app-admin/go-updater/Manifest
+++ b/app-admin/go-updater/Manifest
@@ -1,3 +1,3 @@
 DIST go-updater-0.2.0.tar.gz 2183 BLAKE2B 0afdd1442916a1def1de4d45eb3cb89c5634b275912b7c8c451ecd6b911e82ad5e8a9715e39404c4d3eb006e7b1822c9f23d02e871379f66536bc5eff15c2f05 SHA512 9c81ded9cdbb825872e0224634f7876a598086870a101e8c2f70fbebcfff964d4ff2f0778607c2110dad1a08160628a8943e9ac902df0b6cd70a58d5ca9e6dca
 EBUILD go-updater-0.2.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
-MISC metadata.xml 248 BLAKE2B e2e3af57757842f18124332bf8a206356aa3f66d243354fed63146cacd28424880f2e95296c1123377704265d2843ca3524b0e740580d15eceb81a2406ae595a SHA512 671b9f4bc5e748ae306d358288487ad0887e5b1a620136376b73bb517ccf1fb5c96d8270d9b1abebae8982281614f93c3e83b0355da64fe78924f601c8cf00cf
+MISC metadata.xml 248 BLAKE2B e6e060623bbfa03d0c9909e571a9735dbcc5c5a4c2cd1d8862fe75a02809a1d9d0fb89068adc8f8c739300401159e4bfb3d90ccd75b5e252c0d159652f9ec89a SHA512 3601c8ab33e624fd676b6e4125ff7dfd1b137bd4195a422e86cf0c189cb19a02a25d1016bd7fc46448032aad8a36adc453c4853381da90b50059dc403f644a83
diff --git a/app-admin/go-updater/metadata.xml b/app-admin/go-updater/metadata.xml
index 55bea4d45c86..357ec7ddffb4 100644
--- a/app-admin/go-updater/metadata.xml
+++ b/app-admin/go-updater/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest
index 7cacc41a38ce..6ade5ca1cc1f 100644
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@@ -202,4 +202,4 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 EBUILD gopass-hibp-1.12.0.ebuild 10981 BLAKE2B c24cfd6ba793b52f44bd32c682f5cbc60691a404279fa720cff87dc7f77ca299d324d5f4a5e8c4e669d2a8344b74184e40347f1c68557f61ccdf7df879ea406f SHA512 ae56bd7c432dd280775a119f2d3c77702ba65a012b6e6623b261da8ffbc6b3c3a4c78492b1a50640fe41995c651d9eabdb4521a3f3a9f02c00c8cbfa9a1e064d
-MISC metadata.xml 332 BLAKE2B bbd3ea3f94d07d89f68089b9410a2b406370105526e4722c6c6cf3a554470e83608092d7f8eac2a4f4d5f3e76b47ce53fa8f39400c59604f1d425bf076b55127 SHA512 c7f332115e69d0858df5553687dc509e67d92b6981c2be4bcff9dd193f9533124ad5678927b17dd38627608583b7d2020cec3c321595e6ed8d9d67f0d0382b49
+MISC metadata.xml 332 BLAKE2B c53268eb86cf9b8af3cfe6fb66e2e014c8d99f7ec99808883d2f4e655ced6ae74df3f4fa2f6cfd71ae8ef7ca23e84bd677704aa580def76757371d2770ede52f SHA512 894d24fa0ae741f15c7ad4c73acae59f9b573ec470777aa9754756142a1c05af9d640afe4f542a860c1f0763bc624813d9f409f1c55f3c5ba4fd10a4bc97c864
diff --git a/app-admin/gopass-hibp/metadata.xml b/app-admin/gopass-hibp/metadata.xml
index 59af54e91acb..c0229d0117fe 100644
--- a/app-admin/gopass-hibp/metadata.xml
+++ b/app-admin/gopass-hibp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest
index 3210841d2d3c..d3c77f31e48c 100644
--- a/app-admin/gopass-jsonapi/Manifest
+++ b/app-admin/gopass-jsonapi/Manifest
@@ -229,4 +229,4 @@ DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20210104141923-aac4ce9116a7.zip 28293 BLAK
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 EBUILD gopass-jsonapi-1.11.1.ebuild 12022 BLAKE2B 144b2c847d328cd768ebda54610567e31fb5cdc6af685522ea4712c7ceb2a88b0a3762a4dddfb73b26f0e9be84787e4d0fcd5a9d4e3f0fbe1d0d32908c83d3ff SHA512 11e27a0cf536fbc0e978c8213569efcfdb8c06bb610aa455b26f4e800456edca5583e241febf95caaad5483b3e41296e0f697d902050653df29dc0b0f721f4e7
-MISC metadata.xml 335 BLAKE2B c85fbe2f874d616b3a768dd062a6b9c4f4e7e2084a70478c65ab05b18b67299a01745f6e159349d685d7f48b74ac449e77d5d7dd3fcbe1293f9c4ce291bc2b78 SHA512 a40b7b80113f846a37874561fece57916c167e4536e0b8a8603fb4152f79660beba7f9ba6e9b602c2d4cb8573eeeeb12344b94db913167e0e62ee44c49906fd2
+MISC metadata.xml 335 BLAKE2B 565147b9c5d1e1ba77bed1305fdce5e28a045eba8c6817ee41337b377b1822e38fd212be5b6699798b2c171f1956e49b02fda39f6749083773d5e5aaed862a96 SHA512 cd39bf06f1b9cc8065933fd83af0c178f713c7fd11cde1bef64aea3ff86bc2dcddbf30280ae5dbebc8af24b554a201210631b4707ab7d162941d4131a9bd2849
diff --git a/app-admin/gopass-jsonapi/metadata.xml b/app-admin/gopass-jsonapi/metadata.xml
index 8f667416f87c..d3d90aa3c71f 100644
--- a/app-admin/gopass-jsonapi/metadata.xml
+++ b/app-admin/gopass-jsonapi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest
index 9f476b158abb..0ef65a5fbeda 100644
--- a/app-admin/gopass-summon-provider/Manifest
+++ b/app-admin/gopass-summon-provider/Manifest
@@ -133,4 +133,4 @@ DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 EBUILD gopass-summon-provider-1.12.0.ebuild 7393 BLAKE2B 3b3a1bdeff118e3eccbc13fae779bfbf06ae812c2ec9e9fcde7adba6ae79f249002a40edc166218f27edbf8e77416a3b6f24ec84fb6530d81587510a89e5fbc1 SHA512 32c6b04536545423be5df36a062a4058f44f97156094af960920f0028bc3507eb885db9f4d306e392987b649037865185c8e87012e7fee669543d2be919ae97a
-MISC metadata.xml 343 BLAKE2B e3f2aa64ef0552c17a1720a60f87c79f1e284c8174465b6ab1ff5067923331dc4acd1f505cad3364b67e853299554f8d639e1a440e8bb5ff2e324af9f727cd75 SHA512 fe9a13b16234d476a2a8d77a0d9808fcb639f22e4bbb941c0fa325cd5e284ba8b797922c75d44df54f2f7ac0a7820dc972783a2b57c8aff18a86fb7f2fa1c5c4
+MISC metadata.xml 343 BLAKE2B 11be794126406d9585558cf8c01895535336a3610a52e8e5671f2872406af740ab3a627d1faa721eed3188583ae6523b4a6ee1f9693f46f645076c91e9e41024 SHA512 efec79a299147e1c2e37b457d8d5f149998eb79fac18bd136a9b5e4ff3e63afbfd57897e1bad61200ec4c760dc13873cf8035cd2b5f5bcd5018f6c08d6d44651
diff --git a/app-admin/gopass-summon-provider/metadata.xml b/app-admin/gopass-summon-provider/metadata.xml
index 6561948be34b..725e28b0eca8 100644
--- a/app-admin/gopass-summon-provider/metadata.xml
+++ b/app-admin/gopass-summon-provider/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index b4383383823f..53c27e3d127a 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,14 +1,13 @@
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod 133 BLAKE2B 4140d5578e9738f5f0edff83413628bcf7506e8844873be8427ab9203cb9f76ee5074cd9586fbdf6195927a74bf476c1ac622f2d9e65c884e77a727979bd6791 SHA512 192ccd509f32ea420df41a82089c720228423e16e4bcba0d667f73d92c246086c0a354643bb85f68435b5231f91b7c3364b2eda0a865196f0d991b0ec3c8b5b7
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip 50964 BLAKE2B ec82c1c2cc70f7de63f8b3c83fcaf85c5f4f07b166fecb520e48ad4ef0aab865193311b2f6af650e840c0019d5915e7f7361931fcb569ba8873f5f6daeeda353 SHA512 22f86d62c7a6325a294db906d3733d0904e769e9a837d12821f856842b1adac58882d6a2141c972bb804bb1829b97deb7f93427dd460dbb2d137714f854b6475
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta7.mod 173 BLAKE2B f1a8bccbd84315ace9568d5e5d74588f199cd1d88f726b067f399dc45d22aaabaab924a0aae62d25d669a8b46f56fa1fd78f71a7566e6769ad1dceed4c63b6e0 SHA512 f10b2b75702e08661855184b1221e3fa824641017e1e9ea88461fa3e610d830ac58fbd151f34fffe3144e005f940ace2d99516f3c55b9e9da0d7f30b19467acf
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta7.zip 60641 BLAKE2B ab9879fde3425253bc0f0665178ce5a157b53caa05318f6c9fc6413f6392d48f47f2b03ff812ffc400310cc09d7cdb55c9eedea0c913c6b79d03ef7723d193d8 SHA512 bf8dbe758d82115c9444fe6ed38e053e33cfdb77efb2f39c227b6480b631ccaf25ba2711ef191b84c44aa47437df9645ba7457b6f16178f5b7c6d38fca70fff6
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-alpha.2.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip 84404 BLAKE2B 8e04457aa65ff295afde6913b152a5294f5e8b2d8c081e4ca89f78cddd9f5013c8528d417877a8eba11ce0ceac885ff968a96777499abfaa3110f0405c27f3ed SHA512 7fb52e1050f25d41d32022a8ab6a7f6bbbcedd47e4fc435311b3c498ea575831a754b9a3ded66dfd8d8d22f768877039285d7093f9e08328574182f3fd07b7fd
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.mod 95 BLAKE2B 21644c06fa9277a526af6678d02c707a980e8b61c6cdc57793ffefbd167ee8370dea7a981f10c77fce342b3bf37d5a4329d7684caa50072beab810518431c167 SHA512 d0230c24b46b399aaa398ab6638eeea0f0d632fa3ab181ebb9faa44917419417a4301ae38d3eb9d8f2630f48efc3f565988727773b5334800f2c75bc0705fe47
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.zip 67280 BLAKE2B f6f51f239ed42494c214c059e2112281268c03f2503d120058f303d3d5adae59a875bf590d6e831077ecae5a5a291bda595e86205511796f9adb1079ecff5da9 SHA512 b5ddcdc0b562ca7b8246cb4b0329836f56d0ed5a7bd9a4dbb094781bfb2cf75ec574cb18fea556f8bbb4a4465012f41d6b76eee1e4a962a870ec55f20b51c2b9
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip 8606 BLAKE2B 47f87ff503a7c47ef7062b0ac3ddab26f8f3d322d27a746ccc1950cb6cb9571237b694eab48f95e1253800dd297df58c0c2ca67b21040e151cff634ebcbdde4a SHA512 5a6d9bc0761469bcf803cbb9d1aa43cc784171a81e53df8c4a14bd56e52db6ee7cd8a45e2fc81ce75bbe19f00cb53be3e170fab9ac3e73e83deaf09b799a9e1a
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip 21256 BLAKE2B 7b97d839138a150071d5c23287761f25dc778ce0be309e740dcc2e80902b15575647295c0b82de0737c5de96a04847c078caac89519ceaeb763ebfb8861946f3 SHA512 cb924d643de6a8f38fdb1b8b512ca17e7df4bd93f397280e89a659f90d4ca937cc33a98bea851371275b6ffaa83220e275fa36a9095631d2784b16f4515d0366
 DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod 43 BLAKE2B 0bb8e89eb31061bf2d38a3ffef58a48d3fa9a0dee26aeaaad7f38119d76ab9f34f0bb8ea4bddf277b9dea40acfaceff8925d32eb3386e898d6da9916b55bd647 SHA512 3fd19a3f311a3d0a6faa4488daa0932c661c27aad69568efbfa8aac052b175e2934055f7563c081718fb8a5ae560316a0e884a0f904694d9dd128f61dee2ecb9
@@ -30,6 +29,7 @@ DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fd
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
@@ -47,8 +47,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
@@ -64,6 +64,8 @@ DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod 36 BLAKE2B e3101c1f32c24
 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%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod 38 BLAKE2B 66807be55b6dea3229c9f7e7c69d5a8d2a32c3d3aceb2d1755ac55853de062aba2285a5bd09e1862ecf2e5931fca7ae34e0fdbe95a8ea4631081218326845ed2 SHA512 efb9c8a70c060e6ca149d62c78b62d389bdcfa46ff8f3a77ae0ba98f3e49799ea42d9c25f04546e2460251be6fcf6b31a6b219da6861666ac7e90da66362cba3
@@ -204,8 +206,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.zip 1488130
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d
 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-20210217090653-ed5674b6da4a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217090653-ed5674b6da4a.zip 1550741 BLAKE2B 9799c98d3b94ef0eee871b1a05bc86fe8a8cdaf2f06ae04789394fb9772a7be85380a381be5d4bb64d3e7f87e27455a99b0f1bfa607feb0871a7774861954446 SHA512 7a7a8abb510b9b48a3101481918157224b43c4eab322aae4acd212d7b5f1979620a2cc72d3ce2dd8c72245dc7fa1e03155bad7aa46a502821f4c96593772961d
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.zip 1559699 BLAKE2B c1f20655542aa307f19a1935b0f0ea528cb4e6faab9fe6bdb9bc6e7dd2a98936a294329e0ac89ae4c60698207b9a690a2e98259aa79970efb6f4833f676381df SHA512 9f53eb2de5acc0e75f055ce20ebf343b16b594ba41da46cb1be2a287fdb9c705e707e52778015caa7bfba51164bf798812fd0a04a6c7df4ae9991ccce2055bf9
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -223,7 +225,7 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 2228
 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 gopass-1.11.0.tar.gz 486905 BLAKE2B 406bd0e136963ff20bc1fcc3823b683f06dcb69dfb95eac689197b8572e9ebd735c89f08ec36d1007920970de0cb982bb63780ad5c21a02c5d34a34e30e2fa6f SHA512 0e971ba04cfc81071d44a2d57acbbe11e7e7706ac04774a7e5c0db6c940a30e64f5ef158e873f912b0d6f4c91a33c2aef4c9cf6b8158f714924c972ade34fb11
-DIST gopass-1.12.1.tar.gz 2138992 BLAKE2B ee3eb47e7c4248e348e8779b3ebdce6c059277aeae3a98714cd16fe2008adad35e01ce0a122b4c4dc88c78c3089ca4460c857e37f02e7eebcbd39a63f6d36257 SHA512 7c09a535b47c9768cc1b09dc6f83fdc305aa33aed0c1d0a2aa55df3c08ceac54efd86e2a3ba6708963c0f5ce919a11b991b577c1a4a7ae3e1cd9d1d8b3afff72
+DIST gopass-1.12.2.tar.gz 2139532 BLAKE2B 20130c833446750b81390e21bc97aba2f0897582d5146d342bb2c11cb11f799b89df4bc5da916d1747ba45782146d0342f402ef3427ebe60d9734bbd04931c48 SHA512 274e1dbc429091f54662ac402e2d46bf4c3579b367a3fe7c3c2103ba2c12c04bc3cd0faae7cac2c576e5518866c174e70bc75fc910fcfedd96c9a2394068b62d
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -252,5 +254,5 @@ DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 EBUILD gopass-1.11.0.ebuild 11354 BLAKE2B a00b9b89ae18bdd0bf459f2c76098e020e574b75cf1af450bfceca27a3b87c1f37d870a821ac2c41d4106b7fa74f254595b0057e2a5a00004736ccffd4e8b0de SHA512 e0901f82001fa86ebc168df2442e2810cf772a14737d7e15f8636d2b0a8a990ca1f4472f619cd46c227c5c681ec28ea236ae27a5a9f8f0a33557f8cdc947765d
-EBUILD gopass-1.12.1.ebuild 8278 BLAKE2B 3e51104f05719eb10b1a3048e8a69501710030616658e119531fd674841c8e930096611daccd2be9a72cd5a5955ec8acdb0187b7c86c0452f51aa5a574b6fd41 SHA512 40de35b5ea55ef4e09640e7bcca27d71d291b69f218d0e7ac1f6b52e6a14e2600a817308adf4569d51e4d66e6b7298c9e225f5017982c98b8f2d8b0d38772dd6
-MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
+EBUILD gopass-1.12.2.ebuild 7713 BLAKE2B 4c9ac8ec05af0cf4d226873c59bfd5f0d26b581d4cd281be66335347e93db539be8bcba48434e85a5bfeaf3bf77eeb3fd5850f1c79c8513e68aa8be13d89be98 SHA512 2121423903d94a93cd0c7a0aa50b3a7384c6b472d99f6954395cf1d997dd7c0e5fcefa458febb5f365b1aa0e0563721fe85173f5ff79b3d358c4f092653580f2
+MISC metadata.xml 327 BLAKE2B 79a9ad163a64e1c3023126971905aa819d01990fb031642f03ed1aa42d35986c83896a437055eceed0f4b0dbf458d62bcf33719982f0ec8596a1b81e02bec703 SHA512 7b0759b8822ccd5b1edb8080779ddd215b4e54f35af831498627ab0960d0d435729becf4f217e082ac34be71c71688c426c93b6d10ff993aa0fa8f8566de671f
diff --git a/app-admin/gopass/gopass-1.12.1.ebuild b/app-admin/gopass/gopass-1.12.1.ebuild
deleted file mode 100644
index e61d89168056..000000000000
--- a/app-admin/gopass/gopass-1.12.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module optfeature
-
-EGO_SUM=(
-	"filippo.io/age v1.0.0-beta7"
-	"filippo.io/age v1.0.0-beta7/go.mod"
-	"filippo.io/edwards25519 v1.0.0-alpha.2/go.mod"
-	"filippo.io/edwards25519 v1.0.0-beta.3"
-	"filippo.io/edwards25519 v1.0.0-beta.3/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver/v4 v4.0.0"
-	"github.com/blang/semver/v4 v4.0.0/go.mod"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/fatih/color v1.10.0"
-	"github.com/fatih/color v1.10.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.5.4"
-	"github.com/google/go-cmp v0.5.4/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.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"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/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/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.8"
-	"github.com/mattn/go-colorable v0.1.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/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/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.1.0"
-	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.1.4/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.7.0"
-	"github.com/stretchr/testify v1.7.0/go.mod"
-	"github.com/urfave/cli/v2 v2.3.0"
-	"github.com/urfave/cli/v2 v2.3.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673"
-	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/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-20210119194325-5f4716e94777"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20191026070338-33540a1f6037/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-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210217090653-ed5674b6da4a"
-	"golang.org/x/sys v0.0.0-20210217090653-ed5674b6da4a/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/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"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
-	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"gotest.tools/v3 v3.0.2"
-	"gotest.tools/v3 v3.0.2/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RESTRICT="strip test"
-
-DEPEND=">=dev-lang/go-1.16"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	emake install DESTDIR="${ED}/usr"
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "browser integration" app-admin/gopass-jsonapi
-	optfeature "git credentials helper" app-admin/git-credential-gopass
-	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
-	optfeature "summon secrets helper" app-admin/gopass-summon-provider
-}
diff --git a/app-admin/gopass/gopass-1.12.2.ebuild b/app-admin/gopass/gopass-1.12.2.ebuild
new file mode 100644
index 000000000000..4c9d561a9819
--- /dev/null
+++ b/app-admin/gopass/gopass-1.12.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module optfeature
+
+EGO_SUM=(
+	"filippo.io/age v1.0.0-rc.1"
+	"filippo.io/age v1.0.0-rc.1/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/atotto/clipboard v0.1.4"
+	"github.com/atotto/clipboard v0.1.4/go.mod"
+	"github.com/blang/semver/v4 v4.0.0"
+	"github.com/blang/semver/v4 v4.0.0/go.mod"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/fatih/color v1.10.0"
+	"github.com/fatih/color v1.10.0/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
+	"github.com/gokyle/twofactor v1.0.1"
+	"github.com/gokyle/twofactor v1.0.1/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.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.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/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/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v1.0.0"
+	"github.com/mitchellh/go-ps v1.0.0/go.mod"
+	"github.com/muesli/crunchy v0.4.0"
+	"github.com/muesli/crunchy v0.4.0/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/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/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.1.4/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/urfave/cli/v2 v2.3.0"
+	"github.com/urfave/cli/v2 v2.3.0/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673"
+	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/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-20210119194325-5f4716e94777"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/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"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"rsc.io/qr v0.2.0"
+	"rsc.io/qr v0.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="strip test"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	emake install DESTDIR="${ED}/usr"
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "browser integration" app-admin/gopass-jsonapi
+	optfeature "git credentials helper" app-admin/git-credential-gopass
+	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
+	optfeature "summon secrets helper" app-admin/gopass-summon-provider
+}
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
index 9dce670d8f3f..17eda47baeea 100644
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 877e6ce57ca9..275fae4a407e 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -6,4 +6,4 @@ DIST graylog-4.0.2.tgz 163286730 BLAKE2B 102b410b89e776c43ce97442407e0e7a418b0e9
 EBUILD graylog-3.3.10.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
 EBUILD graylog-3.3.9.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
 EBUILD graylog-4.0.2.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
-MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
+MISC metadata.xml 614 BLAKE2B b9324a8c6eaef41df27e5194c9fba2ad209a28278bbf46877be4b1660b64653e21e70fda4907216bb99bb74fbe93ae84836340c5a105c0a6ff1e59ffd5288e1e SHA512 50b49fec32b8b93b7514395f888db8731c42ae227ffe3509e2d056544e3da34fea38748cbf5c6c28c0676246af2533eb74652045a5a1933cb9d685ac5e879251
diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml
index 84ba1f113f4d..70be1d115aed 100644
--- a/app-admin/graylog/metadata.xml
+++ b/app-admin/graylog/metadata.xml
@@ -5,11 +5,11 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 9d8710fe2a1f..29df5089a143 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,3 +1,3 @@
 DIST gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz 318381 BLAKE2B 06fa325714dba0ec8ee319448286af791472d4aebdd7b94923fc102dfa0352f69247b941e91877c906b754a3b15c8c97d3b01281389274bc92ae23d1c4dfe858 SHA512 641aff62adb665ed6faa82925cc8941d894591e8209a46097b04a5feaba50a401144414edaaa1d97dd9c6b01fa6b4a057b3a5d96f9fd20318f85e535550ef2b7
 EBUILD gtkdiskfree-2.0.4_p20200224.ebuild 775 BLAKE2B bfbc8fa6f36663e46239e49954c2e23de38a6a32aa88991f6a7f5b6322fe58112e490c71a610516f2ff2d7b6da9e58559df87f26660c6e698d30c93454374c63 SHA512 e3aac871b014e841241b7af30feefd40168feee5eb883c9090a5a5792ed3dc582c9de6db2078dedee77e28abd7b4c501cc7cc782d1783069429cf05868c0e338
-MISC metadata.xml 445 BLAKE2B f29d0cf84087c74f4b4c336209891779c2333b2c4838f359e230f3b2d5ab0bb8dcf20734ba7815a23a78fef03b4abb74a0ae40830d7fbd4ad94781c605f41ca1 SHA512 06d2091ac361b713e98ee2e2fdc4997ec9b2cb2e511ccad8fb686e94388448d4422961987c6bfe66241c5318f77b6c7d37032f0cb6129f2fc994a573f8cc53f9
+MISC metadata.xml 475 BLAKE2B b6c71ef318b0d0a5d0a054e9ec17526a8428e0df31f8d8469aa0640a2b2d7e5e72019545d6f1ed2da97ea3d8d21341b27f307da37ed1ca038b9e997e10c2dd57 SHA512 afec7e35e04be59b18893369edf7efefd4c6bab44aa4412736d738e77fe284b56b2051b7ce4d5bb757941f9805082f902aed6bb667c2973e854b1257e87e758f
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index b90f32b55eb4..a0f11575fa77 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel.bauer@yahoo.fr</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index c6429c2a0661..45d03bead5b3 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469
+DIST hcloud-1.21.0.tar.xz 823556 BLAKE2B 8a37c7854d6c74f58a8f9dd021674a19f1cc968901e109dadf2e1b7621c3dd4981b07939334b293419d42fc8d1b1a1ff04b962a40b0ae8bf2518a0f7cccd7c68 SHA512 3186839ed95f355f67bdf7169dfa0b10852c8e2e3dc0f2a30e712072cd06cc69a40b038cfa214a47d33e39707d00a81f781aae7f51773cdaca96bcc0b80b1dec
 EBUILD hcloud-1.20.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
+EBUILD hcloud-1.21.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.21.0.ebuild b/app-admin/hcloud/hcloud-1.21.0.ebuild
new file mode 100644
index 000000000000..77d54006fe99
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.21.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 672ebb46b71b..746906ec0458 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1190,4 +1190,4 @@ DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 981
 EBUILD helm-3.3.4.ebuild 53769 BLAKE2B a43abc89b94f837cb83beddd4fb1efa8e0ea75f8daf972142aa898767075f72d2db90e653ee149a9ebdf43834b8caeb2883c927733df136c8ae1c3377ba9550d SHA512 e8f01ab1ac529e8a67f67146ab906b4162c3799e1dad1503cedca12fb82a84297df063293f10fd62997d554414d551df414ceefc0a2f56fcd66b0fc5b772bcfa
 EBUILD helm-3.4.1.ebuild 61570 BLAKE2B 630a410c9ae384f61b0db72738e276a8e5361ef3cc18402d5e53597223c8b8acb066abd958740c21dcbbdbd98cc0ad94cf6bb13cded3262766b06b1548959fae SHA512 81e76faac2da824fab415e342ade26667952ac9201a6060d53354e9f26e9a17bd7f62ceec0c5c8e692fc5ca3cc070c13db280f4523529d9ea4f192682497841b
 EBUILD helm-3.4.2.ebuild 62589 BLAKE2B d4dbb35f7b1d95746c09888d9e39a67a941d80787ae7c6c119c1b75a16ec6c8a6a48b07dda8fe550a4eefd60cfe7f8508b9d73cef163d6c1f83477e0578f9ef5 SHA512 34f366cf59c23083273c54dc9c4f58165315faae4ba8f87943340cb74e2bb92e808d7b049b7d04d8ac6907ee86f0634b7f6446cf9cc82149585d1a50e6c9af48
-MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
+MISC metadata.xml 322 BLAKE2B d05a8d33a045bce308ffc30abb2b696e93e89a4709d4def945da9f270b66294976219cdf3e0c78ca828b913db15055d8d4d54ec3990e4e429e4b3ff0d07d3a9b SHA512 d47f0793a9b0797829bfb5423c5f8b611eff18f95c4b423cd0060e9b1ba63422086498f7e945b6b15040d0584e32868819a86063e7d7dea412446f9255f9169b
diff --git a/app-admin/helm/metadata.xml b/app-admin/helm/metadata.xml
index 689215a977a4..8f27fe7b46c0 100644
--- a/app-admin/helm/metadata.xml
+++ b/app-admin/helm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/integrit/Manifest b/app-admin/integrit/Manifest
index 83a96c76cac2..0d43242787d5 100644
--- a/app-admin/integrit/Manifest
+++ b/app-admin/integrit/Manifest
@@ -1,4 +1,6 @@
 AUX integrit-4.1-fix-build-system.patch 1169 BLAKE2B 36b13162ea3a583968bda35ece1b4b1cc83871d4c2352ebcbffd079a9265d84b15e72d5e93f10e2404cd26e0622c666cb8b60e1cd53f207f0149a55814e10477 SHA512 4ed15ee8383e280b2d16d353f3401a058ad03c4ad84e4d0932ceec74391e04d266c2468270d2a08d299c57ee105f504c917fcf04b4ac07639bcba42e0fde84f6
 DIST integrit-4.1.tar.gz 271626 BLAKE2B 538a34c8e5c00e1be66ba35095be4d61402372ea7fd9ba9bfff9149c9a82c43d625ffb345fe84b7561100b31f2a2a1ba319e8b9a7d2b78e44a81d1ed6ae64f3a SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842
+DIST integrit-4.2_rc1.tar.gz 223627 BLAKE2B ff0dead8a8903dba0f43c7746672ca2d57aced352df2fef7b195fc90e9b38e77bb21affb40c424c5d23df7dcecf3192c1bff5c7c04d3fcbc5dad0dae60565f93 SHA512 2a86a37c684ca0b78bbf7901c8e72511f1169e8af7e9b4efdeadbade52e8fc7302167f6d82bd02b5af9688a05d13fc56d4f5474e3e04d1aef3dd9f72d782d739
 EBUILD integrit-4.1-r1.ebuild 1264 BLAKE2B 208f5ff74d53a189f7eabd131e3f032cff73d467e4622d317148d9a17c4b7db55335815ec6e59ba85794794bac1bff901dbd7d21b04e32ea0714fd3c7c54d5f1 SHA512 8cbb22064be0107ae5fa363185ccdecf347e7078a0d455d0af8af59b504282005816c1c52e3a01999568bb39a89e30043c48c556b6e78579c25dbc72afe8a5f4
-MISC metadata.xml 245 BLAKE2B 8edad0fa1051f1c6b28fa61e95cbde797389dcae4a23b953e0b77198a5557e068e09cdb6b2e32ca4e25ea07789c406529094d25fa74182656a4c59f4f7a42178 SHA512 e7052ee3572f1a5546b02087b7de95803a2e8b023aa24bc701eebb0bdd47b294d9634f4e78abfa10764e88397a067b1f1f8e431cddf5f8b260693f56ebd88b8b
+EBUILD integrit-4.2_rc1.ebuild 1405 BLAKE2B f2eb0feefa43b95a8eb43829f12059105fd4605418bc4192fc83bc5012bfd0a250f08ee97245aad6a279aa6c3d9f709081b31bbe7d3ff787523f242ec3e301e7 SHA512 b62825370f9fa3721f9929a2460f1561505e80df1893badabcc2ff83155e7b34e0eb1344fda9312718f184122530f5440d2a8a5c8d36b75caaad09ace5b6b7d5
+MISC metadata.xml 302 BLAKE2B 89b3a92b3cda49f6d17f809f4def559a53fd9f5b9216a5be1468a7e40d83faa78024d9f072fc1ea6c45b50f55675711e0ce93a5f781afd091b3edc738288a5df SHA512 b1fed9677cc00dbe9cdc71f89e3fd99e8c83f4ea7e1a58c192ae3b3b4091df924f93e37c1fac4c02ac0c2c7590e4bf4a9b930716f2181b1ba0d6ff59cc0d1039
diff --git a/app-admin/integrit/integrit-4.2_rc1.ebuild b/app-admin/integrit/integrit-4.2_rc1.ebuild
new file mode 100644
index 000000000000..5e4745ea5cab
--- /dev/null
+++ b/app-admin/integrit/integrit-4.2_rc1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="file integrity verification program"
+HOMEPAGE="http://integrit.sourceforge.net/"
+SRC_URI="https://github.com/integrit/integrit/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Tests don't work in 4.2_rc1. Please re-check on version bump!
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.1-fix-build-system.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	mv hashtbl/configure.{in,ac} || die
+
+	eautoreconf
+	touch ar-lib || die #775746
+}
+
+src_compile() {
+	emake
+	emake utils
+
+	emake -C doc
+	emake -C hashtbl hashtest
+}
+
+src_install() {
+	dosbin integrit
+	dolib.a libintegrit.a
+	dodoc Changes HACKING README todo.txt
+
+	# utils
+	dosbin utils/i-viewdb
+	dobin utils/i-ls
+
+	# hashtbl
+	dolib.a hashtbl/libhashtbl.a
+	doheader hashtbl/hashtbl.h
+	dobin hashtbl/hashtest
+	newdoc hashtbl/README README.hashtbl
+
+	# doc
+	doman doc/{i-ls.1,i-viewdb.1,integrit.1}
+	doinfo doc/integrit.info
+
+	# examples
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	elog "It is recommended that the integrit binary is copied to a secure"
+	elog "location and re-copied at runtime or run from a secure medium."
+	elog "You should also create a configuration file (see examples)."
+}
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index fa14c9a7ea90..25b3199e6fdf 100644
--- a/app-admin/integrit/metadata.xml
+++ b/app-admin/integrit/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="github">integrit/integrit</remote-id>
 		<remote-id type="sourceforge">integrit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 810855bf0a51..0da9b5cf3b64 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -4,4 +4,4 @@ DIST KeePass-2.46-Source.zip 5054069 BLAKE2B 81567ab4589e53ae5cc1b75fa42cc61d9d0
 DIST KeePass-2.47-Source.zip 5100005 BLAKE2B 9a71706efbb734244a0de6e1ba705ebaeb550368a77b1e74eaae47ec5a9c7dd12139740d7502dd5ad40e6b90e179f037ca5eae1650c2659a0a64260a93cd595f SHA512 df0f4dc9702198b4d31e78ac4fa1e85746dc7618529ab5ceaae1f6e1cc68a9a574f7892caff99e767f583fe102d87f0bfaf579f375eb227bf6f28fce6253a8f1
 EBUILD keepass-2.46.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
 EBUILD keepass-2.47.ebuild 3230 BLAKE2B b86c31397b4cfd3865ee5ae47f9649724a9c3acc594a4ffbd54c59fc4ecf0b6bb958a579a85635305f2c87db3ed7bc5b48b48bc44a2beebeaf850a03bb7a76c3 SHA512 890c87ca3b874f0c2a35f390feed32ef281233bb339df9bd1c2bf75a49580d52aaca2315f1b1128b8b0db81a6ea31235541bb45b402f9595fa67689f6eab2337
-MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
+MISC metadata.xml 681 BLAKE2B 00836c30b633363faed0504c8c4668935fc47cd1e03c951d4de541cdf688fd996410d6ea317019ca2131a1e7e199d5a9f46ebce117c4f1bed343efd9d05647a5 SHA512 6653ac6aa44001d8e518552ead816a5c3212d01b526f385c44b2bd0263122d40f3a7b12d5cc8801d5822c7e2d2e5aeb31315ac3981339c4668eb79b3142a6001
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index edf5dcda279a..59cc6e725163 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ale@clearmind.me</email>
 	</maintainer>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 3d4bf9e9327b..7f6187ffaa01 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -351,4 +351,4 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b235
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 EBUILD kube-bench-0.2.3-r1.ebuild 19453 BLAKE2B a0ef4db54a8faeefbfc77c055d69041289ff6a0e16ec9fdce41289d2d4859cef82bfde2fbc0091c1a51433040c80b6a39255b92550e7607236e43c0cf53ea2da SHA512 d39eda3f3ab1a45b6a11ec335b6c31e793bf7f3abf07db3137480319eb8bbe86f4d4c7a98a8ff000412c147447414457ba7899fb5337f1e7c020bc1e2dbee87c
-MISC metadata.xml 336 BLAKE2B 277f263a32b6d7452d2b675e4434e56f44d4d68d2b502bb59d6c54ee29dae0e02af8c17c157850f1792c0d0268701aef7c669f171b1a9b4d629b297593d4d3e3 SHA512 5b0fdd5ea1e4da321fb30b752fadf565cdede02a8a001259569ce28294cde66dabbd42c73a3abe682b3cd223ccd28a31a269432f05acf015e3215a03f693b155
+MISC metadata.xml 336 BLAKE2B 42361e24b6f2eb538d4adb3de0657a6330027dab45e85b61403b3f9fbcba0f085aee2fb24acd43cc48dc54d733fac7a86e20502d3252d3e4a4e5f53689889b7d SHA512 f72177a2238716b531f2dd932c68b4b6c5a162f2376ea234e538555407e4166226afaf84b531a176e8600eb86315e6b9b2ec4e94e2ce0eafe66dd3d45517737a
diff --git a/app-admin/kube-bench/metadata.xml b/app-admin/kube-bench/metadata.xml
index 3072bbf793ba..90e40062bfe4 100644
--- a/app-admin/kube-bench/metadata.xml
+++ b/app-admin/kube-bench/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-admin/lastpass-binary-component/Manifest b/app-admin/lastpass-binary-component/Manifest
index 0b7a6fd988c5..c0da89bc636c 100644
--- a/app-admin/lastpass-binary-component/Manifest
+++ b/app-admin/lastpass-binary-component/Manifest
@@ -1,3 +1,3 @@
-DIST lastpass-binary-component-4.19.0.tar.bz2 1625255 BLAKE2B 714fb34708f9dda8dbacfce8e76adf004f1cc966d685c0efbaac7b25c45068bb5595e954e554092852d575f1fedc5f318d05b121bc2ce1aa4888e4bf374f7b96 SHA512 2535d72c5b545b364dd1e91503590cafa16d3de4f4745c4f1fa236135580e2af47094e364a7f0ebde5fcfd11282ab9329ef333866a985f02a873e092aabb9b22
-EBUILD lastpass-binary-component-4.19.0-r1.ebuild 3766 BLAKE2B 90037dc5e17cbe65a5e5ce69f4897cc387edc431f23b33ebedf5ff21a6ab364d59411e93dfffded7bd8a34ebe167732422bcd835440377f8a8e4d4a96f375343 SHA512 bf53793b9ff0855af319e0cf8609a077e17292bfa10f4f8ea1eeeeab8debcf777e7752e64de1fbae90ef8819c44a813b5cd23f70cd1ce7a2858966bda314e00d
+DIST lastpass-binary-component-4.67.1.tar.bz2 1625199 BLAKE2B cd9333866516a0dc43b653106224e5ef1a228c340adac93a2541d4f337b6b865c5eed043cf914a552b390d23a471ff1f21f8439d15282b77fb69dcbd6ffa01c1 SHA512 8277082fcf4cb8ef0f67903f518eb1b55fd6525373f22be0ce7d62abedef76029ef46da7c0aa32d4df3bbc0053471232390ecd69ff0572a3836e08aefee98e48
+EBUILD lastpass-binary-component-4.67.1.ebuild 3766 BLAKE2B 9ddd3ce2de5dd6765aaf269e85530a1d5c49018e5a45914036aa0008bbb65a9dddfef3ce9cd73de3bb2da76eed0d800abf155b50bffa3761cd6784278451684e SHA512 4b6726fe422f56009df365c11cbe24259b5f5c0a9aa37ad446a431ebb334002f582583eaf9a7ba8e9fcbc9d765ce627ea5a985dda54eb1cabf6e20d7d8620b10
 MISC metadata.xml 816 BLAKE2B ea7163f64706263e360241192a07e1e12eabc6fb196e5029cec931c53dacad20a9a4d851402f8942120328aa551159e2ba340257d50a5fcc36f7a72145e13a18 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0-r1.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0-r1.ebuild
deleted file mode 100644
index 0913632e723a..000000000000
--- a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Binary component required by the LastPass Password Manager browser extension"
-HOMEPAGE="https://helpdesk.lastpass.com/downloading-and-installing/#h5"
-# sadly, upstream has no versioned distfiles
-SRC_URI="https://download.cloud.lastpass.com/linux/lplinux.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LastPass"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist strip mirror" # We can't mirror it, but we can fetch it
-
-LASTPASS_EXEDIR=/opt/lastpass/
-
-QA_PREBUILT="
-	${LASTPASS_EXEDIR}nplastpass*
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# This is based on the upstream installer script that's in the tarball
-	bin=nplastpass
-	use amd64 && bin="${bin}64"
-	exeinto ${LASTPASS_EXEDIR}
-	doexe "${S}"/${bin}
-
-	# Generate the policy file for Chrome/Chromium/Opera
-	cat >"${T}"/lastpass_policy.json <<-EOF || die
-	{
-		"ExtensionInstallSources": [
-			"https://lastpass.com/*",
-			"https://*.lastpass.com/*",
-			"https://d1jxck0p3rkj0.cloudfront.net/lastpass/*"
-		]
-	}
-	EOF
-	# Install the policy file for Chrome/Chromium/Opera
-	for d in /etc/chromium /etc/opt/chrome; do
-		insinto ${d}/policies/managed
-		doins "${T}"/lastpass_policy.json
-	done
-
-	# Generate the app manifest for Chrome/Opera
-	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
-	{
-		"name": "com.lastpass.nplastpass",
-		"description": "LastPass",
-		"path": "${LASTPASS_EXEDIR}${bin}",
-		"type": "stdio",
-		"allowed_origins": [
-			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
-			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
-			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/",
-			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
-		]
-	}
-	EOF
-	# Install the app manifest for Chrome/Opera
-	# https://developer.chrome.com/apps/nativeMessaging
-	# https://dev.opera.com/extensions/message-passing/
-	insinto /etc/opt/chrome/native-messaging-hosts
-	doins "${T}"/com.lastpass.nplastpass.json
-
-	# Generate the app manifest for Chromium
-	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
-	{
-		"name": "com.lastpass.nplastpass",
-		"description": "LastPass",
-		"path": "${LASTPASS_EXEDIR}${bin}",
-		"type": "stdio",
-		"allowed_origins": [
-			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
-			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
-			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
-		]
-	}
-	EOF
-	# Install the app manifest for Chromium
-	# https://developer.chrome.com/apps/nativeMessaging
-	insinto /etc/chromium/native-messaging-hosts/
-	doins "${T}"/com.lastpass.nplastpass.json
-
-	# Generate the app manifest for Firefox
-	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
-	{
-		"name": "com.lastpass.nplastpass",
-		"description": "LastPass",
-		"path": "${LASTPASS_EXEDIR}${bin}",
-		"type": "stdio",
-		"allowed_extensions": [
-			"support@lastpass.com"
-		]
-	}
-	EOF
-	# Install the app manifest for both firefox and firefox-bin
-	# https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Native_manifests#Manifest_location
-	insinto /usr/lib/mozilla/native-messaging-hosts/
-	doins "${T}"/com.lastpass.nplastpass.json
-	insinto /usr/lib64/mozilla/native-messaging-hosts/
-	doins "${T}"/com.lastpass.nplastpass.json
-}
-
-pkg_postinst() {
-	einfo "This package only installs the components required by the browser extension."
-	einfo "Visit the links below for your browser to install the extension itself:"
-	einfo "Chrome/Chromium: https://lastpass.com/dl/inline/?full=1"
-	einfo "Firefox: https://lastpass.com/lastpassffx/"
-	einfo "Opera: https://lastpass.com/dl/"
-	einfo
-	einfo "Chrome, Chromium and Opera users need to manually enable the binary component."
-	einfo "For more info, visit: https://lastpass.com/support.php?cmd=showfaq&id=5576"
-}
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.67.1.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.67.1.ebuild
new file mode 100644
index 000000000000..783d1214c731
--- /dev/null
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.67.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Binary component required by the LastPass Password Manager browser extension"
+HOMEPAGE="https://helpdesk.lastpass.com/downloading-and-installing/#h5"
+# sadly, upstream has no versioned distfiles
+SRC_URI="https://download.cloud.lastpass.com/linux/lplinux.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LastPass"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist strip mirror" # We can't mirror it, but we can fetch it
+
+LASTPASS_EXEDIR=/opt/lastpass/
+
+QA_PREBUILT="
+	${LASTPASS_EXEDIR}nplastpass*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# This is based on the upstream installer script that's in the tarball
+	bin=nplastpass
+	use amd64 && bin="${bin}64"
+	exeinto ${LASTPASS_EXEDIR}
+	doexe "${S}"/${bin}
+
+	# Generate the policy file for Chrome/Chromium/Opera
+	cat >"${T}"/lastpass_policy.json <<-EOF || die
+	{
+		"ExtensionInstallSources": [
+			"https://lastpass.com/*",
+			"https://*.lastpass.com/*",
+			"https://d1jxck0p3rkj0.cloudfront.net/lastpass/*"
+		]
+	}
+	EOF
+	# Install the policy file for Chrome/Chromium/Opera
+	for d in /etc/chromium /etc/opt/chrome; do
+		insinto ${d}/policies/managed
+		doins "${T}"/lastpass_policy.json
+	done
+
+	# Generate the app manifest for Chrome/Opera
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/",
+			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
+		]
+	}
+	EOF
+	# Install the app manifest for Chrome/Opera
+	# https://developer.chrome.com/apps/nativeMessaging
+	# https://dev.opera.com/extensions/message-passing/
+	insinto /etc/opt/chrome/native-messaging-hosts
+	doins "${T}"/com.lastpass.nplastpass.json
+
+	# Generate the app manifest for Chromium
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
+		]
+	}
+	EOF
+	# Install the app manifest for Chromium
+	# https://developer.chrome.com/apps/nativeMessaging
+	insinto /etc/chromium/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
+
+	# Generate the app manifest for Firefox
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_extensions": [
+			"support@lastpass.com"
+		]
+	}
+	EOF
+	# Install the app manifest for both firefox and firefox-bin
+	# https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Native_manifests#Manifest_location
+	insinto /usr/lib/mozilla/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
+	insinto /usr/lib64/mozilla/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
+}
+
+pkg_postinst() {
+	einfo "This package only installs the components required by the browser extension."
+	einfo "Visit the links below for your browser to install the extension itself:"
+	einfo "Chrome/Chromium: https://lastpass.com/dl/inline/?full=1"
+	einfo "Firefox: https://lastpass.com/lastpassffx/"
+	einfo "Opera: https://lastpass.com/dl/"
+	einfo
+	einfo "Chrome, Chromium and Opera users need to manually enable the binary component."
+	einfo "For more info, visit: https://lastpass.com/support.php?cmd=showfaq&id=5576"
+}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 0daa511fcd82..6803ee0a7025 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -4,4 +4,4 @@ DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
 EBUILD lnav-0.8.5.ebuild 785 BLAKE2B 6983ddad1736c7d185b80407de989d928ec2709624ed18b8421170a0ec69ea19e858cc2d04f0250802219ffa0982bac843ce27e6fbfb49666b0bf481eac10887 SHA512 c6c62e21891014b3dbf6c0f8052020b5ececbe0190f45706e20cc0047c37d7a655d5afc959e3e93438a2127bf959057c92d12411de1a68fd2adfc7f0f3f73ecd
 EBUILD lnav-0.9.0.ebuild 856 BLAKE2B 019fc30e752072eaa2b308facc8de916017bbefab5f4947f5d2952acf6fcc4fec7d284430e056c18ecf0aaa3d8652b2ac88a8895bb731abb9bfe25612cb34493 SHA512 4dd149c7f76154a640c1a6634f25af0033b948263de9023b5b9a0e36e2d0c1d90564a41402d287269bb82bf41e0e36cd80b40f7bb7e408725f7fe7c44a4d707f
-MISC metadata.xml 750 BLAKE2B 67c9aac6419846486011194cd1f37f9f12c1a9518dc423a096e2de3ad78aad0b1ce930237933025511655d28e9b65d34ae4c1808a4f24bbdae4b0b06f9d6bc08 SHA512 0ee79ec7a057ee82003f1106150c9c2e4147e346b469bf5afe18cac0aac14a8f9eb86f5f832c3e553a7158f58969f3f6a969a044da88e4783c6d3f56a84bd106
+MISC metadata.xml 780 BLAKE2B 2cef44f3fda69ccc20f16a7f75cac035bfec429767dc12966c6729fa1b0b72ac66333d3f3ab7341f7b1b2a0fdd8f533577a04fcf15df7f268ca0a99f8c0acb07 SHA512 b9a91a8dfb2f0f528fb89fc6ea20867792baccdb12386dd8e92f4462b16869b51a796ed44f3f44faa41f8745db18d2c1fe5dd0df82aad6f40486b47b37a8a6e2
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index a6e95f162d9a..f8a3c0e9a9d0 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>randy@electronsweatshop.com</email>
     <name>Randy Barlow</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 173f6ae6c180..14884a1e949f 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -8,4 +8,4 @@ DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4ca
 EBUILD logrotate-3.14.0.ebuild 2504 BLAKE2B ac279df5befd104bf6495aab0e423e953f52870155b5e52b61031cea90cbd57cce9c3b15043d144edff244ee468f4436c1d30acffeb1c4c73953abbfa16e6559 SHA512 fce971e5c74cdf8dfe8ca6e46c84e9e8b10674a7069c10b0ebcf47f88de2d2aac6849f242a399239f65f9aa700eac67dc7e62635d2043bbeed7fad07f50fa564
 EBUILD logrotate-3.17.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
 EBUILD logrotate-3.18.0.ebuild 2492 BLAKE2B 8833db0183e740729d130d3011726f9e56feb9d9b1d8ab05ea3215543ea02b06b672dfd0f93ad45ddc989a69dc89e7defd0a1f05e860331fd6d16a9be0815d9b SHA512 e261bbfa54dd05ebe2013e197e3fb3e7fdff03c151978f64d50d3e4d21daf5b4d7d85f43dc3866e1bad101a83878cc9c12a0eccbe52cfd55e120fea3bfc3c58c
-MISC metadata.xml 1207 BLAKE2B 59294176103f15343e415ada4c4e073cae53322114bf39b43376c6eec8206fd3cce19da99cf609b1e72340f15a272b94a5a956703c93659709f4d83605ab6152 SHA512 29acdfddf935cf1c3bd7e61cbecb19f9f5b4acac31d01aa89ea2f6395a7f59bc2501d3f751f5e8680fc71336cd56cc5abedd9850d44664ddbb12b140efa86645
+MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 051f4438e708..05cd054be3fd 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-	<pkgmetadata>
+<pkgmetadata>
 		<maintainer type="project">
 			<email>base-system@gentoo.org</email>
 			<name>Gentoo Base System</name>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 9372c1180a0b..6ead7dba181d 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -18,4 +18,4 @@ EBUILD logstash-bin-7.10.2.ebuild 2504 BLAKE2B 9e4e24079755eb80b22734c42fa02545d
 EBUILD logstash-bin-7.8.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 EBUILD logstash-bin-7.9.2.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 EBUILD logstash-bin-7.9.3.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
-MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
+MISC metadata.xml 692 BLAKE2B 4dce636bac8df4bdc8761c340b230db0371df1b127e17de8f9d55225fec2ccea4f59876e88b651427c11047eb24c6993391a2f25a3ac1ec39032d50226e9c99b SHA512 6a22c84fcb90fcb8334a1bd26e240e97d7c06d17251a9f973d780c28b836eba45cde5fc35a46e2cd82bf30f04116c825ec831344fd286f9e84cc430d032f3757
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index 6381ef41d5e7..50ec1505c6f3 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/metadata.xml b/app-admin/metadata.xml
index b15417f502c1..09558aac2386 100644
--- a/app-admin/metadata.xml
+++ b/app-admin/metadata.xml
@@ -35,4 +35,3 @@
 		Kategoria app-admin zawiera aplikacje dla administratorów systemu.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 9b7831df0c68..ce286a210d77 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,6 +1,6 @@
 DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
 EBUILD needrestart-3.3.ebuild 837 BLAKE2B 96162645388eff943edf52e9af487eecb8123e1ccf101dd9e4ae3564ee4f8ceca7d673f7a26679171d12c69f66e39ebb4536753c32acc4f5d0bc5ee179e75c0a SHA512 9e900a39d78fe2fba7d182ed0698259eca04df70b00d8eb5d6a28ef3af0b3da9c51f39a93cbc2b4b4d82638582b04dbef33a26c553ee8bbe7db9381b2cd956d3
-EBUILD needrestart-3.5.ebuild 859 BLAKE2B 9090ee834787466b1b93bdb6ca54d8715ed9d84edcc06e39aba89d8fdde98232d42005af0ca2c38eaa60e785498c0033b15080f0ee3166d4ee2a6efe711945de SHA512 b6284535484e173e1a261e55fdd03982c18efb003d73da37f1c2b6a2625ff5703c0ee329e52273d1acc2bc54d43905b3d9cfb8d11b7f610d017f9219e1326acb
-EBUILD needrestart-9999.ebuild 861 BLAKE2B b7b83ec474eea9bec718c3a3be0432abd609ecf26d69d34b6b4c6bf0eac40c62c99f1d628b8d8d0f5d08dc7f4711505b32731bef29dc9fff33e5936c5d347ac3 SHA512 da4a25cfe4b244cf6c99c0685321653102f813598387cbae8f998041b2ff31db2a262f6646a6c389d9c77527b5c5319b7d0da77786c4c8d9abe2ce02abbce095
+EBUILD needrestart-3.5.ebuild 901 BLAKE2B 0c38f4bac713d78e281f53a4f0711313a58188bb75c15d260f23240ee91d8c81fea95c9d272ba80603d5a7dc110b35681bc655ace6501ea86c23a8dd46de96a1 SHA512 cbb46022d5d3f6a5953c0326e5973bcd53870ca853ff3551fc6f875958e1544167c0296cfe3598d4663ca9da20fdd9a1ec6b3e4dcab64eb4927b45ddd59165e1
+EBUILD needrestart-9999.ebuild 903 BLAKE2B f572e71b46cbc6e757ed9a7d5866dfc5c6ae6b835e189cf3c933aaf04dfe2bb0692542d6c0c47763502613a44b92aab6b39a7474cb0ab9d5edfebadd4adaaf46 SHA512 cf4c7bba0f7671893e30b12329af8c523523ae38ffab00cc76937fe4b144cb05bb6b92ed9830db85ec9ea2f6fc38993a340ba887fca57e951b3d01844e918179
 MISC metadata.xml 360 BLAKE2B a0996c4eb2c7dbb05be6ee95e1c0df6ef594d249e332e53cf0c2fbb25513a21da54987ba21171390996a70e2d7d8141913e74f6c410be81c494e0850e895edfe SHA512 110d7d21ababbfcbed16f1ec1cff3c07edcc6dbb05d7806b347401838b0d53d930ddf3a07781c272174f8866bf72a62c187a06d36f06345eca57f040b4fc924b
diff --git a/app-admin/needrestart/needrestart-3.5.ebuild b/app-admin/needrestart/needrestart-3.5.ebuild
index ab1223abcf65..8856888b4ad1 100644
--- a/app-admin/needrestart/needrestart-3.5.ebuild
+++ b/app-admin/needrestart/needrestart-3.5.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
 	dev-perl/Sort-Naturally
 	dev-perl/TermReadKey
 	sys-apps/init-system-helpers
-	sys-apps/iucode_tool
+	amd64? ( sys-apps/iucode_tool )
+	x86? ( sys-apps/iucode_tool )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index a90d4adcab9e..5fc3e7529915 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
 	dev-perl/Sort-Naturally
 	dev-perl/TermReadKey
 	sys-apps/init-system-helpers
-	sys-apps/iucode_tool
+	amd64? ( sys-apps/iucode_tool )
+	x86? ( sys-apps/iucode_tool )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index cec75356a37c..ac66a76606a3 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -2,4 +2,4 @@ AUX ngxtop-0.0.2-py3.patch 1816 BLAKE2B 1f19b6143bc5eab4786043d1641f17a370cc07b7
 DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
 EBUILD ngxtop-0.0.3_pre141201-r1.ebuild 749 BLAKE2B df74eb3f526b1923027923a2619af43c898f4331bfbc2f190aad953842c09719098ff3d522d6036f1234168f09d0cb9a666c052ab868f2297c9d5cc47eaad31a SHA512 bdc0be8087055b3e4e94209ada558728500c8f0fcfa6d64db3d0d94e7b553b0fe710c2433d2b048dfe2731f3cd6fe2c034173db1966d5fb8522cea69dc990505
 EBUILD ngxtop-0.0.3_pre141201.ebuild 715 BLAKE2B 77928cf8ec4032f0d6b2480557b0a79ba549781762982c66fd44d33c182407bf1f387c98a210c0655b8ca8d4c3a1a07d83010a07ac4ce258e9c24809c68407d7 SHA512 e75792344959e260dcff6f3c506009a4dd3dec76325615da592ee651afba59da0ccb4d111e8d2370bf2ba1864c73858fdc7b651623faeb31f63ba7f4ee8d97fc
-MISC metadata.xml 461 BLAKE2B f806664e2adbfc73592f38096aa760947d80503bbc57896ea67a6981d2dc5f96ba33b3c52ccbbc9b89cdf8396be58e02c72fca1da540e50234f56230e1af974e SHA512 ad2119f295b8c26f57142a89ca52ca6fc33b8fd1cbb8fc8b03a838f4515035a58144c661c64afb53a032cbcb385d13fd5d6cdb8c63d5e098210f506e406e0382
+MISC metadata.xml 491 BLAKE2B c1bf992dbd7a74dfbb104760097c496e1e2ab4556dd96032b181cee3dee77d806c7d5ea3e2684cbf3251063af5ce0e5f2ec3e916f9c105099fe8b020b35c7dfb SHA512 ef02eb48c61d27db4885dff568907b7e117ee1f18bd3e76a28af65fcd74ad3af342681144b5119ea0236802d8d31f081f301bc882b49871a29174847e41e92ca
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
index f4945a677938..9d2ded372d85 100644
--- a/app-admin/ngxtop/metadata.xml
+++ b/app-admin/ngxtop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index 36b686518047..2503ade65a8d 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,3 +1,3 @@
 DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5
 EBUILD pass-otp-1.2.0.ebuild 681 BLAKE2B 9361771ca7d5d2e9d34b4b5c733c0d9984355c11c6b91599559b67bf3be74ae4037c116b4028804b0cdb4bf7f5a7cc0cb9e95e7389952de0017bde631879a932 SHA512 b69c15e7f625338a2b3e9da3085b1fddc91536fff0281e9706f550a992c258a9c1d9d95810d8da7757056236957af799eff127a782409e9f2c683ca6bb2252c4
-MISC metadata.xml 584 BLAKE2B aa8d3fad012d95e4162630b2d26fbf4bb093835d9efebfde050a68cc7d6a9f23946950d5b743f8c974aa17f54fceb4e54f8a477098a7b8edc7ab1f2b72d828e2 SHA512 fe8f099b62d4e947f7201d10c44dd72d53facbac6a67e257856d190ee843ed8d1179c188a5460763388a237af6d1513a2e29c90e5687f41e2e6f4a84d27db525
+MISC metadata.xml 614 BLAKE2B 1241c34b4906736f9bc6cf6107ed8a2c596db711e04fdc8116f6480f3bcdfd8fbc8c73bccfe74e33049fa73fbc4f771fd91465e0b5558c456e581ab139cb1fc5 SHA512 f39531d6a843caf9a2d48fc2e5af6710c813aa13436243a7787e40c35de091c5fab4c821a4c5e0f22fa933f04be45bafdda54c93ef7cfd57fd483bc3fb3b6a79
diff --git a/app-admin/pass-otp/metadata.xml b/app-admin/pass-otp/metadata.xml
index 409124c1082b..2206a3c30837 100644
--- a/app-admin/pass-otp/metadata.xml
+++ b/app-admin/pass-otp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <name>Haelwenn (lanodan) Monnier</name>
     <email>contact@hacktivis.me</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index 090fb1f35702..e911eb65212a 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
-EBUILD pass-1.7.3.ebuild 2189 BLAKE2B 8ee842903bfe1c01a62f423eac78cc96f59129c714406f3af605ddb0d3043b481a3748a19dccb5b2cb31da0416cc65d5bcf0627dbfaffcfd46f71f0efc66a58c SHA512 ce590f22fcfb55abc462cb5351f658867d4e3a182ae8ccf7e0d5a183c49514a3f1d1bc3ce9aa41f0a8e8585ff750b21a666d6c14797ff42a8269d5bf6104f77d
+EBUILD pass-1.7.3.ebuild 2200 BLAKE2B 29b614496070c995983bf8ebb44bd02ac8f8ed53161c814adb69cad95fe74667e869f106d51aefe26cd449a08f464cfec88315c24d3e7996ba8f1d44fc8604b5 SHA512 18dc94bdc0d786377791b99a36e3f1eb10f518874290623638cf4ab65cda3bdad7ac6875b37c15cae7dda5fa84f08204b5a64bd3c2de2a4e3b9e885fcfe3d0f5
 EBUILD pass-9999.ebuild 2300 BLAKE2B 9d002c0e8807479e45ad2c945f9c5c3976cb6ca4cc18e78cfa0c1d0f5c8025643579d56ba4eb6cc33690b92f33bba0cf7a9f0004c24de911bd37cfc423dc2ed4 SHA512 87a0d7170f0e6029fd1f80b0b001ca76598415cd0dbf488f5c2341c72ca49e4b37ec668999224d3976ca1ec8aed7a04487172d05277b0d5330149dbe8cb976b3
 MISC metadata.xml 747 BLAKE2B 0fa61ff5f87f66214e11c38fe1dd0dc746b8151bc201c72d972ddbd0f8e32dc89701798746df8e2c912eb0d4ccf43fc91d857dfc5395d184f4da24d5128f7b13 SHA512 5fb903b4d06cd49dea554f2a94bbd79e544840e4cce4e876b12eeaceb45aa6321a3fe50f1d531fdeb9cbd34dab66b2bf3ac0be52b07edaf62acf69a892c96200
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index 0f7ca8dcb1a8..ae678d292fa6 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 5c0925d4f3da..804f828f8e04 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -3,4 +3,4 @@ DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b
 DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
 EBUILD passwordsafe-1.12.0-r1.ebuild 1952 BLAKE2B ca0b8d7112408f3bb6ddbae81f910f22454246f8442b858e4f51108f9cb8b372c9d34d2375c60e102d5a811dd467b0b92faa8198401e961ca7a1c7775b8cec02 SHA512 3c830d1f384651b2f6153594bb589f954c0261a285f1df5c9ee7cff4e7c26904b7b246478761e7bd38ad395e0d542f66ef48974174406b486d75a8c28cf2ac85
 EBUILD passwordsafe-1.13.0.ebuild 1888 BLAKE2B 8e10bb42fb03ef98e3d946d2498b1265d142852c75f36ea1d3bce634991a618159edf9fba455cb56e730f8c28369f175108d731986c3e4e3a6bd158ee39c0e75 SHA512 712f86d94751e859a14281a5b3741e175c7f9a1002938ad31a374687a16463006c482d56f2096241f164f2954d556a63cf2a67fc78d865f6e98be9938de9e349
-MISC metadata.xml 683 BLAKE2B 9db2240d92f852ed50085280e3ddb947261ed7aaa9ed04784cbdf71c8e29ae79e1730cae298bcbcb75f82ebb69bab96695ba1a519487c92da399e1c7a98014a4 SHA512 12f06658b68b46cec87fe6842a8b94cd3c35b9e1d81e4aa447ec488358dcd37f5b3779c87d9fe0e4271f5f7e69550aa44cb815653acd502e10446e1842899e82
+MISC metadata.xml 713 BLAKE2B 7f98705703812e2a7148f5943d8b0c8e7a2f51f2bced2d27badbad478f87411c5dc3d7b37a1dffc7d21cabafa4b61650ca745b8d0bcdfafc7f15c46d363540da SHA512 31cacdb2b25093ee853a43200c498177d207027302a6542dfa095377e1f6834d1c40c28088241939ebe3022f122c0125a94e248f135c084a4a234b2510741148
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index ef0e2e070d7d..5f7a78fbeb7c 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index c61ea6862763..b774d737ea34 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -3,4 +3,4 @@ DIST perl-cleaner-2.28.tar.bz2 7222 BLAKE2B 8b90b6d7be8b21de3de2d946baba2ea96e14
 EBUILD perl-cleaner-2.27.ebuild 984 BLAKE2B e4598ae7ac19a0fce5b047fbba58fe8241f194f5eef4dedd11bb9368ab202cb0728339287053a3b111c11e3291d96679a6ca6a2f82f996ab08167a8b870ab16c SHA512 74d9e44da245bc423c6dc2be00678025c00679235af689c39f2f7849c3ec5423457396830cc78d011ab2127983bf040c29f42638a27faf9dcaa9ff36559f1741
 EBUILD perl-cleaner-2.28.ebuild 993 BLAKE2B f9a73433dc1cbd00680a8d8f7223e71e81116fc32e7ac2320a15438c398c97190240e0cc6c6cb02162c9e7ff486d5dac3357db885d466c01a0c88c4393812c88 SHA512 c4efd93545de3fdcc72cf298bb3cb2399ae235ee096f375a572999fe9a8636b05e7f7814329e381125792b9cc45bad6e54ee9a1cb278fd2c60367a70d9219993
 EBUILD perl-cleaner-9999.ebuild 993 BLAKE2B f9a73433dc1cbd00680a8d8f7223e71e81116fc32e7ac2320a15438c398c97190240e0cc6c6cb02162c9e7ff486d5dac3357db885d466c01a0c88c4393812c88 SHA512 c4efd93545de3fdcc72cf298bb3cb2399ae235ee096f375a572999fe9a8636b05e7f7814329e381125792b9cc45bad6e54ee9a1cb278fd2c60367a70d9219993
-MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
+MISC metadata.xml 247 BLAKE2B d94a568c950df425b54d5f8ce29c206c221f01e64654597f2d4a0f7bc86ea508797045e3fb6eb14bb8a2aadec08995d877434d85dc9e622fc6207d2df28b23c2 SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 408ad0201f65..7faa8dfe9af4 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -6,4 +6,3 @@
 	<name>Gentoo Perl Project</name>
 </maintainer>
 </pkgmetadata>
-
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 537459f34fe5..86aa1be045c2 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -6,4 +6,4 @@ DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c
 DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
 EBUILD prelude-manager-5.1.0.ebuild 1339 BLAKE2B 3776c3f0b0214359ccb7b1615228be29302c779753ed2d00ba5e561b98dfc14d5b3e66dc55709bdee2f4c8b39a35cd07da481455d275a179762ea59cc4fce285 SHA512 78c39f6652b94261270791f1694894532c7fdf79bd40f6114cd31293b7c2d17c5e4c2f4f2ad8ec8b4fa84dbd4c6416c6561f3bee7171baf24c44821713b64f02
 EBUILD prelude-manager-5.2.0.ebuild 1521 BLAKE2B 90329e6f955ff5e35b3f1d6139d27e1991b5db842323d48e0fc3b8f6897a3c3738f374a0089ce6dfda3ee68d4e17b9dad776b481e3fb22b31478515515c16ad8 SHA512 54cb983f67b3cf1b6934b22986437be8fb716220640d3a29e671f9a7845f1dcebe4f17c9e2bfae9e45aed241cd68aac4e248f81d85247a14c349bc69726bce81
-MISC metadata.xml 1037 BLAKE2B 2e4a2d969eac348834aa8f78859b7b4456585ab11985c6083640a6cc0d32269952a78063b5aa11c6228d9c67e04b50b58247b5c2787f7d484390721af0de4ef5 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34
+MISC metadata.xml 1067 BLAKE2B 4ed388278718ea367fc131793873842c8a5c411abbee6864ce1c0f579f4354a4fbc53a7736227d190c8933d01b67d8b0cdbb9c09660c27100b00627bf24516d2 SHA512 7628132d88ca59fba99162917f7449ff4b0064a3de747cf93b1f21c7ae080d7db436a8ba3f2d6b4c0152752ef71c345ad2b1520922be4e8cab70171c6e2548d2
diff --git a/app-admin/prelude-manager/metadata.xml b/app-admin/prelude-manager/metadata.xml
index 5990a2a5fbd3..c2d2aace9f86 100644
--- a/app-admin/prelude-manager/metadata.xml
+++ b/app-admin/prelude-manager/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index c85a839efe9f..54f84dcc6fe8 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,7 +2,9 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.3.0-1focal_amd64.deb 20876192 BLAKE2B 2d7b9925771c31204f4fe12253ccff0fb68fb1c475856c31b1bf82b4c1ef3f93870660916702e9acfe57235a4293d7807c24f80789310bc4efb9784c86e895c5 SHA512 79c72664795c37fe0bbcc0d96116ff073cc07154b5713a904602308e3fadb37bc1bba04466bd29877340e0d7707475f3cc38348e1811660764d18ed3c1d53250
 DIST puppet-agent_7.4.0-1focal_amd64.deb 20897448 BLAKE2B 1ed2ad91dcba1851b5759591033cfd74ec9dc644b3da416f2c1f5598b89e7cfa1048f09331717fc2b72a479ae8a7137f8f0a074debfbc183aea1197ae31b5df4 SHA512 bd58032f38f349938843550bc1e238f1cadec685ab6f90969e12e47e021fcdf4ffd4aa7be98fd797976d7873045444ba20b4ad3d05f543897a8d3594949c55f4
+DIST puppet-agent_7.5.0-1focal_amd64.deb 20900560 BLAKE2B a1f0e3da38cc98e677f66fd8887e4db1e1bd9d2af0b89597c0b1f2e569b78ccd8eb2d7c84c9cf5c8d03097dd6b22ae323ad7e9f989b06692a6ca7fbd28d5cf46 SHA512 250839f7d4a09545ae509273cbfb1ba004b8d0c5559b5312642b7483c605d32b7575c52b5e9a2b9d3f65e2fcfbf00f4ed85ee498ae9dc39629f1618aaab79361
 EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B d893f6cecbbb3faa8187747190824616a34434cb7dab5764821def19f999eec9d548fb6f08bad8fce2e757bc7b3b0a91f765023c2a227849cce7aa6f061c794a SHA512 f4129cc0d99c3c933d4a6054aee09588aa128101e57588e50a2af7341dd1beda29463f523f82478e3975ee8eb9fad04701a98a0e6cf3bb062779afe214553407
 EBUILD puppet-agent-7.3.0.ebuild 1916 BLAKE2B 7d798737797ba2c8639a565c783589d82e6f85afe6964c09fb6dd10d5d57411fee768ad6163089a097da061bf51ea36a60aff9541a1222cb2a27deff8a737c4b SHA512 88abd5125df58d005e53fb9ac6fad2868921537ff53e1a98db6c545ecdac57fe87f5601dff0564baa6e81560719c39986362f81527bf993bb062f5ed426b1114
 EBUILD puppet-agent-7.4.0.ebuild 1916 BLAKE2B 7d798737797ba2c8639a565c783589d82e6f85afe6964c09fb6dd10d5d57411fee768ad6163089a097da061bf51ea36a60aff9541a1222cb2a27deff8a737c4b SHA512 88abd5125df58d005e53fb9ac6fad2868921537ff53e1a98db6c545ecdac57fe87f5601dff0564baa6e81560719c39986362f81527bf993bb062f5ed426b1114
+EBUILD puppet-agent-7.5.0.ebuild 1917 BLAKE2B f8534db7526cb76c6c294e4077d2ef7424eeb0f468c8ee72092c8f21db155e1d0ff2dd7b8e23940eb3e9906f79b64bbf57fb6f2214da34df76a0c006e3e7408d SHA512 74f66547f034c9a416c861384ab524dbc856ebe272bc3a1b6599c0310f596d2d2c8be8681b9e4e95a5d735345012035e0c27beccc7b21e9b7b059c42d7876e4c
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild
new file mode 100644
index 000000000000..d48586e2c6e4
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 75479460bd75..d3569e8a9afd 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,9 +9,11 @@ DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d5
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
 DIST puppet-7.3.0.tar.gz 2855997 BLAKE2B 38a02a036d82be3ae727f7433b80ee1bdbb66f6fe10dd2ac37d3191fa6bcacac8cff84ae048d449564703448a87860fd9debdc043a47e7dfbcab69f6dedf479f SHA512 811e2a182af7bc8038750d99feb526b261b6c3633d5492fc2e14ab9f8902bb54d3f651730efb6f06001b96f550a9957d8604ffd30d489f038200d1359d91e98d
 DIST puppet-7.4.0.tar.gz 2857763 BLAKE2B 980180d10c3329f8c94f02c6a8b403d88a3836fcc5567fd00eb4e2b4ae63d7a03709f3f14a337cdface62be04f9bb9082436f69b95f8d37996a9a933801a163a SHA512 ffb4ffb5121fcbd4b61ab1ad51fce96c1f2415b85ec785c858721a7f5604a6a8de4d595b6806657b9b1757e70763b2c495ca4d8ee694d668532cd15dd38a9c7f
+DIST puppet-7.5.0.tar.gz 2859905 BLAKE2B 59c6b8fee0ce13b1aeb7a59eab21e84835682e606598dac79a838d514352988d260f610aef0f0b00547a141c503f8779668006d109c3ad86133f413b57309adc SHA512 7b3ac681a91160055e4b26c904153b0800f55222201a83e8e5f20d74a7ef153e6b029ab59b237726f20576379ea7d81e64e24126e72e8f709bbc6473c3c0793b
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
 EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-7.3.0.ebuild 3552 BLAKE2B 14aaaf8c7a30bf347ebd26aa83c000e329a63eec65b00927b8b2e53e5f44d610079fe38d1353e31467302f6c5aad558263ea045faaa564cfef4aa8995a8fea16 SHA512 29bd219cba5000e6a68f8e64bbd1db27e8df220d70288ac76b3258712c2343de636f327aa202e8be8d2dfd1a94aa0ef87cfb72438cbb501bce6162fb7f8a0ec0
 EBUILD puppet-7.4.0.ebuild 3552 BLAKE2B 14aaaf8c7a30bf347ebd26aa83c000e329a63eec65b00927b8b2e53e5f44d610079fe38d1353e31467302f6c5aad558263ea045faaa564cfef4aa8995a8fea16 SHA512 29bd219cba5000e6a68f8e64bbd1db27e8df220d70288ac76b3258712c2343de636f327aa202e8be8d2dfd1a94aa0ef87cfb72438cbb501bce6162fb7f8a0ec0
+EBUILD puppet-7.5.0.ebuild 3554 BLAKE2B f9eddf609044df429b57035d3f2b19bcb90ce3f3a5c75d6196f96035c2d23b98ffad9fabba74178742bc65b78dfdc84ba7a7f20e9b4549862219183fc525fee1 SHA512 e27b1130decfe5da1b51cbcb9c915403b588e37c2ebd9bef78f2fbeed1595cd02f99d3bd73d3e0c3c24631656b4732b6e5a5a8bb63f2df17689d980c44493160
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-7.5.0.ebuild b/app-admin/puppet/puppet-7.5.0.ebuild
new file mode 100644
index 000000000000..5b564665270e
--- /dev/null
+++ b/app-admin/puppet/puppet-7.5.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index e0ee4de4dbc6..a62540460662 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9
 DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d
+DIST puppetdb-7.2.0.tar.gz 47126306 BLAKE2B aa9213b3a6e7438f7f70c73d14d5a264fe8d45f41d15a21eb457f4264599d4ffc02339b1109aeba713b7afb09780a7ce66786fc03d27e49cd0786cc81042d36c SHA512 872ebc8caf5c9c2f9509f603809c942ef8b3fc0bab96dd39a51558cae88b07318fadb81aa2f8477d231c7caac513b304c6aa178deb3aa56a4a5f7a9f1917d90c
 EBUILD puppetdb-6.13.0.ebuild 2647 BLAKE2B 210c1c51e34c16766e8f1cca2c94c7e5d6a0e60415cc0fa1691f1b85dd7d088bd540cc24e7318ccc224763c5920d4823b760d5c4cbd78df2c050612b6fd923ea SHA512 3e773a22cfc7fb7b8bf0b038a9641077af5d819ce654bae935d0a7b67840f39c2e703477d91d4f09091337f2bcab41679a6aaa75f76458897e99b94856c611b1
 EBUILD puppetdb-7.0.1.ebuild 2647 BLAKE2B 210c1c51e34c16766e8f1cca2c94c7e5d6a0e60415cc0fa1691f1b85dd7d088bd540cc24e7318ccc224763c5920d4823b760d5c4cbd78df2c050612b6fd923ea SHA512 3e773a22cfc7fb7b8bf0b038a9641077af5d819ce654bae935d0a7b67840f39c2e703477d91d4f09091337f2bcab41679a6aaa75f76458897e99b94856c611b1
+EBUILD puppetdb-7.2.0.ebuild 2649 BLAKE2B 93e811d338631f32fce739bbc2692bfb5b6b9aa93c6fa4705faeca5921d682612c813559a2549c3e78efb37a80b83e390ba27b809c86e82c2b80f160bab4cec3 SHA512 9f82fdfe9efa7320db27fe81b1212e7ee960506e9da28ca9b2e65089d214b7c7e1ab1127cc7fc1d9671e2296792f6cc24a81b22659eae0b140cc020cfb04267b
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-7.2.0.ebuild b/app-admin/puppetdb/puppetdb-7.2.0.ebuild
new file mode 100644
index 000000000000..78bd75a0264e
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 974847845eec..0ba7ff6400cd 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -3,7 +3,9 @@ AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
 DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
 DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733
+DIST puppetserver-7.1.0.tar.gz 62812783 BLAKE2B 3954ebb11c1ac62451a103507feccf829aeae20a1f8ddef5892d902be0fee2b6fecca1322e7c2d160935cf762fe2eddd31ea433b2cfde2edf7743e7f27066fea SHA512 909f2d40f13e7fbc6e53e482f596fae15dec5502709d107a3a1963414a609cc6751e0688bf3324f94d987c7405407d89a652197604ae0dc80d656628c49a3e6f
 EBUILD puppetserver-6.13.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
 EBUILD puppetserver-6.14.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
 EBUILD puppetserver-7.0.3.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
+EBUILD puppetserver-7.1.0.ebuild 5326 BLAKE2B 1ac5bd0287581c9bdaf1de5cf664224f33041661f1c60f78cb62a16a3dc90861c6618b0b77bab7a8c62a29bd3f70ae8b33cba2a93aad586a24dd4926264aae63 SHA512 ac7582cb40523158a82ed01e696cdb34ffd86b34a846afe6424419541bf87d520d094279300c6ec681f637f7096069a13565aa43d0beb448547343ac7b3984db
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.1.0.ebuild b/app-admin/puppetserver/puppetserver-7.1.0.ebuild
new file mode 100644
index 000000000000..0cf80aca0efb
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.1.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 9330a1304731..55b24f1d09dd 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
 EBUILD pwgen-2.08.ebuild 593 BLAKE2B 1dc18a97bdf839a9860a900c8e7a8fd1f989749347b50e799f4ece6362db92c1dd0fe359bccdfff1ee31aa6c8b05e7adf02e4b3cef223168f1ba00e13caa2f82 SHA512 e2ea733486d2197e4c295231d9b4560b2a8ed7a54376f8b04ac5bb9976aa4ab7c6efd83d23aff61eda4a1215c6408ae6c31435b444985358ebaba30b95e6cbab
-MISC metadata.xml 770 BLAKE2B 7c31186239b8def87453795145d9a04b86e584736503bb02a5a2802bffb514d410c5db3ef7025551a63d7fb4d7dc8a054d5ffe81472be48a2d82fca637b9dd2a SHA512 c1cab2c493bb0df17ad27b77c3f66845ad8a51da548cf6c1f6572a2bda1ba7728c32ad8acb0ef54dc2b84c0d9540efd109e0e74fa48d87b3d0f2a3bc09a0d9ee
+MISC metadata.xml 800 BLAKE2B 5a0d864ef0486780ff7b3c11b2bb9517b44cffd9bca0e2f0a271c7ac5706908e68aca646f88a6ff2c4e946decc5857488c56a1fd116ad5d23e75af519d870db5 SHA512 9b373a948f74ba60d4ac120115cc9f4f2f9c4823ea679227693d725bdfb83378f8f2c279140ef34f6dc32a5c2ad093688a4db21f3ec07f73c7753fe741a17e93
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index 82573aaa4a7d..6728bc689ce8 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>julian@simioni.org</email>
 		<name>Julian Simioni</name>
 	</maintainer>
@@ -13,7 +13,7 @@
 		<email>releng@gentoo.org</email>
 		<name>Gentoo Release Engineering</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 3d14bf299f37..82246d3c0933 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -2,4 +2,4 @@ DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523b
 DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640
 EBUILD pwman3-0.10.0-r1.ebuild 887 BLAKE2B 99dfb409141014b98c3b44ef19c8a118ff3d8f042d1f9176238937445fb854179246a01e655fc6e2d4b2345cebd7a8293a2b0ecb1f72ae80862c9ff9cae88ffe SHA512 ee76c7e8122e52526ca999d91f58e1d9cadf916d7c3205c8e870170868f283f44a0422abbc299b959a499df1b860a34c7197b3c9599e62a9c97a4b015ceadf95
 EBUILD pwman3-0.11.1.ebuild 887 BLAKE2B 99dfb409141014b98c3b44ef19c8a118ff3d8f042d1f9176238937445fb854179246a01e655fc6e2d4b2345cebd7a8293a2b0ecb1f72ae80862c9ff9cae88ffe SHA512 ee76c7e8122e52526ca999d91f58e1d9cadf916d7c3205c8e870170868f283f44a0422abbc299b959a499df1b860a34c7197b3c9599e62a9c97a4b015ceadf95
-MISC metadata.xml 913 BLAKE2B e7a041ce4293eb3bab14c466486960eb3d3268c77cadfc88612844fb0c5a599dd6fac5464a42f2e417cd0e56210020ce9002f35eaf5c2350c0a39158b01b8e84 SHA512 bb1aa91fc1f1e02865cc8de32cfadde8374dae91dd75f060289b0f2e5754ab20e9929f541467d5b369cdb4daf83b25235f1f613e89d1871413f619012701327f
+MISC metadata.xml 943 BLAKE2B 915b2bf435f987895b0f8245ebe58eaf8acc72c530dea6a305e0d40ccfea68e9db8320098d0c2726fe3174d21a266578b1c94b036c091afdfc40cd4cdc2c5ee6 SHA512 3bd8f02d95a52b63e27c7f7c245e7f59c86066a26bd7b24b4e7b5378e0455824a05bc7060b5d242c8395d4b47f8309a984edf7cd2a1f01c2294ea4c3b2df6beb
diff --git a/app-admin/pwman3/metadata.xml b/app-admin/pwman3/metadata.xml
index 9b3b7313abcd..11e286b3f482 100644
--- a/app-admin/pwman3/metadata.xml
+++ b/app-admin/pwman3/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Oz Tiram</name>
 		<email>oz.tiram@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index ff0ca18e7405..2f24f70b919a 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,3 +1,3 @@
 DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10
 EBUILD qtpass-1.3.2-r2.ebuild 1247 BLAKE2B 705b02148b5f4bdbc47612f522ee7b7fbf085059c536033f5830d095aec52dd7a61d8c1bc7b70e8d9cde5bb5f6e887086db9e9129ef58459041546aeaced56b8 SHA512 b88bc2391bc8b6d4f656dddd28e2b56dc32170113e13b7f6eafe2d0bf84623b6075905343cee34c293c16d6562b0b91feb41a53dee48581903d687f3d2c7b375
-MISC metadata.xml 454 BLAKE2B 0b9a8efdf75a49e472b9601c99efe53b4d4e8e91bab9182f6df896b514d7c72b15d49cf593d4cbe317ba227ce8bd01f64b98bbaf1ab1213b7c1d886df7feac7c SHA512 3e62cd6dec1e391f571deeca59ca712dba9bc015265ed40bb4e87a141a4b0e31516340705d0ad7d52e4ddf2e4bb004544228862f27b01ff867ad88c92ef2d9a5
+MISC metadata.xml 484 BLAKE2B 11240d56e66f75e6f04f262e641803a925ad9b4d4af59156fb31ce7abcbb85308ca8d45709232e1619fecdb296590e5376b61bd929907c711d36a7242f07f670 SHA512 3fdee9d3e2b7b95c063872838b3ae07e07ee4875d262b800d95a85f6e8b07daa19c89822f96007a57ea8f9032e9709b00f2cf4df32183cf42237b1da1d633b71
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index d8ea83f2434f..a95aecb9dc6b 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index 364418e93692..d86b62b02313 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -2,4 +2,4 @@ DIST rcm-1.3.3.tar.gz 92193 BLAKE2B 42634fad58bf75b622ddf593cf83749113ffd35cba6b
 DIST rcm-1.3.4.tar.gz 93200 BLAKE2B 13ed8694e67fd38e9547e310d50b917566889c74b133446b4384f80084036d62130ffac0b3e17ca6020eb8909193f6095ac42a9d360c7f2d529b31253b87e2d3 SHA512 347facbb99c08ead942a299ef981a22e4e1578235d256343a91d1f0e9ffcda8e8053d6470861538a7435fdff2a176221a17222858eb5e0e8c5c4930b399e7fc5
 EBUILD rcm-1.3.3.ebuild 416 BLAKE2B 85848bef660645e77648d5b43a08db67bac029f715ca6881120ee0a90778b8327aed1352ec306de4b38eccb5db9aa0a37114e26892d2fcc84cc2e8604d72cb53 SHA512 8e1a547e68565ca4ddc011e716116dae636f6cebdb7f1f2627897fa6a8d087fcb49364add248891d2260932df95d0e90189b8fb93ae4bde472606268386f19b7
 EBUILD rcm-1.3.4.ebuild 416 BLAKE2B 4c1212c558b43b96fb992f32458999cc83256c6d3044294e84212fdf15d862f41ddf5b9c91ea9e1c148c303d09e3f4fc2868550c2f7ab489547cf989358b1dd7 SHA512 62f70fef380fa10e2e55824808bc262571a9725ff71a71d625c872ec615f897c026843d1a9ed7bc0775f685bbe7c5bb80b1c3ecf6d9cad3a98198b1f8d74634f
-MISC metadata.xml 440 BLAKE2B 1edcf43bc0d329398cee6c04622b7bcc00d6fab4477cf99f63a7eba25b43daeef01a6f5bc59bb0b57718c0a5975f823e1abab3a95a6d1765c5b819eff27c5384 SHA512 55fa56c5a9130a6be54237acc017b15e2316006522985906788a4a33078f2580b705bc53f2d488b3b5ec6ab4a08dc0749658315cbba812fb5d9cbd04bba5be11
+MISC metadata.xml 470 BLAKE2B 8695c4b94a78d67436c9d81c0eff7aed9e58f8671a0e42105bb15b6d439f6249f826c91697d98bc6425fbab178f4679aa183a2d7a2164a110f1fff1ad67b83a4 SHA512 167943d5306a4fd1a4f86c073a5d93acbd25e8ebb35255ef2d7d7e7be4eeed720b6d07163b5c6aa01c7eed54c2400148d3fb882afa45102243eac6a8c92cd6a4
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
index 183ef0bec54b..7f1bec8cd79a 100644
--- a/app-admin/rcm/metadata.xml
+++ b/app-admin/rcm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fgtham@gmail.com</email>
 		<name>Florian Tham</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 9f995567b945..ba7cdb9a10e3 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,4 +1,4 @@
 DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc
 EBUILD rex-1.13.3.ebuild 6372 BLAKE2B 3ca5d4c6814713a982bbc586a692a2b5359bf3fd9921b5258c58e20dba724ffdeeac256084914901889e53b7ce901b6cba82300be151b7d95818826d3d429b44 SHA512 c04ae719fb294bfcd3e2761c56f82804007b7e395c9bdf913f749280a0552e327d8d4163c893e41a17efd4c7af688ef18f7fce14edc074f4b7f42d4c4f92c8a0
 EBUILD rex-9999.ebuild 6372 BLAKE2B 3ca5d4c6814713a982bbc586a692a2b5359bf3fd9921b5258c58e20dba724ffdeeac256084914901889e53b7ce901b6cba82300be151b7d95818826d3d429b44 SHA512 c04ae719fb294bfcd3e2761c56f82804007b7e395c9bdf913f749280a0552e327d8d4163c893e41a17efd4c7af688ef18f7fce14edc074f4b7f42d4c4f92c8a0
-MISC metadata.xml 23982 BLAKE2B 1167b4f76081e6fb9470b782c9f8b0faae87244cdda4f758f59c3b97ae6cead45d36c4bdb4021841d00d36006dbc70f4594f4f4c2dce334d0204ca456740f408 SHA512 b85457a056ac8f9b52fa3015af1990943468b82ddb31b8dae94aa63a8eefc831d5e5b884479107329f2a883e932587a4986810082c470ed4e29870238850d985
+MISC metadata.xml 23996 BLAKE2B e168b5ecd856cb94f71ac6b49a695b376be4823c6fc009d04a0230a09d930cf96a57b7a72ff0ec14e3c4e09bafa1aeabc06927a746051b756a4b855fc4aba0c1 SHA512 432480499c91ba14994cde0ecd3d07618ae53ba9046893d0c2efe38c1e9946ab7d26746af86b854903f3b8dbc34403a3bf4b84070af77edf021d6e1ff5df6fbc
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index 33feceea4640..3e055b65d18a 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 57fa8d10fee9..9b4086b3e747 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -2,9 +2,11 @@ AUX sagan-1.0.0-liblognorm-json-c.patch 2472 BLAKE2B dc04f9949709523c3516d7b9693
 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-r2.ebuild 2422 BLAKE2B 0509f1784c9be4175dcf87f837e13b5c990353cfa408eb540e139a0286f8ac76138a332a1cc6923d6069dfe1e25f3c9964d858fcc47220714368b21eefb0f253 SHA512 1a27436452ef3c9615dce99af235832b2c477afe6a2348f545d73c4a2c703c39532cc0d59bc2959c700724a67e404330aa2e12d40954aa20e3afb5b9e03600c0
+EBUILD sagan-2.0.1-r4.ebuild 3219 BLAKE2B 2fa76b99db74c9b4e74ad01f8b0dcf40d186c55cd8345910045b67723db4d84403e765e28312c0ff2ceb708a2a3713f4ab0dd6e91e20bb8a74a96c18fbde1a02 SHA512 e31b945927f06265217a76c3f597f9e15d841602c3eb1e5bfa53afdeb3ff57e8032f91042a4cd9a9ed5efa020ad0f9b5bf0c35aaee903ae399447127f0024bfe
 MISC metadata.xml 805 BLAKE2B fe11cb2f2a1d73d2c8da9ef9df8abe1974e4e8ac95a0c91e3eca63828a3db2f8872c43961af2b279a942e299c1b2bc7a1ecd781b3051d92775339b2653c27ee0 SHA512 9a85b9166631c8522f4939876af5a9094f1637659d1ffce0c72707415a9433e0075cc240e2222e101640e21e9fc6f514c37d347915831254edf8e08e7239042d
diff --git a/app-admin/sagan/files/sagan.logrotate b/app-admin/sagan/files/sagan.logrotate
new file mode 100644
index 000000000000..2db6afd0ee0e
--- /dev/null
+++ b/app-admin/sagan/files/sagan.logrotate
@@ -0,0 +1,13 @@
+/var/log/sagan/alert
+/var/log/sagan/sagan.log
+/var/log/sagan/sagan.stats
+{
+    compress
+    delaycompress
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /sbin/service sagan reload 2>/dev/null || true
+    endscript
+}
diff --git a/app-admin/sagan/files/sagan.tmpfiles b/app-admin/sagan/files/sagan.tmpfiles
new file mode 100644
index 000000000000..e6ab42e8ca13
--- /dev/null
+++ b/app-admin/sagan/files/sagan.tmpfiles
@@ -0,0 +1 @@
+d /run/sagan 0750 sagan sagan -
diff --git a/app-admin/sagan/sagan-2.0.1-r2.ebuild b/app-admin/sagan/sagan-2.0.1-r2.ebuild
deleted file mode 100644
index bc1c370afaac..000000000000
--- a/app-admin/sagan/sagan-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic 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}/:" "${ED}"/etc/sagan.yaml || die
-
-	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
-
-	systemd_dounit "${FILESDIR}"/sagan.service
-
-	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
new file mode 100644
index 000000000000..6cd0b6adfd46
--- /dev/null
+++ b/app-admin/sagan/sagan-2.0.1-r4.ebuild
@@ -0,0 +1,134 @@
+# 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/serf/Manifest b/app-admin/serf/Manifest
index 46ec28a4d47b..fc86d6d8fcb4 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -2,8 +2,143 @@ AUX serf.confd 240 BLAKE2B 1eda4261a82a35e8b70cd0192180b4f3cf534656fc96092643b52
 AUX serf.initd 683 BLAKE2B 3e6fcda3250eabcec44daa3b51b36fff0cdb49b4b232123d69b1e29b8100874c4e126f5e3aaffebcac898651f4f84a8515308422b867e55a79f189c4d9a322b9 SHA512 a223d1e002eae3f91b941eb75a2741bb5fc22c78f4ab8ada430ee5e34f85f28410acc26e503eae672911161fab6847c6a7733b51cdad29fa4b4f67cfdc879597
 AUX serf.logrotated 81 BLAKE2B 7f09c81d7efa52d1e970b0603fa2c89809aca99166efb1026e0794957dfd4229a961a345e27da045c2f34ab1785e6e2bd5e796d32814787244656e97ad5cb518 SHA512 9d3664c123e846de81a2f574a9c2610e254d5ddad1c23b67ef7b8841e933c7aea93a419becaf45af9594ea98ac36d23883bebf3d344205c4756f3e1df9e87518
 AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3aaea9cb4c43b3ea164804f105dc94a03aa8e800228db9d2007510885cddb82e50b41d7aa8927ed SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 17980 BLAKE2B b0947bc6a71032e97255b113d70760d85eb09f72e8733a9d660b5b45b7eb3e2bf67b00b57c674a3b6c1a90388e7e80569ac8d36ff5aff7d50af9f7c28f22c3aa SHA512 d30c86fa4d25a5f542ef349e0ae2fd4579de5c3c1bb69ea3cd1bf20978a772ab9934ca68e01b9e5db2e5d8d6d7cfa96a4547ae7330e97c03670ae1dc8585bbd2
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip 62565 BLAKE2B 81458eb1985472e46b2db22532790ea707b1c1fdd55a26df8cd371966a8ce672d35aaee79dc1984f3ed7c2ffc6d303c1c0132f7ca28487fbb379ef6e70cf34eb SHA512 4e898272a286e7abd48722e31c8f256cefb377d22bb8fba47db0bdd8d0a871659cfe1589d0d0254d7bee4ac9aa4edd5ced714546a5710e6dfc66d1f961e0f12d
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
+DIST github.com%2Fhashicorp%2Fgo-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-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 130743 BLAKE2B d7e78c75b2a9cf89b07fc1c1ebd0f93668d595e21d13f45fe7cb98f09a8e7539cbc2acd2d14527370c6d4e219c0d5dadf414a8504930b499dd306a08117d774f SHA512 718496a1cd900d52b314a0113729906e42940f9e3caed0f989f16d7e28a5b8476400c00917f05e669737c5c45da3af95741c99a188698b628497ab2eb18ec49b
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 525053 BLAKE2B c667a83b0ff18782c883406910620d3eb32b541043520e782953a71c33ebdbdc149612f87df68fb645f72db9c888c1d0ea8165210c35498bb840b9047ff0d1aa SHA512 5e60b4baa404de9210496a710ef1bd73b8795f679c6079719d7ff30c5a545f9ee407108981a3019bba008100f35b722f9eade9e48c09df4b8a245b0dac228ccd
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 14575 BLAKE2B aa85d696951ae3aefd27eb419d146d6475bd8d9039d2385fd44a1ec7d0ebda4d1d82a7cea586a6090d67b0d7f692ea958b62ea1d8d75caba640ddc58469b7996 SHA512 498f6c6cefcfd5558cac0f3485e2a11f4ce9aeb9ccf4d9c460354da5268d17bd5a301ac60cf93d73062a236330d254da8c2ca02fe0a339d25f9a70fe064ac610
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 103250 BLAKE2B d322a7ccfc3ca434f8f44cc07769e4179197d1d48d85bf7c4e666f9a6c12640dc4196937af09ba7a07c9da1bdbba5749f2c37744ae28b7c526174aa7af072866 SHA512 af29d68cb9eeadc11a5d0e9033ac0c9a9aa9972935b2cc7eb76e951db9b12124f16b0a6ad91a5990b37c08c8b39258f32a9e63afad75e114fc853ec89504db93
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 19998 BLAKE2B 744a88d9e7abc1a41322870a5bf3cb7f132c768f29975271342723f7395b2d29034be3f706eb239c8b3c50874c5512233be3fa0deedde611805e592bc2992957 SHA512 a81874721f0491ef2bc82d3c3a0e40aaa4db4754d04783375853b05d29f3e57b01df01e81d786771c6612024875797ac7ea6a3142fc0c6957ffadebb4b29576d
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.zip 19493 BLAKE2B 225ef4b00c72d940339165b6ece105ab8c7cf054a0798aedbd1a479f8b3f44560552ddbafe3185c5b49bcc8894764634eabb096b3e22f0e28b74e7455a587479 SHA512 60293937f16bc9e9c466eb6b33e17c8a2b533ade698c804d757192dcea5e744a4e6762755624071c422825c5d7b533c5020a0e8c8213b0ed8eb32f99e6db8a7c
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip 30137 BLAKE2B 0a91beca32707841cfe1369c4139ca20fe8ad59c60e029ab9aa81f1473f35a52bcece594ada0b5c39a7c74b7e5c242f211516a325b89e02e7f1fedc7c8027988 SHA512 ea36b27874c4cb46a27507907458e217c72f988f857dd43986bb58317d9564d6b2dd7ca84f6e70de92030114b3e6893dea61f315535254a826f897b60cc9f601
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip 33879 BLAKE2B 2941a11911a8b9857e5dafc63c6477a1fa80dbc7118720302735277d9d10d292b0da58575da6a3a961a517912079a7c55d7101fd1e401297b189e06623c15299 SHA512 e88934a079336ceec1566612c97e0e5b0fd38fdf91377917d92208f39415c0ef2503fb3ac8923af4dfc43e146a71b5e28d4ad810efed32ffd9831e1e2aedf495
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip 5643 BLAKE2B c6fff7979b6a647b76551dfb80f7e61f7b86cf2c1e70f58d6be6609af8197119dd562acb78a395d7e62cb22fc2c60c4c69a036da7cc30f6990a01900c71284f6 SHA512 ed6672528754c42370277b8ceb0f1a06e2b36cfed8526d077192d71c9412430f338612671a0a0c807dee15741f83ac6cf1225bb900194758b736466fd95d3cf7
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
 DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip 1762275 BLAKE2B 5025486c3ccef3c6967216f6ee8dac5416f37ce22c5f8b3236038100766b768278c5beb2f1483d89111f24c81061fd79231bf8b26cb0170bb340eb77f001af6b SHA512 8605ec4abfddbc56652ad2106863f5e316708f5bd055cc28ff557029377b4f9df98215a1fa8c8832b7bc7f959d89d212b663e7f6dec725aa680dc38813f7fe8c
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip 1825975 BLAKE2B 8524a8f4a8a97083e7f3e680b5882b417f8f13fe989361e25f785cca9c7e26214f643b47e10f3827eab878c783aa588864ef58972d34db1a8a788726cbb19844 SHA512 cd4dc434a7db8bec5cc82fcfcf19c7d2ef46314cdc38d471069a03e5bf24988f159fa1bd2487b02bc95ee1d5358035f20dc663b7d5ad814e7c9bb468307ff20d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip 1322810 BLAKE2B 5457e6fe2004a8b694d792518f1f707c69ce44d005d7c2f6623a0fd36eb099a683022677d6042861a891e421a594212c979adddb56bee840bea15cac9c8de5e5 SHA512 2b34a5da99f3d41b13a7a8414d5948aa15b584beb1ff3e650fa99ec53f23b17b914778b0523b19f8e06623d9c8240441334c5e4026435a9201b8bcc9b46e29a4
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 24746 BLAKE2B 743f3b4641f002cdfec6805ead87d196b43a4de1ec59c788f8516f4bc78ef2d58fc8f0cc34a52e8762f39f0845470dfe4e50f269036576d021d65a5f30aaf08a SHA512 f7622fbf44dcdf894cd397edc8399e38b734cdfc6a6ef4f8e81af9408c9d912a1b96544e713c42237fb3116e70678755e829da8f5f628bc1cbf6767921cd380e
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip 1435633 BLAKE2B d1eac5dcb4b5717d6b87984e51d9a11c9fe763b0af44b75ce706f5ae7bb9f733266768a51e874ee5f52c151f126f2c16e1c14fb2e3f7fd859a263d85b6b8acfe SHA512 ffaa302839b9a3e09f1711a5988d06f04d609b8f106c0ae13a301b4b5a26fc19cba9eac170b8df0bba3e2ec9733acff4761cc2a050238ac0138ab3ec6ff31769
+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-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.zip 1846026 BLAKE2B 4e3ef68bf7e75a37f819024dba92027ac85109b3087282bd03db1c0a234d4ada2f9aa8f02d611fe96b015bf2fd7cb7ed9d8354a0abeddcf89c0905ed20d6bebf SHA512 558185afea455dd7e96423174af16a6df90b528189065d2ea9929cb20fc9268324c4eb347b23b97dbb48c6ae72c4cdba88327bcf7a96a838815a5b945467c762
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-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-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+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%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST serf-0.8.1.tar.gz 1445011 BLAKE2B 5fcf1e3e87c777852656426529daab4ceb3e997d70ac54d81f48bbea37ebe2dab9c27d0b2fff3c4e031a7995eaaa25378ccbbd359ef0cc265cc58db4ddb25c21 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514
+DIST serf-0.8.2.tar.gz 1969342 BLAKE2B c9dc51ff5547edb0299907abbfe719c7286ce2bdfa2a79d04857c339ea481362f6406320f1d20b61362eb8b243f6b19fd51414bbffddda39cf8911eb776dce4a SHA512 65567753e642e78bf1b33acb7ba75f08bb5eb5e3e8f0482688617ff84985de28297f6c86336a1a9bc203f3275b4f36210e1cb50c556f2f5f24be9ad518876469
+DIST serf-0.9.5.tar.gz 2301292 BLAKE2B a3864aba7962fd19223d7fa2557298bf5f4c7f1afa3e72bfd131f815de09c5d9e67c5d01589519ffbb019dea634afa32c458a75c25e0cde82e647eea9ecf7f95 SHA512 a527d9a257365242e307af171f1ead1fd4fa302f6ec7774aeac508f98a422da649533a7b16843656e322b42aa20d900582df5668d14ef2d20c24ec9722d06383
 EBUILD serf-0.8.1-r1.ebuild 2103 BLAKE2B 2da8b75a519b39ada23d07d65b481cfcbe5f09536edef531b177315529ceb001fd3e766f255008b55e636fb958e49780db16b14b129aae55f4d66fdc89e33d05 SHA512 234045563ab81168df44440cc4c496e8c5933ab4229d3d395d0dc1f8cbbf3b78783b60fd0c19e73ff7cb4b795540470552ef5bf11d399ac7946282cbeae2f131
+EBUILD serf-0.8.2.ebuild 5095 BLAKE2B aa4364402c7b450df15c4c2a03e273a2cfe9f58dbe255aef53fcb7c1e12e2508f2295f8e20fcb1691709744446952aac091e6c68913b416df9c793b692eacaac SHA512 297e462f4bdab599b65e4009dee06a13f1cf934c8e89e78185f6969e22d219d7de32deeed803d9601af1719c1bdabf6d36edc22e31b35edcbdbd4244efffc87c
+EBUILD serf-0.9.5.ebuild 6944 BLAKE2B f23f5428f04c45f2bdd51f47c1f45813480003c99a334adcf10a7803f55fa4ceaa67fa0400453c0b0df09fea95817e1f62bec27b8977353bed20cd5218c17581 SHA512 b20ca0b2f61137373c4777d5a580def9b60ca10d5fb5627c319fdf1d1eec5750ef4a4189ce29b556e49db72797682e9a07217c134cdb704dd3656a4dbba46f5e
 MISC metadata.xml 297 BLAKE2B 0d2ca75df2b4667d5b2cfcc0b17ef36c88d2996e661d3393eed3ea61c256a760c4844d9f99c4b280a8409e288392689ab17f46adc40188134307b7ea6060f9b9 SHA512 a4e75bdd3c86842ac3de4852d00f264e877c9784754eb9b2d4d38c39123115ded6beae61628b5315d7c19bfbefd1e0360491b37656e34a87b33498b246521e76
diff --git a/app-admin/serf/serf-0.8.2.ebuild b/app-admin/serf/serf-0.8.2.ebuild
new file mode 100644
index 000000000000..5d36502be39f
--- /dev/null
+++ b/app-admin/serf/serf-0.8.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SUM=(
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.0"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/fatih/color v1.7.0"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/mattn/go-colorable v0.0.9"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.3"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/miekg/dns v1.0.14"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/mitchellh/cli v1.0.0"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+)
+
+inherit go-module systemd
+go-module_set_globals
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
+IUSE=""
+RESTRICT="test"
+BDEPEND=""
+RDEPEND="
+	acct-user/serf
+	acct-group/serf"
+
+src_prepare() {
+	default
+	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+		-i  GNUmakefile || die
+}
+
+src_compile() {
+	mkdir -p ./bin
+	go build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/serf.d
+	insinto /etc/serf.d
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners serf:serf "${x}"
+	done
+
+	newinitd "${FILESDIR}/serf.initd" "${PN}"
+	newconfd "${FILESDIR}/serf.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/serf/serf-0.9.5.ebuild b/app-admin/serf/serf-0.9.5.ebuild
new file mode 100644
index 000000000000..8de97280f87f
--- /dev/null
+++ b/app-admin/serf/serf-0.9.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SUM=(
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.0"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/fatih/color v1.7.0"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/mattn/go-colorable v0.0.9"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/miekg/dns v1.0.14"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/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-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/yaml.v2 v2.2.2"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+)
+
+inherit go-module systemd
+go-module_set_globals
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
+IUSE=""
+RESTRICT="test"
+BDEPEND=""
+RDEPEND="
+	acct-user/serf
+	acct-group/serf"
+
+src_prepare() {
+	default
+	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+		-i  GNUmakefile || die
+}
+
+src_compile() {
+	mkdir -p ./bin
+	go build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/serf.d
+	insinto /etc/serf.d
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners serf:serf "${x}"
+	done
+
+	newinitd "${FILESDIR}/serf.initd" "${PN}"
+	newconfd "${FILESDIR}/serf.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 89df51f03651..df42190b0458 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,3 +1,3 @@
 DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
-EBUILD stow-2.3.1.ebuild 694 BLAKE2B 14f6bc41c07a25167652eea7b9fc08ce6498403395bf5fc5a2a0679350b04c2d0066fff33f165a1331fbd94365d9b826e50bfcbc2ceba445346df4897663bf2a SHA512 26ba27b119c33986369169221455454a54a7e1ff737459e4cecfcb0844534cfb94d4e0b12aacfc9db12517f67b46e6f4eb093a1c24c960f2c2385df1f9f3db48
+EBUILD stow-2.3.1.ebuild 692 BLAKE2B afe75cec32cb6f3deb107c5adc834267780e1671bc512197ba56c6dc59375956e83fbfa4404301f80788ea2be20fadf26c7556113b0799d2d047dc945e55eb6e SHA512 89ff5c98f82a9e1e3f78e26927603768f4f81e0bf6224d924fe4fa770b836dbe6d19cc2e196e996536833046676f381886e823e19697e627a3b3e9378be856ad
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index 7c766a2724f7..4401a0e5cb2a 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
index 4f576cc1496f..5ca788ac2103 100644
--- a/app-admin/su-exec/Manifest
+++ b/app-admin/su-exec/Manifest
@@ -1,3 +1,3 @@
 DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
 EBUILD su-exec-0.2.ebuild 595 BLAKE2B 44e9e1e201b74506b2d1bdd0d25f8e957ba5b7dd4db859de6708bd33d2c122d046a51122f7096936621c7e60dd0e5d44e565295cba4de4b055b3d2e7f8244f9d SHA512 2a008451f0277ac2bf5e97cca68078e4f333f0b488ca8750b22e75dc6424d45ce34c214e5b6513835b8faba6c40caab1506ec8e208ea231f2144ea2fb0d6a4cf
-MISC metadata.xml 245 BLAKE2B 7ec08f969d0cd84a8313e515dd84440cd6417c661672f00be444ebd11b79f3ef4ead9f7318088ecc6717147a9428d9de024441825264f545e71e1fbd2aea5210 SHA512 5378ab531062e61d8cbb78d685c8c343bf5339e8f3c5462bc5447adfaf7015d1c1e2eee787b258ef90203f42a0ff94180ca57579316774dd9e5f5ec2f07b6669
+MISC metadata.xml 245 BLAKE2B 7a5d5cd4007724d701dc67237733c40e6d34da45747a81a374a966fa8b50d8f8c01dce77189330b2c38501ddd131f343b8026ec81554cda4fbbd42c85e58e067 SHA512 d864af44dcf55bc3bdf926213e0be149d266f662bf3e9a9fea0ab98705c947743fb03990cd66a39389ea7c452a61c303c4ab27cdba744c4206e40743cb3c5afa
diff --git a/app-admin/su-exec/metadata.xml b/app-admin/su-exec/metadata.xml
index 994ac4d0e54f..a8645a194b67 100644
--- a/app-admin/su-exec/metadata.xml
+++ b/app-admin/su-exec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index b33d8ffa5cb0..533e2cd30f66 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,7 @@
 AUX sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch 1929 BLAKE2B 404bd5c03b81a9bfbc3796c706fa93a64b4649c651c7859175137e1abb7f9da34f43d7f6e1ca8bca10c567114a30383571771c6390de9975a6bf55d98b0caa7a SHA512 34dd6880a90740eefd3a1bb543b3121047ea6ab8837a127c55cff92ffb7bf9225d0c6adfd88adf299458fdafaaea5351a52f14a9487c04df41aa218c6eeb6e7a
 DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
-DIST sudo-1.9.6rc1.tar.gz 4122708 BLAKE2B b6f3cee7c1b6d7c83ea83ffa38e5a27abc4add4b82c2f3481dcdef6e68bd768903341082caad77447d860da0864ab63fd1c054d2db0f55d161874f17dbd695cd SHA512 836ca8ec5b33ed59cb3192e7eacabb85afebf22b7706a917f0a4cfcb41996cbbfe709329edcbd5f55a672bd57dde73dd4eca50700b0f0bcafcc4fef969a55e38
+DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 EBUILD sudo-1.9.5_p2-r1.ebuild 7027 BLAKE2B be51bde166c512c5aacf0c5d12d6219c3cc2ac86001f8f40694b801b3da4f20fc224a10e1843fdf5046ce24a5a89de327925f5df12e3d67faae0af44216386c2 SHA512 ea65e9226819b18a92901876a2b85c42515571844c01686c6d781772fb403e13690fcb8bf39350bf95acc266b2e069e48d72eebbadc4b9ce94657ef7cb211789
-EBUILD sudo-1.9.6_rc1.ebuild 6970 BLAKE2B 9d759027761957298bdabfdc8699b2981b605d9bbcb0ceecac146f5fdbddb4f0eb8c07821a6d7fa38a47cba423f804f85e65e4327fcf778386a53b9b25f81275 SHA512 8f5aaabff31aa6cdeab9296fe344f7b995628b14db808bef23557258880dd9d38acb5a048b2cb6c846828f2fae0e8535ba76b55010c652e8a28d07eea16e89bb
+EBUILD sudo-1.9.6_p1.ebuild 6970 BLAKE2B 9d759027761957298bdabfdc8699b2981b605d9bbcb0ceecac146f5fdbddb4f0eb8c07821a6d7fa38a47cba423f804f85e65e4327fcf778386a53b9b25f81275 SHA512 8f5aaabff31aa6cdeab9296fe344f7b995628b14db808bef23557258880dd9d38acb5a048b2cb6c846828f2fae0e8535ba76b55010c652e8a28d07eea16e89bb
 EBUILD sudo-9999.ebuild 6971 BLAKE2B 88d262cb3f43386a08851576ba2f3d1f057e8249e206e5008b50c8a05fb5e5a9f0f6ee4b127b801920bae6c89c0af678c0f88a5e1af2746e80c2ec8aa63b9334 SHA512 fe4a0b610929cd352cafab8e56bf6c6a1d34f6c7803bd617b8b8acc99fc940f6fdb4eab04a34adea5fe5113d5a0e824644c3df681ba00585294329d7664565db
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.6_rc1.ebuild b/app-admin/sudo/sudo-1.9.6_p1.ebuild
index f222aa9f58ba..f222aa9f58ba 100644
--- a/app-admin/sudo/sudo-1.9.6_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.9.6_p1.ebuild
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 27f6f555aafa..aa1958080d57 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -16,4 +16,4 @@ EBUILD syslog-ng-3.26.1-r1.ebuild 4910 BLAKE2B 8b6ca27ed3d4f98d0ee40ad88b7143a50
 EBUILD syslog-ng-3.28.1-r2.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
 EBUILD syslog-ng-3.29.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
 EBUILD syslog-ng-3.30.1.ebuild 4897 BLAKE2B 21378d34ab6a7eb355c0ee8c132bf0af75fcb9a36035d55abd9d969c2fd8f270fe3956b8d3ce624f72f9852867260814af9b672c01c30b12150bdc37ef7c9b98 SHA512 7a2de2ef440ffe1c95fee72ad291e1968fa4c8ccf458b0c8394571bd0e98bf2f492c7cbe534c9243c424f6df7de5bd59b604811224ac12c6b2beb9969efad9fa
-MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
+MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index 4f02d274612e..992372b28a7d 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 680d5861f117..5f9a00de5cdf 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -3,4 +3,4 @@ AUX syslog-summary-1.14-py3.patch 3982 BLAKE2B e468d0312a9a83b5f6a779223169cb95a
 AUX syslog-summary-1.14-remove-file-magic.patch 836 BLAKE2B a4b2d7d40ab7c15ac33325c97d8bea3df7d7f824c3d301a6be764ac0a5ce9721fd7d6dbdd6a6f48432931fdfca7a2f1cf141eab897e8bdfa1eba20f2f9485153 SHA512 1f860cb96cf5eef124217c8253264fe24f6b7fde3d078d2f41e419490bdb3d9d4df6fed7c9b8cc68a855dfc06f81dfdc4c7e868d9812ed1a306ac65cbc97f833
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
 EBUILD syslog-summary-1.14-r5.ebuild 888 BLAKE2B ca9de21574e08b741325ad6dbbb00d3643181963e27ec60a872142c677a6185dfad3cdf71ef644bedf3a25fe366757afcf9b808ebdae65e5def985dc36ec895a SHA512 76efbb764a09063c441b44dbc9a339c06ef2062b2336dfbd827bbea8bf8781ae3f1d6e1acbbbabc2b16900ce66d4c5f717c74cb60e537264e5bd9d6846475f72
-MISC metadata.xml 489 BLAKE2B 876fbf72b343b5de47fa5c0eaabecce3d0436a4873d2415c3303581aa4644e4019bc56e00f4530635969b19ad86d8c787e5678412472ad74dfc036529036dc6c SHA512 b21eb3d90346279b7d2b976e6a1700bc36ce8c15d47300de8fdf380aca09cbbc2680b6f9cdec55a97d14cedd8353ac472a9638e7517bbc897c294410929e1426
+MISC metadata.xml 519 BLAKE2B 7a24228aca70f6403be2054a0cad484f7f1b21ce0e5f27fde1433c61d18c247eb1c47559d50f9555f1d72d11459e61718b273e166a3ed7f0da52e4b7e1ee0514 SHA512 f07701f1f146bb946270cbd71bd4c2dc703ee2c05fe0b9971d3834f15dc24239b58d879e87372a59240b047abe22a734db502186cf3b8d9ba8b23fd5d25a1c3f
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
index 1a3b253f9a1a..b4c29644fb3d 100644
--- a/app-admin/syslog-summary/metadata.xml
+++ b/app-admin/syslog-summary/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>lmiphay@gmail.com</email>
     <name>Paul Healy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index 79d5fdeb3f21..d6102f549e95 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -4,4 +4,4 @@ AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f
 AUX sysrqd.service 166 BLAKE2B f6963ca6f1fac672aa400c40b899e56f436e674bcc88bccae63f2f529624fedfd193137da157b0088f8c9c14eb22d9ccc261b5f131451b0269e5742b7238c6ce SHA512 fbac57e9367872cd7289edb24d1fce259fb1b39c3ad5484c259cb7bcc56db84fb21019fb6402759025329db26360f427fc9235f743a49fe2198e44ac8443a69c
 DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54
 EBUILD sysrqd-17-r1.ebuild 1350 BLAKE2B 41d94d29437692c868d8e8734c60317940130bfbd149597985ec170bb981eae63afc2a5d427f8dda93fd6035dea12235680814fe82611e2c2e06dce79c8a6230 SHA512 1ae634662ea246aa4d22b72f3897915de163eac159b4c9d05cebb6456b98a3daf890fc9fe0cf4e6908578833d9b3000bbfb34f978f4c72954ce85ea7f05503b2
-MISC metadata.xml 488 BLAKE2B b042e47b646ca09a9acac8249ab7fde948b74e212605403eec3716404f8ca9f59c9cdb6c407b2565135ae2a599a112763fcc53ad12c93e87fc045a86da742d0e SHA512 35441cc9ec461401ef388c5496f45e9481fee27e6b6d7a35f44f605171294de12a3e7ca28b047de5fd12cd7090b09def956006301f06db7d3fc9a5e5c754c323
+MISC metadata.xml 487 BLAKE2B d55392a182dbb4c56643dd7eb11ceeafbcdebcc627a65794d6602575a4f2a4d4d3c33037281f43693e1b523d8189c36f0af7f6e91166eb64d6863e80aa6533bc SHA512 e0401a8d41c20ee5e097efeed147bd3ffc2f61650d34f8e74508f58b7c07da29c1f9d12fc59ceea607a15dc8d4fce9cc6410226bff35e02fa09ab49ae2389e38
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index 4df0c950f77b..6b2c73d4161f 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -11,4 +11,3 @@
 		<remote-id type="github">jd/sysrqd</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index 95ea27adc000..5ebf12b6a2bf 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -3,4 +3,4 @@ AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d89
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
 EBUILD verynice-1.1-r3.ebuild 724 BLAKE2B e2ce6f00a8230f0c18d8ad80a7f5c46d77a9c34108e2d704b7d2b21c19700bdcc606bea015e5e765220363f12e4a4d0dce023d7f92cd63d15564025698f84941 SHA512 497e0b2229baa3fd5d566554d4b2d028b34ccc45dc4be387ef0052b030900178ab697cf3b9b4ff9c690f0f2b09ee05c5ffc1f00590f207b3c973272ccae02815
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
index 7a38bb900964..979bcc7aec93 100644
--- a/app-admin/verynice/metadata.xml
+++ b/app-admin/verynice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index 179aaf7455e1..1b6451293a8e 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -1,4 +1,4 @@
 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
 EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
-MISC metadata.xml 360 BLAKE2B 66088dbb2e54eefb45d81e9995e925b65e606285f4d7e03ddd3a7db550a57de31b2d07b93b048b79be840c80d920c7ca0a9ff44a5a1d554d45d55118a5838c95 SHA512 669688029486d152f48a596dfa985eab29c4652479e9ccbfc2cbe32c81e1d4c34395aadd483ad3af397e5f67e74f3219f946cd283c6133df134a42eb41c4427a
+MISC metadata.xml 390 BLAKE2B 168f7072a6ed96860048cae57fd75012e612d6445a31702a70112b5d3c95c4959333358b2c323d6311f3d1c8a2f588ff783b208cc39d48563ce14f48f74d7759 SHA512 82d90d00adfb9a23d4434caf312a6f11015425463e81a07bf064af0e9cb7eece2bc6f449b99e2df7a065bcf1c000261b2dcd8f949f220d2330a3da739318a1ee
diff --git a/app-admin/xtail/metadata.xml b/app-admin/xtail/metadata.xml
index 517fc676864e..bba86ef67901 100644
--- a/app-admin/xtail/metadata.xml
+++ b/app-admin/xtail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.power@gmail.com</email>
 		<name>Iván</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index ca85572e2d19..d87ddec92e33 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 52d3985360ac..6532fb147750 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,9 +1,9 @@
 DIST clamtk-6.06.tar.xz 232024 BLAKE2B a9a7310410f685bb6cae24ae6cee45b31a524b88cf75c9346617614e5dba43f3942d39dd6d484d656906c3fbb2122ab3858ab017c0e79d5ed9271b2968b750d2 SHA512 ee4d09e0f3c703bef5a1b3e1bdc97d3d1d91998c98e82a2fb1e3326fa8fdff32d7bbef7d9e2bf2b6292fa1982b1efb3b5cdb4cdd7afb17f6ffd0e089d8b4539a
-DIST clamtk-6.09.tar.xz 228208 BLAKE2B bef7dca1b60c8c7d02efbaf48d75fc95ac6706f553b0d5c7146e3c36220f326b760306f3011d7774510c8f52d577be1d4dd10abe58aefa900fad8ee414f050a0 SHA512 4bb7f4f8fdc346d60ba3dbe6abdf09edcad2fa3fd4aab6f9eebf88705a213dab9974e2b838eeb05f155ca44ed249874e23679002a1d6e8832bfe3c104b2832a8
+DIST clamtk-6.10.tar.xz 286008 BLAKE2B 3f602c9422d57cc24ca47141a237870445c2390f3e4fa07cf32073e058899a603f0882b7df51c40184f84d75632bd2b608035ae71f4d8253a474f9fd30a212da SHA512 32f7856e89fa3d3dfc5b546bbf71c6b2fed62ac3ccc18f30ac9b55ceb9a48a182d667af0b430942a4021c0454491300e312f93ea8d57bce711d00950afebfd71
 DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 EBUILD clamtk-6.06.ebuild 3803 BLAKE2B 7d674a0e2d104b37823e70857ec9948e8de03a97f577aaa09baaf8b9a4066ac6acd884f42f512c0eeab0548d8b10ece39f611b5ddafa7e0dfee95094ed7f3d6f SHA512 254ac7f66ea2923d5882ebc84ebf070de75080f610b22b3887c490d3eaa1723bb60796bd49d312ee591573d6192cfd8e22ad4c6961f0f670b3be55d852aefa5e
-EBUILD clamtk-6.09.ebuild 3800 BLAKE2B 8381696d184905c72e2f1a8637883a9ceeb44004762df25cedfe6c83bbf4817d7b692a5d5c7811046634657b77df44029f864c2bf88c01e5d6091cf2725a061a SHA512 f0b2c249a8b5a423f3fa984f2516b962971b99f8829d3bfe2e0278734b9ce0138042b8eba80e0f4b5914e09c92bd91e478fb7a935ccf0785ccc9af45eb194110
+EBUILD clamtk-6.10.ebuild 3819 BLAKE2B c0b4148f50e43fbc50dbb7ec3bc58766d7af17234ae724f49b3e8e714cf5e69209d83bd51dfdc294205da658a09df56513d1c60ebc4ba7e2f1efdf4af985ecbb SHA512 b9b5113f5995c6f1064b5659a5d3376265d143d861a133461f5db5165e0a9be0bff0302457cc629031ac5436f18202701999264ec17aeec7b49b17dd479d4952
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.09.ebuild b/app-antivirus/clamtk/clamtk-6.09.ebuild
deleted file mode 100644
index b6fbc1d64246..000000000000
--- a/app-antivirus/clamtk/clamtk-6.09.ebuild
+++ /dev/null
@@ -1,142 +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 perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.05"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
-SRC_URI="
-	https://bitbucket.org/davem_/${PN}/downloads/${P}.tar.xz
-	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk3
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-pkg_setup() {
-	use nautilus && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	use nls && domo po/*.mo
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-antivirus/clamtk/clamtk-6.10.ebuild b/app-antivirus/clamtk/clamtk-6.10.ebuild
new file mode 100644
index 000000000000..a03f211ef68b
--- /dev/null
+++ b/app-antivirus/clamtk/clamtk-6.10.ebuild
@@ -0,0 +1,142 @@
+# 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 perl-functions python-single-r1 xdg-utils
+
+MY_PV_KDE="0.18"
+MY_PV_NAUTILUS="0.05"
+MY_PV_NEMO="0.04"
+MY_PV_THUNAR="0.06"
+
+DESCRIPTION="A graphical front-end for ClamAV"
+HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
+SRC_URI="
+	https://github.com/dave-theunsub/${PN}/releases/download/v${PV}/${P}.tar.xz
+	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
+	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
+	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
+	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
+"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde nautilus nemo +nls thunar"
+REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-antivirus/clamav
+	dev-perl/File-chdir
+	dev-perl/Gtk3
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/LWP-UserAgent-Cached
+	dev-perl/Locale-gettext
+	dev-perl/Text-CSV
+	dev-perl/glib-perl
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-Piece
+	nautilus? (
+		${PYTHON_DEPS}
+		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
+
+pkg_setup() {
+	use nautilus && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	unpack "${S}"/clamtk.1.gz
+
+	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
+	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
+	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
+	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
+}
+
+src_install() {
+	dobin clamtk
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"/ClamTk
+	doins lib/*.pm
+
+	use nls && domo po/*.mo
+
+	doicon images/clamtk.png images/clamtk.xpm
+
+	domenu clamtk.desktop
+
+	doman ../clamtk.1
+
+	if use kde; then
+		insinto /usr/share/kservices5/ServiceMenus
+		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
+
+		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
+
+		doman ../clamtk-kde.1
+
+		docinto dolphin
+		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
+	fi
+
+	if use nautilus; then
+		insinto /usr/share/nautilus-python/extensions
+		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
+
+		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
+
+		doman ../clamtk-gnome.1
+
+		docinto nautilus
+		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
+	fi
+
+	if use nemo; then
+		insinto /usr/share/nemo/actions/
+		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
+
+		doman ../nemo-sendto-clamtk.1
+
+		docinto nemo
+		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
+	fi
+
+	if use thunar; then
+		insinto /usr/share/Thunar/sendto
+		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
+
+		doman ../thunar-sendto-clamtk.1
+
+		docinto thunar
+		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-antivirus/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index 25da05e3230a..1a8945f352e9 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -4,4 +4,4 @@ DIST fangfrisch-1.3.0.tar.gz 114361 BLAKE2B eca124f02f814d2915c4dbba45b6e4dc620e
 DIST fangfrisch-1.4.0.tar.gz 115303 BLAKE2B 6dea9305ad22e8beff0fc04219d24da995c36e0838e1be8b98d12b11db1f68d7ca4f6084d15270c09e8a4b8d94a7bdfe1b9bb336abef1767b1ded2d1751fa22b SHA512 5fca7b7e8d24daadfb450851c70391fce94943a718bbed4fc76efe08a730cce313d92e7d9a6a8324a0b0039871f8c77f1fcd3744c569826cc0d2e7a7fd4e9b32
 EBUILD fangfrisch-1.3.0.ebuild 1976 BLAKE2B 6ae2b185454375f005ce29c44e20905c46ea68a6b9f7b12b340aae679f643880cd43d5e03606355b62156569900ef14aa567179ed5d317563ab5612b4f2c30da SHA512 ae3ac41b250d230c1d47c30b38aaa7f70391731d546d73148d9ae00a8a867f7205d98e613737289929ecfa0f0c4937ee87fe2bc81644228829b979d3fb8019c6
 EBUILD fangfrisch-1.4.0.ebuild 1978 BLAKE2B 0bae4e9fca95089a1b05e0bf352f2d9a08bd9c0c75e062bdc794181524ffe7c533d67978731a37fe1d0b1c615abc7c6e0963a5546472e5bc6f5487367f46de82 SHA512 61f5ce2be798a99bfe8b79594756be9bd66c8694a5bb343bb1dc992f2ae7e8e973d7a1a531e0c09960ca54d682f7c0ef64fd75afef3d8033148a116a3ea566c8
-MISC metadata.xml 887 BLAKE2B f4decc99e10c900f69a373d854f0ef2eda5f729f2bb0b937d196d708cd2161b0af82363a1fdb0866e5e8c42dabdc91f6dafee627418a7b85b26eab1cf15db65e SHA512 af6ad5ffe5fa55cf0d0627479b23b0a24b7d811330b0a408b94e57365382581e0f7e6a37712e6ad1c827fc4d9bde5ac069fb05bd46770ab2fe3059327ee5b201
+MISC metadata.xml 901 BLAKE2B 2cd17c12d83281f8167ce3ccc0050c02ff13355fdb781abab571ef0aeec15374fdbffdbb83881d1daab4a5ec1dbd2d05e5894f61319b4fb05aac76817fcd901f SHA512 cdd4680327c1e0dde0634952466feb2e45d8ef41246f4c9e5aff7c48187d5719b34aaed2d8a95415db351349f23a6485d03e3cad9e69855ae0c70d16b3d88ce2
diff --git a/app-antivirus/fangfrisch/metadata.xml b/app-antivirus/fangfrisch/metadata.xml
index 6660de68af79..91d61e29f200 100644
--- a/app-antivirus/fangfrisch/metadata.xml
+++ b/app-antivirus/fangfrisch/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/app-antivirus/metadata.xml b/app-antivirus/metadata.xml
index 7c17b14e55cf..450bdfb0d52b 100644
--- a/app-antivirus/metadata.xml
+++ b/app-antivirus/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria app-antivirus zawiera oprogramowanie antywirusowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 325d734c98cf..0058e8af8270 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index e8e9f02cb1e3..222f2a4ea371 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,3 +1,4 @@
+AUX atool-0.39.0-configure-bashism.patch 365 BLAKE2B 677ab0da286c462adf41b8b58d007dee8e3fe874a7ff34a652e1c16160186c9e633d77901d943f18edaec23ec92356c4b09eca41f0e0d7eb9f92055e580d3400 SHA512 f99d333339f605a3c6f0373984b107925b764ff6843d2b8b9c96e50bb3b368812acaf9a56d1f3db2dcdfff0b3ba2d9a9301312d3e4dd0a2dc3ffec3086b1b9e0
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
-EBUILD atool-0.39.0-r1.ebuild 397 BLAKE2B 2f135263b9377ca21f8405695607667edcc7973155bf7417a1a389590b6e0259d40b3e664ece0fb3329cd83b06183bef09e0e0a6cc4eb4cfb99aa037b09865ff SHA512 4fedacf094bd90bb79cc0731eac449867fa6c59a8fdf6e7f42d15937a508136b1d1411f9a2508087fb9955f586616d4cb79a4c4ecd7c146639c55e07e294bf91
+EBUILD atool-0.39.0-r1.ebuild 555 BLAKE2B f51081d65c029402338ffff8e8dece46d8a654e8ff359a1beaf92bbaf4fbebc6fb80668ea5f41d2c1ad037d3edd2fcc7cb1cdcb65adc8e6726b7e8c9212b62f0 SHA512 b41c2d8aa299f1ebb45890845a7241450d68e32bb752805abed69b59f33cb5ce13bd3864db49650fd1681dee54fcf6f968a0a504133851461b0de0d16cd9655b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild
index 4ab3fb6b4aec..b5a2d655b278 100644
--- a/app-arch/atool/atool-0.39.0-r1.ebuild
+++ b/app-arch/atool/atool-0.39.0-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Script for managing file archives of various types"
 HOMEPAGE="https://www.nongnu.org/atool/"
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
@@ -14,3 +16,14 @@ KEYWORDS="amd64 ppc x86"
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	!app-text/adiff"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.39.0-configure-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for the bashism patch
+	eautoreconf
+}
diff --git a/app-arch/atool/files/atool-0.39.0-configure-bashism.patch b/app-arch/atool/files/atool-0.39.0-configure-bashism.patch
new file mode 100644
index 000000000000..512bdc02ee9f
--- /dev/null
+++ b/app-arch/atool/files/atool-0.39.0-configure-bashism.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/775158
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_DEFINE_DIR(LOCALSTATEDIR, localstatedir)
+ dnl Perl stuff
+ AC_PATH_PROG([PERL], [perl])
+ eval `$PERL -V:startperl`
+-if test "${startperl:0:1}" = "#" ; then
++if test "$(printf %.1s "$startperl")" = "#" ; then
+   startperl="\\$startperl"
+ fi
+ AC_SUBST(PERL_SHEBANG, $startperl)
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 386ca89f8c16..cdc759d88061 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -19,6 +19,6 @@ DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d6
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 EBUILD bzip2-1.0.6-r11.ebuild 3149 BLAKE2B 28c1c0f00331adefab03b4b09678253e2193519f5100bdd1aae3f853e9ff4b7b10182c4f30d5e75bfff3ed6ac053312b04900b6f8e99225240a3e9aa6d96c24a SHA512 cf104189d6affa11b90ca3f34ed69507174360af9d97acdaaf2eda58fb59a9b5eae0e390976e7889e5bb2d39d643ac75a60e5bec8a107d2644a371f4c0c0b4cc
 EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f
-EBUILD bzip2-1.0.8-r1.ebuild 3252 BLAKE2B 8dd88c02318e290e7d11d40c4ad0ad4ca5a746933b7780827bc75eca8baf8c10da93bae6513376976422d25999ef97b0b51c51e96519ad6ab0ee5c33c0618962 SHA512 c49de662256a41a6467cd00780839f5a2777cbca7e24aac113dc00c18af6f9f49f1767142f4519a8b4ef3c5228b9322e258001da2d8c16edb7ef1dacfcefa504
+EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379
 EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 34b92d2ea541..49d36f93d65a 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-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
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-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 static-libs"
 
 PATCHES=(
diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest
index cfc8bcbeb420..82f5ae687883 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -1,3 +1,3 @@
 DIST createrepo_c-0.16.2.tar.gz 601935 BLAKE2B 8b9f279d97744e9eeb68cfcc7e9a229ab5a4d8cfca74a2a3d444915eaae7a6d2fa113e517fdcd72b69d0343e541ccce8020f50162e4800c54ba989cea8d5756e SHA512 c63abc8aa6c65584b51a0aa337e261fe5d9a52d72287874f86531caa8133718290a4f44aa765979fa319973c4ba0681437a26f84f64bd5bf781c86a6daa8a39b
 EBUILD createrepo_c-0.16.2.ebuild 893 BLAKE2B fab974fff5538cd99a0d05962e64f7a2e281b550ace9ef60be73de72dee03e196da3b72a1efc0a506034722e530513c07c3697285c8ecc7256451c2e35882f75 SHA512 ad9a48768e0ee3ecc59ac12f31e06d3387a7ae9d514b0a02420de01d503a5ac870012799f00b2287c17d3db64a26adee53e27eed9baab0a1944bb88d728228fd
-MISC metadata.xml 375 BLAKE2B da084e37dc693663c6130bc546d896512b5091bed13394f75a535e8bd311da9965661b0de025fcc8abf75392b580f20ec7ef543cb395041b1cadf9fb3d34fe81 SHA512 95f5517f6be280b07425a3ff36a358b46a6bdabe5f84460d98e3525328e404f53de04ef11e2235db4935e3ac934cefe16647cd11aab38dd52b36b1c256bdb667
+MISC metadata.xml 354 BLAKE2B 341fb48b84f1b6015feb971db0a6bf1202aa6c77c3df9e5a76c59f958949b156c523718282ead8258a7d4a6fb1d1c69f22996d452eb09780a434739bec7b361a SHA512 a42a4100fbd724d10b462e8c09c57d4c203fb93bbe0d626517584e4d0ca7e1890a9afef0b8c1dd75567e3f9930b0d93f97853005df8ea995345cf341e592cb6c
diff --git a/app-arch/createrepo_c/metadata.xml b/app-arch/createrepo_c/metadata.xml
index d5f9bc4288a3..f7a7ec9ffd46 100644
--- a/app-arch/createrepo_c/metadata.xml
+++ b/app-arch/createrepo_c/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index bdbb75be1491..4f7cf023c779 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1079 BLAKE2B 5331ec26dcf48770798f03fc609263ddd60e575daa10fccc736ab07690b051689d5889bda2dc29dea6b8d2170d7df22f620afec3442b23504c958d18fe69f631 SHA512 a3491091c3523fffca6e94b48c67f5babc9b905dc1953bc8a0d6e4f6745836ef2e3df5da1ac096a4709b8eb25d47add3a2e6a3ce700049e757b3a1fa57c518e2
-EBUILD gzip-1.9.ebuild 1121 BLAKE2B 5f47d124983451dafa1ea7f9b843a79cdbbdd61e1d3f049fcacb0cc75c29e18b3894161013a121f9744c818370227521604533b0c70cf558c0aee75943e1bafc SHA512 a384d830ed4c7be2357c818cc1294eabff91447ceb9f436cb14df21423fa6069fb2018bdf66f4b78a013af3b1531e8cee9ab46f79a31f8f5ddf88c3646ac7d83
+EBUILD gzip-1.10.ebuild 1086 BLAKE2B f0c05758c344467c6e70a45ac67406c6ba89e3744e938e518d0cf7e5d4b723788899331109b2f89804e4a3b49a59241d17e4d396c63ba9f8e2dd06d33073408e SHA512 0fea04bed2f2a9898e6fa52ea2fb8ccc351f60175f5cc7c1d27ccf0dd0e0da37678d6886145032182014e30db6fab30de9be444d6a25d17f212b91e6717cafe4
+EBUILD gzip-1.9.ebuild 1128 BLAKE2B fcc7de9606ccf57da14239d909ae785a872115ea13bd0d5caab544b8bec7f843774dc12c4f8de1900ccdc2aff13683ab59d76fe7f15905a51ed2aa1806e970ff SHA512 d1f7d608cc4d92f1b804b7c4a035ef01576c1b3f8982f26946cefb7814d5ed0fcc7c7c678461f21789dbbf8748c4e03434d18c57ce6be2c7035e1a4735bc19e0
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index b160e4ccd6dd..320d210311fa 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
 SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	mirror://gnu-alpha/gzip/${P}.tar.xz
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
 	mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-3"
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index a32c4185f2db..08f3b6b95e7c 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
 SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	mirror://gnu-alpha/gzip/${P}.tar.xz
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
 	mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-3"
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index d77d721af862..2c18b392060c 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -4,4 +4,4 @@ DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef6
 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 1113 BLAKE2B 4b5324400567699433108c4032a1d43b2212f5b36e324bb7f4404f36c5bb0ab65a8578b55ad6fbcb5a16134bccfda2d05a3371f0cc7b3f135703f47e2c75b6ba SHA512 9e4edd36636df3cb03ae32ac9cc88efb4ce2b99f0ed974059dee79c7e8e0e4474f696cddd2cb6f9452b3b3d3b7b09b90fab3ad4cbf7b83b48d15e9fd526b460e
-MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
+MISC metadata.xml 607 BLAKE2B df5e2e425d0046a6cb9d66536d6295fe454b057948e2605c69309d72acde8ecc4bc7ff2d68ac705ec4960eb4cad8603e33d7c7060404743173b50eef4da621f9 SHA512 e02e533237ee5737b2ad1e134fdf48e3c1350e4c2e1541f27ad465608ede575976fab666d136eb5314bda99bc5e1d2f55d7cb7b90c6cb744e407d6c7704bd158
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
index fba000cbc720..8edf5323b81b 100644
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index f878c91de566..3f955dc2cb6f 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,5 +1,5 @@
 DIST lzma-19.00.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-19.00.ebuild 1016 BLAKE2B f7a8bbf8cd6ad30b7293542bfe71f432058246b71f35f2a1821bd5e02b26d922a3ca65badc629410a6f69541a4edbaa1c41b0e2435242bf743dfb3deb0b93afd SHA512 98dd034ee65a39f9085d7829ce141d4c36d39b8cd5a42a83706c8296fe29784974f1f14387da24fd1127ff9bea3a480406c9552715ca499b374cd0f2d198f118
+EBUILD lzma-19.00.ebuild 1012 BLAKE2B f365b49cf0347b05182ae84fcd349b769b31774bee8353d5db348dffcfc622e41fc8a39f253ba86811537c7a3aa45401119615c7515f5e0800b07a4cebe2e5be SHA512 a0c37b280e59a1f55d881ceadb2fc59c26e0e47d19b0f245bf7c18042f0e45dc86a8d87f484990bc10fdec7d30efe93276b5a04992b220e1ae2b19a8fefea7a9
 EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
-MISC metadata.xml 444 BLAKE2B aec04279877865b9a1cea3f7feb010894c28ac21f120a9d90749a9a625b9fb8b8ef70b141031cd85e10d648deb217dbfb808b8a14566b4c130ae9623a80e919a SHA512 81f32c3de736c2adc84c87340765e18e12a7a3868b135a4e585fe91f646767698208c18aebfc6a772eace180cbbb65ada2dcc8b88ba603cdc3337077dcdf6029
+MISC metadata.xml 474 BLAKE2B f4cbef9ec8a896782590f1e51783f9054b2a2e7f0731bd8798df222cdcb41f9ea9343642e0ca0e1e9ca2d277e35d397fd4d27c17d3415a9078e0326ef8f1dfa1 SHA512 76975957bec1e489dc20569d89a198b4dc70307032b11e716822ce9b3d11a0688fef94270ec1d23995b81b01fee8a4262d9d22764096b207096d887c0494c9f6
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index 5059cbe5ea03..dfc53ece7bcd 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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="doc"
 
 BDEPEND="app-arch/p7zip"
diff --git a/app-arch/lzma/metadata.xml b/app-arch/lzma/metadata.xml
index 3a5f1e16e766..adfe278c8b3a 100644
--- a/app-arch/lzma/metadata.xml
+++ b/app-arch/lzma/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer> 
diff --git a/app-arch/metadata.xml b/app-arch/metadata.xml
index 72ecbb92d2e3..90bc5649cfbd 100644
--- a/app-arch/metadata.xml
+++ b/app-arch/metadata.xml
@@ -37,4 +37,3 @@
 		kompresji i dekompresji zarówno pojedynczych plików jak i ich grup.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 5d4f66901625..d5de2a0f5c14 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,3 @@
 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
 EBUILD patool-1.12.ebuild 427 BLAKE2B 8f5dc48d91273ef3144c722a1abe53cc4132ab636a2941ccc461fe012d26ea4441402d8c3271dbc64d51200a4ecf6a22af345a7c287e44b8062600aea7c6beb6 SHA512 2d918626a5500908031299e5e08b01035ee69cdf05bb497ca01280413559d289cef6eed258f1b8966761f59c542ac3e164ba99e289368ef3f44f5efdffb39277
-MISC metadata.xml 450 BLAKE2B bcba37e75b15c5f89cb2d2d525fcc13acc5548b0c6c37e30aa0b3f45a1e8187a8ddb446b913680722bc25d20eea0bff2da520e053ad73b31ff6b8432701c4391 SHA512 3f8502dad4fd4cdd5f2c8364e68442984514a2de56d14f7c6efaa79cf7daf7904b76eaf486b280327c9c79a3ef147e785894c5c57782942adeaede0e29e7fab0
+MISC metadata.xml 480 BLAKE2B e10b98757d73902832642220ab34fd2ac797881ec3f3cebd59b7bc734b853109b095a6d1ea77dd94a9b02cf08a0f921af23e23c0b06ec20d06494070982f853d SHA512 75aa62942ec5fa7ce30e343034dd0e92c27a43d6e841485c04ca1448cb7e63c2a5992ea0f0bf1e50d332308708866323dcea6ec5f96c64f70ceb1937f7580579
diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml
index 1a9341f87f15..ef580578cfcc 100644
--- a/app-arch/patool/metadata.xml
+++ b/app-arch/patool/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@chymera.eu</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
index c56d5581c55a..fe78a9dc3e1f 100644
--- a/app-arch/qpress/Manifest
+++ b/app-arch/qpress/Manifest
@@ -2,4 +2,4 @@ AUX qpress-1.1-fix-build-system.patch 231 BLAKE2B e8fa8dad2a660d37e927f254804ad9
 AUX qpress-1.1-fix-includes.patch 158 BLAKE2B fa446d129cfc56fc7d53c342df334810311de9c5e903ee8402e78b196583d5caefee29bdc2381e4f5c9193f57a328f196e68e0c79031ca37fbe40ce7d7aedeed SHA512 321cdafc7ca71597c4ccf94a8493ff5156cb7103266d5c71ad4e650efded68e91dc655ae567562f5bc28913b137d9d3f142fbe295703864277e4e53729bf4658
 DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
 EBUILD qpress-1.1.ebuild 589 BLAKE2B 0335a96ebdca99ddf6fc95ab3baa9c519dd2a5786df3f1f3bcbd68186b439cb273ccd137813b585ec92a4d5196dbb0a288307a704da15ad1c3ab711062e2167d SHA512 a1825c173d6c2222a8533bb363d87c6432e77e2c064832d52aea57c934ed3543e19abb26604dc9e588c78489db614c751eb5d63147ef6588ba6ebd1624d69773
-MISC metadata.xml 376 BLAKE2B e46b4a437666942d54605eb173680bd311df035914586e643a2029b95d3d23d1ab4bbbecc6afa5be4421762861e8bc9e9519007aa2f4da0d0b3095aad3438911 SHA512 360cff53dc314b9b94a0aeaafda9b8dfa63ba77264f09412062151bd5be877ea0354fab3f2b3148658c7aff45e96a773c04f1b3e70e8ffa838839b31676f2282
+MISC metadata.xml 406 BLAKE2B f61fc6584d7bb81bde7e7ef2f39bf9e2d0bde9413d138152663625f656b6208b877e54d046a944e75bfa6fba1ccef33d5544edbbbfdb175646267c251667ccb3 SHA512 bfae9ec492c4d29e583fe4870a3c51778129bb66f11868fd31cd7c3fae466e12a418d40ec1ee756e023366ea79d8ca49174469cc3508bd11035d4c02cc75b987
diff --git a/app-arch/qpress/metadata.xml b/app-arch/qpress/metadata.xml
index 49901e8a0d40..2bf41d5f1513 100644
--- a/app-arch/qpress/metadata.xml
+++ b/app-arch/qpress/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index b29fc5e8fd0b..9931edd4ecca 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,4 +1,6 @@
 AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 719 BLAKE2B 0450ee5f7e6010db15f77d474da633fdab17c7b39657971bd64aebf89876a368c7bdbd4572e30a51825ae741efcad6f0845b10aed362c8502101d54485369cd5 SHA512 dd5ea497a2983c45f7c2055b7f47b911f86a5246b90bb1d55d8f75dcb1c9f25f2c20d75e7f19a3df65b62320e8397d465d25f5d5ea234a65230da4922b274079
+DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
+EBUILD rpm2targz-2021.03.16.ebuild 656 BLAKE2B 393a0d52fa311892074da9e7252a8c1c1e21489350f8d041865ad36fef5dabb271e445b8976eec4e429678c43e83dc7dc9a277580993e66939e48847825ff308 SHA512 807abd105b1e3d26c7c220fa5ab26576cc4b62d618b7d3dc416238bafc9f204a451d0ce6ac3ae807e8b504c803dc4adaa68b62ca6dad1007bae7a48933c7cf6a
 EBUILD rpm2targz-9.0.0.5g-r2.ebuild 790 BLAKE2B 967290186bbd63d569bf60838f23c82df5ab6d3b69fa4817b662a31359d623b0e68b0456f3733e7608f72f9076e0f4cb9e5e647c72fbfe9549ca4bcf73dbabce SHA512 8e7aec2613164f579ea9147cd8a184e47643c776275b717620dcdb017315b957821a9348d95a0f3ac11d2305b70b7e28470a91181049f12c65de33c21084001e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
new file mode 100644
index 000000000000..ee07654a10f6
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/cpio"
+
+src_configure() {
+	tc-export CC
+}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index fd26222328b0..b3afc38105bf 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-EBUILD snappy-1.1.8.ebuild 1813 BLAKE2B 7c723f8270d90b9d398e2047f2a1570b0b076993567ec2aaa6ab3122bd874077b526becaa318d25962090bd80eb38e95db8e02841826bff72db98efeb11f0a1b SHA512 33be426220c1f269fa9c88e8f8c0df6575ec6d6859a45291fbb723e399c9e65e011ccb05ce7cd25a1c086a64d785789d089395d7ed3e74cd8cca8ed8dde60074
-MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
+EBUILD snappy-1.1.8.ebuild 1824 BLAKE2B 3476d38a27b461e655d3cb9e9c45fcfd67c751940b1010a6b5fc4a9e9081b5c6be575390d004ef6b2857bc977f677a54de67c9820135e8ca26b03c6b97aa633e SHA512 9d59f8529a5051535c6b8810d515c6dda1307586e17bfb251ac659dfc5614e75a88d9e498d46467e2d2b26f2b229a7e5d87f5fb662ab47d1767e06203726d0b1
+MISC metadata.xml 584 BLAKE2B 2d3686f675dacd34cd4577a0dcf304ac5556641d41c432447c89b5cecb82549a4aa4e82f702714b2cd1a31e6cc6b1cf098785a0ba557ebf90c5534d11221473a SHA512 0f09da2b9e381a8fcd8b0e0f1ef762228dd98287ac455bd526c0377b3269069d733467586aaf941d41bbe47c719613bc21ac9e0f08bb637afa27e3626c60a679
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index e5215ea6cd04..3fb96763fd53 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='person'>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index bb233447d5e7..64b7812e05e7 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 755e69e5d43e..98b94be7be91 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,7 +2,7 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
 DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8606867c8917be165d4a3718783a2959896226df451d7acdd78ba2fd1d9fc774d7905fe0dbe2375e3329fb SHA512 d7c31147fafcd815bb54e3862c078dccc3f192a9fa149c2275bd89a21fcd54a4bdaa8343cacf4f76cadc2f57fd4ed955682c1b6f23d438add5a13cc35bd25260
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
-EBUILD tar-1.32-r1.ebuild 2005 BLAKE2B b966d68dda06858195638d0ca7d744d544b70443c334fcb48688f9a269bdb4faea6e0add0d0fde8e61b304aedb0504b0c144b62a3e533f48c333a96457a4caf5 SHA512 9d3366b21744faf9eaa16f4241e9e799c3da7ffacb790faf774f2f7c78347cd60f9feb4e8bb2981d3b0d3d6a17f134952f52cf0c6c2358bab0a6583c56545821
-EBUILD tar-1.33.ebuild 2064 BLAKE2B c20ce5d513d5d95f91ff4600da0f0f3ab6bc039537a518b7bf9957fa9d2956d5a6223b4283af3420a583d6a56166d8f720ded5e6975947aa22ed41dab300fddd SHA512 4c4e829dc839368cb6cbedc52c0f1de988aa73f0ceab79d1b2542a2847cb575d54a2afac7d77cc9fe8f47273cb2b8d34dd29d7ee5d4fd00ea34815d2e2b7aab2
-EBUILD tar-1.34.ebuild 2064 BLAKE2B c20ce5d513d5d95f91ff4600da0f0f3ab6bc039537a518b7bf9957fa9d2956d5a6223b4283af3420a583d6a56166d8f720ded5e6975947aa22ed41dab300fddd SHA512 4c4e829dc839368cb6cbedc52c0f1de988aa73f0ceab79d1b2542a2847cb575d54a2afac7d77cc9fe8f47273cb2b8d34dd29d7ee5d4fd00ea34815d2e2b7aab2
+EBUILD tar-1.32-r1.ebuild 2012 BLAKE2B 766a281a21badf8a0be405419b962c09952ea2af2b8fb103e8c64fec188568a02d28e9cade253049b12ef7bdcb881791ed56585058f7280d26eaf68a0690a9eb SHA512 c4c707e16510174b57b36eb1c567ed97cd617adaadf78b56c3c6bbf8b2f44f64b6bc35582d37d6de7a51e8e965be56016dc984c5e20df0bd439056362ca5b9c3
+EBUILD tar-1.33.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
+EBUILD tar-1.34.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32-r1.ebuild b/app-arch/tar/tar-1.32-r1.ebuild
index 3056e0508726..db7d8023d601 100644
--- a/app-arch/tar/tar-1.32-r1.ebuild
+++ b/app-arch/tar/tar-1.32-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2"
+	https://alpha.gnu.org/gnu/tar/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-arch/tar/tar-1.33.ebuild b/app-arch/tar/tar-1.33.ebuild
index ce07710a9a69..3edc9849a1e3 100644
--- a/app-arch/tar/tar-1.33.ebuild
+++ b/app-arch/tar/tar-1.33.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	mirror://gnu-alpha/tar/${P}.tar.xz"
+	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index ce07710a9a69..3edc9849a1e3 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	mirror://gnu-alpha/tar/${P}.tar.xz"
+	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index 4335778c5a1c..8d5aae5a2622 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,4 +1,4 @@
 AUX torrentzip-0.9-autoconf-quote.patch 337 BLAKE2B 6d1f630d365eaa9aff9d2c910ad30ad79694906cbb3ec7fccf665a468458d8103a0ebbc4e0d3fed1969e18b92780217fa47ed9a6260c42888f8bc022db15b3a6 SHA512 6ec05d00be36479084005c0938fb3df58b960914496ed149cb7eea9a6b4cb6067f9caa3ae7c835cf3bd79f357e17e18b8fcf80994dc1d550247c32416d71596d
 DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
 EBUILD torrentzip-0.9-r1.ebuild 564 BLAKE2B c3b95f46af8c990519039ad89be0c054a6060184f1911cf8945247589b3095dc5af33513f5488f0119db7fe38cd917f54a8b0a1413bb4f8db819b4767dccf050 SHA512 8e503901307d1e9c3cba278f06ed4f03de7c70bec58ba88a8ddb96d00ba4bfe791ec02e31c53335a7b2d6ad94a2a7b7315b84b3a7c8cb472d0134aa776dca9ac
-MISC metadata.xml 721 BLAKE2B 3a3fff9bfc6d5ab338abecf42f6a742f6e46e00907bb4858c6c41144d46dc40612346a7421274d62b33d4e66f284049da348c5389627492550c2c853aa0e2c34 SHA512 3e9c20623abceddb37559d631e498012bdd080a9b63f29aed8503553e6db7dfc2bff44226f3615c56a9bcc4ddb1c15b2f322d9f77fc1dc1788e62b4b2ea4c2ae
+MISC metadata.xml 751 BLAKE2B b160977c124673dc9aaed6139908ea044e31a41313caa9341998016c684fd534bf6971da204b317ea3802bcb1b17f13709ca00f6d6615faca7b731ef792ccd61 SHA512 0266cc8ad82b93d9114f2758f7cb3e8a711b7b196fb9d2441a429754564928c5502d556d37351facd9db4ab1016f738e16aee75f8801ab3487679c8494ff8356
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index 8c0252f5120a..a8df1f8b3e36 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alex.miller@gmx.de</email>
 		<name>Alexander Miller</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 7c6ce3fc2418..d7dffd3cf88c 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -6,4 +6,4 @@ DIST upx-3.96-mipsel_linux.tar.xz 483832 BLAKE2B c7f79ecc0e9f0b3f4ae9beaf0dc06e4
 DIST upx-3.96-powerpc64le_linux.tar.xz 505260 BLAKE2B 9e92e5e72436a3309c788a96a03c98bfd53bf51d3a22e85c6e58669b8c5536e107949fa860b25e1abc759b229aef76607819e62db353983f6f87f04d59395599 SHA512 8b577444366288427d6b114793b3f8fb42bf223b82bb78a391e5233c3cb3fe6906722ff7430aeaa764ef3feb77f052da469eab9d0dee90182929beefc5b1f17c
 DIST upx-3.96-powerpc_linux.tar.xz 479488 BLAKE2B 2d07dd57b742dd5a3ddcc86298618a939bd46a4af6f9bed41a3e0f12456bffb0ba7d76c866076489cb03130a9b9d84493f5401db5e76571cda4d7e9d65bef691 SHA512 a8f38f2467bc31d8cff2dc0fed191d1451aed766ab49336c7c99fe1b1a48455b08d9d45b14c78d655bc3c811c5fa2466701e1a990a5c954b0ce84499458024cb
 EBUILD upx-bin-3.96.ebuild 1254 BLAKE2B 6db503a0ba0bb34aa73a21ddd2297b88c2a33522b40425f6109ea36e25df754f822d6c37a48c0058f7a471cfa85baada0c9aaf62309596886418c812ec070d78 SHA512 b7d997412e75c06b499060d58658cbd0568be031871b6bd37d29eb8bbf8c3905a6972b47d84bb266f90c479898a61974c03c89cf218f6a82ae684aabe0a19029
-MISC metadata.xml 448 BLAKE2B 867df66ceb7f931bcbdf8e4fc8ebb935d398cd83c32f87f14ea66055e9d88a2b5e76007f394d46db0549128c1682de0b80bee74e290725b71a5be88876997ce0 SHA512 6a817175a939b260a01521d65f5add4569232da1fefe0662f977626ddef2053f9180a47a063e42d24f90de6b00ea29af451e7efaa604bbf80a2bb45d0d5d775c
+MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
index b1093ce78b05..a4810ee0062e 100644
--- a/app-arch/upx-bin/metadata.xml
+++ b/app-arch/upx-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index a5d11752900d..6e16694059fa 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,3 +1,3 @@
 DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
 EBUILD upx-3.96.ebuild 810 BLAKE2B a7c7fabd58c3b527f48b7a6905032150aed66eea7efbfd5e07938367d0bd61dadf2f55924252bfbb2bcc1867af40ef7a55e46113ee2651695343dc6ffea8fb1a SHA512 221f0fc937505130b3c1d0014fd0236e2fbff597a0e2a1d19bb8b4a0dc5141800d50013f352f49b64599b106b6b0825b214854cbaaf181c4943364f79aaa66b1
-MISC metadata.xml 448 BLAKE2B 867df66ceb7f931bcbdf8e4fc8ebb935d398cd83c32f87f14ea66055e9d88a2b5e76007f394d46db0549128c1682de0b80bee74e290725b71a5be88876997ce0 SHA512 6a817175a939b260a01521d65f5add4569232da1fefe0662f977626ddef2053f9180a47a063e42d24f90de6b00ea29af451e7efaa604bbf80a2bb45d0d5d775c
+MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx/metadata.xml b/app-arch/upx/metadata.xml
index b1093ce78b05..a4810ee0062e 100644
--- a/app-arch/upx/metadata.xml
+++ b/app-arch/upx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 26104a3deb78..6cb12fc2e142 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,6 +1,3 @@
-AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
-DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
 DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
-EBUILD wimlib-1.13.0.ebuild 1517 BLAKE2B cda0345780c9edff70e7fbe88a4818edcad8e8317f34aade48712359793a333025d7a971019eb9fa45b994b6a09283e0501fda8aa1b05abe57f25722907657e1 SHA512 a6c72ea6ef5884e15f5473eaad6e669da9ab954c8a55915a3b981c2fbe9dc9fc6ac25bf0c31d78618c78cc5d7d869c176a5750dcbf0e594c36b2128d74a8a10b
 EBUILD wimlib-1.13.3.ebuild 1470 BLAKE2B a1f77e6881bb1f850c9002a2ac65bd96c51c4ac0042110677b06aa44be80f1d22abfe908737426390ad2eb5d25b795646c4c9c079310cfa85f67a06ad0967ac5 SHA512 511ed97e28f0adca5eb3322ca181c331ba81194f3c3ceb17ad4200503ef1ef3e533f11e0f5d2419f2a05c733b3d66c9306c1670823bd9f838502e4d797ba400f
 MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
diff --git a/app-arch/wimlib/files/syslinux-path.patch b/app-arch/wimlib/files/syslinux-path.patch
deleted file mode 100644
index 6fd5bcd726c7..000000000000
--- a/app-arch/wimlib/files/syslinux-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/programs/mkwinpeimg	2017-07-29 13:52:09.000000000 -0700
-+++ b/programs/mkwinpeimg	2018-10-22 19:14:35.170566559 -0700
-@@ -488,7 +488,8 @@
- 	for biosdir in				\
- 		/usr/lib/syslinux/modules/bios	\
- 		/usr/lib/syslinux/bios		\
--		/usr/lib/syslinux
-+		/usr/lib/syslinux \
-+		/usr/share/syslinux
- 	do
- 		if [ -e "$biosdir/chain.c32" ]; then
- 			break
---- a/programs/mkwinpeimg.in	2017-07-15 13:49:06.000000000 -0700
-+++ b/programs/mkwinpeimg.in	2018-10-22 19:16:59.323070604 -0700
-@@ -488,7 +488,8 @@
- 	for biosdir in				\
- 		/usr/lib/syslinux/modules/bios	\
- 		/usr/lib/syslinux/bios		\
--		/usr/lib/syslinux
-+		/usr/lib/syslinux \
-+		/usr/share/syslinux
- 	do
- 		if [ -e "$biosdir/chain.c32" ]; then
- 			break
-
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
deleted file mode 100644
index a6578586e5cf..000000000000
--- a/app-arch/wimlib/wimlib-1.13.0.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 autotools pax-utils
-if [[ -z ${PV%%*9999} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://wimlib.net/${PN}"
-else
-	MY_PV="${PV/_/-}"
-	MY_PV="${MY_PV^^}"
-	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="The open source Windows Imaging (WIM) library"
-HOMEPAGE="https://wimlib.net/"
-
-LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
-REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
-RDEPEND="
-	dev-libs/libxml2:2
-	ntfs? ( sys-fs/ntfs3g )
-	fuse? ( sys-fs/fuse:0 )
-	openssl? ( dev-libs/openssl:0= )
-	iso? (
-		app-arch/cabextract
-		app-cdr/cdrtools
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/syslinux-path.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ntfs ntfs-3g)
-		$(use_with fuse)
-		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
-		$(use_with openssl libcrypto)
-		$(use_enable threads multithreaded-compression)
-		$(use_enable test test-support)
-		--disable-static
-	)
-	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
-		econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	pax-mark m "${S}"/.libs/wimlib-imagex
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 3fbef225dca6..d0f8a39c9a88 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,3 @@
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
 EBUILD xarchiver-0.5.4.15.ebuild 1428 BLAKE2B 05941c387d97a5ff0e7e9e4c98c1c7a57118c562016213caaf0d464be9084787b9c9dab44cfac0cc982a3cb6c49473eabce5264b516952677d89a9adc57e2b4f SHA512 af14235bdcf1bf71033fcc1457e592fbaa2f7f6a5285a5740d8c6c530ee1f48df88e67ccb7f011253598dba2b33b901eaad150a6f0c9fcb98bb8ad00e482b424
-MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
+MISC metadata.xml 447 BLAKE2B 9427d1c1f2062c7efa986b9182cefd225dac542e30a254b787470a2060fa6c3838dadcde3c3fdc9b10aa99fde66a6928286bdb2ae80437bd5590a8899e3f99fb SHA512 35841081a561194fd9ce87cf0232f727e0a7e86caf3564c6551c412ba397f1b759cba10b977fb4d9148529aaab313275e3e8066bebaa0848bc30e6c466e38a93
diff --git a/app-arch/xarchiver/metadata.xml b/app-arch/xarchiver/metadata.xml
index a86ba8068b6f..355bffeed958 100644
--- a/app-arch/xarchiver/metadata.xml
+++ b/app-arch/xarchiver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 6dc422ed0b6a..e07f509be48c 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 EBUILD xz-utils-5.2.5.ebuild 2765 BLAKE2B 4d30653dd29043d86f5bc418c0dfb714301581d3a253967be8d62b61622be5f2fb1efe1600f4ee9b3d4a92b86dc96bdffe9ab39a79a1551bb0e31ce0c48b6413 SHA512 56106512d081a43c59b1c536dd3aa05c2507f9d3409022fff1f1b17a014d0d265a8f5a506ef1e67fa9c03e0620375ecd2a8bc4adee45383d630733c0bd5c9584
 EBUILD xz-utils-9999.ebuild 2774 BLAKE2B 5fc27d6432e3c91a091bd78e1cf876e7e2231e98658eb3aa8794104a1b8be72f1390ebd7f939e8ad13bc53c1b7478d9cd64805283cab31bebc03cdcaa1851ab3 SHA512 d94eb53b779f2c5dbf077f7d89b136d43ab164a18b881c5bf14f3e0a1da10d9e36a2ed1df8078eaa721e6e3d54906e2b1ecddf9a1ba64ebbc18ec27402340210
-MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
+MISC metadata.xml 538 BLAKE2B 06981ff73e0b5996d9231d91eb18dfc31f03c7120d68eae5eb1bf98a5b99fecea4622ee0e3649fc655db4abc455a46627a0b77c971afb5729f7c8c5e50b0f616 SHA512 1f1cc9d8bb737ec14e06c1cc41f27dfc4140efb2e9c5bcb749ecc4cba11df9ee5513d8874e0f78a8ba8d597e16c532ad25891f31824beab2ec02e3455a95f8c3
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 74270db09ca6..290b6fa61411 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name='extra-filters'>Build additional filters that are not
+	<flag name="extra-filters">Build additional filters that are not
 		used in any of the default xz presets. This includes delta
 		and BCJ coders, additional match finders and SHA256 checks.</flag>
 </use>
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 81af71324d98..7e2a23854b05 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index a82939b832c4..6df61bd2560b 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -15,4 +15,4 @@ AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea6
 AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
 EBUILD amanda-3.5.1-r3.ebuild 15838 BLAKE2B 55c63e5e44e26a834f79c9c96a8d12aa2ab6106115789786cda3e7796e22120e22a190f9f38c41e6a3822d0e2feadde8557b0e610c7940445ec2d58860f8e676 SHA512 25e9e15683e3e09f1078f6ff76b3dc70001223be2db11800f9402ff6d1172be2e8a431032c4d60a1628c51d6104f7e18f0c5c7c601d3d6b2eb103385cdf56890
-MISC metadata.xml 951 BLAKE2B 8d3f922a8e395fab343e60d31525a3faa386aebdc2b0548e37037855aab88df4b27f639672e290540bc4746024f43e2da7db853b1d9446d13744c3161a293848 SHA512 0485a881c4592e201c4130ca9bc62499a8933f77a4a4431148c647b420c022404b218896c525ab062cc40f4c386082eed25f2d38ee5bcb5cdeacc0b21c1f8230
+MISC metadata.xml 995 BLAKE2B b3f4617c3799e58c24618c64c6484dbed94271c3ee693f2dddb655eaa1625d19d1e1e28b72eeb949d48c76a19258e0e1269ea1cccfac1913154ba5a0e1bf3450 SHA512 c1ea8f563fb93d290bcd6c3258c83154615f00b15ec719bfed2a2b1325d6126065da3c798b5598843f49228bd3bd899c9be6abd5ac87bdda00832ec14c78dc49
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 5846584c7a1f..7b00f7116667 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -5,15 +5,15 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lists@xunil.at</email>
 		<name>Stefan G. Weichinger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dustin@v.igoro.us</email>
 		<description>Upstream. Please CC on bugs.</description>
 		<name>Dustin J. Mitchell</name>
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 520c3359e7a2..bd0cbddcb857 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -7,4 +7,4 @@ EBUILD borgbackup-1.1.13.ebuild 944 BLAKE2B 97a6e152d9051779457f5082d38a0239f67f
 EBUILD borgbackup-1.1.14.ebuild 944 BLAKE2B 1522f4450a67775a614e597ebdc2b3e010edd3110e0e2499558fa68488ccfc2f40cbfaabc9c8f6b93496adb7a23972baba6085607425dddec7fe3a21cf005c90 SHA512 3fd8db8e4f1ab1c8797362acc27f2102e55dca3d9dad1a44151da3665ddf9c2643feaadf42222719683b101fb21665f63572d849898aa18a9b6e54e56928a51e
 EBUILD borgbackup-1.1.15.ebuild 956 BLAKE2B a79d33cea40d25c63eb62b7bbba0f27b16d229e5caa45f164c9f605923d453f0e670fa9c9c2523ff389ba987f2b45053999922de0a50a9542ac2af7734be3805 SHA512 0a2d8610382a4a34b5a21a24738ff8a48c282b78cd19f6397ff705cea3b5c9f450d58ace334451275572e222bf2aec57d6e0860c946edfcf5d8b8e8f0cdcd853
 EBUILD borgbackup-9999.ebuild 946 BLAKE2B 6173e891ff31cf2682aaf813daab17485b0017c8585c029cc96a229b4085683021baf05d7fe46b47737f71dac8b30e7b0523b5cda3c6d2150acfbb44012aa7a7 SHA512 14e55850b506e5357c0ea423f94125355d560ed107f40d4e6fbc796cba412dfc4195582649250458b2ade2d9257ecb6ff2e2f2a0f94b7cca2b1a9c0246596c2e
-MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
+MISC metadata.xml 493 BLAKE2B 7c8c3f7dafce95377347ff7392fd80580f0bc9afb05654795ba86ab20bc54054395a46eaa172cd61ef1084a023cc26bfa9c835e9d73f921f842c03e668bcb6a6 SHA512 00aa284252b1ce793b4176f7eb1255984670924b3dc6ee75867d5a947761a3db7d3b917f412629edbe146b3d22050a4383afa8af4f017ebe68728d1b5575a473
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
index aacb2bc191d6..15becda10129 100644
--- a/app-backup/borgbackup/metadata.xml
+++ b/app-backup/borgbackup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index fde9d86b8d37..ea3e257b4e70 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -8,4 +8,4 @@ EBUILD btrbk-0.30.0.ebuild 2442 BLAKE2B 3b344a7d8c0a9e93308a533bc43e7b43c3701867
 EBUILD btrbk-0.31.0.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-0.31.1.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
-MISC metadata.xml 1049 BLAKE2B e47ff64c01332ae21819c07797a50835327aa113662bed85043abb179c30ede2a96fa944ecba889622190e441a5d1e5eb49724194643b026446fc6288a8140d3 SHA512 e8d0fcbf7baee25c842f284f72c8894cafe246ef3925a2e40754add811fc1bcd34e5358d39ccf2977f9f3d4515c98750b1d45e80b1fd447e47e13cb2bdae4d89
+MISC metadata.xml 1063 BLAKE2B 3006f83965b390c29b40f43aa1e325d64982be982d80f5ac52d8e0c6bb52e595f36d3a623545a4710e53390e3a14acf170c00d8a37ce2fa092e869edfe3ed615 SHA512 aad705481fe86deb2434f4d36634d34301451c5508a5628c49cf17139d195caa938036f421479f0f89aaa3577c838af88e26be2ef0ac491bd4430b3610746db7
diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml
index b066b9973551..805fb44cb3d9 100644
--- a/app-backup/btrbk/metadata.xml
+++ b/app-backup/btrbk/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>axel@tty0.ch</email>
         <name>Axel Burri</name>
     </maintainer>
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index e5485449cb61..1a4d84c66e06 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,8 +1,4 @@
-DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
-DIST dar-2.6.10.tar.gz 2140424 BLAKE2B 840a7a3d33825658be541157468a15bc3a3082083a35c426ecbab1cd2e8026e0a4d15671a33472068e1256878d1f60d414c2c069a3223ab5050756b13c887b69 SHA512 2fceafba6c6851c5dd11c0d1a3fda8aeddac16f39cf0051027b178703a5e821fb769c42624063d8722d80ea62bb735f3b0c6c39538c1c939234df49d6b757428
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
-EBUILD dar-2.5.11.ebuild 2240 BLAKE2B 676849c6b7e0be4af55d7a4dd67159ef3d0eeea289de1cbd18c5920e9bdf793c0dac7a7f78d76eb1b42c712cd8de2b4545f9e6e911a5532916f17f9076fe9b49 SHA512 635cfb86497ccd0bece7145538130ac301345ee37f71c28c620c10236ffb02d5d184b1eebe0a09fdeb3b56ef644fe497d3fa49d319aa526529a7317f4be79f7e
-EBUILD dar-2.6.10.ebuild 2428 BLAKE2B c593a80f822bd0c0f7151afd315c19ed43442bb7e6f7cd224efca9b8b0fcbc8b0bd7544c89005e436516a5cf6cdf50a94b0f27453888d7014f7689cc7c202d39 SHA512 36bb65b69130fb29c4ad9b3a33779ddc6a637b97daea68bf6e5e6df32e08546300e4772e345744cfca67e52039b8d96e6f931a19be6ab055e1bc3ab8284ee93f
 EBUILD dar-2.6.13-r1.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
-EBUILD dar-2.6.13.ebuild 2423 BLAKE2B a98c3d902c783b6bfb5872334ef38e59224510b59aeb13da03791ace999025d535014cb9ee4e4d2dee7203417ae9c684ea278bf8beecd97ec5fea5f842fba989 SHA512 7f84a8f96fb7d805d2902fcee3a4ca8dd97a8b1e41fdcd2c7803e8a0e7676821265d0c8dcf530f3eaa66fd0289948ccd35b26339e8155d0d4a3af7a4d41b5b33
-MISC metadata.xml 1157 BLAKE2B 2af261dd785d76c50a8f6d4a428c90fc6c99bec9f8aa175424841b3ed46fa9fb8b7662dfcae4e417c9520229361ec4598e4fd5652e7dfc03b423e77869c418f6 SHA512 e3c5608eab71251150624237c034f412bfdeeb5500b8156cee6fe352c0529d17743cbe864f94da54c2f4ce8fda098b6561eeb5b14be51073e8ea22cf7bd7f68a
+EBUILD dar-2.6.13.ebuild 2421 BLAKE2B a16560b5fa34dafd05fcfe917b6739ffd8910d5284cba9dc28c343ba6e92f43704d2ac4e290f03be7426cd0896d371cd2ab7c648a85a5e05327800cb5f8edf99 SHA512 76dff2090770e07c49171176d149b42e5cd331e729fc054e4509598f5b5d26745de3a727d65af103cc72ed94abf103fe7be61b1c60ebab58f94688371588f525
+MISC metadata.xml 1187 BLAKE2B 63ef76c44a9792d83529247af4afb722f9d5de63ab29344ecf55c827dd4e4c20b4dbcc02a6e2e71b6aa33c14cd03f2b14d9cb90000ae47dbde89479b67c1e8a0 SHA512 39eb6ec5774043f23c68916cfeed74d0c2dcf4a6471b70610e5896687a866624dcebd2b0e2050d9850057d2844eae687b7c30338bd82c9acf63ab297e7473c5e
diff --git a/app-backup/dar/dar-2.5.11.ebuild b/app-backup/dar/dar-2.5.11.ebuild
deleted file mode 100644
index 0d7de4fe613b..000000000000
--- a/app-backup/dar/dar-2.5.11.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic ltprune
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-#PATCHES=(
-#)
-
-src_configure() {
-	local myconf=( --disable-upx )
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	use xattr || myconf+=( --disable-ea-support )
-	use dar32 && myconf+=( --enable-mode=32 )
-	use dar64 && myconf+=( --enable-mode=64 )
-	use doc || myconf+=( --disable-build-html )
-	# use examples && myconf+=( --enable-examples )
-	use gcrypt || myconf+=( --disable-libgcrypt-linking )
-	use gpg || myconf+=( --disable-gpgme-linking )
-	use lzo || myconf+=( --disable-liblzo2-linking )
-	use nls || myconf+=( --disable-nls )
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	if ! use static-libs ; then
-		prune_libtool_files --all
-	fi
-}
diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild
deleted file mode 100644
index f37ecb73ec03..000000000000
--- a/app-backup/dar/dar-2.6.10.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		curl? ( net-misc/curl )
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		curl? ( net-misc/curl[static-libs] )
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-"
-BDEPEND="
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )
-"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-#PATCHES=(
-#)
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-python-binding
-		--disable-upx
-		$(usex curl '' --disable-libcurl-linking)
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		#$(usex examples --enable-examples '')
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		#$(usex rsync '' --disable-librsync-linking)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/app-backup/dar/dar-2.6.13.ebuild b/app-backup/dar/dar-2.6.13.ebuild
index 171479d50037..ec82d1c077b4 100644
--- a/app-backup/dar/dar-2.6.13.ebuild
+++ b/app-backup/dar/dar-2.6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
 
 RESTRICT="test" # need to be run as root
diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
index 2d3b4ad0f78f..b601da091bec 100644
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ceamac.paragon@gmail.com</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 666da2e6e0e6..48106b03c7a1 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -7,4 +7,4 @@ DIST duplicity-0.8.18.tar.gz 1352646 BLAKE2B 9703ad0780d6bd7db970941f529192132f1
 EBUILD duplicity-0.8.15.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.18.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
-MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
+MISC metadata.xml 454 BLAKE2B 08e99a3d0e80e38e1ec062be7e4a1a4cc5b8d9e579381142a7c274c27cf585b7c3fd62fa14b1b2b486ec26d8aec4f7dcbc91fa7d8400b36fe609e240c67d6552 SHA512 a4c895eaf690f40fc197acf26501b2da386a3af716b4dda87d84e2d459ef9642e19e1e5ebca8a6ae156c272321d82279e573eaaf1ad3e19e7d5dd35e9f9e69ea
diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml
index c94fa8002b08..f4ba07141e1e 100644
--- a/app-backup/duplicity/metadata.xml
+++ b/app-backup/duplicity/metadata.xml
@@ -5,7 +5,7 @@
 		<email>rich0@gentoo.org</email>
 		<name>Rich Freeman</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index b1d06e091632..a20784070c4c 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,12 +1,5 @@
-AUX README.gentoo 122 BLAKE2B 2b8d4ce5a1388adaeb694bafbacae8daf7c417f1849ed54afd834888b96a94510238c9a621077fe9c2974b0b55c2b918a8e9b5493207b2f2cee7e846bb2532e4 SHA512 6d649c051529f6cc5a748f3f63c3d2f54ecf07d0a01fe6f091b7541b53c261120db521a112ac5bc8155fc330218a72b9a82f1801918b294dea22914ec6ac4a94
-DIST duply_1.11.3.tgz 44198 BLAKE2B 368c8a5d145068da00fccb970188bc64574365517211d3eca253c34f820dd520777f56ebc0dfddeca2fc910558e73bf6a2adac6287422b47d5a5751d43a74b86 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457
-DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec
-DIST duply_2.0.2.tgz 45406 BLAKE2B 46299930a2e05c5d3759e7a90a6bab8b41b28bdab95c945f1bbb5977d78cf5b72090edfb10bd69b2539c65b7c3804d45eb6b400866c6337fc4acdc283f8003e0 SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a
-DIST duply_2.0.3.tgz 45542 BLAKE2B 101e19712546c71af16f5988f1d1a70139414b03fa6abcf9b82b8a656a9fd7385b4c9f524eb0e62e3af1b9d0b9a494e47505f2c829d39745c8b88ce56e6608a6 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1
 DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358
-EBUILD duply-1.11.3.ebuild 589 BLAKE2B a2809b3b4c11f4a29915edc004b1d117416b5551a371a4e950760bb63cdf06867b3e4d077bf4840aaa488035e94e2870225f81bc0d60b58c99d6132d5774f54f SHA512 c56bdb7d9e4d183494c0498c004fa21114a86b651336648cc5b2e0036a2d2b51acced93acdadc26b828f50a37f404446330f5671d420c4ed26c05642e5262a9f
-EBUILD duply-2.0.1.ebuild 588 BLAKE2B caa38a62e139fecdadbda7bca01d1c1cc2ae998a09dca27c18015b28e907a6a2d603f6b6437cc7e766f378d93733ee9cd98c4a3be502d3f1622ddd4ae900da38 SHA512 aff7359b9c6b4c48b6902cb3c16a18581c01e68a83b7eab89ecb091d31021c8353425ae5be197ed9034914381f884927a75b7d8386cf32e3744efbc3528ca50d
-EBUILD duply-2.0.2.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
-EBUILD duply-2.0.3.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
+DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
 EBUILD duply-2.2.2.ebuild 522 BLAKE2B b8e653ad4fb5a3f8eb479e4702feb27ac408719a3588d060b738cb119ccf17155fc7c7108454e694c93309d785461b27212abaee09a4f485f7c82a33e0110e82 SHA512 5fdea7287f4ff925b2f49a604ff350b0da42b134c1aad53fb43cd5dee65ecac17ae1edc7faeaf67cf346ee665cd74030bc2e7ba94e9d012947c7feabd2837e06
-MISC metadata.xml 251 BLAKE2B 047dd5866af91af4be51a48a590d9a3d464494b4c0bc2705610464b91aa4ba600b3599780d597ad9ecf8d033911514c2cae5ee95013ef33fdd7391732e1b078a SHA512 a0a5c1972abfc47c2f46712a9d26e5f4f6df8899c4cc19896abaafe71d6f18268c0a969fbf34b7eecc5eced74da7e2d09aa7e1fc799b636b7981cfe1dedce7f7
+EBUILD duply-2.3.1.ebuild 542 BLAKE2B d3cf86920042f487c9d0b1c4c10305009d89647edf0cc52bd1aea31e2187c849ef46f0b016832cebde46256f051fb08b9189c2acbacd125e7832e19c9ce4133f SHA512 f1fa98b7c17dd94371ee2e327ee6b1fabe4bc6a59bf0f6921728440132cfa621efc06f92d5158d263fb24c382418fe2e0039e97c0706c30434a6938faf0a19bd
+MISC metadata.xml 474 BLAKE2B a4ac0dbf3e29853bc40b8c718a01409def4f6a956f4bb6cfe1657e79c71f09e11258dc2cc0b7443375af70cafcb31211200837d188b3833ea136b25e54234e03 SHA512 1f89f05c042d63ce2851246e68039293ddfc85de6a3a16b36c6de54abe7297326b03d9668dfbd7666ea0d5091975b83abb01a077254f279d76f4739760392e86
diff --git a/app-backup/duply/duply-1.11.3.ebuild b/app-backup/duply/duply-1.11.3.ebuild
deleted file mode 100644
index a68497432cd5..000000000000
--- a/app-backup/duply/duply-1.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-	readme.gentoo_create_doc
-}
diff --git a/app-backup/duply/duply-2.0.1.ebuild b/app-backup/duply/duply-2.0.1.ebuild
deleted file mode 100644
index 9b784d8c149f..000000000000
--- a/app-backup/duply/duply-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-	readme.gentoo_create_doc
-}
diff --git a/app-backup/duply/duply-2.0.2.ebuild b/app-backup/duply/duply-2.0.2.ebuild
deleted file mode 100644
index 8eddec6aefe9..000000000000
--- a/app-backup/duply/duply-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-	readme.gentoo_create_doc
-}
diff --git a/app-backup/duply/duply-2.0.3.ebuild b/app-backup/duply/duply-2.0.3.ebuild
deleted file mode 100644
index 8eddec6aefe9..000000000000
--- a/app-backup/duply/duply-2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-	readme.gentoo_create_doc
-}
diff --git a/app-backup/duply/duply-2.3.1.ebuild b/app-backup/duply/duply-2.3.1.ebuild
new file mode 100644
index 000000000000..b6505eb38052
--- /dev/null
+++ b/app-backup/duply/duply-2.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="https://duply.net"
+SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/2.3.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+}
diff --git a/app-backup/duply/files/README.gentoo b/app-backup/duply/files/README.gentoo
deleted file mode 100644
index 99d9a1320473..000000000000
--- a/app-backup/duply/files/README.gentoo
+++ /dev/null
@@ -1,4 +0,0 @@
-If you use duply at the first time please have a
-look at the the usage help text "duply usage"
-for further information."
-
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
index 928760c70b3e..f790d0c43e4c 100644
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">ftplicity</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ftplicity</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-backup/metadata.xml b/app-backup/metadata.xml
index 291110abf582..36252365f238 100644
--- a/app-backup/metadata.xml
+++ b/app-backup/metadata.xml
@@ -39,4 +39,3 @@
 		así como respaldos realizados a otros medios (CD-R, cinta, etc.).
 	</longdescription>
 </catmetadata>
-
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
index 352c8599b091..c70c06ed4ade 100644
--- a/app-backup/mkstage4/Manifest
+++ b/app-backup/mkstage4/Manifest
@@ -1,8 +1,4 @@
-DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5
-DIST mkstage4-0.2.tar.gz 15998 BLAKE2B 47ce4335ea5dd9cc0defb2897912ce3169e1ef23d03435ed7500a33f26e5646b1b97aebcac286a93e631f11c491cb076831d62c7b565493458c0882e6f359b94 SHA512 31b77782e6b79db1cb1db7baf30a2bd96e828861a9085b257d554d0991ea16299c3cc9a6e3fa2af5738aeb3ffbd040f6627af3510ccb8fd744b59658acc2dd55
 DIST mkstage4-0.3.tar.gz 18648 BLAKE2B 3a881bc1ec14f5c9795d49306966b586c30a8b415542fb500b5a2af7735008832ebc64f0a166ea4e2fdb48a555bd789b352784f1b05118116ae3f634937beed6 SHA512 6971bf4b43a2fdef0b54802b010c99e95caf896c8e109c54f5a6beb4db1714ea5639e0859ba3f958eed92b9fc6a3bb613bb82de440729e71e53543d60549d2db
-EBUILD mkstage4-0.1.ebuild 459 BLAKE2B 7bfa3edfb99837f99eec51dee1e70fc6754097c01e05afae9cae5721fecc285d3c8d503769062a60f28d631e3d709ef0b6495e70d0134da861507ba335a5ac97 SHA512 2568f56448c7a430a4df279550821c55ad50b5f46bd7b17d1188e411393949c557cab846975d09f1c4fbf09896408e0c34dad4df53ba0e2d6045575532b0b05d
-EBUILD mkstage4-0.2.ebuild 455 BLAKE2B 0e9e34ff5bfbead88fe060303276b55c6ad47544d702ab5c4517cedd7baaf9c6d1e08e1c28298b26dbe5664ea88dd10bba00bf8efc42b4cbf4837b26ba370ba8 SHA512 5de5cd34bbaa7070d4ac5d9d1cec1e2ba35c8def577f7b02f3250980dcdab9d29e0c72605ce7d058fac6c707517a32b489d8000f0fefb8821ef58562cd1f23d6
 EBUILD mkstage4-0.3.ebuild 564 BLAKE2B 04c3f8d12d73b68f5dcbc19403f3cf7c26d29e1ac4dc7f183bf0e150ceb7265c0d24b5da31a121d53b00e80389245037263f524c706d8d665cc9a9e0b5657c02 SHA512 1a53dff6acf100669b0fa9b6be0e9ba4b07a2028238891de1baf7bd80d52bf28ca58b26f61139adab004018c0275d855c12aac536fc43334069393677cc8bf4d
 EBUILD mkstage4-9999.ebuild 451 BLAKE2B 01273d1052e60c4b045b26cb5c58601a3827adeb8fffe1cb5d5244d83b8b6b677c75aa51e3ad2f6e8dafc4dee06f48acc17dda9e21ec03c9c7a5edea34c2d00f SHA512 996089d35c4b30da90eb0cea6fc86129c0b4026aba4f71a6703feedce65a02e91502efcda4d160b35ede0630a6c03f40f1784a08673a8c7c64188b5a1522b882
-MISC metadata.xml 726 BLAKE2B fc964c09603f87792d808d1ca8ad59cf50ef8a4c4253968047e9f48fe30bc29f957240fae93a8c64a852b22a3a8940a36dd8730280c09193e9e2663817da23f7 SHA512 85b3379847997bb76cc666c75f4243983793cbb8bf0270f4654f7cac45109fef9fb2fb1647086c3d642d42abba5960f715583ecdae879e1e941c91c40489fe12
+MISC metadata.xml 756 BLAKE2B 72e19f3eff1a3521c27c9ba144aa946ed60294aa254dfca022540c1b6ea7bc171ff888deff3adb2a889aa85056155037b6f1f6f929b7b4b3dde01b4f0a5d55b6 SHA512 3fafecc0208fb4f150e84fabe205306db37e560d712109bb8e6ae9a1775887c0d10948b6fb9ab05787dc1db0dee2d381e264839b4550e7272e05ed81a817bc06
diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml
index 4976c9a889e5..989b22cd92ee 100644
--- a/app-backup/mkstage4/metadata.xml
+++ b/app-backup/mkstage4/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/mkstage4/mkstage4-0.1.ebuild b/app-backup/mkstage4/mkstage4-0.1.ebuild
deleted file mode 100644
index 10464eafc25b..000000000000
--- a/app-backup/mkstage4/mkstage4-0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	app-arch/tar"
-
-src_install() {
-	newbin mkstage4.sh mkstage4
-}
diff --git a/app-backup/mkstage4/mkstage4-0.2.ebuild b/app-backup/mkstage4/mkstage4-0.2.ebuild
deleted file mode 100644
index 76dbb21e5baf..000000000000
--- a/app-backup/mkstage4/mkstage4-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-arch/tar
-	app-shells/bash
-"
-
-src_install() {
-	newbin mkstage4.sh mkstage4
-	einstalldocs
-}
diff --git a/app-backup/pdumpfs/Manifest b/app-backup/pdumpfs/Manifest
index a68091d6e62c..08e1edf305c6 100644
--- a/app-backup/pdumpfs/Manifest
+++ b/app-backup/pdumpfs/Manifest
@@ -2,4 +2,4 @@ AUX pdumpfs-in.patch 977 BLAKE2B 5be9f88f6af0dc051c856da71c4cb4fc3d52f610ec0cedb
 AUX pdumpfs-test.patch 392 BLAKE2B 99b04a1f9667e5996afc294de54eca4d45d51ca36103f661a9c576a823faa85b1fd215e27ae6d1f2d9c02e696f55fceb9b00e55778d56bad0e5560d40aa18a00 SHA512 b7647f51acb30cfc86e80cf5eb5e6d7fa84c6b3ba3c1e6246468baca7835bd08a6d3f3e70dbb55a2c6ef0ffe67b4d10dd78b5a4673ff636c8da74e64f7b827fa
 DIST pdumpfs-1.3.tar.gz 68210 BLAKE2B ab5428c0f12ac289ef6efb5ae1b1ebcb047ce48183a36423d6f4b80d2d55da07b6e346e8ebd0ccd6eb85ae132c4367bd806c8106abeb681a9fa6ebffbaef1075 SHA512 1299676982f1981aa55f0601f361ec24ac119067f5ecbbeebcf9f41ccd69df2f18a07ae5a6e77f30ca7606ee49ecfa516d6066a07c1edbb4d4796f34f02508c3
 EBUILD pdumpfs-1.3-r2.ebuild 886 BLAKE2B 0f8e1b67227771c8cb377468cef7141f726dfa9c69422d04dc3fc968f800b15f66b2c6810a1ea9eb0ab2f1894f35aad84b0269c92bf2001ac188098f28c6c626 SHA512 dccd98ec4b5524c5a960ec5d38d4669f0e15346e0bb65bb3e14fde696b43f45cbbe1882fbda5922edd241a8f7b0c49161f362c2e6435ecec9fc6fffe127ee52d
-MISC metadata.xml 659 BLAKE2B 2fb28583b174d69031ec454a7d8e45876eceada6d5a7c4a150d079a67009120f67e8cab6ac772d2c0968289544e08753a389ccb6d19854998e1d98deee9a6bff SHA512 ad8d61826ef10df3dbb0765ca6f5c020044ce015663f4b96dde61e92fca360866d72fb84751da465c0659956b6d849a565966ae444969c6a6754a5d49a74eaab
+MISC metadata.xml 689 BLAKE2B 6148c289f11bc85f6c8578911868a4a01bb9a44cc75ba809a90cac0fe59a6781e0dce3283f57db310dc3687e123723421e5b543d7ed4407dd58b6d338c95dc6f SHA512 827036f90dd063c262470c27ff1be2efa50c3d9602a579b20cffb8ba1ed3573be0e3e894062dc8cef29cae5696c5e02d5e05153f33a36ffabd9499f38e54614e
diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml
index 02211b3e08f7..adb6810be8ce 100644
--- a/app-backup/pdumpfs/metadata.xml
+++ b/app-backup/pdumpfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index ac7154bc1209..24bc3fbed39d 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -4,4 +4,4 @@ DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 EBUILD rdiff-backup-2.0.0.ebuild 887 BLAKE2B 46b346a08129103218be532919628a535a3191bebb0f113e295dd4d5d960f35e1512606995c9a591a975606a59e3d8e99413526daa4171e7264f49802f691fa4 SHA512 704dc8aeae4550d0582554df8d6c2de73ceb68739b3bc3fafbb34d1ccce76b147356a230b7f0504c683971ac9874e7d8c463bf7940c18a5c93ca7c6627a1e1a3
 EBUILD rdiff-backup-2.0.5-r1.ebuild 927 BLAKE2B 1a7ce4b894a30933cb05cdc643944a9a4a495fc5b4c6e2979a5b54216473c5a13b5083b8aeeef892a61845b280b099a38516c7dc3562bbe190acd6b61cbacecd SHA512 b7b727b17b4207a028fb0108ba2f814a782ff6822a96672e2078cc078b5733065fa827f68e5df8a73be5d326347a0c8c3b9b6788c8f6b7949342bf295d2bc61b
-MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
+MISC metadata.xml 342 BLAKE2B 903f50786c577854a71efdd79b6897368c6fdfe1bb796286397197de79c6c3a3339517d0efea229508dd11167ee52b8dbd5aae7846e1052642fe06163eb6e31f SHA512 13f95f42486db40682d3733858d152a30c3cedafeee6642b7517dfbb60f7eeedf5c0b65265aaf1a2be9bdd59f3fbabd0c6103cf8c1c4517d697eb887ab3e27be
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 8c94752564ce..7d47ace9caa4 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">rdiff-backup/rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 1d8937efb07f..73ddd2b5c8f3 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -3,4 +3,4 @@ DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df9
 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
 EBUILD rear-2.4.ebuild 845 BLAKE2B 4b0b46b7e0bac21849b77d41da8a442377a006fbebe868a53dcf2aaca4dde192ad5b95700112b800a3b55cb631901ffa32522be4dd094db87c8702f68ee4bbe3 SHA512 bd11af749e16c4c65ccf87a0f059c9c5b389b23b74ae6792b07b7667ad38198b3904357b4fa6597b18fce7405c43435b1c646e03111654fe7c474b7d32f5b68c
 EBUILD rear-2.6.ebuild 1384 BLAKE2B db9f7f3bebb2f3727bd0880432b8ae3735dfc94d310276e4ed1469869546f6d76f9c3aa1bd96140b6fd196497bdc7018a0dfcc6e4e3b1965ab53cad70997b88e SHA512 4f9d2114d74414b1679f3f3b01e2beb8fa7301935955f53ff41245415e23148311c7dd681811b136ff4d90d8cff651eb7f295e9a33fba70489eba92f4ff79769
-MISC metadata.xml 1014 BLAKE2B 8216e23c54712cf7b79858ef34b46a4f232aae0f9f3ccec5626059c07a0070445cc2db019badfb1129365d1d47de8b02d11107796f7e86d4889d39cc4e2b7a9c SHA512 b3b62cb4b708bf7fe291d5245eba04d53afca274e0e20f48f9291a7c76d64abcda07176bb9679b95b25e3246683157e5369f16535bc7b37f7a338f1b938e139d
+MISC metadata.xml 1044 BLAKE2B a7156b29cf1f9d05fdad1241e28e3df0c1c0a1f2a1711e9be7bc5bbaa47c2f2609c8ab4e011923b448c26694d4d8e873f348e25a2956df2a4668150e99f018e2 SHA512 179009d5a749f9acb028b11339ce825592faaddc65441591a37f9fde202042199e6e557f0c7110332c87835e80f64f22a6b5d4e0282b9cf164e02e2a99c81864
diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
index ccfd9c81bce3..3d18474e98aa 100644
--- a/app-backup/rear/metadata.xml
+++ b/app-backup/rear/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 8b8a0029bd33..7c4b3de5effc 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -596,4 +596,4 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b20
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 EBUILD restic-0.11.0.ebuild 32428 BLAKE2B 9547c7ce3116e92e034880bae157c1f82430e8b0740d1a5dfcb43898c6b68b300a518b973f6fe70306cba0d64a143fbfed08c8223ad08a6e94f2c3fee8775324 SHA512 9b6170323810b0b94ce6c5664276e2fc5bb6d2517e0e73ef9b086eaf90337a533c775b943e603a91f54f4e2128991a8f1d99fdc3bad269a7d4e7ecea4a429d96
 EBUILD restic-0.12.0.ebuild 32336 BLAKE2B b8b8313b36d84cabdc27c3a73afe7da27a92c62fb2c2ef4540e851108a904b98c55edfa09cf4aa5c239d43ab12e968ca45103714037975c38ab1542fb8246528 SHA512 687325847b768e3741ca63aa836534fc81139607115c55bb6fded0de34b1d115c65f0749691206c295e1ec765938908b61673ee028a722294d4e2706370e2527
-MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
+MISC metadata.xml 474 BLAKE2B 1b2acd92a1ff87ae82add1c26a0624296502c45f8f82abb1fc7a07e5b5320933ab93d56f1d10bbba63b804f7720202c6959f655d220366a4cdd2fe55c8b57844 SHA512 c5fe6467d6d74f94afc85d184355fa9933698d2c55e7b35f923ecbc377ed118f7c101bbe8eabf22feb3ead48f5be00728955b7e1a25772b7e49a4f430bd72a91
diff --git a/app-backup/restic/metadata.xml b/app-backup/restic/metadata.xml
index d013f0a0c06a..ded6a868bb06 100644
--- a/app-backup/restic/metadata.xml
+++ b/app-backup/restic/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index 4e7bd04ecc6c..83e60f7eb4fb 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -2,4 +2,4 @@ DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7
 DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877aa483e2548b5ecb933c3f6e742046730a78b95fd83bfa6496a71f61dbce2a8bedc42562503bef753b0c72c40eba SHA512 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3
 EBUILD rsnapshot-1.4.2.ebuild 1336 BLAKE2B 8ee3cbd073f40287f5b6a7c9e3e6d05a6d4003a22d5c74460f0dec473a8cbf96abf07417cee854d7a7a35b405f2e281d36c3959f26fdcfdcaa8b1737bafc1c6c SHA512 f6bbd4d2d6a89acb6a80ddd916b1b3d8c91a59e2865586dc0b9dbeb842da1f31b1819fdd2d7ec6d8103cb9d2c20f42db11d3589d61dae5652ab0b273413f3a97
 EBUILD rsnapshot-1.4.3.ebuild 1338 BLAKE2B 7dd719ef9c19ae983fd825fb36b1d771720c9e91a54c63dea5d48edcc36d247ab7d081996e3d002f7af2050d7369982db7b25b5a6cd91b79ba89aab2b9be1b5e SHA512 aad5bb2cecbb471e0c7af89dd0143b74676dc10ec496092e67d58cbfcb80c91205e3792768353961ede0de2650e45af05b25f986e364b29b80a9a41c70982cbc
-MISC metadata.xml 385 BLAKE2B 663d1a8524cad5c1ff25711d7f63808109958f264a18c40195b59d2ce03c3ac92dd4812097863fc36b95f6da92c47f7fae820446323b1c4c9973facabbfb8e34 SHA512 1dcdf81afbd2de28c4039e74e12111b7f334717c68ba161951fdea9e327a97f1cbed3e1b50e3dab5e938cd5e022d5399e0c0f1b19f3a8acefc5523eb57804d54
+MISC metadata.xml 415 BLAKE2B 7c12cb4d9fcfa60392b2c7f3cf71fdafc39f67e46d453f73c24a4658e25a1c76aeaa2d8bef11dd51559133d29c83b17442772a1af5db92912711b0e7abc05a38 SHA512 b178d64c84644f8500463b6d187d7478a923f49df7db891bed60d8a69591eead2125eb40e8fd7b4fe97da9598af8f769ec7f34445afea1b1b7b58ef0005def88
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index 41d4a20db9c6..c96a312b18e6 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>Sergiy.Borodych@gmail.com</email>
     <name>Sergiy Borodych</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 9aaa7ba2a1d5..8b122b0fc0c3 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -8,4 +8,4 @@ DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228
 EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
 EBUILD snapper-0.8.15-r1.ebuild 2047 BLAKE2B 60f9e5d2b31d3d4fb8b64c07d2e5b819e83653cef5b51bd2a5fdc79c0758b02bdf64eebde7d98ebcebc22ca2cb100a04ab09bf29c03c7616504ea2cb1c868187 SHA512 5b14fd94d7685fb733d522d786f47bbed6778af456e3df6a3f2257e8c7456743a2e6b658c3af2e3d6d81a560a4c6049af9549aa89cb56b1d38928abf3bdb287e
 EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
-MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
+MISC metadata.xml 1330 BLAKE2B cf72d6a7fc0ae542f465e6e916ae284710f057cee8492bbb2c3f3ce833bbc633e4ed53dd996b231bf26343898b344c37322582c18dbf01e23d068b80fccf5875 SHA512 3086569ba74f6b163619718fe08974856634dde997fcc2a8152f7cc1ba1a5c5638869869806d723f65249725fb61d84d3fe64f2b3b58c8b5e05a1524cb464915
diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
index 1aa9b1e774ab..9caf68b236b2 100644
--- a/app-backup/snapper/metadata.xml
+++ b/app-backup/snapper/metadata.xml
@@ -6,7 +6,7 @@
 		It can create, delete and compare snapshots and undo changes done
 		between  snapshots. It supports both btrfs and ext4.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pastas4@gmail.com</email>
 		<name>Dainius Masiliūnas (GreatEmerald)</name>
 	</maintainer>
@@ -14,7 +14,7 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index 721b6a868058..a94807265958 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,4 @@
 DIST spideroak-bin-7.5.0_amd64.deb 20758038 BLAKE2B ecd549ee0d479f576e8d50b44f4f7a13c4d24445af32f460d34081e5b654586f314399b34cff1c937e157582a143fee6b98641a68655552bb6d3609e532ceba4 SHA512 4af9f6b57d8748c03bccb0ab843cf27f70eac8e8cc5f11bb494c597d5fd29f475bf9c68bce8971d3cc1550a6def7bac6beed78fdfb31961b09be61ee14116ddd
 DIST spideroak-bin-7.5.0_x86.deb 24779422 BLAKE2B 8cdae243794e5de6a8326e335b539d004c0ba0f1121b85067acbffffbef67f4a0c785f3b794abb62a5eedfd459c8e4d5e48cf8848b005ba637150b286b13db22 SHA512 32504b6e6931f1e923d4202f0b3201c93190128d30767ec41ac11cf7c8c751b87094bdedcf44dda3ae8089543418366c5a78093b9236fee5f95e7f89a29141fc
 EBUILD spideroak-bin-7.5.0-r1.ebuild 2668 BLAKE2B 32c56a7d6397d39a95d0de93c30f5fd3518d072e538a514144c573f03bfbfd4401df315f0d38915d552e5bc6e0e245b11365fe16349028fb81b71a5f577100d8 SHA512 dcc39e3ff959651bf9e3db5841beccdff348c206307810ce31c99e44a5ebdd303870bdd809ece124bfcc269fce50d8ccc07dbededb0786c73cb589247b890417
-MISC metadata.xml 352 BLAKE2B d51f327fe859d894ae43eebfeac7b983b9b450ebd190352dedaaa95f844d1df86c6e8ea6b7478dafbc419af1fa273760b0c53c02280050947058ba052650f53b SHA512 fd3c4eea494c4e8e5f093e5cc099577c2f944d0f05c6376798a1e7680e9b194c45719e09a6cec755054b174dd6f9039c69d10e863f0bec72b6a15420d0c9bd7b
+MISC metadata.xml 366 BLAKE2B 6e319c339d3d88f78db4ea80cb4a3cd185e86f108ee34d0df7101c6a57b2eefc43b1ebb3985d8d8517d28f0359f29a5535cc79c5a19d2b7a96f2d1333dff95e6 SHA512 20ef3b773ef34ff3936408fb034c73d4e2a5bedc5e0bd2deaa9802e208e17b73dbff8e15b03bc82a56f4d70c32b3d980f542dfa4370a7f88f3759f8573de0763
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
index bdf371a8df29..9c281652cd20 100644
--- a/app-backup/spideroak-bin/metadata.xml
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>lucianposton@pm.me</email>
 	<name>Lucian Poston</name>
 </maintainer>
diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest
index fdd72b3ab59d..71eca267a410 100644
--- a/app-backup/zbackup/Manifest
+++ b/app-backup/zbackup/Manifest
@@ -3,4 +3,4 @@ AUX zbackup-9999-tartool.patch 283 BLAKE2B 227d8a478ab9bdb67208a493b1f06225e3ecf
 DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575
 EBUILD zbackup-1.4.4-r2.ebuild 738 BLAKE2B 133f13eb20790b893d59ea9d18f71b38d9074eb2546f9a7bf2dda3297e7078f4148642b0273b4b4dfe64321afe9eb75cfbf3f90f73247c6d4075390e7c22cc20 SHA512 9caab4dba755b62513abc646e48831ffa0e71c440a51c27b13cf12b638e203a1d37691b021ce5b7e4e9dc71605e031efe22962e6f6b704694d200a48c29a9c7e
 EBUILD zbackup-9999.ebuild 741 BLAKE2B 7a8d5a598999d6a527dbf170ae5c83cc71650c3ddba8baac8c0749e8ac78711f94e35410c1699ecf27dcf61593c704c4132b0a17dbf78702d19a2739d11f6b28 SHA512 d08869691bd1495af5994b41acabed901aa29719c74192e8ed3e4161544ca5deb22cc26d790ec5ea62e6614b15d66baf403c97f247b685558af6fc099ffad929
-MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524
+MISC metadata.xml 898 BLAKE2B 4e71695daff097301482ae9598551223b6c3f70f112529a6c4b775ea5f287c64d65c6927b9c57fd4cd9b453b09bcd348fcbbb4526f1bfeb60c53c1a12d02d634 SHA512 d101d6d3c304f69a58162bb6a5b00f6c2361ba0ad97775dd6c25b6c6ba77d59f4f1d82bf8d8146481000753069cc3e9b4df150b146a2fbc2713f568dd1d842d7
diff --git a/app-backup/zbackup/metadata.xml b/app-backup/zbackup/metadata.xml
index 65b656521136..42d77886939a 100644
--- a/app-backup/zbackup/metadata.xml
+++ b/app-backup/zbackup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 369af268838c..eb3c781cd2dd 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 1babff005815..501ed783b0ea 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,9 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.3.2-Linux.tar.gz 93056596 BLAKE2B 400bb854956fa74f0f3399b3d4d98f63e9c1e28890001cde55a2aa441cdf2d2aa2e7ede6565bad3defdbaf29913bde66f06a9b341134ccffc434021665a84a89 SHA512 03225a4837c02745723f0d5f65439c20977bd16243c1ee2ab6d1540828b54778de93c82ca5688b3bfefe0dea4e41fda43fdda633a9b1685382fd549742d580a9
+DIST Geekbench-5.4.0-Linux.tar.gz 93156197 BLAKE2B 5d41cbac86ab9a2f9df2a401c6081da3b4e4f4d405ae6913371eae4dbe3135dc781220fc0d43fea58bc4dbde6f1383a4a8cede82b16af813b8cd401d72b2cbcd SHA512 85f1ac0a9618ef08139f9a08051748b1c23827cf770c1e2abd7829a93d2f656b6dbb00fe194b92a15b6f94694142f2df62ed5113b50a6bec4777988e322bd2f3
 EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
 EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
 EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
 EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
 EBUILD geekbench-5.3.2.ebuild 1030 BLAKE2B 4d6e7cdc1b6df833af68ac9592fcc96aea1a8a6c7612add61df7c8f61a967c6c9d4992fa8b8e279dcbbd63dccfd9082aac415f4be4650767e04042985ddee51f SHA512 aa160280a524a86e8c78504255cc984a2ba18ca13ec0df019728f54841d18108844bea3e946091c2de3c30ac7f1c01659ac56c56cd7cc4aca77a6e01ae72ca2f
+EBUILD geekbench-5.4.0.ebuild 1031 BLAKE2B 25532425376ee29508a8aa262c0b2f914226a5949a8e47bd03b937c3464c1c034dc28d9e7c7cdc3bf100799f9f402d78209f5ffa80bccb23cbb229c6a13c578f SHA512 0999f6362bcae62a6e8d50ac7a8427f69717a5ac7ed5d85b23c70854af4dcfb24ed92656f0483b919e9303a31afa752396b7c9c8779048241d6f31e49429affa
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.4.0.ebuild b/app-benchmarks/geekbench/geekbench-5.4.0.ebuild
new file mode 100644
index 000000000000..257bad69c379
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-5.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com/"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* ~amd64"
+LICENSE="geekbench"
+SLOT="5"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="
+	opt/geekbench5/geekbench5
+	opt/geekbench5/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto /opt/geekbench5
+	doexe geekbench5 geekbench_x86_64
+
+	insinto /opt/geekbench5
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench5 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
index 710d888a6915..03744c3167c7 100644
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@@ -2,4 +2,4 @@ AUX httperf-0.9.1_p20181111-libressl.patch 1907 BLAKE2B 7a4c3d3b11d41c994dc1b098
 DIST httperf-0.9.1_p20181111.tar.gz 107070 BLAKE2B 044f45b0d4b17bc714a718835be1e713092fe7f6d6573df237ba87791e5783e8f60d1218f29e01473ccdeec3b461d3ab7d35d68a1037ee693865a37fd78b7ea5 SHA512 34cc92f3de6d1dadc3fedc5b5f617538b76787496f9dd28b7800866abaf96c7410765d4bb0989000910bf2b51433292c0a7009fe64ba4fd29889ce96cc4d10fc
 EBUILD httperf-0.9.1_p20181111-r1.ebuild 921 BLAKE2B fe145b72aecb61b52c3e7fb3ce098daead417280d127e02ef0829083fad2c6c04cdc940752645a01380e6d9f28483bb915f4992a5effa4087ee547c224899c25 SHA512 b09f58c353e11b84be8a54bdd680cf7a82cfa26615b1ea2fd973d4497f5cf728d185c2b66c06432bca44df833e3f508ee45627633d02afceb06cc22f85e894c5
 EBUILD httperf-0.9.1_p20181111.ebuild 872 BLAKE2B 6c782cb5e5c5ed0cafb8c9143639025397e4f06cbddf136eb8d3c759585b2a0ce4328c73f358a9e29b90d2f1c38c9099fd500ed1d7f3fd368c0b16e99cb035a7 SHA512 30ebefb5b74f7d1e668f2c224e15f1385227914bcf1534ff9777f5324c22235999d051a7562b960dcbcb632dc9a2f3b5965dda9aeb713a7b507641ccaacef3b9
-MISC metadata.xml 1212 BLAKE2B 91938ca5e7b245185766295dc75674bd5cfd3020f01d4340513bb2d0cb963f6e883d1ba561f3f3f1dde233a6360fa38e220224daec27221d57acecab1a9c3d0f SHA512 60447c4e412d2621e5d6903ac31f743ff3aba28cc66df150e96c5b5f52748575ba5434f3e6331f840bef95f9e7ab55e17af973331ffa3f030ec8dcd457733f23
+MISC metadata.xml 1226 BLAKE2B b54552bb32937709b97ececa4899fd545254144c19dd639248b813f4ed5d98436d786def37b326d84b30c7aba7a6dfcbf48919cfe5368fd66236da58bd52817c SHA512 6035419ee87b279de13bca869a8407bb1dcf3198d49670219f708f57757c61b62c3ac41c31a41b4972829388e71b69432b58e61ec63882f3d6b8ffabb080af58
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
index 629cc32094b2..45e99954ca18 100644
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@@ -5,7 +5,7 @@
 		<email>gokturk@gentoo.org</email>
 		<name>Göktürk Yüksek</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zekeby@fastmail.com</email>
 		<name>Taha Göktuğ Yüksek</name>
 	</maintainer>
diff --git a/app-benchmarks/metadata.xml b/app-benchmarks/metadata.xml
index c7ff9093b3ee..a89477d1a02c 100644
--- a/app-benchmarks/metadata.xml
+++ b/app-benchmarks/metadata.xml
@@ -30,4 +30,3 @@
 		wydajności.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index c5389573b180..336c7454b49a 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,8 +1,6 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
-DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
-DIST siege-4.0.5.tar.gz 525122 BLAKE2B 6d7410255d9682eeb6755bbf2eb6fd189d1c6e5e4c8bf4ed430e0ad4157ee6af9148a1bfe554167b74a6250b4897a3d34eb1c6c10cc91ff2352419769b9db975 SHA512 61f1b0a9fb4f9738f51932d5203a0ee6435aa413975dc3f5c7afafd74ec206e1ec20f5134171f740f55465e6c015df8bdac1775bc04be50bb10d0516e1a62d53
 DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
-EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
-EBUILD siege-4.0.5.ebuild 1275 BLAKE2B c576911dadc810da8459e1c7d87be18b41da2275a9d445b2fbd15eaedea616db81bc11aeedb119c28df74322ef28fb9a92fc2248ae8025756dd2096f38ee5c44 SHA512 1aa8ad1f8d47675fa6284c02bc3db4b086c04bfb5cddc3c0566fdd1fb82fd2ee8b56f9e6bb08781d3844415c3bd4fba21e098b83c676a4a4c95c1ccb5a2f7883
+DIST siege-4.0.8.tar.gz 525619 BLAKE2B 4c0b570810c4c1f3f13374aa1f33dc1624f989096280fd672a2c3deee7827099d790215e2583670fa58862df35b4db8998cf57c3c864354e8bd8aa8093c66724 SHA512 34239d761c1fff2a6048b59a98b64e87da065257ca4d62eb899f600573d920f5503bbdad8f5c5d31b4052c64857394c7899a9bda5384c00be8652ce4c98845ca
 EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
-MISC metadata.xml 832 BLAKE2B f56d0661ec0f81d5f155be79e6b52712bead41876a1ad2049e9597ba8923b7c0583d1176b64d4f6c76d18adc84f8eba244170e218f4987c6e499138334295be5 SHA512 7f0697daa7194a1a4565f83cb8654272b4e6ed630f41f7be83dd9a972c93ed2f1267f5ddd9f3063f39445b7a02f4c9645e0c0e4239262a98b536b28f96a11266
+EBUILD siege-4.0.8.ebuild 1282 BLAKE2B e90fbda64fe3a679ffb870245a1fd460892b878b1459701f101741ec5ef64435eaaf3217837d4d5d305a5ea21ea31cf31dec4307e7b23deddddd903adec1b38e SHA512 f77ded5a9f0c59a9a33db4a0002334cf6ba2e403677d95812e6e1b7347eacbecb2aadbc262c1a56499eda057be4777dc712f7a1a14ea2d654a6fe928f9cdfb0b
+MISC metadata.xml 855 BLAKE2B 4dfaca82343517227a9fe3f2507863665e5d966bead652ce7700a2a2aa86363750df02e6fb1dfa2ca86d781cca3cb02611325c6def60461692cb2213d5c78d65 SHA512 09a8da39fde59f4eb9e93d39c7e2dc3414e6bc24d0b4c24e7bcef5878f5987221ab7fc3e7285dbbf1be619ab1663a1aabd267ef00bfea9c4b3addd52473a0679
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index 67ce38b8d2d8..a29b53a23697 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
deleted file mode 100644
index ebd14cfce9e5..000000000000
--- a/app-benchmarks/siege/siege-4.0.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home/"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_prepare() {
-	default
-	# bundled macros break recent libtool
-	sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with ssl ssl "${EPREFIX}/usr")
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.5.ebuild
deleted file mode 100644
index 48cafb2e2b8d..000000000000
--- a/app-benchmarks/siege/siege-4.0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# bundled macros break recent libtool
-	# remove /usr/lib from LDFLAGS, bug #732886
-	sed -i \
-	-e '/AC_PROG_SHELL/d' \
-	-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
-	-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
-	configure.ac || die
-
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with ssl ssl "${EPREFIX}/usr")
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-4.0.8.ebuild b/app-benchmarks/siege/siege-4.0.8.ebuild
new file mode 100644
index 000000000000..3b1feaf8f88a
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index a229e5c3a5bd..774d630cbfd7 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 AUX stress-ng-0.11.23-makefile.patch 1635 BLAKE2B 6fd6b90ea16080d5f131724dd9f7128c712e7d6e912d2c8d420fa5c4ff6840e5fffddc18db4977133b0f36f34c5f67e35f106adaef685c0b428d97d37c0e3291 SHA512 15f28bf02fb36e08bdef49b75e413577d226d2e3287560f19c3ce9bb807b3923d7832166156627f5557ca0a1e8e67b9a42177042ad9f1909ec5364e72544d3d3
-DIST stress-ng-0.12.04.tar.xz 527336 BLAKE2B dcf9dcfd58569c90882a44ea8f34df38f87f2fe7d346f404eec28f9a8d8b5e07cf405df5e8d6870dca26ebf6683b8ad8da75036c7c13840bc8bc48123c63d54c SHA512 0fdd92d8b9374f5e296cd8851d2172df2dacfd2c99ab80914ef1bdebebbc66cb88e1792d819734203ec9d4f657765f1cab0e46e12cc3c8753559027b98be884f
-EBUILD stress-ng-0.12.04.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
+DIST stress-ng-0.12.05.tar.xz 529660 BLAKE2B 3ba32dceddeae0910a20fe2a6dda783845059a8d022c372ffef9fc2908ef8b724eb9ce9fef111102f4a07c6f3f05e80560d74285c15a6f82f665a716163b4f1e SHA512 c7be3bfbded5e0d953a02d59fdd983af46e9588b21c4858b26a9432b72f4c6bd5710f5294372746adcb52aeb8d0e9800c99c3256d269b25458af31591f63a758
+EBUILD stress-ng-0.12.05.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild
index 01aaca45b7b8..01aaca45b7b8 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.04.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
index 58ac1d01a05b..ecee29dd700f 100644
--- a/app-benchmarks/tiobench/Manifest
+++ b/app-benchmarks/tiobench/Manifest
@@ -2,4 +2,4 @@ AUX tiobench-0.4.2-fix-perl-shebang.patch 1530 BLAKE2B c6800722dbd5edadd1ed37142
 AUX tiobench-0.4.2-gcc5.patch 1309 BLAKE2B 7c432efee2225afe0f2e35688d19b735b7cff6f21605570b70be446d1e92d6feee477403a37d83351cacec56310a2e0bdc8dc08153b4dc0631b363419a3cf784 SHA512 f462c4eab88aa707a8383fec9e6e8c15f72237ef3d67f8481d2d6abef855f68b5a4281a7a1f1668b968df988e9ac283e4aabb2dfaf68b33cd3430a90e59f97a7
 DIST tiobench-0.4.2.tar.gz 32182 BLAKE2B f3c0f78daac0dc8c38de2049f8edfce7443fb43a6aacf31a0b5c12abf80ec0ae4c03b1bd25f954db261027c16dfb73fdffe970a730a853caf25763579c2e7170 SHA512 02e82d86ee889a366c1a00d4fb49f63d926e44ba6e2f297212479a5c13abe008b62c12d44483de7e971b5ebf875d5c07847f1d69dd11b2e87a050e27d8f9f09f
 EBUILD tiobench-0.4.2.ebuild 891 BLAKE2B b0d207e71b29c5c5c44f38b1921f5a990c3ef47991172e48327bdf36f3d67937474de727b362c00dc2bf88b6b1ffff5dfd0bfd05fcde57deeb5168a53a9bb5e5 SHA512 2749131275caa448748c0a3e9a7741ad5b7aa6d39915f526c0863203a67074fc4cec8422ecbe3167836fa292d218119cb837585c66b6e6b876e084fcc5a9aa0d
-MISC metadata.xml 382 BLAKE2B a8a9d1771e25d37b2d0d4b5264517e622baa324d2891c7f31a254d4a2d05b95c03761610525a979dc9d0e3488d96e64fbcbc651dc98f82fff18077fd49a33cc1 SHA512 ab6ce68c948d173a0241be91da8af3f3690510b521307efe0752f6ca9db17ef573f2980bc16fe904c26123cf2802035de97e58f39d1f60d19ed827d53d06fb34
+MISC metadata.xml 382 BLAKE2B 529653d12fcfd98dc7fffb9685184438ac2208829c7b28b1e2591b29aa0c5596e1ae3011d0d665e58b92a81eeaf0c7233f025de4103736205532fa793264051f SHA512 8cb07a1c45cf762fc95fdb004e60d9f6f5a514fa8fa562b4a95c7f4f1b049d1856620f405b5dee6b0bd3ac9ab3439529f13a07cfcd4f04f0581ae07806fd0091
diff --git a/app-benchmarks/tiobench/metadata.xml b/app-benchmarks/tiobench/metadata.xml
index c217c527e32b..3b2441a73242 100644
--- a/app-benchmarks/tiobench/metadata.xml
+++ b/app-benchmarks/tiobench/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 540260b9b5c2..c9a40c32524e 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index f822fce2819c..b41ebf079235 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,3 +1,3 @@
 DIST bchunk-1.2.2.tar.gz 15359 BLAKE2B f3d65392305ea0cc3e8a3b8449beb7bebd23f614445f44350d66fd2104db89e17fcf03f6e01144d0da2c145e2c227bb5385f67dc2d443e38b49754349c549f8f SHA512 94fcc1dea3a38a907b3f209c20f3de54028cc34bf8964d1dccf94faf3ca3851270cc8e052c29a3f04c60e525c029ebfb1c3c04fa85525e20273ac8d72cb317c8
 EBUILD bchunk-1.2.2.ebuild 606 BLAKE2B d2a194fce2d473f6c95b702afef6df293fdc4013f57c0668040c81562cda19ef8ff3f193dc8b7de29a5c0c5057bdab8287d86b92698f3e5d5b1e8b5004dc160a SHA512 17d893f3a5f117b684b5ed0964a4ff2dcb347e3bbc72edd3113b39b72fe2eebb39b1fc019af74011387e6666d12120c7fe7cf953e1476a3d510a26c61ffa4611
-MISC metadata.xml 533 BLAKE2B f7a7b7a4e370d07c9ea853e33e481b96d7dc2e779b7ff67dc42ec3d7fe6e22957f4ed20956a1c9b525ac38e9e279cf616f8630c2d6cbea44f38a682d05c5774f SHA512 9d0ef61e44a2d4d36701061631e196c9aea1ef69b7a2252f05cb525d17714a395c92e48cbad9bf0a98da62311efb575fd48c7e79ca909ce41ad74916380c55eb
+MISC metadata.xml 563 BLAKE2B 75fc0356f158ad31b5246d9be818ead7337b523940ffc95ac4f1b1da8c0148a525bd63f5470a2e872ddaf175e35fc4b684ba9fb0a176ec6991e9e75a94255b43 SHA512 dfaa0fd0a5f3a1038b3bd6fec6f50fad082d2693537c163f84015eca3891b3d9e4b97bde95ce449d1a6158e39bf8fa1a203818f8ac1428859ef048b38fd8f076
diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml
index 8b0ea11bac68..8bf4f7c7550d 100644
--- a/app-cdr/bchunk/metadata.xml
+++ b/app-cdr/bchunk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 57c70cee8925..913da6f24a7e 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -3,4 +3,4 @@ DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c02
 EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B 21f23121e6a768553ba716406f5f6a85f2439ae89f72d3c544be6da81804966a2df259c22470608a50183afbff0dc3e612eda3915481eb7bf696806a1a2da9df SHA512 4a638e201cc290a51223f48eaf82a46b05e50ace89bf881952ab0e76e66fa38077d84dd8359e8a133bd53774110f83b2d6949f349629cd1b7ee774e37d7f1f1d
 EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 7db6d921230dc4e4ef268c3d20399c428de148f5a1293593530f6f651736d3ecc9b6ae203d209a490890d4379e54e34f06e9857901e809bccf7108020bf79213 SHA512 4c0447b1797904aeb82b6137d1cb5be39a37510171dc5c7457ab796168ab6fa1a5560ad41fb3db5bde9420e415101e1b8eba12e2796f33e9c70f71f546a96bd6
 EBUILD cdw-9999.ebuild 849 BLAKE2B 90d2548a91d97e58118ab8d1bdd5ba50a36742c3ec35b8e163c3c35d46eff7d095c9a823a34c29cc1bff3447fe2c0234f6984da2ddaabbcbf55c1406ff81108d SHA512 a21229cfe723712d29c76746a3613c214ba6098ba13b3672096a2e756d203362fa4afb91c9a230d8e9f79328a3d59406159ed0713e9e3add5421f06ee6b2984f
-MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
+MISC metadata.xml 476 BLAKE2B 37ecd4660e4f625f24214e7475616787265a19c2799e727834201fc9f4ab7d369a33d5e554e37daa4052c2250abd237edcc42fcf965a26a7827e1fa3cd85e23c SHA512 93c7458dd0ece6cc43f8cfed098a22d32e5032aaf92d48fa92f6be2c01f3a2c74f0edba1adcc035ed87e7a5d06be31197827432ea37e3df4ff70c7e8f17bb5d1
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
index 9325abc85670..7be2c9fe2701 100644
--- a/app-cdr/cdw/metadata.xml
+++ b/app-cdr/cdw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arthurzam+gentoo@gmail.com</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 2aa50dedc649..4cd0872a9eea 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -6,8 +6,10 @@ AUX dvd+rw-tools-7.0-wctomb-r1.patch 374 BLAKE2B 670740ca45a6d6bf9e054bedd8c105a
 AUX dvd+rw-tools-7.0-wexit.patch 382 BLAKE2B d07a8e54fff49ef4dd6f36bd3beba94920bc7a7278f03787d2c6cfaade36d8d39f804885839de1bac7755e9a075143de75081d18fb0733cfa6661726a0958d5f SHA512 d98a66ea2e08b14683377c3aff491fb2ee6cd2742e42191c1f7d47fe3474c2ce5f940ba82bce46e557886adbb1fd94431531f7aa73a572a7d41ee227428576fd
 AUX dvd+rw-tools-7.1-bluray_pow_freespace.patch 512 BLAKE2B ca65ce1389dfb0be7b28882897c5711d8f98edd5f72be5f333703af9c42acfb655c711aa7edd7c0bc0bbe1a1af8f0e2e19eae1a3246deefa1a968ad69f3e7958 SHA512 61125ad2fcaa23172132499159cb66c44ba90513328f547c33776cd878d0afdb6927679396290450ab8cb3bbd5819528fd340b1b48bf6632b00d74e3b6357e72
 AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf344e40a191fdfdbd0f7ac9af91b2d346fbfcdf73a2e957c1f5a3aca6bd133054d0a8a89553da2ff3e3e5661241390b0358fdd0 SHA512 d585302680f094eaecbc5ad7d4bfdaf91ad61d621c4c87965c2a9172ab8c2044ad929ff58470f2908949f90c6e227d43778a99e86880acc32c13d305d88505d6
+AUX dvd+rw-tools-7.1-clang.patch 2341 BLAKE2B 752850357de4e38d1f3ba992720834b131367ff3c2d75507356f4734612f7c584241ae3c1b6561e7e81b767fef3d94f45300d790d952eeeea883f2728663ea40 SHA512 f97a12cec230554488c7d666c0134f7594f97c924052382615061e3c25c2dc44c5403432ef87375bee73a35b52a87be4473e00f3be47883dce4a7d6f73f0c054
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
 EBUILD dvd+rw-tools-7.1-r3.ebuild 1536 BLAKE2B 079c22093d821610304c2b687b14feb4e15d70c50acf897c97c40a3d99c9783174feabd7ab08029e85a4011a33ff759d607429b04889f0a56938c37c22919e08 SHA512 e9eeacdc4c4ef38eca0195b90ad1fc6a5e8722c637fb5dcc608a131cc496efdc7f37ac5e2180276e65337834bc1a8dca18c46e3e3624e9447cedcf90f6a0c376
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD dvd+rw-tools-7.1-r4.ebuild 1628 BLAKE2B dc497c09d4ae3784da38654f6e511002b8ee742a5d44b612ff03a86fdf5e1a767578c323fbeb0b1bfbe3e96a99b8d08b67a9b54c6758770665b05ece9c92f1d8 SHA512 5a085d7ef7bcebee36f28db72b4e04e3603f715b4df0dac166ddca6a7f7636698f7025348ed64ec4ff2c06e2a28840b3fb723ee3ab28bdcd8b6836c12a9c10c8
+MISC metadata.xml 402 BLAKE2B ce7dad4fc9e57a354e4cbd49d7c2ba2beb8c0c8e5163ef846e51f6bfe329cb2368857bf027f0c8e01f3722ca956ed809e539ec665cf48254022efa4b0cd50519 SHA512 a69578f7391678865fdedb982b780dcf8733096a1ca36219e9045708e9643e9c5a1638f59dffeace89cdc12b0ec58c7dbea271a04b8214b8cc58034e0598b29e
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
new file mode 100644
index 000000000000..6e8c6a487ec5
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="app-cdr/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
+	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
+	"${FILESDIR}"/${PN}-7.0-wexit.patch
+	"${FILESDIR}"/${PN}-7.0-reload.patch
+	"${FILESDIR}"/${PN}-7.1-noevent.patch
+	"${FILESDIR}"/${PN}-7.1-lastshort.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
+	"${FILESDIR}"/${PN}-7.1-clang.patch
+)
+
+# this is a text file, not html
+DOCS=( index.html )
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental.
+	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
+	default
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'If you receive an error, "unable to anonymously mmap...'
+		elog 'Resource temporarily unavailable" when running growisofs,'
+		elog 'then you may need to run "ulimit -l unlimited".'
+	fi
+}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
new file mode 100644
index 000000000000..430d535ed622
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
@@ -0,0 +1,71 @@
+--- a/dvd+rw-booktype.cpp	2006-06-24 12:21:48.000000000 +0300
++++ b/dvd+rw-booktype.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -398,7 +398,7 @@
+ 		break;
+ 	case OPT_MEDIA:
+ 		if (profile!=0x1A && profile!=0x14 && profile!=13)
+-		{   fprintf (stderr,":-( action is applicable to DVD�RW only\n");
++		{   fprintf (stderr,":-( action is applicable to DVD\xb1RW only\n");
+ 		    break;
+ 		}
+ 
+@@ -759,7 +759,7 @@
+ 	    }
+ 	}
+ 
+-	delete list;
++	delete[] list;
+     }
+ 
+     profile=buf[6]<<8|buf[7];
+--- a/dvd+rw-mediainfo.cpp	2006-09-23 20:46:57.000000000 +0300
++++ b/dvd+rw-mediainfo.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -621,7 +621,7 @@
+ 	if (phys_end>0)	phys_end -= phys_start;
+ 	if (phys_end>0) phys_end += 1;
+ 
+-	printf (" %s    %u*2KB=%"LLU"\n",
++	printf (" %s    %u*2KB=%" LLU "\n",
+ 		dvd_dash>=0?"Legacy lead-out at:":"Last border-out at:",
+ 		phys_end,phys_end*2048LL);
+ 
+@@ -941,14 +941,14 @@
+ 	    printf(" %s:\t\t%u*%u=",type[formats[8]&3],
+ 	        capacity=formats[4]<<24|formats[5]<<16|formats[6]<<8|formats[7],
+ 		blocksize);
+-	    printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++	    printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 
+ 	    for(i=12;i<len;i+=8)
+ 	    {	printf(" %02Xh(%x):\t\t%u*%u=",formats[i+4]>>2,
+ 			formats[i+5]<<16|formats[i+6]<<8|formats[i+7],
+ 	    		capacity=formats[i]<<24|formats[i+1]<<16|formats[i+2]<<8|formats[i+3],
+ 			blocksize);
+-		printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++		printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 	    }
+ 	    break;
+ 	}
+@@ -1121,7 +1121,7 @@
+ 	if (ccity) ccity++;
+ 	bsize = header[4]<<24|header[5]<<16|header[6]<<8|header[7];
+ 
+-	printf ("READ CAPACITY:          %u*%u=%"LLU"\n",
++	printf ("READ CAPACITY:          %u*%u=%" LLU "\n",
+ 					ccity,bsize,
+ 					(unsigned long long)ccity*bsize);
+     } while (0);
+--- a/transport.hxx	2021-03-14 10:17:54.353626017 +0200
++++ b/transport.hxx	2021-03-14 10:16:44.180365362 +0200
+@@ -127,9 +127,9 @@
+ 	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+-			    int l = wctomb(str,(wchar_t)(unsigned char)'�');
++			    int l = wctomb(str,(wchar_t)'\xb1');
+ 			    if (l>0)	str[l]='\0';
+-			    else	str[0]='�',str[1]='\0';
++			    else	str[0]='\xb1',str[1]='\0';
+ 			}
+ 	~__plusminus()	{ }
+ 	operator char*(){ return str; }
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index 6f49eba8f496..6eb1c692fd55 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/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" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index 353d2e2ef49f..cf4e3c3ffd6b 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,4 +1,4 @@
 AUX dvdisaster-0.79.5-fno-common.patch 538 BLAKE2B c50640bd957b1545fde6692920c4fd1a1877a0da6f03aca61eb03e8b0c2e4af72b82c8a9b4f769ab45f0627f9537b70ec188eb5f4f3a57168c9b3024770a9a60 SHA512 0e2c1dd7b48553975df2f3c2d56c811a489aae8dd65a3f57a544eab7c01d9b9022c1574d92a8210a1fef0fc8f44948509c6abf19d64bd3b871c1dc480c25b71f
 DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
 EBUILD dvdisaster-0.79.5.ebuild 1860 BLAKE2B 4ada7e92304ba60c31e6e06d2e4868c78112b3ae63ab0c31a0b84c4d80b43893c10646417caf7c680cba5fb131023aedff4e89d906568209c39a86388ccd7ae5 SHA512 27b5b0dc6247cc37f217472d15aa79f18dc759be57c0dcc22646074f4fb2546f46ed8e0ebced43cc0bf688a1121788eedd314ba1eeba22785741364d74ee27cf
-MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716
+MISC metadata.xml 563 BLAKE2B 5fc6a2d8ffba464d4d9733439495fb19cdc73160a0bc3868fcf5dab2fc170aa7c3663e4afbaf5fddbc7bf26e1a6acb7996825a125baa770623ade22ae0c48dcd SHA512 67803f6a9ee5eabde767a2af8201f4ef31c2cbdbd491bc933b276c1eca7cb2b210445f7ebc1287b811a9544ea831de80325eaf493c3fab3c3487dd62c6fe3969
diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
index bd177f600490..f59f80021071 100644
--- a/app-cdr/dvdisaster/metadata.xml
+++ b/app-cdr/dvdisaster/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@k8n.de</email>
 		<name>Daniel Kenzelmann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/app-cdr/metadata.xml b/app-cdr/metadata.xml
index c7c7c3a8559e..854d2c918b90 100644
--- a/app-cdr/metadata.xml
+++ b/app-cdr/metadata.xml
@@ -37,4 +37,3 @@
 		płyty CD i DVD oraz służące do manipulowania plikami .iso.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3751f3c49309..8e761ad0f51b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 6884cc86a591..33456b62d5da 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -3,4 +3,4 @@ AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b2822
 DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
 EBUILD acme-sh-2.8.8-r1.ebuild 1206 BLAKE2B 99e8c88d8a6f2cf8a189ec22d85cfb93397d50767873575a5e517de688820e2e52a0c50b31265e99b413ca8cf98490260dfaf59129d22cd6c16d005f1a45af42 SHA512 c9974da53271607ab45e1101f12ee7f8c0f731cc167fadff65c4fd14e2bb5d3075a20b688c6aecaf6aed7b462cfffc1f8b8d8ebeb8098f887a1eef3818483d61
 EBUILD acme-sh-9999.ebuild 1098 BLAKE2B 25a97db2f6e8cd0fafc2c07de5312ac8dd3bbfbd4e17cdfbd7c3cb11504137cc705d8ad8f286620e9d72e88bd6cdc2a10e50a53333ea6b43840ed137ac5d6c7d SHA512 2f29bda15f989b61b66bd311e0a34772db242881480e6f34dfb2056aaa5bbe92f1c26cc0eb2c7d7ac218e47088c11c5a8e2eb80f52bb6b5e2a34da3e7a0b0f3f
-MISC metadata.xml 646 BLAKE2B a06db1267cdb5269401e4493ecd5e7432eac110f5554d7627dd718b35c90320be8b9f1310c0bd6ee985023efbc3b99c8314c4ebc81cb3f39db2d5b7f4b9a1ebe SHA512 9959d771b4bd98c6fe3172150d905766b2b4d30c182b2d3cac3cbc5f3a95ef71ca7fc8930c3f42cd9907cacbb28511a40331257f68f7383f806aaf07ac4ee38c
+MISC metadata.xml 676 BLAKE2B ff6e0af7a7e7ff2a4571e5a3bda9a8b300c74e2b5b526a364c920372d7be42ec1986c7dd464c539905d8cba59e73645e0d1079fd0129919d53d1c0c833ec86f9 SHA512 94d61b537880bffcfe15e79a1bd82d96ad7f39e180a19d61a0fc0c1e2489e1f48f378ac8683bc8e790d2edc7fcb761a0e5498885b7ae4deeb9e2165e4534e45a
diff --git a/app-crypt/acme-sh/metadata.xml b/app-crypt/acme-sh/metadata.xml
index a02acbd86b57..bdd5ec3c0608 100644
--- a/app-crypt/acme-sh/metadata.xml
+++ b/app-crypt/acme-sh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index 2fce15df7112..125d26c42f2b 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -2,4 +2,4 @@ AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89
 AUX acr38u-1.7.11-build.patch 6299 BLAKE2B 4c18a2c36f980d1ab381373b0312b0049b94d7a8568827f44bde3381018998ef4ad059e3cb8e355da55ec539ce9c303569c1fb29364b0fe06a730c326c4871c7 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
 EBUILD acr38u-1.7.11-r3.ebuild 1359 BLAKE2B cf9aba09624788656de556e54fb893d1a2642ba77ad74f73f605a83f510cbb2a06bd312310cb59768939d3f1677da17f8b8b45cb8646f0990f242b030b16f6eb SHA512 f269e951002756ab3bd10c21f70388e55f89a9934676cd486a0d83dbc4ce1eda13a7f4fa3b3f995b37a846ab369f0a1a9a955340ef486f5e02fcf0b806081981
-MISC metadata.xml 353 BLAKE2B 4aef7e7e65d23cecbedd5c4d52f225650925963fba206f9cb114bf286c73bd1c500ac101d87699ec23f5e7c3c4145ee564f082d355e9885077262753d5796884 SHA512 7af033f383bfc83c36c8699eae0aae7fd0b46047dc01ef3e7a75bef9020e985adb3bbc6c232f37a4c77e8c971855c47c387efa5987aaa86b32b849605d4258c3
+MISC metadata.xml 383 BLAKE2B 3f9fb5d79817d59137554b2c24e8b69bfceaafb5803ce62d869e4ed47b616bcabfc607483612f3ccfaad25c35d620712026ddab4c13c60a032002c4f528c031a SHA512 e534cd5ee46cb74aa286fcef59093dbd9b41ce9e902769c5521dc5db16dd2bba230e6bd08981bd6f72e70bd34780bdeee603d7fa0d9d33050c76beb62a02a9f7
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 98b6f5367fc0..53e89c0e0f3d 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>vincent.hardy.be@gmail.com</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index dba3f74cc4ce..bebc7430d9c0 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,8 +1,4 @@
-AUX aescrypt-3.0.6b-build.patch 1711 BLAKE2B df5eccdc516e0314a137b1c51e5ae05fe5e66c8defe892599b295d5720e26b3a5cde9e262b7f09faf9db0a57bc0479f3be1481b65c0f62ffcdb404db90051e5e SHA512 b19e4eba11753bb8929d14eddc4ef391c8ec62b2bb57cf63b1a74b9a27250b4719ece8f1a6b790c1f662738b92bb37da96c973dd38cdf059c7482edb3dbd0f0e
-AUX aescrypt-3.0.6b-iconv.patch 1096 BLAKE2B 91d6e74ea8b760e81887a799ee5e8709ea7afc7f499842879091dcffdca76f24cc9191ac438c03b9f7f4970f55beca1586d56f3262e5d0f1de53366464141c2e SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409
 AUX aescrypt-3.14-iconv.patch 1104 BLAKE2B a6b9a8f41e86c9ac6fe16427752ae20da7177e5c1aec9f42373f94606954732632d84dc06a1425508115b3fc94f54f895c671eca691442c4d3d3b9163a27934e SHA512 fb3dd6a459e1378c44ffcd6a5b109f4bd178ee2e3190eed334bbfa4387fb11c4d070105598b4f0b989428f00a28f2064cf5f5064b71c49db269f4f4b55283960
-DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
 DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
-EBUILD aescrypt-3.0.6b.ebuild 607 BLAKE2B 1a411ecfc29f0de364a6d16ff86c8e9ad486cdb42d1a8137c3391bb14549a76df170140eea42d317b1d16301bbcd38a5076f8447c403a4f01d149debc3641fe4 SHA512 0fdc84b108ec79790601d14444543b5e3821e64fb02dc8bac46ef4e763d11c09f2f2181a38b2da255935ad068b86206a0e0214db98f836a48c1b999bae2201ea
 EBUILD aescrypt-3.14.ebuild 1605 BLAKE2B 1464d3609f29b7d468b5419691d917fa52847cbb734a7eaf771a2ccb9cf47111445e4080855edc5e2b95d828445003eacad75abc0d5ca8acf88a385149a1ce31 SHA512 0743249ceede209664999891de2f5652970d08d7b7bfea2fb703555ea036a0d71c36fc2c7c0f661e9bfe767ccd11716971dc8f66b841963971a201411b461189
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
deleted file mode 100644
index 39d2ef7cf78a..000000000000
--- a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Advanced file encryption using AES"
-HOMEPAGE="https://www.aescrypt.com/"
-SRC_URI="https://www.aescrypt.com/download/v3/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-iconv.patch"
-)
-
-src_compile() {
-	if use static; then
-		append-cflags "-DDISABLE_ICONV"
-		append-ldflags "-static"
-	fi
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
deleted file mode 100644
index 8dac5b4e6f47..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ab74ea544739ab044af1e9b398770d31add3b435 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:16:03 +0200
-Subject: [PATCH 1/2] build: respect CFLAGS, DESTDIR and permissions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ac661a8..abcdcc4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,8 @@ CC=gcc
- 
- #The below line is for debugging
- #CFLAGS=-I. -ggdb -Wall -D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -D_FILE_OFFSET_BITS=64
-+CFLAGS=-Wall
-+EXTRA_CFLAGS=-D_FILE_OFFSET_BITS=64
- 
- LIBS=
- 
-@@ -27,10 +28,10 @@ LIBS=
- all: aescrypt aescrypt_keygen
- 
- aescrypt: aescrypt.o aes.o sha256.o password.o keyfile.o
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
- 
- aescrypt_keygen: aescrypt_keygen.o password.o
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
- 
- test:
- 	@$(CC) -DTEST -o sha.test sha256.c
-@@ -48,15 +49,16 @@ testfile: aescrypt
- 	cmp test.orig.txt test.txt
- 
- %.o: %.c %.h
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $*.c
- 
- install: aescrypt
--	install -o root -g root -m 755 aescrypt /usr/bin
--	install -o root -g root -m 755 aescrypt_keygen /usr/bin
-+	install -m 755 -d $(DESTDIR)/usr/bin
-+	install -m 755 aescrypt $(DESTDIR)/usr/bin
-+	install -m 755 aescrypt_keygen $(DESTDIR)/usr/bin
- 
- uninstall:
--	rm -f /usr/bin/aescrypt
--	rm -f /usr/bin/aescrypt_keygen
-+	rm -f $(DESTDIR)/usr/bin/aescrypt
-+	rm -f $(DESTDIR)/usr/bin/aescrypt_keygen
- 
- clean:
- 	rm -f *.o aescrypt aescrypt_keygen test* *test
--- 
-1.7.12.4
-
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
deleted file mode 100644
index 616e87e38d61..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:18:08 +0200
-Subject: [PATCH 2/2] build: support disable iconv for static build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- password.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/password.c b/password.c
-index 9a2c1f8..dee79da 100644
---- a/password.c
-+++ b/password.c
-@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     size_t ic_inbytesleft,
-            ic_outbytesleft;
- 
-+#ifdef DISABLE_ICONV
-+    /* support only latin */
-+    int i;
-+    for (i=0;i<length+1;i++) {
-+    	out_passwd[i*2] = in_passwd[i];
-+	out_passwd[i*2+1] = 0;
-+    }
-+    return length*2;
-+#else
-     /* Max length is specified in character, but this function deals
-      * with bytes.  So, multiply by two since we are going to create a
-      * UTF-16 string.
-@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     }
-     iconv_close(condesc);
-     return (max_length - ic_outbytesleft);
-+#endif
- }
- 
--- 
-1.7.12.4
-
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index dc268bf18e91..c39017ae7324 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -2,4 +2,4 @@ DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e7621
 DIST aespipe-v2.4f.tar.bz2 107663 BLAKE2B 80af945ec938307ddaeb1a1f7a91da71d4f1aeabe4cb303166cad95c36e0d0090fd8440bb636ac0245d2701d61fdea715c84e18dfacf32bfba7f4b85a2db091f SHA512 75b6b2069a0e013dbded29b07b990fc783cc04ce05fc37e6591dae7e8190485960735ec1a1af18d065be57d0b7ec23dbe520e920f92e9c01170b7a23eb32eb3f
 EBUILD aespipe-2.4e.ebuild 749 BLAKE2B f0af3d47dcf8d381891a0711a968a9d75a72136a4b52a8548b6e49d5445b2d49e1a3da595fa6ce18a3cc132ca3c90917a1fdb9440a0508f0c6f7608e6b53c222 SHA512 42d563aeb28a957534b0205aa47df96440cde79baad55b2848f9d1d7aa2fccece4d3abb06e070322016def375c8f9b3ddcb23eda7a75a1e93704d534007e6b25
 EBUILD aespipe-2.4f.ebuild 736 BLAKE2B 4424b54cf7e7d9938da977cb8571624dc2f1876c3f66d939535f37b1777b3a2a939c03bfac39e2c4bbb31ac78f7114affe635015020b279706d43eae15a2e331 SHA512 0c85587fc50881634e3f78b31841c54f8e9ebc58da47409d9665f57dcc283265028c5efdb61894c1c7a9f1b52563689dfe5ec115396ca262736223ed82ea4fd1
-MISC metadata.xml 650 BLAKE2B 4bf3cde201df3b0cd6d73e56b3502946c117d8942853ef1e919c245cde0b7f19da7a4cf6e5f95467f8235b6b3033d4897844c6142b9facb0836c92283d81d156 SHA512 73da723df8d56d8a2030bab56d830473fa66dda7f91e62f251c09db6164413dcc6c1f9c160586e383f4874aba11d21e57c44df21dedcf591d378196736136378
+MISC metadata.xml 680 BLAKE2B 90b39843b6dcda4a82b1757479427ac8a305bf204f97ddb19f903bbb169d327aa3d522806bb1852bd433a95248999f9e4ab9e25ebfebd990305a2d3aa65c6eeb SHA512 385100b06f9472bf3d6124c5faf0fc5198cb85659af2a51aec988c9b57407144f37bc7d42d236853578c73ff464edc01a122824196071fd53b63c60028152f43
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index c896699a412e..5c529472b7c0 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index a0de6f57b305..86e68b6041fc 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
 EBUILD argon2-20190702.ebuild 1356 BLAKE2B f6ded7042878dab05fbf0fbb955e73ca19ae38c7844e520939427fafcac5460966e83d411c6f695f72e62f674f4c4b63a0a4b7a5a91cb686b7d0884daaacab24 SHA512 ad8927654d5334885beb338dd3fc29b5790d51e00a2515f7a7fced928a6653ec1e924d17f23adfa678a25888bc91d9f56e52acc38f1055812818d1de1fd2baf9
-MISC metadata.xml 638 BLAKE2B d07a626d9825ec2ce799713d1b43beefbc306b95f344b7ab40fdc7b4c4c9c6171385f91229d4a2d10159dcdde9e8d1806769277665a90f7419b5b3a2cb2b69c8 SHA512 24c2648534d4855d93eb91c8e127f08a34dcd21fdff3bf2665d26e62409b819a9ada15e6516f9c1649c848d3a57aa4c68adeeaa80f92b870ed5b4c48c40b5e9b
+MISC metadata.xml 668 BLAKE2B dfdefb44d35ebadb4566d1a29127117a07f06b7cc225d7acf5be1783cd2dad4e8c9c2d770bffc392750e770e52d9165ce985909ce4f26daf54f75b774ab9cd55 SHA512 6793dc9c755f1e7856078cf11831215564b73271a61a4287b8e61777e4efd23cd5feaa84068df61e94e1e7eeb77aee5cbf1a64035f1bd035c94c2c936351a775
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index dce9d6d61621..d2542d99eb0e 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>simon-bgo@slevermann.de</email>
 		<name>Simon Levermann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index c796e33679b7..7d116d0ece6f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -3,4 +3,4 @@ DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e
 EBUILD certbot-apache-1.12.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
 EBUILD certbot-apache-1.13.0.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
 EBUILD certbot-apache-9999.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
-MISC metadata.xml 358 BLAKE2B 745ac26a52c7926fcd3d15a7fc88ba34d01c8fda8144bf7054d6bac64625fd4db8ade6d216f25ccd86acdbf3606c47b5968d729a9a8344791958fe971a08b059 SHA512 8fa64cbf6debe838fcf8ba52e9f2c40161860b49065af8e9a1be7b63600ec7748cb34ec33a12c0843f0bcb11c6f8501e03d7d588553be95b5f2545f106af40b3
+MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
index e7e2b64639a0..f1394897b78f 100644
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 6bc275ab6f9a..6fbe0dc3fea9 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -3,4 +3,4 @@ DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e
 EBUILD certbot-nginx-1.12.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
 EBUILD certbot-nginx-1.13.0.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
 EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
-MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
+MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/metadata.xml b/app-crypt/certbot-nginx/metadata.xml
index 264684bb16c6..0a55369a680b 100644
--- a/app-crypt/certbot-nginx/metadata.xml
+++ b/app-crypt/certbot-nginx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index 69e6de95645c..6c221fd0f68f 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -2,4 +2,4 @@ DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2-r1.ebuild 672 BLAKE2B 8eff53eb6794460747a520d5a3846bc7c732f27105ecb472a1391a67ea8425f3a8c68797fb2fe1460073c586c757433bc98aa46bbc6a4c5fd1e09165f70c94f3 SHA512 a7678a94eb1240c5fe2deed6e1e5717dabd91f4a1fa6e1b279caed274e2cbb3ee61a8dd179590a3b5dd23c44366cff738fae3614feaea6d972aaedcaa6fed788
 EBUILD codecrypt-1.8-r2.ebuild 713 BLAKE2B 278aca073a6bf1d154ebf810b8c80bd49393f63354805d779bf16bf6b23be79661b1d029922217cc3d750a0709a53a05b0cde6dbc8e97279713cda9fabc4dcb4 SHA512 03d85d58d7c3bf3111853b6bd9b0c961ef9accf31fbac64ccf2051034c16e2ef634cc5481844ad6f1ae238537398b3de7d01fc70d50d24e95760d21b4a4d6511
-MISC metadata.xml 756 BLAKE2B 23c44085ef45f26b1ac4fa910594f7ccf47756ff2430e0d461d0ef86bdd92b14358f6041ce35979d3f6312da8cc3008c62691222ccdd05ff13ecae345dfec549 SHA512 b5edbcee8db2b2f57e9c8b3c2d36986e660aa9b1401e0a4dd130ee8ae43b7c899cc2652a046fe526fb58285ec45d7f022085423663b5dd37c89591bed0a6a702
+MISC metadata.xml 786 BLAKE2B 1d9838e87c093b6a7405cdc2a82301c15211d8797641b5550e1905f7322cf479bc126a7aaaad27efef8d4a4442ab53c770864d84cd486ddcb7dd4ab92951c81b SHA512 764d49d985760ee8088881570de5823b655f49ed408ce9b7de986dc113a96897a46df0d0c3dc4e4106b357bc2c8c3c48116a4c38f1e02055f5b740953accf3c6
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index be265ff6c7bb..a837d33149bb 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>exa.exa@gmail.com</email>
 		<name>Mirek Kratochvil</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>amynka@gentoo.org</email>
 		<name>Amy Liffey</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 5427d60580c3..b59319185ced 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -3,4 +3,4 @@ AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2
 AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
 EBUILD dehydrated-0.7.0.ebuild 1255 BLAKE2B 558259adab17bf303e93d40538bced438f75bf3f91490cef63959d746d49be7c4779c2f5e881c65385bcfeda6fe3ecc15d427eda56a5bd906393724162918706 SHA512 25047679b5e8d7504fb050f945641db7b9f8f0efe302c2f66d2aa23f513c1b59a18fe058496540a688239ca66b10cc72a39e258090bdc303cab6b1df5dbd9d00
-MISC metadata.xml 555 BLAKE2B a0abd59fec6fa769b7bdd3c4b513af98982d4587522f0f86d07a186932948f7dcefe0246a4616e7b74846c96fd6b4989c4386d8c311a2cd31391c97c80ccc047 SHA512 5b6fb60aec5050207a5606e7155611edd79f64706fcdaa1af4920e56295381a201c84a5259b00d7c4a373c29300d67fa7ea605ee2d364498add7136eeaa37ad5
+MISC metadata.xml 555 BLAKE2B 303318fef11a0c7bdf4efcd70971fffafc90680abf0d6902e2d162e462e0c7f9420bd984e4b2dc43c6af8137ff68070d1469c5444a320ff6f7d6e7c70fb74f11 SHA512 d1c9a2ec024c04d77002d4c5a23965de23e3e37cdf8c15a1ef23a04f60f21a9035633871936f6d1b7f2096ce065f1f780a3c14380bc5dc17bebf403f65461234
diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
index b4fd6de957b4..93f3dace316a 100644
--- a/app-crypt/dehydrated/metadata.xml
+++ b/app-crypt/dehydrated/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 58be8eb2a3be..4df333e69401 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -2,4 +2,4 @@ AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff1
 DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab SHA512 97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc
 EBUILD eid-mw-5.0.14.ebuild 2657 BLAKE2B 9be1250a0a67ad60cad63225f7a29df1234d3c1d28282ba820b6cd8a6c930170a67341e0e50bb5916152f1987c9a481d513afe0899001d0c2bfd4e0218bec380 SHA512 bce58ec9cc79f3cbf21106221ee71861bd83d7ce15a58661999fcc2a8719024bbce8accc5467929c0bad1c18ac7d24e1f07bb757ff6447402d14237b64eea4d6
 EBUILD eid-mw-9999.ebuild 2423 BLAKE2B 600204c3d487c75471e9c9307748f09356dfccec3a466d538a243c170bca8299659d8cf8205cdffadb4c82e4f31cc5f5964f7e22b2014f45224008b4c54d60c1 SHA512 7fb482b981d58272037e5735fdebaec759b7c2de17280c8b829b3e4677c92ce37572449ab64b951a5d6a997e0041e2f0b387d924393db9b88c7ba95ee28bde15
-MISC metadata.xml 1376 BLAKE2B b137dd3488af97de2cf1acb49c0f69ec21cee305db6eaf1c5906215c213dd688813f87ab139b58cc33dd96b3770a4e79cf17e14939d5d92dc3b339d1c9ebd4cc SHA512 b0c354de9d2f90404eb2525cc21b5e7396018fbcd4cba318c356ada544a168fb8e33dfff33989e13393b9e0a99a0e332b59e4f27ec9bf5e16dee4ea30609ca89
+MISC metadata.xml 1406 BLAKE2B d61f6271dfd3770ac70c284761f50b84d01317641faac528f58f0644d916e29f167ed00035defd8814aec3d15242d28db89e3c72397826dc01f7ccd77cfe8a50 SHA512 362708706e778e86ef0d0962bd6d291f213b739470d97f324aa75ef6dd3930230847864296a0ed22a545c7cb9e802a025f5419d632b1ca81720c5b2365099bad
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 1ef7d1fc9202..890881512814 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
   <email>vincent.hardy.be@gmail.com</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-crypt/envchain/Manifest b/app-crypt/envchain/Manifest
index 2c151c84d7b7..f9bbf067c764 100644
--- a/app-crypt/envchain/Manifest
+++ b/app-crypt/envchain/Manifest
@@ -2,4 +2,4 @@ DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e
 DIST envchain-1.0.1.tar.gz 8604 BLAKE2B 6273eac40cf2a9eaf0704ee81d23b6e72cd296232f378bf5e5b15cdfb29a91bd394201724491e3a7104017b2416084d16e07b3634e5abe382e05eec52e388410 SHA512 ac2bca6e53f46c10978d55b2924595988ed6d76a9969691f01c1a57d17e5e8e2abd21653cba996aad31408bb029e8ba00818100c60f5b089b84c70eaf20a2c75
 EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
 EBUILD envchain-1.0.1.ebuild 478 BLAKE2B 4a7f5f450de103e61a9797d215dc3b55fd1181573914bab3228c47d6fb4daa6fce28b8261e9b7e35ad46e3b0a3b9a2bdb296dadb71618fc1ceddba98b8f9efd1 SHA512 454c17e0950d1afad8dfe04310469c6989f730aad483d6f387031be50c8dbb76c0b0f41b4f6f4168360e9a3adb3ad7084e7b291e49bdc08517c167783b10e09e
-MISC metadata.xml 746 BLAKE2B 2a0348bc637eb81abd5d5f7252685b13d3ead96afa478c066b0c00a3b01ca77479e181b6e5c51590d5cf96a3490e011d42e8172f8261b1aa9db257440ffbbfe6 SHA512 c345e54594f861bbd90d61d92c4e549b8885dce39c72253e84cddecb999d71c450eae659b2d5e59ab162849403beac86225c8ffb5a72fdc721a7383cdf2c5aad
+MISC metadata.xml 776 BLAKE2B 540144978d22905830c3a22561e75357932f8bf68c84913dfb77cc53dfc0199d42f37fd4365d9e0b792cc7c4d2ead9bd328464ff76a173dd1b11eb34bbb64de5 SHA512 08d884715afeb54d775a0796e3d47f96ac7b57885a3837b3ca40f577f026082cb718e35ca1f37888f1e819cead510bc90fcabc24516f6e6e904a0fe93cbea4bf
diff --git a/app-crypt/envchain/metadata.xml b/app-crypt/envchain/metadata.xml
index da51982cb6e3..b3f009e86e6f 100644
--- a/app-crypt/envchain/metadata.xml
+++ b/app-crypt/envchain/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index cc2e13bffee6..fbe5806bc7d6 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,4 @@
 DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
 EBUILD hashcat-6.1.1.ebuild 2295 BLAKE2B 851422a617598df23a1a49eb5a5b68b3fefed33332e0f4c78c5607ec20e55b805eef20bd7d8238c6342acf82345f18fd91489e234f7c1eb4a53e0ee02cd58f86 SHA512 535e3b5b010fc6c6b8e3a99e13455952ac15fbe08562009198c1a9ca61b70f60ae273e9f16100982c2efe6f255df05f4cdd9d7c1e13bfe27f4d056fdf076a4a2
 EBUILD hashcat-9999.ebuild 2295 BLAKE2B 4504eab73c1b0fb65d6d9c1c3c93e3030699b234e890374b4a84b9c59743d32c79d4472d0163da2c3bf0b02282ef34c65d48a68d8c38a0ec9b0734626d875d98 SHA512 9e6db642a6a1e38f91b939add0a57b15dc8d3ce95e1c82685c0ebe9cf070a77f500eefccb956874c1ad0cf38a1d421c62dc63d32228918553ae7bbfc8312754f
-MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
+MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/metadata.xml b/app-crypt/hashcat/metadata.xml
index 4379ee24223e..ec1b0af6d4b7 100644
--- a/app-crypt/hashcat/metadata.xml
+++ b/app-crypt/hashcat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 7329439c6e57..c7a336022cf6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -8,6 +8,7 @@ AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254
 AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176
 AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
+AUX heimdal_fix-autoconf-2.70.patch 936 BLAKE2B 313982f105ac8549b4f6049bcc3b9ea21972584ce243860a105985c795166c8be7a8c6cff46810e6bf604e21f3ebe75cb1f0ecad5ab2aa96ab5f8719b1e19156 SHA512 71668c87242813320d57418b849158af1231e42a970d2e7b7bd64a28db6ce834179c2f1f27b9ff2be4c7ba349a73209d715a60bb8913f7cf4d20d1acc2e49c6e
 AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7
 AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
@@ -15,5 +16,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.6.0.ebuild 4512 BLAKE2B a4e4293543cde87d08cb1833480f278c5c2b2e9d7b138eeecc59668a829526e8bbf0d1aa610747166e9427f555d5c36117146f6399f048a22636df28c5d77107 SHA512 91ab34a629c2c7d909ba1d81538d9d543f8f66c26e32dbed4a45e8bf9358db817d4d56b8e85791fb17fddb51e7bc862a696d06c7f49f7a8d32c3c463b281c0e2
-EBUILD heimdal-7.7.0-r1.ebuild 4511 BLAKE2B f5063ce346f8d7c702bee5b2dbee3077d4f635ad439ed4566b2e835bb02dd501a4239c2de9973febba9eb76786745879457cabbbfb20b4f722bdd3dae4de1d04 SHA512 172bec83d21c91bce1ed233b2204b4c1a5c0e6ab49da8ad9fee920b49be55d88f0dc5a62512b5e8ef589783c33ee2f3752717e79fd58f6f339b0d44658073f2d
+EBUILD heimdal-7.7.0-r1.ebuild 4558 BLAKE2B 537f884969b9d8ea30e08f3183e8a41d2d16febdd8e43517e8415a0a5a5046e2374ded4089336959feef42b4373f2e470999c56f557518f12db9a79d4c913904 SHA512 3144c6e6b97273716ce56ef4099794451be9a4e927d0a53adbe66fe949ff46ff195b92a2b0379b622756010e35e7ad1130a41561283aab64c53d68e194a75123
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
new file mode 100644
index 000000000000..0dcc31026203
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:49:18 +0100
+Subject: [PATCH] autoconf-2.70 fix
+
+autoconf-2.70 and newer are more strict with quoting etc. and thus generate
+a broken configure file:
+
+  configure: 20855: Syntax error: ")" unexpected (expecting "fi")
+
+Gentoo-bug: https://bugs.gentoo.org/776241
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ cf/check-var.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/check-var.m4 b/cf/check-var.m4
+index 2fd7bca6f0..71d6f70ca8 100644
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
+ if test "$ac_foo" = yes; then
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
+ 		[Define if you have the `]$1[' variable.])
+-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++	m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+ 
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index e6fabf4e9541..1140bf30c50e 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/heimdal_hcrypto.patch"
 	"${FILESDIR}/heimdal_build-headers-before-use.patch"
 	"${FILESDIR}/heimdal_fix-db60.patch"
+	"${FILESDIR}/heimdal_fix-autoconf-2.70.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index e26059ca6150..e0a94d679b81 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -2,6 +2,6 @@ AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec
 EBUILD libnitrokey-3.5.ebuild 1123 BLAKE2B 3ae935e945aecc878babb981f1989d8105c02d95ccdc652b9367643449bab791e5ae8979a780c2aea3b7b5a235e1b0d0889bb5bea977a0c915dade5d9097b88b SHA512 ccdb2e813224866ac7955abb89d13f9e58f29e751b6fa5008940a3118cc607d6c1a775a0f0b72ab00a5fbba17e6a54b814b3495a0ff66d667b1179f12e02a85d
-EBUILD libnitrokey-3.6.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
+EBUILD libnitrokey-3.6.ebuild 1046 BLAKE2B 19c6e6213b1200743567759d12f9328582273c5f0f1c4fb984e14f6d73e37a0c7fb67f0d874e6f3856a6ea6fee7e213b979f16b19caa3f1559eb6e6e8f823107 SHA512 89e10ca9584e329255753c24f496087b9ca09ba18e623a8938282b9d6f91ff0df457417ebc586aa6b5947d43c632499cd1fe007bdddb91f4788bb139cceabbba
 EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
index 8687d0d1b4e3..ecef8c9b5c2d 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index 5c8b9adc7168..79a6aca11817 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -4,4 +4,4 @@ DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 EBUILD loop-aes-losetup-2.28.2.ebuild 2390 BLAKE2B 6ef1db9002469b21f72be1b318f9499c4c92dbb5c5b4fd4f1e3e4de6bafcef465277f9a5645661f0015a492e6ae1a81aa937e787e99d53f8f9757bb0aa9354fa SHA512 30d817b41727ab72018e2b637ed3705c07ede678bb6a20bf221ab4cfc69a62c37025a4969a4b84235fe3b25b7f7b0b354c0c6a406893c43af13dbc4dcbbb3e27
 EBUILD loop-aes-losetup-2.35.2.ebuild 2178 BLAKE2B 107eeffbd0719d1d89a8ffba218ab9859c9b5ff06a9338d55a6feacd91126a3ebee2419ca781fa870db0c8cc2bd5dc5874cb55ccf6730efbdb964faa335e4922 SHA512 34cdf0cc74b9646bfc2b2d47d1c6c8f35cf051505db1fab8ed7285c86bd633189d29a255e7de1a874412045e7c9770d58fc6035bc2c0bcf079c5a1fdec72fd92
-MISC metadata.xml 444 BLAKE2B 0c31c7861ba6458dd10ef779ca1d7b5a71dceb156e762b8cbed70960766043aa206338561244da09335973f0e03f9b08e6fa5f1b61edf601033c434beb5b562c SHA512 b2f7754872e47e627cf7cefa9ccb1bfc70e7d2c9b36f5b9adbb3094e28b5945436381c9bbef60ba34188a029c3cfe8cadade00fa563e6e4f89afcc0f6516bb81
+MISC metadata.xml 474 BLAKE2B 39d29a21dbe4702ee734066aac4bf46c6a1eef3c9953289910e5f0f9d66ede6e317bc8fc5fedf08f7a5af2e3021af54569a4b36f3654b2f40e025ab690e23f88 SHA512 28270b23d0effc7f6445e87d7b781d9a40d789a4f6042f6e9ff2db8fec7cd0049cbd09aba181fd67e933a7c1bdc522ac32779f08df1a49411c1911a0d6278b8d
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 41aceca13764..2e05891f2547 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/metadata.xml b/app-crypt/metadata.xml
index d508e6060e4c..c60e6f5cea36 100644
--- a/app-crypt/metadata.xml
+++ b/app-crypt/metadata.xml
@@ -37,4 +37,3 @@
 		szyfrowaniem, deszyfrowaniem, stenografią oraz podpisywaniem danych.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 84b975c9ae82..e99f86e90380 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,14 +1,4 @@
-AUX monkeysphere-0.36_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
-AUX monkeysphere-0.36_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
-AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c689783646c15337e3276c55baf8ef43577fc08c1cd68c85f6555a8685ba1741988e0f2ae31b757795a40ecd30411b00e05958799b SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e
-AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 BLAKE2B af75804e5ea457c63e6e904e2f1ffde393e3ab06a8222527b825212f44b253ad7d418a1d10a6abd2204332065a2ba5bbbdff09a14181f0fc8bcac6808cdc64fd SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488
-AUX monkeysphere-0.36_tests_gnupg2.patch 2272 BLAKE2B fd690dfe4fd357f7a6c551698c8cc897d2c5f34ae44fffd77f4a63de9a25173b3f84dfe7aa3877cd0c724650de250c72ee55f63e1aa658421188658691f02270 SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975
-AUX monkeysphere-0.36_userid_empty_line.patch 292 BLAKE2B 5ce813bca6235a365d69f3c8d19b6f39dbb981af57e8171efeeb921f2e0b9c4e73c531838a87e3275809e427a3d7b7e75ad88341ab3dc05a5258f6a7fab6af6d SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7
 AUX monkeysphere-0.44-install-uncompressed-man-pages.patch 1580 BLAKE2B 54db4bdeb8d93406d6f9fa222118c98e0a1cfbbdaaf02f280024a41a9c4842aecbbcd6735cdc9ed9949e0e5463f8bf940b642b632c385d48d4dcf36a28a1cd69 SHA512 c4c677e08130ac01a3e98ba21f5e68e5bd7ce4765b44ed91ca5e0506d22937fc13f1a0dfdcd86f1e093e666882452b112a52b954d5f33ee73a47381a28d2e11c
-DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
-DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
-EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
-EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
-EBUILD monkeysphere-0.44.ebuild 1081 BLAKE2B 9c99e3a87ab77e83f1bc8c42c24142f5fbc318c9726c344a79d11508f0d767253e9d118dfade187bc7ecf023c53b0dd2d9dbea9896be3ecba1da030845b25aa4 SHA512 7228951f276d62d01e302f5dcba2cdebcbf0bf4e4dab2986b8d6f9332d4f1e7fa20eaa6a049d7744c15bd5c2eabb9ddaf3bfacc41f38a3244841b0d26ae49b7a
+EBUILD monkeysphere-0.44.ebuild 1079 BLAKE2B d464af629e7a4c91046bb6ff72c275f2b1b4ae8bdf3b8693d92877d3aa76209917e28441be92d553f506cad07f22e7155fc37e64f193f4a3fcfdfc33c9aa2568 SHA512 be037180395aaaeed4e1de486309f21e3ed7a73c6107ad96cec25493e3b09b1465640bd6881cf1b323c907f2540c50ed2010178a02566951065f6b192cc78e0b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
deleted file mode 100644
index f979114181d1..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
---- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-          # if root, su command as monkeysphere user
- 	'root')
-             # requote arguments using bash builtin feature (see "help printf"):
--	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
- 	    ;;
- 
- 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
deleted file mode 100644
index 7cdaa74b5735..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
---- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
-     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--    <(hd "$TEMPDIR"/secret.key) \
--    <(hd "$TEMPDIR"/converted.secret.key)
-+    <(od -xc "$TEMPDIR"/secret.key) \
-+    <(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
deleted file mode 100644
index f14550280fcf..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 5f7ee764ec1f src/share/common
---- a/src/share/common	Mon Oct 07 19:22:36 2013 +0200
-+++ b/src/share/common	Mon Oct 07 19:22:58 2013 +0200
-@@ -863,6 +863,10 @@
- 		    ;;
- 		('known_hosts')
- 		    host=${userID#ssh://}
-+	    	    if [[ "${host}" == *:* ]]; then
-+			IFS=':' read -a ARR <<< "${host}"
-+			host="[${ARR[0]}]:${ARR[1]}"
-+		    fi
- 		    remove_line "$keyFile" "$host" "$sshKey"
- 		    ;;
- 	    esac
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
deleted file mode 100644
index aec90eb07661..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
-index edc7995..2711ff2 100755
---- a/src/monkeysphere-authentication
-+++ b/src/monkeysphere-authentication
-@@ -84,6 +84,13 @@ gpg_sphere() {
-     su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
- }
- 
-+check_openpgp2ssh_sanity() {
-+    if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
-+    echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
-+    exit 1
-+    fi; 
-+}
-+
- # output to stdout the core fingerprint from the gpg core secret
- # keyring
- core_fingerprint() {
-@@ -163,6 +170,7 @@ case $COMMAND in
-     'update-users'|'update-user'|'update'|'u')
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT= update_users "$@"
- 	;;
-@@ -171,6 +179,7 @@ case $COMMAND in
- 	(( $# > 0 )) || failure "Must specify user."
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT=true update_users "$1"
- 	;;
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
deleted file mode 100644
index 712734459054..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r c13f4b11061e tests/keytrans
---- a/tests/keytrans	Sun Feb 16 19:24:08 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 19:27:42 2014 +0100
-@@ -131,9 +131,9 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- EOF
- 
- diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
-@@ -159,10 +159,10 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- EOF
- 
- 
-@@ -190,15 +190,15 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
- uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
--sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
-+sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
- EOF
- 
- echo "test: diff expected gpg list output"
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
deleted file mode 100644
index 70c7cffe7dc4..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 2315bb7781c6 src/share/common
---- a/src/share/common	Thu Oct 10 19:25:10 2013 +0200
-+++ b/src/share/common	Thu Oct 10 19:25:50 2013 +0200
-@@ -917,7 +917,7 @@
-     IFS=$'\n'
-     while read line ; do
- 	case "$line" in
--	    ("#"*)
-+	    ("#"*|"")
- 		continue
- 		;;
- 	    (" "*|$'\t'*)
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
deleted file mode 100644
index 63a671e3e588..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg
-	net-misc/socat
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/Digest-SHA1
-	app-misc/lockfile-progs"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}_default_shell.patch"\
-	       "${FILESDIR}/${P}_non_default_port.patch"\
-	       "${FILESDIR}/${P}_userid_empty_line.patch"\
-	       "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
-	       "${FILESDIR}/${P}_hd_od.patch"
-
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-
-	# Output format of gpg --check-sigs differ between 1.4 and 2.0 so test
-	# needs to be updated if 2.0 is used
-	if has_version '>=app-crypt/gnupg-2.0.0:0'; then
-		epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
-	fi;
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	#This function is idempotent, make sure it is run at least once.
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
deleted file mode 100644
index fc2a5255bbe5..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="amd64 ~arm x86"
-
-DOCS=( README Changelog )
-
-## Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index 63b1bd885e78..c22ae2b8f88c 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.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 @@ IUSE=""
 SRC_URI="
 	mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
 	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 03911b6a239b..2a17aa3e4f35 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -3,4 +3,4 @@ AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34
 DIST moolticute-0.43.19.tar.gz 5675421 BLAKE2B 8fbe68a86978970768870ac334c38b5cd532e97cb29e03975d6700a98074c51959747c35dee528275b41ef08cf42817f69337c8b93b8c2554729754d4ee818dd SHA512 fb343411854490f8e9bf937728889fc329d2f90274a34bafebacf711b02b3ff04ecad34480b786a59fda07a50f12f572b58fd2c397d46b63dc76df9228ad8711
 EBUILD moolticute-0.43.19.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
 EBUILD moolticute-9999.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
-MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
+MISC metadata.xml 560 BLAKE2B 1a1a2fa92fa327ed5fb5630a5683741c05bfa774e88b3027b102538076c9297e66efe91ac6dbc9d20470bb49b28548926ea337b7a3212049d5327463ccdb1c70 SHA512 21e53b470ecab9422a51b45047cb21a984c8b018d948d58aa878271bb8297bf867141943e670028633151541fb2b2ff8e34930f16bde915e838e2df7dfa02e39
diff --git a/app-crypt/moolticute/metadata.xml b/app-crypt/moolticute/metadata.xml
index 874684f5407a..268fbb10dd58 100644
--- a/app-crypt/moolticute/metadata.xml
+++ b/app-crypt/moolticute/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 3bd3ba10b908..ea40099150a4 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,7 +1,5 @@
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
-DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST anyhow-1.0.32.crate 28512 BLAKE2B c9c37e9bd70074d53b163a3077b7a5304d04b13ada50c020898ee2169ef4db2e26aeb283421f2e757c3d6e31c58ec1832162c1a01904a44b9fb4cf14ffe05d0c SHA512 4646a3b85459fefd826c11fcdf69e532467d2d6ec0711b8d26312483ba988fa8492fe2f727332c39479e25dd37ad04830ea4ab19034cdcdc639e226e2744dc90
-DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
@@ -9,7 +7,6 @@ DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
-DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
 DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -18,75 +15,49 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST directories-3.0.1.crate 15674 BLAKE2B 0650c306a6c1086b5f0b4dc49120c91c8f541bb275eb5a21166272fd8fccc4a20dda099e44cfe4c79e2ab82e0552a6390a5893f1ee7bf1f69e64737a41f6bcdf SHA512 840b325522cf9a6a20ad54885b1e0e16f2fb72de6c18ced24f3766dd8355329b7b9f1e6dfacaaf72623d0415b28e7dbbfff3234ff82e5c0fffa86772c3b4bad8
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST envy-0.4.2.crate 10985 BLAKE2B 8a6f25fd3cdfcc17cfced55bdebbd9641eee3cb7a0d227f1c08837ed41e31fee8575875dc165139d83cd7e124a8998ce77d7d1d0f7ed230ee2e07cb7179b5798 SHA512 3188120adf5dcd72a3329561e8cb864865927df1d24dd7eae6f21df4156c2d8e6bc73351eeefd6c1ac62857bb6d3e154f682b7815a86b77c8047ae6afb88b74e
-DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST merge-0.1.0.crate 16946 BLAKE2B 1389893fdb788371e8f2526ef9fcc9e1b7a61a6f55fd092cc595339b9df9bc550546056191c1479ecaa13b88633e12656d2a8e217927495e0096ee5ca5641e47 SHA512 2adfef5cf142b06343e8f5816ffba7d031bc71b4a4e54170e36b88267d0c203ecc0cf084041cb25ae55df874fc80d55bd051c76f608ab85fd55f1b5512efe238
 DIST merge_derive-0.1.0.crate 2598 BLAKE2B 209381385224343cbe5b67b4fb4c21e0c0820a0abac19e8ff3baa0c1a4c8e403470d8de840c49f5c2f584ca2c5420c9709b9d598257e2067c037506fc019167e SHA512 cf3781464e4cbdfeee6e394dce38aeb41ac44a71f832907ea0e96c5e8fa0f78945e167f42c541e1ad8930b6583f82bf5c77c68db2165a48287d420570b1c5572
-DIST nitrocli-0.3.1.crate 67983 BLAKE2B 196076079b837f9fd622b0ca0ee63575cbe0a0e317321691472df489cea5b97e472477048a44dc46d5024c1882c1e8ad3305c95ce9e6da91412cf3f6c03737cd SHA512 4e4099400175115cd5304a2f135ec497d0fa3d74a2d19ceb1634b2d921d38f54cc5404ab4de31a511a0f2967ffff355ce34236ed3a3530a16e8e86b9d009fe83
-DIST nitrocli-0.3.2.crate 88594 BLAKE2B 8bbc50222724b674e2f76b6b945bf82fc86e4c7bfaa78eaa5806db69db3c324c9ab432f83425caa67a4e7ee275cf6404e9ed2d9ca9243ac05de53612333b5098 SHA512 48ee29dcadab938546bdb9c5d5a053e88d0860d6be6f27292db53fe304d32597a6c415fd61a1c69755e4f60b192a527de99fb603afb27b762a377e2a01bc0d9b
-DIST nitrocli-0.3.3.crate 89987 BLAKE2B bafa15d8d696d5899ac7d1a9af907d77e6ecf62cf09f7a9af5b01a9947926eb1544f2862322d912e283869067bea722e99693513d30ee367809de69ea54c32e2 SHA512 9bc58ea6d1d60985a0f7a8e07eef6a620805be6fc0284c8a43ecfede69e0421c40716812896609cb8516855900f8ed6017c4e693b5be422b00701b0c2437779a
 DIST nitrocli-0.3.4.crate 89135 BLAKE2B c79ce5b4617f47aad4c830d073b39795f6a106697d3ab85ba6f4dc7ad8633cade3aa840c9a117f7b0b4642594757131a5486b077605bcafba6192b28aad26400 SHA512 6a7a5a26af7ac4ddeb14e7612ba4c580c8d7025468a4ef15f102a0890f8ab6234d7ffabc39be04f348c26d87d43c07d2db9b890bf334821a4a6885428b44f682
 DIST nitrocli-0.3.5.crate 97613 BLAKE2B 0bfd97e8a8a643eaf74a7d678c093e3f5beb6851db2f4a1b4df7b2df543a9ee36e4c5de5cb1126799c24fa0c8412da44519a66a161cd9adcadd476789fb20f8a SHA512 7065333b0138a6283224cd604786545fc84360c582f69d0c7ef40ea4d5f8e1bf440d622e958ff84c6ddd4a342c7f38635e222c0f85772ac894afeb68e79e603a
-DIST nitrokey-0.4.0.crate 34431 BLAKE2B 97e5de4f53beabb90ca00685bc62cce152d320bde7092a2a1b911a00a6d6a4bd2bedf5e93e584fd268b119de6626f499ad75c01c715d840be84a94965b90c450 SHA512 b84440bf8624848be5db7c2547d30ebdc9d8bbc8ad09a8809a1a05104f6cb2efe8f5ebd9abd9825ad5028aa474ab556a83836ce4390e650484e0ed1e73543c3c
-DIST nitrokey-0.6.0.crate 42218 BLAKE2B 09410ae8c5bbfd76b216e4ab6c1156dbc3840e9d0f09ab5727ef91bc54b58aab22bb3b54c42f5bc6a9e95936de8c2424449ed61d7cfd4a52ceb749eb6fa4306b SHA512 924c40ad43296538a49f58051d7fa72f6df2ebbeac4b91e416a9e2b017e60b867827352bab0975d1ed5828052572b719b7caf419ec611323b0b5fb8319d0d9e3
 DIST nitrokey-0.7.1.crate 42264 BLAKE2B 32aaf5277f3ffdac9cac5f6a5918caea01bcf4b3f9595d9ea4f1895cde517fc4127acf817fec98f1b2a71141d27632abc2bc4e12bca276beb4e1d3582fbf027a SHA512 eddc244c0feef80b58e8c5d287bef8c6fcb6a08e3e56e599e4c3f754ae47c2ee576721edee22d5784e54086535d995fa30326808b85e40f068c72f4c09466915
 DIST nitrokey-sys-3.5.0.crate 69014 BLAKE2B 61b036749f4c990c9f5575d464016ac4c2058ae81067dcfdefb49e70cc9702671ffe3e952848f24aaee475243208cfeb4bfb52dc5210b5b8db8d53124871378c SHA512 c7b5db1cd9d14dc46e2de6c47007da01ba9d242b0378490fd9c03b7e9ff18dbaea1e756b0731a7920cfae9be12f86b62e7219f8b380ac6dbdd0cfbe362fd72c5
-DIST nitrokey-test-0.3.2.crate 21714 BLAKE2B fc56914efde9fc25cbe04d8e69401b3bf1e231f80dae73a13e760616bf1aea92b9988efcdbede760b88747b4e33103405ad4c5e54597e8a23cc82aad08e4db60 SHA512 fbc2b00d7556244e880b3bf340bbb5bc19e3411f966d4474a661d5e78979a8eb9b02becfb528f026caa03eee658a715314d0e487fd3e0b2338ac489585a6fdf9
 DIST nitrokey-test-0.4.0.crate 21694 BLAKE2B e6d859751c9b32303ad0e54fefb93fcd4d725655521474f12bf35928792558111b602264593369372410b2b83078f01e2391d0874c695b33c0e3a7a0c19d88e2 SHA512 5a2430bb1c8f51de40ee1b81c3b4d01aadd2e6ea59281a255176040ae464191a81547d80a09fe51bcbaf8195c90b17eb0fd32b2ff24d7e8b70cd718c6f243bbe
 DIST nitrokey-test-state-0.1.0.crate 14022 BLAKE2B 786a5dbbbbdc8043ab3fbdfe2b1f2e975c1b98558e828b47bc6ed210b1f4e053233b38dc12491d3256710863a20cd24ab404aff7b7a33789361e5304ccf87c71 SHA512 7d11336e50cdadb9d401a83def544c8aaca9cba5e85f7ecf3d1e94042c646dc39a4f4a17f9cdb1d14ae74b6bc1cf5f9ec2f1acb299c63d949f488fb5325b7580
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
-DIST proc-macro-error-0.4.12.crate 21979 BLAKE2B ccd12d75d8381dfaa15ae1a8f3c820a46e47ef34c49b6f21ca0df77a1e3e5d83b93b0c9d9c99485df6fd35d362b4df76dda222bf80f05ec42593161491b196b3 SHA512 3ba24e96100f859adfc67c25e98c0ded94c5e08e313fbaa0222e9ecc7860219c61dcfc4e0671ace0e684319a43b8b3a92918353fb7d1ade2ced5b01fc45552f7
 DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
-DIST proc-macro-error-attr-0.4.12.crate 6934 BLAKE2B ff7431bfe63ac865ed4facc2b86764179630a98b1949e8c45d4a739d7e7fef2a16919afed749bc3dfce8de4ee0b365ea5fa548d64fceefe0f2b418d4c5135854 SHA512 5927a8ec73e062e836403d9beb98de443a813615538855e40f574e7a82977d55466db191660f97d863efa7a3643ad6e2724759221ee30553b805c9cb7f5849fa
 DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
-DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
 DIST proc-macro2-1.0.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
-DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
-DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
-DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
-DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
 DIST structopt-0.3.13.crate 50324 BLAKE2B 0c2060e87219437f036772e7457b6273c756c8ecf686bfd24273b713cbcb8410bff5d394e5c6effd12fa222fd0e7510cf16966ad6aafc9196d9d0c646e3a2445 SHA512 b22cf51caaa46c0ad07ad58709e024d615f2f8688db2414acce4f1abd677adb61f1dbdbf3318e194172c475781150da6bcf3c149f6acc60cc195ec598874db5e
 DIST structopt-0.3.17.crate 50166 BLAKE2B 86be10f82d7f56ec178c87248c1618664ed2f8491649e4d90d6dd3358bd4b9ddd76685635e060fd37562cde2abf87ab0f933b9a212e32bdbd4e72d69e103fe9a SHA512 dc193e216dca278b081057072e7888f5b0e0c773fac8e136efd9d0af8cfe89f60d07459bbf23172dd7f8c4ee461458a7d5be957d6cddcc5bbff18515716b66c0
 DIST structopt-derive-0.4.10.crate 19724 BLAKE2B d7e3ebaff53b82e093ef750c10593856270dc59f3ac1f6590256806ea7f7dd2254be6ce1b4e5d8322f9bd1b68931816ddf0f5ff8bcabee3c9112f837610daf81 SHA512 b390a703cf8103fe89663bbeaed30871b8c0f9738f6543fa35e36125c0d1eb3032e363812c1c197c4a42da204b992e7c69fe11bedd4474d3ddea19a96c81bbad
-DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
 DIST structopt-derive-0.4.6.crate 19398 BLAKE2B b8bc319693dd46e77a3229ecee3a6b41e2e479cd6b86d76ad1e0fa33895ef79a21640c09d3fda5bfc6d2e181f37f66d8ada3eedae49f7be3e2774d4a2680313e SHA512 842507f9ac3172c48700d1ba350d93fe087eef37903fe71b15b39f21ada56dded638077dadbaa109869f9a0e65ab7e4a049504505e1d3e2736f779846ba6330c
-DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
-DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
-DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST syn-1.0.36.crate 205090 BLAKE2B ec3842cb0b1c72de82b2009a52cfa6e8b37f881f195414b6825345d958cb3052aa6c3212aa1d42da7780f8b8960a38d1487b1967125075ce11ef154d01f99592 SHA512 cefc4161d8f10df4782ab8ccea81c14fbb3b789ed71481e32231d4519b8babf6381a671afc3f89a9a8ad17e7f5b4d7ca6c9dbb4c1843132f606db5636ebf0902
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 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-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.3.1.ebuild 1196 BLAKE2B ab663b4fcba810d44b70f78f3b6eb9fc31287993a1c4fc78be8a0ce5c074078bdd4a2d472429cc6f748617536d514eddcdecd5e12e417c4a69de70f8a54114f1 SHA512 e955f82e18565d4373bccfe4439e4770e16e5c87cd3ea06221f130e4da7a97a81e2096be96608295b8e329ab3a3f5c43035be5e8dca557ab67b6ae239b204f85
-EBUILD nitrocli-0.3.2.ebuild 1402 BLAKE2B d98f0e19b8bf677f299131b7419401425bf5715a6deff8e01e2c340fcb3e2e4fd23c21d0a25411bc357c89c2b5807a48f0f10790341759e2147706691df67af1 SHA512 f873c00e2e2e0da275ab94ab05dcd62acb8ab652a968f722ab05baca8c596862dfa9327d7d635a575ad91b43ef038f7466d1d7c8ee2b187a8404c6b0cdd92223
-EBUILD nitrocli-0.3.3.ebuild 1548 BLAKE2B dc3ae38f16614a564f4d6c3893e7bac3c6469ba61d64e93468b9a5adf105fac05ad0db0d88a4841f87911c9acfec14c4cf7e984a7171a6a1c3ebe831cf75a838 SHA512 8e2255e1849411617ef7e22b187c368336394f52f3e91f9da6c194c556f82200a248859f123c55bbc5dabfc19ccdb26ecd1132a5014c0f58f41fa06cb31ce643
 EBUILD nitrocli-0.3.4.ebuild 1551 BLAKE2B 5d0dbaa6766209bfcb3d2c1332a69c395df40377b679f9b42bbf3f58616ffaf51b532a6ee4df185d6c2ae2744c0b18f214027ba4caf0918ef2a69b0565594ab4 SHA512 d774c7b7fd0f92e52572d1fec2f9413d1e683781999336879a89061a68d5f64fb20717e198f4e286a7db9b5b64990e5c21ab4c4c4be3eb659156c7f24eccd760
 EBUILD nitrocli-0.3.5.ebuild 1968 BLAKE2B 5c58af3560e0ca2bfb52b31fff704117b2d5defabcf55aca20efc19d860c52a9f9675086698bfb88394ec3041453030b2e1fdce3fa3a1c68e8a2316af33428db SHA512 f4924b0e13093548c93c12f14dd2472ce3ac39f67525904cca9522c829db27faf768abbe041b1904931963886df92fc240a85602581acb2a4059c40b5d98b20e
-MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
+MISC metadata.xml 713 BLAKE2B 77012af77b67c16b6ff4fa02a3c0a26d493ee288f4ed2bb5884923f5be779baf56e12c0bf391d6eae4e9f79f3899c053f583ffdc0ed7595f24ec84ef93c23fe0 SHA512 4a99d7fba9fa024a139fa7b71eae1d341d281b9a9db52376b6ed4e447cd875d2319dc6115c7e17e6b1386b10fb956584203bfac9064af9cf8844788fa7542410
diff --git a/app-crypt/nitrocli/metadata.xml b/app-crypt/nitrocli/metadata.xml
index d84c39390b85..9a1a0f54e70a 100644
--- a/app-crypt/nitrocli/metadata.xml
+++ b/app-crypt/nitrocli/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>deso@posteo.net</email>
 		<name>Daniel Müller</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
deleted file mode 100644
index 9d51dc07dddc..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.1.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
-
-CRATES="
-aho-corasick-0.7.6
-argparse-0.2.2
-base32-0.4.0
-cc-1.0.48
-cfg-if-0.1.10
-getrandom-0.1.13
-lazy_static-1.4.0
-libc-0.2.66
-memchr-2.2.1
-nitrocli-0.3.1
-nitrokey-0.4.0
-nitrokey-sys-3.5.0
-nitrokey-test-0.3.2
-nitrokey-test-state-0.1.0
-proc-macro2-1.0.7
-quote-1.0.2
-rand_core-0.5.1
-regex-1.3.1
-regex-syntax-0.6.12
-syn-1.0.13
-thread_local-0.3.6
-unicode-xid-0.2.0
-wasi-0.7.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line tool for interacting with Nitrokey devices."
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.3.2.ebuild b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
deleted file mode 100644
index 443257457f3c..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-base32-0.4.0
-bitflags-1.2.1
-cc-1.0.48
-cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.13
-heck-0.3.1
-lazy_static-1.4.0
-libc-0.2.66
-memchr-2.2.1
-nitrocli-0.3.2
-nitrokey-0.6.0
-nitrokey-sys-3.5.0
-nitrokey-test-0.3.2
-nitrokey-test-state-0.1.0
-proc-macro-error-0.4.12
-proc-macro-error-attr-0.4.12
-proc-macro2-1.0.7
-quote-1.0.3
-rand_core-0.5.1
-regex-1.3.1
-regex-syntax-0.6.12
-structopt-0.3.12
-structopt-derive-0.4.5
-syn-1.0.14
-syn-mid-0.5.0
-textwrap-0.11.0
-thread_local-0.3.6
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-version_check-0.9.1
-wasi-0.7.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line tool for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.3.3.ebuild b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
deleted file mode 100644
index 132dfa4a321b..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-base32-0.4.0
-bitflags-1.2.1
-cc-1.0.50
-cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.14
-heck-0.3.1
-lazy_static-1.4.0
-libc-0.2.69
-memchr-2.3.3
-nitrocli-0.3.3
-nitrokey-0.6.0
-nitrokey-sys-3.5.0
-nitrokey-test-0.3.2
-nitrokey-test-state-0.1.0
-proc-macro-error-1.0.2
-proc-macro-error-attr-1.0.2
-proc-macro2-1.0.10
-quote-1.0.3
-rand_core-0.5.1
-regex-1.3.7
-regex-syntax-0.6.17
-structopt-0.3.13
-structopt-derive-0.4.6
-syn-1.0.17
-syn-mid-0.5.0
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-version_check-0.9.1
-wasi-0.9.0+wasi-snapshot-preview1
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A command line tool for interacting with Nitrokey devices."
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli.git"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install --bin=nitrocli
-
-	target/release/shell-complete > nitrocli.bash || die
-	newbashcomp nitrocli.bash ${PN}
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 36ec16ffd6b9..2473e5056739 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
 DIST nwipe-0.30.tar.gz 6358657 BLAKE2B 69fdcfaacb32aacc27b375a793bff5b7014979c8097ef3b48c2c307e4bc3a828de7c01b6a58e46346dc58a1b4beee4a408074706175098c364dff7ecf67771d3 SHA512 b6d86d78dafbe6c5e27b00b183673dc77dedcf849ecd169b616c90bcda5180bc10fe072580c13f027abaa5fd840e73034ac75af75fe1cf6eb0756273bf46975f
 EBUILD nwipe-0.30.ebuild 542 BLAKE2B 58bf4c9fb2f0280e34e8c626377f9ac49b06a94565f2bd7f75c4ed2af75040e09f1db8ce8ce894ebf0d07e4852e92fb5c89740410c37fd49f17b806e612ee0a8 SHA512 a625f460573dacd84cf11b97d87294b63753063383333183b977136d4001d4dee6f61778e337068488038e4725706aaff14070ff5882395dc214038c4d6a8f5e
-MISC metadata.xml 458 BLAKE2B a42de1e61e183e78050015563f293f8cae433af086d3afde066624dd56b024a35b590590dc728cc181e5ab0912ab94e48af4a3db9117498084423e7134a9743b SHA512 63e500333fff449b1e2e91fed9492ee3c5b33aea0116009cceca1b50d744b87cbe7a86c01a5cf19979425f56ccf746e487b8ec03c55f988f377b326c95a1dfb8
+MISC metadata.xml 488 BLAKE2B 43eb76db498081845651cc0d94746f2cfbc9deb831a0e220e60122d527439d2dcf63ce183f3f39a7592ec14aebe97d4042f78c1492b75e60bdd6d0e66d8fe442 SHA512 46ef396b60d3e2f9b1ac11f68335ac3de5a5b894939902fe98f3c66547a539569e1b6055a7eae80dbba708c999926ea7f4041560e866786365db27785477553f
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 0675dc705da7..007c834756f4 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/openpgp-keys-terminator/Manifest b/app-crypt/openpgp-keys-terminator/Manifest
index 786325b180f9..0b8cebc7381c 100644
--- a/app-crypt/openpgp-keys-terminator/Manifest
+++ b/app-crypt/openpgp-keys-terminator/Manifest
@@ -1,3 +1,3 @@
 DIST gpg-D11A7596F61705480C711598F2FAC7C7BAE930A5.asc 3898 BLAKE2B d0ad7f85001c2e7ecaabfee90e4676296be271b00a10dc8206d8be3b5e4c4c8619f65d9d2361569ad7be44a41d67b5815ce0521e85e7a6bededd3840e0912bfb SHA512 c7b9df5ff1ac3cc64ca12643be7415742f7af6d43324d355412cab2c6a6c9d1f4b3d5ea33005d76ebff9a6513a25beab16ee4446e753adecfde125b5c1ca9f5a
 EBUILD openpgp-keys-terminator-20210306.ebuild 644 BLAKE2B 68c1c656223826bc7432d9e1517b9535dc8692e162994127beb311246915bd9190e0bb7fc8c6414eb919aada745a5b741a2464278a7e78c33c51209e7863456b SHA512 9ad15927bed3aef4c112a316cb1a18f7e88cd70a151cc4b5761c14f201904f20a65b84ddc225e9324bddf6136c9e20a234722fd4dc14083117e0604ed2bbe2dd
-MISC metadata.xml 397 BLAKE2B 5d71b968b7376a396a2641a4aa6cc1d7c019bbf41b9a9af9ebf6280e4070273637ba3dd3b7c6f2c0cc713332859184f271aa685fee1cfc53e77c22890c68f0d1 SHA512 58cd284549afcb205fca09cbfe968b9946c515cc4d94fed3ea1b8eb3d7e97c568fc8de4572f3dc3c1862fb7f07769fcb8c0feddf19b6224c8d0ddd4ba9a80757
+MISC metadata.xml 427 BLAKE2B 2d8c5fd5d9c6a2c49b9454fb488c60a722b5b56825f25861fbee192cc64dc3690e93d47e45a9033bfed431fefa6d2171de2d8efca61fa8b1128fd741873ffbdf SHA512 b41f357a99251aa868f31466749de8043a2b419927d7e87a1abd778b83a799636590278cb223daa83613f5b6d0e86e7e3eb75ee0fed08395354ce14f7a17e433
diff --git a/app-crypt/openpgp-keys-terminator/metadata.xml b/app-crypt/openpgp-keys-terminator/metadata.xml
index 301999f989e9..7db431c0d583 100644
--- a/app-crypt/openpgp-keys-terminator/metadata.xml
+++ b/app-crypt/openpgp-keys-terminator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index cd8f95b15c7c..5b8c87566760 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 EBUILD p11-kit-0.23.22.ebuild 2007 BLAKE2B 83ef4fbea91e9fde8324a6a490055a7af92c0cb21550f832242ab9e6fdf9762d315385fedf38b450e0a8ffb076cb7c872b3694b02fb2d6031bdc9afb0bc67061 SHA512 97a4d243b6a053c7a1008906aaa5143de852438cd71e689c415f7de3a16febdb2c5b2fa4485913ea696bd184b1df804a3d7658ea96f69ae49693f774eb569652
-MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
+MISC metadata.xml 461 BLAKE2B f08333756cc155a6cdf4114a5c486915ca0c328be382457981064997951bc89b4968fabcce89fad96fcf1c26e822d292aceb26684f1118520474df52b40dbf8e SHA512 043b9eb064bd25e69b57b0ec50193ce748efae48429e2b8518df0d2376262d213507bb11a809a2a5b4443d3991eca6c60d418538ea92845b3d71139b16e19fa2
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 21a9f711d2ff..6724ed5eb2e4 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index e2c37dfe4d88..476a1a539134 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -4,4 +4,4 @@ AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d
 AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
 EBUILD pius-3.0.0-r1.ebuild 877 BLAKE2B 4ce34605005d1afa28c76bf158b01803e4a52db9907b5c1c6594d8be3ffb15fe8fd9d144d5142a536216fd81fd496e3d91d2f861530214986ab6da8fbf6616af SHA512 5e86eedf186ce5b72bd1bf99dd0ce01349a50c2dcc56aaf85b6671a041e0d4c49c5bf95f93f89ff9227ba7e038c55f8124f39f0a054c3360c5e319eff111fe5e
-MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc
+MISC metadata.xml 852 BLAKE2B 0599ad8055ad38cfd9703002801ad6e852e942ddfc9892b7450572a08b8a0331f904f76798dee301fee201beb73dc6d8b8f10a6581eb1a456270e85272a617de SHA512 d6c854b7fa0a839401425202a83ed0c931d6ba49e6553d0116d9360c0ad4d8d7f35ee7385c0e2127eb6d67a8749ecc2fdbeb27a28676b05fb0809fbc1773c078
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 0be0c7e0c49f..e153f79ae689 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nickaristocrates@gmail.com</email>
 		<name>Nicholas Meyer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/pkcs11-data/Manifest b/app-crypt/pkcs11-data/Manifest
index 0b553cc64802..95ca0ee6bdbd 100644
--- a/app-crypt/pkcs11-data/Manifest
+++ b/app-crypt/pkcs11-data/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-data-0.7.4.tar.bz2 226267 BLAKE2B d9390dbbf465e4ac945d5a5ed0d11ab538da269fed871a21b122e395c1080f9a1acf4eaea072e422a62b043d546d6a7c130f3c67ab07b953d3cbdc469142a3bd SHA512 79b13cbb7dbcb8a35c46e8de79d31e51e53a4e75783c3bef28a0d1aa8176db869a0bf984e516d21567619a7f8ea9206ac9ab5ee81672d9ae2a89efe713cfc46c
 EBUILD pkcs11-data-0.7.4.ebuild 441 BLAKE2B d5a6b5a19a70e6427efecbf3e7041efd29737aafc1db00da163a926a1f63da8b2374dc9ff6b7e5abaee40a3d1bcc47ad23d06f67761829e2e194720d05308361 SHA512 ff4b872e1f8fb3dfa78e061bc18304a2c87f4f9201e0064d9d3c5d2a6c3204c329f577e68f0261c0cd2d943cec06de4a8be0d85c95d7fb2b2644084fcc7a1765
-MISC metadata.xml 307 BLAKE2B ae01ed33ba78fdb8a1bd890b7e57d75cfea4584ae4affe58bd8ab1397c795fd6f0d75194ed4b6c279de6631ab1a4813c5f05465e441d9641fe32f809277380f3 SHA512 f404f1f58c1fdcefca42d89064a4723578765379a187c5559c999930a459ba5d954a1ee5f37b854d340d80d41b739f25d31aa988f0b53ac96d0f498338f71c59
+MISC metadata.xml 307 BLAKE2B baa64290cb0547464bb3e85d18403f010c3bebfc1ca2a074e633dd88194739df018a71dfbc517d78aed8b654e98791f1bcae34c27829e2873fe7e5e9bfe89775 SHA512 189f549c770d50b1175ac6a1af1d0ca84379f803a7b6969414e51f8c00c2cf3f0113d8ee9a098d0cc503f6c0c3f795159b7f561dc6378bdc5bd6024c9182660d
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
index cbe6bfa21c37..e1b63724e315 100644
--- a/app-crypt/pkcs11-data/metadata.xml
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-crypt/pkcs11-dump/Manifest b/app-crypt/pkcs11-dump/Manifest
index fbe4b4b2ec21..8adfb91e3ec1 100644
--- a/app-crypt/pkcs11-dump/Manifest
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-dump-0.3.4.tar.bz2 255715 BLAKE2B 61545d1b929f47799fa1c3f2591b245b7dadf70df786d7c3574109e66cab407449ec158e2bf29fcdce2238bc316029293ee9f37586367da971f1a8aa777bc015 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b
 EBUILD pkcs11-dump-0.3.4.ebuild 492 BLAKE2B 721d41e557a7d1d6bf0bab3cb064c5cc401cb5d0e12d343fda4afa85b4b103648646244f52c078412d89dad5940b6dd580c72e24ee8358fc516e30fa385b2b7e SHA512 b63b2e3ed5fc56682e42ab76292141d6e1f0a4f5f23bb8c0159cd6779580fdb70109652d8c1bd3a2d5862422a22173f237a9da5d372b8c068aac17ac3310f505
-MISC metadata.xml 307 BLAKE2B 6d692123eb29fc361d6b528781dce686a58c9d25cd85822d49ff80275f78173a8d36c02d7595b267286f055bfc2b20b46332a6f80bb5788c6e2834f1b6119225 SHA512 db3bc942e4feff7a33d76e37e1469d8855e49eec7c5a402ecaedd776e2678d76e3f3cb4e1d79e70258b33afc95325b521397ed04f054434192e7b4b4315c99a4
+MISC metadata.xml 307 BLAKE2B c3761947b71d701b45ebc6d4fd4037ea0b166c37b4a36a63b90ba6212da18a01af423f63da55073f4a6868848451aa6003a2b6029d6ac5177e04fd27d1427bec SHA512 aa1c7499786a9fbcd5ed05f88175e7ebfefc8adb56ab4cffcb515e8a35d67b42e237cb4af66e41f1af5031e41a3764c3e462c3ed8e7379e5233034f401242b37
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
index ab07aa2158bc..cdde025bd782 100644
--- a/app-crypt/pkcs11-dump/metadata.xml
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-crypt/princeprocessor/Manifest b/app-crypt/princeprocessor/Manifest
index 1f1277fc542e..bf1855cdfd50 100644
--- a/app-crypt/princeprocessor/Manifest
+++ b/app-crypt/princeprocessor/Manifest
@@ -1,3 +1,3 @@
 DIST princeprocessor-0.22.tar.gz 38829 BLAKE2B 396a3b12bd390dca80f8d054e8e0c04c70d0bc1cb4f957d53f9f7f4a8aaa87edc1499cde20e01dfa288ba8212403e87e2c6180f1cee3da4825938d08cb2da1df SHA512 8b73867b3f8a83601cde9d6d17e917d0ba468873eda8c47e3c4de7a0511fe35bedb44c68897df9fcc48b1737c1f2c026117e9398f5ff4202611a001fe33990df
 EBUILD princeprocessor-0.22.ebuild 678 BLAKE2B 3b2ab98149708f2e50c0eb9bb890429d4066f9705c57e8e637590603c2531bafea6b74ddab845215eb1c7fa81d536ae48748384be741debce3388b68185440ca SHA512 08777a7c55c7599280f783ae0fd22d4b8d912571ee5001c5e8e2527208dd1a3bbdd881f79ecf232ef4a324651901f146917bcf532c614a667a8fb6b4840c550c
-MISC metadata.xml 335 BLAKE2B e69056b841f119cc4dacf6390d8008a89ca59b715a85fc6b16a65ee01ba52aa87b1035bbcbb4e345358b20805b07dd61555229b0fbc47eeea5b5e0f5e49966bb SHA512 a2cf00a24dfc489539a22eb44418ce8b758ed5b3934ad0cd75fd05a9e081eefa19588d536468a0dd3047f8ec52792186107f755b6136000ba70108d2dceebbe7
+MISC metadata.xml 335 BLAKE2B 39bf00b0d858c41cad2b0b20bd0347eada5a20f33f79ae5fb14ee46f8e50b7fee5b95359aba07aa5c6720eb80fd51ac87d1fca8398d422de044d8ca47a399c48 SHA512 cad2e2b0ccf5c3efad1e8a0d96e409032eccfd3dcb6585ee25f5277d119f30918147e0d954134b95e098c9a107f943f07edcbf53a051f72b14a188b39822e55f
diff --git a/app-crypt/princeprocessor/metadata.xml b/app-crypt/princeprocessor/metadata.xml
index 83b9308ac052..034a0320f71c 100644
--- a/app-crypt/princeprocessor/metadata.xml
+++ b/app-crypt/princeprocessor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index 64508e19443a..2681c0e4e881 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-1.3.1.tgz 394516 BLAKE2B 91faa22dc317927b92abe26c5e15cd52c409722716076c7cc502a0c6e4e84ceaaf60222b3ef141c6a209f36084df2d7f45d8f19482aa035c3e2442513c4283d9 SHA512 c76c29463d2a4db6b62283daca80bc4124a6272f37f983d472d44251b98da702f1edb16ad15058a8d0ea320c23bc1486892ab25d367d37ec77c38a55ad7e69fe
 EBUILD scrypt-1.3.1.ebuild 451 BLAKE2B 85576d7a479c5b1381d947e13cd0b923861799aeaa734c5f0b850befbdb35285dea06ffa359d020da3b4129a48a5b87f0d1a34ecd5f91c1e616b1f86ea023540 SHA512 e3beb1513d2bd91f8e9718682b30567c3f2719e67187ce547fb1a9a9c3c3e1537cdf0354f3f549614db674f2968511693af5e03c155e9c6e825b5a0678f00460
-MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 9654d1c22bc0..6d821181d635 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 6d937474b038..3894614a970b 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,5 @@
 DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
+DIST seahorse-3.38.1.tar.xz 1725480 BLAKE2B 348d9fe1208a9205c58c5655ce97b79c279e2e3506f041a1ebac1f7c83666186ec792bafe7f23b470dd1202a12bc974376b8c369888c6fa194739e7a15973d63 SHA512 1a064ecaf1a25aa84010f914043c3776eba464844598b15e0822217ad330396516df64afed1aeffb3c7b6102d1477c280ec8ec32101cf9f5120c433431b9df32
 EBUILD seahorse-3.36.2.ebuild 1617 BLAKE2B 74ce0bde4fcf4c6e4206075d5e16db5365ee57f90f32d86e07be2d881e8e4f4fb4cea3f77137450c03504cb63ae6243f4e5840c14756a2cca0d5ad9b478fa9bc SHA512 4c7e8563f478ae8852a1c9dca359fb4e0a731e1f6a5e508d40a3487f9b92ac38894bcf52db84e1dfe35239b9de8659957e6e303ebe05dc058ef744cd016cc91c
+EBUILD seahorse-3.38.1.ebuild 1619 BLAKE2B e619cfac7a6e96f1b0f66fdd9bc7368bd6ed9c59d7a2aa8ddc981bf33ac8050218c7162930bb95579e385231abe52e6979a78650910b3277da898ee74f6d3109 SHA512 16cd3b53b6d6410c04a97c23a868d27e8bce6c6c7082bcc6e1aa0efdfd0e2b21c361af8040f68f93d616f9b6fbf8a0cb2b1ba78f3305690368d6377310b23da6
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.38.1.ebuild b/app-crypt/seahorse/seahorse-3.38.1.ebuild
new file mode 100644
index 000000000000..031375c4f5c1
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.38.1.ebuild
@@ -0,0 +1,76 @@
+# 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 vala
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=app-crypt/gcr-3.11.91:=
+	>=app-crypt/gpgme-1.7.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=app-crypt/gnupg-2.0.12
+	gui-libs/libhandy:1=
+	>=app-crypt/libsecret-0.16
+	dev-libs/libpwquality
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	>=net-libs/libsoup-2.33.92:2.4
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 9d02ea2ba710..ac21700ccf4d 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -7,4 +7,4 @@ EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc
 EBUILD signify-24.ebuild 540 BLAKE2B c9ad33a60f4d8e2d5ef7a3f8945e722eb06d1c29f9947d24a93433ad54249860ff8a1f960eef2e31c618c1af9d6f7dd92ea6bf8099694ccc7c92aafa097ca46b SHA512 3792038e4d522c6ef7d30d3c6569f57902524f04e5c8cfa5f3868f491eff6094d163294f0fccbc5338acf1e398dabac3140f6ebd68395f142ff172a649a9eca6
 EBUILD signify-29.ebuild 551 BLAKE2B b91d56242ee6a5f33993e236bc405dd1ca92cf3cef64367aa4fe6d15de963c5dd6a71f6155777d0f1b7a50d2d243f46e54d876decfae931d51514d3e020e22b0 SHA512 f446097bcfd19cfb28450c98aa46b850d036e9ef68518912193f0cdedd08e0c5647232740f464c4f51bb13c712ea1814bddf393575712cbddb905cb079188825
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
-MISC metadata.xml 328 BLAKE2B 48c8809b13673350e0ed718437f90815703eb6977ad40b8ca9a2f17b3b51e4d412450a31e58369f49c14e3a3d20a704840ec3efd6e03b9b377c8378598150dcf SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560
+MISC metadata.xml 328 BLAKE2B 660647e23f662679935a56bfa1e200da9725f5c9906eca894fb8517bc698ed07293450239f38294a011a422a477dc4192e1f1431196ecdac71df1635788eaf87 SHA512 cf027ac829b9862f917060f9452ea898c08ad659a5287a32c3af3984fd10edbe1c6035037b317219fe056cf461b0a3e83ce1397eecf5fcd5294bd07323629618
diff --git a/app-crypt/signify/metadata.xml b/app-crypt/signify/metadata.xml
index 70c25da76340..91cc08c1747e 100644
--- a/app-crypt/signify/metadata.xml
+++ b/app-crypt/signify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index e87b4a5d2806..da48e1640732 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -3,4 +3,4 @@ AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dab
 AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
 DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
 EBUILD swtpm-0.5.2.ebuild 1778 BLAKE2B 6e1ee3a3b5bf294ed8bb63466d63e4e6f89d7a55dca83f3c30ad305fdf0bc766dcd87251693806f93f0a1bfd8697f612df77c2ecb46c1c5ba2c83c56e48471b5 SHA512 109bab163b9fca1815cc7535f93cb38c0ade8389f76778d57dbb00f4b60a02096b12f6d9cd2468fbbffc698d160fbb6ea8b270d72f261b5fa238167ba6b063b0
-MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
+MISC metadata.xml 486 BLAKE2B fed5484b3accb9cfad5349d2752953f8ddbd59d002183efba66e5d3b7117c7d113fe53aa8f782349c40cf0beba60b4caa38507378498e13a94c396372888831f SHA512 e28d882b4a3086f21bba65947bef8b204e730e57a9171913139e27a8211f3856758a479d2e73257ba6ce2db616aa11af7561ac39d7fc52d959c6582f7f4a878a
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 261b73cab058..f5a19bbb03d0 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,4 +13,3 @@
 		<flag name="fuse">Support sys-fs/fuse based /dev/tpm interface</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 7e17186639c2..ea45e7df845d 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -3,4 +3,4 @@ DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 1014 BLAKE2B 709a67933038725f0d5f13c01f022784036980b4fefce6c6409b5dfbf1e688cda1602a44ca38ce6db09a1cb56a84e15366e0f70c241cf6aee2bd6ac9f47595f4 SHA512 96f5e4867454ed666a95fb843a1540514d6114bb40e7df7b6b11f5781851bbae7cf473e7ae0fc5ee361d72d620f57382cde33ee8d777bcbd5e9ffccf68e39d61
 EBUILD tpm-tools-1.3.9.2.ebuild 1157 BLAKE2B 5814481a8573971f5d89f795b02fb09a7c559772f55302a2004d4e45d3e65128448d0e454497f0696e319d632ea972500e29f865dbedc7c530b27b349a71f788 SHA512 4a34636c6382cdee294d9ff29f127a6d44df6d6e8041fd1b4d4952b641256ca03f8557193463ce4d10c6383322b8fb2d91692fb9fe4104c68252e58d0cf087c1
-MISC metadata.xml 620 BLAKE2B 476e96fcb039ddb412218d88dcdd4cf2fff9fab8c1f84d4c8e8388963c3150facf9b23e661c5f3552928fe6695105e8ee713895e88bdcd87b648eec6d2adc59b SHA512 38c4cfaa0c8d3b3f606247d76a52e82e3dab7c487e73780180a197763a695c3d023ac54706c87238f75f2ef8ba6b1913bcfd7769c36506690830fd98b6cb7d6e
+MISC metadata.xml 650 BLAKE2B 66c56e7c16146ad3bd6649ee4bc57f786329edc9fd7b02b7f8ca074ef37d949d34429b9c758ee790c120736b2514a1accb32fb617dbe1661e7144a07251842af SHA512 5fb40c8f69ad43a46bb93bd991b2cee31ba4e1fdf3b770916d6c7ec533abdea0832b273cb2502e2ff56898c0d4a703e760cc2861b139f4ccba90f8a9fa5d2703
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index d0084064703c..9bad4aa32163 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index be49cf5fc23b..e3f588bc8534 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -2,4 +2,4 @@ AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.4.0.tar.gz 575440 BLAKE2B 20c1fa772b016879adf28a67966450d64924bc1ac22b3111cf7376706335dc92fa8de97183d89c9d3ff5955dfb2a7617869469e9da61eb05847fd29b4a0208fd SHA512 c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
 EBUILD tpm2-abrmd-2.4.0.ebuild 1247 BLAKE2B bcdb64e32ca8c3574dd8965154456d156b280ca5b36ef421b7d774fbccca52967234bf2a9bcc6c21fe362773fc2c261ce3c03150ae894a260482895a8d6df058 SHA512 db9395c665dbc7b66c23f84609da325f39d3518c7b618a922a311c7e713105fb193fa2dab9ede08f3de2e1d76b7e6a6acb40033b02bf2f3731f21f9354dac321
-MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
+MISC metadata.xml 488 BLAKE2B dc76f732a1e1c6a7aeebb38bda5ce237ed666ed3aa995f46d42a47e34e458383f86973536d772ed8c88709ba89d987150eeeffd4a71de7eecfcc55ee729f086e SHA512 3285b333530bfe75e9593ebef0a4ba6e27adf006d82b7b78c02be8fca408ef71fd5d599a6ec224d7739d2f0302880931ba0023770eef534b774be88492c84a97
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
index ddc35e0cf88d..fb21188fe8c0 100644
--- a/app-crypt/tpm2-abrmd/metadata.xml
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 74dbe887b3d9..acea8db7846a 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
 DIST tpm2-pkcs11-1.5.0.tar.gz 1355121 BLAKE2B 9c00deb62bf30e22ef346bcdf951252913709f6c953f45e68df35cea434e55f79a960fea16aaa46794650c0cceaf979f4250af8cc835e48f34aca5b2306f2685 SHA512 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
 EBUILD tpm2-pkcs11-1.5.0.ebuild 1556 BLAKE2B f8c03e4058c93fe7866f24cbfe10c41e8cce5f1c7547f5db6877a008b8a5bce8d51f86cdc4f6ab855256af395befece75fdac581285b385ce6acd03b6f08ac89 SHA512 2fec1928477aeacaa54e1760b3669aec86213768ab5001cd2f88df1dc6d0e086b624bb2b9beee04086c978bfaf5a64429010c5883887b4588ba7560b172defa9
-MISC metadata.xml 439 BLAKE2B 6f2f3a6188973cfdc23515761b9ac0a1a67d644374de859c8f493874c79b8802a8cfdab9635ff6af3eb03cf925fc22214da23a26738b51d5dd3c0d5c9e78af72 SHA512 0d819fb83133364a6ff8fa22a868e4a88101ca1d72d2552e007e25be1f4ea7da9066556123879035962f36910dd5eaf2f5b5dc613c8e7807ab383084185bef41
+MISC metadata.xml 468 BLAKE2B e08802703d3c5706bd33b10fc052a921d080c634ab2f9dae36b10b6f16e9fd0d5026b78b8f8c3e1f37a26bbdf6b235306fcb85ea904b50d1eb07cf7bbcfa5757 SHA512 a347075cf14f72b8f1b221ec0436531f53aad8ee878532695304d6972964ec65c119c1a40abab1efc8dfce0d5abdc2fc0977f212ca08b2791e7a7ea78a074f5f
diff --git a/app-crypt/tpm2-pkcs11/metadata.xml b/app-crypt/tpm2-pkcs11/metadata.xml
index 428d019c9ce4..7cbd77e4f138 100644
--- a/app-crypt/tpm2-pkcs11/metadata.xml
+++ b/app-crypt/tpm2-pkcs11/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,4 +13,3 @@
 		<flag name="fapi">Enable feature API backend</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index cedb015d206c..f1070443e183 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -5,4 +5,4 @@ DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45f
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
 EBUILD tpm2-tools-4.3.0-r1.ebuild 1169 BLAKE2B 8e0636426eb9aa2f39464c9c191e58b7af188b6dd01c8b40586abc393425425a427eb481d8c7dfbf335aa63e84d1962f7280f4589fc158e4021c80b20bf7a1eb SHA512 b5df4e5816e4d5135d94d650fdfb4bcddaebf370187da397ad72d9ecb816693cc274dd96989f60f3e1a713da60aed1deb397ec955227be7a161c49c734704762
 EBUILD tpm2-tools-5.0-r1.ebuild 1167 BLAKE2B 059a93934c3154258b9fc32fb7f002d54e4feeee76e0e6d22cce8828ae61a244e0aaa85682b30824e9c7dffa16f0293bf32aacbead026d8fd2ce6efd78c8c8f9 SHA512 d0afe0b7c39ee438de039432ad226bb65d1f98a9687ee4c81955288fc7e3e24f3c395ba6c07a0d6d685d26ac376b982befb0c9bb7386260031aac4a1bf330796
-MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
+MISC metadata.xml 555 BLAKE2B 18636ec11d6b6a4d1586e015c860e38f1b28072194ee6b598646e24843372feda4ac1d1e14b9b27eeeb3c3401635415a0d368311e361aeb67b4039747919cbff SHA512 61444d1451e7c1f827330be175abc03996b61ac42c99c8f6ec4a01d54a24b62a7e115e87aa935a74fbd1ae6f0f507a8386b972a59ec34f9c639a2a984783db8e
diff --git a/app-crypt/tpm2-tools/metadata.xml b/app-crypt/tpm2-tools/metadata.xml
index 26b4dcbaf517..f5730a083624 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index c26fde8d1b47..c73e88d46d83 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,3 +1,4 @@
+AUX tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am 730 BLAKE2B 8bf144a03ec3c29c2e43f564ba65e8c10a70c61dc3e14d8c1085012f3aa1d8bbbb2cac3ab634ea02122ed1f2d21103b2fbf307528af178f3265788baeee1221f SHA512 3f51ed8205d6a0480abe85bc49c4fa86eb8141f3667a04dcac327e6c4382c9b430c97d170506a4e12bbda80c981128e9b5f5308036d4ccaee4e28bb93b866204
 DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2
-EBUILD tpm2-totp-0.3.0.ebuild 994 BLAKE2B d9b207eeb13a40283cedd2993049d09bab514d93cc71071d6332a6d589280d39908cbb1f5b69e9c014aa7e531d2e67498a66131e1389a8c52f6b7e3f93a990e2 SHA512 bcdc1cb8bee0503710d1d673ace426fb340e6a3982c237b09cdfb4f2a9c8370209e9e099a9a56262938a51348790082411323fb30650354aff25d29b20f2952d
-MISC metadata.xml 544 BLAKE2B 4c6496211180d7893b35163eab8ca8f6a6cede115470f0e4bbeaaed773d81c8d08cd45949276e33842d321bd4834f978ef1f1fff09545c261fe02e0add3b6a52 SHA512 47d8998acc8e248fd70743a7cd53ecfd04f9ffdd5f0332be0efb5cf6112d0909044b9562e2401b9d7f6f98d5dd008dd71d56d8c2c85847536d18e93da706122e
+EBUILD tpm2-totp-0.3.0.ebuild 1064 BLAKE2B 5611bdffbba3553a038bd61377e22c1bdafd5bb04018222b4e325b8296f101530a783df628d1968b4cdb510b23d10f35d033405d54f85bdb41a747d63e3bdbbe SHA512 8d16ac7a67fbc072b7478eacc0b60645fa6fc3c4a02c589ba407f0ddf40581d529e337652e558a775a7d328fee5eaf776eb6d1d02caa444584a08f3589bc21e7
+MISC metadata.xml 574 BLAKE2B fb8af894a46a8e2ab847b277d92f9fcb73a59da34ea545d5b116aa16c2ceaf94d795b064cf9f8695c4363654fbff3aa97759a00594ef09b7825f0a0e99b9c406 SHA512 e74c1adc64ace9aea1568ddb6a6e50bac391e02cdf97986174b0240083d339fbebcc3266b5ce71454025f6b2af9326858c53947286916e63faa3ca9fad56e396
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
new file mode 100644
index 000000000000..75188556dd0e
--- /dev/null
+++ b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/777291
+
+From 893ab78144b95a52d73e1c125e56380fbec68a6f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 19 Mar 2021 11:01:03 -0700
+Subject: [PATCH] build: Remove bogus value from Makefile.am.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 984212a..cdaecbd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,7 @@ include_HEADERS += include/tpm2-totp.h
+ 
+ libtpm2_totp_la_SOURCES = src/libtpm2-totp.c
+ libtpm2_totp_la_LIBADD = $(AM_LDADD)
+-libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS) '(tpm2_totp)'
++libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS)
+ 
+ pkgconfig_DATA = dist/tpm2-totp.pc
+ 
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index fb1b2ed30d06..f98b49016b48 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
index b02901ba1dcd..67e6798a5655 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.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
@@ -32,6 +32,10 @@ BDEPEND="virtual/pkgconfig"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Remove-bogus-value-from-Makefile.am"
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -47,5 +51,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index f31212c9f9d0..8a8a8efc67d7 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
 EBUILD tpm2-tss-engine-1.1.0.ebuild 824 BLAKE2B 468c0e8f67cf86c2b7aec7466bcba1ef7180ac24c73f1716510a53f79f0f0aaffa5df7d80276ddf9a6784dae9661650c11bf858fb03734918bc0d618f785e428 SHA512 b4a7b735533ffe077aad28c0cae60f0e611fe5b58b8dbd0bd87195e19a76d8dde7506f115f29ff86e4b93a7e3de8cc5fe923eb65db0e11ab9a058a6ba9793193
-MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
+MISC metadata.xml 493 BLAKE2B aa698b011d1d42b7a68349b50f345ff2d71ee30271c80d506b69254adf2b62e4b81a3ad8a4b26aa9878d3d691927b837c77d69bb32ac6c6b7b4470388d2a36c2 SHA512 e3790629d744cfe6db020a1ab460ce73260b7ffc7bdf842ae77d9f58c1f7dcbafdb6cad198fef04de36afe96b8cdb12fc7e8bd8106f1c85223a40c7b308c096f
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
index 3625c1b74945..be009e371ba3 100644
--- a/app-crypt/tpm2-tss-engine/metadata.xml
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 6a6bbe1d8285..969dc9757026 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -8,4 +8,4 @@ DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a
 EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
 EBUILD tpm2-tss-2.4.5.ebuild 1792 BLAKE2B 070f12c2add6ca65276a2954a2e14c2f0d399256988a07d30cd37bfd96ddd6a390fed1baf372b7377e746dd6ed0f4595c76e1b725a807924d76cdb6439d6fe11 SHA512 a6aae008df0ec09b4ce09b27f6e5c98bad4697f26613d7b479e73bfc6f7cbc1a02661c7f8fc4428ad0b058d3c5a92a7790887e5934c23b604f9ed8fb52cd31c2
 EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
-MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
+MISC metadata.xml 822 BLAKE2B eae42cf7851ae2698b811dd0dff761f281b66bd340675264ce3fede19947bff56345744976ca08770699aa7edc8834286f75ebe1d0a512680736a78315217d87 SHA512 87460c43990ee8cfafe10b6ff001562fcd9acb5ff4a70d91880650d66badf80b66a7fe1c942c0470a69573023f655d36e72ff8938052aef6965777b65dec2415
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index eec8488de47c..c8c3be1edd56 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 9c42a58cb841..1d737376f522 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -12,4 +12,4 @@ DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d3
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
 EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
 EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
-MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
+MISC metadata.xml 537 BLAKE2B da490642bb36fa390a95ec6f20c248ed85fff1fb60df044c7ff7d7f98d33ffd59b616708cce2cf91e28d594a5da320db3b7c0aa34f5a99c7cb682596b7b01bcf SHA512 64fcfc9bfaaa6ba5c303c90211a26f20d8fcf613185c76b808ff06184ba66b753ead06046afc1cf98c08497b658d21d759beb2b523751e620f69f8647c6a7ee4
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index 643c6bf8c70a..43231480888e 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>	
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 45ed70a9d5c2..d57489d4b527 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,6 +1,4 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
-DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
 DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
-EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
 EBUILD veracrypt-1.24_p8.ebuild 2545 BLAKE2B 9bce35c540f25e5e010443fc849b99e409e47b57a572a1bf69c17ec24974cddcffa676f5b2f69c6c26d2ffda4109d3051a599738d9b1290eecf8b4dee0743527 SHA512 4f47cc599a13183c2d18a0927900f429c5a49a03e2227a32654880e7be22919d7795e480f9b2595220aa8410c804a5720fd3dd39d710ad5fb6cb5974d93c17ef
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
deleted file mode 100644
index 10a8cfcacd0a..000000000000
--- a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
-
-MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)"
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-WX_GTK_VER="3.0-gtk3"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )
-"
-
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-	linux-info_pkg_setup
-
-	setup-wxwidgets
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	"${S}/Main/veracrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-	local HTML_DOCS=( )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
-		HTML_DOCS+=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
-	fi
-
-	pax-mark -m "${D%/}/usr/bin/veracrypt"
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 81210a5ba1e5..d21a7686e5dc 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,3 +1,5 @@
-DIST yubikey-manager-3.1.1.tar.gz 116632 BLAKE2B 252c419280143fa6f44daf3de8ec27bbdc3218e4552e39799e1daca5b46939c4042ae1d43abeab110fe1abaf2e87d94c270442ee6fce05e26927add5b34e9f66 SHA512 8229d5442ddf89fe90abb0153aa005cb0d149a84634b994dc283f7cbac2f72d4b913c238c277c6aa07f431aed8905008aeb11e594e730be71c9ca88150a6ef68
-EBUILD yubikey-manager-3.1.1-r1.ebuild 1460 BLAKE2B 96288c87b479695b709e6db3c0cae37e4c6db7b22976b742ee432d54a288b17534103598e03eb5cb8e86f6bccad630f0dacb292a6514c07da4b0575e04975243 SHA512 94a4e4bcdbe60ba0575c420aad79a0a98ae8446d280b8c59efa6b3ff38677e6540b6ad6dc29c60c078e1692f9647033879bbe874b153bc2cd175d9b4ac706b7d
+DIST yubikey-manager-3.1.2.tar.gz 116728 BLAKE2B 35b592a26bbe1c2a1c81ddbc5fd5de2693b01dbadd04dd317baa14e5f9c5556ff8622bc36e31983947b4eed272be16d8ae1d55c6e30fe5532c20605c784411c5 SHA512 e7ad46536fae0476ae7ea4d7115ba9ddb0fe158fcd1e1d548524860b2033996f5487f9c948df85586d5b7ea690b51ad8d5b43261a56aa8820940226e0b18acaa
+DIST yubikey-manager-4.0.0.tar.gz 137438 BLAKE2B df50113ed46c531032785ceb95ee130a2440f88677b088f70095545528cbceff55db483bc299654beb8d78b3cea94a9c8507751a090a8488cc609680167ec8d7 SHA512 f1684122a9ee8d57fa3644ecf140e39973c822dfcb7cc1d6578a2ef9b09ff9b0078e6e4ab3f0eb6522a08703d095027f9f24bc8ca6fff8b6874f7a9b5e99f1b2
+EBUILD yubikey-manager-3.1.2.ebuild 1460 BLAKE2B 245167a792b93078529190fbfbd45bef1c80fc4d1fcf8ce0e6e72e9a2fef4c317708e5c1433dc6bf585e6821aa21511268e7e1191860b329961e1a8863c0a994 SHA512 19b3084bcf54261aaf1537ec8d13721aa5eb1701375c749428f1ff23cf6c586cd94faf9a45fdd6565c2fd8843af9858741c3a19ac3fb9abef67aca66ea178157
+EBUILD yubikey-manager-4.0.0.ebuild 1324 BLAKE2B f15e7265610bbff0ad64940db32e8455893c67382f81c1b5f1e918a279fb409cfbe9392314850383f5e353fbc29d7e6fe1514c0826775becb1e34749b3c25ca3 SHA512 b215021993fa42925c730c84a66e04b502cb2afd5a4c7a152f337e778c01dc2e1bb26f5071e4ff8ebf4c8acde5ac60ab4dba3b20136a9194b89d88f965ceab85
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
deleted file mode 100644
index 1d78a11c0b1e..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-auth/ykpers-1.19.0
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
new file mode 100644
index 000000000000..8995c052f7c9
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-auth/ykpers-1.19.0
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
new file mode 100644
index 000000000000..46d392c70cf0
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Tests require non-existing package makefun
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 6f5ca1ac163f..c57a1a02db12 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-af/Manifest b/app-dicts/aspell-af/Manifest
index 2eb2f579723d..1744af1e8708 100644
--- a/app-dicts/aspell-af/Manifest
+++ b/app-dicts/aspell-af/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-af-0.50-0.tar.bz2 256111 BLAKE2B d2f5cfb6d1e3f71319283d1487bb27765daead18a9b709cb9dd0b58b0f1579649cae3d1b59e4cb28c470b1924bf670e3c89f75a1abe7fa02fd4ad779750647f3 SHA512 8ca7b892745bebe5dfda1319141c5efc53fbad1444066d585cc2d6479c51c85c31307a6977a0647b0c4add4a5b7baa9adb370996e25db4e1c98f1c10991fd649
-EBUILD aspell-af-0.50.0.ebuild 267 BLAKE2B b00d783925c806dfb007af3bc6170b16e24d773a4b4d2e5850b899186398ba327a77b1db8763d571bd6baa28183cbe077e6054bf4de2f101eff96992c31203d9 SHA512 e652e515b3c5e83b6794633aacfc4e884081a079a06c5ceffcee0e13332f6aae5b30eb283a936f5c1ed3a885e7767bfb6837de8c028e920c13aa76d7bc4cb637
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-af-0.50.0.ebuild 268 BLAKE2B ae8096fd4a7960df9aec20eed60b2921d6d96c1e3f0ef25fd895560a1993f806cb386a18dd08812cac0adb4013258983f87b20de7c9b2e40de48a9eeec85cf00 SHA512 9318208a7ab484db21910d61944f1dd154443b0926f89bcf43684602348f23c4b8c5818271a1332a3e21fd0df7c45bb6ca756de7de545c16494cb37436012271
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
index 1f2709e56834..70c3e696f010 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Afrikaans"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-af/metadata.xml b/app-dicts/aspell-af/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-af/metadata.xml
+++ b/app-dicts/aspell-af/metadata.xml
@@ -1,6 +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/app-dicts/aspell-am/Manifest b/app-dicts/aspell-am/Manifest
new file mode 100644
index 000000000000..895510309d58
--- /dev/null
+++ b/app-dicts/aspell-am/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-am-0.03-1.tar.bz2 40493 BLAKE2B 3beffb58eb22243d67f7ffcf2a0f5a8b98b698bb22e192fbee18eb8e9c6bd692db1591d4d64bc8909df658731d3e0c56c2356ef41a7846ca2db0732b1da608c2 SHA512 a9b323266a8d3f72a5684a2d24465d99539069bf330d4c417f6b56f7fb5b5c3479cd18265c4bafa901c86c411eaec3de7798c08c54c565418b5ecccd2a91a6f0
+EBUILD aspell-am-0.03.1.ebuild 291 BLAKE2B 9f10d54fb8ec95d904257fae1396eefa67f1882cb6f8c49ca9a881fe61b061242dfbba86ee9f5f0d332be4dac585ddfe7a0aae44dbc902f4afa49687395c6b99 SHA512 4c86c461362427ab4125d92e01ce1dad10f899589a822f1761e62c684f76b464fb39a60551c27e0214dbd7d355ce1cd1a3456645962fa078330483c74539326c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-am/aspell-am-0.03.1.ebuild b/app-dicts/aspell-am/aspell-am-0.03.1.ebuild
new file mode 100644
index 000000000000..d9b910b5da7a
--- /dev/null
+++ b/app-dicts/aspell-am/aspell-am-0.03.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Amharic"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-am/metadata.xml b/app-dicts/aspell-am/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-am/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ar/Manifest b/app-dicts/aspell-ar/Manifest
new file mode 100644
index 000000000000..3fd1e1f17844
--- /dev/null
+++ b/app-dicts/aspell-ar/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-ar-1.2-0.tar.bz2 1541037 BLAKE2B cead4a31b3421891409bf69e8f1be1680b8815d2ced2ca2068d294373f035f84c59bd84d5758e99da1a89df143f351ff2d20af9a8629f73786f00fff269e8372 SHA512 7f645dab6e27da404d599f40da2baf469293105cbaf440bf9abf9268423b36e0faa11d1afcf5c32a8e1d93eadad356af6486a960c7bca97777948c844108f4bc
+EBUILD aspell-ar-1.2.0.ebuild 290 BLAKE2B 0fe376a81c0ff4cd369a3f1875b4887362c40e16e6749a671031125955abc20d2097f4521d32402dd22998380061634df3d1df3815aaff2597056b1356e11482 SHA512 ae4a4f7c13bac530b5838294a7af60a7912ecf0ff8bdf65450ccbe2e607e286d9d52318d871dfb700aa80a839ab08ec67e1a86507dadeb687df98e631b193dc1
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild b/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild
new file mode 100644
index 000000000000..c1f18baf5fa6
--- /dev/null
+++ b/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Arabic"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ar/metadata.xml b/app-dicts/aspell-ar/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ar/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ast/Manifest b/app-dicts/aspell-ast/Manifest
new file mode 100644
index 000000000000..55d1610ea7b4
--- /dev/null
+++ b/app-dicts/aspell-ast/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-ast-0.01.tar.bz2 123351 BLAKE2B ed4005db252c6f4f281d8b1f56b2f1a0da53b746dd148b2cf1567c0354e8351121145cfe1a06643ab7d3448cc72f81e4dd2c243a94f9f57d0161fd4cbab303ee SHA512 700a45c230218e57549cf4b2caaa9e86c4b8da68a3ed937fa391814816c1e0d16265d77658e209af66550e647f418663eb76952efed973e6b1f88570b90d77bc
+EBUILD aspell-ast-0.01.ebuild 445 BLAKE2B 0e47a0bb02d3031a48adbe6475f78d6a112165bf0a372dbca36cac5529e665a5f2a67c2021107ae82556462b8bfd64f44b81595780112ef78cb1e20e34646b8a SHA512 60191459ff6dee5341c0eab1c36e95983f18e196888ada97755835c88f11acb5d2ca43e8e7b285564aa8ae0a7320100bb12665cb87ce15208583c00f52947449
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ast/aspell-ast-0.01.ebuild b/app-dicts/aspell-ast/aspell-ast-0.01.ebuild
new file mode 100644
index 000000000000..3eda38078a01
--- /dev/null
+++ b/app-dicts/aspell-ast/aspell-ast-0.01.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Asturian"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ast/metadata.xml b/app-dicts/aspell-ast/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ast/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-az/Manifest b/app-dicts/aspell-az/Manifest
new file mode 100644
index 000000000000..58eae8d2e7ed
--- /dev/null
+++ b/app-dicts/aspell-az/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-az-0.02-0.tar.bz2 50588 BLAKE2B 1449ea859d796bd37b3c6fd399862015d2b6f225b08c00c671374170117d0ac3c2285ba7b25979b5c5578e5a640af98fd433b99214788b03a3d2e156ac6ded9d SHA512 69a0858addf72259898fc4fd3a22a572b97227915a08a632ea1d8645c2636c702ce09f66961afbfbb3473b9404a4fe73c9b02c2e694a641385e4bbd2c61c9b26
+EBUILD aspell-az-0.02.0.ebuild 295 BLAKE2B 4b7f0582c5df6ed6f14b23b88bdc730db09bb0db4fce282d79380c377e5aa06440f6d5f338751b17f260b2a246a4325d9004d72d48a832495b77182965e473af SHA512 6b9c6203dca8e67f4e7bafd0046ed0c044820fab830ae94204f5f62442617ac0aaf13ca5fb419054e312df8810c53a44e551754d51e94e5f989578315e7afa0d
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-az/aspell-az-0.02.0.ebuild b/app-dicts/aspell-az/aspell-az-0.02.0.ebuild
new file mode 100644
index 000000000000..a5b9a7720cdc
--- /dev/null
+++ b/app-dicts/aspell-az/aspell-az-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Azerbaijani"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-az/metadata.xml b/app-dicts/aspell-az/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-az/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-be/Manifest b/app-dicts/aspell-be/Manifest
index 1ac3976e1244..2452861a62c3 100644
--- a/app-dicts/aspell-be/Manifest
+++ b/app-dicts/aspell-be/Manifest
@@ -1,4 +1,4 @@
-AUX aspell5-be-0.01-official.patch 506 BLAKE2B 0172ae29930012aee31b25a227765dd01d7656a0c27b2dc62d306e5e4693682123ab081878fa8a78b87f4dcfa9355bfb62e6874a7ce111847e84c448ca7a9b66 SHA512 adf3b65dfae9de761d6971e2894abe3d97b30bc8185e2039128e501fa097dcbccb140e740cec2bfcde3d47b010f5bcc359f8b78ff31eed7d3da0b6edfc265c22
+AUX aspell5-be-0.01-official.patch 296 BLAKE2B f8d182a49512fd5d1331bed4e5eb57ff6f2fd6bda87daeef11dea1acd4cbde636014a754cb82c5920f159ed11b508a58a84779c3e2bb674fe4753f177ad716fc SHA512 d96f5250409589c1463f4c361024abc290f818476f291f1a044969d47c71798158275b5d8070cd134d3b2cd20a3509a1e15ef3d08a4074971d1af417be348970
 DIST aspell5-be-0.01.tar.bz2 653405 BLAKE2B 7a7acadf75a754fd389b1bda94c5a437ba04db01beaaeea8a2cb2a3eba276150f680983e8292d5b80f3d5134501bfefad8538d96d2a459eeb698f0cd5f2a77a0 SHA512 320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022
-EBUILD aspell-be-0.01-r1.ebuild 487 BLAKE2B f161f2e64ab176bc91255dd132c4cc6d20edf568b07453d419cfc5a22adb55b1f235df43b8234462c3461f9e8f49905af8aa96563bb8097c1e62d764b33f1422 SHA512 9305d3e5b9674ac15765c76288cd2966f836386bafaa3576222109a56855af2188d9ac6959b6a3e050a87ee537780ea116f062c868ca978f54868e3d5c47ae4a
-MISC metadata.xml 271 BLAKE2B 71faf2fd2663349e5f6be23a7971dd3dba635e63148815dbad91fc579ffd8a803c13a2aac2df03c15ec04c88432f0cb14fcaf9219c8676f0739408606a6c0377 SHA512 493dc73e9f10c495a9ddb9e75220e692d05376fe962d6b48483f7f03db7f432763eb3b86d241e095b5a57994dd41f50e1207e255a2b7a78aad5c611b4f01c3a2
+EBUILD aspell-be-0.01-r1.ebuild 554 BLAKE2B 3893413a643abbbf6b261eaceda03b6461a0847892b77b0b8b81128ee1839bcc8534192c15b8a5fb4cab1dab4c32abdc454be680bff45e33be38a8ec859d8346 SHA512 3abd746ee981561eb64aba5fb7e64c9fc794745f1e733ca8c352b0e46c308ed1ee5938e5c4bfbe41785b40d97ea77fff85bed396f3df372c0b0ba9eb557293e3
+MISC metadata.xml 355 BLAKE2B 01e4ecf6af03a39a1a5320febe9cd3358c87bff1d5aad7da1b68a41751b202eeebab306e9ae9e0b292b688a1c01781b71dcab070a53c1178d8c559da21039d89 SHA512 421766a27e956bf1e4cc4ddf8fdbf430653c942182fb4433fa3ed63fc0edb93f481d67a69fe8a28c6e4cb09317042b9d122120a3f78538392907394d4e736530
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
index f7393d3d18e9..e2f9bb303f25 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
@@ -4,16 +4,20 @@
 EAPI=7
 
 ASPELL_LANG="Belarusian"
+ASPELL_VERSION=5
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
 inherit aspell-dict-r1
 
-SRC_URI="mirror://gnu/aspell/dict/be/aspell5-be-${PV}.tar.bz2"
-S="${WORKDIR}/aspell5-be-${PV}"
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="classic"
 
 src_prepare() {
-	use classic || local PATCHES=( "${FILESDIR}"/aspell5-be-${PV}-official.patch )
+	! use classic && local PATCHES=( "${FILESDIR}"/aspell5-be-${PV}-official.patch )
+
 	default
 }
diff --git a/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch b/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch
index 8574baad88ca..00a18f19a658 100644
--- a/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch
+++ b/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch
@@ -1,11 +1,11 @@
---- aspell5-be-0.01.orig/be_BY.alias	2004-07-06 00:40:25.000000000 +0300
-+++ aspell5-be-0.01/be_BY.alias	2006-04-15 10:33:22.000000000 +0300
+--- a/be_BY.alias
++++ b/be_BY.alias
 @@ -1,2 +1,2 @@
  # Generated with Aspell Dicts "proc" script version 0.60.2
 -add be.multi
 +add be_SU.multi
---- aspell5-be-0.01.orig/belarusian.alias	2004-07-06 00:40:25.000000000 +0300
-+++ aspell5-be-0.01/belarusian.alias	2006-04-15 10:33:37.000000000 +0300
+--- a/belarusian.alias
++++ b/belarusian.alias
 @@ -1,2 +1,2 @@
  # Generated with Aspell Dicts "proc" script version 0.60.2
 -add be.multi
diff --git a/app-dicts/aspell-be/metadata.xml b/app-dicts/aspell-be/metadata.xml
index 3ba13ec2d9f0..da30f4ed358d 100644
--- a/app-dicts/aspell-be/metadata.xml
+++ b/app-dicts/aspell-be/metadata.xml
@@ -1,7 +1,10 @@
 <?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="classic">Support classic spelling by default</flag>
diff --git a/app-dicts/aspell-bg/Manifest b/app-dicts/aspell-bg/Manifest
index b6d49a82bb3e..8264ba6d74e3 100644
--- a/app-dicts/aspell-bg/Manifest
+++ b/app-dicts/aspell-bg/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-bg-4.1-0.tar.bz2 138940 BLAKE2B 5a694e3ffc89bb6f3254c269cb73730bf725a39661a1418f54ca85f845292b6fd7aec948df38bb4fe954946be65adfb162112cdf68b5808c017af75188bbfa54 SHA512 73ba292e9e78be21a9bd32d802a3f87b5b8200b64fcdc6e8bb47c834eb9dfd855a3397e8deb83e7879dc0dab7b118ae117832032fb9a450976c929bf12926881
-EBUILD aspell-bg-4.1.0.ebuild 284 BLAKE2B 131c4839f695c35375bd417ea17f26a64275eafb618f88e742bde713020991961ca2e7a2dafcb36500e97b47d4edaecd25f51088e117ca9ad6205080758832a0 SHA512 3ad840f3b8e8a7ca93657f367f2c6499896160e55c4dd0473978d4cf332a26355c9bef0db7a171aa026c4f3e4971e435e4e866909b2465fad9a47863bca0aa60
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-bg-4.1.0.ebuild 285 BLAKE2B 48c8557e22ce0fd2e9368ebdc2cdca916c509a296a21632b063d63dd6c2b6689c7c0d99ac8e185dca5e0fdbccc242e794d12f57ab37376c81aa92423159ef794 SHA512 09bff6ede11344977f68d3298eeb6f4beeeb3b20e7d2e7674e00e4a8691ae3fbc8c77087293a0ee4f7b4fc4534ad36426f817e7ddfd99d2a2f7493877506cd3f
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
index 966a26013e7a..c0b6874109b1 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Bulgarian"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-bg/metadata.xml b/app-dicts/aspell-bg/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-bg/metadata.xml
+++ b/app-dicts/aspell-bg/metadata.xml
@@ -1,6 +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/app-dicts/aspell-bn/Manifest b/app-dicts/aspell-bn/Manifest
new file mode 100644
index 000000000000..90bd59bd90ca
--- /dev/null
+++ b/app-dicts/aspell-bn/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-bn-0.01.1-1.tar.bz2 117436 BLAKE2B 700adb7e406fdf41142ac7c4d22deb0f69211a8cab50bdfca53c64f14ffa98f4e7e4dee104479dd2b5fb4e0324eea4efe790d0e8f7fd226dcb9e29c69e738547 SHA512 d8fe29b100284aa6b2e909811b9eb09bd5decea4c056f2ed6a24de9d5adb48714827a2e892fdf38274d1e1a44b2a93415fccf90b4c4d85512f3052c7f7939d22
+EBUILD aspell-bn-0.01.1.1.ebuild 291 BLAKE2B b7ea3e46fc03d9b41542a979986049f9670b2878da3ab72a46c34eb4b18bd13a13c81f8efcea6690629619c6526653c5be9c4193a097b0cb8da496204a794b0b SHA512 8a3d7f110529826fa25da2060914a1d5f3ae49d21443313144f2b3557bedaa283836dbc599f9de76af1f4f39b4693c1e09115a9ef2f00522e62010e2956c86de
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild b/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild
new file mode 100644
index 000000000000..fb6d3749536d
--- /dev/null
+++ b/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Bengali"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-bn/metadata.xml b/app-dicts/aspell-bn/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-bn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-br/Manifest b/app-dicts/aspell-br/Manifest
index 8288eb64750f..a1f1394cae8d 100644
--- a/app-dicts/aspell-br/Manifest
+++ b/app-dicts/aspell-br/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-br-0.50-2.tar.bz2 68055 BLAKE2B f301543386e81bb14a48c22f35897ae9cce296719a501ffab92b733766f5078b86dc1f70ea1eafe851e569e909b73d2c7ef473647f8a4be7bae35e75a9e7ff76 SHA512 02f2ce7a350adb87a0f32dd4748f067230a0f3faf195f8c7237bc0520cc0a7aa6475f96de933ae650611f8b9a41deaaeb57c2228ed95950a41e5defccba9e67c
-EBUILD aspell-br-0.50.2.ebuild 264 BLAKE2B 3173df9f1c39b163af13ae3865ed0adfea4bb6dd9df6a439639ce8dd720a039c6a6558d41a503147bfc48069fb27447287e87aa2a9998bf7eee1acf0a09cee2b SHA512 c380656065a79fb6b9e16b11407f8be0f1110272697f052f807ce5377b831b9962ce7ae67afc414dd26a3b07771987da910e636c4e9ca5b5ce448e8096d94221
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-br-0.50.2.ebuild 265 BLAKE2B 9e2559e1c8deb3540b8ae4b444e4f7efbc429197f0fb9e602acd5b229c8d382b561378d5de8966b6b6dcbf6ba02409f225f8c237d9d13e9d870f77e5c9b87917 SHA512 c3e03db83ae5448531fa01e783e6b514ca4dbe04c1c2c183847eb8b8ca1e00269f24848e9c49d94d5f0680c1bbb5a620d2f557f00933a1d21a6ce00342dedd0a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
index f7be1a3539e3..2421022b2ac4 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Breton"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-br/metadata.xml b/app-dicts/aspell-br/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-br/metadata.xml
+++ b/app-dicts/aspell-br/metadata.xml
@@ -1,6 +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/app-dicts/aspell-ca/Manifest b/app-dicts/aspell-ca/Manifest
index df29bd6522cf..bcb82e0e9882 100644
--- a/app-dicts/aspell-ca/Manifest
+++ b/app-dicts/aspell-ca/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-ca-2.1.5-1.tar.bz2 227561 BLAKE2B a7b26408eb583ca56967508f00d9c617e6e4bec364f6c807813d5f6485c549b9b62f02ea5464c32c3b3a84477d8fb6e768c11fda7d262b56ff0b24d57e19fde0 SHA512 9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a
-EBUILD aspell-ca-2.1.5.1.ebuild 282 BLAKE2B f32f32f5e484d70e4b3c0d661802afe2962f25f172738723ef41cecedad9f81d2b91dd5c1444d2acd21cfb298577f3ca3bc098358c7574fa9f6aaf9cf154544f SHA512 45de8175981d7488ad44547779a2bbe9b976cf4c0b7170a22a10f61753b35368987e469ed5ade556f1d20e0b5a23c75b3cc4a45f23b2a42e8f380a26d8858747
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+DIST aspell6-ca-2.5.0.tar.bz2 250769 BLAKE2B 9ce3d87090416e2af526ced665b535e30f692fec293082828cbb28ead92387c6d3e0b9e4193c94f623ddfdf29860310ffb4446c9d67518edce6b43aaf1b34bc3 SHA512 70eee12b026d6d0b5f710593f4d1759190596e7b7db651b804cc4d724d2c567911ef8d370873ac7ab4506f6555b8dde046f3277c3cd072e0d7b76047cdd5b1b2
+EBUILD aspell-ca-2.1.5.1.ebuild 283 BLAKE2B 9ceac8b3885cfeb6d340f38278f559be170d8f17cdfcf92e8611a8b685aa944ad90bc3c9ee490e28c6343ae0f1f57a1b3c7fd9259c5deb2081a38a9bc04666aa SHA512 e46c94f690e3df434d75441b90240af3fc46a697ffb6e69f9cd61b4a07cfee47d30247fd03d32b5f27e759bc90a1fbc93e1f38a6959d595ddb94f596eff873d8
+EBUILD aspell-ca-2.5.0.ebuild 538 BLAKE2B 75e7f7380358ffc18c76099d8f9a7065d6ff7f65ef86fbb9351e6ad77ec085705b2b0abc207f2eedcc8b53cef227e214fad2fba9ce2cd8ca41d29c784895a358 SHA512 630304d66ee5710ae3de6a4b21069e4b5afbd983ac0b661bfa7db757513c76024d26d352debea8e92dcd9c7002d642f727e9dccffb9eed51149ca135f27d3596
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
index 7f2fcb50e079..80181b38a753 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Catalan"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild b/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild
new file mode 100644
index 000000000000..365a529137f4
--- /dev/null
+++ b/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Catalan"
+ASPELL_VERSION=6
+MY_PN="${PN/aspell/aspell${ASPELL_VERSION}}"
+MY_P="${MY_PN}-${PV}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://www.softcatala.org/"
+SRC_URI="https://www.softcatala.org/pub/softcatala/aspell/${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DOCS=( "README" "doc/ChangeLog" )
diff --git a/app-dicts/aspell-ca/metadata.xml b/app-dicts/aspell-ca/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-ca/metadata.xml
+++ b/app-dicts/aspell-ca/metadata.xml
@@ -1,6 +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/app-dicts/aspell-cs/Manifest b/app-dicts/aspell-cs/Manifest
index 433e0482b43e..0f257ff23ff1 100644
--- a/app-dicts/aspell-cs/Manifest
+++ b/app-dicts/aspell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-cs-20040614-1.tar.bz2 451507 BLAKE2B 7a7c910fd52d15f9513e30db5ed6ed7116d92ce02c401d8f11222e64c1ca6aa332cab3152b3b27904bd59fb542e957517b52f2bae1878c17652a17f575d3e6bf SHA512 b4d3e46907a00c7de4d19766dc29f089ec119b736de1340ff5f56be9d0a1c8c90fa2b156173f312c13c589750ec7551e79bd7aa092d31fa6d5f05ed0b4b12c9a
-EBUILD aspell-cs-0.60.20040614.ebuild 387 BLAKE2B 72986843d103fdf861c9cadb3dc66ee372d544ed292654410dc07d9faae07f9610a735b7c768d8a06671ae4f3fe1f8cab58de18a25556bdb19fdd8f00331cce6 SHA512 aaa42050d874d1e2b332798a703eaae42f1440f529216eae1a87f3393fd70205dc2e69bfe030ff40fea0c285d68e45fa0d4d75d287455626f2b51e834d57dea2
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-cs-20040614.1.ebuild 281 BLAKE2B 68f3cd1d36d98dc8329cd15153fd07385bb0fcff4e2c8d2a48a5a0fe878388308ae7ca93d06d3b4e2def74b26e6e0700ec068f6a9e31938bff3aba6671c120c5 SHA512 be6b741e48fe1636ae9ccb5307589e928f4c29db2e55db713c419c804018029b3580560bf6bc9c407d1bf3cfa38efdd5785fd2dcbe21320008a983f39bacfd78
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
deleted file mode 100644
index ec7630524d10..000000000000
--- a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Czech"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell6-cs-20040614-1"
-SRC_URI="mirror://gnu/aspell/dict/cs/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild b/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
new file mode 100644
index 000000000000..40db143e5398
--- /dev/null
+++ b/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Czech"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-cs/metadata.xml b/app-dicts/aspell-cs/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-cs/metadata.xml
+++ b/app-dicts/aspell-cs/metadata.xml
@@ -1,6 +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/app-dicts/aspell-csb/Manifest b/app-dicts/aspell-csb/Manifest
new file mode 100644
index 000000000000..36762e0ae42e
--- /dev/null
+++ b/app-dicts/aspell-csb/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-csb-0.02-0.tar.bz2 32694 BLAKE2B f8828d5c194fdbaf20b426beeea6232dd4047d1299af5f588956e6de943512e0283a84c661cfa511a1c5bfb30981acc16405a85a92f0acf43088454789d98a4f SHA512 6ed05de10f1647ee98db588df0275721d25e1eea375f73ebf03cb02841f8eb9c0f7aa56f944e0f9b72884ccf99036445b5cddebfea00d77a8c714ed8a50d8eb1
+EBUILD aspell-csb-0.02.0.ebuild 293 BLAKE2B 44da60aa51ca0479a15bd036b829c07a20ee1e3bf3f3ab916a66b2fcc56fe4f2a150bc4849bede44779aea92e5c77a9df368ab4240e6aabf8bcb89673c634c08 SHA512 49bd532ad40949797f768196ab14bf92eb74205d26737056dca6d855eea6a01dcefdd54f3cfb18fce8d4d713c4eaab20629c3cbb1f071a39e0c3d6732f6472e9
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild b/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild
new file mode 100644
index 000000000000..12c92b211a02
--- /dev/null
+++ b/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Kashubian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-csb/metadata.xml b/app-dicts/aspell-csb/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-csb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-cy/Manifest b/app-dicts/aspell-cy/Manifest
index 4fedb6982c30..f2e41defd565 100644
--- a/app-dicts/aspell-cy/Manifest
+++ b/app-dicts/aspell-cy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-cy-0.50-3.tar.bz2 117652 BLAKE2B 68abfa88829f8574229bbe35626bc3c7df7789e063abe9c70c054212bbf159ae704f4a0204d63e362d49582c2300d0e2453d486c7bba039c8141f93232a38045 SHA512 feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b
-EBUILD aspell-cy-0.50.3.ebuild 263 BLAKE2B 29d0e3df5fdde84883dbaf728394f39abcd1837d24c0c2f20089e152c0edcb3e97a01ba6c7e9efc12af8532601b3abea8a6cdebbf687f0cef2e9834bc019dc5e SHA512 79523ba2c06d22717d5b070468ccb305d8395dc9e54844870e6c5de55566a8932d15538da0c95e0434585229f91e72fb1fade2a504339facf43e3a3477dc4c5e
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-cy-0.50.3.ebuild 264 BLAKE2B 9fa9a8e99c786a581aa19c76452ff2066c653dfa5b1a7313e82c711e80a5c16ddb2456593d2857f1ac03532e332e708c9f6562a17597ee06f1a29eb38008ef6f SHA512 aba320dd45541ae30712dacab7131efaed9ba4b74b447ded7d9b9d212678b6462a3c355436c013f455c8bb22228ccd9fdd7d178d7c556803f0d220c58f412c6c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
index 3fdf1bd8e174..1b48d74831e5 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Welsh"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-cy/metadata.xml b/app-dicts/aspell-cy/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-cy/metadata.xml
+++ b/app-dicts/aspell-cy/metadata.xml
@@ -1,6 +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/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index c070ff0d7b46..fdb15c92409c 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,3 +1,3 @@
 DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
-EBUILD aspell-da-1.7.42.ebuild 390 BLAKE2B 345fc0a7d0be42e47c1ac0e04f855a88c19b73304200489488dcff50c820353e56f925348b769e2b927c26e08e00c28d07ec7670070ff1928d29536df843b43f SHA512 4a2bb62d2c6a8c95671dff750197ef1553069c65b81688197d8dbfaca14ceb51596b9131b60da51587f01bcbaacea123e67cb4658190d73f1fcbad09efbd6ddc
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-da-1.7.42.ebuild 391 BLAKE2B b8d0c0acf0839ac517231065334ef9ca50fc55c9f825a9a09938dbefb0cac64efeb8c399e7f2605887d9545095c99cae5cf33c341759b44f836786c4ddbceb5a SHA512 c73dc144ef7f6a9d5bc17529a65f75a7a2cce33d8ea61fa15133c2ddd634a1daa4157e5d0737ddcfdfc1edbafbd0b9d385d754cfc2a4d21abf031f5114aa0f3e
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
index 7e898694ce65..d21d06d7d7c0 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Danish"
+
 inherit aspell-dict-r1
 
 HOMEPAGE="https://da.speling.org"
diff --git a/app-dicts/aspell-da/metadata.xml b/app-dicts/aspell-da/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-da/metadata.xml
+++ b/app-dicts/aspell-da/metadata.xml
@@ -1,6 +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/app-dicts/aspell-de-alt/Manifest b/app-dicts/aspell-de-alt/Manifest
index 45b8f51aacb0..c25aa69a6526 100644
--- a/app-dicts/aspell-de-alt/Manifest
+++ b/app-dicts/aspell-de-alt/Manifest
@@ -1,4 +1,4 @@
 AUX aspell-de-alt-2.1.1-dict-name.patch 1843 BLAKE2B c465d3ff766ea3749011a7ea0a502284e1ba31112cb21149edbf7a909cc4e45bced0ee165649117038a1072cd7d5165d89f9ed17237fbf1ea0b4942a0e54bd45 SHA512 2ad6133fd907cfacb1d33dad879c0b101869b9ec67f33d3689052c5f25a35244fb98e19ea6105f5c8f000ef3412fcc567f1a242decf7eee0ff29784d22d040a0
 DIST aspell6-de-alt-2.1-1.tar.bz2 247116 BLAKE2B 45428b341fd7d2cdf098d6d85956b8e41794ad7a725cd7f3c703bcdb9995c6c18f89e78f06ddc14b7c570b21eea4d72e944ba293b2272d8c5d5a2a5447427327 SHA512 823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4
-EBUILD aspell-de-alt-2.1.1-r1.ebuild 453 BLAKE2B 92c79144230e6b9e69f335bc7b043f4e7471c1f54d26f4ba752870843e1e2f5d9e8b74b961c1590cbe147ef2faa950181d4a618403971fa20085c8d39c341884 SHA512 4d2123a4ab4bc1e0d3f634519dd4539aab27b9e3fb8f63f54f18d491ad527bc87f3514fd4cffb2252b3c8ba64c2b58bb31f3d7ef45e5154c9be7c2fd522022bc
-MISC metadata.xml 238 BLAKE2B 48d0aa531d9781d3bee03ad59363d97f2ad88778cf7e6f62d609daba3b9d253cd86be469e7ae11d7dd3f476792e5ebdf27937acfb09dfc75411d041a6627b80a SHA512 0cb70ce9420fc910aaeaa41a6c6307f2b79f90dcf75fa167c4362a8cd708c156b2575ee219a5fb6fc8f1e25b5f64acc3a242724ddd1035d98be5f13d3a578ea3
+EBUILD aspell-de-alt-2.1.1-r1.ebuild 454 BLAKE2B 9a71c1159411ab6c5d858ecc48c735ffaf08fbaad2f5c81dc07cd5d4a3cb6b551ecd38cf72339272331e85b744696f37f042c449b17e6eab627d2ba0c27a179a SHA512 4d70ba2bfb6398a7a943c6cd9bc6abe937276bf79ba2689dc7639e3c452431aede928bbc88064ec39a1ac707c6ee9016fa04a3a8418eb7a76cb6718cef20dd7f
+MISC metadata.xml 349 BLAKE2B e03d578be52a6bf2fc8d31bb8e7af6769c2f57b25df87b82af3ef354bba4768ec04e45062e79d96bbe1aaf63bbdf41c22bfccaf221db05e3150a9ff5b7e01e27 SHA512 c93edfd5e8c1b141ab3aee8fad1257b097c6c38687d0f36a8414714f9f46f2da9ea5da35ac57c4e6ea1772959d52d06fa75878f2045f66f3d1718aac179d9c50
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
index f5877187ef6e..c2057bcef390 100644
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="German (traditional orthography)"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-de-alt/metadata.xml b/app-dicts/aspell-de-alt/metadata.xml
index 0644d84f0604..ec6a205a5844 100644
--- a/app-dicts/aspell-de-alt/metadata.xml
+++ b/app-dicts/aspell-de-alt/metadata.xml
@@ -4,5 +4,9 @@
 	<maintainer type="person">
 		<email>ulm@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/aspell-de/Manifest b/app-dicts/aspell-de/Manifest
index f6721a329c34..ff200e227827 100644
--- a/app-dicts/aspell-de/Manifest
+++ b/app-dicts/aspell-de/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-de-20030222-1.tar.bz2 274407 BLAKE2B ed69c0a3c1e63599d99a811b7b2d54c5dc4699f776d4c97fb5d295250df64e6189378c2bdadf8ce1b38a5a49046020b220e528ae69f20be01af5f771dba3bc37 SHA512 2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6
+DIST aspell6-de-20161207-7-0.tar.bz2 294974 BLAKE2B c468eb843d0585ca196fa983ffebf933eb3386c942e7a8f0798980409aa2635f2ca9f890db0f3da281d7f126369afc9d27ac972d058bbe0dc7c3e7df5d5518ce SHA512 ec29fa49d4e0303d6ceb78da3884ac54ddf34205895f30a95bce0db66f74472b423980200acf01efb1fa40380d6ea6351a58656400af35772266f8a54b1bbec8
 EBUILD aspell-de-0.60_pre20030222.ebuild 449 BLAKE2B faac32d0c27bf4dd1f6bbbeff93671eb9ddca801313b1af4a81a5b35d4a3a860023145bddbf5deeaa072ca253999d3624c025c0016b070c760973542079f62d2 SHA512 4d30fe127961a30f360576eb7223cdec1723969b15b44f6aea2fb3ab7e8303c0d2821ffcd7259f64f2a9b39d96d076ce75b176e9d75f6d3ab77a905cac876d23
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-de-20161207.7.0.ebuild 470 BLAKE2B 5225401c73d8ef5f7a033bd2ea2d68181d96643da5e5008a2cae2cff71d99c1ceb5c87891d2a0929a987cc6723bb0042ca80ed2283fba766bc5ad394852cb624 SHA512 32ae7584a1f88661d232650f1cc8fbaa173204d19bf3980bd80d46f12b33ad31b995eb30156f291e3106b5db44aba3197589e438efd3a4a6f665b4640f118e5c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild b/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild
new file mode 100644
index 000000000000..2b698c7a0c57
--- /dev/null
+++ b/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="German, Austria-German and Swiss-German"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV//./-}"
+
+inherit aspell-dict-r1
+
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-de/metadata.xml b/app-dicts/aspell-de/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-de/metadata.xml
+++ b/app-dicts/aspell-de/metadata.xml
@@ -1,6 +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/app-dicts/aspell-el/Manifest b/app-dicts/aspell-el/Manifest
index 9419b558d7fd..11cec86d2fe0 100644
--- a/app-dicts/aspell-el/Manifest
+++ b/app-dicts/aspell-el/Manifest
@@ -1,3 +1,5 @@
 DIST aspell-el-0.50-3.tar.bz2 328225 BLAKE2B c032ad4c549cd2ff4d3dbc2cd142f6405d339bccb4040034ca225203666da8eb7c9b153a9ee58472dba6c3de5dd9e10dc338c4e46fa27e7cae3225ea8bc0b79c SHA512 405a21dc3e6ad04ea7a6b3ff69fb77382cc8f20b95e9c1788ec77a38ad1d4eafabc3a5e996a68cd5a2a385927244a2cf81cc5dcc68a1c7d42fc31a95d9068cfc
+DIST aspell6-el-0.08-0.tar.bz2 358493 BLAKE2B 3f69d8d9d2010c95a4fa881b3ae751492f30a08fc9a7d273e47d37d3b0054b47ab26605d31b880a598e8b93423750bf50fdf814542dc38457cae7e166bdf4a9c SHA512 ea4ca962afc552e5525bbb84c7a8f980a2cc07265de748c68fb322c1dbfc52b0ba07b4a561966bb89e850ec60b11a3f21befa6ca8b66501e9ad8b5314ddd1f47
+EBUILD aspell-el-0.08.0.ebuild 289 BLAKE2B 3fec719ee259ebee4b28ba41aa41460beda3f1407e7418c367dad9c07685b2f53992c1ad6156f9aca691c8798bdfb1e64403223a18dd0dc0195e1bd45b42148b SHA512 05c361dd9631a7de0ae91ad6339d345d612d224a02cce10078131dfe4dee42120455f7bd3bc10623f2894f4c011a91d93d115bf23ef4d271ec802728678545c4
 EBUILD aspell-el-0.50.3.ebuild 263 BLAKE2B 273658c58bcc0c7bc21ff0b2120557d471a0fe8f4e97d14c4448b55bea8115a86271c283ca6b03493846a8d96bfd31a23cd1c9423ef14c45e3660d999adbe3c1 SHA512 d8feb801d9328f1a378a2ae08eded168b34133047cafdad8cf596275c8f82df2671db94b28a09c3e6a45a7e16c2ae3f2c108c9ee3b19938b60a5b462d8bb6797
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-el/aspell-el-0.08.0.ebuild b/app-dicts/aspell-el/aspell-el-0.08.0.ebuild
new file mode 100644
index 000000000000..69605bfa0185
--- /dev/null
+++ b/app-dicts/aspell-el/aspell-el-0.08.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Greek"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-el/metadata.xml b/app-dicts/aspell-el/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-el/metadata.xml
+++ b/app-dicts/aspell-el/metadata.xml
@@ -1,6 +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/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
index ed411d2f8ddf..2c8614d71a47 100644
--- a/app-dicts/aspell-en/Manifest
+++ b/app-dicts/aspell-en/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-en-2018.04.16-0.tar.bz2 185332 BLAKE2B 98b3d39463a26473450778d3f3763eb11739deb1d5d28db5f7bc0ef4dbfa977435fc0721d26a39ce2bfed9564985a62fd199ec2ba59154a327b6429109966d6e SHA512 70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2
+DIST aspell6-en-2020.12.07-0.tar.bz2 188972 BLAKE2B 2e200dd1d6d4277a73fa73207119546638d548e40936b5d4744b0d0955b87862257a026e382d344cd4b396099b503367815adc697788362529d9170c3cca6e8b SHA512 9ed4e64891242e5e5e7d6ac82a0d1fda3bdc5116bd9d926e787b8f381080b357915f0c9b39cae04c1da0f2ec6e47ffe30a584f7f3bf7d455a46e8518a7858547
 EBUILD aspell-en-2018.04.16.0.ebuild 547 BLAKE2B 4554f9dd3b5364c39e782eb3494d4aef259a876d0d738e1cb76d00daa6c5693274751562f0ec2022060a8dffa1386616f6b8259dfe6f90b551efd5c3fee2de54 SHA512 982e40317f0e6a9a7dd1324ca7ac51c4000355967859344c95673161b216fc6d947d4f483c656e7c0ec74b07ba2cd2a5bbe5730c77180e1739e1d66b83ad6d1e
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-en-2020.12.07.0.ebuild 368 BLAKE2B 7f82828bbcaca19d7ac45902f8e9e802f9d61d9c8ae316ab4c71111b3267e0743f1f5120d8752626243163122c6aeff39e878d3afd7aab1432b860f06d7dc12e SHA512 a1594a45b70573217084f06112de4186087683a438d062de4bbf3ba0516c7700c3ca518a5b6d7675117cfd0b611f483aa9b38b5a55e673ad589207fe55213f7c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild b/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild
new file mode 100644
index 000000000000..2b2711cd3268
--- /dev/null
+++ b/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="English (British, Canadian, US)"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="Ispell myspell-en_CA-KevinAtkinson Princeton public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-en/metadata.xml b/app-dicts/aspell-en/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-en/metadata.xml
+++ b/app-dicts/aspell-en/metadata.xml
@@ -1,6 +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/app-dicts/aspell-eo/Manifest b/app-dicts/aspell-eo/Manifest
index 60b2ec037edb..8570ca80a5a8 100644
--- a/app-dicts/aspell-eo/Manifest
+++ b/app-dicts/aspell-eo/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-eo-2.1.20000225a-2.tar.bz2 71591 BLAKE2B 3e8624857ae9c7a1256849dfe65a2b5a9de396516973b3e00075d5bdc507598b414ad745df41e2f8b746aeb43d0296186dd1b8163af84a0bb709ac5a2847cab9 SHA512 172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda
-EBUILD aspell-eo-2.1.20000225.2.ebuild 448 BLAKE2B 4d517ac3c018d54f4b063b9d6477b23d7c0b201379fca69452bf8de644d9868d68c415877a99fcc52866e67ba4df05ddfaf5b2925ae74650228eb5e48d2aa64b SHA512 f349e815b38d9208f18958bde23c399867ce3b0e56f60ac0588506a81823f456005868d34be76224b7fa77f1b90957791bb5cbfd933edbb7cbd2f22e5e9ef3bf
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-eo-2.1.20000225.2.ebuild 467 BLAKE2B ee5285d53aeaf58cc4d649170d154020ac98618f4517013df603ecc81118d61bb1a6fb1bcbc1dddbb3575e4593b611341f989cf7f2605c445dfbc326c9b0cb06 SHA512 c878ab8e6bac555bb14c531c5fae8165fd45f6c714fa3dc50fe679e535f6b8518ec13cc83504fe8b30f373134d24a8478e87705a83e520257d15fb6af7e34072
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
index a5c0f7b57583..cd8a38ad1903 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 ASPELL_LANG="Esperanto"
 ASPELL_VERSION=6
+MY_PV="$(ver_cut 1-3)a-$(ver_cut 4)"
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+
 inherit aspell-dict-r1
 
-MY_P=${P%.*}a-${PV##*.}
-MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-eo/metadata.xml b/app-dicts/aspell-eo/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-eo/metadata.xml
+++ b/app-dicts/aspell-eo/metadata.xml
@@ -1,6 +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/app-dicts/aspell-es/Manifest b/app-dicts/aspell-es/Manifest
index bbb80e649a47..d89acc194442 100644
--- a/app-dicts/aspell-es/Manifest
+++ b/app-dicts/aspell-es/Manifest
@@ -1,5 +1,5 @@
 DIST aspell6-es-1.11-2.tar.bz2 154787 BLAKE2B cc035b4f9c6b12c90b7112ad414ee3f28c00554179e9e88d79ceb06e14edbb891a3d2f7d2b3a70945651ceccecc4250e8e1f187cb75e1f6bdbe653e278a54140 SHA512 5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8
 DIST aspell6-es-1.9a-1.tar.bz2 132542 BLAKE2B df33c5c38633573b1616c480c2df4b53bd1b6afc6d749f558c22d56482df9977cc5aa366a0e9a7b5b1bdfc12b92bf4e38957e23b3bf8dca38b0dfe00824ff365 SHA512 7ea228104231a4af395787da41eb14f27b6b864f1512c9ccb72b5f19b4327a0e4ccc37fdc31085b33da83a0b3b45bfe608f0a1361da8297dff2bcd96096f4c06
-EBUILD aspell-es-1.11_p2.ebuild 410 BLAKE2B b82b9f33e9e06ff7e61a5a4d948a12fbb08fb591cf367d447964550bf1f1d594482fe390cb9b2aac8e23f1ea8e37a9c1bfe53f323579c458a69382d0be6805e2 SHA512 62fbded7c106b7e829c7877e99cbf7d351e265fd76c20ba66209fc6fb485509e785064cc255cbbd64afba9e6d34dad967a67e983b757c80b6701db76b2338456
+EBUILD aspell-es-1.11.2.ebuild 290 BLAKE2B 9434385c80096f4df341296116302099b89f6ec2613b8f62d7f9af2b95b72f513dfdb1d05a6269ac1fc85f5c88767ee09245f0f98cdcb8ebd94d684d60d701b5 SHA512 4e1ef96beea7e46ef369a7effd00c9366f2dfa0f11303567f3cb757e1b940cc5e6ebcf8e7ffad1f0c0c9c44ad24e2aa425d2a07360d6beeda82a6716564743e3
 EBUILD aspell-es-1.9a.ebuild 399 BLAKE2B 72315d119578c413696fec786bd0f7d92cdad6a8834acc172d4ec755ef00e8d4dcf2c160666c86060222a3a041aa0dec75632b4918c3b76e0006bbf73e76670a SHA512 0be93a8dd106ca88f2e7156062a16778ecf3bb5540565ecf5de696a505a157c129976d14e3136d0d5ce833eb75a624dbe2174c69a05c60f62b29a12beb688eb2
-MISC metadata.xml 407 BLAKE2B a8003458aa23c8a7b33e9863b54a336c271748657d92cf26875f59972e4782712450d2a9fd9725fc0ca7fbf84af1410e87c14120a9070c8e1a70e65e7017be5b SHA512 6d423181e1cba3e938789ddde44f96ed38d88185748f5e957afa4187edd4ead68e1724f900c69ca800bfb66680d19261b227240f1fb1b27c8c7527fa1dbdfaf0
+MISC metadata.xml 548 BLAKE2B b25f6bd31b64a439aba5cc1067807216caa05dc605e2ee9207011ad88a2a3a8dc62792d1f0b3407270704410fdf127e9d489b93c0295270b0ca2a0be7b6abad9 SHA512 77d789234141a9cd3a5cff520fad4e2621515f601c5e654ab16a3f200a42fde41427ad1ba3541cdc7ead9b55850d0a351cbbba700fe445167f251dd216a652f7
diff --git a/app-dicts/aspell-es/aspell-es-1.11.2.ebuild b/app-dicts/aspell-es/aspell-es-1.11.2.ebuild
new file mode 100644
index 000000000000..261c26f57ea2
--- /dev/null
+++ b/app-dicts/aspell-es/aspell-es-1.11.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Spanish"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
deleted file mode 100644
index 690b92b064e1..000000000000
--- a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Spanish"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P=aspell6-es-${PV/_p/-}
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-es/metadata.xml b/app-dicts/aspell-es/metadata.xml
index e62639767853..a489f7a15418 100644
--- a/app-dicts/aspell-es/metadata.xml
+++ b/app-dicts/aspell-es/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/aspell-et/Manifest b/app-dicts/aspell-et/Manifest
index 75f152166264..30caf1f4cc00 100644
--- a/app-dicts/aspell-et/Manifest
+++ b/app-dicts/aspell-et/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-et-0.1.21-1.tar.bz2 338155 BLAKE2B fb6c1ebe5d63d88d85935675c6f78ae8dc55cc4e0dda2f18370813049042fdd356343b8d98faebe788732c1ae199b851afcfea30e8734e3167bb00579ec08551 SHA512 b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae
-EBUILD aspell-et-0.1.21.1.ebuild 283 BLAKE2B 30227dd3998ab57a70ecde89fcd474501220f0b90e28b51b23625dc9333cf31100f229324890cef49f601600b2ae65f990e38a8bb1f33e29d12f254664d0df58 SHA512 780296cae3d910a6a0421b239335ddec0873b7530a67708fd953b6aa3d79d08b49b62bc308212c496288731f126a14ea2895dec61f436644d250fe3139ad9817
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-et-0.1.21.1.ebuild 284 BLAKE2B f0551cc975347ef7d8c71a52249ffa9efb4f305bc0481317b009bd6bcbeb278389daa36c7d82d27356d6bd99e3a865fd9e351910c3b8f8ac2e5302bac2f2cb89 SHA512 5eddc7bb18b59a71de62d381ef05cbb1350ab989414f2494c913de1f09d3fe662f7fae2f0c05012f70036000b5c0768b9675eb79dd2018afcf3122fc7de6c220
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
index e1d3854b0225..220265133e27 100644
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Estonian"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-et/metadata.xml b/app-dicts/aspell-et/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-et/metadata.xml
+++ b/app-dicts/aspell-et/metadata.xml
@@ -1,6 +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/app-dicts/aspell-fa/Manifest b/app-dicts/aspell-fa/Manifest
new file mode 100644
index 000000000000..e8ea9f6dd808
--- /dev/null
+++ b/app-dicts/aspell-fa/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-fa-0.11-0.tar.bz2 137889 BLAKE2B 24021b04c3576ce29c614d8fe218c61fd61d8d3e3a5ec8b07a562835760af13c467c72f010088e75a08d89178e1c2ca67b84773b91c09eee05c882214755e31b SHA512 1ed97d3bf8397fe9b3c9215ca3ca6630a06ae5fa1c47b2bbdf9821fbe069b9c097d1e145a6303202cec85047f9cd50bef2bde3adbca0caeb05625932c5f3bfe4
+EBUILD aspell-fa-0.11.0.ebuild 291 BLAKE2B 3a8e124b5e6b955a44c63be467a471a04cb2d4b57f14ed67214407d4ca509fe9867f4acbb2c4a30e9bd549e57a8e7c72e8f69ddd069c41e82f6db7bb521bfb8c SHA512 5e125c1292c63f0df4887010a224f7cda19d5d76a3b842b7aec77d373edb8f81db38bbbaf4dfcb7fbc789c285f8b27d68d610c16197ae0a3f8f463a5ec96d862
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild b/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild
new file mode 100644
index 000000000000..362826042930
--- /dev/null
+++ b/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Persian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-fa/metadata.xml b/app-dicts/aspell-fa/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-fa/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-fi/Manifest b/app-dicts/aspell-fi/Manifest
index 2ad53ddd0c62..393e0c8aad5e 100644
--- a/app-dicts/aspell-fi/Manifest
+++ b/app-dicts/aspell-fi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-fi-0.7-0.tar.bz2 209249 BLAKE2B 89b5e385f618a1aabbe0b3e688bd21cad1d15ff9945f61048d72a8d59dbe7551c6314de16dc34249370432459483b7badeae606dc48380d345aa977136c0a4ab SHA512 d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7
-EBUILD aspell-fi-0.7.0.ebuild 282 BLAKE2B 0ce6c94c18f4fd9da63e2cc40a8e0c295ac620752972f2bde6b85b6938bb88bd85459e13bb6fd6175f819785721f9d04279ae523460d25bf8376b6270b416cc6 SHA512 f7eb42631c94cfd569fc60dd7aa4369ab56b5e3e0295063bbcd332198c33fa37077d711e11e41761d068c9b185b8172df7d4511b522f76c16d688895eb94f18d
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-fi-0.7.0.ebuild 283 BLAKE2B 7b84adfd98ed7f979f9a497c06a6b8780cea7758d5be6ae638c16eb0543565ed4c7a41d6654d08cbfc39816cda59efa43b1e36b29bf54ec243a960c5900cb5d9 SHA512 24f16e046fa153a7b6e417ef617338a22f6cc8626635a1c95eac4dc5cf19911cfc65a4ab62d638cf5002333c766aa1605ceeccb600255f85d33a3583cb82a47c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
index 018faa33c338..31905e6505ed 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Finnish"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-fi/metadata.xml b/app-dicts/aspell-fi/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-fi/metadata.xml
+++ b/app-dicts/aspell-fi/metadata.xml
@@ -1,6 +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/app-dicts/aspell-fo/Manifest b/app-dicts/aspell-fo/Manifest
index 1a2b14687e20..0d831b6fab91 100644
--- a/app-dicts/aspell-fo/Manifest
+++ b/app-dicts/aspell-fo/Manifest
@@ -1,3 +1,5 @@
 DIST aspell-fo-0.51-0.tar.bz2 161169 BLAKE2B 2d607954fdd15c07c425b6d53bd10e0226193f45fcadf56b4eba1cea81bfb569519e71295a54058164eb8762fb5e9db8846410a01b009278393e78ee94081fe7 SHA512 8177e302816f0ddf05653656d07489be02dd5d12eb178f5e627034030f38e9b612f41a49fe4a1c092bfc3d6edc4dfcb0ec8326005251a3b36f80e1ca234d4c28
+DIST aspell5-fo-0.2.16-1.tar.bz2 165901 BLAKE2B 5eb060d48880c9d5a40e202aea990d579df171f0c39c1f4895cc1088666cbc64748c8fc0b0c8f476ee5ab038c85775dc199f04033e32f7d8927d697a0487aa6f SHA512 7e99f105cff0e682e2761ba1f91646a3ce657858be819cc598775303d6c08f2c5bd524f72bc0c0b52383aeaf591af56e910e19796732be627d8ab11ad6149126
+EBUILD aspell-fo-0.2.16.1.ebuild 291 BLAKE2B 73ddc3d20141eb9b46c8445ebc2068354b0997e9b995b72bb3de71591190b8ce8eb92f646e4e1e7aa388f55bd555100b353516d4485a3e99b6e6ce1c5b512fff SHA512 ad4899af8f903a9fb0e2a3070a6c84243fc351012d5a4c579ee36aa1dfac1baad9557252bd069a8b487f0be8836384c78132991a573d7193e7d0105a4a812060
 EBUILD aspell-fo-0.51.0.ebuild 265 BLAKE2B 7e1bcc27220954e0f5c3ca06008116d36ccb59f1e34412530c3667c0f010b0fc031709fdd06d80317f46a590cc523d09b7d44e84e43edd3e24ecba414ca4edb8 SHA512 f7e2646c8c17a4d1bff68612dc0a67923d485f38a25193745b52e2742db6587f499df48dc25a1926c6547b5d9909cedaedcba3b9b3be2db5210971f333bd88b1
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild b/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild
new file mode 100644
index 000000000000..43fc59e21eca
--- /dev/null
+++ b/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Faroese"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-fo/metadata.xml b/app-dicts/aspell-fo/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-fo/metadata.xml
+++ b/app-dicts/aspell-fo/metadata.xml
@@ -1,6 +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/app-dicts/aspell-fr/Manifest b/app-dicts/aspell-fr/Manifest
index c2de199001e9..97072e6a07d5 100644
--- a/app-dicts/aspell-fr/Manifest
+++ b/app-dicts/aspell-fr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-fr-0.50-3.tar.bz2 283086 BLAKE2B 674199a56d676ab65c414741e669b099a0f08f2010f3981caf30daff6726e516586aa771190eebf83570093c28a8732761a9166f587a933860a037f1dd561e0e SHA512 bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b
-EBUILD aspell-fr-0.60.ebuild 549 BLAKE2B 2ba7c9a6759e0db50ef962fb8cc44b18efd9f5980a261ed43eafa0e71733933dafdc8fde3d5c9f9351619354c07ede1d78fb275aeccf2d4a3372f731c9bde048 SHA512 ce21a50da05f1cf6dcd7a4ee2751122f0050be69176ded9be4ecf60495056038dfbc23ccb39f9ddc42f550d9c310c3e6b595c3909c4e919095f1bd42d8850f5f
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-fr-0.50.3.ebuild 276 BLAKE2B 3ab98af3219b0a5029ad3823dc328fdb9b8f418e96f02c3a5e5a56b2c1d61cdfc0a2464614e5c09a348c8856b6fe31b2d19167d168587fecba50ad22c2f0bc12 SHA512 c6be5482513b6426e085aa50fe0145991e4f36be69b257da366c9bf03c18efccbd78b8f7ae2703ad27f193efddc9926698740c1fdba91c1131fa7e75f595987c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild b/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
new file mode 100644
index 000000000000..6ef034221673
--- /dev/null
+++ b/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="French"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
deleted file mode 100644
index 3706a0054793..000000000000
--- a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is a hack to allow for using the French 0.50 dictionary until I have
-# the time to do this properly. Do not stabilise this. (2021-03-12: yeah right)
-
-ASPELL_LANG="French"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell-fr-0.50-3"
-SRC_URI="mirror://gnu/aspell/dict/fr/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-fr/metadata.xml b/app-dicts/aspell-fr/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-fr/metadata.xml
+++ b/app-dicts/aspell-fr/metadata.xml
@@ -1,6 +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/app-dicts/aspell-fy/Manifest b/app-dicts/aspell-fy/Manifest
new file mode 100644
index 000000000000..ad6cecf46606
--- /dev/null
+++ b/app-dicts/aspell-fy/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-fy-0.12-0.tar.bz2 90786 BLAKE2B 55066761a6a27345d2442132a101d2d4b249c2ed43728c32589459ed7af32f31d99f73c9570651a320cedf926a5b9b0d8ce7443fda5847e19854d7d53db2eb9d SHA512 f63b5436c78a5c0ebec3be1d3c24dced09a264c68e8ad39716e0e9e6bd984aca627bdc875f88b521f87b7f4d147edfce3fc0f4dc4b22fc8ef8d1aa5090fb9bda
+EBUILD aspell-fy-0.12.0.ebuild 297 BLAKE2B 1032a1c23abcca0f35973a8abea2da45aa7b8107b78ec074d8b6750b7429edda8d28bb274d6526db957416b4d51aa7334c85d7ba8bbd3add3b50343f6c72f6a6 SHA512 fcd5b552f2539981742efb873820d612453734c7334af121319ae8ead8fafa5dd5582f6410f11b2101d919fc1d7346aae4ed6c7bea8a8c9cb4c295257ca0f93d
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild b/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild
new file mode 100644
index 000000000000..4419f9e808fd
--- /dev/null
+++ b/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Frisian Frysk"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-fy/metadata.xml b/app-dicts/aspell-fy/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-fy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ga/Manifest b/app-dicts/aspell-ga/Manifest
index 9b9aa30eaeb0..c3675da4abbd 100644
--- a/app-dicts/aspell-ga/Manifest
+++ b/app-dicts/aspell-ga/Manifest
@@ -1,3 +1,5 @@
 DIST aspell-ga-0.50-4.tar.bz2 394776 BLAKE2B d065dff80c1405d48e39d22e7f8ca789a264763b1caa978a1dfa568b7d5d4c2382bbf5e1cf3626905a9c1bda37bb9389868fc944027eaad4e47b31a452668fef SHA512 631d4e8a6088633be3863e04818b576af861bfbdb90b1641f792c74ca1f61a7d71b1167ae5585245767d628a44e215c2804dd4c2b050c279ee892810203fae0a
+DIST aspell5-ga-5.1-0.tar.bz2 1461825 BLAKE2B e1591c20da9abea4da5b7388c5d9d9f2c0ff2c2cf8b96d4b3e83010b71bcf538126712c8ec249d53398929cef69fe52c5b73745888a176233201fe56b9a96575 SHA512 e13c66829b8d578c577539b9adea459ca85bca5fa535ca130aa76011cad0deb0e8bbf1d5a09c7c0317c9d419898755807b7a5af166c1ee52a34906825070214b
 EBUILD aspell-ga-0.50.4.ebuild 263 BLAKE2B 41ef80a06bc855a6914f29de0ec08018ad370b59582b7b12c0c6a1443421aabfc0e13a3658f4beac9d3ac2dc368c21e03d83bed765de2a88293ac8260eeda491 SHA512 84728c2715b6518feefe68237454328ca0feec54130ec9e5d7ade14122e0d50bd79277e35bd2a25d831c4eefc6c9a145f420280283d35c837097f05ac6307a42
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-ga-5.1.0.ebuild 526 BLAKE2B aa3b12c64d560fd7f150f00af127640ed0ebae90ab03ab852893f96949f44959acec275ebfe192b252920ee972a9195591c683b90b3ae2fba99505c4c61b3bdb SHA512 3961930f6baed9111a373a61af13a8bfdb55b87dff2e83906d9f73e0fc3d666d373afc4ca96bf4aa3c56e758242f6be49024ad934b7fbb31c52bcb33a549d34b
+MISC metadata.xml 356 BLAKE2B 39d2123106c275f3355777d84e111725bc26d2ba9da552facebfb6bb7c8ef554e9d30722400ef1fab6ac784c00fc89d42cc84394d04e6e81198c7aed8d0aeca3 SHA512 6ba8e9e1e3c4c39ae83622b257628364e65d0953cdb3520babec9484555303e595c4eabbabcb627d5ff3eac0a9b8badd990e964f4b026fd8a171385e30020d6d
diff --git a/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild b/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild
new file mode 100644
index 000000000000..59e4406a8439
--- /dev/null
+++ b/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Irish"
+ASPELL_VERSION=5
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="
+	https://cadhan.com/gaelspell/
+	https://github.com/kscanne/gaelspell
+"
+SRC_URI="https://github.com/kscanne/gaelspell/releases/download/v${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ga/metadata.xml b/app-dicts/aspell-ga/metadata.xml
index 9c1b627475c9..e2acd2adafd5 100644
--- a/app-dicts/aspell-ga/metadata.xml
+++ b/app-dicts/aspell-ga/metadata.xml
@@ -1,6 +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/>
+	<upstream>
+		<remote-id type="github">kscanne/gaelspell</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/aspell-gd/Manifest b/app-dicts/aspell-gd/Manifest
new file mode 100644
index 000000000000..7543b340e5c6
--- /dev/null
+++ b/app-dicts/aspell-gd/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-gd-0.1.1-1.tar.bz2 51167 BLAKE2B d2ab952153e684a215f12cfc7c7360114993aab7fa5f6181af8887940c144238e7d643277d2a6836f1cbf7f3fa17a63a8e9daf4b4ad5f77e235435b02c67fea4 SHA512 d388bf3476f440c7773a69a0758b8e9cdddf01b64579f6d92fde38e7363c5c3b321a76c7a4e4587b0810159a35eec8d33d1cd2de49068d73f9e0e4dfa60fbc5c
+EBUILD aspell-gd-0.1.1.1.ebuild 299 BLAKE2B 94fea473c1e1fab7d89b779e5b06f7a99340e567f54d8d732f5a825bfada924e611c570623cdc1deb9e5a0fcd334bdd4de366da3a72895b68a4eb89f2f9532d8 SHA512 e94db1a3fbca15c3eead477be330a25647e305217d5080505831e73fc52b616de41ee384286a0fa5e01f5bdd69400538c6cf6acb96e67d6228a6bb9bfa0df304
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild b/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild
new file mode 100644
index 000000000000..9e3734d71611
--- /dev/null
+++ b/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Scottish Gaelic"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-gd/metadata.xml b/app-dicts/aspell-gd/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-gd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-gl/Manifest b/app-dicts/aspell-gl/Manifest
index 5c60cc62af82..8082429153fe 100644
--- a/app-dicts/aspell-gl/Manifest
+++ b/app-dicts/aspell-gl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-gl-0.5a-2.tar.bz2 80043 BLAKE2B 9c2c4601695e5fa5b64d0047e942f797bd37e2c2245421cb3a236a52fd64ba3524e1131c6e0e1deca777cb793d03e786ad4ad8804eadafe3bc17adf779f4b074 SHA512 9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714
-EBUILD aspell-gl-0.5.2.ebuild 447 BLAKE2B ce5d6cf7f82fee094ca3a208bd7b959e3f15ef2bb4a4fd952a5b6a42af2d93d68a41e55a84831889255c1e8699da30124b185fea7178316eb91214ea128f8e1c SHA512 e3f1b452dd91fc7ee1fa1481ac2067993534d4e90ad9f939e789ba019776ea03ec7226fed51c621c2f30ec1101be826f2afa631d6bc227911596b71e5152e141
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-gl-0.5.2.ebuild 466 BLAKE2B 497aa6052fda663f8a67f3abb6ebfd2025f2b3b16520462b71bdf41d89fa4ac9d4b1205ef36bf83fa64bd28f534c69789b869d466847cb49ba2bf9a7464dc02f SHA512 ae1ce2b5bb2f553f4c4718a2cb941afd7b8d8ccf4844736b8e8ce5a939b09cb6da79322d3574acd3d254b517ca9a83314b9e1eec4ae937bcea6a9462346816c3
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
index 922cd6d71f49..ba98c253636c 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 ASPELL_LANG="Galician"
 ASPELL_VERSION=6
+MY_PV="$(ver_cut 1-2)a-$(ver_cut 3)"
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+
 inherit aspell-dict-r1
 
-MY_P=${P%.*}a-${PV##*.}
-MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-gl/metadata.xml b/app-dicts/aspell-gl/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-gl/metadata.xml
+++ b/app-dicts/aspell-gl/metadata.xml
@@ -1,6 +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/app-dicts/aspell-grc/Manifest b/app-dicts/aspell-grc/Manifest
new file mode 100644
index 000000000000..dbfdedd4e506
--- /dev/null
+++ b/app-dicts/aspell-grc/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-grc-0.02-0.tar.bz2 1435636 BLAKE2B da033276f70f5493de39985e507b91eda1bee81012ada97c849e57403f0db574baef216f5fd7b35685dadb91863a3fe89c6709fca41c84376e5f305019193d78 SHA512 17999e20621efc67ab42d83b0e149d19b18bcfd20966da35d217a3e5682c0728287bec4bce28af34f4e343943a1dac49f85077693ca30bd1ff7cbaaeda453ddd
+EBUILD aspell-grc-0.02.0.ebuild 297 BLAKE2B 6eed9be16a3de555773fa400ae1c2c71a312e8599d624cf44ebd7249fcd1f470327b3e39158d1821fbe14e1e3a44d0df4a1d7274eec8a88c14d4b945036a1606 SHA512 9d306f3b631c4e890c4003fc39debf033898e8370992166dd145f9e5442c733c3ae87090994e87216b336e0f8d4194fbe37d416aa94e6e4e38dda5827ba46d32
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild b/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild
new file mode 100644
index 000000000000..6ece672e8f37
--- /dev/null
+++ b/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Ancient Greek"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-grc/metadata.xml b/app-dicts/aspell-grc/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-grc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-gu/Manifest b/app-dicts/aspell-gu/Manifest
new file mode 100644
index 000000000000..d9d205391eb4
--- /dev/null
+++ b/app-dicts/aspell-gu/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-gu-0.03-0.tar.bz2 160283 BLAKE2B ec62472fd04c3ea952a777c95e13ec577ec7c51d1bb28a19b3c53ad1f1a3bbe15527324a83619bcc81a52615fd3d703f6ca5282dcca23007dfeb989e90058e9c SHA512 0cc252bd1112b8f06cb4ea9000b00d036dc405d8fbb9c380beff949ea138903b5807afa8f1419f4d8f57329a7bb1a4b7f4bd733170e5f09ac7786ac39beb87c6
+EBUILD aspell-gu-0.03.0.ebuild 292 BLAKE2B fd735b52694af19af6f351ceab55a9f27148040d1875b9531058ac1849907ec7a177176da5e960907001b2f4912b52bd58c3385dac34b51a69c8cb3ab26af708 SHA512 8880d02ab2edbfa57e2055abb7d879397ac3c7e8d70f583c43e1dbbf312da3052b898e0be41eaecdb970f902b82ecc219a70e2f8e3336f67a660eb6d0080d3fa
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild b/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild
new file mode 100644
index 000000000000..847771941465
--- /dev/null
+++ b/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Gujarati"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-gu/metadata.xml b/app-dicts/aspell-gu/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-gu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-gv/Manifest b/app-dicts/aspell-gv/Manifest
new file mode 100644
index 000000000000..ce2a373f469f
--- /dev/null
+++ b/app-dicts/aspell-gv/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-gv-0.50-0.tar.bz2 69462 BLAKE2B 707e5c21cf50c082498c6332bdc9c4490dd374f2820d912b70e9c987612960c883943bf7a68b807eb6d6b28ca6c109b34eba3cff149ce8c734e79275ba4915f1 SHA512 6ec0893bb853c9600b49958802572edfed2127b749b2e4ee5ce051863526fefbae367cf2686ccae2f3c27fa168a8c3a8611eae3561853553594fb097fd78e37d
+EBUILD aspell-gv-0.50.0.ebuild 278 BLAKE2B be7b06b5d96530b107c3c05dca5731f9f6eca0091b5efe8719221a0e7bd453459f4e0a124c3eb80f2ca457327734f8ab271e12f0c49834c8d0bbd891d549046d SHA512 cee7f3ce89c12f20872a9920a4d68e4da576c4d91d1ab27e8e8835421bbd542c758ba093087ec1eb7a9170fb854787a8158d276185c84675e728590d46fb62e2
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild b/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild
new file mode 100644
index 000000000000..9d4a30c1b406
--- /dev/null
+++ b/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Manx Gaelic"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-gv/metadata.xml b/app-dicts/aspell-gv/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-gv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-he/Manifest b/app-dicts/aspell-he/Manifest
index 1afcd0d4d36b..d1d317353d52 100644
--- a/app-dicts/aspell-he/Manifest
+++ b/app-dicts/aspell-he/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-he-1.0-0.tar.bz2 122781 BLAKE2B 24df4f12d3dda89e6654bccdfb4290baa883ea21f761046129a4baede917f2861b829dff93349b9ab441b5c2ef556702a0ebfcdf682a8e7ab00c746e2f9d9e1f SHA512 4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88
-EBUILD aspell-he-1.0.0.ebuild 281 BLAKE2B 33bf6ef7b3cd67faf3993a234af71a61189939d845efb59ad52367360f10ebea9bd156dfadb7a65d2d9eccaaf988d012ab8382afdbef02f0f107dbd892ee1ddc SHA512 ddb9e54719ebbbf6683deb8525bb2c2527e13b560d4229b1e5bc6a252b3220f6012cca619e6e9aca7bf213d4215084558ff7ba1f5bf8ac4bc0571fa31f50ab0c
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-he-1.0.0.ebuild 282 BLAKE2B e07de9a3fead39cb983d383fe2385f65311763facc9c6649416eba8c7488616ee83ff4e50fb6f25257e5e238e8559ff1c0824e0de8c98da560e4fd3e2ede489d SHA512 4689534fc1a39305eed3b190382718d0ef07413bea860b0aee32a4056f6eeee73b70945990d546b3b1519a9e57bbe967c90fa1917f9459b5b44c0f927dc6e442
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
index a3b968ab6dd4..271deffddb10 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Hebrew"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-he/metadata.xml b/app-dicts/aspell-he/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-he/metadata.xml
+++ b/app-dicts/aspell-he/metadata.xml
@@ -1,6 +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/app-dicts/aspell-hi/Manifest b/app-dicts/aspell-hi/Manifest
new file mode 100644
index 000000000000..a07eb571f35f
--- /dev/null
+++ b/app-dicts/aspell-hi/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-hi-0.02-0.tar.bz2 174790 BLAKE2B 0e768775f2504c726e414bad6ef07d939218c88878f32f8bb7d0492298ded5bf83e7b4da4036bc3b1f066d4173234e02bfbbfddbe5ba020aa88d99e37b606141 SHA512 298743e1e5988e26081d89ee6cdea3b2f3185ad81b3449b5fa3f644a2beaf488320f9468fbeeb7e6c7bcb3ae4b7116bd02f64c4e6f4c60f80c1a7c3b84946a93
+EBUILD aspell-hi-0.02.0.ebuild 289 BLAKE2B ae11dda2190b52f270d29eb81d178a4e03a1a9f6b32e1498c05c4b30c232400c202c6000dbfb2dbe3bef2fc9fd8475f62c9a14f743dda88a278250e69e2d33e0 SHA512 b5af0b3ac95ca61c2f7249f09effaec90ac9fde58c0306c3c18ace75d837394a861e7c970bf3fa5763b3436d7b380181d9c42dd1eb87f5b184854a6bc1a5ef35
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild b/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild
new file mode 100644
index 000000000000..5205a7f79710
--- /dev/null
+++ b/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Hindi"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-hi/metadata.xml b/app-dicts/aspell-hi/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-hi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-hil/Manifest b/app-dicts/aspell-hil/Manifest
new file mode 100644
index 000000000000..986d99cae7bb
--- /dev/null
+++ b/app-dicts/aspell-hil/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-hil-0.11-0.tar.bz2 46288 BLAKE2B 23f8ce7c9c873ce0a42587f4bd6378d08e945cbc77eef7cc6ac52311e788c776691dc80487dc873a75399c2159c1823eb5bbdf2e0af4aea7ba08b7356d32fab4 SHA512 274c353f48da1a769a454cff0fa54d0e5cfd84a2da7ed979693335aa8e45c5c562b0f92cc5bdeb77a5ff54d0f79f747e792ff4e3f8a0427bbd131879659af432
+EBUILD aspell-hil-0.11.0.ebuild 294 BLAKE2B 77db6bc844d113694b97470629f892760ac9aa8d75663318ca1f677aaaf4a42cf13433db89c1f56116fa0d59dfdaf66d1e38ffaa938a8d7e13b63aba2232b406 SHA512 b8498ecd0dcab61d85a303090fd51fc1af9b331d2cfea72bcde61c615280e06129f141c710c107562bda6178c392e5a656a840b62c778205e10126eb6e650e9d
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild b/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild
new file mode 100644
index 000000000000..30bd06e97f76
--- /dev/null
+++ b/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Hiligaynon"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-hil/metadata.xml b/app-dicts/aspell-hil/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-hil/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-hr/Manifest b/app-dicts/aspell-hr/Manifest
index d2b9c6f1fb55..0da6f98977c3 100644
--- a/app-dicts/aspell-hr/Manifest
+++ b/app-dicts/aspell-hr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-hr-0.51-0.tar.bz2 208118 BLAKE2B 34328a99833dbbdb1e14e5d66c3870a576fd137d38711fbc1c57738057433d1eb7a996dd32ae87942d8bf1c3efd4dbf669d4d5ddc83764caecb8ce36fc2afd3f SHA512 d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad
-EBUILD aspell-hr-0.51.0.ebuild 266 BLAKE2B 1b46698b01634f6e814c3b5be87ffd17f4b7ef6dfd4527b6fe74e87d43e563f20572b698fb81b983e99c08c56de6aed16de9a5229a9601da4c6a58b729d15ff4 SHA512 2a672daba3ffa9cf60723a2a589c5d8fb91a1250ba8f3a3c9dbd01ad4b122c38d6e9dd070069526e2b65a7d754fd337baeb3b4b6cec2e3a22ca7c16783f0b231
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-hr-0.51.0.ebuild 267 BLAKE2B 5b97eacdc52ff6a162ea513eaafb400973b5b711ea500702a42d8613998726c978efdaf71258c6b383ae7e354e0ccc6ec4164e2a478a77fbe1c862aa6a04d323 SHA512 f31f4cf3f39d791e01ae1ef34f6780ae2acd290a78f5e186ea26bcc6ff12733688ba21fdc06eb3545d2570ab4327fe5ef1ef6727c9f700415956888a611b2048
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
index 1ee03ed366ca..d65e7b1c6331 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Croatian"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-hr/metadata.xml b/app-dicts/aspell-hr/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-hr/metadata.xml
+++ b/app-dicts/aspell-hr/metadata.xml
@@ -1,6 +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/app-dicts/aspell-hsb/Manifest b/app-dicts/aspell-hsb/Manifest
new file mode 100644
index 000000000000..b13d8af2dcef
--- /dev/null
+++ b/app-dicts/aspell-hsb/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-hsb-0.02-0.tar.bz2 105195 BLAKE2B 94a5c6fdf0b1857329377efa241a84e07cd06fdb9972e80768f5197ec83ef28455f8486ce821984e9b52c74ef16d6526c5c9066faf58cd64a26c9b9300a64873 SHA512 b8e49bf6d85e149365378a33b56ab61767c34ddfd4545eedeedad012b2b396dff54bb3dcba56fb4d3c0a92a0c3e13fddf0548591568295709d91f18c45ca1274
+EBUILD aspell-hsb-0.02.0.ebuild 297 BLAKE2B c2fe731a127fbbef75b09a30fe609b67b06c83f6c7e3c479c612e78f14fffb548155d1bb7a0052e412dd4570009a988faaa7085db6781719604d3e9e23398fa0 SHA512 ff0a1b11312454ef68c22f2f9b12c924422075e8933cb0fc285abc8bee6fc84a91f063af45cc4b8644c0e7baa6dc8794197ae8ce0e92c99f53c38fb7c3ea0471
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild b/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild
new file mode 100644
index 000000000000..68b1da8569ea
--- /dev/null
+++ b/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Upper Sorbian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-hsb/metadata.xml b/app-dicts/aspell-hsb/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-hsb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-hu/Manifest b/app-dicts/aspell-hu/Manifest
index c26d6ae1f0db..a829ee9b4589 100644
--- a/app-dicts/aspell-hu/Manifest
+++ b/app-dicts/aspell-hu/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hu-0.99.4.2-0.tar.bz2 375949 BLAKE2B 933844253b8280d01e4f37f141e566548b3eecfdb16a2fcfeb026698d64667faedeae512d582b7ceb900753c5e2b1fba6b474bb4d85e598c432d0ac0010a9d31 SHA512 95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320
-EBUILD aspell-hu-0.99.4.2.ebuild 388 BLAKE2B 325889afb1105c5544d4bc458ea7da32924c5889c37d7c20d205d36bab7cf40598e35e3471c3a16507a73fc3abae2a402878a513ba2ae8d19f711c019f959aef SHA512 57fe29f507512af00b52ff0f326a3e6f56366c52d9ad4a50ecff20c9281240b328cc229efb2ebfb80eb2c59f5f4379f83bb1d6cd630760c9905bd76500bad6eb
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-hu-0.99.4.2.0.ebuild 285 BLAKE2B 335fbe36e3885a7e128def8fafb7c0cb4db590ac3c339ebc8446dba2f979bfe98603793aea9fb00111529052752591db3f5e3b70aa1d29c3e943a3c63f1df139 SHA512 4b303b5d2deb8b43b3e63ca1c4fea1bd43a4926e9e4b19f963a8accb99e09ae782b441305b36be7c7fc8d15f64ac4326930b8b0fd1cc1325e6d4189429ed2094
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
new file mode 100644
index 000000000000..3930bc4822cd
--- /dev/null
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Hungarian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
deleted file mode 100644
index 31b89b175f0f..000000000000
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Hungarian"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell6-hu-${PV}-0"
-SRC_URI="mirror://gnu/aspell/dict/hu/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-hu/metadata.xml b/app-dicts/aspell-hu/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-hu/metadata.xml
+++ b/app-dicts/aspell-hu/metadata.xml
@@ -1,6 +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/app-dicts/aspell-hus/Manifest b/app-dicts/aspell-hus/Manifest
new file mode 100644
index 000000000000..82f210cd6e89
--- /dev/null
+++ b/app-dicts/aspell-hus/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-hus-0.03-1.tar.bz2 68844 BLAKE2B f1e9e298b090395dca4414a38d2bbc555b5d02637392db061094df4eb81db857af6e46be6de00953c04929a025564382edca47c2728deb3fd8ac33884e76278f SHA512 2d1f8458f04bda64068ddd3c5017ed129c2b7549e2474acdcc39f76283dae1a0fe557ab67526fa31ce300f615bd5d2ded4aa0414f3a5b6ee8e59389c8ac20c70
+EBUILD aspell-hus-0.03.1.ebuild 297 BLAKE2B 5bf0a5a2b3f369a7d72a0e3411a195e786249a63700f7b5c146678bc77f0be12e90cc41baf7647f858b7ebe8e2b04e1ca60a4fcfe10c902ddd7c220b83c6d81c SHA512 86d89ae8e9c4e24ea74158232c0d86ae6794a1c4f74f3958a0b6364a5b541efe1f4e212e3cc678bf193ca23020a20d1e9f9eb0d3c8eb0bba7d561b50f6080a82
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild b/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild
new file mode 100644
index 000000000000..014cddce067a
--- /dev/null
+++ b/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Huastec Tenek"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-hus/metadata.xml b/app-dicts/aspell-hus/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-hus/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-hy/Manifest b/app-dicts/aspell-hy/Manifest
index 8f6ff5e6114a..fd1cccdac6c2 100644
--- a/app-dicts/aspell-hy/Manifest
+++ b/app-dicts/aspell-hy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hy-0.10.0-0.tar.bz2 191872 BLAKE2B bb74a82446b35a487bf61c27349e9c8c047bf9f9e12cb48b884b7aeb19eee4df7c7e4efb86292338540ae23d4081caf88b63409f06617e6a6da82e9bf7648957 SHA512 b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3
-EBUILD aspell-hy-0.10.0.ebuild 385 BLAKE2B 92296a0f72790b1f8ee0962e68cc0fe0fbc32abf9cd8cb14c0d57df1d5a89d95c03cbfbc0751eaa16f3a8129d3545cbcbf277191b5d8b246ed45475ac603a040 SHA512 f86efda3ae06980d623c9fb5d90a426272d2a14ec6a6b93e6fae21bf5ac90d0a958516efe895eb07160edff9c22a61343e211213abc8369c87dfa31c40675065
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-hy-0.10.0.0.ebuild 284 BLAKE2B 5390d6ca1ffad2a2d35a1195f905795a9ce222255d1fb1c0ea9fff9a33e2bf53f0cc81c644cf200af3a789b4c5a5da761adaff72bf55a3fea108e0972d8d9a56 SHA512 164ac78905f15fec612a3fb67fb426df0d8cd8067d8ea2aac986341da4912664f96fe14f92bff25e06f26f1ac5bc756d4b54955b3889d57a8e98c778811eb9dd
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
new file mode 100644
index 000000000000..7bf4b11a81c4
--- /dev/null
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Armenian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
deleted file mode 100644
index 6cdfb06cc05f..000000000000
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Armenian"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P=aspell6-hy-${PV}-0
-SRC_URI="mirror://gnu/aspell/dict/hy/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-hy/metadata.xml b/app-dicts/aspell-hy/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-hy/metadata.xml
+++ b/app-dicts/aspell-hy/metadata.xml
@@ -1,6 +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/app-dicts/aspell-ia/Manifest b/app-dicts/aspell-ia/Manifest
new file mode 100644
index 000000000000..7ceb26a5200d
--- /dev/null
+++ b/app-dicts/aspell-ia/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-ia-0.50-1.tar.bz2 70883 BLAKE2B bc668b162e07cb01626adb6027ab2fcaa26f81cfd085f74889c7725388cea3efe0f91c29bfdeaa4f36b770d1f14ff15492a7c89e336e608481bec447df941fb1 SHA512 5cdd7b91393043d7b537166c1df100aa76e911cf1c389b34b916839e907abc3cdbdc368f2876a5ecfbd625414b67858950e9d79af184560b9ddd667030dc608d
+EBUILD aspell-ia-0.50.1.ebuild 278 BLAKE2B b64b3b5e0c948b0f406c02e1232c29829bb8d3e3c3b1173da99d364c94e716942802a3cce2d7af7386476642724507f0312f35809efd6735b0a4ad67a5584a9f SHA512 62e4318968660610aa7c24ebd217ffdbf58bc34de4d46022be410cbeb69029460665058418a8ec697bef44b4ffdf49f4dddba4c6dfe4abb6a8933bd7707749ab
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild b/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild
new file mode 100644
index 000000000000..192af4e3cbe7
--- /dev/null
+++ b/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Interlingua"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ia/metadata.xml b/app-dicts/aspell-ia/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ia/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-id/Manifest b/app-dicts/aspell-id/Manifest
new file mode 100644
index 000000000000..8ddd82b10e47
--- /dev/null
+++ b/app-dicts/aspell-id/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-id-1.2-0.tar.bz2 76958 BLAKE2B 2490eed94610ad8ef5185a1c2e6452c1de131eaf1262cd8bd52d9164e4612023d4cfee5ac98d108168ceca945bf16fcbab6f3958ca3dc9933372ccbe60251405 SHA512 bc33c5d6c68027304b0dc299454f8dd221e0138b079bcc423e287fda5e9204b0d6dc14a5a0617b4d018259e011c979453ee13b9050be5516d2379e86ac9cb86a
+EBUILD aspell-id-1.2.0.ebuild 294 BLAKE2B 9d10b35d4b7b9b4445e7dbc8c896953a6f4c055ba6a17e643546347a1218efbb87b4a5db0b20f024012f353ead66822e60172d60b6fdfd56898c3444d3ac5cbe SHA512 baefa3d8a54a70adffa88782bc22dd8ce8be64281e3b845ce81403bed569b9926a2558aa470c82788a286dfa74ceb08d28e82edf459fa4c1d0586c84f634597e
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-id/aspell-id-1.2.0.ebuild b/app-dicts/aspell-id/aspell-id-1.2.0.ebuild
new file mode 100644
index 000000000000..3370c6f01d41
--- /dev/null
+++ b/app-dicts/aspell-id/aspell-id-1.2.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Indonesian"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-id/metadata.xml b/app-dicts/aspell-id/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-id/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-is/Manifest b/app-dicts/aspell-is/Manifest
index 1a580f890baa..ecbe7f0dcb8d 100644
--- a/app-dicts/aspell-is/Manifest
+++ b/app-dicts/aspell-is/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-is-0.51.1-0.tar.bz2 323850 BLAKE2B d3d15c594380ae173f94862eedaee8255a0d98f5e6552ea24fffbf0400d88a858d6d9eb56b35a314b3ae9440929eb525c41ea57f99c43dff0032da68ab8ebf95 SHA512 b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2
-EBUILD aspell-is-0.51.1.0.ebuild 267 BLAKE2B 985ba4a8a1ba11acbdd49444f3294f6ab6856df68ad88eeee9239f0859e8ed7d818f6c533400226694c7af638921fac91517af8c8b0788da4fe5a6354d26f309 SHA512 919a4eef9bdbc9c3c4623c12d9776457494821a0772ec3fdf9f00d59456178e1a533b2b1424e185005b5791fccfb941e6478293a5486140c5ba9e5cd5de84692
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-is-0.51.1.0-r1.ebuild 474 BLAKE2B 7aa43d939ba4ad596405c809fba3fec0bfc07d9abf86d17b21e4f713159cccf888c6a2795937995475abbe9315d66e02a2df7e64b7dedeed7cdd0233a084a4c6 SHA512 fd4c3547b784d3a8e43cea32aa2b8bfefed23d940ba581f7c13b9efcb56f28c3cf6bb94fd421bd74627a4b94b179f5a92bdfcdbf4491d01e2ba38726c18c6392
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
new file mode 100644
index 000000000000..cb88b0f40b2d
--- /dev/null
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Icelandic"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+src_prepare() {
+	default
+
+	# Fix QA error '[..] not encoded with the UTF-8 encoding' by renaming file.
+	sed -e 's/'$'\355''/Y/g' -i Makefile.pre || die
+	mv ''$'\355''slenska.alias' Yslenska.alias || die
+}
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
deleted file mode 100644
index ce5dd5d0804e..000000000000
--- a/app-dicts/aspell-is/aspell-is-0.51.1.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
-
-ASPELL_LANG="Icelandic"
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-is/metadata.xml b/app-dicts/aspell-is/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-is/metadata.xml
+++ b/app-dicts/aspell-is/metadata.xml
@@ -1,6 +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/app-dicts/aspell-it/Manifest b/app-dicts/aspell-it/Manifest
index 7587af7ac7b5..194556e5f7e3 100644
--- a/app-dicts/aspell-it/Manifest
+++ b/app-dicts/aspell-it/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-it-2.4-20070901-0.tar.bz2 261419 BLAKE2B d377690df133647c8345eed4178d91c03a2a6813f444833ae5c78a0960577fa2d8d259a5b04e053770e2df832260ae817c387ddd814593fe2e6ddf5f95eb50a1 SHA512 6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9
-EBUILD aspell-it-2.4.20070901.ebuild 431 BLAKE2B 971903763d0935d57724cc193037eff8781ec0a80000c2a526dcb81b9c9bdd3c023f277e7895b6408d01924c0a2fe453c3a6c6f6d03f0a9e409be33f92fd863c SHA512 e13deba54cd1a85e1e6897a2be2fc267285c500218401a089f249a51e233346e9326e65eac0ef3230aec469bc1126b4e9ff1d32e07e2901d301185684a2b4960
-MISC metadata.xml 272 BLAKE2B af4cd812ee41d7eaf130bf7a49e48b4e21776f9457f39ac0b8bf27efa6b22fe1b0413c4a260cacc85fd3e63e42437f9b91686eab51c1dadf29b18fa77c5f0e4f SHA512 1e4677411873a0129b492dadf065ae6148da5d8ed3c604d64467f5ff960273bc8ba3f7604ad8a11a80260c9bcaa9656f28a80521708563517da450e8407c574b
+EBUILD aspell-it-2.4.20070901.0.ebuild 451 BLAKE2B 0d0a4ac209d18c81b7615ffc18bb17a4807ef01dfc484cf96c4d54bb0a3dfdff4e5555b3b7437f432db8b706a957b08108f40e34b8e89da184dcec18728b2b28 SHA512 48fffb9936f4f8d9564dd85176f764a3fea06eb8edbaf0b8311f9134a3c384ea91c8d473eac3e87b3b4b36974f488b50860a9eec5c7892baa56e7d363db95d1c
+MISC metadata.xml 355 BLAKE2B e175c22153a1b8b08001257755982f7679719498069600fc008a58ea2d91f7bc670493ab0f7c0ddba563992a9c997e25b8843ed714f8724aa69944d293d207ac SHA512 b0ab2f9d64c0fff122ee0af4751a204594b28a9869c297b9a7d5e91c70e570505bacb7ed4b6b1fa09533b09f6f2eff3eff69312eae2909c9c5eb9af3a92e6fae
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
new file mode 100644
index 000000000000..51fc938acebf
--- /dev/null
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Italian"
+ASPELL_VERSION=6
+MY_PV="${PV#*.}"
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%%.*}.${MY_PV//./-}"
+
+inherit aspell-dict-r1
+
+SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
deleted file mode 100644
index e8f2716da15d..000000000000
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Italian"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell${ASPELL_VERSION}-${PN#aspell-}-${PV%.*}-${PV##*.}-0"
-SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-it/metadata.xml b/app-dicts/aspell-it/metadata.xml
index 294342d4903f..9ded0db35151 100644
--- a/app-dicts/aspell-it/metadata.xml
+++ b/app-dicts/aspell-it/metadata.xml
@@ -1,7 +1,10 @@
 <?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/>
 	<upstream>
 		<remote-id type="sourceforge">linguistico</remote-id>
diff --git a/app-dicts/aspell-kn/Manifest b/app-dicts/aspell-kn/Manifest
new file mode 100644
index 000000000000..4bac1c00a45d
--- /dev/null
+++ b/app-dicts/aspell-kn/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-kn-0.01-1.tar.bz2 158004 BLAKE2B c3df1a16ac29a39c87a23e47d41124c9eb90cedfbe04f7f8de04f2e01ab349e32df779a5b96aa2a407f6b13f647ef23c75bb36921d4fd3bc5d16e85fce8a23a9 SHA512 892f93c0ed33f4aedb240d8c673d7888318760ccb2ca0cfb8377a2770f757c5410583a7c18314f3fb7cd58704a531e8931bc8be44d9de80b1421d2238e4229c3
+EBUILD aspell-kn-0.01.1.ebuild 291 BLAKE2B 9556827ab73159b319a7d313a9aeb53c236bbb45eeec8ef4afe37e7e7ef79776d91103f5882db06027e12891c67b60638413dc04fe87d7cf301ecc79af85c816 SHA512 7542d486e5e479ba1dd81c83676d65bb3c8a53a24d8f2c3394e12d47fd710094181b39e9b7d6393b788182cb20e66ff9c6eba3f733d25646f720d1a17588d095
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild b/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild
new file mode 100644
index 000000000000..314352b0cdde
--- /dev/null
+++ b/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Kannada"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-kn/metadata.xml b/app-dicts/aspell-kn/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-kn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ku/Manifest b/app-dicts/aspell-ku/Manifest
new file mode 100644
index 000000000000..cd762daa1fb9
--- /dev/null
+++ b/app-dicts/aspell-ku/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-ku-0.20-1.tar.bz2 23851 BLAKE2B e1518322a869312c4fdeecaffcc9b11f70a55b3536b8a9d58d183b57fe21f133c7219eb5ba7a5898ace61ecd8e8bd01019f307b14c619c1824124f2368278311 SHA512 b1aadc13e4cc494bb7b8bdb1ef96215abb72dfe2ec398d4c383984a2540323117d18a940c675ed0266cbbdf14958525975083a9fe35e93b7885c8f0216362d84
+EBUILD aspell-ku-0.20.1.ebuild 289 BLAKE2B d071096a03f80c31e8238409f0bbcae09fbab0213e03861a7eb0998fd0faf3baea77e5d52f8ffc57ff4f1b512b8fdc7e972ad55fc368348200c9d594c3f69657 SHA512 df1259044c72686d99182962122599de6aa9bb46e24a716a3be28179739c929e1475e3c9f4444dfa2fe6163f2f31bd95889de9b1df13388cbf86339863eebd6a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild b/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild
new file mode 100644
index 000000000000..04224b2973dc
--- /dev/null
+++ b/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Kurdi"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ku/metadata.xml b/app-dicts/aspell-ku/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ku/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ky/Manifest b/app-dicts/aspell-ky/Manifest
new file mode 100644
index 000000000000..32c8debdb00d
--- /dev/null
+++ b/app-dicts/aspell-ky/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-ky-0.01-0.tar.bz2 38460 BLAKE2B 9362d344e09bfef9a75541db82534eb6556f3fec13db20e6969e6fa7279391517dbd2a2ffdfb19036181a70617c5323a94458eb4007143af20e47a22e840f0ff SHA512 94389905505ffc0c469dd5f4ea31e2e76fed695e8cb7b903e248a57a8677e45311e525a07c43da0be87bfdc7825b1af4ae8dd1993d35948dd1ace4b1af9fa307
+EBUILD aspell-ky-0.01.0.ebuild 291 BLAKE2B 382aea0be87b772929712d3822608d2162f7f0da96e970ac61cc12be05c29dfa2464843c64d75e32eccb9c3b24d2a179c62aa77140a87b6eaf58bae336bd3b11 SHA512 5842f29bd9e1cbde6a817874991aa975b368aa57d5349e8048ada7634109fe5f33deb7aeee625b9f8eed5e0510302c31df025d16710ee807a66fc752be9169c5
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild b/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild
new file mode 100644
index 000000000000..3a37e8cde827
--- /dev/null
+++ b/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Kirghiz"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ky/metadata.xml b/app-dicts/aspell-ky/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ky/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-la/Manifest b/app-dicts/aspell-la/Manifest
index b8f4f3661048..3698901969e9 100644
--- a/app-dicts/aspell-la/Manifest
+++ b/app-dicts/aspell-la/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-la-20020503-0.tar.bz2 42722 BLAKE2B 344e4cbf586e93894be20dff7ba44f79d775abe27b3ae3624fbdbc0d4f22c916b6e518bfd0c1d37d69e09d8b9acc50a32622013ecbda5d7ca2ebaadc07358ee6 SHA512 b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f
-EBUILD aspell-la-6.0.20020503.0.ebuild 387 BLAKE2B 944d61b00ab0857b8d64192fc8206bda2c9b8f2efd663193dc03e543e7ca6b962c0be8d7403e4dad0f44747143b968e788b6a836027bcc201f030c009faa2fa4 SHA512 c6dbe74ac87de1ad455d933bb440041ae1acbf36eff3ceab2a452695135db2fb1ff15121676cec04d14a44b534defff79443f7ca7cff18d8b617794bded42aaa
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-la-20020503.0.ebuild 281 BLAKE2B f58d9cd64e038fa942776ce7a5b6a31c27aeb6f0ee11241a2400bba84a959ceb99f20340bd98e7d77bf0b1f1cd52b3bf162793b1ddca70dc06917c75162dfc05 SHA512 1246ba45e53f7f1eac3af49586828a024c394223eb22f3ee4478c9cad7c01fd7e2eba32954c7fa2e65a2541d36a88af45df50ee804ed2f3947c4177dd4bf7830
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-la/aspell-la-20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
new file mode 100644
index 000000000000..50719a9b350d
--- /dev/null
+++ b/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Latin"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
deleted file mode 100644
index 1b3c8a64f0eb..000000000000
--- a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Latin"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell6-la-20020503-0"
-SRC_URI="mirror://gnu/aspell/dict/la/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-la/metadata.xml b/app-dicts/aspell-la/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-la/metadata.xml
+++ b/app-dicts/aspell-la/metadata.xml
@@ -1,6 +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/app-dicts/aspell-lt/Manifest b/app-dicts/aspell-lt/Manifest
index bb9d56dded0d..005f6d2d05fa 100644
--- a/app-dicts/aspell-lt/Manifest
+++ b/app-dicts/aspell-lt/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-lt-1.0-1.tar.bz2 155409 BLAKE2B 5beb2cad8c018dcb5b06701ec467464ea2b472c9cebaba966c0c495899de11c0b1fac29cf3d359cc1b8bf85fc890172dcd476206ac7b5b6eec99a619055ad34f SHA512 478acf95f4a7f7a705ddf481650a35f565b200886eb6b42bfcaa4669021b43a99e1f06ca3459d60afbf4cc0b3d111e9394308bc1fc6ec2ac920c9e7aa7f42b31
+DIST aspell6-lt-1.3.2.tar.bz2 176371 BLAKE2B 6d2d225b04beb3e07a7ec337371f4d7fcafe5a690bf7908f3931bcadb35fd4c9193e50fadca8a748ed93f290c42820cb60a62b57df3538e6fe7f1811f0e33c80 SHA512 df64eb6f5ae9bb564d14f0cd84106da3f32908e79682ebece6e3ed1613216eeca94f48c9c3f689df724cfca4d80f9749e39772766a9ea20167a97ee39074e5a3
 EBUILD aspell-lt-1.0.1.ebuild 395 BLAKE2B 4eca24dc92723e2effb5720c3b1970ff9e49b70c7197ee094275bbd97b5cb9e5eafc496ed4445c5bef144e33b42973c9be9f20f88332b526d13cd0d2261113f9 SHA512 60e0ff6b51e05fabcc9b03dbe3f38a34b4bfbf44f56bdfe53ae541b8e087271a316c6882854083e80c3f17428f5cb118ee7e4b31d04a315d9af47a56c4843c65
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-lt-1.3.2.ebuild 509 BLAKE2B dfe3481ab97d4614e9c0c7de1fb57b95f3446a2a5dac90a26867be4b31718ba34c11242d1e31936ff5208e8c86212ec5b11d4aa98d93e450ab07d62fabe5049d SHA512 deef09e89482b953897906844bc4f88a8af9ec3663fab7ba8f6e7015366561f6fb9ebbadce4faec4386c0a487197d5251b6bfc9de11dcf79a87907379619a237
+MISC metadata.xml 358 BLAKE2B 07274865b89dd9f5f70e45c067a39933dbfefad15e0840b48907541f7e5b99f2768383087d16eae3020f17e998fd9fea4d15d1617a0a07d249162b64a20fdb70 SHA512 cc79656a59cccaf64d6881e9b25e5198e60376e8ffa9cc31a272c932a6155dba9cf36bd87f53c2b24af4277d15468d8d1fc0c70958673ee8e049f47f28c10ca3
diff --git a/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild b/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild
new file mode 100644
index 000000000000..a225a8965625
--- /dev/null
+++ b/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Lithuanian"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://github.com/ispell-lt/ispell-lt"
+SRC_URI="https://github.com/ispell-lt/ispell-lt/releases/download/rel-${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-lt/metadata.xml b/app-dicts/aspell-lt/metadata.xml
index 9c1b627475c9..693d3cc95961 100644
--- a/app-dicts/aspell-lt/metadata.xml
+++ b/app-dicts/aspell-lt/metadata.xml
@@ -1,6 +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/>
+	<upstream>
+		<remote-id type="github">ispell-lt/ispell-lt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/aspell-lv/Manifest b/app-dicts/aspell-lv/Manifest
new file mode 100644
index 000000000000..a7f1a7551c76
--- /dev/null
+++ b/app-dicts/aspell-lv/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-lv-0.5.5-1.tar.bz2 72416 BLAKE2B 6894fcd11f0ba802b410be8fca5f34562f1a4d18c128953214f97b12a3d4e745c1f90f358ae2cd57740ba5a56e04b437daf3c2b27f978df8ac1202bb9e347fb7 SHA512 94a9c6da3fd29f17fbe5d02cd4764bf24379abef526725bb34c0726f7ff385fcb876df24b741bc66518295c3bb75c800aa6010130454c6dc1d6372d12d2eb98e
+EBUILD aspell-lv-0.5.5.1.ebuild 291 BLAKE2B ebb2c052628424cf8aac606201d9fb5d61c109108ae105475d3e605d88953bc7986ff354d96cc94e87b3814de3228a14a484962b9b86743b956c15bea22e9af0 SHA512 ddd74b1eb8cd0b58928abb1bcab013d6fd5b669a54580fcd7a8735df584c6f4315e407a1bd8d2bd0339334d3d0e89d6cd13befd9de064f9a9a5e42dd2fc5e9c6
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild b/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild
new file mode 100644
index 000000000000..f9316f114d3f
--- /dev/null
+++ b/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Latvian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-lv/metadata.xml b/app-dicts/aspell-lv/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-lv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mg/Manifest b/app-dicts/aspell-mg/Manifest
new file mode 100644
index 000000000000..b5c33d1cf61b
--- /dev/null
+++ b/app-dicts/aspell-mg/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-mg-0.03-0.tar.bz2 45331 BLAKE2B a493e149354d99a6799218a54d7d3a82260e57cdee6d990ff1b2b43d697acfafca188b61b4832c2b590fc6b8e8556437f07d386ac203e70fc799433a6fad2607 SHA512 a9c0861b925b40bf9bba5e1d02f3e225a516f929a2e72c6760ec5bedbc513e18e8bda0205e83e17c09b6a37256877e54576c8085e6000f67783147d4cd9ec6df
+EBUILD aspell-mg-0.03.0.ebuild 292 BLAKE2B d366f513da755e7c4e4c6196184f819c2cd2b2779144b1b5cb3eefe99daece93b87b42907f34ff90866eec6cd130b7ba72d85c43318bfff8c47a7c75277c7610 SHA512 84d19e1eac3f6199cee7cd57735b7336a4a1bbd632fcf08e3a3a9823a19db02948861e8683c954bea7d5d9f11a2604810b8d32abdc86a2f4f517d0c070020b2a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild b/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild
new file mode 100644
index 000000000000..e931a23371c3
--- /dev/null
+++ b/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Malagasy"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-mg/metadata.xml b/app-dicts/aspell-mg/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mg/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mi/Manifest b/app-dicts/aspell-mi/Manifest
new file mode 100644
index 000000000000..dbcae904f32b
--- /dev/null
+++ b/app-dicts/aspell-mi/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-mi-0.50-0.tar.bz2 57818 BLAKE2B ddabc814d8fa6e5c6d623151256f427a5c8c6b98b04120c583db585da6e7dd8f63a680afe309d363928983465a0fa55c574c9e12129c295bbb54c0fe3c8ae3de SHA512 cba0a646612f6cd24d1e1d91326dcf1c7a6ec01c04ad0661a95fcd745b4d1a3bb50aef84c382d3a6c9108d4e9589ee7661f4988930c7198950396eeb029062a0
+EBUILD aspell-mi-0.50.0.ebuild 272 BLAKE2B 28a274dfb7c59eabea415319b1bc4dc81d8c5664761ff81af8671a2bcda905c080f86c7cb5f2f5cd32241c9bbee5029e2b60af66f557c9db1d11366f1688b9a7 SHA512 35576d65095b1a6adb4419737528a2eedb0e80f6b59cac3fef94049ab9e074ed43361ffdc9b03a48289ea0d822f25f003c5b940f0939dda60e7d9d0ea95e8164
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild b/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild
new file mode 100644
index 000000000000..0cb2bfe197f3
--- /dev/null
+++ b/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Maori"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-mi/metadata.xml b/app-dicts/aspell-mi/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mk/Manifest b/app-dicts/aspell-mk/Manifest
new file mode 100644
index 000000000000..3e68cf8d8432
--- /dev/null
+++ b/app-dicts/aspell-mk/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-mk-0.50-0.tar.bz2 122690 BLAKE2B b3843d56ab995760a2f5cdb3f1280919359a934111679bc7c2eec338908ac70501f6ce01d602fd22b22845b13699ce510c785165ac3cd9d060d5621078f1e679 SHA512 6bcd57338ce76b7daf22a4be28a2f583c6c1d73ff2d8d5db2e3d5122d89c41617d44a40019dfe647c8e1e07509bee20be6ba136e872710bd77871adbac29e947
+EBUILD aspell-mk-0.50.0.ebuild 277 BLAKE2B 03d4af90938f159d8f1fbc4690cb093adb48e3d1587835e754e2903565add671906eff4b9f1159a5d8e182dc922b545f3b2fb47435d791157984a9fb52d9d20c SHA512 82d55148ec41a484928e865a9085127d42a596b4b6d42d8558dcbf1cc5bf3d4ed7306a21731f9f47b3376bb728e90ab07c7c13185bc2cdaeae41f4e1ffaec583
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild b/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild
new file mode 100644
index 000000000000..fab71b4c4855
--- /dev/null
+++ b/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Macedonian"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-mk/metadata.xml b/app-dicts/aspell-mk/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ml/Manifest b/app-dicts/aspell-ml/Manifest
new file mode 100644
index 000000000000..841e951b6834
--- /dev/null
+++ b/app-dicts/aspell-ml/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-ml-0.04-1.tar.bz2 438015 BLAKE2B 00defa28d347385d74737e680b4c104f2a6c9b19bbe19880069ed1ecc54cef2a7844bf099c03bf7ae301cc85836c371b31588a71c4e3d5f219c596ac1ce448f2 SHA512 a9b6e522f9a4b4d9034f9cd2e1546e0cdfc9bad9f9c7515c8144efb186fb164ab55d422e93da89f0cf7c2b7e6f7b5d439747cc8b7e211c5b09a3638573765563
+EBUILD aspell-ml-0.04.1.ebuild 450 BLAKE2B f0158621c14a7e0224703df49cd3faa9ac11ac39b7cc2cb3ded6bbf36ee7fd168714609c8f684141c16e6c121b5700ede2fd20a7fb0cc6b795e029cf0651ec5f SHA512 db43886c9dd3fdde6609cf2121a8badddee69bec3da3c7c2f6db48148d46eda131ef2bffb6ce3e61224d005a34bd4b1c2e9257f3fee20ab7cdb3c1d994b7feac
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild b/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild
new file mode 100644
index 000000000000..43d616840c86
--- /dev/null
+++ b/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Malayalam"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+
+inherit aspell-dict-r1
+
+SRC_URI="https://download-mirror.savannah.gnu.org/releases/smc/Spellchecker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ml/metadata.xml b/app-dicts/aspell-ml/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ml/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mn/Manifest b/app-dicts/aspell-mn/Manifest
new file mode 100644
index 000000000000..707d1226afef
--- /dev/null
+++ b/app-dicts/aspell-mn/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-mn-0.06-2.tar.bz2 322102 BLAKE2B 7b0da493fbe330d99376cf039ffb9db60c5689a5d6aadec6244390887f927d1228f5d731a83f341e9eddb72014ac3255012bf337144e94d2b7e2c3729631e152 SHA512 c0cf603169eaf8b4b858fd7573374d1ec47b9794e2514cb241b8fc3b053bce715dad6a15bd73eeef443f0d6a4308ffb384acae825d33315ee983a69ceacf9201
+EBUILD aspell-mn-0.06.2.ebuild 293 BLAKE2B 1dced287dd4d2e5f89d81f90fb650bd2c8e62d5a769997f55fccab75f33adcfb3166d83365a44c57ec88d4c1d56693a8e1fa7ddfbf082fb9674379b28f7124c9 SHA512 8e1d69fc2c22d6241af4aa84945b145d374ab30baab61d9bc82296d2c9659ac7f98bc8c91a9f70738356c988d6ec5676577ea5ce1e121539b8c7b6e8965fb91b
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild b/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild
new file mode 100644
index 000000000000..55bb3279747a
--- /dev/null
+++ b/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Mongolian"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-mn/metadata.xml b/app-dicts/aspell-mn/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mr/Manifest b/app-dicts/aspell-mr/Manifest
new file mode 100644
index 000000000000..6d0ddde2f894
--- /dev/null
+++ b/app-dicts/aspell-mr/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-mr-0.10-0.tar.bz2 151720 BLAKE2B 652e6cb7fbfd01d7890c898b2fc8472c2b338158135438b4959651122bb298c000914ecca5d32726e8f332170073bad7db057c08c02448377fe8f4d68bbea799 SHA512 4137a9d6f3dc67db81479a2df628c33c3989214a629f48fc9bb6421e4ce723bdf559eb2f0981c2172315ec140ccd160a10b9556a6618f2fd3383dec184352732
+EBUILD aspell-mr-0.10.0.ebuild 556 BLAKE2B 3e360ccb1a2c6782ed8d003345ff4f381b51cb8ca9a471432a7725e422e409db13709e8d00cd2f990494ee386e0c4a1091116a043cda6b87699d4b2119467d85 SHA512 4fdb937b85b4f46d67845bb1561f94c26b3657b49fd66ba0d646112e9fd87d38d4ffbe80890b60a9dc222233e6495de2fc8e399f6ed2decda36106142bbf2e8a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild b/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild
new file mode 100644
index 000000000000..3452c2ed5906
--- /dev/null
+++ b/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Marathi"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	# Must be renamed, as it triggers otherwise a file collision with app-dicts/aspell-hi.
+	sed -e 's/u-deva/u-deva-mr/g' -i info -i Makefile.pre -i mr.dat || die
+	mv u-deva.cmap u-deva-mr.cmap || die
+	mv u-deva.cset u-deva-mr.cset || die
+}
diff --git a/app-dicts/aspell-mr/metadata.xml b/app-dicts/aspell-mr/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mr/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ms/Manifest b/app-dicts/aspell-ms/Manifest
new file mode 100644
index 000000000000..c5f32b2e4746
--- /dev/null
+++ b/app-dicts/aspell-ms/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-ms-0.50-0.tar.bz2 50368 BLAKE2B 01a92afcb2c74f72915fbcd11790bcc0ed17c3a643071186bfb539c1b3b0941528cf3b09bcbbaed573bb617e074eca3ea5b60abdc08484394179e941dbfff5e1 SHA512 270a6ad18d9b317588e781eab84b59c83450383d703fab815856b3afa58a19ffa0eec3c7cbc418993302703d586cb92678878aea51fff753733f7583d8c2b0e9
+EBUILD aspell-ms-0.50.0.ebuild 272 BLAKE2B 720618752163bbfe2b5f1ccaa7e46b570453dd696e4933eb1b7fc00af78e3d0e7e4ed4ab8a778c57ea20180a0eb2f1ee8f510fdc90732e8c6f2ef0e137ea0c2d SHA512 6291e6d1c79a0c3cdb3ebea393cee302fbe54decb6fbeb4d3c92df7cbf69e0673bf5b9d9c65230f2bf8e488a4c6468e88dcbe6d45c6a6352d0a30b287b9c7d5a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild b/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild
new file mode 100644
index 000000000000..4553e351ecaf
--- /dev/null
+++ b/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Malay"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ms/metadata.xml b/app-dicts/aspell-ms/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ms/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-mt/Manifest b/app-dicts/aspell-mt/Manifest
new file mode 100644
index 000000000000..709d6bb43087
--- /dev/null
+++ b/app-dicts/aspell-mt/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-mt-0.50-0.tar.bz2 124114 BLAKE2B 45aa92997ce9a54a7d0357903997265eb50ac85d24b0e85198cbca34ffbb4e764f9da300abeb8ab035b74b17514697ef2207f02c3b673ea7ffbb7aaf57d26ffa SHA512 aadcc59b0dbbfdf4d715bfe6735bfa2a91e6fae382634a25c0cdf8367710050b2daeac1db18df3a71184720ff9339a852983c8a266f8c97e0ffba1e8be50eaa1
+EBUILD aspell-mt-0.50.0.ebuild 274 BLAKE2B e9f69046b2f6e317d8314bb63b002a80f7f7620b0fbce7c01a5815ffdd96612ae7c4ec3743d2ca3c8b3f320a12eaf5218440007bf4d1f627df72db200dfd1aad SHA512 d8e89c11b9b56271266cbf77623013b02d6a0810504697af9bf91ccde6c583abf983aede83a1e3fece8b9d0cdc3227e4fc9499f695f120073749c67056ee6b55
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild b/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild
new file mode 100644
index 000000000000..4e3a36186d7f
--- /dev/null
+++ b/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Maltese"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-mt/metadata.xml b/app-dicts/aspell-mt/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-mt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-nb/Manifest b/app-dicts/aspell-nb/Manifest
new file mode 100644
index 000000000000..efd791044d75
--- /dev/null
+++ b/app-dicts/aspell-nb/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-nb-0.50.1-0.tar.bz2 423161 BLAKE2B 85f007c61066f0d8e30cd55d0bc2423ee1c02bd8cbd12b5a9793666e34e70359260dd4a861b24c324981368dd0f01a43dc1d2aba192783c32c09843b2ff16f29 SHA512 e30dcf7e757ab1ceb5de349927f9cfa4d9de4015bd9cc9449739fd2f17f6f033f698e71da0270b4e1ebd76be2195c42422630266ad9cadd2173184706d651c13
+EBUILD aspell-nb-0.50.1.0-r1.ebuild 480 BLAKE2B 13c947a82157e8a462f21c13d60a9b74bdea7d011373bf025a4f9db5e098520bb86766dea5bebaa8ec91de23d0a84c1915a507712301022094d4d18b7cf7379c SHA512 4c2eced3c67e50931d3772d176003b2b8cb1fc2fae648031d4fbb5a44b8b6eefb1be3a3ed57aeb4c7f7043807298e48bf95b00d0ff2f9a77c6926cf10cf6444a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild
new file mode 100644
index 000000000000..04fe85955fe2
--- /dev/null
+++ b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Norwegian Bokmal"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="!app-dicts/aspell-no"
+
+src_prepare() {
+	default
+
+	# Fix QA error '[..] not encoded with the UTF-8 encoding' by renaming file.
+	sed -e 's/bokm'$'\345''l.alias//g' -i Makefile.pre || die
+}
diff --git a/app-dicts/aspell-nb/metadata.xml b/app-dicts/aspell-nb/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-nb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-nds/Manifest b/app-dicts/aspell-nds/Manifest
new file mode 100644
index 000000000000..19c02f7b21ce
--- /dev/null
+++ b/app-dicts/aspell-nds/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-nds-0.01-0.tar.bz2 32658 BLAKE2B dc7325ad51c17683aeb8c3c67ebe26887cbf7459314a961ad90bc6558848bb4c5f701417b119721dbd752fd0374249681bc147074c64db079c7a7bb31688dcfa SHA512 88ef6f6773e8699a5200ff8ae3ef9935fee21958fa35868bc10d37c22b55ea721ad9c59ab4843fdc6fedbf5a9ed10c7ea144548713742b8094b99c3c46a552a5
+EBUILD aspell-nds-0.01.0.ebuild 591 BLAKE2B 8b50879756ee855c284bc3ae2c0600c28fe54a079f9947fb26edea6ee76eef7338c531ab95c63a6fff1c6b7effb22fb681abf140afa84e2e4ea5bf1c7482803f SHA512 1ddf88e90961da1635d69ec1543fafdfd66c16c2274a27c14a8bbdc5677784562efc5ef700715277ee6f01b2282116702a1e44ea6b8e92fa772cdfaa3a85a4c4
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild b/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild
new file mode 100644
index 000000000000..c4ed58449975
--- /dev/null
+++ b/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Lower Saxony Plattdüütsch"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	# Must be renamed, as it triggers otherwise a file collision with app-dicts/aspell-hi.
+	sed -e 's/iso-8859-15/iso-8859-15-nds/g' -i Makefile.pre || die
+	mv iso-8859-15.cmap iso-8859-15-nds.cmap || die
+	mv iso-8859-15.cset iso-8859-15-nds.cset || die
+}
diff --git a/app-dicts/aspell-nds/metadata.xml b/app-dicts/aspell-nds/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-nds/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-nl/Manifest b/app-dicts/aspell-nl/Manifest
index cba457b55c69..65137766d7b7 100644
--- a/app-dicts/aspell-nl/Manifest
+++ b/app-dicts/aspell-nl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-nl-0.50-2.tar.bz2 428365 BLAKE2B 91bd81eb0925994961c8f11b28b74a87ec4dd4d0b03db4f6e4510329f3da9db7d50b93398f3bfbca0a33b67e8ba3871ff868562bc95028b40d8efcae2d995e99 SHA512 bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152
-EBUILD aspell-nl-0.50.2.ebuild 316 BLAKE2B df76d6a7096aad4d70b1c832f2d4ce7218292860d3620ae0c0f040e59200391f47b35f41d925ddcc251aa1bbd0b68fb3561ef282d49203902a81ad52d2c3474c SHA512 bc9cfef928d209a2b420c00ce44048b5b115a1d6b7958febb3c4996f2d98134f7d0be4ca56c0efd2a56e398c14e3ca68adfaf693b24ca948f650ca7fbe11137e
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-nl-0.50.2.ebuild 317 BLAKE2B b212455e393e607c36a96251e4e6941c514cdbbef24932d766b678c979d0fe9c79ae9348d13d75d28f37ea33c1915d47dec274e0bbe06b585acd238e83e2ea25 SHA512 4d2f40edec5d69fbca1880c51bf62132abc521b8c597d74b8652c45a62babce1e1c8b2b12e8fc97788e1d36cd85589521b150355bd13823a705b7a954551a321
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
index 36c34be8a9cd..e516cca10b2a 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Dutch"
+
 inherit aspell-dict-r1
 
 LICENSE="freedist"
diff --git a/app-dicts/aspell-nl/metadata.xml b/app-dicts/aspell-nl/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-nl/metadata.xml
+++ b/app-dicts/aspell-nl/metadata.xml
@@ -1,6 +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/app-dicts/aspell-nn/Manifest b/app-dicts/aspell-nn/Manifest
new file mode 100644
index 000000000000..be4ee65b515c
--- /dev/null
+++ b/app-dicts/aspell-nn/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-nn-0.50.1-1.tar.bz2 335156 BLAKE2B eb5cbb0280dd686ea6990e3b3c78360ac2d3a071d397d002eb15d48e705c9dcc80d951d31cc824361a6158a840ef7f3f8ed1c71e13168d17f97119256b319aa0 SHA512 a4db6fe937a62758f51d713e246f70ea6e0b2726c8ddb23af084925394a2d8168442fccbd74378f4773db121f0d506d848c01573138e974efc79f295f3ebe551
+EBUILD aspell-nn-0.50.1.1.ebuild 284 BLAKE2B d8728323737c56d5c9e20b7fe0930cc1939ab9eaab6661488be26a5940bb7a3cc91adfbfdd48e03ee5c9021513a0a1eee0063028f8fabbd41a3025c94f910878 SHA512 353e457324d994f771ce7328d4bf8963486b6addccfb6ccee0ccc89cb2d7a4e741eecef1a196a725f8084b5630cb836adab58d6655bb7652a0803e82b286b412
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild b/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild
new file mode 100644
index 000000000000..c1cce0ceb4b0
--- /dev/null
+++ b/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Norwegian Nynorsk"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-nn/metadata.xml b/app-dicts/aspell-nn/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-nn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-no/Manifest b/app-dicts/aspell-no/Manifest
index 512af567fa04..073382cc3d4c 100644
--- a/app-dicts/aspell-no/Manifest
+++ b/app-dicts/aspell-no/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-no-0.50-2.tar.bz2 286696 BLAKE2B f5719a12cc3f139c53cd7cc5a9a0ca6841ed12e4ed3c5c000100c7b196dc896c1bf5c5514224f9fa5cf269f65e88e9858b9348db888b77661e51bf6c0e5b35c6 SHA512 b07bf649ffce60a5dfa1e771fa0669d246afcc192155be027ad4db7eaba8e5ebce4456d83cec2100020938cda87d5e194c68039df9d4fa726013de4b6d5f5e4a
-EBUILD aspell-no-0.50.2.ebuild 267 BLAKE2B 1ea6c3aa2bb81041eacaf8fa0aba3628863ae5cc10b708257ba5f2e55d7470e988912712f5266852667f5a049cab3fd06912b4e312e4a4e16de2b0750c1cd925 SHA512 195b4a830818b0b070aa8cb024cac4797fa0277d67092c5e5122f9b67d010c5ed7f4b109620509b915cac4643e56dac92f83382e51c090cb4eba078defddc50e
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-no-0.50.2-r1.ebuild 300 BLAKE2B 0677ed9af0b50be215bd2a6ee53d2dcd12ac45993de22d828dc8a9bf41b7d46598617e98c654c85a55134d4ef0876dc389d63552593e180808c6006beb9df2d7 SHA512 7cbce71ca97d934ffa8e3016c0033f59d4c76ff7293cbb7c10a0250569c37116818e75064952d7f0e4cabacbfa5bda72700cc62b192bc07270ed898eae4c9d8f
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
new file mode 100644
index 000000000000..5c72e9c42a2b
--- /dev/null
+++ b/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Norwegian"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+RDEPEND="!app-dicts/aspell-nb"
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
deleted file mode 100644
index 5aa10d63a5c5..000000000000
--- a/app-dicts/aspell-no/aspell-no-0.50.2.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
-
-ASPELL_LANG="Norwegian"
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-no/metadata.xml b/app-dicts/aspell-no/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-no/metadata.xml
+++ b/app-dicts/aspell-no/metadata.xml
@@ -1,6 +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/app-dicts/aspell-ny/Manifest b/app-dicts/aspell-ny/Manifest
new file mode 100644
index 000000000000..95cc012946bc
--- /dev/null
+++ b/app-dicts/aspell-ny/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-ny-0.01-0.tar.bz2 22952 BLAKE2B 70f0d14e29fed1f3b981113967a9d030ac3539679f64d8ec59d22330956454ff7eadf7d604aac4055de227d0a4f62c49c3bc16195c846c50b3be0cc69bf006f3 SHA512 52f4526d605a2f0577217af1dc8e44da20484fe7f725ceee1f8fdf9ba0fc1457910d55567ea9287465cbf37955af9a11b2caba084cece59aec29755cb147cb05
+EBUILD aspell-ny-0.01.0.ebuild 292 BLAKE2B e829de108392955aadb458cb46c8298ef5ff986b38b1a84db83bdffac95f8226254bcc0fc67c17e92d53dc3e32c613238310eefe4de110726b56ff8bc59c3028 SHA512 2290fa5ac93fc845fa13d11e7d32b43cd373103f8406024f3dafcbedc1b0adbd45cef63b855ca9a2cd9da149b93f7fbdeb0a3d5eca67339518931c1a35c17fd1
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild b/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild
new file mode 100644
index 000000000000..6a996f3d4de0
--- /dev/null
+++ b/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Chichewa"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ny/metadata.xml b/app-dicts/aspell-ny/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ny/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-or/Manifest b/app-dicts/aspell-or/Manifest
new file mode 100644
index 000000000000..b80fe8860a01
--- /dev/null
+++ b/app-dicts/aspell-or/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-or-0.03-1.tar.bz2 20525 BLAKE2B 0dcdb79159566b806a4ad0880a1c999ffcee0337bff203def44407ec0fedd41284905b1f8073004b3d209c852ad3cc3e6f6bde8134bd7008e209bf7c04c96ed8 SHA512 4f5c13e37054266a782cc9d9aa6a03de77ca383907ce05f23ab5812581b815276f4d79a2f8626226f30a59f8ab9ecf0f0186835f7f30881e4a358f99a75b708a
+EBUILD aspell-or-0.03.1.ebuild 289 BLAKE2B e4273d3ec785c15e2eda72958d5c50001c5c791dd703617b19ce507cc6daac5fdc284d0e847456cf595f1abe7c9e389e95fc77f82a23b38c494a9d703e12cff5 SHA512 a4d41f3c97bcaf40e60f409b500c4c7c628fb924a1cda1f1a7e2f142d4b77bf1c0c5b245153d09b12f4dac0a3f3c0621d9a208526c331d7891538c42b1eb2666
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-or/aspell-or-0.03.1.ebuild b/app-dicts/aspell-or/aspell-or-0.03.1.ebuild
new file mode 100644
index 000000000000..7c0efd63f621
--- /dev/null
+++ b/app-dicts/aspell-or/aspell-or-0.03.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Oriya"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-or/metadata.xml b/app-dicts/aspell-or/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-or/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-pa/Manifest b/app-dicts/aspell-pa/Manifest
new file mode 100644
index 000000000000..22ac84b8a80e
--- /dev/null
+++ b/app-dicts/aspell-pa/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-pa-0.01-1.tar.bz2 22143 BLAKE2B 11e03cf0a26b760a1ccd22dd70870c372c564d8292ed7d3e371850e139929f2be2f5e768c70d71c8e91afd9dee637e8c3cff28684edb29f0b57f7e5c08e4ca3b SHA512 6a0d2d7f1b1a935b6ac4b373963e525083d16c26953cce5d7a29d391aaed36f5430d27ea69efe59f081230822830dc4d4143bc155049bb5384580ffd66b5ee61
+EBUILD aspell-pa-0.01.1.ebuild 291 BLAKE2B ef2fb1da52038a913bfce6a37e363e8edde1dc0905ab231af779f33ea90c62571209d5d90c328c76a0ed8e604a82fb01f459dd1d0043303da5df0c4ec31ff5fd SHA512 691b5ae016500a03d7b66ce3abbe2b8f2b36824dcf9af4c3783e11013b55c0031f140f091f327017cb7250c57425d83f7b4138780c074b22bd015a6af2dfbef9
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild b/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild
new file mode 100644
index 000000000000..834ae2543458
--- /dev/null
+++ b/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Punjabi"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-pa/metadata.xml b/app-dicts/aspell-pa/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-pa/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index 54a28030fed6..5006b3e66e68 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,5 +1,5 @@
 DIST sjp-aspell6-pl-6.0_20120418-0.tar.bz2 579320 BLAKE2B d338a7b6cc804604e80cab20cf3b6c6d219377a7c4de4d513626e6b787b8aa32e4ab2a7925ea9bc1d0b224fc6770755e3c6ef3440a34c8adb187352b7e106c06 SHA512 58f6734d035f0b4831a7de48f4f0dc2394206e287cdefec95849a8a46f3bf2303f81228f24b52ace0a4f444cad2f354b30bb3598f3ff1930c17a4d54d808fe9e
 DIST sjp-aspell6-pl-6.0_20210216-0.tar.bz2 640441 BLAKE2B edce2332824cde13897002849d3c241b5aa1d46d1f6f6f67c419a995474999bd270aa32add7647ea521304b32ef6c2283e245b1189683b629ba54b2a6326d011 SHA512 22f2dbfe77a3fa69953215117a5951d4d6f029134295a7fd765339f6574ffbc0f19ff448411992c8876e56069471e2874becd6e57769d7fd40b0e804853e4614
 EBUILD aspell-pl-6.0.20120418.0.ebuild 447 BLAKE2B e4e31010e8f980d1f9690f0d07babea31ac26f7f229a2986065e18ff5be980e8ffc8a5a3ea357116c3a88951ced933554cdde31316eb9a43c1ad69ac10cc30c0 SHA512 74c9bf27e2f996a080212c2555dd59f7e156977b4793ea660b37fb817d8b88129c071a53e33ba9497a9342eca98173904c24f79e53ff221f2ef9c8cffe8a8d76
-EBUILD aspell-pl-6.0.20210216.0.ebuild 500 BLAKE2B 3c11b0a71f0ed698f002e215764adbd2324fee5b538046f59b1c757e8c9ce2d1d5bc4003f5c134bcfe4572a816f134eef7c2d8e6e4d793e3d99136ed42cfb375 SHA512 a8f335ad4dc9601d12c3bce902ff2e0f78e521976bc18d34fce37f8c9b97b59a0533c8ed33081e341ec87cc88e915df8398695c829f7ac39f28d58814b4a0c26
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-pl-6.0.20210216.0.ebuild 501 BLAKE2B 828837f30c331408914a53a9b392b40539092434215ec3926979652cd5f0da41defaa0de7fac247fd1920d38507228fe21e679f861404017f066f56895dfdf08 SHA512 d5236e8904e5aeb9df4460d1cf62872c15d32b4ddfc010175e4f649caaa74517b008ff64bcdb7ebeab9284c390f0fc7b536e839ee9cdebbc520e2b6fcf553cec
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild
index 9f00e1ad73cc..349c0555486d 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Polish"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 HOMEPAGE="https://sjp.pl/slownik/en/"
diff --git a/app-dicts/aspell-pl/metadata.xml b/app-dicts/aspell-pl/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-pl/metadata.xml
+++ b/app-dicts/aspell-pl/metadata.xml
@@ -1,6 +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/app-dicts/aspell-pt-br/Manifest b/app-dicts/aspell-pt-br/Manifest
index b28697338fe1..1611932beda6 100644
--- a/app-dicts/aspell-pt-br/Manifest
+++ b/app-dicts/aspell-pt-br/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-pt_BR-20090702-0.tar.bz2 865676 BLAKE2B dd98250d378b15f321850e88de4a464ffa5e00183fda06990be9132406be268bf5144d4d500836df0e6f1d8f1601d8a38f3ed96ca00f3d9bacb5398dbfa9a945 SHA512 4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1
-EBUILD aspell-pt-br-6.0.20090702.ebuild 474 BLAKE2B 1a013759f89aba4657d4de0fe62de7305a646211a005343c6fa67de8e92ffdac873e511afd3237c90f4fda724c7c9e37696c4351206718ffadde4ecbb68d5f33 SHA512 d1fdd337d4b5475fea9a901516a05d918848acb1513bae871cd0e590c33f419ae832fec92fde1c8e08b161b4571978f1f95786a8536271bf43e2224dafadcd89
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+DIST aspell6-pt_BR-20131030-12-0.tar.bz2 894604 BLAKE2B 5956f471cbd142647a011b62d3459b6ccf2e89528cbeb63cdec2fb5ead4df7f9823f46d16fab11cebcb3787088135cde40ab26eca34636e9d04ef365e17fd1da SHA512 9cb54552d34239202e74ac1e2b7da112dfbecbe0df2da011828178db0b93f74dde9922d33ad18a7b37084e6d37cc7fd16419e30cc63aa46664b0b86fb0e6ee99
+EBUILD aspell-pt-br-20090702.0.ebuild 474 BLAKE2B 1a013759f89aba4657d4de0fe62de7305a646211a005343c6fa67de8e92ffdac873e511afd3237c90f4fda724c7c9e37696c4351206718ffadde4ecbb68d5f33 SHA512 d1fdd337d4b5475fea9a901516a05d918848acb1513bae871cd0e590c33f419ae832fec92fde1c8e08b161b4571978f1f95786a8536271bf43e2224dafadcd89
+EBUILD aspell-pt-br-20131030.12.0.ebuild 587 BLAKE2B 545af3f992d7eaa6830d0382c976c85ba36bb969c22168a01cd7399e9177e1c3ae83ac773e818bf63aefd2835e07f821cc6f820435d2a6e4cbde81e5db115730 SHA512 8be8ec019d575272e90bc92a6c02e398f8609ad0e9530707b952e0365f3518d4c0da3d9d0315e4694f5e7bf51874a8805e1ad58723467cd85d5debd57c7c366d
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild
index 0b69c25e6c3a..0b69c25e6c3a 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild
new file mode 100644
index 000000000000..4ebbe16e5a77
--- /dev/null
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Brazilian Portuguese"
+ASPELL_VERSION=6
+MY_ASPELL_LANG="${PN#*-}"
+MY_ASPELL_SUBLANG="${PN##*-}"
+MY_P="aspell${ASPELL_VERSION}-${MY_ASPELL_LANG/-${PN##*-}/_${MY_ASPELL_SUBLANG^^}}-${PV//./-}"
+
+inherit aspell-dict-r1
+
+SRC_URI="mirror://gnu/${PN%%-*}/dict/${MY_ASPELL_LANG/-${PN##*-}/_${MY_ASPELL_SUBLANG^^}}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-pt-br/metadata.xml b/app-dicts/aspell-pt-br/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-pt-br/metadata.xml
+++ b/app-dicts/aspell-pt-br/metadata.xml
@@ -1,6 +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/app-dicts/aspell-pt/Manifest b/app-dicts/aspell-pt/Manifest
index e30f0cbf2af5..bbee898d15e6 100644
--- a/app-dicts/aspell-pt/Manifest
+++ b/app-dicts/aspell-pt/Manifest
@@ -1,3 +1,5 @@
 DIST aspell-pt-0.50-2.tar.bz2 201341 BLAKE2B ad924c197e7e72ea5be7a8f779fd7b144ac23e69ab6f089c338485c9fc4f5624a814b0f0f85d030647fe22e9390f03b873a05bd1cb26997986c30b5af0b10ef4 SHA512 21f115eae4507ca6e8c726476ba40910886e2ed17161cddbe493b2fe1c55a30703f033f8062eb0b9543d85541aa15e9ecab508cb3bb7403881315ecdb0bc55cd
+DIST aspell6-pt_PT-20190329-1-0.tar.bz2 87497 BLAKE2B 678f33a13e995a13fbce084546c37a5ef331db6a4a8cb1d31386327acf905dca148167c156043d3ba0175cd0b2cfb3f6f724bace10ed8e0a4a4bf194049ec1e6 SHA512 7c7edb79cd46bf4566814dbdef09f9b6d202f183abe5c25fda454e69c57d617948806657ed1da83039b508c1ccdb8a020d694b7119edfce63bae7defeafa1123
 EBUILD aspell-pt-0.50.2-r1.ebuild 437 BLAKE2B f3d061036a42ce086d0482047a3590af9ed45f740b9d345e33dd8942a683c958abd12624ba3b261e5b8990719881f32dccdf21c660c275949941d77cd147342d SHA512 d1439320869508e3981a0d7ff59d58c8687ef3808e1df00e0f2d896692729890341e491fc9feaad8f737c9de542ce23fb4b225cfc65d39903d9a23f4d2397ff8
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-pt-20190329.1.0.ebuild 464 BLAKE2B eafc2a8cdfd0830dc9623782507bec43bade48f530cd68f1eec7a6f263fdef25532fcd3f346d7fae4102863baea120ac96d03711c0160b139c92e607c19377ae SHA512 cf5afd3fcaf6a22fc4e62064d519281ff193fffee1552283254beebdc393ab66466e7912dc4b15fe049bdb87942fc4e5509c48aad85fb62eae1d190a2091d712
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild b/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild
new file mode 100644
index 000000000000..7bc729855547
--- /dev/null
+++ b/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Portuguese"
+ASPELL_VERSION=6
+MY_PN="${PN}_PT"
+MY_P="${MY_PN/aspell/aspell${ASPELL_VERSION}}-${PV//./-}"
+
+inherit aspell-dict-r1
+
+SRC_URI="mirror://gnu/${PN%-*}/dict/${MY_PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-pt/metadata.xml b/app-dicts/aspell-pt/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-pt/metadata.xml
+++ b/app-dicts/aspell-pt/metadata.xml
@@ -1,6 +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/app-dicts/aspell-qu/Manifest b/app-dicts/aspell-qu/Manifest
new file mode 100644
index 000000000000..e612c58575d6
--- /dev/null
+++ b/app-dicts/aspell-qu/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-qu-0.02-0.tar.bz2 85541 BLAKE2B 140bcb997e377707497a33bcfc28d6a726355793d424d68afd4fa62fff0260d5b240ba0bfab5cab3609234d54698b8e0e0336915c96a8463787ca6d4faa1280f SHA512 aac1caea88e9bd896ec5a9a2e7fa4a569626fa5e6f6bf1188614db10ca2b34196b589c496027b3bc562ef9435245e215b428a49e91a8d0eb215801ae8c9bb512
+EBUILD aspell-qu-0.02.0.ebuild 300 BLAKE2B f0b2b4a0744df68f7b19dc7e4d7c52b727627432f808382c0502261de565a7ff6c55ca0a91161d7396ab17834c80fa0e9230a95791ee2ee4bca9ac8a5415e8a3 SHA512 8759c5499d45b01c92bead3f67c9304dfa2a9b90e0a50da75363760efb96b69ed444ff2fd7712cd58d908a7e0e9df13d2a62803fabca0c7eb9583c8709f34fb9
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild b/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild
new file mode 100644
index 000000000000..9f93a20f2a74
--- /dev/null
+++ b/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Quechua Runasimi"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-qu/metadata.xml b/app-dicts/aspell-qu/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-qu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ro/Manifest b/app-dicts/aspell-ro/Manifest
index aa70c31e6ca9..2d51eecc5626 100644
--- a/app-dicts/aspell-ro/Manifest
+++ b/app-dicts/aspell-ro/Manifest
@@ -1,3 +1,5 @@
 DIST aspell5-ro-3.3-2.tar.bz2 444966 BLAKE2B 078a10fd3cdcc0771f48cfcaa606c626328becdb98ad8d53b31d2b08dd32d532caa5edcb1649900e29fddb81d960c35e6b6af74aa8e20b15c2f6dd3bf48b8957 SHA512 0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3
-EBUILD aspell-ro-3.3.2.ebuild 344 BLAKE2B 8151af663859749e08d11dc80da5996c5cdeda4cc52c8524abd164487cf7a7fb79d2d8a58ec3522b235f3331c0290689dbf48de0dd2a342d668780e731500f0e SHA512 4cb150b6b0132759f2de9f1443915a5c13d34d59cc057de36ab79ff83b68f64b52af2028e50c9249a2c4839e8c94f154707d3dc8c0897388ce6f2a14115eac7a
-MISC metadata.xml 268 BLAKE2B 27933e5bd5f8d718e01863bc70782653e5d68b232aa25a43aa120fb813865611a77fd2bbae198923d2fd4026f79a05ed78053d123e2876cfbd07c7668f3c33d0 SHA512 da01c1bf92c39a399a60a20d10a98e01e8e2c84d5d009cb21a9256510940091b579a3114a6accdf3737a2b01b9ae57d7e850835efc498766e0b21be69375ff52
+DIST aspell5-ro-3.3.10.tar.bz2 469446 BLAKE2B f3e12fbed93ec368f6a94b5fc3475f26230d91f2e911c808a99e36be4a446832aaceb7ae203d771810c4978fe19a2eff779e099a0cc8f289abdab5db45deb222 SHA512 c535894d11ee168311a2cc0f799005639b21f3284a2a51db25d513d3e0494cf6d2fb7517bc79bc76f2d9ae89bb43c8bcbac7f451195ee22a7cce361aa09914ba
+EBUILD aspell-ro-3.3.10.ebuild 485 BLAKE2B 06d33fd51f113af047d3e9fe3714e91e8a8c7c5295f69026171c085bfaa2a461757f06abfa965225c28110cf2dd3b45ff1765d1d49e13d4449cc512be6695e7d SHA512 cf4afbb2308d64f2f8f8540df8c7c63c4c069159fa31f8ac0c484840830043ea490c4f454c0cafa87af05bd6a605ff018fb8dc70cfe5940d1ba557c5b72d5102
+EBUILD aspell-ro-3.3.2.ebuild 349 BLAKE2B 7fd6cbc49ebd771d0c3cdfcc4e3ed4df9119949638270f814f8b9f430a54ae1f54653a28383ec97b70d94b99be5cfc4fd8edf0d40468ebc4db70a665a320f497 SHA512 b86f14decfd656a30a0a14ea070e636f61991d4ecf5cab45891e32e78ec007993600f2ff1931a0f2be6fdea6fcaaedaded5fb2b164b14e7378a410b7f8856e4f
+MISC metadata.xml 351 BLAKE2B ba83df8a3789e21b8eff1f9f8c22233ba1ddf3a1e471afe96d12439a061dec1d76dbf123c0a031315763e7b61671296fcc56413143a1938d5aaf0b6076310bb0 SHA512 3b2d60c684191c512f6141b04b89c732c0879ce07695d1768f7e32b6ed3732265a240d3966b938692b7374e92543e0da0bd64709032fd0b9d0e2274c6e89f917
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild
new file mode 100644
index 000000000000..d9f0a01db5ca
--- /dev/null
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Romanian"
+ASPELL_VERSION=5
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="
+	http://aspell.net
+	https://rospell.wordpress.com/
+"
+SRC_URI="mirror://sourceforge/rospell/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
index 4b539a98ae39..6ccbbda2c317 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
@@ -5,9 +5,13 @@ EAPI=7
 
 ASPELL_LANG="Romanian"
 ASPELL_VERSION=5
+
 inherit aspell-dict-r1
 
-HOMEPAGE="http://aspell.net https://rospell.wordpress.com/"
+HOMEPAGE="
+	http://aspell.net
+	https://rospell.wordpress.com/
+"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-ro/metadata.xml b/app-dicts/aspell-ro/metadata.xml
index f219c7749f0c..62f4fcd15caf 100644
--- a/app-dicts/aspell-ro/metadata.xml
+++ b/app-dicts/aspell-ro/metadata.xml
@@ -1,7 +1,10 @@
 <?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/>
 	<upstream>
 		<remote-id type="sourceforge">rospell</remote-id>
diff --git a/app-dicts/aspell-ru/Manifest b/app-dicts/aspell-ru/Manifest
index 7a8ff0397f4a..4f5379183e46 100644
--- a/app-dicts/aspell-ru/Manifest
+++ b/app-dicts/aspell-ru/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-ru-0.99f7-1.tar.bz2 427312 BLAKE2B e039744dff54dbad3dacafd63f5e4874b119b01da57929f403d535958b80b33e90a5429fdcfcc3d2fff2beb0e97e67fa0bd8af03c6a1ca2980d7c7718843c0e6 SHA512 789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430
-EBUILD aspell-ru-0.99.1-r1.ebuild 566 BLAKE2B 9ad8c4179378edddd1f666060ac67183a87c66af35fcd1239d91f56f6d2fd9d96be8d627863841bad3c52c0f79d489ee71e7e6c67d5d1045ee721907f6b3934e SHA512 8f7f104a6769becb8bf7e27f17393c9e254a17c39f5a21085ec33a958a18372a92b73fb46df41b6932ec4ead4455991e73d119079dbd2b25072a6dde58f7dd2f
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-ru-0.99.1-r1.ebuild 573 BLAKE2B a87c5300001979f237d8a979a5866eeaa1d4be16198d547ea2e1a384c4197fcff14fac14228f5a882638ef05f73ca1ea4edff1371aec46d9dc4fe0ff239e8b88 SHA512 0d5ddc7f8352b57ab348f5bc3240c4a169e0b652f07b68c27ccd795ed36a0eac070c60ef7820b5f62a6cd4761c3cf599aab1976a759c4d2490269c9c1b61a994
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
index 3bbe42bf6261..d5e6d7fd61b4 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 ASPELL_LANG="Russian"
 ASPELL_VERSION=6
+MY_PV="$(ver_cut 1-2)f7-$(ver_cut 3)"
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+
 inherit aspell-dict-r1
 
-# very strange filename not supported by the gentoo naming scheme
-MY_P="aspell6-ru-0.99f7-1"
-SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
@@ -18,6 +19,6 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 s
 src_prepare() {
 	default
 
-	einfo "Setting default dictionary to ru-yeyo"
+	# Setting default dictionary to ru-yeyo
 	cp -v ru-yeyo.multi ru.multi || die
 }
diff --git a/app-dicts/aspell-ru/metadata.xml b/app-dicts/aspell-ru/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-ru/metadata.xml
+++ b/app-dicts/aspell-ru/metadata.xml
@@ -1,6 +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/app-dicts/aspell-rw/Manifest b/app-dicts/aspell-rw/Manifest
new file mode 100644
index 000000000000..c6122e30fa7f
--- /dev/null
+++ b/app-dicts/aspell-rw/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-rw-0.50-0.tar.bz2 21821 BLAKE2B 5226159b79ce9a9558f504d1a1a7c61f4c11020b2a9a2542282a79afa6d095f24113d1276bc79d0404bf0d0d907f29db7507c94f2aae1aae60f744f7bb793a9e SHA512 a987fe90b091c5f8d4c28713ad50ca917d2a8fd120df55bd413e3112913cb7e9e8fdc740994aa881bbfdd9ac38fa5ebe728c9e62e25a0e7cc8eac13c2380c56a
+EBUILD aspell-rw-0.50.0.ebuild 278 BLAKE2B c105aef438a3424702b2fdae34113cc04b9bc2fa65ff8faada3aaf7ee914b89b75ce19cbb2b53c179628a493fbd5811f478590047e34ed9955ff34361fcb42db SHA512 e7f5167fa0fb6b5ea3f04f3fbc3b620b51851019b9b8224a7e081d859404b90e6339816822dc30ffa826dbec936f35d5c64e4d8e49151a88d73e009071ff879a
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild b/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild
new file mode 100644
index 000000000000..67a695141f44
--- /dev/null
+++ b/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Kinyarwanda"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-rw/metadata.xml b/app-dicts/aspell-rw/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-rw/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-sc/Manifest b/app-dicts/aspell-sc/Manifest
new file mode 100644
index 000000000000..df8b44167714
--- /dev/null
+++ b/app-dicts/aspell-sc/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-sc-1.0.tar.bz2 281538 BLAKE2B 95b9f5f8508b026a919acabc7f1a6234323ffd462bea0447666831726495a5d3f1b7d52e83887144e275a2d76d2f1cb860537827c2c5e89a83aff2bbef3e0e01 SHA512 3cad49510894645b9bc97bbae877641e64af0440a2abcb6f96197da95390d4dd59d1374008c0ade9dc17772a32c367b9b03e6be65e7f190268365f25069d2a23
+EBUILD aspell-sc-1.0.ebuild 446 BLAKE2B 2b8c02e5294141dfe79cce59c1d34c22b493ba173601c6fe3f51068202d9e8c6f34f1e1947c89076a02754a238fc15bf03d10f46daeb9d0ac69ca009aee0767f SHA512 30c616c8b9c4a6ea888a1d2a0764b089bbb4f9343e2b2741312aac25adf0a0a105e22cf2538e5d9176a1723646f20284f8f57098d4ad36f3567a77dfd418bb54
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sc/aspell-sc-1.0.ebuild b/app-dicts/aspell-sc/aspell-sc-1.0.ebuild
new file mode 100644
index 000000000000..dec05d95f638
--- /dev/null
+++ b/app-dicts/aspell-sc/aspell-sc-1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Sardinian"
+ASPELL_VERSION=5
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-sc/metadata.xml b/app-dicts/aspell-sc/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-sc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-sk/Manifest b/app-dicts/aspell-sk/Manifest
index d9d4c745556b..72242ee34d76 100644
--- a/app-dicts/aspell-sk/Manifest
+++ b/app-dicts/aspell-sk/Manifest
@@ -1,3 +1,5 @@
 DIST aspell6-sk-2.01-2.tar.bz2 338933 BLAKE2B b306850bb72e8bb60dec32853afe6e7cd0796f92730e54ba25c6051c65ba5e53e1d5dcb091866adc3dd90d8013863b419d1c98f4e474f6b29754da326eb5a72f SHA512 020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4
-EBUILD aspell-sk-2.01.2.ebuild 281 BLAKE2B d60a98f07a79d65c7f8c4cf0ce311639173ffad467f4a64cacd65e6f832836adc9d6931f71e5f221f3da80a422b6e9b463048d4cad8eb6b9c1f0b708be6daa4c SHA512 e7e5f9190ba23a4563270e0af695ddb2f8ce1d9bb929183a1fff0683b7f9ba80ea61335052d7cf1570d56b3951fa91f4bda1516372f3ac4666ae071becb07314
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+DIST aspell6-sk-2.02-0.tar.bz2 448396 BLAKE2B 6f6a47e8a1dad0550ac0105868f256229ca37e5686422c138643e16d91d6f62f13dc766db4c69001c88c7fb96e5348da61d95f84c27ff7fcc6b5d17e6b9307e7 SHA512 fcdf5c043168c887f93dfad5b9c6e07d9edd0c6194139e61bee2ba3928798792d8e8b446754bc55a67acc6d333034ebed9655cc3c15ad638f834b5a9efcc63cd
+EBUILD aspell-sk-2.01.2.ebuild 282 BLAKE2B 870723d231ddc2660debb433e9710d57e4d8e3146acfc7689a6839844c0075504b67a2221b0115986028f72637cfcf34618aaea68de18d2bc9e22c68c675ff19 SHA512 a4f55eee8240828e54f4e195dbd05dfac4d813158396dbcc661dea04ace51cc0da07c4cbc1f1266cdb681984bba39fcbbadded3d96b0864a792632f2766cc3b1
+EBUILD aspell-sk-2.02.0.ebuild 509 BLAKE2B de3f8981cf2053a6df922f62c85fd84152b0c4bab3f4554cbf1cea7e34283c07a191d42e22cb94065e989d6fde3a66aa00b39780f386979a0e268c5c17b2e610 SHA512 d1c58178b4f6096eefed9ab3dc0a80e09b35466a0abc3a528d964753654be62c4f9a457df044408a82dae13b0874ecfd3625d8b20397a33ed83311456c6cde9c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
index 616916150fb3..7a82df212dc9 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Slovak"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild b/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild
new file mode 100644
index 000000000000..c9ba850b8ab6
--- /dev/null
+++ b/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Slovak"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://www.sk-spell.sk.cx/aspell-sk"
+SRC_URI="https://spell.linux.sk/file_download/103/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-sk/metadata.xml b/app-dicts/aspell-sk/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-sk/metadata.xml
+++ b/app-dicts/aspell-sk/metadata.xml
@@ -1,6 +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/app-dicts/aspell-sl/Manifest b/app-dicts/aspell-sl/Manifest
index 7da8a19c4ad9..c2784b583014 100644
--- a/app-dicts/aspell-sl/Manifest
+++ b/app-dicts/aspell-sl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sl-0.50-0.tar.bz2 215463 BLAKE2B d3583a18cd10d81a443938e8c1430061ad004c964fe84eb79cd721006eee7ae4c422130d8dbee6cbd588ebbec33fc766a0d19eaaa4fc4b5ef60357b6d96fb188 SHA512 17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f
-EBUILD aspell-sl-0.50.0.ebuild 267 BLAKE2B 93f9e8f668a03bd88121c2631fc25299d3f46a6fd23d39fb16979d036576a642c077225e5b374029f2fa9e4a6e89c8c7bbc07cd5045e0ec49cb7db0051b08e7d SHA512 884ba3e98bb191a46fa7921efbde0b46ec6853970bba625ef31b33706cc29f03d55fb71e90334b9fab704662091f9bb9b9902417745bc24a1aa6c46c1eeb975c
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-sl-0.50.0.ebuild 268 BLAKE2B a06ff9c675a2559406858a61ce493e2048bf25ff5c606a8deee42a31d48ad9f0c0e6feaadd50889e4efdc19a50fdff18178e942fdf332772fdc9025f189deb26 SHA512 407cfec3d7ba56484af21cdebd8162593c0fac66801c4b025b2fc0eb2d7c2b9b9f41a15f6ca16a059124c3701644a1e53d8f77e85669a3b54777a4c04ac9e314
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
index 267fdf85ec11..0597fa9d0216 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Slovenian"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-sl/metadata.xml b/app-dicts/aspell-sl/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-sl/metadata.xml
+++ b/app-dicts/aspell-sl/metadata.xml
@@ -1,6 +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/app-dicts/aspell-sr/Manifest b/app-dicts/aspell-sr/Manifest
index 3199aaa0d76e..d7245ab783c5 100644
--- a/app-dicts/aspell-sr/Manifest
+++ b/app-dicts/aspell-sr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-sr-0.02.tar.bz2 574923 BLAKE2B 3fa85bb2a24716a51c33447fa15fdc833059d49db62f36d7f11dc21baa926c2918c869d5e7052f6d729c038af1aa1e12f47c6476349b6f34989c6fbbbe3ce34c SHA512 3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395
-EBUILD aspell-sr-0.60.ebuild 380 BLAKE2B e42ffd5bbdd38aa83ac1ad98d1390051258066982f2515cad9bb1315a7aebb9b01452035cba09f1e3cb3a6ddc0af755393eb5a77d2c94678f04302b3c6f25f83 SHA512 8b0e976976d18a0ac730da42e929de56b3bb81ad9267c5c2bd06427291fb8d30ade8443df1d0b71c8d439c1646bcffe01a2ffd4d10fd0549b8700598b1c9c729
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-sr-0.02.ebuild 425 BLAKE2B f2247dce1ffd9f243e6847485d73f73219c6735ce23193a331d37e95c1901db6ea31f4e8c4c2c44a5412cc77412fb8067d7e1aef9e92eb2ab354922bc4beb17b SHA512 919f7286b9bc76e440bda9c66ccb6df87e2333c6a9aec5e282840ed492a9bda8ff854e499e4f7d0d8ee89e39616b52e9b6345462019b854b198b771084e4ef0b
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sr/aspell-sr-0.02.ebuild b/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
new file mode 100644
index 000000000000..b5ee316aba6c
--- /dev/null
+++ b/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Serbian"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
deleted file mode 100644
index 1b806d384d57..000000000000
--- a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ASPELL_LANG="Serbian"
-ASPELL_VERSION=6
-inherit aspell-dict-r1
-
-MY_P="aspell6-sr-0.02"
-SRC_URI="http://srpski.org/aspell/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
diff --git a/app-dicts/aspell-sr/metadata.xml b/app-dicts/aspell-sr/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-sr/metadata.xml
+++ b/app-dicts/aspell-sr/metadata.xml
@@ -1,6 +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/app-dicts/aspell-sv/Manifest b/app-dicts/aspell-sv/Manifest
index e013c6b045c4..db9ac7360d49 100644
--- a/app-dicts/aspell-sv/Manifest
+++ b/app-dicts/aspell-sv/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sv-0.51-0.tar.bz2 93942 BLAKE2B d089e13e67849ef5fe51b7c7cae1c8e35e47363358842349118fec3685f987d3e87301942d16f95df914f39d1d7594f2f257596812c20cfaf1e728a2a1d12df8 SHA512 f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c
-EBUILD aspell-sv-0.51.0.ebuild 315 BLAKE2B df57c484d7a2f96ef3ceb37e6cfbda02316b5c0b93c22e243bfe7d62c6af5a137d9ca0c3a73e73e73ae000fecc7723e31a381f396f6afeecd5739aaed06e809a SHA512 596d82f7f40f9c2755cf9c92eab586c06b16cac52d917b00b2771eb5b9f4f11e3f8ec093d9e2c994ff84fa67506271b48c3e22b9e104bea64145489d540c9fc8
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-sv-0.51.0.ebuild 316 BLAKE2B 1ec813d43a392cd062112ebc1fb18803ab1b8590d0403dcfe263c2e734a358f2dac139ce2f9c2c0d04a5b0a537a9e776f5bae4c8f50e1260ebf318dc569a4b8e SHA512 8d18e9a26b725f4d80b93b23af2e9f9c8946010bc36e197238f1bce49c20aace13824df0ca5e46f941e0104895eee8a5f2e1cdc0de9fbbf8050a7767e4af944c
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
index 3b2767252435..adb51067956e 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 ASPELL_LANG="Swedish"
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-sv/metadata.xml b/app-dicts/aspell-sv/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-sv/metadata.xml
+++ b/app-dicts/aspell-sv/metadata.xml
@@ -1,6 +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/app-dicts/aspell-sw/Manifest b/app-dicts/aspell-sw/Manifest
new file mode 100644
index 000000000000..7073d7ed7c5e
--- /dev/null
+++ b/app-dicts/aspell-sw/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-sw-0.50-0.tar.bz2 102172 BLAKE2B 5a91b6e3d1342a2541c8e4ba19d37738195bb0a1424c3b42e4915b84b38c6ec58e2d0e56c0e4d8b3458e443368034c932224aca7d7e4c522eceb24f4afe27839 SHA512 5d89a68c292b45a188f611a14bc355c955810f79c32c7784b2e3ba5a4307b48d572e5a7ca882a344b7635eabe6aa6c2f5d789e9506f3a3f4e69c93fd3675e423
+EBUILD aspell-sw-0.50.0.ebuild 284 BLAKE2B 8a7dc6488d35c6cf2c0836eb3ee8ace4105b4b9a7306b103a97efcc7d1ed86b5eb5940df8c947500ca0c9d83cd2440394e10525c0d83568fedb1326e71fa1d42 SHA512 62fff2312e73a367fdf050eb28f3ce527c954eeb8a43f9e07ebf6a397deca145f1c9f14015e60ca30cca802aa8610ee4862e0e69765104364b4f56c7d405f4fc
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild b/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild
new file mode 100644
index 000000000000..b06b3aad9349
--- /dev/null
+++ b/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Swahili Kiswahili"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-sw/metadata.xml b/app-dicts/aspell-sw/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-sw/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-ta/Manifest b/app-dicts/aspell-ta/Manifest
new file mode 100644
index 000000000000..c816179245c2
--- /dev/null
+++ b/app-dicts/aspell-ta/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-ta-20040424-1.tar.bz2 44452 BLAKE2B e23e6ce6df901e10281e32ee3444bcaabc73b8db1a0b43270ef8cfd5a0611059691601f769ed75252a3a696ca0aee36e94e64bf2e8555253182285f7f3990095 SHA512 8809948f25bf197207c3cbd865bf4c7e73cee552fd1518533d48fcabdc79c95765df253d9ef6c7f904748f24898f04acdeb64800ce9856ced8ccab086ddb664e
+EBUILD aspell-ta-20040424.1.ebuild 289 BLAKE2B 7ef3fde349096e9b85c129f1f9801f25dd454cbafa22554e068cc33f5a234cd2b70b2fccd6d0f927ec5a9a444b7a38b3efbf3fd08388cbeded8aff0b853118c1 SHA512 ccc8fecf2b38da9613c52e3535e5e13052f85be3a79739ae5ed5e34da0af36b2479dcc22b52123f8546aa4f102e6607ada39d2d81c73a964cdb880a9de2299e9
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild b/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild
new file mode 100644
index 000000000000..8a6a0e98455c
--- /dev/null
+++ b/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Tamil"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-ta/metadata.xml b/app-dicts/aspell-ta/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-ta/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-te/Manifest b/app-dicts/aspell-te/Manifest
new file mode 100644
index 000000000000..db195b87f6aa
--- /dev/null
+++ b/app-dicts/aspell-te/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-te-0.01-2.tar.bz2 310738 BLAKE2B 9e568a4d966266d5a0168f68c9dca171cabf3ae611c583e2f5d6047b33b98319d22827931f46d993ce642d53c92a36d3c29fe6bde30ae1764eba7ff312dfb92e SHA512 09566d44de03e3e990f575d8e665bad9079f7bafec2474a6aa4a430a1ff71641dd4989d24bc5ecf3b19ca8c4f61b9365ea792b16f271c89bffaab159e8ed0129
+EBUILD aspell-te-0.01.2.ebuild 290 BLAKE2B c901302caee2f394c71d7fc4210a38bf1be72eb86481b03cb4d85694fdd471cdcae0779e95af37602b242a2bbda556424d97a8226e7084952d37068ebfcd89d6 SHA512 3c797c425855e5d8756d7b5c2093ab35a0a78a4d5ef669d755ac8750cba71d1c3fef4f6c5cc365cf12e6e45ba58e34690ecc1e08836d45b8b809dd8d03422626
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-te/aspell-te-0.01.2.ebuild b/app-dicts/aspell-te/aspell-te-0.01.2.ebuild
new file mode 100644
index 000000000000..e199059c099d
--- /dev/null
+++ b/app-dicts/aspell-te/aspell-te-0.01.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Telugu"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-te/metadata.xml b/app-dicts/aspell-te/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-te/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-tet/Manifest b/app-dicts/aspell-tet/Manifest
new file mode 100644
index 000000000000..d124eefb5c80
--- /dev/null
+++ b/app-dicts/aspell-tet/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-tet-0.1.1.tar.bz2 33044 BLAKE2B 934bf9adf4936bfb18990b3c35ec45bfb9884f2a6a7c9518905fce633b842e7141f7365f9f2d9140d71d17fc24540d32484b8c8e68cf49b2673f770ab171de93 SHA512 6dc691b40cedd054a677197219f97ae5afc21bcf4820bf452d23963ae04a716bf7e38d1cff0eb050e13fd24fd2e8f3b0d24f9b19e7de3868faeca8aa16881802
+EBUILD aspell-tet-0.1.1.ebuild 442 BLAKE2B e55244d51b10648672ffc451132cc3ab347f4e00b1d63669372762df8788f136b733e868bf28d24bdbd9a59a0caa95ab4c377a21b40e2b80f9228fab8a68880e SHA512 483f424e3eb08144e4785cd7b871de91405496a47df50502387838ecbe7e4fd46d3b6702c592382272b0b7755c568a1083cc02e97543d8fff5ce1b3bbf296602
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild b/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild
new file mode 100644
index 000000000000..c1bc7dc3fcda
--- /dev/null
+++ b/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Tetum"
+ASPELL_VERSION=5
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-tet/metadata.xml b/app-dicts/aspell-tet/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-tet/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-tk/Manifest b/app-dicts/aspell-tk/Manifest
new file mode 100644
index 000000000000..0322b77b2156
--- /dev/null
+++ b/app-dicts/aspell-tk/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-tk-0.01-0.tar.bz2 29930 BLAKE2B 0a16ee60fdccba7276d2c33b6a5179ffbfdd3e1f3d4f1a977dea59ef230458b7e90ca622523300800c6c32aac54b53d977fade399a0883ea41a32280c6889a0e SHA512 0a4a0c3be9b9322187677d47f56c091f6c3ae2662b8d6831e9fa2e18720277f76c79e9e0c65ee37474459a19dc5a99519af8492645b241cdc076775afc4a700f
+EBUILD aspell-tk-0.01.0.ebuild 291 BLAKE2B 1e00ae5c2cede3a863421761ecc7d65c6504faf26f7e901a7b9282a6be1bd5802e443a2a1c6eb4a1935a51ae9de82153932926af64014857e881c4d47f718522 SHA512 0418d1da54a02531c545c8c38978ee2e6bd221d119a8472fd5744cd596269ec5cf31afaf48deb553c2decff33294523b8f9ce6682670ef04b4939234f1e2f761
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild b/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild
new file mode 100644
index 000000000000..8c90af16481b
--- /dev/null
+++ b/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Turkmen"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-tk/metadata.xml b/app-dicts/aspell-tk/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-tk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-tl/Manifest b/app-dicts/aspell-tl/Manifest
new file mode 100644
index 000000000000..51c7603bd01f
--- /dev/null
+++ b/app-dicts/aspell-tl/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-tl-0.4-0.tar.bz2 42335 BLAKE2B 381fe2094c2411e50ee151da895109a352b1f7e8d6dd2ede372d81bba07f9bf45b9f6156d27e957287c9e8ad55b2a29db1fb3e4c1ba4f6ae47e3c94a7c2e3a9a SHA512 e9ad3e7e619ed19ffde923a07553c4930c60292a0e5592a68cf0e09d6f6d3b3b7ff74adb8f53e9255528c319c12ef442eff4e3b2ce169156d1664b5d565a7f5a
+EBUILD aspell-tl-0.4.0.ebuild 478 BLAKE2B 88a98e3888345b9ca9ef40302f7dbd68ba51b927a205b95c95b969cd392395eae8bd12bf4b65976b2185553a4200fab5b3c02d79e414a157e829441b22fa9eef SHA512 806822491390aea1e01299fe3955a9504ce809f17af7a37bd8767f06b08444ddc63b73614a6a2a1d63bd03c3e4af6134fc1106968da2be678106d6a0c5403392
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild b/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild
new file mode 100644
index 000000000000..133fae1724de
--- /dev/null
+++ b/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Tagalog"
+ASPELL_VERSION=6
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+
+inherit aspell-dict-r1
+
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-tl/metadata.xml b/app-dicts/aspell-tl/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-tl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-tn/Manifest b/app-dicts/aspell-tn/Manifest
new file mode 100644
index 000000000000..f65a32e1616b
--- /dev/null
+++ b/app-dicts/aspell-tn/Manifest
@@ -0,0 +1,3 @@
+DIST aspell5-tn-1.0.1-0.tar.bz2 22127 BLAKE2B 67f9895e3141a812d490506b95d779e87b0c67d239d51793b3f0f90106d116c0bb2ab94a93a54deddc2e817f0efc764a520489d3ec2bf8f3ecbd36d89f619df2 SHA512 ff3258c3eec392f45b34ba7754bbd6af7ffa0ac812fc1743985fec301755be81387a3e567b36ff145a7a3f9b906e991efde8b4fafc33be14f07a581f4af111dc
+EBUILD aspell-tn-1.0.1.0.ebuild 292 BLAKE2B 2d30126d6c6a9ad40bbccf62d8f217eac9656f20ed54d91bc9f8ed61546a7dea394b9dff170d0e4f8614d30f3e2083ca4992ec7be95f630d3212e9d312eb275d SHA512 b20910eaf0f5a325c7f89cb8322b486f2bb98b5b00b3066ae52b6f038d0057277bf82dcaa9f29bc1aab117a6e77835abf8d85345f61c129b1069667aafa2d635
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild b/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild
new file mode 100644
index 000000000000..df9a86e4d2b8
--- /dev/null
+++ b/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Setswana"
+ASPELL_VERSION=5
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-tn/metadata.xml b/app-dicts/aspell-tn/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-tn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-tr/Manifest b/app-dicts/aspell-tr/Manifest
new file mode 100644
index 000000000000..bbc0826299f8
--- /dev/null
+++ b/app-dicts/aspell-tr/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-tr-0.50-0.tar.bz2 84846 BLAKE2B 2329cfa5f74a1e64c832a53ad3d705971b2642e591fe46882bc0bcfec141a39a9b226f71de523d1720806f27f3dbdc8e039b66e02673f01af7bd9cc1ec2801cd SHA512 0054eef2089a916695b7501676d9cedb1d14defdea76deb01656a6a644b4e646db46470040227814f750e0d69dcc72b1023967eb7924b42ddcefd3d604709059
+EBUILD aspell-tr-0.50.0.ebuild 274 BLAKE2B c8d89b0c38b525bbfe9d27136f2e1eff5ba7599e377a7e00061e8c8e41295197b1382c9e9fa468e2cfd0e53cc8c730bcc56bab62024c9a0258b9ae605e463f60 SHA512 bf939646b176b7f09dfd9ecc3898cd6933bc23c2bfaa4183744fac6a1e13f4694a9de6538233fe3aec73cfe221a471186b4e1d126b5b49fd9d42923f0572ed49
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild b/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild
new file mode 100644
index 000000000000..be6fccb46da5
--- /dev/null
+++ b/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Turkish"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-tr/metadata.xml b/app-dicts/aspell-tr/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-tr/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-uk/Manifest b/app-dicts/aspell-uk/Manifest
index 107c91294d8f..d2c128de53c8 100644
--- a/app-dicts/aspell-uk/Manifest
+++ b/app-dicts/aspell-uk/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-uk-1.4.0-0.tar.bz2 226767 BLAKE2B c91ef5132126b477a827b576005ede885932226659c96192a7a176f36db952c802550939dd659bd1b341442acfbd840a8811202a44f054070e9eb3d31ec8bb0f SHA512 2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799
-EBUILD aspell-uk-1.4.0.0.ebuild 293 BLAKE2B 5b9472cc1dbf37af5847a8cbc6e274d33ee40f9faaef4f871fae50ee3e74b8b163bb296259fc603785d7ac1420082b6b7a1e3d9d0c88dd0c370247cd18e874c6 SHA512 0101f716f0479416ba2b9c429543d84dd8d29090b3703f4fa25afc317616b68d84989b66526ad2c8944e99437cf3e3117b475503aa9750e3563d767817e9b467
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-uk-1.4.0.0.ebuild 294 BLAKE2B 7511e7aa15b2f870f08005fe99390edb69b6481a85dc6c4945ea46226f71b49ee434dc4fdf5184d14fe28b1409a2781a5df78be135eada9ed9cd2dd2051f2784 SHA512 90fd521edcf90d07274110635bac29ca7b02feeaa368070f671d8a356902651dfd0c605e9c0ef1c84b6f7da5ea4b406e57806ee83e94516fda5de8bbdaecb185
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
index db0ac6e9a335..c6c97e09ea5d 100644
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Ukrainian"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-dicts/aspell-uk/metadata.xml b/app-dicts/aspell-uk/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-uk/metadata.xml
+++ b/app-dicts/aspell-uk/metadata.xml
@@ -1,6 +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/app-dicts/aspell-uz/Manifest b/app-dicts/aspell-uz/Manifest
new file mode 100644
index 000000000000..09d4b6738495
--- /dev/null
+++ b/app-dicts/aspell-uz/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-uz-0.6-0.tar.bz2 92354 BLAKE2B da62c6b1485cdb0199f17e3520add0842093ec76c7287314c638c0b4863807ab2bb59983b7bc3a6dedae08a4eadc292706fbde2713546bb8ac06ffdf95c9bb93 SHA512 0542a83c149ad761d8bb964be556bfb2387404fce21e0e38d3c0fa8efef2d1587db0fa80140cf7de72da7f08bbb807ff931a95bb63c2a84771a197f5841e545b
+EBUILD aspell-uz-0.6.0.ebuild 289 BLAKE2B ad2579343dc12d025a6398c65e7a8927eda2ecb94f7f8526a501bd67024483978bf88ca7cf65a1b3b77806a648967a8d8f493f181bcbf4475531ee963033f2c1 SHA512 7098b2505c02e8341b056dff542f49d9cfaa2852d18ede91f1ba475edb34e2e2131c0d1fff085c16dc31f915e7c6e61ee992e049dd3c408b45e408e88d04ba6d
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild b/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild
new file mode 100644
index 000000000000..14e750cc578a
--- /dev/null
+++ b/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Uzbek"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-uz/metadata.xml b/app-dicts/aspell-uz/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-uz/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-vi/Manifest b/app-dicts/aspell-vi/Manifest
index 609d17b4bb77..b79d8fdd6118 100644
--- a/app-dicts/aspell-vi/Manifest
+++ b/app-dicts/aspell-vi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-vi-0.01.1-1.tar.bz2 30843 BLAKE2B 73bc289d65bd76d29bfb1db25ba9e2a8845997e10eea26d98989d7d3b3d8c78715e797ee6a726a02632150b744dbead32392199886e2d4f2732a77e686b9627c SHA512 d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5
-EBUILD aspell-vi-0.01.1.1.ebuild 285 BLAKE2B 53674dc61d84fdf921bf8c33d16a3c1b717075be7b83e0a87fcf81f6abb24788ed32112e1fe6a1c60e2cfa8628f8c12db67726debabd70abec4e1b28b087554e SHA512 ad3884abfef5e4953e2134da561b4d245147d651ff9c69c085e1809ade506c0ec3e2587420ae9fd442028d01e8925a46358f398d8e296d34f36eb00a71ebab80
-MISC metadata.xml 190 BLAKE2B 13f967fa4846571025dce39eabf9e0edf83077a00263bf1d0858c1440fb569714ab4ac83f5292ab20680f15620c94a6d20ce9134314d1a3093f7c4cea86342b2 SHA512 60d247fc066287ff37b6e8f1a4c54f0fd37f01648f80a4c20a3e727b5a9022e328dbfca70657d0bed0324848cf9a4fd8d78b56e6418dbd912e4d52673cb2a5b7
+EBUILD aspell-vi-0.01.1.1.ebuild 286 BLAKE2B 6497cd52a5979b63d30dc955a86bcdf7dac2879eb619660358366f8979ed96b25458ac9e841c31095662f3652c92878e642840b52e7a9f3df2d120096d8ba303 SHA512 52705aff3753c3ae87e574410dab434982b49cd2856004d9011c8f34e9a43f8e28c0470eab6fc825d49271706618dfd549fffc1b32f5051ee7179119e0f1b1a6
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
index 09038de7f958..45b6847219ba 100644
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 ASPELL_LANG="Vietnamese"
 ASPELL_VERSION=6
+
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
diff --git a/app-dicts/aspell-vi/metadata.xml b/app-dicts/aspell-vi/metadata.xml
index 9c1b627475c9..debde3ef6ae3 100644
--- a/app-dicts/aspell-vi/metadata.xml
+++ b/app-dicts/aspell-vi/metadata.xml
@@ -1,6 +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/app-dicts/aspell-wa/Manifest b/app-dicts/aspell-wa/Manifest
new file mode 100644
index 000000000000..20db972b2477
--- /dev/null
+++ b/app-dicts/aspell-wa/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-wa-0.50-0.tar.bz2 50363 BLAKE2B a879745c25d30ed0004f25e95ab4fc7bd48d6e9de3c3c5e1b2880cc96d8b73d144a098bc3c54f748dc052d94daa6a17a3642334731aab019d0a0545230deb946 SHA512 67e8fbb80a2622b921e28a37b978fc998713f7e281beccc921afd8e289ac76094f589e905da2e9386c585fcfae53179ca1e9b24a39c8a021cb3f2685461e3a8c
+EBUILD aspell-wa-0.50.0.ebuild 274 BLAKE2B 24be547caaf8af868a3b560e3a3ba9d288d92c50cf0c101af7da3a6681127c21b67b3e224c30af242c2f4f5b6830e263204b7d14d99836bb7e515b715a6b2038 SHA512 dd0084f86ede3c6854844f2a3897d4ce068b1d303d320134c45b10046cb213331c75d00b8078760ff5d9a917fb97ef0811a17add6ce88080274b260ed5858bf8
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild b/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild
new file mode 100644
index 000000000000..f2f00d56a978
--- /dev/null
+++ b/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Walloon"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-wa/metadata.xml b/app-dicts/aspell-wa/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-wa/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-yi/Manifest b/app-dicts/aspell-yi/Manifest
new file mode 100644
index 000000000000..e84edd036d9c
--- /dev/null
+++ b/app-dicts/aspell-yi/Manifest
@@ -0,0 +1,3 @@
+DIST aspell6-yi-0.01.1-1.tar.bz2 74382 BLAKE2B 18dd228ae9885b3a0928bc340982a96de2079a7a543df1ea0abdc352867e635a532e17eeed4bc7da3f12712315bcf0197f7746b9b707cc7a76307744b8b4c685 SHA512 a8d96ba192e61193469596ce1bf6e808bbb03e3fa3a75e545bdee4b6cfa607b681d0a9631465d004ce6e0e25453af732391e76b134138acc7c28991a3664f346
+EBUILD aspell-yi-0.01.1.1.ebuild 291 BLAKE2B 99ab6490c9192277237a066c0823bef5265d7454d20d9594023548401da6eb0a207267beb89f88a10c4b100693e02d98db3fa4a38197a9515197aeb04ac9a9a2 SHA512 8b496dbee81090332c5b5b6a7fa328712dde5a712b6ff7aef72db897bb817eaea4bcf44710e3a2fccfb49b3a4b62105773d7ac6640129c7739a404638e04aecf
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild b/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild
new file mode 100644
index 000000000000..5c8061a13ff0
--- /dev/null
+++ b/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Yiddish"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-yi/metadata.xml b/app-dicts/aspell-yi/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-yi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/aspell-zu/Manifest b/app-dicts/aspell-zu/Manifest
new file mode 100644
index 000000000000..9a949578c8ca
--- /dev/null
+++ b/app-dicts/aspell-zu/Manifest
@@ -0,0 +1,3 @@
+DIST aspell-zu-0.50-0.tar.bz2 168226 BLAKE2B 9f230588bba4f23c6fd6dfd115f23c8b5d93763103d20c821004fa49dd850b80c8caf678b4361fbd6c50ba77ad619436283334ae53d4e8e96e58088a693b40cf SHA512 c79679a41e8aa1b80532c9eea0cf49c3a4bcdaa00f3d0d9e9f6eb7f4037992e40eaad0af711e5d5c29935afe6d0a2fb1c7b49dfdb2add07526a64cb2efac6ea9
+EBUILD aspell-zu-0.50.0.ebuild 271 BLAKE2B a09e70da446ea2767a5463f9a8cbaab4d38a550ea5a66690e57a86b29b302e4e4b6a73fb660b26b4046da88cc804358b4f8a8d7d6532e07334979f65e4d471c7 SHA512 7f530a80ad2c102dfbddfeb8fff316508b1ffe566572f211819fcc95a0edf3b1985c72e2da5d880310e1767145bd1b8e02f1f638fe1779c2fda74462fe527eca
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild b/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild
new file mode 100644
index 000000000000..bd61b3c8a12c
--- /dev/null
+++ b/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ASPELL_LANG="Zulu"
+
+inherit aspell-dict-r1
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-zu/metadata.xml b/app-dicts/aspell-zu/metadata.xml
new file mode 100644
index 000000000000..debde3ef6ae3
--- /dev/null
+++ b/app-dicts/aspell-zu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/metadata.xml b/app-dicts/metadata.xml
index f5ff4bd53af5..dbdce173efa0 100644
--- a/app-dicts/metadata.xml
+++ b/app-dicts/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria app-dicts zawiera słowniki oraz listy wyrazów.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-dicts/myspell-cy/Manifest b/app-dicts/myspell-cy/Manifest
index c270c869e3a3..89bb29088078 100644
--- a/app-dicts/myspell-cy/Manifest
+++ b/app-dicts/myspell-cy/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-cy-20130708.oxt 691468 BLAKE2B 09476ee1d5c945563957e9115613b4fd8e04018127ec4b1dadb776b23674a87ecaededb2ea3d420ff3ff10639d381bb97fe287ab3fd0474c9c5b505a1eb599d5 SHA512 3faa794d0fb62a3f9545afb9740d217b24357be1769082beb8d3fec54fcf5eee9e7ec5b54a316b10e48135db48406d814bdfa3f0448e3c527772fb4e69f17edd
 EBUILD myspell-cy-20130708.ebuild 647 BLAKE2B 55d17303f65f041ca68f0e6212b5d2952441eba7076ce114c734237febf14f21050acbedb37d21f387e1a7570d1afa877b5f7e21a68f19605cd8ded186b3f01a SHA512 593cbf560fd6c0a7301c1ef1e3fa9dd9787fe7d2825e8bd6357ec313f08a2f5e3e598fe2fda5960f1481efe84fdfec63b7eaea011fabe95b22223d8a8231d544
-MISC metadata.xml 275 BLAKE2B fb515635721fc368b2bcb9bc4ebc9468604d1af41bcc89651285cd0953d8d6d8f837bc09945c6b1902987e1a1d89643d5c2bdf120cf988eff91f38c7c0eca3d0 SHA512 9528efd5818f843010b42320937b33fce21ad9fc7b9026f00fee1e57e2c1722882125dbe0f7604fa7a7e13c65f26d1783aa06e4ca2ba658a7612e5a01d824062
+MISC metadata.xml 275 BLAKE2B 2829766b4d593b62af89cc0b402c886c05cb626a8fa9a09c467c16d775ce450196d4eed1d7b86cebc517f1b94c4333aa16060b59e25c1872c51ff0d8ae85b117 SHA512 eb38b1dda7c3ab8ad61a6a54dbfb1048caed7b12fc89cd5d72a35061b282ed21e4ce496a7eb10e063440bb618064617fc944782e6856ee2d3aaca3877387bf50
diff --git a/app-dicts/myspell-cy/metadata.xml b/app-dicts/myspell-cy/metadata.xml
index cf321fce48f8..df33461f8130 100644
--- a/app-dicts/myspell-cy/metadata.xml
+++ b/app-dicts/myspell-cy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-dicts/myspell-de_1901/Manifest b/app-dicts/myspell-de_1901/Manifest
index bd49941f8228..10d338261877 100644
--- a/app-dicts/myspell-de_1901/Manifest
+++ b/app-dicts/myspell-de_1901/Manifest
@@ -1,3 +1,3 @@
 DIST dict-de_de-1901_oldspell_2016-04-03.oxt 8197279 BLAKE2B 5f930ee3d727ad7e6ce37ca1062a200b09d3a922a446dde201c192842c898e5754b7405cf92dd58f9981bb4445d7223131f30f336a39d1c84001f8a61cd08eca SHA512 af6a353e52505895e4084378d91578956452d7db402a14073e6b2387d7b5377bcf652414bf90e113d976f24e082adf138ba138d54fa321c55bcb2c4d93c83cdc
 EBUILD myspell-de_1901-20160403.ebuild 1278 BLAKE2B b639f8bc63fd688ca74ab20479d03f98a594dda8f592294c841eefdd1bfb919f1a202874ff9fb3278277705cf1d9cdeba8764671679d3d44ac5893a21945cfd2 SHA512 a160ef5850e85fe9675e68245dd5f5f82a6d91d59544534cc3a3e8c8ed4fd2c3df160b997f56de31714d651895fd46b230c7a084dee3109f2108a4f702d51a5e
-MISC metadata.xml 331 BLAKE2B 7146c339320cb586e406169ed88097e083b6c7781c96218f9e2ae1acf71a613c27faaa6fbf17ce083a44882a1158751c0bffc6ed18a98d32747b15c87430bba3 SHA512 811b891beb715e8d37853a62a0875e67275a4de47e9f3dc23e7d6ed15f60c22ae6918d7b92ae534a657cefc2a8b61589e802e966f1cba1c45d897018dcd3d388
+MISC metadata.xml 331 BLAKE2B 077584ccf34071cebf495a2e6f3e5f430cde367835f48c037d7ec8a3849383e3e3c80e4498cddea8b4169f493a7558a77f34b81a769020cc5bc7af174dac8e27 SHA512 3a947dc6c6cd210e7b8c824f4e4cd4cc844e62f614aac7de7194c8300643896458507d44be0783203c86c9bfb610fa7346311b53fc91066a888270398dcd3e69
diff --git a/app-dicts/myspell-de_1901/metadata.xml b/app-dicts/myspell-de_1901/metadata.xml
index c382b032d983..6631bee1bf6a 100644
--- a/app-dicts/myspell-de_1901/metadata.xml
+++ b/app-dicts/myspell-de_1901/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 49ed77e5aa7d..f9a71acc8dd1 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -5,4 +5,4 @@ EBUILD myspell-en-20170101.ebuild 894 BLAKE2B 72ac7b395b11a921c7b8587fb1f4506518
 EBUILD myspell-en-20181101.ebuild 1463 BLAKE2B 958fb152648a957b6a8520b5201e22100dbabbcd435f46fbafcc8c2531aad3b770483ef28dc71c149b27ac63bb1fc6ffac2c220b1ee932fd5ed0fdda5639a1bc SHA512 036cc15972471fc9d5582a6776a62e6dbfa35e533a7bb5f25e9b1c00e54a30cb036e736daaa055d21419f18d49db0a1de8182e4f7fe11399dd14cf86df9360a2
 EBUILD myspell-en-20190101-r1.ebuild 1543 BLAKE2B aa80c2c86f2769ad62705c0a1a5fbe7db2cdd448072aa68f66d85ca731e3deb3cc67b70b0725afd6b97a1bbb5a191015e24a441bf179ba509b67f42a2fbdc4bc SHA512 333ddf8bb48bbd9cc9052175ed86c7ded6a97d584f95d69988155d96c7d52b4aa86628aa452fb4806fd2858f0131dc67133f6f875ce85de64e246be7dbb4c3d6
 EBUILD myspell-en-20190101.ebuild 1462 BLAKE2B 3ff866f6234f137d86096dedbb361ce1576ff18625098b8e55db6766e5135bb26f87d4d04be352ecf9b49350011a1cf53eac3c016fae252b570a4e7fdc67ef47 SHA512 b4cb95cb61f09c5570bbc6fbc45d17dbb3273febba80cc5ee6e5bafebfd647a9cbbd7091f1b0eaefb82fe7f2fb31575267506aa7fb5ff5f3bb2b5f0c70b2303f
-MISC metadata.xml 391 BLAKE2B f70f359e32e0a5841f3fca63ddb6abffe8135b9cafc427da3b12dc7c9fd4809621dd1b7dd73047c2de17d3809c9f371504b1a914012005b398d6b9e251588a70 SHA512 3518a7d697a3299daa2cfe4c13b48aed5eebd8a595674de6c3c79135e832358363fc498ef9d59245e8dfac6b42394d9ee4b2471d84eeddfb45718ea5220760cc
+MISC metadata.xml 421 BLAKE2B fb466302071e1dd8791daf82ab44cd37f896d1c47fb15c300cd08495d7777c6a980be2d765ab3af7b73e1a9813c4fae217486a0c6c72ff584d670ca201b53343 SHA512 6ab94a0265c95d3e55beb4f713add1f5e0da20d65250de3dcaf8b78e43d6b20b8d6b1c79d7c1204d774790423070b7f7056c86c36b08b7ff78b3fe52edb896d9
diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml
index d8e7bc793831..e1602b9df743 100644
--- a/app-dicts/myspell-en/metadata.xml
+++ b/app-dicts/myspell-en/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
index 60529721bd0e..a8f865dba936 100644
--- a/app-dicts/myspell-es/Manifest
+++ b/app-dicts/myspell-es/Manifest
@@ -68,4 +68,4 @@ DIST es_VE-2.6.oxt 1399975 BLAKE2B bfa3f6e06c39bd2359300f58d43a1bda5604a9435143e
 EBUILD myspell-es-0.7.ebuild 1211 BLAKE2B a5462cdc64360c4fef320b6873ccbe27c927d7d6fb606b3c5c32a2ba6589cffa544d137aaf3c115f6310456ca7adc1e269d55f481a571c62120bcb47b889478a SHA512 518b2dee01435704ec21af56fff2bcbb85247c8aed417050695e6fb453a5672ed880d3ead9f74f288c9d8d684282a7c982805d58aac09f5922a91627d764d802
 EBUILD myspell-es-2.3.ebuild 961 BLAKE2B 4614ad6147593563b22fe4bdede658e900adf62b0c74f395bf8509f825782926fbf3015d30b46e50c91b578268fff475868a9791cd956465c600aec909368777 SHA512 15d08c4e97bc495d39165365feb57282f0cf5826c38f5d600e4feb38b34ecf7d15fb4d88c112e156a21bfbf1310f250faadace59cec98f4c539468f551169749
 EBUILD myspell-es-2.6.ebuild 954 BLAKE2B 224e7b1fe8470d9078dcd4de738537fcde54c43992c8b432355884b21f212eca214b889e91562b828999ddff0f591a4d69a072936cdd0fb5bb1aabb5336acd54 SHA512 67e1bb1b3b00836f1ccd1d1d8a21a516e3544a9c8fbe0e18cc695406e4f0b5a7bcde179b4e5a12dc012597ae0aef49b91446736805f31d0efd8b5b25d6f6108d
-MISC metadata.xml 389 BLAKE2B dd51a920937b49bbb82a2302b48a9a5dd53e746ef767601faff423a8196c86b35b98afd392036937f411fefc2288732042689c52557351e7b008cbf68da4d612 SHA512 60a74f98f5a1fb5d925bdba215acad0ca1054f4e0bfba2657789c515dbb9cc90827a93b811ec3f0fe70efa77a4475d3cca4be013f4dd37d8067447e1c80336ce
+MISC metadata.xml 419 BLAKE2B c607bf890c60c3ee1a7c71931856b58533e71d1f94c1f351dd5b7ded3447e4acffa8958f82b319ba86c9f3380101f685d4e1d725d11f341b41b2ec51b81772d0 SHA512 36bb1b720a73de1e7faf9e65bc723531cdcc6e62585c24530e6789380c812ac5bd97fc29d1484a033f5acc29d06cc380d916a25c7007c31ac8c403d5931c9d64
diff --git a/app-dicts/myspell-es/metadata.xml b/app-dicts/myspell-es/metadata.xml
index 66d15882a85b..542379cd34fa 100644
--- a/app-dicts/myspell-es/metadata.xml
+++ b/app-dicts/myspell-es/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>boris2.9@gmail.com</email>
 		<name>Boris Carvajal</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-dicts/myspell-kk/Manifest b/app-dicts/myspell-kk/Manifest
index cb4d6a09f023..c36a88af58a4 100644
--- a/app-dicts/myspell-kk/Manifest
+++ b/app-dicts/myspell-kk/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-kk-1.1.2.tar.gz 310307 BLAKE2B b760b807c1dd6814ac89a8b0aa99cac4c28948e43d389d26627967cadb0de76173e09a53e21c1c96713ef3f4d234a594471b512d4481f2e686fc95259a243cdd SHA512 1373f7af6767a9d81b3fd03207775999eb4be7757ccbe26a849f9b3c47d7dbf0b4e8cfd3e4e6436b45478ab01dc23f7d255c2a9f7100193c6b9b3b0f7935d751
 EBUILD myspell-kk-1.1.2.ebuild 594 BLAKE2B 810d17b2b4267b4e7831c402a78eef32da077602edffd12b5818480b85cc801fe1a1cc122fab5c18cac609c57ae0416a5b79c2b1d09c533c82d3993b696cbbce SHA512 ffa00640182ef05845a6d55fad1285ab09cc0cfb7782aa3ff0158b1e57b3b0e0402d02967dd5b84786905ace88d3d581d43bdda24da89da5cd305a9bf415ca3f
-MISC metadata.xml 473 BLAKE2B 86215b04aba50623a28db38f5bf2e769d7ad1bc0d9f1632d3a2dfc7ec023051ac49ec289092fe13152f95e8c8f3afd632f0d6a121cb6cdbfd53a010fc9ba31c9 SHA512 b8b5861f01bc54270ff95a9ee509c3d13529348124aaae9705ee54fb142231b557da45facce196f67e66d0f29d3008b267f404e27c7795f8905c8d16d28b6213
+MISC metadata.xml 503 BLAKE2B 1042cb39407a3e0af123775d3ccbb06b93c592944fbfefe41563493415f36a3d2d2360273ecba72df668dbe4ee960afa228a644e9090f839d1d85c70c3f25b2d SHA512 a5c1105b96e360230b8ae9b81cd4dae5d4b6850097ab594d022d3e8e98edc7e0e72a400e9e55e77c478d593503b43ba0042f53692d2a6c8f9c435fdfc1f5d52b
diff --git a/app-dicts/myspell-kk/metadata.xml b/app-dicts/myspell-kk/metadata.xml
index fc94deb188fd..e619dc2cfb90 100644
--- a/app-dicts/myspell-kk/metadata.xml
+++ b/app-dicts/myspell-kk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kegalym2@mail.ru</email>
 		<name>Galym Kerimbekov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-dicts/myspell-lt/Manifest b/app-dicts/myspell-lt/Manifest
index 572afc0f672d..1283e5248a18 100644
--- a/app-dicts/myspell-lt/Manifest
+++ b/app-dicts/myspell-lt/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-lt-1.3.zip 339657 BLAKE2B 9549d1968d3b60a2b712360dab35fe696369afbdb34097eb7484ea0497b67becb43592878cec5e64691e0069babc9d56817b4d170dbb1ef092d50de64b076420 SHA512 e18f22efb665e3c4cfe0398bafc9e0626c4322009e4b056f3f5cb074778af851bd463be05c55e1bb0bfbc1a04d06d022a3aa37c89e7efac2aa38b525ab415cf2
 EBUILD myspell-lt-1.3.ebuild 518 BLAKE2B 466c9baf430b5c76af3c16d4f2a2fb0a8033f539fff4c39031f19e89a90037ccd378d4e2b5bc6e9a5a10a9cf7ac07a979024e4bdf2f26ce33fbbd17f6612e392 SHA512 e5374af85ef93e1115211459fd04c80fe0f6835fb162498eb70d1ee02fe590f34b4fd9f3d4dabafcfba93db8140895b63bb52408134d8ddf18ed3057020bbb27
-MISC metadata.xml 268 BLAKE2B 083aaa30c94e0f17e9299fdf34e298ce4b1fb8aa6d4433cbd76f11b5e3ce33c8aa93cb1f9122102b49afd15f9895ebd393ef11f2bc1fb32f764ff099dface85e SHA512 d89875b0b95e75e141d2d201c7d8e9e3e5607e3eca97b2a91692295ffabc8418f66fc17c2d74e571bb0e23bb1b411640e17d66cfbc8fe83ae11fea4402d6d8b4
+MISC metadata.xml 268 BLAKE2B ec7b309e56a6041797db0a6dd553ed0dd586ed2aae7a44f93ff2f9619b51543332264a68f7bf3dbda28541fd4a2cec104e51c16e819bb35590787cf94ef5496a SHA512 b4adc329d161a84535f8d81597feac2982c4c7fb2788026ae60258f809156df0ea7905d701098615bb50dfcb5883cf94383e8fd4535db49c1c27f964540d62ea
diff --git a/app-dicts/myspell-lt/metadata.xml b/app-dicts/myspell-lt/metadata.xml
index 3d9c8240404e..256a3c71c311 100644
--- a/app-dicts/myspell-lt/metadata.xml
+++ b/app-dicts/myspell-lt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index a308f429eec2..b3c90d9e02b8 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -2,4 +2,4 @@ DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
 EBUILD myspell-nl-2.10g-r1.ebuild 1067 BLAKE2B a7934b69aee6428291e82c2ceda1a42662289c6125a59b5bcdcc74d60fbfbdb0d0e442567aeb175edd26b2e57bd040e9c77001d3b20acb17b9f3e396c7b4936b SHA512 adaf8b90fae47a0c7bd8b0fc67e9c0bba1e4f465e927838f5469e9c540282179a9b4c8405bf4263b8e1bcdc40b45ae84b595970c74c50a7b484b7c1c72275b66
 EBUILD myspell-nl-2.10g-r2.ebuild 1844 BLAKE2B e80e7c47ed46f542c16fe9ba72d9c9650608e9331c9fc4b2666ce168b1e71d4e94a923834e405ff23f83ffb48de6452bf9519cd8914c624b98cc1e9ae076a386 SHA512 aec913b8e369306216b7525e38cca90c7d034e3fc22b075400c7872b1d548c437515a75778f1c76771fa109f74a271b54af3e94ee1f9249e0e3abff78e5b22f2
-MISC metadata.xml 425 BLAKE2B 51fc2411cb4971be12fe164f74953e92c7e910b793ca8afd537f28d13ec4275ecc33d812f92e393632047354cc4c23aa8d623587d566e0c9f703eb5fdebe7d1d SHA512 1a22f6043ef3d96790c6f269a2cefaf38b5cb6a6c16ff1b17f56df948735f943aab198524aa28b2f5c7537c4556c87f39fb385564bd92ae2644d1177cef231e0
+MISC metadata.xml 455 BLAKE2B 4391a8332e57a57343b8c26ef2c6ef36c221fe164909add57c440d3297b0bbc6189765ad256d195a9d9271aead90aac16d8ed76829a03158bd672815f36df8a4 SHA512 7516598d8398aa62d977aede464be3c3d3080c79bb67267f50a9ea669f8f39601a70df42c53e2b7f7f07d70ffeebcc33388c9d02d10906c78d79a5842a47b545
diff --git a/app-dicts/myspell-nl/metadata.xml b/app-dicts/myspell-nl/metadata.xml
index 581558a60944..7858c6cae07b 100644
--- a/app-dicts/myspell-nl/metadata.xml
+++ b/app-dicts/myspell-nl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>wimmuskee@gmail.com</email>
         <name>Wim Muskee</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index f90c88a631d1..416b6203aa3d 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -2,4 +2,4 @@ DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916
 DIST dict_pack_ru-aot-0-4-3.oxt 1393032 BLAKE2B 8fa0587ae31a155631f799dc7c0214cab0f6c58a059d6948c540061afd7111eee26c18cc638a560928201ff718a638178cebcbd1b7eb17e65b45709217b47332 SHA512 17c0f4d75c397014e3fcb653c8e20d907d9acb2594ba9e43986312d1081f46638a0e3737cb1bf3932d602342f53add26f02efc4edb7e24dd29522aba901f240a
 EBUILD myspell-ru-20150711-r2.ebuild 826 BLAKE2B ec9c115a9cf016238bd0d2a53ed3a28af36d66d8439c7f79a769f267a40b65cfffad0a51f108e6ca5dba6fbec72002e7849cf5be32028a92ab3fb249e4066e74 SHA512 7f84b305b044091628c6f6a6ed11152c8c68b184b4ece332ca66987ee74ba4882dec292807ce644ab4e5506d0c034b7d1d0f1a176550a7d613533892c6b834dc
 EBUILD myspell-ru-20180627.ebuild 837 BLAKE2B b333218c4f86160ad22dc78d787a5770b3cb4d92a1c56a198e695d5bfc8df45829289e40675e7f14959c42b1b00337f6a9f3577487f4b1474c1f794f3de1b534 SHA512 70a2528d36d7052ad6be509355bc49c176eaad10448cc654ec6c08244ec48dc66a90e13889fd6a86035336dbc44ae11125a37faadb7b29c235b4bb6bfc2de47f
-MISC metadata.xml 403 BLAKE2B 3d0f8895c8cb06710773234b09b40b76aca0604eff4c639e9b414e168eb2457da5f5bf61511fa42febf0e9a71d2caaef4df2acf08c15ca4022ca04d67f1b451e SHA512 758159e0e3d3b1318a1be3b1be19f5ed7e34a58499a4ae2fcfd6176fef106a3c8601490bf1ddfad3ed565ad486678642d54aa8b6f37c5733cc30c74e6077101d
+MISC metadata.xml 433 BLAKE2B 050e393f89b53c4dfd87f189e1dc53613aeab46280d70b11acf4ec6435ae6a64c83671ad02d68000f581eaaa17c2059418d71ffd437952848d9b8d2417d39da2 SHA512 725b9c110335ed4018853adfd6902d52eebd2e7774b0dc17e91748dc0c08e31a4beb15047ebfbd01153ff7a1b6b0f04e6717ff82d22a9e6150655dc619c03c75
diff --git a/app-dicts/myspell-ru/metadata.xml b/app-dicts/myspell-ru/metadata.xml
index 862f13bed88f..7ce268b41d0d 100644
--- a/app-dicts/myspell-ru/metadata.xml
+++ b/app-dicts/myspell-ru/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perfect007gentleman@gmail.com</email>
 		<name>Perfect Gentleman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 6a9bd97ab5b3..88fa52905fd1 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -8,4 +8,4 @@ DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def
 EBUILD wordnet-3.0-r4.ebuild 2102 BLAKE2B ffbad9b621e22d6eac0222ee0e9f9eb71b775ea6916c38b1b44e6257d4c08ec396692304e62ee5a40ec02de0a7b086e5faffeab1a33cbf25627de1017a740f25 SHA512 23a1bffeb3294743b1fca001fe68f07f0be2af4303d9bc9a60202401940c0d7c61691050a574045bba9543b67df0a4810d835b8b0b73206cf1fe2b9647fe6d0f
 EBUILD wordnet-3.0-r5.ebuild 2152 BLAKE2B 46f2d2f22ef3b05c044cb16cf9a391ced71836b5b60f4bded033a73d548974c91d00a2561c6040406a5f3289069878505d4b24b53971e6ce968a871b3c9a7271 SHA512 b4d7e2004c58b6c1bc8a8a45b2f3680fe7dd6af9d5786ea9c999f1b44909ab13b2893fdcd80a22bef908685fd6a6bcdc43b4f6e22f2e41069dcec97850416388
 EBUILD wordnet-3.1.ebuild 2774 BLAKE2B 2ec281f73bde952247f3f4a3f9733d2d1c1d9fb0b327531bf94c6806078c30e3d2c35a141ee2106ee66dcd749e76141a9e188fdfad2aa4f0814a0d7f2a5d0720 SHA512 2f7caf8f2658d95f3571bd0c1b47f27a864e96803f5a07635f195b257eeb30de9bb92e90049708aaa6b98ea453c54461c9b1028251cc32b90905d18277ca6496
-MISC metadata.xml 358 BLAKE2B 11b80740d0327acc1dc7c94c2492cf25fa6941014d2c352af5e744036f30f386b9549c5773036708738b774830a22ed5a972e3d88de99dab4777cc46727945ce SHA512 1f57e2d03f71e806f11f7a8e5e667fb2d7255b2af6fd17bf6b095e4f6502cc9f0ff16ef1fb7febd93c98ac52f7a3b6857c0fe1772bb5dd269b455d6db2fa125b
+MISC metadata.xml 388 BLAKE2B d6cba93eb9d36cfc60fb707b6222e8b28e0557b5ec311c885dd9953079c682d336e7ad794d5ea3a8394721fd05e0980d0aad89758231523dabe60aaee93f297c SHA512 835c99077d1b216ce835bbfffab8da4f47ab9022257e412a986429b3151f119839fd0f8f0008d880d1e594285c585282d62b56af78dd18941052447104f01288
diff --git a/app-dicts/wordnet/metadata.xml b/app-dicts/wordnet/metadata.xml
index c40afbd5319c..9a5468172b67 100644
--- a/app-dicts/wordnet/metadata.xml
+++ b/app-dicts/wordnet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>chocopuff298@gmail.com</email>
 	<name>Ethan Kiang</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 65ef802b48f8..f2a4da8843c6 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cantera-docs/Manifest b/app-doc/cantera-docs/Manifest
index f890727d4b44..3fdd1d9aea5d 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -2,4 +2,4 @@ DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f
 DIST cantera-docs-2.5.1.tar.xz 4916296 BLAKE2B eb3da9f1258f6ee71d8a886c916b7c53c886078a0cf92bb407b6ddde28da659e9bb9195809a65ffdf20a49cee107e1a6503a381b52cc58a36fe750bd7edc6d72 SHA512 3e7cac6bc5ef8c8721f4fa4aa34ba9a3291a8bb9919801df22d080a4a45158e9388d2e4b19f0b133fbf9e9a1810d3ef53d12aae032caed5bfe593bc3054de939
 EBUILD cantera-docs-2.4.0.ebuild 831 BLAKE2B d9a095ee817e46ea3c6d150d602d693971d519edb07936802c4253668393658cf76ba49eeb983442829cbcce3e69e28187814ce031caab581033a8ab74fe238e SHA512 5028e20ed26a2620895ec0ab97aaf3fc26f4998254b7714c0eed259fd1b41d10d3a50114f56d0af8de7973bb8a56e9b6159da8b85e3181736f0f411ec238d74f
 EBUILD cantera-docs-2.5.1.ebuild 799 BLAKE2B fd5848748292bb69b0d239104ee5c09ca6a562acef23de5679b540da4533d8cd4e844d41a103b0d26668322dba0044a6dc814ff24bdf5a0c43f1e91b28d93a4b SHA512 f5e8939cedb4ef879d4ce7c925270d41b6bbe0148cda57a03343381d6f35dc83f245f2ebd611762e172320e3347e65cce7e4d7a631385be5062b3b5e51d1d42a
-MISC metadata.xml 583 BLAKE2B cde679aa49edfcb0bfa4e7c3200c06a20e4640310a2762ffe7bdabbdecfe4967b8ae548041470b26910dc34508a414fd259d9d6d1a604c1e7c192b9f31c65418 SHA512 e425291954b8c6475ad3ba6f5b2b0e3eaf47d1e3745ae0e847c11f84634f2c04eeb82e660d72cee9c326353bddd93b55d0d9bbbf84601c2f10e7d60863d243d6
+MISC metadata.xml 613 BLAKE2B 0f39e26b066271d192f226d50ce5ce19f1937662581dce8e0f9582615e14af5a62b46737a56be375adca579c4d79b069311d61f9d9ff7a2703ba04c94b5f53a5 SHA512 a185ec9416cf25bcd960988157266d9feecaf2bff97fd39765b1d4fef6d362a591cc434072acb03a03b15a0e5722c8185a63cfcb30cdddb617d7fbcf37a8b52c
diff --git a/app-doc/cantera-docs/metadata.xml b/app-doc/cantera-docs/metadata.xml
index f1f309bd141b..a702938dbc06 100644
--- a/app-doc/cantera-docs/metadata.xml
+++ b/app-doc/cantera-docs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index 82eec98f1831..c1aa167dbc4b 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
-MISC metadata.xml 247 BLAKE2B 8da6363de18a0eb4c29efee8c35de35970668cf0107b011b7e885c8d151b7cbd90709f000548025593f2ed5b4bc2d512de53c0285805fec978b363536ccf1ec4 SHA512 a788f5e022a740fafc174856c3fcda9b4c43908303427ecb48deb2198b5c01f1103bcf4965d950e3f981be4036173f9e968e431c49d3df96061f24cdc202edbc
+MISC metadata.xml 247 BLAKE2B 148c9e33fb017ba732238f97b907dea241253a0c2269768c46e97f10986c070bf0e92e245ec191eefd3be9fd9f1136f22ed4fb25ed34e2bc021eb85753bff0fb SHA512 a7441e08046bb46527b0a4dfe0d80884f4c126a75ecb8ff6fe429988022f8cec46dc216cda1373d57132f86532b1289ad8db0696e962d4fdae1abffc2a38e18c
diff --git a/app-doc/cppman/metadata.xml b/app-doc/cppman/metadata.xml
index 427bd08b7959..d2233d573291 100644
--- a/app-doc/cppman/metadata.xml
+++ b/app-doc/cppman/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 357b573ffde4..4c4a3d1ac217 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -3,4 +3,4 @@ DIST Csound6.15.0_manual-fr_pdf.zip 9761787 BLAKE2B 671d94bebbabbead16ff251c88a9
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 EBUILD csound-manual-6.15-r1.ebuild 1628 BLAKE2B abca47160974a800e828817a5a2633c179cb9ece054405849f498602b4f54432f1675cf15cdd1f3a81efe6885c1b4979a7b8286cec26d258614e04b2e6bd23d7 SHA512 d75154686ef98be6c52ea10fe1df6ef89ed59de8db52e2055b86e22a98df1b0f23f4830763e95125f48d92b4264900fea4d6082601512ee66efaa9c1a7209037
-MISC metadata.xml 457 BLAKE2B 9cd43383f76b6c6343bd35e014b4d47d7ce84993c06423a4ece92c0dadd34c55b2ca8cc1487c6f809eb6294cf2ae45a8b66f4a41cc32f81a3aee24457f2d4ccf SHA512 3c5fae5f35af69eeb1b3da8aa3bc6995dc4af3c582843e9b86691a68e0e084382a64a47651596f8f04714c41f7004ea1c0fef1765d334ae0dbbb1569d74daae4
+MISC metadata.xml 457 BLAKE2B e435f21c93a42188d38ceedb4ed2dda795021393c4a03c5d5ef020f31b853a45117e5ae2e9080013cff833b3648f8992fbf44b162d84856286a5d057a91fd334 SHA512 d6cb43f4d0d9485ca457ea2463adfe1ab6f480e3065b986e0c6959c9d29d4fb57122116532118a9e98b4189f1fbd3fef5df5b035e1f7050b3992d98613027908
diff --git a/app-doc/csound-manual/metadata.xml b/app-doc/csound-manual/metadata.xml
index 87c2817d034d..864924733e6e 100644
--- a/app-doc/csound-manual/metadata.xml
+++ b/app-doc/csound-manual/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 8dc6ab7b8d88..7782a6383c51 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -9,6 +9,6 @@ DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7e
 DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
 EBUILD doxygen-1.8.17-r1.ebuild 3269 BLAKE2B 4f7151b49875cd69c188af0d1e5275f2d3677f7c49fc022b16b711c86eca4d129376285a9e495a9153b174e3c485f8fec552fd377961bee4ae970f913dd3567e SHA512 530f512d42bbd9fce992dac25985c4274faeb61036d736a53f9ec9dd5da7162859d3f6323317b5d125e840a65295766c6042de086ae275606dbf3c15908d93b8
 EBUILD doxygen-1.8.20.ebuild 3181 BLAKE2B 659f55bc117b30d994c286237be9d3d22fcc27f33c9e4de50e4cc788fa547ac7a1fd69414e6794c5fb4479019724713ddb0316b6786832bdb1d19dcd644fcab1 SHA512 62a4916a83d7b15da4ebe478d30ab62b89eeb75d45fc83b55798692530e16c76ed92d2f1baad67fcd668f7acdcfd86216cd26bdafdadf114276257263e378090
-EBUILD doxygen-1.9.1.ebuild 3145 BLAKE2B 81235e27a07e6feb39de29c740383aef5c899c71aaf2eedaf2d27a58d4598d69486bf8f963fc2b45e525a8a234bec6bab45d155058b262fd8071d00670e47c69 SHA512 619eb30fcc6cf7d351aedcc277838c52cb3361817738bdac14099414f3d0bb710b0ce33a5df7b760ae63b47dd1d201381149f78af9f57aa68368ccf251978c07
+EBUILD doxygen-1.9.1.ebuild 3172 BLAKE2B b0c9c4a4a46d059e5048098e914eb00fc14613fed4f606c8a50a140fa487a2a0f9e17d88ee82efb234f934ee3807b5bd5479791a1b4d8ca4aa10e2905916a951 SHA512 cc3e359f8e77bbfef8d4caa76ab5fe2ad2661c3e7a631c49e4c67282b8a5a02152d8512e7f4e9ab29aaec7f9ae8c403b6e2751c5e82580321d292e4f3103b197
 EBUILD doxygen-9999.ebuild 3148 BLAKE2B 2e18a22b8d7797de67d9f459d976d331dc1aa80d1b5dcc43c35d3dfe1c9764e4f846790dd7e1c78c0f8dde10734e891b9a6458a6cecbede7cfe53e4d90d957db SHA512 234c66cdd23e530383d6a5e6c4281d178cbb9e02164a4984a50ba0b11f571f033719e34435327ea8b7ad33f85097b54de39794b5b3f2fcad4fe3249f2984556c
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index 98132f677430..da4210e23684 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~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="Documentation system for most programming languages"
@@ -117,6 +117,8 @@ src_configure() {
 }
 
 src_compile() {
+	cmake_src_compile
+
 	if use doc; then
 		export VARTEXFONTS="${T}/fonts" # bug #564944
 
@@ -126,10 +128,9 @@ src_compile() {
 				|| die "disabling dot failed"
 		fi
 
-		cmake_src_compile docs
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
 	fi
-
-	cmake_src_compile
 }
 
 src_install() {
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 32f917aa28ac..d3d1c6587124 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,4 +1,4 @@
 AUX gimp-help-2.10.0-python3.patch 13294 BLAKE2B 86ed2514e95210986e9d108e908abbf89354e3ff2ef314ad4409e42804b59728cac8f4b8eab3d1d431aaf3fc4745774fbf405ebad80c235b69e3583e47132b38 SHA512 b1932670247c793c8bd9c70045fb3f568ff99c964f2bc8ca1e7971f510512b7e476ced5c79b0bbd4e6966c9caf5c75f436926772b36996f5cf3d9e80bcc7ad76
 DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
 EBUILD gimp-help-2.10.0-r1.ebuild 810 BLAKE2B 8a2e95aabcc9696fceab900f26a4bf3d5baa2d7e3578fb5cd3de47408bf251eb125ea8f08d413fbcaca4998f82ebc6c9f17018d5d3eb5bbaf6dc360cc3053059 SHA512 803be7fd25adf04effc0ac7986dd6f09687a1c70cb3a8a0d32776c879af13e73bad94d258a7a3b856efc698514f86e3732d6c5852f5d61e70a5420106689fd2c
-MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
+MISC metadata.xml 400 BLAKE2B c5653da1c91643fe976b5205210a2636b060ee941b6a766350231bea4bdc0fd2721fec6e72b381905dbd6470a3c72f32661d00eb53837afe358d62cf96b8df24 SHA512 fd1ee3b3dedb0ebff804feb04c144350c6a9da8edae2238b846132d21b8916ce8850d15c6063da2bcc2b97a8faaeda96b1738ca485f0ab22937cc8a80ebc5f46
diff --git a/app-doc/gimp-help/metadata.xml b/app-doc/gimp-help/metadata.xml
index e7e7a5da0ad0..b1e6755fbab9 100644
--- a/app-doc/gimp-help/metadata.xml
+++ b/app-doc/gimp-help/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 146a3fc3ae44..1fb94957feb4 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,9 +1,3 @@
-DIST kicad-doc-5.1.6.tar.bz2 74202367 BLAKE2B b4d4ff704bf59c7663469f5c4a314a44f1762f8ae5a9fb3abb1a2e8eb54c5dd843f3d095d7e60d0ae541d9e51241fa35ae28c56a495cd0c7e0874d5b1a473296 SHA512 6fae707154aa662689c5da03696d30ebc7442a6d2706cb14d470e91675d0f77c3eb9dd716d29b1eccde5cb0ff39a582a497be2d65d5e34e40defe2fdf97093e0
-DIST kicad-doc-5.1.7.tar.bz2 74202031 BLAKE2B caa6f6403fe984230cbb1d0b0a75355621f9e371976774e66aac2216994249397082ef8699f0adced0696344a256edd5d47c42ce8d789ebf624d702008f0600a SHA512 72dcfdf3d943dc73bb4f30c9dc9f0cfe7a0c3f8749a04b04624c47e2b69f6be29627e2768d008980ae9ac691aa56c97529edc15741c72e261e4c2c6f3e7b32b4
-DIST kicad-doc-5.1.8.tar.bz2 74199662 BLAKE2B f1077202a5a5c263f5cb8bf00f4f33ab0515e5abe15ab18bc21de742d6c4e0eafa5e3b1eb9cd12d45446b7a47654c44a67ec980af8ce0ed5d7f3261628c91f24 SHA512 763951f91b3a86d940fc508fc20846752bd2c7a4520e820e37708feb0054993d84a365df5abe10b5c26799479754ca19366456f3eba2ff3ee6acee34908dd699
 DIST kicad-doc-5.1.9.tar.bz2 74200779 BLAKE2B 9bca24edd9b73a2a532740538dd253a445e8acd1fa56179173be5f231be9781dfd63451e5ad1b4ebe8f676101f0db838f7acc032a5e0b0b21a073332e4978f6b SHA512 5c587fa7fe9611e76537efd8e6a1fc38ce299d1d5a974f27986925c5b6867287b5cd8350d53978e03ea5cff7c2782c1a0c12a5bc64c230973234cf2481a93f71
-EBUILD kicad-doc-5.1.6.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
-EBUILD kicad-doc-5.1.7.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
-EBUILD kicad-doc-5.1.8.ebuild 1426 BLAKE2B b0f8b7f6fd8b6bea2d4abd1d3e78e5dc42ee84dfeacedb930b72e8414e39da9ec1f4944af15b04cad590dbca7a75054097fa4bd3190dbecaa19b67e11a9370ee SHA512 74f3d5a215dd2e718316261803fdb574c9766e2239e9bb55a7199e6c2b2847245c094a995c3f73164a9d51cd689ae591fb25de0f8661e9d6b42ec1e51565524e
 EBUILD kicad-doc-5.1.9.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
-MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
+MISC metadata.xml 851 BLAKE2B ccb27060634024b293cbbd1ee34d774b158d3d21e32f7b36d69c25422181d29d1d5a2de3e9b88f898314290e48bc381fd20d4c042a100d2047ce3d5e7cb36901 SHA512 f48e3e651a0810eddf6c990e4510e86fdca9ff2bc1d58b2df2169449259e8f57f54870d0f3461e8dc66b1ad38dc55c9e7d1493c2b4a73813c21c7b80972d16bb
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
deleted file mode 100644
index 1578ee1b2ef6..000000000000
--- a/app-doc/kicad-doc/kicad-doc-5.1.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=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="https://docs.kicad-pcb.org/"
-SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html +pdf"
-LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
-IUSE+=${LANG_USE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
-unset LANG_USE
-
-BDEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ru? ( dev-texlive/texlive-langcyrillic )
-	l10n_zh? ( dev-texlive/texlive-langchinese )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
-	)
-	cmake_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
deleted file mode 100644
index 1578ee1b2ef6..000000000000
--- a/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="https://docs.kicad-pcb.org/"
-SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html +pdf"
-LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
-IUSE+=${LANG_USE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
-unset LANG_USE
-
-BDEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ru? ( dev-texlive/texlive-langcyrillic )
-	l10n_zh? ( dev-texlive/texlive-langchinese )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
-	)
-	cmake_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
deleted file mode 100644
index 973e10fb41bc..000000000000
--- a/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="https://docs.kicad.org/"
-SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html +pdf"
-
-LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
-IUSE+=${LANG_USE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
-unset LANG_USE
-
-BDEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ru? ( dev-texlive/texlive-langcyrillic )
-	l10n_zh? ( dev-texlive/texlive-langchinese )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
-	)
-	cmake_src_configure
-}
diff --git a/app-doc/kicad-doc/metadata.xml b/app-doc/kicad-doc/metadata.xml
index cb3f935cf54b..c1c19863aaf2 100644
--- a/app-doc/kicad-doc/metadata.xml
+++ b/app-doc/kicad-doc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-doc/metadata.xml b/app-doc/metadata.xml
index 13a90bebfaac..570e14dd979b 100644
--- a/app-doc/metadata.xml
+++ b/app-doc/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria app-doc zawiera pakiety z rozmaitą dodatkową dokumentacją.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-doc/selflinux/Manifest b/app-doc/selflinux/Manifest
index 60cc0c179bc9..92254d564b8e 100644
--- a/app-doc/selflinux/Manifest
+++ b/app-doc/selflinux/Manifest
@@ -1,4 +1,4 @@
 DIST SelfLinux-0.13.0-html.tar.gz 7379682 BLAKE2B 5baf00233fd69c3d115adef28c0644d0d4e563014c82649d7e4c906189a36543bd30528ea901f8b2b7c849721b220eeccc3787f67b016ca7161515e23fa8871c SHA512 bb7f16006863f958dd24c8f82db5e4538f00fc66f1b2efe7c52ed28d241fdcfdd366e973c91b730118ff485c2343f5a0fac293f080f0d6e86d24fca4beaaab72
 EBUILD selflinux-0.13.0-r1.ebuild 629 BLAKE2B cbc7e1c8e1d514a138a34924df8fb9e1ccab9bdaa382a759496c24ef7a33e15a04ea8f82e4059f8e9b18e2e5097c8112a5273270193ebe2ee8738075fcd65b4f SHA512 e55a7541412eb707b35bf192ee19775c01307b3798b35805131dc230ae02653bcab6a6a603a77a1928eaa10e0dfd570072461cf8d4b2dd76588f917ab3b7b918
 EBUILD selflinux-0.13.0.ebuild 417 BLAKE2B bb6cde83ebdfc3792083e5ecea696e429cddacdf46e52ebbc96d9f10373d6fce175c4eceb1c2104620c2baf7a70d13efc74f8521a4997c2f91dfcc7c1494e9c5 SHA512 bb9091b568dafce84f17abcb47ae4866f834b63d6b42c7ac717a68b6387c95129ffba1c9414f715158b2c161bf2ef7a9e70ee6c83747b5e512514aca0e3773d9
-MISC metadata.xml 271 BLAKE2B a8d9d6041b4afe28ccb400071d5c845e4020855f8a27e52e78c608f081fc421c5b2009197d6b84a06941e8bcde6f363f05a562b75908477bcfcfec440f1fb6b2 SHA512 8a67820f553d2c7098aeeb03d712e949d3473120f64f1cc2c7209fbff7539e6ba74d9a5ff9b565814881c790677d56b1bfce53666e38c63627e97311e19aef13
+MISC metadata.xml 270 BLAKE2B 9948dbd05e664315ac11842827c04e5b53bd4a1b773f119a1a9ce99aaf0d9be1795b064b10ef28bf6e5d3ecc2615fb8768e06aae866025e673fe326ea72ae624 SHA512 bb6ff3e49ce5fff927116af4f4676901362fba263d12bfeb04533a209ed743720feac7942fbe4f3ab367c7c07d6142a238cae7e16dbc8722ffbf126cf5fd169f
diff --git a/app-doc/selflinux/metadata.xml b/app-doc/selflinux/metadata.xml
index cba9aee7fc39..3385386d05cf 100644
--- a/app-doc/selflinux/metadata.xml
+++ b/app-doc/selflinux/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<stabilize-allarches />
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">selflinux</remote-id>
 	</upstream>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ab544c572d42..41909d286a0c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index d21f58dad97c..a62b31b16bc1 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,3 +1,3 @@
 DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6
 EBUILD bvi-1.4.1.ebuild 478 BLAKE2B 0ea7ec66035262fe44643f9b0a6747415d9abb88d76bb5113d6d48cd51664d570a1ea6bd2bd005a230a6ecc104f200340a5ddb1eef34d7a527f3421a67b009a0 SHA512 0c8fe2f783f1877c158a58cc6f1c0b01fcac03ad004a8cfe0219dc1482cb08b03ddd621bd02c8592c52f331c5748a603b42c113e5fd201692c3cad48df617ee4
-MISC metadata.xml 435 BLAKE2B f980e4c6f597a6328b959ab2664cc1de7f5f351d39e06a5383f63fa75933e42a45962184a56b5b3456a0ec9f05d6632b53174fc0bdd00fd92ee9a38eb4ed1a4b SHA512 3feab9fd6833b5503477acf55078027a14976e4a1647463a54901467e9ea40c22f3bb9d41acba1c2b8cfbe8819b2af310d2f19b9f1c0a3eb9a991cf001ea984b
+MISC metadata.xml 465 BLAKE2B 3cafbd3ae314d58d9385af6dce54b76daf90d23bd1abbbccaa7217ebfd455d28e4acc83ba0e4a673969a9563b5d2866f6976a5d7c66aa4054560630366a80ba8 SHA512 97ca1604ae28bb068917ccabb035438eac4c414095e30c7261ff42473014eb1d93fcd224637953dc0932ab72496a5f9b3e771b688127ca44e80f98ecaf73b6bf
diff --git a/app-editors/bvi/metadata.xml b/app-editors/bvi/metadata.xml
index da741654ec02..4233deb11b8e 100644
--- a/app-editors/bvi/metadata.xml
+++ b/app-editors/bvi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bugs@chead.ca</email>
 		<name>Christopher Head</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/dhex/Manifest b/app-editors/dhex/Manifest
index b8afb33208e1..d76954e117fe 100644
--- a/app-editors/dhex/Manifest
+++ b/app-editors/dhex/Manifest
@@ -1,4 +1,7 @@
 AUX dhex-0.63-Makefile.patch 651 BLAKE2B 094e99a7bd7d8c09c5fbbecb85070505a0fe8ffb1bf83a1ec03f2a875cad316e6723ee969652389b962f3def7c2257af592682eb1b39b00fc2e6db2205a6d86e SHA512 80a938e81aef1e7450410138ebb445541f9707a59add8dc25aa7ac7f0154d17d1adc4de1c4d72f2e933b9882cce545b9d13650e8e653f26cc38ee65ec7c6a685
+AUX dhex-0.69-Makefile.patch 506 BLAKE2B 5921fcc174c467e973cce08a0d11cb40e0d7dfacbb39834ec386a75d0a4473992ecdd2969b20eef2295ad9fde6ba9e09bbe212b29a36fdd17fe0d4dd0b85cec1 SHA512 0ab54c3c9df6bee462d34df8dc33d07a6cf8a91b64314d22cf0a433130e654c920f11172c9f7ba16a058e86bd0c59721ebc3b7c5706535c046977581f81f0117
 DIST dhex_0.68.tar.gz 58602 BLAKE2B c29d5af598b731bc415e2626e945253641ea61c8a744deaeee3f7a2e7b1636ccfb3f8b7696efd33d36fab59d59da408ff4f59b44a88a36a4d7afc27542326c9e SHA512 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421
+DIST dhex_0.69.tar.gz 57362 BLAKE2B 26bfeaffc65b0f3b0193ee940da3ad866ea1354d0e5bec021a68a6c515da956500bfd7561ba675d0a67526d09b1a72e8372ee7bb52ec372f2b59249313cf77c6 SHA512 76115fd6b67bf1f61af6acfbc4dac9ac54c14aeb291de6a190aa1ffa599cf8b3e40a422ed34c237cf1f5c7406b07e38e38fb1c9c9dd36ce93d05265238060ba0
 EBUILD dhex-0.68.ebuild 716 BLAKE2B da44d04df93d839d0e2a09d6dbe637c9bbf2386b027c0a1c64f86b1b35c55e83b30dc226d7b711770ff7e0e4ae707216cdbc7741e1f09f5135d916aa0d2cba20 SHA512 038f4083ad3578eab56f87fbc042de67d6be67f8c8bbf0e2c20134ab9f90f64e43bdced4fb5a25f308c1e0d5565bed6227a6eeee71bdc710b7d17e4c11c147da
+EBUILD dhex-0.69.ebuild 691 BLAKE2B 6a0fc6ba44933cb5f726c1372de8ed13493531bb11c49683eb0c8335cb6057584cf6afe87760991862d080dc08f87155fc5b155b1cc9a0e2968f3ace94ff3218 SHA512 09e87a865b452f94ff0a002b528708a15b78293256ea00a1ced61519917d65bdda534ff5aa26df200c38dfaefcfeabfaf6c926b7285eefca00825753a428ac7e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/dhex/dhex-0.69.ebuild b/app-editors/dhex/dhex-0.69.ebuild
new file mode 100644
index 000000000000..01e5fc5f6c32
--- /dev/null
+++ b/app-editors/dhex/dhex-0.69.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}_${PV}
+inherit toolchain-funcs
+
+DESCRIPTION="ncurses-based hex-editor with diff mode"
+HOMEPAGE="https://www.dettus.net/dhex/"
+SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin dhex
+	dodoc README.txt
+	doman dhex.1 dhex_markers.5 dhex_searchlog.5 dhexrc.5
+}
diff --git a/app-editors/dhex/files/dhex-0.69-Makefile.patch b/app-editors/dhex/files/dhex-0.69-Makefile.patch
new file mode 100644
index 000000000000..55c281d3a677
--- /dev/null
+++ b/app-editors/dhex/files/dhex-0.69-Makefile.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,4 @@
+-CC=		gcc
+-LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
+-CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
+-CFLAGS=		-O3 -Wall #-std=c99 
+-#CFLAGS+= -ffunction-sections -fdata-sections
+-#LDFLAGS+= --gc-sections 
+ LIBS=		-lncurses
+-DESTDIR=	/usr/local/
+ 
+ OFILES=buffers.o input.o output.o machine_type.o main.o menu.o ui.o hexcalc.o search.o gpl.o configfile.o markers.o
+ 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c89b4beb1e8a..e2d1aca16d63 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,13 +9,15 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd SHA512 37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077 SHA512 9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
 EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1
 EBUILD emacs-24.5-r10.ebuild 10959 BLAKE2B 9abbd5cd629f2b577a9ad4635b6579f69c98945a0e920f821ec84a92fbc916c40ebb9bae88b49aa691fc3145d3a6d8c6224d876f7df055da85d7c2f3b74d1dfa SHA512 eebf1fe7c54f5a812ee97da236f9a19cc2ea4af60f9eb23b6a46ac0ada41d0795363a536d7b524c067c1ee4cb698eae9508a3493e17498804863bd2418b4e4ee
 EBUILD emacs-25.3-r9.ebuild 11301 BLAKE2B f0723b7c8efc6b6ce13648d365e544be55623eeb27f9a4f162da050ad17d6cd8164752f8b09caa96939b264b0c3e81c15aeebf360a4461b8a5e598829c8088f4 SHA512 f05e0a4ec7e585c5b750d8247f741d3f70a31efa8428e2af665ad751de8b2f6e01f621e517220fdcc86f9da2d614b76c5afb9eed60b22b5991ea48f1e740e1e1
 EBUILD emacs-26.3-r4.ebuild 11944 BLAKE2B 85880167c9e31ca96fbd8f3c1bc6966c5823d0a3381086a6457522de9b039d861c5b57cb2641c7b3a453a2f394ee2b207db8c9c53342fc644299eaedadb7467c SHA512 a3688ac6b7518fd2f0533fc40cbc388c5e1ced07b9677764456fd48fd6270cbaf954fcb43263407838d659d2daa06c4e881d02012cd16cd2a403125a2885d309
-EBUILD emacs-27.1-r4.ebuild 14468 BLAKE2B 290e754b87a3b237090c9d424bc68f2fab2a3b978bf6b320425599331b91cfc9e3279fffaae27f83d274cc55432722b98cb7ce53600090317a34e6494b9a94fa SHA512 3622fcc8e22f5b56441a1d3a2fa966b3c3fac7c85415c1f86af190c4e3705b8df74a783390e12e45f199b7262846a4b80793c25716f7e5588e53af378157833b
-EBUILD emacs-27.1.91-r1.ebuild 14433 BLAKE2B cb065e9683580acaca7fc3e33a4698490efa18d19d29a6176227c35f5378c3209b48d73bf7617175889fbbc02ea351416c9fd2c8215bf28109c41480ee940698 SHA512 acdc77b1c0fdfd6d11671fc2a78190ced36a9c637fbfed904c59784b330867436a44b527674b6bb02180c16713dc7849b340f715c85b50a0f117b51c298f1a34
-EBUILD emacs-27.1.9999-r1.ebuild 14432 BLAKE2B 418ae441461b589c1aac6875e7db6998815a24be9275b8cf40e383c2cb150c8da81e0062c1d10ff83d5763397cd1f694c75c4cde399e4d2a8754ad476d9645a0 SHA512 90edb4db36c1eb5f1bbbe2df0ff1b3dc7e2c2f3fbc0212f8ba8fc02224c2151407612cf564e23d940f9ed10eeb38eaa0d273d74a4b14e704537a865924c0f5b9
-EBUILD emacs-28.0.9999.ebuild 14015 BLAKE2B d764afba3091370f99f9c1ee3ea38c13757934dbfc0f005026de14ccc4408f05784504caab5647a815641215a698856df40224e7a0765fe951ad5781622068ac SHA512 76dc16d820c4f64d913f6a6a637c6e8d66345089a2272784031003f92fc8b55206d56940b78d3aae25a1f60f47b3eb87d2b09528f957493122a9e0e8ed51fb0e
+EBUILD emacs-27.1-r4.ebuild 14475 BLAKE2B 3dfb01869b832a9cd1b4068256a0f2df5918504b30d4941b06a3a1a8081e8c78a432629bca1da1b2eddbeb7322e96e5576b3bcaa8e90ea13250e64a98507816b SHA512 240eb0c39a890232016e479122acd878e072c49d0a6b635cdfcea2005f9c5319ea5689c5be7bf276d2c375e7defb50ff240639ed65aaeb4f8edab9624b2f6728
+EBUILD emacs-27.1.91-r1.ebuild 14440 BLAKE2B 8835a0672c4ac3f4f71819e432a6bc3508805e0d8240fd2b5a52c429e6947dc35df2dadd024c291893c493e244313868313f614af2dc6c4cd092e398a41c27f6 SHA512 740e47fbd48bd1497362967e352ec4b5b0aa2738dac0b58ff277064c13edd6aeabc0030467cca21519becbe8f9801e0128f2705568b21d3af4dd874becc19cfe
+EBUILD emacs-27.1.9999-r1.ebuild 14439 BLAKE2B dc38a21c9a51fa6aeaf502663c25e1e03a2036649ac15c49a68b50b6bd71e036e1cb4bdf8d0c1e4ed475701a0f7b76decd0fdbb23cd2be1b57db57c91c5ea39e SHA512 71136864772d724eda2a3b681e8bd28a00c4cfa7d3a71c4de756814da809ac9bed18aa15d1ef0b42a7e2bdd3ff2584b4ff4848f9b5f62611a1f1416234f52c17
+EBUILD emacs-27.2_rc1.ebuild 14440 BLAKE2B 8835a0672c4ac3f4f71819e432a6bc3508805e0d8240fd2b5a52c429e6947dc35df2dadd024c291893c493e244313868313f614af2dc6c4cd092e398a41c27f6 SHA512 740e47fbd48bd1497362967e352ec4b5b0aa2738dac0b58ff277064c13edd6aeabc0030467cca21519becbe8f9801e0128f2705568b21d3af4dd874becc19cfe
+EBUILD emacs-28.0.9999.ebuild 14022 BLAKE2B 7b0fdf5f481d594474901be3b491d8790672274fa87c597d3f36620edd406ca19b52b8bd3f8353e245ea729a287e3fe2082d24273b4826601d275910edaaca27 SHA512 5a29b5775ab0a5093ab2dd9d67ae2f05948312c9039c63f8d9b57c60f1f396dfa17008b01b6fe6ef253ad3578c3434dd27831d323d026ac3b11ec621b90efd5f
 MISC metadata.xml 3037 BLAKE2B fea30de2fe3c754253119e21c0f2c1023d4ac9c78ff0586fd5c427a8b44104ca620a16a8560de310afe342fd38e69be58781656ae45d59223d3e48d6510bb980 SHA512 07a5bf84aecac3fde3d6b0a698e875683f8479becc66037ba4d21f0bfef3e7d533331ab072ad1d5911cc36d9b5efdec979a3daafe812a5055139f8171d4ae6ea
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
index 216c3c4521b9..c8649ab9c57b 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/emacs/emacs-27.1.91-r1.ebuild b/app-editors/emacs/emacs-27.1.91-r1.ebuild
index 50a0f78c3c66..acd274cb4f4e 100644
--- a/app-editors/emacs/emacs-27.1.91-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 4b787936fc98..d9b809b079f1 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/emacs/emacs-27.2_rc1.ebuild b/app-editors/emacs/emacs-27.2_rc1.ebuild
new file mode 100644
index 000000000000..acd274cb4f4e
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2_rc1.ebuild
@@ -0,0 +1,446 @@
+# 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
+	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-gentoo[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			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
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://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
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -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
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index af22d98f0305..037b3fce29b5 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 27486e867ea9..51bad439a677 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -2,4 +2,4 @@ AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818
 AUX ghostwriter-1.8.1-qt-5.15.patch 550 BLAKE2B 2c0d60746273f851f94677c0f0dd8b14f4bc4ab24d59605855cd5ad8570b30b8d4bf92a2bcfe32825a19b1c2b39fee4bf783affc75bc6ecf0c516cc95a731ebd SHA512 2bc77bd62a9d6adbd5eb1cfd40b1893fc2b6f2c321db228e0b22f4cf85a3c09634c3b5fa15c7a9fd25fd7071012efe636f69065776abc51c9ed920920f2feaed
 DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
 EBUILD ghostwriter-1.8.1.ebuild 1216 BLAKE2B d43b703b8af7c0a62e747e0796dc9303ec2f1ea96278c047177328354ea18fe892e3a577f44e6191ba65720eb66901e4889bb6f19346b236e86a42ec99d7f5e4 SHA512 24748a5f81ef965b3b95355e6a75294956f6ecac4bbadc6ad302bd9b94221f13c6266a0254afb2fb340251588a194200576061a5ec40925ce5a43c6ee68763fa
-MISC metadata.xml 563 BLAKE2B 0f231e68a0335b4e4578d5ec28d8b202a26e7cf5c9f48fe9f4d430b01532aac1cb6022e13ef72c91a3ff68a86ecee0ec780a5bfe7e0c1ac1f158d8cbef84f7bd SHA512 585e39bd37abab4db3422b91a342aac06bcb76b3a6447a60c4607e3ac6edadbbbcabc1480828094d480c241a44d07ba81fbb5a4502f71da75c20e28db4583fe3
+MISC metadata.xml 607 BLAKE2B f18da9d5e16cc1a253517921409071e657c04cb79c97c6b81301d9c3a23a259e2f3125b282a2b232f06e767488c7a98e413ba296a7ca6c32fbf82e79c6257756 SHA512 4e6e6203019c0691ac8fc1403de5e7ca758c873aa7af22d1e615591a8b31572d8462514d1a49e65bc7d3a6b79088ee851ac9d30f6c7a484a7c61fe4fec62514f
diff --git a/app-editors/ghostwriter/metadata.xml b/app-editors/ghostwriter/metadata.xml
index f0f7966a74f1..0687ee5fbd1f 100644
--- a/app-editors/ghostwriter/metadata.xml
+++ b/app-editors/ghostwriter/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index dc959febb14d..9bea5210e0bf 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
+DIST gnome-latex-3.38.0.tar.xz 1094376 BLAKE2B 0c02996dbac48c3859d33a0d504a64462e306d346ca22397820231fa8fe7ce2aa621a1435a02d78ea424fc8e9f5b7ac6e3e60180d8212c170d52eb4baee3b94a SHA512 c42cc1ff2c59afe4d995e9f13d9a858e2297827d5f9359cecd969d305224fc4b4d0306e0ab6aa1d9b7fc92acc25e597319299afe176cff1903f734fbc2ddf29b
 EBUILD gnome-latex-3.36.0.ebuild 1134 BLAKE2B e30477f51580d52b2c120334914b10ede09cae50eba5f19a4d9c2511a0f9096cc59df8edbbee252330ce640c046e066e78c34e054ea5c40c3a4b6fe582444917 SHA512 3f9d26de278eb082cb2d0452a9889d39c506996a30bcb63ee157160e6a7ebb32cb7b03ccbdccae4398b9eae78a3366cb05b2115bb0e95c33527b74e95c823ae6
+EBUILD gnome-latex-3.38.0.ebuild 1128 BLAKE2B 0d5cab9987a7ee827603ec3a830c3da220251af5e273756f58c182c771c83f8104e03d5d1d61eb2f456a8e01642e4e6723cd47f8f3d81adb3c047dbe56f21b92 SHA512 f96272dafd5c8166cfb18927abecbbd1ccf51eae36b99a33fe7f8cc0639741c58d960629ddc2253b9919ea4c4a0f02d19522abb876afb3fd9a840298a299301b
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
new file mode 100644
index 000000000000..a473957b2ef3
--- /dev/null
+++ b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+DEPEND="
+	>=app-text/gspell-1.8:0=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0:4
+	>=gui-libs/amtk-5.2:5
+	>=gui-libs/tepl-5.0:5
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnome-base/dconf
+"
+RDEPEND="${DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-dconf_migration \
+		APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
+}
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index c574fb1e7b98..321718200e61 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,3 @@
 DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
 EBUILD gummi-0.8.1.ebuild 941 BLAKE2B cda4a2712cef8c8bcb7dbc532bda5520cdcaecc584adea637b09f254529c0b9d4d46fa2a11d165737ab573f0731c1e3ebd621f17073d642ba0c21af23136c49e SHA512 97240093be39eaa34879ed464538699a14b714775708fe60987cd58756f0acdd65cd87a0bf2a88c31bc70226626ef8e897b9e0ee566d00adcf90dac95d4940b8
-MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
+MISC metadata.xml 615 BLAKE2B ee2552450c4e9e8edc7e3dec38bcafedf30ab2b42b8358cce7c7a38e3a37bd907734406ee12a79f176100e9208c7480e6c980633416e3c4cff1ecb638e840673 SHA512 c96879b8ac00c1aafad177a55ecd524a502519f1cee5c1d036d260bb11e12b492d3e798b8f94572666e4aff45dd4233bef4ceb8a34bac523f3e36c78bdb4fddd
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index ac4246892454..4da0c7ca0e09 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>christian.tietz@mailbox.org</email>
 		<name>Christian Tietz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 2c179086ec3c..602cb3a90496 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,6 +1,4 @@
 AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
-DIST kakoune-2020.01.16.tar.gz 579837 BLAKE2B 46abfd7f2bf2db6f9755a5b4f547e63e72ac7eef46ad0903dac08d0f422774632ac5aa3dc1e6c69aa6f0527bdff0ea1792574933ceb35b2495927f747be94aaf SHA512 81a0fb522fd7f289ede36f966e815d03550df389b05d27fa430474dd55a90cc0e1c5231e660328040f3bd79d155d37b7b135b52b93cee536c15d13fc9d06baa0
 DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16-r1.ebuild 807 BLAKE2B 2feb5925e67ee6e1e8a6b5fa04acff196a938efcbf11ac8673c2bdbcf1fb5e45c59a2a8e8e3139f508708bcb6401e16627d79b18db292dab54680476c182da98 SHA512 bc710c8b691e62db81da592c10cf3fd90a7a45df210ea16f4d95e554575e29ad168c340f021fa7a978060344e232426e1dcfb082416ba0bd760d5178e8ece140
 EBUILD kakoune-2020.01.16_p20200601.ebuild 903 BLAKE2B 8307aba24da0c372e10e301834651e586ef8f7f4d95c465643452e7de4d6a9f8c557e1104db04267bb0609940217f5f5574a41ea0a7a58004dbb29a66ae650ac SHA512 a0af7953ad6d02eeee286ebd3a519b0315a2f47e408efe33bcf1a6ddf49b408da15747e30d64f6158fadcc210ec4046d9f02b49a745c5ff5793f5551d330687f
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/kakoune-2020.01.16-r1.ebuild b/app-editors/kakoune/kakoune-2020.01.16-r1.ebuild
deleted file mode 100644
index 26d369bdf441..000000000000
--- a/app-editors/kakoune/kakoune-2020.01.16-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Modal editor inspired by vim"
-HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=[unicode]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
-
-src_configure() { :; }
-
-src_compile() {
-	cd src/ || die
-
-	emake all
-}
-
-src_test() {
-	cd src/ || die
-	emake test
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
-
-	rm "${D}/usr/share/man/man1/kak.1.gz" || die
-	doman doc/kak.1
-}
diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest
index 79be705ef07d..6da617af1569 100644
--- a/app-editors/le/Manifest
+++ b/app-editors/le/Manifest
@@ -1,7 +1,3 @@
-DIST le-1.16.1.tar.gz 977143 BLAKE2B 4dcba27bd3c0add2ced4209da618070e201bedfe333fa99951720144048c5a26d3d691ff244b64d3e8dfa4f42a598767b78ff601a7f2f0ce0e069a316d6ee0e0 SHA512 77dda0a3c9cf98d9775937373eed2489f22b641ed870f3152cd59dacff373844f5d8d85f4df864c396b812995625bcdb8f5444de93336495ecb1ea7df27e464e
-DIST le-1.16.3.tar.gz 985541 BLAKE2B 9b205f14fae619a7ef355eeacd91a3fd3e093f2f53db607b0b71b16805536780fce4f932173987332924c1e392eba6e5e338d986459502c7eaa0223a70a63db3 SHA512 b1ee5440fb71f4214170bc0a1654b68671bac5f08b38e62fdeeaeab2710365aff7cb7c3d13aecbc052b8596c95d7caadd6b3347f9bcb8cc5272a4639856ae46d
 DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0a464c7e45e5365e89475bd76ee74aae48cbdb7f5c8d7a665279a63a885007a88a556e86bec875584438f0a SHA512 2c74267f9d02944e0c72f109d9be024d1ec1de84dd6f381f7f8667be1d68b8ebd107ac970f1901f2c77e3150897562d42b9b10ec321356ca1e1ee45728941660
-EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0
-EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6
 EBUILD le-1.16.5.ebuild 487 BLAKE2B d74dbb00f183b185ad355feb03b90194688f99b29343ba6f2455586854f932921659fe59c7fad329510abbf1b778eee222022087c678c1d250071c67a51ebc94 SHA512 ab0971f255f42d9f58fa5167c43d626bdf1ad38273aa1fcb953ef08384e10df9d00bbc1b14cfbc7b614a06dce8540a62fd3af59e0e1f075b33067ee495b08dac
-MISC metadata.xml 372 BLAKE2B 87ce04f23c2c03caf708509901ae504cb952d4b69819e0f3cfcc5e3b149d82db976965c1bdbc31db66a481726264a2dfe355f3407938479c71be6111a96391f5 SHA512 366c7a4b144ab34cc9a6bd3328ce4c27f32fd9d638949361ee5e9db29cf3f564d3ad392f9cd59858d359e9050c76c0eb5afa12900834462daaba949675aa232b
+MISC metadata.xml 402 BLAKE2B 1f2a134b3b449c29ef9b90854cb16026109bc18ebafd4c7fdc7e43236339a31289eb5713c9a05cae75358d82620f3d66d5fecf3bca28b4a735fe09b1c652dacb SHA512 12d0a12910d997b3224a26fad8abe0a90008c5020e77bf80cfa75ae1d133e242c7230f914bccd2231ef562211a00ef904d2902e9131d877909c6040691ce95e8
diff --git a/app-editors/le/le-1.16.1.ebuild b/app-editors/le/le-1.16.1.ebuild
deleted file mode 100644
index 66438770c4a8..000000000000
--- a/app-editors/le/le-1.16.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="http://lav.yar.ru/programs.html"
-SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/le/le-1.16.3.ebuild b/app-editors/le/le-1.16.3.ebuild
deleted file mode 100644
index 3fd15af0392f..000000000000
--- a/app-editors/le/le-1.16.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="http://lav.yar.ru/programs.html"
-SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
index e0c7b195e250..4eaeb3fe378c 100644
--- a/app-editors/le/metadata.xml
+++ b/app-editors/le/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@schellstede.de</email>
 		<name>Gerold Schellstede</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/metadata.xml b/app-editors/metadata.xml
index 195f8754aab5..7b797817cf0e 100644
--- a/app-editors/metadata.xml
+++ b/app-editors/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria app-editors zawiera edytory tekstu.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index f0a9a168d9a0..00f2857cf4a3 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,3 @@
-DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
 DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919
-EBUILD ne-3.1.1.ebuild 1107 BLAKE2B fcbe4b009d66a096013ab8f1460166aa94987bbbd2f2cd9b193aa071193df850c46504e530479844c3550a4023510e2bd0297bb04ef8b57c1492e3df0dfd4099 SHA512 6c87ce4bcaada04ae7d7518d4773f4362711313612d4d93ce477321b0d0cc7668dd08c9b885ed774a5e31b0f913c6f1b3ef5e54bafb23c6f9bc8d5188230d5e9
-EBUILD ne-3.3.0.ebuild 1003 BLAKE2B 120daab562298b35f1ccdad4293ce6ce9e50426c88471b876d75e97d85bd3f7e8472a82a6a9460e57a042ed6ede3e4a333ee87555653d843a14b536ffc8f8b1f SHA512 0b80373e820a5509844015362b3a1113c0f703a2b3dfb412b0609efe0019ac17d319f9ee52fe54c568782c0e44a5c9e47fd495f820fa24a76e6dfaa25864044e
-MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
+EBUILD ne-3.3.0.ebuild 1091 BLAKE2B 78860027854e0c4e21491f82c3a749775553ebdda8da81f72cdcc543dc44bb969f01126347376ef2df50663f7e9b0635ec9c383314177871c9ae4f971cee7d4d SHA512 2fdb544933a70387450e0ae2e601cacbe3642f3a06f1586254196738745390fac2086ac0b982674a209655478914320fbda1e95e9628c06ef4e8373a1e1c4c75
+MISC metadata.xml 240 BLAKE2B 66f22dc22855e2086bbf7552dbe1a29c682be5bf7a30efa46f67bd4712236518cfa5f0bf4ceba02f06112648d90cddb46404c7f41cdac60235d22d3abd42d5bc SHA512 db38760572568e6042b2c06fb8ee82bb69af218555c781df2f5463ab4923212bdc2f71e65d5dcc839961634373302b7a6863acef18b01c869fb1c26932b01315
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index 1d1325e157ac..f213fcf21705 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
-</use>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">vigna/ne</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
deleted file mode 100644
index 37edf3c0de09..000000000000
--- a/app-editors/ne/ne-3.1.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
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild
index c1c60d57ba1e..87aaff065bf8 100644
--- a/app-editors/ne/ne-3.3.0.ebuild
+++ b/app-editors/ne/ne-3.3.0.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
+DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="https://ne.di.unimi.it/"
+SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0=[tinfo]"
 
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
 RDEPEND="
 	${DEPEND}
 	dev-lang/perl
@@ -25,8 +24,13 @@ HTML_DOCS=( doc/html/. )
 
 src_prepare() {
 	default
-	#sed -i -e 's/-O3//' src/makefile || die
-	sed -i -e "s|-lcurses|-ltinfo|g" src/makefile || die
+
+	sed -i -e 's/-O3//' src/makefile || die
+}
+
+src_configure() {
+	# bug #776799
+	sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
 }
 
 src_compile() {
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 30aaf04d0873..83f2e14427f5 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,7 +1,8 @@
+AUX neovim-0.4.4-cmake-darwin.patch 2599 BLAKE2B 7d5d5298f3b32385bcd17c582865f554edf8f1a164517dfd802590f8f7f85b3cbcce2ae7ffdd9163fa87b55000a582129b6fb93835decff135f0029c1f8cc681 SHA512 1b4f5b1baaecacb807c6c2d022dd17c887f4a6236c3d452fdc9e01c3e1a868ca395e727343bfe793bf9a667889e22413683e3a196d8aaa4f978514b91634c849
 AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
-EBUILD neovim-0.4.4-r100.ebuild 2729 BLAKE2B c57d4fe7b38c0db34547f2b49c6ec1162aea76ff3e3a940c364d9c2df60f73d6f360ca3d44ac334a0d3f4ead5ce77d962520ff87457a4f14324f2ceb190cc30f SHA512 2729880f0817b1ce2323df33a2c0d9cfec8cfc6230a9dd166807b087ea31209a6fe3da9cecbdd099123890996d6c489544d5b83d14adeeee22b50062038e82a2
+EBUILD neovim-0.4.4-r100.ebuild 2809 BLAKE2B c19dd29a3cb54b2a40b211f250108ff7eb53da0eca3521139a04eda96a43ff4b597223430d16a33e20ff9c48637cb480d0c172f2afb53ca1463cefb62d796f76 SHA512 b2380f420bd48d9ef12e25ec75f794ad3f4821996b5503301a28ce5c9066236642dd3086b6ef4a702f59856ffa903306dc3a0a1f540ab8b636c0f5ac47578d5f
 EBUILD neovim-9999.ebuild 2779 BLAKE2B a629bad5945a0054fc56eb28c759e80c39ff44735bc0ef48edf50238fa6a891789324303c8fb27709efe71056763b987a12c907c62736b197b59c9fd55afb2fb SHA512 87f6afbf6d9ca151a8019761f53d9bd9137ecc0943adc7a875ed019134dc772794f64419fd959198ecbb1ea81a978368e92d20f4015d96be7c24fc030a5f25bd
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch
new file mode 100644
index 000000000000..4fa8bf45bcbd
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07928e3..08881ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,23 +58,6 @@ endif()
+ # used for check_c_compiler_flag
+ include(CheckCCompilerFlag)
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-  # CMake tries to treat /sw and /opt/local as extension of the system path, but
+-  # that doesn't really work out very well.  Once you have a dependency that
+-  # resides there and have to add it as an include directory, then any other
+-  # dependency that could be satisfied from there must be--otherwise you can end
+-  # up with conflicting versions.  So, let's make them more of a priority having
+-  # them be included as one of the first places to look for dependencies.
+-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
+-
+-  # Work around some old, broken detection by CMake for knowing when to use the
+-  # isystem flag.  Apple's compilers have supported this for quite some time
+-  # now.
+-  if(CMAKE_COMPILER_IS_GNUCC)
+-    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+-  endif()
+-endif()
+-
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   # Enable fixing case-insensitive filenames for Windows and Mac.
+   set(USE_FNAME_CASE TRUE)
+diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
+index aa81008..0570dc7 100644
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -192,10 +192,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
+ separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
+ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})
+diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
+index edd5882..e503434 100644
+--- a/third-party/CMakeLists.txt
++++ b/third-party/CMakeLists.txt
+@@ -105,13 +105,6 @@ if(CMAKE_CXX_COMPILER)
+   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ endif()
+ 
+-if(CMAKE_OSX_SYSROOT)
+-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  if(DEPS_CXX_COMPILER)
+-    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  endif()
+-endif()
+-
+ # Cross compiling: use these for dependencies built for the
+ # HOST system, when not crosscompiling these should be the
+ # same as DEPS_*. Except when targeting Unix in which case
\ No newline at end of file
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
index 987745e5962e..6f725bc078da 100644
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -49,7 +49,9 @@ DEPEND="${LUA_DEPS}
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1.2
 	dev-libs/msgpack:0=
-	net-libs/libnsl
+	!kernel_Darwin? (
+		net-libs/libnsl
+	)
 	tui? (
 		dev-libs/libtermkey
 		>=dev-libs/unibilium-2.0.0:0=
@@ -63,6 +65,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
 
 src_prepare() {
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 4f2169ca83e4..2cdc40ce5b6d 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,4 +1,4 @@
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 EBUILD qhexedit2-0.8.6_p20190316.ebuild 1868 BLAKE2B 0a410baee2f0df3ca7031bff356a994c251e95b12faed41299514e4c49a166d0fc6a6333cd88698f4015793c7b69e4bf2bef629dc6b243f6a326c3966b9d1372 SHA512 334e5f3fba83027164051b25a350766671ddc0b225948c0b0928d5ca0701030add68f2e42410dea0841b6482f5131285cdfd812b583f112ec710233133c78d72
-MISC metadata.xml 863 BLAKE2B 30caf38917dfa0d50ec89879717ecb223a6dabc1a17b75d8c55af7fc02ffd702838389d97c9e86ca3641b9d7425b6f4b70ac807b9003e1bfd4d0db678252cf94 SHA512 a1ab5265136999a14b673653c1bc146b8d3a4514d7b2866dbdf3267aa586cd0bdf58cb2aeb116a76546ff3bffb5cac0dbca5d36d7335920dfdf50901ef9e0b81
+MISC metadata.xml 893 BLAKE2B 206191c8344f67ea497839884be18c0380aafc84d6dba30703ecc98c20bc90807d2ad3edcfdb3c7077facdcc45935fb2a7cf155814cb806b081c0bd24eba3feb SHA512 6626e9cbcc58bc83849eddeb4d2126df877b2f6b81d85e61422c97d5c7e3dd26587ca28c9be6813c6e48ac5a42d3eda9973dcb42a787c8e10ad10a43249800f2
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index 527d2f7dc820..8b05dcbc4b5d 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index b9237c3daff8..71ee7f600e0e 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -3,4 +3,4 @@ DIST ReText-7.2.0.tar.gz 516895 BLAKE2B e35cfa59b248135be4454359516c36f94e927cb1
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
 EBUILD retext-7.2.0-r1.ebuild 1965 BLAKE2B 6e48ae5156e88e2eec311fc15ece653c3391b8f8e7285a524d7ad053b0bbc7caa40342e03eb1bf9684bd65907632a91c823f66736c7f2291a4b36565410d3069 SHA512 a6754a88e641e595871e3fb29dafa0a9c704dea062717313c24b1992539e82665d1f3e8f34dce83a6ac88bcf3d05b64822e73c803205fa196073230695f0133c
 EBUILD retext-9999.ebuild 1965 BLAKE2B 6e48ae5156e88e2eec311fc15ece653c3391b8f8e7285a524d7ad053b0bbc7caa40342e03eb1bf9684bd65907632a91c823f66736c7f2291a4b36565410d3069 SHA512 a6754a88e641e595871e3fb29dafa0a9c704dea062717313c24b1992539e82665d1f3e8f34dce83a6ac88bcf3d05b64822e73c803205fa196073230695f0133c
-MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
+MISC metadata.xml 526 BLAKE2B 62c3e6a8421b9698328bb9eae7040f56a4612b9b9ed94e0435673ee68e2d5b99e96b54bc30eb777bd91f6e47fc37b985552aa2575d7d5cdbbc0885c24b191ab3 SHA512 e46d73af70b8fdb762957cc0d84163f0c24139deab2f24c0bbeb4281e50ff7f5456a95f519ea95f084b46c601eff1419dbec324ce6d9305db71f8b25f759c287
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index f5c4f2cfa494..99efc308a05e 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 69fde39c2f95..a27a80610b50 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,8 +1,3 @@
-DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
-DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
 DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
-EBUILD scite-4.2.1.ebuild 2973 BLAKE2B 3aac0ea6df96d31b14e32cf1947470f6b5f968b5fae3e8285e9c4170c8aea58aad3a2326d2cee4c2a7108754cbd5d2a34678e5abe85e9648a0d02242c244bece SHA512 833e3974d555f9cda3b538dbe89d5771c9a886e43b6dd74964d22ee70f4af300551c0251ddfbb62e137f8c97ddeac8bc8db714cdad2c5d8fd7aa59e2ec8c7c29
-EBUILD scite-4.3.3.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
 EBUILD scite-4.4.4-r10.ebuild 2975 BLAKE2B d11639ddcede16d0bb062f824f483e7148799cb4a690a457102d5d85714eb4a271f200da5b76f76315c08de078873c5f5e9695245aca01747c41944d68a11f87 SHA512 8436c3c2129dc22ef640534214691a4ba56242ea784141f81f04f53a0f93ca7603a4f551fc9f08c074091eb15b6ad38fc201224d7eb7c6226cf78926eadb6d03
-EBUILD scite-4.4.4.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
-MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
+MISC metadata.xml 476 BLAKE2B 8f16ea1b891813a88b9a94e6c9b543ed8cfaed30a098582344d5d4337d905d88a8216a16de405f45892a95fa27a77b2f02c82727f9490cb157a01a841b480676 SHA512 fceeca0a2879cb5dcd2fafd67be9bae09fdfdec389f0adbaf4c012a4c17ad592ca0b4b4f689e080063f36be510651bd15999055c426c95258ed132cb6333be44
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index 860834e39909..856d6746499b 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ervin.peters@ervnet.de</email>
 		<name>Ervin Peters</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
deleted file mode 100644
index b235fe2b806b..000000000000
--- a/app-editors/scite/scite-4.2.1.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
-
-inherit toolchain-funcs xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3=
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX RANLIB
-
-	# remove hardcoded CC, Optimizations and clang unknown flags
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-	-e "s#^CC = gcc#CC = ${CC}#" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-Os##" \
-	-e "s#-Wno-misleading-indentation##" \
-	|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-	-e "s#-Os##" \
-	|| die "error patching gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-	-e "s#text/plain#text/\*;application/xhtml+xml#" \
-	-e "s#^Categories=\(.*\)#Categories=Development;#" \
-	|| die "error patching /scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.properties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars="GTK3=1"
-
-	if tc-is-clang ; then
-		emake_pars+=" CLANG=1"
-	fi
-
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
-	emake "${emake_pars}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
deleted file mode 100644
index 791fb5eabe6c..000000000000
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-DOCS=("../README")
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX RANLIB
-
-	# remove hardcoded CC, Optimizations and clang unknown flags
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-	-e "s#^CC = gcc#CC = ${CC}#" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-Os##" \
-	-e "s#-Wno-misleading-indentation##" \
-	|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-	-e "s#-Os##" \
-	|| die "error patching gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-	-e "s#text/plain#text/\*;application/xhtml+xml#" \
-	-e "s#^Categories=\(.*\)#Categories=Development;#" \
-	|| die "error patching /scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.properties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars=("GTK3=1")
-
-	tc-is-clang && emake_pars+=("CLANG=1")
-	use !lua    && emake_pars+=("NO_LUA=1")
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
-	emake "${emake_pars[@]}"
-}
-
-# want to use the base src_install() as base_src_install()
-
-src_install() {
-	default
-	dosym SciTE /usr/bin/scite
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.4.4.ebuild b/app-editors/scite/scite-4.4.4.ebuild
deleted file mode 100644
index 791fb5eabe6c..000000000000
--- a/app-editors/scite/scite-4.4.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-DOCS=("../README")
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX RANLIB
-
-	# remove hardcoded CC, Optimizations and clang unknown flags
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-	-e "s#^CC = gcc#CC = ${CC}#" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-Os##" \
-	-e "s#-Wno-misleading-indentation##" \
-	|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CXX = ${CXX}#" \
-	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-	-e "s#-Os##" \
-	|| die "error patching gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-	-e "s#text/plain#text/\*;application/xhtml+xml#" \
-	-e "s#^Categories=\(.*\)#Categories=Development;#" \
-	|| die "error patching /scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.properties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars=("GTK3=1")
-
-	tc-is-clang && emake_pars+=("CLANG=1")
-	use !lua    && emake_pars+=("NO_LUA=1")
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
-	emake "${emake_pars[@]}"
-}
-
-# want to use the base src_install() as base_src_install()
-
-src_install() {
-	default
-	dosym SciTE /usr/bin/scite
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index de4fe2031a42..776d79a20ab7 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -5,4 +5,4 @@ DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfc
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
 EBUILD vis-0.7.ebuild 2084 BLAKE2B 5b8d2439231f15ccad19fe711b41153ce1da890976fd39a034cb986252b20d76ee9f7434c68af42f4f57b90c092616ddf0e17b57d8cc2633e89c8f32dbbfe200 SHA512 33ccd61a0f1307485a964d1c5fda24f54e4108638b24e65344b2c03af21e5cdccda73004995afd7f4f333bc51db63c99528333008c43bc7394abf7839e4d1bbb
 EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
-MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
+MISC metadata.xml 623 BLAKE2B b15ac2bb4f7ca0007660f46e07c0c994476f538af10d50298de77d0dd251fd0eee4a545bce9d1ba10c545fc929056b5b3a3a65de5df99bc4811e723df8930faa SHA512 742298dcc4b328f46b3c60726169b11bbc7c4a3546e2983c96b90aed07ff8ee027030a20e7fca9469e2ac1d1fdda7069806f9fb35e442a36d2435669d6235bab
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
index 0226bf9ceda3..cb954b0dc302 100644
--- a/app-editors/vis/metadata.xml
+++ b/app-editors/vis/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>contact@hacktivis.me</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 9c01e27e7d72..837cb6ca15a9 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,4 +1,5 @@
+AUX wxhexeditor-0.24-desktop.patch 613 BLAKE2B c923a7f2782f5f88321d1f86ab75c7a4b05d167d86ece484a01b4e26fa76ad8484d19e5dbe337766ff3de6f8537263d17d810b3a5d9d62b883d5eb07238d0155 SHA512 f542918c3f42546b21bce165853f54ca166d0d8335f948c5d442eb7710d4a1f403d5dc4260b238ce6cfd692d37bad101a4fc6bc83742712ed247bf5477662685
 AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403
 DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
-EBUILD wxhexeditor-0.24.ebuild 780 BLAKE2B f956a2b44390a6a3d673778d06f63af8747cd200dd01858ca8b3de527e52b2c19d4cee9dabffce2fd6827e9336fca1076ae56fef4282160686163748be067407 SHA512 a8027cecbedf4a9ace1d163bbc14d29941f53f20844b4eea0a845076b9d8440376c4c87728bd88d53a5dd5a470f0279a0cea639e54a37a4786ad06e566606732
+EBUILD wxhexeditor-0.24-r1.ebuild 817 BLAKE2B 360b1722abacffc995737fdced35c4e9b5ae6f52aa92a160bc8e8e18822b3cec74bd2c1386b7d7323bd21a2f1ff8d01123275eb8bb4bb443eb0b5c86eb926154 SHA512 123a8a5c0a52059a5b90efd34d094818f81c01c20007878c5f6c5fadd146b061de2fe6068b6055c504a1f5b0911f292645cb47ac65643881cd0b41ec4e902b75
 MISC metadata.xml 352 BLAKE2B 6b049a05b438e20e604ed3c93e89e66d5f18cb0dc7322a9f4d5cdd976ba074b625b162baa30ff8b2276429826caec1d22a757945e14a845be3b6bfe9eaeb69b3 SHA512 918e551de8f159920d7d98010dc748efb0e9a79c9a11f6d6fcd44127d3779a66510da18cbccc69a974472bf3f230fd5cadbc15665a4a3710b8c1b92237725f6a
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
new file mode 100644
index 000000000000..7d3d54da09ab
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
@@ -0,0 +1,13 @@
+Index: resources/wxHexEditor.desktop
+===================================================================
+--- a/resources/wxHexEditor.desktop	2017-03-16 05:50:42.000000000 +0200
++++ b/resources/wxHexEditor.desktop	2017-03-24 12:16:39.931400635 +0200
+@@ -8,6 +8,7 @@ Exec=wxHexEditor
+ Icon=wxHexEditor
+ Terminal=false
+ Type=Application
+-Categories=Utility;TextEditor;Utility;
++Categories=Utility;TextEditor;
++Keywords=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ Keywords[en_GB]=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ 
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
new file mode 100644
index 000000000000..a31c4b0aa439
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="wxHexEditor"
+WX_GTK_VER=3.0-gtk3
+inherit toolchain-funcs wxwidgets
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files"
+HOMEPAGE="https://github.com/EUA/wxHexEditor"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-crypt/mhash
+	dev-libs/udis86
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syslibs.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+}
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
deleted file mode 100644
index 517f24a35eb8..000000000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0-gtk3
-
-inherit toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://www.wxhexeditor.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/mhash
-	dev-libs/udis86
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-syslibs.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 086e3784325e..e623ef80c387 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index c8d792959bf8..15dd9b9b0e9c 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -5,5 +5,5 @@ DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beea
 DIST auctex-12.3.tar.gz 1534283 BLAKE2B b70db839cd82805ed0410f8b92c5f19a78e92ee8f23d18962f0da77bdfdbac4264272805135c7f16ba35c461017aac74030071c85d2ff413f8eff542cad670d2 SHA512 29c411a7f18e0dd2d84edaf935e278cdf694644e01f40c26c26da403efa0a823fc3110c291d218bf930cad208dc249ca665dc20ccad5e2b44bd3caae828079ca
 EBUILD auctex-11.92.ebuild 1426 BLAKE2B 6a2cae3590f384ee0b1c0395d872029e4d83830109953557901975ce074d7464dd291511965f916c03eab1b88acc6c4f5538764ad9d5d29c4ea3d735338459c5 SHA512 7e26c9deed5f567d4c1e075abadbbd85df8391e2df17339523de2d07acf3822e850ab264bc1ec6b28e2ae7e3b5dffadd5de139fc222dd8f28ce8b6c2f149529f
 EBUILD auctex-12.2.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
-EBUILD auctex-12.3.ebuild 1447 BLAKE2B 232132031b6e63d8014bd18c684b6e18170347d040d41703cd2f5fa2475236782dc04ea15db5755d36970622cc5ad8ced01be31028c228368b4455f5b749dccb SHA512 88aae118ee34452ab44481b7328f6ad726838207cd8dd1ed780db94078e86fa74e864b1a56b3990beb973d14b4dfa8fb9a7d2823fb01c9731574fb6c0d3e4acf
+EBUILD auctex-12.3.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.3.ebuild b/app-emacs/auctex/auctex-12.3.ebuild
index 809f35351cca..6ce7fec4acc6 100644
--- a/app-emacs/auctex/auctex-12.3.ebuild
+++ b/app-emacs/auctex/auctex-12.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index bab346a00234..099e6a442967 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
 DIST csharp-mode-0.9.2.tar.gz 52389 BLAKE2B 897d8bf3b9e0963647071628af874a77f7181592fe21f2094082c807cb33d26e43825f36cefcd100ad46dea67d217f99ec89e5f3e2c94a639553d7334ff39bc8 SHA512 da4e0aff63600c01d1571fea19d7892af1c3bd5366b97a1d9321853db7d52f04431f0c7c16371a0ef0f8296ccbf2baf0890ceb67e48a9159faf6fd6d10cb49ab
 EBUILD csharp-mode-0.9.2.ebuild 540 BLAKE2B 1ce353c24d36286c139e7681a633e7bfc705cf992d8d393d29d053a130edbd78700e080515fda3a75c29ba9bcaaa44020e89d99df068af8d387c16e36a5e0a7b SHA512 b662d976dee79d73534c083fab34b9aa98a737c4c5390d051e9ed9d52225a6c6968475cacbd25e3c42a2268d5ecd282f5b304ad86bbab8a11b1f57bc97ab8007
-MISC metadata.xml 365 BLAKE2B 198ce5e41bcc5190c96f1513cf4bae60b691294d6343542d42edbe21d087deb81a3a4e102949638d714039959dd0ffa660db142b3b68184e60d6693679bbb0d4 SHA512 43148e8901940998cdcc1667aa7027cf7235273d9dd276eb884a319c99ec2154700ab7c56f25301f23a0238004209f4da887d08c2f3088f71c0c89aca6bcfb66
+MISC metadata.xml 365 BLAKE2B a7ed99c2d937c589f5e6278b891d3526ddb5eb6ee653d855f641f18330dd0a104db9d9e9bd37acfa22bf44fb2a45806ba8da6bc59fa123595c074af90f967989 SHA512 6369e766b5973bb8ea6c1a71dbe3ff3bd02be4d7660ce0c47f6c6e66cc42b7d26881a40f6f222db013bf0d682f35d572958325614d003fe504e499ccb5635d2b
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
index 7629548fb1c3..e9b2508856bf 100644
--- a/app-emacs/csharp-mode/metadata.xml
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 98c5ddeca401..2cc9b17dad6f 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,6 +2,6 @@ AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f92
 AUX 50ebuild-mode-gentoo-1.51.el 1209 BLAKE2B 06da1836a37ec6eccddcac50e999e5e19336f0d9da06813e2d2467a5799a79c848b5363fe1c7725801d6302310b37fa92c80373de0810a8330a50c2157e37839 SHA512 23022e1f532f0b3a1c14f855113b29529501ab84f685471179454fda7ce6494d9744204ee02cb729d402921469ecdc9addaabc43a6f4aec378b55f0b6f599718
 DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6407dee5ee7ee44229bb529de041d31fcec7c08bb1e4b8b5057823c5d99a49a9786daa0b7b17a766155b7daaaecc SHA512 a7c232103848c7782a4ebad89e064f3bc37a78427228be799d8e1bd3670524b32050229ba7cd48d9e4c2b0bb32828ce95eb2e47038411591d03fa8f998614c1e
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
-EBUILD ebuild-mode-1.50.ebuild 718 BLAKE2B f863df9fd2da8b7137eb2cb99bca3bb8b08e2a45adbd33c5eea9dffa72724c4426c9d54ecd6df99295ded40b846686996a1e19e1cf07cdddd601af348cc3bd42 SHA512 995edaa58b22fedf434ba64068d1100500c406a69ee54dc7cbe2333c5cf16977785fd95599a1b9c78929c45d0677f94ccb62d609c82ee14210f6f9a572bc52e3
-EBUILD ebuild-mode-1.51-r3.ebuild 718 BLAKE2B 1487fd11c6f36558281a387596c5a2f6e72c325a5eb949ffb58586dcdd4a3771bb214de37d7f9879b9f053f3d60ea4c268581b1df708b37aa298a422224bec7f SHA512 e28ce3972da962b8c7d5391a78104166c2cf50f2fb25d5848b8ef0d213bfec4587510efa2f13963f82faa87aedde4ad515a0934fba8d93aedb151c2c0ddcebb3
+EBUILD ebuild-mode-1.50.ebuild 729 BLAKE2B 7a3aea7ffb24774518ce77fcdc6020ffbb603524e06dd6662ec3c7effbcf2997403728d05db42a97cb3bb1ead20ff09a5d07a3c6aa2c7215079b720c96068306 SHA512 890d22a7dcfe831c93452a328c7511688e43f08c7b3b2c53fc8f52378229a45bd9ef96dc138db8ba63500804966708c27d0ff279322036a41d071ce9bb8c3c2f
+EBUILD ebuild-mode-1.51-r3.ebuild 729 BLAKE2B 46f74b1b56541e80f41bf14092627d542ca6c434bad44f606d548cc388102b78855db815fa6d151588e2fca2e6913781677687dcb1eb0b058db358d80669fb4e SHA512 7adf4ff115b8aa78d5dd7a6a222fa535dd85c26390e349896d17b8b729abdf73960bd8b4dd5014c47d87d26dcae28aba5f23a0262c4f8bbaf472c7468ae4c610
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
index 17f948f51cff..590200037821 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
index f66f220a0e07..a04c94b38bca 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 19db2d2f4a5c..bddb2587d9da 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,6 +1,6 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5 SHA512 42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de
-DIST nxml-gentoo-schemas-20210203.tar.xz 8440 BLAKE2B 733c7949bd39a94e657c829c478b76229cfbe2edca6f973f45a91423fb573ed6ff5717ef7bca74733266d7ff5b31f5426d06df51d79263422dba1467234ae8ba SHA512 bdd28b40d0748f595b6ac035686605b7d7a08e9802d0e497893329b4cbc1195f4e785befb8afe6362eb8eb45132f3928f394546412ba463c47977587b6f88b3d
+DIST nxml-gentoo-schemas-20210314.tar.xz 8512 BLAKE2B 9219644c1a0dbc7afc78c0c4f2623d9d71bbd4f62c387eb025e001e756262107d59f739d695c172ae4ef54049b98f4c3e92bc630be39bcf2f6727d8b0ea27247 SHA512 a092f48f3fe69df0bc51b3e5dd11a6ef09f4074589ffe9872f4936548caf14554fef8cd8ab42626f621c0163a23879698ad12a0818b52cc4b4a4f384a98afd6c
 EBUILD nxml-gentoo-schemas-20200303.ebuild 599 BLAKE2B f5f68523079760c4d46e7ed486e0270fbeae41772874fe449959c3e83eb924c50a6e46981191b5f8fcd247c98f637487f80eccee1640e79960be6bd04a65c579 SHA512 6ddf82bcf9fda6779b88fff85d9a46eb15450503d55fcb549d2492af1b22006303e1ab33a8f0d972be8f89c6b2c823fe620484a163c79add69dd179d2d867d37
-EBUILD nxml-gentoo-schemas-20210203.ebuild 606 BLAKE2B 6b3f604b78405c74b9488ab95d8d67f77b8d3cf9e70759a7a275c457cb91a14a2fee767c5deab5640c8ec675ee0f2caf3282f46629fb1eccf34f10771c0d242c SHA512 27930759e88402b704eeaae2860cdd680362c16b625cdd6f44a3d1fb9ea8b386e3e2be50e4df1067834c7f01b5b973d46f5fd3b068871b229a546f828fdd7cfa
+EBUILD nxml-gentoo-schemas-20210314.ebuild 599 BLAKE2B f5f68523079760c4d46e7ed486e0270fbeae41772874fe449959c3e83eb924c50a6e46981191b5f8fcd247c98f637487f80eccee1640e79960be6bd04a65c579 SHA512 6ddf82bcf9fda6779b88fff85d9a46eb15450503d55fcb549d2492af1b22006303e1ab33a8f0d972be8f89c6b2c823fe620484a163c79add69dd179d2d867d37
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild
deleted file mode 100644
index b8b974d25777..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.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
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="HPND MIT GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild
new file mode 100644
index 000000000000..949349df0449
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="HPND MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 195f976845f7..827ab1c27d99 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831
 DIST org-9.4.tar.gz 4724986 BLAKE2B 8f56c2459e1718d4982ccdba3a8fb1403ff4a66a5425ec341f6d5ef01b2415c87d77c7ac8a8cd7046b4398a18688ef5fb4f92d0131f6694bc6047b32e3dd5827 SHA512 480377b13950e1f9cfa2ec553f274156ff9a25a5572d5eb6137fa08a3d6f1d5c0a6942f4d139379974861ee467c3be17105bec6b17640beaa308c8fa6825f8f5
-EBUILD org-mode-9.4.4.ebuild 1713 BLAKE2B 9e403b5af66939a1abc64b30ad7ac8585c748a7cd860842ae39e23d95a28817320185e424f5d72b998b9c33c59e240c305833a5f9811b4c7f4b6cbd55402feb2 SHA512 af74d3acb3638926e7ac1315a2601e859432117646b6bb1544fef243f43847c8836cb448c75f6dda0b9ce63fca7fa425337c7bd5d8c500e39461bdd52509c0d6
+EBUILD org-mode-9.4.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
 EBUILD org-mode-9.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.4.4.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild
index 00545f28b213..bffbcb8d7146 100644
--- a/app-emacs/org-mode/org-mode-9.4.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 32c9093f4600..f011662d95a9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index bdafcae634e4..16616485d24c 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,7 @@
 DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
 DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
+DIST conmon-2.0.27.tar.gz 106647 BLAKE2B f242b1be4f86b18ca94dade3d1f5522d1ae1951f4b7abf7e563e1a93472c2a673cd48a136fdff12b410ebaa46694b70ffbf173fc37a3bbefb03891452c22dfae SHA512 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65
 EBUILD conmon-2.0.22.ebuild 1184 BLAKE2B 75c40011ce14d692ab11310ba9e32a9bece265c4f636680bec93186fc9d751e916ef2ad4b9e6cf9f7ebcb6a6d38ff7d37f6f7ba68a50a73cc17564ad1b9a6b73 SHA512 22244dd45ac55b9231b685f0fdd7dcb62d9f4f08f7aea114cc2eb161e3911435f7042d47a7464130d240fe065871694c46f6caace4b6876dd3598dafbe154d6a
 EBUILD conmon-2.0.26.ebuild 1184 BLAKE2B efa932a65151a81d7163adce779affaa458f61a7afee968352af3703189660c5051d3de0b09dc17e1a26057e63a8f5e7b54503fb8b3d103650fdcab60e6a8b43 SHA512 91eb9099ee247b638a8cc5d256278e4dc23c7e40b3053e91d7b724f1ab6658f690e5e8cda79b0176a976319fbe1006ac095b81bec3f1a0646a5c22f20aeb8061
+EBUILD conmon-2.0.27.ebuild 1076 BLAKE2B 3fd2ee929a340c2f6e05df50db97503e579c6ff3196f9aeef264cdc0d8ea0e12aea91719f5c2f0f168922f0d533febcf23797ba5fee2eb9f4b38c29f7d5dceb6 SHA512 9bfebc9ef6ad08f09d85539d9141ef562e73d37bd10c144acfed8f0e3bd25636b4ebeed8f2d130cb4fad4fb025b011249b19a1199eafa3ba948209f62e736cdc
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.27.ebuild b/app-emulation/conmon/conmon-2.0.27.ebuild
new file mode 100644
index 000000000000..8922d84fc488
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index bb168bf65c38..e48273149b69 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -2,4 +2,4 @@ DIST crun-0.16.tar.gz 1370194 BLAKE2B c2a2450518226421b43d93597b38da80ca330cb3d8
 DIST crun-0.17.tar.gz 1385658 BLAKE2B 3d4c30989b9e79d02bf9a6c298daa8d0b5b6b8bfcfaca8ae9e27ad865762a32b6af2c8806586bba2ab94271446a93c34e8f2d465cc008c41bbe69e565556a1b1 SHA512 b095a3c4fca8ae683553805de468594e8dd891cc9911b56e8be7c429584e71fb40a364cf55a6a829950078a539d35308310f53f57b8fb40d483d394e91b20b01
 EBUILD crun-0.16.ebuild 1393 BLAKE2B 4405a9825f15c2c29471a8d104b66a1a412c41aed3ef23d73ebac347eabc7afc8883795a8022aac520f1e5a47405d4247a96efa09e8a56a3b992872c6c407183 SHA512 8015aff83762d3b359d5d8ea4c8c20dc3693212659bb173101abfb01a6a617a102f4168736d74f4435ce01782964c03d63cee58db21b9cc2d6d82d0dc84fc55b
 EBUILD crun-0.17.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113
-MISC metadata.xml 1269 BLAKE2B 3c486216614d2758ad8dc7d01ca46babb33375fad75b959361d792a818d0515f1b2a4c913252eb2f006ecd962e281556137ded3eebe96f5e62f3caa5994c5bb4 SHA512 d1999558dfa98c2006e095589a15d2c2e61ac302b520759921c4eae5c94a245e25b0d7b23eb5754d5a324006d447ab3275bb188e8387110c9c3ec81f724efc87
+MISC metadata.xml 1299 BLAKE2B cfa5ced999f15c2aabb6633865fb8bc2f2dc7c2d2b4fa61780de40f975c8a00ad87d7c1251517f7a50b01c3413d2afbe8bca2114ce9eb74d0437285ee6d19d91 SHA512 0f2109b828550df8807736022598f3fa36128ff5224aa61cbb4001689c344b670c124bb85805cdedf8b2e7173b4cc6bc29d7d46ef95f7c9f03c4a9b6e1c93493
diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml
index 11d539113887..d62ebff73e5c 100644
--- a/app-emulation/crun/metadata.xml
+++ b/app-emulation/crun/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>robert@gnzler.io</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/distrobuilder/Manifest b/app-emulation/distrobuilder/Manifest
index 2b6b09991744..0eb68abd869a 100644
--- a/app-emulation/distrobuilder/Manifest
+++ b/app-emulation/distrobuilder/Manifest
@@ -1,3 +1,3 @@
 DIST distrobuilder-1.1.tar.gz 17339508 BLAKE2B 5dc023520783301bfaaee9dbdb7f6707a565b6b7cde18afe53051c47cf4ec243be4f279846753f4fdab75f8aa3333fc4e74d90376390073e36edcb57a1d22815 SHA512 4638cb7ad34032a4ab6d6d85a07b92b7ee3ebc6fe34672d148b0574d487ca2a572fbcc700f829865faa77ec07f78e47555246cb8a2455c713d5051f19cbf8426
 EBUILD distrobuilder-1.1.ebuild 759 BLAKE2B e6df503b7a2bce89b37da161b374880119722daac5af6afc09475a8c90475b073451e14eea2dc9182f49e16f45c78a99d93b768673e6157e58ab1bd98c9142bf SHA512 ef4b60e7406e759a71abad1f4f866669cdb87e1601b2380b835641915ab30f05ecbb7316ebeb894cd5437b659bb2385ea74ada60e5eda4098209593c4877ae0a
-MISC metadata.xml 489 BLAKE2B edf4553e951d14b1fd58ee9130f754749fc3104a61a1940280d53343f7499bbddf15198ab74c4531578c1abf87412aba8171d0e8c72d0c08f0b41360dddc3ce3 SHA512 06a94d8c75555bbef6abb3d59accd2d941c81e2d87747990ac253f67aad94b7e9967420eea8f650aff0e3b3f7bc567c2c1aa88009be14ff78183210beb892720
+MISC metadata.xml 503 BLAKE2B f42bbe0993502d3d1969100dd5086b7ac1ff52d6aedb65d6bbab72c4b63a2f66eb1c6c91d54ac65a02349dbb5040a5dd2c0a433dc5730cb9ec0af0d9bee9fec5 SHA512 e0f9ea85b0986a2a0c55c576cc96746f0e392544e1396c89c583316d4186ee885ec37c28a0e7959bae8ef36083f4f71a0dac1df782761501b94372b2b458de9a
diff --git a/app-emulation/distrobuilder/metadata.xml b/app-emulation/distrobuilder/metadata.xml
index b495e2e1bb0b..64ac1ae46534 100644
--- a/app-emulation/distrobuilder/metadata.xml
+++ b/app-emulation/distrobuilder/metadata.xml
@@ -5,7 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>posting@vodacomm.ca</email>
 		<name>Stephen Bosch</name>
 	</maintainer>
diff --git a/app-emulation/docker-credential-helpers/Manifest b/app-emulation/docker-credential-helpers/Manifest
index 0253fcb42d02..24db9c1f716c 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1,3 +1,3 @@
 DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
 EBUILD docker-credential-helpers-0.6.3.ebuild 1245 BLAKE2B 7151fc66ed32fa3c43e1c8df41f18431c15f843dd88985fd25a0864a0c99eed0c31ed168d3e8ed4d6460286a919140658e45a0f87630a443b7ceea6b9ef9071a SHA512 7f3a855a1c78a5f36f7bcd784cbb01dfd34d6796cf91376bb949ff98e1cf66b056a8cdb5755cc252392d827a352c30a813da0fb3556c62ba3ab8d3eb1361ead1
-MISC metadata.xml 847 BLAKE2B 7fff76aa67ee9868506860bb8a6812d0412cc9d5e8e6b4ef2906af3a761133fc299f5deb6ac48a5258a0d1b250611770042627f1dc667acab3a974960a2e1ca7 SHA512 f4cfd994d789f493ac2dba0699370fad8253121028ea4f25f882e406d7d6846cbea505149fff090cc6d898b5d4634472e4afe6ccb6f1177a5a23e7ba5136470f
+MISC metadata.xml 877 BLAKE2B 5411cc175644103cddc23decc424aa517f71296362ea3859cc969fc50ffec41b4fd325e98f681e9798e196f6da3f30dc86a4af0ca797d2d83684920b58550cc0 SHA512 e7f7a33a2fb1bbf308606d713691153304b2989de19a8a6f618471b252889d12af8d0737f53379a90da628dea2f7ea6fa61222e4d57c91297731b4b7f52cb793
diff --git a/app-emulation/docker-credential-helpers/metadata.xml b/app-emulation/docker-credential-helpers/metadata.xml
index 196e66de1e6e..d5dcc7f1c72d 100644
--- a/app-emulation/docker-credential-helpers/metadata.xml
+++ b/app-emulation/docker-credential-helpers/metadata.xml
@@ -7,11 +7,11 @@
 		D-Bus secret service APIs, and docker-credential-pass to use the
 		pass framework.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rkitover@gmail.com</email>
 		<name>Rafael Kitover</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index 4498450449eb..f9401d8e056a 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -4,4 +4,4 @@ DIST firecracker-v0.24.2-aarch64.tgz 1429004 BLAKE2B 8d5624f6f6f154678ffab945bbb
 DIST firecracker-v0.24.2-x86_64.tgz 1434481 BLAKE2B d2b81e2b3341317f296c63f14b2699dbf207e2e3a83871e38ef1666c105112788308c773afad61a85f7c6f4009f2373c80f12a52549120d92a42bae54891bf59 SHA512 2a574276296685117acf4e1d425ca75ecb8ad06680ae81e183d73853ff57cbca2f4cf4f42cb013d8d88d18146c0d84d2b098829ca5f6e9402213fecdf539a283
 EBUILD firecracker-bin-0.24.1.ebuild 2465 BLAKE2B 7e2fd7232b1d7409f10ea156e0813fa39da049858a71ff079fd14bf410141c63d5a9f87491befbd830bf3f323c5495ab7a8a945feecf741f5fa5a03d1985f4aa SHA512 9b910ba0af4ea9410dc573338e09396ea85d5850c957888b14c0bc92d7e4d78980335e252d8379eef3e2ee3bea5dead28b43890f7448df4bfef1bd9e57a23437
 EBUILD firecracker-bin-0.24.2.ebuild 2435 BLAKE2B 8622b836b146cbb96990dc0a65f8fc581eb8ded2fa281da6682a5bfc5fc91b65200b91ce8dd8642255eb0122d47f9318e22147f07fa89b5b24764caf34aa0fea SHA512 26d9df41a0be4785ef4b31bdf4160743c163ebae758d5241b7553469643449d943facbd8442778bc281736ca2fa4c9256360aec5b30b5252b5b664c5d52b6b39
-MISC metadata.xml 385 BLAKE2B 5637756b0993be1ae2695067acc7fdbeaae6c0d5e5cac29563a15bd54815d9b9e2c21d516754e95214f2007846c7b477ad7f70f3f42007d70552313e12e57942 SHA512 83790f17e3b5da6bea49d28a82b7eeb8caba881042450f63570cac4d3bd5d64c326ccc053b5b2f225b9fc68a8379707a77d2a484e51d9ce93399bab25058a123
+MISC metadata.xml 415 BLAKE2B 2e3287fc3b97cbe52c6ae404b2bf3c691e162a8f44ff75f720a56679e52327c0817860251d01e3bac8971cfafb7e9536f3c277fa77316547892361c6e669b8a4 SHA512 9762208fed64d628db75d544de99085643aa2fe1cb44c09bf93a2d3224932abeef7351d1332709e9851ab2346224d573d607171db64086c08cb56bfe0e25425d
diff --git a/app-emulation/firecracker-bin/metadata.xml b/app-emulation/firecracker-bin/metadata.xml
index 7f6b797d9b1f..866b948059f9 100644
--- a/app-emulation/firecracker-bin/metadata.xml
+++ b/app-emulation/firecracker-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo-bugs@ares-macrotechnology.com</email>
 		<name>Sebastian Hamann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index 83f4c9c32b3c..757c3250160f 100644
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@@ -1,4 +1,4 @@
 AUX remove-local-prefix.patch 841 BLAKE2B c29e10ed335d431c0cbd88a26028c03599c32d9ded001fa1f61f805589bd1c52352b52ac8f99c147af315ee91d65681d1c0aa355567108f92767f36fa6f6dee1 SHA512 c15ac87af402e06296d76459a13b5817be7393839ca1566c6f0eefaa3055f7f3f0dc7589f762d9caa0e0bd356790bbb1aca5c3ee6166155577bf3520f25ed125
 DIST fuse-utils-1.4.3.tar.gz 501006 BLAKE2B 0637fe05b71416e89eb61e3618ff45bd71250201924fb3741a4c5b9898d09b30acecba9957baeaa864c2c9cfe1bcb9cb38a2af83368bc5729221cec36a1eda47 SHA512 13404d1be81a2de9262cd79cce9dd8dc3f17238fdbb75da8a724b76b0976c03f34da9978af36b808103fedcf3f5d5da4bb10f251c5510127d59ca8de5607b99e
-EBUILD fuse-utils-1.4.3.ebuild 906 BLAKE2B 5d0e2325e3256617e87a1a147626cfa74b3e77638dc0218a45952e469cdf046ca76e97f61667f41bd63965795fbdc69ec3adf0689f6f7464795608dca71415bd SHA512 0d64435c04cfeb91259f0969aeb99b2d84128861772f9c2baa344bb4956b18c9d14e0d8e7251c9491b7a0fabd6fb82d8e590ef210263c6e5050b2dd11724b347
-MISC metadata.xml 389 BLAKE2B 3dbdab50b92657766b2c72e4123275c5b2b58e032ef5f944b2e771d985a6a6c84058c1e28287be157a01c36203b8278e2c091b491725124460d9caf51004059d SHA512 822ec5f3821519739d0e1bba1f66ac3e14925f00c9ffe1557867dece79c3832e2c48c4e3091b8fa79dbf09101dcc6de35d3bb4610467f849ae731de86b1ee247
+EBUILD fuse-utils-1.4.3-r1.ebuild 926 BLAKE2B afe7ad8f5fb60a8350835acf5d7710991d28b25f01bb9082a653759053d16815d9479cc956a62f2ac76755c0e604819a8c55792c8f44efe215b9292b6152ec4a SHA512 5b0bb4157d32d7916e75ef2f3f792d5dcb0e10f3aba71fbc96112d0a732baba6cbb2d3a1b4f4bb6540327ec2c8910869543256bc926dfa8497d0a044a3c960d5
+MISC metadata.xml 468 BLAKE2B d1653b29114c8a61280253b82ad6de47e100362a9a6113706648a25d3803e95eba5438c042b1af91c49e570eedef17598f4ce0987d3d01e76e6b3f4a908d7892 SHA512 b2a1360187920f5cb8516f9377cc1bec1732b84b83038a17ba33347b2bea403cdbfeb09a0abeb8e55157445f4cff13e803369bc125fc0a531aaa509b3aafe9e2
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..cc6f021a658a
--- /dev/null
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-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 autotools
+
+DESCRIPTION="Utils for the Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile gcrypt jpeg png zlib"
+
+RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with audiofile)
+		$(use_with gcrypt libgcrypt)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
deleted file mode 100644
index 8e44998a4a6a..000000000000
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utils for the Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audiofile gcrypt jpeg png zlib"
-
-RDEPEND=">=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?]
-	audiofile? ( >=media-libs/audiofile-0.3.6 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/remove-local-prefix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with audiofile)
-		$(use_with gcrypt libgcrypt)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with zlib)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml
index a335d4fddda0..0436766ec0ff 100644
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some
 		features, including logfiles.</flag>
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index b1a80def7fba..90b0236ec58a 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,7 @@
 AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
+DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
 EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
-MISC metadata.xml 588 BLAKE2B 4a3aeb05e4788fbd18b8d6f2d741e00f1b6f7a849fa0179afb9aa1d7e6f44f29c3ecaa4a527d280b940e7a5dd2ac7e4557184ffabdfc41f743389847dae71c83 SHA512 8c3695d6e28639e0741888eb51487b898e9452c560f486577d4ba412802a3a33630ef72f9ce8df928aa1a8a80ae238df7a7e49c2f945e43ebe7f5db5936c7163
+EBUILD fuse-1.6.0.ebuild 2916 BLAKE2B 0af606e43136c69fec26f7056225ff7ee2e0ed2ded6c83244a53a9e898b59568a37967507ae0d4537ec695a27c7844a2ee75b2d8e0c6254a3fdc7cc35ec3123d SHA512 1dc13be98ee7b8550836e77ce03acd775c129dee8135ddd99abcc2d3ee6486eb3b14f551de16b6ff4dd0b9198cc8d0b0e0ff4027b8fc662911dafc6c224082d7
+MISC metadata.xml 728 BLAKE2B 53fd75cce07e995581475b414394c05e5acadf5e49b3a6c9fcc4e8f5f34b14209f2628fb2ccee98d1018266888aa76778e63b87124a87a14f179601891153869 SHA512 0ec242e0640d786ed5e82c3e0553e4c054b4e493a7851aa47b1ed817f6826014aa2d1a91f8a398baefe76a5aa2535fb260003386f695a53c9c807b10994926b9
diff --git a/app-emulation/fuse/fuse-1.6.0.ebuild b/app-emulation/fuse/fuse-1.6.0.ebuild
new file mode 100644
index 000000000000..ddec66d72acc
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.6.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 autotools xdg
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+
+# TODO:
+# - allow using sdl audio driver without using for the UI
+# - allow using sdl joystick support with gtk3 or X UI in place of libjsw
+# - when using sdl for one of the above but not the UI, allow using sdl2 instead
+
+# At most one audio driver and at most one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio )
+	?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.5.0[zlib?]
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	backend-gtk3? ( x11-libs/gtk+:3 )
+	backend-sdl? ( media-libs/libsdl[joystick,sound] )
+	backend-svga? ( media-libs/svgalib )
+	gpm? ( backend-fbcon? ( sys-libs/gpm ) )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+_fuse_audio_driver() {
+	if use alsa; then
+		echo "alsa"
+	elif use ao; then
+		echo "libao"
+	elif use backend-sdl; then
+		echo "sdl"
+	elif use pulseaudio; then
+		echo "pulseaudio"
+	else
+		echo "null"
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-desktop-integration
+		--without-win32
+		--with-audio-driver="$(_fuse_audio_driver)"
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	# The pure-X UI hasn't got its own configure argument, instead it is
+	# what is used under Linux if all other back-ends have been disabled
+	# - and all except the Gtk+ one are off by default.
+	if use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	elif use backend-gtk3; then
+		myconf+=("--with-gtk")
+	elif use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	else
+		myconf+=("--with-null-ui")
+	fi
+
+	if use joystick; then
+		myconf+=( $(use_enable backend-sdl ui-joystick) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use pulseaudio; then
+		ewarn "The PulseAudio driver in ${PN} is experimental"
+	fi
+}
diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index 04bb5c6c82aa..f6bb92e4f4f6 100644
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-emulator</remote-id>
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
+		<flag name="backend-gtk3">Use Gtk+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
diff --git a/app-emulation/ganeti-os-noop/Manifest b/app-emulation/ganeti-os-noop/Manifest
index 9f08e26a4ec1..4cd71c15d06b 100644
--- a/app-emulation/ganeti-os-noop/Manifest
+++ b/app-emulation/ganeti-os-noop/Manifest
@@ -1,3 +1,3 @@
 DIST ganeti-os-noop-0.2.tar.gz 2247 BLAKE2B ea0d9c4e884aba81895e48b8bb86a28f90432ec768feeef5f561b13041279578c5730783c12a7207b330fe9190c0b41a44fdf154f8685bb8f4d3721f37d797f9 SHA512 ae121759ef775a5fee552ef2f939bb01126ff5fee3deeadae234a6f6f66b2589be1a6cc686d564d3a77406f5839f1cf914a3492c3ea9cc803427967fb75e3c5b
 EBUILD ganeti-os-noop-0.2.ebuild 564 BLAKE2B 2eb3a0dc82eae30ac81c13a28670242bad7f8cb0a5a5494b121bd6b31d4bfc9e464c5fe918de5d4005934063ee7572a76680c6c3c6b4c67e042c3fca068fbae6 SHA512 24d3b53a43f6aade1a075519285f64fc285c4b27ccd83a9442fa1035506480ea9979fcf18e72e831109056abfe38372eccd6cb78c0e907942dbcd93261d70c36
-MISC metadata.xml 335 BLAKE2B 29dac66049297ba00c1a8c850ed7dcd9748b49c232033d4a0ce2ffe92ccd3160d8b25dd15ea989ade9508422f210f9ce6ad3438e79e6b9d04085ece9cc83bdc0 SHA512 4caaca34dae159ff71972cb9e91c8c8ab1743c3626873d0e7e21d184b88d3a86be2510fb14219adaaa1f4ff7b6f7459146e6eb98145c7af46fdd8ee2cdc11f7a
+MISC metadata.xml 335 BLAKE2B a8af2ad6ddbe571ed1149714127a467e89fcfe07c1aac006689fa18e92af3afbde7dd7bac29322d2cce3d7ebf8ed2855ab319b413aa832f693df1871a95afb80 SHA512 044a7f76eceb533617b7ce0e901434a38c77fe419537cbf4f1c11fb2c9836fd6894cbdc456270aaf1e57ae4cde476937c7b929599b0dd530bd86a42bbde04fba
diff --git a/app-emulation/ganeti-os-noop/metadata.xml b/app-emulation/ganeti-os-noop/metadata.xml
index 0be915a90eff..b18a6a1b928d 100644
--- a/app-emulation/ganeti-os-noop/metadata.xml
+++ b/app-emulation/ganeti-os-noop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 907f8fd31d60..a392df24c8fe 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
 DIST genymotion-3.2.0-linux_x64.bin 48173545 BLAKE2B 3b921dfe01d56989d8f8998f6555fceabbfeacd3e87969dcc226d354e1ad5173e37682127d3158bbb280fa72386fd67adbcc3e64b2c5325c8144f106a8fd4469 SHA512 934047a4ced3dcc97c4be4f9767b885d79451701d974471e55b338ffb6bdb255654933678b6a8ba5a732b95ad0992b049effe2bcb8d05957526093b246d5deb6
 EBUILD genymotion-bin-3.2.0.ebuild 3513 BLAKE2B b6aec93ad7fbe91e6e9a52b03e31b6e7f62d53e1aa6fc34b7a0a31d813cfc5bb36053b28db18e13b943aabc790bb5fcbac5ae6f275a5cbc5ba0ce3c909f85c05 SHA512 b6a215f0928577b96ae2222aa9c60ea971990242895c2a7cdbecf517fed7ed7ec1393bb263a446c67636a9843c5c884cf3b5204e9afe993ee2435d0f0913fdcf
-MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
+MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/app-emulation/genymotion-bin/metadata.xml b/app-emulation/genymotion-bin/metadata.xml
index cc2aa77ecc42..a4f3061c46d6 100644
--- a/app-emulation/genymotion-bin/metadata.xml
+++ b/app-emulation/genymotion-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/gxemul/Manifest b/app-emulation/gxemul/Manifest
index 7b487db67bdc..6deb75774a55 100644
--- a/app-emulation/gxemul/Manifest
+++ b/app-emulation/gxemul/Manifest
@@ -1,9 +1,5 @@
-AUX gxemul-0.6.0-fix-mkstemp-test.patch 384 BLAKE2B 35dd0ac35c1084f0abbff566ddf3233fd9b9fcb0c1224c5e70fc3df780102e5a1de3978893ed34ffc336d9d0e7eeacf590a9229d25c65fe257174adc706e42de SHA512 100c394683bfe340360a9c660aeccb39c40eba8c80511ef9929d0342fc7425a2bc1d8e001d8d9da5a16c439ad766fb7166c04662828e485520d501545c38bd54
-AUX gxemul-0.6.0-fix-mymkstemp.patch 253 BLAKE2B f25e1cace6f1c810b902f1d64a37bab72f6a108c6b5e9b1b49e200b6a4b454b5f42a4673e3544124b791036718bcb90e6da56d487b4f8c3cb81bd525b1afc26e SHA512 1f9093e61a0902651e67c1e6144191ca4eb33f28edccafb8f83f12b5a702aa56711165ac19c8e45192a47f393facfa60bcbfdd0014e911722d80953c16e83f7c
 AUX gxemul-0.6.0-gcc46.patch 418 BLAKE2B e098bc1d64a911e9f9c67dda43bf4a1249ac450d88217f92938b9662b72d5f33b75f419ad12630bb9c8638b6e6aed5bdb487eb9e861f9d6563ed3a2d0d98f6a6 SHA512 0652b82645c75a56b24ed88e3cd9d68bdbbd927e64819aae22d61614db520dcb4fa8b9eab06b2ccd5c01f78d20008c587f3245c520b9bde0cafbc5cfdf3083c1
 AUX gxemul-0.6.0-no-doxygen.patch 516 BLAKE2B 31a6fd2037bb2d69be439adbb6a907bc143f39cb682c33d355f5a43ab77e5636ab6c534ae06e303463166099ef22747e2cb54dc74ddef2a1b0876236571c84bd SHA512 f8672505817e9634dc574ed9eb5bfe738c3ada0e86d29b67dd03ba0458b49f7af9d10511882e5473713ec77e43b94c3c55ac4962e7335179ffb3e567ba41681c
-DIST gxemul-0.6.0.tar.gz 3598795 BLAKE2B 01bab252b8497379cc819899d9030fd267cf7679a90a421f435c6cb9ce84fedbdbd0ff23a11e0c91a17e41e166488562b4e173b3793cdbc2dd53b70701351429 SHA512 38108c7e4f1332bf80046a63e4a7c5e0fbce7f83a62fdeaa4518ef02947d7de83aac20b0307d286b7eb5d9c721b8400d449d4f244b2bc9358a2502fa21f56b73
 DIST gxemul-0.6.2.tar.gz 5897883 BLAKE2B 9f5b76d955dc3e1a5b1623aaf491f18376456f33cfaa6a4c1633480980c35bb99172075135cfc1ca942ae3b0f34c4eb11c4aec4bc00272da8bb905176ddcea4a SHA512 4f389c509f9ecf39603ceed50e899e2bee285d3fefac9b3214076115ee71b5a7a68d1d92690b6debc8de5cf5f0303da83b3cc921a5c0b5eb4c7ad89baa730b59
-EBUILD gxemul-0.6.0-r1.ebuild 1078 BLAKE2B b136ac099a9a890b406f79234ab7899f567f2f0170cd377716323f3bd26a84ef422b7310df8495934143ab80af29992dc586f03c868727a265a4aa98fbab64be SHA512 a71fdf46aaa05a4727a374806a0f851b499bd41a7a2ca8a38fb31f57445dccd1acdaf7064b1f3d0d6935b8a1f5fb915ce0a9754d06da956b4cf0ff6077793495
 EBUILD gxemul-0.6.2.ebuild 969 BLAKE2B 4e47fea1b32b6c22e9b32e3ce03bfac77ae50db7b791c70b43c5b2d5c4bda7d7f5d24f95b0236cc3912676fd81c410255e1fc31ac95c653d67206f74e1a85db7 SHA512 4be52a5a04d8824dfb12e5e962a2c3c9d46417460d7c747f9417fec8ba284ebf654d343ff61d1206e17aef70bc09f7b6322eef70b078a251580187c323bfd38f
 MISC metadata.xml 422 BLAKE2B fafd4fe4407522b0d25cdd546c636eba02a245ccb86ec2affa49f479c069cd73aa677f524fd73e41c441f10fd759d96c82157b9a1f8d7fc3ff715fe35e1dc637 SHA512 78942cda34c7b5fe85d937f517846730a76c2b52688a871c683630c122db7fb4ae8db2fbc8a03fa06218e2c3d18ffc406692f81b021ae5613a818feefa54513a
diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
deleted file mode 100644
index cf8b18379cd4..000000000000
--- a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure	2012-11-03 09:08:09.373041529 +0000
-+++ b/configure	2012-11-03 09:08:31.999585979 +0000
-@@ -705,6 +705,7 @@
- #  mkstemp missing?
- printf "checking for mkstemp... "
- printf "#include <unistd.h>
-+#include <stdlib.h>
- int main(int argc, char *argv[]) { int x; char *y = \"abc\";
- x = mkstemp(y); return 0;}\n" > _tests.cc
- $CXX $CXXFLAGS _tests.cc -o _tests 2> /dev/null
diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
deleted file mode 100644
index c9e21bcc4b33..000000000000
--- a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/old_main/misc.cc	2012-11-03 08:47:34.309732354 +0000
-+++ b/src/old_main/misc.cc	2012-11-03 08:47:02.096573614 +0000
-@@ -122,7 +122,7 @@
- 		p++;
- 	}
- 
--	h = open(templ, O_RDWR, 0600);
-+	h = open(templ, O_CREAT | O_RDWR, 0600);
- 	return h;
- }
- 
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
deleted file mode 100644
index 2dd8d8087fa6..000000000000
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types"
-HOMEPAGE="http://gxemul.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/gxemul/GXemul/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="debug X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-gcc46.patch
-	"${FILESDIR}"/${P}-fix-mymkstemp.patch # Bug 441558
-	"${FILESDIR}"/${P}-fix-mkstemp-test.patch # Bug 441558
-	"${FILESDIR}"/${PN}-0.6.0-no-doxygen.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i configure -e 's|-O3||g' || die "sed configure"
-	tc-export CC CXX
-}
-
-src_configure() {
-	# no autotools
-	./configure \
-		--disable-valgrind \
-		$(use debug && echo --debug) \
-		$(use X || echo --disable-x) \
-	|| die "configure failed"
-}
-
-src_install() {
-	dobin gxemul
-	doman man/gxemul.1
-	dodoc HISTORY README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index cac8678977d5..14177ed13a55 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,3 +1,3 @@
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
 EBUILD img-0.5.7-r1.ebuild 866 BLAKE2B 10d5041a3b379840b8675490a7abf54e5dc9c437e5d9424e4f3dab670fc5df138f1f768afb18391e2ee6ae966134f05ad5c956a917337b01f305e9aa93f7a946 SHA512 e5f07e98f8bced65cdecebc1a0b827c47ddeecbcf45963202638ac71b7b13a28ded8b3c2b31d19a87395f37e5a1cb406185d3d313959601c817052b836a3f6e1
-MISC metadata.xml 442 BLAKE2B 9eabfb5043d4b0c579254b497e4fe9252068eef479dc238307a1b69fb395491c7802d9792325f38876ef3ec280d7879a7a06dd1523635c9873565576b1a8edb7 SHA512 3f8d4c2c15806151513d588239dfd365fa1857fd8eb296e460fbc78d31aa2c3488b4da1cfeb32d91fa1a20bc957506954db632142d99b0382b1883d23f7cd492
+MISC metadata.xml 472 BLAKE2B ccd549b95101a4b10d02707afc8b6bee66c948632ee71b0dd9bbe35f3c3271e52bd84490e9e026f136d48695bd289648fb6c34b0cb5740a1f567fb6861adf47a SHA512 64b113d79de20d1088e16e6bc4997cfcc907ee5329e7821101b9ffcd001b5174392398e83094eeb23bef8bb4fe6b8a7bdb960f58de48fa433bda21280ca22c99
diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml
index 236a80be46df..f4763669e4da 100644
--- a/app-emulation/img/metadata.xml
+++ b/app-emulation/img/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 794338aef128..46d899231f5b 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,20 +1,5 @@
-AUX 1.28/0000_bug_499150.patch 406 BLAKE2B 99ecdc6e98e9153f9939ea0318d7afc9cf852e8a575e5ff6731e2be272574510bdef1225303d131c099df5b39702b6cd7f141ec5ddcbeb2722c9cb7b6b63e080 SHA512 a131e49f9e9d3cf6080e0f3ad27805572a1e05a01f348a1ffad62b75d24cb72526bf68035b9a600fb1ae3864e813768a971c6b7d6f31f4a8467b4a6839ebb568
-AUX 1.28/0001_add_gentoo_names_to_configure.patch 262 BLAKE2B 13851f2abc4c979c337120d604e325a8a4bee77ebfb720456fb6e38255ccbca81f11b783d9aa9433842d44c4d1a6811310fd72c58ad99aeb79fdbd3a970c138f SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789
-AUX 1.28/0002_add_gentooway_to_remove_la_files.patch 555 BLAKE2B 067ac24e6aa1a8b0df80378054f420660938cb9a2bbdc1cf3c00e9c74ba36f0add71e8c7b95776b2d965aa06c5feabd0ce4115c5ffeff3f5a78828f2ecb162ab SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b
-AUX 1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 BLAKE2B fd04c471a1eae62c0e3151ecb96dc540cae744e3eee85daf2eaeaa18515b6fead7f087757bfc46ab293865c6af73e745ab57e16934979c6ece95f4178ef74e48 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112
-AUX 1.28/0103_disable_php_bindings_makefile.patch 231 BLAKE2B b86d1fb1d8b3fa45f9b2470f72e04737c105108ab8bbcb0be00437aee05931ee229228573a4d1f7388d1d754bb4c50d61c13c08f7876a9f52fc63f7803499667 SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3
-AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493deec5a423b85634787e8dfe47841bd8d0c31eface0e40ac55698ca269f373381623ddd8d414241bc8775164ba43607a48cef1abed4d156d SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c
-AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167
-AUX 1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1069 BLAKE2B 40838bbaa344984558de1f7281057f26905e3715ef4675e168c85afe5d0f9161547f1816c543bcd37a2e586e3390bfe2950b0e087a8ca1312e543e454cf001f8 SHA512 850df31f977a242bf9b314c7daef9481fa1f886389087b724de1643b57c70c6ec36296a141d3d63858bcd8602370c874d301d71a8e46920c6f7f809bdd26e6f9
-AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
-AUX 1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B 8062f548097fbcdb1c2cba45553eb22d315e618379d3fab8b87ee9c269c6e8de849de81511c6e9ed0aa1023a9ff31131b2ba507a0b1602e7485e192398fa3151 SHA512 a7cf03794c01b4386f7b78762381d17a37bf0abcf65800751126093b335f2e2dbde95f5016c9fc6813d8465370a96018c4aab6f9613104430d04b94a39b78ced
 AUX 1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1149 BLAKE2B 7b9f870370a3ff32cb9ae7ca75cad885c442d322b695349efa238dd27709e890d98bc1c4a093446a4ad3eacf6e1ac55057a4a4b757a5e5520d2df315bbac3a8d SHA512 83cee02636508ce674688584095954d90e1830d85d869a9c9bea73bbf5193da980116313ebc8726dce7708d464bca0f647c3738b36197d5e78adf398b2608d57
 AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B b73cba74867f37ee3e640311a885ab46ae952fa9322469cb636a27da23e69762800f7d867273d1c9b439444d759c386877044bbc3ceb42dde96de9ffc942fcb5 SHA512 331e724a8978af2a608eb86fbf3744d0d97208a73c43ab919286369ade836b9d1f571b8990a1b92b68ebe01d6c9040e2293426a1c49de4e6a11ab1c60013de23
-DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
-DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13-r2.ebuild 4068 BLAKE2B e1ed4bed7e91b15ef764e02b9ea0b57f4445a15b42acb61c40e6713e2eca18159cfee126969089afd02d945564d778e3cdb4d94f50bd41d252073ee07159a79b SHA512 045a24d92a43ff064c70f7050264ff7187c838912da4852fe717edcfec820e864529cb1e0b81f5f5362b31604c1516d8665051a8070f34ce74f7bc9a97ab1f30
-EBUILD libguestfs-1.36.15-r2.ebuild 4272 BLAKE2B 4faaff876e59c79077f9222d3560f60443e11599c0862f25fdcada21a2e6ea6342a93b8cf8a228bf8f8bfdc9de0387724baa4ab8c2755f3690892331866dea71 SHA512 a04d6cc9d2a8c66979fae3e73ab292a9e3c5d0b958f3856411d57ed7928393acda8320faf3306a7a1bebd83231fab303cef67b9ead14ea8fb7782e17f1ef0559
-EBUILD libguestfs-1.38.6-r1.ebuild 3984 BLAKE2B 613029ed271bc50e83c1e25c7045ff433cdc1332d2f9ed09b191352b43268597955d6392245bb25dded3955c2e900b19c4526f0070baa70cc62bdb7bd1666d38 SHA512 00a7bea64c8e628b154c5d746f95c9d5830e23ea4709a4767758518e07192b66aaef5112a350769973c0d11992f38e18731f22464d7efc829d7f5983eddf7749
-EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1
+EBUILD libguestfs-1.38.6-r103.ebuild 4500 BLAKE2B fd0a456bee5c143ff2e05208f5cfa4e9816bdc06ca93527c3ddfa43140c532067056c5800f1a1db397f9c29b16aaac07a3e16fe04c647fe6e7066aac52aae148 SHA512 3c4fa805e1e55dda3e53db238c08e8bb509b655d7542be7617258bb3ad5f8214659317860454925da1a2b8d2db3682a29fb8efe46c455881c55e1611d957257b
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
deleted file mode 100644
index 1e0f1a32185e..000000000000
--- a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
-+++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
-@@ -24,6 +24,7 @@
- 
- AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
- AC_CONFIG_AUX_DIR([build-aux])
-+AM_GNU_GETTEXT_VERSION(0.18.3)
- 
- dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
- dnl gives an error if it sees this, but for automake >= 1.13
diff --git a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
deleted file mode 100644
index 9d209ff53584..000000000000
--- a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,6 +482,11 @@
-         DISTRO=UBUNTU
-     fi
- fi
-+
-+if test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
-+fi
-+
- if test -f /etc/arch-release; then
-     DISTRO=ARCHLINUX
- fi
diff --git a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
deleted file mode 100644
index 38a591b811ed..000000000000
--- a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1487,8 +1487,10 @@
- 
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+dnl AC_SUBST([LIBTOOL])
-+LT_INIT
-+
- 
- dnl Produce output files.
- AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
deleted file mode 100644
index 69b3ae6d0d2d..000000000000
--- a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1491,11 +1491,12 @@
- ])
- 
- # check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
-+#m4_ifdef([GTK_DOC_CHECK], [
-+#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+#],[
-+#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-+#])
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
- 
- dnl Library versioning.
- MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
diff --git a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
deleted file mode 100644
index 34ab42d27903..000000000000
--- a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -88,9 +88,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
diff --git a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
deleted file mode 100644
index 24da76fbab5e..000000000000
--- a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a5fd133e001bb62d13c47ebc392fbb696a513640 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:30:56 +0200
-Subject: [PATCH 1/3] Update libtool initialization
-
-Use the recommanded macro post libtool-2 release.
----
- m4/guestfs_misc.m4 | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/m4/guestfs_misc.m4 b/m4/guestfs_misc.m4
-index 5dce207d7..a2bb39c0d 100644
---- a/m4/guestfs_misc.m4
-+++ b/m4/guestfs_misc.m4
-@@ -17,10 +17,7 @@
- 
- dnl Miscellaneous configuration that doesn't fit anywhere else.
- 
--dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
--dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+LT_INIT
- 
- dnl Only build boot-analysis program on x86-64 and aarch64.  It
- dnl requires custom work to port to each architecture.
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
deleted file mode 100644
index bf265f718c73..000000000000
--- a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:27:50 +0200
-Subject: [PATCH 2/3] Add support for Gentoo in distribution detection
-
----
- m4/guestfs_appliance.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4
-index 890b1999c..9b79e1a41 100644
---- a/m4/guestfs_appliance.m4
-+++ b/m4/guestfs_appliance.m4
-@@ -114,6 +114,8 @@ elif test -f /etc/frugalware-release; then
-     DISTRO=FRUGALWARE
- elif test -f /etc/mageia-release; then
-     DISTRO=MAGEIA
-+elif test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
- else
- dnl fallback option
-     DISTRO=REDHAT
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
deleted file mode 100644
index 093a53f11632..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dc35ce2ba774a9284360bfd6532acb527a2f73d7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 11:21:25 +0100
-Subject: [PATCH 3/4] Fix install failure when not built with OCaml support
-
-Makefile rules in po/ require builder/index-parse.c to be generated to
-allow translation utilities to work on it, however builder/ is
-completely masked behind OCaml conditional build even if some tools do
-not require it and proper guards are in place already.
-
-Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7eefacbeb..c0a68151f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -155,7 +155,6 @@ if HAVE_OCAML
- SUBDIRS += \
- 	mllib \
- 	customize \
--	builder builder/templates \
- 	get-kernel \
- 	resize \
- 	sparsify \
-@@ -169,6 +168,9 @@ SUBDIRS += dib
- endif
- endif
- 
-+# Tools mixed with more OCAML based tools
-+SUBDIRS += builder builder/templates
-+
- # Perl tools.
- if HAVE_TOOLS
- SUBDIRS += tools
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
deleted file mode 100644
index 087708db396a..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:33:58 +0200
-Subject: [PATCH 3/3] Workaround autotools-utils detection of gtk-doc
-
----
- configure.ac          | 3 +++
- m4/guestfs_gobject.m4 | 7 -------
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 268e6a182..65f4231bc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,9 @@ m4_include([m4/guestfs_lua.m4])
- m4_include([m4/guestfs_golang.m4])
- m4_include([m4/guestfs_gobject.m4])
- 
-+dnl check for gtk-doc
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+
- dnl Bash completion.
- m4_include([m4/guestfs_bash_completion.m4])
- 
-diff --git a/m4/guestfs_gobject.m4 b/m4/guestfs_gobject.m4
-index 4b4eab80d..4304f7b00 100644
---- a/m4/guestfs_gobject.m4
-+++ b/m4/guestfs_gobject.m4
-@@ -59,10 +59,3 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
- ],[
-     AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
- ])
--
--# check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
deleted file mode 100644
index 9bce9b05b051..000000000000
--- a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 12:14:15 +0100
-Subject: [PATCH 4/5] Loosen build time requirement on bash-completion
-
-Distributions might avoid pulling bash-completion during build as it is
-an optional feature and would only make sense at runtime anyway. Since
-this setting is well-known across a given distribution, allow them to
-provide the value and avoid the dependency.
----
- m4/guestfs_bash_completion.m4 | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4
-index 1f171b79d..9e877f6ab 100644
---- a/m4/guestfs_bash_completion.m4
-+++ b/m4/guestfs_bash_completion.m4
-@@ -16,14 +16,13 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- dnl Bash completion.
--PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
--    bash_completion=yes
--    AC_MSG_CHECKING([for bash-completions directory])
--    BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
--    AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
--    AC_SUBST([BASH_COMPLETIONS_DIR])
--],[
--    bash_completion=no
--    AC_MSG_WARN([bash-completion not installed])
--])
--AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
-+AC_ARG_WITH([bashcompletiondir],
-+        AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
-+        [],
-+        [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
-+                with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
-+        ] , [
-+                with_bashcompletiondir=${datadir}/bash-completion/completions
-+        ])])
-+AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir])
-+AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"])
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
deleted file mode 100644
index da60a79915f1..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools linux-info perl-functions versionator
-
-MY_PV_1="$(get_version_component_range 1-2)"
-MY_PV_2="$(get_version_component_range 2)"
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-# Failures - bash-completion, see GBZ #486306
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-		dev-libs/gjs
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=app-shells/bash-completion-2.0
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	eapply "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-libvirt \
-		--with-default-backend=libvirt \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
deleted file mode 100644
index ed267915f05c..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	"${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	"${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
-	"${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
deleted file mode 100644
index b522fb1d4797..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<dev-ml/ocaml-gettext-0.4.2
-		dev-ml/ocaml-gettext-stub
-	)
-	>=dev-ml/ounit-2
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
deleted file mode 100644
index 9e213a0a9410..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions xdg-utils
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( ${LUA_DEPS} )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<dev-ml/ocaml-gettext-0.4.2
-		dev-ml/ocaml-gettext-stub[ocamlopt]
-	)
-	>=dev-ml/ounit-2[ocamlopt]
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-# Upstream build scripts compile and install Lua bindings for the ABI version
-# obtained by running 'lua' on the build host
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
new file mode 100644
index 000000000000..718edf8e60d5
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.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-1 )
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/"${MY_PV_1}""
+
+KEYWORDS="~amd64"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Failures - doc
+
+# FIXME: selinux support is automagic
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre:3
+	app-arch/cpio
+	dev-lang/perl:=
+	app-cdr/cdrtools
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+	sys-apps/fakeroot
+	sys-apps/file
+	libvirt? ( app-emulation/libvirt )
+	dev-libs/libxml2:2=
+	>=sys-apps/fakechroot-2.8
+	>=app-admin/augeas-1.8.0
+	sys-fs/squashfs-tools:*
+	dev-libs/libconfig:=
+	sys-libs/readline:0=
+	>=sys-libs/db-4.6:*
+	app-arch/xz-utils
+	app-arch/lzma
+	app-crypt/gnupg
+	app-arch/unzip[natspec]
+	perl? (
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		virtual/perl-Getopt-Long
+		virtual/perl-Data-Dumper
+		dev-perl/libintl-perl
+		>=app-misc/hivex-1.3.1[perl?]
+		dev-perl/String-ShellQuote
+	)
+	python? ( ${PYTHON_DEPS} )
+	fuse? ( sys-fs/fuse:= )
+	introspection? (
+		>=dev-libs/glib-2.26:2
+		>=dev-libs/gobject-introspection-1.30.0:=
+	)
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	erlang? ( dev-lang/erlang )
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( ${LUA_DEPS} )
+	>=dev-libs/yajl-2.0.4
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	net-libs/libtirpc:=
+	sys-libs/libxcrypt:=
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	|| (
+		<dev-ml/ocaml-gettext-0.4.2
+		dev-ml/ocaml-gettext-stub[ocamlopt]
+	)
+	dev-ml/ounit2[ocamlopt]
+	doc? ( app-text/po4a )
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	test? ( introspection? ( dev-libs/gjs ) )
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	"
+# Upstream build scripts compile and install Lua bindings for the ABI version
+# obtained by running 'lua' on the build host
+BDEPEND="lua? ( ${LUA_DEPS} )"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PV_1}/
+)
+
+pkg_setup() {
+		CONFIG_CHECK="~KVM ~VIRTIO"
+		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+
+		use lua && lua-single_pkg_setup
+		use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	eautoreconf
+}
+
+src_configure() {
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	# bug #703118
+	append-ldflags "-L/usr/$(get_libdir)/xcrypt"
+
+	econf \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		$(use_with libvirt) \
+		--disable-appliance \
+		--disable-daemon \
+		--with-extra="-gentoo" \
+		--with-readline \
+		--disable-php \
+		$(use_enable python) \
+		--without-java \
+		$(use_enable perl) \
+		$(use_enable fuse) \
+		$(use_enable ocaml) \
+		$(use_enable ruby) \
+		--disable-haskell \
+		--disable-golang \
+		$(use_enable introspection gobject) \
+		$(use_enable introspection) \
+		$(use_enable erlang) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes) \
+		$(use_enable lua) \
+		--with-gtk=$(usex gtk 3 no) \
+		$(usex doc '' PO4A=no)
+}
+
+src_install() {
+	strip-linguas -i po
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+	find "${ED}" -name '*.la' -delete || die
+	use perl && perl_delete_localpod
+}
+
+pkg_postinst() {
+	if ! use gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
+	fi
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+}
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index 848028824255..211443d31413 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,4 +1,6 @@
 AUX remove-local-prefix.patch 851 BLAKE2B 1e1b787c10499bfbeafca43b08f4cbd8c7525841c641a3fa1211822a7ec3e98b11c9925b1bd9cc8ac3b14e5d0625c34727a330e00f0e3aaf5aba1871a8810647 SHA512 bae42eec33ff2ae00547d8c649b8164fd5665b70e95b07f95cdcce41e342702de559c4b63d6ce95a97407d2e8012c7fe0142b923603c1c1d25b8978f29aaf7a3
 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
+DIST libspectrum-1.5.0.tar.gz 602354 BLAKE2B fc62437ececfe2c86b475efa512bf7aa7c5af182e16a00f75f77f78656fca01d46a71ac90b38008ff46e5fd0710b1c671b283d65544b5556d98e8c5b66525c35 SHA512 55f4cf623bc6c469a0fd80751ada694259d834c19d98400ba244aabf2ac21fed7cdd6de069d9ed7326e099bd3bd62c42cfb8a669b64ae002f90a52563fa2dcd1
 EBUILD libspectrum-1.4.4.ebuild 1040 BLAKE2B c66daea0426b3fbfc816255e49501a9e4162a25436c2dc35519b09e213980f75f3d691b198cc90574d319403f03477efb2ff256a9c9bef7290b65564ed7daa29 SHA512 cc20f0cb9bbfb3d34ba04c4d9a94a58cc14d53363b2a4f8536c0e1368066d3e5970e9a7cafc3f9d564f071b577e3df7e1c008a64168b98912f12208ce6ca9e99
-MISC metadata.xml 728 BLAKE2B 82be49422307c4d16f84303d43ad0f16af9c1b67380e7a5c79d8691acbb2af6f25a4be300f8753abc92d833723b1f65d88cec9471136f663067cc7ec90576fc6 SHA512 d1d2634e9b72b06ec8eef16451969e24b0291bad4ec1cc9368881bc28dca0f2afc3fe555dfd8c0fb41ab86c16e3dcf5ffcd45d2619d983e11604d2fed4fc1545
+EBUILD libspectrum-1.5.0.ebuild 1049 BLAKE2B 4cfc6b4d94b6bc7a403a95c4be47b5f6980f9b1f87721492f7af2a1378f90655559c2ca49fdbc6a4e6282e51c5c04655ad1578fac5ad712329e00fe13fbef837 SHA512 27e3724b0301efb057ea9ac166d873c78e2c739d590aca5d58c11ff9dcbc5935629d319ab3c1c1ccd34ff26b5d1eed318080c24004905acbbaa2f979d93dfcc0
+MISC metadata.xml 807 BLAKE2B b7480d37223342e7c77327d2dc33bf7debb5436ed2ef5a4633a28e9eb2c8def8b5b44c8c66117297de34129f44d8e43870c625839c02b8684f2801d4ca1b59a3 SHA512 95fed51c49f34cab69fafbc0d814aaa63c302d3443bf9bfefd18bc6bd57d337f0329de1eef0f5656dcf5741d7046b6eb64d780dea1a8d24a9c131dc05dd51503
diff --git a/app-emulation/libspectrum/libspectrum-1.5.0.ebuild b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
new file mode 100644
index 000000000000..aec492d2edec
--- /dev/null
+++ b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Spectrum emulation library"
+HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="audiofile bzip2 gcrypt zlib"
+
+RDEPEND="dev-libs/glib:2
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	bzip2? ( >=app-arch/bzip2-1.0 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt *.txt
+}
diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml
index b24f12aa4850..b019c6b4ecf0 100644
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<longdescription>
 libspectrum is a library designed to make the input and output of some ZX
 Spectrum emulator files slightly easier. It is intended to be usable on Unix
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 62f679022013..105a06dcef1e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -18,5 +18,5 @@ DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9ae
 EBUILD libvirt-6.8.0-r2.ebuild 8761 BLAKE2B dad229775b97a350f98e2aa20b99abf8032c89c61f464cc40f4470f89889365cab242befe4d5283f3788400b31176e444d52957d638e4e6a3ce0e9003b6b08f5 SHA512 d4d8d79508871a4ba632d134d71e49e15c069d1f249abc695ac398b0bed46331cd0253c41910773904c5d0ea854505c47bd1733a11fde15516776cf0e2757886
 EBUILD libvirt-7.0.0-r1.ebuild 8445 BLAKE2B 9ac249908c83fcfb03b370999afa4c95f83188cf759bf53f55ae7232930348d7174fd93af3ea957426ba44c59b93131c1a3e9f710e69b14473ea6fcc4994fdc5 SHA512 54ffce4674c9a22db3be9878073ba3695ff99cb3c6a9f68540832c9d1f2df2a81ee3e8c89a1805f79cc58b317c8c1496a91ab9f2875bd280967135ec0b131d88
 EBUILD libvirt-7.1.0.ebuild 8197 BLAKE2B a97c4c71f59730b6c145cae14bf546278d988b8b8b13dd130cebd3c0ec64f80c1247a6caa7e80bf4366f703febc2400fffda0e5593478cd83dc2f4a806407377 SHA512 a8bdb21b844f34450e96c2eaeedcb6c87ded9d43f7cceab623dfc64b747e2c74778e6a4ee3cfe8b62cf8f5fefd90384e0746a4a8384791b4b001a94fe9b0b6a7
-EBUILD libvirt-9999.ebuild 8260 BLAKE2B 8fc76c116b738f49b96880260a1b94662a3420ae138e48394d2c62700bddfa49f5817695d7456d25ba7e2823ac2e9a6af1db7fe5087c2e779bcf5f2b3c63db29 SHA512 e4ea3e8096f8052ce6edff1255005ce10251272d953c0aca1157af88e5582382e351c0457a5f5f2271b850e356137ffe8b7643c29cc872c9d55f58950f6b2058
+EBUILD libvirt-9999.ebuild 8262 BLAKE2B 9069a015ca49de444ddc06384c16834115488f6cbb40edb591dbcc7fbc63e30b101d9579a54616dd570f0d44e2b93702fef3b56f8382eff5dba84aa4b2753e4a SHA512 a06affe00355c1bdd0db8f7506636c927654817d622ed51196f253ab155bf3a29f6983accdd6f8654201b1f708e116308758765469ecec8097759bdf419c420f
 MISC metadata.xml 3568 BLAKE2B ea4e03121fbc3aca8af2d8e12b42fefc9954e8e38fd83b1014353dd83bceeae4e1ba65329b42fb19fc0d6a9aae7c9d16cf88817d4ea7cfe767c7ef5734b291f6 SHA512 4d691fecee1ddd161a67e3b18a6071d1f0f6e1dcc6ae8deb1a63d73ca9c6d86f5a879d8ab9e43397b7988d66a7df9be6f556a52ebfe8d886b1f03e89614cf073
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index d5252cac3d86..767580ad5f76 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -128,7 +128,6 @@ DEPEND="${BDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
 )
 
@@ -276,6 +275,7 @@ src_configure() {
 
 		--localstatedir="${EPREFIX}/var"
 		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	meson_src_configure
diff --git a/app-emulation/metadata.xml b/app-emulation/metadata.xml
index 4b1893efa085..3fc882857e23 100644
--- a/app-emulation/metadata.xml
+++ b/app-emulation/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria app-emulation zawiera programy służące do emulacji.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 34b8cffd7029..00aad1804837 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,6 @@
 AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
-DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
 DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
-EBUILD protontricks-1.4.1.ebuild 1413 BLAKE2B 95ebee3c6b4b1b68b72b5ba0eb3daf7b49baae9eb3c7c2f1f8de0781f17dfbb9b190c4c4751cf98520401e93529fe5b43734a76515138592cdc77f922e50bc8c SHA512 2c0d1a4b403313e4a14158319cf90ce4056d03685e082169452fb4424e1eca025305112c647a5b118ba2168ca035b9b0a53221e3a1a0411176c8c1d569e24ed3
+DIST protontricks-1.4.4.tar.gz 45204 BLAKE2B 3fc66acae79a39e8dc7a5d507e4abcdad24da13a03e10954b667769a801ac42addb55980e3de413e71ad5395e773b065f8f1dca2e694c835a07b8993b4fb5f0e SHA512 4c61da27e97f1b46150f2808c27d1fcf7394f2cc4f272eada54abc4fdd9229443405f7466d3a1ba5603e3c40a025dbbd8fde512334c6007a64687867625abc4c
 EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374
-MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
+EBUILD protontricks-1.4.4.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728
+MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/metadata.xml b/app-emulation/protontricks/metadata.xml
index e18d1ed94ac5..2e0c5e0f0e30 100644
--- a/app-emulation/protontricks/metadata.xml
+++ b/app-emulation/protontricks/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		A simple wrapper script that allows you to easily run Winetricks commands for Steam Play/Proton
 		games. This is often useful when a game requires closed-source runtime libraries that are not
diff --git a/app-emulation/protontricks/protontricks-1.4.1.ebuild b/app-emulation/protontricks/protontricks-1.4.1.ebuild
deleted file mode 100644
index 51ae82b968a3..000000000000
--- a/app-emulation/protontricks/protontricks-1.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${PYTHON_DEPS}
-	app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_MULTI_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-# Tarballs from PyPI do not contain tests, and we cannot use GitHub releases
-# any more because they are incompatible with setuptools_scm.
-RESTRICT="test"
-
-DOCS=(CHANGELOG.md README.md)
-
-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/protontricks/protontricks-1.4.4.ebuild b/app-emulation/protontricks/protontricks-1.4.4.ebuild
new file mode 100644
index 000000000000..8aa78e9acad1
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} 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.4.3_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/punes/Manifest b/app-emulation/punes/Manifest
index 51aa7d637170..491e38f9845f 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,4 +1,4 @@
 AUX punes-0.107_ffmpeg-configure.patch 798 BLAKE2B da041283394db3a436478025fe3c8f5919f368bf00a5947fc688110d86691e987a52653e21215e05aab9d9861e7346fb526031c560da363570e6aeba11e4255c SHA512 443ad57c8659597f1beab1e5bb0a560f053986a6021785e24107463aa2351c1d6e26ee760cb1ec4a9913d8e01002a31f41d21a0b878e8925a66f02a858cebaa6
 DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
 EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df
-MISC metadata.xml 529 BLAKE2B 41ca9104473edaf94faa28749d5705ccd3f0b0eae2ce6e421652ca025d6cf21e1094a9a36c9f787e1556f23ecb73d48c5f3b7784cffc082016307403136ce905 SHA512 6a4892f8f0ff213d87d98db48612b067a131dd6c59b0c4bbf78c098f9a33592ebbee8ef78674a812ef2b35d233c9dea52752aaca315ea0065c472a4c5c9732b1
+MISC metadata.xml 559 BLAKE2B 0bee86baa61da9ccf3c1abe82f11dd3a5d42c4b89e58513d240d28cc5e6ec10dda0b491333073bebb3892109208201fba75b068e6729b3712c23d693fc9fe7f1 SHA512 f20421313854d8df943cadae6621860eb58bec5506b3143fe714d7128191ed4316ce99d05ce00a3f0022832bac3ef92ddc66e0996b026ed70c78d8e3dd7fdc60
diff --git a/app-emulation/punes/metadata.xml b/app-emulation/punes/metadata.xml
index 23b1c9a0b21e..c02689e290f6 100644
--- a/app-emulation/punes/metadata.xml
+++ b/app-emulation/punes/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c4cb90780387..90a84c8daffe 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,11 +2,6 @@ AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7
 AUX 65-kvm.rules-r2 204 BLAKE2B 71d062c1d4d0b619220da360b644a0961fc5adb619da379e80d84892ece9f365801dfc16bd358342557f32f18e2f47c507dd510c20bdbfcd5ae40b83b9def5a3 SHA512 0930e5fce6870eb20f48bde114d0b48ec87f80afa6a005f7e9c0ea84d3960f12d00b92f55c1304ffcc0c63a125c40af08d038cd179a76d6afe6e88e4d057724a
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
-AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
-AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
-AUX qemu-5.1.0-pixman-for-vhost-user-gpu.patch 1788 BLAKE2B 9eddc15909cac5eb3357eb4e16921b8b51ba1107eaf272ce48e6f89705fa246ad3a8cd02abc534329671de3849f83a8515d22c39437961b5de25459f697d4600 SHA512 8df97af001e9d5c671da7ba1d651fae7ddca2f16337741ffa551227ae86bc627b6cbf37332beb0a6c9ee2444b7f40474804c4a7b79140d3e2b1dfe310a0b2502
-AUX qemu-5.1.0-usb-host-workaround-libusb-bug.patch 2625 BLAKE2B 273ba203e765866d91c592388eee695163c947b4b2f077354985e0ce18206ce018e3c223cc0eee5d02b8867e5615817979854039d472da958da2dd9df3e6bbe7 SHA512 b2143cf0c62db0462ceb0d2e5e9210706f27ac9216e2ee7e0a96ec66818e5a425e68463b3a0d167128b10e5bb4f04b16576c4ae050520690bda268de295b74f0
-AUX qemu-5.1.0-usb-oob-CVE-2020-14364.patch 3210 BLAKE2B f812f4bb18e540ebafeb9bf7e95423b48696b639c26525244e7d783eb5ef46453b263831b325b78b90bbb86a585e4f90a3b8ee9c379d52051a2c051891566363 SHA512 08f6fedba9e30eb00a31a0b73a6a7fe11dd215692064330bed5f5701479e1ef63a374460d04b843175b216aee0ca9fc25d8f52987f0680f244583dd8ad75b538
 AUX qemu-5.2.0-cleaner-werror.patch 884 BLAKE2B 95404f78f5559f5725c1978e7ef619675817bbe308cd636d6cd9fc43c5ed7440d826c4cb89165fbb275dae3840026b6391e8040b0d21d65120c34b7e41f844e7 SHA512 bdaf7c433c0f10a3666b4f06b680122e4a9bcf41382e50b3f3cb7b236134860ce91864d305282707068763f1521d61d47277579acdf778d6bd4312884eb04d43
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac
@@ -15,11 +10,9 @@ AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e19
 AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896fa42da75aa99aecfed75283b78073fed43dfbafb8bd9c3c0545ebcd943fe86410171f9933965646bb0f2ed901a0720bc6d SHA512 604e6865d206536287f7690179bf7c369e83646742feb9af2a1b46be809c19754e22c2bec430f35cf2e3ef0fc4929541e140d15ddff4a9579db5cf18a3bab1f7
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
-DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
-EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06
 EBUILD qemu-5.2.0-r1.ebuild 25165 BLAKE2B 719c716e10dab3e845e15497eaace296318d29987efd8f6f8eb1f1ece9d82138c442c1bbb600516f8aaab2886c52caad69006d06bdff39cc90fe772810a9a9c7 SHA512 5be5db0d809ded76014ddd863915ccfb5d8dec0154c1bea2720d8e06a007f882cc6fdc451b18ce2db39b58dd8e3f3e501bd074edb4690a47c3c17bb3a070a46e
 EBUILD qemu-5.2.0-r2.ebuild 25346 BLAKE2B f24ae658c04435b88982aa96445ea6037c337125ddc8dcd1067f6bd5c142d5b6cc9c4035d9c62e849abbe9135115d53ad53f1c1ce23bb1b2c82e00ca19ebd253 SHA512 0f4b343844aee4942a491efc18893a5bc63545fad04c8c0583b51256fbd0be4b3a0f16281ab45877fe98f57cc77935fa8e6714bfc67928d5c583125569072ac9
 EBUILD qemu-5.2.0-r3.ebuild 25349 BLAKE2B 6e5d1270efbb846cab4b21aea6bc864ad9aa19059bb4a60e7ab120c9243b9db6ebd7e26364054f875438d511ef3ebb68e5f7c1bc6dcf5f9d302f374344a4af52 SHA512 64004e9efc5afc945f96f21ecb05241da109ee89bd265f54977f2fe3f3a9bba9c429eeaf5696ffc51201f07086cdaaa8ae1bc74886d80bd5a76baf3c55124b65
 EBUILD qemu-9999.ebuild 25305 BLAKE2B 1c4bda060af3bca672dc7df26b9deef8078217878e14cbe943224f1b52289a4091fe055af6eddcf5a810656af5f51efc1cc7a804313b30ffda5546840bc0b3ef SHA512 282ee0b547ce3c6d077ae32d23b02319f88650defbcfa92445c6d102d3c6e7e65880443b6334d7e32db8ec455f8c4100e52b39cdf640ded3baaece5090b632d8
-MISC metadata.xml 4458 BLAKE2B 522818589e668292cbb756008eba7c9f6e0fac36c8d777f0490a1f66cecf576760947a8d94cf03e22af9c9da1d57e25b533c62ee73e9a4fb6da01a6d25c5db03 SHA512 3e054a17a0c86b4ddec0407d44967954170bbb030cea20de6c6841c057bd7e5c2b1b9013e3c0951db9ee570edbd9e7c433e5e3893f7bd762d44b35f9a1fae7db
+MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
diff --git a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch b/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
deleted file mode 100644
index 95ccdd7a4b1c..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 04a0d450..e0013a59 100644
---- a/Makefile
-+++ b/Makefile
-@@ -803,6 +802,7 @@
- 	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
- endif
- ifdef CONFIG_TRACE_SYSTEMTAP
-+	mkdir -p $(DESTDIR)$(bindir)
- 	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
- endif
- ifneq ($(BLOBS),)
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
deleted file mode 100644
index 101926589a61..000000000000
--- a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git i/configure w/configure
-index a72a5def57..546d757603 100755
---- i/configure
-+++ w/configure
-@@ -6093,10 +6093,6 @@ write_c_skeleton
- if test "$gcov" = "yes" ; then
-   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
--  CFLAGS="-O2 $CFLAGS"
- fi
- 
- if test "$have_asan" = "yes"; then
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch b/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch
deleted file mode 100644
index 4eb644fde543..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/735146
-
-From 4fd46e6cdd976f4aecdc3fbbad728e00a7bc4ee0 Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Thu, 13 Aug 2020 20:19:24 +0000
-Subject: [PATCH] configure: Require pixman for vhost-user-gpu.
-
-Use the test from Makefile to check if vhost-user-gpu is being built,
-and if so require pixman.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- configure | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then
-     fi
- fi
- 
--##########################################
--# pixman support probe
--
--if test "$softmmu" = "no"; then
--  pixman_cflags=
--  pixman_libs=
--elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
--  pixman_cflags=$($pkg_config --cflags pixman-1)
--  pixman_libs=$($pkg_config --libs pixman-1)
--else
--  error_exit "pixman >= 0.21.8 not present." \
--      "Please install the pixman devel package."
--fi
--
- ##########################################
- # libmpathpersist probe
- 
-@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then
-   done
- fi
- 
-+##########################################
-+# pixman support probe
-+
-+if test "$softmmu" = "no" && ! test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes";  then
-+  pixman_cflags=
-+  pixman_libs=
-+elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
-+  pixman_cflags=$($pkg_config --cflags pixman-1)
-+  pixman_libs=$($pkg_config --libs pixman-1)
-+else
-+  error_exit "pixman >= 0.21.8 not present." \
-+      "Please install the pixman devel package."
-+fi
-+
- ##########################################
- # libxml2 probe
- if test "$libxml2" != "no" ; then
--- 
-2.28.0
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch b/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch
deleted file mode 100644
index 34a50a9bfb58..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 202d69a715a4b1824dcd7ec1683d027ed2bae6d3 Mon Sep 17 00:00:00 2001
-Message-Id: <202d69a715a4b1824dcd7ec1683d027ed2bae6d3.1606202550.git.mprivozn@redhat.com>
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 24 Aug 2020 13:00:57 +0200
-Subject: [PATCH] usb-host: workaround libusb bug
-
-libusb_get_device_speed() does not work for
-libusb_wrap_sys_device() devices in v1.0.23.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1871090
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Message-id: 20200824110057.32089-1-kraxel@redhat.com
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++-
- 1 file changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
-index c474551d84..08604f787f 100644
---- a/hw/usb/host-libusb.c
-+++ b/hw/usb/host-libusb.c
-@@ -39,6 +39,11 @@
- #endif
- #include <libusb.h>
- 
-+#ifdef CONFIG_LINUX
-+#include <sys/ioctl.h>
-+#include <linux/usbdevice_fs.h>
-+#endif
-+
- #include "qapi/error.h"
- #include "migration/vmstate.h"
- #include "monitor/monitor.h"
-@@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)
- static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
- {
-     USBDevice *udev = USB_DEVICE(s);
-+    int libusb_speed;
-     int bus_num = 0;
-     int addr = 0;
-     int rc;
-@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
-     usb_ep_init(udev);
-     usb_host_ep_update(s);
- 
--    udev->speed     = speed_map[libusb_get_device_speed(dev)];
-+    libusb_speed = libusb_get_device_speed(dev);
-+#ifdef CONFIG_LINUX
-+    if (hostfd && libusb_speed == 0) {
-+        /*
-+         * Workaround libusb bug: libusb_get_device_speed() does not
-+         * work for libusb_wrap_sys_device() devices in v1.0.23.
-+         *
-+         * Speeds are defined in linux/usb/ch9.h, file not included
-+         * due to name conflicts.
-+         */
-+        int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
-+        switch (rc) {
-+        case 1: /* low */
-+            libusb_speed = LIBUSB_SPEED_LOW;
-+            break;
-+        case 2: /* full */
-+            libusb_speed = LIBUSB_SPEED_FULL;
-+            break;
-+        case 3: /* high */
-+        case 4: /* wireless */
-+            libusb_speed = LIBUSB_SPEED_HIGH;
-+            break;
-+        case 5: /* super */
-+        case 6: /* super plus */
-+            libusb_speed = LIBUSB_SPEED_SUPER;
-+            break;
-+        }
-+    }
-+#endif
-+    udev->speed = speed_map[libusb_speed];
-     usb_host_speed_compat(s);
- 
-     if (s->ddesc.iProduct) {
--- 
-2.26.2
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch b/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch
deleted file mode 100644
index d1d23ec6f0e5..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/743649
-
-From b946434f2659a182afc17e155be6791ebfb302eb Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Tue, 25 Aug 2020 07:36:36 +0200
-Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364)
-
-Store calculated setup_len in a local variable, verify it, and only
-write it to the struct (USBDevice->setup_len) in case it passed the
-sanity checks.
-
-This prevents other code (do_token_{in,out} functions specifically)
-from working with invalid USBDevice->setup_len values and overrunning
-the USBDevice->setup_buf[] buffer.
-
-Fixes: CVE-2020-14364
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Tested-by: Gonglei <arei.gonglei@huawei.com>
-Reviewed-by: Li Qiang <liq3ea@gmail.com>
-Message-id: 20200825053636.29648-1-kraxel@redhat.com
----
- hw/usb/core.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/hw/usb/core.c b/hw/usb/core.c
-index 5abd128b6b..5234dcc73f 100644
---- a/hw/usb/core.c
-+++ b/hw/usb/core.c
-@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream)
- static void do_token_setup(USBDevice *s, USBPacket *p)
- {
-     int request, value, index;
-+    unsigned int setup_len;
- 
-     if (p->iov.size != 8) {
-         p->status = USB_RET_STALL;
-@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p)
-     usb_packet_copy(p, s->setup_buf, p->iov.size);
-     s->setup_index = 0;
-     p->actual_length = 0;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p)
- static void do_parameter(USBDevice *s, USBPacket *p)
- {
-     int i, request, value, index;
-+    unsigned int setup_len;
- 
-     for (i = 0; i < 8; i++) {
-         s->setup_buf[i] = p->parameter >> (i*8);
-     }
- 
-     s->setup_state = SETUP_STATE_PARAM;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
-     s->setup_index = 0;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-     index   = (s->setup_buf[5] << 8) | s->setup_buf[4];
- 
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     if (p->pid == USB_TOKEN_OUT) {
-         usb_packet_copy(p, s->data_buf, s->setup_len);
--- 
-2.28.0
-
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 0016d14bf2d9..ec3f45a06391 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -64,6 +64,5 @@
 		<flag name="xen">Enables support for Xen backends</flag>
 		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-		<flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-5.1.0-r3.ebuild b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
deleted file mode 100644
index a8bb8832c8ef..000000000000
--- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild
+++ /dev/null
@@ -1,860 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		tests/fp/berkeley-{test,soft}float-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 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 usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs +xkb 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 mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-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 )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
-	static-user? ( !plugins )
-	virtfs? ( caps xattr )
-	vte? ( gtk )
-	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(+)]
-	xkb? ( x11-libs/libxkbcommon[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(+)] )
-	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(+)] )
-	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(+)] )
-"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-201905[binary]
-		~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu]
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[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_ppc64? ( ${PPC64_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}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
-	"${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch
-	"${FILESDIR}"/${PN}-5.1.0-usb-oob-CVE-2020-14364.patch #743649
-	"${FILESDIR}"/${PN}-5.1.0-usb-host-workaround-libusb-bug.patch #753305
-)
-
-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/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 >/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
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-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
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# 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
-		--with-confsuffix=/qemu
-		--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 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
-	}
-	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 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_notuser 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 usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		$(conf_notuser xkb 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
-
-	# 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-r1 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 Changelog 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"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || 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/sen/Manifest b/app-emulation/sen/Manifest
index e72918d41836..2c99214c9dcb 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,3 +1,3 @@
 DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
 EBUILD sen-0.6.1_p20200905.ebuild 930 BLAKE2B 4d5c2bb3eac1a04f1edf68715402b3c1063f14b134a9664cdde6bbb1cf3840027fa1975886ea20806d7c9e2e95064cc93a52f6189404423399a7813fe5bc4565 SHA512 884a86533f966b1296cc311e91e7f4415d399362e443e62b3abcc016a5866bab40aaae002c8654a001cc89f26cf05ce1818b9deae5864525aa9aceff812c1362
-MISC metadata.xml 598 BLAKE2B 56052c4b881e934c97af30666df9f8364a2fad98fb855122fe22dda5f7b722c642d71440db2a483ee1b0f6afdb20ded677fb3b82ac6e88c8c2f66651e1db2298 SHA512 71e37148c40ccfce6fa1fa80632dd1143eb0462971b7758b724924ffd9739f81c7b341388b22b7b5f0862b266b83bb4adf6ceb95f0997efc4f7f3bd4a8f92910
+MISC metadata.xml 628 BLAKE2B 14b4762b2dd4aaa480e7f6d61d32647167fda51f0dc7453c8979c93ede078897a4cce702cc976324aa054642860bd08218be4d5764f49072024bfc8f60b2e8cb SHA512 b074d1f60979acad4716907fdb84ca4835fc5c771569658c6476d14683e83b11fb70e907d7a44d7ecb060f6ed695470959a549653a850818e15f01d82628f1c0
diff --git a/app-emulation/sen/metadata.xml b/app-emulation/sen/metadata.xml
index 75bfa9b4d173..b6ab49948eb6 100644
--- a/app-emulation/sen/metadata.xml
+++ b/app-emulation/sen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 911a943f0caf..b93bd10470d9 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -13,4 +13,4 @@ AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 EBUILD ski-1.3.2-r4.ebuild 1558 BLAKE2B cc28e4ba990db883074b505a50ad823d9104e7fb6f8746fa14e4de1f707556a6bd1bf7ab5c0b33f99b3e2b949c5c4220ed72258c2aca1ad282332842cc357a02 SHA512 cc7eccadc7ddd10c247afc8b5ff840fcf93d9452396c553cc3401040a58b2c6e03ab8692a0cf99fd33d92c0f0b2b937e5ddd11bc42008531f37ec301e72a6ed9
-MISC metadata.xml 445 BLAKE2B c044a6cef20657adc98ec1e0d38b14393b04cbba0b71ec4efae3763c8de2a676bfc17569cf9f92d67306dbaf0cc058ef042cb3b0b54631f0f21458d3afacc6e9 SHA512 bfde8716ac8ae245b21561f97a6e4ad69617d9ddc994ec89e032b9a2d512be61f05c8aa94e2ada7dfb93cd24d45f49fb7ea6d0b934367bb9e256fb3f18f1e0c2
+MISC metadata.xml 445 BLAKE2B 9ed57ae50b2327c0fc3bf69bf2ced1dfa2b069abda5da550bd82d04cdf834fe9e5f2a5089a9e5788c45bdc4312127654d482a9b6edc7a39adb05844705e36099 SHA512 6e91887d446a1d2fec5ab934df8d3cbd629bd905541db8300751f624d19061f8d78ccc632d4d36a8505f2f4e29137a20fb2feb0aad061379ea6e39783bdbef58
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index ab1c2fb53a4b..bdbbdb76bcb8 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<use>
-		<flag name='debug'>enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
+		<flag name="debug">enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ski</remote-id>
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 95fd74682d65..479535c16849 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -2,4 +2,4 @@ DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999c
 DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
 EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
 EBUILD slirp4netns-1.1.9.ebuild 949 BLAKE2B 7f34e0533cab1e88ea7c2db9de6dc9b2a58f60e18fcf19ebaebdf8a0f88727c4ecd5c35d8951e3cd55fd1adec5ab07ea2af6c682afe864ff0bc82804dd7e7748 SHA512 c14162894ae957d060bf20d83195c083b65f5a2ba8c8fa5efb09fec0a00157469afc6c98b32e642639b020da5d1ce81cd9600e7d6359fb48e46bba1b8a43bde0
-MISC metadata.xml 459 BLAKE2B e33a3af85acb845c8dde439efb0cc6cc87f5fb04e17d67af393a06f8b4b44242c434f3fae231118d2233c45ad733dcbeed3ed273fd4f66ff70292c39e5ad11ef SHA512 012156833690e44656fae463045a5559e564959904436adcac0af92bae8867c71bb7c24fa0fc416da890b0bad4d53e29a9b6d354b81e673e16d8b1956e9a0d04
+MISC metadata.xml 473 BLAKE2B cdcb7fe8dc296fc873a407cc8602d33da759a89406c6c4c118def05ea2a8ad9233f6ead5d2146db8ad063c0daa8eaba9e3f3a73677a17ce622adb99173b5361f SHA512 bd2c4d8e74a7b711ae34fda72f66990ad79ebbf5f0d2ff0b5e8ece78eb2cdd43bf059eb94a8f4175ab554fd46d83e2c21e1aeb289bb72a0a76e82d25f41c4976
diff --git a/app-emulation/slirp4netns/metadata.xml b/app-emulation/slirp4netns/metadata.xml
index e7dbf873de1f..1a395700b09e 100644
--- a/app-emulation/slirp4netns/metadata.xml
+++ b/app-emulation/slirp4netns/metadata.xml
@@ -5,7 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>g.braeunlich@disroot.org</email>
 		<name>Gerhard Bräunlich</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index c1c2cc4efb07..4d19cf3fe57e 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,9 +1,3 @@
-DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
-DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198
-DIST virtio-win-0.1.187.iso 433235968 BLAKE2B 0df10aa5f46cd70f7530f6d677b882df364a0b1a859d7e9fe777817136213d4f856116cf73b8521e8720c203bca3321b9a7bdae057f867e655764a8b7d5dc0b2 SHA512 db9938f1f17b723a994d1bd5bb0e0ffce47ae2bbfa96f9bdf1d895750502600f9a71f0486a97af9301659e05ebd5365d1f08dc0e062d1f9e4c3acaac8b7f0bf5
 DIST virtio-win-0.1.190.iso 501745664 BLAKE2B f9f2bc4dc371ff412dfd0b65228e0984c30a1fe1b30307d3894f2b238a8993e96fda75f931080aeff06a29467a678ca02174a876b9f339a4c8d199fd9c8a9917 SHA512 dfdaddb99c92d633368eb243801425abbcb09e4693be658efe531c33a47600b165e598ddac594239402d2c578f24f5400b5e7b643f17e7db4ebba2d4d99cf0fd
-EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
-EBUILD virtio-win-0.1.185.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
-EBUILD virtio-win-0.1.187.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
 EBUILD virtio-win-0.1.190.1.ebuild 697 BLAKE2B 3755b24495c2bbc9bb4e630dabec6013809fcfd8a2f682c17c4b464aa15d04def9067dd16902f1e3a0bb7fb821fd71b4d9cea1dceab787e62e16dc73057e3bc1 SHA512 f2ab671652ef92efc65315c4e0fd3889a51c1f990ebc1dadcac0d609579d754ace0a04df870f50423bceb52face1ff2c4f0ca19c6b79db25823dfe053e25c1ae
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/app-emulation/virtio-win/metadata.xml b/app-emulation/virtio-win/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/app-emulation/virtio-win/metadata.xml
+++ b/app-emulation/virtio-win/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
deleted file mode 100644
index 8f43008b5179..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
deleted file mode 100644
index 317b5b926c06..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild
deleted file mode 100644
index 317b5b926c06..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
-}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 5653bd9a682f..09c1fb67fb11 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,4 +2,4 @@ DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a4
 DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19
 EBUILD virtualbox-additions-6.1.16-r1.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
 EBUILD virtualbox-additions-6.1.18.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 338dd3fddc52..d03fc29662cf 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,4 +2,4 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 8
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e
 EBUILD virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
 EBUILD virtualbox-extpack-oracle-6.1.18.142142.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index e62d70840c20..aa923037ca68 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -9,4 +9,4 @@ DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
 EBUILD virtualbox-guest-additions-6.1.18.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 452ec3a55fb5..1dea71402e93 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -9,4 +9,4 @@ DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5
 DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
 EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2
 EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B bc820f78c75b9057944568dd06b06a544f887c7aa8bf026e1907e9b898a7c10638069aa95a38e701ae0422d541d9aa045b109a40faeac1ddef7365f850acbeb5 SHA512 a4f08b633a6e4a5c22dbd7cd088c509e7e5c8658bc3b9604b4ebf77bb2edc70491ebc3eabfa414ae4bd174de36579aaab10226810f7df525691115ecbccaa042
-MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
+MISC metadata.xml 352 BLAKE2B b3f8d24dd3e805ed233d105374d7c7d85b136b0260229daac917bec19bee0aa7dd9c2e19fdc036b576905152c3dad31aa5a6162c28812ca471f37b7297a77356 SHA512 98dcffafad310b4ceb74194af6de0e3e6c443167f53c41068ed0098c2f70916c88315739afb8bf917c1328886d063ca8a54e9dd9aeec3a41a911d34dbba5f10c
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index b55a81b4e004..a4c013c40067 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -9,4 +9,3 @@
     <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
   </use>
 </pkgmetadata>
-
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 34973bb80a34..43bf6a60d6a3 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,4 +12,4 @@ DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.16-r1.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
 EBUILD virtualbox-6.1.18.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
-MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
+MISC metadata.xml 773 BLAKE2B dade5d0d6cb8e4d8f92b865368af2e577d26e883b53e4d2274fb2b59e2ea92bdc8ee0af6a4cbca64384f9820779e44397825b3f1707d87631f1202bdc7164dac SHA512 c4718b4455eecd2669d47881af12257c1187c5f4aa3dd2fca8745df565f55a7b0e018da4ad3c5f38bd03b510bdfaaefa8a235d09fae3d8a99a55f263c995c74d
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 3a2ea79813a6..95eb9062a15f 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -15,4 +15,3 @@
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
 </use>
 </pkgmetadata>
-
diff --git a/app-emulation/wine-desktop-common/Manifest b/app-emulation/wine-desktop-common/Manifest
index 0c28d8acb701..74cd300e56db 100644
--- a/app-emulation/wine-desktop-common/Manifest
+++ b/app-emulation/wine-desktop-common/Manifest
@@ -1,3 +1,3 @@
 DIST wine-desktop-common-20150204.tar.gz 99491 BLAKE2B 7427c08d00a7ec11319908c908c5833e1a3fc297ec2ebfd942ccdf2adb9e657d1fd751da74bd67e7efb3d4b8ad769a11b1aa5e1a56e33e181f149f4f6245fac3 SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688
 EBUILD wine-desktop-common-20150204-r1.ebuild 957 BLAKE2B 7fc9059805ae68d1da70b13144808641035719a0b64184dfedc8352b0cf328d01b54e11b82577a8dd0b7fd636f664f51a2f63b88969a36e413dc7e75b28d259d SHA512 98932bfe14ee4a20b54d80744b959df25a6d635dedba80f1eec4e6014f34edeb197a3f77672e58c2df95469fcc52a748c72585b430dc53820936971828c24722
-MISC metadata.xml 439 BLAKE2B 5748ff1f9d8a97a6c0496f66672ba2131d46db6391003fdb2090b2627561e62519580c1ad78138857111963ec9ea56ff2491b56b63c0bf321ab7de88a3c2f445 SHA512 c9bb03bc6753c6c40c280d477ef343b1cc4bf79f49f0dcd83aab6c5c1f4770e93c65c33a51628453e326618b44fe2a18610667d7177e503366dbfdc882fa471d
+MISC metadata.xml 439 BLAKE2B bff337f2c333a31513cc2859e72aeb5f57a06cc6a25905973c713d1b6b312ae7f4c4071afcfcdb4cae7d494d7ebd1fd4b4a9e7fcc808065fc1289ab6e81c7d45 SHA512 6edd6afb236786be8e48e06733d0274ddf3431ff01872e61a3d37ca1004a325b1cf734158b5f59541a1a10b6ca7f8a577dbf8bddc7b779ffc76879805a47205f
diff --git a/app-emulation/wine-desktop-common/metadata.xml b/app-emulation/wine-desktop-common/metadata.xml
index 751c88a7bada..2b2167344616 100644
--- a/app-emulation/wine-desktop-common/metadata.xml
+++ b/app-emulation/wine-desktop-common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ad37eb1886b7..af1b289dd657 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
-DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
 DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
-DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38
+DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd6534a550e9365ea9ab773d81283520ca6b0efc8aa69063cdeae8da35fc22e08a40c73c6268db4d57b0442ad2 SHA512 f190e1b97defb4620e33d1a4e2afffd475f6b3998153c67c6d06840b4f3b93a50f88c6844de15e7f54ca712330f6fea857310861a78b961feb7f64a4869f3fe1
 DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f
 DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e
 DIST wine-staging-6.3.tar.gz 9796930 BLAKE2B b24e5ec57435a0d797e4d913b027226b3c891477d9df5d098be52348dff4eb704275c7c59d09f6cbdf7f86940a0e6c96bf28f94bd703fd32d6770a31426043fc SHA512 ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2
-EBUILD wine-staging-6.0.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
+DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4e2ef0b78868fc87df6a8a5789004fa5173987a04f4c3f8b51ab70d0c4b573c2ce867765b7009346790dcca6824347 SHA512 9229ff6f56120c64cf79d2b817ce2e1f43f1f02e77356f7d371104a4d8a6455a090555ad80b0efd18f69edd019a2caac7bdf59aaba097ac01d311dac927e48b5
 EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
 EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
+EBUILD wine-staging-6.4.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
 EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.0.ebuild b/app-emulation/wine-staging/wine-staging-6.0.ebuild
deleted file mode 100644
index 954abe1eca77..000000000000
--- a/app-emulation/wine-staging/wine-staging-6.0.ebuild
+++ /dev/null
@@ -1,666 +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 l10n multilib multilib-minimal pax-utils 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=""
-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:5.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() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# 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
-
-	l10n_find_plocales_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
-
-	l10n_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
-		l10n_for_each_disabled_locale_do 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}" \
-		Xemake 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} )
-	}
-	l10n_for_each_locale_do 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.4.ebuild b/app-emulation/wine-staging/wine-staging-6.4.ebuild
new file mode 100644
index 000000000000..9bb1565d0057
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@@ -0,0 +1,667 @@
+# 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 l10n multilib multilib-minimal pax-utils 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.0.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# 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
+
+	l10n_find_plocales_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
+
+	l10n_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
+		l10n_for_each_disabled_locale_do 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}" \
+		Xemake 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} )
+	}
+	l10n_for_each_locale_do 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 e846af697956..f86d4e3bd69d 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,17 +1,14 @@
-DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
-DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e
-DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
 DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
-EBUILD wine-vanilla-5.0.2.ebuild 17538 BLAKE2B c7112948be20ca6f68de5053bd0cc1171eb7ebf06807ec97c1aa392c4cc756d18782805a9f501307da418298eeb8f129830e85e507613233a478bd3c452b047f SHA512 16bc462660abe1eb8dca1d5c90fb02d71ed8e98a121d4290e501f7807c72eaae6a1b2eb65867b90c79d827ac9eb9b2502b6ca4e597155eda6b74509b00a3ac55
-EBUILD wine-vanilla-5.0.3-r1.ebuild 17621 BLAKE2B ab9f9766ef5f30b3fcae5d92a4cc7237deb015fed6cec868e0360fa676f85c5f96579bbb81afd793efa21fe0c65403e747a3b08fd00b69699985298acba08853 SHA512 833096373edf13aada27e0a574097dfb2ced4589bc8f1fa5e7d93ddfdf827c9b1920ce351e66e60c435cbf831879b90b05f3da8ea7670773f364ecf39b48927f
+DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd6534a550e9365ea9ab773d81283520ca6b0efc8aa69063cdeae8da35fc22e08a40c73c6268db4d57b0442ad2 SHA512 f190e1b97defb4620e33d1a4e2afffd475f6b3998153c67c6d06840b4f3b93a50f88c6844de15e7f54ca712330f6fea857310861a78b961feb7f64a4869f3fe1
 EBUILD wine-vanilla-6.0.ebuild 18908 BLAKE2B 3940b795b6b9ccf31f286a8efb99fa2a754da45a5201f5afad80c2dfae227d1aa07ab5bdadd7079eb5ad2f31f7f268f79ff65c8f6e18851032dec58fd3a1ceaa SHA512 64fe38e8318eaeef5ec6676629b2d45415a1effc8a95011c5db115259a515792cca4efd16adce48f750e68ff2483b68b5796788c3b79d880288c9fdbf2357dc6
 EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
 EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 EBUILD wine-vanilla-6.3-r1.ebuild 18975 BLAKE2B 0d00607ee6c7faaf3396aab0fbfade31f681195faf593d453702b11da214ba78b7596472d54cbd625f0e6a3c1425b4069107f1939f7e66db02af472da1a715c9 SHA512 d2e7e68d564f1d27fba83225e039f231718ea3db574b86a37364cb4f0be2faa5d91dc2dbe7fdd893ee44cf05769bc9de45f65d6b4e9244390a48db5b6600290c
+EBUILD wine-vanilla-6.4.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
 EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
deleted file mode 100644
index 2efdd7b61d9b..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
+++ /dev/null
@@ -1,537 +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 l10n multilib multilib-minimal pax-utils 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=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-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 +mono mp3 ncurses 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 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}] )
-	ncurses? ( >=sys-libs/ncurses-5.2: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}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${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.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
-	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}-5.0-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-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() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# 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
-}
-
-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
-
-	l10n_find_plocales_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
-
-	l10n_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
-		l10n_for_each_disabled_locale_do 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
-
-	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 ncurses curses)
-		$(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)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(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 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 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}" \
-		Xemake 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} )
-	}
-	l10n_for_each_locale_do 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 && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		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-5.0.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
deleted file mode 100644
index 625841699e98..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,539 +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 l10n multilib multilib-minimal pax-utils 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=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-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 +mono mp3 ncurses 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 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}] )
-	ncurses? ( >=sys-libs/ncurses-5.2: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}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${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.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
-	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}-5.0-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-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() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# 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
-}
-
-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
-
-	l10n_find_plocales_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
-
-	l10n_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
-		l10n_for_each_disabled_locale_do 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
-
-	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 ncurses curses)
-		$(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)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(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 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 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}" \
-		Xemake 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} )
-	}
-	l10n_for_each_locale_do 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 && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		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.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
new file mode 100644
index 000000000000..045e3bfde6b8
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@@ -0,0 +1,579 @@
+# 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 l10n multilib multilib-minimal pax-utils 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.0.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# 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
+
+	l10n_find_plocales_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
+
+	l10n_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
+		l10n_for_each_disabled_locale_do 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}" \
+		Xemake 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} )
+	}
+	l10n_for_each_locale_do 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/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
index 44626c9ced34..f8f348340dd6 100644
--- a/app-emulation/xe-guest-utilities/Manifest
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -3,4 +3,4 @@ AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9
 AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de
 DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880
 EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1503 BLAKE2B ad1bfc862229957baa6f3253cc534bfcea7e98b84c11af707445691d59070ecec3ed64323ef198353f21cb30065a7b471844537f04e65b63e0e61387aeca1489 SHA512 dfeffca4ae4c29234163d461efd1c1d20c20f9ff1545283e6966878f2a4edeaffabde845b7f040be0b535f200bfab05fadd51a89115a6dfdb72d77aa4201ca59
-MISC metadata.xml 776 BLAKE2B 549a89776c54711d874588740a6f6e425ee80f53aab06143337acfe1627b012aa6090b798875ea16c17f312596b01a6a6129e914b28de7b0cfcc23b032099e9f SHA512 de26a707e9e20f25c2a4115f6c1b960bf9c7a228ceec45ce112d06b622c5bcbf6cd84599357e836b5daa91156e10a6af24f2fb93ced24c25c89f9ad7a4579b60
+MISC metadata.xml 790 BLAKE2B 2db7ced6efa6b95f61ab92c00184ecc237367960dbe22ee98c6714762debc925c25ea20d3286fc29ed1b167f1be7a5565b7e8fe35241a01b0c2eb4b173994a4c SHA512 6706021aaa671e9f41d467b35a26f38be09620968e61f1055799f56fff49b902785de29e58c9d14ac8a8a7926d10a6f6da94bd8c486f4f629402fa78abee118b
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
index b1dc4728a9d2..3ff5694597b3 100644
--- a/app-emulation/xe-guest-utilities/metadata.xml
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>chicago@blkid.net</email>
 	<name>Chicago</name>
 </maintainer>
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index eb2dcee1ae92..7b3e58ffc5a8 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,6 +9,6 @@ DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c9
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
-EBUILD xen-pvgrub-4.13.2.ebuild 4527 BLAKE2B d15b849b72dc8758ee7253c2a12e24c43faad900047051cee89b6c1c51933a571430d7d9b2b50d7828f6425db16a0e1878939943f74d79f407667aed4650abe5 SHA512 2006e7c6c574cd0ba09a0c460f4469f9a3379488aaf9f54672bf67c1b6159aaeb752f06af9c57af7b69fa02b20b28fff9bc6a0688cc0d23ce1a3a8116ba5ca44
-EBUILD xen-pvgrub-4.14.1.ebuild 4530 BLAKE2B ef74a5ed5ffe009f105e48b1b19193a8ae6f115ffe665940fa9e0de29d46465675b242b6154945a10dbb5d0a89c0266adaf9f577ad74e42cad58eeff25a17b6c SHA512 44f97e79d3e13e6860f1b3ae8d504a76cdcbba744b20159592bd6721266d0d4325a88f9fb5d506f91b6c2ddee94b5f10198e18c65078f24b395f51cccdfb456e
-MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
+EBUILD xen-pvgrub-4.13.2.ebuild 4534 BLAKE2B cf49a1dca1498e54e5ee83bb1c2adfaa6ae6e2d1f620b2b0106879a47fe83dad7de8cc00defa73201dff6d24a2f2583164439a519c3b9f19f9802958ecb1d556 SHA512 9fc46f79063d73174457939efb03b08ff47546d5052b047a9424a5f8f6dfde2930aa27f7e7aa813ff6e2f5380e18d0f7fda2eceebb5aceaab7f376b116f4fb4d
+EBUILD xen-pvgrub-4.14.1.ebuild 4537 BLAKE2B 626ef6e6c219b486e50482f03399983b14266409f9287764166ae5f1eb175d5813ad3d4b33c634b652897b84c411b331886eb22dcebe984de35ea570ec000a2a SHA512 46a49ef2d89b16cb045f9070e4d3e6a7c47d1da152c7ef2c888b20078c5463b21a2d57119c9721ff57c65352304de5a601d9ba26da368f2c69170d8b4319c554
+MISC metadata.xml 507 BLAKE2B 8b88290087f82d49524b825bff3b88bb3296b752a8aaa29281918754eed27a75d9213a648e6d0b7abc1f253d2259913449c497fa40aae93e1fdfa53d6105422c SHA512 d019d0c6553ebe58679dc42634e6327ced58e73a0cbe7d5b3cd70f20b689f3042b337700cb57f2ee5a5326b6195d5cca7e5a5d48c297888f226cd8b3e7dae79c
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
index fd12a2726425..d1684666642f 100644
--- a/app-emulation/xen-pvgrub/metadata.xml
+++ b/app-emulation/xen-pvgrub/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
index 3eb5e78f04c0..2d85b41833fc 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.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
@@ -12,7 +12,7 @@ MY_PV=${PV/_/-}
 
 XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
 LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
+GRUB_URL=https://alpha.gnu.org/gnu/grub
 
 UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
index c3980e0437ec..5b25c3a3ccee 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.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 @@ MY_PV=${PV/_/-}
 
 XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
 LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
+GRUB_URL=https://alpha.gnu.org/gnu/grub
 
 UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2f12969e548b..86053003d91d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,4 +28,4 @@ DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6
 DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079
 EBUILD xen-tools-4.13.2-r2.ebuild 16589 BLAKE2B e0dcea110a807bd7c565b41c0d3a016a04b684dfecfa01870951ea606759fa067a3f7a78d655a5decda409f54663c722c499cd98753ba8b3210f5b87efd39731 SHA512 9673f9fa78c6860688213fd21fb015111b6c23f355f89f8f63d0076adde5e87c749f7a44d53323d2fa4894644b04cc069cfd3a949265efe82e0276ddf1abc609
 EBUILD xen-tools-4.14.1.ebuild 16587 BLAKE2B 91b60db2a81fcdc88d2523bbfbf8a6125df1d66d2c12016bb48b71486946186ada12b2567f5c1d2b0f2576b3ea30bc8b439c7e7338ee15a1b482420103dac87d SHA512 237b5271694e0aa408f024de90d3672d24224d1a9e12fb779d7a820c1762579bb023543ffe3bcd27890edd71eb987a0f7b188ff2a16da2f10837261ff0ba56ff
-MISC metadata.xml 1596 BLAKE2B 049149106eb740b3ca38008d18431001f4cf27ef8ab4223cb78ba97e301292a13f39ea51c6064fb1e116404d9c52a61c0d42b921416d0a5fff0f7749e2ab4f59 SHA512 76830a62f4fe0d93df26372c67c2f1aca143e85227d86246e2c2e2aade6c0f64b62f7d7f7229612e65b5da82dd0401822317fe2607e14565a2eb9386c760fc80
+MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 71d5db7e3eba..497a921a1ecd 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 16683baeded4..3fbe3456621f 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,11 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
-DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
 DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
+DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881
+DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-EBUILD xen-4.13.2-r4.ebuild 4443 BLAKE2B 2df57309d69ec69f73e83715e1aaf0f3a273f2adfc756d87a0939b42d1c2c2688fcc755ffd5609a7281648ba9e3ba63114503d4647cc93111bd93c925f5b75f8 SHA512 8b121636cfa76c024b7dd92a0757714133502d143d42587cec19a39514356bd75a2d0b82cb4547ac7ec06370acda9dcd27991f09fd722a79d537aaf9fdaba16a
 EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
-EBUILD xen-4.14.1-r1.ebuild 4461 BLAKE2B 9f3674fcb933e69643d915a1a1954b2b43b6f99b1e38f79142733d8627b254e52c74b20455b735300719d995f2905a193883ba459bd30c9a4443ca1f880495ed SHA512 c1a2c4126a2544ea1db06d07127ef8c713c0e7be5d6c99352bb276f1e99baa5bd0fad14d2c0e3e00b0a682600be8d18e6165fa98b2fd72f3365a643efaeb63a1
-MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
+EBUILD xen-4.13.2-r6.ebuild 4461 BLAKE2B 51ec4190284c97258c5eee7769b0bd049fb63be964dc1077010a432b922ec484659e09864006a4186b0b177c9933da0bfc9e3c82cd018107ff46db5631710bcb SHA512 fc3dc7a4e67118f1d744d197111fdc8d9f74832a27d0142282fbc59f7a064421ec7e4913a179ffa293987434ac6b7d30e917c0fedb6d9c0a8f547d050c5c9bdd
+EBUILD xen-4.14.1-r2.ebuild 4461 BLAKE2B dba0b2e36c540adcef17e9ad611b15937f139cdea43732397f1825b8a2d5b03bf3c30d7b86e335cadbabf3dd4993e8a911e90789898d0900f0664e872c41c1d2 SHA512 32d97681abf3a0a9e17825e088a7221b577ec7902060c3b7a420de388c6ae48657350ec214886802479591a5111f1c6aece6430b38b5afa20e91ed07e272bf17
+MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 574d6261f8e3..b5a2ab082b14 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen/xen-4.13.2-r4.ebuild b/app-emulation/xen/xen-4.13.2-r4.ebuild
deleted file mode 100644
index 4c38268d9b14..000000000000
--- a/app-emulation/xen/xen-4.13.2-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=3
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.13.2-r6.ebuild b/app-emulation/xen/xen-4.13.2-r6.ebuild
new file mode 100644
index 000000000000..43eeeb028b8e
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r6.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=5
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.1-r1.ebuild b/app-emulation/xen/xen-4.14.1-r1.ebuild
deleted file mode 100644
index 92af1429434d..000000000000
--- a/app-emulation/xen/xen-4.14.1-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.14.1-r2.ebuild b/app-emulation/xen/xen-4.14.1-r2.ebuild
new file mode 100644
index 000000000000..fb4f1614c207
--- /dev/null
+++ b/app-emulation/xen/xen-4.14.1-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 90cff3c5cc90..8a6dadf1209d 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-QtPy/Manifest b/app-eselect/eselect-QtPy/Manifest
index 55f18ea405dc..a96eccccae9f 100644
--- a/app-eselect/eselect-QtPy/Manifest
+++ b/app-eselect/eselect-QtPy/Manifest
@@ -1,3 +1,3 @@
 AUX qtpy.eselect-1.0 382 BLAKE2B 8058eafd3dadc7ab01d4fbfbf3bed5a03434b347b7bd0673dcb69c4fa8075ec7e588a19f3e020409e7d8111cd873db1dc5937775dc47ad0ee17e88786c9c2bdd SHA512 bc642276ba717b2d7a78cf900805c76c18d0c651a848b0092100eb272c3bf8467f6bf91a4f1c62029868274b50d14e8f1e567722c53bc8d22497983e552c5cac
 EBUILD eselect-QtPy-1.0.ebuild 465 BLAKE2B 8911bfd38759b1009baf2d1977d100cfae8522fa17747d4a39fcdd591babe84e8e084be13b79ba0b865569261752e814d820a0fe736ed70d7b68f908f8600913 SHA512 db51fe1d2eadafc926e36c96a9dcaeef03dc1bbaeb453f0b7c4ce6b36746708aca574869708beee3321d11c9c2a2a181c7f3b4bc80b5958f11e068699f3eadd4
-MISC metadata.xml 491 BLAKE2B 141087bea1d5804febd944612b439aa7897dbd52bcb529ad73eb71d253d8627d89436ecb246c148ea34a0c3fd7b0c75e671af18c63be1f6547049edd244d02f8 SHA512 07450c739e958fcd84ad8294a38aea9b86e9f8ace6e1bc9a3f8c94fce6c0924836ad0cf199ed274788e3c20601668dd3d4b28a811bbdf46fd8c2181cf56d824d
+MISC metadata.xml 521 BLAKE2B 101cf3143c6687d00c3be2da264d406215b27292cc5381fcb77deb043b51cb9425d7197a1a729cc1202ce9f1f1b3f4372efdce5ea96757a0f7baea0e245599b1 SHA512 23f81c466db6d4f2608a899b61bab9c549e8a54f09bb75377521585b14ec22f0050e258e7e335154dcdd3efd1387739d907f493b90dacffd3df25e070cf61d98
diff --git a/app-eselect/eselect-QtPy/metadata.xml b/app-eselect/eselect-QtPy/metadata.xml
index 45a3712d3dc6..a8fd13bb34ab 100644
--- a/app-eselect/eselect-QtPy/metadata.xml
+++ b/app-eselect/eselect-QtPy/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-eselect/eselect-opencascade/Manifest b/app-eselect/eselect-opencascade/Manifest
index 39259bfe2afa..16f7996d7894 100644
--- a/app-eselect/eselect-opencascade/Manifest
+++ b/app-eselect/eselect-opencascade/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-opencascade-1.eselect 2773 BLAKE2B f605708b236c9bfb1c03ca6797fb0f684cd3614f2b1749d287b02346d7d62002e436a7feac7c42320b8142ea50b5179ed7931ada02dee88f3aedbbf5c4951d25 SHA512 eead41af1999ca97fa5079e2a92763807944a159e4e5e294d6e07d4977d626028d3601b69ac0d6275f6c866917dd87f1a0f8cb6720fe06e439d7d43bcbc03d99
 EBUILD eselect-opencascade-1.ebuild 520 BLAKE2B 93f92e50ee9efb6062b4ae134b612cff9518290a20ef5d53a6d59ce59fae9326815d326ff1c6ae6145796a4e3135688e10b9b5e2cbb69ccaf20b164146b1b5a5 SHA512 4ea83a54a4dc301fc481b03a3b3583c7fccc83668366f053a9dd342bdd3b9f4f99a3ac11fa86d6298405927e4eaec4018aa1065f1b1b6e3182a3f1e239d07df5
-MISC metadata.xml 401 BLAKE2B 3d29c4ba008ca4f97799ced38b83179710eea63ec8f8cc26c658804cce047b8af8b1b497c7a315bf98de4437d024b74512f87f93769896b8a4692931e81b8e45 SHA512 c3630a59c2df433cadc652d4fb579628e53ffdb954c6074deaf3004a1b60630d39c02a8d0648ad98564b230b54a8326e0fcf01e25360fb1c39385f606d252856
+MISC metadata.xml 431 BLAKE2B 2ae461d1c406b10c192fd627149170b480cefb778c9af26808d529550b15df9de004c7a32ec2e8ec0aa2111cbe8866fea4ea1da609575a5fd124a43e66e2ab00 SHA512 64e80d8c5a77acb8117c8e5d974f07f07f81f2666eec56b47e040d0388a384916f1be65445161e9de1f99e3ebf929a623f10032bc13daa92e7108bd3e7a7c820
diff --git a/app-eselect/eselect-opencascade/metadata.xml b/app-eselect/eselect-opencascade/metadata.xml
index 6465b61dfb8c..8f44caddbd18 100644
--- a/app-eselect/eselect-opencascade/metadata.xml
+++ b/app-eselect/eselect-opencascade/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers project</name>
 	</maintainer>
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index ef3e247581e5..ffaeea026e71 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,3 +1,3 @@
 DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
 EBUILD eselect-wine-1.2.2.ebuild 1271 BLAKE2B 18abe8ac6ec8844aaa55960702833da507fe8f7a5ec74c197520aed6d14eb5e9be5dcfcc4417cc372dd13dd79483ecfd026f4935c1608a76bc8307e3856af81e SHA512 2846fa7e5641ed5585f591335e526f9eb698f97349631afae18dcfc783641ed0f9708346241c0aff5419898de672133454183b05a4154e29ccc0e50b08fa93c5
-MISC metadata.xml 459 BLAKE2B 25427bc1f01d66b7e19a21bacf44c608e8774be585b87bf3c26c553cc228990c8cc034db2f68c57964ce379cb4091ae37283970b832df81be7beb13ae9196fbc SHA512 4cb7d97a0a100a67d4d303ba0fca28630bb25739bf498ac8c34df33230b6e137559309157768b71271aa3843956b88ce62e13f32cd97cfbfd75746aa7eb94676
+MISC metadata.xml 473 BLAKE2B 74cf197c344ae3a30c914dcd09ac6f07bfe0f0063982075aaca9f49ce735b705c09a9a57d2b2dc46cd495b0ca6d714dff634de88bef6602bf8ff00859da6f555 SHA512 99d5beec91febe38f12caef84086474f49b31f78c03d5906f860848fdcc1b443b55c24f002e3271eb7087afb417f814383d258c7383f078e94fda19373f7a688
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 2c65a131bccb..41d6a8ffa6d1 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@eroen.eu</email>
 		<name>eroen</name>
 	</maintainer>
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index cf24e40f1dba..645bf5ea9b18 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 783600685193..b5d7985f9537 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -11,4 +11,4 @@ DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
 EBUILD aide-0.16-r1.ebuild 3217 BLAKE2B 584426773393f8bcf477bf01e8bc5a5e3bc4c2570dd7e2c7a6c1f1360a0e88c7db45c9bd5d79a6fe2bd95df172b99c7dab9adfc2f1f8ba94f28d94da83efd19b SHA512 2fcb2cedc8fd85654d00fb96ad66e009417e65cefa1d23f316993305389fd3f7bc49c7a5ba768cc97bfe9b39fde3ad47dfa8c159376954f23f5ce2d99dc35e14
 EBUILD aide-0.16.2_p20200614.ebuild 3838 BLAKE2B b4d62f2d763151c53367e512bdc769f6befa959ef29a701709de6b4ba666a48abd3e2ea8079f8d45d6063cba82b17fa6f72e50ecb37570acc8cdbbb335aaefc8 SHA512 8608ff464885243b68dac665a028decd55c5a3d61c4b0c2465edc1d5289a0479c29128770ea089fe5eb60b9dd7310702658a5c241361c73c6c54468c63be71e0
-MISC metadata.xml 819 BLAKE2B ea807e78f806beaf63b28b99d5dd95054e247333612d35ea6004bf4720699d4c5a503ca893e0df172086935dd927c6e165410df74c51949108ee6d2fa5766af9 SHA512 22792dd087461ca8b147db6a03a5198127f19ea8473ce5691d9630e36655365a9dde4377f6d62e0457b65a634e23c0b2852db9dadc7d00c3fcec4a84e21b3054
+MISC metadata.xml 849 BLAKE2B 7139ae304df1c53a98cfdc244fe43a92b87a3b002a221fbe1b2b41ebbe2d8ef762895abf4a1132df2d5ca90918c7fd032e1966f82feff68546671c3f37103f06 SHA512 ec83a97430529ededee1d009aa1f375c722c70f5763e21721c17247d422e717c53ed110309f0c65c1467d02db96e3c7a96b2c776065e48296c3766dba55b0c40
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index c7da79793a7f..78294f7cb0be 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 7795ec244272..6e466e21ea41 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,5 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
 DIST lynis-3.0.3.tar.gz 331182 BLAKE2B 7b424da8726e474992bcf6b13b6b82b48568b2d1f4268d0cb57f11560c4edbcd60d009c67fd333445392a184f1dbe38a55fde7cb7456498f89c451bc51ba3e8f SHA512 850f832fd45a2e440973c414f2c98caf3add1666573f60ea70bf36f57dbf3ac1b354632f09271b34f85eba25079e564d758e237dcded743a132da771c5bce151
+EBUILD lynis-3.0.3-r2.ebuild 1164 BLAKE2B 07ace7f68c6f5277ee818c7b2e0f789df52dfb624ba28a9f11d8a97ed945f5c9a5893fe9d97239f0d8bb34492f34d888310e54cfc2b7fb5ec3c6582ad7e4d717 SHA512 0b8b1d4762280ce8319ef9ec11921e6db6f67671d9c0b0b40d2daa4cc8450a3a8aaa09ccf70a651183705729554f5e69e707e1a8448aefa86b455978055d71e9
 EBUILD lynis-3.0.3.ebuild 946 BLAKE2B 125ab03724a92997302ee3c916ffc91d91b84ef75f9cb4b29e6833fe9172bf82c1d40266c62fcd6dfe9960e75863391a741237b71ef5420941f2fc693ea27406 SHA512 fcab7d0458fd727cf2b13e31cd4bb36e2e7cf38a0f691006f7dbeba8adf91fcbe4f3d078f033fdeff30c34ebf9cc75d093039855d4f3b3f7d306f5f72e6065ff
 MISC metadata.xml 251 BLAKE2B 7bfd5f1051cbe4343bd02cc5e869988eb1013ab464ae4ea70e15faff085b7bdc2437feaa34d5db2a90b4999014c146b4d1b9b0a4fd5c99e5bf550577923f49fb SHA512 5031be5fdf8e7fd7c6863c4a56016d80530a7363104272c82b99e2bb46cb7b22247fc5eda3814096701466fa73642994303ce4e666fb314ab843c18dcfa1845c
diff --git a/app-forensics/lynis/lynis-3.0.3-r2.ebuild b/app-forensics/lynis/lynis-3.0.3-r2.ebuild
new file mode 100644
index 000000000000..b7d94d5ae33c
--- /dev/null
+++ b/app-forensics/lynis/lynis-3.0.3-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 eutils bash-completion-r1 systemd
+
+DESCRIPTION="Security and system auditing tool"
+HOMEPAGE="https://cisofy.com/lynis/"
+SRC_URI="https://cisofy.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	doman lynis.8
+	dodoc FAQ README
+	newdoc CHANGELOG.md CHANGELOG
+
+	# Remove the old one during the next stabilize progress
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/lynis.cron-new lynis
+
+	dobashcomp extras/bash_completion.d/lynis
+
+	# stricter default perms - bug 507436
+	diropts -m0700
+	insopts -m0600
+
+	insinto /usr/share/${PN}
+	doins -r db/ include/ plugins/
+
+	dosbin lynis
+
+	insinto /etc/${PN}
+	doins default.prf
+	sed -i -e 's/\/path\/to\///' "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+	systemd_dounit "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+	systemd_dounit "${S}/extras/systemd/${PN}.timer"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "A cron script has been installed to ${ROOT}/etc/cron.daily/lynis."
+	einfo
+}
diff --git a/app-forensics/metadata.xml b/app-forensics/metadata.xml
index c0d98da0e1f3..9983a8a85f9b 100644
--- a/app-forensics/metadata.xml
+++ b/app-forensics/metadata.xml
@@ -38,4 +38,3 @@
 		przeprowadzanie audytu bezpieczeństwa systemu.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 4ef40ca85f7f..4af8dee4a377 100644
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -2,4 +2,4 @@ AUX ovaldi-5.10.1.7-disable-acl.patch 1231 BLAKE2B 2f434497f12b52be3f18a4a35dc9b
 AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 834 BLAKE2B 8e4cc626d97ee2f80c40913b09550693437ac6cc9b3ad0491962b8c3b78cd6e060ba4c5c0f3bc18be10348ec31fcd9e0e35108bb80425764a7d4f75412b8f0b0 SHA512 f05a797252a2006384f450afd2c0c2b8cd894abc2409b21a3df9cec57af39ff81dc2b007b0e3c460e3ce85855a1b37fe18b5a4b79408969019332300d0c1ed47
 DIST ovaldi-5.10.1.7-src.tar.bz2 20391784 BLAKE2B 7e2c719f0819f967c6aee533bb881c29ffac756461460d73e3231f1cffd254d88a26e716f0334d023daa7fa6f9c314bf7a42b6c13e2a90daa558e589d135479c SHA512 22c373436889b03ffb5d479bd322703bbd8b5b335f116a3b38a3d206ddaaf3115961ab89597c3907b6e5d745eb302a042c135c73cde0eaae10e51f5d6e3e55ec
 EBUILD ovaldi-5.10.1.7.ebuild 2916 BLAKE2B 2c112f880d04df0b6c38a9af18daf0d4d132d0037eb3dab4cf6b058bb460cae0dd0884d639ba48f529ba678dc4b55d1e043c61dd6407f5402387e01f7ba24946 SHA512 50c1dda60172704ae77a1149e338fdec14b3bb02a24a71a0c3f25edda79c59100706e10029441667cff74c8594517aa11a57b055c8fcf017cbe7c4904632c357
-MISC metadata.xml 244 BLAKE2B f0c285271b149f90fc80cca808366c27dc0e3da036e71b3d5754c33dabfc1e7df9ca340dbf729365f3b38961b165370d511075eebf6c0ce910134378d0c2b03d SHA512 3c0bc0d2a893195113f085b69d5e6d1ac5a6916bde0f04fb319c020badf81472b79d1430d6ba2cd123265334510498a27a3c38bfdc230bf5fbbfab65d5aa4d48
+MISC metadata.xml 243 BLAKE2B 72d65d0abc045838e84adb103b2ce4ae4ec3bfc3f4e9843f3f10aadc5f20f6a13b9997d491bcc69cadfa6db8e2b6640f127db6406b734883292c27a8180a61f1 SHA512 36f385a96e0808f3d6a13c7f1376b62754012dc345671d1404460b74f58e33356cbfef5b8d61cf7c0801c9afd45b1b801d87e2e540a5c0f508b41ca5a7591b97
diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml
index 009a7f30aa6f..a57e1de0c615 100644
--- a/app-forensics/ovaldi/metadata.xml
+++ b/app-forensics/ovaldi/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="sourceforge">ovaldi</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-forensics/scalpel/Manifest b/app-forensics/scalpel/Manifest
index 06248b48f6ca..bd5abc6468f2 100644
--- a/app-forensics/scalpel/Manifest
+++ b/app-forensics/scalpel/Manifest
@@ -1,3 +1,3 @@
 DIST scalpel-2.0.tar.gz 1436379 BLAKE2B 7a645c1d6ea32fbd1b0bcfcbfa0f704b6eb58ebe091b8a7ef89f59756c18ce9937849f9754f6ab8548c805e3503f9eb3cc58a2f835956a1315668db5ce19c41f SHA512 7bf8e36f2fd22eb34e0f454c44a3ec3bc4e61dfd44ecda6ae93f0cc41cc3ad2b9fd9604637329bb96274a606812a578c968dd435d9d4a3ac5533613c849d321a
 EBUILD scalpel-2.0.ebuild 610 BLAKE2B cf16769dbdbbb7e12a5e2605ff92d9816dbfe992c7d7c451fdf8b5e360b726a5024aee52d8d72192c1336eedbe4e1613ff67d56b76efba532ddb9990379b0f48 SHA512 d077b16affa31d02982f565810cd51cb7fc52300529bb2accf069aae3097df61b8000b5040f9289058647c4855a2d83fe3a0befd3b987326606a0eb2891731cd
-MISC metadata.xml 681 BLAKE2B 2fb63f4c9f21fe2afcc34b0a8e498a5d05b4d24c494cec87395ad3272d96a360e38c4d51ddcd5c771063c3223d75cb8568d6e0dcbaa388370e0c62afa6ccc356 SHA512 4b4d72abc4eead9d656d7c341a3390b220f48b40cce01582b3c21fdbdaaff3829905fd6b4d1b930e42ca7be4ab6f9f03ed14f89ce20cf86339578e04a3c8c381
+MISC metadata.xml 681 BLAKE2B 91d9fae0a4f414fd868e4ebbd4517338adfc03dd125261f4f434747f7af7e75e14922f5c6a25e35768c19f21f833f1a48166aa0c79813f05964ebfa08fd26896 SHA512 5ff7365e772ef2aa052ab6598515afa39e977416a31421f2b6c2f8aeb95da9c8221171dab92c524f17e712ff8fa4acf9220fd349d0c1c652a09c6084012a7d82
diff --git a/app-forensics/scalpel/metadata.xml b/app-forensics/scalpel/metadata.xml
index 579622d691e1..1b3a494a7637 100644
--- a/app-forensics/scalpel/metadata.xml
+++ b/app-forensics/scalpel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
diff --git a/app-forensics/yasat/Manifest b/app-forensics/yasat/Manifest
index 3e7068ef8b3d..c335cef011e1 100644
--- a/app-forensics/yasat/Manifest
+++ b/app-forensics/yasat/Manifest
@@ -1,3 +1,3 @@
 DIST yasat-848.tar.gz 148261 BLAKE2B 917846d82f052d8300045eb02e6aa8cea18bb6ea170ef52c83646069ed14096f205cba8f50d079f7f63fcd00e84c78643aacfc202795d3922c0708cd525ef1f8 SHA512 0bc0e8e1068bee05242b5c7a7cdc8ca976503f696aef2889870ef872546021d0956489cf8d5b304a36be412cf8e5c8cbf4be5aa1cce5df008c5185188e5a99dc
 EBUILD yasat-848.ebuild 493 BLAKE2B fc2849bf416e1e5fa05ac48193778f98ed2935dc30fa55b2ca282663be4a86426962f51e40040959ddbbd22279f1359a5952bb9f28801d193298aee39da07a66 SHA512 8bab1fb28f7186345da24999449fe2c2d45208c515c9b76f5bff2e1cfde145b87da895b49b802d28ac9c07926d6db444833b1acb85d60705e20950f7e5f54326
-MISC metadata.xml 243 BLAKE2B 391aeec1a7040f787bdadf6f51360c9479a6fa85593395f5dcb34e499bb86e553da4777c3889a04c16e9f647ac09ab4001911af7c5e2899ac0b70648b0079134 SHA512 92acef03825eb111548d4f7214ed78f938db7485f569a87b6e69c35757e1e22603d1f29c2bc1f6dda7121fa231a41ffaf5d40993515c61c59f95221c93488e5a
+MISC metadata.xml 242 BLAKE2B 71dbdc22ef8219f9ba70cf598a5c06c3d9475c576a9f86c33d9542e0c2e023991b8cb78e35257f0f5499b4700ba1b937612215f499f3e1350e00de29c6efda87 SHA512 bd53339fbb4299187c8d78e8d7a14f70a402d52af93bd3573e42166a704665fd45fdb9c87772fa256c7b0c527ea3c3e693333005e5c814ced496a894475cdf40
diff --git a/app-forensics/yasat/metadata.xml b/app-forensics/yasat/metadata.xml
index beeb17e12cc7..2dd1c9c0553f 100644
--- a/app-forensics/yasat/metadata.xml
+++ b/app-forensics/yasat/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="sourceforge">yasat</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3aeb43fd6df3..6e818e3c2560 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index 2c4cde4d585d..1f27702b7637 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642
 EBUILD fcitx-anthy-0.2.3.ebuild 784 BLAKE2B b1c3a32f4e878d38cb77cd278e67184fc1d2868071ef6c400047ef28545467ee3bc3a28a3201de647c37dd72d254930b06dac6187ec485c8a8fe03a57adfd1f3 SHA512 448abeb934e60470b79c22efaa58826a93fe0fe384a36a7fcc04c9d7b638624e123f0943a8ab8acd7a25523f59dd4f30c35074ecbd3e2f025cf26e8d03e3e8ac
 EBUILD fcitx-anthy-4.9999.ebuild 765 BLAKE2B 974c2629472eeb6122b291e06c7a621b19cf22a253b2dba10a40285e5a65e111bf047fb9cf0d711b2a5b4338927012886462aeb84aba51366d010b4bf797072b SHA512 79f581adc7a301fb4012e4abab6c8a3821257b3981b595699c52d83036fbe856293c5876e3fe1d9935e02f2f28e8218ca4e45e1a86258fa64b55ace44bf71a72
-MISC metadata.xml 450 BLAKE2B 7b27aad529b9f760cafd38ed497a6a428df9580b0612f40eca157f206bdd145f038973ce2823f42f988af182ea60ebb34abdfa41f5d1b9fcf089ed4f421df8c8 SHA512 6100dad76b1522292d84eac3dacf69890747a6c76cc1c1e519b97f749a6d86ba34d3cfa439b6a529db87df9b4f0a019ac38e616860c6fa734186631dffa75d47
+MISC metadata.xml 464 BLAKE2B aaa935a8ea59bb178ef0f9a1ab8924e33a1fa108f8fd94741049152bb64c3d1d8759319bb6087e495e26618c5c62bd3e617e8cbe8c588f4f75b48de2a998ffa4 SHA512 87e1c4f5ced1ac066406509fc16c9f89d4bd1e45604fb087c6a435c71fb54384a81903b7048fb4ccd88df5ef87e66caec0cd9b540c30cbbbdc483a4fdb5059ad
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
index 5e15c729652f..b01927f26e03 100644
--- a/app-i18n/fcitx-anthy/metadata.xml
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
index b01bb3d819c1..9ff44c730333 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd
 EBUILD fcitx-chewing-0.2.3.ebuild 794 BLAKE2B b0883cab14161ad89ec9ffb4f3b8ec653c54bcd772c39d1c89adb838616c3ab0306bee05773c83244299b3c50ec813a78f148aaaf5c521476fb9eddf6e8816ed SHA512 e68fec3fe75da0a853a6a4759457e35522c6c75f39b4256a583976a22b048d611a120493473686a03b9289306b3f0935717acf4217bb3d4c70f1887fd393e122
 EBUILD fcitx-chewing-4.9999.ebuild 775 BLAKE2B afac4b517c3f11dd5a9b0fc8e0a92f1d43d6f99fc6572edabe0648a55f9085898025ab19f4be7e5957760365ebed0279441efcd2f60fc9cdc9c6cc99bc3d06b1 SHA512 21db151a86da51155aead4012a8eb19393fe4928f950f4905d6a4904c2a907eb0e8b041ad6e86355917bc5185e6749ad81701e5e3c67b6050b6bdb111fd8d170
-MISC metadata.xml 452 BLAKE2B 9fcd460dbcff6b2c7739019a6a51f1e65d8ed2d215c8ecf4c7b0f60b7286e9e46c5f9e190d9c968ea1216f43dc5da9fb297cf188b514a02068279eed349b8bc2 SHA512 b4a1540d3993d402fb63dcf4e4f45d5812bcec85ce0635830af088afb74a1214a81e75dfdbf6ba408b3ec2ecc9b98b6e6f76298e5f818f945b7ce88717be62e5
+MISC metadata.xml 466 BLAKE2B fc8393df539e48bda35956560a4614e5213b4ca5addcbb232884b707da5c195e53b0c497ac38463316ccffe0fd1d2bfc8e04212ce4f9c1dfb79314020e1a6d24 SHA512 ee29cec0558abbaaf46b46bf362019cc81bb4d644fec83da56030bf161ee879468442111180e9820b793e1bce76964b4d62a8c62d427a7aa9143a2e57f2371d9
diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml
index c3d61612ede3..a12906357886 100644
--- a/app-i18n/fcitx-chewing/metadata.xml
+++ b/app-i18n/fcitx-chewing/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 028d52ca1525..dee7216f0837 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
 EBUILD fcitx-cloudpinyin-0.3.6.ebuild 734 BLAKE2B 09edc3d6d167dfb75602d8924cc8986c67fdf6cacce39aabdac16bf6bac1e8b833919ce628a7c528c93608936675b176a1d3af45e870d2dfc3ceec4a6bdf9ff7 SHA512 cb2bc4611218f4c6e6034d55cd2d273e53cf24c014ef05257cfd4fa23ef920643a5f8917adecfb140d2de362c129a5e8e47200b9b6dabe7510267e0f9e3616b8
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 715 BLAKE2B e5fab1a6ddb4188819efafb20adc30a60da16cef2b77515a4ed4dfc88f50165134f1b418a136016e6c3f24f4983d31c65ad7c34546c2f10d02c483a3bf965973 SHA512 5cd5055005d7caf9c63ab206a3646e96d9def6483698c2e58222fc0a80a0bfd2dc34de4f579255b01c4c4fa85a40119a898ec7500ca7136b6f8315e6d83ecfbb
-MISC metadata.xml 456 BLAKE2B e7aea5104a7beb0c6d879e801dd4988557759cc89cb48331dfe64b5cb336da07eb5ca0db77fd07f70e2b035a556b41327a1a619a12fd1a80480e0be40373c227 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca
+MISC metadata.xml 470 BLAKE2B cac8daab57a448cb1b46e89dff102c52248a7ae44947674e48c20ab6d32f2a7a628401a4a17aa246ba30243f57db718808e34b6454d431e1ae89cd518fe9088d SHA512 fe65a016454405e64c79e8181243647951575bc8f90bc2e0782992cc0782a817552122f7b30f3f0509e60366487dd8defb2fef3b3714da86fe5ebddbc8e726c7
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index a46ab006f456..bf9e3c5eb19c 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 46eef124333a..e61fb5c20623 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
 EBUILD fcitx-configtool-0.4.10.ebuild 837 BLAKE2B acf5e7b715031125db579e07a887d8cbd2452c6cafe7f35c3579aa12132853806e4efe21d5b7013ad0727c49fb16f37b55fcd53a3f54dba51c6547c6ccf15881 SHA512 dde980fb55abc939c37b5d2c15d6ea6a79fe12789752d5bdd0bf3fadab58fdecd720f4f9baa31b520c61b42511d2d4d1ad42ef3c0d3a52a606064df754c07e35
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
-MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e
+MISC metadata.xml 469 BLAKE2B 6ee438af60b172c821bf75da2da0586ae55d4b8538346719d08fd3d53919ef8c5d87b9059a2c0dd20ea9968c734db3c03c7c08ca71abac0491499c616ac2b5a0 SHA512 7bfc73979cd6f7384776e8e9f1de18aacdc4d4b74b1feb1b2be8373b4f999e1756d7bca20d49616dda6e39033dbf5dbf7795baa392523f88f0fa6cb321354c43
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index c7779e9268e6..e775c90f0cbf 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index 2aa0a3798851..f9d3cdbddc41 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6
 EBUILD fcitx-hangul-0.3.1.ebuild 822 BLAKE2B f4d971b9c5210e709a1263015783300155d112f7eb6f5c17c59a4c7990f50eec27d7394bb2023677bc0c162fcef7cbe30b92e1401f39af0d6018c5bcb0b17e80 SHA512 8df67887faf2bbcd58a2703c2e57668883a60658437e7d8f6969663ba41b225b4f70f30a0e49a4d5a2ba718e49d8ec9c22c917e11422d5a7f1a293021df5303d
 EBUILD fcitx-hangul-4.9999.ebuild 803 BLAKE2B 84ccc25600ba5cdbbbb51f6ae9c2a4b4b04cd902a3f2444502ddfb0980b0c6b892fdd994b8d2b1ff3b252f033133e64941aa9da20211f56e6344b3d2a0d48ad9 SHA512 0ec0d8966b9b5df8963c1602e5430f9b0dae90e4c35cde5107848d0acbb37dbd0ecc116d4fae25d56b36c333ff483b41be062e43a9225eabf2fba831e03a9494
-MISC metadata.xml 451 BLAKE2B 23aaffbadede41a5f006329aaa18e9c9938545b19bc11cd391c37e52581d501abecd44877197a129bb570fb97d0b97bfa205f5dfcf355163e325624c28feed39 SHA512 71946f56143f4b7e4a7a4b032f36d95a94ab5c6a78a8f89860233a0e3b2a5c57088d9312a936316af0035ce2058c473595eb89cd5cd699cc2c86ad57be699891
+MISC metadata.xml 465 BLAKE2B 063e251335f5170d663501f3c550d259cb273e74544d601e4d355982f8962b6c360cef3e2a8ea18784f1a6c294713a93d651614824bb72caefc5c662590d49c9 SHA512 f900e5d412a72ded582bed15673ae491ca2705c5d38e84228671b386858826fb970a16400e771731d6dc901702bcfd69a177993ca7dab9996668a25cbd6143c9
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index ef7714e27ba9..482302a42a04 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index 3b382fc00e20..35f28c673418 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -2,4 +2,4 @@ DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8
 DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
 EBUILD fcitx-libpinyin-0.5.3.ebuild 1601 BLAKE2B 180fe2f12f7dc9105b952d888c016fe4056d2b3a16e3fbf861a7ea6bed33e97b6ccd1fef6e06153df9b18543a5ee078a5588b4692ac7915c00d5dc70b0eeb42c SHA512 73a01b5853c521ae1a6b69bb9fc17d8df27b20444dd89ff1e6f2fb3fa036265eaa6ddb435bec5469f3d49cefab5d28296b5755481b26b6fa8a2e5dfa062e51fe
 EBUILD fcitx-libpinyin-4.9999.ebuild 1582 BLAKE2B e4664b16a52aa4ef11868cf67729c6dc53c77f4b8c16019ff700bae854cc7def01336c9d8c47e19568f9e08e6f2a8cc6c9d0b750d3669b49205e8d199ee8d0f8 SHA512 92b3610d1466a90bbe71b3132131df5592111fa8eb2051f59ba62b75a77374a593056e3617e58c6cc82c7c92d8a95f8c652cebcca8ac672b98646082b8204fd9
-MISC metadata.xml 537 BLAKE2B d60daacfeb2a33824bd399d144ea7bd9a99a6a96062df226d4de0b674387df563a1294366b0cb2e216c33b321680f00adc88905167508898f6c3a37d6f0c1bfe SHA512 32e4b2319df016e83055699ada867d1e1aba7b09d26308f03143df986e6aaadf77243da97894d33282ad7d1a7ee881723a4eadcac6f4573fce05ba3700a10609
+MISC metadata.xml 551 BLAKE2B e2545bc1557d0037171956e7b04e664311cd455c127098413f0ec2a6faa7ab1eb17c81d515dd072b21cf280cd2fef444d9050f8d2a86a6dd0b13a729f0222c89 SHA512 99e37cb27ed91bbdd59cd590341b6ee89ec2afd30e40cfdde1b59314483aa8414a5a05a79e82436e2a7ae79c43aaffc8b4e255e5b157ad1f27d5ef411c615a62
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index 2c68bea1e0eb..551336cb14cd 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest
index 4f4636e77ab6..ccd1c26fa33d 100644
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112
 EBUILD fcitx-m17n-0.2.4.ebuild 709 BLAKE2B 3ffe009bd55dfc99014f91efa9e85daef6e4bd81eda805efd67a2c1cbc16cf74aab0b8846a40ed2952d7dc107b9ef8edef7705143e8ba4db8a07d2a553ccdd3d SHA512 571d3c6b61f7e4127c22a52ea963769e19cebcd271394ac3463bc6ff70da85b9aa2d62ce0aa85e9e2cfcaff290c0ad11ea58b0265e7b3d46d47714265a0d4c81
 EBUILD fcitx-m17n-4.9999.ebuild 684 BLAKE2B b305cb0b38cf7fac69bd8e394393f359513bd7a8e85b800762280a9bed1f685723ed9530776dbc3fce0e61946c9c45740224958ff16a388c07b22e73c22fe381 SHA512 e65e8ca0017ae9486bf138005e9c0759a4d5e64294384bb3e7be20ed083f5441be56bc2ac066b16f06174ae77f77bed36f33185f816ed33f1ffff17b2ca4012e
-MISC metadata.xml 449 BLAKE2B e146ed29ed13e93285bfdc7a08000f72888b3208c1d5a2d2cf301f613e6b2530499ced88b292ec74d81fd0d2af9e0a01b8f07358bd8d39f4d0de23fb986b0f49 SHA512 97c79c2a23d736128429846b87000d52f815e3b32999ea0ca3ee1be2d6281ff6aeb2208d1340e74414a5b5e31e06e3675292e307960d088767c09c252f5d87ef
+MISC metadata.xml 463 BLAKE2B 5a7e0a9b8aab8f0a00da7eb48ee1d39e174843b3b74fbf408056679bb7901e777e7c7b5db4a3db0d2e4c4971691647f695ce922c1de5f4f2baf2c64b7469be4e SHA512 21fc8544e3a3ed5032456ef796e30a10b85fad62daa50cfe831618b5423a61dcbe1926acb71c2429782a0aff8073e1a81c5a07b2aeb692375cc36909d51462a8
diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml
index fcddb15dd181..e7e76c5011ab 100644
--- a/app-i18n/fcitx-m17n/metadata.xml
+++ b/app-i18n/fcitx-m17n/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 7b8ec17fdc29..ebcd7f159a73 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -6,4 +6,4 @@ EBUILD fcitx-qt5-1.2.3.ebuild 953 BLAKE2B f73f95dc706619866904fc03cacad15b13faf7
 EBUILD fcitx-qt5-1.2.4.ebuild 957 BLAKE2B a126752b8b2e5233f31eb1387a2537b6e87a9fd4d2c10896c756447e36263b067dd7e2628c7f3dba93a5ace3bb4471069c0876fc6025e79591badc190fb8a4c4 SHA512 d3f8568e472b53e2eb7d918ffde3f280f4437074c6e184776f4c240191a37b5f2fcb67d42a03750374a517de7aa8280cbb92525696e7006b06c3d163f5156344
 EBUILD fcitx-qt5-1.2.5.ebuild 1033 BLAKE2B 262026c136df7c9e2fee0d422394611574cc3494a9429db5a8933d089839597e99ea336b5bc2deadd5fb32517ad13795d628d91b0987f7297f18b01442c83690 SHA512 a31fba7bee9f1381e70aeb0db5aeea1d7e238fbe66a0e881f4b86cd0e44ad4e57b8a156f1b544e0030654383b749a549c03315e46b6ab9058c0318252ad1ef25
 EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
-MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4
+MISC metadata.xml 462 BLAKE2B 7a233fce87fd36fe60e197aacd130b79e3f74d2cd2d4080643c3f4382f3d890806ac31447188a6d914f79932363c0fb8c04f3ea09fa2767db181f06e381d8a35 SHA512 07d45d9e7d3616dcdaae37f59cd100f58bdba0da66a13122161a154dd2d7a2f5f5cbe7c13c2f9c673314fd74bebf7314966853fcd1be51e565e97d9f96063a4b
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
index 1a301afceb2d..3bc22939d420 100644
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index b2479cbc098c..69b5ff25746b 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
 EBUILD fcitx-rime-0.3.2.ebuild 939 BLAKE2B 2b291d49cf95fc78e4ba61b8e7833e185b2fe63b60256ca8601d8cec1ab13e0b184757c4c138bb71695ac5d668cbaf0230b4f1f86f8a4f6b19d5cd8b7d787f09 SHA512 45c61a796cf01c57b818240d41c1f9ff3d1861b09568aa19fde8f3a1cfc03e375936678a39b87ffeff7f66b3647f614344600075cfbd148dd4cb99ef104da088
 EBUILD fcitx-rime-4.9999.ebuild 1226 BLAKE2B 46d921f42c0288e257346757bb9d376e665c58c2bbbf1a685ea24943caf401c0cefa3d8ea4abd4b21a5c49cf3e04f6a729e1ac37115b53fc21c777021980040b SHA512 fcbe4b1004193b8cef033e97fa87f4c25804baecf17ea02948d15569038292c9b4be9cfee913195acf2cdd2dc5486e187c3abfe8fd69fbd5dc3bb37e1515c9e4
-MISC metadata.xml 633 BLAKE2B ef743e2803b410627255e712b1f0c759c9605eaadf4cc980382acae3a657cfad935b45cdaa6f0bbf697bc1eaf8e2963e8de4a0dc5afe62ffa9f3c6a8bd6ba361 SHA512 91e6413d4cdc60e3d4f989ea06fd5b65acff6684d09fdfe4253f812678bf1e9aa0a4f191ef7ff88e6c394e9d1a8ed252b57ac48262483e52dfa4615c785ff4eb
+MISC metadata.xml 647 BLAKE2B 6256d42061b318f1d9391d891c4646d9305a73486c989fe0425c4b6158b75506f83e70ccc61f2625ba862a8e9028548cb57144bfe74f41429fbcfd3d5547e9a7 SHA512 e7591f5f7755ec545f1fba1a18bb4703499207c063bd05d3bcc809cff1258b25149eb3d91e670fb851cee63b06b3a857f3ddbe282fa0735e45ec887da1bb8b44
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index c809836fd12d..c50c5ed628ce 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index 73d27d00a0f7..1362edf41644 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
 EBUILD fcitx-sayura-0.1.2.ebuild 777 BLAKE2B e40203bc3690cb53df151ff7a0d734226c7ef4049760746b63080bb76efc90301d87a0dcbcf045dc0a47820990eee0b48ac87f5e318a0e46793b465434bf67f3 SHA512 7bdbc7748a560dde57407415ec109885413bc677ee4f61e2ef7bb5f12964be1e1daf5a6fe5e9f39c625699e7f05562a69c770324588672739b94bcc576318158
 EBUILD fcitx-sayura-4.9999.ebuild 752 BLAKE2B 1586570bbf9450e512cb8f1db440cd71c3c3e7156b81a6348f315b2c20b7c139771e8090ff660d440afe42c8e26739a211bdda8889344de8d59adc46695e211a SHA512 769efa27440e0b39d7d6b508004ae07570e9dd9287c72f4c4afd33e4a448dfed27ea5688dc3cd5e74eb8274294db644c7a6b3599d835e120adaa8dfd3d5f6c12
-MISC metadata.xml 451 BLAKE2B 1e44b5ecebfb78a8f5990a2ea12bdd0ebeea8f64ae3a0554f3c66642e826be215dda70c24d2b6fcde7d7ae2c3d42092b7b0763b9f8405f967d3e09fe8062b3f5 SHA512 d1ba4ff51b06d03e9ff7c13e3f9693c8f91cceaec228f4bd90b560a02be5b42e5fe3d8d7a885816c12b9ef123484537df67f572c0e7bd3d5555f0809132537f1
+MISC metadata.xml 465 BLAKE2B 392fa8d151d3401274ad4a93d343fb35e90ed7a4c0c73c0a6f5b007a8f8ece81e1b1906bc1cc9e39298726bd561bff0b6046824b12178e8ab7537b19fc1cb469 SHA512 879c670410e613368ae25cfb7c40abc8a1f136fd6e6413269f1d11b8707e53c9239dd1f0f58d5f18ba09dde4ce4ad161d9a21ce0ee76f59a7ba5d3383bd03a09
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
index 98c49b162783..530a4f134a6a 100644
--- a/app-i18n/fcitx-sayura/metadata.xml
+++ b/app-i18n/fcitx-sayura/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 9cd88782455a..02bbd639bb8d 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
 EBUILD fcitx-sunpinyin-0.4.2.ebuild 830 BLAKE2B fe2e82ecc1ebf52770a10cb4d5a683609b304584408d6108851c6b017da74558ec451bc8da7adf7094c2515006862a0a92d3e83303b0617047b31f99872033c0 SHA512 0317002310d21121b52331e2e1bff8dc732f9d626d03c1cced36bb82429be0adccbfa1f2d2073cf49d5d18489383629d5485364c03696457072e0f20b9f4d926
 EBUILD fcitx-sunpinyin-4.9999.ebuild 811 BLAKE2B 6ae98312e88bde2da2d6439b85ad9f9a1653aa691e459240f40824522eee67f7582d0a777461c43b3fe9d1516b51a07333896d48e65d3e0db7cfc6cf9b62369e SHA512 af403d1715e14ca877460ba2e08adef7cb8b980c234938dc7a246117cfb741d29ac991d1b3d976fd4e5af65283f43d95571ebd90a254222deb6f28cd92c27ff8
-MISC metadata.xml 454 BLAKE2B eece0c6515bdda6ec7f42b7d74152cfc63a3b85df35e7ccc0d2c829539455793907b717c7ed1cf5bc8012ef718d23ccd293bb712fb28f3eba702009c3a57de90 SHA512 4d1a4ccae3b7f553075938c4d59ea3f7eaf65e6e18969a5af3956ab120d6a88e1c5c67f5e91994498750058b54c5f26436be38599bcd22cbb03068307069e4c7
+MISC metadata.xml 468 BLAKE2B 2e2e560d5b3acc4fe04c7bb88e4e5db72fac1523a8221350c504414c7431fb41751db359b6c903fa2264b149a64627d87621d70e56e2fdc0cc84cbd608814380 SHA512 13cfe6f1b4c48837e138f493b8dbd1c530ce9ab1705a5dcc45f77d5a095d82be4b62d21d6cfc4063c0a6e3a7726bbf72f6f0e981af85d27f8157a8a437e8871b
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index a29735352546..ead0ec38bae5 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index dffe9e40496a..1188dfe64ab7 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
 EBUILD fcitx-table-extra-0.3.8.ebuild 792 BLAKE2B 9b55a05194b7103a97629ca7782093d95fd512ea840b0bd8c38d2ab179d10827879d5088e275226cd4f55e9653bbc164ba676dddc4c6601d32cbc14e25ac0348 SHA512 1f12e525ed4d17dadc020fa133f3abe8015389af6e5ae1f98d71355501437d5e4ef9902e09a8c7b4a388364368528793252725abe5d6653d27352ce047ae954d
 EBUILD fcitx-table-extra-4.9999.ebuild 773 BLAKE2B 1debb5da1822ed6e17c62a3a37f2f80e079166b9434cd2f9840f8d0a9f747affbd556040bf7088951fd1a5851e7dbacc62d4f98c3d9961a7f28488b41d65d5c6 SHA512 fd3b5d55e45e0712211cf7ebb8808fde09ba373d7f3ae13a9c43b871fb5287133fc4bb26429f2916d0ca1883406a49003f7b3b400d1e2c2a85dccc281034ac26
-MISC metadata.xml 456 BLAKE2B cb14969ef6882db359489ce3eb5700179d3eda829e0e1b59bef1227e5083723ff2f5ee5b82ed075250673fbe89b6c97aa2f3ce694a4fc0d89c6a600f5ca9346a SHA512 543a24a29523fc93626c2783c3035e3ffd1f7e850a62d80920c5b62b32cb54ff9e811f5d3c15fe785c967daa78e5da56eb38ef6b773a1cdaa4ab3e8e2a3b3235
+MISC metadata.xml 470 BLAKE2B 183e3d861b01b4e7ca750984525f5b56c1f622049fe15e896ec0fb655e84578bf069cfa4b46edfe5009f8f1f67ab8e95f838716ac2e0e57dcaf5f774a2f64390 SHA512 c592c3cddbfa98283767a90ffa5cde290b76674d6000c4daf79bc2d8654e7a2c2eb8575bdcf20ee9d1de763bccb9d863a0604d12934eed00dd4740a8a574d0d3
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index 461bba458254..9af9c45aa41b 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 67f37fc652f9..a0371c4c3a76 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
 EBUILD fcitx-unikey-0.2.7.ebuild 1099 BLAKE2B eb051e22a3184c0f4d4dff9c0ac742a7272ef8f6011a1631fdb9868b9812d581f8d3cb54efd3f59a299b3bbfb5fb443a566f5018229e61dfe86492e1fea3405b SHA512 95b1eb66170bcb1aa997e374ae860117ab2afc4cb55940c0755382fef360c5fbe81cf82da09fc0ff5714a821c46eea8feaf1028702df7dc3889c409d1cb255f9
 EBUILD fcitx-unikey-4.9999.ebuild 1080 BLAKE2B d0294f4b5b7d75792462a72743b7e6697d0c7e9802cb53d38587a957f3666dd99f6fb319f417f7b5202bf68f91a657d03f4fc6f22647a5c0127583edd7b2fde1 SHA512 a1b852387046602883c45c2e98a8b6441a4bbc40b2a7370d8410f33054879a1ea45bc311ae042bc53a0f535a16a6c2724309499bd628e4879f8706358e70bdf8
-MISC metadata.xml 522 BLAKE2B 8d69748cb9296020466c42b0277d8618dccb9c787f35e920d5a0d5e9447c723d7ba1e5c0a7c508053fa33b7c989d7a5c0542a144958083a6214f23399440e83e SHA512 c08e14d4e9268a0c0608148117d50b77754f1f9d96433a28f243fd0643d7021a9e2b85ca57de9f4196bcee54eb05b3c5bee497a3dbf77ef9b279c1bff7814694
+MISC metadata.xml 536 BLAKE2B 7c49cf7c48bfe2465143861fd1336a463ba5dd4ffff7cbf36240bedda3ee59ca8f7e4c3d751c48f577dd320ea30e09826d302cbb8e569dc5491d96bfb6a7c488 SHA512 0dc4855dc805786289c583910c13fb6a5f6c132b94cfa03933522237b7ed5835a39d196eb6eaf5b980ea73f08a482323962930c6066332f9646851d8f48c6b0b
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index fbe690dbfe44..a0ed74ed5bad 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 74e1e926b82f..7c0ca8957d90 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -12,4 +12,4 @@ EBUILD fcitx-4.2.9.6.ebuild 4539 BLAKE2B d23d8f1d64f9884dc7d959662908bc90813274b
 EBUILD fcitx-4.2.9.7.ebuild 4200 BLAKE2B 3871f93e691518ca5c69238879ac615dd05aff6e9f946d18438b22106cb0e23a056064f7629e6f53e4fb14c8c4edbd4e3157563df50a0ebdb63b6a34d86fa0f6 SHA512 5a6394042c62047a801b21041b6b548a0f831c447a37900bb49b806b2c39f5370e6f69ff4763470e9be313b05c77c9534bbd75e4e588e848be22ae3a16841ce2
 EBUILD fcitx-4.2.9.8.ebuild 4490 BLAKE2B 5138430171e5ad92e56cb2b67d7cf9801bb65103f24c471e7973876003a7a6dcff10752217ad3ed03f8a5e86e8033f716e00a330e82d9f3f7e84d1e730517870 SHA512 10c9944edae2a0cddd729badf8d32fb942b80a5f5dff8e145b13fd40f7755c7ee4cb0e252947eb9ce3e5140ad9f5d197f61507653f3905dd81280f07e5fecc12
 EBUILD fcitx-4.9999.ebuild 4415 BLAKE2B fe0db784a804b2cf7e67bf3ab6dee785639a7cdb29da3e1337c761e7a891bed71df0ab43cdb709cb87c95d9abd7f1e467cb01e4542b5371f142d106b3b08e902 SHA512 98c02e7d08e0a64f7f5d056029b3bc78978d2642b2cbcc80c4102866476204ebf260a99556510b610d9d0ead3d2a82a6d7c3020f4a58c36654681beb99ca1fc8
-MISC metadata.xml 1189 BLAKE2B 027fb94416c905c2246444aadebc20230aa922a94228a870f1e99b8721ace82681fc27395e565a81f79ec088765cc2bde303d40788ba29c32727d57554aae196 SHA512 7f7f05a1716f4da573c075961a4367718defa22899e1f29f7d4bb13b0345e0b979c6a7b1e3040d0fd3f5ec03c0d4813585ae043340799d5a46cd3ede1be2bbc5
+MISC metadata.xml 1203 BLAKE2B 4f9e81295b38021d93f063db255fc8213ea9a46d566e9c4aaea577844b868216f8efe6929761c6c340076b3e5816a5eed8d1c4808f604e10e3a10afb9d916a45 SHA512 5d26c6a97c9b2c5f6bbb27af68cd4c3ae22a5e9bd048b384378897146222b3e084f58e6bc06541a2554a3a3eab8da4f98c6754d6758aeee69e9baf00edcd15bb
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index ec867fe607ad..322e79a5884c 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 11a2e10ab395..5ba3cacc2379 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -2,4 +2,4 @@ DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e03
 DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
 EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1227 BLAKE2B 3466516e59e0667b19a33e174c008cbd65465af37e3a8ca2a366b0558a2e94915626550f407ebba316cac58faf65cbabf9cd85fde0a95964d68288db7eef95fa SHA512 aa8c89cc2bd8eee9e89da6556e16976478d90147fc59d7e6d01bb3ccb69a85097253b2510bf85d2e2267fd0ae47be20c076c1727f54ef605a6df8be3bf510300
 EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1472 BLAKE2B a76ab66ec1339d07b3841076a7efc7e2fe9b3e11e1572e5c1d35da2430d0d770d3bb8b05f5ee97d504fb2dd5b926520d4a7d9cf409be4e6f79777e78ba1be79f SHA512 c325487a67d1ec6bfedecf93c7749791c535bc6e20e51c088f3fe1a153c86b78c4a9020a75a2a27d08b8c52fc2d0a3ed584b28d26b396902f84af0c03c09c9da
-MISC metadata.xml 803 BLAKE2B b10294253280adbc8725c28f0c0ff4763b4dbf622fbab14b4ac53dca90ab00727a889f502269dcdbb394259a7d55fb6267e4d39ff2921f27edc8c77d17d71060 SHA512 0f06e79c123901006aeeba3a076c01ee5175f0d5134afbdd058b54992a43c8bbe561589fb910e07734efbc0a81057934ea04dcbb42136ed2d82a9ff96ed270ed
+MISC metadata.xml 833 BLAKE2B 82b50e83b1dd6598cb98a047045ce82fd01ba187140ac9304fd886ca289cd22e988959d7cf5160668dfcc00d34ec0fa246676ec07b1e297505bca3f927edd6c2 SHA512 57172e8a3a3378a3b68d30482c1a3659ad44c96e90a03604c47f19bb4553cbbd9549dd284a48812cf65b49fc8a107f485108c9c432cffcf27812b6f79c89aacc
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index 7fee2ac4692f..103d4a0cb43b 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>graham@ulsterit.com</email>
     <name>Graham Ramsey</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index b39b2d3f8467..7a6d3dec823f 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -3,4 +3,4 @@ DIST kcm-fcitx-0.5.6.tar.xz 63556 BLAKE2B 8518c454f15e5faeaab136c08eef9a74745374
 EBUILD kcm-fcitx-0.5.5.ebuild 1263 BLAKE2B 06af9dd1cf4147e0eaefd80a71dde34f8099f62c4eb627bc8a40f665ecf98e422a6e75506ec5bc05366f2383cf8e2a1693b65cee64b6632a7c773358e9f22992 SHA512 dc5d5055d11dd5c3a2df6efc6790d274c3d9368fc96cc5b772f6cdffc224d3fe7c639c990aed551d7b9f5a8b0a03cd0a7a739791b9aa87249e4e497c41bbb7b9
 EBUILD kcm-fcitx-0.5.6.ebuild 1237 BLAKE2B a8185c2b4eb7034c7a290ccfcbfa22a6b55611467ce67bf0af672a9814603266de0050069faa1df8959c990c15c2d7712b17bd842881ef73f13548390dba8d4c SHA512 97e922d96ae36ff6796cefc7f0dd3fe0b7db4bea78e7c3124b182639edcea8ce6b37313a5d8fb3eb65661516f3afb656738799c25be6e3d1b52d3ec945d8f474
 EBUILD kcm-fcitx-4.5.9999.ebuild 1226 BLAKE2B d15fe4ee56ecc6ffec98601e0af3d1d122c32bc3e7b2257fba3727cd665282725ccb02d806e645579b6504bd560a132a96e20d4707866d126e31f0c2093ef666 SHA512 89b8471c0b1871088e4ac8e1d8cb773f2d05f6cfa3b51e5f87334a855c94c9ec1b084cad530abf3d7c820e358bf3eb24eaa4e91a4e3569bdf614add1729527a5
-MISC metadata.xml 448 BLAKE2B 1bad84f73fbc4e994084f472c2beaab2217259d6da1c1dcd3d7c91fdf30a1c1252adc930236e5ab8f99fa6f764aca4db5219996730037b4ea7da22ae075de6d1 SHA512 fd57b8dd9c679ef1309c6f02c55add627d029e6232bd3efdd8acb6c76be334411cf42e40950f749234f0c290467c4e3245232278a54118010ce01df664aed871
+MISC metadata.xml 462 BLAKE2B f57392fc4b8b85f1c5f17b4a3b030886e27ef9d9467c96c4a2b693133f6020737a61202553584efe42e0ebbb37944feb894d73ea62a37261e2a314e559785b88 SHA512 ec57180d4ab6589080d2e892a6f874fc239f6fbe67333be4e6c1ac5bd23a1fe8e9af56e9ae69c1cba190cd294afb5beb193d15392c4d0f6ca540e80249989eb8
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
index 68e0523550ca..f8dafcfefc2d 100644
--- a/app-i18n/kcm-fcitx/metadata.xml
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 66befca2e5ce..4842e3cd6e9e 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -2,4 +2,4 @@ DIST libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff
 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
-MISC metadata.xml 451 BLAKE2B d11dd7e6884ba77c0dd4b344a1c2a3d95a3894f6f3a85b8e662d102ff0ce0f1f15efea29630baba1aff113181066c6115d19a79408ec91fedc1a0b10e66e4c34 SHA512 c2d5d2e4c929cf9a987acfc30e7013ba8f092947437290aba560f566b171635fb457c6a6a98e55cc61cefbda5364c806ef49cff5c19e7834429d24114f014796
+MISC metadata.xml 465 BLAKE2B 5d172cd0bb5dcf9aa6dd0d6c26c6e3eb85f9e3ef7a280a113370d6db927dd23d6616e288fd96e699b5fd869ec7568b9b476ea298452d5d7b31ae29487e672e1f SHA512 957acf895204f1e3adda5286ac240edd3f6f1387460459b4d20e4788e1db4a52d79b56735ef8c84e97030afbd6a03d6b1c4c9a610edf59cb0760817ae0114d3f
diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml
index e2a2046c180f..384eafa99780 100644
--- a/app-i18n/libchewing/metadata.xml
+++ b/app-i18n/libchewing/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
index 72167eec2bdd..e931cc8eac71 100644
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@@ -1,3 +1,3 @@
 DIST libhangul-0.1.0.tar.gz 2899845 BLAKE2B 5d6f4f9d6dfc32b8d6c6c0219b6e25b9c483555dbe623e5d284043d15eb24b4c7044003bcfd4c55b1ff6ab4b3b0c28037a8497f79fc9b733eb7de8952fee3ed0 SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534
 EBUILD libhangul-0.1.0.ebuild 811 BLAKE2B 5eb2e5bf56ef7877b2b5dd15b8b9dae095fdb0d0e76c846cd238b543bf075d6566f7ec8be4b89ca2229cfc429c59c6ad86614f27951ef6d7696aaa8e9908826d SHA512 ad8e216edb7f4cc0ef1e53637faf8cd02eb9188842589ec0fd348e51356c4fb1658ae5024ead7a7960a4c20cd55d7d2817f55d54dbd7ebbe7d162005234fe899
-MISC metadata.xml 506 BLAKE2B 42c76d7a94c1f0ab842815490149a84d1ab66775e64ac8b3596219d0e8c019d8fc7e07fbe2497ffe014e762d227e424c7a19d0f55182d38233b9d53f7b6c13a1 SHA512 66ae1665ecb4b0a0f82ced19ab5da85fd13f10294be5b45fac0af8bb6dd00c2404685c365860725c36d2c922fb33c7ba93ec91fca1d2d7b69ccf7ea52f44ecb2
+MISC metadata.xml 520 BLAKE2B 664c3055ebebe441f4beaf64eebc29e472be713953710af60cbeb77059a342256c1809a4ea9c1547a0e923f73aad803bce037c0cc3654e1f32eef25474ff6930 SHA512 fa15e1d8e0e7d9d347c9344178f0907504894dee46f653e229ddcff137fbf5596e5b1a81d4f6e4f234d0830f78d7a82381466c52e3b8f3bbf7bacc4080841449
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index 16a564952317..3d31c8bdc09a 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
index e183f45ce317..945faea917c4 100644
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@@ -1,4 +1,4 @@
 DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69
 EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1514 BLAKE2B 2c812e21be1734a9403ea270be1c815bfa7aad6b9e689a71ae97d731bcf07e7cc6d6efa43b32450f546c8540f4e8247c7066f3d7bed0946a6625c552db601a0f SHA512 b1b04062b2e8ad9f8220b99dc8e21baf87918951b99b11f2664349a6b0e38dcd28ac4777bd32a965b5e0f96f02d4e830874965e6635711626cced3ec2e6f8d93
 EBUILD libkkc-9999.ebuild 1463 BLAKE2B d584b34083dda535e540197f39a519b60f16ee1b1192b433945e44e07f79a805d5b4ab548c0d6e783df0959312eded5ba629a468eadbec5d2ef9115e8929414b SHA512 98459cbeb3a17a2affb401f180ad52a8cc7892accc5ae7fe1a66717dec6743a96de96fc921bc42e3b196ab3b156ad901d1ec31f9323424d4f30d48b7c4626537
-MISC metadata.xml 444 BLAKE2B 7c8c97023d21627b1ceef21dab3ecde1f159025683d154eab606c4837f4c31a52a5626e3507193d72569fddc6fadcfb7dfa7b4e3279f9990f243dc38259b78ae SHA512 774b964eae4e57f414c927a3a3de6793374ecd6d6f5a81251cd04165e54208d68d890754904e099fe3da0a7790bb324c2fa171b3a530983f4063403cc08a9a92
+MISC metadata.xml 458 BLAKE2B 2b3ad3bddf4deebb6af987b7c10c9873211c885bf987103158b4ef936a78fc3190725c0d53e489c27224c9551a0920675bacfd037783c23694312d59c4d4dbea SHA512 7edfb1ad9806f8263ddea644896bd9bd23113b81e7ac8c59a895f1ce6049c4df20fa89733dd340b6501b3c0bea991be5fdfa3a50f76a0f0303c608e64d450a96
diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
index da21de5a3482..060c243a1bac 100644
--- a/app-i18n/libkkc/metadata.xml
+++ b/app-i18n/libkkc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index d0f01ebb96a9..cbae73cc3f98 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -3,4 +3,4 @@ DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B d02a587ab29e1115843d8c2318ef
 DIST libpinyin-model19.text.tar.gz 20279012 BLAKE2B d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d SHA512 93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2
 EBUILD libpinyin-2.3.0.ebuild 1396 BLAKE2B 572d949e4718597eb9de387f1f0d3b3c0f00612b94ce59afef40ab5c8f1baa5c0e48f8b4b37b620b97014004ac67691bfcb267f45d7c8b0cd22c7b47dd10ab2e SHA512 8fac54ea183a925e861589c752279527e74ec7a4614c5a4227458aa1f0986f70ee412fd9797d6bf1ef275d8d2cdf9266a3ffc3a775cad2bbe5c1bba503aa2e4e
 EBUILD libpinyin-9999.ebuild 1371 BLAKE2B 387ed25199ff3c1d8e38ac48a270266e238b40caeb67a54517ba4106b031874efe9fd1775d1b0fc82eb8ba3bc4af773e41d0ffaed51d1082aa530ebb775d57aa SHA512 7d9a872d32124a3541643a04ecaff43d5a6215dce70aadf95f3e5d775dcb690be73ae2bda40baf17c75b2c9097ecc546206847234b4061ddb4f2595f5e4e60ef
-MISC metadata.xml 506 BLAKE2B 51516288081e7bec40801cdc1ec540e4ca5772b8b9c894000b9c977721647538a752d1b5022313c48fd5489502fa0b4745f7ebee4330a1547babbbf55efcc5d7 SHA512 72df0aa1c1b13dbfefd3a2b18c72d5244b330cc2aee501ee6a1dda18e968902a2a1b459571f35f34afbab14e3d0ade543680d87c5552f8c1691a10cd58da1937
+MISC metadata.xml 520 BLAKE2B e59311e088cce7c08dba5582f72b58fb5186118837c95e133dea37aafffb04b6e54605e97e2edb29694e7767b59634ed4e6a641396269dec567d4014810fd5d2 SHA512 8a483c8f4759749de6a2290c38808cdf2036c098fe35692c2ecfaa9216ccc3d9db5496a3a87a32469e6ffe01fad60a4dc1584068d7fbe927f2f14155ece1a24f
diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
index d0737be7e3d0..5b6b1843aef9 100644
--- a/app-i18n/libpinyin/metadata.xml
+++ b/app-i18n/libpinyin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/librime-lua/Manifest b/app-i18n/librime-lua/Manifest
index b9cda8865e34..c5902255857d 100644
--- a/app-i18n/librime-lua/Manifest
+++ b/app-i18n/librime-lua/Manifest
@@ -1,4 +1,4 @@
 DIST librime-lua-20201011103348.tar.gz 21600 BLAKE2B f7046d1eb23391ca70543aa64c52092081cef51a69ac3a282f2f1392eaf760515186f063e9d469c5c41ac9f495ace814ab741a0821d1a635b9ad1f4faa7a3912 SHA512 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c
 EBUILD librime-lua-20201011103348.ebuild 1395 BLAKE2B c40ee7d587e95cbe98427cb83356dbd69f7161f52baf080602536a0d9b6c5c32d72da84c2d291e1fb7aed19e470363406299fe585bd90cbd698c77fcb75ca13e SHA512 bde5930ae523ec2762726c3871ac20c03778d6ca637b2335a77e3b534de83d5d5c5a65d4eff466253cfec7830c093bdd174345d54a044fec25d85438f21c5fdf
 EBUILD librime-lua-99999999999999.ebuild 1384 BLAKE2B b3892ddc41646a07daf5ad4f6a1788022549673aba9566251767165c176ae1bd6cc03c06bf1d8a8fe3b7ecc226ee81770980d461fed3f86129a5c61da7446e80 SHA512 e1faf6c9bd1e5ba5744dcd0212c2246743cfe6e3693bda450958695f0da636c6787fad402ac12ee328f1c008837babc096e1f0927d4fa8dc445fed65ee61c4ae
-MISC metadata.xml 453 BLAKE2B 15d1360c79b502b83b4d2ba88367fde8509a56b6a3d7eae8beaa97afe09c77e3c14a3746d42f70a7410de45846b10409ab6b0462e7ca662c64e013606441b5d8 SHA512 4068ab244d90a00628aca8c95e9ff5db0fbfef6b066c962ebe19c6befe19460aec85cf76897a15d4b38f4eb13177f5c639cf85ea65bcc3aedcd7d01f3b4f5e8a
+MISC metadata.xml 467 BLAKE2B ed667132bef6dcdb5fcffe6a72b43808111c66922b07ac96016fa10a6cafee66e0d1d6f56c339fbcc41ce91a10fd9dfe0e7c36a34cbc4a45b0502408f5cef52e SHA512 f4e880e38c9b73e55b740812ffa3d55fb62ccf732b1db4e119e7077d4c9eb03e597c9d301affbd38910d7b490a7c79aa4a5f68e4802e4c5917eb798512772365
diff --git a/app-i18n/librime-lua/metadata.xml b/app-i18n/librime-lua/metadata.xml
index b297cca916f4..d46ae4c46ad8 100644
--- a/app-i18n/librime-lua/metadata.xml
+++ b/app-i18n/librime-lua/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 113ba05ecbbf..4c828910672c 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -9,4 +9,4 @@ EBUILD librime-1.5.3-r1.ebuild 1598 BLAKE2B e2bea3ac09fb0f5f132382caa6a37b8fc3e6
 EBUILD librime-1.6.0.ebuild 1584 BLAKE2B 035bd99e4e49b12cbafc581771d287c0743716af721c674be05c1b7d5a0df8586c504532485a169c535b51ccb332a5a1d43d504d758ebb17c0ee1915d1c5afaa SHA512 381fa20d6a5da0b34d05aed7c53bba10a36029eae10a062c86f40dc7767e07ff1800d799e80b14b7a4e5719e6b32e5364fdc03d557344f24cb14a8097095a9b4
 EBUILD librime-1.6.1.ebuild 1584 BLAKE2B a066ec82c81cd7d1252a24160c340dd8a44a88dee42638aafddc98944344dcc8cc367dda92f0e6f9b006e18bbbd84621acfc5bba48cbbdf23ec4e77c7a6e7381 SHA512 1599d5dcfef15e4c7627fc716fd57ea5e9aeaec60d45f82d0c51893cc363d1d53d235cbba029d6079a368ef43a14ed450873f7efc4ed8ff2cc9b31b109f3cd01
 EBUILD librime-1.7.3.ebuild 1535 BLAKE2B 903bf96d278e0bfabe6d0a23ba027a6580d41ef7349c4193622a3501ac2163b3d1fa247d057668b9a18177d08d8bd1fbdc9bf333c15916ef70b0b95d5f2b9474 SHA512 a346fc3b445df6dc5c111f9ab04be4c655247e47aa101c9cf3e433294870bd0d0676056cdb0555f4452eb79a63765e434a8e8229cc576eee927c6d16a7661c9a
-MISC metadata.xml 762 BLAKE2B 1132cc338a6f90757bb96d9b1d75fe4dc545ee0fdf07fcb946a88d88e5e821320016de902b37855ef1e1c4d4a4b7f5c37e41316b5ff8aa4b3eb14536548831a6 SHA512 82a8325fb69ee74e353375ab4d0f88d7d97b889ce71d660561b74b27303ea6ace3acd9fa9046bdacf15144c013e51382ae4da4c9e355986bf43b363980f6925d
+MISC metadata.xml 776 BLAKE2B b362c5696516b756bb9c9c3102d7d5f52f843807d523f26bb12adb6b2c077f98c0aaa2d5d7d87c0a413b8ed69994f35a7fb02db423592ffc5529150df4253f83 SHA512 1bf10d3e1394b0f9512cfe564dfa4eac007e5b343831a482764f1c7c99500ad55cd99e10f07a4428c67fb262b80a2e2be41f9c36f3a937f5521c72d969403817
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
index 605a81303279..5ec8c66c846b 100644
--- a/app-i18n/librime/metadata.xml
+++ b/app-i18n/librime/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index d8c4e91e4a1c..ee215b1d1a40 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -2,4 +2,4 @@ DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9
 DIST man-pages-it-5.06.tar.xz 363716 BLAKE2B 57ac90d11a76217ead0f201ed4f8cfd0bc5f08b97662023a540f1150fc8fb6804980e6770cc7d707097d732645ebc9b3b85feb15736d7e925df2711a3f32ba6e SHA512 d4d89bba004265c70b6f0220b0172798677174e8034ece4a15c21432423ec904d0a3b7614987a165950c4f28af02c1b9374f536982771307b78617479139f900
 EBUILD man-pages-it-4.00.ebuild 716 BLAKE2B a1fbfdd982e84396a87b2c0d5ace02e9853c875a497a6206e2f6e6b83967011c56b3867fc21796df4a3eef05b6318edae89a38c39d60f85413c39dbea86504a8 SHA512 e0e3ccf3ce3eb3882e77c7fc3e030af7c560ba50208dab79009f23a6cfebf33cc63c7d4cf45a6d1ccf81956c4848044c90db9ecd646cc112d49e816b046f5b0b
 EBUILD man-pages-it-5.06.ebuild 668 BLAKE2B 775da27cf0f32e3237d7b978cc7d88a287142acde9fa7205e8699a980012973716e9b7c38627345e85a883c1b24064c16c4ef3e97a5334ff74ace11e5a2ed125 SHA512 f83a73811117b3567fd519afbbade347a2fa551eef9a9ba2b52d09cb636a2791507bde4192a91be5be25bce208af226f80594fbdabe6afc953fab33922c2f450
-MISC metadata.xml 503 BLAKE2B eb2b9da6c1cd0285a76380f810ec28dd9d9af96dd3bb9d8fbb2afdc0e0ff30c61f1c0385b4c77343bb2d13ef45eaa59a7be72a414d7b9c64a902d15c80a30117 SHA512 734aedea6221f3cdd6923a457e03269f17dfe390355fd7a2a88d5c679f0a788949d4eb287af395feb2c11c664281936d39afdcc84bab11ee2a75ab293e5e9888
+MISC metadata.xml 533 BLAKE2B 82374dc037b8295768d934b59e9765ac7e228ef13c401abfee516a156d16c30c0d3d8e8eb3188ac766365a615baee0cc17c7daa3bb0a7760c311d73f7cff651e SHA512 9f858c0a30a141e95c2eda0d46804cf860b0df44b612099f283bbb32160da5a19e8f16b686ae88e32d1d6b638f45228f56f889fde0c1d5311aaaa8dd4f400e09
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
index 2b14c8d0695b..9d8c38cbd430 100644
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marco@scardovi.com</email>
 		<name>Marco Scardovi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-i18n/metadata.xml b/app-i18n/metadata.xml
index 44756a003f77..9129ba2a84bf 100644
--- a/app-i18n/metadata.xml
+++ b/app-i18n/metadata.xml
@@ -31,4 +31,3 @@
 		składników systemu na różne języki.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 7c828f8402f3..22fbabe95f90 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -25,4 +25,4 @@ DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35
 EBUILD mozc-2.23.2815.102.ebuild 11247 BLAKE2B 6df0d12985da09fd920250c98a65e3fc4957ce6eefa9105fcee0f02e6f9ec49d8de629bae5ad08729bedc95138679f7887d986d027b0ae62c7ec5661fd6e281c SHA512 e4983c41c4623c2c8015d005af8ba261857caa0c5852b69af1640619e94e9f4e5f1c72a992831aa88b9bafa57d49ef0c049d9c3a14a6a495172578401f93072d
 EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10396 BLAKE2B 1e16fc13c5e9720cc972938c362ccbd516b79fff938883b3f5c4fdd44d7ceb66ec8d4a10282fa2a38b7c9210cba986986f519f9016707b6c13bd6e1ed7841983 SHA512 5d33518117e203d44c352ac3133cca452d81785b4e220ab138dac203b1cc20c17cb39c561bee2f29b370423c91b6ff456d064cd5eb3bfa64abf68d4bcb8555a5
 EBUILD mozc-9999.ebuild 10244 BLAKE2B 0d4c7ddd0473ef83919b242940df83d078875478113ac40e359c9520c38492b233afe34bbcd4e588b3b08218ad3566e17d1cfee71c2bd96f1bb2299b7bd8e522 SHA512 8af2b58ea4dcb680ff82106f0a4b9223346a4cd787c52726447c822a1890c7afc0d4c837ac952204a08b0b2a07972ebae2f721c8987b5e5ddb45cdfae5f98a5c
-MISC metadata.xml 1001 BLAKE2B cbbb63e46d6b9cca2c1c5d08dcfeacc8fe82910a0a7398a9060a2ccd06d395765865674b1c66c72cdb9c71d5984b8d0a05a2784052219a6d6af2e0da175e65ac SHA512 98b86d4e51b43d95f7d647cf2cb57ed2a8a7e1b20042a60bae7e56d82596e2f94b2d57cb9dfbf45ae5e2a5a19e78f335e89a8e724424b8fc04f21d344c4e2c75
+MISC metadata.xml 1015 BLAKE2B c9938eb769bd18dd9a71d3be641126a20c756ebbc6c96901251257d668e942f102e7520c94d997a6206b5ba202e3a3760b75613e920c1fe5437d71e6a5124ccd SHA512 5174c831ea46dc3b71d27c43c5381cfddbb622d895d49fa25157f18e0d44670742ed037f97ad744d563da84223b945a37ac8b211b5042f19a381ce09efbf0926
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index d1e036ff9821..8cc0ab6bbf36 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index 56c9d8c7f983..fd24750a957e 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1,4 +1,4 @@
 AUX xinput-nabi 140 BLAKE2B 20aecc9cabb55c5848d1c853d7d41ba39447ef7b01c7c874dd0a17ab1b515310d5c20a8a52499d88be84efec5486ec229625235611d2723c6c5e66e6d1e8519a SHA512 53321a39f5ebfb96986ae225f3c3b47344885d4c07271a6b7defd9f2164564651bbdd6e58676e443806f15f51ef7588aea59a6c3ef52678b7f9f1b5f3edcc4d8
 DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005
 EBUILD nabi-1.0.0.ebuild 1047 BLAKE2B e408069d489b94260cdea18300ddb621b4b454cebafd3411fb570c54fd32df521971a82ff5de940c37f223081723e2511adacf51df1a87226c45df462dafe1b2 SHA512 b4c7cdcf858835a07ac19f497b0794f739309bbebc54cbffaa2ae6c9de8392f5a87eed7e71dd36fe0ef870e285837fde7ee6f8399e0e37266f092f879d27d8eb
-MISC metadata.xml 362 BLAKE2B d66af0b1838b4886a48216cddbb5cd6ee620a2d43a472e0b0b756597aa3d16c584624de99a19121f2a7990095eb63926a5fd7b0e5116160bede3bbc903d3afb3 SHA512 54caebf3c44595273dcd0d89e86517259731740de5c1427300ebf03a6c0b625b18c6091cd36dfd16fe4097ab2c823be62fc3356a52e27d3296d224c7a22abb6e
+MISC metadata.xml 362 BLAKE2B 85b75679d485be52601baea0ab485800c263fb397b4386f157e5f67d449664554cd36bd71258f3fee9ca19442671f1fc34d2fd7e7a7e5e0762001e345d94d5d2 SHA512 26d96050c7b4d506f80e09a62e3e7390e5fc2ce6795739c7a639248997e8f8bdeec65c4ba43aa92db28262d4b5eee3e314f19e4bc069b29149747cdadf7943d0
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
index 61261a3a7a2e..41500dcdee88 100644
--- a/app-i18n/nabi/metadata.xml
+++ b/app-i18n/nabi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 618fc45e12fe..c67f98059600 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -12,4 +12,4 @@ EBUILD opencc-1.0.6.ebuild 1354 BLAKE2B 948b8d384e4f9af810005a1e44209def5977ebce
 EBUILD opencc-1.1.0.ebuild 1402 BLAKE2B 56e77f6bb4902bcc6cd6bf1659edcd6f18fdc85566bc22518989670d8f2b2463111cbcce240822bdf2482b413943e67482b7c9d5e11daf5fa6e64deb1f82ea33 SHA512 d83319b58fcf9d05c91c45765afe8856c58784d3bb981dd4ea9cf7b7068dec40d6ddff3bc5619b542ae37d91980f1c2f8a4a23d8fd326558c20718e76fd1f22e
 EBUILD opencc-1.1.1.ebuild 1647 BLAKE2B ddc71cae9fe727e7a466d008dd6e7d4174e9f8a7c213baf0902cf202312e9c14b35106375e08a9d8a9793cb6fe2cc51f3a862eb51819e9bade08c0c1fea867c8 SHA512 d26bce27b3bc48343622a1b91eab6ffd4aaa8a164a03d56312cbf191773b182bb8e76cf677c881f7581e37505db12f830e7d0fc7044b05ff2ade851b905dbb0b
 EBUILD opencc-9999.ebuild 1629 BLAKE2B 8fcc56601dc78f7205b0e05634922293ff480607c74a64cd7199a374f20ffa67b9bfd6af3491145cbe18463132a9b82b5503c7acf40fb644a64d4b3eef87ce33 SHA512 cfc6b67c69038b368354904e4e91ca6ceaf2bd4daf62470ec10a4ad3256a67df7945366a1ad80cfb4b7e639318e3614fd754a0f1b9702144bc8bd3ffbfdfe5a6
-MISC metadata.xml 609 BLAKE2B 033d770cab9cbc02a2e50b414ec469089f6864826f0bc7f969b19552303aec84d540b0b748770b43e61ec4ff5aa5f946c292e587a8ea144d2e16de70bda8669d SHA512 73432bae21dfaa03db07de30b15aa5417b25b7d9a6b886b595652f2fbde2d505367236164f6e01ff4cab31e967aaea9d2b30f636a28aacc2cb167c51e2535626
+MISC metadata.xml 623 BLAKE2B 5b03b8cb9509583d2d39733f07ae50953f022842dd8b109ee8470ffb869e1130efa76b0687529b9b05153bfa1ad9a806776703b246ff9b2f9108f86db0833797 SHA512 794b61c79fc56923c97a4909ec3ba51f2087322bc50879904295be41d9c3e8dc2048fd77f4519c7781ba9c9ac1fdcb1f7423ab5be1bba38968f8092c8f7431ac
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index b53d22485f11..bfcc2f62831b 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index f1ede5863e94..712d0cbb39e9 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -2,4 +2,4 @@ DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2
 DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9
 EBUILD rime-data-0.35.ebuild 558 BLAKE2B ea665052bd0668d772e2c556b7ffa9784eb1d89d8aa082deab295f8cea5c1b65597e5390a9a96aaeeca1cf5c2891270454f9ba35867fdd91da220c75dd561e9f SHA512 fa661b513b6a36e180d791230f293f950f4274f7349500d871df325fe995967e993bcee9e6569e76ba604efb3a2b46bac72503117c16c0a6e2e75bc134b8779b
 EBUILD rime-data-0.38.20180515.ebuild 674 BLAKE2B daf0ad1b78276bd40108f63843a9fd89fc17d8e5dcf3e04b3ff6a640883133747194ab9a33e13a708ca1e745f43e16468b738548cf4a9c2666a3fdd3f80b6fc0 SHA512 b8d1a76f6e0395acc6c1517d70c57785c4a1242a5461067e989965bf5f97eb8532bb7c849295f0df88f55a9bcb168218ac6fa4c2cae3c5608328260d1e2cd5b8
-MISC metadata.xml 715 BLAKE2B 53298428129b60d501c353f2b20984bb185d5064990659eda2b25a48faf11aab0199af7dff3f15289539e1be92544489e4001979b277e9679a0fdaeec1e0517e SHA512 694867ca96e49d673c23cfb9e279bd3a9f3aa431a848936a3ac4f57b078a11ce57976645f5f65a2362ea34f02b1fda31fb2ae2935bdc28c98fffad71e09941c6
+MISC metadata.xml 729 BLAKE2B f2b753e32b969856fdc0e4101d678b0f1d1db592e8880cf650b356054d0ec7edffb23cda58f4e3c3f3117bfe6175a9d079b2dcb984e27e230f423dc14107c0b1 SHA512 773f6001348df91c3e9cd4eb16ed0dd74a6cece18a1d42d03c6c2844caa89441cf468d9e7cabde88f81055ce7da415f43b6e01e10f8958f69b59fdf1f52d53a0
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
index 197ef071dbd3..128bf3bdf636 100644
--- a/app-i18n/rime-data/metadata.xml
+++ b/app-i18n/rime-data/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index f1e60c625027..d3efa453014d 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -7,4 +7,4 @@ DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca
 EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec
 EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec
 EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d
-MISC metadata.xml 1168 BLAKE2B 8894dbd4d75113bbb09256fa3561c77592394399dc86748683273101ced68460f721768d305bd569382cef84741a655138a4c2864008e06760a6a7eec97043e4 SHA512 f8e08796363d4546bd50befc1a0ed6977e95275e25ad8beaef7c0bb3decbcad47339ad1bcec4f066ad204aeb73a380c6f2a428eed0cb2dd95f1c65898bd1aff4
+MISC metadata.xml 1161 BLAKE2B c996fb26b11405d39539ffc2828893edd7607923c673da429da5d346568ce6f9356f16787484b68359916b38833b0ffaf52513b2a56a5baddaba97124fa2d804 SHA512 69342420a9792a780b73336ff3a4587752a3728f82e45f7725d33a788e9d9accef16b7fa079c18070867a46fa10f85794ab6fdaaf15e2b2f0eeef45df6d45fb3
diff --git a/app-i18n/tagainijisho/metadata.xml b/app-i18n/tagainijisho/metadata.xml
index 02332afd5407..1df8cba85e23 100644
--- a/app-i18n/tagainijisho/metadata.xml
+++ b/app-i18n/tagainijisho/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>arfrever.fta@gmail.com</email>
     <name>Arfrever Frehtes Taifersar Arahesis</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="proxy">
     <email>floppym@gentoo.org</email>
     <name>Mike Gilbert</name>
-    <description>Proxy</description>
   </maintainer>
   <longdescription>
 Tagaini Jisho is a free, open-source Japanese dictionary and kanji lookup tool
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 7fbd85d2d23f..5636d627aba6 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,4 @@
 AUX transifex-client-0.14.2-r1-timestamp.patch 646 BLAKE2B 22d8eced003f2ce5275ef4a8857637ccc0d094e3c9b8405b1c204b78af4bc26f20be9fadf8a7e50d44e10c131f79e9b66f4f03f8ee92c3e73a548236e2903c42 SHA512 339d8ef42935acfd79f438e725683e9592259b9edeb3249d6817957f9bb25ddcd99d05485ad5220af1329937aaf0ea1249ed34cc53bcb3137e461e97a45f6b95
 DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
 EBUILD transifex-client-0.14.2-r1.ebuild 1067 BLAKE2B 2258efe8b37c219685021d786bbea084bfc72084f8d336961b3648671156718b7fc86f8a0e21f8c785518695d6195bd2a14a6b30984970a3a04a2616f36a920b SHA512 84064038c4fdef42b084db4d09bd8afd9df480e359658451b70e92a58ece5b9d71c5fbe8322749aa0dbea4251f29ffc9d853317d8b6de1c5afeacca4e004f73f
-MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31
+MISC metadata.xml 541 BLAKE2B 39f4feade85a590470eaab0c19062530385df86cbec95d167e0ca1c9be370fa07db6f51bae60bb389a84516ee332095a29b33beba97f4c258ac29582639c0384 SHA512 3e713de19b4abe79be21cd33fb4751e662f6757aa83705dd4d130a17ed8cece026a60f9111c09a76e7f5f7e4465ecaadabb1c30c8cd6d58683de69d6a0c2b8db
diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index 0b3622727182..1aaba3b62f4c 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 13edfad12bab..ff41edfe7df1 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -2,4 +2,4 @@ DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f7
 DIST translate-shell-0.9.6.12.tar.gz 77580 BLAKE2B 78e8c694edc03fb03facd8c705c7e703a106fe9f2d7b46d464a681d52523817b4aeaf023fdedf46a9792270daf758fde457ba30ab1ffaa778f8db3eba3caa892 SHA512 6cbdfd14b7004d0e37a4abee01bec87409137f1bb7a14a964936bf0a2ad704ea1fc04dcd8ab10404a5c2df105bf7a6a8b33ed02c75c1035a6900082f6dfbb20d
 EBUILD translate-shell-0.9.6.11.ebuild 1125 BLAKE2B 82038fffdbecd83785571132e127eb43cae6cc489a5659c875cc4118786271cbd5e49e091c01ff5cbce162a579a293495f2eaeed0cc80163273c2416bbbb1d5e SHA512 cf76ed4c4045ca16112cacf45e1b1d87db6346f7830408de72d2018bf4cbd10fe9604f19263db55226c37f5b186704ff2d845b3ab98117a8ff4b7ac73498c27d
 EBUILD translate-shell-0.9.6.12.ebuild 1125 BLAKE2B 5c84b6bdf1063c45a79cb92e0ee5c08f9693978dd3129bcd7b2dffb80bbba3ed8d3072e8da9d5d8c0de03f48368e856e716153ccfd7d7254d442be1d209a1962 SHA512 eac55e001c3cfd2c3f72169983b63f1d8058a4e6a7c4009fe7b7a548fa338d4aa03c07842df73db17565d83eb74827f14ec42f6842c8384f0af30b195da22b28
-MISC metadata.xml 794 BLAKE2B d4a2ba634882f73eb5b151682ce5015169cebf0269edd6358f0b1acbf88d255fed8b45ac0bed74b0371c7a98b77fb37ba8b2712bbfdbc924bb99c78b5e1dbd2e SHA512 fa67bdf15aec6119714fc5160189f7b08c24bcacf7471fc4fe0812a410639690900a3132164f87ac41739a597091d5aefc2dcaee50f1c5c72b4d34f982e3e99c
+MISC metadata.xml 824 BLAKE2B 0848a54cad02e34ccea83ffa2cbb40653f5bfc72ab29960b5d0de7bdef30127f85a7247631bf5730e1dbf43d657db86be9efdd344a6d2a384e69941cb338d78f SHA512 25b2be5296505f4c73c5f46c7aa8eb4917ea426579774f72df9d7337902a3c11819a6668cf542b58b391eda4bf39898a35bfe1fa622d043c90da0f93fbef00fb
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
index 0ae1b9e6be51..4b14e09c4539 100644
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 98a60d83105f..8ec30dca2c53 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,4 +1,4 @@
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 EBUILD uchardet-0.0.7.ebuild 1015 BLAKE2B 4a136a4430d0d3d166dfb403ce698e459888285e21e9bad2af22b8ae937de91e984c88d76cab55f3fca979f76f689da98d54d277f6f06012eec63ce8a84fea24 SHA512 310fad81f208924e54ea0b1f96c813eda0237232f6f688b99809791c204f3832adb80b34c0fdf8b80d555c5e45de22351b9179a816ff248c56ec382bf74d46f7
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
-MISC metadata.xml 671 BLAKE2B e4d37fa90064a38dceb1472cc2683257d8f7f7ef5f4c15a440f2d9102f91561d408b919c29077b305013e5dc967b42400ec49ee6a50037708a76b2c2e1742e44 SHA512 38fbc4d87e388fc19dcb64a65fe8859307dd7636a4327353131a7c8ebf8974cd74c73486b9dedf1f350d1d42e23a23e33737a1e2e3f4b769f9f64d730149c8a6
+MISC metadata.xml 701 BLAKE2B 513c0f34587001a432686b657805f9658db5833273fd5b140bfa7c09ced80afc1ce31ef57476c019c840dd641ebba7ea801375ebd50030af843f57dd4aeafa99 SHA512 8cd88611e00af1d1c2af2e88580fff4682bef4fab3eb35e88497dd2c8e604765f4dd209ad3f6cf23f1af09b0acf3e63f10056b2515bf3724b6d44c69acbbbd32
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index 83fddc43dc8a..7a5ba7b3c342 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>coppens.matthias.abc@gmail.com</email>
         <name>Matthias Coppens</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 2e1b161bf702..c71b78caf93c 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 22a26e67228d..5ce6675d9c9b 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -8,4 +8,4 @@ DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 3489de1993267eb8aaca1dc00e6c19f68be14b53
 DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
 EBUILD i8kutils-1.42.ebuild 1022 BLAKE2B 4248f6b20e56f8298a4fdfcfb28fb03e76c5d3da611a42dee4a0a1ad49678bcda1b547d6e4c3c0da47a1c1771b59cd7e7fdd3dc367e84e94f8560c3bcb1fd64b SHA512 a8d386ec9e17804dbf5dac188e7a6af2f943d40f6166972482a3fe970c42300a9cd137697b8b21018a23af8ce080db1c24f6b1b3b4011224559e1df749fedd1c
 EBUILD i8kutils-1.43.ebuild 1152 BLAKE2B 3e42ed12051ff979a009234c477bcd5b4b682584333aa1f39ea1be5f69e077e6725700764e3de03c05afa51e21dd369424508ee999623afabbf7624dfcda0b9d SHA512 b3f207556ff004ecee5d61ba68abc93a5c195d1eaf0323a1ccac0f868a0ff1072053ad0b2268e68bd6f7b0cb5f76b09cc04f3e252f69ecc82865e9a35c1ee55c
-MISC metadata.xml 455 BLAKE2B 50bb29697e972a2cd20da7f82a87f9d15eae4332496696d85e7be9f88b93a9b8583cbe420816ca90272ead782ad9055d458335fed2b69732bf143952fac4ebf6 SHA512 f561cf2ede2f1d36508229e97e0b1dc7d736f29bc6ed588fff9a2759be1d0457c9d7c64fb114e8250824dbd530fe25a01373673ef83b5370aefc0d250bc039f2
+MISC metadata.xml 485 BLAKE2B 75c334131b955002752321192acb3e3ae092e325e8d868477742a3a0c63d616cef83145d0abefce2a6b0c326295609a16700fdaa18bcebbff06e13e4fd6c0f3d SHA512 54f23399c9913a0cedc0d1f7db5a974b9f05827c30dd9ad95385b52807dfbbc75d72110659fa91613ee8a42893061f964675f53ed5a1e0415ad70fdbad45f48f
diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index c9d971e383d6..ee006acde1ad 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>octiabrina@myrvogna.net</email>
 		<name>Octiabrina Terrien-Puig</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-laptop/metadata.xml b/app-laptop/metadata.xml
index bee35931772d..bde1e7d295ae 100644
--- a/app-laptop/metadata.xml
+++ b/app-laptop/metadata.xml
@@ -37,4 +37,3 @@
 		laptopach i notebookach.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-laptop/msi-keyboard/Manifest b/app-laptop/msi-keyboard/Manifest
index 4f02fc0ce730..054b217172bf 100644
--- a/app-laptop/msi-keyboard/Manifest
+++ b/app-laptop/msi-keyboard/Manifest
@@ -1,4 +1,4 @@
 AUX msi-keyboard-1.0-makefile.patch 506 BLAKE2B 43d593b380383db71fd02b0a8c6378c76b614f90122744d2d776c69f1d16f105de6320a171820f4a19a5b41e61ebe71e501fa8e53e8b058c3424b9702c1a6eae SHA512 2c75593ad02c59950b341d95da5b7d6385614cae8d25519eb2f01ee7b0ca76b88bee5dccef9f34efc0ba496e5052f04aac6b58735446404ce28546d8ddf8c238
 DIST msi-keyboard-1.0.tar.gz 15182 BLAKE2B 4c084e1522da926e541b18d0e59044aeb83873516b3ec5b5bd980883b923acee21842c3612910d84008f66556b6c9e2f9d0c7e588f6aecf242a0e54d72e9c3a3 SHA512 542f74b8eb77db4ef0b26fc5c671bc7446d37b88e13855927d5cdd68c688f933e46b5a377d0f5ec496c1e35694789ae82694d31fc70f04d5059fe60f2ea9d24a
 EBUILD msi-keyboard-1.0.ebuild 532 BLAKE2B abd05b50043a59bfc77f56ace32f05766668faaa875ee1fae6950d18872e2d5d1d8ecb1f480318f199bbc452446ee5ab275c864cb74b657c57541a1342ea46df SHA512 e1da804f019d48395724fda98a2dd3621c00efe4315e0d1802588e29aabb5657766ffefff186c7b2ca68c6eaba5597788fe7bff8763907bbad5ee84fd2d084e4
-MISC metadata.xml 341 BLAKE2B 6a76dc7caa6869f96d10087412f04b6e951af45125bccb7e8fe96a634d649339f71cab41e384cab224285e8b7433b68256cb43ae1a15af335d6dbf51b1365cf6 SHA512 04a91fcb9f8d5b46fa91a2a777839a6cb12df692866114529344c5f017de0a460dde4a88cfdf3572e7d60c06e9b2b45f2a5b373be5c5d898d4e69cedc4597729
+MISC metadata.xml 371 BLAKE2B a4bff65b4c59f3a87db90dea7a1858c0e518d18631835ebd19ef6a4bfc1ac1a1e7035d191907cb6624ae226ded1d8aea9b8abe6110174d90f79be4cf9b92998b SHA512 d66f09714c6ca9bcd4bf882a99c4a21544f373d6dc9ecdb05469cf24b85be842485ade579bff9b46defb6f040276106c1a95594026d10aa33e70ddd4a21052a2
diff --git a/app-laptop/msi-keyboard/metadata.xml b/app-laptop/msi-keyboard/metadata.xml
index 5c41b33f0a4b..d1da15f6dabf 100644
--- a/app-laptop/msi-keyboard/metadata.xml
+++ b/app-laptop/msi-keyboard/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zohran.londais@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-laptop/tuxedo-control-center-bin/Manifest b/app-laptop/tuxedo-control-center-bin/Manifest
index 29ce4da0c78c..1b1378fedefa 100644
--- a/app-laptop/tuxedo-control-center-bin/Manifest
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@@ -1,3 +1,3 @@
 DIST tuxedo-control-center_1.0.4.rpm 71316848 BLAKE2B 9368825985f292556d0c4b60000ff05d8363b300be34708c4fb2f7ac284218b48051deaa30d62707aefa28db4b54c02a2f82d12db33bf56341f257a47bde13f2 SHA512 6881069a99b97b03234fca93423c72a9a8c2eca6d619d9cfd1712055d89d174ccc79a4931941cb8d65a28c10413e0faad2a9f16ad444d29799a1cfe14b9879d8
 EBUILD tuxedo-control-center-bin-1.0.4.ebuild 1961 BLAKE2B 60bba00e9a047286ad392880d84535e621f26e79cabb3dd862425c45b1ff16fea3f408e81fccc38a5109ea7678208b292933c99d78124fd8c9bb12a7272b468b SHA512 d0ac29268c65bb130066968da12a4ffdba2360cd49b8b8d7fa95cd475d3769c3f03df88f9953d996ad3d13716fd609b5164555f8872834685e2cab0eb82f629c
-MISC metadata.xml 250 BLAKE2B 0344eb347d6ab268464c8f93553ed9c26a16456388f2a0bfd2c8cb79e16d8d868dc4de59f93d09381c44cb37c620694769aa9918a79f7ffc2e79e1301e9cd499 SHA512 cf3e0d4ea30e418092b70339a34b52d9ac7a9e72e164e9a25d9b913cba902b99d5edc2f3ae1fd23672162352ae2dc8435195cc2a9ffd51289b8df1804b26460c
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-laptop/tuxedo-control-center-bin/metadata.xml b/app-laptop/tuxedo-control-center-bin/metadata.xml
index 7b7524b9586f..ea6b59e79026 100644
--- a/app-laptop/tuxedo-control-center-bin/metadata.xml
+++ b/app-laptop/tuxedo-control-center-bin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mschiff@gentoo.org</email>
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 95bb62f5190c..55c6f2a2deef 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1,3 +1,5 @@
 DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a
+DIST tuxedo-keyboard-3.0.3.tar.gz 48275 BLAKE2B be4fd4a52cd578ec7db2d0f94c64ba842c2b28ecabbca10331024e104cf4dbaa655e0686f412141ac3ad6bc0430398797f628139a396e5a41ac73c33943230cf SHA512 6ebbde6ea9351f9fd7167d38d8b5f836d1fda2fbbcf80755e86c2b76c49cf263ad2e9cfc47bea3449387626d88d8c1725335c2861ec2ff5a76e64ef87e27d9fb
 EBUILD tuxedo-keyboard-2.0.5-r1.ebuild 583 BLAKE2B 3633ae11af2f13a533feb53f2a3368ddc2b1a6a536903ecfe4312850d64b00f7f2ae1d81e12358515035e4bebbfe02640954602e7ae2898a7203f02d4f64c31d SHA512 eb48c301ebded725bb576736e611d8a187a0f9c9778cb272f6f1c881b108ea7b306e650f8822f78f9f5597b88344a55d80a6d9897b0cc305e54d558e5cf9914e
-MISC metadata.xml 257 BLAKE2B 509de9ecfaa2a50c6900b1ec69308a827823d04fcd54b77575b9b18b71b508bfeecb4be9e230324cadb1bc70674516d4e6744a0dd50ed0556fd71b7b2458f86e SHA512 5f02fa3554ba0e4203073be18f3962b6b6c4dec5b7bf36dcadd9de78827b31c766573268d6c9b092a4e7382557fe423fc31899cfe963ddbfae9ee6015c05c920
+EBUILD tuxedo-keyboard-3.0.3.ebuild 675 BLAKE2B 6aa6f7b4d2f6803f59fb21a927061d20473906accc20c58fcd752bb69261eb0ba91f14b46c7a4bc7e4dc0421e20620f8681b521e590d0ccdac4ff2eee2c59db8 SHA512 dadf0006d0c2740030fafc6379be6faafffef9ca845412cd3d99a36d4142c7565f9c4f6096ea6cf8731dda80c6b98ab3ff164cce891a481f1bb1ebc73ed1c28e
+MISC metadata.xml 256 BLAKE2B 2662d7faa80a4af3161e1c2b304d21fc61d49ff05013f4de1c4891ff4614296c42a7cd03d00b23fe32e8e10f27329effcd157bdee9f8582b3c4835ae1b410009 SHA512 e7731faf6b4148811f4d7598947e2800d8c298098a4493b17b902a9871266154813345e76edab8aa87c84fe2b0f73fcdcc13e140d36a12d00df166974a1cada7
diff --git a/app-laptop/tuxedo-keyboard/metadata.xml b/app-laptop/tuxedo-keyboard/metadata.xml
index e42604230c16..f6780aa3b751 100644
--- a/app-laptop/tuxedo-keyboard/metadata.xml
+++ b/app-laptop/tuxedo-keyboard/metadata.xml
@@ -6,4 +6,3 @@
     <name>Marc Schiffbauer</name>
   </maintainer>
 </pkgmetadata>
-
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild
new file mode 100644
index 000000000000..209f68c72490
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel Module for Tuxedo Keyboard"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
+SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="all"
+MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index cab3af12d5a2..e512d6e97960 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/metadata.xml b/app-metrics/metadata.xml
index 25becdd97f49..33f61c8d8d9e 100644
--- a/app-metrics/metadata.xml
+++ b/app-metrics/metadata.xml
@@ -5,4 +5,3 @@
 		The app-metrics category contains software generating, transforming or consuming application, service and system metrics.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-metrics/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest
index c886b3ada104..bc5e5155c4f3 100644
--- a/app-metrics/prometheus-bin/Manifest
+++ b/app-metrics/prometheus-bin/Manifest
@@ -1,5 +1,6 @@
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
-DIST prometheus-2.15.2.linux-amd64.tar.gz 59204993 BLAKE2B 700d61063cddea02ca4445257b11b782c3b6fc84ed3d48f8d196c5602819f0d44b218d15b870281293bf0661929b02930b937e66fec34918b81cd3d010a6fa21 SHA512 a3b95fe6101d5587329d84adb18c0c261babe5a909e62ab1a39f42df28c058d311b0b2ea9ecbdad9227789ed83c0fae4a12776348999cda3a70cdc457f6d3611
-EBUILD prometheus-bin-2.15.2.ebuild 1504 BLAKE2B c08a028d48056ae10bd5f25e0f083d04118746ae5f99c7bbd3fe7e6ff6d52769d9d3b272bb058e132af1b7fd8ac0709cfd2106cf25a69618338a45c1f7844ce3 SHA512 78d134521d15cd3c322ac3365d725ddeef86f7608354b6c23726c8cd845a3f683d9416b6d3cd38520c12fffd9638d582f892825fc1777f1f6c691dd48cfcaf29
+AUX prometheus.service 534 BLAKE2B fcae8c118b19169e6cdf7469754307ff9037ad72991cd1b6f3f816b51ac4716b75d5623ead83cf4b4d1b8a26fcd3ce54c16bff400e454b9ba00c7149e7c4120e SHA512 84eaffba13c030dc7b2b9dcdf4c96eb12ea5ca16e569ea4f9d4647b1bf912c00826f12cabf02cd97c0e2e76646ab9f179429a92bc32d49ba33c6360ec3cfce8f
+DIST prometheus-2.25.0.linux-amd64.tar.gz 66280932 BLAKE2B 3528c9a2c3275d93152281c0083dc224e5a296636ec22628b6b43bc07f64a7c95cf96fb5f9c212c8101b441d9cba40c629d9fab9de3bcca2e18e2ade06ebb3bc SHA512 0dcbdc18fcc99a4c7cee3ce1435812b651b6cea373df4fbc7263c986c2c6c22de1a686ca44eb104ef602e2a1261957a4e0a64d3ba7b24ae4e9b587b852e5ab24
+EBUILD prometheus-bin-2.25.0.ebuild 1573 BLAKE2B 408f495ccf2b27c96a1a2c89e16697b3315fb4f8070883f33a0e07b8935507890a123b02acf90bc42ce05c6d2ac3da9e6b9edd7e19dbb884d3f0cbf2c0cd7cff SHA512 344a7a6ae9724d577a4132816c6f93895b01f43ea0f0b1b588427e11bb528b7afbeee45e5f40586bdee62a3577863563a736cf3eb0a513a44d3c742686a1b810
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/prometheus-bin/files/prometheus.service b/app-metrics/prometheus-bin/files/prometheus.service
new file mode 100644
index 000000000000..ebd8a901d1fd
--- /dev/null
+++ b/app-metrics/prometheus-bin/files/prometheus.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Prometheus
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=prometheus
+Group=prometheus
+ExecStart=/usr/bin/prometheus \
+  --web.enable-lifecycle \
+  --config.file=/etc/prometheus/prometheus.yml \
+  --storage.tsdb.path="/var/lib/prometheus/data" \
+  --web.console.templates=/etc/prometheus/consoles \
+  --web.console.libraries=/etc/prometheus/console_libraries \
+  --web.listen-address=0.0.0.0:9090 \
+  --web.enable-admin-api 
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
deleted file mode 100644
index 877bf429003d..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool tsdb
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.25.0.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.25.0.ebuild
new file mode 100644
index 000000000000..da63a8595d37
--- /dev/null
+++ b/app-metrics/prometheus-bin/prometheus-bin-2.25.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="prometheus monitoring system and time series database"
+HOMEPAGE="https://prometheus.io"
+MY_PN=${PN%%-bin}
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT=".*"
+RESTRICT="strip"
+
+DEPEND="acct-group/prometheus
+	acct-user/prometheus
+	!app-metrics/prometheus"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}.linux-amd64"
+
+src_install() {
+	dobin prometheus promtool
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	insinto /etc/prometheus
+	doins prometheus.yml
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	systemd_dounit "${FILESDIR}"/prometheus.service
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index c27d87c8cd99..2b1565e8d577 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,11 +1,1327 @@
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
+AUX prometheus.service 534 BLAKE2B fcae8c118b19169e6cdf7469754307ff9037ad72991cd1b6f3f816b51ac4716b75d5623ead83cf4b4d1b8a26fcd3ce54c16bff400e454b9ba00c7149e7c4120e SHA512 84eaffba13c030dc7b2b9dcdf4c96eb12ea5ca16e569ea4f9d4647b1bf912c00826f12cabf02cd97c0e2e76646ab9f179429a92bc32d49ba33c6360ec3cfce8f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.43.0.mod 1150 BLAKE2B 061e538c00a3bb43069837aa4492ee4a040a31cb20acc0bd18cc9c9bde19f1a2a54a19539e71df75b696879bcae42eed0e708e5e07eb76e1e8a238baea589592 SHA512 9b440323826ece8eb7681b931bf7964b02242425651111f1ace97c5b026d25f8ee5e72147bfbfde60166e9d3cede791d2d9ea20893985c118d087705747a04d0
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod 1226 BLAKE2B c58a92fb234f949137fa6a6369308f104c2619cf6af1b0a727dba2e6d0ca9297521f9236d15389e40945f314fdd3f03cbaede2a5e1a2f5b96a983ddc26beedd1 SHA512 dbadaecbd6db504404c9bc700960c20678af4ba3ecf517e993589bc3b124654cb8ba5585c77d3e454ab3e5a5172c2041ef9560ed2776fde91bfa5d92c95085b9
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod 762 BLAKE2B e6349d349c8249101b89b3fd324ef16b7fcf65dc5a87f751a8738b00619942abd06511247ee0e425b3f9b380a669475061f64cdb27c7c8f8f9007bd6067da13d SHA512 57501aa2452b72ec72fe2fc0cb2e2dc7e53f28895b0a9e829f4bcbf6e87464b9f1d05283f72c066fe7e5665b300112db1b92533affb36db3894ab5dbc04a0cbf
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod 799 BLAKE2B b9cf83579a32d0109d952fac0d6bda1f8524aadc267aa062e05f7679ad4e910ac18f2b0c652ce71cfc153a30f7df128f69fc742f7f95392c74fa6b32f360cd95 SHA512 123b30fd3799e31fa3ca7237b81cd6ba20874cedbe0c9c168409adf90c09d2dce45de24c7de61fd60c117bf3306ab5299fa22bf0f9231e0ea10bc1a7c9f2dc3e
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.74.0.zip 1766943 BLAKE2B 5784da13d54fa2eaf5d761f701690cf945f1634b2365d917cc312525f6c8fad69c24465af09deffbc2d6843a8f483bfac528f672d7444eb539ea4b1de47f358e SHA512 76dee6bc4476b32c553cf0bbe2b19cc055e9d0718272f81d750b92820ad3cef7ee1cfc2e01a6a671bdeed26f6c1e6168dd91032a724cc116ca5d84fca15ddf4c
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
+DIST cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.2.0.mod 617 BLAKE2B 4717d7bce69879f27db17c13d4c0b283a9939d32f5e116d885d170e2668235114aa0a7c70ca98a522e01a543285ee10ba47f5d8fccf2e6c3b8a7c123b3fc1bdd SHA512 850d2892d1be55d674990de6cad2b778372473f03fdbbe8d3fa61c0a87ba32a349d5f98a52aae006e079986c84a5ed56256629a1bfbabf65b89c0f068e7f9975
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
+DIST collectd.org%2F@v%2Fv0.3.0.mod 20 BLAKE2B 7b96a22f921fe63455011f7665f2a9d857a574a9ec0f5045366dda86a1d2a9ef9a8afebe9c5640aa46fc8c06cc73769b13263aea16537ac63a938fb8df70833e SHA512 f214d1a62a9cbf57ab751b12c01e522933dc85f766efaa3d01f15730bc36c08bb3fd01bc3305d883d204f55871eb7996978b7bf8d4a43d2c1675c677d4179b06
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip 51384794 BLAKE2B 9de740aab299d1acaea8614517dbf09429cff83154ad8327aaa9c4a81397ea6f6340e65273e493454c0051b17b5d370a9ec30aba4498778bdf0533ca5b80f6ba SHA512 9dc11ff998b3b86599514f6b4db8627b9a413e5bc8f8682f92e30b94c1b08453e7f9aed845a8053e4de8fffe2eb7c04e01c7ae74213b0bb9f23eb7ad0c8bd785
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip 112025 BLAKE2B b3eb6a781432ae32e384e4bdcee16fee0117038ace90fccd959573ac3bc057805972fc54983c5e9eca32006163ede3aa46beda59b5cf2d4946e0e70cd3e09d42 SHA512 1083a5f773d78d0f79f121222d2853b9ffa5cbbbe80538a4c14217bf67d551918e9f35ff0d2b446113db60756c6d0d6676604171426ded48d93f122d49c4b9dc
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip 47890 BLAKE2B 3c86cf8b8a9be463073e3ea7eb96770a12f5d662532a4706b3c4c1ba30605ce1016662c9cdb7f95b8e30a9dfb26b612ef941ac8bf008b0ef2191fbef67e46909 SHA512 2c78eb875092f1cd18289c1e5f0585324bac3e534dfc0967c3f5c14dc1063b0b1ed3e602a121a750cc24110dffc6eba8d738a4f2055c1730221418857aa8d484
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip 15606 BLAKE2B d12ada3cb02c1999145b3b2ee3b739cb6c846f4f6c43150e71e4bed4d07f441d40a02e47294f79e7c3d724b5accc9e5a04236921f02f6a8928ebaca2d8eeded5 SHA512 a906dfdf08cc5b8a5d09700d73b52aedb66ee586024fc31396d4ce2542a83f4998c138738b354c5611b7d3fe4d09f3ea9cfe384241199c4d5b77d89a15d8a56b
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip 10631 BLAKE2B 23199c0e4bffb67d890f4ac5729c97f3546e178e53f65c725fcf3728f625696ad96a6bbdd13fba9c45da6c849eed44e5143e6efd174c8dc0dc0b2a9345f61929 SHA512 974649535e3db11c2ac0ae8f3a3b401f0d967ce3562c55f92c41af6a9aaad69cc22066d00c15d8be17ac545e1b39689e35b3377eaae8d48571a961f86476e59f
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.mod 434 BLAKE2B 28bc29d78246f4684c73dac6a10605db31ccdca22c582d394cd9c91f83376ac0175e4de4ee68828f17a59790930082fb6935e2eb7fb7ef840b0726c5851a6c22 SHA512 af99f4717954026a06eb886817c8c2c63dde23e8b1c98d2b8218a1482cdf48857c5acfc686c65c61dfa8c82aec5086bda9a33ebd5d89be93027372e837e39d9a
+DIST github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.zip 204110 BLAKE2B 6c141c2601c2c3eb2d8cf83cd865c14e4dda94d3a1840a4974c9d21949feab0161b0247db19b95f2ec31b2edcde5a208653acb1e5e2db4d776b045ab32ac472b SHA512 e3da1e60abe08fb1b7d6d15d4b7597a95c0ad82f1e52ce4e03bc254e767930da9f111198d08c21611f951ef7e2bab5b8d769d779a5ab09631949b4a3bab584bc
+DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod 177 BLAKE2B 4dc3ea105907151260d8473539a5e8c9c32efea3087590cfc5521816e52da19dcc0f7d57ed067a15e82de427abed5a1271c45d5d3c7b284e6490251b0b29f289 SHA512 df4e0266024f6899aceda327e2634b0552f19bfc15db0dabd394cea6a15d3076b210800a083b79e4fa23a78852aab214325bd23040d5e064faaeb34af4ec4bf5
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip 111695 BLAKE2B 8e2a00ebba135af9cb0b8b766255bd2ad68fb762161599e568e3a1c5748263fa76a7f775b1179f58a32cf996c0e526f16d9db132d45839fe6edca62191340825 SHA512 4cf0575e874ee97053cc4928183e6f9f5e8734905477c67165c2b43a5b6de03732c652dbad1eaa92446dff10ae1972a6b4fc0fcc3b2e1184d1aff306402261ce
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip 15402 BLAKE2B efbf0c8a3f7e771b5a90ff620bfd513d476e21a672e3f7446202861121dcea08fa95d33b0438b6f1882273630e3cfe756c5934a14a1ab6b2676b117273616097 SHA512 4c39d0907455b1c60e539e8497477e676bf7656c3b30996d55104d6129ebaa02079e5d7d27856352446ec2570c54f0d945be83e2a3445a025c85d12834120ea6
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
+DIST github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod 34 BLAKE2B 325996884246cd840e22801dc089388410afc2bd8ab7c5c1f4bac6aa6ac035f387e1b896a91702386edde85ba82efde16aa8d7bb55a7644fc3f530a36eabe89d SHA512 dcf507ac7e50307fec43fdc5e5dd93f0c8509ac99033500d1ff3414ac0a2419ddb10a688b17cd9d0035c36814a25ac68b771285ae21415eba7a55586b91fed7c
+DIST github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod 39 BLAKE2B fb2e961ec1914554769b3294f08059e7d8d934938062fed87c404166ce6128f35bd8ab14243fe5e5923e20bf17e0d97937c94f699bf6b5a7839d23bd1d3da7d5 SHA512 2687e2246613ee595f475b33c7bb216a7d8776e415196e4a271e4725a2331e661f2d3128d23f0102f5dbcf2b76f5780e02d673b6336db186932bcfcad35380cc
+DIST github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod 32 BLAKE2B b8647c299d1f9a1c4f8ade152cfcb58f73d4bba4b6803f7fed7e0584607c6da369f9f622e70c1a415af2f5f53cdd1c8de7f29a7843b3ce505821ff1ffacaaec7 SHA512 031c2c2f683d57f81b504c68d24aa328a8f03af7d3ab9021b0acffd541d9a295a80cc7b1c9051d19ba30caad619d3e454ec5b804f14e24e9e39b008ec27dfaf5
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.mod 88 BLAKE2B e68b2a7a39626a64da57cc09c741191628925ed60bb5558f7250d670ee75533d3e9f8142232f0d8388399a6fc2c15687bc148db4005638780c5214738035f818 SHA512 16082151aea1835d72dfa9fef4af569b923c60122fe916b062934ab469884f736e93835b411750dd6bc27b28665af0a05c1918f37720496c8336736ecba3b6f2
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.zip 7246 BLAKE2B 33a976530093cbb038a9d28dd6ecf595facd57553e26f949baa0f813392909725739d4427a5c3e014db9537edad5f457c431b459af6d409e6ffc7dcf0f3be64c SHA512 20622818dbd7ce60c1aa657f3cba8fa667acb314b731a374ac7d9e61475b992819a82cce9e3fc8c8afa50d8ae086413f3fe6f651e54d6eef5da25f35f6aa9775
+DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
+DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod 1060 BLAKE2B 50eb8aa20b011a8dedf13e3a00defda30ee36bb4ed9405e648ea2cdd2a00cc379c8a1c41d3d5794300fb7624e59b2b5aee65d8b93555c736908ec1e7c2ac46c9 SHA512 8bcab95c89a92d8840a37ecedb7a000290e6db5a4354bf1339066d1fc02c16532be5eafd4ae3213df10eac236d08dfcf50a0a6b848f63c0557453a26dc36d3ea
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod 50 BLAKE2B 365a971fcd7a5d7accf4e0d968df70dfc452ab1dcd8c39773177f1f0b5ad113ea377c4019cd86f5313e3f1168d63cc51e5cb8e2daa2ef4666d12dd30b89c691d SHA512 2ddaaa2f101d8f297f37bea4236aa9b86a0ce765abc576625460298db3231ad5207bc9313b6bf1eb85b96ffdbe4acca15feb945a4bf084e933901da52f3ed975
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.mod 50 BLAKE2B 365a971fcd7a5d7accf4e0d968df70dfc452ab1dcd8c39773177f1f0b5ad113ea377c4019cd86f5313e3f1168d63cc51e5cb8e2daa2ef4666d12dd30b89c691d SHA512 2ddaaa2f101d8f297f37bea4236aa9b86a0ce765abc576625460298db3231ad5207bc9313b6bf1eb85b96ffdbe4acca15feb945a4bf084e933901da52f3ed975
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.mod 50 BLAKE2B 149c350eae19311721163a613d3ba23bf1c91a5c415554db16c12a31c455c074ec450cd597297b2505acf10925d354c105bb42cdf5c2d9dcb9c55e8f7f24fdee SHA512 6629c439209e02cd490f1a899949d6a6f5a71b80fe819a776b291f3c66b7d5ccf0e72b839a0a8c17c504b02595480024d21667e4d94095ca0412f338abe34ff3
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.zip 73879 BLAKE2B 0f9e74cc1df01c8a03d30bebb2349dcb7cb37ce9494ff0e4f4a14265141f56e5e88ab3d9be1a2d6d8d31959f6391e0368478c4a70ed7065ced2e2423e9c09d3b SHA512 c6bc941a546844ef3711a09fc01ab288f17e966c53dd416407fe196f73ec6b67f936f36ed57f61f079f2a7b2804e8da6dda858dcf6a16ea8831d2a0a9d6a6bd4
+DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.8.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.8.zip 19842787 BLAKE2B e0d7f6544b047341b9f8088db76bd2045b38bd218cd1d17a2197e5f82d49568ee76baf12def3dd9c06212eff71988b9b7b8a232ffb35530edf48ae2cf9983d0f SHA512 1af2373d0bace7c24eb730577b4ee45cff04998b8956a3e476f87831594e2bb3656898dd511b545ff251e66d03084a4f01300e3f4054eda555708f6ab53628fa
+DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod 32 BLAKE2B 25b2fb5f8529b2f05f214278d44b7bb0470cf5c1b5ab7ab72461fef66ac68f911c4c092b073bf0b0f1688d596847eea2782b4d303d71ab3c2801c1a7b024dfe5 SHA512 f26adb57197a4c172e0e34fc6a4a897e54e2855a5bf67dc43667ddfb57d31e243d4a971044c456dc0d1c54351426d7582688705791c3844938dc76e0d1afc5aa
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod 35 BLAKE2B 275030ee2ce09666c11f6b20ba9d787119ced543b4e3f310900f5030544e956af15b407003d01849e807f0c8c256bb709619fdacba8c19b93e4806be5a1ae5d8 SHA512 cd905646c7ab3d19d41de121be3c8630c40ac2c55ca77b73afab555c54d1130f7c41c966ad91b84744fc2d52cbe3f6f7e7d1f2f9db5c8a29e7c799ec007bd4b2
+DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.mod 47 BLAKE2B f238800b26c16806af21a26f7bc037b5b81768b47e48fb469740e3a8ef4febfa6514bcd86c596b8c9f4159dbc7d741cd17939f510394c1654656c27350952ff0 SHA512 c398310bf078b9e1c748d96334b1c10188057c8078ad7e7b58d0d0ac286221b7f95ae0ce6a69f6a4a4b8b50d89f2bddd9e03adfa447e37cfc250f395644c1764
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip 1760119 BLAKE2B fc1a1b58c00568fc72f1d5252379ad9224b0a5062bb2fb3f50a8d0767f42e96d4396c7a1ac0eec1005269df6b698a1b8f6d81f7ce9e2116ff68ce73f498b567b SHA512 fe0532e268ccbe5af37c0e6bc13317c8d7caa7f895e6270d5195d0843d5e01c47068f380b828f177dd700ae02ab7490954e05fc39426d04975fcae67884c1f2a
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip 19702 BLAKE2B ee009befd8861b2556869434d14c1d4ce130d432ba5f43821b0cc2f6fa493bc8a4f93a011f05f5789f7c388b2a74f272623d6dc2689a5c29dde0b3c307598173 SHA512 d7c39c78c074d060973433f5f4c1405260fa9f49ba9ff020630bb17404412337b536275aac71ae30c0e3783b95585c46cc492f722572b941fa1476898a6f7e8c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod 32 BLAKE2B bac4a6712c426a393e847390ccd97e8ac70a59481520ee26e029880733401b91d138425f233a44513303b14d72210b5a7e54dec2078a7a7adec89f0b49a580ff SHA512 c75dee01e189f9fbc2fad8e7b74890ac91b1119af917341aa4437b0018e6895569d6c614e90864c75516825c8ce2923b34e1e396f67c56f1d71bd126dc1de712
+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%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-bitstream%2F@v%2Fv0.0.0-20180413035011-3522498ce2c8.mod 39 BLAKE2B c435f602cec54957d1ef8546cd47d5f0171055be6cfbb65da80a055e7829ab42ed7f88ec10b04977f6c928794e754b86722cc686f7315e873565e767c34ff976 SHA512 afdd263d04c6c48931f5734013fbe50d810d027664bf5bca128ffb8ec2cb884466f68eda26ce54d899bd517b6c8151ca4e1f09cf767696dbb56ccae1a5cb398a
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.zip 5923 BLAKE2B 3cb4780d44c02d706d5fbbdd0d508033dc5f72f018f5ef949bb1cab44e87e1f8032d78eef76a43233da73afedf4c937cceb7ded00bdd77ee251a67cfab2f7b0e SHA512 71ed2207658c5c675c6cd717dd34eebbcfce3126a15d7f2efcf5dbaf1336296391bae17020c165e7ed4ee24c12158e7678a99db8d9b31728ff36ed6b61c0464c
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.57.0.mod 507 BLAKE2B e01241c3c8407bec21260be1b0926622fc6af0ab4a61c77d142c6bc46204a15d57ee91a2d0491d0de0a2f2af05bbd528da4ba709fc1728acda88fca43f6671b9 SHA512 9bb85f88aed3bf1b11aaf1349c47f2e231313a7f07c6dc0980132b12598fa832560961b7880f959494db2c31c0ec5867c1eff01e432b30c966bd4dd447e5e4e2
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.57.0.zip 149991 BLAKE2B ecabf29dad678099b9c4b8f2738aa0d04cbc58416cf4692dc5c138b94d6e2a20060fc78a4507044654a70460396455db138df94e7d0c4d26559523b162885e96 SHA512 b258c172dda81abd44c71c87f39563051d3dc83345b36cadcc305fafa1719d25eb29ad12ff7734b809d7fad39faa4a538a911be8e9530ce693e57ef45c7563b0
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3+incompatible.zip 4564368 BLAKE2B f32e6b957d7ec920b92b7d725af9fd979ad4b3e5db692f30f2c3e807672c1207419cc35e0643ba85ac14787c2e982e50530511bff5af760f922a6af554c6daca SHA512 072a6341eeff662b8bd43e83d8e6e417e86b092b59e9bfa4923d6e946b473c75463139b8ef60242f5da19a12622eb6da31d3acb61b456c3b56e627a371094f9c
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip 7269 BLAKE2B 470c1c97f98491797c00b10598113e1a86948ea9490eca41925c3c814083ead15e97e98affa53838523487b1c91857074d2f3df4bb3b0405a2e2680096c6080f SHA512 be798def35cc584c8510a0acbeb6e243e911d3429d8042804e8ebaccdc6c6a46043087e8abe4d894cf8f03347e666d877455d138941c300d4d4b4e20473b78fa
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod 543 BLAKE2B c757618d90ca032a7a1dba4ea988603324c82b3c8df0248caae59c5d33d601def8c5f6238acd40166aae227759bffe4ba9ef746ffb045da14416441e22f894bb SHA512 90f3298da3bac3bed1dcc040304c84939efe3757cfa4ea0d4367a459b3328f26da343a7aeb8d9b9185ac9e324e5cc6287243b51102edac6089b50209226b5018
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip 19896 BLAKE2B 8ca1144d10319091d11cd6541176bb21eb26eea5aea52c0f09d919d00ec7d324910e18241736478ed91a21744252ea8da374abf5963e7c5d800628c9ef49e312 SHA512 4c11818589ac5f5ff12ece87b49ce995acf151c87e96d1b0a8bbb9b2326b30e2166ffc5da7e19a59f42628948fae931a15bf418a702e4606779ae31925bdaf0d
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod 30 BLAKE2B 725b27caadd05c18fc518e46ce4f1a213cd6ed7b4da3edb02cd74b7c7d3dc37891692f195144bbfc455bdc9bc77e683b41122bb3d646796555e92f565cc0133c SHA512 d64a7c87d6a40c48684a61ed0f6a7e75590df7d72d55242863f1bf18af9bb9ef51c40ecf0c41fbc039e06f1651898a238375afb12f41af5978195887a9a16c9c
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip 59458 BLAKE2B 3e319bcc242e354aac2efbc31d978bc5dbc0b1af3911835f96243d3077fa12ca37b16256e89223b95d1c89f0fee1cc8105210c6cd74a04a01b69d7c45d4da3ae SHA512 77e29db3609028cd2026db97add708afa8a0688ed76d40e2beb64e5cf93004714605d8cfb83cd2668d1be1c5401747652b09d0f6e7aecc3ea0a3a1e08c957f06
+DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
+DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod 45 BLAKE2B bac7691d817e47764a81e469868f9b02deae3674d8853e7e9e089000dc2c8c94414c978dde8f7b8da65bb692bde21f569db9de8b94c2944d92b17b9534ef9b55 SHA512 d74f84f6297e89c221091296b305df98c6a28d30385a5a4dccbdb664040f23dd211528e2d859e259e862b0f626f94dcdd20ff58aa8afe26af5b95d9e675507e4
+DIST github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20190410193231-58a59202ab31.mod 37 BLAKE2B a1d5e990a4760ee43e0e3ecfcfed98cadb6870b30fd5bc4015c5d4ad89eed058453f2f48a771eb12f0952e7fca5a817aeb0139f529b6fa7a82a1445e19c066f2 SHA512 f8c65c717d960464e2773cd3f6d73a481d9694ed90627a08eefd42f9fbac72c60a5fa4b0b28942eac6292afe62d244eaed51a6514133a8d0ff41282b3bc71c26
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip 461958 BLAKE2B 025cdb8036d1e055a68ecb215d0e8464e0840d5ad9f63c7ea11cbdb20998c74d21f5b9d019bd4b36335e9bb485b6fa5ee285eab1080b755aad8bed59e29e7d9a SHA512 fce6fbee13f3b4eae6182c000d809d9d96918ee93be3d460a6ff359b0889299a806e76b9caf364454211116b5acabca02caf2f401e900c95ec41a5bc54c4d693
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip 15925 BLAKE2B 66134bbd8bbdb9f4ed2db1a77eafd5a0403916ba2dbed0a0da0f7328d2edd7a16a59cd101efba4b5167ec249388027c3a7152de336d1544b98316ae68cf06aea SHA512 26e1b68fb64eb8830aa1140f7cac6d067c7089ba1ce0f10bd59acf9c906add6f64d7797de2799b33232185b8ae9b611234645c324a814c5be338d39a6c2d3488
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod 38 BLAKE2B f973673320ec56ab6d8ebff0f6a789a40d5f861736377298de042f2cddf926994bc99611e4757c4cfc34b3dd515609ab9b5dc2b0501d1929d8580b115beda0fb SHA512 23b05bf2f58a7e584e301622fe71160f6d8ef32236c48b2ab9f6afec79cad5afcdf7dfa729073f7b29f1f94fc181c86197de2f05f9e80624411802f55f137c50
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.mod 910 BLAKE2B 52621f52b077333e25db559ed0d633149a1608fb406ce7a1ac7c4cc0f622d8a442673e15030d5a8733dc5119e3586d3cdf4cf0219aa53141a3c57e5a37efb979 SHA512 ac4588a06065fbe12cb7c183a54cb6b1ee306bd56b8f2f7620028f818afde99ff024a48bb1c1917a1f0bc8bd351ff782de89fc7baba2087dc4acb9c7d467b83f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.zip 211263 BLAKE2B a86d2dd9f0c1449b1612c934024140e309ead64db5965d889f9d720f4a249aae3607d2528ed21cd2ccab6fcdd3a8f67c4a334774fe6ab659580a967d6a2ba6b4 SHA512 66d2dad074abfd0358bbb4e3c7ab1f48abe66045e9b2ba9ecd56391059b7d418977fd22da796d450b187f7e8e626aebce38237f3367cfc779904c3a34a14da66
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.16.mod 393 BLAKE2B 823209074e22fa4af1dec6bb0e0f736a23901a288ce615ae3c6c72d860092b7346aea4faee71363acff62b621fb2e972d2549a975bb9ac1a48374de914f0ac27 SHA512 12f0721bdbfbdb9c48e5742a30a56ea8410ddce3431a31844f4f954e3ad97b0f395a61b9b4d7a890b0380b6e8c999db952bbdfe008b7d09d6d4974df049c1344
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod 483 BLAKE2B f95e0948ad794bda6de6fcad4ec0414d14d448e40b60b947b583e430e0357e125adb56b8cbfba060d5d7439010e8fb4c36e25240f7a6d65f46bb8ece1480c23e SHA512 63845faa6486792914fa0644586a0aea98bc44d9ad802a1c90ccc52aed39609126af1cc09067d547782fe7cde764c77fa2b687648e7fb0b3de339f94c097183f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.4.mod 483 BLAKE2B f95e0948ad794bda6de6fcad4ec0414d14d448e40b60b947b583e430e0357e125adb56b8cbfba060d5d7439010e8fb4c36e25240f7a6d65f46bb8ece1480c23e SHA512 63845faa6486792914fa0644586a0aea98bc44d9ad802a1c90ccc52aed39609126af1cc09067d547782fe7cde764c77fa2b687648e7fb0b3de339f94c097183f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod 334 BLAKE2B ca61c4390ba8de5e9fb81d62cb7ce1ecf7b22983ccfeed6b4a8bcbfe2f23dfded897d41408772d4d4d23fe4623cb8afd46185227823a333074f5be29b364362b SHA512 e98697e890d24c66eb807c95f9a58aaf76a6ab5dd07402bd7d928d458bb9af5c72c96ac9c94bf348307bce81c74d1eae94450ab6d9463e41e2dd46a533fb6e97
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.mod 287 BLAKE2B ed518445d692d0a35d14ec301224b99bfff913ab77606001c292d0d15cf521f3bfd0c557f39fbd136cefc3a65b229e43cdafb95e01126baf99eb85dc4cb14127 SHA512 de1500fd1595da53739df720e1404292cd908d10a1a7dfdd164d145c7c7c26519d9d7e6446aa899dbd40b4a8a9165b0de4804638be288c4fce548ed1e7a0a744
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.zip 308875 BLAKE2B 4a021cb7fe61479562bc64e47f86e0520ad65bf03115d94483a4e571f38a7c904d9cc771dceea32fb2d48cdbf8773e50cb1a6caa5d168bcb225d8cd7d64fd476 SHA512 c05d4c8d90cced3efc5b2010c4f2e1e21d2e2b6fc56aa847ca0ba9556833c891fb3d454590ff6b8b4b8adfe015e58388fee90a67cd122c70bfa49a6fa3bd1130
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod 130 BLAKE2B cbeafbdfffed4eb5c91295044a618d126ac876cfc56ad60e909862e77cb35576f0efa88972b5194a7095003f055102dbceb88edb792be3b47260c7d1bce9b5dc SHA512 2a23a7db04a32554bd2e502284d024060fa39df72ce5bfc6df15a11dad312655eab10f16710a18531cdbbdb464477d9bb88b53a17f364c8f7562d1df7436ecdf
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.3.mod 130 BLAKE2B cbeafbdfffed4eb5c91295044a618d126ac876cfc56ad60e909862e77cb35576f0efa88972b5194a7095003f055102dbceb88edb792be3b47260c7d1bce9b5dc SHA512 2a23a7db04a32554bd2e502284d024060fa39df72ce5bfc6df15a11dad312655eab10f16710a18531cdbbdb464477d9bb88b53a17f364c8f7562d1df7436ecdf
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.4.mod 130 BLAKE2B cbeafbdfffed4eb5c91295044a618d126ac876cfc56ad60e909862e77cb35576f0efa88972b5194a7095003f055102dbceb88edb792be3b47260c7d1bce9b5dc SHA512 2a23a7db04a32554bd2e502284d024060fa39df72ce5bfc6df15a11dad312655eab10f16710a18531cdbbdb464477d9bb88b53a17f364c8f7562d1df7436ecdf
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.6.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.7.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.zip 27639 BLAKE2B 7407c5ad9e14b1586ad18b1a3becc51359d80d6ac81d1105da51683ab93b6eeef370ba0f5181b985df939ff445614a05f6c90d054b72f620e8c78868ed4f30d6 SHA512 efe63e6bc42a7d8d031349575033525d91a3263a694bda17921acd337b1350989c5ecc5f16def73f161f2b5cef3272adae7095803238a0ea6e8b635653395e53
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.zip 27898 BLAKE2B 516a04fa5f110e87d91589e98422e955cc82fd5447d63082905a7d835acac7870096a1069e786dafb88e92c002ff7aeee11a6d94ba3d0d2b48ec963d92ab77a1 SHA512 0cce56377066137a4271a0b21a811ab963241fadc6c9469856d65c624a060898f2bb043aeb399acbb5f297773704ffec5bafca49f14bd0655c775207ee2a3907
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip 18504 BLAKE2B 96ca3632fa43a2e7a2aec8e72bf5ea06374096da1c18656119ea5c1ca1eca55bb82b1075dc1ff478d290febfcdc6d9596e8b6400f053e611b0101c8d79154396 SHA512 2263bc61ddf10f0ab76b3f0b3ac2bdb91e30894e6fdd48731bd3595c9005884038bcea0bdb09abc73bf9a68c03e6b761f73b8cd60315c121058e58a4bc7d18be
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip 18595 BLAKE2B 1d2f10a892b679a58ee2a5f73f423d91127bb8208fdf1bff862c8634d4fe1a93dbf721ece4c87b470232b78924a4ef190536dccc9acfa4a16f0ef21609e73d9b SHA512 c6b3a6bcbb93b2882a9873d0362b8618499f0f7d0aca697c5b9de04fef7f3c462fa11a55a175a0c1ceebf34bdad9df365dfa622dffc59abc4d881136aff5dd4f
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod 363 BLAKE2B bec8f102ff2d1cf0d4e61960971cae49e628ff3678b0a6595fd4add3dc6018684c004ff8de4a7f60fdb5ea8fa98dae0507c619f148836dc9287cc687cb9629e1 SHA512 b9528f1a273596c8227843c7b5513920f78c25b859c0d095499ea05f5c0200095f28a344c5bcc913b61c44f71c5af50462a2e7e2ca6ebb9670c5875096118998
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip 16705 BLAKE2B 61428f887e1b321afb03e2fdb690c4d4d073c343457472fbbcf48b841e49e4e4e0b9215ca217982951bd3948ae8a2efb9042cc87f7ccea1b4e0356358aed98f2 SHA512 52d4c005063af04b2897f5fbc1d23b5b9280701e667949441ca19db9ab8484dedb9f148e5052b0d785aa24fec8fd27a44faca2cda4aca946bd0fff92231c515f
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod 363 BLAKE2B 44a45869e933ecc2c8ead308cf2396c25bae527cf3bedb12142cc7d2f008b7fa9ac91c4ae04705d84673d71b49ae0490d7e801f1ef0b508792e6be68e79a2534 SHA512 1f1e8745f7a01c67b6f80a9ed4e69a8189a2ebb2bace9d5d63b7aa4e261ee3c465bb791b2df15797823651f9418fca8b2efe8f788525e04d62193a81147f5258
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip 17133 BLAKE2B 86787baefb7883fd6b8718bc471dd4c2546c1795ea6a17a981a73c0fb9931b785dbb8e22558a6c731559058c0010e2f6b27156914ec9360c97247340247de9a1 SHA512 0274301c00cce0c9436bd038165fa6350173be7e73b1cfbfdd7fb12def1052b37a1505be35ca6a340692d63dff23d5abdc3ccffb1a325659c50089ab443ca1b6
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod 221 BLAKE2B 868f9dc1980e996cd0e1a96fedc219e5277071d6d36a35e39d57672c1a2123f1388bb722afbd087085f91a16bae62167852d94631f160edc1bd760b1be3db367 SHA512 aee9410d5bd44b38fc2ad7627cd87f158dadbfb9aa9ba20db1324c44120233891aaf03db712ab5bc9478005992388c26d6ad5acbdbaf131c9f1c26d7d864d5a9
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.3.mod 230 BLAKE2B 9638e003fc34cfe622a027b06c1aa5885039fec87261eb4a716fdc8401238087a5d34d0723670a746bffc1b7ebfe33b8003f86a12b804014d56c40851a2d459b SHA512 08439e254b014ff740f38aefa63483d1e45bf91a512138c93d1ab2abb587d27e39df878a93673be504dd6b5c77608b4eff3123a55597893565e9163bd93dc717
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod 230 BLAKE2B 00b69214f0de6d8b6b38ee35a856b7d9e6f44c372c55f54e9c650c85c19b69f6194540c8236569ee69d25339802bf51ac4ac89f78600c6c1e8c7f34228126a1d SHA512 978d42cff1b1bb988abbdd1997b6b1c215c23e1271378f9d3fe7252e8ddc3e19a9deb4c93e15a93bd47a5f8b6abd62118cbf8a26bc43d655308dcf0f623a763d
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.mod 231 BLAKE2B a579c713c47a9a93ff008fd0cd1de1ee3b706f5b965430079905d606768f847a932b1350ac5ccdaf346487886e7b38639e5af1e3badd9f5fe0d206dcab445962 SHA512 90f3db4743ab404ee40ac7af4066d40c417d0a1ca03a0462ac4f47bc80f2413a8cfccfb781a29c7ab8f130e1c6869954b0dc4fd5ff700ba290e750cdc007942a
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.zip 140398 BLAKE2B 5d907ec17a64ad7044bdc1a38c8a8de301e3e0f3a41d85da5851d74b56d0234ed259fe4dace02fe62d3b6117778c758a07c7935ba42e015c42ecd5d678e4dc87 SHA512 b808029e4fa84b3d7a6dcd264120f73f90d2d9cce368271255ffb77e36537cf9e7e9bc62702303efe9f0bb8a33296f15d7e9fe2907122b62d8afc13672dde959
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.6.mod 310 BLAKE2B 105b9544053a786c4cb7ccd8ef6708f07dc04eb1319680036e81b1198b7464d9cd141aced937a3b2af5dd8965387747bfe64bf0f77685ad988241ed64dcbfa1a SHA512 66692749fbf28cc0313e302ea6f70b7182fc90f15038363fc39265b2e9cecba1e711db311fcb0ac7332670e7847c2863998a8c84a9d905208a2db740e304d13d
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.7.mod 310 BLAKE2B 105b9544053a786c4cb7ccd8ef6708f07dc04eb1319680036e81b1198b7464d9cd141aced937a3b2af5dd8965387747bfe64bf0f77685ad988241ed64dcbfa1a SHA512 66692749fbf28cc0313e302ea6f70b7182fc90f15038363fc39265b2e9cecba1e711db311fcb0ac7332670e7847c2863998a8c84a9d905208a2db740e304d13d
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.0.mod 425 BLAKE2B 7fc1b88fef59d11997c0efb13e1e125a86f4e13586ed79bfb882dcc5145996f5206f7be26da3d3d61956145c976759f5ff9b2e0a99658528585e63c648d89d29 SHA512 07bfb801917e953ca11efed478f7ccda2fe570cb2b23abadaa8e8725fdd6c57c155eceb8509d8994ec9ff5b6453453ead61ab468ae2ce1e8d0eebb7a75dfc440
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.mod 515 BLAKE2B 4768367fce97684120bca991da69d70aaeaaa9eed3dd63e41f60ff2539df75a792c7d79176dc67f8990814d4b085382678c87c4da21bf201584fdb5541668e7b SHA512 fe98232caacbe95edec4e141d0f69075fd1487b6d1d8f5e45cd367de327426310c861852f36a66067ac523f3f408a9373007e9f2f47d40dc639ff4d69622ae32
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.zip 151073 BLAKE2B 8adb6348e986a19954b93f20b5dd185b4bc8f8eed8c721e1ccc647d6c7f9c3548783999fca3097e1bb013dcbf601cf0987a95efe63148bc370c872a5039e3ae3 SHA512 b707d091841a853b4d524a56beed9feef38f5b30406651cfe9cc0008f9423ce60b07643952b5114fa91b17e23f931229b061919021a963dad0e713d3bc0366d1
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod 37 BLAKE2B fe2d5da39fadf3fcf32f06d968157a8e8dea075a9d473349399f0bb8a04370ed0f6e17f37a333f5aa2bce1d2bfff644656a84c5d1bb65cd00e4310886435e1ca SHA512 30e9611c496c86d8331d8575ebd70c9459b4d0377e36bf024d9934fb03ee616665812373e8aacfb814ed0cea25924659a9f1636d65015b929a4652bf590d6322
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod 1074 BLAKE2B 34cf9165f8a795cf1b2182addc17dc5cbf6cf17306921f7d6b35c0d67c9f85a9795d19983aef40c7a9c9b3a9f7c24f4313c30f3774446fc9e8b0a6ffd037122f SHA512 ccbb2dae7075af582756a35d6fac07d92281d3f58e222bc79404edd3f416d4a8841b6f75ec6ad1c67bce5d7b7d9ff913bb42e3ae92e7cab86ac3717802d1a080
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.mod 420 BLAKE2B 6cb7d725e1d5351d65241787ce9a3d64e3f4df72c74f0c53916f0015559d3fded75fe88a4a65f3dc1809efe9a0283f7fdf7fb0aa9dc8304167dcd4ef27aaeb4c SHA512 fbf4b05c4e26c553923bbe65e6ba4342ae1fe63c27ab288d8d233ef714106da9d6a166f1dd123bfe06fba530287f8a17fb459c55db17907d0860fbdbd7dfc7cb
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.zip 189311 BLAKE2B 0ba4879b263757630c2cf2895e993c55b61d67ddc99a061b499e4700d61ada8bd6eef187c55e20675b88c26c4bebaaedd3205f6ff64e580ceabcd29bbfbb3c3a SHA512 19442d068cd997f97335a6b552fe7c0075f5f6e1a9632819544a38d6ff2ddd801d10c3c6e4a55dc6784532ed82ca0ecb622fff0b1ccc449f34cd226ef0f17d4e
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.16.mod 719 BLAKE2B bb13bab5dd2f47f267d06bd8103babfa7a039aeb49dc92d6cccbf1678f7ba203065f68b0de4189176a320fdb632d8ea035e0eb23d658e9e998e0a0ea2649bfae SHA512 033d13dd0b3affe8c1fb11f03c8f8e3a5e9b560d947a755b5793d57fd8d1d0db37284906b59cd6562af28884038d234debbdb7117bc268b63f86904b0c0219fa
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.mod 487 BLAKE2B f93f1c9551f9480c3babcf18b3d840aa794302746acfb69abc519db8abd7da042e8597c0ff8ff8580373afe2bde87e47a69552e726fd67e4566aba2e5880cb25 SHA512 188f10c0a79e5008d43844f12b7a4dacf13b161d10eee0c4ceab6d51a44db507c2f9a8b8b84a11e712ebb91638099ee20c6f5db29ba15a687cfed0b949843e91
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.zip 198206 BLAKE2B a32b49a0a62423e23d74f5e915ab2614e6375dae6a08e348ace7c5e4d0ec5e3f20ab38be0540e2c719d94ef5d75618d0ae60a1846f5ca6260e6356b07502c58e SHA512 e3b80892d76e4adaa5f5a87fba9f15f2624acb4eb3eaee9533730872da40031d5c6c68b47993f78cbc1166b0dd57cc86b1eed9eaa42684d34c24135bc94ea8f6
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod 546 BLAKE2B 5def96d32f37b6d5db079cc1724ca10c0be93f33b06907aee142e45985bb1891c8850fa531ab10f0405a34cfaeea5adb538401c2ca8955511d758ca77f9bab73 SHA512 99fe69cb7910196d46060da7b382457189d9085c9eb4c15ee75c0acdbae283a5bf8df6aa30191b3202793a071301739de57d972b5daa2be81d86de9bf08a1c85
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.15.mod 345 BLAKE2B 66df6d778310773776dc525f594119da05ece55656e7dcb733d90c0afb996a1a7deebd43123ec70ff56675a3f3c5cc312bd39c7e2cb0434ac8fbf4548846019a SHA512 6e08ca28aa47bbc9d73d17f4cd39adff431b45b18679d3adbfb88b323d393e06c5b00ad412071a6e1141745b316f0c92665df2dd05c2db287c504dbfff95b8b7
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod 515 BLAKE2B d901158241d70a76b23e81549a51db50d1a446939de537688dd1a43622b59ba7c118a17c697f6e2753a10b34d5f806a6418bc20de8aa35802c15ab50c87dc295 SHA512 fa3615e0bd38c5b0a55ed3a24ffe0534fecdc8b36b44ed47d7ce3784bad810bb2d5fe451fde2055e7c003454bcb20e9f560843056087e9b20d7afba899af065c
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod 589 BLAKE2B 9446db5ead7af8fe9e74376580e35fbec6d00ac8590e3e6ed4469ee237f549da84be7a1c282081a65f6112119d9af29c11a603640ac8dedd45e807a9582a55d3 SHA512 23d81877040f9b00f665fe8970912d413e944fe3c811970158cdd2df6778a4170199209de6039d535a896a87286392a2e342d48743235d99059ebda16086d231
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.6.mod 306 BLAKE2B 49030ac69185eb35210ed17e9cf5372b79a6d1602f1b70bfdd171501032a37babd91372f546ffc15d427a6b42aa6f2d409192ff9c54fe6422b196d3dab64bfc6 SHA512 a56eaa49fbe1e7afffd722e75a3a6df05e4d78606cf0e23445293226280f97054ce2d9a4c418adf5685c208ae434dc79778c0a36e3c9b66f1f9b25c76207b5de
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.mod 306 BLAKE2B 49030ac69185eb35210ed17e9cf5372b79a6d1602f1b70bfdd171501032a37babd91372f546ffc15d427a6b42aa6f2d409192ff9c54fe6422b196d3dab64bfc6 SHA512 a56eaa49fbe1e7afffd722e75a3a6df05e4d78606cf0e23445293226280f97054ce2d9a4c418adf5685c208ae434dc79778c0a36e3c9b66f1f9b25c76207b5de
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.zip 283942 BLAKE2B 019af1ce673dfea5583b01b260a06e9c643115b6cc7bbcb38ddfbd275e02a6258c664b2fd1cd05f0a6c6fec078a9861ce7de387ad345edfe4137cea116a4ed9f SHA512 b4b34ef13c5d5c86ebe916e436803682d17ff56406d0a1f45173cdff1aa35ea85c01c5b6862f857154c04b393b5873cc2d5547a751ac4537d4e5f078a8b52d4d
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.0.mod 345 BLAKE2B 66df6d778310773776dc525f594119da05ece55656e7dcb733d90c0afb996a1a7deebd43123ec70ff56675a3f3c5cc312bd39c7e2cb0434ac8fbf4548846019a SHA512 6e08ca28aa47bbc9d73d17f4cd39adff431b45b18679d3adbfb88b323d393e06c5b00ad412071a6e1141745b316f0c92665df2dd05c2db287c504dbfff95b8b7
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.1.mod 345 BLAKE2B 4629de89f66f2c971549a079920859ad9d4771ab875306e99d433108cd78b82d9f0a60ada2fa6d2ffdb85340a6d33ddf6d65bc0d7d52403078cf6473147bec1a SHA512 bf32de27678fee02e4896b8ed183fa19560080c40397b08fd7afb8507b3f4c52f4a055d285bfd185be796ca14f001dc69dd7213bf52dfd1f218ad34493c1eade
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.3.mod 345 BLAKE2B a976c7be163e8f2a8f25c17d7b3683316d003e7159ee483fda3f63f28978f929b8cb5125b2a859a9d0e6a91519930e77fe1ac30fe40cf1518755bf5c3b9f3ca9 SHA512 06add7124daf159c1b58c4eea831f040158f4bbde19d92de6f65ee59acd9f6133e7731a817abe1c141086ab12902b8b149616e008a18dbe2b0a4e4308185a5b1
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.3.zip 404911 BLAKE2B a453af5e5c20d7a586f92a11863550dac86678fbae16af7b0f94e2e71aa75a05e3cf2c4ffa4f02984d9053817010d8c872ec8d51b9ba63d234e8cca97738c920 SHA512 b0ff1e2f4def315af2410f5e5299ec2d0f06c49c430676e7e2d00e35891d8fe54487a78c8010e54b80be1eed547f50eb3c4f4ea1b7f7b770a8976b68e5161cd6
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod 498 BLAKE2B 328cbeacdb4351ec3a4556df283d1ab23bdb0e2bfcfef6c516b1fef24b7591e55723a425d0e59b0ecb1ed552198d752c9fdc6977cefe6edb6f3e028dd080dbf1 SHA512 91813eecb164407460a706e6b22b368da59d9c1b29f827d95ff56ffa1c8e5fcb77dd7bf20fb830febd6ef597aa50ba63d9617540277c6502933a96ad63370b77
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.11.mod 311 BLAKE2B ff4af9d6ffd2537f9185d6a6d4b5eb45a3d5146010afddf50c1d8bd4479d8b9979ad7c7f3f1d0b0eb28b8224067780d5f9c2d77e6aa86abdd78b4dc2e5eed31d SHA512 d38bfc2e636535eb4bedb2fef41f496d5db854b38628df83a9723d80eda8170e6ac5ba10c235ba1f6f5a6009e7bf151e4da864474b700e25bdac1284867e9cba
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.2.mod 439 BLAKE2B 468211633ac8a95203aa1a26c04d10b0973dee61bf220b68546c97d119838ec451c627e8d598fe6e9db1b0519a55522d713498e4ce0655113ded453800789d51 SHA512 8fd770f491e8e65fcf65714ac59b44d6d967570dd028039b4bea22155261d95a7ce05688cb9bbcc2f40c9e55fbdc89b673a0f70e3522bac04d508f56f1098123
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod 439 BLAKE2B 468211633ac8a95203aa1a26c04d10b0973dee61bf220b68546c97d119838ec451c627e8d598fe6e9db1b0519a55522d713498e4ce0655113ded453800789d51 SHA512 8fd770f491e8e65fcf65714ac59b44d6d967570dd028039b4bea22155261d95a7ce05688cb9bbcc2f40c9e55fbdc89b673a0f70e3522bac04d508f56f1098123
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.4.mod 448 BLAKE2B d919fe8d244d6d5f5fbd3bd11ab68c56516a7dd5cf330e0356f72aa9c38479f7e45c712c34a1d6a6d8f0acb3d31abed95c359c7b0781b80d86cffcc35af744d2 SHA512 0c3fa960c38f9f2ef8ea4c05bb24c180c6f6f2a1af4c580ac8b9e83502b81e1cd13297d4cd03176adb36df539bdd19af85cb304c8fef8ea55ad3689882974dbd
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod 448 BLAKE2B d919fe8d244d6d5f5fbd3bd11ab68c56516a7dd5cf330e0356f72aa9c38479f7e45c712c34a1d6a6d8f0acb3d31abed95c359c7b0781b80d86cffcc35af744d2 SHA512 0c3fa960c38f9f2ef8ea4c05bb24c180c6f6f2a1af4c580ac8b9e83502b81e1cd13297d4cd03176adb36df539bdd19af85cb304c8fef8ea55ad3689882974dbd
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.mod 311 BLAKE2B ff4af9d6ffd2537f9185d6a6d4b5eb45a3d5146010afddf50c1d8bd4479d8b9979ad7c7f3f1d0b0eb28b8224067780d5f9c2d77e6aa86abdd78b4dc2e5eed31d SHA512 d38bfc2e636535eb4bedb2fef41f496d5db854b38628df83a9723d80eda8170e6ac5ba10c235ba1f6f5a6009e7bf151e4da864474b700e25bdac1284867e9cba
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.zip 54890 BLAKE2B 58d19ee07a67fe2ab983fe838418d5be4d1efe53f4ec0ddbb1f700fae436b2c937f03d31b47f33a0275017a8a615814acb2c13947249a07515590995d12943b1 SHA512 c3037e3b7fbd54c9934a28ce2be771d305e4342727032f305b7217b887a20138674f54f65526a0e4d85b52f26ae0265589fa5fb7e26b50d80f296bf12238d2aa
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.12.mod 618 BLAKE2B 28d45b8e68e9996ff41b016b7fdd43d796e59684b3df87c471420b03e4e473af071e78edc40054b29592fdd92922fb291abb14fa663e4a74d4af2d3f5a4ae6a4 SHA512 4df6462ac42ea2c1aaeb019aff6ebd89548ab3e02b7923c3bad6931f389f0dc56e4184fc30fb802afa7beaf35a9b5bb2c8e06863f21fd56719c3df28817c5fac
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.13.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip 52002 BLAKE2B 0129a6d34389f3b890a3f51ad4dc31ea051dc9279cba5748b3becf6c06e07cab6a13c24c7989a82a44393b624e7179cf2821504ca540df2cb19541077e5bfc5e SHA512 25fd2a4643d7190ca6a68a72bd0063ce77acb3850fc81970830e3b6103b6639a5b8cfb4e7eb7c5cb5c3d3b0c2d376b654de44c4384eec3a44d44000837a365d3
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.7.mod 508 BLAKE2B 5f2a8e18b6d5a03921b197cb0bd84c871522a6ca19cd74d506f668dac4e5a63cec401bf4933e7244c0a441b01995265b3b00abec4c16072de6db4448fe356aea SHA512 0330c5bdfb5c0ac2fd5e2a7b3763ee9182fadac4774ed3462ce68934a1eda3eb25f38cfa7ed2793ec12e8884a42980c348ac891ae3c68b73fc9b1d6c6182f37c
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.mod 508 BLAKE2B 5f2a8e18b6d5a03921b197cb0bd84c871522a6ca19cd74d506f668dac4e5a63cec401bf4933e7244c0a441b01995265b3b00abec4c16072de6db4448fe356aea SHA512 0330c5bdfb5c0ac2fd5e2a7b3763ee9182fadac4774ed3462ce68934a1eda3eb25f38cfa7ed2793ec12e8884a42980c348ac891ae3c68b73fc9b1d6c6182f37c
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.zip 50333 BLAKE2B fa30de36ac33b2458c10678bfcabde9fbfd011968739efe71b8e956f5cbfd36365a28895e481339f1ecc66aee6c5cfc657f1ccade544301326360af5325ed94b SHA512 d3e069286789b25a2de128cfc674ff299f3e7605e111e0b6b670e8b97ae9b6de2b1468c8f5391426b295a64ad5f807194bd1142558d8bcd06c2e86aca7544578
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod 446 BLAKE2B 50730422149ba32c04e4c1344feb09e0fca7b5edeba41e4b11134a2c5c4d80f222c216c92297b0fe61b8fc081ab9b493530d4498886a874553f24df8dea31bef SHA512 acfc9cad354c8ef9ccd01df7593edd4f025d6e32dafb096fcaf21d5de8af1cce9607bd413b2c31a400e94271136710294c5b943e32a76d4b3304c28b88173f42
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.10.mod 680 BLAKE2B e7ebd93182d889467a2f682ab2e18a90389f7f1204550de3e4558f7aaf1352752bcf0434a13f914c3728f4f4942044ef7120b33f8db80cbf739f4308eae4843f SHA512 ddefd09f774a8402fb7b6f083f72b31d613666916da4e8e9540530d361f9a66762a854a382516ce4507c4176e08c3b2718828cfd13f96f3c46787682b8b2da27
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.12.mod 679 BLAKE2B c69478da2c5fe33011bfa5ca34353b59b39854ad45f3dd786960ffe4f9d0ef9bb8dc4d54198a6cb6efe70cbaae80226914096883b31e78e049de10b693a53b9c SHA512 f4267714cfd2ddc18f3e1240d70727437f80bd35d5671f2d99469625273723b3c606811bd44790a3f6bd75b84954da537f0cfadf67ecfc13c91ac18d56fcf8ff
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.15.mod 433 BLAKE2B f0c6576fc8c0e3c57dcd48d2ce75ed40811c970800697711d49eeef85c0627c5994d7c49c05458992b56c4099d1e008b5049394a7a4b3a9a08dfd2166bd663b4 SHA512 df51a3fbd41ca491d53fd75271384805a451a623ea16ef3fefa32559616c1ef6fb2e5f463f6b0fd9a42b7d49955acd36b7ea3d35eefae88112b92df88e1e7cdb
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod 419 BLAKE2B 1d7e2f5a1658dea6016639a05385324b0769a07f563bb1414d560cd34d47dc64d6fab2445fefeddeecb8e70fc0703f7a174f1039a4f9948590053bfb4451b8a7 SHA512 4b81b994907ffdc0489ce9755fcb76c12b8c80a8c1f3e94a0fd628720fa8bd495b73eec430390151e417fa6d04e7784fe3eecf2efe59149f26f0da953f6598cb
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.3.mod 476 BLAKE2B db5aa659829341b0940b5477f5eb852ce67c67479d8e9f08f1cadfc0c89490251ab848c23a850304da454d8324882d3b3ce93803e35d853f61bd0bac6c6b71a5 SHA512 0e52d76fc58b5328169d62a16bcd30a10ea8d1c6b9cd3aafa7ab824e287b76923034c3ffe93d3dfa19f90ad8c127b46bc131852a4978198300075adbe31be37f
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod 616 BLAKE2B 195302c90abe853d5c39ecaa800355007bebe9eaad6c6a57e49d8a432d1d30440c213cf3b5e926f5264a65aa22a9cb59b58fcb72597fe38344e943a3ba8f89c4 SHA512 099f9d1770c55309210e8885d327a0c1299a429a5252335578009d415b56da4f30c1ab37049826f9a6a009a9a8003194c60a9837aa733e74578b43848b16c33e
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.zip 716454 BLAKE2B c283d142a94eb70e60f1490d2d1208f693dddc9c57c08f1041ea5e4de48de5c29138996cb0d3d5d6ae0d3c71927afc5f362bba183ed5691835e938909c6f3efa SHA512 87de5947c3d6f551a2b9e32ee398b26fe73029d61c37fd02f343a59e7dfb6c4d63e4a63db290b5f58d7392cec71df8b1279a1f9c021202769e33347447611306
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.1.mod 432 BLAKE2B da6b141cfdcadfbd35922e2290fb893abd1dd175a19501a8441bf38c919ea6d267d2323e397ca9175977d218e78ac5e514af5a7354a99afda32b0a289572df9c SHA512 c92b5ba188810e0abfa0463a31b76261befd60fb05ef4b0061125935855de68ce3fbe0678b4235d5b74acb6047fb8f1151767906f0b2ba84a9382908d2054fba
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.mod 495 BLAKE2B 97899166c18c99a00ef5860f55d7249597ebdded0c8d4b8bdc5e9ff3ff2a99788ea1e2a35bfce98a0d4dc2b0944d0a2119ebfc3ff01858db82f54f823b56e9cc SHA512 0f3d696b8936e49400bfd9932619f04b2564dc764829df202e58a4e48b40df6abd8c256e2b6c8e4f2b60ee29cad65f6038b29971252afcaac5b507db9a2c529d
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.zip 727824 BLAKE2B 360c2f322d1d4786666f5d82d0c08e23b4074dca4ae26414e61e4c6ce6510bf866e629dd6a7ae837aafa182d89dfe61c4bd78326bdab3a5fdbb425ca97450466 SHA512 49d0ab1036e1122dcb03c945bfaf3da0c3f607905bf12185bee6bf7385509e7e71484bc4a2d2e22fc05e72b378a14949a895c1b8e4f9e45ba8a1c2ca9ce6e5a5
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
+DIST github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod 148 BLAKE2B 8937f897a2766b1f4bcb20e5a25d72d987720a4858d18140868a8e0c5d625128d52c2a08376e34955f6869c620877d193163e00545312ee28000698b29576cb3 SHA512 d06d1db00a1d7e1a3c41410e101c80b3888ad5d271559817687a35b1ec130b98812c058cb151813292e249303a3d5cf527578428c3c8284bb0e4fdb075fe700c
+DIST github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod 35 BLAKE2B 60a83f9e36c829f2df2cecea9e8313d9164a0438215098b84580dda457488a3a77dd01b04925be7f449c641e304d8bf8ee31374cf98b21d48fae7b6d47f80d04 SHA512 abe9637868866cdf5270b0cdf68a0dd1100badf3eadbd17799fb51a94b7d850f55c326c30c2c477254e6c1056c01e5ed6b0a32c042f0306e2dfdcb16cf76d3b4
+DIST github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod 230 BLAKE2B 7559593fdd40706271ad62288cfd7a15619e36be5fdf178fd8a701abefe5afb63b1d414f89deb1dfe861aab0f41e607c784a29179e8c252c77911a115e05e43f SHA512 03e8b675d774baeb3f49136380757ad34e61a7f5eb9b2dde49f0e39de30ceae72698ab0aee7846bba36983d558157e05db0f4d09a4d2bc4d8eec006c29c5b2a8
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod 130 BLAKE2B 5ded6225f9bf41543f60e4224c3489ed745d0855fb17a7027efab5bc5e51a692c56bfb370010e063e6d640d2a8433a32e5d72cf35e51bde5e7e0b05114f8a21f SHA512 52492adce1facd2235caaf0d3c4f7aecf25cae21d1a87b051b418c2b056f1d81e6f49ff37a50c403223ad97ecbd88a5742ef41e5f59700703e216a3d471b10af
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod 78 BLAKE2B 445af2b56365266c2c008c57e619e33eb62db1037e680324765fb9c004eda7915d0e61b3d8ac8c37667e2469dad8193b2c45cd20e5c11e7fa9d325e66e728f72 SHA512 94a7ec2a36fa54c762ccc641dea5b73bea6d68eeb638a3073e7b4412b8c6ed098faeb467db3533ff23b0b196bf35fb719823f9a0ec4c5d5c93544dab99aaeb66
+DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod 78 BLAKE2B 445af2b56365266c2c008c57e619e33eb62db1037e680324765fb9c004eda7915d0e61b3d8ac8c37667e2469dad8193b2c45cd20e5c11e7fa9d325e66e728f72 SHA512 94a7ec2a36fa54c762ccc641dea5b73bea6d68eeb638a3073e7b4412b8c6ed098faeb467db3533ff23b0b196bf35fb719823f9a0ec4c5d5c93544dab99aaeb66
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod 34 BLAKE2B e9532be4fafcdfb516038f30c7b93ba537702a5833cbeb07b3d7eca560eeb308a5bf689b33332e4740acb9435aca9cdf66921fc55158fde696bd9a70ef65c4f6 SHA512 cabd1a4ec03cb48e0e239f2793f558881360b89fc8a178f4ba52c236474f21e820cb8cd74aab3acd89a09942a643a4fb0cf5bead59f46cbe8a1776c23823e637
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod 769 BLAKE2B 8ec4b44157eba530f29de853263be0196cfb60b42ff0cb79a521fb0e743d8c9a10ebe21690d4c9957f28abce7be19f6bd6200be807e782fc31ee4aee22f95847 SHA512 afe0813966422a1b074fb9d474674d1056ecdb1e70452466f37c3b309db83d36d3662d6507ae39635bfbd62d880e8e66761ddbac5b07682f29f9e9f4db6c6b14
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod 868 BLAKE2B 51eb3e1a0e9125b1c4af1d22c3a912830a835993ab3b91abb4795fcd38c8b124254a6f6d8465b2c37679c8652f556e78bf70d7a8c74ce74830b0231a9037f510 SHA512 d5aef9c8593dde4953907da95b47fb3c68e5b7b97dd45d41ba56beb7966ddcf2ef5e532d0f46ca5edd4f609c584e41cf62337385930e7509b680a532d1f1e442
+DIST github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod 888 BLAKE2B 57651d970b40132299103e1a2f86846d243ae8383b3c6dcc9b8dd1276f436db79fd43dd3cec161dedc1cb8a352ce1880d6a79e76a7b992d110cdc0ad9050d2f2 SHA512 c5e95c442b489c7e2bc04aff487b7da08ac6cc4ca133c9f23d00e4d89877fb103f5955a2b1ab0c5efbe0429ab09448390be3414377f40d558b55cb2cc31cbf21
+DIST github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod 35 BLAKE2B 4a75dc59561b6ad5a4914fbaec620dbb37c8097fa5ce5577d03df73dcb423d13b1229db1da1f428de0338a82c3f6f2be7b620072ba9ea9ac391b253c18ddfee5 SHA512 ed460e05ed530341bff610f4d2d72e67d61648c591a219f25cee365b0b874e7a9e9403cf9080f96632d06931409709fb2bd67220330c8ba921e6056e1bf86ac1
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod 34 BLAKE2B 040068387a0623c4b48854786b73ff75eaa13df0a8eaa1092f40f37cd3cc416bbab0c6eb75b2e807a0f88925e5167b98e6bac18a99d70c8df931e48e06e8571e SHA512 e72986700b9cf60852a736b1540a9b74c99b34af5519582d0a953bfa6aa3a4aa105bb73f250e856b6c3a3dbcf79c2ca81045ffefffd624850b0365890d0b10bf
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod 318 BLAKE2B d72d6ebf8f93cdcf4b2c9b7e6d3038e14a2506d8487b3074d8955e95b6db696934c7a74c08ddbddc1409c7126efa10200d42ec791b669da4204e5e64d5cb1e4d SHA512 f44072bb3cf44d9ad022e8ecabba525092318449f27b94e9d1575a96e752500b9aaa8b79e4af8dce365534c4e5e56accde07b3ac1bd22c32b08582f28c95787b
+DIST github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod 309 BLAKE2B c5165ba369dacb269419034c090cc0710bab36c2b7cb170de9e841f1ff4284c3b8d86e0c8ed9893cd50a42cf44301b1b963ef4a550e705b13b926548246a6456 SHA512 30480cfba42c831ce3e0a5d78aedb43f1ce88f8af43edd53c61c4ee311c27c7c5ad8defce05ace9cc29b3942797483c8f6c9db6b71afdeb3b8853cd4eec79b81
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod 35 BLAKE2B af76920cfe2eaf97b47a0c21b775e805a4257648af9d35f12814b4d7534734f24d83a881edc8f5e6951e72675fc769d6971708a7398f7f07715326026f29e926 SHA512 129509b3db5baea4bec598671363fc03d6af7f1b418f07a9ff48e9a4834e92515be742b7d5ea445423b5bf02908014df6c898ff40dd6d0bc3d6beb267ca99ef4
+DIST github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod 209 BLAKE2B b872565189be65ab8a0dfcba181a18371afeba4c2f5510edf1592595ee18fff5137c96f91a390bf76341f91f81790acc11154c95903adc7768cfaf5c7a312b38 SHA512 7db0b2946a16520b0eaaadef0a4334b3a3426d3c9f94c8ff18f0619e2b75559a92ff0289cf19d8fc5fc503678b2428b1e272127386f3a758f6b3e0b8f278a6e6
+DIST github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod 209 BLAKE2B b872565189be65ab8a0dfcba181a18371afeba4c2f5510edf1592595ee18fff5137c96f91a390bf76341f91f81790acc11154c95903adc7768cfaf5c7a312b38 SHA512 7db0b2946a16520b0eaaadef0a4334b3a3426d3c9f94c8ff18f0619e2b75559a92ff0289cf19d8fc5fc503678b2428b1e272127386f3a758f6b3e0b8f278a6e6
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod 176 BLAKE2B b56b780594926fbf5c5cd71f4e56ed2405e62ae620468c563a9309bafca35962dbad39e49ed199e5569ef9afca4a3a78be1d2e502f8c9e312b2e6223e2111879 SHA512 d6cee8b8666cb35d0806456799dd91692fd25f09b4e44fa67feb1fd20c425205bb195f068f28631347ae2adf2d0b1603e3a9d61cbf7d5945722b4ac1abb173ba
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod 176 BLAKE2B b56b780594926fbf5c5cd71f4e56ed2405e62ae620468c563a9309bafca35962dbad39e49ed199e5569ef9afca4a3a78be1d2e502f8c9e312b2e6223e2111879 SHA512 d6cee8b8666cb35d0806456799dd91692fd25f09b4e44fa67feb1fd20c425205bb195f068f28631347ae2adf2d0b1603e3a9d61cbf7d5945722b4ac1abb173ba
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod 899 BLAKE2B afc5ad3cbf7c93354e7e85b90fd91410cf9086148f8a9e0e394acd08d1c680973a72f7a313759cd56c71c10e245ce04adb25e869976ca1fcd584e2fe4c672d2c SHA512 463dc53ec72b0dbeccbbaab43249a9f21eb00157f0306a0b253a55ff67070abfeca23b18084192408e09589c5eca2c3338b0a346cf7ff0c28527ad16d7cbd5bd
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod 752 BLAKE2B 45ddce0b2f5a32cfa6cc2137a41b47c9278314348c3afbf1754048e8ef05f6958cf24c28ca9e9c23d5c2c5135457b06eeb6e0cba3081111dd9c86507bcf296c0 SHA512 47bdc60efd108ad1335f7da69dd774adfb4f542f2f9978df69660520a715edb285c30453c678657f01169ecff23feb760a534b46db88e1ed83171c5c5def1a2d
+DIST github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod 180 BLAKE2B 3b1bdaa97b34b89903a4d9375a581a5318f75635f04b1e2c4f4a927b8a5cae4638a6cb55ecbf6908a18d04fd77177286952153e2fb73ddcdc22a9d1e6bfb8776 SHA512 cecafca4c0b08807902f0fbe560252fbd7901a258c57c374939013ca857e0082fa7af5b95bfd72625a10a441d169cc1728342754d6e0e924867d4dc120d6a43e
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.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%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod 34 BLAKE2B 55487f18e815e30ee3653a5dcc9370d2cf044641f7cf12c566e165fa173efe9af3ab18fed752dc36ee0fa25ae2e81a5094e18cebaa61d997ae599b9cc3d09bf1 SHA512 a34e950c565fa284163c40712c9f5e53881996c85153f972a78f27a5cdcaebfdbcce60556e173bbef2db32939f1b8721325846b705ef1504a1c5680598343b10
+DIST github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod 38 BLAKE2B 3dd22c8b8c82e80965988cbaf0b8241af2d32273ae0bffc30f3da0522a327ea65f2f93a0496558551f2799ac7fa4cb8f103d80de25ec8def97ba34578bdbce77 SHA512 d7a817fa0adf48e773c941af6f6207d87204e153ddec86cc4bdc9508411fcec5179b4bcd6bdeaacf5512d50afc5f4ae4f5f25354acbd665698e6110ed4e400fe
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.zip 79281 BLAKE2B 6b93c61a88217e741d528fec2b72b9ceef9ba4b46b7632e614dcbbd6ab2d9401dd9dc15452d2e241bdb0cf4f4727222a5de2364c6b4e612ebb98f37af8771551 SHA512 ab3279b64f02783ddba1b506a538eff97a97634bd8ae4ae61a508c98adc2accc9541d336508eb60d4bd6e8e18a5a335b384074378fd30c29ef6892ca242f9e8b
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod 37 BLAKE2B 9355e4909ed1e7ea43b9882cdfffdc9c986b9a8febd22659143b53f05b4c7a9b152e01848cacaef750ce4fd7660dbb62ea3e0fec4bc2abb47dfeb566248df33d SHA512 9d10e0f8380c49034398df4cf8c9500a0e1091001f08b9574da6933b861210dc4d518c7e353570618c4d4c432c0162e8fab4b4acd64a2d5360efe456fed4881c
+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.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210208152844-1612e9be7af6.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210208152844-1612e9be7af6.zip 1839038 BLAKE2B db32030ba19ea87bafadf2f5f01a560e79493fd999058b8271299ee1401cef3d48274c4430e84b27d7af687f98d6c52cea74bdaffc9aa51cb36736b5d08c80ce SHA512 77f1d5613ae704959b3d3e4f34a774c51482ae8c9fc184f8172d6b22caeacaaf217a075e61f9324efa20adac0b674289d6ce2b6169bfc4d4d156db5241151b68
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc528386a19bdc3396a6deccf4872ca8d20484291c279b7c93bec50af19c31d6b41e37ff9144085af7e267ff63490bca1f2524c52a52e28c645f SHA512 b4c3f39d7ef5d42eb89e78e7924cc6edcb682062bb0a96295742359089fddf2806557877bb8ad609ee9c53ecf9d0fce15d0c8366d193ae89a979f834bec64ed1
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod 278 BLAKE2B ddb0dfbc6706088c465077c061562538e66dd414033408a92d7a967fb4382f10ee4926bad97508e4106b9ee341bb7417337630ca006726fe79f3be7ae12a2953 SHA512 3a36f6a3ad1c6dd306291520ed836c77a58390fa21fb6777bc3158df18cb254096b0eecc791947e7815098e020f260a4914bbffdacb53407582f9cf2e908b7a2
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip 467713 BLAKE2B 3b48332c43aa3e7e9196503297acbf3cf02b29305eb1f54f459e456f6e1de7851034ebbf15fe22917824208a98aa2435132cf4fa7d89cfb1aa0fa6c8c7f6db62 SHA512 041514fe7007b305fa8a67c4c937560f7c173429bd4ba98baf7512d213b4a917608725d6d6761f7c5bdbecef5ced189a0a05d9c1d4199b54ee523903717f94ea
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.15.0.mod 317 BLAKE2B 163cddb198a6a76aac9382fba277fb28cc785e508ff8c2bf92a2b3beaca28448be980136c137595e68b0d0ebd4d94b4b360614ddcd58a71dbf3bc65615eecd2e SHA512 a22ba4fb52d5c4f67711a6b3d43464e2c9f62fb9a8741a235b2d92c64c561cfffb1a52b4727a4b42d5d11e75435f58848ba42e286b3a4002cb7ca681a406548c
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.15.0.zip 1988927 BLAKE2B ccaad20c1e6725cbd4b40793a039cfbe7f37fa94ff439979c750663098da0c56967076119492c9f6db97ab7c21ec84b620fda2d8a3016175909a40f0bd0bd344 SHA512 cb764e7c07ece54374f59f989ecd1429a39b00c469c2f954da2dd40d5820d839425ba3dae0ac65c62b018b1c2ebf938ad474f202db287413c12f77c383412988
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip 685854 BLAKE2B 2de9f99bde4593ee24aeb819c12df9fe950a62e7e78428dfc18051012c5c3dd791da1e157a1e2f8c5f9367f2ba404ae8e5132071c1ab3bda1ce70cd1aab391de SHA512 0d0ee621079056418847820d55f794befc0eda9a9e569c06c9f099887e680be31683943dd4aa25813caff89e0e573c6d2ed3b27ee7c99cfaa381c34c0d1c1edc
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.mod 424 BLAKE2B 9e0bbb86c2fd0f5ff214d3b041587bf7e18f571add9745063306ddd6a52a85b7ab2d2061352153133c27b3d03b4dad2677e1dbb35fcd2a7642cebf1a78b3d500 SHA512 04b33da69befb972a2c28da406a6a1dd1b7414ebd35569e81f72af14f146307f4e0489daef720af78100e2c2c002bd511944f26948827b0ce9dd1a51c8d5c62d
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.zip 160400 BLAKE2B 47fd40e8f22c85829b05f1f9b19a4607d80eb3a6833a881a36c74d66ba666b4e06c56cd8dafdb8a1a939c873a6abdccf9d3e59f35f8336941848f9af383f59b6 SHA512 217d5be7184331c6a6647ed4ca3b868268d29b873e236b0ff59bdad451af1e4352ac39e63f3555c16380e1e650912956ac4f39c6a01422c6b7f92c010f43e802
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.zip 32856 BLAKE2B 4cf2ce44532be7493e9c73e4367793e3fb3c241b80da473ad67b2780d93f6261d2863fd71532de76f930d9e11d6e71e019e0fb6865405330ac9d957dbc785dd5 SHA512 2ccf46578accf867012c1d72c2cf074e1d88d2540ad7bf8917407445709accbcf8e320bbf6c8e7861f169e88c32a5d8421b5cb0e767b7804560ba596dc9fe01e
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip 62565 BLAKE2B 81458eb1985472e46b2db22532790ea707b1c1fdd55a26df8cd371966a8ce672d35aaee79dc1984f3ed7c2ffc6d303c1c0132f7ca28487fbb379ef6e70cf34eb SHA512 4e898272a286e7abd48722e31c8f256cefb377d22bb8fba47db0bdd8d0a871659cfe1589d0d0254d7bee4ac9aa4edd5ced714546a5710e6dfc66d1f961e0f12d
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.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-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.23.1.mod 91 BLAKE2B cec1064cee0f15bd43ac844854db3d635e547a05e0da9d5274c6424ff0fddfea29d980429c60d10be380e2a7bdb4c4e9ac7dfcf3a575644f18fade8172cc4e33 SHA512 b14a6aa71dd23306cc572cc82a7bb974039f6a20306af756ce4e4dc1803646ac4a449fb61fe34f6aae65cccf17f0f15f5e6da74ab097957303d126a0ac304e8d
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.23.1.zip 117345 BLAKE2B 1b649d3d29b81192987851654b64dcefec80bc9d6e493900b9a20c85e28e68a3120c7a33d8f2a5c4cceb3143148865c3838d191dea63d9b61ff26b93eb679a9f SHA512 61c250a7a37e08d5384c7b60caab72fec738dae8b1edff94bbb2c408a3739689752b4bbfd222d29e659df48c2907046191d0bf940a6c09d79b9057640513c214
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.zip 59110 BLAKE2B 9209419562e983f7c24938065b8522e281fc54b68197df5647b7858e4da017445dfa489bde8eec52dc5293e9b2475f6726df1d4959d8e5189610cfe00e752f27 SHA512 4c9b7051d50831e3f7caf018f501c7a4344ca917b58167fd159c298b09e3cb03320227e9bcd5e21736a26b70ce28521cc5fae3ad9b8b9afbb82097ff63781e5e
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.1.mod 2172 BLAKE2B d6e003af4680c7a44e6ab883051a17d17adf0a6a47e734203c4e577c8a3b0164d138e5267c99a73ea5825ea36b413a129681dee3a6957c0c304eaa0edf5b9051 SHA512 c64e72f8cf7b727c805c155b9a2725a3eda7d1533a9beb1c95223f1806a41d175c27673cac46005dd6484f9f76737e6b78e0c9b919271cb17330ada932d81a76
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.mod 2501 BLAKE2B fe5d21bacafd322b0cb8b2e4fbde2c82f4b5bc632080ef52c6bc88813844cf4193eb4be52f2a31061cd5180b3902baa24d6506f0108cb8fd9de9a689dbd6b422 SHA512 1d8f08e9678522dff4f47189b76010cac23f2906b021e7394b5b4ca771f5adbe040b14cb33b794e0229ab80d5070c06c5ac1b1356b0995e566572f058ce5971a
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.zip 12508400 BLAKE2B 9317c20a200dbbea4c2173756fcbd086fa21ff2db1d466530f239b13c3f4d06f28f0f8fedd0d43b17eed19d20d6c593f6f4ab7d6b4dcd89da5ba7547120f9cd3 SHA512 294743ae5358bda4dbe47de11b63fb974255570ad6d5f5b76a4429b6015af44d91835c6d9a15a8334a938d9d2b5f0e4ef19890e345ed498ce4eb2637f3086b0b
+DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
+DIST github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20200828144457-65d3ef77d385.mod 88 BLAKE2B 33663dfe72c785654946bb76bb663eb3335275d778be681c7c9a653321ba5ca446fb3580b073dc9519578c45eff3728784e2077dd7697ff8923efde17512594c SHA512 e38a910673c951623a2b5d0a2855843fee0b78ccbc547bf8943493f036ae8a1ffc76b42474de9a25755de688d060a8d1be648f0fe81d7a69c831a01b5956ab10
+DIST github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod 43 BLAKE2B fddec34812812262b5b2e9499391dbad71c00fb2546658d031306189207c366ba5f9863735c4a52c09b838f2b052feda55bc8f9e424447905725079f7877ef49 SHA512 f40bb2ea09705727ab3be3b8598b471e32dbcf5a67e64580faae7ac80f8b8504964a30b8d84cdedafcb47577bbe021e73127a2053ce04340c27c00726572edd8
+DIST github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod 198 BLAKE2B e0abd56792debdf075818269c29a5928ea182b7e10792a2bce20f217db64b3922608067c6eb4a87a88c981c44478ea9e2ee3831905c724b103f98170718db37a SHA512 3cc83aabd3742a8dd775077f4c71055ba6a7949a7730af7da6df9e92bfdd7688c02b8c6f0df3f51b22f84a6defeb79040a6f1e9b78becb680358fdefd3e7528a
+DIST github.com%2Finfluxdata%2Froaring%2F@v%2Fv0.4.13-0.20180809181101-fc520f41fab6.mod 37 BLAKE2B ccb5fc7cf2c1564b9f5f0c9559d1aa34913d6c6d38b256d88fecd346b0a12532302585d13ffd00ace8e55d100fbd4cc468ff6e4163b45e352340ee5ae75c3580 SHA512 d56f2a532b077f1321c2e462db1a6091c5b272948b3cd2a272369a30539cb284a35bdc8a3bce39ce86808c81275d31e79cc9b0e61e42c0a2238f499c247755f7
+DIST github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod 259 BLAKE2B 4d4f1556bda08820db792730d893a735a856c824073e1b66f8b9a06e2512187038e4ae5f465d1f9b1e4e074c69722d5003917cf40dd6a0f61e0a32697a99c2fc SHA512 76e847d693e7e785e04ffeef5b48db94ff1a8a317a4037710522b596adf01e30c4b4a38e5e4b8040db55a5b1b3a68911fcb8b1e646473863c6644adfe5cf9759
+DIST github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.mod 42 BLAKE2B a4aee4aad699064a4fe353531afb259439d8b83aea1ef68037faeabffaa4eb5e74b8d8dc85a34e67c068e166510695da32711906ff7a4a99cd3bfe572d4d83ad SHA512 58805194d2ba4f084b920a808d036aeaf794ef9df76e5a251bdd0ec073b02dedcf1a9c78bb9022fc4b1cd3c1b89215464de81ae8ae6415baa0aedde273867d01
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip 94054 BLAKE2B 33e25f87bb306decf63ba4d67e841b59b5fe1410ab5a75829f5f33f396b74335d28876bd0c3deba8edd37e7d5f938ec3fafc3982dea464958fd0d34f419bfafb SHA512 297e929f6acaed88fa197463d38b50725f8f3d953faf813da2c1aba2e179191cc1863e3b0910159d419c842eb319268985aaba4ed4486d5ef9b9c4173e02fcb6
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod 43 BLAKE2B 90d71b886a5077e501d659ca78215cd02aea7e24432a1e174045cb7da6235d45c6e32c81b517bf534e40e36361a1ad3998f415f3975b3f73778d7f8201915725 SHA512 ea2a15e05d84d7a0e86e1ecf62eb07c0baab34a8248f59114545cedc80af8146e529557047e5ffa4ce8e5e4bd2e9b2c282f8f2df929f8da5f72ba9aa8156bde9
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip 2648 BLAKE2B 169a81d606f15df5f98f6ad2ff418bade31be9c6b78ea790a18bf404653f47f69d2ae067315c735e52da5212459975dc9297e6c03cd1d53e4b3a4b3b25b51c2c SHA512 5343e0a259d658899f8eb93035f9677e96f559726ecadb284271ee60e171666ce8c824182cb5d08b3626eb1d539c381c33f6944ade735210ade30158b028c1d9
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip 4359 BLAKE2B 4c85e5d2de711987feacb8cc322135e1ac899c3106f5976d8e397b6b7c6bd10490abd144a0e2429139156b51ddc395cb09bee4d257047062053c9ffa4f57b29e SHA512 d5a90394b45dd5179f285a7c6696277e3624c4011dd7ee9818c6a0a03657162bc1bdbd1a6540d167084a74b06b846fa33926f658017257a52839a01c5dea34ca
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
+DIST github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod 40 BLAKE2B b72c62e0cbfca034aaa00d7c23e4ae2e2d1cec4c259f9d1ab96c65b7e3336e050087815a7c8d47c87f5c04983d77f7e10d8dcfa22c74aacde1bbaa8830880f90 SHA512 bab26ae4f895940fbb77346904916a7b8098f580ada97021dae11d9d6a4ab14168f57c3ebb25364bd35baf64955f115b9e431c4f68ddfaa96bb478fe9b59a5d8
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip 28212 BLAKE2B b1c235da19a684201cbc55cc8ccf5294a840e27ee3395b59b730c274e199437ec1042c816141b0701f4284ecfda946d790861e8a698100b1be78bdcae0e1ea39 SHA512 c6f9a9e98c8916fc767fcabdd0854da6c9f993c64511806d46f42d1c932f8dd00d25c1d08b5a0d45d1ad6df96e16391f7d8e987e5b7bbb64262ed410412fc6c5
+DIST github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod 35 BLAKE2B c1b6f3da9b37c5e0888f6ae304f7885901fb5f90bd94de7c980b7089d2477ea25f0fecf30b502f55fdb6a8dd7ba49683f33b89d761de0acd0e9ccbeff53a183b SHA512 824e0e8c8fe3985feb5f25c43725d4ff70f577373406b08767795e691f0bb10594dcbba4149e000bcebaf231bca5f72649c0d078b86cd4df38d0805e1939d63c
+DIST github.com%2Fjwilder%2Fencoding%2F@v%2Fv0.0.0-20170811194829-b4e1701a28ef.mod 35 BLAKE2B f0ddeabc9200613978b0b4b128326d7af4b21dc542e54e12aee41b36443d0a896dde046adb0c00c7e8adefa91cd296330bf24fc8d2cb322bf2225348ce60a36d SHA512 a06f88a90f2bd8618dd8a2236f1b54d85cbc8a3efbed21d4a3246398eb74f1baf3da40fde8d452441fc45a2fe78abe82d330f28d1a39a9224d0b5c606acfce8b
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod 45 BLAKE2B db48945fed4cb850f178e9dcdd0247e47c4cd349b17102d16ec289d353494c44015166cc7ad977b33367a8eca2bf9ab10728523364b31bec8f766e4a5e6948c7 SHA512 2ed2271c324cc5d92b021d64084d5113ac4e3a1723ee74dd28e478d180d4a341f53ee7b0435e53b5ad95b45c0a79e3417f042722deb0b56f492589bb6631c763
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod 36 BLAKE2B 473d06ea15a3992475608d6b784ae45908e77494d007d63599aafebf49b54abe9068bc58b581bf1be6a686c679048ef5c9ac127b4c00aefe9b65328dcce8b3b3 SHA512 0e4f2430ce02a71bce1b8ac38df95b86332db955a8e7d9d59d59c094c5003adf8af5a3073e350fdd06ac06ae9d8a1a30b4d8b2c8f84e2a5c5e9c720bd0727fd4
+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.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20170728055534-ae7887de9fa5.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcrc32%2F@v%2Fv0.0.0-20161016154125-cb6bfca970f6.mod 34 BLAKE2B de38b76cc80d4772016edec60ac6de4a290b1083a1979630a8aeeb2d6e7ad0c5e92ad3c25e1a47b6a540f106cd66a39a5057f3acc0f39ec16ca0c1a23691bb9c SHA512 97259895cac5090158a564861a3e58ff60728471fa5f0cc5225588cc5072dec813433942e39ef3fef99a00fe1b3147814e76789501c45d1f56f30403151399d0
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.0.2-0.20170402124221-0bf5dcad4ada.mod 34 BLAKE2B 9a841f2f76972fa5d9b89395c421d1b4addf03a137703bc8f5296a2071a3db169c993468489e59ae3eb51c4668c1eac2a8dd27b742c5af923d379dfd0651e826 SHA512 cd08026364570f1acaca890fe4929ca5bafe90b4088f764a077952ce4b52e8d92a8a09e4bf264abd209a161ed47d9b6f572ebd904af2025da3696dbf79b63d5c
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
+DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
+DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip 71751 BLAKE2B 828d4e00e138f755724170e8e13c8cc95b31d1701fee5903d54f54af0b6553427e5ea0b0ee39f2a078f6827bac43ba7245d6f6be13ef785df82807f854928fed SHA512 c8e29e95279ff183f5a3a4df25494349cac032ba191398809bf41aff746cb5a1f661e20659a257ae85bb58366b355287fbcb58798ceba0afa8991f6a729deb1a
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod 87 BLAKE2B e7fdaaee7d16d457c5ff45af261e8dcd7568a105658dd9dbdb61bd62dea3d63456f9e0e7be2bedeefebcce910d9c0734416ea4bbc2a0bbb0e43344aadb8917cc SHA512 b27ca99790b63631bff904271ec74c9d641e05e16455679904b85dbd1800a67c4439cb5ee3da89c40ee51acf8151141881fa7e704d451ea6ee8e62aac84b0ec0
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip 84387 BLAKE2B bf57eb15f428e44e24525c817738460e2473a94d9c4184f74427492f3cc65fd14b3b8c90c08669868d853115a7a44b123cc31267fa4a4dfaf2133cda1099c341 SHA512 eeecc4714e4ca23cb41b01660043caaf9f76ff0beacb99d03372506d19ea97721aa627743040639998421099413498cb5c7b613b7edde39c8e00940f664ade2a
+DIST github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod 180 BLAKE2B d2cb50ad2f7d1b54d60824d1dca3adc50969d91c448e932608554c1102ac3ba968aae92ee1f621c71548d2788be579b8296d5e1813879e52d7a3cd7c3dc382e4 SHA512 8799f1a1a2bbe0548bbb0777e40ce85367fb538385b0c9abae42890c7cc3275b84c58ca461f0dfe6ef58b04b2fc18e573de75903372b81e01ed4b90eb89f97f1
+DIST github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod 179 BLAKE2B de910385e475042370cba96867c04c984420d69427c8d0b8e3784e9263869e463decd856ca914dcfdd85c2977570da2ed59bf5f17c41b6320a4dc5e878388db5 SHA512 4700d6bf62086de6dc5b257b855d20770779aa3b6de37f237e608b3b130e588ac08c035c00636876e38bdcf2637fc84f2547ec9eb9a9de1168781c6225dedc37
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod 31 BLAKE2B 01ec123858a9bf8d2e9b6b2bb8415431e5d4145cf3ce82c16522eaad6f5bcb7667e391ddc4544a3ee04a8dc9dbf3fbdfb74173da09f3a330952bb5eedbbe203e SHA512 8c099ef777c49b02a62031dbe9d4fdb18839f4b2265802ac5fc3e6c6fd1d3278dbd3bc01e8674a0b52d2d6e6a394d1d4ef7bd64f4388c68e9b81749a4228773e
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.zip 235434 BLAKE2B ce765ccec0742b9d50e9da0dff400535d8b107f1702f112107b2fd84c64b3a7b291d7bf9631bee068dec8fbb995176bcbeed8bda8928385728e9357bda8774a4 SHA512 d3abeda260cca73924bc7db32089e72b5663feef5c92fccef6379975bcbf0bcfe2f7e06d54a8d5bafa7b40474ed4aa2f60bbe76e11299fc075708da0d7cf9bbd
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip 32972 BLAKE2B ead9d8ce8dcd35159742d9a8ccfa06acf36a4f993a36b45dbbb9fd99bcc28be32401ff7ae30b545337cdb6a5a15c4765c61f4d129eec96e4646c132ec85507fe SHA512 d846320bf53383a66d0e1604075a25ffacea41fe12452ab2dc5a9b16365b6cb5595ac4cb53e8e8047a9d7cf86af79b997ed8573c125afbf59b06be8f28d6a13b
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod 298 BLAKE2B a0b5363a0969c283250c05505cb09191943d095ecd42fb8eef6694abc77ca4721aeaa5534a6c1b3a23224fa668ff206958a1900cb3dba36cec73f07c95598ac2 SHA512 3c9e90bf64ca3dc8d4e16c56e6ee0d1f41fc0bb1350ab6242d8f0908b01a90fa61e849a63e79ecb282ef0cb9f7593daf7307f922c92badc365822a1b9512f9fe
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip 22571 BLAKE2B 129cb205745d7f839899afff88380c24592f975867f5f5d0cb2d05479bbb1fd4168f8fed381575f3ac7a724d816ea69804886c0057eec05cb74a3869c4c406f8 SHA512 55e04111a7b17ea5d0b99dac9c0d30b0449021c94c0c314322f64d0884b6ddadf6703f244636113b601643006c3b1e2faddf1c70092dac1ca7a1614d60c0c38e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+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%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
+DIST github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.mod 31 BLAKE2B bed30df7f6ef3446cc884987b8529c2201f1d0fe4a855fd198c73ad47b293a7d66136abb092d2462a73ddca30baaab574376825019b47198d961a840d4d6b07a SHA512 6a9c039028a543ecef585f043beff78d099ab0890e0e3471cbda4cdc40db4f433f9b2aa6c5ea185f8a7dfe70546b69b415def4c0785691fac0bdd067ed65a186
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip 24595 BLAKE2B a9ba2118db74998db672087e350798e08c4d73fb42a2ed6f7e1b29ba29c5170cd3e5a712b89db4e1b4f1989c8212c01f9b5eb9cc76b7203ebaa396f2c7d77464 SHA512 d45ed6d06801cecef8d85eb1068db9e5c4d48fa750c67668f13284a6bf9101ce819a38146739c7d3a18bebf5fdada52a2b75ca71b678a6490bc0c0c8648d6c68
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+DIST github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.mod 37 BLAKE2B dd93bce7a80e10964244df869646972545e4578085a29ef5bb86f79691fe8166f05b04679019240ff20964c8e4fb4bd556f065baef08258cec64769eb1a378af SHA512 c336b1742766e6243c28942fc156df1c252a9e6be3294608cf02373185a31343c21268774f4d84f3a9d45e96ec52f8844a14a14aaf2e0ab9775798318cb052f1
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.zip 9834 BLAKE2B 13ccef1f19b521774349115a6f7c3cb3bf0b89eb81b1f00c863475da51a3b6be58f3f3f6be3a5e3a5db9b71f4fa1e96b1f98ac4ba5c294c954f4df1009b54a84 SHA512 579633bc8fc808d46c8a552291579b740428a6c772f1687b6afc4ff75478b271780a0cc3f8f450a2bb36f9d682f4d57f0cbd998b2dac59515ae12c1a2bcfaa0e
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
+DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod 52 BLAKE2B 451e6b2dce76ac1525c48f536a0f9fc9ae773978ca7b9356bd75473e075877d0127217cbb5695f1fe406295c02a7a9d5424f2f7d4520505d0119834c11645785 SHA512 708918e1cabb5710f63858f35ef5bb197666b2ab8220ee48b47575b77805e44b083dc7577ad3bcf9414fd801653c21be9582086ca73fbd9c5589380a7450a400
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip 34573 BLAKE2B 156844533eaaa6410ac116ec0bddc68ac155aebafc017c51e6fdbfe0425a02dc878e8515795e9300b6ddeef776aafabb60ad0c420a1acb9b0fbcfa1fc0f84905 SHA512 be04251b483e39b4cf503ee442344d3ac1eabcc7c41acb56c25d65ee35eea414f798f159fc168ecf5594b15b9d5349c96cb9741a6c5202cab4bfeb104353a9a1
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.3-0.20180606204148-bd9c31933947.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod 98 BLAKE2B c02a87e814d1c714464668cb563452e38abdf990ce032deeb5f7d5a7aa4975a6836943318cf7ec829d26c702811ec7fcee6c6c27ac3056722926dacc5b12e19f SHA512 00dbc2834d06b7c97a79f10cc59c588f37bf8f59658a2fcb16fc773507077d09426563028c247eff9bf2b5b849af8b0d12af45f9cae0b400263e9b49b868b56b
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip 49529 BLAKE2B 2d53d01d52d4e08323b8d59b8425a5ea43e47d44fb2872c69da6473b33b39f7303d464cfe100e9d441b1767185f875d8c6d3dd183c5f9b0523192efce6a81bd7 SHA512 37bccafecc500372653d1dfd7b03448242399cbce9cf21ef0b34831672332b2272b143ade48346b7d1914d017ce94957ccf53b96daf9a110a3f05a5929e0ad73
+DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.mod 116 BLAKE2B 684eed32a11a2cb5efa528a8daccd8506aabd72b2d924d07e1f8547fbee326dbe1e6d08f22695d5938950ffc63c5549da532434bce3b7f59300d953aa65954b7 SHA512 abb662e11ca6339a327299a8d8b77dd771ea540e2a9cc55df92794a3eefdead33c4ce0f18cbed1185e5042e8bfba93d3d9d1eca60cd2c49e90acaa6a957edf84
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.zip 18848 BLAKE2B d08f6d7558679710a913d6dc3ac3829f29b0e1359f0efa6dd4dbdcd547e95eb2d86d4058da50f0086729bad4f153c3c1668e0499800c729105a575323f5bd957 SHA512 6f922339f80d78ac09f5a3ab0f8b84e6cea660a256b6c63b441b15154dfab5b779496ec3b66c038d251a4efe11bc5dac657fb2b06b34d3600fd9aec012a6328f
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
+DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
+DIST github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod 42 BLAKE2B f21a13c6a193574ad2c00817bd5ca777ed141f6128748e7536c9b209bfb88c3df66ad37948902bc905c1d75fecd43afd21877c379498dd52c95a83c63f7c17ee SHA512 33c99b140d2377785d09c2d510766936deb7d67fea5919d4d5d350d7021db27cb776b3587582e65d5c44d97b96280c4e24b13deb2210628953e6c08daaf07b2a
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.4.0.mod 153 BLAKE2B 7c79be25b5525550b75f64f8a73f68561fa21d30f71f069aab552807a7147863481ffa3003dce34e06832e2de9328411e1df95603232bb4648b50efc53ff81e0 SHA512 7db697befa192a2fab9e0bfa4f4af163e9bc71fe2b695e6b611e84066a03f02a6cf81003456a0178d176138ac43887b14f2ca9f6e9b9ceb62364b62ce0c435cc
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod 153 BLAKE2B fa07893d430b69f49991bed1bccdca11e9bc2d2c92303570601a05dec04155b52ea9a74ab58af54944f158a837aba650fb48a131845001e44035adea7122fcc7 SHA512 9e36fa7f42a0d5660cad8949f47b31a3b0361a40cde7f531fc26438de521ff64f9a7a3b0b77215ec1a4a93a7f6f283c28f9b16ed9ff1b8a049efd66c2a1a6e9c
+DIST github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod 43 BLAKE2B 22517b91de93a0e72290dc3599ff8b4fd4fe2807e175e3778c0cb6977db6c02857b9a331e2e07b21851fbf35eefaadb2e05f36c2bda3c2381f22e23d4f24b89e SHA512 b2a58daf4ac906cb34db04bd3815766a74ff25c40c4f4b70edbefac0d3368f1a26ccbff3a5ea910c399ecad0213a2eecca174827caeabe3027e0c99fce53bb23
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod 31 BLAKE2B 7d0579fb1469d76d519c6c5257b978dc5d34f568b26a4a0e21112affe84cc42cc894a48123f4c6da1d2132d34e9088849e38403b260e772d4f690163e196d186 SHA512 157d394ce35054f717ec2f03c677592d0a56586171489111c3904c734ff0170d34559015a16f9172b84b389f1d2a7d40b2647a94657edd350dedbafae8bbac98
+DIST github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod 32 BLAKE2B 400d176245ffce370598e46c8fd88ac601298451d873a65c290009413570ed38f3c5be35fe800e95d1c23b894c9e8c1cc787ac54dc5c6b7e2d11c2f1ebd031dc SHA512 75eb2b85e2900d2e0a492e281f2b9f8b88a6b480478bc38e33b8d957ed2b65be5835f03dc8bf0903e80ddb5af268db410ce9db9a1569bc25e50523f74878fbeb
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
+DIST github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20180730021639-bffc007b7fd5.mod 27 BLAKE2B c44820090e3e6b67eb062638dd9251af75ef1262a034430d43ee34024051c45bfd596f258ba3f9238f1a8f25374fb55ab3840503310e1f97e6e6e5c98ea0725c SHA512 5b8d46571cfdd120c406dd6d48a943d4484053ddf05edd078529c3f927b4acfa1bf15c775e1adf9eddef260673fd6c591541fa1d781310017e421a9f164dd9ca
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
+DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.mod 1343 BLAKE2B 2540b17e15516606ac7820a22932c9bc5d70ed1f23e8fb0712b03b63dbe04882e3f72825686974ff5172ceff342a633e4db28530ec07cacda4570cecba2c5b4f SHA512 a4dec3ab1d33f07c9be6d65ad12f7a62e68df3beb3cccb680d290feb792b9ca8a42aec5bd629c22541a64ec9e80f1f988ba7f0704821d65e6dd693df396bccdc
+DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.zip 2251637 BLAKE2B dd402253932683999a41353c86cdc0dbcb22c3da5476bd845760d9783537bde88b20efcc47233e4bc82bc4cd5995fdde0724b2d32b0f00df38337247d097559d SHA512 8278e072c3ae064ab2a11f734527dbdbfba444a04aa7faa37d1fdb218bc4d39cacbc6983e7aa5dff894d353225c36d749cb73848021e1ac66c4bbb04beae6a04
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.6.0.mod 568 BLAKE2B b9afafc90713d607700297bf306b19e65ab9e250e4dd8c4cb437fabdc08fe1f7551e334245950107a6f52eb2c0db5ee62967efdb9037c89a49b102737614efef SHA512 3c53048eb63a00ce6a692d95f285790f7eca72e554262acfbaf8a30122efbc9767bc09abf3d6c16acea65c81e4a94c862fb8b627135711d92f89566cdec67d8c
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod 377 BLAKE2B 51ba08b9e8ab65c350bc60bf337cf786426ad6e51d2548f5358622b41608b7cec408d264ef87810da60f9ef0a7e6ca972cf048d0d5c1fb5df748f0e342d75cc6 SHA512 f325dde1f371b028a8f9e3a1464e8f90982aca72a9c262a3eab8edf752110fb1fbca55650ac48e7575a5e5ba98b371df47f2178ede11faeaafd68b0d27515641
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip 244293 BLAKE2B fe666ceb014052fd0aac0a092300eceec2a78a0c943e4b4890df6af74aae1c2f9134f4495374f0659d3f044b558fd5712d37decd37a542ea1e86ee847b09ff51 SHA512 136e3f1d2cd66a1d9acc5485f3838fc3ae8a201e448c5e8545dbe8f4ec22f59a19cb17d61ca978bce7f980996779ececdd04a72920e06a491e3e5e3e1bf5fbcd
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip 179538 BLAKE2B 63f0b8db91a63eeeeaca059ca5ab286c061ce89622af0a4083e1ba2456a09541eb01ca01c62d0f2c7f5e2fd6f35ce464443cfc787ccad3389099f508310f4f6f SHA512 5e715eb1efd6d64f6af867ec8c5171bbdca42881f6753e50390f59b6e68dda58976298e010ee1af178f116732f4fcea096f19d67eaf882120bd77f9290974f52
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod 287 BLAKE2B 21f5e5b0f556844005234fb29f985a67de41a5344b0155e1bae329fd9d11412ef5cae6702b8d034bb7ab8d1c3f81ead7da62469a64814a3c4bfbca5dfa28ca6a SHA512 49ed1469c453e6ea78576c51424bee1f456705d7a2ab167d250364813c44eae39fb51e8fd0aa7418a585a48762d9e2c4afbc9119ebb76b781943dc1723ddfafc
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 70154 BLAKE2B 70e3dc90ebec9462de8c05e1243bfa5754c1ffe421b5380e75ddef5109396453aeb18a107de3a03c1fc2f23243ba53668338fcfe1b289d85c8526bca5ce8c756 SHA512 f8b3286dbd38591987d4c4d4037d1fe16c5adb5bf971131dcda47c29a5c20286db863412056539829235c306bbb68b184052f26473a30fc8194b46a093881cae
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55db33da70f3764bfd57657445f66fb4ba22c0d05898aa46156228c4a3e232cfaf24e2881707cffe7d3b5694fe04c03f589ee12d6329e94c90847e62e SHA512 cc3c69c18a6bd2bdc5e98de10c0ad6f9c540d5639252b007851be73c405e3774d1ca16518d3edeec036258300692b82a959bef3d92878c772370f6b8892ecc64
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod 35 BLAKE2B 236e030308da9f6665046299fb6076bc3bce65b5ffbc2820c463ff3af2c95f78581b8b0260930e85eec3e1f9b40c65d206a2fd947b4a5aa8b032ae608a5e8daf SHA512 ef6bdf93c07e5d0d7fb93b733a0a902adde1e2aa719673b9d3bcc1142cc4dfe001ec4455964a13000709e0c727f5f1655e36cf1eb114591ca30a32f9af707652
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20201211165307-7117e9ea2414.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20201211165307-7117e9ea2414.zip 51362 BLAKE2B fbae000aac30e0368d8b81a735557f94e6ebc8cbdfc71dc9c4ba7a2fd779ca250ef87a505557cc13e4727928ea236d0dd2de912ffb01fd1ec3187e038cd6fd9a SHA512 a02b2f15db5160d572cf025d4f3fe810f3c0ad953be40b57bc37740764568fc2c1513c12823abcc474881e604a84e4f3b3b95c17202c403885a4d193d5681bae
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
+DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.1.0.mod 37 BLAKE2B faf1c2419c014da764d5ae4cc24e27c0c368f413f05ec8d6b7757412e811fcb18719d9a63d7505c6eae5588f5418be3bbb8e06302356996c12080b06ba68a849 SHA512 8c851766aefc9e5ca6d7330c26b5d87fa087fa057a1670dd51895ae116a91492be0ca41c0b15cb905cb044bdf5074a5648d0b8e4ebd236acdc11bf86baf57e26
+DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.2.0.mod 37 BLAKE2B faf1c2419c014da764d5ae4cc24e27c0c368f413f05ec8d6b7757412e811fcb18719d9a63d7505c6eae5588f5418be3bbb8e06302356996c12080b06ba68a849 SHA512 8c851766aefc9e5ca6d7330c26b5d87fa087fa057a1670dd51895ae116a91492be0ca41c0b15cb905cb044bdf5074a5648d0b8e4ebd236acdc11bf86baf57e26
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.mod 34 BLAKE2B 5844c0db6ae64aae3cf731d2d71203d29aa723f4ac32760f4b74a4fd21bc55829dd0c5ac9fcb71c368026f9f60ab48a623d976e1de5c7a0085e095b701903d54 SHA512 96df2995b87ec379faba4c16f3e73b60edb5e9831384d171c260539f04c1cb6c66c5ee44ca1d293d9a68c9cb70d40a0dc09694c6a412f5445c353136f1fddf24
+DIST github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.zip 15878 BLAKE2B b5e5d936b3cc49522df54a8d3cf8427ab60fcfad71e3b1eff16106e42c14c50d73084d91248b50ab2f08c5764c6fb4a688f29eacdf470f531c8d353956245d5d SHA512 4e8864099f125ae4fc69949d491c03860e7606dafbd40178ec2c1ca91c179bb954f2d74909e5f6448de7bf23d07bd7f43efb2c5887bfa6bf4b671e5d79070930
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20181202132449-6a9ea43bcacd.mod 34 BLAKE2B 387b9aecdbeccde350d8b650f5d72ef3664f4b2b753516cdedcdb840553eb7f10eee561b0e578dc1f21aec244841c43eea9e3c89d83b7bae6b8e3fa1861c7d29 SHA512 ed8f5296f33e46bb19d703d618ef8bb19b3bb9bc945b7c314cacc2f3160aef35a409b39f0f37d57c34996c22d1b778ff3a6b7365283555af184050306507ea34
+DIST github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod 34 BLAKE2B 387b9aecdbeccde350d8b650f5d72ef3664f4b2b753516cdedcdb840553eb7f10eee561b0e578dc1f21aec244841c43eea9e3c89d83b7bae6b8e3fa1861c7d29 SHA512 ed8f5296f33e46bb19d703d618ef8bb19b3bb9bc945b7c314cacc2f3160aef35a409b39f0f37d57c34996c22d1b778ff3a6b7365283555af184050306507ea34
+DIST github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip 21686 BLAKE2B 0e6ceac9b0f8315ea43ca242be54c7597855fb0bb6c70463b5d34f521066818970616422c294f0c979ec16c0aee02bd0ede95f512d1ab18b94993f5417cae491 SHA512 6b920d8b9b8241024260107e62d9db35f9201cc27aad4f97c181e660d426c9bbb717ab6f93f614f5dd8b08a2e5e2edea6b7b3e3dce9f943f04bda2633b2591d7
+DIST github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.mod 132 BLAKE2B 7bd19401bdf31042033003d11c601e945617e0d495408a72f7c8e154a0e68736a7d8303de8f83c1d52a5f6b5fd688c5e84c53194287b79b04232a51243e3246f SHA512 e6e829b44842ac961c33e8ac52eb32e9b5658b16a5f4333c96c70f47bb614ac1568ad8c6086a74181056c39c49aad74d3a83129c769dffda8d13540454a01417
+DIST github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.zip 24242 BLAKE2B bb7d98d74cc94a2821905c85dcd915f51693dd60dc08bff095c63c83097edf46376dbeba67cd259b83810cc9f209cec94cda3c74407bcb450563c1e1077f5653 SHA512 432c5284804c733d433c8fd7d266102ad647f97bc055cd37fe039da916adc1779ffd5ae9326604922dba4ce642f236f84d494ebdc24c16dec02c6216ca649b43
+DIST github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.0.1.mod 94 BLAKE2B 76327dce4cd0ba30bc76f4dea04b1c4f68a5c753f3794823fded11459c25fd00c7140e77f9e5fff381e9bb1e0e583830f0f9bdd5e9f40c35758f2a571ce34966 SHA512 efe0d125978ecff6a35dcc6faedf8c3a548061c1c964c477c728be95685157fa5a72177ac106c5fff0195a0ce23af3240239e65121b552b2bad5c45417c488a8
+DIST github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.0.1.zip 20351 BLAKE2B 9e9e65da6a26e4755d585280cfff50d1c78422b1adbe0d6718d020505ce84efcc240ab7c7d548eb721830b016786d694edeb1af8295eb32613acded1025a6bb9 SHA512 d0a3a7d938738d480c8d0769dcc9035dd456006e8a39cd01c4fc00603315fd45effa040832b1cd66de17b9b552436fd1f243a947f28c893e4b8f14a61b2ad36c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+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.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod 34 BLAKE2B 8362ffab206b4889b3d3c3842042d4504d5e040313b40a66022477a6edb32b377f4756a8c783c1950f1ea60e4ed0f9b616408908e44e571fa340c75639f50e5b SHA512 20d2c6658f5ad6e033e9532ddf6944e168fd2296acf434999967932ada1f80b6ef2e4f433dc033f745168be3e77c07931d9ae95c7f48c9a01eea2f6c2a7a9855
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.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%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787
+DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.zip 357253 BLAKE2B 4017774fefd039f66468a17477dd5c1aaa47a3c62f51fec520cab9108072eb8facbb0e8554c31a5ea2dde6fe4167f5cdb54a02e631bf3067091aace395db1dd1 SHA512 ccdf90cfceba824df843f67e5c3ef934f762e7221be1f0cc7314dff4363b21eb2f1a6d51ba51369e2f8a4055a4d1fa97d35200c31335812bea4d426df448e5d5
+DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
+DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.zip 72259 BLAKE2B 250af2ce40105aba12c305ed07038398b92389d7f0c9bd0abef17b53133f1425c4c99b8a027deb6e62dffdaf769485b9b43ffecade4973aa6eafb4a17ba60d78 SHA512 ad13b739f1f39c702428ece17592cb8c3953bc0bf0187317b22828a6e0f7a4240fbc3cda4b95938cb86193a7c663cd37a848c07a8fadb6a8bc272a6aee2c0cac
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
+DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod 33 BLAKE2B 1fb8495d86422bc87ae3a29d7040d3deb46560e8986404fe66da26fa2f7eea5f38b1ab84a67b8e79c544841627025e882fee2aea3fadd75f69f1761238eac23b SHA512 3f30afa5211772645ee93a8b11eeec246fda17559bb23b1bbc93b614815998fcae1f45827f12922fd8d51bf84425e2154f690728a63b510d278d60a48549fb77
+DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv1.0.0.mod 42 BLAKE2B 7f1707dc136483ec51919da03b8dd448983a9dc23ec576731454887705aaf207e9f2f80e5febf8fe5399946f72014f23f0f32672bc7aaef9bc1da92e8bb22ee5 SHA512 04bd4bb4121c2bf94a9224bd2ddeb8646525fb3a9abd1ea8834d9db851b7fe03c1a9b17356abd3134399073b20abdddb6f7534a6638eee848c79267f622ae7ec
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.0.mod 1094 BLAKE2B 374ab66042c9252dc3c2d9f5b93878b9cc5ddb46529f3b7892d715411ee68376f282e250860bcb3adeac6026ceb049be6e5d732ef1ee71c2d445e6cd8e8cb8ad SHA512 da5d3009eacc93265a7c80ac5f38866361e072a233a2798a3f0f3bdfcb2e85a0d50767783f0835e23a40ccb2bc42b303b3bcc2359a1eada345a179543bf7e232
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.4.mod 1094 BLAKE2B 374ab66042c9252dc3c2d9f5b93878b9cc5ddb46529f3b7892d715411ee68376f282e250860bcb3adeac6026ceb049be6e5d732ef1ee71c2d445e6cd8e8cb8ad SHA512 da5d3009eacc93265a7c80ac5f38866361e072a233a2798a3f0f3bdfcb2e85a0d50767783f0835e23a40ccb2bc42b303b3bcc2359a1eada345a179543bf7e232
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.zip 4418425 BLAKE2B c021f9933c827e67d7bb97762d84c7610dafdb492bcbc3194bbd088c75d5c96f07dee6c5d553813ac50a36440271559d7263fccc1e1ced7fa636e9b9fb839d7f SHA512 396fce7ee2610090e1e1e5333b8acd8297146bdc53e57bbe8fdcd851315a18aab3a7917718df3c5b56cc8911e19dee956c9f5d293a27fe45f19ba90dde78de75
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.4.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip 4423319 BLAKE2B 9debb98b22b35416140e0b5fd24185df6d7f6954cff4ed9b143fd7adcb95102bd417d63dafd1a75ce9c63ff20dce003a6928a9de0cb56271ec2d10aa633afc3f SHA512 3aa265c5bc1560329c63d34ebcbe8b83f0a4c934cf11fd5aa433814a1f60117965f54f3b18693a89923ea87d305683d03dfb6bd8296d99852da16bc46c40bf70
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301afc55f32d5d9062c70a03307bf7b5b7626e7f2125be07c7b6900cec97e1af9429d4930bac4d67179d87575e90acaf68d7fc3ffe SHA512 e94311fef653435875bf2c670a9c19e0e1fa2d6761b9323115504d2acb154596818d5ec9d4f65c662e607f4089cbbb6be0cfef0bb41631260ff8474c759c1323
+DIST go.opencensus.io%2F@v%2Fv0.22.5.zip 304246 BLAKE2B e0fec87affb4467ce127e62d6e86dd371bd32d4b8a7193e5c3cc39f306e289f67f3026b43930a23b60f6c42367f29c28a0d31a146cf19c13a79fed0e961af9b6 SHA512 905c4a03641b7978a06132f43f9fb2402ef4fdbea7438ca8e8524e48a142c0ff00656abc9857c7bf64bf0de159e7d3f972c3dac1cdf7f608afd3ba7506b8518b
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip 1861665 BLAKE2B 95df63738f62cd51ec4fe5e13e696123950f9e72d92909ead9b300615d8ce2a18be37548c4471e1348e3002f9df61327c1d957890b5e4e35aa25ed692d5456b7 SHA512 efd0155c4d968a337068e9d79847981f7f048dafcb98bfb53bf280222348e743d43e96e769ffa3eae984f29b762afe9dd7f93522869f8c5f445861f20d389779
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod 26 BLAKE2B 99ea5bcf900233680c1e0fd7526b1e12c79143afc9e545e59796fe734cb5b788536d332179d2432924b39670e4067fb3d13752735e59b8b19b3d27e9de9403ef SHA512 e78afa02a8d030fcd336ae1c1d5d4071d14f2873a1ad72af64a744c0e5e3ec795957fbc527557f4ba5b747cbcdf31c0109b43a6d75342d85a69fac6cf97f233a
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip 46110 BLAKE2B fa560c7a47a9724e278b64c4c96c4f28fbc5d1163a8e919f4e656527871420139d0c521172d9e7bf22401a21e6a0d4a802df9e7c6326f45d159138c5ec46b780 SHA512 393b1eb08da86deb3931b57743706b705567979f1e5f5b72520afa4690ad325ce6ae885520594683e510aa26889000fb5c042654612d902de092f29cd6a65786
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip 139506 BLAKE2B 9860ea996cb981d2bdeb4954d72e66609f125002bc356e027e49634136bfc20c7039351e7a7199d76e84caca11fdc000c455542f7e069f12c1adbe5cfd8d0b25 SHA512 bc26de861771474bcb7f4b19131c90f7e5de723ec4a9101ae904ac275b88e2acd651c9b22a26e3f35ffc4b2346a87086635db7b335d02d29a2b3986056c1a543
+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-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.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-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 1583673 BLAKE2B 07f4349a74096ed2d757fef00892d30c428082663d5cf998dae21f6bc0aa62897e25bcb628872ef0f100088ae9c5b01eb0915db28980e1a0d9651655fb287e25 SHA512 2a79fdae6c57df7762827d29d9e31e916a2dd33ce9d1dd07fa9e0c2b194015018949078d791336eaa5aa3c5ae831702aacdc48fbce5a779120d0eb8754fa4024
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210210192628-66670185b0cd.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210210192628-66670185b0cd.zip 125866 BLAKE2B 57756b410fa1500a2ada00c7fd44d82e037e65147ce484c1faf1d34f119a952a56244a39d46d0f5b842850f0a951a484f4095e3fcbdbcd01c1a30822d0753d77 SHA512 7e18c4050dc8f581557ee350777720ee18bfacc2789932bcb30e70dfc38f0b8f121b89c29eeb5294c89ba9390244de9513808ff006820e182d7eb6a546c729f4
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338 BLAKE2B 94514181eb8c63293bcc8586586ed12574ed1aeb1f64247ec4953c4a591d8cfff3f32f8cb919eea69b67ee0b6edf406d65b7676dc27db2fea86549148f372127 SHA512 8ac070589db0adff74a784cf233ff80bfafbca77d840fc13f8f5c03e66bd62c960248e13aeee5d6b401282c913adc5d42ab3e4eef64ed199700c953500309ad4
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20201208040808-7e3f01d25324.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20201208040808-7e3f01d25324.zip 12054 BLAKE2B b91339be03002d8a40fab56787561e3b3ecec20b77a5eefc3725071e6f1de3fae1f987d2e8409e2e101f0adffe3d40be7d34c999ca0d904990b27b96c5488ab7 SHA512 5ff260d58f1871d63c9499a0fca1f143292ce12b0327c94959f7b8af7cf90dd8361b4eb3424f1adcff0a8e5201b5205e87d3edeef203fc48aed733416e8cd786
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200108203644-89082a384178.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513201620-d5fe73897c97.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip 3276723 BLAKE2B 12b3291e8ce52a94677d56ad3cbf020f56777301c8b308b1f05189d346caa6395e8a0e177efa226e15e6e9235c1e387031d34cf61b08b4fc0f3769d65120ded1 SHA512 e1beb4466d35acaf836e0a8f015177e44c346f4fa31599a0b022cb19cf7b6623a3d3efcaf9c00114cd6f86a7634f19c14208a8a48ca3adee780da67964a60b57
+DIST golang.org%2Fx%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-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 gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod 147 BLAKE2B 6124c221210cb16cf7f0ea44ad962d904b2e8b050b4a86777f8a21114609c99866c53cd32572005bce9778317e2e13425cafee613ccacefa52933ae35c2fa65f SHA512 ff99bdfc473f5d75904731fc4e507a08743e5f4943d3fda12160a81dbcd1d7340935effad4e053be14da69240d6797d0462a823ba705e9f849607b8a069720d2
+DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.mod 147 BLAKE2B 6124c221210cb16cf7f0ea44ad962d904b2e8b050b4a86777f8a21114609c99866c53cd32572005bce9778317e2e13425cafee613ccacefa52933ae35c2fa65f SHA512 ff99bdfc473f5d75904731fc4e507a08743e5f4943d3fda12160a81dbcd1d7340935effad4e053be14da69240d6797d0462a823ba705e9f849607b8a069720d2
+DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.0.mod 266 BLAKE2B a396e867f12af9acaa0ba4901fce9488d91292bbc1395946347017863a80e2ce4c6208e3a21294f970c8fa5e1ff81855a606e9ee44fe17228e79e4bb74569402 SHA512 7cbcd41fd71c39cae85710571902f9cf2a477d8ef8eedcd2b47cca7d8d36056b1c897f790714dd905e0872546eef853cb52b1aa6c39366149e69d912cf26d567
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37
+DIST gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod 471 BLAKE2B 92356c493b1e94781571e05eb5096e6b40beb88c57927a955f899e8610597192fe82622f8e8f84b4c96ec00b1965552e6d5fb9166a6e3fa4f603d4fba72a4913 SHA512 ee8422d1041c7ba9306c5a49eb3bebb8c8243563250b7b3f19326769a3fb08660414625130cc1941077e7778104f6243aa5a5eb45797b72b4daf4f6abddaa32b
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.31.0.mod 582 BLAKE2B 431479fd5159e7d6966e23b1ae21d9355dec06ad86309249bb9928778c8b093cf24f79d59c1ca70661baa4844be5d53be06bc1df99fd9eb6502ba86fc059a317 SHA512 f97097a1ecb035e94ef73ef984d22e3428dea418c6231d5f8127d4f6d14cb91bb0c3f04aa7d5e0c1032a5cd3f995210d67a73939317c5c810bc921419930b3d7
+DIST google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063
+DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod 582 BLAKE2B 6144aaa4d8f028d41ecbc807a0286e1d703bbd248c2741c117d78e380c3d84c004a2f7552899c3fd7f241441b8931db63c904b4e8d81e860c5236d921074402a SHA512 a80b81fe93766e995ce621dd5459b203f694e7b4fefbfcd06ff7f75a07c31d23b4575c9d1947ad570efa969083d120f7bdcfecaacd8a386efedad7c740088f69
+DIST google.golang.org%2Fapi%2F@v%2Fv0.39.0.mod 582 BLAKE2B ce5d0b2f3965440e4ea032e13b44ac8b1fd84267df7c4c68c81e771771090f2573f3852bcaedf586a5dbd9b746446d56fde8803cdb7d6603f605bb8013b2be04 SHA512 33b7cbedac4b2c779aac3c67f883ec122079830cee7af6ddac0883ab69fe89482d9d73fc0f48b2596d396b87b19daf625ee4af0026648c8040a484560781bb87
+DIST google.golang.org%2Fapi%2F@v%2Fv0.39.0.zip 19701664 BLAKE2B f9cf084d37b41f028741232558e15b5c9f5c63b9ef63f0ea862c4d355d73558a58871f83ae8e687b2f103242336a52724b84e91eb66946dfff65c75cc690bfd1 SHA512 ad2ee82977e855520f774a5c9dcf9b0795ce04b8121f594364f2ccc4ff04939f3775b564c4a0a0389b9b8b1774cd95a63f2ebb8b473b9002bfa4576c08f0baec
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip 417823 BLAKE2B 3ba5afeec03711fd1e2ecb11739fcc4dd770d5f1c23489549c7b3697fd7bb8eb8471fa76569a73b7ad4a2b634a126a055e1d67ab654e399005398655f0bf8a31 SHA512 cb047087045fe995e28b96c1a3ea3cef8b46facfcca80fdc14707f4f09d1429daeca9cbc456ecd9bb2e3d32dde145b75929506b10ffd67d35b3604674dc27b01
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200108215221-bd8f9a0ef82f.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.zip 8901494 BLAKE2B 5fb165ead5eb4ce0d8cf75b12eb404516982e39de7d372c4337be5672143f56f1c4c119967dcffd6703022527fbe1116e9b60b91d5a1dccbdb87b57e3ea899b7 SHA512 bd199d4ea6cde1d6849faeb0e51d67b20b39d452a8dc7e505ee0861501d5126ef46582e20fb02096325966596bedb33f1e79966167370d7eee207f6ecdef8ec3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod 542 BLAKE2B e4b2b7b1fa60a14dbc498ae1ba77dfe6056d4f990c8b699323802ca3f5c31896c498d907c766b49c093d0c89edf7d57604daac7f64a543fc5e0745e7b6fd1bc2 SHA512 4e4f309652556a76b4dcd3bc14b32c69d8aac9dde500456d1d9f9f4c773a5aeaa19061f29f5148f7e815c0c5dd0ba377470975d004b0b73213206e7d5aeb89df
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod 578 BLAKE2B 620224161970d1fb64725588af21b34b4c986349185177b34fc7d8b33db92fcbbd270f1ff6bb9449b6e1289c17d9fd6cb0c284f774fe52c68deaf147266d593e SHA512 b9535ff6b3954975139cadd62af8d229c8e27b2ed3b62f0307bd99c3ec211e1fdd1c70c2bb93d755c8b59b7f4f22dcfc3dfa2d8d959ac30e1905435ec1d870ad
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.zip 1410776 BLAKE2B 2af907f16db79a4fb49e4b4509812a3c225239d42c4d4bfc3b15f2ba343d09bb82b80941c272a299d800af561d36365f89ad1304c94909a942ab70f4e6f3274d SHA512 759458003d6a15b76f4d1472dc4871bd7df2617106fda27e41f27c3d41fcf12214ccecf0c070854cc60196aa03f877f0dfa9816a8053ff2ed58075625b9534c1
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 37 BLAKE2B 9eb4ce55453382bec9aa0ed0603f34979f93d85de1e091f4e0af123cbcce871eb217d252502d640e42ae10b872634d7380ac8d4c12f63648059e83794dc81896 SHA512 2300a0705978f3384fb92672d8e66fa0a2552de26030a6337e93a57a0e2abb29804052947d321be21d826121f5133990997b6a955011fb38852470852f99c9f4
+DIST gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 41326 BLAKE2B 2aa20b6e7fe41f7a11bc8cee25ac7a3e4af93426f93adbfb3c0c644eb71ec0f166966c7d0e091aa3a3361389a36d7b120578c82587d89097ec37c38551716dfb SHA512 a644717ced4bc7714784cc8379902753fc2aeb0700ae5cf7875e69ba98ff8dc774868314e83e66c8b39dcf9517eebd2a990f1d49c9d6da06246eb30e60d70b1a
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+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-20200605160147-a5ece683394c.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-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.3.mod 194 BLAKE2B aca56964199448b8220169f979c283dbf422308351fbffa9a858d0c0bf1f32bb7c3139a0738dc0409b4bcd3844a9596daeeeea8a0c79b9cdac7232dde6c47e1d SHA512 027bab5202a25d01ab9b9a87feaf66333ef376daa9c5c12d5bfeaf1624537a895e770c8e927a474589b23af2456d2a7f5a03708f80464cdb3351a64981a4a9dd
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip 95019 BLAKE2B e78e242f9ea5824ffa2d8c1dda6df571eb6d27af59ac9bd5f09e09c398fe47098895000752c6b79571398a0ca7e163a58ba789b15f0451e98d79e273e1afb58b SHA512 7f3f556401d7ce27f1dc88e8a022f8885cddd488f4ece632e24cf9b9f6504d748519480dcf60a577a3a9451104340a917f353f43f89e05f868913c26357593d6
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST k8s.io%2Fapi%2F@v%2Fv0.20.2.mod 250 BLAKE2B f93d20da27ed9f7cf9a395db739de87bcba96ef717a36e7d10684e0ff45ce4cd15931140ff6b025128c02b41fe48b59e5ddd6cb3a81a658a33389eb7170709b6 SHA512 5df24431ab3973f5315700fe405f9f38cbac7021fd9c3174237adcdc4d7b0ae1d7c70d9090ffef325666109ec7dc91c5adfeafde8887b5af0b0436a594164312
+DIST k8s.io%2Fapi%2F@v%2Fv0.20.2.zip 3873168 BLAKE2B 7468f7a7120cdf4db1ade8dfe3641c13a2cdc15096cd7eecdfa0054498a85386c6b167ce279188a11e5b6cc63552bf2d64b0af0a06dddb52e0548ad1b58fdaca SHA512 c329fc1bac0a857225c21a6799036e03a7a7a06a0a119575146ebaea99f97430ed089b23f90b9f1713505cf9840aa2f1a763788edfa61c1ea0d19a9f65a0ac28
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.mod 1477 BLAKE2B 9093190a164cf46f5342b17755d15608ea7e75253ba12916153c03e69b311a879810dd52b28763b3f75b9ebd31c26bc35504fdf15da30cc68d35c6d5ae063a86 SHA512 957f6ec445363e9e13c972c951c65b7932708bd460afb42b08191740bb1e0b1547aa4f6e3a34031962753497cd079e074ec8a462dd8ed0953e434df36a7128f0
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.zip 802858 BLAKE2B 491ecd4121185b51e212f7430864ad6797d63b242554d2d3498f2645318207a3a328649c73012f13d3cfb7aaaf3f92fa39def183aa749de1911209d21ebed96c SHA512 460c4542cc1633714a09dce37ca710359597b291f796a442ba56eaa15d1abea51c7161e82cd5c4ef67a444dcac4908a4409c109b61315f9dc85cf492cbe3057d
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.2.mod 1273 BLAKE2B bf53ed0b462c810d7e9f25453d768c546cc1f75ce1dec05ddd5ab138b9be93a4c87ed1f107f1a581b76048a6528efa7bcd05dc2093c70f8f9acea2a9b2212329 SHA512 6488abd961b3133343f1db75807748f38cce45b28c00c2ea5aaf06075d51627e2fed40f1294bc171b55dae730f252aa633551f433ebbccbd1aaed07651b615cd
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.2.zip 1723988 BLAKE2B 11915b21d79f51defdd85ae1d228bc7fbce986513b07a8fd5f9bf3fee2ddc9d0dea0bb5d4444591c457724bef87b6a92cfb1fc1ab07601abdb286b4ef6581412 SHA512 939719b39eb6be57703196238fd056f85aceaf7ad6960919967a1091bb2a3dee70be396d14fc099664e9c0a3f21089d430d1dc8d6ae04dc9f80b0c764623d3ef
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod 1277 BLAKE2B 931fd6a123ccb62fee29d795690f778a4d39c8f84159bd85b80ff0d47f92d298985a6620eefece9c4c76d4e3ed795b4aaf8dfe6e53ceedebd68095a373fa2af9 SHA512 746bc18de0a8a3cfcd1707a3e6b01055a8e29dc2bebb6edb2a7abe8709c13199b288da6107ab3a85e35338a1b3c15eb73ac8f02243579aac0b9c4fe76c8f54fb
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip 1002101 BLAKE2B 3ffce7dc81c73dc390b68e8ee35a68b125880bfe214e0ac3acf6ec9dffd180b430951f4972c53a5bdbcb0012fa9a165870ba4316252ac90195e9fe4e358df1c5 SHA512 5dc73a20de4b31f0f93540f58d0c7394de26c302298be6268529ea2928f18d3f97bd33e4ee02cb4a8c14c31e798f694414b8ecbade75e1486206d28c1b8e265c
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip 166996 BLAKE2B 210f1ba6f4b371b8216157d219b23dfada39ef76a86152d10dd34673bcd486dbd93802b1d610e31c4ca794e8d2eb1744d77e84adde09277c11929937d6631410 SHA512 03eb8ba4916ec58144deb1a10f47019e127a688c7e3f87b3ba6fee85a2c41b92b6d7a9293c6bf8921b33f83f8e46be019fd4751fe6c1c98cb83a6080065d2b51
 DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
 DIST prometheus-2.19.1-assets.tar.gz 5032055 BLAKE2B 75bc247d3dfbcccf3a9d7ef8a23fabe2d92d698670f5aabb19e1ee019e0197aa4fd49cfd53353e09a765a014af70ad860c7d1b6bce292632e5ed1175dd206ae9 SHA512 52d1f80d9ab2de778e8a0c81549ff83647d3d8af37ccf535a6fc4ac45fe29f25f6592e9b5eb137cd5ed6f6730835e4ba52b6c4c82e5b0bb2336b90c809d756de
 DIST prometheus-2.19.1.tar.gz 13343138 BLAKE2B 042f2c6e10e3d7f50b2373d9c3977db0318c8c9839e313463890ccae58c91d6d46c306d5aaeb795fb1a9649477b179999cb6b182aca9dee222d8fba557bf6d74 SHA512 a54a83b21ac8f3477e678ca365b8f04adcbe5cdd8a17d842eb9cd2e3428238841fb0492da6f4ec973f48803b0739667c734ae8a88b48d12555e23410e6461629
 DIST prometheus-2.21.0-assets.tar.gz 5060038 BLAKE2B 10c9a89be71935072e6096c1bd62d9e3ff015b98baa4d11eb19cc938c857d38ebd22345173a9e404441bc1dceda4f86e82d455e6f4ea23d6ef5c78cba130ce9d SHA512 0f4b03b33c04a86d44c6521d4f0a1048f69d32b0e1797b5508a279d990171ca15268b461f567146f689aeda9fc696fd8a656147b20b6fd0293542fa15fd35a29
 DIST prometheus-2.21.0.tar.gz 13971178 BLAKE2B 8701d8c4318b6624e448b91959ea5afd62d0574f4329bc72c141145b197c653912b050f2da93d670ad350a244eb18c0a7e8ea9c12083fcb885233d8631653447 SHA512 6c4af981582a0cb07a8be5cfa786797507f3f23e4d52f03a4f4126b9b5df84f0481d7400120ed3368268f77d07d8d939f1a8758044e65ede291d9ccafc1b3239
+DIST prometheus-2.25.0-asset.tar.xz 3968408 BLAKE2B d32ec04d7e03c51da04e41e0be5eeda61e77bedd1503d75b60d0bd5d1a6881ff01e4c2a588e55f5b806d4822c327d702360379adb18bf346e145d96af59025cc SHA512 3e984fd01f6c49e676cfeb3d0946c531f4bf0daf3ef3498f1850ec55c5e91d040b8ba57cf844efc075cd041d95b631acbbc78d13717b7cd5542c421a5b93719e
+DIST prometheus-2.25.0.tar.gz 5535969 BLAKE2B 99ba3c5badb3cc073d98604caaf816ed5e41cbf7f723b0c7c86184dade5986c1b6d87b9cf14bcff50966bda561f70e4975566f9dcdb744afca779e11251c6c94 SHA512 ff13acff09bcd39607b06f5003343c6461e52c3a7eb49b42336e63560b20b5146bd2be0f978e9107a64918d6257c215c3b94d154a32f8792c25fcb2b3d2329f6
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip 229142 BLAKE2B 70e76301c337432c351134ebc32f723f80be1f8331b9ef80bff6d510b437f9d2ba613d40368c6170a17217d9ef6cd7b639450b64697ff63c3d0352f3733921ce SHA512 a941e1144613c7ddd2dfebac185bc65a9f68d794eaf29bccd4c8f9be209d3cf5c9d1d06d3be09a9af816d2e727f2e3ae92d22724c925ab3211afa1e226b058b4
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
+DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD prometheus-2.13.1.ebuild 2059 BLAKE2B 4614929b87ff860eac5b7b46d9b8f60474c51faab659699a0866dccaaef4d149214430d370dc5f0420c756d8d240da4cc8bb33b1948e6b4baf690c20b8905f06 SHA512 aac4922659750e6bcde07a8ef7823a5d8c4d47ccd1107a9f593b95079322031f4c8546b7d0d6df20f736a6a24d869105866c30eaf9e81773e21a6dcad27beac9
 EBUILD prometheus-2.19.1.ebuild 1947 BLAKE2B 64f7ac94e68fd321be19747fcc29a8adda3ab99183e509c33241e34b014b9ed7c3e3d8beaa8c3da58e7a5c11fbba3a85a3fccaf58ef3723d43a798e18f99600d SHA512 726f4d332155e642bb7213e4efc3a06c6202a9e4c08d96f372a36ed3e752ba944fd7d51ad1a6f2ff601fdaac2db6ee171e6b72594e409363a0a7acbb68d44849
-EBUILD prometheus-2.21.0.ebuild 1901 BLAKE2B d78ca60ce6580810928b5a90dc45eee14c02a7239515ad27dce8387a2852fdb712a5a2f0eaa6a5727f5e95d2ce5e5704b3bea96dce96c8e62c47a9e583ec646a SHA512 2a2fc7829ed0d4c704d2cc6736e0b953d7d030c3208e9738e11a59157e4804ab815359dfd9b1ed28c23a5c60902aa9da7b859e64a9e012bebec77935047c07f4
+EBUILD prometheus-2.21.0-r1.ebuild 1960 BLAKE2B f41f1bb62ec114baee352c4647a4895e13d0e2ea887c1e5d9cccb4212e8ee3e817f104522da231fe6128dc97d8426098884aaf3491d30b51b2f0623113fdaf7b SHA512 3e21c74b5cdbbc187f48d8f9d322f33e03cf25ecde9949b62b0dd2f867eb616cf23c19c24377164af583de654b46d4ab7eb2503050975c1eb1d44f2d5b6656d0
+EBUILD prometheus-2.25.0.ebuild 72291 BLAKE2B 492755e48f65f9e46606842a6cad15d8a45003c0f7e355a6493ba31f45099893a7fedfd3c84375cdc00e26397ac432e8df3d0249cad3b98d1eed8d3fb961ff9e SHA512 c41c99ba4899db076d02f3e001a8fdf22c06c5f7ca940daecf3c86e3e9cecd5b07512692862d32ebd18e03ca68701b75c249bd19358517af9ddbdc10a9e5b586
 MISC metadata.xml 334 BLAKE2B f35628a28c6087863ab4d96e1a4a3705f470845fe6c963c47457caf85e14cb1f99938b1b78bad2f87653f525c154f76c8e0e7b18d6f21d2cf10016eacc565984 SHA512 1a64169c81388848bb26d32e8706fb6d4fbcbde847b1e075f1eee297d5fd4b35ecc835e9ed16ac79825f8c17efac78271e6c8735809a57a8b4ed73b5a789300a
diff --git a/app-metrics/prometheus/files/prometheus.service b/app-metrics/prometheus/files/prometheus.service
new file mode 100644
index 000000000000..ebd8a901d1fd
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Prometheus
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=prometheus
+Group=prometheus
+ExecStart=/usr/bin/prometheus \
+  --web.enable-lifecycle \
+  --config.file=/etc/prometheus/prometheus.yml \
+  --storage.tsdb.path="/var/lib/prometheus/data" \
+  --web.console.templates=/etc/prometheus/consoles \
+  --web.console.libraries=/etc/prometheus/console_libraries \
+  --web.listen-address=0.0.0.0:9090 \
+  --web.enable-admin-api 
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/prometheus/prometheus-2.21.0-r1.ebuild b/app-metrics/prometheus/prometheus-2.21.0-r1.ebuild
new file mode 100644
index 000000000000..f2030b8dd9e1
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.21.0-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 go-module systemd
+
+MY_PV=v${PV/_rc/-rc.}
+GIT_COMMIT=e83ef207b
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+COMMON_DEPEND="acct-group/prometheus
+	acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+	mv ../assets_vfsdata.go web/ui || die
+}
+
+src_compile() {
+	promu build --prefix bin -v || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	systemd_dounit "${FILESDIR}"/prometheus.service
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-metrics/prometheus/prometheus-2.21.0.ebuild b/app-metrics/prometheus/prometheus-2.21.0.ebuild
deleted file mode 100644
index b4bb7a694d13..000000000000
--- a/app-metrics/prometheus/prometheus-2.21.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-MY_PV=v${PV/_rc/-rc.}
-GIT_COMMIT=e83ef207b
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-COMMON_DEPEND="acct-group/prometheus
-	acct-user/prometheus"
-DEPEND="!app-metrics/prometheus-bin
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-util/promu-0.3.0"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
-	mv ../assets_vfsdata.go web/ui || die
-}
-
-src_compile() {
-	promu build --prefix bin -v || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.25.0.ebuild b/app-metrics/prometheus/prometheus-2.25.0.ebuild
new file mode 100644
index 000000000000..5d9b68903eb7
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.25.0.ebuild
@@ -0,0 +1,1384 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.43.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/bigtable v1.2.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"collectd.org v0.3.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/HdrHistogram/hdrhistogram-go v1.0.1"
+	"github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15"
+	"github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/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"
+	"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/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+	"github.com/aws/aws-sdk-go v1.37.8"
+	"github.com/aws/aws-sdk-go v1.37.8/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/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/c-bata/go-prompt v0.2.2/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/cenkalti/backoff/v4 v4.0.2/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/containerd/containerd v1.4.3"
+	"github.com/containerd/containerd v1.4.3/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/creack/pty v1.1.11"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/dave/jennifer v1.2.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245"
+	"github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod"
+	"github.com/digitalocean/godo v1.57.0"
+	"github.com/digitalocean/godo v1.57.0/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v20.10.3+incompatible"
+	"github.com/docker/docker v20.10.3+incompatible/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.9.0+incompatible"
+	"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod"
+	"github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.0"
+	"github.com/go-kit/kit v0.10.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.4/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/analysis v0.19.10"
+	"github.com/go-openapi/analysis v0.19.10/go.mod"
+	"github.com/go-openapi/analysis v0.19.16/go.mod"
+	"github.com/go-openapi/analysis v0.20.0"
+	"github.com/go-openapi/analysis v0.20.0/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/errors v0.19.3/go.mod"
+	"github.com/go-openapi/errors v0.19.4/go.mod"
+	"github.com/go-openapi/errors v0.19.6/go.mod"
+	"github.com/go-openapi/errors v0.19.7/go.mod"
+	"github.com/go-openapi/errors v0.19.8"
+	"github.com/go-openapi/errors v0.19.8/go.mod"
+	"github.com/go-openapi/errors v0.19.9"
+	"github.com/go-openapi/errors v0.19.9/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.5"
+	"github.com/go-openapi/jsonreference v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/loads v0.19.5"
+	"github.com/go-openapi/loads v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.19.6/go.mod"
+	"github.com/go-openapi/loads v0.19.7/go.mod"
+	"github.com/go-openapi/loads v0.20.0/go.mod"
+	"github.com/go-openapi/loads v0.20.2"
+	"github.com/go-openapi/loads v0.20.2/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.19.15"
+	"github.com/go-openapi/runtime v0.19.15/go.mod"
+	"github.com/go-openapi/runtime v0.19.16/go.mod"
+	"github.com/go-openapi/runtime v0.19.24"
+	"github.com/go-openapi/runtime v0.19.24/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/spec v0.19.6/go.mod"
+	"github.com/go-openapi/spec v0.19.8"
+	"github.com/go-openapi/spec v0.19.8/go.mod"
+	"github.com/go-openapi/spec v0.19.15/go.mod"
+	"github.com/go-openapi/spec v0.20.0/go.mod"
+	"github.com/go-openapi/spec v0.20.1/go.mod"
+	"github.com/go-openapi/spec v0.20.3"
+	"github.com/go-openapi/spec v0.20.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.2/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.19.4/go.mod"
+	"github.com/go-openapi/strfmt v0.19.5/go.mod"
+	"github.com/go-openapi/strfmt v0.19.11/go.mod"
+	"github.com/go-openapi/strfmt v0.20.0"
+	"github.com/go-openapi/strfmt v0.20.0/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.19.7/go.mod"
+	"github.com/go-openapi/swag v0.19.9"
+	"github.com/go-openapi/swag v0.19.9/go.mod"
+	"github.com/go-openapi/swag v0.19.12/go.mod"
+	"github.com/go-openapi/swag v0.19.13/go.mod"
+	"github.com/go-openapi/swag v0.19.14"
+	"github.com/go-openapi/swag v0.19.14/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.3/go.mod"
+	"github.com/go-openapi/validate v0.19.8"
+	"github.com/go-openapi/validate v0.19.8/go.mod"
+	"github.com/go-openapi/validate v0.19.10/go.mod"
+	"github.com/go-openapi/validate v0.19.12/go.mod"
+	"github.com/go-openapi/validate v0.19.15/go.mod"
+	"github.com/go-openapi/validate v0.20.1/go.mod"
+	"github.com/go-openapi/validate v0.20.2"
+	"github.com/go-openapi/validate v0.20.2/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+	"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+	"github.com/gobuffalo/depgen v0.1.0/go.mod"
+	"github.com/gobuffalo/envy v1.6.15/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.1/go.mod"
+	"github.com/gobuffalo/flect v0.1.3/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+	"github.com/gobuffalo/genny v0.1.0/go.mod"
+	"github.com/gobuffalo/genny v0.1.1/go.mod"
+	"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+	"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+	"github.com/gobuffalo/gogen v0.1.0/go.mod"
+	"github.com/gobuffalo/gogen v0.1.1/go.mod"
+	"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+	"github.com/gobuffalo/mapi v1.0.1/go.mod"
+	"github.com/gobuffalo/mapi v1.0.2/go.mod"
+	"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+	"github.com/gobuffalo/packd v0.1.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+	"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/googleapis v1.1.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+	"github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/golang/snappy v0.0.2"
+	"github.com/golang/snappy v0.0.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/flatbuffers v1.11.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.4"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210208152844-1612e9be7af6"
+	"github.com/google/pprof v0.0.0-20210208152844-1612e9be7af6/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.4.1"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/gophercloud/gophercloud v0.15.0"
+	"github.com/gophercloud/gophercloud v0.15.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/api v1.8.1"
+	"github.com/hashicorp/consul/api v1.8.1/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.7.0"
+	"github.com/hashicorp/consul/sdk v0.7.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"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/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hashicorp/serf v0.9.5"
+	"github.com/hashicorp/serf v0.9.5/go.mod"
+	"github.com/hetznercloud/hcloud-go v1.23.1"
+	"github.com/hetznercloud/hcloud-go v1.23.1/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/hudl/fargo v1.3.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/flux v0.65.1/go.mod"
+	"github.com/influxdata/influxdb v1.8.4"
+	"github.com/influxdata/influxdb v1.8.4/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod"
+	"github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod"
+	"github.com/influxdata/promql/v2 v2.12.0/go.mod"
+	"github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod"
+	"github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod"
+	"github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/josharian/intern v1.0.0"
+	"github.com/josharian/intern v1.0.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jsternberg/zap-logfmt v1.0.0/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+	"github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod"
+	"github.com/karrick/godirwalk v1.8.0/go.mod"
+	"github.com/karrick/godirwalk v1.10.3/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.9.5/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod"
+	"github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod"
+	"github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/mailru/easyjson v0.7.1"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/mailru/easyjson v0.7.6"
+	"github.com/mailru/easyjson v0.7.6/go.mod"
+	"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+	"github.com/markbates/safe v1.0.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.3/go.mod"
+	"github.com/mattn/go-sqlite3 v1.11.0/go.mod"
+	"github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/miekg/dns v1.1.38"
+	"github.com/miekg/dns v1.1.38/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/oklog/run v1.1.0"
+	"github.com/oklog/run v1.1.0/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing-contrib/go-stdlib v1.0.0"
+	"github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.2.0"
+	"github.com/opentracing/opentracing-go v1.2.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/paulbellamy/ratecounter v0.2.0/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.4.0/go.mod"
+	"github.com/pelletier/go-toml v1.7.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod"
+	"github.com/philhofer/fwd v1.0.0/go.mod"
+	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/prometheus/alertmanager v0.21.0"
+	"github.com/prometheus/alertmanager v0.21.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.6.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.9.0"
+	"github.com/prometheus/client_golang v1.9.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.15.0"
+	"github.com/prometheus/common v0.15.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.0.11/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.2.0"
+	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/cors v1.7.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414"
+	"github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/segmentio/kafka-go v0.1.0/go.mod"
+	"github.com/segmentio/kafka-go v0.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749"
+	"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod"
+	"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546"
+	"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod"
+	"github.com/simonpasquier/klog-gokit v0.3.0"
+	"github.com/simonpasquier/klog-gokit v0.3.0/go.mod"
+	"github.com/simonpasquier/klog-gokit/v2 v2.0.1"
+	"github.com/simonpasquier/klog-gokit/v2 v2.0.1/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/tidwall/pretty v1.0.0"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tinylib/msgp v1.0.2/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/uber/jaeger-client-go v2.25.0+incompatible"
+	"github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod"
+	"github.com/uber/jaeger-lib v2.4.0+incompatible"
+	"github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/willf/bitset v1.1.3/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod"
+	"github.com/xlab/treeprint v1.0.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.0/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.3"
+	"go.mongodb.org/mongo-driver v1.4.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.6"
+	"go.mongodb.org/mongo-driver v1.4.6/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/atomic v1.7.0"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/goleak v1.1.10"
+	"go.uber.org/goleak v1.1.10/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"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-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/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-20180321215751-8460e604b9de/go.mod"
+	"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"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"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-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-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd"
+	"golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+	"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-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+	"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+	"golang.org/x/time v0.0.0-20201208040808-7e3f01d25324"
+	"golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
+	"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0"
+	"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"
+	"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod"
+	"gonum.org/v1/gonum v0.6.0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
+	"google.golang.org/api v0.3.1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.31.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.39.0"
+	"google.golang.org/api v0.39.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+	"google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/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"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.22.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/fsnotify/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"gotest.tools/v3 v3.0.3"
+	"gotest.tools/v3 v3.0.3/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"k8s.io/api v0.20.2"
+	"k8s.io/api v0.20.2/go.mod"
+	"k8s.io/apimachinery v0.20.2"
+	"k8s.io/apimachinery v0.20.2/go.mod"
+	"k8s.io/client-go v0.20.2"
+	"k8s.io/client-go v0.20.2/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd"
+	"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/pdf v0.1.1/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.2"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+
+go-module_set_globals
+
+MY_PV=v${PV/_rc/-rc.}
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-asset.tar.xz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+COMMON_DEPEND="acct-group/prometheus
+	acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+	${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	mv ../assets_vfsdata.go web/ui || die
+}
+
+src_compile() {
+	# no need in promu here
+
+	go build -mod=readonly ./cmd/prometheus || die
+
+	go build -mod=readonly ./cmd/promtool || die
+}
+
+src_install() {
+	dobin "${S}"/prometheus
+	dobin "${S}"/promtool
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	systemd_dounit "${FILESDIR}"/prometheus.service
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1fe9cee4b8a2..e5345edb564d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index c61dfcfc90fd..ba26cc77353d 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -5,4 +5,4 @@ DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cd
 EBUILD OpenRGB-0.4.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
 EBUILD OpenRGB-0.5.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
 EBUILD OpenRGB-9999.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
-MISC metadata.xml 454 BLAKE2B 3494c8e32c5f741e269a332fbf382e5bc6dee352d9aa3ae674d78fab6b4db06ba734ab82182a9d0ac4888813b1d3bea80fb87e252070bf931575e8eabe58047c SHA512 586db979df41b203cc4c4df318ebeb136d7098c535325c34a5c75dd40dc0ed8b137e62ffec323ef1a28da7cb646f1fc1bc4aef75f9f25537f7dfcc8d502ba6bc
+MISC metadata.xml 468 BLAKE2B 995cee43adec6a52c9ee8cef1abd9940cfe501e860cad863ed32161ef04c9bb1fa8d11d87869dea37d882170d8c54b548666ba788641899a3d8364b1307d7450 SHA512 9dab70cc3cc39d8051f93190030aaffbdf5256a4ca68c0ae85c4563021d6c459fa4fa4319efdce25f7dea18f797d4fb52ea63d448dda90e5ac69b79d98f21ecf
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/OpenRGB/metadata.xml
index 54b4f43faa0e..c308d68bd107 100644
--- a/app-misc/OpenRGB/metadata.xml
+++ b/app-misc/OpenRGB/metadata.xml
@@ -5,7 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 584f00207f80..e94a5107eb35 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,8 +1,4 @@
 AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
 DIST BANNER_V1.3.5.tar.gz 135190 BLAKE2B 4accf00ad92f0351a1df49d3cb6451a71ee7f929fc6f2b25aee7fc6898780944b71cecf8070dc186888a9fb7580213ef2111a5086fc396f3c7e242e678cf8270 SHA512 6f2d79f1d76533fac920aa2984258e3f5278c40692d2b2dcae560734dcd5b06fcc8c99f266abdc91fb272eb291906bcea747f5ee53a67a4a5cb99179941897c3
-DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
-DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
-EBUILD banner-1.3.3.ebuild 480 BLAKE2B 0eaf3d67b45f317bf504e08ba87bf2e87bbac880be28cd0ab48a9093911166f83030409aabbdbaecca1914369c73b516e8a2fa6cd9bf84f8b657e0d1591c9580 SHA512 9114fc46729f981060b648dbf8a1c524a0735921eb57c80c5f09d5012da489a125c582203c8dbcceae4b6460ad017ee239417e4e4237bd529b507756886a1205
-EBUILD banner-1.3.4.ebuild 465 BLAKE2B aaedf3860e6d3c5bfea57603ace5e1b09c49c7d77f0c31084fb728fb12eef7ebd10fc5081d37be35f93a0fb57cbad548c0735ab77667f891d6798f7c1c8db015 SHA512 9bbac3a6a93bd2ec49d7f9b5e9ca52389b6249d259378b9e6c248bccacbfcf81243482ecea826da183c8a8d87b2ecf7239cc7d99dd9d52c4a9d2967460cf81b7
-EBUILD banner-1.3.5.ebuild 520 BLAKE2B e7289bbdeabd94a046495450205b8fba039ebb4ec6d20e3681f44456bf32e05b8f316ea4a289265ae0bcabfe7eb99ac72c1037418eba99583c686970d0291778 SHA512 9cabf46059475eb5c56b3db849d3c44cfe88311b623f6106c6280a302d76140035302eb46f80ab6525b190fdb4bfb1f9d0c3a1e5b5726fcbcbcb8b4fd7339dc3
+EBUILD banner-1.3.5.ebuild 515 BLAKE2B 60f2333c6ae267bad869c381ee13dbb5d6bafd64b35666c36b26ade7cb963d62af0f7427f074344e8d43b9f660c90bb2839876db6d6ea8ffd04cc6ec2835dd34 SHA512 67f9530e6f00a41e3c2b6242d96759fa538f0617bbaeb7a67e30c2e3ad97fda52f882259a3cc34af0e3210ff06ec20850bbd0ed7814c81ebc5279fcbdb368a6b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.3.ebuild b/app-misc/banner/banner-1.3.3.ebuild
deleted file mode 100644
index cf588c0fb915..000000000000
--- a/app-misc/banner/banner-1.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!games-misc/bsd-games"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ctype.h.patch
-}
diff --git a/app-misc/banner/banner-1.3.4.ebuild b/app-misc/banner/banner-1.3.4.ebuild
deleted file mode 100644
index 608ba7901d21..000000000000
--- a/app-misc/banner/banner-1.3.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com/"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!games-misc/bsd-games"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.3-ctype.h.patch
-)
diff --git a/app-misc/banner/banner-1.3.5.ebuild b/app-misc/banner/banner-1.3.5.ebuild
index 7a4c24d8d711..b3e96bed5c2c 100644
--- a/app-misc/banner/banner-1.3.5.ebuild
+++ b/app-misc/banner/banner-1.3.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
diff --git a/app-misc/blink1/Manifest b/app-misc/blink1/Manifest
index 4888252ccabd..6e300a49285b 100644
--- a/app-misc/blink1/Manifest
+++ b/app-misc/blink1/Manifest
@@ -1,3 +1,3 @@
 DIST blink1-1.98.tar.gz 29439933 BLAKE2B 5c775819c9401c04e1c9adeb3dcb1f524ed30b6493380368b063a6ef94af75ab30e8b7f43e1b195f17578a1625bc6118bd65c7402376560ab5ee00e80f0c5c04 SHA512 2057e3ccf149dbdaaea2d09dabaa95317125d65151dc79c675365f55e85a3d0988232fd5ff404bdcfd127ebc266495afa04fb1b3fd0e4ac931bb711b0bb63568
 EBUILD blink1-1.98.ebuild 2414 BLAKE2B db04108f1cef9fa3d1ef184bfa3e2c373a2a87f613ae5f2053f7ceaf029126013ef3d1f7c9cf126238f99d2ad57c1fb48794808f04cbfb698c0f1d593f2cbcca SHA512 0f7e756b91caaa36c33cce0c844678033c58efdb3f0b455dbb627b4ca355d5533bace1300b1895619e89de91f497a28f6bbd132bd77ee378f0b856bc4ae41806
-MISC metadata.xml 579 BLAKE2B 1644cacb6985bbe68c7cdcdaaa5f602fdd79c63c8e3b54ad34b6d97e9c50415ff9d343ab60b9c91bade52b2f59b34e4b0488a091001cb36ba294e0a29ff1b90f SHA512 a848eee9c39a574515aa6a5b70f347960a4c117583e58e2a31b3c714fb91347061518f96b2c8f13cb9167afd9e5478a4c76717af10a5ad5fc084a82fc47a9f7e
+MISC metadata.xml 578 BLAKE2B a095e5225c14fcb172a96bcfe1618693476739683425c9a7bff99beb075378d97a71dfcc6bd87a9ade7bba9df3fd2b1e8ab5ec5abc25f727928dd46688818645 SHA512 1051d39be9398b9bd430e99493c31cd73d2975797cd7fffc2a380ab48c11e7c6c4e3b0f32eb18372a52de691d471e9866031aeff99317bdcc8d27514b8d05c7e
diff --git a/app-misc/blink1/metadata.xml b/app-misc/blink1/metadata.xml
index 3b8c7475c606..03eeb948c0a5 100644
--- a/app-misc/blink1/metadata.xml
+++ b/app-misc/blink1/metadata.xml
@@ -11,4 +11,3 @@
     <flag name="server">Build and install REST API server (currently hard-coded to TCP port 8080)</flag>
   </use>
 </pkgmetadata>
-
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 6e053b9f2ec2..3df5a86396e8 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
 EBUILD c_rehash-1.7-r1.ebuild 968 BLAKE2B 0795785a2b8749202ce9cebaf97db07310c048ec7e5067deaba88399a80f2640f6cc8bcdbd022ae80ef67d665bd3e2346984449cafdcfe655839b9effbe27411 SHA512 a4a2ca37b81cb08f6ac28531efeba6141cf3d33c177f48acd4c09f776b52c34258d1d6af1dea12606e2f2980a434625409a7fb9234df468aa42a1cb1bbf27690
-MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
+MISC metadata.xml 339 BLAKE2B b8e32c0f0f6147fc8e3ef5842ee8d375648506528f60de787d132be280d480d2c4e6680df6f4e78d8ba8a906ea3e768bbf124d84a23800b0476db37d6c4d0730 SHA512 c66dbcf2f2ef7d99dc059e69c162237e9f3a233058ed05702d1a6b4e17d97e91fcffeca021f22558905669f65a3224f8a38a8dd0fa4107f74c53d5ca5bdd38c0
diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml
index c481526f1340..bd993784ba02 100644
--- a/app-misc/c_rehash/metadata.xml
+++ b/app-misc/c_rehash/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 30d576ceaa2d..9f8fda7d4095 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -8,5 +8,5 @@ DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20200601.3.53.ebuild 5591 BLAKE2B caeca6b6ef04f9cffcd09f71a71e60f5a0bb83e2a17d250b7c70509d7b7c5a0157ca73551b3195f8e896967ca7693c286d654924a7e928a32588b4548169f0b5 SHA512 50173d5d27dea6a7425d59f05f7d6739a0c247ec171e641af26197746f28257fbdbe1e84ed2596a44bbf5ff2417e9e8526271cc6f552ba960ce95b30b6406f94
 EBUILD ca-certificates-20200601.3.60.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
-EBUILD ca-certificates-20210119.3.62.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
+EBUILD ca-certificates-20210119.3.62.ebuild 5727 BLAKE2B 5b7df2f363391a7c8b42e153533a8d0c3e00a61e5fa494348d0e45059e677fdcf85c5fbddc232e9b78d51de937708f027b9e91ff27df8e726b5c6e4f844f0c96 SHA512 2ede38f7742f442d3a61c192d552f3f35891a531fca69301bbc28bb881311976a5ef3164119506fa815a79cdf7a4f9142de7166c655ab053fdc4398b6cc783ca
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
index 2f777c592fc7..f49a7923491d 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
@@ -50,7 +50,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/cfiles/Manifest b/app-misc/cfiles/Manifest
index 3383f1840bb1..87d00610d295 100644
--- a/app-misc/cfiles/Manifest
+++ b/app-misc/cfiles/Manifest
@@ -2,4 +2,4 @@ DIST cfiles-1.5.tar.gz 237333 BLAKE2B 26eaa9f6d96bbcf07047a0c7f5cc941bdf8417c53a
 DIST cfiles-1.8.tar.gz 237966 BLAKE2B b2c0783ac4d5e5b9950b574f635b8d4adbe332178e09cd89966e2a44a941a34806332222fa606a097fbe21453bfe9a49f4718575c6fdae5f5b9b9433181e8fd5 SHA512 14880c71bcc6dc0b6433be722bdd75d30859556fae30754c668a9dacf8a1b8e4758cca3572de034a1e8fb4e947d38739351969139fe72f59a7af3dcb158aaa86
 EBUILD cfiles-1.5.ebuild 590 BLAKE2B f8aebac3dc2e61c9a3046217696b7db7641ba757b05f1addfd2faf6d55da157536bb507f0e1e68ab5f65b19b27e028b6036ed5960730b86755cf279be5cd9d8e SHA512 1eaa00ca187d6cb1670cde62d25eb2ba62931d4675212e5d98243b378a25a74d12d578e11fe8dddeec7bca96b4cecfb3667ac592ecd1fca9bc3c0216411cd767
 EBUILD cfiles-1.8.ebuild 590 BLAKE2B f8aebac3dc2e61c9a3046217696b7db7641ba757b05f1addfd2faf6d55da157536bb507f0e1e68ab5f65b19b27e028b6036ed5960730b86755cf279be5cd9d8e SHA512 1eaa00ca187d6cb1670cde62d25eb2ba62931d4675212e5d98243b378a25a74d12d578e11fe8dddeec7bca96b4cecfb3667ac592ecd1fca9bc3c0216411cd767
-MISC metadata.xml 590 BLAKE2B 1aa0b35129da61cf18a1512af1ca77561b35608d72974aa4d82c99ed9b218443ae118f6f72a362409b4f9d3e34a0781333494724be6d8ca88fd59fe7980de711 SHA512 6bb1ae35d085057ff824fb1e0cf6922c9ff5e631e80814923e42d95c117a06c2d9f66511d1fafe4fbff72fe5fbf889b5a74378b6441bbf94ad9f944040bf7f3f
+MISC metadata.xml 604 BLAKE2B 4738e90e80bcd01e509527e039175aadd8ce54c947cbc54830579dc1a81be2963af28bddd2e50fce05b9f1380d9be772c56de9d63ec3c7a30559d7da2aeddbf1 SHA512 db84349ee4cb9bab9b44948ed28e5cafe25c33a85c6f70a8e576d5407f6e289f3458b496eb7b236d7fc60b00dd6be82d99fd409d8ef7ca59ea9a8c9f2772137c
diff --git a/app-misc/cfiles/metadata.xml b/app-misc/cfiles/metadata.xml
index 732586efea37..c61787c17bbc 100644
--- a/app-misc/cfiles/metadata.xml
+++ b/app-misc/cfiles/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>yumi.tanaka@miraclelinux.com</email>
 	<name>Yumi Tanaka</name>
 </maintainer>
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
index 64e656cb2978..315cfda0bc2c 100644
--- a/app-misc/chkcrontab/Manifest
+++ b/app-misc/chkcrontab/Manifest
@@ -1,4 +1,4 @@
 DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
 EBUILD chkcrontab-1.7-r1.ebuild 573 BLAKE2B 4d70b5f4d46f8ba8055708d83c949c40ef6127415c0cf81eb8f34fc660d832187e63e151d8720b844f5764ec18f80fbf08f6135194521fafa4712eeec024e823 SHA512 ebb75cde3cbe8b00eaf976caac7dfc5daf04fc554cb67b4efd578b6ba326b5bdfe729809b09ffe2dbef3fc4c983c3ec9a8498a866df72468c71f6e95f9026d26
 EBUILD chkcrontab-1.7.ebuild 553 BLAKE2B 5c2eaa7dd043c52c03bbe8e194a2c9c034a07c3ad09166a43cd0a081ea9810d434adb43a98c08378404109dc9dfbd1e79cf1147507089e4a46289cc77e953332 SHA512 175bca54fd3ef5205ccd1668b7ed81b88fa57287d418cee88ddac8b2eec4e32bb5b91cb76c95aace9594ccf578520050077ef3ec3d5108311c85b72ca99d9999
-MISC metadata.xml 463 BLAKE2B 82e0b38cdc6aeb0cb304f3448f326c129e5b936ff559e07e5ced9b1b72e840cc4f1573571eae46cc56639f6920e717e7d3f67eef6cf8aac5e9a11f5948ac70ca SHA512 d181e1a0b06519224d4e6b13b7157bd9741000c676e7f47c72dd27eb475d991a32480393bd62a599fb0a833908bae96b810fbdb17723723067edc6af3b3ab0ca
+MISC metadata.xml 493 BLAKE2B f9775f6c04feb4498e5fef0d7bd570b914a665bea3fa7ff6868389d6c5b1ab8fd69a7e7e004b3354451cde363f9dfa8c1774a0ab08737af3ba49b7bad707fb5b SHA512 45fb605cd220fc40d964cb78590d9a0584669d11ff8b007d40535f3577999f7fcdbd6143c522eaf4eaeb58d68f9cbedbc02ee6d9b63dbfe995182bf32724501d
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
index d69c349ca9a7..e5e155650aa9 100644
--- a/app-misc/chkcrontab/metadata.xml
+++ b/app-misc/chkcrontab/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index b426edc27e31..c3dc9971fe5d 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -6,4 +6,4 @@ EBUILD dateutils-0.4.6.ebuild 798 BLAKE2B 656721cb90bd9e00e46a590312c5600acacbaf
 EBUILD dateutils-0.4.7.ebuild 804 BLAKE2B eba3a0dc5309e16cfc00e237b35cf8be8b93f5eca7e7c5afa24eb155e67ee6363455bf31b64062544e0a12f3838acee3231ad8fc73a76b87637b58b1ddf05053 SHA512 ede4962055b614988a868738028129c42ee78d3b6e2bd6a644e319af5f1da447f520663a34072ac143a46d2faa2ea9da62582004549aeb8c452fcafdc5f9ba89
 EBUILD dateutils-0.4.8.ebuild 736 BLAKE2B b8b2aed6504e1562e58c9ccbc331fbc9ac13b8698934cf499c1dff3d6c0831062eae1dcb87ecc3f1c7be83f8668b923c9fa5f867fb2127ff561706e716dc1637 SHA512 9eff55af8b0346b9b177b2e43c9752b389733e2f1729ad7667703f0873beb0352753a629649fd8ab2ec3e48a61f49ea742950613b80378d1bf496662ac42848e
 EBUILD dateutils-9999.ebuild 736 BLAKE2B b8b2aed6504e1562e58c9ccbc331fbc9ac13b8698934cf499c1dff3d6c0831062eae1dcb87ecc3f1c7be83f8668b923c9fa5f867fb2127ff561706e716dc1637 SHA512 9eff55af8b0346b9b177b2e43c9752b389733e2f1729ad7667703f0873beb0352753a629649fd8ab2ec3e48a61f49ea742950613b80378d1bf496662ac42848e
-MISC metadata.xml 851 BLAKE2B 91eacf1cd8fa8e0a8455fc5ee60ada4bbb360eb7dcc40b1b1e4339ad7c6e0a56a07ce0682e13903a68a642a2ceed812baf30b061614647a61c069a68bd462ff4 SHA512 4fb4cfaed3812b0d35c2a467a11240561b96edea8a86834996353ac35fc2a281d72f27cc7f32f29367ec68fba3fa2fc942e0256b9d968b91cf67a450aa40ac21
+MISC metadata.xml 880 BLAKE2B fed61eea77484981bb9b09ac77d2e09cce8809099ab3e55ee226986bb8d382b9fd5b657b38780a7abae227911f14ccc4a7c58457de2cc256de547e009ee868f1 SHA512 542b454e35e0e1b12651045d0ec92ad0369a74587dbe862153d2203a169d842352b700ea1a6555d0620c9361c849f18aaf2387b133047bdb930856f9e647fc3f
diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
index d4d0049e4e07..881e4bc3c166 100644
--- a/app-misc/dateutils/metadata.xml
+++ b/app-misc/dateutils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>coppens.matthias.abc@gmail.com</email>
         <name>Matthias Coppens</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
@@ -20,4 +20,3 @@
         <remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
     </upstream>
 </pkgmetadata>
-
diff --git a/app-misc/dfshow/Manifest b/app-misc/dfshow/Manifest
index 92080e8e348c..5c5eca9d4459 100644
--- a/app-misc/dfshow/Manifest
+++ b/app-misc/dfshow/Manifest
@@ -1,5 +1,3 @@
-DIST dfshow-0.8.2_beta.tar.gz 97733 BLAKE2B 99790b6901760a5e4adc7942fa84d11fb9d5e2f4e60a5d4abc2ce8fed0e86ab5f3def67c2f567b1ca54f1ecdbbe04522d4a75d69694b0ad213a69d86d49514e4 SHA512 1fca7f72c0200df13ac6e640314f9ad94ea3b88eb62a18a606f3a06a02252107f59747fbd404891fff5898b3796650023827ca59ceb690a0aa45e3c0a8bca749
 DIST dfshow-0.9.1_beta.tar.gz 109882 BLAKE2B a8351a4ae1e3d8f0a4166f7642bb32a1ec60723f73d7da9bdc8b496162c4174421e0e369499ace22cfeec64a32b3dbcd9411bdc10c19cc6427d04bc1df298c44 SHA512 c13347075f51c213e804855a1cc432076d8fcd5f278e4945b457fdddc3945e9d743f3dc4f26e4194f6a5b612a4e118081dd3afbb1a4523ae3c962a4fae68494e
-EBUILD dfshow-0.8.2_beta-r1.ebuild 739 BLAKE2B afbc920285c9805a6335af54418e7c3cffe674f005af3608a397d554a64fe941ac2c1d09911f6c0d712d01227ff351af6381358915fba69d05da0b6807cdc28c SHA512 d643e7c363096c8b2ea42c798146461efce164f67605a2fe565c699c627d031be7e03bcbb3ef8168f0d9d5aa122e95604c62d97f8b7f4338e6ece88c38a605d0
 EBUILD dfshow-0.9.1_beta-r1.ebuild 1051 BLAKE2B 7b307677052456d972314e64de288153a7d12dded4cda7b6d10ce1e28f3fc81ce34c8934387843c1da2d79878cd097d426f918dec1241b6875a1a97ee8fff73d SHA512 996d8be6f69685b4702a051a054740de1fe07cd40b98822b0865395d10007c722e9c097d690b4e4f74155f643b2458be43d6a887f6dc1c8a75bfc625d89514f4
 MISC metadata.xml 432 BLAKE2B 070e05fa430c4198c17b388d23dcf7dc75bd7249a3de6d664399a1a30bd26126b18098b11c144ef639b63b5cd8d5988e95cead669c4cac5081496d8ed19e5c7e SHA512 ebd53dbe275b79137bdc3515674b9a23afba5d727b5deeb63b41e97e069fd2873e5ec322b6e4635a227c9a0a2ee5080755b4c8d5566a5a24abc74ee9c965c812
diff --git a/app-misc/dfshow/dfshow-0.8.2_beta-r1.ebuild b/app-misc/dfshow/dfshow-0.8.2_beta-r1.ebuild
deleted file mode 100644
index 5733b6700512..000000000000
--- a/app-misc/dfshow/dfshow-0.8.2_beta-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV="${PV//_beta/-beta}"
-
-DESCRIPTION="DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT"
-HOMEPAGE="https://github.com/roberthawdon/dfshow"
-SRC_URI="https://github.com/roberthawdon/dfshow/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libconfig:=
-	sys-libs/ncurses:0=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's/LDADD = -lncursesw -lm -lconfig/LDADD = -lncursesw -lm -lconfig -ltinfow/' Makefile.am ||
-		die "sed in Makefile.am failed"
-	eautoreconf
-	eautomake --add-missing
-}
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index 4580536db65e..3728f78f26c4 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,3 +1,3 @@
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
 EBUILD digitemp-3.7.1.ebuild 1808 BLAKE2B 3a81fb123fe2cef98264968f31abd4b41672b5825d96baa75ecf87070d91cdfb785e6521195d3d41f49a2d1d717b60321a906569f9f2cf0e43cec9033fa98754 SHA512 4d0bce875ed4bc7cdbc985d9acebb40ec74740a5c0caff5aa063b0178780b89b8c7b5abfeaabe2d03a70e10da07c3134335426ba198ca86e280b21aa51ab5687
-MISC metadata.xml 982 BLAKE2B 9a74eb54a17f249dd527e5aa4b292dadce934da1d1303ba6ca3bb5503c5e235836261495af1eb3c04e0322725c46838b1c902e8f5862856edb3696a147a74184 SHA512 8dda9bc7dff244e54e4951d553f2255bd1da1279221374fc514b5483e36ae129fc9e154c8bf07bf66b3ddc9b2bdac172184b3d9b89c06852f0f9f2237de627a2
+MISC metadata.xml 981 BLAKE2B 70fbbfade9dbd7f8d24b2c871a5667fe6028e0cf8c51b76dc574d089c42bb61f0f845d3a065c1c8264312fc938d3cb4e57d5e88bda945b3337df37c2941a32e1 SHA512 1928a628e949a7a383a52d3a35751002ae3c37da973978347dff8a422c92e283e3e1dbef345e6557344a2d1884180f3f295d88634d80096184842cc08553923b
diff --git a/app-misc/digitemp/metadata.xml b/app-misc/digitemp/metadata.xml
index 7ed6505057eb..d03fd51859e1 100644
--- a/app-misc/digitemp/metadata.xml
+++ b/app-misc/digitemp/metadata.xml
@@ -20,4 +20,3 @@ humidity sensor.
 		<remote-id type="github">bcl/digitemp</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 139ace8a87b5..e92f332010ab 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.9.ebuild 465 BLAKE2B 8016c13e7c56fdae2b23689f003940f76b1c7dd1284ce960360a12b1463674f54b4503a7ac5abb3a3c8e91e82c49c7c5315883cb36298243d1cbfc72e06dda1d SHA512 64840147c3285909fe240d8216ea6248e9d29dcc0f73d2f9d3690a9958c7a5a507107e001d77408c35ee6fc9d262e496f5be1c41f666d343596c7887a9fb47b5
-MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
+MISC metadata.xml 393 BLAKE2B 756a37f0c08bb53ac424590f953e4c3fb6c1042f9a3532fa81871360e514a8c00deb96ebb5d77a0387794dbc97f83b1a30b4888ef0a7705b307ec723c779d0d2 SHA512 dc8b1b4eb987f20d2a83252dd8b9039b9b28c31d76be46dc11bda46a62f7a40e69fb802df3dbaf998e3339bdfffd6037e13d9bf7dcc43e00d86dd7411efabcf8
diff --git a/app-misc/dtach/metadata.xml b/app-misc/dtach/metadata.xml
index b49e8d43f1e8..004af0fafb4a 100644
--- a/app-misc/dtach/metadata.xml
+++ b/app-misc/dtach/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 834444e0e092..d5b9f07f53e4 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -21,4 +21,4 @@ EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a4
 EBUILD elasticsearch-7.8.1.ebuild 2438 BLAKE2B 0d3520f7d4fbb3f8ed4c0d2934c9b8f93f7ca9f114a6e83d52abfc8a9b7e5b42ffc017c9aa7dab52c4ba5acd128c4f4fe58cb17dc5e13b7fb94b6bee71227cf4 SHA512 e4359d07a3245451230a0b129975e9cde5632a44bcbb41a6a28d4cbd845a392c5e72a9a5e9d325180e2ed67ff6cd26cc6d552ac5a4be40c1a5a07cd6ecdd151a
 EBUILD elasticsearch-7.9.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
 EBUILD elasticsearch-7.9.3.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
-MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
+MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 56857d7ba312..fd4d2ce0c024 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/enum/Manifest b/app-misc/enum/Manifest
index 9870144464e1..c6a3c9c93928 100644
--- a/app-misc/enum/Manifest
+++ b/app-misc/enum/Manifest
@@ -1,3 +1,3 @@
 DIST enum-1.1.tar.gz 59849 BLAKE2B fdccdf3a362b3a6f7727c76eb50e4d568b2c6be85fdb62af6f095655865708102e578bb3e4988fdcbb542b2397aff5ad024b89c0cacb120d676aed518bbfcaa5 SHA512 4d2885ea8d3d24d04360b32241517152ab25480c5346917e1bfb483dd0f50ae5a6cb8b4ca3552c04bdb0d5960b1e83502ce4d154fa8316b0e0ff5eae8aac3648
 EBUILD enum-1.1-r1.ebuild 666 BLAKE2B fb657e233f8adf4199a73da3cc5f6dc349253ff823c5653048c16ff18b44ee5dd3361f9596795fca97041c7fde83e476addf727aa1538dee57c34204a6e60ef8 SHA512 c117bc15d0c70d7212f3862e7a5ff74245eb2d760d894becb85333709b0b0ddd6f365d4d3669c133b852ab2e8da8feef7e98e6d85acad7fb6040abab18c39093
-MISC metadata.xml 327 BLAKE2B c4c87de1c4b70265f16d5e78197870b902605cf9cc334a4e0064fdfd3e15a6e01cb9013ca296b8e7ecd805d536dd375925ddcee49f80b1b4125762f971035a04 SHA512 e76ec4d0ea0a8a0c914f41578a52cd0a31942e75f13c3b0f3bd290a86c989f93cae9f5d76ab085acca6a5bc16cfb52429478034a48b9daadc4c95162b11f40ee
+MISC metadata.xml 327 BLAKE2B 0e0cb7305bc4a3d978a3471c7adb0996793de9f0248050884f1b7c71352fb43006341b1a6a6576a4bc87d95226a72d508fdbed1a81bd650c3feef63fcb145acd SHA512 7dd63b7a8471b72982bc122313158c438e3b956a98fd69e40d180cf247967360a57695bf6875547aba0f11050a6e1932b24a8ba16cb5cfb008fab640e6c74850
diff --git a/app-misc/enum/metadata.xml b/app-misc/enum/metadata.xml
index 9001d44827fc..0ca049dbcd34 100644
--- a/app-misc/enum/metadata.xml
+++ b/app-misc/enum/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-misc/flirc/Manifest b/app-misc/flirc/Manifest
index 3ee0221d44e1..1b9e2612f0b3 100644
--- a/app-misc/flirc/Manifest
+++ b/app-misc/flirc/Manifest
@@ -1,13 +1,5 @@
-DIST flirc-3.22.4_amd64.deb 9013138 BLAKE2B 5624f981fab68d58951d6f0411c059d098d260cf89a98c238b7fed0b7eebc2952d7584bfc9f0a6364757002a565faefbf489c2992031e91177ec8f3bb11979a0 SHA512 ad493a6efa30dcfd6f92dd7176cdd751c1129f669fdbaa4cf06a41447a5e1fc3ebd5d9100f82698ce82592fdd032bce86266489035879edc73f876177531576e
-DIST flirc-3.22.4_arm.deb 10643940 BLAKE2B ace0ecf667e177253a1de50d6c629092ac39ad16c838e5b99006ba39c6bc068ebb1cf624d024e5634d10ae0d03e9bddc5e91357bc0a8fa5eac84eabc28f691f0 SHA512 6767e0e8c7ef1bdc3c1d0b0637bf01816382dac544b2cd7fd344a0ec5e54b0ecd1b2d5a668533f7808b171eacddd54c0fb2463f79acbfdb3dd448fec0e8564ae
-DIST flirc-3.22.4_x86.deb 8989574 BLAKE2B bb1171def52e9171e3f97df7230de1f7bb6e2e571577e45aa9fe88bb11b663c322f90c0e74b4001e792954f8667105401aa0d3a05aa7b49264ea507a76f5c63e SHA512 4b51d0c6f89411ba54f412ac89b82760b8817ad774838de1af467dd0ca6d2ebf567a073d222f8563aedb68755dce53de8bff4a5dfa785d27f3123d206bbf2869
-DIST flirc-3.24.0_amd64.deb 9027598 BLAKE2B 5ab9b0c24eeeace872aa0c022d78afbd19a1edd5b54be26216f4cd1e63f2ecd11b257c53254c76aab0fa96eea57d2a346633c091ba109aa08551a5d6aeae4115 SHA512 12bc6fedc097491cbfa30ca26c0bf3c97a2fdbeb51e2a9ad26d0bf44f9020d2f2becbeaf2d760338894466f5c7f455abb608cdc11cd46893fb4bb79ed1ce7f37
-DIST flirc-3.24.0_arm.deb 8988130 BLAKE2B c201521e8cf4fd1e2dbd5be4eaab30a00660271524d0be9ee58563f60731247ee488721d6c2561cc4bbf24aeef56530ed87be5d83c73696bc2877b1a35e58526 SHA512 b5af7ca16587e6f89ea32b9127ed6f6fb1a4634189a39ca9242a87471efb6f0400a8e9ae2f0652095cc3a92476e419b2df529d938685435ab1f740dfe2621790
-DIST flirc-3.24.0_x86.deb 8992950 BLAKE2B 2435d65371cf4209a16862e2f18b3bfa24af6b1336bae87bf3fc701a764b491551c687602d0ed68834fd7083a8271b234db70003240e23bc970e844383faa92b SHA512 8c9a16c59a88057b90f6f9640c0729e2ed2c862f544cff8e42fcf3a7ee85cd2be4ae1e4b5e76e38d733996b985b01cdae40892f4fa1ddc52fe327a7ef07282c2
 DIST flirc-3.25.2_amd64.deb 9059418 BLAKE2B fc08c69defdbaff0c5b387855b6e9eee42ceb3e710fa398b7f32f694b978d5ffd6e49d942e8d94bb41b68bba05d44d8fa8fe88854ff4dafd0a607809ca229167 SHA512 75056d86912add575c5540bce59061fee949462d2011f601b3234abd3f058e0285f4e57a1151c59604250398cc868c7baf0fbc257d960c68f56409eece872245
 DIST flirc-3.25.2_arm.deb 9023232 BLAKE2B 527b51e09d52a56e2aaa3f23ca3ed52bf25651b649cf7bedbe0e21d693efc81a14821648ebc965217956c022af30cf23db3e6c07304cadd4234eec8b6ecd48c6 SHA512 325d569e05e4f4574e942a1b2e93bd462fa947ebafe6345adf38f07c0d6c3d4dbfebec106cc7034c737073fe6a82ad5e1fd38208f7a9432ad3479d0082180156
 DIST flirc-3.25.2_x86.deb 9029446 BLAKE2B 8efaf2fe21f04b4af0cf76c0c440d75724e47021c69e7c754ac46dcc4d7e808894a7cc6ef1a3f8dbfc929c53391f2697add079690019d81c6822113b9220bde8 SHA512 aef30713d0df41a1b0c964b4fbbd4aaac9cd75875926fd646a6f9fa3cf6688714cb148d5ab7750a8d182943c1980af3233a324ab8d7deb48b35753f2acf43128
-EBUILD flirc-3.22.4.ebuild 1138 BLAKE2B 9d4d35721c2a42dfe40ffb8286d105d498aa17be3946cb59d88d903fd874979d6b4fece661da2b7e6181e280cc730679486ed5a2681ca176e0a8354542b4a7c0 SHA512 15dec737b0a2eb272397ba5269c8fb23f53e47943f47285387258bb283b67992dc8f3be8aa696bd038bab0cc805c31e455db8eb5b397635688a3a95afd6ea995
-EBUILD flirc-3.24.0.ebuild 1135 BLAKE2B d562f9afdb4296500a8f06158046c45bf3f17034d8fd9f6a5f26c61008473148f4c07b7ea40cb2e6633683659f1a305f9cd86b3bd6e609df5ad7caa3b0595867 SHA512 4fe456c3d183a0482b73e1b013a16459a1995f2273eb2f6ed8812189a7bdac855bfa5caf4bcf99db10e3ba93eac5983c804b7934de8e69965fa08e823e016c12
 EBUILD flirc-3.25.2.ebuild 1135 BLAKE2B d562f9afdb4296500a8f06158046c45bf3f17034d8fd9f6a5f26c61008473148f4c07b7ea40cb2e6633683659f1a305f9cd86b3bd6e609df5ad7caa3b0595867 SHA512 4fe456c3d183a0482b73e1b013a16459a1995f2273eb2f6ed8812189a7bdac855bfa5caf4bcf99db10e3ba93eac5983c804b7934de8e69965fa08e823e016c12
-MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
+MISC metadata.xml 408 BLAKE2B f75684c92e32f18116c2940600b5b1b90d94c81aed4faa7830aafd478e66f4a11f3bef4d2a92f4c68c6ae2b7fe84c7ba0b310d2168856ef39b059a5e6acb664b SHA512 7f2895fbf37ce51106a56ce964ee677dd630bbfa56eee793508c5dc2f9bf525c5a356439726648996779c86113f87a0b10f37fa6eeb5154f622cb0b79888dd7e
diff --git a/app-misc/flirc/flirc-3.22.4.ebuild b/app-misc/flirc/flirc-3.22.4.ebuild
deleted file mode 100644
index 487445f6ea37..000000000000
--- a/app-misc/flirc/flirc-3.22.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop udev unpacker
-
-DESCRIPTION="Allows you to pair any remote control with your computer or media center"
-HOMEPAGE="https://flirc.tv/"
-SRC_URI="
-	amd64?	( https://apt.fury.io/flirc/${P}-amd64 -> ${P}_amd64.deb )
-	arm?	( https://apt.fury.io/flirc/${P}-armhf -> ${P}_arm.deb   )
-	x86?	( https://apt.fury.io/flirc/${P}-i386  -> ${P}_x86.deb   )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-IUSE="+qt5"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-DEPEND=""
-RDEPEND="virtual/libusb:1
-	dev-libs/hidapi
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5 )"
-
-QA_PREBUILT="/usr/bin/*"
-
-src_install() {
-	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
-	dobin usr/bin/flirc_util
-	doman usr/share/doc/flirc/flirc_util.1
-	if use qt5 ; then
-		dobin usr/bin/Flirc
-		doman usr/share/doc/flirc/Flirc.1
-		doicon usr/share/pixmaps/Flirc.png
-		domenu usr/share/applications/Flirc.desktop
-	fi
-}
diff --git a/app-misc/flirc/flirc-3.24.0.ebuild b/app-misc/flirc/flirc-3.24.0.ebuild
deleted file mode 100644
index 770c51abbc35..000000000000
--- a/app-misc/flirc/flirc-3.24.0.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
-
-inherit desktop udev unpacker
-
-DESCRIPTION="Allows you to pair any remote control with your computer or media center"
-HOMEPAGE="https://flirc.tv/"
-SRC_URI="
-	amd64? ( https://apt.fury.io/flirc/${P}-amd64 -> ${P}_amd64.deb )
-	arm? ( https://apt.fury.io/flirc/${P}-armhf -> ${P}_arm.deb )
-	x86? ( https://apt.fury.io/flirc/${P}-i386  -> ${P}_x86.deb )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-IUSE="+qt5"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-DEPEND=""
-RDEPEND="virtual/libusb:1
-	dev-libs/hidapi
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)"
-
-QA_PREBUILT="/usr/bin/*"
-
-src_install() {
-	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
-	dobin usr/bin/flirc_util
-	doman usr/share/doc/flirc/flirc_util.1
-	if use qt5 ; then
-		dobin usr/bin/Flirc
-		doman usr/share/doc/flirc/Flirc.1
-		doicon usr/share/pixmaps/Flirc.png
-		domenu usr/share/applications/Flirc.desktop
-	fi
-}
diff --git a/app-misc/flirc/metadata.xml b/app-misc/flirc/metadata.xml
index 9344dda7b30f..23660d540a47 100644
--- a/app-misc/flirc/metadata.xml
+++ b/app-misc/flirc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@k8n.de</email>
 		<name>Daniel Kenzelmann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index 2d2adbe6e3ff..7ec484543f19 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -2,4 +2,4 @@ DIST g810-led-0.3.6.tar.gz 34544 BLAKE2B 142fd54d7721a1deebfb019b644a4c8ab0fd5e1
 DIST g810-led-0.4.2.tar.gz 36669 BLAKE2B 738ca1849b05ddc35e42c258f67b2fedc2ab207594a32111aeca8cb1cffa99580e0f22e57ea92aff0e49f546e871b5af1c77cd5830349af98c9a977b27a0186b SHA512 03e62265964b6d47d474b57a92beb3a017e8479113750e7d52790d0779b8893eb7e3761f236db94ff1e1ddb0424c711fd1a35c869d0f93ad68104b1ddd2bf1e8
 EBUILD g810-led-0.3.6.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
 EBUILD g810-led-0.4.2.ebuild 2033 BLAKE2B 1624115e3b4412155f618b05aa73edc024b3cd6076be42453714cff38add7910b4874068dc4b6b0b08c8698120b85817caabefa000432b8c6a601da09c0acefd SHA512 e3f30b558a9c9325a500a3c50999ba1b7132665f2ae8bd8650484221778c0dab825a670460314d27ba102efcd65ff685110e334cde9bea207a1acb344f0c0a88
-MISC metadata.xml 610 BLAKE2B dc374b0b903c17b3418871362fbfe6bd47704f2d9d7895ffbbdfa468f98e42708d385d844cd96b04b88646f5b71f4acfae659c99f7c2fc5bcdcfbdb4eef18303 SHA512 978a7c99bf4e5f7a79e04055871645438322b950b8274512bdca9563050449ad395e40ba479ba70914aaef60bd86c3b41aab05f070e79fd7dbc61c941cb59fb8
+MISC metadata.xml 640 BLAKE2B c948b25bf2c15e5f7a16a5bbe3ecfaf09e4d2d0110745c58c1a7e850cc691db8e87a4e9e3eb5c1bdb3ebb28f1a977f8dd2dc5d624a26dd5b3f6983e18dc4ceb6 SHA512 69dbede1a939f762327f40629d284b23b5366e17e659355dee3de56a61e417c580e6c3a355f1c1ab44cc1b3500a361273e7146234a7309ff2274132d052f8010
diff --git a/app-misc/g810-led/metadata.xml b/app-misc/g810-led/metadata.xml
index d8e24b32305f..1eab538b0668 100644
--- a/app-misc/g810-led/metadata.xml
+++ b/app-misc/g810-led/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>contact@hacktivis.me</email>
 	<name>Haelwenn (lanodan) Monnier</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 27f166f559a6..fb6f90e88a65 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -5,5 +5,5 @@ AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d654
 DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
 EBUILD geneweb-6.08.01.ebuild 2193 BLAKE2B fbd1b8f71b4c1e1e33956659b08f5e4ea441a8266dae4b65103721520851e2a6eaa0f5c9d8a35d261a4677d1b1d88c939064fcc933e1e0952202c880ab251b1b SHA512 8c2c767970c1f6bcf9824ce5b4003e6452ada10a2c31b49f707a1aa9c8bff2323141065e553e3e07efef4a66568997769a6643ffb535748f1446832b1dbbbab0
-EBUILD geneweb-7.0.0-r2.ebuild 1750 BLAKE2B 58ab5f6b018c476b22212fcf18ce266e2bfabf174e83ccab7c31f92e09ccacf2fb6c279c73931f0f686da0b17455204ec5f698c58e407932b75b637722ab3087 SHA512 d5a5acd361d5103e7cf382193efa9201dbd5544e8a39b06fd413f6fc92b0e3abde4c281c46c73780e2bc046fb60e9cd8e2a20013e255984c705d3721d3400473
-MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
+EBUILD geneweb-7.0.0-r2.ebuild 1829 BLAKE2B 47c73aac31ad3308b1f222fd0fbefb77df46b00653bcc3ff073c497dcfe9a3aa87b5598c28cfa2536de26a30c1a1deb642390a6e3036917fccf07877db377182 SHA512 d871b881dfc6c9b4eb50f5437c133169bac4042814da40c2470ff502d00931d0721c9a2e3000d83da1a75c5dd38c931b9ff7514016d857c9b9406ab252c47f71
+MISC metadata.xml 652 BLAKE2B 1a96b9b6c9467f401450a4a71e7714d2bf87327963febe613c18236662ff8a992ef16315b38688fabf61124b0ebce9f618f81c29e56b53eb1eaeaf90be730cb4 SHA512 ce9b3c6218c48dae0a0b9998866457170a684f914b3f06e84f1e93d7fc52985237a1751fcaf06bb5d76fc093b4e4f8d06292dd0527c70ae4d128c5cd9c53c979
diff --git a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
index e96a2f98c991..17c350fb0681 100644
--- a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -25,10 +25,16 @@ RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/calendars:="
 DEPEND="${RDEPEND}
 	dev-ml/cppo
-	test? ( dev-ml/ounit )"
+	test? ( dev-ml/ounit2 )"
 
 QA_FLAGS_IGNORED='.*'
 
+src_prepare() {
+	default
+
+	sed -i -e "s/oUnit/ounit2/" test/dune.in || die
+}
+
 src_configure() {
 	ocaml ./configure.ml
 }
diff --git a/app-misc/geneweb/metadata.xml b/app-misc/geneweb/metadata.xml
index 4d7f59b58f9c..6260a92ed00f 100644
--- a/app-misc/geneweb/metadata.xml
+++ b/app-misc/geneweb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
index 80376472201e..5e3ebb8b1f52 100644
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@@ -1,3 +1,3 @@
 DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
 EBUILD gnutu-2.9.ebuild 615 BLAKE2B bc0996da02889440e32b910175f616840310124358cd859eeb198f2c7dda10526b9775d9f5da3525d195101a63cfdb0b6508f1d85ee2238d09af69ddb5f91e1d SHA512 646f8c0ebdfe18e9d7aefe7d4c2fba3e9d492a15b102fd312d9114f074e8cc0c214b82a4af925f1cc432b5fd997e8a04720dfc7eae5e4f6a75adc510bb285016
-MISC metadata.xml 1074 BLAKE2B 6c0522bee38564ad715c44022803d11f1999c5774ff07aac9ee42259a1bda24c024bc0f83e4c329dbb4d3d9e380aee4df61af9ec41dcd17064a3879d7b4aa3c9 SHA512 4e9df2df20f654d87bf9b6a6be9d873129878f610a25f08446135f8fc7ac74ecb35d7cef3de0aa06cd2b19768fd5bcd9d399d781de11533c8064d5cc61a2f0d5
+MISC metadata.xml 1104 BLAKE2B dc393761862f4740978b34bda85b67e4874487bc4da9786893547140311c6832ce375b273d67c43be5eb17deee06cce4cdf1ab5e4166a3a55297b65ebc531810 SHA512 4fecb8706fa65197a7318dbec0410f81a842c3398068c656ed30ab570311bfef9124613ae4c9904a7686103ddcdb3514e1bd607a16b54830b30db2ef66156f02
diff --git a/app-misc/gnutu/metadata.xml b/app-misc/gnutu/metadata.xml
index 29a4b57b7210..a7d422630ba0 100644
--- a/app-misc/gnutu/metadata.xml
+++ b/app-misc/gnutu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 4cde5fd65037..f4b5a6513099 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -2,4 +2,4 @@ DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a0104
 DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611
 EBUILD goobook-3.4-r1.ebuild 1179 BLAKE2B 36a578f5d47e8e327d660c8a09634a3937e4f1e8282123ed07a74ed394aa98b21a36304d1991bbd43b327cda20669f82b0a78269d84af1951787d926d510c39e SHA512 2eb41761a72a33a0a6422ba8066714fdf907df7daf9da51728f3a594724cef204f9ad6edaa9cbb586aa9014cbfdfa3d081579c663a53b7beb2a2397cb5ed25ab
 EBUILD goobook-3.5.1-r1.ebuild 1173 BLAKE2B cc3747e45d19ea46e390031c0566c415b0f571134c420755bfe3576d0cb25615e83ac1ff02c65348c658ed395ed892d34b64d3de9d6d2b0b01984d8388b8dae0 SHA512 1a588455d84feb5184631a44d700ef2c40f1b12b787a25c3b62e09f4ddfd8461ba738a7c6756717e600a647ff1ba641572f77e5af06b26ce448b8eb1786c3b5f
-MISC metadata.xml 478 BLAKE2B e898a1ca96096dd7ae1bc246db1a5fc938a2319fac72e7fcfa41a42da5f65bcc7628c87f6a59aff69cc802ce39c7ea7172b5af9ad2cb2c1c5c9d8063696efd86 SHA512 013fbe5c11b4a6eabe8313c049f5f82486b6db64f93636ceaf95d1369f56f8cec7f35077415c373bab81adca364afe8f284a945fbe6a95dd55d8c1d4994060dc
+MISC metadata.xml 508 BLAKE2B d90b6c0e591cc65d70190075968d6c327ed9490109cef726277a42ec2064c5ceb235983ecceb00e28825fcc32318e81745042f29b8e055e7df2139c7fa5f4553 SHA512 ea905765abcb6bfdc1e782ee4addcad84ca275744a0a1793ef3e77a96e0dea3f254a61f39f6b398b1dd338bb1c80c010fcb7b70df8abf4bcdebc4c06410dea93
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index da36391e86c0..b2ec768907c5 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <name>Kalin KOZHUHAROV</name>
     <email>kalin@thinrope.net</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index 4bb539fdec43..012ec45811ab 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -2,4 +2,4 @@ AUX 2.8.4-fix-install-paths.patch 1189 BLAKE2B bb9e00721bcc4cbb766e6ddb432b49a0b
 DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5
 EBUILD grabcartoons-2.8.4_p20141112.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
 EBUILD grabcartoons-9999.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
-MISC metadata.xml 253 BLAKE2B e1d15b2d2944cde7e6a52fba9fb0c75d3e73d2f1182572c7cd567f3658304d159f262476924df02b9c2924114283ec96cc24ef804fca9153a402a3b0208c1809 SHA512 8c92aefe6448e9d697177aaf5e6f5b08423d728ded122b1cec119079998e8e63c74558260b6b26bfddd6a0c7b50d13dbf4a825c5a126389885ffb75bf2ee478c
+MISC metadata.xml 253 BLAKE2B 4489ef8bc84ba73e03d70e09d8919f91caffb580bb208390ce4620392ce553b19b17daf0d3b479a7df27ffbf981485a582853467b06f66bd896c5b071c383090 SHA512 d3d3cc574c80956ed81a0351cd5164a7562e677a62ac5e3f8a91a8d6126986434c62ed69c46b79c88811c87358234195385c8d8e15b66168391584eaa9eb99f4
diff --git a/app-misc/grabcartoons/metadata.xml b/app-misc/grabcartoons/metadata.xml
index 53bef2c91710..1e8edd1de843 100644
--- a/app-misc/grabcartoons/metadata.xml
+++ b/app-misc/grabcartoons/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 15d53f40da3d..48cc52058a28 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -4,4 +4,4 @@ AUX gtypist-2.9.5-link-infow.patch 453 BLAKE2B 6fd312a511b4d151a42679a329e47acf0
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
 EBUILD gtypist-2.9.5-r1.ebuild 1565 BLAKE2B b6973250feca2d15ef1c7e26ac0749e1f9230d876cf590ae05ccba9f177fc7cd480341c75bbcb5b747ebe6bb282f441e4ffe86ccc91196b9904a3cb16485491c SHA512 4d0a71cba518197cfe1a7f1698ca31df7cc5d587983947b2bf6e989aea136d697b33e6fa8e3c746e106b6edd99a0cabff82165be194c3bd6552392038b79976b
-MISC metadata.xml 376 BLAKE2B 2a3e88e63a9e5ee940a450779f15bb08848a13cf35085f4cb56aabbff9f7f8fa3da0e1c8513e509c0fabe11f8f110446243272ab49bdf4dae84bd40005770027 SHA512 e982eb0d58b53908421ecc7ff65c0044cd2ef1544431505e57ff0e18edeb64978dfc01f9b9265c01945c08e116978b55e07216b3ffdac860039f82034fa7ed9b
+MISC metadata.xml 406 BLAKE2B 913231fa4e415fb6e9c7bb67652fa8232479dc009ec930dd57dcec1a8bdd4f4a311197bcdad29c79ad138012cec5f719f2372ff506d0e1fba8248a75eb0fd3ce SHA512 8c226f2754e76b9ec21f28f5973ff51a584e33391cdf89961e753f990533356c397f3e105036b7e160d5c0098d31b1581bf9610ac4a51547fac64a276485d955
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index 3454332014e8..88ada141a2ad 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>arjan@adriaan.se</email>
     <name>Arjan Adriaanse</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-misc/hodie/Manifest b/app-misc/hodie/Manifest
index f2029fad9483..663096249147 100644
--- a/app-misc/hodie/Manifest
+++ b/app-misc/hodie/Manifest
@@ -1,3 +1,3 @@
 DIST hodie-1.5.tar.gz 18450 BLAKE2B a3278a2f3ad0153606ce96d6a96981f80e2c4944c8a7baa33b438b7db9136be10f0bdfb0646c4e6f75e5ee2a2e21032d3c453e2fd6b5923f9b458b42e4186d5c SHA512 831e8e78f3353695f408b6f5602a8d8a0b633bd6df5d717b479d30d16989ddbbf426302e4d539d9babdc70c52a3ee3908bc0c8f24de4e437c475c0c2c5629289
 EBUILD hodie-1.5.ebuild 556 BLAKE2B 199f448d094fc99f2238e3f5f82ba0426af783cc4b1e2617a1fea4cc3e9298f4af78bdb14b31e0143ddc68c8c78a96d70705bb433702629e668023b0e9a70951 SHA512 bbb2803b4219f0780dfdc2eab64623a59b30124c33b14f8340aeda0f714fb3671c0fe9f4ceda72dd285f8ebf3f8d2a35df97a3805ca0070ef1ea0ca508b34dc0
-MISC metadata.xml 364 BLAKE2B 750fa4c9e1b40cda0dabeeab4175eed3792bc2edf122d37521278d7ad3b27da6b7593f2e05e804593957ae2612a27c517c6b730ca321a5adb8397071210331d6 SHA512 ec49ef9169296e47bf48aec935305acb4c83d526b3fd73b602d582b4478b86c2ab5f701a03ace79f0c1745755f845c047aeff1a8a49c582c339939c7bd0503a1
+MISC metadata.xml 394 BLAKE2B b6a2f6ddf5287c5d5608e667f3e47b4347dc9e70dd486dbda168fbd8c3cfa2acf2ab9932b40356ea4bae443aad2ecae5ba4b386f0d55b67690ad7bcc9d51c089 SHA512 6ea79b13bc62ee4048b223d8a981cd9818bfd343bdba3261b87697100ced559d65a901d1743dca42c678602c33cfa8b6b1d894d7be0a01a04190e7880a8c9c50
diff --git a/app-misc/hodie/metadata.xml b/app-misc/hodie/metadata.xml
index 8b8eb1b6e5cc..541144de8b14 100644
--- a/app-misc/hodie/metadata.xml
+++ b/app-misc/hodie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@nephros.org</email>
 		<name>Peter Gantner</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/imgurbash2/Manifest b/app-misc/imgurbash2/Manifest
index 2a06ca9a6374..6300b070aada 100644
--- a/app-misc/imgurbash2/Manifest
+++ b/app-misc/imgurbash2/Manifest
@@ -3,4 +3,4 @@ DIST imgurbash2-3.2.tar.gz 9569 BLAKE2B c34cc0cb8e5ca3b7b7da201dab90c3adbd115449
 EBUILD imgurbash2-3.1.ebuild 601 BLAKE2B 89ebc31aab052a83a482e669867a07d557ceb709d7bba03b6186e8fcd9a93ab7b369a8cd630c92f4e89c8bc513f8ba88a92103a3d4017d407f9e4a7cc27b0e3a SHA512 0d80a0b34a8f5414918e383a4e732ca1441afd367dc40ecb99ba6c81cee64cff49ef24f3bbc419bb0d10a8850995d34f420bfb34bd991d9eaf3b583fe2e66a37
 EBUILD imgurbash2-3.2.ebuild 645 BLAKE2B b48d7b8e1104950100b00a3629f29d88c7baf04ef0757c25fda29ddd0ead58ec0d17b17f504f93c558610b0ddc0c80c86ce9ac89bc41ab22247b4671c6252b90 SHA512 c5231527ecc57c22376e978bb8a9e0cf2850139057a7af3bb23288dfb62cb3c0d8d11b64162fc1dd1512e733b5ef306d79bf70b56a232c20f4fd3d771bf60336
 EBUILD imgurbash2-9999.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
-MISC metadata.xml 446 BLAKE2B d320d9d38032271643c158fa8bd5e356c41a2fa3d91c375eb58a42084f2d202a3728a4b49e2826111bf01de57c5e451b82be8cd8c11ce40f4ab86a41981839d7 SHA512 f5d5aa394eac1885bc1aec85009b73bce9f875ede01719a234a84d8a311441e372288abf04d993263828b0bdabee6da1ab81c7ebd70f1100f5c4c17a0ca6e1de
+MISC metadata.xml 476 BLAKE2B ca432be8775ec98b537b13c03d1d985c625963677f4d0a3e016a072e03327387edbfccd3afde42367b0e635916bd29585359ee92b9f8b12296bda1acd029d9f0 SHA512 72cb105961bb826e073a4705fff43ace36e4e765c23973d892ff797f92197914c31cc9ab30e6981c3ab00715f76214c8a845e3eb017bc290831c7848795d47e4
diff --git a/app-misc/imgurbash2/metadata.xml b/app-misc/imgurbash2/metadata.xml
index 080521c63d58..02d820bea31e 100644
--- a/app-misc/imgurbash2/metadata.xml
+++ b/app-misc/imgurbash2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index ad17dc9db9e2..7112649d9158 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,4 +4,4 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 911 BLAKE2B 2516e6f232f9da1ea9884358dd3f40f3651de98a67f25ccb6bff655b39dd29c6ce7b478c0308421b41b2e70279b8cdc0767920748026a9fcab913023dd93d485 SHA512 a1a4a1b71811d7180093d90e7c3fb53adba81e6af9b3c0daae4aa48a8cc8f23a2315532d37528e7af0c029c0417fd79458c7f2c69a2f978d76236d4a27745ff4
-MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
+MISC metadata.xml 258 BLAKE2B 488b1dca6ab52f028034ed9f03d7b4bcd929e80df6f5b4532514431e88e74baa3126653a549f7d543150fdfd0ed486c728945bb51cd93ee7683e364220bbb1b8 SHA512 c0b896a13e974ab97943c68645785443061cb0495466e9bffbb01c8683cf56fc8ac4ae476aba6d287b1b902112cd36fe267ccf3b305b1c991704640f50f8fd38
diff --git a/app-misc/inputlircd/metadata.xml b/app-misc/inputlircd/metadata.xml
index d50a83a22926..23d7aa7b0473 100644
--- a/app-misc/inputlircd/metadata.xml
+++ b/app-misc/inputlircd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 4b1c99ffc27b..7f8eb2b5ef05 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,4 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
 EBUILD irtrans-irclient-6.01.05-r1.ebuild 1328 BLAKE2B 3a56233f675d8515eb09675b1e0253a9403d99986699de28f60972052c88a1f28001b4c757499013a38c1d04fc5dd2ae965d01adf3f07fad6354496e39f6f58c SHA512 9a9c609ef2ea621bb1a1cd53ff5751228d3531ca44256d37df88eb5bdea489c576c1542c5ae79fc02d6ba44759548a1c412322fb65ca1d100ad69e53c7b737a9
-MISC metadata.xml 353 BLAKE2B 2dd10c875e6ad6330f05698e402ae3f702173425fb28552c0fb0be29be461719c04892b5405d4003e99f13d33bc4308ff60a399df5e30e1409893777008d1ad2 SHA512 0793beecc7f3ef50588aaf249a86e6c8b9740a2b9655507c337b823e400fb115d1b7c46360c200873622aedd496fe100e177d298c6e327800585b23660d6ed66
+MISC metadata.xml 383 BLAKE2B a0f465328da3068d7e32c3399640437080ec3cbd46bd6b8e5d776724ebe00b2dabc7ca89672bdaef609f0492ffb7c5005356c644b58d7dcc3dac9095ba4e916d SHA512 e483eef66a0c5f3a6cc788c125a6cac74df24157d3cadfe6c6ed047015f36d2996c16b1a7530c38fe38ed846d304deb4fe12920e77f8dbf0e34dcd658f307f66
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index 6ed3aa55bfab..ccd1178da2cd 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 <email>mario.fetka@gmail.com</email>
 <name>Mario Fetka</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 0fb6eee605c1..ff49ab67df4d 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -3,4 +3,4 @@ AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 EBUILD irtrans-irserver-6.09.04-r1.ebuild 1883 BLAKE2B 2381429568f1592a4dd2efd8426da328a0e1a202d9a6682c37f4adab0b76d7619643ec16fea38571c7b89eda6e1a5d7bff8092d4edb87b7de0b507b36c4e76cf SHA512 d1fde7eeabb728cb9cec417896a61a817523000dd7f7ce1eeff3958d721d9d1657603178e3ee9fafc7bf741436e4d41cba56490a62f9ccd8dc48d5085a078e01
-MISC metadata.xml 427 BLAKE2B c4da795721c8a36a5b9817e71589757731b6ae9c903192f6e0ad041b9f887cbd861d071b30f1337df6d6bb3fddac4a572010b731b0ceebec3a5e5c6db9387d3d SHA512 f2323a83f13bdb99de53f94a7052ed0b601dd21e600e78cd452d05965695053b4ed87b0d1e74ac44a5ae3413041165963e6217b1137793b2cb3de2af1f467b40
+MISC metadata.xml 457 BLAKE2B 9a6dc4962ff3c3e7816a1ece72106ea970d72ae525cd7d39dff2ae0cbde05ce7014b0af95060446c460df5ccfa39994a07594f0c55341cd2fdb5000611e44f99 SHA512 ec91588e4d6959585f2174fb45a6bd7edd2aad79e4d9552ed024d96b87eaa8fafbfcea47ff35e9fb4d61ccc0dea5ed8cd6d64e2e87edc7ef2269b83e81e15014
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index a6f45b6038b3..aa48b3cd9e65 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mario.fetka@gmail.com</email>
 		<name>Mario Fetka</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 446461db4216..96564f18c92b 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -8,4 +8,4 @@ DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47
 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
 EBUILD jq-1.7_pre20201109.ebuild 2280 BLAKE2B 8dc5faed9e3020ce63a080a0a61e47dc0157be4ed9ade031f4d12e68c39585ad33ed26341e0b4cc32f6eadb290ce856f4cf7ab0188a2af7ce653f91ad5b521d1 SHA512 84a3ee08112e77ad429cba0d3f101172b9179e85976fa26d4472366301d66ecfb3602d4152fb7eabb290702f749bbd272a4bd97bbb2961116783f9f0611e3ed6
-MISC metadata.xml 595 BLAKE2B cf785d8ceab62aa62f65f3f9eadf20fddab1e15f4461960e66a3b8c4fb747d6748a94576f2300ac7bef4220a635a51d90dc85d8c8eedfa097eef76c1dd9456be SHA512 ff760e992f881a3f7b252cbc59d7a97dbff503100d6ab72d2f0e5beae7ae5431bbc69fd58e3db12bb9c353826613e2c671790e04203a607a7029ca67003a42f6
+MISC metadata.xml 609 BLAKE2B 0ca0b4be60514d2a6ca287fab34e3e16574600fbaea6d924965242b27f25527f3ee3ad5b2c5ffbdb63662fba16511a9d70589990d4f4a506ecf7aba3e6541fbb SHA512 ca934d537070ea1ff8c7b6285870ee3aac60552b6b99e9fd7d361c157bb371926f532388d43e10570a27dbad008c5068ff4c9a17a05ffb14e7f95c84eeef19d0
diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
index 65a87c9344f0..48139e023fba 100644
--- a/app-misc/jq/metadata.xml
+++ b/app-misc/jq/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index a02d5b38a027..77a22776f5ea 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -2,4 +2,4 @@ DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71
 DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
 EBUILD khal-0.10.1-r1.ebuild 1278 BLAKE2B f88037dcccd4f5bf878687f42a96459b84d4c1e57b3b2e797542db99cafc14efa9c65d08bfad762a450b53d2338087138ed64dc440b1d155a0057d028b7e8dbc SHA512 6e6156925243a298f179b0bd3d9815d7c869fc837ba7c1e26cabb0e4911c8a469e32ece04338c2bf5366da98991ba650938477552492947e04739b74a7608d1b
 EBUILD khal-0.10.2.ebuild 1286 BLAKE2B 321c33092d322a11ba93cd0800ecc062a47d9ded1170e164ba779ce0337a326585938f5b1a1fb7f823e4ba91c316768fb5a863de3306276e5ab0b30bae5719c2 SHA512 ca02801fee34aa421636b14776d4330c57337bd3b86bf666105510c225f010179a7d057b19e1f92c789d9cc663a32d3880353c2be2f43910cb01bd1cbe517ae2
-MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
+MISC metadata.xml 284 BLAKE2B c98ae36013f5470384f56f63dc1cf49d8499e20d5062bd5adccbef7e84b9cc5caef1c76da113adfa81272b83099b71e8495282bf52ed2571a5cfe751fac88381 SHA512 0cc5d1286118b00aa801004d68df0c5cc780f4c2e4cec3f4652c5b1ea27cdbcef2fb6403482f56706239fae3dc4bbfe55eb5985da6ee9aaa9a286cdcd660eb50
diff --git a/app-misc/khal/metadata.xml b/app-misc/khal/metadata.xml
index 82b122eb7d08..91d3803bef69 100644
--- a/app-misc/khal/metadata.xml
+++ b/app-misc/khal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index e59781cc620d..b0916833e0f2 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -2,4 +2,4 @@ DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2d
 DIST khard-0.17.0.tar.gz 593928 BLAKE2B 488e1df70212c856d8dfa43955e681344fb1a257d765c81820444f6435d39aec782da9d01edeeaac0b9a87412db680fde368c39c74faa82b0eff2d7a0a2dbc6b SHA512 9cb936aeaa327b9837488a752906bf603429ca0c7240703829220119049f5f62e84f7e4c90bb81799307fe446c3aa47fe6ee4112c276b6bb329c959be438ba25
 EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
 EBUILD khard-0.17.0.ebuild 1206 BLAKE2B 176fbd0e298e324ed63d251ca19bcd158c16f1002c74f462deee2466349c3f9bcaadf07108a2bf6fe47f758f99d59a6650daa909b4a50786273c51a3b9cde8cd SHA512 b487c3793a47b1ec82fde6c48bdb5b2c384cb459625ab8677309b3e0e89dda5ebdb4da111e0e0a846712bfef69658bdc29d680f385739967d28b124a580bfeb9
-MISC metadata.xml 543 BLAKE2B 6da71501ec740c50c0d48e058620d59ec4224daaa79762dc05655962cc57d08ace200fed8e584185f63587cadffcae18e4e2870ff804a1901b559bf8825a0105 SHA512 3ed52f8d71a10c2c1ae9136434be79191d6c8c4f42f9c935c3f4d5e6517dfae09820ee8ec5436f73411ae6cba982d5e537ab5d3e33b9b66ab8759a560b8ce734
+MISC metadata.xml 573 BLAKE2B 11d9867c3a9f752b077267755b4d0d8bacc55678326774b756a9efe2dbfea462159bdde3d709e963e590dd9023ce645687ceeb76a474e9c0809a7200d5e4415f SHA512 afc9fd7488d435781bb8f5ac10192e2a8a3e200a4fac861283b5c0843a3ce04a8218eb561f3430ac77e8934b0af6975ca1e7bd75702e14ad4a5ff493b82edd22
diff --git a/app-misc/khard/metadata.xml b/app-misc/khard/metadata.xml
index 0810dfe60baf..845b2cc98fa6 100644
--- a/app-misc/khard/metadata.xml
+++ b/app-misc/khard/metadata.xml
@@ -5,11 +5,11 @@
 	<email>andrey_utkin@gentoo.org</email>
 	<name>Andrey Utkin</name>
 </maintainer>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>holgersson@posteo.de</email>
 	<name>Nils Freydank</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 124130dbdc60..2ff9f9b4414e 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -10,4 +10,4 @@ AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 EBUILD lirc-0.10.1-r3.ebuild 3846 BLAKE2B 77143c5af5cc855ec5a26aa31576101c4634a762ac99a17157c8ecb0b44ba7f1354f9c4a78484e99ea44b2ac1c6c77c703d3d7f632be4ab55fe19a336cfd0896 SHA512 9c3bd892362b3baa03db1570eea0ee497c34263218938721cf59914a07f97ecdba437482103e14901bbe0f0462a81b3363d693bc71a17b46f621d8572a04b0b1
 EBUILD lirc-0.10.1-r4.ebuild 3900 BLAKE2B 0d877b1c49bde58b015fff913fa03c00894bd814b302a774b5ac6b846a05798d02494a8b526514bffad32d7ca1dadb7badfb3c0b33aa04d587807a0eb679e532 SHA512 f9b2b8c1cad3491c6e56dbef33cbaa26ec856d94eef51e781f335275c3cfb469cda3c450f6a86b566d43da6f5f42b4db7df44037fcd5bea4433107b690964364
-MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
+MISC metadata.xml 817 BLAKE2B 2bf367849a5d41cc4a0b5827c41a45ec144e6c180295d8a2e00376a90b88f98fac655812bab6693464417553cb133cba59c982a84a76d54b0b94d302c0ca862e SHA512 3ed7ee97de581de955efc5120f20603dc29f4456cf2b51ec4391cf0811df33472d8b5924a52910ddf88b54733edbd7622ae5e86630bad1fc8527393f60f651b0
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 248b19f7b6db..ad60237290c2 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -17,4 +17,3 @@
         <remote-id type="sourceforge">lirc</remote-id>
     </upstream>
 </pkgmetadata>
-
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 3f5ba5b4d7db..c914a73e6942 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,8 +1,5 @@
-AUX mc-4.8.25-alacritty-tmux.patch 429 BLAKE2B 2621145cb976e0f9c09abf1071752a2a89a7b143aedde63c7b0c447cb930f1647b0b8c63a96f5f69b6f7abf718ca3b7784e0fa5b30a507f2a8d32fa3923c738f SHA512 32e27a75c55b9044cb2d4c392974e5e9916f1e73755f578102c7826f97525c0410bcc16a1e8b9600d4facc8be7a90fbef4932ef622fb59dc7c1838ad448e5f59
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
-DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-EBUILD mc-4.8.25-r1.ebuild 2852 BLAKE2B ffbaa4da65e9a2c95252ce2eb613da83579f85e451a564122dfae9b0d897c469451b4a45a0cbf33bc7400d3dc5a8e98afa3fe4447c2c47e5ebfa9f0f24bf9667 SHA512 7cc1bd97c31bfac08b248e9481ca7bfc98dad3540135f86efcef028c91a86e1aa87ad7c009c9f96429f4b8739ee8ab3158a2f736437114173a6e993db870ecc6
 EBUILD mc-4.8.26-r1.ebuild 2841 BLAKE2B ba0cf54b91292f2184b0e05203d0a407efe28eb13ff378ecd0b881bf46506d43d4a52e1d8d2218f2e864fcfad7167dbdbc0ad19030c3988fac6fd2075eaf238f SHA512 40e67c95d0a0bcf350d25a36edcc00bb850152328794b5a0a03a4243b43a31c82f910e11a10e15ef0eb40bf3f0845454802af223fb20b75fcac24aaad4ebdf17
 EBUILD mc-9999.ebuild 3039 BLAKE2B 080662107814c15a4889a73c9f3b9338a305fb10b5ae2369acfb6f2f818d63215e8e176af0d8fed2fda6a47f83d8de45bbd37d6c0c4be108e3a8dec8bcb9203c SHA512 e107269656f99702c1c544e161dc0a36663798d4bb3798213a5d05d6cca1a0c072f487d833a5cfe2f2b48abb983ed5ace4041258661bd61dcff0f8d3ed0d9cd4
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch b/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
deleted file mode 100644
index 239ac5cb7cb2..000000000000
--- a/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://midnight-commander.org/ticket/4149
---- a/misc/mc.lib
-+++ b/misc/mc.lib
-@@ -116,6 +116,9 @@ alt-shift-left=\\e[1\;4D
- alt-shift-up=\\e[1\;4A
- alt-shift-down=\\e[1\;4B
- 
-+[terminal:alacritty]
-+copy=xterm
-+
- [terminal:gnome]
- copy=xterm
- 
-@@ -137,6 +140,12 @@ copy=xterm
- [terminal:screen-256color]
- copy=xterm
- 
-+[terminal:tmux]
-+copy=xterm
-+
-+[terminal:tmux-256color]
-+copy=xterm
-+
- [terminal:ibmpc3]
- f11=\\e[Y
- f12=\\e[Z
diff --git a/app-misc/mc/mc-4.8.25-r1.ebuild b/app-misc/mc/mc-4.8.25-r1.ebuild
deleted file mode 100644
index 9d1a282a2ca3..000000000000
--- a/app-misc/mc/mc-4.8.25-r1.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
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.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 ~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 )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.25-alacritty-tmux.patch
-)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-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() {
-	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/metadata.xml b/app-misc/metadata.xml
index 98bcf3dff285..50733bcb1b29 100644
--- a/app-misc/metadata.xml
+++ b/app-misc/metadata.xml
@@ -33,4 +33,3 @@
 		misceláneas que no pertenecen a ninguna otra categoría.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index f429556a620b..ffed501e1d0b 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -8,4 +8,4 @@ EBUILD mosquitto-1.6.10.ebuild 2889 BLAKE2B 592c7c7439864cdc787843d07862f45aee57
 EBUILD mosquitto-1.6.12.ebuild 2887 BLAKE2B eee9bb7f59b73e59671478cf8099523a565c6539781f4092527b05563a6e7377abb66fa09bd8d675adebbe34e1126cc7ce3afbfc6538277d48797456190b5b26 SHA512 1b7f43fb0a47aff7de08cf12a86e5225d4f6830f480e4ad4c7f8d28aa8582dd74a4575798844ed857aabd575d13b4f2355597ff7df435fe0e387e3388f6e320a
 EBUILD mosquitto-1.6.8.ebuild 2842 BLAKE2B 9c3edb2fd1801aaf523029260906bf36d45a30f8e9170f2530e3e142cfa17e0ab0f1067d40540237e0d4995a5fd98c08272aef92a9d9262226296a4656d1abcd SHA512 b4654f1e54c557188967957e62b4def70a3766948a38a7a7d34f70fbd3aa00944feddb9070ccbcbbdcf93cc39cd6bd2bc2b71700b5476e885e7ae79ffa866775
 EBUILD mosquitto-1.6.9.ebuild 2882 BLAKE2B 3fc6ffca0938013e28973b90dd24be274d31a0699e888ba034a77906ed2c97044d9219a91487cd9ec4d19d07c92b2db533cc1d447f5aeb1e010b1e85911203f0 SHA512 557e802c11ffa1ecdc53da365d3a2773997a4571ecb529f1c8a1ec5e07c63ae0f3790e66a7b1e9ab8fffbf197c2f3490558ffcfc5e8c327c05830e10c812f25e
-MISC metadata.xml 611 BLAKE2B be4691b67eeb17bd99ecf3783ddb5a7065f4ea89d2a4ff1a73fd572e6f720f105c7d49b91b7328e69e10b69b46e4e06147451586e3dee08f7a46bbeda3307deb SHA512 3fd1d005ee668217d3fb24c3954bdebe469f2194b332539f561fd168c8e738bc00cb858c497aa83629cc347481e9609c588ec889be260bf49c822e304bd21ff7
+MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 029cf18b51fd..ca427d5de466 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 83a21e2b53dd..969ebddc9858 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1,4 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
 EBUILD neofetch-9999.ebuild 939 BLAKE2B a9e42345b9a4a07ada01f8f5a3b38749c58673059fc256506cb73334e632237e7824caf3b33c5b4d2b1aecfa78bfaf5f010b6babd5efd3ebef3ebc6ba7cb842e SHA512 c4d7d5aa941269102ef16f071a0ce92717f3975d41d89adf2a986d47e848de5fe912cdd1c3739bc2325b2d60d86ec8c9d2eacd53d687a1baed5b4950676e31a2
-MISC metadata.xml 832 BLAKE2B c92c163b1e21732707fa19bcaf9bae3de4fb2affe29d8076cd36ccdb68e9f3409ac00db0b2e4bfaec02dbd15817de343ddd4b622b04aec83a05e1c3f87575a34 SHA512 8a81813a52396aa002730820d743f52baa96dda5e5ae8bf4c5058b80f04fcc7948e02839515a76d241b8064f77c02517806c1f1b94d8b59917c4fefcc8f8154a
+MISC metadata.xml 862 BLAKE2B 962450327b7dcc5718d64b88ce3d8fd1b68a276d17d347fb7e7729bd8181b4c3784b2d8444d9afaec4c64082ad74cac77ac381976b404b5350c4013b041c60db SHA512 ba333d9291f5d56e1d942eb40278c13d2bf2cad13c0eeae0fe1d83cf516810af7086b9713aca2ed3a580bf9ac33b328bece3c52a1bcce1e197430ece8549e94b
diff --git a/app-misc/neofetch/metadata.xml b/app-misc/neofetch/metadata.xml
index 75a47774e2b3..b6385402dbba 100644
--- a/app-misc/neofetch/metadata.xml
+++ b/app-misc/neofetch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>herdiansyah@netc.eu</email>
 		<name>Muhammad Herdiansyah</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index a178b48b5510..e85c31b3913d 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -15,6 +15,7 @@ DIST nnn-3.2.tar.gz 143122 BLAKE2B 1d5cb823d274e0ca8d15be75a6df149697d81abd5c60a
 DIST nnn-3.3.tar.gz 148795 BLAKE2B 71aa01c6882b3ea95331cb97d309218b65b8a1ab515a026a49b90b9dfd3cf5eed9b1337bb1d1d39a4b3f9e21f4d2bc0f24b29c380b8b66a9e9d5e42139bfa387 SHA512 34b772b4a876f7b31fb7badc1d7854faacebf266e4bda29cba0d2ee8e6728b5e7a842a0964a7d28d82d39053c8325dcafe6dafeaae43e7a7cfcc0e5d5dc719e9
 DIST nnn-3.4.tar.gz 194844 BLAKE2B 5b41196af67720a3485bd68b6c08e4ab41e8308d5ed0e279ed4b215acf1cbe0e10ee3a39b47b74115111003ef5a3d9871c71bb54e3778bfbc6597eb7de751deb SHA512 91b19e9a4581c6367b5c90b8294232fb77d86df348a6b4bce0df2336cac14493bf48cad52e02e5b6b0027c2ea14e3b9f15cc70d78abe82687172169b958ca918
 DIST nnn-3.5.tar.gz 205980 BLAKE2B 4c49fb0feb4f04075fd64d0b42643256cceec84185df2fa78d5d1fc04177b446b443ea3843434d844206ebc120820ff97b33f7703a76aed85af044f14f985621 SHA512 87710ca251906d22afc8d329675675c81fdf1d6e71f4f4991ab36868105906b6d45c2c84dd118beafa79644a0677a66bfa346ffe9a4516082d899c5148c5cffd
+DIST nnn-3.6.tar.gz 204688 BLAKE2B 475bd783333bbb55f0c64a3028712792f9376f6a604ba18a7aef3735f1afc5aa91f419f3f41b2c14d525d02fb30db6ca7078fe56f4c7cce2f97c32079be129ea SHA512 e997e2279c495c7235fdfd51ffcc36949686889424686f050329c7f127c62f3ddc807a758ee1b18b00a1884eeaf9f94195d02b2d0e2d76ae1523b8bf2cef1232
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -32,4 +33,5 @@ EBUILD nnn-3.2.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc
 EBUILD nnn-3.3.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 EBUILD nnn-3.4.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
 EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
+EBUILD nnn-3.6.ebuild 925 BLAKE2B 7cc045f7c53e61b9b364c540f6b6e1807f0948c972d20c86fb0080bb5002f2b35d2fa2825dcd6d3d07ed3324c9827008efd74f94285deb1b66a5ccbbdea97b18 SHA512 c7bab0060018e802c9e196e426ea9fa93aa8ee09a6a9d30568b6de44945e279aaf056b69dce76e7600fa890791d16dbeff9a4a3fbfcddbaab0aa45894d097d9e
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-3.6.ebuild b/app-misc/nnn/nnn-3.6.ebuild
new file mode 100644
index 000000000000..90a0ed062b70
--- /dev/null
+++ b/app-misc/nnn/nnn-3.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	emake PREFIX="/usr" DESTDIR="${D}" install-desktop
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
index c468e377a38d..9c308ffbbeaf 100644
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@@ -1,5 +1,3 @@
 DIST note-1.3.26.tar.gz 53485 BLAKE2B b88fe67b708d85a60ea705caa99506a5ef59c442ed233b349cb07bf1cbc80514e8324b63f6e7a1ea6727e9742b11ecf4c460ecda818fc03de4532a132e3aa608 SHA512 4de22da10aef93e694cd1facb356666241435d2a468c25d43f42453c708d9a75b451820a01d952e587cca34b310a64c6e0069cdbe264376eb0cf50e3f852a252
-DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
 EBUILD note-1.3.26.ebuild 1342 BLAKE2B 9c0bf0963b79e1dcd1379429733b8eb7abe38fab19159f584ae2cf105b13b48966218443c11cc7c733c96b158503b0eb6325317a2b876d3c1328b241a02d170f SHA512 533d74bccaa70c097a2de704652e00f330bbd055ce3b75ca2d804e5956ef1fbd506275678a914d2cde18331a6245c4e926ca49125da1b9f573e2eb69d94a0c91
-EBUILD note-1.3.3-r2.ebuild 1321 BLAKE2B 048c1db99c1562b4e1e2ab89ef50c4bd338a9a87b7eb00a1c1e9e1ff08ccf9a81abf33622dfa2a753841d492fcfa24d4c7fad6c38477e42e2b570fa589f1db38 SHA512 9213fd08ea701cad178fc0a222accc4bfcb9ccb62034fcd58e87d0b90b02a9fa8ae445807d368f9e8c519393bfdd251a032847b69ab7e424b9f8f28b81439c86
 MISC metadata.xml 404 BLAKE2B d3156915a5f7af0c7bb45f39e7083fefe0eccc23fa2e278b236447144dbc132443fee61adda923687bd507892fa1d027e2494ce63f0ea219ba2274b036d2d533 SHA512 e2e8d63b287148f69f14e2fef3ee6c89ada388d69ea7a589a5ca8e75726d93fbcd419bfc26ee09549a429aa0ecb63a6e521ccfe25550f6169df3f6b92a7f078d
diff --git a/app-misc/note/note-1.3.3-r2.ebuild b/app-misc/note/note-1.3.3-r2.ebuild
deleted file mode 100644
index 59c93175ac43..000000000000
--- a/app-misc/note/note-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="A note taking perl program"
-HOMEPAGE="https://www.daemon.de/NOTE"
-SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="crypt dbm general mysql text"
-
-DEPEND="dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Perl
-	virtual/perl-Storable
-	dev-perl/Config-General
-	crypt? ( dev-perl/Crypt-CBC
-		dev-perl/Crypt-Blowfish
-		dev-perl/Crypt-DES )
-	mysql? ( dev-perl/DBD-mysql )"
-RDEPEND="${DEPEND}"
-
-# extraneous README that gets installed into the perl module
-PERL_RM_FILES=( NOTEDB/README )
-
-src_prepare() {
-	# Supressing file not needed
-	local v
-	for v in mysql text dbm general; do
-		if ! use ${v}; then
-			PERL_RM_FILES+=( NOTEDB/${v}.pm )
-		fi
-	done
-	perl-module_src_prepare
-}
-
-src_install() {
-	perl-module_src_install
-
-	# Adding some basic utitily for testing note
-	exeinto /usr/share/${PN}
-	doexe bin/stresstest.sh
-
-	# Adding some help for mysql backend driver
-	if use mysql; then
-		insinto /usr/share/${PN}/mysql
-		exeinto /usr/share/${PN}/mysql
-		doins mysql/{README,sql,permissions}
-		doexe mysql/install.sh
-	fi
-
-	# Adding a sample configuration file
-	insinto /etc
-	doins config/noterc
-
-	dodoc UPGRADE VERSION
-}
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 0a06da9810db..8ae36cb77d06 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -1,11 +1,7 @@
 AUX oneko-1.2-include.patch 168 BLAKE2B 48b44fd9269c51a125ea9093c08b0d07e64ef58877c027a20dce75ac3584d8cecad20f785caa0d11b77bd25e9fc3785ddb7c3874c3cc7c7a79310984ac4af920 SHA512 001c47f84a921b2b963282d8132336a2b6368f85dbfa94e294d2dd2054a5697c12fd8d48ad73ae0e0b38039613c3e1b8866e832bedc6162d661bad71643a1702
 DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed62ffc37a94f9afdd54cac9c251eb82a85cbf7ef31af36c010d54310d79f079cf43a6ba3761ee3b18c34 SHA512 f3543be2bac0d14d3db5fe6bc33cf59caae743d547993fe010c79d2bfc6f8720d608026d692733b7519d5b6b99db09f58f34af9bd2d8fcc3556b6994734f24bf
 DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
-DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
-DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
 DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d015b53f6dc1e28a0e841c55da18710bfc3825786dc8ee8ce06b5af1ca41445661d6f5c10225b80c6802ab5d2de06dab09de10e0 SHA512 35656ade57e57ba400b6e2d0f9dcfa1b41a7002f874f1113db080d9e75e390ff0e1f4ec169fbcf1cbea135988500501c65a2f520eaab196b8d92ef4feb993baf
 DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348
-EBUILD oneko-1.2-r2.ebuild 1662 BLAKE2B 016fc1f8ce45f304683bb4a56d5d1a5acf7029f4704d46ca5d3cf8c9089be0389cb03f444db45681cbaaab7e70e0b3e5b8076f6ff47ed9d5491b50f8d6fa5519 SHA512 031f740ec81e3e4b6a8b94191c8422bd274a68c3c36f038208cf3253bcfe522c1ba923b44eb0ef9ee4b0ba5837ea5ecb2068109b9b5266fef58789921f5f8fff
-EBUILD oneko-1.2_p5.ebuild 1369 BLAKE2B 0c43a1c58a73538b6ab7ecf59723b9160cddb68094ec4e415ada1a94bea85cca0934e6e3a6584cbfeb62088ba0279872b2c4a68ac477f5879b637f4996aea9a8 SHA512 517d0576f509b3f99ece67b42c7da2a2ace712cf79fe0902cfd44609cd22594dfac3fe6332a3738aabeb86c7b32b8ca69955b99f4203c9928e3e15e65cd80a23
-EBUILD oneko-1.2_p6_p14-r1.ebuild 1669 BLAKE2B f7a597f8670b5592e25fee76ad97c9c8e7fcfe6b7bb9f9d2fd1d5ed39387fd6885c0d38f9bc76fc1f835b811c94e6e2d2473c16650498facc7da9f433e3d161b SHA512 7729a838492ed85ef5fca9fba6f1664bc438b6bc2c05ec0c9a84a05365a55c3fd3c903c582b788c1ca84973570fbdd83304aa555db68dc215d3f9c681c1a0639
-MISC metadata.xml 623 BLAKE2B 55087cf6c20ffb041c6f80bb0adbdcc561c282e8de2284e139bf2b9e7156469f356210018f23229e826cc2822e84e88513e29b7dc25dc55eec583e2cb456ed72 SHA512 5f78a9557c5e87edff59075bb5a7d4dac93b4b1745244ad8b89ddcb02e997dc859bf682b7ce4dd774eab4d82e48f8895a86679b24a702e3b054f825b5d6f14f3
+EBUILD oneko-1.2_p6_p14-r1.ebuild 1665 BLAKE2B ba72f644daa7da6cc82980f2e90dbbdd99c49fd062b5905bf3fd006538a4fe5d74e9fce01221300f7c9a6ef21332e0d3368164509b27bc16c3d57834c1d3b08c SHA512 79573887ae7bccdc8980a6ae067d3aa0bb5562c56a36350253f64c8d92a416f9fdf52182a83f3e0f0d84cfcc901f089221da65c50b3455adf4046688244b347a
+MISC metadata.xml 623 BLAKE2B 91065c4a60354be6d48ad0f26450d0c1d79358b61555b31deebf7186c39cbd6750291691de9ace29316db5b3437d6cb11fa50df971c07a88891b744dbe1bb4a0 SHA512 9a73ce96bb6c2ed05230cb673c3f7c22e97919aeae95e60fe8df4559c908a4553d6f8eaded6625952b6da20d9ba428b6fcc4f8a3a0b38a6ad3c3675bd5640fdf
diff --git a/app-misc/oneko/metadata.xml b/app-misc/oneko/metadata.xml
index 4f979a604e1c..fb799421c54f 100644
--- a/app-misc/oneko/metadata.xml
+++ b/app-misc/oneko/metadata.xml
@@ -5,7 +5,7 @@
 <email>desktop-misc@gentoo.org</email>
 <name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 "oneko-sakura" is modified version of oneko. KINOMOTO Sakura chases around your
 mouse cursor.
 
diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
deleted file mode 100644
index 8ef1f755b8e6..000000000000
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
-HOMEPAGE="http://www.daidouji.com/oneko/"
-SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz
-	mirror://gentoo/${P}-cat.png
-	mirror://gentoo/${P}-dog.png
-	mirror://gentoo/${P}-sakura-nobsd.patch.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-
-S=${WORKDIR}/oneko-${PV}.sakura.5
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-sakura-nobsd.patch \
-		"${FILESDIR}"/${P}-include.patch
-}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin oneko
-	newman oneko._man oneko.1x
-	dodoc README README-NEW README-SUPP
-	newicon "${DISTDIR}/${P}-cat.png" "cat.png"
-	newicon "${DISTDIR}/${P}-dog.png" "dog.png"
-	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
-	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
-	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
-}
-
-pkg_postinst() {
-	elog "To kill oneko, type the following in a terminal:"
-	elog ""
-	elog "killall oneko"
-	elog ""
-	elog "If your mouse cursor changes to the default black cross"
-	elog "after running ${PN}, you should emerge x11-apps/xsetroot"
-	elog "and run:"
-	elog ""
-	elog "xsetroot -cursor_name left_ptr"
-	elog ""
-}
diff --git a/app-misc/oneko/oneko-1.2_p5.ebuild b/app-misc/oneko/oneko-1.2_p5.ebuild
deleted file mode 100644
index 6693ade88c71..000000000000
--- a/app-misc/oneko/oneko-1.2_p5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
-HOMEPAGE="http://www.daidouji.com/oneko/"
-SRC_URI="
-	http://www.daidouji.com/oneko/distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz
-	mirror://gentoo/${P/_p*}-cat.png
-	mirror://gentoo/${P/_p*}-dog.png
-	mirror://gentoo/${P/_p*}-sakura-nobsd.patch.bz2
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${WORKDIR}"/${P/_p*}-sakura-nobsd.patch
-	"${FILESDIR}"/${P/_p*}-include.patch
-)
-S=${WORKDIR}/${P/_*}.sakura.${PV/*_p}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin oneko
-	newman oneko._man oneko.1x
-	dodoc README README-NEW README-SUPP
-
-	newicon "${DISTDIR}/${P/_*}-cat.png" "cat.png"
-	newicon "${DISTDIR}/${P/_*}-dog.png" "dog.png"
-
-	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
-	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
-	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
-}
diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index eb47a60002a6..262843e5b3d9 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index e21c9f64ec94..55e5f17f1290 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,5 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
-DIST pax-utils-1.2.8.tar.xz 704804 BLAKE2B b64b50f985320618e10528aaddbeee9a2c86b05724d8564342fc78fd8bd31a84f3cfe5e6051b3b8a1a882bb0b3da586ca351b6fdda0fd6168930e8e4a44806cb SHA512 c211defb72921a6dfa950173bef7ef6bc5ac059dbb394a82d2b2455d082843fc7722a6819f37aa39033bd37a5a77880f193f8be550020320e87ce5becfa6e5bf
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 EBUILD pax-utils-1.2.6.ebuild 1890 BLAKE2B 5178e5c8495e24305743efd40f8a1a656efa0673b46854fe32c2c6cd2fadb6d7e51b0ae9a67a3e1ff5ab45d5f60f681699d52426c1b7b767ebf14cb709a6a8e8 SHA512 f3534814ed8b649c568e00de1c1c1aa01759c715fe5228bc6f00f990e973840e48108dac2ce6a3df25783d8441d7d651e91072a2c1a2c543bca7a6692ee3bab9
-EBUILD pax-utils-1.2.8.ebuild 1899 BLAKE2B 92234ba91caf039d1fbe8cfbd5e01c598584df51e78e360f0289efc845bffe24193327d7ca7a4383cd5aee6e753b3bfc7b837e45c9b50dbec6f765046b82f075 SHA512 cdfb54fa055c75632d905ceb17781ce7f81866d6ce7730f985ebce641189b20131643b81d26273beda5b06d8dbcb71ca815f9e84a4e99f8ccb02bdcc33db31b8
 EBUILD pax-utils-1.2.9.ebuild 1896 BLAKE2B 76d23260e4931ab9fb662fd3877588bf9a97dc676715295ee51f0ab4326417a1cf3a231010609978254f33cc4eada65e712acb0b5cd60bbdf633160f06a0b972 SHA512 1789ca639879708109d1e12d4e41d0c42c73d537e11d33f6f82734efe121139ab5fd0843ea0252937f152e3f8d9c3ef38d53065e39366ef616b345b9df33f1ab
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.8.ebuild b/app-misc/pax-utils/pax-utils-1.2.8.ebuild
deleted file mode 100644
index e7a257126c0c..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit eutils 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"
-
-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_MULTI_USEDEP}]
-		')
-	)
-	seccomp? ( sys-libs/libseccomp )
-"
-# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
-DEPEND="
-	${RDEPEND}
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
-"
-BDEPEND="
-	caps? ( virtual/pkgconfig )
-	seccomp? ( 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 ||
-		has_version '<sys-libs/glibc-2.10'
-	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/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 4d50e28fbb67..9ec217163307 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,3 +1,3 @@
 DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
 EBUILD pdfpc-4.4.1.ebuild 1242 BLAKE2B 0f4c09533bd338ba82265d800dba50f15e6c575991d9a99700567367b0265bf4090b6ad09a9aa3c6324a80fb77b0105620cd024439c01ebc747c22ba29b8cefd SHA512 a94bd059f53ea505c484e660fa894a6e9e0d2186642ce26e064db220e6c60b9a9978278639f080150fe9bcec441681d2d1f9cb7bd70f12e2fe8ab530286004f0
-MISC metadata.xml 442 BLAKE2B 2c0c51b3e75d8e7012fa16b4d289c16c929c15c9967d648dd7d4dd474c930deccd53f39cc6324bca81a697acd700e04eacca5d34f6e66fb320c2b01d602f9b0b SHA512 63c75c7e256649f353b2e0015d9952a7a51c6f49c09c37acc45a1aae6560ee5df0f7969d2bf9c9161a059238b5ba21858e94fc5a3736345d5bf75482e4278fa3
+MISC metadata.xml 472 BLAKE2B fa7e72fc0dc5c0e7fc06c2790eeeb6d683af724455b3fe02407cf6f9006649abf171f3f166f916a74521030b249d64829bca15c48b6a3f8b121f437f35b524cf SHA512 4c7f9744c5bdf49c5eea81b1d96eb38a76ead9557683459c9ba506af6be325d0128b7f427609a811514e41b63a65fea6d3aefd34c2641d25f3e933ca80ba1c38
diff --git a/app-misc/pdfpc/metadata.xml b/app-misc/pdfpc/metadata.xml
index 0954067c0543..333ba8195ae4 100644
--- a/app-misc/pdfpc/metadata.xml
+++ b/app-misc/pdfpc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 368b6406c8f7..f96c5c8e3c57 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -45,4 +45,4 @@ DIST google.golang.org%2Fappengine%2F@v%2Fv1.0.0.zip 310156 BLAKE2B 1c3465601193
 DIST pet-0.3.6.tar.gz 2739396 BLAKE2B 16fd9cd2e80d742b7f56819318f709ebe40902e9096c4b5f11b4dfb5341c78b491e70b1d5e6ff81d758413b9b2276e9bd87e99eb320592a70f93a2c75c805892 SHA512 366eabd93865ac72f9d251d51393ba9ad5904195d40f26da80a371d6d2183b5e81156930b137b1551ef2bd372cbf235847dd8a7ac8c7d4584c9d326325d30f79
 EBUILD pet-0.3.6-r1.ebuild 3090 BLAKE2B e94be83612c2aaa16fa07b73c87494125ae94bca15b1de10355990b2e64883ecc5791b1b625c2c98e5ee9e063c5e24736afaf3f0debdec9940d60f58c4405cef SHA512 8779018dcf52dfceeaa4987efd41f39dd332b240443bf7d4222043aa4019f9f1e898a460dec180c985d0a6bc32f22c60c285e537e47688e97cd29c54328d908a
 EBUILD pet-0.3.6.ebuild 2939 BLAKE2B b864a4138f8bc468eed85b9c4988052b984f178c1d689fee4616b35bcd71801c41749257d6a886687b5b0233b1690f5bd9e606d96cee6e94702bf469c7908a84 SHA512 bb03376315f4350b313d02f2697594b2b654a936a64f5853821aeffeae6ccb7b90f98a96863081726eed666c9981e9f476d1e1db3bec4c6be9436f895cd981b8
-MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
+MISC metadata.xml 799 BLAKE2B 9375e88c18c18ae6efa3c3b569d7d8b5fa5ceadc56838c93be0b660a76d20bb24c1306af29047490afd9679eb7d950050de0ed2847c744526b98968aa2bd74a7 SHA512 874752c55d21c1f4176de63d3d097bab392e8a6b58dd2a64979d08e6f6df595d7d23e42557bcfc0f410a5cb13598a0579c55da536b54e40e5cbc2cb0473a45a1
diff --git a/app-misc/pet/metadata.xml b/app-misc/pet/metadata.xml
index 95a5086f8109..8b4499cb1f36 100644
--- a/app-misc/pet/metadata.xml
+++ b/app-misc/pet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index dea124c0ff3d..603fe4794b23 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,6 +1,3 @@
-DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
 DIST physlock-13.tar.gz 14123 BLAKE2B a43f151c1660c38bd028f80742637a51d5108e6769161c88fb269ac03c827e49bd20e521b8face6aa6a71a8ab65ddf8662e81e8251b74c13388070ed04d4e13b SHA512 85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c
-EBUILD physlock-11-r1.ebuild 551 BLAKE2B 50d5ea880dc464903a6d60a18a773eb0286d78923533624dda8c5db954c8b2b6ab3b587e41c3d0231d2cc842684d4c6d143989548a83318045c8e9395bb5566b SHA512 a7bebe09db65ef32be5af4bb73619d8b45dd142cf7d940f77144873b95ea3004536fe15c565c57f3ab711924a778ffaeef50992ec6fb9ee45577890e012fd353
 EBUILD physlock-13-r1.ebuild 827 BLAKE2B 0318aeaf8aa83b09543d73359793c089dc0e9877de7a33d098bae3d4b30ffbce073f4b82a8829814f9ed47dd9118f166be4d82c98455ce01be12bd48d96a86d5 SHA512 cf974db0960391066be2f53345b7c6f5810e107d46d07e8cebbd48193222aa03b7f1c2309a193b3265e5fadd5e58ef3202f03d903b64769e317cc37bb6a129ab
-EBUILD physlock-13.ebuild 817 BLAKE2B 5ada26b839b729c42bcc6cf056ee065d9ac692b2e2805b4681dea7d24a0e2b112f0c412a86d098dea3bbeadcdf23ed32c5e5067dd638bdb37307e428709cae79 SHA512 3d1e7e195375d1db115cc41bf138442bbbd5019b0f3feb03001af64aadf2733e07a0b955ba2b35c91e94fe1e5d6bd0cae45255666fcbaa1977e87a8573d2726c
-MISC metadata.xml 950 BLAKE2B 3fc676cd63b6c70361d47ac45781b969129100a21c5d374ba8a563dfe9da2ea5eb18e34f07502ef2265af36dc76ceae55cb9b01c58ddab753f225c951e5a6e5a SHA512 bcbd8f01cc353619824dac7dced66bb3ecbb09ae3b11c6403153cee62b9eafa2a5cbb45f1809994901be0915f23006514aa7400be16ecedf27544aa30c9bd8d9
+MISC metadata.xml 980 BLAKE2B 91d6f8f672008257215864ef06b1b5a09b695d9dd1f75c1c028e3b8a34536f7f327e8279847f0bdbe49f621d278005309873de346b5e54e8073ffce8c6cd612f SHA512 99c579c2185efecfe25d8093d04ac2c48baa3f826e2db276df47268cc1cd4f7ca5fbe31ed5fa432990bf714fe6d5cdb50c8f59e1ff215cb12b9f0478cfd0d770
diff --git a/app-misc/physlock/metadata.xml b/app-misc/physlock/metadata.xml
index f37bd00b3eed..36d09b35682e 100644
--- a/app-misc/physlock/metadata.xml
+++ b/app-misc/physlock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>toshokan@shojigate.net</email>
 		<name>J. Pz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/physlock/physlock-11-r1.ebuild b/app-misc/physlock/physlock-11-r1.ebuild
deleted file mode 100644
index 06539301bfe6..000000000000
--- a/app-misc/physlock/physlock-11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="lightweight Linux console locking tool"
-HOMEPAGE="https://github.com/muennich/physlock"
-SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="sys-libs/pam"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dosym login /etc/pam.d/${PN}
-}
diff --git a/app-misc/physlock/physlock-13.ebuild b/app-misc/physlock/physlock-13.ebuild
deleted file mode 100644
index 375d3288bac8..000000000000
--- a/app-misc/physlock/physlock-13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight Linux console locking tool"
-HOMEPAGE="https://github.com/muennich/physlock"
-SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="elogind systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="sys-libs/pam"
-DEPEND="${RDEPEND}
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-pkg_setup() {
-	export MY_CONF="HAVE_SYSTEMD=$(usev systemd) HAVE_ELOGIND=$(usev elogind)"
-}
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake ${MY_CONF}
-}
-
-src_install() {
-	emake ${MY_CONF} DESTDIR="${D}" PREFIX=/usr install
-	dosym login /etc/pam.d/${PN}
-}
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index e40ebba86bc2..476a60986056 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.ebuild 1108 BLAKE2B 587c5cdbbfce87a7d11fa09288106ee7b95c99136142604e8aa2976bf4df4b4c46f0c3b0990eed74f22dd7d2a3e0575317345a885da59127a945f5225bf5ea35 SHA512 50e6cda7b734f6a751047680775bbef5c1390d0a53300bd99b45193c3d169e1e99ebd697c5a94f88b80f4b071594f39060574c9c4942bc89dbd0cedddf4e6420
-MISC metadata.xml 630 BLAKE2B 21a1ff2104078c5a1e13ca8981d4c0db9e693c0a060fda89fc097c1d3fd4b5f6169cd026b6e62ee9aadd746b31c00469dc305e96eeeea9ab24b39e643d74c9b9 SHA512 01eb922d5a1b216d47da29d00febac07c89760898eb4e2ef24435879330a81255be63d139bebf5ea2a97fabe73dadd7049e11c3f09ec45ee5ea22267a628f939
+MISC metadata.xml 619 BLAKE2B b002311b812d313df127db3eb872aa052382550833e5c64f1b575d965958cc266eb2652946491b1a63082403a4740d86ce1672e32fcbea691075acf12596cf67 SHA512 c6ac218834d9b7ac04da0602a64b2f1b56118c9ace6b2769b0d201e8baa6c8984c68984925a0d80b1616546f44fdd742c0edb2c28a20a2c161660481ae6d9b7e
diff --git a/app-misc/piper/metadata.xml b/app-misc/piper/metadata.xml
index 293e65b38d2b..a307a9b7cfef 100644
--- a/app-misc/piper/metadata.xml
+++ b/app-misc/piper/metadata.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>alex@1stleg.com</email>
     <name>Alex Barker</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="proxy">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
-    <description>Proxy maintainer for Alex</description>
   </maintainer>
   <upstream>
     <remote-id type="github">libratbag/piper</remote-id>
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index 3e7c243d8f89..c58bbd91f66f 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -5,4 +5,4 @@ AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
 EBUILD pwsafe-0.2.0-r5.ebuild 1101 BLAKE2B 3d1dc24fd42c9ab1f9089c51ce0f8b7bbc40281fc268b579f0ca4cb61aab31d55a8e25938120862ee9a1d29a04976390c2744fed0141bf7bb746c29929d65e2f SHA512 28762ccc44bcfa5bb076e3de0bee12c47dbb20c923969e0f9b6e7fe8f817aefd7d78cc52ea2b160467d3b3d7cfb22dd97a0b3427d06c6aca1fbebe0522427822
-MISC metadata.xml 867 BLAKE2B b5a9fe61bf56a919e466f290917b0bdabc1fd36c493d95afdcee9afa21ca6a547169bb6f39a5a118a0eb25e478b8b487a1d7b37efc451fb4563f16db2a8c3b25 SHA512 e73ba53f01a694f4bc93857c94fd7e999295b3a8cf3990bd8e0699007131ff16bf1dcb64d946ea9832713bd960d68f5940e3dbe00786e5fa77de48b22c23cf2f
+MISC metadata.xml 897 BLAKE2B a575108a92c6e9199f694315da31ef9ed4682e1063ebb802c41e2e5f089555c9ebfa8e437f675241fe7a233523116f6ad849f188b1badcc1f6b291a60734e7ef SHA512 636f9740c48a1cf9831e98ac92058db730b084825e445cf7ff00d04c393a6de0110ca2e4568482ef194fddbb5fa4486478b73041226bdda72d3756e98f8f008b
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index c94aeaa2dcd2..32a3d61a4cce 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bugs@chead.ca</email>
 		<name>Christopher Head</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 4b5eee5ca466..4860ad030414 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -4,4 +4,4 @@ DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db69
 EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
 EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
 EBUILD qlcplus-5.0.0_alpha3.ebuild 1509 BLAKE2B 4c3267f85207c1f763ad5c4d7be46df95845e5a30b6769df7dbafe0e9f65b80c4fdb75f3435ea5296934c3b355a79680c6dcdafb90ace5791d5c17b1a6cacfe8 SHA512 06284d1b8f216915031a6974de5070b0a266a1e3cc9ca80399bf377fa8bbb744d593d9427760dc614dccd64253a4d2474aff8cd9ae6b2d587b88a6e2fca30231
-MISC metadata.xml 455 BLAKE2B eb880143c2d81895284171757362efbbf7a7cf53b5e4802d45ee5a6032d6be87ac609c0d4b2e2e0f5a2b7da407ef425ca5e00f2f8d5acce281725fc2e71e988b SHA512 98b45a554c331f71371178ffd02eca17bb6ff4e3477534538223d5478fe49d8594e35c3986c27aaa17f0a413a0ddde4f07cc586ffdbd94842884c428379b9339
+MISC metadata.xml 485 BLAKE2B 4666f9cefe8331b06dcdace276a0abc7d69e9aa91d98f62db4b9cf35929bb0fb58bf7008914ad4e7808fa2f165e650cf5729863f72bbea7e2fc5f8de05291095 SHA512 925b1d7228135ef55a3c455821638fe8b2ea2f3eb591cfeb2576ad9c6f3870ecf9e9718fbc1f87aee7bebb0fbd0bba1e904fcd1cf5daa1d343d33448dc744c1d
diff --git a/app-misc/qlcplus/metadata.xml b/app-misc/qlcplus/metadata.xml
index 5a480aaabd80..f77615bb3ec7 100644
--- a/app-misc/qlcplus/metadata.xml
+++ b/app-misc/qlcplus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kripton@kripserver.net</email>
 		<name>Jannis Achstetter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 21f5cc0b5250..69037fb60f9f 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
-MISC metadata.xml 451 BLAKE2B c4ca2856ca2629b92995ade4871f9e8108b33908d6a9909b770dabe48f92cfdaa1a3f3dda03a78dda9ceee1db2c69355390cb737c60b5134ebb38f92608c153e SHA512 20fc03e321f528b1728b3ea4ec408101eac67931240ba5ef88235569b2a80b88856dc974d75264a3f67c720da2963ea77913c6bd88ad06f668aee35fa40e98bd
+MISC metadata.xml 481 BLAKE2B b381f684b2211492f06268d65b5eded2c001150aefd3e66cc27d9bba633284b5e14f0a6703871bbe977ffaf7be5c3212be1bed68109f9dbf95aa57df7a563e83 SHA512 04d4d1e7fd8bbeb603cc3ba80b3a06664a4ed43cbf0ec0b8b925d2ab4d0392a648ed7bb8c5bd71a71f2da36e6a476359c28102496a6836cfa6d35c31afff2155
diff --git a/app-misc/radeontop/metadata.xml b/app-misc/radeontop/metadata.xml
index f42aa641e444..82eddf9f4ac1 100644
--- a/app-misc/radeontop/metadata.xml
+++ b/app-misc/radeontop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 00a2413a92ae..73b9cbca1555 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -3,4 +3,4 @@ DIST ranger-1.9.3.tar.gz 280363 BLAKE2B 2698f82773aae0224e7385413a1f939cdd4b3374
 EBUILD ranger-1.9.2.ebuild 958 BLAKE2B 8e0141ab238f23237f6f263ef89f27b5c022e52ba6fb5a69f84eeda6ff698017896e0822157faa04fbad95d471d7ef0af3e634375e847725844682d4272fd36a SHA512 c4a02cb06dcae94374bb1759d5eb4bc99ff599a87ba0ca5c779223b5d8f4ec24ce9e82bd00709111d97becac3a9dd365ec1e8277ad6a9f2504346697903b51de
 EBUILD ranger-1.9.3.ebuild 959 BLAKE2B 12548ec7a077daa8121b1ac4879524d2edf2911b8424d7040b82525aa3017aac35c27be941bfdad9e391a43c04d554acac3a91c1ae05dc58da8356d7ef7ecc2a SHA512 72a160f13fd7b387b8c0038de9459d47c7026f9787a5b55979f89db5fe99fd90cc528a7e66b0bbb2e030f1597bbf28ba65d5c04c40adaed1619b528a081aa8b6
 EBUILD ranger-9999.ebuild 959 BLAKE2B 12548ec7a077daa8121b1ac4879524d2edf2911b8424d7040b82525aa3017aac35c27be941bfdad9e391a43c04d554acac3a91c1ae05dc58da8356d7ef7ecc2a SHA512 72a160f13fd7b387b8c0038de9459d47c7026f9787a5b55979f89db5fe99fd90cc528a7e66b0bbb2e030f1597bbf28ba65d5c04c40adaed1619b528a081aa8b6
-MISC metadata.xml 695 BLAKE2B df6caf08621cfa17c9ec7b75c331b329d3bc5b287418faf045c0b721143d802c43f87dba66695dd4352220e939c194efdaddd16f8c6499cbdfae58eb5f11d536 SHA512 01aa726ba045468046c2f4c7d0eb290f82da0c2548fd795e6c7d23ea33a00520deabb62ac677c215c58ccb5d156d007a366515ae8940bd09b3532ca94bbaed26
+MISC metadata.xml 695 BLAKE2B a6e584fc3731a0a9d7bdf8b6c7fc4bd4c88de12b7beec511ed67db337621c4156c6c3ac86289202e7e94c1378dbc3bbd2217d9005ede45071b310abd8bc1faef SHA512 1dc83811a39cd6a1ff11e976b22f74a15e9ab74c44377b92196cc7962d6d4703b522c9fe9ba2c97f43f5c5935a15cdae2c1a95935b6cdee8007749fcd4e7a34b
diff --git a/app-misc/ranger/metadata.xml b/app-misc/ranger/metadata.xml
index 199164de4d74..82d84c0e8312 100644
--- a/app-misc/ranger/metadata.xml
+++ b/app-misc/ranger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index a0ed6bb8ed7a..6643599d4235 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,7 +1,9 @@
 DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
 DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97
 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712
+DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
 EBUILD recoll-1.25.19.ebuild 3621 BLAKE2B f787aa77079ffe6bf6c1465222f09c68cb2bb4e81059dc6aba164abf8766ae9b04b24c228a6fddd21afc329da306ebbfea18271b5206f8e8f722e53ff6e67f6b SHA512 dde44347da9a0492d33825262da6d786f1df04be0dd11878868a2e012e40bc00b18f4927cbb0e8577215eababe387be4f130b1b10500efc69b689d08b981bb75
 EBUILD recoll-1.27.12.ebuild 3644 BLAKE2B d220d7ccc4750b0752d06b88185edc1ce710e4e1861caf5f5b662a61ae1d84ae75ee54d61ca1f10a4196089ddc3cc998385290059061bb75827e23e8df188f82 SHA512 8d59f7ab78c48f4b61039b3db7f1ec911082eb3d4c54be1c8a702a2badcb5a08401a1580d12484717c8abc3f3cb5974c0d96131f33f7865dafa0ec0aaec78265
 EBUILD recoll-1.28.5.ebuild 3652 BLAKE2B 258c29084765f4e3f356ad6ef82459152c15e355623fea2be3feca6b4e4bcb75356b0eaa9fc8e246159024fac17b4fb164e658b4169b337dcb7e69bd06fefeb1 SHA512 65595a84dc48d64a72cee75cb4346e8033b1f40905e1c82ab2f9193b7bc070452ba16bc09e650206d4fa52f3056c27f45c97a3666c908e8f1b369062b36f8017
-MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
+EBUILD recoll-1.29.2.ebuild 3652 BLAKE2B 258c29084765f4e3f356ad6ef82459152c15e355623fea2be3feca6b4e4bcb75356b0eaa9fc8e246159024fac17b4fb164e658b4169b337dcb7e69bd06fefeb1 SHA512 65595a84dc48d64a72cee75cb4346e8033b1f40905e1c82ab2f9193b7bc070452ba16bc09e650206d4fa52f3056c27f45c97a3666c908e8f1b369062b36f8017
+MISC metadata.xml 1412 BLAKE2B c76bff8f2b5483cc9525a1806b7136a7414b4944c54cd1953bacc6a353bd139fb53f0692042d94500308629014f222dad80c9fb79c640d80927a4f3eb31c4775 SHA512 0f0c368749d42f60845b7d81e20bee3cf9fc83e696e6463e42b2c925b230b8fa1da76088a9e41ced0327f6db05beac3127b1739b421143255fda22b3db1a0ba2
diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index 80572eb1e414..acc03cdcbe17 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ppurka@gmail.com</email>
 		<name>Punarbasu 'ppurka' Purkayastha</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/app-misc/recoll/recoll-1.29.2.ebuild b/app-misc/recoll/recoll-1.29.2.ebuild
new file mode 100644
index 000000000000..f72ea0e76f09
--- /dev/null
+++ b/app-misc/recoll/recoll-1.29.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_pretend() {
+	if has_version "<app-misc/recoll-1.20"; then
+		elog "Installing ${PV} over an 1.19 index is possible,"
+		elog "but there have been small changes in the way"
+		elog "compound words are indexed. So it is best to reset"
+		elog "the index. The best method to reset the index is to"
+		elog "quit all recoll programs and delete the index directory"
+		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+}
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to extract the full functionality of "
+	elog "recoll, the following packages should be installed "
+	elog "to get the corresponding document support."
+
+	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support"              app-text/poppler
+	optfeature "PDF files with OCR support"     app-text/tesseract
+	optfeature "MS Word files support"          app-text/antiword
+	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
+	optfeature "Lyx files support"              app-office/lyx
+	optfeature "GNU Info files support"         sys-apps/texinfo
+	optfeature "RAR archives support"           dev-python/rarfile
+	optfeature "7zip archives support"          dev-python/pylzma
+	optfeature "iCalendar files support"        dev-python/icalendar
+	optfeature "Postscript files support"       app-text/pstotext
+	optfeature "RTF files support"              app-text/unrtf
+	optfeature "TeX files support"              dev-text/detex
+	optfeature "DVI files support"              virtual/tex-base
+	optfeature "DJVU files support"             app-text/djvu
+	optfeature "tags in audio files support"    media-libs/mutagen
+	optfeature "tags in image files support"    media-libs/exiftool
+	optfeature "Midi karaoke files support"     dev-python/chardet
+}
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 97346220c6ec..fa69f893b279 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -2,4 +2,4 @@ DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc05
 DIST remind-03.03.05.tar.gz 402481 BLAKE2B 8fabc3269a06aaf3502c2245653442ddf6c101c3f62718769418c28850da467d210f381ef3452e95b6dbc921fe06979b4c38be8b7389a9defd76865da66080f3 SHA512 56b37dfc50a6c6a8a284691d7f1c39d542b7309ec12a029c65b68f7921cd43521d3cef9fc8d21f4a9f4a7609b0e00013e7f2793b529f39f80d63ae1fe5194fd4
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
 EBUILD remind-03.03.05.ebuild 1015 BLAKE2B ac404b7b43e999201424874c13ff654326ccd3c300e4c4b1d77776d8ebebe2ffd53c7d37322aab4cb9748f841e85665f167b23255d43428eeaa6d85501ae3816 SHA512 ecb9b653470caced44953e9c6e5f31e7905f3df50ba4ddb0ac2d45c645cbe76f7c4d9e408746171efdff7bbd2f635f4255b0df589702ccd8a3100e9786a2e63d
-MISC metadata.xml 374 BLAKE2B 2caeda98aec3a70d5a22ab4e23d776794928f84875ff9a7a53a153f3179247ef6f1b2e4b22f4cfef17b18a200353603304b9c7cc3771d7d2a8f7dc53a6920d93 SHA512 2af4508460e5f5847976cf8f7fec4a3f8248a59f59ea4e4492d384e887b77ba6745d6832b90c1637deeaa383c36ef1240842420cbd9be405910e93f8d0b9e2b2
+MISC metadata.xml 404 BLAKE2B 2b778bdd15c3d2f49ebe6bceb0269233ade6420e4f14d137b117ef947f8bca031f228210b7a1c5c92a35a00f33d1b082b6dc34959499bd42d29150e4efa4994e SHA512 49df6bda13c6b41a344f10a275a77e258e810858a9d12db036e9361a3a696ac0649b8c1bf060e35496b3f4dd1596196207b57d99cbb40555345984fc68f3695e
diff --git a/app-misc/remind/metadata.xml b/app-misc/remind/metadata.xml
index 3f821c44382d..2183e41d611b 100644
--- a/app-misc/remind/metadata.xml
+++ b/app-misc/remind/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>r+gentoo@r78.nl</email>
     <name>Remco Rijnders</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index 4e62ff91e80c..cd6e78cff743 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -1,5 +1,5 @@
 DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9ce4ff6ca6ed794cf826cb141cd83936c2762db43d1d7b64fa6f39e1216b4738a58c35a07d9df7a78dbd061de636b7b181fed SHA512 b73e34c9f957dd3f8941b7db25af88b32cc1f67e4384c97034a310b98e6f6e6645a583ec567f8b1547bea41e072fcc20189017930a172781061d741839c5a9b2
 DIST resolve-march-native-1.0.0.tar.gz 9341 BLAKE2B 5b56084816a88a462c889e2409c2bd1a9fc6297f239716f1d61c84f2417755dc92f31e677283f818b9c0ca28f38eb57d7145d60587cea004a001b22098e1fa4d SHA512 fdd0fdbb0980e86bae793f37fe0de3d3886dfe360c2ce52b37d92f881e14b1eaa0ba9c8d52a1bc6774b1389154300c0753eba5701c3c2ddc98f0696a8351f895
 EBUILD resolve-march-native-0.9.4.ebuild 529 BLAKE2B 3e7df863da4414f75b638639c4c6cfff5605cbdf1e545819cedf2a28bf1bda2a6bd96450e11b9ff10557bff1875277f9420f4a501b42b275f53bfc2376183b41 SHA512 a423c2078e7829bef0eae4f9bcf43c96b6452e363276e6642b977fd4cbc8418300d476e3e5721d54079a65636bd49c3f0ed11db41beda088e52f3440c5454b9d
-EBUILD resolve-march-native-1.0.0.ebuild 526 BLAKE2B 4ad07bc205f126f24ffcaba24ebef1231ac4434c4cf14fa6ebd62e7cf07796c8d4a0ccf07b775f2091b3b395c631222eeaef2ca2bb07d5f4ee58db824e617c27 SHA512 aea5d82bfa1bfd87ba71c6c1d1d91baea80cabdde80ec35c9b9e8085a0a537205f8eb6279f4e264f8d91689917d2c20b7b7fab437ec01852eec9ed2f75ede06e
+EBUILD resolve-march-native-1.0.0.ebuild 524 BLAKE2B 214d1602fbd80292435a1d5be2f6479fe261f444932a42cecf85b02b9ee66e438c6c6dd9862b61179977de1dc6db17b647662e93f758556bc38bc45d66515887 SHA512 281805cc04e7e0b2a17a645207c2edf2d281c94f973bda5b986896f7e13ae9d70eba45cd5f0b062bb48b0e58caa923e7f750205ddbc626a850d8c7abec552378
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-1.0.0.ebuild b/app-misc/resolve-march-native/resolve-march-native-1.0.0.ebuild
index 913b18b43abf..2f379f0b1ed6 100644
--- a/app-misc/resolve-march-native/resolve-march-native-1.0.0.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index 3f43723a9d79..8ad8702501f9 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -2,5 +2,5 @@ DIST rlwrap-0.42.tar.gz 279608 BLAKE2B e8569d35cb0b8b3309af71122c1a48039fe559372
 DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23476e7205cddbc8c5adbab4c5a10090d8ef04e9adfc62209f37f101bfc3e294e634379844417c80540485532 SHA512 4a1440b2eef3a1664c6381eb09c19f4030de2c0ef4f1f3509f7d6e130d3c5e9c3ceb00fc6ea6052b22bbe1f6b162f72e0b47564df34ccecc5220f195c22e86a1
 EBUILD rlwrap-0.42-r1.ebuild 495 BLAKE2B 5c0ffa2ade7e74000be7a5c7698ee329c0f3bd0d8bfb97890d9853538b83869fb0a2950ddc4a7f6ca928657a419a314ea416481525cc5b6fff8164ba6655a2f2 SHA512 65a0f5fe7183422b5ed4131516c3f42796b59e44ecca37af23b83155a65a85e9800ed7ae17465cb36bf0becaeb1ab0a5250833507adeb93c2fc6cbff56f8362a
 EBUILD rlwrap-0.42.ebuild 595 BLAKE2B e342bf2c71f66e83819ca97b6bd6e8dd97cfeb39ec039ce6190434d229fff9d5e65fc13392d73bbf8253b8499f14fa11be9a18408c66074c8484b454b5e9882b SHA512 a15b4c59b33a7e3f82c525c881cf2499cf7c687d44b80daef5446d28f2c3c070063e40e3750721be2a6fa7eb4d1ed5af011c4ca319544befa2c1e8aefe824532
-EBUILD rlwrap-0.43.ebuild 509 BLAKE2B 21d19b22f0fdd5bcff19eaff89911640d68a085d1fdcae6b20e17379a46ef6cddae4bf8801e76cd7de1c9fc98cfd2e87fd20fca93908eae6b625bc5fad7eb6ce SHA512 3479535a0bb22cf1645e1ba9811957f7492d92b150c25a104a54b72ece45d7f9f33c428b7114004f82ada0510f172f43869d97263a3d4176f9bd980c58986d42
+EBUILD rlwrap-0.43.ebuild 506 BLAKE2B bb1d7527de54b31993473b22376603f669d41bf4c688395be0245593d2245b1336abc376ba4a8333b7cfbade7f860aa05c3f5e3f58178e6f6bf0bcc389b28e05 SHA512 3acf5f5f5bfcf85cf563a37fe99bca4a86fdac0bb976d2ec40def3a72b21307dd7639515763c3140f6d2051db37f3f0b420f3a3a93ec25ff7c6e367cfc6a3673
 MISC metadata.xml 707 BLAKE2B cb970829cfc9eca1dc9dfc2cab28410f39c8a7ad2dfffb44d52e093653d43ff20f1a3b622aa6fe8c35091c79d45d1db1d4ab6244ad3d7d9c9083813dde4d17b0 SHA512 8f6da0c6c96533098cd750c1dc4cbae6d94bbf4a285561ba52a3fb1ab414ead6a4f1e1a600cd120cda4355a5c52365938921ee43df560015296f15528d79c8ff
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
index 8347953f5c82..e339f0280bb0 100644
--- a/app-misc/rlwrap/rlwrap-0.43.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index da9ac2aaae5c..45a023083329 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -3,4 +3,4 @@ AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f54
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
 EBUILD rox-filer-2.11.ebuild 2433 BLAKE2B 5b30db35aa9b774d134df54a9caba91655c3cc4de28730bfa8f99c1d4f7e8d4dc0cba8ffc943f468da6d330f71443b7ca8d2acf59c564ca024e2495dbd36b4ea SHA512 fbcce87625850a70c6835c5828d84b896bfef4c317f24f5a908b77f442dde10557d0ef8af81816038109643d418c036a67bc269faf0bead8ecceb4ca93994342
-MISC metadata.xml 1188 BLAKE2B fb150cdb9a5d058579d48b6c0af7e328693ea8faf80ee0d54272892ccaa9a7095875cae2e09bb8ba72fc6fc1ad834f624230e5f1a1b2bc8a3f88a9ad7f3815c3 SHA512 e4697b62759e1c589a964016a1d18889843e16ada402d7f295fee8077dcef4178c02870f696485079c98d3c18b032a981b6d887741d7e22dd7882d5dec6f9c9d
+MISC metadata.xml 1218 BLAKE2B d394fbe19487b95a21114c59d579aa746bd9933be0a752b967ad4ca8f5ddcb65f1c6ac48c84733f657a858657c84d5af43c9fdca53d068adda3f4b546986bfee SHA512 e238f646bd3c3b158677e333d9291d95da9d6e206983ac2f6d794575e2bd1d57bdffc6bd9e66f35cf9e187f3c5703f4e1bf563904d60af72fff3f5b4fca3edcf
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 740d871edf39..900b0182a097 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>ppurka@gmail.com</email>
 	<name>Punarbasu 'ppurka' Purkayastha</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers Project</name>
 </maintainer>
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 64abb7f53fcb..d147f94912c7 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -132,4 +132,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD rpick-0.7.2.ebuild 2476 BLAKE2B 29fefdc7f27dbcd9ddd05e48011a5efb6d59b47eab35f27d5e8816127c3bfbc340adad377cdfb769f514456d6a54ce400aa139a16fd411e00247fae57cb4e08e SHA512 a0d08a5566ef9af7d7e1a921c463a85771b59533bb2609010bea5b1fc3ffdd2f97f62e806b47df7f81b3aca490d22e5f1b98c580b13cee534debd93079de5768
 EBUILD rpick-0.8.1.ebuild 2685 BLAKE2B 5608cdaec2a48b9f9fef324d49bf2d199c56904ae5f088bf196d8101fe8816a5e1f378699abfe02e7cd061fa170419f1bab416d33507918997e26195975d4626 SHA512 e178e5906a8cdf27d0cafbccf118f045119f9c52fad17221ef842dee8e1c6ea23f4a6c3bbb6195efa2dff18d75f299ce1fb5dec2b437c2e8938600b9f8ac7f8d
-MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
+MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/metadata.xml b/app-misc/rpick/metadata.xml
index eaf616922a24..4fa69da1ab1e 100644
--- a/app-misc/rpick/metadata.xml
+++ b/app-misc/rpick/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>randy@electronsweatshop.com</email>
 		<name>Randy Barlow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index f662a20cf931..eed55432f140 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,5 +1,3 @@
-DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc2704454bd2b8871518a3d525d9101abd9f2ebb11171cb57937b598125b599371908c3b32800dfbd7aeda0fb SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
-EBUILD scrub-2.5.2.ebuild 361 BLAKE2B 12c02e0203f651d963a8e03820e0c32124870f4501ffb0236652941a7a455342165107e852a84f2435e8a4732c57567ba840414292d385c8492398ff2bf08dcb SHA512 f03300f1f891d99128652209b056a90af2c5ca70dc693afd75c3846dccd476f5f129ce2ba92596f60ff6f2400182edbac31299a5109bd178c56ac748c22d4360
 EBUILD scrub-2.6.1.ebuild 386 BLAKE2B 838abb88e8f819a332ef9af4405ac8ede63e066b18ea1c5755e9f4275f780e3f719da70063cd88d92878759e27d796fc7b5e1045f0ecc33e5700e22e557d7776 SHA512 838861353bb6ed7f2163b3bdd19cdba6c115f002d0138f7ce828c7bc5f7ad33835c9b01ad8c59c21995adfc745db545da16a100229d5c791b23c53fc9baad180
 MISC metadata.xml 427 BLAKE2B cabf19dba485a1ab72e0500c58039417e3d43a16221200a291fa24ccf071592bd6fc4360dcacf03f56242a3a218a4783e4f716253056384dec0da2dd60831b6d SHA512 6df40e1c7f4e9a5dff97a24cac6e0ec70ef4932846de7499be62bcd9bad40c5e23cfe23aac3672f1c9de4aadd36b6abcf96945cd8bd6c58a87ee91f793e0a627
diff --git a/app-misc/scrub/scrub-2.5.2.ebuild b/app-misc/scrub/scrub-2.5.2.ebuild
deleted file mode 100644
index ede2f37a6bc0..000000000000
--- a/app-misc/scrub/scrub-2.5.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="write patterns on disk/file"
-HOMEPAGE="https://github.com/chaos/scrub"
-SRC_URI="https://github.com/chaos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-misc/selecta/Manifest b/app-misc/selecta/Manifest
index 3c5193912a15..73fb7d57ddeb 100644
--- a/app-misc/selecta/Manifest
+++ b/app-misc/selecta/Manifest
@@ -1,4 +1,4 @@
 DIST selecta-0.0.7.tar.gz 116987 BLAKE2B dda7f21ad939780a1d631086eb669f4824277c9b9bc4a762fa56e201fca3202ee8fab63ea1328dfabf868f4c430456969be99ec1520afcb8c509518f589a3a6a SHA512 7db8fefa51411c6b9996bd1e19889902e807471bb76309bbcace16dcfae70cdb71bdd7abd2c1a96b99d2fe1f9ecbdb1972e95485a2d06b3e3258303a0fef2018
 EBUILD selecta-0.0.7.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
 EBUILD selecta-9999.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
-MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
+MISC metadata.xml 394 BLAKE2B 6f163c48ab23759d5b574e628a3ee88ff40d9a6a0e460799cda903edf6be1e5fd60646452713eeb20f062cdd57971767af7e3344a55b0a60d798bc47f3b2d12c SHA512 ad270cdc7063ae6c541d29e1224ce6608ebada07b212d836030ee3377c0596ea37789fa6cdb8e96bcfa84b295611a95d450c37726e88876d66c5a8ece4f327da
diff --git a/app-misc/selecta/metadata.xml b/app-misc/selecta/metadata.xml
index 6bf484adc0d0..4d62759742c9 100644
--- a/app-misc/selecta/metadata.xml
+++ b/app-misc/selecta/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 79702d3ad733..ca71486cf8d2 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
 EBUILD sl-5.02.ebuild 951 BLAKE2B 380079532d539d86db6e90b7427e303e42684f7bb85e19f51d414aa7b12b446b07df42e4c35ceb7071379e8afa61c31055fd560e3d1c4b32068a51034a1d045f SHA512 a3a38c6c5954cbaf6e05f2d2cdb0d172d75254d1c301e6dc36aa0a6fbfbb2e5d6e36afd360a8d6ce7f897dfaaeee69b272c8cfd33a4df188d237f0960a808089
-MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
+MISC metadata.xml 607 BLAKE2B 1db8886c5fac75d14c249826c1f3aa4a084005ab925b9d5066f9ed9a858ec4eec184e7bb967c076eedc7806a7698fbb8db0cbd99608bdd5a4189c9112a5c09b5 SHA512 61bb5d5e147d4053e91c01a1431d5e55093e77e0df78f3882a5bdc553a5d8e593126d433a8bec0849c82a20bf84b3eeba76a158fe86ebe75dee25483ff08ac90
diff --git a/app-misc/sl/metadata.xml b/app-misc/sl/metadata.xml
index e68cdace86bd..42db1fc673ce 100644
--- a/app-misc/sl/metadata.xml
+++ b/app-misc/sl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index aa890c293e3f..b0301ce886e1 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -6,5 +6,5 @@ AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f
 DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
 DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
 EBUILD spacenavd-0.7.1.ebuild 2344 BLAKE2B c8875709154e76954b675f808f58f59f2c9c8faea230fc236f9d648011d712363abe96516c74c54996d215129e790416de639efdc192920778cf8d9a55994035 SHA512 1e37501840845ca62be2413148dd1dea0c891a66814cdb0a87524747cc546ff2393312a10851bdc4574f45ce256d913148783e30caf1729a1bb752acf29ef1ab
-EBUILD spacenavd-0.8.ebuild 2394 BLAKE2B e0de97a84d5d71f18543a4eed853cc8264b3aa97bafa4265cbb963610d03c9ffdcd9a578a447c8bc333cd3caba1f76a599182553b142c7f61726853cfbec581c SHA512 1995b4284750078245cda683a61744cfc68b6bd524819df2459d3884576fef7f283647f69c3845147e68da6d93d13ea2ec9c6f1ae28baa2359bf985cab37fd56
+EBUILD spacenavd-0.8.ebuild 2391 BLAKE2B c015c8ef5c91e1fee035a1d7831617319023bc8b4f7ee46185d7d04c7d9e703b4ec6466c30bc53e08005cba1b635edad8e694d47670453865867d59e8035d8a5 SHA512 9926653a34d7b4daaf70933080f2eadcd86966656975ac82977d36d4b9a499f634be6e56db7e7a88037d65947321d7a24402dfd4958ebaf5f44eee9df1152b1f
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-0.8.ebuild
index 3e2772c32f2f..3db32eb95977 100644
--- a/app-misc/spacenavd/spacenavd-0.8.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index b823d7546576..de32e51cf256 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -5,4 +5,4 @@ DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab817
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
 EBUILD task-2.5.3.ebuild 1372 BLAKE2B 732b1e4334475946e54f18e798d2671e9df7ea3f2225dff6c0cbd44ead6b7b212fa26ee76a2e29c7e84fa3f8e0dedb50d3c9127ac72291e76c7aecb7d1700368 SHA512 dc94c3845672c981536013b521904354ee64928b87bc37fc20060681744f34df5adde9b5bfcb1427303ab45b3f049cc139b8524cccdab71f9cbd4820736da968
-MISC metadata.xml 435 BLAKE2B bc50b21afa9614b81ef07ba84c6261fa5978fc8e050a7b2436e83eb2030a86404c89c37a2acc6164d53d0aa265921fea209eb0e3e10d67b3dc028a41f4a2885a SHA512 2b2ea567948e32f5cab9fbebb7e5b96add831e4992eab88bcc304c26eb2bf533fade36048dbdbf36202c174a63cd8587b33f2a7ba86d0fd8bf009a860c9a7593
+MISC metadata.xml 465 BLAKE2B c3932c8c436b15c3222e07e7102364c30008fb2b36354f3da1d0ec5c8a9cb29a992a39ae9e329404166c1f7220ef29d5ffed1e10401a84782b79773072add441 SHA512 16416c5221952dbcc52b47312b9277d6e6230e1686816fb3c56db6dfd576459f39ded1e2eec7d43a14956373a090b7fcbb045fe285c49a65a0e0339ff6e789cc
diff --git a/app-misc/task/metadata.xml b/app-misc/task/metadata.xml
index 3720d3657373..7fca55d9b8d4 100644
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
index 6ef80ec0a9a4..06950c7b3314 100644
--- a/app-misc/tek/Manifest
+++ b/app-misc/tek/Manifest
@@ -1,3 +1,3 @@
 DIST tek-1.3.0.tar.gz 99399 BLAKE2B 191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b SHA512 20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
 EBUILD tek-1.3.0.ebuild 935 BLAKE2B f3e3402447b1b3fb451389018fd16497bfe2eb52be781eace5bf5fe907fb86370283e23fd16572b56fa1eb8798ac46172c7c8de7f359901bf3a3f12b8864af1d SHA512 24f9cc5e5b8a8859a9f9a1de0fbd10c7deab048b40e2723fe65e0279f0c3eea345621a3bd386ceee482b5d9a5fc41dd293da5ba12378a73b903ea31c0d0ea13e
-MISC metadata.xml 243 BLAKE2B 6d8c95bd9e42645e28dce3d37257479f0a94624878958226bb6791561b62ddd499b6fb350280881ab15d463c8e1797530532405ed74b5c3b4f6dda78c2110f0d SHA512 0b850a50c55c9c8698e714f12e5da3d780a7dfeada4efcb0f35e98f2b63372d05ce0dbec0a596299ec842bcaa0c3e2491226feabc628bc18cc1ceee7c2f5bf65
+MISC metadata.xml 243 BLAKE2B 32baf4172680828d109bd212048ca921186236135d4ae1dc76411ea32307f919cf0b8c89ced23b4df6e446dbb3c2b1b1553a3588b3e61a2309405de3070fc313 SHA512 37178ea2c1bbaa0f40a3a2895aff57acfedb9846873e52248235023252cd3d3621457927ae54cadc797f3cedd71866a620e2c2ef627831a29512038b84c43012
diff --git a/app-misc/tek/metadata.xml b/app-misc/tek/metadata.xml
index 747e72299490..90624b1ac380 100644
--- a/app-misc/tek/metadata.xml
+++ b/app-misc/tek/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index fe50b581765a..89cb5616e969 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,3 +1,3 @@
 DIST timew-1.4.2.tar.gz 1316841 BLAKE2B c451f37aeb32e999fe2cdca2eb5f234c7424b76f489324d5723a3649da37f53f5094989bdf8d5c2d27f5daa0d75c72ec4a01e3c19b8b064f28e4db82587498b9 SHA512 fe4c3def6b2cd78793dd97a38a61497b3910cd87a3315f826c64893b96a998bf30363f0df1892b74b718d03a279d51c1a636739225e101c5c126794e434076f0
 EBUILD timew-1.4.2.ebuild 888 BLAKE2B 41a2e83233277e5722567378b7337c33302b6319ade5605c9d3e32ed99896d523d1833f4ddc164e5345d4f83b5bee9af346f63b5d40dd59849e5c12ef7279263 SHA512 cb84813049c46eb18090f022e77c9eab56ecc4e72011bea60d12ed95f0e8f8b5e048fefd343c48bfa8eacdca447c3e83285f79b80ca9b4350af3e08abf5e1565
-MISC metadata.xml 679 BLAKE2B a0d48844e9b28b17958a0019744ea6366e0e7893fbedba5805f8c00b9fa3e1110f2d61462ad295409bdca399db04377417fe646408b4ef4914ec8cfed7537e20 SHA512 3a10119fa8224b6629985c9acb30900029d3507412e8c47732a214d55d6c12c7b6013c15808be318344f2fbf789f95e9b4c6e8f259dc4378597c917bcf06aac4
+MISC metadata.xml 708 BLAKE2B 879f68ac24d859950a032eb1273b95acd3039af650bd1c58566338306263008a9afca6f7aa9198cac0878caf81d22187856076658dbb24ee48a6b3d1f5e9b4f7 SHA512 2455c4358bf999a15ff468dfef75d932dc394385e5d993ec5cb41d69d410279807f80d90bf6cd4a34fd39ca9a43141597bd5d1719d5a550045e460683244c6b1
diff --git a/app-misc/timew/metadata.xml b/app-misc/timew/metadata.xml
index 5ea3c900a15f..390d721d5ff0 100644
--- a/app-misc/timew/metadata.xml
+++ b/app-misc/timew/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index b920e07bd5f8..c90ec08eeebb 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -2,4 +2,4 @@ DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884
 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
 EBUILD tmate-2.3.1.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
 EBUILD tmate-2.4.0.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
-MISC metadata.xml 329 BLAKE2B 4b983e08fb7a5704f11c7e07e91a322258b128d5a2826fbea1f62718b83daf71552d63304df6e0995a68ce33e05bf3e276aded270a004a95a43fc8f98501744d SHA512 0097a64f483d6b8a24bfa5006f6df9dbeb697ee04152f5451111449d69d54813ff6f474e8fc91b33a2db2e0ba6ad85d25b359ef6684a74c884d2bcf16cfa9e75
+MISC metadata.xml 329 BLAKE2B f5ed7ad5dc2827db367a67a14dfda02644260fd16336e5d342b5e9d9ab7e0d62bc8493b834443fee00337123474ab7a1a9a6614ff9ca98ab3a1b4bc022fc03e7 SHA512 d5595ede15c355e3a54363cce03bdf3ead85d95035687432a2f53e30c61570d33f6f2c7893c8fe21b0bac47bf4a87cee8b1672084410a47f13c46aace2729d60
diff --git a/app-misc/tmate/metadata.xml b/app-misc/tmate/metadata.xml
index 02e9da1a1d51..fbd6cccf4c3b 100644
--- a/app-misc/tmate/metadata.xml
+++ b/app-misc/tmate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 2377c279240a..fe88f510c906 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -3,4 +3,4 @@ DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7
 DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
 EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
 EBUILD todo-2.12.0-r1.ebuild 1765 BLAKE2B 6201f93d04dcfb5625b93c806f2005d5f01cdcf88a61d56854bbb4e9d1c0bc3f75a4707a8d447b3910861dfac8dd52dc578be313fde5a0a9d8f86556fad0e3e3 SHA512 f2cad76d03e34372b16249c13b5b9956ca546edc1dcaa600348db7f4a8e52182eda27b341668477fe3361bd91776a4b128c65f95efe64902611b6b47c0d9d0de
-MISC metadata.xml 561 BLAKE2B 3c375b971f13ae4f52cdb0da0d34a24e95e26f6613ee275763b8e42e08d75aafeed918fbba943046933995596fd7c623fe18699cd05935f56d027f3df2903f0b SHA512 fb34968423ced5a3be1d8f0f4d6ad85ab1c971ce3bbd1251e54c2a839ef9a16c95805f30ff090a2483d93f7d2f48a2ce98d4a99d76ccc3f72004a634597ebf23
+MISC metadata.xml 591 BLAKE2B 8b7a405aa00c7c97123b716f6f0a9e835ed49bcc85e28c17c138f56d8ae28d823c4923324ff53513caed7a7045ba8b493f5e162bd7fa2b196af897ef9ba2dfef SHA512 402fa56092d366bb5ff52ff4443a1edaabaa168bcaae2ff44fb7fcc34f101fca2a5ce32fce7595e06a6cda825c32d0486edf74cd35a4c9a2b2ea6878c24ea10e
diff --git a/app-misc/todo/metadata.xml b/app-misc/todo/metadata.xml
index cf82b8681220..848d82ac6eaa 100644
--- a/app-misc/todo/metadata.xml
+++ b/app-misc/todo/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 43f0f2ab0960..06f7fbd73129 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -2,4 +2,4 @@ DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c7
 DIST trash-cli-0.20.12.26.tar.gz 74542 BLAKE2B 558e3cc043cdaef44bf68317e666c6f757daf9feeb6b731a57aba91ec983e1adb1e404f7e8428a7bd1225d83df6e94e8b9b793942bbb233f09a44127af0a42fa SHA512 d0b0a97014c888ddda95759dc82837385a2809cae04bdf6a84dcf0233dc2cf9370253110bc5fdbc5c4452ebb65c5e7836fe1cfaa9aaabe38d34269724456cd1c
 EBUILD trash-cli-0.20.11.23.ebuild 586 BLAKE2B ee96ab281f9d8c27d5dd22e67552de0084f32a1fa26c3385465b3cf8f8ea95fe381179fbbaf7589f4d2de9370b6242df8e6e702531f8624d18149366dd0462ea SHA512 207d7a1cf4215dfc2e53b673cdbb74d74ae1703a083075a0af31ad4d7f0e6314ae6206bdf03ebee5a7287393aee2ab5338a940bf2fc983f19f83a465b552c384
 EBUILD trash-cli-0.20.12.26.ebuild 588 BLAKE2B ee7f364004b6b2c35f8aed8f94186130e4308f3a3111fe0b25e4cf5870ada6ff6d115d8be57ec58018ce078422bf55651fdee9a84b78d52278a92c2c1d8a07da SHA512 0c350f5d3899070e8c16f3fb99d5c3aa210b4559c61603023240d46f04ecc7c5699e05a12f0db3d2476c8a6edad7dc68480a41fd1a73aca613af45168f75a9c4
-MISC metadata.xml 1064 BLAKE2B ce5e59cc568a0542a0f94bccc46521901384ca856adaf922db9a62a4d45b86e9d179e12cff203fa8a2813131882116310122265805d54d1303b33e82680404c3 SHA512 8f74a9665e4d72c4f7dde8104189ab55d0a64c1e79abdf41920ff1ca425735cb76ce0e5fba044aae2608151086c8b0ad8a552dc15b7780c6086b8ca36d856068
+MISC metadata.xml 1094 BLAKE2B 25187a31e5ffc666c680bc9970599affa08b76be31618489fb698e9a4581c75e75385c32c1ff65a10c6749222f813e4a783e657f9b142cfa2283ab863be3deec SHA512 81dda2f222de76ddf74f37e19afb498b0cfd37ed6583dcf92adb2a8ce64566c2b8360cca535bdbe9343c04563894257a74fdae3df2d9bac20e486f3aa7c86417
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
index 7daccb6a3c72..21aa0384c58e 100644
--- a/app-misc/trash-cli/metadata.xml
+++ b/app-misc/trash-cli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index 43d61ca8298c..d3ac8d30c3fd 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -2,4 +2,4 @@ AUX utimer-0.4-fno-common.patch 672 BLAKE2B 2a325b112f2be43780e5e60a134c30585905
 AUX utimer-0.4-locale.patch 188 BLAKE2B 57e8f72c6541e1b161186ee4043c4685bb9593cd257bac5c11d7b80beeac627e434c60ee434036af5154636af7fbcb763a1d7d20da5e0226f193d488372b8845 SHA512 8c5d8c614def996e147dc89acad2e5a844413a5e16845bf76dd44761a3a2ac510b148eb72db0ab2e34d4d4d7097c60f3dc245b0ac4f99cf22eb700791d4f69bd
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
 EBUILD utimer-0.4-r1.ebuild 613 BLAKE2B cd8164d4e0d22b5317fa0eaca07d2f330a4bba770bf7819c50d5916a8410e6352f763cf180c7f7b14fc13cee0c2a4815b9c14bb511372b1468649cba945e22a4 SHA512 9ba26c95372b88ffd991f11c829f0915a290cbb4f2b83f0dbb62eb0741a94325188d4bafb2c6cea77b149a70d2be365bf2ec7a851124a977eb681b5134f57072
-MISC metadata.xml 349 BLAKE2B 7c7669d3a1a33cea3684b7fe7d3cac9f45cb0c93c71a28314084c1b6a418774003afadfd7b8f204db91509c188fb46d6a43271ffc745d3bb933221cd4bf519c9 SHA512 36bc7a82cebaf4a6915d78a65a3d69f845b139a699bc9a6b1d0137749bd0e210d6973cdecb8d68d50363f60baa5ed14af59b53d1414149c1115261d94910acd4
+MISC metadata.xml 379 BLAKE2B 592045b5fa77d9dde09fe352e783ed85e453433bce7a5a54cf02d24816c8dbe6087c21952ac0026576ffad8532e635d0840c736da17e2164a919fdcf33e2912e SHA512 b7871e578811de5320cd0419c29e8dba37871ce50c9f11d7c409d2372995a74d0ee0c27f0ae4c4dd0f524bbd16fd12cb07256f84cfb61c09d49896ac61f83ab3
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index 9be9a54c5d3f..54c7f0c0b63d 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 <email>lavi.kfir@gmail.com</email>
 <name>Kfir Lavi</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index ff581a3d2108..b7b2a40815ee 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,4 +1,4 @@
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
 DIST vcontrold-0.98.10.tar.gz 87721 BLAKE2B 06111f534d137d08f0a66b00f1238dd04856c3a7dbe630baeed89667de2840cfa6d9227a899b3ce4819accccd8d2228ef7e31e9562e1bb21027a3ddd2fe2b148 SHA512 4e65c23edd2542323a2815154544c2a4376c35a49a52168d6a3a08dba68f462dbd9c0c43020f86a4cb6c4eb7736b5d9460c2e4e2a67c015e2e51841338547c55
 EBUILD vcontrold-0.98.10.ebuild 882 BLAKE2B febf481c4f796ed0058fd4cee3f938d2633f5ae86dc47b1fc2dd603c40d13fde1107abd0cff0e865b5702a01a2df2b1f1f5435c2242bd9cb8ad3219d5f32cf68 SHA512 b958adf4ca63c46fa77fd1dbf700a25b569bb3eb9b90b888780af43adf4382b959deecdb3ab8f08b0a8d3831ab139ca63d6c43080942e3e821806fba4f80a4a5
-MISC metadata.xml 866 BLAKE2B f39b62acb12f76e47aa345545eae5801bda3fcf0a6bf2231ccccf053aa7f3718b2c2f3c7bce2a29072ec4728f4632b05c406f14248dd50dbfa4ad86ca1b973dc SHA512 e6b65ade9861e2c8d9f7968d09d5a3faae227f6887e5647d6b8efbc8768b67345c96c813738f841eff00946264c7f9b56b2fef665cf087fec44886e8b2ac8f4f
+MISC metadata.xml 896 BLAKE2B 453d5c8e202257a947529013345418198485e2bc389d41d6760b3e16f24c458f0f4c732e6bf31ed03c6190c9e0e3fb0b337fcfded8e3db804f9faa132c5343a5 SHA512 0b2ec22e4c21e605047506a41e33e4ce07b8e6d6cd1bf556cb43683c1626c5c1cdfd49dae489f8e2db4840d110f955e00c8abe8c30468fb1823d8941800104d7
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
index 3883fcf236b3..54ca11d7944d 100644
--- a/app-misc/vcontrold/metadata.xml
+++ b/app-misc/vcontrold/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>tobias.leupold@gmx.de</email>
 	<name>Tobias Leupold</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-misc/wipe/Manifest b/app-misc/wipe/Manifest
index a9881a15d63d..621348b3d162 100644
--- a/app-misc/wipe/Manifest
+++ b/app-misc/wipe/Manifest
@@ -1,4 +1,5 @@
 AUX wipe-2.3.1-LDFLAGS.patch 470 BLAKE2B 76b63c80c561bea0fa5bea750b7eae9c6b07b516c6b4ae7b0949fa3e60b2b9c665afb28d48abf5b1c6f6a97062faec16a8f8145a24a461e71cbecb1d67a75b1b SHA512 e44d409f8177466c22c5a76fcb242e424d4584e587c6a8e25c5d3d8adb976b11a5cce2e0a77b99833a06879a4df3bdb2c71e468f08b7c7b2888b5ed1907dbd79
+AUX wipe-2.3.1-musl-stdint.patch 392 BLAKE2B 1316dd67b65ceb3b5816900a00a3bca44346493da8eb18b77da2fd65e4231cf8251bbc3a21c6b182cb9deff0e46fbe7e2d53b7e69b230cfa8a7978046010f54f SHA512 8ccae661f1fa37c143c3c2d6a644bd2bfee4d0ef5a594489592f9f6cad6265774d84cf33c044d13d62a55309bc54093c49b5380006c441804041a47b52be6bce
 DIST wipe-2.3.1.tar.bz2 72297 BLAKE2B e4c15e3b2f64d21d05b915af2c841518f686bec297a6b97eb91b57c1af2e5fb70193f54718ca2f9fa9d04ba684ca21f116b75328695e29f757fe44c62c8504e8 SHA512 63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110
-EBUILD wipe-2.3.1.ebuild 792 BLAKE2B 6f93fee4cc851e862cb3a35a39d27ae66e7cd78221095ce620f2babd641b8d6c6dfd88a493f80cd0aeb316acc00f5b6c8e0306b5471ac1c61deb5e3837e3bb8d SHA512 33d3351e8e5f15481f7c82ca86107d5f97ec6e95ae126cf3f073993223a64b737ed128066446ca5feba1a2ca6834435e7e1de072288e8ff8e6a88f4c80cbdd46
+EBUILD wipe-2.3.1.ebuild 796 BLAKE2B 927cc37a2a3d0cdbbbe8e245884aeca0ce734542f8eba80132b52f4b260e66029558c35eae9cabfbdd02de2a0dd244e8c5fdbc90fa218e220d15a46f6a38d774 SHA512 98c148bda0d54f8daf7fab6d23590d3d33f8c850d42b9245124dce11a1e87960657a47dc892225fb843915345d4c94c37516723aec795fe70f90feb51ba29170
 MISC metadata.xml 241 BLAKE2B c8e6466e0c122eda0f737f6830ba6fb7445c0ac7ca1524890b48e927ad302cfdcc7a0852b1d4bc444375dd4f77329345b4a49519833e5638e6a333d3c69015bc SHA512 34af1318b14f520d2aa49e93d44688e907657ffe1d3a6ba4e9f7fbbd00928b427266f836c0eb5efcccba86aaf1e4f49c3e48ab4bedc86334dd207a500a3edc3b
diff --git a/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch b/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch
new file mode 100644
index 000000000000..f14c77e09766
--- /dev/null
+++ b/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/713622
+--- a/rand.h
++++ b/rand.h
+@@ -20,15 +20,9 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#ifdef HAVE_STDINT_H
+-# include "stdint.h"
+-#else
+-# ifndef LINUX
+-#  define u_int32_t uint32_t
+-# endif
+-#endif
++#include <stdint.h>
+ 
+-typedef u_int32_t u_rand_t;
++typedef uint32_t u_rand_t;
+ 
+ #ifndef UINT32_MAX
+ # define UINT32_MAX ULONG_MAX
diff --git a/app-misc/wipe/wipe-2.3.1.ebuild b/app-misc/wipe/wipe-2.3.1.ebuild
index 8775ae458c90..2fd02b71399c 100644
--- a/app-misc/wipe/wipe-2.3.1.ebuild
+++ b/app-misc/wipe/wipe-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.3.1-musl-stdint.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index 85f12d4ede21..125a2357d3a0 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1,5 +1,3 @@
-DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
 DIST worker-4.6.1.tar.bz2 1615384 BLAKE2B a0d665f82d585d4e8a7e515e44b23541da24f6712c86bff422d4612ea67292c31cd204367965f8dd0ed91e69fa11453f7fc5a0228b2508d8397bde39460ff6f1 SHA512 f5977bc2c84c1eebb0058d63c7d10a0b39fa3c3bace09b6adac82f6a17bd9df8b1e2ba8138d764899895b69493493245cb6f7aff15014471a109a023fe203e57
-EBUILD worker-3.8.3-r100.ebuild 1350 BLAKE2B ae916e885f177c37254b0c1fc5239f8f4de0d58c2bdb01cda99fec2ee4ae1e74b51e390bf4faaa0c7361f23853eb3b9f4636f6ae715951e79a98f0c1b8169622 SHA512 9b2d3087f599bb130516cd6b64ee95496eed76c217be928d18d05fb45d9b2ddb373edc2f01477aebc89f4097f4063898ce31ab84150102fc6c237bbb59903a81
 EBUILD worker-4.6.1-r100.ebuild 1461 BLAKE2B ce272601e1963df20e1f1951daec4c98faa43081e3e4f262d6f18f174bc2dcb88c9cdfa845bec4f0e21e1ec85fc4f43e599286908b83c26f9a35bae22b86c50a SHA512 3a2d5b007fb7d5e02da607e274c7d3a9658242369f743d0dff4abb4c0ac4a54f14bad26463f0fbcc1b5e9270475bb9e5d45b6a2dd991b7216cfc1c72bc051448
 MISC metadata.xml 625 BLAKE2B 663b7236063925cb15a6025b7c48b0cceb01c0af01955215eed227939c1e6f471de78fa16ddaba4eb152b78303d835690a7b18d630f7440bab3934c89b69fc46 SHA512 b8a94fd69a914d144791fca62c5f52085dfc8d9f2d09810860e761683f34bef87623f0e15a33713fac06a1c7529f1967faf155c96b5a8d5bef7a9abb9ff02883
diff --git a/app-misc/worker/worker-3.8.3-r100.ebuild b/app-misc/worker/worker-3.8.3-r100.ebuild
deleted file mode 100644
index f03fb05716e1..000000000000
--- a/app-misc/worker/worker-3.8.3-r100.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
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit lua-single
-
-DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
-HOMEPAGE="http://www.boomerangsworld.de/cms/worker/"
-SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
-IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="x11-libs/libX11
-	avfs? ( >=sys-fs/avfs-0.9.5 )
-	dbus? (	dev-libs/dbus-glib )
-	lua? ( ${LUA_DEPS} )
-	magic? ( sys-apps/file )
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
-
-src_configure() {
-	# there is no ./configure flag to disable libXinerama support
-	export ac_cv_lib_Xinerama_XineramaQueryScreens=$(usex xinerama)
-	econf \
-		--without-hal \
-		--enable-utf8 \
-		$(use_with avfs) \
-		$(use_with dbus) \
-		$(use_enable debug) \
-		$(use_enable libnotify inotify) \
-		$(use_enable lua) \
-		$(use_with magic libmagic) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto examples
-		dodoc examples/config-*
-	fi
-}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 97b6ea1dd4fe..e99b208d124a 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/dfu-util/Manifest b/app-mobilephone/dfu-util/Manifest
index 0d92e3326cbf..e68b066722c7 100644
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@@ -1,4 +1,4 @@
 DIST dfu-util-0.9.tar.gz 138397 BLAKE2B e3a9db3276204d25fbcdd7d50caacd28a8e043d2781b5f942cd0df343d046870003abeaa1005a2774d03c4198ce96fa2124040987069c5f444e36e4f365a5e0e SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952
 EBUILD dfu-util-0.9.ebuild 611 BLAKE2B 1684c27777969c7aefefa831a4f93b1e58bee27042d2f57d026aaa3cc8a71597211fad44ee5b7763c22ba307bb6fac6b89318ccaf94998673eccc2f9e536774b SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f
 EBUILD dfu-util-9999.ebuild 613 BLAKE2B f36bfa2685a0c2ae90a0dae5df42f99a181c9314b4c8d952150e76c6144ecf174693157ee897b281213fb570aa085b8197e18b260a09bcbab8102d5664c2d068 SHA512 6cf5538e2f99326a922767631402887324a7395788bc3435ed410d65b8fa0735ac6fb9414e1ff61f8584f128ce1a992dc3ee1df4c97fb1cc540b7db1edd98727
-MISC metadata.xml 329 BLAKE2B 4785e0777c86743251036916ea3c691e828e772a2fd409b666e36607f96a096ae19b14ad6e70fccf55f0415c4d52f25754d597ddd8e11d2b40c73c487abc7fff SHA512 95b30bccd833523adaadcee075c48621d3d9e783a4c1c514711aa67697d2c2e5f8d773ac4760c95a9d92ba9b13d3df448202116696c412afd2a844ce7815f678
+MISC metadata.xml 329 BLAKE2B 314fd57a41c2d9e59f6ee8120604af60817dd8160502a48cd58710038a62d58537c081db31b34b34264a241cf498c023f8bb9e13b9c94a025350359ad5efa42a SHA512 bd7816953923ec3a5ea73c610070e6b28a46f61ab913f3c0a8ad5999ace4c20bcdcb6d53a958824cb16e49bc2dcc0b04f14f2bca2527bdff4e12d56a9dd2eb46
diff --git a/app-mobilephone/dfu-util/metadata.xml b/app-mobilephone/dfu-util/metadata.xml
index e7237c8d32c6..2701c3c701e9 100644
--- a/app-mobilephone/dfu-util/metadata.xml
+++ b/app-mobilephone/dfu-util/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 1f4718af3721..314aef6d1bfd 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,3 +1,3 @@
 DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543
 EBUILD gammu-1.41.0.ebuild 1365 BLAKE2B 74a0b9ed1a90a0b124c7ae1eb0a447a0125d83072c0ad0364885b5e6401b6294735923a42fc53871425a0da356d799183a7300a76710584d4b3d79a41747ca86 SHA512 23c4515ef97b923c699027ed34732b94e450ea134b8bc7e66a5ea6212dccec7457b2d3aad980c848a1e11fc2d30bddbb944eb7be7cc27b12535c73f9d1ee8cda
-MISC metadata.xml 984 BLAKE2B 3e0df0fd12d705aae2205d86942131a2cc482aeef6a4c963d8179fb84189df45eaa294b7701a0d0ada00596d171808df6e7f0c9f7b1b4f0467cddd12ee47b316 SHA512 2d6eeac0eb8c89178ee3c66f778d5db8e9b24bd645a47ba2996c0e676ba229f59fa2e1be908ee46a5e182c18d0638e473d8076cede396c910157bd286f084397
+MISC metadata.xml 1014 BLAKE2B f11c1e13f7dd7c62314dc3b1d1507c7575ff51eab08de45724ea46690ce1952ffaa9f391f7ad6a59beca2cf63695e69948188c78b13b2e9990f2db1734fb4a53 SHA512 a83152c0588db1dd64ad3d40f39de670a4fe65f9e67b6a44f6115b5876e0e65e449c438403a9655d4eb53c9710714b55f1156ec9587d34ecdf67a0b74dc84310
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index 14f99f5a7df2..a6b415e25335 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index eba76b1f4d02..8e4cfb237b29 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -6,8 +6,6 @@ AUX gnokii-0.6.31-gcc7.patch 830 BLAKE2B 308123e9f4a341a9ec1b2dd90e6c88b9ba9f2d8
 AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2d8692cf5879f3b3b0f5304dba257a56dc3c45b920c29b5fbda120daa7bbd3135f9a53880e09447580fd320b SHA512 11ecd345c1bd93a8c0f316b411106bc22c5fecff2a848d075e9feb1bd1581a255dbf5a7eaa7fc525325af9b1c7d90736a7b58104f870f3d7ec329ea0b43c2dc3
 AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
 DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
-EBUILD gnokii-0.6.31-r1.ebuild 3407 BLAKE2B a8632655d09f8fddac442304a2c9715b3571b89769b913964ed3c5673fb99e9be0910032d890b38b6e279616c111282aadba1aa33a74ae565bf62af7ad39955f SHA512 7161428ec11848d25ea7e1bccd11ffad5d844494c8badbeb5a04cc15b9a7b2b8ccfc4babda29aeee6893ccb84616c8d3ff6d5af8c6f7e2497cbc3a58d2a1b3ee
-EBUILD gnokii-0.6.31-r2.ebuild 3430 BLAKE2B 74b33ed0d9899a60d7c4c1e4744705280e9943b1e65b35eb93b4711cb9e7f1227a62fa049e24b7a449723d3a65e30ed4c7305962b60e87b39f83d7b16cecde68 SHA512 14171da8a6ca43e22f8b5f3232203623070516c039858ec22e083fce699cc2c9fa55de12a32fa73670591cc6cab782cdd377cb47f7e4abf9a61b51315efa8fd6
-EBUILD gnokii-0.6.31-r3.ebuild 3515 BLAKE2B 92298645c991e8a3a3c38d0e4cbfc62353787cd0fc6c7dce5ac113d5a4fa71fed4b57232858d9fb4a82457fcade0bf3aef1cf2d36793897bc99c40fdcc3dd886 SHA512 3744b2033ec52135fabe74590bbff65fb997e814c78a5e1e0a50358d8f29419b21e683621a4d99bd7d5a764cff16f0be67e6e6604d847344c2efa011fab06868
+EBUILD gnokii-0.6.31-r3.ebuild 3514 BLAKE2B 1c22c3b5fdf3b7b7d683330ca43503ca464925613fb9e15d4bf37ceb39cfe9f561b54d1e68f67c4703ff51fcdfc21aac03b3230f3292f5f97411b653131e0b87 SHA512 1da9fa658837cc119bb8cfb780e6c54a1baf127ae8a00bf9fdeca450287ceff925fce32bb9d27e9762719ae7a78c5e22b320c227bdb74d25d9929aab3395889f
 EBUILD gnokii-9999.ebuild 3347 BLAKE2B 68b0e4f22aadfe6a0f22bdc54adb555e5d840b12e41eed4c11c65fa99f575694b29e7b003fef3cd01cfe4739a9ddbc6c8dddfb559461327e42844cf69434dc7c SHA512 433039368e1b48382406fa03d59fa8be2aea545172173795d21ed79dabe03371d05750daaa1fadc210f8b81cbbd7f64546bfdd0c8da7d80e46645e7e10af257d
 MISC metadata.xml 756 BLAKE2B 840e51ec7099b1ae34694dfa328d908147c90a32689165201a98bbc6559c1d6db8c63dffc0264210203775ba502d1c64d3245b32c4def375abf7a7685539c458 SHA512 7fbdd7684cd7810fe6114146a3378c346ca8d01df54adbbea292b0727fb039d5ceec29e4a5fd4d3031c17f9f229a4de0d635ae23e57eb507103255ebcb057983
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
deleted file mode 100644
index 95e4c8ba687e..000000000000
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info
-
-HOMEPAGE="https://www.gnokii.org/"
-if [[ $PV == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-DESCRIPTION="User space driver and tools for use with mobile phones"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
-
-RDEPEND="
-	!app-mobilephone/smstools
-	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
-	ical? ( dev-libs/libical:= )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	sms? (
-		dev-libs/glib:2
-		postgres? ( dev-db/postgresql:* )
-		mysql? ( virtual/mysql:= )
-	)
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
-	[[ $PV == *9999 ]] && \
-		PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-
-	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
-
-	default
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	local config_xdebug
-	if use X && use debug; then
-		config_xdebug="--enable-xdebug"
-	else
-		config_xdebug="--disable-xdebug"
-	fi
-
-	econf \
-		--disable-static \
-		--enable-security \
-		--disable-unix98test \
-		$(use_enable bluetooth) \
-		${config_xdebug} \
-		$(use_enable debug fulldebug) \
-		$(use_enable debug rlpdebug) \
-		$(use_enable ical libical) \
-		$(use_enable irda) \
-		$(use_enable mysql) \
-		$(use_enable nls) \
-		$(use_enable pcsc-lite libpcsclite) \
-		$(use_enable postgres) \
-		$(use_enable sms smsd) \
-		$(use_enable usb libusb) \
-		$(use_with X x)
-}
-
-src_test() {
-	echo common/phones/fake.c >> po/POTFILES.in || die
-	default
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins Docs/sample/gnokiirc
-
-	# only one file needs suid root to make a pseudo device
-	fperms 4755 /usr/sbin/mgnokiidev
-
-	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
-
-	if use sms; then
-		cd smsd || die
-
-		docinto smsd
-		use mysql && dodoc sms.tables.mysql.sql README.MySQL
-		use postgres && dodoc sms.tables.pq.sql
-		dodoc README ChangeLog README.Tru64 action
-	fi
-}
-
-pkg_postinst() {
-	elog "Make sure the user that runs gnokii has read/write access to the device"
-	elog "which your phone is connected to."
-	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ $PV == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
-}
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild
deleted file mode 100644
index 05d602a9304e..000000000000
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop eutils linux-info
-
-HOMEPAGE="https://www.gnokii.org/"
-if [[ $PV == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-DESCRIPTION="User space driver and tools for use with mobile phones"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
-
-RDEPEND="
-	!app-mobilephone/smstools
-	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
-	ical? ( dev-libs/libical:= )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	sms? (
-		dev-libs/glib:2
-		postgres? ( dev-db/postgresql:* )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
-	[[ $PV == *9999 ]] && \
-		PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-
-	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
-
-	default
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	local config_xdebug
-	if use X && use debug; then
-		config_xdebug="--enable-xdebug"
-	else
-		config_xdebug="--disable-xdebug"
-	fi
-
-	econf \
-		--disable-static \
-		--enable-security \
-		--disable-unix98test \
-		$(use_enable bluetooth) \
-		${config_xdebug} \
-		$(use_enable debug fulldebug) \
-		$(use_enable debug rlpdebug) \
-		$(use_enable ical libical) \
-		$(use_enable irda) \
-		$(use_enable mysql) \
-		$(use_enable nls) \
-		$(use_enable pcsc-lite libpcsclite) \
-		$(use_enable postgres) \
-		$(use_enable sms smsd) \
-		$(use_enable usb libusb) \
-		$(use_with X x)
-}
-
-src_test() {
-	echo common/phones/fake.c >> po/POTFILES.in || die
-	default
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins Docs/sample/gnokiirc
-
-	# only one file needs suid root to make a pseudo device
-	fperms 4755 /usr/sbin/mgnokiidev
-
-	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
-
-	if use sms; then
-		cd smsd || die
-
-		docinto smsd
-		use mysql && dodoc sms.tables.mysql.sql README.MySQL
-		use postgres && dodoc sms.tables.pq.sql
-		dodoc README ChangeLog README.Tru64 action
-	fi
-}
-
-pkg_postinst() {
-	elog "Make sure the user that runs gnokii has read/write access to the device"
-	elog "which your phone is connected to."
-	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ $PV == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
-}
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
index 0787373510f6..949ac0b84603 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
@@ -12,7 +12,7 @@ if [[ $PV == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 DESCRIPTION="User space driver and tools for use with mobile phones"
 
diff --git a/app-mobilephone/metadata.xml b/app-mobilephone/metadata.xml
index f1c904e355a5..c3d73852b4c5 100644
--- a/app-mobilephone/metadata.xml
+++ b/app-mobilephone/metadata.xml
@@ -30,4 +30,3 @@
 		teléfonos móviles.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 410f8134a87c..3a53f83a654d 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 75f2351adc15..5ee047bed959 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,6 +1,4 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
-DIST calcurse-4.4.0.tar.gz 620263 BLAKE2B 8fbe875f5e757ec3c11b9c23a994260403ee990bfcb3d4c41eefbf06a6db9e76cd5157e32b11c3fdc049896d5db3a9856862724902dab1cb48e0b00ef5df6f73 SHA512 43d30ad68bb39aaa9460644a691e66cbb15b9930737581583da65d00214c70fb1148a0edeca4430abb7a5cef2821b0f4c6fdbed8188d9ea5da5fedc4f95fa07c
 DIST calcurse-4.7.0.tar.gz 699134 BLAKE2B fb50ee3d5fe6a0eebacb557ae6fdc1b49a413b35d53fd8dfb64102bd2ed963bf83f27f1e3c3f454284143d1410f18766b56792252634ad82b1b20c130364a54c SHA512 656f3e74cde923bf7bbe5aca56f0544023b69fd8ff6ac8c851bbe224bf6cbe1fb58eb141b66ba818b1382d705e1a7c82a7e20eda7a1672d513ad54749d5a2bac
-EBUILD calcurse-4.4.0-r1.ebuild 806 BLAKE2B 9579615ef4a643ec415659c006868a3cd803246137ca981518567f61fd2aa08c1903dd5a71e57465085a1aba2df97054cfd0ec6d9728e474dbd1e8cc7934d980 SHA512 3407958edda10e125378714676fe98688514eb70aa1acb619e3bca538e562de20e900be005f43cad3b28eb19238f8cd25c80f74d42981ee2c12880d9b1d62fd6
 EBUILD calcurse-4.7.0.ebuild 966 BLAKE2B 827e72b7fda6e962c3c1561286606d336ea55de24be84993b820437d5de2f62801fe9189829c0c79891b9caa2f765630b0818bf77c2faf7855ab619b08f7cdce SHA512 8053074be5ea40de3fbf0358464cc823eade9dc370d5bab8f3ecf517b5227da84834c7c9dc0222743a6b6b3cdff36c7de9efb889e865d5e25ed2d28f8c634716
 MISC metadata.xml 542 BLAKE2B 3b8858b3784dee744d56a735c20ca5faf165a5e9ec1ba4789206aa112b6dacfbe7ae563263eb24fd28da6be5bc02573f9ebfeadda96a9378f577d31a022f623e SHA512 6dcb0459490f73f429bb62201b0168f87c841b66d3e14671628ed6507c57704c16f26fe1ed5a7a0b896087a6847eb76c00680bb76f801d2220c64506d4ba1d2b
diff --git a/app-office/calcurse/calcurse-4.4.0-r1.ebuild b/app-office/calcurse/calcurse-4.4.0-r1.ebuild
deleted file mode 100644
index 3474043e55eb..000000000000
--- a/app-office/calcurse/calcurse-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="https://calcurse.org/"
-SRC_URI="https://calcurse.org/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/httplib2[${PYTHON_MULTI_USEDEP}]')
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.1-tinfo.patch
-)
-
-# Most tests fail.
-RESTRICT="test"
-
-pkg_setup() {
-	:
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-	python_setup
-	python_fix_shebang contrib/caldav/calcurse-caldav
-}
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index c4493322160c..525ed727e09f 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,3 +1,3 @@
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
 EBUILD grisbi-1.2.2.ebuild 985 BLAKE2B fae4b28ac06e534acf3e641f46bfe7767afc1afa1670c5d9c107110c5902af6bc704c2ab31cecc4dede20c07826ce9f0ab7c7eeb385dfa75be732268aa720383 SHA512 71308b7ca91ee51ddbc88df4429bdcbfb5b2b9bd88234f201e98be5b156ae103b27732b81dc9a78e61f81ad6703afb4793b0a9fed0498a863e2e456ecc4cc684
-MISC metadata.xml 711 BLAKE2B be72967e4680a341903aa29e9f2627beb6a9084696d6b0f8b5048e2902220b5ed2a1fee71e7458f7a2df8639a532b554fe437dbabc2a055ab8ce05dd942a699e SHA512 f8fca475d676c5a4fd504f045471a767e67cc397d4ecb5a6d6e2b89d0532d3e59e12a693f56adb12101283b7614e8e62eed269c9785ffeee5b7ab9c26e568230
+MISC metadata.xml 741 BLAKE2B 04b4958b26b7c8fb99d314cf0a6e09743b9f30ef68e0c05293ac83518b07eb50ee752da9b616579192a2459b5fc856f58bfd66f3b0a7dcc15193b57e83819123 SHA512 74f2fc45820a853a6589a1dc78e93bceecd702c47da3cd6377adca6a62414328630243b6c0496d8efaec399b21678cf2a3805c6e1757cf71f694ac1acb418663
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index b120f01ca373..175440ce76a9 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>remi@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>casta@xwing.info</email>
 		<name>Guillaume Castagnino</name>
 	</maintainer>
@@ -12,7 +12,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 8c0e77b76b8b..43dbd928ee5d 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -167,189 +167,6 @@ DIST LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_xh.tar.gz 292851 BLAKE2B 9480
 DIST LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 845408 BLAKE2B 0b447f228e543a0007c55eb36521f441c41139d882c40afbd39f6459efbd8f446b7cbc8f7d42141347ac677758487d8019b26ce18d90b6b008ac8a47bee7f32a SHA512 e27f34f9bed04aed3ce50dd4210cdacf7ae9ee5da2208079ee9178b8f3a7e67eae40190aa774a6e85353a9572758920897d4a74a393a75d08e7ab51aa1e39819
 DIST LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 846108 BLAKE2B 364492d2597538ddf850809393fd0f364f8f8b2e72d54ccfe5685ec8f386a90b672b0592f8f7eba0f4e8e8db14f229195a6a435224f0d45fae01c5a0a36e1c70 SHA512 346f214a3ebdb88063b08f2980ce55a2cf8789135a6776f4e6d1d3e737e3946f5646ccd5c3d5c115a7e86fcb64ccb23d22d9ac1f8cbc9b382db86571f55ba2fb
 DIST LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323898 BLAKE2B 438447de9dd9ce04b17b99f8c888190eed02588edce028dec7e8f6e412cabba65a2fbb73817b6741fae9fb1d1ae0503e8fd35a2a2f39ea4ba25ea33b51719141 SHA512 efce615c323c5820bc1d3505817c4634379aef37bec35db5e4c9b96c86f664563a9c0d17998d8333db4330a9f8c309650d9d442783f4ed89171c87002b81a2f4
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_am.tar.gz 4041485 BLAKE2B b132a461b8d4d3b2f5623e6e2a0921820f5c4f022c5925b470507c050da98d20293a075c04baaacc86bc005fa2d70c76115fe25fe68229df86a452e1c651469c SHA512 e7a0f359a7cd58d94d531f834c4511b7b41f7628432fc9b32c3f5e96265e3a9c7c3e2f529e4635095484e370eb18430d273a80ecde7e3f0f1ae429f162037523
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3515831 BLAKE2B 431b3b424ec50673ff3cdc599d2dc141f6430021a51dd2374ff535e4c46b0ad29bf8af5b0ddecbc1e975e99c72d902ef7f845e1e45427940af238525d7eb822f SHA512 faf4bece4b8be4447b98958617eff0ad10e5dd9eb19f6e666ab4402288ed26d47995320a77df9b667c1861d41528b710b756ab4fccda80208a9867be9cca18b3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3762326 BLAKE2B b7872bca8d1d5d52c226d01d3a09eada5597fe695ecbe75f5b14c3253bac505925b12060705befde349a60f290e053bfba19b4e5ca61992951c4048929f0dda7 SHA512 680431991861ca9253a36663e58b6c1e977350fb8cd1b6591195a3a17a2ed310428a3226a54a874e1fcb4836f997f32eb6750dee15cf39928533b3e984b085f8
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz 4076518 BLAKE2B 30e10afa9c6b747a0fea9142373ce89b2a5dbce732df201ecf37998e559b882627c64f31576455c6b4e4c769208eb40bd7be449e9aafb70a8ea19de4874ac48f SHA512 b6c61ace16e6b36e3f6c4729c88a9129fcda8668a80d759bd5c7bcc01aa00df43f0fd48e2b77dd3b18727498c940800ea071a250ec489dbd21c5a3a36d4f01bf
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 4228028 BLAKE2B db8683ab86086cfbfd7dca5b27a364e4fb3dd20755fa61c62945ec05cacd8cee0dda64b8f18c62cc8bd0bccd8cdee2abdba5a02ace194fee80b93a78def260b3 SHA512 d60848a1c433535ac22a4d2b98ed5526b4e5505a1ce609cb338a3df6e35c0ead56bcbcc4bff61b58052ff0e680ebcee6bd0ee810bd024f42d88640c2979035a9
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3906893 BLAKE2B fb4c71b6f712966df0e1cde394cff853dfe654f632975a3cdeae5d908295cc50a011793b569182660f6ecb1941f669e736c44f3bbac0ba4eb48fdabb644f9599 SHA512 1cffae0a36e54ad8e91a08b662272973f156864517969553e36dfb77493d560f5611d41aec98607046c424df471758236f6103e79a497dd68592372bf40cbd2f
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3916866 BLAKE2B bd421ec63d3bac59e61ebd8e3b38937f8fb11ba0549999ec9ab7f0c6f24641fee8020ca0dade9eed425cd8beb00fd51c9f971cd554847bfc6862c42238d168cc SHA512 bfdd54f8e722080a548c7d115ff363f810c91f546c4077644ab6de6a94beaeb14e69e1c249ccd97a7c755dec652a7d59f1ac62899e2f8b21fd91d87c4456fc9e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3646773 BLAKE2B e59a8602779007060835df0108c1a39bed30dd8c7f93c289e369213cdb4cec2b4eaef48401f47c1c10eac68e8965160a1ec3daf032dddf5e26c23eb626d495c7 SHA512 eaa47939c992ff4afb4942037cb8511d667c5ad3484c53d08f0da0b7d04cda459bde5bcd40122436aa4f6e2e12efac3756e79d25b7d3e2c3c6270dbf0d5ca552
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3782171 BLAKE2B a69d27a8d9523851e2d191681fc424faedb37bc646737eac1e1c2cef36e4fcf93d952720d82fc4ac428aacdfb5fdccb534af795787a9a528676995369f68d790 SHA512 1cfda233019ef47dc89937812cd6b3eafb1f9938f730a0451b518428319a02f51cf211d22c221b1b6b4979095b2d864081f9c9db7bfe468e9adc05f94e83d9a8
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3772303 BLAKE2B f1339fd0e28c6877ef1a2e2bfab3f9e3d340dbc496458fd7b204dc10608ffa9b75270ad4d2fa0af6edd1e35cacbce010d6995c70d799f447c1623619be6fc2c3 SHA512 49709dd9715b5c152eae4f2343cd0fc5ea48f8c2a63b8cb749530d8492302de978570e2fa4c4b26b723ee8fce92bc23eb65e45f1648b0749850cfed8f7c20697
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3801701 BLAKE2B 2eb669aefeb2776ec00f33d216a8b949335578b2d35a538e38ef4b3eca33e2a33d6e89faf97ccf6c4b5c79875bd61ca386cbfa7ea5ead13a8684a0595b2e8bf2 SHA512 2d4b0a135b31c22c50964226c6f6efb7b4bef76165f43f30bdc134cddc7858992be33f6943d662d2b33cf3bf56dd8734e064a242f7a72776b380264be17b6d71
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_da.tar.gz 3702569 BLAKE2B d084733ce52a955fc63f81748737c4ff6379a2b00865617b82df72c960d330aa05e6eaf57b4160b6b3b5f3c6de4768be86bdd52a1557ab6cac896ce9c36feb09 SHA512 20ceda63b747130d5d28a781b6d0d7c1a1c4dbbfd510f1455828a44cf276404ceb2bc89ff8a3ebc37ca86b8366260b532572bfafc1297497e8583841f69460e1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_de.tar.gz 3863939 BLAKE2B b1a7371a12636a63ab3da1c6a9fcb107189c1eb46295e7beff921c7a3100cec8c994397b6930dbd2a7711235b425ca4df6f84d9fe834d0a84901fabcad6056e8 SHA512 3d785b6e7ea0802a7dc37ed6d4867ffcc21da047af2abc1e95845eec1a2069c803241e44200cc51e14808cb585d297050edd2e353504268169d7d4301d956761
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz 4063418 BLAKE2B 369d2486b62b7a71f0bff209874fab6c5d5675c47837352298d5db8d030bb58ad76a17d7e3d53d5e6b96f5487bf33a04432e22bd7b2b2121a52cd6a05dbe9365 SHA512 4efbb6cd2110f3570e6ba7538ccd943cfbc6c27f9902a468862db596a219bb29229809eeb8968afb0d5ff7a9653ca2d98cc8e0f837ec9f2c01e4b1f5d093642b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_el.tar.gz 4497205 BLAKE2B e8e5861135a84f12604916e9d9430c5bb69867c52570e2c2e951d416ec07b57bc5d187ef69550c99a89544bce0d221da58ed28b7c323b7050a657532c0b42220 SHA512 ebbfa7bc9975759baa2159aa05ace80bbc5b6a59b49920a93f0dba950adc059d30e42b5bc3c3ae8ce852537d2c513e0aef1d15e12a330ac502fe2ddece574445
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3534308 BLAKE2B eb41d5d2f47ed6b9432a9c42c56668eeeb6bf3f34a3b4ceda6ea8454af744141d30f529aeb0350b0f4dbbe257d794860446c12f35eb9cfef2b6542e45ebe38a8 SHA512 4ad45923ba03ca02c6435d4ef150cc855bc9514b6d058915704c040ca80694098baa5814b574d8bd6ba368b17a9bd838343fb1c123f34f940d0d0f1fbadbcaa6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2224896 BLAKE2B 62bec3c6b50587b7ee5984af0878b3438c775f8c4b1717900638b1c1154bdcf4ecfabc384e1c52e0233d5fca98948ce32780615c1e3ceef2bd61badd648f471b SHA512 3c16b54b670ceffcc02d4e09dc83113c63ee1b8ad74f3c5138dbd9d118a41f15c08731641a7702fa0ca9adf7b8dc89c13cae2f290546a8b86b26b140150a9327
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3526483 BLAKE2B b5d66cdf41dc98b5eb59a89874151da236043df24779c8c7ab5db44e29033c384373a70b6e2e26c824a59616e7bba84fd06ec7e409a01a4eb97f4a9ecfdbbf65 SHA512 32da02f8a8155b9a5d9ca6d173f83ad3813103aa0d0f659b721eedb215ebd60f7da0e2606cc7ac87fdc0347e8a3a9e389c84a1ba2da3c0ca7209a6e78934323b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3621112 BLAKE2B 40c20d68b03d5894d98085ebbeeaef004e03a81a9545a8e8943c390076921fc74d35c98984c0147393ad307a76d7991f786139dfdfff1a31c5ba7c8157322990 SHA512 e5ee5aa0ee21f4b4f3964e73f9b56b94a71b7d7de26e0ab7fecaac07d0e2b1526caf69089a0f25b22305a4b0ac822203a8be36632d7d66165a44aa6732174cd5
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_es.tar.gz 3814089 BLAKE2B 5db5aeb1d7e9e70a67df31169a199d2e12c2f14c2aba38a31c84a6e91d79a447d065cc5c1651aea56265b90bfb539a8a71d101ffe7dd82b33527c50db22d867c SHA512 0039d9cf57eb0540efada4bbf1782a429b824995345efe17d3aef689385dbcf8b27bad8b863318f5940486fc9e183b7cfb2deb3a73a2f82542498a3c267e3b42
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_et.tar.gz 3664636 BLAKE2B 2def2356b97d39ad74348a0529a2f5cc4409c89f8c6b34888b56372f9e5a71e0fb5b717fbf4cfddb4166f60df846e608bd2779469ceb26c7dd92fcfbcca42649 SHA512 cb0cba464a8f4a8171e887d29e8161c9d0756847c3d1532b375eafbde4f346a7b107cbcd75d3a4007f39666c95083baf1c29b274ac0d25c390965c62aef1bcc6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3650812 BLAKE2B b5a7ed6e21a604c3f0a419df97ce8a0266cef1506be75e373c8488a89369a92cd5045b67aa7bdbfe0d4ccda6351307a39bd48b42843fc8ae6a71a0796f7740d7 SHA512 28fb8750d595cd3323843fb6e06a4c582de0329d070ba9178a72c2daee5074b7985ff8f9d04af678230bf044d8411fa382a23029483a7a2f170ae1239ad7d7d2
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3675740 BLAKE2B b2a9b54c366c3070cfd18ac96a70a806200b8b3f99f4e9ecad156cd88b8917444d1248efa187efccdfd93654cc5c40812d5f4a90a6cd044b44474457cd32e92e SHA512 2a43a489cc6a91145481a941e358a75ef52bdb703940e73c52fae0b1d09be678e0c73994f7936c03c49f8c5e7d5a6009b7f12bff6c4817190df193871aaeea27
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3797744 BLAKE2B 9c4915b06caa1f8a8b95571dc78490d53f77701fdad10b92a56d7381a908f7f127e8d76a8d3fc151f3b583f0777e59b02395c72aac1c3fa4c08669d939a72950 SHA512 f2a7b5dee0aa6a1bbfd6290b184e9f7d72937ef787fcaf9a3458669400086eeab5e4553eb7c6af02c7aa250873a5acf8f727a59590e7fa2d888b8cef1bc469f8
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3759630 BLAKE2B c40c8dc7aa594823d22e46685395f96b3b4d1320f68cf7c9173632aafa0ac26e7829117cce4768dbb35703088ad0abc17df38b2eb396f10cefdbe17c44101a6b SHA512 3a8a4b9498ddbbabcf2094f66606df5c96e2d6a153a21a195dc17425a267d1d12bb4b788aec40d3e7874953fc515b228c8bfd05bf7accfe16fee9691f61c9870
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3614106 BLAKE2B eb058e8ceb3c2909d8ce2193b6757acd45319af990dea792e74f477cdc8fa3566649dc82783a03bdd4e7fa22f6517fbd11dc48f692d8ede6616eefee125c5741 SHA512 236ca474c5a3bb42a854b30eae6a66abc04f44fdfa94430b1b6cf437ccdf02ce66025ac364875351d8baac91b073202c8d605cdfb9fcb4118d88bbf558d5738e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_he.tar.gz 3386005 BLAKE2B b8bee4f4bb39065678fd4da36c738c58d44191aae7db5078833240d68614219a5a4090286b911d2a1f451c519db0f2f6ac7fe578908b2d76ab9e08a82b44eaed SHA512 6e7960c4ded953ad693a8c2cc8fb63b2f38675c6f0538c9f3d7b4475e601b0951fa406f19d36774be72f566afd6d9428f69aaf6e0ee5749994a0aafd2fb0e65c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3739367 BLAKE2B 48b163978c5048a419a34da0ff8dd4e33ca74ed1dbdfa12d43a935199c3b7f3a182ad2ec41f86e04c194a343d8be8e829371b35e9c12406d1ef6730702c7b903 SHA512 4c5fc7c99ee0ac0b9792e7086908b277ef1274504d861b0739c9f8fdf55a8b81ad4e3dfed2720408db4464dfda25977bd49c6f7a51ef3833fe96fddac013b4e2
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3653417 BLAKE2B 36213247c8ecb2b92e326db3a825e4c37ad8074803b94e5c2a416a47739597abdcd27c8fa12a4de5130edb75892fca435933763b69240fa61b241e6fe1f011a4 SHA512 cafc0ceee80e407ca51c29cdd62f2c41fc15ae0ed509bc35e32329aa94aa93c23662425b869c3220b6d3327ce1086f49ed6193db193d16f7d9cb721aac41063b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3922141 BLAKE2B 46d86a5649cd26c22bbad96152a1c6698ab3767d06017223b9f529d0cc6fd6242db16a5c5ae7bc6294ee6a28a4fb0505f329b45c970fe0e2d7d2cbbc6d173890 SHA512 03154561d552abd3d3664ce91b80beb1bddcf8c1897a5ca6e9820587aec079002654830e93392865007d4606c8c52e0b9783fe4e828531caf4c31ae58911df5b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_id.tar.gz 3596558 BLAKE2B 7cf60a027ac5f6f55a8a293c3812796d6f381d7f5b50a03ad7329f406788d1c7049c780661e35fcaf85b1af83a16865fb72f9bc7f2155915a0b3ce04fe2048ab SHA512 c9622b06c5dcd09b815454b00e1cd1d391d72edfcb730e6a90364370b912280e14c6dde72d550575b8d38fdd3f30384ae029d1da8ab03219ad72f8984fad5b52
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_is.tar.gz 3670222 BLAKE2B 7bdbdc22a7118743fbb376e5c1fb688d768c44cb6dbca8e7c988267a43688313e7b4ec8cf7fd36f3c0f2b05a35a60250996c9848e3275f48e006ff57b49f4f65 SHA512 f3080256c980405d691189232a23ac61f918ee486691e83fb7517b402f3e49af0fd11ebe62940641432a8d038dfccf3039d0cfa5e7990e2755ea8d33406796f9
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_it.tar.gz 3725108 BLAKE2B 0467eb0d227245ed118bf9fdfe60717b1c8982f8b35d416e78c7627f6099f530a9fea0f8f0e0a64c759ee66fd1ba2ec553004536614c47cf4d4e915d5c4c5125 SHA512 3f0918900712c886afcb6119731f03aaf630a00e2862e51cbbf1eaa5cef0b2ec35f92b8aba5ca1b69b57336d8203a26fe6dcebc3b52984940e344c5304abd323
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz 4380108 BLAKE2B 41347fc00749e0e8303373bf3b7e0b24d90cb5c3ce0cd7fdbbae5ea69c711f48083a8e954b494b384d4270d8e516e2c53eb42c147c1613ccf44388c11059b0b6 SHA512 ce923189dd89642d25bd30f8f9c78afec3c9c8c66ea144d479e76e4e5778f2e54a7bc8d8f521860d3d2bfa0879d50b6effcf19014c588da61f7a6abde239f39b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3857980 BLAKE2B 74040d0b14e0a976624c411b640cbb0d1b219400f390dad54e53e515846c12a5668fc2c45927c27a001567d4bcd50a740693283a6c1ad6a2edec4dedbd339f88 SHA512 e2ce00703300908ff4ce13f855fe707e657f0d131b1a27fe97c22f88471646a7f60212c21044e138f0780d375451e67689f542eb189fc598a084c8768b9311ca
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_km.tar.gz 4190011 BLAKE2B ff2f29c6e688d9845335c34e089523155976d678acdbc99ab7b5c244411ac065d403756871884917a8d86c4f58224829a37bd200f46894c9159249197b24debe SHA512 6752d0d55e4e9e3ca9d2e792ad4c385c17f3be089b679e3e0c89a8cb8e07a01d77b358b796272ace000f7c668816287e21c6671670915bd4e1a542b5c5975dbe
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3884500 BLAKE2B 48ce9369577ab979e73ea6d19825880b2e9a1751e2f26d49015fbf788bc0e790f020124421b6d44ef4c2cb4726a495c4baae5fecf0fdaba9daa758fec4618ab4 SHA512 6a7b0ce2c251535fddf968837022790540ab4888e427b712aa4fcbbb1a6a44e6ff3a32ee10bffe695d4d0616d85dbf59d633fb12d9e48452296e7d8c8b948ba6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz 3610583 BLAKE2B 3957528ba8eae9a5c428acc64454202497c45e6a6e6e8dbdb8865168bedd9e9e68013ce50923b8462fd33a10cf601f2bf278a003f1ed7fa4d7b22eed9c1d859b SHA512 a2268233f67ff8f8622d4f23222830ae5ff3185142e64afdb79d11b5b26290f56afb3239d559337358f0da0661f46bf96e34f991f0f798adae061dc7981aedd1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz 3805163 BLAKE2B 83e0ebb2f7b2aa9813bb553bd0242c84eee12a2a5c91cb0c8fd4cb463ec1ffd83d46ff22e1155ee601c173079ba37f1331b2741c56d18890a9c2342546f78baa SHA512 b178af97fb2cd6015efa5675120ac4d7f37c0bbb54cda085b5a8b0a04aba88dab673db6385328b7ce474f0b68ee2629dd6e0b4437ccc13e757534c549bf7855e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz 3666905 BLAKE2B 88fb004f3ff1a875f209c5495914bfaa59f4def9951ae3edb519194a116d01815354b28291a9e2bf3a53825f4289f39b1146b1d434d9aa5e12464f1eac307bb6 SHA512 4b6ab759818481c6f0fd3df79bccb94c85b14bb47d9e140655b97f067bb7e8aea64a27b742dbf2ad88bbc4964b6fc7cd6c52dc4733b47d2ae07cf6d3d271351d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3707598 BLAKE2B 360e41821bc3cded7f5e103506469e0f6cbf295309ee689008e69e6e242772a3f70e989d9803099eecae093597891e0c2ac67695a5b780a17a459eaf42014674 SHA512 0de84885e82e0a647b3969972c962387dc98970a9c3fe3edf4761a15f0df700affc58e0be1968bd120988c33400fbeb45f2b4254a4cb076ee2572f8d4f7d9bf1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3656551 BLAKE2B d937aa6370ea84e4c5ebbd1d1decd0e9e6887b74721ed8415757a344b5461245bac69eefb3d7da5855229418d22fb2d09b4b6c9cbad8c25482ba5959cd14f763 SHA512 855f1b16aec21d56cd90af3c4713fd4977b94141c81f88b209a0d9a51bedb2b7a997bf631d381df081be7de33c2a8f9774c206a6ee9c650cb48d031d6d04e8e6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3945622 BLAKE2B b21d3f966770616db9aad0bcc2aa01045f176c65195c67b5994937d32fa363bb9f08b23e9d41faaa9e34efa261ab6d5ffa734d4ee6f8cc74bdb25de7146b5d6d SHA512 4b711a14a06ddcaae17bbeaf0dcedfc786dff1de1d72d1f9d05dc314afecc697af1293aaabc2b361fbf673b3f62f253e255349e005f854d90206b68b8e21a817
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3779859 BLAKE2B b7dd7b90ee7bb87d178ee2471d4f1cb0de806dc81cb2bfcac8312eb3b2874d02427bcc823e0f1eab9c60d579e9e7273817afa6a4f50f780c27ef4c67c791271d SHA512 9dd13e34e0a8004560305db4594514bc874042b514b5e94bc730cc07351d4db63d54c5e25bd8eaed7d6c0ee09683d60957b28002717406a1680bbba057832268
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3814969 BLAKE2B 402ddaa502e8dbb2ab744eb3e73733703c57dc5455dc092943560c237642b651db210e700928d00cfbac19b8c16d66cb96a44ade77e7918e5e186cba44ca5085 SHA512 e850a59ad2616d2a605d971988c2fa0b4cd41826a55611c66b1711668a5074c8a3d9c27a5cdc8baf1d14e64db336f5f61d83493207ccdfbedfd45684f935b291
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_om.tar.gz 3713125 BLAKE2B 93622d594e3e614dbdefa418284c60d37ad389528c32679e9dec15ef6b3a23c1535b31f23fbd2adf4f5719f441cf02fa4e6591e05055ee159d60920c3d5a1a17 SHA512 7562325287bd3e90a6530ea80a34362566262e3a10616b7ca25b73c3ec20a5b8b1418238218e58d14e17fdd2e66ec155aff7b89425e8a966db1a780d109b3cfc
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3956066 BLAKE2B b8489f5c15194a2925a78ed7d2173cf6fd8686cdd06e3f25e488b65c36374894daf518fbf74b570ba5261d86cf5ae32be9a91e69db0e5546bd7b0537d352fe1c SHA512 e4920caf1d11925702841ac4049b837c8c3e862c356a3e7164bd0654660de973c34fdaa95cbee00a6589c4da653e4bc082c88dbdf63ae185b83f955afc23e167
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3767089 BLAKE2B e3cfc213baa434f2050f6c607fd1a76e3802d3c5e5152e3df4dd9e574e901c9f88132253472db841e00d229302696b890f4ebd89566010e9cdaa1e30debd78f8 SHA512 870db5ef0a8442c0807ed2028f2faa77876a6696bfbca7311eecd718c38621d4faeb9f947409d186e194536a692ef24ac226b932ae04b8f462cb41a32fb9d43c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3746970 BLAKE2B bf8ddedc3ea1cb834891107fb4a57ccef5981ac3942c6b35fdc4c92cb62e82f8d8645636ca801066cd55aeda7152c1bad195c7431cc96f0158e7e3cf73d2fd12 SHA512 0a852f95616266ec978ae9b8e4c668a7a800d6d9fd566d0a7b18142dcc45b51b2ed129ded8fb0552a25f46b85bb60c4ea49b73e990cd2a7929f67c997ef2f8c6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz 3559679 BLAKE2B ceaa6153274d0ebf663b651b9acf2e5d202d7fd0d188bc546a619191a917710e39c7a39144460003a6b460176742ef1dd3f4d8e179e707c744504525bbd94e4b SHA512 a3e10379f0a7b4bb43d476f3705f31697e4f6a3a26fb9b895a9f63f8475cf66283c6eaee60d907e7b0784a64bc8ba07a0ee65a4d8a992f6b937a138f8c277b30
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz 4107560 BLAKE2B 7988da5d497e9a25da249d6eee45951235baf9c443da99405729afc7feb14dd84d4e0351dd296dc5cfbd09b2ddea2161e6c766b8aafa6d92f7c7401a3bc9e8f2 SHA512 04b6ddc97cd6204078e460c4da57b443006dbf0eed87634f1f0a94ef48db4d48dcd17cce85aad91049bf8b63637ce04942550a9ed6999d2c0f283e38693c7b3f
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_si.tar.gz 3840283 BLAKE2B d0cb6a83117cb7fd243641e52b592dbfca2d5c64c505652812ce84b55eaf2d82d3f88ef424a8795236af885dffe00819ad608d5022325ea05d377fdfa07bc701 SHA512 d8cf7cce76751011ac3b70cc5ff7c07a3abc3418bdca5e6a426c91121af4e49b6538269ad83cf7f29a54279ac26bacade0fd4e3b6326dfe53889f083d9183401
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz 3703213 BLAKE2B 2b5022fdd5b0a442140eaf3d8ad2e3be0d2a40d161d70ec829b75d993e08adec45696b8969c7eeeec82918a9cbbb727fdb52b3adb98904b85544f7e89f30d229 SHA512 aaed3fd6613abd971220129f92c0a8ab2425c474a1bd9eda2af22f64fac36f3d2b471a6b26fd3be68beb85ac7650bf187279a38b2de0130477b931d380f78cf7
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3862167 BLAKE2B 9904d764072ff9ef707121bf9e6ef4d4b89e958a6e8296064863d0e3a1b0041e343e3e11ffc5e769527ef63b026d0bcd6e9c3f30f201ccea8d3ce2d6bcd71cab SHA512 228b488a09f5dfdab256fd717e753cad95fd93dddbfe9115a0650dd0338b5b767a394fa188204bd2fa5d252a1d60c863a65b2da709135fcbbe7de1c88cbe64d3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3715492 BLAKE2B 6a2371d0d0f091d43e2b86ded37e2bfcd43864fb57fbd65683d5b6406e2bdc798c7d6fc42f8f0ebd6969025f72ced9c547aef7606e948dfb69c686dbe95701b1 SHA512 901e5741b7a792690b4bc4a7b169b521d3d5b92ee101e65dda2e43fbab98e48ffea7cc4db946058cd918e2da5c3c4d692d1dbbb346196cffd59960fba7dec2dc
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3623139 BLAKE2B 909b348a9c574d6a1d6539061884a58e22954593744b71305a75e2fb4fc6a21b944692487aeaa31dfe21b3174a3f115bbca2b56a70c4540c50e0406440c559a2 SHA512 d9d114a031127ce217be5485b2acd453ecef42e07254a6d783c2d2011cfa1a35aaa02b10d2933fc837984a04ba1219807547d643290192dd0fe51036ed5dea85
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3704458 BLAKE2B a866110a51f4adfb9c7eeb2988e297016234de3749e9052131c2f362d0d143a7834bb16f471224c91fe1271ae5b2faf4ac456c1493b1795f5620fdaf022ea03c SHA512 57b42bc43b372a08a3b48c49236896e09c6ed06a6f6ae54e1cf6811bc93bbb9060c4aafba0a3acf21dd76f9ac69fffda7a27c80673670e52b3450cdd61976d52
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz 4054657 BLAKE2B 4caf141e0861876532cd97c46ccb14818f1ad03ece1fc5fc7706bc19381f440fdd963ac9f312bb79368862fcf2490b0f01c484e1b8d2081ec0ab112485366bbf SHA512 dcbca2901f96b2f47c7213482e8dfa82ff2b93dde8566c9ff5f69be1cdb95c1674d1b832bef1a2fbc6076f067a744e78c8195bd9718bab8cd76b97f9a710c23a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3673241 BLAKE2B 80b4995be53368169ec75e1ce19171c16c467f27a83b89469af95f0041bdf0169b255207232d86fd13ff0aa4b962052545638e4c772fc4f45c1d533bc4587c9f SHA512 8e775596d78c5831954fff8c5002f90b9b9d5c4aab811112013882d7eb0f9de707d7dc53a7515accf442202e9ad8be343fa4571f5f573681d3c00321bb61144d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3764300 BLAKE2B 4b832d53383b482b22850204c9f378fae86d25c04f5df91df5a8209954e4344a56181e3263fed4ca465eb7796429bb862f06c3aa3ee296944a2d04a717191c7e SHA512 f358aba9f17e7a85b1d0fef4d7b2b709fa43c2c7b89b3ad1af3eccdeb7df990a440e1ccd63bb87e72f6f7fdb7e5ff4c894e209e2fb88c1385c99a1bd4d211eae
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3782686 BLAKE2B cc713dcd8be5f1e8b3ebd0fbfdf92bdcf5c7b819054a7338b1562b1485d3e3d91f76e61a5f243d8812e3dd22e8cdf73b223fdc8da104da873127eff4b55451b0 SHA512 7a33a8b70f481b0740c2ec06a2b91fa9af8570efca19f80d152118acd87f8fee037414adbe66546e16aee72a857ff8cee2f437dbb3f80800779071e0cee2d263
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz 4087414 BLAKE2B b297ea751fc56f72fb653f85395c27ec8eeb750ee01eb3962666c5dff565db00e6646bbcdebc05a28d0797e9d2a9d74fd8a0cb3f1991c3dee9e0501d8403420a SHA512 7cf4d4c5f39bcd8887f5fb06b500c3add85c0f8188e70b71ec9c0149598773e40851c79f31c9e3d17b91a623157f45a1bacd963b77878b1fc1d547e268a652b2
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3745545 BLAKE2B 497fea0da6a51d81fd36b907b11491a3465fe09ddb2dc5a14edc918b874f87785162c593d4f33aaf51308093fd5f9e9a69c6cc096efb8fe1529d279f880792be SHA512 953853e24f2e762f7d33912c47dbb1b5cfb97bd02ddbfa3bd10393d91767cfd046d7b5f3233aedc5269b0f0e96ef6d3dec6998375c0530ae2ca30d30791b9188
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3995910 BLAKE2B c2beb85881ad71181ca9d3bc3f406357dca63ecf28a787269e2571502b7b78c6e890875777b1dc0f3c24a1e1fba9884073bcee374f7af7447efc2df3ea4e8270 SHA512 4424ac5dc481b341bc9be0b8a091862cf1f005ef83b2927c4c16ff82479fc65c6c4b4d57e9f7be402b360ea1c6cfd503b08bebde61df81fe3c4105f359f29a65
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 4128339 BLAKE2B 69d3261344b9cfbba193978b30c3f23d1803618e4f17a8fd66c06cb7866ef7722e158303c48e096f2342e06f0f03e69e8ef399bc8c64b5788a43c9352a500cc8 SHA512 302ec630c3ee1e100c9e55e1c36f8937bb8b748718e989c9e965d89308a6cc830ff04e3004cdd9be10c3ab4f3524e7c6b9ff3580c2521edec4d49cdcc6a84018
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_af.tar.gz 1238368 BLAKE2B 1b159b59961fbf0cdb8c038336e0f5fd9229ac32b5a21766903ff73200928c307b5ff246de1860dbb77ac872db6a195d69ed14c69d5345bb551dbc221eb12eb3 SHA512 09f43e4d38667c1a506187f8c7e8f3503388a2c99e42bd5e9315ca25ed271f66044adea97acbd9a7caea41493359f3a37b0f655dcfd7ff7f4e973011053d31b7
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_am.tar.gz 757090 BLAKE2B 2ee737e30b7019bfc0aa77c6ef0de9f641010df697c2b6286d1e9e054e314dcb6d4a52cdd5a40e2353c911e073ffa2ca8f575c2a90a4c958bf4a4e2d03d9c9ad SHA512 0b55ec8edd86197ed3f8f4e4fd01e024263d7845488e3cc78e18d96c6ca8abd5448f32851a40564f3ac63c176df6cfc02f38721b911764abbe15804f4ffdc0a1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2402829 BLAKE2B e8eaa2f07e1ef8326b3382fedf70b09afb2631310bc8e29bc4a198163ae64fb642c6130942b751db217f3ee3129a5a70188d157d1e66befc4765070196d7cd96 SHA512 bf3219169b098623381cd834c668101a25a2ed48e502c9f98560858200ba0a27d8cbe02116dac580a782359a4be0d0e84327dafc3c7de895e45b83dd6c716432
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_as.tar.gz 525260 BLAKE2B 4809b782fa9387ab34a1c1dd986829fe78b0dce4678f8c4bcd605d956782910578ffd859212a0c2b6a3056e93e0624e49345f417dfb6b5712e7958c96264af32 SHA512 8b24007111d25453deca526f745fb90697253f7be7316c98aa10977a03fb96e539fc4637b81a9518dbddfaab7f6e74ca345c5912f79920495b560c5b3e12dd12
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz 488863 BLAKE2B a1d1802bdf57ca1d3fbf7057a4334e697adefab811c809e4dcba6fe199bbb795212b1c8dd069852d75727db7c35bb2153f0a4a11a13fdcfd528c4199cabc4343 SHA512 40b3d853118be59ce49c96a1c391266df0281ce7f12c684647e44b1c3c147c3b25c904382f2ba9d0a1e6e05db3c694312a6369da8d7a2bd5c9440d9244a9a111
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_be.tar.gz 1055570 BLAKE2B 850654befac630c88ea54cee2ce61fd764c7bfb9b25f0d8568c1f71a209c73e76a28c93ad4c12e22d697a6a4e7fc63b5ff6145de992fdbc3ce27753ecc059dde SHA512 207d006190b2ab996c96a0c4e9f693eb43025a084a22482bf1c7b3047adc46c3a6a11ee4d0e0f0faead984bed241542b3cf4c47611fb1c60f85c39b5087b867b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2490286 BLAKE2B 2b8b8e237c080898caadeca29b3b1808d7055f476449f9cec0aa6639b85fbd941bb108b3d347997003cc537f136f4390a3de6709f3581fc537203726b5eaed14 SHA512 5d799a42a01956da9ea723f31fa7aff4837c8a9d901aaa2049c1f70d995407b2407eeb10790997a48b48f9d6fc65eb5151631092a4b5f10e33ad04fdb4872244
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 634399 BLAKE2B 1fb2ba96c79a7c4fae8d9031e58dd94051935ce75108949e173c12571bb929fb015f520a10be81eab9af383e14e8f7bff89c9c3fa9f0261d6ce5e30e6df7cb07 SHA512 efd9880b13ef92ab78b8b2cfde86813e9aa60b65cd1994bf35de287101e4b0a491fa5b543ca4feca2d1534a986052a43a17b3396601a8c9523de8f88f3575c7e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz 786379 BLAKE2B 950e61dc05f529d5c9d056b1c592eb1aa1edde7229ea23b57b09348cc28538d00e8f749992c89aa00fca5aa57f7b27cce5b2f831b5a86edbdc512f48b3828e18 SHA512 7c7bf1573b73e747eb071a1a86c3305c23223267d815527f8090bf4134367eba2e70e73dc356d6c43bec3936b7bc258a15d3cd2c1e34e7eece46575ac699eb23
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz 379022 BLAKE2B f6cfeae547885fa1d433ff052c62f196e712aed690749788dba4f8e62f6d29ef16b252e137946a3a90432295619b06f5bea37f0b2f06da056984376296ab2d7c SHA512 3dba35e3f59af71d503c4aa6aae0e6b4531b6d1a28d9893e28cf71fb3e56611a7cb05f50fce97783c7386b503aa42e75bbca9a25761e869fa961286df9d384cc
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_br.tar.gz 1523417 BLAKE2B 72a0270ef07ac3fa5b6e37ed0ad165938b9825ec7a9fa9af6b909a2040bcf67ccaf0d2566a09ad749b073c507001e05b8ad4b97ba080547ba8c0845551673f93 SHA512 ffcec9e3ebe8261ef6f5a3f78384b7bc1d34594355822f2265fd7c0adb62466508e36ac47678ed252bab26ab0ac16e29824074d6fe45b44504fc137d13b97ee1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz 337294 BLAKE2B 241d3007a51ff0bfcc87a6c646f4c478d277c68d5b5dd4457b2c0ccaf1f8a5f477e9c6ba23c9d08e6b41ac04b8270011d94794eebc88f679713ccbf5e0f8fbba SHA512 bd8f72372e23bd7942805d39127136a839bc92e9113bdff2d5838630099847b5bf22da48f604e2da1b6ad54525051f9514229c2d9fda7b21a32b2fd38a97f232
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz 629015 BLAKE2B f4c09528373bc1ec0ec6dd2e5ded0e6e4f01c54186c5cae886506978e6d967cf4ef1885f625dd7fafe8bd864eeeccf162e38f57457851f5fdfefb0741d8e372b SHA512 8b42065996c5a72c8813e1bc35c13d9cf865faab781ebe2cc738d2eace3ee3c7c241b6f7e928b4f03577acf19dec0dd52b99435575ff71bd313ab7e73ecba3cb
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2480042 BLAKE2B 2879aa665c4cbaa4d8f895f43c3b4afbe3f8258f5d2edf09ee9ebd9856a3ff3518038093fa88d745b349e8836518014878d181ae2928c692d05e399af3dbce47 SHA512 23a5b7358925038d129accfbd25e5b8de747cba46e236280dc94ac318a16bacd03aedbe85b2553d081e141b86a5697b504bdb4029ef325e61ad7b098ba7ffc44
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2480550 BLAKE2B eb950c68a05a44cbabe76265ef7c59c34518fb953e4c1494c9e1bc5c787f422aaad05aeba6cc194a30c615f537a7c82dd1f84c8d3703aca72a7a39f430ded8ed SHA512 6adba6d134ae51f2f03a602fe0ddd841774b89e584dbf1c718d45ebfc319f490b6bf96cd2d8651faed2c4864124eb05d7a1b252e35ef6f6330104fd4f186fe84
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 365942 BLAKE2B ae9ba2f662a30a5557f058585a6ccdebcdc624f4bc78e94dcd5a3446293eb9acc8729fb2e0ed490aa2221a1623601b3accf9ab24d2b532195e96169c0c93cb01 SHA512 b4d7e92265bdc688ef66f0d98bd7adaf7e24cd11e4c3628a0f4da4f0c40cc2ae1406a3bcbc3d7c70b0eeb408b640275b71b04c22268ccc8ef17de11655e2e6dd
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3229603 BLAKE2B 5d8bc978e25d16ae1438f0cbae94dbb1b0f8c84828def08b783c31c3ab9badaaaea3f8f9209787559b6d4b17a9884a2ebc36a32daa592ef4d5a65e39fb598750 SHA512 eab0c122a9250ac2a666f16eaf2c04c94dcc0c39b69d0d96e753cf032de23c294012ee3111ed097ae60a59de2115399e8722273c6c7be5172edd92f9c7b443c3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz 769044 BLAKE2B 559b7eb8ff3bf6fe386ab8f936cd9659f408107a391a6f2bd0fb5dc34f9b80ef18dbd28182c0cbf3591538df2a9ed12998fbf571d3eca2188f11e9bb63d3ef0f SHA512 85defb0b93bd3b2bab7343e4024bcef94453fd4dccb2fd276e4f94d9769bc42de1066469912c28fccebfbae1faf2a1de4df1d6097a464474a5f78b3befeb6fa6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_da.tar.gz 2867357 BLAKE2B 4e16120cbfb4efed9b7a499159555674b08001abb9adba67166cdd488107fc2daba8c04ac7bd878208745ec5eb038ae25b781697370eb6fcf0e2f74c2a295e7e SHA512 920e281c02a25e49fe9edd1c67d3f2c9ef1b5588b746d52f7dae5d2e0a45438e2cebd598057c2f012fddcb38fecc687283c9256e59b37fb3d0df4dcf7c8b9d3f
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_de.tar.gz 21797800 BLAKE2B f825963cee0bc481f78d684cf843f0a35ef6fca3a482062ab4052687cb0810d312162d5200680d1d1b06d277e9d37f3289a10fb021d3f3aa344f35075f28a40a SHA512 6918a056c45d8f9b14afac1af796db7c128d424bcbd4e6f800101da756fe90d87721efd92b4617f8bd934deabd4e3b6b3a835db8401901d59016249cdf57773b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 436333 BLAKE2B 1bbfee826c948f1852c3ca4c5bb911b9b73f14a859d7d2ce7f32f0350c84eb7b14c7ad9c7a3ee1d6fb97dc3f1b93030d24c8ef98c7b2bff17294123056bc4603 SHA512 abfe8fccb7cf57ca08e4ee26e4141fcff058110608e31efd2f6f98285617f50b99744b92987b843bce839fa376dfad1ab62a2ad1f76f619aa295bbae4d4e79f4
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 792870 BLAKE2B 6a6ed9c6f72e283d36334b3083ef27ab2aa88b1362cd00c13021d86ae0cc2448459137cc22bc6a25a25c22e9581b0f579dba6e41e6451f066d0c113f0528f774 SHA512 c1c214132800c3a9c75e5a419e4b4bcad3e59b7176ebd2b9947d5b01916c982c72ad490454d88fc9d744db531fb95133ed424f9523116c268b754a9a7af4d473
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz 366489 BLAKE2B e91c68641547602ed16a359c8be1d202c79ad9c155ff403f90a0d248a37363d9e769c1d069f8170e61114f392c21e79dbe63c961068bba37575ee4f7bc1a1422 SHA512 38ce1d5966728e4d916eb2c6f3f78b7336d6c0cc786b886f6329b7a5f186b3cf8c16231bdd384870c3cf078c0ebcbdb68c0b2aba607dfd3ca97424f043a61580
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_el.tar.gz 2877545 BLAKE2B 2f394936e7f0a1ec47fc019f4ba48b29658410d8681b036f7f945f7c4025e717159bedae137e33e821537f1e2ff814f4b53eb5a374b877335f2077129befb2ce SHA512 d7821edd1c7d71de3cf0f388f9e6eebb8f5c7f73168cfb2acc909fb8f2efc594eb49f15bbb4b92659c00ff5d22d2701824153e19a7e85aa56ab3f59d81a5f64c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7388556 BLAKE2B 07841374315802fbf43ef499269cfed61b13e82944e134ac67b5abf819b3dd75c07e31b2f3411345cc90b7678fb5c8b3be48e957196a8ac06e550302d7db15c8 SHA512 98a256087685b5e269c4badae14014dd5001a9724aa892fbd648287eaa07bc9baeae4a4ff18a8a32da54e65066893caf9b45d7bc8ccc887f2b44607ee2b010f3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6936162 BLAKE2B ba1ed38214be13c657cc49858dc483283afd55ab7b0123b20aa4d0902954a5187b1a423ffb8cbcec35a24f0345f66836537e0b75b9fb71eed00b7e8e9f341ded SHA512 6bf6abf14bb8dd8f1bd9a56e9148955d1347529e281eeb55c74f34b381f8ad961340a890ffa9430119cccdbafb7b6918d8155b47b929b303fcd6c5db619fe8d9
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz 765453 BLAKE2B ff45679ca7579407da16477c1f87aec3fc2a9437ff46c39c26d8d15254eef0696bee72e2ece345cf2422fb3ff679ec09c02f9bb815a5e9d24cabd75d105daecb SHA512 ceeaae0ed4d01f512467aca3f4a65f3619119ebb5adede411da52085a9bf22ed1936fa0f1535a802c967f8fb10bf2250f4ef0dc8924b50994b0fca7e5530577b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_es.tar.gz 2278313 BLAKE2B 2dd8934e78ba6c3100ac4a748d48a4b977eb9cfb99d244d829195a0b64ae14a876a1363c508f9093e4d3a3d7f666346dc14b9464335721e4f87811821fcbf36a SHA512 5011f2efb1bf33567f7b9f01be30f163be5885ad91af5fcd25839596d5c17b2ac78458f2ed4771cf4d2eebbb88c72d93baaad4f8f0affa5b6377db7ad73b6370
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_et.tar.gz 1681336 BLAKE2B 90c975a07cd941ba7c09480f467fc2e01f68b6f332751c3e95b1aa66758f2b7803f1c4f3747873c4907a2304855750cdaa85db3917a94c6a71af7b60e6649ed9 SHA512 01964ec854aca58339200ca7eecf5acaec252dd4c92e6a29f521d6561a980da53a103622ab09ae648ee24dd085d3053b715af5b7771e0745aee0b2ba04f86f73
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz 774278 BLAKE2B 92e4c3199f651ce09915972904230781e4c7c3b8c5d66551d570bb48c0b935c329d1507ba2bc12df7e5dcb60eaef1bb90f504e3633dc4f09ff846eb8eaf47dd3 SHA512 af325f387e951062c9b5ded8c73e16cc945783f52abe46968c52c8f5cfe6d288c91b99b6b29b9f77ab747e8defc5b0ab5d38da3518929246806a435d540caa4c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz 337185 BLAKE2B 578c3d01e6ca04be8108f487495c8224566b34d7b5f7e32548420eb04607fa8b62b02d47c7a6fb5ae95af192b20e9ed75441633c93902ef19adeb4d9df56f6a8 SHA512 8ae8b0ef500f32829173ceef4aabc1b116c41f93c06dd6cac6c793d010aa33b23458c531608c616ec656914253bd160f11d63160869bb85fdfa59b310b17ec09
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz 745531 BLAKE2B 1c4d41ed69c121e34aa5faf9503949d08ea36cdc704e3aa921a84631f3d25f4b1287d9ae5368a83ba2d8ee566afa05e657cc4439378f49bd6ff6747a3e4da2ae SHA512 a6408f060dcddbac32ec9b3468205e0c9a868d4f0f6875af484780af95ee6f8b728c7572c1382fd1fb14f37720921cf2a0bafb92f9192dfee87c5d5dc1d3bf57
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3076954 BLAKE2B 06f97792a430df6c307653bec02cdb0938e155566c715d614024f9e8edc37cfd3a2353c00e23772f8d55e2f2f822b1705138f7a8a357e7b6539f2f54b0dbc6e8 SHA512 6afaad0e183fa10a8bb46ce3771314f64a1e22197e630ea2e2e4adb7be90b559a98d68cb8af8d42380dc6990edd74ce4df9ba9d375f799a1a5c34bcad4b1f393
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz 167049 BLAKE2B 44d76b1de46cf1cd76647a6eff879795bc55c3f7e2f6c1ef642991ad6a38da5f58786cabce804a8ea5bac261573d20092f2d49a22d02a5daca7f82a4fdeecf49 SHA512 2f1ecbf6c838851fbcc91e300c3fab9fa76a30fc64df0c1e7c3094e9c28d2e6c2ccd2a9a868c41fceae6ac7f247198e3ec4903aa8d309b043e2c8a22b44c7d6e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz 774623 BLAKE2B 1c83a5d703183f7f85f8bca3c15b000e23c30e55450ad8c03988c0f99193f5d6965297bf630bcf618bd3e7524a9d45e9c31931a291985221074f008dc4db0566 SHA512 a23be205b01f6ffc775f15319f879e556baace34dfc59176d34c2479de74e432627c30583bd272ab7591c6e6bb3eaa0aa426ce1d3b3e105d30679ef27bd29349
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz 728962 BLAKE2B fde3cb06a01c922381ea07430f6c854bf35551960b9f8bf1214cd5d1f21d0e0303892baf195308279cddc441f4734589cc4fbf4e70ee85a42c5f07d1b1bb3b38 SHA512 a544692d862458c4ebf96001302000f01fb9b3d86e2a683bf3b90f3ada1f86ee3ca867df7cbc46c606c622fc710e7d1b52cae2e70527a74ae93f14194177e927
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1776484 BLAKE2B 9554a4f0b501437130ba9ab3300c3b4fd5031907709762c5c6982d515f1be7c6130ac74a643c001eb3d6f252a854a885d5ccf99a1c4b76810cda0a008ecce024 SHA512 c501726f431ebe6033407d978b775c74340a687afdbb6d0c88fc423979c938e307ab036e8ea56bcbbd8e05b44d197956d08e2c76b491f6b8bdf10112011e95d0
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2666752 BLAKE2B ac248d0924793209dc6373e7b4254f65f0d35492be214b80cb9c2c6c3456cc247e261d2f173fd463d849397d4cc52f37dec155f5af6f451dd21b3a9f4da6a090 SHA512 99740c17ceccacf36d0ad239584456dfbb37898916f0a7f773a1c5b9ce1b517312b079d3b22f848a04c35daa5e243e818066b27bde7305965132c627e293580f
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1218401 BLAKE2B 25c5b4ad9f3cb12bcaa2c46f9c0943d7cc20a3f67cc58a085d419d9f7636ed138dde0ee9b5292b9071f4e655475463f76114980c6a98ee9c08aa4d16f31ca297 SHA512 ff48b5bfae08154bf763660b38524233a660c100a68a5b61017f1058718bbf6cf8cfc5b65f58f87144c97135a8113e2b2454d61762440a5d075b91f29540795f
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz 513605 BLAKE2B 922e258f79b85151370f161c8d3ebd3881c36bdead0447de0ad8885b05b967c22060350f9d79f688281b96b5fdd2db6a811da35091bcdb06ae4d781197f3d90a SHA512 8537a331ce16dd2bbc818944aaeb06305f56c160d216580fc5ce0a55bbc133ed377d42e176023c0b77fd9c8c51c0f0fbc0e575651b5b6c0ebced7e43c2094882
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_he.tar.gz 1663704 BLAKE2B d5432a1a1b60783148355576afc697d0eb76975506a5fafae4b16bf97260a6f6a41526e7007359bde50c7291cdefef7ba77df9f2c8cf0530dc6d7b0bdea8a4e4 SHA512 b6a9ec10652ebac716f3a5c596821c02404d269171dbc4f82d476580284a922954df1407c6342bcd315c62345488c63e8b2f64d13efad43e7b99c3624fbed4e3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz 563500 BLAKE2B 3329ba6130c55853cda2a045e92a4b6601d50f1d6f6a3536ba2be2ef4f1973d5924d479a227555289805887b0dd7ad53f29daf3b501c9a02ea7bdf39732165a5 SHA512 df4ed6f42a02fadaa5c7bbf2262db82873c715a4766a9acab9a8e68333b7b2a2be5ad3e85f811604751a46e807cc576e9352fa3ed15a965b5728920b5c6a24ae
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz 991732 BLAKE2B eee81409bc354ec77a0126985cb14bed5310a1221e15ad5c5aed45cc1868c8767804964cba9d29738d74a6ca07c941cd68e70b75b05468e9a77ea961fcecec5c SHA512 506bca9ebbeac585867138e87ea28c2fae830118ef6cb8dc270c5d3379009e4d7f0b577045ce60d433dc28122945a9bb64a351c260ce0d85860aea62a3463d4e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 789825 BLAKE2B b1c263ac4b0a718ce1d6f4e95a54c7316bde6262dad963cac071a620e969de074d03b013f1ae530e91c61e7a248ba01052c75f30b540f901847f0064b303b265 SHA512 5b7695c02b048b3bce103bbf3586f9ed3f5ba019f67eb864345ad8bccb1e556bd51ddb3e2751c83d32075c23d9e45ce903a9f710f6e92447f2999c7c1439f30e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3045308 BLAKE2B a00a132ebf2de6366a5688b05f28ac53eb563e4ef0006cdee437254c6defa8a575140eac5b4c69ab61820a783c704acb8affa69a5de94fcf654589b59e6168bc SHA512 1c7010977ff3a7bb0a4878e93337b4dd032a4bd059ff0251b215d5d463ec8b406d58097461bbaf63da8a0961f4dc460b29a06f8ded49037bf93109fc41e3a925
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_id.tar.gz 1632262 BLAKE2B e8076c07f92a998dad4b982c3aed3e8198968ca1652185b14e5f406393437f42bbfe4f1a29e57e0fe174baad8f37b2d91e46d64d0e17a1d9c9aa1bbd3f262f8e SHA512 09ae22fa348220415e2cce7ea2ca1b8fa63b8180a8226a56688b8eb1370c1f930777fa661d1338d5c91534b506e6593f92673d21457221e8eb287deeb2d10e6e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_is.tar.gz 1540122 BLAKE2B 64a342e0e262c6da3f3b308b49fe14f08de9e6f7ab33535003d9a2d3f87affbd7aad787d780a09d6ce38e9d914b4527667188be54431d84554799be99776655e SHA512 12666ad949cf66d4931acaed6b75302f6493a98f93900dff197af7cc165e207a6e79762d1a21f7abbb209735e721dbb10be1d861084bc2b08c187fb7e33ad925
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_it.tar.gz 2107149 BLAKE2B 24f734dfe79ac37ba46f30bd060c469121bb79db3c3832dbf638eaf9f69a6f0371bcd3250633e809f14f83a3acbbc425d08d2e2d61ff032d2996609554943913 SHA512 a53e3a8a3b1524025625b1506f651571ff0c350a3cdae82c68838b2e260b4a79bc03ab7bd87c499309a30749dff44b19fccae140c28fcb5234e8cbee6f3b3675
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz 833570 BLAKE2B 313937001c7aea1c6de4d8542563ad83bd854cb2ab187425627a6ffcd843e31f4d77aa4a016c4fc66172777c89eb7c8f9ece7e2659a1272e47fa6e236ed2b784 SHA512 fa9ce8722aa7e4595a44a4f794a0c97ede032f1d8b46d9355eca3b4a5e41f644ea5cb291dc43a9b5164a3da12fa72e1e65985f824b7b4108a68cd7ecae393930
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz 358310 BLAKE2B a26e341280eb003f588dab7134fc0ee36c595a6993a4d5547ff211275d8506df9a1d5f65a4327e4ae3751e521fa4c48cce696847e107b9d7ee073e6996052992 SHA512 4800863317ff0844f2876a98b7a7078dd38d87b87d55c2b772a74c7fdcf25e4489ba87ee25575bedb63c321667d00e62c0e04abab7e8e9cb4085da6663059fa9
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz 635861 BLAKE2B 60ea94aef834c16023d78177bd2ef347bc3308d906c00b26e71b47479b634ed4fa1d9c051c3042474fadb115202073ccf83e9f042c926a8d8467ea0c91147e7f SHA512 aae0fc7b66e20b78f2e741823f75f9cc02105ce272528f2c5ded5013e99e8a65a867de920bdb8c15ef42b0c75efa7ced3e3c6f9cd751e570841c178d918bcf36
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz 832718 BLAKE2B 3af395ea0aa949771192eae4e9b7b6d10fe5c51533826c4c8552c2bc8a2c95e88dfcff776306f32ba5613a87810c9d7d63f204787baa1822596149df4e251a4e SHA512 da3bd95e59682241c4f6dc98a27bc4124505942eee91025dccc3a476ac8d7732d2000049b8a0f2c18fe0c8f9678713b9fda1ffd83572cb1b81f7dda2008ee5e6
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_km.tar.gz 669701 BLAKE2B 0bfdfef7ac173c0d639a8d2139e84784cc08ac0816c9c8e5b741c7de6c084d28329d19e498288ebe00090a7750fb6b66760215406e9dc41e592fec03acef048b SHA512 8b0c5e48eb52cf95a7d1f1be515895160ca5ae97e02fbfa1d25a2012018f440fde2ca235ba847f3cf68bd35cfe51eab2023ed450c601fdb9253bc64796da6bce
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 335856 BLAKE2B 9628409c9ee28bc7aeeb433cc6fafb9edfc07cd2a4a0f5b19c0e87e095377eca286d0a37d4e1fc6daebe5c4baae7f28f55021cd022a2c54bbb2d08f672a09fba SHA512 665a7f6d2e844a446585a22e24abf2983f04b70e3dadaa7c24b897f67c470506e3aa9d1ceecc0304ea89bdeae296db49d8e669e543b2eb19b60d7059ac72814a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz 574902 BLAKE2B 2bc91502ad14eeb0cb2ef6044f1ceb312337ffe5bb0d29f960720e47f3721cc20ae0aa88f4295f9f25dd12efa9bf3a5b1f4917fa007fcccba8c269fa304476c8 SHA512 7b7f9b7dcf9281707ba55e12bf8bfe2fd31d1edc3870b5d33c21d2e1a62d76184e6ee764d44182e1c2ead83b2a88a88efbab32621dfa45c7ce3c7c4a28ad81fd
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz 795900 BLAKE2B e59e2a754e74f34d51280629fbcc1488f05e89ffe470137b6230c5ce18d3e180e898870803e5ee739dc6292d2118db40d2c2a1d68513fd7e8c42608b0f746ceb SHA512 70651cc676d5b7faf6298d910b9bbd5529d604273b1fc090cf416541b50dac2725487657c3c187b7992263fa69520be8af81d58e217b43a44d6001d8c0ea6073
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz 409901 BLAKE2B 82a54957714e275f7313cfb107176bbf1a5d117e41f0d16f9e1eb2b07899f065d1b6a5f066a2362868fafbcdc9d73bd040bf0d35ffdd20b674b78c942b403ac0 SHA512 eb68a848ab413cb418708244c35b9aba626092a9c7f350600533546a53595e396d47899ddc701f2eaadcd608d37620368daf8b6e23865afcbf4c12942d8cbcd0
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz 330523 BLAKE2B 95f75d394101ecb429b7cd32d81731e01f28e467eae1ae4052c7d3d289707719adff3d4ca959697639176402119223f969a192c2d6b8628b40585ef9e39d779a SHA512 ed7ce20faf322795b2c9dbba2ee51e5fa55ffe19ec1fd32fdecbb2d213e4716b1393f1f0dfe55e21d8ae72e65b6731d840a62b01e6cfbbe678b0c01fa0801b95
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz 147707 BLAKE2B a3f75e66c9a0f6b30907bcaf69d22e801b73b9016505a12d0c46dcc72bb462b0df4c61a928a5a56f0d965636374d0ff408645194016da22429a933273aa02ee4 SHA512 5ff5c556ef93ecd896d0e81c34dbbe9b0df907e509458fcf1511cf72487b7107cb493240fb8f7cdd5f69612a5c270228d492a1750ca97e8f3a9742ff96409a25
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz 433455 BLAKE2B 5eff50378334a7105b211f3d0cb43bc94a1cea85f00dadbf5b96f1b83c5c8ca41d58137ddbf0e16602b35a7470e32ea7d6cbc75cffb98bfc5aa199c81e5ca1ec SHA512 f6c1fa622512493ba8eaa37927b09f3084ce4153f4ec84937006e04add8f630f05bd2a7b78a38f5a676448f0747f17a9c6e6aeacdebf159ddd8e5ba2ec75a170
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1068305 BLAKE2B d46fdd720d1d2b4af6d7183e47deb4d89fe45b251c6f3515bb531861e9a658dc5c350e90fe6f70553bea9d2f8f021049f7d7910111df2ebf6fc09a3c4d89f6b5 SHA512 d85d92d4de55200e9e08e5b2af3220a379cf547c1d7a78b370aed7276844a01b6c89e134ed1bb7581f36e1349117dbf5722c9f639a360144dab6d2273349bdb4
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1164819 BLAKE2B 3753711ed4c9862dbf6e42eb8d77ae8b40c9661858c10b0000f6f3ac8db00316fd22fabf8aca5a7ea003ab644a6cb7757aa5de36d7a8c1086f2a49ff661fac0f SHA512 57f549de130aa6e5ce498bfb05643340d3fab543bc6749a2b08b7cc722974d63c18d1c4822348d7bc2f4fd36b4c19a9a7380d00deefbdf4129a93108972ae485
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz 331660 BLAKE2B fe765fbdb8050901a9915dfbdb432f001c774344e0e2ab9d8d79d987c9c6969d1eb906a249423392055f1b1b61c4a312e9e37b08598b4a1878bfe46bdf761a55 SHA512 2bf531b43701b28738f84969772f6aa299dd16db4517593899069b95452da1a435011cf0216e4a62de00a68386b82537cfef91abb5d8ff2169434dfd265f63ed
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz 382043 BLAKE2B 6cccaa586e15cf2280a0b5375c45b17f07fbe0179c494e27276b5d9185f3170a5f721aec333807f80d9b45e560ea7ff5ce6033e7449ae53c2d58cd13bff47287 SHA512 a1e687ccae05c16b550a35f39abdad4005c533af4bfc003d0c9410387f0b25bbf46c6811ec6989459bb7b59ee2d234539a1e102094e2a81642b93ef5bde9d28c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz 533895 BLAKE2B 5633e37c18559c74cf93e8071860d7f6e381b6ddb1a93c3d815ef73fdcc3cc79e7e38340919e3cf171809ca94eb2f8ce2e58f8aa2e53cb4c051998bc6bea46a9 SHA512 fa46ad6a68e3830988817fdaea24b12520a78819ca91ff9ca0a62cc5040fcaa55c806d870c78fa7fe6f0f7682b1c5d8cc7f4ea48adefdd59b83a0b421c4fbdac
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz 692482 BLAKE2B 446181269338e0af70ddbab967f2679dde9d6f56afb68eb17bf3ed2b8f2a0cfdd5b80de42f145730ca8f354228baaa0dac1eb2573ab22d707618ad2eacbe8a58 SHA512 a28f61fd29b9d55bc25408056c12c81008e6b63bf4b075f03226654dabef0cd28eaa4a47995a96e59d3980f65a31d3060dc4218c76dc48b66c9c18fe89827513
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz 400117 BLAKE2B 5163f02d23237193dd0fa0359db14db0d05d7dc66377bee5490e474e186259bb263a3e7a8f305c46878af4e2a8e9b80a7a0bf86a7c7ab29bac305c9be0f84fc5 SHA512 83cb5a9bcdf2bb48619ba2f4d1f6b72474db80a1f70815bb59340f779b3615b6527fe01d5bc294d2fb56f16d49731e2ca449b4b9e63c68cff85cbe0961add5db
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz 569298 BLAKE2B e40e8195d01b7bd8d7e0831b0783b75d13eb28a23232a9141a9ed7c6ef293f76cbe8f843dc19180400c44f8b5ca6bc900428001f3df3b05d423ce24891f71a75 SHA512 904386576094abe1415765c435a47fcfc4a6d7ba0f764b3593551d07a601db948d85dac563a488c8a04d7386750b6a85f81ff3e082644a42451d107fa1978ea7
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_my.tar.gz 459607 BLAKE2B 27b6e972071948780bb9639c668f3393519bfc751778748884231eaffacc298853be80a523e06a6ff0365f88dcf855828dbbafb5cf8bd01e9af45e25a3fbf33d SHA512 a4380dcd2a4655f8aac14fd9991dd0ae9b03d6c4b95061c60e81253aac63a467e26e71f3d2e5c4dfda09fdddf9710ddc5f23d7335e64f9afed72b6c47b627ffb
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4109505 BLAKE2B 661cc85b6ee8516d3c1f70fdbaae39da074ed11f1a05a8c3487f44bcdaef355ead9308fd2afa14fd19e14f486775c0a9ce8925d2a787df0801a617ffe8210976 SHA512 b44d2e6977e9247b23116482cde1bc68de16b35f98a0d35b8f169114a8a4f916a23e9588419b037f15ed36c4ff8dc3a46d560b438cf96cfe7db9046304545a9a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz 840824 BLAKE2B 1d4e50aa959f0853121033c4d7f94229ba9caca3030c616496dc5f79a0c81595a13808eb39f5813f1b211bc360e1786413aa1a84eb58f0ff8947934038968ad5 SHA512 8483312c587124fddd0019253a8eb2e69b0d1fd0641cd4e1cab4ac498b883420182fad65b871fefeeb9c54329ecf23881725d1aff0f3f5cb6ff7a59c0e6dfd88
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1565029 BLAKE2B e1f8bde37809d076aeb0bc6df2f9759786b541b7cf12686ac160f56d63e0751cf37d08b2286382bfeb1c4b3bba6b7e4de5186ca331255c7d10f02e25b9daf83e SHA512 6cbfed2b3bf2fc3ff41d91e81c9a5da575381e92c135305cd7e3ccb4c233971dece9d270f72dfe325d2c43ace8ac163cdc05c740c24fa714106f1660d784f463
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4110361 BLAKE2B f6d69853902ace5734c4fa85a3f9a84f44d64a34dd82a05983c5c2fcff7d7e38455dcad3ddbaa7530d46fcdb0347d0f9e29d50a6cfea4d9a76b83b5633252529 SHA512 c237a7f502a460a4e7b72fc9db7e8f3a8e25680c4a62df667676f2ff0b391c925c781eb784c390f16ff26b2797db03b9f0b1bbf64d500dc01c424d4552edc27d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz 279194 BLAKE2B ce25fc1f566230f3cba609c8b1133cbb1f1219535419e97eaa39adccf56eb0582d2004649f461d72855af33885393c0b5c2c33f92ddfa13209245bc39b89b717 SHA512 7c754f98aacb233ca4f8c22a62d63863008489aec39b068a8799c40dbdaf8219a8857f100dfe3bf0fa7b998516d36267d57ca40e54da3fc6259b50ad1e425174
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz 321790 BLAKE2B 31ad92fc076fc909f1e0d134b1eacab42cdd4af7aec797e595e2ae4d20ab01e2a59c1e08f1906f2ceb5dc1b4eeed1f6e9f42ce403aeb1dd4f8068294cb0a7223 SHA512 ffc0dd26a3f1210996f87790edc35bf9cad405a76f954ce01b45b4647abc0d80f29ce3ea1337b9411be4826aa02206f107cd6c5f740832adf052a25d8abd3796
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz 875028 BLAKE2B dd73fe47e506a2865ac424908c8584bf52e234410dcad427a599cc5dbd181f45b85916a9a18e485cee71eb6fc6227434623bd94a7a0448afc7f97bdb015bbeff SHA512 7397c42a6a0bee779fa61c743f5e83d317dfaafdb5fe2e3772a37ee97195e38cc740ee2881ebb24f62a1f6dd7ec62de8364bae37f6048486ae5b7b508d246e4d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_om.tar.gz 370281 BLAKE2B d919e3359b86f5e49189e8e0f7d7ce7f241c9b9fef48fd64620bf9d70a99305503f62176c5bba88166a24d8185787aaa21aa160c50f944087ba81e25f4901c0b SHA512 2f642ca683fcd4a38c8b410730524e1fd22bb5b0c4d1f3a18b270b5d8174ff3110f7c3f738d0e84efb6d143baebbd1449c583068597f9f7b2cbfb0822d2ea175
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_or.tar.gz 590668 BLAKE2B 931d280f6b77f024d3ad0cbe543d136873f287178f227cec51dea891fb818ab54529286a2a844228be72b86ee20f002dc5c16f8591af2889b20038ff8386cb9e SHA512 fba6c8484f3930907e09b3fa90970f7b668a2703115fce4c81c7aa87eacfee62b9083e66484b071e8ed9bcaeff950c4b463c4ab4c90026d6b013c7fba4788e8e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 470143 BLAKE2B 993dc6de366c4a14deae90a1352a3022452f7bbe92dff9666c71558bd746fa5f2af6b00db92afec6e5b515743ecda154181f52c065e53e6c28f3fb03e34a2e48 SHA512 d3ea707adff02fd687facee15c24b5f146a93b94e75af10460728274b6e523da39eaded81482010c00ba02ea0b0d909aba11c8171cfca13741aa0cafe1e6bc58
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3135792 BLAKE2B 08c3e83ed19ac24a8ca38b0f0930ccbb463866583b47ecdb25ac2bd8abc32416b442b56e7d89997b8a115964acdf6ead5af4e6e32b7587199ecdfcb7a90bdebb SHA512 222754983131f6dd6a5aa3081514e10aff3c0c92ab66b937e051dfc92b179cdfa54874a91ca5428ffbfa56d25bfd55b3d5771ef0ee7b8641ca6544c71da1539b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 2854144 BLAKE2B becb0d7bb96fea28a060cd5b339cffac1b2c223ede78b61acdac74247f2e2df843e756b5ed6b5c3b10b425093209ee2d77492c63fa77097665f15d6269d344fc SHA512 19cfdf2f316f63ee7bcf39ea17dae9580bb58489d6247f0cc946c4980e9b2ef8bc2ada3768a45cc4387372d33403cc57430a8fa7ed83f028a2979868840e4ed8
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2411437 BLAKE2B a18788de16976d2dbf04477fd26ae7dc1911ed9530a4c320b52db4f5e3aeab28b87f51d20403efd951385e7cde51de3e8ea4d75fd8906de25d915023580aaa54 SHA512 e1df77633eeb8427530fca09d3d87bd92d80bcbd9bac6d357d706ebf7c73203988d875b1afc712cfcd5d7bc32f618ee53092dff09e4b28af33757e0a71c689f7
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2514051 BLAKE2B 2f812ce5f829e9ece0760b7d0be64d941a1be66a583509d4d3e5a94b1bcf7b3840e05b12296527eb0a8d3e9e39b3a6ade53cf92c3ddee765ec5c2eb9e1c15410 SHA512 0c81dc57adb6aa8ad90dbbd201f5024b7e058f94639bd1e8ec6e0316ac2a3d0a38e05f26e0151e98dffae7fa7b2c3d8f1e4d6986ae5eadad1b621c1ea9d7d197
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2131299 BLAKE2B ad17047cc0ceadeb8fb6038bf518f3946ee904b176f1c097038a04a7bd41e3aa3c7f27088a24fc50e595c99b28e192c700c675207bb3ae900bd8a04cea76127b SHA512 5fe22486aad4553cea2359aac62ac8919b2a764b801c6585a6d3ada3d1da7698b8a3c8baeed0f7961da3ac4ad36eac8270602f42dc5a672e8a64ac6e0d57368c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz 346473 BLAKE2B 81f9cb5ee67719902d53046169daeff6232f586631fba580a58c581a9ecad04f70c55856fa2e1a1d04a97fdea5d0a8e0ea4ec98518124fce997f0928d0240c7e SHA512 bc66674636a3efab93cc2c89300784d0ab26232c9538a3996a9266b7478ac62c739a8ec9897629d2a49f801ac4a4b6c6fcfc4570b8fbb491b3e4acb3f7be4251
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 446170 BLAKE2B 7e43ed98ea3485dfab6f2599c508d7c6ee86922181d9a85557322adc8caa70e2ace0e98948b5c4f9846a233a2d9458192bfc1444d79c87d9787b756ed9f4d222 SHA512 d564d1412fb1b3fe3716eb120202c915ffe29abbeb4b233c3e51a1d8fc4fec5e292f103902f960fd23d08b5c982361828966fdfdd50916a63ffc3eab72d77443
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz 513776 BLAKE2B 3691f9ea453c6ad40b13a646e59990201632f497a96a83a982cf50572d04f549b3496afd1e121bada06c12dd3a2ab37a107c93a7806becd223c36253b3e90c84 SHA512 497fe74f9027232b63e02c47e65ef1d72406aa5698bade50f015e18776fbd32b9ec0c10e311ffe0955c6ea38be7d433cfae1f74cf073edcdc742a60d4b920a07
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz 432776 BLAKE2B fc1e4165d6e5d994588f9e8f71b7d6bbedca3663f2ccb1d8781977386e75e81f6aa8b2f6c2550bebe9bbf7ae085004da17362d285dc9ffb368174ebda13de0a0 SHA512 651402022c554ac58f27c1eb4c15ccd1d54bd2fa6c3616d6a4a5fdee77d74f00bafbe0c31deb47d6c6ed9648e67f6d6f58ed5e6a1df54640463077a595ed0940
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_si.tar.gz 733809 BLAKE2B 0f2be112eb184fb55a53acddfbd0c4c680e28df2330931f467c340a96a3cc460eafb6561697f9a2b7ec1e9b92a94b6eaa07fe66f59f787f49e22b4dd58c01b23 SHA512 130d977511e965da937965813d271fc91882b18227199a34484a883cf6c35cc9bb43ce090c9aa4e46c31bd38acd2e7f9a10a9a34464dd3276641caf87c505a3a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz 445425 BLAKE2B 6815abdc72cb2601394319ddbdf0eacfe2e2001bf59df4a7399fea9b92f34ec159e1f40f926ce04fa4b8db7ab31182f97af51f7900e50944543362e8868fe3da SHA512 006b37ae3af67f1d919569fd5ff724eaef6ee36f073335e38c78c4733e5bce69729ec69cae5eda8a894270797fbe978c4e8a33bc49714b007d18686183f9fae1
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2115872 BLAKE2B 58f92faa78aa2eaa31ae2e40e0b972c660b3896b8c8b8ad9ff4b090eae9c673ff00d02fd2a7728d9e0b541d6724b226786da2dffb0be2ab6350af21d83342ad7 SHA512 fd3f23f6d2354809e1f96ec2e57fd93b3b85ff0bedc8f4aec7aa28a63bc38d28a8b222b5230d70894b9dabeb12a6eba1bf735c702f0ec36b424a3e083e966539
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2503794 BLAKE2B ca899f184ef3d02ce8d65834d61a9ee2f6b570c1fbe6384d1245daf7b127c2c0bfc8878cf90d33231893fa4bdb045bb0081a234f3541a821fd803434b4f98abd SHA512 8c45792a07e8a841ef183cc66034685bb42da2c23ba8283e010b24056265470b5dc03623dac0655484ca7e9d05a5da4638b1ca7550a221dedfa8b2d4abc974fa
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1168461 BLAKE2B d3e3f1c98ce5d46feeed2ae3a4395ed4213fce976c4d9d0fcd313ff9f1c45d28ddc943eb2192dd900bf06a9053f87fbac5f89d7470d91bd8fe696968ffac0df6 SHA512 70bfb4c724c378cb8b2f71ec97b4ee0ed201f8692caf96c2a019936cd65fd5861c3bef44a488caff68b0e6864e2e01a50cd049a0f41272440033666a3ae8151c
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2406497 BLAKE2B b77501f2a8fa2aa1cd57153df5fb37461f8e76fa40dce026a992821c3c31967467dcfef5f696b6788b0949771d38a31f96e9361ffd93a75956798bc066ba3df5 SHA512 cb5b83e6498256e6a55681cae7a4a2b6094a10e127a8197343f8eed413e18bfab827b1a5d0615f1c478a5cfdd0ea7ae1d338f04edb195655fbed459f972bd02d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2467872 BLAKE2B 9f89ca259b976ea97f656b089f102957b6ec1d05797039842884d640a2bb460c46626612ef6b4fcfc084ad9826dda9d60661aff5b0690c6d4848e79ced55a39e SHA512 e74ee9369443476cec35d245ba1992e5d4e428bdcd6df00f0e42bd8e416dd7405b3d8719d04a95e5a2ee95efa123808001e37ae88f563bf1edd62908519c86a8
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz 286511 BLAKE2B d5db19780e599d1679c0c37ecb29e4c0a84a071b438f9769e8a6fd2127ea84cf784cdb7c8dda0295e5f9623826d8807893773ab6c138d294b89fc6c9de11742c SHA512 770138b2f2440ca2eddd37aeca3ab0f6fed77d243095f90f50d226f73903d6d3125c06cd1517cfe026ebd8a7261bfb60de0055a3f6a772f72814370cd7f3f806
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_st.tar.gz 281496 BLAKE2B 94d0be41382125d9280889c2d0f75d6cf0078b23700275d99dadddd1405bc075c8630f4825da5493219d86982cc181eb28315be673624c81d178fd8bfe53efd2 SHA512 2dec16f7d287cda8c87c21df1a20f60e0e6996dc473f4c6cc980beef52523e982e153cf328548a80b856b2ae42c7605c873c6653d3cbf9ecf909a9e0abbbe3bf
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2650578 BLAKE2B 9b9818910893210593f5c8748b28f9c7363fd64eb960b6058a51f20996be77700c4b49ad920731492bfdddd9442c3bb88782ed9248b504cefd72fcff65c8cecf SHA512 d757a59620dffef0843efa256976447199ed2df75694db461d121a9a969c53d8c1e3d29548d9b17733c7c46a23a03ea105f8e79c833c2b21c22d610e9bd5030a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 318846 BLAKE2B 192f2e5b812038b8f7c0dc99fe6f2c47fc65f999b52bcbca5b0cbc81f4980898cac19bb25e734c7a86f04ecd6b6ec732ec077d877e5826d144f5fe3eae53209e SHA512 08fcea126b0ac1e742cfee110f1647c0280c1f70cf375669d3f4e9e842b36a3b0e380f06cd34c8dbbfe9dd454904b62a2c2683f73a898fe5a85d14a37fa1b37d
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz 738494 BLAKE2B c7770ec90116f51a92fafc494b90c56f55fa95db9424d14ca35ae9ddbb78cc5e30ef59e30022e91d97d10153b4eeb6a230991c8969898bc2a84a6f01d1d92aae SHA512 e4b24c1753ba8038bc6c5d0907a357f72582fa40b60db5c63dab9c753a3206a9ff09347c3267ca2d6af7eb720a6ebef9d8af3d782b3843d343dbca0be34cd296
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz 670182 BLAKE2B 9dc083aa461b05f9bbcf30a7ad53bdd4381fbe04fb4fac78567799b1d0dacc7955473dac0e173a946832498f69ca79aa2fb74e5482425637c441cee3a1e830e9 SHA512 f53e5b503019f16c7261523fd5b0c19ae7e4c1f218cd835dbf7700cec492bda33a013d568b156911267d231043de9c46de0f195d99a3d2a542e593b92fa6c276
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_te.tar.gz 1077947 BLAKE2B 703187039cf0a2df704135a5b43db8426e235d9f4578b450fe91dc2ec28d6d77269675f61b4532c5daabb64613f2edbbcb0755256dc210919891f23b4da88403 SHA512 528b14a1ebd065e3232678eb79e335226433d203afce8b5945f224b15f7f3f9c9220f9d7d897807db625b2d3bd7a4b1838f19a430850391010b092ddabcdc68b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz 358400 BLAKE2B 30fe13b8581cd944e37387a54ce87d191514589e179a7a670bf72346856e0a037bbe4954a20446e123125c8156f2e0ff9edf116d4694fdc97a7c9fa4c0aa8ca1 SHA512 ad3b3f6972a9d2270e63fea989b006dd2577d294946663db2040dfb9de5086d740c9f00bb5d78b84375ad734f5729a69d2b57f08506fb0ce33e17ad408f3ffc9
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_th.tar.gz 741882 BLAKE2B 0056cebc4ed0e271e77c709158acdc64d6e156f3f62bcedf13f5e89c0a1a3e9560575758daa66ed93119910f4580dbd9204d054071d4bda769956a927f95e901 SHA512 7026196fb2f65741530dbcafe18996d33d7137dc3a828c539068e222352bacf0f497dcd986c654af9067f083e6416065550e3234318ae3b728a79702f460b54b
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz 261612 BLAKE2B c73cecfac947bc8f0a2a811cf963521be3e6683d956e14caaae69843a18b94a7a333cd0762401fc0ac0017836227fdd3bca2806446c34dc4f76f5482dc9a863c SHA512 e23e902b8704c1cb35010f77c5275e2947742df3218a443f4621721b52182fdda1c2577c547b2dee893b22ace966ffa1bf2831226be75bad45740f53c677bfb2
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3089182 BLAKE2B 6316fbf8115e18517fe7f47aafc44092040260a9b3ade2830a4c02e1ae57a93e9ace8d212125c6aaf136f4b535b3e367cc07f5d0f7a26d784358841f97dc60cc SHA512 99e1bd3447706441e85da59df32b50c432d1be3e1539203b6156ef31fd7f9627b7285ee1d2da28389daa2523e4fbfa76e4b15ee8d833ecb8c333254733df3da0
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz 278634 BLAKE2B cb69af16a6aee26d2980693789224b0a1947d5253ad73c4f6e908e97e9e75b0b253c41ca981c88147d15cd3d86aa2e50340ff64d6609d032181e75240e0640e0 SHA512 4cc3dae6dc148b91acb1f072bafc3a13b02c8b1ebbe4ff3e0d421e2ec04eb10e6beb57e5f4340d7880065a52637960dc4a773c63867340a093d5ab3ed43cadfd
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz 187163 BLAKE2B 49fc9c7b078241a3fedf6c5fa058021d8cd54f6f3470007dfe8aaa11d9b2b52d0e96212e774d937a0f3cd2bd42d2eca16cdbfc35ec371aa832b7960a302533be SHA512 6151d03ddfb92a44b6778219bf925127e908995f4305a7a8ff425402d566220ed68e30470818f82978f0fb2ad728496b027617fbb19472ea5eef3bc1f0db676a
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz 538760 BLAKE2B 9d481e90f86b25dc98da8cf5528d71af4317a2150f9d3417811b166c94c50c6f11aee0b20d9b24e784e2e62a197a3d2a6485f23530cd15fe6ce8b851f2d68f5d SHA512 b761468a06303818913c7a016db162c44bf46c1b90b3d45cb9484eef44c80f23aa80f76c5227eaa9a51f90031a5a81f8244c41a4f81af841a2345c62f5ca2f38
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz 1665891 BLAKE2B adaf33aaf732937c0b12bb7b5e3dff537a7afed2c17d074ab51472f99ed88c86fd8452940adf0e6f6a11640aab58348554868d51ed35d78abcd092bcbe42ffa7 SHA512 1a1dfe5327e4516ff4c71f4124f32f5243a2bef791f030696d4311e5fdfc86d86b77ea3bee1e97c55ee8a501189d5ea32011824e18df5d101e9857307a0a5ec0
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz 314671 BLAKE2B 99d42ea478d193f0cccfad87f5f751dc428cfbfd323c335c4d684635bbebb95effd8166a2f98e8fd384c8440c10e07e6a74954dc058f6c2e932112603ad7e46f SHA512 23a0c29029a19b1e4a85bb6947363bd5b44891731e7849aff45d5337b43bea64730068ab8aa9c943b90baca70befc50479c5c06d5a46b3308a8c967aff8d7ccb
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz 283077 BLAKE2B bebaa8f894712508e5f01ff8f8f2bf4a703f49087337f217037063c2741536c5175e030a8cee0c58757bc7b07e66562f9b315cfdd3bafb6f3a06289248026b63 SHA512 6c03c6b1a37ef4a4e18fb39a22bbaa7575eb1c27bb1a9cd834d71c01278719cdd7241f238190aa00ed05bc72c826362b5aa75b378b411e11aa42e02e50543a57
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz 756816 BLAKE2B 884ab43b1663f505b7bd881a9a3a0605fab048de8c04288bd9821db2c0e60a93da2ae38ea53bd6d3d93ebf56ce37dc534b51f64219a7ff0b3dd8f8286d25c41a SHA512 c03c94682f0c588e81e759e563549d6c6c86259be4b22daa282d12fe13c327e2c94ad3e289f4964aeb4d65b5e99a5e43fa48249390f03cbdf3687bc100435f97
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz 454112 BLAKE2B 8514d8162131ecb99fd67e69bc1a358d088c64c668aa1a251ff46ba860f5ab0ede264fabb8d664d475acc81ade03492f44172092fc51f6077831e8a529e17e97 SHA512 6782acd7223bde5f025e80e9e56581b802a58c58c4d7ba05938af628602f3755ba14a90ba1e824ea286fed18da2706513cad5fa67520469d546ecbe0726bfddd
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 290130 BLAKE2B ddec83a410cb2ed567db3f6e56360636d50ecc40830ee7a162a47b0b7b5f0c190cc4d11d35e818a0136b717b160b8346fad86e2faf6f880864a66321748a5abc SHA512 515865bc31274d26d2dcc8ddace8a4566ca9650aa6932edbc2e9159d020d7181a7b5546667d43643fb16e2933cb5d52da670249b0f251133e3397398861946f3
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 846870 BLAKE2B 666eac04a6711f7c29b7849ca14e1535e439f72434c0d25efa5c45a818973f97050204fac5903969e0f9c49b32b40b9dd11b74aa650b27483b45802aefa43eb7 SHA512 585c2f346e6ae556b6764e34ccf7bfc27dc6a3d48ec11bed8c2bc78848b20412ff55f44122f113d04fab49b8b41570b47ef2c3a0b53af05efdcdccd93c76e350
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 843033 BLAKE2B 3b2a5dd116d716371d5b38a641c4aa80c9037ae91aefce88fb93f70e0dddab5a85c70bf7224aabc998d16958ff01b5bd1fc93c7797416493742af0363671f1f7 SHA512 bdc7d9a48314b8baf0916808932018fbb47f774282bb898b2cf1ddf801610a9f3671172cd647028052e8f37245ba70a83fba3583d25e24f2d751e8ca7ef2186e
-DIST LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 320706 BLAKE2B 2efbc8dc8ada30c05a228c55e51b36ffe1ee0b4fc3d6735ce82b19c3609711b4e299b43be535994b68a4ef9bed21215bd153577c5b23e996f175069d1cc34615 SHA512 b9ef270f76a04cc7109a93772011cc8c3c3823d65a552c708d2e12380669757a5f4feb6e4c3a19e745abd4b3ae800fb980b0c88cd3ab3a704db4ad840c387b60
 DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_helppack_am.tar.gz 4040915 BLAKE2B 8f98fe8d6e4cbf8c6f3783d28a74ab871041429dd66aecc320bf1f2ed169f8b44aff931d0ba7be200efd95a70b4a3b114709d2be50709f2bbd59cf9f506eab29 SHA512 8f5acb78a5fc47d72a6e881d26c980d88f65a127349d46890ee0ddccf1e9194b1ce161cff2b787ae2e378c9b402e7db4687e5b238f928a749e92d237bac5d4d5
 DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3519351 BLAKE2B a71cf6614ddb09c8cefcb70de70141bf5f00d33d8eed9cbbdf27afecadc3666df9e2cfd45607e8e0b14707e365d41f41b41e721d995b2ef9c2ed76e8674d7349 SHA512 01fbb903c6520e82794e1d02d10d257e20a052748b1fadc9b3913f36844f3b66ef4484f7c52a539a753ce0302f86686e863ded2047d44acbe4c24cd3c0166a1c
 DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3761959 BLAKE2B ec475dcd165d369b0f52e5d1b8a9aac768d6568e43b7f1d432497a0dd3a7e9858bc56f20873dfa0fdd80bcc6a75e4d22b84c7b76fb5f09e65e8a443cf73b039a SHA512 0b89d0a3888b4d61dd1f6975013fa40fe2bcfe4bca1e28da1218e46d9c97bf087dd09136a331549954f67e411694e9ba06cfe439f3f32c0e3627b02834d67424
@@ -534,6 +351,5 @@ DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 846819 BLAKE2B d
 DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 844151 BLAKE2B 96d5cc52bdaf815524194d64000e35d13eed2dd632ac334c0ef9164faaf6776e4d59f08811ea59eac45fe200b31fe7ad450b499d8a051e2b515fbffb65baed66 SHA512 9c596aa20561b2cbc7c7cd0dc5d8a1174010f9f3d4b4782d90e07e772c71cc6c82ee6040f04b3cba90e6559e6a4168aea1caa532d9f5384b86e6a4a3cb9519ce
 DIST LibreOffice_7.0.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 320148 BLAKE2B 3a260627799bc43b175caf7ef7b025191d652fbde61a7daa5741aad61eed42da1ccbd237f2e864c928f078d712afa8d72854480d355e3f1d48f89649d8748db0 SHA512 ce1f8138df8d1c8c6790199acd74018e41c3bffb7da913e2992db67d87a717556b2956765dffb32f9cb3342b8d2db611e6d951c2f0038ff346f99479d4067da0
 EBUILD libreoffice-l10n-6.4.7.2.ebuild 3666 BLAKE2B a92cc04049b2c291c0d9d9ab1b2de57aa3d183ec7b6c17a49b5852367380620f730f02b30a0472d5e6514e73efd181cfd4e26cc8f6dd18b9e25bb277ce008b37 SHA512 c9cb96aeb7fc40138b78beb3865f441df3ed644d594ee25790412eb952c5d3ee0ac3507a3fa7f5f5a2c7ae4134aa5a5a70af94d71c42c4309e6a015a8bf2fc4c
-EBUILD libreoffice-l10n-7.0.4.2.ebuild 3683 BLAKE2B f19266cbea8429d5524baed8e48f4107c0668ca1b83d9c88404ca0ee6f6da4344432a450d7870e5b164d0100f96274bbeb8e1d6b0d0c95e9196d20a7ba7e322f SHA512 298a7a186b1e05634ac983ee2a78291ad88d232791497312317e21871c36f695452ec9ae6119169a02e7755676414b6ae6544eb1165591faec9d4ecb1915a42a
 EBUILD libreoffice-l10n-7.0.5.2.ebuild 3683 BLAKE2B f19266cbea8429d5524baed8e48f4107c0668ca1b83d9c88404ca0ee6f6da4344432a450d7870e5b164d0100f96274bbeb8e1d6b0d0c95e9196d20a7ba7e322f SHA512 298a7a186b1e05634ac983ee2a78291ad88d232791497312317e21871c36f695452ec9ae6119169a02e7755676414b6ae6544eb1165591faec9d4ecb1915a42a
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.0.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.0.4.2.ebuild
deleted file mode 100644
index e72428ad789e..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.0.4.2.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
-
-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 ~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 229f452ea184..bba6eacf9be5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,7 +6,6 @@ AUX libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch 3460 BLAKE2B
 AUX libreoffice-6.4.7.2-icu-68-1.patch 1930 BLAKE2B 20a59bb0141d9e5831963f79ab59aeaf7a137b619b1ad55a3a6825f944f25a241c951164f00ca2c4f90de5713b8b0392768d9fc429d67cc5ac1343972842271f SHA512 501fc1b980727bdbf4e0bfa319a3df16aa065829bcbd9f8c7689de4bbae5ae73535a5547c8d69916966e3b83fdf817159db52f5b617a127eccdb761ed47a4177
 AUX libreoffice-6.4.7.2-icu-68-2.patch 961 BLAKE2B 610ba98ae4c57f79bb6b950081e4b565937d5f9fa38eeed4a086f7790adf65064e3b114aedcfdfa6dd328acd41f43520e4ee033e160f481567452782f92e552c SHA512 5e70548d52d693602f7fe40c2d9486158e5fa3c0d43c8e1ae87a014781966b39219a82c456e71e561d6c2b2c7da258dcb77ba70712b3677801ac28b2a5a1cc82
 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
-AUX libreoffice-7.0.4.2-gcc11.patch 824 BLAKE2B 9137f9eaf1695e92e7f326af99534c5a5e18b8416aee2dae92f6e883e8e2a203f0b978de247d433df6d1631004b2771ec4417fd05e2212d76bee34df8c6ba30f SHA512 ebf7fb6451c2b3b1e1d61e60bbfabd6cd4b9a96d559f8e02aaf00fade15071a1b568975b2a3800f58574e4b91ee224f8c8f79b0588105c9e286b5780a602f5e3
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
@@ -27,16 +26,14 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352 SHA512 cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
 DIST libreoffice-7.0.5.2.tar.xz 236703992 BLAKE2B 71ae5cfbb18e012d8214d09ac1f151b8b1e6045b8453dae5dd888c8e8fe20a0675e4c58c81a179e7fd78a67f5992c124d7c1d3c9cee1a58bc2c444cbded410c4 SHA512 aff01224881d4971a44e754e0a6a15466dc2bb1e10fa4f3249453356389b3dfd6efd2d588b80359f1d06075ac7e4f7b74a711904d125e17206346808f2ddb4b8
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
 DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
+DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
 EBUILD libreoffice-6.4.7.2.ebuild 17756 BLAKE2B ecd2929b57fb0dd0b06017f2940018e324c83ef7dd752528a87e69358e644ec7a26f32b24a3174f45d29e14c0060e099d31e7ed6f1d0a0afbd98eaf157257729 SHA512 9319d0a04425e38feedecaf9542d6d0636b950ed8c5733f8eedf47dd16b89b69538fd96ec9fd9458a5ea54b775387ac8fd0dbe80cc842090d8c35b13ba06aa21
-EBUILD libreoffice-7.0.4.2.ebuild 19484 BLAKE2B 9baffd374fa17ec21ebfa518ff497e58d9f7e1465b97d2366a9b9f875672837d89de3c62b4b0c53e63149e18db1a1e0d89da844befb1dbefe0ce7f460accb9fe SHA512 fe3e179a6d15ea4355aadd58e2ffa01c2488acb683234116ea13e6d6030a3e480415ae54902f0a55e1a36d6746513cbf2b029ea4a2db84f35d726c5c43596ff2
 EBUILD libreoffice-7.0.5.2.ebuild 19428 BLAKE2B 210c1946441eddeb3db30aab9b2f8ce51c46df318c8d66a8bf37de88b5904c4e449830667273d9d0d7ce9a8423d5dda3b2e5c7f6eccf3a5bcb37713fe7eb71f7 SHA512 d3d38c02defb7d5ee6131dc05527bfc0484370f94674deed45e0853368d065c043d3dda3bf5010a63ff762d846069772a4491fac3ccd9df61be5255d08d11b5a
-EBUILD libreoffice-7.0.9999.ebuild 19428 BLAKE2B 210c1946441eddeb3db30aab9b2f8ce51c46df318c8d66a8bf37de88b5904c4e449830667273d9d0d7ce9a8423d5dda3b2e5c7f6eccf3a5bcb37713fe7eb71f7 SHA512 d3d38c02defb7d5ee6131dc05527bfc0484370f94674deed45e0853368d065c043d3dda3bf5010a63ff762d846069772a4491fac3ccd9df61be5255d08d11b5a
-EBUILD libreoffice-9999.ebuild 19418 BLAKE2B 972627c32307d3ecf5f6b2157a18d7c012c496237a03c0376e529a07155698de30cf8904b91e364804a7a85fddfc50a16fd4fa686eacf88cbcc1ba06b6d76e32 SHA512 a3784c016f3e5fc4b014c2f046561f591a441f9285132bc1435470cfabd75e01a64e3925c91d4e3bf95543f356d583cf1c2bc29496bce8f7a948654c59597bbc
+EBUILD libreoffice-7.1.9999.ebuild 19286 BLAKE2B 0b28480c409badd67631fcefff56ffe5c3bec8e243c090504c4a9a13575f6f9d44b5197465cef796bf0639ac02dffe3bdd865ec98f1dc0d14a0ff8d5fcb1a7d1 SHA512 ab7cbb77ebe8c11b4ca5bd58540d76c347364ebd2cc35b694baf6159b6be8c42a53029c345a37199930e87ff6cc218b56380fd3646ae610b2078b28a5f917e47
+EBUILD libreoffice-9999.ebuild 19270 BLAKE2B 1db6f885ee2b1471a60b6b7dc098cbb9d778818b2d4de62c2eae60421da4d06c92dc803644324560030ae54a65d2da0f85fc6a6fce83228c4efc0f726552fc47 SHA512 f1718c95b1a3ce833b7f982cca99d5a7d6b9c25d2394ae5eaf41bc861378b0ac346026a19602ed23535f4dc22191252c4109c0378ed6554342d03adafd61c357
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
deleted file mode 100644
index 748a6c21d742..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Tue, 3 Nov 2020 08:05:03 -0700
-Subject: include cstddef for gcc11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- include/o3tl/lru_map.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
-index c7132fd079c4..96fb3161782d 100644
---- a/include/o3tl/lru_map.hxx
-+++ b/include/o3tl/lru_map.hxx
-@@ -14,6 +14,7 @@
- #include <cassert>
- #include <list>
- #include <unordered_map>
-+#include <cstddef>
- 
- namespace o3tl
- {
--- 
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
deleted file mode 100644
index 77c24f8b7d65..000000000000
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ /dev/null
@@ -1,663 +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="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-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.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 ~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
-	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.15
-	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
-	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_MULTI_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
-		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
-	!app-office/openoffice
-	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"
-
-	# 7.0 branch
-	"${FILESDIR}/${PN}-7.0.4.2-gcc11.patch"
-)
-
-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() {
-	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."
-
-	[[ ${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 CLANG_CC=${CC}
-	export 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
-
-	# bug 709450
-	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() {
-	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.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
deleted file mode 100644
index 108fff08a3b6..000000000000
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ /dev/null
@@ -1,660 +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="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-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.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 ~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
-	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.15
-	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
-	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_MULTI_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
-		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
-	!app-office/openoffice
-	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"
-)
-
-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() {
-	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."
-
-	[[ ${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 CLANG_CC=${CC}
-	export 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
-
-	# bug 709450
-	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() {
-	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
new file mode 100644
index 000000000000..cf695c2bff7d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -0,0 +1,655 @@
+# 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="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 ~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_MULTI_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
+		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"
+)
+
+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() {
+	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."
+
+	[[ ${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-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e89f80aedfac..a38aba75536f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -47,7 +47,7 @@ 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-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+	"${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? (
@@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=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
@@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
-	net-libs/neon
+	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
 	sys-libs/zlib
@@ -267,7 +268,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( || (
@@ -639,11 +639,6 @@ EOF
 			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
-
-	# bug 709450
-	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() {
diff --git a/app-office/metadata.xml b/app-office/metadata.xml
index 93999ecadbf4..bbb4bb77b06b 100644
--- a/app-office/metadata.xml
+++ b/app-office/metadata.xml
@@ -38,4 +38,3 @@
 		arkuszy kalkulacyjnych i prezentacji.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index e331c4e63b25..319239657bcc 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,10 +1,7 @@
-AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
 AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
-DIST texstudio-3.0.4.tar.gz 83191627 BLAKE2B a800b369967051a7154a1ec5d00ae735477fdbb4237e6653bf5469c5fcfa1083fa28f56e3e6bda304821084281e1bf02dfdc4738e6762072d7fb43988e029641 SHA512 094fc53cab388d2e5f9ecfc1172a6ae853c04abe746ed03afe8819be3acdf4e7cb2bdf9ce1edda43fda9396c260f2063aa05ca9aae66871505555d7da6c49beb
 DIST texstudio-3.0.5.tar.gz 83231803 BLAKE2B 739a57fa5305ad8044f8fc13903910ee743cac353aeed53b298dd3d50291c4e5b2d2b67db7785305d1f1c71ba805769a57b46374c762efd39bc1a450f1df470e SHA512 240d177ffbd64f51a8f2aa93644cae29764876ed6fdd03733da05ed97a8ec10e21c1f3aebcb05b35617083abf0442b60ffe8f0a89edb28adacaf9ebe40609a48
 DIST texstudio-3.1.0.tar.gz 83232492 BLAKE2B 6e890fb19a51d8f1fdecbf844f674579391cfea4c3e41535db1daca78d24774e085d7c3c7d2c1eae6e7c287e9ab1d465e1082a25e95b95a7b62930a416bd654d SHA512 83d758102b597eae928e68a59035a83d90a950920995dc992a4478f8eba8ccb1f038a01bd07cce2681f354cad735394b2637cb79899d8e89960bae258652b3d8
 DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
-EBUILD texstudio-3.0.4-r1.ebuild 1612 BLAKE2B da5a132b2dc7a4af6874d08efc204e751bff3b57309300f314eacd7e7311268ea7ffe08233b68443c09edaf005b6bf7046f39dc2bd882f15b73d4038f6e8dc39 SHA512 16ef97c412dd08bdc4f6bf307a97c3624507e24450d4844f86b0c55be63c2d2cf364d21f1c2e71e7f69ea97110a6e3428e01adc408aa3a3d1a1881da715e66e9
 EBUILD texstudio-3.0.5-r1.ebuild 1728 BLAKE2B d92337a8275176ba700df9ade1ae31596037622bf27713f5aaa9af672e82c86802294fdc5ededa55f652b770327b18d730959b6db7ecc54a0b182e12e30402f0 SHA512 a5b36e967193fce6866bb492218be9c615fbfce34bb4aa3ae8eb696f365aba4704ac804be79bc5f58ea5d967b9bf696c2cd5c8e02f30a734c6f7c3e1dc22dccc
 EBUILD texstudio-3.1.0-r1.ebuild 1737 BLAKE2B 0bde46f53e9f4944fec024eb812ee72f0ec680ca53ce553e940c7dea8388e768b50126aaff2162eafcf9c49b928325f5a473518d112ed08b0a157bf9c91275f4 SHA512 14fbbfba5c373a0ada45eb727ef5fcb558fc0171a91e5935affff4d2b751fad48c039e19b0150901bcea88692027b0708e8cc0dc3927e6be25fd5b1ba4840bbb
 EBUILD texstudio-3.1.1.ebuild 1741 BLAKE2B 28f823a8dcb662af2690637539ddb1d9d6be8aba172d1fb37364679549ba0f68f2ca848d52906d6be5561787e03a4601f33fac4e643de588c4149b92007c3b1f SHA512 745fb3ed7aeea744c4d5c9c50f71d85ecf774e576c9ec521aaed123714b4f0ad0a6b06edba801a37b418bc879efddb2636d9adaa85b29ebdf7c417afed578a7d
diff --git a/app-office/texstudio/files/texmakerx_my.pri b/app-office/texstudio/files/texmakerx_my.pri
deleted file mode 100644
index 06426fc6a9ce..000000000000
--- a/app-office/texstudio/files/texmakerx_my.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG   += link_pkgconfig
-
-# System Quazip
-INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/quazip
-LIBS += -lquazip
-#INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qt4/QCodeEdit
-#INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qt4/QtSolutions
-
-# System hunspell
-PKGCONFIG += hunspell
-
-# System qtsingleapplication
-#QT += solutions
-CONFIG += qtsingleapplication
-
-# System qcodeedit
-# Not working currently
-#CONFIG += qcodeedit
diff --git a/app-office/texstudio/texstudio-3.0.4-r1.ebuild b/app-office/texstudio/texstudio-3.0.4-r1.ebuild
deleted file mode 100644
index fca57b96036c..000000000000
--- a/app-office/texstudio/texstudio-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop prefix qmake-utils xdg
-
-MY_PV="${PV/_/}"
-DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
-HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
-SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-
-	sed \
-		-e '/qtsingleapplication.pri/d' \
-		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
-}
-
-src_configure() {
-	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
-}
-
-src_install() {
-	local i
-	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
-		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
-	done
-	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
-}
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index b5502b43431c..81dba53d5a36 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -2,4 +2,4 @@ AUX upwork-desktop-r2.patch 315 BLAKE2B df27130999a74eaad5a49104434977a8cd898d2d
 DIST upwork-5.4.5.1_i386.rpm 52638856 BLAKE2B 95e598f96a9a8165875cc0f94bcddf80138ef1f9281434d33e3eec997e6df6b96c6bffc3de57163b6c4dcf6261b74e593dd801dfc38706d6644d3bd87f4141d5 SHA512 bf2a18cdb563aca8155ddd1f5844e6726d38df8207999d6f64be47e9c0a636e64cf5012eb6b31682c272d3584c1a067aebdf1ce4b11f8927cc58a569168b2449
 DIST upwork-5.4.5.1_x86_64.rpm 50954566 BLAKE2B 1547cc49a9029f65942398088786e9261812ce7a9a32e212199f5e0c56ebef5188988715f2f1a88d1ad2b426b78dc299ad5921d8df729666d5a8ab295b20456c SHA512 dd000abd53c79d5655c71aad3e566d4baf09cfb5e4f3a5c83806c61bc7e9a5ef8513b8553cf04049e8b7bbbeffc90ef388f09b620f85113efc4586aadf23555a
 EBUILD upwork-5.4.5.1.ebuild 1294 BLAKE2B 4761e383bacd85b8db9157efbbf47b0a212a54d4f12fad00233cfb13aef9eedf7f678b329bd2de8402be67c118f400e93a19d067b8420d506ffb3b5be0c7df5a SHA512 e3de98dad5c0c9f1a3912e446a6d292b7510db4a95097d755c897f73f617fc93df0a9ed72d5fce0b7698e02a5362c370e71fb81f28674e0c7047bdbc24720103
-MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
+MISC metadata.xml 615 BLAKE2B eabdbca10a7e9ee2331bf14647f55de076bd6d5299730f0b59c84cf3716deca80034ee09d9de6057ca8423287710127c81ed9094ca756c5f4dd31ab84860d7ac SHA512 93679ba9c4db18df84d47c51c305dc264acca4f1366ae6a2441fec2826a017fa99ab6d3ba1b57a3f02932ed7f862577a2ab2228e11e8ea7e29765754d019c692
diff --git a/app-office/upwork/metadata.xml b/app-office/upwork/metadata.xml
index 33ffa3148d10..fcd664ea6edd 100644
--- a/app-office/upwork/metadata.xml
+++ b/app-office/upwork/metadata.xml
@@ -5,7 +5,7 @@
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>stefantalpalaru@yahoo.com</email>
         <name>Ștefan Talpalaru</name>
     </maintainer>
diff --git a/app-office/worklog-assistant-bin/Manifest b/app-office/worklog-assistant-bin/Manifest
index 6dd4ac67a555..6f22be703405 100644
--- a/app-office/worklog-assistant-bin/Manifest
+++ b/app-office/worklog-assistant-bin/Manifest
@@ -1,4 +1,4 @@
 AUX worklog-assistant-bin-2.1.3580-fix-desktop.patch 554 BLAKE2B cdbd1525257e8f54ef1fbc1d03d2779155bcaabf6ca6da9741d741da6622b3be171ae1afc56be07ffca74468233b914ca1a032a8cdcaa828052b4b0eb161ca1c SHA512 0fc20285b4ad932762b44d19c9db08d7150f79c136f74d6ff9add6f7f510489f3b56f7637ca5c2b2fb44e6572ff2e117ab84ad39f83edeecaf7774197b502371
 DIST worklog-assistant-v2_2.1.3580_amd64.deb 31434440 BLAKE2B 44a85e3cefa652fac6d01d2b3dc0e1a32128d8c7e27b6177d2c3187b97011cf5cce7493d67e9f989e034f26bd88589e3d9960232a5da2dbadf909c26bede2ce9 SHA512 cac38acfd7e00a57f6869d1205920a27f5e6cc0525b09cc7b76350df38d5b6dd673779df22fdf55e8e327cb591a1c4738fe23645a6e42b6d2753af2eb330a646
 EBUILD worklog-assistant-bin-2.1.3580.ebuild 722 BLAKE2B f8213a08a24669448e8e08799deddcbf120fb8a0504b94383c12b7b3fc24b547f6e9030bc724aa3961e6a0ccd0ed295b58a44a3f06f5310e3e11be9abbe4976c SHA512 9dc7745e69dda6c52ad630a9503b43f9c5b0e1a9ae822e2c4182181da1aa217915b7fe720b8194217ae3189c86d6a4f2faf43635db138a4fd8444c1038d5cc8e
-MISC metadata.xml 368 BLAKE2B 634f194e85eb8d2c474f9027221306182cc6437e862887f3dbf3ce00edadfe7c718fed914d0b8eed19d88750d63b37c6ed134be0c80fec716d812f722583361b SHA512 e0efef9ed540ede1c38e561774d8ec5d22a687068cbf61d6f8e124b673db6e3352a12df2b821fabcb5f5fd84444e22a1b22f656d791ddd03317d86012e92dd32
+MISC metadata.xml 398 BLAKE2B eb4bccc645fb376895c8184225005f2434b9bdd0f1f8a5172107abdf08ed23873974ec38a5422d707a25719615000fd930a0639309390b607986bb66c2cd1731 SHA512 c2e6bbbedfc92ff5ee3b56bc2d4d6ecd294bd439a5877fbf594f2f9cbeb59be4882928f6af1f0a7e7464d5426aa3b8b528f62b7e5e79e563aeab05fd4bbf46ee
diff --git a/app-office/worklog-assistant-bin/metadata.xml b/app-office/worklog-assistant-bin/metadata.xml
index 72530b22b19e..58cea62d3712 100644
--- a/app-office/worklog-assistant-bin/metadata.xml
+++ b/app-office/worklog-assistant-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 494fe377e632..8a8febe5b6c6 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index ec83a0deaaf8..38705960f35c 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -2,4 +2,4 @@ DIST OOoFBTools-2.56.zip 5256051 BLAKE2B ed78dffff2a2480d2c882c56ed7918d729c7942
 DIST OOoFBTools-2.57.zip 5362083 BLAKE2B 81d361839cc5f3282d7d31465561230cdc2965c69cdc9ad3db5d6293a1ec76cb0bf1ec6fc8af706d6c5870beca3fb15fe091583eda127d1de26dd1d71c8e7b7f SHA512 f6cf01b173885eb30d1166753a3ffd357a23db71b517e84713783cbea7b36deb98d586faa0a555d6d7fb21b46e89ee78860407aa28fb7bb1e272a51df570ea50
 EBUILD ooofbtools-2.56.ebuild 774 BLAKE2B 0830f01c76bfb71060d55031aeb1afc93882492c561e1c66335ab05e6d7997f336990e02893d45dfdffa5b2fc058c8ec6f98ee8ab8bfb5eb4beed42adf9b672c SHA512 87ef15f888f3781e057cc9977cce71f7645668bc470fbddf1f770d39f1b615cf131125ba4e0773af9d8f550425f5036b2990090017cda04e0f1e43d0772d5d7b
 EBUILD ooofbtools-2.57.ebuild 774 BLAKE2B 0830f01c76bfb71060d55031aeb1afc93882492c561e1c66335ab05e6d7997f336990e02893d45dfdffa5b2fc058c8ec6f98ee8ab8bfb5eb4beed42adf9b672c SHA512 87ef15f888f3781e057cc9977cce71f7645668bc470fbddf1f770d39f1b615cf131125ba4e0773af9d8f550425f5036b2990090017cda04e0f1e43d0772d5d7b
-MISC metadata.xml 558 BLAKE2B fd01136ef59f107646bfd319657c23cf75cd2a75066a9ae63c1b430b34e5a30b087fb307a5442ad6c40a16f74a81178f35f216c95d264ef584e10ea4c3784c5e SHA512 45b372bbf351cb6d5e2f984fd8151a47f85f398059ef5470afd671fbd1d0f05e6fb987c94a29c263f4e71283c3cccdab5094cce9b78d16221c2e87045aa92009
+MISC metadata.xml 588 BLAKE2B 02f2f2502c5bf913710ecac1013f3d488aed99000043543fed97df29af358990c4436edb685dbe20ed94aa1c1108933f907187fa2d9da47b419cb1f79b5c1c26 SHA512 e1f4c61efe1e9d7586bc00b29f8a89ed24aeabf086969a469feda2980ce4820f40f2c322f6f7685b5f0234267cc0421585d2409007e5f823c6f603d9c8162b07
diff --git a/app-officeext/ooofbtools/metadata.xml b/app-officeext/ooofbtools/metadata.xml
index 1fa7af4080b9..a25ace577bad 100644
--- a/app-officeext/ooofbtools/metadata.xml
+++ b/app-officeext/ooofbtools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index a6d93af65eed..6a9d91e501fe 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/metadata.xml b/app-pda/metadata.xml
index 94e264ce8154..c5f319dbf5d5 100644
--- a/app-pda/metadata.xml
+++ b/app-pda/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria app-pda zawiera programy służące do współpracy z urządzeniami PDA.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index e35c17379310..552a91ebe599 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
index 6135b02e1b60..5326bf5db15f 100644
--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@@ -2,4 +2,4 @@ AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6
 AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316
 DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a
 EBUILD deltup-0.4.6-r1.ebuild 910 BLAKE2B 65481b8a3acdea5d12056c14ab8d796ac05694ad10d79967b1aab1365c65bb2ea1759a60017ebe074f7fcda1ae62c9bf3adf1782dace5d5c1611979fe289f9e0 SHA512 cdbd7ba84716721a97cf62a992e9380e5a786d3f8f70bed32ce86e48e4b569de3d53f62b8f6f0f58bb79bd6a2226e97e6c865b114924bb285fcb153bfb0229d8
-MISC metadata.xml 529 BLAKE2B 32728c366ecf7e40a84e875ba3dc2e6e181faa241939ed343e23257ac7120008ec86718495a4e7866aa7037b99143360df13253bd4f8fbffd6abc78aecda7fb9 SHA512 453e074a02cbd112c17da0b4726a15f4f98ae3dd1d73b454dd09775c2db4d792a9687920c0a647940e810e4bce623b59f793dc66bf9f33d697ed3bb8cdc77790
+MISC metadata.xml 559 BLAKE2B f519d2d6a797e16aba8fd7aabe17554c5b4a2ba03ebe6c7c5bba44f5eaaf0c5bb4b5bb72de383147a3ced0f6f0a7034a357488e37506797a920fcb3455a97026 SHA512 e3f2234ad04c520aa8aa260b50177c3027acea5ef9e71861dcc9328e0d95e2d3d6df9d29705ce810b4ed6236412a1178512f7bb3bebbedad706c62eba98e98d0
diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
index b61ab2084920..a777a3761381 100644
--- a/app-portage/deltup/metadata.xml
+++ b/app-portage/deltup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>Ameretat.Reith@gmail.com</email>
     <name>Ameretat 'reith' Reith</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 3857e66d5855..eca45bbe83d7 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,3 @@
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
 EBUILD eix-0.34.12.ebuild 2538 BLAKE2B 8b9edcca404e1b1ce0269a58731e01b6c1fba3ab6396057bb37be6a33d40eced8c83ad3512c21863f530ed83575196dcd68c9331b56c467e210895453203c1a3 SHA512 2af3a5b54e2111795d8135ea35bdf71d500780b6511ddf55ebf89bf3b28610f0c436975cccd88c89dcfca8f4447ba7e45540a476a4512583f722bfffd9a4acc8
-MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
+MISC metadata.xml 1065 BLAKE2B aba22801b07a7346aab81b420cc8eadc9aabd68f27b5943b9f5be4f98bc435bd4db09fca13356e09ca16b753e7378459001501112e8358ff552e9efc46569626 SHA512 3524a0ca51ca92fcbdb2c7b4c862d8f71da8041fc8c968cf63840266d79c52b7d5632cfc479c4e9171ea4b680e986b10861afb3e49598e1e10327587937690a9
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index acc485463b42..c63f78d2f35f 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -9,7 +9,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
     <description>Upstream developer, CC on bugs, do not copy ebuilds
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index c943d48f7f1d..be391797d6a2 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -2,4 +2,4 @@ DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed64
 DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
 EBUILD elogv-0.7.8-r3.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
 EBUILD elogv-0.7.9.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
-MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
+MISC metadata.xml 469 BLAKE2B 609b200e2d83dd2022906fb10af760fcd4bc740b08decb77f1ca6375a73d18c9e6dfc039762571be119c51dcea6fa02ba32b78ba006134c74392c0e366757156 SHA512 1964c3b63bc437f6a20b18b2fcb46e10514e34505d687fddf2c8423653d8cdb106677dde101d39d8ab4afd6ed3d4d721f05c6881a814c5441133441f966799cc
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
index 1194e752228a..8516991bfeb1 100644
--- a/app-portage/elogv/metadata.xml
+++ b/app-portage/elogv/metadata.xml
@@ -13,4 +13,3 @@
     <remote-id type="github">gentoo/elogv</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index cefd4aede801..c352de615610 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -5,4 +5,4 @@ EBUILD gemato-15.2.ebuild 990 BLAKE2B 5c866f65ab8a8267592ea0840bdbe5aaeba65eadf9
 EBUILD gemato-16.1.ebuild 1013 BLAKE2B 0600d2f8da39cdc285917fb5a7e597f466c79935527d7caf8901d0003594c65383efb425fd681402cdd9776da0b2329b7a9878cbbcd9f09243d2003c66ae1674 SHA512 9d109978e005dad29756fdd9276140ee316a2939fe45ae19e23e48d7af210abf25da1d841f0c9b8838592db4a117f38fc1d508759b8f45aafcc664d923d72911
 EBUILD gemato-16.2.ebuild 1005 BLAKE2B e03f5005f000f9a4b773791948d365ca98c5f9da2b5f42a304de18f4200ffadbb88a604e95f54df1c8485dfc283022adfe96535ca69ead1ba15be8c48bce6fd0 SHA512 281772fd77ae89a3108c5b9cc6d44be0b9cd39535e43a9008cfa3f4944941dc19202b5a56c88a004a90fd314b1680007b6a7e5d4170bed41f45a880ca70c75e5
 EBUILD gemato-9999.ebuild 911 BLAKE2B 617c87c98594611df16447cb1d295177b37a524ecef4e4193f78ab633876d10875b0831c8be9f4976e052051102028327ba9e8e3fa1528e9fe73b5ceb2609a5d SHA512 80da873f4a456b62779895f19f713f679ed168fdb404b395698d3c2b4b596d1de797a0fdb2ba7afcfef4b20c5d59d46f750a7b3120fd1e029f84e97e2266b59d
-MISC metadata.xml 670 BLAKE2B 227576c022fb4b2011152a3c423ecab3b8f7524e4e2ec07bb7e963c573fbc17d8b99c4123af93ab665f0e24690c1dd6394e2683bec3999112e1e2204293e91a4 SHA512 c45044a72c71f1e98245019db989a2222e9487cbfad87e7583c57964bb724b1947700497718035a726e4dfa4563dcd154c8ac9eeb43173b6a690037349e905d6
+MISC metadata.xml 670 BLAKE2B c6cfaad2f460b24af8c5f2f126edd38c873c8cd9cf2c4594594d20c70eed4d6c7851a1f3c4e8bf9b6a4787cb13d838b47bad9e0a05c92e876ed70ed6dee7e6f4 SHA512 9f180e86c3d52bd9d7fa3e7fa48812a3af7327dd1200498148153fa5722758364eb4a318e87134d0027e5d0efc6c90ee6d8c58fb8eca4840e5c93e7159540ce9
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index 62b0e6ff165a..79fbd6dbc98f 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -7,9 +7,9 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<use>
-		<flag name='gpg'>Install dependencies needed for OpenPGP
+		<flag name="gpg">Install dependencies needed for OpenPGP
 			signature verification support</flag>
-		<flag name='tools'>Install additional utilities (benchmarks,
+		<flag name="tools">Install additional utilities (benchmarks,
 			hash testing tools, fast Manifest generators)
 			to /usr/share/gemato.</flag>
 	</use>
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 82e773366f7c..4fd2108ba0d8 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,4 +1,4 @@
 DIST hackport-0.6.6.tar.gz 2079279 BLAKE2B 6e4084babb3fc036568387845ca2793d47a29ce94c24211259324d3040d0c0e15be028d0a9726ea8512dd518d7e9dd8447aba67725c0916418f523449f2179b4 SHA512 b836bd21e3713796feaab9ca830fdef80f52b9723d0fba6cfb60d802e038eaec2da8492eb025d6ae376aea69734c031e23c0887642675c4f767b1592d82c5523
 EBUILD hackport-0.6.6.ebuild 1333 BLAKE2B d13593e39d71f79435ddd627221fa9ab59e5e5caf8dc239878665bd40c3cd7bc04edb32754586f0debd737abeb832df2cb53086bff9435c071f2b6082d5ed126 SHA512 67d8164fd4e0b31317efd87c1127f2bf8dbcf57d9e4b638870a6ac4dc4f52d266c7860ef38caed2a4219132d01ca43e354351c0a9feecc9ad3507060e723ecaf
 EBUILD hackport-9999.ebuild 1384 BLAKE2B e451cae0dc1a4f626346fbddbf36459780114cb27834c69e5245a19012de4050f641afacccfce9fe83cdeadcb916fe2838a417f2813eab3f663ba6291af763dc SHA512 c46f0b1ce12d45f06833d9818dbbf441ec7dd94272342a047d7b90b82a524622a018a1a09370f02b26635927794283fac67433689eadd333a260a33265e5cc77
-MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
+MISC metadata.xml 497 BLAKE2B 7d8e47f675a15d22ba13a84bd02fed368f3557189199f3ccf37ade9968434643e872af409eeba700845ab3ccacbc70672ba07152898b70822e535cb04a351e9b SHA512 d8a105777198dffb4d6177b456f01227e919365f2fd264fadac1e749d4ab6f09bd2bd0db256d0971e10d2b4698c87cd32717d9e687a8efc20fdbf417fa186efa
diff --git a/app-portage/hackport/metadata.xml b/app-portage/hackport/metadata.xml
index 91fe17ae253f..c50a266c0b62 100644
--- a/app-portage/hackport/metadata.xml
+++ b/app-portage/hackport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index bd61c58725b9..fca893bbb37e 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,4 +1,4 @@
 DIST kuroo-1.0.0.tar.xz 248912 BLAKE2B b7b556fb833052890038a8186d0d5c9eae127633449b542ccad3e38c8c888f31b1dc73bd6b5ecbbfe332917c72f0b1511e25df4360b8057c95172188cee8ae12 SHA512 af90554604aa9ae4776f207202a6a1313e104a9a0883fa924241dc5b14b7d39a4c60b226d2606f55a210b7dfe80c84b952ab3cdca14da77c150e7ae6e7782bc2
 EBUILD kuroo-1.0.0.ebuild 1082 BLAKE2B dfe189437085e3705b9992a48f1209d423552281115e57fb66a244ac44622f4684617021a9cc865fd5ca694bb6d2f6e9b87e1387c24be388e235488c8b20e3ff SHA512 d5c3e0d33b7f84a73e1b17e23119cec37d1b3a3f5b7dc13c76a1a6679d632ca925a2881785db70301626566bacd933e11e484ef5e2c74cad21e738ebc6000424
 EBUILD kuroo-9999.ebuild 1099 BLAKE2B c042dd6f8b908e40471974decb763dd405ba689e3fd57e9527562b690ea7f27d6540974b7588f5164bed5b9e64f01e25c2c29b66a886b4725e4dfb9c5a35ee22 SHA512 659d25f521e86e616974a17a11ea69079d8fe6cb456c4edc41f2ad6c6d4a934e1a9217a86392dd872335ad6fe6d3b0c09851def2ecedb5a5acb99f4c0a75eab1
-MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
+MISC metadata.xml 787 BLAKE2B e9a0da083ad03b67468e0901f5b985bcbaecf7e71e869bbdb1ce9274a20c05cb4590cd7e925c5a14625bf52ae2b1fe890afa4bfd39897082158c6ab1a88d3572 SHA512 3ec9624fb943563854bb7a26f595860e051d31b1d48832cdf8d47bd956e3fefcafae55630133f5e57abce6814079b0907ffbaddd6fbd34d76c0108c83f037065
diff --git a/app-portage/kuroo/metadata.xml b/app-portage/kuroo/metadata.xml
index 880a4473e188..1b8e9bfbde95 100644
--- a/app-portage/kuroo/metadata.xml
+++ b/app-portage/kuroo/metadata.xml
@@ -5,7 +5,7 @@
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,7 +13,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>galiven@users.sourceforge.net</email>
 		<name>Andrew Schenck</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
diff --git a/app-portage/metadata.xml b/app-portage/metadata.xml
index 3872164d80bc..30f4d64e6d4e 100644
--- a/app-portage/metadata.xml
+++ b/app-portage/metadata.xml
@@ -36,4 +36,3 @@
 		Portage oraz ebuildami.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 052a9154b283..c6fb607edfc9 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,4 +1,4 @@
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
 EBUILD metagen-0.7.2.ebuild 737 BLAKE2B b8abed80940833688f245cef82963833ddea9994479d11896016bf601677c36b03531a4bba48ac5a7ffd7cd0ca15cb30e1db7890496e8f8e78507b4205e501db SHA512 3e4eef66d79eab73b0c1e4b7c0dd0b6fafe7fed3d529a399729bb9378ce68bb8d75f8eddca165fb7f814470bcceedf828e5dd239948895cea9a2b04d73e847b9
 EBUILD metagen-9999.ebuild 930 BLAKE2B 2ed329c8bfdfff8c72d7ee00b448b70c900bf90f325a7ab0d72f8c85458860c36313eb0597dd01962f446d89d12ac52045318ed879ad7841299f7286c3b01a91 SHA512 4d842ecb22d61cd199138d0692dc3713af538f026354efeb6f6cedab3ebde0be7f6cdd9a500594043af2f4ba282f27b05924b4e1fb86e507b7001cb7971c1a2a
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/app-portage/metagen/metadata.xml
+++ b/app-portage/metagen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 62786031e08f..bb457d652f9f 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1,4 @@
 DIST nattka-0.2.12.tar.gz 92954 BLAKE2B c4ffd44030da0224963d7fa367336d7ab9076b17f03292f5e65b7855823b34374b8d7626c4b97c155d10797f2d550f3c20cac39f68cfbfc4b8038406f37b21b0 SHA512 f1e775895d66505b09a3098525f998f87bb1561538f0e75b993b264f87f61937d7d5c71999018fe93c683366ef81dff5b7fef1e1d44af63153003f70d7933273
 EBUILD nattka-0.2.12.ebuild 901 BLAKE2B f3d6838efeb395764fe0e1c98792e6061fe6b015f81ff325cfd0ae743a3bd10e20759822246b4bfedbbfc519e9645b18625a08d08a83aeff4621249f9f498abb SHA512 9734db90cc7964e6c9b274a41dd8be93380b632e936bacdf27e250f837042a866bfa113237ebe5e8e791cfd826af0739474903fa4883ba65c2930ca4aadc1f2a
 EBUILD nattka-9999.ebuild 851 BLAKE2B f451fe8c8b8b742e217607780e1f3f34e8ce1f3dc3f2dde019b79807fc802284906c40e42fd7ca7e33ac3ddd117117cb5e05b806baed2e54485a9d63351ccd17 SHA512 9dc88faf76c7c84e49ee69b9e899547c215fc86823c446a5bba052d9d4eb11f537578f1063b2d4fa9a4f5122ba157e8226514c913d7080eab52424d7a7446f50
-MISC metadata.xml 384 BLAKE2B a75502a1e8d6cbe02ddc6c56505790fe6ab3110797d9d50631650d38c83cd04bcf6eee6d8d1b2db5e092f7721626312ba2f1623e680c5d8bd1aff3feda5fd5cd SHA512 3a6e0ed25d2650d1dc81e3d243726abcfe5a9f8d47feff6f89346df85b425d85369bc03ce49bcb1fc49086ab3c8fa394fb3578618d1bf4c019737a9f7cf17004
+MISC metadata.xml 384 BLAKE2B 190cdbb5b8976f88c21c364eedd2548b16d7a0bdd72c546058271b9b70fe98fe52d29e26f16cf6039aee0be0a89d058ca80da3dbfbe7c8cfa9906c7797cf2393 SHA512 6f50634a08f13a36a3b8070e4cf41dcc8517e4677f973709003996321e38a61dd049a5415eaf3c12dfe21f03c347f3729e02c4740c012e2c4e9133230e9fc971
diff --git a/app-portage/nattka/metadata.xml b/app-portage/nattka/metadata.xml
index 0d91eefaa247..57c85f2ab0cc 100644
--- a/app-portage/nattka/metadata.xml
+++ b/app-portage/nattka/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<use>
-		<flag name='depgraph-order'>
+		<flag name="depgraph-order">
 			Process packages in depgraph order whenever possible.
 		</flag>
 	</use>
diff --git a/app-portage/pgo/Manifest b/app-portage/pgo/Manifest
index 73072a014bdc..7122bcc55acd 100644
--- a/app-portage/pgo/Manifest
+++ b/app-portage/pgo/Manifest
@@ -3,4 +3,4 @@ DIST pgo-0.0.3.tar.gz 1759259 BLAKE2B 9a6be02078d9ff44311fef72e01316a6f5ff896b84
 EBUILD pgo-0.0.2.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
 EBUILD pgo-0.0.3.ebuild 584 BLAKE2B 13e957fc2fbcfbf6b0355dcdc32911c1ffb069d66f7ad8da96cfd142702f0a3ee3d02091a6a1301536780fb09ee4111317d6ea99e7368a91671bed4062173066 SHA512 9a0ebb9477fe3b7fb33e20e84552cb1404a18c8813c3521e715159bc24a6247146fc77c09a80bb139d70e321891241d0a12c4e515cd2ae27c7d79c4e2f2530df
 EBUILD pgo-9999.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
-MISC metadata.xml 831 BLAKE2B d83ceb60c84590a186615d9ddf2dc02feb95bc2af89b9aeeeaced964698864aae382b524f62fbe74526c8c36f39d96a8e1781714489c14e8d9174023361f3cff SHA512 7226f2d0ae45f560e9254f3f4ff661f48fe86cd1d0a74aeb96e7a80923224d85fde07b8a9ce3060c95bf328b78975d7d6e8266f1a8030d20fbdfbc9a6fe6c2f8
+MISC metadata.xml 861 BLAKE2B d2747b35daf5031ad015b00bfd102d28a5775c4e6ac55e50cf825b1d755a1c1877aa537789f6a738a58495aa1b66d9f71383ef918c7e2920a98c03e7508dcd3a SHA512 b64abb236c498efef9111385f6cdf71132b25c93b492992321682a299833f1639e59acd0876a07991d37371f847c3b9cc66dbccea6e1eeeb49f17356707f8483
diff --git a/app-portage/pgo/metadata.xml b/app-portage/pgo/metadata.xml
index e7c029f91d68..0db2688a2266 100644
--- a/app-portage/pgo/metadata.xml
+++ b/app-portage/pgo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arzano@gentoo.org</email>
 		<name>Max Magorsch</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index bf1450413ab4..aa97f601aa53 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,5 +1,3 @@
-DIST portpeek-3.1.5.tar.gz 13501 BLAKE2B a22b039e77d3c72c0cfd71e6abb097ed7aa6f0d4b00bb3c4108bda2980ceceedb21d75eb630cbc8eba2d842fd4cbd77c6e8e54c4c842351d2fb86251abbca522 SHA512 8245e40f9a2fada1919583a67de13ba2b6c111c85c9fd0a02e9177e188e2d8edc42882685399f4c61206d4414d4a8296e93d51d4c45ddac0fc968be43a13c639
 DIST portpeek-3.2.0.tar.gz 13793 BLAKE2B 224ffff46090ee8c6ddc338623a5a1b4323ad2104514f0be8962b5af9070ab8217d76e3b19fdeac148b13cee77531ddb0261b89e563bb9a999b895b2a2475c69 SHA512 2b0592b92ce122c53c687e1897e1a51319527dca70c16ca38564dde870a05ccd0f4a00de88b53194046c9b2a4fef3a3ccf1a5fb84777de8437f66bb6cc25da94
-EBUILD portpeek-3.1.5.ebuild 689 BLAKE2B c12b402b21f4f3978b9f6f8602f8becb37e67941f2321a224aee3e48fa0026fd71400e66c6b8349c696829f491bfc650c01699600495f905178052d9f54e5b3b SHA512 e560bdfd6c6d30450adac92bb79b51888667f677dcc08dee71327208a8f0a0cd569eef362441234cfb8d192eb2f3b5ab85f2530d9bfba020fc1f99fae9277da9
 EBUILD portpeek-3.2.0.ebuild 688 BLAKE2B 89745986a59dd306ba764cfb20c909941dde1d3a2954968b946dc33825bee67ca30e930d45c879e5f45f534d2207c6cfde5edcbb4da1f986f47cdd271802e8af SHA512 be3aec7962dbfed55235a811224c7573242ab9c958ec328f1f0738f5b81c31230d793687ddc52d01f9fc257967cdfca783c9e02ad95b5186c07253d9f79812e7
 MISC metadata.xml 247 BLAKE2B d6a36f1ceb3124edcff52b16e0893bf1984a3615da55fa5d160ae6faf816680dd7e735c3b9c5088ea101aa73501b4492553003771190867e35dbba8413d5ea7b SHA512 992dfbcdbf5401accacff7c9506d06cfd10555546cd041211755a90664a107ddc99d5d6b2b429a241929fe8895a0d5d571e3821ac0395dda10ed22cad60cb1a9
diff --git a/app-portage/portpeek/portpeek-3.1.5.ebuild b/app-portage/portpeek/portpeek-3.1.5.ebuild
deleted file mode 100644
index b81cd64dc282..000000000000
--- a/app-portage/portpeek/portpeek-3.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
-SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.5.0
-	|| (
-		>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 0ef3c9d57efb..03bbc4fbb451 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 e8b028b3d46a..254f024f1f53 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,4 +2,4 @@ DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc130
 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-9999.ebuild 3895 BLAKE2B 69a51c4ec428012d17546105198b9c4b51e3a6f1df848376d0f3ef008a6cfabcd36e4bb5ce246b177f887f92ce94db5ee059d0e4350f4da6eb62a3c5642c2073 SHA512 24ed09097a8164e18272c0dba458ba83acdb59b3a889567efd3d94db7b454f744c0ead9db9f32c34a1c328bd8ab81c44e79ece643cdc8ce675df1a3b155b41b5
-MISC metadata.xml 1439 BLAKE2B 06bfaf55046a8e6001e3de802ce5a2fc11b32897726930ce1e98b41e75faac78e54ff8ee947f4fc85a207b64c342c6359298ca08e66e39a74a0c8c99cd0fe4cd SHA512 2d6fab5c7b6f5539bc0ea7f56ca787524d0ef20777b86e58c87200423bd10081dc21053e21ba9084e7a7f4ec03d73d71ac4b7cc1082e1da3ca8d1499b996612f
+MISC metadata.xml 1439 BLAKE2B bd8b7a31daf2b9a9b094b053c8f0b3bce069107ae00aa95ba8386e259e79d7a95ad4f2b8a3ed9a7a5b6f2b7204d3d74770a3c929a54a563eb5678ecdaac14be8 SHA512 d7c85fab833584f2ffb08c4601e7900511e640adf532ee80b9a047254e8f2ff9bb781a02f02d5ef2a5247f5b6be31be68181d557618101c792a0dd0cd13e89d2
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 0e24540d67ce..65ec04fcf31e 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
 	<use>
-		<flag name='eselect'>
+		<flag name="eselect">
 			Support blacklisting of completions via 'eselect bash-completion'.
 			This enables custom Gentoo patching of upstream completion loader.
 		</flag>
diff --git a/app-shells/ctypes-sh/Manifest b/app-shells/ctypes-sh/Manifest
index a7b0eda90e9f..ad3599f62f78 100644
--- a/app-shells/ctypes-sh/Manifest
+++ b/app-shells/ctypes-sh/Manifest
@@ -1,3 +1,3 @@
 DIST ctypes-sh-1.2.tar.gz 475531 BLAKE2B 6fe00415244227629b952a0c18f9c95659a3fb22b9f17e109554f11084d27bf4c23eca5bfc49679b63367fa9fe74a20f206ac79955ed6588418033f37b776729 SHA512 23e9c30acc8ed5b4fe93fe1427c406e7c7b18067bbfc3f948126683910efc645cc69e426d771beb715148b54dffce75351b7773d8b54ac13f74d9787db8529f6
 EBUILD ctypes-sh-1.2.ebuild 731 BLAKE2B cbdee5849bad59fcf3a0ab7956e31e0323c4ec0dab15693e05257f2f2982dd6409857b08b9ef31f4f07c9d39777894c2c3f682eb2b5f50eb9fce39054f1ba97e SHA512 901d2817e18509b6a7470a6d48e22b6e3fe65dbb21133ad487d5d0996ddf023684bb28ef4f767fa133e1b653786ac5faa92521bc613e7dc22fda513b8684e655
-MISC metadata.xml 558 BLAKE2B 820b7e4f6e8c7fec2ba02cc164090f20464b78a137f53697532224a360c63952e219c77aebfad40f75673e2c8e82b08100358232290701d47fdf6b66426bfebb SHA512 514d59c04f3c419abcf7ab54a8860506bbcca810c2cafb911b4dcf468cb7b81f63e6f5c01b92c3bb5b2d10c2266bb7adf0ba264aba3bfe632aebcf7d1d3fb1a7
+MISC metadata.xml 558 BLAKE2B 2642a4f3751dd30ca3df04eb30fe3578bb1995049f8e7c0f2e40e37f58cfb77f12516ecd005a9a1cb81de948e72054895bddfe76cab478e31d160b55c1250b1c SHA512 41cf4fcad374485f8508d9389606baf1bd96f0edbc3569e12f255512683698c904ca0d850056b927d605c25c54dfd69a093e54a58e74703105f840c5f136484a
diff --git a/app-shells/ctypes-sh/metadata.xml b/app-shells/ctypes-sh/metadata.xml
index 6086f8198355..6b7e991a6479 100644
--- a/app-shells/ctypes-sh/metadata.xml
+++ b/app-shells/ctypes-sh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index f044435e801d..c11d11d59ca6 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,7 +1,9 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 DIST fish-3.2.0.tar.xz 3403640 BLAKE2B 740e20d428ef67b25352d56e5f2ca5732bbcb8310082dc1ca4f66c173d0380a5ab86328d6c1f8d899844d78bfd9547323a02d2c4caf5e82817ad01260bba3a7e SHA512 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face
+DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
 EBUILD fish-3.1.2.ebuild 1559 BLAKE2B 6591d08cf4f1a160d5b133436b7e11ac4eabfa506710ad2edd61c3b98894f32265073102acf83dfffffdd4d4af67549240f7e8097cfe74691663ce0ec5d2b4f4 SHA512 b0d4f615573a43b5407262629d40c3f3a60d3007ea53978173b29ac9a996a72a528f538f83f1ce7810948dc606509494e2b92e6ab1c846129aed29d3b7c9d754
 EBUILD fish-3.2.0.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
+EBUILD fish-3.2.1.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
 EBUILD fish-9999.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.2.1.ebuild b/app-shells/fish/fish-3.2.1.ebuild
new file mode 100644
index 000000000000..e2662c513ae4
--- /dev/null
+++ b/app-shells/fish/fish-3.2.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/fzf/Manifest b/app-shells/fzf/Manifest
index c21e4ad3c775..198c4870de8e 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -37,4 +37,4 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 EBUILD fzf-0.25.0.ebuild 3402 BLAKE2B cf7e0d862812d3d1529b09d39dd3b63672481cb95d7b6c6437ce0a913a5835658a8f1a59f15d557e1930124acaedfc29ce8970f8e492bf24522bfeac4acd895a SHA512 9562bfd4473d057f1100b682206b950d05fd12d005e9f3069eb0d1a98049d234300df88de12d940ccc50240cdbcd62838f60a08f6e468401078fcf02c755f49e
 EBUILD fzf-0.25.1.ebuild 3402 BLAKE2B b4542f11eb53df1956d9d63069e21a20ec2b142e8010bc250ae0191d15d7e2503a231b9611ab6d7c53b83a7ba13134e0742d8fda35dc5b7444eb6a60e4bd78c6 SHA512 1c9cb16972c49ddb6bc741ee723da333c9e094341cb714ba212aa77e0eba4896b7bb18611ad8bd464ade3cefe574ec442b9eb73143757f8f3c210de5f515c4ec
-MISC metadata.xml 575 BLAKE2B d6fa25687111f71da6dbe80c20e8387ef699e5d8022a903b1d8c60a3c0c58692166141fbf4bdc55f305e31a87aaa2a4dcaf0d4429f8b94dc71fdb9305675694c SHA512 14efc2b0b44734d0092306392b5dba2e0745dbdca7801fd6507f1739d5e6431fad622c15cb5b2f7d297abea58b54ebd09391ff9fd9b01c9778b067b9f88ff98b
+MISC metadata.xml 619 BLAKE2B d2af10f888ca5c627b85697491455ba012f109741fb638e665c41c38c52f3b38be91fc2b4807087c638ac3a10ee0e07e9143086197e24c22747e88450f12ed63 SHA512 246cf19de9de22665c17d1023d5ee3252c9833251e741c32ada34e8b2d4c708d9a0c61b560152c6125b07d8d9d06ee8e186b89abb3b37a194e70aecc943c5bd3
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
index 1ca0de6d4247..de5105a4a46a 100644
--- a/app-shells/fzf/metadata.xml
+++ b/app-shells/fzf/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rafspiny@gmail.com</email>
 		<name>Raffaele Spinelli</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
 		<name>Theo Anderson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index c67082ac12ea..4f26f12e7f67 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-zsh-completions-20200914.tar.gz 25823 BLAKE2B 2a4af0fe85819f5cb8b3669f5a3b5b0e9672864a1562641c1760b7fa889648d3b405d5e28fd863bcea7800faca3c7392ecf3c5169755345bbf75d17c996c0de2 SHA512 a7f65e255a3c9f342d266d3a8604645c117124bd3f714d90aa63b3f6f873a4cf46224d7a9969061fc522107139b97695b8bbeb8a6dcb360f41128079adf9ce8c
-EBUILD gentoo-zsh-completions-20200914.ebuild 740 BLAKE2B 092a580a43a9f023bcdac71e6ed95c8793868ec97e35ed79f583d337ae6c56969f827542672535abb406bbf7216721a1bbd8c34fda5b13f8f930feb54e974c04 SHA512 959637b8164555ada00d915b1686771129da27d6bf1cdcc3daff5af4ddfdc6105deb8c31c34c2fd0ae6f549720d116b043a927e0468cf0f179716c3fbcdc154e
-EBUILD gentoo-zsh-completions-99999999.ebuild 734 BLAKE2B 2123e1f149ca7e6651631045d1a21626f9e9a7b507995f736ea2132c8f6878aa20319f8c062a39b24801164bc1525c9e21624a88c59d2b5c579c19977a5f948c SHA512 08ba6b98565cf1cd084d70cb95a749329d8a08285c741cdc12397e10a5e0691b386cd568399b2e800b3064a2861f91ea9b2345eeccc9666775141cc1ff19de4f
+EBUILD gentoo-zsh-completions-20200914.ebuild 751 BLAKE2B 18eb81e338b08ac4ce88cf8d22dbef751607eb7f5e03972df1161ebcbfda96e2feb18c6bb2bad5e1736e30503c5ee21ba6f73e60c740731877462bd78766f46a SHA512 aed6a0ed814b1e296070b4e439045ce4e80fa0a0148c3700c581255584faeca26aaf2c5c72faf494846b27bea9f3eeed8fdc68ac2a43f84ae751e4244807c7c4
+EBUILD gentoo-zsh-completions-99999999.ebuild 758 BLAKE2B ad4db72cb42333f63255eea216d36aab1e8ae67dba96725e6ffa7599fd861a805d8550f55ab75a7d2b44c93966ab457ec7d8aee717efce650537810d4b8c6106 SHA512 5ebd7b5c1d6da4066335185760c52a73355f45c46498e6260a615b3ec3e26285b4c36c8e0607fb534754f97fd61ba366e9f0eec956c6f6a72611f7490bd6eac6
 MISC metadata.xml 264 BLAKE2B 8020d5ed518f5d0046da3b51ca0cb5be5e6afca0f743dd117dd8057b707c4b8dff58487491fd61592b625793837c30408a9029cf8ab74e0d7efac7d7ad205dcc SHA512 baa3e290eb539d5a9c615585e8701a9656d1f2e5096de544cadd8f84f4bacbee6f5c3874af59942b2933506a60cfea5d60538fd9e38135f711ffb50fbad2f034
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
index 10790e56b8fb..8f20b77d5d71 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index 2a81da460ee2..306738aed653 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index c5c4edd54410..aca866be285c 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -4,4 +4,4 @@ AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc0
 DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
 EBUILD ksh-2020.0.0-r1.ebuild 1123 BLAKE2B a1ca7574835877a1354c39ccb6c65c4ae4aba7f7bfdd3c198b641f97174841a46bd6a3dc931808418ff0fa2a93e16d2a9fc11774f1b7d4c24b7f3899a2d6c4ff SHA512 1dc0af0d3469c8a9d106880d7b8e21c6bc48e6629965de6e53880bdca308e63f93bf610775592795c5d5caa844a9083fe8f4ba5fadb03ecb93bb3fb3095a6e0c
 EBUILD ksh-9999.ebuild 976 BLAKE2B 4807cd3805a2f7f05a726019c707c6fe0106b636f0d221f31dd08b62b249df4815cb4bf6c5b0309863e2916a919c53aabcbe4c8efe3e8218655f2078cbb03361 SHA512 09f6498596ea5cf1c9a49eec1d8572a30b27649b0aa3a1eda99eaff959279627db59fd3a694a5929e8075dc2e641bfa65442a1a4819b9f1af5ca174d91bb5fb5
-MISC metadata.xml 1292 BLAKE2B 052e6395eec0522017bdae1d6376706e6ecb17f6cc67d938805dfc25e2927f841f91ce220099a8b7ee5a9ed3e727dc40537fb08d33e3020bd8455965c39a99d5 SHA512 282f7ebf3b56e493b89c131ffc1ff153b48cb81513ab7451e1de8d6161e31a8fe528f9da436b0a7a0a260737dba6b383e1634ad3e6239a0a4692dc212e350f14
+MISC metadata.xml 1292 BLAKE2B 4815be9e58a765c46e6561b0e92cef0fddc8b29c368a1a10f3a320e59bcbd41e3b26a9274d0f41a4ffd3df9a8a8642eacc8fee940c6311728dd5af1a14390e91 SHA512 a8c28e9efc5f866c2fe9caea2f023e4644733a956407f3197b9d16e4883feffb26caa320904950fe9ab1d016081cf523b9b5157717164a48689a698d6d80d85d
diff --git a/app-shells/ksh/metadata.xml b/app-shells/ksh/metadata.xml
index c81eecc0500c..9a8471f4350b 100644
--- a/app-shells/ksh/metadata.xml
+++ b/app-shells/ksh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 5ef9cc04f7c3..38c68663b2f7 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -2,4 +2,4 @@ DIST loksh-6.8.1.tar.xz 210424 BLAKE2B e02c51bbf3679c1c81ba66207576758f035bd2b66
 DIST loksh-6.8.tar.xz 210440 BLAKE2B 438181e3fa5b95bc15d5cd2d5a42d09d595aefa45b8598532835f5df2464c40c6ebcab8febeee55f20272cbe3acc57f02d1408bf726cc9fc3435b7b35fae6e4a SHA512 bc862c4aa0796b0fde14c5c3067fc48c6325741bf7e62dcd99faa2ed0ddb80a8fcce79819ff599395f88ee8e5958ce4a451f777d0105fd8ea0ec513977d4e715
 EBUILD loksh-6.8.1.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
 EBUILD loksh-6.8.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
-MISC metadata.xml 451 BLAKE2B 358525d8923486354e84e6c007b7507c5b4461645bb8f457ac0408b66118ffe4649dc4d5d3397cabc5657a18cb98f96989dbe491bdd48346d56f3306e004f4bd SHA512 a2f6689a29cdb417e4f050887b82eca1c7546b0aa708e3496974a78129c0755a203a402023d627af989eff9d513eb130013d7754a81d3695e50ccb496b72583b
+MISC metadata.xml 481 BLAKE2B 9289b553af5196f8fa84d50e9868108b8aec4fd0c5cf14e9479a55dc0e98c1e77468226d6d505f4a5ee56b440f2ebd3607f10c21abb9c52ce1b88ec8b91b597f SHA512 568514074f3fb450133991d30e354922721c3a4063e522d7805b8b8ba0184da7688fdbf0c0c7a6c2d32273d7b11c4f62aa45141b2516017419748d1b1bb10ad1
diff --git a/app-shells/loksh/metadata.xml b/app-shells/loksh/metadata.xml
index 6947fed68e5f..733c84cd3105 100644
--- a/app-shells/loksh/metadata.xml
+++ b/app-shells/loksh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 684f37660c6a..0646a2562ffe 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -63,4 +63,4 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.5.3-r1.ebuild 2166 BLAKE2B 10190f9501ccd89ccb0d3e982cce820aff107a6812f0edfad6a9dcdd62efcbd7fa08d1d46dada41ac12218540cf2806f8cd3d8c3a3a8bee84149f6f0afb1dc6a SHA512 8282d58d80feab34defd073b9c4386b9961335cf1394ad5ad6931b7e722172fa59f86e0349501b6b14aeabb5b5d5889027c6db9b0f5a54ef40d797b106a1e309
-MISC metadata.xml 875 BLAKE2B 498461adf43062d8797a72b5fb79226c786068b23cc7d56943820719a12a74b9d565f36b3510769108eb742ffd39e83ba2668413af4dde5c19375310e13f8fa6 SHA512 c54a73342f880cba784eaab6989b2415a19e0856a9f1ec6f5cacb2ca1a9fb9c271c5d031891b7bd35d7e4b0f9f7bcff3ed9828c8f4abd0ac012bcb4a90b718a1
+MISC metadata.xml 905 BLAKE2B dc23375a7d313454fbaf67f8b5312fe0acd5b9acbc5ed597fcb0027ea420519ef230b245eed61dbdc3c8779a5f87af18be5223c7cf9dcaa0e9619facad93442f SHA512 cc6209e5eb422500ff6a2d50c43424f1da0fb628929aa2093ec5ee844ef3d0afc5f234a4ce95c5edb5bf89d9ad60f624663d4d7e70f32a8b07ae02cb6cb0809a
diff --git a/app-shells/mcfly/metadata.xml b/app-shells/mcfly/metadata.xml
index 0c99d19209f3..14ea22b24eab 100644
--- a/app-shells/mcfly/metadata.xml
+++ b/app-shells/mcfly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-shells/metadata.xml b/app-shells/metadata.xml
index f70a0494ef8d..1428a85c0276 100644
--- a/app-shells/metadata.xml
+++ b/app-shells/metadata.xml
@@ -29,4 +29,3 @@
 		rozszerzenia.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index feb6df249e87..1c8a4048349a 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,4 +1,4 @@
 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
 EBUILD mksh-59c.ebuild 1670 BLAKE2B 08685aa312d079dbe4ecdd949cba7ee2d6827b51a7f18228b5b2884abce29326414c40ad3149e09083b8a7007f5cd180dfe494745c84f264cec8bebf2f73c901 SHA512 3096facaedafef124771d462d1033adbdc06e31f2c32201c5701bf69e01ecfa31b1b92c1ee0de8438543cb86f16b4bf1dc2b36223adb24009ed583f7b07c976c
 EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
-MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
+MISC metadata.xml 595 BLAKE2B be131f5babf31d1c99d0e744fdaea55fe9e3eddaf23464de024bf103b3064b53786c30cd07d95ad284df2bcbf62cec4c2df6c8a9b0de0026c2745b4bce30c04c SHA512 e60a0606ef2ecbddc1c4a0f4180714ae75b24ca9cfc011b017502938e74cb0d8bb6a69759e8ce727b06c9d863bccb2ca6ddfb19bb7551b3c74c6912e7847d862
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
index c22c0afc77d8..bf00de669117 100644
--- a/app-shells/mksh/metadata.xml
+++ b/app-shells/mksh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index e79339e7a8eb..ad6c602c29fc 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,3 +1,6 @@
+AUX pdsh-2.34-slibtool.patch 804 BLAKE2B 8a6f03999b8683f7ac92f1e097b5e5fda829037df91f216c77294d9b02e7aae6f8d5da01a8c12b9f4b7547574f77b21d8a34f1bbcf51735819fd9ddd29744a77 SHA512 968570e1cb5a68d92579b359c350c01c5c7c2dc8072b4aff98c9c5e3442a5fcd517f999ebc0a8fbe8342b04a001239a2882104daf06734eca98af1b98dfa0c53
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
+DIST pdsh-2.34.tar.gz 215708 BLAKE2B dba626c66b9a17536fc02d8482b776d539ee680354326c821dc916735d1fc115226fcf22868407830245067cf45ddf9c997cd8c382b0dde0168d9ed6cb4fcc4d SHA512 2d4e090d97f6bad97ee1dbdf2ee29e4d9603edfd5c92a6935131ef7f7bbff797cceb8ad3a72e3d5995d3d5302eac985d129f4968e3fa6744785a3df2d0fda33c
 EBUILD pdsh-2.26-r1.ebuild 1311 BLAKE2B c6267cef6c7ec26205ba3994002b84f9171a28d37f2baacf373ed65f3379d258b8689081c5387e111a3713b92ea60e7faad59d5014f41c1edcd462adc5074748 SHA512 308235f52db4448a3f5d541c6c11c9542e9add603672ced12280e1583382c7eeb71967ea66aee053dab6f35fa710182035727ebf14397ed5d240845d7702b03a
-MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
+EBUILD pdsh-2.34.ebuild 1401 BLAKE2B 8acd3731a7be77a52a0321344b5c1d5113e162dd9a4664f468aa4d55cf70b41f93690712416517e1786b86bc9980206fad148e4de32eeb00015e21d594d021de SHA512 562aae7cc58c799b888388937ee897c6cacf7a6587175b9ec124d1acc0a00e17124b21fa272e6e6b99e8dae1367df466368844ca1bc5c57da69603959cf522ae
+MISC metadata.xml 1254 BLAKE2B 442ec3c5c42dfc29b8cd3d8442b689795002f4743f3ccb3e3effa5312d88f394ea01ff213ca139f600339f7c1a23f59b4b5a07edc616fee90ee545041ef1ab98 SHA512 7d2704ab95da12f97aa683762afe80031e37d95940861aab5a920fb7d576677b246382c20bb9a4838b8da053689479e2661bda318bce8c0511b3c765c494e136
diff --git a/app-shells/pdsh/files/pdsh-2.34-slibtool.patch b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
new file mode 100644
index 000000000000..1be0485b9c6a
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
@@ -0,0 +1,20 @@
+https://github.com/chaos/pdsh/pull/130
+https://bugs.gentoo.org/775593
+From 258de95760a46c6d4c84e904823425aa1a180211 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 13:25:52 -0700
+Subject: [PATCH] build: Use LDADD instead of LDFLAGS for libcommon.la.
+--- a/src/pdsh/Makefile.am
++++ b/src/pdsh/Makefile.am
+@@ -16,9 +16,9 @@ else
+ MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS) -ldl
+ endif
+ 
+-pdsh_LDADD =               $(READLINE_LIBS)
+-pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
++pdsh_LDADD =               $(READLINE_LIBS) \
+                            $(top_builddir)/src/common/libcommon.la
++pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS)
+ 
+ pdsh_inst_LDADD =          $(pdsh_LDADD)
+ pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)
diff --git a/app-shells/pdsh/metadata.xml b/app-shells/pdsh/metadata.xml
index 2c51800069f5..46fe03a5e32b 100644
--- a/app-shells/pdsh/metadata.xml
+++ b/app-shells/pdsh/metadata.xml
@@ -24,6 +24,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">chaos/pdsh</remote-id>
 		<remote-id type="sourceforge">pdsh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/pdsh/pdsh-2.34.ebuild b/app-shells/pdsh/pdsh-2.34.ebuild
new file mode 100644
index 000000000000..6fd3cd631503
--- /dev/null
+++ b/app-shells/pdsh/pdsh-2.34.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="A high-performance, parallel remote shell utility"
+HOMEPAGE="https://github.com/chaos/pdsh"
+SRC_URI="https://github.com/chaos/pdsh/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt readline rsh test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	crypt? ( net-misc/openssh )
+	rsh? ( net-misc/netkit-rsh )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.34-slibtool.patch"
+)
+
+pkg_setup() {
+	PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
+	MODULE_CONFIG=""
+
+	local m
+	local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
+
+	for m in ${PDSH_MODULE_LIST}; do
+		if [[ "${valid_modules}" == *:${m}:* ]]; then
+			MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
+		fi
+	done
+
+	elog "Building ${PF} with the following modules:"
+	elog "  ${PDSH_MODULE_LIST}"
+	elog "This list can be changed in /etc/portage/make.conf by setting"
+	elog "PDSH_MODULE_LIST=\"module1 module2...\""
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf ${MODULE_CONFIG} \
+		--with-machines \
+		--enable-shared \
+		--disable-static \
+		$(use_with crypt ssh) \
+		$(use_with rsh) \
+		$(use_with readline)
+}
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index a6df3c97e729..d0b4918157d4 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -21,4 +21,4 @@ DIST peco-0.5.7.tar.gz 79584 BLAKE2B 2e3119dd7ce344ce1534bf5fc17668eaa6e8fa9b0ff
 DIST peco-0.5.8.tar.gz 79589 BLAKE2B 04ae33b276686fb227de348a0ad4843a9ef15a3ef3ec051f82cf5a2955099a7092c4eb598cb718eac0092799f552066a32d4ca7773c0d1cf9a46b08ae115593a SHA512 7ab831a55eecd2091637da6e9044f2dce188b29748d5ccf2ff81ceff49c5013dd7cba52137ada3ad9aa779955197f7963cb7261f0d9551ddd13c5a0f5c8f835b
 EBUILD peco-0.5.7.ebuild 1732 BLAKE2B 66d0d1f56b55ec88556f561c72afb7b004289d8eac74ad8af82e31610a853255b540c8b55bd670d61141326e901bcb41cddfbe7d4f2b7b02b4dfa2bc50f663f7 SHA512 046d297d018816263e4968ad010a63a90eff3b1a4a297992054853ba06b8199a09791a4b8ba13b782e35bb7cf82d2f3ad79a5bde9c80ca3eecc59fd7e3541e94
 EBUILD peco-0.5.8.ebuild 1738 BLAKE2B 1a739f0284b85ee7b67810abb8f0b315613212f7e47f0ec5226f8f35c14e46ce1f1d9f7db92c00e4c805b41783bfdafba171a8166d9e2a346b098d2233f06126 SHA512 d484805b816b6f3efb8325c8acf8224068625197dd08679608822df3ab6fcadccc84580dae2be18e67e90abdb2ee0a9264c163ff3777f67c76cfe854f8970aea
-MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
+MISC metadata.xml 696 BLAKE2B 0e9425a8bf226622bd59036a08ddb2f7a534da2d219b0d1c4c6128e72b63e1ce1dd9d0632d2adf17b7f42bc9fcb4f68498b438af9b4750a1b85cf5b5b16f63a9 SHA512 244adbe085290f237f2d33cb4939c2754d6881328524220a8f23025e20c5f76966b5dba6000719d71fc6226441e607db2eb3cc5a0572ca261818d7a0b9739992
diff --git a/app-shells/peco/metadata.xml b/app-shells/peco/metadata.xml
index e54c22ca1bc9..92a2d2b4e0df 100644
--- a/app-shells/peco/metadata.xml
+++ b/app-shells/peco/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 64b684fb6ff4..7cdb20bb9025 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -2,4 +2,4 @@ DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b
 DIST push-3.4.tar.gz 2839 BLAKE2B cc7dcdb0208b1eb9d36963acbbc1e0c852c4164d5ba2a35bd52848338bab7f66073c9c780c82e28b3f1bdd55d81f26f5281694ba76214fd7631f946e0fdc199c SHA512 aa118f42210b40d790c0b274045ff45c2067cf894731228f5065eb44a723fd813549204797c365329f409e36f564ec22f6d956341b1f2b62964b918e76991344
 EBUILD push-2.0-r1.ebuild 620 BLAKE2B 89f4886c11fde3b8517b3074762106c064a5845c007531d443c03d856ac4ece3c7c3c75919a4b102b3a3e31315532f8b42968973ea637762fac72b82e3d8a243 SHA512 ded5e16ddb090c0a7755dd60b349ae29f1f0c8ac43547a16f4885d47396d80f94a345bbb52ed21d5a6e11784b66bcc7ba9ac8a69221bf7c79e95dfce6cf6fb4e
 EBUILD push-3.4.ebuild 637 BLAKE2B 6f07c0760ba128436384b080bbc129a204f7d7a20478dc6dd3aeaedbef84ccfbf1115ab6aac98eedc98c90f96925e2b449164164af922b5ecb62f321b59c0a1c SHA512 a0b46d08a44eefe76b82297e2335d42d558c07e57b4e71763c66d76178ea3ce5765a6c8f03063bd786f2ec925600a52d3aee4992a09326a38ec992c0112703bf
-MISC metadata.xml 723 BLAKE2B cc1b8c4b3b106cc5ec9b75ad644f03cf125e6e469e53cc3f9149ccbd543688c02718e70b8d7c93994ce16c60919f78f1c6ef41b805d7bae20e5a97fb350434e2 SHA512 5de3e41ccb9914139fb9ebc209fc3e840465ffb9965ce6e2d5bb19e5456e016d2fc2c016e0e4a378a3a679391f37cd501c8e090c68de87653a54821495b72b13
+MISC metadata.xml 737 BLAKE2B b64b1dae15d9407cdb648b3f994f15f8f408291d7ac95d396054b6c134705440572564437df1f01250ae8c96f3bfbcd0588df7fc7b844d4ec66868b7cf8c5e17 SHA512 e799dcca6af8e1fd5b2b6f79c3bcebfc0d413205428070d4dd0f712aacf5b8e54b1f5b1e84bdc4480cc186df1d8223e70300f361c018f01bc8d0e408bb97145b
diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
index b0c79a53845a..537b5d65d169 100644
--- a/app-shells/push/metadata.xml
+++ b/app-shells/push/metadata.xml
@@ -5,7 +5,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
     <description>Upstream developer, CC on bugs, do not copy ebuilds
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index ad968a3f2099..8c5b084879ac 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
 EBUILD quoter-4.2.ebuild 739 BLAKE2B 0e1cbda6e96a1db548442639b62bb230979d75897905ffb1b6f3907decc39a4212a25475d060f2ba73b14fd701976894d72294a6a9876d0f4829edb89a93bbfe SHA512 bc18ab71e72a702cddc099f17a96d21b9c235e3690b1c80d59b8d1e01349425b2c6cd4bb4d4ade4ac5f96006a4e6d37570f1234dc849df6ec856d2dd93c35713
-MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
+MISC metadata.xml 714 BLAKE2B 9d6a9477d138f59c78f61104957d666f0b31f13c27ace4fc0cddaeb4e4845e612a4341edd65fd4ed898b4d694eaf9e9aae11ad70ad641df4ead3a9757aad0fb1 SHA512 330770668bc41847ec6605cade82a2170b897d3de2a3c970a9b30b77fe9a551b20e52cde1181de2160b396c723f5191d93a508f685fade4aa522658ee9fe2178
diff --git a/app-shells/quoter/metadata.xml b/app-shells/quoter/metadata.xml
index 3a2246e9e6b4..25103a0d3a71 100644
--- a/app-shells/quoter/metadata.xml
+++ b/app-shells/quoter/metadata.xml
@@ -5,7 +5,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
     <description>Upstream developer, CC on bugs, do not copy ebuilds
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 5fa87a16a70b..a7626a67d5be 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -2,4 +2,4 @@ DIST thefuck-3.28.tar.gz 1369230 BLAKE2B 0825ead15eae174b08bc2608ff64e1cd5993484
 DIST thefuck-3.30.tar.gz 1383210 BLAKE2B 9d6a7ba2712b5cea0146315f5023a104667531928ade93c4aee1f210f06755efb3488b82ce2bc63adf9ce41aec91528bbb6ee4212adb5eca2af53cacf4510a67 SHA512 99b270d0aa535673c09e7e932212af4ded5639fcf30ad0aeedc89a54e94c0a072a37883b1a1a56301efb82ea1c72cf53d4dacf2e83edcafcf4fbaa55ecd35f3a
 EBUILD thefuck-3.28.ebuild 881 BLAKE2B be5fa9b13c88705a2a891833a736320775b116561a9ef21b51fe16e680f62ea2d712313ac53f5bbf128394bf854f1de3e24bd30fd458ced298da56ecec2664c8 SHA512 40a669f77c65cf6b38caf57f21b3fc90722922c36e2a4d757e571362cfb2029d2b68fd6f61cdebd4adcbfe67e64fc1fa204ed60bf01795264cc968a8283285f0
 EBUILD thefuck-3.30.ebuild 921 BLAKE2B 248466188a57067442739aedf4c0bf588a31b7d2f1438976ddea4d04df1160a6b5e3e709970d5e6dac551c6900127e1b6d4325da52681dd7a4eec997d306b85d SHA512 9a6dc47b576d5768a5dc03c547043476fc7305a4c7fe8e7e50322e82aa3ef9fbe57a344979b904dae7f5d9f13075f0fde1bf1c878128f7f166c18948ebf19597
-MISC metadata.xml 462 BLAKE2B 556cc89cbf5a5a484403454b4e56741a76fc6b0418450be9a12079e8cbef2b5f092fba6ec4fdfa811d908224ebec2e47654457f5640151e2c12c965ff8b5b0ac SHA512 fa2c3bedf6576b45dee2dfd047ca4c010b28a9cb61bdd92b4f1ca2911b2bc18a7bb8e4719c3c5b545cc8e6bbd6614c43f79148ef0ad2b0e31db06de5687c6d04
+MISC metadata.xml 492 BLAKE2B 962573e3fe0aacdc454408cea5d906e749644fcb07cf7e78a271004b987051c3ba16618fcdf54ab6456751a03d9eb9fcadb13c7e7f7c9f776e17b08aa40d5603 SHA512 9b483856100c830f71ebfa2a8873c44e6c3215c420a815ba005a86616ea3d644484470e73d47ec28e5955bea65a3d92bfe454531fd8e1478e2c01075338ebf3b
diff --git a/app-shells/thefuck/metadata.xml b/app-shells/thefuck/metadata.xml
index 0af76b219fa4..798e8b914fba 100644
--- a/app-shells/thefuck/metadata.xml
+++ b/app-shells/thefuck/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>me@aphypnise.eu</email>
 		<name>Andrew Attali</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index c145f24012c7..8481c80e0e9d 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
 DIST zsh-completions-0.32.0.tar.gz 273885 BLAKE2B 73400a13543f63c45fd32d78752f0294e3eaef9a63d41700aa004e445f123673c8bd8cba7aa3c0969fee0e188ea019b3f92cae2a6de341bf9b2f0f5842792785 SHA512 f1ef5dab3343675a9d82f6df0db4f541196d1904386becc94753b69a4515229ddcc133fe491c33e4a736ea0789c667f50306e60fbe5e61b97d0b3fd4946bf69a
-EBUILD zsh-completions-0.31.0.ebuild 800 BLAKE2B 8cd0c838f544a7dff4cd7e5ab1c38308a25cbedfe141bcbadd9909e6af260c739fe1a961e265b8a90851be304077f38792c0043e15d732fdcf16351f0da86131 SHA512 565c3633835f5fa660f1cf25129455b1909e772faf3357b0eac5150d81f574b1caeb2d7a7c0bc4b3abe180a70feba08f0f5444d90dd3a01c05a22141a0a7f792
-EBUILD zsh-completions-0.32.0.ebuild 800 BLAKE2B 1b9e97212d7828f6a779d42031176db38a28ac690f7f7a48abdbf3e851e1a8f02f9609c9eb3e0e972525e55b75648587582388ef4bf524f8f9ef972f92f6652e SHA512 d3a34343f518b40ffd6eb89c1df46dc803fe69f62e4f8f147155784753ca3b7aabae2d17c80b1276fa3f50d006bbb8091c44c9c4606b8ddf4cfe70e3e946c4a8
-EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
+EBUILD zsh-completions-0.31.0.ebuild 811 BLAKE2B a9f2789602a387e450ee62ea911423b4356fed1a3d3e31e032d7595739185d8b2bdbfb29b039fdbdf6770c1868c18262c2fd87a5b09b1a144cdff00af94bbd5e SHA512 f3a1388dc1ec14f79d1e16a3cd9dab154a4e7637f94bc3eb1b2f395ebebb8c13c95f31a34cdcccf97c491e3b7779c7986dcc7943a240495ac64d7ffd57e46812
+EBUILD zsh-completions-0.32.0.ebuild 810 BLAKE2B 69ecc2f0a92833ae988f788f5f2c39722523bfb29f2baf22500c86f0b343cac4a84d0d1c877dbe1a7549e60b6e9e12905b86a5124fe0322f90d199388a4c9a30 SHA512 b3c4cd6637f0aba3e385059394ceb9bb53703b1df221b9ccf27064768ec124084ecb64194f9aadd7312fd0cc2b9c422a9f5478442a2e40476ed349d81070516d
+EBUILD zsh-completions-9999.ebuild 812 BLAKE2B 018adb830906a95aee0971fa2ff56b0d3d0be3ea3c067154ca80d57917546d0a9e202b7620d44be0b63561a1372874dd264dcd2c4fe04d5d854af766e040f847 SHA512 406f8b5a42e9dde02754c31e0d9d5ea9c9e0a13f59bf70112b22302e82b0b999699191fc3dbfe253dac0858000cc60b8e00e502d3dd2ea0b1aa9bffc896f1190
 MISC metadata.xml 287 BLAKE2B 4fc6f5facc5b1a0002e5910677c2a10bc05bad985b664bf1b0369c31803594b2360ee4b74c05ed08115b2c5c7f696fd5ef1fcca60df9744564b6051d59a2c142 SHA512 801d3f30ce96bb8acd812bb4e34f447717c886b05f6dc328dc375ed896f419a15f964f5a808682a9977cb0c12ead6a1cd78657f3f71e18d4a57c6616865558b1
diff --git a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
index 062d59b04010..5ff3f6657faa 100644
--- a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
index 39e4da5bebe5..3a5bb0cd1a39 100644
--- a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-9999.ebuild b/app-shells/zsh-completions/zsh-completions-9999.ebuild
index 3ba0582d57d7..76ce34750ad6 100644
--- a/app-shells/zsh-completions/zsh-completions-9999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index 28cf466607a8..ea7d3761bbe7 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1,5 +1,3 @@
-DIST zsh-syntax-highlighting-0.7.0_beta1.tar.gz 130063 BLAKE2B cf0f6319af22b47cb8a280de682a69b0479dc59033be5ce84840507b77dd2df0441b8d260af55bccb303c87d7f5a7e4cc6db9f46860aee040b4b8115c76f5e07 SHA512 1692015aad58103c752e2dd4161ea87f26aaa09d34eb2faec1f651fea1d9bfad29226455468017160a5393a87c1f7ed0514b09b0802b1810377beef72bfa6c87
 DIST zsh-syntax-highlighting-0.7.1.tar.gz 133554 BLAKE2B cd55a0ad69670b25edc4bfa78ad76d1e2ef501deeca3e93adbef0aca305896722b4906d7717be3ad61bc0cf6b6496e217626406e5ff4168ece4b75bffd94bbf0 SHA512 e7e86b88cdac9b9ed5f973823ba8efff99dd720b9ed929f765f9f9266b9d6e147274f5957ceb630d51a660e396fc22e97f10cfbc5cdde941b907f3773bb1ea2b
-EBUILD zsh-syntax-highlighting-0.7.0_beta1.ebuild 999 BLAKE2B 5912b92c1b31242b364cea1fcb91b11aafa8753be046ceb2291bb10735f35a63470f6bc49b920375db3528b696c6a8cdd6bc5450bfb44615d0ad797034537d4c SHA512 fd1b4b6083ee119afd5104a91995e4227e393bd399989751e996435994d42299194ebbcac500bae6dfe13c6ca4c3f36586c4b2dc1361e16c402f722c7a123a55
-EBUILD zsh-syntax-highlighting-0.7.1.ebuild 1001 BLAKE2B c57f7c1481dfddccf9757faf2956563382bd43b32faceb7edaa47feb228c331064a664c4177e9cfac0066cbecef42b5b43ffc7fd9bdd7bb9d0ad4a30e4c1462b SHA512 37a1966be8434416fbd1a3a992a0cc3b0dc1a49293763b63a9f009060372208275f44c70304ecf707f002248bb5a41541680089a782a92f86506111074a9aace
+EBUILD zsh-syntax-highlighting-0.7.1.ebuild 999 BLAKE2B 2694a1771ca62535592a35f8c35f0e115991e2e94d90f28ed9a1497831b632b10495163e45646a015b6ca79b859108820391164895c0d0b6bd37a3be1df765e8 SHA512 981657f7a3c53a30f39e221167a10467682826252a2da22e6ea0c63e2f2709c170e5db6bed20754f2459430b4536886100a30a4e83bc8bd3a5b85521b1ad5848
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
deleted file mode 100644
index 0ba4e019c3f3..000000000000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-if [[ -z ${PV%%*9999} ]]; then
-	EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
-	inherit git-r3
-else
-	MY_PV=$(ver_rs 3 -)
-	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Fish shell like syntax highlighting for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-shells/zsh"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
-at the end of your ~/.zshrc"
-
-src_prepare() {
-	sed -i -e 's/COPYING.md//' Makefile || die
-	default
-}
-
-src_install() {
-	emake \
-		SHARE_DIR="${ED}/usr/share/zsh/site-functions" \
-		DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		install
-	readme.gentoo_create_doc
-}
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
index 8ca8ffb2e2b8..7d6ef4a088be 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_PV=$(ver_rs 3 -)
 	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ad30e59eacbb..95cc87b64971 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 93bbc8722197..825fd2fc8194 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -2,4 +2,4 @@ AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
 EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B a2a34aaf741a67f871f78d6b8a8ca72abf21fd6e9ccfd0fc40e8fbf622b99e60f0400e960a8ebfc87ba04544c14b6db4087411dccedc9f8e0575b46878ea9684 SHA512 53a818bae5c6935bb085a15a8f5125928ef07bd493e223e40f645aef320e01998501a14b14f8cdb85d0bae8748ff468efe8bd9e0d31bf32cbbffceb0d4d27d4b
-MISC metadata.xml 343 BLAKE2B a255d4f9a7079612cf94d69b3136bf3dc5d1ac638629e02430c96512b039fbaa0d1d05a216f7181c7269a1701c096292e47251769581d1f4dc5bb1559c76501a SHA512 6a09982bb72f873e6fcfc90d8dcb8db7b06c11b43633793303f511b5bdc86f83a2b2ab560f6ce1e4b62e334c16cce96fd9b0ad983caee6381612a4b4102ccc09
+MISC metadata.xml 342 BLAKE2B 18f1014abb7ea6d52728e80c15d3e6e3f7cd554777774cb5060e5305643f5bdb1471bdb8a20d171bd88e44556dc00d6907e64d650571faa7eebc68267714a23e SHA512 420c79c983e7b4b69118228cf6cb62fe69c2fc6ff4de2d024a31663b8646fb809cef3b1cb7510346536eb7cd3447dac156d45b923daf23dfd853f54a91f4b30e
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index 8ee341cec0e5..a5fb11f5d0cd 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 83b46c18dbad..12853043f137 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -4,4 +4,4 @@ DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d239854
 EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
 EBUILD asciidoc-9.0.4.ebuild 2339 BLAKE2B d70827665f449472bb892754a1e591b3cf30706534b92998dae33869bd5af8032ae8ae74719e95d8462aa100efcc579c07072e3f4d471fa6a7b5e7268de8bd46 SHA512 483afdbb7ff4e0691e423f593d2b2b9c0fe8cafa8efcd0fda5a5083981efafcdb62f58a668db85269673f36b1400e5c287c7bc4f11bbe66c2753694101ece09f
 EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
-MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
+MISC metadata.xml 465 BLAKE2B 7add2c9dc126e1538251b0ba0001a624d7ddb9406adc5151d8388d7a8549e2968fc5a02219f79e63ac1577c4ee55cda9b4ebdfa138eb9d6142375943d8da0e39 SHA512 986aa9ed2b95d5d5a61bfea9aecd3c4371ba76a1a6e9cfe8833b7cdef449527dcde14879565f0302d55533501e082c2f1d4734004218299061bcd87b7adbc8a7
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 00433b60b17c..cde4f44f98ae 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcec@gmx.de</email>
 		<name>Marc Joliet</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index b5fc0941cc0e..d28605c37c63 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,6 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 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
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8.ebuild 2744 BLAKE2B 3ad1277dc1f15e7df451156bcee28e63911478f26ad24e759e64e50cfdff6ae6fd6eaee858d12b237b6fec9e679ecebcf2360ffe57e89d06e3d47b4a6811e257 SHA512 70787a237d059fd42162756902785d5a61d8d0a168fe490d02e0e50f24a3019e2161fa63a6f6c4d2e6d03e1a9c85d1eaa9140deaa7a756bc4a89b1ac4541d399
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD aspell-0.60.8-r1.ebuild 2792 BLAKE2B 9052ec2d7c4e0ff269886b95c4dc81628eae8d508caea503b1bb654fd0e770d09bd80a3612af0e8c14157fc1dc14bf0de318b9bcc2ce78c76670da148ea11389 SHA512 318f5965672715c6bde5cbcb72591711240a97781152e94837d96b633a223bf45b024e83bc0c2d0cd9630cf4c2d1d9a33b952efbe5960f7eb29289f9d66d14b3
+EBUILD aspell-0.60.8.ebuild 2751 BLAKE2B 0d8a9e5e2b9ee9d9ff1a6afbc6762972822d3660d8a7655eda144dcff94a19e0007f7924d8db44125a800b78db3f80c64144cf7d7ea44045509109778a6440f7 SHA512 3909f4147e56d8a1a241648be5f40890a390cda116bdaec66f57673deeb84ee6492c05cfc237c4c1da906558f812fe61239c219a2e8370ada459b5504ab34d3c
+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
new file mode 100644
index 000000000000..70e130e54c32
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index fd9ccc335282..6207c44dc5a8 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -10,7 +10,7 @@ MY_P="${P/_/-}"
 DESCRIPTION="A spell checker replacement for ispell"
 HOMEPAGE="http://aspell.net/"
 if [[ "${PV}" = *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
+	SRC_URI="https://alpha.gnu.org/gnu/aspell/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
 fi
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index 7a38bb900964..3e3880cf1051 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,5 +1,8 @@
 <?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>
 </pkgmetadata>
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 03e379222948..e9d76628818f 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,3 @@
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
 EBUILD bibletime-3.0.ebuild 1466 BLAKE2B 913496634dcfe8e4fa3e3a5bd856d65255ccfed1dda8fbb225bee7ad00cb22f429ba2135cf129d7eaa209dd1910cc316348dd29a7a93162dfc247c916f5d7ef9 SHA512 226d64927296a001d9c8d620c6155daea681c00fd788622f9052d8baad1c3c22b8d2238e93319cbac7c94b5bb7018538f3e01fb5bcac33c294e9a1cd10877b9c
-MISC metadata.xml 656 BLAKE2B 66daf991e55a977a67ff159c7d2bd780308bd580572b8eef8fd5a456cc0932e837c10b175cae7288b0c5097434820b9eb9bdd2b93124f81fe6441e913823674c SHA512 7214abfb4ded4f531e84a2895ece417bb3fe36249fb59ec1d53d231d49d40119c66438931c0cdae79fb4859a70874c3bb03670d554c86f221223530eb12f0bc0
+MISC metadata.xml 656 BLAKE2B 2402db72930eebc4448e4f0e48ae2e0494a20b9f52ba82a4bf61ea446aa476c917ce0af0229bb3c935ee5648aa69ea82943dd3ef98649aa6ae58af85f475eb53 SHA512 4e72b972bdbbb02fd7297414ba11fcf1680f640a05a4d47e45a4765441923f5c3fea4c2e5c758355fec60b809d94897151a30a8c09675c9466201db62940bf83
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index c397d7aaccbf..d5f2dfe886c9 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index a1e029c748fa..dc55518b29ad 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,4 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
 EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
 EBUILD cherrytree-9999.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
-MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
+MISC metadata.xml 474 BLAKE2B a271f5a9c93dffce9f0ae9a3f977d3262707fce091f3b74eb40ed334546432cee1d6eddb0f85ede0c9299dbb3b8fd4d922215736380998df83f3eef48461c07a SHA512 95a2ed35beb4f1cc8db913a07f3b7a9ae4e4e601e118fa657cd151b4391400ee8db465109600fae8afbdd91e4ab0383c6deaa40ddbce6c96f8e412639690ee8c
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 92aea49ad5a3..9b740e32b848 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index a5a20ee774dc..a019b1a5a011 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,4 +1,4 @@
 AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
 EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
-MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
+MISC metadata.xml 503 BLAKE2B d319f79c36b1fa299ba12b92c2e0a6e240d445108b84c5b8af68903d6ef59f7c7676ce10032924c201e4fd8b9256ee47c38dab6f108c6ea33e1f709a7ebb3e1d SHA512 39ad79bbbae29227109bfe2c8dd5431e7ac76ef8d71a8105ad6adfa4fe80c04b42e7183907443cbdcb4ca039a362f90b6d627f3fb46a3af7c6e06c04f0ec138c
diff --git a/app-text/cmark/metadata.xml b/app-text/cmark/metadata.xml
index 8da187d6f1c1..d8780cb2ed52 100644
--- a/app-text/cmark/metadata.xml
+++ b/app-text/cmark/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 428458f9b5c8..977ac0b3a780 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -7,4 +7,4 @@ DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c0
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
 EBUILD dblatex-0.3.11-r1.ebuild 1829 BLAKE2B 5818b7ae2576666fb7fe0686b692a68406ce32fdddef81460d767de649827d354d261d7212653b92f00a92a8a79f65a95e4e4ea6daffb27e1a973a95cd4319f8 SHA512 dc481ff1759bddca0861e3be149c23bae39a5438f343b098d65dc1237a6870b64ebee4febcaa69dc55710ec4b7cca54f6d4e2c0b85312ca25ba9dbe69ff1b0af
 EBUILD dblatex-0.3.12.ebuild 1741 BLAKE2B b500a50c81ebf3bd845832d4af60162a3e8ed49dff27dbf61c409c937798e50be131aaaccbb21a720a3bb8859cdb87063a85a146347b623a5bb0628d753b4886 SHA512 fb5baccc7a2330837ad5f776ec9040275a6b8da99dd083a79d1c60d3125bb47d07a847af76cc077bf9c91edea54372042b65162c42fe6ba3f99de5b64fbde54e
-MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
+MISC metadata.xml 896 BLAKE2B c01d462757e3af55ccbca34bf8aa601155be93586ab6da5028b9deaf4c71fad74965a1da586a89daddee0e3037ecfac8a59f497cb796fdef45bbf2eb3f6f044e SHA512 79a4f0bd55ea9c240e0490c37db08a365b17ae1837c50d29f5c611a09c3ed2594d8f7dd0d20391b45f740ec69bd36eb99a858aaf921adcaabea97ee6a7743d06
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 609cf12fd1ec..08fd7881b0f1 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>zoltan@sinustrom.info</email>
         <name>Zoltan Puskas</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index ffc71e9345b8..fef5e1cfd344 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,6 +1,4 @@
 AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e3aebe3459d837597c2f4f37ab7608ee2819e284992f542f5a0bc5b699c671189e650810289adc25daa8393bd SHA512 ab317f3de37697a098dc9c50ef741417772ab66434a41b89381bf123b9e980263a1b6b488f7f1b1bfbe25a178b2d7acc793067e8eb26e34300e639765af818bc
-DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
 DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
-EBUILD diction-1.13.ebuild 561 BLAKE2B 6fe02769be4aa1e27ccec9d7246a5fa77ad7bb3e31c26e95b9eaf29edbc79019c7b0ffcae8cbc092226543669a3c859280cb338855b9c0956ee68fe0c55b79f4 SHA512 2625e94dd8e2ad3ec9cd2ec272123517bd3dbf332285e3729cdc59ff909a2ff701e7a977e78ba98000bc81aa6dec4e899b73ee0d8175704853824456fbe15023
 EBUILD diction-1.14.ebuild 534 BLAKE2B 856fc77f1a7522509164b97e65fe1787265298f2fa52738cf4389f54936a44baba57b00062028d5de7792d6c8ecd5b9623880ef4000489ee9c653e69cab5a6d8 SHA512 d2209492c2a6ee191504bae3d2c98f4b1a2d3c8727eb9984e92e7361940d7c588538b06af7a0a3bf5a2380f9043f828c0ad04da2caf874a6025f9c1b251992e4
 MISC metadata.xml 709 BLAKE2B 648f71ffcfa9459107ed2ebc967133cc8a6da94f74a583e9fac11eff1f436842d2d0e6be116670d7e5e70d7c5b98b0a5e326d48d59ba15c019d1546beb4900b5 SHA512 1fea867686b1d236a7f1122879a7dca81b6dcd72de744ca19fb1189442a9373280ac3a5b9aa4b5266c791b9c314431b25a115a50dbf5956b9cc4ce3516400d54
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
deleted file mode 100644
index 2bd1c55453b6..000000000000
--- a/app-text/diction/diction-1.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Diction and style checkers for english and german texts"
-HOMEPAGE="https://www.gnu.org/software/diction/diction.html"
-SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
-	sys-devel/gettext
-	virtual/libintl
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-}
-
-DOCS=( NEWS README )
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index 0267f73e534d..c9c5842732ba 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,6 +1,4 @@
 AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8
-DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
-EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23
-EBUILD diff-pdf-0.4.1-r2.ebuild 1412 BLAKE2B c8b69c608f797be990cd7ff2bba3d8394efe6a9fcf0824e386d78a65194f37db2002a33f85316dea65263083d6990201a94b32717b0678b98a64c4657d332546 SHA512 bbbf7c920ce7663f518c8f0517c022a58e1d7d2632312d89c9356fb8dc855a4fbc77c98fb766fc2ac2775fddeedee3a1e34e413ee97b34338f52a2d86150b361
+EBUILD diff-pdf-0.4.1-r2.ebuild 1411 BLAKE2B 78fbab50fa4d9f795edbf09793f753ba30d2dc7be1cea8d480e62fac471f2bd3e93528746622b70f6e608a7530bc06f44a92fa62b8d939b20783a42c87128da5 SHA512 5c4b8cd1e8c3c0c693b1a6508e0a0b2b057f8ef7798ca271e16f781df1e5a15f7a0424480aa833c6f16afd5a1552201f94348e43e22795b954a96134e770b5db
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
deleted file mode 100644
index 60b53a0e7912..000000000000
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# No EAPI=7 support in wxwidgets.eclass.
-EAPI=6
-
-inherit wxwidgets
-
-DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-# The COPYING.icons file states that two icons were taken from
-# version 2.16.5 of GTK+, which is licensed LGPL-2+.
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-# The build system checks for "poppler-glib", which is provided only
-# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
-# of poppler is relatively stable, and I can only assume that diff-pdf
-# uses that rather than the low-level libpoppler.so API. Since the
-# subslot on app-text/poppler is ONLY for the low-level API, we
-# therefore don't need a subslot dependency on app-text/poppler.
-#
-# Since diff-pdf.cpp includes glib.h directly, I've included
-# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
-DEPEND="app-text/poppler[cairo]
-	dev-libs/glib
-	x11-libs/cairo
-	x11-libs/wxGTK:3.0[X]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	WX_GTK_VER="3.0"
-	setup-wxwidgets
-	default
-}
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
index 992e9b377978..0a5bdf8683ff 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 # version 2.16.5 of GTK+, which is licensed LGPL-2+.
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # The build system checks for "poppler-glib", which is provided only
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 53b253fa94db..2060ef36acf7 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -2,4 +2,4 @@ DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efb
 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
-MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
+MISC metadata.xml 382 BLAKE2B f53c90248d27a826350a572fef359f9cb4ba83ac99ea787db1a035bd1e1e63e757566fefe0e531732900cbe32fa02cad6894d8b038019db88e147398df24e39f SHA512 6bee249b741358b1c82d1e2ec8bde902f260c3f3a506be1652a50f96cd4e0b1f6047f2527942f8df83a3be55c53c9a49c13b528c464016582302165bd01e48bd
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
index b0cac41f1f5b..23a377bd57db 100644
--- a/app-text/dvisvgm/metadata.xml
+++ b/app-text/dvisvgm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 58057a388893..3f48edff0582 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -3,6 +3,6 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b43e1caa5f21e52c6f3037268b1959e9cd1adf04b08e05fce78dbbcfd3163795e8d2079c484c530065566a0307f2 SHA512 e29b3a85d993af28044a86dd23a3ca74c7d50b4218e542c380053a3eaf70c3ea2406feb3361ba8e793bac586c252330bb20fb56c65f3a0a54f63f103cc0abb35
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
-EBUILD enchant-2.2.15-r1.ebuild 1240 BLAKE2B e96ab8758d54126a9e72cb204da24c34da7e5daa0a14c132eec7588f9928bc26adb163ad501c3e21d28f3c1f7a169b26eb3f6a9d939ec15231a5b0be9f092766 SHA512 0417b01eda97208805d6be1d63e88dd09232e4ef68b38ac152632f9574e8e218226acbe28551b21f0938794beec692d2f9c6080f4997d785ef3f54dad652e02b
+EBUILD enchant-2.2.15-r1.ebuild 1239 BLAKE2B ccc49b3b36e88096516ace10c7a6725c68adbb381849e641a3547bc2dfbdc1b5282c09a43208cb7a6517830f1c7f8340f1c6b33d1a924c1a4c998856de2f84d4 SHA512 3f69599d7dc4849a9090afcc8d5416bf00fca24ce7887cda1807681522ff1446925a1737b223f32d61a458662b071df682ff98bbc6cf2af5dfb2f3b6d81bce3c
 EBUILD enchant-2.2.8.ebuild 1219 BLAKE2B a68741164e6cb8eb2e96ae2349bc18e584327a10aeb4fe9c6ee0a294a2101709327afda22567832248b36fbeb4d84f6281e99acd0840ba93619d9daa3180ba44 SHA512 a3549c67b4543d18180e6b09072f56b234b04cb374535b3535f71ce5f9156e90705748f0289f127ff5c1074349c57a467f77f2669172abb9b3f6c3929686aebc
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.2.15-r1.ebuild b/app-text/enchant/enchant-2.2.15-r1.ebuild
index 3ccf7b9f85f2..7108074ab661 100644
--- a/app-text/enchant/enchant-2.2.15-r1.ebuild
+++ b/app-text/enchant/enchant-2.2.15-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/extract_url/Manifest b/app-text/extract_url/Manifest
index 5c51897db037..284283b33d00 100644
--- a/app-text/extract_url/Manifest
+++ b/app-text/extract_url/Manifest
@@ -1,3 +1,3 @@
 DIST extract_url-1.6.2.tar.gz 16296 BLAKE2B 63771d63fe9a93e340fb02788e12596003d0d7242578d9d39255a5e8b22e8ab3040e2aeed505f6342181422194ee80611092d891146ba2c5d0ad9b8c7f9c249b SHA512 c95c52c096569d4fb24da95480c8c5262ee29bfce8ddc9cb70af45d17f4977edff6d95eda8aa7976f82fc75e7de262fab21a3498590e1c212cf9cf6435d2c4f1
 EBUILD extract_url-1.6.2.ebuild 637 BLAKE2B 474c4cd26614320f3e03e84e79265a8d3cd7484fd8deae3c511fb4515d22aa9434c4f36742c639f2a2d6b9229907237a4c13529221a5ca882f537c1d5471865c SHA512 7626bc0cdbe1bba8d99e99f8ac356ea18f4d3911277b6ee634f4dc70718180c21cd523aee30a0e2195508fd2266de51a74ef0e12c62e39043551dec40ba661ee
-MISC metadata.xml 253 BLAKE2B 768ef30b7e388f5c40e536d436d335d56c32a5b4999a586e17ddfb3d3db36b98ad88e0557e731563a9234d4bc0702b4f0d35681120590c968481f37c53947003 SHA512 5aa20861610f0baadf687889d3074afca45952a17e59930882199e4f85ace6f07b1bd225d1e5caee010a6e007da08b63d1de3b88c84d7178549765ede32b1708
+MISC metadata.xml 253 BLAKE2B 37f776327abe236f7cb7484d68775124d9417f81daf6cced48e39b27e40459b271b779eb9c282913e7505d364a1eb0b19aaed5fddc19e274bf9b01dc6441c148 SHA512 5c9bd38bdb614333d278798ac4b2db4ca9a85087440f152eb43ed6f7699a44dc044699def507944d835868ad4235ef1d7d28a87a8068690a491ec389a2f414b4
diff --git a/app-text/extract_url/metadata.xml b/app-text/extract_url/metadata.xml
index 7cfa3990e6ae..ad9e7554f68a 100644
--- a/app-text/extract_url/metadata.xml
+++ b/app-text/extract_url/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
index 1a4d166d86b2..e5b0d2db6dfb 100644
--- a/app-text/fictionup/Manifest
+++ b/app-text/fictionup/Manifest
@@ -2,4 +2,4 @@ DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2
 DIST fictionup-0.2.1.tar.gz 375892 BLAKE2B 1aa80517116e2154227fbc374efe6f051c665c7a2cbc0b2f7c71373a1f535ea41189db4528134b0031f754507d214e6f787df3b571443b6dc5d17f60535069c6 SHA512 c6fadac5bfbd88356dd90b4d2673d2d3dd4d7b5cc26d0b0e1141862143d79b8cfbb71cbbe1c82fe52e4777aed43a677efba1479d14ac64d3931d6bcf31dbc127
 EBUILD fictionup-0.1.ebuild 514 BLAKE2B 80f508bdee2c8308d840fca9ec476e0252c32c25d2a64bb6e19b8430e1ff580ae632c26ee1fbbd1a9a2f69195aea0e0a11caf5edc5ee6da8edf9af692f18751e SHA512 ca95b1d8b0553d899c3c86d77c7f5175888d74d5b734ad6b66f90d3cf6eb916c851897cdad07706adb3ed83c2398a468257197ffc9344a641ee5ae8346f724dc
 EBUILD fictionup-0.2.1.ebuild 388 BLAKE2B ccbc1036f9dce129e3c88092852822b53f0b969094e7a837472e53192258c6a3131b2e34213cd091900aecced115e69eb272ae1b204f4cdc4a367e00859af780 SHA512 eb848b5bb9d9e36940ea980b866240c22b1b5fe890332cda30f6ca0bfb1ec9038c434131509df708105a4ab323ad25ab982ab35dd1baad394443f8fc7828b8b8
-MISC metadata.xml 466 BLAKE2B 49d2b46c6b3bdc4d25b6373c363d22eba40437fc09f4302fb6f627fdd856802d1d9a5143f9129326516ed7ff4d1bc3fa8f2d2583bb070d71c6a8ba817a5e3a6f SHA512 bf13006956e97c9e3fbf1f0fe52acbc42e321b2fe39ac988cfc70f7e9b5ae4de83da1bc131dce9b69882c05c6205fc8630d6776a47e665231544c34a1bcba8dd
+MISC metadata.xml 466 BLAKE2B 4e60cfd84216bde52c111ec55c721701e8c39e5628aa7dfbd64db39d730311ab4990a8741fac47937e1c50e82b120e204ca9d745b7fa6c1d060dc31ccb032981 SHA512 4a7d987b4fc9f9544ee6deef1773c319aceb13e0364ac11bfb4434a224ede3f25e7e2d84088d0f13551cbbe6f993d509a0f6d75bbc27b023e24f39d60bba08a5
diff --git a/app-text/fictionup/metadata.xml b/app-text/fictionup/metadata.xml
index af04cd4a1e5f..985c9143d19a 100644
--- a/app-text/fictionup/metadata.xml
+++ b/app-text/fictionup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 3a760372840c..2d2cae9971ca 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -6,4 +6,4 @@ DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-MISC metadata.xml 764 BLAKE2B 671576c7e04062ade59bc49bfedcf642db7aa809e778bede37948486a2657cf69b3157ccec611257ec0fc09664b796408a0feb4ffcb456e967708b8480628956 SHA512 7eb765287556a16c9f15d19c69f8eb99ecffe5a2cda3d4acd8a5e90fae42bc5e9364d5aaf57810a1704bb5698f59498fd5d905094afe3f2ddfcac53e5458efcb
+MISC metadata.xml 764 BLAKE2B 9e484085e597e1e465a5092d57ab3ab46b428d016db7ac6780b62c06bd27754079eb38d6fc2b2fac5cb8577cb75b4c3fde6a2d410c40b6fce9b6ef6fcdc8b005 SHA512 f410375fc8a20c69e1b6859054d2776826392048b321912ec8f4ed9a6e6651b824f8ad12d1e74c6a12bbe57126bc9123680b23a7d2edf6d2ee28fffdd906eaa2
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 7fc1cdd53b9f..aa055c05a0b5 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 309865c65857..5f2ab084b5eb 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
 EBUILD grip-4.5.2-r2.ebuild 797 BLAKE2B 24ce3ffd49c9345553e92435d69ffe4056c2f215754dd61965ad608cf04237b472e6b6065b45fa38c3b8c45ee22c91021b92f4cae1d4608f61b834cf22dc7812 SHA512 dbf618f1964463a1fedeb9229a489c45d07d713e69d58d19a97b21c87e6696161aba5abb6ebfa40f752363af6a88cbe46a611d7139da9fe32a13309cedce8544
-MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
+MISC metadata.xml 364 BLAKE2B 5d04da59bdd3cc56f840604aca495e186e444e75681a686c60a41fa04f373b78052c2733bd4d2ba2856751e8ac5b228cbaf6e32d62f837776c6dd31e68857850 SHA512 21c2302875fdd3d8fba627ee7656efd7ebd72ee2dad3df540cff11700d10b588483227d69f2ae3e3aef2a9bc446e8e70d29a0080f8bdb53bd35035069ffe43fa
diff --git a/app-text/grip/metadata.xml b/app-text/grip/metadata.xml
index 39a5a95b6c6e..bb0121d9f630 100644
--- a/app-text/grip/metadata.xml
+++ b/app-text/grip/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index 4ba738119c4d..b1c00a251a53 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,4 +1,4 @@
 AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
-EBUILD gv-3.7.3.90.ebuild 1046 BLAKE2B 22b6c9ec3cfae0bc8faed072b8acb4e42bf6385aab66f0ffee5ea06a167611a43d4ae0518aaac55b59322fe0e3ec22ca4758c3d5118f2d1a3b54547bff689342 SHA512 23534891e0c433d97e21e215fa76a1f619d1b25444341c261bfae51c7ce75bc8c554d756e791c39502023502bed8acf3127dd8dbaee3a3fa85b7010818564f00
+EBUILD gv-3.7.3.90.ebuild 1053 BLAKE2B e473bb00cb90f2ac251f9314314be3d2d1095db327fe749f27a820e123f23a0395b8b71050ed82746cc73e77ea3e26e17d27f920fb8d85f8aaead498dac69036 SHA512 7e9bc62d33f90bacb78dba44b3f6d6405f75a38c27da5f97adb489a2d4978f3e565be7c23280e3b0549bbcdd83bff27e7803256c512792f7a786bcacb2a93bd6
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index eec0381d633f..fb9fe32c8378 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -8,7 +8,7 @@ inherit desktop
 DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
 HOMEPAGE="https://www.gnu.org/software/gv/"
 # Change 'gnu-alpha' to 'gnu' for final release, like 3.7.4
-SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
+SRC_URI="https://alpha.gnu.org/gnu/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 122271c07f06..f563fc6dd76e 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,4 +3,4 @@ AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.7.0-r2.ebuild 2309 BLAKE2B e7c468c928af4d5725068bd3aff75e21fe66ec6faca85d3426bed959ece9c929d1c067fe819f7266b378475b9683e582fb8e5ee87c35a4385bc1a194bc0ebad3 SHA512 9b497025439fd7b94abc65255e501c485af1e7a8f356b44524bdc77e16d7583fa50a017d674be87dc56dda678a08df961dcfea436f2d376bd2253b746e158b49
-MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
+MISC metadata.xml 300 BLAKE2B 972209a6a73b02c87d5fe63e24596d3d3ba7a4f3a1be17e50abfd58cfcddea4ba18a10a1b7ca6794534ff360cf7f697aa71dd437e97f3597c925488b62e3f2b3 SHA512 d31425a427b5d423ec9f9115aa7dc9b4adbeeaa961326ebceb6528ee51b7f0e2cf9bceaa117be367f921a8b1a37e06736b1ba3ff87088cb009de055d2b1a4c97
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 3df52fea111e..d9ca517caa67 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 673f83573004..5f35a6f36b87 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,7 @@
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
 DIST iso-codes-4.5.0.tar.gz 13635723 BLAKE2B e96cbf80a93fd4901decd59006e51b39eb35b64b6ead28c0f0f1b0103f341dd79849db07f63be16154e5041a85a563d477b6470143ad325f1d25880d539807d0 SHA512 457585de1bfb848bbdbd15754588e690e3214f5d4442c32df4044f8a5b2cf6035c9c0cea84cc9b6e6ef093c0e9c8f7317e5bea920060b09d121b042e66046ca5
+DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
 EBUILD iso-codes-4.4.ebuild 2622 BLAKE2B 1d50fe1b7b86ddb2e4ea632db1913f3484b1d320e0826486d56a2ff325b43e20cc388f3fb650897860f5acbb9807829f98d6733ecdcbd0f74a83f8bbb4a1ac15 SHA512 32416dba78245fe22d42fa75b6cb53175145ac7e450498fa1df7906836e97cb8bf722c448d8ef3d10ec497b63cedebc5526619dd249286d86c90efc129f2b1b9
-EBUILD iso-codes-4.5.0.ebuild 2634 BLAKE2B 569275085ec5bf492763195c175741526944fa8ff1f82bdca6d6fce9d7501766043932dc5fc422fa25374787799df321e24586077c1eb4d8deb5124093b18ddc SHA512 89f9b1e97bdfb92f63fac82841ccdd565a30a4a956e96c269433d930e5cd202b7f24298c09498fef7e735619a445f2b09d5c568ee4ff1945340ba896c25a9002
+EBUILD iso-codes-4.5.0.ebuild 2633 BLAKE2B 525d41f158ed7d59faecd9841c801f66cd9e7a3f586aacbab8804884a62a355461a5d7b5da509573865c8ea4049330e3fae1673ad629f1c0bbe798cc47988b8a SHA512 159a6393ad54bae9d0daa6ae31419ff24bbbfa5fae7cae09b8b872a9a440514285f95a6b633f2bddbcf8fa7ccaf499f76906b74cc5d0e51d075b977e44e31a18
+EBUILD iso-codes-4.6.0.ebuild 2643 BLAKE2B c240244958af247e1330cfb72befd20d48e9f9232c0c839bf509ec2db03aaddf6c127fc181c1dba4b93150b1e615d35d8eb119adf4d7dc52829f8921eda7ad1f SHA512 91885f9b953eb3db67ad374db26a9672a5b025c66165e1b8dfe28f76cd94a11150698a34bf4a793491523c156525b511cc0cb35b569b0f9208e876d91a685a45
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.5.0.ebuild b/app-text/iso-codes/iso-codes-4.5.0.ebuild
index 8232e7373025..29a8518d9f68 100644
--- a/app-text/iso-codes/iso-codes-4.5.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
new file mode 100644
index 000000000000..606b0e7ba92b
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.6.0.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_{7,8,9} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kn ko kok ku kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-${P}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( ChangeLog.md README.md )
+
+# l10n_find_plocales_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 16ccc8c6a12d..29ebcc81bd40 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -13,4 +13,4 @@ EBUILD jabref-bin-4.0.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c02
 EBUILD jabref-bin-4.1.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c022323c464514cf37818d25e6dbf7eaa0c0bb8a57c468240f14d2ef1afd3a2911f42623608c676d7ecdedfc8e910 SHA512 2dab48dd25474b869a284121843e60ed9ff8d6016224046f1eafe2ceb93bca17f02c67a6e7395e621c5824f5c5c1e57aa737499ac21183497168cbe0e64ee327
 EBUILD jabref-bin-4.3.1.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c022323c464514cf37818d25e6dbf7eaa0c0bb8a57c468240f14d2ef1afd3a2911f42623608c676d7ecdedfc8e910 SHA512 2dab48dd25474b869a284121843e60ed9ff8d6016224046f1eafe2ceb93bca17f02c67a6e7395e621c5824f5c5c1e57aa737499ac21183497168cbe0e64ee327
 EBUILD jabref-bin-4.9999.ebuild 1147 BLAKE2B fa6eb88cc12996d037837b106fe619b6d06379941f37f8d0701fcf3837ea0654fe430bb98a04e422ebb78f5ef460d3fb21d840baf1fa5859762e12a380cefc08 SHA512 2f530eefb6b97fd093f134d3e7a3619c96b7cd6d52a2f8f6ffa0b28260672cdb237256f282a3223718ee520578b725884cf02ce97d0caa74b30dd838ea77e722
-MISC metadata.xml 911 BLAKE2B 126cffb014bca2a1ac056adcbfd52140c8adf76547aea45de34a9d98a4e7c77d1e175e302e7f1cd3677181dda238bf4f75754f9f9a2dfb981196fc8b974d0fd3 SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3
+MISC metadata.xml 911 BLAKE2B 2e0e53bae22a1a8959c86556d46ad3aa0b1bb6d16e1a01f667c1f98eec34bd33be300d266b115436d7abc193ca87d6c00e2a6606cce91248fbb78e2ea33752bf SHA512 6e3cd257fbde5ca58e4248b8194099cfb3b4e837c7f66c95e60a9eafc0a9e4b46f331dc5dc051cbbacc3c3bf2522d85a478f07e4b796d05da71827bd2d273381
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index e2170f6bc5a1..3ccaac3de7d9 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index d0cdc6b91948..4daef53a4f99 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -5,4 +5,4 @@ EBUILD lesspipe-1.83-r1.ebuild 1063 BLAKE2B a3bce9fa46ddeb453cab46d0b0db9d24069d
 EBUILD lesspipe-1.83.ebuild 1076 BLAKE2B 43e138721dbb29c653aaf5a0fb1ec65565f065eb6026056755a961ea0b7d7692f9957eb395120894c11453355daad1ad904e14f26bf41da125238bcac0b8eb75 SHA512 15a08ab8ffd2b0b111494b74a960f65bc7bac8dafd12d9017d69f42933ce34c766e9448ff85a469d65ee40c16c3b5bb2cc1b6db4385d491c71d2839f129eefb4
 EBUILD lesspipe-1.84.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
 EBUILD lesspipe-1.85.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
-MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
+MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/metadata.xml b/app-text/lesspipe/metadata.xml
index 0ad8b1ed80c7..f48f0758cb2d 100644
--- a/app-text/lesspipe/metadata.xml
+++ b/app-text/lesspipe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 16ac49149df3..dfeee45b08cc 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,3 +1,5 @@
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
+DIST libgxps-0.3.2.tar.xz 79956 BLAKE2B 4e41361a90fe24816aff33e90dc1084d0c1c799a4c9368364e73d9a5df34a45be75bb9906ee272cd1956b3631894d4be63070cce57983e2401dc1496f08c3e33 SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9
 EBUILD libgxps-0.3.1.ebuild 1223 BLAKE2B b80393ea587682f60e9f76f1e953dabd8a8589b51e302a71ea8d341be8df4d125485aa8f0b672b4ec94eae9a89b8426f165b1c02b406d12a60efcb4733da2878 SHA512 eb5351ef6f8e40e7b9d27b532966f53d655f84ca992769712fe05aa698974b55d32033ef2c2bf7f1b8fb3c215145f18a77be8b1fcca45a78522a12323dac914a
+EBUILD libgxps-0.3.2.ebuild 1241 BLAKE2B 291e05bd7686e0c5ee28febf16bdb702d91f01f567f75b120183f3d66f953c6a4e0c932261cab0517a74e83d7eacb034437b486b977f6b432774567d889ace55 SHA512 9e7a2460a2fa7b0358c807387baf73ce2f72134c6346f41b01245e81918b1059033a8f907d2937d3ccfc66cfac0171fff81827231bd850f5518c43b28f2c98be
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2.ebuild
new file mode 100644
index 000000000000..051579ab2eaf
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg-utils
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection jpeg lcms tiff"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.36:2
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=x11-libs/cairo-1.10[svg]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff:0[zlib] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	gtk-doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+src_configure() {
+	local emesonargs=(
+		-Denable-test=false
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Denable-man=true
+		-Ddisable-introspection=$(usex introspection false true)
+		$(meson_use lcms with-liblcms2)
+		$(meson_use jpeg with-libjpeg)
+		$(meson_use tiff with-libtiff)
+	)
+
+	xdg_environment_reset
+	meson_src_configure
+}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index de4ec17a09c2..5f75270cf537 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,9 +1,6 @@
 AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
-AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
 AUX llpp-33-makefile 2733 BLAKE2B b98e6ce0573d4461a9dcbda41e8f54c5c652fd21b0db5b43df28c9e7117cee3415860b0dae9ec6030392cfdbcfe73844ddc824959b9e7a5f5fd34e8c6d41c01b SHA512 64895d517d6b973ed34b374d3bccd6c06233887aceb3df1fba350db7c54f62fe7756a6c0e02700dbab1e350087fb483f549c8c589067c2a50fa23d769f32f0bb
 AUX llpp.desktop 556 BLAKE2B 44ef90b27f7d4efc02e7a4f420bade296d9704ba1dda803d4ffe897fef1393a2147827971bfe58ad0d896b0af619c6b4796c1bb08beba0728d66c2ec15e2cc56 SHA512 a0c6a256f8d08829f70cf8c1b2a2b93fd9cb60ff2e5d886a09a4afffe42fc95e5f9ac86fbcb9e4af805d40f309a65b7958f5f60dc3637aab9ad4248a56a9fb97
-DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
-EBUILD llpp-30.ebuild 1311 BLAKE2B 7374170bd2d6c13e4f270017d34c235a35d1008be4163b9bcbb24b930156202abb6590f1e05d3aaa53915f11c01f15575f9857da0bca5b05c615c89eb300ab39 SHA512 fe1d9d4518bfcf14d7679e988da30ba501d7f26c02b87dae0e0407fc7e0cb533089e6aae117334bd5e1e2f7d24275b7e1c99c9300a189d0ce6bcb332720acb9d
 EBUILD llpp-33.ebuild 1312 BLAKE2B 2754cc2cffaa99ac9213e3b1a80629697664bc45318329cb135179168b73f1bdd35854a2b50716d9972d74627b258a0b9fe6c681955a92a49804607bca5a6484 SHA512 5a47ece59fdd4eef4ec453e73ac0d9e320c90b2c37bbea16fe04b48717d581e1a1f2ecc76d3331abda60e49eb0ff978513205155d175f1874c76b89de65ea5eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch
deleted file mode 100644
index b1527e1856f1..000000000000
--- a/app-text/llpp/files/llpp-30-keysym.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 5 Jun 2018 11:56:06 -0400
-Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
-
-Source code, e.g. #include, belongs in the source code, not the build
-system. Build systems are for defining include paths, not the includes
-themselves.
-
-Drop the KeySym keyword since it seems to be a useless alias for
-uint32_t which might as well be used directly instead of indirectly
-using #define everywhere.
----
- link.c               | 4 ++--
- wsi/x11/keysym2ucs.c | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/link.c b/link.c
-index 783b12f..e8dcac3 100644
---- a/link.c
-+++ b/link.c
-@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
- {
-     CAMLparam1 (keysym_v);
-     CAMLlocal1 (str_v);
--    KeySym keysym = Int_val (keysym_v);
-+    uint32_t keysym = Int_val (keysym_v);
-     Rune rune;
--    extern long keysym2ucs (KeySym);
-+    extern long keysym2ucs (uint32_t);
-     int len;
-     char buf[5];
- 
-diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
-index 38f9f1f..0f907c2 100644
---- a/wsi/x11/keysym2ucs.c
-+++ b/wsi/x11/keysym2ucs.c
-@@ -37,6 +37,8 @@
-  * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
-  */
- 
-+#include <inttypes.h>
-+
- struct codepair {
-   unsigned short keysym;
-   unsigned short ucs;
-@@ -816,7 +818,7 @@ struct codepair {
-   { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
- };
- 
--long keysym2ucs(KeySym keysym)
-+long keysym2ucs(uint32_t keysym)
- {
-     int min = 0;
-     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
deleted file mode 100644
index 31eafbf3035e..000000000000
--- a/app-text/llpp/llpp-30.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
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt"
-
-BDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt?]
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=app-text/mupdf-1.12.0:0=
-	media-libs/openjpeg:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/jbig2dec:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-misc/xsel
-"
-DEPEND="${RDEPEND}
-	app-arch/bzip2
-	app-text/asciidoc
-	dev-ml/lablgl:=[glut,ocamlopt?]
-	media-libs/libXcm
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${P}-keysym.patch )
-
-src_prepare() {
-	default
-
-	# use custom makefile from archlinux with minor changes
-	cp "${FILESDIR}"/Makefile "${S}" || die
-
-	# re-add desktop file removed upstream
-	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
-}
-
-src_compile() {
-	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	dodoc README Thanks
-}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index dba71eb90e09..e4ab7c9a973e 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,11 +1,3 @@
-DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
-DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
-DIST master-pdf-editor-5.6.80-qt5.x86_64.tar.gz 15996548 BLAKE2B a2e8ad77d3cb107786b9dcb152a399b60ed87da02c052d992105f541a948d8fa05116af7be2c935ec21f642d21483d1166ddfe5d2ab8f41caee2ce26856f63c3 SHA512 c722c055e86dfdb1d0821e5e25635646fe5905ae8e13451f1cad3f1f71e4332ddb5ebb661cdefee89b186bd4647593cf2e149326fd4b7ec3433bfc17fb1c76ff
-DIST master-pdf-editor-5.7.08-qt5.x86_64.tar.gz 16029448 BLAKE2B c37491e43d49ee6e3db223c878f49c4becb06f1d780f66918d8da132f83fb6e6a299aeefca670aab0e0b4f7ee159b3d042cb8a4492456660a2c020424ec60ed3 SHA512 fced1b551ced646a4ed52167cc856a251cb976d522433cf7bb3020c566a40c5564ab712d298d539f36e4af8ea147245477aab52f29aabc21a0d33542c8326afd
 DIST master-pdf-editor-5.7.20-qt5.x86_64.tar.gz 15905883 BLAKE2B 7e698a477552f9d115f2024f57f9acc76963955c9e904d376eda5296256907973e56f96c7ae8f7a93d6357339bba83ba80b8901125def3987548a3cfb415f235 SHA512 53426c3bde96a8c1e43723db6b5a67e99b030b83e42f02f79eb8a36ecd888e2a08c20c02a9d81c0c34e0dd294b3611aab540f611c6f5dc03b983914aaf05b878
-EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
-EBUILD master-pdf-editor-5.4.38-r1.ebuild 1585 BLAKE2B 7f8ef524fda232910acb17f42f90aac4781070bb841976616c50cd6a7d2cd5c5529647b59927ee8a75f9be09f5112cc516f0c75387a1e17802be6398d14c7c26 SHA512 1a9f0e9d6ed6935ea1c02f7badd19206c0d7b3ba9a59ea6949e858bfcc9d23c942fab255a312c18b37b781b0f3f80b92d371483319be011244dd1a563d7a3639
-EBUILD master-pdf-editor-5.6.80.ebuild 1189 BLAKE2B d67c9a3d9fd5e5b4df10b8f1aaefed1db2083e60d977d75d8f8a9aa1eec773796569d49822f9691193111321a87f3565bda1745d4d0806294e2b3ba460f74348 SHA512 8e0c0ad14900b871278098a9f6a5afedb9d61f48fe1957c088542fd70c39f657060bbf6969a94d7eebccf44588a32d9c8b7a157aa3b766029812dcfe132dad5f
-EBUILD master-pdf-editor-5.7.08.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
 EBUILD master-pdf-editor-5.7.20.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
-MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
+MISC metadata.xml 397 BLAKE2B 452d8c61c1042ca4152ef78d105ee9e50453e477628b5bc265fe7069b2ef60f351b31151811becab19615aac793c71a456ecacd0b44d8db767a16698a1c7f6a5 SHA512 319a7177adb83e54195daf3ba392d68540c94c98a57681e4bfc20fd3df76632eee4b2e9c994a387df9878b9d596a1bb74dbbf5f003d1755c6df1fc3f2fc0dc32
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
deleted file mode 100644
index 7b474ad5521c..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.4.1:5
-	>=dev-qt/qtgui-5.4.1:5
-	>=dev-qt/qtnetwork-5.4.1:5
-	>=dev-qt/qtprintsupport-5.4.1:5
-	>=dev-qt/qtsvg-5.4.1:5
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.4.38-r1.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.4.38-r1.ebuild
deleted file mode 100644
index e5bb5285e55d..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.4.38-r1.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 desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5-all.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND=">=media-gfx/sane-backends-1.0"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5
-	/opt/${PN}/lib/*.so*
-	/opt/${PN}/iconengines/*.so*
-	/opt/${PN}/platformthemes/*.so*
-	/opt/${PN}/printsupport/*.so*
-	/opt/${PN}/platforms/*.so*
-	/opt/${PN}/imageformats/*.so*
-"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_prepare() {
-	sed -i 's/libpath=$(cd "$(dirname "$0")"; pwd)/libpath=$(cd "$(dirname $(readlink -f `which "$0"`))"; pwd)/' "${WORKDIR}"/*/masterpdfeditor5.sh || die
-	sed -i 's/dirname=`dirname $0`/dirname=$libpath/' "${WORKDIR}"/*/masterpdfeditor5.sh || die
-
-	eapply_user
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts iconengines imageformats lang lib platforms platformthemes printsupport stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5 masterpdfeditor5.sh
-	dosym ../${PN}/masterpdfeditor5.sh /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.6.80.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.6.80.ebuild
deleted file mode 100644
index 37c3602d0599..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.6.80.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	dev-libs/nss
-	>=dev-qt/qtcore-5.9.8:5
-	>=dev-qt/qtgui-5.9.8:5
-	>=dev-qt/qtnetwork-5.9.8:5
-	>=dev-qt/qtprintsupport-5.9.8:5
-	>=dev-qt/qtsvg-5.9.8:5
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.7.08.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.7.08.ebuild
deleted file mode 100644
index 1300656eb4a5..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.7.08.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 desktop xdg
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	dev-libs/nss
-	>=dev-qt/qtcore-5.12.9:5
-	>=dev-qt/qtgui-5.12.9:5
-	>=dev-qt/qtnetwork-5.12.9:5
-	>=dev-qt/qtprintsupport-5.12.9:5
-	>=dev-qt/qtsvg-5.12.9:5
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
diff --git a/app-text/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
index 82340dc648a0..21140496ac4b 100644
--- a/app-text/master-pdf-editor/metadata.xml
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>joaompssantos@gmail.com</email>
 		<name>Joao Santos</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/metadata.xml b/app-text/metadata.xml
index fcbc7cd873ba..ab8ebb95cb72 100644
--- a/app-text/metadata.xml
+++ b/app-text/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria app-text zawiera narzędzia do pracy ze zwykłymi plikami tekstowymi.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 4ce95f1fdebd..5d40d7fc7156 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -3,4 +3,4 @@ DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff731576518792
 EBUILD nfoview-1.27.1.ebuild 870 BLAKE2B 5742c72800642e268f45b391c4ab22b1dfc70f213993be6205f632a956e3bdf08e3f50272c7ebd124e2bbcda45a5d79ac74b5d94b067285368cd44255b51cf18 SHA512 39feeb3c4a844c444c0678aef7bf0f167588ce5f7b363a29853b30da7f3167acb81c28a4155778e36817c26d09ecbefc8303dbebaa744806bbfb1672918ead4f
 EBUILD nfoview-1.28.ebuild 716 BLAKE2B 74529c9706cf55661dfccf7e8969c3c270ecff2a3de321408789f81e4d583a758a65536ae505d50e36cd7182a2042ed48348f0150d080e27dade1af9096abcc8 SHA512 fbb243b7df31e1149603d6eca7afb19281698190eae6e60175a4bfa1c1d2a4d671e11925a4b4feb5e10864c08927b63ffb6249ad4139924f521085f4f9162d74
 EBUILD nfoview-9999.ebuild 716 BLAKE2B 74529c9706cf55661dfccf7e8969c3c270ecff2a3de321408789f81e4d583a758a65536ae505d50e36cd7182a2042ed48348f0150d080e27dade1af9096abcc8 SHA512 fbb243b7df31e1149603d6eca7afb19281698190eae6e60175a4bfa1c1d2a4d671e11925a4b4feb5e10864c08927b63ffb6249ad4139924f521085f4f9162d74
-MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
+MISC metadata.xml 487 BLAKE2B d615db3c8ab2b6819f6865a2b1be9015b9b288fbb2f931bdc6b0be1939540a970ec0becd36b801976cdbaed207d2a055d084f820a45e7403b4fddeb160bc095a SHA512 a5fd365d3f2f97db62cb78f43bf8175d226e4a49850c55503eb37ef45c4e8477a81840efedf34ddc4dafe3beb9750d2432ca934d83daaa1e9d51c99da8f57911
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
index f49632fab59f..a6de1706c8d7 100644
--- a/app-text/nfoview/metadata.xml
+++ b/app-text/nfoview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>till2.schaefer@uni-dortmund.de</email>
 		<name>Till Schäfer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 9c7237efa44f..e86825b4a137 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -8,4 +8,4 @@ EBUILD nuspell-4.0.0.ebuild 1170 BLAKE2B 2492c07d1f7b6ab3ab9bbbec92e1ab493931ec6
 EBUILD nuspell-4.0.1.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.1.0.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.2.0.ebuild 1142 BLAKE2B 940a20fd21b52017c1e8d2d2a9dcc56de5f1e2eaabfe72b2c6c06052fc8bb8f372e88452eeb0f7d702c6ff93d630212a53d66b5939a786f2b72de437b2a693dc SHA512 3c4c91aa5cd1f38389884bce74fb343877ad0977ed8ad4919ef69dc00f87350416e964384f2b62c875221657b37a398279838dbe3f0e1c5b00c36293046c99c0
-MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
+MISC metadata.xml 489 BLAKE2B f3982146d0310c27e8fcb8092ac55e70d1d4d2b63beef25bdd9dd2db709f900236a6c8403845f40600bd692f76f9f96724282d02084832fc628842aa50e93f5f SHA512 e6e6d227ffead16c0e465c82dcd125351b5fd6af2195cd8e93e2855f76cfd38d225cf66a381c1f1023248b9d00d8896124c7b928400e34874eb3b5891ab81a2c
diff --git a/app-text/nuspell/metadata.xml b/app-text/nuspell/metadata.xml
index 6a10d096c251..1b840bff947c 100644
--- a/app-text/nuspell/metadata.xml
+++ b/app-text/nuspell/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index f5b59e620e77..b9f9254abf61 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,4 +1,4 @@
 AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
 EBUILD odt2txt-0.5.ebuild 722 BLAKE2B c9ef4fc3458743347fbb27854631da0162f53fc6dbdb82c0303333410f7398fda6c512f189c96e77f8ae8ef5ea040490ebfe1a1ada87e1fa38af8175be40ca1e SHA512 ed87b89753904440345aeb27031d222f827940d72331d1016bc2e7163fc9da6e8c56af283d93e287b64ff698e9e3764da8d8660250c346aec6f4c6f3ec6798bc
-MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index 684b678e70f5..6f49eba8f496 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
-
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
index 887d1902def1..be6f4b5bc3e8 100644
--- a/app-text/par/Manifest
+++ b/app-text/par/Manifest
@@ -1,5 +1,3 @@
 DIST Par-1.53.0.tar.gz 52209 BLAKE2B 4069f75e1d0ff397938941ab58020c41cb1b896ab91b370c4f9c9a4d4eea1fe695cc0c27b0129780d40b7274e355ac1f41a933d051bffebc938c284e71971fe6 SHA512 3f8ac57fe19ebcf427b11f4d79f2c5cc9286c1439c38a53d45bd29b9219369db2798efbd0e203ac359d59ebbdd3ead1c50ae75352a1ffc568d4d3b9ad50642b1
-DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
-EBUILD par-1.52-r1.ebuild 711 BLAKE2B a87b87a8476a7074cf3eed2e017abbdc6ecda7cd9a99b47343511bfa0195e9b93ac5f374bbd0207e44a62a67c6eb740f05598470333676ada90788ea53d0ebfb SHA512 3fafda24ab5c87a5119ecbc2a88c27c29d574a63a046ddcc1bbb7d8d094335c0fe58883a30d6d575ec8f03ff5b070e3caf02fb527a7277aaecd3ceebf4cdf8f8
 EBUILD par-1.53.0.ebuild 746 BLAKE2B 506f2f885f72d1953e693a00618643d56b0eaa025b9207da7238a7f818f9b7f63ea9f3d56eb035528e9678fa51bad6db170bcc1b031a0b9bdd8c20b4401b4136 SHA512 b452304ba06c2ed4f82759eda2d4f941d3457369c188f01253e9ca20bd14a85e7e029eec0c7956f5cc26cde635bd21ee32f15d9fcc48cddc992dec277e24aa71
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/par/par-1.52-r1.ebuild b/app-text/par/par-1.52-r1.ebuild
deleted file mode 100644
index 8bb95b8b42e1..000000000000
--- a/app-text/par/par-1.52-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="Par${PV/./}"
-DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
-HOMEPAGE="http://www.nicemice.net/par/"
-SRC_URI="http://www.nicemice.net/par/${MY_P/./}.tar.gz"
-
-LICENSE="par"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-DEPEND="!dev-util/par
-	!app-arch/par"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	make -f protoMakefile CC="$(tc-getCC) -c $CFLAGS" \
-		LINK1="$(tc-getCC) $LDFLAGS" || die 'make failed'
-}
-
-src_install() {
-	newbin par par-format
-	doman par.1
-	dodoc releasenotes par.doc
-}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index f817bf85f81d..7454330bcf50 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -2,4 +2,4 @@ DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff026
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
 EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
 EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
-MISC metadata.xml 492 BLAKE2B 7cee2a75825f42f20f364427915e938fecd8a62d0d7053bfc8dad1f9e377a8d0ef5f6155c756fef486a0136181b67b08d5536783613d27cfd63bf32b850a6f69 SHA512 2db060e5b59ad5bb8d8f1d66178e28ca923afbf68420898b27e69bb46f7edea4296bd87f2f35c954f75062cec9b765369aaf45a5516d33b79581ae60efc25d1c
+MISC metadata.xml 522 BLAKE2B 9bf82a86f7b50e8b0031b556acb03170978b6b720b41df5b539fcb0480ccc8f5fdcb1a2a5869a2cfed49486e2ac34c2a31b2aa01de87a55ee35489e0762a6295 SHA512 b48ef34c6097f56b48ea17567eaf1ec9e5f4ac5acf6de362a5e681b74d2b9bd683f3ccb1a5134c2afb3b86e618c3cc21ac8d9a32eacbcb3376dce435df762b97
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index 3b89b4ece539..05820062d13a 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>flo@geekplace.eu</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index e15b0b8a8abe..0684752ef798 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1,3 +1,3 @@
 DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
 EBUILD q-text-as-data-2.0.10.ebuild 1099 BLAKE2B c1b9568351faef21e244e49be0d1815ac69ac7b2f0a8e2b633420f20a32293e5cfacd7dab0a277461560c29fcc96c8b54380ee33d38b33479c2ebf4891ec78ba SHA512 66c61af048a7b42c588842f3990e69f5a1b8da9dfd67662b9f2afb1be0d8cb8896ebf3aca275cdcf385fd6729d682ae0227217716e588ecad3928f366ce7f88c
-MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
+MISC metadata.xml 300 BLAKE2B f446aadf3d56e6660777fbae7c41dcd47d88388ee9ed8d39bf288df289a46b62a9110a5a2864422fb8504d1d0628443689668834b210af1f630696ec00cb092a SHA512 92f3a3be33a46162aa5ecc537005c5ec055afd44c951ced5f61e6a85a54efb87650970e57c6435c70ae7a4f63d60a824f3b91a6a78ae2a5935fcbd942de3cbd0
diff --git a/app-text/q-text-as-data/metadata.xml b/app-text/q-text-as-data/metadata.xml
index 5405551a7a2a..90846aa5f937 100644
--- a/app-text/q-text-as-data/metadata.xml
+++ b/app-text/q-text-as-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 599bd3b86ef9..d97594302f47 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,9 +1,7 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
-DIST qpdf-10.2.0.tar.gz 18816798 BLAKE2B 2983dd4ab8d234d6acb838abb57cd8e75edc540804608c3c3d387ee4c2f8ca8060b77e1b6f1a0950640835065fc681d9ad1dec5d8cf2a706727e237b71eabf8d SHA512 07a37aafccb670034aedfc031a4c2c1d3b6aa001e5c1bde5a3f57520a0523eebd890011a8225bb26b5beb83be15d4be3d2f1f40ad91f8370032db984cf788c0a
-DIST qpdf-10.3.0.tar.gz 18954381 BLAKE2B e0029cb1e3b8b318f0d72fa235ab08ebadb7d9479e23308398292e5374e05ae369b0fc3bbdd98554c48e55228aceb2bd8b645cbb7995cf40e21922dfd24e0485 SHA512 43afa0127d296fb314cf428403882fe200339f4620f842c129056d9498bd46574c83147e4db12405fff8ee27e0c0618ded024d46be1582ee5378c06bfae19f1f
+DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
 EBUILD qpdf-10.1.0.ebuild 1307 BLAKE2B 155b1d9ffc578aa92f657759cb181a5a62001241e318c866ff6a08b37c0e7bd4606e80f9e351c4b647affe6ba5cf21f4afe80e844ee555dc01a6599d831ab69b SHA512 d9465dc9e98a26db87e9efc11d68502b73942204ba87a89a9b10a2cc928698ee9976439c7de4e0f7a0d2ffba016bc7183809362ce580d2096fc37a59981a62b0
-EBUILD qpdf-10.2.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
-EBUILD qpdf-10.3.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
+EBUILD qpdf-10.3.1.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.3.0.ebuild b/app-text/qpdf/qpdf-10.3.0.ebuild
deleted file mode 100644
index fa194fe13674..000000000000
--- a/app-text/qpdf/qpdf-10.3.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
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-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"
-IUSE="doc examples libressl ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		--disable-static
-		$(use_enable ssl crypto-openssl)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.2.0.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
index fa194fe13674..fa194fe13674 100644
--- a/app-text/qpdf/qpdf-10.2.0.ebuild
+++ b/app-text/qpdf/qpdf-10.3.1.ebuild
diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest
index b955c8bff28b..597f24715746 100644
--- a/app-text/reed/Manifest
+++ b/app-text/reed/Manifest
@@ -1,3 +1,3 @@
 DIST reed-5.4.tar.gz 32414 BLAKE2B 3a74b5d3501a37671247f8f2eb2baa674e6418669ad59825733faeff100ae7920ee43cd5506ecde9a8d733ec8462266166b59b525cf1a74edd1eea9182127ac1 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7
-EBUILD reed-5.4.ebuild 904 BLAKE2B 5879d481a5cbe6b8501e2a9b2877a0739119283e81be1e0233d2427f3e8c294246d2c66343a0429e79b3fe1ebd013f65f6b0eec2fa89294540505c0ddc8c5feb SHA512 192c30fc19c4c0ad2af92eca1864f956572e43b722d381ac6a84e5c2814e30f3e750159eae4a2a181b71b73d5b4a1811aa6e96a3d4de65eb26b3a11b94023666
+EBUILD reed-5.4.ebuild 933 BLAKE2B 44d11f76ab9b28ed98a2018602c6b6a7cbdb729839007cbde44036dcec4a8de64c385d326be2cbb05dba98f8edf9a46b21c8d76f35aca83ca88f6352920d6c78 SHA512 cb6da583f485d1aa5832284e9697cfb94acd1367107686ae56fb72ff5c3027596d9400dca9fdc7abd06753d2cd6df9744563528bf0b071e7f468776348774007
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild
index 10999a62f908..6e417c037980 100644
--- a/app-text/reed/reed-5.4.ebuild
+++ b/app-text/reed/reed-5.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
 # Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
@@ -13,19 +14,25 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS NEWS README )
 
 src_prepare() {
-	sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
+	default
+
+	sed -e 's;-O2;$(CFLAGS) $(LDFLAGS);' \
 		-e 's: wrap::' \
 		-e 's:-s reed:reed:' \
-		-e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
+		-e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
 		-i Makefile.in || die
-	rm wrap.1 #Collision with talkfilters, bug #247396
-	tc-export CC PKG_CONFIG
+
+	# Collision with talkfilters, bug #247396
+	rm wrap.1 || die
+
+	tc-export CC
 }
 
 src_configure() {
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index 484ebc69bd5f..ae48267edb43 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -4,4 +4,4 @@ DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aa
 EBUILD rnc2rng-2.6.1.ebuild 526 BLAKE2B 659af24b255a03f7a18b905ef55b998dd6a5772741dd72c989e1e6d27be4477673ef17aac187fd0b77ef2eeb7360b49418ef7069f6bed1a45262ccd3fc70ed6e SHA512 bd65daff8c92917dbaa6ee5a8f759e93c915f4a170caed0adc6336605bf005128a40c8a53df18c13bbee5a96b2fd3ab1b42539d076cce7e30978d96cbd54ce3a
 EBUILD rnc2rng-2.6.2.ebuild 516 BLAKE2B 3b2294a5b599a6f2df8d08d0e95d6d1a5d5759d6682029e2559eec0f3f264e27d63de1b0ab559ad84ccf2390fde2b06591e2aea4095df5c61f3df845272d25d1 SHA512 b00b7c76d6a286898a1807cb3814fd72e78b55811676eec76a4c1b0a3867f6dafe0b69feab788f4f86898fd75b916bcc4feaece056f245fd62c21f7c9db53494
 EBUILD rnc2rng-2.6.4.ebuild 556 BLAKE2B 89697fffa568d6535ab6a188dca657de7b60170817f32efe22c4d37c98a9992a3988e047c4a23f04118df46397a7bd85c953dbda1022ae8c0f6020326eb80b73 SHA512 fbbf384237b5825a3303310c6770a949e5809e6b2e733dae2abf767533a9cbca5cebb556bb8abd3e56cafed2b457a7d2db79227649a728fce7dcfcfd1b0205bb
-MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
+MISC metadata.xml 366 BLAKE2B 070e33036f9d25fc5c34b2c4605f1c1eeef1d108a439c2356ab8bc6a3010865e7f72d8cf4021a7644336d34cd9bd11114af0b9eb8057be0ae8e7bef7fd6a9462 SHA512 0ed8a799683a3e54b6bed7d5bdc0373db115baaf7ade3118158792b6c3f93ae9ddbf3f3f8770b43b2f526abd7624422d45b8c844d8bfe2940c94f12b8fb9d872
diff --git a/app-text/rnc2rng/metadata.xml b/app-text/rnc2rng/metadata.xml
index 3c8118378ab5..b9e9ece4553c 100644
--- a/app-text/rnc2rng/metadata.xml
+++ b/app-text/rnc2rng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
index 901c7b018bda..b3ac38f73ba2 100644
--- a/app-text/robodoc/Manifest
+++ b/app-text/robodoc/Manifest
@@ -2,4 +2,4 @@ AUX robodoc-4.99.43_clean_libc.patch 388 BLAKE2B 394a16b5d0ae62318ddb6ed423aa519
 DIST robodoc-4.99.43.tar.gz 310182 BLAKE2B f8f83c50f51e1f690068b881b51a91369bba3c6b1a9be534fd50887abbf6f06cd90706039865bd0ffdd454b4776ab6e5a1d62dbaf12f459bf1eca0e5872f7e29 SHA512 b9d8758512f6921ca773574ed57763b6eaa203134f13839b8b6f89072bb9a5c0b061bcde816ca8cc64ec72aab7566465ffb0ff2f6a0ead66b50058cb5974fff6
 EBUILD robodoc-4.99.43-r1.ebuild 620 BLAKE2B 6c75df0757db56ebaab1e68ed715aa08fc17a44642a289859bce562c01233e5696d6e2e563f7f39670de8615c4fa29ee9c9425bcd661f6588f9042b827d8dee5 SHA512 8f3c03a4cae79f4795c1828988071c4ee5b39fa222465944687fcc52a235c0780cb648bcccca2d11606be4624e5c1f573789da422b5e33cc7dda7bc9aab1acd0
 EBUILD robodoc-4.99.43.ebuild 570 BLAKE2B f4f805f0bf9cf74fbb6ae70ce65a9d3798a84855ea38d2b3c376eb91de0396f71727f21a0036af952e5ab239b18070ef511b4227d8ac7d3359bf35ea91d82fcd SHA512 3eefa446ac0fd6e89043dd2ab9fcb3c5be48bfb978ba3ac784e8dced8533ae9634d9d9ee7c69be7b5c9621fdec711c2fa1e2a892073940bbfab7d42b4491fa2e
-MISC metadata.xml 457 BLAKE2B 038453d5c13c125d7460bb89c81138111b01e4906c2809cc44659c84db131b84bdbb1ddaf6e609afc9b63071d2232af69fbad5f5a471eabc2580c40b4fdf0dc1 SHA512 56cf72fc87ed198624682942e3cad00c9342ed795efddea0954d098f6e159c44b8777e8ccda766aa436079855476ab44cc05d650cd2c09dd8cfb83f8cb30a453
+MISC metadata.xml 487 BLAKE2B ad2b0860961560eacaaeff260cfae19fbeca6b5270550fb8d9636ad755591d16099e76a437137af510756fe3cb1f6d2c813cea25986a2b62fc246830e53ba619 SHA512 e5b3ca8f960983481ef501d81b0db39bdf8a8aea4fb366772a55f72068e4c12efc005bccf75e4ab20cc95fb5a585f708c726ec5fddf1c88b51a1210ebdd11453
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index 3e77b26bac9b..29a83a3afc40 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ovi@ovidiu.at</email>
 		<name>Ovidiu - Dan Bogat</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index e8934770d7cd..f81d127a5b51 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,6 +1,5 @@
 AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
 AUX 1.0.3-libsablot-expat.patch 195 BLAKE2B ec916a15bbcd86eff5c28c4f4ff2f5cc1f81bf43a4c8d5d26f2bc63fa14e509ae68e531e17051c09037932ea45043d4d94f9886aa5155610a52fa411c5b7a858 SHA512 3f769da06b06548bac82fb505d3f3aa9f2111c448e5b18ea3b553ecce9b627e3e0f02cdc6afb9491f9dab0b89946f6b056486395e0fd6a0822be0f549ccbf035
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1039 BLAKE2B a8f3a9e0cfc0a4036949d66ab5d0094f8f0a0932b2a456facf415372aa3277b58a864a5014f70dfce7888cd54dba6f7c73c7fb3891541e92d3c5d64ebc8da437 SHA512 3ec6dcaf05dcbe7fa07332af1190dded1db1efaad4bec8b029cfd02f162823a2dde24d7d0daef3456b7d3eddf8e71a9742f6e32368af1d21daaca3d0ec245a83
 EBUILD sablotron-1.0.3-r2.ebuild 1139 BLAKE2B a8d85d068908b8659752bf48e19ed6cb4052759e74079d5f9b8649e8c35ddd9da3221797f043179b3cf22a36df2ff08bd8565945d65199c65dedfd57437924ce SHA512 61c6c96c087a6ca54e5233ae2c709ff5d049b954e392656f9a1259e6f99c1968d324fdd4f6157fd41e614b375877934114efd76346a746eb3d245a301ee09404
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
deleted file mode 100644
index 2ab9d95c096d..000000000000
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html"
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
-
-# Sablotron can optionally be built under GPL, using MPL for now
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=dev-libs/expat-1.95.6-r1"
-DEPEND="${RDEPEND}
-	>=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
-	default
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable perl perlconnect) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README README_JS RELEASE src/TODO
-}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index efe9e87639ad..a975e6b55aab 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -2,5 +2,5 @@ DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd
 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-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
-MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
+EBUILD scdoc-9999.ebuild 1173 BLAKE2B 873f1def0a103e8c431fad6ffbf902a9e97ed543d29f738e0ff4799be7f5d49449f50b30e4f37ae5310f7ede07e15f76a395f553756f1d048b3f36ee8aff0b4c SHA512 4ac9391cd7564179179a1951469c73e798c12a6ad3b82c72019d64e6364c943c02251b43344d5e7a1f4e9f1115c941b2e5b89065be25d00002cf5b6dc8fe3af1
+MISC metadata.xml 436 BLAKE2B 488499e5a1aaf5c623a667415050a63f1460eb6495b1013dd81299807a330680d02f65f725dd1f964794b28956d7d4e32b07cf24bbbb2dedd77d2919e23e131d SHA512 13ff20e7c0fee769e256c7e9ab595ec623d86878bdbd0a57ff036ac496513aac348796d526b978539f0cef1bac23549324fc7a6ed1dd45a685050e04d4be66d1
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index 36dc13c52c24..727060ea1fff 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index 15ecbe1b112a..d162fe258aaf 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-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
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+	PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
 }
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 71df7913ec7d..f3003a8de7bd 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,4 +2,4 @@ DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa954
 DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
 EBUILD sigil-1.3.0.ebuild 2010 BLAKE2B 7e11b1e820ab88865810dfc37c859794864a48240a5663dd4d3167dc5c5d1867c9b0eb359812432af1a65fd32c0ef6069fe6ca67281f888dd2a6a7966cfb7130 SHA512 e85ba0ebb346f6b94127ca8d4c8e4c5dd3c0de2bf58ad3f7c2776881081c7d22c8847ffee376240f377899d34a6e8d47e8bc8c0b9a5d2355ccc08ff31ca0c629
 EBUILD sigil-1.4.3.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
-MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
+MISC metadata.xml 962 BLAKE2B 1f90625c7778f97227f27708f6ca94cc002fc587dab80ed64c0c8c1a809a759da20174ccc4ada91411ae1c9ed761600129caba3fdf81cae97ab544db46bf3258 SHA512 67046450741a9553bbb826b4ae1db7b99e9b09d53a7036fe13fd3c2a99ef41ed02efb6a3a2a2e72e845cf8c28395e87c949de0efc160910be2a6c02ed8b60aa5
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 7ff0b9af85b3..0ee8d300aebc 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arthurzam+gentoo@gmail.com</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 99d608b3a9c0..c69fced592e0 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,3 +1,3 @@
 DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
 EBUILD teckit-2.5.10.ebuild 1033 BLAKE2B fedcde1bae2c0729b5956f353e4486e1f2d597008e919205e06e6a4982ef5295fe9178bd124cb4cf73799598008a8bd0090ee3c43770cec3af33f92b3afcf2bf SHA512 a06f6ab03640c477f0aea5358f018f91640f9591877f61de75e49c3a9e02e3997cd1b0d5bbe120890fc7e595f2d6574837c0a45a8146ea114200a26a33e1b25b
-MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
+MISC metadata.xml 328 BLAKE2B 62957bc5c7f41162d3376974ee6812a6ec71eeb48e4740b710308c58bab8aef4155961db7171ba742d9da7d025840d7ec390575c3dfc47429e839e27b21a3d0b SHA512 ba8d102f0a114796f53adaeb95566a469d891a534bd5a13a43699b9438dcc2c78ffcfdaf851035e1e484463eaac34b925914f532e78c048ad096dafff144985a
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
index 480b5571f79a..940a9da898c8 100644
--- a/app-text/teckit/metadata.xml
+++ b/app-text/teckit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 3c8b6745966c..7753a58c270b 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
-MISC metadata.xml 553 BLAKE2B 94c65255d3a407dd26f92c44f904dbf5e3d5a969a0e93203c11d68c92766060bdfd62615513cff9f1bd74ba7e124b066b6eec2a8fc434c564ec7c5486ecb728c SHA512 41a492b7a1c2e33d2ea0c44bdd480027e7e578139faf00da7f1e0226b3011d03963dcd7b221e5d065c762797a24f8c04c8a34c16dbe92c70ee7aa30764423758
+MISC metadata.xml 583 BLAKE2B 89ab5d3ca7ea4dbe5b5371c19793d9f2feca363f5690a67478e83963e9afa273113c95c1b395b12e060754864f2f9c77765a486f7577f864f3a8d0fa73e79c3c SHA512 840c4e58c80d826e67ebbfc2b88670d70a4902f8188fbfba9c63e0553d40676c4df9684ab3c7d086e9c36d28dfec7d402147cf537fd4d4517aa857cb0cd714b0
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index 5b6ab9a1eabd..2fe89408ee8a 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>william@ewpettersson.se</email>
     <name>William Pettersson</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index c493f12e0fac..359a1d8737b5 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -2,4 +2,4 @@ DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade
 DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 EBUILD xmldiff-2.3.ebuild 634 BLAKE2B 0a8b7df2c86fe4b6a1446284dd82957c15a4172eb8972c57a52060e9f8ec8ae75b5ebf87ab8cfc352373b4ab820ec729894b49c28f73831b7dc0010a62329d00 SHA512 201f5ebb12312e61900cbc7dbc664723a02d345bfecfbf48ecbd9f4151c7d41ad934e9b0177620b472981a152e6e0b0dc7bbef5e6f4d811ebaee88e25b6c84e2
 EBUILD xmldiff-2.4.ebuild 638 BLAKE2B 1d359e9782b14a28ad024906e3fd49bcbf76ce7d3e3bdc91be8d4c29b93cc668e4d5ecbb331f0b54a09392e3e50bebe16e61a1485f012a1ccb0eb7d7b8c5d3de SHA512 9d6ebc21102bb07aceaf5c84c9b5fd42e9e9091b066f0d7f8e48ab0b547e9e8d8cd07e68e41979ad0ead1d58fd33e38db52545ec0a34cdcb8a412d1301dc33b5
-MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
+MISC metadata.xml 571 BLAKE2B 683529e9b239a0cb78efd35dd49ec77b50d251bd8f3468fcd368aef74bde57072438d1f39f0641a51a34c961aea74469e8c52061fbbdcff564a24c220d28c0f3 SHA512 3cada00af2e714f7c33e1c79de4276d107d4162a5f1d6d468724e128988560f1fc27ae2733f3db7f962c9ea08cef40f4333c624e957ca73d2153ee9941f28f62
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 70f8606c9a10..32124eb5f86a 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/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">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 037f4222042c..fac6915ebac4 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
+DIST yelp-tools-3.38.0.tar.xz 213692 BLAKE2B 87da439f864df8be78f8c2ae3fae387e9d70a5dca7f4ad6b584602fd4a6beec49cf0403dd7a53045d38cfd1ac6945802032689092f2624ba8b421ab5d4d43fd1 SHA512 2042e37f8efbe9974f5a507910393b837a0b9154beb918a5e8d145205fb519c8244bb405cf328ff5014287086be5b6d33ad631951bd0e950c2ad9efc60065d59
 EBUILD yelp-tools-3.32.2.ebuild 630 BLAKE2B faa9e31442ff615884c3ca248a90a6796bbbdf8147672f8ce454272b01732d5f99641f187cb9663eb99007b23a8c7f0988b035a30feeebfd207ad7aaed8564c5 SHA512 97d6b8a3375edf5b61040840fc634728a331216aa1c13663eac5faa78fc4910769093182ae75f1872517e3613470414b04eb9ff32e72c6672a705b0f2fd42abf
+EBUILD yelp-tools-3.38.0.ebuild 649 BLAKE2B e1329d0a99b59a162ee131951fca364ae8c0d06d268e679345ca5aa4ebf64db72bda30ac9ef602501df6a260811d94ae829740b7e0c9aff8dd40d5806434599c SHA512 5ac6c7ba744b579a995378c9cbafc8875eebdc84c77645bc594d53f698c8232c027e2669cf9dd1c9901d09fedaf9915744317f880ef639e35c6e91c7657b345d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
new file mode 100644
index 000000000000..9a58cc782f4c
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.17.3
+	virtual/awk
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index 595584f3e2cb..5c5a5debb52a 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,7 +1,3 @@
-DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
-DIST yodl-4.02.02.tar.gz 309075 BLAKE2B ce9da287ca59e20319ae8a132553b669ffff926c79e7ffbf7891af3e777c45815cbd784eaf8d706b7f4b8240ceac41c38882c7b5d2b51e2691da249b0f5be43b SHA512 531b5b61f85ed556163b0cf76a30451212849e5e03e11819cc466603db0856737a9d3bc34ba11419befd7925ec1bac33f92b707c38acd2fa8047e3e1223d0a78
 DIST yodl-4.03.00.tar.gz 309212 BLAKE2B 9a89dfda5f4138f466bc2f871724087ff2c0084d06d81c32e1e865744e1c133b1073becac30e817f2f997c351b8f8192e942616174acb644dcab40d5d64c9d36 SHA512 ec5edaf932d94e9272a08867322e8fbfec65f612447fa412a7c19412569a6d811bbe5badd0af692837086a9ee8cdf8bb8f0c10a3e8333ef6096513b263c8d831
-EBUILD yodl-4.02.01.ebuild 1184 BLAKE2B 7547e9d39fd312c30e1d465cec9f95fc15ef1acfd04e45af85105b95ef57a5fa8a24949d2d70348c9c03a89a060c59a785f771f0a70eb99b673753c0ea939bfd SHA512 a33e23178c78cad05f8f3c1e1b67cab2676706e2c989346a823c993ee3ac60dbe3c303a01c71d38ef9bb5cbcbd8ef039e0ef63c8cec52409a9ed200a6d53dbf4
-EBUILD yodl-4.02.02-r1.ebuild 1796 BLAKE2B 40a83cd6c04bd975f6562f80b4c699027763816ca55594cdf647ba2f06f47328eee0c4351a1a7f94849b793ebb96dd8de3c3170613f2380b3a8a580fb1d3c994 SHA512 a9fa0a475da628273c15a772983821aa1ebb50656be96d2724f104f2c6eadc087ad354ac5b6812ca96970a9f21eeb6fd7ade54a03294b63ba8d3df3f1316825a
 EBUILD yodl-4.03.00.ebuild 1797 BLAKE2B dc4fb5136959359504ee13f2913fa30580324b093ea2511e2dc87f4985137004b535be551217242f259708bea391d5284e731567533c9d67e27cda89f1416046 SHA512 6d18ec183571d32048b9ad756298cb879eb2672c239762da2ec91a29299afb07e2b28933a0641b839c20c71fbb23350327e3e77d077d655d02d369a3d72a419e
 MISC metadata.xml 244 BLAKE2B 256b5e0596820baf1555605a91d2b5a2454bd96180ac95ea34b705405212a37eca42f21754f8f11f875607f97b82badc149211361ec253226593297d867d1376 SHA512 4116d229be9545299fb52d43d3c5f3f1bcd44e53ebb05483cf231f05d76758b59a6a1a6b7b2eb0fc78304dc3a2422d9ba70c89ac159eef4afbcc5730b58f297e
diff --git a/app-text/yodl/yodl-4.02.01.ebuild b/app-text/yodl/yodl-4.02.01.ebuild
deleted file mode 100644
index 3ea825807fc1..000000000000
--- a/app-text/yodl/yodl-4.02.01.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	default
-}
-
-src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.02.02-r1.ebuild b/app-text/yodl/yodl-4.02.02-r1.ebuild
deleted file mode 100644
index b54d4d14d58f..000000000000
--- a/app-text/yodl/yodl-4.02.02-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-BDEPEND="
-	>=dev-util/icmake-8.00.00
-	doc? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-	)
-"
-
-S=${WORKDIR}/${P}/${PN}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then
-			die "Your compiler doesn't fully support C++17. Use GCC 8 or newer."
-		elif tc-is-clang && [[ $(clang-major-version) -lt 6 ]]; then
-			die "Your compiler doesn't fully support C++17. Use Clang 6 or newer."
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-
-	sed -e "s/g++/$(tc-getCXX)/" \
-		-e "s:#define CLS://\0:" \
-		-i verbinsert/icmconf || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	sed -e '/strip/s|"-s"|""|g' \
-		-i icmake/program || die
-
-	# required for std::filesystem usage
-	append-cxxflags -std=c++17
-
-	default
-}
-
-src_compile() {
-	local target
-	for target in  programs macros man $(usex doc manual ''); do
-		./build ${target} || die "${target} failed"
-	done
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index b071e5cfdb22..75f377ad8579 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
-EBUILD zathura-djvu-0.2.9.ebuild 790 BLAKE2B 186206077ba1e1686d869ec7ee0f7c696db689ea580690ff349ca7209845fd2d875c3f7d89c6c9bfbc8826bf3f2af5f5de40cf2b72301c8d164c8ace286ca3f2 SHA512 0cb49628a301366421a53175837eabd9283d1d21f4c1a682ecf0b88bfa2ea6d49f26f1d544826e45fe2128eb4e8cad0d4241605b2bb627bc3a3326ee44d5e606
+EBUILD zathura-djvu-0.2.9.ebuild 771 BLAKE2B d7a738105a255609e1ac1e0ab0b47a6a2e1fb52ee0c3d938465934520afdd88876ce9c036f73cebccdf982ca6d7d3e44311fa89af0b774c894d8954da4b465a8 SHA512 d31717e453372402aa0fd477692774dacb77f94b6e9072bc2680a5ab71417316df1ca2112c3e961fdfa3d60f94710bd27f17536544e8d72fb25eaec0a00f71df
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
-MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
+MISC metadata.xml 592 BLAKE2B f6875d7dd73e13161bce16ad8a2da428a044a4261716b3adf20802e41e40d97c4924c20cd3beda2b39290d3c27bc338c82b754ba862762ceaaf8609cd9d83040 SHA512 ecb7e663dc712e5ea13c801c466511d754ab0ffe67cdc24f783414c85b0584a22ba08f12216a759ae512ed565916602d69ac454ffd637f471244a1840e7539e3
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index 7f5e7f55e607..f3839784e581 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -4,15 +4,15 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
-		<email>mlq@pwmt.org</email>
-		<name>Moritz Lipp</name>
-	</maintainer>
-	<maintainer status="active">
-		<email>sebastian+dev@ramacher.at</email>
-		<name>Sebastian Ramacher</name>
-	</maintainer>
-	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
-	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
-	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+			<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
index b5a67f6e3010..6b35a56bea19 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.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
 
-inherit gnome2-utils meson xdg-utils
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index e68fe9e2b97f..56d9f66b8325 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,8 +1,4 @@
-AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
-AUX 0.3.5-fz_location.patch 1710 BLAKE2B fc6a13a495f3121466da5553c044d7de31c9a1c37984cc36b219d32aa2d9cfefb894f9f8225a5d93e96bbe4c25a6a4d76c2e24da24c583273bddf7efd4de4436 SHA512 fbab10cff2bc28da23effa17f05e17ef332b4ace23e7c995e1bfd6126f5dba66bb825ead78e91b70549e41c60ca089c64ba4961f2bc0d509c4e5bd6fa2b169e4
-DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
-EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1112 BLAKE2B 12620e265b0ce055f23ce2562faa958dcc9d5796fda2a9614e54e59567281fe8e77d7fb484ae6feae4b5602fa0481d62766c1df4ef0209e9e961ed62c6537ca7 SHA512 98db4e1cc241b331a76d6b357b837f54a5edc0ed2dc7a03afb6668c9ee611888f94e5ac4e0ad3b637dd28886ee9c66b5daaf956b9a1bf0b33650fd3abc3d178f
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
 EBUILD zathura-pdf-mupdf-9999.ebuild 823 BLAKE2B ed4be465381eb7313c35873f9d479b3119c49b9175744511349b5345d6f6fba1ec2f341f05b0e5679eca91bed6f2b2a6d146706e25cfdc45caa894a312b07ba3 SHA512 2314179fdeac75c52412d950e449a5edaed5d3846d56e35c775086d17aa572fa53c25032b6251664422351618f920f909846ae4ef705fa06c06b5469ecfa8d30
 MISC metadata.xml 592 BLAKE2B 1159f04d19816c03115b8b2fd20ddbee3c420ffbd6276c9c48b80b4e6d43377354ae935d01c0ae7b3d81f8fc1f7b0f0928ee72ddcac6826c2775efd109b33e32 SHA512 449cce725a42bb2f05746e9af3e474547e83b4f7d25357b948ab8f24a9a6182dbd627a8cfa66b4385e396cfe3bc7e9dcadb9a6672eef354b49eb229e89640de8
diff --git a/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
deleted file mode 100644
index e031db3c9188..000000000000
--- a/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/zathura-pdf-mupdf/search.c	2019-09-12 11:29:21.527194069 +0200
-+++ b/zathura-pdf-mupdf/search.c	2019-09-12 11:30:11.648675352 +0200
-@@ -39,7 +39,7 @@
-     mupdf_page_extract_text(mupdf_document, mupdf_page);
-   }
- 
--  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
-+  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_quad));
-   int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-       text, hit_bbox, N_SEARCH_RESULTS);
- 
diff --git a/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
deleted file mode 100644
index 03c0bf24aab5..000000000000
--- a/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c2dd7835b63ff68c0edc8a3182b3f994dc6ab4dd Mon Sep 17 00:00:00 2001

-From: a <a@a.com>

-Date: Sun, 16 Aug 2020 19:46:11 +0300

-Subject: [PATCH] fix conversion from 'fz_location' to 'unsigned int'

-

----

- zathura-pdf-mupdf/index.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c

-index c421f5c..996d012 100644

---- a/zathura-pdf-mupdf/index.c

-+++ b/zathura-pdf-mupdf/index.c

-@@ -67,7 +67,7 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_

- 

-       type                    = ZATHURA_LINK_GOTO_DEST;

-       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

--      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y);

-+      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y).page;

-       target.left  = x;

-       target.top   = y;

-       target.zoom  = 0.0;

--- 

-

----

- zathura-pdf-mupdf/links.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c

-index 99c5715..2e8e90a 100644

---- a/zathura-pdf-mupdf/links.c

-+++ b/zathura-pdf-mupdf/links.c

-@@ -57,7 +57,7 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error)

-       type                    = ZATHURA_LINK_GOTO_DEST;

-       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

-       target.page_number      = fz_resolve_link(mupdf_document->ctx,

--          mupdf_document->document, link->uri, &x, &y);

-+          mupdf_document->document, link->uri, &x, &y).page;

-       target.left  = x;

-       target.top   = y;

-       target.zoom  = 0.0;

--- 

-2.28.0

-

diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
deleted file mode 100644
index 965f6f84b38a..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.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 meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/mupdf:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
-
-	if has_version '<app-text/mupdf-1.16.1'; then
-		eapply "${FILESDIR}"/${PV}-compile-fix.patch
-	fi
-
-	if has_version '=app-text/mupdf-1.17*'; then
-		eapply "${FILESDIR}"/${PV}-fz_location.patch
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index ea922373f61b..cc53f7811331 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ackvim/Manifest b/app-vim/ackvim/Manifest
index 159cc9941929..eda4cca51a37 100644
--- a/app-vim/ackvim/Manifest
+++ b/app-vim/ackvim/Manifest
@@ -1,3 +1,3 @@
 DIST ack.vim-1.0.9.tar.gz 9361 BLAKE2B c1bbcd00d7ec5207fb7de0ff1a49df5ada31f02f1b4dfabc84ae3567f62d058224fb6e7d3eae338f4ba9ae09276a1ca3dc2a7025a154b93d008e243fc36ba921 SHA512 42c931433ca2554cee0ccdc576891ba82efaebb0e5301ab279b3db8160816892b6f6232da7389058177ef9640a07e9582409c852ee5b55f3c9ee0b6f547ae8d0
 EBUILD ackvim-1.0.9-r1.ebuild 525 BLAKE2B a9efb2a16765815197b500d9cd92213345abb076018de164966a915fe2dc9601cae738b25f10be0c17eaaa8cfe816f82897e40403522e358170280fc775828c7 SHA512 c1584b58eb21af819309bbaa079d8762cd8a69034e12dffd243eca49bdc20d160ac92a3e5ba4c5c0d09e53cfb4a57ed421453dd1aad4b1a25c00b963e8138ced
-MISC metadata.xml 441 BLAKE2B c75a457783a1afc0c008bc4161787dbec890f51ef35ab9fa38467ff7b0c4ca336a376eb053991fecfbae08f666344744916e7d2fe1ad36d5b5784014d8242b37 SHA512 2d1dcc58aad00a20900a58a57a4a560adef15405ae2c9a04e52cb82504e8999bcf2461cd39d8bec8211c1815cbe82ea8dce35970e83ff2357f8e0974c38a9d6d
+MISC metadata.xml 441 BLAKE2B f511d81993816a0dbab7c9046acb4791971c4504b96e9b6a8379b0e200b505cdff161ed9fbf8af72a6c5e7157fe8d3ad2978f31020b6cb92bf3d69ad73ef50a1 SHA512 3463d306d8c9e467c35f304003655e5f39e63591c50b8e8d9e498ebe056c03ac095a95431557641f24cae441e237a77480a5ee3cb365ae91a541158c13dd2c8d
diff --git a/app-vim/ackvim/metadata.xml b/app-vim/ackvim/metadata.xml
index d5118b2c9442..c0d9ae10444d 100644
--- a/app-vim/ackvim/metadata.xml
+++ b/app-vim/ackvim/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/airline-themes/Manifest b/app-vim/airline-themes/Manifest
index a95aac4a1c77..27143ba56290 100644
--- a/app-vim/airline-themes/Manifest
+++ b/app-vim/airline-themes/Manifest
@@ -1,4 +1,4 @@
 DIST airline-themes-0_pre20181021.tar.xz 38516 BLAKE2B 2fe1e848b57546aa39e02262e5ae3e0164830641b1c8ccca1d3dc04afab8db4c618b079c63d5854697737610df1ab891d1622a22b89c431331b8bd16cc31fc3e SHA512 764fa44a4711c92a03f6f16a3d774ad871d13adfa53e7b942bad677ff1d03f32aa24723c612d50c14ca996fa971f48695e259cc53345d253d38e63f08651e002
 EBUILD airline-themes-0_pre20181021.ebuild 423 BLAKE2B 9ef9a6d05dc07798cb0c906181a26e268d3f6468ab5c1c0eee5011d2784c14593dc48def5567726c343ba60b475ea6933575ac56827eea5fecde9af955c82f5b SHA512 16afd66ae7ba2f42342a253d9904bc581218d275b4bb6309a01f981090a70581e0b53f3990e041c5c12e73cb7a4fdb3fb9b92697ce80a365e7d6fc847a204456
 EBUILD airline-themes-9999.ebuild 408 BLAKE2B 465ac11ae90275b3cbdf3171b957257075a86ba73699f12fd5ef765ee31094bf39396dd2b246ea1dc321051f9701b95d09065363b4d735f45a83bab37c6e3da5 SHA512 4f96d7819deafa452e8efdb4531208a19fad406e96cbfd2765ff216ed0f191cccddeedc4cfa2b4346ed1896fa2424aa4064a833444f0b1a3e4957dc393a391de
-MISC metadata.xml 439 BLAKE2B 45dd2e92f4cbcd83e0acbe5d4bae4aebe12c541184edcdc1187e0a8f8aa3887bbb089d9253147c451e05be8b3b6d9f8fe84a9f4b6cacfa24e11a2288396ef86c SHA512 d652a18b151c701e17191e1dbe3dc57f6b8cd02ec2107ceef4dd9ae7164724b62389872025f473cc85c328b8552b9e16eadc2103080488e296e2d81253ce08f4
+MISC metadata.xml 439 BLAKE2B 92465de645c5d9530191eb278ed90bef3060ae1097bc1ad6459e93fcfedb12cad84cd03d3d9cdd195d1f4eeaf9cfa0ca4022adb47beab0c5df118274f0ec0025 SHA512 115265faae58bb6456b48ebd54ba749c6e5dd8a755feba18928e7bc4bf49970c9edd62b2b3011bee1993e8a5741e1769be4f364dbd3f9c40eb74a62ed6ed38aa
diff --git a/app-vim/airline-themes/metadata.xml b/app-vim/airline-themes/metadata.xml
index 6eadc4d2435b..447cb1e22770 100644
--- a/app-vim/airline-themes/metadata.xml
+++ b/app-vim/airline-themes/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 751ee40d9f1c..5f765e3cf1ab 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -4,4 +4,4 @@ DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
 EBUILD alternate-2.18-r1.ebuild 715 BLAKE2B c48f19be85c246029265f9eb74aa45b979d2899a34c057af1c663514e0bcd6c6693275e223755a4c729082d3a1e782291f7294058ba6c8e955377264ba52c6c5 SHA512 147f6c0e9738de4ff21948de71af3287277cb69817399d8c77202429123ed635ca8b755e151fae4b97e9cd4c9019be2fbcaa0dcfe26b17e1cd65df6e1460be1a
 EBUILD alternate-2.18-r2.ebuild 999 BLAKE2B 07e53304e03cdf38f1908efe9da443d1959d017c68297636939c49fc3afe0350bda9cc092cbadbbdf1f3f00247594fdc6935d9faaab7a7c362c12e6845c859d5 SHA512 febfbb3378e1a3b5179100d3e9b664bccabd17f96b861dd4c4bca65f525ee1d6390b805f020db5759e0af65ca2abf3c3055a4b47e89fc70c01a03935336edee7
-MISC metadata.xml 331 BLAKE2B 2dc5ef5397f37066b5fc7d3a3c5c04185632f538fa6efb5006d0d8aa12d51696464850b2b3a0aea4e7bff8c3e9caf9cbe9e90a312e903d0b5313e29eb5588d3c SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d
+MISC metadata.xml 331 BLAKE2B 1837a5a93c5114047149660345bcc4f52fddc80d7d711c6e4002b9ff1972577714c9d30a09a2d3038b72f9496e96b9a1d9e9971f68b8d7ea5718621a647fb20f SHA512 9c7969dd9021d0ff15d7e91f3b750b66bb683202d5e9262fed75f3114527e6de5a1d81f558a556f9d4974192f1cb64d12052cd444d09e0a7d105a6a93a6721b1
diff --git a/app-vim/alternate/metadata.xml b/app-vim/alternate/metadata.xml
index e9468b3dde77..9d2b40fb0437 100644
--- a/app-vim/alternate/metadata.xml
+++ b/app-vim/alternate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
index f86f4d8ff46c..9bf0708706ea 100644
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@@ -3,4 +3,4 @@ DIST bufexplorer-7.4.19.tar.gz 25679 BLAKE2B 814adb79fc196174a9915643a3617e3c324
 EBUILD bufexplorer-7.4.18.ebuild 504 BLAKE2B ee68329b9446ebf1c7571af162de167dae2ea85fcdbc1b9ac88cbb623bdf9cb728d1ef7fe296be1309542dd5ea01c68a72effaf920274f2a8b731ef26db4c168 SHA512 90dc950091b57c65896ff66b77e3b65671cbb21ae37f878445b3771153ce9509dcc5984fe0c3734ae693ca04518328b8517312188eb691a03ef4066df06752ff
 EBUILD bufexplorer-7.4.19.ebuild 506 BLAKE2B 8bd50099f3da4d4841089e63f9634f480190c4e5ef0a73ddb3d7f181ebb3ae32a72970fc51df72d7c3e31e46c288f69ac470095e246855f36838f82235670038 SHA512 b396c84c4fda3fbd12d1a91a96012c1cae337c8db7bd2eef56e70b79ac3d45645e20139f049c8749cec6d146eac0487c6469b6d97d67a30674a15c24e67ca5cc
 EBUILD bufexplorer-9999.ebuild 629 BLAKE2B 1bb452f22f906ffa14e6dec853dd5dfe14a478cde4c4e7a47984d42ac12e14b338423bdce9869c5643d4a4f30efab691018f6c8c11fff5714dfbd60e110965dc SHA512 7fe257c7df973c65d80920d2af28c710e21a8f3337628b517faa546de954b27b1303be55334b0c89cbbcb814b8cc40c4a6a75d667b501df8018de803764d919b
-MISC metadata.xml 337 BLAKE2B 1f7ff65f6508fb9463322cbf6d76f55455dd281dbc5b1227fea6f066e0c197216cbc775373fef3a8d8bece89f39b84ff5546ab5b3ee0ffe6244ddb482e51d2ef SHA512 31c66f4059fd32f6521fa33b6d655d6d006a71b6d14fc008e4dbe2cc1b93bd3fe5a8055105afcef07f38845377ebee7ecb41d0f92cf7da73e020dcf72216590e
+MISC metadata.xml 337 BLAKE2B 677344320a4428087bb1ae89643277c0c00385cace597dfdbf222c46e0ff23387151a4310060e8d275a52e01dd7ec7788bcf49a576d2c73a522d13c002311706 SHA512 a61e67d0b9f1ea651c31bb5fa0c40f6206b6ce84f92b352e1baabcf46bbff40658787740d103968ef06bd6afe00708717cc17dcd750766a4d78243332d0406c0
diff --git a/app-vim/bufexplorer/metadata.xml b/app-vim/bufexplorer/metadata.xml
index 5c41162e1690..4cdd1aa2e6b4 100644
--- a/app-vim/bufexplorer/metadata.xml
+++ b/app-vim/bufexplorer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 5e0fc426ce4e..4b95b28d405e 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1,3 +1,3 @@
 DIST command-t-5.0.3.tar.gz 84019 BLAKE2B fec893aa698a1d1bfc86cf7bd08562f19b54e58d81b7650e50acdf17bfcec54f78aae38d05ca5f93ae60c981a6e606d5c68c008be3508c7d41e74aa9f064943a SHA512 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb
 EBUILD command-t-5.0.3.ebuild 1278 BLAKE2B 4436b01a61acb082d671eb2bcf026f9547c2ab719c2a7a65e22b57c16d45ef9a0cc8e4a8b9da0983f3bdb45a1a60a8f85430f4dc710631412a93279aa491df46 SHA512 878e16ce0555d997c177aec91aaa4bf051dda32c0b7be79b02e3491be184d96707137f73d236f03052e03e42e7860a2e4ea672f273658a6f69a80f4bb4686757
-MISC metadata.xml 331 BLAKE2B ce98227d75f9770a856398ac8ee677a237a2ebff220647964e59ffa6c02ae0162eef5a97b078014cf9c07fae2287d3bfcdba4af162f9d3760a96bc71f5cde6ae SHA512 e6b82ef13f3942afbb08a2d192073d5498640a719e64512c8203c15081e6873e0acb39421adcc711efc6a0f3adbea2953309da0d48acc86a92c51b6a3924f331
+MISC metadata.xml 331 BLAKE2B a65f2e6cff106416168097ba58849fc3f88f9fcfe01c7d6e201344fd77d5ac36ddac46400359542522b7fe8e9c52f43d4f562b7285d32919f10f781a5282902c SHA512 07c9de3f662f3acf4bac7f8b8eac6fec536241d55084346b4cb2a78665165477573a6ae2570fd606abb11cdfb66d76785714e6475c396da0506291eaaa648236
diff --git a/app-vim/command-t/metadata.xml b/app-vim/command-t/metadata.xml
index 26f6f323f397..bf0e9b852102 100644
--- a/app-vim/command-t/metadata.xml
+++ b/app-vim/command-t/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index 7a0187b45fe1..82bd1c45472e 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -3,4 +3,4 @@ DIST csound-syntax-0.8.1.tar.gz 404555 BLAKE2B a26d158a3a050b3767cade77a0ccb8f12
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
 EBUILD csound-syntax-0.8.1.ebuild 556 BLAKE2B 234fa59dfe739d5f7279e8611f529126bd7cc5df1ebd325ea14ed7e7dff5f52b4e75e1e557c308e0dfe388742d0890528128ded4e72aaeeb4641806fb45d960c SHA512 308a47c79d16af3d41f8d8b72f5ec429cf425da19ccfc7e104e3842e6c3c8fd694ec9ee8adb4309af08d542f74b4a923bbca6bebf3150c418a7a367e7b68c00c
 EBUILD csound-syntax-20160804.ebuild 420 BLAKE2B ea16ea4b0635871ed878428993e747e157e43636e80a0120cf993fa2691597eed11d102d693e36661eed19a2c65f3136fa210ec24b8ac9a08e579fc5c1cf0e21 SHA512 1f553ba3382a53b67ad8f8d3a593b5997e418e61e39ac308c86a8188e7157ac9036c3117bb8b35a1eef3f299b0b9de8b7a9a571e20db10d48417cb469e7cb563
-MISC metadata.xml 329 BLAKE2B e0693430b5111554bfcbd4929204c4e88534933d4f5d8d445345845487adfcebc4181e5b55b6c04211c696a794b53c4dcac068e150949b419cd022c4de612a44 SHA512 5caad244c40e0c4a7db09f340c0119758dc579db6bfc5a82e1e0023e7cc63964dc85b4f35546155f15c1f858991d8ed428910bb5b7c41d5538b34bbeffa8354a
+MISC metadata.xml 329 BLAKE2B 116e9fff6b6f839e7be19c8180d0eee6868395653cf0698906967f6d7522768766eb7d5aed9ffe436707c16ad8bfe1c87ee98ce0eb32c3859695f4d31bdf43df SHA512 d774938c6aaea43ac1bde6aee89b872f1df2df098a2d58b1fd0e0e5eba2eb11179f22780aa4eabaf4fc00e777a74200ef49d42c59841a42dc51c4e2f77e4f338
diff --git a/app-vim/csound-syntax/metadata.xml b/app-vim/csound-syntax/metadata.xml
index a734c4404129..234f700a6082 100644
--- a/app-vim/csound-syntax/metadata.xml
+++ b/app-vim/csound-syntax/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
index 915b6f9c9f86..a663bb26d012 100644
--- a/app-vim/csscomplete/Manifest
+++ b/app-vim/csscomplete/Manifest
@@ -1,3 +1,3 @@
 DIST csscomplete-1.0.tar.gz 16621 BLAKE2B d05f7f781fdbb26f1672ab47dc01345be3fd78a3cf57e7f746453fd437f1b387a24969fb3de7cb23163abe098a670cc36ac989e2a1285de6c7499ec41ea59a0e SHA512 adbc2634534c3f0f8b3ea2389950d37540a2f5c7b4756e428cf50d6086fef5706aa5cde9b3cfd1fa87a9b6f07fddb26be75bf32f7ffc4193d5f0813dccf84c0b
 EBUILD csscomplete-1.0.ebuild 514 BLAKE2B dc3e1f4526dd4ba373e9d84532db8267b4f39650ea51406a871692b68f05af3c6d1db5ebfa140e3a257ec955baba9f579f9c3767f6d2045281e0017a9f722f17 SHA512 d2f2220624d4f751f82f64920fb5d27634ba21cdeb1112220b5710a8b2e471ad5c693253c7294e0e5d87d21da122a979d16c70d79b8a1d9197dce411058eb151
-MISC metadata.xml 431 BLAKE2B cc935d06e76af5fe96e6f270140525e207c316cf11350476e446432b51bba36748586016edf8b314f1a895c21234bdd27873b9d351150edb570237a3aff45010 SHA512 18a9dd07313408b87c59fd36d268004d5d8c4370a377e524e1c62aadbe1d7bd6f677524912b71e5eed7ae421ce4eba60c9581382b97666cc5ed70dc88ca9b69a
+MISC metadata.xml 431 BLAKE2B 8f740ff74f5cee22a3605d0ce59fff1db8170f2665917169468bfb068495407e4c98b4df38a86adb762ace3faba7a39b4d9014c6c5f0dae4412b6d59fc397c70 SHA512 05c7b8d31beb48849fb6401545a4932e64b0264704ed4eb918f0b781095ad0ac57fd34d6fc1bc8b4ce420eab208d3b1fdf27fedcec2689d2d1ac8385873d79a3
diff --git a/app-vim/csscomplete/metadata.xml b/app-vim/csscomplete/metadata.xml
index 373d7ca9fa23..82aa90086fcc 100644
--- a/app-vim/csscomplete/metadata.xml
+++ b/app-vim/csscomplete/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index e278f44cbf86..3b9d8d39e313 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -1,3 +1,3 @@
 DIST editorconfig-vim-1.1.1.tar.gz 33287 BLAKE2B 4c79ac3bf1f82ca6182480ab2f3c2ee24b8234f5845c63d90434bb57271981554a0651d8bc0314c718ad9700adf7903fed45f5e400d8ae8a0b6d42932e89e071 SHA512 7b94db4b2f641ecd2d2623bf55bf9b457c007b2b5c8553cba5b7a75bc34823d6995d3c9ed13febe0f59de6f87c52eb0367591213c43c6fcd7c331c529126f4d6
 EBUILD editorconfig-vim-1.1.1.ebuild 701 BLAKE2B cd551b493af3415e41792555ea71b3a535eb8eab176fc61676d335b9c139b4c1b5ba782cd7aa760ec2a419e22b92852250fb47bf4dbb35f31fe4ff380c0789ed SHA512 eec38d17f6ba5038ec3bfc8557f8fadb888593d8ad30f506d31cbf43cffb862e82947c2c95517dffcc7ca487520dbd4fdf86e31be2644af575315e91e88d00ff
-MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
+MISC metadata.xml 419 BLAKE2B a133c95d7fa2e7539996b88157d6ac02205b1ea2537241dce9e4b585dc085ebd1a9a291e7b439f884ddb55003e2b63656b9ce59af3181c6ccdf055a4a1aa0c60 SHA512 ce9dc7a57acd853eef7c4f83f7544fca75235b2fd301e335373c69587a755e33f20ed163be6dd5eafc47a9ccfee8e8a785f83bc6a03e935d70b599bdb184bb49
diff --git a/app-vim/editorconfig-vim/metadata.xml b/app-vim/editorconfig-vim/metadata.xml
index ea346f7a9329..d1648589d048 100644
--- a/app-vim/editorconfig-vim/metadata.xml
+++ b/app-vim/editorconfig-vim/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
index eb3a3c2fa042..97cda015e2e8 100644
--- a/app-vim/ferret/Manifest
+++ b/app-vim/ferret/Manifest
@@ -2,4 +2,4 @@ DIST ferret-4.0.tar.gz 36867 BLAKE2B 0c386d5ad24fcd0662108e8e6005f94900c68099af0
 DIST ferret-5.0.tar.gz 40975 BLAKE2B 75970b35852c5859ce53686eed9c8ba0d3d8599c9f53dc0a2a859dcdee8efd99fef298964db7cd9c2848180d87f45cb7e40a3352324b0530c5797647199a7f2f SHA512 882dc7d3baaa8a0e64244e8b7c3fef31088d4f89e49bf57dff85efc65f87fa6d3d8516ed3067dab4f4aa9857bb429e6f50d389d57a8895f6dab01db7e580867c
 EBUILD ferret-4.0.ebuild 489 BLAKE2B 33bdb03c5b9f8e000aa30f0179f5f6ccf06f3d0fbc14a9f4913e7b69c093a74867f6aeefb21801f8302a7f891c53fbb2c9a1da7751e1d3d48eab74b82057486e SHA512 d8c78b61b4491cadffeaded004d4cadf6c0ff967f981621d353b6ca542e9ce693484ea2488a4602b87b03d2d9f96e7261609b23cb881dda080b1ee761c9387a5
 EBUILD ferret-5.0.ebuild 492 BLAKE2B 63f5b4e6dfc9d98118eaba141390806cff51640f4a224cf3623869a53308c0573585b5c7fdc495717bbf74924bc9d3edd21bba14a5e1333bfc7183a362993c1a SHA512 ad5f6c4c3789d57e7559106948a4286400ce28bb00f7537bd6fbc8a54c5e2f9b6eaa5ca8da21392826d8375c741164201837ae4eb7fe5fc394c33ac8e94ccec4
-MISC metadata.xml 440 BLAKE2B b0871983d30d46d6e350449f58f2c9b363349a3d6b564dd684e246b196e10d3539d61de4253761a3242d9eb560ada5f52b3f081c1b8c001daaf2f8959334bbbb SHA512 d7bd2e675190a561e1211895efc03cf373117842c56f6ce92a0f5e421f4a5cccf3ba2cc94deabe063697612ff3bad3eb0d7ccb620715119c34811f4128aaf81c
+MISC metadata.xml 440 BLAKE2B 174dbae8b73a12338dcd3957bff36107a778e6be8cbcce093a025e1f7c43574aad5217ba652ea348b00fed095326bdb7081ac737c4376a6f5e2baa0d872acc1d SHA512 6c8575afdcdaeec88497dce0d1c4961a5bb46cde15315460ad8df89e6561866ffd7d2cbf58b63db50351da397972bc7fbe00529c47ed16d6a1f28b33ed5822de
diff --git a/app-vim/ferret/metadata.xml b/app-vim/ferret/metadata.xml
index 23f63c1306ae..b395bd901e0d 100644
--- a/app-vim/ferret/metadata.xml
+++ b/app-vim/ferret/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
index 444220dd7ad7..e53f69033f70 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,3 +1,3 @@
 DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
 EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
-MISC metadata.xml 437 BLAKE2B 302eee78ee54aea1ade2aa9206518258d8d4d8d2382ff7f5ce786c404561aa049f0e9a1b50330fe54d3c3432d688a7ddda193161d38dc43559278f802c378d3f SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7
+MISC metadata.xml 437 BLAKE2B 6ee742532c2c15329f47bb72a97fb2a0c56fe7bbf4f341a81a62dc404d05a44d3af6879cc030caa511a290263babc030dad675f8620b97162b93ad442542c2e3 SHA512 d9142c0372916dcaad285650a3f94db9715a81e68e3c73b19d2c3c25a7434425983c94bd0e5b99d41723e987932895ffe8d84081191e4dd5571f23b02d01667b
diff --git a/app-vim/indentpython/metadata.xml b/app-vim/indentpython/metadata.xml
index a4ec1d420f91..38f8f9f2b5ce 100644
--- a/app-vim/indentpython/metadata.xml
+++ b/app-vim/indentpython/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 2895bb262afa..1bb451bba357 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,3 +1,3 @@
 DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
 EBUILD jedi-0.10.0.ebuild 891 BLAKE2B d9586d6370d814223e3a4e76c5318a53b3f77fabadd07b5910783216b0a9c428feb1642680fdd35ff5ed9ec5d33b072c6cb227b6fc6f0381a8c75b47608a8cc2 SHA512 5cfaa9478152f1f9f0e77a8f83c10e0d1a6a001bbb3cec6b5524bbd0462119e5bd8eb62ccef9ddfe93861336bb8fd799568daf40326f7a6e1b4ed6c7e2475bbf
-MISC metadata.xml 735 BLAKE2B c89395f99de7a7f84405a45e70fa93bf253f739fd042ff633fb3dbe3bd15ffa82047151f8c739c0e42c45a58e0c4ada34011b318872b53a93d5249e54d9dfd60 SHA512 ae7a7c0ba0976bd450ef4c1b87a2f1cba9a1f0a32c44ab050accb36a2a9d1b9af8a24910b65f0f90cb915968dc13be8aa1a6eab141a8e1102c64e0aa656f08ce
+MISC metadata.xml 765 BLAKE2B 18bf7233db72f6301ebe3a4b5e13b747299ce71686b6d230463c6b6e5758255843bef176160821038cf129bbbb45d070e232cbdde0b866fbb1e3c13629a0b28b SHA512 aece590777da00e80f991f372d0fb264f1973ce5f814f56eaeda95c476d0ad9949cec6acfc7ed2aa6c98f29add4f954066470a4bff72b86bae33e9911099179b
diff --git a/app-vim/jedi/metadata.xml b/app-vim/jedi/metadata.xml
index 5245a475b30d..c3cc0adc9d4f 100644
--- a/app-vim/jedi/metadata.xml
+++ b/app-vim/jedi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-vim/lightline/Manifest b/app-vim/lightline/Manifest
index 5a13d685d82e..a91ef3309852 100644
--- a/app-vim/lightline/Manifest
+++ b/app-vim/lightline/Manifest
@@ -1,2 +1,2 @@
 EBUILD lightline-9999.ebuild 543 BLAKE2B 15bb8ad6c3ebbd1e89eb6357ba594045f94a0776eac486f415df8b529614856a0785d84d235685ec4c7f0d854e92330272c31802a10b949d666d14a7147421ac SHA512 f3cec9b22a25d7bf57aa8e42c4805530ad2988d9ad328dfcb7f017c1e0e54eb10c9d499f1a6cfd840b13c78a23c3f49d0af0870dc1919f4d49a61a8bf1deb6f6
-MISC metadata.xml 430 BLAKE2B 62d2f51b8599739f3b15b459084904ee4bd2a9736bbba7a093779aedc495586629f39f2f7511688f1f0898f27eb023acecf29ed921f56b70be921174f9bb17cc SHA512 b6fcb4818bfab07af559ff67912a956bffa0908ce29a91913088b86b7bea38e023ca1d407cacb30e48598e6d5fb5b851b72196eab5fbe7aa78362b976da535d9
+MISC metadata.xml 430 BLAKE2B 30c23ed6788f7835e63a1cb2afe32adec3f4a87624a0c1029dacc1462a2ec7780cb792354d9b5dd1483a9836b001368d06379378fc8e9beb1bf59ff2bc8731e1 SHA512 cb14fc408a7a54fd58db70b1813ad3bdc28416a8ae41e8c3e4aacae5d797fbaeaffbb91196edebf9f9e07853ad67e4bdeff53181eff590e6a80224998340ce8b
diff --git a/app-vim/lightline/metadata.xml b/app-vim/lightline/metadata.xml
index 3e87edaa71f7..d92ead46dcb6 100644
--- a/app-vim/lightline/metadata.xml
+++ b/app-vim/lightline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/metadata.xml b/app-vim/metadata.xml
index df7f60378d9b..5fa2573aed77 100644
--- a/app-vim/metadata.xml
+++ b/app-vim/metadata.xml
@@ -34,4 +34,3 @@
 		oraz dodatki służące do sprawdzania pisowni dla edytora tekstu Vim.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-vim/nerdcommenter/Manifest b/app-vim/nerdcommenter/Manifest
index 7d91fd4045ef..45135930505a 100644
--- a/app-vim/nerdcommenter/Manifest
+++ b/app-vim/nerdcommenter/Manifest
@@ -1,4 +1,4 @@
 DIST nerdcommenter-2.5.2.tar.gz 37216 BLAKE2B 80cd085022da15567e935aaf9d770ed6fadd949a4c8cb6cc3244bb75c76ccb81adee070336a7f4ed409e95bd88db8ce3b7259d8e2f390b71b6e0c575e02ed423 SHA512 63b43abdae35e2e5d9132a5cc1e3109a9ac7945bab58b7f2544bb0a6d390f2f503928fd17c2e82104e84454d9278f98fc581dcea8ccd08f5f1bedb2d5f112bf4
 EBUILD nerdcommenter-2.5.2.ebuild 686 BLAKE2B 3ea615b0f2bfe055bb2e27d0ef0e93256c1980230decc93dfd26145b4a7180b6e2a29547ff815fa80a650a20b2b1d3e9a66ba8b79710c421858d0a35a466ba35 SHA512 9cd1fd0cba8c2c7f38a7c5780f80c5b4483925d92d6d7c66e2cbd86dde8daa0d4c77749abfc3f43147de74d3e5af50281880db284cb2d0f4b1bdfffdd3a32b05
 EBUILD nerdcommenter-9999.ebuild 688 BLAKE2B f1da65769edee2486177403f07edfe79884aa4f2de7b10afd3e0b83c75eb70341ee9d9ed154e909524c58ced71aff2d9a221c695ee4bc0bf58d5f996ff2a0b89 SHA512 ee1c0d6f11bb586b7a0552ac913762fffb19befcb43508a5aaf56ca89fa521b73f992db196c0839c4edf0859ef835e7855082f852642ea19fe2845805d813f24
-MISC metadata.xml 338 BLAKE2B 654c3b28cc5544f0f9b62d9b6c75f5e3a87e6e13e775ab2d4d0c65a276403c1b8cb0c3e49c72aed4564c39561a395d2dc621efbfb158caa1c28b1cdb79cc7800 SHA512 fd7585ceac792841d94bd11039d0f2367ecbb2a5d297213b6679aecd22a3f64d64f627421e3447ae6f01035bfb1ab7208b5d0c53a9d402085c9c5bf48b43eedc
+MISC metadata.xml 338 BLAKE2B 6543ed247c9247bf9dac2c739a66c49e418787fbafbf76493557523a06e88768811908928d4a82c7a769f1b4513e4c0c24b0f7d0c34288ae68416c07a758171c SHA512 3c27ed8dfb90c6ce67286added0c0a4ba154befcf5810d9a1f50fac71857591c69f77619d1b9abd4a47f0d9cbcf2599e86a86110eab9010adef2892e41cb7bc7
diff --git a/app-vim/nerdcommenter/metadata.xml b/app-vim/nerdcommenter/metadata.xml
index d44387bc0e20..6488fe1df077 100644
--- a/app-vim/nerdcommenter/metadata.xml
+++ b/app-vim/nerdcommenter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/nerdtree-tabs/Manifest b/app-vim/nerdtree-tabs/Manifest
index 1539ccaf230d..f4a81b92a951 100644
--- a/app-vim/nerdtree-tabs/Manifest
+++ b/app-vim/nerdtree-tabs/Manifest
@@ -1,3 +1,3 @@
 DIST nerdtree-tabs-1.4.7.tar.gz 11135 BLAKE2B 0c2e5a5616a7e4a22600d20f0d759e95755194a3d867034e3c1f66025f3e19c1df0b38f34f99f7ba2a2ba640000543db5e29096b705d51f5c98098965fa9c562 SHA512 f11172f0f64628752c7b523c7f65864a35b57ac83c966dd765402489c52b78c6a86bca65b99f788f2abf0b3d489e188dcfc9e75b342818dacbae221930aa6449
 EBUILD nerdtree-tabs-1.4.7.ebuild 505 BLAKE2B 6abe437598610432e6872c5f382c9f98064ced90b20ade4cc8237579c5edc4b2192c9562a3420658fc271b6275775af3608e3fa7f7220da9cc835756b152b3bb SHA512 31fb9e6a514fd90aedec1784c655584618b52ddfcdb4beba3bc4cad7450fdcbdcae56c522217b4388970653914fd2cb2dc4eed5feb4ea9ca494f4a4ca3317953
-MISC metadata.xml 432 BLAKE2B af435bf8c76e3068c6d3ebd86379779b6ac4322c5b84ae89ea6da203524d0de8137661bb7a183eb37b4086ffddb7c25f0b0d136184f3aeade22ec26e02cce474 SHA512 52c60fed04ea58d04749f4c9c645b252b83b4b8ddd0b6b813329b2be250e78a2f7a55c71a737288cd1f832922da54f5ea7eb5ac0bc3b3350494f7ada6e480b39
+MISC metadata.xml 432 BLAKE2B 6785182d3f943c465901ceb1de9c2dea4211bf19848f593bf1562335be039bd157197cc8deeffdf3f4da6b46979ebcf3e90bcbc1496ac3ad9ee74be42496af18 SHA512 c2e22c293b4f7647925645cff325652ae26f340c11deee492a3bc14537a5f95279fa752c72501fdcd7de0b38ffaa739830eba94dc0c98e24c123002d9a773d3f
diff --git a/app-vim/nerdtree-tabs/metadata.xml b/app-vim/nerdtree-tabs/metadata.xml
index 345b182b51ca..073ecbb61612 100644
--- a/app-vim/nerdtree-tabs/metadata.xml
+++ b/app-vim/nerdtree-tabs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
index d8e3a637621f..6c41613f024f 100644
--- a/app-vim/nerdtree/Manifest
+++ b/app-vim/nerdtree/Manifest
@@ -5,4 +5,4 @@ EBUILD nerdtree-5.0.0-r1.ebuild 529 BLAKE2B 2dbec1ec982f417e0b30f6656ea589f13dbe
 EBUILD nerdtree-6.4.1.ebuild 531 BLAKE2B 2849b49db3ba0e94066c61ea3b748f84e32765426c50b384e6c2b89308be814a8338e3c49e9c1cc91efa8b3c94f49543066018866a5818d6fb26dca2fc86b019 SHA512 a2b57338d2d1cc0ad828c89b7ccd825fdaa441b3304d9fcc5cb8e4842bfde0cf38676a2e95df4be831788a8f40ce056a35e2cab449c8bad6e872ad3e1599052f
 EBUILD nerdtree-6.4.3.ebuild 677 BLAKE2B ceaf012b6b91da875d452073a1d4d630702dd524a7eb2f75e821fb96d9026a598987308f1e46d03cfc0c626e3e15fb3dd09ff050803de1ac7ce80e7ed8e6e025 SHA512 0f2aa816b32e3eb96389090647d5fbd30d76c38df884ec7d35c75ca97d8dc6de2256a8bb953ecf67bc7d336339e63ebc4f99d19679d98d1f582ffad7d46ce4da
 EBUILD nerdtree-9999.ebuild 677 BLAKE2B ceaf012b6b91da875d452073a1d4d630702dd524a7eb2f75e821fb96d9026a598987308f1e46d03cfc0c626e3e15fb3dd09ff050803de1ac7ce80e7ed8e6e025 SHA512 0f2aa816b32e3eb96389090647d5fbd30d76c38df884ec7d35c75ca97d8dc6de2256a8bb953ecf67bc7d336339e63ebc4f99d19679d98d1f582ffad7d46ce4da
-MISC metadata.xml 333 BLAKE2B de49a7c07d2268dc5550bd2bc842240e53a087e370a093dc08a5360b157e0411cc9dc99e210f1012afeee6123a55f46fda13187a9e6d857b5429e336f5ef6ae8 SHA512 703134609bdd4d7ed256d4c6e3f045fec2ad056d0348af8e97bf6513c5e63139ce0084e8ebca8fe56c925d5ad7fb7146256f932094ee21846a0f8915f0dc5dea
+MISC metadata.xml 333 BLAKE2B 237dad3d7df5be9860ca3ac093710436857f2064fd97ddbd6ed0f5c9512f471334732406a722e912f8032b15296c572c4b37481a0888d8ee4b74086d6326ff5d SHA512 ba32a28feb4f65fa3a3c543610e9c9ef0f8b8195264e8bdbc45a665b68551163593d82bc8a78ccd28dca0dfa18b3e71ef7356b7aa60782ca7c4b7dfd4ea0c1e1
diff --git a/app-vim/nerdtree/metadata.xml b/app-vim/nerdtree/metadata.xml
index 4167319572b2..db3741f0011e 100644
--- a/app-vim/nerdtree/metadata.xml
+++ b/app-vim/nerdtree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
index ed6c287a5554..9e7645cce554 100644
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@@ -1,3 +1,3 @@
 DIST perlomni-2.5.tar.gz 20152 BLAKE2B ccba727b3ed2317a2f1983202eda97dac38080ee0e79173a402f45956c713741acebe9c79ab8321bd5b3c23481bb02963fe93edc26d022ccf29d3724a704f006 SHA512 5a7eb10233d620db73387d79801b451183e1a00f3086f4667cfaa871e6cdd43b1c978beca8eec28050148709d98e8f55be048806f111fb4bdee16a4e22786bb8
 EBUILD perlomni-2.5.ebuild 659 BLAKE2B c44fc86077a85986b5f13657441e883829881415bd15c481ce8f661badf2fd77951e2ade0705f43df8982951c7ad87fe67af3f5ce5e1d1f3615d08b0cb9b2c88 SHA512 a4c324fc314d4f0a7bc22b60e5a6f49ed4de15b86ef8cf0de3041a48ccac3e86266e1f7113346d87b31897927c7a871427a30c8b4d2123ac88bfab95954cf03e
-MISC metadata.xml 425 BLAKE2B 5413dd0212d6fd1846cfc504352d543b1be51053ac9cc140aa05db59c1f6a4a44208ae7ac798c95fec0b233b97d8581486765def9afe910c2da059f9c8eb83f2 SHA512 8ad19bbe8fd10660518b2b20d8c94307a0322031615bfbed081b24c977bc8d999fd3a5878698be85d41d4090c1dbf632887ef9ab99fbfb068596b17c5be78c2b
+MISC metadata.xml 425 BLAKE2B c67287df44ca16d30a65f128d2ed93663c083091855272c6ddfb391a1320a2c06d45a904f173dfed1e37413ada152f8f3c69de2268c8608e0850199182ef121f SHA512 1368a64bf4176032edc6dd780cda09253f9363194ca7ce9ca6ca5ca5d5df8abfa79fc2198377e4cc1dd8802009c369c4c4af4f367d0bbda9864833ea688ecace
diff --git a/app-vim/perlomni/metadata.xml b/app-vim/perlomni/metadata.xml
index 6dfc1d1aaf2a..6e63087d76e4 100644
--- a/app-vim/perlomni/metadata.xml
+++ b/app-vim/perlomni/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 33c58c2baf16..a09aa94034c4 100644
--- a/app-vim/pydoc/Manifest
+++ b/app-vim/pydoc/Manifest
@@ -1,3 +1,3 @@
 DIST pydoc-2.0.tar.gz 2795 BLAKE2B d780265c474081431e43076db9e5bc244677d9deaaa44bbd6ba2c2bdce7e88b8e2f0c6a9e14ca5a3a4bda7925b5c5bc108a34d5d6fecaabe9f0a025774b101ca SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214
 EBUILD pydoc-2.0-r1.ebuild 619 BLAKE2B 9ac901d928c314864d69f2c2ce9daee0baa3f5f66199cb4e1bfc54a3e2516e54720ab6d836dbc91a0f8dc9764ed850771c147518b581889d5ffb05d71dc59538 SHA512 af000656cf4129eb33f83b4f8c6c3ec43488c66d16b685d126901909afc05d2d237d828a4a9f49a190059e0afc8ca9bd2794520d95469b67c9454edda6f9da6d
-MISC metadata.xml 424 BLAKE2B cd8fb601b39c8ff1247498a196bf776d70b0765661f866b355675b5d8ac76a713bf007b8aafa503d438ac7fb49295e6f09df9d4b1d9d7fc1cba323fd139eea12 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab
+MISC metadata.xml 424 BLAKE2B 0326e93be286c9818941c853171cf1d7b2dc2de43526fb9de9d1ec265809420ca7134141c0fbeabcd02d840b9fd0df68210bff65251444db757f14bddbdfbd3c SHA512 2b361ec74c215e39afd3541703b6d4313aaaa5987432e60334a70e20cad3203dfa3630da5cf4b148f7d1a68bbcfda3f48f2db941847b76c8c8d0797b319f9859
diff --git a/app-vim/pydoc/metadata.xml b/app-vim/pydoc/metadata.xml
index 2b82c379a010..90a3fe096cde 100644
--- a/app-vim/pydoc/metadata.xml
+++ b/app-vim/pydoc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
index a9fb553e0d62..798eefe3d3db 100644
--- a/app-vim/rainbow_parentheses/Manifest
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -1,3 +1,3 @@
 DIST rainbow_parentheses-1.0.zip 2827 BLAKE2B 655905c1b54d5c885e1a06fe4403786b76958ba47d0facae3d3a1e657ae0a702b3f939383e2f617f5bdca9b33193dd52196eff5915236180e0d9d4a6a4e22e79 SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569
 EBUILD rainbow_parentheses-1.0.ebuild 464 BLAKE2B 4241123414537c248f6b7c3da354281fc7c13a32dd87bdaa57bd25f51fb5960e1000384b1c0c74491021eacaeae831c321021c869465d659c824a25a0ff14fdf SHA512 8767cec818909def1946aa15ff57f99de316884843148ad712d0a49e2d9f389e49986346865b9023a822fbc48d5e0bdc2b225e419d6a2f97eeed2e6fcf4c1a3a
-MISC metadata.xml 454 BLAKE2B 36c6cd350f7fec2a1e473f7c9fc071943d5de82826e7cd66159542710137ecee788fcd3390d8271a36cd8c1f7a4b99e4c864dd92667e502630fc3243f03084fd SHA512 a4b31f36a2f9097b165e424cafdeb772ece04ecbfc5b7813e17ae13eb5ee4a15f1e180fa20ac722087ba2968385c766ff76be1599dd584a01d804604c732dd63
+MISC metadata.xml 454 BLAKE2B b62a4ff148a70fefa7836a0468b95661a3dce27db41f3a25acfaff539974ddca73b2b51bc9c1bba178433e755fd6cc00f43b39ead2c7243779dfd1ee1a0f5c20 SHA512 66ea6bb40434eb5a7c22a49106df5822ad6da0f8a5433621788dfbb6eb1f29f951e41ccfabc8cb2364189902553d33b161f9bb293a3eff48f882584885e8d006
diff --git a/app-vim/rainbow_parentheses/metadata.xml b/app-vim/rainbow_parentheses/metadata.xml
index d73a957169b3..f9fae16f743d 100644
--- a/app-vim/rainbow_parentheses/metadata.xml
+++ b/app-vim/rainbow_parentheses/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/snipmate/Manifest b/app-vim/snipmate/Manifest
index 666e77ed674e..f0b241545e33 100644
--- a/app-vim/snipmate/Manifest
+++ b/app-vim/snipmate/Manifest
@@ -1,3 +1,3 @@
 DIST snipmate-0.87.tar.gz 20624 BLAKE2B 74e8c9f594c711d9be95768dd9c76f82f7c1a68de94f55090be8251c27970ebd47488d1b364d6e0b66c7d5d3d2ce68e98e832555e5aa4d83f53b6f72f044ee66 SHA512 36ef13676e0ff8085456883ad09c111158be6051251a15b428a05d3caee678a6c8ab092694fdf876ecdf19b93e04cb8ff67108dda83ab602250f5ae42602e6b9
 EBUILD snipmate-0.87-r1.ebuild 631 BLAKE2B 79fb01823ca16bccd3edd391ab888563207b1bf56a22f2e7687492faf6c133bbc474ff4b0d810f94278636fa3567c7082ef7a00f8e953c672372c05a245f7bf0 SHA512 c595627fdf4d26634b2927a3485bb0c1d17279cd8a471a18b970e0fcc1c7f01ce6776f64203f7f1c6b06bb0d0fd072cad389b2ed4cdd885548ecc27f618684ff
-MISC metadata.xml 333 BLAKE2B 85580e0392b9e766d9ce511441b4320fa0025fbae223ed72b0c4c8debfda9303e846c76dc2dd11bf3cbd0ac88d5cb5f4d553a9874004799bb0a524cfc2251c3c SHA512 e74edb9123ce65fe8ba73a41b21ed68702f7e9e6c902ce5d4b3dca9caee585747720444ab71866c6472a3ef1cf3cbcc12668248d3180ec03184af3d29a2406f3
+MISC metadata.xml 333 BLAKE2B fc2e46a12d6b2e9a7016e43d9758cb583842d0260d66f8b6f46370b4c8d865861fe3af4ead82f50d63d66331add3d13428ba1b9c87f48c5ac8f50e50f8f6f44b SHA512 53f06b6a78bd4afcdf806524600b0e608c5ed777d27efe8008dfe881a0f9849f400fbb07442f71113e0477bd1dc468f01c632be4384b82936b6b4f5e23767504
diff --git a/app-vim/snipmate/metadata.xml b/app-vim/snipmate/metadata.xml
index e1b691100398..03e93d44a1aa 100644
--- a/app-vim/snipmate/metadata.xml
+++ b/app-vim/snipmate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index a7f522efa4bd..713935b4d0e8 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,3 +1,3 @@
 DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
 EBUILD splice-1.1.0-r3.ebuild 905 BLAKE2B 73a11dde78740363f83bf86d606ae0dce699069e21ca18e7b4c599442e119764e661706b18c702f1ae31419a64794e2b710ac8ad264fe7fcbb3ebf6a3a56a383 SHA512 372b917d7706dd58740f5e2ed43fd0298e6944ea351f1d5098449ed3e3851bac3c08c5d460c1fb8128dbad28784800b40aed93e24e697d0a59ab7372246afbe2
-MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
+MISC metadata.xml 379 BLAKE2B 3700d212cfecb937db027eeeb498222dabb69bc46ed13cd2b0d90e5808ec2fbb4798de70bf53ea84d5947a83b477c4d7dbae2b5c88b95b540f6a1df0531fc6ea SHA512 266205403cd5a0b7453781c070d3785b02ecfe3416bda920649598d41b7272abfe0d27697e87921429765a0271ce83b5b1724930e5f1c7659224f623417ee6c4
diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
index d67ea981ad1a..ea657fdd8a88 100644
--- a/app-vim/splice/metadata.xml
+++ b/app-vim/splice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
index 3fa3cba6f2cb..58c1793e3d4e 100644
--- a/app-vim/tasklist/Manifest
+++ b/app-vim/tasklist/Manifest
@@ -1,3 +1,3 @@
 DIST tasklist-1.0.1.tar.gz 4066 BLAKE2B d55e12f28546f400b34e11636814205e94c3c82656a068c9774fb23fcfd336fae059efcf307043b6bcbaccb939a4a4ed8d02c9a5944381bece096c57f6092ade SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9
 EBUILD tasklist-1.0.1.ebuild 397 BLAKE2B f0baba7365c46c2120083d8ad37ed1fdcd21e447c7d64ee6fa332701b8fa33dba64cc73f93d06321cb3292fbc5c945ecfc512beb5a9a5a9aeb36ada412770f48 SHA512 647a2728b9115728ffee66484604ce46c618635bde9dbe4f36674360930911c1cc2933d2801fb5fcadf128fb4bcae5225d9fe8122d36a7041ede0649175bd76c
-MISC metadata.xml 450 BLAKE2B 3a688d7ebb054fc8ee455e92001c40c1325c614b18800f6b31d7dca2d47621016fc831e4785745fae6bce770b3eec6d403b5de3a4b4cf373f60a17b97cb80e99 SHA512 2f047ee53729d6cf9fa63861c3f4246767541fbc16d21df0f6b75bb153a77f0e2b68d67e20a1544944f19ffb00e8363c6a374c9d414c242cf218aaf0f3ce69af
+MISC metadata.xml 450 BLAKE2B 7b69fc2e7f039f258d0e9dc5520cd2433dd89f9abb6ce31208cd2d6f0551b648097c01db0869812bc45a267c74c24768677a1e728095abb57066289291d02d43 SHA512 fd88d03ea9ccf3f1cce3b5213352d26588075b69b6cccdf0d47d05bed00f300223391cb9a17b5ac8749bcb16c338dfc1bc0b15fe538a3eb028d1889e87a398fd
diff --git a/app-vim/tasklist/metadata.xml b/app-vim/tasklist/metadata.xml
index 550fea50c1c9..2c3fc4ca328f 100644
--- a/app-vim/tasklist/metadata.xml
+++ b/app-vim/tasklist/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
index 7d063f640c97..cb57e898cd5d 100644
--- a/app-vim/tlib/Manifest
+++ b/app-vim/tlib/Manifest
@@ -2,4 +2,4 @@ DIST tlib-1.22.tar.gz 119979 BLAKE2B 2fe1231b6a075989c41aa2cf38d0964b6d9ada390d0
 DIST tlib-1.23.tar.gz 120827 BLAKE2B 7b86a1b0e22e499390239e5898d81c90ac1b3b989b929e3bde3ea516d05419fc8af19e72d5313df36ce856a4c7ee2cddbdbecbace835f24adefb1883d4e76e46 SHA512 5fd5d6e6ccd36117abcfca35173d28602a73b0773e5fc77cb8c1c8660f13dd7882c8a8de9b4335927b807c7d643c480f1371926b4ffb1758e53948132dee1d75
 EBUILD tlib-1.22.ebuild 572 BLAKE2B 9d9b39d9ca27887a2f8e5dfc719b65b77d256f08fff840abd862a453d3ebf87745aaa2a5a8e49885c1462f8cbbc9be4c7b069324bc823911da649bd7eab63c9f SHA512 f06bfb18a7a2b6fe71954e5be4c48b0d8d6295b39ff0da081d3c12aa9aa0c55d6e5e4d114599a656b1beeac4dea97b7316219a17c78ceee3e92e76064d1431b5
 EBUILD tlib-1.23.ebuild 574 BLAKE2B 51d22f1530c73e115261899119d78619067e01a91d0fea74d3abb83c63a16c67aaf728730adb23b327837fcad1197cc4a15165a496b9d5fd4cac8f90ab25263b SHA512 d25556bc5a28123feda483ebf582ac5e5200adeca26dc104b18658f38c400b2321c955c6b7a5ce0b36cf0d73bc7d410a84fa33b802e43a9adadc2aaed1a99db3
-MISC metadata.xml 329 BLAKE2B 87f979ae53b0fca4bbf6966613d9ef71365ed69a0b790bd41d526536f3e04b63e435dea3647c7b19fc31ec81bb8df70c1d830c6ec0545f1a5f63f3c1da14d923 SHA512 d36d9443ce025d73d277cc67387418ad73458be408932bf200609b6fa133b06b87598377866c89b8f9606674b54540b19c6f63afdc5ca9696225f1976bcdab48
+MISC metadata.xml 329 BLAKE2B 87b2296cdcd56f61cb2ce3f9da6b8bcf557a4f380e827ee96c91f9c2cf5a42f102251edfa6bbe0549ec883bf6e24883cd16b8392e436354e08ec299d6950a819 SHA512 ba015f91508e2c9d3cf1a7a202cdff6b8f543651c8807984bc82422747f8f9b532b9b6133db4ccf425eee399b064e01822d06cd6dcf46619b17b716c2d9cfc10
diff --git a/app-vim/tlib/metadata.xml b/app-vim/tlib/metadata.xml
index 5eb011848cb6..8b455c633ae7 100644
--- a/app-vim/tlib/metadata.xml
+++ b/app-vim/tlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/vim-addon-mw-utils/Manifest b/app-vim/vim-addon-mw-utils/Manifest
index 787c906dcf35..301509448dec 100644
--- a/app-vim/vim-addon-mw-utils/Manifest
+++ b/app-vim/vim-addon-mw-utils/Manifest
@@ -1,3 +1,3 @@
 DIST vim-addon-mw-utils-20121105.tar.bz2 10071 BLAKE2B c32216879a1873829f44777cde0b455d68694214c48e4f18e0302a026bbab7f9705016fc00158c6c9db69c59d2914ffc15dd385f79814781e517f71109dbac99 SHA512 15104f23416e8dbeb25d60e9b94c0c04434df19bbd3fa418285a1b1106a95dc6bf28cc472014fe431d80086217110c58f267d3d1b5d855bdf85fc4d4fe870346
 EBUILD vim-addon-mw-utils-20121105.ebuild 370 BLAKE2B 44f828edc2453a83c8e3ffb60af93366544d8f0f0124168b3098fe691f01ed4b4a8a0c30b035d5b7a7aa35841174f2cbcefff2624862bba199cd8f1f56995fe7 SHA512 0a3b58d5b84617c801ea6c1cc0fd323650b429534d431066847bf799dbe83f344c45396da0e3d1cdcb828271ec47ba0f529f442f9a3f9ea3222355de6057e6a2
-MISC metadata.xml 342 BLAKE2B 91bce96b9a5ef212e7fbc6e520a4c7ef11a4bc8d998d1afa4ff25b5885002d66b9d4578488ba3d9050f00ff608cdca20d96ead3d528c17d76c42363264c8db00 SHA512 ab292ae32011a7ff8367839fe3972e3e2dbe2db977ee81b0a619847d50288be8f2204604c19cb2e4e4942a98980d8ab886395a60b96dbdbfad2e5a739734954b
+MISC metadata.xml 342 BLAKE2B 8307dcbf56c00fe82cab6ac2468d9fa7c2a204bd95a58f1717e1b1405c4c6b617ee34cb2b7aa915692246917d7ca343202c0a50cfa7d0a03b319b8fd30ae25ff SHA512 d15a0c56c92c227efd086cdbd8d42fd3fcdd69194a7aec00db5f0e32917eab9a664590ee609c056f7128e4519b40016f25c97be994eaa78809c1bccd7b9f7a68
diff --git a/app-vim/vim-addon-mw-utils/metadata.xml b/app-vim/vim-addon-mw-utils/metadata.xml
index 96018bf9a027..6307ab1bf129 100644
--- a/app-vim/vim-addon-mw-utils/metadata.xml
+++ b/app-vim/vim-addon-mw-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/vim-autoclose/Manifest b/app-vim/vim-autoclose/Manifest
index 958b77fa467c..8a9055cd7e53 100644
--- a/app-vim/vim-autoclose/Manifest
+++ b/app-vim/vim-autoclose/Manifest
@@ -1,3 +1,3 @@
 DIST vim-autoclose-2.0.tar.gz 35779 BLAKE2B bf1536b3cdeecfc261ee30687d53ac2dd7632e21e877a67a99aa21e1d9e4389e3d1d3de764c76d94a8d97fa2bad1c7877276a5defa6b2ca137f1a8e866e902b0 SHA512 2604c2c16f25eb60bf660ba4f80d40d9aa51af38cc59a2727f0c705ba2abe5302a58dc60a71c791cc6aa002477587d1dadcc8a9269a93c5a9405a86251f4fcd9
 EBUILD vim-autoclose-2.0.ebuild 389 BLAKE2B d865dc00c7975075ed2d6ff4627d2e6fd7f86e55aeea70e6736995ad7729c481976361611cfc2008986f9578aeba4e6d60e2434a5e5e960b64fdfde551b833ca SHA512 ea690cb014599f55d7c658d76186a898ca3e7f787966bece9d2538dd94bf9a08a6ce62226ed10834013b4bb10e81eec5cddd18b33832da138aa018d63db1af17
-MISC metadata.xml 445 BLAKE2B bb09273cbcd52c149f21155f0b234ee70f2946038e509427f7ef6f3842af9825e41a569a8350ef93d671db7830d7c14269a21e399d640ee172edc02ba082daea SHA512 a78dd7130e0cba7566721294c9e3c7c90481f4eaff8d0d84ad3ad015c9afff79e0972335f9cb7bf9ac15e3f083853a6160c5654d6a0ab6dd2f20c047b4e7f8a5
+MISC metadata.xml 445 BLAKE2B 951779e612ea848204932701181fcbf7c2928a242976c7ecf86444bce6919f3626aba7a12079a9518692798bb9c551bc39726745050b3255e53541fe90229f02 SHA512 2521c98ac78af5c24084a9a0553ea1259a7c3e9390deb4be57e98ca6e7bea910fc0e0731e6f54e9b92e7f9f33013682c4a326e79438d89332287ab3ea0d3f262
diff --git a/app-vim/vim-autoclose/metadata.xml b/app-vim/vim-autoclose/metadata.xml
index 0e5ce60b28e0..a55a4737394b 100644
--- a/app-vim/vim-autoclose/metadata.xml
+++ b/app-vim/vim-autoclose/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
index ed011b53e30b..e75dd8ed544e 100644
--- a/app-vim/vim-flake8/Manifest
+++ b/app-vim/vim-flake8/Manifest
@@ -1,3 +1,3 @@
 DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
 EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
-MISC metadata.xml 424 BLAKE2B 3229e40038f1b81d9e30930a93fd292caacefb1425f4fe070348ccfacc377fd52a972735eff894cbbc01f838c2ba1d0f5a1f1fd84d3a9a2b76cf952a185914a5 SHA512 eaa032b9c9f247340b0eceffea35d85c14259024eac52195f3aab1d7916ea028b44a4ee4e1a8d1b95cf002972a82f0bf36b8425248da684ef794c8afbe632ac5
+MISC metadata.xml 424 BLAKE2B 8fcb0323bb18ac672c1e57a0f54817188701a5e68cc8af697c85296772df8f1c89d7574ff344d4ecbb182d98455b3bf37e0d2920daaf672df8101851c1714367 SHA512 02cfb3f24bb321595efe474651b15c12f8c29d5048cafe6667758cf82b8ecc8faf4579b048d2a140ce76be0111b034745cb30e0e80fc44cacda2503f354991e4
diff --git a/app-vim/vim-flake8/metadata.xml b/app-vim/vim-flake8/metadata.xml
index f1026b7729be..2aa7d6e08f1d 100644
--- a/app-vim/vim-flake8/metadata.xml
+++ b/app-vim/vim-flake8/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/vim-multiple-cursors/Manifest b/app-vim/vim-multiple-cursors/Manifest
index e8bc697d750c..1d3268a84acd 100644
--- a/app-vim/vim-multiple-cursors/Manifest
+++ b/app-vim/vim-multiple-cursors/Manifest
@@ -1,3 +1,3 @@
 DIST vim-multiple-cursors-2.2.tar.gz 1055659 BLAKE2B b21336295a800e0458ff4f14a5a2d2c254ee9d1341fc0011a1b6bfe702f1e300d96d8e52f998333d3dab0c3a25b8ef12af828c479ba33ebe486399ed87a37b23 SHA512 109e8117a692e05c450ba30e0a4f635bfd24f08125d06b22c0e850e03e89e193e2ef7b415c8356d326b44ca93254b390d44ee417e8a0ee59fe9a805cf157c0e0
 EBUILD vim-multiple-cursors-2.2-r1.ebuild 694 BLAKE2B 9334ba36a1429fe63e0e6cc4c6ed01ec558d5f082c623952578414c8fbefbc26dbd494825b706de941f1d8ecd21519d39927dbc532f660b02337d7478789e05a SHA512 2d8c4b2c46833706500b83d5b3e8db2d82317726f03c298938de0ae3c255d310c076c080dceb6790a127f35a296b11042463924b16a459a8abbc51266400493b
-MISC metadata.xml 450 BLAKE2B 666dd9af7dd6cb28cad6e6fba8cfbc30bb4dd15b91218793ef13794d6c5498c3e581fdc6fcfa0a49e94df9b761557b58f306078410973393f304b1a928d68309 SHA512 0294668ca3ce283c851e27bcb6854e8fa1189ebb6daadbf2583b05014b2c34efd31194e114b4d7286641673272b8036da8aa7d7358febb1521927a660044ef97
+MISC metadata.xml 450 BLAKE2B 53e3fb2214ab15662110c5dd47906f1119d8ef9097f9621f9ee1deae709bf53ccc8137ee7cf2c1eab972d58475a70fc2e2b507748683535520e1a753c0e9a650 SHA512 703f189f875edf5b2b3da10a6502efd250b256847d9b5d28563fc1c2ac0840a467f675e5a1bc21e5f4fee1d53d559e4f9e5270f8899c0938662a4739851c8803
diff --git a/app-vim/vim-multiple-cursors/metadata.xml b/app-vim/vim-multiple-cursors/metadata.xml
index b6f784080ccc..81e081766a05 100644
--- a/app-vim/vim-multiple-cursors/metadata.xml
+++ b/app-vim/vim-multiple-cursors/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
index 607d2582467b..20c030dec135 100644
--- a/app-vim/vim-spell-cs/Manifest
+++ b/app-vim/vim-spell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-cs-20061021.tar.bz2 1320356 BLAKE2B 0583ecb357ab3180c637211c6565e5e8e61e2739e41b25a3a704944d7216b8c54ebc249734af25d92de1c9a69bc9021d538df78953773570d7f84f70ff6705a9 SHA512 cb9cae6dab11c5cbbe16e0902b18cdbea81dbd7844eda4774f45c6e5a5f3eebb09e062a37845a0e6ff5bc5c0abf7219001824768c0e058998a7c922790006e99
 EBUILD vim-spell-cs-20061021-r1.ebuild 258 BLAKE2B 8d974edbce8a3d4c63c31c9e974a4fe3abd402d1f488ef6d96ad5d140cfdcb8040dbc2820b50392aeb483e1c565fcc117c7daceaabfd92e69849c94f3fa107d7 SHA512 b352e663756e3b175b151479f15bc95e93ff6ab8234196c79e176dc3ad242aa8361340454dc9eba80837d207987914dae2434a7b2f7e4bb913fd7c84954d8bda
-MISC metadata.xml 349 BLAKE2B 74bc6bb21eb1bc08b3a62dcdf4bd3e13b2f30c28447c3fb14cac799167960497ee4430425c346b806d27de72827fff2ecd7b2cacb94ecca509b2db369c474b78 SHA512 0093e07644bbddb71569e9758f6c488f90992a396aecc3a48983cf6bd716ee88c3a83e1ecd37af8ed9b0fa8e9796e465e3a28cabf4fa51d5363539058e608aed
+MISC metadata.xml 363 BLAKE2B dff30273a3027a76f5e34e6def8254adc8bb4d10f70749d9a885ffe4859a60142b1791333bb13e201905e969fce877139032b1047ae762715471d4dd9537631c SHA512 9449dccd435a2192e9bb90fee9d1ef59f8bdaa9ad086c277390dcfc5c070ed8385e812adb4661071befb606db8c2a6f316211b8273ea5981e6bc6b6991698944
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
index b791ab7b1eb7..592d200dace6 100644
--- a/app-vim/vim-spell-cs/metadata.xml
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jkt@kde.org</email>
 		<name>Jan Kundrát</name>
 	</maintainer>
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index f29c7c6d7d9b..7c6482047afe 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
 DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
 EBUILD vim-tmux-3.0.0.ebuild 430 BLAKE2B 5d2fc37e981caaa8a6c36b803568e4739b9a7664d05fa724aa6260a89d620e1027dbb7c25bb0dc018b2d2796a337ee894f1c54265518779298d7ea9438e9b96e SHA512 554dc3b1a6bf009bfaa33a7c54fb4b4ceff1256f406007263a25f76ce033aff76eb2cd65cc665604b1e4845a3768d5eadaf548971a65dbdb4238c88840792903
-MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
+MISC metadata.xml 556 BLAKE2B 72a1f65754bf3326fbe587943c3e96fb60c09b33f37c55e462b5bad0daca65758d8f38c365c62937d5731386bec85aa50726b3b9d4ce48db9f71ed69240e4adb SHA512 c6fef284e89902f6fb68785746d31ea9b4536671bc4501747d188ac301e24a83bab7acd3db0a781c6819b59d5c2be2ff335e2d8e05e832a67191e980107e3cee
diff --git a/app-vim/vim-tmux/metadata.xml b/app-vim/vim-tmux/metadata.xml
index 2e81ab74af54..dbfa7a8209ba 100644
--- a/app-vim/vim-tmux/metadata.xml
+++ b/app-vim/vim-tmux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
index b8312fe4992a..c73ab6693b03 100644
--- a/app-vim/vimbuddy/Manifest
+++ b/app-vim/vimbuddy/Manifest
@@ -1,3 +1,3 @@
 DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
 EBUILD vimbuddy-0.9.2-r1.ebuild 522 BLAKE2B 9a933bc2d54aaa69971701e9ddc805a11a91fef45d16e0e3a8187fdb099427842235f2a770eaf6c64afd03710ebfe3c65aaa86371b6e785584b79ada5a27dbc6 SHA512 eed9ddec2c60fc07d9a09e01c4104d73f86a30ddc1d7c471edf9908b46291195bcc5c2ae88d83534e8104fd71d8bc182753296cd94c4cb14e1193c48bff1ff04
-MISC metadata.xml 338 BLAKE2B 2e474bc2ecade1fe907cfe44bb86943ee572783d3bfc849c900a05d9c6056d15b989c80e348a3d65596140ce1485c6d516f8f856d5901d0317831b553e243176 SHA512 1a949dd9cc669a43a63ac53b3429325ab44873aee6ffa02c8e8f1abfd64d47c6645c1c4fd4a312cba81de1196abee5ceee5510e59b6637bc19cd34880ff32048
+MISC metadata.xml 338 BLAKE2B 30fdbc67a6a8f29665abab1a3b13f147e35f3e623e865ed087fd8646727e5414e5c30197cc2cf6aede1e8d179f508ed2c352b4b7d18d21e267ca316cd3e6615b SHA512 10eca8357fdf09722d6e495da71416e11eeca34d60d4e3f6bb089ed57ab06bd0266951cc773090bf5d780fffd303f315087882c4eab7317f7dbad054fb8d2e34
diff --git a/app-vim/vimbuddy/metadata.xml b/app-vim/vimbuddy/metadata.xml
index 0cf1ee0aac77..38543c894d10 100644
--- a/app-vim/vimbuddy/metadata.xml
+++ b/app-vim/vimbuddy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
index 450fd494567f..fa24554e2ee7 100644
--- a/app-vim/zenburn/Manifest
+++ b/app-vim/zenburn/Manifest
@@ -1,3 +1,3 @@
 DIST zenburn-2.25.tar.gz 7361 BLAKE2B 728930ddfeca46d7e020882fde92841a0ed9c889504686589a5028b1b373bc3b7c862d8fcc0740731738416057f4c99533e835594e8ce01029174d74f446bab3 SHA512 e3d222b66696ce24ff6ce8ccda201a15ee27d868581c311b8c31e7eeada4a2fe3ca395d53fc42245b1dfe4b68394cd22f23203dbd6366298adc7a9d6428af683
 EBUILD zenburn-2.25.ebuild 417 BLAKE2B 1bf1b095ae48e66c7316dad62ae51e7389791a0996323c478038771298f688118ff4e6d5380cfa05dc60b510c8bda3bb8a108ca26fdce425b2c6c87fa1b1ec2b SHA512 b72d16822f01bd64b4802766861ba6cfe9ac637b06d52f5efba948483fc988502bd1c2d0125a0aa71f159f2a8e37dc7ff047131763c439c235d45cd768c18a2d
-MISC metadata.xml 425 BLAKE2B 7b16c41040090b5e0c43e75db0637ef1bd38c600616499f1cbac877789ee7e78aa659c21663369a9705fe4d994986b3a1c97866efbf302052aa0f46fad5fcbe1 SHA512 66ba23df2866a13c9117fe6d51ebda94bcec609a588f1560ac5fbe86f20b6a38f279796ee2105b07fb968bd5c0e04db31b290d43dc9227540b20548af5e24025
+MISC metadata.xml 425 BLAKE2B dc87140d07969d356cb28c9abf0d82ec544ada3fadda41efc4da3f1cb2f0daa55c1dedaf4dbacc499f3886384890b8f284f6b6fa733a7e5a67f4029fd68d58cb SHA512 9e72021fb5e1019c4b94c967c8d8c03d3216fd87c62e62f469b994fe1cb3da77bf7db5cdf9ff0d7f7d37402d98d4baa256be342a38e613bfcb69c83ccf716cd0
diff --git a/app-vim/zenburn/metadata.xml b/app-vim/zenburn/metadata.xml
index 2c84d77fc719..9a52daa13756 100644
--- a/app-vim/zenburn/metadata.xml
+++ b/app-vim/zenburn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 8f928cbb48e8..b289ead699ed 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/metadata.xml b/app-xemacs/metadata.xml
index 3cfdbce6021e..ef4af98f5c90 100644
--- a/app-xemacs/metadata.xml
+++ b/app-xemacs/metadata.xml
@@ -34,4 +34,3 @@
 		Kategoria app-xemacs zawiera rozszerzenia dla edytora tekstu XEmacs.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 91c09956d40a..ae6e3a08c45e 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/metadata.xml b/dev-ada/metadata.xml
index 01b80fcd13fe..766e371bd2b5 100644
--- a/dev-ada/metadata.xml
+++ b/dev-ada/metadata.xml
@@ -37,4 +37,3 @@
 		programowania Ada.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e285d3501ed3..cfe771b56f47 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index 5707560382fb..4b0c4657637a 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,4 @@
 DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6
 EBUILD aixlog-1.5.0.ebuild 567 BLAKE2B 4f562bd9ab1992e5de2eb7dfcd8644d7f5f21e54ac30ea8b13f37171a5e9a7d04a24cc4a305fefe1ce92e6ea367e40950e355744304f66dce0c691c7f3e989b7 SHA512 e4a6b263dbe935411180369c5edb86e6f20ed86666a7906a9596798279dacdeb8fc41be1a7783b3315a4e3f01f4bc784076555e678f025ca05c104cdb281a81a
 EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
-MISC metadata.xml 619 BLAKE2B e3f7dd29a257d900b0b0744a40b5c89211cca8cbedba0d569adc86d3bdafd5d57342dc2579964dcef1ebcb8478c589579f2593a26894877a1471671544b459de SHA512 2eb302d4c2c22bc3fac529a6a2cb185adf04dfa43630ec2ca8680660d3fd761b48bde333443f74af7efb9df173ae3569ac9366593baef234101d07d0c689fef6
+MISC metadata.xml 649 BLAKE2B dfbac8ed96f74ed345b7bf280cbb35a58d3d933ac7524c28ee6121466d9e70a1719e785c90b69297adf2cf0626da3c980e97bbe695cc9db89875f9c23d4c76c0 SHA512 ac4a3f14bbaccaecad3ba5c342f33270d1aa835c20918247506812b27d6a1a267ea25a047b59b2b67df105138544099aceb29f070b94310443135397e140d363
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
index 82b79fa7bee7..9dbe74b38688 100644
--- a/dev-cpp/aixlog/metadata.xml
+++ b/dev-cpp/aixlog/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 6c6e6932d2ed..9360b3d087b3 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -4,4 +4,4 @@ DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34
 DIST antlr-cpp-4.7.2.zip 1494927 BLAKE2B 007aac6655dc3c4e3a0c2073ca9c8c016b46bdf97dca4494d4ea2c44d27a458bfbb09811b3beb0aec1ce2873c3b62ad6789c6a9e3e7ddc62cde51c8357e9123b SHA512 3298b83a06ddd8d8852462401e46fe2eb83d20af4ba14c722cb31b33d929d1c5a4ffb694ee084495a4ae26ed3246b6781ca6045d11253c94efc09729fa001090
 EBUILD antlr-cpp-2.7.7-r1.ebuild 2804 BLAKE2B c03a8989fc0e0d9ca8409ec82676405f37e2041f1fc9f40d8a823ed5aaea940144b5855d64311f2f9ea29ccc54fbeaa42b958a147eac47c12ce21917a4908422 SHA512 12674af8eed6304c0ebac94e1216bc4ef7c3e2cb8935d21319a4a3a15c3912c3be23b0e9a399cb245a028f370c5f3507856a7cf82e8e3a451ee586fb0f53084e
 EBUILD antlr-cpp-4.7.2.ebuild 634 BLAKE2B 5f0116026e47e7448360471f5fb9b96e2c24d2ecedd7c5a446b7710cb773dcdbf2f545b4613a4c9562a3d6e676ca5af3873822ef810ac00a602b55727163f3b2 SHA512 31211740e9d28309335aeebe88fef2c46059f490bee9efab633c026e2cef0e7f4c3bd55b1af2e97f1c3eee31aba7dc71f5604bd3aef36f0e4253474f5912d559
-MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
+MISC metadata.xml 313 BLAKE2B fed6320dfc4160af517e7b6f605da9f43a882af049730c41cbaadee0b73ace2b84780e7803fb9f82b74633a18d7696fb38788e3885af6d0f626877a80b66abcb SHA512 047fde5417bc4b8514902bebfdc5be4d14fe490b7638270fdc381cf300f32c34c889596489a028821d880f159ba0dc00efb583c5bdc707a3de3c63f2e99f842f
diff --git a/dev-cpp/antlr-cpp/metadata.xml b/dev-cpp/antlr-cpp/metadata.xml
index 38b353fb46ac..151f04becb1f 100644
--- a/dev-cpp/antlr-cpp/metadata.xml
+++ b/dev-cpp/antlr-cpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index f5ed2228f75b..3009999bb623 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -4,4 +4,4 @@ DIST asio-1.18.1.tar.bz2 1729219 BLAKE2B 3f020407403175ffb6777b855a38e708241499e
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.17.0.ebuild 1182 BLAKE2B ac2cfb623111f9f7d4e64ddeaa395f3f4126aeccd666f82f0145ad62bb4a166cdaad9735bd7400071873e9e6b3718e20986150969ca2acb12dd81cbbfa9218f5 SHA512 4c518c0cc5988a5b821735df8fff7953c5511cb69efbcb8f44584867d1a195cd0f7e896fbf7187b9091324960c379ce5b2e46200e0fdd2440935911e44bd8c90
 EBUILD asio-1.18.1.ebuild 1189 BLAKE2B c295b2e1390300049aa5398a223ad6f3d587b9757177edb977a3688171123d5ffc7445cfb4a61c9bddcf653196ceb198cb76e7e653389df2e1100aedeb74e450 SHA512 c3aedc8a54cbe87e01242c56549ad389a17fae7d785e71166a169f51e5060ca392641e0f0737c002e3717d44980bda12575241aa9ec8d81ddd6527a028f859c2
-MISC metadata.xml 456 BLAKE2B b92702f7cd621e3bb4191c6dedc380e21d934e7299202b572c68e9bb029fb0abd1b834bc053b18ddd6293d65d522ade938791fdc6a885a85aab63e3b90f0adf8 SHA512 451257fa1e2f3ccab92aea2e81984de91ffe61e61ba57d56fe86d06a09dbcdb6491e13b2e7e3dc02c0cd924b19bde0000772100eaef8929b1a3779d174e918cf
+MISC metadata.xml 486 BLAKE2B 90de27749adaf253e5d03d290225f1d8b7f7ce36cf2ada6289d68b07513973fa21a47363aeb965da9914867e954e69b9e4868eb9a4ffe8e6e3a685bbe8ccf1d2 SHA512 11558b26c58abda9bae1b0314be4761f0637652b3ccc978d49f1a4dbfc57e12a126c9a152fabd6a8c81c628e8a47cae58b1456444671331c7d15369d6e07b0ff
diff --git a/dev-cpp/asio/metadata.xml b/dev-cpp/asio/metadata.xml
index b989829e74cd..a2aed74a7c3e 100644
--- a/dev-cpp/asio/metadata.xml
+++ b/dev-cpp/asio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 90f01420c2bf..bd0a8e8f34e6 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -2,6 +2,6 @@ DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa9
 DIST atkmm-2.28.1.tar.xz 688912 BLAKE2B dd18c2e0151192eb56cc81ceb6d8da2b41850e9c31e357f14822ac99418f57237e5ffe876b0c0b05768ad93ffb9d2e5edfddd518c838a1cc916b40df7b7c0933 SHA512 9f336b594930b62e9789011f4584f569d40b6153e5f3f04ac0f5b48704c50fb7b99d3f5d8639eec8dfd42b9c268df3cf21c2ae2372fdb781729fa29c57365916
 DIST atkmm-2.36.0.tar.xz 735400 BLAKE2B d8b821fdddd27d10f1995aa6bb8ab8a2ccc3357c7553656e30ee45e4ad677457b7a64a86ee9511124547c1680b5f95c3fd306fb315f3911787a6f0817ca5e130 SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf
 EBUILD atkmm-2.28.0.ebuild 820 BLAKE2B 7c1f0b1df7be64edeee9f602ee8ac2403614b4122b4a7f2e46b158c840702f08f252c399873f1ce5e6f5f0782cab4d14afd7de122b1815f8895ce5bca701999b SHA512 9ace55c82803a6d45277168da4b2e6c8af8058f0db1753cae978d22082425f01df371573353be4e3325edc490fb8556615dcfc2f949e185340979ad0ae79afcc
-EBUILD atkmm-2.28.1.ebuild 954 BLAKE2B 749606009415ecb6252ff903499884db3740ba247869d4099a3212d90d96748fda08877569cb9237e86ac64318c0ad73e58bfc16b1f6e8cc0199d88e9150f3d9 SHA512 806b18581b8a0bf998b37452f20f82928bb0670bce51a0f2c2e366c53a4d842b936074bdd5f020b38caf6afb5726cbd8ddf001017b4b3bf0ab130220131db11e
+EBUILD atkmm-2.28.1.ebuild 953 BLAKE2B 753068c962b038613a9eb0a955b77c0f970bb8aa2e3124dd401c9685c93c9d44f1266a72bd34b4583b556d806a76192fe531de638c4e41976c6e0de4f2e08893 SHA512 62d5ad22f519b68f1111454248f148c1ac4436f9c4aaa217a90d86b16f8db97cd407ebe37a706e86d21c19faa0f5da63c82eae9f0b3c7e7dd7cd6333298a5915
 EBUILD atkmm-2.36.0.ebuild 953 BLAKE2B e2b563f9d4caa5e2dd7ce31d9036208d22046c02b9d0edd09472436dfa7fc4095573f6f316745eea40d54dce72d9a4eb4bd20a79fe953b71d3d3cb47cd5198f5 SHA512 2afca7f5c6ab71c712ed300c0254eaf4d698f95a1f893f2b09cc14f5521f06664c64903be46a2ceb145519121275bf42a0ce77423e0655c6cc6f324ce30212a0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.1.ebuild b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
index 98f561213f20..15b3924ba531 100644
--- a/dev-cpp/atkmm/atkmm-2.28.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index aa002ec86cf3..4eca66839719 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -3,4 +3,4 @@ DIST benchmark-1.5.1.tar.gz 154896 BLAKE2B cb8d74b3e6662e35ea12809d8b62d1e3a6849
 DIST benchmark-1.5.2.tar.gz 160235 BLAKE2B af14235d174e39b8bbb0a44960834b7d13b1aed6cd4494efa9eb58d32c051efdf244258a33b83b82ad82aa69917356c35ccb470caea838cb6fd7eda37f0f80f6 SHA512 a071613f3af669296aa613e0e64726bdcf27cc3db331d8003f49164581cd6935a86641ec435118ea590a9d722a926d3fef740e938e1a5f6eba8e2a5a615da1b0
 EBUILD benchmark-1.5.1.ebuild 586 BLAKE2B 32e3927f94e984581017799ccff367d46b05538f329ba172149dd156e75a6e9384a213c1ec6f96c8fcf89bae0e29c2db0b4ac8c830e7545472deb17fad83344f SHA512 13ded77c738a20317f0e3391885a056d0c829025440e6fbbace2ab7a2ef52f3d1c35f4ca18d000ab2f8356c5b598e16873806e7006b87e505a2b2fe80a3abe59
 EBUILD benchmark-1.5.2.ebuild 714 BLAKE2B 71202b2bb3fadebbe9618eb4b3549507265e642ccd183e7a230509b97f334b51d3988da7ebf428b6c162f325e267f5417914856a5a3743f531c30f5d548a12ee SHA512 7f006e1cdca9027a40231cb5c2e5e23a16589ba6b84b7f93367914d5b297900cdda11a587999ea397c84ad9d376fa226f5c85f1e48e93d4c0693c1ad9b9efbec
-MISC metadata.xml 599 BLAKE2B e7ccfaf68072c7afdc8a1bc7abf3788e566c49dc88bc3fdc4f78a71360293aa310e55e34970544388e604d886e145d3b21d20b058e47d70c89d4dd57405fc980 SHA512 512145e4f2352d1f44c4d5dd43605e24081424219faded0c25271aeb03533e0a48816b66918b24e0025026dbf566b6cb86d581e1b71471114101bcfecbce9679
+MISC metadata.xml 629 BLAKE2B 94f77f788f8769f02a49334ab7b9e16ce615e6e27de7ad0e813ea057c7bde395d87c466c2451f5fea3a837dd15d2a5814c0db38dfe708c0c22a040a278b9289b SHA512 8e507bbbc80036f510d84de2cd0c4e822e7603d9fb5e262004f2307e7c1db5656ae0f98cbd7cd13292c4a912d4b92a039944e337ffad15d12c7df76b70498742
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
index 49126cc81f10..116d3feca038 100644
--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 2862bf6e55ee..8ca282e38420 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -2,6 +2,6 @@ DIST cairomm-1.12.0.tar.xz 789588 BLAKE2B 4c864705ce4b232a3dcaf7251cf22f7f9ac2f9
 DIST cairomm-1.14.2.tar.xz 603804 BLAKE2B 37417fc13f3213c1cd51ac2b0f17e0624c0592f6115a66c96295b6fa2f9974bee7c138f5087b130211a6e4f9fba045404d85e9aa08a36d9000415132400d4da8 SHA512 aef374fca25ad22770407e36512046b266d71ebeccd47fb629cfbf2f67783aa314bb335b972088a88d98417a4774d6f144cd2769c452f8aa23770eae08dca592
 DIST cairomm-1.16.0.tar.xz 579604 BLAKE2B 3aaac8039d13f13ef8fb844e38cb0cd9b0565559544c7a4cab544a46f8f8bdb6d4ee1b8318ec5d9991c33264cd3335a8796e6a49553735516a184565875e1d08 SHA512 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3
 EBUILD cairomm-1.12.0-r1.ebuild 1223 BLAKE2B 321ef7fda56bf65c682ad05fd49fe987aa203e9df3edd1d249882979680df3df0607b24b77b78df2d687efc71791181d8d1daaf1d9a99ee0e4cde246ce8ba94b SHA512 7f7f73ff4396e9082834b25b4fbba0ea079ea157f80070d6dc2cba65e822dc57663ecfb1269da07d21777966461846e8df91cfc3c30fa42fc160e9868a2358c3
-EBUILD cairomm-1.14.2.ebuild 1194 BLAKE2B d0cdb0561ccddea2b491653c4c712b41687b05f97be688ca06bb60e9a93473e215f0463f7bd118847251141b40d1391d5ed5ed919d69f12e126a4a07a494fbfb SHA512 1569962d1769ae2156ee2f2c229a8ab85305b0d9950cdfcfa7896f0c2dffa110bac4a8d7f6a56fb06441e65a20a59f17b873fa1c54c5aaf86efca79356535894
+EBUILD cairomm-1.14.2.ebuild 1193 BLAKE2B 352f15087dffa7b6a08be7462053426a8e19d00846d82d13c8008bf56e94c52dc3594807047fe1f71920b0120ceb35457558859c47fb808b45d6e97b7b409a9a SHA512 5caff86c30edafd681a0818b212064ca71d509d2d908804dcc6564a7c33d6b3dcded4526f75140792b556dede9b109bc15e36ecfb7abf672115bc2e4309a0d0d
 EBUILD cairomm-1.16.0.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.14.2.ebuild b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
index 03410d0a124d..5d1186952493 100644
--- a/dev-cpp/cairomm/cairomm-1.14.2.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 620d89ec10b5..3f8db6ee22b5 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -4,6 +4,6 @@ DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac723381
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
 EBUILD catch-2.13.3.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
-EBUILD catch-2.13.4.ebuild 916 BLAKE2B 25003bc54358c202b635dcc8f1310382f8c38c1020b0a76c10b939e882a8c9f141280447f432014fd393add78cae0143e4e37be5d3637c3edc73a3e6adc7de28 SHA512 caa1a50e9567c32b63a234c177467c3c9e083dbcc5dfe4aa81b9f0dda2dcb86706492c84fd7eff4c3c89bfab6ec6e8ca1fd750d492688ae4220292dc7715c4bb
+EBUILD catch-2.13.4.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.13.4.ebuild b/dev-cpp/catch/catch-2.13.4.ebuild
index ea9ba4ac559d..4ef090102289 100644
--- a/dev-cpp/catch/catch-2.13.4.ebuild
+++ b/dev-cpp/catch/catch-2.13.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 5bb0a7f9ff22..155357607211 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -8,4 +8,4 @@ DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 EBUILD glog-0.3.4-r1.ebuild 1180 BLAKE2B 2ed697ee1185eaf03e52b38352d200ccbcd86cfa3aba16a6db4f0f4afb7215cca6d00d9e2cf95e137548fc833371e823ac59b1e020d41ece0d8f20e2926810e6 SHA512 0b6eddfa00be3b507c4563697154293af9d1dbd107e9a0e5a221fb66d2ea20e21def06ff5edf2d5355de63ef4a26aa3f148b89fbe8781aaab48be94da0464635
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-MISC metadata.xml 719 BLAKE2B 37aafa6b3ad08d9e26bcefd30d0f86b2d8339feec2b07818141e5b5b643287e7972e1f6328aa1f1a3c8dc6d2b9eb9692a5afb3064a690e69807da95c96d575d8 SHA512 6d67b0656b906fa51d657f00d8e801ae11a1db2ebee5c99e53278cc88c63e828f8a0770dae9e06a4bbf3947eba19d08380da849fa588c3fd061f66955eb452de
+MISC metadata.xml 714 BLAKE2B 8263b158cc7cf8e1f403ab37d32e4a36f5d0969f94b6ec9419114ba00b59da7f9f65190bc151eb4f65e93ff9b3946323bd17e8f4ea20e89e8035a418cbcde744 SHA512 df3fdab330ad01a7fc978bd954c6c4313c386508525142c020ba4f7836ce95ececc6bc59a536372898e0015a0f36b7e2bd8470f92190d2febdcdf6323babf5b3
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index 2b1fb7a5004b..3856364cd842 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<use>
 		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index a9b1c586d750..fd3f67cd554a 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -2,4 +2,4 @@ AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc3
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 EBUILD gtest-1.10.0_p20200702.ebuild 1825 BLAKE2B 14dede4c7184a45bc5520d992b86522bcc47f682856a6c3557ed50095968a9d8d9dd32b3319b18a3762cf714621d206b2100b87e92f55f1aa8ef00585a592491 SHA512 75c7a88812db0f715e386d8ced86200ad2d139c03fdbb010ffac843f771d69018c200d47e7124e73d972ffea3d9cf01002862bd47a466d7dd362d6908a3f4162
 EBUILD gtest-9999.ebuild 1705 BLAKE2B 5d6cdc2e1a62ea1cd40a10831c5d28a25ca05242f7e115f9e99d2a2c2b72c4b931b9d820cec0974c895dcac5a07b8d230b59565cdb4077bec3f5329dfcae54bb SHA512 c28e333fe5731d07830f6c19f7a6e91f78f6e1e39a91d6ad4af024d034a00dc1ae0fe94cea00b4f6eb6d58e330d55dd5b53ce46a3ca3e92896e31849b24c59ef
-MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
+MISC metadata.xml 565 BLAKE2B 91bfa03883973e06fc2532239899f7e881e59909906fc49829eb657ac9e0b505229878a81fc627a6b66d81951a835e0b74f54030da340c91b22edc81e81359b7 SHA512 3a4f04b89d43ea090a021d8a5d9c571bb119727228f375c089a613c1fd2b62a24d53073bac466cbb6f259ab82504002f0cb23e9db1db25dc8bdbd2a6ebfa04a1
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index f40cfed12c28..fc2d97bb19ab 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>plevine457@gmail.com</email>
 		<name>Peter Levine</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/metadata.xml b/dev-cpp/metadata.xml
index 643f7614d21e..6524036846d1 100644
--- a/dev-cpp/metadata.xml
+++ b/dev-cpp/metadata.xml
@@ -37,4 +37,3 @@
 		programowania c++.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index d3e8f4922c9e..e6bd1e32d53e 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,5 @@
 DIST mm-common-1.0.1.tar.xz 271144 BLAKE2B a5c540c9004103298627146e6483de1345f1c3c1c6a48e3f0821a42f1e875f1753df5d5e8164d4c95e844a3b0229a45e697a49596a0671c9717a7561bfc621de SHA512 1dd5fe5fbcc04c6d42cbf4ff33a06058fdb247f6ed9ce958f7231eb99ca7e4b41ea2b91611e0d3909e0fcc9f45a6a4b2c119c0bd3da8afb1741256ca31e1a33b
 DIST mm-common-1.0.2.tar.xz 271720 BLAKE2B 955a541290ffc9489a7061a1bdcc4b2cca7ac5e0a834a008b4e15173e3b6df38a5fb719f26fe6f83c073c025c7113bba3586f28a6341d37c7c98cfc93ec50f0a SHA512 106f3aae8bb836386148098037c52fef19c3779f5e8cfbafcbe52eca17340a6e2fb7e5c57154cc0a90b75c0bb23900a4274591a71d85f81391be780c53238de0
 EBUILD mm-common-1.0.1.ebuild 524 BLAKE2B 4e82c5d0e8ad644c9d98a94e3b46525b4332f8a15ba5567e34fe653ffb59e5f11e634f4a24e2fff55a2f3e49734e9dd243c81c60645b5d6b7ee242f962b58152 SHA512 8baa70e97a72de48bc720aea432948a9fd0a28d49356ecb4d39fc0c1a247aadf7733dc3474a2b4441cf3a67ff433e8e365f9344f5d87d805f416c3bce45d2e7a
-EBUILD mm-common-1.0.2.ebuild 500 BLAKE2B 44f638bde2914f0acbfb68e8cb230ae41a9bcb2b557cc70a20da2f89e17082986090e1e5c79637ce50ece3589a0a27250f108ffe5c38a13065cb69616822ccd0 SHA512 c81593835ddcd40973e0027f04380cd3884ae42e2dcb8172083260bb505ac0c310f0d2cd11f636686d2ccbc39b9990817a3e2d4aca3132fa858cd6520a18977c
+EBUILD mm-common-1.0.2.ebuild 499 BLAKE2B 82986a54c2c0513c928743efa548d203d7f76dfc6e62671f0e0efa37483b0fe88dd1eda45d2d58ec045c99c2908a381eb4e2b92c0c95d12cef918178594a4e84 SHA512 f99b5f4ca4726493230a08707443c5ac0563b1f975b380a496bf3781d5e0743a4b71fb87bb71d8378cc64fc8100974f9e9e7777fb35cf205e202d7443d207107
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-1.0.2.ebuild b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
index 1203ebd4f1ef..35492b68ab71 100644
--- a/dev-cpp/mm-common/mm-common-1.0.2.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 325c394321a3..469a22700ba2 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -3,4 +3,4 @@ AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c5
 DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
 EBUILD ms-gsl-3.1.0.ebuild 751 BLAKE2B ba4c998f295b9cdd3fe51b57cc011864862905d0843da29482a656ec9a6e4c4079e938c863b0528a89a307a944403367ceac5ac10cf5ce236f8851576d3a2ea9 SHA512 a3cfd04a72f02bb1830e2842d47f4f5a0d29c7057956d4de58977f345426c44120a2429acaecfa9e36f23a57048c6b1239cd42c7207d571a5aa601bc9b6e92da
 EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03
-MISC metadata.xml 436 BLAKE2B a56035e3f8e1a7a9f174beab2295972c57525325689333227592ea19e1b641317909d4491b30889d621bbc6775062feacddca77e16ef3d45e8464d9a7dd9d87c SHA512 07428e8e2b2a76ae4ae6b083cf6c25fbca2508307f492f9e75d1d1786df2bdc785fb6cf773e1bb2016e0ad9c826b2dc24750f1389cca7b6692f811ba4a52f863
+MISC metadata.xml 466 BLAKE2B 15f8a37c624f60bcd2b2edaadbcdfefa9747eeea737dfda2d952b477126d4fe492a2515ed060aa1e365a96c2b7c7ef83141c2ffebf78b3c6ca95445f4fda2d4f SHA512 dcdac607f508699b6d381e4b5d845fdc780048e21f76d5025299a3559db4e9d30b8804bc622fdfcdef477ebde784d288f1ab373e641e19333aea3a20f9a7e115
diff --git a/dev-cpp/ms-gsl/metadata.xml b/dev-cpp/ms-gsl/metadata.xml
index 07ec8daf5079..af51dfb1e1ef 100644
--- a/dev-cpp/ms-gsl/metadata.xml
+++ b/dev-cpp/ms-gsl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index da2ab8122e98..681a42ea9677 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -7,5 +7,5 @@ DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953
 EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
 EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
 EBUILD nlohmann_json-3.7.3.ebuild 858 BLAKE2B 852622cec3d775387e1a63bd1c7fdec647d5aebb7d672dd90f780e04cfd3c254f76a56363d4b955277b80aa48dd99e8e044680735fa5a3ff05b575f64e2cdc8f SHA512 4a9435489e2fb3840ef663a915004056d3faa0ea2b6bc24d9d77d74e5c7ccdf2700a1a568938a27e7bc071bb5a9068165369e8f51d20b6217151c578c146ea55
-EBUILD nlohmann_json-3.9.1.ebuild 1397 BLAKE2B e38e495ca4ef55e7243aa2fdb0c97ebc83bdb742b5a1e54b6bc68c2375d7ab65b56c17cfcbdf2849ebc12b01326e6ddb94658c2ee6f478f4b89b177f7bdc2414 SHA512 3c422cddda9ad2b1c7115c18912838a47f61f475761b7e2b41c2be46e4c2c921d95401464e2bdb66a0747ced0617edd8dbca4becaed320d9a2f0601180dc73c5
+EBUILD nlohmann_json-3.9.1.ebuild 1402 BLAKE2B a1447d98f8b3fdaedb6de761c23de5ef1a2ea3cfca21d597075bf0ba44775ca19887791b17002d6626310356aee699c8b9a007985fe0ee80c404b9809de4965a SHA512 888ded9b7006374c1230ab51036a14db437bc9650781ba3b993ed00150f3651ab8ac57e0e35666b1e71c132d8120de6c17ceb2cc44d7aa169fd46828643570d1
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 9e63f828a377..ded1b4622890 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="doc test"
 #RESTRICT="!test? ( test )"
 # Need to report failing tests upstream
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index f147f1deddd1..40b155f98e67 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
 EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e
-EBUILD pangomm-2.42.2.ebuild 992 BLAKE2B c52afcb802ff17893098017611c8d57ffff0e7f872787145e7e8df84a0522fc6c8870931dfdc5d6a03bae465144a69a9423b0d2f7ca14c37681f05b583407f43 SHA512 2fdcf26739ba76e786d4430376a18db93110fbcd26f87bc6086eabc3b3d7baccfe73b3896a4e54ae1831b3737eca7fbc50fedff5ded349d6298f02e0da222bac
+EBUILD pangomm-2.42.2.ebuild 991 BLAKE2B daff32bc87f4d3a0978c22a358e59737c64bed09df58e00b4a87dff6671bb7e94674c11dfd04568ca00bb204b4d3363f19dca569534d627762352749e171b408 SHA512 9171d58dbcc3d0348bb38f8e5938a28cd3265754a56f738257ff26f685569d8c41ec07a02f89ea570e02268194b2536206ef966d03b098499668110dc9c77f33
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
index d6cbefb77fe2..103bc296f9cc 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/picojson/Manifest b/dev-cpp/picojson/Manifest
index c3da0172ad52..1d3ee516a3a5 100644
--- a/dev-cpp/picojson/Manifest
+++ b/dev-cpp/picojson/Manifest
@@ -1,3 +1,3 @@
 DIST picojson-1.3.0.tar.gz 14695 BLAKE2B 9643a17abd8b53e7191fbab924c36428c71f265cf785f6759d66735a0501cb2b77ef385b4b4c35d8d1512bd9f3b31ee6b38b84e15b7eb6b0dc737f4253f384ef SHA512 76d5a6b3b9e1151198eee707faffcbbba28a2842daccf03d99a5d02ae017f9517ef3ac9da4acc74a4fc1357feaf19e14a15c34698a1d4cb65acb6d23b566b284
 EBUILD picojson-1.3.0.ebuild 579 BLAKE2B 7d41dec9556795e470d059e15a32eb2c268e3c00a945945a3515099fe8f4f97905eadb4a1eb3e90490f9fd252b601ebb544757c2eb081e18d7a5ac1d71ddb4c8 SHA512 e4c2b6049ecfcb38e091f86971191fa0ef38dde1a59bca8fcdf12f791c4b5d3a5ef66efb9fc83dae9ccfacf66087525cd002d807884e9fed78cf8def85767814
-MISC metadata.xml 329 BLAKE2B 034d8b9e387b3ce0f9648cb767df8a32a39adb17d14f5b16a6851af0492fc4f141a23807f8f89183989fc86120928b57bc9ac6e32aa9060bc3c5b3c95e5ada0e SHA512 ea66781bd303f0c8983771231d8038342bdfc30d80b1a55f4d93b7a1ad87f4b0eb62a65d6c18a6c2a9f9e5efbc7ec74bff59e77966ca55c7965753e9a7fc1054
+MISC metadata.xml 329 BLAKE2B 37ec3540e2e0e5f4a6807f12bfc0daf5473e8f403a2d21202226766a2ed2266192ad45fd96ea6d05f0fda7fe293ef595ce6ff10b3ba189d002666bd9000f9faf SHA512 2254a5a67beb7a23f59f37bfe88fabf50ee313ed3856a69b5d861c2b741b07255ee45742f750c1d74d18dab941cff06a4b1956b5473d7feaf5d05905521a6da0
diff --git a/dev-cpp/picojson/metadata.xml b/dev-cpp/picojson/metadata.xml
index 63a2504e7c68..6154b6172f4f 100644
--- a/dev-cpp/picojson/metadata.xml
+++ b/dev-cpp/picojson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index a9bd144df86a..eb6c7c879d6d 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
 EBUILD popl-1.2.0.ebuild 576 BLAKE2B 7da06c88f777fa7a8fc843b7214f2f5f21c3acfe3dc7a5aaf3074ecde1c18f04607cb4e4fc8c3f88f962ae94a847ba6660453f8e4306e26324c09863218e84e3 SHA512 7e3ebb93c803fe716b7e536df014dff0349dcc32ed7067da70d445ec43fe75d178870486fcc32594acdbc7071799a4ace73009ca4c1c7edda65d555adc16ca18
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
-MISC metadata.xml 615 BLAKE2B d8b1ee056d6ec06554aec02e134d1645bfde0a0dd8ba8c51784bc0c4e8091dc763a7be1e16fcbe5b967b8572aa982cc48b097b6270a7204c8af73b6823fd6073 SHA512 5b03e952ffcdc47886a998ca6b707fb6598c044c202733cbc42bf266a9fe486f0270afb26d4d2952673d23d03443b01f2d965b0b1cd59f16b7b3bbe95b8054bb
+MISC metadata.xml 645 BLAKE2B 1975336521d85ab625a31e91d96642bd0b4864065084e5acf950c08fd025795c9a779d33d006669b336d8ec3affe8a19c2705aa212bc478e1215f61efba1c371 SHA512 b3c990edb47262aa4a4584e7db00ffd6d2f36a2e1667e435fffeac6491aaa6ed5a9482f8d8ecb7416e9cd5c4b4b44518e6a06585d8df833282fd8f1330c61892
diff --git a/dev-cpp/popl/metadata.xml b/dev-cpp/popl/metadata.xml
index daf345b2e76b..f8460c972b8a 100644
--- a/dev-cpp/popl/metadata.xml
+++ b/dev-cpp/popl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index dfe60bc3058f..34dcea788437 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,12 +1,4 @@
 AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch 2180 BLAKE2B cd864a68def30f4bf64eb56afc2666ebe7e56a645da1df7e143d7874ae36ea8ecc82a2d5f8aeba5939866b67baeb6a457937355d275375c3bd93b1340bf00ac7 SHA512 3f1dbd41a953e897a1e18a97ef239b73ee1a00475d210406ada3b17686ebd52698c125670a217bb2fd75bf43437640426d48d1c5216ed313c2aceee6bc9fed68
-DIST prometheus-cpp-0.10.0.tar.gz 49694 BLAKE2B f14232e1dad0376ea8e90c89079c4a6d8f2e9f5661a399d38d6f5001506db6c628cb42a934b40139cbb0d904a63c4b4483e6ed92452f5393365ed4209a236247 SHA512 18938b30143ed29985ee56943fd69e0a221f9d25f04fc611554050ee2786e96d968f7db251cccefcbd0017b61bcd8a7ea05af8f217c8aacd9f0694a4702ddcff
-DIST prometheus-cpp-0.11.0.tar.gz 51126 BLAKE2B 8c2126bcba405748fa398d9b8aed472ca5ade45049817995836fbdb1a09fc29e4176a17ecafa6b9a26f8fb7b62cb00037815ba300123fa3c7f39faac54e160e8 SHA512 4ab286c49403d09f182038cda9cb3bd1b9dbf7061493ff5355afef6ec4ac6ef109c875306e76ed3776b07d640ad7034538cfbc00474106108500994242b4cde2
-DIST prometheus-cpp-0.12.1.tar.gz 53034 BLAKE2B cd7f63e76e53cb45c1a23a9b2caba15f56410acfdac5757138cd63d92188a4515563b6e2b5583cf38743c470804422934db40f21293d2dc25fe09daf6a21b82b SHA512 9f9d7ed5b66ff05642e3b0c12cccbd8e23f2685da857d4d24243dfb85239f5478f651043dbe052ac19be4bd44d71875ad0c492797f9a284bad4d4519e970b19b
 DIST prometheus-cpp-0.12.2.tar.gz 55191 BLAKE2B f1430cf6b8ca8272c447e8c2a25af5fb0d515389cb1078f8836a9a1f1ba0e26cc43236e9c147219384df40d601b843219acb95ebc46bb1c2fce6d83a86724182 SHA512 9907658939b7956219c3623bd5997f341f4374fbce2ee606bd1d8df820779ed8dc70658a30aafbb47b9af645205c048270b23e701203e13286bc365094a441d3
-DIST prometheus-cpp-0.9.0.tar.gz 43924 BLAKE2B e2b26b257e44c63ae5bc2a703d0ee9247fd8f093ef58a3b00dec022af9cb56b18d20b74ccdb91899e2385b036c332b62d9959b9258082ca420fecf48926139d5 SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891
-EBUILD prometheus-cpp-0.10.0.ebuild 769 BLAKE2B fe1d2756ee9c375fe0962b27be13ade4ea83be5770e93cbc3f4bd3bc7f3645899467b92a4ccc61b5dfc8cfd3e362a4ee62604e16eb8ac05ea9b64c3b7df36492 SHA512 381fb21b7317337fadfdce1b9fe4c4842bf6f5a0b663eb90cb770c1ecc7fae10bf6e62afd0f6984eb8c95da03e07f164449bfb3a45b674534775db92350064f8
-EBUILD prometheus-cpp-0.11.0.ebuild 750 BLAKE2B f837d8b48c2464c0d5eeb3b4e02403ecc0f3f3a31533dd77a6b660da3a26804c1c493a8c6981f66c8853518d325ed32fc4e42bec886e06871c99b0f36bce8c16 SHA512 f31c5398456ed9c069ac83bb215c20850b46f9f090b3e461ceb34a1c13f66ac42ff5fe15c0593590811caf8788442f24d5de268b91f9199cd16e4d9d9a1e2b7f
-EBUILD prometheus-cpp-0.12.1.ebuild 750 BLAKE2B df0efd340967279998b221ff903ac1de3931e890fd121e4c37aa5fdb042455f9da21b18988ecd6e381c70eeba1ec71883c2e4461d82a5258acc8c85711d7e590 SHA512 5d5c552c42e6359691fd079d4af12cadb7d4243d86eb699842f70be3142da1778c55714cb03c06664b1f01ba6e854231044eb48bb592bdc58f163fcd3aa27add
 EBUILD prometheus-cpp-0.12.2.ebuild 821 BLAKE2B b4a5e9817f4cb65919ad504a6d2bcc53cf41b0cc81bfdda34eaf4b335d6bc9054d7648ebf4a344afc1087239b020f073142994b8ceebc0bf77c9daa1798632e5 SHA512 4377daa3ed659ee16bb0dca9bdce029b5e68650cccce4d4a6eb6b518e8f5bfbf4e08f11779e1a45e0b0c782218b8026b1200302e27459d1b7993f931564760f1
-EBUILD prometheus-cpp-0.9.0.ebuild 861 BLAKE2B 5646744ffc35576379efda8660d4766dd5a31f34688e1e1ae8ed203c78741c2a3081ac17d08ecd42bb470c473494f382fd7be520ec7fb272f0eab8fa0b86fd8a SHA512 173615b28f1d1d73f871b22c6fbc8d787cecce06529ce39a5e9bb03dc4ca9672d74ec2a71666b627b445fd104606ef7d2c5e5fc187e645fc227525f58c98e876
-MISC metadata.xml 957 BLAKE2B e5ad4d542af4a50bfe542f810c937f79065d7a77f5733bd9e3ce356da4dac599eacf980ad5650e91da3a64c9a050f08dfd24acead0538884fbe01253cb008130 SHA512 06444b55464c8301512b2f6c25f8d0e0071cab367cca4111bd21891b66ab7432b7e637f4ed46803c189cc657677ed35a8c351a11e440f8f1ccd48c9a5d636626
+MISC metadata.xml 987 BLAKE2B a3ee76e524e97e6577b2e71d00cd2eb29821f74230d8b8224497565ddf2e80a7358f37a95948caf1dc3a4213f7e96683a54b10836e83a71e6e5caf78d59a8268 SHA512 cfea74c7e5325514dacc13fc86213bc2c6fe758681168099fa1edb5b49503ffa40b83dc10ba6fdcbbbbe502aa064a6445caa7c07c8f1c82fe177dc574dbd75da
diff --git a/dev-cpp/prometheus-cpp/metadata.xml b/dev-cpp/prometheus-cpp/metadata.xml
index ece2117d6db5..3a50d92cce7b 100644
--- a/dev-cpp/prometheus-cpp/metadata.xml
+++ b/dev-cpp/prometheus-cpp/metadata.xml
@@ -8,11 +8,11 @@
 		be collected by Prometheus, but other push/pull collections can be added
 		as plugins.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild
deleted file mode 100644
index 3cd755921597..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.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
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/cppcodec
-	net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.11.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.11.0.ebuild
deleted file mode 100644
index bbbdf49919b0..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.11.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.1.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.1.ebuild
deleted file mode 100644
index 0924da8da654..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild
deleted file mode 100644
index 75d66bcbc3d2..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/cppcodec
-	net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-core-Skip-serialization-test-if-locale-is-not-availa.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/robin-map/Manifest b/dev-cpp/robin-map/Manifest
index 302b6c9bbab5..ed50fe875f77 100644
--- a/dev-cpp/robin-map/Manifest
+++ b/dev-cpp/robin-map/Manifest
@@ -1,4 +1,4 @@
 DIST robin-map-0.6.3.tar.gz 64506 BLAKE2B 46a2b5b47346016695db0c49f73cfbf8530b7db0a31527030eb00f3b6f0695325ab6fe16de1e60d6b1d0793818bdd1e31e50117f2e2e4c50154f65b38ac66d84 SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b
 EBUILD robin-map-0.6.3.ebuild 502 BLAKE2B 159600dc8f19618ce93ff5f58fc80cba234ae7700685d9e54b4b3b11b59b19a028ded4719bce1a449243af5070e01b9f7b7489cb9d930573ea9d7054a350226d SHA512 36b12444e22c878ab08f411891aa27d579fc3ef6dc09db34de2403193c907d413b0c6ef7aa447a58894fdf5332c32f0cd9c76985a7036b6b20a4518edb4ce371
 EBUILD robin-map-9999.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a
-MISC metadata.xml 368 BLAKE2B de2351d3b1e732b8c5a5e17afdc6b0a540ed78ff6404cf3faac0e51fd44678b352b9a0df4aabf11bc49a31b00333e941525b4a873576676a6e46be87fe4b59bb SHA512 ecc9d3212da03cae0ff6b48bc78dde27d40769faaa48bc66c86a13fc88d80fd7a89bdb4137e911c0ad06bb12c40220e9427fb8460fb95eb1beae0fc8af8d2a0e
+MISC metadata.xml 382 BLAKE2B 6b50aa2ffd6fe6e4d0ae88968a8b80e398ec8f8d7ac9ee509bb1ab13b96094fc021ac51c76a939da29d0673ffae4300f46fcb69d640cf6699cc2b9857dd6914d SHA512 c82c5aac98ba94eef167a45304fa1a06846aa3786e3d86646aad1d731445e8122652b0a8fcaaf9a5fc3f37b833f86a6f297f753749fa55a390659b99a1b24b34
diff --git a/dev-cpp/robin-map/metadata.xml b/dev-cpp/robin-map/metadata.xml
index 8238cc0570ce..f6d1924d0057 100644
--- a/dev-cpp/robin-map/metadata.xml
+++ b/dev-cpp/robin-map/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest
index fddd1aafe861..0f4dceee4c2d 100644
--- a/dev-cpp/sourcetrail/Manifest
+++ b/dev-cpp/sourcetrail/Manifest
@@ -1,10 +1,3 @@
-DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530129cc569a0e9c481f127f656059f80575e4be22e9b63a8b6f00ffdac977ca930ad7a3c4d0e1aa7912af711150afbef03707 SHA512 b8fccc4bae55abf5c5a05418b37c665817c860cc27e314f8ccb69665a63b90ef68485c2395fc899f1112a05def8e95068d7a5c92db399f1d3f7a203a09107767
-DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9
-DIST sourcetrail-2019.2.39.tar.gz 84960185 BLAKE2B a515da1a0c6a061d7db843b9bef3b1d419fdbea361c4f5465d32a4a9bfc018575a334de739354de2e249facb7ea6d342329c445990173303fce4fb818da8131d SHA512 5603d7c2fe84c58a13dc682bad6bdbd807b15a9fd7c73c6633f8a7d9e051a660916b3a03b9a5244e2cb4243492586d555a98f0cc464f7405c02f36ef655c8959
 DIST sourcetrail-2019.3.46.tar.gz 108528120 BLAKE2B f36e4e2eb98c28a4d4aa245df3cbd2febd524a3370111d77cc79c2220e6a6227509c9fb9ba9c8d8e0d286719ab55a858adcaee4c983233ee72daebddb62c9467 SHA512 032e9299430c4333115ececedfeb85f39a374d14366c06130becb395a71fc43af9ad9ee09258c4a3ba2d0c2daa0997d5054ad48f0701654fe48eea055ebec666
-EBUILD sourcetrail-2018.3.55-r1.ebuild 2652 BLAKE2B 202b8f41f4403064f3b2c13548b8b6e09d2a75f1cc78b5a3f84bd7a7ec27af9ef911a092094cbd23182aa94b794255847b0c29e0a7970966a2f35f9bc08d75a4 SHA512 5f5bbd16184efe46b8965831fec85075a14b72adc903ec37e07ba2aa7f48d1aa85fbee3d9e09371523e0f15dbcd91739bbec56a301ee35e876f3bcc08480d0c9
-EBUILD sourcetrail-2019.1.11.ebuild 2652 BLAKE2B 202b8f41f4403064f3b2c13548b8b6e09d2a75f1cc78b5a3f84bd7a7ec27af9ef911a092094cbd23182aa94b794255847b0c29e0a7970966a2f35f9bc08d75a4 SHA512 5f5bbd16184efe46b8965831fec85075a14b72adc903ec37e07ba2aa7f48d1aa85fbee3d9e09371523e0f15dbcd91739bbec56a301ee35e876f3bcc08480d0c9
-EBUILD sourcetrail-2019.2.39.ebuild 2638 BLAKE2B 95c9853821f4dc592376fb894a3d92a4cae528558b5c47183bd83c5fa84fdd11cb6f36039586c82b865cbf0f57935de6833bc88bc5d292e8af2bf1400f985842 SHA512 c76ccdf3f8834692e4368d34c87f76aa5f6c8045096d19e68747d6c7ce8875bd021c7d2a2860595677c12f8d39c07c3ad35346d374bcf17fbd047c0e7cc838cd
 EBUILD sourcetrail-2019.3.46-r2.ebuild 2664 BLAKE2B bf39e2d1bb2dd1999ce4e1ae69999cd144e231213c63e06a9711c83997d3526f06b2dcd407bdd0a23dd13303b52185bf7073d3ef451ed94615ce1adcd7d64805 SHA512 08b126153a86d7cc2d39adfb6849ec3fcb406ee4df2d4854711e223b6f54effecfdc4b37598b5524bad9c9cdfa22ffac831cb6a4b50a34212aa38bfc7a67c544
-EBUILD sourcetrail-2019.3.46.ebuild 2638 BLAKE2B 95c9853821f4dc592376fb894a3d92a4cae528558b5c47183bd83c5fa84fdd11cb6f36039586c82b865cbf0f57935de6833bc88bc5d292e8af2bf1400f985842 SHA512 c76ccdf3f8834692e4368d34c87f76aa5f6c8045096d19e68747d6c7ce8875bd021c7d2a2860595677c12f8d39c07c3ad35346d374bcf17fbd047c0e7cc838cd
-MISC metadata.xml 445 BLAKE2B d04d2bd24a8c19606568123ce7a5f5b35a68bafd35728972b887232dd0bf501902ec4e91ebd2c782396d8a945fa6a456765c974dd45f7c004d5b543ff5e8e9e1 SHA512 d3682126116eb02bb50564213649fcac41f0c44fbcf481016bdcc0193fff7b71a64631883a2df21113c85d141f7c5fea3d463dd8c5a102ef24d9b69e1029b677
+MISC metadata.xml 475 BLAKE2B e103fbe35a7928f1adea975da8b2b036c1350fbedd1df9042cdd2682106aa6b3b61786c191078fae20c526f5f4b793852967cf2aabcd193a53889d450e2b845e SHA512 2ab8ce8e1e11d2038f46b48093296afd0499416bd4c081f6efbe2868cfe16ae813cec2534d90f2f219ae3af30f2ad77d4bb7b423f160cf3a66f00dcd7e3114de
diff --git a/dev-cpp/sourcetrail/metadata.xml b/dev-cpp/sourcetrail/metadata.xml
index 1e96a507061f..caa47e5f2c91 100644
--- a/dev-cpp/sourcetrail/metadata.xml
+++ b/dev-cpp/sourcetrail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>david@davidhallas.dk</email>
 		<name>David Hallas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild b/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
deleted file mode 100644
index 55f38a5d224e..000000000000
--- a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
-HOMEPAGE="https://www.sourcetrail.com/"
-SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
-
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples selinux"
-RESTRICT="mirror bindist"
-
-DEPEND="dev-util/patchelf"
-
-RDEPEND="
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:*
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng-compat:1.2
-	sys-libs/libudev-compat
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	selinux? ( sys-libs/libselinux )
-"
-
-S="${WORKDIR}/Sourcetrail"
-QA_PREBUILT="*"
-
-src_install() {
-	# This removes the rpath entries with $$ORIGIN
-	# since they trigger warnings when merging
-	for f in "Sourcetrail" "sourcetrail_indexer"; do
-		rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
-		new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
-		patchelf --set-rpath "${new_rpath}" "${f}" || die
-	done
-
-	# Remove bundled libraries
-	rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
-		lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
-		lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
-		lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
-		lib/libpng12.so.0 lib/libselinux.so.1
-	insinto /opt/sourcetrail
-	doins -r EULA.txt README data lib plugin
-	if use examples; then
-		doins -r user
-	fi
-	exeinto /opt/sourcetrail
-	doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
-	into /opt
-	newbin - sourcetrail <<-EOF
-		#! /bin/sh
-		exec /opt/sourcetrail/Sourcetrail.sh "\$@"
-	EOF
-	local size
-	for size in 48 64 128 256 512; do
-		newicon -s ${size} "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
-			"sourcetrail.png"
-	done
-	sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' "setup/share/applications/sourcetrail.desktop" || die
-	sed -i -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" || die
-	domenu "setup/share/applications/sourcetrail.desktop"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
deleted file mode 100644
index 55f38a5d224e..000000000000
--- a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
-HOMEPAGE="https://www.sourcetrail.com/"
-SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
-
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples selinux"
-RESTRICT="mirror bindist"
-
-DEPEND="dev-util/patchelf"
-
-RDEPEND="
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:*
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng-compat:1.2
-	sys-libs/libudev-compat
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	selinux? ( sys-libs/libselinux )
-"
-
-S="${WORKDIR}/Sourcetrail"
-QA_PREBUILT="*"
-
-src_install() {
-	# This removes the rpath entries with $$ORIGIN
-	# since they trigger warnings when merging
-	for f in "Sourcetrail" "sourcetrail_indexer"; do
-		rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
-		new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
-		patchelf --set-rpath "${new_rpath}" "${f}" || die
-	done
-
-	# Remove bundled libraries
-	rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
-		lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
-		lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
-		lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
-		lib/libpng12.so.0 lib/libselinux.so.1
-	insinto /opt/sourcetrail
-	doins -r EULA.txt README data lib plugin
-	if use examples; then
-		doins -r user
-	fi
-	exeinto /opt/sourcetrail
-	doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
-	into /opt
-	newbin - sourcetrail <<-EOF
-		#! /bin/sh
-		exec /opt/sourcetrail/Sourcetrail.sh "\$@"
-	EOF
-	local size
-	for size in 48 64 128 256 512; do
-		newicon -s ${size} "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
-			"sourcetrail.png"
-	done
-	sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' "setup/share/applications/sourcetrail.desktop" || die
-	sed -i -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" || die
-	domenu "setup/share/applications/sourcetrail.desktop"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
deleted file mode 100644
index d84567ac9a33..000000000000
--- a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
-HOMEPAGE="https://www.sourcetrail.com/"
-SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
-
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples selinux"
-RESTRICT="mirror bindist"
-
-DEPEND="dev-util/patchelf"
-
-RDEPEND="
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:*
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng-compat:1.2
-	sys-libs/libudev-compat
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	selinux? ( sys-libs/libselinux )
-"
-
-S="${WORKDIR}/Sourcetrail"
-QA_PREBUILT="*"
-
-src_install() {
-	# This removes the rpath entries with $$ORIGIN
-	# since they trigger warnings when merging
-	for f in "Sourcetrail" "sourcetrail_indexer"; do
-		rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
-		new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
-		patchelf --set-rpath "${new_rpath}" "${f}" || die
-	done
-
-	# Remove bundled libraries
-	rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
-		lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
-		lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
-		lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
-		lib/libpng12.so.0 lib/libselinux.so.1 || die
-	insinto /opt/sourcetrail
-	doins -r EULA.txt README data lib plugin
-	use examples && doins -r user
-	exeinto /opt/sourcetrail
-	doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
-	into /opt
-	newbin - sourcetrail <<-EOF
-		#! /bin/sh
-		exec /opt/sourcetrail/Sourcetrail.sh "\$@"
-	EOF
-	local size
-	for size in 48 64 128 256 512; do
-		newicon -s "${size}" "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
-			"sourcetrail.png"
-	done
-	sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' \
-	       -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" \
-	          "setup/share/applications/sourcetrail.desktop" || die
-	domenu "setup/share/applications/sourcetrail.desktop"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild
deleted file mode 100644
index d84567ac9a33..000000000000
--- a/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
-HOMEPAGE="https://www.sourcetrail.com/"
-SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
-
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples selinux"
-RESTRICT="mirror bindist"
-
-DEPEND="dev-util/patchelf"
-
-RDEPEND="
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:*
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng-compat:1.2
-	sys-libs/libudev-compat
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	selinux? ( sys-libs/libselinux )
-"
-
-S="${WORKDIR}/Sourcetrail"
-QA_PREBUILT="*"
-
-src_install() {
-	# This removes the rpath entries with $$ORIGIN
-	# since they trigger warnings when merging
-	for f in "Sourcetrail" "sourcetrail_indexer"; do
-		rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
-		new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
-		patchelf --set-rpath "${new_rpath}" "${f}" || die
-	done
-
-	# Remove bundled libraries
-	rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
-		lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
-		lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
-		lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
-		lib/libpng12.so.0 lib/libselinux.so.1 || die
-	insinto /opt/sourcetrail
-	doins -r EULA.txt README data lib plugin
-	use examples && doins -r user
-	exeinto /opt/sourcetrail
-	doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
-	into /opt
-	newbin - sourcetrail <<-EOF
-		#! /bin/sh
-		exec /opt/sourcetrail/Sourcetrail.sh "\$@"
-	EOF
-	local size
-	for size in 48 64 128 256 512; do
-		newicon -s "${size}" "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
-			"sourcetrail.png"
-	done
-	sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' \
-	       -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" \
-	          "setup/share/applications/sourcetrail.desktop" || die
-	domenu "setup/share/applications/sourcetrail.desktop"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index 7d5576d2439f..f0c9b561c2ed 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,4 +1,4 @@
 AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8eb00ad2b8fc33e26840ee0a9ca63c73ea37aa99548d3c741d70647078424f27906946f261b07d764be9adaf47c1d13bc4bf6d302f SHA512 6732a3197550f75ce7a83d61882938d841694f41e9daec51ef36206306fdabdd33dd46eaec106a8877826098b8227368c1ed0962d36aa220abd0336713667bd4
 DIST sparsehash-2.0.4.tar.gz 323154 BLAKE2B 8e0da89a6ae684271293f048092d6c79d14818f7ab9d4fa449414b3354f9e7769d9b0cc724227c47a1be7c7357cdac5cf6f3873047a08c8f085cc457858a8826 SHA512 40c007bc5814dd5f2bdacd5ec884bc5424f7126f182d4c7b34371f88b674456fc193b947fdd283dbd0c7eb044d8f06baf8caec6c93e73b1b587282b9026ea877
 EBUILD sparsehash-2.0.4.ebuild 535 BLAKE2B 4193e724f2289877d7f2026abf31446c60176d87d19ad95aefcc220acf16fa9dfe8757bd649a7a5edf60ca051a6b55559de1395e199ed576eba59910f2b30949 SHA512 3113d72f49fdb3711effee15cb490b0dc23439b5d4eea08a54e9a3dc9964fe2d62bca56cc35633c14a0796e28c715029e9cff635f8fab63e86769b7d1aeb2404
-MISC metadata.xml 454 BLAKE2B 051ab33e4a21fbe135aa5b8ad470e5f6c896ffee33b3b17f99f26c77af09bb7171da7e5860bd2fd303d73533614c0c129f9147579cedc97f884b6b6945870778 SHA512 db6bbd6617ffefcec0f70a1112abd1a57d836fa5d1285eb0a9dad86c782695035d26b75fbb56f83a5a47a76d7a1f96bae5d9a52713b9f1406f437a68d19d3346
+MISC metadata.xml 484 BLAKE2B 9857992add5ac2bfbff280bd941e31344ecad1321ee6a17b77c6af26c73e6413cc9a44869f73b8e27c51d7c11ef51851cb2102c69d883253f95bf9c05503b640 SHA512 da49d748ac8b3688fe60de993729fb972aa6fe713a05fd2094ab2a498ea95606f760324d4589c6d19b814306d033ab5f57ff60cefe80946a2cdbc8a2a3bdfc8f
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index 8bf56d26c160..4d034ae1f843 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest
index a08b57b0b1a7..188be9d22441 100644
--- a/dev-cpp/string-theory/Manifest
+++ b/dev-cpp/string-theory/Manifest
@@ -2,4 +2,4 @@ DIST string-theory-3.3.tar.gz 588360 BLAKE2B ad87857e6d5e3cad1346b759457b434de76
 DIST string-theory-3.4.tar.gz 588522 BLAKE2B 207c490293401829d28590291166bcbeefde4ecb3b70d1cc2751d7582c53cf234b7e01579d3bfbe55681708e4d3e22cedbd6fe96b2fdad1c3ef158bb7a080593 SHA512 36ad82c6da276b7cb66d350ceb4bed2a66f768a6604b2981331ceec6a96d03cc3a7e7e5f733de88ec15e0ea41f99f8657b959a51149c540f530d06268c5657ff
 EBUILD string-theory-3.3.ebuild 790 BLAKE2B 7f5f08a59ee1233e4ab14e520fa837e65c1697215dc8330526a7011ba66a1d28c6f7e953f36b89231dc5e44bdb9dcfccc94f54c3a060a4df37b3341b9df2741d SHA512 b6f1d3baa1c606e0bb470aec7305dae97c7096b876768e45e250bb68480198a5f278a5ce9a9ef654bb29f35e2d435caff1eeba7c59e4be6866bc98b3eb519bc3
 EBUILD string-theory-3.4.ebuild 802 BLAKE2B cc4e8331a2f414d6ade504544a10d412bd22aeb8b7a30f3f649c5500ca6809c89ea6c7c5feafa9a5ffe6f7c019d89eabe0cc21f352c9450b6a0524af03c78017 SHA512 83ff1a846aec28d307df60e5c22d3647db104114ede4a3e627fa7f7cd2d077ceca134a2f323e63d591a0a4fcfbd953c05803e2303d1c2e4c86811d2988584bce
-MISC metadata.xml 469 BLAKE2B 4826f5bd124fec7815e99d11166a0a4c79d806ace91b25f529f26e2b61e89451d2bd464e24103f24d39a1dc3bde56c608bd4cf4e167948633dbbc8381731a28c SHA512 6df6277f273d4d5a8739df38abe0e3f590bcae55b4bc00d2543f89d5429dc905c81464015f0e07933d8c5e38b9d74338d370baf4c8cf68b1ce66622f75ed1309
+MISC metadata.xml 499 BLAKE2B 338c0781e8071a4d52ed2328c992ee3567f30df62b580305ec9b7fc3ff93bac8e769ee8f88fb38bc317e33aaa0b0cb62f84b56e3a3f7826ff4a8793bf278a0ca SHA512 afde4ba1afff957b2d6120ab762a0042c4bb8b1f3e52dc9f33af3b54c3854e4afa0edb52bf2555fc76f5f05da46837e2403295cf1c511a581da50da450675e29
diff --git a/dev-cpp/string-theory/metadata.xml b/dev-cpp/string-theory/metadata.xml
index 4f7470fb770c..b14a34be7b05 100644
--- a/dev-cpp/string-theory/metadata.xml
+++ b/dev-cpp/string-theory/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>misanthropos@gmx.net</email>
     <name>Richard Fröhning</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 38cddd3b2b8c..576eb4d90f6b 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -5,4 +5,4 @@ DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177ab
 EBUILD tbb-2019.8.ebuild 3219 BLAKE2B da178b7f1be91e0cea538891f93d40842fa7fb72ee81b60fccc46d46c8f0ce8c36aa0a46910013bb78311ce05452d5d8594067f4526a74126341bae446ccd76a SHA512 00281dde79efa4e06a6b98eeb206d823e06a8b846808a58d43f324bb2053e2ac4f20a7b8a0b9d85416877a58efb03410855e10af073675ee85d0313bf87b42fb
 EBUILD tbb-2020.2.ebuild 3397 BLAKE2B b5824f331e87bdfa563c1bb430d8d599ad5d3415c3582d6c3d7deb036b0aef8009798d986af9e8f01f49c1fc77559f0de31a47f75044d13b20a9ca4a35f997c6 SHA512 c659086dd1beedbc05bb1570185d546970040714c2c4bbb3db595a20b04070397538ae79777e3ae01ce18fc5033709ed4e6a8ad535f5c9967e71db05893b846d
 EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 9c8791a0ea337b4db5b6aa3ba819cd0de176eee8581403b037a7d0f84c8890e11182310e5cd31cf8cef812ce13d80c52b70962dc6b5c3e7e02c06ce597fbbbcf SHA512 8a057dc3453a9851b00727e839230cdf24d2e50959b68d4c0c9bfac6314efd3d69c4389d91345d25bc5a3daf1c75ba18fbfa3dddf4d21613fb932d2357232b57
-MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13
+MISC metadata.xml 687 BLAKE2B 3d71a46504de458f31f2de33441c575240d35c0c1fc8135721b58ecf89c30f2687bcbcabd2c0c78c52547a469ac7540bfba41c98799aa621f6802830af3fe6fa SHA512 ae6422c5a68ae7029f966c2cc717b52e8a018c2720838911b2ec9961dd3881f3cd4e0608b996023186d6c4dba1d465e5a726dd1a271c34b063a262efda0b753e
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index 1e4e905a8844..620c131dc97d 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 9d3fbfb76b11..9f9e35216ddc 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,3 +1,3 @@
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
 EBUILD tclap-1.2.2.ebuild 549 BLAKE2B d3ad6a465e07b217a9254e8b50316e50918fd474d6988f91e70b3ebe5c3b40b5166a5573117adaaf0202edc8facc73519e05bd347074e2f37b53ab8b2869bb40 SHA512 d5971899f95945b3384078777c6b80c0332a1b186af6998ca261fb089ada1ee8fb0a3096b1d7b48761d16117c339bcb04fb505db46ff28be828f9beda0c33c23
-MISC metadata.xml 438 BLAKE2B e325bd7ec0e700a1880e240b8dc045da9cc393b755180b529594e1b65cd888156b059c0391673f69379851f7ffbede7cb49c8749baf8164292fb9926ba372445 SHA512 892cde44dd9d835b40d08872c00b4d5ed9090f1ee6bdfe706a3d387b49a9e3552b3f899653a88a39732601de8ae9be9b8f6057d5d4b06f77d4d5f4b277c49583
+MISC metadata.xml 468 BLAKE2B 7a7cb4e5990c8b35a9393b8206aa4bf0e304918aec4061331b7dc0201c2c5544906e59d53d33f4e55e8839b5b28da2001b4e1cfccf6d944ed91561406f5b99aa SHA512 8dd344d7410b740202f520d8fa40d193860851c355c0285fa84b3c2987573eb0a0fee89074059d03e003c1c986eeff3bcfe4496b3ba9139c7fffd6545674aa89
diff --git a/dev-cpp/tclap/metadata.xml b/dev-cpp/tclap/metadata.xml
index f06935ec61de..9e8ca2faaa6f 100644
--- a/dev-cpp/tclap/metadata.xml
+++ b/dev-cpp/tclap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@culot.org</email>
 		<name>Frederic Culot</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index caaeb64b2da9..86598e87a30c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index 41d48b3dcaad..0fb66ad7ce3a 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -2,4 +2,4 @@ DIST cpp-driver-2.11.0.tar.gz 9392387 BLAKE2B 37d6063b33cd9821faa15d0eb8cb7e87d3
 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1
 EBUILD cpp-driver-2.11.0.ebuild 613 BLAKE2B ef569879f623a411b2e92060b2b6b3854e6a1ab3e58cc89b00f980bc3d15225d0a21582d731bdf53498eb7adc604a0d9db95251f3d54ee2f08fa27088ba2ce2c SHA512 63d19c7b45eebb4099d206cb5ada28fa9adcc52297ad7b07016cc929022a72edd4e8ad50a88dd02b3d8fcca84901d716386e64f2f6aabbbaa5dd714d55f8a761
 EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5
-MISC metadata.xml 676 BLAKE2B 48e5c2f895466b330017e6c13f15eb49f41f3e317250dbce3537210895f9234568b1470af0fe1bc7f88ccf40a01ce340543ae6176e46f9a89f26f3751ece50a5 SHA512 dae7394f2998715c2928fa0d4200ebe222f66328adbdcf51e5a1d1d25f5d1f7e48e5bd356236470dbbe36ea18477617b5da02cfa70365bb74c4a2d1428e12ad2
+MISC metadata.xml 706 BLAKE2B 8acb71ef303196e20bcd2cd4f7ef8e3d1d0a865dd06cf1a1e393ecce618a456c4b4e338c04a5e7d03a98fc3b885cf6b293337a8910d121f7e54bed25508a4c41 SHA512 6088ea69f298ba254779116d0e0a12946554da18a9e6b2e8b638de0f579a830fdbd17d3ac4d9f2c4f69bed02875997686d1b1fd4d01707235f6355c5cfeb7b10
diff --git a/dev-db/cpp-driver/metadata.xml b/dev-db/cpp-driver/metadata.xml
index 35194b53a268..3690e58ab74c 100644
--- a/dev-db/cpp-driver/metadata.xml
+++ b/dev-db/cpp-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -6,11 +6,11 @@
 		This driver works exclusively with the Cassandra Query Language v3 
 		(CQL3) and Cassandra's native protocol.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>geaaru@gmail.com</email>
 		<name>Daniele Rondina</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/gqlplus/Manifest b/dev-db/gqlplus/Manifest
index 3c82cbe4b124..aa41c041cfb8 100644
--- a/dev-db/gqlplus/Manifest
+++ b/dev-db/gqlplus/Manifest
@@ -1,4 +1,4 @@
 AUX gqlplus-1.16-ncurses-tinfo.patch 485 BLAKE2B c5a38640cd4a1b072fc0f966095041b9ae463e6a2c577a822e40bd899f061f11b42b4c0bb8eca4a2ff9064251a69bfef508c8b63b31953da45061e801b337f17 SHA512 4b9fe6e489d12e021384979bc659a75ad60f704ca485320893d42326aece16720c8d02268703b3bc8b45527197dbbe85cbac9d7ae9133ff350718b874abb4382
 DIST gqlplus-1.16.tar.gz 2128428 BLAKE2B 5d2ad6cd58d7a5e0e6ce0d54301d70ad452d34a9636ce1f831d1b6d1de3bbc0ebce3d92ed15c2b8da60107d49c56c306543c768c0ef3534f34d2d545b80c43d7 SHA512 e9d7685e4db741db8232f7ba7a05df59042d0cafe198060adcd37aea2d3878e785eacb1f7b72fcb154558d1be8c619818dbeceffaefb75e372a18ed23e234512
 EBUILD gqlplus-1.16.ebuild 806 BLAKE2B 0e670ae099780beda48b434a2f6e13553c95316ac28c84faccdc3b36dfb2396f9713b25eca594672f03b8884fd324dc2f032b00d8df37424521a2ca1156b209d SHA512 7d5b310253539b0def3d8540115d1796467057968ea9ef175cb71885e54e539efb69fe613e37ace4e8be910b1e803c4f0212b71750c9d4b55c1cabca2b1af618
-MISC metadata.xml 620 BLAKE2B 82537c625dbd12eca6562acf5605a5b3b6b1841dd946d2f5dd17a1730bb340f49837f3bea3c9ea6f830abd4c0ecbc3751d218a8daf843f65ca4bb292a5a355be SHA512 8ce9a86e99c4198a246b149f5a526f0cf70ea9e75d3e97bc643520c9377136e83ca56ac47869ae0b62f021dd28da6745204c7c12a52a82e996949b4a796086ce
+MISC metadata.xml 620 BLAKE2B 1bf8eef6669e88237044223573dd13252acfbd1ce2357a8c3a8b54c10b55aaf3acb2df040baea23b4cbaba487579263362c054131023e5e8da183f2257dd9ba5 SHA512 6d73381bce688df3aa4717c419131798673cf83c14cff9e32b6391d6c8d7df470285a7654c4f68370b2166b48b3abcf4a6d1715bf8d257a4a937e73e2a88ee57
diff --git a/dev-db/gqlplus/metadata.xml b/dev-db/gqlplus/metadata.xml
index 533ec708627b..06ac859c58cc 100644
--- a/dev-db/gqlplus/metadata.xml
+++ b/dev-db/gqlplus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index f0f6a4074d42..1f90304d10a3 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,4 +1,5 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
+AUX libdbi-drivers-0.9.0-slibtool-libdir.patch 564 BLAKE2B 7effa5db121872b079af2919b56857fda040f9712a10789ba3e4c4352a0b172127026f1df9c2f93071cf78a14f05431557e23e63b74f52df87710942d9c14711 SHA512 9f4ca8fd4147ed1c619c2d7ac40b4d67e67f3f6f940568647dd1782a705a52cd3d10241b2c4039ad8cca2ecc7186841640ffa44fd56d5fc9d19a7e8f3fc974ba
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
-EBUILD libdbi-drivers-0.9.0-r1.ebuild 2170 BLAKE2B 84ee219333a4c1aecaf6f6bde7fd1a237c2e5b4d19edee27d7beacea85173ea492ad2fcda12afa4660fdd4f690555a99ea7004258165fee5fcd760afa814c8ec SHA512 23b2842089bb96164f09ff6a8ea4ae80c9e451418d7dc50babde784c7ffc755740dc91433d48f6e045ab418c84fccb41c71f4ae64a6c6ee7e97a67e232f466a8
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2215 BLAKE2B 677085541cba057c53e0c2fe5658ab3e682af6305258a5150cb04dd20f9d255a0e0330e064097981d4eff3e2e0787fa848afc43dc36bbe9491c8d8f98842aceb SHA512 6759e67116de90a12467bc5d473333917e45048a20a1906fb426445e002bcbe5715d8c578eac15f678032fc43f6dbb251f98f3bd5ea0028a538ef69c3dcd8b3d
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch
new file mode 100644
index 000000000000..4db7485d33de
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/775878
+
+commit efbee1f631981bd454051d20796f1cd52fe16f00
+Author: orbea <orbea@riseup.net>
+Date:   Fri Mar 19 09:01:22 2021 -0700
+
+    build: Fix the pgsql linker path.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8e89af8..7504d63 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -191,7 +191,7 @@ if test "$ac_pgsql" = "yes"; then
+ 		PGSQL_INCLUDE=-I$ac_pgsql_incdir
+ 	fi
+ 	if test "$ac_pgsql_libdir" = "no"; then
+-		PGSQL_LDFLAGS=`pg_config --libdir`
++		PGSQL_LDFLAGS=-L`pg_config --libdir`
+ 	else
+ 		PGSQL_LDFLAGS=-L$ac_pgsql_libdir
+ 	fi
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 81c597acfdfb..74c9b7367fbb 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.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,13 +6,14 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
-IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-SLOT=0
+IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+
 REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
 RESTRICT="firebird? ( bindist )"
 
@@ -29,10 +30,11 @@ BDEPEND="doc? ( app-text/openjade )"
 DOCS=( AUTHORS ChangeLog NEWS README README.osx TODO )
 
 PATCHES=(
-		#"${FILESDIR}"/${P}-fix-ac-macro.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-		"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+	#"${FILESDIR}"/${P}-fix-ac-macro.patch
+	#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
+	#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
+	"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+	"${FILESDIR}"/${PN}-0.9.0-slibtool-libdir.patch
 )
 
 pkg_setup() {
@@ -83,5 +85,5 @@ src_test() {
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 490e260316a1..4b65bb1ba2a8 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -1,5 +1,5 @@
 DIST libzdb-3.1.tar.gz 720162 BLAKE2B 2ad8ede7e2a1c0ee831ba546b7756d2688bcde83b537e812c12ab3d42d6bdc13526778ae68b61584a52569f0b42fbeb8462efe379821295d855f585ae3420df4 SHA512 7cf24ccf0f0a938955d8b54af2c6eca8a8f700737beafde9e824129f324511e06adbc11a3fdbd6ad6d9b902fdae6f7caab4e5c1c594d2211be314e3a24c697f3
 DIST libzdb-3.2.2.tar.gz 752292 BLAKE2B 449fe1cf9ac7196473ab45593d197ea9d02a91bb3b0efaaea91b3c95bb22de1ced68704835e542e092a9f507e8f2484a141e021721df84e818a18a36214f7c40 SHA512 1e732f8785322e0369de16a8100c9467e96ad1ca4eee31e8bfc349f4f17d4cc237a691addc060a66e1b46bcfeb99c3aed07b1d5dbe20e70fde4ffbf35dbea2eb
-EBUILD libzdb-3.1-r1.ebuild 1987 BLAKE2B 7747fd2a24c9f45fbd2713d931a41368369964635466442b452af6a1ea38e1b187d26a424981b76da1a9796dd45a94d00fd3f79a2b43e6f9e855e3b0c6b2b719 SHA512 735b7ed0579a6cdc95dec473f6fc0d15891e51d2068ccedec1188b163a3afa285603a32f68352df88c7cd3f5bc9dc15da6cfb41321b4a2b09efd1231e2dfb0f0
-EBUILD libzdb-3.2.2.ebuild 1989 BLAKE2B 33e36d7cc7b73aacf23215e4a40383338faea0140ab926367c0e971f1529725b1673042f2ddd4113461db31ac0cbe8a086ea892f0588618a9f5774de1796f271 SHA512 c1c1c9c0864221f2a90909d0ed994f8c36fc16f461c67b46d07c7effd3357f570bc59f5dd6fd5cc9036401dbb442212af3ab36723bb8848c2831aeebddc58b78
+EBUILD libzdb-3.1-r1.ebuild 1989 BLAKE2B d492521d60979d4b135d8c66d9612fe6d09a85897f9bdbb10c6f879119f9aaa1dc32b4c9366fbf8c09ff858690375572b7626c4a60cda90c484d9c011c4769c2 SHA512 ebd106e30eebd9a9e52128433f68ebdd9c8cee3f877e5eabcec7469706209f3d7a18e6b7585288bb85a65c412d99ca1692c9d5fc94895bc0f022e83b7efc0b3e
+EBUILD libzdb-3.2.2.ebuild 1897 BLAKE2B df6d11a904408ed4b1250d8d8b51811974bdc61794b03d90641a477d7b13273acc8802119f40224a4fe9fe20e503b3e4f11e58bef3ba3c2d4f0ecd296d82f91a SHA512 7637ae90918a3ad11534ba1937e769c0596cb02724b267b90193411e69beece521660540089c6a89f7ba1dd7deeae6abcf24c5145e864943db107ba4977569b5
 MISC metadata.xml 258 BLAKE2B a542b7d3d6fe41d4d6804f23d3f4eae32151dd6a261fd9c53df59afc03381e2621ef74094f612a796d2bfdcdc994b210f47935bb396e4ceb58e9901ffbdbd50d SHA512 5744904454b157ef1753d1858d293f35e7aa0d9c513a96823f5efc1ea7fde3bcbe2a50ae70f56be9c9c15463b820d45fcdfd52773a58d078252aceb0e93992f6
diff --git a/dev-db/libzdb/libzdb-3.1-r1.ebuild b/dev-db/libzdb/libzdb-3.1-r1.ebuild
index b3ba017bb1ad..2e86113710c8 100644
--- a/dev-db/libzdb/libzdb-3.1-r1.ebuild
+++ b/dev-db/libzdb/libzdb-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE=" || ( postgres mysql sqlite )"
 RESTRICT=test
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
diff --git a/dev-db/libzdb/libzdb-3.2.2.ebuild b/dev-db/libzdb/libzdb-3.2.2.ebuild
index cc039a65aee6..eda97e8cd4e3 100644
--- a/dev-db/libzdb/libzdb-3.2.2.ebuild
+++ b/dev-db/libzdb/libzdb-3.2.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE=" || ( postgres mysql sqlite )"
 RESTRICT=test
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
@@ -28,8 +28,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
-	# Fix detection of openssl 1.1
-	sed -i -e "s|SSL_library_init|SSL_CTX_new|" configure || die
 }
 
 src_configure() {
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 75bdf1c4ef25..68f84dae2828 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -9,5 +9,5 @@ EBUILD lmdb-0.9.23.ebuild 2243 BLAKE2B ea9b523973dde81ab257ba7a7b25ce41a3942f5cf
 EBUILD lmdb-0.9.24.ebuild 2263 BLAKE2B efc56dc416bc96dcf55e24fe2f757fe23e7194ee46036df50600a0794bdb44a1b9e892e6b00acceb467ef1a08a021eb22c66272193cf1d282dd733f9cd6e743e SHA512 05ac018fb64cc85ebb3f53c62c6094b46701239dd99fbe048e164bb0a180d15aff76e42a876e80a61484b864d98eff7da0469ae7ae40f6a9c9b3ab8f04bfb478
 EBUILD lmdb-0.9.26.ebuild 2341 BLAKE2B 6a6edee5b90634bd0cb802b9b467ecffdf0bd0a3fc255ac2ccf601b1048d2d1cf45528341516c09f90d3ff4e1f3078f5665019f0783fdf71835176f076672c2a SHA512 1a21922d2a95b5de62962b6df10768079a608f7819fc3d00d34a260dbc251c88edc7f901dd8374f4dd31d8c87b631e9ec3fb1bb68474ca0806df0be4a236e8b2
 EBUILD lmdb-0.9.27.ebuild 2341 BLAKE2B 6a6edee5b90634bd0cb802b9b467ecffdf0bd0a3fc255ac2ccf601b1048d2d1cf45528341516c09f90d3ff4e1f3078f5665019f0783fdf71835176f076672c2a SHA512 1a21922d2a95b5de62962b6df10768079a608f7819fc3d00d34a260dbc251c88edc7f901dd8374f4dd31d8c87b631e9ec3fb1bb68474ca0806df0be4a236e8b2
-EBUILD lmdb-0.9.28.ebuild 2431 BLAKE2B 77fd8d723132c07d8458f4734c4bffc2c81ea36a2b028f13b702e1be2bc0991dd4367b2630e5c9b5e72dfcd01574c094d554657e0544abe871670883c37282e8 SHA512 9464f89f1b805b834397050e9da47f91aaa30d9976370d19fb2147eeab9d2c3139913fa533600f9efe889c1d806f703a8b5c554bb2979aa7a22eab1a18bbedd7
+EBUILD lmdb-0.9.28.ebuild 2425 BLAKE2B c2d3dede502a94b7c6800444c857fc5bb81618e2dc441f89f74ea110e335e2ed245707fb312d610a3679fd8a5d294dc085a1a37aadc4d20eb6e6c81e8f84d1de SHA512 c0bc7b2d2d30429917f420ef05c64a87fb015457ae005a31a6d4a1e2127f228f9076f26399486acd2f27fdea973bea825419cb1622d894e4272c043aeeec32bd
 MISC metadata.xml 432 BLAKE2B 21af6c7ba636803d33bf8877d93282327ab14f0688657115cfc2d23bf40b0f1c556cdf7238460430347570590d8ff2441f8186b5f15fa48651f12e8fdef846e4 SHA512 5feed30bc7a5a51b41f330de6446ab4f92826d2e1c216f0eb994d3e6e55b596e0a57369d51f11fc0151acc67da5d6b0d169d2394de1bd4790f2eba0eac1a21cf
diff --git a/dev-db/lmdb/lmdb-0.9.28.ebuild b/dev-db/lmdb/lmdb-0.9.28.ebuild
index 0b02e87102d7..270b26e5bf16 100644
--- a/dev-db/lmdb/lmdb-0.9.28.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-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="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index eb35cd113ad5..735b9fd5d14e 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -4,4 +4,4 @@ DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 318e5a269c6f4584
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d
 EBUILD mariadb-connector-odbc-3.1.11-r2.ebuild 1998 BLAKE2B ef765a439df34b0b0bccfc84565f829b84e3a56d66390b5c00f2c53f3f3568153c81c0aca762231b09f20ff02d307b42106144ba16841a5b04c25c89b8f64510 SHA512 4dc27c27a4557174e7ba9e6f3a1232cf9d5a57024254a0b7a8c8a087bd18d5776f0ccfbece99335662360909b4a8a354b278733669a8865da01a96b6a243db39
 EBUILD mariadb-connector-odbc-3.1.6.ebuild 1700 BLAKE2B ff213bb689fb6d20754b313eb296da1bbd93d87cb3af978eb87b021321d459f2bfe0354340a370ea88054e509af34ca311924ebad0fac3843491b9bf84fd6ab5 SHA512 0ad3a6f1e594fcdb6248f6eb39cb54a85f4a0c59f05b82b1c2ad4037939a227ef73983a34a01e0c9c40d9b5a2bd038dfcc85d3d91ea6f6121dee5e397ea523b6
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/dev-db/mariadb-connector-odbc/metadata.xml b/dev-db/mariadb-connector-odbc/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/dev-db/mariadb-connector-odbc/metadata.xml
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/metadata.xml b/dev-db/metadata.xml
index 7ef0dd98662b..d761b11d8fbb 100644
--- a/dev-db/metadata.xml
+++ b/dev-db/metadata.xml
@@ -37,4 +37,3 @@
 		programowaniem związanym z bazami danych.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 05cad9e3f9c0..a6795cd3e663 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -3,4 +3,4 @@ DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d1269811
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.10.1.ebuild 1055 BLAKE2B 1fba1963ca58f425fb9319aca1507bc895eb717f8f2ffdec3741003187e0203f7493191e62d3475e057c6e2c4735ec2210355705fcd24750ac73e850740a9c16 SHA512 867fa644160a44955f4be27eb2a82bb10be73d5e1a9c80850e7ea5bf34f00410e0005bdfc963df4a94439cdc54ba8b22178481b606fa0d8d33eb94f96c6ad1dc
 EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B 5561bc8e94a28d6676d6673953b970b05f062a48d25a2ef280a6cf79a9a881081b936e39260d34f46719a45085b4201511a10af0a00441008218032a5aeaafd5 SHA512 fe5ab2d9ef8f9d4067e61f376e9867bf48b49029666d7e85182aa1ad774fd9177936e311e9c31fd8835a0494712cf231e55097b393b01c084712492245f507f6
-MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
+MISC metadata.xml 478 BLAKE2B 75bc3d3ed6095b767a4fa6488bab9c98c693370eccc11508a56647c8d45a3d909cd08cf0deb93c011ccfae5f727e9942e90b340ce7a70e7e514dea3e2e894cbf SHA512 5410f1bd014a5de0fd9a0e0ab85c6b2955ad761619118b549a1ed85ba76f1bd785cf89099c6096aee20d43ccd849bb90840331bff80b94611cb27cc0c2ac3460
diff --git a/dev-db/mydumper/metadata.xml b/dev-db/mydumper/metadata.xml
index b7a839d9622c..54e28fa43fa9 100644
--- a/dev-db/mydumper/metadata.xml
+++ b/dev-db/mydumper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 06f5cb9c1254..3b9e9b68561f 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -5,5 +5,5 @@ AUX mysql-connector-c-8.0.23-libressl.patch 13374 BLAKE2B 991f1e921c3f06937c682e
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
 DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58 SHA512 b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8
 EBUILD mysql-connector-c-8.0.22.ebuild 2904 BLAKE2B b46f1757bd0d1f4ba6db5f9c029425e57f5f43b379ce121fcffffd0d6562f747b81f980bbf22cec610fdb416192b05368cd9cb45362e296d6e851de6d5ed6780 SHA512 e8de286e91c74a9cd65396d713372fa13d793a719bd702e9116370659194b001a221881051f0bc9c46f3474336e7d134177b1bd35883c09e0e0c3f3c5e0902e5
-EBUILD mysql-connector-c-8.0.23-r1.ebuild 2980 BLAKE2B 77204b68e7322efddef3db0adaec920f596b960743adbad721386947195f7faaf6707bd2217d0c566fb5eb9301d29aa913eef3fee77a5cf946973fe1bd7386ce SHA512 cfe53abf698a40f57e51af85d5eef0315d89deddfc73c5dec4636720271225899df31c917c34ffe1f0119dcb39e66aae826456b15fa9177fc100257d0bc3badd
+EBUILD mysql-connector-c-8.0.23-r1.ebuild 3109 BLAKE2B 061ffdc701798e2e6b743b3fb22827a82bdf79bf69abdf458a4774f08a5afe5b861db5aee923c49ea134f652994583f0195878dba0fbd8468d65b262b09cea75 SHA512 f4890724a0a9e488f2a3d1751b331d57dfa617fb6e72f2669df7fe3f391b00313bb555203491f5a587e1eba8cba52a21e301a8e4a73b4a7f268beb9f0b56b4bf
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
index 1abc77fe9934..4923fe57f0c3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
@@ -11,11 +11,20 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/"
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+	S="${WORKDIR}/mysql-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
@@ -39,8 +48,6 @@ RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
 
 DOCS=( README )
 
-S="${WORKDIR}/mysql-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
diff --git a/dev-db/ocp/Manifest b/dev-db/ocp/Manifest
index 973d7f819ce1..512f467a8a5e 100644
--- a/dev-db/ocp/Manifest
+++ b/dev-db/ocp/Manifest
@@ -3,4 +3,4 @@ DIST ocp-0.3.tar.gz 156447 BLAKE2B 0c7f8743fe4ae46c3b9d95847e39c51fd1b829af9e9a7
 EBUILD ocp-0.2.ebuild 732 BLAKE2B 4d7301cfb319b4e40650ff6c9995d7f9807bfda90e581699cea845557f56aae666a1aedfea375e2d2e24009028cb11adf59147d419bba2c1e2765b4211cb74b0 SHA512 447f0a33d07797e6dd5fbe5fc7f62ddbe853e4d038f5ba1da148c92311d38ba19289c17166c5f4a9fafacb7e22eb4ecbfafe60dfff18cfbc6ccfae29c73c287a
 EBUILD ocp-0.3.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
 EBUILD ocp-9999.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
-MISC metadata.xml 614 BLAKE2B 218c867c70ad619570c2c9ce97bc8fc5ea1ba9b121db0e05e0fb3046d7b4e7fcd3e467fbeb57d72715604d1c457b4aa44649a78587d29c61b9a63d19775f3b9e SHA512 33281a9bb09cfd13ecae433df9612587d56befe35f81e50d88164b0b4caf997f404c613ae456b497fc934fae9b4837846a18a2cf714c49bbc0b0b6eb920fa77d
+MISC metadata.xml 644 BLAKE2B f7498f57e2fdbb2440bff4e3f4c39f24c1a9cbdd3ce5c5695d429d139cd6de8cb6c78f77515e031c333c97962a6ebd6226ee2ba817fcef468b9edf0b620b1cbb SHA512 87267932f099a05230ff28521792cab03ea80d017fa674cca853335b6304c709d511748b1596b422d15b65d253a340b0cec48f3ca22db7ffab8450738996065b
diff --git a/dev-db/ocp/metadata.xml b/dev-db/ocp/metadata.xml
index 1d5044264397..2ae5aab128c0 100644
--- a/dev-db/ocp/metadata.xml
+++ b/dev-db/ocp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>maksym.satula@gmail.com</email>
 		<name>Max Satula</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/pgFormatter/Manifest b/dev-db/pgFormatter/Manifest
index f6fd84362f40..dce8067b1617 100644
--- a/dev-db/pgFormatter/Manifest
+++ b/dev-db/pgFormatter/Manifest
@@ -1,3 +1,3 @@
 DIST pgFormatter-5.0.tar.gz 1311094 BLAKE2B af9a730e50d09920026dd50794c65e11456c8ea38a6f4793d6bf85d7d3afec37c114f098551c72da25fe1f91bd72845c80f5f0bd96472003d5cba182a0ec5a6b SHA512 0b192c176431eb8c59a30783bc83d5ce2451ee240d08c95ac1cddb899e6c201f01601858db8019a2b967c9d31dcb710da781d06fff694295dba1a623c1c9eb19
 EBUILD pgFormatter-5.0.ebuild 351 BLAKE2B d2f706cd19065bedfe6617990123dad601f4ddcbba57bb73f23d05b741d99927244d46b1e6e5926dfbe4dc58b68841cd92f99640c7da316a984d3aa5b1280166 SHA512 04c860991ddea29ce49fb12d22ca14d13a010b25659909d794b0e359690d4b5b3fe1ff8acb629bcc2abd5b3e9973b2b04b05cec14ef1c4b81abf2f8babe7e3f1
-MISC metadata.xml 373 BLAKE2B 98b377a3549b3bd27492c791b4fbd3556d3ba98b8736a8e26a162cc2427a4209340cb28391574d9d48ec91e8ce6e164c93d00c1ccc7e1cb817514c15e6654f18 SHA512 a66667075db4298d870c447c3c9b0d84e4022766d50483774375025457f8d01b4cf7a1507a73fc3435813b85559af3d16fbf276351dd1e3d096a3e1699fa6c13
+MISC metadata.xml 373 BLAKE2B 931a577bae37200c49d2c84ab6f626656b8c39c757288f9aa705a13c21e46dfd6e433edb3566720787556e9d92decb55a920e56aefd8a5430321b4507d478717 SHA512 1fe6c6376e99e2bfc05017609c7b308504b1b1f5a54ce09e45c9d004e4b02ca67e775116c7d263c297fa9f4f6720af6887b5e43032b7c3c8913d61e9887e66c3
diff --git a/dev-db/pgFormatter/metadata.xml b/dev-db/pgFormatter/metadata.xml
index 79a51a6f7526..83ed1aaf1a99 100644
--- a/dev-db/pgFormatter/metadata.xml
+++ b/dev-db/pgFormatter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index fb712860cf2f..c95a7a7c161e 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,5 @@
 DIST pg_activity-1.6.2.tar.gz 127561 BLAKE2B 5ddebd3068ddc33196903892c01b947ffc50ecff7ec790e196626e87ee8933ff79242e3ba61c207ea1020535c5d85dbbc4ac9e4825a19ab98004bb27ea0b6a6c SHA512 fd743f369201c6ec3762373c39969b2b7632d79a8fb9c8ebd12a88b66b91915c30e445e93162844b4a176cf7e13009c9c8136e973180b00e7cc708ecd66b4853
+DIST pg_activity-2.1.3.tar.gz 277297 BLAKE2B 9677ebad581e2e66e266e5433454e054274693a8e2e5a959c5f807ec1641f3b02a4c202eac7bddb7abe7e51e131d32d25a513a439e97aca996e79be6e1e9c0be SHA512 e28c75d1b88f6b530820d82327d6428d2388341bd09ba4efec5e80e753aee17e995b4e6d5ee8b35b3b972f20aa1228d525fe0c4bdcb8e365795d568a4a25c076
 EBUILD pg_activity-1.6.2.ebuild 624 BLAKE2B 023b6368bd071c1fc01eddac90d205293bf0d6edde9a315e8549fe5c20ca8e4fa7048213a9e5e1ecc83c0d8241868ad3593de6fcd572ddead29198a62c9e8704 SHA512 121f3dc7c5d348d27bfd999e5d4dce387466d4a593dfa0aab4f20f1a1d6af80db03c617d340e3976e59b5c3e6fdc63ce73d8201241c540e53c3c1deb1e501151
+EBUILD pg_activity-2.1.3.ebuild 988 BLAKE2B 69eeb374337b00713cb593f0ba2eee64bf644aec89183105678797205b871ed0e1c67cdb0754eadad4694dbe951d41a4ff544c63bf14d3906cff4a4fd09c694b SHA512 4a03d3b88b369f1be169ca542a0e567d4f4099bb729929d1a428473bf9de9174c254d60d0cfc9ed8b9ae95d0214a50da3f6ca5f508a66900a21cd286d6b318d5
 MISC metadata.xml 339 BLAKE2B 216c15e347a9dd6061fa95a90fe2a6b5b14f9dcfe7dce8a36376f28dc1c30bad6ae505247d1a5133bf9d8c1d0d61aa07b0f827f1547d563a5046a40e300896ef SHA512 e4b44855c8acd726e3e43cf79e4706077edb2cbccb955ed70c3fe44ee91ed604a057d8b612e4f3950387ee8c96b3fc77fd8e5696e63b896280a243506c7c8853
diff --git a/dev-db/pg_activity/pg_activity-2.1.3.ebuild b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
new file mode 100644
index 000000000000..745e50c6b85f
--- /dev/null
+++ b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/dalibo/pg_activity"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/blessed[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/dalibo/pg_activity/issues/201
+	export COLUMNS="80"
+	epytest -k 'not test_ui.txt'
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index a40e01f1d0c4..ad17176371f5 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -6,4 +6,4 @@ EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4
 EBUILD pgbadger-11.3.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.4.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.5.ebuild 455 BLAKE2B 5c4abd9e9026bee497df8b5366fd3bf09e50cbdd72eb7b6cedbc12eb5557223c22407a399dd120e0808dfe1ea4f3f2adc300f9c6d1a6b7f0057b92cd10b77bda SHA512 25cf5979a60d87314aba054a86c47fcc496e167392fcf1018605a37e76fb3ccef45536e642baf4de827648948c1d0e1321da1dc7e1554721eebbb9a059d7aff4
-MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
+MISC metadata.xml 413 BLAKE2B 15cb832ee856b856530026c2541f520feb59b15d345c66d9851168df6502c0e9b596d1d6c9412af66dca9570302a6033e43aed906b8950fd9f3b300684b32285 SHA512 3ac9450fc26e5e683c219e638cce3caf09f4a348926a5c863f7d3951988a363920349c29b00b6791e7d414439971242866f7d2d2901a26014f2e17b0e83bf791
diff --git a/dev-db/pgbadger/metadata.xml b/dev-db/pgbadger/metadata.xml
index 5010c08906f3..d1e69cdab335 100644
--- a/dev-db/pgbadger/metadata.xml
+++ b/dev-db/pgbadger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 2c98269e44a8..beb9cee7168e 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,3 @@
 DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46
 EBUILD pgcli-3.1.0.ebuild 1011 BLAKE2B 2eedf2e0abfff372a260ad99fb445480b71f4af68af07bbd364e734bde47c92148b0456558bf43658cd321da3b52490209d264ad390b8245263a0fd44f17ed1e SHA512 b644c1e97ca4e5fe88cd3a174aef4d60626f0e8502cf783e55a646ec040af27e3bfae10b70f92ea0ce2aff33f5dfa817aa09c0d80e15da934d5504c4e3b342b7
-MISC metadata.xml 485 BLAKE2B 635bd7fb0c4daa7b5cde8497c3a6112b320484daac2e27c87a69986f6e611db5723b97b7349c8c11ccf84c4ed4a2ec06e8a791e092d65eecdcd69248271828a9 SHA512 302332f48f73c36f9336b6bb53232a1acfb18c6a4ed3c4b90abb611592d43823c9c0c270fcd872866916f727eecfa85ea5228706d67bd41f16eb82a0f6dffae8
+MISC metadata.xml 515 BLAKE2B d487fac15c86cb09b5527e462385a290345dfab312b429f0e8582dc060af10eeefa1aad4caf80d8cf4f0b76adc8517130027de9c03667b88ae0a3f54bb97d31a SHA512 843c56959c88ea1b6fdd3cdf7d09142d1261bfc37355f2c790c3f4f2f325535c984f2cd4f70444a1a2e4c7f6148a57689f8351f76b7ab19111912d6f005067ce
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 22ae05489b8d..4dea25618d51 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index 5a2a5922f33d..10e36cf34f9e 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -2,4 +2,4 @@ DIST plr-8.3.0.17.tar.gz 74017 BLAKE2B 314b4cfa2c3ca8ed31e80a72233a6dc8cdb9f3811
 DIST plr-8.4.1.tar.gz 265142 BLAKE2B 859913ba14d3e6876eb5a3d7593346b98ab2e1b6c70d9fd9cc7e1810fe11ecb3c552305485735cf975cc41ce2de6cbd7bcf407c9e373fc4024230be797c9899a SHA512 0db407355271009bad95c21f81e544839322f0fa0a63d2abd8edbf9eab8f61e208a3e4f7083729cc8247411885197ff3569c88264db0a29b34523dc83bbed7ec
 EBUILD plr-8.3.0.17.ebuild 1700 BLAKE2B 441f233545359ab8d171834c88564883acdb1470ffc88e01c8b617cded8af24b2dbce943a23ae4ab7275908f809b805773915e96c9788b1be71ccf9fd65cb07f SHA512 deb87ada7c10d6fd263f0a1261e31444c1034dcfd603ad3ef1287f1f5fb30c040953d64de5ba0a58ef7c7036b38923cfb4beb94518a25e5e363a6dc2bed87563
 EBUILD plr-8.4.1.ebuild 1706 BLAKE2B 9cf57201d0630c2f3f8934b2d64db8c01409cbf1001a0e3ce0949682e01280da700f4a9f14165e5c06fb369136f7cecff8c9b3f8f3465540893dc9f84ebba75c SHA512 45a3d957f45b2d71eff298b9f8931a495fcb6c7f48edf318d21f036a682d899d003fdaf56c4688395d716ce8a8f1eaf4554cfd124b96ac5221e75c7ae7095310
-MISC metadata.xml 399 BLAKE2B 3c3d305e53fbb1fae5ca9c97fe8d3e9b765bbd9db2e2fc79d392d889da65069487b867f73f69bbb10971fce543827947e3611e9052081558c33da7b4a66c29eb SHA512 213efff0d0d08b552143e20704f5f8506f94c8ccc67484c8048d95421f4b6ade9ff1a40d9db6bff6dffcab22abdff5003142948abe95bc5f19aae7e67d34056e
+MISC metadata.xml 398 BLAKE2B fbe9113ea3c7b36b9edf80a645a929aba4c1578ae347b6c3f952de32566fb038e2f8d66e116c209ed9132daff772ddf8609e2fee4d34daa82d7f491d712755d5 SHA512 0a3a915b23606e75f6bca1ce8088912022826dbe336f03b40a9a2988c7518d8c5a61b5c700f60d827465142dae9f2ee1f501a51209d1d3b9c891da1e1d3f847d
diff --git a/dev-db/plr/metadata.xml b/dev-db/plr/metadata.xml
index 60798fb9b769..7d7dd18a30cf 100644
--- a/dev-db/plr/metadata.xml
+++ b/dev-db/plr/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>pgsql-bugs@gentoo.org</email>
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0cf3c261b68c..ccc7c4fe4a4d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -26,9 +26,9 @@ DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38
 DIST redis-6.0.12.tar.gz 2276349 BLAKE2B ab49b0278420c65fc995a90e850130971ccaf3df34a08a5cc10a8c211239eba8449b87fe67684189c71816cf259a70a23a77935ec61e8baa787daa61cb994201 SHA512 9dd8e3bed51e1356470e1bf08892f771744c0c9418ff874c16ea932ad1f471a908ffd8479efe1f32531d7f63cd7af5224273ce50f2fe7aa26c47716e0e78330b
 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
 DIST redis-6.2.1.tar.gz 2438367 BLAKE2B 8717630771eafaf8a15dd371d46475f81f15bbcdc9a4fabd8f270ab6e09fbfb3ee2a1cddddb6c7778922d3552bcf5ee475eec7ba0623147ec36a5c5422cb0de0 SHA512 7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6
-EBUILD redis-5.0.12.ebuild 4732 BLAKE2B e1aa4db765f757fdcffbeb806975dc346879d09bbbe23eddcfa8deffe2a6f86b173d4d5fcd01ee2845f03318986e68fdba7793ff7561a98ab801cd7471898e03 SHA512 db0e89efafd5045e2c2efcdb0dd2902af4e4539e5f6cfe7206a681e3b9f9387e6a192cf5041ff6dde47b922e20b997957ef1aee46458a68c0d92acf916da146a
+EBUILD redis-5.0.12.ebuild 4729 BLAKE2B 1c5329e5d7e296f97fe5561b64b39ed85e83cc22cb5508016a2e966359140e9e946b72c4865435a6fee6dc5f350eb6a981afeda5aaef5b30318046280e1ccfa3 SHA512 a61756d60c828959e9986af99a169f19f6b3f607868836e15b79218527a9eef5601825bb176b1f87bf4cafab3150937213c6ca881e6dc4cd5a7caaf346b4f786
 EBUILD redis-5.0.9-r1.ebuild 4727 BLAKE2B 296ae8313437d189b96ee93f5b63cefe11abb576d4925e150de6db510183a948bae6a4ae76db1a393e8c1f3c0c17dfad8c52e07b8d1cf36cd88d11df4d2ac17d SHA512 af8a96dcccbc12d8dfb0c77d1c857b245c47d77b3084f11021e9cf02ce1a8258c3c09a855c209356c49ba9aa8a5ad37e732751d908e01e2314d7c2d5ceddf320
-EBUILD redis-6.0.12.ebuild 5020 BLAKE2B 097ff357543c0060d3684562bb58a018ac16e4a6800bcc5f1bfebdba842a45a5b9400bcaca36ef781d201d85814bd28025c4c53662dd67a14f1e6c4f7eff2aca SHA512 41fc1ee5d297d54bf62042851de411fbe5a6ec2846dd58d826eaceab191cddf4d35018542c0259d6330a5ab8d7b770aa2481997e634d28d7bd10771eead57eda
+EBUILD redis-6.0.12.ebuild 5017 BLAKE2B eb087b9eec1e14361140200dbfe6cb9388b32d06170434c50e40c17b237b91d7986b226f97cb4a823858a9f39913a4a8905cb729fe5cd27f84d594d85c545c63 SHA512 fcd2acef853696d40900cee136ed29b86614befd89555560f5bbe985dcdba5179b7ba9424c782ee81cfe22414bec600be53ba3d2f6f5b89234c4d923f5bd2b9d
 EBUILD redis-6.0.9-r100.ebuild 4569 BLAKE2B 255dc421757021cabf391366934eaac4eb3220df64e60742ccc7746e5923fe60bc90e7abb7180002c831017525ac3bf0dcc39d0bb8a4014a38894e68fb3bad18 SHA512 b3ce8c2c71d11f73a66b012adfef1aed5505e441814cb14cdc820a24d50cfc6f7dd57695d3bb5fa2f18037ca92113932daa22f97979c967a6f5fdf91bf630785
 EBUILD redis-6.2.1.ebuild 5020 BLAKE2B 9d64fc2efeb3b7a22ecbaf9440639b327f2555a21152f0cedb81cccbed351f1037e6158dbff9afa10e33c7ea59b575fce0f9c59e06576b1284e749f07a1472bd SHA512 c61f65441d30d13a939275bdebc0d27b7906eb6aa9de5dc675ba53662a5404d06f5bee04c4412a85daff711b5d31a739142e7e365e2fd19bd32aaaf66ebbbed5
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-5.0.12.ebuild b/dev-db/redis/redis-5.0.12.ebuild
index d9cb0a2b1f39..db7046eaf85a 100644
--- a/dev-db/redis/redis-5.0.12.ebuild
+++ b/dev-db/redis/redis-5.0.12.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/redis/redis-6.0.12.ebuild b/dev-db/redis/redis-6.0.12.ebuild
index 22268b85376b..ba48c5558daf 100644
--- a/dev-db/redis/redis-6.0.12.ebuild
+++ b/dev-db/redis/redis-6.0.12.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index deebbeb79b35..9aef5b74b357 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1,3 +1,3 @@
 DIST sadisplay-0.4.9.tar.gz 9536 BLAKE2B 0265eb470ab600b761cf6d0e1872c3225e863de8aa602fbcdb1839c33ced8825318d4e4f8ee24de420847c077d1830af069af37ea8d3e3e6c76f47dc2335e1b3 SHA512 30fe8dd2a6247328bc4d7640e5a34b15a062322729cb8a2ffb66c740145475a95ac924f752017fda8f347268ce598957cfe78e8fd6f80413267c72b143b3e8b8
 EBUILD sadisplay-0.4.9.ebuild 476 BLAKE2B 47175e13c1ef36529ea68f98b6b5b50e0a659233d3fbfa445b9b5d3e544c3792c0b005eb0df802839239613bbef283170791b1e9125ed1126e973dedfa64ad01 SHA512 32e5eb90291bbbe461111058f5fcaa185ba6ab004baf590687a152798f180c42a56e7c82e2177a95230bb255caf9ee7c7d45a45f7ad34c953c899dc5e1af7c64
-MISC metadata.xml 715 BLAKE2B eb0731795ba03939b3bb99859e1b461e515bec1763405c35cf2fe0c1fb749599527daa8731a4b18a9f18e0ec4f018a748f42acb87646fca63ea271d460dbea34 SHA512 47849ddbc16013c526be4754cddcda1dbae4be9d651431460e605b0873518fb3dcff2f5b2cccbba5e1ba29156598b67368aa51de3d1336294ffca54fb57810a0
+MISC metadata.xml 745 BLAKE2B 4b6c498625993d6143aa1eb6d67f30978247f4cf977f4af97fb4102b62933528a4c98cbad8dea04667601578e8038be0f494bc9d45194ad771428dd3c1c4d3c2 SHA512 e63776f5a01dd5a28f55e352ac909a514bb2b58e003f550be823687e63dfe9d810673d3cd33e69807cff7cb20cc04ca9cd5842ceca66a879c05b2e7614cde0ed
diff --git a/dev-db/sadisplay/metadata.xml b/dev-db/sadisplay/metadata.xml
index 9f00ca2c1e9d..4e12231e7088 100644
--- a/dev-db/sadisplay/metadata.xml
+++ b/dev-db/sadisplay/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index a0ec35034a68..dd3997fd5e28 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
 DIST sqlcl-20.4.1.351.1718.zip 36694031 BLAKE2B e2c3548676223891afdf346ed5e9e3150557251e017cc6b13709f00998113a9fe44d20fa5e5969b7c4671c88b9daec77dc7f730437e1be71fd93f1f542a7c4d5 SHA512 14efb04f87da6b3e93edbc654164ee25fe8258bcc5ba91ff2e42e10d036e493e0e65c2e82795ba7ac93055af7d2d923e35573e63dbd3f22c2241bd3041c3e56d
 EBUILD sqlcl-bin-20.4.1.351.1718.ebuild 937 BLAKE2B e21df4f4713969555029c69f4af4a494e0c4cd85bc5465aec3f915064b8f7ad562e1d12936cae5cc4c80005611c1d7f5defcf474a745f5a18a87a2d30ca2218b SHA512 0cc3d5ae15deeb45635d23a89ff82fada8450e4327df6565bf10faf522e431a1c09931e9d5ef64deb3173ec63b50d5247236aed6a1c2e7eed53b3fb300764fcb
-MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
+MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/dev-db/sqlcl-bin/metadata.xml b/dev-db/sqlcl-bin/metadata.xml
index cc2aa77ecc42..a4f3061c46d6 100644
--- a/dev-db/sqlcl-bin/metadata.xml
+++ b/dev-db/sqlcl-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 88bb57a7f379..6b3cb8a75d95 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -12,4 +12,4 @@ DIST sqlite-src-3330000.zip 12591089 BLAKE2B 14888bca229683e97c4666f8efb535be5bd
 DIST sqlite-src-3340000.zip 12623425 BLAKE2B 548293cf0166407727cd068804eb5e1ce62f654533c88a87b71a6ff62da37eb2af21b89b8d63ee677777ca917e0d685ddcf9b8d5c3c8b2a2b787d71da8e5a161 SHA512 520fbca59da02452e2861a140bde891aedfc8254eafaa6894e8d845369d60d6a921595a411efb2611c0f7b0cadd69a713dcdaaeaad1e4254e9fd9a6efde07f91
 EBUILD sqlite-3.33.0.ebuild 11438 BLAKE2B f0cc7f4987d1642d4b294e2c2d373e7da1cfa8db202fdef9ea66eb0347cf809eef5f09590114f6a75f8d1e3461ed689dfa8b6d574095c6113aee37c6c6500d77 SHA512 5ee535586943330b0cfc8e4108207c46964766fd59ae6a86bbc8afc6d4e5dcd820d60a75cbfe6715ed9908677f6f927adf185f9950953fa7eb242c3a611ba93b
 EBUILD sqlite-3.34.0.ebuild 13013 BLAKE2B fbd505c4299e99f26d7d81b5915b31b8297e1b33098df9bc247320d99b1ac974b8c9b265fe7631d264910ae924bc4864c87784e694673ed62a5859349885b22f SHA512 b69523d15df43fe906ddf53ebc0fababf0a57af3a8e4ad1aaf4d14d850168a25bd90cc493e4e2a38fcb911ea9b80d1e71fbc9adf1abe15f45950d820f64321ee
-MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
+MISC metadata.xml 743 BLAKE2B 4e2cdd6391c851ad8a705895fc9a5b5f8d77df3ae9cdd96310b1a72d5f4963d19427b8c97f5690f49262e91e9f321f6aafcdd5fee222eede0505810a803265cc SHA512 06315ac56dd1d0e738e3d1161b611c4db053de49e1a35e536b06b9ad7c0f9276b50c390ea6572802b58d49b84c7f1a3c8e63496d04d0f4b0d603bba804fb1757
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index c7b127a748ee..67b1888edcb0 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<use>
 		<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 1515619e1b13..8d8652879853 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -4,4 +4,4 @@ DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004
 EBUILD sqlitebrowser-3.11.1-r1.ebuild 1420 BLAKE2B 2c7d13d4d011bd56cbfac596bd30dcb6d8c8252958be8a481dcacf59e1d16d2b1fb92f6b721a52506d685f51af193a42ce164340314c600f24430199fbdbf444 SHA512 3c9a8d829c49fcdf4f18c0ff2d48f9c4ce281110671101ac306edf1d60586759a6ae40cd0e05e244bfbb3bef6a86f1db6e7c6673fd1951ef665f34ee8fd1865e
 EBUILD sqlitebrowser-3.12.1.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 EBUILD sqlitebrowser-9999.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
-MISC metadata.xml 1477 BLAKE2B bd6a9d3483ae98cfe02d1d7cc0167d86e50935247063e63c428e92846e035c50757145957ed16ab5bbb979620121973e207f2d341f46cdc25bc2fdfae3dd89ba SHA512 6199dd425d9b960e403cd80155aaa6aa7f146f4dc1113e03969f5721880df426ddf082ae27cd5c0413b68a2a8d9f7385cda00008064ae7c56e9203f053df8063
+MISC metadata.xml 1506 BLAKE2B e52a311da6408b28b570e975745f05607d88a7b0fd2e6144ef008664ddaed062b67f355a141f61d926448829694907e2474d0d0b39088a7c7c8f8a509934d344 SHA512 a4ed70e46b0e86e266ce4a30f401517ab83dcef51fd048047e2dcd13b9c5cc7d9e985e69de5df73f670eaf969a86f835b65035e7093f9c195464dcb4ea09de7b
diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml
index 92f71ab68770..ed00998feb6b 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>beatussum@protonmail.com</email>
 		<name>Mattéo Rossillol‑‑Laruelle</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index e2c312361256..ab5d3bf24462 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -3,4 +3,4 @@ AUX tora-3.2-qt-5.11.0.patch 1891 BLAKE2B 4617847e8ede3cbb25dfb3a5121f7664bf36bb
 DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a
 EBUILD tora-3.2-r1.ebuild 2371 BLAKE2B fc87422fdcb4ffa3b091e027b80be0869ed8eeaff6201c5bd3ed39cf21e26d76297aaa381854d73593c2c151d8b270fac171afeae0d6d5c77392987f9eba5751 SHA512 fe2dc980090dc7f1c52e00383659ee99c8dc8f8fae5616864ed7ca25ab2f298e0670ec01b5d3ad0ead4c4788c4241e9febd06ffe8c7007cb0de117d8637deea2
 EBUILD tora-9999.ebuild 2293 BLAKE2B cae70dd88725d3c007737c5ea97494fcac0df6cc7c37a1dd2f88449c45f5f336170d2bc64fb89ff643bd54a41139cf6297c93b8420cbfe75cae8c5b5a3670fbc SHA512 6f59d5b2438d0f22b6662a9dc3e9c82f039bc30e55f0e928ad4c1a21c16346f0abd873994693e0e4978b0a66daff1112022836b5289eaddc9045f61a3b6449f8
-MISC metadata.xml 843 BLAKE2B 483349f54edd1d61c459d689e4f4a65a427bfdc49a05244b8b9ef26f0d49460f3f04a995bca0e9e2becfb335cda699992bf62c4a1d26b264d5469741c01f9bf5 SHA512 fb6b7e2966d2cb74576f2558d44e64a5cf8aa79f78c5eeff58fcf433369b4efd32edb103ad4174bdd7d878466e4db720d81e4b1ff637d7c1193d37d944708247
+MISC metadata.xml 873 BLAKE2B dc914db9ecb278eb50579a2405be7ad2d3ae2f7e0d04ee57a2970c46b314c28ed76ee624533f0ed0315decf3d1ff763eb9810b1189b4771e5bd47531b5d58161 SHA512 0f9ea83b782109daaaddb1a15951f57c7c139a481815b19407a4869eeb3b5e49a188dec6ecd04b2bc57ae02c7a94fff04e2c6811ada19b74cf6f2402de0c60a1
diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml
index ac37be91b865..37466537bc7d 100644
--- a/dev-db/tora/metadata.xml
+++ b/dev-db/tora/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>haubi@gentoo.org</email>
 		<name>Michael Haubenwallner</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 5e5b1c7a72ff..c593828f0631 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,5 +1,3 @@
-DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
-EBUILD unixODBC-2.3.7.ebuild 1741 BLAKE2B 8b4e552a341fc6fc0cbde7f1a57c4ad4767c19f7e1b9aab7be8e86f2cd568e6599031877ad6fb567f04d173d61b031515ec2817625dcb07d68dd03618cc9e55e SHA512 f09723a448dc9c76c6ac2cf33261fb715334ffbff3c362ea0169ab9fbf938a313c624cbc6c4788700420df28f4e87eac769eb28342cf1400c70d59c5dd912d8a
 EBUILD unixODBC-2.3.9.ebuild 1770 BLAKE2B b4dd58f09389162bc9591ada594db3759aef4c2fbe6d0bdb77732d27b0cd86237b72c8cf30a6bbf7c125b1256e9e51693b0ffa9f672eefeec9408643120500b0 SHA512 20992b85a2db4608f88f4dbaaf2b07fc6adbe0ffe39f8e5ade705efd8c48839e0cdc54a1bc217cd231636a6f398b0a88c2d73ad677bac5cdbb901373d7ef143e
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
deleted file mode 100644
index 89073690e49b..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--disable-static
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use odbcmanual ; then
-		# We could simply run "make install-html" if we'd not had
-		# out-of-source builds here.
-		docinto html
-		dodoc -r doc/.
-		find "${ED}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
-	fi
-
-	use prefix && dodoc README*
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-db/vsqlite++/Manifest b/dev-db/vsqlite++/Manifest
index 330148e0e754..cdfb98becc92 100644
--- a/dev-db/vsqlite++/Manifest
+++ b/dev-db/vsqlite++/Manifest
@@ -1,3 +1,3 @@
 DIST vsqlite++-0.3.13.tar.gz 28195 BLAKE2B bd66a1592d4044f6735b063b72e3ac12fce32ea67c1af92e435d9db475264ca4234021ea7c6b997cad03e296b0ff66e90cb781707b18ca4048e23f21b47d61ca SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e
-EBUILD vsqlite++-0.3.13-r1.ebuild 911 BLAKE2B 88226a1fe11c99e119b18d5ffe3971863ede877c8cdd279ab123d9abee6e68d8df0f52a2edf6ea4f1e979a5c829006b7d4ea51d72f2116a44ab62f403049eaa4 SHA512 5b7357ae383da99fb8b09e9f4579cd1a45f4c0504739b75be7c77b49fb77b394fafbace6f683e3c25ff4b58ece8f8ec607876bd487856429bdb1c2c25b9556f5
+EBUILD vsqlite++-0.3.13-r1.ebuild 816 BLAKE2B e39b8df3184573e1e780d78efd740b89faeb600e860d4b380e96dc61ea92609cc588add88b827f0f2a8a415aefb48418f2e72d1609b62d059d6fe1c5ce1f23d6 SHA512 4ea875cdbe92ad0c206b3128976e98ec1296bdcf51fdd44407a1a5a6391a992def159bf2491e2a7d1023a2df75ec12c251bdd37cc86e611f0a035ec23800446d
 MISC metadata.xml 307 BLAKE2B dded10764ef95d964bc1d0685a8d54daa17d56eab31a36121b6b0a47937f8e59f199cb4a74ee1e1d7b457749b870db08e6ce15efb435f8850cbedc775dd463a8 SHA512 9c6a1b9a9d1ad7b9c5e8235145bfda70198cab067695215ac9a1844f8e292338c136abf1ba68e28d82de3d2f2884ee47ec4401355cece233534c73a3451476fe
diff --git a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
index 0024ad1032b1..803330278e26 100644
--- a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
-DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++"
+DESCRIPTION="VSQLite++ - A well designed and portable SQLite3 Wrapper for C++"
 HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/"
 SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="static-libs"
+# package name is vsqlite++, but github / homepage name is vsqlite--
+S="${WORKDIR}/vsqlite---${PV}"
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 ppc x86"
 
-DEPEND=">=dev-libs/boost-1.33.1"
-
-RDEPEND="${DEPEND}
-		dev-db/sqlite:3"
-
-DOCS=(AUTHORS COPYING ChangeLog INSTALL NEWS README.md TODO VERSION)
-
-# package name is vsqlite++, but github / homepage name is vsqlite--
-S="${WORKDIR}/vsqlite---${PV}"
+RDEPEND="dev-db/sqlite:3"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 
 src_prepare() {
+	default
 	## remove O3 in AM_CXXFLAGS
 	sed -i -e 's/-O3//' Makefile.am || die
-	autotools-utils_src_prepare
+
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc VERSION
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 1405dfef21bf..32326c247c46 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/metadata.xml b/dev-dotnet/metadata.xml
index c2df3bfe8ca6..0bcbb0ced1d6 100644
--- a/dev-dotnet/metadata.xml
+++ b/dev-dotnet/metadata.xml
@@ -37,4 +37,3 @@
 		środowiskiem programowania .NET.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index ea6214615721..7e7ebcb0cbf4 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
index 5fd8211f9d40..b85afb1924a2 100644
--- a/dev-embedded/avra/Manifest
+++ b/dev-embedded/avra/Manifest
@@ -1,3 +1,3 @@
 DIST avra-1.4.2.tar.gz 392445 BLAKE2B 6b556583838e0e5bef0207f7291da7c5e6dad01e695d9592b3de8f528bc7a5dafc3015f75934bcc8f9e0b6baca39ff0ae13c88ee290e657868bbb522d27da068 SHA512 f51a43b1b28102d6180ce27e74b50642de8f3d18fa35a82904fddaac993e87e1096667f2245bebfad92e4ba3283330f6ac4b6083e486be5af9edca7b7e90e56f
 EBUILD avra-1.4.2.ebuild 567 BLAKE2B 6c374a5ec439e71a58f8bbaf0ce135fd66717e04fe4e03a8a6804bf3abb66964e8f41c8d63442ed9e30caa82a71edbdd16ecec5d730a455b4226725add80a588 SHA512 1903e839232c6b83e401ab24207921b1aa5da561aa2f986ae534840c346738daf326b9dcd631c03f96f0cf69b2001961a7ad93ef7c68a7e64588806257b8cd74
-MISC metadata.xml 443 BLAKE2B 54e313793f71742c73eb9733326a26578971843a9af53f9104c897181c759ba6f589b49f744f7fe0c86a4fa4d0db0be9a3e44a9b5517be5830483e014ce47c24 SHA512 97aad2214c0b9e8fd3fa35393eff597d71cdce159ff291f0f1780eaefe68c5d4b0ef66f48b7036da3e3a32a8d9903c473491fdb483aef02703f6979f8d93b583
+MISC metadata.xml 473 BLAKE2B b04afa72e5b0c58d81828afeb3045a83c5ea57149575da4822ccd85df2f957dcec214012b673385075e270a23af07491ac6d85be591b9a99ab6cf883fa9bb1fd SHA512 ebbc0be8a1f6abc1c9095282d7ea2b0428dc741858eb7cace8d92a13554516fcbfc578ce9a5ce710c1dabe1791fda9fc6efdec69abec441c35f4c6683a6911bd
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index 7cba2e3edc42..cdb75a2d8c77 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 2d2e6b290d0c..e088409e15f0 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -2,4 +2,4 @@ DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a
 DIST esptool-3.0.tar.gz 6628258 BLAKE2B 613bdc4c4d0df633c25c83d51a84ff9ca34d5c345f010d2e3e99bc126530d484bb1fb4818b3a10b10a6b9879b161817d5bc6288dab55368f1250a27e2418d641 SHA512 b522d30b11e9ab4e426009116bf1872e587116b7a3b517f841d34d3e860f6454345be89a2e28b8eef5aa5e59318e991504697644a3f4f90d7e63c037025716eb
 EBUILD esptool-2.8-r2.ebuild 1057 BLAKE2B 6cc687c86fa7851648b135eaaece7de1aac22d7b4d16d298f23e045cc7357f07e0f3b19ce4761522708076b1b9091da7f1f3d3b0384cbc612af47bdbbdd54331 SHA512 797e8b5229af3eed44143042232136a383fe7f3f4e4773fe6fbb6ed45c39d02b9479354f3d966496bbbc94bd8813b1aff33a44b0460b47d0f6d66d2920fe191f
 EBUILD esptool-3.0.ebuild 1244 BLAKE2B 90d3f79441a14aaf7f4e9eb1f7f324bff0fbd8904cef54415d0ac13cfb3f85fd43268327583ae2ca0b21d5461743b7dfbff259c18c72c30a5c5484c6e2882fbe SHA512 5dd476ef90c84038c4f5341606cb48ceb891ba4999152819fbec832be460c4fe7d6d6b92b550f1e0102fb18ff42802c23d9723e99f48b93ef5967e130733a2d0
-MISC metadata.xml 473 BLAKE2B 58b09a7777e3c2c04d7932bcfb631a8cbd0322cc81cc35a0871fdc8843f0d3d376b42bb2d7cacd5378f1d7e0f497f0989be1381ee9e8dd3513a899a9ba268199 SHA512 6029394a2639f610b705a820bdc92eab6849087b6964aac46e1aa9a2bd897f06e45919cb32441115081c3ce26097e6a083d9826c43bb7da86b2859855e7f9d67
+MISC metadata.xml 503 BLAKE2B d759cecf4fde754abe8b01d95f2071281c463c1baba1df36e5e3e51dc39a92ec62f2d8411feb67435184a03cf0d80550b5ec213f0194d2ccf41941e9d86b2d89 SHA512 a878ade6c10267d45335db070603587c464d17dcd3cc2b4466e31695c8cafb6eafc46aad9d17f0fbc785d2f69542ce934ee8bd64974291744caace19ceb543bd
diff --git a/dev-embedded/esptool/metadata.xml b/dev-embedded/esptool/metadata.xml
index 5d0a40ebda0b..e46f90f518a9 100644
--- a/dev-embedded/esptool/metadata.xml
+++ b/dev-embedded/esptool/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-embedded/metadata.xml b/dev-embedded/metadata.xml
index e2e461a48134..a3e8d82b096c 100644
--- a/dev-embedded/metadata.xml
+++ b/dev-embedded/metadata.xml
@@ -37,4 +37,3 @@
 		programowaniem dla urządzeń osadzonych.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 149e525f2d40..063bc7d077bb 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -4,4 +4,4 @@ DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc
 EBUILD openocd-0.10.0-r1.ebuild 2235 BLAKE2B 5c3bb924ad4f04172d3a6020c1c0463e9b3a0481b536c620a9217894ee35aede3825b6b9740a5ab8540d5b2c3f36068278d2620c8ae4d8c1351b9b877160f3c7 SHA512 9722e83dd2416b57a4d245d9eb88234efc175ce24d1b72bf2a7775f4973cf5c855f7981f3ccbdc3bc8529896a796f026320030154f9cfdf3b10fddbb1185912d
 EBUILD openocd-0.11.0.ebuild 2224 BLAKE2B e42a39589aea254e12964b2bfc8e3db5003b142e3d42f441bfcf47ad6b962457be9f7d0f9f52f8c6ba441077f4994911f711e0fbe0dc7655a98636e9bd0b00ed SHA512 ff24e9f4794df158b729178b5143add285a7dc3877fe50c349ba198432175b14578f9bc23cc3959033074bf7c8985db4225285b1bd4578c537fe8f22eb6b0f0c
 EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898
-MISC metadata.xml 1071 BLAKE2B 8e2caeefe14839f59d8c8e6332b0c563da046f3e1684e8e7f6d2ee13146f99aa5fb0589e0dcf9ac224abdd88b785fe165d275693706f21704e407a51b9d588e7 SHA512 38de30a7a3d68adeb2dc8cec33ea8ac30f069f95c36109419c06bc6836d636205c9a30e7c414017ab296d04beeb4de029afc264a15dd1345f7501729b1b8388b
+MISC metadata.xml 1085 BLAKE2B e707859a0e103d2bc009eec929b8b7f872fe366fbe0cbd2f59dd0c6a63063a0e6c67659331c066eedf5688260c06e60a79fa5321428e264c0425511ea76ac44b SHA512 2062830a00e4d09284d8f77d96d568a246dda03c979a06c7dcd7b0a52d17cfe2915c77c855fc60e7b91f05394b71c4182e1c92312282e27c2c8153728144ef09
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 270c6290d4be..36b4559088b9 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -5,7 +5,7 @@
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fercerpav@gmail.com</email>
 		<name>Paul Fertser</name>
 	</maintainer>
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index c507533705b9..7da5d3945a38 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -2,4 +2,4 @@ AUX ponyprog-3.0.0-desktop-qa.patch 333 BLAKE2B ef21bb3f39a828317b1dddaccd36ec77
 AUX ponyprog-3.0.0-fix-build-system.patch 4477 BLAKE2B 0c933f8b7e330f2c9a428d3cb0974550180b460fe1ebe2ac22cb98e4f7de579d2b5fb2e3d24ad227184396650b2ea6041ff36dd5e08db4c4d720e5ba5bb9e2a9 SHA512 5c8be7660d770bb7120b69e70f5a08ddec2568f2c930d780c6fa5bbcd09edf3e624d97497d3740c9d6c199db9878cccadc78e6da35d8a2b43d5d9a1a8e89851f
 DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
 EBUILD ponyprog-3.0.0.ebuild 1068 BLAKE2B 849d35644c72b705444062fec7e30cf4383f7fc230da62261e2358fdf20760fefa6e3250845e2d28c1eee35e036709c82fd55fd81b12124dc59f922f25182cda SHA512 2c671813476d272dd53f44f4bfa62b7c4579925a4ed4725d20f1ccac4667847c326c9ae0265c03fd852b5565f9e31c43c57fc13988e37b2c01b5d5ae39d0eee4
-MISC metadata.xml 607 BLAKE2B 81117395201c00d6de624c70c682a345258849b4b389537855aa762d0f282ab7becf1461a3260fea8e54f96efa5fdc1543e51be860a242bc50915a375c9089a6 SHA512 f48ae88969bcefcb9977f4c58f2cf3367fd8a557df36a0f18fa013b9d41fc3e9880dcb41ae27181015191096e8812b817f6a314c4459605cb56e13b7e0919383
+MISC metadata.xml 637 BLAKE2B 6f0281a42f9cef6c3a48dcc0f6a1308480701a19182dae29f43c851c9c3504a0d47071d9c4d91f47c63b92aa48a941d7407f0b6880c97008ee7de3b94ea7bfdd SHA512 515865be2ebb940357e20ed68ff832963497219d6ef6965c53530b5417f2a9d3b92826207feab5ae394703ca4da4ef641e4a5cb3cac9878b1e9c3bb19ada147d
diff --git a/dev-embedded/ponyprog/metadata.xml b/dev-embedded/ponyprog/metadata.xml
index 5b188e0ba7ad..1c56874aca40 100644
--- a/dev-embedded/ponyprog/metadata.xml
+++ b/dev-embedded/ponyprog/metadata.xml
@@ -5,11 +5,11 @@
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ktrace@yandex.ru</email>
 		<name>Victor Kustov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 89c1d2216a61..920e02770eab 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -2,4 +2,4 @@ AUX init.d_rpi-eeprom-update-1 394 BLAKE2B 4a42ba2bca9f1cc646f2b39f33f1752a34b62
 DIST rpi-eeprom_11.0-1.debian.tar.xz 10248 BLAKE2B a83230dc13ce296963ed206725d465a69536f5cd23f52076fda2601ceea06354f365e1f8b2d9a93a4396826b5e9d9ab5ad40fd6336116e693419fd3b4630b5e1 SHA512 939fa16fbd8c21340ca77cc74f3cee22772d25cd6dcb70c178d70c1762ae9b9acb9e7a070b2c3a7f114841712142284c1f2bdb23fb528a229507d8eae6477c84
 DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb13f88948490e14f1e251f6440f3ef31879ea66c0fe94761e1abf40a23924742e8c2f33c49200e710542131091b223b292 SHA512 0ea2971b752a53a4529b2c3d3b814b9e743440397f8c4d21c9a06493561a37bc8cd8c0adaaab389f41b1697584d12641f49d7a93d6541f9dda3bba5d6dd1371c
 EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
-MISC metadata.xml 565 BLAKE2B b4395ad5647c8b95ede29673c8eebd9f2b05b0512a0a8375c9f05c98b03f97d37330a2f81ceb2e84c5629989d48de4a29613ebfff1a4715efd642c872373f62d SHA512 6769925d46cfea80d661c5b4a10cb8234c37311b3a3ac1b2aa1f63bcf8de23d384f42b2cf8508144ac33e6adfa0603f62434d06564fbb2862ce3db370400d45b
+MISC metadata.xml 595 BLAKE2B 497bb778975ed8fc5025f91053f83cf020427799d260272ba62a307a7750fb0ece92f5cf321c6e836cb1c90e70f528c48ff0c8b703782677837891a9a805abd9 SHA512 7eed8f3099a2ce56f7b7972630876cfd0c9c7fc875d44a91195e243cc11ffbb838f673ac7c7baa60a47597489fcdd6754a1a99e331c9e401b47afd750c99d3e4
diff --git a/dev-embedded/rpi-eeprom/metadata.xml b/dev-embedded/rpi-eeprom/metadata.xml
index 1dc09f3aafd9..981f39939a0d 100644
--- a/dev-embedded/rpi-eeprom/metadata.xml
+++ b/dev-embedded/rpi-eeprom/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>crabbedhaloablution@icloud.com</email>
 		<name>Peter Alfredsen</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index bbbe93576cd4..40d484df336e 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/base64url/Manifest b/dev-erlang/base64url/Manifest
index 26455de8d27e..16ac32d06c79 100644
--- a/dev-erlang/base64url/Manifest
+++ b/dev-erlang/base64url/Manifest
@@ -1,3 +1,3 @@
 DIST base64url-1.0.1.tar.gz 2726 BLAKE2B 38bf2e8d31cbd39a29d444f682692b6128ff41b0bd1496ea2db82f869a4f8f760a8cadaf81facee259bcf06b344cb340def8ed25af25b7b1f8b2e2213f81339b SHA512 7398dc99078053b6e0544eb8ca93e9616549493c02245084c220ec854f429139dcaba38dd522858dd74b95067979a3ec4378eb3abd5f6d1662af27687381c738
 EBUILD base64url-1.0.1.ebuild 440 BLAKE2B fa49439e0f65bd33d348cff1ef0333dbb15ccd5c34ea6d84deb451baf3eefca8b44a4e738e0fc0f1a258096b366f04dfc787dd781c58fcb27c066234eb78867c SHA512 25ac2b7f9d1a69d861df5502e905c0b0bda52490f9958cb24e860f825f82986f42b24ac90e114c7882b15c4adba9ad9eb6349f5511dac3e3e9a256023133407a
-MISC metadata.xml 298 BLAKE2B 274c5ee6808f7a6e27c5f41afaff6f7d8f08a29cd72808ad076449f5e33630fd221c5b359ba02deafe7bb10fec2b12a2a3bd78d16655ec9539d2210b7998f12a SHA512 aa5fceb1fdb2c496c8ba82c197a6b406a1201445121e39ed30d9df710b68b0d60bc495b908f9a764e2b179a79c31afe7d532a4d55dce6daaf8a1857dd1dd6280
+MISC metadata.xml 298 BLAKE2B 03313780db26da10e370a181d832907a03ddd975a4d4611b7d9ddac8a87a977b0a1b690ef1e3a45b004c69790c11337a8de5519c06bc53a18aaee63fbde651ca SHA512 454c7ac8994fff19892e3e5bc00aea1938023933bace275080a8bde6c2a4a758b7ac098ab2dcf029311d263cae4a18732ae2cab33f7fb8365804390930cbc08d
diff --git a/dev-erlang/base64url/metadata.xml b/dev-erlang/base64url/metadata.xml
index 866c3203a324..512572b18fdc 100644
--- a/dev-erlang/base64url/metadata.xml
+++ b/dev-erlang/base64url/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index a13a9b505772..7f3d4c9bc5cf 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -2,4 +2,4 @@ DIST cache_tab-1.0.23.tar.gz 23362 BLAKE2B 6cd92120340600a3bf2444c716162e47c673d
 DIST cache_tab-1.0.25.tar.gz 23433 BLAKE2B dd548283091a16ba6d0f8ab751f76be8f7741abbf3b95051c063dd6fdb1a2bfafe8b7ca02ef0b3d0afe526aaac0cb90da4ab8a25fa5f2083b7743a23189bf28f SHA512 bba8e1e06c889661406a6abb9c1bd808d118e22246db7116363b0cac74cbf3e33483d6997cddba65e5576fe86dfd0226eb4739b9e9ee246c261324ee97fece4e
 EBUILD cache_tab-1.0.23.ebuild 509 BLAKE2B 025549975a67dc3a6e500a3f25a3e566af473324c0f101fb738d87b6fa36282af53f7a913422efc30b362ce725289c9b1c84f24e247038fa912575de07b873cb SHA512 c0b5fd04b5caef89d02f3f9a9c2ccb34b98a4a65b2a4595c6eccd05aa25b53957f838b346ba0ce0fb7f4a187e1c9653eea904cc9282a4906a39a4eebb3f048bf
 EBUILD cache_tab-1.0.25.ebuild 511 BLAKE2B 7e2eeb222988038918ae8c8ae30fe23180213b27fcd9032af5485268f1379726fef89e7d7bd9f932b69016008272a7914ef526353902963b793755c701b87d20 SHA512 792e5cff21887c621d820d302a44a27af710fe02a9ec0d1d810447a1f02e5e79db214bf63115b1b6d7d921e99f1f2c8cafd5eda1811e5a69d287f6bdf8176493
-MISC metadata.xml 765 BLAKE2B 56bf8c63819d57e55ce37087e1556a6c7005ae01c20611800338c51adc6570d5495adc43526e1767a97c8ecae90760b18ab16f9a6d9d62b3ffdcac396795ea90 SHA512 d4ff8add477f79c8aa715932200412de793915060065fa41a5e94c4f7ff2e97a929c094dee5b04ed815874c20bfaaa6b8fe1289469e0566f9b4f8e5f58ad796b
+MISC metadata.xml 765 BLAKE2B d96054fc282a976170ffd5284edf8e594d4c01f0e5e8a551782eb68f2df14c201e9ae661b7896aeaf4df2ed36bcddeac2f43dedd59001062ac71978ac4bf28e1 SHA512 07b090fd5fcd4658243fe7c76e73491bed8eac535456d5bcab5219627062f7d3c0f6c1a7d754dc1f9ac41e0aa1e78a87d157cce85f45b7c4d1022e53d2c65422
diff --git a/dev-erlang/cache_tab/metadata.xml b/dev-erlang/cache_tab/metadata.xml
index 85df7b9cadd3..c0fc17bff7e1 100644
--- a/dev-erlang/cache_tab/metadata.xml
+++ b/dev-erlang/cache_tab/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/eimp/Manifest b/dev-erlang/eimp/Manifest
index 04d74b2b989d..6f4e520b3f5b 100644
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@@ -2,4 +2,4 @@ DIST eimp-1.0.15.tar.gz 3476420 BLAKE2B 09836d8fcb4ff653da37f3be52ae2f2ec930e88d
 DIST eimp-1.0.17.tar.gz 3476648 BLAKE2B 74d1840f72e921b3d31bf2a3ec25ed57472c69123eba92a19a6d1f549878b9ba23b432f56209bbf77716f0a8f591ad1a872e7dda0fa95a061dd0c5e174dc8721 SHA512 2eed6aa8cbdb571a84e5dbfacee2d949cee8c663619dfb83e898a04a9cb7c55d7fa769db7d7699f65e7ddca34bc8ecef96b1326a0618af7f803c5bc38cb3752c
 EBUILD eimp-1.0.15.ebuild 633 BLAKE2B 520e9c4db7e8ad5b8ab1b1e46aee87513ae22f56b64a25e681c6efbb359dd03b4894f7e9c01556061104bfe8ed076c9c4357170a194cceda33522506dbacd33a SHA512 7a6018724c8866a14903063236cdfba5f5666d74adb86636682872aea80a56a91a415e9530ca591fde4559d1c02c22e8c39e388d259d4174e2e48676c8a94b54
 EBUILD eimp-1.0.17.ebuild 635 BLAKE2B fc8d7b65833f699f74a23b2601a43d445ca436045e73217090e34e8b1286671c51d5fd0295406bb78f1c6700fab787adaa898021c3e4a1b2670a4c1574849710 SHA512 0e0291529c0615e2fcfd9ca339bb70118f94410c4c588b78fa4a3df5e7408cf5f106d53bc96a6444c310a6e144fbe5fc6ca3b6e347f199730ae7c56394e98be3
-MISC metadata.xml 300 BLAKE2B 42710a5ed8bf7db4b090862b3a24ca028ebc0dda2f869857b11f7a02be03f2dd7bbd6fb0ede4d81c99fa0821642a092615aaab76dd3494b14a4b867a45e2e848 SHA512 bf280078b8e095533909d040da770268ff65d376e32f01745d1241758bc7bfd2f3d49eead64cffe409367ec852bbc3db5c578a80f52c914bab231fa7f018afa1
+MISC metadata.xml 300 BLAKE2B 977b51a391dc5279dc591bab51bfd4839454d76f6a5470b3a05e3c9d880cc32f0d3dcec73a9c1fb1bca3ace06686ab5c8f9ef1b8555a80b64bdd85d5f5771043 SHA512 564c1c33b9280de4dd549cd441fd64dacbaf9c194e70dbf935763ae9a1386c7bd7511868d16c7373b174d86995bca65b8f8595afe742df5ff8c4fbda7402e8e4
diff --git a/dev-erlang/eimp/metadata.xml b/dev-erlang/eimp/metadata.xml
index 66011c53a5c0..210fdabff040 100644
--- a/dev-erlang/eimp/metadata.xml
+++ b/dev-erlang/eimp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index 5ce46fb44bf5..5bd6a0f50d5e 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -2,4 +2,4 @@ DIST epam-1.0.8.tar.gz 47334 BLAKE2B be914b0a5e4657e3ddb3e9bcb607448b14451e112c0
 DIST epam-1.0.9.tar.gz 47548 BLAKE2B b0a8c6e07d788160e153c75e6d8c6535f68279f1f404b25c0fe5ad1559251059a6efd38a9a30c5b180513f69fb22674ba772c29fa598bed5ddc6dcacd9f0f419 SHA512 f537dbfdba09b3f65775e2235e90e2e91951908d95cd10df05581c740d7254cce53a3a2f4131df75f5c6400b3b2cdf6b37651a554076e9cfa66fb3c627d8562c
 EBUILD epam-1.0.8.ebuild 705 BLAKE2B a9dd2cff66c816688797ef08f23046b6931424eb9579ed485fc818c67517b17aca0cd08fe65db46f3164c700e9ef0c5148c36a57152b513a14fca9358749aaf5 SHA512 33b8728a73cc93b44ee28e96eab02800026187f41d22ba80a3ea71f5760c416fd14ba381ac0ff0b95724a759f2f0e9e39e7886cec445f62f6a45965d4a3f71d2
 EBUILD epam-1.0.9.ebuild 707 BLAKE2B 39cd02393fe143571a69f9f891fd1871d20e2ba1d74fe1ced2926a40e549b894f355332b513ed2759191dff71d3873599c53eccd8312eaef2bd3bf5a6d4e266f SHA512 81c917c08d22c0c71751fe30ec1e13195ba26b20642ebd4d18919f617c9823bc01ab457d3364e51bbb8a0606e1367a678e47d847c2675c36da7c1e5052ff26a4
-MISC metadata.xml 300 BLAKE2B a33450cf19659d35cebd7c2af55112772ab91d24fb791b995bf71a87de6b16b1aed627620640f3abca6d5f6adf672a02ac0352a12fa1542b35168ecf0b99bf47 SHA512 2aae6f30853e3a91c983ea72464c4a09c1d8c8e24080d78f91d1f77c3f62db62621ca7e9bb17d69ae3be9f42acb17dfb77f1448de43be8bf9b8545e601780ef6
+MISC metadata.xml 300 BLAKE2B 70b84ed7cfa390af577d1e4e3e2ba2f759604425bc2c6319f8ccf51f4d250387a5fe7a07345a5de125a4e073d9988f733073db6e984864cd083ef3f4907fad95 SHA512 9e25de9acfc2b83443304362b24954f0f2b9cff338950d82b3a84ff081ed7792bda2ef1840a9111e0fedd3b63aa871a34fa384543e863b550edfea2d3296e483
diff --git a/dev-erlang/epam/metadata.xml b/dev-erlang/epam/metadata.xml
index be9498d2a76a..93636850d9c3 100644
--- a/dev-erlang/epam/metadata.xml
+++ b/dev-erlang/epam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/eredis/Manifest b/dev-erlang/eredis/Manifest
index 72dc487767cb..a7fa9410f60b 100644
--- a/dev-erlang/eredis/Manifest
+++ b/dev-erlang/eredis/Manifest
@@ -2,4 +2,4 @@ DIST eredis-1.0.8.tar.gz 124993 BLAKE2B d668e9e98657a63db18c67e16293622c631520c1
 DIST eredis-1.2.0.tar.gz 28568 BLAKE2B dfd50a2fc6367322677dab02fc1e84dcb1ea1eef622be2c2b3994798a59a0d4c78c58d5852cf9205df9dc5d03d8dac6cab3991f16b601d3227749e1734ac9ffd SHA512 c72ae291389e47d1ac4c1de69dccb6121f4f9195283665d490904226b2ea15cb7671b48bb08db507a5e62c6bced62d890a9ecb9752da6e0aad24a28da137907c
 EBUILD eredis-1.0.8.ebuild 515 BLAKE2B b55820ff6b3f0ce2656b3892eaeb6057387f9ea2ff39cf8f43e0aeaaff830c545e23f6531ec4c7a28b0f7185efe1e442d41630aa9d81dff5679f316e6d4915c5 SHA512 4477350c75f9ccba476d9cdf83d83faad377706516f58aa585dac7cae4ec4abb0e29fe4fbafc84522b9c7008c44bc5cb2f45d1a5e6a268be27ca78c34ee1e890
 EBUILD eredis-1.2.0.ebuild 515 BLAKE2B 3daaf349381ffbe613911670c1a67b2419da851d8b7d553629f1f67306eda8e8fd38efe80b4af3e0159e69564d3f794f858c072a26adb015a3d92a44dffb7c2f SHA512 f5e3dab0419cee8007e70e1aa8238f404fa54ab39f3745fdcaf8f2b0775d6981b9275f28255bb8a0a5a8d8a31f7d99b31b09b31a59661ea5f1040777cdd2eaa3
-MISC metadata.xml 297 BLAKE2B ccf9e8c5418e28e31d232dc7b3395d1f0cc3570aa5e35795227fa1d05570bee3842964f2bd41032c5af682d58578f9db6ad8e910e7eaae28280e7d6953b0ae25 SHA512 f9c13db194c1d460411753b7e4586ac309cc8d3ab63651d9351de27e2b99704416997099fa3b760bd6810eda4fb1bcbeac5f58e1498723e20e56250c921a874d
+MISC metadata.xml 297 BLAKE2B 7b905f70d8f82583938c660da6bd565f9b232cf03e9e514cff6b5a58bf8b15043ca28ac4b339271522e10ad54cd9059c2b173407aabfaa364ad337c21d4d7197 SHA512 7e936d878c4be66e14cd9ef3f51e344d403f9945a2533c8813451868bfab36f9c8eb18704c3d5693f368129d0456a6b8d8e69752213bb2e3e83640225b7b8312
diff --git a/dev-erlang/eredis/metadata.xml b/dev-erlang/eredis/metadata.xml
index 74fd2361a31f..bf3cc8e99e7f 100644
--- a/dev-erlang/eredis/metadata.xml
+++ b/dev-erlang/eredis/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index 4e9068def086..2923db144a3d 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -2,4 +2,4 @@ DIST esip-1.0.34.tar.gz 89545 BLAKE2B 7411bbba155706abd9b5e8ad187d7a04cce0eb6a91
 DIST esip-1.0.37.tar.gz 89632 BLAKE2B 6a733b5b09a50e79f9dfdbcb8fe2678fd7698f78559513052faf67e286da664b6f766d12f6dc6244ed922b5257ab2b2bebb593ff7ecee200e5dd6707a34c122a SHA512 8862154b4b43d177acb522107c193d0b19db28cde686538e565102f4303c16cffd3571d37a31edb00fd8ba436f2a847eeabf575fbb22cb7c1287160e266e207f
 EBUILD esip-1.0.34.ebuild 679 BLAKE2B 794c30fcf407837fe5e5371e96f9109ee5cc330125799779b30fbba70d9a4958756f21c42b6c04d7b5d8220ebe194c72f0bbce55aceafef69e022933bbc40441 SHA512 5e71a5bdc4d5d9eabdf39b629dfd5fb8c40947b302ab978150c17d18ac6ef1722e8683956b151f203df4735b74c2bb61d9e3097f7a66791a2a1ad5feccb8642a
 EBUILD esip-1.0.37.ebuild 681 BLAKE2B fa13ea0e4875094a24f5eed987683ec0333243e8e9f3d63c93b68989ad8a00ac4872cf4018577ca0e60cd2f39820ee94ce556383382e38f49d7bbc5876d4b39f SHA512 ae501ce963b2f05b735853ecbf0d1e26502457041cf516ced2fb928ee9570f111df84e8487b596d5ca47794c44a0b78b2b876582659e6c7db3d61563578fdfdb
-MISC metadata.xml 300 BLAKE2B cb03126697327a4fc61963a6864f41bfcff8b1f61cc22af3ed9ead11e042c977e220f4c31dd9c1fd76af4e7c9114eee6615ad95c0bec8fc347e71b9d5abfb080 SHA512 a9dd8c6bbad69ddbe5ca9a2fc3fd5da67b41c9893414f81e3bc0450f1a313a2dd47fb8b6804936e7469a7f40f685b6462a7dac5c90b8c266632bd8f73ff05f58
+MISC metadata.xml 300 BLAKE2B a9905c2c2a500c049d378c8da2c501750e63ea54df50baad58c08d815c4bf00fd9925674d37ef2e8fb9392fbf46b4c08f00732e3b1cf12a53fd37b0bd2b5de58 SHA512 e4a40c8f954f20be2f60bdf8ae0ffdfe67beaeba5e01ffb258771b2e91a1f9e6c7d759ae865fdfbfe36973eb9981fb8f8b6c84a4c305a2798593a952becdea5c
diff --git a/dev-erlang/esip/metadata.xml b/dev-erlang/esip/metadata.xml
index ff769db22dff..39574409d938 100644
--- a/dev-erlang/esip/metadata.xml
+++ b/dev-erlang/esip/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index bc2c576488e9..a7f5b11164ca 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -2,4 +2,4 @@ DIST ezlib-1.0.7.tar.gz 49143 BLAKE2B 51a1bd0972024dd6dc905266c375d7097fd3f9e45d
 DIST ezlib-1.0.8.tar.gz 49200 BLAKE2B d4147ae45f91619342e82c25efdd29fd25e5528aee52f2a79636c0492cb50a2e49b5c7c6c5737aedba0001df4c0798cf30e8043fa5274b4818c1754f80ae4a20 SHA512 49b2e7d03995d4e43c023b8910e7644f3332e444b194bc7621cc35fd4d41e10692649250875462b1eca9a606312138c6f50812a32c9224f72e70ce4f2a9e6422
 EBUILD ezlib-1.0.7.ebuild 491 BLAKE2B a58cb2ba75d9cfb35290ecf67ab2a063dca9b3d1a2aa668f97e1c8059f3e22192cea6eea44fad4e5d610e1e75e45c7e503777e4e2b4712caa28f7b9e9eaf19e3 SHA512 b5da3d0df825775dfa78d7ef0c8cbdde6307e96c8f0c0b2bd1899a74907b285a41c10e304b71776c63fb69d59de8a1c71aff9d734947fd67a2fa19db78bf3a5e
 EBUILD ezlib-1.0.8.ebuild 493 BLAKE2B 628c41284d31e5476a7437dda28bbc2ff2f033f889f708c3f25dfc4677de74eba0a802b734419ceb2692deac5500ddc9e41eff10937124608d40affea808f810 SHA512 201a5a169a98a5fe8789941774b9c24a18bb57df241186ba7051f4b83d9173b415c2dea28d01bc2740580052be324bd73350cb862bf3ddce4384b2795dfd6d36
-MISC metadata.xml 301 BLAKE2B 4775c3c3f47d311f08cb9acb60efc793519a72cf88df198c2e1b02b1752cd66927468da20d17d87c4361e4eb55d67e1be1232e8d9f3a83b6fbdd6c65a7f538ba SHA512 c666b05945b47891d00cedf53f827ae5e65be2b395146c79f694f2448dab72b8377bcd42d8e2d648c860a5fab2f1f2479bef9cb1cc5a0cb41ab44298ee08ef9a
+MISC metadata.xml 301 BLAKE2B a14c381c96a0bd30eaab665d50ebe8d3e605acb6200f3f1371a460eafa2ac7f5b8549ff60c630c7cadb4daaae1c39169f32b242eed2895603a372bec7f4017f9 SHA512 ee8072659e9ff59b489ec2e860e90a9da0f7a3208374d305e33fe68a9106826287a2177f91b624b37070de56c2f50bafa199a70450de13f2b4b99d37ff2c2b2c
diff --git a/dev-erlang/ezlib/metadata.xml b/dev-erlang/ezlib/metadata.xml
index ebf7f0a0fbd9..7abafadc6593 100644
--- a/dev-erlang/ezlib/metadata.xml
+++ b/dev-erlang/ezlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index a1f616ef846b..83d8d3f226c8 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -2,4 +2,4 @@ DIST fast_tls-1.1.6.tar.gz 80339 BLAKE2B bbd7b327516ca028729387880db32d09bbdbade
 DIST fast_tls-1.1.8.tar.gz 80396 BLAKE2B a75777014a32140fc884b39a1c6b9aa93392e8988cfb18d931caaa07cf6fb7bbf909faea197d865b0074741ca7a2d61f2987558b8db7fa742ffcd76af7d570b7 SHA512 014780a6c12ec20cd49b14e6a9b34a3b17a617ad36b62c65422f4eecb6a60a7c609c77535e126d9c1a9ef0bcc5a836daff9c879dc0a0d92347a3810a81c737a9
 EBUILD fast_tls-1.1.6.ebuild 574 BLAKE2B 878669d3e589105247844c9dffe4b258ccee9fdcc5f894f2639e5efac92b16a483e326ec5aa2afd4531be242ccf938e999fadfb3f67bd03dfbab067b9c43c1be SHA512 dac01871ad094080ef69759c05e4e1be535e18c5dd76ad3235bc34eec196608548137cd4a50d63167669b59f6bebbe9c612b0181bc67d915ad6ce86bc32d8302
 EBUILD fast_tls-1.1.8.ebuild 576 BLAKE2B b7214d44eb5ab551b8e4c4389001d824eb3649b9514c083a469c7ca3177e55ed1a6880ce0189afecc162ede00b8be10959cda381fd3eb65f06c324aa20345399 SHA512 53cac5ea1e321c6f5d6a7133531f7e47e8b4be6dbc30003bff5a1e33c6a55a8bb3a885b9a13f6482a7e5228dc84d1136680dd6ab88ca2cdd28e64887dccb6582
-MISC metadata.xml 304 BLAKE2B 0c88902a0a8e500d8b92101b43b781ebe08b52ece820d04afa22a3c2ecb003bfe9f98ab7c87d01c5ae16204970274a5c54414c55c52852ed82bc71776fc1bd13 SHA512 20cdb30d4aced210a91fbef1420d09340d61743362076f3f636ea95417668495f1c35b60b4d791c827322f96ca76c8e58df2b627dda9c134f05f3b748f5f00cf
+MISC metadata.xml 304 BLAKE2B 2a5efca915900765a5aa11ca74381f896c32d2d045048e0eab33bb7b1b5911a6c42db0cf7d8f414b5ed789655c3a32a6e467d601fcdbd6a6f694081ddcd337fe SHA512 b31d9aeb53ec7c66ea555e3ba4dc01986fac6a9e1134852626a78c3b1e0a1520d7703a16450b13fbd8fdbb0b7bdcd0084649995fa7bcf8060a1c73d5ea6f3179
diff --git a/dev-erlang/fast_tls/metadata.xml b/dev-erlang/fast_tls/metadata.xml
index 82c53241ef6a..7e4105503f77 100644
--- a/dev-erlang/fast_tls/metadata.xml
+++ b/dev-erlang/fast_tls/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index b2a5102a900e..0f79dcf883e8 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -2,4 +2,4 @@ DIST fast_xml-1.1.41.tar.gz 99078 BLAKE2B 82e6aae6bd5a4b4297711d30c6e8416bbf6f42
 DIST fast_xml-1.1.43.tar.gz 99115 BLAKE2B e4c0eb35656481b5334b875f8a30b60f9e25fbec0c37e5dc206bba129a3ca32805075edd72ab23be9f43d294cae625554761ae3e23dab3e56fd3cd1789042c04 SHA512 d3644238f484bdd320e80fa68a86f48b8c7a9428cfb317bdaf1037c98428240120626e867347addfdaae5fe262a17e20f802c6c733c7938beefeda83617da8e8
 EBUILD fast_xml-1.1.41.ebuild 502 BLAKE2B ee63c1e4bc370900424840e216202bc3bd2ba4e7f2082cd2856f382247db50bfb530b42d5b1c81c83a71901c1b57c771876b192074df081a64af302b070d3469 SHA512 55714859609ad88e2bb517012bad0404249ce82030d37e77f594bb346972225d4cb82d11b305d322c85ea2864aa3a441abcdacdd5df86759d33f97dc72ff3f2f
 EBUILD fast_xml-1.1.43.ebuild 504 BLAKE2B c4a224752270664ac8752f7e8425bc6f8a18ec84c619de9b4da2d53097fef77f475c5a1b1ac527e1cd9cdb101c3838fce213175ddfaf2373ef1e94acdcf6e996 SHA512 c814004aaa4ffdabc93af69eb8affde3eb4503da524fa97c3c46e0aac7cd72c6138820a67d153883aa8bdb671c0cf963c28f8f8fe4d9a10076dd96ecaba56ea6
-MISC metadata.xml 304 BLAKE2B 298443efb4d3fe34d9cb5170fec6df94a84ede88c0f7c89da17e2e68a09f5df64c184f509e6df0e56e9d7a3ad215c4546c19d0a98bc93f6df7322fd07de11ee0 SHA512 6f68933291ed9d7fb4a0d18b0b6b476194096c4b2a957c500a37c2999b97855167f0bcd73c5c1711217ed5f9a62043dbf8f2e244be83db4befba2937ab30185b
+MISC metadata.xml 304 BLAKE2B 75975446ff7c6a73a4ecd8b48949312da3731ab17427e4ff250ec9d9a5cd015208bd1b6ff11a252c7826e65b2016a412d601d93824897232c5f8aecac017fbff SHA512 2a3c85a05f1835d74737ded58e9c8b51481a6c7dd7f6d0a1ed61e2d76bb3b4245c7cba56408e32f8dcfd08df0a3bd277811e0752381232534433dffae0032ac1
diff --git a/dev-erlang/fast_xml/metadata.xml b/dev-erlang/fast_xml/metadata.xml
index ca110500a3bd..638b3cddb6fa 100644
--- a/dev-erlang/fast_xml/metadata.xml
+++ b/dev-erlang/fast_xml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index bcb5135bae54..e4688cb9f6b7 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -2,4 +2,4 @@ DIST fast_yaml-1.0.25.tar.gz 59025 BLAKE2B ea5eda560ed2fdc2a0935b481fa5fc9c8c3cf
 DIST fast_yaml-1.0.27.tar.gz 59075 BLAKE2B 0d1c6c33c0a4063651d788f6a006d76094500a928e4cbd6bc4014a4dbc899bde2aa087d9a43053c2401fbf5fc97b4fbf6eb8622eb72811cf49dc5a97ade76290 SHA512 7f57a38bee13275607a97780ee634e2d909e35c2593263d5622595e541102b08006d09f19fd01a958f0119956b650ec253c013782f599b68b391fc2fc5f44512
 EBUILD fast_yaml-1.0.25.ebuild 532 BLAKE2B 99fb2345fbaa76be35d3cea19a87ddecf8e9741439bc5cbc7cc4004bb28d7226539d2ed41a0be72c3b163b320fb3a27f527ba0dc749a844f98197c3761151a3d SHA512 3bdd5f7974d954a0dd2c27a02bbcb6295302a041ccf806b6fc5cca2e27aceff18e3c79ee7b3e8d7c4fd654a8e04553b06512a9767d1c1f75a20fcfb9e2c7f234
 EBUILD fast_yaml-1.0.27.ebuild 510 BLAKE2B 55fc970a3e26d0990473ff49d8bfd8b5b5e83423b3ad4119cd62acfa2126e23548bfd502727bf5f1c3a51e91ed68cefb5cbfe5f0f4a5a204068b1a5d9dc4b95f SHA512 eb38448129e3f5d1a6007ab654ffe17dab4fe008a3363f7a867d7d9ddd370574cb6a158159872118fbb0f86fa8b3ac9f216e6ad28e4a49826533741c1303f5d5
-MISC metadata.xml 305 BLAKE2B caff17a0f8f3e50ac76555104e3416d85fecc1402b452ffd9715c9f935a85dcb6043bdb1a89eb9c3ed892347f204478f55c9bb7695b0ce93dbb2dd4e2c16d576 SHA512 87fff64d249e97c9145e7eb3d665084d7f6aa762911e98a5b03240d904dd482cac822713d4bbc6d42be13ebe6e358bf8919cc4050d1b7996e9cf3a7c39f3062d
+MISC metadata.xml 305 BLAKE2B 72bb59d2ef4ddcf0754fa32f57a73fb5ec3cf8d84bfa65e29e925299e60a39c313521034b7dffcf7cb8a727379ddf2124a6904cb1e0f4319bf768f138074e4b9 SHA512 bfcb5dcab042a06339a2428a0fc0ffadbd1ea4252c9b582122f89e264a9cc365a5aacaa665b2503c3013b7e1780da31c6b0eb1f965f8b9d0a070d302a5b2731b
diff --git a/dev-erlang/fast_yaml/metadata.xml b/dev-erlang/fast_yaml/metadata.xml
index 6e6470bce3f4..dc5b00ed90ce 100644
--- a/dev-erlang/fast_yaml/metadata.xml
+++ b/dev-erlang/fast_yaml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/goldrush/Manifest b/dev-erlang/goldrush/Manifest
index cc0220e815a6..f3b9ad4e4657 100644
--- a/dev-erlang/goldrush/Manifest
+++ b/dev-erlang/goldrush/Manifest
@@ -2,4 +2,4 @@ DIST goldrush-0.1.9.tar.gz 24548 BLAKE2B db1599ac8009a76558fbb451790f7d8d2fa0ab5
 DIST goldrush-0.2.0.tar.gz 25887 BLAKE2B 35a8202db212dabda1966d33d1972ed869ee44c5caac9720af6b05eb6fa71794b3c85d7341edcaa920b516c1cd22678aee9f815cb307c96b2d4d86cec07d2cde SHA512 1a74f02c75e72f8a60366b9ba74b763eb98621da2ce6044ed97e836566caf8ce85fadeee62b3d24303df319e2c1333d1c544cd267a041b718b0ab36de53e7b1a
 EBUILD goldrush-0.1.9.ebuild 612 BLAKE2B bfdabb06007c7c49fe033210021413fc136d5757d2ce055c606e3026529f69a8f3b956e441f9b238c0212ab08bc0de187121f07a3e7748ce0edc9d4d0e0b56a0 SHA512 ad4d74286946b06a7514ee5b1cc62e818eb7528d5433b536ff872a9c8bc928003a0c311d82a78ebc2f5d1b2fba47515ec414f08a3d0c5fcb23386113aca74a73
 EBUILD goldrush-0.2.0.ebuild 612 BLAKE2B 54e865e5c51852b0416667d70b32ac0e7a0b116eecab2e7c9aa9969747e6ecf446212dfa9e2eebd27104cf431fc12181bae8521f812e6329cee73c5367dcef1b SHA512 de3a760fc44c7a4714ed3adf4aa76a57e8673bd90414d8b1c6fea6b864f4291e98d03d7307a464dbb97e5f81cfe08a746c460a499a59c4efff678fa3074d047f
-MISC metadata.xml 301 BLAKE2B 9684867b946b97fa190e3d44ccadfef90be87d342e3ff13406a71b705e0a7a0d087ab3a960287ee6585076b8810afee8cb2f6d9a60a665a051d12c5c173ce06c SHA512 ec74282acb01b2cb514a3cae31bbb9d968115896eb50bd8ec86343c7ed38300ef9047cc031f659db7a43c1f3d0b7453a4259b33cd4db3c7928015e7870c8cab2
+MISC metadata.xml 301 BLAKE2B 1f9b880307e85d3a65c06a3aefeba9f5b128cd1766d5096817c82cc58015ac449242914bbfb395914da7e1bf4a72eeffa4861482fa9c00dacd557156c69efae3 SHA512 7ba58cb283b41c35a4defe68b173f9b276315b2c7934e7e1f2c4cd94e98a12f1dda7259a9b408cd8788baca6001c04cde359387b69f53ecf3ca6d41d8b0a9d77
diff --git a/dev-erlang/goldrush/metadata.xml b/dev-erlang/goldrush/metadata.xml
index c0eed44ec262..d7d776f49a21 100644
--- a/dev-erlang/goldrush/metadata.xml
+++ b/dev-erlang/goldrush/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/hamcrest/Manifest b/dev-erlang/hamcrest/Manifest
index f375e4d21928..241db29bb8ae 100644
--- a/dev-erlang/hamcrest/Manifest
+++ b/dev-erlang/hamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST hamcrest-0.1.0_p20160709.tar.gz 160574 BLAKE2B e7fd8db2ea69e89ff4adb89d4c9cd87ce1557019f18200201bffb0e9f867d03ccaaa2f957f38057ed1d0b01372f1646e7233f013e08cd4fdcdd56ac631af4230 SHA512 a1d162e72019bcd56c3f1c486e65b7f788e69a1a2985e5500920565bf6c40b6dd7b920e720ffc8da81cac3b1919124b8defadec2fcef5b27585e63da3abd852e
 EBUILD hamcrest-0.1.0_p20160709.ebuild 747 BLAKE2B 7133e9b7d509fb2a1872cc2e1341598e3e4d561fbd2ca8e9e3485c704b523435db329db395fad400c17feb377c6a5ba9c46e55a6a3f7139e848c3efde47e9a4b SHA512 9e71e01672675b66f3ee28236c7cc3bd7396d8e9bc432808e4843f20a39a38a64a2d34f69972bdc6a0e4a3abdaf1acf9a6fee2a320c0b25428d014585562d9ea
-MISC metadata.xml 258 BLAKE2B a542a62493285a76e8ca1b8eba8f463013a782dff3d264cbce165db42e4e7c97b5c8f0c76c0bce70bab6a72eb235aa171fc2fa6954fdac95b0e08ba2c5112110 SHA512 7cae790af4e177e5532b932679d95e993b419a86a03eaff8574bcb23d9f467c9966d9315e817175d4305e0aed1015ffc97c71e735ab20bf54341d072129f7193
+MISC metadata.xml 258 BLAKE2B f66c697accd93382de336827c4b6bcbe0327f5026f6b1117d15adff6fc4cd86c26404297f3ee4d72f4be102367222164a15b4a7dbc9b80cd852f7da91db9c7a6 SHA512 cd6c7d3c0fd8f6a16f280990b0516e3cfabd42ef85d2aff0f365095048a643e88abf368638f03f53bf837d60a44225f000b74112a8a3232ff9458bd4e26e1c28
diff --git a/dev-erlang/hamcrest/metadata.xml b/dev-erlang/hamcrest/metadata.xml
index d2ab254ebfb1..e638d84afdf2 100644
--- a/dev-erlang/hamcrest/metadata.xml
+++ b/dev-erlang/hamcrest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index a0aa0decd9f2..260b95d9bc77 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -1,3 +1,3 @@
 DIST iconv-1.0.10.tar.gz 121594 BLAKE2B 407a6cbe51aa50c561c577bf447dbc781c22bdc4ea20cacdcd2772e3cd7d262a1577381985ddafeb6fb48be94b35070de025b5d2301dbb4a3b9b9c0defd6a4be SHA512 c0537db617b83184111ce6f3be2e381c4a9f6a96d4887a2cf5bde3b275974411fb997f4a2f6a9c2b25c8e783e26af92b531788e9354be413d1837dd0482d41ef
 EBUILD iconv-1.0.10.ebuild 523 BLAKE2B 0f9d11b413dce9a2eab4654a7b521bbb4584894d985fb74fe5afb53c380600d4065fcbbe96ca0986782868e2a77e7c1842c79d31423226b70d580617e257fce0 SHA512 90b063a9bade87e2dc23312eca10811cbfad0e2f7b0df0660621e4af09be824fc717c12e208edfc5ebc7d7236fedd37f0d9582e79c138170d1d34ee00061c970
-MISC metadata.xml 248 BLAKE2B 4304134df15df3127bf83b694b8056258d906a9ae6655f35277a78e527121ccae0545557c96c9b0df7093308f4874a4b70126b4a6b786c51338f22dd97ddd09a SHA512 a412162dc6bf45e973e2511d463f412b6fba8c3162b0577aaadff52b2e15e39a78eec278e93be22cec103b13866aeeda3fe21fc2b580a99cdaef0cbccca1c6d2
+MISC metadata.xml 248 BLAKE2B b0d25734521adc0e33ea48abb1ab98465ec0ada2e56e455c5299e36c366bb29ca365eafa4ff6bb4431c310613434d9a5931ad89b8ca3cc0df9b5fffd6f3d65ab SHA512 713851be23ac44a9de181ab9e68c661279fc55a6d0908c5b163db10d1dfed2be17aae3890a536ed07c6d8c58fa53dd6fa6dc8043469fc9daa1275edcfb37b988
diff --git a/dev-erlang/iconv/metadata.xml b/dev-erlang/iconv/metadata.xml
index a45e5cdd08a1..4eb7953ac706 100644
--- a/dev-erlang/iconv/metadata.xml
+++ b/dev-erlang/iconv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/idna/Manifest b/dev-erlang/idna/Manifest
index 071bdd960926..a13597edbe1f 100644
--- a/dev-erlang/idna/Manifest
+++ b/dev-erlang/idna/Manifest
@@ -1,4 +1,4 @@
 AUX idna-remove-unicode_util_compat.diff 3444 BLAKE2B 7b45729159ff91beb386208c02eb726d32f760cd63537cd80521be56803c5bfcc12299093ff4c8a3fea27b46b016063a73b050c0ece6617ae3709101dc5ad9bb SHA512 25a2f9333711184ddf192fb0d7ca98d50bbb74628572c0e7a144078489561fcc2d2a3a9a7424d84cac74f87a7b370f0fc4947ab1ff01fc079577be272d94631e
 DIST idna-6.0.0.tar.gz 740802 BLAKE2B 91bc6ee4031450b00659415125e8cec3f034f988bb7d307d323b0a7ca53450d42f0e84a044ccb6c198107c253b70e54466e77b2b0b4e9dd7f7051da49872be33 SHA512 59f8996199f7e3391b1da1b8fb1ebb70e442838eab1f26af9a8a8545f3e1b9f72f0afd65108272a51d846b34e0e8abe9623f10c89156ebca3d87b6b3eb63a066
 EBUILD idna-6.0.0.ebuild 656 BLAKE2B 5bf53827ccefd89f1df77a1ee174ebcccedff78fba74caf9496ab0651c15509652348e2c1f391985f71e2fc831f888d224ba3665b6c7278fbae376141d6356f7 SHA512 2937093a77e55cd05abd39df7cda279ad6519397fdd2498f460a8b8ae9713fbe0ffe7d5c4f2a64fd3a73e84ea5fc4866fce425a7e6b66a9942524458a39defe8
-MISC metadata.xml 304 BLAKE2B d663ffcaa3b4c411f78c6d9020593800e3f7ec04ae77a6a38b80254cf11a0cf6c016dcbf7b25266b6784160408c2c8389bbacf5d54722603eb96094bbb09d8fe SHA512 3e3ee0f02f9c45ce9339720f95586800c92ef28f2f15e843e40655473d2437eb222de20dd3b86f9b7da535d6b5b862393bc62415a75cd5e21a669a3a00ed1f7f
+MISC metadata.xml 304 BLAKE2B 2b2842ba00aebaf921f5681602aecd852190006dc8ae7e6fec8b947b70f201bc4a0828940e2ee7608ba92489b73331092dfed1b5349f89acef84c7980fb3127c SHA512 bd74f4f66daaf228c6e94fedeaf31151c2fc1c28d003b62e54dae6aa5ab8949512585ef5cd90f9a42e0023d50073b80edd4dcfdec46442bc37353c2b8e6b2532
diff --git a/dev-erlang/idna/metadata.xml b/dev-erlang/idna/metadata.xml
index 4943424ae150..bcd82de24387 100644
--- a/dev-erlang/idna/metadata.xml
+++ b/dev-erlang/idna/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 295de140cbc7..210459b58e1c 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -8,4 +8,4 @@ EBUILD jiffy-0.14.9.ebuild 430 BLAKE2B 41a3f6bb8251fa5171cff411f410384347f296971
 EBUILD jiffy-1.0.1.ebuild 432 BLAKE2B 38815c4aa9662e331c6ef3452f8a9c9f2780793df9a353dc19236f10924fc58ade4249d2d14ca3da2a0f943a4ebb22600f8f1d279e1408b7ea769b0da8b69a69 SHA512 1722c94fef3dbf4fe76a69b8898a299a60613d786b48b9ac731d53d73315373f7b0f5a8756dd3ddda2369dcddc4db294e0540c3b3ccc6a0877f522ca2860053d
 EBUILD jiffy-1.0.4.ebuild 432 BLAKE2B be5da8e042e2a99a83c485d5be75504196e39bf2175e764bd064fb7e97d50795732af3a3d34837e113688d4d5f20e650f7fd8679f61eca3cf0166163129defae SHA512 27c5a61b69d156ea0dd0a586da3d0e6327a1e60f3efa2ee321ee98138c23b6af9ba3765417625f23686310b247ab8c1712babadf796d9981f4f78fb1d8231d26
 EBUILD jiffy-1.0.5.ebuild 430 BLAKE2B 199a21bf11b5dfbd02c515d857fb1fa5cafbf8db8e84cfea94f050f7eeb23c45f745912d0a4325d3a381ec9c9276f5352757486570c5c649d0d34456b7ed3764 SHA512 78c413598da81ae0cd4b035885d8e296fd88a9d4547425d8b91fc074412d2f767d7461158ac0d952fe86849cd35c1f5a7017f9a12c36d95fa7ffd4eac28f7b98
-MISC metadata.xml 297 BLAKE2B e2c4eed3c56ce68b2c20e85ebab3d7c726f5cb8dd64d367137dd91298c372edad335d0a88b90da55092c0af8470c760d166f2f2611ef00cabc7fc75fdae1ae5f SHA512 0d276618e7023cefc54f3f0d87542a99dd65892b1d021c12719496245ec56a5aacd76fee2a92e35f19c3c5c36c15651605fb62f1ad78c0cf40e8149f013c4f6e
+MISC metadata.xml 297 BLAKE2B 9ab7e428404f34387dc6b836c8767532dae2460b9c9eedb4c10001ad0bdc1e6a2213d5a3e033eed5b7b6efc6dc90077ab7c3223a7fe2e8c7ab7e7939fbee10aa SHA512 8dda9336638859651e74f99356025123068a0892d007cdfbc5e7cac2e792085d2e6b01d338b40c75ede7d8454d97712fc46571bf09ec2be735651a7c24a97367
diff --git a/dev-erlang/jiffy/metadata.xml b/dev-erlang/jiffy/metadata.xml
index 075bdfe392f7..982e4135e7dd 100644
--- a/dev-erlang/jiffy/metadata.xml
+++ b/dev-erlang/jiffy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/jose/Manifest b/dev-erlang/jose/Manifest
index 7218ecde0ecb..df77ff56d7cb 100644
--- a/dev-erlang/jose/Manifest
+++ b/dev-erlang/jose/Manifest
@@ -2,4 +2,4 @@ DIST erlang-jose-1.10.1.tar.gz 279187 BLAKE2B 18b606e5a2fd93b96a26b989a52235af08
 DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68
 EBUILD jose-1.10.1.ebuild 989 BLAKE2B b3f99358441c610a7b247adae8c863ae39d93adb6ffd8e061a663db23acff60006ea7a6165fae79a559ca51edf744eeb31e8291a81b3f5f3fffc82cbd9546659 SHA512 f8cf3326d74c9977efa19341b7dbebf6c86c9e69db0528f79878527a3e34e8a0f7ef8046c7b285fc753f26de7c0261cd0146f992872ca9229e030fd9ab329485
 EBUILD jose-1.9.0.ebuild 758 BLAKE2B e48f6253daca6746cc534cea3a66ebf5d477763d2bcf1fe955ba83613c5dbf7f58a691b91d1d2a776c4f7424dfaa4bdc87c66029ebe999ce52519def93b78089 SHA512 2c811754d4d59acf2fd9e369b41fd19a7ea45a75f8f49115fcfce611c1157ffaa8361e229ccd75dc1f2d427bbee01e1e036e1202bc74ab791c3c3bb1aba28a1e
-MISC metadata.xml 308 BLAKE2B 7206d5d69299b11b8f0e595423649507bd340034f021e7dad826f984f42ddac0b09ba0ad9c5a537a7b15773c5196f7c48f5fc36157a6abd141096f813cff500a SHA512 f64bf6d1f188bc6c61ca8390db4619a7a06d94be956cc0736943b9287a379e8f5372fed00a4ad123068a2829432ef289fd697d0f74d86c46fafe1255e109a519
+MISC metadata.xml 308 BLAKE2B 6966524d0b86c159fde4844facc1bbbc3a3a8bbb05a06e387f5662d3870cde26ef3eda3d2c33cbe41d2020e418528e05382d39a623a2d8984721b0c806315cdc SHA512 870075cbd505af1bfdc8f5a3a94fa1f653071fb6545d6d7179cf023089463fe6406de6be562ea9a269560c097ee10109a7dfb4eee6487e3d6accf1ad18f8de88
diff --git a/dev-erlang/jose/metadata.xml b/dev-erlang/jose/metadata.xml
index 35919dc10c53..a1843b6aaa3c 100644
--- a/dev-erlang/jose/metadata.xml
+++ b/dev-erlang/jose/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index e293b25033e6..74f176a27397 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -4,4 +4,4 @@ DIST lager-3.8.1.tar.gz 273594 BLAKE2B 527b04429fabbd0b093bb22a39cd6d7659d77860d
 EBUILD lager-3.2.4.ebuild 618 BLAKE2B ad181070cb95bd8b35c32d210fac2f2e3866dc7a64bb00f0680f00369d631f2af43079ee0c7ef9e0f5761062a5a6eda1b98039afebba79fc2fd000d49a04e786 SHA512 85f892ac58880fccc60f7ffd7ab96c125b16c418340041aad306bf6a64b54cdedd2e307c80ac0cd4f50f22f92e4bacfaca569376aa40eefc632f11f5b4cb0054
 EBUILD lager-3.8.0.ebuild 732 BLAKE2B 1c77a9320bbb9508b8a4c77877a599e750100b3128f26c1df1114390b0089d7798afeb4713a93483525eda38b26eb84759de02d7d6e089bd7a7d048ec841358a SHA512 358ded5ba26ac49b4b8c9150348b126ca34c1b2da6434e7815a4087624db2a4f94388e07e06d4de874796c95f7f64ca105cada2328b5964c183d3afd171964d3
 EBUILD lager-3.8.1.ebuild 710 BLAKE2B 62ece407f2fc6525afffa540a571e80a5f14848d9a6054ab601ca3c08c9fd5860a01a4da40c097207f8be6e77f6ea70d8cd7a787feeaa381b3be6db6d869e09e SHA512 921df9365c9b4f21cdcaf162b9a05a99e573bcb5b5e455dc990b79f94913a37436cf4bd02495ea6933574f58e1a050fad45781f2610b01bb9aa8677aeb00a662
-MISC metadata.xml 643 BLAKE2B effda1c4112990b35bf6edde305448ca9426182d15e85442b049df4584eeb5c41c0d163a19996968335470bc10bc32c4143a034f92900c698dc04a7d8d7883bb SHA512 7d1ff8003cb6b55fff3df2f79441da072691c10cc810df247b03b82e995e4f7da5cea6a2cd6626ad84a133bd39f66d400fbfd22a86e3e322ef5546f769d9a3b6
+MISC metadata.xml 643 BLAKE2B 0bc4378a73f981d33550c66e89c5d3a13ffd55c39da80c7671a480f2b577f64a9b1659b8b433333076e4abe98f684b2f931092ee3db422ed8c3b398294321cbd SHA512 f22e5144c0c2f485213a7b1ad19dfe4ffce8386f410f13bca8cdd58943f7ff36641b86187e4eb026a12ac50d14d47c15164895f11f7bfbbd87285acf2ab7bfb3
diff --git a/dev-erlang/lager/metadata.xml b/dev-erlang/lager/metadata.xml
index bc8b377b4fc5..b5f6be3565bb 100644
--- a/dev-erlang/lager/metadata.xml
+++ b/dev-erlang/lager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/luerl/Manifest b/dev-erlang/luerl/Manifest
index bd36a0ec16d8..81f51cec4d89 100644
--- a/dev-erlang/luerl/Manifest
+++ b/dev-erlang/luerl/Manifest
@@ -2,4 +2,4 @@ DIST luerl-0.2.tar.gz 94603 BLAKE2B 47e04b93791c6e9342878a1d3da8f1b757822e5fcf72
 DIST luerl-0.3.tar.gz 95182 BLAKE2B eca0317c823fb3649f87e6e872780e06aa6288f7e7fb10dcdff345680f0112e2928a54bd061bc258e95da160ddd335500c6ed123e1e8cf77d37822634c42da05 SHA512 490e4cd5d26b18d4102e83b6a8440fd31588f3888ac1942c44ac0985f68250b440eabeecdae648f076a6b8290a5ae838a59e0a517d745c5febfbc00b6d5dba44
 EBUILD luerl-0.2.ebuild 433 BLAKE2B 2c7f1bb5b041b9145f08b80f733cf6591b42a0da5a4042d3361f436b2c39d461b4f46817918de188fea9b1ae50fba8663aa8b36fc02c8f946eae3be9ecaa98eb SHA512 22dd3f993d57404d9085be3ce11a811a03ad642447ca979ac19ea78be3936794e3ee2399dffef5be2b0b1bbb47f65cf857ad8d0944cc8ded8b2ef4c5e50dbbc2
 EBUILD luerl-0.3.ebuild 430 BLAKE2B 815170173d2f5710980822d12ed5a1ccfa3e758c943f08e86a08a032eba86e4cbe114e9d8f51589d45f1db069594685798f7881e77f244ab27b07f9957b0b80f SHA512 d527ad1eec687295d5e3d96811fcf17a7b9de43ce02ffbbb5362ffee55729390a9986c166916e7fb8152cb68848c8b224933c4f110dc3fd989ddca84bb1958d1
-MISC metadata.xml 299 BLAKE2B 75dcc99eb76d4315b8e69a24185a6b31854f865cc8882f613cf92eea6d471af5e9ef077c4bb435fd9d2732951a4ec6ed786bbd13dabe892e433c28e51631cada SHA512 f2b17214e75a5a3b5e4e6d403b6006af19cd45038f4d9b32a4968250a17fd6defe3fb690a5b29dee18e1a0d3a651ceb185801dd54212bd551dc3afeee0314e87
+MISC metadata.xml 299 BLAKE2B 1851ebc8a0454934d6aa65c24050e72b9d910bf66ed395af02a4816515c4e4263de1c3e9bfc301f7627a2b12b7fa0382cab741ec5a9e7ae981dfa49a47b1434a SHA512 5eed2607bc53f51b74c40767fe9eb3817b74f249e6595fb6f7eb0f3b4a32ca2978883526e86f3fe9ed9aad8b44b04fdea8e345ae4e822733c8db74981f64df88
diff --git a/dev-erlang/luerl/metadata.xml b/dev-erlang/luerl/metadata.xml
index f91f6e18cf3c..c9c2c9a33a23 100644
--- a/dev-erlang/luerl/metadata.xml
+++ b/dev-erlang/luerl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/meck/Manifest b/dev-erlang/meck/Manifest
index 912fb48fba1b..a8799c4d31aa 100644
--- a/dev-erlang/meck/Manifest
+++ b/dev-erlang/meck/Manifest
@@ -4,4 +4,4 @@ DIST meck-0.8.4.tar.gz 234157 BLAKE2B 0f8abb2bda2afa3c41e18d51ec8ba6add17e69343f
 EBUILD meck-0.8.12.ebuild 617 BLAKE2B 4f3c446a686e24a9d49a22f37df502ea7439ce2d17041e37de72094005341df6e5ce134c475ee4ce878e937a90985f5e3146f76e6be44c55203906cc08147c2f SHA512 8c50d285258d4d077adb4e6f63275c0ac781cb05ddad54f531b5c6ae09ded90c60fc4285312218733803b14bcae3ccbca925673989179fb150194fb2a0a2b0ee
 EBUILD meck-0.8.13.ebuild 537 BLAKE2B 3ad8780cdb5c14bd8352049b08259b93c4817af57da52f136ef0127111436e60ddcab75b3011a272ccf945726a723d913e71e26a4352a2f30e6fe88c6c3b0af9 SHA512 24f4107d4d3ef294e2a61a778ee290874fd5427fbf88806b3259d878d0b26ba3a503d05b97caf00531ee56d88c620a6e283ef33c19cb0f02e3d7b5e93dd87601
 EBUILD meck-0.8.4.ebuild 687 BLAKE2B d49f6ab0471db97f3dc8d86cf59bc2a1bc993c4874df3000af7d4a9441bfb2e6a750fc6d5a343b61ba08dce2b07f4b6e83c5b57d5014cd8ed45d5f3e74044c35 SHA512 638dda66978d668a9902ec9660bcc34c6d90acd311d3eb039b9f71733725c94ab1aae4259e0284839e1ca37af33d4ebce6a81933412bc22f96f6fb62b4cda485
-MISC metadata.xml 297 BLAKE2B 2c7c3e2ec2b202a9d915da5821de37db67e7d4b6d7e1d86c7a6ae44d7a98d9e74fbf1d818e52e012517e4a16ae8c1cbefa730f49b16b5f3ba51d97205b91f490 SHA512 47872387b9802db8dce659f68a5f03809b5e0afff93c7209d17273e008b0bd6b9ae2f9c4b35c8400222a66833467ef5d54de37467ceaed111f3716e54176c9c3
+MISC metadata.xml 297 BLAKE2B 8fb3aeb3c9ecb2092840d1b55fcd97d1985224c564e79f26d3bebd29e7f236c4f4438677b5ed8a559157bd3f06dba6ef8f760ef0522ef725fae8774f966694bd SHA512 6795cfa0e53f897301302600fc118ff678e4d0bd12f4a9b8c8d4ba2c792ab0e736f9b3bd6dc909666fae187ed42f2293c9098d570e90435c1d64ea372550d7af
diff --git a/dev-erlang/meck/metadata.xml b/dev-erlang/meck/metadata.xml
index acaca2d2fef4..18bc9c151544 100644
--- a/dev-erlang/meck/metadata.xml
+++ b/dev-erlang/meck/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/metadata.xml b/dev-erlang/metadata.xml
index 04742f279077..0b128d083cad 100644
--- a/dev-erlang/metadata.xml
+++ b/dev-erlang/metadata.xml
@@ -15,7 +15,7 @@
 	</longdescription>
 	<longdescription lang="ja">
 		dev-erlangカテゴリーにはErlangプログラミング言語で記述された/のために
-		記述されたライブラリーと>ユーティリティとバインディングが含まれます。
+		記述されたライブラリーと&gt;ユーティリティとバインディングが含まれます。
 	</longdescription>
 	<longdescription lang="nl">
 		De dev-erlang categorie bevat bibliotheken en hulpmiddelen voor het
@@ -39,4 +39,3 @@
 		Erlang.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index a0da2fbeea90..8eaa83a9843a 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -2,4 +2,4 @@ DIST mqtree-1.0.10.tar.gz 228863 BLAKE2B c8a0a611ec125c5e1dbe56677975cdae4da14e2
 DIST mqtree-1.0.7.tar.gz 227967 BLAKE2B 72cad70ab53038eed09ba4444f0c21c9767405aac4b573c60a6ae0ef84737c1da248189e4dc5b08f0f197ca0f6cfd66a51bed1867d6cba591a9aec8ce8298501 SHA512 efca5119bfbdaab5637855ff20016061fadeed6b9ebc6b3db03686b37daba1b36b1ddafe805c953eadc77f8cbde3c6c4943d1aa39ae4c9a96eed3f97f64ca37f
 EBUILD mqtree-1.0.10.ebuild 487 BLAKE2B bfea4f9dcb7d2f23f305141e92ae79bf0dbef4e5d1230f4f7855b8c648d8893c43679053109dea3c9ca7faf97389ae2389d2625bf04cce345d9f8b4091ce1201 SHA512 32c938ddbc8cfeeb97ed66e8e2f4d0f789d8648bd0a5ab9207df75a3705cde048c091c28b3f1cd0fd589f9ccdc251729bea68c7ec4d4b53779dff315ce7c1dd9
 EBUILD mqtree-1.0.7.ebuild 485 BLAKE2B e30b4ed01cc75002ba3ace737e11c27c00e5a1ca971fec6ac850585ee34dd5a2d27d6a7bde1c4c3f80ce1bd705c1bb30d384f2c7203d7c71f88142e23eb5c653 SHA512 15b9525bdda055b181ca90931cc253ad4ca125ef16400236b8370fa4cb6e4b96761a39dbd24a433e56ced44cfd6bbc2e932639e5ceb03758d0dc7576378dbd4b
-MISC metadata.xml 302 BLAKE2B f1e14f60c14e6ca60f01611695e2780a2322a84ca4eb765def4c9e820fa895db70586fe9b402eb3caeb17b53ca6a7cf509c6862ca23c28a6d03b8493a6da5ae5 SHA512 d08d18264a4294d72bc4a628b255cf8e00108e2d8fd452376a3fe76c80d6e0ecded13f1192b2b77ba3f91ec0922d0c7d5adddc3024f915237aa4ff148b03127e
+MISC metadata.xml 302 BLAKE2B 9e6dd1dfc83107addfc14907ab01a66bea8d8fc32128a2b81c3c70c23afd3dc2dbfc18e8c32f4f9689099ec2c46fbf7baac0758947333e1901305322f0fe00c9 SHA512 eaf90fd7aca6412ec607cc855ed02f63d09ae917d115a161ef691fb674550ba2a048f2dbde318435df88775d0dfc11c461365e14e7399e90c01cff40b429d9d7
diff --git a/dev-erlang/mqtree/metadata.xml b/dev-erlang/mqtree/metadata.xml
index 7ecfb120dd7f..9c9e23998e07 100644
--- a/dev-erlang/mqtree/metadata.xml
+++ b/dev-erlang/mqtree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 7e1735abc88e..cd8203015343 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -2,4 +2,4 @@ DIST p1_acme-1.0.5.tar.gz 220724 BLAKE2B 7f236f9e66dc982342c15c46ebe2a391f723847
 DIST p1_acme-1.0.8.tar.gz 221082 BLAKE2B 1e4b23f638b4f7bb877edf290aa54cdf45733816488ab518acc83bd268c240aa564ba1299674f8f938c059b4f2c0072f95d05b017d79419f3ac55d709eb812fe SHA512 8b2b4c594dc1dcbfcf9bb7a6b98096128791d416092a73109fd74ef7ab715d469c87ac6d66056cc5dcd5692c6e71936dc25afa86445a6ffc8164c5bc4f2b1869
 EBUILD p1_acme-1.0.5.ebuild 740 BLAKE2B d18d4dcea55ebbe1053de7987ae2c2520b3a00cab9a47cb964338bf677f374e231dde6508dad0f06cf01114c420193cc53c3910d1409ecafbd01779abe0a7f2a SHA512 7dd40867ded34f20dafe554c2c906c08b62740bcf2ac329dff727a74da8ae2ffcdfd81384a2ff5ef8895831e535307ddf48b62cb17a93f47e0844d6b0186fcf2
 EBUILD p1_acme-1.0.8.ebuild 742 BLAKE2B 83d9f44af26a747d19e7bb87bbd8e99dd6832f78615575968075aaa54fc6f5f1e62bdd69b1d795b7e2def154176ac37bf8dccea098e047c40a3b00de98b46b0b SHA512 1805d90029f6955bc856ff51d5087701d8213e13897f974b50848f66a056a7761c7ebb6c1b8074a0eb7da0573dd60a57aa555058b12fb3d7d8137e6b1fc03603
-MISC metadata.xml 303 BLAKE2B 55f783852d04cc1214a55a4d8922ca45dc57b05114cb8a006b8d9a8393f162437b94426d8c79b144c7fd9b3c965eab914419bcdefbc10645214b2f72918eafa5 SHA512 60484f81b126b6b0f01615bac8c83be479c352e9c7a7a511d8de04c4a9dc3eaa50c9dcbb242b8cba8e4d498f429116127e66259a2e16f503b9f97e859a64bec6
+MISC metadata.xml 303 BLAKE2B 28eddfd259aaaeffa776908a889a017249d23a5d5ba3c15d39bafa66488f40768cd061ff832512a73e21757bf1717042394efa2d4ac88aea51688a92bf3e1b3b SHA512 3d9e1ea04302c9d5c4b9d447910de6937619e4cc26b4c5cd625f145d48e31d7c51c9154e5da8361edfc5c11f8f839285ac43b6e6ad4474dd0110a8e10c26edc8
diff --git a/dev-erlang/p1_acme/metadata.xml b/dev-erlang/p1_acme/metadata.xml
index f6d22fa78e8e..be20efc21024 100644
--- a/dev-erlang/p1_acme/metadata.xml
+++ b/dev-erlang/p1_acme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 9123683b90b8..00211fe59d08 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -2,4 +2,4 @@ DIST p1_mysql-1.0.15.tar.gz 26943 BLAKE2B 191a7dcfae3b5f9e3f7c317aa10ad818147f0f
 DIST p1_mysql-1.0.16.tar.gz 26959 BLAKE2B 6c61a7127e35af39106559b9cc31c4774cda3ef66d630173865d52afccf9822db67a3b4753674df3a00644deafa87d1b82525f0ca6377009a22a1cbaced03a69 SHA512 f2b2ad57ce5918df231af2462a83c11babdb9d4b787e59ffee7c9dd48a38439a121ee2631927934bd12a9d98932c4d7a03a9313a58b1715102dc932d26eddb56
 EBUILD p1_mysql-1.0.15.ebuild 454 BLAKE2B f9f2fa8b79fd41d06f199cc43d3a0a965d68e69d910031ea649f3d10c71cc1e970645c01fd84eebaedf63ab02278dabde092e35e8a695c082cf23cdb54874063 SHA512 bfedfb3f8df54ff8b9d425c90d9d68c54b7652b28478b10dcb60fa95e00e302eba168b82ff6702fdff2b0b7670fa269b437cbc5d6a023ca428cc7adebfc38b2c
 EBUILD p1_mysql-1.0.16.ebuild 456 BLAKE2B c5ef56f86d7324d081781b70d2e4521a1a3ec4dc117b6214276ead092ef1b853f2c98e9543bf38d7b2162e421d9e4ca0c221c825a16d46e2f65f2bed8a5773eb SHA512 64d002bc9fe5f05642de44e020eaf2db3f2c586725aa88ccdb64512a989c8ee4d70246045baed5ce2116c8fbfc80369323d7badfc4818acf0a0575e0dbf4b1ea
-MISC metadata.xml 304 BLAKE2B 3d45b5c4b62a376ad320bba3d9469f35f5636233802428dea8bf5ac8b6134b8d06ef5de1ab9d977bd2089f6e9174a71d41dbaca71c54cb5990cda65dcc31a61a SHA512 0c3bad8ec7a25a29a6539774a18a8d8c57394cbe50bc9d4ac24f88897ee8a98717ae82d84245d5b593895645c9e543301573e321f47995310517aa764f95dfff
+MISC metadata.xml 304 BLAKE2B fc6a08d183c510cd35ecacd154c2978ee58f192bda891788d34be28e360dcc2081d050caffcd5d697dd6f7becc7c839d75f8f4086277533c16abf418452b8012 SHA512 ece8617f0dd7b3fcd726ced3bd39cddb174f7111a9b2e6a282db5d06c6d9ff57447d4530b27720a38d99ab515de75a1a2929fddb5d0ea4bc89d30eb9975fa412
diff --git a/dev-erlang/p1_mysql/metadata.xml b/dev-erlang/p1_mysql/metadata.xml
index 4e19f53d8a4a..e98c30fdd4e4 100644
--- a/dev-erlang/p1_mysql/metadata.xml
+++ b/dev-erlang/p1_mysql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index c9d54ea55c6e..feed275b37ad 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -2,4 +2,4 @@ DIST p1_oauth2-0.6.6.tar.gz 213866 BLAKE2B 2b7ff13697658c6ab31a2cab60100758d965a
 DIST p1_oauth2-0.6.7.tar.gz 213885 BLAKE2B 42f363b3afec9368957bd788f43359a40a5929b7efb22078681caa8827fdb315f4b0063c3004b92bd92da2664d37b860d606e8c14124fe3d214fed2219e98117 SHA512 485db5926f11759ee447e40d2d2e3a9c66f949510b40adeb0c90ab9deac500dd01178e9b65cea6044e389af3881ad3a300222bd879b69b3a55d84ba3d718a166
 EBUILD p1_oauth2-0.6.6.ebuild 721 BLAKE2B 141c96b9b6e6e482f1472993f1a3d596b8ded233f57daaa585910c7304a5960c7968f547022d8d820e4e30632f0eda77308bb89cebb5c77994ec851966a18b95 SHA512 35c01d9f53f0f2c8ca5b5b740879907eb17e71ef05ec9baa250ecda594eece3fa6af71238e851140e25f07a1c4d952dae83268f442470f1eda0f71fc3983dfbe
 EBUILD p1_oauth2-0.6.7.ebuild 723 BLAKE2B 2cadab1ac041131df513021a873cb3a25aa5b4a4bcee5f96b050a16c518e77d788d525a03f3f83f7bee2fff33897d3361d31e906093c6cf4e8d5e8f8bd21474c SHA512 93bf43f1c9ddcee6094c2adddfc72832bd557d56737528f78c038867faa5f37e97dacce2a9762d3c68529aa7b45f0b88c666860e59da0d42df1486a3e7b6857f
-MISC metadata.xml 305 BLAKE2B 98e1f6ec2c085dae2c72693e64f9cb18ae8bb6bf0b8a5971b7d3e1a55cc3face9b7af974b9f1af40ee76902e625e330b219d78861601ed3f4b211296471f5421 SHA512 8f6d2d7fdaffa942e66e63e1cc315b59af452406993c7f208d09e00ecd5be8151b3cd72ec6f8c573a9c274662e9f75ad8dab616e284aa77257813ff82ec50823
+MISC metadata.xml 305 BLAKE2B 14fd1503ddb28fc6534e40282e49b2e71324bb070871b3a815ac0bfdca269eb265239dd8c35eac9b631ac410d71c59d2cfa71ef1cd0b23e72550bb12897d9405 SHA512 426d001671afa1e4146c0921c817659ce53bd699c82f171cbcaf8dd1b7e8590b8999a04c4b2a8d0dea54413b82fdf7a575affda338ecf876dfec007405812edb
diff --git a/dev-erlang/p1_oauth2/metadata.xml b/dev-erlang/p1_oauth2/metadata.xml
index 44f18bb2b73c..38b7a2c5a722 100644
--- a/dev-erlang/p1_oauth2/metadata.xml
+++ b/dev-erlang/p1_oauth2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index 136c0dd9bb95..4f219e4e4a01 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -2,4 +2,4 @@ DIST p1_pgsql-1.1.10.tar.gz 24073 BLAKE2B 541c12e72a7be558f7c9fcfb64c88ddcdfbc25
 DIST p1_pgsql-1.1.9.tar.gz 24175 BLAKE2B cab26e09e89fda82431cd29a3a09c9fd309868021bfad3d5110fd5b40ccd19c9b6eee40d77debb1cde86bc77f139123ce282305500774f5650ebf7c647bec532 SHA512 5a24bfdf13bf015d0a92cbba74dbe09122b900bed994495fbccd51616ee6fc3032fc571847813ef4631d2c6a947985302818c067d19a3ab50e190de6f0f2cf1b
 EBUILD p1_pgsql-1.1.10.ebuild 467 BLAKE2B d7c0846d73ab89288c18209b74583e18eda1714632ab1a66e7fc89b506bcabcf30dcfe63ceb3aff7cf19a11dbf73685c6386e56b206b72af8d0b40301fa9a699 SHA512 0e69a223920b5ced398a25784e300733dcc768f891a8b5ede11de432a97ce0e205968ba92c8b23e0425e1412ba44f462899b2b7f6f924adc70bb7fcd4f5121f2
 EBUILD p1_pgsql-1.1.9.ebuild 465 BLAKE2B 203d68dea219e01faa4f06235baa17b3037dcfe5bb9515963df58353c204fb093cc9f0205245787747e2e8f52352d8ca257c0c4d237976b5f92be15ec108f3ac SHA512 fd9dd12bb71f692c3eb3e5539c4ae669ef28ddcf36860f646e20b1112dbf78384df5482fe6d68f079287edda534c1c5050d6f466007dc49756a188da8037b3df
-MISC metadata.xml 304 BLAKE2B ef4e6ddc16ac353e121848f24676bbc1924a6afbaac3b8695d0be09b89cfee030b9bec9fd66484eb19595dbdc789d2b5fd746bdda9b5f4815c064cfcf146065b SHA512 b77962ea56d52b513fd7d3ea6c6726cafbb928f49f8ba0d9ccee10b20482a07385d250f80ad2780e3c5ec7d1854dc95b106575abf142e82d185c13d110b41431
+MISC metadata.xml 304 BLAKE2B 183c966e8c9d5ab917adc1969491806f9e6ff3a069a171e4d4118ec08971083df1d7bd1ad9a5e895d01056f337c9414bc1543bc9d450d289a89073f13a11ff64 SHA512 a64626a22d2db79ef88507a54e0245bafb248dcb87d1f70994f9a9a4d2f5a7086619a05b6042cb10e76fef6f120204f7aede9cf8b68f1c7bb072319d57280735
diff --git a/dev-erlang/p1_pgsql/metadata.xml b/dev-erlang/p1_pgsql/metadata.xml
index e1d73b1abd30..3df7bf6ca9fb 100644
--- a/dev-erlang/p1_pgsql/metadata.xml
+++ b/dev-erlang/p1_pgsql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 4ee1d9fef10e..59c86d36c072 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -2,4 +2,4 @@ DIST p1_utils-1.0.19.tar.gz 63649 BLAKE2B 0fe55dc6fdd436b5e77ad02bba923afe17cbac
 DIST p1_utils-1.0.20.tar.gz 63739 BLAKE2B 7bad679e526d934a06b8ad8f049965cdba713f168e2232e30389dd0906ceb0cd4d311daa5247ba5b5dd3d6155d59c64dd77510cfa15d6995a91201f62989b7a1 SHA512 cf389039f4bac9a62379c3f33c4820b3ea13c4929f8db20ea0b491eae455f4d69a36567a30d2800aad6d46837340040a2a30cc3cb9216c24f15f3e48524cc7b8
 EBUILD p1_utils-1.0.19.ebuild 484 BLAKE2B 14cd1d5752d69983c0fce9bebae21ee1d064196c606abe5da1adcd2165762111326c29389624e929ba4ecd5e9eebcf6fd95feb91d530d2ec9e82af65a89551c1 SHA512 39337607aa0f01b95c65bec650d8bf6c2a1b1741222204a5772a24eb572029efa631145e2471dce53956a1a21b96ca7534f7370d82a0d6159e8a8ae6de344ecd
 EBUILD p1_utils-1.0.20.ebuild 486 BLAKE2B 86ce01267391c253b07922deb8ac5cac27e7f5e3b9a7a52923a8fa12a5febb87bd14379b462ea3b1a4f545e86f6a02172acb7c020c5146fa3122d515701ce445 SHA512 0e11efc76d8f71deded0b65216894a9239629d74cc9429afbdadce65bc86f29a85aeab1bd1171fdf54a3a1b69ce362c1447359e58ccc7653d1122e690c410bc3
-MISC metadata.xml 474 BLAKE2B dd0f46e4c69d981a6341dc888b33f3bab4bc233df0208fbf09c16dc3bbacde133af147ed348f3f619836f3b3c52137b3b861c903d305a018ea61d535b3b5909c SHA512 9b19dd7b2c377527c69241c9af6d5599c9f8413c329297ea29fe38ea481a9a05e10c7f91656cc77e3b090dba6152d1d59f64f71e74b0530eced45af0ae7fd121
+MISC metadata.xml 474 BLAKE2B ae6d7ee5aba9551859de459eb6804e53d78387b0d51ee2d449e8de9ded9a2cd385b8120b799046f6741313caa00db3db777c0d2b2c28e7eae3f9a6f7693618e9 SHA512 33e41c924bb836a93da31f341908ddd8d23d64bed26e600b4b22ef0a125a9af65683adaa14c29954017932f1b8b22945e59d6569bd89f96d9d704d1f38393282
diff --git a/dev-erlang/p1_utils/metadata.xml b/dev-erlang/p1_utils/metadata.xml
index ae3174ba25e7..e0e53e3e8cf8 100644
--- a/dev-erlang/p1_utils/metadata.xml
+++ b/dev-erlang/p1_utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/p1_xmlrpc/Manifest b/dev-erlang/p1_xmlrpc/Manifest
index 4df565706c4a..ee0987b7c0af 100644
--- a/dev-erlang/p1_xmlrpc/Manifest
+++ b/dev-erlang/p1_xmlrpc/Manifest
@@ -1,3 +1,3 @@
 DIST p1_xmlrpc-1.15.1.tar.gz 21132 BLAKE2B 95dee53a46c2584dec6356bbeed75af9700194b63b02ec4452dbec20e070f457db23d70cde8a2999cf76a83e0c25c7d5de62ddf6febe874ea836fffed2d4661e SHA512 42d4ad71899f1c460a97a8c24b96673fcd597c6cd3881acb69f703a832729d78217e1bd401f659eccc2a2b2d235e68d0b0ce2543923c8cc675a3793df0291c90
 EBUILD p1_xmlrpc-1.15.1.ebuild 498 BLAKE2B 75e734dbc41e59703f3e0175796455aae50fbe983bea74cffe0bf5cdb9011b4bd475a18ed60b3001f63b60fcd4fb21227496410c8b188c1225f0f8899df7e9c5 SHA512 bfed3ae713688ee0c1e551f7bd4e15e8de1d7d56cb11c5bee0118819c58a340a118aad846327433d891fda7b2253add1af772cacad4a8f18c84513f1b4a2c9f8
-MISC metadata.xml 252 BLAKE2B c751cb7fe25cd4df1c517bd0257ed35f0984a52c3142b1c91925c0e73565b10aa5fbc008c4c1b58eabf838c4a58ae55898916231efddd85950ba1435caa7f780 SHA512 d7669c9e34f2ae6d2c2c4c5f8c9aa71a46e22aac4cc8f2f59eb8850a47b311e0300e8adaec381d90ea35e946ed5b5d26badd0ed8d7eab567b632940f8eaf7edb
+MISC metadata.xml 252 BLAKE2B 3c566d7a4b3fbcb0e3913ad6e59d7b39cb02f8340a09b744509cc99633ca7e452c7263d613770060f2e71afaaa1bf1260255347367db29b5dc96363907c8e1f9 SHA512 34e7a7fea19fd4f0a31322cfd4aba30cf12e0f4080d909a750092a3b440a1a9a82be41ba393b52f1edd99f4f80ffe1441bc8eeb6666dcfd32eca7c1edd127071
diff --git a/dev-erlang/p1_xmlrpc/metadata.xml b/dev-erlang/p1_xmlrpc/metadata.xml
index 946993fb2976..98eceba2b3da 100644
--- a/dev-erlang/p1_xmlrpc/metadata.xml
+++ b/dev-erlang/p1_xmlrpc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/pkix/Manifest b/dev-erlang/pkix/Manifest
index 927d5c2cf816..ac3ac6a0495a 100644
--- a/dev-erlang/pkix/Manifest
+++ b/dev-erlang/pkix/Manifest
@@ -2,4 +2,4 @@ DIST pkix-1.0.5.tar.gz 411755 BLAKE2B bd4b8cd87f1cabff7aa6923007aff9f586bb5e3e32
 DIST pkix-1.0.6.tar.gz 411903 BLAKE2B d6673421fe8ab96f8521ad6122b3ef5b3fece3b3dfbeafba3a5bb67ff528a158419c132247ac258a8f8adaa9947b132b5589245da0b9a23dbb7f3c91963c1013 SHA512 28bcadf4dfc44f494dedd34b8a37a1e77c76ebb59aaa8113a8886be15f01e6a11bb689278437140513fba9552c507a0b9d7ca7587ec92ccf037641aed55345e8
 EBUILD pkix-1.0.5.ebuild 467 BLAKE2B 52aa65ba307c5f1df43bf6a121d62d93e5dccd9cf34c995bc4bf12ef65c5cea8b8af91721a929425749ba00f984a77cbdbea1da2296a84e474c127db4264fa07 SHA512 a0b47f65268edda1aaa4326107dc3477feac7f81033457c06e5287870f01369966de8af8f7b46d260ef859426e096349c1555d146e421d959c2548bdd87401c6
 EBUILD pkix-1.0.6.ebuild 416 BLAKE2B f8ae0775bca563f441d751462f0634fe698e4dce3ec3371b6e190f543a92d1781bd1ddcc071a4f26ed7ffa861d9544cf82511c7858a8fc1416c034ce56edcdd2 SHA512 22a1bde455e90686734df434b36511afb944d76123bc8af276fcd73eee4555e764dc6141867a74d80462cb17e0b94d59a81a0c0591627aaa7efe9966bfab2aa9
-MISC metadata.xml 300 BLAKE2B 8faa02c849b7b56f6351028f45f4183ad0e971b1564b142246ce9192ee1daa2f80c36845920b613897a3a4f5c775a6e472e70fdbfd6ee8f00ff15effb193bfd8 SHA512 3dae9451fc5c94b513ff8e9eaa68a68110bd9bc36dd0863b949c2a345a0d12775d70e2619798de9a6bbb62daafc9eda00baefa6201535f49044bef9048d92e91
+MISC metadata.xml 300 BLAKE2B dcb521d5a8a926c87de90ccd89e3cbb01e0cacc8cde2c86a3cc99b7142614b40747c244933fdfd978dad71d99bdd3b9db6ad7364851778a381a46940b5f33820 SHA512 18ec656ed681b2fe47bdf4d4106355785bfe0aa2e3aedc7d635c6e041875ed0797b9566f61f3d209d67bafeb90459031e39457eceaa2c9969e073cef4b637260
diff --git a/dev-erlang/pkix/metadata.xml b/dev-erlang/pkix/metadata.xml
index f555f65ecb78..eae0f52c45aa 100644
--- a/dev-erlang/pkix/metadata.xml
+++ b/dev-erlang/pkix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/proper/Manifest b/dev-erlang/proper/Manifest
index acd3c1952e28..f31276e68a9f 100644
--- a/dev-erlang/proper/Manifest
+++ b/dev-erlang/proper/Manifest
@@ -2,4 +2,4 @@ DIST proper-1.2.tar.gz 291892 BLAKE2B 6c69f449c8794c1a957c78e7c478385bb4590f1375
 DIST proper-1.3.tar.gz 385139 BLAKE2B ff161c9ef694a039105a4ef863952b1a9377bcdfcecebe760de15bfe722291aaf2098a1e187357c6c30586024313f746abf52c89f6c337977deb6caeb448d404 SHA512 4d57ad4fb2a73aedbc9d839c953f0a844bc13acfbcc7e7ec2f0fcf3570a6b877589c1684a28e30dea93f469f6a7ab6db46bb95bb9b539721f6273eb6909dd2bf
 EBUILD proper-1.2.ebuild 517 BLAKE2B 76618a1cea25946ea2e1277d78c9133112142a7fd43b6483ff54b78a07e5379ef61a365bc8018b2cfeae746c5a0ffc02dd44a1d8609aec6a91fe0ba7130668de SHA512 d59107ab2f28890e4b9864fab694127ec88b83136bec0d6028bc07918610c9c5eaadacaf8d3de8675005f3d5ede0f2c6c7d29a8f19e42121ecd2565d011faea2
 EBUILD proper-1.3.ebuild 574 BLAKE2B 8b34b68fa95b56d36ff41ca5128a1fbf1e660bfc77feade87c194ae8e2ea241357ff427c7edad69df647d47fd6c70a246f6092d5ddf2826a19eedbc1a6026586 SHA512 4f9a9ab6f2fe058b5bef17c8c0499a300d17012c125a20921a3f0d5421cbf2d8f2b50c0dbf9ff86505878da3b6d76cf9c21b7655df863e84241a388451a5b946
-MISC metadata.xml 301 BLAKE2B d8a8582e03629f16384ce3b163c6684bc204dad4e688a6e05c8f64985dc6c7aa8a9c0a4ccd5ed3786ba32f57d8a591f3a340dff099c022a2608a4bb86bf57063 SHA512 b5e1a00d235d45d780c5189c06496c3164b2cd8e0d9f37a2b1bee2191badc275a8bc9e1631c296cd52d71d000ee5adeb8f69c6c97e4d4bea1c2700f577886c22
+MISC metadata.xml 301 BLAKE2B 64bf3c5790d2993e944074e7cb9bf1d9f3cc91ed59c6cb54f6e961da72fd64d3e57f8cec43630001e67c4a1413a180c13074da176f0149874fd615faf51e3acd SHA512 f8ab6d8e5450f0d59d3741d4268b957da0c94c671677439fa04874e665230b7a2ef65f397808082164e6df0d2dd354772303bd22867b34cad3aa1379f6110110
diff --git a/dev-erlang/proper/metadata.xml b/dev-erlang/proper/metadata.xml
index 0ad5806f6914..8dbe7429087c 100644
--- a/dev-erlang/proper/metadata.xml
+++ b/dev-erlang/proper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/protobuffs/Manifest b/dev-erlang/protobuffs/Manifest
index 6cea5c386567..8c40e9f77234 100644
--- a/dev-erlang/protobuffs/Manifest
+++ b/dev-erlang/protobuffs/Manifest
@@ -1,3 +1,3 @@
 DIST protobuffs-0.9.0.tar.gz 237560 BLAKE2B a29964deae465e0762570a04e6bbe65eea4ab5b60aebf8639724cd7db85716a69d61aa89fbb6dd3464283b1f343dd62f12b8cc2ab6dc0c0e6930d925a4943fbc SHA512 f5838723c5e5ae55f412848978729347186075917893e0b74e5af966ced9f12e8bc65906f3e591c78a99e64d70461df46e5719b83c262e9bbc5acfd1e50ae1d2
 EBUILD protobuffs-0.9.0.ebuild 893 BLAKE2B 80a69f89a9eec09f00f2bd5c19d8918cf834c9a8707f25b685bbeb5bcde65880a859975766be05312883e732538133136927fe21566271cc796acd94041ec905 SHA512 954bfddadbf9443ead1f75e2338e70bf743a5167aeeff15436afa1897ca020d053404401a368c355e1e710be2961ec124972d2c9ad08a1c47714d90559ef071b
-MISC metadata.xml 255 BLAKE2B 7bb202710c4823bf62a99def164ebac4ee36a011ba2c814d24bd7a2c9c103f42bd40e0bbd2b03be6ecfae3970c792ba5bde95a4700add7b7ef3beb845be6fcf9 SHA512 66811a88665deeba9438af85c1493dc7e3a493617edeefbf6d45d9aea1de08b53beb04f0238653c779c74804da39080d29fb6791e8d5f7251990101109c03637
+MISC metadata.xml 255 BLAKE2B 6ffc1fb9a2a5ff9fcbd2bd45854dbc6da958833d50ab4817151bb7b7075665b7d54df445e569f86a587428c9f95dd84996122e2baf46a9d1c694e19e64ed527d SHA512 d8379a053b94e317a3e99416217cedfd5e62b8b68f44a9b3d39cec616aca3794082e66426973e46eb1667bbd0675f6f25a8b738818bd39361e383d66cdbdfb65
diff --git a/dev-erlang/protobuffs/metadata.xml b/dev-erlang/protobuffs/metadata.xml
index c3df8ac7facc..03fe522fa7af 100644
--- a/dev-erlang/protobuffs/metadata.xml
+++ b/dev-erlang/protobuffs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
index 870407a85e21..9a0b221eb1fc 100644
--- a/dev-erlang/riak_pb/Manifest
+++ b/dev-erlang/riak_pb/Manifest
@@ -1,3 +1,3 @@
 DIST riak_pb-2.2.0.2.tar.gz 237485 BLAKE2B 5ca10bffcdf68562c9d61ffde0480be134a7b09f9040001bff2cdcf12e87c7256021829ab8c467a73cfd16c3e7e7c48229400d32b2e9f5442b05888de537c8be SHA512 f730d7bedc8152e5764c82df38a594e0113df7ab729008ecb9a231ea36d590e2240d7a5d0d3f57a6856b41748d5a525e0ab195887265d7cf5ab95563a6216992
 EBUILD riak_pb-2.2.0.2.ebuild 527 BLAKE2B 6c2819940ba2df5f7a3bb09531aa8f491248c9dce2f695ad21d8710e4a609a070989cb850a03df8b265a532bc904ea4307f891bd436e4732bd7c37fafb27f616 SHA512 b9d6417cb833754cdfbc71adf0f3cbd20d6b5ebe5fc9392eaa5bed5119df376d00c672ce68793d83221c2547c50fd0134fcd5420386fb956e26b1fc7455e548b
-MISC metadata.xml 245 BLAKE2B 5ce7c22ba3e9e685d6e6cee9387439065b5ad107f0e3f262324774c6ac466e2a49fb4a0ceefd37c0c956451b1ed2743dff85a8eaa789dcffa5c93835cc1600d0 SHA512 66061bd485dceaf463ad259fe5b66bf0e7036f45ed1482b1ac777aa5922957877094c8a088d73ca3651a3862a71b6402762f9cc8078319bd9d1f18b8380a428b
+MISC metadata.xml 245 BLAKE2B e48a04a9f9c3084969c65966ad936e58d69cada7329f0625fdf39886443b172a50a2b514dc9f21def51f6f86682731a497cb56fb93f7fd46431b26f4c6fb2802 SHA512 b3bdd63f2beec06882153911ac0a31e7bcef483757e42a4121a405262c0bbc0d6ba0d9522c47f01b23f4e455f38815f89ec56a8c97888efb65eab28da46105b4
diff --git a/dev-erlang/riak_pb/metadata.xml b/dev-erlang/riak_pb/metadata.xml
index e2ef4c4ba577..45552ed93e2b 100644
--- a/dev-erlang/riak_pb/metadata.xml
+++ b/dev-erlang/riak_pb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/riakc/Manifest b/dev-erlang/riakc/Manifest
index 409a48232a38..56effe5d2ff0 100644
--- a/dev-erlang/riakc/Manifest
+++ b/dev-erlang/riakc/Manifest
@@ -1,3 +1,3 @@
 DIST riakc-2.4.2.tar.gz 273312 BLAKE2B 0428990472f99d8824299b4a100d00c328f97ce6a93c0460e30e11e7669453790d8d6804d066a69390da8a28ea9a7aed59a72887376fccfa008010db3faee439 SHA512 ec1712dfc2a3ec0dca237bb9050fc901bed4eddfe200b92ff878c1e37db4511bcb3b78c036e803ea0c81dfa4279022ce668288a4cecde51ef0afd0583cffb0a6
 EBUILD riakc-2.4.2.ebuild 708 BLAKE2B 5d1d0b88800ca4d62dc0a09ea85cba1e720aaed176fb882c229dceaefda0294a66e6fd8d14111e44c34f3ac72e65f78b8e292990bf7f537329591801e8c3ed70 SHA512 c553560fa9a64da87339b7f44f78bf08a367689c869c6818cb56fe74b1bc3fa5f5c66e79f909c1f5e7e3726efc2c0f6f184b69dc2bdbb3c596dfaa4863de6e6e
-MISC metadata.xml 256 BLAKE2B 1db4c73a2e9d0d6b2c5649b81e0a21ec82071273401c667c117ad9c1924a844307a65bc653ac66da6ada3b044cef55621b4c618c28e90c76ffdab1fef210e930 SHA512 bcf4fa54e2d2a770efc7554ad33011648bd9b19a02d7771940aed57786a0e14f5a9c4b185ba5662ed2381d70dbb24c68605682eebbc0f966683233df9234b449
+MISC metadata.xml 256 BLAKE2B 0e2076cfbcb372cfddbd94a2b50a9551ac0d28d5e7e01af04899320ee71b3af8a371e8181136a5c33fe585617961887e2357187b7f5e5aac5c3fd227f090a2e4 SHA512 847a1f917a1519e679015df84f8fc48c89accd1c4090367e5c2b90e64806fcf347f705cf6eb22346483cddb1864c620ecd66e825399d24962122277e8cca6e28
diff --git a/dev-erlang/riakc/metadata.xml b/dev-erlang/riakc/metadata.xml
index 44ba4d92716e..691d40785da3 100644
--- a/dev-erlang/riakc/metadata.xml
+++ b/dev-erlang/riakc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-erlang/sqlite3/Manifest b/dev-erlang/sqlite3/Manifest
index 8133f4f2e35d..a072e8a3c036 100644
--- a/dev-erlang/sqlite3/Manifest
+++ b/dev-erlang/sqlite3/Manifest
@@ -2,4 +2,4 @@ DIST sqlite3-1.1.7.tar.gz 1834822 BLAKE2B 9a3f30a3a5f4e7ebe38aa1a808057767dd6d43
 DIST sqlite3-1.1.8.tar.gz 1881308 BLAKE2B 0a73a422c678ef1827608cabb18dba28d11d260b91788caebbb8ad65355f60fc3b842df119da68fedf356013e52509a87ed4c0c7f117e024484069e0ef722fb5 SHA512 056630056680f6606c6acf303521bc31ccf514163e4f02df3575535fe31eda74380306baa505734ab0e92a2bb82b35cc4fab81d11c3a409f855b202440b6247e
 EBUILD sqlite3-1.1.7.ebuild 560 BLAKE2B 0c5f809d4e308dea545ba9271400bde05f60725a65fc9b5204c21a6f7237bef3c80d657a4c3c883c7917a3eeb2a461dc754a45954fd8ef1ff674862406c5df77 SHA512 c183f0aac33e80321cd9fff8d460975674a3fb8e58b1ceabef24fe491c547aca9b353dc7980de7f0000cb7e49aae0dc7d7c8e78be6f79942cbed01a56e6bc0eb
 EBUILD sqlite3-1.1.8.ebuild 562 BLAKE2B 89b905dc2621c86ff10fbf97557136687c13a20398ea5b261dbd6307b9361dc7a99e91e5fdf1bdce1d7198a6a3b51b04d84d6879ecf2815bcad343beb50e386e SHA512 03e70f878d0fd2e8522cb17986cc9794d8d5de7a3e438f1f785e67253fa6c123c89b43e201967cec68761615ffc8d3f4c10d99753f39a19de9c56f521331b274
-MISC metadata.xml 310 BLAKE2B 9eb8a6f6e52d8b9e6f0cb38f374bdeb0d6973dd71b421808a2ff72e31b0e6890a4cb5d11566dfe7c523b691dbd858f8f2105ce269d85429bd69aa20929af95d6 SHA512 a9ca10f4266edf6ece231e2c50fe37b7eb6913815156c678b3d3d6911c0bcfd9b00315c1e81ff071a470492f7ea505a1601a1ffbcf88e4090c545f77e329f6cc
+MISC metadata.xml 310 BLAKE2B 447325c2a7f202485f8541d2ad75d029523dafb943fddac88531c512d58b9df8cadebc3816f148ee1d5e70d4147c844a55cca251dc19ae049d5032cdb3c89073 SHA512 12b783fd9f3ad3eb6db5a01dae1ab67ec56fc2afc23ae97316227db283d2a762b6275617b16c7b7db8607ad5b79d40018280c1bdf4d17d03295831520513a092
diff --git a/dev-erlang/sqlite3/metadata.xml b/dev-erlang/sqlite3/metadata.xml
index 120c0cf1dd4d..a8f01e90d975 100644
--- a/dev-erlang/sqlite3/metadata.xml
+++ b/dev-erlang/sqlite3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 604497d4843c..7d1ed162bd63 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -2,4 +2,4 @@ DIST stringprep-1.0.20.tar.gz 98836 BLAKE2B 8928bbc502f98101d93554430fce240b441c
 DIST stringprep-1.0.22.tar.gz 98910 BLAKE2B 5885aa58a7201408467afa7ec6c4fda350effaf2c4f0ce3000f036fd67c16e778344e23a71f753abb6337db5e2084b147ef3b24878c1ca2bc0e1e308945a46ba SHA512 3cd687ede237de24476b091d0e871bbb4af42be21cf27ea44936413ba2b643d0c6f92b5c7135b7064b8e111e05f0a0815b0d32e6d33b60e46612bc0f7bfd3b09
 EBUILD stringprep-1.0.20.ebuild 527 BLAKE2B ab9fceae5c8597c635c4269072151b2dd6a2a220e17a9d2341e72fd3a1a5db08ee75f4d486c53a0d1f480f6e2b72e2fa042ac3a736b87393f93f17668e4c4d72 SHA512 7b2e95353d9eff9afdf1ca0d27ae143f8535ddc6de3ae54c4a56c6b86f86359b822a5459858613126b0494f14007aa11629e2aebbb3427a134598d5d0436661a
 EBUILD stringprep-1.0.22.ebuild 529 BLAKE2B 5f0a400757015665846d56b4f9a77ded343b6e1a1709dc94a45b3f053c72e9daa0bb370f37962ef825de2b9f49df42916502e1c5cf1fe6c1e24cdd11c332be1c SHA512 a9b1eb1fbdaad094cee98174c54da95e70ebfafaef3b7f4a01cf46b249a16b768c6489886f76bb2a02ded967d00db6a52bb0e88cd61651dea043767292e45f44
-MISC metadata.xml 504 BLAKE2B 2127b99146efa992ca8a77c13ccf2966a92ea11b4e379c32752285431cde5f3a271f7bc47ad0f6bf6945f153f3a2cbd00c3bfd285b81978c8c1b3b66b256de96 SHA512 355a78e3829c0be4a1856053391d5e33a4cc23225fc44d6769acf1e2760e1b8220586a728dbd70639c4e3177f88d60d8333c5f16d1d227232fbcdf29211f2c47
+MISC metadata.xml 504 BLAKE2B 8bdefb290c4e51532e21f5e927e33f96eba4fd6b2bc84c57a938c3e3f2ec85d1b40ae68085ebce6bf7708e308bd4f805c54e42c1604e6b9dd00e5ebd3731b29b SHA512 209922b58a9e01f94c0c5229591996f9bc22e7243b1ddc9fc58ee008ea16866194accd968de95d61b9e33a1a0084511aca4878227089de79a511846d693ca54c
diff --git a/dev-erlang/stringprep/metadata.xml b/dev-erlang/stringprep/metadata.xml
index aecad4f5260d..a2c5ce2c84c9 100644
--- a/dev-erlang/stringprep/metadata.xml
+++ b/dev-erlang/stringprep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index 8589cf21d639..fb4161d85521 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -2,4 +2,4 @@ DIST stun-1.0.33.tar.gz 34863 BLAKE2B 84a501f19c332aad98d61e5f7f75c8866e44b4b124
 DIST stun-1.0.38.tar.gz 39142 BLAKE2B 47efcd8d91bce2a4aab7b927a3adade62aeabd166464bc5c54f24db5088dda709c19f2155995398dd29de72eb3ee8ee5f10bfdffb37a839189a7f8375dacdf78 SHA512 a9a99440bfdf151d306e2da26d60eac5756bbaee41ece07d7b31634c66e7ac646bd8167b50e47a014a9b74a72510de34b5ac3dd75b03256cb2d792e796f0d6de
 EBUILD stun-1.0.33.ebuild 504 BLAKE2B 5c6d89a02ee25d756e4ea201a754c047c7ae1edbf53e439ecac023b1a37f0495e639f6bf298977dfe4e9fae9d49d641e62823da307d70bcb15d38e68ceb259cd SHA512 021822647426cf7157c2474a013f5b8bae047b05ea0ca5e82be757007720c6aa19e3a56754e35617eb010e0c99b0d7ae582980562494e3af16fd47c5dade811a
 EBUILD stun-1.0.38.ebuild 506 BLAKE2B 635d5e8e716eb08919e8ca6c4ee77e028621f1f5c660a03d4aefb1b3019c11087498de4161eab3739b0436768b374040f2bd792e6c07aca973938d46e9471f0d SHA512 a843fdb29890e2c21df0653884797b988b4be8551355ebc26e2a775e0460fe1fafc84f66b88588d3cc7e99e99464aba48488d4abcbf718273b1cd930148f4397
-MISC metadata.xml 300 BLAKE2B 0e29cad1b734c0349b9910a8f0ec2f6ef8aaa813c860409f1688efa5d253d76fd035bbe7c4c837271fec68585d6d5bbcf4493542a3dcb1dbc229b3829f1d65df SHA512 48c6b133bcfcb9c038a6f683888f269424a65785e73b7f81c366886fe3769e569b15004f1353bbce9570b47346bb0db305654954b34ae12a959ef26f25944319
+MISC metadata.xml 300 BLAKE2B 1a1e8321eb7efef15dd4f8dbb676c6d7584ef5e5eed837bdf2e82514fb1d272189cc8a0600d6ac12aef0647974402252dc500de3dd4003c8999685044f7e009d SHA512 545b0110a22153c96b9eec229da22a5dd66d9cdfbfa54e3483976b9b1868a0f10e9e2442498b3b3cfc7db798df38c2aa73808e251ddfa118441882305288d1f9
diff --git a/dev-erlang/stun/metadata.xml b/dev-erlang/stun/metadata.xml
index 086142171705..caac9e7c3598 100644
--- a/dev-erlang/stun/metadata.xml
+++ b/dev-erlang/stun/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index df572449e7c0..35853929a7fc 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -2,4 +2,4 @@ DIST xmpp-1.4.7.tar.gz 483070 BLAKE2B fae845a165a44c6c43e2f23ebf67a272c9a9b7dabc
 DIST xmpp-1.4.9.tar.gz 483243 BLAKE2B 15cd04d5e99357ab4dac71fe7ee9952059658b56894c205e2d5b6c705b347004e580715c5198fcbc026b34e17033ad08da622eab92c83934de58500a8c64b905 SHA512 9c66ca3099584ea971f863ab24ccdca070bede63bedbf2fc858df762c27c329d07d3d119f7ced8ffcc1c24acf8874a68ee7372f157e81836e46dba27b057b381
 EBUILD xmpp-1.4.7.ebuild 710 BLAKE2B 7742c5d18d51e064f24f6e78d3dbeb03ab2f4af41daca9457c62d66c7489f5e2f16b998f129a63c7da4947df0e979ea261e2a4cdaf7a59721305c124f96a48bc SHA512 eec0608284f8c0973a787a77729e5907d52fa3ce50d8c28c35e512703b751d047fc299cdaa275c8a0a1313c9a7e9e8e7c1e60d2be939930b83ba3e4cd07494a8
 EBUILD xmpp-1.4.9.ebuild 712 BLAKE2B 02c2421c669d7ddce7c16fce4e4e8b609b0ec28ccd9cefda063aeabe4d6f7b628a27bb0b66cdef91864e2526572668aa3576f3fe546ab0714c0d1649a53c24ad SHA512 a9a10a8c54a85180833e016fa35a9d7d0fd9e58a55e28f91ecfc4768188151bb455346cdbb44941642fd2b3bcf2e328811cd88f9806e52168103ece2f38e2eef
-MISC metadata.xml 300 BLAKE2B 95b46ed0dc39741f2e8c5a822637fa76a7952e00f93ffe1b2a28905b7f68bec492756bf008653f5370c08d31e9b47133db6a6f181015f1fd1d0138e33e84746a SHA512 41a4ee656e0f8c79b319ad575de817bfc877163b235dbdfcaf5bfc0555b875190a4c395b4c2ed7e9e366d0c430b273f382d6ed984ffea6d4dc29ac0378336c92
+MISC metadata.xml 300 BLAKE2B 94b98f7c65da84f0f13c6c6518b996c029200ccdc7d7603e0c8a0be9556154d840dc081f10db7702ca2937e7da190960dc22638c636f18fa75b1ec36de4070b1 SHA512 1dd553efe1dcc77581c5ac3e476e5be002d56ba254b7f8cf3b29e61ae7a30083818f55188b4ce26bf06610401afd45c1b90311dd89a77aa6bacc4bdc7e9a13e5
diff --git a/dev-erlang/xmpp/metadata.xml b/dev-erlang/xmpp/metadata.xml
index e870b89083fd..781ab80f85ee 100644
--- a/dev-erlang/xmpp/metadata.xml
+++ b/dev-erlang/xmpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-erlang/yconf/Manifest b/dev-erlang/yconf/Manifest
index bf2b8f3b62fa..87dd81132292 100644
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@@ -4,4 +4,4 @@ DIST yconf-1.0.7.tar.gz 222483 BLAKE2B fdf2798a9552ce0c42e4d6b5287ff076acde805f8
 EBUILD yconf-1.0.1.ebuild 485 BLAKE2B 980a8d5ca95f4390203bf576debfe9fa775d4ac20b42ba49dd9596502805f05fd2b631448199bba920177f852db199b828489fdfef143d997ec1bf4286af4fab SHA512 de93d8214a87523f34da3789704b146d4685af761cc2938aa58e010cbdf5a246ccf94b38a60bfaa24cd65d3a827a220e57e9c7cfb8c951703f9641c1b9fef05d
 EBUILD yconf-1.0.4.ebuild 483 BLAKE2B aa3ad5b2da63a24b56c594700f5d8c1a82fcef1581cef81501c63010e1ea60346ded5ce50b409b72f7ad16e003c5d7f42c21ebd08d708a030f5d089f22694d1f SHA512 340709dc9e3c7aff1fe1460ee6b37f4e581e36280814f72aa15e1cd389799483727104845ad719d59aa5affc93ba44a94ccf10a26cf0e0c6df1cb92698d8d7f9
 EBUILD yconf-1.0.7.ebuild 495 BLAKE2B 7ed23e790c6d802c1206a7a1608538d9a6a4a2d19eb392b5993e8be2a7f3238216c4eeeac1e99e9fd940f18c815453b15b1466f93ad8fcda8ce265078a7c8a6b SHA512 d4c8ec5cd4fced419c99c661c4759e2289abd7145d6477c3638c523fac7bbbfb2f68ae1f37e0e6f47d32510c285862825fc87911cf42c7629234308cb79935f5
-MISC metadata.xml 301 BLAKE2B 0eaa7215cbc63e139f0edf503e5a9adc2d6d951c795f13b3b435537af6435e789c7eb48d9c5a2c7f13ec1aba0796cacacb7cb3255a8c754864a6b4e3dfb65ada SHA512 741c861101e6d438535ba24136ffffc603dba0e661134accd761fbe4269ab10c1f98e03ed35859421c382d76c53a09d5d2c42da9535d0cadca4fcba3c2f6d975
+MISC metadata.xml 301 BLAKE2B ccb7fb5ec0d47a4ee9c138deb9d5a68329c0c5955603535e62f640b88d2b01abe47b65d5578caab12ccad575ea4e175af592448cf61af740b877fbc40579238f SHA512 abd84813475fccf474b93c43358e57fe536da63ebebbef712195cd0f30433d1b1d27c63f6d1f29e31babc328490a5653f0c753abfe3db8163c97e26aa4e6626d
diff --git a/dev-erlang/yconf/metadata.xml b/dev-erlang/yconf/metadata.xml
index 9c843c8f055f..39b2e1b80fdc 100644
--- a/dev-erlang/yconf/metadata.xml
+++ b/dev-erlang/yconf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 1cc68179e2c3..2b27afbd002e 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 23f0df96654d..b5876b6af9ba 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -3,4 +3,4 @@ DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a5422
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
 EBUILD aseprite-1.1.6.ebuild 2161 BLAKE2B 182bd7e62802ff539f4e6ffb71e6e787af9943793f0f6b866d05d052159b2f82b4237ce46744cb5fd07bd94f1283e9968d50f375c94c257cd386e1e0dfeeb95b SHA512 f313d15dc499f7b468ffe78b6df84aba6f663e9abbf4bbb8266a8a3f1e726d53202be92e2637bf264f1ebb37392497af0b52b32bd8a03900734de5502b6baba0
 EBUILD aseprite-1.1.9.ebuild 2734 BLAKE2B 685d2f3ed9be7dba135e500c1860d794e43b7841c2c8fa49332e8ea5868823bee03605ddc16b580cbc104f9fbcd8a1c5ac542e4fcb15bfb00937e94fbe7b055d SHA512 cf0f3a5726f55a438bf26af6fbff7c09e93b552dd1881eeb083384de4e8bbe051220dc43cd9a373880a23cd725ef2b95ffef6a6a9a5ffc79c1b0c04dcf378db7
-MISC metadata.xml 653 BLAKE2B 7bfb4ab9faba731096e693600285b0390be6bf3dacf79076346d011660b7a558fe7711b05ac5bbf9ff9b4de9f0e32fbe7e4f44a7ad9251b7d97afa8094a6689b SHA512 7b3692fa1d9f37b2b15aeae2a7e77373c37b6f5dea9327c675294f23d7cb965d8aabb37be452c7d5a2b85e55f0aa23fd4e5f487f2c5f72e9ec0ffb9fb8c79438
+MISC metadata.xml 683 BLAKE2B a1f5cdcafef544e762630dbe0beabb6f6de75f8a54f957376434978bf1dc9194c7428e1db6cbb89d11cde8724784b8ddc01759f833dfb3bdcc1f016e39b041d6 SHA512 26cdf928671dfb63cebfb8d720d711766273f4c781bb37161a171670c40d06d0e2fcc0836888ba2408e01e1b12f3978ddbe952f4e4c57f0756b8e8cd359a6608
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 1bf066565824..0484042a766f 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index f558ecf5e32a..b32d270ed708 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -17,4 +17,4 @@ DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a
 EBUILD clanlib-0.8.1-r1.ebuild 2252 BLAKE2B 5d04c8d1291f961c1567ae34cb9f148fe6993cc6a4c1694b3beaa454082248276eb0eda6edecfdddd704a57e98b0395cc49b38011c0fa71ea5f1fcfea1feb75b SHA512 380c236592632dcdd1b8743390678b72fa3420f0cfb92c001645fe73fc8ba5cee4fbb3437e69c81241a88181a2587d0813fbaee01b0439ea01bb694d63d8fb4b
 EBUILD clanlib-2.3.7-r1.ebuild 2123 BLAKE2B 2641ee84fc7400f8c9227f849179746101e0cb8751fba9d92f2b1a4cb0d042e06363b0af1d8bfca821367d37007b4279656ceddcf5f0ae12b04118c266f03ac4 SHA512 1ba8e97e83bd0e5029d27a0be7157e2479edf0f7d985ce55539ba5770128598b74e29deb0583e2cf3c76471c9850fbe11b5498a6bd6dbb987f84817779d896c9
 EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
-MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
+MISC metadata.xml 3096 BLAKE2B 2424f96e26408b05e8cc272dabf45ea1b865207364eee064fdf7132f6293629e69864779011d5cac55a42671ca0adae6f34e09209b636d2ad224f413de4c5ee5 SHA512 bb84df024ebfc5f59ef035537b8f2d19c3b7e7cf2b9c832fed8a973062807a95671bdbd2ce76529d8d424d664c9b37ad79e0839248d6099f8ba237f0d49cb76a
diff --git a/dev-games/clanlib/metadata.xml b/dev-games/clanlib/metadata.xml
index c6bda8543208..6868399b0068 100644
--- a/dev-games/clanlib/metadata.xml
+++ b/dev-games/clanlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
index 2f688a1abec4..ef17d83d8f5f 100644
--- a/dev-games/flatzebra/Manifest
+++ b/dev-games/flatzebra/Manifest
@@ -1,5 +1,5 @@
 DIST flatzebra-0.1.6.tar.gz 359098 BLAKE2B 8f17c76ea70013bc916ef062dbbf333abd5d8935f5daabd47a101a3c16c7dfab169b80dc406e6175d2626b6265f9bc009b8a5f7a5d4bf2dc1ed766e632977d5a SHA512 500df95ee23bd2decf1e11be76725733d9219ef06a844f2de337fc11494eeea57e5ab6298cb4235c394216dd75bfb64a4e9f732362ca5ee95c43086b2ca38f75
 DIST flatzebra-0.1.7.tar.gz 375938 BLAKE2B b84ee2a69c02a7fd519de3e709a81026946b107fa1ddf8f4ee24a490ae9993f2ecf6c8509b9e92d1ab4e11e7f41e41effaaa2b32a7d2e679400f02853602a9bb SHA512 12afbb0ef00dfac21654961da8d2101e9b7b0e6550b9e66bfb4da4faf77cc1dfb7f3da15c8b84c19379eb1ff8bac09324acc694f9282b74ae73a7379686f2374
 EBUILD flatzebra-0.1.6.ebuild 730 BLAKE2B 5f955df8a7732f7b95b390cd1371dd6019ca0bcd738b03c679b48a0b763feae84f4f0660be74231a3906907ffd61d0dab0eaccd1f4fcead9f9778dafca009998 SHA512 10cf7e3f63c4d95ccc6e599d4b44ce2db6753e825962539f1b55ebb4cbbdf53d7c547d77f18a51f940def6286073c6a001b74caa8bc2e671a0e67faf7e3f8c17
-EBUILD flatzebra-0.1.7.ebuild 767 BLAKE2B eb0751b20783251726a05d50108928cf5487ad33c3e1a7fe68f4779b8f4acb86b9eef2b65b50a1196eb6cfd3ff04a11deb5a0cb3887e8d23a8685d06ca094ea0 SHA512 411bae9503f235286ecf5987696a976e4fe103c0e52ddbefcf0fd167fb4c8a96995b72f7d09d3526745746b3d747dce3aeda86e85234bee6ef8ae8b9ebfc741d
+EBUILD flatzebra-0.1.7.ebuild 765 BLAKE2B 4db06a829fa620908d9017d2d9bb82ea1e37a66fa4e18fd8c600dc6485f17b51fe9b61415820061839473df64c56f04180f899475191ec6e5fbaebc07f1cd29d SHA512 af05473f3f014fc93bdadbf728647512ebce3d3df705c3f2f828741d4bddd118f9a98316495766061a945e3535ec64dbd08bd677b0ff1abd45f28abb27da565e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/flatzebra/flatzebra-0.1.7.ebuild b/dev-games/flatzebra/flatzebra-0.1.7.ebuild
index 725e4ddcf45f..f19989af5497 100644
--- a/dev-games/flatzebra/flatzebra-0.1.7.ebuild
+++ b/dev-games/flatzebra/flatzebra-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/dev-games/goatee/Manifest b/dev-games/goatee/Manifest
index fbfc1bd7e321..9cadda85c6d9 100644
--- a/dev-games/goatee/Manifest
+++ b/dev-games/goatee/Manifest
@@ -1,3 +1,5 @@
 DIST goatee-0.3.1.2.tar.gz 84576 BLAKE2B 66eea2e0685279acadba0ae857786bc8bf5eec26d4856745f6a040ac220a824d02e7c9ccf36e38d81ad8a60e90972681f9e2ab2e5f67fa4af267e5f8bb5cc98c SHA512 b8723679823dbb092346f8a6c556c3391888f004d609d6b61c73c9f590901abc5d4024d0ad4063692078637be0171d78e9a91c9436735423d597f310226ee9db
+DIST goatee-0.4.0.tar.gz 86585 BLAKE2B 32d099fdc4acc66a89b8f17790a4c73d234e28e935f5c325a3dbcbd1c34edd24513a99eae5108f2bcd38ead402c209a4d09e2a57c65fb69c4dbd70a4f05903e7 SHA512 ccd53a3924528cb23ea58e5d9080ba2f6f10a3cb0b60d2f7a427f4be3d20cd9082466757394a82a63ccfd7cb13c1dc0d690084b66193ede0fe43e6ccf434706e
 EBUILD goatee-0.3.1.2.ebuild 764 BLAKE2B 2b7979b1d4dc4383a1bb3bd77a9ad7ab972edd476f16f3d851a5f475f1818be10486a6e3c7644b77898c651dfb0a2a27673a5930825dea28eba0dba5924a380c SHA512 6842c143397d197efb6ba355092d80418636850cd0ff27e8695b46168b0153d0d784b9fa7535424ff64e1d177cd86de1acd7b110d5ce099f12165f1d621f65ca
-MISC metadata.xml 815 BLAKE2B ec7785235c9879ff74718aa5240e07455f1e36ecf3fccef95e7a49cad7f4f79d3dcb729ea2d50271e277410a3dfdcbcdbd63f155c84d0fcb061761ccbe1bd2fb SHA512 34c22d6f4785a966025c02f5e51ae0159e4dea45359a97e795865b3c75a119dbeb5d9c9485c897381ed932e21c7ce846753de66926b0bf4ff0a5a08a4472ef49
+EBUILD goatee-0.4.0.ebuild 762 BLAKE2B 77a9cc40e2a111c1321ca3617da445cb49aaf658661d0e87672d608109070fa5a65f1157e5bae3bced69d08be19b4a2d8cb6c0106ce7abb0485ff504cb6a279a SHA512 adce5c02453684d8a63280886af7825957a529452527a0ec703a6d015822a6347128ded1fe464b39f17b2eaa5f074759eedb208b41527b2ec3bc744bd2151a90
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-games/goatee/goatee-0.4.0.ebuild b/dev-games/goatee/goatee-0.4.0.ebuild
new file mode 100644
index 000000000000..2a66c208a016
--- /dev/null
+++ b/dev-games/goatee/goatee-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+HOMEPAGE="http://khumba.net/projects/goatee"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
diff --git a/dev-games/goatee/metadata.xml b/dev-games/goatee/metadata.xml
index 7bb68a35c426..b7878815d80d 100644
--- a/dev-games/goatee/metadata.xml
+++ b/dev-games/goatee/metadata.xml
@@ -2,20 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Goatee is a Go library and game editor, written in Haskell.  It provides a
-		GUI for recording, studying, and editing game records.  Underneath this is a
-		portable library for manipulating SGF files to build UIs and tools.  Goatee
-		aims to be full-featured by supporting all of the SGF spec and allowing for
-		full and easy customization of the game records you create.
-
-		This package is the shared library.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-games/libmaitretarot/Manifest b/dev-games/libmaitretarot/Manifest
index a6a97ecec37e..f714348b3e64 100644
--- a/dev-games/libmaitretarot/Manifest
+++ b/dev-games/libmaitretarot/Manifest
@@ -1,3 +1,4 @@
+AUX libmaitretarot-0.1.98-libdir.patch 633 BLAKE2B 8fec5587a940744b9abb2981db49cf703376657b40d6367764daaf02ba7153d81a06b7802edb602ad3c893e198b656e89ecabf83777b3c06aa2a40cc716156e0 SHA512 88efa5708c79112e145cc3706e9e457017f7c7f9a63bd70291a4d0a0afcf7a1e66f22b1e0f0368ff911a5aa50b7a1b650c34801bab8d455c3c70a3de6687134b
 DIST libmaitretarot-0.1.98.tar.bz2 158060 BLAKE2B 0883c6232e53caa633091022e9f2488362b400723e78c71b836cf79a0189d304e5aaeadff0de4d3a67f9316c37a848ef5ae56312c79a6f20c287f196dec5675f SHA512 1626f7cd8d53be97b70f4258e83fccefc8edc0605e8850466e94a09f9cfbecf9f763ca7b9154f1fb77da15e9856398b8fce12b12064463a0a9293f8273e95d90
-EBUILD libmaitretarot-0.1.98.ebuild 548 BLAKE2B e532686a607a812bcf9768ac06a9764b321f60d8a5fc1735511c236e534b59dfcf1b99b1b7493466d6d1e98723b191e850a36c91ccc1635d6f0a2621baafcf17 SHA512 1ddaaacab565778268409087b2d208a0943892e4c266147cc01157eb1ca2fb82eadd275c9e7b219f4056a19338c40b68bd808d730fbf6249441546195308b668
+EBUILD libmaitretarot-0.1.98-r2.ebuild 734 BLAKE2B 7c1faffff1b9a1e7892f163fb678eee952d32813cb26ed2a9bfa0c219f1e96563a750f5370d4e26d3b5ec74cff4cb39fafa0c0a19389c649091e2890e038eb99 SHA512 4f04e100138eda8bb9b55879bb7fbae6e3d9504a3ac8c8c573911cdffd894a8e1fd8a743951b2773844c021dc7e3ac41c35ebbbe1f5242f556acf889a2b0d16d
 MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch b/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch
new file mode 100644
index 000000000000..635ba1e437fa
--- /dev/null
+++ b/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/729734
+
+--- a/libmaitretarot.m4
++++ b/libmaitretarot.m4
+@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MAITRETAROT],
+   --with-libmaitretarot   path to libmaitretarot libraries,
+       [ 
+       	LIBMT_CFLAGS="-I${withval}/include"
+-      	LIBMT_LIBS="-L${withval}/lib -lmaitretarot"
++      	LIBMT_LIBS="-L${withval}/${libdir} -lmaitretarot"
+ 	 ],[ 
+-      	LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
+-      	LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmaitretarot"
++      	LIBMT_CFLAGS="-I/usr/include"
++      	LIBMT_LIBS="-L${libdir} -lmaitretarot"
+ 	 ])
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_save_CFLAGS="$CFLAGS"
diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild
new file mode 100644
index 000000000000..2004dba61357
--- /dev/null
+++ b/dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="backend library for the maitretarot games"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.98-libdir.patch
+)
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# Needed for consumers like dev-games/libmt_client
+	# bug #729734
+	insinto /usr/share/aclocal
+	doins libmaitretarot.m4
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
deleted file mode 100644
index ef9389f6791c..000000000000
--- a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="backend library for the maitretarot games"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-games/libmt_client/Manifest b/dev-games/libmt_client/Manifest
index af17aa22b919..a3853e746fb1 100644
--- a/dev-games/libmt_client/Manifest
+++ b/dev-games/libmt_client/Manifest
@@ -1,4 +1,5 @@
-AUX libmt_client-0.1.98-format.patch 2325 BLAKE2B 01827a1a89ae4ad36c6c655b1bfa6a0391cb0e556777873fcf01840ab13ef133dde7e0330b9ef266d3a6b0eb5c5a85fe731bff03ec8be6e7ffbb499edd8b9dd1 SHA512 c4ee6b5a5ef2a62f8022fe6672c2cf9769e9f120fad3abcbbd86c1ff12bc66c5d36ba285b8576eb410cb337c9bbb3e11c9941761a024f0d445b143a1d3de4d65
+AUX libmt_client-0.1.98-format.patch 2253 BLAKE2B 12527fce0c4a9d0c2fe719e783f7d650e7851da2edce0d99b1ad85014158fb398e191c115a67fd30ee1b4ea2738fc9799e1f8f2491436a3e0d2cf644d7ebfeb1 SHA512 0c380ff0864b922815c56fb287e8bf3b6c0485e13747f5c2641a4e5fdeb96e24901a135960f36f71d21a95cba9a90bafcb31c00928b5c175dc2a995fdb289567
+AUX libmt_client-0.1.98-libdir.patch 615 BLAKE2B e0077f5d6fbc5d21aeebd9d6fb0389a068b09fae2b7d6cf0552f9ef82acbab535b18b32976872c10f32fe4d9aeaa053684c26617ceef7cdf9260851be775da2f SHA512 0847661d4c64be724b08a9d83cbccab4508d1aabc663699284db232487894174e3da6ec5269f50e797a81dd6792b14467af0d46f3458dceeaab0f9ccae598715
 DIST libmt_client-0.1.98.tar.bz2 146319 BLAKE2B 0edd2690f8139f62a9f31a19bd869e98f213b613a76ca735b5b95fdc7fb01f8d3e4739828f0d5c3ab0f0f4597875c1334304b1888e3dd237d0e2f6fb19c553ba SHA512 1eb53bd36a171dbc3138942ec8314aaf8a71ca207060ea6d7499d18c2680fe8ebc822d8ec9843675a7c329039d2c985783f239b74b13c004e47a38250a8c4411
-EBUILD libmt_client-0.1.98.ebuild 630 BLAKE2B 5d8377f1f2364e0c5859005223a977355c35f311ffeb1ff70c5266205123da90f1c0183bfcab9d1d93a18246861f2059968da97af3a570b58547b4c76ece85ce SHA512 dee8355439cc7fe7cbfd346c196ac6f80afd0e8da6ed26fbe6325c2f5f9dee302c892c0dcb6aa83ce1f1716dde5dbbd7abc574e685c4759ed654b9d8e4954b55
+EBUILD libmt_client-0.1.98-r1.ebuild 844 BLAKE2B cb0d70adb9568b3ee4910cef1a0bf8cdc0953eeeb4c6ec1daadbc5ecd89e8423e10e5195bc32f5bf7877a0be941df3404d0c760b2e001cc883c505a151c65763 SHA512 f3eb568c0c5cf425197496b002209d2234647badc6b88c8083227aed3e08313054d35c2e64fbab9c5d66b707af874cd9e75db4bdcbc5a077a4f3f301f227f255
 MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch
index 5173853849cc..76c329d388d6 100644
--- a/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch
+++ b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch
@@ -1,5 +1,5 @@
---- src/mt_client_game.c.old	2015-12-22 08:51:19.858561807 +0100
-+++ src/mt_client_game.c	2015-12-22 08:52:48.934904973 +0100
+--- a/src/mt_client_game.c
++++ b/src/mt_client_game.c
 @@ -56,7 +56,7 @@
  	}
        else
diff --git a/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch b/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch
new file mode 100644
index 000000000000..cc56eb09be45
--- /dev/null
+++ b/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/729734
+
+--- a/libmt_client.m4
++++ b/libmt_client.m4
+@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MT_CLIENT],
+   --with-libmt_client   path to libmt_client libraries,
+       [ 
+       	LIBMT_CFLAGS="-I${withval}/include"
+-      	LIBMT_LIBS="-L${withval}/lib -lmt_client"
++      	LIBMT_LIBS="-L${withval}/${libdir} -lmt_client"
+ 	 ],[ 
+-      	LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
+-      	LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmt_client"
++      	LIBMT_CFLAGS="-I/usr/include"
++      	LIBMT_LIBS="-L${libdir} -lmt_client"
+ 	 ])
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_save_CFLAGS="$CFLAGS"
diff --git a/dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild b/dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild
new file mode 100644
index 000000000000..997ade02a0e2
--- /dev/null
+++ b/dev-games/libmt_client/libmt_client-0.1.98-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 autotools
+
+DESCRIPTION="backend library for the maitretarot clients"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	dev-games/libmaitretarot"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${PN}-0.1.98-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# For the m4 libdir patch, bug #729734
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# bug #716102
+	insinto /usr/share/aclocal
+	doins libmt_client.m4
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libmt_client/libmt_client-0.1.98.ebuild b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
deleted file mode 100644
index 611635f26520..000000000000
--- a/dev-games/libmt_client/libmt_client-0.1.98.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="backend library for the maitretarot clients"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format.patch
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-games/libsmacker/Manifest b/dev-games/libsmacker/Manifest
index a27c66eb54e9..f7eed985840d 100644
--- a/dev-games/libsmacker/Manifest
+++ b/dev-games/libsmacker/Manifest
@@ -1,3 +1,3 @@
 DIST libsmacker-1.1.1_p35.tar.gz 27554 BLAKE2B d8735518d2e6c6dc2b03d5781fb7d58862ff59c7452e91eeea913c619ff4e22b9b01f5cc1512329a1678406f98844c09125caede1a963b0c690bfc8f6a60e367 SHA512 beeece71fe35a9d2554e082245f1f600e211f1431c2162c83d6bd1b378867f211f5687ad359ed5e035c0376cfa28a58651532f1dc58863fae8e0da4540283c33
 EBUILD libsmacker-1.1.1_p35.ebuild 668 BLAKE2B 1ace82237aa794bcc94ab9eec22ce8b21320294d1257626f49635779a25b4618f17703f7cb03a132c5ea7d47720882e67375ff895723d9a12b1408793d984b7c SHA512 5ddf795a56e234a2e10f787d0480d57c2c5858b6ea4d16782f613a9c2545884cb5182596bf77adde9a1af231d56b2000d80c0371458a0e7a5fa064774d095546
-MISC metadata.xml 382 BLAKE2B 2a58c709cead6b58075460431af75fd8fa8f0e8f965efc62d13878b0ffe70ef9461adb3f980463241dda25c01adf0ec934087e6da16d05822597ddcf92f10b1a SHA512 c7a4a726b4d7ec5462bfd941673327380efb5fe0d32913f125e0df1820d9605facef16a2f766fbb4baa1fdf5000b1a31beea3a454e4dc7918ea387459d28c6c9
+MISC metadata.xml 412 BLAKE2B 5149be4529e8bf8baf206d108408782e4693f8fc81446948051c7f64e9d010813aa3f448c82b80ecc70a72d1be0d143944840a086f3a4ff105dc741889b64c65 SHA512 bc0157656d12b2485e4a6608c0d921f148d2b13e6633cb13fe08ed210f065b38b60b0e1d7bac8eb1d26a4882ef54f618b3ea5d86be3d8c62f6ee0148af3c909e
diff --git a/dev-games/libsmacker/metadata.xml b/dev-games/libsmacker/metadata.xml
index 2a6c92d969d5..6dfdfb38359a 100644
--- a/dev-games/libsmacker/metadata.xml
+++ b/dev-games/libsmacker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>misanthropos@gmx.net</email>
     <name>Richard Fröhning</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-games/metadata.xml b/dev-games/metadata.xml
index b9454811d16e..1b2b57569882 100644
--- a/dev-games/metadata.xml
+++ b/dev-games/metadata.xml
@@ -40,4 +40,3 @@
 		programowaniem gier.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-games/newton/Manifest b/dev-games/newton/Manifest
index f2898c96dc12..459327a73063 100644
--- a/dev-games/newton/Manifest
+++ b/dev-games/newton/Manifest
@@ -1,3 +1,3 @@
 DIST newton-3.14.tar.gz 31417588 BLAKE2B 40704d614928ea2927f21201d924641766cbb32393e3d1cc36ea8fca2158625847e20ec2f0b3fa9e70f30bb1d6f4d8c4795e19873392b8211b0efb015ccc10c7 SHA512 c86775329921faafc061516db8473ef3b17ee407ffe3d6aaca604f1b733f837bef18d394b2251dfa9cd1296e0f3c3ba61803e0e9b43a4ecb6abe42640b4773eb
 EBUILD newton-3.14.ebuild 724 BLAKE2B 3c601372ec3ee8a19b0f82d47a81ae7360b5d7ab25834efd1e2726a6a6c8f4484d7788626b0644f3ec2e12f05b8ad25f5197a2f5d750e86f332730a4c674612f SHA512 dec3f70f8c12261f885a9ef5cd1874a45f7adc42315c784cb0cf72f2ad7d691c2ca8919800c705ee5cab67265d0acf9696aebb0fd02c64c22201777e0321ecb4
-MISC metadata.xml 342 BLAKE2B 284d0480027f479c09aee367aaa561797d76f63e1dcc9c693f9cbcfc28a5249a14561f0377c775286dd332c052f5ba66b8a903d7f4ab1e9ecfa62fc6687bb9f6 SHA512 c7cbedbb073be0d661d134a4e09270aa82232273736a9ad94bf107f551d5511bc6e9849155d01f30342515928b7b1209a4e286437d21bf94151721146340d579
+MISC metadata.xml 342 BLAKE2B dddb478568c5d081b9a5854342ad161e1bf7cbf4d27cb114cb0430b0d8ac39b10dc7a02b4bb14f9771c0bbf9fa85d598eccb0e6a40cc1e108595ff666d900100 SHA512 06baf90bb35db498642ba4c1bed6f6bdc9b872ee1c5826423def1f0ba389d3920b11c3095c4e5cb74f3b3be39de471dbe67d4c0bbf40d1d8b9d6d613c9dce244
diff --git a/dev-games/newton/metadata.xml b/dev-games/newton/metadata.xml
index 50e390f21491..83153f4d38fc 100644
--- a/dev-games/newton/metadata.xml
+++ b/dev-games/newton/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index 3a79f5c8b41e..046775074de5 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -5,4 +5,4 @@ DIST ode-0.14.tar.gz 4018146 BLAKE2B 7dbb3d4cd673dabce176cf92d9d0b5fdd21dea25b75
 EBUILD ode-0.11.1.ebuild 1512 BLAKE2B 4ab54d811f2aa0d4a162d1cff1284b1872cadca5ff9c325192113fecfe1dcf80c7196f64210a98dcad060c2169958feba83bdfe671d05ab2a89b460ed1a7b7d4 SHA512 ddc0984245aecf46358d2a23950861e172ce44a4ba27df46a05232c2ab14515d5495c70fd49ef549105c7a4f40db0fb31c35e4b110b00df45e62c07944028441
 EBUILD ode-0.12.ebuild 1536 BLAKE2B d860e8afa033a84e6fc317865009f9b7f6f081d00996c31baced0e8893e46167c5e579e4086b3d48492c5ba9487471c457044d3a67f04d07e682abf6a7e859ec SHA512 edd2b2f225afcc432fabeefc44ae8ae678040bfaf22b4d822870039e4da796d943b832150fe8d7ca77902412f054da966fc5c8b77f104ee7fc8ea5dd3bf3d58b
 EBUILD ode-0.14-r1.ebuild 1676 BLAKE2B a0ef16fbc8bfab3ca7d3edf814096bd96d7e64b04745d915379aa870c4e38b5d73226fba1507625f2cd336d06a1f0bd80ec3677f5249c3e69b64e1b402658167 SHA512 fe9325e95aa8efd81e7af01bb5b7733ab1957efcaa8853813e49ba15d3ae21ef7df3b3ca1606fb9300c5d39fb40322a33ce55242c728dce5bf33d36a0ade34d0
-MISC metadata.xml 917 BLAKE2B 09ae21e95ce0c14de1507aaeec9e40e0c231708dcc55d741a12cae6d55d1a29235c385432e2bb5cbf8a6928e22ff56382be73bce0f84c024e32643697ccd9240 SHA512 46b02d068b5ae22dd6a7cf7e56f4525c377e5c6f35476842f76523c0f0c8582342f46e0972a99195469d59d9f0136b255c35159f91dbe98004cb9c00ea24ca8e
+MISC metadata.xml 917 BLAKE2B 27118db0a3337cadc8a130bbc4c8fdbc6fa3b26b52ad357b94e0c17740cd4e886eb98652a7f4a17301868172d1306ed5b69fa239b7cfd8f7dc9be7a642aa2c10 SHA512 d9bc708ab08c0bb64565945f372ccfd7334447265e5115426200eb60a99bcbc6aa00c652f4a61d6401c24fe64cbc8a5819075cae3552de0c15f57ba2dd96c28d
diff --git a/dev-games/ode/metadata.xml b/dev-games/ode/metadata.xml
index bc254df5ec9a..7e588d6ce122 100644
--- a/dev-games/ode/metadata.xml
+++ b/dev-games/ode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 5abfabc233c9..fbd4e9e624d1 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -4,4 +4,4 @@ AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd
 DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
 EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4316 BLAKE2B c5d475494f271839ad50da59caf9b9f07d5144841d64741fc4266b2f1b5eba1aca98ba8ad954a41e99bd01fefdbeb3d93b21fc7f78e0b45da75b9825314a08e4 SHA512 171d766ff3083009f2abe54a55a580d77e56f117072dd78e76f7a81c90d671387a54716ef45ff0923379bccc8ef540275fd99b7636ce936a284bf2c19a166332
 EBUILD openscenegraph-openmw-3.4_p20200425.ebuild 4067 BLAKE2B 3c61a5c3eb1b0929c774d4d39317ec8ae0a5901cff5757b8f266a1fe8166b99da72d515d6d5ce4e6eaf69be0f52a7e9086e9f4cbd1fdba0ebd4141f314e4d5c0 SHA512 9c2be14d5055410290af536dcaa69c1b278e010c79dd4bdc3a4a78c4640a82b8293d4dcb2576a0498598c3f6cac624e77c92988b4b00a42ec53fb1ee43f4a75e
-MISC metadata.xml 1660 BLAKE2B 57921674c11a78f14a142bfccea979751b718ceab534358265394801abfa2d7193c5024d8336c6748cef561761d2bb9287e9a30239e524e241724a27a98661f1 SHA512 ace5614136e12a0d7deaa1feb6c83673b01aa2477663baf553cf90230877174a5a06358c2e1abab132a18479a59286344051d9a7afecca478525add69a99f356
+MISC metadata.xml 1690 BLAKE2B 4c99a953f827084c2a9d848f1bed0f1b7c885343ac2bb8ca57b2ada30ab8901e56ff1f7a37e97394c2fd0f8b0eff452ac0dc2a5fcab270ea8781999fd4bd45f6 SHA512 44a3d3a9af55c002330282ce036c3c455ffd7e9800c854657bd643fb3033645217e365a1a8dc8c7dbbff0d7038a9c6b0265fc824af71404a5b42d9a26a147645
diff --git a/dev-games/openscenegraph-openmw/metadata.xml b/dev-games/openscenegraph-openmw/metadata.xml
index bc586e1a8125..6e5dbab66570 100644
--- a/dev-games/openscenegraph-openmw/metadata.xml
+++ b/dev-games/openscenegraph-openmw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-games/recastnavigation/Manifest b/dev-games/recastnavigation/Manifest
index 774a040d724e..4cfcc2d49e7f 100644
--- a/dev-games/recastnavigation/Manifest
+++ b/dev-games/recastnavigation/Manifest
@@ -1,4 +1,4 @@
 AUX recastnavigation-1.5.1_p20200511-install.patch 4029 BLAKE2B 7167a92f5763887f073110f04e0965745ff2114579d8a35c5c7c2480f3787aec3929f83b443e585852d268891fa279a91577a73b3bdebee0aee9c10a66afdd7f SHA512 da2c1bf75328729ef9679e2ac6cd9446b7b950ece6b6f343c0e015cc872c1e69e9fd27c9a6781a62cf6f8c845b82133d4df4ccefde8cbc3983258896d346ffc4
 DIST recastnavigation-1.5.1_p20200511.tar.gz 1541540 BLAKE2B 3878294247e26421c33019c05a8d70f9ae04ce046d1e503b2df8297e5c390c592e0222c445c9a7798c2e3eb7090b6c32d18b94015dce0a248ab17198d3054dda SHA512 bc48d9195c1ce4422359d850ad422e53c2599ff575b8c7a0ce6b7dc42720d7edd99781a1efa7bee49a00cd4ce6734f34ce9d434421471cb0cbf8e5207bbebebc
 EBUILD recastnavigation-1.5.1_p20200511.ebuild 811 BLAKE2B a5ba8c158dadc09cc59c53504d425696a2665fe5e529c05d833499c56f3f6abc78d1fa8cec56e5cad475934c676ff53510d771defd2d955878a8f2898dfca03b SHA512 0c9d9be8c118a5ee78b1d2429c52a2dcaf4249877518f714fe350d3b375ab37a622dd9723fdcdc989f0a13d9e244528b15bb2948508552886cbea82730ac38a0
-MISC metadata.xml 487 BLAKE2B f05f7dfccc42f908aa0d3e886bbe5a631e08d6e33babe10e1a5844cd48930c481873c843b8954926413334e8887c6d392412821ed173036a25349ae25afb8948 SHA512 54a6c615a69a2ba3e482e7ce37d556afa7bca8fa68cff67919aed151eb84ea38496a5a439c333ac1699db0085990f4a1d5ea221ec18997a7fcc93b9442d896d0
+MISC metadata.xml 517 BLAKE2B 68c09b23758cc20e24ca0789c5590ea6cad2089b2a7ddbc1d13193491cec83e45e986633bd0e20496a24354496a4414d0172c59aa2e7ee6d4786277f70f83401 SHA512 1a694f110c0e94aaef94b4cdeb9223707f10d51e9f171b95cc69d85ba22643c0046e945c0c4b1841f5425d352c6f49fc2bf45ecdbcbcad8ba99ecb1d8c214fe3
diff --git a/dev-games/recastnavigation/metadata.xml b/dev-games/recastnavigation/metadata.xml
index 476961fc1b94..9e15ea52e93d 100644
--- a/dev-games/recastnavigation/metadata.xml
+++ b/dev-games/recastnavigation/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 481da445b3d0..786eeae18fb5 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/act/Manifest b/dev-go/act/Manifest
new file mode 100644
index 000000000000..d59c0ccff292
--- /dev/null
+++ b/dev-go/act/Manifest
@@ -0,0 +1,3 @@
+DIST act-1.6.0.tar.gz 781572 BLAKE2B 04ac295b09d9ae5fd9f062637f07671009140988e42d00668174bdc07b09d3dea8df6064d597f03a64157f34d3a4f60df2a9d528eaaa60e2540cb51a421136ef SHA512 1a99b628eea87151e6efdafecc80aa590e679925d8e3c03251888b72bce3026de8149ad6111605bcae52ea5006a4ecfe97b4eb4e860d545c2b536475a67282e6
+EBUILD act-1.6.0.ebuild 1225 BLAKE2B 10b219d171188d67d98f89e06f28d82266e9d8941b132bcf6fff809a58ed9de565c7601ff30bd12f25c18ccfd0dd88cb8f95b6e47bb35ad5b117a25a67c73240 SHA512 070759d865fafa0dc0600bbad5ada938a61a0f95d1f2433f75e3001fa7ce4d7060fcc7424fd7281265b2d1b150120ec793ef91c694e67f1478e4eef9df49e120
+MISC metadata.xml 800 BLAKE2B 834a16f772f75b456cb8fbe14e04f0c8b87070e83904b7a9c834e61bdfc505b886dd1a4ff6d39b19c1665279140f3a4c228e9f9354a8907dcfc71f99f8512be5 SHA512 1acbed2581136c0bef40f2db7dbe33c91f92df54509fae7f3e3bd03067dc34e912860e8be7463f186fc52c91d7638e2a13da12b0a5bb8efa7615f71b0ee500ed
diff --git a/dev-go/act/act-1.6.0.ebuild b/dev-go/act/act-1.6.0.ebuild
new file mode 100644
index 000000000000..df33b4de346f
--- /dev/null
+++ b/dev-go/act/act-1.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base toolchain-funcs
+
+DESCRIPTION="Automated Component Toolkit code generator"
+HOMEPAGE="https://github.com/Autodesk/AutomaticComponentToolkit"
+SRC_URI="https://github.com/Autodesk/AutomaticComponentToolkit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/AutomaticComponentToolkit-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="strip test"
+
+# Package does not follow the usual go directory structure
+# Functions borrowed from dev-lang/go ebuild.
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*) echo 5;;
+		armv6*) echo 6;;
+		armv7*) echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+src_compile() {
+	export GOARCH=$(go_arch)
+	export GOOS=linux
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd "${S}"/Source || die
+	go build -x -o ../${PN} *.go || die
+}
+
+src_install() {
+	newbin "${S}"/${PN} ${PN}
+	einstalldocs
+	dodoc -r Documentation/.
+}
diff --git a/dev-go/act/metadata.xml b/dev-go/act/metadata.xml
new file mode 100644
index 000000000000..0430f3d0a6b0
--- /dev/null
+++ b/dev-go/act/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>
+  The Automatic Component Toolkit (ACT) is a code generator for a thin
+  C89-API, implementation stubs and language bindings for C, C++, Pascal,
+  Python3, Go, NodeJS, C#, based on an instance of an Interface Description
+  Language file.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Autodesk/AutomaticComponentToolkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index 94a994b5b13a..c0bbc90b1f9e 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -1,5 +1,3 @@
-DIST delve-1.3.0.tar.gz 7725559 BLAKE2B 4817536620ba86a0eefaaefe3249941f23e11ef66bab11c50847e021b3f86ca0d77bcead455fb4ecde5ca4d2753eb858b832109b0b2ab0a0902f24eb8dd21515 SHA512 9c7f543d855d3e27a16622a37ddf1ffc74f9abc06b34ec32d0202692def098e664e877f1c89ffe65683758dc43ed2cca350ba64e55c564920145323bb5e4ea13
 DIST delve-1.3.2.tar.gz 7732880 BLAKE2B dda40993beb553ed4e126547eadf2fcc14645a3e8f8d73032a6b75621d991d292d82b40a5da3435264af803dd081b9ebdfebfadae29caa5614d4b331340a38a4 SHA512 9a02c9e38e3ac824c257627a96d4184014db76c29851179df96edb2edf638e4f6ca055a392cbfa2a1bd36851d5ec24a9abe7983a9a1944f624b10cd5b392883c
-EBUILD delve-1.3.0.ebuild 583 BLAKE2B 0a79a9cd967a2cee4c90cf44309029c79a55ebbcf4ca463909587044cf6a9a6d2a44cad000a56aad8d181ca2b33651cc465b78fa490db660dbe084f02e6c37d2 SHA512 f2bf7db48a6c60ffba97203bcd2a6b52ab60992853fa3fca16da2813eedde79dcf682355af1dcb0bdb1db1429d8919f9f77d9614474875e70adc92866d5d957f
 EBUILD delve-1.3.2.ebuild 613 BLAKE2B 485f66c0fe75343ad126b073290209f89b445aa9ef3c3ba1527c3959cf3b82ce9f5dfda9dd62aef0531e28b5289db059116b83d5a388a427d3bf3d72cbce146f SHA512 f333acc96e35cde3efff089ddca5f965f7011055fafbd049ffd8ef1555f306d5aae5cd8389220f8881cb349b0e789d386d797f8c4f11d45abdfe89e029425110
 MISC metadata.xml 246 BLAKE2B 4f74c718f60100b9679ccbcc0bb5d9a7bd641cdb0fa6c00a9166e5ed7bfc6e9108fdc7c21f1854de6c07ca4f658cf6fa28be25cb79fe5fe4319191d449142d76 SHA512 5d0752d049bf50e6be717e6e39dfbf255446cf4dc51c08b69a43068a465d176554d163b4e94d8f5cce3430cd13555a58df780a3fff5e462ec5ef00b9c7e19f93
diff --git a/dev-go/delve/delve-1.3.0.ebuild b/dev-go/delve/delve-1.3.0.ebuild
deleted file mode 100644
index 41d537d305a6..000000000000
--- a/dev-go/delve/delve-1.3.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=7
-
-inherit go-module
-EGO_PN="github.com/go-delve/delve"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A source-level debugger for the Go programming language"
-HOMEPAGE="https://github.com/go-delve/delve"
-
-LICENSE="MIT BSD BSD-2 Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-src_compile() {
-	go build -ldflags="-X main.Build=${a3e884e}" -o "${S}/dlv" ./cmd/dlv || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin dlv
-}
diff --git a/dev-go/fuzzy/Manifest b/dev-go/fuzzy/Manifest
index cd89e14364d2..9d261d104473 100644
--- a/dev-go/fuzzy/Manifest
+++ b/dev-go/fuzzy/Manifest
@@ -2,4 +2,4 @@ DIST fuzzy-0.0.3.tar.gz 1931876 BLAKE2B e00c19a8b63f96e2fad8c2614409d8173cca758a
 DIST fuzzy-0.0.5.tar.gz 3352741 BLAKE2B df1239bbeae661519a1c0830eaa7000088bae737a46ea415fe9f8758dcb6977dae9eb7b8f661a678f7e588436a614f3edacd93e15741903514a6f9d8a6be1cc8 SHA512 39357e7adeb3e6fd1ec16c82f5b2a109c7a5218129d6c88486119aaed172c398f716d8fd83abf044c8833d6a06ee6a9114234f01e1f29d5974fe7b78ad9b84ea
 EBUILD fuzzy-0.0.3.ebuild 691 BLAKE2B b953df6cd31a9e1b28e4bc22c5a5c630aafb36287822cfcd6f799d3d012fe3f637df4d3bfbcf521726f836df833035a0e52493d5807d86d9a5f49388608dbb7b SHA512 0db8ad806f2b5b7d822e45256bd54d9a1a8637ee148988f21580b9120d0191880cc48ff54bc11c759ccce57ff666f69a64f54de7506996a39857c3ffb68fd22a
 EBUILD fuzzy-0.0.5.ebuild 612 BLAKE2B 05ee857529c90e6a374f1ff38a8e4bcfc6f44c84a5a8e047405a20bbd8406ac588f86a10a7bdd44aa1bd8d6442ad18ac01575d4588fea8b3feb6c9ed10199645 SHA512 51ede0fad5ef2bab999511336e615741f9ad710c4f21bff757926930f39318e2556c7adf2a8e8cf05903ae2ce9ac557537c9f45139b189ed8abbe616c882087b
-MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
+MISC metadata.xml 393 BLAKE2B 4e6384d199282453f5abaeb4b3fc89a44a3eae88d7084e6619c2ca3abb7162b476adfb9dfa938c20a24c84f879962455922082a9ee4765791531afd4b8366781 SHA512 610ff6d76acaee2a052ebe59b637f1baa26293b675683f4322d5364b0bb0a41294e654fa848eac866cf0e25788c72cb5d32fc1aba3bcfc5eb2275b4892a504fa
diff --git a/dev-go/fuzzy/metadata.xml b/dev-go/fuzzy/metadata.xml
index e8523f5eab18..efcefa58be0f 100644
--- a/dev-go/fuzzy/metadata.xml
+++ b/dev-go/fuzzy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@culot.org</email>
 		<name>Frederic Culot</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-go/go-bindata-assetfs/Manifest b/dev-go/go-bindata-assetfs/Manifest
index 0c86edb8dcff..8bd222404d83 100644
--- a/dev-go/go-bindata-assetfs/Manifest
+++ b/dev-go/go-bindata-assetfs/Manifest
@@ -1,3 +1,3 @@
 DIST go-bindata-assetfs-1.0.0_p20180223.tar.gz 3984 BLAKE2B 5493fd7546df6fad162cbf51f49ebec382bc39feea8b6ad9849113f3c65186423387b3db59ef376d0b3fddbf00d30bac272f982c526f0bce80aa98e5460d4864 SHA512 24fb9d55efb781b40b2caac01c7bed053321846b2f38ea317146bc87c008ef8e0c5b849011d856420e500caba655f1993abc6d0a398debb1b8a3ffbdd0d2238b
 EBUILD go-bindata-assetfs-1.0.0_p20180223.ebuild 640 BLAKE2B 7fb413676f3d4864ebe3aa85eb1ebf7a4eb4e5a6e886ad4e367595e3f682451a6bf15b3ed652e58afac6b23cedae9eb6923f1997d2b38804b69074e24958455d SHA512 a1ca611d8ae3e2daa4f0980b873563caf9fb71ee4474cb777ed072e21afd72106cd115538885ddf7eb81ebab3b1431bdce89a7903606d6e836e79357eec828a2
-MISC metadata.xml 258 BLAKE2B 27bb554801679826c9f8b158fa3c911f946510ddc3085a0bf73a624e405d51ab19393066caa38a08f216e338c14eaaa278a1e775be10ad855a4d100308455c3e SHA512 55c43f39e49f4eb0e2874caeeec6fe3a3fa494c9882f8cd9de50d5b050963ffecc586bc17d21fa126b762910475d615e287521ba36c2fb58d124ffd45225b773
+MISC metadata.xml 258 BLAKE2B deb8fa05231de1626bf2eb9c4cf632e676ecc07acfd01d094150f6651fc87f7e3f745da1aa92bcbdb437c45bc535c28341115c603e52cd3bc836b887fa0614d3 SHA512 ccf651158cb380c694a30a9b91314fb12a53fc0724998757bac38f78ab7b59948a680d1e955484bc43749990c2fb9d0a8a6d4553204060ce030abc6e04a4762f
diff --git a/dev-go/go-bindata-assetfs/metadata.xml b/dev-go/go-bindata-assetfs/metadata.xml
index 636a399825db..b7c76dc00396 100644
--- a/dev-go/go-bindata-assetfs/metadata.xml
+++ b/dev-go/go-bindata-assetfs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index 1cdb9c29e6f4..e5cadd346607 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -13,4 +13,4 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.zip 2908295 BLAKE2B 2dd707c5fcea8b16c24aa85c6ed98c0cdd26440a04a3f4c61d55e315f1959e133af3644dd7b0480c007367806e56b64e2a80f0680551d77c57b84f8a810725e8 SHA512 4f1931e839f7ccbdefde629b5ace77a463104179b58818963eebe42548185b5c8597c0632735ec25a6d0eccf85d8294eabcededcfda12b29bd21c4fc7e84aad5
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 EBUILD go-bindata-3.1.3.ebuild 1340 BLAKE2B 41a6b1cdd94293bb182aca748cd2f7c9e9771b0f7891ee8b4bcba3541852d0c468deb26d3851191c56a6bd750a7ff4c4c32e1941a5bf5fe23feeb4f7c296d2cc SHA512 ff58702b0615d2f856a7a6512702eb9fbd6822548818af4156a37dc44a6f640f39c4ef73c3f1eb0a2d903b6ba087c00552848f3e2f88b2544a4c5ab2395f4243
-MISC metadata.xml 253 BLAKE2B 65983c8bfa504f4890227be1904125e2107ad2592b39169c5491c1b91a2681c42105593bbe561ea347b29a382f5a5eaf485dc1feea655609971e2792d35d091b SHA512 bc868f73cd0d9b3206bdfc50fa43ca5c209a9af62d16316b274b78d4caecdacf16305dc1b6ef99ec87e22daa596a51b31ff1b46d89b2739e40a487378ae1cc0c
+MISC metadata.xml 253 BLAKE2B da35ee4f03aa6500f5dc5f920ca282060af2a1a2b6eb65d95246b1fcd54a3743b8e7a2978ac32f42a9321ad0a78728d07f81f393cb86bd2d1786a779cdcb44ad SHA512 5b0fc265a3f2512f8ea73d43a8365d93055b1d94fd3dc6975162be7c0bca5ec8595fe8d1440aec68e6df266fc125c29ef6a356539e144c3e1529bc285943911e
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 3477a0700af7..4e02b461d240 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-go/go-licenses/Manifest b/dev-go/go-licenses/Manifest
index 3ebac1d09e91..873de7dadacc 100644
--- a/dev-go/go-licenses/Manifest
+++ b/dev-go/go-licenses/Manifest
@@ -129,4 +129,4 @@ DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.zip 4950 BLAKE2B 35fad8c7c0a1de9e47bc5
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 EBUILD go-licenses-0_pre20200511.ebuild 7899 BLAKE2B 8a0c06c20ab6bd6661870e5e9f6a7af107af09091c7248822b14bf92a4d44082352e8a09dafb54a59198b9f38b93ee4b412c8a553d216344a1c897eafa8c3568 SHA512 b2c932802d84518fdb1956edd821b572daf78b3159f6213ef938a06a34c61025b0db02831dd4c70d0037fd2c0305e6df0731d491d1fd8c990bd73ed18e50ccb9
 EBUILD go-licenses-9999.ebuild 7899 BLAKE2B 8a0c06c20ab6bd6661870e5e9f6a7af107af09091c7248822b14bf92a4d44082352e8a09dafb54a59198b9f38b93ee4b412c8a553d216344a1c897eafa8c3568 SHA512 b2c932802d84518fdb1956edd821b572daf78b3159f6213ef938a06a34c61025b0db02831dd4c70d0037fd2c0305e6df0731d491d1fd8c990bd73ed18e50ccb9
-MISC metadata.xml 837 BLAKE2B 3acd1d863a842585f1cb217bb800df2258a248f5df4b2cccf6baacc8b1279d08355a2093f80bc1f9b0b517800898626797aac9bb0ffc71d31207283e8a8b74ff SHA512 3ad4ef65083c75df69629f582b018d9c3cbbf8f9e34452f77c92ab7f2c41830642175410037b75226754d4be93c3bbf4d5f4897604ec11148f6c5629e104f3a5
+MISC metadata.xml 867 BLAKE2B f0d0363bd8e611e4be122d2883f090c2ffb5600c7d58897cf623de6d67e97efbb197236cf9adf51854dce7b5ae6cd4fb1a1dee1b3d57f2fa8c1039ea08d9434d SHA512 27f4ae03a4b6477e7c104ec1b1400dc5575629d006abf7ffd0f07e9074e45ae6b71ccea994e02e44ea0b5658675d5b6eb4a925116b36c115067ec53f6226006c
diff --git a/dev-go/go-licenses/metadata.xml b/dev-go/go-licenses/metadata.xml
index f88e2310ea0b..76c1f8bb2967 100644
--- a/dev-go/go-licenses/metadata.xml
+++ b/dev-go/go-licenses/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kpp+gentoo@qrator.net</email>
     <name>Konstantin Ignatov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-go/golint/Manifest b/dev-go/golint/Manifest
index ccf5fc033ff5..5f9fbf94b6eb 100644
--- a/dev-go/golint/Manifest
+++ b/dev-go/golint/Manifest
@@ -12,4 +12,4 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.zip 293135
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golint-0_pre20200301.tar.gz 31870 BLAKE2B 54fd5d0c8c490c95f397ce7889a696726a57e83b350e2133724d80d8500a7d3b2427e3fa24bc28d82c8b4ca32fb9c4e45ec8021fe6f499e320c8194bb113f229 SHA512 d62a20f02006d6e69391f5758ed1f3fe2c81a44e782d6a5530c6feacd9b1547168ae9401f84c92ff4adfcbda32d97049cd7afe47b00ee91ec50bc850c8ca9462
 EBUILD golint-0_pre20200301.ebuild 1380 BLAKE2B fefd53f5fc4f154f8b2f54366dffe84f9add5691e24b77e94a4cd0db1e9ec8b628902537b427a3a4802bffa3eb6b2581a353731d35424e0abb6b0185ae4b6919 SHA512 0b1e827cb61e251cf63a9c54f831d666533de1e119c5649de1d9b5ebc247775f8c116c3aacb89a0ec8a16d216d5da3d4af7ba0c0c4ebc20f78d9fdc0906567d3
-MISC metadata.xml 324 BLAKE2B 66f4944a9c30a65ccf8a89b90f5d5150165a936daa0f39f74fa5e5de9348288df31bcff94cd61bcc67fbdccbc0ceffa4c2a8cec00d2a1a2ca3621a0bf9b09e24 SHA512 69b45d514c5f5f336495087dc1e1343594596155307671e9c05c6a95f063362b21a5392a59d038bcbbfc6e4e071f015475fbc573d63824381f22425a1c0579f3
+MISC metadata.xml 324 BLAKE2B f0143b449fe5a8efbda936d01956fb44920b4508246e87737170f8394c7df5ff685f3c2b1a2891bc29bb894eb375915de81c5d607451165e3a871c7f8956a2f0 SHA512 e1eeae8ad7a10003149c72ca4f3c66d3d078d7c10f699916386b7fb5769d14fe569bf9f49db1189e64f5073ce5ba4aecf5dfb461f7d92ca084e13c9f1de62021
diff --git a/dev-go/golint/metadata.xml b/dev-go/golint/metadata.xml
index 68d0b04fab18..4d2fb8e97ddf 100644
--- a/dev-go/golint/metadata.xml
+++ b/dev-go/golint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-go/goversion/Manifest b/dev-go/goversion/Manifest
index 79bb4fa393b4..31ad1cb6beb1 100644
--- a/dev-go/goversion/Manifest
+++ b/dev-go/goversion/Manifest
@@ -1,3 +1,3 @@
 DIST goversion-1.2.0.tar.gz 8586 BLAKE2B 76001c1ebbf55bf742a20f7434d7b28da3aaa8e24e2cb6d14c182192735d16184aabbfc47aedb5872ed2610c81c4e6d637f425597cebaacbbd7095f18cd715f4 SHA512 27a8ebe71679c9161556c8aa49356c2da54c7e7b3bf580aa18518e49bb919ea836a9958ae9fc8fdc86c3750afc900d6e1c17d87dea406366467a6ea9c8ed8931
 EBUILD goversion-1.2.0.ebuild 668 BLAKE2B add958badbe000255239501c3d772742b4de8eac1f0ae855becd01c37f2621ffa011b4c763072813855a84101a40bb8087cbc10e41212128d8593229daa332df SHA512 5e29999f85b32534e8cee9a0bd439e1ec37a745826f4e603c177470b2f36a1419b19aa349e630eccfd8c694a644edc9c6a9d5d9fc162f3b4ea693dec062d66ea
-MISC metadata.xml 245 BLAKE2B 73fc0cc6b32fc3f2379f13578cfa9671488441e7e66253a9079162b351264b19a5ea6dcbe0e6d8116f4dc5cdf686677b1433f7e1bb2b8419fb8bf9d73dc24a84 SHA512 a3440d271add0812db6ea485ffe15b7c8486a1c580d2f6c056be7610f3f09bd6f7ae06ce42ca4fd2344a3de4434b3ed24b3840b955b18fd6aee42d69e9bd5248
+MISC metadata.xml 245 BLAKE2B 8af34553c700e6092c02d976417dec17febd9ae99e7e1558f7e9cf38389dea42ab8ebbc26773c5ca24f86cce914c2548905eea5a146c6827f12badea5228c3e8 SHA512 56e59098e0235217363247d62bcd66027174ca1c460892e4a1374dedd9567d55f5d554e99aba8ff6242d36a35d2f0ebad00d90cf2bb20bc8f6dcf93a771a11d8
diff --git a/dev-go/goversion/metadata.xml b/dev-go/goversion/metadata.xml
index 22a97633bb63..63140784929f 100644
--- a/dev-go/goversion/metadata.xml
+++ b/dev-go/goversion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-go/licenseclassifier/Manifest b/dev-go/licenseclassifier/Manifest
index 7f864485d318..dd86cc9e7bac 100644
--- a/dev-go/licenseclassifier/Manifest
+++ b/dev-go/licenseclassifier/Manifest
@@ -12,4 +12,4 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e
 DIST licenseclassifier-0_pre20200402.tar.gz 6703094 BLAKE2B c68dc92e593aeb71b1a3ae0a938d659ecb72a870025ac900587e62b1f9923e6e6b9356efc3ff7bd7b085ce01fc0c65f51ee7d0aec683cc2605d56a5da075021e SHA512 e376be738bbbc9e6d3df495c9967ab198836c6ac80d1c658a4ff44a261e495b0bc0aca0b559477f80b6f433a6867c7ec6b1937d76133bd1fef0a3e9b15c8173b
 EBUILD licenseclassifier-0_pre20200402.ebuild 2067 BLAKE2B 7c4a626b69ca45d9e304ea703fcdfb8ae15fe8f6ab9c501496278dce93574b2f2b0486dd5c85db261725c628fa255a43d224f570e85fa9ee7dd4c3affc2357bc SHA512 90dfc54d14dc1fc57cdda058b1f74251bdf5929a79c55b85274c5ea920ac08eb660d893e3d49ed25a9799e9409c35a9872c9f71b52bb1fecf7085f2bf922da49
 EBUILD licenseclassifier-9999.ebuild 2068 BLAKE2B 7de81cfc8973b91137d9444c741713b0c405b173e4ba4669da5f3cc8ac606d5d007e0138730b4c9b2c0290fb6e94dcf667090b31adba9bbc7ce386635d65a660 SHA512 7f2aa68df63203402553d9bf91b4206b1ccdf80be392daa7b88019bcf92eae87e154aecd98f456ff6e097542e6600c2994c1dfd229d6c9fabfceb6eb452ac1c1
-MISC metadata.xml 892 BLAKE2B bd627e3945da13a1a610fe69aef2d86d033254c63e8f117b4ba69e6b5f4cbc2a81bf6ceb4118686dd4ebfc1c8741655ca4c180c823ac533f3b6a3ddf505f5925 SHA512 961b28443d11dc4d06b1eac034c3be1a32f099454e2dcc44cb939a0128e7a4fd0827ab715e9316549fbc56ff3d281bdd8dc00b3136c9871f3c844bc5f16c75eb
+MISC metadata.xml 922 BLAKE2B 6dd96ac59491fc10729ac83a41a6d04a829cde466a85df283668f906276bf2018de840380295b23187a0f1c609a3633c8509d20955fc4f04bf7993e4624710b5 SHA512 aa4756978120210c3258090db579b9afabe5dc766e6499de2ac95d183ab91acadcb4aec9e6036c2e9711a4078591afd9b5740f8106c4226e1b05217397709e0f
diff --git a/dev-go/licenseclassifier/metadata.xml b/dev-go/licenseclassifier/metadata.xml
index 36c5ed7ae5ec..db5731f840af 100644
--- a/dev-go/licenseclassifier/metadata.xml
+++ b/dev-go/licenseclassifier/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kpp+gentoo@qrator.net</email>
     <name>Konstantin Ignatov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-go/qt/Manifest b/dev-go/qt/Manifest
index 4a4c8be4f6d7..fd269a64a600 100644
--- a/dev-go/qt/Manifest
+++ b/dev-go/qt/Manifest
@@ -1,4 +1,3 @@
-AUX qt-0_pre20200904-disable_modules.patch 2450 BLAKE2B bf0824e2c01d385695e5d251aba8c5ccee47e9f87587088f83771e0a41f03190007e4fc273481e2dc6033643aecb6fdbf6375bd81a53043722c3e96aae19a2c0 SHA512 dfedc9247dd3526561a3409d434ae93bcfb11599ff4bb4c8e8d5f86b8c327b8b8d6626183f17744bff50dee873e4c43434e5ca89f8b1c7ba243bc765d827f786
 AUX qt-0_pre20200904-r1-disable_modules.patch 2394 BLAKE2B e0416492952a4ea211f86612fe6e20da30b0a1cfeb7fa7c1a280abbf15d280eeb6f8a6bdf5e14a91408c94abfcac0aee9ecf168e071be8e0ff6b1650a8f7117b SHA512 a5039170e6a4fe962477f338445a6385bcbc8aa192d3f76401f9f3ea8b143d5b397ac58da9247247f0921285c9a7029579803285fcfb6b306663b7a97b9ac9e8
 AUX qt-0_pre20200904-r1-go.mod 871 BLAKE2B a617826e6a90e8d9ae7e3d1fe134f63fc2e0db8be1bb2b156c3e1022b22008700655e0fb1a8792ae88955b3081339751739f18477c74f1fa1aab69cfaccaf5d4 SHA512 e11275b2323b2e6d3b753cea4037e59fdcdd060be80c90ed5cffbec0bf85f49deb45b72f79cddae96da3bbc1c320bdf56e5fba3cf93fa5fc67359570ccfc2c56
 AUX qt-0_pre20200904-r1-go.sum 2496 BLAKE2B 31fb8c8729d557a11eb2606554dd62df1a08a41543aabfc25c896e8ad4132c0b5f4727a99f105bad0d9991a6c1f11a1dee2defb4110aab4cba1726ef4c6afc16 SHA512 8facd9066f928adc3d143928b0c23c4c3c63dc2cd40a2eb9f776f262d9c257a8a4e6f9fb9a1e075b7eecee85787722e7ab04fffec4294ed840debb2934d29440
@@ -28,24 +27,6 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70
 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-davecgh-go-spew-v1.1.0.tar.gz 42337 BLAKE2B 691ee430beca602ea686aa065b23af5e00356e866cbca2b014bf0c8f4cc965a2318e6a39232772098e250d61d5bd6707afb769fdf4223c81a8249cad267d1971 SHA512 20c9f0550a2d5030265dde8ad3ed009ce5c6490d010f184ad3f656b8fe5eb6e5c6abc9594408240aa731c0977afd9739d293490e6164cc0ce156652611b05b39
-DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
-DIST github.com-golang-crypto-df01cb2cc480.tar.gz 1678929 BLAKE2B 1f803bbce58260aa5d57d63841999b33cfe27866bf762dfb10510b1f7e9448afa83afc7861786dd83416cfce3ed820cff8c6be5ec15c1cce6caea9656014891a SHA512 d2ccc27b8a239a8bd48af49763d6a2123d95c2db6ae0d818802c5d70c66d7ec39e4294e282ed9dc3874e48126bc26f4997dc85626cd9a51739a1854c37ac58b5
-DIST github.com-golang-net-afa5a82059c6.tar.gz 978660 BLAKE2B 35d7f0a63ebb3f00c77236ff886c485caf792cbfda70378814e3250e500df7192aadd2258a4c3a3151956f3ea2f7695cf5fb7225fdbe5ed2564b18130a70f066 SHA512 4e0a9aa0e1cc612b9f662a5cd1106e1daba65cadef345b3221b9210ed5251727f2cce3126ac7cbaf9105b2929e04a3938da2402a49e767d5b00f8ccac7826e2a
-DIST github.com-golang-sys-e8e3143a4f4a.tar.gz 1353192 BLAKE2B f6506d74ca44953839468a81ce40c4b3a686f5361819cd9218858d61235d44bc8c4fa9d62f2873aa39fc15c6946b2fc097f8d41d88a66be9684e30114a5debc0 SHA512 2cd3f41a05e749c868f4cf81aba68876a23ac89e73f91e19bb084e40aac6c5df8d900502362a43f0832740a89ae8f0003df09d8b933edb5fb6da5e8092c6b75e
-DIST github.com-golang-text-f4905fbd45b6.tar.gz 6595858 BLAKE2B 8209515bae60d8b465881678fb2bd65fa84683001c2d97ea872f33f3a12ccd6fcc063c6a2e085f9e0e10d702f6e0ad327524b840b1ace749244d48e95495db95 SHA512 fba082d8f80250fa058cd144bd9eabd3ea3ef0d3d53d231e288e9cc218b2e6d95e5e170381f01a1c5c0220cdd406dbe4e21a5aaceda8e3fd54f28e3e086603b1
-DIST github.com-golang-tools-aa740d480789.tar.gz 2081304 BLAKE2B 735b69e0a0ff9db74e1d0ce528a29141f4adf5f15433e578e043f2fcabc309425248f956a753efbda864c988729fafce66c54657492f6e7a117d8ea673ae2b55 SHA512 bd83fa44078ee3d9d889d8e3d9ac92ee1165fef6cb999f33b8cbd8e43ef04404d2aaa9d0989a23df621f74325833f85e29e876b72faed26116acf792be47a00d
-DIST github.com-gopherjs-gopherjs-bd77b112433e.tar.gz 221699 BLAKE2B 99714586d93fd3d85c6baf65eef7411a9e8e70d3f57a06381c165f2b013c97a1cdd2d7b733faec79b7f3c29f3ee493c6b7f73df2bd067a452e58a60c3db2ea5d SHA512 d468dbac7a993322d4602689d0407af25c44691853d3845b2edbd291200fe74babc3e7a8b811390f6e2a3ce4ca6a8bafa668be20ffc6322b64ec95e6a2416cc3
-DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz 1909 BLAKE2B edc8dc8f9a9c27d724b98614c2d937f5fed94977c1590f542cb1c8724478a63bba61cd6569fc7daed1e870bc59fc5ca0f5acd501f58e7c93e5c69517c9ca80ac SHA512 8c781a4c17df20623b8ab5af9757fedf6fae9362c10f195eaaeb821a0520ab9407de30607fb085a38a04915eb180bb8d5c4940f91db4fca7ce1cf69a8276bbe7
-DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.2.tar.gz 1987 BLAKE2B 7dfa1ce4e84b4a6c49676b58d76071b0e82c0cd65cb066ea82bb424740278a34efa53f76d165e3c93a76724115700b7265bb9f73b9ae1907e71fcd97c29663c5 SHA512 25d32f73ca5c7f6fe12037d4ff406264093a36508100fb647864dbe465fc81a7f534beaf4fd9f8b17d299bb1e992d0d37511e92b7e39c8d4ba4176877a20225a
-DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
-DIST github.com-sirupsen-logrus-v1.4.1.tar.gz 40811 BLAKE2B cde067ff74800153f555e3f9f00021d4cd9d11adadfa6df6b3da0cf86cc7a8cf7137e5d8e12adc7fdfd45022e9dc0c309a6e23ec4b50d9b9cfc37d73038e21b9 SHA512 7e8e215abb0a7909602378caf8ad746b73f3097b56d2ffd81fc7fb4c9a6b68dd8be25ad452cb19b02d7129e0abbb1e29aca51d91a9421ecdec711abcb97da268
-DIST github.com-stretchr-objx-v0.1.0.tar.gz 109451 BLAKE2B 4283e5260eac80654b310c02660973644f2f8a4520e8ff4f58d34c0be34938ab7da2a56a807d0661f66c322555277e10f43a2d4cefdc282fcc54fe97a9ebbff4 SHA512 206d0c5cb6b4879d3eafeacfae6d0bd9e6f2372eb3e48d62fc57e4f6b0680253b70326ee1d68d55024a1b8c6ffa8a0007eaff91dd3a75ff7096ac8b885889bf9
-DIST github.com-stretchr-objx-v0.1.1.tar.gz 75768 BLAKE2B a394114d3d4d7d1a7fabd3f4b4e0a1722df8f1332685d1fdfff9662a7077ac43f5d6e5cd5f360fc47a9ca0852a81574f050e41a089ef40052c14311dc4fc3e90 SHA512 1db9240a7f4c1f34788418abe60bf566823d4881f5224eae9ba6cbf31e65177ef9f5f94b42fca2151bd0111a69b42f1fa6d5ec317955a32463199d4bd6d86b75
-DIST github.com-stretchr-objx-v0.2.0.tar.gz 79981 BLAKE2B 142269aa50602af8a00dd5f9acb0c85d3287c3d1fbfd953675c6023e597dad88462560ad02d3d20671fa1f3c89fdf66e46a94015e5c492287fb4973beb84d2c8 SHA512 d2b9b907c33b52e6ae5ef58280b3e8b2aa03bb7fe055275850cbe95ed4c62663867abe6ad7a5790ee10ecfab9c0cc7cbcefea1d3971454c02fb198c792402b36
-DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed
-DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 DIST qt-0_pre20200904.tar.gz 125636107 BLAKE2B 1b9878e5f48a46b0d53610741c58356197c00897f1ea815376638008b6931a8f5a608b52cc45df40c4274e78edc8ebafba568a65740c4851c980935ef3986d77 SHA512 0e5ffa3662e92331dc0438bda09127eed186180570046c919ff5a33ed9ad3124a51279bbbe08fafe685f3fd5b0c61dc94ae217e2699a8ebcb24f4cd796c85b1a
 EBUILD qt-0_pre20200904-r1.ebuild 4286 BLAKE2B a40f476d0d89346e9e87608a572b23d5212824ec11b5d96b524de666b910a65932fa0395f4afbb9a9988f3d0225c79fba5cd5dd3eb544e9e1779c3ff3b97ec9e SHA512 1e44abe6e68007800a9e34e423a6e19dde8c82eb90b1602d6b3e47bb2af7315dea578f43feb0e35cf72f6ecbab063c767af3770cb67f830c46ea97a8bc3d6845
-EBUILD qt-0_pre20200904.ebuild 3385 BLAKE2B 6cfc1e82ed2f19e62bdda4841a678a523945d6ea73fab95090251fafadb8b0441f27c7ac2db4c991e17d2dba7d604e9cb145b07aa7344071d93e0103adda24b2 SHA512 458dc18cb6395a6bb1cfe139e70f16260c34a1f3e70e6024954c2490b3511c36fabef94a227e3cc57ec6f693308f0c7cd94fc344c4a80b5d54fe50b2e97b4709
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/dev-go/qt/files/qt-0_pre20200904-disable_modules.patch b/dev-go/qt/files/qt-0_pre20200904-disable_modules.patch
deleted file mode 100644
index 79ebd7ec1ddd..000000000000
--- a/dev-go/qt/files/qt-0_pre20200904-disable_modules.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-We cannot generate bindings for Nfc or RemoteObjects because they
-haven't been packaged for Gentoo yet. On the other hand, the modules:
-Script, ScriptTools and XmlPatterns have long since been deprecated.
-
---- a/src/github.com/therecipe/qt/internal/binding/parser/helper.go
-+++ b/src/github.com/therecipe/qt/internal/binding/parser/helper.go
-@@ -191,10 +191,8 @@
- 	"AndroidExtras": {"Core"},
- 	"Gui":           {"Widgets", "Core"}, //Widgets
- 	"Network":       {"Core"},
--	"Xml":           {"XmlPatterns", "Core"}, //XmlPatterns
-+	"Xml":           {"Core"}, //XmlPatterns
- 	"DBus":          {"Core"},
--	"Nfc":           {"Core"},
--	"Script":        {"Core"},
- 	"Sensors":       {"Core"},
- 	"Positioning":   {"Core"},
- 	"Widgets":       {"Gui", "Core"},
-@@ -202,7 +200,6 @@
- 	"MacExtras":     {"Gui", "Core"},
- 	"Qml":           {"Network", "Core"},
- 	"WebSockets":    {"Network", "Core"},
--	"XmlPatterns":   {"Network", "Core"},
- 	"Bluetooth":     {"Core"},
- 	"WebChannel":    {"Network", "Qml", "Core"}, //Network (needed for static linking ios)
- 	"Svg":           {"Widgets", "Gui", "Core"},
-@@ -210,7 +207,6 @@
- 	"Quick":         {"QuickWidgets", "Widgets", "Network", "Qml", "Gui", "Core"}, //QuickWidgets, Widgets, Network (needed for static linking ios)
- 	"Help":          {"Sql", "Network", "Widgets", "Gui", "Core"},                 //Sql + CLucene + Network (needed for static linking ios)
- 	"Location":      {"Positioning", "Quick", "Gui", "Core"},
--	"ScriptTools":   {"Script", "Widgets", "Core"}, //Script, Widgets
- 	"UiTools":       {"Widgets", "Gui", "Core"},
- 	"X11Extras":     {"Gui", "Core"},
- 	"WinExtras":     {"Widgets", "Gui", "Core"},
-@@ -237,7 +233,6 @@
- 	"WebView":  {"Core"},
- 
- 	"NetworkAuth":   {"Network", "Gui", "Core"},
--	"RemoteObjects": {"Network", "Core"},
- 
- 	"WebKit": {"WebKitWidgets", "Multimedia", "Positioning", "Widgets", "Sql", "Network", "Gui", "Sensors", "Core"},
- 
-@@ -389,8 +384,6 @@
- 		"Network",
- 		"Xml",
- 		"DBus",
--		"Nfc",
--		"Script", //depreached (planned) in 5.6
- 		"Sensors",
- 		"Positioning",
- 		"Widgets",
-@@ -398,7 +391,6 @@
- 		"MacExtras",
- 		"Qml",
- 		"WebSockets",
--		"XmlPatterns",
- 		"Bluetooth",
- 		"WebChannel",
- 		"Svg",
-@@ -406,7 +398,6 @@
- 		"Quick",
- 		"Help",
- 		"Location",
--		"ScriptTools", //depreached (planned) in 5.6
- 		"UiTools",
- 		//"X11Extras", //TODO:
- 		"WinExtras",
-@@ -433,7 +424,6 @@
- 		"WebView",
- 
- 		//"NetworkAuth", //TODO:
--		"RemoteObjects",
- 
- 		"WebKit",
- 
diff --git a/dev-go/qt/qt-0_pre20200904.ebuild b/dev-go/qt/qt-0_pre20200904.ebuild
deleted file mode 100644
index bcc7f72e1a9e..000000000000
--- a/dev-go/qt/qt-0_pre20200904.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/therecipe/qt"
-EGO_VENDOR=(
-	"github.com/davecgh/go-spew v1.1.0"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/gopherjs/gopherjs bd77b112433e"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/sirupsen/logrus v1.4.1"
-	"github.com/stretchr/objx v0.1.0"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.2.0"
-	"github.com/stretchr/testify v1.2.2"
-	"github.com/stretchr/testify v1.3.0"
-	"golang.org/x/crypto df01cb2cc480 github.com/golang/crypto"
-	"golang.org/x/net afa5a82059c6 github.com/golang/net"
-	"golang.org/x/sys e8e3143a4f4a github.com/golang/sys"
-	"golang.org/x/sys e8e3143a4f4a github.com/golang/sys"
-	"golang.org/x/text f4905fbd45b6 github.com/golang/text"
-	"golang.org/x/tools aa740d480789 github.com/golang/tools"
-)
-
-inherit golang-vcs-snapshot xdg-utils
-
-EGIT_COMMIT="c0c124a5770d357908f16fa57e0aa0ec6ccd3f91"
-
-DESCRIPTION="Qt5 Go bindings"
-HOMEPAGE="https://github.com/therecipe/qt/"
-SRC_URI="https://github.com/therecipe/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# As of 2021-01-20 the test 'widgets/textedit' calls methods which do not exist, at least in qt-5.15.
-# TODO: figure out how to disable this test.
-RESTRICT="test"
-
-# We need qt-docs[html] because binding generation depends on core .index files
-# installed by this USE flag.
-RDEPEND="dev-qt/designer:5=
-	dev-qt/qt-docs:5=[html]
-	dev-qt/qtbluetooth:5=
-	dev-qt/qtcharts:5=
-	dev-qt/qtcore:5=
-	dev-qt/qtdatavis3d:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgamepad:5=
-	dev-qt/qthelp:5=
-	dev-qt/qtlocation:5=
-	dev-qt/qtmultimedia:5=[widgets]
-	dev-qt/qtpositioning:5=
-	dev-qt/qtquickcontrols2:5=
-	dev-qt/qtscxml:5=
-	dev-qt/qtsensors:5=
-	dev-qt/qtserialbus:5=
-	dev-qt/qtserialport:5=
-	dev-qt/qtspeech:5=
-	dev-qt/qtsql:5=
-	dev-qt/qtsvg:5=
-	dev-qt/qtvirtualkeyboard:5=
-	dev-qt/qtwebchannel:5=
-	dev-qt/qtwebengine:5=
-	dev-qt/qtwebsockets:5=
-	dev-qt/qtwebview:5=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_pre20200904-disable_modules.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	default
-}
-
-src_configure() {
-	export GOPATH="${WORKDIR}"/${P}
-	export QT_PKG_CONFIG=true
-	export QT_DOC_DIR="${EPREFIX}/usr/share/qt5-doc"
-}
-
-src_compile() {
-	# Not a typo, all that gets installed here is the bootstrap for generating
-	# and building actual bindings
-	go install -v -work -x -tags=no_env ${EGO_PN}/cmd/... || die
-
-	"${GOPATH}"/bin/qtsetup -failfast -test=false || die
-}
-
-src_test() {
-	"${GOPATH}"/bin/qtsetup -failfast test || die
-}
-
-src_install() {
-	# Just in case
-	unset GOPATH
-
-	rm -rf src/${EGO_PN}/vendor
-	rm -rf src/${EGO_PN}/.git*
-	find src/${EGO_PN}/internal/examples -type d -name deploy -exec rm -rf {} \;
-	find src/${EGO_PN} -name '*.c' -exec rm -f {} \;
-	find src/${EGO_PN} -name '*.h' -exec rm -f {} \;
-
-	insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
-	doins -r src/${EGO_PN%/*}
-
-	insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
-	doins -r pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
-
-	# Not sure if we still need qtsetup - but just in case, install all binaries
-	exeinto "$(get_golibdir)"/bin
-	doexe bin/*
-}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index c3cb2a5193ea..01c8da02bea8 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/ac-ppm/Manifest b/dev-haskell/ac-ppm/Manifest
index 3f4e9fa388bb..789bb9f36675 100644
--- a/dev-haskell/ac-ppm/Manifest
+++ b/dev-haskell/ac-ppm/Manifest
@@ -1,3 +1,3 @@
 DIST AC-PPM-1.1.1.tar.gz 2958 BLAKE2B c2d5c96eebde31a45d8bd3c956687d01fc0c56906b841816bfcc80912831324fde0ccbb67f7aff99fc3efe4797fafcec554cd2599806168c9ea8c975d6f1eb0f SHA512 c296cb02fa9d70ca1f75bfdda8e307f66c800ac0e7b110bdd4af685c6acc506f3310456519d2445f850263baa22aa317266c68166bfcb551d297296d8c4de5ef
 EBUILD ac-ppm-1.1.1.ebuild 610 BLAKE2B 107593986434a69bbac726cb15bb732c8f160c6c12511f3c6ddbdbe3d1bef8ca5733c816d6f69bf9002a116af92d36a46b054dd3fbf546db7f823cc1292aaa75 SHA512 3d4bc3b1cfcfab4d4dd5bffb55bd9bc16750fd7b79affd7a77273977f11a48e9b3257f1c5031a059a2539d577ea1a9a0c2a371cf7b90ccbd9c01a8af4cc12077
-MISC metadata.xml 853 BLAKE2B 9e8a3c9d7ef69ba49739ae4e0befd08b0746eae2413064381c08b23a987e72cbc3f39ff44f1e1901675da0a868d7c41db25c2cd79aa8510ac2da2087558934eb SHA512 cc3e811eedb17c5d16bc84fcb4674fa2d21de42f8b6adec9c92a529664c44b6801a60b994bdb74cfb3ee21afaa167bf7549c8dab010004399e87c356e5ccc9d0
+MISC metadata.xml 839 BLAKE2B 3d41aedb7aa9fd730e6f6487065544a0a28fd24b2c6d110730ef87bbcddf1f017c4eae5b5827ac05aeb63db5c1103bae9d147aad91f6766f166c40c357f11cea SHA512 ee2d3abcd9ed48d8dd04a0d67c00ea06221c52003348e66eef50909f5c809104d6a1d0315e48a86f249eef52cb8845fff1763cc7607bb4079792bf176deb16f4
diff --git a/dev-haskell/ac-ppm/metadata.xml b/dev-haskell/ac-ppm/metadata.xml
index 435999615a27..6eebf314be89 100644
--- a/dev-haskell/ac-ppm/metadata.xml
+++ b/dev-haskell/ac-ppm/metadata.xml
@@ -7,10 +7,10 @@
 	</maintainer>
 	<longdescription>
 		This package is written in 100% Haskell and enables you to
-		write PPM (\&quot;Portable Pixel Map\&quot;) images in human-readable
+		write PPM (\"Portable Pixel Map\") images in human-readable
 		text format as well as the more efficient binary format.
 		It uses the ByteString library for maximum efficiency.
-		For those that don&#39;t know, PPM is an image file format
+		For those that don't know, PPM is an image file format
 		which is trivially simple, but therefore horribly inefficient.
 		None the less, many programs can read PPM files, so this
 		package represents an easy way to write Haskell code that
diff --git a/dev-haskell/alex-tools/Manifest b/dev-haskell/alex-tools/Manifest
index 74564126cbe3..d1f41edb441c 100644
--- a/dev-haskell/alex-tools/Manifest
+++ b/dev-haskell/alex-tools/Manifest
@@ -1,3 +1,3 @@
 DIST alex-tools-0.4.tar.gz 4507 BLAKE2B 3475957bfe9eda85b53bd4a541cf4441b6eece6901834723c84e4e9877579e8b45258f045aece44ed0d1f17f17f3ab77ea61d56421f07b998bf0a5b7f69e915c SHA512 d4282acdd6f734e3077802d3e87588eaf704f449fb9a46cc330f17a067bb142d948b7c0ae430def970e0b4dc5caf533b226e02112bdc9a2b1c79b552d3abc681
-EBUILD alex-tools-0.4.ebuild 786 BLAKE2B a9deb468c87b5489a2dfd6f7a386871ef356793a6df885e460f237d567240ec0b43c20cb5663ddf69863034c99b868d4d4f0deccf44c6aee2682ba8940bd661b SHA512 79143edaba62915af3c7471f67fda3de616d2d73fa08fce1e683f477385be9856733eec9d85eb3e779f5fda8eb6becdfd032af4c9f1461d208d2e79aa16c2f1b
+EBUILD alex-tools-0.4.ebuild 777 BLAKE2B 791d6c3a04722e8f177b522e913b2ea2f462808fd5bff928fa66c7006bb431147704629d163db9bf86c2783d5909bc9876a512913d19f2ebf2e6a332c96b7e32 SHA512 b15d2941923bd24a9e25fc1b32688dfa7bf2c886c5dbcc797e15e496b1626022d2f068ec3baa0b719f485a0f769e5f8f996f227a5c69afd9636b5ded77ea0740
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/alex-tools/alex-tools-0.4.ebuild b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
index d33a9a66b590..f1f30eb55b20 100644
--- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild
+++ b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,5 +29,5 @@ src_prepare() {
 
 	cabal_chdeps \
 		'base >=4.7 && <4.12' 'base >=4.7' \
-		'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0 && <2.16'
+		'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0'
 }
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
index 806206507d52..0d33d9e3a4cf 100644
--- a/dev-haskell/arithmoi/Manifest
+++ b/dev-haskell/arithmoi/Manifest
@@ -1,3 +1,3 @@
 DIST arithmoi-0.11.0.1.tar.gz 188071 BLAKE2B 0958f4dc0ac1f37a02c9c5e4908ba8a29df3aafe4e060c79076c9c86d9ed11242ab19aa6a4c7dd732fd620b0513b1056d70fcc984dfa3d6b6a5ef99f7e887728 SHA512 8140d9b035290faf9aa044f11f42c101e4a02f1346d5237f46338355828bb6b8bf44f3f8454abfaa6a88e381c2e5476d8512c6edf251dbaf8ba3d776ea68a641
 EBUILD arithmoi-0.11.0.1.ebuild 1504 BLAKE2B 4ab2f6d416353799c5189b4b4e217fefa76acfcc42f6f27888b933cff2a212af9113a39d2c6068176e081b08e55d1ab8700db9ad7609307b3eab325e12e162c5 SHA512 1d580e0b228dca2fa6b3507ff5fb064798927462889a2e063b2059ea723e1f5d035f223d7c565de5810ba6be7984b52a4747cd5d361ef05f2cc73821ca330548
-MISC metadata.xml 814 BLAKE2B 26281ca55d86a794b8f3d323a9a58fe1bd52868fe677fbb5d0509eabb5154ca79eeec6fb5e1fe414c391930a95c9be7ca2e2e47f6ba465c971f0d219df545f3e SHA512 95714cf6da1b5e139ff711f959f6e0a62d3c2d9943aa15d09ab86e19ef4888d11c5108bcdf6865a22f0e72e10066bdbe644044777848982d432499ee24b74723
+MISC metadata.xml 814 BLAKE2B bc1551a1c23b31566ff1bc65fde44e9e9eaf307f9372771629e27f66ff4cdd09acde78992b6944d0f0fddc2e482f5796f8887cecab40acd7eca4e81a9b539a3a SHA512 c4b7de2c3d066ea2128576425613a35b20abf0b628d7a32a5e59d93a45acfe942bba4d80387b0025f7010d20ef278a8276cbc5552608984280ad17791a1dba8b
diff --git a/dev-haskell/arithmoi/metadata.xml b/dev-haskell/arithmoi/metadata.xml
index c32026c57e0a..99051a85ca65 100644
--- a/dev-haskell/arithmoi/metadata.xml
+++ b/dev-haskell/arithmoi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/base-noprelude/Manifest b/dev-haskell/base-noprelude/Manifest
index ea5e6aed7bf9..10a739d8814a 100644
--- a/dev-haskell/base-noprelude/Manifest
+++ b/dev-haskell/base-noprelude/Manifest
@@ -1,3 +1,3 @@
 DIST base-noprelude-4.13.0.0.tar.gz 2864 BLAKE2B 25d13ae8a2cbee524d46cfe351abbe77321b61dd118bc26b8d275179fdaa5d429450c3e99a12518646bfaa13258a5ffaa9eaf0cb0bd7bb84a93187ae175f6d36 SHA512 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf
 EBUILD base-noprelude-4.13.0.0.ebuild 670 BLAKE2B 94f594ddff49c786e2581b33c1819797bd6eac3200c19fb66c47028b6a280ac0628c419557aa22ea35f1925941ff07a6523d33b1359c8464b2a8abc3c437ae68 SHA512 232b73d52a0bd6c1e9a3bbceb071d472aa1de4b4492a389b46b221b38bcb3334c9770c68bbd455c578a31ed057914fd906f1237295ad7d2873db25dc2ec7ae5a
-MISC metadata.xml 1165 BLAKE2B c1314fff9237099c8e2a846b36635ab8ead6563ae3002830547d610f3c9a3a50cebc734681bcb035e822a762f206f01b28aa5af420c92caf30a82e8479e5ee92 SHA512 addd4e0aa14ffef7ef5e01aa3e6f6714812b10f0c2d19b9e9412d5f61ac20b5218c7d691b4b668e899b0deedc4538fe9368a2583e6784afde19267e14f320971
+MISC metadata.xml 1131 BLAKE2B 2784d70e22f8ad26ca4ca207af9641df5f576da4c6805e5c5ba7aa9b192e5fe6d1ff3b918dcb0f482ab7385aeca9cc86a9ea094adca28636208c7cb9eb6c0e2e SHA512 b0a6f5cdfd3c79f15f0837173f8a17aab2ba74a8aae22fc7d59133f8db64be3c5e45e55a55159191765c9ff53429f5673eb14d1ddc608770aae54532904b9186
diff --git a/dev-haskell/base-noprelude/metadata.xml b/dev-haskell/base-noprelude/metadata.xml
index d90faa18c748..624ee3bbed6e 100644
--- a/dev-haskell/base-noprelude/metadata.xml
+++ b/dev-haskell/base-noprelude/metadata.xml
@@ -6,19 +6,19 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package simplifies defining custom &quot;Prelude&quot;s without having
+		This package simplifies defining custom "Prelude"s without having
 		to use @-XNoImplicitPrelude@ by re-exporting the full module-hierarchy of
 		the [base-4.13.0.0](https://hackage.haskell.org/package/base-4.13.0.0)
-		package /except/ for the &quot;Prelude&quot; module.
+		package /except/ for the "Prelude" module.
 		
-		An usage example for such a &quot;Prelude&quot;-replacement is available with
+		An usage example for such a "Prelude"-replacement is available with
 		the [Prelude](http://hackage.haskell.org/package/Prelude) package.
 		
 		Starting with GHC 7.10 &amp; Cabal-1.22 this package makes use of the
 		package-level @reexported-modules@ feature.
 		
 		Each version of @base-noprelude@ depends on a specific
-		@base@-version and thus mirrors @base@&#39;s
+		@base@-version and thus mirrors @base@'s
 		versioning (with the exception that @base-noprelude@ needs to add an
 		/additional/ 5th version component in case of bug-fix releases).
 		
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
index 4ee01fbe7e3e..168f6f693b58 100644
--- a/dev-haskell/base-prelude/Manifest
+++ b/dev-haskell/base-prelude/Manifest
@@ -1,3 +1,3 @@
 DIST base-prelude-1.3.tar.gz 4323 BLAKE2B 3d36ddfa5528f16d4323f690c42fe8871f563cbfc926d5e79831ddb0aebe5ca705842bb87d21dc960bbfaa088a298f7f810dd085228877755678b3daa6c67b4c SHA512 de0f500e0d2d962491951445e7409f337bbf5614417cf6dd54cf04e1dad9ad181bc09648c9f7e0201838fde38ca86b2f89eb40805c9d9df7afb9dbaae565eda9
 EBUILD base-prelude-1.3.ebuild 572 BLAKE2B d065cc066c9c4124b362132a07678767314ddee2f9c5c870f6dd82efd2ef1c148b5d1852c603360fe7084ec4a608b600d0704db49df3226f6c6609aeba411337 SHA512 c06ec7df67ca8788da9e7bb07773cfa5f06cc0733800f006af32cea12b27c8fd2bddc737366392d463dbacf2b902ad3d908ed6af41aeb7ce62b4bfad454cf5a8
-MISC metadata.xml 945 BLAKE2B a9382f6ecce320a9c3796f042727bb5092acba53826b5160a05f9a89bc4776e229bd42136567c8dcb05f9f02bcd893304610cf4abe04a3f4518ed72fdb4dc542 SHA512 cab916deb37631cc623cdb799d10338f21cafa557879dc3b96ab8627a06f5ee4cf196b1b5b668fed1a838e8d195d63526d3a8587f5134730375af0d2504d439f
+MISC metadata.xml 891 BLAKE2B c18e42da59520e8dfc2a1ae57ebc4769ed52f774d530997f9d06d28fff584a988b6c1107c916e9855379fdc33a5d36f9818682bb328bd6e4df367714ee346fb2 SHA512 7d36aa643bf792dcfe7844f4be239d7ecb96e3392fcfbd038b7e37274d8d491286ebf2af4fc006ac6d73cf9a8358ec9f956835cf4cf0ca1385b6625ac60c7a3a
diff --git a/dev-haskell/base-prelude/metadata.xml b/dev-haskell/base-prelude/metadata.xml
index ca9a5160de97..cb751f85043e 100644
--- a/dev-haskell/base-prelude/metadata.xml
+++ b/dev-haskell/base-prelude/metadata.xml
@@ -7,17 +7,17 @@
 	</maintainer>
 	<longdescription>
 		A library which aims to reexport all the non-conflicting and
-		most general definitions from the \&quot;base\&quot; package.
+		most general definitions from the \"base\" package.
 		This includes APIs for applicatives, arrows, monoids, foldables, traversables,
 		exceptions, generics, ST, MVars and STM.
 		
-		This package will never have any dependencies other than \&quot;base\&quot;.
+		This package will never have any dependencies other than \"base\".
 		
 		/Versioning policy/
 		
 		The versioning policy of this package deviates from PVP in the sense
-		that its exports in part are transitively determined by the version of \&quot;base\&quot;.
-		Therefore it&#39;s recommended for the users of \&quot;base-prelude\&quot; to specify
-		the bounds of \&quot;base\&quot; as well.
+		that its exports in part are transitively determined by the version of \"base\".
+		Therefore it's recommended for the users of \"base-prelude\" to specify
+		the bounds of \"base\" as well.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/biosff/Manifest b/dev-haskell/biosff/Manifest
index 88739a529c4b..5e4bc8f6b958 100644
--- a/dev-haskell/biosff/Manifest
+++ b/dev-haskell/biosff/Manifest
@@ -1,4 +1,4 @@
 AUX biosff-0.3.7.1-ghc-7.10.patch 214 BLAKE2B aeae844af1b934653223812838a01f6abb3b664d07e6abdf820e37c791b95d8020815744cac094a9ce2e9ce1c1133bf4439b0b903a54de02ec43e7666f87c455 SHA512 44d1f85fb4625114cf1d032a9f16b57a1602489100521e2801bc8aaa42b5bf6990fa3b849fe040f13ff19a13a0cde13ccc3965826d9673a191f4356d8c0cd96f
 DIST biosff-0.3.7.1.tar.gz 26705 BLAKE2B abf585342c14c01a8f202b34ec94e67138e345918b43a52dbf535c3690bca2039c977ee36ebef861d5f215174429f41702e84d440cf52316de0ec82722053f72 SHA512 ce075d734864b9a00999d5c37c824ece5ba475b583536eb842835b4a44ff56581f18ba8ddf065f2ea4416ff4f96279f6a46f5e57330a43d40164f4cabab2ab9f
 EBUILD biosff-0.3.7.1.ebuild 877 BLAKE2B 6cd441c621cd14f85a71c494ff5d68db23896b6d868aa8785f3c4354d563f70c2c9992551dc8c8205ff3987a3abf7ed52e4ca88418c0c645384c61de03c1cd73 SHA512 985442821c023f2367e1e094b7ba04bb7599bf1f9357d1d9a7b203bab7ea07b3a60cd656cb7c1fb6cbbcc5886d205cf21afa8b0bec6f74a580bc0858a12237e5
-MISC metadata.xml 689 BLAKE2B ca93513fdff1bae2b98185ed4a14a0313aa07f8aed8da548eda82316d2c0331f970bcf5bda8ebf0b6edbc32dd6978fd00289444186f3e14c7f2d8b0b406f5021 SHA512 0c9015c5e1de72fa5f0d0cd7eface35314e566e227751bf73253766f255926afb3f233ab96b6f54e39679081b03a1fff547aaac29b0297d96c6fe17cc27962c6
+MISC metadata.xml 679 BLAKE2B 32b3b12cc5748bba6c18e7a17ea9c876981d38dddf4774a1e07df72ef22dc24c0f8cceaa9080ca29cd44b1f4b86cbef7815270b48ea0e88468643d207835a77f SHA512 15679aa030c47ceb26f38a217b11f26b221e93170e1e755408b81e27c4c703c96c918ab4f9e0b035a593c094f5551baa5076a712c941ceea44e593b563ea80cd
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
index d11b6ace7fc6..fc323e3c2a21 100644
--- a/dev-haskell/biosff/metadata.xml
+++ b/dev-haskell/biosff/metadata.xml
@@ -13,6 +13,6 @@
 	<longdescription>
 		The library contains the functionality for reading and writing
 		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
-		code from (and is incompatible with) the &quot;bio&quot; library.
+		code from (and is incompatible with) the "bio" library.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
index 96f195167390..d42c4b36071b 100644
--- a/dev-haskell/bitwise/Manifest
+++ b/dev-haskell/bitwise/Manifest
@@ -1,3 +1,3 @@
 DIST bitwise-1.0.0.1.tar.gz 16473 BLAKE2B e7caa6d1ac864d6c12ff471a7080559da93f3973eeb5949e54ee2a2f205cab4a9c452578c0a22102fe613964af4f9367b037552a30dd711b08cac2dd2c3ccdca SHA512 b8653549ef0d0f4eb608802f6124cd969c16cbeb6f26dd83839bbaab7d56cf0c1b39a7ac3dba40f3fa00f3f67f38bad091ee0f01e7f6aea7f9c0bafa34efb443
 EBUILD bitwise-1.0.0.1.ebuild 744 BLAKE2B 81103f3a7f7e3a85d84607ae4728f351954ad2ce77b07094e99383a7e7aa13c23e5c0746b08168a65f78860ca5a82ffb63f64b64571529838d14567854901bac SHA512 666e574316db133336d195e37b2c6950b9f90dd825e8ede16a88ec867a13020edba10079cb460853fc457cbb966fa17b21c51d549c4789bb2b479c6ce90f7c17
-MISC metadata.xml 1712 BLAKE2B f33c499851f77b486e0c415c9fed8912871d9b0a06a9a9fbddd6ac232bc5bb345294a8fe116939f0d6226ab9ff7bad961d4965d6584079f1faef6160332b338b SHA512 3c845b956c5480cb7a2f57dfaf41f269564731c22f68e7e5d1cd2285210f39a2f4bb0a23b6a3efec6b7d26a0a3025f21bc5c97d0b4db924eba2c11227db92fc4
+MISC metadata.xml 1672 BLAKE2B ff76e8473b92e016e3a31fcce72f05ca3a317327bd3b8f2a40e2c07866e3287dfd65a8dfa16e74c6d98f73acedba6b5b45de0cbd3234ca5479345c815d785c41 SHA512 38523565f2605a949829b7a42953c56a0d901403708d8db1cabeac5091ad2d1d83985273341bd1eb1e610350f85abc26a35318d399684a6064e2e520b74a4ab6
diff --git a/dev-haskell/bitwise/metadata.xml b/dev-haskell/bitwise/metadata.xml
index 4f0bc14cf689..c68a0e9787de 100644
--- a/dev-haskell/bitwise/metadata.xml
+++ b/dev-haskell/bitwise/metadata.xml
@@ -22,14 +22,14 @@
 		
 		Quick tour of the bitwise library:
 		
-		[Data.Bits.Bitwise] Lift boolean operations on &#39;Bool&#39; to bitwise
-		operations on &#39;Data.Bits.Bits&#39;.
+		[Data.Bits.Bitwise] Lift boolean operations on 'Bool' to bitwise
+		operations on 'Data.Bits.Bits'.
 		
 		[Data.Array.BitArray] Immutable bit arrays.
 		
-		[Data.Array.BitArray.ST] Mutable bit arrays in &#39;Control.Monad.ST.ST&#39;.
+		[Data.Array.BitArray.ST] Mutable bit arrays in 'Control.Monad.ST.ST'.
 		
-		[Data.Array.BitArray.IO] Mutable bit arrays in &#39;IO&#39;.
+		[Data.Array.BitArray.IO] Mutable bit arrays in 'IO'.
 		
 		[Data.Array.BitArray.ByteString] (De)serialization.
 		
@@ -40,7 +40,7 @@
 		* immutable random access single bit reads:
 		@BitArray ix@ is about 40% slower than @UArray ix Bool@,
 		
-		* &#39;Control.Monad.ST.ST&#39; mutable random access single bit reads:
+		* 'Control.Monad.ST.ST' mutable random access single bit reads:
 		@STBitArray s ix@ is about the same as @STUArray s ix Bool@,
 		
 		* immutable map @Bool -&gt; Bool@:
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index cd2089df8192..8811dcdc9532 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1,3 +1,4 @@
 DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
+EBUILD cabal-doctest-1.0.8-r1.ebuild 768 BLAKE2B 388f49569c581fc485c0bf0b2a3a3a98fe1a140b83ff3c008883837e4f6edb88f3fddb781e7465c75f3462ce4ee6d5aaf028c4368f18afae292c3a8f07a989a3 SHA512 faf431b81d18512e68fc880aedc4050fa5a7aea821bfc90f7574c4cd56e3bf73a710ec34771ba673bc4c7e83b5e82630075ed03fc03db491f78bc7ec96b46bcf
 EBUILD cabal-doctest-1.0.8.ebuild 613 BLAKE2B 5d1251e1ab4e2f57ada4216afbcdbce3045bf906ad7e89d7fe3a82345005408e0b7ebeda22114cd346b1e794ccf0ef599b0cd27afa1dc112a46504dce7ba545d SHA512 e4536edf2d62466ba0c116b2063ad10d209f6265b9c8622259b3675eb638b59161ae10d0ac4d667dcc5eea485bc5ef5e4e8c3fcd09a3a85591094a3883a952e4
-MISC metadata.xml 723 BLAKE2B db4d3a4ba2f8356000273e0c98e91fdd1c781f48639075b8ca3ab59ce32e92d16c32e416c5421815ebd5fb1602aa0f485636c675fc7eace97f7d6da56c30c6b8 SHA512 916c984fc5af470538d6960698608f85e34b679f1ae72074d3b81dbd3e50418e6722d7897419dc669aeea52828d3b8577ba68cc21e5bf42fda287fe3a0d643a8
+MISC metadata.xml 723 BLAKE2B 9dda95bba28b06fc0af23fb9ab8cd996d89e5d2c2a759c303634e0ab39838fb7b0a5272246dd12352f1c5433719c1c4b8e4fb348140921430d6c69d339f0cac2 SHA512 25745138b02b609df373a14f09d26a1f4809b5b082ff23f11febdf05f864f35b239fb64c9666e6186eb945e0848c9c3dc7abeb8fad0eda43ff333cbc6e5f15ba
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..97eb27900f0f
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Setup.hs helper for doctests running"
+HOMEPAGE="https://github.com/phadej/cabal-doctest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >=4.3  && <4.14' 'base       >=4.3' \
+		'Cabal      >=1.10 && <3.1' 'Cabal      >=1.10 && <3.3'
+}
diff --git a/dev-haskell/cabal-doctest/metadata.xml b/dev-haskell/cabal-doctest/metadata.xml
index 90bd0c4b51cc..766a49c0eb31 100644
--- a/dev-haskell/cabal-doctest/metadata.xml
+++ b/dev-haskell/cabal-doctest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 2fd6fb72ccb7..eeb731153a32 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,4 +1,7 @@
 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.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
new file mode 100644
index 000000000000..085a26c438fa
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
+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.10
+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/cabal-3.2:= <dev-haskell/cabal-3.3:=
+	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
+	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
+	>=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
+	>=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
+	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
+	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
+	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
+	>=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-7.10.1:=
+	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.8      && < 4.14' '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 \
+		--flags=-debug-conflict-sets \
+		--flags=-debug-expensive-assertions \
+		--flags=-debug-tracetree \
+		$(cabal_flag native-dns native-dns)
+}
diff --git a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
new file mode 100644
index 000000000000..fa98278a277d
--- /dev/null
+++ b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
@@ -0,0 +1,11 @@
+diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs
+index 66b415d..6aa71bb 100644
+--- a/Distribution/Client/Sandbox.hs
++++ b/Distribution/Client/Sandbox.hs
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE CPP #-}
+ {-# LANGUAGE FlexibleContexts #-}
++{-# LANGUAGE RankNTypes #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Distribution.Client.Sandbox
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index ce9b7ca1ba85..62dda66713cb 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,20 +1,6 @@
 AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
-DIST Cabal-1.18.1.2.tar.gz 323545 BLAKE2B d9e88f8f512b6bf23f8c57b6719fcf560b24aa2b20a0be3aeaba455dbea79c7320cfec495f31524a098b2d0298fe04cdd29c65f8c527066fcac82ba1f592e761 SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6
-DIST Cabal-1.18.1.3.tar.gz 705715 BLAKE2B 46d6c446e9410d7bd3e3f2e68e2e950e180f8fde4332ba3c4657add30dd721d7e2887b830e9c2954d3ce8e521e42d7db90d87150804589ad5fbea5c08b6b3fca SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708
-DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc9096b0e185fcf1299897e536be23714ba9126033d98b60558272fc28e9d72f638ee94d9f769e61d00c2d2bd1a092 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef
-DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b6aeb6e83ea169aacab0bcb1d14629df885cc9c02bb64567069e475497cf2ac716731bf84ee89bdf177404cc5e0 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3
-DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b407711a8dcfcee127e03f3cce6a0e96165126a996b39a8f29e97e65eff4f5ec308fb3f53c53cb795cb8ba1ab0daf SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3
-DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
-DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
-DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
-EBUILD cabal-1.18.1.2.ebuild 1257 BLAKE2B 38df6a82d0419df3cad600daf63ea2d998f2f8bb942d299c5961578bfb89bc808ebdd8d100ff9a7e8911d583460695c3439235128410ab0f6c378cd4a6de15c4 SHA512 7c99fdd7550bd4724d487a91012505a585f2406a9c1cfba8a7da93b6317b92f8b901827e5c81fe4ac5f8d34f69ae307a258d0d65f5485e2991fce339171f6e29
-EBUILD cabal-1.18.1.3.ebuild 1439 BLAKE2B 949b7d00466bdfb1b7a6cd5f66b3be1b359a8a5ee32e475f1a32adcfb4065963b1f79c90a909d60575267ddded7d0bb4f06a6cc1c1addf1663b7185b37314133 SHA512 63b556dcc2a6eb54d3fa4cbb036237e4ca6110a117435b078fc8253e65e0765317ef2d69dbb234c40d765be4e371507c63c8c65ef9b7ab07792fd5186f28525f
-EBUILD cabal-1.18.1.5.ebuild 1461 BLAKE2B 6f08fc4140c61c2b0ac2ec2022bc41d485d103f135d631dfce9503b3ab219ede53efd3131afc4a96d60a07b9a1e8111ccbfdb8c381227dfd60ef403ddfb2d1d9 SHA512 1c5f51c404c563f89931d586fe2bb3e643db76c41afa5bf53c601f38967dbde10f28c21587f58dec5c464136b4df39d8d4da9817cc6eea438b25c4614cee105f
-EBUILD cabal-1.20.0.2.ebuild 1516 BLAKE2B 6488c9ad1d262d91da0a4cb783f2c2fb5e36a06de99429b40019f8d221b515e856776bf0e8d1fdfcfb2a67e91f0e3bd5d84ffb08471d4ef91ddd683e831286e2 SHA512 e7f5bf19918fe4c12f8b07fbcb24220162d15d817565f0bddc44eaf13a0c4b00d0d5ae71010019103247bde8e285f3052b7ca6650a6532106419ac6e261d7d05
-EBUILD cabal-1.22.8.0.ebuild 1405 BLAKE2B 3966d76ad9335068dc94b44ba496a73d9faab1570f8533cc215c0c58066e1734a270f616861476db1334533f9f10aa9bd09dbc70ecdacdbfca52ba58581033f4 SHA512 3758a49788a5a794d461555471eec70fda5265cd83cc00a017324524b34f49d9107c5101e4c70e7ac103a4aa79de443cefd2c7f4d76cca7379c402736729acb7
-EBUILD cabal-1.24.2.0.ebuild 888 BLAKE2B afb7cf12ec9b8a15a18c7384dc39205f20c3557743ecced554719629d31ad528df84ee9a8c09bcbf246649d3106dd36ff0a45c5fd7c09c5ac9ba03fe40f680d5 SHA512 aa421818ef473812c211fb2c45c4d0a1abe9b06e29822e1775df748240bcb16d927679252e9333491e84d98504cf2a32badaafa6a27b845e990e4e967ad64e5e
-EBUILD cabal-2.0.0.2.ebuild 982 BLAKE2B 74dbee036c70e78435282ca73c3b535e387d5e186196cda4bfd7bb54a02de4f1705d814e3c67b942a9c0793c2bf24a8582af86c1eef53d9fc0a2e53139336594 SHA512 498aff87f0d7891c24c20ca3dfed2034fbde79e97603da702a8080dec224ac748c5854c0da04355098ae5558b3e9f6bbeece7d30b2cd6777765ae0380b244b5b
-EBUILD cabal-2.4.0.1.ebuild 1244 BLAKE2B c49bdc329ee67863a9f67c0c2f47232cbec726194a00b4a61688cdc19099f239a3902dbe94834257ea0285835b4b85f1de69933ea1d8ce14b52ca08b36e82006 SHA512 4f52e44cab2d5654d3134692cd1ee5387e1aff48c95291be0258faed089848fff3e291d8859ce01d402a7e8d2fec3434c422f8288aee5e687f03a3a0801ce18b
+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
-MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
+EBUILD cabal-3.2.1.0-r1.ebuild 1886 BLAKE2B 6542138f6e409fdfe899c6ddd37e1d60a2fb1155203754e73f0e8cc9c3189310a32054fef5213df0e6802c911fbd75a1cbe3b2612461396681fd846a40dda9fc SHA512 79583918d97430ee4e11636a371d5b8c00a414ebb4450de0cceeea8bb7b7a1d2df6aacadba0f13afd9c91d53645620e651200e62dc882316a580d41c57818c42
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
deleted file mode 100644
index f70319a436df..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit haskell-cabal versionator
-
-MY_PN=Cabal
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
deleted file mode 100644
index 4e3ef6605f6d..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
deleted file mode 100644
index b788a5425abd..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.4"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
deleted file mode 100644
index b2818d3ca188..000000000000
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-
-	cabal_chdeps \
-		'QuickCheck < 2.7' 'QuickCheck < 2.8' \
-		'QuickCheck >= 2.1.0.1 && < 2.7' 'QuickCheck >= 2.1.0.1 && < 2.8'
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
deleted file mode 100644
index e9344803aa79..000000000000
--- a/dev-haskell/cabal/cabal-1.22.8.0.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
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
deleted file mode 100644
index b55efde6e140..000000000000
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.2_rc2 PM:8.0.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
deleted file mode 100644
index e46b1a1e7a60..000000000000
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: -parsec-struct-diff
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#not keyworded yet: many packages are broken
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.2.1"
-
-PATCHES=("${FILESDIR}"/${P}-no-bootstrap.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-parsec-struct-diff
-}
diff --git a/dev-haskell/cabal/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
deleted file mode 100644
index 9335390f8e66..000000000000
--- a/dev-haskell/cabal/cabal-2.4.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
-
-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"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
new file mode 100644
index 000000000000..d18123f7001e
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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: -bundled-binary-generic
+
+# Drop test-suite due to "circular" dependencies with quickcheck
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="https://www.haskell.org/cabal/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris
+IUSE=""
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+# GHC lower bound set to 8.0 to remove semigroups and fail dependencies.
+RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.0:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Cabal bootstraps with 'ghc --make' without package cleanup in environment.
+	# That causes module collisions at build:
+	# - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3
+	# - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5
+	HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
+	HCFLAGS="${HCFLAGS} -ignore-package=kinds"
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bundled-binary-generic
+}
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 97bee0727e40..b7878815d80d 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The Haskell Common Architecture for Building Applications and
-		Libraries: a framework defining a common interface for authors to more
-		easily build their Haskell applications in a portable way.
-		
-		The Haskell Cabal is part of a larger infrastructure for distributing,
-		organizing, and cataloging Haskell libraries and tools.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 20ca25390851..bdad065c5746 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,3 +1,5 @@
 DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
+DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727
 EBUILD cairo-0.13.6.1.ebuild 1086 BLAKE2B decc8ecb97e7e72cf0126b70ae17321f6641d022d03efa6577c29b154fdc74e9abe65d8f313b2b2f8ae94f93231cdae0f6b5b57a8086989ecd4ec45bdd58cff0 SHA512 9eb536a6a339a2c98b989e454062116c5903843d687f4c0802942e8d809f37bc7e17b8e3bc2e6b2ea48a9950ebd8bc5eec7fbf86828fed19aeffc6534aa0ebe3
+EBUILD cairo-0.13.8.1.ebuild 1091 BLAKE2B 8b3bd6dab36ae0a3e7a2a9c9cf2df9b9e4fcbb9f9d81911489dab7eaaa57d609b927827b076f6f4f355a53da5dc6f9c338d1c68178b7a8d85cb1bf6e458e7cf9 SHA512 365cd5f56a429ae2e909b0d2414a3a311f992d75234c012c720fb044cb35ed56d43d383c025b9b4e2a38db811d3a73309fe4ef27043014fa13171211862ecd9c
 MISC metadata.xml 468 BLAKE2B 04053766d0971041ea0c68c8945622845833dee8fac5b144799ea1c21874fc739f9c60ee5f418a9a4e94e12f9bd8d621a8419fa6b916bf8fc518aa0cebab90cf SHA512 30c5d32612972f08d6d51603a6972b6a084b2f68e644c72ceb4472bbac83122916070ffc597b8199874c62fc80dcee775ca6632a45e82619d9927669559c79a9
diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
new file mode 100644
index 000000000000..174a94c5d100
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag pdf cairo_pdf) \
+		$(cabal_flag postscript cairo_ps) \
+		$(cabal_flag svg cairo_svg)
+}
diff --git a/dev-haskell/chimera/Manifest b/dev-haskell/chimera/Manifest
index 0d04c1501f8d..eb38634d0843 100644
--- a/dev-haskell/chimera/Manifest
+++ b/dev-haskell/chimera/Manifest
@@ -1,3 +1,3 @@
 DIST chimera-0.3.1.0.tar.gz 13809 BLAKE2B 64a343f84de1cd535676934c26e43994062ea24fdf27463a22b3ff1086480a277fc3f0f87905f9060bca80e46ab0a553e5091cb27065ba0e3321e62800a7756d SHA512 7f155bb3d938331760e8e06c47d67a985588e1817e8b151f6a58074d77a71ce0a70537c55ab3d97c02867d9f2a3ae2f31ed87432e833930b3be6c2f92a8947fc
 EBUILD chimera-0.3.1.0.ebuild 982 BLAKE2B 11ff61ae5f4d5707c99b2d83f8746b1784938eabb9cefe9b951f148ded71b99c9a63a90b5f842cc89bb03fd4e5305bed6d637fd303cf8b916ce6c706ae4f04c2 SHA512 ca55bfd97af39256c9746153cb23f937e22194437d8f7a10adb3b5e9867a344941d6bb9e7dbb9dc8579195753834291f084fd2a19a609279f948699ca40ca4f5
-MISC metadata.xml 1372 BLAKE2B c481306daadd31f9b8d6b5ec2cadc7f78b01b4555ff84727abf59e98c845f233eecb3711e4421f5cd0dfca99d55dc8cecf5875d4b8a4b6363b4362e2fe8780e3 SHA512 3eb9213682d3cdcc39548965b2cea32d353e96efbeeb1212a1df51526e2e3ed9c122345c2f4e0797d2beaaa2250525f30aef377a1196bcf9b480f79c0f03cf65
+MISC metadata.xml 1364 BLAKE2B 4901d46cba26ef01a16ab6636261c895961c8d6e87b7735f75fb28437d275a4aaf71ae9b710287b61b66e3cbb3a882c217057b8c3743b5bb6781ebe9e600d383 SHA512 6ab464300e89a43293eb31c628b397cd9b131b653c5dec8d6ef509ac3fa398d4a34739a7b550af7501e8609f4128c72d1aa7d0a91e0562d8850aa77ff13d6c13
diff --git a/dev-haskell/chimera/metadata.xml b/dev-haskell/chimera/metadata.xml
index 317b99f5cc7f..c4103da3aa36 100644
--- a/dev-haskell/chimera/metadata.xml
+++ b/dev-haskell/chimera/metadata.xml
@@ -25,7 +25,7 @@
 		which kinda defeats the purpose.
 		
 		This package intends to tackle both issues,
-		providing a data type &#39;Chimera&#39; for
+		providing a data type 'Chimera' for
 		lazy infinite compact streams with cache-friendly O(1) indexing.
 		
 		Additional features include:
diff --git a/dev-haskell/cmark/Manifest b/dev-haskell/cmark/Manifest
index da3d0ba52304..a48778cf0aaf 100644
--- a/dev-haskell/cmark/Manifest
+++ b/dev-haskell/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.6.tar.gz 169132 BLAKE2B d6c72aa17216f89e90a269d2fcd6639f25ac2e9aa02a0799108a85247b5ccb5211ee02dc078cdbccfbd6295705799d5b49e2af70d50cd6a791fbf4ddcea70a01 SHA512 35d2851bb1d3305000527cfce81253c9492a3e3205e73418fe42fcc9f8e5f8e396a7ecf81ad4a003a2dd4a571c4f7d051bc6812c07a5c79dc30eac1d45fca4f5
 EBUILD cmark-0.6.ebuild 904 BLAKE2B 060cc1a7c9909a98bd7c11611d9b0115f4e79d6fff997adfe99c5a101c6287c7df33021bd9c68b46e5490ed19f0a947c496b77678352bd79eac8bd2cff8083b0 SHA512 b5e30412503a9ad8001549dd241a7f174f61d492ea741fa4a726a11156361f9fa4a4b45af24a138152f5dfb8b38b836208b9d9b134a3332ed3008287bcea4b60
-MISC metadata.xml 3529 BLAKE2B b8b6571f4e38d3cb44e700f899e834cf0a562dc695367b73b3bad6a57264fc7a6fd6eb76ea7e4a4c1e21d34e77d1a10475fa10d4c3dcc38010748212c526a0a1 SHA512 81816dbafd239df87356729fa48f70a7be0c4c2567340a0f06d1698e66d9161b4e0ca69bf881041d90b331aaed966f57c9b631a3b2151a441a40147ab163cc8e
+MISC metadata.xml 3529 BLAKE2B 5b8f44dc437f30e8e0a4d1c859fc155d1c38c35094a798ba4878a09aab0ed681fb68f92faee172f923f007fa906e34e1ef3d52909220e7367e498c57ed708503 SHA512 7f0b367ce878fd3de54f6db098b91fc493aeec562a32ad7f5f1c61c00b0a264e31168f0ae5230f61c6c64893293be6bd6363c65e63bb0140a7c6b62ec8494237
diff --git a/dev-haskell/cmark/metadata.xml b/dev-haskell/cmark/metadata.xml
index 2d92a8edfc92..565126256251 100644
--- a/dev-haskell/cmark/metadata.xml
+++ b/dev-haskell/cmark/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='system-cmark'>use <pkg>app-text/cmark</pkg> instead of bundled copy</flag>
+		<flag name="system-cmark">use <pkg>app-text/cmark</pkg> instead of bundled copy</flag>
 	</use>
 	<longdescription>
 		This package provides Haskell bindings for
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index 00d98116322b..6ce98b2450f8 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1,3 +1,3 @@
 DIST cmdargs-0.10.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
 EBUILD cmdargs-0.10.20.ebuild 726 BLAKE2B 99d23fdfd04c8412035426af691eaa39d50120a69fee09c36d1a302d5a86e04a743d603a6353c52ce8fb2079d07299f74b6b8d2c0ca4903c404ad654686769a8 SHA512 1904a5b649fb307ff8a5c5c762561f74b2a4b37278446cf5966fe6144dca16d4b5cd1b3b94bea048340bae6f75e111bf6ca4daa7b2880aa573abe05d9beed530
-MISC metadata.xml 1399 BLAKE2B 19e4eb5aa40c08e1cbcd82eda918e9790c065295de89a1039b1ea247922f82107b1df2a7a42d50cceba092972cf77af689c877418faec763c9443e1851aba6c5 SHA512 2c94fcc315c08a3c34dbf1cb4cb7131b76d612701abe89b7c18c7ea09bf1b29ea80fb6716551bd452594df6b8f62f6032b51467a121cd6184627e5622c26ae83
+MISC metadata.xml 1399 BLAKE2B bd5f552e9bac2bc413b19eced282310476bf55f300cbe86670a6f1a6f2ec7c4c211a7752e4cdc5c6956e41c28b2ce8e5a775539a5a25761124f7ab604a4d1e25 SHA512 0de120693dc92aa2148de0cd461c0f71a47bb7c461a37d260890aaf5f11ac941057d9e92e9c5bc7d87c2c8343b26235b06c5b7a49eb6612150a53804acf19c0e
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index d07cc4fd7c80..c4830346d134 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
index 8f2509af95b9..28cb87e9888f 100644
--- a/dev-haskell/code-page/Manifest
+++ b/dev-haskell/code-page/Manifest
@@ -1,3 +1,3 @@
 DIST code-page-0.1.3.tar.gz 4718 BLAKE2B 0062024dd536b23359d84a8f6aa5bb66a241ae41190a59c9c2cdde34f3ee1664ad180a1d7b8332904b761956bbb73bb85f74f818763a37021dfa5fa09d36a040 SHA512 1a8f650051d749840562d4ac8789f9834afa73e64582f2781d542d281d894c420cdb7a5b8a2bf30c983bec99a27bec8b63a32b1cabd3ab26a964e0a9b9b647bc
 EBUILD code-page-0.1.3.ebuild 553 BLAKE2B fa95640c095c68d70f45a0d3b6ba257c7ce6411272db30435335c932cc7da8e4e16f2fb17a376617958c95d2fdb4ba8ae53d59d90af741fe68db6eb6971f1166 SHA512 16633aeb51b05428940a008552caee90e30481f79639c1be1da30e633619cf7a5398bd6ef509830e663e81f6e5dfe06e1aa625b25c3b0ea2961d1259427b8572
-MISC metadata.xml 746 BLAKE2B 4d5803af18ea6f3e41126603c0185048c59762afe39cd0879c5f810ada3500cc73297d37e45cc7ced1f3ad541fe1cf8ed80fc8f98f667ebccb2602b96376b258 SHA512 964781fdc03c324df2cf8a76fe3b7dd58fb1511d1d8281a57ca8eedb4ace74404d43b566a6b1f083b0a7b986e1181c81e83726a2c0c865f922a13cd0d8c8d0a3
+MISC metadata.xml 746 BLAKE2B 17dc7f1ce3c2017f04bbcfc78d99f6bd74f3db4cd4c6b7d79c9103a597c30feb944e9bda686328398572ad352d5c66040831f9a8e23e4527ec2f3d0fd8be27ac SHA512 02ea2165ec05e1011005c491b40beb264dfdd1bd4ad815172f62f9294bf720d5a59d64303da5cb1b88755d1929f74d22a1f8e6739cb51ae9b54a2c43bf866c22
diff --git a/dev-haskell/code-page/metadata.xml b/dev-haskell/code-page/metadata.xml
index f316630ab908..95c62975e56c 100644
--- a/dev-haskell/code-page/metadata.xml
+++ b/dev-haskell/code-page/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/configurator/Manifest b/dev-haskell/configurator/Manifest
index 60b8ea8a7b24..9e249fa706d8 100644
--- a/dev-haskell/configurator/Manifest
+++ b/dev-haskell/configurator/Manifest
@@ -1,3 +1,3 @@
 DIST configurator-0.3.0.0.tar.gz 15232 BLAKE2B 1d09d8054a6cc948e63ab2024db6866d6bafffcac2c56f8e6b0b13fa63177aea34495a49207235016a4911f5293babdd9ee90f73c1a08f350823d6b95d6b31a3 SHA512 0c4c95b3182874c87c4b6b8e74bf8e39ec7528b49f06e9a02baed5fa4aa90a22a9504f59e881c17616ef95a1aa5450b431df8cc9317ef837d8e821f330e303c9
 EBUILD configurator-0.3.0.0-r1.ebuild 933 BLAKE2B 70876ad88f23511be36a8d18bed6af9b5b694fa4cf6ef07ca2791aeef1db65cdd94916d6839589aa8636f0663b215f3d1ad021ed01c5d851f1cca691104e55b0 SHA512 2d890cbd1d17083fbec2806ebcc8db2acbeb0d8dc8847146a44e44ea6f52a81fbb017a0db65978a1445ec8faab0b96113a083e9a9692a81cd813005c86bcd7a7
-MISC metadata.xml 1211 BLAKE2B 5538b16c2f108b42dc1e604ff015867fb9d0368093511ed54c8e8bb0c2758b59d19f555ba9711f787fdfe2797934eff03244d2a61a0d444de876bd9c51aa642f SHA512 3798db36c06ade14fe701fccd286af6cb3de0225ef712c2ce92b574be8c03fd7c7186121d55082ea5517ce1ecb338e32f404848ebf9904312393bc0939c5464d
+MISC metadata.xml 1211 BLAKE2B 0fa2e4779c8da339f890ffd2a012c2b932d39871f5e8a56d7189cdc9e550c23ddc882f25ee25505b19d6c2f61940e481a89eb54bf55205d8705959aa39d8e8df SHA512 69155199e9d8fd1f9cca034471bea8bdd9281c83361fcc255ab80018f1eef56b747c45b02f5c4b1119f9ad491c52ffce9c27a3cf1d6e6919f0742453ba8ba161
diff --git a/dev-haskell/configurator/metadata.xml b/dev-haskell/configurator/metadata.xml
index 2005cc7f0e0c..73634c2f1fbf 100644
--- a/dev-haskell/configurator/metadata.xml
+++ b/dev-haskell/configurator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
index bc6d18cba5e5..c7dab11d31c0 100644
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
 EBUILD cryptohash-md5-0.11.100.1.ebuild 1083 BLAKE2B be2d63ace440e88e85cadbeafd7db617971384d0546d860099aa737abd34c16c70f3a7070f0c5f2197e48be9e510d383af083a14f163b4b4fa2736a6cf58321a SHA512 374b04c403a9ed15b4d976d60edd210141c0bfc1ed9752df2a4b8240d98289cb9b66dd99643d561b6d78e97b3e00066e0e19d300e403021897935714ee530fcb
-MISC metadata.xml 1136 BLAKE2B cd448de1b5bef8a190d7c6be94244e85391a031aeba638e9231c5bbe2792885e08781d036ca514b92bb53c18b7ef8569d727991e1fdc0aa0d570a69af8f0a8af SHA512 04098b3b905f5fc89951a0929309ff7dcd77516b8d1087cebad2f2cbbc8edbdb71f6d83175ba5a0423fd7f57496ab2d131d7d1ed868684a602cd8ae8106befc1
+MISC metadata.xml 1122 BLAKE2B 965aa007d1fe8ddb2f56b9173c5a467111280188d1ae821df8362927ef83a082c73d2d51b76e0b766ccbe3a5318d7fb217b4484fd903aff996c20eece8d31d1a SHA512 aaeae49f29c3fb6412887001bd1c3798b817efea838d2b8b766ffa9a11d9c42b234903efef8f32c0be80b4266f9f326e1b7a994a4c76f3c9f42e45138a6223de
diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml
index fc0f69d6e24b..c245482dc722 100644
--- a/dev-haskell/cryptohash-md5/metadata.xml
+++ b/dev-haskell/cryptohash-md5/metadata.xml
@@ -18,7 +18,7 @@
 		providing the MD5 hash algorithm without any dependencies on packages other than
 		@base@ and @bytestring@.
 		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
-		&quot;Crypto.Hash.MD5&quot; module, though with a clearly smaller footprint.
+		Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
+		"Crypto.Hash.MD5" module, though with a clearly smaller footprint.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest
index 59d5c03dce94..7b3d6304213b 100644
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
 EBUILD cryptohash-sha1-0.11.100.1.ebuild 1078 BLAKE2B 6c359c8410729196b99c25f79c01bc42695431372cc58e5513e4424d1da606a9dae841bc3932085cc5065b76e2787edfda7df61f7ba4f8475a1303063bf12fa8 SHA512 5cdadc922591e86d5cb44a5eeb55046f5c2eba37c9d84d976c6d55f4086b2cfdefa44d680c711203caadada1f4eaad3745af77eb140ba6ed99d708c40c6d0fc7
-MISC metadata.xml 1142 BLAKE2B a76762c6ae8ca60ca6153cb5bf6257c5b2257c9792cf6dc29572f8e979256eabc0fab1578066cd774063bc81042b23deada1d942fb42241b00fca5ddaae7c7f0 SHA512 5fa379d2aeb81a798dfd5dc25d92c1a62b864a7f0a8188f76775e11d0a55c01ef8cb676420afdbebe456ffc213bf165f6e77b6a8e6ae86864270c998104c7659
+MISC metadata.xml 1128 BLAKE2B e2a44a266c127ba6a5631009e0f9e5222e42a5ae6a30843b9ecf41e1ec28921c5306110607ce52d129277a5b8c9753d8b2bc4607ab2261c8e6fa92be5fc9e48a SHA512 97b2ce7ffe0983599d5095f362594c99b961e8c0fd921af7a4366e0652af4df3b835fa71dc740a8df5287d524eb5f7887ffa76def8c445f45ffc213665d4b748
diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml
index 6967df1105e8..d29699cef4e2 100644
--- a/dev-haskell/cryptohash-sha1/metadata.xml
+++ b/dev-haskell/cryptohash-sha1/metadata.xml
@@ -18,7 +18,7 @@
 		providing the SHA1 hash algorithm without any dependencies on packages other than
 		@base@ and @bytestring@.
 		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
-		&quot;Crypto.Hash.SHA1&quot; module, though with a clearly smaller footprint.
+		Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
+		"Crypto.Hash.SHA1" module, though with a clearly smaller footprint.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
index 0ebb120e05c0..5ada0954184f 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-sha256-0.11.101.0.tar.gz 14996 BLAKE2B 9caccc3eea4ad25c6ebbdd507771d86264a853f282d03399917b42a5311dcad0501bd0b4ea6fa00d039f67bcea3f81c116b9ec016d65cb2ed6f086b0448894c0 SHA512 c755f1354fb5f1d6cfb54f73e39692392517954118d98b39ac4be7460e75a9ddc91ad641fed0f17e5fa33b62b7b0734af66526ea757e00716832572bb383c612
 EBUILD cryptohash-sha256-0.11.101.0.ebuild 1171 BLAKE2B 30a6259126fd4c7fc15df16042002702dd3c7fa9585146f7f2df4d3415d140ece5452b6548c90f7a516b77796f5f1a0bbbf587e011f3bc1783439a309ee49e0f SHA512 401532bbc5a67b624bb1964a82a28428737baf7266ecf152a32f9a8a7b914d0ee52ced79b00624c75c0f2b35b3ab082d2f2d12d4fb7e4339465a1c7d9e49c05c
-MISC metadata.xml 1142 BLAKE2B 0cad5264e9d4ede629d9ca0ead9b4f523b1fc78f845db2c3ef27198e089499ea09a272e4070ca0212cbcdc983dbcdecff11e13e9e445a46fe5b0d0371e4ffca6 SHA512 992cbdbfeabf1b1b5d70b451ec96adbf782fd2ba4f49dd1acd796d19fabb0d54bc5dcbcf968b0c9d99335f972abe0d0aa4b6f042a3152ca1705396cb5fb4c76a
+MISC metadata.xml 1142 BLAKE2B dee1653c05cc8eda21cfb5c8a4273a006dd7205e01fea83102f068bd99040829338ebcc8a49549e9edade06078e046a47ef37103572f4425a8ccf25d70cc456b SHA512 df887fd414181015ee3fd2d28b82d4bc8cc87551257ccc0f9487fb296130f440d8cdc3f6f6e1784fd92725d1c33a5075edcfca3828c89a23d95d9c456be6c34d
diff --git a/dev-haskell/cryptohash-sha256/metadata.xml b/dev-haskell/cryptohash-sha256/metadata.xml
index 095ef6762db6..35059158effb 100644
--- a/dev-haskell/cryptohash-sha256/metadata.xml
+++ b/dev-haskell/cryptohash-sha256/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/deriving-compat/Manifest b/dev-haskell/deriving-compat/Manifest
index 5df17dfeadc9..98708dca099e 100644
--- a/dev-haskell/deriving-compat/Manifest
+++ b/dev-haskell/deriving-compat/Manifest
@@ -1,3 +1,3 @@
 DIST deriving-compat-0.5.8.tar.gz 67468 BLAKE2B 0d5ea2e882e598590b69e8682d6a751fadd8cc78cbadc97d884db74730972e93b4045276aa86369d744d4edd9db4942acbdde4abae18002c599d7b0728112be1 SHA512 e0a807142bc324a0205bd3b98fc9c68292100808d448edaf800ed41c073ec0745329458dbbb6c1fe33cc86872a9d2555d76f57c6b9d8a1dcd891dda1a9fcf158
 EBUILD deriving-compat-0.5.8.ebuild 962 BLAKE2B 1aefab793916274f6bd49a905a4985cc28d21d8069197d06426f68b049e25f1bf55606e954082cef7b75c2fd91ede611933d5d2f06feee2fe8f933fa57e2f102 SHA512 8d527ea376d7073a24fe22f3961f6f02559aa9d4b69891e2770c6c25dbecc3ba99c9f4144a67a0e7c89fcb719a58bb4c60c1856968e29b3cb22631dbedb35544
-MISC metadata.xml 2105 BLAKE2B 36bb5e8a3c3b0615e744e6563eb066887ef34c1b73a4386aed41ef493bffa4eca1a26b7c53755f99c6605f69617d891f8e069ed189d580b585b94fdc98b35521 SHA512 b2d303350deb80e0ecb786c2721a3c2168952195f16d047e2b3fa2ea2f7d3fa8552dbd24fe15ffcf22a8fd81fc169f6908b325cb59073396babd41fcd3acc399
+MISC metadata.xml 2105 BLAKE2B e18c77b8ad9d192d6dcc0b8332a8f006f6de81ecee9976dc6e694176141a37501952921ddc5ed0933785281d017333ff4748424a922679afd27feb6f124a433a SHA512 aaa6203f996b9b566029448d8354c31904b8141bba743c0fc0003356d8bd5158318af1a4b8b6bc40f9d0d67d76e37c8dd7f1ad77ec4558651629b212842735d4
diff --git a/dev-haskell/deriving-compat/metadata.xml b/dev-haskell/deriving-compat/metadata.xml
index 047211a1b6d5..3d15bf679497 100644
--- a/dev-haskell/deriving-compat/metadata.xml
+++ b/dev-haskell/deriving-compat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/edit-distance-vector/Manifest b/dev-haskell/edit-distance-vector/Manifest
index 922b72869aef..fe897b450a10 100644
--- a/dev-haskell/edit-distance-vector/Manifest
+++ b/dev-haskell/edit-distance-vector/Manifest
@@ -1,3 +1,3 @@
 DIST edit-distance-vector-1.0.0.4.tar.gz 5819 BLAKE2B 8658c52e64e704dd5c52bae0e63ae0b4d84c88d6cb1e3ecdafb05191dc70e3dfdec34001b2c287ec62703eb7ecdbac9b127b3dd084bc4e484e70cd778d31913f SHA512 8d7ef7c6ca971aec5efc2e90adff2584c1e4f996df3ad4f6111f790fd88fcce1814111eb3a3bbe07d8455b03ade98f11e6343c4746e895be2ba9b82a86a33e6d
 EBUILD edit-distance-vector-1.0.0.4.ebuild 686 BLAKE2B f8335bbe568dcdb9262dbfaad0f19ad9038be59c0c815b203c8501fab1d9450e36e71153e587dbc0723926f49165c8c7d79709973fcffa072d8bfb7fb98c98b5 SHA512 a298e2104eab8ed9cd89267811fd8eb90f1f874420c4a757703da64af0f0007995f1e10d830edc9778995147bef5c4782c6bdcebf6526a55722555472a65dc01
-MISC metadata.xml 715 BLAKE2B f806edd036f5aff0827ab5a5e661b1878a37fd791681d235eaa4dd2ddfac2432cc5544cb0bb91af88b59b01f6c443cfa79ec711cadf9f02732ae17888c8bc17d SHA512 7631013f455be1ab70fcf1a596a3c21c9e807bda921020ce3b073a5a4f97dd9d4c3825d14693f3c118ff684e3694cf72d4258ecec3edc38988ad26d2d5e3359d
+MISC metadata.xml 705 BLAKE2B 3fcf05b886375fe6e8df8654e9111416a797f81907591af1e2135306747d5ca68a05f7c497b0b66de166fb6090c866d280997caa20f4198de4e61aec31580e2a SHA512 26e3350966d948d271731e664d9333717a84fd55f78a4a1e34c1055b61f5c79c90aba89909da85d95534b0aac46401364d178fe60343df46019aaf0154eb433a
diff --git a/dev-haskell/edit-distance-vector/metadata.xml b/dev-haskell/edit-distance-vector/metadata.xml
index c2c7c2767205..e7d7e8f9392e 100644
--- a/dev-haskell/edit-distance-vector/metadata.xml
+++ b/dev-haskell/edit-distance-vector/metadata.xml
@@ -10,7 +10,7 @@
 		find the optimal edit script and cost between two sequences.
 		
 		The implementation in this package is specialised to sequences represented
-		with &quot;Data.Vector&quot; but is otherwise agnostic to:
+		with "Data.Vector" but is otherwise agnostic to:
 		
 		* The type of values in the vectors;
 		
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
index 8d0a4efe66f0..ecee7fc927db 100644
--- a/dev-haskell/ekg-core/Manifest
+++ b/dev-haskell/ekg-core/Manifest
@@ -1,3 +1,5 @@
 DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789 SHA512 5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
+DIST ekg-core-0.1.1.7.tar.gz 13612 BLAKE2B d630fca0277890b6798c28ae83339d4de8491439edbe1ffbdb09177d382b9e3bb2f2ff43c12741061ae78e8c7e2b8bf499bb5748721df3378b3e78d19a5004bb SHA512 68915d62d7851ff99877a478b948ed119462883463949f551a0d94efa60209f734af0578b1437fcefead3e2cc80570d1a844f6be3b5b90b2fc804f9c85aaca90
 EBUILD ekg-core-0.1.1.6.ebuild 695 BLAKE2B 131abffc9ad4848907c716123d262881079919826580f81d99c4df341e973f2e3671255ffa10d3505f27981faf77f6002179ae8b30bd1e92bccb768efdfb5766 SHA512 8e897466a337675c5146909b845e04ad7f83dbd1004bc6eac01719f193818bf43684edbc969fcc207d976f2b67047ab8c309f5882a1f97c8ae2623b7bd8f733a
+EBUILD ekg-core-0.1.1.7.ebuild 722 BLAKE2B 41a90477e274e3be82baa9841f1211f6eb6227c7547b7855577fd13971f5ae937286345d2d0e0e31d7f54a61846f966f267e66a88fcccbad94475bd7954f178c SHA512 17c505b06ca8c2b1f15a210979061101427500c29719ce87c218d58fd3d2134d827bfb808f5e506a0a596f7f84a3b84b08f42ec4089eb21d16eb4ec57f414b8d
 MISC metadata.xml 328 BLAKE2B 4e16a7208c3f336c1c70b77f2bad7b1bd04c3ba3976b925409dd7caca28b85b938f8cdf67af2901fdeed22e7806ff1f1e1f06fd5a0fbe8cfa23d2713256c04df SHA512 f030ec00edd9ae0d27d387742c17e73e740fbd83923f8a1a476bdfe35909349da63845159b8740da75a495c0d279e816316bba5d0de1e1213b6318ba73600dd5
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
new file mode 100644
index 000000000000..18d209e7e28c
--- /dev/null
+++ b/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tracking of system metrics"
+HOMEPAGE="https://github.com/tibbe/ekg-core"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/text-1.3:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.6 && < 4.14' 'base >= 4.6' \
+		'ghc-prim < 0.6' 'ghc-prim'
+}
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index 81536fa2cb77..a3c9ab0b9ad7 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 1334 BLAKE2B 4ec0055705d4dc357e068d5e2feb0e32a5ff5cbbe0272f015ce1156824fb11ada419d20c2197e9d06b1ae8a9acf455aea4cbfe8d64463c257e378fc863757277 SHA512 395a9ee406735c31c11891dd44c311535472369cd03c5aff25180ee3359deecd5f3f56ac7109753319805a7fb89497a5d87b6ac5d7aebea8795f44d1299c9c26
+EBUILD exceptions-0.10.4.ebuild 1381 BLAKE2B 6721fd21f0528cd5416e00704e3b3d752805827834a7e2315d448e0d6d4170e643a6f3a270d517c870af94da5ebb85ecbe4466b4c66676d8c08fa240b5294cfa SHA512 350b63b4abbca67f9297d8b256eaa12514769d67ab8a72abf03844b91e0da8b172e925706dff1c13b03a234fed48361083674b6effb8db038d2f8ec77679187d
 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 073b42171f4b..987428590228 100644
--- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
+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"
 
 src_prepare() {
 	default
diff --git a/dev-haskell/fail/Manifest b/dev-haskell/fail/Manifest
index 3f910d20d2a3..78b6c5e1f7ea 100644
--- a/dev-haskell/fail/Manifest
+++ b/dev-haskell/fail/Manifest
@@ -1,3 +1,3 @@
 DIST fail-4.9.0.0.tar.gz 2416 BLAKE2B cad36efcb3b93245dd3f90643694d85e6797fce5ee1866c6e8691d9b2845774846b99a7436f854c26daec985f07a9700fe4b2c1a467f2d33bd8a8fa0e6d3058b SHA512 0b4e6111387768482ff10b8ee55ff0b3b04750d8def057b7935bef814902de4536d0825e18b95a342722735b29cf88aafec21eb3b2a75eb4f0c55aa7c6b80108
 EBUILD fail-4.9.0.0.ebuild 713 BLAKE2B e009a7c2280c614a4fa19e4944ce36439fc6c204be955392444e2ae7440a2709589bda5bfd2a59e27cc74a77ddc65e0c12815e25705b31fe3e61728118714c97 SHA512 7f91a97f6eaa0695115112bd04b2ead31700525c399c62fa46defb36756c062d7b8ee77d3ace7664189d04e3956dc0fbca2213b1b7a624839a40c3f9bd37a35e
-MISC metadata.xml 802 BLAKE2B 3233af197b69239c6cec5f3711c9b6ef976fc3a71251298515866d786afb360c02bed95e4d0b614828f91b2fce9ae496c72072423468fba2453f898c95f7f141 SHA512 45b162d2aafda8927d5fd066b5db9340830998aae3093717910e5d39863c329060741e7318312c5f26c0115dd0b583fe77c89a82eca7ad15ac54013be29835c4
+MISC metadata.xml 768 BLAKE2B f0bdd9cacd2e4f2d71e16c0035d40dea007a92694898ee7615678425325bbbf1e5b53b50fbce338f36d116c7521c1ef6d94d08d68fafe80103640795e7fe69b0 SHA512 2f25de4405eea5ba35389329b0bf5984a228800af8c2f7cc03700eb70ee2ee190fc673c96b1f67bd72894570cbb65d2f4e845d16e8d8b47580dd75fb501b1696
diff --git a/dev-haskell/fail/metadata.xml b/dev-haskell/fail/metadata.xml
index 498e6ece3d08..027bc135420d 100644
--- a/dev-haskell/fail/metadata.xml
+++ b/dev-haskell/fail/metadata.xml
@@ -6,14 +6,14 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package contains the &quot;Control.Monad.Fail&quot; module providing the
+		This package contains the "Control.Monad.Fail" module providing the
 		&lt;https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail MonadFail&gt;
 		class that became available in
 		&lt;https://hackage.haskell.org/package/base-4.9.0.0 base-4.9.0.0&gt;
 		for older @base@ package versions.
 		
 		This package turns into an empty package when used with GHC versions
-		which already provide the &quot;Control.Monad.Fail&quot; module to make way for
-		GHC&#39;s own &quot;Control.Monad.Fail&quot; module.
+		which already provide the "Control.Monad.Fail" module to make way for
+		GHC's own "Control.Monad.Fail" module.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
index 0cbd6e1ae9e5..4f3fafe70afc 100644
--- a/dev-haskell/fclabels/Manifest
+++ b/dev-haskell/fclabels/Manifest
@@ -1,3 +1,5 @@
 DIST fclabels-2.0.3.3.tar.gz 24714 BLAKE2B 2bba8892bdacd87fda89106b60752714edd8d2bf15abffe0f1e8cd0b6d17f18f4313e1adbb8c1307de71927936208e65225f9a49b73389f15f1ea9cfccbe82a4 SHA512 0c0f7ed886b65a80aea4e19b5763d7b91ce948b63f86d507ecf0b6874716a190752e0806957c71e0ed0ed97422ba3d09a2be0c82588c8dabfd647474c1a33cff
+DIST fclabels-2.0.5.tar.gz 24612 BLAKE2B 48742838f7d7e6194da0556c55ecfe80512f412f0cf03e30092199917f9037bdd3ce55d2744330e43a11a7c63b007ae8b25c2f2e92a277b7f6d2a65a54c439f7 SHA512 f6cc731d68cdf1e5867340a0b73385492008c2729a144dc685136ee6bf80ee0d0e07ddb80f83a18e6a1989d7f8a8755211aadcc92debffd5fe8c178a834021e4
 EBUILD fclabels-2.0.3.3.ebuild 916 BLAKE2B 7a2f665bd125cb46fcfd8b64702352b6cfd70e4da5f5f4e150fe7d6060e9a8245548ce643cd7a3657ea7338c83b15cea7eee4ece1f3dc78861d67ea977184d14 SHA512 34f7772a6b17826d7dff9ff7b0b5a58dd763a7a1e3b70e2a3385636293e47935b66f3ec3c74926dee3a7139baac7b1d43b2bc1f1db73d5471c27b0b0bc960980
+EBUILD fclabels-2.0.5.ebuild 787 BLAKE2B 25bc1ee81184af22a09c380a67252ddafd378e387ec974cb3d0957f94935c0be3c004768471acfa6a6d5cc7d2721d5da2dcbc785ada76c56861dbd4e15cc9e0e SHA512 00983c40337867333be731b36d9d745fbc00433ff91ac5bd52efc93175815048f757385a914f472a9aa95b2590c55e1e5596a22280790b0aef3fc3a5572b6a43
 MISC metadata.xml 1246 BLAKE2B 094973c2bd67ad69c84e3eb85c74bf4a1a5411f48a57a5b5c066da7ad2bc9b0d59282a8ecc06ddf857621e2ae381511717b7de552be637be1a5c6b5b86282424 SHA512 6000016c8b6806cc9352e0cd76a2655c9c9d09f36a3264a8451a235b2f877d74fe403984d187d3477ed744de562a6493459bc54aec0fe588a23e5ee7e6ce236c
diff --git a/dev-haskell/fclabels/fclabels-2.0.5.ebuild b/dev-haskell/fclabels/fclabels-2.0.5.ebuild
new file mode 100644
index 000000000000..f0dbe54240a8
--- /dev/null
+++ b/dev-haskell/fclabels/fclabels-2.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="First class accessor labels implemented as lenses"
+HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.2:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
index 20dfcf49e206..1020358e60fa 100644
--- a/dev-haskell/filepath-bytestring/Manifest
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -1,3 +1,3 @@
 DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
 EBUILD filepath-bytestring-1.4.2.1.6.ebuild 661 BLAKE2B 6453c72198aef122f54938f6ed442523a2b90d380927aed2c00aeec7c7a0bc27fa1810704eb2b861c45928c5fe5a823adb1379886a96492701eb1017f193ea32 SHA512 50ea1391f7464ac1938ba591bfd2ace4fe26bf6d5a3af6370b75ec406eda0091db4300d4a611fccc1f2cb899c00bcd4895d867e77175f285429885926e080bd3
-MISC metadata.xml 1044 BLAKE2B e6b1abdbd4e39ed61665d4bc99c3bb9d5416dc683a4aba0fec22271d3600574a6fef11efd84aedd624a50ea4be539f93b131598d2e6011d3ccfb9606c6d53703 SHA512 ff1d28f9296a70667be705e2614d220c15c53c003734b951e932b3060308f0482456956aef29f2209c3863ef79e69b97029d16dfb38d9f23b316c7491c972eef
+MISC metadata.xml 1014 BLAKE2B f671b15327bdd4146ad8c16ef63db86bd8ee792a9f5a33e250bdde2dd37f1aac80ebe6bcf954c5e2c6551e16685aaece936dfd08ec1fac63b277ac27087e06d6 SHA512 36f1953f1759ad2aebc3e117ec6509887c9f9d4356d66a7e42ce5bb6c10f98de5135175b0b5680e5333a004f6416877ab80d554430b999f865843cb72d10e594
diff --git a/dev-haskell/filepath-bytestring/metadata.xml b/dev-haskell/filepath-bytestring/metadata.xml
index 89c5eda9bf27..841dd1507998 100644
--- a/dev-haskell/filepath-bytestring/metadata.xml
+++ b/dev-haskell/filepath-bytestring/metadata.xml
@@ -10,11 +10,11 @@
 		values. It can be used as a drop in replacement for the filepath library
 		to get the benefits of using ByteStrings. It provides three modules:
 		
-		* &quot;System.FilePath.Posix.ByteString&quot; manipulates POSIX\/Linux style @RawFilePath@ values (with @\/@ as the path separator).
+		* "System.FilePath.Posix.ByteString" manipulates POSIX\/Linux style @RawFilePath@ values (with @\/@ as the path separator).
 		
-		* &quot;System.FilePath.Windows.ByteString&quot; manipulates Windows style @RawFilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
+		* "System.FilePath.Windows.ByteString" manipulates Windows style @RawFilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
 		
-		* &quot;System.FilePath.ByteString&quot; is an alias for the module appropriate to your platform.
+		* "System.FilePath.ByteString" is an alias for the module appropriate to your platform.
 		
 		All three modules provide the same API, and the same documentation (calling out differences in the different variants).
 	</longdescription>
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index ac6a131b9749..8f48a35bf88e 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1,3 +1,3 @@
 DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60
 EBUILD foundation-0.0.25.ebuild 1014 BLAKE2B 217be1b6cb7318f94badab77cf39a1d5f7a4abfc8ea584c847b426fee928a0f06d6ec3abe3ff848988eb4c1d342bdb8b476d5519b3307d5c714a516456ee858e SHA512 de632b91a9d3a5373067be73666facb43183eadf25a8c0a0a41804fd5ac1b6a5f2fcd1d79f723a546df0ffddc23b777d61c62e1879291223a7f1f5e7c2bf97bd
-MISC metadata.xml 1114 BLAKE2B 41ce470a3203d232d7ecaafdb84a2c972d92ebcd2b9f6b42e9502b7999642a3665eff04a914f8df6b10323f63e311fa10e2afce28bb784962d1fa58ac0921d9b SHA512 bba2cb85bbedd5dc75f56f0cfb1858e6a5c8d38c0c1fe1c25e193f5ba77f82554c092737d439307a7e3494352819820106cc4cc13d3a9559a871cd3bfe4d1a7a
+MISC metadata.xml 1110 BLAKE2B 5e23698b75a35807f1dd4dcbc02342e30f4b578a4e210dc4baa34af63ea381e0dbf36113b0607bed5c61e755df975424b9344087fef0f9675ed876c15e9ca0fa SHA512 75295c41b772997e4988c79f9fe8ea148125b9e3342670e236b7179c76997ada5322923b023afe867072709012ef535508b828fcfa4ae5284e87bd08fcdde84c
diff --git a/dev-haskell/foundation/metadata.xml b/dev-haskell/foundation/metadata.xml
index f3416f8ccd59..f0a6087a3337 100644
--- a/dev-haskell/foundation/metadata.xml
+++ b/dev-haskell/foundation/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='experimental'>enable building experimental features, known as highly unstable or without good support cross-platform</flag>
+		<flag name="experimental">enable building experimental features, known as highly unstable or without good support cross-platform</flag>
 	</use>
 	<longdescription>
 		A custom prelude with no dependencies apart from base.
@@ -15,7 +15,7 @@
 		
 		* provide a base like sets of modules that provide a consistent set of features and bugfixes across multiple versions of GHC (unlike base).
 		
-		* provide a better and more efficient prelude than base&#39;s prelude.
+		* provide a better and more efficient prelude than base's prelude.
 		
 		* be self-sufficient: no external dependencies apart from base.
 		
diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest
index 7e7fb94023f9..e0493f27cf62 100644
--- a/dev-haskell/generic-deriving/Manifest
+++ b/dev-haskell/generic-deriving/Manifest
@@ -1,3 +1,3 @@
 DIST generic-deriving-1.13.1.tar.gz 68256 BLAKE2B 419e50b07d72066a13016c9c0d2cb7f7ad995956ea07763c3345d2e6057e7b428cffa5ba7b58df0230195a05f97f58360640a28a020c41bc3f78dc6f3bb8f924 SHA512 946e3a4da31141fb1156690e0fb51cd3ef0a4f62c0e5b68d0e0d31953d8999885011acb743edd5d0bf88985422c9c74a727dd7f775316911da57ff49716103e2
 EBUILD generic-deriving-1.13.1.ebuild 715 BLAKE2B 01c7bc8b89ea527e96be6e14089af18904ce6477ba087b15976970050f7e0328777b5ed57fee216411acbe6742c6bafe68fa0c0d17504d26f2b2e4f735d83dff SHA512 c1eff3a9e41de8ed2c541d11a4f2da204dd93d9cb74d0364eb41f067c38cbbc3266831c969754798a1441d1354af919934540258e8c40866c69e583148accc5d
-MISC metadata.xml 889 BLAKE2B 335604ba68647b47cc2248fc5a9908f69972a0cafe685f9ef638e4b4da1cefa966ece2967f1531060c42b7ce51e2fb386d054dd3574957c4e10501ba276b1b89 SHA512 6504da89504ed73583423762aaf87c38cf35abf9ca05818540f157062c26f85d29341310c03ad4045f7a8642528e09bca8cf81433b02f5a724b89371156d354f
+MISC metadata.xml 889 BLAKE2B 43b84cdcd3809f024f0cbdbaec538e0b634ee4bcf9ada9f290a5f961ef6527d6522e488d9016b05d079e368b4064c295b0b46d8d6cd9c0890c14393f24d35f05 SHA512 784540f509615219e841424af28fb8297f8d72a539d537c67a56abcbe52dba4d6f69f771335a88ccca69b4ffbc6c141ba4112c09cec7ee56798e8362b159a751
diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
index 9ea87ee12d69..d2cd1627ae9a 100644
--- a/dev-haskell/generic-deriving/metadata.xml
+++ b/dev-haskell/generic-deriving/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/git/Manifest b/dev-haskell/git/Manifest
index 41356e382c36..61ac8961392e 100644
--- a/dev-haskell/git/Manifest
+++ b/dev-haskell/git/Manifest
@@ -1,4 +1,4 @@
 AUX git-0.3.0-monadfail.patch 3097 BLAKE2B 5d826420a9372f79371872eab74b107a8e0b47f7fa125e30a2ecce77844fcda977a528bd5c010d1b2f75a33c68336bccf2ccca74e1114589d2111617a12b905d SHA512 3ea3775ac72cda8182bbf134795f33025ff922d087485ab1fc2abb2e3b260580d3598c56fa85c93b59cda363fe732a0f44959569d809f21cf315f136b11ed0e5
 DIST git-0.3.0.tar.gz 45846 BLAKE2B 93eb07d136085a0512f51b67e2e3b906fc7bee2c63e1bb621570a6123da0e08e87c829c88f7f17ddaf2a9f3cb3b8d5ddc485f83a14c814da86f2863fe17087f5 SHA512 f50061a6b3bccb063f7af74cbdcad33561b45c353ce35b8071ad03b0dd0b6e0d215381d6145dfeeff8bb66fbcef0379a9d749a8a1c1f8e45857b0c6bc4574f29
 EBUILD git-0.3.0.ebuild 1160 BLAKE2B 8272efd6f046c3d95f65a886d788ed3f40adb225bfffdca0cfa7341baace350384ac5922e8111876305473f19d1f99e2c8666b227a9ea223a07c47a99fabd06f SHA512 ba19073392e5e818cb85a17763df12084bf88fb4bc9deeb3f5164d21f71d88a65286f9af4c2b69c6bda9ad9c1b63ea0005251abe1bcdb54c9e2b483a7ee4bc58
-MISC metadata.xml 666 BLAKE2B a16f733e871a14cbcc3baa90b77552628f425d2268eb727a4255104195f54da0be0518de7e34509e6f98a56746ad1de0fcdfd47ebf013225161fc6b410ea4a1d SHA512 1c27601184979a61fbfea352c04e8ff6005a99518ba91229f16e8646579f94033c2d384571fdc2a706c2eec001cc275094e5f85a6e61fd972d7ee7c7dfa0702e
+MISC metadata.xml 658 BLAKE2B 6fc2a6efb62e47dc3f3c4ac3396e2dc534b3acfacc921be0dc2620b16e043dccb5660ad0181dde25a1601c8de11df006d006a6bc729543f2eeedd42593513e3b SHA512 6ee499db9d46196ff1a64c0d4cc8c6726f1b510f9b6c3c0371ce9d884768d5b24e0a54cbb7a6dedd39c6e29056fd2359d149a64023c0a4c01f9847334741e300
diff --git a/dev-haskell/git/metadata.xml b/dev-haskell/git/metadata.xml
index 4cbbb473028d..d4679569e5ca 100644
--- a/dev-haskell/git/metadata.xml
+++ b/dev-haskell/git/metadata.xml
@@ -12,8 +12,8 @@
 		
 		This implementation is fully interoperable with the main C implementation.
 		
-		This is strictly only manipulating the git store (what&#39;s inside the .git directory),
-		and doesn&#39;t do anything with the index or your working directory files.
+		This is strictly only manipulating the git store (what's inside the .git directory),
+		and doesn't do anything with the index or your working directory files.
 		
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/gitrev/Manifest b/dev-haskell/gitrev/Manifest
index f74232e7d6f3..648ce0b2e2c9 100644
--- a/dev-haskell/gitrev/Manifest
+++ b/dev-haskell/gitrev/Manifest
@@ -1,3 +1,3 @@
 DIST gitrev-1.3.1.tar.gz 3756 BLAKE2B 6871cb2c036bba9d6e727749778e0e16939a4ff84cf5ca74caf0c198a998265a8cbeea2019ba12e1e6190413499ed1b82874bd002416d620b70bcfd85bfcce1f SHA512 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd
 EBUILD gitrev-1.3.1.ebuild 589 BLAKE2B 2d2b045f516ec3525fb1331d511102ba7f7b1b5af0e8a95d5dd83186c4c59b9d1f96002c79c24e88a44241aac36dc122604ac1f34728603454f3ff059458ab1a SHA512 5c464716bc74c3153d80a4f1ed20406e07d9e06b967482a834a7c6a36a52de14fecf436dc539f7ddb33a45f485427a81f5aad9d6e58e9bc153a7c9399113f1fc
-MISC metadata.xml 595 BLAKE2B 5a06ef55070d88cb66e56e0355747df3eac531e986104588ced77148f56c9279920d6dc3f700ce9b3d3d6a4be18e8643ca2f7ad449a83e73f9562c64c1d52892 SHA512 cc629c279fc1e19e374e312f42b1cc26850aed821b51aa2f1660abf8a131c17c66d184279b4a127138f74ad5405fbd05ae871b38c41bf054f117507a2cbf0c80
+MISC metadata.xml 595 BLAKE2B 3cacd1362c0a5bc6bea6be877b4e9c4a30b0573fae0f1d2fe4ac6ef1702eb461776ba57901ab34c8450648d0cb2698909d2cbe969150742f0848f25b46e8ce59 SHA512 6e69ea800156141ad75f077030c29c81b755a26c67d1c02ab09036e49b9210fc601fc36d1a9550e93789411c2d25ac4b9fc9bb308245e78a447b798789c1aebf
diff --git a/dev-haskell/gitrev/metadata.xml b/dev-haskell/gitrev/metadata.xml
index 8f5eeed7fe9d..46a8c690ceeb 100644
--- a/dev-haskell/gitrev/metadata.xml
+++ b/dev-haskell/gitrev/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index 7e233eeb1ec1..4bf63dacad96 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -1,3 +1,5 @@
+AUX gtk2hs-buildtools-0.13.8.0-gcc-11.patch 1156 BLAKE2B 5d3485191fd380343412f977baf6e0d434235f012e425118317e5f9c810d4e7b4bde64c5683e912aea098afe84dd9d45f9e458e88214c005943f6ea919ad5987 SHA512 f01350cc6603d0b8cdd4ad4ba4539cd307058c81a4452e8a455c5c612e6a5e1156ffe71518a8fe762e4a56c8f0d173e9cf7fac498b2849e48ce811c511186cce
 DIST gtk2hs-buildtools-0.13.8.0.tar.gz 178465 BLAKE2B 73a3bea8e002ba641f08f3104b7c8759dba2649e8b050ac769470c7d67441e86365c4687f2645fed62cb79cbe38947c02c2622224e4568440a8d2745a045b333 SHA512 fa427979f20f10ca8baf38c80c28a5190d18b767046de347950ea799660e1d54939d668c01c469da36d2df6c347f7ba67e2e85f3a7000021f8d37852093e03fd
+EBUILD gtk2hs-buildtools-0.13.8.0-r1.ebuild 903 BLAKE2B a0f2c7dd51499141373eeb955bdb3ef8a682d9617db029add65b7d88dbfc0b2139a0bf3a2d2deeeeeb40cec10d132068b1670494ac25d35b1b426fb54ffe33a3 SHA512 5241a5a51445b76b425d1df8ad5fb415e24f36d321391ee309aea7e8f23e15ac5f1e8d94ea5af98e22a5398c639f1a8e84cac44424edacebbf6340a20d4d7166
 EBUILD gtk2hs-buildtools-0.13.8.0.ebuild 850 BLAKE2B 6006f7d07dc50a6eef337b058e23f074b5dc827472a5b49c4ba244ceb7490955a25db68bf6f186d1894613935b398083fb0451a849241439d8e30c1e605df98c SHA512 240a9459683800f4bec0e994a2b6fd2411a82b5284f9e2a14a22caeb6d822e9974015d8311395e9128eb35e8bb336925114ff32e0588b66823bb750b8464941f
 MISC metadata.xml 838 BLAKE2B d807057f72ce471a31e5eda4e4c26d8c2e7a6e5c6a932dc577c293d5f52704ce64b055a2dc194fbce71d8028ee7d5dca05f863fa2519fc841f585400d05849de SHA512 81b67b9c4d461b291561a2ee3873c80c257fc0e3e8641724381567d378aafae21f8056b60b00d432a0db60f5795d6b7a78a74cce9e10722b809f46c6701e7feb
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
new file mode 100644
index 000000000000..123c1359ff1b
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
@@ -0,0 +1,32 @@
+Same fix as https://github.com/visq/language-c/issues/74
+
+"""
+Lexer: allow zeros as line numbers in preprocessed directives
+
+Starting from `gcc-11` initial line numbers not related to
+actual files are marked as zeros. See the "preprocessor:
+Better line info for <builtin> & <command-line>"
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9
+
+language-c's grammar did not allow it (by accident)
+
+```
+Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos
+Left <no file>:: [ERROR]  >>> Syntax Error !
+  Lexical error !
+  The character '#' does not fit here.
+```
+
+The change allows '0' in line numbers as well.
+"""
+--- a/c2hs/c/CLexer.x
++++ b/c2hs/c/CLexer.x
+@@ -130,7 +130,7 @@ $white+					;
+ --  * allows further ints after the file name a la GCC; as the GCC CPP docu
+ --   doesn't say how many ints there can be, we allow an unbound number
+ --
+-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
+   { \pos len str -> setPos (adjustPos (take len str) pos) >> lexToken }
+ 
+ -- #pragma directive (K&R A12.8)
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
new file mode 100644
index 000000000000..30ffca890e99
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+	dev-haskell/fail:=[profile?]
+	dev-haskell/hashtables:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.18.1.3
+	dev-haskell/happy
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.8.0-gcc-11.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closuresignals closuresignals)
+}
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index 4a8f14183fe8..fb2e81ffaebe 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,4 +1,8 @@
 AUX hackage-security-0.5.3.0-ghc-8.8.patch 720 BLAKE2B 1761f38642335f28a17d4bb089cf0f0de8acf4b14767e3c5987f723e520000865080c69e29d6a35870f0b5cca44f67371686beb84ff023d73fcd13fbfd89c962 SHA512 d220ea358e59a8b965695006ade99dad369a4648ab77012d0a7e3413d90d37809887f449b9e4831f97d2e871205f3b3d86fa4977ca781eb028993d393f002031
+AUX hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch 602 BLAKE2B 114b64c1e15b260b64ca68b2aadb1b4f462f160ec58cad2669d496083f28757f87474f76f6b8bbf203c80bb75106d16bab451af528f81edbf7a323a290c24cf7 SHA512 0380ed545b38e3a6f8c6b0232be2417a8e54a2f9027551247d3e796a82424cce21e62897a1f55924b757b19c391c5d411495c1e279821b5f6be27fcf57179c85
 DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
+DIST hackage-security-0.6.0.1-r1.cabal 12313 BLAKE2B 41dbb4a5b175fe49ab65dba01aa1cbd1a43fbf55fc9cd06697dc984f9a3917d3da5c9c3234e336b78372899848b0fa5adf09f0507617ed0835dfad1443eb62ab SHA512 f4a8d2adde837af18587d74cf4191bc12dec22802aaafc4cd86968d893a41bf912d3649be339503063f8c698a4b8a62888ad50e0e58d3836cc55de100ca51e30
+DIST hackage-security-0.6.0.1.tar.gz 86006 BLAKE2B 6d057da569beb4e30f91a630ec37247fd47a3467e6037ebf0c4391ff58d95d5477bea09f7d66ab6d0bbe49a445ea15d53ded884f9ea7922583a03ba7497cdd9a SHA512 b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb
 EBUILD hackage-security-0.5.3.0-r3.ebuild 2638 BLAKE2B 3e51aaaf5e00c49d738ff7ba0157957acd79a557f7a96249048038f54789dde0e3b7b9b5217a845973e2de8e201a0d6f8f4b4a0d2d1f25482f2c5b1718d7064c SHA512 0090fb12f14d8a265d69740562e481ac5636e4daa7b97c3f2bcd97e67d7495a45f3fb08792d162b753ad07c8b55fb6e3b2d4808d9da228e6c7b7c5718003bb82
-MISC metadata.xml 1347 BLAKE2B 4b6d1718cd6cc1ce9c455413eb9c96079ef724007f997b7495c6886161dfef3dd835d8371943a6962c108b8636f0c430cd0e572a70d6ec6d4f02188bc756a2a2 SHA512 d3e388264352de1ace5022bd843c68454476c65bf8475f4e00dc455da01f128b36d2b1122c452227157d3ca9529d2a8e14df5fc8cb51c6f53bea2c3770f17469
+EBUILD hackage-security-0.6.0.1-r1.ebuild 2560 BLAKE2B 821843587bd007c7de6b72b671d082462254a290fd866d7c7dcec186088860a6180d126f6e8c69167275493dddcf7bcec18805971989273b72c8aac595b45f28 SHA512 66780d0440e1fbdbb7fb3b8396cb10bff59bc7cebbfc618bf569c71b0dc631dbfe24d1fd34d5665b1efb1022c5a954884202bac02c929cf6d2975bbba43b35a8
+MISC metadata.xml 1319 BLAKE2B cfadd7855c2ac34d82c8e824219403207a705a52761b9faa7c002706a1d4379f0763a503778ccb6b51fd0c882efbab4bf2e95e4a8e034160158a54b1bb1284a8 SHA512 72182d8681d39c56c436cb898105409f749c4fcc12b5be91f250127989f57e989da9eedef29af0aa0467fb03f522e1617e01314f61af44a499f68f3914a0f8ae
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
new file mode 100644
index 000000000000..fd83a5113c56
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
+index 598e151..f62f1c5 100644
+--- a/tests/TestSuite.hs
++++ b/tests/TestSuite.hs
+@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [
+           testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical
+         , testProperty "prop_roundtrip_pretty"    JSON.prop_roundtrip_pretty
+         , testProperty "prop_canonical_pretty"    JSON.prop_canonical_pretty
+-        , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
++        -- , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
+         ]
+   ]
+ 
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
new file mode 100644
index 000000000000..e10ab6c3c0b5
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# 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: -mtl21,+use-network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/4.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86"
+IUSE="+lukko"
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.6:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.4
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.13 )
+"
+
+# See upstream issue #247 for more details, https://github.com/haskell/hackage-security/issues/
+PATCHES=( "${FILESDIR}/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch"  )
+
+src_prepare() {
+	default
+
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lukko lukko) \
+		--flag=-mtl21 \
+		--flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index 47b37051ae7f..9f0ec91b2400 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
 	</use>
 	<longdescription>
 		The hackage security library provides both server and
@@ -26,10 +27,5 @@
 		clients (the typical example being @cabal@), and
 		"Hackage.Security.Server" is the main entry point for
 		servers (the typical example being @hackage-server@).
-		
-		This is a beta release.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">well-typed/hackage-security</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index 1c2e6dd453b3..0f8f0f4d9ec7 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1,8 +1,6 @@
-AUX haddock-api-2.17.3-ghc-8.0.2_rc1.patch 747 BLAKE2B 743b22c933a793ed5006664ff78b7b1691e8ea745f8dedf080a426c2daaadc69d4e7dced80e9872c7e6a65c56cf2946cf24f75219b2e9b8dc361598c8f27fed8 SHA512 813823790fceb96c8b314835896dac165bd4e91f888090c65cbe91dc2ac026e2d0bd79acb40974154252ea106a7dcf56d80da6af4dd67db59f8004166f29bf08
-DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
-DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
+AUX haddock-api-2.24.0-ghc-8.10.2.patch 6161 BLAKE2B d13f756bb8736d320f00c06bc654b684ab5dff03df0f58a5a895ba61f038e8566a08a1174a62c984e94f2ce145ecf7a443a9b453f7260e09dee1d7caac4de551 SHA512 351c34536d3faccececd4ccbc3f6b8aa9bf03438d65ef46788496be9455ba9d7c1db4bb6fdc1b185ad014ec06ed7e1ab94dddf72be56a1205ae95a6e6167d448
 DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
-EBUILD haddock-api-2.16.1.ebuild 837 BLAKE2B 5714c573a889ea1ab25d4348abac1c0ad4c090c4d0993d50ee7b43e09ea0e8a90fee5e20cf1b5ea36473f963d3933d41931eca20afa2d2b46f78e06347de022e SHA512 c72fb8c9e0e3d0ea5d021931ef7f50acf255b680218313f7c812b4ea812c8dd3d86cb7cb0a9e092f79a33aff5996f2484982267dcaf6f4c7d2b8b223b96e64cb
-EBUILD haddock-api-2.17.3.ebuild 1050 BLAKE2B fa65189aeb89200c0d55a4e30b29cda630d346ba3d6a6430a331f83515f73a626913080e02b6af7b9bfcd60ee9204cd548ed4da943128e4547e8e2fd760dc37a SHA512 1cdc9ddeda2cad2193975ebd504d2ebb1d319f6aaf0f0b3d10cd677b14880e7495eeeddf701820b34cc6d7f8b419ff63887b0dee099d15f687166ab3970f500a
+DIST haddock-api-2.24.0.tar.gz 200478 BLAKE2B 5c4f7be45066583e3d3afa0b1866070f2c05d71685526b0d915461f75208f13cf6bbf2b91cc820e1f229df9dbf240cfef150fb3a9929878cfdc02db9dc124c99 SHA512 dfbe5bcfd722dc92ec70aca2dd681da9e122f60ec3da5c9583c188f65b11bade314c64d4af1a3a51cf8f618d8bea943bd4052aa9860ece38ab10717b484ed057
 EBUILD haddock-api-2.23.1.ebuild 1087 BLAKE2B 937fb9b076c2081f74228d85f11366b937ebfcf450a04f8eccf0ce43b03a8c8c13657a4571a873db543b346c853658bee39c6706857e69342eea953b7e27cae5 SHA512 d795bc7254f46790f615b6a6d507ed8693c1cc84bab3fb143f5e9201d486d77459579705f22cb1e335a6dca6532621e10eeafddb0e5ca0721b5771f346834918
+EBUILD haddock-api-2.24.0.ebuild 1146 BLAKE2B bbc12c4eda94191c71bed7a5cb42b550a75d7c1310cf1851452cf67e235df15e771470a41eb5fa42670abca079cb03fd3f8fedeedde56360e7c741279a130c01 SHA512 1bde64fd2ff4ef0337ac2050e08b71dd3b7d323b35a9ac5a1efe3392552b205d52ac1fb9d5e460efcef512c17ecafa0ee34e853867946377a30042c2efb40805
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch b/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 6aafc8f37522..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
-index eacf447..458d15f 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
-+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards, CPP #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -450,2 +450,3 @@ instance (NFData a, NFData mod)
- 
-+#if !MIN_VERSION_GLASGOW_HASKELL(8,0,1,1)
- instance NFData Name where rnf x = seq x ()
-@@ -453,2 +454,3 @@ instance NFData OccName where rnf x = seq x ()
- instance NFData ModuleName where rnf x = seq x ()
-+#endif
- 
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
new file mode 100644
index 000000000000..84c275fbb348
--- /dev/null
+++ b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
@@ -0,0 +1,147 @@
+From e455bc18e15adf05a1f32bc7c4512eedb7ab889f Mon Sep 17 00:00:00 2001
+From: Alex Biehl <alexbiehl@gmail.com>
+Date: Tue, 8 Dec 2020 19:42:52 +0100
+Subject: [PATCH 1/2] Changes for GHC#17566
+
+See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469
+---
+ haddock-api/src/Haddock/Backends/LaTeX.hs     |  2 +-
+ haddock-api/src/Haddock/Backends/Xhtml.hs     |  2 +-
+ .../src/Haddock/Backends/Xhtml/Decl.hs        |  4 ++-
+ haddock-api/src/Haddock/GhcUtils.hs           | 29 +++++++++++++++++--
+ haddock-api/src/Haddock/Types.hs              |  1 +
+ 5 files changed, 32 insertions(+), 6 deletions(-)
+
+diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
+index 647812f93..024a6c513 100644
+--- a/src/Haddock/Backends/LaTeX.hs
++++ b/src/Haddock/Backends/LaTeX.hs
+@@ -255,7 +255,7 @@ declNames :: LHsDecl DocNameI
+              , [DocName]       --   names being declared
+              )
+ declNames (L _ decl) = case decl of
+-  TyClD _ d  -> (empty, [tcdName d])
++  TyClD _ d  -> (empty, [tcdNameI d])
+   SigD _ (TypeSig _ lnames _ ) -> (empty, map unLoc lnames)
+   SigD _ (PatSynSig _ lnames _) -> (text "pattern", map unLoc lnames)
+   ForD _ (ForeignImport _ (L _ n) _ _) -> (empty, [n])
+diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
+index f80a9c05f..541f40c4f 100644
+--- a/src/Haddock/Backends/Xhtml.hs
++++ b/src/Haddock/Backends/Xhtml.hs
+@@ -407,7 +407,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode pkg qual_opt ifaces = d
+     exportSubs _ = []
+ 
+     exportName :: ExportItem DocNameI -> [IdP DocNameI]
+-    exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc expItemDecl)
++    exportName ExportDecl { expItemDecl } = getMainDeclBinderI (unLoc expItemDecl)
+     exportName ExportNoDecl { expItemName } = [expItemName]
+     exportName _ = []
+ 
+diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+index ef0ba1b67..30b8d43eb 100644
+--- a/src/Haddock/Backends/Xhtml/Decl.hs
++++ b/src/Haddock/Backends/Xhtml/Decl.hs
+@@ -536,6 +536,8 @@ ppClassDecl summary links instances fixities loc d subdocs
+     -- Only the fixity relevant to the class header
+     fixs = ppFixities [ f | f@(n,_) <- fixities, n == unLoc lname ] qual
+ 
++    nm   = tcdNameI decl
++
+     hdr = ppClassHdr summary lctxt (unLoc lname) ltyvars lfds
+ 
+     -- Associated types
+@@ -794,7 +796,7 @@ ppDataDecl summary links instances fixities subdocs loc doc dataDecl pats
+   | otherwise = header_ +++ docSection curname pkg qual doc +++ constrBit +++ patternBit +++ instancesBit
+ 
+   where
+-    docname   = tcdName dataDecl
++    docname   = tcdNameI dataDecl
+     curname   = Just $ getName docname
+     cons      = dd_cons (tcdDataDefn dataDecl)
+     isH98     = case unLoc (head cons) of
+diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
+index 0874e7b4d..43fe3e774 100644
+--- a/src/Haddock/GhcUtils.hs
++++ b/src/Haddock/GhcUtils.hs
+@@ -58,8 +58,7 @@ moduleString = moduleNameString . moduleName
+ isNameSym :: Name -> Bool
+ isNameSym = isSymOcc . nameOccName
+ 
+-getMainDeclBinder :: (SrcSpanLess (LPat p) ~ Pat p , HasSrcSpan (LPat p)) =>
+-                     HsDecl p -> [IdP p]
++getMainDeclBinder :: HsDecl (GhcPass p) -> [IdP (GhcPass p)]
+ getMainDeclBinder (TyClD _ d) = [tcdName d]
+ getMainDeclBinder (ValD _ d) =
+   case collectHsBindBinders d of
+@@ -221,6 +220,31 @@ getGADTConType (ConDeclH98 {}) = panic "getGADTConType"
+   -- Should only be called on ConDeclGADT
+ getGADTConType (XConDecl nec) = noExtCon nec
+ 
++getMainDeclBinderI :: HsDecl DocNameI -> [IdP DocNameI]
++getMainDeclBinderI (TyClD _ d) = [tcdNameI d]
++getMainDeclBinderI (ValD _ d) =
++  case collectHsBindBinders d of
++    []       -> []
++    (name:_) -> [name]
++getMainDeclBinderI (SigD _ d) = sigNameNoLoc d
++getMainDeclBinderI (ForD _ (ForeignImport _ name _ _)) = [unLoc name]
++getMainDeclBinderI (ForD _ (ForeignExport _ _ _ _)) = []
++getMainDeclBinderI _ = []
++
++familyDeclLNameI :: FamilyDecl DocNameI -> Located DocName
++familyDeclLNameI (FamilyDecl { fdLName = n }) = n
++familyDeclLNameI (XFamilyDecl nec) = noExtCon nec
++
++tyClDeclLNameI :: TyClDecl DocNameI -> Located DocName
++tyClDeclLNameI (FamDecl { tcdFam = fd })     = familyDeclLNameI fd
++tyClDeclLNameI (SynDecl { tcdLName = ln })   = ln
++tyClDeclLNameI (DataDecl { tcdLName = ln })  = ln
++tyClDeclLNameI (ClassDecl { tcdLName = ln }) = ln
++tyClDeclLNameI (XTyClDecl nec) = noExtCon nec
++
++tcdNameI :: TyClDecl DocNameI -> DocName
++tcdNameI = unLoc . tyClDeclLNameI
++
+ -- -------------------------------------
+ 
+ getGADTConTypeG :: ConDecl (GhcPass p) -> LHsType (GhcPass p)
+@@ -761,4 +785,3 @@ defaultRuntimeRepVars = go emptyVarEnv
+ 
+     go _ ty@(LitTy {}) = ty
+     go _ ty@(CoercionTy {}) = ty
+-
+diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
+index c2cf08bb2..853f4b1b2 100644
+--- a/src/Haddock/Types.hs
++++ b/src/Haddock/Types.hs
+@@ -789,6 +789,7 @@ type instance XDataDecl     DocNameI = NoExtField
+ type instance XSynDecl      DocNameI = NoExtField
+ type instance XFamDecl      DocNameI = NoExtField
+ type instance XXFamilyDecl  DocNameI = NoExtCon
++type instance XXTyClDecl    DocNameI = NoExtCon
+ 
+ type instance XHsIB             DocNameI _ = NoExtField
+ type instance XHsWC             DocNameI _ = NoExtField
+
+From e1fe49e9458a5d5161adc8b5b8bfea6437a9eedf Mon Sep 17 00:00:00 2001
+From: alexbiehl <alexbiehl@gmail.com>
+Date: Tue, 8 Dec 2020 20:03:49 +0100
+Subject: [PATCH 2/2] Import intercalate
+
+---
+ haddock-api/src/Haddock/Interface/Rename.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
+index 78c585814..4d9eadac5 100644
+--- a/src/Haddock/Interface/Rename.hs
++++ b/src/Haddock/Interface/Rename.hs
+@@ -29,6 +29,7 @@ import TysWiredIn (eqTyCon_RDR)
+ import Control.Applicative
+ import Control.Arrow ( first )
+ import Control.Monad hiding (mapM)
++import Data.List (intercalate)
+ import qualified Data.Map as Map hiding ( Map )
+ import qualified Data.Set as Set
+ import Prelude hiding (mapM)
diff --git a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
deleted file mode 100644
index eb3209d4acbb..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
deleted file mode 100644
index f2203d2510d2..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
diff --git a/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
new file mode 100644
index 000000000000..d17fc17abb38
--- /dev/null
+++ b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib hoogle hscolour profile test-suite" # haddock
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="https://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
+	>=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
+		>=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.11
+		)
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.10.2.patch )
+
+src_prepare () {
+	default
+
+	cabal_chdeps \
+		'QuickCheck      >= 2.11  && < 2.14' 'QuickCheck >= 2.11'
+}
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 7f768b46ac93..f26679d873e5 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,9 +1,5 @@
-DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee142471b8e7f53f5a77e89265211588cc80719e7fec49e35142b8288b4632a0548def65f9f2966d6838d79e75ec1574588336 SHA512 5f1a592af66a054482fc06ca8d974db0ebd4e42b383ec6b3fd7d44d155bd89c567013af1266e697b76a96b4d39486bc22eac7eb4b1d6842ec0f842533ac8dffb
-DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
-DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
 DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
-EBUILD haddock-library-1.1.1.ebuild 664 BLAKE2B 94b5fb56dea2859cbd27f2bfdef9eba77b0e3c1d0e6085fda4d054788560c847748ab160585a02cd99de9b301d9a84483033c2e1feb9e806bf9ac7043e33ccdb SHA512 f455d52e5873b98bd051a4af099e01611f3dad910e48accfa786073b9723fe24c03c51d10c41e0483eddc52d08d80c12b0baf6957b744bd0bbabc0570e867242
-EBUILD haddock-library-1.2.1.ebuild 788 BLAKE2B 6689b94bc4291968a9b03d5778386e42a532537ce1a777a3f70f8befe1252c5e2933302c42ce1f5b3776f215a779bd8c3df078d13c488a72f3784f9217fae612 SHA512 385574c9cfd9106f5d815f438461c4a3cc0cb3fde763e8274757d6c05afa34b08824f779dc538d56df4e516e480459bdaa49148e4b2fc8af90a4297c04da45ea
-EBUILD haddock-library-1.4.2.ebuild 803 BLAKE2B c79dc51e3bb499e40127ead0cea5c873ea52442bae3b5c2b9d7e8837c5e7ed2db842a2bc52bd955e060c7d19d51c900d1cf7cbf1a849f71bfe8fe6ab0a87727f SHA512 9fa9237bd3befd6cbfee8b146cccf0e06327736ce985a2758813d38b1967bc36dc4a80273d373412fcbe38b5c060f51f3f7d3ea27cd79f21b0bd223c4da7c5cc
+DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d SHA512 ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5
 EBUILD haddock-library-1.8.0.ebuild 1269 BLAKE2B 746fc2165ee259ef53bbe513028b2eee7dcf1b676f34d8916e8365a7fbc68155b8d5a576cde611d7c4989aee8d84a6979c70731c919b41cdb7eb27f12fdbfd13 SHA512 ed721288d65543cdb488e30d64912725fe67bfb493259e536127ee4eb5f529c4a26a6b08e59d6fefad6df2efe2379af1aa0297e18250b92aaaf6dafa3cf63542
+EBUILD haddock-library-1.9.0.ebuild 1350 BLAKE2B 803ede5107f1c85c2113b78c5f7229726bab76665464dd33ce55716439071870eac145d80ca8789250afe365d09d6633154fb5cf6bae9646a288841497e363fc SHA512 41889bf7c0f9db230a7075512378b1c2567d05a1dd933f969011858bb3d6fb404e34870b52ca3d489e6a2a7748bc4afd3f5eedcfc8841f8fd0297044f5d98182
 MISC metadata.xml 649 BLAKE2B 3009fffda0bdf4a08fb7014a168578c8054cd7e701ca254b12debebf6aadf7a36d968d3d39a555767aef11646e2cc71707ab40f5ad77bc85923bdac3a3ac45a3 SHA512 316469b542dcc67cbf2c6f28a2cb7c3321fc13654349c59631c185ceeb2bc55b78d23b2bbb224ab7b19b1aa0d2d8237fb9ec98693e4420fe8e1556e5acd370cc
diff --git a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
deleted file mode 100644
index 0bd4c0f1af69..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
deleted file mode 100644
index b1001acdcbff..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.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
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # on ghc-7.6 Prelude collides with base-compat
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
deleted file mode 100644
index ee68c2a4a112..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.4.2.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
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1, might not be required but needs porting revdeps
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
new file mode 100644
index 000000000000..59c2d563d118
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/hspec-2.4.4
+		>=dev-haskell/optparse-applicative-0.15
+		>=dev-haskell/tree-diff-0.1
+		>=dev-haskell/base-compat-0.9.3
+		>=dev-haskell/quickcheck-2.11 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat  >= 0.9.3' \
+		'hspec                          >= 2.4.4    && < 2.8' 'hspec                          >= 2.4.4' \
+		'optparse-applicative  ^>= 0.15' 'optparse-applicative  >= 0.15' \
+		'QuickCheck   ^>= 2.11  || ^>= 2.13.2' 'QuickCheck   >= 2.11' \
+		'tree-diff             ^>= 0.1' 'tree-diff             >= 0.1'
+}
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 75b1fc491097..dc7423b48ab0 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,9 +1,5 @@
-DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff35e1d104fcb05c4317f16e78c0517b27529c1fab28e2ee4f2e14cbf2db592ff88a6b01d1840193c9a69233230fec1ffc423 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be
-DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
-DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
 DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
-EBUILD haddock-2.14.3.0.7.8.3.ebuild 2043 BLAKE2B a29324b23bef8dbe8c0b98c016b52fd03abed1fb4a98207da810fca269849f1477d5e1a714b03e8bd0740d722cd82ccdf80b56bfa71bacc477fd5557cc62bb5d SHA512 b621458d9f193609c91455ba10ec2f2739d02d615b6e5036810fc55b0857089b65738112b110fd8e1b9ce1dd7b7f3d73dc9b0eae6f6db915d8905ccee74d779a
-EBUILD haddock-2.16.1.ebuild 1929 BLAKE2B 425c9d7869257bb06c50187025028083c3ccb4951c1c01682b2ab3d941f1649362926092b1e8ab323545332011f22ee12e365f91179e1c7ae3ee41f634b98510 SHA512 72ea7e1422c97b5496f306b150a2b90751ac65c3886040b83f27014fa97c04315da2636a83dc97535e0fe62aad589f5aff059385ca249d472c040a94d5685516
-EBUILD haddock-2.17.2.ebuild 802 BLAKE2B 8498ed4ea1900e4e28c5a76977bc33c74010ebea30f9376230e1cc839e60df7fd9b7a972594f75b7050647f60220910280ca162a2266aad782cce89010a7b3b7 SHA512 c0291127f88ab1ae5134343eb2eea1fd7890efe128835e1f2208f44fc04b5b690ea7913eae4ae3784ee9ca9f56b94f40a903769318d9d83706f2c3667edf59a7
+DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036 SHA512 52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003
 EBUILD haddock-2.23.1.ebuild 815 BLAKE2B 9bc7ba6da63c4f8befb46acbe62384a58fd2b766d2561ce3d1fb5a66e9b9c20fa1392a34b93af1de0f8feae0c0a517e1cba4e476db5865489ba7c9c9cb4ea21d SHA512 6b9f03e5bdea82ec6defd6e32b35ab67ba097e07e0fa24b9022dbe75b081e927b7f84422617d8bb281b54675f86af67e04bd83bd2f61a6552ea8dc494e5ffede
+EBUILD haddock-2.24.0.ebuild 823 BLAKE2B b5ddbb9e087fc2066abdc54b48051b4e0e3fb5a7e9ae98a72aaeb60ac941c9ad1ead665107890c100f38c3abc5737886e2d6b2a38912a046f4f7fc96f759287e SHA512 8ab5b3f12c55fed3b777de550ab0fc707c6d5f7c7a75b1a885c9623eb047ef19266d0af34abd534a5ea4a2e3ede0bc30a3f2a4439cae9ff7713459be4d44bb65
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
deleted file mode 100644
index c1349a930c8e..000000000000
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-#SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # many test depends are not keyworded yet
-
-RDEPEND="dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
-"
-DEPEND="${RDEPEND}
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
deleted file mode 100644
index 9e61f53b16b1..000000000000
--- a/dev-haskell/haddock/haddock-2.16.1.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
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # tests are outdated
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	>=dev-lang/ghc-7.4.1
-	~dev-haskell/haddock-api-2.16.1
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--flags=-in-ghc-tree \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-	pax-mark -m "${S}/dist/build/haddock"
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.17.2.ebuild b/dev-haskell/haddock/haddock-2.17.2.ebuild
deleted file mode 100644
index e37d8cb4a761..000000000000
--- a/dev-haskell/haddock/haddock-2.17.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # there is no haddock-test on hackage yet
-
-RDEPEND=">=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/haddock-2.24.0.ebuild b/dev-haskell/haddock/haddock-2.24.0.ebuild
new file mode 100644
index 000000000000..08f165ce877f
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.24.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -in-ghc-tree
+
+CABAL_FEATURES="" # broken test-suite
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="https://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # test suite unavailable on hackage
+
+RDEPEND="~dev-haskell/haddock-api-2.24.0:=
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0"
+#	test? ( ~dev-haskell/haddock-test-0.0.1 )
+#"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-in-ghc-tree
+}
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index 701a8dc9e623..34f98ac01f15 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -1,3 +1,5 @@
 DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
+DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f SHA512 e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e
 EBUILD happstack-server-7.6.0.ebuild 2268 BLAKE2B deba298727d88769becf6c5a0337a774c0e45f5004d224c6a1cbad33f3d9b1f037a4c4831ea5dda714b820db6838a30d4442b3a0352d598f1ff22a3d1ef56a67 SHA512 b21bc776e44188d8381e679cbf73b3f14b852248efe7f76fa8ea2642bd225f5af6fcf71b8e59c382edbcb3a4e571560220050e8520b651019b69148848c306d1
+EBUILD happstack-server-7.6.1.ebuild 2201 BLAKE2B 713d1d27e330f7e213c048ba112ac57ce3007138842b937dcdf71cd29bf11ea28de69456f7b24be8a3fafa2b984fbdf85af9b30eb5b0e65ad833ba3c3d76d908 SHA512 d6acc83a0d38c4b3f5da2d3f9993dd23d042860cbbdcc3e404a1daa8f37e8a82e1b01309cb1d1509eb2b2b24ee146e4f3f5d345bc91140445b1f954924f1436d
 MISC metadata.xml 783 BLAKE2B 51a13d512979778ff2fbfdad3eaf90e5ec64aaf086aef3e7a65f4ad544e718b5d08e68505b3446ba3c3fcec76a00e957ea9d534c85ab2f31d1f02088391eb7c8 SHA512 c85819776184a2a11e2ee9f4217000cafcd1c8f357f8875829483aa5ca16796cac2ccb113a392dde6b1653eb1478498320f931551e48fb59468bdcccf5a2248c
diff --git a/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
new file mode 100644
index 000000000000..fd564869651b
--- /dev/null
+++ b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
@@ -0,0 +1,55 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web related tools and services"
+HOMEPAGE="http://happstack.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/hslogger-1.0.2:=[profile?]
+	dev-haskell/html:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	<dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?]
+	>=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/system-filepath-0.3.1:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/threads-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+			>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index f78dd182109a..b041b2d78571 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
-MISC metadata.xml 759 BLAKE2B 9b5adebf002ce3c46477b073dfb0859a2635156a0b0344c6da5748e3126494682814d4712b8d5e47aaacbdabf7ecb2b9304a25d1f20bfc9485ecde6a28648900 SHA512 f652a2195ed544745a5df8f92361cfc2646a1478ac546fd16885231e9e359717f6af463562c057294f26b865769774ca5a2606327a12e84d47caa66082489f27
+MISC metadata.xml 759 BLAKE2B 65db68f050406f7d67549c7ee59445c0048ccc8ef3d841fc0da8b03c20f30b7984c1bcd673890e304f64ab8dbfc6fd666d86282e96c22b0111a19fd8025f512a SHA512 ce39f6d65cc0830be627f0e79086c454fe55e371c70f1ebc18bf850c7490409f557d371d3b0fdf40cfb11dd31de561f515a3b78c2f6aa56de39d865b33bc481d
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
index 3cb2b1d1146f..f824f042cb89 100644
--- a/dev-haskell/haskeline/metadata.xml
+++ b/dev-haskell/haskeline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
index 081f7623f1cf..2ad628f78e59 100644
--- a/dev-haskell/hcodecs/Manifest
+++ b/dev-haskell/hcodecs/Manifest
@@ -1,3 +1,3 @@
 DIST HCodecs-0.5.2.tar.gz 24397 BLAKE2B 267a230f124c7ecb50f918fd5ba293373ac82b9b38d6b3ede715f79f8f7ace3e7a7f3ad2280fbdb6225febd647fec5837b4cb6d2a00c05ec3b9a514fac2e5e7b SHA512 454f499e93c9a99bb0f5b210d84e89ea1edb1714a639826ea012caa49e744de3fe024eab25a9288317135d081cab0cfb19b4fb2537c14a6c27dbb228e70c9a49
 EBUILD hcodecs-0.5.2.ebuild 813 BLAKE2B abf2108e0f6b77a7c3cce9847a468346d8902499e5e0b83ada70bc314589599d5dc46eed028e9f1e53557aa76de654a0d4ede375dbdb698337d448832050a5d1 SHA512 69c90a484232d2085476f96593084bc71e3452193c2f22baac53c1fc0afc15765d55a0a3e766a67216a3022b9154079345a2250b63777666d450bca782d8dac8
-MISC metadata.xml 728 BLAKE2B ce849c707ef84e02f145fa21006d5f2ef278bab8877fec4a74b49006293c55b4d3cda41c6d57743d02352f9e2eae0e817ce906aa9fb7014dbd16bbb0a3635b9f SHA512 cbcbd8a4fee96a1490763818b2122789adf6faa89da1722400775e42042177f87d474c5faf11e86eb693374a6c841022004a6be61f1f039cd10f2fb01906f105
+MISC metadata.xml 720 BLAKE2B bc3c2831543437c4c94396d1b6e3972a086e2daf5bc9f15a032d2fd1e13ba7b7eb7dbf72d169d867d4a57e397d6cb45b80a29a754d34dc8ec37aa2448bf2401f SHA512 749ef6fb5ae10cdaaaca0bd4b5fb10901d0aaceb8978dc76928728ffb429229c40f57ae3eac2bacfc7cf247d6e28c56952a75f83adc37ce2eab5a646f311ea0c
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
index 02cadfb9cc8e..5d3a832fb47c 100644
--- a/dev-haskell/hcodecs/metadata.xml
+++ b/dev-haskell/hcodecs/metadata.xml
@@ -9,7 +9,7 @@
 		The library provides functions to read, write and manipulate MIDI, WAVE and
 		SoundFont2 multimedia files. It is written entirely in Haskell (without any
 		FFI). It uses efficient  parsing and building combinators for binary data
-		stored in ByteStrings (based on the one in &#39;binary&#39; package).
+		stored in ByteStrings (based on the one in 'binary' package).
 		
 		Correctness of significant parts of the library has been validated with
 		QuickCheck and Haskell Program Coverage (HPC) tool-kits.
diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
index a02944195f81..77eb4d558231 100644
--- a/dev-haskell/hexpat/Manifest
+++ b/dev-haskell/hexpat/Manifest
@@ -1,3 +1,3 @@
 DIST hexpat-0.20.13.tar.gz 143733 BLAKE2B 73cb82a98454f7dda6425d1366e3746741e73290dc6eb2d10510caa3a3d749a074f1592766a03a45bd820d6f44d6cbd9215eddb35bc4005b2bf273501a889695 SHA512 900abcb599bd66856c822b791222a814cc6293d655f45c4295e991ba74f750a80fd1c3993a0dfd943de6a83e90a5905711a7ce9c599471b043b10f661ca5a598
 EBUILD hexpat-0.20.13.ebuild 953 BLAKE2B 19bd8d909031a5c880a8898ca2c6518866026313e285945097e117585125d2f72b7bb2e4ae611e2de7150dfe15a0848b31cf5df100231bc4ed71582897ac83e4 SHA512 e398e336a014311307598abf3521de5ae484615a14eea44eeea1382c740b6e1692405a2c2c48a0535e2cf220f3168fe8f3e7d18dc242eb4c4ce1de1ba6935d23
-MISC metadata.xml 3554 BLAKE2B 20c397df0b40251a6cde688194b7a396b04e0c348541a4f10560cf95fbe05e7b368ddf75c71f04db059bcbdfffd11f93011de9fdd228613450cb41d1cc0f04a4 SHA512 d096692b1c981f774cc784ebe97163d5f021e8e979e265b86dbe143cb332ffe234c20a986eb210f440da996f26e22d9901c9048f078c26ab30182f986901dea8
+MISC metadata.xml 3554 BLAKE2B 91aa31aff7ae52fba9b6efcfed3b199968fb12881b286462e57ac5b475870628c58ae72599dd8bedc25ff3afbae530f94f1cfeafcc5fe85373c081117ce33fc0 SHA512 e6e1d12e17761cac548f4ae19bd12b69cc66eb1d6e66bf1ec9c98a880a8f9ea2622ad283e03f064ab6b7942a6d71e667c0bc107d7b9c1dd9e899fe914ba636bb
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
index 686f514d51ef..b858ead0d5ef 100644
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@@ -5,7 +5,7 @@
 		<email>haskell@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='bundled-expat'> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
+		<flag name="bundled-expat"> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
 	</use>
 	<longdescription>
 		This package provides a general purpose Haskell XML library using Expat to
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index 9106aa850430..43ab0ccf8058 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -1,4 +1,4 @@
 AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c8728ba528b0bd8b5c9e10fb765282de3f856ee59146e1f1043d7b5cb47c8352e60a72f2a86119654283c6 SHA512 1e83147144fb72a9e98fd405116baa2ff10532bdfb954fd86486f1abc3a6df7db54f90875dfe325f827546c03cc6c1d9980003fa839857f8c6b4410cfe8cccd4
 DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3
 EBUILD hlint-2.1.17-r1.ebuild 1948 BLAKE2B c599034a9b4139ff21d8d493efb4ceae6b072eda74077c6c3e19129dc0fb63506db1c6d438b3117e866e5239a7688344c643941bd271a8296c9dc65b02185a80 SHA512 cda3327dc8192d7b00ff35d0a380ab5c923f1c04f2a9fde8c8adee988d9cdb16570a2053de29b52688febad57acfd8227bbf0dc28d15483e0f49455a55b182db
-MISC metadata.xml 413 BLAKE2B b3c7a44237cd8756edc1863caf50815279f3ddaf58f1660ade12c8e17adf60d842643fe678f7c718dc7a2d92a84eab6582414d0868ab066d7d7db45eb8cadfbc SHA512 26df7942f29f0082fcd3ee674af3e33ad7b2e23570033ee5d6206b7f8adab98efb59fe4c2d04ff38073078b366dacc3fee9608289e930bb1576e20f3cc1a22bd
+MISC metadata.xml 413 BLAKE2B fcda272b6d32522677922b85aaf4d0f61c670f81d89cec222efdec84de44116cfb4bd383e1d5b07568e4c949087c03bebae3f7771cf1f711823b487d847718a4 SHA512 859f47847efd9bfd4cc5c406df9efa406dff07c051fde2e101acc62588a920f3ccd1c2b06b9c324c10399d28327dd928265d80ce46cb3556d87d860ef0119840
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
index 1d96b0c9db84..bea62cfa5834 100644
--- a/dev-haskell/hlint/metadata.xml
+++ b/dev-haskell/hlint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
index 459e9b99efb3..e80efee31bfa 100644
--- a/dev-haskell/hoauth2/Manifest
+++ b/dev-haskell/hoauth2/Manifest
@@ -1,3 +1,5 @@
 DIST hoauth2-1.11.0.tar.gz 18270 BLAKE2B 8258e8e7a1bfe12ca0da09297c18354617cb525aee70418a85a56cd5421b4695aa22861e1368fbd2d0ac11ff155fd4cebb8d220ebc4b1f7c3403268682e11e95 SHA512 179c97045f33da6f6cb4c153b9be3482031ce8a150ad70defcbbbfa3c67ff10b31c86c45d845aa605b9c4d3ac921f4372bcd49fbb384e0c78409219bc0bf1607
+DIST hoauth2-1.16.0.tar.gz 18479 BLAKE2B ca9aa0d35d3bfb9ee3a9cbe62c2ecb1a0efd109c89600642a062fbcbe62cefae53f4810b38eb55b81c29c72e4b80aca8f746966ccbaf17ecc83883e2f6fc3528 SHA512 fe42759c2ccaf035bfa15d9276a7c8bf6608a7b74732c6950c2081616196296a73c34474989c1eda5fcfc15066626e1facf2f58b6977d5e00520290948731cb6
 EBUILD hoauth2-1.11.0.ebuild 1353 BLAKE2B b41c3337299bca10862ce3ffd4ceb8ef3beb124e617d3901dfc0da22d840752175f16b0c7a307e68d8e8948871aa977b9273eedeffde83c46ad549025fcaa478 SHA512 42b0f3d2367c359a6c99e450c8ed4c182348dc6ec1e76f77af494de06878d732fa056af72b1fb8c86cc00198f517cd0063e7338e5e054ef5ddafadfa67922788
+EBUILD hoauth2-1.16.0.ebuild 1398 BLAKE2B 5d4a31b3eeb8784ce694805f06c2769c64d39dd1b4c86004af4ce35d959e8218cec2ee58690f9c57f154dc1d1517ee0d00db802ba9ca29a5bbcae21a211a4b93 SHA512 8aaf230abae7ea1337fa1b9fc4b864d894b35134a26b2bf90ae811a27efbcdde0c3fa74b4436bf656ec424a2de2fdde9966c1374da68f0cb1a9b2b4f3b7ac71b
 MISC metadata.xml 655 BLAKE2B 19a9e440b04b5bf2e3bc9847baf82c2dba9e10f0c1156ddea8346f1c7511b9447874916b8ffdbac637fd5e41e2cc78a0d7ee6fe9034d13366920c7bf27e80072 SHA512 e8ea432f6d8785580b6486b34c43423dd0e141a102abf18ff4a5b1b418df23101d82e6f3cffac71b749af75793f61f645ee5074abe79f633127c82ce740d1f72
diff --git a/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild b/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
new file mode 100644
index 000000000000..ebe4fd23f0ae
--- /dev/null
+++ b/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
@@ -0,0 +1,40 @@
+# 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: -test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell OAuth2 authentication client"
+HOMEPAGE="https://github.com/freizl/hoauth2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
+	>=dev-haskell/binary-0.8.3:=[profile?]
+	>=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5:=[profile?]
+	>=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
+	>=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-test
+}
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
index 57fa6874cd49..982cd318bfaf 100644
--- a/dev-haskell/hs3/Manifest
+++ b/dev-haskell/hs3/Manifest
@@ -1,3 +1,3 @@
 DIST hS3-0.5.9.tar.gz 19981 BLAKE2B 085c09739c666b658f0fcf2e82cd7bd7c1fd033d29490a7a6754c43ecaaf495ce914a2c987d2fd852b95b2714cabbf9d6106cd9a3b9c92daceb9b70f46832191 SHA512 30a3393f28a6ddd930cda1b866527ead9be59d376c2a6c3123eab3278a996602307612f3eaf126b36ef4a09c65784b842442ff09caafbf605474b42b6582c79d
 EBUILD hs3-0.5.9.ebuild 1317 BLAKE2B 46f4bbbbe3f661b160bdc1d8b96230dc46040c6931af9f25fbf0f8f016a834101b060c1b54736e9b421d36498d73adb2644f041254cb360ee8bc474643f95566 SHA512 86e3cd519d043ef74512d069b6e2947d849e25c684d0623d94131b8b4eb80563bbe1ab4fd01a9639d2e938a4bd27ab696506c5e83a4855ff5f214ae45f2c251e
-MISC metadata.xml 609 BLAKE2B 94244e2bc67520b810b576db4df8e83af37da37ce0e4bb98828159e620382b448514b0cb4290b41ecb18434a630a5cf9ac39f540bfedb05331adb2289df89dd7 SHA512 9184647c1e928c007c016712f41b990ac88023d6898405a30b51c79710bdc0e8bf0c781336462eca2c69e52ae5e123325b1abcbaa086ea3fc0acabb9138fa1da
+MISC metadata.xml 605 BLAKE2B bb3c841b0f7802a721a96404a1b246d12f857bcd963a8ae7263fd2d2d4fef424e94f2956b472a0351e71cab3f33ecb57105ae98dcb3305f3be9d9db9fe904a49 SHA512 360bdfacbe752a2a3dcedd929a038bf5aae15f5cdbd659ff5f0d756027e386bf596b9cb86cb007343a123c1be255df60fd36f768b36efdbe0a753504df24e849
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
index 397148db120a..eb9a3809a4cd 100644
--- a/dev-haskell/hs3/metadata.xml
+++ b/dev-haskell/hs3/metadata.xml
@@ -10,7 +10,7 @@
 	</use>
 	<longdescription>
 		This is the Haskell S3 library.  It provides an
-		interface to Amazon&#39;s Simple Storage Service (S3), allowing Haskell
+		interface to Amazon's Simple Storage Service (S3), allowing Haskell
 		developers to reliably store and retrieve arbitrary amounts of
 		data from anywhere on the Internet.
 	</longdescription>
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
index 79bf6b402689..8b6d832cd1d9 100644
--- a/dev-haskell/hslua-module-system/Manifest
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -1,3 +1,3 @@
 DIST hslua-module-system-0.2.1.tar.gz 6339 BLAKE2B 0019478bf29dac977ff5124e77765eac86876879514e0346a6126574b8ca948a89a66f8417842c45357124e2990e2394275be886b43db59e05ea9065dd2b6b5b SHA512 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
 EBUILD hslua-module-system-0.2.1.ebuild 882 BLAKE2B 55d1d8564766f9d0019cb7d29ae7d3a05760aa7b4e727103d708070cae0d3b2818bb1fad5e7d43c0419837d874ec47c7a16e680901560a6fb5e4481aefa12aa5 SHA512 77d6a2ce165c4f6283926bdd3833502712100be1b5419bbef9f5c0db67f02f928d63bdefab90c037390440796bd143e42051de1ec89dec701d606a03856183d9
-MISC metadata.xml 608 BLAKE2B 84d9767860f2cc5d690c723c4e718652e604d373ac7c955783841b45cb2b4f77cb8edca7d4e73cd7c9579695a0f32b4e7632320f5b4ac1db29e6a7467689cbe8 SHA512 57be331428cd466055136b05dc8834257ae406318d8c5b26da4fa2198d15e1450b7419a64ec1b79bcbc33581fdeb0875f706650e939dbb2d68671ee2b6159d7c
+MISC metadata.xml 604 BLAKE2B ea0b83d0b0aa9b8d1d0d44ee175d289da662033041d99eb90fe71b50677c9e77bd4e0b7fa45397ed78b16e33344ceb34c3f7272114a1914547c938376ced76b5 SHA512 220d83b871e28258b4c4f0543ac24ed78f61bdce499c17c861ef09173e9df07817a4fd16063b5fb65e1a885287b6a143c656c756b7f7ec228a30164aa5ae7d47
diff --git a/dev-haskell/hslua-module-system/metadata.xml b/dev-haskell/hslua-module-system/metadata.xml
index 286db6fad738..27aac66f2081 100644
--- a/dev-haskell/hslua-module-system/metadata.xml
+++ b/dev-haskell/hslua-module-system/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<longdescription>
 		Provides access to system information and functionality
-		to Lua scripts via Haskell&#39;s `System` module.
+		to Lua scripts via Haskell's `System` module.
 		
 		Intended usage for this package is to preload it by adding
 		the loader function to `package.preload`. Note that the
diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest
index 978d1ae00f17..a0793435daea 100644
--- a/dev-haskell/hsyaml/Manifest
+++ b/dev-haskell/hsyaml/Manifest
@@ -1,3 +1,3 @@
 DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
 EBUILD hsyaml-0.2.1.0.ebuild 1342 BLAKE2B 6f7257268c6ad56894b24d0f57a59bea526258f2e4b19e0c5ae57d8c697a930e087c6775e136d091b6b965166fb57ec23c4a0198f603d3872cd9050fdbd3b1a0 SHA512 e3074431b4c0a2582da9a738d0273f6c51242979ff069f28b06fbe81a93cf394f4d8bda5b7cc03c84acd340255d82bd5169fa52e721fdf39705f768843899b86
-MISC metadata.xml 1257 BLAKE2B 6517367f3e13c4ad4d47af8ed098b9aa0a53d38150ec5777fe63197c0e0f5f03bdbe4154aee763735c72c5bd407559d1b9e1af1231acdcb65de7d75efd0c1764 SHA512 c070e085bc7682ce4b2f6abb37a9804898e81e10228573f975a33e0dad6101b834ab7a873f8cc1b04884fe64f322c59024b210af79de5d9aad4a4980c5de7aba
+MISC metadata.xml 1213 BLAKE2B 61846b786ce1f94737ca67f57a82635be688c9e71025daedca24d38ab5c66edc988133f699a734d10dd8aeabf6897687c949060588a247a5a025c3a02ca5c88c SHA512 bc63d9e68a0251417fa1ffd51b20369044ba6370a822dd904d59bd22191c9328954998e2c37f9924c5f02327956deb1d901eca79dcda5a5bde6c47d9115fe8a8
diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml
index 4fd3981c32d1..6097517da336 100644
--- a/dev-haskell/hsyaml/metadata.xml
+++ b/dev-haskell/hsyaml/metadata.xml
@@ -11,11 +11,11 @@
 		Features of @HsYAML@ include:
 		
 		* Pure Haskell implementation with small dependency footprint and emphasis on strict compliance with the [YAML 1.2 specification](http://yaml.org/spec/1.2/spec.html).
-		* Direct decoding to native Haskell types via (@aeson@-inspired) typeclass-based API (see &quot;Data.YAML&quot;).
+		* Direct decoding to native Haskell types via (@aeson@-inspired) typeclass-based API (see "Data.YAML").
 		* Support for constructing custom YAML node graph representation (including support for cyclic YAML data structures).
-		* Support for the standard (untyped) /Failsafe/, (strict) /JSON/, and (flexible) /Core/ \&quot;schemas\&quot; providing implicit typing rules as defined in the YAML 1.2 specification (including support for user-defined custom schemas).
-		* Event-based API resembling LibYAML&#39;s Event-based API (see &quot;Data.YAML.Event&quot;).
-		* Low-level API access to lexical token-based scanner (see &quot;Data.YAML.Token&quot;).
+		* Support for the standard (untyped) /Failsafe/, (strict) /JSON/, and (flexible) /Core/ \"schemas\" providing implicit typing rules as defined in the YAML 1.2 specification (including support for user-defined custom schemas).
+		* Event-based API resembling LibYAML's Event-based API (see "Data.YAML.Event").
+		* Low-level API access to lexical token-based scanner (see "Data.YAML.Token").
 		
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
index 8286bc988aa2..3ba2b8d23c1f 100644
--- a/dev-haskell/htf/Manifest
+++ b/dev-haskell/htf/Manifest
@@ -1,3 +1,3 @@
 DIST HTF-0.14.0.3.tar.gz 80795 BLAKE2B 8933c2bc9480ff7d29cf86cf5d7718ebd179aad55a7836b2f19cf1b93ba6acd48eba89410fe4040bb073111686ae736360554a598456b7a25c77e52ed05c4335 SHA512 cf839a3fa67aec998b1f035a9b5ddb326f57c859c13767f3681deb2f8041ac283c3bcf36d0c37b08ef7878fc8ada5623af60c72a548adf8c272d2d38f8609784
 EBUILD htf-0.14.0.3.ebuild 1203 BLAKE2B d9916e56999049859fffdc377855d591cb6a93f9f53bb0844dedc20c194647dd0056b84432717c85963ad6468b0837e004dea975f4d88efa4f35c07e9fdf8dad SHA512 a4992975e214cfa72be33a7653ca751730e48b64aeb864711144b508d6d38247b3f1e214942c5cc75baeca39a651376a0d6382036dfb5c7a8f29501ef0b634c5
-MISC metadata.xml 923 BLAKE2B 690bbf2765309647e8029490cd2c7ba9055f00e8f4ccfd45ae8ef826deac43a13bf919b73607fc0241e9f60d6cda44bba1ae95de8031f76744d3eb5fefe7138b SHA512 1bcdd3551b19f09f600b050f84ab81de6e99133b29a8a94942ff068ef354a9bb31226395cb221c416a65466a96973a92521d3aa3b13c94b557bdedf011e28164
+MISC metadata.xml 923 BLAKE2B 5eb46ca00132d89e7d18e3addc453c8a5b6252240360b6a9f59649ba7e991ad866122eea16388ca204d14195151fe46e94c9da44df0c1c8c1552fbe3b32f6ac5 SHA512 3692735d4d35691afcb72fb372f9002ed847ffd6f0ebeb4338e4775217ef0ea111f23b320a5fc1dbf220aead54b4442fbfd2110b74a88508b223aa69673a1046
diff --git a/dev-haskell/htf/metadata.xml b/dev-haskell/htf/metadata.xml
index be697624296d..e62042b9a2a5 100644
--- a/dev-haskell/htf/metadata.xml
+++ b/dev-haskell/htf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index 92c839583e96..c57b6ef0dc9b 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1,3 +1,3 @@
 DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
 EBUILD http-api-data-0.4.1.1.ebuild 2235 BLAKE2B 76eda71dd0eb62a2ac7ecc8e455ae7d75d21fd9144b8654ed93fcf5c68fe23071640a034fdaffec1e6acad3f0297730efcc10da9cf2147f3b424b53bbb9deabb SHA512 c8954f6394dbf3b3911adfb9208a686de9c51738178408cf47ef60bef421cf5ae31d18c0fd837c86811acde72da27d110b3b9b70c819e0ac387d311a537b09e9
-MISC metadata.xml 334 BLAKE2B 1bb3490bb01d09896df949f13be9c245ca5298430b21b4aaefd378d1473092b3f2104248abc3a504ca3e7ee8099127751c74f0482385496cd47f926992722ffd SHA512 131ee174aec3add246c0782d0c7cfe0019b1bfc20da5e0150bedd7baa643354d753c1dd2885aa4cfaa54b0f8414485ee7d14e51114887d17962a4aecfc6c057b
+MISC metadata.xml 334 BLAKE2B 6863dfabacb339d21b8472dbce3ed9fca87acf4834b35d52be942bc4611e47301b5831d3f027edf807acb716e7225655436d7c87a71f5a60031e2a280984ae87 SHA512 368764084082155ce261c49443183043c11c255791174f551a4235ce49d431d54e42085e6b5d4c206b994693f98468b629adb83978952a53b5b3b9b69a4084e7
diff --git a/dev-haskell/http-api-data/metadata.xml b/dev-haskell/http-api-data/metadata.xml
index 5da311b1ffc4..c943ae8ea418 100644
--- a/dev-haskell/http-api-data/metadata.xml
+++ b/dev-haskell/http-api-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/inspection-testing/Manifest b/dev-haskell/inspection-testing/Manifest
index 185a5adb9f72..d5f5205886ea 100644
--- a/dev-haskell/inspection-testing/Manifest
+++ b/dev-haskell/inspection-testing/Manifest
@@ -1,3 +1,3 @@
 DIST inspection-testing-0.4.2.4.tar.gz 20946 BLAKE2B 20547c5a231083391c886fcef8b3dc153fde8498d9268a297013691a055c65dc93deb31b5988a8cdf1e32d465344802153448850a89b819744551dc13712a1a2 SHA512 16ebfcd20e4ee3a9117670ad9e0d683002262a2f3c52dcfdb7c7123f256db4f133780e759a80469a14c786a4158ef9ba4e7d534e728e8d44188b11765a1e8745
 EBUILD inspection-testing-0.4.2.4.ebuild 788 BLAKE2B 655214cd4f38ac3ff3d34983e4649a94fbe20b09807e784ebffd8ab37cabf59773703c99a1dcb81e3ffbd31cf9b291ef4a024e2e60ff8100458e886e98974e7a SHA512 c94b80a261a0509b5807d88199bd2f3c205a976a77e403cb10daddb7631896434bb4a832945aff92ead2705a89295b7052da565b9804f379f4be2a111003a57d
-MISC metadata.xml 1362 BLAKE2B d0711467f7ad20755b6c997b9091bcf51415a8e214f2e0236d6f469dbef15651581f25ea5f76f0193e0177d7b62d32e6f4d5d0600bf40ff9cda8d1ba017b67f9 SHA512 f8d04337b4963dca5fb5f91b9d769d6a5a03984961cc330b8a460bb6e227ab3810be4aa50a3c2fd2716f7e89ba76ddb819021727581e1f9c98587111778a5edf
+MISC metadata.xml 1352 BLAKE2B fb62e5460d79be570ee9f01bf292bffd5b64703519ac4df0ead42ede4ee088d193226b41966354a303430867164f4daaf572f7e1d0b737388eb39f5e6ec3bdf1 SHA512 296c17dd2bd6c911dbe9e63b07479ea66fca5e65214ac117cd3ec8ad3ddf6441a541880896bd43324c22fc544ae03d9659f5475717cb84136a14dda6590c8a03
diff --git a/dev-haskell/inspection-testing/metadata.xml b/dev-haskell/inspection-testing/metadata.xml
index f4d3257dab77..ed47f4615df7 100644
--- a/dev-haskell/inspection-testing/metadata.xml
+++ b/dev-haskell/inspection-testing/metadata.xml
@@ -27,7 +27,7 @@
 		this checking can be part of the ususal development cycle
 		and regressions caught early.
 		
-		See the documentation in &quot;Test.Inspection&quot; or the project
+		See the documentation in "Test.Inspection" or the project
 		webpage for more examples and more information.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index 82ed81f994f4..5e676eff0e14 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1,3 +1,3 @@
 DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
 EBUILD integer-logarithms-1.0.3.ebuild 986 BLAKE2B 3342fac7f8b3ba3b019249e9766e2cc84febe55dd4c7575cec22cbe5750a90903741ee6cc5eea87b1064f2955b53641b1fb50f6fae893fbc1a8b5ad06f7993bd SHA512 9dcbad03dc721de0757e18b39c62548ebdf1f75402b827ba4ee7257964e0b448040aa6e170b5756a88ae76729f00544d267866fd18059719c06f95b0eb1d9ee6
-MISC metadata.xml 589 BLAKE2B 76de72281a61f80bb438d9ab8ff0624c80ae6b947d275489ae30931232035fc16a65b0f61b9c08943a8d07b2967a3b8677afdbc9b8184582d20b3246e8b8fed1 SHA512 806816183d7c86a1102b3e8591631464c38db3f1b5af355f5e0967eb630fc11ad6340f05eae883b0eff1ce16d50187df184d31807e151e5dc43539d2cb468974
+MISC metadata.xml 549 BLAKE2B f46602eb9c49576aee4b2c56458bab5d6a98aded9a44f2ecbde66303e461f84b0afba62bd9575aa9ae35567b046f06a4397ce7d3d9a37292552030a72c8dfd5a SHA512 7c3a9a7d2e09ad62fe7e4c149dd6de970e875fa322afccea5ae22bfd6c0f7a08e92ac077ce08f2484a068d0acc7628c28fd2cae189f1cb22526838ae3ddda904
diff --git a/dev-haskell/integer-logarithms/metadata.xml b/dev-haskell/integer-logarithms/metadata.xml
index d1bc98b5a57b..24fd8c97c877 100644
--- a/dev-haskell/integer-logarithms/metadata.xml
+++ b/dev-haskell/integer-logarithms/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		&quot;Math.NumberTheory.Logarithms&quot; and &quot;Math.NumberTheory.Powers.Integer&quot;
+		"Math.NumberTheory.Logarithms" and "Math.NumberTheory.Powers.Integer"
 		from the arithmoi package.
 		
-		Also provides &quot;GHC.Integer.Logarithms.Compat&quot; and
-		&quot;Math.NumberTheory.Power.Natural&quot; modules, as well as some
+		Also provides "GHC.Integer.Logarithms.Compat" and
+		"Math.NumberTheory.Power.Natural" modules, as well as some
 		additional functions in migrated modules.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index dd783fa3fcfc..273c99ceff6f 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1,3 +1,3 @@
 DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
 EBUILD io-streams-1.5.2.0.ebuild 1863 BLAKE2B 7239468f7bb1b4523aadea960743b25ed33bc764e1ec16d167281a7ead27a30553b600bce45d179940dd1f4d4cc47fe2bbbfa73be1bef0ad7a81702a6ee2cef5 SHA512 1e7037f2b0c55ffd1529e89a53bee05b3716511dc7b513e761c8f53ef11b9f50a9c1fc680e23e3b282cf073d8cff80bb38f2715d2533a282a11d985107c5c387
-MISC metadata.xml 2707 BLAKE2B 7f0a861b73b99dd2b03082dc8eb4302491a087a86515ef1fac00e94ceb234bea85359c8cba2bb35895f78e94e68bad896f814a8add92e282faef8000d011af9f SHA512 9b7c8d5124b259fd742c9fbeaf3dee464742a7ab51c48aa00bc09f2795523e37c0d38a204513e5ae3c3ed8addad7b3ad8abcd03f6b1a56f581dff122a572d772
+MISC metadata.xml 2649 BLAKE2B 0c4dacf878753b68f6f3e3d9fc017fe87d0c74739a088a2debd297eb36278d64ae1ad102a0c38de684fcd0fdde970ab3da16119a5fbed3734082043bdecc8367 SHA512 bc24b1ac6d1822c605be4a46768df95d886b2b84f69b34f0cf717945cfe0e5eb70812a96def9e6e701af8decaf54998ad4604816ce630d338ac62d24c70fcdb7
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
index a86f42647c54..307b43967abb 100644
--- a/dev-haskell/io-streams/metadata.xml
+++ b/dev-haskell/io-streams/metadata.xml
@@ -14,7 +14,7 @@
 		
 		The io-streams library contains simple and easy-to-use primitives for I/O
 		using streams. Most users will want to import the top-level convenience
-		module &quot;System.IO.Streams&quot;, which re-exports most of the library:
+		module "System.IO.Streams", which re-exports most of the library:
 		
 		@
 		import           System.IO.Streams (InputStream, OutputStream)
@@ -22,7 +22,7 @@
 		@
 		
 		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the &quot;System.IO.Streams.Tutorial&quot; module.
+		be found in the "System.IO.Streams.Tutorial" module.
 		
 		/Features/
 		
@@ -50,19 +50,19 @@
 		Stream composition leaves the original stream accessible:
 		
 		@
-		ghci&gt; input \&lt;- Streams.fromByteString \&quot;long string\&quot;
+		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
 		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
 		ghci&gt; Streams.read wrapped
-		Just \&quot;long\&quot;
+		Just \"long\"
 		ghci&gt; Streams.read wrapped
 		Nothing
 		ghci&gt; Streams.read input
-		Just \&quot; string\&quot;
+		Just \" string\"
 		@
 		
 		Simple types and operations in the IO monad mean straightforward and simple
 		exception handling and resource cleanup using Haskell standard library
-		facilities like &#39;Control.Exception.bracket&#39;.
+		facilities like 'Control.Exception.bracket'.
 		
 		@io-streams@ comes with:
 		
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
index fb58e7d241dd..9c55705abc74 100644
--- a/dev-haskell/js-jquery/Manifest
+++ b/dev-haskell/js-jquery/Manifest
@@ -1,3 +1,3 @@
 DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
 EBUILD js-jquery-3.3.1.ebuild 613 BLAKE2B 21d410960a74975bcc701e25acd66cb1798cdb7f30e1e917c386adcc3ffd13b6c51248b1dd576ee20aa110e86d08a10b116db3ce59183f31e448ce0c46f0083b SHA512 fea11d941775d6f734e9847de98d611da383252e0091c87a727563fd5804c486b2342d046315e84e4062d5b89548ef62d5724d0699706d9880b1379bb76abb6c
-MISC metadata.xml 707 BLAKE2B f3570e08e6209e6fdb6be46fc28cbafe316632654ada344598c47c73a02c43f5ec9d1094927bbb27f585de95ad6b4dce360d1883a3064e07c5600ea12f2b2dc0 SHA512 d316dd0a71dce3c8085510d8fb7eb55ea3e323fe0b484ae1b90301412eb7fcc49aa29f3f3d4b94f33fa4468985cad3fd456bfe89eafdcdc14b02e31bb59c4990
+MISC metadata.xml 707 BLAKE2B 5a0d4be70db6e5bfb0f4cc1884c57fd3989cf32c0b7760ef907c49cc79e6c0e80d9cd67e6d860726c0fc2d028d316e096065e759bcc8cd32fb43dabc2c3c9d3f SHA512 7e99a7fb2e24698730c438a9e75430c0d851d2fc04423dfa2565f00512c81fcd2b14944112b2f383d7380b23ad1f341771c6f8390ebdabdca5a9cd1eebcd6906
diff --git a/dev-haskell/js-jquery/metadata.xml b/dev-haskell/js-jquery/metadata.xml
index 9b1d6090b8d9..bed62240b125 100644
--- a/dev-haskell/js-jquery/metadata.xml
+++ b/dev-haskell/js-jquery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
index 868133aa7304..5bd2116bd48e 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
-MISC metadata.xml 596 BLAKE2B fc85e0172510fa01a8ff9ad7bc507031e82f71483535dc295f47bd041943b410e8fdaa104c3c3f765f19c5dc314689dd491c486f5feff9e202aa6799e0cd66ad SHA512 47cdb2d3fe83cb1e12a403aa455ff575169c2200b526cd0c04982b4e24f2e91b01c83ff7450e9c48c26f37c5f187478f1a0872b632aabf6be2d50627b44c7485
+MISC metadata.xml 596 BLAKE2B 787ae6259b762c93911394e5705222432772e615b6fc3c74a193d65d6f95a5f28e2020f9df5bb091a8aea0d0d16e15a58b2cddc490d2200a7af3dd4d7cddfd31 SHA512 5d34b8f0d441df1eb10c5bfaeb8b18d018c579b8d25d22ba50f87bf9f850c0309f9f5964f0ee5e2ccfb8447f8411dd1b18fac62a44c09db2223f1b29a3ddde80
diff --git a/dev-haskell/language-ecmascript/metadata.xml b/dev-haskell/language-ecmascript/metadata.xml
index d5b2ae80330e..d7ca12103c90 100644
--- a/dev-haskell/language-ecmascript/metadata.xml
+++ b/dev-haskell/language-ecmascript/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/language-lua/Manifest b/dev-haskell/language-lua/Manifest
index 7f6d5ae64ada..c75080416f71 100644
--- a/dev-haskell/language-lua/Manifest
+++ b/dev-haskell/language-lua/Manifest
@@ -1,3 +1,3 @@
 DIST language-lua-0.11.0.1.tar.gz 122831 BLAKE2B 20b1ae06f2b22e5f75b50c04b7fe9edbb81b8897ec015d8b5c6a8ea97fa8dba49901ff101103a4f728189be6c18f76191506cda8a28583f3783d6f4af66a6b4b SHA512 59b3d64f7a920b7aee55965e2a0c847d7eeb4e7c5a33668ee4a796b403b98a11a37ed8d6d1efe8244aba6e56cba01841cd7cf00d706544d65949ac019b5fd11a
-EBUILD language-lua-0.11.0.1.ebuild 839 BLAKE2B deefd42273af87958c244617419d0a91b26ca31af79a967f2fb40fbfd752b4ca7325753a983867427be955f2a5c48030f0ac196cca8bdcaf05fddaa7e0286ab8 SHA512 f16d9b9ad40f6422da0ded178cab4e7e78210addef0916b12fa60e73a22ea515ee381fd891396c81614e09f6d52a4f1cff081688ff50b4ef716b9860e15d731c
+EBUILD language-lua-0.11.0.1.ebuild 924 BLAKE2B 479a209dc70e0d4cf813d7ca95ae90e9c92465c71110cf6ba8e6081302ebd96d02053b6be784738fe062440e1cb243e46e95c6e4d64ea1ac12032fd9e48ed8c8 SHA512 3b35b9482a469014a24ee37019830c1bd6dfffd35d47400409183bfb1d85d01c8d2f51e8fe73809f823e0caf83840a420ee324bc29ac2346609be1966ab11e8c
 MISC metadata.xml 332 BLAKE2B 90d6c2520b120543984788781ad6354084a7ab65b9178420dba136fd43391f8cb2de99589acb906c2f3b337bfa1b46b8f83fa5f320a47798733ba5603367cfc1 SHA512 f4aa3ce4015cac00154336e302d718c96d14eb585fd66b8f74484f832c9e9d712dba69ccd941c211409388259fc1465bf791ba5da0dda28dd555a0388e7d585b
diff --git a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild b/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
index 7f916d15ee72..aec8100c4652 100644
--- a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
+++ b/dev-haskell/language-lua/language-lua-0.11.0.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
@@ -30,3 +30,10 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-hunit
 		dev-haskell/tasty-quickcheck )
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.5 && < 4.14' 'base >= 4.5'
+}
diff --git a/dev-haskell/language-python/Manifest b/dev-haskell/language-python/Manifest
index e6212e5b7c96..b713aea77e3f 100644
--- a/dev-haskell/language-python/Manifest
+++ b/dev-haskell/language-python/Manifest
@@ -1,3 +1,3 @@
 DIST language-python-0.5.8.tar.gz 60171 BLAKE2B 1ea4e12bb9d8efe209d126c8787d80e616c34393cbb7017b7a55711b407f19150e688f3e8f45eb8a6f6a5c3c0a080539674134c8b253586ddd7da006fd0a4733 SHA512 fa2d9c1a20460e38dcc370be60157090e7279386a4ebc0f4c4bac56fb3a8f65541c41fa789d2df31e385eeea3c05e2f84c44f77917379194eb4e29372ab4c20d
 EBUILD language-python-0.5.8.ebuild 749 BLAKE2B 5f954c0b25efdc61b1c33019d04d2d3bfaeb217897d15dda3de558131f6cbc1d24a5c71ce7235b4e932031b30810741a58c6ab40f1e0a019f64ce81bcd80841d SHA512 ca7bc024ca4125ee508c8dc9d3deccb8186daf8f4395ed07352f477cbbee6689c081b9fc30293ce3525d196c0e949d4581bdab1bcf4835406c020e4ff667cd9f
-MISC metadata.xml 522 BLAKE2B 87ec77a302e28f15d6547231c98543e7c919ac2a358f875760f8f6814f12920484315f15a0482de83571180483ac4eeb34284894cfe8df55970056407e141084 SHA512 646c64774499fe411f4751bad544b7d489f12eff37a4afcfa3d96d952a8fbc7d4140cafdbad792ed27227f2752b403002844a49f3c4781ba0bbbb9939cf0a5d3
+MISC metadata.xml 522 BLAKE2B 870f826ff79603c42f96e29b44e43e877056ab743cb5f88790e1ff41307f8bfa4d5c1dcb80c2afcf8235aa118989c37e2273c4b1d81805ad3df33aedd646a2c5 SHA512 8db1e1822e5ef322649b15257670bc4ae2756baadbaa35464e4ce0679fecd3394c2145568793422a36316643fc3f652b37cc035525a341e6583cb7f17f17b606
diff --git a/dev-haskell/language-python/metadata.xml b/dev-haskell/language-python/metadata.xml
index dc19c4cd973b..73e3172c5476 100644
--- a/dev-haskell/language-python/metadata.xml
+++ b/dev-haskell/language-python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
index 49a385ab9ee6..8bde2310d00c 100644
--- a/dev-haskell/lens-family-th/Manifest
+++ b/dev-haskell/lens-family-th/Manifest
@@ -1,3 +1,3 @@
 DIST lens-family-th-0.5.1.0.tar.gz 5724 BLAKE2B eec0a853e47fd4283a809c97d11d5b12fc5eda26d6d7fc136db230a518b8c99b9eeda40cbafad9ae5ba7916ef77d1d73b509324c407d96df6a8b5819f18703fa SHA512 0b38de8c6270478e7b8933def57288c8d938ba359f880b8e002f0871b56de4cac887b37d0a99c8ccc62ccc0e51416a7d4d3cea1d110477b7ade4ee0e9f799077
 EBUILD lens-family-th-0.5.1.0.ebuild 592 BLAKE2B 72daaa4ea37546553bff41d23b553a74ffee38bb3fc63d7be1da5668840ef57420a84e525be52f80fabf37239c26a230ee36252c1ff74b808a42afde2aeda94f SHA512 51428c1ead2d5cef15bbe4357be2edef1b14a53aba7992c4590578ca64b49a97c560fa41b08246e089afa8a6721d4ffd3b31e9bafce2307ba9f582f246cc22fd
-MISC metadata.xml 690 BLAKE2B d2cd7aa52cc8d336c744531618a66539841aa72e58678277937dafe5099c1a5ee827335cc65723df473c59ad72d71adbfd3873450f624eea158df7692a4be0f5 SHA512 55dc29a781ac230cf03c0d8f5907ddf60199804f9a37ceea31f361b3ce544b20a06c03b89615fe1076708ad76fe501c3dacf1907ba5f09ba345357ba68a80824
+MISC metadata.xml 690 BLAKE2B 1c2c19d067b6f296835f9ed25b084cd767363120f75f7c69cc99e0e66d07508a9e5cfe966b0795edb4db9fcde4927b73ab1cb24f47b2739447a2e90c95b22594 SHA512 e35bbb43288017bbf1178f840e208a0f2a0bd9518ada7c15358ad68547ac2eab27aec1a0c77aafd4bea9f4db5606c51dee74c707109b43b219d793524e642ff0
diff --git a/dev-haskell/lens-family-th/metadata.xml b/dev-haskell/lens-family-th/metadata.xml
index 1651186a0a1f..2bf781e85ecd 100644
--- a/dev-haskell/lens-family-th/metadata.xml
+++ b/dev-haskell/lens-family-th/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/lens-family/Manifest b/dev-haskell/lens-family/Manifest
index 9d9ed52f3315..0f6a108be586 100644
--- a/dev-haskell/lens-family/Manifest
+++ b/dev-haskell/lens-family/Manifest
@@ -1,3 +1,3 @@
 DIST lens-family-1.2.3.tar.gz 8525 BLAKE2B 769d26b7deeb392718f200ac99b6af757131a56e7725c1b90e9c40d6c352f4d812095a3863e56b48d8b17a9f84348986301c2b7fb10ff88962563449e1379547 SHA512 a8925f6596b396e65f4c5015badfd48056e3dafe372019690204fa44502fd512ebd78dcff709b1fe5d1c1648fc2f3da49d657109c495a281d998c6be67bf3201
 EBUILD lens-family-1.2.3.ebuild 692 BLAKE2B e3693a3bb93d6222bb25ea5242a95403d51ae336c4731ac7d72676e2841ec925b7cea318f60e779f5a01871bee1fa781b92aa33716338e11ce08655b50493131 SHA512 9132ef721fff8afc2399d742707f011b6f55d9278f7488af6a56430bc565ab808504dead572a8e47ae6f5ceb459410e5eea74abe61809d56051b65ecb24fca7a
-MISC metadata.xml 734 BLAKE2B c45de814050d33189f54e59256c2c9b261e6a47bdcdfb383e15f4d2318fed41b9903da259078682f0c03ada42205283962857a1e2ab60e7e8a66e466f3993924 SHA512 23553989de8d413abc7a1c2061af33beda9ae0f161d0bbc1f8832dd587454c3a18932b6aa8fd6eb77717af2b649d0b1ebe3c0d9d52bb12b243918ebdbdc3a37d
+MISC metadata.xml 724 BLAKE2B 45e7cf533855d2374f7a3542fe028e10262c77caaad13a07ea34b7dd52314b0c67bc497b9f66fe3f99e7db72eb082d38b9363f15c5913fb9690f51424c04fa77 SHA512 a15a051125265ad127002354a7271aa790fb3e8e92659ebc2f58adcd5e5883109113eaad8b616bb53c7d8cd6981172a9f7c0bc49dc09320a6d4a4adde4d6c2c4
diff --git a/dev-haskell/lens-family/metadata.xml b/dev-haskell/lens-family/metadata.xml
index 02358802aa05..6ffe8e52dac5 100644
--- a/dev-haskell/lens-family/metadata.xml
+++ b/dev-haskell/lens-family/metadata.xml
@@ -15,7 +15,7 @@
 		
 		* Cast projection functions to read-only lenses
 		
-		* Cast \&quot;toList\&quot; functions to read-only traversals
+		* Cast \"toList\" functions to read-only traversals
 		
 		* Cast semantic editor combinators to modify-only traversals.
 	</longdescription>
diff --git a/dev-haskell/lens-simple/Manifest b/dev-haskell/lens-simple/Manifest
index c66f72968783..51cd1fe5dbba 100644
--- a/dev-haskell/lens-simple/Manifest
+++ b/dev-haskell/lens-simple/Manifest
@@ -1,3 +1,3 @@
 DIST lens-simple-0.1.0.9.tar.gz 4541 BLAKE2B d3967769ff693b5e1fd370a96753753e2bac502fce326e6266627f28c5ddfc3e29ec0d646c1dcda2ceeaf7ea88f6acd5fb031aaf976c42338a1e9c3190f578f6 SHA512 3bf1079f4525b534bca70f83073ebb8abbc84cd9320ef97a1fb137914fcb614f8d7c8ea7065a4484539dc6240ab1aa393ee22ed3b9e20bc421d25ce7adadbd0c
 EBUILD lens-simple-0.1.0.9.ebuild 934 BLAKE2B 68dcacf053ceaaa6595cc9386f8fa14016b4603e83b814ff4a75e837de864cd002301dd9a9f70c5300f9f6e92cfe1bcd69425ba0998dffa9d32ece221e02ed45 SHA512 d2b18392fe751454ad8a542f266cf15d5bb39d95d6aafebea45d933a928354a8ae086ff92c76e1dfdb30c37985884a8b0094f360e0ebbd4cddeaa04cfbe5ac18
-MISC metadata.xml 3832 BLAKE2B d7aacb03e4104637103d5fecc44027b51ad2dd1caef58e47f77e343c3e307df50363a61124408c9f64adcf2a7d0e8abdd99efbc5e92dfb489ff18f96a0e81b42 SHA512 fb425a74d1f97a963d35f9c34a522a9cd559ee960bcce274da4ffecfacf2d6c424bf9844eb4e662c3e888f1035ec954b6dc2d67df8f78d86705f9b2049b1301c
+MISC metadata.xml 3832 BLAKE2B 87b3455f6cd578db01611887a1165375a064b9de37e91127f0c671416dd419d5be15b431978616d335303843217db104905c13683ccae6c30e400e4ead9087ca SHA512 c47006223bdb2440c058a6e21baa8893ac4fbeabd13563efb96b949ee58c1893cdb7b9e13500e5a74ed71d7423195dc0420db6702e15cc7cf45c8e7d17c18d32
diff --git a/dev-haskell/lens-simple/metadata.xml b/dev-haskell/lens-simple/metadata.xml
index 743355961e37..899049b30ca5 100644
--- a/dev-haskell/lens-simple/metadata.xml
+++ b/dev-haskell/lens-simple/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
index d823a4ddd07c..0b1686d23ae0 100644
--- a/dev-haskell/logict-state/Manifest
+++ b/dev-haskell/logict-state/Manifest
@@ -1,4 +1,4 @@
 AUX logict-state-0.1.0.5-monadfail-compat.patch 2447 BLAKE2B a6decde86f3993e00e55e3298e25347ce2fbd43b38bda91de00b828267c20e8ec53f98c64e7ee4f25a65d44eaf18b462b354b2eca97430779688007bd551228c SHA512 5c237951869ae09b7b1e0c82d39e9d50949ff53dab7afdd51fe081dbed412e29e4c3875e5d446bb81b426e53e158ba9977beaf2abe54b61c412c2fc8c91cf5fb
 DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
 EBUILD logict-state-0.1.0.5.ebuild 707 BLAKE2B 79c1fb80c5e47f31cda599c061421ac2db65a8e1cf5610855cee329daddb723fb480fae92597ea95d4d4dc1642833925dabcf85d79c1416cbf6e06fb602d42f2 SHA512 5bf998460f9443947b6261acc5ebb8db82c1c78c03a712069a1207193968ce27040dc180c67d16576da115c28fff2ae1799f8713830394570e919673ba5baa05
-MISC metadata.xml 489 BLAKE2B 7155624f2570bd9e09434734cf702db4785da809af5f1a37d71c831109aeb4eb1d60db8fb9e12043fc7b564deb6255e076a47126d9bf5c82c1a73c14ffc71349 SHA512 a240b1ef1ef72e87f57d27217359e2f5e6494cc0884b25b605b66ba9ab06182be8e8f815e73fa49a44961b958e8d00e0d4daf3cf58f20e7210ea531f6ab848fa
+MISC metadata.xml 489 BLAKE2B c5e570ed193181b52573d59d109a848a71845333a49e84f09d38079aeb0054cd6ef5a1ab99cf5024e9ecb1ee9dab5a01ffba73abc57663f7e29edeca39163480 SHA512 6523dc1c6f54376f031d318c20073bab00c4285c82104263df0f86fee3e8ecc8409687ae2aa1f0bb1659cf99e05e95b095cb242a5e73cf22e7cba3e36bbdb7be
diff --git a/dev-haskell/logict-state/metadata.xml b/dev-haskell/logict-state/metadata.xml
index 8419c5504031..e9af1b88c9ae 100644
--- a/dev-haskell/logict-state/metadata.xml
+++ b/dev-haskell/logict-state/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
index 503f6424a34b..f662ced5c99a 100644
--- a/dev-haskell/lukko/Manifest
+++ b/dev-haskell/lukko/Manifest
@@ -1,3 +1,3 @@
 DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
 EBUILD lukko-0.1.1.2.ebuild 1084 BLAKE2B 01d56641070b69a1263c841558daced98987b7b5a7291075c5b364426f1a5489cb846c9c5883978d826917ceede47bdb7f25b4c613899540bcd2bb230ac35686 SHA512 7c73a0bc57e44cf2a32d9566af68ec5e2773fca8bc51a4d0f71e1cf3f0964f123abdf74a451d39bd5521f3f5f6314259f03cb534fa317986e48e0bbc93dcb6f0
-MISC metadata.xml 1775 BLAKE2B c2465f50a55356961ce4e30d005a76589fcfdf1ebb5f985e9415fe39b39767b9c02872cbc4a371441af240257b9d8d27e731b3e012b65beb60e45767c98035f9 SHA512 c8b0386734f1810ec1c2e693b5686e0ef0e5c9789794e393df47991341a5011ce079de92888763394a9867ea86fc2a205f13271ecf9af22207e4e7244a0c0d4b
+MISC metadata.xml 1655 BLAKE2B 2d80191e06962671643999ecd726b5251d5a6a79ffe2147b1372e857c4bc1331315e75b5e646954c04868530e9669a7a266339f8fec45433d333c75a86292ab9 SHA512 8e6b574192ebfc60a8df85ac205670b3711173760a8500a83a079ccb1e86ee0f088e05ab1e3eba773bcad877ab02ecf237d28a8b2065b1637fdba165dcaf25f0
diff --git a/dev-haskell/lukko/metadata.xml b/dev-haskell/lukko/metadata.xml
index a2f47beee925..aad26bd3444d 100644
--- a/dev-haskell/lukko/metadata.xml
+++ b/dev-haskell/lukko/metadata.xml
@@ -11,23 +11,23 @@
 	<longdescription>
 		This package provides access to platform dependent file locking APIs:
 		
-		* Open file descriptor locking on Linux (&quot;Lukko.OFD&quot;)
-		* @flock@ locking on unix platforms (&quot;Lukko.FLock&quot;)
-		* Windows locking @LockFileEx@ (&quot;Lukko.Windows&quot;)
-		* No-op locking, which throws exceptions (&quot;Lukko.NoOp&quot;)
-		* &quot;Lukko&quot; module exports the best option for the target platform with uniform API.
+		* Open file descriptor locking on Linux ("Lukko.OFD")
+		* @flock@ locking on unix platforms ("Lukko.FLock")
+		* Windows locking @LockFileEx@ ("Lukko.Windows")
+		* No-op locking, which throws exceptions ("Lukko.NoOp")
+		* "Lukko" module exports the best option for the target platform with uniform API.
 		
 		There are alternative file locking packages:
 		
-		* &quot;GHC.IO.Handle.Lock&quot; in @base &gt;= 4.10@ is good enough for most use cases.
-		However, uses only &#39;Handle&#39;s so these locks cannot be used for intra-process locking.
-		(You should use e.g. &#39;MVar&#39; in addition).
+		* "GHC.IO.Handle.Lock" in @base &gt;= 4.10@ is good enough for most use cases.
+		However, uses only 'Handle's so these locks cannot be used for intra-process locking.
+		(You should use e.g. 'MVar' in addition).
 		
-		* &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn&#39;t support OFD locking.
+		* &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn't support OFD locking.
 		
 		/Lukko/ means lock in Finnish.
 		
-		Submodules &quot;Lukko.OFD&quot;, &quot;Lukko.Windows&quot; etc are available based on following conditions.
+		Submodules "Lukko.OFD", "Lukko.Windows" etc are available based on following conditions.
 		
 		@
 		if os(windows)
@@ -41,7 +41,7 @@
 		\  cpp-options: -DHAS_FLOCK
 		@
 		
-		&quot;Lukko.FLock&quot; is available on not (Windows or Solaris or AIX).
-		&quot;Lukko.NoOp&quot; is always available.
+		"Lukko.FLock" is available on not (Windows or Solaris or AIX).
+		"Lukko.NoOp" is always available.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
index eaa7212d5185..f4d1617c6743 100644
--- a/dev-haskell/memotrie/Manifest
+++ b/dev-haskell/memotrie/Manifest
@@ -1,3 +1,3 @@
 DIST MemoTrie-0.6.10.tar.gz 8403 BLAKE2B 4d8d3bbefef13d56c16fdd4e3584a811e6cfdca6de27df7d8eee7bd684050275c0e7299073e7ad3edd231db0dec91f3e42725295f21a096796f2a8445d10822a SHA512 73be7e356ad2aeef49abf43975d2e24ee8b883e12453f316366b52998637ac26d98feef34388c2a46f683027dc7132444b17a25a12d3e86748088fadf081b186
 EBUILD memotrie-0.6.10.ebuild 767 BLAKE2B c05e118fc1d918c49856b88332dc61b7fdc732eb3f99261dcce678c697721cec61c95f66de9bf58248ed9db040cc53468aae86a8c93bfae35657b8d580a25be0 SHA512 6db53fb85253cc1a3d93016dc5114c7cd667af88855bdf21af6a15ad6de7cffe3838f57b5585391cefc6c0a8bc3d5eb70ee94b399a5e4c7bbb07e872860e5897
-MISC metadata.xml 640 BLAKE2B dee8ca839f73f4be6933e30e23e4ae8a15fd428f652276fd3ffca8b9b715c3555b18ec8e05850a6b40babfa861afe889e1d3a21cac9a8d40269eb2e3a16cf46d SHA512 0691348e9a5c6a7370e272bbb12f0dfad0ba17fddb256df7b1cb9e5b38d059c2bab91562ed8c44a4f7aaf0a5dac4e9dd8adfcc2c91e3ec78dcad5d7d9c624b40
+MISC metadata.xml 640 BLAKE2B 21c430804b7a47fc0bc905aa8f75b9a89d094c2b83da187bbccb7185917a5c86c59b811f2b35fade246ebc24ca8c9dc8eac4ee4ef1933a5c0abe993029a66132 SHA512 de9c6c460615c62adb2062b4a2ce6509613568d28c2d3275ed25b85ba17628bda99d62a6a35ec498509b6438250c9dc48e4e7439821ec030466d93a61fd8cada
diff --git a/dev-haskell/memotrie/metadata.xml b/dev-haskell/memotrie/metadata.xml
index 2a3b094947a8..f1d48939ff44 100644
--- a/dev-haskell/memotrie/metadata.xml
+++ b/dev-haskell/memotrie/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/metadata.xml b/dev-haskell/metadata.xml
index e6044576f941..3b15a8a72e9d 100644
--- a/dev-haskell/metadata.xml
+++ b/dev-haskell/metadata.xml
@@ -37,4 +37,3 @@
 		językiem programowania Haskell.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-haskell/microlens-mtl/Manifest b/dev-haskell/microlens-mtl/Manifest
index adc058d4b17f..7fcbdf70a7f4 100644
--- a/dev-haskell/microlens-mtl/Manifest
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -1,3 +1,3 @@
 DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
 EBUILD microlens-mtl-0.2.0.1.ebuild 799 BLAKE2B 3f1c966b0fbccce16da18f77e3fb9182ca9e23923619a7a5d9feb9518542d6cc92d6f9392d3913bdd89f3fcb50003b58d2aa29c4601ac3afeaf866b75745d072 SHA512 d8a3d8c616610418c52e8d44390f84510e4c166b4b7731bad8b87879adaef920fb8d605b7862dad8bd46bb382618bcd97cfe33f33c63eee303d182f99cde37ec
-MISC metadata.xml 649 BLAKE2B 3ff775441db74484cde52d1112461041573ca1cf3f6becf2f63a41f26a904ec8dd84c86642cfae6c38d8924f659ac5b57038136408248ac8f28c591f3ffba606 SHA512 5cedb24535136c1c14dce2cf2fb9f0af06a616bb91023913dc30790ffa8c782ccdbea3fa1f25c41c2ac336794e239afef8474862352ef7834fb4b74aa5c029cf
+MISC metadata.xml 609 BLAKE2B 3d674ecf2100bca458f51db537842f8a640438291e494e6e3e8c564e664311e1f11c66a96542091252e39e0e495f0a55576308e641195dbbbf59a49c3f0935e4 SHA512 ab221f026e89a2f74dcfc00abb86a507112021bd05e24465be499664b3af80333cdf027bba3c0a6c1d8adc8a29294d3536266e8cfe7f29efd9157ecf2d2a91aa
diff --git a/dev-haskell/microlens-mtl/metadata.xml b/dev-haskell/microlens-mtl/metadata.xml
index 31f5b531504c..183a6dfcf8a6 100644
--- a/dev-haskell/microlens-mtl/metadata.xml
+++ b/dev-haskell/microlens-mtl/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package contains functions (like &#39;view&#39; or &#39;+=&#39;) which work on &#39;MonadReader&#39;, &#39;MonadWriter&#39;, and &#39;MonadState&#39; from the mtl package.
+		This package contains functions (like 'view' or '+=') which work on 'MonadReader', 'MonadWriter', and 'MonadState' from the mtl package.
 		
 		This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
 	</longdescription>
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index df92a4c2bd8b..019d50c2b795 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 882 BLAKE2B f8aef1d52351b2711f8651a3630da5dbb8cce9d43152fee9339fe89a289f0c98f5128c48bceed159200c59c60ebcf60ddf16a8affa1cd5f6ca9dc4b8c27ba40d SHA512 d207f70a0f6bff0165271377b031980c25f6c88ceb820e24b6a912a82a42e838f168964a20431c8a0df6d9f607ca1a9e3020297bd53b02eda0aac9928be50f4e
+EBUILD mtl-2.2.2.ebuild 921 BLAKE2B 6ce035f4a361e8d9daff8aab62718fb0366896ab010ed29c09712ac402ac4977201371de349befe2edc62fd95aea8ca3e0e6b8bde14c5482ecdbeadd2577dba9 SHA512 085a41929ffb0befab24b067f39b633b5fd21ce2b6ae766f50ca876bf0dd8d108ed17c997d304424adf39bd8f2c55ae8b20ee37be2f02f2408b8f871b0e18151
 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 c9885eb4351f..573ea637bf81 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: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.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"
diff --git a/dev-haskell/murmur-hash/Manifest b/dev-haskell/murmur-hash/Manifest
index aab19ff7f560..272811330ab8 100644
--- a/dev-haskell/murmur-hash/Manifest
+++ b/dev-haskell/murmur-hash/Manifest
@@ -1,3 +1,3 @@
 DIST murmur-hash-0.1.0.9.tar.gz 4204 BLAKE2B 33781f0a94f767d8f4fc9e10e3c94718308e24370ebfd9f66cd5279bf9c7204136103a8e4aa86f3025559e87075e47bde6930135215cd9b1c4275d696f2c2490 SHA512 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486
 EBUILD murmur-hash-0.1.0.9.ebuild 539 BLAKE2B 8bd138665d2d57fd53b834aaa678f6cb4cfb1d233fadf2c32a89b0f5b7c11fa6256981854e88e898d68b7c9c6775fcf1ad4598f3b3254ec2d9ef7c8a987f9063 SHA512 c6b2de58f4b3eb653e185be358745f4e0a940843177cb4a2b8ad9d07a0cbc1dd0fb3838565403268628f854a04f1f3b231a1746454a5fa2da3b67bd6c0a184c5
-MISC metadata.xml 625 BLAKE2B 0bccd08db0d4a54371359aea8188fc94bc198886c5b2cd6c5895ae84b508f3df958238dbd4bec90aa5d24d83b4884c38e2af568e0f64aafe770e667eab6aef23 SHA512 0a34e2c2f2c0908bceac9f12fb82259cc54ea33198d73400332d00ec7a54591505bb0b1ce387408219b44fd96136a33ef9f27c99e1a0a00be38dc1ed6fd82aa1
+MISC metadata.xml 625 BLAKE2B 817d9df691fd160637232637acf74cd5ce6f64d707eb41bc7fb83618740588fda25b91e3150b9468b36307b5b7f313d2ba3cd025c91740d5943387cfb0c27b13 SHA512 a38e4dcda8c2e5a74e0bc146ffbfec90f7b222c61364f2fe78673b87d3ae04931fdcfc95110c6d4c3359070c927ace989779f3d72b611f91fb0521ac5bdd8bee
diff --git a/dev-haskell/murmur-hash/metadata.xml b/dev-haskell/murmur-hash/metadata.xml
index e0fb34889e78..c14709e957ed 100644
--- a/dev-haskell/murmur-hash/metadata.xml
+++ b/dev-haskell/murmur-hash/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/netlink/Manifest b/dev-haskell/netlink/Manifest
index cce51641af53..638a08ed1c86 100644
--- a/dev-haskell/netlink/Manifest
+++ b/dev-haskell/netlink/Manifest
@@ -1,3 +1,3 @@
 DIST netlink-1.1.1.0.tar.gz 49444 BLAKE2B 620cf5a4b52f86d9410534d5ed0f4ede40961e976e811c0e2f07c46c95b1ceb1452b9b19cdf4f9da9dfd60166fc7899550b060569dea956feadd6c1293c20f6e SHA512 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
 EBUILD netlink-1.1.1.0.ebuild 841 BLAKE2B 2c05a399ed25f634ac10857fe4f7abeb778f7fb240ab7ff7e46a88e0328356ff789e585c31c874369e708dc440d258461dd66162d60bb8bdbeb632008fdac8e4 SHA512 bfc246baa8da6800f95c80f0eea79e199322d32776413a09ddc60ee93e404938425abff7e7fc25e84fe20393768c6abd313df53ed3ea91e7b323d363ab44d749
-MISC metadata.xml 339 BLAKE2B 40a47c360c94feed4297bb8d44315fc2e02201b19ff53b2fe3ed2c4f4325279bbeebf8d039ad92e0e989ea352895cd3a38be20f5997d7760571bfc259d474311 SHA512 0beb4aadfad4adcdd7acc220c7b2c584e0c908b0a80dc6c69dfb959a4f80146eca0bfdc3b86d2cc53acf5268f834dd9fac4ed4fa7d9e35b6de34f9269cd466fb
+MISC metadata.xml 339 BLAKE2B 57896d65082bdc45a0c13a2583a8483c385a957f6c5d3c8779cbd2d1a7bb2e3bdabf839db9638e6ecb323895833bedb826b13d4959521bdc64992d84e0bdf613 SHA512 72f31c8dfec007a91d42eb44753a16a22f1c8e1fadd79dbc8e7ea428871543a8101e3b5da4f82432aff4385b28f6fe6fc8d2e9a08938ac5ca05bbd34d92c431c
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
index c32804186997..8bc33cd1ae7a 100644
--- a/dev-haskell/netlink/metadata.xml
+++ b/dev-haskell/netlink/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='generators'>build the generator scripts for constants</flag>
+		<flag name="generators">build the generator scripts for constants</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/network-bsd/Manifest b/dev-haskell/network-bsd/Manifest
index 30b9a9101ebd..9f3e3f0493be 100644
--- a/dev-haskell/network-bsd/Manifest
+++ b/dev-haskell/network-bsd/Manifest
@@ -1,3 +1,3 @@
 DIST network-bsd-2.8.1.0.tar.gz 8584 BLAKE2B 9864cdcab82d77592574983c70ddf262a4e836807d9141cacaa638d109f423e8332d9cb0b7d07661121970d9bd0b0ef9dd292d7e57010dff106a62003592d738 SHA512 b2f66c6705c490e1cbaab6ca88444294bc90b3711da4039046a9279060ed41228ab855b40039f56bd02eabcc0351200de3e043a108a0cdc98192d563702de7f3
 EBUILD network-bsd-2.8.1.0.ebuild 695 BLAKE2B 595c754b501c69374b6043bdcfaa648c38c1d75f5a8d5c05f24a3012a69bf4868611e1fa2ba2dab8cc4795d2789469423f69d66721592e4a7d3ba05e90f95b3b SHA512 ca740eef3e4e2d8372dfd2f6c39f1576ab79868075034221e5d80cda9db0edbc024f711080e140a96591fd9a47102bd40cbdab717c641d8ccd46d16b60bebeb3
-MISC metadata.xml 565 BLAKE2B 94098ab012c476f17cfa75d4d84d8e1a3b2c0cc1e963a380901a8139e9f09bbaa8abd81c31a3355f3f7541a904bd4228c82c337426e1c625a4f848d657721d55 SHA512 942ae67c0f50e3d39f3ae7c0cee4953b5b3964812fe92f9c8192bae028efdda30f3cc02f8022bc58e44723cf03ec40e33c0f94cc0ff36d78ac943c7dad1fe0ea
+MISC metadata.xml 555 BLAKE2B de1d400f1ab127914d8ba4141df6de2ecd174818cabd046e55f00764f582be2249723d7c499adea7b434673f99f9b01746dbc0c7c8a11cf860d2362785b00974 SHA512 ede788453140cdb37555732a8c0782342f33eaf97308496d8a7eb465e4b74c848ae2f2077178e2682820d0a65972b683459c425c532813d3ec61dedad11c8285
diff --git a/dev-haskell/network-bsd/metadata.xml b/dev-haskell/network-bsd/metadata.xml
index c784256ff24c..b67387384df5 100644
--- a/dev-haskell/network-bsd/metadata.xml
+++ b/dev-haskell/network-bsd/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package reexports the &quot;Network.BSD&quot; module split from the &lt;https://hackage.haskell.org/package/network-2.8.0.0 network-2.8.0.0&gt; package.
+		This package reexports the "Network.BSD" module split from the &lt;https://hackage.haskell.org/package/network-2.8.0.0 network-2.8.0.0&gt; package.
 		
 		See newer versions of &lt;https://hackage.haskell.org/package/network-bsd network-bsd&gt; for more information.
 	</longdescription>
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
index f707d843d98c..d68d8119a90d 100644
--- a/dev-haskell/newtype/Manifest
+++ b/dev-haskell/newtype/Manifest
@@ -1,3 +1,3 @@
 DIST newtype-0.2.2.0.tar.gz 4853 BLAKE2B 7b4b14b3ff158b6ceba22465421933fdadeddf20a6309cb107078f792087c63a614eb8df99f5ad515cbedd0897342252929ab34aa1694013d95d2e165c2a02e8 SHA512 9d8b344ac5f6ff62d8100b95dd879715639af2d8d1f63a8cb17a18fa7c4f427eade49aa3d6b47034351ac0f2cb5061013f6321038bff1053eb3aa84faf157a5b
-EBUILD newtype-0.2.2.0.ebuild 568 BLAKE2B 1f957f73182af6a794361c48e42321e8f541f007c749d8d7b874fbabc1967f6ef75e4f1759d976462b3596a32189abdc7da1245749e53314e86a77cd390d7415 SHA512 ff7d2d0cc5ed590deffdf4d597b8065ca2a1c5b4b6a62593da07d4778a158a5b3b36cde386e465ff5a50e26f6e3bd0e89efa7fbe370fd0baf29df7f679f30e5d
+EBUILD newtype-0.2.2.0.ebuild 653 BLAKE2B 89c28846a3dfb315c06d6a650e5a6c780e38daf9d99f5b32238b5ad5bfa7e20b653e74c2f89c5c2813a6eb4608c67a5bcd68f5b723d583f6568793c46ba9b324 SHA512 2cdd8f443eaea69ecb9d932d8ed880590db463017e4310fbc12f2bd261c8c4f87d7a52f773d87d742a5ee6e3dc503bae6b79a2c309c1791e54da81d601baf34b
 MISC metadata.xml 457 BLAKE2B 91199f5831c7431f71b4851e9ef19b0be90d604ad18087201febd2402e7839cc343dbffdc0904f0b43d31b2900037fc63d9f036d8daab713e4dcce80edbdc6b9 SHA512 75b00c69ad2b24cee918d3ae93f9bf4d8f66bb4a8e977af215c88b712dbbb235586add1750647215896544bfe79ac073fc50d588de267a4df2cdbcf2d7c53075
diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
index 2b424a821927..f3a91654edfc 100644
--- a/dev-haskell/newtype/newtype-0.2.2.0.ebuild
+++ b/dev-haskell/newtype/newtype-0.2.2.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
@@ -22,3 +22,10 @@ RDEPEND=">=dev-lang/ghc-7.8.2:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.5 && < 4.14' 'base >= 4.5'
+}
diff --git a/dev-haskell/only/Manifest b/dev-haskell/only/Manifest
index a73c95cc0cb3..756bf2d7e964 100644
--- a/dev-haskell/only/Manifest
+++ b/dev-haskell/only/Manifest
@@ -1,3 +1,3 @@
 DIST Only-0.1.tar.gz 1960 BLAKE2B b57f48e58287c43395383e355ba9b2d42df4c8b65edbc268e7203853083524dc88540d63a052968b9776dc94064006241188b23e840e1e36872389f9e463d1ff SHA512 6b64178a433079449b6840b03345e70f2c5c03e322184a60d3ff2f4d0ae48be87042ff32dc1cabe1911b6c43f7162090ee067aa582c6d5ab56610ca4897a33de
 EBUILD only-0.1.ebuild 618 BLAKE2B d849e119cfb5edbc9a68e325b5b5d230dc61404d7e812b7345939c36dbb1303110ea6ef15ab90f568eeb41ecaf586960bb1ae2427392a3538c4b9c2da69c3564 SHA512 2591f2256f47584c93ebb60036f1be1b71ee5c182d2b621dec516d9aa4bb1803a192d0ba643ef8c2238b59c19c2ccb741ed15f660d1f0e54656c62fa0812de87
-MISC metadata.xml 779 BLAKE2B 2f1b17b0133b6eb1b3ef8a97b938640ef6cfd7971940acf2b168a338d71a6c61066e8271ec06bafe51ef399989f5ad328053c1b090a2382dbc4bfa26f2d12c09 SHA512 6f58cde68e293f6b336bb54c02dd1d04d6e1e7e76ca13010b98495a08bb9a153cc4841a80ba7677ce108ed4f5f7447bcfd9289d89fb4c20b47c862156e74bea1
+MISC metadata.xml 767 BLAKE2B 97c1d2433bd26b0fa33bccab84ad4c5ca62fd289d18a65d7d753d76ac91a56a495ea086fd6486e1a36d35a23c047318a098e61f6f81a57d14e01d309874ab310 SHA512 fe2b0c9057d3383ac114fa63d38311ee0b7b49f1f9052a7be9470cf48841deffea710ead80d329a1b962714a2fb24510f7ec6c9271f622a418ddc6bd3b2fdf71
diff --git a/dev-haskell/only/metadata.xml b/dev-haskell/only/metadata.xml
index 180274c79810..c69eda744f58 100644
--- a/dev-haskell/only/metadata.xml
+++ b/dev-haskell/only/metadata.xml
@@ -11,8 +11,8 @@
 		
 		NOTE: There is also the &lt;/package/OneTuple OneTuple package&gt; which
 		by using a boxed @data@-type provides a 1-tuple type which has
-		laziness properties which are more faithful to the ones of Haskell&#39;s
-		native tuples; whereas the primary purpose of &#39;Only&#39; is to
+		laziness properties which are more faithful to the ones of Haskell's
+		native tuples; whereas the primary purpose of 'Only' is to
 		provide the traditionally so named type-wrapper for attaching typeclass
 		instances.
 	</longdescription>
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
index 4e7b6ca4decb..1900ab988c8e 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -1,3 +1,3 @@
 DIST pandoc-citeproc-0.17.0.2.tar.gz 344577 BLAKE2B f2b4687fe5de8cb8b76d1d8022ec9629c7834a3f3d3bc2735c52ec40ea0132caa8d7b9ad3c603d6120800e2c1f75e76cb13a3c45a4cbdd0e4bbba6d6fd54ed24 SHA512 5ce079a542b096c06d6e4e205625a993422a972f04787495ac9013dd3131df62733f30e4c3004335e3738b02bb22a7ad50a31c1eb3f67d2b4ef51605c7fcbf16
 EBUILD pandoc-citeproc-0.17.0.2.ebuild 2722 BLAKE2B e5ad059cc4a8d4d0d0609014b50eb425d7efc483e8e8c99cb84cd45f87779376c8a2ec634e9fcbece1c7c6f15b660f9585284e55cffc674146b3fe8f8ed9acad SHA512 df584133674ecac26cacfeaa3a7fbd30639576a8a11b7d45384496d876f87c9b30f4dbd65f4a92cdff1ed0fea280fe5b723bf1579174e0952339e091c66a1144
-MISC metadata.xml 1247 BLAKE2B 5e118fd7595a9775b75a9b87fc81bb7221a2b2609565880bff42fd9efcd9469dce6c69f47c1dc1a04b1f7fb97023166e73fa76943c904cd6633e66ac6010e963 SHA512 fdde89152d95778a857d83643ef23c4759d1d0de2e4d22b78444ee4f91a181e503ca02349ba4b468265281edb361f8d86c3a78e8b6b49fca0006777f8cd79674
+MISC metadata.xml 1243 BLAKE2B 4eaf94bb0ce02d1bb09e07f48d0e96451b1740ca6a11fb570555ae0a3425f442685fc31e6c3aec7174f210c77592f9418e2cc176c6fbd2b342aeb3a0a5607a58 SHA512 7e406e16680e9880c0dad285dbda57e9f6ef8797a0aa1dcaafca37865f82ec49701abed0d061274f7a270cce95580b2aa02c06d107d0a65ce4f386d3d6a63489
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
index e2fa1b509fd2..b5776f219431 100644
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ b/dev-haskell/pandoc-citeproc/metadata.xml
@@ -25,6 +25,6 @@
 		databases into CSL JSON and pandoc YAML metadata formats.
 		
 		pandoc-citeproc originated as a fork of Andrea
-		Rossato&#39;s citeproc-hs.
+		Rossato's citeproc-hs.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 847b4a45a493..cae581a8a374 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,5 +1,3 @@
-DIST parsec-3.1.13.0.tar.gz 35207 BLAKE2B d5d39122bdc8117aa45b7fc83c15162ac5d366ede01fbf99a94909c0b8ff6a31b6058bbd52ec6aa2366c6e9b1c909acb78c90a697821f8a88b67fa01c7655ff4 SHA512 4efa52bf5f8cdfe81ea97f1ea0bb5522331217976feaf98bb5ebfdf37f4685263f653de091c0ec0ecb0fc26cf6f8525639f9728c9e92afc154e91c6d4239c9b3
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
-EBUILD parsec-3.1.13.0-r1.ebuild 1306 BLAKE2B 875dcad5ebad6d756fffdd7da232c7ab9a35666eded41f15d8e7e00f1ccbb9bc4eea4167797ba25827fa70ec8a96909d61c33d1efa50d7434be0c60302977bd0 SHA512 4d8d56676d71a9034354ed63116ca6af3b226c64667db9d53a29850daed0518795da884c7d234f545e760bff66d422a2be85cfcf59d2f2afb30148d80dbb20a3
-EBUILD parsec-3.1.14.0.ebuild 1262 BLAKE2B 5e8e3230fb9c83939ab48413536aeab995c3478d17de9461361621650075bc3d6ec359f3cd6a8474eb7a21571e5df7d2234b0405d329b3e6af7c7741b4114ced SHA512 a55281aaf54fd412909c6433d3624463fb19841cfb65530167d0e7134318415ca79ffdd36a8024dffd6734bc34162fc932413c3e7e833f8302cba1695267ca22
+EBUILD parsec-3.1.14.0.ebuild 1291 BLAKE2B abb8b57888a9486b05189997f79df5150116b0419a9b02dd9343d9be143e5df0a93da82fce38401aa9ee60d167b33e0ef0c5f36149df28359f46a9650b259d34 SHA512 d339cf1ae10a6e6d30983bc404cbf0d634a33f04a832ef24490200aa39c7843025dcd9fd4266820fe227392ca1f87d88696f5f3a25234a44fe06dc956e689da2
 MISC metadata.xml 636 BLAKE2B 546955f2794df86c208026c6b3705535af628a8603ba09e942655c268684bf19e30f7c7b6b2965985cb5b8397a9e58ff278261bf08800f6ba7f0d2a74989d7e8 SHA512 ac9389b16e95e34ddbbcbf567449f2cdbd2247a2e419c58d8d07de32a782e29153271da8e80e4382f61e3af469894f80926acbc7f01ea172b53916cf1b32003d
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
deleted file mode 100644
index 0a7c5b66927a..000000000000
--- a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circulare depends: test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/hvr/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.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:9999"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.5.1   && < 4.12' 'base       >= 4.5.1'
-}
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
index 7cebba59ce2d..0743f353eaf9 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.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
@@ -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:9999"
+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"
diff --git a/dev-haskell/parsers/Manifest b/dev-haskell/parsers/Manifest
index faf5c5ec942d..e7249d3e5601 100644
--- a/dev-haskell/parsers/Manifest
+++ b/dev-haskell/parsers/Manifest
@@ -1,3 +1,3 @@
 DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
 EBUILD parsers-0.12.10.ebuild 1495 BLAKE2B 588843cabdf6475f83401d8d51362fab3aee8fc2336842d13d6d46daf0eed227ee1fd0884055c9d65765baeceb64423ecff28e1051d682ca796faaf425c478d6 SHA512 fa02af09569303b982010c73f64c5d54f7f42444ff08f6172528239a07dc88ecf1cc1b51a929a413cd1f093884593fbba50c28b117083cd184d76ff29a3fc4e9
-MISC metadata.xml 860 BLAKE2B 2578752f82eb9b0f48db65ff635446dc167def7c5a01a874609a6599e8544d407001936c0ba24ca6ebff39d549b4a52a536451a6325259b090ac159911318438 SHA512 2d4427181eadc4b5c7db4457f2b982ef893d1e30ff93c9605a1a2b28efa9ae9ea3b9832edcb7fa16062517ac2c31c8570eb22c7ff7bd90fec39c4287fdda4a24
+MISC metadata.xml 832 BLAKE2B 4951abfe171a818872f267c54b53956cf5cfedf9b8f83edee5ad5f8146b644a2c749e5fced8c74de8a97be7e88231afbf0872ada9f6791f7964e0f2e823f682c SHA512 72ccb931a0e2852c8df7ec4b80594b6fb0ec58c43e6c0434090e51ac1c096361c0fbafefd08c85376a4253d6dab9fc4874cc86c1861b692dab0a339b5b3a976d
diff --git a/dev-haskell/parsers/metadata.xml b/dev-haskell/parsers/metadata.xml
index 0149708d6d5a..c4382380d26b 100644
--- a/dev-haskell/parsers/metadata.xml
+++ b/dev-haskell/parsers/metadata.xml
@@ -12,8 +12,8 @@
 	<longdescription>
 		This library provides convenient combinators for working with and building parsing combinator libraries.
 		
-		Given a few simple instances, e.g. for the class &#39;Text.Parser.Combinators.Parsing&#39; in &quot;Text.Parser.Combinators.Parsing&quot; you
+		Given a few simple instances, e.g. for the class 'Text.Parser.Combinators.Parsing' in "Text.Parser.Combinators.Parsing" you
 		get access to a large number of canned definitions. Instances exist for the parsers provided by @parsec@,
-		@attoparsec@ and base’s &quot;Text.Read&quot;.
+		@attoparsec@ and base’s "Text.Read".
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
index 7f6e168674a8..02fac96f4daa 100644
--- a/dev-haskell/pgp-wordlist/Manifest
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -1,3 +1,3 @@
 DIST pgp-wordlist-0.1.0.3.tar.gz 10143 BLAKE2B f6523be71399c90e6248b583f5e68a2ad51069d3ecf62609aac09e289a799c15e4f30241cc558f070fae7d68990e1dd4ddd2fd7a30e046902405c7e19189eeea SHA512 b7c6db47c1f9a0b10c5c94ea46b8eee282988e5990ef3dafa2d07a5bfc0718572b04494d23ddab063811ef2452546d6b17010c6490a89031f4b071f1a43d989b
 EBUILD pgp-wordlist-0.1.0.3.ebuild 864 BLAKE2B 49141a8aed2e302b5949bf34a667fed914312d5dc0fa92de5df89b6084234c506e26e9d6d5dd635a7c595b5aaf965d68b57e0ab04e6dc5847c9d5d441a387cc5 SHA512 7f11b3c095e795a398357597e5fb26b96549345a88235c1d33b15a83296874fcf83a451fe211b1a0318fe8458519cf54e6a9e5dd105bc9854f44df2f17db3ad4
-MISC metadata.xml 793 BLAKE2B 31de74e5791a25f4a8166a099041b38d18fa97fd1d1cabc0d9f40bae32763076427e4a75e6077e90a17069a758ebe541a7c7b92d4cd14bf5082c91bd8db75683 SHA512 ea2360cb9f18ddb50da1be41c4b339c0dcbb21216c352835f1137ee48afb6fc4e13af3887a5bb91b5a06e05521cecd0bdeb1f25c1dc70f87e2259bc2ee5f1d45
+MISC metadata.xml 783 BLAKE2B c12895547f41eb049a6820f9c2f5bcbfc8af8d949f32a856a097b54bf85b9ccf20f71658387d101224c27deddd9c4fd4cc379d8e5878d2b48539b89f0d6b6c25 SHA512 bc370b604c0eef4a505b6fddc4f9ba28bbad170641f3b59206e4c629ba508714561b84478a3c68f1307d63bbfd44a2068c2c2b12aa34122d2127083a4b530721
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index 36a5661f1120..603a8f267d3c 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -15,7 +15,7 @@
 		them at each byte.
 		
 		The PGP words corresponding to the bytes @5B 1D CA 6E@
-		are &quot;erase breakaway spellbind headwaters&quot;, for example.
+		are "erase breakaway spellbind headwaters", for example.
 		
 		For further information, see
 		&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
diff --git a/dev-haskell/punycode/Manifest b/dev-haskell/punycode/Manifest
index ec31cfd12725..7b82af44691e 100644
--- a/dev-haskell/punycode/Manifest
+++ b/dev-haskell/punycode/Manifest
@@ -1,3 +1,3 @@
 DIST punycode-2.0.tar.gz 6243 BLAKE2B b6a0b5123ea3dbd8b8c28ea56b4cf7425962011224549ece1c3c2c5b6a951e7e8c76c46f33a548f43ec650a42ef98f373769f623b4094ab6e222f5e2b91ce621 SHA512 106ee29667582f0341b993b8fd888046e70aff02bf9a31fb883488ed0f1fe346ae6dacd60ceacf088c056b50cb99d633322f066be391585af9c37fd8e5e4ff44
-EBUILD punycode-2.0.ebuild 786 BLAKE2B 21e0bfa00b65f36b632591e50a4d05167f64c388f1aa84c93c69b17c69628c7611b9abc8faed1df2f7431ced1066bf39fb4c7a8594d2df91c9741eb36d588a28 SHA512 efcb97b8f969b43b9211c42eecfe9e2a5bc8d4b06ae72a6b67b6bcb5ff7290b39a0be3ac5f5fbc2ccbab7d702ac42747e14d29be9052b480f0f1a03dec6b8b32
+EBUILD punycode-2.0.ebuild 799 BLAKE2B 4ee6d69487a3e32e9b5e468766979b202f74a70339ecee2dce57039458c9bc72c5407c9c227fc795c133591191ba458c346ab57e2251325642eb5f497fc1e176 SHA512 56b1fcc6830774b9e1a60c797a24fe1db1679cb07fd6d0250af63ad28979faf90043758ed309c3ba0ad30bf9b5c20e89a31ab23c236999dd051fbdd89f465a4b
 MISC metadata.xml 640 BLAKE2B 471d4516143eb307d40d70cc7675bc6021ead59615a2f27dadad6daa7214225dc74ec87d192779bef70f74aa83da849b6a66faa4bb8185dd5935deae8fcaf4e9 SHA512 8b6a12f34e2649b090b1effb5acdf18f600132a879393560d0d99b9f887047efb2804bb36a244da51def9c3e662de5604f1bbe93d896bcc3c0ffb376edaaa149
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
index 5bf0e711c377..064e6d0602da 100644
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ b/dev-haskell/punycode/punycode-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.3.2.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492"
@@ -17,15 +17,15 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # runs slow, finds error
+RESTRICT=test # runs slow, finds error.
 
 RDEPEND="dev-haskell/cereal:=[profile?]
 		dev-haskell/mtl:=[profile?]
 		dev-haskell/text:=[profile?]
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/encoding
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-		)"
+		>=dev-haskell/cabal-1.8"
+		# test? ( dev-haskell/encoding
+		# 	dev-haskell/hunit
+		# 	dev-haskell/quickcheck
+		# )"
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
index 6664c2ecf0b6..e16e8ec39090 100644
--- a/dev-haskell/quickcheck-classes-base/Manifest
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -1,3 +1,3 @@
 DIST quickcheck-classes-base-0.6.0.0.tar.gz 25760 BLAKE2B d09794c63da8311836e6422006d262fca21f7d71b473b69f57bd49b3ed2e39f29fcfd18b73fd311db4f6b1cca390cc579f2438481dbd680841c835d7d0d9f557 SHA512 3d0a7c68ab1cdaddbd272df633e0704f5ee3997b3a86fe79cb960f7c84f8546f3360b9d52ada45b9db6344135f0aab1093d5304935ae19f43d235790fba83216
 EBUILD quickcheck-classes-base-0.6.0.0.ebuild 1143 BLAKE2B 9f80f952b5ebe7f421bea47b9fd028ceb8f21aacf6a73dac28e5d7a321b43eef02df93ee78ba347a1e588ae56b5b8562b58b6c84fd1734e62143ea6940874993 SHA512 55d5b608286319e3bedeb2f0601556045420b05520062ecc5ef9e1b41f68b05a05ccdbcd204f38c73079da86ce494c60c8977cd9212cc92b667e7dc2f3327c91
-MISC metadata.xml 1592 BLAKE2B 7020e82f10049c969769746ae0650957824e80aa448ee2a360055d88006e5423cf888f4467fe364c58df852c6611126a60fc91c55f621c02e4787f6f236aa28d SHA512 a9583e85d9b560b12cf7493e64010527bac6cfc2e9e259624919f77459fabd36bf75ec8ef53085812f99623c67da03ffa16b6e85d2d1da4823c898c8cb56a7d3
+MISC metadata.xml 1568 BLAKE2B 977b3e776e54bd046d3dd86ee971c47c58f2b302cd1788ea4c5c379aad84e8f0915afa0b6c55148e4d8120fb26f23e8ca0787c5ff386c8bbedb457e35504fdb3 SHA512 481c27afee017ea85e28760e56ec5a5173c977683a89c27ab254db1c08935ccea91178017db2eb8ba489b1a8942f4963f6564b6b128ab064592b795af0192d39
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
index 6b8592b1a5b8..435de9480d90 100644
--- a/dev-haskell/quickcheck-classes-base/metadata.xml
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -26,7 +26,7 @@ configuration.</flag>
 		any new typeclasses that the user needs to learn.
 		
 		/Note:/ on GHC &lt; 8.5, this library uses the higher-kinded typeclasses
-		(&#39;Data.Functor.Classes.Show1&#39;, &#39;Data.Functor.Classes.Eq1&#39;, &#39;Data.Functor.Classes.Ord1&#39;, etc.),
+		('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
 		but on GHC &gt;= 8.5, it uses `-XQuantifiedConstraints` to express these
 		constraints more cleanly.
 	</longdescription>
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
index 4e8808c5d94c..fd0d476a0e40 100644
--- a/dev-haskell/quickcheck-classes/Manifest
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -1,3 +1,3 @@
 DIST quickcheck-classes-0.6.4.0.tar.gz 19976 BLAKE2B 614ebc6e1be382a942a55a039921021fd4bcaa2f5c977a8d83bd7b1fb76feebb31f94da908c2389d5f9ab5f7e2481f76223375db41d12b3583658d5d7361ed9b SHA512 2d5786d3cd386a795d5e1ca58ef55fb2efb9285724cf8cbb2f28577973ac2b2a9058ba6185904bc29da88f6d080f4a38629df272502796a0c2e31f9a0e8b658c
 EBUILD quickcheck-classes-0.6.4.0.ebuild 1955 BLAKE2B 7ebebce4d4fca87ea9cafa847cac4e5ae4deeb0823f4ae6a835bde154b3ead9516161fdb4a6b29fc14788b33371b26fcfae0c977f0436f8abc786a7ae2d0168d SHA512 8c2d6da15fe86bd8e97ddf28563477fb9d1ca321f60034bd5507ac3c6eab490c46ad5fa214ea8bebb0b04c51f8023622bd885e95f43bcb01d8070a08367b8580
-MISC metadata.xml 1912 BLAKE2B 5fa229a9678e56d25a15e8bd8d7ecc228c56786eca51bea101184b240f1a901d2ce124f531fc3f4a86ef2c64770e0c5fbfd47c38c6abd1cdf00e16d167b6dbf7 SHA512 56cbbdc738e1cdf5ca4d208dec76c99806828756746aa5a812f1523c3917fb90c6a050fce9489db52064b7b4b54d17768e2a9296176876eab78f454dec2b5d0a
+MISC metadata.xml 1888 BLAKE2B 067481588e8d1d834f5a617683a8291ad640eca2048a022e3815d4a334a93f5fa3743320130317f20dcc72269e34bfeac7f5bd3ed086d527b45589486983695b SHA512 8bbe3c3a731294cca16739e4903a08f755dbf60b7e07a6d20427335778eabbc65f83e29e309e8e16976c24f94e6dbc7b2c2abc0f513e0100284c91c997c2142b
diff --git a/dev-haskell/quickcheck-classes/metadata.xml b/dev-haskell/quickcheck-classes/metadata.xml
index aaf10d4bc2b5..40fcf1b73c00 100644
--- a/dev-haskell/quickcheck-classes/metadata.xml
+++ b/dev-haskell/quickcheck-classes/metadata.xml
@@ -40,7 +40,7 @@
 		any new typeclasses that the user needs to learn.
 		
 		/Note:/ on GHC &lt; 8.5, this library uses the higher-kinded typeclasses
-		(&#39;Data.Functor.Classes.Show1&#39;, &#39;Data.Functor.Classes.Eq1&#39;, &#39;Data.Functor.Classes.Ord1&#39;, etc.),
+		('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
 		but on GHC &gt;= 8.5, it uses `-XQuantifiedConstraints` to express these
 		constraints more cleanly.
 	</longdescription>
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
index 0af5286a2106..08b246c47e0a 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,3 +1,3 @@
 DIST quickcheck-io-0.2.0.tar.gz 1843 BLAKE2B ee6179ed912313a17d0506c35ae79853aba4e31fab90c1f6727b59879bf3b172f739eb6be5186af1aea47342aa8a357bb4565299a820beaf104e642338db01e9 SHA512 02e1f40bac8f31f27c21d1d2df9f226816f9da871092b09f0451a8321e250c9e94887f94889be421c9d0034e0a27b02c907d16eb7da5a4376df42c7c1fbd01df
 EBUILD quickcheck-io-0.2.0.ebuild 637 BLAKE2B e7df3508c8e8633141831a7f68de757002a35f4bb8bcfaff97eadf94d5e6ecc2f6872e8b2f46694b04e0ced5f317a5f2161bfcb69acf5b8d530ca2a5493a3c69 SHA512 b946822697d3814189dd451695d74b7b0e91279047dea073d62279a0d2b1d444385148851ece58587f6a966b44acfb935e2d0d55870e06ab5cbb19697e191407
-MISC metadata.xml 483 BLAKE2B 87b16eefe2052cac2bda82073ea123fad841566592ecdaf48648a5bc397bd61da7e20834a21d90f4e3275b567dba02999b0fb33508806b70a897669819292e42 SHA512 d5f62058fd6c574a87e4c87fec15f0718302019c3a682a616a4ddb7b97b2b12544cc801806ba0e823f61e488b68f701a264a99c5ace84a66b4b1c8658a20a7c9
+MISC metadata.xml 483 BLAKE2B b98a75da00a5dea8f8dfd562a1b6636aa752a49daef7b133fca779ba13176c185fe77c9fa444d14691282298aad80a109b748115390b1b6f4cd6bb03375bfc02 SHA512 83c0fe39f3f9664a3a11fb6eacc7437a737e352704f524bcd8bdad5723388774faa4c3056878c600be314411d7f7c2d366bff63e502c3736cdf792df71e7e4b5
diff --git a/dev-haskell/quickcheck-io/metadata.xml b/dev-haskell/quickcheck-io/metadata.xml
index 601e4db9c3b8..ccae67edc9cf 100644
--- a/dev-haskell/quickcheck-io/metadata.xml
+++ b/dev-haskell/quickcheck-io/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/readable/Manifest b/dev-haskell/readable/Manifest
index d8c354a82a78..0d7d8c759bdb 100644
--- a/dev-haskell/readable/Manifest
+++ b/dev-haskell/readable/Manifest
@@ -1,3 +1,3 @@
 DIST readable-0.3.1.tar.gz 2907 BLAKE2B af3dab05bb8eba05bca049cb8991e3b46c38e8a4bab73f81c4c2fd4fb62f9e4134071eac0f69d4354be6b02df70ddfe1bd2a7bf59407434ba265371d0006c979 SHA512 237467c4b6dfef9fe090c53e45a1f4261e34fc947b16878575c2b1d2b93400a67678bfde3ad8500f82c56a4b87c5b45e561304c9936572a033d7b295740fb3be
 EBUILD readable-0.3.1.ebuild 603 BLAKE2B 2ac65daebdb0c41c394de87e1762863aee92249934138b2f934432a9f7eb5e3a683f6c8982f57ec22d1c6f5ea86485a261c4d8fe8ba8f044b0830e8c7d775e02 SHA512 305f94cf711d0df20669703ed84ad6e06686afe2e574335a1883bf2ad0ed765eb40e0e81c45a865a64717aec0550ba28137a144e5b4bd1de8084540e57007b03
-MISC metadata.xml 520 BLAKE2B 0740e50bc1efe8ae2f00b5efc2764524169c2c69e8f123450fbba70f460663e53bf7eee6f09031073cbc895ac1ff13b864ae474f4c3e25a5996482c7ea1c5f5b SHA512 5894bd6c4786ef89307780801a4278a528476dac4effb186b7c8cd4ef1bfa1b41e9c54d132acbfc476c6d5d7b617fd29187ba8bf640b8a85455e3c76da8e1d3d
+MISC metadata.xml 520 BLAKE2B d3122721417240e90adefd7d8259ee6ef6bb5240a46b3605f486e0edfc88f13d2329d775557092d246df7ad705f9dc51a4e96da9556944d35ea84a473245a42e SHA512 a50edd89bb23958a7f7db2d48b23a94898cb139fe2c8eea27db9a025c51c63e00ece9fec3083d0246479214553087867028354c525a536d5a1410c57fef1ddaf
diff --git a/dev-haskell/readable/metadata.xml b/dev-haskell/readable/metadata.xml
index f4857ab56a2a..4ddb13ff612f 100644
--- a/dev-haskell/readable/metadata.xml
+++ b/dev-haskell/readable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
index 6cff3940e8ad..631729a7a512 100644
--- a/dev-haskell/rebase/Manifest
+++ b/dev-haskell/rebase/Manifest
@@ -1,3 +1,3 @@
 DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
 EBUILD rebase-1.4.1.ebuild 2186 BLAKE2B 38260ed79e87c79f6d05a06806842932f09b9165e6caaf9a3800c9f0349b87e0d255df2f934476412494c153076c33fca31beddb9d10f60611987420eaa2c83f SHA512 9aed2662cc3b70af4d702bbec1d73c233b62124f8b17e61100933a8a1f412e75a87f8dedd8ffe8ba3b30e5902e0999d2e0eee69f49447b3dec29968060226e70
-MISC metadata.xml 1156 BLAKE2B c94eb0e35285de40e539f52d34783668348b1b654b4c272e727214bb25a4c0cfee2b0c664bac0a74624b2e5f301e7d84719a8479ec63126a12164a4e3228f93b SHA512 9233440a20e9736ca8ef80d2e76265055e63e4382d460d55dcacd5a38a900641bfabf64864208e6b823be3e9373918c4db24451bfdd0cd4f30ffac895132c67c
+MISC metadata.xml 1136 BLAKE2B d43d95786e3bdf0520a0ffeaa8b77e2c59d4d673bca7a696d3ff131df07aae2ccde8d74ac69d93af56376ed371eb0d0bddf73f0c71b8a4bd7bbc111fad9e9b7b SHA512 9142c5e4bd76496037a6880b0f87639356090cec5b05296c1c567f1c5b13f1fc476164ffed59a14352abb75aa2f3708d0a8a60d4c181e86d3c96d88fedc72cb2
diff --git a/dev-haskell/rebase/metadata.xml b/dev-haskell/rebase/metadata.xml
index f74069f161de..b5b31fd8ab3f 100644
--- a/dev-haskell/rebase/metadata.xml
+++ b/dev-haskell/rebase/metadata.xml
@@ -13,9 +13,9 @@
 		
 		To solve those problems this package does the following:
 		
-		* Reexport the original APIs under the \&quot;Rebase\&quot; namespace.
+		* Reexport the original APIs under the \"Rebase\" namespace.
 		
-		* Export all the possible non-conflicting symbols from the \&quot;Rebase.Prelude\&quot; module.
+		* Export all the possible non-conflicting symbols from the \"Rebase.Prelude\" module.
 		
 		* Give priority to the modern practices in the conflicting cases.
 		
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
index 9abeafdcd5c8..cf485b7be0b4 100644
--- a/dev-haskell/rerebase/Manifest
+++ b/dev-haskell/rerebase/Manifest
@@ -1,3 +1,3 @@
 DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
 EBUILD rerebase-1.4.1.ebuild 602 BLAKE2B 012b7f48e9e0a3c312948224081e0fe20e87e94f22af5ea6b1b9a6998c67bb509f0e251365d75e2d89c33bd8dc835bd83c0b059be3fe191f882e6574f95cc151 SHA512 2f4b8c3f796e6c8e4eecfa0cdb365df69772e65679c38fccd0b757af7ec1351f8a9d82a498534e72b3957495d32e3f354d80b4b9eb1b253fa5a7536fc8cb77f6
-MISC metadata.xml 460 BLAKE2B 977cc8dec4e7052b62ee4e45369c44a917c249de0c2cb4cb4afd71d154c1543657e6ab6e65f58dd479f336a3051cb0bf1ea7f81b690ba443972f21bbdf13e918 SHA512 23581ab5dfbef7bd3557e6305aee8b6b57401c23b417e2ea91caaa7f171012a19da475c84846d0fcc3e18c5f9739705acd7addc79ee2887f2c4b501c4879fc65
+MISC metadata.xml 446 BLAKE2B fbee4ad2d5d1b8e7ed8af4d811dcaa688bd150d9a3b66839d414993b30dc768434cd426d9b137a06d9c861e6499df27282839740f9a35ecfd8bc30781c6381c2 SHA512 07a54c43e611d6bec040e3a0c1e7bcb818f2030e9bb94d1e90705d0a91a244218a398997ff8ff88284ac42e9481965cf02b1db4daf637178737c459ee672674a
diff --git a/dev-haskell/rerebase/metadata.xml b/dev-haskell/rerebase/metadata.xml
index 2e10d5a26a21..51db45d2c5ed 100644
--- a/dev-haskell/rerebase/metadata.xml
+++ b/dev-haskell/rerebase/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		A rich drop-in replacement for \&quot;base\&quot;.
+		A rich drop-in replacement for \"base\".
 		For details and docs please visit
-		&lt;https://github.com/nikita-volkov/rerebase the project&#39;s GitHub page&gt;.
+		&lt;https://github.com/nikita-volkov/rerebase the project's GitHub page&gt;.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/riff/Manifest b/dev-haskell/riff/Manifest
index b4cbf159de2d..17dc7f454c0f 100644
--- a/dev-haskell/riff/Manifest
+++ b/dev-haskell/riff/Manifest
@@ -1,3 +1,3 @@
 DIST riff-0.3.0.1.tar.gz 9420 BLAKE2B 28715306b6c6ff6e630da306606f2946f05a5b0470576eae46761d7c368c502084cb4dcae0ddd6af2525491f83f7eb54101645a9d05fce53e117ab0d16123f69 SHA512 9b488fa0853dec662109809627c451ec22766595e710a14d25598e1232bc1e286a649a9fd4933bf42737b68554f1a0401c0fee12e833d6fd79b9eb989a4d23b2
 EBUILD riff-0.3.0.1.ebuild 803 BLAKE2B 22e8fc2749d60a5a371ad08fec2bcc323b80b549927d50a0da2767cedfceaea601f1a8662f2df082392b51dac8aaaf5689c135dea70de6e10f2b3e55a21c1a83 SHA512 68c37624a1cfc26a9ec0e95300ef4ed39cc405293618ea9f1c0524b1e80dc636f4089feb551f75bc0ed5c0fd249c1401a0c6e8f1fb0cf212fdbea159106bf9e7
-MISC metadata.xml 513 BLAKE2B dbece2e5a9c9ce115a159c6567e82851495dabf863a75ac812b8af948364eaeaa167cd475287a1d48ab112501bf46852c664692ee1323f599a24d99873de4088 SHA512 438371fd59af4219218051f77cccbe09cbd4ebaf66b247e0500568c70b5374820ab3d1498326edd9e724341c88461b0e3c395d783efc8d3aeb5d80c909391009
+MISC metadata.xml 513 BLAKE2B 65879b85216eacbfb6e6b4cc9954c30731eef772e8124523db7617a49db545d8366b4013964ec8c6efe18eae3281afb0b659e9542e3c02fd561cb544103107a7 SHA512 68631a84fa2c1a70c336eb97b76cd8abb661b5a19d66f3df39c32327af289e9638bfd63cccf26bc9a10e079048398fece6502031a21aaea22b04d74a4f10c6b0
diff --git a/dev-haskell/riff/metadata.xml b/dev-haskell/riff/metadata.xml
index 9e39c9d11cc5..4daabf5ae1ea 100644
--- a/dev-haskell/riff/metadata.xml
+++ b/dev-haskell/riff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index f7ae1b163716..96e945d8ebd7 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,3 +1,3 @@
 DIST semirings-0.5.3.tar.gz 18622 BLAKE2B 70075ef121969652ec666531f42681af759863247811425e43eef590e73b6c0d139274fb57821d28f405f0bd44cc4bed1e48506f08f880aee71f0ff986a30136 SHA512 cd038746d1ce36eb04040954b0a969f17bf67ff45750a221284550724dd0ab563896fc3012c8d58aaf5c11a008b5526088711655e165895a4dead2d054cbf5e7
 EBUILD semirings-0.5.3.ebuild 1104 BLAKE2B 916921b348516dcc88e57d50add3bd1bf14fe6a3240e3373de6225e87304b8ed76d73eb6b524e9109138cf95b8f71a10511719940735d8e4ca306c4da9620dbe SHA512 68269343481d8472e52badad3d60527c5ad5735d908c6c7635083868b66fca50e04fb59f94a34acd7cdae3f646281e4fbe4907a54eca8ea468cda96997df8ac0
-MISC metadata.xml 1648 BLAKE2B f9b35513d18ea7e7208147eb57509889a346fcb8df6dddefe133aaa98f626490b3cf9613647b8464f678f237fe9312f94148be35ea6cc2714e8615793db99d7e SHA512 8f8d98f2e90c6a7458181beee8a3001eedb68f401f1de732d8c0d3bbb600deaa2d594e8223b9f792ae5d6eb35af19232587ef976f28c9a9e8fc4254c61e261fb
+MISC metadata.xml 1640 BLAKE2B 354905e265e4d6dd59ee9268381eee54148798051531fee147627053192388785a883eff69f164ea64cd85729f88458d1e86ae1ed0043b77a1a7f5b49319fea9 SHA512 cdc4068b377096f334d4765f13cfd15a84364719f7c4c131b98c1da67a0d426b8a5c4b6c0a3954f0d0d64db755fe7e4c61cc20f4969829a5e6ca6e56309baaa5
diff --git a/dev-haskell/semirings/metadata.xml b/dev-haskell/semirings/metadata.xml
index d2b34f62c61d..ee4df2a73e2c 100644
--- a/dev-haskell/semirings/metadata.xml
+++ b/dev-haskell/semirings/metadata.xml
@@ -35,6 +35,6 @@
 		
 		(*) left and right distributes over addition, and
 		
-		multiplication by &#39;0&#39; annihilates R.
+		multiplication by '0' annihilates R.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
index 0d4890e04e21..1360a2fb3ef0 100644
--- a/dev-haskell/setlocale/Manifest
+++ b/dev-haskell/setlocale/Manifest
@@ -1,3 +1,3 @@
 DIST setlocale-1.0.0.9.tar.gz 2098 BLAKE2B b12b847957807038da6fb7bb31a8a9dbeb55ce17062a3060ab66aae75d840f9fb44cfe51b3b2644361e457d21cca3f325e0bc09c6d453c5d28074efed56bd6c6 SHA512 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
-EBUILD setlocale-1.0.0.9.ebuild 541 BLAKE2B f832a64c9eeaa472dcd55bb14fde4977d0fc7c9af09f6883a2f34e4a62ca016d27f5198fd1da7c6088f7aa2135e7934eaccad57ab45d4b015d668a9a050816df SHA512 cb40025f9bf1bf44c8a8f6e943476f92bd0ab47419991d0c6d40caf36764417433ef4fd2cca41aa912b9527a4b5f3d0a6ef31a6b8eee85fe9f127a00d1e6ce37
+EBUILD setlocale-1.0.0.9.ebuild 623 BLAKE2B c40b7cdead2a95f04aed2b33df65343127fd8a9aac993fb9ab4a45e49a889b4e475e4dd59475fb4dddcf28bb69cc4f20286e41d14875f76e5e8808898dfe0cf6 SHA512 7ada4f5c3a3f920dcfe6ba36dc03eb31836c074b5a6a546767676937a8b220f50226ecdcabcc1dc2d09b6058129d8c5215ff93945c20f43e2995fde8f8c24b92
 MISC metadata.xml 348 BLAKE2B c54b9d4440f64627494b33b5d5b9ab7f9fd97859fabcfa341e02a6098f7d17c64f779199a73db2adfe392d4856ebf9239413eb52f3c861228a929c4a208934fa SHA512 2eb07cf28ad704a235cec040cf80230170305c1ee619c44e2c8e31f0518ac543a190f3f3dc2255c2b4a9534af52c15bc8a395a696eceec73a73830e6e13ff2d8
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
index ca5fc8991912..89678002e584 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.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,3 +22,10 @@ RDEPEND=">=dev-lang/ghc-7.6.1:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.6 && <4.14' 'base >=4.6'
+}
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index bb20af50711d..78bab20b5c75 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,3 +1,5 @@
 DIST shakespeare-2.0.21.tar.gz 65752 BLAKE2B fdcaf27cc9f9346b93b3f1eb8b215ee75c4751427be279574c93929f4f5f521c01091bbff81a849bef3f98d97cf662b725ab99da709437b98ac85afc34f74d99 SHA512 ca796206aafffb5a96c75d305e90bad48f17d213b24dce8c8adcc9c94299ed78b0a2b48b5116d18b0ee26b413e845df53d387d3ca1b3d4c127e9b02b9f124af7
+DIST shakespeare-2.0.25.tar.gz 65816 BLAKE2B 65bf2313e74de6516fd0fdde91986e9ded0e8cbba46273402f296fc1a824893725c8b618cdfd1c6194d6b49b303c6ee8cbafd42fc3ffc70e7b9d56f7267d6eb3 SHA512 26805c070c712a7bd549a2923f7b39cf9eaf7c9a3451c0c672eeff3b22e4d3f696887f3846e39c73f1c0add6a21becae9e58bb2821c0158298e105e0a1bf8ac2
 EBUILD shakespeare-2.0.21.ebuild 1234 BLAKE2B db18728eeb30e35a24b19afcfe04f5323969fda373ba9853ca13ad566fea63bd68af99760f840833120ed7b2daa749d6c88347ef5238227a89c6a36ea0f9d76d SHA512 b8f3f179e974164474e5165d8eb81d032aea432ac15a71c46909014a9edb62ce44f78d7bacb169542ef7fbdcdae957c47786f0ee1d9ea3a7d0bb2518a715b45f
+EBUILD shakespeare-2.0.25.ebuild 1269 BLAKE2B feacdc8123834c236bd1e4932345715bbe2e3b3e8f7dcf15ea5ba4c7b679339a75df0913f749160f97d98b6e242951ffd0369d11f9e274f8ae7fed81ffb809c0 SHA512 d8a183302fe65a95fe05979ccb15fa7ceefdc1c2002f99cda29a1ba0f26b1aa48f4a953288ad576b0cfcffe81790ac84b9eba87ef17d9ca3da768a65e25f6f45
 MISC metadata.xml 1034 BLAKE2B 122bdf19c088484e3cb66f4f98a7946af84a742deb782bc8bbde17add33ec4eed1f4241bada666748ff5ddd5063aa3b20997b89fbd80b6ae3a414cfa8b54677c SHA512 3ad916e35105e916a43f2ab37c30ab7a2daebf813691743a8bd88306cce96c1474056838451396b451424b5f960b168ad07f6aac3bd155a89aa6af37f89826d9
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild
new file mode 100644
index 000000000000..beb62cf019ba
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild
@@ -0,0 +1,43 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A toolkit for making compile-time interpolated templates"
+HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test-coffee test-export test-roy"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/blaze-html:=[profile?]
+	dev-haskell/blaze-markup:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/scientific-0.3.0.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test-coffee test_coffee) \
+		$(cabal_flag test-export test_export) \
+		$(cabal_flag test-roy test_roy)
+}
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index 0faacb663a6f..16b77b4ac300 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,3 +1,3 @@
 DIST skein-1.0.9.4.tar.gz 134346 BLAKE2B 0161ea5a6de793c7938595d05b98b04f8929f007945fb86ea6c6fc7cef26a7022be00d0546920abbfb0ececcdab3e770acf4a4f468a33582106cd8290e830f2f SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34
 EBUILD skein-1.0.9.4.ebuild 1068 BLAKE2B b4be7e7c851f4fe93f10a832370e7cf4d79a1fc74e9a0752cd334f1421bb1a0c52aa69b7623352bcf85d388ec7cacc2dd7f65b3881b621048e8d8f5043da78df SHA512 65c0d46bd1fbbcbc8e634801041b6f87b12eb8e5bb26f3504275962d01b8de80cb1277e2f8ea6b5be07c1c85ef66a58c7aef684a36d0253ced1996acab9a5148
-MISC metadata.xml 1520 BLAKE2B 685f0105e0cb6dbe17d295356410a81d4f159d359c6f9e07f9783ccede61efa20343ac1dba848d7e62ba7369f91054276edc089c612a6ec6e96d74a656685021 SHA512 a47c5874cc7c4c41d4f4483fb91d1f2364d6e3aa98e9b7e23b5e1b056ff5b95a8b5de71887c273c816ff54438f335b0b690167d3feebbfa8593f064ef9349276
+MISC metadata.xml 1490 BLAKE2B 939881fe2e68e85b275dfb1216f448e5cb0195832be62be762612ac11495e87fcdbc889b3b81c97e1ee8b9ae06d92d2752dbbb149092823b28cf2ba39ad13a98 SHA512 c0f6893d86fe1fdb39faabe59c98188af311c230cf085fc9f9a61c1d6eda96eaeefa192423bc5f8a7a035cef907286158ebbb105112f7b2ea88ce4831860a686
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 2b5aea896921..6525f3d29398 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -18,15 +18,15 @@
 		
 		This package uses bindings to the optimized C implementation
 		of Skein.  We provide a high-level interface (see module
-		&quot;Crypto.Skein&quot;) to some of the Skein use cases.  We also
+		"Crypto.Skein") to some of the Skein use cases.  We also
 		provide a low-level interface (see module
-		&quot;Crypto.Skein.Internal&quot;) should you need to use Skein in a
+		"Crypto.Skein.Internal") should you need to use Skein in a
 		different way.
 		
 		Currently we have support for Skein as cryptographic hash
 		function as Skein as a message authentication code
 		(Skein-MAC).  For examples of how to use this package, see
-		&quot;Crypto.Skein&quot; module documentation.
+		"Crypto.Skein" module documentation.
 		
 		This package includes Skein v1.3. Versions of this package
 		before 1.0.0 implemented Skein v1.1.
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index 4a94f406b7c4..18ec49af83c4 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -2,4 +2,4 @@ DIST skylighting-core-0.10.2.tar.gz 695555 BLAKE2B b4ef476780b9cf613e8bc7150abc5
 DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
 EBUILD skylighting-core-0.10.2.ebuild 1356 BLAKE2B 75a8326e94a055d9521716261f1d2af25e3fa3d73dd5e7ef6571c56a3eb1a1f1ed5dc512fb73aea53627a13b93feaf49476914212a54cae36d68d119a1f7f811 SHA512 9fbcf7fe7b9f6d6ca4e09c9232408c8031889202d8837839f195b68c2ae0a103f0ee6823d7a396b77f067191bc90fee920f67c47a367c5ab06c3c2b992f6a149
 EBUILD skylighting-core-0.8.5.ebuild 1393 BLAKE2B cae9c111639ba16103db61609b380cae0268753a54eb3a61894b112e18768b041702695d4a2a84c58b18e5b38268c4371bb80be5796124a708351a3d4c350018 SHA512 aa65fb1f748c102c539bdc3f869a1c86a97716538588346ca5231fc37ad21837739c280bf885ac49b05331357f1632c80b5b29ee6c1c17b6cb66813d4d112d0c
-MISC metadata.xml 860 BLAKE2B 168a330230e8a77fcdd7da5c60bbcc88546be72a0f383aa9e5e55370459982437a2cfd0a3a1645c4542e15a04e56a250c486650d13a18cf00bd6db03829623bf SHA512 e09699b10db27bf3ae4b794fcdc7e84f5a6ed870ce0fe28e269e337457f9be90e234d8f104e532d8c9c3dee0346547d9beaeb8f4a3e24a0d4d1a1e7553b7e225
+MISC metadata.xml 856 BLAKE2B 5a7e4a810de2cd3f3030d7ef193f8c7c6f40b5c57ae3ed1f92d4f96c2617a1a3623c1e47381994c78a6386f959110b7794f4b83f94d3a7204c42cf3211d47b20 SHA512 f1c0cdf81291d8e209b2260f2df47065eadf359d68d8c395388f639117a7bfef44b54fca3c338a449fcc43a737730d0bbd4670c9c01492f56faf03931c7ab4b5
diff --git a/dev-haskell/skylighting-core/metadata.xml b/dev-haskell/skylighting-core/metadata.xml
index 4dccbfb7b1c7..72eedb40ecd5 100644
--- a/dev-haskell/skylighting-core/metadata.xml
+++ b/dev-haskell/skylighting-core/metadata.xml
@@ -11,7 +11,7 @@
 	<longdescription>
 		Skylighting is a syntax highlighting library.
 		It derives its tokenizers from XML syntax
-		definitions used by KDE&#39;s KSyntaxHighlighting
+		definitions used by KDE's KSyntaxHighlighting
 		framework, so any syntax supported by that
 		framework can be added. An optional command-line
 		program is provided.
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index e8a3f39b0e50..f75a00239842 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -2,4 +2,4 @@ DIST skylighting-0.10.2.tar.gz 633776 BLAKE2B 9f8899a7ad65e812009299f385033250d0
 DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
 EBUILD skylighting-0.10.2.ebuild 899 BLAKE2B 6a587e7f7400eca3034b3f0d734aae74988a2d1e384a4ce8f8197aab89fc9562dcca7cc1023593662ae9f833b8145670d34beee964717b598cbc20c604393663 SHA512 e26baf847e7d7c773bc4ec7da48a7664aafb58957c56917eaa7424b540200492aab58c8a67f12d96b730e8006d146dfd91a70655b12f572aa88f96f6e98c2151
 EBUILD skylighting-0.8.5.ebuild 898 BLAKE2B 628371708fba84fb319cc1174b8f2a9f12a41152da8857b31987a1be294d71431f0f0af26a253f5f5178bab06de7269e9b02a724a3e3eec6977a808aa76f411b SHA512 c4fd303427acc18e85d1f2aa76942d406257e778f4a45e147305f7a09414c4cb78cdb002f5a6d28d68453510de13b4a32bac412e511b2286a7b891574deaf3ed
-MISC metadata.xml 824 BLAKE2B 40102d8937d28fe2b98f055019288ea9fb08307e23702e46c2f10e815006e4a3f4fa11a34fd787c1053441f30a27c138252ce853e9c22867523b3be8fa711f3c SHA512 377bf69b015def5abcaa6dde5865890fb97188b09b4539f13f704880d61aa352df3f4a8f5a76bcadc51e4938ed6336e4732540a8ee12e705aa6fa39e58f9b792
+MISC metadata.xml 824 BLAKE2B 9746617a3c5284d9c6fd93aa23b5672983261961f9aa4b411978911eb21711831804d3ba44451d9f6d784b3d6f07faa6a5fcfdfd2be7183bf6ab26fd8601d7be SHA512 b60271f8d5bde37488e37866698c3d081c285300b1f1bbd30af2e7901dab9c43ebf6753d19e6b5115c802e6869a27cbedd8f8e1b509e4614a982004edccb99c9
diff --git a/dev-haskell/skylighting/metadata.xml b/dev-haskell/skylighting/metadata.xml
index 45342c91c5fd..c04fee2824a2 100644
--- a/dev-haskell/skylighting/metadata.xml
+++ b/dev-haskell/skylighting/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
index a88432eb6321..846663efd5b5 100644
--- a/dev-haskell/splitmix/Manifest
+++ b/dev-haskell/splitmix/Manifest
@@ -1,3 +1,3 @@
 DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
 EBUILD splitmix-0.0.4.ebuild 934 BLAKE2B f3782b73fa15b5995421acc439f1bb709893658f3cc29822e876c0d2235f8726bb2854acaec8f81a45251552cdf01af86b47720a0ae7742518609fae1bdda4a9 SHA512 ec30b081c2614e1d153fd84e3e2815a541f81d0e90eb82f6bf6215821d2d116d480593494e43495b5b8c02cfbaeb0c1419943f392bd3f98ecc1f76c603e116b1
-MISC metadata.xml 1590 BLAKE2B 8e40c0429c9292e72149f06cf3e90d5363daf1d153a7a57a1345789126d6fd0622b7319e68a55cadd7cbb446f57f72917a28f95d75cc1aaf24c6ca7a13131a00 SHA512 972a555b92eaa1faeec687b080ad6780a7d55b5da16772fe3928675ab8bcc87e3738c7dbf84c0b4cdeebee3be9f0f12a59a3e23b0bf81eaddc617b500ef13f6b
+MISC metadata.xml 1576 BLAKE2B 1bbf1babe574ca8cc31317f73bf13527bb00770ee9ad0bb2071b094266d2ca65696eaf79cd5cf49e8035f57de15defb596828fac063b29b3d85e1a476023ea02 SHA512 e7179db2ab911329ed8f754f7170769fede60e6a22528d0ba49edb6070c5796b93797eee2ed6d44261cb961ffdfd0bd0a0cc0b177b67f0b63c7193f1ec8a09bf
diff --git a/dev-haskell/splitmix/metadata.xml b/dev-haskell/splitmix/metadata.xml
index 07dd5f4f5b23..e0647d4f38b4 100644
--- a/dev-haskell/splitmix/metadata.xml
+++ b/dev-haskell/splitmix/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='optimised-mixer'>Use JavaScript for mix32</flag>
-		<flag name='random'>Providen RandomGen SMGen instance</flag>
+		<flag name="optimised-mixer">Use JavaScript for mix32</flag>
+		<flag name="random">Providen RandomGen SMGen instance</flag>
 	</use>
 	<longdescription>
 		Pure Haskell implementation of SplitMix described in
@@ -15,7 +15,7 @@
 		Guy L. Steele, Jr., Doug Lea, and Christine H. Flood. 2014.
 		Fast splittable pseudorandom number generators. In Proceedings
 		of the 2014 ACM International Conference on Object Oriented
-		Programming Systems Languages &amp; Applications (OOPSLA &#39;14). ACM,
+		Programming Systems Languages &amp; Applications (OOPSLA '14). ACM,
 		New York, NY, USA, 453-472. DOI:
 		&lt;https://doi.org/10.1145/2660193.2660195&gt;
 		
@@ -25,7 +25,7 @@
 		
 		/SplitMix/ is tested with two standard statistical test suites (DieHarder and
 		TestU01, this implementation only using the former) and it appears to be
-		adequate for &quot;everyday&quot; use, such as Monte Carlo algorithms and randomized
+		adequate for "everyday" use, such as Monte Carlo algorithms and randomized
 		data structures where speed is important.
 		
 		In particular, it __should not be used for cryptographic or security applications__,
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
index 8ff5f5b3ea1f..0b041eaa368a 100644
--- a/dev-haskell/stack/Manifest
+++ b/dev-haskell/stack/Manifest
@@ -1,3 +1,3 @@
 DIST stack-2.3.3.tar.gz 572406 BLAKE2B 4b88614ede72ea3704e3bfad433a7931860c1c098bb65aeabca46d3abc5364ea132b8a7f0f559f1b07463d4b753b5501081841fa388a5d817389d91371214236 SHA512 cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3
 EBUILD stack-2.3.3.ebuild 4423 BLAKE2B 5177202463107ecff37070acb36e00364e58605ca2b03595d39b4f663d626b9005fa6ecba453fb88044371dbeb50fc8ce9ea01a9194d565137f4f4f1cce1dde5 SHA512 18123b478813591ae8a820163ce37881dc8c5df9d0c91039cb2e115c5318a15b7857429424cdcb0bf42fafd3451b58e9ba40e5809256b09c0f516233e03749a8
-MISC metadata.xml 1022 BLAKE2B b36a0c6a2a2587fbd335807c2138c23e86807361de73d379eeccda9cf9d47d0d4a3786a0fa44cb364464830d1656a40d61b26561fa84bbbc951e2447098aa34c SHA512 b161c958b2cf454146db34131093c39e574e7356b57df0cc761312412fbf51a65fd6cdb3a437776f92150c5a5542881f3c4d4e231134866542f02e0c3f5794b2
+MISC metadata.xml 1014 BLAKE2B 47cc3cf59ae32ba77125520e9116291e3d3a4637d872bad2a2d4eeebdf8bb40a5135e23d773b234ef5733ed952a1d363711a4d161b4e42b730c01d0bf847fd5b SHA512 b6ef3cc1816d46852ccd4c1e6fb539ce19584cf04e2d31bfbadfb0578796696ef8b996440df02b1c92edb12dc85423664facb46225686c18a797fe8c3049fded
diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
index 530923816ff9..e406dee6cc9d 100644
--- a/dev-haskell/stack/metadata.xml
+++ b/dev-haskell/stack/metadata.xml
@@ -12,7 +12,7 @@
 		Please see the documentation at &lt;https://docs.haskellstack.org&gt;
 		for usage information.
 		
-		If building a &#39;stack&#39; executable for distribution, please download the
+		If building a 'stack' executable for distribution, please download the
 		source code from &lt;https://github.com/commercialhaskell/stack/releases&gt;
 		and build it using Stack itself in order to ensure identical behaviour
 		to official binaries.  This package on Hackage is provided for convenience
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 44d6b004304f..43b73fa7ef6d 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 830 BLAKE2B 159f3e1549b7a902deef91a100e110c919be81f447232e08f33a540af44ef7a8b9e134d955d6287e6e9c2d18e1f6fcd9baf21005312906446b2af41d8828d912 SHA512 248f26b0531fa1e00680b9b559a1b6c1e7e3a6d919d7e9000331ee8399169185c4cbff5eb61fe82e20ef97aed2df5af96ff68228b8f6ccb02ca97a7579c9a54e
+EBUILD stm-2.5.0.0.ebuild 869 BLAKE2B aaaea38e81f75b43e27a7828418acef8a0919f5b07594d9aaab0975fd93c07f5e39a16e2347fc71f99bb24065fc0169b595b14e26619d1613524ab5ae55a3435 SHA512 24c4c6a92fbd5e2d6f84e4da1184b24db457bb573688d73041a6a866f39d9f90f9d8e6031914422ca8fe0fbb77b55ca5b479a8415b3c3ba5502e63d629d00fad
 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 cfec29428a9a..8a5b50e5bfc9 100644
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.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
@@ -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: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.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"
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
index 213b22967649..6692248e25d6 100644
--- a/dev-haskell/syb-with-class/Manifest
+++ b/dev-haskell/syb-with-class/Manifest
@@ -1,3 +1,5 @@
 DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
+DIST syb-with-class-0.6.1.13.tar.gz 13225 BLAKE2B a218611f332037968513b3706bc35e903f335477fa490f0c709f085014e833f1969851a74ae0d2a40c6a085c9aec1bbd963a48d4362963d3a89fe8e399a790fc SHA512 40082f8b97ae49929fb2b686a840656fd2a62936ddc4873f3af4bdfe128e213dff509185e412c3c58bd48ec32abcade8ed68dd257d221bb08f9d20433067f371
 EBUILD syb-with-class-0.6.1.11.ebuild 707 BLAKE2B b4204c678ac0f342438546abbd662c87f2a0660ec6e63c3433ba278b19ff70da4bd24b52a72b574deb1ead2636641fe692bd843c3c9f1f042a24e2c903186574 SHA512 e11f67f698f21b6677a7a1d40f138ca566ad645773ad1d917a5fa7e6ad4406e409903ef812830979720744439cd9d7ec4f3ca5acff18e5bb38caeb0e1adde93b
+EBUILD syb-with-class-0.6.1.13.ebuild 588 BLAKE2B 27b697c8ef2412adca8a6932abfdfb854f36cc2e1b25dbf304c774627dc251db7590778f99d478b47223e09b92a8e6177b43e4f248b94acce45b0998870a3ee7 SHA512 0d6e3166c070ca70511a24b6f454c37ad6727e0085b6a00af005745dba4a5b8d27b55110764cd03fcc388b21ebe3f56321630527a53505b51f1e13021603c5ed
 MISC metadata.xml 400 BLAKE2B 6008bc250770a949e0074a7830d8451a38e7ee075295a4d2a15bb0c3b4cde670f25e5b5a91580002d19e6211b85ce06d04a650385bae6681cab3587dfbdef9d0 SHA512 db2b6e1778e715f28b5244b8d15e654692e619c2ddf674ad93dd54caaa79a3a87917b1a7ec4c0bff5af44c89faa7f0be03797cf33fad6f4fcd4279b397b6758c
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
new file mode 100644
index 000000000000..7bd577793d35
--- /dev/null
+++ b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate With Class"
+HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/tagsoup/Manifest b/dev-haskell/tagsoup/Manifest
index e1ce42396bf1..c33764ad7818 100644
--- a/dev-haskell/tagsoup/Manifest
+++ b/dev-haskell/tagsoup/Manifest
@@ -1,3 +1,3 @@
 DIST tagsoup-0.14.8.tar.gz 43894 BLAKE2B 68688af3ef280058f51b35a99f654af53d1b90a2303ebb8a95b0d936e7c68aed70dd6624d2c14fdcfc9a8cfb221ef1cad3768fa770ab19e65cba3adb1d0d3442 SHA512 2fc0adfc43402e537dac043682d876cae29834ebe9bcec7b53cc26ba769324b987be9cd86f9174f52344635342b7ff8f6cc2186be92c5bf4b359968f3cdd17e4
 EBUILD tagsoup-0.14.8.ebuild 667 BLAKE2B 47b67aa02c8dd376b55da60617b301b125d593aad4f7647293d70225a019c8853ef7192455e0584e3d799aa3dfbe1946fc60d332e0216e46bbed4dbb0e5c3a6f SHA512 7ac7816cd32e5d0868c9e377b72a5a5b529967745aff8c167d97b2596bbe87046cbfdd0b9731a599e2912b67f8d3461e01b1abe795d242160a9a75dd4f5c386d
-MISC metadata.xml 745 BLAKE2B 0790c16db601f4c9ba8377dc329ee1275bb44a48afc6bde31dae97646f615181cf4185338fec65d0f78e9d45a1c68b626d9309540b8a12ee895cccfc7930f9d3 SHA512 23fa1e520e4846c8690d012658301e4ae9bf4e044890b6960c4fba4ec70782396110f59dd6880978c0869857886dba88d79964e18404d98c9ddb39aa45f8beb9
+MISC metadata.xml 745 BLAKE2B b7ed44a84df0fa40268511a68c40f64c3ce5271dbb0fe46e4da2b9878a5904f9bc1df67bf58f8a5d8354d07907cfd13e0ae5dbeb04b193fe2dbce28d53509d41 SHA512 eb4b2e11751e421799940f178e5ba7df2939b4f53f1a0cf41a74ab415dc0fc88f656ea4ca4e4117c8a34707aaefaff9d95e8dc524fc0c1ef96a88ceab67db84c
diff --git a/dev-haskell/tagsoup/metadata.xml b/dev-haskell/tagsoup/metadata.xml
index a63f2ccb5413..dd3a6906a1fc 100644
--- a/dev-haskell/tagsoup/metadata.xml
+++ b/dev-haskell/tagsoup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index 0a69e7214c36..97fe752a05dd 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,3 +1,3 @@
 DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
-EBUILD tar-0.5.1.1.ebuild 1113 BLAKE2B e1254ee7997e1e6741757c294f03e24c6ca73a6cb3f3a61bfd7a49a49bf655d90d44ee79d142a38ef6551d5f29aaf6edee9901f1cc6e942d4da31c78f41e3280 SHA512 9886326a16a331671708864841de7019d0e4e877a5eda108ea40b341f825d5c47dd2e31c5da51503328d3662ab815decaa6cda36a0d4856a7f60d5cb3f937552
+EBUILD tar-0.5.1.1.ebuild 1163 BLAKE2B 5443aa179c8b2f51a8df058e9a15948b9f2f0d31caf5c6133334540b6309acb867467fff9a928b6e7389da246a6b3c2dc744d009fba09e92cb4e8e3e7f408cf7 SHA512 317add31711cad16e1a034aaa2fbc476f64fb8f13f70544ac96f241e954d74e5dfc2e7682155cc493ab7424388510355fbd9e3d0ea1549f0088fec54837b97a4
 MISC metadata.xml 636 BLAKE2B a60075b9bfcde03162a7f5a8a2a22ddecc9906c2305408aa3596763685ae5a65cdbebfe7251f9fbe70348a6045183ec840678a00efe338d0354d06cf0757cba1 SHA512 2088e0e13c3cd3539be718360a10145e17083bd135749b8ed3374cb51523f53bc0bbf4a441c879f95982ef235f18243bfb49ec822ae70ea4fa8e684e96fdde20
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
index a8ba70e43c28..b2fbd1ed1957 100644
--- a/dev-haskell/tar/tar-0.5.1.1.ebuild
+++ b/dev-haskell/tar/tar-0.5.1.1.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
 	default
 
 	cabal_chdeps \
+		'base       >= 4 && < 4.14' 'base       >= 4' \
 		'tasty            >= 0.10 && <0.12' 'tasty            >= 0.10' \
 		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
 }
diff --git a/dev-haskell/tasty-expected-failure/Manifest b/dev-haskell/tasty-expected-failure/Manifest
index 534ca8c01a21..0155654766cc 100644
--- a/dev-haskell/tasty-expected-failure/Manifest
+++ b/dev-haskell/tasty-expected-failure/Manifest
@@ -1,3 +1,3 @@
 DIST tasty-expected-failure-0.11.1.2.tar.gz 3781 BLAKE2B 04101b477457747abbf1a90fed80ab8692e3f771f27fae8310c0451839b38efadf1751ae302a1bac0f020e01533030563c45a2c0d75b03f9cda88ee23d1d8e12 SHA512 31f89d64a1f700a2563b291d287f559e023b0b1059cf5ad35eb9a8b2d4a7d90b2ffced828017b3e86d7ece0b125787f7512e9f4745c75d38bbc688e09031aae5
 EBUILD tasty-expected-failure-0.11.1.2.ebuild 745 BLAKE2B b635671f6f37788177f8ea8315558102b0bc80b45107b7f7bfcca1ffaca423ba1b184eccb19abcc67c952c3a3fce3108a383a9f83e0521b0ebebb3a9050a21cb SHA512 6a0d37ea7eda7932fe7128a53d3f01fd229ac152d715891e2219b2363e89fd7b8cbf74241582a1c9f9ca841f0a682aa3662f7792776cb7aebb71432982066b27
-MISC metadata.xml 1198 BLAKE2B 916fc5054a8fba5dafbea48bb7074ab2bcbd986191298d2a985b9d89f4db424d38277f4229baec55c5b327fd8142aa2510e0d001f69818248480009e2e7a2285 SHA512 1c2e7390095a26f26d3fb57b7715fe34afb209b63761e3597e578d72169b8b6f802361adfa15652c054560c210707dee0d00c43326e82c73eec7ff4df70e72d1
+MISC metadata.xml 1148 BLAKE2B 29cc955f3d652472632fb2e17400a7fd51dc82ccd167c7194566fe444f7dc80d486ad457bf59ca0cb98650643990229712af498555c944c2d29856fff31b2326 SHA512 07c1482566c466ab9ddd401ab3e1d3bf407b14550eca0d55e3ed34733b127097dc36c2b1362c9aad2b70f433bfc2f95935932e64cbc5a7edc3520e7eff22ae13
diff --git a/dev-haskell/tasty-expected-failure/metadata.xml b/dev-haskell/tasty-expected-failure/metadata.xml
index 38e4a3a924f5..c1dbe8030a14 100644
--- a/dev-haskell/tasty-expected-failure/metadata.xml
+++ b/dev-haskell/tasty-expected-failure/metadata.xml
@@ -6,20 +6,20 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		With the function &#39;Test.Tasty.ExpectedFailure.expectFail&#39; in the provided module
-		&quot;Test.Tasty.ExpectedFailure&quot;, you can mark that you expect test cases to fail,
+		With the function 'Test.Tasty.ExpectedFailure.expectFail' in the provided module
+		"Test.Tasty.ExpectedFailure", you can mark that you expect test cases to fail,
 		and not to pass.
 		
 		This can for example be used for test-driven development: Create the tests,
-		mark them with &#39;Test.Tasty.ExpectedFailure.expectFail&#39;, and you can still push
+		mark them with 'Test.Tasty.ExpectedFailure.expectFail', and you can still push
 		to the main branch, without your continuous integration branch failing.
 		
 		Once someone implements the feature or fixes the bug (maybe unknowingly), the
 		test suite will tell him so, due to the now unexpectedly passing test, and he
-		can remove the &#39;Test.Tasty.ExpectedFailure.expectFail&#39; marker.
+		can remove the 'Test.Tasty.ExpectedFailure.expectFail' marker.
 		
-		The module also provides &#39;Test.Tasty.ExpectedFailure.ignoreTest&#39; to avoid
+		The module also provides 'Test.Tasty.ExpectedFailure.ignoreTest' to avoid
 		running a test. Both funtions are implemented via the more general
-		&#39;Test.Tasty.ExpectedFailure.warpTest&#39;, which is also provided.
+		'Test.Tasty.ExpectedFailure.warpTest', which is also provided.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index 61b15d817f2c..9dbc3cbffdfc 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,3 +1,3 @@
 DIST temporary-1.3.tar.gz 5686 BLAKE2B 7769c471a8fe3f2a73291b53633c9d4ec785bff9dfa93874f46bdac50b7e16a5fea918848645132593d2d0c0aeda2479777e04b1adf8fa501306bace89fdfdcd SHA512 e3078caf54da95c4efa9e9c936b35a98b62296ecce2242cd4e103605a9d29e8a9d6c7027dbf50d02b6a893bea558ea5b07dbb1df7c59bf26d86db76ccf112f25
 EBUILD temporary-1.3.ebuild 743 BLAKE2B 2f7c476d29eaa306efdb8081690174c605d74e3aa5342373db323a830b84df0db4964fcdc2f4b712e01c7b7175ad98b4f5280bdd145daff157966685c0153b21 SHA512 a29378ea865e7f418fe9e9eaca715458a5e50646b4141048848093fec3ba387d205f204818ba614b425e8cb3e97b667053330d9939b78d4a3cee8a058d2cdc98
-MISC metadata.xml 760 BLAKE2B 657f8412b7add619d5d8827d13da1aebe29087a9334a6bb48271450138710c89e4227ff19f1348426531b3d189d750501ae343835ea9ec77d6e5a8b1e20b8a43 SHA512 bd5b25179a899cd867b1655df9e46e12d7a4a229edd3b1a13eab4688b6018757894be8c0a857231646e39260af604d762e8f7de5727d2366e20026908b3b3ed0
+MISC metadata.xml 760 BLAKE2B 6095e25763b45ffcfea850fac2fb2ffbaf94a14943c51027b3d5242119680ba134a743ffb28ee59f2799c4e0f49433c3eb0cf11f29ba41d0b366a83fe28c30ee SHA512 e507b09804e3c9e5dfddd45bfd11ce9ad2ca1bc591dfef624b6e9592ee7f9f6eda526ab7977924bb5618d204b2f64d4bcacf9d90a191e04c87039d8e5cad479b
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index dd1a1cb7cec3..a3f53935b648 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 207fd2e9d607..5a59232e3762 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 694 BLAKE2B 198803287f7a9f98a8b6ac40a54e4bf25b267326f00313dbdbd54a8e11baccbaf1fb29fec98ff048d4c063021457da1c0fb0012482862d983151e70aed55d04a SHA512 48556bde990cdf0dbab7a6e320e984036e6d0a30bb6e4dd4cce51543ab31726d15e4d2657e648e503abab8783e75769bd2ef245b77aa736b722a885417e78a87
+EBUILD terminfo-0.4.1.4.ebuild 733 BLAKE2B 5fbcb308b7f94b5095512221adb5c1172882ad9fa9f712f058c3431f2b4d175b28b8e76999b8ddabadae38dbf943f1e682fee4daec56280076bf81804f73b33c SHA512 91e51e105c1826ff03db92150375b4d34f165bf08172529094443cb9db1b0608e30d6095ee5d024778d84383f10f508ee8b45710eff404033f00a17ad8e95865
 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 c179dc6ec011..f7efeff63931 100644
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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:9999"
+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"
diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
index 7de6df508b11..3d692ce6296a 100644
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ b/dev-haskell/test-framework-th-prime/Manifest
@@ -1,4 +1,6 @@
 AUX test-framework-th-prime-0.0.9-hse-1.18.patch 2666 BLAKE2B 7aa73a96cb24688bc42812c5fbb86faed1ca4fdc672f65a4fed13cfb3cdec4830017d50cb154b7e02731527898bcd52a1ad77a70f78eef33dbe74de5e0a1da7c SHA512 a87717808f6ea5fa47de0ecb3ae3789d59707957458c9569f10ee01bcd30bf52662dd8a63255e2975f7de4b2465b7e9e8d41849975442c0c46c349d481cc8fa7
+DIST test-framework-th-prime-0.0.10.tar.gz 4035 BLAKE2B 44c0f454ec4018f8aeccc9e7eec33c25778d05e257ce910dd779ac6bbb2acf1d4b54a897d0625e78308def417f1aa1b77194fba353802f2fce7a6e954dea3fbb SHA512 91298214c134821b298270c2770cab284131787a40293c01dba2e88a58f355d6811dea06bf14f237fea5d4aa80987790405644bc09ad64a4d7b4574e2bca97eb
 DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
+EBUILD test-framework-th-prime-0.0.10.ebuild 679 BLAKE2B 3b6da5b8be020a4bec38e6e33fa68cf7d8b21f0bd0714722b93c8c4735e656d41859fbfd11132452164d5c64cac197ab6ff5a4e3cfdc9bdb6102cb709396d13d SHA512 165ee0dd12b2a30475f05fafa3a355ffc3b38995df1569423e1f17f80d30b89e1e805c2b000ae9f492c00065734fbdbbe0bafdca39dc6e16fe3972b679a5427e
 EBUILD test-framework-th-prime-0.0.9.ebuild 722 BLAKE2B 3e8320932bb7298b019d028a075ecbecd09ddc3db97c47de4168236505827ea4cf55182c2c905ac421768987666f06d332b51d2b739bb91aaf35d03f17cc0e5e SHA512 ef4642e5dc56962a99ea8105d083a09a63f83bf76ee864f176e41d98de190043d8db457a0f66648e1a05daa4e6ca8e0f3d7672da1ccd23a5eeb7002fc5248496
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
new file mode 100644
index 000000000000..f0c62e9157cd
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Template Haskell for test framework"
+HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
+	dev-haskell/haskell-src-exts:=[profile?]
+	dev-haskell/test-framework:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/text-short/Manifest b/dev-haskell/text-short/Manifest
index 76d78d0019ff..12177147ca20 100644
--- a/dev-haskell/text-short/Manifest
+++ b/dev-haskell/text-short/Manifest
@@ -1,3 +1,3 @@
 DIST text-short-0.1.3.tar.gz 24435 BLAKE2B f0d571f2c84ca47ee2d4f0aef0a98812880f68d9971e73abd40f2b8d27cce50052a67f6f2a5d19d683093fabed490082df72e29bc8e43123b53b388b9962018c SHA512 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428
 EBUILD text-short-0.1.3.ebuild 1348 BLAKE2B 9dce2c4775e803c5620c336d74e39b303928368af2fab518cbff7291fcf86f3ba9e71af05c29aee99eb74e70e92a756d139612d3e28ec90f6d6bfd80cf6fb983 SHA512 9fa66fef824be7dcfde5be75a08f59e0c2125a80a8e653a349cb233a6f3907ca2c6eaadd0dc082d4d545fb2d0fa2fd215e8f569405323f79ef49a1c2019ff726
-MISC metadata.xml 931 BLAKE2B 9bd6ec4b5cea39dcc84dbb660a1a6392c6912b9662661cf73a1d782f491a3c27b17bc081da399bcbea394708078fbe1db0d15a00ccf663e3579c0daf659232c3 SHA512 577f354740c15b8381bf3321f19f76233a6dd4f92552bf52f2b60f1bd68024b8f6723b543c015088fbfe538bbe152a50160e2bd4ebdb8c2a92c9ec1ac1586658
+MISC metadata.xml 871 BLAKE2B 99b6badd995815edcc420bd52e3aa2db8466fc1c55e60479c26d4a1cde7cf99e58a197a1789993dbc56d44d611d096dfe19ba1159aed12f1e6e81aa55e72bec8 SHA512 9ffe6cf589ef13af232d1ce4e5d8d246314812686f74db1b32975cb7fc590b3116ba14753b0ad5d25241ab2e39d4c612d5c19f7150977a8fc8097a53248cf01e
diff --git a/dev-haskell/text-short/metadata.xml b/dev-haskell/text-short/metadata.xml
index 02b8c54225a2..4284ddcbdb5c 100644
--- a/dev-haskell/text-short/metadata.xml
+++ b/dev-haskell/text-short/metadata.xml
@@ -9,8 +9,8 @@
 		<flag name="asserts">Enable runtime-checks via 'assert'</flag>
 	</use>
 	<longdescription>
-		This package provides the &#39;ShortText&#39; type which is suitable for keeping many short strings in memory. This is similiar to how &#39;ShortByteString&#39; relates to &#39;ByteString&#39;.
+		This package provides the 'ShortText' type which is suitable for keeping many short strings in memory. This is similiar to how 'ShortByteString' relates to 'ByteString'.
 		
-		The main difference between &#39;Text&#39; and &#39;ShortText&#39; is that &#39;ShortText&#39; uses UTF-8 instead of UTF-16 internally and also doesn&#39;t support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) &#39;ShortText&#39; value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload.
+		The main difference between 'Text' and 'ShortText' is that 'ShortText' uses UTF-8 instead of UTF-16 internally and also doesn't support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) 'ShortText' value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index df45a7a503ac..cf2e52e1c070 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1,3 +1,3 @@
 DIST text-show-3.8.5.tar.gz 95620 BLAKE2B 51c1a5f9b29d60e305b53db1a47bc415f8cec3fa4c29c22d103ffc20dd4585bc8241f471031eaaf798c0df379c589cd4a9622877b7f69cedc5f15c3fa94c9291 SHA512 17e6e4d188280d4545867b31210f9e8e69337996c80b8c4f9fd846e50605acb29ebb2429e72ce76545426741055c4806c20a32b59d47e190a38d0f1ed9405947
 EBUILD text-show-3.8.5.ebuild 2212 BLAKE2B c5ee88b668b59e175e7026ec2016e3604f6a255c72d681a65843d02645e8b3fa1c40ed98becb1e684ef4b8fcdad74ee9485690812d67a96c2f2843c1dcec3768 SHA512 849c9406d795b7c8f592770afc03fc157c383934829d74a3390a627a6a1bb5f8c0076ba942132dccdaed1ab1c5b0f8226592a369ac1877a5dca1156b9f2d64b6
-MISC metadata.xml 1745 BLAKE2B d094818a5099ee07ad3d768a300b456f1d5e62b11fcf1c5bbfcf6fb4ec0417709d96bb1f6f76eceb89e5154dfd19ce57fd281ef1011c1885e947992ebdaaeb05 SHA512 ee8e1085322a3ecfc53b35f651757515b214be5e3511931390e0e79b65d449a8cc15af6d50b695cd777abe5508c662b0bb9bb5cf4943399bd01809c9b124b2c7
+MISC metadata.xml 1745 BLAKE2B 262176d4fba66bcc5b9dedd983878fcb8b3fc97cfccbd9575949d68a72cc4c8a41c99c287ae5ef4691a81ad6f2833496184e40bec96c2334052814c6e3660c87 SHA512 1be4bf3a70a5cb017b8d27587405a27acfaa95c804fa2644cb9c5bfca5c45852020797f6ebed5b3d7c62888dd449d5cd9fa89aec59807c585ff710d7c6073c50
diff --git a/dev-haskell/text-show/metadata.xml b/dev-haskell/text-show/metadata.xml
index a6729c09cb4b..21220b368994 100644
--- a/dev-haskell/text-show/metadata.xml
+++ b/dev-haskell/text-show/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 62474656bc2a..7387f4d6d19b 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,3 +1,5 @@
 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
+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.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.1_rc1.ebuild b/dev-haskell/text/text-1.2.4.1_rc1.ebuild
new file mode 100644
index 000000000000..6da0fe1d6e7e
--- /dev/null
+++ b/dev-haskell/text/text-1.2.4.1_rc1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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
+
+MY_PV="$(ver_rs 4 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+SRC_URI="https://github.com/haskell/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10.3
+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.10.3:="
+
+DEPEND="${RDEPEND}
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		--flag=-developer
+}
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
index be48674af4a4..2891832cb84c 100644
--- a/dev-haskell/th-expand-syns/Manifest
+++ b/dev-haskell/th-expand-syns/Manifest
@@ -1,3 +1,5 @@
 DIST th-expand-syns-0.4.5.0.tar.gz 8112 BLAKE2B 9a4572993f309144e70adb2967c699c06871246a00eea97e551d79cb1117970d12bc9c7594e8908f9b6a59550ba4fcef8e3e9888375136c4fccd3dc53d7e1857 SHA512 4e72ec26dbe875c3d664b94d7892001af835794f04bec83ff05952c3b9ea9b9de242cee5c713671213479bce4cfae3d0d6172a581e7fff58923688624dd493bd
+DIST th-expand-syns-0.4.6.0.tar.gz 8228 BLAKE2B 6f0a0ee73cc7999a2cc42aa4982980851d14e4db8aebd921cc04517505676b24fa5e2b6977ce7b2d73a3e153ffb4f98727503fc5d735e409c0dcb9d4930d4f09 SHA512 93c4516052b2130a189c72fe5ca99e44ffdb4937f6a8afd8c192ba24a7002bd45865992cebf44c5c9d6ddfd9f67a1d7d73633e7521c4a9828a0defee627e89b5
 EBUILD th-expand-syns-0.4.5.0.ebuild 598 BLAKE2B 35be6334b462b368388be45b8d4a25377a41716f135cb5c59b8820c6f0df2860b34f74780e5a9a099fee941d0ad4beedce8746b67639998e0cf6a0eabd800969 SHA512 d279febde7b26ee5e23337b898fede5ac1c64a26eaf2c6e09cd98efac01d56ece94ad7ee6546a7ec1d153610399e011d825b01aeb766a6fddf2bd5a05a8b5c68
+EBUILD th-expand-syns-0.4.6.0.ebuild 600 BLAKE2B da6091de846999c6dc84474e34cce7096e2329f0d3ce583aa36ab040d6cb7e31cfae607fd83f51b103032703d5e2ee70023f625b3739e611258322d34d7ebfc4 SHA512 6e08c000f570e81e0297a9e41de123e6be72b0f7141bdc9ff290ad9507565cca4a4df4f9280b7e5e8fc403fcd09052a34428c2bf8dcdc75b1ca9b533aef7aadc
 MISC metadata.xml 345 BLAKE2B dd891dc3b668319d8b13f785119a1872353f8449f895927c81036dc1041f0643f6032ce817dd622d49722657cbf7c0e2e3f63ab64404c13175c11659eaf13e1b SHA512 4242fbe3b53db98aa2010eeccfbbf4e213fb16a0628b8d25aa00b1b97baf240ec1bd8a19f4da9439088fcb7b4c178594dcb214de16287ba904d237193936a8f5
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild
new file mode 100644
index 000000000000..01dd51636b90
--- /dev/null
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
+HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
index 4b96d00fa143..52a56a2a1a92 100644
--- a/dev-haskell/th-orphans/Manifest
+++ b/dev-haskell/th-orphans/Manifest
@@ -1,3 +1,5 @@
+DIST th-orphans-0.13.10.tar.gz 8680 BLAKE2B fe03bfbd6ca27a9949573cdff3c496088fd6b082c6a334960388b45bc0bce38d2675ca9319c627d4d7b0df831fb497bea2d9dc753c76ce1d967e9f423b3562f6 SHA512 bdf9cc69f57b97772f2ef38dcda61ca352069ac07e45c85efdcabec9dd3a538f33b3d65cfdff77185c737b8050139e232c4ecf677d89fd79aa5b74238b8af651
 DIST th-orphans-0.13.3.tar.gz 6549 BLAKE2B 1a23b345fd5cf43715deac8c1f21df56bb75e6d683b7d8ab2b28ce3c72ece178e0a0096d970f04e947d0977ce4a7062c4f47616e0c56e046e0deb8f621dec60f SHA512 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d
+EBUILD th-orphans-0.13.10.ebuild 904 BLAKE2B 6b093628db0ec18ab441cc64e8d962c4b148fb6220fd00c1ae49bdca8cf9158623eec469fcd8d9662c92c6841733b5ca7e9009059b7e6611bd31699afdd17fbc SHA512 093b81fb64f922b0a797c673484e92a469cc2ed49cf115953d1c7517490d8988ad7370f457d0064b7dbe5e5175656615fc48ea3bfd7d323101415b2acfbf062d
 EBUILD th-orphans-0.13.3.ebuild 833 BLAKE2B 57ccda07b4b1d9ba7b47c8a1f147be257c5f138dfd93dac79648007c710a923ab46840dcc7978edaf4915bb7629c8e4b18c3577f424e34145d752103c1b08cfb SHA512 d333a9badddf1d20dd8db8baa4c27d8a7ebe307f0ae24a0ae9e9be9ad818b627dfcad957894b8e11498b684f95f925cf7204e61103b60a378339cd087fcc917b
 MISC metadata.xml 507 BLAKE2B 99ba933aab8c90265fa2794e4dc5b9c8b3012421b07b3a4375225cab2b544f3eeb485bfd3877f1ce2fe7f447ca272d6d64700e36333e5df562af463c532a24c2 SHA512 4bdb62e70a857bba59d2abe32dd5a28fa4ca20b0756c785323fcdc39327d89b85c9e936c767454dadfa60f52cccda99a08f8d5bf3dae1a758a0be9102fd8e4c2
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild
new file mode 100644
index 000000000000..c2a10a9d6d76
--- /dev/null
+++ b/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for TH datatypes"
+HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/generic-deriving-1.9:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/th-lift-0.7.1:=[profile?]
+	dev-haskell/th-lift-instances:=[profile?]
+	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
index 9bac32921340..8612edca40fd 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1,4 +1,6 @@
 AUX th-utilities-0.2.3.0-ghc-8.8.patch 2566 BLAKE2B 3d59929531c5de3892155d836ffdbdbbe425bb959b65c2fa15fb58c5e9f083515f263717cc68e0a780dd95c476ce2c4cd504a4abc1f8f9c51f9d86b1cf10efb7 SHA512 346e3bf318d4f8aab2edfa89719a82997d91175ff11e2d649ac281269f062396f5dea9364a74ebb2ab0f78421dbc462ecea60e1b0868ad9fa08379659e446af3
 DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
+DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1 SHA512 b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02
 EBUILD th-utilities-0.2.3.0.ebuild 805 BLAKE2B d4c5d4b4278513198cbbb18e501bec598c9afcbf545e66b6a14655e2baba9d3fb446ab8f62111385fd2dfc1c7e8ff003dd6419ac3018aaa9665d385c2d5e6573 SHA512 392247a11b663044fd7528e0df8018b050d7494ef2487b099ede77d4a3f0156354dad3afd222acf34831ecd0c9f5264aee850b8f982959b46e1e3a6419886bab
+EBUILD th-utilities-0.2.4.1.ebuild 763 BLAKE2B 1e05e0f88d026a67a6ee9dd3ffc8b078ed20634aecfffe0fe8743b9f7dea5cc8205538538534a5be11838b7de27224fcd4b6accc7a9c3d68099050e9d750f827 SHA512 1f77bbd1c7982942b3d7cb844d63227234358793d2c716983f0e65958af66b3b8dae1682231598b2ee406d364a845f8b12cab41fab829de8ec5fa631fbf69ab5
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
new file mode 100644
index 000000000000..9f8403689752
--- /dev/null
+++ b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of useful functions for use with Template Haskell"
+HOMEPAGE="https://github.com/fpco/th-utilities#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-orphans:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/vector )
+"
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
index fa0dba915256..90b23babfc6c 100644
--- a/dev-haskell/thyme/Manifest
+++ b/dev-haskell/thyme/Manifest
@@ -1,3 +1,3 @@
 DIST thyme-0.3.5.5.tar.gz 37220 BLAKE2B 16c72f436d8587f5102458a9013f1244e223dd675e610cfb8216d95a2ff01ec1b90bacd23dd50440ac87f6a73e22b2580a0dd4c0da3ca2c336d8e521b31fe23f SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5
 EBUILD thyme-0.3.5.5.ebuild 1343 BLAKE2B b44bc558dfb40b1aed2e5a01daa32f7873f86258b822f528e7e7b7b242622f67ca7e7951d521e0b4c7ad32917967c860865897ba8906d6a8938675903dd7be05 SHA512 8f848f2752c624ddb548d5ba0a72a4d7c0a710213bec55c25cfc64a8c041b08863cc08bcfef466c83f8d953b362fd567208cfebc648c2be31f5277fe92c1c2c3
-MISC metadata.xml 768 BLAKE2B 4a2c19070a42c59d074bee59efb4d5727a9556119e9d6f2ba0f1717e2099087fb1ad09b5a19023ed18abd6d233ece0b4b4514c346b80bad410f6dacf000d8391 SHA512 ef57041acbcd716294f3c1c5a120977170c415c4149966414e340817d75e99b80c1efdf37c841b323275d444ff4c824573bf4953d7d663e309d04414c95342e7
+MISC metadata.xml 768 BLAKE2B eb82b870ef045d370f8d4b7c0992d603631af43ae8e9e756dcb52778c9e58a8b85367d232015d5c9d087967abbc97491ca7f196e60ce6197653390a0da1e0c58 SHA512 3f843dce3be56db7c7afd6a86fbf803af93228ee1da3a264c113f2df6ea92600fbb0c0ba05683b9d16d33914bd49e05cdd0cb217ff2cd8be20d6fb6760891ff1
diff --git a/dev-haskell/thyme/metadata.xml b/dev-haskell/thyme/metadata.xml
index 61acd72e3cce..885e20b470d5 100644
--- a/dev-haskell/thyme/metadata.xml
+++ b/dev-haskell/thyme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index ed498286dbae..10df99c3e140 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,3 +1,3 @@
 DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
 EBUILD tls-1.5.4.ebuild 1366 BLAKE2B f1746c3ccbc0c38ddeb33f5a1266e0930751f0e12f23ac10a5faf40ba5438092ccfce8422ef3378d31bbfaf7a6f0bc543e54fd277798c5d68a19ed67caa41c4f SHA512 c96d05c16a52fbbddd41d8d59cd7b6d37aed8dbca5a7e846fa7c466e210e1c55007d91f39c4c959fe56f8692accdc7f4b94a0d0536d74e4841fa0f5bccaae824
-MISC metadata.xml 1116 BLAKE2B 9d00bcd54e0705289cfaa53b4de66f26abe5aced518e3a2297e006c3831a47211a765fc4b67546e99ece24df406dfa27c2917bbfb886becaa9c322cc981b9fd7 SHA512 d2edc3311ce239a521e6f941e5cd4a98c25b70376b18b8700643e06e580532d7d6d1b760b5229871f3fe938c89e47cde3734a7c87de1427b83950cd22d73c590
+MISC metadata.xml 1116 BLAKE2B e0cb0b90a3b329f95868e2be4eb11eeda0660431e1965a309104bd9bf3c728166ed52ef7e71c2482e0c7b2a956d3b811f7288bb802eee62dec91773268de1d23 SHA512 0b92016f57ff18aa689f2218e412bf072f049f26c53d06494ce7e22a2a3ca238f650f260ffd9f232e353d9789ebde818218b58b2442aa7c31d0152e239998895
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index b95ef7b625de..a3ea5ee5f41a 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index a5c0eb7c6d83..59a421b16ab0 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 801 BLAKE2B e800cdd6aa23882357d288194549deccb3896cfee4d0aa588445c1e1232b0e2aabb2a29cf815f7a676a2653b52a714f0989be0b23bed8bd07ce593e5b256d2e9 SHA512 92c888e9fe495b2424f1765110c907ad9b46a35a6bdd427572dc979e607a60bbbc8a098985e057640cc187e03c06e0f85a935addcebcecd95a8a112be4ea29c6
+EBUILD transformers-0.5.6.2.ebuild 840 BLAKE2B 521cf4616dca36b71b26f1ed27f79a8fa35d945e8fb234fb6951493646e12ded845388ccd5e80dcd3a1c0200dc9b1f26a79728375fd940924bd26bf81211afb3 SHA512 23f4d62f31f53bf5ba96bdf7f4c375334fbe59948161bbd59b00cfcd87b33cf43db6c42c83299efff0390db7ffbacafa1cc1d747752f7125864797ca1c0ada50
 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 f75a3f7a9ea6..2355d6f9f776 100644
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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: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.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"
diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest
index 4fb4173725df..f1643dcf8112 100644
--- a/dev-haskell/tree-diff/Manifest
+++ b/dev-haskell/tree-diff/Manifest
@@ -1,3 +1,3 @@
 DIST tree-diff-0.1.tar.gz 21644 BLAKE2B 0cd1633970216a994100f852b0982d43b6f1d0dc1b0550e759009250e016d271c5358460ef3999267da597b4e58dd28c3094e0ba4f618ba5990e91740eb63881 SHA512 a4ee703e4b6a18055c7749020863a9571af4620dbb7ea05903693c752e10e3ffa4fee8da0dacc0e4bbf92173e34c9070251881597ca1cd9f7c8ed365e840563c
 EBUILD tree-diff-0.1.ebuild 2823 BLAKE2B ce0c3e0649f9eaebdfc5d2258e7c2f446d907a6be243ecc2dff98ff9e2a332f1fa73dc5788d899b6f27a0a1fa1b81ba782e4178d3ab0ff157436754f4f2108a8 SHA512 b7f398db5d2c1c18ef2a62ce5c8e11fc1fc3f5f73c010feb178a25a9609deccb8604e74917e3d84ce507e2ad6f21b5946e08eb24133a3bce8bfc8bdeeb0f8997
-MISC metadata.xml 1099 BLAKE2B 24140fae7689e6b927d38a271444695b72e4459e2eebf9e90df4be94736829bc2ed23c6112ef71087a9c85d96df7f1270d508ff09698592eadd8b387cce18c81 SHA512 45ad2e28881f1f58c608134b1f33c2797732716b33bbe20fd1bd8e076a0fa3ea24fb457adc8e48240d0eaa34b8067dedb9bbaf231def7f3270b47be96f866784
+MISC metadata.xml 1045 BLAKE2B 4ce4567d1731cc4f288be89466c36b4a7bf58be0f7699abf24900bc7faee6530b574cfd98e4797426454db2613d3533b8845faa21e0e35c8b66ef2f3c59176f6 SHA512 a511257b57e098f65eb57b8dece118408c5640eafc6b3ee74384bdb38e69b84a912f3ed6fd122722e55907b59aefa92b766bbcac600c5bb3aca7dfa1c134dc53
diff --git a/dev-haskell/tree-diff/metadata.xml b/dev-haskell/tree-diff/metadata.xml
index 214ee1271465..6433f52fbb3c 100644
--- a/dev-haskell/tree-diff/metadata.xml
+++ b/dev-haskell/tree-diff/metadata.xml
@@ -22,15 +22,15 @@
 		using @Generics@-derivable helpers.
 		
 		This package differs from &lt;http://hackage.haskell.org/package/gdiff gdiff&gt;,
-		in a two ways: @tree-diff@ doesn&#39;t have patch function,
-		and the &quot;edit-script&quot; is a tree itself, which is useful for pretty-printing.
+		in a two ways: @tree-diff@ doesn't have patch function,
+		and the "edit-script" is a tree itself, which is useful for pretty-printing.
 		
 		@
-		&gt;&gt;&gt; prettyEditExpr $ ediff (Foo 42 [True, False] &quot;old&quot;) (Foo 42 [False, False, True] &quot;new&quot;)
+		&gt;&gt;&gt; prettyEditExpr $ ediff (Foo 42 [True, False] "old") (Foo 42 [False, False, True] "new")
 		Foo
 		{fooBool = [-True, +False, False, +True],
 		fooInt = 42,
-		fooString = -&quot;old&quot; +&quot;new&quot;}
+		fooString = -"old" +"new"}
 		@
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/unexceptionalio/Manifest b/dev-haskell/unexceptionalio/Manifest
index aef1fe8bf968..a30106c33e9d 100644
--- a/dev-haskell/unexceptionalio/Manifest
+++ b/dev-haskell/unexceptionalio/Manifest
@@ -1,3 +1,3 @@
 DIST unexceptionalio-0.5.1.tar.gz 5635 BLAKE2B 4a4190a32a306dd8406639d24e9cad2abbd93ad9e59d3ce2dc4c370386915bc366ff42ce3d6179f02a9d0523702fb283af07b6182cedf0c9106195e54d17fb76 SHA512 62c42e5c683cd05505971602fe4e64a50b5949d9540acefd8d4d66ec0bf57075cdb8e35e99f7e7c4b4fdf589b2af47aa31c0cd62d518b4ded5fc5f9f382008ba
 EBUILD unexceptionalio-0.5.1.ebuild 662 BLAKE2B ebc6942fb622d294a39c43c40c52affae2213ff02cdbebf6dac423c86d0414fa1693659813614bc1a89fdfda46a5183004dfa93a5816aa3d977e5f5060a26b93 SHA512 8e9e5c56f8de96726ca08eed3451f0e58808296696c8815f62a3e5a0d9f6e823506d04bad22a5f00de3b5540fa413d73fdb5b6676b5f294b5ba267ba62d0f358
-MISC metadata.xml 636 BLAKE2B a45a7539e3dca76bfe3b5dcc7e3dd5bc36b55f9d0357f02cbb726f4b6c6a38d4845cacf62ad27c40136850fb9102ce96e64cdacf750577d87fbb76f0559d91b7 SHA512 04828cdccb54886eeec3e13425a91b2f3924a7758428a4adc9db513e5a6475a635026f4540c23ba1f739dd821f7ea8bd75a25c823a14d724648b47f0cccb67fb
+MISC metadata.xml 636 BLAKE2B d19aec28ece5a193edaa77a4b7556206936a33d8b99552da45eb798d7ee7446bf94b84e5701e54cf8932ccf7805264660b839ca70eb66ab255ec9e58eb8e3bd0 SHA512 0467c1c56f8473ec6c60db93dc6e8a4da0e591e8f8802dbaac553a380aafd71d39527f98d66640002dc69630fbbcc3573af2d3a1f79c9a735f3f5e51aedf9181
diff --git a/dev-haskell/unexceptionalio/metadata.xml b/dev-haskell/unexceptionalio/metadata.xml
index 7e8b34c0ddcc..b94ff64b6576 100644
--- a/dev-haskell/unexceptionalio/metadata.xml
+++ b/dev-haskell/unexceptionalio/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest
index 6fabc3e2796b..9888a91ea8c0 100644
--- a/dev-haskell/uri-bytestring/Manifest
+++ b/dev-haskell/uri-bytestring/Manifest
@@ -1,3 +1,3 @@
 DIST uri-bytestring-0.3.3.0.tar.gz 22994 BLAKE2B 1dbe396e48773b93a3f1aae0bb84c1d525e0b5ff5831dade79c709ee215e79c1e7834296680341dc074953e249af3472e5b1504526854a28750ef5aee6acd50e SHA512 29be8a04bc95e5d86cb3f1c042e0acfec3970af7d9424c8e3218e143b2b9d783d1e7585597ba588928bd843b4d7f02dbb7f3ad862f39c60e4baa6c262faa9669
 EBUILD uri-bytestring-0.3.3.0.ebuild 1358 BLAKE2B c47bf2dfc1161ad5c008eaa145cc5b1792c40b38634deca9772fd576c23c40feec740262eaaac9943e5b5a51e8e7d3b2640c9da1a1f796006e9e3df2e827dd8f SHA512 5873c0308e80007025a807021c326e05ca53364e9cd6b6cc24c8bc7a4b3688196442b3b3c63a74e502bdddbbdd3f84ed7c0f08909a5c45800025278da708b7ec
-MISC metadata.xml 511 BLAKE2B eb475c8f280a44c0f4b09e34c344ed478a2503d2821711b57d12c40971d4c75081455e1cb4e13350846a4cd2cc0a92bc1b69228f4e8ecfa9d90439fcc10a5d27 SHA512 d21aadfa0df81fe2542de2a92f94fe055c0040e5c963d33bbdab5a8a2da085b64788f4141fad8ddf6c5e0959c275ae650be95298e7a984e7535045503b257a42
+MISC metadata.xml 511 BLAKE2B 58c9fb109771630af8dc293c28530ebe7607e236c39e589735cbbb321891f454c554fe6d4746bc259c505d8261294ab8be62e61cb5d1699e2242ec7923e94674 SHA512 83da5699aa84cbdb03b7adf164ac19087e03f823c3fb118f939cfda13296d998c9a484c3355568ced0757a6c4bbc476a161552fec187a379e6ffc3329305444d
diff --git a/dev-haskell/uri-bytestring/metadata.xml b/dev-haskell/uri-bytestring/metadata.xml
index 16a771dc5920..d90b4e09cd78 100644
--- a/dev-haskell/uri-bytestring/metadata.xml
+++ b/dev-haskell/uri-bytestring/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index 576cf79a002f..d63f373b34c3 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,3 +1,5 @@
 DIST vault-0.3.1.3.tar.gz 5314 BLAKE2B 99b98c771075c38e9ad11dfced093556af020dd03f4549ed9eca2f2e8066b69a2e3c3c6ea8ff27488c5c3c2a3c4fa62f4b03dd2b4a899ccc8dfacabb0e219d1d SHA512 70773be0f9c6fc9db290b633e663cdaad3e4d30dee5a6754415d475b40adf1bb20aca61c80b2971570c411ebc6644e646f5908fe7149e8698d38270e1f3f409b
+DIST vault-0.3.1.4.tar.gz 5375 BLAKE2B 6ba8dc1132d9e188cbfd65e5c1246df18399d08b614bf32f162e2aa4127bf324af6856198c7e32a8f6bbc6dce9f5c8b2cc393f3b3b3869d0731fd7de45a3a52c SHA512 70bebabce76b5e56b3d5cd4f95590ecef7a41f4de7f943932713fbb3eb17ac4d615a25b6503773a532b36649cf4a7b595be3b4222a15ca7d0756b2bee8aa0792
 EBUILD vault-0.3.1.3.ebuild 993 BLAKE2B 080bc1df4e3ab364e6b15477624c9aaea105c41ce4e07587d881e9ef2e50710cf5b625efe23acd8e5d2286c2cd5c2293a6e6d8fb328ae0544761092b5d4eede8 SHA512 56d844b4c8b81bb8642f97bcc22d73be4a2ec058c9ceeb6b015d3f61356d71ff9fe62ee1c2310e7bd6b2d4256d314d8f3d772dabf7b156472e1b174480e73e0b
+EBUILD vault-0.3.1.4.ebuild 995 BLAKE2B c2e1ddad9089a1bd1f102585b59de6f6b147aff20f394db04d498b225a80da06582104c49c532dea2799cf21c25890875b1feae06a87af752ebfca68ea5e1c54 SHA512 df5c58ec5d7555bcb06dc2fc22f522e977d1e9b84c12dbe02f12aba6259f2f8c1d9d220659a19a6062050ef4464d63b1f77883934919a23833416692f6b1bfb2
 MISC metadata.xml 658 BLAKE2B 9dd8c71a6edeb66e554b41232200643af326c4d89c8ce87f187462b46abdb52a2275c4f19b9679fb6ee0e038dc7589f02b19636f19df42f6d3a8242796e62d27 SHA512 e76c19492190a13feb99f15f8cfb283ed55525dbdfe786bd33fe9e123b1fb344d45d8751da292d10dbdc906b8348b6840810aac2c871c9c39f5b4fc3823dc169
diff --git a/dev-haskell/vault/vault-0.3.1.4.ebuild b/dev-haskell/vault/vault-0.3.1.4.ebuild
new file mode 100644
index 000000000000..48f582ae33e1
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.1.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=useghc
+}
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index 4a5a6e31ab74..806436a017f1 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,3 +1,3 @@
 DIST vector-th-unbox-0.2.1.7.tar.gz 4771 BLAKE2B 72d25981c2dd42bce7028d94a1805ad9a836cfbdce9dfb8bdbfe2f1aa26f4180ea8fc02b3323eccaa11c53065659ddc25063460b737831cc565ae08cecc914d4 SHA512 fa65c32eace3ad93f0df69830eca0334519bbdbb2bbdc511db6e6abffe48c78870fef131dc34451873775a037634a87f0cd0d06dc1c4bc9404af2a86d7593ae1
-EBUILD vector-th-unbox-0.2.1.7.ebuild 694 BLAKE2B 7c13a7bac6913f377ca71bcd5f74f039ca527688127f32cc0b3fca3d11055d6b14f8e528f40dd8409d4797138a0e968102abf102e0bafdb3aa57532569a67ea8 SHA512 9ec1e8d51befc69a13838a84e9b970beb0f7bcc97e7195ccbb2e2b7e347ceb8865c3113552758912639d3b7eb5878944dd3ece3d161e7a1f941caab21a714180
+EBUILD vector-th-unbox-0.2.1.7.ebuild 844 BLAKE2B 5df4209f404fa8c9fc80a9298284f94f79536d76636ef9a3820c4499106ede0d20320a5bc31c065ffc11f61f61f6db63a97e5a2e19107a35a8d9bfe8a259e7b2 SHA512 4e55fba8f6f43ec19d6684d5a1db575feeca61c4f8106addb749a4b27736a1dd51aee2d63c833ff0debfe070c0c93c3d66104e468a98489a281cad6f2ee1e497
 MISC metadata.xml 507 BLAKE2B b7d5ac975575519f663f97b6af10f1d30c01654181291b76005aebd9bf7a53093bd1fb89704412d00379577796ddae52a3cf6f536bd2dbb061e957b72b185880 SHA512 d26a922cea4556e110e803e2d4f51eb87969abc695f51cf85fd7057dc1a1fd09ec6758c5eb0cce2fbfad127f4731415deaffc33efc1f54e6d8c95d30ca7cbd9d
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
index 820ebe66aefa..85c71811009a 100644
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,3 +24,11 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 	test? ( dev-haskell/data-default )
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.5 && < 4.14' 'base >= 4.5' \
+		'template-haskell >= 2.5 && <2.16' 'template-haskell >= 2.5'
+}
diff --git a/dev-haskell/wavy/Manifest b/dev-haskell/wavy/Manifest
index 746ac06afd84..a0c8a833749c 100644
--- a/dev-haskell/wavy/Manifest
+++ b/dev-haskell/wavy/Manifest
@@ -2,4 +2,4 @@ AUX wavy-0.1.0.0-binary-0.8.patch 454 BLAKE2B 8865e15588ef0a9fa603da3aefa793ad7b
 AUX wavy-0.1.0.0-ghc-8.8.patch 519 BLAKE2B 35d8b175c3fc6b63e2fa58b8113799479fdfadcbab492df69a83bc4c7d2f810cdba672851ed919e5b3926f3f10caa6429f1b1f362178e69d6445489cb70d6e35 SHA512 059b239ecd843a90f08eed43347d623d2303fe83eadcdad4e5667fc3c0051cd60459850ca94f3a82f2cd9358af8c344268491f6d407d4c87613aaf06205e23e0
 DIST wavy-0.1.0.0.tar.gz 25100 BLAKE2B 5c4926c22b0a874b84a02fdff9218aa78f78a97dd736ae1243e99bfe368c8d136dc463346c3905e794b70deaeba5dab7223a54fa43304d67234cb16f0bd489e2 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d
 EBUILD wavy-0.1.0.0.ebuild 1049 BLAKE2B 459248f0804452fa51aeb517e1bf2ba9bd2ce3319611156712da66b9839097ad6733339a44ab0828b128d97a5b5fd607009d823e0e65f6b5038cddfdf079f3cb SHA512 d73cae852db8a92ec771a6c42fd6d8e0251d8d3e6d31e6b7bdcc77ce5546f477dd6d89c56a8e0c14076a295a7a1d92be7be41885813e9981a81006466265465c
-MISC metadata.xml 624 BLAKE2B c3a9f576830d189dc88e76910ea9857b6d77fb9bfb12ee8187512b81c41a4a42097efd24daf05b63da4c91029eb7044a4013772b6b5045c3638fa1852d9ababd SHA512 8442163e564335e43e3010df0183a5b6e15fcda2650ce97cc59c410bc978171b49a65b926229c7d02c8f7ffad4232b160a326fddca89e20822d4930e84c6ff8b
+MISC metadata.xml 624 BLAKE2B b5c7b07ab855760504352161a102729672dedbfe4ff3e70a28f169aacedcbbc0791659c7fa332cbb8df41b93dd2aa06feb1eaa4ff2e8f68fb70c2a2de5c1cc29 SHA512 4a2fde80709f3434236b56a4aeab3da2b4c6a8f1dcfdb57696b8ccc00f3f429ebc878084ecb9ad737310a147ecc94c357aee1f36b20f345151286c1f09789acd
diff --git a/dev-haskell/wavy/metadata.xml b/dev-haskell/wavy/metadata.xml
index 162d299f5c8f..a69dd264fd5b 100644
--- a/dev-haskell/wavy/metadata.xml
+++ b/dev-haskell/wavy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 61cd468ba0c3..72879ab40928 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,4 +1,4 @@
 AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1
 DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
 EBUILD x11-1.9.2.ebuild 941 BLAKE2B 82064b0310daa30aa54e6c285de9999bcf0588f77ca3269c63f022932bb3e349e66258da90e4d816cadd17d36a676e04c38ed15a96ef1a05f4239c7fcdcc4375 SHA512 69273118f44da0a00ff34bdc73da22f1ad274243e8f568fbce5afdb877bd61e24e554a942d31d39d98917e135782b7aefdb5598ba7b367ccb909baf7980cfc91
-MISC metadata.xml 543 BLAKE2B d29d4081691780e98aa55b3f5316e43ac844a8a6fbba6915874d6ab9091fa88773dcac66e880c79939176eb7922ac22c2caeea4e4a3979b4b6dfaca0b23b3ee1 SHA512 50d4070a3804970ed1fb8e050935d5f331fc960dc8c8a0fcc9ecf0349cd93f059237dfccfd02d29f8197368f3af9fd02af8dcc207cc99a1cfc1720f779143968
+MISC metadata.xml 533 BLAKE2B 3a7ab0ee40f553aa4ca8faec689fc785bd735e55cd637ab34a2b7749d569ccea28db66e0b1a1f96d38e53c336dc0c3f10709fc24abac91ce02e49bf4ca1d32b8 SHA512 2b01bda05166cfe05c9b5525f8083de771fb76c9b836c408e6f51e679b42f9aef89892ff339eb1986e180f2f387c00c4990c1949fda574e318252a6d737952fd
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index e9eac3ea9674..ab2b4cf23796 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -8,7 +8,7 @@
 	<longdescription>
 		A Haskell binding to the X11 graphics library. The binding is a direct
 		translation of the C binding; for documentation of these calls, refer
-		to \&quot;The Xlib Programming Manual\&quot;, available online at
+		to \"The Xlib Programming Manual\", available online at
 		&lt;http://tronche.com/gui/x/xlib/&gt;.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index 72a47ae1a49e..be5d576125a9 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 695 BLAKE2B 5687e7a9bab589c8bd56515af32145016852c8a312a51f6d01045730653f28d333e43c8a8bf9401d8e5a2885cb4dfcf4fca79465744b069e5bfa901e7aaefd10 SHA512 fbbac568878f53acafbbe20e00f036bc6017919f789a29b773d699a7ac001cf7aa0cb020431656e1ba62dc243ee6df24ac56800d4eb90abc27b50176f146d1ab
+EBUILD xhtml-3000.2.2.1.ebuild 724 BLAKE2B 06fa8d8e6dfeb5a4e690cf97022eaee020897ce37158fde4554d7add2998bccfe618dd6f08a600b5f1d233bf643a9a585df189f65ce8d6f01394214f6693eff1 SHA512 3d1de8e9797e43f0817bdce3fe75c769abd921c01ef2667918f4c5662e25c6a3079b9f5cc200117d6d6c630690adf944bc7448f15b21a831a338e2e1d405eb58
 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 570b8317bb30..373bbe200864 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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: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.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 514aeb18793b..0ae245bab18b 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
 EBUILD zlib-0.6.2.2.ebuild 1099 BLAKE2B 3a861ecc21cf9fee1abdf10d6cf9286edcb311d6c9298b275e79d4447d68c8a6f061ed1602c47064d5de263da533769428972e510f71297d263abfb9e7e65c4f SHA512 6da795f3b91902d54d0f459174da7df8f4586896f046714a7c320c53c98307399c49946f43ba228dc3b21d30a9f9daecbd0eb4908922612e9320b34f22950694
-MISC metadata.xml 1169 BLAKE2B 00ccd79f20643336c55e80bf917a09ec31d214cc29629cb5cb1e838369ce8828929e7b9521d2526723ea951c97039f9135519d3cf42c07a6f547f621f4ea72fa SHA512 7955c1f302be91c1e6f864a2296d8b537c66b6b9f644c7fff67f94689e704ce182cc7d3811829883aae91b29b1fa06fb5cbe452f0b5d1e045e13bc46bf917c8c
+MISC metadata.xml 1131 BLAKE2B 9978e724a8dadd7816fbfae73e6082a1d38a932ffa3b1c3000a40cc97ae640e2d6ab89bc9c93f1dc2e93925cee5555a864c42817771dc657888ea648378ec381 SHA512 99cd9d6da0f1ff231ef2e1f2543a5f06fc38bac1a5b3b9ad539154d78961b1d8dd39d3365fea8e965eb314442be84ed71bc5276ac246cca4fa1c6022e1a8f703
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index 45b44ae5f1ea..5bd9fe9e7fcc 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -12,10 +12,10 @@
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
-		&#39;ByteString&#39;s. It uses the
+		'ByteString's. It uses the
 		&lt;https://en.wikipedia.org/wiki/Zlib zlib C library&gt;
-		so it has high performance. It supports the \&quot;zlib\&quot;,
-		\&quot;gzip\&quot; and \&quot;raw\&quot; compression formats.
+		so it has high performance. It supports the \"zlib\",
+		\"gzip\" and \"raw\" compression formats.
 		
 		It provides a convenient high level API suitable for most
 		tasks and for the few cases where more control is needed it
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1f56532f07a2..15cae7f481ca 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
index 908f444d55ff..966510bc11f1 100644
--- a/dev-java/asm-analysis/Manifest
+++ b/dev-java/asm-analysis/Manifest
@@ -6,4 +6,4 @@ EBUILD asm-analysis-6.2.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09c
 EBUILD asm-analysis-7.3.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
 EBUILD asm-analysis-8.0.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
 EBUILD asm-analysis-9.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
-MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582
+MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-analysis/metadata.xml b/dev-java/asm-analysis/metadata.xml
index f653390931e4..e1ae832ca03b 100644
--- a/dev-java/asm-analysis/metadata.xml
+++ b/dev-java/asm-analysis/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaiboma06@gmail.com</email>
 		<name>Kaibo Ma</name>
 	</maintainer>
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
index a977c9b256b3..5692c5f0b21a 100644
--- a/dev-java/asm-commons/Manifest
+++ b/dev-java/asm-commons/Manifest
@@ -6,4 +6,4 @@ EBUILD asm-commons-6.2.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156
 EBUILD asm-commons-7.3.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
 EBUILD asm-commons-8.0.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
 EBUILD asm-commons-9.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
-MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582
+MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-commons/metadata.xml b/dev-java/asm-commons/metadata.xml
index f653390931e4..e1ae832ca03b 100644
--- a/dev-java/asm-commons/metadata.xml
+++ b/dev-java/asm-commons/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaiboma06@gmail.com</email>
 		<name>Kaibo Ma</name>
 	</maintainer>
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
index b507097dfc4d..4144a3b51699 100644
--- a/dev-java/asm-tree/Manifest
+++ b/dev-java/asm-tree/Manifest
@@ -6,4 +6,4 @@ EBUILD asm-tree-6.2.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be
 EBUILD asm-tree-7.3.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
 EBUILD asm-tree-8.0.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
 EBUILD asm-tree-9.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
-MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582
+MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-tree/metadata.xml b/dev-java/asm-tree/metadata.xml
index f653390931e4..e1ae832ca03b 100644
--- a/dev-java/asm-tree/metadata.xml
+++ b/dev-java/asm-tree/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaiboma06@gmail.com</email>
 		<name>Kaibo Ma</name>
 	</maintainer>
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
index 7c9526cebb69..6227cd85f344 100644
--- a/dev-java/asm-util/Manifest
+++ b/dev-java/asm-util/Manifest
@@ -6,4 +6,4 @@ EBUILD asm-util-6.2.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14
 EBUILD asm-util-7.3.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
 EBUILD asm-util-8.0.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
 EBUILD asm-util-9.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
-MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582
+MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-util/metadata.xml b/dev-java/asm-util/metadata.xml
index f653390931e4..e1ae832ca03b 100644
--- a/dev-java/asm-util/metadata.xml
+++ b/dev-java/asm-util/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaiboma06@gmail.com</email>
 		<name>Kaibo Ma</name>
 	</maintainer>
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 0b7e6e0ab800..234539ad1778 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -2,15 +2,20 @@ DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9
 DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db
 DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af
 DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
+DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e
+DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
+DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
 DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
 DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
+EBUILD asm-3.3.1-r2.ebuild 925 BLAKE2B b8d162ad54bfd93b1e1784ea36211251241f8ec669a8031a9118a9000b02176e99643ef56822c521f5eca6b40be0053a58f15f5c05b87ddf32339577bcd02985 SHA512 80a89ac921c28bb5fbc4bcdc5e330cfceee17c17ac15514f9f9cac5f9aaef8a668fc023d79b2f17e659bb5fd66d716fce23c88bc961dd70aaf6454f920139b95
 EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
-EBUILD asm-5.1.ebuild 1209 BLAKE2B 67b2b998cbe6c063362c8c1ad52d1a7d0c315e953f7086a167c4d53ed6a39340596f12b2ff57b9c6808062f8ad19f6b95c3bd642ed6b5fbe834f2aad881fb7f1 SHA512 eef56477abf698df89d26b18dadab6a13d6bdb624262f711cff34f22a7b61aa8881ee5d679fe8759bb2442cf7552a05ea355677a7dd19e316b0c3c2215951c8a
-EBUILD asm-6.2.1.ebuild 568 BLAKE2B 9a27b351e265867302d8003376b992ca8fabfc5bf60c224f142f27f3414d03956150a865057fd1e28bce77f526fd0b0c345a7f287c96758d7b3f5b5228f7907f SHA512 ea2e107ce6653644a7df344b0c09fa12751584a83a6b5cf4fae9554f23a485ea1c788601adba2b670df9471fccefdd7bb07cafdf6ac8ab794639841b9c581b13
-EBUILD asm-7.3.1.ebuild 568 BLAKE2B 6bcee43b6942f454b91e4bb8bc0dcc67660e4b7dead4789afeec5c17fefa4b2faa75581fce0f0c7796a2eceee317294529629242a4910fe05175302235da34fc SHA512 b858ea8e1bfdd274701359eba7c784c1afca1f27f3c2f397419fc19694ee5caabb4af312b13e1d99fbbed7c818f2e70b063302a6fd59670619ea0b3ff2b868c7
-EBUILD asm-8.0.1.ebuild 568 BLAKE2B 67de6b694bdd1a776555b1011ee1149432e828cfa733d4cb142f0a70ed5b9333bba4cb626e7ab495e6327484a16d1d25e736679448b90dc2d23cee4f48df0522 SHA512 52d9fea58c7f175721008f4885d3c5b87a84ef8f8a31ea4f6eeec6a492fb765f27f0da1b9a43375967d8e3d3853b928a22fb38b1b562e8a3b668f2667df8717c
-EBUILD asm-9.1.ebuild 568 BLAKE2B ed82a7167ef4b0cf0a8b375f06928cd4472ff10b840a27ea6d9bc24be40aadae21c540aaed80dfb08e45476228f7dcc0db8947fb34b8464bc1dd2cb28cbc1983 SHA512 4929ac17afec26b1a4d944426a6eeb7e9a68f9f816fbe760a1ea65904503b43924aeeec6dd6751968a475cc80824a4358cca89640f82ada786f6442192ee260a
-MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582
+EBUILD asm-5.1-r1.ebuild 1284 BLAKE2B cd9ba7ce9846795d6aed159bd8273e786098736d29343fd7e4599726f11cfc46dd84512604a6b979cbde94c0a3223e8297f2ae69f47703fbf270678ebfa8508c SHA512 dfcafbdf2b442e3a2fc602ed9445ad7a2d2852de8bcfb859f62a1e74925d30372c6a23722217a8d92356990ca817225244282e0947c2e8355d794459114a0153
+EBUILD asm-5.1.ebuild 1209 BLAKE2B 55f774cbe303d63d983a31937babd7e15f04273ea4c1d4052aae21aff2a150919abb490127b7bd8371979120a1b6a793f75ec0ef5f93e1082408d0e800a62a59 SHA512 010768d998a2d406d7ea90492e51bb1056fb4797bebd939aa3f7d776f4a5a599143615fc4471340f8d500345830975c6a48bc1a3191bd5e984e14cac26d57805
+EBUILD asm-6.2.1.ebuild 568 BLAKE2B 32971b777f8b654ad23e36ec2e15e9ce1dc2e0724dbed9baa3ffd1a508deee565b95031352813f6bddb6bd5f147e2d013e7022cb3b149a50e88bfb5a993db423 SHA512 13492f12664ba269f2ab8cb331bdba728279feaa29dc6c1315164ca16c2de12778958fead17eb827095ef61f273045be6d9efbdd07772e177a10e5b379dd35dc
+EBUILD asm-7.3.1.ebuild 568 BLAKE2B 5813e8eda936a34f77c9647583b92e7ae845b52aa6c9a74408cf096a4b1badfad8fa1b075429bd75ac0d3aea2fe0b9adefca15265869d981dc18a29453d25d40 SHA512 5619c7922bab5b984283968749a46fce73903ebe4db57589f37b2c21a0f242ef03498e753dd0464aa68e66d798db07e3656e30d86ad015799dd1b6e668612bd7
+EBUILD asm-8.0.1.ebuild 568 BLAKE2B 5861690e7bb9868484dbf18e6bd1dd62efd3e779aa63a35364e832db79b4d01d799d583b5c8fcf4967c5815d45baf836b6c2557f597b54deb12b9558790d91ca SHA512 847fcfa188a7028850fb66ebb9f1d615a0f645a0b845276eb0d1c2abdbb5d02d6e9b411d633887d655f9dcbfd9a75670e33d2dc5346330f765b47a21bb8466a3
+EBUILD asm-9.1.ebuild 568 BLAKE2B fb9ac711d6adce8911b558a5558be89dbb2eeb25d37112c506f6797328424c7c966163bcbd266d79403237de21527a2f4b14c0623ac1e1d2179c90d0063f293f SHA512 c6599e31d0522123145c51e3dc9972940d6ced2173156fd4c3f0eaef93b97b087412ce2267f613de64df14f3dff23d7a140d3341c15d56d5ec9a1ee44146b5d2
+MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..b67557484231
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_ANT_TASKS="ant-owanttask"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/asm-${MY_P}"
+
+# Needs deps we don't have yet
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this property is not set
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
new file mode 100644
index 000000000000..b53de05f70d8
--- /dev/null
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+CDEPEND=""
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/asm-${MY_P}"
+
+# Needs dependencies we don't have yet.
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this objectweb.ant.tasks.path is not set.
+# Java generics seem to break unless product.noshrink is set.
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
+
+src_prepare() {
+	default
+	# Borrow some ant scripts from an old version to avoid requiring
+	# bndlib and friends. This may not work forever!
+	cp -vf "../asm-ASM_4_0/archive"/*.xml archive/ || die
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
+	done
+
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
index e210b62e4860..0b38eae33728 100644
--- a/dev-java/asm/asm-5.1.ebuild
+++ b/dev-java/asm/asm-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-java/asm/asm-6.2.1.ebuild b/dev-java/asm/asm-6.2.1.ebuild
index ed050bec9824..d5e30d7baf28 100644
--- a/dev-java/asm/asm-6.2.1.ebuild
+++ b/dev-java/asm/asm-6.2.1.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
+HOMEPAGE="https://asm.ow2.io"
 MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
diff --git a/dev-java/asm/asm-7.3.1.ebuild b/dev-java/asm/asm-7.3.1.ebuild
index a9e66f9b283d..9b1ce17b7973 100644
--- a/dev-java/asm/asm-7.3.1.ebuild
+++ b/dev-java/asm/asm-7.3.1.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
+HOMEPAGE="https://asm.ow2.io"
 MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
diff --git a/dev-java/asm/asm-8.0.1.ebuild b/dev-java/asm/asm-8.0.1.ebuild
index 76ad51bd4ada..9535ca9a5ecb 100644
--- a/dev-java/asm/asm-8.0.1.ebuild
+++ b/dev-java/asm/asm-8.0.1.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
+HOMEPAGE="https://asm.ow2.io"
 MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
index 7ff100a3d930..73bac3be0c6f 100644
--- a/dev-java/asm/asm-9.1.ebuild
+++ b/dev-java/asm/asm-9.1.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
+HOMEPAGE="https://asm.ow2.io"
 MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
index f653390931e4..382aec39b1e3 100644
--- a/dev-java/asm/metadata.xml
+++ b/dev-java/asm/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaiboma06@gmail.com</email>
 		<name>Kaibo Ma</name>
 	</maintainer>
@@ -23,4 +23,8 @@
 	therefore designed and implemented to be as small and as fast as
 	possible.
 	</longdescription>
+	<upstream>
+		<doc>https://asm.ow2.io/documentation.html</doc>
+		<bugs-to>https://gitlab.ow2.org/asm/asm/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index ebd307fb345f..5758d136a34d 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,3 +1,3 @@
 DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
 EBUILD assertj-core-2.3.0.ebuild 745 BLAKE2B 2dffcadb02ebd13c9178b71c4ae4732573c8a5d9464fa49cd8289dc7effc99738da2f019ed4575c34ad1bc64366c21ca88f85def16bb016030d5b3a1ddc14696 SHA512 6c6c8f520d2d64839eb615d5f4d8c5fb477657527885c1085e01a7b14cfeff7309ceb341722146becd80d24c12879bc6c854e3563c0aa718924aa6392bf7ddc3
-MISC metadata.xml 639 BLAKE2B 1bf3a68298529b7356f7416cd193cedb70c3f44fda7753cff7a9213d75e8ff000b92bd3bec724b5fe8eabec254c26920bedcccaa450e565074a1451cfc08b735 SHA512 784148def8994941ba884e79622d7d9ac8c6f2c5eb0a15acc003aa2b345c63a4574d4a9b3f521943f841598d61b1ce1a512bfe0328e51d10d9cfe4c7124a0cb7
+MISC metadata.xml 639 BLAKE2B 838a5321ee12c23f8d85c9767a15085724c1fb872fefdc9412d67f113de7e1515dca16afe11c5f5fd55790bb9e4feaac3bd26027a33f728655592bb7bbd448cc SHA512 ae023f76f4d256b3efc4b8393370db21600ebd381066691574ef9f02b962bd49996af10eb74fc009b94860e29b3a18d747943ddb3642e0501c14b41bbe428359
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
index a7b501cac593..e2ea74d8f3ec 100644
--- a/dev-java/assertj-core/metadata.xml
+++ b/dev-java/assertj-core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 8f8ae15b497b..8d17c740ce22 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
 EBUILD bsh-2.0_beta6-r1.ebuild 1303 BLAKE2B a74bca95046e027ce0f462b559ebd8c679545d034f3b4057759e96b32c61898e5c707444e40965e2b0e7cd5df7e4c78b97eb68e419305d18df48c4d62694ce18 SHA512 847ec48e9c52470178835285f7cd1b575cb73af4f206efaa9007adb6d4306057aea26516ab5f804adf379ddf2d12736b00831b562e200743f245dcd804dece1c
-MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be
+MISC metadata.xml 330 BLAKE2B f6a3eddd83a1af377f5f482041ef9bf0bfd4cd820a1304a60b1e9579a9aef5c6b7d7f4149e8e34ae55f93d23c846d7487963dd997f22141ee51c3990813732c7 SHA512 70339f4f92b294ca23db2e095fae9c56bf48714d1070090410618c8ce69d651d39ed78bd45371b7b84e46bf864c3a7bb1e53190f93667ee6d8a01366051a6a62
diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml
index 203bfa39aeaf..69b7ba94f68d 100644
--- a/dev-java/bsh/metadata.xml
+++ b/dev-java/bsh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index c39fd4d7c1e0..a8275df96aeb 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,5 +1,7 @@
 AUX MANIFEST.MF 1222 BLAKE2B a7ec1ac35802d24cbc9ce95d3974004d89e6233aa41f95a33733b08dc447c54bbd6da2a3a01ef2d46cee303578a4dd116704e7e1dc551af1212b0b3ed891ea1e SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d
 AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c25fb96b80d84e83e371debb619efbfbd244f31a0214d7487f38611f8532da838a971b5b8d528 SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89
 DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
+DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
 EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
+EBUILD commons-compress-1.20.ebuild 1070 BLAKE2B e62e87c31d535950f9aa90e55847a36b153b446f065955f00bdc4faaa0df672ab5daf3265d2d537eab8b221ed8dc910a4cf05b2bdcb7ba4935cc391422463af8 SHA512 04fe39bb22322218cfe93e2a9a71828aa13805db75e9184b06b3934f65839ac5f43df609e763afee6c484c8546da0e92a75c5d04c508cd40261e7824077f272d
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
new file mode 100644
index 000000000000..f20803df625f
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.20.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 pom.xml --download-uri https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-compress-1.20.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-compress:1.20"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="
+	dev-java/brotli-dec:0
+	dev-java/xz-java:0
+	dev-java/zstd-jni:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="brotli-dec,xz-java,zstd-jni"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
index c1b01f077cc1..0effab637858 100644
--- a/dev-java/core-specs-alpha/Manifest
+++ b/dev-java/core-specs-alpha/Manifest
@@ -3,4 +3,4 @@ DIST core-specs-alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f801
 DIST core-specs-alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
 EBUILD core-specs-alpha-0.1.24.ebuild 884 BLAKE2B 70d8e88cedeb0a133411990f3849b479f24896f644ab5620fe3c3377b793cc6c553177fb6386eed57becfd0876557eea2c512bb0be837e635e24f214cfb9c2ca SHA512 7a93646083f75faedb51925814ad00463348424d704fefc8eee4f780199e8a363b8e343421cc62439d0e4744f03418c65b59495a87a1560dd1590f0b99d9e06d
 EBUILD core-specs-alpha-0.2.44.ebuild 884 BLAKE2B eecf5279ed83fde8cf61cf672f017bfdb38ad4ca58a18eb56b1e550417271ee0b9dac6da589c7769d78fc3768b30e70b62e9663bbfb1f9d7ded797332087ad9a SHA512 d4628a9171862783508b7e7d522db649af73724234ece129e851d14bacee696c5c348f95a76860f4483119403c6a0a7a441677fc016ad8354b6a4b4afc8e33f5
-MISC metadata.xml 451 BLAKE2B 67e193d5ecdbc6e472b46b38ed2182c23e2506c07f048df3ae5b2192fa30d8fa4d8f6481d0cc85475008992c38e9d46daaf63c5ba5ee42db8a1f5d1eba1e206e SHA512 a5543ddb12939e3f7a3d091968098e1ffaeabbc774022098773d5f81fab71639ec75fd2294f5797c7d33734a6a3096b68d66bcc79e48780a7fad14cb1d3a5538
+MISC metadata.xml 481 BLAKE2B 5077630f26ed6daf5fa01d4a256b14428ed0b7b0fffd264fd4120709bb6d671c332d767326fe38016a8de89f23d166508927a98eddc907baf4f72ba13b43f6e5 SHA512 b833cd62bf3d25bb9140e0619218e68ac35d9ec6667d73a14ea01e738d746afd587e83633e713bd7fe808b177a50e795ce7bc30a1e215c6cce9d3656161a4fab
diff --git a/dev-java/core-specs-alpha/metadata.xml b/dev-java/core-specs-alpha/metadata.xml
index 3e2f01e0d964..4e34b7026845 100644
--- a/dev-java/core-specs-alpha/metadata.xml
+++ b/dev-java/core-specs-alpha/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>tgbugs@gmail.com</email>
 		<name>Tom Gillespie</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
index 9d3c9b33aadb..334b5a8a64ef 100644
--- a/dev-java/fastutil/Manifest
+++ b/dev-java/fastutil/Manifest
@@ -1,3 +1,3 @@
 DIST fastutil-7.0.10.zip 518168 BLAKE2B 7941e4b6725a45e7e4f08d6c3c2b44fc5940266d0274ea2c8342747e8078024056c4c39e2d64a2f529599b9780b66f1dbd041f5de4e5fec3879c35fc923702c2 SHA512 9345f509243bf91123b4232b95915ae4d6071b5da17948cf62e993e77e9ed947637f02937ccd98edbfd874db7f98c1858357e21721feb338d97041a7bcc3e558
 EBUILD fastutil-7.0.10.ebuild 828 BLAKE2B ddceb91f90c3ef093fef0dc9cbadf98883acb71222b69fbfacb187687f63eedb7035726b9f0410b313d0588b1d28202df4d4b7654e54de2f2c0e7e1f13f88ab5 SHA512 74b0b380bdc479f97b5da50d2dcf2ee114b6a11a168fbca1330827b93467e385a2ebf009d69bb4e924c25de2305ddb277a2859120867461272d605b6357f9a82
-MISC metadata.xml 315 BLAKE2B 182d83d40631234d357d332b8e293c21bb2f3eae973943e9e4bad72d59e6d99beba37ea7040f609490b2f5e9dd9dc6844c29bdcd2067862620b883cd53032e3f SHA512 447055480b194584c2a20458664b53916d198417612b3a084f7d36dc18ea0d4678b93ba916295905059ec37d92a18bfdf2e04b536b5aca378325f38037730ad9
+MISC metadata.xml 315 BLAKE2B f7936e933c4510bf344b870432c54ff24221dbecc10375fe7e4a7b9e06c894b6b8557f1900ab88603cf2607fbff91506cd76b8ef84b14f5f7ae0c35611b3a697 SHA512 ced6b57b11305f857f84b07905dd24732cd43bbfdfc8269b3bfede120b1ca284964d793ede90fa05180f53e7cf136f4ec67b8c3735412ca5a64f02a6c1fc2db9
diff --git a/dev-java/fastutil/metadata.xml b/dev-java/fastutil/metadata.xml
index ef9d3ced77a5..a17b5c024c8d 100644
--- a/dev-java/fastutil/metadata.xml
+++ b/dev-java/fastutil/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 53630aed67c7..c357cd76d56e 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,4 +1,4 @@
 AUX build.xml.patch 2160 BLAKE2B 15221b65f00871e3e01b30b735d9ac3498644eb5570e4d8ac5e75ad4dc995719f40832fe9a58fa367aee8a8a2a0d854ea99370cd1def119c30371c3f503b2a69 SHA512 ae01462ed0a8fc61fc6e34b99b536bf7d36da73744a070ad63f555af07de5dec3a0926b97fc984ab481db7b7c8807db53998f83e17a5717e805c87a49047731a
 DIST freemarker-2.3.25.tar.gz 1873971 BLAKE2B 52c64938c67ac0303b07f4aa74c3fc7ccc0be68bd37a7c6c663ac0849acc9f2236d1028abb377efa6fdb518840b1961e71c1a02a37388864f9be14b3b443f28a SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac
 EBUILD freemarker-2.3.25.ebuild 1521 BLAKE2B c2bfe59271f782fbdf032ae0bef290652b02cc360a597190fb08fa404823272a6f2ba5dbecac0c86ee6a2be1f3ebcfdd259ea37a1bd801daf44b1cca78b41d4e SHA512 dab420734ea60b4b26781240046a5791a48d0346ec30526563e6caa656062a550948a61232664f96544cc4b6f4a865626d0bd21ab1ef60d1e3743da7b32c0039
-MISC metadata.xml 383 BLAKE2B 37aff0d8a54a89b0cc78ccc0b9f09b86c1cd91f6759511711124cb805bcc61b682111a6664c8ea03d701ad92a0eb72a4108e09bad1a33a4c5dde3d7ed4f1b646 SHA512 2b6f5f22ae11f25aac3cbf3a2c3f3161ab391b932740d964b41bb84d24f54d12a8fa60f11502571b30d5100bd7fc578d82939de0ae7d1bef0d22df910edfed2c
+MISC metadata.xml 383 BLAKE2B 673f786e4169d8ce1dfa9b341738f6b30cab82a6c0c86cbb53e6b3ef7fb853285ad33551d0a1f436a77eb5fd029f5a50120a4a3dc29e0edd8643a6248af540f5 SHA512 6159fec9f927ef733fb89aa11bf0fc6e9920d9b4d33601bf728d6f0c32a625ed673a4c1db0fd4d364664479da85c3bd0a11e26debdb0664a88659970740c8202
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
index 62aedeea4e53..e471a93e212d 100644
--- a/dev-java/freemarker/metadata.xml
+++ b/dev-java/freemarker/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index c96bec1ee0a5..4628da5e2642 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,3 +1,3 @@
 AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 EBUILD gcj-jdk-5.4.0-r1.ebuild 3726 BLAKE2B aabad7193016c3035c3d75c338606e865d084deb7e75f509728ecf31206455bc8b4c79130cf40a9f266a102aa329dae9bc914a86a58863912a7e336457708f40 SHA512 3019ade48332e0313aae1f4fc12f1aebde7a6734a8c7966dbc3d34b70a81aff1aa8e37173bdc2d249316ee13010928e64c8f0ae00df3adc3a73bd5eae41fdb78
-MISC metadata.xml 587 BLAKE2B f7ac8f38876d21fa09c3452344ca5b0c3d32090d15eb9753cb3c466d30ddf3f99289d41297c84956384f851767419112adbf349bcff99977377e9476644fa952 SHA512 6d748a94a49716fdc70c7983b87cb37ec1809d2c43b823486110957cd38fe6766db6627f3d548fec0c204af153f852bb1e75dbc112ecce2bfb26478b8db46754
+MISC metadata.xml 617 BLAKE2B 92b08aedb4220dd134d8a7da3355638ba5599b0cbdc6a42c4f21ce224f1c5fba664328c9629b7ea772d3f7c24bd4cfb0023049318366f7bef038742075e564c0 SHA512 d37993bbdfb72db0d6f13de58a527b28e82cf6e4ab36aff4dc75a338fbc08ff45537e4540cee5e6b107128c9f14e47819fc67c4935092d1c79b5b71be4c2825b
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index 7ea0b046d2a9..860110bf6d56 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gnu_andrew@member.fsf.org</email>
 		<name>Andrew John Hughes</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 958add0d4b89..e6dafa6d4945 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
 EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583
-MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
+MISC metadata.xml 449 BLAKE2B b675645687a94a13762df0ee0607f6e9bbab7fcae1a7570c0648d3d574f640b3460ec3b2dc6ed8554026a70287abc349bb2a3f601e534d370cd6ad08c2f791ad SHA512 0393173c9476820673d65582c827868e2b16e346d07be73d8be2f37e1599c3e643e4c16d2fff37ef1ae1d3b8dd667492c2f166a352d382ba4a6334134af41354
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index 1b6bfaff005f..f9d3fac87a16 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -5,7 +5,7 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>flo@geekplace.eu</email>
   </maintainer>
   <maintainer type="project">
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index e47cae3095ad..23e284d15961 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,7 +1,11 @@
 AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
+AUX hamcrest-core-1.1-java-11.patch 1516 BLAKE2B 0a6c7fdc74015377075f174149a1fe2f55a3a4e782490c5bc7cac4abc3b0f8996e39dd98c094637f9899b58b15f9339b800154e4ab380395c06167c28d603076 SHA512 43b084fafa7d1c69f3cd6924e3446c32f20481da1148a77d2dc9021a439257eaa518e3b57a8049f3212cba75f62e1cd3db2c6feea36e28a6c93584fbb48ee968
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
+AUX hamcrest-core-1.3-java-11.patch 1204 BLAKE2B 25f17238124829786bd3c8dbc468536f8a6bb684531e7859c003789249c88307d063aaf5b3e47abca5a93884bb3378d9197ce112d3237eaf1d021ad75e678e61 SHA512 6269c90835fea7387e5f830160c536eb91ab3037ed2e9bd5142f8cd2029fbea9e9baf374aa0fba98e0d59f0a0e83cd41f1d81265d94099013b81841253a85f20
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
 EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
+EBUILD hamcrest-core-1.1-r4.ebuild 819 BLAKE2B 3f493eba6cefdb44388ce7ff68358973124e501d4d64baa3db1ed090fc14879ea84cdc703a5735101980a7b65b9c3cca6fd0128e3faa70e70af42a1f54a7d80e SHA512 67e6a9862994324c14eae28d426ff1b9265bec1fb1ccb82ada71f2b376b13ec57d010c10678fc570ef60b6cf6a05a15558901ecaf0aee8f4e092db8a571f542c
 EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
+EBUILD hamcrest-core-1.3-r2.ebuild 1589 BLAKE2B 836857be5cc28379c345ded0738cb3d48dc43096d804b80bdb9e2345961a53b6b084e3e0fe39ef18fdb81cbf226005d1f6e82e7ae219db8467588043287a3e56 SHA512 9be6623ef6703d1a6dd930d4000d939de5d11f65221f9bcb4e537e6e9804a5cb3a9fa50d9661bd7af57950366d4f5bd825ecdd7e90a814f08bce4fab6fbdc5f3
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
new file mode 100644
index 000000000000..1e3805eb1755
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
@@ -0,0 +1,42 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index d435303..962c945 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+ 
+ import java.util.Arrays;
++import java.util.List;
+ 
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -32,7 +33,7 @@ public class AllOf<T> extends ShortcutCombination<T> {
+      */
+     @Factory
+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+-        return allOf(Arrays.asList(matchers));
++        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index e003a7f..4ed9030 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+ 
+ import java.util.Arrays;
++import java.util.List;
+ 
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -33,7 +34,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */
+     @Factory
+     public static <T> Matcher<T> anyOf(Matcher<? super T>... matchers) {
+-        return anyOf(Arrays.asList(matchers));
++        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
new file mode 100644
index 000000000000..b250f1cc7c01
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
@@ -0,0 +1,26 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index a206b80..d55cf6b 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+      */

+     @Factory

+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {

+-        return allOf(Arrays.asList(matchers));

++        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));

+     }

+ 

+     /**

+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index 55d08dd..2a46631 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */

+     @Factory

+     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {

+-        return anyOf(Arrays.asList(matchers));

++        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));

+     }

+ 

+     /**

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
new file mode 100644
index 000000000000..36347fc3a513
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-solaris"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
+PATCHES=(
+	# https://bugs.gentoo.org/751379
+	"${FILESDIR}"/hamcrest-core-1.1-java-11.patch
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
new file mode 100644
index 000000000000..1af30d072f00
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+DEPEND="~dev-java/hamcrest-generator-${PV}:1.3
+	>=virtual/jdk-1.8:*
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+PATCHES=(
+	# https://bugs.gentoo.org/751379
+	"${FILESDIR}"/hamcrest-core-1.3-java-11.patch
+)
+
+src_prepare() {
+	default
+	# Empty out the contents of the generator target; it has already been built.
+	eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 63ea5851c3d9..c7ee902025ca 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,4 +1,5 @@
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 EBUILD hamcrest-generator-1.3-r2.ebuild 1324 BLAKE2B 80e8b7ef81afe127b0cb4cd17db60e376f448d304695f9ff65a4e9c5571a1a57a1cdf292612bf4671d6c260b377be68d72895a3dee9a15527028f7a390581a8e SHA512 acae20ed327ca7555e47d676ef768991dab7fde73c8156b9f0b167f4ea6fac5079c155148c84bfd4df8c6569be8a7812853e05b25d889ef42c3634a9e2916e11
+EBUILD hamcrest-generator-1.3-r3.ebuild 1306 BLAKE2B e862807de2f19aaed010d88080e9d589cf730545cd6f7bf1bf1cebc3080362d55c667cf6c294ee727fc3d02407caf3439f457a1ad60203178efd0d69b5068046 SHA512 5c3dd291f0d2d20ac1787fcd734eaf69e03043e6733ba7fc7cbc6906dfb489e2164f68f46f53f77fb12522694958d108a4fe3c23c84fab26599159680ebbc6d4
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
new file mode 100644
index 000000000000..0c1e98d14c19
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/qdox:1.12"
+
+DEPEND=">=virtual/jdk-1.8:*
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="generator"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+
+src_prepare() {
+	default
+	# Don't include source in JAR.  If a Gentoo user wants the source the source
+	# USE flag will be enabled.
+	eapply "${FILESDIR}/${P}-no_jarjar.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
+
+	# These jars must be symlinked.  Specifying them using gentoo.classpath
+	# does not work.
+	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 0536bf2f5781..c158dd648c53 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
 EBUILD icedtea-sound-1.0.1.ebuild 884 BLAKE2B cbeab5af2535f85b974f70eb861412ea9f94e7c48adc82d72a2b51930053d45cf894dbf9c9a499f33b207a84b5fdfca1b65a95c695ed0060bf4603b1901780b2 SHA512 0de6493e5357a26f9577c98496e66e72b96452e5f5d92f7e6e1c1d3c7470563b793266d280caa672b593cadac7b5d6e21996ccc391ce3af8758432d8a2e77d47
-MISC metadata.xml 368 BLAKE2B 456c9159397faa36fe3eafa4ec60a46a43ed4e2436f6c1175147da66b2ec2b6b97d4e03b08e53340382ddc06d0ad0007e8d31a6a8c90c39522c84f4393a0ec08 SHA512 e7b3e6a4142b0c38a9620af80161d2b4a2cba75dcb5a95fe19c9eb1f98f23888d0bb97369103a577a6ecc5e72d78dd3ab86d1cc7cd8d984ba9ccd9d35c17a509
+MISC metadata.xml 382 BLAKE2B 59a6ba628e5453fa0b74e335ddc7b2518b2624037549c20a2850c3dce7119c52c7b592bc875a89e5b04eac272f98156b9819d03623c35580c55501ce6d3b4cd7 SHA512 210018116f0894a6eb291b92cc5994b4e89870035e884b5248f930172cfa431f18dca6acd972ed0b1f366b6aa441e46ff2730c291b4334db4637aeca1e64091f
diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml
index b9ef3f832b7d..72ea7ca75a41 100644
--- a/dev-java/icedtea-sound/metadata.xml
+++ b/dev-java/icedtea-sound/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gnu_andrew@member.fsf.org</email>
     <name>Andrew John Hughes</name>
   </maintainer>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 357af0dcceb6..5f4428c34f51 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -25,4 +25,4 @@ DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591ba
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 EBUILD icedtea-3.17.0.ebuild 12309 BLAKE2B 749c85a4365c8ce9330de196578f8a7b4cdaac48608e24c50df9244e27e95f62ef97c5b5652cf1af25b3042dfe537344acb617efe54b5cd481b971bb620f7a6f SHA512 9770ce5deb3950ceda3d5fd4089c09feaea93c2181751a561a4166333f727f7afd3a46d0b49bd15174184e1a4b5a72f866d2fdf679886b0e8cd52f8445b29ac7
 EBUILD icedtea-3.17.1.ebuild 12309 BLAKE2B 37146e81d1edc8dd7fc12baa6ed22c4498cc9768d95d14f371003b60d4eb52df0249f3a9a0f15832a78cf52aef3453684b2b5aa57129ed77a48189d9adc36b0c SHA512 edb424109fae679985c7b53eddced8aa926bf812291a2a580b37d8430c4e4e6b506a04db15a5f9cd86151102c1dc1dd4636c39e1ccfe3f604006f587633098e3
-MISC metadata.xml 2078 BLAKE2B 62fdcb5253303938fdb76f663ddc6f3916435a3c9ed96bd4dbace4def75710e6dfe651466cf2ec9783cb897e13347c64eed12b20c90b68635865c395979bd67a SHA512 1e7b759aa3b3e5a50347cfd788c50435a28dbe094cead897e35c7be4fc85dcc47fab0091592d8ca74f7274e77e57b75658ad97385faaa7d3287579f88a198cf1
+MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 55c624c0a067..18643722fecb 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gnu_andrew@member.fsf.org</email>
 		<name>Andrew John Hughes</name>
 	</maintainer>
@@ -13,7 +13,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
new file mode 100644
index 000000000000..308d1d8855f0
--- /dev/null
+++ b/dev-java/jakartaee-migration/Manifest
@@ -0,0 +1,3 @@
+DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105 SHA512 c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f
+EBUILD jakartaee-migration-0.2.0.ebuild 1389 BLAKE2B 3ad313f6831a5515aabdb82fdacf79b8f5c797ffb2795cd69f3cebb30c52b4d8084cab5a74adef3b8fe0618d54d89702edeffa136c138727a929377d8a8a37be SHA512 ead7d25c89c56bf8c7e7a5731addd40b6ef4d984a0c653926230b3944069a8cbf310c1122d1f03304faad98799f9a20b78a29e98c5d69ebeb209f547ab8bedcf
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
new file mode 100644
index 000000000000..7815b0e6bc20
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9."
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="
+	dev-java/ant-core:0
+	>=dev-java/bcel-6.5.0:0
+	>=dev-java/commons-compress-1.20:0
+	dev-java/commons-io:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+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"
+)
diff --git a/dev-java/jakartaee-migration/metadata.xml b/dev-java/jakartaee-migration/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/jakartaee-migration/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jargs/Manifest b/dev-java/jargs/Manifest
index b6aafc8dd3f8..65dba8949108 100644
--- a/dev-java/jargs/Manifest
+++ b/dev-java/jargs/Manifest
@@ -1,3 +1,3 @@
 DIST jargs-1.0.zip 202051 BLAKE2B dbf74d90a5c229f9ca1ba42c8d0b3b35404b3eb7c5dc7af0a76fc222465707b9dbfe44fef63cb1ffbc64821fa2f0c7e8144466e44de9bbf84cf198f5a107e31c SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359
 EBUILD jargs-1.0.ebuild 556 BLAKE2B 6003311771e030c4f2dadff72c08aa22c0b984a72786d2bb61d07beb22796aad8127a242591e944fc56604387f0c9072dffdf404431eadfe2bd38e18c3fd474a SHA512 4312ddf7383efa9b098e7f9c6746f49bdd77242bf910f6196eedfed2c7531f8b23f7f3b6fa9fe32dd420a60787e85222bf60618373ae371602950e4db95328e1
-MISC metadata.xml 376 BLAKE2B 28627c0b5a5b855f815a0a1d0d5546ee392dee917be5819e1a9dd5094bb782a511402135a4b56f91e41b71b8f86dea1925d0b363cea9b6d53b5247e76e87e895 SHA512 6dce1f0c46259c53b16a7d846ec695d2969815566641e15efa3949304a0e534f78b2981673f71af5c851feb5976999fb7c846356448942feee7a57446abfb3f4
+MISC metadata.xml 376 BLAKE2B e7ea00029cc75fba1532b6c80c9bca23c62372bfd6e110c7b14d487a4c61a2ad703bf7049f30e312ac3e0d2f5dbbc1026909bb8d78f1515201cd0ac58ed19598 SHA512 c11ec80d93b5135983534df74d66f04fe8a67344c3242ee565f4d3cac30eb1ae5b48fed9992bddf57a257c219f987e7f1fa712f72ef4c917d8b4433842d46501
diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml
index bd60fb04a3db..b4b878fa541f 100644
--- a/dev-java/jargs/metadata.xml
+++ b/dev-java/jargs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest
index ed962d282c1e..68424b0b509b 100644
--- a/dev-java/java-dep-check/Manifest
+++ b/dev-java/java-dep-check/Manifest
@@ -1,5 +1,8 @@
 AUX Main-0.3.java 11702 BLAKE2B f0f67f098fdf20cb6ad78ec6f0e20afa29cae2c7b62bbafea7a0e6ec5c3ab83029e7929d1e7d78b93b7551c62802a5b2a9f7ba40e16d99c7037ebcb8d2d71e1a SHA512 a70c0161fe72e8f4b4476cbdad5ae3074fbb7321214723a7b1b7778fd06de4eb616479de2b5d6ce9a6dab2e919d721ce2b177a515039a0b9592aa2b5e1017e88
 AUX Main-0.4.java 14943 BLAKE2B ec9f08f76a38e16f17e68e05e06985f11700532c6f6827518cd8303635d240f7c425a205dbc2c41df870b1029d83a3b04b5d20a76f10275786a8d7c457472501 SHA512 340e6912285ee5c61116cd838c2abf68c573e57053d0b923fcd3929e19253d7cf29a281b226a3624a69b358f112bdf4a554b6c23b850933d60d7a1fd059f7a1e
+AUX Main-0.5.java 14974 BLAKE2B c8cab47bca61f5c792d214f817768ed9455bb31f407ea5259e760ee8e66c6ab7cd811079bd8d1764fbf0c70da4aad1d9ab5500385c3894292b6e8e8e51c54e6f SHA512 3111783b22e01b357bae675fabd9af86536d4db82cc7dad1f4dac4c3a64efd84f3b6f35e5b5698dafc696d3ecde49589bcb167967130004e3fd1716db9d868f6
 EBUILD java-dep-check-0.3-r1.ebuild 645 BLAKE2B 06181b8bd751a72d4a2876d4d44dbce6a037abcc23a09b9e91994a3987a03442dd58d6b191ea9ead5d2187254455c625c6cca587d61136ae236148e28eb92505 SHA512 6da35a65c72ef3d61f4544d49fadac6d743d8b348130ae811b620d62b428227ad4a8cc889d78dd409291dc59a621f459c27993033d7daa2eee5f23ce4d786ebe
+EBUILD java-dep-check-0.4-r1.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46
 EBUILD java-dep-check-0.4.ebuild 642 BLAKE2B adffd940e68f3e7653a1b723acb360b31d7d402e3415649608d161c0c5dfa7cbc0ca476ac47b284d2af5f76632300f96d77350e130e8839aad36dd0520b9a842 SHA512 61463bfcced95396791da6dcd12135c0724294956c74743492c4fb8a21199aa855250797e6aa6a5b34ad4a5b2e6c0bc34bd77745e4769f4aae6335821ce048e1
+EBUILD java-dep-check-0.5.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/java-dep-check/files/Main-0.5.java b/dev-java/java-dep-check/files/Main-0.5.java
new file mode 100644
index 000000000000..bcd6b4f2a9d6
--- /dev/null
+++ b/dev-java/java-dep-check/files/Main-0.5.java
@@ -0,0 +1,442 @@
+/**
+ * This file is part of javadepchecker
+ *
+ * Copyright (C) 2016 Gentoo Foundation
+ *
+ * javadepchecker is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package javadepchecker;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.Properties;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+/**
+ * Main Class of javadepchecker
+ * Gentoo Java Utility to scan class files for unneeded dependencies and 
+ * ophaned class files
+ *
+ * @author Petteri Räty <betelgeuse@gentoo.org>
+ * @author Serkan Kaba <serkan@gentoo.org>
+ * @author William L. Thomson Jr., <wlt@o-sinc.com>
+ */
+public final class Main extends ClassVisitor {
+
+    static private String image = "";
+    private Set<String> mDeps = new HashSet<>();
+    private Set<String> mCurrent = new HashSet<>();
+
+    /**
+     * Empty Constructor, sets ASM op code version
+     */
+    public Main() {
+        super(Opcodes.ASM5);
+    }
+
+    /**
+     * Get jar names from the Gentoo package and store in a collection
+     *
+     * @param pkg Gentoo package name
+     * @return a collection of jar names
+     */
+    private static Collection<String> getPackageJars(String pkg) {
+        ArrayList<String> jars = new ArrayList<>();
+        try {
+            Process p = Runtime.getRuntime().exec("java-config -p " + pkg);
+            p.waitFor();
+            BufferedReader in;
+            in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String output = in.readLine();
+            if (output!=null/* package somehow missing*/ &&
+                !output.trim().isEmpty()) {
+                jars.addAll(Arrays.asList(output.split(":")));
+            }
+        } catch (InterruptedException | IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return jars;
+    }
+
+    /**
+     * Scan jar for classes to be processed by ASM
+     *
+     * @param jar jar file to be processed
+     * @throws IOException
+     */
+    public void processJar(JarFile jar) throws IOException {
+        Collections.list(jar.entries())
+                   .stream()
+                   .filter((JarEntry entry) -> (!entry.isDirectory() && entry.getName().endsWith("class")))
+                   .forEach((JarEntry entry) -> {
+            InputStream is = null;
+            try {
+                Main.this.mCurrent.add(entry.getName());
+                is = jar.getInputStream(entry);
+                new ClassReader(is).accept(Main.this, 0);
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            } finally {
+                try {
+                    if(is!=null)
+                        is.close();
+                } catch (IOException ex) {
+                    Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            }
+        });
+    }
+
+    /**
+     * Check if a dependency is needed by a given package
+     *
+     * @param pkg Gentoo package name
+     * @param deps collection of dependencies for the package
+     * @return boolean if the dependency is needed or not
+     * @throws IOException
+     */
+    private static boolean depNeeded(String pkg,
+                                     Collection<String> deps) throws IOException {
+        Collection<String> jars = getPackageJars(pkg);
+
+        // We have a virtual with VM provider here
+        if (jars.isEmpty()) {
+            return true;
+        }
+        for (String jarName : jars) {
+            JarFile jar = new JarFile(jarName);
+            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
+                String name = e.nextElement().getName();
+                if (deps.contains(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check for orphaned class files not owned by any package in dependencies
+     *
+     * @param pkg Gentoo package name
+     * @param deps collection of dependencies for the package
+     * @return boolean if the dependency is found or not
+     * @throws IOException
+     */
+    private static boolean depsFound(Collection<String> pkgs,
+                                     Collection<String> deps) throws IOException {
+        boolean found = true;
+        Collection<String> jars = new ArrayList<>();
+
+        pkgs.forEach((String pkg) -> {
+            jars.addAll(getPackageJars(pkg));
+        });
+
+        if (jars.isEmpty()) {
+            return false;
+        }
+        ArrayList<String> jarClasses = new ArrayList<>();
+        jars.forEach((String jarName) -> {
+            try {
+                JarFile jar = new JarFile(jarName);
+                Collections.list(jar.entries()).forEach((JarEntry entry) -> {
+                    jarClasses.add(entry.getName());
+                });
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        });
+        for (String dep : deps) {
+            if (!jarClasses.contains(dep)) {
+		boolean systemClass = false;
+
+		if (!dep.startsWith("org/apache/commons/cli/") && !dep.startsWith("org/objectweb/asm/")) {
+			try {
+				Class.forName(dep.replaceAll("\\.class$", "").replace('/', '.'));
+				systemClass = true;
+			} catch (final ClassNotFoundException ex) {
+				// it's not a syste class
+			}
+		}
+
+		if (!systemClass) {
+	                if (found) {
+        	            System.out.println("Class files not found via DEPEND in package.env");
+                	}
+	                System.out.println("\t" + dep);
+        	        found = false;
+		}
+            }
+        }
+        return found;
+    }
+
+    /**
+     * Core method, this one fires off all others and is the one called from
+     * Main. Check this package for unneeded dependencies and orphaned class
+     * files
+     *
+     * @param env
+     * @return 
+     */
+    private static boolean checkPkg(File env) {
+        boolean needed = true;
+        boolean found = true;
+        HashSet<String> pkgs = new HashSet<>();
+        Collection<String> deps = null;
+        InputStream is = null;
+
+        try {
+            // load package.env
+            Properties props = new Properties();
+            is = new FileInputStream(env);
+            props.load(is);
+
+            // load package deps, add to hashset if exist
+            String depend = props.getProperty("DEPEND");
+            if(depend!=null &&
+               !depend.isEmpty()) {
+                for (String atom : depend.replaceAll("\"","").split(":")) {
+                    String pkg = atom;
+                    if (atom.contains("@")) {
+                        pkg = atom.split("@")[1];
+                    }
+                    pkgs.add(pkg);
+                }
+            }
+
+            // load package classpath
+            String classpath = props.getProperty("CLASSPATH");
+            if(classpath!=null &&
+               !classpath.isEmpty()) {
+                Main classParser = new Main();
+                for (String jar : classpath.replaceAll("\"","").split(":")) {
+                    if (jar.endsWith(".jar")) {
+                        classParser.processJar(new JarFile(image + jar));
+                    }
+                }
+                deps = classParser.getDeps();
+            }
+
+            for (String pkg : pkgs) {
+                if (!depNeeded(pkg, deps)) {
+                    if (needed) {
+                        System.out.println("Possibly unneeded dependencies found");
+                    }
+                    System.out.println("\t" + pkg);
+                    needed = false;
+                }
+            }
+            found = depsFound(pkgs, deps);
+
+        } catch (IOException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        } finally {
+            try {
+                if(is!=null)
+                    is.close();
+            } catch (IOException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        return needed && found;
+    }
+
+    /** Main method, parse command line opts, invoke the package checker
+     * @param args the command line arguments
+     * @throws java.io.IOException
+     */
+    public static void main(String[] args) throws IOException {
+        int exit = 0;
+        try {
+            CommandLineParser parser = new PosixParser();
+            Options options = new Options();
+            options.addOption("h", "help", false, "print help");
+            options.addOption("i", "image", true, "image directory");
+            options.addOption("v", "verbose", false, "print verbose output");
+            CommandLine line = parser.parse(options, args);
+            String[] files = line.getArgs();
+            if (line.hasOption("h") || files.length == 0) {
+                HelpFormatter h = new HelpFormatter();
+                h.printHelp("java-dep-check [-i <image>] <package.env>+", options);
+            } else {
+                image = line.getOptionValue("i", "");
+
+                for (String arg : files) {
+                    if (line.hasOption('v')) {
+                        System.out.println("Checking " + arg);
+                    }
+                    if (!checkPkg(new File(arg))) {
+                        exit = 1;
+                    }
+                }
+            }
+        } catch (ParseException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        System.exit(exit);
+    }
+
+    /**
+     * Add dependency to deps hashset
+     *
+     * @param dep dependent class name
+     */
+    private void addDep(String dep) {
+        mDeps.add(dep + ".class");
+    }
+
+    /**
+     * Add dependency type to deps hashset
+     *
+     * @param dep dependent class name
+     */
+    private void addDep(Type dep) {
+        if (dep.getSort() == Type.ARRAY) {
+            addDep(dep.getElementType());
+        }
+        if (dep.getSort() == Type.OBJECT) {
+            addDep(dep.getInternalName());
+        }
+    }
+    
+    /**
+     * Get deps not contained in the current hashset
+     *
+     * @return a collection of deps
+     */
+    private Collection<String> getDeps() {
+        ArrayList<String> result = new ArrayList<>();
+        mDeps.stream().filter((s) -> (!mCurrent.contains(s))).forEach((s) -> {
+            result.add(s);
+        });
+        return result;
+    }
+
+    @Override
+    public void visit(int version,
+                      int access,
+                      String name,
+                      String signature,
+                      String superName,
+                      String[] interfaces) {
+        if(superName != null) {
+            addDep(superName);
+        }
+        for (String iface : interfaces) {
+            addDep(iface);
+        }
+    }
+
+    @Override
+    public FieldVisitor visitField(int access,
+                                   String name,
+                                   String desc,
+                                   String signature,
+                                   Object value) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access,
+                                     String name,
+                                     String desc,
+                                     String signature,
+                                     String[] exceptions) {
+        for (Type param : Type.getArgumentTypes(desc)) {
+            addDep(param);
+        }
+
+        if (exceptions != null) {
+            for (String exception : exceptions) {
+                addDep(exception);
+            }
+        }
+        addDep(Type.getReturnType(desc));
+        return new MethodVisitor(Opcodes.ASM5) {
+            @Override
+            public void visitLocalVariable(String name,
+                                           String desc,
+                                           String signature,
+                                           Label start,
+                                           Label end,
+                                           int index) {
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitFieldInsn(int opcode,
+                                       String owner,
+                                       String name,
+                                       String desc) {
+                addDep(Type.getObjectType(owner));
+                addDep(Type.getType(desc));
+            }
+
+            @Override
+            public void visitMethodInsn(int opcode,
+                                        String owner,
+                                        String name,
+                                        String desc,
+                                        boolean itf) {
+                addDep(Type.getObjectType(owner));
+            }
+
+            @Override
+            public AnnotationVisitor visitParameterAnnotation(int parameter,
+                                                              String desc,
+                                                              boolean visible) {
+                return Main.this.visitAnnotation(desc, visible);
+            }
+        };
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        addDep(Type.getType(desc));
+        return null;
+    }
+}
diff --git a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild
new file mode 100644
index 000000000000..eb7e53a80eee
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/commons-cli:1
+	dev-java/asm:4"
+RDEPEND=">=virtual/jre-1.8:*
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.8:*
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main javadepchecker.Main
+}
diff --git a/dev-java/java-dep-check/java-dep-check-0.5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5.ebuild
new file mode 100644
index 000000000000..eb7e53a80eee
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/commons-cli:1
+	dev-java/asm:4"
+RDEPEND=">=virtual/jre-1.8:*
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.8:*
+	${COMMON_DEP}"
+
+JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main javadepchecker.Main
+}
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index dc34a5e3725f..5aaaa4288958 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,4 +1,4 @@
-AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4adc08bd5f6b71695df6369a12d0a0c91f62d587cb7e619a8337cfe6c34e5d278eed5bf5e060355751b2b61c891bdabd59b142865893b1 SHA512 f45dcda4ff87b98cf60d3db5bbd98b6f0dfced2d784076d49f0e29997b25f9f3eefe8b7d3410ff2df3e8cff11910a226996763982193d44b5c99aa03ade8aaef
+AUX java-service-wrapper-3.5.25-as-needed.patch 7033 BLAKE2B dc74a0794917171dd7b84cc54a0f6536ee9a36d5082535219f1ade57f6b1482e6c68ac71b20e1c8c9fd4495ebc246f7680c8a7a567e338b55ce2e8021e164784 SHA512 6fbaead84aec096aec6f05414d0250ab0d2407e09616eb8c0e72a67e61c2b127433f41f89d6513ac55aef43e5427b3cedda841618138e6c1b18d8b26a1e1cf86
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
index d956ff0b0043..85d3d791199e 100644
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@@ -1,4 +1,5 @@
-
+https://bugs.gentoo.org/622806
+https://sourceforge.net/p/wrapper/patches/25/
 --- src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
 @@ -33,14 +33,14 @@
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 0a370ffe62dc..106b599043d0 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,4 +1,5 @@
 AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
 DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
+EBUILD javacup-0.11b_p20151001-r1.ebuild 2790 BLAKE2B 7539940729bc92676ef614ec76a0287da8f38a8bc3a25616496f8c4b25e178a86dfbcd892ef08dfb96b170e2e3114412eac40fe1862dbe1b39ae7fa5abd56889 SHA512 ae3f59c9d126dfa5db224313cc631df3055b48af66457c9b03340caa4e28afbfe83a5d272d9a8e94b06b93aa472ea5c414a5a84ee6a49795674753e7ef160279
 EBUILD javacup-0.11b_p20151001.ebuild 2798 BLAKE2B 8bf3e57971595295db4c5af67e9d810577fb1cd017a226ad4bf6f1835fa96d1150f9135e7ac5e4b2b374d2d433f58d6ad55193465a8f092e8d82c83c949f2050 SHA512 cc8885b9d6dfa24f39d9ad9ad28f4af755d1c50182b388f7ce1243125de58aade47872647b2fd5add3a4f80af1b88697da39855fab8d0d95e49e6db75b087bfb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
new file mode 100644
index 000000000000..587cf479708e
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/-}
+MY_PV=${MY_PV/_p/-}
+MY_PV=${MY_PV#0.}
+MY_P=java-cup-${MY_PV%-*}
+
+DESCRIPTION="CUP Parser Generator for Java"
+HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
+SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/ant-core:0
+	dev-java/jflex:0
+	>=virtual/jdk-1.8:*"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	# Bizarrely, you can't build from the tarball without this patch.
+	eapply "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
+
+	# The JFlex package name has changed to lower case.
+	sed -i "s/JFlex\./jflex./g" build.xml || die
+
+	# Remove the bundled JFlex.
+	rm -v bin/JFlex.jar || die
+}
+
+src_configure() {
+	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	# Annoyingly javacup bundles an older version of itself that will
+	# break jflex if that has already been built against this newer
+	# version beforehand. Even more annoyingly, the binary download is
+	# built with Java 8, which isn't much use to us. We therefore use
+	# any installed javacup that is newer than the bundled version where
+	# possible. If this approach turns out to be unworkable then we may
+	# just have to use the bundled jflex for bootstrapping.
+	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		einfo "Bootstrapping with installed javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
+	else
+		einfo "Bootstrapping with bundled javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
+	fi
+
+	# Clean everything except the new jar.
+	rm -rv java/ classes/ || die
+
+	einfo "Recompiling with newly built javacup ..."
+	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
+
+	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_P}.jar
+	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
+
+	use source && java-pkg_dosrc java/*
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 41dc56b11912..5a58e3cc820d 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,3 @@
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
 EBUILD jclasslib-3.1.ebuild 776 BLAKE2B 29602b4386651dd5edaeb924ce4b56125554159e448b649ecb99cbd3a0ea0dabd1d0fd0d7714a070d078aaefed44e93991671a1c98f92809c249dc32d077c652 SHA512 91d0ebeffa9539c9e6aeae71951d9cd89f1c1aa2c701a086c3bcc904f8692af6cbd3038c63faa40c918bc64af4cb6fc15b1dd26347df0a96d3c8ca3b045e1cb6
-MISC metadata.xml 374 BLAKE2B e0919272ff6e152907ffa22c7bc8778201b38ae1f53a553cc66ccc4d13095ec1ed7044c4fc3eab3eb4aecdb6667bbf4701b6934d06f0eb01519b01fc9aec4145 SHA512 7f7c3383fdc738b2e67837e024d23c6b9fc4a3288b443ecac539c69766b94769a60a0bc0e1b271d6698266fe3c7f3fee81444e36c4e6dd57e8568c51cea140ca
+MISC metadata.xml 374 BLAKE2B a45fdc671c3258da8b801aaf106c28ba5ec42cdee2997c0d57d1a94878036c8ffc669cc9e209e09b19aa6f382f1094b40e0e5617c570a45d28152504c7c44f03 SHA512 fd9cad2f9460867de742c4ce2a0dab9467db869f95b5e70e40856408f3d2bb98f6d67b4d26ed75d32d924e0c920db4030a9443742941f40f089f5a39cae8a2c9
diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml
index f860d915bfe9..f6dc3aa541c8 100644
--- a/dev-java/jclasslib/metadata.xml
+++ b/dev-java/jclasslib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index f6d3ad857c40..a548d86b0c3b 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,5 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
+EBUILD jflex-1.6.1-r1.ebuild 3547 BLAKE2B 3f31c1b03cf1de496c4e97a9a4470758cf8809d457fefc29a140e2f1d5d23b2e517d3f9755a551e76680e7e2b96bdede3a9893d116a95561514978b57ae2fac1 SHA512 d5dc5c9ab7ada77845f6aadb93c69baac1a89d1068f50246a6a297cbeacdf84d8e88c151d74844796df3f24d8a0c29eff4a0492c790c2d55a2cb553521408a86
 EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 60652de3c6f2251ce128ff058e36265a5ebc15b98db0f0ec5c1c611adcbf868a2cb3855f535ac15897bae15bdac1cba1dc813720a8adcf5968a3f7a3e2f0a5bb SHA512 5cb6e698518eb0d765c35647766a3cab0550e5c48f7e37330321a22039ba1c99fee64cbbaf26faca01f684cd7fe7ae98a03aa694c6eb32b8f4672541f2ea2977
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..d7bddcf955e5
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND="dev-java/javacup:0"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	eapply_user
+
+	# See below for details.
+	eapply "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile (without doc/source) using the bundled jflex.
+	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index d03e1566b721..c5c74e6f7e83 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,8 @@
-AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663
+AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
-EBUILD jmock-1.2.0-r1.ebuild 971 BLAKE2B ebd8861dc5e02c85c98289f2820a7be9f006f97ee62fce32c7c45880bfaaa03745f78677408a1c6aac383bfa7e85e2ea26f0166c59bcdf8e541171b63575d6c7 SHA512 1450db05391b0241bf95f78824092d5bf4657632155f28a70d47cfd79510526399c7b1351a58318b9723b22f17f34e44d8a4bad6f2f17c4135a12d29e7fd92d0
-EBUILD jmock-2.6.1.ebuild 828 BLAKE2B c76836b50142234275461ef7e3801bf2d4e698f63d826496db984dd514234278b6307d49d340e5941ad3cdf00e4a0307c3ca17fef9409344668417fccf345242 SHA512 13a6f4ef2997353cb0761d5da4fc571324cd401375a54fdb629135ae09cfca077d6ba266a681bb1d737ca3c927707bb64dea79599e825095793485b0e51314f7
+EBUILD jmock-1.2.0-r1.ebuild 963 BLAKE2B 53c60bdddb516f45f903006554fe3db2069b8a0f22508849f1af907e8e6489a5928b80e0491ef1cd793cf629d224559224852f1b016d46256296ed5ef5c8c7cf SHA512 a9b123f34046856f913ecfa0fdf70f243b4e0914a56746a95af2738aca3c17756f4c3319978bb7070157be0460c8f59478c8801bafd089572cf9383ddef06117
+EBUILD jmock-1.2.0-r2.ebuild 965 BLAKE2B 4d3a87e9f269319f352a8abbe56102fed3f51f7a531a1ecdf3c07dff064814f507d2bb8c078eed2d929bf789dc8f014fe09736d0d71da70c0fa78e3a3c4a6d2c SHA512 d25b8b8de0e4efbb709616ee9d7d7a6be36fe80f39b80e386222bd46f99171d55a7ab0b544a78c522882cc97e5e7405f8521d0a9d3b013509ad11e7a31530329
+EBUILD jmock-2.6.1-r1.ebuild 827 BLAKE2B f2866e65ae2a8d260827802c36196c6de59b1fc5a2a40e1f07263e0670b9ba143cb751468144a68dc16a427c15d64607ae3743cd09353d4c6485d4b7dfe14215 SHA512 dafa81e697fa9ce57547ac75d72787b6dbdaff3b227c06be7e6f08c06bd4e208c6c2fcfb538f9bacf5ca2a6da96f83a68f53f57ae24dfaccd28f1258f9b15877
+EBUILD jmock-2.6.1.ebuild 820 BLAKE2B 0041aabe995530a8105d30a7914629446f722c1508da4307234f746278a578e5fe2c42716822f4e2ee0980c0ef6882515615934dee7b05d208f7c8f021eae6dc SHA512 8a41af0316631b30d9b891eb7cc153ec0fdcad09786f807f657e1e2a5c1170f25004103dff1ffcf99f54cc63097beb2fd0b299e86f226c531b9ca593e61c3f03
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
index 1e3a939d26d3..75b5195c37a2 100644
--- a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
+++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
@@ -1,5 +1,5 @@
---- src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
-+++ src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
+--- a/src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
++++ b/src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
 @@ -73,15 +73,15 @@
          assertTrue("Should not have verified", threwException);
      }
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 62eb3c443dfb..3d0abb03985f 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.${PN}.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org/"
+SRC_URI="http://${PN}.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..f30beade3c05
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org/"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit"
+
+PATCHES=(
+	# This patch isn't changing the behaviour if jmock per se.
+	# Only the formatting is altered.
+	"${FILESDIR}"/${P}-AbstractMo.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	unzip "${P}"/jmock-core-"${PV}".jar -d src || die
+	mv src "${P}" || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+	rm *.jar || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..150ebf8f03ce
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	dev-java/junit:4"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unzip ${P}.jar -d src || die
+	rm *.jar || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
index 750c4115862f..6761ae6b5229 100644
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.jmock.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org"
 
 LICENSE="BSD"
 SLOT="2"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index f06b996a8f19..4b0ca791c430 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -3,5 +3,5 @@ DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6
 DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
 EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
 EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35
-EBUILD junit-4.13.1.ebuild 1483 BLAKE2B f56b0f948417658ab16cf313b4aff3c6122331e8ae2229da5854b9b36203a4927ef0fdfee7a4a37b7c393a8700868b8fae09d7722cee5cf264a411e890413614 SHA512 63916ea343e2e3472b861826de9aff49ed621d10bc59e2d8c6e1fba15877e255234448a07951a27d26cf9d1454e9bf4b5d93b41da960733000e4de7b6cd9b0c7
-MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
+EBUILD junit-4.13.1.ebuild 1561 BLAKE2B dae7806e52c1224bb555f9d3979382d453a51e11add5c2c212e49091b4189b157766e76de49d99184417aad1993e1615caa9800e175348424078e667611b698e SHA512 01cc082bebd6fab811ce838e3cb2f6c28f78da8f74eb6af6f67c41df6d7b27f6f5bfa213ed047ec8b895fe5048c5768fdd0d07e4c4db48f7f221fba32c642460
+MISC metadata.xml 368 BLAKE2B 8461f82cd98863df6643a7727fdef984d30f6cd8f9cf7cb37453fbae186896b2845bda742864eadaab1fc932604a48957b0c7f7b80ecfa8ca107276287abc602 SHA512 f9bf527c63c7c4cfb4c0967918b23e6c2abe6c9239d2a873bf2ccefe31be8224c38d4062c71b6ee2692f5b36a27c348e3fc24d48279bc392a9efae2a8d17e077
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 60c035757c38..d1c31fdaf6f0 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
 SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
+
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.8
+CDEPEND="
+	dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	"
+RDEPEND="
+	>=virtual/jre-1.8:*
 	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.8
+DEPEND="
+	>=virtual/jdk-1.8:*
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -v lib/*.jar || die
 }
 
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index 9c59435e026b..618f5e0e4b6d 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">junit-team/junit</remote-id>
+		<remote-id type="github">junit-team/junit4</remote-id>
 		<remote-id type="sourceforge">junit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/metadata.xml b/dev-java/metadata.xml
index 878473a04601..110adbe2ca1d 100644
--- a/dev-java/metadata.xml
+++ b/dev-java/metadata.xml
@@ -41,4 +41,3 @@
 		z językiem programowania Java.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
index 590126392253..cfc8395f1d3d 100644
--- a/dev-java/microba/Manifest
+++ b/dev-java/microba/Manifest
@@ -1,3 +1,3 @@
 DIST microba-0.4.4.3.zip 89737 BLAKE2B 130f6a39f069b0b4e93f352b7fea10abd6eec23b7f0392ad15fa34c198b4dfb46a9b0208322b245f0934e2ff2260661934f958e6216a45c4c69573976f366a2c SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10
 EBUILD microba-0.4.4.3-r1.ebuild 768 BLAKE2B 118819854bb185b357736387a7b016f30a9e2bbd768b93a8b129c2e06854414fb7ce21c08a84bed586f5e9419a7ebc867f878f34c35eb179a3e033a02eedd5b9 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16
-MISC metadata.xml 367 BLAKE2B 8b77b9e21a7b7ecf7cf4ec5f6038d89099400f34b5400d781657881199a66b76d54b6795b5b32bab132d6eac75c904ec59e02d0024ad8a7c9ba2f8ed23b83e9c SHA512 ff305633c3f8b368c57882d57a545755dacd718071f0e3a00e438c1eac3281057d4572b085cea61ea2ef40574fcd924032529b8267485ae6a5788d594b0305c1
+MISC metadata.xml 367 BLAKE2B 8a7e3d742a170dd9320fa338ad9b142c6f24dca994719e34ddddb705b899d9515c3262bc84123c07067c1014d12a281fdc884e798bd4648fbe2e7ff12926f935 SHA512 da7a401cfef034bd8ab514f2502d1da0ddeeaba7436ea370cd1ee08570e3733afdc519b8736fa6910b82ea30f1759162584f60ddd198cceba0bf0eac367688ae
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
index 21819550bc2e..bf98076be4e0 100644
--- a/dev-java/microba/metadata.xml
+++ b/dev-java/microba/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index b4e74bc0ccdc..46ea537c8b07 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,6 +8,7 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz 176435718 BLAKE2B c99
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz 194069769 BLAKE2B b537bdf553b1da11c06ba8aed7f2baa498da384209b5c94b22995a6d05e1d83b4fee215c6c27e1975e6d2e04805916f85c8fa244f53a6f002d3eb42d56898b74 SHA512 993881259ba470030c589f272d239aa185b1b460c4d505a266cb99f7107de2aa646b3cb8bb8d38fa454d226228c6d3dd8245301c8535c7f6b3bec766cc555bf9
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz 186160219 BLAKE2B 5a044db5ff02dadd8a1677254c8653e14f41e09e4180dc8726d35dd293193e8a332db54aede19d7a2c2bd3c3b3c799cb0faa315bfd9deda03c231fd01670ff61 SHA512 cd115893162a9db3e7e5763028a0040eb83773ae82cd056fdb9400ae3a2b720e7e1bee24a0251ea29eb01923400a1c459d3fbca08bf563d15f7434f5a4d6c69f
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
@@ -15,8 +16,9 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892
-EBUILD openjdk-bin-11.0.10_p9.ebuild 2979 BLAKE2B f7a8ebc65c05886c8ca3544bd25c059a8f7eddf9e35daa23ce44f1b02102b59c6ef110bae5b74249d2e9090934a0fa2ead043af616adf653451947f37d77aa92 SHA512 3ce971bd6441b866822597bc9ed3f60be306bdf452758595ba4924dcce8a435edd3fb25278600a762502c89db61cae9a531439596a6910fc5c7c2db6eeee1e08
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812
+EBUILD openjdk-bin-11.0.10_p9.ebuild 3511 BLAKE2B 37160845edf57ff8bc990a40545106628af6feaaf41c93a2a1a74fbf19998f5b05a90a194ed16c8ff68c255ddb213a60e2cebbd1958ad99e44ac139fd725a5da SHA512 5c5601dac2dee4c2f8fca804de5183efcc8b3701fd0f2d0d0435d49271f63a0ccd8dab5b812cf780f6b09fd25113675dd8b1f91b1bb8f06d57d48746bc5d7d6b
 EBUILD openjdk-bin-11.0.9_p11.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc
 EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
-EBUILD openjdk-bin-8.282_p08.ebuild 2480 BLAKE2B 5a6ce67f483d9bc33e2484aed4896397299bb600ea5023412e73b9ec8f5f2d9ae30930d50281c4c5b5f16c2576d8bcdd51078645c2080c1950bedc6068fc49a9 SHA512 2d51980616e575dc8b7b019a77857877c10a387873e7c85fc59d3a503b2fdc670f7177b8bf67807ec78aeead9490d9eed965aa6c24283df26f8cce73e56551cc
+EBUILD openjdk-bin-8.282_p08.ebuild 2984 BLAKE2B f7ee3c47ade97bc482d836ebc8d04d5a76a8888de8846c98ec4f1754d7310ae755c7338ee09b0e4d5eadaf2fb0bb5a379b98dcf3f9930b41e7db37cbfac1f613 SHA512 849748924f899d3d86a6e8ed7bd0e2b287c855cc3e9ca5e83eeb7c788ec86761b2578a21a3385f33557836d631ffa2fab8ab120eb9c3b8c6a18b201238cb0ad4
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild
index 4583d7823353..3eaf868c6d29 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild
@@ -6,8 +6,13 @@ EAPI=6
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
+	local os=linux
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
 		)"
 }
 
@@ -19,29 +24,32 @@ SRC_URI="
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
 "
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
 	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		>=sys-libs/glibc-2.2.5:*
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
 	)"
 
 RESTRICT="preserve-libs splitdebug"
@@ -55,23 +63,36 @@ pkg_pretend() {
 	fi
 }
 
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED%/}/${dest#/}"
 
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
 	fi
 
 	if ! use source ; then
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
index 7bba13d4c195..861deb4537cb 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
@@ -6,8 +6,13 @@ EAPI=6
 inherit eapi7-ver java-vm-2
 
 abi_uri() {
+	local os=linux
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${3-${MY_PV/-/}}.tar.gz
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
 		)"
 }
 
@@ -24,29 +29,32 @@ SRC_URI="
 	$(abi_uri aarch64 arm64 jdk${MY_PV})
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
 RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
 	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	arm? ( dev-libs/libffi-compat:6 )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		>=sys-libs/glibc-2.2.5:*
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		arm? ( dev-libs/libffi-compat:6 )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
 	)
 "
 
@@ -60,6 +68,9 @@ src_unpack() {
 	# 753575
 	if use arm; then
 		mv -v "${S}"* "${S}" || die
+	elif [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
 	fi
 }
 
@@ -69,20 +80,25 @@ src_install() {
 
 	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
 
-	# this does not exist on arm64 hence -f
-	rm -fv jre/lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v jre/lib/*/libjsoundalsa.so* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr sample || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-			{,jre/}bin/policytool bin/appletviewer || die
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# this does not exist on arm64 hence -f
+		rm -fv jre/lib/*/libfreetype.so* || die
+
+		if ! use alsa ; then
+			rm -v jre/lib/*/libjsoundalsa.so* || die
+		fi
+
+		if ! use examples ; then
+			rm -vr sample || die
+		fi
+
+		if use headless-awt ; then
+			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+				{,jre/}bin/policytool bin/appletviewer || die
+		fi
 	fi
 
 	if ! use source ; then
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index c99548631cb4..1a1559d6e521 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
-EBUILD osgi-core-api-5.0.0-r1.ebuild 580 BLAKE2B 0a4938075d4317681763c0527211e81c1974c44fbdbd8b54aea169523a1320890ec75b26f1d707344e1f75a15358c2497df255d692897d337dbaab1e058125f5 SHA512 4f9043052ce2a2508dd630b0e132195b2068055cc8dd1cb481fa5e8c5aaa1047007302f04c153dbae97cd3cf78d4f5e0b1640275ca6e6ffd511aded5299a99cd
+EBUILD osgi-core-api-5.0.0-r1.ebuild 591 BLAKE2B 437dff5358d14e6f8f92fc5b1f37b67a985e34203ca910a8bad45cb0f76c01569f6d1c34c2e61220af7ec827c4d330e9da675c985684fdf41087c381222d6640 SHA512 c7d54fdfea926849023632e34117e6970f18ce8767905bf1139c2028c7c5dae2ad213151c73351e84e52037643af03d2679ce84ebf6ef889de1d038da08f5b0f
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
index b6dbedd21ac1..9ef2442e4438 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.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=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
index f36ae7d9aab6..dabc045872d5 100644
--- a/dev-java/piccolo2d/Manifest
+++ b/dev-java/piccolo2d/Manifest
@@ -1,3 +1,3 @@
 DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
 EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b
-MISC metadata.xml 379 BLAKE2B 91a8e052e0698a62a8596c658229b78e0750cc80e34ce81d3be41c833e106f2e2f0d7c5eb7d148b2674f4e218602b054e2435c52d9c0ce27ef546ad0ff43d9bc SHA512 dd13d25a0d532e7246cdc32b6e058dc9fa3979d4d28e459ecde801b103ca8e40cf9f154208c9ee364379f2f6c6059011269a75d658d68b207e7d013c7d0bdf02
+MISC metadata.xml 379 BLAKE2B 8e4337e2de075e9c1697e3a9497b50f9c3e549ca16bc7ec5e242bf8021e75154d28dedf7a7fc481d2177a8a70e2012ff8547cacea4666bbe173c611cb1892855 SHA512 6411900dad2b5f7e410713dc14fd3d968d28a4c0a8235435e60e67d2ceeb9576681b8fd33efe9c9324a04869c29f73ee69d0469b5a56656eb2e256cc58849fd7
diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml
index f053cea1a4e7..4f70e1c96374 100644
--- a/dev-java/piccolo2d/metadata.xml
+++ b/dev-java/piccolo2d/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index cfe9e69f8c65..6faa5a663a6a 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -7,4 +7,4 @@ EBUILD protobuf-java-3.12.4.ebuild 1478 BLAKE2B 8cdc4e335d0cb6b9e5002fc6ac099c03
 EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c
 EBUILD protobuf-java-3.14.0.ebuild 1478 BLAKE2B eff459444ef91a15f63b6d3cb2f8d1afebf3695e4f98f793f3fc855a5b81d89923af0ea6d7c09928452913239c8234380111c4de3a1387c4ebf51f16d96aab1a SHA512 3b5c168862ed9b7d208ba14515dfcf450c3764a2ee7b562d05bf274ffba0f8c691b8a48821169b75a000c1a165fe2b028ccc0ac0b76b79462b2787edb28e7e5f
 EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293
-MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
+MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index f8086ae85526..f618b52a34c1 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index e338ce511d7d..a4f7c0b8a02b 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -6,5 +6,5 @@ AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737
 DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64
 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
 EBUILD snappy-1.0.3_rc3.ebuild 1451 BLAKE2B 12d41c164386a228231b3483f8dc6024a7430af3f55a4ea34339c7da98d19ce7eb8c57ee7a2171aef7b96e420f86d7d3b29dadfb74ecd9c27b1e054e34308f77 SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271
-EBUILD snappy-1.1.0.1.ebuild 1466 BLAKE2B 4e46b14af58b6ebd415599bce40cb173c2f1452bcdd64c4b36216abe1e2e80a4fd611e28d6073b96a259cc38e49ea4edf52cd811bc733ef56d90bcc6b5c11a9d SHA512 ce574f4a7f8fe94d7bc72206b1330645249c7f538adb573a5a289d39475c4c05f38aeece92004a9dbb586511b2729fcfae977b99567476a5f756c24cab256d55
+EBUILD snappy-1.1.0.1.ebuild 1697 BLAKE2B 303375436532cd1e63fb71b70230f072f7678519b39415e11137cd040ab0562e4fa850c980b0c7c9c343e63ef8aedf1da9311f33ffbecbbd72ba725e79b5bf86 SHA512 3f7c40dd83d8a7205640663a14f8ef31f7944000d8011019690a7c37b4fdb32e6c541139cdae2ac67ba02f666d61c98351cc08aeff6816803bdb3c2f7433b86d
 MISC metadata.xml 319 BLAKE2B aa818743200d9cb65ddafa6f447c385862a603467950a6a71e6aba21f2510add3ab16fe39e11b02848bf97e15eb28827b2705b5288ee21a5b4b158574e10f915 SHA512 c652d81b9f2400efd81da0f61ed764ef80873e16b5e04d6c5689ec7633f34f83065edc2f2a7f7fd0443770e281befb5700c3416ea0aa74c548a85e337a9fed6e
diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
index 60983950c431..443002b9ab82 100644
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-$
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE=""
 
 CDEPEND="dev-java/osgi-core-api:0
@@ -53,7 +53,14 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_doso "${S}"/target/libsnappyjava.so
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id @loader_path/libsnappyjava${jniext} \
+			"${S}"/target/libsnappyjava${jniext}
+	fi
+	java-pkg_doso "${S}"/target/libsnappyjava${jniext}
 	java-pkg_dojar "${S}/target/${PN}.jar"
 
 	use source && java-pkg_dosrc "${S}"/src/main/java/*
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
index ed879b287653..239001a0b178 100644
--- a/dev-java/spec-alpha/Manifest
+++ b/dev-java/spec-alpha/Manifest
@@ -3,4 +3,4 @@ DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7
 DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
 EBUILD spec-alpha-0.1.143.ebuild 869 BLAKE2B d901bd0b70f0312d0e4d581b45d7d6350265200533dd6bf157705aad03ea3878e772a8995d0054cdb928a8ee45d92d2c47c46c2989472e8f7500c641729f649e SHA512 efc9183c36885f20caba13f61514afc0f2b05bb663bb4790c779be15a8c82a8a08b99a64ff30c8a37f673fa1c55dfefa4a267a08adbffe30f0057aaf8483bebf
 EBUILD spec-alpha-0.2.176.ebuild 869 BLAKE2B a67b4f7a48c6ec63f39c474e57734c255be135ce0b400f8e7c958f1dadd7f7a7d46aae1fd4d7d298fb7083fcebecde093f987a6426c0b8975c2b5176530311bd SHA512 ffb2c5f5fae16ca5f18bd439b4087eda56f0c4aabaffbafea253d76e10806790558c573716cba07c29fcf2b6fa03a12c5a46525654e0d96c7346a9a16205a2ba
-MISC metadata.xml 445 BLAKE2B 8dbbf132af2d8ad24de8fc1aeeeeaf381dd5578e9b06c1ebd611b47b754dfb846deb5ccc86538ca672fed41f2fb67dc3f21f61b27a06b1f06055854d427f4fad SHA512 2a09095ee7891155258f300b37cc9707f6cb8f4d002b76cdec22ff2e26b59a25be0a38fe7235cf1fd01322b3388ee8c356cc903733acb0c9b8da113d2b9239ff
+MISC metadata.xml 475 BLAKE2B 990e8c578a8ef2de5631891132aff9a4e1cf481ad51dfdebe13833f2064dd785d07a01b6b8d1dee160146f667df8b27d62adbcb1d30aab5b4959ada49c67287e SHA512 6516536797ad86d28d3f5837506dc9e3bf8b99287b1d984ead967fac98fa9ff555b5ea878de354aec0e5a6c97691eae397a8f13df7371d20cc40ba359fe98112
diff --git a/dev-java/spec-alpha/metadata.xml b/dev-java/spec-alpha/metadata.xml
index d7856d86ee56..be4b4200cdb4 100644
--- a/dev-java/spec-alpha/metadata.xml
+++ b/dev-java/spec-alpha/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>tgbugs@gmail.com</email>
 		<name>Tom Gillespie</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
index 76e689ded088..28b9d62cd37a 100644
--- a/dev-java/spice-jndikit/Manifest
+++ b/dev-java/spice-jndikit/Manifest
@@ -1,3 +1,3 @@
 DIST spice-jndikit-1.4.zip 55185 BLAKE2B 4d5068a3f2e12d287ecd657e2092a2e73e6637f2285dcea58b6d8c820508f21f1ceb508514813b34cf9c1a7536cbc530aba1edf0ca80603b3008e3afa240582a SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501
 EBUILD spice-jndikit-1.4.ebuild 868 BLAKE2B 2ba91fedd394e87c0fe49c7366a7759a4c1095b03fcb50765e99d03ab55aed61b9529ec299df4971d1045a68885dc04e6f73fd332e344c335ecae99ef7b137da SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a
-MISC metadata.xml 553 BLAKE2B d097fce9e744f8edd8d86284f5fc71cd4a987af0db70a475bca9db42c18127fe2bda1e04fb6bfb564483858e4aaf737d917a6deff7917643123996db89119f46 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976
+MISC metadata.xml 553 BLAKE2B eaae2087353a12dd0c5a5570fa3f372ac9f19230e29fc6e0a5952a9cf512c1efa1ee9f3fb50fa962e6cbf42e2b07d4dbb8993ba6e6d261bd02da7499d9b99e9f SHA512 1c2b8767831d4e9fc398c09a3b502911c0c680b4c7e126254ed5abc9b34ae814724de311d45adb58c327e03b5c08b528ba95ceae182f3fc69efd6e476ae44367
diff --git a/dev-java/spice-jndikit/metadata.xml b/dev-java/spice-jndikit/metadata.xml
index 38b4a7041837..18fdb353db5d 100644
--- a/dev-java/spice-jndikit/metadata.xml
+++ b/dev-java/spice-jndikit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index 4f101e4fc4d7..1530519ca74f 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -2,4 +2,4 @@ DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
 EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16
 EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a
-MISC metadata.xml 459 BLAKE2B 33dce90cfd998c8a2c5ae695840604ff6092fe43765f6825af684689d30f69b6cd806b3b3ddf591c587bd397426dc8186449597bcdb9e14052ab029de9cb7ecb SHA512 ba6627622238e8d5ebfac52de63029eee448edd37a4819cc08677abd2f04601be6f29943785ff5abb16e602e919d04ec15427de0b371962cf03e1d35da6315d9
+MISC metadata.xml 459 BLAKE2B 40942c76285fa089dd6908e56dc8a44b0dbfdd2d68fe4724d3abb3c033521aae35e7ca2f3defe33cc13d7178331761ad2d278740eae5e7706d00d76fc640621f SHA512 53ceb5cc03ae00c6b8633353d7851a3a3faaa2436a6e612c8d9424dd88a04c6052bbc108f8a94dfb16285ce28cd5d6e1260b619903bf6ebff7cb2e5ca1d89e8d
diff --git a/dev-java/swingx-ws/metadata.xml b/dev-java/swingx-ws/metadata.xml
index 89a4387936f7..4a2709478a9d 100644
--- a/dev-java/swingx-ws/metadata.xml
+++ b/dev-java/swingx-ws/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index f22ea33ad6cd..354a7316d39b 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
 EBUILD testng-6.9.10.ebuild 1750 BLAKE2B d371f64cb0d0df974e35adb987fc41a0c2d916b7a188f20b01255477243bdcbb98bcadbba373010df1d40a0cce1f2aad9e8b3d3ba2df0e53633d38d9607ec3ef SHA512 16a574302dbf241ba9a195f141e6626ddde5362a7ea3a025ce8f4721b7d485f14dac23a0c616a1034d353ef8399c26ac7a92a71f07ff21a5816df37bafa9d8ae
-MISC metadata.xml 314 BLAKE2B 827119483a30d9ad2a35c20ad9149f941326fe6eb74c0a10401bf8b96ae07b233fc4177f87b1fae02c6d766304ff3002d70c8b9aaa9ff87f9ae951793e191d6d SHA512 dc86504b0f3aa0bcd4adf4470e7391a05eb5cead186f79b0fc35ee3dd57ca1c927454e4150463376ca37ba5396e9f75328bdb8969613457a9ddadbd5ab81cf98
+MISC metadata.xml 314 BLAKE2B 7750c36abcf989f704db0760b3e48d331329361fc0c6053966c4e658286b0762a78d3cf13d60c711cfeeb818ce380b1da88b95930c485bbe857a5748ac0e73a7 SHA512 3424de693fdbf8c629df163e74c075446f93f3f73129baec49417040b5ad89acbd70ac9272e4e1065aaaf7a6f3a44a6e15d000860e6f97e2467286fb2df419b5
diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml
index 741d9407384d..40124b35b074 100644
--- a/dev-java/testng/metadata.xml
+++ b/dev-java/testng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 691386ff2a85..9eda0af5343d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,6 +4,7 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e
 AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f
 AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
 DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
+DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -15,16 +16,17 @@ DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379b
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
 DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
 DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
-EBUILD tomcat-servlet-api-10.0.2.ebuild 3165 BLAKE2B cf4aa92c2b241461c134a5c77349dc03c20e64d3eb3ab30ca89841a1ecfa48346e5295bf6485ef169121e2d714fc290e8fa108fec4448702ba9894285b649215 SHA512 4b26edaa5ef0802a210a52c8f43e363cce30d5a2746cf241e79de7ba62bad52b412ab9b8913895a190d1a26c223f69412d23e5bd8777fb26c684ab028a041c8f
+EBUILD tomcat-servlet-api-10.0.2.ebuild 3164 BLAKE2B b3710592d4aba3023f425618d646593736af882f7f36791f8c0cf48e69c834b5acf4cb7be6bc16ab353533ed93cd0a72c93a9aca3e3b8a5b3cce74a1a2259c58 SHA512 bd50c82827a648b0fef4be3205405b49ba415dfb2f9a117701b2061a9d8ab2d263b613b97dcfc03561cb027f99c6c8ad7cda7d40f9cdf0e251e41efa2a589651
+EBUILD tomcat-servlet-api-10.0.4.ebuild 3173 BLAKE2B 29212c3e8101cf949bb6d5a111e7a9b1525f38d9c8eb103d5e2f4971456159d3f0f3de8908b9adbf831ad7e672b95397783a988d81297fa98da18f7313440938 SHA512 2e532ae99f36940a7a228798c4f7f0e66dbbb9d05793bbbb68117d16c74809da0b842d2648703aa0ec1d599b46a4d91a1411a76276f8885137b8dca988ebaf31
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
-EBUILD tomcat-servlet-api-7.0.108.ebuild 2996 BLAKE2B bc663cdfda29e16b0d0bff18bb6a6e4f8f3f5c3deb7a7a9a134cce09115c6f57606061e5238f279d99a5476f7fb9388d1280ad3f0e2b1844034dee186ed0bd27 SHA512 d78ba594fc8f2c65c3e1ef8856a1269bf282e3c33ad260941a2d7f671b68752456bcacddc08d4cde175f9db12fc839de68d79f559f00a349edff50eae1b1bf8b
+EBUILD tomcat-servlet-api-7.0.108.ebuild 2995 BLAKE2B 35de7330c7750162de0e4f81f08c4536f4bec60122c3f69b5526b104a412573c775c34376698a384a10e5367df947d9cbb708a2522e899a7dd177666953a4917 SHA512 e8c41d609804d30dbe25aa61df632ab0c3031d28eadd36ed75d6b0e8438cfd3c96f269a0f3e9e0d0e7a4d1de26f1304fce9282509c751eed222c13e1f772d43d
 EBUILD tomcat-servlet-api-8.5.61.ebuild 3006 BLAKE2B 5a5ace1a95a190f6de2b56f42eaa80a0c35e4bec8905143350cf0f98af9e1d5d110622579b1164ea3f1af65581f06f886fa49d589e81f676694ed67178f613f2 SHA512 73d09c2d4aac971b1f00f9d4f6028d19270c343dcd0e4048585c2addd33b781bae4be3a9376739763fee8432479a4a1ad85a8e63c46dcf8b1b17b22ee872456c
-EBUILD tomcat-servlet-api-8.5.63.ebuild 3008 BLAKE2B 8f01f33afc915191bdeb51e7b3989b7486e91e280e373dc06f80c228c1732ab6ccedad59f456425bfaf5b379d8afbb9cc0ae10241d874d5e3f67baeeed1dd20b SHA512 817cab543d860a9906a6b61e6dfe102da11beeda46c324d6ffa4711e5a17921185c3566f8da832a8f0d409b019946ab9c395a2ad6c7a717a6e9eb3fce22a91f4
+EBUILD tomcat-servlet-api-8.5.63.ebuild 3007 BLAKE2B fde18d95a829f850ea8bb1eef772b639e447d114391286e55c54fa1e28947065b97098fab8e2289dd4e105d5acc812578acd7338bdeab872018dc5d98aaadce4 SHA512 6d0ce135abb51bcea4cbe5f6777e9a192a2d7c488315f4346ae52d76cb1ade204bc173edbd20625dcd80db6444f04d804315f1311ba156d4b3c55250aada4bc0
 EBUILD tomcat-servlet-api-8.5.64.ebuild 3013 BLAKE2B eaafab16ad5d3abd8548472444dde131df8aa69d8c76e5791fe9411649e5e0d02f6c2acfceedb46a437b9f6751b881aac947cec86df75d585bcba767f937a659 SHA512 59cfd4b848df3ca159c9cedb031d15fb9d5b0f28e9d2c8e7d6e2244ff0d4a70f2d39033bf49857ab4cd55406bca5ecc6de82d9c50e82acd6a04ff4709fbe0a44
 EBUILD tomcat-servlet-api-9.0.41.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f
-EBUILD tomcat-servlet-api-9.0.43.ebuild 3174 BLAKE2B 1e0e628d53d7747c3882523cb73de01000800bdf16e2daed89c769047935d49d35ca49fba0ea2aa071e232193507a2bbab0e1b7a05cca3a4b44ddd3df6c9c9dc SHA512 7506cd8f698ee205dfa186a5e0715eb3844fe71f7afe4f56e51c3b0695f8af2285e0d7cbf157e7bdec81ee96bae2d9aae1218ee940579e82109007945d2648c3
+EBUILD tomcat-servlet-api-9.0.43.ebuild 3173 BLAKE2B ce7f0f3452899ea4354dbea3af3844c22c3e8f4e9b710920b6f77f3a9aef403b232451fbb12721027d109d19030fd07321e1edee4981d7edb56ad18ad1209433 SHA512 c1e97c19fbf7ff51a5e1c0c619e0b6d6d4436baa23f12803ca257e13f6e583342b91c3866595a1a386b0890755c06d5f5d0bec900ea4c63fff853e2d5c9e4489
 EBUILD tomcat-servlet-api-9.0.44.ebuild 3178 BLAKE2B 340842e202037af6b9df88fb08a73e7aaf9c52e1ddaab5034aa5611f70df1d8aa5213eb1d783c38fce546dcf3fb6658c224342a4b00310b042b6fac5232e4d37 SHA512 63f9e79717f395a40ab5d9ea9429273ec902ec1866c43551099095298e1a8c4d0e603dc61bc7ea914ad1957d8a794a52826ef23ea6376dfbdadf777dbbd39bca
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
index 5c22f78e4c33..b8fec495a250 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.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-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
new file mode 100644
index 000000000000..30dd1169f097
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+	"${FILESDIR}/${PN}-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
index cdb2d22d435e..f6011174998b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
index 0209b9ea50cd..b6efba166758 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild
index 6939efb958e6..8b077fcce91c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.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 ~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/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index bd63bf09f41e..3a46c9132ee7 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,3 +1,4 @@
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
+EBUILD xalan-serializer-2.7.2-r1.ebuild 1151 BLAKE2B c3b96ea77ac1bc0196de1615b16d9ac5ae404d56a6cc6d9238ea39a430e634e7c61346474a8dd08fc5fe10eaa76042c7bc7a442292c5b71d4242ce5117f9758b SHA512 e2ce9eeff54ba0f9d445a2478e7315bea4b4f0220840ecc5e9e4815f86652ccdf16555f87d261087bc6cf5d8be1456fef31d67cd871a3881f0a2396f64dc0aef
 EBUILD xalan-serializer-2.7.2.ebuild 1172 BLAKE2B 0363376283dc843270c2aa5727a416bdf630fe32a1479d1f95da735a869ea3630cca1d09e03f7cebf905fa0fbcd692e51e57713e85214943a3450b0581f383bc SHA512 f2a5960b5d0d9e8f59286f96d167d40ba932a6aaccb88b48bd2eee14f0223c3b59dc7deada3b8b23b2a5ee3975c6130810d72d24c590de82f47e884ab8cd8d84
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..1f6ae506e46a
--- /dev/null
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="$(ver_rs 1- '_')"
+MY_P="xalan-j_${MY_PV}"
+
+DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces"
+HOMEPAGE="https://xalan.apache.org/"
+SRC_URI="mirror://apache/xalan/xalan-j/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# kill all non-serializer sources to ease javadocs and dosrc
+	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
+
+	# remove bundled jars
+	find -name "*.jar" -delete || die
+	rm src/*.tar.gz || die
+
+	# move resources elsewhere
+	mkdir -p resources/org/apache/xml/serializer || die
+	mv src/org/apache/xml/serializer/*.properties resources/org/apache/xml/serializer/ || die
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b307ae5383af..8d457eab42d1 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f64bcf7cfba9..f34ed6d8c8e1 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -10,5 +10,5 @@ DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53
 EBUILD R-3.4.1.ebuild 6227 BLAKE2B c9c50a779452d2689119c1de9fd9b6b14dd915fb6ee263c655e998a0a690fe98d1a68f138ef82bf6e70b3ca58ecb02a9f8638a1a7b0f95fe474c37efb78be492 SHA512 b3d1e0f0a92c9f31c8a091736c507f0618ed0a5534b13905017715fc7ea114310a03baf963e0cc961a49cc0fc34e70d46c10eb886d170a74e462bace3465b702
 EBUILD R-3.6.3-r1.ebuild 7177 BLAKE2B 81e09b4946c208068077008d711858f49b799245ef2097b0e3c984b2261d79fa707be0d892991bc8ce0c3f5bf3c592c8e81ff4492a97f2da41ca903d4ca67351 SHA512 f1a41aae1e951fd48af91b92e76efb569d0cc4d1d5f7d34d010d5882e90a0bdc3b26997c22fa8f1725d739fde61cf189f5032c15a4b6be913958b597727b9ad8
 EBUILD R-4.0.2.ebuild 7331 BLAKE2B f170e5884f52ca8f1fa7a53c6a37487c35331b1464da87e2371ad73989870838ab6a2f1acc3d2e59b7e0cbbb48ebb42954df7aec2062407f6026276e0bd90cbf SHA512 d1bd84790276a6a8804e29373c534b75ed41bd4b2e0084aae990016e8d8918e58612a777aad246a44769b97515c6f5a1afb18ba7e2b13db782c46fadb130b389
-EBUILD R-4.0.4.ebuild 7315 BLAKE2B 77445afa767b02617d92ad61c3c8af84e9a4eb3715579228129c254341382e08b474dae18b819bfe1b559f0e3a48e09a8bde653a16106047a10237c43ed1bb95 SHA512 3c8bbd24aca4985049f7bb6c13dddf22e0eb454658bbc7bd973920a802a35a7f180ba91792a5ca42f72887181d878647a60556d0d64611bd29eef241a3fab225
+EBUILD R-4.0.4.ebuild 7314 BLAKE2B bb5cae73a12cf63b0b6d4bb6171fd04217a134671dc86d674d55d3f0c7c920597fd339cbb3db20f24fc1ed03849bc06ecc156c3382e393e26ac2d005caa90a10 SHA512 11bb80ce27c047394a6e4130507ce8a927c091a95fb371889b33ed9af055c6baaa9bd2fcbd3c7adea29cb2a815978e3b2ddfe45d885f3eb4cd5921eb3f3af885
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-4.0.4.ebuild b/dev-lang/R/R-4.0.4.ebuild
index 560e83d01f72..71c2eb33b3f1 100644
--- a/dev-lang/R/R-4.0.4.ebuild
+++ b/dev-lang/R/R-4.0.4.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/crystal/Manifest b/dev-lang/crystal/Manifest
index c27487d6ee42..ca9625689446 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -9,4 +9,4 @@ DIST crystal-0.36.1-1-linux-i686.tar.gz 30873747 BLAKE2B 43cde4b61d2947012e860df
 DIST crystal-0.36.1-1-linux-x86_64.tar.gz 28360836 BLAKE2B ee9fef20c252ae0efbaafae3426b384318cd141669ce929f723dfa9e6fd9485961c46c948a3aae2fcb2780b92b759fb74e0a4aeec45e198ee9541b0a959072cd SHA512 12389aee0bf863606a620e9e5a1600081aef3be5eef091f592d000f00e9925cbd36cc2e55485c4d295b3a2fcde033425eb2b225a92fd2b49b2e3f18b2b38510f
 DIST crystal-0.36.1.tar.gz 2413747 BLAKE2B 19b78217a37394b163859a536fddcd93e201209dae55713743a459414a48eae38458c28fa17e1ac6e8d361ccdc498a23026ee83c7c2a744f9d51c55bd6e5f0d8 SHA512 86ce295aed0cb601820c727615fffe6816bee0e98e5d91c912f43354448d59f449a6ffb895f5914b3e6564f72f35a50880cec4513826068a2e3e470b4f06048b
 EBUILD crystal-0.36.1.ebuild 3078 BLAKE2B 6eab0ead27ef8d8786f0bc6267817c9cbdc31178074013c3d5842df1bfe7f2bfdd30c95c459bea12b55720abb654c3d237add40ee74b69e0ae1045c2cc8dc3bc SHA512 b0cf132093890c200190248529c44b217a7aed694e47597d503767774f8565e60cc6c831d1d738a34c9b460118ea5c51bfab2c94d0efd587b79c4e051acf2618
-MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02
+MISC metadata.xml 994 BLAKE2B a4e4884456baf95cbfd22e489dfeeddb038230a9f4a0c609e89b1f154fb68cb8ae388a0169741359dc4f2bfc7d1d3e6fe75e70bde39ef4a8c1d309024862edfb SHA512 672eb799dfa83b2abc52222c3bbf448148b3d480f21ebc6eba18e2ffbc5fa2d4dd4d3cd6a35df8a6247d57549d1fbbcbbfd0518b71aae1ea875f8e20ccff94e2
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 76b2f7772585..372dd996e6ec 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -30,4 +30,3 @@
 		<remote-id type="github">manastech/crystal</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 7caba4d78245..094c2e0fa045 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -4,6 +4,8 @@ AUX elixir-1.11.2-mksh.patch 2058 BLAKE2B 45e14921fc59f5707ee9bc2aaebea5f090a599
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
 DIST elixir-1.11.3.tar.gz 2394406 BLAKE2B 066e11651265d63c713809f1968b7dc7faf70e8254ef0aec1978a3db0f92da6bb894e882a1a6c1ba8da13d234c91dc84d2d750b0e044e4cd8706986ec7b2f382 SHA512 4962bb9fcf5f4190a8da22a3e42df5b4e521d73771f6a067edb482b911b0f9fbd2883841d06d94ae4ad6b1db2f61f691e5de4c118c722a16f95830c67ce3e45b
+DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0372bd09e8c0a357a24bcca9a06350973f1453f482d3854a48712471c55389c3bd530df46a19c20a359376b779d SHA512 5dc940a31a31ae1c1537f874c15e58311cc0b0452f61e923bdfde0a5cfef3d8003eb3e85be320eb0acfb7bc0c0c0dc8ac965dec6727257c244048268fbf38ceb
 EBUILD elixir-1.10.4.ebuild 883 BLAKE2B c8945f6c84ce2ba4ef99b42f5f0f3c262cfb6d743cd418f66113cab8a9a90caf1ddc71441d96b3755e9025974688909d8306b63ded24d871733d263c54df1d56 SHA512 a3581664d0fe5c49bd7c4ed2b6f2fba7c4b402944daf7c79e79acbd7ffbb463c17e559d961f7abd3c54c5ca5e6d23520e379a5712d7d232439b5c878291cb3d7
 EBUILD elixir-1.11.3.ebuild 922 BLAKE2B 718117a8aee4294e70930d45d6b39d6522026c48165b9af54eae4b612458509e456586e8c6a256175ed4e66a6e36293d22d65d69b1fb40ec28efb6ee1b511fbf SHA512 e77cad093155fbcbab5247c18c4c45db407df167c296d9587c19826d303c0e38f431bb4c3ea61537dbfd0c211d4917ce08a38c6f6a2c7fb1c6040c0e279c9b8a
-MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
+EBUILD elixir-1.11.4.ebuild 925 BLAKE2B b0dc8a5e279524bf5683c635558992fb91e7dc943c6991601537b2273bac0b0a03b78618198bfbd4d8c40d55ca3e385bcac9c375d6a63dfd26af5c2530ca9441 SHA512 07c8f268f96f3fdaec2ae82762475fa1a94e4d5250786b2cbdb4ee5991d6486fead55e9d6d2c70aa11ed494e79c0720b4da65f79fe53533b9d22fefc971b511b
+MISC metadata.xml 820 BLAKE2B 7fd55cc9f7450d46060069909506fb74e93234ccd319b5f5b428580fd4f55c59c2ada78770ae744d784838574d87522d3e94f101eba06b5a64ebcb513db4eef3 SHA512 11300d8d6d6cbb73b55d4dfb44d04fc087867bab1fc3fcb0564473d911844d3be148170c03a9247c6a407d8de88442ca6017c00177d93be46b37166d3ba42593
diff --git a/dev-lang/elixir/elixir-1.11.4.ebuild b/dev-lang/elixir/elixir-1.11.4.ebuild
new file mode 100644
index 000000000000..4c9e14b12b16
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.11.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-lang/erlang-21:0=[ssl]
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/elixir/metadata.xml b/dev-lang/elixir/metadata.xml
index fbe86b3bebe7..3220cf329e6c 100644
--- a/dev-lang/elixir/metadata.xml
+++ b/dev-lang/elixir/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>styx.mp@gmail.com</email>
 		<name>Mikhail</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index beae406370c1..58c82807ae25 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -16,4 +16,4 @@ DIST erlang_doc_man_23.2.tar.gz 1386417 BLAKE2B 91fb2646461330c2f3793e7819e4c77b
 EBUILD erlang-23.0.4.ebuild 4563 BLAKE2B d144bc5d0c8f802d720fd36a53663692f8e335f766ced3c9bfab0c9dc5086c875df2b6cb42fb840304a659f203c70ec150fffea072d9e04dc5e151a55325c067 SHA512 a16aa96dafb7729c137e06c5d4c654965437a80becd9a5913d33ced734063e0947d61c2a2672e1ef6fff8dbec14b9a736e8d4b94a839a7da4e8add656645269e
 EBUILD erlang-23.2.3.ebuild 4563 BLAKE2B 32e12007a6f1414bf47bf4ecc4ba714c5f6ed8b1845a410e49b8ae796b9c349cdf4216d97fb93779f0104c83bb743b6359b1313d1689d0c9cae4a11fe7bb7333 SHA512 64ea869b959a0c8cc2b179ee5f817d773db388f3a30c73dddfeab0cc92ef5aa7b19e09c56d64be77a14ec568a250883495a667fc884bed9019901d784e9b7adc
 EBUILD erlang-23.2.7.ebuild 4568 BLAKE2B afa013bfe43d1c6c8a9853f4ffaa3ce26095d5eba4dba1383f56ac0378fe1f3d73f2cfbfdb17df4c689764eaedcb349d65ea2b99aac67ff452f14a3d2d17be44 SHA512 7e8a5cb7c184d4e0ae500593764f6fbd9866e0ffc22c33359d0b2911b0b98a546da0998fb0aba17534e97ddb7ebc981f2e470c542378b0def45897383d26bd8a
-MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2
+MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 7e9a773063d1..580f0687c1a7 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -5,11 +5,11 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 0487d4a8598a..5022fea64335 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -4,4 +4,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-r1.ebuild 1313 BLAKE2B 783f8030fb856719b5cac67216f21a6c3517e7b7c20772ec5fb6486033f6eb3eb6a3f313ed29ef38dde2f6dfc8bdc1da1239dddaeb98d057153947a676904654 SHA512 c970bfa352e8ca1ea1b46c0c5ff8bc3397577668616668b348f6d09ad99050210e26d9e06f1fc5aec8d56d79012cf8aab73fd28e73fb875fe6e366dd480f41ac
-MISC metadata.xml 326 BLAKE2B 45cd0a4ebaa69033fd5844d0c5b775ae70129eeafb2074faa26e6f5267f959cc21fccead3e55b7624092447b4af42b2adfc4a0815b0b2a4f5f04b822877e1095 SHA512 23c89da79edf3a0886758d0b3c1fd1c45de90b3eddae943614e25e8188891e2f097e03a3beaae36ef0be916fb8ce24f9cec8d5060664929b3d55f910d651dac4
+MISC metadata.xml 326 BLAKE2B 6da20ce2a24c972471a238851ab8507c86dbadeb31012151be42584e9d57bebdce2756f559de384330dc046643f488d5c1113a14ee062c3876af781ec06bd0de SHA512 ddc827fdf3ad56400315226a9a396689925918c60a9bfec1c3f927a3408b16da0c2df51e987fd8943e5575446f98fe7a83547fa168fc6863f7bbff0bc5272dae
diff --git a/dev-lang/gforth/metadata.xml b/dev-lang/gforth/metadata.xml
index 03e8585377c7..c14f5a586840 100644
--- a/dev-lang/gforth/metadata.xml
+++ b/dev-lang/gforth/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<use>
-		<flag name='check'>Enable build-time sanity check.</flag>
+		<flag name="check">Enable build-time sanity check.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index d0e41fbda30d..df45f4d6a9fb 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,152 +1,28 @@
 AUX ghc-7.0.4-CHOST-prefix.patch 276 BLAKE2B 77c706d291928a229edad6bcde37786b2c11cf52f42b22f44d3bbb7cfe12f83b8725cae020f95994e0f12022989b125d1f1e6f43ad0cc6698452264b8634651c SHA512 9d5d30b95c0467bb77f320c82458be5eaace5bbd77684725b9f3fd70d9640accdd771e36aa957c66f9bfb01e45088d32a5f811444b472058574ccbf89e10efbb
-AUX ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch 2648 BLAKE2B 82145d17ff3f7535b80b76d98a30355895d1a43ab9cd5cab1606f989764f77b5b00d8d098ad327bfb6f3318ea8d188fcd55bcba15789234fceb0de5c132e9cbc SHA512 ea2c9cd8fde754803950e29b2eea113227ca5504c58392847090e13640bdfa6b39ef714eff985947aa27e66c2506ef2a2867696f68a7ff34418a7fbf49765d48
-AUX ghc-7.10.3-hardfloat.patch 747 BLAKE2B e2a328372ddd113752400957aa697d171b3367693c3d098c9b5b8b02b9e1ef1cc0cb86c2af4a0385a142791b4e7efbf4c7d64835f7e296a03abff2fccc9e9ef6 SHA512 a9a186ff62236d63b4b841bcfb1da1a902b3f300eb7d768c5316b5d636190d58fc71177f2d1670df261d0b681b104621f98cfdd76b30a0fb6917525874759264
-AUX ghc-7.10.3-relnotes.patch 1584 BLAKE2B e247668b1fb2a5b8ff69b00f31b8b642a7ba47cba0cacf9ac254b08cd736ee0d5276e77f64665ce37d8d85250c7cf4cc9924c86e21b35a3abfffded45b72ae9b SHA512 20d61d9f73bd0efa39c920897bdb18b69cff453f5ab24193aa3f7fafa70a9aa346ab4402604f81471f989c2401ca28d901fb85b8862577790559a35cfa3d3f05
-AUX ghc-7.6.3-preserve-inplace-xattr.patch 495 BLAKE2B f9f32485af27b76d62466bc03a17826e18efa40a87858a46b41d4f094e1c0989d2773ddd92e206d4285ae1791bf00daaabd4f19dedcd80610db1127b440394fd SHA512 98504e3b72446607deb520521c4abdd15e41e4ff69ad64e2ad13faca396bd7c7784b92c2bc7b5d8190668da480d5b1dd886f5e47e2e192d76b7fbbd58a42d44b
-AUX ghc-7.8.1_rc1-libbfd.patch 2771 BLAKE2B 8730551d3900012d04eafed69894740f603618ae59bef59e71194efb5b1e417799647c4aa1cda4cea9041504d116d74085bb99b0e9f0c543d2429529e030faca SHA512 e232596342675769c6bf97686aff0fa7a8991e1edd3bf607068482cd0d0c9f9a9500e5b15f176a2025732474c9e547c0bae603d373c81b374c96787d46bbfa4a
-AUX ghc-7.8.2-cgen-constify.patch 1173 BLAKE2B f61bef77e23e47becb8b5f99e8cfdb5f4e8858787da21b62215f5538c02d5c8d92bf58d29b080468c81d8b732dafa34969e5138df7c113e2e805c7b4e4ccdb1f SHA512 3e1bca7d7f9062d231c45a6765485291871df833da31b0a5573bb04639791c554dd5c0d8fe33bab05455fe06d3f36fe81dd1db6d3819c739284a3af5c4ec8fb0
-AUX ghc-7.8.3-linker-warn.patch 1317 BLAKE2B 399c117a216cbeff9d863893ef821b965d91428e55b447e72469ccc6940d0eccd4bca33f2ceaaea096de23789e74ca7ffe38a5fdd08005bbcc016c06db4ec8c2 SHA512 3b0ece4a6536ef43f15e97e723d036401dcf41d47c15e29dd8fe30c9f1563894102922617982db7b6c7cf3ed8aea64458b540ef92ffe690ff72994b1246834c9
-AUX ghc-7.8.3-pic-sparc.patch 1007 BLAKE2B 64a1214b1df6cc2d894e898dc21983a3df17da95f6ace2b7dfb2469ca62bf10b548a65c6242bd97e63a70fe7ae6e921e3e5828b664fa1ce04d10323fd8a4dfa6 SHA512 d3d81142a1e606c85c22127e2fbb26ceaeb2116435bf0bbc3743273577f04991e28c38a375a78b3f633a9b0e25f10951146d1f322e0ad7972089c1e5d977d16b
-AUX ghc-7.8.3-ppc32-fPIC.patch 14549 BLAKE2B 05811de54b2896c75456a0f61c64325fd347ccd3a47f86d7e9697d04266f11af0b3f3b8081b39318e8d90d76e3f763ad292adeb0114d8b7bf60157b5a90b13a1 SHA512 aa6f13e04a52e7f25db456c02031b63c01b71adf41262361b36ca97aec18965f618ebba73494b4283ad3c0224f15d5c80dbd43076553e604d86a07baf7fa86db
 AUX ghc-7.8.3-prim-lm.patch 444 BLAKE2B a930bb9657441a48941debf79711e06223c5680df0f60d7d972e0150950109bf8f8a99c35c7dbcda21172dddcb15d8a379085813e44647583e3888f27f597568 SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389
-AUX ghc-7.8.4-gold.patch 1025 BLAKE2B f62a45f9761690a685217654e45c037c63e2cf0ae297f14f3c70c038c4b02e048899b1a787fedfd30fa4e41839f729d20c2442ec3410fb59508da57222ac19fd SHA512 3087084d8b6a202496fc7ac71fadde06f7d1622d0e3f44f1b52fd04f1451d690f54b6bd8ee0da85663d252c6110340402bd1864f746117e59ce7b02e0247ec94
-AUX ghc-7.8.4-ia64-CLOSUREs.patch 2243 BLAKE2B 7bfdd4f42917a7b856ce18b85a2131bc0b566151fda16a77412331f38a4465efa080f6aa3eb52cfe12fb9c2c3fdefc1fe4a533fa5b339f4f22ac70c2a4a404b1 SHA512 9981d13f294fe0a28d1cabfd4db98bfb18110c6adb390f509667e3166a931c7d9f7b4b0079dfb1a22c174556944fef62f0e67ec855a9c3bccc5b54b0d0952c09
-AUX ghc-8.0.1-limit-jN.patch 1896 BLAKE2B 3acabcf982c0520d628d502cf2ddc01d6fda8ead7341d8f0341a309b4cc314d01b4e9237afe810b5265b7a952c847e605dbc3fb2e35d76a35ec2c832cc7653f3 SHA512 5eb69e0d5f87e326da82f018f0466a62e307f3acec47d991c7735ddf828c98c836dbff5d8164a4dfd08829b36a9d573828b9553fe89d65f5ac6be6c0190a110a
-AUX ghc-8.0.1-par-g0-on-A32.patch 2276 BLAKE2B da7f6dd5d68e911886448afe04e3d0da6cddbdae686e040e8b060ade871075b87e464cf350f1272d33a7ee16e8e73cfa2d7f4c64ab7540980c0283b898817602 SHA512 0aab32a6f289c2a4e83bea2479c04cbd226f3399b5cb4a8a596ed756769a1b29bbbad261d7006c28ab56faa48c1c02e9e52cd35a7bba56ccc87f49ac1d17b0a5
-AUX ghc-8.0.1-ww-args-limit.patch 5212 BLAKE2B 1079855da7599a83d6e950eb1caf40da4bbb5b856746dc7d2e2e50651071e3acca45773cb0f1db35a6c7c9657ffd40c911ae4c1085b9e33ba4ab815d1773a8bb SHA512 5b3e34f52406649dca1cb3079565cfd068872387956dda296902c2e1ae8a092be0e70a1fc1d96f0e578fef0b82ff48b655d35a1e21911484f04d34809b295428
-AUX ghc-8.0.1_rc1-cgen-constify.patch 1185 BLAKE2B 3fc5807f31cbb5c30ec5782d27539987195bd83a6be28dc510568f0cc2d4d328cada1f111838e1ac79a3790ee197a4fb5cc41c040fbde66ca279c1fad01f9f5c SHA512 338c887a643b31ce6df2cbc28df03d1b98f48ae6b66afd0440cde7fafdc8ee51520f18c7f026645c3c995f106f78f451733b80abcdf8d4e4c3e9fcbcea597394
-AUX ghc-8.0.2-O2-unreg.patch 1203 BLAKE2B fd0ec53968fec2f4415a367c729b9b69e15f6e2c76f8ec39d6b3de24fdb0de0b9c87559b04f8b1031a05fee8a653c5f0b2ec09064f43eb9a6afaa8cf4f179e8d SHA512 0d0252bb7c49cce2a38fb81673e6f6a6aad16728f66be6287f5a765064ebe5e5fa43f30f247fecaadc7fdd07af416522e5eb28656b3220ff3832ef8164c94019
-AUX ghc-8.0.2-binutils-2.30.patch 2115 BLAKE2B 5affd1954283773ab1f4717b5cc735f864db9ea3eff3f859cff5548b059ef00e66230795aed8c3866f8b839d74e24bc5d767bd73bb928bf19c1bcd17acdfde5c SHA512 d7542cbf8ad2ccbf6a3b5f50125c98521f10872e319043eb048c06ffc416c6c835772190d58f6a09d10e55942168ca9588f3f1bb1cb835e1c1993a44403329a4
-AUX ghc-8.0.2-libffi-alpha.patch 2133 BLAKE2B 596410d5bead5a3c5f1f4a1e33a767bf2ade92204e469652e3ce005dd275a54e0e084799af2967529008654f4c45148b955e5e0b299a48cd5e78cf1c209e3d7c SHA512 77964b82be47219d709ed4b79ac255c4762986decadef2d65d6643cb2d1b6cb0f3210cce1bd46bc16b6e6c51a4aabc73c5bc5e1bdaa8797a5f23033194f91a4a
 AUX ghc-8.0.2-no-relax-everywhere.patch 766 BLAKE2B 76ca925d56a9d2961cd342971ef8fb0165158d707f0089f3726560511e57ee5c08adeaf996595378d1cef3ec7b59ddf1df06d0255bf20da51c5b26e817f4057b SHA512 b729ddc27bbf089324f0b4d7229925226b59c0047cec0c0230e022fb8554389373e309e93a108f0aaa155fd9ff6957a7d41cdd35a90c6ca59b216381ff21483b
-AUX ghc-8.0.2_rc2-old-sphinx.patch 434 BLAKE2B ede17cd4e5848b452edeaa3b429a7485f324cf1c9133098c7d9f84a22816eedeaf55143fea082e514b5e987ca40f65b68a476060e0c18d19bb5f8b5b993fda92 SHA512 fc8fd8d40c70a77a3aecfbdb0993bee9ef1582402b7220ed3066e1c6d4bc480c5b569cab44b58b3c54d1e68f506dc5b86ff87518d744a5a846d4de6cb1093db2
 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489
-AUX ghc-8.10.1-no-relax-everywhere.patch 910 BLAKE2B 3afdc92313cb48a00698b8c4cc8af822b843dd107d546a95d598fa0d7e7fc4507e3e7dc8ab06faaafcb0cd24770df28826987088898a6cc2d1b914fc7576ec75 SHA512 21f1c64ed75c5b062a00f48b7439753aab15083c583a1cbea76b63398873ac14f52a45fe62e4cf3751c5dbb623e75a4f96c416f5e8f7a1f7822798b21cadcbb1
-AUX ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch 13879 BLAKE2B 6e36243742c4b4bdd900bd9f049f06c480e1582154f2dbc0071c1ba07e8e4dc4b9e37c3425840f35fee6cfe290036b6ac12493da574efa65260589ce63aa28f2 SHA512 3b14656faa2ba0416f01693fae43f856032e6607f1e27b22bf86e39f56e31dd06878d340fb4e7bf297af59fe6f3d2f32458e49efdc18191c2b887ac47ebf3d8e
 AUX ghc-8.10.3-C99-typo-ac270.patch 348 BLAKE2B 8d23baffa0ae781db4610ee78fea812ebc25450c94e942d8008c591cca78c6072c24b042e7a9dab08ae5213ed4ba931ff932ad4685fc029fc004039494a70c7f SHA512 9e224c6863b5f0f0deb032d4554dd41f2396a8cbc373b860294ba76feaf1abe7594711ac02e9a06356c024df8d6fc6a7a064ca428eaa1e4e6209b3a29d4317fb
 AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c
-AUX ghc-8.2.1_rc1-cgen-constify.patch 14371 BLAKE2B 96f9607cf857bb113b475d173a62998f2b0424f09f14c20ae3cab8497a25ab2df7523850f46e3b2867dcd75a499b3487345376b7cdd8e6f4a5e8008e160cf3d0 SHA512 8715c2f7c497eeefffd13b578ff718f36ec22bfe397501f685db0c781c614ebaa1178a9ca7550a722876d1cf9ace39aaa44493ecb934a828fa5010471672acfa
-AUX ghc-8.2.1_rc1-ghci-cross.patch 2828 BLAKE2B 89776c87d4ca8c0b74f0d7ef11680d2cea217774389bf297df1a61f9d95ea515b5f9d44387eac7715fec59d9c91e91bd06215c851c94f091c05b03f84d0b8699 SHA512 55e8f2e6bf69ff26976005e0b89c400df9facda5eb974f7340af89625361adce48371616a5d292dafbd4d98cbfbc0b656d36749f2e16918b275a0469ed88cea2
 AUX ghc-8.2.1_rc1-hp2ps-cross.patch 3865 BLAKE2B d68b1e15c091047d086be780dc0bb5ce2a1b713244ee240ae045052ccac947baf6a5bdea8cad50d0fac2984700069af7dcd320b96ca09af8c7b81021329da41c SHA512 d2ed48701216f5c03567e61c207e32d6218009380941275c690edd8eb0197728e7e3c0edb00d512792dc2041a958de82ceef393e96d3324b690157162e28d29a
-AUX ghc-8.2.1_rc1-stage2-cross.patch 2986 BLAKE2B c50b502adca0730fc382831631851c61aeb067bc9f7c028d983bc9b528c22fe75839e63589a714f06c848e72cffb77d4c80d6a617908e7bbec87166652a38624 SHA512 7dcae0f9ff090e521befc9aa593a674ae9175ec07ebab91bc5a72097be509a89de12bf7c959870b12219074919eef115096b74f78e7cef00360aea32126ec8fa
-AUX ghc-8.2.1_rc1-staged-cross.patch 1605 BLAKE2B 5b5f203e17912396539530f40c5a93f72f1982a07ee8eb2b367d6b02ca82a2b41ac38d06e8694abe226da7761f169822b74c8c3ed1025a55bc2dc61214fe8996 SHA512 d9005f0310002f87972b0db8484b714d15664209b41eb84ce26950c4a19e854203e9b78e959755ec65a2a50a73bbce4999b39a3ad4da844cfe65098e65171450
-AUX ghc-8.2.1_rc1-unphased-cross.patch 1066 BLAKE2B aa29454f12ba0073779df08885c587cc5ef5ef21d72247d52b9f71bd455ba5fd0c01b144f0cf071e712c5e60c5ff1b96afdaad6c701fbaf8b7c418dbcef54efe SHA512 24b9b864e984cf3e34c2a23e0ba24a7f2c961dc590c6bb8e6461afeee7bc4a6361e5bbccf17754486c81136b60e12ae7e9ed06f485ef2f178084bcb2caa5edd9
-AUX ghc-8.2.1_rc1-win32-cross-1.patch 4535 BLAKE2B 546af93363a16fdcc7dc7b4167b30e81fac5dca126fac8d1421632d4fe9d2c3803f1a2ad3bedb7e270bd442e2ca95f99d18ec8d17ca9633079c6d486c6ec9ee2 SHA512 16e8be604af1e856bcec0603caa9d4fa66d5e4773a68fecaf4a57f509cd241cc7fb37fb9705d253e28d871ce2afc942e940ca171b45d41715acae5ef6e0fde8b
 AUX ghc-8.2.1_rc1-win32-cross-2-hack.patch 6231 BLAKE2B 8ad4428ebe9a373e08e94e5373ad9578cafdf95b866ced2a4000434d9e5d4298b129e832e13e8e175e8977b9dda9351d01a896e2c320a1a40551d5892b0efc33 SHA512 8617c1346ba7aa2b41ee01feaa47f2ca477353f9b825be48c5d3505a134e0a80b613efc6cb92e7fbd3fe062e77450e197c826151a42c0c77177fc6ef8e65287f
-AUX ghc-8.2.1_rc2-O2-unreg.patch 1199 BLAKE2B 7f3fe4b40e026736a3f1c58336274b49eb2cbbdf06c20ccced7cc83fd740128e4c30716cafbb251abe4d963ad224d3c406ec9f66b4b980af5f5c523f01136722 SHA512 708f68234f3678af3d41e7a50f9b914030536aad081b1a09a6169b12ed61ffd9db207a03f8f73d1761a93c5f2a21e92cdc23475501f96cac3bf98b046f3a6dba
-AUX ghc-8.2.1_rc3-any-vendor.patch 1288 BLAKE2B ea451228b0304d35ea1047a997e26efba4eab4159b8f84fac833a8561682be15b38734434459d17a02bac8da5df97c957a7f76091c5393dd87121c3ea599c1ba SHA512 934d6d91a434ef1ec8fbeb8b13f7a20b0654a97df05d10e8d4f577567b5a0498eed484261bc1348926e112c6d4429304f74f10e4ba819120cf5840e9dd2d8329
-AUX ghc-8.2.1_rc3-stginit-data.patch 1179 BLAKE2B c67a01bf0dc9b04334592b85ce8c238d34096857759a47d37a91e305d363f1acfd2b7ebb1a65f1dba7a558db65fd4448a11e4309e2c0f4cd7b0c8075e8680990 SHA512 351b78bce46699c63ba9e02103eda0e80eeb92cba9b364049a11e61bfec3f0bbd9317a4d221b51ea29e42e6735ea4d5e3a6357d0180dc91647b11ccbe5f885e4
 AUX ghc-8.4.2-allow-cross-bootstrap.patch 768 BLAKE2B b697a54fde6687d49592398be33ea4feb6404ff24f51b5b82bd71fe8234ad2d0d3322199b12770b23a0fe27ebb5a10eab2400a5c84d28c29f3d8f3d4521cf214 SHA512 1a58408a96d2e35b021f7298b399153973905e6ff8338de8a137c126f0e2598306e0c9cf2925253717c8d7125796094a0490a03947982961f583537b5188fbec
 AUX ghc-8.6.5-numa.patch 850 BLAKE2B bc15c4e24a8a395f5f3540469e5e769285b705fae05790b9d9a76e87490ec1103a89c1b1a0166b05f29f9d6e07b847fba9c9b7ec01e9cb9f3c8aa0078e4caa68 SHA512 89ee983384cfb07211f37ebcc32c74f93d82541c9459857cf317a8c947d4325a9d50caf051cd68fda2c648c0f0305f7df12eef7dfaa86ada79fb5816269f76ce
-AUX ghc-8.8.1-no-alex.patch 1080 BLAKE2B 7e7d6f445f77eb5b86ff36400240d322646c4495d669c8c6dd0f3e4471170f83a2966746673b292c8cebcbb0a7a9b07602eb0fabcf5ab8820159d3b0b22d16ef SHA512 84b784c44d471a56771661a9f1a75f12ba6312e76a2b42bcfcba68b64faddda50c8c8ef93a6dca3051de13535df177f6111a1428c514f60a1e72513c10e871dc
 AUX ghc-8.8.1-revert-CPP.patch 2236 BLAKE2B f793a9e9516f9f484234311372715116dfdd588a6682113914c17feedc635371779f0c0591e1f0caf3ff3e5ca5d4c7cc8b052045306f3df4085873d0df25f2af SHA512 b324c6873a802e20ee690f0574f9f2f312f3ba4331345504b7170f52ab2b1adeb9d047a0e5526053d006d67fc261e771a284bdb8f7b76653c21d9bf9337d7cf5
 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
-DIST binary-0.7.6.1.tar.gz 47086 BLAKE2B 7d81b9c254902d5ff2bafbef4c31a6f6f0396202d8585690c1ae3b63ae6ed157db7221d65a62e393ee8f6725ffd5d80e51030c0351e954b06004fcb70e5867cd SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2
-DIST ghc-7.10.3-src.tar.bz2 13281867 BLAKE2B 51b0a94cc63269926fd5d04c0fb0871266c45b3168187b891127db71980d180668fb8ef7adc51a7a3df947ecc93b4d4a06965ccf9ef53eb74ed063c54adfebde SHA512 97a8282d8a75399c78d85d6faab7ac253a993dc69f1840358572f1878b8fd1a527c28801e5823c8200b5690e268e4a0c00941945ada13790852c75a83b612c17
-DIST ghc-7.8.4-ia64-CLOSUREs-regenerated.patch.gz 13268 BLAKE2B 35af21163e3a46ee340e29eb88daf617eeb094f02da7fdcb80e947c1d26234232b12d9eb2c38c02c3207c047573521fef3ac5e7b87609e66f0c57072fef1038e SHA512 a655713e06324b56f0041edf70837487e296d28e6f3ee35fe116b9938765aaf3469d25e92645e0940655ed3607dff27d3826fe0f995c84e81b51bfc956816e7d
-DIST ghc-7.8.4-src.tar.bz2 10600755 BLAKE2B 6cf27f663178513b25032b648cf36b016e01361966725dbfc219079961e8eb9b1ab3531427c7012dc599e8e102dc87ed6dd43b31e7bd4e231e2d989936eb2c66 SHA512 079a53891d8ebd8d9b88da96170e60981608a619f8282e4b7948f35244e99bd87277649ac7fcebc227a61a4d21960db8d5e5b9e92f2c69c82d8d68d7fd0a41d3
-DIST ghc-8.0.2-src.tar.xz 10687760 BLAKE2B 3b2a487c115680342ce308ff1a42d2b6fa6fb1f31e2670b27a305b4d44160056611b77273c9d47f2e37a1ef01b1aba59c36e76b65c83142a5f09812bf3b1ea02 SHA512 58ea3853cd93b556ecdc4abd0be079b2621171b8491f59004ea4e036a4cba4470aaafe6591b942e0a50a64bdc47540e01fe6900212a1ef7087850112d9bfc5ef
-DIST ghc-8.10.1-src.tar.xz 19781652 BLAKE2B 61ff73d3a895cfa0c836e25a684d7a31cf099dcc33d1f308eaf56aa4b2a75b8f38cf963197c11dad9d027270845af20e00a7d81e5417b0fb8b4a98ddbadd53d8 SHA512 e6bb5c326f8354f0892324586c164c6e04168215d8bfeccb594173a838a535e37bac38db6fbdb01fb37150099c12842c53be5e912dfb6a6feeae3c75d4ae24d0
-DIST ghc-8.10.1-testsuite.tar.xz 2091988 BLAKE2B 88796f0fb6ea2bdd749161c84ec88768f3bf87063d2224a083db24f69282e615227626fe3c7b41d4abec10883e22042abed6a231582bab4ea530feffd683ed0b SHA512 35147f98301c5bfb6c939e108de48b2a1133adc1028aaa720ce49d60faa06a4b486a9eded658295e3f203731b4dd53475b57e8213491c45b05959430030be269
-DIST ghc-8.10.2-src.tar.xz 21880680 BLAKE2B 0c1b67c1576cfd1067d11838301f96041cabf66b94cfd546cfe6bef57babe940fc3814918ff9327e59fe73a8e230fa1d62d7816d7c6cae274dd8c53de6e81736 SHA512 6c3f1311feab3665419a301b17fcb09d303ec822f8eb8c4021edfacff00d9b52e71895bed0e58f11d8f7970415bd8c6f95ffde1294afe795e15607199b20cefc
-DIST ghc-8.10.2-testsuite.tar.xz 2101788 BLAKE2B 0d4528223471dfd68cadcda47931d53508c9eafa415716ca5990ea519eb89bfa2bdd444280057be33467382dd3d178887262d54ef633aa8ce88ea91eb9d58ece SHA512 043faaf2f0dc34a868c481b284b94afd78aa1ec1a4056d1f3c97ca3f7dadb3e9cff0517a4cfb378fe5187389db7c9027763bf066328e7dcfd264b737f6d09e41
-DIST ghc-8.10.3-src.tar.xz 19872356 BLAKE2B 043f41a21becc826b3cd13ee81b138cf2edfa18484f98361dc85b12f784df85571522347d5fafe40a19ea8ddf12390cd766db8fc21cf4971e797bc61404304cc SHA512 6f3248e728d3677dfddf2f02609167c67a194750418f2a5e34ed68f1135960761c5a5768255bfc8b2ef5640395609424878375184d2dde8e2d69021a3baf9ec8
-DIST ghc-8.10.3-testsuite.tar.xz 2261376 BLAKE2B cd03d569c30637d531d9a13fa926a28f854a37d48ef0d4e2fde684664ae000f3c941b5113ccafd42fec019428bafb5344b1ddf8f84a71b21bca8831ed4784907 SHA512 4c9d20a27ed71eb7c73bd86c1049ea5adcc8a0b12040386b7d0dddb46b3cf704c52a3392e19ae4ff1c76b8868665c599391d47e47dba516fcadf8abbc30e28df
 DIST ghc-8.10.4-src.tar.xz 19818108 BLAKE2B 069dd8436c373ccf73c20d8b577243792ffdd3a031e869edd612fe1e273126e60803326542695012dbe62e57654ada18af9342bbe1a741b2bebb41cdb0d86035 SHA512 9bb078cb72535a352243b83b671c871392564efd09e478549f27ae58fc6f46e337a0782f5500d26d5704ad96eace22e77bb36031a1fe9b7e175f265b0b9c028b
 DIST ghc-8.10.4-testsuite.tar.xz 2236932 BLAKE2B 17d0520ad5c6daa0cc60530279ae7e617e4d79328b9f436abbe75e72f0803d9a997fb9e1ae61425326b070f45794a488d8507957fec9a6ed49eea86d30a1e579 SHA512 1bf129c8d872e3ceff7c19929605adc5d68daab9ded9aa2e5109b0de162089631472c66f04993adf8481291f8128bf804fe64a9d344c81e257f1b962ba5e382c
-DIST ghc-8.2.1-src.tar.xz 10736016 BLAKE2B 60993cfc9569e83b0c383591ef30a7280e0138fbb7bd696ad62d87e68dcbccf31c0b8ba211b6647922b8595c7aec2c783648f12c67da53e0766b71c7d7c923fc SHA512 d9aa2aa7f9414db8f4e51d6c275694b46df515e68331a1a2b6018256333a2c63ebd877b75ee90407ecce5be672ec9afc6bebd62aadbf8ae06b94f1760d1736be
-DIST ghc-8.2.2-src.tar.xz 10753272 BLAKE2B 6fd792390d3df20f84836466705c3f3c931ba2d594dcbe2b808ea0ae284460000b443df8aae74903eabf05ff9064d68a303086cf888ea68222eb1c60959c8f21 SHA512 6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799
-DIST ghc-8.4.1-src.tar.xz 11301528 BLAKE2B 6dcf467d04cace856b68315c85b80f19b517dcbc8ae6e2a08c60afa141c9e0261e012738452c9ca208f9fc40c48bd1a0817e5e0fe9f4737383cd7b44ca65c8d9 SHA512 f8ae11f498bf2911fb92635534c6906c96f1fbe5072c7b7447bd3f69e408026b674564515af02a8aaddc57ee6905ce78d10005b12478a39c220580aaec13a9f7
-DIST ghc-8.4.2-src.tar.xz 11313140 BLAKE2B d6fe90f3c68b137c6029bf08918a51ff43c210ba0485aca8d77541cd455f6f9c94287cd011ecd710a8e5a14a27e8a27c04c517417c5748966afd63a5ba6ed19e SHA512 aeb17c986c597762381d9887679eb0eec194c2938a92b5a33e66b4c80002ead02d672b4aa968e1061ab5652b74e46a3c9f9e3d58d5be4a0ae47aa8aed288cf1f
-DIST ghc-8.4.3-src.tar.xz 11315068 BLAKE2B cfb858051aff0c4fb3cdbbe96627cacc82665a6bfc4f863b0353eb3d93d358f7ed4efd7b131280763786f397aabc5c4825f60c3890649303fc97187f2b996d21 SHA512 c6cea84264f32ae888f9931f834a1d721889242f656d14262e787ec54a1793d1862ce76daacaf1006c12b8af12919501afce1dc02571373e24830e4d51803414
-DIST ghc-8.6.4-src.tar.xz 19029904 BLAKE2B 80676923866417cbf674c3cfadc2ecf9a673e9dcefb4561be7125c83edad38990ea9427c302aeeb9ef04b2c3eeea4fa9fabc72d89c742c6714163ea280802122 SHA512 9237e45b26852cc8a6d64c80da2b28c910349bbbed60f6575035f39bcb064a5ce80ec73cd85e2298e4abefead378e19b7d7ec3ffeea09e362f20eb0b09b36798
-DIST ghc-8.6.4-testsuite.tar.xz 1906656 BLAKE2B b0e55b415c885479c3573fe86436338971e685edc95e106043f36e92e1ee6a7e86add9e86a35c8bd685916f18a7bcf08d4a7b845da41dd855132b131ccbc4a37 SHA512 b1bbe1759ec528914cbfa6b3789c596e46b6266568972b9f5d1cf13e31b7206400b65536e7acea698161e46b8ca11285b3282ebd9336d23b68d34feb4f0bf314
-DIST ghc-8.6.5-src.tar.xz 19092168 BLAKE2B 2ac0926b186c43fd179170a0690492129e9ffb6651608875db7167113becf324dcf99a82f56e578c67051f813007c0ffa32ca5b12588f0d370330c8274a2d74d SHA512 c08a7480200cb99e1ffbe4ce7669f552b1054054966f7e7efcbc5f98af8032e1249fa391c4fc4c7d62cc8e0be5d17fa05845177f3cea3dbcf86e6c92d40fc0f9
-DIST ghc-8.6.5-testsuite.tar.xz 1910060 BLAKE2B 71136207e3eccb4ec6756661ffa64c0a82475704c071cd8f060855a9f40d7d1fc4be2da7ff265df38fb918b8ee2ce21a54ee4b224aacaa3026ad1ddb1e1e4ab2 SHA512 980f3934bb18876cc80b80a0eb64a9ca1dfaa7f4d8b0761f5d733a6583053e38b231445388b992b26ec1ad5f569b6385dbe60f96381794f5577964979c253e16
-DIST ghc-8.8.1-src.tar.xz 28634672 BLAKE2B 3a012db5d9798efddf806542a88cd9fef1d0972f7f025d377c247961cf8d8071fcf390aa130ac11f1a5556fb572499b9288a8698c49bbd594f0bb5fec4130a2f SHA512 7268b012c3a6c34e7eac05c7d6959de6005651d33e870860bbfe589295502e8794a76580130b8f4da2f88032b68116dbbdbc4c1e900e0c862aaa9891fa788bef
-DIST ghc-8.8.1-testsuite.tar.xz 1959220 BLAKE2B 8606a6439f7d5b4c837b2325c4ef5705dbcea17c4b59daf7aafd0de68e55179bb2c03ce7a4f376398b185b6dbfb361d18592756558461ee43722d2142370d815 SHA512 e13b651c60deb86522efbfe8aa42679cc81a413475f70580d9ef28dbb711617c523951441a30fb46f3be9418c4c0bb4dbc522b04aaa51313afd2d39027696c30
-DIST ghc-8.8.2-src.tar.xz 19365816 BLAKE2B 85dbd2a4696755f43c28ec578d5ecfe706b27ba7f640f66b464b7aa7b959ca5f02b8b51d130299c30d024c46b9ce6a115606bde46be400fb8ee221ff18177d65 SHA512 11eec0bc03254ea848a5c86bc3e2da317801a1227dd91406a157e11cb675891d77d61177b740b6df88bd823063f6cb2af5a928a7540e25392d9d0769ea121069
-DIST ghc-8.8.2-testsuite.tar.xz 1976924 BLAKE2B cec6c5dab1782332aca6364f995cffc1e9f3506649c3410b6eaa220e665b66f033dfad8ab6cae7677e15a6a1bd51237ed491b7fd04a19fa1d4f9cd8904617c64 SHA512 0fc41a0b3cb5f172442863c8a3b1cf549f2f660a070965e6083baa2c90c27b6a7c17550625105799010f4329dc189f4e392c86991844a9704a3e3a72a6d4e2f5
-DIST ghc-8.8.3-src.tar.xz 19343672 BLAKE2B 4b33b4a386926f0ee625c7c18a3997f02bf664b8f553d7cdfb231553bf9510f44f72c0b46911539f6209f28ecab52ee520e61e2c9e750cc217b170b3596ffca0 SHA512 7db0d820a288e56bd32935cc03584295900605f6e7cac6fe6adcb3ec6c24d8d2cebf7a8efa421f2d2fa192602d7f24dfad1ddeeba252455e4cb8baa9889dcaa9
-DIST ghc-8.8.3-testsuite.tar.xz 1965236 BLAKE2B 9cd10769336513284d8e0fbca1c3fce9e298ec67eb63eb10d41087fccba0f6281f1509aee684778fd23710ffe65843c43b4042e6692940af67766056c4503273 SHA512 4ebf3eabcd7591762dfcf45716b06293fb14c00b51307f7788c90dcf4e01f67e6bbb7a887b74d8d30272919486441ac236b42a54c4874aac69d90391b76f81c9
 DIST ghc-8.8.4-src.tar.xz 19395252 BLAKE2B 6fa898b9552398a724f0452f5cc88ba073264a5645288c73507258959efec40ce5a56a0eaafdabe58f15c5a9210b2c9da5954411dff5c81c52e061569d6a350a SHA512 efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
 DIST ghc-8.8.4-testsuite.tar.xz 1965820 BLAKE2B 3b715700561788b8abdc986961d533b91399461d57a1686ededb4ccc36881503cdc3fc126b9a7b204a728c24b9a9ca97320142348644367aca9b47c87a5b3b51 SHA512 79d8fb0ba8de0fb48c938bd54c8c3278f1895d8ce5c700ce8cf6b3fc550073bb757208e85d4f9818400ebecca96f51d9248b8bbdac9eb2995671756164d08c16
 DIST ghc-9.0.1-src.tar.xz 20782336 BLAKE2B 53eaf903081d705d641459fbc1e6fa7387a6039f9cd466b4708bda86e81252a84d80878d6eb956ec2e1e5b721a313e68eeb796f8345244ca62f536a7a3f0c6df SHA512 bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53
 DIST ghc-9.0.1-testsuite.tar.xz 2322432 BLAKE2B 350df763c607dd89ba58ad6e856d815556159a9f088dc0b069de48ae87c1e874a45fad51159e65a3c9a9beed68602eeb2a2728dbce86277bd287455f46f6c53a SHA512 13fbe0f0ab5e2426820d0fb37f0a75e1198ef2a660398508806e8ef094fd23647ca3d386815a2118168d12253d8df3273043678dbb37cf3924c689dd0fd1932e
-DIST ghc-bin-7.10.3-alpha.tbz2 183558856 BLAKE2B 2bb02aafa49c6a91bec016e8bec2d07257d602e53c9df55792ec6fbbf8e2e46de1d5f3f72c0ccf74d6bd7f7987f53412063ccb02ae85455fce11fa928cbf5291 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230
-DIST ghc-bin-7.10.3-amd64.tbz2 112040431 BLAKE2B 3e59b70ca309a1cd704266c54a7983f9a58362bf700ced89c5649c780c664c650ec091e14026a7b84e339d2ebff39eba1772eebcd9fb4b99b9c99d179453d5cc SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558
-DIST ghc-bin-7.10.3-ia64.tbz2 238680956 BLAKE2B 08593718d376051edfb0c86131e54dafc5c15056757fbeef90c653a7d217e49ff34ffaf7cd4083144c9277e73a290b822a0f889aaf806341375708e4b92654b2 SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5
-DIST ghc-bin-7.10.3-ppc.tbz2 125832171 BLAKE2B cbf9c87200062606fddc6fa705666aeabceef954dad17166e24e181d210d7d86aad684e9af5ca05abcc89c947bea295dec3223735a6a915b680667ad32d850a5 SHA512 4eb111e3686656a83515f59d4ace8bc28806dcabfcee5201ce29aee38b8efcefaaf70c50bee55202c2d2abbfbf231a6b41df8b13199332c53055adb1754a3191
-DIST ghc-bin-7.10.3-ppc64.tbz2 142469712 BLAKE2B 05e6ca2498180399dd8a1a209843dd1229a1668d7504c424b9182fff00f78ec9aa2848d562f293dd388dc983851e0e28d481b12f0ae860b5c3a36eb616c3f1cf SHA512 eb59d3abc8b10010311d59df9473c5ea649eb0dd7f9ad41a1929a540a0ef8c20abaccd68254f8abab037fb1fc94d824f474e18e4316b8f2a7a954d0645a2a2a4
-DIST ghc-bin-7.10.3-sparc.tbz2 163105069 BLAKE2B 4a535472bf9ed83164f4da8280215a156b973a3a1f93a742a46050a112b7073d0a5f252686ee2ebde97140748cf3f164f33f1ba9df0b11fe2b35a86a7211b3a5 SHA512 d467a42487378d7dee311eb33aa1c151f5c16a6e7a4ab5bd8177df229f474adf19da3e1ca1064943a40abafcab6852b0589dd34413da82b33a03ede1ac17bf5d
-DIST ghc-bin-7.10.3-x86.tbz2 113877175 BLAKE2B 2f3064174f82f3ad6fda615d1f47f30b11f9dbd4a4b721673e5db49013a11ba80e850a0f392460651408fd3b31f8e677f1488fe2c94160881ab34740846b0390 SHA512 75096fe9106d975c15e646b0a559c544621fd02791f491bce54926efabf0e55b97150069ddfa7a9f02cc30bb6975d3d3121a82207a9f67b8dda5ebfe17ec4744
-DIST ghc-bin-7.8.4-alpha.tbz2 210691009 BLAKE2B 7a59cd1dbbe76fcf37ec7d1b2e81a76bd35f268c10614890cc8a39dcd846f6e5fb524ce1851036c315a9e5fe219d3abbb78d55f3e93f4ab5ad1dbf6c946146b7 SHA512 f08230de82f0c4112da9d0b48227ca74d5d0b4a84046d746b023557b7aeeb9678f5ac037fe89a863178df4b9036e5c5c63182d14dfbb42c772011de883e3966f
-DIST ghc-bin-7.8.4-amd64.tbz2 100573133 BLAKE2B da6bfb26eac8ef6c996ed10a56da9c535fb5fff4c69474de2cd979fe185876059f9e87940d24db8c52a0f04e81cf312982da75d04f3b96e7a11f2f134b512058 SHA512 e4416d6dae3c644f74bafb3aecf1a123f985427aba32d0e0c43143a137d64a9220fc5947cd9bde8a3bc44555ae71184fc06a3f7df7976aadd065ad5681b90954
-DIST ghc-bin-7.8.4-ia64.tbz2 222789275 BLAKE2B 2e0fc3ea11885b739156dcfbb4d52ded6492bf992ea18be2f91302d82e541a4de52e4bbe215f4d0cdbe54b32aa59e142ad10ae2fb20e8f0dfea22368a88620dd SHA512 2d8b89e399cbe9bfeae29cf3ceea736bfaa65ea21483fa2ee95d9814e122fcfbb67ce22ad8175493fab088e9a9d0139610c67e9d5c8b4f797b5e14846df32b6e
-DIST ghc-bin-7.8.4-ppc.tbz2 112803496 BLAKE2B fa60eda8b87dca0e23cbb971bc1f361f280735846cbe628e632981dc86baba0e877112e5c03d09fbb7f256cc078f8bf3248007c013208dab41c5205a82fab494 SHA512 9581f55a088e53edcc969960e45c9ad7227d71198ce2d241a4a066a138450a879287e55e7d2210e86143670539711387e36c7f60660c4422dc1b4122278fe4a0
-DIST ghc-bin-7.8.4-ppc64.tbz2 129284515 BLAKE2B 2e9a1e70830930dda7dcbd696ef3c27e7b64d571042cc0fc26bed42d13b9707ffeb337ffab38e2e04a7dabc56d8305fd77df508928d61fd0c653945afac8984d SHA512 53974e15c26cf6b62d8f838607abd209ec57cf0f45fcc48b90ad62736f5e4e7ff263dcd326ae03d8d5557a22eb9730e5eb8ae4eda55e52dd3d973bc73c84935e
-DIST ghc-bin-7.8.4-sparc.tbz2 147340595 BLAKE2B 8e39d6b144f4fce5196ad758f89887476e0482e8b98a012874d293d5e57756659cb9acb897476593a28f98f5c859548efa2e130f3806bfa2bb9e74795078a506 SHA512 ee5f0b2f1cf2693a0f2be9df71ef61b52bc2327225d40b8be955c1584b9901ffc6aaab63c1e46bf9bb352633b605c98378f8fd3e6cd71aef1c089007e4110217
-DIST ghc-bin-7.8.4-x86.tbz2 102312459 BLAKE2B 256cca9b2353af30dd7c239db0e21781d9d8aa352e38b3dd678b1429be6251e81f8955ac6ee0f766cc55f4de71c68acd98bc7b9434c3ea4b056d446ca59adc97 SHA512 cabc5bd6d8760ce4120e7053f6c1dffca7d161ba454b6201087760096c037c932e3ff8c82e53346c8278855bf0cff1c2f5fb8046242ca4d8307355b060a9556e
-DIST ghc-bin-8.0.2-alpha.tbz2 234361847 BLAKE2B 8e3439f3bbae1d3f6ab71f69669ea065f5f36c9cb4b334f06161cc1b9507aae56297d5eeb8a9cf72916aa012fab0b444a179a0336f00d5f17a8d402d5807c6f8 SHA512 c8b588feeab85f7b8fd60e2e8bf755d46790d4882d2ecf6b2c8b8e02c62a11b7e6453bf0cfbc646bfbf24310fdc775337f3957ba5783675a271b68f0af2e9070
-DIST ghc-bin-8.0.2-arm64.tbz2 191332951 BLAKE2B 305c4d618a6221e1322a5665544883624de4646e0186c6eab56d0b32877645f0b2bad8381848914751fbd2e11598727c46ab136de74c57207b75ecc6cce9572a SHA512 b9cabfda8fc6e851ba99f53274c1a63c5a6a365311a9203f1247ecf90ab843dd94960ad44c4e67032f4690f07d67bfd8bdfbe59f857d6c63344430539e2082fc
-DIST ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 133679542 BLAKE2B c50597857b53a2bf9d8047c048f86aa1782f74d5d9816d44b7bad7302181b407257ad0b52a03b4ad4936de3a15010b0ff5ca877b9578af6d3e7684dda2284718 SHA512 7f33e0b20a21fe076db142a58a81f68ab8f230ac9ce0167aba31aa0843bce20a9cf4065acc1c0ee2aaa01ea2ad4a8234388b0cf3ef886dccf25d7072602b430b
-DIST ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 256581880 BLAKE2B 7a9b41fccf3a097a19e169dcd8f553d38ffb96ebce3a3f0df15af79de77f6e33835a955fb7cc2c373f7bb6bfd3508a45ecf19f8b3e74bb058d2d6cdb6576bc6b SHA512 5d14521cc4f2a8fae1e5f43fce70cb976e4412df468c3bc611c99f57806816c349f4186c8a064c579858a82cc070e5942dd7b0c2d57b88d507215acddcbfcfc1
-DIST ghc-bin-8.0.2-ppc.tbz2 144760090 BLAKE2B 32410f3563f7f2555350806db460d2083c7248c57223c9c681d0b4913df942f023c7c1f5fda145179a524ee7ef105a9b8309ba87c20dc393a9f49151579b6767 SHA512 bc6bf8998064ffc1692c3bb83c44d1787760a3f4a1e6b79dedaefda5fe32b9052049a60f0ddd3c0b0bd24a722fb35e310e0189b3511721ff89d4d02b3d7c14bb
-DIST ghc-bin-8.0.2-ppc64.tbz2 117432068 BLAKE2B cae202f0d6e825127d543996b2fe7ae02578c47325674cbf22fddc53b1c4c9413f45c60d76ec3d07860cb8d0aae1ec792e4141822cc5c08ef9013308c5d29bf5 SHA512 0eaff0557b68649a15bbeb2019f46fa9e9e7b8a916aa210ab56888090a5b887d20d818e7987177bc6a8e7fde503de560026e6bb55fe39679b8b1ee13c6b7c4f9
-DIST ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 130852973 BLAKE2B 24d2032bbfc664d924800c1a317334e2342c8ec1e529178f9d1bb99bb4772a9cc100603bf70111b8cfafa715c1cccc643f115c77cf6adcdfb17d1f1735ee6682 SHA512 c36e0e2600fc7c284562a323d396a03062cb6e8fa63c353e672be61e76d2ec5c7698485e3a370a57cf512db9e5ba6a68338fff2ab404d9fe67b1a468ed72638f
-DIST ghc-bin-8.10.1-i686-pc-linux-gnu.tbz2 123398571 BLAKE2B 3650f9dbaaa5af684abad589953bcef5b1684a91a4cc2695d0ef735536057bb031231fe3d73dd74bc38a199f0890ef91764b551e5e158c120affc0d7bc3175b7 SHA512 52cc172de08ef30d6e89384e86eda1b8bbdef2bbff526041eb47d85d77b70ab49314ac7f33f18b40864c16fa546256f1b4c7964e65aa5d3cfbb7f9cbec505dc9
-DIST ghc-bin-8.10.1-x86_64-pc-linux-gnu.tbz2 122227601 BLAKE2B 84340866c70044eb1444a70b0cbed6814808037b697db28f567d2b14bb791cbe7d9bf2a327cc47ae85ce3c4970ba039854b4a6df44eb85cdc18040c5a4d15f4f SHA512 81df9de95aec47d60ad8d699756ad323eb525c3a16536fac8c6717e1754272061bd8d7d70cd38f5c509a2fc323305333e4f898c9b6dc27645521bb29ee218bdb
-DIST ghc-bin-8.10.2-i686-pc-linux-gnu.tbz2 123683156 BLAKE2B a486076ea6e67f124c850e037be0e63a873181c3fd746f437861f7367a968e0df6723afc934c966432274a55936c0fe48a9a43a48199840b37636843da4caccc SHA512 29cc1703bbdbfcbef8aa2a5a563b83b0663970f5902a1fc70230515a128ef47e27a3a6df2b47a01009c3976b4936cf8e64e5da4dfdda0c1bcf73ab7ea5ac0b6d
-DIST ghc-bin-8.10.2-x86_64-pc-linux-gnu.tbz2 122818630 BLAKE2B 030a68e2aca0eb0a273e0d48a3e180d92b219b2d1826d1d58fa133d0a6cae1316b3ccceadb55a4fa5870f87c3df85df2998e7611b93dbc1fea592437748b2daf SHA512 23bf47ee45fae54a843de9e6991b67fccb79c14ad8d08eff9f38a68a3530496c8ce4bc8cae8a731bb690ddd6cd0bf36d6d5bf37eb68ddae8ce646a0bf3916d8f
-DIST ghc-bin-8.10.3-i686-pc-linux-gnu.tbz2 123802832 BLAKE2B a770dd43bee7a1d60fec2eb9aaa7de715eed01c19d9514e04678801827879977a5c91f5e191d026ca83aa5e5fc5f518593053b2e78b27b08df64b39058dbaec3 SHA512 f810432a56ddcd773e6118f038cdacd2f5e3a508d87bfa468ee861aef0cfc434ec5766a8a74360d8cec6cb9c664928290901c025496100e7c8465408635227f5
-DIST ghc-bin-8.10.3-x86_64-pc-linux-gnu.tbz2 122993247 BLAKE2B e3395ebc7e87b4ae8f66dbbd9441c214c4d9535e55bfb14f78ebb92d30b1e100efc4893b3cdc65564d47bd53a21cb30106572b3fce13be022946171112c3218e SHA512 2ea4295bcaf6e3fd0db54ba67465e979cd85d3370c6c49f2381478ae9824ad89df53d7d93ccf06bdff5f4849f14306c9f50c13e6f6ba45f79e5b8c13ad63ae4f
 DIST ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 123831294 BLAKE2B 1ca4c1b5c34c948011049a73d409c741db89658d10e311cffbe464c631c3733278fc7dede6ad27474832295ded2c26fd4d6419c760505255e29f7cb232a670a4 SHA512 1f87cf63651f7c0e5f7f55d1f4d7d7c48b0a911cc6673a899d4b92190d765b359f9c7d73c329969c1b76f1af102b7e2c18a80382c81d5dade9ac7dd57de4ef65
 DIST ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 122558873 BLAKE2B 9f07c7bdc3beccfa629d28b2524ccd2f4688a5c0036a45408f5ace2d530a2a0e42f95b3cda5037ebb365317999e1ae776c6f9d21692867abfe85e33f2892b1be SHA512 68bd70f94961547746a696aa2839e156c95858fda0c7ec5b2ecf802070724ab7102b0aa86bcbf93432170d521cce4af10f46b851b470e5dc49dfa5b07380f46d
-DIST ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 96157437 BLAKE2B 2b9608845db8cea78db07209fa054b3b05085d5c3ac07cbe3de02a93c87fb0cff12b1820f08757221c59c8a0a9e7a5563c44266b181525d916825e5cf5bac34c SHA512 e891e76557fa61853e28829b8bedc4a6abb92954f90cc1ebcf22a13cc137556bbe9262e7398b7e1aedbabeb997916b008bf1561a52f16a569f3d58ea9404f41e
-DIST ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 97490496 BLAKE2B 3666ea70cb8b3645db071040d2069fe244042c11954b34e5d92aaa90132d2316c0ee8c176cd4e674772bea3b99df150404f62bd8745c046cdaf102ecf0a0fa54 SHA512 52630a185d0eab56bce0469a612a54109895bfee041ec362ced59a9b35ba3b9c185e86bc7dbf0a5939081d3626baa19fbb3306e36d1857530248a7b9bfc100bb
-DIST ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 96638908 BLAKE2B b470f838e77330969f162196b0f1035fa764f5d123687fbf67c14323280bfe55216af0e16f8b79c62f290905d96abc8bfafee650f8d27c81608853e78329b2c9 SHA512 15b1525890477539878385efc15ce5f1cf2f126cc785c42923be958cabe3298cebe73526a2370cf4c630124160a7ca0f0f9062aebbf035dce807a0374eaddd14
-DIST ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 97696152 BLAKE2B b481cfea186220ee402f9f215dd48b002288766b643f3d8352579735347136c6349d242a9a56728d88ce80f72367dc9fdb6e40c47a0331910dadbb9a4998e17b SHA512 531df6505e8987fb5c5cc0aac59adc6aa153a4757b96936d3f09f27f3614589ff41c227568b780114b2e87c6c8656f2c88683cce86925628d12723f14b893eff
-DIST ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 116995839 BLAKE2B f94f2206d603d57f7fa64bdf63bcd2528019284fbf6641273ea1d8c62324e2f0b26b2cfa50c6ef96e12beba550bcedd17aa824e7cf9a27c794e962526326e105 SHA512 8167ea80fa627a1b55d28363513ac79985229326019288e7334cc87c3017d39781f4d129081d62da112420152a41d23d2dffb0c13721b80cca72d2a21fbd2c0a
-DIST ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 117369638 BLAKE2B 583db924a50a3d7d261d2f392a74e0ff487ee662af055ac292ff1943534fb305d6c9f6f0045ba4bdd5afa268d75beb50f64b4760e49cddabe1f56776a5f4769f SHA512 801f4ecd538c7a035a0f573f301769984814fa3ce4cf5b09a914ba012bebe0583b6695a6a93f92c7e6e2b7d58caf812a1214b5b778d7b7835d7eab988ad69ba0
-DIST ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 117083472 BLAKE2B 7dac18523ed693efb0ec42b31bf7b910e6bb8289cdc13eb309bdb30230fc87fbb060baf41eb4f18af2bb265b42e6aca535ceb70cf0fe09046b0e4650f11bb37c SHA512 f9799bdf7a2a66d1db34b828860203872d7398bab2d667e8982c9ee89301654c3f7f54705b639df2d7adebcfb7a05e071b83d994f5e52a72f604b62098be51cd
-DIST ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 117604406 BLAKE2B 644ef535497eb73a2d1ceaab7ff96228e8d4021c09bc061a3f397dc27b3b86bd6d5300736e478671cee0a160bfaa5aa4611f06012285079b40973f468b59664a SHA512 7bf4bcdce954319422b8b8f09e56294012fac145662ba3de1c7765ed86ae9f8b61dcf6dd8febcf85d60db8d1a26edcaf4e89c3644ffa24c7b5b5c41a14105936
-DIST ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 117028296 BLAKE2B 0c99a2f6fe4af4a1342d948cbda53b178fe9709673e0d09bc3b6a4e0f3ec4e4b8f77830829f149993f51e490692de39024900fb188116816e41441153eac3622 SHA512 13147ae0d6b941b3bc2f0239071a2f6f854a39cb6a381f0e2fda7069ac29bb2c64fb3ccc6191e7527b5f27fe616bd62f2e487b5d50679789927b401f02c62ad7
-DIST ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 117537996 BLAKE2B 2be0102fcc0f1fef5aae194620a43c1c90538215d4eec2550419634ed9c5bbfb17391d57519c20ab53987a36b42488ac43ff968690a4f65b96c52c3485589d10 SHA512 5f26810ec1f0a483f03ef01f56130eba0287b49b912efba03158336ce521000b611192cf021b72c1a0d902532cc4c9470ca1b3233ccba7c7e7c2ac490c6099fa
-DIST ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 121639881 BLAKE2B 51d223b654ff23bbdd594801f4ec92b016a58b952ba98007abb56c1c4b184a672e51eb9847b42160febcc4ada0f28f18325cc27f8a025dd9fcf656e3bab73918 SHA512 6b58b080c5fb18ea7b76632b4b48726af61b52d8829f57a2ddd55e6bc109c1fe1a133d2a0ca974a168ffee0013a6dfdc4922577bad01c50a42dad8b9db70e061
-DIST ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 121695747 BLAKE2B 39c745f5f9946bbae622e09bbdabdde4d62eec472fe14e693f37cba6b93ff66e4e56f66df8f0f073686339d252dce71f79f4c2aaef620c3dffbc26a67b1119c3 SHA512 c60bac50e7879bda1d6dcc7c1f12fdac915b18c3ebbfcfad575b2b01fcb57a487496ce7935f7ee4ae934162209ab66370fbcc8a4f021628e5f9a2aa7ef95e119
-DIST ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 121938050 BLAKE2B 17b6d15af21390e28a025505da76d39a2f8656f74c88a81fc75e7c8e799e54171c0d964d8a977c01576603a781c139b5363ea79eeaa2252622913d2a08a79f0e SHA512 9eb33b4670ee15f53c988885a119f3ef7be896ddcb318019628cdd04e21ec0c61876e08466d9d10d6cb1e16d89cd318e0ba42f0f0ae512f48590fe87483739cd
-DIST ghc-bin-8.6.5-powerpc64le-unknown-linux-gnu.tbz2 173549697 BLAKE2B 296bf4e0745f56dfefc3ffc96b4e492ddbfd8bcbbc28a8bc9b3172c616d0e7da1081834384ab69e387808331b607104f015632d59963a87f4e257f290ff286c3 SHA512 81261614a7939adb0ffad3657cd33588ff729bb1e3a7dd228cf869afc1f21b74cb4dce6369a4c4cdc9f45f8d8ae64f25d71cd0f2dc34f36d3022afc149538a78
-DIST ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 121728723 BLAKE2B 6620b2a116b5696dd2d776350a43251c093e117338a4407ae8c41ae27763a4614d7e761b2684b90aa9317dafe7cb67481a6bc141c812d335d5231724ae3db2a7 SHA512 69681eab137f6713339f8912d0d92f6af865630053bcd7a32cb8a31e01628e969951db976533196794fe39e0e57f0fcd8778d9fc9fed4f4231e965b9a603dd8e
-DIST ghc-bin-8.8.1-i686-pc-linux-gnu.tbz2 120789855 BLAKE2B 386f37696d956078fad5cad50cbf5b9d9d7765615a1d9cc91a376fb5394648afe8ca956e24ef210f2ff0e51f339b63b16a50f6dc35f30babf019aa57de50b27b SHA512 193c29889693befba863d3c5a26d38d8182bb7e1932b61115dc0a21b6582f818b05db144a9fae5aee06af2044ea59f884825cf1081b62a1c67feb3041d184d3a
-DIST ghc-bin-8.8.1-powerpc64le-unknown-linux-gnu.tbz2 173653088 BLAKE2B 6c29777b596b35fee8e3a17f965e6a21dc40dc2387988f55d4ca5fef0ea9677b558ed210054216a6578b93fbf844df9e407770df184f707f8203f846f4929d2d SHA512 d338b8912c1632410c43a0df75ce69f961924a7c51049a3ac27c22f7c6cfc07388815813713d594fc38b721127df80b65f72b1b0cc6fbf0e10fa15970b8b6f46
-DIST ghc-bin-8.8.1-x86_64-pc-linux-gnu.tbz2 119317594 BLAKE2B 98f0fb262ac485dcfd6a8a67304912ffad2bf2634111fcc3b60346697a836867006bbacaab1e1be0cd5be34b4595d12bec13af644c451c10f7e3843ebaf5922f SHA512 e6acb11755db18fd86a346de642b8579a6b48b303c19795949757f5e351ad3b8892906e989dc57a7fd4471d0efe30fc8175df5bac741d7faecfe42a855a67980
-DIST ghc-bin-8.8.2-i686-pc-linux-gnu.tbz2 120289601 BLAKE2B df65bc6aa4ee22c979b9d8eda29f51188c96700d61fb4cf141ebad8a55e26b6cd959fce3ec0b8d780b68e7baf15a1ce7654dc4ef084aa4671fe05f00f9c4e9aa SHA512 da059f3fea00e14df346143e714da6484ae51d362d9e237607817791e02ec81e29e1ff7f9929fac44044f63196b395287c42f5829884c34391289179b4f6e204
-DIST ghc-bin-8.8.2-x86_64-pc-linux-gnu.tbz2 118957404 BLAKE2B cddedbb0fe8d38e9821bd8f51f5177d35922b25bf4fc8a537e921443560f141cdef44e54a0b4ef2dde07dbe33d9c1cba2e67ba80db4313f67e9bac089d967f56 SHA512 b0b801dd6abe9f5e6217e18568e2911dbfea11b1b45ff526950e87c73a34bcd597afc5105fcff2dc46bb13cf95e63db90c0d24ca9babf174b397a53001e8e0ac
-DIST ghc-bin-8.8.3-i686-pc-linux-gnu.tbz2 120243899 BLAKE2B 7f932523a71dcfd4cdd468bf67f470a942c314888c0093c21c211d54b3e158f45f051f027c78644a651047d81e809e1422bbaa5043e8559c6a4622ac0472f7e4 SHA512 12bf08b85652fd061849b9adb528d7a5c6fe9c2260cf02b92fab470fff16c3121bcb4e0f7044d05f252012083d622a1a490fa7f7c949142a3b5d03ccf0dd3ebc
-DIST ghc-bin-8.8.3-x86_64-pc-linux-gnu.tbz2 118988294 BLAKE2B 4e5aa3844934ae2726bf9c8690acd5a887f10cd49386ffadbc536f9309d33b3894b49507964eaf0d8a052747eb33aeabbe4d2cd22493297c295cf9414fcb766c SHA512 dd656157fe744c1df1c8ed34d1129ec358b26f3042c6da68e704e0f6a45d8114789000479e28a06dc16961afb283b3c666b427025590498a3d2da9b741b435c7
 DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 55dfbb90d5e55c2af5e93c69249828a85cd9171c164b80dfdaf86512972b2c6854c8e4f07426af4ab52a5fb1a85d96a58c2cf003fb02372c55428001cfaea491 SHA512 ad3b83344349976d3253934195b2dc6299648391572b13735943c5ea2239c031c19b0cafd86c16cfb0c061e73bc72e9248f9c1731494a9a15fbe188f02913c12
 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
-DIST hoopl-3.10.2.0.tar.gz 241940 BLAKE2B 0ed7bf80486767c81415f99da8780a525401c388dea0b3f380bbecceae9cc7f66d8b5d0d7b31f8cb41796309b7a93adb113485efd14882f8af321989ce900a9b SHA512 083baa8a5eb53247aff8d5b9b2144e0f63adb9400934297bbd80bfcec607dd90a34def4301045a60472ef10b0fb90ab84692fc08f786e7f806c28afdab1ef66a
-DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
-EBUILD ghc-7.10.3.ebuild 21609 BLAKE2B 123d31edc5db034398e355ee246741337d9f33514c0ed1198145e4073070d0232f7322c8b2da990c8e5f343c2cdf71f6321d5b81ecdf64877e7377a3909636fe SHA512 d2a81bd7a206a6c55bbfb9e5903c806949dc5fe062770fa056f142b0c8d6856c0309625d8f8375501b759efad7dcb708c6b72584a3e88ab5db60371fcef1acd1
-EBUILD ghc-7.8.4.ebuild 19744 BLAKE2B 4e9ad53b5f84a5b09bc92f19f2169706aaba7921480afd9bb08e070de8d00e75a02d42a1729c8679c90048becc5831d52d9b153cc58e966bf13c56af0251e0bd SHA512 c9a0274e070072db12b4c9e4fe162a6c94cbb03648699c82bea749ed8fff58ee67e127bf73ea580804b3159e92985c4b3ddcbff31f00081725f8640e3e4b786b
-EBUILD ghc-8.0.2.ebuild 21544 BLAKE2B 31d10f66f55ba897d1072b4376022d0cc85272c2ed91607485fb2222f0a9cd6467ee4854496824cbdd3c11eb665bd41fc475c1b29853bf02a81abdec2f186aef SHA512 8492c0c3713264d1426ab2921a07c3671057404eec116a110b09aaf3acaa093759da6ff4c4c5d835b457a8dd49d6e333ff2d0c918af538a40d7fd2ad577a8b62
-EBUILD ghc-8.10.1.ebuild 25760 BLAKE2B 90c24a0cfbc89d3c6973ae085fa738008bc0a89491ee4d9345dc9cfb21bbd02e9715ed3e9f00e43cbd33dd355835b72198f7e6d51f9eaf68018e58fcb1a6c222 SHA512 7db0aac5cbc96888887c96458f6193732f537797642f202df3edfa5413e5132171873ed2f51f5b038f857665374904ab96130e2c7ff5712fa60a8224ff07e0b2
-EBUILD ghc-8.10.2.ebuild 25785 BLAKE2B 6077cc483722c1904f1a7efaca467624f8c3b5bf9268737070b02ac8f37be6fe3cd5920282eb018d460197defac3869c11f52d1b09fcd7531c60922844e65ca4 SHA512 1c03661b3c747a1500c66ddd5acc2795e69c40381ed9e7d46468851db372906b9987650f6b3d2deeca564993b7af4860bda68923b1167629fb257f0b2cee3cf3
-EBUILD ghc-8.10.3.ebuild 25710 BLAKE2B 5cf8fcacde2c7c57e7b96ca5a826d033a3ab0f4daea692cbcaabba1968ff488bdf655f8e8c68ac446eb43e9b0076f19c945172093cf14d66d7191c984e650c75 SHA512 deff8744a1ef184614ebf003d5e23e51848a973d8126f4cc2d07955fa1fe10e3180a6a0e9a4b55a90f2a17c7796a14a13b8e1610509616d7e50cc57733010f6d
-EBUILD ghc-8.10.4.ebuild 25849 BLAKE2B 444f0198f2355bc0824da86ca732c3019ea73b3c9781ff8deed3d3abf10d41d93b40e7fd46d5791ebe0f1244ca316091f41881cca65f3c1e318669199967fc05 SHA512 303e645c617dbc53b733b481bf47549e327caf90bc10cc865501e64dac0b623045fef6f960866707f215f8d6248e729398c85946fb7b8ee04185b0310f38f6e5
-EBUILD ghc-8.2.1.ebuild 24777 BLAKE2B 39d0fed2d446b5e9c24b9d7b5b4c5db5a19e2c2d1fd189cf273b830934995c52965bd1f4918c4ca0e40e084b88dea8c6308895d2605f030aac1d1412af892f56 SHA512 1eabfec6cdfabf65b7371e08eac6e8452e14dbcf8ccce358274d7b1b13b4c6b6fdd3a5077af025e0eae021f70718d1e62f5f8e0754edbc897e322fb121560c01
-EBUILD ghc-8.2.2.ebuild 24746 BLAKE2B 918b55ca88c702e4642bcf8719e5e3645bff604aedc4021553daf1bbfbe9200773460b48b0f2eb07c848642295dc744efc217f11a18a06585bcb13b21136d3a7 SHA512 ccb2ef01f88965c4274cb407dd3cd3b9817d658a926b190876676a1875042e810b3fdfbfa19fa4ba148bbb2d189bf8e5006f00c6a7d66c39ce434267e62b7b52
-EBUILD ghc-8.4.1.ebuild 24564 BLAKE2B c722911588225628f56c02abd8daab2800ff0a5c5d412b14a0b358cd37f0ccca9db1db517a36b9185e43c2890d1d0024422ead897e56489fc4fc0cd0626c2e62 SHA512 f10fc32b3bf628ee7903ac0a15cc6484475d601a9d9ac2f1163cb61415eb173e90bba1091d006b11205adbceb0df884a43a27a7533d52bb18a80511603c72c96
-EBUILD ghc-8.4.2.ebuild 24789 BLAKE2B 252de8df8ebd5a4ff377595f1880db44f7b3411c846e26d96501d48e62c3dc373d9ea61d1b6ec7be71adf2e40a5aab02e40fff35d35403403b61e82de4e86af4 SHA512 78123fe4944f2178d23850b423f3d9f457b48eb3b957546f751580a7998215938db22d0aa2228b26de9c94ec26d7640a5432b5e3a6d371b1ec3f2af7e400b871
-EBUILD ghc-8.4.3.ebuild 24734 BLAKE2B aa5f2b9bc89a5b78aa93df13c258b53e9b5694d02a2dd861f35a1785fdac4abd99cd10dbb585181c6a4a65b066afdf2672534ed7bdcabd1bf7e5d9e92c5ad9dd SHA512 5c49e104831fffbb3e98aef7fa49f845021e8aa6af5841862f7a6e6d4ddd0c7cae636c1eb09e19b31e08b5596236240128b47af1c3ca1716d9a90e3872a2edcf
-EBUILD ghc-8.6.4.ebuild 25234 BLAKE2B 04ced0f4ebaa55b2c145fc350edbb790bd7b10c86a2d3bcf5de7145577e6ec45d8d5aca2c2384a465d370c0b58a2e1dfb4696e4d8b27d5e35f27e660c9bfa1f4 SHA512 7aa3f386b0f39879c5fd3a1dc6c2147651c8e0c8a5559d7b889d5d6084a97a78934105ebfae30ff3cf667ea5ff858fb28f7522ab3f7c2b4c8d4c8b881a8cd5b8
-EBUILD ghc-8.6.5.ebuild 25552 BLAKE2B 8b9eac7651052d8bea16b73fd2d408fd741d3bc753d2680269b77abe36c0f0ebbc4002fd7b53f7d16c017ae1151235431088fdce4ae1be2162992806eb8564b4 SHA512 37fe53899f866b0049f02a788f6e3351a3f1aa6b65aca0e2b362483874e5f2e00d978b609f367723601f35fac3239dba4beb4821d6cfa98bda35b4e3751010dc
-EBUILD ghc-8.8.1.ebuild 26204 BLAKE2B d3f3bb41c29a61e1bed42160c5f3b06b247ae501fa28dbbc1976c0efb9fc86af687b9643a419fffc440f2430559fd879f950b523c5348e3dd6a102e0d5dc768b SHA512 56053b27e560e29d61157c2436e5bdab27e09d35fc56f18234764d4bbb201d558fa18fbad284e86ec72335e3b9d174a80b8671e6cf2f00c3b3df56a75b1b711c
-EBUILD ghc-8.8.2.ebuild 26160 BLAKE2B 6e7cf133d31eb37bd895a8eaf1bbdf70a073f834eece116ef1279aa4f7321278d94e1256233d3451b7356881cea56f493febee25a968bc849fcfbf969a68a2b6 SHA512 d1fc2b95b4df7eac166373830dcc947612d5cbd0a602e0a1ab778ad6cda49adca32368fe4947d88e0df2ff01103e30a07551e148b38a1594d0729faa9ec987cf
-EBUILD ghc-8.8.3.ebuild 26294 BLAKE2B d2aa4f2ab7604d078e93d214bb6f2fa2b66f038433a872f2f93bf94918b847c28fd54b1c454d03d78e47f8bfa031efabc03d8b4b924082ed90a154d5d4a8a333 SHA512 c613abca4ab47ab17c6f91ad24d787672be4d6b50d85003bad287163e57a91aeb339b7a675ca5bdf632cc966472b9add1ea0e9a491d6f399f8df4f31d619c8c0
+EBUILD ghc-8.10.4.ebuild 25830 BLAKE2B aa68b44948d22cfe476851427bf2bbd3b1257a6ad120ef8612e867ba81c2cff2b12974c82a36d52af5ed5c5fbe6ae3f74a12aa278af6b05ce3356f775c131016 SHA512 c6587aeec865a92f00fc5b967ef9bf87f8a0fafe86516b5d3b4a76d6017c409f521cf2af39e08aacb3b38230f069a72db38be0f923b83f60b221ed82ee133ca0
 EBUILD ghc-8.8.4.ebuild 26410 BLAKE2B f49c37a85a76a0edcbb7a253ef2a1c49291919e89ac933a0da5ac29dba29d16944f0e310c2a7426b4ebe800f2f1c405fbbac69b32217330b5d295efc9bac97e3 SHA512 b6a8f90a0f2b1ada7878696c7e937253c9e7dfea551bdf44b328f0ddcc0416facad4168c0a528d4d3f8235c4cad14da8903062cf887193cc15ca152dd8b860c1
 EBUILD ghc-9.0.1.ebuild 25788 BLAKE2B 8a90d51d7cad901e3477c592f0e4397f0b9d6e682557539ba3c3146e0509dfb387457bbe24ed8f80da1ac03c6abe314ed1fa42466339202b81de1cead3a6473c SHA512 dea79fa098fe288a07c7c29913dd32c80b246c91c6f83be5f4878e9cbb69aefdd1f8d75f34bfbed30fa1286892efdf70060b133cb0916c4d4cbca46ca9e4e0dd
 MISC metadata.xml 877 BLAKE2B 763db2ffce8c241ef55110ca08aa9f7383f14bbe7f96a443b438f027214e04f56f8216b0cd0d871e516a13f07a8a5a52835b0f75ddd3eb9ebd7faccd3a6b03d9 SHA512 516ad3cdb3b26b242668ae2bbf48628c8fb95fdc84ab3dc00afc940c68c2b78a7aa85634c228e9b3427963f0b86263d24ba043d0fd9ae57752e5075392a0322c
diff --git a/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch b/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch
deleted file mode 100644
index 60db34b8b362..000000000000
--- a/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- ghc-7.10.0.20150316-orig/compiler/utils/Pair.hs	2015-03-10 05:43:13.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/utils/Pair.hs	2015-03-17 09:50:48.491115080 +1100
-@@ -15,6 +15,8 @@
- import Data.Foldable
- import Data.Monoid
- import Data.Traversable
-+#else
-+import Control.Applicative ((<$>))
- #endif
- 
- data Pair a = Pair { pFst :: a, pSnd :: a }
---- ghc-7.10.0.20150316-orig/compiler/types/Coercion.hs	2015-03-10 05:43:13.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/types/Coercion.hs	2015-03-17 10:11:21.636047380 +1100
-@@ -104,6 +104,8 @@
- #if __GLASGOW_HASKELL__ < 709
- import Control.Applicative hiding ( empty )
- import Data.Traversable (traverse, sequenceA)
-+#else
-+import Control.Applicative ((<$>))
- #endif
- import FastString
- import ListSetOps
---- ghc-7.10.0.20150316-orig/compiler/typecheck/TcEvidence.hs	2015-03-14 08:48:57.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/typecheck/TcEvidence.hs	2015-03-17 10:26:03.251433371 +1100
-@@ -50,6 +50,8 @@
- #if __GLASGOW_HASKELL__ < 709
- import Control.Applicative
- import Data.Traversable (traverse, sequenceA)
-+#else
-+import Control.Applicative ((<$>))
- #endif
- import qualified Data.Data as Data
- import Outputable
---- ghc-7.10.0.20150316-orig/compiler/hsSyn/HsBinds.hs	2015-03-10 05:43:13.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/hsSyn/HsBinds.hs	2015-03-17 10:42:21.459519033 +1100
-@@ -47,6 +47,8 @@
- import Data.Traversable ( Traversable(..) )
- import Data.Monoid ( mappend )
- import Control.Applicative hiding (empty)
-+#else
-+import Control.Applicative ((<$>))
- #endif
- 
- {-
---- ghc-7.10.0.20150316-orig/compiler/parser/RdrHsSyn.hs	2015-03-10 05:43:13.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/parser/RdrHsSyn.hs	2015-03-17 11:17:48.950929542 +1100
-@@ -91,9 +91,7 @@
- import Util
- import ApiAnnotation
- 
--#if __GLASGOW_HASKELL__ < 709
- import Control.Applicative ((<$>))
--#endif
- import Control.Monad
- 
- import Text.ParserCombinators.ReadP as ReadP
---- ghc-7.10.0.20150316-orig/compiler/typecheck/TcGenDeriv.hs	2015-03-14 08:48:57.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/typecheck/TcGenDeriv.hs	2015-03-17 11:30:39.106508173 +1100
-@@ -59,6 +59,8 @@
- import Var
- #if __GLASGOW_HASKELL__ < 709
- import MonadUtils
-+#else
-+import Control.Applicative ((<$>))
- #endif
- import Outputable
- import Lexeme
---- ghc-7.10.0.20150316-orig/compiler/vectorise/Vectorise/Exp.hs	2015-03-10 05:43:13.000000000 +1100
-+++ ghc-7.10.0.20150316/compiler/vectorise/Vectorise/Exp.hs	2015-03-17 11:46:41.829481669 +1100
-@@ -46,6 +46,8 @@
- import Util
- #if __GLASGOW_HASKELL__ < 709
- import MonadUtils
-+#else
-+import Control.Applicative ((<$>))
- #endif
- 
- import Control.Monad
diff --git a/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch b/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch
deleted file mode 100644
index 106d07aa31c8..000000000000
--- a/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5cc08ebf2f346992a0abd4440252165c90b5ec05
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Sat Jun 20 12:23:00 2015 +0100
-
-    Recognise 'hardhloat' as a valid vendor in a host tuple
-    
-    Observed on a tuple armv7a-hardfloat-linux-gnueabi:
-    > Unknown vendor hardfloat
-    
-    Reported-by: Sergey Alirzaev
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 590edb0..958622c 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1966,6 +1966,9 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[
-   softfloat) # like armv5tel-softfloat-linux-gnueabi
-     $2="unknown"
-     ;;
-+  hardfloat) # like armv7a-hardfloat-linux-gnueabi
-+    $2="unknown"
-+    ;;
-   *)
-     #pass thru by default
-     $2="$1"
diff --git a/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch b/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch
deleted file mode 100644
index 675037946e75..000000000000
--- a/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/ANNOUNCE b/ANNOUNCE
-index 7812eba..0018b37 100644
---- a/ANNOUNCE
-+++ b/ANNOUNCE
-@@ -1,6 +1,6 @@
- 
-    ==============================================================
--    The (Interactive) Glasgow Haskell Compiler -- version 7.10.2
-+    The (Interactive) Glasgow Haskell Compiler -- version 7.10.3
-    ==============================================================
- 
- The GHC Team is pleased to announce a new minor release of GHC. This is a
-@@ -29,7 +29,7 @@ bug-fix release and contains a number of important fixes,
- A more thorough list of the changes in the release can be found in the release
- notes,
- 
--  http://haskell.org/ghc/docs/7.10.2/html/users_guide/release-7-10-2.html
-+  http://haskell.org/ghc/docs/7.10.3/html/users_guide/release-7-10-3.html
- 
- 
- How to get it
-diff --git a/docs/users_guide/intro.xml b/docs/users_guide/intro.xml
-index 3292334..fb7116e 100644
---- a/docs/users_guide/intro.xml
-+++ b/docs/users_guide/intro.xml
-@@ -309,6 +309,7 @@
- 
- &relnotes1;
- &relnotes2;
-+&relnotes3;
- 
- </chapter>
- 
-diff --git a/docs/users_guide/ug-ent.xml.in b/docs/users_guide/ug-ent.xml.in
-index b696aad..3629e93 100644
---- a/docs/users_guide/ug-ent.xml.in
-+++ b/docs/users_guide/ug-ent.xml.in
-@@ -5,6 +5,7 @@
- <!ENTITY intro          SYSTEM "intro.xml" >
- <!ENTITY relnotes1      SYSTEM "7.10.1-notes.xml" >
- <!ENTITY relnotes2      SYSTEM "7.10.2-notes.xml" >
-+<!ENTITY relnotes3      SYSTEM "7.10.3-notes.xml" >
- <!ENTITY using          SYSTEM "using.xml" >
- <!ENTITY code-gens      SYSTEM "codegens.xml" >
- <!ENTITY runtime        SYSTEM "runtime_control.xml" >
diff --git a/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch b/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch
deleted file mode 100644
index 08410fa0cd9b..000000000000
--- a/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On hardened 'cp' drops out XT-pax parking.
-perfinion suggested using 'install', where portage
-might have a chance to save our marking.
-
-Reported-by: Jay Yang
-Gentoo-bug: https://bugs.gentoo.org/518734
-diff --git a/rules/build-prog.mk b/rules/build-prog.mk
-index 399369e..2ee9cd5 100644
---- a/rules/build-prog.mk
-+++ b/rules/build-prog.mk
-@@ -288,3 +288,3 @@ endif
- $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/.
--	"$$(CP)" -p $$< $$@
-+	$$(INSTALL) -m 755 $$< $$@
diff --git a/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch b/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch
deleted file mode 100644
index d01cb49affbd..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit bb5953484579968c984d074ca1af5d21e1c9e7a0
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Feb 10 12:45:58 2014 +0300
-
-    rts: unrust 'libbfd' debug symbols parser
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/configure.ac b/configure.ac
-index e7fbc7f..e47979c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -801,7 +801,8 @@ fi
- dnl ** check whether this machine has BFD and libiberty installed (used for debugging)
- dnl    the order of these tests matters: bfd needs libiberty
- AC_CHECK_LIB(iberty, xmalloc)
--AC_CHECK_LIB(bfd,    bfd_uncompress_section_contents)
-+dnl 'bfd_init' is a rare non-macro in libbfd
-+AC_CHECK_LIB(bfd,    bfd_init)
- 
- dnl ################################################################
- dnl Check for libraries
-diff --git a/rts/Printer.c b/rts/Printer.c
-index ca9ca49..ce02b02 100644
---- a/rts/Printer.c
-+++ b/rts/Printer.c
-@@ -48,6 +48,9 @@ void printPtr( StgPtr p )
-     raw = lookupGHCName(p);
-     if (raw != NULL) {
-         printZcoded(raw);
-+        /* it can be just a C symbol, like 'stg_returnToStackTop' */
-+        debugBelch("<%s>", raw);
-+        debugBelch("[%p]", p);
-     } else {
-         debugBelch("%p", p);
-     }
-@@ -794,7 +797,7 @@ static void printZcoded( const char *raw )
-    disabling this for now. 
- */
- #ifdef USING_LIBBFD
--
-+#include "../mk/config.h" /* silly BFD's requirement */
- #include <bfd.h>
- 
- /* Fairly ad-hoc piece of code that seems to filter out a lot of
-@@ -863,7 +866,10 @@ extern void DEBUG_LoadSymbols( char *name )
-         for( i = 0; i != number_of_symbols; ++i ) {
-             symbol_info info;
-             bfd_get_symbol_info(abfd,symbol_table[i],&info);
--            /*debugBelch("\t%c\t0x%x      \t%s\n",info.type,(nat)info.value,info.name); */
-+            if (0)
-+            {
-+                debugBelch("\t%c\t0x%x      \t%s\n",info.type,(nat)info.value,info.name);
-+            }
-             if (isReal(info.type, info.name)) {
-                 num_real_syms += 1;
-             }
-diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
-index aa7306f..5bdef94 100644
---- a/rts/RtsStartup.c
-+++ b/rts/RtsStartup.c
-@@ -19,6 +19,7 @@
- #include "RtsFlags.h"
- #include "RtsUtils.h"
- #include "Prelude.h"
-+#include "Printer.h"    /* DEBUG_LoadSymbols */
- #include "Schedule.h"   /* initScheduler */
- #include "Stats.h"      /* initStats */
- #include "STM.h"        /* initSTM */
-@@ -162,6 +163,11 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config)
-                       rts_config.rts_opts_enabled, rts_config.rts_opts, rts_config.rts_hs_main);
-     }
- 
-+#ifdef DEBUG
-+    /* load debugging symbols */
-+    DEBUG_LoadSymbols((*argv)[0]);
-+#endif /* DEBUG */
-+
-     /* Initialise the stats department, phase 1 */
-     initStats1();
- 
diff --git a/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch b/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch
deleted file mode 100644
index efdd54fbf3fb..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit b0cf3ab7a69b878a4335d21a347b56e4b0ca0b7b
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Apr 14 19:06:24 2014 +0300
-
-    compiler/cmm/PprC.hs: constify local string literals
-    
-    Consider one-line module
-        module B (v) where v = "hello"
-    in -fvia-C mode it generates code like
-        static char gibberish_str[] = "hello";
-    
-    It uselessly eats data section (precious resource on ia64!).
-    The patch switches genrator to emit:
-        static const char gibberish_str[] = "hello";
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs
-index 2398981..fdb578d 100644
---- a/compiler/cmm/PprC.hs
-+++ b/compiler/cmm/PprC.hs
-@@ -112,6 +112,12 @@ pprTop (CmmProc infos clbl _ graph) =
- 
- -- We only handle (a) arrays of word-sized things and (b) strings.
- 
-+pprTop (CmmData ReadOnlyData (Statics lbl [CmmString str])) =
-+  hcat [
-+    pprLocalness lbl, ptext (sLit "const char "), ppr lbl,
-+    ptext (sLit "[] = "), pprStringInCStyle str, semi
-+  ]
-+
- pprTop (CmmData _section (Statics lbl [CmmString str])) =
-   hcat [
-     pprLocalness lbl, ptext (sLit "char "), ppr lbl,
diff --git a/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch b/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch
deleted file mode 100644
index c8570c06940b..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 326046739801a380c5457ef4c87bce8fb95497ba
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sun Aug 10 22:12:28 2014 +0300
-
-    systools info: fix warning about C compiler (message said about linker)
-    
-    Summary: Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    
-    Test Plan: build-tested
-    
-    Reviewers: austin
-    
-    Reviewed By: austin
-    
-    Subscribers: phaskell, simonmar, relrod, ezyang, carter
-    
-    Differential Revision: https://phabricator.haskell.org/D132
-
-diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
-index 1c1c52c..72fa19b 100644
---- a/compiler/main/SysTools.lhs
-+++ b/compiler/main/SysTools.lhs
-@@ -809,10 +809,10 @@ getCompilerInfo' dflags = do
-             )
-             (\err -> do
-                 debugTraceMsg dflags 2
--                    (text "Error (figuring out compiler information):" <+>
-+                    (text "Error (figuring out C compiler information):" <+>
-                      text (show err))
-                 errorMsg dflags $ hang (text "Warning:") 9 $
--                  text "Couldn't figure out linker information!" $$
-+                  text "Couldn't figure out C compiler information!" $$
-                   text "Make sure you're using GNU gcc, or clang"
-                 return UnknownCC)
-   return info
diff --git a/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch b/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch
deleted file mode 100644
index 16a552fdd4be..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 78863edbb0751f5c9694ea10c6132a87cfd0ee10
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Wed Aug 27 22:20:33 2014 +0300
-
-    Revert "disable shared libs on sparc (linux/solaris) (fixes #8857)"
-    
-    This reverts commit 623883f1ed0ee11cc925c4590fb09565403fd231.
-    
-    The commit a93ab43ab5f40cadbedea2f6342b93c245e91434
-        driver: pass '-fPIC' option to assembler as well
-    fixes shared libraries on sparc at least on linux.
-    
-    Properly fixes Issue #8857
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index c210cd3..392237f 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -97,9 +97,7 @@ endif
- # Some platforms don't support shared libraries
- NoSharedLibsPlatformList = powerpc-unknown-linux \
- 	x86_64-unknown-mingw32 \
--	i386-unknown-mingw32 \
--	sparc-sun-solaris2 \
--	sparc-unknown-linux
-+	i386-unknown-mingw32
- 
- ifeq "$(SOLARIS_BROKEN_SHLD)" "YES"
- NoSharedLibsPlatformList += i386-unknown-solaris2
diff --git a/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch b/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch
deleted file mode 100644
index 434be8b1bdad..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-commit fa31e8f4a0f853848d96549a429083941877bf8d
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Sun Dec 14 14:30:12 2014 +0000
-
-    powerpc: fix and enable shared libraries by default on linux
-    
-    Summary:
-    And fix things all the way down to it. Namely:
-        - remove 'r30' from free registers, it's an .LCTOC1 register
-          for gcc. generated .plt stubs expect it to be initialised.
-        - fix PicBase computation, which originally forgot to use 'tmp'
-          reg in 'initializePicBase_ppc.fetchPC'
-        - mark 'ForeighTarget's as implicitly using 'PicBase' register
-          (see comment for details)
-        - add 64-bit MO_Sub and test on alloclimit3/4 regtests
-        - fix dynamic label offsets to match with .LCTOC1 offset
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-    
-    Test Plan: validate passes equal amount of vanilla/dyn tests
-    
-    Reviewers: simonmar, erikd, austin
-    
-    Reviewed By: erikd, austin
-    
-    Subscribers: carter, thomie
-    
-    Differential Revision: https://phabricator.haskell.org/D560
-    
-    GHC Trac Issues: #8024, #9831
-
-diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
-index 0f2c0ae..37b8ada 100644
---- a/compiler/cmm/CLabel.hs
-+++ b/compiler/cmm/CLabel.hs
-@@ -1170,7 +1170,8 @@ pprDynamicLinkerAsmLabel platform dllInfo lbl
-    else if osElfTarget (platformOS platform)
-         then if platformArch platform == ArchPPC
-              then case dllInfo of
--                  CodeStub  -> ppr lbl <> text "@plt"
-+                  CodeStub  -> -- See Note [.LCTOC1 in PPC PIC code]
-+                               ppr lbl <> text "+32768@plt"
-                   SymbolPtr -> text ".LC_" <> ppr lbl
-                   _         -> panic "pprDynamicLinkerAsmLabel"
-              else if platformArch platform == ArchX86_64
-diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs
-index 9b5c080..6326a8b 100644
---- a/compiler/nativeGen/PIC.hs
-+++ b/compiler/nativeGen/PIC.hs
-@@ -54,7 +54,6 @@ import qualified X86.Instr      as X86
- 
- import Platform
- import Instruction
--import Size
- import Reg
- import NCGMonad
- 
-@@ -468,11 +467,8 @@ pprGotDeclaration dflags ArchX86 OSDarwin
- pprGotDeclaration _ _ OSDarwin
-         = empty
- 
---- pprGotDeclaration
-+-- Emit GOT declaration
- -- Output whatever needs to be output once per .s file.
---- The .LCTOC1 label is defined to point 32768 bytes into the table,
---- to make the most of the PPC's 16-bit displacements.
---- Only needed for PIC.
- pprGotDeclaration dflags arch os
-         | osElfTarget os
-         , arch  /= ArchPPC_64
-@@ -482,6 +478,7 @@ pprGotDeclaration dflags arch os
-         | osElfTarget os
-         , arch  /= ArchPPC_64
-         = vcat [
-+                -- See Note [.LCTOC1 in PPC PIC code]
-                 ptext (sLit ".section \".got2\",\"aw\""),
-                 ptext (sLit ".LCTOC1 = .+32768") ]
- 
-@@ -688,12 +685,7 @@ pprImportedSymbol _ _ _
- 
- 
- -- Get a pointer to our own fake GOT, which is defined on a per-module basis.
---- This is exactly how GCC does it, and it's quite horrible:
---- We first fetch the address of a local label (mkPicBaseLabel).
---- Then we add a 16-bit offset to that to get the address of a .long that we
---- define in .text space right next to the proc. This .long literal contains
---- the (32-bit) offset from our local label to our global offset table
---- (.LCTOC1 aka gotOffLabel).
-+-- This is exactly how GCC does it in linux.
- 
- initializePicBase_ppc
-         :: Arch -> OS -> Reg
-@@ -704,18 +696,9 @@ initializePicBase_ppc ArchPPC os picReg
-     (CmmProc info lab live (ListGraph blocks) : statics)
-     | osElfTarget os
-     = do
--        dflags <- getDynFlags
--        gotOffLabel <- getNewLabelNat
--        tmp <- getNewRegNat $ intSize (wordWidth dflags)
-         let
--            gotOffset = CmmData Text $ Statics gotOffLabel [
--                            CmmStaticLit (CmmLabelDiffOff gotLabel
--                                                          mkPicBaseLabel
--                                                          0)
--                        ]
--            offsetToOffset
--                        = PPC.ImmConstantDiff
--                                (PPC.ImmCLbl gotOffLabel)
-+            gotOffset = PPC.ImmConstantDiff
-+                                (PPC.ImmCLbl gotLabel)
-                                 (PPC.ImmCLbl mkPicBaseLabel)
- 
-             blocks' = case blocks of
-@@ -726,15 +709,23 @@ initializePicBase_ppc ArchPPC os picReg
-               | bID `mapMember` info = fetchPC b
-               | otherwise            = b
- 
-+            -- GCC does PIC prologs thusly:
-+            --     bcl 20,31,.L1
-+            -- .L1:
-+            --     mflr 30
-+            --     addis 30,30,.LCTOC1-.L1@ha
-+            --     addi 30,30,.LCTOC1-.L1@l
-+            -- TODO: below we use it over temporary register,
-+            -- it can and should be optimised by picking
-+            -- correct PIC reg.
-             fetchPC (BasicBlock bID insns) =
-               BasicBlock bID (PPC.FETCHPC picReg
--                              : PPC.ADDIS tmp picReg (PPC.HI offsetToOffset)
--                              : PPC.LD PPC.archWordSize tmp
--                                   (PPC.AddrRegImm tmp (PPC.LO offsetToOffset))
--                              : PPC.ADD picReg picReg (PPC.RIReg picReg)
-+                              : PPC.ADDIS picReg picReg (PPC.HA gotOffset)
-+                              : PPC.ADDI picReg picReg (PPC.LO gotOffset)
-+                              : PPC.MR PPC.r30 picReg
-                               : insns)
- 
--        return (CmmProc info lab live (ListGraph blocks') : gotOffset : statics)
-+        return (CmmProc info lab live (ListGraph blocks') : statics)
- 
- 
- initializePicBase_ppc ArchPPC OSDarwin picReg
-diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs
-index ddf483a..c1c4a74 100644
---- a/compiler/nativeGen/PPC/CodeGen.hs
-+++ b/compiler/nativeGen/PPC/CodeGen.hs
-@@ -54,7 +54,7 @@ import Outputable
- import Unique
- import DynFlags
- 
--import Control.Monad    ( mapAndUnzipM )
-+import Control.Monad    ( mapAndUnzipM, when )
- import Data.Bits
- import Data.Word
- 
-@@ -355,6 +355,19 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
-                        ADDE rhi r1hi r2hi ]
-    return (ChildCode64 code rlo)
- 
-+iselExpr64 (CmmMachOp (MO_Sub _) [e1,e2]) = do
-+   ChildCode64 code1 r1lo <- iselExpr64 e1
-+   ChildCode64 code2 r2lo <- iselExpr64 e2
-+   (rlo,rhi) <- getNewRegPairNat II32
-+   let
-+        r1hi = getHiVRegFromLo r1lo
-+        r2hi = getHiVRegFromLo r2lo
-+        code =  code1 `appOL`
-+                code2 `appOL`
-+                toOL [ SUBFC rlo r2lo r1lo,
-+                       SUBFE rhi r2hi r1hi ]
-+   return (ChildCode64 code rlo)
-+
- iselExpr64 (CmmMachOp (MO_UU_Conv W32 W64) [expr]) = do
-     (expr_reg,expr_code) <- getSomeReg expr
-     (rlo, rhi) <- getNewRegPairNat II32
-@@ -918,8 +931,12 @@ genCCall' dflags gcp target dest_regs args0
-                                                         (toOL []) []
- 
-         (labelOrExpr, reduceToFF32) <- case target of
--            ForeignTarget (CmmLit (CmmLabel lbl)) _ -> return (Left lbl, False)
--            ForeignTarget expr _ -> return  (Right expr, False)
-+            ForeignTarget (CmmLit (CmmLabel lbl)) _ -> do
-+                uses_pic_base_implicitly
-+                return (Left lbl, False)
-+            ForeignTarget expr _ -> do
-+                uses_pic_base_implicitly
-+                return (Right expr, False)
-             PrimTarget mop -> outOfLineMachOp mop
- 
-         let codeBefore = move_sp_down finalStack `appOL` passArgumentsCode
-@@ -940,6 +957,13 @@ genCCall' dflags gcp target dest_regs args0
-     where
-         platform = targetPlatform dflags
- 
-+        uses_pic_base_implicitly = do
-+            -- See Note [implicit register in PPC PIC code]
-+            -- on why we claim to use PIC register here
-+            when (gopt Opt_PIC dflags) $ do
-+                _ <- getPicBaseNat archWordSize
-+                return ()
-+
-         initialStackOffset = case gcp of
-                              GCPDarwin -> 24
-                              GCPLinux  -> 8
-@@ -1431,3 +1455,21 @@ coerceFP2Int _ toRep x = do
-                 -- read low word of value (high word is undefined)
-             LD II32 dst (spRel dflags 3)]
-     return (Any (intSize toRep) code')
-+
-+-- Note [.LCTOC1 in PPC PIC code]
-+-- The .LCTOC1 label is defined to point 32768 bytes into the GOT table
-+-- to make the most of the PPC's 16-bit displacements.
-+-- As 16-bit signed offset is used (usually via addi/lwz instructions)
-+-- first element will have '-32768' offset against .LCTOC1.
-+
-+-- Note [implicit register in PPC PIC code]
-+-- PPC generates calls by labels in assembly
-+-- in form of:
-+--     bl puts+32768@plt
-+-- in this form it's not seen directly (by GHC NCG)
-+-- that r30 (PicBaseReg) is used,
-+-- but r30 is a required part of PLT code setup:
-+--   puts+32768@plt:
-+--       lwz     r11,-30484(r30) ; offset in .LCTOC1
-+--       mtctr   r11
-+--       bctr
-diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs
-index f5b9506..b7081f9 100644
---- a/compiler/nativeGen/PPC/Instr.hs
-+++ b/compiler/nativeGen/PPC/Instr.hs
-@@ -205,8 +205,11 @@ data Instr
-     | ADD     Reg Reg RI            -- dst, src1, src2
-     | ADDC    Reg Reg Reg           -- (carrying) dst, src1, src2
-     | ADDE    Reg Reg Reg           -- (extend) dst, src1, src2
-+    | ADDI    Reg Reg Imm           -- Add Immediate dst, src1, src2
-     | ADDIS   Reg Reg Imm           -- Add Immediate Shifted dst, src1, src2
-     | SUBF    Reg Reg Reg           -- dst, src1, src2 ; dst = src2 - src1
-+    | SUBFC   Reg Reg Reg           -- (carrying) dst, src1, src2 ; dst = src2 - src1
-+    | SUBFE   Reg Reg Reg           -- (extend) dst, src1, src2 ; dst = src2 - src1
-     | MULLW   Reg Reg RI
-     | DIVW    Reg Reg Reg
-     | DIVWU   Reg Reg Reg
-@@ -284,8 +287,11 @@ ppc_regUsageOfInstr platform instr
-     ADD     reg1 reg2 ri     -> usage (reg2 : regRI ri, [reg1])
-     ADDC    reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-     ADDE    reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-+    ADDI    reg1 reg2 _      -> usage ([reg2], [reg1])
-     ADDIS   reg1 reg2 _      -> usage ([reg2], [reg1])
-     SUBF    reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-+    SUBFC   reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-+    SUBFE   reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-     MULLW   reg1 reg2 ri     -> usage (reg2 : regRI ri, [reg1])
-     DIVW    reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-     DIVWU   reg1 reg2 reg3   -> usage ([reg2,reg3], [reg1])
-@@ -358,8 +364,11 @@ ppc_patchRegsOfInstr instr env
-     ADD     reg1 reg2 ri    -> ADD (env reg1) (env reg2) (fixRI ri)
-     ADDC    reg1 reg2 reg3  -> ADDC (env reg1) (env reg2) (env reg3)
-     ADDE    reg1 reg2 reg3  -> ADDE (env reg1) (env reg2) (env reg3)
-+    ADDI    reg1 reg2 imm   -> ADDI (env reg1) (env reg2) imm
-     ADDIS   reg1 reg2 imm   -> ADDIS (env reg1) (env reg2) imm
-     SUBF    reg1 reg2 reg3  -> SUBF (env reg1) (env reg2) (env reg3)
-+    SUBFC   reg1 reg2 reg3  -> SUBFC (env reg1) (env reg2) (env reg3)
-+    SUBFE   reg1 reg2 reg3  -> SUBFE (env reg1) (env reg2) (env reg3)
-     MULLW   reg1 reg2 ri    -> MULLW (env reg1) (env reg2) (fixRI ri)
-     DIVW    reg1 reg2 reg3  -> DIVW (env reg1) (env reg2) (env reg3)
-     DIVWU   reg1 reg2 reg3  -> DIVWU (env reg1) (env reg2) (env reg3)
-diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
-index 6851769..f59d51f 100644
---- a/compiler/nativeGen/PPC/Ppr.hs
-+++ b/compiler/nativeGen/PPC/Ppr.hs
-@@ -525,6 +525,16 @@ pprInstr (BCTRL _) = hcat [
-         ptext (sLit "bctrl")
-     ]
- pprInstr (ADD reg1 reg2 ri) = pprLogic (sLit "add") reg1 reg2 ri
-+pprInstr (ADDI reg1 reg2 imm) = hcat [
-+        char '\t',
-+        ptext (sLit "addi"),
-+        char '\t',
-+        pprReg reg1,
-+        ptext (sLit ", "),
-+        pprReg reg2,
-+        ptext (sLit ", "),
-+        pprImm imm
-+    ]
- pprInstr (ADDIS reg1 reg2 imm) = hcat [
-         char '\t',
-         ptext (sLit "addis"),
-@@ -539,6 +549,8 @@ pprInstr (ADDIS reg1 reg2 imm) = hcat [
- pprInstr (ADDC reg1 reg2 reg3) = pprLogic (sLit "addc") reg1 reg2 (RIReg reg3)
- pprInstr (ADDE reg1 reg2 reg3) = pprLogic (sLit "adde") reg1 reg2 (RIReg reg3)
- pprInstr (SUBF reg1 reg2 reg3) = pprLogic (sLit "subf") reg1 reg2 (RIReg reg3)
-+pprInstr (SUBFC reg1 reg2 reg3) = pprLogic (sLit "subfc") reg1 reg2 (RIReg reg3)
-+pprInstr (SUBFE reg1 reg2 reg3) = pprLogic (sLit "subfe") reg1 reg2 (RIReg reg3)
- pprInstr (MULLW reg1 reg2 ri@(RIReg _)) = pprLogic (sLit "mullw") reg1 reg2 ri
- pprInstr (MULLW reg1 reg2 ri@(RIImm _)) = pprLogic (sLit "mull") reg1 reg2 ri
- pprInstr (DIVW reg1 reg2 reg3) = pprLogic (sLit "divw") reg1 reg2 (RIReg reg3)
-diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs
-index 0f636bf..69e69c0 100644
---- a/compiler/nativeGen/PPC/Regs.hs
-+++ b/compiler/nativeGen/PPC/Regs.hs
-@@ -37,7 +37,8 @@ module PPC.Regs (
-         fits16Bits,
-         makeImmediate,
-         fReg,
--        sp, r3, r4, r27, r28, f1, f20, f21,
-+        sp, r3, r4, r27, r28, r30,
-+        f1, f20, f21,
- 
-         allocatableRegs
- 
-@@ -295,12 +296,13 @@ point registers.
- fReg :: Int -> RegNo
- fReg x = (32 + x)
- 
--sp, r3, r4, r27, r28, f1, f20, f21 :: Reg
-+sp, r3, r4, r27, r28, r30, f1, f20, f21 :: Reg
- sp      = regSingle 1
- r3      = regSingle 3
- r4      = regSingle 4
- r27     = regSingle 27
- r28     = regSingle 28
-+r30     = regSingle 30
- f1      = regSingle $ fReg 1
- f20     = regSingle $ fReg 20
- f21     = regSingle $ fReg 21
-diff --git a/includes/CodeGen.Platform.hs b/includes/CodeGen.Platform.hs
-index 9916e0e..1d46a01 100644
---- a/includes/CodeGen.Platform.hs
-+++ b/includes/CodeGen.Platform.hs
-@@ -881,6 +881,8 @@ freeReg 1 = fastBool False -- The Stack Pointer
- # if !MACHREGS_darwin
- -- most non-darwin powerpc OSes use r2 as a TOC pointer or something like that
- freeReg 2 = fastBool False
-+-- at least linux in -fPIC relies on r30 in PLT stubs
-+freeReg 30 = fastBool False
- # endif
- # ifdef REG_Base
- freeReg REG_Base = fastBool False
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index 0f5820f..8f134bc 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -95,7 +95,7 @@ TargetElf = YES
- endif
- 
- # Some platforms don't support shared libraries
--NoSharedLibsPlatformList = powerpc-unknown-linux \
-+NoSharedLibsPlatformList = \
- 	x86_64-unknown-mingw32 \
- 	i386-unknown-mingw32
- 
diff --git a/dev-lang/ghc/files/ghc-7.8.4-gold.patch b/dev-lang/ghc/files/ghc-7.8.4-gold.patch
deleted file mode 100644
index a8e9b1e6c857..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.4-gold.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/536426
-Reported-by: Eric Siegel
-commit 021b7978d14799bae779907faf7490cfd21b3f46
-Author: Austin Seipp <austin@well-typed.com>
-Date:   Sun Jul 20 10:13:15 2014 -0500
-
-    driver: use absolute paths in ld scripts (#7452)
-    
-    Patch contributed by slowmo.
-    
-    Signed-off-by: Austin Seipp <austin@well-typed.com>
-
-diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
-index 11427e2..49126fe 100644
---- a/compiler/main/DriverPipeline.hs
-+++ b/compiler/main/DriverPipeline.hs
-@@ -2166,7 +2166,9 @@ joinObjectFiles dflags o_files output_fn = do
-   if ldIsGnuLd
-      then do
-           script <- newTempName dflags "ldscript"
--          writeFile script $ "INPUT(" ++ unwords o_files ++ ")"
-+          cwd <- getCurrentDirectory
-+          let o_files_abs = map (cwd </>) o_files
-+          writeFile script $ "INPUT(" ++ unwords o_files_abs ++ ")"
-           ld_r [SysTools.FileOption "" script] ccInfo
-      else if sLdSupportsFilelist mySettings
-      then do
diff --git a/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch b/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch
deleted file mode 100644
index 9d50792bcf45..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b677ba51cf8131a6f6ddcdfee8dd2a8c4c2b4ac7 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit@google.com>
-Date: Sat, 17 Jan 2015 14:27:13 +0000
-Subject: [PATCH 1/3] CMM: add a mechanism to import C data labels
-
-Fixes threaded runtime on ia64.
-sm_mutex there was not referenced correctly.
-
-Signed-off-by: Sergei Trofimovich <siarheit@google.com>
----
- compiler/cmm/CmmParse.y | 4 ++++
- rts/Exception.cmm       | 2 +-
- rts/PrimOps.cmm         | 6 +++---
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/compiler/cmm/CmmParse.y.source b/compiler/cmm/CmmParse.y.source
-index 6b51e51..fd9489b 100644
---- a/compiler/cmm/CmmParse.y.source
-+++ b/compiler/cmm/CmmParse.y.source
-@@ -575,6 +575,10 @@ importName
-         : NAME  
-         { ($1, mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction) }
- 
-+        -- as previous 'NAME', but 'IsData'
-+        | 'CLOSURE' NAME
-+        { ($2, mkForeignLabel $2 Nothing ForeignLabelInExternalPackage IsData) }
-+
-         -- A label imported with an explicit packageId.
-         | STRING NAME
-         { ($2, mkCmmCodeLabel (fsToPackageKey (mkFastString $1)) $2) }
-diff --git a/rts/Exception.cmm b/rts/Exception.cmm
-index 5007ef3..8d19c14 100644
---- a/rts/Exception.cmm
-+++ b/rts/Exception.cmm
-@@ -13,7 +13,7 @@
- #include "Cmm.h"
- #include "RaiseAsync.h"
- 
--import ghczmprim_GHCziTypes_True_closure;
-+import CLOSURE ghczmprim_GHCziTypes_True_closure;
- 
- /* -----------------------------------------------------------------------------
-    Exception Primitives
-diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
-index 3e8612c..2e6ca46 100644
---- a/rts/PrimOps.cmm
-+++ b/rts/PrimOps.cmm
-@@ -28,12 +28,12 @@
- import pthread_mutex_lock;
- import pthread_mutex_unlock;
- #endif
--import base_ControlziExceptionziBase_nestedAtomically_closure;
-+import CLOSURE base_ControlziExceptionziBase_nestedAtomically_closure;
- import EnterCriticalSection;
- import LeaveCriticalSection;
--import ghczmprim_GHCziTypes_False_closure;
-+import CLOSURE ghczmprim_GHCziTypes_False_closure;
- #if defined(USE_MINIINTERPRETER) || !defined(mingw32_HOST_OS)
--import sm_mutex;
-+import CLOSURE sm_mutex;
- #endif
- 
- /*-----------------------------------------------------------------------------
--- 
-2.2.1
-
diff --git a/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch b/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch
deleted file mode 100644
index dc5410da3020..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 501e05bb1b8974fc8b6c9eee86c87c367e87a211
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Tue Aug 30 12:10:47 2016 +0100
-
-    GhcMake: limit Capability count to CPU count in parallel mode
-    
-    In Trac #9221 one of problems using high --jobs=<N>
-    is amount of mutator (or GC) threads we crate.
-    
-    We use userspace spinning-and-yielding (see ACQUIRE_SPIN_LOCK)
-    to acess work stealing queues. In case of
-    N-worker-threads > N-CPUs fraction of time when
-    thread holding spin lock gets descheduled by kernel
-    increases. That causes other threads to waste CPU time
-    before giving up CPU.
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-    
-    Test Plan:
-    ghc --make -j8 and -j80 have comparable sys time
-    on a 8-core system.
-    
-    Reviewers: austin, gintas, bgamari, simonmar
-    
-    Reviewed By: bgamari, simonmar
-    
-    Subscribers: thomie
-    
-    Differential Revision: https://phabricator.haskell.org/D2482
-    
-    GHC Trac Issues: #9221
-
-diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
-index 9dc43cd..905df63 100644
---- a/compiler/main/GhcMake.hs
-+++ b/compiler/main/GhcMake.hs
-@@ -761,7 +761,12 @@ parUpsweep n_jobs old_hpt stable_mods cleanup sccs = do
- 
-     let updNumCapabilities = liftIO $ do
-             n_capabilities <- getNumCapabilities
--            unless (n_capabilities /= 1) $ setNumCapabilities n_jobs
-+            n_cpus <- getNumProcessors
-+            -- Setting number of capabilities more than
-+            -- CPU count usually leads to high userspace
-+            -- lock contention. Trac #9221
-+            let n_caps = min n_jobs n_cpus
-+            unless (n_capabilities /= 1) $ setNumCapabilities n_caps
-             return n_capabilities
-     -- Reset the number of capabilities once the upsweep ends.
-     let resetNumCapabilities orig_n = liftIO $ setNumCapabilities orig_n
diff --git a/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch b/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch
deleted file mode 100644
index b46e57301782..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit bdfc5375f219d6def81effda4e57cb56d01fc917
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Tue Aug 30 12:10:54 2016 +0100
-
-    rts: enable parallel GC scan of large (32M+) allocation area
-    
-    Parallel GC does not scan large allocation area (-A)
-    effectively as it does not do work stealing from nursery
-    by default.
-    
-    That leads to large imbalance when only one of threads
-    overflows allocation area: most of GC threads finish
-    quickly (as there is not much to collect) and sit idle
-    waiting while single GC thread finishes scan of single
-    allocation area for that thread.
-    
-    The patch enables work stealing for (equivalent of -qb0)
-    allocation area of -A32M or higher.
-    
-    Tested on a highlighting-kate package from Trac #9221
-    
-    On 8-core machine the difference is around 5% faster
-    of wall-clock time. On 24-core VM the speedup is 20%.
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-    
-    Test Plan: measured wall time and GC parallelism on highlighting-kate build
-    
-    Reviewers: austin, bgamari, erikd, simonmar
-    
-    Reviewed By: bgamari, simonmar
-    
-    Subscribers: thomie
-    
-    Differential Revision: https://phabricator.haskell.org/D2483
-    
-    GHC Trac Issues: #9221
-
-diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
-index fda33f0..7a719b9 100644
---- a/rts/RtsFlags.c
-+++ b/rts/RtsFlags.c
-@@ -237,1 +237,1 @@ void initRtsFlagsDefaults(void)
--    RtsFlags.ParFlags.parGcLoadBalancingGen = 1;
-+    RtsFlags.ParFlags.parGcLoadBalancingGen = ~0u; /* auto, based on -A */
-@@ -1398,2 +1390,19 @@ static void normaliseRtsOpts (void)
-     }
- 
-+#ifdef THREADED_RTS
-+    if (RtsFlags.ParFlags.parGcLoadBalancingGen == ~0u) {
-+        StgWord alloc_area_bytes
-+            = RtsFlags.GcFlags.minAllocAreaSize * BLOCK_SIZE;
-+
-+        // If allocation area is larger that CPU cache
-+        // we can finish scanning quicker doing work-stealing
-+        // scan. Trac #9221
-+        // 32M looks big enough not to fit into L2 cache
-+        // of popular modern CPUs.
-+        if (alloc_area_bytes >= 32 * 1024 * 1024) {
-+            RtsFlags.ParFlags.parGcLoadBalancingGen = 0;
-+        } else {
-+            RtsFlags.ParFlags.parGcLoadBalancingGen = 1;
-+        }
-+    }
-+#endif
diff --git a/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch b/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch
deleted file mode 100644
index 4752f4482678..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-commit 5efbf0d243984444cf352ad6f0d147e226c64498
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Thu Sep 1 17:34:58 2016 +0100
-
-    restore -fmax-worker-args handling (Trac #11565)
-    
-    maxWorkerArgs handling was accidentally lost 3 years ago
-    in a major update of demand analysis
-        commit 0831a12ea2fc73c33652eeec1adc79fa19700578
-    
-    Old regression is noticeable as:
-    - code bloat (requires stack reshuffling)
-    - compilation slowdown (more code to optimise/generate)
-    - and increased heap usage (DynFlags unboxing/reboxing?)
-    
-    On a simple compile benchmark this change causes heap
-    allocation drop from 70G don to 67G (ghc perf build).
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-    
-    Reviewers: simonpj, ezyang, goldfire, austin, bgamari
-    
-    Reviewed By: simonpj, ezyang
-    
-    Subscribers: thomie
-    
-    Differential Revision: https://phabricator.haskell.org/D2503
-    
-    GHC Trac Issues: #11565
-
-diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs
-index 10d5614..7166f57 100644
---- a/compiler/specialise/SpecConstr.hs
-+++ b/compiler/specialise/SpecConstr.hs
-@@ -29,7 +29,7 @@ import CoreFVs          ( exprsFreeVarsList )
- import CoreMonad
- import Literal          ( litIsLifted )
- import HscTypes         ( ModGuts(..) )
--import WwLib            ( mkWorkerArgs )
-+import WwLib            ( isWorkerSmallEnough, mkWorkerArgs )
- import DataCon
- import Coercion         hiding( substCo )
- import Rules
-@@ -1533,10 +1533,14 @@ specialise env bind_calls (RI { ri_fn = fn, ri_lam_bndrs = arg_bndrs
- 
-   | Just all_calls <- lookupVarEnv bind_calls fn
-   = -- pprTrace "specialise entry {" (ppr fn <+> ppr (length all_calls)) $
--    do  { (boring_call, pats) <- callsToPats env specs arg_occs all_calls
--
-+    do  { (boring_call, all_pats) <- callsToPats env specs arg_occs all_calls
-                 -- Bale out if too many specialisations
--        ; let n_pats      = length pats
-+        ; let pats = filter (is_small_enough . fst) all_pats
-+              is_small_enough vars = isWorkerSmallEnough (sc_dflags env) vars
-+                  -- We are about to construct w/w pair in 'spec_one'.
-+                  -- Omit specialisation leading to high arity workers.
-+                  -- See Note [Limit w/w arity]
-+              n_pats      = length pats
-               spec_count' = n_pats + spec_count
-         ; case sc_count env of
-             Just max | not (sc_force env) && spec_count' > max
-diff --git a/compiler/stranal/WwLib.hs b/compiler/stranal/WwLib.hs
-index 09bc204..d9460d9 100644
---- a/compiler/stranal/WwLib.hs
-+++ b/compiler/stranal/WwLib.hs
-@@ -8,6 +8,7 @@
- 
- module WwLib ( mkWwBodies, mkWWstr, mkWorkerArgs
-              , deepSplitProductType_maybe, findTypeShape
-+             , isWorkerSmallEnough
-  ) where
- 
- #include "HsVersions.h"
-@@ -144,7 +145,8 @@ mkWwBodies dflags fam_envs fun_ty demands res_info one_shots
-               wrapper_body = wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var
-               worker_body = mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args
- 
--        ; if useful1 && not (only_one_void_argument) || useful2
-+        ; if isWorkerSmallEnough dflags work_args
-+             && (useful1 && not only_one_void_argument || useful2)
-           then return (Just (worker_args_dmds, wrapper_body, worker_body))
-           else return Nothing
-         }
-@@ -165,6 +167,12 @@ mkWwBodies dflags fam_envs fun_ty demands res_info one_shots
-       | otherwise
-       = False
- 
-+-- See Note [Limit w/w arity]
-+isWorkerSmallEnough :: DynFlags -> [Var] -> Bool
-+isWorkerSmallEnough dflags vars = count isId vars <= maxWorkerArgs dflags
-+    -- We count only Free variables (isId) to skip Type, Kind
-+    -- variables which have no runtime representation.
-+
- {-
- Note [Always do CPR w/w]
- ~~~~~~~~~~~~~~~~~~~~~~~~
-@@ -178,6 +186,30 @@ a disaster, because then the enclosing function might say it has the CPR
- property, but now doesn't and there a cascade of disaster.  A good example
- is Trac #5920.
- 
-+Note [Limit w/w arity]
-+~~~~~~~~~~~~~~~~~~~~~~~~
-+Guard against high worker arity as it generates a lot of stack traffic.
-+A simplified example is Trac #11565#comment:6
-+
-+Current strategy is very simple: don't perform w/w transformation at all
-+if the result produces a wrapper with arity higher than -fmax-worker-args=.
-+
-+It is a bit all or nothing, consider
-+
-+        f (x,y) (a,b,c,d,e ... , z) = rhs
-+
-+Currently we will remove all w/w ness entirely. But actually we could
-+w/w on the (x,y) pair... it's the huge product that is the problem.
-+
-+Could we instead refrain from w/w on an arg-by-arg basis? Yes, that'd
-+solve f. But we can get a lot of args from deeply-nested products:
-+
-+        g (a, (b, (c, (d, ...)))) = rhs
-+
-+This is harder to spot on an arg-by-arg basis. Previously mkWwStr was
-+given some "fuel" saying how many arguments it could add; when we ran
-+out of fuel it would stop w/wing.
-+Still not very clever because it had a left-right bias.
- 
- ************************************************************************
- *                                                                      *
diff --git a/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch b/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch
deleted file mode 100644
index 877a5827e4ea..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit b0cf3ab7a69b878a4335d21a347b56e4b0ca0b7b
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Apr 14 19:06:24 2014 +0300
-
-    compiler/cmm/PprC.hs: constify local string literals
-    
-    Consider one-line module
-        module B (v) where v = "hello"
-    in -fvia-C mode it generates code like
-        static char gibberish_str[] = "hello";
-    
-    It uselessly eats data section (precious resource on ia64!).
-    The patch switches genrator to emit:
-        static const char gibberish_str[] = "hello";
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs
-index 2398981..fdb578d 100644
---- a/compiler/cmm/PprC.hs
-+++ b/compiler/cmm/PprC.hs
-@@ -112,6 +112,12 @@ pprTop (CmmProc infos clbl _ graph) =
- 
- -- We only handle (a) arrays of word-sized things and (b) strings.
- 
-+pprTop (CmmData (Section ReadOnlyData _) (Statics lbl [CmmString str])) =
-+  hcat [
-+    pprLocalness lbl, ptext (sLit "const char "), ppr lbl,
-+    ptext (sLit "[] = "), pprStringInCStyle str, semi
-+  ]
-+
- pprTop (CmmData _section (Statics lbl [CmmString str])) =
-   hcat [
-     pprLocalness lbl, ptext (sLit "char "), ppr lbl,
diff --git a/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch b/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch
deleted file mode 100644
index b64d65b80a05..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-ghc -O2 generates too large C files for unregisterised compiler.
-On ia64 it causes DynFlags to compile for 60 minutes (then assembler
-crashes).
-
-To decrease C code inflation we don't use -O2 in UNREG mode.
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index bfaaa66..d8f93b3 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -72,11 +72,2 @@ GhcStage3HcOpts=-O2
-
--# Disable -O2 optimization. Otherwise amount of generated C code
--# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs')
--# and sometimes not compile at all (powerpc64 overflows something
--# on 'compiler/hsSyn/HsExpr.lhs').
--ifeq "$(GhcUnregisterised)" "YES"
--GhcStage1HcOpts=
--GhcStage2HcOpts=
--GhcStage3HcOpts=
--endif
-
-@@ -894 +885,13 @@ CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@
- CURSES_LIB_DIRS = @CURSES_LIB_DIRS@
-+
-+# Disable -O2 optimization. Otherwise amount of generated C code
-+# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs')
-+# and sometimes not compile at all (powerpc64 overflows something
-+# on 'compiler/hsSyn/HsExpr.lhs').
-+ifeq "$(GhcUnregisterised)" "YES"
-+GhcStage1HcOpts=
-+GhcStage2HcOpts=
-+GhcStage3HcOpts=
-+
-+GhcLibHcOpts=
-+endif
diff --git a/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch b/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch
deleted file mode 100644
index f02cb238c6b9..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 358b508051333882d4099acca8f269e6fb2b7d65 Mon Sep 17 00:00:00 2001
-From: Bertram Felgenhauer <int-e@gmx.de>
-Date: Thu, 3 May 2018 18:03:53 +0300
-Subject: [PATCH] Compute DW_FORM_block length correctly; also fixes #15068
-
-Before this patch, the pprUnwindwExpr function computed the length of
-by the following assembly fragment:
-
-	.uleb128 1f-.-1
-	<expression data>
-1:
-
-That is, to compute the length, it takes the difference of the label 1
-and the address of the .uleb128 directive, and subtracts 1.
-
-In #15068 it was reported that `as` from binutils 4.30 has trouble with
-evaluating the `.` part of the expression. However, there is actually a
-problem with the expression, if the length of the data ever becomes
-larger than 128: In that case, the .uleb128 directive will emit more
-than 1 byte, and the computed length will be wrong.
-
-The present patch changes the assembly fragment to use two labels,
-which fixes both these problems.
-
-	.uleb128 2f-1f
-1:
-	<expression data>
-2:
-
-Test Plan: validate
-
-Reviewers: bgamari, osa1
-
-Reviewed By: bgamari
-
-Subscribers: thomie, carter
-
-GHC Trac Issues: #15068
-
-Differential Revision: https://phabricator.haskell.org/D4654
----
- compiler/nativeGen/Dwarf/Types.hs | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
-index 23a2c920e7..579ed0d256 100644
---- a/compiler/nativeGen/Dwarf/Types.hs
-+++ b/compiler/nativeGen/Dwarf/Types.hs
-@@ -492,9 +492,11 @@ pprUnwindExpr spIsCFA expr
-         pprE (UwPlus u1 u2)   = pprE u1 $$ pprE u2 $$ pprByte dW_OP_plus
-         pprE (UwMinus u1 u2)  = pprE u1 $$ pprE u2 $$ pprByte dW_OP_minus
-         pprE (UwTimes u1 u2)  = pprE u1 $$ pprE u2 $$ pprByte dW_OP_mul
--    in text "\t.uleb128 1f-.-1" $$ -- DW_FORM_block length
-+    in text "\t.uleb128 2f-1f" $$ -- DW_FORM_block length
-+       -- computed as the difference of the following local labels 2: and 1:
-+       text "1:" $$
-        pprE expr $$
--       text "1:"
-+       text "2:"
- 
- -- | Generate code for re-setting the unwind information for a
- -- register to @undefined@
--- 
-2.17.0
-
diff --git a/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch b/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch
deleted file mode 100644
index 166f7fe42991..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit 2c220c4b053c8efb2098ee20910084a42a0b2dcd
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Sun Jan 29 11:59:36 2017 +0000
-
-    libffi: fix build COMPLEX build failure on alpha
-    
-    libtool: compile:  alpha-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude \
-        -I../src -I. -I../include -Iinclude -I../src -Wall -w -mieee -D_REENTRANT -fno-stack-protector \
-        -w -MT src/alpha/osf.lo -MMD -MP -MF src/alpha/.deps/osf.Tpo \
-        -c ../src/alpha/osf.S  -fPIC -DPIC -o src/alpha/.libs/osf.o
-    
-      ../src/alpha/osf.S:298:2: error: #error "osf.S out of sync with ffi.h"
-       #error "osf.S out of sync with ffi.h"
-        ^
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/libffi/ghc.mk b/libffi/ghc.mk
-index 7c5bc9e1b3..4297ed449e 100644
---- a/libffi/ghc.mk
-+++ b/libffi/ghc.mk
-@@ -63,6 +63,9 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
- # will use cygwin symbolic links which cannot be read by mingw gcc.
- 	chmod +x libffi/ln
- 
-+	# fix libffi build failure on alpha
-+	( cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.3.2.1-complex_alpha.diff; )
-+
- 	# We need to use -MMD rather than -MD, as otherwise we get paths
- 	# like c:/... in the dependency files on Windows, and the extra
- 	# colons break make
-diff --git a/libffi/libffi.3.2.1-complex_alpha.diff b/libffi/libffi.3.2.1-complex_alpha.diff
-new file mode 100644
-index 0000000000..0d6e0bc290
---- /dev/null
-+++ b/libffi/libffi.3.2.1-complex_alpha.diff
-@@ -0,0 +1,20 @@
-+--- src/alpha/osf.S.orig	2015-01-16 10:46:15.000000000 +0100
-++++ src/alpha/osf.S	2015-01-16 10:46:24.000000000 +0100
-+@@ -279,6 +279,7 @@
-+ 	.gprel32 $load_64	# FFI_TYPE_SINT64
-+ 	.gprel32 $load_none	# FFI_TYPE_STRUCT
-+ 	.gprel32 $load_64	# FFI_TYPE_POINTER
-++	.gprel32 $load_none	# FFI_TYPE_COMPLEX
-+ 
-+ /* Assert that the table above is in sync with ffi.h.  */
-+ 
-+@@ -294,7 +295,8 @@
-+ 	|| FFI_TYPE_SINT64 != 12	\
-+ 	|| FFI_TYPE_STRUCT != 13	\
-+ 	|| FFI_TYPE_POINTER != 14	\
-+-	|| FFI_TYPE_LAST != 14
-++	|| FFI_TYPE_COMPLEX != 15       \
-++	|| FFI_TYPE_LAST != 15
-+ #error "osf.S out of sync with ffi.h"
-+ #endif
-+ 
diff --git a/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch b/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch
deleted file mode 100644
index a4d49d3ef808..000000000000
--- a/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/docs/users_guide/profiling.rst b/docs/users_guide/profiling.rst
-index 4d0bb3a..f980f72 100644
---- a/docs/users_guide/profiling.rst
-+++ b/docs/users_guide/profiling.rst
-@@ -435,7 +435,2 @@ To generate a heap profile from your program:
- 
--For example, here is a heap profile produced for the ``sphere`` program
--from GHC's ``nofib`` benchmark suite,
--
--.. image:: images/prof_scc.*
--
- You might also want to take a look at
diff --git a/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch b/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch
deleted file mode 100644
index 19c8b4bccc48..000000000000
--- a/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/gentoo-haskell/gentoo-haskell/issues/704
-
-Allow users to specify -W,--relax externally and pass
--Wl,-no-relax unconditonally on all arches.
-
-Reported-by: wmyrda
---- a/compiler/main/DriverPipeline.hs
-+++ b/compiler/main/DriverPipeline.hs
-@@ -2144,9 +2144,7 @@ joinObjectFiles dflags o_files output_fn = do
-                         -- gcc on sparc sets -Wl,--relax implicitly, but
-                         -- -r and --relax are incompatible for ld, so
-                         -- disable --relax explicitly.
--                     ++ (if platformArch (targetPlatform dflags)
--                                `elem` [ArchSPARC, ArchSPARC64]
--                         && ldIsGnuLd
-+                     ++ (if ldIsGnuLd
-                             then [SysTools.Option "-Wl,-no-relax"]
-                             else [])
-                         -- See Note [Produce big objects on Windows]
diff --git a/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch b/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
deleted file mode 100644
index eb30d9d9dd4c..000000000000
--- a/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001
-From: Ben Gamari <ben@smart-cactus.org>
-Date: Sun, 9 Aug 2020 09:15:16 -0400
-Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols"
-
-This reverts commit aa2e5863699306920513b216f337de09e29b5bb8.
----
- rts/RtsSymbols.c | 224 ++++-------------------------------------------
- 1 file changed, 17 insertions(+), 207 deletions(-)
-
-diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
-index d10a6900db..b2f90a892d 100644
---- a/rts/RtsSymbols.c
-+++ b/rts/RtsSymbols.c
-@@ -58,6 +58,7 @@
-       SymI_HasProto(signal_handlers)            \
-       SymI_HasProto(stg_sig_install)            \
-       SymI_HasProto(rtsTimerSignal)             \
-+      SymI_HasProto(atexit)                     \
-       SymI_NeedsDataProto(nocldstop)
- #endif
- 
-@@ -976,213 +977,29 @@
-       RTS_USER_SIGNALS_SYMBOLS                                          \
-       RTS_INTCHAR_SYMBOLS
- 
-+
- // 64-bit support functions in libgcc.a
--// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
--#define RTS_LIBGCC_SYMBOLS_32                          \
--      SymI_NeedsProto(__fixunsdfdi)                    \
--      /* 4 The GCC low-level runtime library         */\
--      /* 4.1.1 Arithmetic functions                  */\
--      /* SymI_NeedsProto(__ashlsi3) */\
--      SymI_NeedsProto(__ashldi3) \
--      /* SymI_NeedsProto(__ashlti3) */\
--      /* These functions return the result of shifting a left by b bits. */\
--      /* SymI_NeedsProto(__ashrsi3) */\
--      SymI_NeedsProto(__ashrdi3) \
--      /* SymI_NeedsProto(__ashrti3) */\
--      /* These functions return the result of arithmetically shifting a right by b bits. */\
--      /* SymI_NeedsProto(__divsi3) */\
--      SymI_NeedsProto(__divdi3) \
--      /* SymI_NeedsProto(__divti3) */\
--      /* These functions return the quotient of the signed division of a and b. */\
--      /* SymI_NeedsProto(__lshrsi3) */ \
--      SymI_NeedsProto(__lshrdi3) \
--      /* SymI_NeedsProto(__lshrti3) */ \
--      /* These functions return the result of logically shifting a right by b bits. */\
--      /* SymI_NeedsProto(__modsi3) */ \
--      SymI_NeedsProto(__moddi3) \
--      /* SymI_NeedsProto(__modti3) */ \
--      /* These functions return the remainder of the signed division of a and b. */\
--      /* SymI_NeedsProto(__mulsi3) */ \
--      SymI_NeedsProto(__muldi3) \
--      /* SymI_NeedsProto(__multi3) */ \
--      /* These functions return the product of a and b. */\
--      SymI_NeedsProto(__negdi2) \
--      /* SymI_NeedsProto(__negti2) */ \
--      /* These functions return the negation of a. */\
--      /* SymI_NeedsProto(__udivsi3) */ \
--      SymI_NeedsProto(__udivdi3) \
--      /* SymI_NeedsProto(__udivti3) */ \
--      /* These functions return the quotient of the unsigned division of a and b. */\
--      SymI_NeedsProto(__udivmoddi4) \
--      /* SymI_NeedsProto(__udivmodti4) */ \
--      /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\
--      /* SymI_NeedsProto(__umodsi3) */ \
--      SymI_NeedsProto(__umoddi3) \
--      /* SymI_NeedsProto(__umodti3) */ \
--      /* These functions return the remainder of the unsigned division of a and b. */\
--      /* 4.1.2 Comparison functions */\
--      /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\
--      SymI_NeedsProto(__cmpdi2) \
--      /* SymI_NeedsProto(__cmpti2) */ \
--      /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
--      SymI_NeedsProto(__ucmpdi2) \
--      /* SymI_NeedsProto(__ucmpti2) */ \
--      /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
--      /* 4.1.3 Trapping arithmetic functions */\
--      /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\
--      SymI_NeedsProto(__absvsi2) \
--      SymI_NeedsProto(__absvdi2) \
--      /* These functions return the absolute value of a. */\
--      /* SymI_NeedsProto(__addvsi3) */ \
--      SymI_NeedsProto(__addvdi3) \
--      /* These functions return the sum of a and b; that is a + b. */\
--      /* SymI_NeedsProto(__mulvsi3) */ \
--      SymI_NeedsProto(__mulvdi3) \
--      /* The functions return the product of a and b; that is a * b. */\
--      SymI_NeedsProto(__negvsi2) \
--      SymI_NeedsProto(__negvdi2) \
--      /* These functions return the negation of a; that is -a. */\
--      /* SymI_NeedsProto(__subvsi3) */ \
--      SymI_NeedsProto(__subvdi3) \
--      /* These functions return the difference between b and a; that is a - b. */\
--      /* 4.1.4 Bit operations */\
--      SymI_NeedsProto(__clzsi2) \
--      SymI_NeedsProto(__clzdi2) \
--      /* SymI_NeedsProto(__clzti2) */ \
--      /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\
--      SymI_NeedsProto(__ctzsi2) \
--      SymI_NeedsProto(__ctzdi2) \
--      /* SymI_NeedsProto(__ctzti2) */ \
--      /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\
--      SymI_NeedsProto(__ffsdi2) \
--      /* SymI_NeedsProto(__ffsti2) */ \
--      /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\
--      SymI_NeedsProto(__paritysi2) \
--      SymI_NeedsProto(__paritydi2) \
--      /* SymI_NeedsProto(__parityti2) */\
--      /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\
--      SymI_NeedsProto(__popcountsi2) \
--      SymI_NeedsProto(__popcountdi2) \
--      /* SymI_NeedsProto(__popcountti2) */ \
--      /* These functions return the number of bits set in a. */\
--      SymI_NeedsProto(__bswapsi2) \
--      SymI_NeedsProto(__bswapdi2)
--#define RTS_LIBGCC_SYMBOLS_aarch32                     \
--      /* armv6l                                      */\
--      /* TODO: should check for __ARM_EABI__         */\
--      SymI_NeedsProto(__aeabi_d2f) \
--      SymI_NeedsProto(__aeabi_d2iz) \
--      SymI_NeedsProto(__aeabi_d2lz) \
--      SymI_NeedsProto(__aeabi_d2uiz) \
--      SymI_NeedsProto(__aeabi_d2ulz) \
--      SymI_NeedsProto(__aeabi_dadd) \
--      SymI_NeedsProto(__aeabi_dcmpeq) \
--      SymI_NeedsProto(__aeabi_dcmpge) \
--      SymI_NeedsProto(__aeabi_dcmpgt) \
--      SymI_NeedsProto(__aeabi_dcmple) \
--      SymI_NeedsProto(__aeabi_dcmplt) \
--      SymI_NeedsProto(__aeabi_dcmpun) \
--      SymI_NeedsProto(__aeabi_ddiv) \
--      SymI_NeedsProto(__aeabi_dmul) \
--      SymI_NeedsProto(__aeabi_dneg) \
--      SymI_NeedsProto(__aeabi_dsub) \
--      SymI_NeedsProto(__aeabi_f2d) \
--      SymI_NeedsProto(__aeabi_f2iz) \
--      SymI_NeedsProto(__aeabi_f2lz) \
--      SymI_NeedsProto(__aeabi_f2uiz) \
--      SymI_NeedsProto(__aeabi_f2ulz) \
--      SymI_NeedsProto(__aeabi_fadd) \
--      SymI_NeedsProto(__aeabi_fcmpeq) \
--      SymI_NeedsProto(__aeabi_fcmpge) \
--      SymI_NeedsProto(__aeabi_fcmpgt) \
--      SymI_NeedsProto(__aeabi_fcmple) \
--      SymI_NeedsProto(__aeabi_fcmplt) \
--      SymI_NeedsProto(__aeabi_fcmpun) \
--      SymI_NeedsProto(__aeabi_fdiv) \
--      SymI_NeedsProto(__aeabi_fmul) \
--      SymI_NeedsProto(__aeabi_fneg) \
--      SymI_NeedsProto(__aeabi_fsub) \
--      SymI_NeedsProto(__aeabi_i2d) \
--      SymI_NeedsProto(__aeabi_i2f) \
--      SymI_NeedsProto(__aeabi_idiv) \
--      SymI_NeedsProto(__aeabi_idivmod) \
--      SymI_NeedsProto(__aeabi_l2d) \
--      SymI_NeedsProto(__aeabi_l2f) \
--      SymI_NeedsProto(__aeabi_lasr) \
--      SymI_NeedsProto(__aeabi_lcmp) \
--      SymI_NeedsProto(__aeabi_ldivmod) \
--      SymI_NeedsProto(__aeabi_llsl) \
--      SymI_NeedsProto(__aeabi_llsr) \
--      SymI_NeedsProto(__aeabi_lmul) \
--      SymI_NeedsProto(__aeabi_ui2d) \
--      SymI_NeedsProto(__aeabi_ui2f) \
--      SymI_NeedsProto(__aeabi_uidiv) \
--      SymI_NeedsProto(__aeabi_uidivmod) \
--      SymI_NeedsProto(__aeabi_ul2d) \
--      SymI_NeedsProto(__aeabi_ul2f) \
--      SymI_NeedsProto(__aeabi_ulcmp) \
--      SymI_NeedsProto(__aeabi_uldivmod)
--#define RTS_LIBGCC_SYMBOLS_64                          \
-+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
-+#define RTS_LIBGCC_SYMBOLS                             \
-+      SymI_NeedsProto(__divdi3)                        \
-+      SymI_NeedsProto(__udivdi3)                       \
-+      SymI_NeedsProto(__moddi3)                        \
-+      SymI_NeedsProto(__umoddi3)                       \
-+      SymI_NeedsProto(__muldi3)                        \
-+      SymI_NeedsProto(__ashldi3)                       \
-+      SymI_NeedsProto(__ashrdi3)                       \
-+      SymI_NeedsProto(__lshrdi3)                       \
-+      SymI_NeedsProto(__fixunsdfdi)
-+#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
-+#define RTS_LIBGCC_SYMBOLS                             \
-       SymI_NeedsProto(__udivti3)                       \
-       SymI_NeedsProto(__umodti3)
--
--/* for aarch64                                        */
--#define RTS_LIBGCC_SYMBOLS_aarch64                     \
--      SymI_NeedsProto(__netf2)                         \
--      SymI_NeedsProto(__addtf3)                        \
--      SymI_NeedsProto(__subtf3)                        \
--      SymI_NeedsProto(__multf3)                        \
--      SymI_NeedsProto(__extenddftf2)                   \
--      SymI_NeedsProto(__fixtfsi)                       \
--      SymI_NeedsProto(__fixunstfsi)                    \
--      SymI_NeedsProto(__floatsitf)                     \
--      SymI_NeedsProto(__floatunsitf)
--
--#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
--#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
--#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
--#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
--#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
--#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
--#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
--#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
- #else
- #define RTS_LIBGCC_SYMBOLS
- #endif
- 
--#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__))
--#define RTS_SSP_SYMBOLS                                \
--      SymI_NeedsProto(__stack_chk_guard)               \
--      SymI_NeedsProto(__stack_chk_fail)
--#else
--#define RTS_SSP_SYMBOLS
--#endif
--#if !defined(DYNAMIC) && defined(linux_HOST_OS)
--// we need these for static musl builds. However when
--// linking shared objects (DLLs) this will fail, hence
--// we do not include them when building with -DDYNAMIC
--#define RTS_LINKER_SYMBOLS                             \
--      SymI_NeedsProto(__fini_array_start)              \
--      SymI_NeedsProto(__fini_array_end)
--#else
--#define RTS_LINKER_SYMBOLS
--#endif
--
--#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH)
--      // Symbols that don't have a leading underscore
--      // on Mac OS X. They have to receive special treatment,
--      // see machoInitSymbolsWithoutUnderscore()
--#define RTS_MACHO_NOUNDERLINE_SYMBOLS                   \
--      SymI_NeedsProto(saveFP)                           \
--      SymI_NeedsProto(restFP)
--#endif
--
- /* entirely bogus claims about types of these symbols */
--/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic
-- * macro.  And we'll concat vvv with the __VA_ARGS__. This prevents
-- * vvv from getting macro expanded.
-- */
--#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void);
-+#define SymI_NeedsProto(vvv)  extern void vvv(void);
- #define SymI_NeedsDataProto(vvv)  extern StgWord vvv[];
- #if defined(COMPILING_WINDOWS_DLL)
- #define SymE_HasProto(vvv)    SymE_HasProto(vvv);
-@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS
- RTS_OPENBSD_ONLY_SYMBOLS
- RTS_LIBGCC_SYMBOLS
- RTS_LIBFFI_SYMBOLS
--RTS_SSP_SYMBOLS
--RTS_LINKER_SYMBOLS
- #undef SymI_NeedsProto
- #undef SymI_NeedsDataProto
- #undef SymI_HasProto
-@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS
- #define SymE_HasDataProto(vvv) \
-                     SymE_HasProto(vvv)
- 
--#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__)
-+#define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
- #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
- #define SymE_NeedsProto(vvv) SymE_HasProto(vvv)
- #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv)
-@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS
- #define SymI_HasProto_deprecated(vvv)   \
-    { #vvv, (void*)0xBAADF00D, true },
- 
--void *RTS_DYNAMIC = NULL;
--
- RtsSymbolVal rtsSyms[] = {
-       RTS_SYMBOLS
-       RTS_RET_SYMBOLS
-@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = {
-       RTS_LIBGCC_SYMBOLS
-       RTS_LIBFFI_SYMBOLS
-       SymI_HasDataProto(nonmoving_write_barrier_enabled)
--      RTS_SSP_SYMBOLS
--      RTS_LINKER_SYMBOLS
- #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
-       // dyld stub code contains references to this,
-       // but it should never be called because we treat
-       // lazy pointers as nonlazy.
-       { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false },
- #endif
--      { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false },
-       { 0, 0, false } /* sentinel */
- };
--- 
-2.25.4
-
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch
deleted file mode 100644
index 2e1ef932b454..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-From 7e00046772e053c63ac93630a60b0f396e32a2d7 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 16 Apr 2017 10:43:38 +0100
-Subject: [PATCH] compiler/cmm/PprC.hs: constify labels in .rodata
-
-Summary:
-Consider one-line module
-    module B (v) where v = "hello"
-in -fvia-C mode it generates code like
-    static char gibberish_str[] = "hello";
-
-It resides in data section (precious resource on ia64!).
-The patch switches genrator to emit:
-    static const char gibberish_str[] = "hello";
-
-Other types if symbols that gained 'const' qualifier are:
-
-- info tables (from haskell and CMM)
-- static reference tables (from haskell and CMM)
-
-Cleanups along the way:
-
-- fixed info tables defined in .cmm to reside in .rodata
-- split out closure declaration into 'IC_' / 'EC_'
-- added label declaration (based on label type) right before
-  each label definition (based on section type) so that C
-  compiler could check if declaration and definition matches
-  at definition site.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-Test Plan: ran testsuite on unregisterised x86_64 compiler
-
-Reviewers: simonmar, ezyang, austin, bgamari, erikd
-
-Subscribers: rwbarton, thomie
-
-GHC Trac Issues: #8996
-
-Differential Revision: https://phabricator.haskell.org/D3481
----
- compiler/cmm/CLabel.hs               | 24 ++++++++++++++
- compiler/cmm/Cmm.hs                  | 13 ++++++++
- compiler/cmm/CmmInfo.hs              |  2 +-
- compiler/cmm/PprC.hs                 | 62 +++++++++++++++++++++++-------------
- compiler/llvmGen/LlvmCodeGen/Data.hs | 12 -------
- includes/Stg.h                       | 22 +++++++++----
- includes/rts/storage/InfoTables.h    |  2 +-
- includes/stg/MiscClosures.h          | 14 ++++----
- 8 files changed, 102 insertions(+), 49 deletions(-)
-
-diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
-index 3ba4f7647a..62c8037e9c 100644
---- a/compiler/cmm/CLabel.hs
-+++ b/compiler/cmm/CLabel.hs
-@@ -89,6 +89,8 @@ module CLabel (
-         foreignLabelStdcallInfo,
-         isBytesLabel,
-         isForeignLabel,
-+        isSomeRODataLabel,
-+        isStaticClosureLabel,
-         mkCCLabel, mkCCSLabel,
- 
-         DynamicLinkerLabelInfo(..),
-@@ -575,6 +577,28 @@ isForeignLabel :: CLabel -> Bool
- isForeignLabel (ForeignLabel _ _ _ _) = True
- isForeignLabel _lbl = False
- 
-+-- | Whether label is a static closure label (can come from haskell or cmm)
-+isStaticClosureLabel :: CLabel -> Bool
-+-- Closure defined in haskell (.hs)
-+isStaticClosureLabel (IdLabel _ _ Closure) = True
-+-- Closure defined in cmm
-+isStaticClosureLabel (CmmLabel _ _ CmmClosure) = True
-+isStaticClosureLabel _lbl = False
-+
-+-- | Whether label is a .rodata label
-+isSomeRODataLabel :: CLabel -> Bool
-+-- info table defined in haskell (.hs)
-+isSomeRODataLabel (IdLabel _ _ ClosureTable) = True
-+isSomeRODataLabel (IdLabel _ _ ConInfoTable) = True
-+isSomeRODataLabel (IdLabel _ _ InfoTable) = True
-+isSomeRODataLabel (IdLabel _ _ LocalInfoTable) = True
-+-- static reference tables defined in haskell (.hs)
-+isSomeRODataLabel (IdLabel _ _ SRT) = True
-+isSomeRODataLabel (SRTLabel _) = True
-+-- info table defined in cmm (.cmm)
-+isSomeRODataLabel (CmmLabel _ _ CmmInfo) = True
-+isSomeRODataLabel _lbl = False
-+
- -- | Get the label size field from a ForeignLabel
- foreignLabelStdcallInfo :: CLabel -> Maybe Int
- foreignLabelStdcallInfo (ForeignLabel _ info _ _) = info
-diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
-index d2ee531686..bab20f3fdd 100644
---- a/compiler/cmm/Cmm.hs
-+++ b/compiler/cmm/Cmm.hs
-@@ -9,6 +9,7 @@ module Cmm (
-      CmmBlock,
-      RawCmmDecl, RawCmmGroup,
-      Section(..), SectionType(..), CmmStatics(..), CmmStatic(..),
-+     isSecConstant,
- 
-      -- ** Blocks containing lists
-      GenBasicBlock(..), blockId,
-@@ -167,6 +168,18 @@ data SectionType
-   | OtherSection String
-   deriving (Show)
- 
-+-- | Should a data in this section be considered constant
-+isSecConstant :: Section -> Bool
-+isSecConstant (Section t _) = case t of
-+    Text                    -> True
-+    ReadOnlyData            -> True
-+    RelocatableReadOnlyData -> True
-+    ReadOnlyData16          -> True
-+    CString                 -> True
-+    Data                    -> False
-+    UninitialisedData       -> False
-+    (OtherSection _)        -> False
-+
- data Section = Section SectionType CLabel
- 
- data CmmStatic
-diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs
-index b5e800a977..35e3a1888d 100644
---- a/compiler/cmm/CmmInfo.hs
-+++ b/compiler/cmm/CmmInfo.hs
-@@ -133,7 +133,7 @@ mkInfoTable dflags proc@(CmmProc infos entry_lbl live blocks)
-         --
-         return (top_decls ++
-                 [CmmProc mapEmpty entry_lbl live blocks,
--                 mkDataLits (Section Data info_lbl) info_lbl
-+                 mkRODataLits info_lbl
-                     (CmmLabel entry_lbl : rel_std_info ++ rel_extra_bits)])
- 
-   --
-diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs
-index 56de94079f..21ed6f6516 100644
---- a/compiler/cmm/PprC.hs
-+++ b/compiler/cmm/PprC.hs
-@@ -83,12 +83,13 @@ pprC tops = vcat $ intersperse blankLine $ map pprTop tops
- -- top level procs
- --
- pprTop :: RawCmmDecl -> SDoc
--pprTop (CmmProc infos clbl _ graph) =
-+pprTop (CmmProc infos clbl _in_live_regs graph) =
- 
-     (case mapLookup (g_entry graph) infos of
-        Nothing -> empty
--       Just (Statics info_clbl info_dat) -> pprDataExterns info_dat $$
--                                            pprWordArray info_clbl info_dat) $$
-+       Just (Statics info_clbl info_dat) ->
-+           pprDataExterns info_dat $$
-+           pprWordArray info_is_in_rodata info_clbl info_dat) $$
-     (vcat [
-            blankLine,
-            extern_decls,
-@@ -99,6 +100,8 @@ pprTop (CmmProc infos clbl _ graph) =
-            rbrace ]
-     )
-   where
-+        -- info tables are always in .rodata
-+        info_is_in_rodata = True
-         blocks = toBlockListEntryFirst graph
-         (temp_decls, extern_decls) = pprTempAndExternDecls blocks
- 
-@@ -107,21 +110,23 @@ pprTop (CmmProc infos clbl _ graph) =
- 
- -- We only handle (a) arrays of word-sized things and (b) strings.
- 
--pprTop (CmmData _section (Statics lbl [CmmString str])) =
-+pprTop (CmmData section (Statics lbl [CmmString str])) =
-+  pprExternDecl lbl $$
-   hcat [
--    pprLocalness lbl, text "char ", ppr lbl,
-+    pprLocalness lbl, pprConstness (isSecConstant section), text "char ", ppr lbl,
-     text "[] = ", pprStringInCStyle str, semi
-   ]
- 
--pprTop (CmmData _section (Statics lbl [CmmUninitialised size])) =
-+pprTop (CmmData section (Statics lbl [CmmUninitialised size])) =
-+  pprExternDecl lbl $$
-   hcat [
--    pprLocalness lbl, text "char ", ppr lbl,
-+    pprLocalness lbl, pprConstness (isSecConstant section), text "char ", ppr lbl,
-     brackets (int size), semi
-   ]
- 
--pprTop (CmmData _section (Statics lbl lits)) =
-+pprTop (CmmData section (Statics lbl lits)) =
-   pprDataExterns lits $$
--  pprWordArray lbl lits
-+  pprWordArray (isSecConstant section) lbl lits
- 
- -- --------------------------------------------------------------------------
- -- BasicBlocks are self-contained entities: they always end in a jump.
-@@ -141,10 +146,12 @@ pprBBlock block =
- -- Info tables. Just arrays of words.
- -- See codeGen/ClosureInfo, and nativeGen/PprMach
- 
--pprWordArray :: CLabel -> [CmmStatic] -> SDoc
--pprWordArray lbl ds
-+pprWordArray :: Bool -> CLabel -> [CmmStatic] -> SDoc
-+pprWordArray is_ro lbl ds
-   = sdocWithDynFlags $ \dflags ->
--    hcat [ pprLocalness lbl, text "StgWord"
-+    -- TODO: align closures only
-+    pprExternDecl lbl $$
-+    hcat [ pprLocalness lbl, pprConstness is_ro, text "StgWord"
-          , space, ppr lbl, text "[]"
-          -- See Note [StgWord alignment]
-          , pprAlignment (wordWidth dflags)
-@@ -180,6 +187,10 @@ pprLocalness :: CLabel -> SDoc
- pprLocalness lbl | not $ externallyVisibleCLabel lbl = text "static "
-                  | otherwise = empty
- 
-+pprConstness :: Bool -> SDoc
-+pprConstness is_ro | is_ro = text "const "
-+                   | otherwise = empty
-+
- -- --------------------------------------------------------------------------
- -- Statements.
- --
-@@ -984,31 +995,38 @@ is_cishCC JavaScriptCallConv = False
- pprTempAndExternDecls :: [CmmBlock] -> (SDoc{-temps-}, SDoc{-externs-})
- pprTempAndExternDecls stmts
-   = (pprUFM (getUniqSet temps) (vcat . map pprTempDecl),
--     vcat (map (pprExternDecl False{-ToDo-}) (Map.keys lbls)))
-+     vcat (map pprExternDecl (Map.keys lbls)))
-   where (temps, lbls) = runTE (mapM_ te_BB stmts)
- 
- pprDataExterns :: [CmmStatic] -> SDoc
- pprDataExterns statics
--  = vcat (map (pprExternDecl False{-ToDo-}) (Map.keys lbls))
-+  = vcat (map pprExternDecl (Map.keys lbls))
-   where (_, lbls) = runTE (mapM_ te_Static statics)
- 
- pprTempDecl :: LocalReg -> SDoc
- pprTempDecl l@(LocalReg _ rep)
-   = hcat [ machRepCType rep, space, pprLocalReg l, semi ]
- 
--pprExternDecl :: Bool -> CLabel -> SDoc
--pprExternDecl _in_srt lbl
-+pprExternDecl :: CLabel -> SDoc
-+pprExternDecl lbl
-   -- do not print anything for "known external" things
-   | not (needsCDecl lbl) = empty
-   | Just sz <- foreignLabelStdcallInfo lbl = stdcall_decl sz
-   | otherwise =
--        hcat [ visibility, label_type lbl,
--               lparen, ppr lbl, text ");" ]
-+        hcat [ visibility, label_type lbl , lparen, ppr lbl, text ");"
-+             -- occasionally useful to see label type
-+             -- , text "/* ", pprDebugCLabel lbl, text " */"
-+             ]
-  where
--  label_type lbl | isBytesLabel lbl     = text "B_"
--                 | isForeignLabel lbl && isCFunctionLabel lbl = text "FF_"
--                 | isCFunctionLabel lbl = text "F_"
--                 | otherwise            = text "I_"
-+  label_type lbl | isBytesLabel lbl         = text "B_"
-+                 | isForeignLabel lbl && isCFunctionLabel lbl
-+                                            = text "FF_"
-+                 | isCFunctionLabel lbl     = text "F_"
-+                 | isStaticClosureLabel lbl = text "C_"
-+                 -- generic .rodata labels
-+                 | isSomeRODataLabel lbl    = text "RO_"
-+                 -- generic .data labels (common case)
-+                 | otherwise                = text "RW_"
- 
-   visibility
-      | externallyVisibleCLabel lbl = char 'E'
-diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs
-index 9bb5a75bda..adb86d312d 100644
---- a/compiler/llvmGen/LlvmCodeGen/Data.hs
-+++ b/compiler/llvmGen/LlvmCodeGen/Data.hs
-@@ -56,18 +56,6 @@ genLlvmData (sec, Statics lbl xs) = do
- 
-     return ([globDef], [tyAlias])
- 
---- | Should a data in this section be considered constant
--isSecConstant :: Section -> Bool
--isSecConstant (Section t _) = case t of
--    Text                    -> True
--    ReadOnlyData            -> True
--    RelocatableReadOnlyData -> True
--    ReadOnlyData16          -> True
--    CString                 -> True
--    Data                    -> False
--    UninitialisedData       -> False
--    (OtherSection _)        -> False
--
- -- | Format the section type part of a Cmm Section
- llvmSectionType :: Platform -> SectionType -> FastString
- llvmSectionType p t = case t of
-diff --git a/includes/Stg.h b/includes/Stg.h
-index 619984d8e5..b1b3190307 100644
---- a/includes/Stg.h
-+++ b/includes/Stg.h
-@@ -223,13 +223,23 @@ typedef StgInt    I_;
- typedef StgWord StgWordArray[];
- typedef StgFunPtr       F_;
- 
--#define EB_(X)    extern char X[]
--#define IB_(X)    static char X[]
--#define EI_(X)          extern StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
--#define II_(X)          static StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
-+/* byte arrays (and strings): */
-+#define EB_(X)    extern const char X[]
-+#define IB_(X)    static const char X[]
-+/* static (non-heap) closures (requires alignment for pointer tagging): */
-+#define EC_(X)    extern       StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
-+#define IC_(X)    static       StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
-+/* writable data (does not require alignment): */
-+#define ERW_(X)   extern       StgWordArray (X)
-+#define IRW_(X)   static       StgWordArray (X)
-+/* read-only data (does not require alignment): */
-+#define ERO_(X)   extern const StgWordArray (X)
-+#define IRO_(X)   static const StgWordArray (X)
-+/* stg-native functions: */
- #define IF_(f)    static StgFunPtr GNUC3_ATTRIBUTE(used) f(void)
--#define FN_(f)    StgFunPtr f(void)
--#define EF_(f)    StgFunPtr f(void) /* External Cmm functions */
-+#define FN_(f)           StgFunPtr f(void)
-+#define EF_(f)           StgFunPtr f(void) /* External Cmm functions */
-+/* foreign functions: */
- #define EFF_(f)   void f() /* See Note [External function prototypes] */
- 
- /* Note [External function prototypes]  See Trac #8965, #11395
-diff --git a/includes/rts/storage/InfoTables.h b/includes/rts/storage/InfoTables.h
-index 307aac371c..163f1d1c87 100644
---- a/includes/rts/storage/InfoTables.h
-+++ b/includes/rts/storage/InfoTables.h
-@@ -266,7 +266,7 @@ typedef struct {
- } StgFunInfoTable;
- 
- // canned bitmap for each arg type, indexed by constants in FunTypes.h
--extern StgWord stg_arg_bitmaps[];
-+extern const StgWord stg_arg_bitmaps[];
- 
- /* -----------------------------------------------------------------------------
-    Return info tables
-diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
-index 9d907ab3ba..b604f1c42b 100644
---- a/includes/stg/MiscClosures.h
-+++ b/includes/stg/MiscClosures.h
-@@ -21,10 +21,10 @@
- #define STGMISCCLOSURES_H
- 
- #if IN_STG_CODE
--#  define RTS_RET_INFO(i)   extern W_(i)[]
--#  define RTS_FUN_INFO(i)   extern W_(i)[]
--#  define RTS_THUNK_INFO(i) extern W_(i)[]
--#  define RTS_INFO(i)       extern W_(i)[]
-+#  define RTS_RET_INFO(i)   extern const W_(i)[]
-+#  define RTS_FUN_INFO(i)   extern const W_(i)[]
-+#  define RTS_THUNK_INFO(i) extern const W_(i)[]
-+#  define RTS_INFO(i)       extern const W_(i)[]
- #  define RTS_CLOSURE(i)    extern W_(i)[]
- #  define RTS_FUN_DECL(f)   extern DLL_IMPORT_RTS StgFunPtr f(void)
- #else
-@@ -489,9 +489,9 @@ extern StgWord RTS_VAR(sched_mutex);
- 
- // Apply.cmm
- // canned bitmap for each arg type
--extern StgWord stg_arg_bitmaps[];
--extern StgWord stg_ap_stack_entries[];
--extern StgWord stg_stack_save_entries[];
-+extern const StgWord stg_arg_bitmaps[];
-+extern const StgWord stg_ap_stack_entries[];
-+extern const StgWord stg_stack_save_entries[];
- 
- // Storage.c
- extern unsigned int RTS_VAR(g0);
--- 
-2.12.2
-
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch
deleted file mode 100644
index dbba18e85c7f..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 732b3dbbff194eb8650c75afd79d892801afa0dc
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Thu Apr 6 22:48:13 2017 +0100
-
-    add $(CrossCompilePrefix) to 'runghc' and 'ghci'
-    
-    When Stage1Only=YES install mode is used one of rare tools
-    that lack $(CrossCompilePrefix) prefix are 'runghc' and 'ghci'.
-    
-    This causes file collisions when multiple GHC crosscompilers
-    are installed in system.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
-index 41d1f15c17..0f31884080 100644
---- a/driver/ghci/ghc.mk
-+++ b/driver/ghci/ghc.mk
-@@ -16,16 +16,16 @@ ifneq "$(Windows_Host)" "YES"
- install: install_driver_ghci
- 
- .PHONY: install_driver_ghci
--install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion)
-+install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci-$(ProjectVersion)
- install_driver_ghci:
- 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
- 	$(call removeFiles,                                "$(WRAPPER)")
- 	$(CREATE_SCRIPT)                                   "$(WRAPPER)"
- 	echo '#!$(SHELL)'                               >> "$(WRAPPER)"
--	echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)"
-+	echo 'exec "$(bindir)/$(CrossCompilePrefix)ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)"
- 	$(EXECUTABLE_FILE)                                 "$(WRAPPER)"
--	$(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
--	$(LN_S) ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghci"
-+	$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci")
-+	$(LN_S) $(CrossCompilePrefix)ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci"
- 
- else # Windows_Host...
- 
-diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
-index 9169ca21bd..50b11a612e 100644
---- a/utils/runghc/ghc.mk
-+++ b/utils/runghc/ghc.mk
-@@ -34,11 +34,11 @@ install: install_runhaskell
- .PHONY: install_runhaskell
- ifeq "$(Windows_Host)" "YES"
- install_runhaskell: install_bins
--	"$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext1) $(DESTDIR)$(bindir)/runhaskell$(exeext1)
-+	"$(CP)" $(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc$(exeext1) $(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell$(exeext1)
- else
- install_runhaskell:
--	$(call removeFiles,"$(DESTDIR)$(bindir)/runhaskell")
--	$(LN_S) runghc "$(DESTDIR)$(bindir)/runhaskell"
--	$(call removeFiles,"$(DESTDIR)$(bindir)/runghc")
--	$(LN_S) runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/runghc"
-+	$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell")
-+	$(LN_S) $(CrossCompilePrefix)runghc "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell"
-+	$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc")
-+	$(LN_S) $(CrossCompilePrefix)runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc"
- endif
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch
deleted file mode 100644
index 1439d722fef4..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 54895c90440cb81f18657537b91f2aa35bd54173
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Fri Apr 7 10:08:58 2017 +0100
-
-    fix 'make install' for cross-stage2
-    
-    When cross-built GHC is being installed one of
-    latest steps is to register installed libraries
-    with 'ghc-pkg'.
-    
-    GHC uses freshly installed 'ghc-pkg' and 'ghc-stage2'
-    for that.
-    
-    Tested as:
-        ./configure --target=aarch64-unknown-linux-gnu
-        make install DESTDIR=$(pwd)/__s2 STRIP_CMD=:
-    
-    Before the change install failed on ghc-pkg execution phase:
-    
-        ".../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/bin/ghc-pkg" \
-            --force \
-            --global-package-db \
-            ".../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/package.conf.d" \
-            update rts/dist/package.conf.install
-        /bin/sh: .../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/bin/ghc-pkg: \
-            No such file or directory
-    
-    To avoid breakage we use 'ghc' and 'ghc-pkg' built by stage0.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    
-    Test Plan: run 'make install' on stage2 crosscompiler
-    
-    Reviewers: rwbarton, austin, bgamari
-    
-    Subscribers: thomie, snowleopard
-    
-    Differential Revision: https://phabricator.haskell.org/D3432
-
-diff --git a/ghc.mk b/ghc.mk
-index caa6c38fbb..8971f25981 100644
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -962,6 +962,12 @@ endif
- 
- INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
- 
-+ifeq "$(CrossCompiling)" "YES"
-+# when installing ghc-stage2 we can't run target's
-+# 'ghc-pkg' and 'ghc-stage2' but those are needed for registration.
-+INSTALLED_GHC_REAL=$(TOP)/inplace/bin/ghc-stage1
-+INSTALLED_GHC_PKG_REAL=$(TOP)/$(ghc-pkg_DIST_BINARY)
-+else # CrossCompiling
- # Install packages in the right order, so that ghc-pkg doesn't complain.
- # Also, install ghc-pkg first.
- ifeq "$(Windows_Host)" "NO"
-@@ -971,6 +977,7 @@ else
- INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
- INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
- endif
-+endif # CrossCompiling
- 
- # Set the INSTALL_DISTDIR_p for each package; compiler is special
- $(foreach p,$(filter-out compiler,$(INSTALL_PACKAGES)),\
-diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
-index 002c8122f2..4d5ef4e108 100644
---- a/utils/ghc-pkg/ghc.mk
-+++ b/utils/ghc-pkg/ghc.mk
-@@ -49,6 +49,12 @@ utils/ghc-pkg_dist_PROGNAME = ghc-pkg
- utils/ghc-pkg_dist_SHELL_WRAPPER = YES
- utils/ghc-pkg_dist_INSTALL_INPLACE = YES
- 
-+# When cross-built ghc-stage2 is installed 'make install' needs to call
-+# native ghc-pkg (not the cross-built one) to register installed packages
-+# 'ghc-pkg_DIST_BINARY' variable only refer to native binary.
-+ghc-pkg_DIST_BINARY_NAME = ghc-pkg$(exeext0)
-+ghc-pkg_DIST_BINARY = utils/ghc-pkg/dist/build/tmp/$(ghc-pkg_DIST_BINARY_NAME)
-+
- # See Note [Stage1Only vs stage=1] in mk/config.mk.in.
- ifeq "$(Stage1Only)" "YES"
- # Install the copy of ghc-pkg from the dist directory when running 'make
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch
deleted file mode 100644
index 7e4ea7a9f610..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit f2685df3b10e13f142736f28835e9064334bc143
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Wed Apr 5 22:31:37 2017 +0100
-
-    avoid $(CrossCompilerPrefix) for stage2 install
-    
-    Suppose we are crossbuilding ghc (when ghc-stage2
-    is a normal compiler for $target):
-    
-    For this case 'make install' should install unprefixed
-    stage2 'ghc' and not '$(CorssCompilePrefix)-ghc'.
-    
-    That way cross-built ghc is installable and
-    usable on target as if it would be built natively
-    on a target.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index 4d5d82aa80..5e274bb71f 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -530,7 +530,7 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@
- # needs to know which gcc you're using in order to perform its tests.
- 
- GccVersion            = @GccVersion@
--CrossCompilePrefix    = @CrossCompilePrefix@
-+
- # TargetPlatformFull retains the string passed to configure so we have it in
- # the necessary format to pass to libffi's configure.
- TargetPlatformFull    = @TargetPlatformFull@
-@@ -567,6 +567,11 @@ CrossCompiling        = @CrossCompiling@
- # See Note [Stage1Only vs stage=1]
- Stage1Only = NO
- 
-+# Installed tools prefix:
-+#    we add prefix to crosscompiler GHC only (ghc-stage1),
-+#    not cross-built GHC (not ghc-stage2).
-+CrossCompilePrefix    = $(if $(filter YES,$(Stage1Only)),@CrossCompilePrefix@,)
-+
- # Install stage 2 by default, or stage 1 in the cross compiler
- # case. Can be changed to 3
- INSTALL_GHC_STAGE= $(if $(filter YES,$(Stage1Only)),1,2)
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch
deleted file mode 100644
index a5528956de14..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 6ff98b962db15d18eb1d082fe344cef692ecef8e
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Thu Apr 6 08:55:56 2017 +0100
-
-    config.mk.in: remove phase=0 hack for CrossCompilePrefix
-    
-    $(CrossCompilePrefix) is used only in 'make install'
-    target filenames in $(DESTDIR). None of inplace (or boot)
-    files contain $(CrossCompilePrefix).
-    
-    Thus we don't need to worry about phases.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index 4e61eea821..4d5d82aa80 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -530,11 +530,7 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@
- # needs to know which gcc you're using in order to perform its tests.
- 
- GccVersion            = @GccVersion@
--ifeq "$(phase)" "0"
--CrossCompilePrefix    =
--else
- CrossCompilePrefix    = @CrossCompilePrefix@
--endif
- # TargetPlatformFull retains the string passed to configure so we have it in
- # the necessary format to pass to libffi's configure.
- TargetPlatformFull    = @TargetPlatformFull@
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch
deleted file mode 100644
index 79751e1ecbda..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-commit a691f6a7a191a268380805481d8e63134764a4a1
-Author: Sergei Trofimovich <slyfox@inbox.ru>
-Date:   Sat Apr 29 22:02:24 2017 +0100
-
-    add basic cross-compilation support (#87)
-    
-    * fix include case: s/#include <Lmcons.h>/#include <lmcons.h>
-    
-    Noticed when cross-compiling win32 on linux to i686-w64-mingw32-gcc.
-    i686-w64-mingw32 provides all headers in lowercase.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    
-    * Pen.hsc: don't use c99-style comments in enum declarations
-    
-    Ths change workarounds hsc2hs bug in cross-compile mode:
-    https://ghc.haskell.org/trac/ghc/ticket/13619
-    
-    To reproduce the build failure it's enough to run
-      $ cabal configure --hsc2hs-options='--cross-safe --cross-compile'
-      $ cabal build     --hsc2hs-options='--cross-safe --cross-compile'
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    
-    * SimpleMAPI.hsc: don't use #ifdef in enum declarations
-    
-    This change workarounds hsc2hs bug in cross-compile mode:
-    https://ghc.haskell.org/trac/ghc/ticket/13620
-    
-    To reproduce the build failure it's enough to run
-      $ cabal configure --hsc2hs-options='--cross-safe --cross-compile'
-      $ cabal build     --hsc2hs-options='--cross-safe --cross-compile'
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/Graphics/Win32/GDI/Pen.hsc b/Graphics/Win32/GDI/Pen.hsc
-index c880170..8d8df5d 100644
---- a/Graphics/Win32/GDI/Pen.hsc
-+++ b/Graphics/Win32/GDI/Pen.hsc
-@@ -56,7 +56,7 @@ foreign import WINDOWS_CCONV unsafe "windows.h DeleteObject"
- 
- type PenStyle   = INT
- 
--#{enum PenStyle,                              // Pick one of these
-+#{enum PenStyle,
-  , pS_SOLID             = PS_SOLID            // default
-  , pS_DASH              = PS_DASH             // -------
-  , pS_DOT               = PS_DOT              // .......
-@@ -69,14 +69,14 @@ type PenStyle   = INT
-  , pS_STYLE_MASK        = PS_STYLE_MASK       // all the above
-  }
- 
--#{enum PenStyle ,                             // "or" with one of these
-+#{enum PenStyle,
-  , pS_ENDCAP_ROUND      = PS_ENDCAP_ROUND     // default
-  , pS_ENDCAP_SQUARE     = PS_ENDCAP_SQUARE
-  , pS_ENDCAP_FLAT       = PS_ENDCAP_FLAT
-  , pS_ENDCAP_MASK       = PS_ENDCAP_MASK      // all the above
-  }
- 
--#{enum PenStyle,                              // "or" with one of these
-+#{enum PenStyle,
-  , pS_JOIN_ROUND        = PS_JOIN_ROUND       // default
-  , pS_JOIN_BEVEL        = PS_JOIN_BEVEL
-  , pS_JOIN_MITER        = PS_JOIN_MITER
-@@ -87,7 +87,7 @@ If PS_JOIN_MASK is not defined with your GNU Windows32 header files,
- you'll have to define it.
- -}
- 
--#{enum PenStyle,                              // "or" with one of these
-+#{enum PenStyle,
-  , pS_COSMETIC          = PS_COSMETIC         // default
-  , pS_GEOMETRIC         = PS_GEOMETRIC
-  , pS_TYPE_MASK         = PS_TYPE_MASK        // all the above
-diff --git a/System/Win32/Info/Computer.hsc b/System/Win32/Info/Computer.hsc
-index bb2eb72..65ae8dc 100644
---- a/System/Win32/Info/Computer.hsc
-+++ b/System/Win32/Info/Computer.hsc
-@@ -65,7 +65,7 @@ import System.Win32.Utils    ( tryWithoutNull )
- import System.Win32.Word     ( DWORD, LPDWORD )

- 

- #include <windows.h>

--#include <Lmcons.h>

-+#include <lmcons.h>

- #include "alignment.h"

- ##include "windows_cconv.h"

- 

-diff --git a/System/Win32/SimpleMAPI.hsc b/System/Win32/SimpleMAPI.hsc
-index 9727cfc..5ebf06b 100644
---- a/System/Win32/SimpleMAPI.hsc
-+++ b/System/Win32/SimpleMAPI.hsc
-@@ -53,12 +53,6 @@ type MapiFlag = ULONG
-     , mAPI_LOGON_UI         = MAPI_LOGON_UI
-     , mAPI_NEW_SESSION      = MAPI_NEW_SESSION
-     , mAPI_FORCE_DOWNLOAD   = MAPI_FORCE_DOWNLOAD
--#ifdef MAPI_LOGOFF_SHARED
--    , mAPI_LOGOFF_SHARED    = MAPI_LOGOFF_SHARED
--#endif
--#ifdef MAPI_LOGOFF_UI
--    , mAPI_LOGOFF_UI        = MAPI_LOGOFF_UI
--#endif
-     , mAPI_DIALOG           = MAPI_DIALOG
-     , mAPI_UNREAD_ONLY      = MAPI_UNREAD_ONLY
-     , mAPI_LONG_MSGID       = MAPI_LONG_MSGID
-@@ -74,6 +68,19 @@ type MapiFlag = ULONG
-     , mAPI_RECEIPT_REQUESTED = MAPI_RECEIPT_REQUESTED
-     , mAPI_SENT             = MAPI_SENT
-     }
-+-- Have to define enum values outside previous declaration due to
-+-- hsc2hs bug in --cross-compile mode:
-+--    https://ghc.haskell.org/trac/ghc/ticket/13620
-+#ifdef MAPI_LOGOFF_SHARED
-+#{enum MapiFlag,
-+    , mAPI_LOGOFF_SHARED    = MAPI_LOGOFF_SHARED
-+}
-+#endif
-+#ifdef MAPI_LOGOFF_UI
-+#{enum MapiFlag,
-+    , mAPI_LOGOFF_UI        = MAPI_LOGOFF_UI
-+}
-+#endif
- 
- mapiErrors :: [(ULONG,String)]
- mapiErrors =
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch b/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch
deleted file mode 100644
index 00f9ca4fdff9..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-ghc -O2 generates too large C files for unregisterised compiler.
-On ia64 it causes DynFlags to compile for 60 minutes (then assembler
-crashes).
-
-To decrease C code inflation we don't use -O2 in UNREG mode.
-diff --git a/mk/config.mk.in b/mk/config.mk.in
-index 4e61eea..15a56e9 100644
---- a/mk/config.mk.in
-+++ b/mk/config.mk.in
-@@ -72,11 +72,2 @@ GhcStage3HcOpts=-O2
-
--# Disable -O2 optimization. Otherwise amount of generated C code
--# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.hs')
--# and sometimes not compile at all (powerpc64 overflows something
--# on 'compiler/hsSyn/HsExpr.hs').
--ifeq "$(GhcUnregisterised)" "YES"
--GhcStage1HcOpts=
--GhcStage2HcOpts=
--GhcStage3HcOpts=
--endif
-
-@@ -904 +895,13 @@ CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@
- CURSES_LIB_DIRS = @CURSES_LIB_DIRS@
-+
-+# Disable -O2 optimization. Otherwise amount of generated C code
-+# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.hs')
-+# and sometimes not compile at all (powerpc64 overflows something
-+# on 'compiler/hsSyn/HsExpr.hs').
-+ifeq "$(GhcUnregisterised)" "YES"
-+GhcStage1HcOpts=
-+GhcStage2HcOpts=
-+GhcStage3HcOpts=
-+
-+GhcLibHcOpts=
-+endif
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch b/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch
deleted file mode 100644
index b55e37a8bf94..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c2303dff95aa174021a1950656fdf9a1cf983959 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 8 Jul 2017 09:47:12 +0100
-Subject: [PATCH] aclocal.m4: allow arbitrary <vendor> string in toolchain
- triplets
-
-Canonical triplets have a form of
-    <arch>-<vendor>-<os>[-<abi>]
-
-Checking for vendor is almost never correct as it's an
-arbitrary string.
-
-It's useful to have multiple "vendors" to denote
-otherwise the same (WRT <arch>, <os>, <abi>) target:
-    --target=x86_64-pc-linux-gnu
-    --target=x86_64-unknown-linux-gnu
-    --target=x86_64-ghc80-linux-gnu
-    --target=x86_64-ghchead-linux-gnu
-
-Do not fail unknown vendors. Only emit a warning.
-Ideally configure checks should never use "vendor".
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- aclocal.m4 | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 001f813dfc..1d9c09b0cd 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -230,8 +230,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
-         dec|none|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld)
-             ;;
-         *)
--            echo "Unknown vendor [$]1"
--            exit 1
-+            AC_MSG_WARN([Unknown vendor [$]1])
-             ;;
-         esac
-     }
--- 
-2.13.3
-
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch b/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch
deleted file mode 100644
index 81e751d778c8..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix label type for __stginit_* labels: those are .data labels, not .text
-
-Noticed when was building --enable-unregisterised build for x86_64:
-
-/tmp/ghc22931_0/ghc_3.hc:5:9: error:
-     error: '__stginit_ghczmprim_GHCziTypes' redeclared as different kind of symbol
-     StgWord __stginit_ghczmprim_GHCziTypes[]__attribute__((aligned(8)))= {
-             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  |
-5 | StgWord __stginit_ghczmprim_GHCziTypes[]__attribute__((aligned(8)))= {
-  |         ^
-
-In file included from /tmp/ghc22931_0/ghc_3.hc:3:0: error: 
-
-/tmp/ghc22931_0/ghc_3.hc:4:5: error:
-     note: previous declaration of '__stginit_ghczmprim_GHCziTypes' was here
-     EF_(__stginit_ghczmprim_GHCziTypes);
-         ^
-diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
-index 77a889a..05d71ab 100644
---- a/compiler/cmm/CLabel.hs
-+++ b/compiler/cmm/CLabel.hs
-@@ -956,3 +956,3 @@ labelType (CaseLabel _ CaseReturnInfo)          = DataLabel
- labelType (CaseLabel _ _)                       = CodeLabel
--labelType (PlainModuleInitLabel _)              = CodeLabel
-+labelType (PlainModuleInitLabel _)              = DataLabel
- labelType (SRTLabel _)                          = DataLabel
diff --git a/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch b/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch
deleted file mode 100644
index 39b6eeedd566..000000000000
--- a/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/gentoo-haskell/gentoo-haskell/issues/959
-
-From 144abba394c6a23eb877fbde727111a5e75b9d47 Mon Sep 17 00:00:00 2001
-From: Ben Gamari <ben@smart-cactus.org>
-Date: Wed, 18 Sep 2019 23:50:20 -0400
-Subject: [PATCH] configure: Don't depend upon alex in source dist build
-
-This fixes #16860 by verifying that the generated sources don't already
-exist before asserting that the `alex` executable was found. This
-replicates the logic already used for `happy` in the case of `alex`.
----
- aclocal.m4 | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -984,8 +984,11 @@ else
- fi;
- changequote([, ])dnl
- ])
--FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7],
--  [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[]
-+if test ! -f compiler/parser/Lexer.hs
-+then
-+    FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7],
-+      [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[]
-+fi
- AlexVersion=$fptools_cv_alex_version;
- AC_SUBST(AlexVersion)
- ])
--- 
-2.23.0
-
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
deleted file mode 100644
index 590b6e0a913d..000000000000
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ /dev/null
@@ -1,674 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-#
-# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass'
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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}-arm.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PVR}-amd64.tbz2 )"
-arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64.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 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-${PVR}-x86.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 ;;
-		#arm)
-		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
-		#	return 0
-		#;;
-		amd64) return 0 ;;
-		ia64) return 0 ;;
-		ppc) return 0 ;;
-		ppc64) return 0 ;;
-		sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=7.10.2.20151030 # uncomment only for -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? ( https://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.tar.bz2 )"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-	"binary                  0.7.6.1"
-	"hoopl                   3.10.2.0"
-	"transformers            0.4.3.0"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp"
-IUSE+=" binary"
-IUSE+=" elibc_glibc" # system stuff
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-5:=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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-compat:5
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
-
-PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
-
-REQUIRED_USE="?? ( ghcbootstrap binary )"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# 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() {
-	if is_crosscompile; 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
-
-	# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-	gcc-specs-ssp && append-ghc-cflags persistent compile      -fno-stack-protector
-
-	# prevent from failind building unregisterised ghc:
-	# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-	use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	# fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data
-	# currently ghc fails to build haddock
-	# https://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html
-	use ia64 && append-ghc-cflags persistent compile -G0
-}
-
-# 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" "$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/$(cross)ghc-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)hsc2hs" \
-			"${WORKDIR}/usr/bin/$(cross)runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/$(cross)ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)hsc2hs" \
-		"${WORKDIR}/usr/bin/$(cross)runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/$(cross)${GHC_P}/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"
-}
-
-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
-}
-
-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.bz2  ;;
-	esac
-	unpack ${ONLYA}
-
-	if [[ -d "${S}"/libraries/dph ]]; then
-		# Sometimes dph libs get accidentally shipped with ghc
-		# but they are not installed unless user requests it.
-		# We never install them.
-		elog "Removing 'libraries/dph'"
-		rm -rf "${S}"/libraries/dph
-	fi
-}
-
-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/$(cross)ghc-${GHC_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)/$(cross)${GHC_P}/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}"
-	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 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
-				# much 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 epatch will break
-
-		epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-
-		epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		epatch "${FILESDIR}"/${PN}-7.10.1-rc3-ghc-7.10-bootstrap.patch
-		epatch "${FILESDIR}"/${PN}-7.10.3-relnotes.patch
-		epatch "${FILESDIR}"/${PN}-7.10.3-hardfloat.patch
-
-		# Since ${S}/packages does not include base, etc. add them to gen_contents_index
-		sed -e 's@\(for REPO in .*\)@\1 base integer-gmp integer-gmp2 integer-simple template-haskell@' \
-			-i libraries/gen_contents_index || die
-
-		if use prefix; then
-			# Make configure find docbook-xsl-stylesheets from Prefix
-			sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
-				-i utils/haddock/doc/configure.ac || die
-		fi
-
-		bump_libs
-
-		# 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/${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/${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
-
-		# 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_DOCBOOK_PDF  = NO"  >> mk/build.mk
-		echo "BUILD_DOCBOOK_PS   = NO"  >> mk/build.mk
-		if use doc; then
-			echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk
-		else
-			echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk
-		fi
-
-		# this controls presence on 'xhtml' and 'haddock' in final install
-		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-
-		# 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
-
-		# 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
-
-		if use gmp; then
-			echo "INTEGER_LIBRARY=integer-gmp2" >> mk/build.mk
-		else
-			echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
-		fi
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds 'gcc' 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.
-		is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc)
-
-		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
-		else
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		elog "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
-
-		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
-		# 1. build compiler binary first
-		emake ghc/stage2/build/tmp/ghc-stage2
-		# 2. pax-mark (bug #516430)
-		pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-
-		emake -j1 install DESTDIR="${D}"
-		dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
-
-		# 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 [[ ! -f "${S}/VERSION" ]]; then
-			echo "${GHC_PV}" > "${S}/VERSION" \
-				|| die "Could not create file ${S}/VERSION"
-		fi
-		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"
-}
-
-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-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
deleted file mode 100644
index 89b41d258710..000000000000
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ /dev/null
@@ -1,600 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-#
-# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass'
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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}-arm.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-amd64.tbz2 )"
-arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64.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 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}-x86.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 ;;
-		#arm)
-		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
-		#	return 0
-		#;;
-		amd64) return 0 ;;
-		ia64) return 0 ;;
-		ppc) return 0 ;;
-		ppc64) return 0 ;;
-		sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=7.8.3.20141119 # uncomment only for -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? ( https://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.tar.bz2 )"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-ia64-CLOSUREs-regenerated.patch.gz"
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp"
-IUSE+=" binary"
-IUSE+=" elibc_glibc" # system stuff
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-5:=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-PREBUILT_BINARY_DEPENDS="
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-	sys-libs/ncurses-compat:5
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )"
-
-DEPEND="${RDEPEND}
-	ghcbootstrap? (
-		doc? ( app-text/docbook-xml-dtd:4.2
-			app-text/docbook-xml-dtd:4.5
-			app-text/docbook-xsl-stylesheets
-			>=dev-libs/libxslt-1.1.2 ) )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
-
-PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
-
-REQUIRED_USE="?? ( ghcbootstrap binary )"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-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
-}
-
-ghc_setup_cflags() {
-	if is_crosscompile; 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}"
-		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
-
-	# hardened-gcc needs to be disabled, because the mangler doesn't accept
-	# its output.
-	gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
-	gcc-specs-ssp && append-ghc-cflags persistent compile      -fno-stack-protector
-
-	# prevent from failind building unregisterised ghc:
-	# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-	use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	# fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data
-	# currently ghc fails to build haddock
-	# https://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html
-	use ia64 && append-ghc-cflags persistent compile -G0
-}
-
-# 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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"
-
-	# regenerate the binary package cache
-	"$gp_back" recache || die "failed to update cache after relocation"
-	rm "$gp_back"
-}
-
-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
-}
-
-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.bz2  ;;
-	esac
-	unpack ${ONLYA}
-
-	if [[ -d "${S}"/libraries/dph ]]; then
-		# Sometimes dph libs get accidentally shipped with ghc
-		# but they are not installed unless user requests it.
-		# We never install them.
-		elog "Removing 'libraries/dph'"
-		rm -rf "${S}"/libraries/dph
-	fi
-}
-
-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-${GHC_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)/${GHC_P}/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}"
-	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 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
-				# much 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 epatch will break
-
-		epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-
-		epatch "${FILESDIR}"/${PN}-7.8.1_rc1-libbfd.patch
-
-		epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		# bug 518734
-		epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
-		# fix threaded runtime on ia64
-		epatch "${FILESDIR}"/${PN}-7.8.4-ia64-CLOSUREs.patch
-		epatch "${WORKDIR}"/${PN}-7.8.4-ia64-CLOSUREs-regenerated.patch
-
-		# upstream backports
-		epatch "${FILESDIR}"/${PN}-7.8.3-linker-warn.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-pic-sparc.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-ppc32-fPIC.patch
-		epatch "${FILESDIR}"/${PN}-7.8.4-gold.patch
-
-		if use prefix; then
-			# Make configure find docbook-xsl-stylesheets from Prefix
-			sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
-				-i utils/haddock/doc/configure.ac || die
-		fi
-
-		# 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/${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
-
-		# We also need to use the GHC_FLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
-		echo "SRC_LD_OPTS+=${LDFLAGS}" >> 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
-		if use ghcbootstrap && use doc; then
-			echo "BUILD_DOCBOOK_PDF  = NO"  >> mk/build.mk
-			echo "BUILD_DOCBOOK_PS   = NO"  >> mk/build.mk
-			echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk
-			echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-		else
-			echo "BUILD_DOCBOOK_PDF  = NO" >> mk/build.mk
-			echo "BUILD_DOCBOOK_PS   = NO" >> mk/build.mk
-			echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk
-			echo "HADDOCK_DOCS       = NO" >> 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
-
-		# 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
-
-		if use gmp; then
-			echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk
-		else
-			echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
-		fi
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds 'gcc' 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.
-		is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc)
-
-		if ! use ghcmakebinary; then
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
-
-		if [[ ${PV} == *9999* ]]; then
-			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-			GHC_P=${PN}-${GHC_PV}
-		fi
-		GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-	fi # ! use binary
-}
-
-src_compile() {
-	if ! use binary; then
-		# 1. build compiler binary first
-		emake ghc/stage2/build/tmp/ghc-stage2
-		# 2. pax-mark (bug #516430)
-		pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-
-		# Remove the docs if not requested
-		if ! use doc; then
-			rm -rf "${ED}/usr/share/doc/${P}/*/" \
-				"${ED}/usr/share/doc/${P}/*.html" \
-				|| die "could not remove docs (P vs PF revision mismatch?)"
-		fi
-	else
-		# We only build docs if we were bootstrapping, otherwise
-		# we copy them out of the unpacked binary .tbz2
-		if use doc && ! use ghcbootstrap; then
-			mkdir -p "${ED}/usr/share/doc"
-			mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \
-				|| die "failed to copy docs"
-		else
-			dodoc "${S}/distrib/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
-		fi
-
-		emake -j1 install DESTDIR="${D}"
-
-		# remove link, but leave 'haddock-${GHC_P}'
-		rm -f "${ED}"/usr/bin/haddock
-
-		if [[ ! -f "${S}/VERSION" ]]; then
-			echo "${GHC_PV}" > "${S}/VERSION" \
-				|| die "Could not create file ${S}/VERSION"
-		fi
-		newbashcomp "${FILESDIR}/ghc-bash-completion" ghc-pkg
-
-	fi
-
-	# path to the package.cache
-	local package_confdir="${ED}/usr/$(get_libdir)/${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"
-}
-
-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)/${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 --upgrade'"
-		ewarn "to rebuild all ghc-based Haskell libraries."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	# Be very careful here... Call order when upgrading is (according to PMS):
-	# * src_install for new package
-	# * pkg_preinst for new package
-	# * pkg_postinst for new package
-	# * pkg_prerm for the package being replaced
-	# * pkg_postrm for the package being replaced
-	# so you'll actually be touching the new packages files, not the one you
-	# uninstall, due to that or installation directory ${GHC_P} will be the same for
-	# both packages.
-
-	# Call order for reinstalling is (according to PMS):
-	# * src_install
-	# * pkg_preinst
-	# * pkg_prerm for the package being replaced
-	# * pkg_postrm for the package being replaced
-	# * pkg_postinst
-
-	# Overwrite the modified package.cache with a copy of the
-	# original one, so that it will be removed during uninstall.
-
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/${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.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
deleted file mode 100644
index ede481d98eaf..000000000000
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ /dev/null
@@ -1,672 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-#
-# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass'
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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}-arm.tbz2 )"
-arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-arm64.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-unknown-linux-gnu.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 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)
-		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
-		#	return 0
-		#;;
-		amd64) return 0 ;;
-		ia64) return 0 ;;
-		ppc) return 0 ;;
-		ppc64) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.0.1.20161213 # uncomment only for -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? ( https://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.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 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp +profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap binary )"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# 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() {
-	if is_crosscompile; 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
-
-	# 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 && version_is_at_least 6.3 $(gcc-version) && 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 failind building unregisterised ghc:
-	# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-	use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-}
-
-# 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" "$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
-		bin_libpath=${bin_ghc_prefix}/$(get_libdir)
-
-		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
-			"${WORKDIR}/usr/bin/$(cross)ghc-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/$(cross)hsc2hs" \
-			"${WORKDIR}/usr/bin/$(cross)runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/$(cross)ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/$(cross)hsc2hs" \
-		"${WORKDIR}/usr/bin/$(cross)runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/$(cross)${GHC_P}/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
-}
-
-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/$(cross)ghc-${GHC_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)/$(cross)${GHC_P}/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}"
-	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 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
-				# much 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 epatch will break
-
-		epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-
-		epatch "${FILESDIR}"/${PN}-8.0.1_rc1-cgen-constify.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
-
-		epatch "${FILESDIR}"/${PN}-8.0.1-limit-jN.patch
-		epatch "${FILESDIR}"/${PN}-8.0.1-ww-args-limit.patch
-		epatch "${FILESDIR}"/${PN}-8.0.1-par-g0-on-A32.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2_rc2-old-sphinx.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2-O2-unreg.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2-binutils-2.30.patch
-
-		bump_libs
-
-		# 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/${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/${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
-
-		# 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 'gcc' 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.
-		is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc)
-
-		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
-		else
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		elog "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
-
-		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
-		# 1. build/pax-mark compiler binary first
-		emake ghc/stage2/build/tmp/ghc-stage2
-		pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-		# 2. build/pax-mark haddock using ghc-stage2
-		emake utils/haddock/dist/build/tmp/haddock
-		pax-mark -m utils/haddock/dist/build/tmp/haddock
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-
-		emake -j1 install DESTDIR="${D}"
-		dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
-
-		# 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 [[ ! -f "${S}/VERSION" ]]; then
-			echo "${GHC_PV}" > "${S}/VERSION" \
-				|| die "Could not create file ${S}/VERSION"
-		fi
-		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"
-}
-
-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.1.ebuild b/dev-lang/ghc/ghc-8.10.1.ebuild
deleted file mode 100644
index 1db40de34286..000000000000
--- a/dev-lang/ghc/ghc-8.10.1.ebuild
+++ /dev/null
@@ -1,797 +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
-
-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}
-	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} )"
-
-# 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
-}
-
-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 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-no-relax-everywhere.patch
-		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.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.2.ebuild b/dev-lang/ghc/ghc-8.10.2.ebuild
deleted file mode 100644
index fc819806ed06..000000000000
--- a/dev-lang/ghc/ghc-8.10.2.ebuild
+++ /dev/null
@@ -1,797 +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
-
-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}
-	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} )"
-
-# 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
-}
-
-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 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.2-revert-linker-rtsSymbols_more_linker_symbols.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.3.ebuild b/dev-lang/ghc/ghc-8.10.3.ebuild
deleted file mode 100644
index 4b91c85afe92..000000000000
--- a/dev-lang/ghc/ghc-8.10.3.ebuild
+++ /dev/null
@@ -1,796 +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
-
-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}
-	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} )"
-
-# 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
-}
-
-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 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
-
-		# 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.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild
index a0a3d692f588..7257681ccbe7 100644
--- a/dev-lang/ghc/ghc-8.10.4.ebuild
+++ b/dev-lang/ghc/ghc-8.10.4.ebuild
@@ -75,8 +75,7 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-# no binaries yet
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
 IUSE+=" binary"
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild
deleted file mode 100644
index aa2a45cf9624..000000000000
--- a/dev-lang/ghc/ghc-8.2.1.ebuild
+++ /dev/null
@@ -1,754 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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 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) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.2.0.20170704 # uncomment only for -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? ( https://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.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="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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
-}
-
-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-${GHC_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)/${GHC_P}/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}"
-	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 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
-				# much 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 epatch will break
-
-		epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1-darwin.patch
-
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-cgen-constify.patch
-		epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		epatch "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
-
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc2-O2-unreg.patch
-
-		# a bunch of crosscompiler patches
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-unphased-cross.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-staged-cross.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-ghci-cross.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-stage2-cross.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc3-any-vendor.patch
-		epatch "${FILESDIR}"/${PN}-8.2.1_rc3-stginit-data.patch
-
-		# needs a new libffi release
-		epatch "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			epatch "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-1.patch # upstreamed, waits for merge to -HEAD
-			epatch "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
-		popd
-
-		bump_libs
-
-		# 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
-			LD=${CTARGET}-ld
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-		)
-		if [[ ${CTARGET} == arm* ]] ; then
-			# 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)
-		fi
-
-		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
-
-		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_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"
-}
-
-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.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild
deleted file mode 100644
index 1338261d87dc..000000000000
--- a/dev-lang/ghc/ghc-8.2.2.ebuild
+++ /dev/null
@@ -1,755 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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 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) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.2.1.20171108 # uncomment only for -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? ( https://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.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="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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
-}
-
-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-${GHC_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)/${GHC_P}/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 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
-				# much 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}-8.2.1_rc1-cgen-constify.patch
-		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
-
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc2-O2-unreg.patch
-		eapply "${FILESDIR}"/${PN}-8.0.2-binutils-2.30.patch
-
-		# a bunch of crosscompiler patches
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc1-unphased-cross.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc1-staged-cross.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc1-ghci-cross.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc1-stage2-cross.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-
-		# needs a new libffi release
-		eapply "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-1.patch # upstreamed, waits for merge to -HEAD
-			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
-			LD=${CTARGET}-ld
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-		)
-		if [[ ${CTARGET} == arm* ]] ; then
-			# 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)
-		fi
-
-		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
-
-		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_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"
-}
-
-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.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild
deleted file mode 100644
index 0e86ec36e7d4..000000000000
--- a/dev-lang/ghc/ghc-8.4.1.ebuild
+++ /dev/null
@@ -1,755 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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 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) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.4.0.20180224 # 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 )"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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
-}
-
-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-${GHC_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)/${GHC_P}/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 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
-				# much 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
-
-		# 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
-
-		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_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"
-}
-
-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.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild
deleted file mode 100644
index f6d8c953ac95..000000000000
--- a/dev-lang/ghc/ghc-8.4.2.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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 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) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.4.1.20180329 # 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 )"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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
-}
-
-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-${GHC_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)/${GHC_P}/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 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
-				# much 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.0.2-binutils-2.30.patch
-		eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.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
-
-		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_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"
-}
-
-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.4.3.ebuild b/dev-lang/ghc/ghc-8.4.3.ebuild
deleted file mode 100644
index 58e642364d02..000000000000
--- a/dev-lang/ghc/ghc-8.4.3.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib pax-utils toolchain-funcs versionator prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-# 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 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) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.4.1.20180329 # 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 )"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-
-	# 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_PV}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$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_PV}" \
-			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${GHC_PV}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
-		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/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
-}
-
-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-${GHC_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)/${GHC_P}/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 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
-				# much 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
-
-		# 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
-
-		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_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"
-}
-
-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.6.4.ebuild b/dev-lang/ghc/ghc-8.6.4.ebuild
deleted file mode 100644
index 52d995e60819..000000000000
--- a/dev-lang/ghc/ghc-8.6.4.ebuild
+++ /dev/null
@@ -1,775 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs versionator 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 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) 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}"
-#will need big tree sync
-#KEYWORDS="~amd64 ~x86"
-IUSE="doc ghcbootstrap ghcmakebinary +gmp profile test"
-RESTRICT="!test? ( test )"
-IUSE+=" binary"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	!ghcmakebinary? ( dev-libs/libffi:= )
-"
-
-# 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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-}
-
-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 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
-
-		# 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
-
-		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"
-}
-
-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.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild
deleted file mode 100644
index 89e16a5acd9b..000000000000
--- a/dev-lang/ghc/ghc-8.6.5.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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
-
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs versionator 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}"
-# to be rekeyworded when most of revdeps are updated
-#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}
-	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} )"
-
-PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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} ]]
-}
-
-# 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 && version_is_at_least 6.3 $(gcc-version) && 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
-}
-
-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 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
-		eapply "${FILESDIR}"/${PN}-8.6.5-numa.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"
-}
-
-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.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild
deleted file mode 100644
index 00ce56862619..000000000000
--- a/dev-lang/ghc/ghc-8.8.1.ebuild
+++ /dev/null
@@ -1,804 +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
-
-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=""
-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}
-	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} )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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
-}
-
-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 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
-		eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch
-		eapply "${FILESDIR}"/${PN}-8.8.1-no-alex.patch
-		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-8.8.2.ebuild b/dev-lang/ghc/ghc-8.8.2.ebuild
deleted file mode 100644
index 61b81fb8fb23..000000000000
--- a/dev-lang/ghc/ghc-8.8.2.ebuild
+++ /dev/null
@@ -1,803 +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
-
-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=""
-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}
-	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} )"
-
-REQUIRED_USE="?? ( ghcbootstrap 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
-}
-
-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 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
-		eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch
-		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-8.8.3.ebuild b/dev-lang/ghc/ghc-8.8.3.ebuild
deleted file mode 100644
index eb0ede0ad7fe..000000000000
--- a/dev-lang/ghc/ghc-8.8.3.ebuild
+++ /dev/null
@@ -1,808 +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
-
-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=""
-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}
-	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} )"
-
-# 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
-}
-
-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 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
-		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/go/Manifest b/dev-lang/go/Manifest
index cbb79dde25b8..b68f0ff8fb18 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,17 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.14.14.src.tar.gz 22557733 BLAKE2B aa3638c7a20f89e90bf17e9da1b12323cc8c0f52fb0a92ca6a850f7b2c94e406ea50a57fc28cc34b951bf7ecee0a9bb1ce884ad86dfc23241d7b62cd9435f881 SHA512 76213b19eeec66ca6c6b5bdef875bea0b64c3877c70eec64dd65f7869ceb8db016ff19193f01771f8944fd5f0ae3b54c68185e158f2622d1db5552fec1f37976
-DIST go1.14.15.src.tar.gz 22557340 BLAKE2B 1170cb9d5c0c6686c0c49b4bef1f5d7afcf495a3989fb98c51f1e881eaf1c7502a9517dd9da8d84e091bd6e0d5a88f1d448bf430733a69b44ae0b00c217ba2ba SHA512 94cacf8c86789600fae09a1da4055b9a436977b18488d85bb91494eece8a8e012e1b68924a8a50714c2d17db19d1e84a4a6bec91fa10fd8415c9739c9a348dc1
 DIST go1.15.10.src.tar.gz 23021993 BLAKE2B 8143f7703d07d4793521bbb6b935b87ecd87df451cc5d03370a01bddabc284e85ec94a16fed378ee9ac8e3f0d6999402025bb1d6afa3c1810c6343205c4eb2d4 SHA512 4f0ceff8dc035ec50cd0d136678573f4d624bca6a19293d5ffd75868d94d264291e44519bc450e40e8de486ee44d720555550eecf86cbae1f0d64dee00f90764
-DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb
-DIST go1.15.8.src.tar.gz 23018628 BLAKE2B 234208b16865f0ac1567e12d3f2dee379f64220a8a04e4b4057d065d3b12e1a110688f165ddc25accf96eab7d8bd2da3717cdd18b74f8d391da8b404bf40ae4f SHA512 4b805425550aff5c38f1f66fa7f7b3282b20850b1c0735898ee62820080514a2a6ab573f1d6984656c5bb955ec2b10cef90fbb7ab6a6c8f1e75ebc0964a04a80
 DIST go1.16.2.src.tar.gz 20905135 BLAKE2B 35fccc72604bf8cc7b1b5677d995b88e3232559e32af51f96a63bfc8cabecec09d885b5b8aa4b2ba03c481254da20dbf9bd83387091931c08a1c5c180c071931 SHA512 d14858a75cc7411975aaca705e66145287dc96b4fac1b1b06b95377dc5e5d2762f060973744114f42c780b34ea4baef7038c94616649c2dcc5c97e261cefc6bd
-DIST go1.16.src.tar.gz 20895394 BLAKE2B 7ac4939394f873d748b7436fccc926591d34e5f046d6a5dc4548e494b523ceae5f0c30e90494993536240ebf01563774fb2103cd2e7911f72997dd2d20aeb112 SHA512 9c43e0ebb2d35c694b652cae8d4040ce3f3c8c014abd9496c92c78cc015ecea5b5331e7c2acf098d0c24dec222454ea09d834df4b6bc90d46e9feeac0ac578bf
-EBUILD go-1.14.14.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
-EBUILD go-1.14.15.ebuild 4579 BLAKE2B d6e3779180ce639f03387ec3a5021b31e8d30493180c01cf86a5f69aa4d93bb3c265db1c23d5e6dd69c319b9845b5a7d0dafda47c0ae840b1a1d56e099e65744 SHA512 4cb133223e319b4c12679cc39e32f1262192fcac68e918ba69a501979f9cf97760589d28a897f5ae2a7c26da7b17e8f9c0593509467f85223daf7aed95e7974c
-EBUILD go-1.15.10.ebuild 4575 BLAKE2B 59478da54b06e96c39ae118da8a34afd9326c4adc54ea1de82f79d5022fc9b168cb2a972be881806b2ec5483ae3fff0050b5eba8c8a8113c5884d8e7c2cd86a5 SHA512 60a5ab131234a322fbf48997359cf89fbd684507b14757c8d368c7ddac1ba85fdfc6e741dbbbeaedb07067944c62e8a60ff55c5fc6aca96239c1c158c65cbf2f
-EBUILD go-1.15.7.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
-EBUILD go-1.15.8.ebuild 4579 BLAKE2B d6e3779180ce639f03387ec3a5021b31e8d30493180c01cf86a5f69aa4d93bb3c265db1c23d5e6dd69c319b9845b5a7d0dafda47c0ae840b1a1d56e099e65744 SHA512 4cb133223e319b4c12679cc39e32f1262192fcac68e918ba69a501979f9cf97760589d28a897f5ae2a7c26da7b17e8f9c0593509467f85223daf7aed95e7974c
-EBUILD go-1.16.2.ebuild 4575 BLAKE2B 59478da54b06e96c39ae118da8a34afd9326c4adc54ea1de82f79d5022fc9b168cb2a972be881806b2ec5483ae3fff0050b5eba8c8a8113c5884d8e7c2cd86a5 SHA512 60a5ab131234a322fbf48997359cf89fbd684507b14757c8d368c7ddac1ba85fdfc6e741dbbbeaedb07067944c62e8a60ff55c5fc6aca96239c1c158c65cbf2f
-EBUILD go-1.16.ebuild 4579 BLAKE2B d6e3779180ce639f03387ec3a5021b31e8d30493180c01cf86a5f69aa4d93bb3c265db1c23d5e6dd69c319b9845b5a7d0dafda47c0ae840b1a1d56e099e65744 SHA512 4cb133223e319b4c12679cc39e32f1262192fcac68e918ba69a501979f9cf97760589d28a897f5ae2a7c26da7b17e8f9c0593509467f85223daf7aed95e7974c
+EBUILD go-1.15.10.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
+EBUILD go-1.16.2.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
 EBUILD go-9999.ebuild 4579 BLAKE2B c19b3d07e84df70393c8242eb825444436b97d591b214bf1fbd6d265ac0e276fd147d1cfa96e61b1e33468d56eb355cdeda807af7beaa0b3fdcb2f1d1f989374 SHA512 768d17b68de2925267e8274f9e216cd5f79c13be54cb986d0126ab85beaaaa4e46d8ca18422786ee09813b4707aafc6695df815e234fa330dc0211c2ebd398d3
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.14.14.ebuild b/dev-lang/go/go-1.14.14.ebuild
deleted file mode 100644
index 55fd0c4f6bf1..000000000000
--- a/dev-lang/go/go-1.14.14.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.14.15.ebuild b/dev-lang/go/go-1.14.15.ebuild
deleted file mode 100644
index 461f57dcd52f..000000000000
--- a/dev-lang/go/go-1.14.15.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.15.10.ebuild b/dev-lang/go/go-1.15.10.ebuild
index aaafc03202c3..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.15.10.ebuild
+++ b/dev-lang/go/go-1.15.10.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 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.15.7.ebuild b/dev-lang/go/go-1.15.7.ebuild
deleted file mode 100644
index 55fd0c4f6bf1..000000000000
--- a/dev-lang/go/go-1.15.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.15.8.ebuild b/dev-lang/go/go-1.15.8.ebuild
deleted file mode 100644
index 461f57dcd52f..000000000000
--- a/dev-lang/go/go-1.15.8.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.16.2.ebuild b/dev-lang/go/go-1.16.2.ebuild
index aaafc03202c3..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.16.2.ebuild
+++ b/dev-lang/go/go-1.16.2.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 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.16.ebuild b/dev-lang/go/go-1.16.ebuild
deleted file mode 100644
index 461f57dcd52f..000000000000
--- a/dev-lang/go/go-1.16.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index 7ca7b01d2130..3b04b0647f6f 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -2,8 +2,10 @@ AUX icon-9.5.1-flags.patch 2148 BLAKE2B 37fcaca92f67be74caddbf7789ca4e666a4e0b98
 AUX icon-9.5.1-fpoll.patch 977 BLAKE2B 720fac1a8109d3400b6a718f708904d14e2d4207840a2e4d31888dd4be2d02c241c2f40271b89f6e3273732288e203e9298f061dfb485ca4eb0c24baea02534c SHA512 4b9d471d7d2992a75cccea98790339318b8a622d993a34affc69e0dbbbfa7103e8b994494eb33aaf26168bdb18623c5419f2c34471dee4adb1a004b420b793ab
 AUX icon-9.5.1-musl.patch 726 BLAKE2B 83aff0d45e50afa88830d18dbec53838e8adaaa4099fbe405b2212fbc0e53240fc0b21d934f2dfc263afc576bf671924d253784dc65e498b4bacecc91d479255 SHA512 b2be4642126edd75f6ae3466879841ec0123c367c93d74d91d9b9f290deaef9d7bbaa6642ad0440e297850664c6da7f33931782214c9afd8ca2d380b75d588e1
 DIST icon-9.5.20h.tar.gz 3137602 BLAKE2B 093290f7df4d0c1686b57c1debabdae5ab607fab00849885fd97b68b872db9d360e9ffe61b7be2e503f5ffa70a387011128c65586b0d48e298577d0ca690a729 SHA512 c3dec5d9d6f2e01fb27b09897cf9e54103749e64e64feb6503e1d25a00bf7da498e40207d8d220af8aca134df6fb281484bd8c8444d256f04ddc39de6a23ca1f
+DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b780733820000c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394
 DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad
 EBUILD icon-9.5.1-r1.ebuild 2507 BLAKE2B 5493470ee8d9a3bdad899e84d76f84b760e6bbcecc27e783247ffc386970948e3a097bb786e546f9c6473247f9707f50eb623cf270e6db2d401bea627d56967a SHA512 65aca9dfd666661578110c0056371a2b2647cadf11410f1f0af73669e2153a5d813da401b1f80ff97cccc7d507a265e80c8357ee86d86516b4de243d02f6f18e
 EBUILD icon-9.5.1-r2.ebuild 2971 BLAKE2B 811c5a0670ec4b68d5ff63f26b16f5b180a08aee91e9afe4399ddc05d22ab962c91b14055a3e2c3ed82e62fc2bfde5da1a07eec04f0b1050a777f8115001219d SHA512 4cca14040a76bdcd15d8b3e200425d9e2ad0dffc9883054f1d0a628f62fb83786928f17eaff5f2eb64bdab8d82c559895471491cac57ae90e9089d902a6956be
 EBUILD icon-9.5.20h.ebuild 3292 BLAKE2B 07c2221714a69ae1a35577bd195879f5203d03bbc8942ae777583153664d766100020a1a221f6a94f254fdff68f1383d828a078a20d9782e0c18064754c46a65 SHA512 c99f537832b4c172a15410202461f45ab1b94794bf7f9f65b52f3ab608691b193ec1ef5af91bc5df14998c840e6fc6ea0c19d2de351aa6ae822eadaa8331e5bb
-MISC metadata.xml 467 BLAKE2B b480285505dec662f62038d22a88323f01f21b100de7ee652f2e3d5f5f4cdf4345ad7d303f2713b1a2816157c46610c2f5287cb385c61998f68fd95d09bf9d5b SHA512 1a77000b72ae453ecb2bd4452e32ea917328a61bb882e107b96f013ddaa218e951743569e38e97210a341755bd7c891324123d96e56da9a5a7caa93ad4dbb93a
+EBUILD icon-9.5.20i.ebuild 3399 BLAKE2B 275f027efa50c2b5c04f068294b9e3af4f28505b11db82d3c245c67cd050e5edc44e2003413cb43d1437a434528342fd6fcf5d88404578b735d66f38f6ff866f SHA512 838293a4e49f19d30e46115aac6a567c4093db22ad589500a7797e305f23a874348392df23870a67111560ca9f5b2be5e74855bab941302d42ab07153bb523f1
+MISC metadata.xml 497 BLAKE2B 789a576ce23fa3a1e3ff1675d08268dff5ec7f4ee2c12ad6bb49f9d1533f2d7066aa42bea4b1719890d7f796378eaa492d15c0f8a1921ca0766c645765469585 SHA512 9ae10c0e4f75d79ca89325d6894f29b41f167c9c9d8eef56df9d525bff24ee5703afa4017868f2bc1196ee9185ad441bdd257c50cabf8d2d0ec8f63ad81f8cb3
diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild
new file mode 100644
index 000000000000..ba49cb68f235
--- /dev/null
+++ b/dev-lang/icon/icon-9.5.20i.ebuild
@@ -0,0 +1,123 @@
+# 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="Very high level language"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+
+SRC_URI="https://github.com/gtownsend/icon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="X"
+
+S="${WORKDIR}/icon-${PV}"
+
+RDEPEND="
+	X? ( x11-libs/libX11:= )"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+
+src_prepare() {
+	default
+	# Add CFLAGS and LDFLAGS to Makefiles as needed
+	sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/cfuncs/Makefile || die
+	sed -i -e 's/^CFLAGS = \(.*\)/CFLAGS = $(CFLAGS) \1/g' ipl/packs/loadfunc/Makefile || die
+	sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/packs/loadfunc/Makefile || die
+	sed -i -e 's/-o $LIBNAME $CFLAGS/& $LDFLAGS/g' ipl/cfuncs/mklib.sh || die
+	sed -i -e 's/$LIBNAME -fPIC/$LIBNAME -fPIC $LDFLAGS/g' ipl/cfuncs/mklib.sh || die
+	sed -i -e 's/$(RLINK)/& $(LDFLAGS)/g' src/runtime/Makefile || die
+
+	# executables in src/common are only used to prep the build
+	sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/common/Makefile || die
+	# executables in src/rtt are only used to perform the build
+	sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/rtt/Makefile || die
+
+	# do not prestrip files
+	find "src" -name 'Makefile' -exec sed -i -e '/strip/d' '{}' \; || die
+}
+
+src_configure() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if [[ ${CHOST} == *-darwin* ]]; then
+		mytarget="macintosh"
+	else
+		mytarget="linux"
+	fi
+
+	# Fails if more then one make job process.
+	# This is an upstream requirement.
+	emake -j1 $(usex X X-Configure Configure) name=${mytarget}
+
+	# sanitise the Makedefs file generated by 'make Configure'
+	sed -i \
+		-e 's:-L/usr/X11R6/lib64::g' \
+		-e 's:-L/usr/X11R6/lib::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		-e '/^CFLAGS/d' \
+		Makedefs || die "sed of Makedefs failed"
+
+	if use elibc_musl; then
+		append-flags "-D_MUSL"
+	fi
+	append-flags $(test-flags -fno-strict-aliasing -fwrapv)
+}
+
+src_compile() {
+	# Fails if more then one make job process.
+	# This is an upstream requirement.
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	emake Samples
+	emake Test
+}
+
+src_install() {
+	# Needed for make Install
+	dodir /usr/$(get_libdir)
+
+	emake Install dest="${D}/usr/$(get_libdir)/icon"
+	dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym ../$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	if use X; then
+		dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib
+	fi
+
+	cd "${S}/man/man1" || die
+	doman "${PN}"t.1
+	doman "${PN}".1
+
+	cd "${S}/doc" || die
+	local DOCS=( *.txt ../README )
+
+	local HTML_DOCS=( *.{htm,gif,jpg,css} )
+	einstalldocs
+
+	# Clean up items from make Install that get installed elsewhere
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/man || die
+	rm -r "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die
+
+	cd "${S}" || die
+
+	# Install Icon Programming Library files
+
+	# Remove files only needed for building the library before copying
+	rm -v ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die
+
+	insinto /usr/$(get_libdir)/icon
+	doins -r ipl
+}
diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml
index 3a8dc81cb0aa..3c41d2c6915b 100644
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>cwills@witznd.net</email>
 		<name>Cheyenne Wills</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index d9155f4fb42a..ad9ce04a40ac 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -2,4 +2,4 @@ DIST janet-1.12.2.tar.gz 558788 BLAKE2B 0cdbc33d968b0b589cfc0ccd6dd5ffffe23932da
 DIST janet-1.13.1.tar.gz 584998 BLAKE2B f1bfd9e62dde786127a1307d38f48fc7e75b9fb09f009f9d01eeefa593b67c2469e213fd366fac7c52e0372e61b1a9afdb558e8a1be1ab2f4f538b5fb39075f3 SHA512 8022ecbaf7680855611202a3c17b8e5f6dc61a9302508c9de5312dbd9e80d40c24786bb5e8ae653ab5a7b00191a2d7c44cc3e305d31245e3e8c53be0e1c80372
 EBUILD janet-1.12.2.ebuild 1748 BLAKE2B a03cc9399f248d6050bf59f6ce251fbce076a9276da10415cc13c58cfc07e44d3ac6772a7c86394ed83e4b78063742d2f42d7c52eeb47227b8c9d7ffd657cf56 SHA512 ddec46f26a72ddb59c9bc5f46db601625afb1764ebeb5826221ab4d89634538f6d840e622d292bd8ece3a4577c31b5a8a7746fd88f8e25baeb8e2b1df3f6c9f8
 EBUILD janet-1.13.1.ebuild 1748 BLAKE2B d33aedc446e1692e0c39aace488070501e3cff1efff6545fd0d43710efa16d7a5a5cc52d0fbc360756b04d78dd8f015c12526cab986bad05bd75de5326fae923 SHA512 9d41ab1921792cfc549d1bb8b9bebe3b8080de6ade08ca189ea8422bfa3a7106e722374b31d240caee2d00656b85dca99bf69608218ee20e2c2677b43083b09d
-MISC metadata.xml 960 BLAKE2B fe836e1f5b7313091bf2c4341a30f7c395056fd4c63a2477a83a55daecede052eea148dc44cb253e8bead356e7b501b7698be4c787f05fdabc08638b2db7163c SHA512 a54e679498bc1239c6eda2302213e220a69eb25e5be02d3c945c89ed3943849adb7043ea6794aa5ad6e3a53026f7b06c16e7ba2ea35d5022d1cc97a9f561a4ba
+MISC metadata.xml 990 BLAKE2B 7e8a261e9007ef46da4944eb81ff4ea35cde6c9c510e63f5407215974302fa0410d9c38ce1356fb7ce1648c81e0c42cb16dd74b46c2d9f277c7bf1044c5a44e3 SHA512 35291cbd14a89e3ce9b6ed31eee97253dcc7e82f6a6310f669449518778eb137a1240d04a55e5f30d5de479c50ca7eec6e0bee5e64d035e8e0705746de6cfe3d
diff --git a/dev-lang/janet/metadata.xml b/dev-lang/janet/metadata.xml
index 9baceda37874..87a61a029b50 100644
--- a/dev-lang/janet/metadata.xml
+++ b/dev-lang/janet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<name>Oz Tiram</name>
 	<email>oz.tiram@gmail.com</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-lang/jimtcl/Manifest b/dev-lang/jimtcl/Manifest
index 438fba39c40f..4d5210b6b2af 100644
--- a/dev-lang/jimtcl/Manifest
+++ b/dev-lang/jimtcl/Manifest
@@ -1,7 +1,4 @@
-AUX jimtcl-0.75-bootstrap.patch 585 BLAKE2B 7d1cce053ae41100764bdc9a7beca121b002774bcd2b5eb5f0e0fa318aa390cb852c62430ff30171695e44c274f2e4200a6b189ed3d2a07aef79c7cac7d9d83e SHA512 fe82d393a1a46e3db4567287717af4c1813205945459702ebc3a9423395994a9fa2a337a5569241f4aada4176ce8abd65f88081112a1e2def9a4b5eb237cb647
 AUX jimtcl-0.78-no-bootstrap.patch 1370 BLAKE2B 1f584727970d7103a183b9099818bafb9a94aa7634463bb47387b4aa0afa330d477a15c50c19f383575251677d42a27d5cec1ede116bbf8d709c32378384eb6a SHA512 827bb679b322da790f68f5c6c3a469362edbb6e0128a439a6f9c98b3877e2d32c67c9826e0cd20762e6f234df332d05b9ccc309bbb4367e3b8d6de3d5d7afa3d
-DIST jimtcl-0.76.zip 2326715 BLAKE2B 50ea032cf46d2edeeecde1dc3b4deffcbd09b5dd3a6880963608b3f20616bf162fafc4ec2869bfe5de90231c4c9a29fb04710bd299cc5e8728ff20a86e46f32d SHA512 50763ea897fb5393083749cdd9e57a3f3d2d6dbebc40ee6371b1b86ebfc2f515e9775cd2acd6627f0f81b54bd72cd8c74be5aa9d0dbefc7c16372887e07f6ea4
 DIST jimtcl-0.78.tar.gz 3073533 BLAKE2B f0cdaf2807c7dd0e7c64e37cbc8dd019d8460e6a0320c239b0d01549aede8c86a89d84d7a3c5200c8d8cea428dbd1038d57dc66f5b580bdea8fe39710f967bbb SHA512 2a2cff12d7fdc4cf36734e41727eef08f6d74fb13d70bb0a3e01839e66859e57dd927ddedc161a6a7928881d640bd4e20a1bb313ed24aa2bb7bcb00eaf64fbf6
-EBUILD jimtcl-0.76.ebuild 1499 BLAKE2B 84a6faae307b4e6e67e48e5424b7826cf179d9dd3cec74d452559d7e65e6e924f6ac3aa901e5c0e94c4e30cf790f8d07ed8bfdcf9ff9a9ecd25cac40cd45ee63 SHA512 5ef245dc133b79cbc9664c6a7ef63f1a24ad295c2f784d3221d33634b456840d86cd49886d11d8cf67e872591b6bd475c7fca8b2213d22a7e50f9b6c433f73c2
 EBUILD jimtcl-0.78-r2.ebuild 1301 BLAKE2B 2a4303f35d1889620f9f85876c1c269815843dec92a34a481edc2f2ed5530b98389dee28091615c2705b4f9155ad2f1a5013c38755813c3ee229ad529b343666 SHA512 01ddc863f39ceb5825142bb58b31a37c1ec53beada967460df3d77bd231e29587a30455c28b73d3098bea3959da95b5990369440521bbfae95654464abea0557
 MISC metadata.xml 251 BLAKE2B f23df3a2dcf096cee2f8d5cf2ef4fcc6c741ae312d2193f1d449aac7cd19126aa8197d4f3e2bd7828abf1aeeabf60f4a3ef8cc05b8152e6f6ce55b4897de5eb0 SHA512 0186a63dbf97f1800694d0bcb67528a7da92d30412398d5916452cc45c17d823f84ba7ffeae533476b7a48e7da19dabd0e431155ab66c19e68b113c910a4c03c
diff --git a/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch b/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch
deleted file mode 100644
index 60850e0b6d0b..000000000000
--- a/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-always do a bootstrap w/local jimsh0 to avoid requiring tcl or jimtcl
-to be installed first.  the bootstrap prog is small too.
-
---- a/autosetup/find-tclsh
-+++ b/autosetup/find-tclsh
-@@ -4,9 +4,6 @@
- d=`dirname "$0"`
- { "$d/jimsh0" "$d/test-tclsh"; } 2>/dev/null && exit 0
- PATH="$PATH:$d"; export PATH
--for tclsh in jimsh tclsh tclsh8.5 tclsh8.6; do
--	{ $tclsh "$d/test-tclsh"; } 2>/dev/null && exit 0
--done
- echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
- for cc in ${CC_FOR_BUILD:-cc} gcc; do
- 	{ $cc -o "$d/jimsh0" "$d/jimsh0.c"; } 2>/dev/null || continue
diff --git a/dev-lang/jimtcl/jimtcl-0.76.ebuild b/dev-lang/jimtcl/jimtcl-0.76.ebuild
deleted file mode 100644
index 64ca59df29e6..000000000000
--- a/dev-lang/jimtcl/jimtcl-0.76.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"
-
-inherit eutils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
-	KEYWORDS="amd64 arm ~arm64 ~m68k ~mips ~s390 x86"
-fi
-
-DESCRIPTION="Small footprint implementation of Tcl programming language"
-HOMEPAGE="http://jim.tcl.tk/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-text/asciidoc )
-	app-arch/unzip"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		default
-		cd "${WORKDIR}"/msteveb-jimtcl-* || die
-		S=${PWD}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch
-}
-
-src_configure() {
-	CCACHE=None econf --with-jim-shared
-	if use static-libs ; then
-		# The build does not support doing both simultaneously.
-		mkdir static-libs || die
-		cd static-libs || die
-		CCACHE=None ECONF_SOURCE=${S} econf
-	fi
-}
-
-src_compile() {
-	# Must build static-libs first.
-	use static-libs && emake -C static-libs libjim.a
-	emake all
-	use doc && emake docs
-}
-
-src_install() {
-	dobin jimsh
-	use static-libs && dolib.a static-libs/libjim.a
-	ln -sf libjim.so.* libjim.so || die
-	dolib.so libjim.so*
-	insinto /usr/include
-	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \
-		jim-win32compat.h jim-eventloop.h jim-config.h
-	dodoc AUTHORS README TODO
-	use doc && dohtml Tcl.html
-}
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 246b0c96a94e..955a56833998 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -9,4 +9,4 @@ EBUILD jsonnet-0.15.0.ebuild 1351 BLAKE2B 70adc1ac64534dcf8d7ed647d81942b5918ab6
 EBUILD jsonnet-0.16.0-r2.ebuild 1601 BLAKE2B 2de253f42358c8258f7f38b53b6fb8f6ed9127b5407375b8f69306701c884efa3ce280713411eaba899a972441eb92ed404ca02575a611dfd997dda99adb8ba1 SHA512 264866ca79d21d8f5870db27f14993d8d86fec27b44190ce69acab8d597417004edfd4a018b9100a289ad49e0aac7d670c568196b604d0e4107220bfd91a1012
 EBUILD jsonnet-0.16.0.ebuild 1375 BLAKE2B 4990a4e9754dd0fbc96ce2d6b557b4f9d2325f705ead68db7c768a6942c77a2d235f2a7db961c41263c629a90c4d56633b07d66f26f610c1252a8613ebe9bbdc SHA512 34012d168676b6ad7b519c580085166e7c290e760bb3362003fffb509917d3496d4424f1beb067350d0da6f3a4197aeb87bcfcf84008c6937db63704249e2e16
 EBUILD jsonnet-0.17.0-r1.ebuild 1752 BLAKE2B 93381b8c8546fefefdda73e2940a95bcd8b7c5de6ea8f09b53c6012027f4a4c01903af0f27a48f086dcfc471ec848905c572529332d07e2a7ff43dd5c57daf60 SHA512 befcf6b7ec73933ca127413ecea98169f55aec5346bfa94d0bfce4c1303f582ed3625467f744e791da7521f085705f6636c95cfffd3f4de17a0f2d08e7174402
-MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
+MISC metadata.xml 635 BLAKE2B 41d32196b19d3eef61d882b18bab0c192fd8a77b1745feab25789aafb15921d8f6fdc6046fac908330152df87cdf355e0b0924513293ef7dd6e2c678c5f84c5b SHA512 908d1303309420992e4334e77013534d5cb63168d76983f82369c3c2f98d811aed1f2981a2e64361742d1283a74a7f7c23f2b9e7db459317b0be64ceae7da383
diff --git a/dev-lang/jsonnet/metadata.xml b/dev-lang/jsonnet/metadata.xml
index 6a3ebc349696..484bd8095c53 100644
--- a/dev-lang/jsonnet/metadata.xml
+++ b/dev-lang/jsonnet/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>coles.david@gmail.com</email>
     <name>David Coles</name>
   </maintainer>
diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest
index 58ce2802de2c..16a72ea81581 100644
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@@ -10,4 +10,4 @@ DIST julia-1.5.3-linux-x86_64.tar.gz 105260711 BLAKE2B b132fbe090ca4a4cba518efcf
 DIST julia-1.5.3-musl-x86_64.tar.gz 101802400 BLAKE2B da69c1b4ff5bde8692c3fc9ed3d60fd655a32121a0e11a4d1f00b5e4494cc4bcdb0e323a2644cca3a291fa7f7604925d387204df90cc19fee89048c4ba83b2d5 SHA512 e98c74ce2a49532a491a46efe81a2edc85103f9ec04347fe6b052cffdaecadcecb48a02b15ad71853fff6ebb2281498000e89d44732f36d31b6252a1a88bd0a6
 EBUILD julia-bin-1.5.2.ebuild 1238 BLAKE2B 1f20fe4f0fabe3953a53fc3f810992bc545dd4d56d92a49628486a3d65fa2e9fb671619560d6a0409e398d441249df0c74448eb6fbfd70c49a955292c70a8016 SHA512 2174cc671417ff92eeb245a1bce7a722f8b76b37dbee11f72b1503e494b1c9a15eb0936e0bb9b4437546be64d4a2377573f76bd364977293f422261c98b8a177
 EBUILD julia-bin-1.5.3.ebuild 1238 BLAKE2B 1f20fe4f0fabe3953a53fc3f810992bc545dd4d56d92a49628486a3d65fa2e9fb671619560d6a0409e398d441249df0c74448eb6fbfd70c49a955292c70a8016 SHA512 2174cc671417ff92eeb245a1bce7a722f8b76b37dbee11f72b1503e494b1c9a15eb0936e0bb9b4437546be64d4a2377573f76bd364977293f422261c98b8a177
-MISC metadata.xml 1269 BLAKE2B c7ca56d7660c41df452725bae9526d587d79754a3e7b0cb0584bacc588b63523e4fbae113b26f48290d874bc49fac1eb2ecfc97946e516212cc511346f876e26 SHA512 8e0325b241bc76162b843b64e2fdac98873cba21e8e39d2ddd439647466d94e163fe315eeeae78435398db17635d3447ec9c713bf53d894487ac6acb67c5afdf
+MISC metadata.xml 1299 BLAKE2B 58046d07189fcdada72dc58487d1316cfe7d7d189170ddb59f3ee88edd0edf7f043d40f2420d84411e928f57c177d6d98f0ce5862ef7bdadbd8aaa5194f75601 SHA512 b7e1e0cdbc2ace51b3b78432b4edf553d5e9dce4cbe9ed8a0d9d77a01d8eee33842f5f5b70deadc9073db09cca8f47b00db11ff25366e055f6d93fe49ba1f83f
diff --git a/dev-lang/julia-bin/metadata.xml b/dev-lang/julia-bin/metadata.xml
index 33f454aec98f..8322da953acb 100644
--- a/dev-lang/julia-bin/metadata.xml
+++ b/dev-lang/julia-bin/metadata.xml
@@ -5,11 +5,11 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index 0ed9712d4eb4..9bb85837e91c 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 6824de006351db2d3fcd9da82e45fe8c81c083209af168ef5a4cb838e44cdf951377ddebd539b198b9fdb082b4ae384dc2d6cf0357ed86e234c7226f2234af27 SHA512 ff2d01893c3ac2522da224e1526c83f9b0c081e21d735064da6b71163e8f3b8e6c3ac2e27b083b03b30c54af433c4cad29efea7984367c56d077c804675872ba
+MISC metadata.xml 326 BLAKE2B 74fb3400512995784ba11f7f23a7730233a6c6698ad0c4c620f29a1f0d2f4c249e19e1e61664ab88f65e7f617cbe320780248527acd911daf69b4717140d454e SHA512 c319281a95b48cba52da17bdbf084fda50f0da5cc9c4fe50f135a8d8cadad4f4ba37755ac781335b14257b72f6ada693308ca05e6e8740285a4f1cea308b67a2
diff --git a/dev-lang/jwasm/metadata.xml b/dev-lang/jwasm/metadata.xml
index be7d54b1219a..d1d88c49d6fc 100644
--- a/dev-lang/jwasm/metadata.xml
+++ b/dev-lang/jwasm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-lang/metadata.xml b/dev-lang/metadata.xml
index e19c9e95cee0..ab776f0fbdc5 100644
--- a/dev-lang/metadata.xml
+++ b/dev-lang/metadata.xml
@@ -37,4 +37,3 @@
 		związane z nimi narzędzia.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index 08c659755b81..2ea39c405493 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -1,13 +1,6 @@
-AUX mlton-20070826-no-execmem.patch 1236 BLAKE2B 1d708bba547f8ea3076bdd494a5e45f8352430b9a852c45296258b6371fd2bee07a7d2d9cb224bc426e8c364b07d8d37b92d98d6fc186b0217b0650ac961e128 SHA512 d6f323bc181656fbdfdf25e0472e7e13e93b565f3ba64ea9cc81fbcb6c935580c1811f783035a5b1c45be082a38f157610666276aad9fb36d3fdb009fe7ce1c9
-AUX mlton-20130715-no-PIE.patch 2399 BLAKE2B a0af01c4eea65a38d788744f593303d8732a754de19230ce13ce14ce6368058840e9076934311385bed7951d94f1daed878847a57e70ac9330f4af575f35c1bf SHA512 ef0d675acfcbe05c1f810da2b9d684b4412a0f283e6025930c13d80912036ffc650972664f5a4fdd955e4c78c3564c751c1ba9bf279f738eca96801eeb57f0b2
-AUX mlton-20130715-split-make-for-pax-mark.patch 556 BLAKE2B a98f9a6b01edfc19723ef20eaeb0e9046162e179f3c63c69f59d07a39e0b723c4b429c3f10adb6099f912340431e8ea7b06a63d397cb8feff46d3d7d256a0e22 SHA512 9d334c930abe38f222bdd16c7dbdb0b1e0a70955aa8832fd441c9443c53f9d66c3ec49c06f59de501c014a66c6265a6df64269e0534c0ffdae0115718febb694
 AUX mlton-20180207-bootstrap.patch 980 BLAKE2B 4128d0d3aae1e30c6b234e9cc3e0d91ee6de7338e2f8d4e8da7bb5b63ea62138db3148f8ec9ab16966983587dac7c9040a52aea80d21409d5d8fdbb020d13f7f SHA512 7657185d7f4c4e9bff4fd44f3991cd3d115ea0e1e4f6c3b702ecba74a3b2fcb7c1c0c47a814dc26bd3af7a523a92aac50df4d4ddb873eba938c2689ac6b5cf0b
 AUX mlton-20180207-paxmark.patch 728 BLAKE2B 05bb27260dc8007a815ce74276a537a48127b4c336472afca571c39b0e29368be5be79ae03c21940dde6bd37f79613817adc8f22d986d570fab4cb184051b141 SHA512 78526ab383f481663cc892938f74ad1783aa7a2b1fcfd7032a67c4489daa5d141877806fb16232b8f0843e7b4e001d3f76a9a171a8da6413cd921688f493f7f9
-DIST mlton-20130715-1.amd64-linux.tgz 19512324 BLAKE2B 972688dcf6fc6ec17146e2597e6f5dab3b5df4e894697a98c68de61cf4728bf7e2e3ef1cee96befae90f9b555bed0b09cef846912225f8b770d20782fa833212 SHA512 ac41cf8b2afbba80ed25908b1842348eac1507b2aada103648171db1482358c4176b01d9266dfee053b20fc224653ec58ee9d3265672c02fa3774b7562a319bf
-DIST mlton-20130715-1.x86-linux.tgz 18065793 BLAKE2B d05ca4f46fb35b0b819e2678f282943fc9cd8f701bdf2a20da68b285db4618401b4138a227352e8aacef9f604528c7fafc0973631115954cfd91e01e9dd01a9d SHA512 13a996952df27420f05f8290920055231156c8982c1cf3c31259d73e0c534258e2aad91596e51809719ffb0b74652aa052d296000f2ab99462714d4ef9a41859
-DIST mlton-20130715.src.tgz 25606142 BLAKE2B 3fa3e8cf4991faef98e23ae4cbe9e0db5cae2e46ce27be57b784a81b576eeed17a179018e8b70d1264cb9595a3467900f034a2b4a7c114d1bac74025450741e1 SHA512 db273de47dc0059e830332b559918567f5153a0518e067ba71927e3705157f1984d6f6202201cef25aaef29d1a71a637e9a1cb30951e94dbfae4ab1a5e5d40d1
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
 DIST mlton-20180207.src.tgz 25003695 BLAKE2B 8cddfe83c76e05fda446917ddc85035b3d74534fe4bc597a839cd13cb59a15538f40a3f68bb8f7136f9cf8cb27a582e88ca0d14b8f7a4582a202b3bd075f3c9a SHA512 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a
-EBUILD mlton-20130715.ebuild 3920 BLAKE2B 327347ad498c3b70d8d108c9ee2decf54fa3812bbec0bbc8d7eb0802edcb52b0881e8e538763334a853296e63fdc6b70c3adb23616f6b6a1a7bd95bfe789dfb3 SHA512 f5d40634f59e41015970599b3c6bf8812acb92aa21411a0a692cdef9bb6eb0de01c0bd079060c7b86a5922d9fbb4335f4ff132741b13eeba5c3aa71a9f7475c4
-EBUILD mlton-20180207.ebuild 7017 BLAKE2B 53c358f730da457736d81529dbc905fbe94823e38458ea10c11cc634f60c9d317b20a9dc7529f7acc0068631a4638a8f24c6b5df1085b5b985fe6d3c21c618b4 SHA512 d63023ea41b2c5cf97bd5b19698221349163e3083f898a67739b691df19ebed7db63214f321d8de436b027f5fb35ff837589530885b6710032a074dd54023f23
+EBUILD mlton-20180207.ebuild 7013 BLAKE2B f5619b234c8ab703370cf446db52fa05adf9a32c4a8cce94ac906029e8bf2353f73bf0d88e287343562a45e7f36a6ab7d888e43d46af6fbc9122edc10b53f6a0 SHA512 f4548995a8860ca5b05c4b9937f311c7d8db1e5951c057a9b77cc1799b50c296cae9adf0f0e9894029af14848c71cb49bcf475032c0975f2631a0d34db37d0c1
 MISC metadata.xml 672 BLAKE2B 1fd22f7212a973039a94dc14bc3f2853a7b56968d3b4a106605018ec53b45926b11cd8ee6b9ea187ea863ad5a43f8a094dc9baced81cdc57927d213ee587af6e SHA512 fa72f182a62140658bdbcc67268fd42ffe979d8370473af755fd691a156b3027002e3a80f341a4d9c2a8840d99e5140b8d4f6efb604c99bed2d6042ac811cfcf
diff --git a/dev-lang/mlton/files/mlton-20070826-no-execmem.patch b/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
deleted file mode 100644
index f4d4bdf540bf..000000000000
--- a/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 544930de3b1c754fa8803169902a63bce7cc02ba Mon Sep 17 00:00:00 2001
-From: Adam Goode <adam@spicenitz.org>
-Date: Wed, 6 Feb 2008 20:17:51 -0500
-Subject: [PATCH] Remove PROT_EXEC from mprotect
-
-It looks like mprotect is used here as part of signal handling.
-There doesn't seems to be a reason to have the area of memory
-marked as executable. In fact, on Fedora 9, this causes MLton
-compiled binaries (including MLton itself) to fail.
----
- runtime/platform/mmap-protect.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/runtime/platform/mmap-protect.c b/runtime/platform/mmap-protect.c
-index f0dea49..df42215 100644
---- a/runtime/platform/mmap-protect.c
-+++ b/runtime/platform/mmap-protect.c
-@@ -7,7 +7,7 @@ void *GC_mmapAnon_safe_protect (void *start, size_t length,
-         if (mprotect (low, dead_low, PROT_NONE))
-                 diee ("mprotect failed");
-         result = (void*)((pointer)low + dead_low);
--        if (mprotect (result, length, PROT_READ | PROT_WRITE | PROT_EXEC))
-+        if (mprotect (result, length, PROT_READ | PROT_WRITE))
-                 diee ("mprotect failed");
-         high = (void*)((pointer)result + length);
-         if (mprotect (high, dead_high, PROT_NONE))
--- 
-1.5.4
-
diff --git a/dev-lang/mlton/files/mlton-20130715-no-PIE.patch b/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
deleted file mode 100644
index a059b1598bec..000000000000
--- a/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- mlton-20130715-orig/bin/upgrade-basis	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/bin/upgrade-basis	2013-12-17 18:17:24.165889500 +1100
-@@ -28,7 +28,7 @@
- tmp="$$.sml"
- 
- echo "val () = print \"I work\"" >"$tmp"
--if ! mlton "$tmp" 1>&2; then
-+if ! mlton -link-opt -fno-PIE "$tmp" 1>&2; then
-         die "Error: cannot upgrade basis because the compiler doesn't work"
- fi
- 
---- mlton-20130715-orig/mlton/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlton/Makefile	2013-12-17 23:35:06.137421195 +1100
-@@ -106,7 +106,7 @@
- 	rm -f control/version.sml
- 	$(MAKE) control/version.sml
- 	@echo 'Compiling mlton (takes a while)'
--	mlton $(FLAGS) $(FILE)
-+	mlton $(FLAGS) -link-opt -fno-PIE $(FILE)
- 
- .PHONY: def-use
- def-use: mlton.def-use
---- mlton-20130715-orig/mllex/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mllex/Makefile	2013-12-18 07:03:29.592171611 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- html/index.html: $(TEX_FILES)
- 	mkdir -p html
---- mlton-20130715-orig/mlnlffigen/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlnlffigen/Makefile	2013-12-18 11:55:33.590660407 +1100
-@@ -22,7 +22,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
---- mlton-20130715-orig/mlprof/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlprof/Makefile	2013-12-20 14:02:50.292677796 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
---- mlton-20130715-orig/mlyacc/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlyacc/Makefile	2013-12-20 15:01:26.567775876 +1100
-@@ -41,7 +41,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- src/yacc.lex.sml: src/yacc.lex
- 	rm -f src/yacc.lex.sml && \
diff --git a/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch b/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
deleted file mode 100644
index 3286d44e3522..000000000000
--- a/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mlton-20130715-orig/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/Makefile	2013-12-27 13:29:35.259563131 +1100
-@@ -58,7 +58,7 @@
- 
- .PHONY: all-no-docs
- all-no-docs:
--	$(MAKE) dirs runtime compiler basis-no-check script mlbpathmap constants libraries tools
-+	$(MAKE) basis-no-check script mlbpathmap constants libraries tools
- # Remove $(AOUT) so that the $(MAKE) compiler below will remake MLton.
- # We also want to re-run the just-built tools (mllex and mlyacc)
- # because they may be better than those that were used for the first
diff --git a/dev-lang/mlton/mlton-20130715.ebuild b/dev-lang/mlton/mlton-20130715.ebuild
deleted file mode 100644
index 1e3533a37670..000000000000
--- a/dev-lang/mlton/mlton-20130715.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs eutils pax-utils
-
-DESCRIPTION="Standard ML optimizing compiler and libraries"
-BASE_URI="mirror://sourceforge/${PN}"
-SRC_URI="!binary? ( ${BASE_URI}/${P}.src.tgz )
-		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.tgz )
-					x86?   ( ${BASE_URI}/${P}-1.x86-linux.tgz ) )"
-
-HOMEPAGE="http://www.mlton.org"
-
-LICENSE="HPND MIT"
-SLOT="0/${PV}"
-# there is support for ppc64 and ia64, but no
-# binaries are provided and there is no native
-# code generation for these platforms
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="binary doc"
-
-DEPEND="dev-libs/gmp:*
-		doc? ( virtual/latex-base )"
-RDEPEND="dev-libs/gmp:*"
-
-QA_PRESTRIPPED="binary? (
-	usr/bin/mlnlffigen
-	usr/bin/mllex
-	usr/bin/mlprof
-	usr/bin/mlyacc
-	usr/lib/mlton/mlton-compile
-)"
-
-# The resident set size of mlton-compile is 10GB on amd64
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	if use !binary; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	if use !binary; then
-		unpack ${A}
-	else
-		mkdir -p "${S}" || die "Could not create ${S} directory"
-		pushd "${S}" || die "Could not cd to ${S}"
-		unpack ${A}
-		popd
-	fi
-}
-
-src_prepare() {
-	if use !binary; then
-		# The patch removing executable permissions from mmap'd memory regions is not upstreamed:
-		# http://pkgs.fedoraproject.org/cgit/mlton.git/tree/mlton-20070826-no-execmem.patch
-		epatch "${FILESDIR}/${PN}-20070826-no-execmem.patch"
-		# PIE in hardened requires executables to be linked with -fPIC. mlton by default tries
-		# to link executables against the non PIC objects in libmlton.a.  We may be bootstrapping
-		# with an old mlton install, if we tried to patch it (to link with libmlton-pic.a) we would
-		# need a patched binary.
-		# http://mlton.org/MLtonWorld says Executables that save and load worlds are incompatible
-		# with address space layout randomization (ASLR) of the executable.
-		epatch "${FILESDIR}/${PN}-20130715-no-PIE.patch"
-		# Remove dirs runtime compiler from all-no-docs to avoid repeating these steps.
-		# As we need to pax-mark the mlton-compiler executable.
-		epatch "${FILESDIR}/${PN}-20130715-split-make-for-pax-mark.patch"
-	fi
-}
-
-src_compile() {
-	if use !binary; then
-		has_version dev-lang/mlton || die "emerge with binary use flag first"
-
-		# Fix location in which to install man pages
-		sed -i 's@^MAN_PREFIX_EXTRA :=.*@MAN_PREFIX_EXTRA := /share@' \
-			Makefile || die 'sed Makefile failed'
-
-		emake -j1 dirs runtime compiler CFLAGS="${CFLAGS}"
-		pax-mark m "${S}/mlton/mlton-compile"
-		pax-mark m "${S}/build/lib/mlton-compile"
-
-		# Does not support parallel make
-		emake -j1 all-no-docs CFLAGS="${CFLAGS}"
-		if use doc; then
-			export VARTEXFONTS="${T}/fonts"
-			emake docs
-		fi
-	fi
-}
-
-src_install() {
-	if use binary; then
-		# Fix location in which to install man pages
-		mv "${S}/usr/man" "${S}/usr/share" || die "mv man failed"
-		pax-mark m "${S}/usr/lib/mlton/mlton-compile"
-		pax-mark m "${S}/usr/bin/mllex"
-		pax-mark m "${S}/usr/bin/mlyacc"
-		mv "${S}/usr" "${D}" || die "mv failed"
-	else
-		emake DESTDIR="${D}" install-no-docs
-		use doc && emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs
-	fi
-}
-
-pkg_postinst() {
-	# There are PIC objects in libmlton-pic.a. -link-opt -lmlton-pic does not help as mlton
-	# specifies -lmlton before -lmlton-pic. It appears that it would be necessary to patch mlton
-	# to convince mlton to use the lib*-pic.a libraries when linking an executable.
-	ewarn 'PIE in Gentoo hardened requires executables to be linked with -fPIC. mlton by default links'
-	ewarn 'executables against the non PIC objects in libmlton.a.  http://mlton.org/MLtonWorld notes:'
-	ewarn 'Executables that save and load worlds are incompatible with address space layout'
-	ewarn 'randomization (ASLR) of the executable.'
-	ewarn 'To suppress the generation of position-independent executables.'
-	ewarn '-link-opt -fno-PIE'
-}
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index dc132ad34edc..f55bb40d5a14 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs eutils multibuild pax-utils
+inherit check-reqs multibuild pax-utils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
 BASE_URI="mirror://sourceforge/${PN}"
@@ -147,12 +147,15 @@ mlton_create_bin_stubs() {
 src_prepare() {
 	if ! use binary; then
 		# For Gentoo hardened: paxmark the mlton-compiler, mllex and mlyacc executables
-		epatch "${FILESDIR}/${PN}-20180207-paxmark.patch"
+		eapply "${FILESDIR}/${PN}-20180207-paxmark.patch"
 		# Fix the bootstrap-smlnj and bootstrap-polyml Makefile targets
-		epatch "${FILESDIR}/${PN}-20180207-bootstrap.patch"
+		eapply "${FILESDIR}/${PN}-20180207-bootstrap.patch"
 	fi
+
 	default
+
 	$(mlton_create_bin_stubs)
+
 	if use binary; then
 		pax-mark m "${R}/lib/${PN}/mlton-compile"
 		pax-mark m "${R}/bin/mllex"
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index a94a47007194..731e026bfa6e 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -15,6 +15,6 @@ EBUILD moarvm-2020.09.ebuild 1467 BLAKE2B c20140017696176cf63a887c76bbd511a69349
 EBUILD moarvm-2020.10.ebuild 1467 BLAKE2B c20140017696176cf63a887c76bbd511a693493aa0fcad043a4919871f5eac4ee67d686b8dae5bbdea08576f5d576118064f41cfa4aefca8b55d6121eef20e1f SHA512 db2302a7eee365b212c122eb3389f417d34fd68ef828c705e992cf7e38283fc61343d4fc70a69d9d6677e4047ac698c173d2d2ceb2def85de46389e04803ae93
 EBUILD moarvm-2020.11.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-2020.12.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
-EBUILD moarvm-2021.02.ebuild 1462 BLAKE2B 2e8676db60a8c03ec4c284f99285efaea1898aea9e11e6fbdd5779e7e313f9649089bb81ba02ca7c71b2d2d4d7aa91ac25a83974beffe431c5ff76aa9a2d2979 SHA512 d51d33f67857a4d4620bb0d7af5a3bbbd97f7ce10c54efa91961ab6a195c9ef0483c4da92fabdb05868d10fe729adb72f1035d91661a35d6444b8b3539e0e7db
+EBUILD moarvm-2021.02.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-9999.ebuild 1736 BLAKE2B 9f434f8561c55716165952dce8e35bd3659fbd0f3a42f688049e023faa0f10c4aa245ca810279ae80527c4ec5fe5c514bc5ae534aa30e839693657ce68fc7f9c SHA512 5867e2ee90401a86cd0341d8ab5ae75fecb7d366d88e1269439248686942b5c1855e45857b4388491631b26361aac3b0495d7214158931e955655a34d557fada
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2021.02.ebuild b/dev-lang/moarvm/moarvm-2021.02.ebuild
index 27ecb3b89048..df017e9cd54a 100644
--- a/dev-lang/moarvm/moarvm-2021.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.02.ebuild
@@ -9,7 +9,6 @@ MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index fc0eeee26c26..447bd46a7fb9 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -2,6 +2,6 @@ AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a
 AUX mujs-1.1.0-flags.patch 376 BLAKE2B 6bcfc39f97b35ae2230aa33ca99d4338915224a9b1ffbc39d747bb9e1ec566d36510cefc75906695c729ea2b44b2c118519ba25998aebb09dee51ad622bd1f3e SHA512 fc86b1422db6b3a934bf6e0da5c18a7a61fbf8c691c2dbf1355c0b7fc669d7f324af81d7e39c6042b0006ad294e4b21cb4c16bf77b3f1be18a07fc9037e09039
 DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
 DIST mujs-1.1.0.tar.gz 123450 BLAKE2B e7bc05d35566ff26346e713645e0f417a9acd1a73b5fb5c7f0c35bf940765fba1ab04199f4ed1dd6ce0e3bb2bf1547703335a1c125353da24de72f2b1adfb243 SHA512 10b61453f8483e3e67c95a742aa7868e255816b2ce25c84d8e24c5c737bad1f23ade67531c5c5bb914804be446da33c0cbe8e95a6d5889250dd8520ce56f23a0
-EBUILD mujs-1.0.9.ebuild 1367 BLAKE2B da737815523e53241a5bbe38c36b172cb01ca99a5d45961374124b63b207f9ee3482e33cd5bd114774b9b4c25aa17a48cd60a5d5e6a516b7df3993c2d95c75f1 SHA512 acc4b05e6e5a737831f96e959e706a6f49abd72addc2d274bc596fe79777cad755e88df78512bc1bfab22fdd6325047b8e5f2ce85c8d545d9108cecbccee6759
-EBUILD mujs-1.1.0.ebuild 1375 BLAKE2B d57fbc773fe1c7588df706d564c21be2c045a32c30c4de6f2ee96068b5ca09d10a9d09dd2a28a44576f681c636c751f61606f32c414bf35070b3b420ea58d9b4 SHA512 a5e6bd7ac2f450b4a93cb184a79fb86eae85beae3bd3a25f11e1f96aa2418fd5b70c613063e145bc37831108754bd27b4d20aded694d1370200f206498640cec
+EBUILD mujs-1.0.9.ebuild 1366 BLAKE2B 1b15c2443c8e1129e37607d419a26fcefe8f878a72be1bb48ba75d397dce75fd40cc5f0c5fcc0b1a8455d4c670fcc8e991b6b5892a347d49e995b820fc31b63d SHA512 e521e558017aba8623eee10ea1992524423661fcb2adf1ac5f9a4449ba70c4091067e0c270c5bb2c8db44e12e69b023ebf987c9bccf4fb937bde9dd9f8f5b9e1
+EBUILD mujs-1.1.0.ebuild 1374 BLAKE2B 9ff2daf4c70862e967e0b1484a9d19bc381e51e18d8171079bb2cde612e558caa375cc9c61d68b0aee74a2464ac889901c175ffa397b250c8728970ff6484a3c SHA512 27a48528e47345ef57f54175a4d39e87f86616643e4c20787bc16e77afd874665b9207c628f46172e7e80ac53d86326702aa0a0847a809b752d47d39f39d4fa4
 MISC metadata.xml 547 BLAKE2B fcf818d9a103347b5b47f7b7c77654e84db6aa2a8dd12f169d58522cb47a455f02f0bf66fc85057a2a10916c4a24dcdca87a5f2e12c54d184ea8d5af1db65810 SHA512 e6bac32e74df77c2ded4e9a9e6200ab76e06217b9a236d6bf5f0df23a031eab2519f26e3d402ff106f9506a4dbe3baf66cae5f961f6d016e7c42fe83fc532799
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
index 0761367df73f..5d2b197be958 100644
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
 SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # Not available right now.
diff --git a/dev-lang/mujs/mujs-1.1.0.ebuild b/dev-lang/mujs/mujs-1.1.0.ebuild
index af61b9b01bf5..6488566e188c 100644
--- a/dev-lang/mujs/mujs-1.1.0.ebuild
+++ b/dev-lang/mujs/mujs-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
 SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # Not available right now.
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 16b9dcc2d47d..62e83d6f0579 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -5,15 +5,11 @@ AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06
 AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
-DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B 71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d SHA512 f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
 DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
-DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4 SHA512 93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
 EBUILD ocaml-4.05.0-r3.ebuild 4032 BLAKE2B e661b119edf65d14fd040274a9cf4d04600eedaf25990a9045898ff95d036510e15e966539ddd6f3a0c7336fe6a24d4c14ae7ca419dec5a1c9536b8b2dcd10c4 SHA512 07285302718df64b0a00678d931c222837b38d92850409e260591f24df1c031714c02d29e7854ae6ce374f843cf10061ec89705bd2a0f772eb04ca88dc7d71e1
 EBUILD ocaml-4.09.0.ebuild 2459 BLAKE2B 41e75a2bcde313c4205e9b5e1dcc704c1aed3fc02bac569b1ae764f6644bb0da02281fb96f4c8e3ad7ebacb5aea94ac328c444e8f228d90cfa1caa50b70b2d4d SHA512 04b7dd810ef40c89c41810725af3cc3702e8645e0b267357d747d9c5de053bbbc553c71e3ce7d1eb758566d9ff61e4eb4d09447e12302fce3fb9dccc01ba17f2
-EBUILD ocaml-4.10.0.ebuild 2466 BLAKE2B 44c527e6343fa8232e3edfbad8b95d1116e2a27355023f1aa9758cd4da56345f9a5391f048071127005103feabd0c7d2d2fceaf379dac78405353fd712726de1 SHA512 722b30025e8285bddc98c38bef1c70b48ed00197cc7057a1c5142f2e9e15d4da9af8fcc1b5df5ee1c08ca5ed6ea060dad29da3681574945df4f205bd1570c9b3
 EBUILD ocaml-4.10.2.ebuild 2417 BLAKE2B d10cc95f1518619bef972b5eb219f45de8d1143c97ff9cd01a9acf74190636ac3316835f7f26523d9388e5be0954c04c4aaea34f2ccf02b4e926fa6abccce842 SHA512 fa701247c912886020d2ff57f03bb94661954ae0f58f95b69f527c2f4efab10bb26fa51d402f7fd236f0932a986424cb72925586e82c41daabbc3cb628cd3541
-EBUILD ocaml-4.11.1.ebuild 2288 BLAKE2B 7b948d5bf90b17cfa8e0d476382e6f6fad60d0b52e0018bc0a71c5857e92bbafb10805d6ed95bfddac37e5ce026c7dbb3822dafc0e33478c71b60345145cfeaa SHA512 e74a344c78dc505fb8b24a674126f5ded5f0e695d3f4584316eac44055d7bce78e2208a3bade84f49d0280508041f9e6582868e1ffa3f275c2930662f48a82ce
 EBUILD ocaml-4.11.2.ebuild 2290 BLAKE2B 73ecfc03f0e61821174790f5d360b1cf392517c7c961f0625159c04febb1ffc43c3c6fa4e5705f2d1dbb1cf7e40d84c50782b63411ca2462348c151ae2734df9 SHA512 bcd82adcb04843f597e08efd7d5e904336f47f412d2360c89dd4c1e1802375c60de0fcd77f9edafbe9bdf61be2e65863e84f0cad74d424c52787694e64b21288
 MISC metadata.xml 775 BLAKE2B dfddcb1e262074326ede7fb648bb524404e86a302270b6bc9e502124689077cd54ebafbfca277d516d2763cd18580a09f749f45ca215c34c26c7ae1c56c2e841 SHA512 3551489dac19dddcf6490c74df4c8e2aa370565b207bcdee28a8160caab7394d8d770ed4408ce8db3d3c224b61439f29c4eae84180adf01a468e0ef515980818
diff --git a/dev-lang/ocaml/ocaml-4.10.0.ebuild b/dev-lang/ocaml/ocaml-4.10.0.ebuild
deleted file mode 100644
index a91786e03014..000000000000
--- a/dev-lang/ocaml/ocaml-4.10.0.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
-
-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
-
-RDEPEND="sys-libs/binutils-libs:=
-	spacetime? ( sys-libs/libunwind:= )"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-#PATCHES=("${FILESDIR}"/${PN}-4.10.0-gcc-10.patch)
-
-src_prepare() {
-	default
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# Upstream build ignores LDFLAGS in several places.
-	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		Makefile.config.in || die "LDFLAGS fix failed"
-	# ${P} overrides upstream build's own P due to a wrong assignment operator.
-	sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
-}
-
-src_configure() {
-	local opt=(
-		--bindir="${EPREFIX}/usr/bin"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		$(use_enable flambda)
-		$(use_enable spacetime)
-	)
-	econf ${opt[@]}
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		emake world.opt
-	else
-		emake world
-	fi
-}
-
-src_test() {
-	if use ocamlopt ; then
-		# OCaml tests only work when run sequentially
-		emake -j1 -C testsuite all
-	else
-		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-}
-
-src_install() {
-	default
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
-	fi
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
-}
diff --git a/dev-lang/ocaml/ocaml-4.11.1.ebuild b/dev-lang/ocaml/ocaml-4.11.1.ebuild
deleted file mode 100644
index b9fe45e6172d..000000000000
--- a/dev-lang/ocaml/ocaml-4.11.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
-
-RDEPEND="sys-libs/binutils-libs:=
-	spacetime? ( sys-libs/libunwind:= )"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-src_prepare() {
-	default
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# Upstream build ignores LDFLAGS in several places.
-	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		Makefile.config.in || die "LDFLAGS fix failed"
-}
-
-src_configure() {
-	local opt=(
-		--bindir="${EPREFIX}/usr/bin"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		$(use_enable flambda)
-		$(use_enable spacetime)
-	)
-	econf ${opt[@]}
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		env -u P emake world.opt
-	else
-		env -u P emake world
-	fi
-}
-
-src_test() {
-	if use ocamlopt ; then
-		# OCaml tests only work when run sequentially
-		emake -j1 tests
-	else
-		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-}
-
-src_install() {
-	default
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
-	fi
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 637c074570df..7a11a1d7d151 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -13,4 +13,4 @@ EBUILD perl-5.30.3-r2.ebuild 26146 BLAKE2B e0756d8250acfd3dbbdeac414f2515270820a
 EBUILD perl-5.30.3.ebuild 20131 BLAKE2B 2857fa2e63c9245dcd3b2683258313dc6e2ff1eab768a2e26a6c942f2b43753b8b26e47a54bc538747500d730d66e03177cc4ea9ce145d160c2e2d0f333ae3b7 SHA512 46d0f78a965df0945c14ac75e203e6957e54542b04de688cabd722402c6494c5583f95842de91510722c26e58345e6c3afca53848d239965629ed2eacc240d08
 EBUILD perl-5.32.0-r1.ebuild 25913 BLAKE2B a97f41da180ee9e0beeb163ffbbc1c1f944d8dae32954603c9a3a9bf24d9623db6146b8440917dc891ce24ddb41c6c782e04630e4cfa68649f526d7a3e57def3 SHA512 1223ca91df30ccdc247f8a9659376e4407920c1223753b00da91859935117f5361c128b3b1f5d38596f70a4d0ec0e6e6fda58f1b135525c67183fe906bbb2cd4
 EBUILD perl-5.32.1.ebuild 25766 BLAKE2B fdb6aa92e7f88c273d918cc11ddf964ce9baa4b832c5dc7f6f2d68d1cfc6ee5121ba665747f6550192ddb4d3fe4c76be67809db333ccf6a4ace34b1022fe0048 SHA512 21b9d98f4166472dc869f8ef680fd09635e78a5b6e69fe5d042430e362ec25852e045e615dfced0e3fdf3328ee5445c337eb06050e55356b7410a4a8ed6892a0
-MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
+MISC metadata.xml 430 BLAKE2B 65949096d565c5754b25bb708f80ab17e95d21b252f6a3b7a1104b01bed26db1f9351c100d1cc59cbf4161d662bba6fb17d232d146165e97f82681c410feb98d SHA512 b3aaad1820fb62287c8da2806ad385e1ced8d8d2a05fbcd2448214120a4682d503c3dcba60d03a5d02cd8e1b4f5b13568759a096a5d8a3a5ecc5c35c5680b670
diff --git a/dev-lang/perl/metadata.xml b/dev-lang/perl/metadata.xml
index 0edcddc60b41..bc06f09b5269 100644
--- a/dev-lang/perl/metadata.xml
+++ b/dev-lang/perl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index a17ab4b6036d..b722c99b869a 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,7 +1,5 @@
 AUX polyml-5.6-configure.patch 390 BLAKE2B 7f20e9de1c00a429ed86ab33cd05bd2aed0a4c431d92f52e7c93c4c44f4f4611637299020d3cbf7c32b9d43f868757f4b7c534f68e5b7120c75ee0b27b5f8316 SHA512 d868d6739e88ccacf7ab5ee495ffaa54fb3ace83c57633fde2d97fb894c9e0c81e896e15192318f9b8bbcb678efb95a827549a0fd30d2ca87473b582fa09f850
 AUX polyml-5.6-ffi3.patch 584 BLAKE2B 6c7e38c077968f439f03739a4d95bad6d5f631b4cf4e1a51a58ae6273c40a1ae5dbd1fe3aa6e338215f9cedec950435e846351275be7bccb80fd313965888b78 SHA512 22bb8e13672ddb0a8f7a3ed9908fb652e238c849b553ab3ceb9b33daebc35d6502dbff3f099ab933f4e2639b5eac2294e21d45bfc96dcb1b9c6be0129c57232d
-DIST polyml-5.6.tar.gz 6066166 BLAKE2B dc7e35ad1f51f270f9043736bca8b3d8a96e208dfa2833a2de3c06c969e8bb9d5e92c3ab025e4e55539188a9d6d5000b7befdd3cfc17aa3b0e54315778ab71b0 SHA512 cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59
 DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
-EBUILD polyml-5.6.ebuild 1212 BLAKE2B d59d404d9d735dc700fdb62534284aef3ab6260df7ff22fa192c8edf5e9ade50bd219cde51afaf95022633df105e99d156f07609a1071359c12fba04d7d1d7ba SHA512 90bef019b8717e55409b52cf812704955778b21023d2364b8a8f0414d43cb0d1f32c31c67d9975f52c571b7f802964a14756dc7d45920651dd54b274d99504d7
 EBUILD polyml-5.8.ebuild 1222 BLAKE2B 303ce107ff8f8131ea957ed8cf871a979529cd1bd51032f4b032a0dc1757535253a4085c8f4bed274a533be6f51b554525267171ea41ad5217e8aeee442ee15e SHA512 6773ac8ab453edc3a2e6dd4091881c7c8719a6806e270f64ef35027527fd362cabe52555c46f692b3d5bf0ef5364ab3c06fe01ab221c5f71fbca11f33ac2e3b0
 MISC metadata.xml 357 BLAKE2B f994f420abc8bb1020fc533a0adf04c861961b8e6cd72626db3d7d2e8ef8558903df895d182266eb419e75f6293524e690b45738902cb74ac79afe04a94f2a99 SHA512 d7f4c4c4f07e7f516fac55a58d83256f54566e0bce940d178e739b05c740abf842f6f343add927dd098546828547f16f3176e874fb8501e84d12ca7ead9fcb32
diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild
deleted file mode 100644
index 8d2700996b92..000000000000
--- a/dev-lang/polyml/polyml-5.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools pax-utils
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="https://codeload.github.com/polyml/polyml/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-ffi3.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-system-libffi \
-		--with-pic=pic-only \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_compile() {
-	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
-	pushd libpolyml || die "Could not cd to libpolyml"
-	emake
-	popd
-	emake polyimport
-	pax-mark m "${S}/.libs/polyimport"
-	emake
-	pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/python-exec-conf/Manifest b/dev-lang/python-exec-conf/Manifest
index 399181c739ce..6174182b6358 100644
--- a/dev-lang/python-exec-conf/Manifest
+++ b/dev-lang/python-exec-conf/Manifest
@@ -1,3 +1,3 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
 EBUILD python-exec-conf-2.4.6.ebuild 1159 BLAKE2B a690cc1742a93c17206d85b2b2fd29412283965b0e1116322e5c491296327536bc6320e226d162bfb54cbc5ce1e8c6b1367bf7157fa2d6122695e49cc6822339 SHA512 e129ef635bf197c7fd8826ae550a0b4f5ed03ed8d3f7e0de5e9da449f7a209e9f99ac1f4d870d0581c05670708e9bc50ae3d40f3459c29856d9f9388fedb8897
-MISC metadata.xml 240 BLAKE2B 97c523cb7da7b4b1e2c1809fadbe80a88f0760dd98356fc1b9a1d8f7514fb8a696f1d36bc45285a3dc169994c78176d2bcf1397df51f9e3227c7b2dff5849742 SHA512 57181dfbeaab954ce3f81beb68ef3458f78d2f1fb9c9c2954e0553d19806b3455721f8845eb45beccd79a20941f682487fa0e09763339012a4b5057ed4e2a524
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-lang/python-exec-conf/metadata.xml b/dev-lang/python-exec-conf/metadata.xml
index aa2793060bf8..7f4f33c6dbc9 100644
--- a/dev-lang/python-exec-conf/metadata.xml
+++ b/dev-lang/python-exec-conf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 4b5e6ba9db81..a03bef1faa72 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,3 +1,3 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
 EBUILD python-exec-2.4.6-r4.ebuild 1705 BLAKE2B 6e108a8d4870eda9f2d931ddec0e53a981257439447b84a73132948926960794f028d8808c2636687252f4ecd485954735126371a5561130c78254de89904d92 SHA512 8e2177bfd56dfff934e3f4b15e98f8b7db889587f96d173b2bce1bc9344de72f5428c63d823cd74c9f5b12cfeafff7b25cca365e3f7ddc22aeaadd61916c394b
-MISC metadata.xml 791 BLAKE2B ba836a4142e78972a7a6b603749bb4df0fe99cf0f054e286d9ede512db5cdab18f18fa484036e9ef7e19c20afcf1c94b70d0f813e7790dbd9decda996dd53713 SHA512 be18445f875537d03532d2ab30241951c2abc0929b382c351eda05003fd84cd84c545018941117bec5a2f74e2e2a1dd17b60bb2dae99eb81909826947ceabba9
+MISC metadata.xml 791 BLAKE2B 5be47111a2bd77ad817b6c4fe9822b3ab0e859ccc13bbccf7439549e0b2f2ff4734896942aa4324f5c35fe2097b8454828df0b7a1e2c855824fcebe60925431d SHA512 a6782b79df1d7b130cb93cd77fa3292bcbc23fd0b35158ce8231904d1593c9e5659a55d00d158c88bb1326b5c375e7aa8591d9b74e9e12f5e1192a42c037a9ad
diff --git a/dev-lang/python-exec/metadata.xml b/dev-lang/python-exec/metadata.xml
index cef85cf6ce7d..c2f36c68fea1 100644
--- a/dev-lang/python-exec/metadata.xml
+++ b/dev-lang/python-exec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2758cc7c845a..51232c4c735a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -40,21 +40,21 @@ DIST python-gentoo-patches-3.9.1-r1.tar.xz 10464 BLAKE2B d69ce207020b7a34eb45c14
 DIST python-gentoo-patches-3.9.1_p2.tar.xz 15556 BLAKE2B 5e265ef8edee70694d73c6df6eb908a747be34e1e89b900d2470d41e7e043d179408bc643a52ade6e54e61a210ee8850d02a2cb452a9336f3973345c1d027158 SHA512 eabfd304b39975258705f5e9b238f709196ce0cbd3803f157dc77d864631a3eea380084a3a4de180e3ba7e92239608ae369e810f8066c0f1ff9fa251bbc1816c
 DIST python-gentoo-patches-3.9.2.tar.xz 8824 BLAKE2B a1cd122837b50e6cf0459f86a1d88ecc4b266f5a0658975c9913f1f4e9cf6a79a0309c89c37421e92ab59f3854309cdea8ea233b771cdf517c7aea432e44bc53 SHA512 2e619ad2a7b2af2fef9070c85619e3104d99977f2c839eb1e20ed9cc3dd6c5092f7d9587c94e76d530f89272741fe6ce345e36448f6aa2800f2dc9b6b425b1e7
 EBUILD python-2.7.18-r6.ebuild 10337 BLAKE2B 014fdba169450128f1a0b9cb3af177db0135b0bcd71c8c6e91b4074e0919c6e83105c778a07f976f6bc430b5ce2950b470a5efacd3d7be5ab0e0f34a94a04456 SHA512 4c223212c0878987503ac9ab358678d21d6f7244b1426d80ccb46454792e6be523741baf1559be0a6fa29cd04e2f7b779d5f25200a87e6e3941a8b7eb7529086
-EBUILD python-2.7.18_p7.ebuild 10347 BLAKE2B ded8ce3ad4f1cee4c13d38206f3d3cdd0158c13ff8ca450a70bac1199ba8c23c0cffca0583d0d22431591a53b6012671fea6ec385f158b0484f2adf4f135a521 SHA512 fa6986369baf88d98c93947fd9350b54f7e59a04c038e335e0f31ca39789c26ce509c95fa1e36699140ec84253e47ff59fc350b357d8da681a4f557afbbf17f5
+EBUILD python-2.7.18_p7.ebuild 10344 BLAKE2B 115506409e91074bf69ad685c3d00152bd9b491bc01b109e42e1fb36119d496ac6abc154a8395bf8f0a2b7c07cb7b110178505f1b61e1e8d80c85408fc7499bb SHA512 a458b7bd6b3b07c5f5deb16c38114a740324f2b2bd84d7f5de800503a4c004bcd2f5e3886cc7dcc8277230ca3ace3aee8f511dbbde1ef79b997136aea39ddad6
 EBUILD python-3.10.0_alpha5.ebuild 10019 BLAKE2B c5e228133915489c20e6979ef3a37209922e5b5c4f280674669f322470e5bf50a5bb0bdbcc8c301c673fb6def152006ec65188889a2b2a1ef1ca9b15baf8554b SHA512 a730f9a4ed404f3d0df5f57f772c7d8a6eefb70f25bca174c6b4971e96002f1dda6f2f0344da6591dd3f129bf3751df8ac0f564077c94bdec19caba51212768e
 EBUILD python-3.10.0_alpha5_p1.ebuild 10040 BLAKE2B 24835b3340fe4ad65f05490f174e177e2b632aed63446dfa0a9a017a542b18351f316c4b56927e8eff32cfdb225fe5eacc051e921429a2ce79d088090fa09243 SHA512 c1f549bfadd97ab8d667609cfc971db3be8932f57f0ae998fc52d0ae50698ef004ce9f789a2196e95b680b8490f89e2539835c1397b57001bbed8aebe98765ad
 EBUILD python-3.10.0_alpha6-r1.ebuild 10137 BLAKE2B 411b359510370cd0d1fa7602bc9ebccd45e7a987455fff2d167e9d5b89b1e1e95f8b4ffee85c8aa11aab25c953a8fc3bf25a4f9722e293e603384aa467cf01ae SHA512 45b15e538790b2fd5eea8ca90573e1d824f602a75f6d10619899fdbff3f9fa273406404fd2b3233bf1d1c958257d531cc066eddbc69da1c5b69c61c99389af47
-EBUILD python-3.10.0_alpha6-r2.ebuild 10108 BLAKE2B 360796ea9118662281e571a396b38897ece476ceb56ed73301551d42599640f2a98467a02ce39ab53ad996d3b949ce3f5ddbc4c4050edc69194977ff08406502 SHA512 0ef5f571b4108446953cf03dc948cb2ea643f29ac0164605506c898f5d4223d4e2e072cb990fc786e2b8fbef9b0ea4ed0191b7e3a9d5746961607eacd9398bd8
+EBUILD python-3.10.0_alpha6-r2.ebuild 10109 BLAKE2B 10d3497a3b1c2142a0b4df37eacddef81d8e7f500ce031256d84f3b69353d37fc3f996ebec8a3360b8fc9664b55b3f3b90f6eb44cf996e3df6e3462ca4f1bbfc SHA512 f462e316d5867ba9aee69c18442dbc088ddeef93e8df3f960a472ae46845e1138b3cebb2d7bc00d6fbf695fc0d7a6913f5990c102efd5bf023d93527d091342c
 EBUILD python-3.6.12-r2.ebuild 9884 BLAKE2B 6070ecc3e0b388012426d9591d87bdceed4ab7c76e7bfec69aca3a1980e0720fe8295b8d7fc9e5e6914fa68a4e7f3d146ff0f403a4959c5f9b750db46349a414 SHA512 f7f207e63071dfc4ff475d1106e970d83e6b03acb85ba09481a05f9279f96b2cccee6adae0ebf8a23c4ec9f5b8ccb74db4130270821457999075655c1e62852b
 EBUILD python-3.6.12_p3.ebuild 9897 BLAKE2B a3de467ac2e729268d122a6ba2572caf4671fd67526d0cb553755368d892340d03e06785b012cfe3d6aefaee2cce8aaac2ae397739210c8ed4ac859e1bfd8d89 SHA512 7b93d6ba30855586f451113c933555f1edc7efec3b97f6e6f161a32670f7717add5fde19effa6e5d712d834fb19dd8a4b727f608aa9d3231280664e75c34ed08
-EBUILD python-3.6.13.ebuild 9895 BLAKE2B 6a3be039de9e3b89b8ba88641981b93593c446be9d3169154191a7d6f9e97a0a026c2ffa69efe4667e62f18062fdc8b0df378c14951a4dc2c14f425d1fa20166 SHA512 c4ad6a0b10484b1cf53d85f86f91b6b6cd256f87daf322e74a5f45e3015a72eb19ccdf38ecef4f8927eee7844ff1f8a8c2760fa68676183f0493018ca16e26c9
-EBUILD python-3.7.10.ebuild 9700 BLAKE2B 83df5ca5fee6ab856da3778710782cb666eec2569faf470e9756eb9cf46e5091da981c07fd5922e175aad1f512d201e4b73273dedea2bb63f4b9f772ee25688e SHA512 e3f070549c58c987ee3a030bbfaa2e75ef3f819756d2d119f6e0f1952298aa3f3615db0a421c5e16f75d2b5bfc577de1fc9e75b6565a53af60c34ee2d84560c5
+EBUILD python-3.6.13.ebuild 9892 BLAKE2B 85823ef6ed5265c577fcff0ad99ade598bde878a03f2bbd9d45f88dc41fef425a63c1635e07588df43b530d5bad050723c2b96a678c378ce9d8d4f24a2eab417 SHA512 71bf96b3a193ac51edff7b514ad350cc4edabb2d69b0bb13a07650a09818de6da72af2e4c4cd7da2990245e4cf242d41300f5840a8ba67acd84bf211c73b3dd0
+EBUILD python-3.7.10.ebuild 9697 BLAKE2B f1c2a5677765bc71822b9c3e98e8af5ea693bc3185ff61ef9bfa43512cae980ea11d1d6f98b19418def8a7eb38388cac291012751975014e1cfe008619b34279 SHA512 80f7a855d9b8f76a5cad9dc5594db36b1fe918030c0c585d65b57a6dfb8ab13c4645e8313b27b28484ad49e4173d29b4d46e73839849ed08f288e18c4f456ee7
 EBUILD python-3.7.9-r2.ebuild 9689 BLAKE2B a7b010040fce4663b1693e36fd4f417a7774f4f72f3294656013d3c2ee6076cb1e8e3caf6f0ec76162248ba9db2bc73814e99c7ae83ddb2c59a4cc97f08fb079 SHA512 c59a1e356cca66351789f13b0aa78d322ea5d8e472746f120635a12bb5abba638f2f32033c4ccd0a9e986c7c531b85879772155ac47b194c8393d90384fc788d
 EBUILD python-3.7.9_p3.ebuild 9702 BLAKE2B 1732961443de66431d4363eef2d5ec0caa044afc102227bcf85efc51a6a9cdebe8be9dadfa1aedec7c757f478897d2af47c3fdbcbb9dccf05ff4f15b0509b957 SHA512 d6e2660554f8bb3acdfc93141ceb8132e9b880ff89bb8b3b12eb475a14c298b2141d1143e21470d378aace07d64f2169525aecd7d4be8c688db5918f5c2717e2
 EBUILD python-3.8.7-r1.ebuild 9790 BLAKE2B aad0ae19e4e64af3ac6da2b1f73fd46e6d32cac53b56dbbec74a4176ff7987137c06f8f793b50355cc1f1bff6a41b30024ff044413a8fb9ab585c6e9f0718cd9 SHA512 035e1ec195a2625acc37656a6689cec71d631d013e4bbab2f95fe43f68578e7b0f922fff2b6962f389e5de04a316908e6e49eba3088a7c076ee3a898adebfb47
 EBUILD python-3.8.7_p2.ebuild 9803 BLAKE2B af3770efda34e9281819b81cbfce96d8cb8096ab2a9e31e132b0e898737750937726430b3455e739a7a26dbe430d4bbe933ff9d8e937357e4afefaac187cf028 SHA512 93ed9d7d56fd0d66b8c55229f14603d5a041a690bb47c2fcf8f9291e45fbaf0b93d15be82529e75f18a9b5662e83526fa862efdf952cb4de188ee69f5841d9b8
-EBUILD python-3.8.8.ebuild 9826 BLAKE2B bda1d45792be1e6d1c94b8b3c55716c5797c852f7eb9466303a2058730fef1c6464be1042e0d587a479d860cdc4ff87fc624e99abc7493e4402f8f43d8806e0e SHA512 b9f9e90afb4439d2f73ecf835e7b531eaaab3c7eb2845a52518fe28f466dd359e09906a700cf6d435749119312f260d0095fec702f123b468fe2f63f24887d48
+EBUILD python-3.8.8.ebuild 9823 BLAKE2B e38ae691ac7957ff8ab3440b828f11f5d1c660055117ec2af9d5a54cebce8bca99f0fcbf5cb0fd344f0fff0479d925962b324de5d7a6ab486e9443b7551518f1 SHA512 d3d78e5bf036853915e4604d6b7be81f84dcb8e52a57efaac56a2c7b0942a2ef9618f651726cabf36b39e9e113582a6a3ebf1c52c3dd5afe7a1f9989fa66f536
 EBUILD python-3.9.1-r1.ebuild 9935 BLAKE2B 7c8f73800e02697200748e4beea21af471cd23664f6b35b40dc26d5f46fb3aa96c1bb3a4f2fc9038613b4117ddcb71586c68d3fefc1f6a646b083bdefff7a223 SHA512 f1536b40a0ccb25d41bd9f7933e1ec6391f367400a9a5b4a08541c7e4d69bf50c3235a20c80c84d7825611dd3c71adea7dceb476ffad2c5dfb316c3a6a6a0332
 EBUILD python-3.9.1_p2.ebuild 9942 BLAKE2B efad280cd9b6b8792defdb63e1618053e195a7c1421900032c1ade8de288a4fa6abd5f1705fd31d6f54740f5ed235c924b7244c816a6bf4ef5e32fc074926c92 SHA512 b9085e3ace1d842bd1e81b0882ece3249700936129cfd5f904635fb9c42a6e914c5699953a216e61663f3ed6fa4b3d6cc5f84af12048ffffce6b4d8ec846a12e
-EBUILD python-3.9.2.ebuild 9965 BLAKE2B 639f7d5c44d7eb1f0d98de81b40aa5dfbec89b27c9ec42f7824b659fcb02671b58d28d59ebe7111d17a2327ae8554d0bd917486ca5fd0b4c9e2a615992b77c38 SHA512 304ede26ae513794b9e5bee6708193c6f7a5717e07e8f61bb3ba87fb0f7b2bce758c7a217da0b070b30107c8c08068aa4381d4e67ecd3e60a51f1a4777411105
+EBUILD python-3.9.2.ebuild 9962 BLAKE2B 3630079f824ca7cf90005c284da6293e7e78b50c2aa7a76961646f107de726b60e19200a7b82c8b99928d9386ea52c4cb2dc5205bb4cbc678813d5f374650de8 SHA512 07b4404d0d836ab6d271e7463bffae001c8d7fd5be6b8e99703a84feaf70df8b6db57ad19dca677102afa6ac3e10c464938b4314d6ccc2ab066b4643f130e7ab
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18_p7.ebuild b/dev-lang/python/python-2.7.18_p7.ebuild
index b022d92234dd..72e7050e9ebf 100644
--- a/dev-lang/python/python-2.7.18_p7.ebuild
+++ b/dev-lang/python/python-2.7.18_p7.ebuild
@@ -22,8 +22,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
-IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
diff --git a/dev-lang/python/python-3.10.0_alpha6-r2.ebuild b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
index adedfd6f3388..7d2e54b48f91 100644
--- a/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.13.ebuild b/dev-lang/python/python-3.6.13.ebuild
index 9c9faa0f5c7f..7160fb22e843 100644
--- a/dev-lang/python/python-3.6.13.ebuild
+++ b/dev-lang/python/python-3.6.13.ebuild
@@ -22,8 +22,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.7.10.ebuild b/dev-lang/python/python-3.7.10.ebuild
index 0228c646c667..a05732f9e83a 100644
--- a/dev-lang/python/python-3.7.10.ebuild
+++ b/dev-lang/python/python-3.7.10.ebuild
@@ -22,8 +22,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.8.8.ebuild b/dev-lang/python/python-3.8.8.ebuild
index e30fdd1c11fb..ce899ff36271 100644
--- a/dev-lang/python/python-3.8.8.ebuild
+++ b/dev-lang/python/python-3.8.8.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.9.2.ebuild b/dev-lang/python/python-3.9.2.ebuild
index 9d724f7f9372..8fe2c15ca58a 100644
--- a/dev-lang/python/python-3.9.2.ebuild
+++ b/dev-lang/python/python-3.9.2.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index adbd6bc59b6a..a69e77a36ac4 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -25,7 +25,10 @@ DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3
 EBUILD ruby-2.5.8-r1.ebuild 7073 BLAKE2B eaf5037da9841527af3e3197442c31c69eca718d25fdeb89836e61e40e5b63f6d34aa5116d50477348cd589f560fc85affd8dc04cb8d69f1c26d1aad1deeada4 SHA512 762019ac4eba249710a190579659112ba6b5152c75074fe6b2b20d2e310a2ecc860c8b7207bae371b31e9cf26820201b6aa8a514235f69eaa3af3278beafa6d5
 EBUILD ruby-2.5.8.ebuild 6189 BLAKE2B aa04b9f393085468d3452bfcc55a45c721bcbe51c9602d6f44510d1f936369f1c741ade879d24c619b1722270a460ba20bc679f0714a98d310d8293bc84c3678 SHA512 156ac0da5b5e6d1240bcb42ad9a7ce455a17077a3bfd66610d5425216ff7436462e8e1362764c8614900376eef146b168e1dd4691cddd9f13ded5a4a30204c9e
 EBUILD ruby-2.6.6-r2.ebuild 7483 BLAKE2B 5a35f894ad96b5fd275ced79d45efc8ef3eae80a4649bf78bae35bbe97e129d9e9a7ea1a76fed0ce013f391159aa202015a805c401c13639825c138b3dad3ccb SHA512 9f248423913fffb984744387f1fd2d8b2b38cbe8a90d60fd75e5bbf25ddf9e90064a4fa24ae8cb5ab158c3201024cf2c3646706c24464e6973ecb739046e9c16
+EBUILD ruby-2.6.6-r3.ebuild 7579 BLAKE2B 133498c36d4d1e24fe23033d4d104b68db45eaa1b02f9db2435caecc0e2c01b1d73f5fb89ffd48e7217c28c3af5261bc40474648585de52dfeee18ca4dc6ea6c SHA512 777fa647d01c55e98b87a308fe0c1d496af509485939ade4de0dd65c285fa4b26fac60327140a0a606cda17bab11c4fd553b541307203cbb6b2e05aa4ca361d1
+EBUILD ruby-2.7.2-r1.ebuild 7775 BLAKE2B 973a836d11245fb58f101d154551b17a97556197b81ed8f95ae39196f213ff624774a38993de697443e18c8941e68729c5b5fe77d705f734cbbd620b89e8b844 SHA512 7200904496e46e1d6dbf11b36a374f718b4391f7bc9f4e6d7de7ad0225d70e875c7bd34b74274c06b500fc9130385a7d0dbdcca5ff27485ecec5b3c9ba1899d4
 EBUILD ruby-2.7.2.ebuild 7654 BLAKE2B 9c3a093850ad70ff63c334b2f3dfe3e3d8637e23667f4f5b0e4d969e287a3ed5ce5055f22cbd3c334ffd1ddb3b0ec09c7bafa8a8c87ecdc3d2d2d392cf5860cf SHA512 c284e72bd6847aaaca2bb2481af752e56eff49ac45007f4757edd80237bba092d21bfdc2d863d1e0fc6b9b7ccb3bdbb3898b91490261325621d8c7b395c0875b
 EBUILD ruby-3.0.0-r1.ebuild 7658 BLAKE2B 16d96d395cb398a2bb2f3b986996163453b44769b667545f5ca1d8527c48d4b9f17c5ba3da41769cc6fcf482f2f1e0e3e5be44a11b40bb3a0c175757ae9ceedf SHA512 0fc8907e181c259a30cbb6db82b66a99791b131bd93068b3fd924a6babb4e89729a4efe8437b143cd0e907a6ee5804a3a1c55634ec72c65a9f37d1e31f22aad1
+EBUILD ruby-3.0.0-r2.ebuild 7779 BLAKE2B 4c214a8c79a5742e46f714907f440eabbd82e6dda34d38fd0a665bdd49c7f1c7652a734c6ef8e9c29dd3217ded2e1ecbd38bd603567c2b02e0db2c6bf0e9da48 SHA512 652b35ae989b4af553a8666de36903c8d0028a6c125d9d8cdfee5bb97785269add49c612a6441fd7a19fba575de3f63d7821272f493b164dedaf7dc8ce1c229b
 EBUILD ruby-3.0.0.ebuild 7652 BLAKE2B 3e67942dd8dd944bd7af027d257bdc6a41769c3099f5a5f9e391fc0bbb4916e7203dae81bc4b568121bbbfe0b758b229bb66e25eebcde3cffee1766652adc036 SHA512 5b02c7620ba26e49007ecc105d946ddbcc286b848ab90210dd712130a8e05c4d7a1e258ebbbec257bab4801b5c018404b284e0eda8cc66f2d130e1cc4b73286e
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/ruby-2.6.6-r3.ebuild b/dev-lang/ruby/ruby-2.6.6-r3.ebuild
new file mode 100644
index 000000000000..acd4660da3fa
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.6.6-r3.ebuild
@@ -0,0 +1,259 @@
+# 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 libressl +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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	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
+	>=app-eselect/eselect-ruby-20181225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
+	>=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
+	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
+	>=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
+	>=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
+	>=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby26]
+	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	# 005 does not compile bigdecimal and is questionable because it
+	# compiles ruby in a non-standard way, may be dropped
+	eapply "${FILESDIR}"/2.6/{002,010}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf .ext/common/json.rb .ext/common/json ext/json || die
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.7.2-r1.ebuild b/dev-lang/ruby/ruby-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..cecc334b06d6
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.7.2-r1.ebuild
@@ -0,0 +1,263 @@
+# 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 libressl +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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	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
+	>=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-3.0.0-r2.ebuild b/dev-lang/ruby/ruby-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..096518f2ba62
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.0.0-r2.ebuild
@@ -0,0 +1,264 @@
+# 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 libressl +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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	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
+	>=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/sassc/Manifest b/dev-lang/sassc/Manifest
index ba7f450084cb..57cadd83e6d2 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,5 +1,3 @@
-DIST sassc-3.6.0.tar.gz 26111 BLAKE2B 91d634bd652607407c48f141aa39260739357f6eeb4bade1fff1bfdd4e4e6e0757712501395c913ef1a8944ec9174649fa5ce657af4afec6f9f0eb7f804e1ff2 SHA512 0d8de651b1587f4994a5da85ad09ec2ce6e240213dbaa567c6b9baa612fe82e337061d9a5a8a3a5588e4c366c1178b6fd04e9d699a0be3d83c68f98bac774527
 DIST sassc-3.6.1.tar.gz 26137 BLAKE2B 73aaabe4f4dab7efdaef591918da8a4bd79e98dff0105666548f00b09657f46d2e28523988d60eef7f4b1eedacbfe17638e96f5a9c98a5325ef9e56f681c0e28 SHA512 b6df8f481db0737ca08808c0849dcbd83e80799d883271d382607b7a74028153195f5f9c26768ffe1a9a92ee8c26be3c382ad7b3a5336eb6e4a0dad58132690e
-EBUILD sassc-3.6.0.ebuild 499 BLAKE2B 32e47680611689f022aa863cb12310bc456cf14817c871da23108872d2a7af046f73d9cf14ebb8a1ca48b5c688a15f4d6c9799268b75218a3ca5fe5a11d9313e SHA512 178d94cff7e1f973beac530b4f0f602d190c31977bfd0bc2a6e9966856fa8aa12aaa90e1995d6ec1201f0dbd5f362820d44b9fef73f6b9bfb944268bcd84574a
 EBUILD sassc-3.6.1.ebuild 543 BLAKE2B c9f38480e2554b1116b98beb2e0a003177200c7e38482ea09a71213971a19057f00fbf07d152a3fc868ca9ac3ed853cdbc9108ec3c142a6faeb8f1cbe6b90bdc SHA512 ea199a2b858a3c701d8c88857b392928a8f0fe390279cf649b373d6cc59cc9fdc4c52e836ff546d707d20a03b605eaee3580ce51624e34317486c3703123fe93
 MISC metadata.xml 481 BLAKE2B 4f5d2e0062ba66e18b394807ae98e1ebe8925d0f094f969406f4d3c3cbed7fb001adfe41f1b61246df24f89e11b142d31027dfde07cfb919c60a2fece1ed20fe SHA512 2ba528dc5a56c29561f5b7644b5a428d99383965052233f4b5b03e0796a5e0bf1d7747548f9a7edde41471cacab1269d3c1cce089bba8ab33d903b4cd48585f7
diff --git a/dev-lang/sassc/sassc-3.6.0.ebuild b/dev-lang/sassc/sassc-3.6.0.ebuild
deleted file mode 100644
index f66b0dc86192..000000000000
--- a/dev-lang/sassc/sassc-3.6.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
-
-inherit autotools
-
-SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
-
-DESCRIPTION="A libsass command line driver"
-HOMEPAGE="https://github.com/sass/sassc"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/libsass:="
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest
index c6e3dcac2c50..e17cfd2731a3 100644
--- a/dev-lang/teyjus/Manifest
+++ b/dev-lang/teyjus/Manifest
@@ -5,4 +5,4 @@ AUX teyjus-2.1-p003-Removing-deprecated-function-String.set.patch 1599 BLAKE2B e
 DIST teyjus-2.1.tar.gz 723763 BLAKE2B ab6a98c2d2291620b586ab0b419a214b0f7c0b27aad444324e5a417c1a0b27382e2d5c622f798ea88cab77853bca3305ec37904c50a7304ace20237afb993b91 SHA512 1f71d19502f4f4da00f635d2c3d4e141403182d65f039e0d43660edf84c5fcd900e7225ac92dc5bdbe0c8379c4e2ce6e27879af504fcfafddf2695a0c8a13379
 EBUILD teyjus-2.1-r1.ebuild 2951 BLAKE2B 2b5ad60a50908053416b7633eae435da838621ea15ee09cfab961710db1e7d4b7ac8f35e70a3819fd4658ed8b110902d6abf37b6f525ab7e3cf606fcf823d6aa SHA512 5502e778ddfbe97973949e638af3c73631efa9d9b2af53fd1435e1eb47f7e68df8a4e49411ee20748e17535c786c2c04a5bde4d913ef70fc2bffd933ad9de4d7
 EBUILD teyjus-2.1.ebuild 2907 BLAKE2B ea6e92b665791e776f737885a883fe4f04bc05dec026cfbf0e9b3da84ec9cb6d54aeb5c9f124ce958a27eadc624eefec651b3f69e35c0a4e7175241e9887d764 SHA512 809cbdce2b3ffd69e7fb1281feaad43220e688539be1ce63fc99febe3ac2adf57da12ed2f8f4b5ffe86df13dec3f08557afe6c7321da75f1b631b54f2488ecd1
-MISC metadata.xml 1653 BLAKE2B a9c2315795d7eb61708ff4b163a0588900bcaea661b052a24f83834acbded91f3dabaa0a14525e1ff729175d7c17ac393946c21ae801b60efd591448b07b7c1c SHA512 5b82a25d9ef5e24c4c9bbd633b7de98f92ce79ae041c3056df6dd0471824c98884d1ef608352431c34aecdaa79736c7f163762206adb9207eeebca2886f5aa1b
+MISC metadata.xml 1653 BLAKE2B 8780391a497177661949fc7754d04138147c8987e7cdaa3744ba4a1aca153aa1e1e4f5cefc891220625fbe2b31c940d89645c9a903b94c143f283cf2bbc0713c SHA512 98392884cabd672c278e7b78bf817055acd369bbdb9144448afcff0f8c095fd27f9af02da1df4d3ef54b4cfad39444b9426979c66a2459afe526b07bc21cb44a
diff --git a/dev-lang/teyjus/metadata.xml b/dev-lang/teyjus/metadata.xml
index 472f7ac2b56a..7ea6eb93b45a 100644
--- a/dev-lang/teyjus/metadata.xml
+++ b/dev-lang/teyjus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 205074bacf06..ff4e20258690 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -16,12 +16,12 @@ DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2f
 EBUILD vala-0.36.20.ebuild 802 BLAKE2B 0e7711a1a9ae8af349595084c930ab419675a33fcc28ee041bcf9e4b81a45be47ca630840a111b6a92051299af6147832b2ae5d27274475ed02cecf00437a7b8 SHA512 e8c2813a11363f4c6875c943b89626b35ab164d833b11b9bf4c163b7dbf080ddf441a731d9eab0c1c1b4958c6c5155d59e7d92c65bc8f541faadf2c491dae386
 EBUILD vala-0.40.20.ebuild 1189 BLAKE2B 6e83aeb9ed64a5e84245acd2817fc378d35f8e54811094f0443db19162bcaa805a27512d4d40b91b8ba6b7f7a2936245f3394d12ab6324fc91c266390d389f86 SHA512 ee4e6c0cf1608758ff204ed09ac847dddb861f652d5275c4f9e9fc9bc9518d692aabe87047ef61976b78ae3457d407abede2178a58bcc92e0b41b16dc6891217
 EBUILD vala-0.40.23.ebuild 1189 BLAKE2B 6e83aeb9ed64a5e84245acd2817fc378d35f8e54811094f0443db19162bcaa805a27512d4d40b91b8ba6b7f7a2936245f3394d12ab6324fc91c266390d389f86 SHA512 ee4e6c0cf1608758ff204ed09ac847dddb861f652d5275c4f9e9fc9bc9518d692aabe87047ef61976b78ae3457d407abede2178a58bcc92e0b41b16dc6891217
-EBUILD vala-0.40.24.ebuild 1195 BLAKE2B 9b158f53417106993669d21f72a52c3ab61ef3ab92680dcafb56c1db278fa2c59c4f84ed9baba93550e2afcd3f289d344e0c0931fbfe151a753e0e8f8146b6de SHA512 8864a84a674feba6971cabc3ae51f3855db90e4e181e102e39d44c1ef085241b4d64b1af20928c261de5543f2af6b8f99bdf5aadac0881e10b84d171b16fbaf1
+EBUILD vala-0.40.24.ebuild 1194 BLAKE2B d4fcf457089c81defbf66ac93c51f6242a0cfc22c5fcee5aa7b82f35b9969b06014ab5fba3b8471b864ea953ecff59946bcc514a2a4f8b52e8cde67353a436a6 SHA512 4c19985e30a50a898fedef09d22dc712ecee70dd7c95c53d75958265aba19d849dfcf5a2dc9d7e9be49b47932c347fa8181ee9c5e1b30021aab254765fd10a70
 EBUILD vala-0.44.11.ebuild 1111 BLAKE2B eb0baf6ec735ba36bbbb4b2c79d272f92511c3bf01b072096409305e01b9d866f28817165881707504c007667810d4898ed8c2aeff055d22de28feaa89796ef7 SHA512 2a030743cf3ba4fd4ba2cc3fcec83003c04de9b40e61ae4cfd8a3084b6d18a726f32302f41d03559c53ef8edd4d69aa36cf74d34418771ecbba924167bb62967
 EBUILD vala-0.46.10.ebuild 1304 BLAKE2B e1f8ea4781878b96860e364d6428259bea06e520294d73bb069727b1423de08758e91ce56749b12de32b8fc238237498d8e5fe21dc4f0f48c3ab78b5b09d228d SHA512 54a3cbb1817ee0a24c196ef5c48357026ff0ee77987e51babb3f6ba26bafa0e60e9deedec627e94b098e4bbea99ae514883a08f5660507a4fd3216e7852ce45a
 EBUILD vala-0.46.13.ebuild 1304 BLAKE2B e1f8ea4781878b96860e364d6428259bea06e520294d73bb069727b1423de08758e91ce56749b12de32b8fc238237498d8e5fe21dc4f0f48c3ab78b5b09d228d SHA512 54a3cbb1817ee0a24c196ef5c48357026ff0ee77987e51babb3f6ba26bafa0e60e9deedec627e94b098e4bbea99ae514883a08f5660507a4fd3216e7852ce45a
 EBUILD vala-0.48.11.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
-EBUILD vala-0.48.12.ebuild 1311 BLAKE2B a045355c6c6da5dc2ffd2eddf0f357acc88d634724df5cbda5adb4c67afde228a9bf8ce5c0c0e112f3107b9b115e42c3a21483ab2fe1bb4e2440d236d4afb8fe SHA512 226ee4a014ed5e15607b62d76fce20c7c9968258e6fcf951b340aff36551195f014b50be90fe92f74dab1039d70b07f40b4a41b9f3e7ef50d2ebfc8768cc003a
+EBUILD vala-0.48.12.ebuild 1310 BLAKE2B a67852970bce5c7722ea5b3b9f83c87cde1a6b081d9a31af0db83592159324263120586260549aedf97425ce9ff2425064a9cad69c527aefaaacd6fd016b0ab6 SHA512 ac9182b38eb5fbfde254d2d2bec74d41c4d96bf5d957bd5af46998d1eac11fbdc9c5912cb8e8c74749701e025d8302090ab128b9fd887f2b3ec7ebcbd392e01a
 EBUILD vala-0.48.6.ebuild 1304 BLAKE2B f1a1eef0f848d21caabd058030ec26d50db969af3a8f5a8f2463a15c11cb02333f2cbce222f7d99796613a55edc2980be622bec0ed234198399ce1226d565b20 SHA512 9b6dcb5a0ecfe47b308f24f94746585962b0fc016f748599c9d76921ca581f75fb5615d34dd233a78f7ea999f7906e62c23db271573f32a44d7cba00fd6def86
 EBUILD vala-0.48.9.ebuild 1304 BLAKE2B f1a1eef0f848d21caabd058030ec26d50db969af3a8f5a8f2463a15c11cb02333f2cbce222f7d99796613a55edc2980be622bec0ed234198399ce1226d565b20 SHA512 9b6dcb5a0ecfe47b308f24f94746585962b0fc016f748599c9d76921ca581f75fb5615d34dd233a78f7ea999f7906e62c23db271573f32a44d7cba00fd6def86
 EBUILD vala-0.50.2.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
diff --git a/dev-lang/vala/vala-0.40.24.ebuild b/dev-lang/vala/vala-0.40.24.ebuild
index 09138c9f8325..6c813e1d316b 100644
--- a/dev-lang/vala/vala-0.40.24.ebuild
+++ b/dev-lang/vala/vala-0.40.24.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.48.12.ebuild b/dev-lang/vala/vala-0.48.12.ebuild
index d680177a7c44..486138e84d76 100644
--- a/dev-lang/vala/vala-0.48.12.ebuild
+++ b/dev-lang/vala/vala-0.48.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 55c87fa42ec1..5885a32c0e51 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,4 +1,4 @@
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
-DIST xsb-3.8.0-gentoo-patchset-3.tar.gz 7297 BLAKE2B b3da3b4458e6e97c32fc6318bfa95d9755398572b85fe10a00af327c7cf940e18b8ae49cd2543544b363daf39bdc9db3963487e134c3a1b3a31c05344ed927fd SHA512 96064c2a27c4570b213613b97386bed1dac8082881794b7e18e5ae9ee9c28af78412c793b1fe26a293664ba88236257fbb3804cdda63799fff6fb72ca498b4a4
-EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B 7c80f0e041e0ed06e2f8a6d14a4aae6ea63875182865bf46afc6c6871399c6554329eb91e71f8c1ffd90e6398eb835748a1ab99b8718f25fdb8c4fa3b0ece609 SHA512 17281a3bbecf9750c7491dba0ce97d375485376668246e2df0a24754f363fa17c46753d2ae0ee5c6efd7438d28d9196a89fbfca73846894163073f2273287ba6
+DIST xsb-3.8.0-gentoo-patchset-4.tar.gz 7373 BLAKE2B d34925e314c2b4726cdb1d5d6256f9ce5f0e9dbba408e77d1383ba72c6499be601fbd93f2ad20ef30e5df965016dd377bffed3dd3aba9f8256d8c4b57afd12d8 SHA512 8fcdaa3b2cafbd4e3b91fd1dc5c00b2986158a17968cfbffba263acd0752bdb76e342256b92f691c40d535a6f2f1c8632bbf8b095691fced55d18a67080ef559
+EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B 63bff0d8c8b5fb73e0a99d302259a55bd111c42c569a8635e3e6a996e4626055d89498060687cad6187ee742c979f837305132d2cc91fe71fa77ab2e4f9c3116 SHA512 8adba13ce781f0dcab430a443c19a0668f9772efa307e0b19b68427dc32f8b6d8beedcfdfc8392762f203b8a6e9932934a0aeaccb6c512f992edf73f4faa32ee
 MISC metadata.xml 313 BLAKE2B e6feaeb68ae7144def50a0dff4671b3a9ff070be4d447d45e5b8fbab61940026a5ea9d13c54fb21a808ed67630debf2f55e44d9186e83ea094b26dccab3bf1e6 SHA512 e271dc66bb407abe43ebc5b1fc27c318cc8082b4b14f43f1c33f3453e4a248c83ba2fcc73ba32a63828e172093a00b507f81c629d022799c4cd5a14417fc5ef0
diff --git a/dev-lang/xsb/xsb-3.8.0.ebuild b/dev-lang/xsb/xsb-3.8.0.ebuild
index 5c18dc3bfc1e..e1453eb2ca5e 100644
--- a/dev-lang/xsb/xsb-3.8.0.ebuild
+++ b/dev-lang/xsb/xsb-3.8.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
 
-PATCHSET_VER="3"
+PATCHSET_VER="4"
 
 inherit autotools java-pkg-opt-2
 
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 2083598a1e3e..68ffc061ec43 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,4 +1,4 @@
 DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
 EBUILD zig-0.7.1.ebuild 1276 BLAKE2B 39e057ffe802b2983cb3f0515ebb176564dc50b6da99fba92436a7fd65c0a01c70d6af98bd661706af55ba5f3060848493744b2402d5206266a1ca9634a3aeee SHA512 ceda6aee196248e2af7af35aa6877c90fc6c1498bffcff3ceb7ab12988cc809c17febbedabcbbf86ce6c0c8ce8bb708c7faca37ca14bb1498c2fa178afbbe7c4
 EBUILD zig-9999.ebuild 1276 BLAKE2B 39e057ffe802b2983cb3f0515ebb176564dc50b6da99fba92436a7fd65c0a01c70d6af98bd661706af55ba5f3060848493744b2402d5206266a1ca9634a3aeee SHA512 ceda6aee196248e2af7af35aa6877c90fc6c1498bffcff3ceb7ab12988cc809c17febbedabcbbf86ce6c0c8ce8bb708c7faca37ca14bb1498c2fa178afbbe7c4
-MISC metadata.xml 554 BLAKE2B 79d6e6148b3e2ba0d4eff9bf40e28bf75d29945e72b25eadf786d0f01ac7ede2705b63f8ff53303ab040246b6467964eb4225abf4d3a8de9d705835fde53e4d5 SHA512 b20d35c23d4e01f10e858fcda8c215400f56c62bd22c69a100acf7d20f3e2d08b6b1681bfaf0d6e4c47b99fbb4eff12337e0d7bc42caf1cbb2cf01d1c0646cce
+MISC metadata.xml 584 BLAKE2B a9ef261216e4ae4d9d21d6d7572515e9eb34d11c7df499b93ff86d62e349a6794aa8cabe89ec2f62cda2840d521887ec7ae9970e275a995d9dfe3d61eb691e7e SHA512 291034cec0f3b45d461d05fcf1512d5df0f3985b15c4bcf52aea4f61b25307986ca014e8e00f9d2a3a43f847941c5cf1c59c8065ff2b5878451f60743f95abe2
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index bd080b506d5a..734a3df4906c 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 7d72ed523de6..8b00a89c4e47 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -5,4 +5,4 @@ DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
 EBUILD Ice-3.6.5-r1.ebuild 8522 BLAKE2B 05630b45b81dd787c386faaa5d783e2d2f567044bdd02d1fc9b2ffab3999b1de4c84e93f0a5e622bc5e6a2e8c36eeaabdf45f7250e3c23ada8cfd32989080593 SHA512 381d3c73c36d8a556b77d98ac8a41e0ea352e004b52eecaff8e74556d5283bd187c13b2b841bbe3866b60c6a07ef48d3eec9ed54333970db7abb547059ee7d49
 EBUILD Ice-3.6.5.ebuild 8520 BLAKE2B 9c84fe189f72437a7cca9c4368dbfcd9562c0f9a61da16897a1b97f8a18cb4391756af4ec0ad8f8bbe3131456a1c2960990cac942d9da7b29f34b1e6ddbc0ff0 SHA512 770edb96b2ffead60bece12cc2b512965e41c7cb566e45d3767d21611d52cc7009b5427c16df503ea5077d24df988c858c619452827588899ec82fae01891caa
-MISC metadata.xml 440 BLAKE2B 4f7fe8256ea08eb9fb9a9ae4d7c768ea8f5eea45c0dd3842a1e4992dfe61c36a70b4ad9ae2d1ed5d2f1246c659a48f8a6ef8f39f08bd07674949d6b0ced6be5d SHA512 99aaa114855fdc523d8ffd334c9681f70a6859ab3dad837aa14ead4abb3e1df29d65d0845e040c8e2f9193d03d83bc8201f582c23dd7ef144d4f42e927df8d01
+MISC metadata.xml 470 BLAKE2B 0a0f575d2237b74f0f369c49745408308af92797e19904ecd07a46cb56cf6f45366155318f727045448e3bb9639868672b4c55de224703803216d12b5b920262 SHA512 f0e959732e6800280277c32606ea6ba67947d071f17dbef5ced97970879e10198476ca3ecba2099818e3dbb2ded079dd2a1a9c5517cdd233455869e3d816444f
diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index b682a17753cd..c81f240e6c20 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c0d995d1d840..2137092551cd 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest
index afb6ea1d3fe6..9e27dddea37e 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-9999.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
-MISC metadata.xml 432 BLAKE2B 5b98c6e8af0056d63f5ff10ebb335363aa9b6da251232aadc738cf7156ddb15727893eedb55b590caa9f1f019fe28f1651708bc1b6c43ae2cead800047c3949e SHA512 81e7bc6d24d13b710c844244b70d139128ffa73661856882a5493e26e12bad78e87f494ef9ba838635087b3f5fffebb375df2468af4a9985fd9ebff876178392
+MISC metadata.xml 462 BLAKE2B 1c1838f2f464d371ccb3a48603a27369cb26f7ba44f35d68e2b892ccbe5e738701192c71b150e013dd9bb3ceb2b80123a4c385e79d8e3deb82957bee13b3e3ec SHA512 e761cac28b27f3616965dc90439f7f43f3bf887f84fcb9c810f579f6ee3cb672b0382da667db5887f4503730c85b03925fb2ad4b41f432db23b67e0ff1cfbc19
diff --git a/dev-libs/aml/metadata.xml b/dev-libs/aml/metadata.xml
index 9e2438fd5155..db6af5c22cad 100644
--- a/dev-libs/aml/metadata.xml
+++ b/dev-libs/aml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
index 60a169f992b6..37e46e3cb80c 100644
--- a/dev-libs/antlr-c/Manifest
+++ b/dev-libs/antlr-c/Manifest
@@ -1,5 +1,4 @@
 AUX 3.5-cflags.patch 632 BLAKE2B 34051800ce235fb8b913abd1b3c01f2364d73a7103d380cecc861d2b89eacaefe65a6038199799c3974789e6d4cb17aae43c74a3276c299a95dbd3406a6e8ed8 SHA512 8f68bc1d56de08d144ca6dc29c530a6d89347aed58d497a7f5525d5375086cbce1c4365e4ac917ef92eaae9471c6031d38df98244dbb426620073f697c8fbf68
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
 EBUILD antlr-c-3.5.2-r1.ebuild 1387 BLAKE2B 57c75124fc536bb156a4638a7a74f41482803db897e5be36fdc4dc612b0a5c19cf9fdf811a1f6f5150abb443146c6903a7be53a9bd852ecc15f5396ba64f63a0 SHA512 48afd4378769bd1ddf00bab876912b1fcca17d49ecd6526cbf28d7757ad6379d27de398fff56a8798032771e6140978ef0f4c3ebd33bec78ced96c03db5c6fce
-EBUILD antlr-c-3.5.2.ebuild 1373 BLAKE2B 0dfce85d2268ba4a767db3f7911b7d0ba5c6e8ec138060ae55fd4a7cb5e33ed9a716d7c89bea2a6204a3ad803b0863c55f4d10047655c524231b2f00930cbc69 SHA512 2f3f0d094d75659159d74937e0ffa9db8fc0405aafb9021938359e2b34313ec535e73c759b1b4c2feba77d495eae597106d08815ec927942357344f66813a9a6
 MISC metadata.xml 336 BLAKE2B 980e56da4035d18792f5f65654223bdfa1bca764c18677a1e4cb6ee7da3e2f59a09944c0c6bfd63045f0c2855ed353d0cc2bd68a3cefced82ec9f3d82f478401 SHA512 4d1c32d4948359f596c0b006237cf7ee33d662c1730c4c68b9b4786fb46d762e3e4b1c89f9ca5ad99cc727c9be96c2a0f0ad92e5ceb990e71fcfd8b37ec257aa
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2.ebuild
deleted file mode 100644
index 52c508bf9e11..000000000000
--- a/dev-libs/antlr-c/antlr-c-3.5.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools ltprune multilib-minimal
-
-MY_PN="${PN%-c}"
-DESCRIPTION="The ANTLR3 C Runtime"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug debugger doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen[dot] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
-PATCHES=( "${FILESDIR}/3.5-cflags.patch" )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/antlr3config.h )
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-	sed -i '/^QUIET/s/NO/YES/' doxyfile || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local econfargs=(
-		--enable-shared
-		$(use_enable debug debuginfo)
-		$(use_enable debugger antlrdebug)
-		$(use_enable static-libs static)
-	)
-
-	case "${ABI}" in
-		*64*) econfargs+=( --enable-64bit ) ;;
-		*) econfargs+=( --disable-64bit ) ;;
-	esac
-
-	econf "${econfargs[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		einfo "Generating API documentation ..."
-		cd "${S}" || die
-		doxygen -u doxyfile || die
-		doxygen doxyfile || die
-	fi
-}
-
-src_install() {
-	multilib-minimal_src_install
-	prune_libtool_files
-	use doc && dohtml -r "${S}/api/"
-}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 0561537ad479..3ec914b79ca8 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -4,5 +4,5 @@ DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc34
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
 EBUILD appstream-glib-0.7.16.ebuild 1690 BLAKE2B 14c53fb11352fdde910a5a41e28d232f970c33e8482a65865ba17fb690bf41507af0755264c5ed7fbf088f0b70768bb96727f6fec8e2e660fc9e41346eae1c1f SHA512 6a115a6ee1aae8ce819ac2fe7fadf26a666562abc25ed9ce54a2bde0b8eeb873e268daf6928c710fb9f93fe3103264d28deac805cf486700aaaff48afbefe0e0
 EBUILD appstream-glib-0.7.17.ebuild 1628 BLAKE2B 16e2d0be5ce07f59ec468572c2461e7479522c0d24e3cda5133e3b46b27efdd617337b06e7a1aee50d300f450b6d7f125d0f8aac19e4d17dae4416027fb690c0 SHA512 9f150460886683029006a6b59838d3dbd39277ef6c27ea78c704f3538b7986dffb4c65d62fa613fb86a8265231e9cdf01e2a614efb047040ce4f2704e02f2e91
-EBUILD appstream-glib-0.7.18.ebuild 1646 BLAKE2B de65ed14fcbf2d2fff0949fc1d7b282bcddaf62a648f9bd06b40ba31d2994c2005bea22da033b8483b7251f9d6f97429dab64dc8759511e2628a0495d307facd SHA512 d8aaa98d3e82f9930990a821a008c8182c5a4fb320b5d64f04f6d5b39941cf1b6cda26c661812429ae9ec598a7a5a79aa19e83790e9f060084104259dbede48e
+EBUILD appstream-glib-0.7.18.ebuild 1645 BLAKE2B 4b92d43e175fc8b33f591786a8d907e3488f7e0cdb5d16e97d2f1f276370b79f53a93eac21f98c7afc250fbbcb9408449bad7b7df2616bb16d9c2cd1edf1b69d SHA512 f2cd996406ccb0d5131547b24f63766a77a828fd28247672f2fb522da0743e59f4cb06729acdc2738e95fb43abe45119d69a5d3cc0922c2840b0eb0e0eeca788
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
index 969f483b6458..5b6a19bd40c0 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 8c10a762906d..c891451c4c79 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -3,4 +3,4 @@ AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e7
 AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
 DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
 EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
-MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
+MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/metadata.xml b/dev-libs/appstream/metadata.xml
index f33a7f5bc7e6..30bbe5372a2a 100644
--- a/dev-libs/appstream/metadata.xml
+++ b/dev-libs/appstream/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/aws-c-cal/Manifest b/dev-libs/aws-c-cal/Manifest
index 35c01d8334c6..a33b9f41302f 100644
--- a/dev-libs/aws-c-cal/Manifest
+++ b/dev-libs/aws-c-cal/Manifest
@@ -1,4 +1,4 @@
 AUX aws-c-cal-0.4.5-cmake-prefix.patch 535 BLAKE2B cc5a1e62b082eb7ab377e0cd5c5ff8b4a5d03e6346b1f3dbd7cddbc012a979f9d1f122e7b1d4bd6ef0c488f1f574881544cce1e1aba7104773791807ffc8a21c SHA512 439fb27f0332cd87cb93c7b2cefa2f1c15476b70e75142fcf5873f9791193d2ff193b8e74a9d5bcbf98aef36654541951830cc2a595b092fdf54a14c1abe7143
 DIST aws-c-cal-0.4.5.tar.gz 51956 BLAKE2B 8e758cf4ba362efb3721c4b25f8264e3859eb0882d5bd1dc65a1ad7fa6ac5deb80872b214f39f389ad2c4cae620cb3d6535f39e8e6cbd63bceeb6b1ad7fd5bd1 SHA512 b6feb72e607bf9bbd927dda21a6d7e7f99771c5078fad778aa2d858aa86b251726a3797b61ad2d927a5293dad10b8ec97192ed60db652ebf8c664923c2484b6f
 EBUILD aws-c-cal-0.4.5.ebuild 781 BLAKE2B 3a8f2c2a36f1a9cd074b2b28d7379d7c1035b6b58e04ab589180cb728249f1d42f0f1f250d42d6c230664c2dfccb214c9135334b4ec74efa906e8224e990dffa SHA512 158b882bb67fe50fcc40dfde7f95d41379b8df5125b847e1da8d0e1540c9a5dcc001eb854175a2dc85a37d1d01936ff4c0fcb934c8d4386140ff7e992a914962
-MISC metadata.xml 365 BLAKE2B 173e5a8de1e8326296f192e96f64828c5148d5a37fc4b02c05507655d045c2e63d32833f148e76354e43d196f7f8305c2e26eb3b138eeee1856de18fa76f4140 SHA512 16a909436dd61400c177a54c56dd1302c6b1c5aa0f2f76fd049c22a124dab0ee9449adffa3631cd7bbe7998c69a349966d5434d57588adf438262326bdb78633
+MISC metadata.xml 395 BLAKE2B 37b634fd59971e5e551280f9fca50f9b5a38b87f4fb0f1460ff3dd68ca858d80d5033630d1826cdf6f2dd7eac03422d81cca0abc58b057b2cfa1bf3d1437979a SHA512 498484f9a669cd21f6ae7e97b677618c745beed5ae28c78547a2c402869c444b2eba458c6516bca0fd06dee28eea39fb34a5c3a655b9fccc055a8bad078dd7cd
diff --git a/dev-libs/aws-c-cal/metadata.xml b/dev-libs/aws-c-cal/metadata.xml
index 82d545903897..3dc826d0e8d3 100644
--- a/dev-libs/aws-c-cal/metadata.xml
+++ b/dev-libs/aws-c-cal/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 10e4f208f1de..c27ac8d3f6e1 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,4 +1,4 @@
 AUX aws-c-common-0.4.57-remove-Werror-CFLAG.patch 424 BLAKE2B 211f9b23c979b6c6d867d66a8a6c5ab023229f4fd90affd147c319ba5baeb5cf90cb1aeb8c42066b5de698ed5fa6a7513645e24b61ead58e5c6dda8b45f3c8ce SHA512 39264f91b5ce4ac506d771a97b7403503009f5d6616d8e0ad440574cffa1c18e1f6970fee75f712ec2e514d54885d37e9f157ac1160575af0883a6e56ad0b0c5
 DIST aws-c-common-0.4.62.tar.gz 411263 BLAKE2B b9eb8eab8fceb949adcb96bc98987c318dcc70dae2cb8ecdcdf36c306be97158a64208c4bcc2452c83f03708cd7fb5401639558bc9bea946234f4b6b4c8eaec1 SHA512 7f31d739a3376404016bd509b40656d7620bddfb77a7f988306f2dcb2b03a03387855d845c2b9f63194d0bf2182a8d96392dba6c2bf847eaeb008115561d73ba
 EBUILD aws-c-common-0.4.62.ebuild 693 BLAKE2B f9c6aa405d361433a0d0595d619685e3000e67c9331b9e25c515f9f6ce5d818574f30c67d7dea9f21dfa44de6b73a81634a955d75efa6c19014764df26a4ced6 SHA512 94b7bd1ef8907bb4e39a0632c7db42a1df0e8dfcfd4c96467ce919d7a40049a63be4b413f3ab3e5e387136ea5c0177b08023d7e7d1db4a52f6c7fc6fde5c9f6c
-MISC metadata.xml 532 BLAKE2B 30b517d35fb386776dfb24dab54c359e4edeac3fe3ba5a0c54ef09f0542c05bb91cf7e38c9bab3e0939ead184351326bb1eaaaae17c2f71b3cd7264c1091cd46 SHA512 19b51c483bc90b059d6b8b5282289239140b361362142c3a8252bae3d4dfc57098b2b7869f4440c5312db136b801d2c9d725ec64709fa4a0c46c04a6c640b9f2
+MISC metadata.xml 562 BLAKE2B 139d3dcb4f55353f8eead871c99eb19af005cf23c8dad97b98d8fffe91cc540f9dde9401c1c1d924aba94caf20199804acf5d28d1fae4acfc145d722683d0c18 SHA512 5eb8b9e0f93b699a263b392b0959644874b886e960b23cf677cf4df208a2b650c630fbbeefb537099f050bf0dca73a5846b90a36be2a1ee4c450f03e4a236631
diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml
index e3151ef13d4c..a13cbb9b8f07 100644
--- a/dev-libs/aws-c-common/metadata.xml
+++ b/dev-libs/aws-c-common/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 8152a281013c..7bfce63b3ae6 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
 DIST aws-c-event-stream-0.2.5.tar.gz 61949 BLAKE2B baebd87a916fb8440db56afa2b97bd02229d70e00b55c40a17a2f467ad683422a6c6747aa698adce5272a03ced3fe6957d8cc62040d8080d3ed95409d8182851 SHA512 1421d608d8a5cfa5ec5df3bd905aab9ce9abc913461569a99b895c8415e50305aca0be3595bd4f3ed74cb52cc0e342354d211531066fdde60e14dd60e5629239
 EBUILD aws-c-event-stream-0.2.5-r1.ebuild 1174 BLAKE2B d1813d2370c9599f5993a8a58620c8ff54f8c2eb8002071cbef77f089a845bb480348ff93e6e6e7feff790e78c795df320afae69c2f691788599f3d7ec5186f1 SHA512 f85b498448cb87d87bb4898f3c3218fd2d40a8ad46d21e80600c1c09319dda0c4944a84f0f18942297d3dfdac0b2da9d1d1965b89aec2c510d0e9f2466d2ca1d
-MISC metadata.xml 365 BLAKE2B 173e5a8de1e8326296f192e96f64828c5148d5a37fc4b02c05507655d045c2e63d32833f148e76354e43d196f7f8305c2e26eb3b138eeee1856de18fa76f4140 SHA512 16a909436dd61400c177a54c56dd1302c6b1c5aa0f2f76fd049c22a124dab0ee9449adffa3631cd7bbe7998c69a349966d5434d57588adf438262326bdb78633
+MISC metadata.xml 395 BLAKE2B 37b634fd59971e5e551280f9fca50f9b5a38b87f4fb0f1460ff3dd68ca858d80d5033630d1826cdf6f2dd7eac03422d81cca0abc58b057b2cfa1bf3d1437979a SHA512 498484f9a669cd21f6ae7e97b677618c745beed5ae28c78547a2c402869c444b2eba458c6516bca0fd06dee28eea39fb34a5c3a655b9fccc055a8bad078dd7cd
diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml
index 82d545903897..3dc826d0e8d3 100644
--- a/dev-libs/aws-c-event-stream/metadata.xml
+++ b/dev-libs/aws-c-event-stream/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/aws-c-io/Manifest b/dev-libs/aws-c-io/Manifest
index abf222871f64..3eb778d383b0 100644
--- a/dev-libs/aws-c-io/Manifest
+++ b/dev-libs/aws-c-io/Manifest
@@ -1,4 +1,4 @@
 AUX aws-c-io-0.7.0-cmake-prefix.patch 536 BLAKE2B 7e4220bfea17be839ea3e9c1ea16ed2e375d8fb2d4e5eb1dbd551fd395332e0ba8865b02fdb10c542b5b54ce2e3a4c488bb2792fa1ec52f53d541db84ca985e1 SHA512 786c8fa9eb8233d39aec9f4335b55eb80ad0ccd6ea52e762b8ab4a5740f1fe2d13b3bafcbb17da6f876896c6d65da4c2153e9247e00b7b9797ef49bd54fc31ca
 DIST aws-c-io-0.7.0.tar.gz 561762 BLAKE2B ffe8ac5de9fd5f57e7bc18e1d956f28567413d34ec23a7d0869065718039b1ab56aeae82fd8e24bf77f7393df2c1140308195cd8a4c6ff06cbc7843ae62d76c8 SHA512 b858a5a14cfea86c39f96963c4238ca0f90339befcbd6480e6353719d9846079764f8b42fbdc0cec2f99223bfe1c07fa2a014543fa3fe8a6357440e3cd1007f5
 EBUILD aws-c-io-0.7.0-r1.ebuild 1145 BLAKE2B 3b0338cfeac8a556888a98841a5fdce1a2e827661ae2f0d44a5a94dbee971482ad7a9f56616c842a4aebab7e7e5f27bd86c37378d0eea8e617c91aa679fac07b SHA512 b87cb9b99b63eed7e401057764a54bdb63dab7cf9cc4adcae2094ff2a75333e38ac58d883c14ca66982887aa61e7328c5d49a9291a168f827ef0a697e625b8eb
-MISC metadata.xml 1050 BLAKE2B 81eed64eeea9f2ee78bc14873e81e36830b5793c12a7f2d622f3bfde5ac76c16042f4f3284c4d5519f0ae168df6e155d0a330bf553b63f8a022279056d146ba5 SHA512 9debb68b6e98f34b357ea91a42b7ea772cbf2db76c222373c39a717327f03fb30d47b1e01157b171d97caa964122e5771d18855065efd2e6cf6c29207ac9a040
+MISC metadata.xml 1080 BLAKE2B a5e977045a08c0df3193f640c81b99a8267ac47473abe83260b847f440e9aa53cea83970776dd8f1662baabc8dd9d660ba4ec6b598484ddda44c7b278baa3972 SHA512 9402db0d4165dc3a2414574a9097c95e4618da2508b1b4e4d5189dc3e031986a435e2ab0e43f70ead54a2c678f8a8439827c0e5582d47058dbaf4ca0477a9f51
diff --git a/dev-libs/aws-c-io/metadata.xml b/dev-libs/aws-c-io/metadata.xml
index 6e6c8ed7af38..07c95bf44b2b 100644
--- a/dev-libs/aws-c-io/metadata.xml
+++ b/dev-libs/aws-c-io/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index a5bd5c0a5f3f..eb38df523d84 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,4 +1,4 @@
 AUX aws-checksums-0.1.9-cmake-prefix.patch 966 BLAKE2B 5b1db93baf8699786ebb011590dbb5151dcd5210580fa5555b59c7cf28a7ff1336fb308dec393e1fd559d221359550375ec7de820977757495cabbe4aebf1fe2 SHA512 3b436c32ef1fcf1eab933ec4da9eb8952f4f8af9cdd8de4976b142b412bf132b310442e157731fd13ba21cd507ff70c552870e117e1e8a06f5c0830a077f99a8
 DIST aws-checksums-0.1.10.tar.gz 70961 BLAKE2B ef0644b8b6f81ca743955170940b9e152bf6b48d8146ea0ebe11b37eac607fe6544a826d9a14b273575837c842a3e539e4829571df1c4fa61bf9008e44872e8c SHA512 a76eb274f668189cb303f7010311e51551b224d19bf54bb152c3d9346ab837c33300fc6c1e9c35b04922101817cca8b3ea7968f6cdecf1166e7933bf0348edb6
 EBUILD aws-checksums-0.1.10.ebuild 782 BLAKE2B 90ddc9febc0b3dc8fc5dcbcbe1411ae44e98790af13e7af2ed1fc6465ab261d78246ec85a29fa07fc6c3909fdb3adad7f106a9fdfc14c953b652a5dbb07c9c62 SHA512 6828f3e93bf0136093c8abe22030081354ec97046f18616da640e99a04dc3c529970fce6c6664d0b7561291451d5b2cbffb2a227bf45ce5dd0137f3e02543845
-MISC metadata.xml 560 BLAKE2B 9021d243e459572ef30be51e493e325f08cb515dd7484b0bb9268fedb69c11bdf9e4728931bf89ea9ff5250ee51592cdee543c5fe18d65293820ff4b167a0b84 SHA512 3106bc8fad12b73fdd39af5fc38cde0411c0fe24fa07b8b37349bcd4615cef52875595215455dde9db3bb847c65f1bebd79a16cb7d6261c4cec1ecc3d7faed6b
+MISC metadata.xml 590 BLAKE2B 114edc0bef560469a165fd3eac75d776b3a41cf91effc456eec0a3fea89bf813b84220bdb9a0ae63552fd7d58b3dd259678b28322d342ac297d0e415349cf7f6 SHA512 fddd081aeab465f4e3b8badaaf787383df28dedf5eda87d6ebc0b46d82febf8adae0979f2d796ce85f38aa0206cfd2183e38b7319c221cd87fc6a226c24711cb
diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml
index 43f7aa0e4eba..030047b360e8 100644
--- a/dev-libs/aws-checksums/metadata.xml
+++ b/dev-libs/aws-checksums/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 40e7979d5e95..2c81f51e05c3 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -16,4 +16,4 @@ AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664b
 AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
 DIST aws-sdk-cpp-1.8.105.tar.gz 31880249 BLAKE2B 1a2eb972b716c656f45b8d1d12fc3e7280c171e4a19eb5431e320511365d305211e8567aa7fcc3e21f553ad5befda91829df6ccf60c23296d210d0c7347bb2a2 SHA512 a76da095718c8569c62597431d29a0a54c1a7f81c1825894f0f40b1a971a3e0b4f0813da4ac929612b9bb5f92501ee6a034436faa6eef678d936117765baab7e
 EBUILD aws-sdk-cpp-1.8.105.ebuild 9102 BLAKE2B 99c9f1bbe0a8f7e080d3f1773d73d60a2561379bf532018a7c05584bf8d8f6abcf4627cfecdf242b4672e03cdefce7a5adb93c6095c1836c2937d56525ab166d SHA512 3c87ee547f1d4de9ed5e388a2e22db69bc2abed07951867f6d6cae160fe166bcbbcd56e239caf9832f920ca71269741cfcc9fec61fc9d3e56ce49e6dc88dfea7
-MISC metadata.xml 25208 BLAKE2B 0d627df443b1cd8b2a63aab79efcd293a7844828175985077e35b2e0e6544efd95a6077afe7d1e9ec6a75d4ace9bd635b1b0a305bc3c8527082e395ffade4d86 SHA512 a363f6d023e44c3e6561ab45809978a89d2f16833a3859db25437a75bbdced716bfc5dbab3b031b857fbc54e3c78e9b6e971322b1b60c083768d7011aa43a71e
+MISC metadata.xml 25252 BLAKE2B 34a5f5c3272d0600cf2691c550df70872ec1b1ba2f2eb29a6956fa6f20e5b801992012f713be262abb86d3b56427a2644e1bb924358e91145a074f2198525e1c SHA512 6218e390850f5751638951eb00cb108709ae055b7e42bec42ccee3dc1ed6ce4042a7c9d968d3e445e232407fc278be1499f81c2dc37efaca5ad1e7d928e023e6
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 1ddb8306031f..08001e16fd87 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>amit.prakash.ambasta@gmail.com</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/boost-mpl-cartesian_product/Manifest b/dev-libs/boost-mpl-cartesian_product/Manifest
index 67c483f121f3..5c55f6f82688 100644
--- a/dev-libs/boost-mpl-cartesian_product/Manifest
+++ b/dev-libs/boost-mpl-cartesian_product/Manifest
@@ -1,3 +1,3 @@
 DIST boost-mpl-cartesian_product-20161205.tar.gz 4391 BLAKE2B 1ed647de2cf98f78aa58fcf9fa4122c3b4a8a40c00c6379d9abb8c7f36ccf1b3360ed3fc3143effc7a7e228404c496d9b93dd3c4f9ced59be15148ae122d7316 SHA512 cbe1f10b45bbb3db84bba7aa935698d7d79a59ae8b40c786df31da2936500feffe5589755ea53f31e3fc869ca4e87a880f013967d2829ce55412900b244252e7
 EBUILD boost-mpl-cartesian_product-20161205.ebuild 1008 BLAKE2B c0229b0b3a05f72cee13083cb6f93248e2bd0f869c3a882bf4aa8b984a0bf18e51e838c93de404062b29853e1eb1c0754d6b8bb9edf9fd9053e91b6e957475c9 SHA512 d12b3161db35767c538a3dd7ce37b9e66f2813510bf637eb49887549d296222a66cdc3a86e845bc656cff029b41e4876d0a904efb9f7bc4dfc398f19354a4615
-MISC metadata.xml 472 BLAKE2B ec58c693ec625618d6a11e4639365572c555253bc3a84168151cefa286e4c27edc8e7447778d4a8c992e6dbc76fd965e040f834bd5ba3299e3e06bb15c3a1239 SHA512 9ebb1a50e9e3924a4fc5237741f017a0963ddb60e4a39ec0b118c09937772bb1934acf5e80549f4204437ba2803981b12776e795a3b1918b0700b1e9717b8aac
+MISC metadata.xml 472 BLAKE2B e8d36cd5b67f82899ac7df127321ef2cd47434c876e9e22490d2981c11cb709e8e17be8b5f344770bc11c0a18cf52192bad5fa9fe465a5b95294a6fa1496e010 SHA512 93a0320930d833e4d2be36e06b948ebdb689aec30360442a661877c7b6d2d3cda78caceb26012abf50f940dec93f64ac8f583d221d10f3c7ad4b34dd41f95899
diff --git a/dev-libs/boost-mpl-cartesian_product/metadata.xml b/dev-libs/boost-mpl-cartesian_product/metadata.xml
index a9b49496236b..b67a38ca8793 100644
--- a/dev-libs/boost-mpl-cartesian_product/metadata.xml
+++ b/dev-libs/boost-mpl-cartesian_product/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index c82a478947e5..701d1e8c72df 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
-EBUILD boxfort-0.0.1_pre20200110.ebuild 942 BLAKE2B 38a0c089bf34328d35b17268e5e122e8c677d0a6bf53aa81dc85c0d0419772e4ef999eaea93156928158f7bd9b2b643bb5a0e48e619b5bc950e51e8d721bb7eb SHA512 1e1ef178406ff993ded4eb358c07c4ba486ddf887a00f3d2472a107a28f21b0981a9a51f4e911fb0d087e3452b6b68160cbf0963492937fcfc72d5dec858523b
+EBUILD boxfort-0.0.1_pre20200110.ebuild 954 BLAKE2B c1ef5350723e0f9e902185c0fb4af1eb6a135efe3b02a139c9a8664254ae08405b29bd816732d03b9fbcf19ad2e6eb5352ef78d36105860e5f345419c59ebc39 SHA512 1a1dd166d91b25c6f9230995abbe70ecb6f65e236bfdc58a4b20333ef2e3413aa4d42b61a686649a736c13150d82256d0c569ba64fba39796e8e5da75c9265f4
 EBUILD boxfort-0.0.1_pre20200902.ebuild 938 BLAKE2B 96de7897b6009c7e6a4a8cdfc3008119a7c7a7146ffaa971b9dff0f44b1e882c2d2ba8314207bd896457badb21267bff342da4d1d9c5d94fe81415d4b481fb76 SHA512 abfddee4f5c4c46e7e95389c8529c4daf93586b82900b38b266b389127b3621d9dfc3acb36012c6192c9d44415c8f1392a8f1b29f706dd0d7f86cdfd65141a47
-MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
+MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
index bbeb07f8e80f..f7d59bb7efeb 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> b
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/boxfort/metadata.xml b/dev-libs/boxfort/metadata.xml
index 6b226abcada8..035c274410d5 100644
--- a/dev-libs/boxfort/metadata.xml
+++ b/dev-libs/boxfort/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/c-capnproto/Manifest b/dev-libs/c-capnproto/Manifest
index 86eb143ab715..070c2613a08d 100644
--- a/dev-libs/c-capnproto/Manifest
+++ b/dev-libs/c-capnproto/Manifest
@@ -1,3 +1,3 @@
 DIST c-capnproto-0.3.tar.xz 620560 BLAKE2B bae9d568531cf4138c945255e16cc989e096714c088581716f49b52d96c552aba231b0f3ff7795d9d64a51555f7af3ea7e06f3c5d5cc249d3eb8a017a093127c SHA512 188167a7e1e50e099135dfdcd2e739585074e0c63fe891ef173a5070cd4f019195823eb8f30389c82228b8981fd595c25fe03c3ac35a158f593c1fbaab87691f
 EBUILD c-capnproto-0.3.ebuild 446 BLAKE2B 7fac4fdab40df3f8cc54d4bacbb0acb043d378c31a0b509a4988658ea3d06afb09a6666f3996b3b79d78aa3cd8806b2a89fac85cab21381b365fd4a78a676d66 SHA512 105cd934715644a359c898983bc2236801c16260c545e0a42e2ed890ad87593906e6f164dcec1314b15b0930b52ea81c3bc496299d7747f2c29cf29f26a36091
-MISC metadata.xml 353 BLAKE2B 4128eb6c17498fcf4c5f5f34cff4e99245bcdcaa08ffc3d15901ba444ff21604db6eddb43ec282539ccf32dc7556907d8cc2356a0870f0a7b921505faf2a7c4c SHA512 09695711d2274fd74f3bd14caaff7cfbe51054e608038c3d392e5f56498ef91ec7bac4530763fe569e62d30f714af87c8bbaf71051efefc5cb7ef105491af33b
+MISC metadata.xml 353 BLAKE2B 972f3ebfb843abe4d9acc4bb0ff4ab7fc228cd07e6b7c69994d18b418b41a1934729760e69c53f7bf64b548f30f091c5d7dd7f84b612cd9a5af12b941735ba37 SHA512 944318c246e57822b1aa483d96932cc9848e7377ae564246981e2f8d3923f3b3df5fea1be3de94f45dfa120732c96a41c41c17ae858c94664bd3b3e8596e5c68
diff --git a/dev-libs/c-capnproto/metadata.xml b/dev-libs/c-capnproto/metadata.xml
index 6fc9163438cc..f14d68fe8e99 100644
--- a/dev-libs/c-capnproto/metadata.xml
+++ b/dev-libs/c-capnproto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 533a7542390f..362bf73b06ac 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,3 +1,3 @@
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 EBUILD cereal-1.3.0.ebuild 553 BLAKE2B ae9b5d7897c871ef8f67495e0162f1fd5c88abb03eb146c17321d49b53454d5369725a80bf421a75a60b977aaa5eb98007f4fce258a83f1b45e7f3c0099abf52 SHA512 9d6f822c803d6da65184219b0644b1f6941824ecc67de12c6325be3e6391bdce32826f993de434ac7ab690579956bb6c2f6688c54b5db4511856c1686f96e618
-MISC metadata.xml 246 BLAKE2B 70c6851c1f49e3762973bad9dc77d74feb88e75748b113e8c55df939e1dabada66a25008a73f29e0f3cc7d4c62295f3289fe12eae44c0ad250342027abba6993 SHA512 728b85be92686499b77af7d61d7a22d28fd8f41e8bbfa637021d033021d3f43c7516308763f02157cd5317766f9dd39f01ec55eae6b00b7592535de53bc23830
+MISC metadata.xml 246 BLAKE2B 5b5665b0dd02a1ffcb5fa8c1c1ad30d32b6996e772f2d5418b3c705fe6514e26c27ff8c09c7d64ac7bf3223600c0d97a652c54cfbc98fa12c952ed01da6f85cc SHA512 11bd994e7a2b931824521a66ee32e85fa73e75d7aa3207d9b24ffca4e698c0e5e3100291710afa0d4e8b6e4d4529dd4ecdafa3827cd05761dd6b60c4c3b9820c
diff --git a/dev-libs/cereal/metadata.xml b/dev-libs/cereal/metadata.xml
index 9758da161376..907c95a13f45 100644
--- a/dev-libs/cereal/metadata.xml
+++ b/dev-libs/cereal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-libs/cgreen/Manifest b/dev-libs/cgreen/Manifest
index 0f2d5ccd887f..30bb29df8e32 100644
--- a/dev-libs/cgreen/Manifest
+++ b/dev-libs/cgreen/Manifest
@@ -1,4 +1,4 @@
 AUX cgreen-1.3.0-cmake-git.patch 326 BLAKE2B f58e5c57429311b70285f2605d3f21f8f6545d379909dda17460d855eadb5545a746a6122fee31c41cbd86410db08a460937ee70af6a0e5aaef997632bcae180 SHA512 76e4b2e0fdaafb50006733eb198b5b97ea2874957efed81552a279680d03b59ad20935c6f9e4835f39019f5646be72d7fa00c6825f86e6a502743f3bb466c340
 DIST cgreen-1.3.0.tar.gz 350959 BLAKE2B 467af04aae61745e1a78e872be9c174a0b21db7a470b48a3d96132f4bc97300b0d51fd4617e4588491a2f032b3ba82e665c7bd49be3d360a33dae0e1323716a5 SHA512 3734be08722900b4c6aaa1cd8a7a31ffd876c12742cf81266014158dad0919db46a457fbc742f3d7e9b1fdf75530ee872045962469eeeb6d1fc45fddf2b6d332
 EBUILD cgreen-1.3.0.ebuild 544 BLAKE2B a0c2b449eac53fe0f0116bbe5b925c50b5c530ef4b31c23c3ce29321bc9e5102169d66d95f684fdf5a246faf70285564d532f8956a67da94f1c803603e7bc664 SHA512 bfe132b82435338870f4f418853404ffe2ab1342494f4856e016c50facfc0f32b88c4c2e84a3ae10da7b4900172167f44085fedaedb65186e9f878e9de273a71
-MISC metadata.xml 448 BLAKE2B 40d2658060ee754b9647cd977d40dfad04d3c4c0f5877d58f88ccd3700c7cbb414b5c451a6548daa58b9f567915cb7b78fe635ca5993aed0e4980e1a2f2d2671 SHA512 ea44b83deb6442cee3860f2af55dec6486d1813cb3ef2a875ae338c9ec3607e7d8269c78e3641cd921f9c691864de35c62ca7870c115b2778ccdaf0e5ceecf49
+MISC metadata.xml 478 BLAKE2B 06eb44281f966dd306e46fe4d0fed02e2e93994fed15c1acd27e1430dd9b2bca89341b79011f264ec7f1fee7f0bbce35291d2ac188578a04568ac7d165f1488d SHA512 a3f58ef2ac5f9e7ef4d050235f98f98709dacdcaa4638caf886c9f1130b126f7cb17c04a0bb829ee7b01adaa44b647938a5ab5e5fac2664bddba9d107c74cdd3
diff --git a/dev-libs/cgreen/metadata.xml b/dev-libs/cgreen/metadata.xml
index 7cd1d64d499c..1a941a2191e1 100644
--- a/dev-libs/cgreen/metadata.xml
+++ b/dev-libs/cgreen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index a9f1398c24c8..8f62e8251503 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,4 +1,4 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
 EBUILD check-0.15.2.ebuild 1575 BLAKE2B 331471902e21335448ae4a5990fe77aebde2c1227cb5886fdc768a25cb9dff239b2d985adfa49265de8b16a416de3ebf04ca0e583a73ffa24723c779e9b3b9d7 SHA512 c024b7e069776b72ecadb07d619d9553ea35e366320ba90d63d2374879eb0699a8a4660073750fd9d1f716744d0b4c6bb81c752e9d46ae33240b5b7a0b77f183
-MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
+MISC metadata.xml 488 BLAKE2B 1cd690b0e4398779744c8a2efedabaa5e3355061032d88ebb2c23d1defdcc619e5924ba6d7ff6ad4e857e25923563b2f3ff0f1aa4dd449f5899b1a9b9d2008fb SHA512 6373c637eaec3cd674bb38bc8108fcda5715818b52b351b101d852f1a29630c5382e88a4759b7e6b8d3bb220b1b6b57eb4b4d9b525519dbec8d9f99b2e5e7365
diff --git a/dev-libs/check/metadata.xml b/dev-libs/check/metadata.xml
index 9db0afcb5fff..967c3f12c21f 100644
--- a/dev-libs/check/metadata.xml
+++ b/dev-libs/check/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index c887b26ae44c..532cd010085e 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,3 +1,3 @@
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
 EBUILD confuse-3.3.ebuild 1148 BLAKE2B 33c7de154ec7e06627fd9c0c6c04003d0d7ca7406ab33556b9de7d75efa3307809c7da82a9bec8cc51e4df601bf70107619c84eda60826fa86fa82c35f83e514 SHA512 789e489c79c406b72d04ab9e11ba8c32cc627cbd0469b1d2dbe828328b9f63988303ea4bec41f98dc0d6770a945d0285396c3186dd005316b9a2cc3624ecb53e
-MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
+MISC metadata.xml 403 BLAKE2B 5727ddc37d600cb102f7e9cabe85d7331c3ae1d6a9ccd23cf278c36140a9ef044f4d5da75bd4bdbe8d21921cc8dc6f192c2cbc2c285a05ec072ab35e9084630d SHA512 83f6b89426a65efcba3fe250300faffd05d6fe647b36448d947d15d257e5acbb9b4e8034d745d51095eea141dba06ebfc4e0ae6e285b087c6815c51a6eb1d859
diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml
index 3b320c11f642..a97e2e76eb8d 100644
--- a/dev-libs/confuse/metadata.xml
+++ b/dev-libs/confuse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 48935eaedfa1..71ac3545d2f7 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -5,5 +5,5 @@ DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 787
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
 EBUILD criterion-2.3.3.ebuild 1068 BLAKE2B 75f224ac5e583fca3bbcc50cfe73d95e42ad170d1693c31ba599c1218751613f239a54926bf7763a479785f71d87e5ce6a199fef3a71cbc8d37ab82947608f96 SHA512 1256d827ed9165cb3db614351881875ad00ee0539f7c2353e47d4ee4946a5628860240f4398eb1446bad739c4be6a43211ec37d01b60e55c3fbe51f38531f8aa
-EBUILD criterion-2.4_pre20200110.ebuild 1855 BLAKE2B 340cc93f4ec233e2c99182e2e5173759a83a4fd1b11c3b87feff5ed0fce451faefdfffb53b65009fcaded35193498fb708449b283350b95282ee4e491e61336b SHA512 a890ced19ecf3083fb0119f5cf23420a8399e31907e6dac59d13c355373f41672d1ba74fe93a6729b7c1ef0ecbbefbaec8bf541513d9316feabcdfc5a83779a5
-MISC metadata.xml 464 BLAKE2B 336514e525410272f84e05c76be4fad57be4198bc88ebcc5f048615f233a0b69035b27728e15b2190ba04c13671aee6756be24b4fe8a5b09118b78abef918529 SHA512 42131d0130a9d260ac5f305a261c883a3c6222c21abdeef290d9f71f3080932acbd4127eb44266b4c69c782eb63f18df4fcf4a5a97829d9f8483fc1d3d853a1c
+EBUILD criterion-2.4_pre20200110.ebuild 1867 BLAKE2B 1029f52c1685e51e4043f0333b080eab363dab0b3959d9a874fc51f469be5883bed57ea9eaf809f75917586656ad157f50a086c6c972823f5a1d6aa52d6b5a3e SHA512 c628cc00d973def8bd31d4db04d2439eda2b4e030affc2ce677d587d8aee7cfdadd01613c1d0eca43637195ae8c46b81e5ea9ebde882bef9b7098257adb2e356
+MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index 5613158c2bc2..44e8faa084b9 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.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 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/criterion/metadata.xml b/dev-libs/criterion/metadata.xml
index 5df5b2863638..82164612e191 100644
--- a/dev-libs/criterion/metadata.xml
+++ b/dev-libs/criterion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 12e8d7493278..2d6845f0b9fb 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -7,6 +7,7 @@ AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c
 AUX cyrus-sasl-2.1.27-doc_build_fix.patch 417 BLAKE2B 2a76fcce47d248ccf0dfd08b6d18c94c5426601964fff64c0579b3c2ef2be28673e80a00f298e4830797adc3404c7c79ebce8b5869af443248bd1a25fdf7f2eb SHA512 6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde
 AUX cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch 734 BLAKE2B fa45f0bc2598602b9bff76fa4462010507227f4e914ae265c2715cbfb13f71848564e886bd59ce9ff0f6ff4920b215cf28a4511d8928cd93283469fa9e657011 SHA512 fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7
 AUX cyrus-sasl-2.1.27-memmem.patch 1559 BLAKE2B 97d624b575b7479ba84b0d0fed98743eddb0419b38957c55ba66475e1509bb7fa9a2db517b1a2bcdc73f1dbdbf3031f7641890ddc4858a08af38ece082c0fa82 SHA512 6e3c6bb4212fe0cb29f4432d94d6cfc4dc9437a30dd5c4fb4d5a30afb4a9a5273674386d6c81da1829553968b371d98c4fa2efb686a62f84944a456fd420415c
+AUX cyrus-sasl-2.1.27-slibtool.patch 599 BLAKE2B 1dc8cb7edd82216cbf36c5d4dd5279f9530e169565bc8bba90d3e54485c9a549cc8639ebd8909c796e907bffce2816810782a33893afeedc5cf02c33559356e7 SHA512 4783c54f9d6db3eccb1324b3bbde9e99c9fd9ad8a31974b7c236f022e9f916745818da5308c1bb08f4238e1e5df9ab464aacb764e3ddd41cf08481f83b5c4036
 AUX cyrus-sasl.conf 34 BLAKE2B f41e1d0d58f484958648cc6f6e2903cf7555f825a1f073b247b4080f575f8508b9a73c9d02c155178d2031019a48ff6300adf60bbb0286a6f7dc710c72f433c3 SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e
 AUX java.README.gentoo 934 BLAKE2B f3447c8422f07cfc17b5e240d5c2fe894f94118132360dda4a5eb04fa51acab10b13d01fcb68beaf6308926256e7c95c457a43f3f697e0c755c7c08143e6c3f6 SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4
 AUX pwcheck.rc6 409 BLAKE2B c3e27eeeca23d60aad6078d0e66887b40742a516caf585bfe21619275bae59bd2a9da0c31299c03f1c1aff2e340b93b434816e16d196554d59e78b7fdba5f78d SHA512 797317f0361d6d849ca35c5189ba0cb562e58d62022ce7c29229aab71e8ce4c1e3e6409cd3b092b666724a00b0b3b6071e527cc49050fc34590ef3b1a7648f8a
@@ -16,5 +17,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8210 BLAKE2B 1b57ab87d62970c0b61c604dc9f9e5e5b553b99e5b0b67c9358054071ed1bdd07102a7cf008ea79e385e9ab81a47494999399084d5e85688a47f416ef106dd64 SHA512 0bae289f1218824a00596bf188a60452fca5de311ae3ddec2097e04c583741a6f58b5e6851dfec151cbf5a9b44450f5ce301892e9574afa6de5f79c3bcd7924e
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8253 BLAKE2B 273da39c2982498c0fb1bce4f5c4139bd298d0718292bb874119e13f4f2e81215ca55849b99d1f758eb4f0783ca2a342c8ac2996c10e2f26486c83555504c2e0 SHA512 6e3362324d3f6a60fc032110517eb745986f83d89938db1c56b78f6eadc28c0d9803ff8012215d83f2874a88267b8c1be7c44f5e1c4c7898a5e8fb328b969e02
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 500aa56870b3..32fdde1ac701 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
 	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
 	"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
+	"${FILESDIR}/${PN}-2.1.27-slibtool.patch"
 )
 
 pkg_setup() {
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
new file mode 100644
index 000000000000..81198cb87f0d
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
@@ -0,0 +1,18 @@
+https://github.com/cyrusimap/cyrus-sasl/pull/623
+https://bugs.gentoo.org/775875
+
+From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 9 Sep 2020 07:29:38 -0700
+Subject: [PATCH] common: Define the missing crypto_compat_version version.
+
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -46,6 +46,7 @@
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+ plugin_common_version = 3:0:0
++crypto_compat_version = 0:0:0
+ 
+ AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
diff --git a/dev-libs/date/Manifest b/dev-libs/date/Manifest
index 7bc8ed9b69eb..c443d33b1017 100644
--- a/dev-libs/date/Manifest
+++ b/dev-libs/date/Manifest
@@ -2,4 +2,4 @@ AUX date-3.0.0-c-locale-export.patch 3628 BLAKE2B 25fcd214430334a2c9f95dbff68595
 AUX date-3.0.0-version.patch 312 BLAKE2B 6cbfd659c271d39b3441ce980579efb8fa2b002e482710dfafde89ab1978742fb178ed3336d284febfb143f1a81ca23276e04bca3b1a00e218db26f403283acd SHA512 c1165064c48793572ffc02a07728b0fb815f4b8610764f08e9ca53b9fc7fbce83168d39b38191db2ccac69f283b637ac12cc8c1516c99d8e1cdffe9773cd0dfd
 DIST date-3.0.0.tar.gz 822623 BLAKE2B 438a7a5c153c7c2d695fefc95bbd474ef507af2cd8182d1e7d54d482b0128c3f9c57582ed5b40ef46d8f6f5539228d20322c684b1e1b418e5ade3b4871bf4ec1 SHA512 03ba0faef68e053aba888591b9350af1a043ef543825c80b1ca3f0dc0448697f56286e561f1a2a59e684680d7fc1e51fd24955c4cc222fe28db64f56037dc1aa
 EBUILD date-3.0.0.ebuild 1599 BLAKE2B 9eb62cd334e71c10fe02b209f0b78d47fa62d73b54e1a83584c26bb25c3ef07374e95ba1d31ef0100a25bd6bb222ef22105c6001b7a7e6a77d2f31d97efdc571 SHA512 46d468e6ca99498bd2008347584eaaa13958a6ff22e071c4bddf658f1661d54cca881ac0dd3d7580df0bf68f292d1d08281bce50419f8e37286555a61635c129
-MISC metadata.xml 659 BLAKE2B 5e21f2ef7779eb58a8f2ec78005ff01f5b0df2ddaada6acbd2588f2be8ce318665735ad509e705761606917b858c4714722f3f5c261765bb0df70c17ed8b2af5 SHA512 b5ebc03dcafe026118e7b0035671890327c2a719086861ad682fb0bf3e242ac11ebcaa031ffb865e8039b5370b6e28f99d1c4baa7ccf3fa99ee0fbf9e05f7ff9
+MISC metadata.xml 689 BLAKE2B 414867ef99db1e73f0ca558feaaec76cffe6e634b13115616bd6371ca07dd3ec459d88b30ef2014d66c904132929a4f2736f3d2fe7472c188bca8331667c2591 SHA512 387264d9a62e0d2630021a0d799fcb8e5663e7e132dd5883b26c99d6d80afe21c0c7cfd83e6a03a5d5833d874d9de6d2260bce0c9c6e7f53ad7c7a4375bb41c6
diff --git a/dev-libs/date/metadata.xml b/dev-libs/date/metadata.xml
index aaa7e8ae6e5d..396c82805da3 100644
--- a/dev-libs/date/metadata.xml
+++ b/dev-libs/date/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@jonas-toth.eu</email>
 		<name>Jonas Toth</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index c8da4d8f9678..7a4df8efd3b7 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,4 +1,4 @@
 AUX 2.1.4-src-cmakelists.patch 1496 BLAKE2B 879dfb7943eee4c03791c25b1f73d5a1d1cdab07f5144f46891d610492dffd61dfa0cd03afb35177740615549a81ac403d0f4009992cb78d46fccb2f20efe922 SHA512 1f9097accda72d10bf5201110fc5ae099d99e4a6573ac30fac399744b88ce9957f6fa82e8c11275663e028865c8c4b376d07ba8894785b57e8324e6e2ea81f2c
 DIST deviceatlas-enterprise-c-2.1.4.tgz 51756 BLAKE2B f8dafdf31b608890da07214e14e9b2ec558e2c9c94c394a04c554e915cc1d4e2e886be1c0932353b0a68efaf90f190157696a2575db6ff2a86bbca3b492bc427 SHA512 5ea765738560c6dbc90799426f6bc0e6eb5e7775fa005279f046a68a4a984305ef99ae8b943dd9d32f88d88c1d24b6c09145643fa64a90eb834fc4a6ece05008
 EBUILD device-atlas-api-c-2.1.4.ebuild 992 BLAKE2B a82dc8b3f1e78572763a771cd8a59d80c719b6613e1591ed074864512811c0b3e3a5cf84e34a161c5312d7669a686b3072333a6e51d36dcaac1d98a4d91effe5 SHA512 bc9272a8efb0a99008403dc981d662a86800cd92e462a3c9d0c517b0ffb83a19d7a711abc3675a384d23d0a77a4b32b43755c81153bfacbf4ed0ca27d65a6486
-MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
+MISC metadata.xml 824 BLAKE2B c93422b6301d02dd2875530b641331dea21ac7054368f464e811a8b7258c414a44baf9ca65a5da249e93c4f718131a14c7f383ced91adc15fc5a573ee776e539 SHA512 39613e92507d998d169347835879eb6cb139973e45feeaa0cdde0ab1915da3b2548812b884827335b6750f842b50f18f3af18cbba7fcfd8ebc0f0230f08e2b3d
diff --git a/dev-libs/device-atlas-api-c/metadata.xml b/dev-libs/device-atlas-api-c/metadata.xml
index a1a8f31a03a3..298dcbc8a5f3 100644
--- a/dev-libs/device-atlas-api-c/metadata.xml
+++ b/dev-libs/device-atlas-api-c/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>bertrand@jacquin.bzh</email>
         <name>Bertrand Jacquin</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index e8d1c2f53720..aae0154ee862 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
 EBUILD dotconf-1.3-r1.ebuild 639 BLAKE2B 4524621f34f4140e5b9f8c210e43bd6f298c4b3a80daa879a54d3c85806e31367eee341d58d8183d0a0b23f487ef62da462c898b7191ba92a309f5340304933b SHA512 783f97f15902352af624c042df36ae57627de7a53c13c4882f6a2d9eaf1e87bb956fd3966f8554ce554211afb860215148948d9cb2b9a7cb7b39582916f16672
-MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
+MISC metadata.xml 444 BLAKE2B f0078b67742b8b4c2faf12452ce09a30beeedbfa69d911138bbe999964953e49e47bd5e455933e95708ec8963edc980f92434937efffce3de8651c5256375194 SHA512 df7d0b977443f2e3b56547be612f8a20854056be685f519a0e78275a3ddcf4a5a9f8fbfb8315244ceb0ebce97f63abf85ab1e0343d7b7c61c0fbd0b7aa7a392a
diff --git a/dev-libs/dotconf/metadata.xml b/dev-libs/dotconf/metadata.xml
index 681f451b51b2..e996618c39a5 100644
--- a/dev-libs/dotconf/metadata.xml
+++ b/dev-libs/dotconf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index a19bedac0f32..d681efc97454 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -9,5 +9,5 @@ DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
 EBUILD elfutils-0.182.ebuild 2545 BLAKE2B 89299bc12196b2850a01426ce17afbf10066a2332ff0aefe2a91092e48f16e99b3ffb94757ad3cdda78276956ed34a180525a3b4c6916911268b2e653febadbd SHA512 c58bd0bbb091f7dcf885255269939ac28422fac08446f8409878e2cfe895e5895bb1efdbf7ce797e92e0575ebcc0968537d7f9437095570adeaedf00ce2d4f5a
-EBUILD elfutils-0.183.ebuild 2433 BLAKE2B d71fee0f93c01e145f2b2b8fbb5a50f04f895184b168708d650918c6875fd89ea201d7592b0d4736187f504255f7dbe686b70c24659e070c7807427491586bb4 SHA512 a177eb63cdb5605316742594e01d71619ec46baddab48621abb7469495318a8d29582a6cd704eba85d39f769bd37e0240dc008be7a931c826fec5767de0446ae
+EBUILD elfutils-0.183.ebuild 2427 BLAKE2B c787a1c83ec4a14d048df88f7a935a5ce51968c6e30cf2621a41f46d8156bf5e42495f2c537a5c0d326a86afda0113a15ef86eba78611d34de429d0663398eaa SHA512 31ad20d6729d29387aa2c7371483a8dd68fdd7fa55edc4d3a1dbefd9023543755b2f86a6aeb845dd8715ce3f2539fba796b3658094a28e4ccbdc2abdb12b69e6
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
index d12889034536..fbbe87f8db75 100644
--- a/dev-libs/elfutils/elfutils-0.183.ebuild
+++ b/dev-libs/elfutils/elfutils-0.183.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/fddl/Manifest b/dev-libs/fddl/Manifest
index 5cba1ece46ac..ae9bb03c7da2 100644
--- a/dev-libs/fddl/Manifest
+++ b/dev-libs/fddl/Manifest
@@ -1,3 +1,3 @@
 DIST fddl-20111124.tar.gz 29608 BLAKE2B 5769edc935c4606cbc9662712ea05ff2cdd44646e36ef71a2b185a9efdd8655fd8ff0c7a0f0ed105cfee44f18c43815984771e7a74a2329adc29f6ff544fe64d SHA512 d9c4f3f4e10b92ffc158a8cd24726ac6f95050256178a17b6d11aefd4b5786452b17ee96e4d4f4762d07c372c248aba1f22cbe2c03cd6b0f709aeeb4d15a0266
-EBUILD fddl-20111124-r1.ebuild 1045 BLAKE2B 96a1e86d085cb91cb66f395f99cdc720fc93b11087bb5aed3dd751e310f4a3ec6cb5b799b13cc835d6f12afe6c4093d3e794d48508ff70ebfe2ffa193d68270d SHA512 457232f89f5aea21c796c777a432c343b8a785b7bbeb54d30ead9f96cd997dd27a66f9bfcaf4cfc7b395d2e22ae0c495d0f6cbf5c7cd88024e0296d145c2dc2c
+EBUILD fddl-20111124-r1.ebuild 1013 BLAKE2B c074eae4236d6cb6e58fa50484a4d128cb69351b1f0ce312b54aecfa1493924d7a527346b431dcb2baf824df690e03f6bfba8b6afd57c11d6a0500106b14b7f8 SHA512 8870e1d3cf7af6b6ce2421ae2b5e817fd0dad12ad9af68e3f8c524f508311224452a878825e9c50dfd31ae74165f12dfdf885609453e5b6c8e84586f3d637080
 MISC metadata.xml 388 BLAKE2B 04fbf4fd05fdfbcdd707e7d365979466d6df42ac6ab1af756263e6b468928c761266b1e949ff99ce83ac9be136bfc74862dff9ae3f766736302ec8e6b80f86c6 SHA512 bb5b6f0a1a76714330e83dbd98c6408326ebeb5bd2abcb89088daa835590a8101f5389ff23c5411af11916d66e24c7292438bdaf49cadd2fd79cb7b25b60fd55
diff --git a/dev-libs/fddl/fddl-20111124-r1.ebuild b/dev-libs/fddl/fddl-20111124-r1.ebuild
index 0e56e742f1f4..b25d4dd8bded 100644
--- a/dev-libs/fddl/fddl-20111124-r1.ebuild
+++ b/dev-libs/fddl/fddl-20111124-r1.ebuild
@@ -1,9 +1,9 @@
-# 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 cmake-utils multilib vcs-snapshot
+inherit cmake vcs-snapshot
 
 DESCRIPTION="Free Decision Diagram Library"
 HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
@@ -12,12 +12,11 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Remove references to files that were not shipped,
 	# prefer dynamic linking
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index dd49fe905f68..c39bec387810 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
 EBUILD flatbuffers-1.12.0.ebuild 710 BLAKE2B 3570f028de583c4509a927aefff9d5ef8f69fd6aa6e05542d78ad57e3864f65b919e2c3324eae56671c3ffadb2704fb9bbc5ae9d9743a622540bea80b2bbeecf SHA512 e35ff2395a348c4c3e1a769d165d8a3b034f49d53adb8d38f4ce708889ab5d75e53e780152e9c0e02867701addaedf3c930afbf62a6b4b7b855c54b73800c889
-MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
+MISC metadata.xml 332 BLAKE2B d8d0407f0bf9b22966b551396238765d83d830aa9d70efc8de522fc58a0424ace05025bdc30732c96af91d69202cbfd417f4775805e630b728550dec44a2598e SHA512 005454078e3fbb9fa650dd6ab4eeeb69708338e5c1b0a3595937365ce5d93174e352d9f8bda055127feb6b80644c91f6f3e82e85b5c162ffad09ff19aaf1dbf1
diff --git a/dev-libs/flatbuffers/metadata.xml b/dev-libs/flatbuffers/metadata.xml
index 69ce66602487..e3dc93e9a9f5 100644
--- a/dev-libs/flatbuffers/metadata.xml
+++ b/dev-libs/flatbuffers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 7d1dee64c5e4..a5ee5c10cec3 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -2,4 +2,4 @@ DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f
 DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
 EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
 EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
-MISC metadata.xml 744 BLAKE2B 9580feba11a5596321376921c6a6f6fcc88a9d691fe405425bd03253ef0bd1bd2d53e1f693383cfdc806b1930c2ffdb0d86601b3ba832044137e3b2df5e0cbf9 SHA512 21d02b987991d6e6816f6042813b5ff175e8edb32ee022bc7fadc27fecd79c58ccfad0fdca7f5ac7002dc6f2f95f3e2c1e055fe906dda8dbd8c09ba4cf058f2f
+MISC metadata.xml 774 BLAKE2B 9e6ec6d0fd5d7317eab55cb85f4595521e406bc29337a2524d80edfeab3bc94b149e714190b2be764b2f620a4c3a6fc5f8a622c00a7d04492fdbcb14c7f0e178 SHA512 17100ad403d72b53479e9a918cfe0da4ec1375395fc1f9d54263835b2db81c9affd4fbcdef9f25f37651a8080ac9cd4e1ab962461dc2e20c8afe89653d3f50ab
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index b0702aac282b..eb929563e148 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index ab8cc1855c46..729fd1ae3bb9 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -2,4 +2,4 @@ AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e0
 AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c
 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
 EBUILD grantlee-5.2.0.ebuild 1056 BLAKE2B 9f4dbc461f4f82394fd88655a1fe6311fd4ceefe60f136ed5b36e8294dba38d4bbf0a1dc00c711690b95d8c633a1f6fa8d0892783365ac319820a23cc1dbc399 SHA512 dceebeb2ffaf3dbebc3eec89dc8529b43285e638d6f2b87e9f07ea52a84b5389cb49c2d0012ad8d0fe669af05292e7ba31ce3301819ea99fb8b59b02183e9245
-MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
+MISC metadata.xml 331 BLAKE2B 4d2b886cfb049410b624de0acfc20887bd2139402cbf98428c0b8ccd4709fcfb43eee78d137beadb36ce7e7f29bb330ddc3f2a8cacd45ccac69534c7a6f7c1cf SHA512 5e0816357edc8ef6d61eedea244f61ac4e05f7be0c9731b90c913e69513e804e45913292d43d40116d910290eda109bda5f5a07534e0b4faed13a14cd07f2956
diff --git a/dev-libs/grantlee/metadata.xml b/dev-libs/grantlee/metadata.xml
index 060fd39bc3e2..8edcd422f99c 100644
--- a/dev-libs/grantlee/metadata.xml
+++ b/dev-libs/grantlee/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 642e8c9da459..cab305c20cf7 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,4 +1,4 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
 EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1844 BLAKE2B beacd5e8d3e72157ccf93e44e1a777fa00adcadfae6e247397aa5195e9367f9d00dfcf237e2f482ac9579a929a7292cfcad14c21538b7777ef5e980fca6e4399 SHA512 7693a87f85507b8cdd3eea7d81b38da476e0ef84e4a44c39ce219c5240af13775605ba7df900b20e4ef2450631b72d000e6ddf291fc732b3cc41287e906bd704
-MISC metadata.xml 540 BLAKE2B 6396197ca946971d1e954233589189f5e91dd4dc4fd6182f5cdf24890a5601a5e32fa71e2f4b2a676d346cb8feb1232467fa569f9348a5b788f5ee4a6838d7dc SHA512 3e0185fa3a56d0bb18f1256fe9e5c74cb5cdaea91cd24054d12243512012fdead25ac69c84a82d282b070bd73be2a9a7e313e858c05e6c2fe49bd38cba4d28d1
+MISC metadata.xml 570 BLAKE2B 8fb695d6a88996b796ffbbea7892fc0385d81ade258731a7b6b88a420d708de72b92325bbff56a3e9465b0d9848df0c61173b21188f8a851a39c1aa96c9f13ec SHA512 d9d3f8d838bc22d341cbebdc99d4ca919c0871e9445accc1a7b6154a16d45934865701790a5a0a2975fd07a5e54861bc857021f8a94e4d8c9e261b2f3e3d6985
diff --git a/dev-libs/hidapi/metadata.xml b/dev-libs/hidapi/metadata.xml
index 81b593d1683a..78fbddc7a454 100644
--- a/dev-libs/hidapi/metadata.xml
+++ b/dev-libs/hidapi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 7f50d2956095..b499b5725f03 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -2,4 +2,4 @@ DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
 EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B 9bae28ced3eaf52f9994e9641bd8d68583422fb888f8c2bc407073a0dcae600a3a50f6aee20ada3892ed631a1f9bcd292728589c0ebcbc57dd434524bfd62cf4 SHA512 20efbf148f3b1c816696cf36b10e936021113c8f1b6e5d681b541ae323c84b2043619e7cd381e4aff033bbf80d7ab8b2d51224ac8a3aa17a4854375bd26bd5c9
 EBUILD hyperscan-5.4.0.ebuild 1265 BLAKE2B e7803d2a72e6e63216a08a76f6c0d0bafcaaec2a1f1414d6143b3b57b4f5f804fe55ffbf628730400392e661abbda37aa4b9faf44fd17e32b8349c540099539c SHA512 cb83991b397c87abb9966bad8ea4277ea979baf51432ac53f30533ef5ea840c26f54d4ff7f474a9d5796a14011e04090cba897da722a21bbd9b9b638bc2b1176
-MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
+MISC metadata.xml 592 BLAKE2B 34be91efe23c3f15a33721893e48d8b963b9a27b6d2ce58eadfbc7a90cebbbf83f14231b9b843205d6906ceb69b5756b00326b32732a91b3abe0b49cf26e88a6 SHA512 c1a119770e21839d0775f898453e8dd7392fd248bec79a794702ade386edc7a1794359c1e4b368148f84603daca09f303c92d660473a5b45a0ab88e60b90e8b2
diff --git a/dev-libs/hyperscan/metadata.xml b/dev-libs/hyperscan/metadata.xml
index a0397a7f0d92..92d33eaf18ce 100644
--- a/dev-libs/hyperscan/metadata.xml
+++ b/dev-libs/hyperscan/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c@roessner.co</email>
 		<name>Christian Roessner</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 98e1a0aa0323..9ea9fda8e1d2 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 757 BLAKE2B 076ede13fa695870ee4c15951e176f03dc2f37387a90048c4f9d9b56f285f0564f0bf22c5d7232f2fe37f4aea2565abc0d6ca79a14c6686884ef7e5d5e6a9883 SHA512 0eeff004399ef0d034961954c56b87e4a10ccafffd2f8b70d32fe352729f27258190613cc837e110bd6e89153d26bd3e97437c92014edaaa8b2c959751f39ee0
+EBUILD hyphen-2.8.8-r1.ebuild 784 BLAKE2B 855c676e8d66ce5f46eefce65a8623ad00a675a929e0919d657af29d38dc02e1a355e7f0472a64bb7b53fb72c7a998c4ff1417d21832a155e360f9e3d3792799 SHA512 1ba49e98dd10d0826006df9061266062c9e9b52e9bd1eb472148673e3aecf3d6a4c7435d18a2b297ef69bd03b915022e241750f486243bce8807fb1019bc69e2
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 3284a42cf6a1..c56b63111a4f 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-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,5 +29,6 @@ src_install() {
 	dodoc doc/*.pdf
 
 	rm -r "${ED}"/usr/share/hyphen || die
-	rm "${ED}"/usr/lib*/libhyphen.la || die
+	# bug #775587
+	rm -f "${ED}/usr/$(get_libdir)/libhyphen.la" || die
 }
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index f10b370d1738..bf0c3d0afe83 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -6,4 +6,4 @@ DIST igraph-0.9.0.tar.gz 3752584 BLAKE2B ab8724de1fb57fda1250a9a3e1958609004731f
 EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
 EBUILD igraph-0.8.5.ebuild 1177 BLAKE2B 0aebcbb3875bb2ee611d6e35fae031a41cc0eec694649e573adaa3cf987099b2114417332b930102a3b817344ef30f5c383f4f72a70ac9dfe7d3a0caa8397207 SHA512 b8c588bd5a802b2c879d02e81d6c5cde176ff698739423eeb4de5df89cf03d14e70030218b957974f4b65278922116ae0035bf9ad3da9cf9ba275ada0311fdf3
 EBUILD igraph-0.9.0.ebuild 1079 BLAKE2B 6ba6490a7a042c441e64df9fe37cf03d8c078cdbc5b970431007a720d4a80d4c39154948b15eea4496266be58a298380a27c666dab001beb81c77ff07da6adde SHA512 2fcca50517868fde197fda25adc3c827abaecf903f9b67c1792105ee32aabc15ae3281cdf2899d41ce2ef9f413d43eb8b6caafd154f49373bdb3e2df0badaaf2
-MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
+MISC metadata.xml 821 BLAKE2B a81ebb12eb30401f4a4d19a16f45d50455588465cd22cb3604ae9bdbbb949645efd0ea0a4d9e01bc330262b1a51f0cddb9a4a03ef32d7fab236b36ffe2159bf2 SHA512 8d5fbb68495909d06396bfc2456911b7fbfdd4d4c0bbe946435eae35fc23eba7d7a790fa696f721203a49681ea9af0ca0d6c86281be41ce5419d5df9ca8eefc2
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index 91a6671aeaf2..000b3ab5be8c 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -7,7 +7,7 @@
 		like minimum spanning trees and network flow, and also implements algorithms for
 		some recent network analysis methods, like community structure search.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 7ae78c979fb9..fdaf2280d7c4 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -3,4 +3,4 @@ DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f343
 EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
 EBUILD inih-52.ebuild 791 BLAKE2B 09983b3a0fecbc3bc76218f7852778282568682a355c2e9644205b8adb0efc6b4710e5611b08c674359ac828aaf8c7797788601f0eac5ac3b9b5854cc2f9a0c8 SHA512 6da75c3754efd2dcce6e7c24e13ed14880427d6291d2d01e35c15b4d67b1ffb2c2a9d390ed4b0c73e56b1593c1d31ca0ed91914543aa150b2bcc3eaacf8a8ef9
 EBUILD inih-53.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
-MISC metadata.xml 505 BLAKE2B 304fa736140ec6ca3461e31f5629e22857ece165c6f16dbe4632211f05d2d4a45c2c9b5f35e858e81ae0d11cbdc87b3fc4977b55c0032cc115b65df43466242f SHA512 09e559083c0457cc38eae5efe344d035fbbbc860ae1ba268462ff821a467712d599c3cf7292d44f9a9f0d99674b0a1d6650e199147403686e859ee20d8fcdba3
+MISC metadata.xml 519 BLAKE2B 837ec41139390ae96130a1be2c25e178f4ca39a655a263e1be689c3da09236c43cc9750d07af108577d54663710ccc0cffb5fc432b0320c9c3f55177424ed35e SHA512 b9c05b7b9e8314a943215b721862d16b361306cc715d77250eb5e4fa1ac24f22165b8a79465188f4b5e3dc2381de72821c76b6bd6b6c7b966a3c6697209a8234
diff --git a/dev-libs/inih/metadata.xml b/dev-libs/inih/metadata.xml
index 6d0bdb811ca7..e2f491610534 100644
--- a/dev-libs/inih/metadata.xml
+++ b/dev-libs/inih/metadata.xml
@@ -5,7 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 4bd087b91cdc..a3181187b1a3 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -5,4 +5,4 @@ DIST intel-neo-20.44.18297.tar.gz 3586089 BLAKE2B ddaa719db25bb9b57b76a47c438e7a
 EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
 EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
 EBUILD intel-neo-20.44.18297.ebuild 1260 BLAKE2B a0bb152b9fd94a30ed9de552611b461e65e82321c9e7f29470f724b42edfa345bd11cbf13b0e7daeb1ae536b4fb3f7368c2eca30fa177c04f91f7fb24fffbcaf SHA512 3480f3bbe928354b9240cadcc244676f7d4814417eca30568787304b73b4df160f90bb3dabe23b2eb384e67081bf722ca832a70bad0d20e6e28faa8618dac64d
-MISC metadata.xml 1095 BLAKE2B 4669305d1799b9fde4b63f735593ad7e42d17b5ec65ef482a316c7347bdcd0c37b99700f4a29865352dc18e06ca8c38ddaeb650cc12793ecbca7ffbe6eec27cf SHA512 fe9a420c66ee8a86954f52d824a4f812667a5a84fc2fecdc286bd590413e0ac1ae55452dc736a4b315a0cbf15ac22f8a4b682226cac8b2377db9533bedb13fb2
+MISC metadata.xml 1094 BLAKE2B 47c0260920268a5e8cce5344a9b734a37bb550d6302a1e08bb617ee772a6fe6d8a11a2683d00b3aab525a7a54974f73e19210f44352b7927b5de57d53cb4804d SHA512 f610b7b2d81cdf52cca290a9ca574feb84ca8447b9c0944e42fa73d0a0eb52c13b1045cbd118606f12e65bd059bfaa3f8d76ab10c3a48bf16b2be6b3f5acb166
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
index cae799d9f329..acc2fc710e69 100644
--- a/dev-libs/intel-neo/metadata.xml
+++ b/dev-libs/intel-neo/metadata.xml
@@ -20,4 +20,3 @@
 		<remote-id type="github">intel/compute-runtime</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 8aaac6922f6c..1912978202b8 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,8 +1,4 @@
 AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302dd01a1649263541e1ad0f330442f2b1dba61310304c13600e291692134c1f30ecd18c04c792eac491471e3408b7b96e9ef4d15 SHA512 7119f12154810cb1a898c83931d74e207ff0902ff4e4d97d06ebc374a78fb2e22b1f676bf9cdc7321b259cb9558b574e3cdd7cddcd5512992b4a83c57e643469
-DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
-DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
-EBUILD ivykis-0.42.2.ebuild 403 BLAKE2B 4cc7661c30f37955813fc42d89324c60e9bed5f485958746f8d5b6f78a8b89d3d63f7045c30a5c497bec2662298b4943da929a8214d019f7a11fa1a180b40f1e SHA512 ed5a2368d6841ba7327c98b70223913bc64c2fdb4dcc9d93d9ba77063f2bc73f51da367bb541518e3ac0ce478bb5ae81e49b0c1c89628f8fb2085f7256aaa0d9
-EBUILD ivykis-0.42.3-r1.ebuild 707 BLAKE2B 7c0808117fa180cec9b00634bf28f5349c8c8fb433fb19777d7dd5b9a29da318d636841d5f7801cf788b947d2a1f9632e6715366b3f35c919ac4a04578b8b402 SHA512 1502128a8aa892368a812d88a75367da0b64d808b601e9935cdb9af43c3cc3e5f3df1ab14f06e10d39259d328cfb71df8f7f839672115ccfd84ee56a3318031c
 EBUILD ivykis-0.42.4.ebuild 630 BLAKE2B 7de89f062795060831da10aa83dbb08e68009f348fc853e8258bb25e79418f8a576b08c1665fb105c06d85035e67e255a365796ffbb2a5677cebbf64004eeb28 SHA512 a09c7b0cde1c32ba6e0d176816d15a26aa8b8472b2f302df602af519c1ada3860a1908e1c28a69392fc6e5da0f030e473790880154e297c869d75859dc14b546
-MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
+MISC metadata.xml 492 BLAKE2B 145f6e7cabc3c05a06259ad6c5d2c6bdd594feb1d036625fd757f9c2d89098a6e723f1e35d20f54b7f8326384a82afa850fe3d25fe241f9f46dddd9a3e4cbaa2 SHA512 7b65e7b6446dd4e149221e872974bd06caa571dc49f7c29cdbc8fe68652419a1af984d401a9ceded7022b526779ef643517fb63e6892891cabc319ed7e36b50b
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
deleted file mode 100644
index 8fbb7e4a643f..000000000000
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for asynchronous I/O readiness notification"
-HOMEPAGE="https://github.com/buytenh/ivykis"
-SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
deleted file mode 100644
index fd70a7c3b5d7..000000000000
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for asynchronous I/O readiness notification"
-HOMEPAGE="https://github.com/buytenh/ivykis"
-SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-segfault-glibc-2.28.patch" # Bug 675338
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ivykis/metadata.xml b/dev-libs/ivykis/metadata.xml
index 4f289fcb4a9d..403fdd860fdf 100644
--- a/dev-libs/ivykis/metadata.xml
+++ b/dev-libs/ivykis/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 912cd9ad858b..a05943db1fcc 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,4 +1,4 @@
 AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.13.1-r1.ebuild 941 BLAKE2B c4415794d498b4c805b33084d58a3aa985e287632fe364eb21cb4a35d1bea38eba94ecc87f7827654420083429cb4cfe10a5f74362e2b2016bd41aecfad864c4 SHA512 55a7703ca6a653613983eddcdbe866720cced62bf971f037c5400938b7da472354c09da69199453f7c4b2a9e922759bb03959baf87ffdb20b37d7931a90f4b6b
-MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
+MISC metadata.xml 394 BLAKE2B a0157c37450b88ecfaf562c147202583689aede1fc452623d49014b9caba19d0df682bdd470104378b5249e206fd47135c77bb8afbed49bfeb49fb7a795f2325 SHA512 50148e361ebe81f5bfaa3ac850fcee6aa7d5bae32d6f613494fe62e3b6884b8b7cccb6410f525f77ba819bbf1615adf19a12486f6985b3fbd7873ba4ff71e7ff
diff --git a/dev-libs/jansson/metadata.xml b/dev-libs/jansson/metadata.xml
index a4a2e61b9e7e..0201a3a531d2 100644
--- a/dev-libs/jansson/metadata.xml
+++ b/dev-libs/jansson/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zero-one@zer0-one.net</email>
 		<name>David Zero</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 25f03363b9c0..9386daa06318 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,4 +1,4 @@
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 EBUILD json-c-0.15.ebuild 1085 BLAKE2B 8bea9975427aef1949cd491bb742c3c76d0d2ec2cba6aad7960d13b79bff0a6572ca8921700f3f2313ddfb6af4977e742f1b4d03701e54f560393595e9a57552 SHA512 15d69aff34c431107940a7fe6bd0604749230ace47df22f616bd430ad8ec44f5f5ea40edb36449977064c1132e268427e04138fe002567722733c3201f0f7290
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
-MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05
+MISC metadata.xml 1028 BLAKE2B e75093103471c8de368b8845e7131ad99044c0bdbb436e1fef1932958d8f870b1bcc6ce0f3df8aaa8eaed1f152637b29806a0f156651bc573bf2fdb1226ef317 SHA512 6c36e1df600b5f4b891efa330df66907c08ba5521113d6d7c02900add0f48140ab1cc46a045ffdc766a80159e2ed8805f2bb7dc47c899a76b4f502723f417d0b
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index e822c83364dc..3b16c1944e7b 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luka.perkov@sartura.hr</email>
     <name>Luka Perkov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index fb3621db7d4c..36c853263880 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,7 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
 DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
+DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
 EBUILD json-glib-1.4.4.ebuild 1514 BLAKE2B c6c90de778fd04db9f8d1656bc195a66643dec302b44eb46c845d87f226ea37ac5641df57d0d9076ec1ed69039458ee00c609f7fdcfdba0dbb0122aa39998ce0 SHA512 a65556de5ead0c2563fe9106a2d94ab83a428a8973d1b5931f79858fc2a73d47d1bd7244a4d77347a3e14ff4809674be35a7d02bd3c7b7689e8e16878447c5e4
-EBUILD json-glib-1.6.0.ebuild 1547 BLAKE2B 72c9a1fb4378b6c5932c4dc2e24933e44d6902a440dcf205bc85c277c52caf51537f8e2896e7a50224680e474762df48c342b2c2006fd3e7879222cf4965a86a SHA512 91f47205aeb81251f0c89ef920f32718cebb9279e64f00a02bacfc21ae19fed73fc5ea13e0f1af4fbe5ff69855c629381bbabaf3cf8f5235ae36eb9fdc6ad0f2
+EBUILD json-glib-1.6.0.ebuild 1546 BLAKE2B d0fd4b5fc752e04635cfa09a871ef20be76f7b4583bd2b891557dcd48a12e1f7f00a8719321aafdbf275e305d572c1cf5bf19c7013b6a462a5953e712a228225 SHA512 9031ed6ccca2955ea60bae281c8b0d18aea3c8fb3356216106f12249b696a4982e52f76574e593ed7da79e63b1f99c3100ac151a4fe5e01f1e217de6043330e2
+EBUILD json-glib-1.6.2.ebuild 1548 BLAKE2B 37c85cae4a14e5c954455abec37a247f0b5c58f3ea3ae6f966c1fdef7492b8fb0288daa2525183a59ea5a4711092c8ca7a8efed41215ab94fe93caa283f2568e SHA512 5e575a9c93fccc033aabcc1a12c260410af684b21e56d3cf60d07b440c2d366ea3f88a60489c15fb36d405a0bd71b6dabe0c9921c23e5197be644858a865b198
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
index 2dd59591b36e..36f1245c389f 100644
--- a/dev-libs/json-glib/json-glib-1.6.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
new file mode 100644
index 000000000000..52f80fbce692
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson multilib-minimal xdg-utils
+
+DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}"
+# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
+BDEPEND="
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
+	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
+	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 6a2df713a9a0..e6c506f165b5 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,3 +1,5 @@
 DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
+DIST jsonrpc-glib-3.38.0.tar.xz 42224 BLAKE2B d7caf3dc116c43d652009ce646c0b837bd8a2a1b4d2b60ba49e9d746ff5e36e4c91fe5f4b5542a4562e6c8f13130d00fd22b57777d0e5ffd6e5b46f817f4dcb4 SHA512 1862403c37b7140e91720264a1b00a408b969f0464fc022a5c24be0eea993526d118ece6611927e1309071c3db9d3d6bf9f13ae8ed23ff1d34f36fb68c2584cd
 EBUILD jsonrpc-glib-3.34.0.ebuild 971 BLAKE2B 4f0ba2deafc37cf4051ba58ee20c19c669c1f46b78c893b2c859a55bceef4e0fb2a28118d208c5bedbbc5260eb6d5ee9884c7163132fd0212642bacb1b4fab7c SHA512 93372b1f84231ef06344b177c5696b9da31863e46bfb24814d7d99eccce5f069ae23fdb9b2f3b1227bea3d3064a8957b5cf31c299ae30b4eeb4acb8c2eecea74
+EBUILD jsonrpc-glib-3.38.0.ebuild 973 BLAKE2B a081bf1c0dc4dfb2379ba42704ea87f5054827b618bf91720c0dccc2cd5fd5a52a18bf791114ef56984e1087a25265e1fecc51264d07826fcd2d20f42540637b SHA512 34c5d9ce9ef46a4a3dc32ce7609dad4b522c9be56c8bde9ac438e03fc42080c213fec44adfc8ec857ce3b83a3762743d8b60639c928f01d39bacde4488b45802
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
new file mode 100644
index 000000000000..0029319a3d8b
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.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 gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_profiling=false # -pg passing
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/kqoauth/Manifest b/dev-libs/kqoauth/Manifest
index 1d92f346cba8..390f038b6c13 100644
--- a/dev-libs/kqoauth/Manifest
+++ b/dev-libs/kqoauth/Manifest
@@ -1,3 +1,3 @@
 DIST kqoauth-0.98.tar.gz 37059 BLAKE2B d1214ac22cb52e7ead1be3ce7af2af9c4b2e1cb74e2b4bf3891300099c0a0abb0c7295fb4616adcb59cb4405eb52bec4097b48d39563ac407bfe692ce94492a2 SHA512 f89e0f046fb7fd7812548f94c460d7c18d4881972e155a99e07503e97fd46b6eada0de9f2c3a94af33ef5b1b3b489bbd5dc6738cee104fe2d11ed62e681c7979
 EBUILD kqoauth-0.98-r3.ebuild 1157 BLAKE2B d092dca4d5ee1b6f603f03ef5004af596548259122f442db151a6e75881ef9f22fc5b88842f03033c2200f43d370efa517f7db5b75d3696e7f6f321678eb6cdc SHA512 0fdbe01fced1aad9d173f1e2ef20e1a6118b29029afa7ada2ce57f546563a598b95d28ac88d763b85b25c9779cd997431280895817c6fadcce5253491453bae5
-MISC metadata.xml 443 BLAKE2B e38dcf6daed9ac5a23061075de0f992b2e3a879ca35450617ce70dc3a007ea989ffce209a4ac150a98cfe37c6bd013484a3dca219934479128ad11bc493a7b93 SHA512 56182d7d36d0d01d2a64393e60cefb440650b46dbc45e102cfa7f3fe6431552dd4dfa03eb4f34a284fb8dfafa14ef711fb8586a7beaf6aed71f6048401c89aaf
+MISC metadata.xml 473 BLAKE2B c1c2589050b344e5c6565a5495480b937e6482d0f129b6810ff67a0a98c92e28c7c49d21db2b0bb19ae5aa0714ef7428d4151e27f72189f056bc7a695b301dba SHA512 8f65f8cd8a4bbfb7a74f42880904d62cb224fdec7e56e1193f0783463ede735ade705ea0b4cb9362a7a0448e6307864da4a0ffb841d9b27d63f8aa345b5e7a38
diff --git a/dev-libs/kqoauth/metadata.xml b/dev-libs/kqoauth/metadata.xml
index 47acb0dadc7b..969ff0c4ab17 100644
--- a/dev-libs/kqoauth/metadata.xml
+++ b/dev-libs/kqoauth/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>0xd34df00d@gmail.com</email>
 		<name>Georg Rudoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index f41719857eb4..42d755f3ce98 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -2,4 +2,4 @@ DIST level-zero-0.91.10.tar.gz 291352 BLAKE2B eaec1aa89b529b84d312f21c91e03c9ae2
 DIST level-zero-1.0.0.tar.gz 448583 BLAKE2B 21c3bfe3b960c153e5bfd2f57d84d5297fc0cbcdb2cab954f1e9669e966d02e756c8a5726b2aaead01a834b8b362130d30c12b7590384d629de36c713c0629c1 SHA512 69fd0f8a951dba44be8e41897824261d105ff27ba7924b86bcd97c00d3be41f4ad1ad5eeb08f1c8361c802fd3e76715cfd6c2e21ca83c16a603490b2ce111887
 EBUILD level-zero-0.91.10.ebuild 883 BLAKE2B 3abcea17935f73a1dc030fc1cec4103ea9b9efce71c8909c8a123f0885e89e5175ebd044545534d4d1e14c8e6c0f82a9fab36e256d32ad781f869b9ab6eff190 SHA512 753080be169166d29a6ee9f0ff55bd6ebc414662ac8a8b625721b5a9a77198737d162367c8b7fca2a48459f31504e1faafdc06fb89ac70fb410d6d712591904f
 EBUILD level-zero-1.0.0.ebuild 729 BLAKE2B 1a9e381c8eea4036a1243b316db9a3ce50365b4d76d800ffbcda9eb75d43bd5c57848312f1898631b6c1e6eafd257af3c352d61e862e8307a0335daf09978cdd SHA512 176e351e56076881fe20d95438cd1d38a4feaaab5ebe9df9b5438109b2abe04130a926cf4137afcdfca84e1ac64665622619a8c6fe06a1e6d49965a7b634139f
-MISC metadata.xml 254 BLAKE2B a145270127ed2edfebcab245a3cd1d30c01bdc556c1be4413d84fee7d267e926105dbd3eacd23116de171293787771e733890ada1ac1aa1179d1a7f1c6a43ab0 SHA512 5434613b7507fedf370e065a373894055b4e36421901d38b88f0cba1f161bd0b3ffdec3d8d8bd7e1dde1445f87163c6dcbc81d09e0547dc6c7159091ac2fc7ca
+MISC metadata.xml 253 BLAKE2B 31bd678c05831789c3717051a75558c7dd799a06e246244e1436bec2e184a2e84a50e8e492d121e740ea223df36f5e520903910ed0e76b179e71b92ae1335df9 SHA512 395a64f7e3df6e9414997a55252192dcf8def695a7782a85695b3b1484cef173e703a6247cf4c68610adea6e82442274a93bde8520d123603e0c43fb9d365a68
diff --git a/dev-libs/level-zero/metadata.xml b/dev-libs/level-zero/metadata.xml
index 559b22254e6b..f088ce8f094b 100644
--- a/dev-libs/level-zero/metadata.xml
+++ b/dev-libs/level-zero/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">oneapi-src/level-zero</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 9be2e8e93a88..e3f199a22116 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.8.0.tar.gz 31906 BLAKE2B 677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794 SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689
 EBUILD libarcus-4.8.0.ebuild 1359 BLAKE2B 5f0b775d5bd0e4fef3371d0489cd7130554cb4995e08ffd299b57d64a13904790714c890614eeec2a62196e240ea38260c0d83818eaece3ff57886d247fe9e17 SHA512 8679d5641f0edeeb45cd218f277508ffdb86ad4b3de1c12dd98d0e02f27ad06ce6f58b9ea01887ad0cfaa2587ac46142f21adb119bea9c88e5dbc360439bf2fa
-MISC metadata.xml 1241 BLAKE2B a66129e61057c7070716f15f8fab75dcc7d1e821bc0f213b3d8f9ab19e8bcaf74fcc07ec412fc290d0ee2776933e199c47fecc9c0c7dc57c204724e6fdacd41d SHA512 b141e6fdae8e4bee2d2ad3f54380948dfcaedbe1815590c9d3a247a31a3c34cd3f22382695dd15ccf9bfa05edab8441ca67d5bc598f6bec6d916ee1eb2e79ba5
+MISC metadata.xml 1285 BLAKE2B 49a2e165b06fde2a648dcd05d2d4da13bf0205fa5ceeee17f7e71672913747b44e82bedaf4e8bb8f12d58c2678ed20366325ac6b396d4c833a69fd94b5b946d0 SHA512 762d61333089b3bf0800ed9578c7d231e0a996cd0c8577c794cc8e745fa46caf9f3e2ab21465a84273c0185c598ec55875e11345d982382020d002f277382117
diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml
index 24c5cdbee943..ce0fcf336e7f 100644
--- a/dev-libs/libarcus/metadata.xml
+++ b/dev-libs/libarcus/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index 302835832d04..2b8d947c1fe7 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,3 +1,3 @@
 DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9
 EBUILD libbase58-0.1.4-r1.ebuild 1344 BLAKE2B bc4e5d9bd8d2b30d3d2639f09841251d9509993a2b7ffe295719dc05c61977c145d330c141b5d942854091947057874f6dd0e7a74234aec70ecc5e6a20550bc3 SHA512 d0b9fcc76dc65bd9ee602004f28ae6c810cad8a19d06692c2a38b4a2cfeac5aefeb2b074cfc15ecb84588196f54e154263993560efb67e710cbe465978f43426
-MISC metadata.xml 546 BLAKE2B 82f8c4af155cefd55772b9bb93f62ca3ac7bebe9ce51519066ee9439293933490d279a6f0da794d1b39fc7eb1a8bf04ccd911685a11f262549957fcc2bdca476 SHA512 2944ee72c2a86666eba6ad64046c1d607b816ab8f2a0c1f3cc38805ebd4c95f9169afc4438a523298ac0a0038c2d9ea702571fb407fb7bf87d8e8fcb3b2ea052
+MISC metadata.xml 560 BLAKE2B 43cb3217ec1fd011b4bba11b80b5c3bf7a81f2688332c98803493b5b89080a707a556424054315b8e91cb135ecce070d243439df79e769f92109e255ed35e66d SHA512 0565a4755c48448dcca5f9a45c383ba225abe2f239254be9147aa8925f454e6d3f6e51f7e06f2bdb838d80f9c2501e69c7501ef7a93e871ce3c110bc1265c451
diff --git a/dev-libs/libbase58/metadata.xml b/dev-libs/libbase58/metadata.xml
index a2e814a17c26..eb1b444eb35d 100644
--- a/dev-libs/libbase58/metadata.xml
+++ b/dev-libs/libbase58/metadata.xml
@@ -5,7 +5,7 @@
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 31fad7c476af..0fc7dc3240cc 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.8.0.tar.gz 151223 BLAKE2B fe4d2901908367569b45c466d31ac6e290979a8bd39c84f9c3ceb3ed91e9d9f1a789703fa5006706e21d77bd46b3185571df3f6157c7722e3e35244d27e0231c SHA512 33d3e9aa4e356fbf1d41555cfe2a5470d8f02b1d4f59d83e1ba89236b5e4489a93bdf24fad6f9bd2b0f843c053c485a082f5ee57437862ac40522aa61280b19c
 EBUILD libcharon-4.8.0.ebuild 1780 BLAKE2B 4efeb4d02bda95edca92de8e2e5d844463a1af6a1cf2e4a8c53ad172af051c3ab9ead90865ae6eafd0aec50995d5505739b882785e04702ed0f1e0cd8e9ff19c SHA512 d431e8b45fa1d5da7756ad62ea326b1ba58fb35bf4d9566796bd6be66168c75c4e922684203b4becd5fe5ea2204d0fcae0590eafa545866222ed1ed0dbdcbbd7
-MISC metadata.xml 1165 BLAKE2B 91dfa3edb9222a10c0f765509ab07eb3c0b67fc7d32a225b5658aca044e31833c1d1ce50c123633fcb6931425e5360039d82c1f02baed65778468674d3176e92 SHA512 66086298cea86cdd6e45b14c67f4723baaef3f6e61ea40e3266cf2ef2d66f48c8e55c4daa2e72dee18352cc4b992db5e20d70e296bdce10f99cbf26d36b39c4a
+MISC metadata.xml 1209 BLAKE2B 358ab202ad4dcc96b472845c6f853cce633599231488d21b7cf86b90ff31e07378877679c7942d17c9c019743a326faa01951b50a9dffcf2d46e461920d5f615 SHA512 d3f74eb75b386d226e802179ebd66cc528ece495b2da4ef9c5bc75e98f988891b737eada2b86cb51863e5ccff7aad87af9dda4212f53b75d6f388db82578726f
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index 12642d145e05..f522947e90f4 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 633e79abf262..43a3e5a364fe 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d
 EBUILD libclc-0.2.0_pre20201001.ebuild 1450 BLAKE2B 4037c436548563561cef4f84374e7ebc1449126c3583c942607e6c7f2f8bd1df537b942854c6f6001a241f2bd4450974a31798aa3a4fb9a0d35eaf09ea8efad7 SHA512 77b6b9395c66d582e09a5e1b9fb1913c387d6dbc056f33cf55334d14cd7bc42e45c422994e26a4a909c676ce550096323d6aa6ae24bf041cc74d7a2aa840705c
-MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
+MISC metadata.xml 394 BLAKE2B 760b7c480cded6848c4467778f5599833a79f7b6ea4a1a1b9b005bb62d78d5876f76125c49bddacb5a0e8c4895b3816c0e8c7df93ca22c6e33c1313533a1747e SHA512 a24a5d7e962f332f7d15d9878f7ba9b5a318556882debf74efdae9c0760e675ca608e42f17f79640d48062407897e5b051512af9939fc2e21e16b5e40a3a0902
diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml
index f5be5f9b19ad..365915f11acd 100644
--- a/dev-libs/libclc/metadata.xml
+++ b/dev-libs/libclc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 322b898f4984..df112c9add00 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,7 +1,3 @@
-DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
-DIST libcss-0.9.0-src.tar.gz 522267 BLAKE2B c104dd2cf859b908d68ac318d1da0430733b8813fbfbcb1f8f6a3d373e3a2ba1db6685542823fe0bef838619ec358f336f8eb07dc073a55a2f8c1907727295b9 SHA512 435dbca91aa2b91398dddbc1d9d035d104be193bb593907e3fff9320cc4f668f8aae54e0d5d0b7cd2ed9cb36fc02255fbe97bc9038b79fe505b581d6af1ded0d
 DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
-EBUILD libcss-0.8.0-r2.ebuild 1091 BLAKE2B 8678d2aa61ec3b82e6e78e4f67ade170216b2623282e88c6336aa81acf3949aed39be1a754545808fc0b0a5e2086883b3126c3e1d670a4806a8c6945fd5875f7 SHA512 0aad3c8e1be00a9570cfb75fc876b301cd996959fc74c94194cb7818ab3dd01e7896a7fae079b326124949eb20e6f249bfeca22290ca15cd71836736dc627006
-EBUILD libcss-0.9.0-r1.ebuild 1084 BLAKE2B 9ab5540531a15fc4da96c8fb980fac5f283929291826dc3bedcc40dd9010dc9dd71ca6e7bcb511a0b6943960aeae43905bd69aa6c0c4527bfa234f8d2659b94c SHA512 d3356cd9946a95cf8dfca67b3ec1d406eba08274c205f10a4d8779cd27455a5df9d8e7fa8b70340d5f1c9f2eccadf068df534a471faf86597f70c73d745b8b91
 EBUILD libcss-0.9.1-r1.ebuild 1084 BLAKE2B 9ab5540531a15fc4da96c8fb980fac5f283929291826dc3bedcc40dd9010dc9dd71ca6e7bcb511a0b6943960aeae43905bd69aa6c0c4527bfa234f8d2659b94c SHA512 d3356cd9946a95cf8dfca67b3ec1d406eba08274c205f10a4d8779cd27455a5df9d8e7fa8b70340d5f1c9f2eccadf068df534a471faf86597f70c73d745b8b91
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.8.0-r2.ebuild b/dev-libs/libcss/libcss-0.8.0-r2.ebuild
deleted file mode 100644
index 9c537d57334b..000000000000
--- a/dev-libs/libcss/libcss-0.8.0-r2.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
-
-inherit netsurf
-
-DESCRIPTION="CSS parser and selection engine, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libparserutils-0.2.1-r1
-	>=dev-libs/libwapcaplet-0.4.0"
-DEPEND="${RDEPEND}
-	>=dev-util/netsurf-buildsystem-1.7-r1
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/parse/parse.c src/select/arena_hash.h || die
-	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		-i src/parse/parse.c src/select/computed.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libcss/libcss-0.9.0-r1.ebuild b/dev-libs/libcss/libcss-0.9.0-r1.ebuild
deleted file mode 100644
index f532d433da5d..000000000000
--- a/dev-libs/libcss/libcss-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="CSS parser and selection engine, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libparserutils
-	dev-libs/libwapcaplet"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-BDEPEND="
-	>=dev-util/netsurf-buildsystem-1.7-r1
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/parse/parse.c src/select/arena_hash.h || die
-	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		-i src/parse/parse.c src/select/computed.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 2b9380d40513..6e49ef8ac7aa 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -2,4 +2,4 @@ DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
 EBUILD libdbh-5.0.19.ebuild 766 BLAKE2B 776458c68471e42a401937f8d6c8eeb05d7e1365412c00212ef9e32ceb0f06c8afac848b584066aea5a2d723557527cb9e805b5218ebc90e882544271509b859 SHA512 5f2a90307c5c7009efa691d2f0a5608f6f67df1ae95d8a95fd0e5758f21f4bbc2ef42b3bcb3ef19b46d2259a09090a0e33d742a377fae1d3af943de6e2aa6c28
 EBUILD libdbh-5.0.22.ebuild 743 BLAKE2B b6b0c9b0fd998adfc02e34b47edcf15b85562faaab3b0a8920d62b979c4a0367b620c95dd19737e3242f10a165addfc21d7879e0c0853e2e27858564de30c495 SHA512 a30978a83bf0a27ca44b6f50e8b24f271e199892acfba9000fbebb4a263cce680d23ff7f889c98bbb20ae8bab5750b7ea34aae1c3287ce188f85b258cd911133
-MISC metadata.xml 436 BLAKE2B 8817621c260b3c6153ddebeb5b7d3b0877340f4b2eafb10318713ed7b8ac07a7a76c09480d25fc33ecc900b27e7750c1ee3b538d2280241bea4f7bab3cd91c20 SHA512 a43a689f3355779e44fcbe6aefbebd84f1e339736a58b6783c9b62a35b00139250899adc62e633d8ba209d68245df46f4041aa68e8d13184a934f5ba4d834e79
+MISC metadata.xml 466 BLAKE2B aa2426494b4350f37e04cafccb578c0b2883dae5029e8b6ecf60081006d8d10d578b6e6d2aba9f68ecf1d74a8a82b6af75c80abfa3b9efea3b7685c91e106110 SHA512 fb102058f5974d30660f2c4032dd8422703a7acdfffba825e63ea907f50facc4c012884066e4c17b870794d3cb2d685b62d7ce45f3beb1ce223386db55c3c9f7
diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
index d22f1a83844d..09058f134485 100644
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@culot.org</email>
 		<name>Frederic Culot</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index d5b17e86e950..18be87745d15 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -1,3 +1,4 @@
+AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
-EBUILD libdispatch-5.3.3.ebuild 914 BLAKE2B 9f350cfa7bcbc278a728c4efa057a5b17bc5145b4bb43441b7a2bd73b6ded456c74a174e14558f5cea38616fd9707db792276a5f1630a500f9c306045662c5de SHA512 d0da595a9f026824aa577d35b043b5ec40441fded2efddd122eed541352bffb357641d52cd1bcb28f2f14745c42f3857004887e1acea4f21e023f97cfdb54507
-MISC metadata.xml 349 BLAKE2B 5174115141a1abee14ac46ea3e8bbf9dfdeb263fe431411ccd17c36fbf25b31607df53fe3c9535404aaf5a5b4ffd1f11606387d1b0cd7ab83e18549588a0e563 SHA512 afda3310a1fb23f69619fc40e24c2007b5b40f0c3976b0b20b5c85e87d48830d56ecfc1a0b8ca1800fba00eb00cbff22f7b63e6b99aa12d601081fb8451c42b4
+EBUILD libdispatch-5.3.3-r1.ebuild 954 BLAKE2B 7642ecaa20be03b9f2d2354794b7d8befe16f2a7322c8293b7b91b234680ac5589fb9a48c17cc51b03a807c6e7b6a36d7d3b47dcfbe26ff4c266d18f60d4c8da SHA512 32467c96ee7fdf079da89fa6e5c5b2281128640008cb0d5c0c63f0225c0b7aa6128496c9b7c4ab3ddaf5ff43dea785f630977fb12bc29d669edf41a0983b5f2b
+MISC metadata.xml 349 BLAKE2B 7019847597264a24c724fc1c4ace226ad2b952a82e881813d9725f1153ef728cb0e8ed4b8071d8891606e8a6a1d4c8c2a270395a02de960388a7d084d2ff090c SHA512 dddd39bdbab38f07c35e78d7d38465b8b187854475f4b1feedfdaaea42bb53e4fbdd68f70c24f82c10a7e1abbb8683424ff865cb3d246d360aeddf145457e0f4
diff --git a/dev-libs/libdispatch/files/remove-Werror.patch b/dev-libs/libdispatch/files/remove-Werror.patch
new file mode 100644
index 000000000000..bdc3edf2d483
--- /dev/null
+++ b/dev-libs/libdispatch/files/remove-Werror.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/modules/DispatchCompilerWarnings.cmake b/cmake/modules/DispatchCompilerWarnings.cmake
+index 35b80f3..cc554ed 100644
+--- a/cmake/modules/DispatchCompilerWarnings.cmake
++++ b/cmake/modules/DispatchCompilerWarnings.cmake
+@@ -2,7 +2,6 @@
+ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+   # TODO: someone needs to provide the msvc equivalent warning flags
+ else()
+-  add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adc989d..2841aa2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -127,7 +127,7 @@ endif()
+ # FIXME(compnerd) add check for -fblocks?
+ target_compile_options(dispatch PRIVATE -fblocks)
+ 
+-check_c_compiler_flag("-momit-leaf-frame-pointer -Werror -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
++check_c_compiler_flag("-momit-leaf-frame-pointer -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+ if (C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+   target_compile_options(dispatch PRIVATE -momit-leaf-frame-pointer)
+ endif()
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
new file mode 100644
index 000000000000..d02b56e15ca3
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!gnustep-base/libobjc2"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/remove-Werror.patch" )
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
deleted file mode 100644
index d469c43530f2..000000000000
--- a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="swift-corelibs-${PN}"
-MY_PV="swift-${PV}-RELEASE"
-
-DESCRIPTION="A library for concurrent code execution on multicore hardware"
-HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
-SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/clang
-	sys-devel/llvm
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_configure () {
-	if ! tc-is-clang ; then
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libdispatch/metadata.xml b/dev-libs/libdispatch/metadata.xml
index 7629980c0ab6..e9023adfe90b 100644
--- a/dev-libs/libdispatch/metadata.xml
+++ b/dev-libs/libdispatch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest
index d3a8b639ebae..a3cd075aac98 100644
--- a/dev-libs/libdivecomputer/Manifest
+++ b/dev-libs/libdivecomputer/Manifest
@@ -1,4 +1,4 @@
 DIST libdivecomputer-0.6.0.tar.gz 680425 BLAKE2B 9ed951c6cdec07929ea7a9d3b842483ea1c88bff0171bfec1ec5a1a1d21a73580f70034856c97397bd21061d01967e14477ffabdf75b10bd6a736820b17e5b7f SHA512 b199d3e7e89fb2f79e4de5b54b086ae5f8b6bc08d02513e903e8fb008c1a453cf4cd4c4b7a94b1f7053ac53cc7b9085193b0ee0682318594c27ac2cb693c9b3f
 EBUILD libdivecomputer-0.6.0-r1.ebuild 864 BLAKE2B 5106d4832ae97b7cedd007d4846a3964c0a66d3994b81dd754653df237c4d38f189bbdca85e02f40c8540c306a922c435d53328cc95aefd2ccccb7dcdf9b341b SHA512 53d9892d3c90f6168d62e4566046329fcafd244607566eaf14b113e5ae8bae0934531e21b7bdd374372f498f4d710aa59002791d14e7e7743b6897593d71c43f
 EBUILD libdivecomputer-9999.ebuild 864 BLAKE2B 5106d4832ae97b7cedd007d4846a3964c0a66d3994b81dd754653df237c4d38f189bbdca85e02f40c8540c306a922c435d53328cc95aefd2ccccb7dcdf9b341b SHA512 53d9892d3c90f6168d62e4566046329fcafd244607566eaf14b113e5ae8bae0934531e21b7bdd374372f498f4d710aa59002791d14e7e7743b6897593d71c43f
-MISC metadata.xml 358 BLAKE2B d35618d267dc453d7446498f0d77dac8a0421dd99c7f1f8e5f6f04de46e5b15e9705df2476f84b84ccf3ab8519f50beaeacc6af0a46da729c5b13ea03a711887 SHA512 04333ba184ba31211c93c47915f49c1f11639f8a8d269ba9176fdc6a3855c585daaeb836056d8d690e9edd6c13a440d77e754de1511d135b9649a8248918e09a
+MISC metadata.xml 388 BLAKE2B ff0e99c0b04e787a6023c25d3acfa92c87cc0d6a4c9565125a15642ac39a21baefcd3c9a952a50a804da41246323f3fbe4d8b0b4e1e7d09705db33a0bf4e58aa SHA512 6f6112b006a11bf7bda5b27584141e1f9d55d032500d8d0c2821b37c45aeb6e53885b41beda3bb346431725fbbaa1a42bcaba8f46968274f3a438dc5dfc0aca8
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index ca379a9cce2d..e37806e64517 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>me@bearsh.org</email>
 		<name>Martin Gysel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 9ab233503e64..05a973e54bbe 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,5 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r1.ebuild 1505 BLAKE2B c56665847b90b14919528c753e2cc87d311d3c378c32eb26c2389e59c5a4d883c00d03e1fdf9702195f1d50608fc85958309e56dd041c51e94588b20de91f861 SHA512 9d6e0f8c10d8b0cfd24b13462caa2e47fe49ec04b52f029d1de20939be26d0c5617b37fc65ad9c7566f2a6ed3c2cf9e58d78a5594b0793f5460f2110806b9188
 EBUILD libdnet-1.14-r2.ebuild 1549 BLAKE2B 40321bca56583e9edfc1f768b9566e1b8be271deb98a8db56457c64bf345bdf8308d04523fa30ad8b96457c3a65097a3f5fac9920e0f430a28feeda3957b97de SHA512 dc14df9d1d60dfb35cd2118dd632d07b174915c5e728c1bebd2e511bc204cb997b85d68f227b550b0124e5e631bdae94fd400bb39cba72a5ab0d2aa485ae7705
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
deleted file mode 100644
index 921313b5d730..000000000000
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/ofalk/libdnet"
-SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-ndisc.patch
-	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-	sed -i \
-		-e 's|-L$libdir ||g' \
-		dnet-config.in || die
-	sed -i \
-		-e '/^SUBDIRS/s|python||g' \
-		Makefile.am || die
-
-	eautoreconf
-
-	if use python; then
-		cd python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python || die
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index f2ee8e33cde0..24f57ff1bd02 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,4 +1,6 @@
 AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b50263f297db16bd838dd31b571ee69f0f15056542be533115d92115963e49b357e0caddcb34a0e5a9eb7160fddecb9ca5c SHA512 e03cef80831c8982705e9ba3448a379e48a443b3b09b4c6f6be56ca2d0ac594f4569b76739551cc945bef27fc0fac2ffea3ad532355933a528753338f4094172
 DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
+DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B 4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412 SHA512 2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c
 EBUILD libedit-20191211.3.1.ebuild 1138 BLAKE2B deb7c2ef49a6252134c6d875b05e8c56f20dccc08906266f6ae58d96e2053751f4e4a756255e55d1ab7ee820371582f93094c473e52eff56eb3373ae2d9c672f SHA512 530de4d2e9057d064c7ac5149b82ae2893f30ea1a34fbeec79bdac6308c6ee73a4f30ea19560d9766fa06331354cddbfe1ee17d942dbafdad8dca4625b3a42ff
+EBUILD libedit-20210216.3.1.ebuild 1076 BLAKE2B dd57f842c575047c0e8480e4ca90126f4c1decc736c44e0088cf10ee28546af05dd461eedf6eb62786b3edc846bdcac2c8659f21d5d7123d06abf5a14e76aba7 SHA512 bf6780273b052aca0b4ac375c41bd1b3bb8c4d4f8478abaa8d896a7f0e21b37804767ab190cb2e531ab4d1e8f0decea232f581bd7aade04b7a0ba9952b6996ee
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20210216.3.1.ebuild b/dev-libs/libedit/libedit-20210216.3.1.ebuild
new file mode 100644
index 000000000000..f615587f5f2b
--- /dev/null
+++ b/dev-libs/libedit/libedit-20210216.3.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 autotools multilib-minimal toolchain-funcs usr-ldscript
+
+MY_PV=${PV/./-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline"
+HOMEPAGE="https://thrysoee.dk/editline/"
+SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-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"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND=${RDEPEND}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable static-libs static)
+		--enable-widec
+		--enable-fast-install
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	gen_usr_ldscript -a edit
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	# file collision with sys-libs/readline
+	rm "${ED}/usr/share/man/man3/history.3" || die
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index f243f5965453..0780b46ff647 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,9 @@
 DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a
 DIST libfilezilla-0.26.0.tar.bz2 564361 BLAKE2B 962f513846cf74a419a281c751266360196225c06577e7f5fe6b67f23ef3a4759f7372cac8fe11918e49a0ed20e08995c4bd971a02e692979dc09726be51fea9 SHA512 96ccc61e66dae744c092389a570f591e4f4e62ebf4fc39ed5a60206ea96b47b1aeb3d8f2fb7e22b4920560af4ec212540cc177d23ddbeea879dcd80143b86af6
 DIST libfilezilla-0.27.0.tar.bz2 567792 BLAKE2B d20013746a0a90b9e95436a2b408e9d95eb6b2d32e5cbd0bb827f401a9917c2f376fce45108f332e0a8b71c55d29a78946396440b18f345d8214775a3b7f3b39 SHA512 f7545d0220bc83d66dd6b66494696a8799428d065037c98d7752d841e03fa5ea2198751cd22e22b9b1ad8023210725dd1af8afcffa6f61bcfe6aa12671200011
+DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
 EBUILD libfilezilla-0.25.0.ebuild 1197 BLAKE2B 50fb4560d6a60d5a1a490fda01184173f1b82cb6f636330f6bb2d1186e9bd3327384757e6fc586be6ea15396a7d1c8aae27b90dd62a73dc3487e811329f6c1fc SHA512 8ed8773b226a0b656695e139f9eb97e1c7b6d9b32ece10085a3440427ee49aa802cb2ba587ecce33306ba85821c3a067937cdab2a5e17232c604bb186fc2d28e
 EBUILD libfilezilla-0.26.0.ebuild 1201 BLAKE2B 605e1c7fd2059de3beeebcad1207cdc87d4003361e72fa2264c71e1570fab8a263a65e32d29c8b32a08caee46af68c20b60c56ec8f617f41ed3f66649ccfd1aa SHA512 5b195d6c324cc8467c46552ba4f60ec0b3b6a1dd5caca1810164f33fb50f49984b13a40dc42557b5c8fa9f44f731289a528bc8725f4c2583753fecd55264744a
-EBUILD libfilezilla-0.27.0.ebuild 1201 BLAKE2B 605e1c7fd2059de3beeebcad1207cdc87d4003361e72fa2264c71e1570fab8a263a65e32d29c8b32a08caee46af68c20b60c56ec8f617f41ed3f66649ccfd1aa SHA512 5b195d6c324cc8467c46552ba4f60ec0b3b6a1dd5caca1810164f33fb50f49984b13a40dc42557b5c8fa9f44f731289a528bc8725f4c2583753fecd55264744a
-MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
+EBUILD libfilezilla-0.27.0-r1.ebuild 1201 BLAKE2B d3da57e06cb22e50cc25d0cf9d7c77a9aaff1d3b64d4dc6770d54781d01d9ce9d576d797c516cfd62624aa40c69dae29b55ec308b49e2edcdebd4a00f49c9b1b SHA512 0d77c5a2f3d2789c17b4f020af992321f8e17c0c63f7f2bbeade84981c29473dfb637c419440e2a6a900773789886a036cbd887cc70825be31ec4b910f9dfb7a
+EBUILD libfilezilla-0.27.1.ebuild 1201 BLAKE2B d3da57e06cb22e50cc25d0cf9d7c77a9aaff1d3b64d4dc6770d54781d01d9ce9d576d797c516cfd62624aa40c69dae29b55ec308b49e2edcdebd4a00f49c9b1b SHA512 0d77c5a2f3d2789c17b4f020af992321f8e17c0c63f7f2bbeade84981c29473dfb637c419440e2a6a900773789886a036cbd887cc70825be31ec4b910f9dfb7a
+MISC metadata.xml 1135 BLAKE2B 403d46fc71d4b6e9bdcd741cbf6ac8f911e35f998253495834db8346fec1fd58066949877e4d14e1bba895db0d05690ad9e499d5772a82fc08e99ee7ae8f23eb SHA512 87e61d89897246499ad56b231afcb9beda85d6b1f67c5c9dbdaa754e82d556a94a6df77836c11c5d5fd7c0a6926155d0cd77f17acaecd2e279fd9a63fc915404
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild
new file mode 100644
index 000000000000..f77f65fc8d91
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.27.0-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
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild
deleted file mode 100644
index 2f343c359bae..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_configure() {
-	if use ppc || use arm || use hppa; then
-		# bug 727652
-		append-libs -latomic
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
new file mode 100644
index 000000000000..f77f65fc8d91
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.27.1.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
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libfilezilla/metadata.xml b/dev-libs/libfilezilla/metadata.xml
index f5cd4f09fec2..b091d1a106fa 100644
--- a/dev-libs/libfilezilla/metadata.xml
+++ b/dev-libs/libfilezilla/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index 452b73d589e0..7ca55833eedf 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -1,3 +1,3 @@
 DIST libflatarray-0.4.0_pre20201009.tar.gz 166551 BLAKE2B 6e2a13b69a8cd21124c02c849956b85fed1c57d01e2b359044302573526d281b191454acbc0ef37355c0c7b5f8b34d48eed4ca0d5d44f75008040950cb570cbf SHA512 2d2111cdb0c5d80e2af04eb3b53e6aa0a3ca989809adc0e8ca654c31a46a3bcbd916eb0a5b5f9e86391e54a22bbefec3d1cbdbe0dbbd0c538da0130dcc7db562
 EBUILD libflatarray-0.4.0_pre20201009.ebuild 1115 BLAKE2B bcb1ab5ea118471e40c08ef2011314a1294f704ad3502c6cf5283815ff05b52a4a56e42afffb1a8ac399263a92083dd42757a9b4c6ec89900f58337cbb151af5 SHA512 e7c865d5cfcd580a863c80ea93bd64f2bfdbb1c22838ec8db1f934b5e856fa92382c2a0035ebff53cb8c582f311ed068c69392dab2e6a010d0fa5d5620ee2fd4
-MISC metadata.xml 796 BLAKE2B 97e9da58126fc47aa98f30b4e5389ac90f792db95e84a2186d7cc8702719c299d8e8b8bb9de3d91c21babeb6e1c21a778da4e6719d84975d142ab1fbd8256ca5 SHA512 672b8ab81e7915b0477c716493afb2e64b48749bdc510da3f01efc0a20ae5cc49facfd97ab96ba4661783142671f5c68d9f4511f89f928875f9a5c47d0cdb085
+MISC metadata.xml 826 BLAKE2B 617565f5092e1839bae81ea58734c9009619295b71b3bb7a9e8abfbfbb696f488eab7ba1d349a368bb2c30bfad8ec1c943cd41109f83b260f98e9089f04167f4 SHA512 ad209a94886943b348c951f1a073792c18957654ea100486d680714eea9de7fb8f73ac4af9fdb315894eecf4489fd853c34f4048d71ac806e80196085c8677bb
diff --git a/dev-libs/libflatarray/metadata.xml b/dev-libs/libflatarray/metadata.xml
index fdfc323c8194..bbe633548c8a 100644
--- a/dev-libs/libflatarray/metadata.xml
+++ b/dev-libs/libflatarray/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kurt@kmk-computers.de</email>
     <name>Kurt Kanzenbach</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 6a9b766dab6d..2cea76903f83 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 EBUILD libgudev-233-r1.ebuild 1098 BLAKE2B 01e9a601ff8142d174ceed9397f231d9e49540b15b66129059ca0fd6a7843ed44cf7156bd9c885c67e1bc55c68c93ca16b28f987b7da8570bd080b820e5a8b9a SHA512 52f0b728dec487a6316b2a31652280bcc5c456ced107acf3f97f7fdcee3568f5f5555afa3d1bfdd415be3a903e1e55506f18aa2a593dbacec2106bf48e7febc2
-EBUILD libgudev-234.ebuild 1087 BLAKE2B 5c8ec639c67378dc190b8990bdddb1c992761e88c1522ba2e7fe1207a60e2863ad4982b196e64a95237c32354e0bb1a2b0f47cc95550be6bee7cf6a7b641d9c4 SHA512 85e56261769b1c5dcd7cb8e3bb66391bd5b3c64af48b16b06a2dbea02a3eb5c17c2234833baa994a2be6cb29cf59707270b4b0be2a974bf1af790756c872ec7d
+EBUILD libgudev-234.ebuild 1086 BLAKE2B 7fc3c968b2365fb5dcb9a858913101e5f268e705db6483c730626be501f95f066bf8bb626fc2fc9d421334125cf59d61c54c85ee6a06d7ed2be8b873bc03e81e SHA512 a41293ee10ec266f7c6320e2eb7bcc2ccc54582f42b686f386ea64b1f62665e34c0bf7545a589e00973cc25cee335a4c9fe88f1a72fefba7557cff7c5cefa3a1
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
index c8561b1eab9a..4c186713a29a 100644
--- a/dev-libs/libgudev/libgudev-234.ebuild
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/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="introspection static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index c0d60e93e6ba..93d7f148b8a1 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,7 @@
 DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
+DIST libgusb-0.3.6.tar.xz 41648 BLAKE2B c4fe7661c3912233022c90b6201e2e9007871355dd2c7f6a67a96da77ab1d3c937bad9cc44fc8a91f89e93a66c6a072e0835e0e9178e9352b0bab73463bece3c SHA512 a185b6feaeace72f78672ebaa6788659fcccb5d6414d49afb8ab717307c7a3d8e55a2adaaadc24f00ee0059fc1e3fcee54212ac3477989f7cbe4aebbf91699c2
 EBUILD libgusb-0.3.3.ebuild 1477 BLAKE2B 1384a0af7a44ab3ecd9c18aac872719e77c2a0b785045d1f58002d1187735dcfb1ca1fd209a64ab05e28ab8ff194cd2d3dc566dd07eb27fc91c51ac69f6d8c5c SHA512 973501c489c7b109fa5c42ae1608ac396ba4677c06ee001c99f637ff98652dd8f3748fc4b2f967cb2550ba322f540e801386573271ef2512445f429eeeea8467
 EBUILD libgusb-0.3.5.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
+EBUILD libgusb-0.3.6.ebuild 1701 BLAKE2B 1e0868395e1c800f11674bc074df49b5acfc68f3eb5beaac7482338f27a78d9251e6017021bd79b2839a196ef3a1296f70d4da4e9125f4910f8ed82978ea44c1 SHA512 25e2950fb56c29f4770f9fe95642360ac48019d27d8f71318ee0676b2a2716d90c4dcf6eea85f5062b9ff5f1292f0f094d7e6bb7cac53f4393ec6ca47498165b
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.6.ebuild b/dev-libs/libgusb/libgusb-0.3.6.ebuild
new file mode 100644
index 000000000000..4ff3c4ea094f
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.6.ebuild
@@ -0,0 +1,74 @@
+# 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,8,9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson multilib-minimal python-any-r1 vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index c4dfa545888a..cddd8b4db9ca 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,7 @@
-AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
+AUX libindicator-12.10.1-no-werror.patch 5307 BLAKE2B 8c4c9a4277968c1598b0d5f2084727b5236afa729568f767e561225cf7e532d65a9cd3a8f916a47b401ee0e6b76560adc79d138310568ef02e46355c32948a7c SHA512 dce99a58fec589633ccd86b94558a89a5d42145d514ded782828fd8545660ce659d0c3eb469b32a67220ec20ef8b1a60b1074bc50282cced18960a948fac9424
+AUX libindicator-12.10.1-nonbash.patch 573 BLAKE2B ae6b2806c99d99c83b36056b0ece7335ab673339e8ba275366efed3bc68413563ef4baffed64a0e3113473e8ae6dc0a143ae388e5280abdd7b84be97ee9f2afa SHA512 8a436dc62fb70d857b2bf3489e576e72fe9e06639a6563cf528686b6646adf2dbd5418c0904d986e44f5a3f9bf41e3687ce7cb2ff7895680a0d2bac792c2bb74
+AUX libindicator-ldflags-spacing.patch 351 BLAKE2B fe395bb718f1393bdfad20fb572afebe531623b299c5dcd6e69f8bc87dad5545aef8bbd6fc4c28788984b334f97a0642c9802983aa6aa0b41fda83a46491479e SHA512 0762b32efce30e680116a3ab451a0b036c9d6e9d45f6894b745e211746ad13a2854e0ac58ecf32e7011b0269a50581070c9107a6140b15d10d537c37f6f3bf9b
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1197 BLAKE2B 5082a2b7963e66380a13b43323f9fca4492749fbebd89fcfb4f1a092292d8555f40398a1fc120e2bb771c784af12149dc13d95092c0b27146feb728c22f4e787 SHA512 01fa3c26a4a13d4db640e491cc12f19fbe3cdb86eaac3a2d81cdc9a007853ad338e3e0f65cadf6ab800d74bea41292399bdfe2a78b0365cf552370d962761713
-EBUILD libindicator-12.10.1-r301.ebuild 1178 BLAKE2B 8c4a9b86a23fe1cf355abe943fd69accff0baf2a8f38436c3bb15c2f3b99f01ad17187a5f62acaf2a3f752814092062eb71639f34b473ed19ef6ca849992609f SHA512 7a9df8a784836f37d45928e614af2228c303e30d4a5a5a9450468966f6a947b7d153190ab83ffc6afba8c672724fabe26e50507f6e207396e638435198d474f9
+EBUILD libindicator-12.10.1-r201.ebuild 1362 BLAKE2B af1856a0dcff13426d85530e178a7b8aa200342107d6dd14cb169664306b656b1fafa7fabda7f3237a78ed04abd2fca6551958bd4c5ed133af96179edd90b089 SHA512 2560bb73a841f80b401d0607e0843eabf2765f0f1e44483ea47dcd93a5dc98baf971b1aaa08e68308591fa0313787712e9d1d77d437880ba6e1730bd87540a78
+EBUILD libindicator-12.10.1-r301.ebuild 1275 BLAKE2B aa7aa82ff71d8ea1bd6c4fdc0a4d97aa86899dbfec020c132b40513f2492f85f60dd79ac145f1c339f4cd5441f0b1a9449cf038423a780eee81666f03e540fb4 SHA512 ef897424dde3a53e0966137e70d3a04a64ffb01d953290aa9353ea5964d376b2eb0e8ad5efe5370d8e077ed47f47feb617be65b6caea7c6822bd61986ff9e052
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
new file mode 100644
index 000000000000..dcbf50b43151
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
@@ -0,0 +1,196 @@
+https://bugs.gentoo.org/698774
+--- a/libindicator/Makefile.am
++++ b/libindicator/Makefile.am
+@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
+ 	$(LIBINDICATOR_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"libindicator\" \
+-	-Wall -Werror
++	-Wall
+ 
+ libindicator_la_LIBADD = \
+ 	$(LIBINDICATOR_LIBS)
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,7 @@ test_loader_SOURCES = \
+ 	test-loader.c
+ 
+ test_loader_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
+@@ -57,7 +57,7 @@ test_desktop_shortcuts_SOURCES = \
+ 	test-desktop-shortcuts.c
+ 
+ test_desktop_shortcuts_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	-DSRCDIR="\"$(srcdir)\"" \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(abs_builddir)\""
+@@ -91,7 +91,7 @@ libdummy_indicator_blank_la_SOURCES = \
+ 	dummy-indicator-blank.c
+ 
+ libdummy_indicator_blank_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_blank_la_LIBADD = \
+@@ -111,7 +111,7 @@ libdummy_indicator_null_la_SOURCES = \
+ 	dummy-indicator-null.c
+ 
+ libdummy_indicator_null_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_null_la_LIBADD = \
+@@ -131,7 +131,7 @@ libdummy_indicator_signaler_la_SOURCES = \
+ 	dummy-indicator-signaler.c
+ 
+ libdummy_indicator_signaler_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_signaler_la_LIBADD = \
+@@ -151,7 +151,7 @@ libdummy_indicator_simple_la_SOURCES = \
+ 	dummy-indicator-simple.c
+ 
+ libdummy_indicator_simple_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_simple_la_LIBADD = \
+@@ -172,7 +172,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
+ 	dummy-indicator-entry-func.h
+ 
+ libdummy_indicator_entry_func_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_entry_func_la_LIBADD = \
+@@ -192,7 +192,7 @@ libdummy_indicator_visible_la_SOURCES = \
+ 	dummy-indicator-visible.c
+ 
+ libdummy_indicator_visible_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_visible_la_LIBADD = \
+@@ -214,7 +214,7 @@ service_shutdown_timeout_SOURCES = \
+ 	service-shutdown-timeout.c
+ 
+ service_shutdown_timeout_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_shutdown_timeout_LDADD = \
+@@ -240,7 +240,7 @@ service_manager_no_connect_SOURCES = \
+ 	service-manager-no-connect.c
+ 
+ service_manager_no_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_no_connect_LDADD = \
+@@ -272,7 +272,7 @@ service_manager_connect_SOURCES = \
+ 	service-manager-connect.c
+ 
+ service_manager_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_LDADD = \
+@@ -286,7 +286,7 @@ service_manager_connect_service_SOURCES = \
+ 	service-manager-connect-service.c
+ 
+ service_manager_connect_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_service_LDADD = \
+@@ -319,7 +319,7 @@ service_version_manager_SOURCES = \
+ 	service-version-manager.c
+ 
+ service_version_manager_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_manager_LDADD = \
+@@ -334,7 +334,7 @@ service_version_bad_service_SOURCES = \
+ 	service-version-bad-service.c
+ 
+ service_version_bad_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_bad_service_LDADD = \
+@@ -349,7 +349,7 @@ service_version_good_service_SOURCES = \
+ 	service-version-good-service.c
+ 
+ service_version_good_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_good_service_LDADD = \
+@@ -376,7 +376,7 @@ service_version_multiwatch_manager_SOURCES = \
+ 	service-version-multiwatch-manager.c
+ 
+ service_version_multiwatch_manager_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_LDADD = \
+@@ -391,7 +391,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
+ 	service-version-multiwatch-manager-impolite.c
+ 
+ service_version_multiwatch_manager_impolite_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_impolite_LDADD = \
+@@ -406,7 +406,7 @@ service_version_multiwatch_service_SOURCES = \
+ 	service-version-multiwatch-service.c
+ 
+ service_version_multiwatch_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_service_LDADD = \
+@@ -432,7 +432,7 @@ service_manager_nostart_connect_SOURCES = \
+ 	service-manager-nostart-connect.c
+ 
+ service_manager_nostart_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_nostart_connect_LDADD = \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
+ 	indicator-loader.c
+ 
+ indicator_loader_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
new file mode 100644
index 000000000000..eac1e73aa288
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/777087
+https://bugs.launchpad.net/libindicator/+bug/1502925
+Thanks-to: orbea <orbea@riseup.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
+-AM_SILENT_RULES([yes])]
++AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+ AC_PROG_CC
+@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+ 
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
+ 
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
index 8c4a55faec08..5bd2cf89d5a8 100644
--- a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@@ -1,3 +1,4 @@
+https://bugs.launchpad.net/libindicator/+bug/1502925
 --- a/configure.ac	2012-07-11 14:07:33.167169453 -0400
 +++ b/configure.ac	2015-10-04 09:59:31.023669616 -0400
 @@ -66,7 +66,7 @@
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index 24ca42f49f2e..e5cd461a3d61 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@@ -14,31 +15,43 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
+	test? ( dev-util/dbus-test-runner )
+"
+
+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
 	append-flags -Wno-error
 
-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=2
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }
 
 multilib_src_install() {
@@ -46,10 +59,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 
 	rm -vf \
 		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/${PN}/*indicator-debugging
+		"${ED}"/usr/share/${PN}/*indicator-debugging \
+		|| die
 }
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 068768b22c0f..a56e52859f3f 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@@ -14,32 +15,42 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
 	test? ( dev-util/dbus-test-runner )"
 
+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)
+
 src_prepare() {
-	# https://bugs.launchpad.net/libindicator/+bug/1502925
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
 	append-flags -Wno-error
 
-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=3
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }
 
 multilib_src_install() {
@@ -47,6 +58,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libite/Manifest b/dev-libs/libite/Manifest
index bc9b963d0da0..c6718f1967a0 100644
--- a/dev-libs/libite/Manifest
+++ b/dev-libs/libite/Manifest
@@ -1,7 +1,3 @@
-DIST libite-2.1.0.tar.xz 265712 BLAKE2B c8a0f2a55bc6e0ae2ad774be67501d2d8ec31927cc107b1b38de409ce78334b9a516727722aa57d615b234edf1057967b2375a96dd947637e987d2583e2efc2a SHA512 dd6b48ed6dc646ce2d17e647179173bf5d3b478db38f05c2133119ce81da9778be8bb277db9beb0e28aeff7f81cb3fc361d3737de31623f6661141efa63d64d3
-DIST libite-2.1.2.tar.xz 265524 BLAKE2B 6e89fda5267e9beb8b057d195f1ed7503fc898146e64da2735510ee9fe703a9ee7d1f21e67a7820cd9ae413ee77b66c050d6534553b5a6ce113c113a7fd58f06 SHA512 92c3830344d7816cbcc2a697bf55b53557d4df7bab4d3db5aa6319379c82a14cf021d18402eae724c5b9126ec06df9728ee6ded9599117cc7f3fa7a0b2f997cc
 DIST libite-2.2.0.tar.xz 267172 BLAKE2B 6f3e76fca28b72978fd92e2e52234ebeaee764945108c0d3b1049c759bbba3a1e1c6aa6822707ae8323b1fc8d1b56b360b93c58f109ba1072123a27488b54c34 SHA512 56b4d21730b1e31f7c70ec16d0983d5c060866d6579fa69c44d1d3d2a539a7b4691adb4964bfac3f8bc04282537e93f53dc2bb5af2efbca637ddc6442db181af
-EBUILD libite-2.1.0.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
-EBUILD libite-2.1.2.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
 EBUILD libite-2.2.0.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
-MISC metadata.xml 773 BLAKE2B ed6eab8165e4f6a6b37c9c23616d0eacb44f2b15b13fda13093629a8d060e2c9f35b5a5614ad8e205462e0e1c8ec2a1cd71243d377d3a94084f0c1d7d2ab62a4 SHA512 2bb72bae63f07cce65711f13f5268a2bdde04ebdbcc9be4a2a5700f6a68aa3745d91ec83881fa83001fcdfb71675dc4fa1f937ca63273ae763ad899e43e0290f
+MISC metadata.xml 803 BLAKE2B 5111a2ed83e3330597b13bb2f67f519ae07d132b2f1c86e00d703225cc91aa224f8a5d9734d338edafef5a213f6891fb5f0d524b117f6bf2632f4cfc0c3cb2f4 SHA512 ba0344ef7f5e1c11cebf1ea786b3a812423898a3951cad070c6211c110ecc19ff420a51681d8f3e7d5ed5bc26d53eff51f024e943756c19ae6830d0ad9218e31
diff --git a/dev-libs/libite/libite-2.1.0.ebuild b/dev-libs/libite/libite-2.1.0.ebuild
deleted file mode 100644
index f0baf554132e..000000000000
--- a/dev-libs/libite/libite-2.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of useful BSD APIs"
-HOMEPAGE="https://github.com/troglobit/libite"
-SRC_URI="https://github.com/troglobit/libite/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf --enable-static=$(usex static-libs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
-}
diff --git a/dev-libs/libite/libite-2.1.2.ebuild b/dev-libs/libite/libite-2.1.2.ebuild
deleted file mode 100644
index f0baf554132e..000000000000
--- a/dev-libs/libite/libite-2.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of useful BSD APIs"
-HOMEPAGE="https://github.com/troglobit/libite"
-SRC_URI="https://github.com/troglobit/libite/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf --enable-static=$(usex static-libs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
-}
diff --git a/dev-libs/libite/metadata.xml b/dev-libs/libite/metadata.xml
index ec1edc5f9935..cb5c67aa4e9e 100644
--- a/dev-libs/libite/metadata.xml
+++ b/dev-libs/libite/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Oz Tiram</name>
 		<email>oz.tiram@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 24382b462d47..d4c83b6089b9 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,8 @@
 AUX libixion-0.15.0-bashism.patch 895 BLAKE2B 6da1172978c76732c2e7127a6c85e1bb6bac7912fabe96e0ad91f07f1ff89a97fed2e3bf7d348c58f79fcedfb17d2f5e33dd6738769fb208c3c28a4521b7a9d7 SHA512 aa93ad7dcd20b703b9bab4fbd880ae13cc532345a007e28fca010215bbdeab411fffc1ce5cff5e7b602ffec2db4193d212e2b5a956b33cbaa05207b04921205b
 AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e805840a5831ce38f2458c3e2b008dfca94b5bd68cdbadeda81a6b4bbd647fa3883d3c47dfa76761a31f8f9ff699c0ad8d SHA512 1b6a62c9219705472046d9da5fa8a92672a7055160c66f16a31fd003fe88ceceedaac4d67774bf55103a98d7434c030e1a020e15dd818aec23267b47bcb9561d
 DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
+DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 EBUILD libixion-0.15.0.ebuild 1197 BLAKE2B 4e29a88f44a9d75b451213de6cd404675aa105cb3b838f06a604d4aae7cb935cfb464fd07e8f8c602d5224731274db509ea0fde95dbb0b51c9e6aaa39fe196e4 SHA512 7dffca8b8d82fc84b6888ffce3d3ef43c8307fe7148fd15b2ecceb1b661cd927fade9daf97fccedecdac15089b527ab6b3e2e6a6c5f645e3e4b2363c4dc32d91
-EBUILD libixion-9999.ebuild 1160 BLAKE2B 38603b78e3d356387921f61d1a03057be8a3db2ea1819723c22e6e824386c5fa3b104362485a57a1ffa9ff64e85c80f63533f7310262f990b6c3c6285395db5a SHA512 7e1e40c3ce6b5a2d8e3a257220ecf5b9d7e73ce07c12f69cd2ef2a50167ef549a748f2ddcacd71581aa074c72b30568fdbc0a3f3100e95f31fbc3743ffa438ca
+EBUILD libixion-0.16.1.ebuild 1211 BLAKE2B ebc09a973772c773f53c637ba0afe242797e8c4282c9270fd230115957fe1685641d1db560d95d8f698478dab6311fc84ce7f5a000dbb93f0422f5267bf32e61 SHA512 7eff99faae43a0b55a066e89177300eb647d490818ab9d7d016e3ce0966b4dc966850ae90de40da42caad3af098de8d093aaf458d206e945073c817875c50379
+EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
new file mode 100644
index 000000000000..52f2afa3ce6f
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit python-single-r1
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+
+if [[ ${PV} == *9999 ]]; then
+	MDDS_SLOT="1/9999"
+	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+	inherit git-r3 autotools
+else
+	MDDS_SLOT="1/1.5"
+	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+#	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.16" # based on SONAME of libixion.so
+IUSE="debug python +threads"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-util/mdds:${MDDS_SLOT}
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable debug)
+		$(use_enable debug debug-utils)
+		$(use_enable debug log-debug)
+		$(use_enable python)
+		$(use_enable threads)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index c1793b33a8dc..96e5b7ce6f18 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-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} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -30,9 +30,7 @@ RDEPEND="
 	dev-util/mdds:${MDDS_SLOT}
 	python? ( ${PYTHON_DEPS} )
 "
-DEPEND="${RDEPEND}
-	dev-libs/spdlog
-"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -47,6 +45,8 @@ src_configure() {
 	local myeconfargs=(
 		--disable-static
 		$(use_enable debug)
+		$(use_enable debug debug-utils)
+		$(use_enable debug log-debug)
 		$(use_enable python)
 		$(use_enable threads)
 	)
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 79ca89470d44..0e8b90f81277 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,3 +1,5 @@
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
+DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753
 EBUILD liblinear-242.ebuild 1450 BLAKE2B b5cc50baae5858e1ed68b6b4faaabee6b6e57301d0111b62e3615def56bce1d07d3bf909a133e445fc849d1899dcc8fdcadcfdeb22b6b96d4dde90aab594f190 SHA512 56360ecc14c2ffe1bf2712057b139e801bbac326c00194d53ff26c935db8be48c507f774e425bd5e9f6779bb4df022f09a16c6ad498e9a9369161dc3221b634a
+EBUILD liblinear-243.ebuild 1457 BLAKE2B 7c61ba2761e7e7614459d40899eab240fec2e9bb189fcbe878f9fc1b3f4747dfa9f6d6eba0614ad97f40308ab3fffdd65e6a6ac7ed7c760cf35454448048cc28 SHA512 c4173b415a3a1c9581b0723a3891d675c5b94180f57b7358d6d0a7389f52526e6d033d8da547b760d153d1a851350f6caf1313db1c9c0ebdaad55a22c2c569c1
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-243.ebuild b/dev-libs/liblinear/liblinear-243.ebuild
new file mode 100644
index 000000000000..bc03e36ab2dd
--- /dev/null
+++ b/dev-libs/liblinear/liblinear-243.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Library for Large Linear Classification"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
+SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^AR/s|=|?=|g' \
+		-e '/^RANLIB/s|=|?=|g' \
+		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
+		blas/Makefile || die
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
+		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
+		Makefile || die
+
+	# fix install_name on Darwin
+	sed -i \
+		-e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \
+		-e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
+		AR="$(tc-getAR) rcv" \
+		RANLIB="$(tc-getRANLIB)" \
+		lib all
+}
+
+src_install() {
+	dolib.so ${PN}$(get_libname 4)
+	dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname)
+
+	newbin predict ${PN}-predict
+	newbin train ${PN}-train
+
+	doheader linear.h
+
+	dodoc README
+}
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index a7f89d254748..d1f298f1fed1 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,8 +1,4 @@
-DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
-DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
-EBUILD libmaxminddb-1.4.3.ebuild 627 BLAKE2B ec59a52f9ddffb0faa9ab6a33416905cfa1f13dbbfaf62fb870c248e671772bdc07bf3b93c3236f582d29224782b03a8c75b951af17af9960dc344ab583d6469 SHA512 c41b3a52fef686e2652538711f40f05467239df7915ed2cdc5aba6968891764ce3b41a82b03452077e99c4ad0a746dbc3bc5e956f0a6846f5af0752ed9ef1c5a
-EBUILD libmaxminddb-1.5.0-r1.ebuild 672 BLAKE2B c315939f56ca0795e3b82e087fb94d422b1ae2a1bfadeeee0104f0edd09c81fbf77f56e22c0caabeb45f12c557abba6e4fe9e2dd292af238a4123d62e51a35c0 SHA512 a60002797d17cad41d731ab210d6c87f4b71c530693118142a520cc4a43d67ed23397352b063f41a11287e623ddaee294689d6d22a18f80302eb1dc01f60f86c
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
-EBUILD libmaxminddb-9999.ebuild 622 BLAKE2B dcaca8ba54d66b52229e8ab3b0d64c92a4a4be70e6b130cdae77ad131f6b60a056336e64b5d494542d4c8003c32a2381549d8688640bee9c89d142d70955cf64 SHA512 311ebe39f56c5a159504636d91d791f7058ebc263ea879843eeea648e562b5e8aa55b2d42721a37e4b550d49cf41fa99bce4361054ed58df481f1bf01505bd56
+EBUILD libmaxminddb-9999.ebuild 619 BLAKE2B 1334372b07ce20069e2e7dab6f8cee0682fce4c32cbb85def685ce773a5a8595a4ac2a24a69346b099ef428c14d7ae1b5f998649d345e156292f159e6c250751 SHA512 f2df46949fc7d937bd0a76bdbd6f769732665521f17012888c2cee80dac94a056e515d41fe136ee74b28057da5cbd3c7a490d65e58d1dc90c559d2b1eff1a95f
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
deleted file mode 100644
index ccc7b3b23ecc..000000000000
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="C library for the MaxMind DB file format"
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DOCS=( Changes.md )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	tc-export AR CC
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
deleted file mode 100644
index d46d2afc1b46..000000000000
--- a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for the MaxMind DB file format"
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-perl/IPC-Run3 )
-"
-
-DOCS=( Changes.md )
-
-src_configure() {
-	econf --disable-static
-	tc-export AR CC
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
index 4979eebf44d8..39b988d3675b 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
@@ -14,9 +14,7 @@ SLOT="0/0.0.7"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? ( dev-perl/IPC-Run3 )
-"
+DEPEND="test? ( dev-perl/IPC-Run3 )"
 
 DOCS=( Changes.md )
 
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 78c897ec0dad..d595cb9cd090 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,5 @@
+AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 949 BLAKE2B 7fc95d23a4eac97ac87e49dcd4fdc6e44b7efe16881ef78f0bd390e7cde1264050f0b8c55f267e5a08b37cd61174d91797342f59a62c7f06293370cfdf848e50 SHA512 e8b5dd2c187f93ceb647c3c3bbc108a37f59f472bfeb774652c339dc33b72c822193eb1e0d0ccba761e02b37850175f8de55421a8e66d57b0cb7f95deded63f6
+EBUILD libmcrypt-2.5.8-r4.ebuild 997 BLAKE2B 09eabad4327b46c88a5930322f77bebf3035c09ff5d53cc9a2cafff485326b7c7f6d02c6e70695e308ec856fa7bd2a9d4014413133214ffa31e049eca3b70e15 SHA512 db16aa64a129a6feadbc8831712b7e0b95163c6c1a6459aa35075e60839e76022c2361a73db80d57b333717ea4dfcb82399c2b7abd3c2e9641e3ef47294bff47
 MISC metadata.xml 248 BLAKE2B d2f70b047cdeba6294940f0b4f8c4426c9b7eda93baa14e9bee35b9807c8b7ebd991c7aa726bcfeb17cc68960d335145e857f49d83d1db265935d81e9c5b07e5 SHA512 03ae18ecf8f19984fc4398e0e972bd2a52c033d7d94970d661015c76ede0c81191d9a297dfc7a04a58c1c4bf1cdd0b158236a1255c17232c58b234aeb26653a0
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-autoconf-2.70.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-autoconf-2.70.patch
new file mode 100644
index 000000000000..0fa3bc0e7ce1
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-autoconf-2.70.patch
@@ -0,0 +1,16 @@
+--- libmcrypt-2.5.8/libltdl/configure.in
++++ libmcrypt-2.5.8/libltdl/configure.in
+@@ -2,13 +2,6 @@
+ 
+ AC_INIT(ltdl.c)
+ 
+-dnl We shouldn't be using these internal macros of autoconf,
+-dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
+-AC_ARG_WITH(auxdir,
+-[  --with-auxdir=DIR   path to autoconf auxiliary files],
+-[AC_CONFIG_AUX_DIRS($with_auxdir)],
+-[AC_CONFIG_AUX_DIR_DEFAULT])
+-
+ if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
+   if test -f ${srcdir}/ltmain.sh; then
+     # if libltdl is libtoolized, it is assumed to be stand-alone and
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 8aa8182e9387..d8332e4f7509 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -21,6 +21,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/${P}-rotate-mask.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #775113
 )
 
 src_prepare() {
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index bf23845268f6..ac3040f25cfd 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -3,4 +3,4 @@ AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
 EBUILD libmix-2.05-r7.ebuild 841 BLAKE2B cfad1986e93b2ecea28b6c62cee7a9b5c43478cd5465c3905429361f1ac9bae4a0c85a40ce4f9abefacb8d7b5512e6406b111a9c9c867c75a5f95e084999d8a4 SHA512 25bc2ae7c30f6f373ec305aee9e840805871e01543527ef7c6427e339c379898ac32c4ca2a9206c17e4d5de5b5e11c8c12b5198094f6a05cd3180666868c8ce7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/dev-libs/libmix/metadata.xml b/dev-libs/libmix/metadata.xml
index 6f49eba8f496..979bcc7aec93 100644
--- a/dev-libs/libmix/metadata.xml
+++ b/dev-libs/libmix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 505287507550..4e39a7f8c565 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -6,4 +6,4 @@ EBUILD libmowgli-1.0.0-r1.ebuild 472 BLAKE2B 9d9c086a3f8f07ca535287baeda38018d09
 EBUILD libmowgli-2.1.3-r2.ebuild 1097 BLAKE2B 6398d0f93ca750d0b313fbc20eb8964443a01b473796a54d30080539e1a339de9c951b31d86d7d9cdafc755c7521ce77753e22c54019cc1a7a32440329cc3f6b SHA512 5e81a6c4303b4bb59c577c7c8e94d42ec317fcac4f6a0adf4b0b0c50d1c150d126fadc81b7953348ace8250921010dc434c06fa24be0286fc57f86c24bd14178
 EBUILD libmowgli-2.1.3.ebuild 758 BLAKE2B 48cead860bb0f3e97ee089a2780878fd1ea8e5b8b06ed9c8ff69f5bc8d63dce275b35b51ad1b6442eaebeca6d166779640d910dda5e91866f3308f80d9dff826 SHA512 7e4d4af5c0cfc8d25b602ce8fe6fa8b29747cfd451f7b39df13b2c458a22743dd7311141da14f0729077786731be7816324480094a34a0d87a1d1728b95a7ef1
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
-MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
+MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/dev-libs/libmowgli/metadata.xml b/dev-libs/libmowgli/metadata.xml
index ec4650dd7673..cccd8e9eeb02 100644
--- a/dev-libs/libmowgli/metadata.xml
+++ b/dev-libs/libmowgli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 5c2a4fc8a775..385ba9ef2951 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -2,4 +2,4 @@ DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
 EBUILD libnfc-1.7.2.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30
 EBUILD libnfc-1.8.0.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30
-MISC metadata.xml 463 BLAKE2B ef027bb940311ecc6a1c0095114924a3daefc3b85b1bcdddd83d0c1b87e6a2b210c3b5411fcc7a9fdd9940cd709758e743c6e3a462c100fcc31904cc88af9e8c SHA512 20f4b81da686998f0e779615d995433aab1cdc89f30bb79bf5426b2dad480da5ec90d65d371f6fad11ad94773bd758c9650a157067dc73547c180c8ce4c54dc6
+MISC metadata.xml 463 BLAKE2B 53a92a5eee64b4e8b1b438424064575b09fce5d121e0c67318b970f16aad8fbf5e4823fba3525beddc868cb7bae500c08413f0f132552bfa09c86e6c7cf04818 SHA512 1b7c15643550b90d07893eae94a866d490d14c4596dc19dcea1e6f9b488a5a30d91d3e8b253169d70f4bcab4e74ca14e1ab7a1d548ea434fa7accdd79a6e309d
diff --git a/dev-libs/libnfc/metadata.xml b/dev-libs/libnfc/metadata.xml
index 4346902e170d..080fc8f98add 100644
--- a/dev-libs/libnfc/metadata.xml
+++ b/dev-libs/libnfc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 2f231b2db364..3b43c6b00334 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,8 +4,8 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1143 BLAKE2B b6c7360702f8650059cfa0fac3d940f6f1ac5d19a3fe1015b5503413985678dc11d103bb44ff54c6baeda28a988ff0b6b589410585b3f06ecc6918a1a20798f1 SHA512 b0325f64a8aeabb950e1e18c2252be1df3e83903eac265d0e66b96f366ead7604971af680a4c4fef85f5474eb0f1a1e0c123566ee71e99456702bca5bfaae261
-EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.5.0.ebuild 2379 BLAKE2B a45dc74aaa9ab1c3ddc5dfffc29b22ec18f9d06e5900d774eb001bb464fb71eb89dbe64b5d1d5ea4a42413590d7e32b0e4c857363dce210b60bf3195474b0fb8 SHA512 5dfc733e2c9a37405c249a98ae469533ba79d451a0bdcbbdfadce469a38424f593862b907fc16f8ed8dd96291b26750ce18be8390d07d69fa7a48a77ec215b36
-EBUILD libnl-99999999.ebuild 2424 BLAKE2B 7d9ee26dce080636c994419379fa2594507d26702b3541e2fb441720e444b593c9e0d8b69b5816ea5d8bad2dbb079232913e8382250675b2c4924bfcc197121c SHA512 1d925a12d3a42215e14b1ff06236d50ef1f6111947b267ce477c3e39d374ba332622e3da5b3fc60eb4c0532f55a82ab422848ea23c309ec3ef6f8ba5821f3607
+EBUILD libnl-1.1.4-r1.ebuild 1144 BLAKE2B 4e83cca3689722cce4ad101f36db5923b0fd4771f2d49113f512f7f742370c8ae019b39925b9b29e4597f15d4011c85a54aeb1ecd6fec28a8216282f59d71e02 SHA512 cd7685ae97104765e5f432371572e7bf1a6b1bd984e62dabf87563fcd3fedfbde975972ed84d5c485c45cb2a71dbd7a141b54b237b9525d2b5abef50d3b636d5
+EBUILD libnl-1.1.9999.ebuild 1056 BLAKE2B d8a6610330b2720caa2089e9365c913c7e7822097fb744e57ee5f5edb0c70217ce758928f3953e529d2052a6d5f309f57e22bdc92e77d6a80e46fdc706fab106 SHA512 0bd08b49ab67f6702737ce1fad08467b8b7fe522bcdcaabfd4eaa04d2b78f85d7afab72b5440b7bd9b41dec994f8f6fd5a64621552ef575dcb6c6a540e56c856
+EBUILD libnl-3.5.0.ebuild 2380 BLAKE2B 4d6de097ee0a7872659872a0560e3080f388a8db1d1b3447d5db0d2769ac5754e1f9b722098352f05d1354ba8dbd9da46e86683054c12dfb162510849b557d1b SHA512 7fdb26d018634fe77c0a5aa38e53217e5d1a997ed7da6615e73c726c8af3d57d065492209fed1482f1ccc60a9320c63b3e5d17376a9dd1a53a0fd03237a6143f
+EBUILD libnl-99999999.ebuild 2425 BLAKE2B e1e0af93008411e8e8857b2dda0fee2c2fa8a9f707df10601e95ff3ce003787dbc1cb035aedb7a1210e4339e2764eb890cd38fe125ded76be2e52e47533ff262 SHA512 c891cceb93025e2456efddb03c69485b6e2ded0db86f46734b00698e9736d1f7d6c095eb20b6108e040a8430b01d317857b72c4728407f29c3345b61c9db9888
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 77e2c37dac6d..40141bb55b71 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
index e9ef685bf116..30fa4a923c0f 100644
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ b/dev-libs/libnl/libnl-1.1.9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit git-r3 multilib toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index c078b024e6cc..2c8d76055e42 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -12,7 +12,7 @@ LIBNL_DIR=${PV/_/}
 LIBNL_DIR=${LIBNL_DIR//./_}
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
 SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
 S="${WORKDIR}/${LIBNL_P}"
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 75200c890123..1919e6e62e7d 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 git-r3 multilib-minimal
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
 EGIT_REPO_URI="https://github.com/thom311/libnl"
 
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 59a5cf93cbcf..840a0cc3c5f9 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,8 +1,4 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
-DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
-DIST libnsfb-0.2.1-src.tar.gz 82357 BLAKE2B 2904b8890fd1ce3f6eb8d327db09c7b38146d5d16499beecbe56efd762e33d6ee9da3394ed7923ad43a89fa41e45602ea4af2710dbf2f232b42a038ee90abdcc SHA512 f8965aeaab0d8e7c2676bac56ae67bdf6ef651ae84c62e01aeee888807f1edd7d65542cb14027a8f1a207155a1cc54ded9112a42bf9e7a8836956bba38d365ed
 DIST libnsfb-0.2.2-src.tar.gz 82594 BLAKE2B 6deb775e77df71fbcefac6ef8755484bed476b652ae5dc3fe8914b859262ea1f6ee49da9d27a5a1bf34256481c58dd98339f0eb96511dcdc44cff2bef9ef6a7a SHA512 8cd16c0ca974aad8105dc32c8ebd627cf24f6d3bd81360515c2e0159e35328920e91039bb06ab4f52c93264c2112d0e130761e3837ba26fc703caeb52bf27b66
-EBUILD libnsfb-0.2.0-r2.ebuild 1128 BLAKE2B e8364b9aa888d20185079dbef844be6b8196dee07a928ba80e0388e58589ffb5a6030b2085aae69e34795620c6c18513284f8ec1e64b845c3f18382bfdee4d2a SHA512 33c9af0ff5143f498c625ba6180465fd426d10747068abfec5c1e1f9ad42b766069a2e2d2f3cd2d513697a545d5dd251c9ed5897ec807cf9b8cf6553f63181ee
-EBUILD libnsfb-0.2.1-r1.ebuild 1120 BLAKE2B f2f49986e3e9c72e4866b1cd890fa675c001e7b7ec7d3a4d6c97ba6bc921d209c0d211ec0fbaf4dd546c6c2f069c1ab4c3f6659eec3ebd0dcc5a437a89494b74 SHA512 679892dff6d23b1ea978fd7f189465ccf6eb0441801be5720027e6aa5bdca471029635f96541699910250e073b857d18b48ec806db4a064e3c7debc58f78cabd
 EBUILD libnsfb-0.2.2-r1.ebuild 1110 BLAKE2B 26f4d07d3c83dd2d0bd4779a7d841279302ea22c739cdd84bcd4e0114421c0479891edf644d62a5126e774464681dfdc597ec5c8acca925c45b4fec32ec6c30c SHA512 326073cf13c49446c82cb8674542484ebf8025a97e042b0ac297efd62001aa874cb0b56aadb351ca6c28c1367ce5436ef9cc70b36d73bf3d61b8d948fa78a223
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/libnsfb-0.2.0-r2.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0-r2.ebuild
deleted file mode 100644
index ce5964414d8a..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="sdl test vnc wayland X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
-	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
-	wayland? ( >=dev-libs/wayland-1.0.6 )
-	X? (
-		>=x11-libs/libxcb-1.9.1
-		>=x11-libs/xcb-util-0.3.9-r1
-		>=x11-libs/xcb-util-image-0.3.9-r1
-		>=x11-libs/xcb-util-keysyms-0.3.9-r1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/netsurf-buildsystem"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
-
-DOCS=( usage )
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
-		WITH_VNC=$(usex vnc) \
-		WITH_SDL=$(usex sdl) \
-		WITH_XCB=$(usex X) \
-		WITH_WLD=$(usex wayland) \
-		$@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libnsfb/libnsfb-0.2.1-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.1-r1.ebuild
deleted file mode 100644
index 354ba28b0bb9..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="sdl test vnc wayland X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
-	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
-	wayland? ( >=dev-libs/wayland-1.0.6 )
-	X? (
-		>=x11-libs/libxcb-1.9.1
-		>=x11-libs/xcb-util-0.3.9-r1
-		>=x11-libs/xcb-util-image-0.3.9-r1
-		>=x11-libs/xcb-util-keysyms-0.3.9-r1
-	)"
-BDEPEND="
-	dev-util/netsurf-buildsystem"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
-
-DOCS=( usage )
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
-		WITH_VNC=$(usex vnc) \
-		WITH_SDL=$(usex sdl) \
-		WITH_XCB=$(usex X) \
-		WITH_WLD=$(usex wayland) \
-		$@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 9a28fb085344..8707113dfc6b 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,5 +1,3 @@
-DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
 DIST libnsutils-0.1.0-src.tar.gz 8840 BLAKE2B 9f25763b945a96d89ba33959caf676b09964da096a9e969396f3b0ba0f6b4bd6bfb52a61bdcc222432463f2bc0f6bc148bc754200fb80a9ab521c5d64638bba7 SHA512 82d75e799b21484120b9711c853075a07990aa4d5ac5bb0574683bd1fd59eef547d9b78333eeb2da9d96c2132b4e7c32510cf690c80cef291cce8ef2eb44198e
-EBUILD libnsutils-0.0.5-r2.ebuild 591 BLAKE2B 7f1cb95cb1613aac7df971e706d5aa2d5014a85f720caf64737d700ffaf4d6daca3a797a5ed825ca245e22169b285ba268fef74d4c94396a8b0ea6c7fe177907 SHA512 116b19957b6fe55b75ce3aac7ea9def79b4f9dbf56a133942a1ea0a75ee924844e6c4ca10e5d33ac28545c3153e74015b840863554862839af165b226ec2136f
 EBUILD libnsutils-0.1.0-r1.ebuild 584 BLAKE2B 5ced7bb5432b56ca1ebee8a32aa8b6e72b9e798d531f2b1e8b4fd32e12f53cf711d3d00209598867516c26af621544d39858adfcbc029f3b3afa4a5a7ef30d10 SHA512 290d2f21f0514430d41b3f833975d8b09b78c804ce2c0883c7b35848190fefcd3a0a7f9d0cd77fb11b835e64e6b9e08920b0eb20bb49ad46bc50559481ea75bd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsutils/libnsutils-0.0.5-r2.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5-r2.ebuild
deleted file mode 100644
index 13f403c3edb4..000000000000
--- a/dev-libs/libnsutils/libnsutils-0.0.5-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="base64 and time library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-DEPEND="dev-util/netsurf-buildsystem"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index a1a968db212d..54c9cbf93d8e 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,6 +1,8 @@
 AUX liborcus-0.15.4-bashism.patch 640 BLAKE2B 4ccb09840325fb59756b806c1be68bd327757899ba904e9c3b83bafe167c61ac3e94b9779e2df547b2427f622532c86ebba56d20d853095c215a0a15d7b179bf SHA512 0d7605eea0594b81b45faa0120e7fc37021efbae8b676ee0a1262923aa69511203927163785a8648ab23ac8df8ea5b4bb08ca8f0dda436b81ec287dbe2064951
 AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a
 DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
+DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 EBUILD liborcus-0.15.4.ebuild 1330 BLAKE2B 1418857b75f7c98f4160430afca5fcfcc05540a01b1c9191e71701c8900f2937a6bc2632697778af6364b3995fb487b9307a376420b5f62a1572a62673abcffa SHA512 a1f0505fabb9d35f33d620f31add9c96ebdaeaee8fbecd20b1537c2e0a72cc1b1accba1171ba2b0c2cd6cca7de66a5be2dfe90b8b19a79221b74beee8e915a82
-EBUILD liborcus-9999.ebuild 1296 BLAKE2B 2cb025cade84605ede18fe4d58dc3fbfcc1f425350b4c1395e0f2d98bffd76ba2814e19bb0d8caabcd68c4482c3eff68d9e00d0dfccd94e3956e0322c9e4510e SHA512 1584bf01fd5175bb58270bb432862dff7e8efb44094e2305646052361482f3d5b1d5482d0d097ee5a2c36d0035e4cd8c181471924c32d35e5b7080e6d06619b5
+EBUILD liborcus-0.16.1.ebuild 1365 BLAKE2B 498d60136a42d169af92c15e563136f19f9564cc2d8fe1c75780fa160fec6c509aff5c717668da8007eb9c521e456fe5a63cbcb5541e67526c556e696ebc9c96 SHA512 8879c389ad9813f09349261382a452b3e6f3a6d99f392478273c8c4a3b80244eab6c33fffcc02181857b81ac15d6e67ffa798d7c57ed0ed5fd85b4550461f693
+EBUILD liborcus-9999.ebuild 1298 BLAKE2B d36fecea100888f02258506873c9590989d7d8abadb2e03e97b0c80d1d3643fd462f13a7af52ca889c9ea91d44a8eed9b5764887f8a2c0b0d4fd78995b9e28cd SHA512 d7c070b9f43558abda76cd5602a0176ca4713abce69b458243edd089a114bef05ec189fa61384a158406427368463f5618f256d65c7177b04d59051a6ab954d0
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
new file mode 100644
index 000000000000..668bff144022
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.16.1.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_{7,8,9} )
+inherit python-single-r1
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
+
+if [[ ${PV} == *9999* ]]; then
+	MDDS_SLOT="1/9999"
+	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+	inherit git-r3 autotools
+else
+	MDDS_SLOT="1/1.5"
+	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
+# 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.16" # based on SONAME of liborcus.so
+IUSE="python +spreadsheet-model tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[zlib(+)]
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
+"
+DEPEND="${RDEPEND}
+	dev-util/mdds:${MDDS_SLOT}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.15.4-gcc11.patch" ) # bug 764035
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-werror
+		$(use_enable python)
+		$(use_enable spreadsheet-model)
+		$(use_with tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 215c415e3d80..50a9442c2807 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-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} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 4d6c8247d235..273a8c6a71bf 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,4 +1,4 @@
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 EBUILD libparserutils-0.2.4-r1.ebuild 926 BLAKE2B 9ca877b42e5ec18999b631c757e789b3cd065bed250c0759b8ead0ec309f5d5d0bd5a330023590eeae369c299ee7fb6a8d76e5afcb6a36784b5d786178df0c0a SHA512 7213800d743699f75b296afd3c1033b92c30907635ad22d425dd80015558e90ef1ea9f5aeb123fdec4275229e4e8e80ccaac7e99455cfc5e43c345a5f61668cd
-EBUILD libparserutils-0.2.4-r3.ebuild 851 BLAKE2B c0c9d50d9d7f65e4c61fbfd1c3006da4cb3531d04486cc608de9dc7600712450159872f870b70296c168d9b3321b2e7b7d05e065b0ebe7a1ff7e6eb1c0bf7389 SHA512 89ec2d15c39c106b937a3b25e20a2d62a4ce7ff5deade89730aca75dafed9c7614c27c8c978403fbcc0d1e464093940c75f29be3622c890870dc1156f2cc6c1d
+EBUILD libparserutils-0.2.4-r3.ebuild 848 BLAKE2B f2f66c1e397f83cc424d6bb38e1e03df0281ad29f839a48e4ff547430191c00e6b9c964a478dcac96ad1553a647845de8d895eeda90deb05fd9d9f76427a4bf0 SHA512 b4f57afdee96f869b1654ee679e6c89dd6f25ad615c046bcf2387dd3a2698a8bc7faeff5ea87062adb3f99807985c323e1fb1b35c8ce6dd9fa75f2c8db157d09
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
index 9cab84c8f96e..6fad562646f2 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 021fe0a6019b..ead97301327f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,4 +1,4 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
 EBUILD libpcre-8.44.ebuild 2573 BLAKE2B 6ec9aaac5493ecc7f150bc9f85aa5932bdc8cdae20e98c7298510ed3819b802978fb7ed406d0c1885bbe24c649015c457f6b0908c91b8a03d4411869df4c0e65 SHA512 c0a9c49980afa9cdd46d45bffed17c7dd79d5f0d5941ee5d826b3dba8f9da3136cc4151a3816a4eafd2dbfdf9899065387d54f939f64d4d951520113d17c8964
-MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
+MISC metadata.xml 1219 BLAKE2B 633af3b60f5cd2d75585f1747b6d0233f5b5c46a182450777c55038a3e0da55b6bd70e471e4287267ba28b18af8bd9c9cd4f44a76415ad1baa2b5738655d5c86 SHA512 f012e32d3a8198b9ecb5b03aa99007c3a9a64652843071c6d106569ba9fdea4d1922c58f2e049a21217b92e0d3b32d264c5a4c41f4a84b0c2320f4f06deffcb1
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index edde7e11c64f..3572e85b8df7 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="bzip2">
-		Add support for pcregrep command to search within
-		bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
-	</flag>
-	<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
-	<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
-	<flag name="readline">
-		Add support for command line editing to pcretest, through
-		<pkg>sys-libs/readline</pkg>.
-	</flag>
-	<flag name="recursion-limit">
-		Limit match recursion to 8192; if disabled, the default limit is
-		used, which is the same as the match limit.
-	</flag>
-	<flag name="zlib">
-		Add support for pcregrep command to search within
-		gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
-	</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-	<remote-id type="sourceforge">pcre</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="bzip2">
+			Add support for pcregrep command to search within
+			bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
+		</flag>
+		<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
+		<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
+		<flag name="readline">
+			Add support for command line editing to pcretest, through
+			<pkg>sys-libs/readline</pkg>.
+		</flag>
+		<flag name="recursion-limit">
+			Limit match recursion to 8192; if disabled, the default limit is
+			used, which is the same as the match limit.
+		</flag>
+		<flag name="zlib">
+			Add support for pcregrep command to search within
+			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
+		</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugs.exim.org/describecomponents.cgi?product=PCRE</bugs-to>
+		<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
+		<remote-id type="sourceforge">pcre</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 42e76c0e4c5c..824ec35a3b48 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -3,9 +3,6 @@ AUX libprelude-5.1.0-fix_awk_error.patch 3243 BLAKE2B 2be6fe51c2edfd85b851f7080c
 AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
 AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634228898a951c2ea629c07a5df087f8998df27f532ea9d893df2b233ebb0dde094f1acd6c5bb7b95a6688fdcb5e805c449 SHA512 b35c74578a2e00358a7da8f7301f9c4d1055e53c99bea71cc3ef90020a93ff7d0d41f1cf6d3ea3a5c6fc18a3ca1bcc9ed0baafdd8110c1fa51db34e005a1c874
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
-DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-5.1.1.ebuild 2004 BLAKE2B 5d509f1c326000fcd93d19f603f1413601a350543b203c06d4c6188f3abd20210f10f40760e0eb6479160b6f845a8f2a3a480f3b659750bea9d2bb7acd0667d3 SHA512 af10845ad1ffad15ccf1b8812f9b16f417350f1900004b3de9aea2f43ae7353cd3e5eef7db022fa31bf7475e69b220f0c96df5bb45c6e715d5e3d2809c56a1fb
 EBUILD libprelude-5.2.0-r10.ebuild 2090 BLAKE2B 518d8b28c5fb2056510ba3f9c23046821ae6fac9883a5c9f10ae8484c12234a2639a28233b49ec98b36d239834dddd8f895df6cb45d46b65aa5ee91a88f18261 SHA512 b024355425efcb4a2a4746324de6d3bdc1087d03aa775281c8177bdf8c2c56bdf76647df7088cc5d2ff4c56a07e1bb336109117499089034b86aecfa3464929a
-EBUILD libprelude-5.2.0.ebuild 1949 BLAKE2B cc71788080540f3fae57b93c389f9230688360a0a897c13cd58702284174e5a1338f3d12f10935d3e48d1eef17baa5ca634d5028b3863436059ce4960c2f9f58 SHA512 e661a3cb6b158241288426b50995be8be9283fda0997d31d1551f9b8eb70e303e9ff525cafd620f47cce3f198f3a8613831c9f236bd4cdc90930838124bf8d91
-MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
+MISC metadata.xml 901 BLAKE2B 89514888f265a8205fbf95d1c84fe2c4f3681eb14a9c2591405814f9f0e3e5a58a47c2b2f08321cb10bc9525cd6d726624db9fa01633f3d4dd1409e41cd7fa1f SHA512 ad0d844567037c393112b3e3db375de0b9eaf517c142e2d121dc2459c960b0acc5e42d0511971ae5f5efcb338d93dd4b94c65048a8ca172f0369efa64f4ab895
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
deleted file mode 100644
index afc79ba5ace1..000000000000
--- a/dev-libs/libprelude/libprelude-5.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-USE_RUBY="ruby24 ruby25 ruby26"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua perl python ruby"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-lang/swig-3.0.11
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_awk_error.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with lua)
-		$(use_with perl)
-		$(usex perl '--with-perl-installdirs=vendor' '')
-		$(use_with ruby)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-
-	keepdir /var/lib/spool/prelude
-}
diff --git a/dev-libs/libprelude/libprelude-5.2.0.ebuild b/dev-libs/libprelude/libprelude-5.2.0.ebuild
deleted file mode 100644
index ee2d9adbb3e4..000000000000
--- a/dev-libs/libprelude/libprelude-5.2.0.ebuild
+++ /dev/null
@@ -1,99 +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} )
-USE_RUBY="ruby25 ruby26 ruby27"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua perl python ruby"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-lang/swig-4.0.0
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		--localstatedir="${EPREFIX}/var"
-		$(use_with lua)
-		$(use_with perl)
-		$(usex perl '--with-perl-installdirs=vendor' '')
-		$(use_with ruby)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-
-	keepdir /var/spool/prelude
-}
diff --git a/dev-libs/libprelude/metadata.xml b/dev-libs/libprelude/metadata.xml
index 1870d87272ec..87b35eff4b3e 100644
--- a/dev-libs/libprelude/metadata.xml
+++ b/dev-libs/libprelude/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 461dd5ebe8ce..a3ade8bd71c4 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -6,4 +6,4 @@ DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f89
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
 EBUILD libpreludedb-5.1.0.ebuild 1875 BLAKE2B 5fba769391866fc42ecf439deaede6dcdb2bb51c022bb56cc8c0bc10230cd7b7bd347ab078e63b2be17ffeedfac3dae2318043f2751e7568bae843f476ebf0bb SHA512 511e3fd42cf9157ef63dac60238550d0d7573c00450efe3b2acd3f90c556151ffb05f2e231b2f4a4f74e14064e0a5b05fb5202955244ce83d77ff4a67ec5e608
 EBUILD libpreludedb-5.2.0.ebuild 1902 BLAKE2B 70abf2f4c1a002049b36aa37e173d813679fe875eb3ae127c6e1d69bd2bf17a719f29c6700d9d4615fbd93939817b7a340ddf5e8b6869d26ded6b92a4073746b SHA512 ef0089648810af994210043f51c197a82323bde7d940b95de29140674755a0470308cc2f7a54b10ee7ca1975d77d0c7d13936bc0e90f03903872293f5563755c
-MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
+MISC metadata.xml 770 BLAKE2B 5765d87e951ae7d219fbd111582ce89679c8c0f501957b9cf0d8a33d98bc7a244f210e228203949efb5be2b7a07c12d91279c85b4300d4bebe579e20b40e7380 SHA512 604f81ca0cca54d7bf06e025756397e83089ab1c6ba652b59bf16f59bacee18e9c094fd7244d36b5fbf7c1d8f4123788bb7e89b596a6aefb407ebd91681c26e4
diff --git a/dev-libs/libpreludedb/metadata.xml b/dev-libs/libpreludedb/metadata.xml
index c342084aa9be..59228ca738d9 100644
--- a/dev-libs/libpreludedb/metadata.xml
+++ b/dev-libs/libpreludedb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index f1f712443fa7..25fad21b6f08 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 EBUILD libpwquality-1.4.2.ebuild 2022 BLAKE2B f6575f0a1b098d95c54920ed9ab83439cdcb03b3ac98ef070e2b6ea30711b5d14e4438960aca5ddbd7cb04d3185e48ff2424dd29b6e2c65eb8fe07229f814c94 SHA512 80134ec60d0241443c655d10a529e861138df9ac00d4d00511eec0967296bfd2caca7af916c10e140139f7f4b0a628d0083ad5266ba8c554d0ca873c821b4571
-EBUILD libpwquality-1.4.4.ebuild 2029 BLAKE2B 7911d2ec62e62d3d8b7ecd7f80c72cf8a6b58caee5bbffedd3337c8e1b0154b6a89c6b4b9d8241008b4061b127541da998a277ba85e1fb2c7a4758aec93e1bd3 SHA512 85ebaf35cbcee6d765afbdee263b3cebb16083b3da845b1f01ed555671e19d4bf5c4cda49c02a3ea499534414e777d4cfb7b91050862de191b2297bf0b326be0
+EBUILD libpwquality-1.4.4.ebuild 2027 BLAKE2B 068ec5a5c54c82ea7582466a015f012690fc868984d6837da4ac0fd1d349fe8783fad0dfe78d6faa76c863ccf9c586e1440ea298a4df30c8ce58b2fcffe8ae12 SHA512 50a65fe49ae91174c7e8be21de08532de70173f41d2b6b510695caf4e45f7278d0b68368596ae87938247673b1f948fb996e5e893617936d1b83deac99f873a5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
index a5e696de2b52..d9354232d9e3 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 1db26a6053d1..258a6d5bf919 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,4 +1,4 @@
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
 EBUILD libratbag-0.15.ebuild 1981 BLAKE2B 62022b004ff8a2441a51866da9d6ab3ab9d8e1b3a88896a86777bb7b493bd2433a7d5be56dab482dbd39cad34770f29277ec29758e3f00a83e9f57b0db5abe9e SHA512 e5ac7d1604a6cf49a71a1cf1b9e2812565a24235333134775e2b035336d5e4ee44225685bbc55e4abe213f6715dd9cb970c03efc0ceecb8d039bcf7dae5cde42
-MISC metadata.xml 634 BLAKE2B cc8a930132b186fe8acad18725ff2c621edd878cacf59a65491c3515061d5954bff2eb9be72ee0b3901aff82acb6aab0f88d814528a62358171a4288da2b38fb SHA512 6dabec3887b8958f6351c5fb7e33ee512bff8905d36d8002b088f02f0bf5474e97d33f017bb866b67cc6b6b82939fef25549625aefd87546dfa626bb596aa5d3
+MISC metadata.xml 623 BLAKE2B 9927622eaaa6c1dac2628439bf9b923ae0707fa6cb8d5ec7869bed62d8630d4ca10d9ed0f7a330e887fb4683467928c6280decbd6aa2f3fe25cacd24dec7425f SHA512 ffb3bae021b48df16e0a0123e0d74d6ba2152bdef2fc8e9512ec3218430b0b4090811fa25d9200a3868700b8ddb0cd2a59047765952a577b0315bb62c74944a7
diff --git a/dev-libs/libratbag/metadata.xml b/dev-libs/libratbag/metadata.xml
index f0fab9cd91af..65bf04aaaba9 100644
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>alex@1stleg.com</email>
     <name>Alex Barker</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="proxy">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
-    <description>Proxy maintainer for Alex</description>
   </maintainer>
   <upstream>
     <remote-id type="github">libratbag/libratbag</remote-id>
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index b9e0d2e4bffa..4f1c3f122025 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -3,4 +3,4 @@ DIST libsass-3.6.4.tar.gz 338519 BLAKE2B 9d312e36e1ac40dcce3aa29728e66643de28da7
 EBUILD libsass-3.6.1.ebuild 1116 BLAKE2B f1174691608a060b863409ac34e986c11bb93b2c303065ea39dde346b4b4b5305629f52a1c6ec1c9b76d602610148d51a8c3a2b9c4115ba6b9c342e46ad9a8d6 SHA512 3d47a99032af3fbdcd6542675c896d330c68c8d36f1844dc5425b3fc5601228a22283812fc0b0743a261e103dabcfc2bcb5b0fd4e30a2bb5ff6ca8812f93ea1f
 EBUILD libsass-3.6.4.ebuild 1128 BLAKE2B 33dab1e807300f7a942697f794b08fc72d1568cea92737eefbccdb878159e9eed49c091ca6f6045cf4d40c64bee1705033ca43bf844275febb08681af8ed083c SHA512 e0f1d76a0c2794f7b15d4d0c34d2e9a67854930f32ab4d02bab78ef6acd59f32e601dbbc3d2103c6325ff0735157af2968ba284c2e2d77c97c51e5aea2f91164
 EBUILD libsass-9999.ebuild 1122 BLAKE2B dd8f690a7536279a14bd0bd839c7db6d19e7b64d6541aaae28b546754039b77dc1f765f40792e4e06b5a12439a827da9b0f46ce2fa1ae026a718d9c4d3b26122 SHA512 4015051e835f2f73e19f78d2d6d65146d904cc1683432065fc13c68a3860767102e11aa5be5f13dd17260718e47ebff4bd92c0908a72bf95eea7966c433bdc13
-MISC metadata.xml 763 BLAKE2B cd9a87ffa0ec968701b492d614a2183df763b8bc36ef0b4851d72ea8c162d6c1dec3d0fce2e8bd95e38d606b6cd3fc958a25e91d5fac69d11a680fa75ff2523a SHA512 be3333cf53d2704b1959fe6012837d9220a8d076a5287795a802961b044dfed989b337014b938b96755a89b23e9c66b5f760f97f31d1a54c144cc34cdf19a94b
+MISC metadata.xml 793 BLAKE2B 9d318616476b39f9f833b523007453f4c8671157a2ea3387b51d01f9298ca01fdd58e31031549c587eeae8e4803753358716c02308219c6f37b0b4ec2c099f14 SHA512 8f746615d9a4b24721d8bba0964a54f15815866d9e1bb6b5890468a08c152b332fd02e81ac45eb3ef0c0b292e892f48d3db3789510bfcd500b936800d270be43
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index 47eda06e2ced..d97f05d217be 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index dad91f99a824..dd0e49231783 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.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c
 EBUILD libsavitar-4.8.0.ebuild 1753 BLAKE2B 693cea9194c410e2868e2f109d0cd31ab56c8140469be0fde64c6206847704ecddeb6097aacc37f5a1b5e067eefc69e0120f13fec2216364cd922d7ca616756c SHA512 bb7fd8bd856d2bea79be263a2ba827a47076342ae4b965f7cbbdfba4ed6308b820798cb503d914452984075203da5a1380e736aa68e25f0d962156631bfd009f
-MISC metadata.xml 930 BLAKE2B 281ccb868f40b79f50d43d4130b9fda9bfc17584d72d93c611dd6d6fc4958575a758fff7ee93e97c4a13ffff7bc6d274de95ee39dbfae4968101af10fcd024e8 SHA512 37071aff5de670fbc7353a103bccbcda393c0001686eec2662daa71d7b27d2eb77a73648a0d77fe1ae426067e4042d9fca20bf11ecb4a690a0caaf9114b048fd
+MISC metadata.xml 974 BLAKE2B ac8e144ae33fea171c6a64d8a04f1876a3a3145b952e285fdc3f0553b8c5cf9c03a36a3e3982b88fdcacf69d668b9df8d156292a687fbcb65171700517bcd772 SHA512 8ee0d54dc6f627e57ea7b980df32aab3fb49bf73888c0d69a91c9f8962df159d6145f19892d4b922e8fdd673dd489fa72f4f3128bb04d0089d4204a6f060d0b5
diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml
index ad6f0be797d4..eb8dd7c331a2 100644
--- a/dev-libs/libsavitar/metadata.xml
+++ b/dev-libs/libsavitar/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 516aa016311b..38903953dd32 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -2,4 +2,4 @@ DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae
 DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958
 EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
 EBUILD libsecp256k1-0.1_pre20201028.ebuild 1913 BLAKE2B 6fcca920c51a4cae6f483508575827cff4b00159610f3966d37ce1f7a87535e0e59ac22fe5a5172b49cb3597179fa3019f2a40136a48ef5dc76f358c54ca6c2f SHA512 e36565cc8b4c11c67ce2e10c77f7e486b41275828926e731d4b150aa0385c252a79121241bb2564ccce5d3adccc33dea6c8a580bda27d14209fd1d34d1d4dc26
-MISC metadata.xml 1338 BLAKE2B 684e4e3cf51fe3d273469c6f7ad5512846cca80c078de240e3a4d7183a87d355343bfe5517c1e3146651fe5d0eddc32c160f7dfa75b65caf42fc871f893b9afa SHA512 0465d73f9c61536ff3f3dae7e225c1a82080feffae05659e13edbb78fbd2615cbd2b91543c650cb8c24ed04a95138ffce1b2536725b1b093c50d15c50f54b2ca
+MISC metadata.xml 1368 BLAKE2B 25830c79e9859725ee995ee20c9a68a2de168ee0d9bc280b0111aa92c921a03ca72f86e8d327c1f2706e4cba5bd10d89d19e0d385db8a9d0851c4c9e184e220c SHA512 4818fb096c836d952a2619c4f63bbe02601f92c3b730121115965aaac50f6568d06e6d5940cd770a3e252dff30ce692b0805f4edf324f1cfe0cade504cb2c284
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 04c706ec1caa..6242c4f5e8e8 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index a069e6fb29c2..1eb78672a2b1 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -7,6 +7,6 @@ DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f3
 EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
 EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
 EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
-EBUILD libsigc++-2.10.6.ebuild 1383 BLAKE2B 2dbc16478c8ce5614f753fd7d9ff46d7bc0d40c8c2c46ca6694f60af39b5eeb080372716dc10f4e26983c2aa493f740bbd5efab33c38d22b1628ec9b20bd1873 SHA512 c036bf96d3cdad1a08254b48dbb6e8dfafd3f9ae97867e1fbc34c15b8c0716b031a1c64c5af6a3bd5b212014c88b2f9ca81c85a59e1144391967e73f58e143ac
+EBUILD libsigc++-2.10.6.ebuild 1382 BLAKE2B bad058d50e0b8a11d95cae3e972ac83a83adf152451e7145659b8a9030e2f94521948ab91baaf3649e3fc07e6a7e63e1c5a5f06a6a5f1decfda8cd3a5be57611 SHA512 594a6d430af8168b465f0939277ad050f2f04a5f3db686caaed45114184f6ca8844433d4cbd886b9624395fb4e633ba5d658d954e2b4d7e5cfac2b058bf7216a
 EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
index 151633b2c823..085db00084de 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 2c313bad2c3b..55fdba6cbf46 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,5 +2,5 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 DIST libsigsegv-2.13.tar.gz 460736 BLAKE2B 2202ef92e96b2b46d7496a69427159b06b0413e9610daa9bc035dd18f193fd650a06dcc5a2db3b36b6c68f95593f2da047579e644d5ca4e54bc17160a57dac8f SHA512 9c0cf01ee2a39f77f2e42eb06a2aa60644e10fe2cd39089de58f6206baf7fe7d61fe0ec6bf187276fcfccf61585154ce904fe374b474b7ba9fa050a61a2f3918
 EBUILD libsigsegv-2.12-r1.ebuild 759 BLAKE2B 0f1e96575db99253cb02f48d14a9f07918094b8a25db274b33e1ff07d5d35b50df5658f17426db1934f2aaa8ef6dd03ca03531d6f0c843b9ed46ed5da5c02ce2 SHA512 e7941e5ac2866276883a8fae1bd4191197ca52acf1aaaa242850dff627b80ed3487ce597e14e3e1eb626eb036bbf3898beac4f8900b256c9e8fc39fb8bf0baf3
-EBUILD libsigsegv-2.13.ebuild 794 BLAKE2B 296c0dedcbf752a532d3369052c19c3f77903ab77cbf6c629a6bcbcc492d05ccf3d6c4e83d6a8c5e55d11a3f2eca172a8fde7a1cc7502129e91da0f90fe660fd SHA512 290bb0db6316ae0945d994d2b8abe011a16dcfa71d0b3e63a6c3de5450d9fdeead59a844aafad08848c56dc8db69c9ba0ef98cad263cb2314769e8932da9c313
+EBUILD libsigsegv-2.13.ebuild 797 BLAKE2B d7a07942e11ffc9db6518450e738fe679175d6bf5191e6eaa2b78def3272877e5418f3c8006af7a6d1676bd7086f29e98ce8985f700c9b165bf3357a1c573006 SHA512 9f825cb3cff2b8b073eb34b571d8eebbd062cd1dd54a95576cb5e7936b5ba5776b8660d44f9544453a77d002909b48cb73f599eaa3e607fe9319dc8c890c0fd8
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
index 5db18ac2c314..2f6d0e7207e4 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
@@ -29,6 +29,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm "${ED}/usr/$(get_libdir)"/*.la || die
+	rm -f "${ED}/usr/$(get_libdir)"/*.la || die
 	dodoc AUTHORS ChangeLog* NEWS PORTING README
 }
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 8faf644edab0..d7161bbef80d 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -2,4 +2,4 @@ DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c
 DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
 EBUILD libslz-1.2.0.ebuild 1175 BLAKE2B bfe8a7e5cd3d96b435a680a6b041fe4f8902bf99238d82ad4ffac2c26af06f4fdd094b7070c12d92809c5c86068f7f9da08f0aad9e7d48fdf9998833dfd0de4e SHA512 e15a12f2f40ad17b8bf5031f0158c827e2584b171403b454635ce38e23ce47b7238c760ca9e1df3298f227c93e105cb9a01b3337bfa17673e75523f90b5e4f0f
-MISC metadata.xml 1176 BLAKE2B 912f2785a4418e9dda2014a1c7d9d8a47be8d38ceda9b56c45b5ac9ad05f5b0aa0793891d8436823ee1bb3a14f7f1239b15daa4ba1ee6dcf35c42a95e1b910bb SHA512 fd49087a1691173da56b6669a410d0db911b999fce1fba2536832ff13a8b4c7a304410fa5ba0f87b7587bdffab216b620ca5b8549936cbf21375139a402b771d
+MISC metadata.xml 1190 BLAKE2B 3c8dbe6e963dabd7705fdddacf6cce98672b5431e3b46d006732598fda8dcbc2682158b14f879a2214594180928c0d869c627fc368b5f4d7b49d413030cec705 SHA512 fe5c8467b6f39272f16662eea1b75eda216dd7395124792be1dcae59f26cd1b3b2b0688a2e57a2f24f668efc3fae857dd6afbc36e2dd19f800c2be0c2667326e
diff --git a/dev-libs/libslz/metadata.xml b/dev-libs/libslz/metadata.xml
index b70f04c44388..28546a3e4a6d 100644
--- a/dev-libs/libslz/metadata.xml
+++ b/dev-libs/libslz/metadata.xml
@@ -5,7 +5,7 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 09db209f2367..55fd0cdf270b 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.3-r1.ebuild 1233 BLAKE2B 42e8a58e18ac6557945848af6c9b61617dcf565d899c2f55dada0729797cabead916d31a9f66f60cff427876529b21ded41d8a0b72f2370e92ff10f6dbeb3066 SHA512 2e363b2e500806169cdc29bd4e7c2580251abe0242458581e7cffee7c8807fb503fd6824673f024829d48ec0d5e6d2ebe81b66b26f910f2bcdeba1c78b2697f1
+EBUILD libspnav-0.2.3-r1.ebuild 1230 BLAKE2B 1e5f6f08b13593ac30f36d4ee40d36b158e576f5ebe8ac9e9e14eeb96f76c1c8d476c51ea0c8f6204c65f6a6db84cfbd75a6e74aa6ffdcf1ae8ec0759ecc240d SHA512 a5cfd5f810bfe569ebfdb268023fde6c06286e2afa895ceb01ef7e2a3c81181873426626355adb63a0814f44b3365f5b31aec5a08018034fb4b3c5c2ac611e51
 EBUILD libspnav-0.2.3.ebuild 911 BLAKE2B 5bc75de1c7f55d63e56221fa2e0de3b468d391bf025a8d961d168792de96508dfda92019bc36eddcfcb69fbdf7b5fde085bb2d7385e01ef9e661d41308055ab0 SHA512 d7baddeca48ec813dad886a2724c1d7afb762b417a5b976fc21b6d1b386df01aaaeb76325960f7351a8e58743374e1a5dde1713463fa9dc3b04a7fcc8cdebcdc
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
index c5a626aac159..fab23cc86475 100644
--- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="static-libs X"
 
 CDEPEND="X? ( x11-libs/libX11 )"
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 48599da8111d..32c4ca270f38 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,3 @@
 DIST libthreadar-1.3.0.tar.gz 440695 BLAKE2B f4f08d27f6be640e44c9a3abb564c2f1b8faf5b10ec26931a77d6de9769b456e577902c8de378d6fc420e930f20a59081e6916e2b4aeb4f083e70a1565570112 SHA512 54257ebefa0473f78510a5add0241f1282e1f135037edeecc76edd0982b6cc279592ae86e1df263327e1e090b7905ab65847ccdc2afdd366c7bac5c3097abd9e
 EBUILD libthreadar-1.3.0.ebuild 933 BLAKE2B 95747b8fd659c15230863063b8a8eff254eca0f09297afcc1b231a6d033ef560f41fde2061f0cd129d0da40bf2830fbe7a89e71e48f1b39cb63757e1257abf64 SHA512 52edd7e75eb9a84a37fce263ac390cf245670ee017b0a69104fc5cf7e8d7e81a816587454556cc074073aaf257c8dcf3c619d8b6dd812108f2312f7fa8cf724f
-MISC metadata.xml 859 BLAKE2B be25bf21b05ec44dc5ba2c6cdfd33e942485a7cdc1a0378040130a9a0b4c1c60fe4876be144cb7185bd349c67e51157c0e740012346fa7bc908a4fa53db87889 SHA512 da0e98e9da10ec81ef56d26ac77f4e358acabb6931b7b09e146240f4a77dc4cc19cde62a200d81c491895cec674f71ec13ce96cb55331178198ad59f4e297ade
+MISC metadata.xml 889 BLAKE2B 461d6b835a6e98325f56d0287e302ed14e8cf2bd8ce16a918b2e2c041e7dccd39c62ea0426fe5f5b3ea40681077582cb130d816259d6b79ad8712e9b46bbdc48 SHA512 792b25f96d0107116a0ce2d2617356796052026aba471228e3c608c665c76f5f0319e38d6da2b5d0f4547ad6e31d8b7b8a1e9424a4b03f003806e1be5517a8b2
diff --git a/dev-libs/libthreadar/metadata.xml b/dev-libs/libthreadar/metadata.xml
index ff22d4ec0241..5220e1ff7cf3 100644
--- a/dev-libs/libthreadar/metadata.xml
+++ b/dev-libs/libthreadar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ceamac.paragon@gmail.com</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
index 538fb4cb8a99..05b61fc711a9 100644
--- a/dev-libs/libtimezonemap/Manifest
+++ b/dev-libs/libtimezonemap/Manifest
@@ -1,3 +1,3 @@
 DIST libtimezonemap_0.4.6.tar.gz 2872895 BLAKE2B ec9da9efe4f58cd7c3cd6cb502ffc23d1331f8b8352021d30c4157d4a6fec983702c049725af672136f332e450191e03bb0c36c752cbd496c37a7e0bf64c4514 SHA512 3cbd4f577684254a91f1e745ecb49e58fe3c75e28c172a6115fbe68e7868c33ff4c68b80ef1d7f5c759f67d288e29a2a057e00e1788a57c4e55e0cbfef351761
 EBUILD libtimezonemap-0.4.6.ebuild 652 BLAKE2B f3f93af66494931b514f8e43c13f04cf1085e1626cef27782e571f1cf0c0b8d7d8f7d3c3f661a694a1cdad204437695afe86a2e88201b437aed96ede845a9cc1 SHA512 cc7aa0f758630b0d4cc5c6118d41930cc6bead7783e77a755a9d14f6b3493ae6d11d14c57fb593c9e5d8abcaad470f773a33e587e992588028c84c16f79bc9d4
-MISC metadata.xml 453 BLAKE2B 0ddfa1215414fea50844dcf5a72a5de4af39eca0b275fb95cccef077ba2c3717f0fa94e77ab8afa30196cd9f8c668b06ca9d09b5ba0974507d6dfb5a740544b3 SHA512 b0cf55d87a8efc69b49ea0f172016de1d6d9ed3fa9b86fc3d9713a42d2a36b4886bb5973a352fe0ab4ddeec8637dfa61f85c536a367de0a38a5e164f025bce1f
+MISC metadata.xml 483 BLAKE2B 5d9cbf09b4f03be7edabab77a63ef1495645ab7f93c198ae78fd6e6b5b2ab6694ed0518ae659b3ca9603ba55675cf5ac005ae6d6564c112c3feb02ea04f0120f SHA512 a814d618586b1a8f8e595e2f31e117946eb818a6d65e35dd19b464a325f9df999481a50fd119c1ef8c412590f68a8cb2ab898c5b4e971885e62326868139799d
diff --git a/dev-libs/libtimezonemap/metadata.xml b/dev-libs/libtimezonemap/metadata.xml
index 3dbb34194df4..9aff9ced23ac 100644
--- a/dev-libs/libtimezonemap/metadata.xml
+++ b/dev-libs/libtimezonemap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 8d51e931b18c..5321bbb7da3a 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX libtomcrypt-1.18.2-slibtool.patch 2859 BLAKE2B 2af276b50dd627a7dab88b6d349c908a32b364b0cbf199d14ca43019a65c4ac47ec16f8498c22e27454ce0144286502253fe3434cade6a614c7f9162d99fb20c SHA512 f6c5a802a581971b309815f82416c649a388e853c143f849bf89478ca4b9d883b3ab426c4ab5bbd94b5748d5b466f6ec56336c18959ca1c3ef5396b5be8d2da0
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r2.ebuild 2798 BLAKE2B 1dc6dd3e1ea47b1f622163858fefb3fa79456d436b29f7b2cc48372772640025b23f308fd7bd26d36ad7b1e13db5e26c22869052c2ad90dba5afac60e7cb0803 SHA512 813e4c9f8d827d69c3b6a8d23c176b880501cba7cc25984d3545df893358fc55849fe21732781b946fbca8fa83a9f0f24c54423ed435259c69e0b6e79a351fd6
+EBUILD libtomcrypt-1.18.2-r2.ebuild 2948 BLAKE2B 6621119cf52e105c1fc2bb8d25558cda5e4411f7d06e9844bd7d2bb59f2799c50bd2c82f3642df701dcedef41d78bf9de8d218a124ca01a659cb34f1e946eb26 SHA512 00353d27023436f1d4154a6179ce17d74a1d5f342cfd58ff8bc4109c7841c97bbaa52106b5c337c0ac9000f25a4e6d0335653e0764c63ffe6ea165be2cb21953
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
new file mode 100644
index 000000000000..5c7bcda502c3
--- /dev/null
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
@@ -0,0 +1,72 @@
+https://github.com/libtom/libtomcrypt/pull/433
+https://bugs.gentoo.org/777084
+
+From ccc18b9eda52c31cc70a3e46eb33b87b3c076d65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@fredslev.dk>
+Date: Mon, 13 Aug 2018 19:20:37 -0700
+Subject: [PATCH] makefile.shared: Support rlibtool.
+
+When building libtomcrypt with rlibtool instead of libtool it will fail
+when rlibtool fails to parse the generated libtool which does not exist.
+
+Since rlibtool should be the default choice for most slibtool users in
+the future this patch will use slibtool-shared instead which will
+correctly build the shared library.
+
+This could also help build the shared library on additional targets and
+hosts where the stock libtool does not have shared libraries enabled.
+---
+ makefile.shared | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/makefile.shared b/makefile.shared
+index 98ec2b501..c72f2ac8d 100644
+--- a/makefile.shared
++++ b/makefile.shared
+@@ -16,19 +16,24 @@
+ 
+ PLATFORM := $(shell uname | sed -e 's/_.*//')
+ 
++ifeq ($(LIBTOOL),rlibtool)
++  TGTLIBTOOL:=slibtool-shared
++endif
++
+ ifndef LIBTOOL
+   ifeq ($(PLATFORM), Darwin)
+     LIBTOOL:=glibtool
+   else
+     LIBTOOL:=libtool
+   endif
++  TGTLIBTOOL=$(LIBTOOL)
+ endif
+ ifeq ($(PLATFORM), CYGWIN)
+   NO_UNDEFINED:=-no-undefined
+ endif
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC)
+-INSTALL_CMD = $(LIBTOOL) --mode=install install
+-UNINSTALL_CMD = $(LIBTOOL) --mode=uninstall rm
++LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
++INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
++UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm
+ 
+ #Output filenames for various targets.
+ ifndef LIBNAME
+@@ -49,15 +54,15 @@ src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c
+ LOBJECTS = $(OBJECTS:.o=.lo)
+ 
+ $(LIBNAME): $(OBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
++	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
+ 
+ test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
++	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
+ 
+ # build the demos from a template
+ define DEMO_template
+ $(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME)
+-	$$(LIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
++	$$(TGTLIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
+ endef
+ 
+ $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 134002447d9a..ba054acdcfa0 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -20,6 +20,10 @@ SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="+gmp +libtommath tomsfastmath"
 
+# Enforce at least one math provider
+# bug #772935
+REQUIRED_USE="|| ( gmp libtommath tomsfastmath )"
+
 BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -31,6 +35,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 mymake() {
 	# Standard boilerplate
 	# Upstream use homebrewed makefiles
diff --git a/dev-libs/libtompoly/Manifest b/dev-libs/libtompoly/Manifest
index 09969f6ff411..bcfc449b0327 100644
--- a/dev-libs/libtompoly/Manifest
+++ b/dev-libs/libtompoly/Manifest
@@ -1,3 +1,3 @@
 DIST ltp-0.04.tar.bz2 171966 BLAKE2B 748fd04d55bd3dcdcd9510de1e34e2b9d96c38fc4f48c14137676f60c6d89751e8a095e07687d368d9a46e49ed056484cf8971e96fc400cde15b254a7374c38c SHA512 64a0b25eb058fc2475e6c645138729796099081ad7e926b58d2e83468d988048607e26716b4b669f0e923ea74d4d9705ff5a0466eb41cbe160488d0173447234
 EBUILD libtompoly-0.04-r1.ebuild 686 BLAKE2B f6276e6bc9d7b22b4a0b7bd7251505a7c57e1eeffd09b42cfc2d0455a58d08ba83fcc8b20e04cb596cd657c4c22702c2ff61ffb7f6532660f776ad8d3dda0fbe SHA512 6f1cfa6866ac2470764ffca882936ea6c58e3582fdfb81281c7710e46c91ea942f6c6fe30335b07d27a595d6a36913b2c8225c47e28a9255a91291af66c6ed30
-MISC metadata.xml 1004 BLAKE2B 3a2e6908ade2ae67d90b417083876855f6883dc015ed9a81d3f73dacaf5f9df8e0da0dfc0b732ed1550d7bdd739f3eaa136676d939bd1331bfd4f54acc2698dd SHA512 f11dff1fe992edabb996248d3315e020fe1ef8ac9ee429de47522e292f77e00b4772bc61b985681fa12b295625c5cc9251cc8022de5e444840afbe93fd482cfd
+MISC metadata.xml 1004 BLAKE2B d86d81d29c11a770df1762f2c2d3117fbca74d70c91f0a14148d40d9f0f96cbf991a17187aa1991a9887f3dd2da6cb37c070da413d7d417809cd438412f990b7 SHA512 5582a5f0f3509150e65dc6059c000a32dd7e13e9335530934a47d3752c8213288048fb1c19cc4350877289181fca23c42f23e20fa56b2d0570bfb737c3bf752e
diff --git a/dev-libs/libtompoly/metadata.xml b/dev-libs/libtompoly/metadata.xml
index a4b3cf633bd1..6f94cfb2cb6e 100644
--- a/dev-libs/libtompoly/metadata.xml
+++ b/dev-libs/libtompoly/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 4dba74baa762..ca93a396357a 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
 AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
 DIST libtpms-0.8.2.tar.gz 1253915 BLAKE2B 48281512f2611376f0f3a67a2646fdc406c2d28bfd560a07b23c122a1b4d68c2840c5cd23f41beae4a13eab419e722aed821cecd919ae6219da325724d55e3b3 SHA512 635f1b30265f1752602caefa1fa87f0032e4d38f1b7113137b7e25a85da10e34f89f9d928b960660e9451306807f111ed96c2a11cbb2de4fb4beb7e638f83727
 EBUILD libtpms-0.8.2.ebuild 1253 BLAKE2B df095e423e0020bd75c7507eb49802b077747ee619ff001664905f70f41540fdf93fb485c2cc4095ef77ae5253423bcb07913ce7b4332d2360fef35d29abb305 SHA512 96b9caf1d2c761f93a98926a16edd6be5ec828d4c45142bb1c9bf3de878203af9ef9e952edf405b9864c3ec2f4e041b7e8351ac9875760e7fa5758dc4009a69b
-MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
+MISC metadata.xml 399 BLAKE2B d3c2e40efe608d0831d27d53513a7d32564f16af81293284d17c5620f6be10ad4d2cb7192ff7eac4e7a3e64570e0a12c753b04e6d356e203b9081efca779169c SHA512 cef8835ec1f1c5fec60891f10807ab9687078b75380da019142fd02b878db4e73928155749ed9c7128f57ea907814f81d14e0340c79f4719b0b56b8b77bbe45d
diff --git a/dev-libs/libtpms/metadata.xml b/dev-libs/libtpms/metadata.xml
index 6ddd104074b9..f2b95e147157 100644
--- a/dev-libs/libtpms/metadata.xml
+++ b/dev-libs/libtpms/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index a108be94dd75..c062d0389ea0 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,6 +1,4 @@
 AUX libtsm-4.0.1-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
-DIST libtsm-3.tar.xz 293264 BLAKE2B 51044f5e7be2269e1b3f40b04aa486f30a3a496d57d3aa64f25b148edb04d8e039dafbe0df32d0557f4c3a21da52bb53be146fe57d84d4e8201289c3bd347d95 SHA512 119834fd6a84489cc7904bf01905c29004901ddf73d6dc4a1f47f6b402ad76f65cb4226eaa718a73dc06694b1524647eff6046894fd9526a8588eed97f6f68b6
 DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
-EBUILD libtsm-3.ebuild 356 BLAKE2B 1c9e1a0808e2dbc01543b0258d1331be845381860775515add11a7b9def7da590ec0e96e2b1e44abdd49c1f722b4a1a239fae6366ba688ed766344fbaa615226 SHA512 b1f5eec9d9b0fcf1eb9e090b700e41d462db9f28ec7d005b22aed699ce1f494b09664b9223d715f4a571f401002337f700d041a529bd8c0b27ca04b48c790f38
 EBUILD libtsm-4.0.1.ebuild 403 BLAKE2B 1ff0cda94f29dfaab48a2bffc79a0188375676747d49d3a8871ab84ba19b9cb059ad87130f3f83b96033d4b79b551235caab02c29a7700ec8f87e03b3a0493ab SHA512 41201a25eb3c90000c04fa18a981efbfe983eb5eaaf90544533f04642acbfa67d93264f71df563ff07612a0bec9841aa69f9fcd116df2c9a07e6089731a6f19f
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/dev-libs/libtsm/libtsm-3.ebuild b/dev-libs/libtsm/libtsm-3.ebuild
deleted file mode 100644
index fe129ccf2169..000000000000
--- a/dev-libs/libtsm/libtsm-3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal Emulator State Machine"
-HOMEPAGE="https://cgit.freedesktop.org/~dvdhrm/libtsm"
-SRC_URI="https://www.freedesktop.org/software/kmscon/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 1b15c12de841..e2c6cf5fa47c 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -2,4 +2,4 @@ DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722
 EBUILD libucl-0.8.1-r1.ebuild 1243 BLAKE2B 3a846ca9e36f8569185d9a92e2832b3569cc19f67aa5f4aeeed721c05e18c8a156759e778a81fe8d810364f1a1e77963d6896133d4a3c2cdf2e8f548d68267cd SHA512 a0b9f074d9539f5274ad98acff55ceb14ed823e6f6ae7fd2aa07e26855044857348e0e78f282b5de0e5c29b858d2db9a257101219e2a57f96f0e81d9d09bf5b6
 EBUILD libucl-0.8.1-r100.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
 EBUILD libucl-9999.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
-MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
+MISC metadata.xml 985 BLAKE2B b7b4f33a1c6a33751f246190f8b38cfdce778e37c70321760c173b61cfd1f8bbdb811930a8ecab46a3764e2f77f8908cda79e395885b322c8c3c599da31777b7 SHA512 3546d93841d932f75cd5352a4c06ef63ae30a106b7b44a2e2cc6bd99a0b703b1e2d5010671b46d29e7ec26d571c6f6f9c788e6f22a9a0a216752988559823aba
diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
index b357b63e2e53..2b33adb650d5 100644
--- a/dev-libs/libucl/metadata.xml
+++ b/dev-libs/libucl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <longdescription>
@@ -8,11 +8,11 @@
     UCL objects into different formats such as "nginx like", json,
     yaml and compact json
   </longdescription>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index b58224dca997..272c42ed082c 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,7 +1,3 @@
-DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f
-DIST libuev-2.3.0.tar.xz 247932 BLAKE2B dea136cbd34788b7156a5ce1b8390467fde77a21b6fb4c7b27068b87254eb42034579bcaed3228dcfacd00b320668db915557230ebbb8da9487ade2359a5fabe SHA512 dc6cd2d1df5336027d8df77fda17b9d9521d955ffa013a5e83958d6b4f981f14f5b0caac3e68e4fa4a8a00bbe8001a18de54ebc441b4231a2d17600c762f80d2
-DIST libuev-2.3.1.tar.xz 247596 BLAKE2B b2d6a7034aa27a80c17438e4329cba59bc4f047b2879662f9900e886f13a948f2c507732d5c5a4abbb130e42af9ba8a935724d1542f3c929a60198889ac7cce9 SHA512 bd463604a89f5bd3e749375f450b376ed1d57b1195b69a5bcfd247fe92c4d42d245bbce9a7950f5aa5a13ce75abeeee028073b7d4356b7770d8821aa501113a9
-EBUILD libuev-2.2.0.ebuild 543 BLAKE2B b63dd3875a0e0f905ac84104f376dd4d3a2770f9a7cef94a99ed2585355a48c7aec38045dca593ab9be767a33ed77bac595200cd946a5a16b3bf21f707871094 SHA512 d0395069771ca607246ffdd995fa45080f20dfdf1012a27296354b254d9d7bb16cb7b469d2e1ad5b7412fff61848985016eddde3bbe6e0eeec2895ed01c21f32
-EBUILD libuev-2.3.0.ebuild 533 BLAKE2B d65f03a5fcb2abd1038257e0473d47877c96e0a5000a1f2e422f6db8fbd8bbf9f3afcbf2eee3b68581a7a348b1ba6215265c6f21bbd5ece68d50761e104758b4 SHA512 aa6855e9e93ec7b9c9215e2a997d6d72cee1aa82edb454c1f4e57b098f2134a5f68d69a38183ee3dbabd5ec92490abe1dee21c5fea2b0b465c7b1807fcb60254
-EBUILD libuev-2.3.1.ebuild 533 BLAKE2B d65f03a5fcb2abd1038257e0473d47877c96e0a5000a1f2e422f6db8fbd8bbf9f3afcbf2eee3b68581a7a348b1ba6215265c6f21bbd5ece68d50761e104758b4 SHA512 aa6855e9e93ec7b9c9215e2a997d6d72cee1aa82edb454c1f4e57b098f2134a5f68d69a38183ee3dbabd5ec92490abe1dee21c5fea2b0b465c7b1807fcb60254
-MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
+DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8
+EBUILD libuev-2.3.2.ebuild 533 BLAKE2B e297873aed1f8b6a5ea88ce5ec898c84d5cafe842d339059b0fc2b6e3848dea72cf1742a9929ef5011e56d392bebf306985fc6d389028a30bdea70bfb0502b78 SHA512 c98bea1fe2f67802ed97bc01d622eb9aa56ca480d9ef896fc6c0d5e7f30c368bea2afa23f0d3dd4b45186b62ec028cc888f12ea0e39fdf00b6ada2d7cba08eef
+MISC metadata.xml 727 BLAKE2B 82955efcfda4e0f1e3e82f3206432f9832e4844b0c68968cbc143bd9a68d83f90ccc574a647871313cf489787d24f266c94d269725305062c4e92cdd584533b9 SHA512 b6ecc3f2878e73950cb6e8d479905746705fc63b366c995a76a1af2df285bc471cf7d891ea54b857c35738485c4394c306bdfe1ad46c57378b261b7a78f3971d
diff --git a/dev-libs/libuev/libuev-2.2.0.ebuild b/dev-libs/libuev/libuev-2.2.0.ebuild
deleted file mode 100644
index b5c9b2d941bd..000000000000
--- a/dev-libs/libuev/libuev-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Lightweight event loop library for Linux"
-
-HOMEPAGE="https://github.com/troglobit/libuev"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf --enable-static=$(usex static-libs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
-}
diff --git a/dev-libs/libuev/libuev-2.3.0.ebuild b/dev-libs/libuev/libuev-2.3.0.ebuild
deleted file mode 100644
index c4a3bb57a119..000000000000
--- a/dev-libs/libuev/libuev-2.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of useful BSD APIs"
-HOMEPAGE="https://github.com/troglobit/libuev"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf --enable-static=$(usex static-libs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
-}
diff --git a/dev-libs/libuev/libuev-2.3.1.ebuild b/dev-libs/libuev/libuev-2.3.1.ebuild
deleted file mode 100644
index c4a3bb57a119..000000000000
--- a/dev-libs/libuev/libuev-2.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of useful BSD APIs"
-HOMEPAGE="https://github.com/troglobit/libuev"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf --enable-static=$(usex static-libs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
-}
diff --git a/dev-libs/libuev/libuev-2.3.2.ebuild b/dev-libs/libuev/libuev-2.3.2.ebuild
new file mode 100644
index 000000000000..4aa8d00bd3fa
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.3.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of useful BSD APIs"
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libuev/metadata.xml b/dev-libs/libuev/metadata.xml
index 55df3087918b..57c0966a0175 100644
--- a/dev-libs/libuev/metadata.xml
+++ b/dev-libs/libuev/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Oz Tiram</name>
 		<email>oz.tiram@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 2ffee1062e91..eeb55d91a38b 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,4 +1,4 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libunistring-0.9.10.ebuild 987 BLAKE2B 64cbe13bec1cf1a2cdfb1679dc83e6378b692fbe81f9386828016bc11303de83495984937bf358cee523787533fad7d504d168cfb71a2bd1e226c839a65ad077 SHA512 970a529a6c7573c98bf9cc68af5966b68d5e5a8fbb78cf80c065cf6b7bf6dc90942cd2840cc895d96916c6bed3fa7b81ae6af73516b819e1d65ee764658b764a
+EBUILD libunistring-0.9.10-r1.ebuild 1001 BLAKE2B ed9d0bf1519676081ff0865427b23df5dfce37e864717b63a99582650817ce583a5e8562404a8fa9cc80738f18647dce4d868ca9060718640773c7a7e8332c35 SHA512 2cb5a118ee0b1bb80b874ee6a89a00b3e847934a4e53e80119cd198ad3eac5e04581e0c0e943d1fe76f6012c92d4f3c001742a6056e4e0e832a4cac5822ff027
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..521b7e2ce71b
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-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="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	default
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+		doinfo doc/*.info
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
deleted file mode 100644
index 4a9014675627..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal libtool ltprune
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-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="doc static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-nodocs.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared libraries
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	default
-
-	if use doc; then
-		dohtml doc/*.html
-		doinfo doc/*.info
-	fi
-}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index e990a5c50fea..795c6e964757 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -5,4 +5,4 @@ DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df82
 DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
 EBUILD libvoikko-4.3.1.ebuild 1246 BLAKE2B 48e3376a16b900f9313aebac627bb2c94a34841cbc9c8c86b73d4346e9b8677e277c4c1b248365644ef93f4d9075821ac5d497f908d3299ccda8bffa46187cff SHA512 6e0fb734888ca763517f376886ffc255d6b4813c66c8dd4037d97e890153a296c8fbf684aa99be98d68945f7e2d37f685e25f913f9aaa795149f03712c25a444
 EBUILD libvoikko-4.3.ebuild 1235 BLAKE2B 3887dfa49f9c0bc1d62a52e4c38dcee8b64131538f3687ca6722036de2cfaa4233507a3a36f375660ac7693fd8760f3c354584002412b90987ad1eca3a3e1de4 SHA512 112c5a28dad525cda883157251dfe3bead401c834ac49c7ef7ced715d585432f8896bfc544654d01e17ea55fa7de34d00ad13ab994e2778e5fc6f4f9da58ea95
-MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
+MISC metadata.xml 419 BLAKE2B af90ea5ea311d4352bbdfd4852f71dc51564f7f34cd088b8b77016b5500a468d37c4ca6c1cf38ba4e091e8adfaeb5a8051955f189c4855963a4fd6c5b4523ef2 SHA512 8b84aa16876a8aad7bd8bcfd588ff4de660dcc4ec9fd5d07f22d513bfde4cac278992cfd619a5d556256adbc4b00bb946448feefa561fa99e07da2181b121a88
diff --git a/dev-libs/libvoikko/metadata.xml b/dev-libs/libvoikko/metadata.xml
index b61e52b54ad3..789282a1ba91 100644
--- a/dev-libs/libvoikko/metadata.xml
+++ b/dev-libs/libvoikko/metadata.xml
@@ -6,7 +6,7 @@
     <name>Joonas Niilola</name>
   </maintainer>
   <use>
-    <flag name='expvfst'>Enable experimental features of VFST morphology backend</flag>
-    <flag name='hfst'>Enable HFST morphology backend</flag>
+    <flag name="expvfst">Enable experimental features of VFST morphology backend</flag>
+    <flag name="hfst">Enable HFST morphology backend</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index b864e258edaa..8ab6844fadc1 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,7 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
+DIST libxmlb-0.3.0.tar.gz 112097 BLAKE2B a1046ee5c940dfd23a7e3cc07c0deb2be0f18fd416c13df7f467ce98308239191788a1cf18026593862c04645486f4ab332fe71eb96dc5e5abc7909e61451cf0 SHA512 28731c84cab0b1164fc08ea751ee7da22b8f4f278c4950a2d5957cc0dcd4457b6ce47dace25dd7c163a790b7ed2619dd6b4863f8147dc201c18f3433990af2cb
 EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B b7c684f7643c068f1394e5faa8c13e58fbe7920dcea85ce0dd523bea99fa97370079b9162eb7818aaefb820fe0b7d6a650c8cc50d2469b84ff0415a6dff73c61 SHA512 2fa73b4aeeb0aa9e1845741bb0ed6d523adaaba4f8269a398cf59ecb756c65e77acb9b7418a876b453c42e68fcad9b814d2d007ed66f1d7067ec8044161a5cb6
 EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
+EBUILD libxmlb-0.3.0.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.3.0.ebuild b/dev-libs/libxmlb/libxmlb-0.3.0.ebuild
new file mode 100644
index 000000000000..a4cc4b2a152c
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.3.0.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_{7..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # libxmlb.so version
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 40ba3843d76f..ddf6f3242df9 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1004 BLAKE2B 8347e5f23e8a3dc4cb453b1dceb3387d63eed5e1920c71c31b2016df90179b3a62ac37bcc739504aed103aac54b50a454062c291203be87abe90b9985979656c SHA512 e23502bd9e1179814f721f6b1463dad01aadd3ccad2ee307b131caa980bec3e30c057038ae1844e8044dc2bf9341d544f855f8f37fed321d60607bd92ff3bd4c
+EBUILD lzo-2.10.ebuild 988 BLAKE2B d06aff3d78112ba066f09109489c5582de17a5052eb8d631103b4bd1ce82be0ffa4486a0bad083e195b269a80f0354fc16accb28da18fbb6f5a6622298ec94dd SHA512 3eedc944b7bc9fca864af2e310edc0e0daa834fed62958c8156189f33e640ffed4ebdeee93e052b8cf032461d30fdb66ce172b9dac2ee06241fd899d7f4d11be
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 2cb8231ccd65..b7fc48293da7 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.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 multilib-minimal toolchain-funcs usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="https://www.oberhumer.com/opensource/lzo/"
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index fdadd2c89556..b0e3b2fa520f 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -4,4 +4,4 @@ DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373
 EBUILD marisa-0.2.5.ebuild 2262 BLAKE2B 4b59b590907a1ce4426142ad0bcf0770e048f9cc56d41802fd44f78b1827e98feac6cb4391c58d6ad77487f391759adfc824d011592737fda04af10963e6f5b4 SHA512 cabdee55108d6d1ddafb9df2ba684da1ee838a99ff9f8bd7a5df5e4ae4341b20a84eac98ae9b0374db07aef1078040d6591e4310f184ab48d22ec8e1f2bbae1e
 EBUILD marisa-0.2.6.ebuild 2839 BLAKE2B 6e6683511ab508fc6cccd4b5210de25e8fb5bfa24c3a127e1bcb4d6b51ed44062c96ff9bda4d6444120d881bbc576cbb8c937eda5c3917939ac804963ea62f0f SHA512 6926ad3a1ea05f70aba5611de8d02e0280fd3ac934e3127629b70358e083d9bf106b65f64c1abacd5b3ed94252e37dd2145fbed1f52f40274d34f78e6f88d888
 EBUILD marisa-9999.ebuild 2796 BLAKE2B aae358f1d13901cad56450e9173f8934fb690fa45ab154d39414830cce1755b320e106cddf6f1629c9aa1cdc1b2d822364ab7cb113423b8914c1e4f53a1cea07 SHA512 f0820a5257e3724ba8ec665187746f5a22595d0f07e6218b7ffc70608b1989dfa762fbdbd5f045479432ccb1df671d39a6e1435fa765fa96fafcb709fe7705a8
-MISC metadata.xml 451 BLAKE2B 8aaf9cb592f2321adf8248800f6000e3988d55bacfbd8f880d3de788867262d921992cbdca3c449e2b4b2de7ecc152eff329cde05e54bea538d8fe0676d97e4a SHA512 d92d8194b791437a0e17e51f5678f852fc046785b495ce3aa95ead02ddd80d07dfca9d7cd7b43d0f061c9d4d0d45ca42852e0563dcef71204d352f977a78a6bd
+MISC metadata.xml 465 BLAKE2B 7e3cf178e0635e628f362132ffaa3e8183c8a74b322624441137e64182c3a15c7fa28dea8c65c006589cc34625ae0af3da6569206f716faeaa6036e32f1aeb7d SHA512 5f36a2b6288061acf03f9d216e49d3368cf7d0af9f78d5d21f71dbc7e40bcdc4bbdb861e60cadf5c94f28978c5da62e4bb5c2b69b16a140cf5aee0fa8ab0df8e
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index f8feae5e9c20..098bb0534b38 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/dev-libs/metadata.xml b/dev-libs/metadata.xml
index e85537c9b212..9b84b9e34fdf 100644
--- a/dev-libs/metadata.xml
+++ b/dev-libs/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria dev-libs zawiera różne dodatkowe biblioteki związane z programowaniem.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest
index bea1fa98232c..54297f67651d 100644
--- a/dev-libs/mimetic/Manifest
+++ b/dev-libs/mimetic/Manifest
@@ -1,4 +1,4 @@
 AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63
 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58
 EBUILD mimetic-0.9.8.ebuild 951 BLAKE2B dea52f7d511ff1c0a11752477c2f94e7d547c3f425a64e46cb590efaf116f917d4d8a984035395da39a11959b1f844c3065a2c0a9f4c1cbff34fb5f4a5729922 SHA512 897f203937ee81452058c6acc1e2b703968a376a10d06b1fd0c9ef12502a13bd62ac63f9e005e757af383c3e197a00cc72f137b08c0b71053d9f7a589b601d7f
-MISC metadata.xml 293 BLAKE2B 34185556fb4bbb3af0e496075cd2422d5025f963a30d168715dfe6b941562ba8c3a734b975fce56b7078f6013c5eccf71b004d074beb7db11a4370b3669bde66 SHA512 83880131b4ea4a31515c133e27dac9deb71563c05baafbade66750aa0d00404ab51d42cea9dbd3f8774a36f3464c06e812578aca7fc17370507a9c74f4849fc4
+MISC metadata.xml 307 BLAKE2B e7b916fd70cef60506087b468d421ad3f2e4858de12815eed8865c4ef02af911c1e06621f81abde9cb88c50763d0cce7f210e9348dba5cb37dc850cff3817059 SHA512 7dc1a2417c2a4a7eb521af83ee15b9fbd50a6f28aa178c1c3bd78d34bc77006aaee58cc6994ede664b4873cff656ab63da5f852cca152f52c7307d9f5172ac9f
diff --git a/dev-libs/mimetic/metadata.xml b/dev-libs/mimetic/metadata.xml
index f15aa1f11854..0f8f01bc86f9 100644
--- a/dev-libs/mimetic/metadata.xml
+++ b/dev-libs/mimetic/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jkt@kde.org</email>
 	</maintainer>
 	<maintainer type="person">
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index b77d6f4451bc..aaaae6912b7e 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,3 @@
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
 EBUILD npth-1.6-r1.ebuild 607 BLAKE2B 6a0b84ecd916c60634f777d8afa145041643995c294b784359f1a6b6e5fd7d4b1b6fcff5b140af155025236f3966ed9cc3390121b35bf62e0741b6bf3eee2df5 SHA512 95fe303819ddc70c039ba912eb34eecc1f088d8a31230c37bc66d5841b49b8bcb049d468fe201112901ee5e01e01b3d7b11d2e22c813db24360803a5bf766959
-MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 9654d1c22bc0..6d821181d635 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index c1a03d703bf9..b47bf5ae63b2 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,8 +9,10 @@ DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7
 DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
 DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
 DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
+DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
 EBUILD nspr-4.26.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
 EBUILD nspr-4.27.ebuild 3904 BLAKE2B 24d7d9a95cb45cca71357f4f8adc5d7f1b04f2eddb3a36df4ba9ec078d6ec0eb1155157d30f83d3ea01a2ffb6a447266386ae54c838af8535698a1de17061831 SHA512 d8c2002a06f296b3937501637d2de6fc6dcb11fd23f7fd0e83c91b3574751169b91c074edcd63747f94911207a7ef8ea2cadfd8310df34759391191974eeaf78
 EBUILD nspr-4.28.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
 EBUILD nspr-4.29.ebuild 3896 BLAKE2B 8adfe2c29c34d2c67ee88bdcaddb57b7b5892ea9cad4bbe811d8c24aee0398da8678ea036ddc04aa6f291f0b241346ea567d4cbb125002876e2bc71aa1414e5a SHA512 276ce63679d11ae47c2734144c10386dbe227ef8cb703b7f7689ee471e66c5604426dfddb2edec4d2e7459edc7f149b81442adaa52b23ed0e28b83a7e14b4411
+EBUILD nspr-4.30.ebuild 3905 BLAKE2B beffe244b6b9b998f3b2dfd58245deb316872b38e341eb5eea14400d2cae82609b6b369ff7a2409d3ffa3c3a62ea7bee155cd90396a57604517bda50a8236af4 SHA512 64ca9f3d0b72e8002dbc6cb4e303055ac394cbf4db3e953b2ca0c96b66433aa99b818fc711d62cbd62344d8338430cd3f132b7e1cc5303937faa30bca57a02d7
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.30.ebuild b/dev-libs/nspr/nspr-4.30.ebuild
new file mode 100644
index 000000000000..e6c6b0dfafd2
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.30.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="https://www.mozilla.org/projects/nspr/"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.23-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+
+	default
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	else
+		elog "configure.in rename logic can be removed from ebuild."
+	fi
+
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index afb6432c2797..c9348020ea5c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,12 +4,10 @@ AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
-DIST nss-3.61.tar.gz 82034245 BLAKE2B f04dd0dd79d44abd335799ee53bb2229ab0c65f5b9d5bf5b61e49fb33ae2eb5c061c278d5e03328e697a6f0f461411ca35df79afb9ab51df9b555cb410c0167b SHA512 b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
 DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
+DIST nss-3.63.tar.gz 82167087 BLAKE2B 3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9 SHA512 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD nss-3.58-r2.ebuild 9243 BLAKE2B d064a59fb9780ffa37454397ff738b4ba91ceca46d98facfd9e2fff2f73980280a3ed06bc02d5ea8ba6915440c4cbf697006484cb5580fae8b16472230f01186 SHA512 ebf3a0df5de6170fa14428bfeae73d8a34d02bf010c9cac49d9edcfbc3303044dde0bd28d6b330f327a9f4f7e8cf9fe2b7b1fad8dba19768fbc51aee06ceaac9
-EBUILD nss-3.60.1.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
-EBUILD nss-3.61.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
 EBUILD nss-3.62.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
+EBUILD nss-3.63.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.60.1.ebuild b/dev-libs/nss/nss-3.60.1.ebuild
deleted file mode 100644
index 22ec72ccc32c..000000000000
--- a/dev-libs/nss/nss-3.60.1.ebuild
+++ /dev/null
@@ -1,358 +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 toolchain-funcs multilib-minimal
-
-NSPR_VER="4.29"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.61.ebuild b/dev-libs/nss/nss-3.61.ebuild
deleted file mode 100644
index 22ec72ccc32c..000000000000
--- a/dev-libs/nss/nss-3.61.ebuild
+++ /dev/null
@@ -1,358 +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 toolchain-funcs multilib-minimal
-
-NSPR_VER="4.29"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.63.ebuild b/dev-libs/nss/nss-3.63.ebuild
new file mode 100644
index 000000000000..5e3240e8db8d
--- /dev/null
+++ b/dev-libs/nss/nss-3.63.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.29"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index f70b02cb6f7f..1cdadf12b5ae 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,5 @@
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
 EBUILD ntl-11.4.3.ebuild 1618 BLAKE2B 9752c09cb92a1389910f53a49c1cc882f35f0627e622745a133b1697948d87197ecfdd322347feeebee1d280db45ec7e3d842b13ed368da1f559f860a500d5d5 SHA512 d32d3fc780fed344c5a9c01548de12d1326c9a7842dab8831dccdf39447db7a94ccd88df59484d79210fc1b647f8abfc0106238a4a5c6aa336b0ca8e558e1fe5
-EBUILD ntl-11.4.4.ebuild 1651 BLAKE2B b8f435cbca2e1f42d80a9dccfc47efdf9ff0712e8782c77bae4694fbe56c8c1e577e549c7a492add309dd79b0d438b4d36327dc01e0899897542b5d817677f07 SHA512 d753b41b5fe2986d1a822b2c131e7f65d5f04898c85cbf34a5abdbefedfcaa6cc99369665cd5ba932618a6f9bde96723723a342ea2b3d73362210df9b8eec635
+EBUILD ntl-11.4.4.ebuild 1707 BLAKE2B 6ba902c94e587f24bd4746e9a5226908755ad3d640ebe8860d56075af1c78555ae749a4d46e6e85b708e12215189ff817b9a48d3968bdae5e88c3e10a45380aa SHA512 920dbc160fde73be5ca460a4eeb2339e82346548bc289aaa41974b5b9a9167e4c59e8bccf17ae9eb01f835b780643b38a5f1ecfdd91b3f27a39b4de4f5c380a3
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/ntl-11.4.4.ebuild b/dev-libs/ntl/ntl-11.4.4.ebuild
index 0a9584119e17..18f21afb1eb0 100644
--- a/dev-libs/ntl/ntl-11.4.4.ebuild
+++ b/dev-libs/ntl/ntl-11.4.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="High-performance and portable C++ number theory library"
@@ -54,8 +55,11 @@ src_configure() {
 
 src_install() {
 	default
+
 	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)"/libntl.{la,a} || die
+		# bug #775884
+		find "${ED}" -name '*.la' -delete || die
+		rm "${ED}/usr/$(get_libdir)"/libntl.a || die
 	fi
 
 	rm -r "${ED}"/usr/share/doc/NTL || die
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index aea796789180..d9a59f63afbd 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,4 +1,6 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
+DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf
 EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4
+EBUILD ocl-icd-2.2.14.ebuild 1172 BLAKE2B 1e9f4b6c9a504d7b1f1e2345ceb598716299ea9043d0974e42ad6b26eeec099daf9d6902900d27e1dc3d4dffdd787e06e9f6eaf3e7ff482f777cb5929dd1f1b1 SHA512 885ec62b6b718dde98f1789acb966572292c12c5ac3c4fa650835e002ab9782887d67bbe77485b151b08ac3eead72194393d89287142e383d2764b179f40fe92
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
new file mode 100644
index 000000000000..e5b4c9f26236
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+inherit autotools flag-o-matic multilib-minimal ruby-single
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Does nothing now but by keeping it here we avoid having to have virtual/opencl
+# handle ebuilds both with and without this flag.
+IUSE="+khronos-headers"
+
+BDEPEND="${RUBY_DEPS}"
+DEPEND=">=dev-util/opencl-headers-2020.12.18"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
+	# does is disable the use of the bundled ones
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index ce11fcb27c65..240d980dc4e6 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -2,4 +2,4 @@ DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b
 DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
 EBUILD onigmo-6.1.3.ebuild 869 BLAKE2B e7cf04de463ef485df5f79c1ef3a3d9fdd82b1592511d67778b91e6a2cdfa20fb6304c1bd58fc954da6cd1fb69b08b899e2ad0e68153df73ab3c0212764fc12f SHA512 85f5a083ac4843c81a62a781d55f23e857c6c7675e7f33742c2544fa3e0ce783cd2c1844375fbf8e33c4f518ca999dacc07caadccc22512773d93b711c75e37a
 EBUILD onigmo-6.2.0.ebuild 869 BLAKE2B 0e10f53f852c3685d51210ee50785ca0cdb9a4eb2a266e5007518275758a85384459e304e1e2d96c84c06a39c9ac86e139cb8c4fd89d45bf54097281f8661678 SHA512 86683ba757b9c648b692c59273ad1d412d28a759599d39339ee3d4a24445c64e73552ad6d0819f63fc5d75176b2e9d30c0e5f4fcb0de292b302f17c05ac4c637
-MISC metadata.xml 577 BLAKE2B cd1e0bd09e8b4a1f71dcde39b47a7dd78308786c8b9424111eddb3a6ba6b50181e6af722605db9cded62076434410325a795181a4adaaf2d837bcd74128dfee7 SHA512 7c1e07ac10f864fbc74ffdd4706792eb5978cc28449536900ab2c870d23e52f24c5de215b766238d0629cf4ef3cad77622f37e468b5295e57ec42f5912a54ac6
+MISC metadata.xml 577 BLAKE2B 18e5fd4ed5182137d77ee09bea45e6597927f12de9effbaa5fadc5506f1075bfb3c9b8ff19180cdf432798952a8f2efd8f2a98f3b1bef9dda490b23f35dbb0a1 SHA512 a9d3f1a765674e090bf19676e36e6c533802a764ac1947e66e4532486254c7c4380fadc168b0d8be87ea1c1e995cbe721293a73009a00917c39a82adebfd9502
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
index 2914fe8f54bc..17c86016bd25 100644
--- a/dev-libs/onigmo/metadata.xml
+++ b/dev-libs/onigmo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index a2b6b2a6dbe6..9eb9fe4e266b 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -4,4 +4,4 @@ EBUILD oniguruma-6.9.4.ebuild 1495 BLAKE2B 01218f0889e0d685a957b31a867312587dcf2
 EBUILD oniguruma-6.9.6-r1.ebuild 1486 BLAKE2B 9196a06dc0641952398e978e142ebf212193dda3529edc2fc3bef52d32a7efec4b6350a8754434df02dd69291cd6cba0c8f25c239e8f629abd632b5854819a96 SHA512 db2c5faeb079d697872cf44e37648e8135d2da3c56e867820c5d58c2ef261cca2619978f6f5d0338c6ba6e21e4cad4f82ba6263a50fd0d59539918b782580ec6
 EBUILD oniguruma-6.9.6.ebuild 1151 BLAKE2B 530a1a31a2e640d9137bdef3008def0962ce52b4d22d8c7247e902bf77f4feeae129f2a8661b72a3647d62811c604afbe3d3db395720e827bc06108c04951781 SHA512 8495ec3fc1f3a8dd7de404d2e901f1c39910bee9b4cb73aa6b7c5d7c892bb7a4d4675479375b5687cbb02f11707911506a7b8e535ac34805de44633b5fffd65a
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B a501302d3a207054c966c8fb3bfc56fef6a301e8e33ffa406d4a2c5fc40d63d12babe0733a43322a7aed4894ab82f215a586b7f8038b4d38f0f73db6c855cc17 SHA512 1e261ffa3fa322957e5cbc4d78e7f7cc7b690f35e68af298d85bbefd673365a134d2b7c3637a741b427fc95b658e7e942f9cdf3a8958edb501d2098906ca025d
-MISC metadata.xml 899 BLAKE2B 3410f5e417f4f7e946b8f0485d39a9a03f8f007c3b37f329958939674a6d4648719d9d0366c4de2f06ded2a8e5b5f088f3830fde351a5f0c4a3b40f58b7ba01f SHA512 ed6a20a44390801a201994802059b22e4df1b2d3735e36cefb60ef91990d19a63486f09f5d5915d0f4d88f18b376df62a20a4b0dfd37ed77256691077f490ff5
+MISC metadata.xml 913 BLAKE2B 1a3f13483acefa02561c779bd419f49dad5ea2abb5b6a1cf42825674bb3a9076fa7890de17b60dd8b10e975908add14575c166a00ce5e5e5c403fd29969c4cbb SHA512 c79b54199a79a798074aa0c52cf60dc2f019184c99f15a60b07adab2a34d65697fd864d5ce1405de2df1bc013defab86d4a2e1e27b2ea970aca0819dd8d967d0
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 597c459467b1..8e11b14cf61f 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 6de80321fd59..44795e0ca09b 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -9,4 +9,4 @@ EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f77
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.0.0.ebuild 1146 BLAKE2B 0b2455f22a68726583b9638b8a20db67efde7a9a19c2879561f5614df99462375fcc453ab6c638bf72d0056325428698976b213a271338f8fa449145c8148e14 SHA512 6297e9bee27415679474b922b31ae1f3b1a5df7b7ccb7954993bd5f6346e7994a5b2e89794ebffd18c306abe48644691eaf764b844532d3d1744a715da8cdcb5
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1263 BLAKE2B b84ef38978e43306f5be92a6c138b4aa704d77374e70b8f2c3275168f0ae24bd3a303d87ebbbaaee04f85aaea3f8914493863171ee8ef874b429fcbeb31b6d5f SHA512 3879464f9d72f46bbd6dce799a63d1c62e174635299753df2d1174a4c47cc97ab8f3d698c06c2e636ca9f76ce564f55ee871852fa4aca40786fd3a1a925fc918
-MISC metadata.xml 251 BLAKE2B d59c954af9491cf4baaa1ef87798223542baa4d51b53d7efe06cd840bad610355371123af40858103530471987e6689863955eda4320e45add1964d64a2d3f10 SHA512 1f5116232dec742b8658c6296c94e33b014a4305a191fed50b9c840dd2613d3937a2405efd57b23d6bfeace5473a310bf36b087cf0b73817287043f6a2ff701e
+MISC metadata.xml 250 BLAKE2B 7be2fdb3efeddaad6369a79b3c29566a4a6d596bb6ee9408bff4c82c1aa151ea3ee99f30d2b6813caa9348c9d7809b38c017a43c6b49251b75c9d7b365f7c5b5 SHA512 5e202e141a05c33cb2a627e147dc3439d344db0a04529fdbee7c0d164a40bf0a847818fb94f21f3a45f1104fb6be421fb16442db0688d50eef8b4771ab0e85ff
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
index 251a7a75fe18..3dd0ac5ebdc3 100644
--- a/dev-libs/opencl-clang/metadata.xml
+++ b/dev-libs/opencl-clang/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">intel/opencl-clang</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 08ce93af6d76..b0a70734fd53 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -2,4 +2,4 @@ DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e4
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
 EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
-MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
+MISC metadata.xml 340 BLAKE2B ade1ca3014eb1b6b36aa11078944e4b13ecdc02ee889751c1c69bf85d320a75dc70c5f74bd24aa69ed4822f966ad218f4742c3249e2b2aa2f51f21ab9cf07064 SHA512 599a65843a54b48228a37ee4e8219e5b128bdf2e6f998fd397292e0aa6466a5b0b1ce3977c1aa8ce9341778975cace7ffb890ba66a2c1c7ac44934ce9891e906
diff --git a/dev-libs/opencl-icd-loader/metadata.xml b/dev-libs/opencl-icd-loader/metadata.xml
index e74450ef1a65..4388b9e5d870 100644
--- a/dev-libs/opencl-icd-loader/metadata.xml
+++ b/dev-libs/opencl-icd-loader/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">KhronosGroup/OpenCL-ICD-Loader</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 8a3a971a5070..2be5a03ee0d8 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,4 @@
 AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd42e2893cf540484fa6b3bd914400c2fd39067e8cfc29d030691fd0e4e4fb83b229bc2c03085e5df2f0 SHA512 3bdc6d2f87b2209163ad08915afa900f9c14324d3e48619cffe462c3c651996fe0e0b485eb6331552fcb22297cfa7bda9b6440a8bad9419d6835a047f1b2a0e9
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
-DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
-EBUILD opencryptoki-3.4.1.ebuild 3085 BLAKE2B ec9aefcf4acc5e8839962682e930c2ed1195bd015a22cafd343e1e8473986289645c1c6282c1346c679e18b1bf451cbd500d078fdbc9d5fa58c1730af0247959 SHA512 3e5e197a2b9bbe336a4ad10e2b0c3733d67c033c5709e22193dc8152af7f299251ed0f0bd5cb2597acc3111d781c3060b2a86ca7b5479a1d0af86fb2df793679
 EBUILD opencryptoki-3.6.1.ebuild 3100 BLAKE2B 8775c159cf881eaa7d3b2f10125c84b34ed008490e06f7addf110b9cf4a27a884f02a43c32bdc31508de0f0dc51afadb1e5842f9d28a84966223be2a85158046 SHA512 d44e5d8f572b380245a9fa330fb423867e7cc1118a3c3201cb41414768510e3cb34ee513c7be6af166461b73f60c84c843800af400d1ff276501b1f11fb23512
 MISC metadata.xml 375 BLAKE2B e00a1038bf53c0b8a93ee545e4674dcd7081a70874f5a3fe94794cf65b47d34cd94ccf512c8340b8b84170205840afbdc785dcd49b8391cdfdb655830a483c6b SHA512 fb29b7702172d4e47fe7cb29ec502f9ff0e1f713181ea5af7834a776b2844f4f5d51972764d4bf62088325c498d48a17479856ba5d24ef050af3d3f835c58352
diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
deleted file mode 100644
index 99428ccb4f77..000000000000
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="https://sourceforge.net/projects/opencryptoki"
-SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
-IUSE="debug libressl +tpm"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	README AUTHORS FAQ TODO
-	doc/openCryptoki-HOWTO.pdf
-)
-
-# tests right now basically don't exist; the only available thing would
-# test against an installed copy and would kill a running pcscd, all
-# things that we're not interested to.
-RESTRICT=test
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	enewgroup pkcs11
-}
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# package uses ${localstatedir}/lib as the default path, so if we
-	# leave it to econf, it'll create /var/lib/lib.
-
-	# Since upstream by default seem to enable any possible token, even
-	# when they don't seem to be used, we limit ourselves to the
-	# software emulation token (swtok) and if the user enabled the tpm
-	# USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-	# software-dependent even when they build fine without their
-	# requirements, but until somebody asks for those, I'd rather not
-	# enable them.
-
-	# We don't use --enable-debug because that tinkers with the CFLAGS
-	# and we don't want that. Instead we append -DDEBUG which enables
-	# debug information.
-	use debug && append-flags -DDEBUG
-
-	econf \
-		--localstatedir=/var \
-		--enable-fast-install \
-		--disable-debug \
-		--enable-daemon \
-		--enable-library \
-		--disable-icatok \
-		--enable-swtok \
-		$(use_enable tpm tpmtok) \
-		--disable-ccatok
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install libopencryptoki in the standard directory for libraries.
-	mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die
-	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
-	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
-
-	# Remove compatibility symlinks as we _never_ required those and
-	# they seem unused even upstream.
-	find "${ED}" -name 'PKCS11_*' -delete
-
-	# We replace their ld.so and init files (mostly designed for RedHat
-	# as far as I can tell) with our own replacements.
-	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d
-
-	# make sure that we don't modify the init script if the USE flags
-	# are enabled for the needed services.
-	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
-	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
-	newinitd "${T}/pkcsslotd.init" pkcsslotd
-
-	# We create /var dirs at runtime as needed, so don't bother installing
-	# our own.
-	rm -r "${ED}"/var/{lib,lock} || die
-}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 5ec18c208a6c..0ffed7387a3f 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,6 +1,5 @@
-AUX opensc-0.20.0-gcc10.patch 1132 BLAKE2B 1afde2a2a92c85a1435bf6b2f4cf9d44fec836effb1867c8e28bd4a4b8ec78dbf1d7ea075c77bfa2ff0a585ba62068765a093cfe8925deea4f9c4972bf04930f SHA512 d7cabea0090b6c05ffd5f597261f06afa3ba0f051e1b75f715a6fa50c59cd10663f023f570af8f76532dd5a3bb8a76d5cd6b26872de271e3eadae29c3ba7bd27
-DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
+AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
 DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
-EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 30c0f97f196c780a3097a43ad1f6dc1a57d36fb13ef09a8e409d0798e90399cd1aeb35362f59930e9276983f8329e4d9fc0d3edecb962b003fb545aef1a4b4a1 SHA512 af135d3d845694ccf8e09f460312919f502c321b9bac1adcaf90d3aa9edf8ccea94612413dced2b224465eb8b90c617b5a8a3306081176ef0fe1f3043c3c060b
+EBUILD opensc-0.21.0-r1.ebuild 1708 BLAKE2B b57663a827cbfe31df245625fc43d30963abe463b00b905e7a2bcd8d85a633a710fe20f564511b7e1180ce3df3f4b313e28642452dee1f1712b6cfccec4214e8 SHA512 dd4c4b912dc7465357ffee5c74d6e56ecef4323df10f27d237b8f54303bbaebe74ba3f830b45ac9b072ab8e668fa9a566f35828ce70389202bb0a2c072821752
 EBUILD opensc-0.21.0.ebuild 1644 BLAKE2B da7e509d5adef201397ce549151289f690621c85a4e6b0d93b7f62b3994a251f397a3853d71197dfab103e2e5538924ccce0ac1e99964ccac5d453a46f9fd85a SHA512 3e6da8d3d5eabab456f0033e761d7d017170301551c68c3e4b24520feb24f2624e5725a7b077c61335939b207624f26f554f149b6402f0a9ef304beeda6be938
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
deleted file mode 100644
index f96a1140872e..000000000000
--- a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 10 Feb 2020 15:09:17 +0100
-Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
-
----
- src/tests/p11test/p11test.c        | 3 +++
- src/tests/p11test/p11test_common.h | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
-index feecf6fb42..a16282cba3 100644
---- a/src/tests/p11test/p11test.c
-+++ b/src/tests/p11test/p11test.c
-@@ -34,6 +34,9 @@
- 
- #define DEFAULT_P11LIB	"../../pkcs11/.libs/opensc-pkcs11.so"
- 
-+/* Global variable keeping information about token we are using */
-+token_info_t token;
-+
- void display_usage() {
- 	fprintf(stdout,
- 		" Usage:\n"
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-index 2f3b238de0..9eb5cedecb 100644
---- a/src/tests/p11test/p11test_common.h
-+++ b/src/tests/p11test/p11test_common.h
-@@ -84,7 +84,7 @@ typedef struct {
- 	size_t  num_keygen_mechs;
- } token_info_t;
- 
--token_info_t token;
-+extern token_info_t token;
- 
- #endif /* P11TEST_COMMON_H */
- 
diff --git a/dev-libs/opensc/files/opensc.module b/dev-libs/opensc/files/opensc.module
new file mode 100644
index 000000000000..3246ab4da0a1
--- /dev/null
+++ b/dev-libs/opensc/files/opensc.module
@@ -0,0 +1,8 @@
+# This file describes how to load the opensc module
+# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
+
+# This is a relative path, which means it will be loaded from
+# the p11-kit default path which is usually $(libdir)/pkcs11.
+# Doing it this way allows for packagers to package opensc for
+# 32-bit and 64-bit and make them parallel installable
+module: onepin-opensc-pkcs11.so
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
deleted file mode 100644
index 51a8742645f5..000000000000
--- a/dev-libs/opensc/opensc-0.20.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=7
-
-inherit bash-completion-r1 libtool
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
-IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-3.1.0:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	notify? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--with-completiondir="$(get_bashcompdir)" \
-		--disable-openpace \
-		--disable-static \
-		--disable-strict \
-		--enable-man \
-		$(use_enable ctapi) \
-		$(use_enable doc) \
-		$(use_enable notify ) \
-		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable readline) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable test cmocka) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/opensc/opensc-0.21.0-r1.ebuild b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..7e6fedb42d16
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 libtool
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
+IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-3.1.0:0= )
+	)
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--with-completiondir="$(get_bashcompdir)" \
+		--disable-openpace \
+		--disable-static \
+		--disable-strict \
+		--enable-man \
+		$(use_enable ctapi) \
+		$(use_enable doc) \
+		$(use_enable notify ) \
+		$(use_enable openct) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable readline) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable test cmocka) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	insinto /etc/pkcs11/modules/
+	doins "${FILESDIR}/${PN}.module"
+}
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 348aca814d67..5c659c37526e 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -1,5 +1,3 @@
-DIST papi-5.5.1.tar.gz 4233127 BLAKE2B e065bed5a5607bf5ce3459ea84e1dabd6a60cd1f78f3ec2fbed29676ff79a057c77bd4210b8c45428238d927016a5a1e16d7bdfb4a9f56ea1e180cb0b19ec182 SHA512 c65c3a4e95c33ee7ceb950c184c08019d83cfee38bfe1bac86e80670a5191918edab2916b6815b15001da961deb8b6cf51263541554eb92a817e1a48371cfcf5
 DIST papi-6.0.0.1.tar.gz 4665285 BLAKE2B 5b6b2de8c16510a05a57159ceba591625c78f2a6d4ea62979fea4dd3e72bce73138e36480d82e13713c9ff2298e00330619fa57fdc7f81d75e1ce519b6f600ae SHA512 54c37b49858e921bd1357d8b0bba12c27e40e89b1354d89e5a85672ef3e6d3a4784212079098004256369a172d744580fb283741e7b4ac2d6fa5642bc42ea2ad
-EBUILD papi-5.5.1.ebuild 817 BLAKE2B 6bfc966ebc939823b356d123fec16a8fe3c402a31fa0ed9218024cccd5cf7ce71a2c9263ae9b081f9048886c0a5ed09e17c3f7ae94968bf1a1792f4651451bb4 SHA512 d386295abaf4c244f4bcb5cff018c9be53c5732d90d5c78357449a9638b265ad2a2528481143e20f7589813b21ac3676a45ab2a490752a4052c70646fb3ea7fe
 EBUILD papi-6.0.0.1.ebuild 1118 BLAKE2B 841bc96e9e64018da26bc1ee9698d0e202d77fee3dd24dd364018c1bf013fd637d85f035807200acceb91a2ec3d01f1794f69b32e2d5c1613c05b7fc0ce6cbb3 SHA512 9fa6411201f4142169e477ae4f18039fa6076f7b5d58c4f449f6ad6ad14c60ed91d338fef15245c07b1878647a0351d022bb9e716c988ff06b20c77453ee0d9e
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-libs/papi/papi-5.5.1.ebuild b/dev-libs/papi/papi-5.5.1.ebuild
deleted file mode 100644
index 2667603df0e8..000000000000
--- a/dev-libs/papi/papi-5.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fortran-2
-
-DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="http://icl.cs.utk.edu/papi/"
-SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)/src"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libpfm
-	virtual/mpi
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-shlib
-		--with-perf-events
-		--with-pfm-prefix="${EPREFIX}/usr"
-		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-shared-lib=yes
-		--with-static-lib=no
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc ../RE*
-}
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 6e868986f84f..81a535852734 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -4,4 +4,4 @@ DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
 EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
 EBUILD pegtl-3.2.0.ebuild 631 BLAKE2B 2fc285796ac7f29f180e408192dad8b673fec08d5ab8a513d22c9a9f63cd3bf682cd53b9923e9689ccb71ffd38f138245aa2e7a64c44a296d6523111d9df20e9 SHA512 138a9c002084645f12c37ee2fb6757d0bb992da805b65048e76e3743deb34de036b60defa87b4cfdfa8e0fc0dd81825629d9c008c6bb4615253d610dd7935719
-MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
+MISC metadata.xml 330 BLAKE2B 1ecf1d4e82723b878142197d5d8ace0b53f719bdf64fb5988c566ffaf1b60a9d7f899664a21c51d7645503f84376945e428cb9523caa92c1c09091284b42e5e1 SHA512 5177a4fb177ebd3064cbd9dd9abdda753d9c8349dae0e9dd9e02b6f61b3145f55ff691616a8933f3cc75da26f26af25770feeafce64586e4e16eca3d9a63689c
diff --git a/dev-libs/pegtl/metadata.xml b/dev-libs/pegtl/metadata.xml
index 353f1f5078b7..780a23a174b0 100644
--- a/dev-libs/pegtl/metadata.xml
+++ b/dev-libs/pegtl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index a68a9ec33d85..08cc59fbd348 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,12 +1,6 @@
 AUX pigpio-70-makefile.patch 4856 BLAKE2B ec3010a687ae8104ca09f3df6313e74aecf2d9583932b1c17a72a58ff043a3d1e22ef43ba4e7ce1b4bd8c21824bae929b8533d5adb9ecef49614b8db94bd095d SHA512 b355ddfde0e3771f023c651ca5f7cbe6dc99a9720f0d2ab23715ad7185aad6f7e1c05b494415247838b371968756fbabec9f5539b172f623048757fad72339cc
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
-DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
-DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c
-DIST pigpio-78.tar.gz 2900959 BLAKE2B 71a7ed89b247292718229955bf69bec1b7798040fb69b3d9d19a1143cd4fc6565b61deb6ed3bc40eb643a7987f88809125b4368b80aab2fe03bfbaa5fd665274 SHA512 893eefc4a5ab054d56df2c439539ab32a292050aa1fe4b062ba535921f1b12aeac9d509756d08986cd18ed512f52517fa64822422ea3f4dbf6e41fd364a75c3f
 DIST pigpio-79.tar.gz 2908059 BLAKE2B e33347a68635c1d8c9f65b3e1c23442b625a76c2c774326d093c281024abc7d588d4c5f7137056f49c44752752d0873fdbb24de9148a7306c61c91771d280e6b SHA512 bae24b0a28b6865bf4e0903d9e1881344ab7cf26a513f295d178402a426f90f2fdd43444cfe899c0bc25939a129ebf47ecd1ac1600683cd648902d56825a3203
-EBUILD pigpio-76.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
-EBUILD pigpio-77.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
-EBUILD pigpio-78.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
 EBUILD pigpio-79.ebuild 1089 BLAKE2B f78ce8820c42d67f656b42c53d1b7943537bcdc5325e55af7e6d4e876ea5fd7950e24790d5e34dd95b1607b8781b235af489eaaae0f665c7960b74f32fc971c0 SHA512 dbb4a01345aa7fafd146ae9c0c190109a219cd256b343ad255b41c4f07ea68b1bdc30ba53a0e365e26811b79b1b864b68f3e4e01d1c4424312444abe8a37408b
-MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
+MISC metadata.xml 408 BLAKE2B f75684c92e32f18116c2940600b5b1b90d94c81aed4faa7830aafd478e66f4a11f3bef4d2a92f4c68c6ae2b7fe84c7ba0b310d2168856ef39b059a5e6acb664b SHA512 7f2895fbf37ce51106a56ce964ee677dd630bbfa56eee793508c5dc2f9bf525c5a356439726648996779c86113f87a0b10f37fa6eeb5154f622cb0b79888dd7e
diff --git a/dev-libs/pigpio/metadata.xml b/dev-libs/pigpio/metadata.xml
index 9344dda7b30f..23660d540a47 100644
--- a/dev-libs/pigpio/metadata.xml
+++ b/dev-libs/pigpio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@k8n.de</email>
 		<name>Daniel Kenzelmann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/dev-libs/pigpio/pigpio-76.ebuild b/dev-libs/pigpio/pigpio-76.ebuild
deleted file mode 100644
index 3800134e583b..000000000000
--- a/dev-libs/pigpio/pigpio-76.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio"
-SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-77.ebuild b/dev-libs/pigpio/pigpio-77.ebuild
deleted file mode 100644
index 3800134e583b..000000000000
--- a/dev-libs/pigpio/pigpio-77.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio"
-SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-78.ebuild b/dev-libs/pigpio/pigpio-78.ebuild
deleted file mode 100644
index 3800134e583b..000000000000
--- a/dev-libs/pigpio/pigpio-78.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio"
-SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index df797633bfec..07d178d295e2 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.25.1.ebuild 1053 BLAKE2B 0a4a0e752814c18fde08cc36dce8cd6a3c6548d861e5d23761ab6a040b0d60be67369b7ae835381070b6803c192e41a6283a8423bac0f84dcae9a62629acfc68 SHA512 50603b807af1a57c02a7d8dbce2185e677de61fd34a7d3b69ca37a34caa3c78159e95b1a0932df7608700c840193a655461825ec9dddf143f1a2df50d1209357
-MISC metadata.xml 434 BLAKE2B ae95013cf35b04c9c254de1637b1de3b755bfb57a053f789e5ff8875412a5be2db2e348471ba938a9752c3fccce023a86cc0e8c13a8f485a0f3717defb81c1fc SHA512 1699017823c013e6b053b316ee538de24a498aa790da27fec0181b05c4ace43569ba90a2d210e433f3ec9bc8f260f921adf609647fcd8e12ec58d084accdf2b6
+MISC metadata.xml 434 BLAKE2B 0f814ae964f39284cc9ca255744de6eb6cb9b268d9710e6f820562691f482dfde9ec1c3caa547ec65350a883a528a0c8858d3bb4225fa7a0f43225647652db96 SHA512 f38336f8c6e9716b560fe2ee16bf2fe0a670f757981651ece38f82a8028ad457dab6d99fac2bdb76a7f69cb807e3885b6933a82e5c82b387b9d822ce7ff518da
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 10e458aff011..b415dac9eb05 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 10177761ec8a..25d521deb5a7 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -4,4 +4,4 @@ DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767b
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
 EBUILD poco-1.10.1.ebuild 3835 BLAKE2B e9f3a497dc2abac87c1a8e12bd00b3f070c18f7c8fdf136973fc26e85c5d80f5255bf39b95943e3fd119d976c04d0d21fb830f2e4f04a4e2fc302ff4657c4b6a SHA512 45a2f75b1a60b5e69a59811fe6be0f1f9cbd983bab8e70045d3928e9f2d86339611bd92073d7e14a13fe784c5049d3501d38446fbeb672e1c69c5f59c62215c8
 EBUILD poco-1.9.0-r2.ebuild 3845 BLAKE2B db4139cd4bc0e7d133d32f6a25cdf740e9671c400a909599a05da83726183fdb932a91ba5f628dd6d1d3531186779ea1ec9f8eed351994aab0c6a33f35133952 SHA512 a85f82234f98f4a8b89a2f1e9bbf63b48f3580d8651a0c09d98fadaeba59136af0073ae370128a8ec2f9c19cde0121a5eafd680b95db6fd857a4339b29b0eab0
-MISC metadata.xml 2553 BLAKE2B 2de5210d62ca2df3a02187d592efc80ea4af5e0d2601885ceefc66079f8f7ecbd52535c4da7c4287f4232eca57947c890182cb497a99460733146bd3ea764000 SHA512 000dd91ec6f5bc139134ecb05b227c532c5efa81256f5302e71e22d9766ec48a629285a1895a6c731954ccda247c3962537dbfbc4d155ae8d0c882a725c3a4e1
+MISC metadata.xml 2583 BLAKE2B b99136b66aa75ad6b95b142ecee307402a845c1de12fd3cac0105c4988fed008fd1ec19cb2a1f8e3680f8d6da889005aa4b21ac1925c19db18cfadccea0761f5 SHA512 bade97f4def1e022ed9693117936c595d08ee233c6afd8f68fb0d941a71a7e96004457d48996ed6106815fda64755f235f561b9456de54fa9024662079625cef
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index efd7d2d61160..f804fb896701 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 20042bb649da..b3ac8c9f8846 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -4,4 +4,4 @@ AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8
 DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
 EBUILD ppl-1.2-r3.ebuild 1796 BLAKE2B 3539c5632cffcbd77a4d116637ea4d3aa737a33e4a47fa159a4af84b9c0d89abf67d6db70703c43e28b032dbcdcf3d83f28b1a3d029884889e666d220dd1f1cf SHA512 b3851d84685a7147c4eaf0282eb7fba643b0c1009684fd0b2ce145d8aade498de6846d74fd6077f7d47d056a7fce2ddbec00b4ec698d3a6c53ba86e38bbbe706
-MISC metadata.xml 859 BLAKE2B 73b368a2852176bfc7e38a89b8ec0c239fd4e96a838bad0fd883d50125cb25cbe2962fddd3c62d420a3bb97287d80c47c356f063dcacf39057d4bd07cb3b110b SHA512 a7f896a4a2a485c18df3cf03038621bfaf93057eefb43ff093f9cf89d0d71937e96de0ef0fd5dc20fd12580cc60bebd80d74e64fd40941e9f3bfe1f91d1666bb
+MISC metadata.xml 889 BLAKE2B 569fe94d744c94a0991a4a41ab14df4450b7a9b4b2b2adad1d39cf6638b57ebf89246bcd99bfb2c8823f9c6d757c0070a78b8a0bf4afcc9afe8a08e4dd4c870e SHA512 f2b98bcc8cffaec5802fbc2788aab5e5571302c9f6296a34085febea857ef9f10f56ca722bd4ae3a8a80725a3a53e69c88ea7f33adab01221be04fe40e39f3e2
diff --git a/dev-libs/ppl/metadata.xml b/dev-libs/ppl/metadata.xml
index 3520098af316..96ef40dc45a0 100644
--- a/dev-libs/ppl/metadata.xml
+++ b/dev-libs/ppl/metadata.xml
@@ -4,11 +4,11 @@
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
index 631dfa882e4c..eff341a886b4 100644
--- a/dev-libs/processor-trace/Manifest
+++ b/dev-libs/processor-trace/Manifest
@@ -1,7 +1,3 @@
-DIST processor-trace-1.6.1.tar.gz 250843 BLAKE2B 0fa3f97f14e6fb931ea787261e84c65cbce0667db7adc709bdf386f5a87a9eb9af71b3b5b45c1c0f17d6b8e6800b92e9417955dc5496f3f6d3022620153fc2ad SHA512 c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468
-DIST processor-trace-1.6.2.tar.gz 259982 BLAKE2B ab394dd37eab924e841d77911f90e0b3ecceac69ae1b8fcd911c0bc26c2ac4aedf8bde3e0d8197b3341159d6b35458177f0c795eb9c1b146e38fd278135042fe SHA512 10f4ef6bcca9a4b39b0cfbfc82d79a6adb206aaa1a78961b0dea0926f7e2e462ea3cd5430dc82e71ce9dede18550f3c84d38fee26e1b2065668767fb5f796995
 DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
-EBUILD processor-trace-1.6.1.ebuild 567 BLAKE2B bcac1b2a0d401e99dec6b5fbee8c812762fbad8726957f8fbed959b45569fb08b9920f9f7c646fc006aff51ae581f06087ee702f5abb22d88b9785a869d57656 SHA512 6d0cc083b32c9eebfb9a8ca8b8549297a81ab2da0a56e7546cae7f9c5a180eac341bc6b3ac854f41f9ed3fdb8c959e2b9fcc27bc0b4afd4905f0d0ee710d6912
-EBUILD processor-trace-1.6.2.ebuild 567 BLAKE2B bcac1b2a0d401e99dec6b5fbee8c812762fbad8726957f8fbed959b45569fb08b9920f9f7c646fc006aff51ae581f06087ee702f5abb22d88b9785a869d57656 SHA512 6d0cc083b32c9eebfb9a8ca8b8549297a81ab2da0a56e7546cae7f9c5a180eac341bc6b3ac854f41f9ed3fdb8c959e2b9fcc27bc0b4afd4905f0d0ee710d6912
 EBUILD processor-trace-2.0.ebuild 571 BLAKE2B a5077681da3182ef6a2fd8f3e881b81e166730d8f214343370b616bd9664794a70836b19d47bace9643ca6fdb23b4fbf8622dceb5e81af446b7cb35eace3e11e SHA512 70553ee2b00358a367a3f7b1edd676e3e775b54e733dd53c3dbe31463064da66cc1d40a7246f638f62860617f009f1bd3ed5f2384a9a849d910f0552a5c623cc
-MISC metadata.xml 369 BLAKE2B edcef74fef3ee485f69eb5c78d78dd917969ca0caf6d0e1df3829abafe94c88bc5c1b098c79f1c7f9af67108a3d31f841ec749a386d25785db20f160091f450a SHA512 2f19cdf8f8f3bce36e4c7f904e16b8068cdf41fb01e8031c13afee9a413e1d65084fa69db2198ba0b239ccd05ade12bc13ec042b689eb86ee725d51167d9a9e1
+MISC metadata.xml 399 BLAKE2B 627b7141b420718ed14e837d10b1d53bdd97058b517833fb187e8518251fa3f5f3b6359238919498487f752931536e8584d692fd8548b8efdb4f5d1d78d3a904 SHA512 c44cb21b6bafe5ffbf22ffbe69ee883372fa40fde83daa230ece062fed26fcbb6d2837c85cc23101ac0d3f542a6e17b4429e832e41aac9d28a8c379f69bf4621
diff --git a/dev-libs/processor-trace/metadata.xml b/dev-libs/processor-trace/metadata.xml
index e55ddede119c..148d7752f90d 100644
--- a/dev-libs/processor-trace/metadata.xml
+++ b/dev-libs/processor-trace/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jollheef@riseup.net</email>
 		<name>Mikhail Klementev</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/processor-trace/processor-trace-1.6.1.ebuild b/dev-libs/processor-trace/processor-trace-1.6.1.ebuild
deleted file mode 100644
index 8d50273392c6..000000000000
--- a/dev-libs/processor-trace/processor-trace-1.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Intel(R) Processor Trace decoder library"
-HOMEPAGE="https://github.com/01org/processor-trace"
-SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="-* ~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-text/pandoc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAN=$(usex doc)
-		-DPTUNIT=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild b/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
deleted file mode 100644
index 8d50273392c6..000000000000
--- a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Intel(R) Processor Trace decoder library"
-HOMEPAGE="https://github.com/01org/processor-trace"
-SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="-* ~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-text/pandoc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAN=$(usex doc)
-		-DPTUNIT=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 1119559aa0f8..cdb80e2a54b8 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,6 +1,4 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
-DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
-EBUILD protobuf-c-1.3.2.ebuild 976 BLAKE2B fd9d077375ab6355a98d33dea2a30233a3548d453062c9c5929ec1d70e74f01277347309d1c352894dea4b94886d917408b1469aa77d7cab5ef2695ac7a81611 SHA512 b1189e57806c7124a3a8c6d44e7a192618f196425b2dd8bf820df1f126e111747b838d9e13991666c6f20d7afdda5cc009ad239637f455088620379acf242fbb
 EBUILD protobuf-c-1.3.3.ebuild 976 BLAKE2B fd9d077375ab6355a98d33dea2a30233a3548d453062c9c5929ec1d70e74f01277347309d1c352894dea4b94886d917408b1469aa77d7cab5ef2695ac7a81611 SHA512 b1189e57806c7124a3a8c6d44e7a192618f196425b2dd8bf820df1f126e111747b838d9e13991666c6f20d7afdda5cc009ad239637f455088620379acf242fbb
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
deleted file mode 100644
index f6604b26b18c..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-# Subslot == SONAME version
-SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-libs/protobuf-3:0
-	virtual/pkgconfig"
-DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use test; then
-		eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 33e731d18a62..f6f1eb200ab5 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -16,4 +16,4 @@ EBUILD protobuf-3.12.4.ebuild 3205 BLAKE2B 5d41dab953c7a0230df22500c99caa1ef8436
 EBUILD protobuf-3.13.0.ebuild 3199 BLAKE2B d79383364ae304ea0a4682e9d9d92b673ab524820262b8e8fbc303594ca9079961d6964222d1d2beba4733f97a9e74e4df48e8f907f1ffb1e46901f986b93625 SHA512 22f2acef4cadb511040ff2f6421c2e5efe4e0d5983ffaa111edde7d0737b82817dea34dc640c7c97a45c10678c2e0ffd7061c90031b2bcf8adaedebb0efd4027
 EBUILD protobuf-3.14.0.ebuild 3005 BLAKE2B 155eca420c45741efeb31947fa0357408abd0e7ca40fec5e8642af8522fa1a93bf626231307a28466edba9d0a1d22cded2d1abedb0650542e8c6ee8caba129e8 SHA512 aa95ff5ba7fe2d9571279f48d17af10d6a7dd33dde0bee4a160b90de1f71a4849fb181e7d3168e3ee524b70ed0a528dcbab7aa3e87b5cf6e2c7aafee89088156
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
-MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
+MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 6858f31af628..2bfedff80e39 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<slots>
 		<subslots>Soname version number</subslots>
diff --git a/dev-libs/qrosscore/Manifest b/dev-libs/qrosscore/Manifest
index 5ed20195bf40..d0d6550844fc 100644
--- a/dev-libs/qrosscore/Manifest
+++ b/dev-libs/qrosscore/Manifest
@@ -1,4 +1,4 @@
 DIST qrosscore-0.3.2.tar.gz 3963954 BLAKE2B c7553fc1a0a2f4fd3f41ae0dd8bbb8c752c790c8a79b95b9b05ee38260e1ab9b2a337cc8fdf9b9aa513cc178f1155e0f3d7e5e0238aca50c9c970b981c189418 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16
 EBUILD qrosscore-0.3.2.ebuild 583 BLAKE2B 74d87edd67a61d2c6d70815b6ff399da81f954082516ae0c983f7c4749af761232261308a0d8b75d89855c8304beea6dd060867f4892122c526fb2d55bd701ee SHA512 e9c61370474c4ffbe464adcd9a4f3742ace12f16a95e8396ca7760815f82fb0d31b488a0b7dabbbe065dd130e4d864b2ec1c52748412df2ca0e494cb23a432b3
 EBUILD qrosscore-9999.ebuild 564 BLAKE2B de3ac2cf2cc1e489ae1f2603a5379c9dfc1e51b9dc028785d9b4eddbcb2d4593c0dc967a1a0e37fc44ac4fc744dd8183b812fb3e06ac652fc43a28fa571b1675 SHA512 3a004c4624d2b70b1f4b690ab69dfc9166f3806eaad17021528237fec0827ad07a8cd981ef8ed6e5009feabd1a72f63cb02d97ea1dc4cd39c7de62f9ad4e40db
-MISC metadata.xml 445 BLAKE2B 86fa57a651c7a35cb86b98da098010f90f7d7fd38575ccbc7cd5505784929284a63b048b96b5033c3f181054fef6ab059a8a8bae859f420ab7277e999af6e68d SHA512 81fe8b05cfb46a512e708751b67314b183f320de6b85a0781c2a1ca93cec51862380290d0e10a671c3716a5e20ca5087a21a4dcbe90ed20ddf7a61166c879f0c
+MISC metadata.xml 475 BLAKE2B 1854c9872ac4ad8a4d3cd0d30aad5e251131a430d4ab0ec462fe712a3f09ebe0ca425c41fc1102e427e32c77e51a4cae368b182e9323ca8ce3d2be17c5984b37 SHA512 8f294c190273a15cd285fc7aa5a60eee0f24a302fd13bf159f028dea10bd4e0f81ebe69a22e52563c7971f266b081e09abbe5b3c4323cf65c2140912f43ed3cd
diff --git a/dev-libs/qrosscore/metadata.xml b/dev-libs/qrosscore/metadata.xml
index 047a3d36582b..e2f54a321e91 100644
--- a/dev-libs/qrosscore/metadata.xml
+++ b/dev-libs/qrosscore/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>0xd34df00d@gmail.com</email>
 		<name>Georg Rudoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
index 44aebdacd56e..633fb3bd92c3 100644
--- a/dev-libs/qtcompress/Manifest
+++ b/dev-libs/qtcompress/Manifest
@@ -3,4 +3,4 @@ AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99
 AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
 DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
 EBUILD qtcompress-0_p20180513.ebuild 1454 BLAKE2B d8f78847c8782f00877cdf4fb5520ca431d3dc1c777d1dba5b683fdc620251ad723121d157450fe8766ac2bcdf0676b80071fe69942fc29c5978f60b00d4efe4 SHA512 f790626ad9d35783344ac4d1de5ca8a301203ec27a9629342ddb7cd2d04a4375e7ecb40cc72f0a514129d9a787479f2c4b4eeb400c5960ad96788f7a7e1f3cdb
-MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
+MISC metadata.xml 487 BLAKE2B d0cffb8be82f490cec902006835c551d3ab6622e6910abcf6c0f711e33ef9273461134f2fdd12460e682bca0901fb3e7a4a6dd761af5aef77cdabf7630bdf745 SHA512 8ea5bb41904e1cfb47d784ce910fb5f078f7d1cee3f696a6fcfe41b08e1a1b065e45d1767459716d4951a8fdcd54a294c92d851663e39dc859fce6a779574cf8
diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/qtcompress/metadata.xml
index a07b3622f7d5..428dd6456dd2 100644
--- a/dev-libs/qtcompress/metadata.xml
+++ b/dev-libs/qtcompress/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index e891d14598ba..2fbf3b891841 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,4 +1,4 @@
 AUX rccl-2.7.0-change_install_location.patch 894 BLAKE2B b38635d2eaa2e3f342c9db7ede66eb91a6170cc486ce90f487820895879ad6666a35ffe3673dcc2ee610ade9c8b5fcb6a65f0469aa971aa3c0994ee347d22eae SHA512 97b1d3799e3eb105045d1c29df498c1255bd008433f56dd53cedd602fef77d9cee61b3b9db9281d72ec297da19058e86e74b66380b321f1727053e8c6148e698
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
 EBUILD rccl-4.0.0-r2.ebuild 791 BLAKE2B 1d2b95f2086c0f14ab87779e5d8d0304ec030dd985e8161aa9467455e414457508eac9a9450638bfa43499e38d9c597302399e4a08474568752bb47e6b378321 SHA512 79f6f264b5466b4a8c4389923487c4378fe8c59c9c34f5bbc0f5ded01beb2793b9981c982ee1598b00d5a16668f44a5c226e0d2cb40ed0eea1efd871825b4851
-MISC metadata.xml 583 BLAKE2B 74c041b3ca69729d6be7b81ee439c0a51aaf24dd72de8e2b75878b07b48def0d2ef6509f8bd5dab1fc92301c6ceee350d05b2dfa5cc16c08e0bdf6d7c2e59e9d SHA512 4aef286c591d749a019ab3f9db5542a4b05569d53429522b5c5acac48383513599ef5e5f75254297c5b30a71db7a3b43f0aca53b50bacd46db206243f58edd2a
+MISC metadata.xml 597 BLAKE2B 27c232f1a8c3c16a709aea2faeb8be5658dd8d111314d43962574f0f54056328843917ccd4c25ae4353e9efa0bc3638e18e6687830a16fc07715abbf2b4019ec SHA512 e98ee6fcd0af3169b5890e5a0b79a5cecc14460ee8ae7a8d029b08104c25148e96c18ca09400acc47cd953ded95718ca34d756df057860d02ececf83a5614d9c
diff --git a/dev-libs/rccl/metadata.xml b/dev-libs/rccl/metadata.xml
index 1e0f4fb686b4..2d1f086965f2 100644
--- a/dev-libs/rccl/metadata.xml
+++ b/dev-libs/rccl/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 064bc0b19096..00b4a9eaddf5 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,3 @@
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
 EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
-MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
+MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index 97fe53eb4350..271bd716612f 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>chromium@gentoo.org</email>
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 7932d45eb75b..aea6f54c0ada 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -11,4 +11,4 @@ EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a0
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
-MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d
+MISC metadata.xml 511 BLAKE2B d2b374303172e793b16f6cb1dcd569e4f112ed2a2396f8ee85d053411b31688c2fac0c20ddf43205ad04aa36f910edcbc0de57b4e972615953b22e2475b3fd7e SHA512 349b4d3a8bc6414c5d015f8f50d4b09869e04dc67fe8317644cb148752dcdb767beb2d0eb18dc83bb50e9927e81fcbd1e43134e9a0ded14fd16bc109c8518365
diff --git a/dev-libs/rocclr/metadata.xml b/dev-libs/rocclr/metadata.xml
index 26f1de03c97b..1869bfdcf528 100644
--- a/dev-libs/rocclr/metadata.xml
+++ b/dev-libs/rocclr/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index e94088b16351..74650b007f9d 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -8,4 +8,4 @@ EBUILD rocr-runtime-3.8.0.ebuild 1466 BLAKE2B 263ba0bbd1cde48ce0a07b846e2f241936
 EBUILD rocr-runtime-3.9.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
 EBUILD rocr-runtime-4.0.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
 EBUILD rocr-runtime-9999.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
-MISC metadata.xml 500 BLAKE2B f56d759b8a8cf351a26095b51f7c48ebd9fb72d06f0a937aa23ea6c905a04d95c1de31c5ad176f5651a3b4c6a706f22e3ace3f4ec8a99a7f293be82de25b4e2b SHA512 33ee8984ef288b26e1315ccbebb03703e3d1648db220e0b3bbbadaef38ff414c938bf01a04c69ece7672cccb268f445a11b14d15da2939729c798ef8f8801719
+MISC metadata.xml 514 BLAKE2B 1f7548f78a4a22f8bcef72db68b93aa472b3b72377ac99f087325d7867f6276f9f03ab868cc6e3a2cffceca1ec77f9cfed0f4764955d6f45c04b2a6c50a539cf SHA512 4bdb670aabaff9f29a87129efce22ee5ab23c78c1b1e16534afefd4101e1eaa9338d9319b3b326bc6a7ba7f6e3b54f8eb576284306a0105fc0faedd18a5a5789
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index 47b3e7327caa..8de8a51dac57 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index e9c83f84295f..54195fcb02dc 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,12 +1,4 @@
-DIST roct-thunk-interface-3.10.0.tar.gz 2694321 BLAKE2B c743e2df8133a382f62f0cac3b73eb1a1ce74efcf5970a7b07b7ec0f16a6c7d39a44112d62e32bd9f5d7c2b984e3aea31d7d8a8b1658f9608b6a3c283e12ad24 SHA512 c5a447be0b4a3df886446c2066e193c4e0064b2868103e248a6adba8e7f12aed49112647747ad16d3b115f9f74946c317360396e7c5f3e0cac43b349fcfd33d4
-DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135
-DIST roct-thunk-interface-3.8.0.tar.gz 2692624 BLAKE2B bb0d288da08081de63f3848987eb86a319c977250052b8bcccdd221b31167d2b344ecd17163aafe1fa5e7a4372248510af77c4ed992c39e71de05452b0b83a8c SHA512 b60461869f916791b702fb7a551978dd741873925154cb5980612f71bb19000f73fda8c1becb5e3482be872790d6cc8c34dfe3484349796c9fab2fedafef525b
-DIST roct-thunk-interface-3.9.0.tar.gz 2692605 BLAKE2B e256217aa8410eb3a1cbb430509c7426e2b00f4ad0a0a3d14879fc116a112e9d10e50b0e2d336f04bc52d98f0d98afda5195565995c6d8b64101132e9c71746c SHA512 eb0d3abaae1aa92f60eeb58ef07bf6dd0f954488e2e05bcf30cb75aa772430c49a3103b0498208c7f8f8fd35fb5d91f0f8c056064ce595263e1737e8f72ba462
 DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71d444a467bdd0b39ce0b487c70f1f68180fb4b564b10a65e26e41b71d5e66721c3086ec834aee2550246172965f2d611ce9a644a SHA512 cbb45c4372ce2620fce6ccbf94e8e7600256d12acf6721da9d22aeb619cec9d4e4e25354649b83fb322f8d369347c251ebb7242ff8fc3976cc3983de0d8e30a9
-EBUILD roct-thunk-interface-3.10.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
-EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
-EBUILD roct-thunk-interface-3.8.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
-EBUILD roct-thunk-interface-3.9.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
-MISC metadata.xml 643 BLAKE2B 97a92b285d79397e3b1f8e07d4c9fcea72613261901f70b016104ee7298a62981d2f54d70404bec0397d0e96c11182e5356e64fb6a30625af2ce8fcc1f6c5e3d SHA512 27da5fd910679ae0ba469d556df2110242432726d74ac19742936a3434ea4701b04bf920e5ee42f5a2154d44c76201c5369b0d4afb2c954efb2e49e08c872c18
+MISC metadata.xml 673 BLAKE2B f78ae2fd3c7a17761aa74600340903bb39071bb8ced6ba5015626f28ea472b815e5d2880bd91b3c9509204eabfa169166297edcca464582d2b0f181f8241847e SHA512 143d0032c62e1acb1d0cd72cd5be335954495a1afc6b79a6490afd5f145a8c0d9458b6ca36111faff9b310e3e40bde182ec8222faca7d48b4945719686f4e50e
diff --git a/dev-libs/roct-thunk-interface/metadata.xml b/dev-libs/roct-thunk-interface/metadata.xml
index 92df31aa92dd..be0618c49bd6 100644
--- a/dev-libs/roct-thunk-interface/metadata.xml
+++ b/dev-libs/roct-thunk-interface/metadata.xml
@@ -5,11 +5,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.10.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.10.0.ebuild
deleted file mode 100644
index ee5be506ed83..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild
deleted file mode 100644
index ee5be506ed83..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild
deleted file mode 100644
index ee5be506ed83..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild
deleted file mode 100644
index ee5be506ed83..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
index f68752235458..6a794206f0d8 100644
--- a/dev-libs/s2n/Manifest
+++ b/dev-libs/s2n/Manifest
@@ -1,4 +1,4 @@
 AUX s2n-0.10.21-remove_Werror.patch 1292 BLAKE2B 208aab54784a956003c0f23564d07124476149f9a36fce40c6404ea79956479ba2a589bcb75808adae67c4f50ba78ac5fb72d21429248a515c9c84bf5faf5930 SHA512 4f8cbdfeeb7dfa514750083e1be4481f5ffe1e30ff88915b5c7eff2494ae534c454da51a0c56d720be66b5ce50900135a4e17f66a517ec437a027b01c9fc0fd0
 DIST s2n-0.10.21.tar.gz 6150129 BLAKE2B cf598ef02b4aa9a2a69f11a47b2a691055575b7398ba0a833081da704ebc7564d30abda5f2ad9ff9858ec2f553b1f332e913494b9e195e2a754f008bab5c11d2 SHA512 26957edf36af088af2cb355dad9281fefd9d54ce8c3c2c26f5682aee8d64338a3677aa81f3a07563b27a938cad2c57e0a86a478c9619cc93552674451d501909
 EBUILD s2n-0.10.21-r1.ebuild 1479 BLAKE2B 0c2e33c6e9fc25cf67e3443dd9cc6a6cfd124326cfde164c945ac692fc2a4df1f2c336ea9df285c32c2a90848de0357fbd98ec9424fc48496576c142f943c391 SHA512 f8cdf7306ebfb68d73651b6617c49e011382540c1752b5ffc3449a9fc37b57ec8015a310ec155f8c23dab3430942b4696074a4419459c4f912d946c51684c5f1
-MISC metadata.xml 1538 BLAKE2B 93c2ed3dc762e8c7ab2eb1d422c3b86407c43e7bab88d9e3e9ff83eb236e7900336e5f6c73fcf05002e6a1e8c3e143c9ed7c0651f9744d72aec6ff6945af1841 SHA512 41d6a055ff20fac07585324d3f98a7fe1836502c27259337a33eec0435d72364cf49dc5cbb006e375e0481b3ae22d6ce014fe917eaaa3779df32494f54de733d
+MISC metadata.xml 1568 BLAKE2B 41ed0afaba38302a1e1c2c6dee42947fb5a3221c0d58635a391193042e1d7589032722c215f3266c6771fa5097c91003e2f07166e794a801a264533f80481279 SHA512 12abec6ad35667aaae299705b1618c3fe173344a3ce4223213a437feef599afc381d7b31e8d2265429af8ae53c396e23fa673e44d666bb8910687d554f88d3d5
diff --git a/dev-libs/s2n/metadata.xml b/dev-libs/s2n/metadata.xml
index f7c25930dcdb..fd1c459874fb 100644
--- a/dev-libs/s2n/metadata.xml
+++ b/dev-libs/s2n/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index f8b2a413a530..6a1bd803cba5 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,9 +1,12 @@
 AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279ea70c06eba2bf69ff881577326c90b037ac538c4e0c75f156a86406b7fc357eaad7f5211bc255e885b57419c88af91087d519561e54 SHA512 77901d87773b2469011bce126520d33463907568991a1f2192492ac52331789c1e1cdc8251e2cf413c6493bb97a5e8737799ed3258616cb552ee038e9be65d26
 AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
+AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
 DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
 DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
+DIST simdjson-0.9.0.tar.gz 7952791 BLAKE2B 3229cc3cece573c9aa0fe21ba807e7698a038317dd17f7551d2afb79a1104efc0535e8af9b2f504cf00ce0f04a90bb7802507cf3d4188ff5d2dd057b7512d83f SHA512 800ae478e6f47d4e0cf1eb941b1a9f6a5098b2d6027f329ea50b449798798395d4ccab0c84271edcb7fbd2adca125ede3ad6fac3f2508e0af7aade85350af1aa
 EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
 EBUILD simdjson-0.8.1.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
 EBUILD simdjson-0.8.2.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
+EBUILD simdjson-0.9.0.ebuild 1194 BLAKE2B b59614cbbd18b3f9e63fc598bd1caf725fa0e596d90025855894c27e6805bef35fe34ed15a1e6a0f4f7a8c883ec23c69b2b307cbc0f285f4af1f97405c70e2d4 SHA512 90f1b5012ef9126f6a7ea974057616d8fb18ef15e9f4625b474d140d4634a82830148b813c26d1521e73e7e33476357233b8eefdd19f4cf135079156a28882c7
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
new file mode 100644
index 000000000000..49594ca291c0
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+index 2d0959be..324edf80 100644
+--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+@@ -14,6 +14,7 @@ function(add_dual_compile_test TEST_NAME)
+ endfunction(add_dual_compile_test)
+ 
+ 
++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
+ add_dual_compile_test(iterate_char_star)
+ add_dual_compile_test(iterate_string_view)
+ add_dual_compile_test(iterate_temporary_buffer)
diff --git a/dev-libs/simdjson/simdjson-0.9.0.ebuild b/dev-libs/simdjson/simdjson-0.9.0.ebuild
new file mode 100644
index 000000000000..b13f61e541de
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 46df8df35360..7b26b8902550 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,3 @@
-AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
-DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.5.0.ebuild 1111 BLAKE2B 86532145dfe22ff324a041b3e653d6d30f6a557f7dfc7c00c15c6ac54a52f0622324259ada1dea891da6429c496fc789490c29d6b45266ffb6b82137d124d53f SHA512 8b67f123f85c46ae3212aee3355e6e064fc840f5d79a726930dde851085b380c00d2ad29124991992d87044bf9c42a2c85b38d74fbe69a7d55ea1d2b850e1276
 EBUILD softhsm-2.6.1.ebuild 1066 BLAKE2B a4d14df59862d7d30c9f5bbfa34ea03f86dff1b23a47e2ca637e82538819a07797526179c28e727a1ba5f133b59f5b53f1596b142fdd52611eb57158a753219f SHA512 cee0e4c0c457e56392cbb2ed4e3c9476f7e518a9281bd699eedfdd99742f9e39cd24a21ff90813d5863789a1b2d2db2f61c63c98454dcfbaf457017c604810d1
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
deleted file mode 100644
index 9aeaf2939ac4..000000000000
--- a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 308b0b2760d6cb218003768747346d31764f1cfe Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 19 Oct 2018 23:19:48 +0300
-Subject: [PATCH] crypto: use ENGINE_load_rdrand with recent openssl
-
-libressl and probably older openssl do not support this.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/lib/crypto/OSSLCryptoFactory.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-https://github.com/opendnssec/SoftHSMv2/pull/423
-
-diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp
-index dc5f737..04d383d 100644
---- a/src/lib/crypto/OSSLCryptoFactory.cpp
-+++ b/src/lib/crypto/OSSLCryptoFactory.cpp
-@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
- 	// Initialise OpenSSL
- 	OpenSSL_add_all_algorithms();
- 
-+#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
- 	// Make sure RDRAND is loaded first
- 	ENGINE_load_rdrand();
-+#endif
- 	// Locate the engine
- 	rdrand_engine = ENGINE_by_id("rdrand");
- 	// Use RDRAND if available
--- 
-2.18.1
-
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
deleted file mode 100644
index d9c6a91a08d5..000000000000
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist gost libressl migration-tool test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	migration-tool? ( dev-db/sqlite:3= )
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:= )
-	!~dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gcc:=[cxx]
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
-
-DOCS=( NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable !bindist ecc) \
-		$(use_enable gost) \
-		$(use_with migration-tool migrate)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	keepdir /var/lib/softhsm/tokens
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index cc093e17a905..e071c4be666a 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,8 +1,4 @@
-DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
-EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
-EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
-MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
+MISC metadata.xml 474 BLAKE2B c66a689b156ede0e146807626045108496b9557afe1c24992f3314d1eba04beeb47e3048286df4c0a029410bd19892eb963910f3a505e3b609010a76a48bf223 SHA512 41ad4b9ee9d6803838d1f090616c4d6d2ecd754c62d6f271815aa77bf157366b659c2c78233a912d0b92dc372ff123b96ea77a6db37660b09783f6c5c2f02f61
diff --git a/dev-libs/spdlog/metadata.xml b/dev-libs/spdlog/metadata.xml
index a7c882298820..505ca0a5ac6a 100644
--- a/dev-libs/spdlog/metadata.xml
+++ b/dev-libs/spdlog/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/spdlog/spdlog-1.5.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
deleted file mode 100644
index 0ced6aabc53f..000000000000
--- a/dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild
deleted file mode 100644
index 1c96b2168c83..000000000000
--- a/dev-libs/spdlog/spdlog-1.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-6.1.2:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
index 66350041d8c0..4bc9886c4c95 100644
--- a/dev-libs/stb/Manifest
+++ b/dev-libs/stb/Manifest
@@ -1,3 +1,3 @@
 DIST stb-20200713.tar.gz 1378579 BLAKE2B 13f2deecdc20c95fe3dfd1820346e9c8d1046004082a4b6044934efa7e20270b253953fb8e2d9eecf2a263ea342b740d87807e50da48178c0eb4c7028bd27488 SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d
 EBUILD stb-20200713.ebuild 719 BLAKE2B 51077574a1751160fa47f7a15cc58069fa7a51db0002ff0e97ebb50df58ad3f843eb57b642f782efb1c0df0f712939a3f09ce3234b4905525131397e3babc18c SHA512 5216946ea6ddbdc04776adbdc71a44895cd62a0e33ebf5fd54a279d8e4f39beac2cabd82bc884ec4d6b549f2523dcd77a7d109d61b4a6cac5b998e85ea2bd987
-MISC metadata.xml 626 BLAKE2B eec1e68c5005e9bcf16a25774f766b33ee02e7c4a3146957a7a7c011f42185fc9f4fad48be96543187573b59489c5dfcb8412d7d26719ce4374703117a4ec9ea SHA512 c0658ffa41b20ff650609b4e31072845977c97f09c9879248a76fd89c3215bc22bf2e992a1702d59b775edb9464d70cf20f866a08d7e885ac0f13d6380079a9f
+MISC metadata.xml 656 BLAKE2B e115ac3c5bd94e363bed162a039375b482fd46876c06083f144e53feac27c627408d98001e7ea39c5fdf3af0ce4e402322309834853db748b3e7c3d531d606a1 SHA512 e55ac4b94c3c55196c3da1d9827a519f676f92f1f079cc0cb3c22983164b0cb24785d26abd19af8f9891007b0a812412173fa489767823338598bcf35c0bbb28
diff --git a/dev-libs/stb/metadata.xml b/dev-libs/stb/metadata.xml
index 06108ef2af4f..16de650fab19 100644
--- a/dev-libs/stb/metadata.xml
+++ b/dev-libs/stb/metadata.xml
@@ -5,11 +5,11 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
diff --git a/dev-libs/stp/Manifest b/dev-libs/stp/Manifest
index 3328be554928..486493b9ed0d 100644
--- a/dev-libs/stp/Manifest
+++ b/dev-libs/stp/Manifest
@@ -1,3 +1,3 @@
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
 EBUILD stp-2.3.3.ebuild 954 BLAKE2B 5651116f8a31248a8f99c733149d1f637b2270fbfaf42490cd540b6d9da83f5ca99acea1ae8851f43b70594e39f8ea420c2df0320ba47854415c99677473a65d SHA512 d65df738ad4177802c142e1b91c445512e2477bbe2aa0ebde34c70132c29bb1b71beec6a1ac1a09fa4ea523000544cea146e10ecf22a03f91d1aefe197a4a829
-MISC metadata.xml 881 BLAKE2B bb604f1cf823b06a4d7bff96ec805bc2418dfcdeeaa17ca88f98c509b687b7467f7c6864d25294d8f1f1e4cbaf0e7d99b82edd27fcdc552353fe5510d1fbe375 SHA512 4b3e243ae419cb974f49b6d37e3e807f5ff0676cd989dc145fcd716c23bd2292177935658ea899afd9fc37a18dffc8c0949dee4a25b2e493db0f3713703ad2cb
+MISC metadata.xml 911 BLAKE2B ccc83bdfeb6e7e77c0e9d5a1676cf9c83192778e2b749ff83ddda6faddfacb1a84eec9cc97fe8c3bdb40a41fe168f85021a35fe0ecb9268e9c13af33caee4d2e SHA512 5a0081a1333d9bb52fbf4b8a9c9002fdfcfe35c47e9ab9bdff05f1d8d10eb6b06b923aa25c23c3b246466016ca9023b76eaf1176c6516cf77330472263e34c5b
diff --git a/dev-libs/stp/metadata.xml b/dev-libs/stp/metadata.xml
index 2b1417586ce7..7fa176112470 100644
--- a/dev-libs/stp/metadata.xml
+++ b/dev-libs/stp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index a8ac8610d6fa..006eadeb82bb 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,9 +1,10 @@
 AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
+AUX tntnet-3.0-autoconf-2.70.patch 2238 BLAKE2B 65b5cd276f35ce4b046dc1b6ce4be086935eba283266520b7ba07db6e83b066dc6233d40f80e13131c64e28412ef7974326339f5b2d694a8c2e87b5610dea3bc SHA512 7cebddc0e366499935874706a58620e5f277d5f39a1644733895d2899a97818313e70168c9d9ec91313c9afe9e2a513367b99c109e3b6065c5ab2a688ec05a80
 AUX tntnet-3.initd 550 BLAKE2B b31fd930b69c62c3439096c8de229a256d3f77cb18be752902b577950bb757cb06bd0f19005b25405c263f64d0d8db5d18b0b914d552a25875620c8c44ce090d SHA512 1be6437278de9319806a7fd4ef8cfb7674e4c04b156c2342f850d8ee9aa33c4c490cb64243592f1d6605e96cb51192216f859eac2a59e7aaea8d2730a9dedc0a
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
 EBUILD tntnet-2.2.1-r3.ebuild 1900 BLAKE2B 273821b9179d910302c61511a7cd80dff6aeb16091dfdd387776f2953a8c1fc0338ac534d3958e3adf45fbfd9fd2d7742b22cafcfb42f3255bc0cc958d5b530e SHA512 db7ced55aceb5ed38ba87107a5d2bb63aebf3471b68a87592e5bca48bd23301d35ad6fddd2fb095d3371beb8a89c2a55b73a341f474c0cd33cc1186e952a9e05
 EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
-EBUILD tntnet-3.0.ebuild 1456 BLAKE2B 0f50b43c9fe63257123cd0784206c2ae47174d0d27ca37e60e27e726f09dbf74a103122bbca4f243a4c3a6e9759a0dcfa8b1d635f672d2313ed4d6d464cd3a5d SHA512 40bb15dd86bf440c37c26e3690f359a743948b5bcc5f434732e1b3a45ebc021ca3a2398aed5678dbb78007a367e4e73bab624e2404c64ea1626ff825a7288155
+EBUILD tntnet-3.0.ebuild 1514 BLAKE2B 014c4fae89038f5fb174bcee7380a87cea815bb6cefd1d7bd6245064b2db43ccc1e83ad6998259b1c434024c137234a9245874bb2ba159732f9ac82d261a53de SHA512 d6d10e5e59fafaa060cc67c017c5288ef3870f89a19459838e449596b7abc6d844116278e4a4fcd479e84eb9e20d3fdfc010b16d4f29690126bdfafe20a07667
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..6e25e683da1c
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
@@ -0,0 +1,78 @@
+diff --git a/configure.ac b/configure.ac
+index 0c7732c4..52227db0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,21 +74,21 @@ AC_CHECK_HEADERS([sys/sendfile.h])
+ # optional components
+ #
+ AC_ARG_ENABLE([server],
+-  AS_HELP_STRING([--disable-server], [disable building tntnet server]),
++  [AS_HELP_STRING([--disable-server], [disable building tntnet server])],
+   [enable_server=$enableval],
+   [enable_server=yes])
+ 
+ AM_CONDITIONAL(MAKE_SERVER, test x$enable_server = xyes)
+ 
+ AC_ARG_ENABLE([sdk],
+-  AS_HELP_STRING([--disable-sdk], [disable building sdk]),
++  [AS_HELP_STRING([--disable-sdk], [disable building sdk])],
+   [enable_sdk=$enableval],
+   [enable_sdk=yes])
+ 
+ AM_CONDITIONAL(MAKE_SDK, test x$enable_sdk = xyes)
+ 
+ AC_ARG_ENABLE([demos],
+-  AS_HELP_STRING([--enable-demos], [enable building demos]),
++  [AS_HELP_STRING([--enable-demos], [enable building demos])],
+   [enable_demos=$enableval],
+   [enable_demos=no])
+ 
+@@ -105,17 +105,16 @@ AS_IF([test "$enable_demos" = "yes"],
+ )
+ 
+ AC_ARG_WITH([md2man],
+-  AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])
++  [AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])],
+   [with_md2man=$withval])
+ 
+ AS_IF(
+   [test "$with_md2man"],
+-  AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
++  [AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
+   AS_IF(
+     [test -z "$MD2MAN"],
+     AC_MSG_ERROR([go-md2man not found])
+-  )
+-
++  )]
+ )
+ 
+ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+@@ -125,21 +124,15 @@ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+ #
+ AC_CHECK_FUNCS([setenv])
+ 
+-case "${host_cpu}-${host_os}" in
+-*-aix*)
+-    SHARED_LIB_FLAG=-qmkshrobj
+-    ;;
+-*-darwin*)
+-    SHARED_LIB_FLAG=-dynamiclib
+-    ;;
+-*)
+-    SHARED_LIB_FLAG=-shared
+-    ;;
+-esac
++AS_CASE(["${host_cpu}-${host_os}"],
++    [*-aix*], [SHARED_LIB_FLAG=-qmkshrobj],
++    [*-darwin*], [SHARED_LIB_FLAG=-dynamiclib],
++    [SHARED_LIB_FLAG=-shared]
++)
+ AC_SUBST(SHARED_LIB_FLAG)
+ 
+ AC_ARG_ENABLE([unittest],
+-  AS_HELP_STRING([--disable-unittest], [disable unittest]),
++  [AS_HELP_STRING([--disable-unittest], [disable unittest])],
+   [enable_unittest=$enableval],
+   [enable_unittest=enable_unittest])
+ 
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index e09bb6e710d4..07f7369d5a46 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	app-arch/zip"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0-autoconf-2.70.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 27a35e1a685d..8089d9ce2091 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -2,4 +2,4 @@ AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 EBUILD tre-0.8.0-r2.ebuild 1455 BLAKE2B cd1c67ed4394b42a7b1871ebc6cd8fca2cb6da5be5f96491d6a20996642b1aca718db842331e12b3d3d3b7dc175faf43ec2e2839a12934a4c1f0398fa4c1f738 SHA512 cf184d2a734a97224c4ae03f1a062bafae034d3355430523448a0e3e5c8007fbeb87fcf7ca0c825d67c802e32f36cd7b69ed632e4a786243d67f388c8eb79f0d
-MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
+MISC metadata.xml 353 BLAKE2B 282c9b6b3e45d26d9afff940f2ddc27484d03c45c53aff87384018d0fed3488b35caa8afd81a6f5e171988238df01f7798f8dcdba8f885e74a9e76f7ebfc16ed SHA512 eab7eb9923a843c519231d331bfd86f842c33bfc30a019a5275a39402ea597c3965a84155e08824762e621b7173817d6556d1ea9124a5528d5d8add88c03f364
diff --git a/dev-libs/tre/metadata.xml b/dev-libs/tre/metadata.xml
index b675c9f5b843..3c543fee7024 100644
--- a/dev-libs/tre/metadata.xml
+++ b/dev-libs/tre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 88e14f0c7354..19ba4e556e3b 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,7 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.0.tar.gz 2861471 BLAKE2B acb1ff34c2ce4bc3995f59569f1ffa153c76013701eb04b834ac041efe6a533397bf2d540b55c27182194a0dbe285698927f29a2be001add8235ae4357e15e2a SHA512 c5315b1b452303d0a2ef2e710cb282c303649464c0d0ca41380fef2a26f551a6b6166991f6fcf48a5a9c046871d368c062d1354fd0e1f327509c4b554ac8731e
-DIST tree-sitter-0.19.2.tar.gz 2864890 BLAKE2B b3c8a79ed5fa5749b5b824c03a7ae451c08d28c6f2f23a17e0b4b77d7c7c834a067025e3f8da7af75ee54773c186e394fb5cfac37d370e4a9f9489eb9ad7df19 SHA512 f021b44ca78f6855d0362eca122c01d0134ce376f6123547201abc86490276134b650f33a600dc72dc12916bb14e3b5c3814c480d4e789dec7f39bbd3175bd65
-EBUILD tree-sitter-0.19.0.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
-EBUILD tree-sitter-0.19.2.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+DIST tree-sitter-0.19.4.tar.gz 2869774 BLAKE2B 4f39a565d12f2fa0cb3a68c2015fd83a3445e5951a2293e1b37ac6c98c430aaeb1e219d33b11691de2c198b0039dd2319df53ab3be8c136c25a744f1c355d48c SHA512 269a9022f11c153c2dc09446273cc65de3f4fbab7ce2c42605b1b41abc5c98368660f6f10a5fd2deb751d6b9f21cf52a4351fcfec21bd6459be681e16eb2efc0
+EBUILD tree-sitter-0.19.4.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
 EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
-MISC metadata.xml 692 BLAKE2B e8a04ac2d2dbe16214d82067944baef692a4e8896fcbad7feca9e54565e603b0e5308bb4f1e4bc5aaf39f41b1ca0e10fa5710159ed1012c6ed47f2007fa19a69 SHA512 a319341832c189a845f1a757b17bbefc10a7c4b00c49e80b49745061112b91ebb80f2f96a99de27ed6aa5799f25bd56ddec3eb41bfb2507b037ee8e965525053
+MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/metadata.xml b/dev-libs/tree-sitter/metadata.xml
index dcfdb27e8a99..2bf83afdce78 100644
--- a/dev-libs/tree-sitter/metadata.xml
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>abdelqaderali@protonmail.com</email>
 		<name>Ali Abdel-Qader</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
deleted file mode 100644
index 62e7c8355b29..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
index 62e7c8355b29..62e7c8355b29 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index b0966d4f33fe..216604c4f4a3 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -19,4 +19,4 @@ DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
 EBUILD tvision-2.2.1.4.ebuild 1594 BLAKE2B a1bccac96513ec89519025292db0189fb4dba4c8cb132bcc1367b8ff14664bce0113b5fd550dfc66b8357acdc25cd76523732414ffe13c5917e8390f97ffda4d SHA512 4c5acb5a63b1676dc9e5f92736608d579f7055cf4e0b301d3042f76ff56fe042e802f38a3b18608df4c9c3c273065de292713faf46bcf65e01f295b03add0ad6
-MISC metadata.xml 554 BLAKE2B 4c11c1b140681f4b0b228f5a586526a496946a198587cc98148d4e86af29afc7a4e7981074520af47850dace4d8b4bb3d0473f2e3788cd05cbd9fb7293a4297a SHA512 5b3962e4385fb76bca1a5d188ab072d625c24a4e471d9c50c402200a00f42ce1ad3a993a314bf3b99203d6ce987a43fee59d42e74f7f923cbdea2ee6287bdbff
+MISC metadata.xml 584 BLAKE2B 9e0a46f70886d90423d03dbacca6f561f72aca282cbbead51e61a78632d93b444caf1d4485f0cdc1a3c8ef6069e0da7f04fc9eb152a0f630f8ed745e2347e11e SHA512 5c47abf240f67aa4eac6aafb2d1ca26bd494ffb8eb3ecaa6c989939cf201707ca50be9244abda468cb17391d4d8acc287a6676f4fbd565587cea446d51da4bb1
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 2b609c0582b1..9bf7fccc56e8 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 2f92f5745f7b..89795166feed 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -2,7 +2,5 @@ AUX unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch 2311 BLAKE2B c7d8511fbf097
 AUX unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch 999 BLAKE2B 02ac677273d5b2c52e23683b878df04095ddfdc294c87778da71e1e3f4a2c0b2012f9ffb78f92f43a5667b8c76426abf094b8048c76283f69951f3e8e3fbb104 SHA512 089ab6aa6b68f52ba7d61a4b7929cfefe4feb25b73ff6ab0f05e9a8fec29e502bc2bf5c16cd620808e24267f04b3330572baf232d8ce78e459d439c22b22d0b2
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
 EBUILD unittest++-2.0.0-r2.ebuild 1247 BLAKE2B 1e5ddea7459949781726f1061102d238c4f236c1bb1d6ca609deca225d597482c9f42523f897101bfced06ad1ce12f47b25a44f8c7fe05b78d4f1384bddb52b0 SHA512 4ae29d6bf7b359d38b8b6d79e4d7fd37d09be18ebfd321b0cee1dc0cc34a5980f800ec5a4385f491bba32ad4a46365f5cb9e1e6723178a01132a08574f074229
-EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
deleted file mode 100644
index 4744a8bd5dd9..000000000000
--- a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="unittest-cpp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A lightweight unit testing framework for C++"
-HOMEPAGE="https://unittest-cpp.github.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d
-PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# https://github.com/unittest-cpp/unittest-cpp/pull/163
-	sed -i '/run unit tests as post build step/,/Running unit tests/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Don't build with -Werror: https://bugs.gentoo.org/747583
-		-DUTPP_AMPLIFY_WARNINGS=OFF
-		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/TestUnitTest++" || die "Tests failed"
-}
diff --git a/dev-libs/unittest++/unittest++-2.0.0.ebuild b/dev-libs/unittest++/unittest++-2.0.0.ebuild
deleted file mode 100644
index 88339de12284..000000000000
--- a/dev-libs/unittest++/unittest++-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="unittest-cpp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A lightweight unit testing framework for C++"
-HOMEPAGE="https://unittest-cpp.github.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d
-PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# https://github.com/unittest-cpp/unittest-cpp/pull/163
-	sed -i '/run unit tests as post build step/,/Running unit tests/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/TestUnitTest++" || die "Tests failed"
-}
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 1173f1a31a06..11fd1da28e36 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -1,4 +1,4 @@
 DIST univalue-1.0.5.tgz 20114 BLAKE2B 21f1432bf62325547db7a1ce0c84d80f47b160dc19de3567eea4678a0f242fb2c814daa6955f7a2b45c5b75e859b6d2ecdfcd68abe58f573752c0f037a099d10 SHA512 9c2273d82267aaecd2b017d00ae8bc40f7f40fff10ce6176bbea0df93d7c9478fc76a38101f0b55ded0a3c4fc49f00c868aad33deca4d936b85342ec6a394eab
 EBUILD univalue-1.0.5.ebuild 576 BLAKE2B cf6789b8dbf97d2693885ab9e9ecc2be2284daea820bce6bddafac27f63dce3cbaf81423bed41d4b6bbb49b7e829297fd4a3a535873244253ef3dd7f77e55100 SHA512 597ec9ce7a151758e715af7a41169dafa133c3f93f49d999dd9f08aa37f547d53f2371a6c663166606cfe95ca93ac3116a1b67e5519c386d72e1a9456d2364f4
 EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
-MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
+MISC metadata.xml 501 BLAKE2B 5a69129830e413341bb23bcf8addae76824185f2ac07df26242267a8ac01207c1a3d02c666db516c17117cca7de58651203ef38376ad2c0c29c975908b96d56d SHA512 8dec940ee32f3c0ff1c97236db7df9a891ecf1b4191afec41f057fc8af61be68fc7dbf167ee0bf1a5afd30550d86e2d682c19c94ee4201f32e4b669378bd76a2
diff --git a/dev-libs/univalue/metadata.xml b/dev-libs/univalue/metadata.xml
index dd4ad75523d7..90430f53a37d 100644
--- a/dev-libs/univalue/metadata.xml
+++ b/dev-libs/univalue/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 8b72e1e99db9..5963c02d95b0 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,5 @@
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
+DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
 EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
+EBUILD uriparser-0.9.5.ebuild 1413 BLAKE2B 8a27ac829f2b24d066070b45810a7bfdbdc4892a7bcf3f1c0f887b84c563df7b9f8d8a36dbabffb6f4d07a2814a5568744ec1faef619b9b369560eb04f6e3680 SHA512 0948656fa671161f1ea15d39d6035031606d479b53749d746d7de13b069c51a4908d24a766b7976df7f8c93cb37e2d4fd20162bb49a1f0b3997a0e892c956fc9
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
new file mode 100644
index 000000000000..559813f6f523
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
+
+REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( >=dev-cpp/gtest-1.8.1 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.8
+		media-gfx/graphviz
+		qt5? ( dev-qt/qthelp:5 )
+	)
+"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DURIPARSER_BUILD_CHAR=ON
+		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
+		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
+		-DURIPARSER_BUILD_TOOLS=ON
+		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
+
+		# The usex wrapper is here to address this warning:
+		#   One or more CMake variables were not used by the project:
+		#   CMAKE_DISABLE_FIND_PACKAGE_Qt5Help
+		$(usex doc "$(cmake_use_find_package qt5 Qt5Help)")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc && use qt5; then
+		dodoc "${BUILD_DIR}"/doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index b07f53f3dd0e..5cbce7d13e74 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -5,4 +5,4 @@ EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b740
 EBUILD utfcpp-3.1.2.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
 EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
 EBUILD utfcpp-9999.ebuild 898 BLAKE2B 3412683e554ceae20d79a57b4487f614175decaf501be0f4dc33f95ab81a822cdef2a3d736442f2fe7b1c8ecba30f62b9db3ed7638300d9fac3ae289dac7ba39 SHA512 3ddbc5569ebe18570ab9f6f437240c707706df91c23851761e8749c6b9efc11abd1ea1393ed2b9dd8bce497939715de56de8d0121810123773fc63f30496b812
-MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
+MISC metadata.xml 489 BLAKE2B 2ef430c67b786e25a0957139d366ce549e68050c1d6b3c70e3ca26b5d9a3e0ab636f4db1ae14b415fb21ae8c554a375f7bdb2f2e2d6935574df69893b2158ead SHA512 5bef0ad84410e96db68f4af49053d0046e4e2c606dd93cc6693fa3bf1327af0e88f747c2ea41675d353792711fe4e02d05ac3b74acfc0d5841bf8236ee2bb6ce
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index d25cf40411bd..1709ceadd449 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nemtrif/utfcpp</remote-id>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 99df16064912..a16c123628cf 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -4,7 +4,7 @@ DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
 DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
 EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.12.ebuild 653 BLAKE2B e9058802a80a1e5def9cade1ee0a8b91c025ca45fb6abed786b30e495c9cc3235348ccf7ec1d168f924bb6d3729c3ec4cc68054196c40d5a516fc7a8da3a8ff4 SHA512 604181259a41104e04e349b086ffaad7dd8ca3dd17e4ccf5e607f17b245a4ac2587eed6c93e5d07bf250f08445818bf67b751291e7c212c895a4591acd80a0ef
+EBUILD vala-common-0.48.12.ebuild 651 BLAKE2B c5cb1a42522cee6afef4cb3827cdea1e4c539aa4ec27e68236344f92a1ca64dc92ffbf380bb5ed95c39a9a80ea1db1c020ddac19726d47991790eada50d1e2da SHA512 d7a58a7e2a330f071481ffab85f64d6faa4a54609e32916342dfd36d6e881eebeb250f28cb65a37d51af5754e984b3704be5cc8c5573a263c9c1eeb428d30d26
 EBUILD vala-common-0.48.6.ebuild 645 BLAKE2B 41f2dc961ad49516633d96a5f899fcc545b50c2632917ce1bb44e96eb5af458db56dce8838544092810ae55b3e4b88070b344d6905830cf5c8a472f3415366f6 SHA512 1edc9583a5e34b7592a4169c2fe3300deeba71015c1ce376d05d71a998e127ec77fa7c558b1b4fb8fdda5cd8c2556e3dd7a752d87647209a7e4cf678d4ea28e6
 EBUILD vala-common-0.48.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
 EBUILD vala-common-0.50.2.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
diff --git a/dev-libs/vala-common/vala-common-0.48.12.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
index 4ac1f54df43b..b865eea1db7e 100644
--- a/dev-libs/vala-common/vala-common-0.48.12.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vc-intrinsics/Manifest b/dev-libs/vc-intrinsics/Manifest
index d7f314a64f3b..464d57dbc868 100644
--- a/dev-libs/vc-intrinsics/Manifest
+++ b/dev-libs/vc-intrinsics/Manifest
@@ -1,4 +1,4 @@
 AUX vc-intrinsics-0_p20200904-cmake_libdir.patch 717 BLAKE2B 7c3d72b87b0acc67c223a3468e96ce68c5c1a166bccacc045d73e5d29a063856b23ba959ff1e13d07333d20803cedfa3f55f490ee9ee7700c708876de1960f71 SHA512 927c89f748fa21d3ef9349749c3428014b055a88d557dfd310f2b76c7f9e263400267558a83871ab132c295a997dc0488b9df2167378b9c1dc691469e1554f4c
 DIST vc-intrinsics-0_p20200904.tar.gz 97118 BLAKE2B 7f1a4f0b3b5f8abba8972668877562fbc6835ce8cfa9e0b336541ee6db72ff1469917320b63dee7d193af89593bb318c9fcd000ba5e8d62df5729f69cfdcb9c7 SHA512 7b5f87dabcf1c093c50721390dba9c82a1f0da1a087d00af4bf1c2e080bffa531b8d16fe8faacfaeb4862b528929865263d0e84a5ebee6a76eef1436dc4e2ec9
 EBUILD vc-intrinsics-0_p20200904.ebuild 1355 BLAKE2B e4ebb93f1eb3b500027788d4dbb6d089411af2a443579ee60096b33a5e0421e3673a4503b435a452549077de2c309d18718fbd94f26ee3be4e4604c617456325 SHA512 836b14997f421581e21b2af7bb8a4866392f000610e09d792adefe85077f416fd5b3a40934f7a57e85bc1c0ebb555d6ec1f43e36be87e7a5ee9ba7936fbf2ee9
-MISC metadata.xml 252 BLAKE2B 9478a43631ab002f4eb32d800c24979b5b5c5225e4b54eef2457a040a86f0003442138e93723e678ad45ab346a7c84239725d007a09ae04fad1019ee42c9b689 SHA512 69ea8aaf02f2bebc26c2d4620cd15f20139454eb7e0f3ae25ad0d5d628e5f7cb013a7b2bd44ac24c09eaa2c952e280ad7f116f8714c768dfb7668abf3b894353
+MISC metadata.xml 251 BLAKE2B 91d839cb92b2cb2138bc8e4fa406107a0c0a425a5bca54a07ca81802028b2e1878e973ca577bd1f1bdca3c6ccae6fd229bc30de57b1f11e5798cad8e93460a82 SHA512 aa1bccb04b93123ae34fc01973dfa49e42765a1cf78844bb608bf36da9019b3084b537079f163d1ba64d0cc34c98ef68446d59cbb7af3fdd15e637f45e881dd1
diff --git a/dev-libs/vc-intrinsics/metadata.xml b/dev-libs/vc-intrinsics/metadata.xml
index 59d021249019..f3dc8d7eb66a 100644
--- a/dev-libs/vc-intrinsics/metadata.xml
+++ b/dev-libs/vc-intrinsics/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">intel/vc-intrinsics</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 73bf76641e48..59a4ac09877b 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,4 +1,4 @@
 AUX zlog_no_static_lib.patch 1974 BLAKE2B 67c9cc1f7c6856b44096648d36085ddf9ee41074a82ff2dfb4a3b9feb13968bb6da53797f7a63f969b3a34dd1cc2e61a36eeb63b9d78512294e8dcb9e0313f75 SHA512 fb4acd9937112bb1bd044db0446618bc098e8cf87156f792dbe98c4c6e3ca9a66f4c047639562485acf371c20d12754bbd6b233d5bdc45c28b99e67779c3d5ad
 DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
 EBUILD zlog-1.2.14-r1.ebuild 677 BLAKE2B 1e87dfe72852c91ff3bf2d8d0c84edb3d40502af499fa96ce666e4bc4663c6a86c1e152d44fb9990c96bf0ed487290356d0623707d0bd082200ada3711e9a0e5 SHA512 0741244fbfeb6fd95568268279a6baa0fe543a66cb9448a0ecc810c4629e21a85ed1b8868464ed6601bb84ea7b1ae7f9365c6b8a3d6cf2c35d75e31ac46d81c8
-MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
+MISC metadata.xml 343 BLAKE2B 89638546a983a00dbd6d23bd6367b8bfcfddeac9bc5d124711f7504ed5acfeb9fa7783e53dbd48962852b7c2d0a1d8fdb698f40e7a34b8845992ef4f37b1ae0d SHA512 c298ff8a2e20c56ff911c10866ed06ae28a34b8c52902963de0e7a52494cd94732247652d638c1be292d13e207b2c74510a77580e800131022e3118302889c8d
diff --git a/dev-libs/zlog/metadata.xml b/dev-libs/zlog/metadata.xml
index af68f28d59c1..aeaf6c3bf36a 100644
--- a/dev-libs/zlog/metadata.xml
+++ b/dev-libs/zlog/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ce64d5c42bc1..1984856807c0 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,3 +1,3 @@
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 EBUILD zziplib-0.13.72.ebuild 1258 BLAKE2B bdcf7833a983bc1eae81c2da26f6159c80e63d4bce90fc3d64258020eb1508b9236323d263a7f380e86d89033c3b8c0b16c70d565074154053c53f76689e7c9a SHA512 0bddcd8386ca17dc4bf8d49c68d4a9777c0f8cd8613aa10ddc5d862c0274a13e079e5a7dbeae9e2b33ba5f0f317dff6ac6bf6b2a1ba409f2a847fc625af1bb0d
-MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
+MISC metadata.xml 534 BLAKE2B 75453ba275956e63942619a0fa2b92eecb9417deef4576c9cfdf4fad87440800c85a468033b8205ca4b8c62383e103fd6eafbdb2b66b27bc8a705cd66a8784eb SHA512 8cceb9837461402b45ca7cc800a4b52358cc06b6e073a505b69c0fa2e24c8ed7544477cba0e01e855a35c02b45842415a5e63ea640abb98408f8e53deeb98f8b
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index 6183ccc5b3b4..b967c2510b2a 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@pogatzki.net</email>
 		<name>Volkmar W. Pogatzki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 0445144ea581..9eb5f2334f4f 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index 2302fe5ef3b5..c49341397006 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1,4 +1,4 @@
 AUX c2ffi-10.0.0.20200527-add-target-link-directories.patch 394 BLAKE2B afc5089d594af74d9bf2707d22c120d17bc6a195756bdc89773369a29a3e727e96806392b7620dc9df60bb34546f60f2db1b0be2cb6a70577c69ccad52092918 SHA512 ad72f333e96947aa0ad660ccf683d64d17e377446001a7403cf1ab2ca7a9c05aaa5b28303ad616fb9b7e77044b5a971374c695220cc731b078ccc5198eb0c192
 DIST c2ffi-11.0.0.20201113.tar.gz 37608 BLAKE2B 59a97867ab7675a00ef2b513abd67409b6bf4540a46b3f5fb19bf4747cdb5dbe93a01d8b308b917ae4f7c17e9ccc52c6c29c80a5b0cc58cb6a7dacf4a9d0c140 SHA512 2430cb56c29a392c2efbe283761580ec23d8d2a0945a7ca39237bcf68f419ca73ffc2cd8a39f5c822f2e4b8d0b9b2abf9851a908549a639158f8c4858ecf0768
 EBUILD c2ffi-11.0.0.20201113.ebuild 619 BLAKE2B a91daa515b1820a9a8f9bfd5703da22f0c3124add2c5eb4172108b8fff1057c65ad085ade78115ed02060f8b365196091b2d8dcf93cfc05cf7fc4c77be3c4242 SHA512 ec5d9518f4fe77bd07496a693354758c38c4f3c34d807fe3525aefa9e6f5c2437d90d9698d453c3c5ee032038dee21572ba0fced2e3f4d9332138c4de373816b
-MISC metadata.xml 421 BLAKE2B 2df9693805f6968df30c8df0dbb1578c11b064b5f3b23f96321832c7551dbc751ebaeb81845147a7526f891b658aaaff8efeea185b239576e2885d3606944e87 SHA512 7bf517258ecbdf98192c055c451fe16315b34ac8875528b0fac4e844c15f2a4656d2252a88bbb642b54bc608a21d83af158cb5e6872b46e70d7c32f557b83de1
+MISC metadata.xml 451 BLAKE2B 551ce40e4d1bc7761bb3dd6a4e4f270b53785fa96b6e4f824be266847e2cd187341f2f6188f03b27a6c6761bc52855c2db191434c8d3b8efd33d899cdcccb675 SHA512 ee9ad4db08eb23c6182bdffe1da704304b06f45de1dad642ed5fae50d82a8beacefb627f48aeff425c4478e32eb51aa3aec5232734eac7574470be89aa80b816
diff --git a/dev-lisp/c2ffi/metadata.xml b/dev-lisp/c2ffi/metadata.xml
index d30f4079e72f..794c7caf794f 100644
--- a/dev-lisp/c2ffi/metadata.xml
+++ b/dev-lisp/c2ffi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>h.judt@gmx.at</email>
 	<name>Harald Judt</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-lisp/metadata.xml b/dev-lisp/metadata.xml
index 6258c8c7b1b4..405bf269fa1c 100644
--- a/dev-lisp/metadata.xml
+++ b/dev-lisp/metadata.xml
@@ -37,4 +37,3 @@
 		językiem programowania Lisp.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-lisp/roswell/Manifest b/dev-lisp/roswell/Manifest
index 0ad1bedc6496..fde9a3a520b6 100644
--- a/dev-lisp/roswell/Manifest
+++ b/dev-lisp/roswell/Manifest
@@ -1,7 +1,3 @@
-DIST roswell-20.01.14.104.tar.gz 164384 BLAKE2B 905bb54081da137c588b911f1aa6ef4957e9d860c9d42b72bcda37b084d4049c4234a757514170e2a857de40c4970d70e53e98d72bbeb037e5c35930fbd9286b SHA512 8eac3ada8afb9f2ee82004e46fcee72e45cfd2ed4e86dea8892ff6fa0bb5339bca7e3d1d4a7e2930d6848ef1bf1ef4b63aa576382bee1e66e98cf50441c81c7e
-DIST roswell-20.04.14.105.tar.gz 165121 BLAKE2B f7f0e651768aa2a0d8ccd648b511eaae8d9c18e64941b0ce1a155017e53bd5b6552b129afa35ca1132765d1f03ed91c26d9d83f52799704857f1c3f1475f581d SHA512 3e63b206253c0922877beb0c5091fc42052cb6a711b47333c3d6553cd22eb509f6fb09a0e073465bfb45225b46aa4041d760df17c8e781d3b815c583e9578c3e
 DIST roswell-20.05.14.106.tar.gz 164302 BLAKE2B bd2387bea78a746d5cfedc27e9d636ef7bc0f5118036ae2270c49a4361268527fafe2683850a2dcaeb1bf3f14db6a24fecd98f395081fdc1b4db620838d2936f SHA512 03a923accc4d6ac9a3a3e0fd1853441bf4be0268571e8b6ffffc122170befad6b1dcda6f062a566b54229bb325efb6a5d39459ce22a89355e927e3fea1e08cee
-EBUILD roswell-20.01.14.104.ebuild 492 BLAKE2B 03043785edd822cf9eb850ecb74b345a8550afdd2e8f65d923f200ffffaffacc8ea6e56f3a36619e2b2ff7e6cb871b3a11d8da0401a682b89ef757ee35d3314e SHA512 707515dc5f0f25be00ec6029c588044668394975d30a8cbf157fe377287c8a9775da6e494ab63f08f5f964cfbc127609c7aaacb7aee648d93398186ba8869e32
-EBUILD roswell-20.04.14.105.ebuild 448 BLAKE2B 63875189e2f002c32e017b4d02840c3621aeaf3e2f04aa36af947fe5e96773ea95293bd8d14ea31f17280bb2a3fc8de8e6cc639b96b3c4d5bd1f9234e80d9671 SHA512 28cfbb5f37453c8c6ca96c825b7e9968b7a4dee2e9cd7d9883487b58e1eab1bba79cd65d170f88088a73303b3008b1305c3c66f3a5a60b1039cfce2192148d28
 EBUILD roswell-20.05.14.106.ebuild 448 BLAKE2B 63875189e2f002c32e017b4d02840c3621aeaf3e2f04aa36af947fe5e96773ea95293bd8d14ea31f17280bb2a3fc8de8e6cc639b96b3c4d5bd1f9234e80d9671 SHA512 28cfbb5f37453c8c6ca96c825b7e9968b7a4dee2e9cd7d9883487b58e1eab1bba79cd65d170f88088a73303b3008b1305c3c66f3a5a60b1039cfce2192148d28
-MISC metadata.xml 655 BLAKE2B 91386e6b98fe2dcce69cef28983230e97007b0edd90e2b521f57a1d67b7a7d20d4b67525691e04ec9131b69be455d7220fe6a5e0436767c216a540b44c642b39 SHA512 a3152c908d723c2ac8888241ea21765eb1db041080ceaf62910f954e2c70e43d8a3fcfb21e2a829eafc68e024266143a4dc2ecf475cea1db22a31f2f697be487
+MISC metadata.xml 685 BLAKE2B 8cea6cff076859bc99e5b362f23c53130aad765257765791920b02f7018075a02ad69609768fd6381ddea52de5f54120fec42b1bdfcc58c7007b2d8334c358eb SHA512 a7aad079982e7e3ad5f172bf8d58213655760ffde8702f85654dcef0bbee32e8512bc6b2a424984f407ba80e3e4db29df3d95274176d469d43830b5e12c6b129
diff --git a/dev-lisp/roswell/metadata.xml b/dev-lisp/roswell/metadata.xml
index 020c3a635287..c7911afa07a4 100644
--- a/dev-lisp/roswell/metadata.xml
+++ b/dev-lisp/roswell/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>sheepduke@gmail.com</email>
     <name>YUE Daian</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-lisp/roswell/roswell-20.01.14.104.ebuild b/dev-lisp/roswell/roswell-20.01.14.104.ebuild
deleted file mode 100644
index 26c7a2e2605b..000000000000
--- a/dev-lisp/roswell/roswell-20.01.14.104.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A lisp installer and launcher for major environment"
-HOMEPAGE="https://github.com/roswell/roswell"
-SRC_URI="https://github.com/roswell/roswell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-
-# File collision with librouteros (#691754)
-RDEPEND="!net-libs/librouteros"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-lisp/roswell/roswell-20.04.14.105.ebuild b/dev-lisp/roswell/roswell-20.04.14.105.ebuild
deleted file mode 100644
index 76c9e1152f1d..000000000000
--- a/dev-lisp/roswell/roswell-20.04.14.105.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A lisp installer and launcher for major environment"
-HOMEPAGE="https://github.com/roswell/roswell"
-SRC_URI="https://github.com/roswell/roswell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!net-libs/librouteros"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 0391accafa6c..a7d2baf7c7b3 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted-htest/Manifest b/dev-lua/busted-htest/Manifest
index 4093debd9c00..e656e91208f9 100644
--- a/dev-lua/busted-htest/Manifest
+++ b/dev-lua/busted-htest/Manifest
@@ -1,3 +1,3 @@
 DIST busted-htest-1.0.0.tar.gz 4347 BLAKE2B f1d30a305cb9691588b18f67842b536d3de9430d22c51ec292202e5aca5784447cd525ae8b1f1da42a3d3792344419efbfe1d03fe29823b445a7c1ead0fe577f SHA512 001f494949c04445004e8b06fde62727cab85a320673748d18714b82d7b2b9aea43316f6119e669c569f31578b787f4e5ca5d19da3f33fe28df572aaa41c75bd
-EBUILD busted-htest-1.0.0-r100.ebuild 656 BLAKE2B f4b84592a81765eeeeb11d93f8f497cafa912215ee044fea90a7b064958a109a015d6f1d303209dc80c1f747badaf3b4ac2e4d9a4db243664d45300108423606 SHA512 cd7de5d5f9c8b0d897607e72ba218ff546a6b072a11e77e2f4668a6cf2d120fa61c5ba18974cce54cbee0af430a0516bf07a93969a2201cd274cfcb7532552e2
+EBUILD busted-htest-1.0.0-r100.ebuild 656 BLAKE2B 4cfc5602dc583c5af015057ab17deed1fe4e5370418bb2645075e2854ac033246f437b1cc47aead0e687206bb961bfb1dce3e381fc88f4049f8ff543c47a7199 SHA512 5cd4d0930f09908af16a6fca7e01a0dd19e9b24952c0a9c9cb47dd01ca7d1d2f47d0e466d397ff5eeb47757a3ae258c75402eb4adf5edceac7bfd9380caa306b
 MISC metadata.xml 445 BLAKE2B d93949e732dacc208367a75c8a25a742a01e4c4f4fa489341ca788749164c34407f730c907629b85cf24df8d0f18840f5b7c65f9f215116987c287b850b58d96 SHA512 c1e94898a7dfc55ae498125a643dba08184f5d5cf0a8aa6cd935b90fee365cd5c59c21f3ac4918d12d2b805beb461248d061c9d2101ce561405e130e95177262
diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
index b10cc0779e3d..0e7dd7d32698 100644
--- a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
+++ b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua
 
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index a64cfb7c20f9..b121c8b42732 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,3 +1,3 @@
 DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf
-EBUILD busted-2.0.0-r101.ebuild 1158 BLAKE2B a2600473a1d2000dec9f8ddf08b8a7f663e38dfa346a7041291c60abb780ba64f792dbb2d6efc8f9136da31c7feeb25a9e97fa3e8f8363557106b8d7e7c21064 SHA512 3a6f034c3466f4f57666a6e1fdce3fffe0897b64fc46bbc4716811b5fd503f66b359eee984a0c441d9a4f9845556363788dbbb1feae132acfd2526cf734de428
+EBUILD busted-2.0.0-r101.ebuild 1158 BLAKE2B b7dac5d396d343b4ecba5f72817b3d17cb73f2192a3a7beaa794ceb7ab19c7e0a4451daa3c8f0ba0a71a1d9449df21f078b670e68e78b411556985f40fe13ed9 SHA512 7096ff4424296b1e7b8fc813367dd62c968239c6b20d38041a13813c734421a788053a39a2e192110f12891491b4cbec247d931a5a042adb5df285439c214c45
 MISC metadata.xml 753 BLAKE2B cb7d80aca20864ef7d138d3834011f666775dfee6614f6d233675824c1715ef5f893402532b0d8b928cd7aa1ecb53e3216150c22fbc9d6a21abf3251a10905b4 SHA512 3bae03d1b27087507aa3b8b4b4365a607256c1c0b9cfccde4bd42c946674feb5325715c0dea925aebfd941ab62c6a2b4bc4bd7a5f0c0211f49c4e2fb45ead48c
diff --git a/dev-lua/busted/busted-2.0.0-r101.ebuild b/dev-lua/busted/busted-2.0.0-r101.ebuild
index b5ae27eba597..92d9fa8c9e89 100644
--- a/dev-lua/busted/busted-2.0.0-r101.ebuild
+++ b/dev-lua/busted/busted-2.0.0-r101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index c24cb7d195de..704521faf3e9 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,4 +1,5 @@
+AUX lgi-0.9.2-lua54.patch 886 BLAKE2B f2163836ca359d91f2f36d6b9fa0bd4aeeebed80a27c0ea8f11c3d025f8e84393b7e5f82cf87de7c567fad34285de8d40da32dae85dbba9efe34b2596801b059 SHA512 9b43ea4ae0e6844f33ab2fe71d04443c4336b91d287aee31ed438c9fb63a201674b160aa8e4593c90459115f60d64e27633e63db9e0466cc7ce2ce244920c431
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
-EBUILD lgi-0.9.2-r100.ebuild 2546 BLAKE2B 8bca9901581a952620ca8448976ce0f70d168c47d996bf404dd668b92e57727daadb8f8efd752d058e21455a1525cd01bcc2cd466c1de531ff1146f509555fe8 SHA512 c8a4a4165ffa7bccd783ae739e79b431c1d909736e030e2c641f3276b3ca55fb8b757e51f149c46625ec19a2e0ca85767e4d75f7f8e615eb485d3a4e45b9280d
+EBUILD lgi-0.9.2-r100.ebuild 2590 BLAKE2B 62cb3ab1e4b7dda27d6388c42fb44492f473a4132c2a9efb53d23d5ff1b91d4a26c05a2b8166a5c66e99e6004f634e950b80514845346d9c3806903ab2463434 SHA512 daf47e83d7ccb3c29f8f229ef5d18edba3261da91c4edc043d453b5ac61416185d3c269d251cca8f76e8c28a1fb8c018e053c90d0ebb285318be6a31cf55ddd6
 EBUILD lgi-0.9.2.ebuild 1374 BLAKE2B f5133eb162c385d7c00e5bc037219781329449abeaa09bec7ddd9990f6f18f4f72df7d98f8b62cf30019f947ff81f165bdbb21c4030d285afb1b57179907b5af SHA512 f7ceabdf5190a744af5e5325e04d205f3782756493849d234b7ede4cda5af8019fa816cf780d1125137404b8b91fe8f8a3e508716e6bf5217f215a18a847cc85
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/files/lgi-0.9.2-lua54.patch b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch
new file mode 100644
index 000000000000..b1451a7566d7
--- /dev/null
+++ b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch
@@ -0,0 +1,29 @@
+From 5cfd42c386d3adae6d211fbb4011179c3c141b04 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Sun, 2 Aug 2020 16:14:27 +0200
+Subject: [PATCH] Fix the build with Lua 5.4
+
+Lua 5.4 changed the API to lua_resume(). This commit changes the code to
+cope with that.
+
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ lgi/callable.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lgi/callable.c b/lgi/callable.c
+index e96d3af..3234b64 100644
+--- a/lgi/callable.c
++++ b/lgi/callable.c
+@@ -1355,7 +1355,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg)
+     }
+   else
+     {
+-#if LUA_VERSION_NUM >= 502
++#if LUA_VERSION_NUM >= 504
++      int nresults;
++      res = lua_resume (L, NULL, npos, &nresults);
++#elif LUA_VERSION_NUM >= 502
+       res = lua_resume (L, NULL, npos);
+ #else
+       res = lua_resume (L, npos);
diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
index 285de59e5aff..79f00bb47318 100644
--- a/dev-lua/lgi/lgi-0.9.2-r100.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VIRTUALX_REQUIRED="manual"
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua eutils toolchain-funcs flag-o-matic virtualx
 
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 			${VIRTUALX_DEPEND}
 		)"
 
+PATCHES=( "${FILESDIR}/${P}-lua54.patch" )
+
 lua_src_prepare() {
 	pushd "${BUILD_DIR}" || die
 	# The Makefile & several source files use the LUA version as part of the
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index e0260fc98a77..5797d09fd933 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,4 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.2-r101.ebuild 1951 BLAKE2B 3b248b64495d5016f2107a7b584b58fe28b94b27a74cce4dcf837d854be613cdb45fba1fa7fd38143a6e8b7776107d53a3c105d77c5cb5a16e1b54d3aecaf048 SHA512 4f43f476999ceb81cada2327b559225bcd0d9e9b1288ffdfbc50260f442763c1b95faadc4a846e17e068bb1b841c90b7f24da52f7a31809deec3267a8dc9161c
+EBUILD lpeg-1.0.2-r101.ebuild 1951 BLAKE2B 8f73b92087cb4f54809068b8d48b98fd5fab0bd1da7dd751deceb36fe137332da6a21b9651ad5249baaa178fbef9b9695b31edb6cbcba32672cc39e291ae27a7 SHA512 62a4cc21142fc1608e2f53c68eb5cb38ed821ff0e81600a7b5724b3a41649209ef015f47a2382b58d4fabc8c5ec7d8015452efc532dedb0bc21c108b34df8efd
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index fd6789b18f6e..0a8e84bf7e8e 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua flag-o-matic toolchain-funcs
 
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index a3b8994d7a86..2a669a749468 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,3 +1,5 @@
 DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
+DIST lua-argparse-0.7.1.tar.gz 43778 BLAKE2B 6bc6a3dee3fd98cb8c00fa3ccb3ae9ffdb9f2707d80dd7f5717e1265430731957b756672ed4acd9222c686108f8a8b8c71c71285c2540e818396faf302c1d287 SHA512 f192d0c591516a74408a19c0bbf34233be180f63794211a951d19fc8d981749bc71eace16a4680c8f2bb302ab48958c6a9ffc84022a1754275fc1f9113ae32b0
 EBUILD lua-argparse-0.6.0-r100.ebuild 1132 BLAKE2B c5ca703ac1dbad353f6f5890c1d2888f355675b5b504a1980b44a587f07d1317c340a8e9f89c43d535f45d2e73967f88a66af9c41837d30195e9d2578819c955 SHA512 de2b9d414d6a1906e061bc1d1447b8dbf46b648366905db56521cd39202e872f1b6d6087259b160e03ee2235869eab4c06308b924bfc0ff0fdf7e0f668096859
-MISC metadata.xml 862 BLAKE2B c7ef04527672d2faaf171382d0a9860d94f881545141212212b55ab627e6ef0e681a0118fe9f92c5799578340b9a436de3fca41b47ae06bd998c5cb66ac85eb6 SHA512 53d6abef7c0a9085ad75ee1abfa079e6acbb3a9b9f69fb361e961f7e9cc0d294db1a35bbe33b05684888b782ec37609cb549a2f13c474c08949e0538d99ffa0d
+EBUILD lua-argparse-0.7.1.ebuild 682 BLAKE2B 0e56cfc1ce07a5202dd05c714033354531bf60e48752badf6553066b4dc8e1cb7f33dda7ea16aa520949cc4146df094952705a8eb3242137dcc073892bed3f25 SHA512 4b9c3bc9265ecd7eda3cdcd3b833fd16fe7fbda092dea6b4ec3a1d0353099217970001f2b58c62b0d13925fe32c79ccb9dfb106f8bf3e41f55f25409fa39dac8
+MISC metadata.xml 933 BLAKE2B 38e144bce940f7b4bf9c24601b8c4d5c3f26dc7561400843aa434a4f132b49c0ff523c65d7e100644c5cbee2332221b74bf9de661a5ff3a184b6c07bd1124925 SHA512 f2731ccc46ffbc4053b09842aaee2bbe486eb4247f9292beaa1821d0bed8bda2f8475769e03de0edc180af417bf3ebcf64afa5b9fda0647e210a62bbfbafa55d
diff --git a/dev-lua/lua-argparse/lua-argparse-0.7.1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.7.1.ebuild
new file mode 100644
index 000000000000..669314b5265b
--- /dev/null
+++ b/dev-lua/lua-argparse/lua-argparse-0.7.1.ebuild
@@ -0,0 +1,31 @@
+# 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 toolchain-funcs
+
+DESCRIPTION="Feature-rich command line parser for Lua"
+HOMEPAGE="https://github.com/luarocks/argparse"
+SRC_URI="https://github.com/luarocks/${PN/lua-/}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN//lua-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins src/argparse.lua
+}
+
+src_install() {
+	default
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-argparse/metadata.xml b/dev-lua/lua-argparse/metadata.xml
index d44082c8ccab..483bd127dae3 100644
--- a/dev-lua/lua-argparse/metadata.xml
+++ b/dev-lua/lua-argparse/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
@@ -20,6 +20,7 @@
 		and more. Argparse automatically generates usage, help and error messages.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">luarocks/argparse</remote-id>
 		<remote-id type="github">mpeterv/argparse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index 8583b73af171..5fbc17fee1a4 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,3 +1,3 @@
 DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-EBUILD lua-bit32-5.3.5-r101.ebuild 1411 BLAKE2B e88cc460437dc66e17802bf094329fb3d7c9c7ae3a91e44fb78a783c4876e0aae2067deafe8b410cf760d4f80abeeb4884749375814d088dcdb8bc735efc6c40 SHA512 d09490dfa54ed8c7bfa085cc3e0fd8b71371753c302c28ac59593056e22b1bdd1c6979765d26e7dfbd310ea9519908724223ce8c14c2d3b136c50347b947cc46
-MISC metadata.xml 580 BLAKE2B 4499d47fae3cbc26be9bbaf4cf8db719b6ec28989fb4c583e6c16006378b6161a6a32062638df6bc41743e271bf395abf5e348e39a9419b496ba6b834ed71a95 SHA512 eefe4c553c1dc03173b7662969c8bc56cc6be18b879d199c20ade33b4043fe71cec065e71fbc2bdba9a35ea88eab6f8a41b834d433159fbced2e743e663d6974
+EBUILD lua-bit32-5.3.5.1.ebuild 1411 BLAKE2B e88cc460437dc66e17802bf094329fb3d7c9c7ae3a91e44fb78a783c4876e0aae2067deafe8b410cf760d4f80abeeb4884749375814d088dcdb8bc735efc6c40 SHA512 d09490dfa54ed8c7bfa085cc3e0fd8b71371753c302c28ac59593056e22b1bdd1c6979765d26e7dfbd310ea9519908724223ce8c14c2d3b136c50347b947cc46
+MISC metadata.xml 610 BLAKE2B f5b6a311a715889cb35e53469a10ce11bdc4f3273ff0cccce539cd03347471cdd6c6ee0ba6d7e9f6a39d7af2268187889ea48d00c21ecc3d2a95cda79ccdabe9 SHA512 aa9269afe5123db5ec8fa3e7f409977915cac701d8c8f8fba05ddb8c0e6101927ae461ddfa193192196939d31cb4e28beeb832c399af66d94011a6fe491bdab5
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5.1.ebuild
index 6ea0b9148ee4..6ea0b9148ee4 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5.1.ebuild
diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml
index 5ff7bd4eab78..33f193792663 100644
--- a/dev-lua/lua-bit32/metadata.xml
+++ b/dev-lua/lua-bit32/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index bb6bbdcd285a..db6122dd57de 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -2,4 +2,4 @@ DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
 EBUILD lua-openssl-0.7.8_p0-r101.ebuild 2638 BLAKE2B 6503aa6e5366969373fab225f28b5ed7a1cbee87373dc5a42a350693bcc0adae6a5d558ff6bbac0748fe851f876baa83ba51d12ab72845728a995009d31fc617 SHA512 771dc1f791cd597dfb0f3d692b358bb89a9c27818cfe5f66cf0f91f2b54a9a36ddfde965cb132f48a556b9dbd5e148d3fd762e92d95ca33231b340a57bcd513f
-MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
+MISC metadata.xml 569 BLAKE2B 80e5dc0b568cfe18741e12d2df60301a9a8424a3043899bcada19052fb240b4207a9bd6bbbbb2b6c6cd7940e5af3c04ed4126dc89cfb40d3934403a442bcaa5d SHA512 e17108732d270894cb9ab3d99db60da6af3860604256f44a8ba86af7457fd8f94452ce333c7e86dcfc99c6edc652d58ad19bfcd5c081968dd2af24f9d0e591dd
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index d23128cb52b3..9ecb5eaa4dd4 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index c23e912fbbe9..a00e651caf2d 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,3 +1,3 @@
 DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
 EBUILD lua-utf8-0.1.3-r100.ebuild 1482 BLAKE2B 42501ed0b4a9cd60cfd533466a181d74a3d167a5c96ceefeb4cf452c81c40227a87f9fff3487cb99fb0b442f04469c97b3390df03ffbf4efa7d96302d07a56db SHA512 a31ca17906fb8ef1fcc8b4d63a6f8c4c5e946a9163bc8ad9bac3253414de5e6688e74d394a69334e89873cfef87b54cd76fa8d16026f0df0320797bbfa6fa49e
-MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
+MISC metadata.xml 764 BLAKE2B dcc23fd1a7f54edc1abefd9173dc19e69109a1291a08fb53cf064efe3a3d729f14b9d34a0e1c61c6deb32f0aecfca62462e46d30ef0cf73a3f1c3c9ec3c52e73 SHA512 43ccd3e3ab298084b1d2caf032b779845342a87016561cf4725006032d7757404f651d7e976a36639495d5f767e8598fef887c9440d5d2795ca9f1d18ae1f6d7
diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml
index e9b8d834be80..c6a2d69af803 100644
--- a/dev-lua/lua-utf8/metadata.xml
+++ b/dev-lua/lua-utf8/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 5e44e61ebacd..0dffd25e6efb 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,4 +1,6 @@
 AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec5eb3d073a5e907c6285a6a2a26f1563940435a111d74274dcdff76f7662d8b623c86658fa0a0b568e150cfa059d2100d82b7f65fcd293b361ec6c45bf SHA512 046cc3ad7e74435b3c6df1a5d271e82cd90a3c02c9228c5a632b13378a8b17c3cde21b00fdc84ab350493b64ec36beb10591a32d52b96010481b7d6a08655392
 DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
+DIST luacheck-0.24.0.tar.gz 162474 BLAKE2B 6ec2b35deb2f0e5dacbe00e9d5adda7a1d66ee55475adf2b40cfff4d876cd44c9aec762e52bf02bb6f65cccc7c42203d94d3c9ed7a9f2311b3b7ae7bf8ab09e0 SHA512 759079d4a033c8af1d7c314f39bb75398b8ad89b627eaf8b60cf0a878c3ea86bd5e8993ad3d564746614b06b93b4100f016fdcb805d02b226e8e1e5b4c81c6d2
 EBUILD luacheck-0.23.0-r100.ebuild 1228 BLAKE2B 257bb63e73c83bbb411362f8693607bebf4bf3653a45459258d071f6b50635203afd6974604fc3b5a540f27e72ba5a19fcd6a223b76e7aa0aa22da198d9a9a0d SHA512 1fbf725a4bdd8e767c3d5dad1861dc1705808c67a144755ea8b33a9f42ba5bf7b71c38b0d5522a0fea261c55c2c5375f8c32308e2f4706d6d5a99827e57482cd
-MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
+EBUILD luacheck-0.24.0.ebuild 1222 BLAKE2B 65573d503f6d8382cd09c1ac0c057f6bde946daffcf41427230cf857c0ba1479f4716935e01a446c4715c3d52af95d460bc0bc73f3b92e197692306f72eb20fd SHA512 de7d6fa40be1fe3a54b853af591a504242531ad9244ad55c8f3095bf9dc2a3ec9574a31c8bacf664109da9b51bc1c29e6f8aa11079b3499c0cb82cde74dc111e
+MISC metadata.xml 912 BLAKE2B e63ee1cf22a4bb13912354d0395180e9d3d9bcd722cd33f0247a6d257db637f9d8e1f90f858c8bb4d9078b40ed5672b35612f4adde0da9bdab218f8ed12d4468 SHA512 7f0f6db4ed7de1c606f7b3dc0b0c09e6de8b07fce09d24d04021a0769e32622fd1cc1ddcd2915d93b370eff2641f80e42abd117c46eeffd4d10ccff481f186ab
diff --git a/dev-lua/luacheck/luacheck-0.24.0.ebuild b/dev-lua/luacheck/luacheck-0.24.0.ebuild
new file mode 100644
index 000000000000..d84d6ffe301a
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.24.0.ebuild
@@ -0,0 +1,65 @@
+# 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 toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/luarocks/luacheck"
+SRC_URI="https://github.com/luarocks/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lua/lua-argparse[${LUA_USEDEP}]
+	dev-lua/lua-utf8[${LUA_USEDEP}]
+	dev-lua/luafilesystem[${LUA_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-lua/busted[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+	fi
+}
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins -r src/luacheck
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	newbin bin/luacheck.lua luacheck
+
+	use doc && local -a HTML_DOCS=( "html/." )
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index fa1113bb8edc..55354930c5ca 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
@@ -15,10 +15,12 @@
 	</maintainer>
 	<longdescription lang="en">
 		A tool for linting and static analysis of Lua code.
-
-		Luacheck supports checking Lua files using syntax of Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT. Luacheck itself is written in Lua and runs on all of mentioned Lua versions.
+		Luacheck supports checking Lua files using syntax of
+		Lua 5.1, Lua 5.2, Lua 5.3, Lua 5.4 and LuaJIT.
+		Luacheck itself is written in Lua and runs on all of mentioned Lua versions.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">luarocks/luacheck</remote-id>
 		<remote-id type="github">mpeterv/luacheck</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 8b8f35218b70..6207dff8cda5 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,4 +1,4 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r102.ebuild 1810 BLAKE2B 4edccbc8bef8ce374a5ed067f3765e6cb0e43059526d8c9c5dd72c9ff32b3cdf11c4500e749038bf72d75b44a2842f446a1084c61634e3c8589b9790e763ea82 SHA512 7890e40014646c6d52973caf0035705ee5a87c063c7d278744708f49d288bd502aa8c6500adc5820c73b1abf79589d3b6034346004f82d44e743a0050c40bc4b
+EBUILD luadbi-0.7.2-r102.ebuild 1810 BLAKE2B 1f44decc0a561f2fcc93ed8a8777e51ed04d6bd14f76591125ef5a235b0684274b6d733fe9523b78fa0bc8193256696d0e644d04455bf0f2741c136877e36f90 SHA512 29ed02ffd0803ec7ed477d737778c95c4870d5066310c86b530be6f6af44acf281c04620abd5ef392243899ac9a4951e200c9820af6c38e5ba5cfbcd3d369da0
 MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 178c82c225c6..64e47e01ff3a 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 667be89269e0..17071cb9c140 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,3 +1,3 @@
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
 EBUILD luaexpat-1.3.0-r103.ebuild 1341 BLAKE2B 5793951927701a018d90d9c51d3bf9616ca056fc3a88f74aac87855d574273a201ee60fb42c2986689acf1c397571b24c07992e6792efa77fc3e7e46f123741d SHA512 b38b87b276fc100137229f9a51138b1a1f6585b4b36d6fb631f9216383130a3cd51f3bbeb8ba6148fc0f48e11f2a1c396928664d1b6c4f6259917ba1d9ad95c1
-MISC metadata.xml 487 BLAKE2B 7b350d23246d49970c4fff153182eb051e4a956594f7a4015b0806388948c859f5e05aedc395f4b91bed8b57f63070d1580529adb4ce30e872f6a562ab2fd942 SHA512 321b206c9f4b23b53067126366b42e4c5372da45c17e3398c6808e741743f81bf42d4e39fa65332d8d9625782529baf878e2fb0e5bcba02cbdfdd854abf882fa
+MISC metadata.xml 517 BLAKE2B 43bbf9086de57065bd17a09f041bcce52619cf12c29a33c601a698a9b382b5e01d9544047522998660d24ac004791efe0df25c4d43a6e60811f02832d0ca0923 SHA512 d092a3157f7b2a83c071c7d602218d3b4836e86f6464fee954ff44d389def3f8a11412f73849d5214b6bc2c6260084762c3a6ed4f4ec0fc711de38fe531a7249
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index fd1dd982c84f..362018267c14 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index d986251e171e..a5e6f61313b8 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,3 +1,3 @@
 DIST luafilesystem-1.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247
 EBUILD luafilesystem-1.8.0-r101.ebuild 1508 BLAKE2B e7343b7c12e8efc0ac32f14cb004313db9a9aa7f3bf0a2c771574f6cc0d722af8621b5671a4195e72b25339f6d5f3b265d6e9d6f9132edd58d9c8f8ce776937f SHA512 0e20ba90d67c910927f51225a1aa0b0cade3e86158ddaf5bb3b9c75af50db4d7d71be794b908f907004af11e666ce4aa5fe2cf002b89d379602de2f139770950
-MISC metadata.xml 858 BLAKE2B 6f50e96acfa2b1aa606c616eda03ac35c214902a2d39dee101ecc32a3f1fe91980d4f735e4ecf066133d573910b10dda51ca1e57421f9f5327148e74fde3212f SHA512 6816a7b67fd5c7cab8cf90b2e096877e360e482644b339214becbc47dcd6b1b6a3e49470a481493dc31fe611d8c8ff7470b7c4eb5080bcd201e6543dbf3f2a7a
+MISC metadata.xml 872 BLAKE2B 3e697039c0ed0daea205a40833577dcc642ee5f15f8419b26c955fb4fb89b839de6d3b314483fb3c02366079b7952fb656bd3649716c7d0aa18248ea37b87e22 SHA512 e31f665efeb610fbf5ca6132d97ae0e68466bf1b27687b9c8083ae999c6c2564147cf16b7d786a7c1ac9c8e86cb1a369d51adc0554a0c7e99e5f665dff100966
diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index 5b577f074b21..4da361818146 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 974d59fe44e1..5fdba5f4eec5 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,3 +1,4 @@
+DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lualdap-1.2.5.tar.gz 85920 BLAKE2B 14015fe258fa391e08fc9b6bdb7a71dae10fbd84636cc3d84c446d67f9d0ea925c0086343a29ce21b81f77c87da37040560c631cdf3df7c8d3c255e5913fd985 SHA512 4fbd7bcea2e55a3b165a7316e4f6c45aee22506915c4cc204d1b5006adbf95611ebf4558c1ef1511f90d7142571cff37ea24952072dc7ecb13bbbe06aef32e72
-EBUILD lualdap-1.2.5-r100.ebuild 1445 BLAKE2B 83928ee3e5d1f7fb97ac5687c8d01a4c22eb8422d9de089492dc8b217a009e6610d8c1104f90d98f1718e75bcdcc3b4e8d9ae52c90652710606051c0c8c93994 SHA512 3b4b758d7a9b1bb436b2bdb59de6f8f7804217b14edefe9575ad77610cf729e8ef0b07f2cb5ac7987a88b00e2dea35eae90dc8b2ea5445c463a98d524e13d148
+EBUILD lualdap-1.2.5.ebuild 1775 BLAKE2B bdaa9788774d711fa28952705ef4b87d0d79bbecb206b58364147e0cdf0879800568108c920685d23fee37939618a8d08ce5c6f1ba14d3939ebc9711619b3a38 SHA512 96944fae16d8858c043096bd7aea66843f6c89d2c8498339454ff9858622bf33075838e6077f3977b3e361f6f9dae479f989a740a19ae3492d42918d681a5ff2
 MISC metadata.xml 547 BLAKE2B eac91a6aa0723c8442142daad10af992c7142bafbe29f9ec748418b49eac2dc4bbd034ae4994026238eb8f7339f9d86e7c823f3c33a54a4fbde13e8f2fe8ddff SHA512 d893b983ca2b1bba4de32a90f9b0df79fdb30ee937d978ae506b2c07c7ae6d9d0d8c4e9ecbf09f6e2b4d54e95bef8482035b63672a41119e30d74244674c3f10
diff --git a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
deleted file mode 100644
index af582b86b150..000000000000
--- a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="A lua binding for the OpenLDAP client libraries"
-HOMEPAGE="https://github.com/lualdap/lualdap"
-SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	net-nds/openldap
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "doc/us/." )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LBER_LIBDIR=/usr/$(get_libdir)"
-		"LDAP_LIBDIR=/usr/$(get_libdir)"
-		"LUA_INCDIR=$(lua_get_include_dir)"
-	)
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	# Workaround, as 'make install' does not create this directory
-	dodir "$(lua_get_cmod_dir)"
-
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"INST_LIBDIR=$(lua_get_cmod_dir)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/lualdap/lualdap-1.2.5.ebuild b/dev-lua/lualdap/lualdap-1.2.5.ebuild
new file mode 100644
index 000000000000..d8210cb3aa77
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_PN_LUACOMPAT="lua-compat-5.3"
+MY_PV_LUACOMPAT="0.10"
+MY_P_LUACOMPAT="${MY_PN_LUACOMPAT}-${MY_PV_LUACOMPAT}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A lua binding for the OpenLDAP client libraries"
+HOMEPAGE="https://github.com/lualdap/lualdap"
+SRC_URI="
+	https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/${MY_PN_LUACOMPAT}/archive/v${MY_PV_LUACOMPAT}.tar.gz -> ${MY_P_LUACOMPAT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	net-nds/openldap
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	# Copy current lua-compat-5.3 files to support lua5-4
+	cp ../${MY_P_LUACOMPAT}/c-api/* src || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LBER_LIBDIR=/usr/$(get_libdir)"
+		"LDAP_LIBDIR=/usr/$(get_libdir)"
+		"LUA_INCDIR=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	# Workaround, as 'make install' does not create this directory
+	dodir "$(lua_get_cmod_dir)"
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"INST_LIBDIR=$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index c8f233844e16..424c41fb2a21 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1,3 +1,3 @@
 DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34
 EBUILD luaossl-20200709-r100.ebuild 2041 BLAKE2B 1a5f517b83dab75d92d25d26bbb9d1ee0257bf4464fdb37155b3caadba045110339ee6e296373320d1b5eab8a6247e9e627312872c7ddb6991abe99b6e7a5d8a SHA512 8847a97d18a8c68c159dc263f05c6eee766bfdd3843f31350348d13ece2d1e51757b065a61ef534efe91fee84e4587050b16db71d16af9368c0f2e8ee6d57ab5
-MISC metadata.xml 557 BLAKE2B e42a835d0d6ed6481cd2be9a1c102c949f1d4a01526eba3c4634e3d28f9aa9d1ef67e0d82601c19869e7bf8db08167d3207834eb01d56111c50b8934102a8a0f SHA512 ea4a1248a41fa80097fb715819eec012c1e0b0f020397e548579d56e3ad2eea6a606b82d60a2df5c6acca7a4dbd91138cccd379fa59c1c9325456852eb4d018a
+MISC metadata.xml 587 BLAKE2B 3ee9997a19052c385351d3703fe3c7a2a3f5c5a1d48e82dd83ce3ccbe10483c4851815b01d97f0cd48c106a64521d3f6a8004a0361817c6083696f8de146f7d2 SHA512 9076d6429743c14c0fa94bbe9527c86b29d2ef0cddb29828616df1ac260dd5e9aee106060189f536ae7c08a3249e9eeaacb8c33002c1758280f11c77df8294ec
diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
index be7afb66eb72..ed235b367e4c 100644
--- a/dev-lua/luaossl/metadata.xml
+++ b/dev-lua/luaossl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>crito@fnordpipe.org</email>
 		<name>Matthias Hauber</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 2456b0a7332c..da49f5e24ea1 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +1,3 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
 EBUILD luaposix-35.0-r101.ebuild 1739 BLAKE2B 338f0fcdf903219c4b759994546661ae676c19499b8290c2eac7fbb47e38b4a3893f1e883933d5bdc58d5fe66bbdade98da31f53ad64a014592d0f07f1c8e1db SHA512 4ebeea72e3b5adc5a59db1865d27962c723d010197b2287af97c528cde304ba1aa8d93596e87b6e3ec17c3e4dbe7fbd86d9d4848fe20f86cc83100086e655acc
-MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
+MISC metadata.xml 504 BLAKE2B e1d4aa804daf372530735ca8e8c63e48b217c8727d9df5f43a11eee19c3368f3310f3da82fe8d13dbb390447560189fadaaf2afe0f5c4c25cd1788fdd0c0c951 SHA512 0255f682b22f979f210bda8293f1debee04fee7582a384630aee77bb0265dd7e7ee424f0d925a78e520e9ab6d0babb33f8676d0b1ce3f88adcfd61b1ba374477
diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml
index 142f40aa2588..68cbd358a129 100644
--- a/dev-lua/luaposix/metadata.xml
+++ b/dev-lua/luaposix/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index c78b6af9a343..59cb15f40ce6 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,3 +1,3 @@
 DIST luarocks-3.5.0.tar.gz 244798 BLAKE2B 24ceead8953ad6d9eefbf471fd49e0bd82256cc00c201395770919a680873544db67f062a4af93ddd390985b0b74db55e37a95516287dfc1e077a25b67c9f264 SHA512 fda01b7149839adf7c0e1c05d0f1793e79575c5d378d96ee1e197828e9b9b6e89a635f8a26a5b71db5b48465ef74b219fac18ecdbd59962cbf9da613b05dd42a
-EBUILD luarocks-3.5.0.ebuild 2072 BLAKE2B 51e11591cb4656216c89e631ed6ba210e4d332c01a445c9dac8894b6e64425496967dcf154273e5fc8d4aada69fe306d358f486c42611c12f86ac19d7f5131fc SHA512 f18eb188101c8e944c1a84aa5e5687fb8d21f4a82739399aad429dcc17bc1117e7084b13010c837d1ad4afcab9f08cd6ac775d41afa916111f96b461b38e9ac5
-MISC metadata.xml 724 BLAKE2B 690486dab66b070c7ec5f7e71db2cced3d1c191acbbcc3d86bc7b4dcb90796c5b1cb712a4cad42462dc9bedecfd5de330b02447bd7ccf89b89b57905871a555f SHA512 7d8d58c931e5134bd261a05539d3d2e54648fe538a4c65397b78be325feeb4da04d93fc1ff81e2d3b6fd062cc2d94f8cf9958865ca968c1805fc915bcf287edb
+EBUILD luarocks-3.5.0.ebuild 2072 BLAKE2B 19a562fa571b46b31090b135c93d62d9bf9ccdd430c667bba128677df6426c96c449e6fb08e0aefc8ae2bd6c949236bf33f2bec3d72e5762bd59def3695ce92b SHA512 71b1d213e0d882118500761bced293d4c0759e8649134e60af7bc4b462af9fc1c1456c784d3377f70a3929234fed834489cbfd18c0e8fa38d60333b896d0328e
+MISC metadata.xml 738 BLAKE2B 49367ad6b9fda430056e09e411ace950195c9121d9eed448cb8420bca760d2311952f5633e7703e4e400544457d0ceb53155d8ce0da9283c0d225caf10ed4b1a SHA512 563e37aaaebac1d2552ae017917d9fa567694144985d01f5f726b48d338b1a2f75ad1ddea8c9972bd3b1731e5cf295ce1206a54c6c41e213f14993958ffe487a
diff --git a/dev-lua/luarocks/luarocks-3.5.0.ebuild b/dev-lua/luarocks/luarocks-3.5.0.ebuild
index c8e7bde648ff..46efa852a937 100644
--- a/dev-lua/luarocks/luarocks-3.5.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua-single
 
diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
index e3ced5af4244..da887d1954a9 100644
--- a/dev-lua/luarocks/metadata.xml
+++ b/dev-lua/luarocks/metadata.xml
@@ -5,7 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 0642d61a2855..02835a932020 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,3 +1,3 @@
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
 EBUILD luasec-0.9-r102.ebuild 1575 BLAKE2B 6ea2e96306ace47a14d6ec22e80b4f617ddddfafe1d2839751604d4a9689ebba2990f6735233ed07b2f241d08b93178713fa3303e4acb1c589f0b4732ac2f67c SHA512 5fc569a958729781f1b6450b5200c88fc50423f432d3944c2436b5bc1dbe093811e4190337a6e68de043df9729d339772630dac45c730a15ecaf6b9bc1144eb7
-MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
+MISC metadata.xml 596 BLAKE2B 0116422318c66247af5add321ba97b4d48a27b5871a2edb2eab81f03611ddad4f6e616c16070e89f8df7ef1dba6fdc94a070325e24f90df6f6095c2afb0af9f7 SHA512 97f09d268b8bb90d82707f6a39a2339a8cdab827b4fbf70292904e580f15b3503d0473855dfb9141c9384579339df4073ad2926662ff8839ffbe73ce009b3402
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index 67fc375b3b4a..2f349c268172 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index e06b0a356082..51936e0c3e9c 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,3 +1,3 @@
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
 EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1823 BLAKE2B 47a0e959b9682e82c733995f10644defc58b9437249f38beb8b1dce65ba79f5bb96d6da4475d6ae74bec367b5794e43a592c3df0735701ff4ec50490629ec5ab SHA512 fbd8584502b9c0ef151ffc2162ea2683b615dcc62f5dc7ac999ed470eaf3de5e845483b6d21a847e0f4bcc1d2af9acb78b79dabe312f91892d42ee977889c978
-MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c
+MISC metadata.xml 602 BLAKE2B 4217236b94e58e11db72e3a3bd9c9220fe4b8fe8b4a37c75d2543e15185ace74c1e832a873bce5d9581078718e5afaa82b3348037d48729deab115f3690ad0a6 SHA512 baab9f6021a07468221bd2587ebfa22213bd5ec52915c37f5ef1fc3294b928be9ab32e9c28d70bc1cf000dede046b8f29fd23983626e2cfcec3f945e4647e9e0
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index a173d5088869..874b5d1e5886 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index be257fa88d8e..64d3e73d485e 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,4 +1,4 @@
 AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e89404d18e9bdc77ac5b723d577b8f5694f7fded74275c8ace59e938ddd2ad46b19a9ba7d8a36886d36db384d6fb439a2cccee77cf370e711060 SHA512 0bf9b3877e78183d5db3d33acb977f64e1aa7934f313838ffb5ec9b759283b21f071c619020ca4b8ec8aa36d9ea4e8082e3510d59d800fbd82fef74e0d8b9895
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
-EBUILD luassert-1.8.0-r101.ebuild 961 BLAKE2B 665a4e5694872ca41c486155a383fb1ff168c39ba4ec6f1b81a4f63f194d4dd783727729a45d50412152ee7b95af5c50656614d8489822ead801e49a84a1ab59 SHA512 36d28270964034de772032ad8e836a2582ddde0a7912e4c545a01e1e951650a7f0ac04a28100e95329a865dc141d2a6e24ef494c1a634b56d5eec0c1dcb6ac26
+EBUILD luassert-1.8.0-r101.ebuild 961 BLAKE2B ccc143d3dc378c2ccdeb0bc8e0ceb012672dee86f3906b0517b1219f85daff0eb3db19f89c2d9eb2f362d8861c6f300f1a0727518596e03fa0b2f18c415ca48a SHA512 c29ad5598690e9a599f02c43879a0801acb214f6ef2b7d236c7f3b756646a10ccaa0ebfa486382b91462c8d300c7548685247229a5047acef9b85c1715fb84f7
 MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a
diff --git a/dev-lua/luassert/luassert-1.8.0-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
index 6012657e591e..36abed363366 100644
--- a/dev-lua/luassert/luassert-1.8.0-r101.ebuild
+++ b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index f1665829f137..82e41153c7df 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,4 +1,4 @@
 AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de832d611e851bbe8c8edb7c1861c43b5496d47306a2f61d29087b83a0b8d87ecb2731572c2c3d149a19000c7173161bd0f326fd SHA512 980ee1089e4b2b45c54e0ac953bb441e5c31164417e64dbf3fd8f75010d50ddda84572fa0b8ed6101f1924a96a64de0ce31d4e24cf69f9f15d5c59b8f5ef8e3e
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
-EBUILD luasystem-0.2.1_p0-r102.ebuild 1516 BLAKE2B 0ba42db6c32e1cf7bc70fafe3568805aff7e52ce6ef66c90f2fd225bd125859719546618be953b15b9387e14a46e4ed7bf1127afb856f7abcf0e2173a8fa0429 SHA512 ad05466bb80c45b86fc02ae2eda9bd6636ee1ba266370b90e0fa3f2f474225f740d1c7753e66c7f370bb1e46768672b9c3c8c2401122a3600856bb20a63b0e74
-MISC metadata.xml 591 BLAKE2B 9e8a3ce4bfe3031b55f3aa5193c124a8aa3da8907e6dfd97e60c59e4bb846a1aec0f1e2319f43178840a9b9e7517362d654a95c2f0871494482a70a20131e535 SHA512 23828de621a5ac7168e256b201af36343de97edbeb898d6d5e4f882bca88fe345914fc98f70d5e997d8b191dcf446f62250e4309cc2d3f84b9830b023088fa0e
+EBUILD luasystem-0.2.1_p0-r102.ebuild 1516 BLAKE2B 9b0788747eb49b733ad4b53fc3e7e34d85f7d671afd354d83d58be014963dbf5026d9c11459f73feb5e38db71074b5842ea8251fe60d1e5fecdbbba801254bf7 SHA512 0134aecd51a6fbd351d9e5e416f217b23d24e264931578701135a7602046b7c3473e7c3922e2d4f71370d267810fe224b43d07fc7c3811379dede12b97972ee6
+MISC metadata.xml 597 BLAKE2B f939e6b5b94baa7c7dd0e0fa5fd8f35127f490bc07db2dcd327c339c2e7a8b9aae36eebab4d88c1148a038ca87087ed671e69fbfaf0b1f46224dfe3879bac2be SHA512 a0e876b195e8ebee0c7311ce4058d56da2407a9aae8fdcb62e756dec9eb3de27e1df9cea097be0d6c7300159f9613e8429371f7d1f880d11b7bfc308c4411e45
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
index 82a70e635227..a8f8ee9662c9 100644
--- a/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 MY_PV="${PV/_p/-}"
 
 inherit lua toolchain-funcs
diff --git a/dev-lua/luasystem/metadata.xml b/dev-lua/luasystem/metadata.xml
index e98cabab81dd..be1a5c00ca4a 100644
--- a/dev-lua/luasystem/metadata.xml
+++ b/dev-lua/luasystem/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,7 +11,7 @@
 	</maintainer>
 	<longdescription>
 		luasystem is a platform independent system call library for Lua.
-		Supports Lua >= 5.1 and luajit >= 2.0.0.
+		Supports Lua &gt;= 5.1 and luajit &gt;= 2.0.0.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">LuaDist2/luasystem</remote-id>
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 40987bb4c52b..03565507eb9c 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,7 +1,5 @@
 AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60708583be04cb9a2e785c1ba09a171c7cdeb3cb18e1baf9dba976c429d6f7a5737c0c8ca803b3241d170f395f6045da03ece03 SHA512 6e8341db5eeb5c1e51cc9c812ffc99c2a15a18467456fa20c7dc37c100ac269ef4b416a311f7d435b89c824171218193b00e8e7dccf7506eaf789a88121866bd
-DIST luv-1.32.0.0.tar.gz 91349 BLAKE2B e4a90b3241e2fe650f62e34439ed75f9ba53168d6bd96b8685fc5600d6f9cbb1bb598a7d40d918ab9123cf4bad99f872a79d0664056d35caba52d1eda9046020 SHA512 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
 DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420265a27756b0613781621c78c18edc272072cc29c46336787b040453cc9a06195264c0a72a985e49c48202022 SHA512 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-EBUILD luv-1.32.0.0-r102.ebuild 2183 BLAKE2B 76d88767f5494c469557da85f09e5ba0cec37b529f88c4b8300d8b80d69ad9486547cb7a72bf117be2e7a679c17af22caa6033cad2c344e0636a72f845851ebc SHA512 b0437489b69efee65f690f2dbcd266188ff34736c2a196e51bfb57ff10a10c94f42383151d1ad7cea751e4a7b4ffa0d0676a63710926d7ba1993522fb8e48de8
 EBUILD luv-1.36.0.0.ebuild 2296 BLAKE2B db184e750df7311e87258da93f473d9f1449093b399620da8d6b13824f6b3e067bb1cfff9531f84af9f77e032711aba6e3fd37afee6174ce0c5aad63dc943047 SHA512 3b3122bc5421ab16a09c465f7a37bdd43f80424cadaf66f8fb471349ee4c4bcceadba3c48957717e0ad599d4d3054aa00c21d031164104ee996464c26e2f8f88
-MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
+MISC metadata.xml 483 BLAKE2B c7609751a1ad95afd01eac8e61519ce1e71d61133618e4ead2798c4c592c274f89fd7ef8ea58c3a8291a8177f2d319bf1ef34db98fa04285595164f2c14287d6 SHA512 940a8ed65548cd84671cd750e9957a21e05febe4fc2bdff93d20421079d7906536c59ce9666f5b767cf873141bcaf8e3115907cf053f40d2634c6bcc66dd2d02
diff --git a/dev-lua/luv/luv-1.32.0.0-r102.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
deleted file mode 100644
index ee469f396b9d..000000000000
--- a/dev-lua/luv/luv-1.32.0.0-r102.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.10"
-SRC_URI="
-	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${LUA_DEPS}
-	>=dev-libs/libuv-1.32.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix libdir
-	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
-	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-	cmake_src_prepare
-}
-
-# This could in theory be multi-impl (and we have an ebuild in git history,
-# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
-# app-editors/neovim, actually links against luv instead of trying to load it
-# as a module. We could probably implement some sort of a hack for this
-# - but given how messy it would be, don't bother unless someone actually requests
-# luv multi-impl support.
-src_configure() {
-	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-
-	local mycmakeargs=(
-		-DBUILD_MODULE=OFF
-		-DLUA_BUILD_TYPE=System
-		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
-		-DWITH_SHARED_LIBUV=ON
-	)
-	if [[ ${ELUA} == luajit ]]; then
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=LuaJIT
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=Lua
-			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# We need to copy the library back so that the tests see it
-	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
-	${ELUA} "tests/run.lua" || die "Tests failed"
-}
diff --git a/dev-lua/luv/metadata.xml b/dev-lua/luv/metadata.xml
index d48a9a305daa..63b1acc68566 100644
--- a/dev-lua/luv/metadata.xml
+++ b/dev-lua/luv/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
-		libuv bindings for luajit and lua 5.1/ 5.2/ 5.3.
+		libuv bindings for luajit and lua 5.1/ 5.2/ 5.3/ 5.4.
 
 		This library makes libuv available to lua scripts. It was made for the
 		luvit project but should usable from nearly any lua project.
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
index 39e1859550bf..e0b15a4b6302 100644
--- a/dev-lua/mediator_lua/Manifest
+++ b/dev-lua/mediator_lua/Manifest
@@ -1,3 +1,3 @@
 DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
-EBUILD mediator_lua-1.1.2_p0-r101.ebuild 921 BLAKE2B 5656a1db5c5fca62e129b117534ecf6457d2a8c9551261ba31fa8b8a1610095f67d9a7f64372d71d18f0e747378a14303dd485b867d130036f8952fb28d4f73b SHA512 9b8c1716efa2524866b2dbd624dfa85510a9e1151a8be5fb00b46d528006060d418963e7ab231357bb68b0884e6a64754908907270969506cc5a3c90324ff09d
+EBUILD mediator_lua-1.1.2_p0-r101.ebuild 921 BLAKE2B 019e71eb83517ec230c9d7a6ec01297e77fe9aed2586c5bd72c4ef8d49e848e99412ee2f46e593b595a841a42fbcc64fd0ec2b53566777f3a14d96264964f772 SHA512 cf0160c5db61bf9c12c3103bbbad2762dc8601f36c969ea7e9f905c304dbe09061a3bb0a9894d5fc0ed81914151826c6fe92fab6c30606e0050a8f3e8e413580
 MISC metadata.xml 724 BLAKE2B 8dca2534d29b63479b715a665b9f3cb785d7818e9cb467e38b4a69a958826507f286760d43ed6e5645296199ebf94b7562ab5e0c0b8a5e17729637b363e6a8c2 SHA512 a0c40bea247859b28e85de1c00535882a562329973c15899493303b095da0ba1434cf4f01ae68dd027eba3ce9fc46c419b0568187cf3cf851c258aefce6b8220
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
index fa2cc4f28dcf..2c0a7dab214c 100644
--- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 MY_PV="${PV/_p/-}"
 
 inherit lua toolchain-funcs
diff --git a/dev-lua/metadata.xml b/dev-lua/metadata.xml
index e7b1e1bc01de..6dc64e595038 100644
--- a/dev-lua/metadata.xml
+++ b/dev-lua/metadata.xml
@@ -35,4 +35,3 @@
 		Lua.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 58edbb0eb001..7b189249f19e 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,3 @@
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
-EBUILD mpack-1.0.8-r100.ebuild 1811 BLAKE2B f128fb148748f7cbc2134e771869c6dc6818ca808eacc2ac07a3951a321b481e31299b8d378e11df835feaef0643261ea6fa77eb1aac3e31641b07c8a7021aee SHA512 01add209b1a105c4c5894d2158cd6b9777a617aa3aa5de1474b2e88139f3a715d6a7de7dff7565a3f58228f452445816c9a6da5fd7cc52b681495a7f8ead981a
+EBUILD mpack-1.0.8-r100.ebuild 1811 BLAKE2B 793a6b13c1f8566869ae66ef02f6fb648e90e5065e1bf50681531f65949491c55ceedb1148d07608b6966b9dd9f9440d78201e3a15c54bae41a3ff8c5740bc56 SHA512 90b064f242b13c53a80afd6455d22b8b114a9f0866fcf205ce1212efabe255623ae65ca26f257f167bcc39693bd1aa89ba4fa10a8a8f22d273738d733fedf533
 MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
index 68c6968289e6..a1c30a108a64 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index 6a3a4b51351f..d80997f89616 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,3 +1,3 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
-EBUILD say-1.3_p1-r101.ebuild 893 BLAKE2B 4f016c02e8417b0f198db1907ec8a77499220529e69f991ad23b3b42dec8b724a6ed221a604a9a4594f43e6b20d0c70ec882fd75073787c182b172f03ac20990 SHA512 2be86768c7c91f4416ae458e7857d6a5aa35e1392fb96f76b71ed104e187ce3332aa81a57998017ea8a0734e1bea071b4cf22f282f18c64b227a55a9c6a15217
+EBUILD say-1.3_p1-r101.ebuild 893 BLAKE2B 815189b7ee96ad7fe5c1c14096f5578472244ddbf6a54178b7782d875cea5abda00e5ed072b61eb7d645417679af5da42419b25d483ec68fa7cfb49ed9866420 SHA512 4923bb2b20947c82dcae208dcbb387a4e524ebfff2c73d41f7810adbb891ca71de5d7d3f605903d0a399042a39c518a956b7f85fc29811031b8ad6d6bd176f8f
 MISC metadata.xml 440 BLAKE2B 436e12385108634e35113c2cfa87d1fc7702e577f3da3242e575ba2c4d64c076ebd05e96e628db472c59957db600c244a14d72537c3728a83cb3125547c789be SHA512 15db0d85172a05831440854135278061e1240e287e36c367ba98cab7f98505450db8d770dbb7612a21a3468f079328bc074102d067e1c5f5f86e18b8d6794392
diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild
index 2d9756fef117..2477fcbac8a8 100644
--- a/dev-lua/say/say-1.3_p1-r101.ebuild
+++ b/dev-lua/say/say-1.3_p1-r101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 MY_PV="${PV/_p/-}"
 
 inherit lua toolchain-funcs
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c3a4bd2ef729..53ac947084a7 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
index e83b4c9cf0f6..d49dbf91641e 100644
--- a/dev-ml/astring/Manifest
+++ b/dev-ml/astring/Manifest
@@ -1,5 +1,3 @@
-DIST astring-0.8.3.tbz 38710 BLAKE2B 253fe07b51996eb7b5f84e18d171b0f65cbb5abba9b241a02aa679765f3190edc636c1ba989910fde374a20c7615db1887eb73d8607f3bb8311e20ab6e67f670 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1
 DIST astring-0.8.5.tbz 37499 BLAKE2B bff0b9a295da9e33e0cc4bf1a5a0c3cec4010f477d67a39650bbb8e61f12e517cd5734f1e869d35448e4e555a04d0223b76181f29ee299ef9f19359c7d59e69a SHA512 b40634cc2053d651bce5c1974996b352ffa48ecac429919113840b2a807efb34387d950f12accb346afd5e40514cb90219d70b00109c30e1450c4e99f65c9856
-EBUILD astring-0.8.3.ebuild 543 BLAKE2B aae2012f0f7c9aa12a694e7e7eca117bc61e876e3df5496555182b4168dd36e1507f07361ebc841151402cfa89f398cb799cd64acdede315c0bbcb88ec338991 SHA512 19df26876c674ac092c9ab753ed60a9a15e046729a236e9063899062a0a98fe29fac67a950a28ce7bd7548f25bcdabbfdca91c966671be01773aa57ed2b3e5e4
 EBUILD astring-0.8.5.ebuild 592 BLAKE2B bee9c337ecccefa62de3d4b6eafd8cd08569ac84605fe6a5b747d820e76750e7fc1ea9e52e27f349982b64ea52a3cabf0af2c94a6f97f21ba70875774b4106f3 SHA512 c2d04c8421b884d9090d4d11b4a96dd371e47b8a2cb0bd31a51064a72643fc9318b19c793f5a7292fe6e1ce780f41d6b54c9ed6eed66aa8af450f38fb7ae7334
 MISC metadata.xml 332 BLAKE2B bb0dcf9efae54d3c1f2708df73254af5e5f0a87a1c6651809e78e975a1d05f42c83db5a1f0c7bd4ec345695bfefd81de2ff201d917f8a8c15cb70855b890fe65 SHA512 b45554a47abc646388c8daa8b7e79f4bcbcddb9f4699b5c91b93eaf2acaddfe2838c179256473dab11d2dfce9ee626f68494629d1801e8ed199b4c391a8fe34c
diff --git a/dev-ml/astring/astring-0.8.3.ebuild b/dev-ml/astring/astring-0.8.3.ebuild
deleted file mode 100644
index 503571633f03..000000000000
--- a/dev-ml/astring/astring-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit opam
-
-DESCRIPTION="Alternative String module for OCaml"
-HOMEPAGE="https://erratique.ch/software/astring https://github.com/dbuenzli/astring"
-SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild
-	dev-ml/findlib"
-
-src_compile() {
-	ocaml pkg/pkg.ml build || die
-}
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 561ce7f98ea4..2714005f5987 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,5 +1,5 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
 DIST base-0.14.1.tar.gz 385381 BLAKE2B 619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237 SHA512 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
-EBUILD base-0.14.0.ebuild 482 BLAKE2B 2a215c26079665f6f14480d4d29e6f7745b607a8c60a9b11b4bbbadf078b71f65b5a98ac71e1b6ba9789ac06b257d7835fbf7e5ec2119caf69cdc26058cadcc5 SHA512 69d6da0825307e2cf24397c5369e43c58f43ace0109a86d43738a1f4b8ceb346b28de9bde525e281565297ab1da90ec4ac4c19396eb79ab6efd20874f0fd19c2
+EBUILD base-0.14.0.ebuild 480 BLAKE2B 9bf362a5511760be4d1ce2c034d1463bcbbaf454fabde6504bac3cf4f9464962f90912db47a9921d0689679df3fd04ddd0b40cfa1b3e02f52789db79953ea820 SHA512 1c0c091e87a6e3e9ae7cd7204b3d67331f07b8ba53bf8886662c950611452b9e95857f964c1125fd0b3d187402700a1887e810f7605e482b02c2e55a627b0e02
 EBUILD base-0.14.1.ebuild 486 BLAKE2B f45d23ba7ec9690f78a4cfbab8ccfeccee98fc1bd08e3965ce6d9960d84bacc141485d4f7782e2e6464fe5d35c7183cb046fbd195f14d55f688cf50d1779d9cc SHA512 e0c83936ab8e766ba976fbd4d57bc77d549b291f8585a80caf2761868b7b3688c01275165f1987f3bde830c8a4d93c8d4d335b3778551395907fa76a55052776
 MISC metadata.xml 324 BLAKE2B 46767022bfb469c7d638f87103b9db54b54ce4f47b0a1c6c7cb46afa81d0c2fec5204efa773910a48215a4a89f9b9abb510b0104641d7ae542785345e822587e SHA512 eddba1e998ddbd328645d17aa95877c7d01b1ae435605005179ed29afa97d0f26841c0e1a56423a53445d08d86ee886c4761c8aa63cd90f70cf4239601c6995b
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
index 9b92235cb0ee..c45143ed9c05 100644
--- a/dev-ml/base/base-0.14.0.ebuild
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index 721a9d891fc3..67cf84a03791 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,3 +1,3 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
-EBUILD base_bigstring-0.14.0.ebuild 536 BLAKE2B 74c0791d64746ce1c0f78d90723f6f99ba9316bae5821f755913d9cad4f75f06d71ab00a7f37d2aefa002c65194a0e0857ff8923ffb25d327385d3abc446669a SHA512 aaa5f0238b4bfe5c324867f50754ea1b1ed3bfb1b6175db4db3800df93ac37377a09b463b27cce5182c6c8008cd5e5a460a8f60f4c81673043b2f55152467494
-MISC metadata.xml 322 BLAKE2B 6f3b69019ca3e0a854cdf57efa6e27f66dabdf01fca2323c3bb96d876a96b172f1b99c681b5428581bf51308b70dd82fe8604ffa36de6595d0c2d81306fca8a3 SHA512 1503d91c3e848bfbf4f7833c3459f8286f8794aa71c4df227cc3ab820fd9d13c06ad5b57327b2cf0cfd88bb255035dbe9c7da29f580ad7e93b2575f7094e18e8
+EBUILD base_bigstring-0.14.0.ebuild 533 BLAKE2B bfc58f88f52835de7fc0ffd9dda4e03d7a64faa1c8b75f99780e70c6b988b802e25d3599af7abd2b5035c61351aa2511b313e22ecd7a197414e3ca7ce930d889 SHA512 a6472a4f0353d7aef5b6df20a2814386750d7d9ad38064051238b412deb3db0783ec81ea4192ca4f4b334dcdebc3a6d5bf5f56972e5ff7a17ca12d29dae1dc1c
+MISC metadata.xml 322 BLAKE2B 28e239b7255fdce171064d28366eb2befd183823b1a4a036c3a3d560d9294f0dde0140553c8511361aa063fe9f1b46bc885e05fe44d892306b17dc3f5e8a1152 SHA512 942343f20f1825b1199db85f47fc88b9fd335459d1fc81748ab1ba7970dd2d56b289e359c787af6b3c89393af441ed1459797e3343770824fff9d9dad7197021
diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
index cb8e12b075da..1ab861fa10d3 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/base_bigstring/metadata.xml b/dev-ml/base_bigstring/metadata.xml
index 70e661420ebd..19d0dd1957af 100644
--- a/dev-ml/base_bigstring/metadata.xml
+++ b/dev-ml/base_bigstring/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 95d4ba143f28..67e7be7a3eaa 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,3 +1,3 @@
 DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
-EBUILD base_quickcheck-0.14.0.ebuild 767 BLAKE2B 708b3764cd3bc4f66bfdb562fda573511818220384401b921759ebb6cd48952e94cfec37d3f61bbe893cbcd2c7c25ed724db662a1b29a821e9f7e28fc28615f9 SHA512 9ef0d6649de9d79b209e1060a8c70d0d34b9660147e4d49cca6f21f18dca1ac29eb6c58487045f41ab32d5cc755122d36d6e2b48f16a802598668a843eb20bac
-MISC metadata.xml 335 BLAKE2B 0203200737ac39ac757d5aad36d71e65e7767bc6d71a48a7df20d516c52de22b0608a2e3771086888dd9cb901cc46085612fc3eb52838668d6faaa1d498cc7a9 SHA512 2fe83a19b40c5547547023bbf8a2852ac5588d9374c7210d0b867196e2384ae6c938f44f613a2a70c5b03ec6cc09c3eb35fa4d671a2ea5fe3bcd96c141a1a8ec
+EBUILD base_quickcheck-0.14.0.ebuild 765 BLAKE2B 08d36c59b4f8fcf6bb43ed9e319dfe9e1a175eda8447b41435c257f34f42eb35c26d7e5a95a28f27060983911ee22ee36f08ec67d7ecc2760979c08019f3b6c2 SHA512 30c91a1b596cd0652c2f2084ccfd9b5e3dca9ef4227a14ab2d5d3aeb413311b8846911edc0830c6190841b5290693797dcd36015f83ae4f274f4405231d740e2
+MISC metadata.xml 335 BLAKE2B 484048ed7a95d91082b3e0239c55174ddbf5a20a151ef6b467c8550d858810b7fa9ac010ceb0cb2c0135d289a795f41e503f18a74d7eb4c742c31908f4e8d044 SHA512 5ab1c19f6209e1a1566e2e15b6564f423b7e0c44712083b6ae60b30b0050b12af0584f0e5b4c6a7675a449e059cfdb9a030eb7659936d2adef3a9a0b03f6e78e
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
index c787b7b17a32..da316d2b46e8 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/base_quickcheck/metadata.xml b/dev-ml/base_quickcheck/metadata.xml
index 9859b7303328..7249c288755a 100644
--- a/dev-ml/base_quickcheck/metadata.xml
+++ b/dev-ml/base_quickcheck/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest
index ece49848b789..2ede4c6a39de 100644
--- a/dev-ml/bin-prot/Manifest
+++ b/dev-ml/bin-prot/Manifest
@@ -1,7 +1,3 @@
-DIST bin-prot-0.9.0.tar.gz 338958 BLAKE2B 78b447f42f2c75d70d17dedd855c2c08b740ea847a489bdcff860b88f4ce3fbfd05d88f87d16d761b26314715507288035f708e5bb8267125a360abf4df70850 SHA512 111e0a9d07bdf22db6e3e7e9a165d196a264a3652e4cc363ec8f49c4ef385b8b76982a9d42fa8e0954e15a4a80c35ca6876c70fe6f20d7497fd8a2d53fab24c1
-DIST bin-prot-0.9.1.tar.gz 338969 BLAKE2B 249329c0093affc082a42b5a496f0f8861d761799104ef50d788331179e3a6965cb1cd03ee6530782a608677488a4970583e85f25e5ba220d2d179d3d16908c2 SHA512 6575f51931c6dfb0f640bc6eb8bb789fd1ca4b1ca95876df906bd5d5c3320dc8aebedd44b5c6feee6b66b40007bd0077da6cc628c791daba0c8cf806d7af7b9c
 DIST bin-prot-0.9.2.tar.gz 339008 BLAKE2B 3fcad0d5a88393b49b22d42b4669da485ddd9a61938cdda4183658eca5b0369265480005945bdaeb53cc8af5c324cc7cb158b4208e4a7a7f821db5c045502910 SHA512 a4aa453ff4d2037b8ed0e53186fafa876a96ecb970ef25e99cf133afa4615b8fc53de75234454519a4f7c11f771f98e8117f8fa37682dbb8f73d4fda8a1805f7
-EBUILD bin-prot-0.9.0.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
-EBUILD bin-prot-0.9.1.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
 EBUILD bin-prot-0.9.2.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
 MISC metadata.xml 251 BLAKE2B 2d9aa56c6d280f06b11e24a52f9570b233f90932cb1d470a8f2ff98a70ebcada1b13bdb0ab2e0999e9f40ac51e9bb01c3181d16d97edbe00e699e9fa287977c8 SHA512 2c96165d825a9f4794ce265fd2d55bd3e4fd5e8fb0fa27ce7846b53cc181160bb77b96f3014157a4e405e30958330139afafc5faf34795061878116582b0fea2
diff --git a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
deleted file mode 100644
index 5c2d435fef0b..000000000000
--- a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Binary protocol generator"
-HOMEPAGE="https://github.com/janestreet/bin_prot"
-SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/ppx_compare:=
-	dev-ml/ppx_custom_printf:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_fields_conv:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_type_conv:=
-	dev-ml/ppx_variants_conv:=
-	dev-ml/sexplib:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-S="${WORKDIR}/bin_prot-${PV}"
-
-src_test() {
-	jbuilder runtest || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN/-/_}.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
deleted file mode 100644
index 5c2d435fef0b..000000000000
--- a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Binary protocol generator"
-HOMEPAGE="https://github.com/janestreet/bin_prot"
-SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/ppx_compare:=
-	dev-ml/ppx_custom_printf:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_fields_conv:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_type_conv:=
-	dev-ml/ppx_variants_conv:=
-	dev-ml/sexplib:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-S="${WORKDIR}/bin_prot-${PV}"
-
-src_test() {
-	jbuilder runtest || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN/-/_}.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
index 481a0d9bed56..dfe338240c97 100644
--- a/dev-ml/bin_prot/Manifest
+++ b/dev-ml/bin_prot/Manifest
@@ -1,3 +1,3 @@
 DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafccf83ac632a988cdc36c16f273076ccdd67ece333acb70e2604180084811319ae41decbd7ef6bba0ee16538c0cae SHA512 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252
-EBUILD bin_prot-0.14.0.ebuild 679 BLAKE2B fc306ed1d4a2eb3960d64000cd1fd28616e19202ae1cd9a638e9ccbcd3427da57cda06a3bd9ddb83c23b0f28ee915bcb8c1123e3547c8728f6331abc505a6ae0 SHA512 a285c97eac592c067463e32a4e8984f01fa568629b5ba47f24507ba9b8ceaaf67df488f4af545151963f74ec4c6660f9adf74781142f21c1c079cf5c21bf1b37
-MISC metadata.xml 328 BLAKE2B 151852523506f04b20c5b1f6a63b34e7955951a0c98b6af2cc75271b4e374116f78ad405665e6b7cb0b05761d5ab9f48d7777e4600eefdb09c4a172a2ab90ef2 SHA512 b87df430bf4c300f7975e3df7ff2cb459ba81512d46e4860a6ec364526088fcdba7c5282f3fb08e8b4c592a2ab7957d780056c472ce1511715ad2694d3047e34
+EBUILD bin_prot-0.14.0.ebuild 677 BLAKE2B a3318088d7c86445e22d7dfb00e699bdc81f8d1373c77e3917b5fb63f12403c95bc6e0e0f9cefa6da9d510577271eeb2d233f373fa69aa21cbd79ad8009e71b0 SHA512 b17da07fb0c05b512d1fa5e3864cb32199186bcdf5d95c503b0146bc6231aa15b459585cb8b8c20efacb92d6f6c6a649e4292d5da33c2dd24145bd8e5ebd37fd
+MISC metadata.xml 328 BLAKE2B 7e06b270f61b46c87491e5427f18c50d8996870c5f6063c8138c6ee35c1562a321489146ce043531e4b33572860b7f0ffb3701606b69e9c2a6f720294a48672c SHA512 b9ee1c4180e0c6758d13da4314480785d8dd59ea69ea29de23b9f3b1b2f43065629ce23ffb199f757f95480f7e20157a5db7a191f8617691a7dc08c10f3fb5cb
diff --git a/dev-ml/bin_prot/bin_prot-0.14.0.ebuild b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
index 082d46d0c4d7..2f0004a88c2b 100644
--- a/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
+++ b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/bin_prot/metadata.xml b/dev-ml/bin_prot/metadata.xml
index 352205a61728..506875a7ca56 100644
--- a/dev-ml/bin_prot/metadata.xml
+++ b/dev-ml/bin_prot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
index c4cadf1b4b0a..e770eb4728c7 100644
--- a/dev-ml/biniou/Manifest
+++ b/dev-ml/biniou/Manifest
@@ -1,3 +1,3 @@
 DIST biniou-1.2.1.tar.gz 23970 BLAKE2B 139f17e3fd31f3f834c8111d81cecfa5fa48f860fc4fc898f7896b6d39a9756989504fa88901efaa0f67a51de25cdf304bea2ecabf15ea9cace59b4b311c00e1 SHA512 f0166666559f3a767fdc6987bad45ec4a772b70b8880b6d769ef644c9bfd46962f089c7b5dfff368413015e765daf4bacffe253bdb3478d9a4d30a15f0d29589
 EBUILD biniou-1.2.1.ebuild 512 BLAKE2B b3e8d9196a7de4ae7bf5dae3d29530cec59655464402ea245d6b087152d3a856d61487d53524356b5310b9936d2c8e87e24eafbbe419184090c27bb24720c437 SHA512 4c6b55613e66315870e62da45392477d86c2bbf306dacf923e5a2eda55970f96556eeb9bec624a9931f322319d8952a7f242c812bfa8de4b682afbfa9108f7e3
-MISC metadata.xml 456 BLAKE2B ed44520d2c0c3cc8914be5c6d7bff366a5c14ec38b4752df5c1c5d4f7cb81cbe0768dcf0ee7a15dced0c419d5513d450633acd67ce029edd82125d3c164b83f0 SHA512 e79e0232bd52a7bbbd2a9df561e76689efe529f15d5db6e53c47bc8d22d893c553dd4571cb7a6609c982e12b1b70b07d230d866a2d2cd5e32a676d2e89a83d4b
+MISC metadata.xml 486 BLAKE2B 98fedd231d97dc39df66f1336607ef36ecad64cd9f76566e35b248459039ac99c092f5779ee7d4d77dfd1183d24994729b59b69b892b30a345aee6f02557b2fa SHA512 b2bafaa019760364db4fc3b9f2ee4d4b7ff5cbe79a4bf5f1c996c87e5f224dcb2da82b9a3af16692bf18edfdfbd7844eba0dbe129d6d4ba54017b2ec876a5765
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index e8bf7a1ab03a..087765862406 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>François-Xavier Carton</name>
 		<email>fx.carton91@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 1c8cb06a4534..511ab26879f2 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,5 +1,3 @@
-DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
 DIST camlbz2-0.7.0.tar.gz 22769 BLAKE2B 4bfd1c4e7e4b47e666dc3053bf1536ce71b9d32fa0dff2a11642176431af89f83007bae23c61335eb1153e21300a91193f86a40af7ff0c133d491b6e6a3ec4f6 SHA512 570901199df4b5ef79e158f5309ff69d2b85babe002a0324244868f4201f0e9d6aeec377b2ec9a6bf657a29857dc13a0f63e05d162f76c7d412fa6c5f3c0e0f6
-EBUILD camlbz2-0.6.0-r1.ebuild 672 BLAKE2B f6e9ada40d80104798f1fb8cfa32341924472adaf3d5d0c4f122c43241f217fda1ff2e7bf295dca476454c204f8b4c01af8b0909132b8d29ab65c549d6f1f00b SHA512 d6616b2fb9af683e1942d028c636ecac5bc26ab96f4553527c8a6fec0442b2b562e3a6c2ed9b386a34f315fc3643d3fe6b2c6009e79cd106f9a1c0e9a017ddba
-EBUILD camlbz2-0.7.0.ebuild 781 BLAKE2B 60e7019f18c8d5ae0ea5e6067fefa96adc7b831f57f2abd9fed42d1e028d2db2717f7edf73efdffcaae1a4d2982d811565710a33afc02f09f2de4afaa5c872be SHA512 abe0328cad8ee58fae4cd2cba699b41db99adb60bb3886c1c707b416a446b9aca3faad370949cce08c90f0e88bd127f216a07ed92bea02fb508f8e1e073099dd
+EBUILD camlbz2-0.7.0.ebuild 779 BLAKE2B 0d6226027d927665e16931304b00b851e595fb7a75d3d4ff39255f6800f06183334a3fcfafb870430d2d3d9a207291fc5a3fa163687759e0ae9010e28473d8c7 SHA512 1aaa0b126416f66a63ce1e45500ad9eae5aa0e4b1ed477e944e70236cf6e56b5772ac48681dc2a3d9f8ca34f583a2a713aaed7feb16ef3cade654a208973840a
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
deleted file mode 100644
index 98ccbc37320e..000000000000
--- a/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
-HOMEPAGE="http://camlbz2.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/bzip2
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-DOCS=( ChangeLog README ROADMAP BUGS )
-HTML_DOCS=( doc/. )
-
-src_install() {
-	findlib_src_preinst
-	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
-	use doc && einstalldocs
-}
diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
index 8ea155290856..774e2b6b2f7f 100644
--- a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
+++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index d7ed4bb8a625..1e35150b027c 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,7 +5,7 @@ DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 9c6ded1579caaa21eb8b9ef4a58fcfff773e622ada30606c786948ff48d8188ea291d570cd5aafe420cade8f42c2df04fdfc257393d6abb65cf1a617eab41f93 SHA512 1d11caf10debd97be5b34655f8f0ecd8b167ff86ce0ebe891000bf35fdb2c95c13472dc98bb943332637e3312a3a0fcda1cca6c12220b2415cc6e0f0d08bd2b1
-EBUILD camlp4-4.08_p1.ebuild 1090 BLAKE2B ec64b3d3d505b267e7fe253c2cf0d6e6fd86e16de8ce6de312e20431f9e05ae79b7af525c23531c0232fdc353a9df6d9f570c845aa9713b48f50d38e0c9164fd SHA512 59d9e4b0d1e612fad7129ff12d15ee61fba147205baa49ba97a7055ae246c37054a5e8f625e66a8d80e926572f4df36b74f9d9ad121fe0cb714d40f7d7235439
+EBUILD camlp4-4.08_p1.ebuild 1089 BLAKE2B 8cae83e8f4860d7636d16e8397aee05e9e8c5a0fd7615ad1a31ad50c7be3db924e51df335f7df6f06a0899ddd10a5edd314a11b8dc310d1d02808429697a0c09 SHA512 e7322361ca2a57d49864c05249c2f7cf780b4195607a3cc35a724e375787ad0e05324bd55b38e535ff5fbc4272c643ea82a778a107f5e577c98aa5bc701635bd
 EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
 EBUILD camlp4-4.11_p1.ebuild 1093 BLAKE2B ea53b00b9f901e448470a0e805dc7959f466998eb267150a4cf96f971e5cd903d91e88410ad65ca9c287b8d4604b28bbab6c4d7ccfc1d688ab689797d2329b97 SHA512 e1aa33105784007697f7eae883a55b2388cbb86bb9e38f38ac7876c4e7c4f29ac2d3f11a1257f5d2af485c51e361df68edc3fe88ec2121402e9357289650261c
 MISC metadata.xml 415 BLAKE2B 71ebce898009219ae77c1cd07c0103aaf322a742fa4012fb0bad0c7cd9fe07a15563a594af1c8c31e09459ecdd0af58d2d5f44d6ece7edc0ce53042b5430c326 SHA512 27f7a2c68e7eef2278eaf51e1cea93646c1281726cdacf881e9e3aa3e4ac0b4806294651a00392b62d730264b3bded358b4f25b203bcd9c92055aefb34beb085
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 2b583e112ed6..b075e93816d4 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]"
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 146b32f6b96a..7d1d8c6f42f6 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,7 +1,3 @@
-DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
-DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
-EBUILD camlzip-1.06.ebuild 668 BLAKE2B 82f6287580288f3cdeceb91afb7229e150e440d17e78b92ced16f1d8ae26a55c1ed7bcd6d1eb233755104cb26f21b6adfb95c07bec1dbf1dd394f0c3ff208abb SHA512 103fb9d9fd567a07700204489fea658e24f7142b6ba3d497d77623bacfc8b8b388a43f3658a548dcaee781d9218638c0302e0ab06597b15797c8e56fecc735cf
-EBUILD camlzip-1.07.ebuild 740 BLAKE2B b3825484a64ec0e62218ca81723050f0992d6e02683dbced3ba11a5dd5289f74e715a22d62fb440b6da6495de7d5fbd1a21ca8811b07f3925b0c2c75a7ee1928 SHA512 42e72e3edd739f86367f9f35623944bf72a5d812ca9e7efffc94db7d5622eb69a760ba500d0700820ba411079bfe628501c6fd7791442cf69ab3acd29fbccf27
-EBUILD camlzip-1.10.ebuild 905 BLAKE2B 11b79fd9833f2b9350585dbfd4f93b66dcc5b346400c847a91d4f8a83b079f6df5f1f35e9467ed728d87ca0f1eb733fa6e38111be6c16ea2317d77a7289bc07d SHA512 b02d7e8804878501f2f035a3b34c912bf6370b00944b3ed0cc0ae5c61e2dbf38b8e1a9026ffd9a99ed0e2d7a6f8019b7107e7d7fef2f05fcb1c0fd4406c649e4
+EBUILD camlzip-1.10.ebuild 903 BLAKE2B 8c3f6b59e4efeed7418ddf85d711bb41fc3b30a0e02e6f169d5cd0d604b43412fb54ff9b16e79168c413b0cb168900d8e42e0a8dee0e3e86877e00a4572051d2 SHA512 9525f5b22a9ef4c20a518e3cc05ec820cc92c7cdf16b6a10e35ade61678d3d18e81408fadbbe1e6261f389e5e6b5c6c96dfa917e734033d68fde6741c57f9dca
 MISC metadata.xml 316 BLAKE2B 77b2aa09d7f9f4ab39f475277041c53808372951adf605dec9dac4665883c70716fcc18370535027c12581bf8fa7076899fe2d95597d5e5d6b04b5d45a1789e0 SHA512 fa95894f70cbd2fb42e0433a29e675235ed5b68e2bf0095e7fa2fc865f28043fa125c2df5db11b3d8d2998ba71ed60749d302b62917db90747dfa62022553ed2
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
deleted file mode 100644
index ea2362cc8b90..000000000000
--- a/dev-ml/camlzip/camlzip-1.06.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
-
-inherit findlib
-
-DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
-HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"
-
-SLOT="1/${PV}"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.05:=[ocamlopt?]
-	>=sys-libs/zlib-1.1.3
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-
-	emake DESTDIR="${D}" install-findlib
-
-	dodoc README Changes
-}
diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild
deleted file mode 100644
index 448875803b1b..000000000000
--- a/dev-ml/camlzip/camlzip-1.07.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 findlib
-
-DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
-HOMEPAGE="https://github.com/xavierleroy/camlzip"
-SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
-
-SLOT="1/${PV}"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
-	>=sys-libs/zlib-1.1.3"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-
-	emake DESTDIR="${D}" install-findlib
-
-	dodoc README Changes
-}
diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild
index c4dffc0a9c07..d4658b1b6de1 100644
--- a/dev-ml/camlzip/camlzip-1.10.ebuild
+++ b/dev-ml/camlzip/camlzip-1.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index c6efe5b9f397..bd5a7260f86f 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,7 +1,3 @@
-AUX ocaml-unsafe-string.patch 374 BLAKE2B ad6bb3eb9e34b567809b153e1c20f4fb9f6fd87d72f7d42ef423193a213740fe4805cf4e27ab4e8eebda17d6d768ab4768fc5cfde50c0356ac5c2ed07553d7d0 SHA512 8e8efeccc3568cf28ca5caf4a8f77ec34875202efdf536ed8f9ed6dcd1eb6aeb7f88ab20f3c37afcd9b564cac961b8c5b68753eba127222ad2aab5a08495b574
-AUX ocaml405.patch 1397 BLAKE2B 027d67a10f57c205c46fb443f2e6a8e1fa6790d9452b70bc09f74d26826aa4acbe99b91841db69900146041450ffc5d2aa3850e10ccedce6e8203b3ceed96f2d SHA512 e4b2bbd651c151d4822a72d8cf9d272493df450fbace1c693accec575ac810402fe15a39d7e579b421b4b42723840236e54d5e092e91108a6da8c7a8e5ebfc0e
-DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
 DIST camomile-1.0.2.tar.gz 7032339 BLAKE2B 8cd60c74821c2c8e7084e752d1e4d67428c935859e02a8630f3f5563b53b3ce444071fa26153950f6a410b2743073692c7061e4f1f902c23e5fa54c50a89383c SHA512 d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e
-EBUILD camomile-0.8.5-r2.ebuild 960 BLAKE2B 8200c4a38975432cc86a3f0d968b9ca6a7514793952bb07b14553373ec52c742d6ef2c0e2dfa681337b9c1d8d001752ac9a42561cd60a8d40041727fc6a0612f SHA512 c3b1b0ee8e815f315ca5021fee8193647fca36e649557f307c2d33d56ff0adbf09ad786ffd12567265331a247c79326247d65f71dd49848d4aee10e2040e4960
 EBUILD camomile-1.0.2.ebuild 753 BLAKE2B 84c2adf0696a2473cebd95a1ec46eee9962f9013773b7b8e6644daaebdbf36d11374264969fc552e8d118bad79114123d92574871e42db73878c774d4f71ae19 SHA512 adb5fb1ca40d713e8e463d7f81b15945ebb3a5562bd849195b203695933c745884f5da6dd2f5997c1b08243dfd5a1096a35645a9a0fd4e3ec8ea931125d61062
 MISC metadata.xml 324 BLAKE2B 2b46a676df7d41a06cbd99a35115d57faa6454a4c0294cc27d5bd6f94bccaed255a711f23ad9a64f3ce8f7e7fcf539d21c10a6a24f1c51c43c0ae6aa1979a15a SHA512 f8f74153b96f912754b959ed65319803624dae1505498e462341b751797f44996f04a665f2ed73536c1aa0f1a59e5d271c5eb5c0fedd8431ada345a69c64f291
diff --git a/dev-ml/camomile/camomile-0.8.5-r2.ebuild b/dev-ml/camomile/camomile-0.8.5-r2.ebuild
deleted file mode 100644
index 93b60798ff05..000000000000
--- a/dev-ml/camomile/camomile-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib eutils
-
-DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
-HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
-SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug +ocamlopt"
-
-PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
-
-RDEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if has_version '>=dev-lang/ocaml-4.05_beta'; then
-		eapply "${FILESDIR}/ocaml405.patch"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 byte unidata unimaps charmap_data locale_data
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
-}
diff --git a/dev-ml/camomile/files/ocaml-unsafe-string.patch b/dev-ml/camomile/files/ocaml-unsafe-string.patch
deleted file mode 100644
index 49139d61ada4..000000000000
--- a/dev-ml/camomile/files/ocaml-unsafe-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in  2013-09-15 02:48:38.000000000 -0500
-+++ b/Makefile.in      2020-07-03 00:43:13.639039206 -0500
-@@ -48,8 +48,8 @@
- OCAMLMKLIB = @OCAMLMKLIB@
-
- # compiler options
--BOPTIONS = @DEBUG@ @ASSERT@
--OOPTIONS = @COPTIONS@ @PROFILE@ @ASSERT@
-+BOPTIONS =@DEBUG@ @ASSERT@ -unsafe-string
-+OOPTIONS =@COPTIONS@ @PROFILE@ @ASSERT@ -unsafe-string
-
- #
- PACKAGE = camomile
diff --git a/dev-ml/camomile/files/ocaml405.patch b/dev-ml/camomile/files/ocaml405.patch
deleted file mode 100644
index 9648708f669f..000000000000
--- a/dev-ml/camomile/files/ocaml405.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 0fa0a19f15998e89e4b04150dd74529bbd406f42
-Author: Gabriel Scherer <gabriel.scherer@gmail.com>
-Date:   Fri Feb 24 22:30:23 2017 -0500
-
-    4.05 compatibility: use explicit module signatures
-    
-    In 4.05, checking for non-generalizable inference variable ('_a)
-    (forbidden in toplevel modules and functors) happens before checking
-    the .ml file against the .mli signature, so non-generalizable
-    variables that were previously resolved through the .mli constraint
-    are now underspecified and result in a compilation failure
-    (see MPR#7414, GPR#929). This commit adds enough annotations to avoid
-    such underspecified variables in functors.
-
-diff --git a/internal/unimap.ml b/internal/unimap.ml
-index b6fdbde..6a7cc30 100644
---- a/internal/unimap.ml
-+++ b/internal/unimap.ml
-@@ -58,7 +58,7 @@ val of_name : string -> t
- end
- 
- 
--module Make (Config : ConfigInt.Type) = struct
-+module Make (Config : ConfigInt.Type) : Type = struct
- 
- type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
- 
-diff --git a/public/uCharInfo.ml b/public/uCharInfo.ml
-index 69bf141..6a0337a 100644
---- a/public/uCharInfo.ml
-+++ b/public/uCharInfo.ml
-@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
- 
- end
- 
--module Make (Config : ConfigInt.Type) = struct
-+module Make (Config : ConfigInt.Type) : Type = struct
- include Unidata.Make(Config)
- 
- (* General category *)
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index cf5face715b7..f8fb73167620 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -1,5 +1,5 @@
 DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
 DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2792558597964a55d935544f09167aed269d6d68be65c1f588b7c0d645aabeed303885929a2f41628f6fabd9 SHA512 e69018c1b8ffc8895a5280c592bfbb0ac074b5a0367dc79392198819e751bf77dcbb67cf56e5f722e57939538a54b584bdb998cd8baedf6d01014a1f7d18a0c5
-EBUILD cinaps-0.14.0.ebuild 547 BLAKE2B 2f0b5de11ab58dca21e96ba2b38240a8bbc9e692de1034febd25953c8b4537404940ea67582e3189e7ba5ecfb2ef6d111bd71667d5800f34eb4df3e93e53acb3 SHA512 3a1ab4ada7f968d91d1bcb7c1ada14df67817408c0746cff915fb8f24afadce6630f91249acb9b1cf6ef18f4756a9c45e1b7869e21f58c966628f35fabaa77f7
+EBUILD cinaps-0.14.0.ebuild 545 BLAKE2B 48b581375ac583904e5e91d7f8bf1b696ba77f9b67b434d107178eb56c2095168b99be2dd830d32a7dd42e2ec3e27d87afce1be8315a719fa8ae4a8571df3cf5 SHA512 2e79d9a29b94e1bb74c0988be7bd6320b4181d8607f8f9af2a2725b44b110a4e9968f32f2237c78c21a00fa2b72d7bd096118ca8faf8d21d4e8065ed01082ba5
 EBUILD cinaps-0.15.0.ebuild 510 BLAKE2B f85fb27821b015fa56a6264d629eff6641f91e4a6c6df27a6491f070a25dfdc5ce3e12d6304a72148ce96451f35514e7bcc8d8a1033b5f32208d44f3819ac158 SHA512 d9a6e88526dd9460c560c58a60aed0679d7d2e27875bad42eb269772fc78fc6d64eb5f3785b9f5fb30619f2510c5ec50910248ec372da6e38ab956523c403ecf
-MISC metadata.xml 418 BLAKE2B 7bc68f327917734fb8039591095334b13f77ff7be363ed2da1d82c0c67c4222f68cde887869206d9c87d78809984e5c3f59519c37c98e5feb97df87a99c5b2cc SHA512 2e0427dbaa73bebaf022cc56b96baae31017bef48615b22750f77f8fa6726158cd6d80a107c646e00a7a53a1aa74117b9c0355e0f418b5ab6a686344e2adfadf
+MISC metadata.xml 418 BLAKE2B 020f896b664f7d3ff2de0152579c4e1000ce701e70394d892a86e89e556ed6de3b7535fe1e8db08d249e7c370a6f1dd37b81aa5dc07cf5660098acc15ecbcfb2 SHA512 1753dad85161623bd0a7598a01266fcdd8441ab6d971b1012a6b9705afa210342e601b5feed0ed8f3d77d4005206285d7e08b0ac32a85b09de951a55badfbe14
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
index 49d3848af248..300f13b069f1 100644
--- a/dev-ml/cinaps/cinaps-0.14.0.ebuild
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
index b15b69a6000e..5009a28d6d44 100644
--- a/dev-ml/cinaps/metadata.xml
+++ b/dev-ml/cinaps/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 6a6baee57d9f..2680939b70ac 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,3 +1,3 @@
 DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
-EBUILD cmdliner-1.0.4.ebuild 1067 BLAKE2B 9de35359d561a8e010cd59097816b98ce14c53dd2ed102fe0c0adda3d46ec61a25c315df267ca12dbc5de5615a87d6ecc8a37ac5affd5ec3ddefd07330147fed SHA512 225be80e1296540e98eef6a085469183c2d3447daaa3b80d4fb6e1619c3c61413a6d2a28b6e29c98c3dc7cf796c074d81f369a00a1765a00c2469090e19e21b8
+EBUILD cmdliner-1.0.4.ebuild 1065 BLAKE2B 24f4106c8047204aef0e47fa8f2f9e18ba432d89c971b3f2cb9304ef4f855183998c8f7cc7736c50102dfa285943343dbb1e52f542f7553267dd49e6ab5ad7c4 SHA512 09894aaa32c0ec8786998c249a4494bb67b9eba23381c2384dba9c6c8d906a470a7ccadc444246c6f4900fc7a5228cd1a28b9c9e06807fc7d0ed4c50d1423a98
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cmdliner/cmdliner-1.0.4.ebuild b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
index 023ea8053aa9..200197589aee 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 0f9e8eafba5e..cfaf707b2fc1 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,3 +1,3 @@
 DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
-EBUILD core-0.14.0-r3.ebuild 643 BLAKE2B 7d956a44d2b43ce9506cfaf493fc9900f0f4f107c5008a33a9ecaf49daf40e115902931e0f25f9caac497e49f688f9a615217c688c14c4b270c2cb189fd1c73d SHA512 dd47a012de9d0236a4ab0415cd683d570780e688fee436ffacd66bba804f54af57c316382c1efdecb72cf8b7e19ea927a8cb1bb2f8fa566ccef03327ee7eaabe
+EBUILD core-0.14.0-r3.ebuild 641 BLAKE2B edb3da1a6608f21de5b96a3017a411bdac80b3f5652450cd96eafeab2206c156bbe22e37decf29bdddd82782c412aa0573102fdcc46ff36ce05e0b17442b5ada SHA512 f95a79cb182f14280d8b244962e48a0f658b70173929e8c04c1215c0bb9fd4fda3f24f9c9a16daa01684f6665a2e45df3fbb7e989d6372abc8b1c438827c4d80
 MISC metadata.xml 709 BLAKE2B 412a46fa866c78f170aa4fe749b8748da8aa33ed1e25755d794eb7477bdc4a3fc8be8d8a09846e6ecb1c5391c22e5b137cae07668d99d361c8ff32d5803f8564 SHA512 3a145f47d4958cc417121c97029f92dc4bbd5124ad53959d3b798164a80b7001075cb5ea5b0f04d1ef5c38f9eac0d716308225ff7f6a66e604a60d4197675069
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
index e3934669e900..1774dc183f88 100644
--- a/dev-ml/core/core-0.14.0-r3.ebuild
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="ocamlopt"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
 
 # TODO: Wants quickcheck_deprecated?
 RESTRICT="test"
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index 97e02558420b..af7b92b9320d 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1,3 +1,3 @@
 DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
-EBUILD core_bench-0.14.0.ebuild 560 BLAKE2B f4068e073fa1ffda29d840908e9baf2c38b08fa850a7800694c7b96cdac0e81ab9b2a957080accbea894cc9910852a5c165accb34647ae310ff0d95402a4e7a2 SHA512 2162c5cc74850f9a604a75f5a75b489eec946c958edc89b7c0765f7b57ad5538dc7da06f5e4a375453f914dc26e81d06c305bb8c697d14151dff1305159dafaa
+EBUILD core_bench-0.14.0.ebuild 557 BLAKE2B 1a2acc2519e360f7522e07d33a9999b57d8a5f9d335b2a369597c8d59fcdac52af1373d7078994ec90dfecf4d445efcab9b78160299cbf4936fc5abac8a070d9 SHA512 b457aa15b7851a7d0ce69762a9a3dc8c6445ed37dd1bbfd6d325bdf3c100066d591f1925a1da9a9b5d8f6d01d0e992a170b522b08498d0bb25dcb931d356bb2d
 MISC metadata.xml 318 BLAKE2B 6c71bcfdbe90f31ce88f8fbe97c81b777382b9e0caf52b58e3feb94d8e00a150f36d99ade835a4e15c97327863f406783323e8c0b284fca646f3c0e051e44a87 SHA512 e165990bffcbbd6d96ec6d915dfb97037016755cd94934b97ca51f99a369c4eca7bac28545e8e7714e60c9dec777fdad7c9e24360560654a0d35fcabf03c548a
diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild
index 04d2e363c290..c6b66b01b28d 100644
--- a/dev-ml/core_bench/core_bench-0.14.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index d0ce16dbb6c3..66000a5e04c2 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33
-EBUILD core_kernel-0.14.1-r3.ebuild 1000 BLAKE2B bf9d65867f6fc3933c849735ca99c72d97ed81ef01005789a09821af03eee1032a7dc6a93921b056a78a1121358dc224d97384367145df0597a34d3dd1d5ac53 SHA512 ca5f65599f1cbdf558ec5e39b96800a818e4b46b5cdc1558b3f9a7e8f710f518761be3b9f4e279626d821b10144c0f5184d7c2bd8e0f9d659b10a9cdd9637205
+EBUILD core_kernel-0.14.1-r3.ebuild 997 BLAKE2B e0520c647e0bb64774e8cbd20e86af0ad014cc73852c37f5e4341c72f4ae07733a573d3b1a757794e6e145f9c575e6fc5c346c6447be9a71abb246f7990a6882 SHA512 37bffd1f91f3620958e0adc4daeafcdfa0b33232521526c725e3d9969039d6e7e08b949d22bfb4bd497e7631dd335edbf5da6e3856ace3ca2b0beb1b8d852a31
 MISC metadata.xml 639 BLAKE2B 5691a0a727a87374d34c5e2c5f73bbbde1518159da96aa5768b54b056b4ac63a6e341acaa41ee4338f91d90147803be56b26fde91922b36ca3915517774325f7 SHA512 18d78302f5f1980d5a2f75ad1289de96686b570fb90e3c788caea20aad8e7ad5b6dadb8162633e3040db9670c18b52b7d89be83c113f82cd3de1baf278cec92f
diff --git a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
index 5e300becad61..949faa0132ed 100644
--- a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 5e436fc4b18b..1459dbb327c9 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1,9 +1,3 @@
-DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16
-DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
-DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
 DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635084bbf964afdde66783c01e3d48d515eb42a5188189fef67ebe7cf79c0205c60537c9d1a8b14f453fd248 SHA512 fb2865b4004fe3f17d5893659fca90c01557cf6be789500c54b06ac8e0d097181c9f6437f178aae6d786b3f6b639859bc68400f4a7c59e7acd4f296cf8271a9d
-EBUILD cppo-1.4.1.ebuild 692 BLAKE2B ccea873890aaf90d4d24e513accd74bb1670c5c337ec1748055c38b6d43257e8c1109ff9f3a028689a7894dc038689045e4165c950bac0711fbd17cbac43b5a1 SHA512 05e75dbd8db776093944ec83d84a827d04b02587edc0aa6d09e6a9faa2672f7a0700d893bf28085ba051138f465cb8e1556d6b9402e9d9ca088c5e359df4467d
-EBUILD cppo-1.5.0.ebuild 996 BLAKE2B 8cfb359c9d1d6750f7abb9b62f9d0518ccdf46b3a543f609c94346a8e938888ef77208dc783cff8e5a35c75510d4088cfc6f40b2d89a1eb3c796145954f3bed2 SHA512 e7a5d48dbb9476968c88ac9582bf60c2c39db5450f7971644ba84cdc7171b1f20e013a882c6e6a4893a9b3918479da9aecc80f4f06f14e60d1d11f058a6779d9
-EBUILD cppo-1.6.6.ebuild 492 BLAKE2B 42dc6c1547a985a0eb90e6b169b9364a2f9f4b876cdcc5a60a2898407b0b1043a38d20c67b4e0a0317bffd4014a605b28b773a1cf0ec4838a574cfe6fa361500 SHA512 64fafe74e68080e8eafb3c1fb29f4afa581f4e005da80c7c27ee6b2b8d7785321b86551cbfe9063aa63762222dca011efaac4002b4c3fe6c39ad2357dd0c0854
-EBUILD cppo-1.6.7.ebuild 492 BLAKE2B 43d53467e18b33f2106a125ece077201bb9a98116e03d1a4e0d16fb32f94b54e07bd7b74085d0d2aeb2af1bfb788d1ebe2b75fbdea1a095ad20795f323876bf2 SHA512 b61beab07a384e7ac8d87a69fb09ab86e7ed2d9ab135f41bba3ebaff602968439013318e5ba5ddaf3dd8e9c0702072538a3de1b17a966df3662bcd7a260517a9
+EBUILD cppo-1.6.7.ebuild 490 BLAKE2B 5ce584175da0b9f71b2f1175247a5a27447391971d818ece0c225c157d49135fd1f3cd120ab4e11c5f118848a4bc120d15ab1d57c5c17c0f4031153c833b7922 SHA512 0ba6dcc0c3bd3dd0ade1545c901f73dcc4a408dc0aecf9ceae7637b2a5c46cce633c32ed57ec39e32c1fd88f3cd77d8ce3bda63da9442be6b92e5aeab36fbf34
 MISC metadata.xml 422 BLAKE2B f14a59f4442289cb9c1c27922dbfa4049fb62c8c2aec05919bf0c8de749f2d18ee1e66d57cf9933c257ea009763bcdfec165af49161ba47e3bfa1afac4b474c8 SHA512 ac7300da07e509ef7c350f9c9ede10426a9d9b2f14c6346c8d7649d020da41ed40b0893b8c1e689b977596cf10d2990ca6c9578a8175153ef4d4d856d1a62f5c
diff --git a/dev-ml/cppo/cppo-1.4.1.ebuild b/dev-ml/cppo/cppo-1.4.1.ebuild
deleted file mode 100644
index c01764452e40..000000000000
--- a/dev-ml/cppo/cppo-1.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="http://mjambon.com/cppo.html"
-SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ppc x86"
-
-IUSE="examples"
-
-RDEPEND=">=dev-lang/ocaml-3.12:=
-	dev-ml/ocamlbuild:="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	findlib_src_preinst
-
-	mkdir -p "${ED}"/usr/bin
-	emake PREFIX="${ED}"/usr install
-	dodoc README.md Changes
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/cppo/cppo-1.5.0.ebuild b/dev-ml/cppo/cppo-1.5.0.ebuild
deleted file mode 100644
index f6525a761bd7..000000000000
--- a/dev-ml/cppo/cppo-1.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="http://mjambon.com/cppo.html https://github.com/mjambon/cppo/"
-SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-IUSE="examples +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/ocamlbuild:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	use ocamlopt || sed -e 's/ocamlbuild_cppo.cmx/ocamlbuild_cppo.cmo/' -i Makefile
-	emake BEST="$(usex ocamlopt '.native' '.byte')" $(usex ocamlopt opt all) ocamlbuild
-}
-
-src_install() {
-	findlib_src_preinst
-
-	mkdir -p "${ED}"/usr/bin
-	emake PREFIX="${ED}"/usr BEST="$(usex ocamlopt '.native' '.byte')" install
-	dodoc README.md Changes
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
deleted file mode 100644
index 48f2d5465146..000000000000
--- a/dev-ml/cppo/cppo-1.6.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="https://github.com/ocaml-community/cppo/"
-SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/ocamlbuild
-	dev-ml/findlib:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.7.ebuild b/dev-ml/cppo/cppo-1.6.7.ebuild
index cbf8fb228dbb..9f8871da75e9 100644
--- a/dev-ml/cppo/cppo-1.6.7.ebuild
+++ b/dev-ml/cppo/cppo-1.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.t
 
 SLOT="0/${PV}"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/ocamlbuild
diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest
index 2bb7b68b721d..27bc9c31a1b2 100644
--- a/dev-ml/cryptokit/Manifest
+++ b/dev-ml/cryptokit/Manifest
@@ -1,7 +1,3 @@
-DIST cryptokit-1.10.tar.gz 152525 BLAKE2B 51c905757ad141292be89707bdab5c83a1f3e9e2665202cbf17e12b115591c57b77b759b4fa2967d1f00b4cf5bd87445a2189b4d222d5d1613e19c32e1054189 SHA512 22564e0151c492963d75fb81780b3a884a0bf613ad09380d9b5365740fd9c4bbdaa1c21fed50a1a4934dce920d90f5c86dc014f90e52677544789311f7bded4f
-DIST cryptokit-1.11.tar.gz 156905 BLAKE2B 3fc77321c0d525a32f5733d77963b5df4e618b3168f2f00aceeb1e13b16cc202e79b50afa93c0769f016b4e43061ff19851c8ba3f40ad7f8f0c9ff78a51d68e7 SHA512 cc641a05a67cd3d2e5ec481e8d426796db625ab60e89f79bde2e360730892c62f30ea2e37c4b028df16471220847e6d7ce4984deb9528fec6647a17fc4ae1b0d
 DIST cryptokit-1.16.1.tar.gz 120607 BLAKE2B fbb89c4dabef8f09614003acc2b8173fdfdacb36793fd20f4415ebec04f3759537739eccd7b9d143df0163816b9db65c221c2b83408c9ac3aa7f9bf7b63876c6 SHA512 28913a7c35ae951a4c464287acc511ee1bdc9d03b5928e2243c5ae5cbb8b10afe8e84d7a73ba6478ed62657d01fdb6f02472739255c33de3671c4130b659da52
-EBUILD cryptokit-1.10.ebuild 1256 BLAKE2B 1d3100602f1552065099df7b67338c27e9e85f7d06529ff0d18c7d6d2169fea9aae3c025aee34c0353226e8395535c86e592aff7764a9223ee2d40ac176c1096 SHA512 d6696043f757bd9da8966e671c2778fa217274db41c8c9730998ce372f6325ebb3f76cb3df5ea08a354adcf40076b134362f1f88023e14099b98ecaa06a8787f
-EBUILD cryptokit-1.11.ebuild 1304 BLAKE2B eb25ecabfc257aa1f10e0b90ab2a94e3390fb416659c89745156a818ce6c16319a99de9fa7c40ea21a9fb1b6b52fe09a10cecea7d2a7965e645809a17e9be97c SHA512 4c184b9591945af1da9ce08b68b7387dff100453ce5876c0ca0c1625efaa69d84eed776f0115edce8516e02b681e21c674f0685116de86fa4a3bea01283b2127
-EBUILD cryptokit-1.16.1-r1.ebuild 1742 BLAKE2B f41f5f4564c155a524a765cfd84bf40c047fe822d37ddc93dff656ae171de770154d693e6a7c0362ddd8699cd6c38caeb9a2584e161f83c1033febe1fd2e4b69 SHA512 00c6f9254e181eef7195fd6b0c124af3beeeef7989ba51c8d1ea87d5b7e90b76c1c69a0eb96a10f07b76476da09c3e24f68f7ec8671ed39039ad9819578fddfd
+EBUILD cryptokit-1.16.1-r1.ebuild 1739 BLAKE2B dada0580a4b28e9ba4488add17cd683eb518be82863dd01e9ca2cb7509a83c64be0b279875d3068d280f1a43b00af9ee20613fdfb60c9972c2a067ae46341827 SHA512 c92c1c3c62cf62c031a25f4184ac38a37b8f4cc45fb831a79a6805fc0e4d2a4ed213d81e3c6eb96bf95d78830eaf0f36e396125be2c12b7f70a26cf8c8e57550
 MISC metadata.xml 253 BLAKE2B 7f94398024f3ee85392671327ef194e7b5ed3336f25734f286e2bab74d4c7001dae92ed8e1b826de9be0c1176260e08b444ac44c826e52e27e940de57ead2eda SHA512 edd60a11f202c6d04c3b4879adadc8abc252eb61abfbb22043e12298f2f6f3aea53177c2b254cd113bc222dfce32687ebf8cfefd97a35fdf00504c54207ea390
diff --git a/dev-ml/cryptokit/cryptokit-1.10.ebuild b/dev-ml/cryptokit/cryptokit-1.10.ebuild
deleted file mode 100644
index 59e05f0f84ed..000000000000
--- a/dev-ml/cryptokit/cryptokit-1.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Cryptographic primitives library for Objective Caml"
-HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1493/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="zlib"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "Changes" "README.txt" "AUTHORS.txt" )
-
-src_configure() {
-	oasis_configure_opts="$(use_enable zlib)" \
-		oasis_src_configure
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This library uses the /dev/random device to generate "
-	elog "random data and RSA keys.  The device should either be"
-	elog "built into the kernel or provided as a module. An"
-	elog "alternative is to use the Entropy Gathering Daemon"
-	elog "(http://egd.sourceforge.net).  Please note that the"
-	elog "remainder of the library will still work even in the"
-	elog "absence of a one of these sources of randomness."
-	elog ""
-}
-
-src_test() {
-	echo ""
-	einfo "You must have either /dev/random or the Entropy Gathering"
-	einfo "Daemon (EGD) for this test to succeed!"
-	echo ""
-
-	oasis_src_test
-}
diff --git a/dev-ml/cryptokit/cryptokit-1.11.ebuild b/dev-ml/cryptokit/cryptokit-1.11.ebuild
deleted file mode 100644
index 152ab71573fc..000000000000
--- a/dev-ml/cryptokit/cryptokit-1.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Cryptographic primitives library for Objective Caml"
-HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1618/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="zlib"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1 )
-	dev-ml/zarith:="
-RDEPEND="${DEPEND}"
-
-DOCS=( "Changes" "README.txt" "AUTHORS.txt" )
-REQUIRED_USE="test? ( ocamlopt )"
-
-src_configure() {
-	oasis_configure_opts="$(use_enable zlib)" \
-		oasis_src_configure
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This library uses the /dev/random device to generate "
-	elog "random data and RSA keys.  The device should either be"
-	elog "built into the kernel or provided as a module. An"
-	elog "alternative is to use the Entropy Gathering Daemon"
-	elog "(http://egd.sourceforge.net).  Please note that the"
-	elog "remainder of the library will still work even in the"
-	elog "absence of a one of these sources of randomness."
-	elog ""
-}
-
-src_test() {
-	echo ""
-	einfo "You must have either /dev/random or the Entropy Gathering"
-	einfo "Daemon (EGD) for this test to succeed!"
-	echo ""
-
-	oasis_src_test
-}
diff --git a/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild b/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
index 3a589111cb51..13e417a32df0 100644
--- a/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release${MY_PV}"
 
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="cpu_flags_x86_aes +ocamlopt test zlib"
 REQUIRED_USE="test? ( ocamlopt )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index 61f54ac9c6f6..2938f4dd6234 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1,3 +1,3 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
-EBUILD csexp-1.3.2-r1.ebuild 571 BLAKE2B ef2595c003c7728f99175b5c4d967c8c640cc72cbd9d0305bd78538074ce02505f3234fb7fc57ac3be01a9053046d6951dd0d6e937ffb88c3dcf26102ff6ae88 SHA512 ab11ef204578c396a87f96742d1ff1e2365a8c591c8257e1f2c931c35199cd71afa2fca0aec56f15f16890a00a8d89ea3474e34310764b1ef86037844698d6c8
+EBUILD csexp-1.3.2-r1.ebuild 569 BLAKE2B 6c394f1fd9093fc1f1f2603a84d6fe804a829fc2a48d65a8eb11b33b179906baf6fa8624737aaf42eb6bcf87be3589df9fd5fe190ed2da9d1d2288104873caf4 SHA512 5d33595266645f3dec19e40a18aba9c68f6148ec06dfcc575475d934e423e1a342de2f549035013cb189c843c49b617e661ec53aa2f1347e1da4d2e78f65a1a9
 MISC metadata.xml 418 BLAKE2B 60017919689b95805ce9d5ce854a8d7152a1b98eb650cfcc82c3cb5fd96e53324b7e4fe850ba1f168192f62695a7091d40dae89828dbfbba619870796df55b40 SHA512 2cdab351b9ad1462093ba8281bb9f2713fe970bdf588a54e188a3ef3bf952ab1975ff9eb2c8d5e662d4c80761473969c9ae6112a7494991770d9df0ff6b64457
diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index dfc8daec3864..3299c8a7c789 100644
--- a/dev-ml/csexp/csexp-1.3.2-r1.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index cde6f4a56b43..9b36d3c23d07 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.9.ebuild 1661 BLAKE2B dc1981a65fc1e46833b4e33258b32dc2840ec42f3d718dc6bc1502f0678cc2988df49bad0603b8a4ddeba309097d424e058d4a3bdf2aa0f02125ab61e83477a2 SHA512 40d6e213750613e3ab8bb27f8f9671a37e2739f6e646fdab780a9cc81bd7318ebfe92fcf0bc237e9f0506c095156f484730fe2f9e0d8329da6937a40bb1bc466
+EBUILD cudf-0.9.ebuild 1659 BLAKE2B 2111fda5bfb9a1618a2773846f35baed5349390f68918077fa6e148cedab29e3bc03a47de482c5aaf209c55c97fc09fc72c024cdd56cf8ef6c97aeb2cb1c3616 SHA512 49494c73b8db9f3f9070eb27982faa704ff83e9797341d57f30681358ab0448fdbe5937ac2ce58c78e5ac424dccaa886a826eedc2e65324f0418530998d9b393
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
index c0f2acca2c10..9557d7c35db5 100644
--- a/dev-ml/cudf/cudf-0.9.ebuild
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index b0f8def0507c..2cd8883caf8b 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,8 +1,4 @@
-AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee13c7aadb1c062d38bdb7a8e06805a7dc4cc6a19cab829702e55797f7434b3aea402c8d8023e36783 SHA512 1ccc378bb32a7ced3b643590a5ebd3b4b5b31f256ba4067f64a1611abb74cba48f0e0da42fb498aa66ee17e3d2446b9683ff5eca64749360af7a147fbf36385b
-AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
-DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 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
-EBUILD dose3-5.0.1-r2.ebuild 1702 BLAKE2B 19396715dcca23f347ae34222f16d25050147cff8bbd5e3ff693c8f0ef95d7a22f99c139fcc4aa4065e421826e56d70a9f81953848660eaf5836dc5ef528125d SHA512 06a5b1f09d223a9a39a2bd2dbe338d703b66fd8350527cd37b51df834bbe050d41f0dd70fadb0b3dd5595004c4fc074e92ea08a4914422464e8b9aee28db2604
-EBUILD dose3-5.0.1_p16-r2.ebuild 2266 BLAKE2B 653895b764463f197cdd044fc1e482acdd0613ed6c06d4375ac9ae8189ecaff82b5e4d9c93544399a0b5611ec2db264c565050d34a9b958b3f2087d91c3342b8 SHA512 4c36f120415bb59275540161f4cc7da0d5aedf508c38ab51c67b427af83d6cea04b554f648f13b2ad0680af8747aa0d706f2fcfe5d5a90b223ca6b061bc52e9f
+EBUILD dose3-5.0.1_p16-r2.ebuild 2264 BLAKE2B b91216ce6df7fe918529560c02850505cfcbf1fdbf99ad42ed6ec8b802381b815917cb738ae88b6060f48c3757d458f4a2eef68d808f537f7e0d4b7a3de17e53 SHA512 e989a1397ec4eb4b40d75c46ea2c5227e8589657ecfae2715b15218ba8072807f0b616bec3aa17b0fcfa5fb82fb1db14584027c452c473cd867aeeeb419f82a6
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-5.0.1-r2.ebuild b/dev-ml/dose3/dose3-5.0.1-r2.ebuild
deleted file mode 100644
index a90a3f4b1e81..000000000000
--- a/dev-ml/dose3/dose3-5.0.1-r2.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
-
-MY_P="${P/_beta/-beta}"
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
-
-RDEPEND="
-	<dev-lang/ocaml-4.09.0:=[ocamlopt=]
-	dev-ml/cudf:=
-	>=dev-ml/extlib-1.7.0:=
-	dev-ml/re:=
-	parmap? ( dev-ml/parmap:= )
-	zip? ( dev-ml/camlzip:= )
-	bzip2? ( dev-ml/camlbz2:= )
-	>=dev-ml/ocamlgraph-1.8.6:=
-	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
-	curl? ( dev-ml/ocurl:= )
-	rpm4? ( app-arch/rpm )
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-ml/cppo
-	test? ( dev-python/pyyaml[libyaml] )
-"
-# missing test data
-RESTRICT="test"
-
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
-	has_version '>=dev-lang/ocaml-4.06_beta' && eapply "${FILESDIR}/ocaml406.patch"
-	eapply "${FILESDIR}/unix.patch"
-}
-
-src_configure() {
-	econf \
-		$(use ocamlopt || echo "--with-bytecodeonly") \
-		$(use parmap && echo "--with-parmap") \
-		$(use zip && echo "--with-zip") \
-		$(use bzip2 && echo "--with-bz2") \
-		$(use xml && echo "--with-xml") \
-		$(use curl && echo "--with-curl") \
-		$(use rpm4 && echo "--with-rpm4")
-}
-
-src_compile() {
-	emake -j1 VERBOSE="-classic-display"
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
-	dodoc CHANGES CREDITS README.architecture TODO
-}
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
index 86654782b7e4..e8cf0a7bf4fb 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
 
 BDEPEND="
diff --git a/dev-ml/dose3/files/ocaml406.patch b/dev-ml/dose3/files/ocaml406.patch
deleted file mode 100644
index 867c2ca4848c..000000000000
--- a/dev-ml/dose3/files/ocaml406.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: dose3-5.0.1/common/criteria_lexer.mll
-===================================================================
---- dose3-5.0.1.orig/common/criteria_lexer.mll
-+++ dose3-5.0.1/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
-     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
-     (* find the terminating delimiter *)
-     let endpos =
--      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-       |Invalid_argument _ ->
-           raise (Format822.Syntax_error (
-             Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
-             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
-     in
-     let len = endpos - (lexbuf.lex_start_pos + 3) in
--    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
--    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
--    s
-+    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+    Bytes.to_string s
- 
- }
- 
-Index: dose3-5.0.1/common/input.ml
-===================================================================
---- dose3-5.0.1.orig/common/input.ml
-+++ dose3-5.0.1/common/input.ml
-@@ -47,7 +47,7 @@ let bzip_open_file file =
-   in
-   IO.create_in
-   ~read:(fun () -> input_char ch)
--  ~input:(read ch)
-+  ~input:(fun x -> read ch (Bytes.to_string x))
-   ~close:(fun () -> Bz2.close_in ch)
- #else
-     fatal "bzip not supported. re-configure with --with-bz2"
diff --git a/dev-ml/dose3/files/unix.patch b/dev-ml/dose3/files/unix.patch
deleted file mode 100644
index c3dbfabcfbce..000000000000
--- a/dev-ml/dose3/files/unix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dose3-5.0.1/META.in
-===================================================================
---- dose3-5.0.1.orig/META.in
-+++ dose3-5.0.1/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
- 
- package "algo" (
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index d7c241c816e1..779fff7323c4 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,5 +1,5 @@
-DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
-EBUILD dune-configurator-2.7.1.ebuild 612 BLAKE2B 777cb99c81ba218e6c8b366343b7d0a407cbcdc9716cd073367c8c1cc2573b79e11e2e31827e28fef89195db4546273174a8ea6d88dc9dde5c6aa9e342e4c578 SHA512 9c77c244f844686c8b4c558c623196549da678c65ab83e515953ef2c036b8c27a2796c2dbd906c93cc7563d875b78714d8620647471e011c7f104f6aad57753b
-EBUILD dune-configurator-2.8.2-r1.ebuild 3693 BLAKE2B 6e16c2ec039f3d0a97e19dfb688bd23c035c4d6fcdf06708fa63ae552337b8cc51520c64db2bea6bd16f9b1ed1ad61c0d075dd8e394acdc97ed824eac332ac74 SHA512 1487a0136c1f0e515c2eb07771ea10e3b281cc878de49c1099a6d357061c2efc3f99706bbd48ca149c8973be2b700eeea35805d3c4896f40274df4ee89803b3f
+DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
+EBUILD dune-configurator-2.8.2-r1.ebuild 3690 BLAKE2B 9924f03dfcb3aea4d18f6aad506875adcac52853279895dd02d334e9453a813cda55d9dd03ef75cf4f28c26a985644f16e359c31f1b4344d0a0d0d63280e71ab SHA512 da7e364dab740d7210662f626dc1160a3ff83a81a880fd6a4132bc64a749f07e44a1a127961c930027cd600e76dbe2438f1b284a9400310d09d6fa0ab1605b08
+EBUILD dune-configurator-2.8.4.ebuild 4118 BLAKE2B 1754774ccc4d32b252bb6fcf33b735051d8a6eb811bf520ccae53db0bcc28ef7b626cb5d543fda9fe0d08b8106afaad7d1490cf5c312e71f481c7dca55aa6bcc SHA512 af6f4ed4d33ef40018356f9dac5acce992ca8f4dcb34e566da2a1a3801490490df28ed3308656d60edf763059490d7a0f8834f9ac17763ecde2f7a6e7a02600d
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
deleted file mode 100644
index 1238e8b1367f..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-DEPEND="
-	~dev-ml/dune-private-libs-${PV}:=
-	dev-ml/csexp:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/ppx_expect
-	)"
-
-src_configure(){
-	:
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index 332128aa98c0..acd4036fd3ae 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
new file mode 100644
index 000000000000..56fa50bd7cf5
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.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 ba14a23a431c..213b61788364 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,5 +1,5 @@
-DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
-EBUILD dune-private-libs-2.7.1.ebuild 896 BLAKE2B be729dae693c543d389e2a53d0c1a839482fb2d7020e8c114965602adc3dd2f1bfc5f1379416730b1afd1d0a985aa989bbd18f51d066c399b4ae3bcfe5720fff SHA512 649d123e1d8acf922244f296541ebed1a0e85741a23cf537b1a259df9da2937b7256d5740c105199a851bcc06fb8bfa161c4c0b15747c1d867cedee7f924de91
-EBUILD dune-private-libs-2.8.2-r1.ebuild 3694 BLAKE2B a3d5cc680b6e126711f92621cff6b8747454ebf398f63370a0c4555e956ee565130e32564ea5af99016e39cf61e743b4d63c0b565cfb9975fad9d465e1731e31 SHA512 f1258d55a3464673f02e476c663d09c6df28caef16588c52b89356194266b870a9c40abd0c65b589342929b61fe3a5c6f10f4875bf7558bdae7e88d9d3fd5699
+DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
+EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a
+EBUILD dune-private-libs-2.8.4.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.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
deleted file mode 100644
index 73b61f709cff..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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/ppx_expect
-	)"
-DEPEND="
-	dev-ml/csexp:=
-	dev-ml/findlib:=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/dune-${PV}"
-
-src_prepare() {
-	default
-	# remove tests that run git
-	rm -f \
-		test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t \
-		test/blackbox-tests/test-cases/meta-template-version-bug.t \
-		test/blackbox-tests/test-cases/subst.t/run.t \
-		test/expect-tests/vcs_tests.ml \
-		|| die
-}
-
-src_configure(){
-	:
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
index b7c3752f9529..3af456b42d85 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
new file mode 100644
index 000000000000..7b6b59feb352
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.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 654666f6195a..e5a1504e5708 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -2,8 +2,10 @@ DIST dune-1.11.4.tar.gz 849090 BLAKE2B 4dace2d998dd00dd8fd51fef6bf0048fd7d0c7941
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 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
 EBUILD dune-1.11.4.ebuild 688 BLAKE2B cdf2a8f91b21e32ebf3c0f22c05b4f61560c0adfac4e67c17c1729506216919a4013c26ab1556d47e3e4722d9a81c01c84170b5dd914f4a4c70b3a1ec5fd8115 SHA512 5e3dd0d2e81006816ee09005891644f252bfaa2e37d800a0a3d9892ff7fd59ec80cfcbd581ba60e34a202afc940f0c6461bdf0c155a4e42ce54b31614e2881a3
 EBUILD dune-2.1.0.ebuild 693 BLAKE2B f29523daba28750f07a15e6e6acfb47bce3d0793fda6fd95af855f9cfe19b534059f3824bc0f66af3d6bcaa9f728b94ff6e0d1aa6f64989d4957515c9dcaed5b SHA512 453c4ed9686b9e33b237d977cfefe5d920487318f0a29e14bc70ea829cab78508e59c7e876fa9bb7edafffe8b6e4d24b71b0b9c88b6679c845f950e6bdf512d1
 EBUILD dune-2.7.1.ebuild 760 BLAKE2B 78f494098d67c0f08aa9076186b2641bbfaa082c3e14f767f8b6e399c2ba503eaed3d4400b5831b353483ecfb6b1216e64099a0d2dca2108fc68928860fd7476 SHA512 b5cec406cc7f8dd2ef0186f73aee3cd9d4feae1319ef2ff26d2d48b1755c530efa08e356a12c3c52cfedc2685f1482087b443a7825f71891840e76cc9d1ba3e4
-EBUILD dune-2.8.2.ebuild 899 BLAKE2B 67806d7d33d9260e81a7a571c03320ac19c9f9812f9bd69f53762b88dc184b9fa937830d9db481786ba5488807bde0b074ff1df8155962cf4544ea225ec3a4fb SHA512 9d8fe7787d9b8f485e7eb8a84b6ae00fefa99581018ce61a703d6503f915b545c55729efbd6a114ab5e58a8c2b80a8d4485edc6df961e469f872147d6647cd45
+EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
+EBUILD dune-2.8.4.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
index 1236c128df67..ae0c9474e80e 100644
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild
new file mode 100644
index 000000000000..47084c42bd00
--- /dev/null
+++ b/dev-ml/dune/dune-2.8.4.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/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index aec16365cb43..1746513f3943 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1,3 +1,3 @@
 DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c
-EBUILD fieldslib-0.14.0.ebuild 474 BLAKE2B ef82919d3e77dd54b7c6f183c31015f4791e50b0907ef0fb7825ce2be6955c27337dbb07a2b38a543bd78d801caab784a14412ccefaa1c293b27bdc12a84ecda SHA512 82fe44d69177ace9580565077b5e1fb0652a656395baf0d408bbf1845d8be32d5f1823cdcdead243bfb64cb5eb33d558cbdeb0b0b64276ae3ad70523496404c0
+EBUILD fieldslib-0.14.0.ebuild 472 BLAKE2B b410aaa71bc0c51efc681e8e42536ecbd0e4648f13c28113a239a3ec63dba86c0d432f030e608880f30264aaac3d035e1a837c8f2d7876d68fe5db306865ad89 SHA512 2a2d422a7a60f1b7301b63dd7378d9080e74d84f3137ff9e4f23501da2f5f5747ab76163db026466e7f3534a757631561773b5718c573690e1abc0f50f1fb17b
 MISC metadata.xml 653 BLAKE2B b3702122c92b23968c528ef67bb667868e5ab691a9e143e3f8581dd636cddd2827c09c134d8533a29c6ad1b53ac56edfc154f90889ca0e68480a462954beb50c SHA512 d9c24b44732fabd5b59e2eb522cd3bcc50c60b798680b8fefafe8b942c64aacf0f3ff9cc629f2ed3033f7e3be9a4edb9627d387e8f1d4888abbd6b6f5b03f181
diff --git a/dev-ml/fieldslib/fieldslib-0.14.0.ebuild b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
index fa3741770fce..cb0a2fe393b0 100644
--- a/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
+++ b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
index b8ea593ee4bb..9748d82333dd 100644
--- a/dev-ml/fmt/Manifest
+++ b/dev-ml/fmt/Manifest
@@ -1,5 +1,3 @@
-DIST fmt-0.8.4.tbz 14079 BLAKE2B c4b6fc35a27734e8d878ef1abfa900b659d4acafc20757b0413aec1404378aed6e57c6a1a0e5c7dbda7e60fdd911d38fa1fecc76d670299ddf6ed14930fbcc28 SHA512 d17407f15447172ad444fa288b9a16962b0e4829cb73f62004b0f8dad2bec60a7911ad11fd05545d61d7fdb88099e53694548c73368399ba183c53383e1dfd31
 DIST fmt-0.8.9.tbz 21469 BLAKE2B 4cddf626118c9bdea435f9db4e6a3c0b92b49b2c07d1b0f708ae7b82963453be666ad49df196d98b466236509d3fa5a519e191da6b2385a308d1019f1583f0b5 SHA512 19b97caf5d2dbe86cd75bec478707b8f4e4b899b2a11ce04790dc5acb5c9ed6ea98047de52ee50c6480231a16307af2541eabaa94d18d7d008f7a67496f5f626
-EBUILD fmt-0.8.4.ebuild 765 BLAKE2B 91222c11a160ef9aae734095245568acf08c7fbcac767b40287b93c914d2643704cd51c0249001c86121db80fd9e7d4579419234f15a475dc614ecd8182944d9 SHA512 5f6635d3f81a913c52b1f708eb86ec2092dce9824d0c95c2b6994963d567430bda8996a87b022bcc05785f963344e4f89e7e443dbd6152e9acbd69c1f8122903
 EBUILD fmt-0.8.9-r1.ebuild 840 BLAKE2B df28dfe85d38e819f5c9a39bdb7e6030b722637130bf71408eac82b5e44eab01d5d946cc57118b99818cfe07c6e484279a847ea4b9bf9f4a0a1dbb12d738928c SHA512 1ecd60e2ed4673082ad0a816becdd3e38bcad426815d200b5b90fbb83f5810719678883d4f6f7cd042bff1b2ceb4a01177c88a67b96ea239f2751590175372e0
 MISC metadata.xml 244 BLAKE2B 7bad0b6c3b4ef28ccc919f1cbd297434f930aee5575e6135e78409a31f2e8e6406201c3dd81992cf89f808a0f3af6aac46165395ec7cda6b4af91274696a9eb7 SHA512 319d9b69276e64a092b5c35b50894347712a625e6af1773fe2b2e988428f7cfae19fcbeadea0152c3c02969f4dd5b5e2e369a6a2f29579d037d819b314461705
diff --git a/dev-ml/fmt/fmt-0.8.4.ebuild b/dev-ml/fmt/fmt-0.8.4.ebuild
deleted file mode 100644
index e08ee4dfd3c4..000000000000
--- a/dev-ml/fmt/fmt-0.8.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit findlib opam
-
-DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions"
-HOMEPAGE="https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt"
-SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ml/result:=[ocamlopt]
-	dev-lang/ocaml:=[ocamlopt]
-	dev-ml/uchar:=[ocamlopt]
-	dev-ml/cmdliner:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	>=dev-ml/topkg-0.9
-	dev-ml/ocamlbuild
-	dev-ml/findlib"
-
-src_compile() {
-	ocaml pkg/pkg.ml build --tests $(usex test 'true' 'false') || die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 3c984e0f5f33..0bbcfced7736 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,5 +1,3 @@
-DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a
 DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
-EBUILD integers-0.2.2.ebuild 724 BLAKE2B b8a46e4a19a2ba854cbdfad4844e44d18da832d3ebfffa61599f37168125643c7f9973026f70317106ce58f0032b696f8509f5420cf0cd8fcccb689a269156a1 SHA512 e70e8cb10db7e476ed2590025f8b7ae23657199dce1c2bdf4ed2e8a2a8a0dd876ea10c3aa3882d59f9a426bc24db02268c1f58f53d7d4c1cc6c1f2622bceca59
-EBUILD integers-0.4.0.ebuild 478 BLAKE2B 06dba7fd1fee624f292c63b3d119119a3acc89337cd6d87a99187a2e6bd23622d41c5d7ad0e29b89acc7fdedb8b9913c2dc94f126c1f604c93c1423510a834f7 SHA512 da113b2be8dbf9feffae925599675cc933339197b91eb4106bfddc5ef7893f9692d3b21d7020a447abde5ad4519230e62dc6e6d07c84b6c272812bc91c7e1e75
+EBUILD integers-0.4.0.ebuild 475 BLAKE2B f1288c7b71549228345994d826a2f6973d88e46b5a99a6c115314b06a6b85de04c5c426c03f1e7c76f98b75f8223a71cec1276e3c74762419db212649e312b35 SHA512 583e6daef600004bc0a516ceb736dba1c96e2af8d17d92323980fd0151a5a2c574ab01cd8080be3cc18d2e3a45334be41784b7f0d03174b167a884010c356eeb
 MISC metadata.xml 333 BLAKE2B 47fde1e3ad5ef5a0645e960c712e37f7bc4c5083b26932697e02c29cd1797c2fa986b98a51571a98e4f66d8559a252e5f03f43a2ecc95caf02df24d1fc74e80f SHA512 47a5112e4bbd899580c7e40fc0af2fa20fdf836f211452d15c2c5a70b3fb126689d0e1c51093ca3a472621c38e32cb15c02da9bbdc25aae48c78317a0ccf11f5
diff --git a/dev-ml/integers/integers-0.2.2.ebuild b/dev-ml/integers/integers-0.2.2.ebuild
deleted file mode 100644
index 4c4999134304..000000000000
--- a/dev-ml/integers/integers-0.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Various signed and unsigned integer types for OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
-SRC_URI="https://github.com/ocamllabs/ocaml-integers/releases/download/v${PV}/${P}.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/ocaml:="
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-	dev-ml/opam
-	dev-ml/topkg
-	dev-ml/findlib"
-
-src_compile() {
-	ocaml pkg/pkg.ml build || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-}
diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild
index 08af4e0f7e86..fb25c4b284b8 100644
--- a/dev-ml/integers/integers-0.4.0.ebuild
+++ b/dev-ml/integers/integers-0.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
index 7252920961cc..c726e9dd463c 100644
--- a/dev-ml/jane-street-headers/Manifest
+++ b/dev-ml/jane-street-headers/Manifest
@@ -1,3 +1,3 @@
 DIST jane-street-headers-0.14.0.tar.gz 4662 BLAKE2B 22a48e9c254005d28c03399dd9d9347b45b7e3def9c0efdd768162f80ff611be6249d629cd78fd8768c7e6ec5610684e9459b149f3de85da307b2f1e8525296d SHA512 9c80acc57016f98cd88455866523f2463a13d2b7e10cf0d63f5198747615321799a8b3442432b321fa4f33a051f404464e27972317d197ac9513651600673879
-EBUILD jane-street-headers-0.14.0.ebuild 438 BLAKE2B 65151ac8129026b42837abfdeef5447e0e7e9c579b3046519227da273f32b4d4f695aabc03d56f81bdf9b9e9fc87865a78f3b6d5ea3e16ad4d6c7a68f74b34a7 SHA512 68474cd5302ccb404d3653a75c026c1aede0c8283baf772532cc1c41cb636323a3c9a29ba43bf0d9e8dfba531d8e50440432bc782f5cad8371e9aeebb2555a04
+EBUILD jane-street-headers-0.14.0.ebuild 436 BLAKE2B f1576098956bb5dbf9e67b6a55da33a311814e3343a373cb97d655151e6b498ad239552ec945c8c0d92f12ff92ba17f9680626f933b4d0d8faa8b5986758b29f SHA512 c315641766c79ca15b2ee1c25e949b96fb7c151962c3ad02f9f0c5ba36d910333340ad16d3015ddceaab55ebd749705ce4c7e781a093b67276f223c949edbbab
 MISC metadata.xml 339 BLAKE2B 85c148f7fb2c8d7e08845f11faf317cd19f45d63b88d9093d6d1d51f5c876466bd425f275ccb43ab75674d9808f3b2704833697047aa15eec15006b7187010b6 SHA512 2f111efb4204b28b0b80db6d34788fbdaec96fad172488c4aabfde7bb6b29e4920fd13b1d50a04dbc8c15e440b4979f594e3b4715cb54ea76cb0c17cbaee7b5e
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
index 98e77c7843bf..7a98ba245d43 100644
--- a/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest
index 0a10b59f2269..ba44045206e6 100644
--- a/dev-ml/jingoo/Manifest
+++ b/dev-ml/jingoo/Manifest
@@ -1,3 +1,3 @@
 DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad
-EBUILD jingoo-1.4.2.ebuild 560 BLAKE2B d9f3a3f34e5ba3e313155e04deffa7684e5bcb030e69c5500e8e2e2f9c24b7fb18862d51d19eac368fa88ece0639d5b49a8b7ffbe83ebe304c5ba654c8135b06 SHA512 3f7cd9f674f4ab6169544e4131d9c56356e661c8d6560e51d60b4ac94c192cd8f99d36dda2d1a736c80e08035aac5f6477a4473d52cedc21cd1d8ad4181a800c
+EBUILD jingoo-1.4.2.ebuild 665 BLAKE2B 60f857f90c6d346d3180ecdcf63705a326d80c5a9c5a2c4b9955e04a51938d223854ef55ecfbca46ce2a959fb4143ab60820f499777e2aad78cec370670ccb33 SHA512 299ec5c9022f7de6a7ce99d81bc19bc072c725c6267b088f7e989e290809e4435039a53864f612d04dd4b8edc1897eadff73210e0404e078fa6f4bd5403685ef
 MISC metadata.xml 317 BLAKE2B b57cff70c59dd46051192a7e63c8de6921d3b71c9f69cc4a4ecb677bd53330c4ab7e96711cb23d3136faae3b88a8ff591ddfb016e17a8481de2614355a17ddb6 SHA512 afc508aed8b09713f0f3246783a64f8b26a016b26fc14ad3388c0815136219da00bacc7174629c3f829eefb67d0e5d7fb384919f5ec61f42c963782a1398b85a
diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild
index 666330ad24bf..21270b6af09c 100644
--- a/dev-ml/jingoo/jingoo-1.4.2.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild
@@ -22,4 +22,11 @@ RDEPEND="dev-ml/ppx_deriving:=
 	dev-ml/re:=
 	dev-ml/menhir:="
 DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
+	test? ( dev-ml/ounit2 )"
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' tests/dune.in || die
+}
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index 5c99b43f04bc..3c57bb4a9c82 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -1,3 +1,3 @@
 DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
-EBUILD jst-config-0.14.0.ebuild 531 BLAKE2B 79abcf25d3cea4fa13fbd951bd695ed1bae9a36e9a1c012d1f206ea0cb8754c6eae452a36b23c1b2e52e97c0fd46e3960efe8ab553ff3fcec0a609d2278bc8e5 SHA512 72f0b6596f257b3363eb2a07cac5d1daafd27417270aa1f36e2511a52b4732cdbded6a97c789e4c77895ad62fe7aa269afaa14092dfe0b307b0f3eed71825bc3
-MISC metadata.xml 330 BLAKE2B 15602b7cb5a56cfcedef0915d59ccacb98ede36037a7ce187ffacec4f3f5255643bfc9c5965ea40179a33df097b7db22219c33117c8ac34c408847e1ce00060e SHA512 01dc5993650b041bbf4ce5214b3033af924d7b0404a96b96a7b51599738092cba12bb9064eb4508236d525692a3bce1e5a1d51942fa52f2521200c8ab3567d27
+EBUILD jst-config-0.14.0.ebuild 529 BLAKE2B f56c9c1f1ad30edcfa66b391be8cb0aba83761149024a84513dc460e2be540321dfee2661fee64d732c6669b9dab0b6e6a76ff024651adf1b3bdb8a334c01796 SHA512 b09832a6d2a2c5eb88fdee7920f1fb602fa4c864acd57b09a0a3b78f0ff4de7a2ded2f4b10f644e8a08c559b3748a4f8987eb417f18a3ae298c5495fc0306073
+MISC metadata.xml 330 BLAKE2B c00b17c0f6b91ac97befe422f0a13aa8ba522c33495b70f68e98d26845303af4eaa20c5ce433576691540a8377e0d08e253a28ffccf03d3f10cd9e0abb600acf SHA512 3db6877605d03a86ec8db6d66234688c742d0dc95c13f0ba6bd36b6a22e933e0de9895692d3fcca08d6b8ecf5c600696ee2e638ec21c1d4cf6e5e0b394926130
diff --git a/dev-ml/jst-config/jst-config-0.14.0.ebuild b/dev-ml/jst-config/jst-config-0.14.0.ebuild
index d8170ff7495d..dd1ee7ea3ad1 100644
--- a/dev-ml/jst-config/jst-config-0.14.0.ebuild
+++ b/dev-ml/jst-config/jst-config-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/jst-config/metadata.xml b/dev-ml/jst-config/metadata.xml
index dfb62d54d092..9695c81b0cf8 100644
--- a/dev-ml/jst-config/metadata.xml
+++ b/dev-ml/jst-config/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 87a98da78a78..5c95091fb715 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,10 +1,6 @@
 AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
-DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
-DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
-EBUILD lablgtk-2.18.10.ebuild 1979 BLAKE2B fc3f2212c9629121a9c219783e525fa5a3ddc2aa61acc52ed03f5a4568d89e962b17151681e45d67f7a6438de86d82e28993631164ae68fecc5fda88f538a8b4 SHA512 89ec5fc71bfe6e07060c0830f07664cb2746471f6af527a1e517353fa2c467c8aae5fdc4699c7c459ec02a65b89b90bbcbd654fb0c2961e298e122391cdc280f
-EBUILD lablgtk-2.18.5.ebuild 2324 BLAKE2B c521edb7b2726f0991318bf68d08ee359822c2eb3e055b32323d530488c08f06d4287a2a08a2dbddad574a65b584da7b3fa29f9fe12d9d8884b9cbf6f34b732c SHA512 e2188b5447c8127945f43145b851d1f75fdbc29112ff7db551f30b53a720c97839e80f58ece7f80f297fb4582471df4d6d293e7935edd0a1858941c28cd0fcbc
-EBUILD lablgtk-2.18.8-r1.ebuild 1710 BLAKE2B e404ccdcd1b0329abbe678f23533243ecd31b2f6192ff3ce379c23e794a6eb25a70ec55c1a9783850f89961a4de18a2ac092ef7f2c828eb82078ca1ef7625315 SHA512 986b606bc6eeb8803852754790c5775f9666c6a9b14cea8a6f10382c789f22427c2c04c97586a6026273e9ef0d2de61703a58607786cbcf74fc130aa97eaa5ba
+EBUILD lablgtk-2.18.10.ebuild 1977 BLAKE2B 69e2e9fbd47ab6ed17142ebf8faa35b2b14d7b618b2d28421433bba6f7d9cd423585e5e19f76849cf2d8bbba6bfd25815993a55cf7c7a6db77ea1d7dafb5aa1a SHA512 f69ce8d47f79017e499e59fc8d6c87c88ddbd49a5d78dc23d5f25c66d10a81f7ebba6ff7b9afbfda9037216c288356c90ad2d1e74914da017877394502e9bfdc
 EBUILD lablgtk-3.1.1.ebuild 702 BLAKE2B 29d01d15a38b2e68e6097e2dffa2605ca8d2c010063801315f5ab79e16e600029ee03c0a1efa44b0666a13c279850754d8c14e078aaa96181edcad0b6cec1385 SHA512 0d9137f652f9babb62b147db5d574b539c55155f1450534f19d38ea4f7ec7e5df5a9c8ab6b4ea4510e5d17b43713186b0135baed44e447929eb56491c82ce94a
 MISC metadata.xml 553 BLAKE2B 90a0c974eeb82ca8d6c6634fa4c277ce2aa1352629462377178bfcab4928df5cf1cce9242b32c30447f006cab1297622c0f5ae16cab7030b23373f9bd67fd926 SHA512 dde726bb31037d7fe2490b2f578bae878c4f08a350ea732ed036ff2497c3bbf445953ff22f011a2e6e4fdf8295509fd3ef3f979c90157f35bb48c04efbde8302
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 24e25850f2ad..2a808a4b259d 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
deleted file mode 100644
index 9bef8aaa2b15..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib findlib
-
-IUSE="debug examples glade gnomecanvas sourceview +ocamlopt spell svg"
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1627/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	<dev-lang/ocaml-4.09:=[ocamlopt?]
-	svg? ( >=gnome-base/librsvg-2.2:2 )
-	glade? ( >=gnome-base/libglade-2.0.1 )
-	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
-	spell? ( app-text/gtkspell:2 )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	dev-ml/camlp4:=
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with svg rsvg) \
-		$(use_with glade) \
-		--without-gnomeui \
-		--without-panel \
-		--without-gl \
-		$(use_with spell gtkspell) \
-		--without-gtksourceview \
-		$(use_with sourceview gtksourceview2) \
-		$(use_with gnomecanvas)
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-install_examples() {
-	insinto /usr/share/doc/${P}/examples
-	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
-
-	# Install examples for optional components
-	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
-	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
-	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
-	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
-
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-src_install() {
-	findlib_src_preinst
-	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
-	emake install DESTDIR="${D}"
-
-	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
-
-	dodoc CHANGES README CHANGES.API
-	use examples && install_examples
-}
-
-pkg_postinst() {
-	if use examples; then
-		elog "To run the examples you can use the lablgtk2 toplevel."
-		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
-	fi
-}
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
deleted file mode 100644
index 6bbe47119f84..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.8-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=7
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org"
-SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/camlp4:=
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	gnomecanvas? ( gnome-base/libgnomecanvas )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	spell? ( app-text/gtkspell:2 )
-	svg? ( gnome-base/librsvg:2 )"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-ml/findlib
-	virtual/pkgconfig"
-
-DOCS=( CHANGES README CHANGES.API )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_with svg rsvg)
-		$(use_with glade)
-		--without-gnomeui
-		--without-panel
-		# relies on EOL gtkglarea
-		--without-gl
-		$(use_with spell gtkspell)
-		--without-gtksourceview
-		$(use_with sourceview gtksourceview2)
-		$(use_with gnomecanvas)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# parallel build crashes
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	local destdir="$(ocamlfind printconf destdir || die)"
-	dodir "${destdir}/stublibs"
-	export OCAMLFIND_DESTDIR=${ED}"${destdir}"
-	export OCAMLPATH="${ED}${destdir}"
-	export OCAMLFIND_LDCONF=ignore
-
-	default
-	rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die
-
-	if use examples; then
-		dodoc -r examples/
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index a5f299e03ba9..47cbf1dda79e 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,9 +1,6 @@
 AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
-AUX ocaml405.patch 13731 BLAKE2B 36ce4825b8e004720d966d7a7c1a769c84e4e3b044c07ce8112ee456acd819315a21625acb33a8423ad317d026bb03ddffa2b3dcba63dec1549254815c14d7e7 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d
-DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.2.ebuild 1093 BLAKE2B 529cef5576a7ba07ab56ef4c29a5cdebd03f058ddefc26e2d3d484585d1b0d8dc1a6930d1cda915cb012e5c6351e87443993282aa8ed64daef46e4e0f4eed0c1 SHA512 dcfe8dc6542034ca114fe5267b1eed116e48a3018e88938e13c8cc3c4da458a345a47b9c2f536ac2bb74f9b0c57b0a39f0726bf55b0042a7233fb9f333a07e9e
 EBUILD labltk-8.06.7.ebuild 998 BLAKE2B c31a2f9eb29f5d63a22a998c8dd9e143798f74d17e0d04bfef4c6995e9a003cbe897a5b157d6044f450fd3177c024cc768db785ab90577101651cbfa3f5d8cce SHA512 c4fc20f8b97e23cb0caf8e3b478d34c60c13a00617fb41dad005c811f9746f1c42c508796af24ca306b7d29bc065bdf6ebbb8b4ca377ba785ae24106620d7758
 EBUILD labltk-8.06.9.ebuild 986 BLAKE2B acfde3021a3cae9b4ced6ba8e79c04034b5eaca4d3b54b45c4c2823c838ebf7887192a5396c91b8a748bfc5c2c154ae6839a35936445d607d5bffdaec0dfe244 SHA512 12877671736a842ee5a21caee37015a963163d66efcc95d2c05de8fbb58868c21258513f26bb26920e93abfadd4b74c02b9695132558a45c9131ac9e1e4040c8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch
deleted file mode 100644
index 8503646f71ec..000000000000
--- a/dev-ml/labltk/files/ocaml405.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-Index: labltk-8.06.2/support/cltkCaml.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkCaml.c
-+++ labltk-8.06.2/support/cltkCaml.c
-@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl
-     int id;
-     if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK)
-       return TCL_ERROR;
--    callback2(*handler_code,Val_int(id),
-+    caml_callback2(*handler_code,Val_int(id),
-               copy_string_list(argc - 2,(char **)&argv[2]));
-     /* Never fails (OCaml would have raised an exception) */
-     /* but result may have been set by callback */
-@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v)
- /* Note: raise_with_string WILL copy the error message */
- CAMLprim void tk_error(const char *errmsg)
- {
--  raise_with_string(*tkerror_exn, errmsg);
-+  caml_raise_with_string(*tkerror_exn, errmsg);
- }
- 
- 
-Index: labltk-8.06.2/support/cltkDMain.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkDMain.c
-+++ labltk-8.06.2/support/cltkDMain.c
-@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client
-   /* Rearm timer */
-   Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
-   signal_events = 1;
--  leave_blocking_section();
-+  caml_leave_blocking_section();
- }
- /* The following is taken from byterun/startup.c */
- header_t atom_table[256];
-@@ -222,10 +222,10 @@ int Caml_Init(interp)
-       strcat(f, RCNAME);
-       if (0 == access(f,R_OK))
-         if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
--          stat_free(f);
-+          caml_stat_free(f);
-           tk_error(Tcl_GetStringResult(cltclinterp));
-         };
--      stat_free(f);
-+      caml_stat_free(f);
-     }
-   }
- 
-Index: labltk-8.06.2/support/cltkEval.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkEval.c
-+++ labltk-8.06.2/support/cltkEval.c
-@@ -45,7 +45,7 @@ value copy_string_list(int argc, char **
-   for (i = argc-1; i >= 0; i--) {
-     oldres = res;
-     str = tcl_string_to_caml(argv[i]);
--    res = alloc(2, 0);
-+    res = caml_alloc(2, 0);
-     Field(res, 0) = str;
-     Field(res, 1) = oldres;
-   }
-@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str
-   Tcl_ResetResult(cltclinterp);
-   cmd = caml_string_to_tcl(str);
-   code = Tcl_Eval(cltclinterp, cmd);
--  stat_free(cmd);
-+  caml_stat_free(cmd);
- 
-   switch (code) {
-   case TCL_OK:
-@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v
-       fill_args(tmpargv,0,Field(v,0));
-       tmpargv[size] = NULL;
-       merged = Tcl_Merge(size,(const char *const*)tmpargv);
--      for(i = 0; i<size; i++){ stat_free(tmpargv[i]); }
--      stat_free((char *)tmpargv);
-+      for(i = 0; i<size; i++){ caml_stat_free(tmpargv[i]); }
-+      caml_stat_free((char *)tmpargv);
-       /* must be freed by stat_free */
-       argv[where] = (char*)caml_stat_alloc(strlen(merged)+1);
-       strcpy(argv[where], merged);
-@@ -227,10 +227,10 @@ CAMLprim value camltk_tcl_direct_eval(va
- 
-   /* Free the various things we allocated */
-   for(i=0; i< size; i ++){
--    stat_free((char *) allocated[i]);
-+    caml_stat_free((char *) allocated[i]);
-   }
--  stat_free((char *)argv);
--  stat_free((char *)allocated);
-+  caml_stat_free((char *)argv);
-+  caml_stat_free((char *)allocated);
- 
-   switch (result) {
-   case TCL_OK:
-Index: labltk-8.06.2/support/cltkEvent.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkEvent.c
-+++ labltk-8.06.2/support/cltkEvent.c
-@@ -49,6 +49,6 @@ CAMLprim value camltk_dooneevent(value f
- 
-   CheckInit();
- 
--  ret = Tk_DoOneEvent(convert_flag_list(flags, event_flag_table));
-+  ret = Tk_DoOneEvent(caml_convert_flag_list(flags, event_flag_table));
-   return Val_int(ret);
- }
-Index: labltk-8.06.2/support/cltkFile.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkFile.c
-+++ labltk-8.06.2/support/cltkFile.c
-@@ -33,7 +33,7 @@
- 
- void FileProc(ClientData clientdata, int mask)
- {
--  callback2(*handler_code,Val_int(clientdata),Val_int(0));
-+  caml_callback2(*handler_code,Val_int(clientdata),Val_int(0));
- }
- 
- /* Map Unix.file_descr values to Tcl file handles */
-Index: labltk-8.06.2/support/cltkImg.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkImg.c
-+++ labltk-8.06.2/support/cltkImg.c
-@@ -47,7 +47,7 @@ CAMLprim value camltk_getimgdata (value
- 
-   code = Tk_PhotoGetImage(ph,&pib); /* never fails ? */
-   size = pib.width * pib.height * pib.pixelSize;
--  res = alloc_string(size);
-+  res = caml_alloc_string(size);
- 
-   /* no holes, default format ? */
-   if ((pib.pixelSize == 3) &&
-Index: labltk-8.06.2/support/cltkMain.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkMain.c
-+++ labltk-8.06.2/support/cltkMain.c
-@@ -51,11 +51,11 @@ int signal_events = 0; /* do we have a p
- void invoke_pending_caml_signals (ClientData clientdata)
- {
-   signal_events = 0;
--  enter_blocking_section(); /* triggers signal handling */
-+  caml_enter_blocking_section(); /* triggers signal handling */
-   /* Rearm timer */
-   Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
-   signal_events = 1;
--  leave_blocking_section();
-+  caml_leave_blocking_section();
- }
- 
- /* Now the real Tk stuff */
-@@ -77,7 +77,7 @@ CAMLprim value camltk_opentk(value argv)
-   tmp = Val_unit;
- 
-   if ( argv == Val_int(0) ){
--    failwith("camltk_opentk: argv is empty");
-+    caml_failwith("camltk_opentk: argv is empty");
-   }
-   argv0 = String_val( Field( argv, 0 ) );
- 
-@@ -91,7 +91,7 @@ CAMLprim value camltk_opentk(value argv)
-       /* Register cltclinterp for use in other related extensions */
-       value *interp = caml_named_value("cltclinterp");
-       if (interp != NULL)
--        Store_field(*interp,0,copy_nativeint((intnat)cltclinterp));
-+        Store_field(*interp,0,caml_copy_nativeint((intnat)cltclinterp));
-     }
- 
-     if (Tcl_Init(cltclinterp) != TCL_OK)
-@@ -128,7 +128,7 @@ CAMLprim value camltk_opentk(value argv)
-         args = Tcl_Merge(argc, (const char *const*)tkargv); /* args must be freed by Tcl_Free */
-         Tcl_SetVar(cltclinterp, "argv", args, TCL_GLOBAL_ONLY);
-         Tcl_Free(args);
--        stat_free( tkargv );
-+        caml_stat_free( tkargv );
-       }
-     }
-     if (Tk_Init(cltclinterp) != TCL_OK)
-@@ -164,10 +164,10 @@ CAMLprim value camltk_opentk(value argv)
-       strcat(f, RCNAME);
-       if (0 == access(f,R_OK))
-         if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
--          stat_free(f);
-+          caml_stat_free(f);
-           tk_error(Tcl_GetStringResult(cltclinterp));
-         };
--      stat_free(f);
-+      caml_stat_free(f);
-     }
-   }
- 
-Index: labltk-8.06.2/support/cltkMisc.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkMisc.c
-+++ labltk-8.06.2/support/cltkMisc.c
-@@ -41,12 +41,12 @@ CAMLprim value camltk_splitlist (value v
-    { value res = copy_string_list(argc,argv);
-      Tcl_Free((char *)argv);    /* only one large block was allocated */
-      /* argv points into utf: utf must be freed after argv are freed */
--     stat_free( utf );
-+     caml_stat_free( utf );
-      return res;
-    }
-   case TCL_ERROR:
-   default:
--    stat_free( utf );
-+    caml_stat_free( utf );
-     tk_error(Tcl_GetStringResult(cltclinterp));
-   }
- }
-@@ -54,7 +54,7 @@ CAMLprim value camltk_splitlist (value v
- /* Copy an OCaml string to the C heap. Should deallocate with stat_free */
- char *string_to_c(value s)
- {
--  int l = string_length(s);
-+  int l = caml_string_length(s);
-   char *res = caml_stat_alloc(l + 1);
-   memmove (res, String_val (s), l);
-   res[l] = '\0';
-Index: labltk-8.06.2/support/cltkTimer.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkTimer.c
-+++ labltk-8.06.2/support/cltkTimer.c
-@@ -26,7 +26,7 @@
- /* Basically the same thing as FileProc */
- void TimerProc (ClientData clientdata)
- {
--  callback2(*handler_code,Val_long(clientdata),Val_int(0));
-+  caml_callback2(*handler_code,Val_long(clientdata),Val_int(0));
- }
- 
- CAMLprim value camltk_add_timer(value milli, value cbid)
-Index: labltk-8.06.2/support/cltkUtf.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkUtf.c
-+++ labltk-8.06.2/support/cltkUtf.c
-@@ -76,14 +76,14 @@ value tcl_string_to_caml( const char *s
-   char *str;
- 
-   str = utf_to_external( s );
--  res = copy_string(str);
--  stat_free(str);
-+  res = caml_copy_string(str);
-+  caml_stat_free(str);
-   CAMLreturn(res);
- }
- 
- #else
- 
- char *caml_string_to_tcl(value s){ return string_to_c(s); }
--value tcl_string_to_caml(char *s){ return copy_string(s); }
-+value tcl_string_to_caml(char *s){ return caml_copy_string(s); }
- 
- #endif
-Index: labltk-8.06.2/support/cltkVar.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkVar.c
-+++ labltk-8.06.2/support/cltkVar.c
-@@ -35,7 +35,7 @@ CAMLprim value camltk_getvar(value var)
-   stable_var = string_to_c(var);
-   s = (char *)Tcl_GetVar(cltclinterp,stable_var,
-                          TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
--  stat_free(stable_var);
-+  caml_stat_free(stable_var);
- 
-   if (s == NULL)
-     tk_error(Tcl_GetStringResult(cltclinterp));
-@@ -57,11 +57,11 @@ CAMLprim value camltk_setvar(value var,
-   utf_contents = caml_string_to_tcl(contents);
-   s = (char *)Tcl_SetVar(cltclinterp,stable_var, utf_contents,
-                          TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
--  stat_free(stable_var);
-+  caml_stat_free(stable_var);
-   if( s == utf_contents ){
-     tk_error("camltk_setvar: Tcl_SetVar returned strange result. Call the author of mlTk!");
-   }
--  stat_free(utf_contents);
-+  caml_stat_free(utf_contents);
- 
-   if (s == NULL)
-     tk_error(Tcl_GetStringResult(cltclinterp));
-@@ -84,7 +84,7 @@ static char * tracevar(clientdata, inter
-   Tcl_UntraceVar2(interp, name1, name2,
-                 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                 tracevar, clientdata);
--  callback2(*handler_code,Val_int(clientdata),Val_unit);
-+  caml_callback2(*handler_code,Val_int(clientdata),Val_unit);
-   return (char *)NULL;
- }
- 
-@@ -103,10 +103,10 @@ CAMLprim value camltk_trace_var(value va
-                    tracevar,
-                    (ClientData) (Long_val(cbid)))
-                    != TCL_OK) {
--    stat_free(cvar);
-+    caml_stat_free(cvar);
-     tk_error(Tcl_GetStringResult(cltclinterp));
-   };
--  stat_free(cvar);
-+  caml_stat_free(cvar);
-   return Val_unit;
- }
- 
-@@ -123,6 +123,6 @@ CAMLprim value camltk_untrace_var(value
-                  TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                  tracevar,
-                  (ClientData) (Long_val(cbid)));
--  stat_free(cvar);
-+  caml_stat_free(cvar);
-   return Val_unit;
- }
-Index: labltk-8.06.2/support/cltkWait.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkWait.c
-+++ labltk-8.06.2/support/cltkWait.c
-@@ -54,8 +54,8 @@ static void WaitVisibilityProc(clientDat
-   Tk_DeleteEventHandler(vis->win, VisibilityChangeMask,
-             WaitVisibilityProc, clientData);
- 
--  stat_free((char *)vis);
--  callback2(*handler_code,cbid,Val_int(0));
-+  caml_stat_free((char *)vis);
-+  caml_callback2(*handler_code,cbid,Val_int(0));
- }
- 
- /* Sets up a callback upon Visibility of a window */
-@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win
-     (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
-   vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
-   if (vis -> win == NULL) {
--    stat_free((char *)vis);
-+    caml_stat_free((char *)vis);
-     tk_error(Tcl_GetStringResult(cltclinterp));
-   };
-   vis->cbid = Int_val(cbid);
-@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl
-   if (eventPtr->type == DestroyNotify) {
-     struct WinCBData *vis = clientData;
-     value cbid = Val_int(vis->cbid);
--    stat_free((char *)clientData);
-+    caml_stat_free((char *)clientData);
-     /* The handler is destroyed by Tk itself */
--    callback2(*handler_code,cbid,Val_int(0));
-+    caml_callback2(*handler_code,cbid,Val_int(0));
-   }
- }
- 
-@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win
-     (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
-   vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
-   if (vis -> win == NULL) {
--    stat_free((char *)vis);
-+    caml_stat_free((char *)vis);
-     tk_error(Tcl_GetStringResult(cltclinterp));
-   };
-   vis->cbid = Int_val(cbid);
-Index: labltk-8.06.2/browser/searchpos.ml
-===================================================================
---- labltk-8.06.2.orig/browser/searchpos.ml
-+++ labltk-8.06.2/browser/searchpos.ml
-@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp =
-         search_pos_expr exp' ~pos
-       end;
-       search_pos_expr exp ~pos
--  | Texp_function (_, l, _) ->
-+  | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } ->
-       List.iter l ~f:(search_case ~pos)
-   | Texp_apply (exp, l) ->
-       List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x);
-Index: labltk-8.06.2/jpf/fileselect.ml
-===================================================================
---- labltk-8.06.2.orig/jpf/fileselect.ml
-+++ labltk-8.06.2/jpf/fileselect.ml
-@@ -55,7 +55,7 @@ let myentry_create p ~variable =
- let subshell cmd =
-   let r,w = pipe () in
-     match fork () with
--      0 -> close r; dup2 ~src:w ~dst:stdout;
-+      0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout;
-            execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |]
-     | id ->
-         close w;
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
deleted file mode 100644
index c598fa167907..000000000000
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
-HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt X"
-
-RDEPEND=">=dev-lang/tk-8.0.3:=
-	>=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-1.5.5-r1"
-
-src_prepare() {
-	epatch "${FILESDIR}/findlib.patch"
-	has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch"
-}
-
-src_configure() {
-	./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
-}
-
-src_compile() {
-	emake -j1
-	use ocamlopt && emake -j1 opt
-}
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake \
-		INSTALLDIR="${D}$(ocamlc -where)/labltk" \
-		INSTALLBINDIR="${ED}/usr/bin/" \
-		install
-	dodoc Changes README.mlTk
-}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 53f3dc7bcdd7..654031ef8433 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,12 +4,12 @@ DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
-EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 71c2d364d0e6c52cec07cb743813963d12bd6918c0558b2edcf73b14647b40ce217a4b824def2e0590d06bcd085f71f0de18e1a12504a7a10ce072284393657f SHA512 7e572802eb3ece2e2f57ec391334860a1e9fb911e74ddd7e224965657031cc5ae463cb26466ca0f34e93c488acae5c8814f0f72e6b1201864e573033effeddc7
-EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 6bb5afbfe3536cd33530e082aef0e634b925c4887de9340ad19a9ed55ee5e647aa48ee0d0e66960cd088cf34306f254f931c8e21fd9e4e73875b977126d23ac1 SHA512 27fe154682b0d163118ff5311bc4443f36a4533f92d254878e57fc4917ab47b7a93c549cbd09f4c182f0f8f95f98044ead0edef7a4e29073404b513c5415b817
-EBUILD llvm-ocaml-11.0.1.ebuild 3053 BLAKE2B 9af55df861e473d24ba0cd3641527c8c1d7be544175c7e74a2e1e4f977fd8b0b1132510bc132b47ec494d07ca514720c8ea9742f39c9d327b0ee141ab7fe91d0 SHA512 6aa5aec51ce0dcd3271d2b0c4965f62a171ede0b01b63f3e84906a88f16821e4cf2fe97eb1f040ad3a5c536c1a990ee567bc54682f61971e0e495850271a630f
-EBUILD llvm-ocaml-11.1.0.ebuild 3053 BLAKE2B 9af55df861e473d24ba0cd3641527c8c1d7be544175c7e74a2e1e4f977fd8b0b1132510bc132b47ec494d07ca514720c8ea9742f39c9d327b0ee141ab7fe91d0 SHA512 6aa5aec51ce0dcd3271d2b0c4965f62a171ede0b01b63f3e84906a88f16821e4cf2fe97eb1f040ad3a5c536c1a990ee567bc54682f61971e0e495850271a630f
-EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B 609f78d60cc0a66d0f929db8d6855d0f6db24c769ef156a1d69796eeca0de6a4475e99c105504253d77680949f568efdefd4007bee79015ebea159dabed5f7e3 SHA512 ce96aeeaeb4119d69ada3fdd626fcfcbe919f22faa1f2562b048adc0278b8a38d5dd074a606326f3286812402200767b08deb1ff44f9d3e3bc34f778af02242b
-EBUILD llvm-ocaml-12.0.0_rc2.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
-EBUILD llvm-ocaml-12.0.0_rc3.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
-EBUILD llvm-ocaml-13.0.0.9999.ebuild 3042 BLAKE2B a78e90337120b5e98258feab0423fbcd097ed91ad7a29419ea15ec2e1d52f24eb944bf4f70d3e8b915d7385821c9d50312c2d9c8052644a9e1d516c554e9db99 SHA512 0a1809b8ef9c4c9c1266af12d5aa613bc861e433c78f7b0e09b69d06b5f82421f80f6514f00c03f07aa94535157a24f6f8543c457ebbfaf289c8a7c0817d55fc
+EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
+EBUILD llvm-ocaml-11.0.0.ebuild 3053 BLAKE2B 0f8b152cf350f9a7cdf3d552347b5729091b265a47bff1ce289473c4d094ba55f168b9d5c18e7754cb5f48e0eafcfa1f3b3d07b6c4bae9780ac53037e7e88d04 SHA512 75d8e6273fd3360e0df8d3dd1130f4a5dcfd3c8c93d75b3b48b173632d263341d7d235d1a5309d4e9d33ce78aea262e35ab6844a7533d8fb84ce3f758cd0e27e
+EBUILD llvm-ocaml-11.0.1.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
+EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
+EBUILD llvm-ocaml-12.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
+EBUILD llvm-ocaml-12.0.0_rc2.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
+EBUILD llvm-ocaml-12.0.0_rc3.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
+EBUILD llvm-ocaml-13.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
index 5dcb70c38053..f4a1d0ea6f6b 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.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
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
index 31cda80cf0eb..2927a17a5ef7 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.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
@@ -41,7 +41,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
index 6a74d00cd2fd..eadb980e8aa5 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
index 6a74d00cd2fd..eadb980e8aa5 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
index 4f3798d7196d..3fc4ee845be9 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
@@ -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
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
index 0376bb7114cc..3fc4ee845be9 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild
index 0376bb7114cc..3fc4ee845be9 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
index 0376bb7114cc..3fc4ee845be9 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-lang/perl
 	dev-ml/findlib
 	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
+	test? ( dev-ml/ounit2 )
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 88e77a55a8be..11ae9c42b379 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,5 +1,3 @@
-DIST logs-0.6.3.tbz 17670 BLAKE2B bea90590913c83ef0ac32bb63551542d52cdc63f761e0198ff747f9e03987dcbfacd1b1e351a826218f71768020df8ebe1caa7272fd79e2c1b634645d728bdd6 SHA512 6cdcb3ee19eadb824500e90235a62326194ff5d2a44dca598d2727f2ad358273a79240197965b682aa80986870bb859ee1e57f2cb29c684c92ca146cac8094d1
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.6.3.ebuild 1157 BLAKE2B 17b237caf82e0c667737a2f2d53210b092e30547e389f19a8b8039881f9216df4e4163691b4e65cf66f7ead92d97d304eff93b630ccb570b9c6b06ac6242458e SHA512 5d883cddf6eda98d73429c4589b02a29fef205468fbe2742195cd498b9df4de068f669e420154bb740f61c40b60dcc110ad4a4b9689a357e8709bc7af9b5365c
 EBUILD logs-0.7.0.ebuild 1387 BLAKE2B 8ca895e2a2b75f2fc3eea5d34b71159f1f73695a8924126d27f4db1adb673b9af6fd057f09c311daf6250fe8e9f48e7fa30818266ec639796ff5ac110e462be7 SHA512 b375d7a465c115138537c77a3e730414b2da89a176cef61fab235c5bdd4ae16462c475f18fd5a11f29c947e20dc86aab747d31c74444df5bfba12862442af753
 MISC metadata.xml 586 BLAKE2B bd04cdf2c8e2cbf3ccb49ec1394ab882e0c104c6fbec63fe72d8497f79c91814e6df34f5e2065a4d91c6fcac2d2500a6cf4f35dd5f71dcdd0fe1c30adac042eb SHA512 ac20ca8fcaf6372f88f50ec77f6632a6d04597a8b6257e5a61ff4d66b34d74259b0ab671c840b79613213f6807c131cf6c46cf3fdb3686324548a9f23270f054
diff --git a/dev-ml/logs/logs-0.6.3.ebuild b/dev-ml/logs/logs-0.6.3.ebuild
deleted file mode 100644
index 978b7cf88e07..000000000000
--- a/dev-ml/logs/logs-0.6.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="Logging infrastructure for OCaml"
-HOMEPAGE="https://erratique.ch/software/logs https://github.com/dbuenzli/logs"
-SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+fmt cli +lwt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/result:=[ocamlopt]
-	dev-lang/ocaml:=[ocamlopt]
-	fmt? ( dev-ml/fmt:= )
-	cli? ( dev-ml/cmdliner:=[ocamlopt] )
-	lwt? ( dev-ml/lwt:= )
-"
-DEPEND="${RDEPEND}
-	dev-ml/opam
-	dev-ml/topkg
-	dev-ml/ocamlbuild
-	dev-ml/findlib
-	test? ( dev-ml/mtime )
-"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--with-js_of_ocaml false \
-		--with-fmt $(usex fmt true false) \
-		--with-cmdliner $(usex cli true false) \
-		--with-lwt $(usex fmt true false) \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index b21ae5d8e3c6..ebaf19c60421 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,4 +1,4 @@
 AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
-EBUILD lwt-5.3.0-r1.ebuild 800 BLAKE2B f948390bc748fbf09c74fb5c14483a3b8857f4098a5c5e44b442c1addd2eeb62fda0d9446d336803aab117b68e3d901dbf31f3798c9e1b96ddc0d2a8762321b9 SHA512 b08a618bf51cb76d3b9bedfca30318f815cc3a6d3861b4baa666a45412891dd07e4dbbc3a842f43761cf100b3fb31470589075e3e436988761ec0f9c3917a135
+EBUILD lwt-5.3.0-r1.ebuild 798 BLAKE2B eef325ce5007d70b4d2925513c7bd421a002ba17a5dd4b0f3a2f5234c04af2841e02af4b515aa7bd537eeb2c03a873ec775d792fc4067811f15b4a7b50741aac SHA512 999d03e9b1c86e9ba9b7f0b6085b7b61e3477ea8a8aa9e7d7808038284e9678d9d79e70926ada1d3db6678bac44a6b9212f84fd7a80302090133362012f0f7c9
 MISC metadata.xml 320 BLAKE2B 30af4a959e49cc4dedde3ee8144ebcc7358c245d0f66d18ada370d682d4b4c971c7c3c4d15e0f796aae6ff13a923e18017058bfdd73db6974973b88447311b26 SHA512 02ebc0a053f10df606e161ccb91804c8e3bc9ea34cd7c24158820aa31689f12d8297df58f56b8bb24d23e7cd89b87a198ca726130a2021163b59198e8f3ff135
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
index 86ab95f72f77..b635eab67eb5 100644
--- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://ocsigen.org/lwt"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest
index 3b88716f61e7..2b5abbb3042d 100644
--- a/dev-ml/markup/Manifest
+++ b/dev-ml/markup/Manifest
@@ -1,5 +1,3 @@
-DIST markup-0.7.5.tar.gz 278654 BLAKE2B 5338d4b546c74ade522c84c5a0583ad08b09e4ca3ecb96712725dd33792e401f66f076e47cf24986047f36236c53134272cadcd2abe322307377bb79055bf39a SHA512 19350df7a3a619c479fa030b8772009bc32f3e9830494f5707e05f85b9ee9ff0ddf382d292c7a11bbd3b63c8c108e6a84b2d01f5e983f49d7cdf63ee3c4545c8
 DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab
-EBUILD markup-0.7.5.ebuild 795 BLAKE2B 82336184a25b1bdf5587ce54b951f9e3517f87970e859708d3d719ff20dbf15c90eaec801693fd1332083462adff6f7949d403916f5d6bde3c849d38e7d730a8 SHA512 0070e1433b66ee032c722c7b0445e10c758c9e56dd2dff7b520d14be62ca5a9643397cf16f838528707e045dba8446a07f15825634bb574303379fae20fd7509
 EBUILD markup-1.0.0.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
 MISC metadata.xml 324 BLAKE2B e168b429839fdf6aa127eecfdb0d6d53bca42fd44a4a111c0fe88c92f956c4d84cdff299977727ed510d2fa75409c3119c399b774acb3e10eae4c4bbeda272db SHA512 15681de57dd33e743107811a6f05c0139cad1488009191cbb8396f344e29ead53fa8ba09bbb914c0e53d87439d2e83a864c5f162e099ae027b5b0958b6946214
diff --git a/dev-ml/markup/markup-0.7.5.ebuild b/dev-ml/markup/markup-0.7.5.ebuild
deleted file mode 100644
index 68e867c0943d..000000000000
--- a/dev-ml/markup/markup-0.7.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-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}p1"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-lang/ocaml:=[ocamlopt]
-	dev-ml/lwt:=[ocamlopt(+)]
-	>=dev-ml/uutf-1.0:=[ocamlopt]
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/ounit )
-	dev-ml/ocamlbuild"
-S="${WORKDIR}/${PN}.ml-${PV}"
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	findlib_src_preinst
-	emake ocamlfind-install
-	dodoc README.md
-	use doc && dohtml doc/html/*
-}
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
index b0f9d42a02ec..23f8147fe0ec 100644
--- a/dev-ml/mccs/Manifest
+++ b/dev-ml/mccs/Manifest
@@ -1,3 +1,3 @@
 DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
-EBUILD mccs-1.1.11.ebuild 635 BLAKE2B 5463b7e9ee6fc7d0feb540357961eb63667af19384754140aba0e8c688193878b99f43fff05b226e0dc6c7126d4d0df8172abed4687ddbe93a01f6196b9506d1 SHA512 cbbb93169d1e97d92df842cae902ca2e1c6568d7ecb0af18ca8428e599db3ef42367ffc6b565dfa049ff559300530a64fba2004739fa27612edc49aff5cdd2dd
+EBUILD mccs-1.1.11.ebuild 632 BLAKE2B bbfd52836642ef6d1482ea4a5088a6f6ccfb6bb62c08879ee0a39001b297abca0b0180251eb4bc1c3505303e573214aea5d3b8237873ee249e45383e9f9a481a SHA512 3ca6ae2551903f4e49e52673a973dc0889d47967126ab7c6cdbd9df95ba9e1feff44780cdcabd0203c38256b92c1bce5a43dba3cd09286ee1bb158616f30cd40
 MISC metadata.xml 325 BLAKE2B 7385ff0e6224f5197139764e79e60e849806e74d9f15f17934358bb3cc9a7ff41213e53167351b4a1308e84a436f8e14e9416da49df5615f07d33604e09bcb45 SHA512 ae6f92a85cbac16fb2c53676e7b3d326bf637a47129f3f4b413ad3a4c9df4a807f10a8513f2876a9310efc8a2d8ad3215a448ae9a9ad9128e356403b394a58f4
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
index ef12a27bf762..09637d8cbca7 100644
--- a/dev-ml/mccs/mccs-1.1.11.ebuild
+++ b/dev-ml/mccs/mccs-1.1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 94c2b892d7b3..eb50bb5019ce 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,3 @@
-DIST menhir-20181006.tar.gz 6665871 BLAKE2B 98820922c3dc9ffa27e0f9432d683aae3a1115cd5ba7d1114c57730c7dc679a918c14ef692d1287ca851c62d32aca50a034de1d4c6d4049ddf80e4694bbbae3e SHA512 a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
-EBUILD menhir-20181006.ebuild 890 BLAKE2B d9bdda28d00ccc0f528d6f7a43abc8b9d394073b5592fef9857b2c06092a6d8f0f7de49bea4b974379b0d789e4de044f456f65984f2575665cb4e2296379525d SHA512 420da808f42896ece95cf6b9487140a3509e1a60cd6c4f4fabd9fadc0c894d3cb054e51e52d6aba16d52ae1af6832dc461eec8fba65e0db12edfccec00d0fb2e
-EBUILD menhir-20190924.ebuild 909 BLAKE2B 2f6faf021c0c8c65adaa10e73e8a59652720c8211f57f8b73f3e9bfb9e8fa3d309798e91d842c2032fc9e24875d20bcc34eb04fa00e48efcebfb317075d64b06 SHA512 554c02b8ea327d753f4919049d624b17b57b65831b02107cc6028622b0948c3d30b31efecf887ef60164dcf9299937e671f60190a8516e094ea5b0e3324b74e9
+EBUILD menhir-20190924.ebuild 906 BLAKE2B f64a1821c1015688bcb4e786f81ec5e066bbc010df4b0edc1cf30d270d3688c2dd228ff9d9ae6313969864b2f9efc882e526c7f98d2bf41a15338cc1268691d2 SHA512 6ed9b185d507cadec87ed86dcf876838780105f8ad75b6fcf9adfd658d1528d5d611aad66e822a4e2afc27ac4fe63e67a82f4a235fec6ba586433451479eb8db
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/menhir/menhir-20181006.ebuild b/dev-ml/menhir/menhir-20181006.ebuild
deleted file mode 100644
index 00be878804ac..000000000000
--- a/dev-ml/menhir/menhir-20181006.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20190924.ebuild b/dev-ml/menhir/menhir-20190924.ebuild
index c925dc236290..c0bb1d2198fa 100644
--- a/dev-ml/menhir/menhir-20190924.ebuild
+++ b/dev-ml/menhir/menhir-20190924.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples +ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
new file mode 100644
index 000000000000..a9c20cc0e0c0
--- /dev/null
+++ b/dev-ml/merlin/Manifest
@@ -0,0 +1,6 @@
+AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b949293367935a741b0ab8dcf9f40cfbab2042fc4afd95f09b3ac9980f7daa371dab93fe39cf56245c111 SHA512 7dfbbccee288d91c010cf0bd18d490ac2fdb8c5a2f6cb5ae55697f196ba9e4965ed6c0b0140aadc0685a3bfde58a4b30ca85658876c22c9f91b456aa1753ba4b
+DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
+DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
+EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
+EBUILD merlin-4.1-r1.ebuild 1290 BLAKE2B f72028d7744e4612eaaabad95c79db31b1bed9e1ce044ca8ab5104e6276dc25112d3704756b23dd33a70086fd98737c48181f6c3c68902bd1eee20352dcdf65d SHA512 ea01cee166bb3ebb274eae2f2890649279b0231829ee1a112e28e6f902d0cc4cd24344da95ad1e48f49762ead0a3fd9e74762e7e2a3e8e7fdbec882644bb87e8
+MISC metadata.xml 309 BLAKE2B 3d87e255533b30e9d93961fd4e19b7811eeec76ca1d0a23d2e5c2dbaf7702f19b4d1825ef5f4a8673dcbe99a7c283cd6cc0c380ebedf121757a1536a90eab129 SHA512 9f83661d41366e8a258849f199e738f8ead98612c0e444f5c1221fb4d5ab803b75d0d63a7c288f5714635faae33e8669da1598b932a7c2ec8e620cb232def482
diff --git a/dev-ml/merlin/files/50merlin-gentoo.el b/dev-ml/merlin/files/50merlin-gentoo.el
new file mode 100644
index 000000000000..fbbbf2019411
--- /dev/null
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@@ -0,0 +1,4 @@
+(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(autoload 'merlin-mode "merlin" "Merlin mode" t)
+(add-hook 'tuareg-mode-hook 'merlin-mode)
+(add-hook 'caml-mode-hook 'merlin-mode)
diff --git a/dev-ml/merlin/merlin-3.4.2-r1.ebuild b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..d14be4876eb1
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	>=dev-lang/ocaml-4.09:=
+	<dev-lang/ocaml-4.12:=
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
new file mode 100644
index 000000000000..2197e4695f95
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	=dev-lang/ocaml-4.11*:=
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
new file mode 100644
index 000000000000..fe5fd4f15a0a
--- /dev/null
+++ b/dev-ml/merlin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/merlin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/metadata.xml b/dev-ml/metadata.xml
index 54ef546c0f26..8c47159ecc84 100644
--- a/dev-ml/metadata.xml
+++ b/dev-ml/metadata.xml
@@ -37,4 +37,3 @@
 		językiem programowania ML.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-ml/mmap/Manifest b/dev-ml/mmap/Manifest
index bb020a45d214..56792f0753f3 100644
--- a/dev-ml/mmap/Manifest
+++ b/dev-ml/mmap/Manifest
@@ -1,5 +1,3 @@
-DIST mmap-v1.0.2.tbz 14575 BLAKE2B ddc0ce540780bf362662b90ba0ba71098151bfaf2633161d747f6122b34b4cec813c0a839f5f702595fa9d81b24a4d550fcaa6600d6fdd7560947e71c87b1b6a SHA512 280afb62a0cc5b13f7e9485bb81c0fe6bff91a3838420495ce7a10709af987264590562f21b2d66e778b7e606be3f1f940ebb090e4fa0af5702f09bacab93cbe
 DIST mmap-v1.1.0.tbz 12312 BLAKE2B 3f688f5649ef51fc2a0cee76519da46dcfecd72a065de3cdc72412e27bfa39c26c6bb54d35ea6e3b139db0ccc75e9460f8285826c40ecc894a3782f279366686 SHA512 15e4ec2634998f321f495de5372dc75a3f4059ab7512115603ae8fd99a619c91299d34c8a12a697aa36df4ce14c90c66746b873eddf004b7bbbeaef8ec7858f5
-EBUILD mmap-1.0.2.ebuild 439 BLAKE2B ec4371daad00b5817c31e5cf3aab57e35f852d7846f16be88dab295842e4acc5e61411566d548de6438b1948adf34edfb13e2deae3d8a7c08f1084f9976886e3 SHA512 cbdd78d9d612bc9d1f50537c657126c978bf0eeef1a70826eddb520b4525a45580266d37f0a48b3d5987cf2d893d8aeafd59dee8ff25b98a7776025bc6e2c437
-EBUILD mmap-1.1.0.ebuild 435 BLAKE2B 66d4982d01009d5c6d39afb19dd3b9d51cabd8b0a46b4f401fd22d2321e53cdc3052ee0410fdff79042a7cdceccbf98d244bb5235dd72fa4bfd007dcf4a3be45 SHA512 ffa5731706ec263f910d3f3498cd566016686c929d50a84cb4f540d175eabc78a76ff9d41aa33f70384544ac471361c49067ed6811fc297f2d4c7ac5fae3f2d0
-MISC metadata.xml 320 BLAKE2B 5af9b73b1a5dfa02956a9c31e9ba5c9a2ad1578c117cb55c46f33a4bc7afe4acfc74bb5cc25176e6d6f7bc9cba94ec1b379e8b99fa51a6a5773039e6e92afd3c SHA512 25aea58fe2509a172b1a93f263e5d3580c736f4d83f40050d0de7c6d13cf33033eee9e577ecbd7a1727572c60e3cfd29d1782365c4b26d17b893fe09f2b338bb
+EBUILD mmap-1.1.0.ebuild 433 BLAKE2B da6ae263bd8e1e2d8ee85806e5c3f22a1a5930f21db68d33c5f1174de5894be85f8ddeb3d60fcd6e3b961e62c4b829a11d22ed65f9ebc95f173f12b413e10127 SHA512 43886545270a5ba6c49e02637de7ad8ca836c4ddf4d497599deece33a8c680ef0b24e3db2080f15b41a98c6a53df2a08ee9ecb56b663136624facd9de3c88821
+MISC metadata.xml 320 BLAKE2B 670840e5fb0d98728ec1abc313a4a454d0a9ee0cef86380461ffd0c60721a98bc8ea831a2bd53345427483b61c056fda5e37ca33ff6ff6741a4276947e06216a SHA512 3e740c72a5216b56f5e8c960355ff9cc21a045a5bb1cee1cf35df835ca755ac507e88adc5d2d405e13e9487d8934de926ac595624d60a98440caa0e8167e82e0
diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml
index 3c0ce5319562..75a96f40ae08 100644
--- a/dev-ml/mmap/metadata.xml
+++ b/dev-ml/mmap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/mmap/mmap-1.0.2.ebuild b/dev-ml/mmap/mmap-1.0.2.ebuild
deleted file mode 100644
index 7064da7c5444..000000000000
--- a/dev-ml/mmap/mmap-1.0.2.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
-
-inherit dune
-
-DESCRIPTION="File mapping"
-HOMEPAGE="https://github.com/mirage/mmap"
-SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tbz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-ml/mmap/mmap-1.1.0.ebuild b/dev-ml/mmap/mmap-1.1.0.ebuild
index 45bdd47e84f4..629ff88e7786 100644
--- a/dev-ml/mmap/mmap-1.1.0.ebuild
+++ b/dev-ml/mmap/mmap-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tb
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 16fe2f3aa0c9..74cdf480cc15 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,7 +1,6 @@
 AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
-EBUILD num-1.3-r1.ebuild 801 BLAKE2B 0435a9f55413c068c4d72b7e405c8cc36b11f57993eec3e0ff7fc5a18d97261b79f4f88d3edd9be170a3aca9ef1f20aea28807210af003ba53325fa39d9e8d28 SHA512 9d39461969c4a0644bbfcd23b90c412f2ac18627c239e9fb6d0171691f9d4705e2856a77202b12e9325ac376d946edddacd63f7bb6821823ad5b4cb6fec6d3c5
-EBUILD num-1.3.ebuild 723 BLAKE2B 50ac5e2566b164c5b1aa77037a77f68763ab7d7db2d043f67ce011b1aaf49b97eacb6eaada17af468e9d0f4cc451f977e5964e789dcf03f2b7addce7c935d01b SHA512 d3c8198445dc5eae9c517243bd54a72762e0c3a698a4ef332e48c6fa8cdd1c9f18cab924980e575b8170a85e19766380a4b053b999e24dae5dd9d9233632fb7e
+EBUILD num-1.3-r1.ebuild 798 BLAKE2B 2d1d99154b1dc00c796925dd3bb7bdbcdc26c429243e9c783fe607238d24f17a3cda34e18c2269d3ce0da9f961437f6e058d12f96cfccd7cf45f00fc6d6a706e SHA512 63434c701515038f368bb84b380119200876c98b84b37324d7145fcf2b384fd8cffe017b91ab3284526fd48601c0c485b320ac59388ca1763f5019a11c80666c
 EBUILD num-1.4-r1.ebuild 739 BLAKE2B 6d1cf81df5c7e127ce1208a44c5467c2e504096ecbd56975a209ed71801126656774819fbefb8531f5f43ee0937ae0f98dfa33edd388cbe09b9536fbcd69d99f SHA512 0160908a5713a00c46e3a0a85eb97bf79c83820ad2fb8f68dc5e2d9e4cd3aaa81b6257924f4cf6bceffc6222a7e77d277492ee1ee92a7b5a43d89d54d8ae0ad5
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
index 60d2f6679323..8cbf68aa3b51 100644
--- a/dev-ml/num/num-1.3-r1.ebuild
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
diff --git a/dev-ml/num/num-1.3.ebuild b/dev-ml/num/num-1.3.ebuild
deleted file mode 100644
index 8cea14497085..000000000000
--- a/dev-ml/num/num-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib findlib
-
-DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
-HOMEPAGE="https://github.com/ocaml/num"
-SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
-	>=dev-ml/findlib-1.8.1[ocamlopt]"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-)
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	findlib_src_preinst
-	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
-}
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index 66db21ff1cda..84442d437114 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
-EBUILD ocaml-compiler-libs-0.12.3.ebuild 507 BLAKE2B d40b9dbdba7024a48f6ae03b3d96df8afc8f52654fec898f1838a383b7469752ef9e230d614ef76750284ec75c73426f491e962480ecb871e121372b9d3456b8 SHA512 0e4ca1e0daa722047010d5e6bee8cf3de455305d0d8a36e565c736b9db32cedfd8819607246c499edd3983534fa69f55ee1c80aeedd9780026237b9ee5d0bdba
+EBUILD ocaml-compiler-libs-0.12.3.ebuild 505 BLAKE2B 2990a1048ef8cdfcd44cefd46bf9630a0d5fb3d21ef459ca2cf360554f8956766f246c3f471de7fd3cebee5b8612849c665f7757f1aa1ea6be4f6b943877acb7 SHA512 1443215b8d99bf719b2f524bd56df14b32142b4f92bf995b502417b54177f72f00fb395900b9fa2b0e9de2c5e0748f6a0b15df122906862d86938584c021575b
 MISC metadata.xml 339 BLAKE2B a88542e3c94246704d78ae7795166cee13f24054bb39450b2c1b7f3c499514e67fcf38421100c96ca597115bf354a1e20290d22d57fa9313bfb6279020c2758e SHA512 5480f0fa988de348557ae888609a48a083798d9d4decb57e6b29c3789e83b4900a663ba15ef9cbf3c2574404046e4b1101026369355db6cdfdda8291a1eca0e5
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
index 2ed3306f2b27..3b6b4bb2a868 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 501d15aa5605..2e5ed9c2218d 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c3476c1505d8b58be9273405b4c198500d8e5ff4b0689f76599cc3e92ebb1f5db685c025e2f6a29f590ef21e36c4ac4c3ed SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
-EBUILD ocaml-ctypes-0.11.2.ebuild 670 BLAKE2B 058d2278336a8fc5092606079078d2e7a19accff917bcb4679f700e5e5d07f71d4fa47079ee18a3d0b1b54bcc06f60f966aad047f44d1295edb9aae9df2b3c9d SHA512 d48415b9c30c6d63ba61c2bf98cbb2e459be1a412196c038caf9657914a8e579584f0c8eb22352c03c2f2f26c343ed3f13f2186be9f801f537a3b87f0f26e6b0
-EBUILD ocaml-ctypes-0.17.1.ebuild 805 BLAKE2B 636c3010c16883fe96817333884885db7ec0ddd885b0c7c9eef5bbb74fdee5606b6cefe2146d0b1c1edf9cd6524270e0c6b6bb730d8c09244db6e6a8fdb9abad SHA512 47174c36c496511138f40c935c615937c3ea73bf0cb0fd6e25742b072b6a97ddb4aa47162f2950ce616e80afa05e0051e163a7842e8289841b9b094233fb6365
+EBUILD ocaml-ctypes-0.17.1.ebuild 802 BLAKE2B 2d66c3d0f963c246c8640da69b5c4607ca7f312912a2c1873fb62199ec833d10b4c6188dec099efe498f6890a06ea5a3d67499d6bb97eb82a1e3d6c68b588f04 SHA512 bf8959d8cf7319fbd61cb2b29a33b98df5539ffce0352ddd71304e6709b965635181eae53cc3c3b57f2e18590b7843a67c5c9d8be62c757df21ea0de3721af7a
 MISC metadata.xml 331 BLAKE2B 7deaed237d1fd18b923d5a0dee3595a7c59f35a0a4e900c417d52fad7d659d6db8b1f36d64a859df6a7770c401b9d8054f51a93dd6fdb738a34a82d8a7b08620 SHA512 35d5acf562fbf2745c71984f7bd26c5ade620c55b23a76a5b443a401a5484a3c58a74e1ab9ae0a0128b2a16c43f661f69e98cb886a3053cfc581ac618ff5c896
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
deleted file mode 100644
index 4d8ab3652fdc..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
index e4e0fb587c4e..d1a9ccf78657 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index 869af40a185f..329a10e0d93f 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0af8f97b7022b09b297a4022a02317fd6e4843bd3f66a875feb8389750cd3f332560cbc38834e5b SHA512 5298115ef79f2d59cafd1c0d09e7dde8649dc16a7a84f77965078a62f76ee2d9348e10d0e2230efdd89c3ecf4cc59ba3fc7b3d5de4f2a428641e8a67a47dc220
 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
-EBUILD ocaml-expat-1.1.0-r1.ebuild 902 BLAKE2B 9cb2574baae8d5ac26704dd090ca84509ae3398c94734ac9ff52ab0902ffb419ba3bdfff3798fb7eb0edd879610c509a46d6360610b48af370ff951d9c06cb80 SHA512 816c152e68c2ef090f061600b858ff30448b30c732614c91af3dc7ec8ab90a2d4b850f7536889a21e12970435ddbb16cc93b44a0efb47355fc602e8e980fbd5f
+EBUILD ocaml-expat-1.1.0-r1.ebuild 900 BLAKE2B 9800b7750eb1b3322e939545a5d9bdf13b201f3c1618c7c46d0babf8f4164087594976e19b60140087bb93d2d4389f494d4f6f27cc22c8161079ab5f1f00ae55 SHA512 1ca53ed6723a0001c0d5419d84b1ce43da1097fb77e85f5471443121e2b29971dcd9629f2891299411d878fa7cbd1e0fd846a3cd532024f9c38903746a9246d1
 MISC metadata.xml 331 BLAKE2B bab5b5dec6ca651b9ca68b86fbc7512bfeeb15946248234814bad8acf17aabb785e6bd23a645e205adb1c97907da43ea4dc052233c0f5b699551cae30eb77fb4 SHA512 da512352ddbdf8c8a274706656b4611e918089d0c970dc68d6ebc95200ba0900c5bfe3f7d5454d87ef7ddd5ec0e45b2da2aad531c2c22998ac0d5798fbd62d64
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
index 00529567b473..43b3e2f07aed 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0/${PV}"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 PATCHES=( "${FILESDIR}/ounit2.patch" )
 
 src_compile() {
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index 57e8552aba16..bb19942263b7 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
-EBUILD ocaml-fileutils-0.6.2.ebuild 649 BLAKE2B b3203abdd1edf69d46658ee97b4f52228d872d244c2c077b62f0875a3386e7c962ff444e5fafbcbc092d70ca05040eda5add67bc4417a2ed2678809894247a16 SHA512 a5d04dd27e325283a3513d73ca112989c81004209d06a3dd68b6f374ae7c136db315dbf17496660d94a2adcc4fd0373d2652f8b4b41330d277ee0bc9fd56db8a
-MISC metadata.xml 799 BLAKE2B 412e5e86cf787c2a3a63eff243337e4f8e54abee3d8cf0491e90c4e2e0cbdd2e5c4d452ec87b63cc0ad8d23286283eb1f17b295c422100cf412fa74ce99318d3 SHA512 c22647ffa2dba7aac8d3f401e6124e0acdc02526fb53ea35995ccd22984715a09d6b558097b9385c1c2fc31ca75a20864e22b0fd9ea9a6113620b31bdde7a691
+EBUILD ocaml-fileutils-0.6.2.ebuild 751 BLAKE2B 90a512b800b5038777e141bb95452a413e24500e8e325abecaf347cd7ac39975b090d285371b27f0b1a888c4fa522a7ae437f98db053331a0a20781b16f71bfc SHA512 6358e0ab33ba4a5973b346a1cefe6f719fdbdd603674b33dbcec1c13652515b08b374754231ce6f3aa3ed31dc9711376771d6704fa4363a0b3d439dc2fea88a1
+MISC metadata.xml 829 BLAKE2B d5b5d0678a3bfe6d9aa4f99e2d79478d528d726d53f899cd2400a6ca45b20281bcaa606d1c9028cf84bdca1cb6c9bd0f5d28f5c8fe4db1bf1ed9ac9b044d6649 SHA512 84c9e1c83e6670ae473dc9d3e7227d82ae3d4bd57c9ed0b5ef80eacd8e1e8f074cae7babcd9ff331a4c5f1bfd14f561a094857db31cb7a85c6ec3329bff6e0d6
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index cae1d28b2b3b..76b0f0d3ff23 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -6,11 +6,11 @@
     GNU coreutils and filename manipulation functions
     for OCaml.
   </longdescription>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rkitover@gmail.com</email>
     <name>Rafael Kitover</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
index 1b299b6fd39d..72c2b68e4139 100644
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,18 @@ SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
 
-DEPEND=">=dev-ml/ounit-2.0.0
+DEPEND=">=dev-ml/ounit2-2.0.0
 	>=dev-ml/stdlib-shims-0.2.0"
 
 DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" )
 
 S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}"
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/dune || die
+}
diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest
index aaac2b9f7abd..3dec2e4488f9 100644
--- a/dev-ml/ocaml-gettext-camomile/Manifest
+++ b/dev-ml/ocaml-gettext-camomile/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-camomile-0.4.2.ebuild 824 BLAKE2B 4ef48617501eb0c404a411c8cadf25b972700eff02a70e7520cc04d79cb0b7a82d93006ac474f4ebaacf8a62c349f4939c5d778d33438594e523354d485d9699 SHA512 1b0a43435dd49b20ab6943836bb7dd723b9505fc0c30c85f63f05f07678bfe1c012f1816d3708780a09ec0a6c38cf1aeafd05f2464b9a63364642cc7b383b883
-MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
+EBUILD ocaml-gettext-camomile-0.4.2.ebuild 959 BLAKE2B 9353ce7e936239a8983ee9acbb43bb1b3cc586925fc1714f285ea0f26ec293763bf7e2360ef722b8bb30cded88f30bf18681715eceff4626841c2cc91f6bb5e8 SHA512 149c5e49befc68e5b61234554fa8a8f0375f3a43d6d25fe965eba5210594cf83fa7e930cd54367cfe0eefbdfddbe94509a91df05d85559646b715a7b20694009
+MISC metadata.xml 662 BLAKE2B 754d4c1d39fc2c171dfb45d123de58c96cfbeaaefe92d2f04c758db51897776c2e892120e60a2cea66f7a76aa3e2c621149b6f6d86ce76193ff82fbf9d9f09c1 SHA512 37b456155c65f227395d9220632f681d1b6727806fa97aeef1c5955679cccf2f10163e8176b7c083c2b2a5721a156e68faef4ca528d3d36b3ef528fa2ecf4025
diff --git a/dev-ml/ocaml-gettext-camomile/metadata.xml b/dev-ml/ocaml-gettext-camomile/metadata.xml
index 4014d3ca4a80..7c93d1f89b11 100644
--- a/dev-ml/ocaml-gettext-camomile/metadata.xml
+++ b/dev-ml/ocaml-gettext-camomile/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rkitover@gmail.com</email>
     <name>Rafael Kitover</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
index 372ea5df6256..fd285b3dbca7 100644
--- a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
@@ -31,7 +31,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-ml/ounit[ocamlopt=]
+		dev-ml/ounit2[ocamlopt=]
 		dev-ml/ocaml-fileutils
 	)
 "
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
+}
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index 151a83c198d4..88c1205cd5f7 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-stub-0.4.2-r1.ebuild 845 BLAKE2B 374225b66618373de9cb49a469c86e8928db5da187d5585fc9df215a24920f490e4161afc63ac11565d079f15f8db2dc67cab5187d605db1d56415f6c489cd65 SHA512 45325f76eb977b7f0acab9a485208158c464d72333403d27f153eed8f30de5723af59efd82d6f7dc02ebd955d44e942359864022d0d773c76d8b89e397b57ff1
-MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
+EBUILD ocaml-gettext-stub-0.4.2-r1.ebuild 980 BLAKE2B ab0d24a1938da9793d804e1d54cdd61557afbe8573c71a6eb03d9f30100b9f1a81c4684ec09cb85725ee0b2bf858431cf0c319bbc1da348ca4546526b842b46c SHA512 000a15d0b62b5feb0e537254ec547d67a530a07269470b90a8dc861389c1926d997bc2459b27a696f6522d140e3f23ecca5466fcbe9a487b4f4183c65a01a781
+MISC metadata.xml 662 BLAKE2B 754d4c1d39fc2c171dfb45d123de58c96cfbeaaefe92d2f04c758db51897776c2e892120e60a2cea66f7a76aa3e2c621149b6f6d86ce76193ff82fbf9d9f09c1 SHA512 37b456155c65f227395d9220632f681d1b6727806fa97aeef1c5955679cccf2f10163e8176b7c083c2b2a5721a156e68faef4ca528d3d36b3ef528fa2ecf4025
diff --git a/dev-ml/ocaml-gettext-stub/metadata.xml b/dev-ml/ocaml-gettext-stub/metadata.xml
index 4014d3ca4a80..7c93d1f89b11 100644
--- a/dev-ml/ocaml-gettext-stub/metadata.xml
+++ b/dev-ml/ocaml-gettext-stub/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rkitover@gmail.com</email>
     <name>Rafael Kitover</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
index c47570d78116..3d79cb05c000 100644
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
@@ -33,6 +33,13 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		dev-ml/ocaml-fileutils
-		dev-ml/ounit[ocamlopt=]
+		dev-ml/ounit2[ocamlopt=]
 	)
 "
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
+}
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 163883a85623..cb09d2658da9 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,6 +1,3 @@
-AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
-DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-0.3.7-r3.ebuild 1387 BLAKE2B 3ed194dcae360ff403489d550360eeb1f9ad34f5952cb8a15127ead202cb027451315d15e7be802097f9c7ef034006791ff8e6c5774f4541cfee04a42a07d82c SHA512 17c7a4e777e476115b0be95e3238d9fa36299f71d6bc90baeb048ee88d58cd70f56784fc3b74192bb060da633572107c584084a811b0d85acf120fd9fad5bcd7
-EBUILD ocaml-gettext-0.4.2.ebuild 782 BLAKE2B caaa2993e3b8aed055be1a07e6d339332d79f84550f34abc6bb13303d70ba6112613e47bef0136f992589010aa0b2b2b2b4e42701389038777665ed45e679cf8 SHA512 64442e7b6fd4218bfccbcbb1494138ab6e4fac7723b14f8e3cfdafc54498c87803d5d95be0355f22a71329c435a065692d9761b386c0011978307d53240c3ed8
-MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
+EBUILD ocaml-gettext-0.4.2.ebuild 917 BLAKE2B 898206729a10a4e6a7109dd9975393a51ca1d5d528ce3de6566348c14f28a9771a731221063a0ac6466511257bde2d2766882c8ead2dc8fb9f13280c9d4075c5 SHA512 eb3e47e901bb47b21e5dca54106cb8d9d1816a5458ca5668fd7cabece316a0364a901c26759a8f45afaf9eb0bd923fdfd34e59fdd73f2ceade4fa53e4bc9ad12
+MISC metadata.xml 662 BLAKE2B 754d4c1d39fc2c171dfb45d123de58c96cfbeaaefe92d2f04c758db51897776c2e892120e60a2cea66f7a76aa3e2c621149b6f6d86ce76193ff82fbf9d9f09c1 SHA512 37b456155c65f227395d9220632f681d1b6727806fa97aeef1c5955679cccf2f10163e8176b7c083c2b2a5721a156e68faef4ca528d3d36b3ef528fa2ecf4025
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
deleted file mode 100644
index 8d0a12c80d0e..000000000000
--- a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ConfMakefile.in b/ConfMakefile.in
-index 5a1e9ea..b562698 100644
---- a/ConfMakefile.in
-+++ b/ConfMakefile.in
-@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
- OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
- 	ocamlopt=@OCAMLOPT@ \
- 	ocamldep=@OCAMLDEP@"
--OCAMLC       = @OCAMLFIND@ ocamlc 
--OCAMLOPT     = @OCAMLFIND@ ocamlopt
--OCAMLDEP     = @OCAMLFIND@ ocamldep
-+OCAMLC       = @OCAMLFIND@ ocamlc -unsafe-string 
-+OCAMLOPT     = @OCAMLFIND@ ocamlopt -unsafe-string
-+OCAMLDEP     = @OCAMLFIND@ ocamldep -unsafe-string
- OCAMLBEST    = @OCAMLBEST@
- OCAMLVERSION = @OCAMLVERSION@
- OCAMLFIND    = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 4014d3ca4a80..7c93d1f89b11 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rkitover@gmail.com</email>
     <name>Rafael Kitover</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
deleted file mode 100644
index 60ff476d5448..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib eutils autotools
-
-DESCRIPTION="Provides support for internationalization of OCaml program"
-HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
-
-# OCaml 4.10 does not support -unsafe-string by default
-# bug #666149
-RDEPEND="
-	>=dev-lang/ocaml-3.12.1:=
-	<dev-lang/ocaml-4.10.0:=
-	>=dev-ml/ocaml-fileutils-0.4.0:=
-	>=dev-ml/camomile-0.8.3:=
-	sys-devel/gettext
-	dev-ml/camlp4:=
-	!dev-ml/ocaml-gettext-stub
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	test? ( dev-ml/ounit )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
-		$(use_enable doc) \
-		$(use_enable test)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake -j1 DESTDIR="${D}" \
-		BINDIR="${ED}/usr/bin" \
-		PODIR="${ED}/usr/share/locale/" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		MANDIR="${ED}/usr/share/man" \
-		install
-	dodoc CHANGELOG README THANKS TODO
-}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
index 62186a50ccd8..640af1cd5c11 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
@@ -28,9 +28,16 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? ( dev-ml/ounit[ocamlopt=] )
+	test? ( dev-ml/ounit2[ocamlopt=] )
 "
 
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
+}
+
 src_install() {
 	dune_src_install
 }
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 92c890459e3c..ca290f2184e5 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,7 +1,5 @@
 DIST ocaml-migrate-parsetree-1.8.0.tar.gz 466241 BLAKE2B 0b2211ed3a2a2e4e5200a6da0eb288839620fb6397b3cb2b1b83ed7c9a6a23eb7505e1311d30a8449a198221888a5d3b44d528dc84b1f6cabc546adad4110c67 SHA512 25eefd57a23221c7e71025557c977159c2a831713a40188e9750af7ddb93f089163ad4d8b24c53667869839249f1f389ea7928f54777101d5c291684e76be1a1
-DIST ocaml-migrate-parsetree-2.0.0.tar.gz 150973 BLAKE2B f9cdaabfccd82ba2fcd02a044815072ac6495c46ece5cce306a108246dbe68b711f163b05702dc657cc8ee56f1080a5e83430ce2084990fa4ab2a4740fef77c2 SHA512 eba6574339225c44a1872e91fb95b3e8953031b2550038497c57832c94b02297ca3215525341bbe114fe480198519965a6a1619e6490a57ad66f65eff66d160d
 DIST ocaml-migrate-parsetree-2.1.0.tar.gz 169358 BLAKE2B 072ba6e1a879d5e308e7b40c55c323f353cd2187c8884bce25bffd35d7f5e64f2aa7070ae2766c1e41ef47ffbbf44218fdc8b823dbb33c6c11f0e262cd94ab83 SHA512 0fd9dc9ae9a4c0b50f100958c0df6d9bb33a4d3c2e4d9572aae52d4e7393c1432deca9f5812dbccc637150b1a8f58eabb433e87baf08c79af9e1ff3c58509a32
 EBUILD ocaml-migrate-parsetree-1.8.0.ebuild 559 BLAKE2B 90ed2c07d5c9aa5b3050545dbd0c2544ce622a24e50f53f3f2f6e13120767fe058bc29f283e6928b99fe615c859a43f6627e3c116a2883190053f8f688da16fd SHA512 10a4625b8238d3ee6a628bebd28386aaa3a228bf83f472062056c082d3f38e6ca884a8839deda917f8782db86a42f661a95ac9fac3f7d0d3ebb1d03f20156aa8
-EBUILD ocaml-migrate-parsetree-2.0.0.ebuild 536 BLAKE2B 09597773e464fc6d30cec839cf52afb8ed276c853bdfe05f37584a4c178b589315d270302446aa663d230dd7b6ac0ab27d9ff6f542bf9010749fbf369837b70e SHA512 a80dde2ccd6b0f356337147c07538c5c4d0cb2a83258e39d328460307ef2ef445ef87fb73c46497fa5f9390d708e20e152b06d2403f669802b0cf2505caab151
-EBUILD ocaml-migrate-parsetree-2.1.0.ebuild 520 BLAKE2B d808c70116f210066d2fad947bc1bfdf7c96e90bb1d1d1f4b6f786c99b7eb8aca9da36412a1b91b3ab2ae93af8df4203541e4f55ffe266d949c57db49578e748 SHA512 7244f803068550c999532c74551f0902421d785ed05040b84544deabb98c5e05f779d64e85396e7e3507bae4245c8b0fd860b0f97e2bbeda0d6cf5dc99479f1d
-MISC metadata.xml 435 BLAKE2B 811eb1f4a95f8dfd7b072b82b8db41d1537b6c6d239d6dd658a07aa4affcfeca1dee1262e5820c7191bd16a24a508a723bdae220813c4adbdf6a2459dba9a952 SHA512 10a153236f6ecf40433615d09399350d883664c339cec316ac6b6641e4aa58756c00dff75c0d81be91cf504943b4f8d7e38dda5fae7d30f319e266410c67e70b
+EBUILD ocaml-migrate-parsetree-2.1.0.ebuild 518 BLAKE2B 9f1a41716bcc98179981cee1b9d64da9b30c2177bd9e3aaf5350918929ab853a1755ca451e53495c61f7ec58c83662642ec7dd61aa4c593f63980e7981761deb SHA512 10c31cbd85fd0e291182b42a540e5a14edfc0930f6d9615a79498c9572045871149f8eaa89d9f722529de471c17e28de7065ea4036013227179b5e311d030974
+MISC metadata.xml 435 BLAKE2B fa52c4b5a3dac2b84ddeb0a3195e8302bc044f9e00b9463b03a6b873e482ab6058d62b2af721604c4cc9f4decb012bf0c516d39fc20df85a05f37c8995c95545 SHA512 64275a827c387126647430adea4e27fdbc48927d929cf2b42babe53cebf920ce200557267380ee9e002ba32db62b03a120227830c67c3742fb5efcbbbcaabca8
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
index bf3554de4973..a5f97e49777d 100644
--- a/dev-ml/ocaml-migrate-parsetree/metadata.xml
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
deleted file mode 100644
index 08473031c00c..000000000000
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Convert OCaml parsetrees between different major versions"
-HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
-SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-ml/cinaps:="
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild
index c9a32cc90664..198d60910325 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 9ef1edf730a9..3af01bbfec70 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,7 +1,5 @@
 DIST ocaml-ssl-0.5.10.tar.gz 33951 BLAKE2B a27cce7e19c3737657cbdba31d919d51d0db137aafddc6397ff018fe36346a8e99b0353c76f4a4bc4dcc7dcf63ec326e87b2ebc809b78de1511963357be280b0 SHA512 f2d0acc8dcdb0a36c8ad236f60c6e9d7f8f76ea25183017218953dbe3432a19de5b0be8214714add71b88b211ac78318f09429d4df7ecba1e19dc94d4414f0e1
-DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad854108755719210aeeeebd0e14cfee9b6244986f21ddbf86a970ea4b4f9eb2bb8e0a5a888dafe2a7262f004194a26ba SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52
 DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
 EBUILD ocaml-ssl-0.5.10.ebuild 596 BLAKE2B bc7c81afc83dd6740a44552024248e974258e9666585ff961aeae0ce6d2a0a8c4abb24509cdd0f921e49c7bc0464e706a06d1779d30d67d6f5388408e0b06732 SHA512 3ca3d8d41474aa7844b7e030e4c46c1cfb28ad3432ebd88dc2e1e370e555a92a5a5d1020b7196726757d685a00c986368714ae56825847056eed12b54b4891ef
-EBUILD ocaml-ssl-0.5.3-r1.ebuild 622 BLAKE2B 5580e58e991391196cf9009f52ab6bf414c2692f0bb8b3c23c54ab251eed5161d49d1e033b93b5395d1045f5448735e04c86a121d7c872f7c85ff614d6407fbd SHA512 a55eef42b339d8a0aebbb60940ba42bdeb8768379b675274d27e8f7156e19190492851ccb4242c8b7bcbd173069ce00eff4a7107330aa92ef0927de6fcee98c4
 EBUILD ocaml-ssl-0.5.9.ebuild 594 BLAKE2B 9937810b53282c9e858d0f513411dec14e91ac72ab3d174d6a36e57c17ac665448665c8fc039dcd8d68608eedbea7c475089c386ea4ad21446ec915e5c68fb91 SHA512 e0ebdff5183bfb5e77663071877372dd269a0cfc53d20f5a91586f51198e9b4852da67ced0dee3799e6449bbd509fc07ddbb977613812fb10774011484493075
 MISC metadata.xml 366 BLAKE2B 3500b88cfc5c67cc1cea168548db25e3c38b0e821dc9140b68472da7b8f11bedbcd9f9cf1c3bed002e4ce6848e83b2cf2a0531f0f60cd92a605596d5ed8ae8b4 SHA512 0d755921669d45da244c75aea1fdeadc05fca6c98256ba5b2afb8a524b8db705a91127a5e726cbd0f5be329a779a46578c941a93fc801a5ac373a6e8b0bc3e27
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
deleted file mode 100644
index b6933117902d..000000000000
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="OCaml bindings for OpenSSL"
-SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
-HOMEPAGE="https://github.com/savonet/ocaml-ssl"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="
-	dev-libs/openssl:0=
-	<dev-lang/ocaml-4.09.0:="
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-	dodoc CHANGES README.md
-}
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 6f14b2db8001..606bf93eb216 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,10 +1,5 @@
-AUX ocamlgraph-1.8.6-installfindlib.patch 1383 BLAKE2B dcdfa9cfde71eb22e057950414d68a7873f8b9f7d88e84b4c11293379aa8276e8b4083a24cec192ee4f57ca460caa54e239c943b155331252dd0f2a25f53568c SHA512 a46ef5504a79dc33e25db45832411cb65dc1ca6b41fd572276595f29bc983a96f31b3efe969e82534c4cdbf98e37184d145e38cb9d43d5709c5b233af689ced4
-AUX ocamlgraph-1.8.7-test.patch 594 BLAKE2B 7a04f1357f82ab23820d7013ead56918b9548853dec086f5dabd45c81e035762d2d792797e83f9213a13ae37c5a27618577226373c31ae974cd4e3d506f788e5 SHA512 795a28d8b9702ed8e55d4b001285320c179de77de4edcc260212536cea4bb1bf36c58158ff7975e9a9befc075f03a1a64e069bc2a74a2b7770913a19c52d0652
-DIST ocamlgraph-1.8.7.tar.gz 272625 BLAKE2B 18df3f78cfe66e2259c770cfc3671096b06a185e3f407b22eb0a21ff6e7f7df4b0b705a830d740c64f66609b88e2fb76aa91e200ca4c0fadc7ae2a1910641f3d SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e
 DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
 DIST ocamlgraph-2.0.0.tbz 298912 BLAKE2B a4bb04c74f4dba8b0f37cdf8ab9a82ef5120b1e7f5b5570e67aac35de16e4553c93759acfa5c218e07dc7c036750d92d2c557c7d58247783718f691c5319ded8 SHA512 c4973ac03bdff52d1c8a1ed01c81e0fbe2f76486995e57ff4e4a11bcc7b1793556139d52a81ff14ee8c8de52f1b40e4bd359e60a2ae626cc630ebe8bccefb3f1
-EBUILD ocamlgraph-1.8.7-r1.ebuild 1363 BLAKE2B 2350a00277e23466213d134190d69bbf85fcc9cd5c274af447cf939dfe3a99412cfcc828913a8354cdb37854e8fe0278dd1de965f51f5bc1f560fdbdc4daaadf SHA512 2edba0df4e85c60a4de4a92560b6a49fb5f29eca1259748b4cdf43dd4d98416458d6a5948358d30e22cf981eb06931da8490de085a736912e079e7d5fc05e199
-EBUILD ocamlgraph-1.8.8-r1.ebuild 1249 BLAKE2B 27ba4d13ba15c443dc8b3bc45223ae667c13ab224ea7195b120eac877b39083f5ffde60b31162c682ef65f92c2441d77eacc15629abbe69660074c521afe198b SHA512 445b06c8333436f9622df96a9e8acd71f6f04603e75d45a18895c0a7f000d59f76ace9743bfe91b6b48ac5a9b48e10786c51819c140c44dac0a0fbe58a9baff6
+EBUILD ocamlgraph-1.8.8-r2.ebuild 1261 BLAKE2B 5cbe7c4686a5f23fc3e6eb931dd2dd6bd0b0634088dadd6073e158ad365c0562acf01b2a7894936022e9b374a2457ff846349189f02a220725d5a82484fc6893 SHA512 df648c6d9b4b9ff3ec910b6a8d4dfd3def5b45985b6b8daebdbc7d4fbddb52d0c6a46592b16b08f704b8c46e9b95cb2be28e7cc2c9d71965263bb274b34726f0
 EBUILD ocamlgraph-2.0.0-r1.ebuild 556 BLAKE2B 84cfcdd68931055500fe5f9641795f554434a69498a62a1cc9a114014acf61acff2a20c0e8f075596bbd0cd59429808337bf9d3ac7710ccf312339cdc46e1dcf SHA512 408d1e86c48733520e65b946475498afbea91c0802bb144c4ab744b3526c14e4f338353ba579ca99422610fb7c08f74dcb5c04b0dcf0a50a570e7687dcc97e4d
-EBUILD ocamlgraph-2.0.0.ebuild 675 BLAKE2B 6aa8a6360e6e3c043f7dd2defbe7f0d94d4c72c94b99e46f14fcb8f58fbbe22a5d692b3509858633071203bf73b5c01900430b01e40e97ef34981f1b6a5ddd94 SHA512 fda6a086d5c1941787df29ecaa82e702f6e424ebe0607ab10344b60416212308923f48c75fe5d785740177852f58d2c9bb8b018e4d894994ed69526b6466ccb0
 MISC metadata.xml 320 BLAKE2B 6e9b68d7730eeb473f9f54e46d3c141e034114b9a87c13c2a7d43372780a5858f3aa129e032cd1d4066df00ec2a7650b2b1ae01d06c7a499ab634d4523751ced SHA512 e901769566dcc8840cbe098cd907d479eac133a458a52becbf53146856d3808c206484ec8e5a7dd60f4471434b1126b098baa8546c7bfaa650888d61fb8c7479
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
deleted file mode 100644
index cb980b6f19dc..000000000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ocamlgraph-1.8.6/Makefile.in
-===================================================================
---- ocamlgraph-1.8.6.orig/Makefile.in
-+++ ocamlgraph-1.8.6/Makefile.in
-@@ -421,21 +421,25 @@ ifdef DESTDIR
- OCAMLFINDDEST := -destdir $(DESTDIR)
- endif
- 
-+ifneq ($(WANT_OCAMLOPT),no)
-+INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
-+INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT)
-+endif
-+
- install-findlib: META
- ifdef OCAMLFIND
--ifeq (@LABLGNOMECANVAS@,yes)
-+ifeq ($(WANT_GTK),yes)
- 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
--		graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
--		$(CMA) $(CMXA) \
--		$(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
--                $(VIEWER_CMXLIB:.cmx=.o) \
--                $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
--                $(DGRAPH_CMXLIB:.cmx=.o)
-+		$(INSTALL_OPT) graph.cmo graph.cmi \
-+		$(CMA) \
-+		$(INSTALL_GTK_OPT) \
-+		$(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
-+                $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
- else
- 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
--		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+		$(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
- endif
- endif
- 
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
deleted file mode 100644
index f0d370cfd94a..000000000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 726e8d6e31224eb70f75655579da9a374e910b98
-Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@lri.fr>
-Date:   Mon Feb 13 08:41:58 2017 +0100
-
-    fixed 'make check'
-
-diff --git a/Makefile.in b/Makefile.in
-index 58b9e9c..9ce40df 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml
- 	$(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^
- 
- check: $(CMA) tests/check.ml bin/test-ts
--	ocaml $(CMA) tests/test_clique.ml tests/check.ml
-+	ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml
- 	bin/test-ts 10
- 
- # Additional rules
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
deleted file mode 100644
index 1ae4977a6ef7..000000000000
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-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=5
-
-inherit eutils findlib
-
-DESCRIPTION="O'Caml Graph library"
-HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
-SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-RDEPEND="<=dev-lang/ocaml-4.06:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-tex/hevea dev-ml/ocamlweb )"
-IUSE="doc examples gtk +ocamlopt"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch"
-	epatch "${FILESDIR}/${P}-test.patch"
-}
-
-src_compile() {
-	emake byte
-	use ocamlopt && emake opt
-
-	if use doc;	then
-		emake doc
-	fi
-
-	if use gtk; then
-		emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	use ocamlopt || export WANT_OCAMLOPT=no
-	use gtk && export WANT_GTK=yes
-	emake install-findlib
-
-	if use gtk ; then
-		local ext=byte
-		use ocamlopt && ext=opt
-		newbin dgraph/dgraph.${ext} ${PN}-dgraph
-		newbin editor/editor.${ext} ${PN}-editor
-		newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
-	fi
-
-	dodoc README.adoc CREDITS FAQ CHANGES
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc doc/*
-	fi
-}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
deleted file mode 100644
index e76a4464ef6c..000000000000
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="O'Caml Graph library"
-HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
-SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-tex/hevea dev-ml/ocamlweb )"
-IUSE="doc examples gtk +ocamlopt"
-
-src_compile() {
-	emake byte
-	use ocamlopt && emake opt
-
-	if use doc;	then
-		emake doc
-	fi
-
-	if use gtk; then
-		emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	use ocamlopt || export WANT_OCAMLOPT=no
-	use gtk && export WANT_GTK=yes
-	emake install-findlib
-
-	if use gtk ; then
-		local ext=byte
-		use ocamlopt && ext=opt
-		newbin dgraph/dgraph.${ext} ${PN}-dgraph
-		newbin editor/editor.${ext} ${PN}-editor
-		newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
-	fi
-
-	dodoc README.adoc CREDITS FAQ CHANGES
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc doc/*
-	fi
-}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild
new file mode 100644
index 000000000000..a395027a55ff
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-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 findlib
+
+DESCRIPTION="O'Caml Graph library"
+HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
+SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="doc examples gtk +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( dev-tex/hevea dev-ml/ocamlweb )"
+
+src_compile() {
+	emake byte
+	use ocamlopt && emake opt
+
+	if use doc; then
+		emake doc
+	fi
+
+	if use gtk; then
+		emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	use ocamlopt || export WANT_OCAMLOPT=no
+	use gtk && export WANT_GTK=yes
+	emake install-findlib
+
+	if use gtk ; then
+		local ext=byte
+		use ocamlopt && ext=opt
+		newbin dgraph/dgraph.${ext} ${PN}-dgraph
+		newbin editor/editor.${ext} ${PN}-editor
+		newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
+	fi
+
+	dodoc README.adoc CREDITS FAQ CHANGES
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc doc/*
+	fi
+}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
deleted file mode 100644
index 6fca1bfe3b02..000000000000
--- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="O'Caml Graph library"
-HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
-SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-RDEPEND="
-	gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] )
-	dev-ml/stdlib-shims:=[ocamlopt?]
-	dev-ml/graphics:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-IUSE="gtk +ocamlopt"
-
-src_compile() {
-	if ! use gtk; then
-		dune build --only-packages ocamlgraph @install || die
-	else
-		dune build @install || die
-	fi
-}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 2691f7f21c2c..11812c43b272 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,7 +1,3 @@
-AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
-DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
-EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.8-r1.ebuild 1562 BLAKE2B 9c047b948a3b94cc6ee31d6cfa3693bdb882507c134d010e8d7a1b56e958f3eed0a20d2ef6825e7580fae87313e73f9bda17ad7b5a953ba3cd7b1f6623d43121 SHA512 d7ece3bdca5f2c7206f164020d26f1a724b01ebbc70f003cbff92cb1f1a626598bc656cb6e79ec928a81234f63e9ba74b4a234fe307a6b2680706d2172504573
-EBUILD ocamlnet-4.1.8.ebuild 1627 BLAKE2B 2cc9b2b01211d7ec7f7037c4acb0677a32f27ea540b77e70a2342ae3ff1c3cd748356f18ff235c899df20949d2148c4b4b36c3851d8bed2f25e3dbd4f6b797f6 SHA512 322f53cfcd5f74cdb3cedd23b20e95d87d7a2efd1aa0af14d510ec8597dd55dce40868dd67f7912dc9ecd058453c9dd1ff65cc2bdd8d4aeb1d2477181b01bb5e
+EBUILD ocamlnet-4.1.8-r1.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
 MISC metadata.xml 405 BLAKE2B 375c39f43bf129f891891710e6dc9125884f7ee0edad718664334d7fbcd612a812b019f9acacbf55868aa0d7b3f94b018f7e8b46a8a1a0228e53194fa16ac454 SHA512 102afded360029e38c9ff3a803280553c2f8d6af6756e28508ff2c2c237c62e21a3f2241d5c04b93c7d924adef2bbefe9e2696a6aa545b355fa1b98b78ef7b73
diff --git a/dev-ml/ocamlnet/files/ocaml405.patch b/dev-ml/ocamlnet/files/ocaml405.patch
deleted file mode 100644
index a112d1fb4473..000000000000
--- a/dev-ml/ocamlnet/files/ocaml405.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-commit f3d451b81c4caa8cce7f55af6463ec685e79e227
-Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
-Date:   Sun Feb 26 21:04:49 2017 +0100
-
-    ocaml-4.05: support for O_KEEPEXEC
-
-diff --git a/code/src/netsys/Makefile b/code/src/netsys/Makefile
-index cbc1ce2..cb70a09 100644
---- a/code/src/netsys/Makefile
-+++ b/code/src/netsys/Makefile
-@@ -56,7 +56,7 @@ OCAMLC_OPTIONS_FOR_netsys_c_xdr.c = -ccopt -O
- OCAMLC_OPTIONS += $(STRING_OPTS)
- OCAMLOPT_OPTIONS += $(STRING_OPTS)
- 
--PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
-+PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(DEF_O_KEEPEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
- 
- INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT)
- 
-diff --git a/code/src/netsys/configure b/code/src/netsys/configure
-index 1325843..f4dbc09 100755
---- a/code/src/netsys/configure
-+++ b/code/src/netsys/configure
-@@ -437,6 +437,21 @@ else
-     echo "no"
- fi
- 
-+######################################################################
-+
-+printf "Checking for O_KEEPEXEC... "
-+mkdir -p tmp
-+cat <<_EOF_ >tmp/t.ml
-+let x = Unix.O_KEEPEXEC;;
-+_EOF_
-+
-+def_o_keepexec="-D NO_O_KEEPEXEC"
-+if ocaml unix.cma tmp/t.ml >/dev/null 2>/dev/null; then
-+    echo "yes"
-+    def_o_keepexec="-D HAVE_O_KEEPEXEC"
-+else
-+    echo "no"
-+fi
- 
- ######################################################################
- 
-@@ -445,6 +460,7 @@ cat <<EOF >Makefile.conf
- NETSYS_LINK_OPTIONS = $netsys_link_options
- DEF_O_SHARE_DELETE = $def_o_share_delete
- DEF_O_CLOEXEC = $def_o_cloexec
-+DEF_O_KEEPEXEC = $def_o_keepexec
- OOH_OBJECT = $def_ooh_object
- EOF
- 
-diff --git a/code/src/netsys/netsys_c.c b/code/src/netsys/netsys_c.c
-index a8b16be..4c30873 100644
---- a/code/src/netsys/netsys_c.c
-+++ b/code/src/netsys/netsys_c.c
-@@ -448,32 +448,43 @@ static int at_flags_table[] = {
- #ifndef O_RSYNC
- #define O_RSYNC 0
- #endif
--#ifndef O_CLOEXEC
--#define NEED_CLOEXEC_EMULATION
--#define O_CLOEXEC 0
--#endif
- 
- static int open_flag_table[] = {
-   O_RDONLY, O_WRONLY, O_RDWR, O_NONBLOCK, O_APPEND, O_CREAT, O_TRUNC, O_EXCL, 
--  O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC, 0 /* O_SHARE_DELETE */, O_CLOEXEC
-+  O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC,
-+  0 /* O_SHARE_DELETE */, 0 /* O_CLOEXEC */, 0 /* O_KEEPEXEC */
- };
- 
--#ifdef NEED_CLOEXEC_EMULATION
-+enum { CLOEXEC = 1, KEEPEXEC = 2 };
-+
- static int open_cloexec_table[] = {
--  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CLOEXEC, KEEPEXEC
- };
-+#ifndef HAVE_O_KEEPEXEC
-+#define unix_cloexec_default 0
- #endif
-+
- #endif
- 
- CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
- {
- #ifdef HAVE_AT
-     CAMLparam4(dirfd, path, flags, perm);
--    int ret, cv_flags;
-+    int ret, cv_flags, clo_flags, cloexec;
-     char * p;
- 
-     /* shamelessly copied from ocaml distro */
-     cv_flags = convert_flag_list(flags, open_flag_table);
-+    clo_flags = convert_flag_list(flags, open_cloexec_table);
-+    if (clo_flags & CLOEXEC)
-+        cloexec = 1;
-+    else if (clo_flags & KEEPEXEC)
-+        cloexec = 0;
-+    else
-+        cloexec = unix_cloexec_default;
-+#if defined(O_CLOEXEC)
-+    if (cloexec) cv_flags |= O_CLOEXEC;
-+#endif
-     p = stat_alloc(string_length(path) + 1);
-     strcpy(p, String_val(path));
-     enter_blocking_section();
-@@ -481,8 +492,8 @@ CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
-     leave_blocking_section();
-     stat_free(p);
-     if (ret == -1) uerror("openat", path);
--#if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC)
--    if (convert_flag_list(flags, open_cloexec_table) != 0) {
-+#if !defined(O_CLOEXEC)
-+    {
-         int flags = fcntl(Int_val(dirfd), F_GETFD, 0);
-         if (flags == -1 || fcntl(Int_val(dirfd), F_SETFD, flags | FD_CLOEXEC) == -1)
-           uerror("openat", path);
-diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml
-index 602ceae..3bf3e7c 100644
---- a/code/src/netsys/netsys_posix.ml
-+++ b/code/src/netsys/netsys_posix.ml
-@@ -715,6 +715,12 @@ type at_flag = AT_EACCESS | AT_SYMLINK_NOFOLLOW | AT_SYMLINK_FOLLOW |
-                AT_REMOVEDIR
- 
- (* The stubs assume these type definitions: *)
-+#ifdef HAVE_O_KEEPEXEC
-+type open_flag1 = Unix.open_flag =
-+    O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
-+  | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC | O_SHARE_DELETE
-+  | O_CLOEXEC | O_KEEPEXEC
-+#else
- #ifdef HAVE_O_CLOEXEC
- type open_flag1 = Unix.open_flag =
-     O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
-@@ -731,6 +737,7 @@ type open_flag1 = Unix.open_flag =
-   | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC
- #endif
- #endif
-+#endif
- 
- type access_permission1 = Unix.access_permission =
-     R_OK | W_OK | X_OK | F_OK
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
deleted file mode 100644
index d307e7628307..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( dev-ml/labltk:= )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/ocaml405.patch"
-}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
 RESTRICT="installsources strip"
 
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
deleted file mode 100644
index 88008b436c7c..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-BDEPEND="
-	dev-ml/cppo
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-ml/findlib-1.0
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	pcre? ( >=dev-ml/pcre-ocaml-5:= )
-	tk? ( dev-ml/labltk:= )
-	ssl? ( net-libs/gnutls:= )
-	gtk? ( dev-ml/lablgtk:2= )
-	kerberos? ( virtual/krb5 )
-	zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error: econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index feeeee5cb04e..a9a16bf9c6df 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,8 +1,5 @@
-AUX ocamlweb-1.37-strip.patch 718 BLAKE2B b393c62c0ae1e276f0feebb0b9fb6d339af5bf57c9fb73864df2a42d51cabe695474b90bd567686af80ecbddad2981508ce8fb98d65a239bde8e7ecc89934edc SHA512 b4741ac5c7c4b3bbb1c1dae7449bb4b57cbf2b8c269b8ae668e5d14bc98ae973a83502c6bb560e06b9bd0536b4ec914713e159e286b41806071bcd160145b712
 AUX ocamlweb-1.41-ocaml-4.08.0.patch 1798 BLAKE2B 3bd06439f093dd25195070b41bfc59af9f0b54ad5d6dd0a705926961a1e60f49a64b62d11ffaa56f40bcd9cb0260344a8cd66f1c9b713b7238a2a83d710e06e5 SHA512 b9019c0377e24f719c086ce3ecc1117a2a96375f608d63a5267e0e6c466e60d43db2a714659201d2c74da7c0d7499c8c8982e31f5f87d7f6229a77f7ceb3dadf
 AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca09218dcee0ec78183bcb3160dc039e7ea7f81fbbdc2ef80dda05c1130faa24a3d09f4546262c4dbb832ed2b532b982 SHA512 54c211cb3b78b04bd4212acee0065e3c8614729a841691e1e29b8c553b73df20114bfcee4191ea519597c37a3c7344651647263fe6463829b780d7cc17710491
-DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
 DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
-EBUILD ocamlweb-1.39.ebuild 669 BLAKE2B 6e16d76acdc5611f0f56dcfa5ec30b753b058200e7dc675da98c3e4b0241368fc5a831a210006f7546a1443331fafc1242455f40885c2903a514e44935b03285 SHA512 643b172a6b98ea4e790f4ea556d49733eaf4d08969046b8d8e88c429972c23f5e91bee3adef320119291510fcf68acdc05d89e07ee79e956748b44418b8b1266
-EBUILD ocamlweb-1.41.ebuild 832 BLAKE2B c951c00a8453fb401fc7516cd4da0df24e88cdbdf4bb9b1e7667fe88ae6f248ce2259e472c9f25dd7c096ed00deadb5a386edb24d36d1c117fd0a19cad5da4ae SHA512 3868c5e8a35b77d5f9329e6f2c8b19dfb53d140bb92da6142dd2c6008ee6d3aca45832436b6c011743ad55ed9cc130f19200fded5cbede93a46a2ad89211822f
+EBUILD ocamlweb-1.41.ebuild 830 BLAKE2B fad80e14433e9f7310c14b5d38a9f28fa8d693965edb7f8a44b1b64d8fe9c3724ca5c28bcbd68a906b563b6fad3278bf02f3addc35fd6a3c7d16c4eefd135fda SHA512 ff57843464c013acc18c0e1d353885cfaf2ed6d2560123925085e86b8acac2e0faee8b204fac992c5c09d6e541987d9592ee378d873a779a4a0be63b58635608
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch b/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch
deleted file mode 100644
index 393391fe52ce..000000000000
--- a/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: ocamlweb-1.37/Makefile.in
-===================================================================
---- ocamlweb-1.37.orig/Makefile.in
-+++ ocamlweb-1.37/Makefile.in
-@@ -61,14 +61,12 @@ byte: ocamlweb.byte
- 
- ocamlweb: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
- 	$(CAMLCOPT) $(OPTFLAGS) -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
--	strip ocamlweb
- 
- ocamlweb.byte: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
- 	$(CAMLC) $(BYTEFLAGS) -o $@ $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
- 
- ocamlweb.static: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
- 	$(CAMLCOPT) $(OPTFLAGS) -cclib -static -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
--	strip $@
- 
- debug: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
- 	$(CAMLC) $(BYTEFLAGS) -o ocamlweb-debug $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
diff --git a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
deleted file mode 100644
index f4baea3a4598..000000000000
--- a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="O'Caml literate programming tool"
-HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
-SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-
-DEPEND=">=dev-lang/ocaml-3.09:=
-	virtual/latex-base
-	dev-texlive/texlive-latexextra
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.37-strip.patch"
-	)
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
-	dodoc README CHANGES
-}
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
index b704712e342d..1cd6b57b27bb 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
index bee7477c1f95..c386e3b6e84d 100644
--- a/dev-ml/ocplib-endian/Manifest
+++ b/dev-ml/ocplib-endian/Manifest
@@ -1,5 +1,3 @@
-DIST ocplib-endian-1.0.tar.gz 62753 BLAKE2B d343343eb22b7ff591219ad0d45502e3450cd4200d8f3cc7f8a4783bdd93752d015b686b57aa574f58344dc44cec751ba89e68f93770ca5df73a98d95a604b8d SHA512 a08fd58ec5e72510c40e8b75e0ee8327ee658f479e45dd4632bc04e3907d04aaa3684df3b993ab63fc2a6c1f1a4fb32784e9b5258730d3b89a716300522d8d7f
 DIST ocplib-endian-1.1.tar.gz 17544 BLAKE2B 62e4b1cb998ac00fd3cfd7178939b6c9f8c1bebe7c0dc072fbb45b79172cb07f4466e5f1e6e93b41e3fb8c3df8020d2033eb24abfec4906d3ad003fa22bdcd27 SHA512 39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9
-EBUILD ocplib-endian-1.0.ebuild 567 BLAKE2B ecafe568edef8828f8a5828f272006f43a783ede73fcbfe5912c6e2f32d86a3d81b5b4fa03d901d5c7819308f6485eafe402d9296a75dd72381c65dae1411364 SHA512 9d7e7db49577d98be5d4a6b861c04766d12e3368bdcef29ac61c6a91471adfea49c638cdb633225fa6e5dd06e4c6862dceaaf85a04365a62667d0ede0214773c
-EBUILD ocplib-endian-1.1-r1.ebuild 536 BLAKE2B 2866aceb535b73b74373f3c4808c7c145716efd2e257e3744b7dc7cf13dacec3ad77310e71b72560f402f5bf1dd96c982b0d7d1067cb80f7381ae490b4a8eecc SHA512 3d2db470f58475cc8864b92e0973db38decc7f73bc7588c4c8d6fcbfb01bc3cabbd329089e3ee370770955eb74bd245f2128be515bb8ca9f619b87d9e494115e
+EBUILD ocplib-endian-1.1-r1.ebuild 534 BLAKE2B a49be0d8aa8bbea325e35d3a1b291a1f6b19f0c1b186db7c5099f4f42e7137433df5ab3a395c779444e63be8666d7f228c0309d7a20e4fa7c47958488fee70ae SHA512 ab097ff00d0d16479d9dee944acbc94367002268cb4668a7668e596ed6402fb3a0b754aea0a66c5df1ca39ca4abd885c6ae84a5f5adcec4a9544bb5cfe5bb4a4
 MISC metadata.xml 331 BLAKE2B 99f5f2a85b64311e955383fbd71c64c917376f9b831a7edaf202ef4bfa0e613c64bc889099db33d5837d5c4bab28e77ae210e40597c30586b97b69fbc719b7b7 SHA512 8dc69602c2b6c4296a4d8c8777baa73b00a39b5b2d2893a9d4896d96595223bc9be74d01bdc9051852ba96e6157f7fe145d42fc5816cc6c53a3b548ea2681e30
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild
deleted file mode 100644
index c3947fbc9c87..000000000000
--- a/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Functions to read and write int16/32/64 from strings, bytes, and bigarrays"
-HOMEPAGE="https://github.com/OCamlPro/ocplib-endian"
-SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/ocaml-4.01
-	>=dev-ml/cppo-1.1.0
-"
-RDEPEND=""
-
-DOCS=( CHANGES.md COPYING.txt README.md )
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild
index 80766f8c55dc..f771d8ce93d5 100644
--- a/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild
+++ b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # 2 of 70 tests fail
diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
index a21314c7de17..ed7229e95d0c 100644
--- a/dev-ml/ocplib-simplex/Manifest
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -1,6 +1,4 @@
 AUX ocplib-simplex-0.4-flags.patch 1596 BLAKE2B 7bc7a8a70245756937c5c1de5fb3bdb21de5233dd978ca1a8ac781d98c0d4e4bb22384d5e8df0601d42c413522824c9c697d706e64fc9d9ca848294da0ec9e4b SHA512 09f4edb690922d7a460a1a4ba7d72773cd26abc699fe5e9d1c130c2e5321edfd99e913b121f274f026c0d8ca26833b7e08677e0047821ef0e4dceacb7797f3bf
-DIST ocplib-simplex-0.3.tar.gz 31013 BLAKE2B 30d1541f15bf9d2c55f51ed565f2feb63c2b0fbe0095c15849a22df0876ad992a3e6c15924dbbe5a798ab278c7e171e30cda815b1de2ec9bc19fc92bbe79ad95 SHA512 43373deb6e921a31526c27d33808c3520b4f375caf9e5237179db0e8d84b5be3bf43e061e2d991fc6de694958c64c7ede0b258400fb921c4139664e367958630
 DIST ocplib-simplex-0.4.tar.gz 31784 BLAKE2B 89ebb43ba59debc658b1400b24379dcb717f44f484742a4ea2227e1692f2d1d359469add4e3c22bd15b7a5044e4d45877994b40e80f28ec8639989bf28565d9a SHA512 5eb80f0c8ad32291d24423255c0359e139cd85e2262b0cbbfaffcab66d9a7eb66c9bf04bb9d5d5c103574ec7041a72cde5412e6cb03fc9fe4a8fd257dab49a76
-EBUILD ocplib-simplex-0.3.ebuild 755 BLAKE2B b3c1b4fb214ea1c3a4deb79508ebcd58eb75b753899dc63edae5b38bbedeadb9baf26a8ecd2f57e44e267e3973248fe9bfe538fdcdb55e351156c6ab9bc9954e SHA512 665c3ca7adeeb547c390742ffe3127f6783a90262b7719b119d6aa962b58d9210c4b63c3c9341fd92d7083cb472b4aab748510a45015c18faa429ce4b084d3e9
 EBUILD ocplib-simplex-0.4.ebuild 873 BLAKE2B 28c840cc9fd1fa52b199140191b20c951cf4bd9bd930d466786f35ce47e8e3378c37308b10f8e93b26272e21d57242646dbef6be3d7a45d5ec73f325b25508bc SHA512 ba17ac1c46113fcd36930de84e37c221c84af9f689bc74fdd12acd98ee27219177ebd6b8bbe3420364ddb1abdf2a63f09219ab9b39adb53872af262af6e2e6e3
 MISC metadata.xml 395 BLAKE2B 54a700f2e21a6b8a8b9f05e017e7c2601d7880aa7c3009b8877beb3cf023c5fb6a74e7ec63b65920c0b88994a594a36218aa5e1bef367a1f499fcc87a34134d2 SHA512 7f7ac525cbf0913934c92722e9c279846664b9f0628eb529f67039e6dadda276925535b53b9139a22ed2da67e51f6434f0dea35ff60d74d8941e27b51a0f0ea1
diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
deleted file mode 100644
index f04ed1fed37c..000000000000
--- a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools findlib multilib
-
-DESCRIPTION="A library implementing a simplex algorithm"
-HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex"
-SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	sed -i -e "s:configure.in:configure.ac:g" \
-		Makefile.in
-	eautoreconf
-}
-
-src_install() {
-	findlib_src_install LIBDIR="${D}"usr/"$(get_libdir)"/ocaml
-}
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
index 6ba9cdee7a35..6cc3b28900f6 100644
--- a/dev-ml/octavius/Manifest
+++ b/dev-ml/octavius/Manifest
@@ -1,3 +1,3 @@
 DIST octavius-1.2.2.tar.gz 14910 BLAKE2B ad2c6cc274e205918276ed8ab58032ce3f5fb5d564c1ad7cc33c2d73accf1952e972899bd872b9bcb190fcfa223ee4de7f74fbeba44720b3fe78725d1d4d2561 SHA512 57e40f0bd03599bf0b14d85b29bef2214f9b9393917c0a65acf60cf028fe028a730a804f3c0101fee1378cacd4feb7a4f2df3c8411ceeb6bb34d47f849b7a55e
-EBUILD octavius-1.2.2.ebuild 427 BLAKE2B 2e29213125dbd8dbfb46d49c7bb2ed15be6f246540164491c2d33ac4382f2e6cd3778d0e6b5f74a94cb21576165d9d4c6b3c26c84bb253b537c406b307add238 SHA512 3131a16a0ae2420ee0702e4793bc66907b02421dbc25c1145611afd714ba598db98e7e2aec177e86be0c93a0d198f5f8a4ba84fa51373734240a85812e7ea525
+EBUILD octavius-1.2.2.ebuild 425 BLAKE2B 8f92e03167a4b10bb417ba9f4293877b6c6d9745b8d2a4c6650f951db437bc83793ff50720eceab75fd7ba5d7d995122d515c7bbb4de359f7b9453a412bcc6a8 SHA512 28e0a96b6664e3fdaeff346b6db993e5c19291b397a0c37a8d35de5258d25362e7197d368390e99676bc49f7670b396f220b63614541baeccf9a6e601b028c13
 MISC metadata.xml 327 BLAKE2B 58702e13c3b8968a045cfef09983d51eefe7d52e2e698e79573403887bb75f0365c1aebb23a442227bd498ab62c5c6fbc41253fed5d289be7e6bb97a808edf99 SHA512 ebff2af79425cbf3b4b403ee4caa36ef7eade90779a52cf247c100684f973b80974e7c2c1f819168d17c692b2b8405bc2cfb6be14f6cbaf1a78785ae259279ba
diff --git a/dev-ml/octavius/octavius-1.2.2.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild
index c2f630452523..8cd4f8364783 100644
--- a/dev-ml/octavius/octavius-1.2.2.ebuild
+++ b/dev-ml/octavius/octavius-1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 2be8c48e3840..55702e0932df 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,5 +1,3 @@
-DIST ocurl-0.7.10.tar.gz 108234 BLAKE2B 17b679e331fa266001744522457cc7f4a3656b97b4558fc9e4458c31abd8700fb0f55ce1f9049de7d95a1df41f6543aa36729bc10d9cb688e5e45c50960d5e3d SHA512 7e7adae7d32a39465d578c0e9a0b3b1d4baed76c41428337e9bdc86f7c948297db22c14bc61b58c28d02871a2f3359767e745891690663b63ee1334a839b49c8
 DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
-EBUILD ocurl-0.7.10.ebuild 768 BLAKE2B 1f149546cd5a8f83a1d4d53cda2672d8f32c08d15c5f4e9dd521704175cc36c2852744b4f3058eb500447a49404608d9529a060833fefb32cd4d97c63dd4be75 SHA512 3f59e918a13afe9141041515ee93ee7cbb185918256db46293d8f51d90139226232c1e1f7ac72a4625da9ae18f2ebe8663ec060788953d8cf1bad732c7c400ad
-EBUILD ocurl-0.9.1.ebuild 788 BLAKE2B 555f9f78c66864d3169862c9fdb05aacc49f160b3169f3bc5fb3be867ebeca6c3d3694f574197ffa6cd5be886bdf80e765777f6d453d010225711e0f1b7c1534 SHA512 468fd7d79f0e2b5a3b339aec864441c45ea09276f7debbc00199ad8826712cb831ef7ef55f44ebe2bd6f8195c5983a1550afe67e16b1478bcd2aba56eadc1b52
+EBUILD ocurl-0.9.1.ebuild 786 BLAKE2B 6e9836181c9cc3ef8a100decaab730d0622021358495eab2ddbf3ad56218a533e01dffb850d1ed021440f595babcb6f9ce4e5805cef2aba2c7b9ec3bd2c4fbbe SHA512 26caf1a73c6f5b3ee72e31718668502bb204c2b043621bc96885887371bf729e112e3ef9c93f11563b68cf846b3aa0aa9a285864a9e2219c2bc62033b71b9cce
 MISC metadata.xml 248 BLAKE2B fe3026d958889632df0c7f1830afde1cbdb5897819d451db6a083424d0bf8d1e1b4481aa5d015116f6420f40a82270cb833357bddb31fcc2415124d5f81f80de SHA512 31d785847bcf3bdb00d8358b10c988f77c62121b8a287440917b1950fa35ac595527b85b5d3d0bda5abfd1e34802787f6dc6b810adf03a18e87ce4c9f1b30903
diff --git a/dev-ml/ocurl/ocurl-0.7.10.ebuild b/dev-ml/ocurl/ocurl-0.7.10.ebuild
deleted file mode 100644
index a23d5e728f2d..000000000000
--- a/dev-ml/ocurl/ocurl-0.7.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="OCaml interface to the libcurl library"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl"
-LICENSE="MIT"
-SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="examples"
-
-RDEPEND=">=net-misc/curl-7.9.8
-	dev-ml/lwt:=
-	dev-ml/camlp4:=
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_compile()
-{
-	emake -j1 all
-}
-
-src_install()
-{
-	findlib_src_install
-	dodoc CHANGES.txt README.md
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/ocurl/ocurl-0.9.1.ebuild b/dev-ml/ocurl/ocurl-0.9.1.ebuild
index 410c2da529e0..ecab07d3bfe0 100644
--- a/dev-ml/ocurl/ocurl-0.9.1.ebuild
+++ b/dev-ml/ocurl/ocurl-0.9.1.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=net-misc/curl-7.9.8
 	dev-ml/camlp4:=
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 src_compile() {
 	emake -j1 all
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 9f920f65023c..b47c4bd65ead 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-client-2.0.7-r1.ebuild 805 BLAKE2B d0abd7f2154b1cd7c06feffdc9363134bce9d0d6f0528e9d4b231a61cad37c80b62ee127458eaf2e3194a727d1ef6b73340bb3c79a5523b184811e2e27d377c7 SHA512 e1bc63922a380b2bcac4586a44ab8b94aa3f78f1b591050d0cc79090a764e088345f3e3bf5607d9810f14a62f7e30592d7c1b147428c64dae2ba0fbcdb158e1b
-EBUILD opam-client-2.0.8.ebuild 801 BLAKE2B 67c861358276c035c60966c49bb961ac4b51b27583801dc796f9fd3a240e475bbf5235155d34e1c274af6bf6a9746a54a4e11c16986a9ee6362d061ad82e7866 SHA512 bc2afc3cf925da8781bbfc9a2b0c9effb35d276934a480b2103ea68486814b68ab5d9c2aa3bf625509519d696bf315ff91c326c0768fc1f80f55c98cadf87e11
+EBUILD opam-client-2.0.8.ebuild 798 BLAKE2B 4ee97d0154b58106d99c2a298dd52d254e13e18dd7104d8f4222cf2d7e3397036c22aa03b23b529a42712b6a5eb099eed7d9f4d9d444046f0c22cfbc82efd0d1 SHA512 e5f5a45fe8cd9b85e2369fee75760049ec06b2aaa712deae2952fada604efe462fa4c2135382f98249a19f716f51cf5116d828fd2b0d2783898df3f635590fb7
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-client/opam-client-2.0.7-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
deleted file mode 100644
index 24d269ea2677..000000000000
--- a/dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	~dev-ml/opam-repository-${PV}:=
-	~dev-ml/opam-state-${PV}:=
-	~dev-ml/opam-solver-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index c057f7d825bb..cb9b0a4fcf42 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index d3f1ab4abb4e..ef9a9b42a888 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-core-2.0.7.ebuild 890 BLAKE2B 312e56553597b8005158f10861b5699434446ecb3514721971e703091f89fcc0a5bb06738eb8c180a0214241f167e4e3e9f42ae954eddd00bd468d10dcd67162 SHA512 145500984defb5c6b47587d63dc984e104e81dd509f3c93b210d59cd4269ac3ab1fc1771239f0ec873c2195a60c20bd82a6d6b0a3f6e857473c84af65eeecaff
-EBUILD opam-core-2.0.8-r1.ebuild 864 BLAKE2B 16093a4773a30bcea01d036cccbdbca8c3fc2092345c400f7c16d206e0476348eed0084597424b409440f7693e2d16cbd7b93d4a6578cbf334ef786b5de71be6 SHA512 4b04dff73c9f9b0f5bc7898ec91ec0808e62069d5a1e66a822d4c8f4f9fc458e62ec7d384811ac9244d99371d862f5debe5eaea018f4f1b0fd259f0ab326a491
+EBUILD opam-core-2.0.8-r1.ebuild 861 BLAKE2B 8f17334d7dd341661ad70190957edbf51fee7d6d68147caf41a2b9f162ef4974fabca85c6624d7ac5b5767ccf449035280dd71f39c12d7fe626e4f37bb1a994b SHA512 a2f4e1e6b3c20dfc609feb768fc00c30437e9a0e038f8d3e09355037d471431f3f587e448341524f0c62cb186b892fd74e4f3d5ed2de9a570fb755fe8c59d567
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
deleted file mode 100644
index 8f9c7e998d66..000000000000
--- a/dev-ml/opam-core/opam-core-2.0.7.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
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/dune
-	dev-ml/cppo"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
index 1482b3c1ddaa..b32234835a9e 100644
--- a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index 6e494921344b..909e55ca2dcc 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,5 +1,5 @@
 DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
 DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
-EBUILD opam-file-format-2.1.0.ebuild 724 BLAKE2B 49f7d1a40abc3b3925742a39b9d958b546246f1ec257f15c3f5f91c44e9fb1ca900f0c96b520eea870f14616011b30fc624a7bf467ac7cff176dc878839a897a SHA512 3278618a3d0520e0c516e4a552be4d395cfe040bfce21238f1441b766e7b6897b4ff9c46ca5dbff3d43ecb13ed98e6ffff321869821cb304b030e7dabcfc8072
+EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
 EBUILD opam-file-format-2.1.2.ebuild 578 BLAKE2B bb952e031263e0da424399f4e7d0a2adc0db94c9715fd77f6fb635dc2467fd02c4cf24a55ee6eac8cb35c4b16513975d71c1ce6c82878fd3173c8ea55f5fbcc1 SHA512 518e0af5afbc7526d57048f553e59e5b5ee91aabb37800c218cc472c43ff7e2a2a0bd533a47c29f84335f2b57601f048d80a4cf084961c5c3c13e75919a9ba5a
 MISC metadata.xml 424 BLAKE2B be67fa815545cce58cd870b84438927044fdca0ff12b9498217d3d04fe1e68981409e5c8d5b040da85f7969004cad18260b3bd0e105234f9ddd55271aa12c434 SHA512 282c587f3927e29035d987cb102c4b9042081d758787831335d7ce6b009193f7058e5c5e4e1ba5db3794e9dbdc79f2203e93783304f908aa26ffc7ddcd87969b
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
index bf7219d42410..13f9827bb32d 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 70755b14af4a..7df558dad308 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-format-2.0.7-r2.ebuild 872 BLAKE2B eb0d4ee65c91aeb7529051f31d5fba9ca7408a6fddc38d75f1f132ad659671acf1d6952f639ffd616cc1614031c4117fd94c353141a1c7d5c3794e26646fc9bd SHA512 a65ca56ee293ac341c4f20e7e32884ac45440a78f1a59f16eefc2e1352895664febc53bf21075fafc6e94a23c5bac49262eced5554f69536632d3befa3a37fb0
-EBUILD opam-format-2.0.8-r2.ebuild 820 BLAKE2B 72a52d608deb00984c8adfd5acc6dcfbeb35f897e30f26faa644f2eee02b16ea8b04a3dbb6d994710114fb0fea6ddcf70c313ddab93568435e54ea9656212a6f SHA512 18c70937a5113d5e09c08c59f55ebc62c64992164432f1614e57a2c74066d9764ed0e353b4e5f29a69b92d4a17d793cd46ea6018cc9444cd5b93780f8413c512
+EBUILD opam-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild
deleted file mode 100644
index 0b5aefeaae86..000000000000
--- a/dev-ml/opam-format/opam-format-2.0.7-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
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/dose3:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index a7654582b1e2..54b3b0ce46df 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 0f43bdca59d8..964e69169a45 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,5 +1,3 @@
-DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
-EBUILD opam-installer-2.0.7-r1.ebuild 1041 BLAKE2B 9c89e154ba44b46b13ee43a359965e8b9a49c89971fc7d255763cb7f7117dda2e5efcc05328ef9535e8656555b6cc8f4f9f824cb66afcdbc81182c085d8a0dcd SHA512 64ea51c7f4c478a44e6d53f1502c0af6d3af1e6e3455f101a18c4004a5076211974da00387456939dc5b893e08faff1db5dce404459f8c86777a3ebd9af524e5
-EBUILD opam-installer-2.0.8-r1.ebuild 1034 BLAKE2B e20659787fde8f5150dafefa51666df44fed411229db2712b1d8b87a1ba31fd55e20fa1fdbc1784b0b3b5bf43f468658923cb64c04b9332691ffaad6096e3a3b SHA512 6b9bcd66462b82528a746feab8bcb8095ae924d141b1bf89d5f3639212107e8daaaa7b7850dfc42cc1d948c497a6b34b3e6b39afb361cb28159186565a53e112
+EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
deleted file mode 100644
index 87658e669be1..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
-	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
-	emake lib-ext
-	#passing -jX to the dune build leads to errors
-	#see: https://github.com/ocaml/opam/issues/3585
-	emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 7f1e1eb67e3b..71045308f5b3 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02.3
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 4c7ed8d33eb0..f6b824d05f6d 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-repository-2.0.7-r1.ebuild 760 BLAKE2B a286db2f3a0bd8de0d856ab8dbf1f577b7a06e6b3635bca46f7de51d04083881b7bed7c40806d20eefb268e1fcc2d23a69555144b010644dbe0dd9301e50b550 SHA512 47a9d906bfcb548efe2c0a412ada748ba05e63b80eee99579d732ed77fcdf5fc233733d2fed2018b2f482a9afaa2022a535a05408b0fe6858e532c6fdbe71ce6
-EBUILD opam-repository-2.0.8.ebuild 757 BLAKE2B b6a168a2683900236666fd003f1bb70e32916a9d15b0828c5ce3b532eecb7253b11c7daa6319930d02752b5929f5b34966b9d791ab2f73dd798a2b974100aec8 SHA512 0c0a4cb28249e6611854aa1143de7ae8687265cf066b9096f644801cbf37b1be664352a4d77f433c46e48bcd6b2674b3f28b5e02da8d3b978eb234a941e8cd9b
+EBUILD opam-repository-2.0.8.ebuild 754 BLAKE2B f9d6d9b652e5bd1911cc8f9596a1568928915001d1e1dfa826d760d967d0c867468332496400a844f4d35fa6704656a6718fa9c25ff52ac5469b28cae92da817 SHA512 4f19f6d9dfa8760338fb68b843e6617d6b0cd96673ed4c5ae6a1229c09c8ffabb02e3ed41363d1075988b1f0fbe526cc7b3162cf0cdb01653b6bf57cfb746e42
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
deleted file mode 100644
index c0970787f1db..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/re:=
-	dev-ml/dose3:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
index 5b8eca6bd799..632b71026c65 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 1d9166ffc825..a8e194775eff 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-solver-2.0.7-r1.ebuild 831 BLAKE2B 7ce493c866aecd1a0897021c057ed094f04a5b6feebb9faaed89a8d7d63aa6bc5e531a35f28071d5439e26caa3bf5bbf7d0602e9d1837c448d1aef9d4feaa654 SHA512 3dfc47038307c97775b4c409f7b18e70cc796c55db40ca7137bf02951695d53f171a76744eaa1906e0074de1ddfe0fc68c475623864e5d9d719b11e3681dc947
-EBUILD opam-solver-2.0.8.ebuild 827 BLAKE2B 62ebae47bdb9b5b390daa2158caeeca1650126249743a5cf445a2302021f86fb82aaf2f60f5924044bc3c61118c41160cf431df2a0a49852b2e6a34b0c6c5695 SHA512 a06fcbefb7c40bab923c523b9adf8c33c6039493e294e6599f71c64ea86001f6136f2c8424a63fc0b96d488fa78a42375af62e847c0f2aa1c50cdf9fa4343c53
+EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
deleted file mode 100644
index 3613f874ac62..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	dev-ml/dose3:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index f1e3fb60b9ff..65a72574eb59 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 12abc089a0e2..d40cb954e944 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-state-2.0.7-r1.ebuild 744 BLAKE2B 583a7ce5e4ade97f0070ba65a556e013268e1ad11b0f5c57d56616ddf758252d97b0258529c7ea6e56511c45827368406ead588f157cb98dfd0d39b99b1b0068 SHA512 2505c06f7ec1aec58dd2698c5c5d1cf5e17861d4f88e9d79a1f0a3d4b533529e03f5cad3e6a64096f3e84e1e0e7d8400f218e30b42fbebf3b6e1dc92fc81ce62
-EBUILD opam-state-2.0.8.ebuild 740 BLAKE2B 7dd4c8256b13a97b48585fc4e09bcc00d92cdb82ed83b8bf1929229ec459c3b9d91a4c03f27d9bf0e81aa140652d7401763c9647b756bceb84d1a2109fb5c9ba SHA512 528c04c156ac6e477a4058bbab869ae4b8427b4ceddca1b4296433f60e7f314b93f58e048aac348ae7ce67ef35f4982b67fb18cc3a8bc4858801de4f9db406f8
+EBUILD opam-state-2.0.8.ebuild 737 BLAKE2B 31e5398a6fd835fab9fe0cf31eeebbd2ca587853b8de942ed54511c04b858b2e3f5fd1a3b46c84bd920c639b606db65fea8c863d5ec746ce75dee0bda3a04c83 SHA512 19caab930f0f43ec38319248a23e89e5e3ef3edb46d84a69ad2db8054a13a806deb3846f1bbfc8e96e1d5a27de9f3a0505316f92a5c34d22cb3259136fd96f00
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-state/opam-state-2.0.7-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
deleted file mode 100644
index 6a79137fcca9..000000000000
--- a/dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	~dev-ml/opam-repository-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-RESTRICT="test"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
index 4449490e3574..48e053b3e9cf 100644
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index f04cde885263..3e5ded24e68f 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,8 +1,6 @@
 AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4
 DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 EBUILD opam-1.3.1-r2.ebuild 1093 BLAKE2B ecc0296a205c8d2b6f4b1d060eea574b892bcb4e970419b266c6c74437ec6da6c733feeb93979716f6bcfe7c977b1870119348e06eb35e8417cbdb97cbf3164a SHA512 e422e7d15e363970fb2ca752faa5b9b156f884eaa139362973d57d98bf613cefcf35ba5a4961ad210fd132e4298a5d881d0b4e97e5099d473ec0aa4eaaf2bcf4
-EBUILD opam-2.0.7-r1.ebuild 802 BLAKE2B 29ca25f720a229a6b41766e4eada93cbaf784859720dec4e23ce1ebfb7b27d3cc7c9124e70307a66f65b0748cdfdcfe31ab8b72f51fd62bd0acfb229a34dd6f7 SHA512 11e8e159101e32350aee72f5f14c4d8f213b722131f76bc1faccffdfdb1d2c363154dd9c5fa85fd4988fee3adbfbd54396d007880a630aae6f52a7a868c777e6
-EBUILD opam-2.0.8-r1.ebuild 799 BLAKE2B c313fbccad4756df5ed2d283d813b439960510250e761f35f2013834de0ba9c4c0d06e62a60630c3f58b28ae7cb83869774954949b2e345a7d29075c20902775 SHA512 5813196d53efba9d3869244f451965518936f5b34ab0c196e5c0583266cf4daf371717c1ea6b8c593a5ffdde6891e213d801a98b388b372d56dfbd1df2ea4d19
+EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/opam-2.0.7-r1.ebuild b/dev-ml/opam/opam-2.0.7-r1.ebuild
deleted file mode 100644
index 765c723d6f11..000000000000
--- a/dev-ml/opam/opam-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	dev-ml/dose3:=
-	dev-ml/extlib:=
-	~dev-ml/opam-client-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:="
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
index 4587e6d1f458..6fd893a1ef12 100644
--- a/dev-ml/opam/opam-2.0.8-r1.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
index 2398a9bb6d06..f29de2ac3e85 100644
--- a/dev-ml/ounit2/Manifest
+++ b/dev-ml/ounit2/Manifest
@@ -1,5 +1,5 @@
 DIST ounit-v2.2.3.tbz 57449 BLAKE2B cf4742c4800ff66551416e243285ae0264f94d1665f795039cd37ad717b09fa3ba5cdfb2380169dfcddea5a27a82373ae892adf11155147a081d734091bf39d8 SHA512 dff04859d263e5f80a1606156d07493d0320a2756d0a7f134c63c53078550c7b056587486922bc66a288413af30c59a7e47157636502c6dd10626cf75587f981
 DIST ounit-v2.2.4.tbz 57558 BLAKE2B 5cb1eaa1233102af49155b46a1a95742c3c6c584901536ce755e6f6386d0d645639b98fdbab236fe20c93c3bde2632bbfc31c5a076f61cc6b9a7f408ac032643 SHA512 d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f
-EBUILD ounit2-2.2.3.ebuild 504 BLAKE2B 07940d746fd4e035f43d0cb0ae067730a5ddb399399040600ab2624907d92df25d9b89220522c42ad1ac20ec91cebac70886f22f71d561ef8370dda11d004eb6 SHA512 97831c5736cfef52c60979be528ec372564487fdbbb4038c4018986de6a621b32ff1f324fb607341c74536f35051a639f956152442b3d33855375c024c03fa4a
+EBUILD ounit2-2.2.3.ebuild 502 BLAKE2B fce38109ec2b08e2897ee526b568f626b3b8928974cbbb744aff470a0d2d6c0b90de11bd16169aa7247b03fbeb3da4e250029b0b714fd7153e92e8055521a9d6 SHA512 4a29c05b2a01be3697c45548ae9e2181302f5df9a7c772d4bad905d7375ad52a62962c29548df4a28fa7d7def9eafb4cbcebc9ac5a953a02e7cab303733edbef
 EBUILD ounit2-2.2.4.ebuild 498 BLAKE2B b5b21b2d27eba15291a0009de501de051e8214ff845bcb5b7f7432809793aa80df2ccfbcc1ddd0abc94ddb128f1df9c23c1f2f4a22dc8cbd23b8bc92ceb00f18 SHA512 62f31733d78021e5cb3a9ec59bbe4f15a399fc57558d04ac1c60e87a8009286bf9c952e104c37708cb0807fb9942b2731fd6c5e54b57373517fe329bb5e9f085
 MISC metadata.xml 417 BLAKE2B 9f043e612988157e93659d1d3fa84fcaf56b9a1751870d3fdd252c8872782f905d809075cd99bbabe1c5ab07b541aa8ee3968db157d8ade07d7722fe6400ba57 SHA512 1c09364b4b9a39f3b6d7189b0468d1a9414bc94655f9113ba384ff7e1ad431edac0dfd57767cde34b65ade365cd2c387d10e7e7b40396678fb77d037d62b5cf1
diff --git a/dev-ml/ounit2/ounit2-2.2.3.ebuild b/dev-ml/ounit2/ounit2-2.2.3.ebuild
index 426e90de74de..40be073255c0 100644
--- a/dev-ml/ounit2/ounit2-2.2.3.ebuild
+++ b/dev-ml/ounit2/ounit2-2.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/gildor478/ounit"
 SRC_URI="https://github.com/gildor478/ounit/releases/download/v${PV}/ounit-v${PV}.tbz"
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 DEPEND="
 	dev-ml/lwt:=
 	dev-ml/stdlib-shims:=
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 0a25b6825356..79fe34cd5b7a 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,7 +1,3 @@
-DIST parmap-1.0_rc8.tar.gz 98699 BLAKE2B 755208d0b380c200c5fb2a38334bcd422ea3e3c86bd8a52db37e256dd45c22c05e8577a5f13ae14d4ad553d16c212ae2a1b299e0870ac71a52e0bf11ddf2ecc4 SHA512 96bbe49f06dc3611577e87d9e6f5ca32e10271d6a14a0970bd4548fcaf268f833b3143258e14328237a60578e2355687e4bff031a021903f3e2280ef1713cc65
-DIST parmap-1.1.1.tar.gz 44311 BLAKE2B db80056b2207d0e6723486b930bd0636171e0f2d710706b5348f2f098eb866fe9ab5dc516754e70bc81641484d4403868950ed6b35abd926d3212402f91ca41f SHA512 8333337b4f58496dad7c3417449ad6ba319c84d5cdb8434772479c9bde5708af95c230c9e1a9a31e4276d88cce3d827b1655c42a110ccd889d1735fcfecf0c20
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
-EBUILD parmap-1.0_rc8.ebuild 1089 BLAKE2B 0936f97f0d2464868df7ddd870b141e7689aeb612c279a1d3521f9c8c3b903dac29cc38f9b31e7e27c1b8e995e29852dec86ea92e2fc818c0ad51b3be8a9e575 SHA512 43b7b44ee2580f63037a136436bc30e4eb57544eefab41beb041424c19666ff2b063556ab2acf2c5980acaa8396ed348178e6b465afd500f810636c538428847
-EBUILD parmap-1.1.1.ebuild 608 BLAKE2B 024dd9b769c4db08d09efd56d471bf617f08b1aad57c0ba75210a35a161bcd7e2e3122f681c8fde8edcb1f2ac54df78ee0d666b5cd87ce8ddf92b0d5f43d5a7d SHA512 be0ce8c1b8ef873dd5291665649a2245cd4a92d6b804bdaf2aa89e2ccdb8cac5795a67caadf4edfef19cda92722186065ebf8e197e91d96ba304c2ec4dba3d61
-EBUILD parmap-1.2.ebuild 604 BLAKE2B 435990f943489e2ad79906134995b017d3257cca8aef024926c1507f518de72f2dbacda146604843a9b37e1127ab4dde6f682dfbcd9d0cc3f3eb58ce477d3865 SHA512 6d1008901a8c66c6f37e2c84265a4ed313049058384dd4ff3ef6bdf47910423b71b5ad0ee7628f35a18a33bda1cc3943729e448b1976113675e0ee7c50f8dc9e
+EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 322 BLAKE2B ce1a2f61e9f4fd4fd8286835af805812ab1fddb8cba9e85401f0967ed03ef6be8507868ef292accb826332b47f800b32229a0dc2ae62c2e8f44bae20bfcd9de4 SHA512 7d752bdbddf86b905a475ba3243f4bedfb1b07ecd70fe36f73671dd197c1bba4d1abcd8c44d4ffc94301417c33bb30e15d819645f63390d3c9ffc4f9a8fb6cd6
diff --git a/dev-ml/parmap/parmap-1.0_rc8.ebuild b/dev-ml/parmap/parmap-1.0_rc8.ebuild
deleted file mode 100644
index 1f698332db44..000000000000
--- a/dev-ml/parmap/parmap-1.0_rc8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-MY_PV="${PV/_/-}"
-DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
-HOMEPAGE="https://www.dicosmo.org/code/parmap/"
-SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-ml/ocaml-autoconf"
-S="${WORKDIR}/${PN}-${MY_PV/+/-}"
-
-src_test() {
-	mkdir "${WORKDIR}/tmpinstall" || die
-	emake \
-		OCAMLLIBDIR="ocaml" \
-		DESTDIR="${WORKDIR}/tmpinstall" \
-		install
-	export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml"
-	emake tests
-	cd _build/tests || die
-	for i in $(find . -type f -executable) ; do
-		${i} || die
-	done
-}
-
-src_install() {
-	emake \
-		OCAMLLIBDIR="$(get_libdir)/ocaml" \
-		MANDIR="${ED}/usr/share/man/man3o" \
-		DESTDIR="${ED}/usr" \
-		install
-	dodoc AUTHORS Changelog README
-}
diff --git a/dev-ml/parmap/parmap-1.1.1.ebuild b/dev-ml/parmap/parmap-1.1.1.ebuild
deleted file mode 100644
index 7290a63d2d42..000000000000
--- a/dev-ml/parmap/parmap-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV="${PV/_/-}"
-DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
-HOMEPAGE="https://www.dicosmo.org/code/parmap/"
-SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV/+/-}"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-BDEPEND="dev-ml/dune-configurator"
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/parmap/parmap-1.2.ebuild b/dev-ml/parmap/parmap-1.2.ebuild
index 4bf5334c7f34..170399c1cc16 100644
--- a/dev-ml/parmap/parmap-1.2.ebuild
+++ b/dev-ml/parmap/parmap-1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
index a0c9afb9eb2e..65b1fa79df0d 100644
--- a/dev-ml/parsexp/Manifest
+++ b/dev-ml/parsexp/Manifest
@@ -1,3 +1,3 @@
 DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
-EBUILD parsexp-0.14.0.ebuild 469 BLAKE2B 6d96c8bd3a21d908cec56616e8cb17fa6c8ee3219473ce4af10f8d530e767fad9dea03cb76934d3053cc29fd9e3894ebef8ad00c17a685a0d1a0dceb3448c581 SHA512 12d87aa7abc38438b509203d1bc7a1cd1c85346f3b26fdf5d5605104b6b3feac91ae0d10985c86a9b0df4da90a931dcc3d3a175f536b36fa467ff59b6fc82c9c
-MISC metadata.xml 327 BLAKE2B eb1bef386734e20b2bf5ced714d66bfdb38bd87264def3be40810290dd5f86be06c26e52798fb126d60aebf963549b861b728856aa008ef9e39a7ea8cfcdd725 SHA512 2c810d31bf8d5c848b17b1708e5efb65fed70f6590b2681b6e5aaa9b0d175f467dd69ccc4f978324a82cb21fae027a0d0376c46fcc2c8ddafe64a20cd6efa726
+EBUILD parsexp-0.14.0.ebuild 466 BLAKE2B dff08580ce79deafaaf7d99149a07c0f3c5d3b8e7b59596b716af6ab95e31cffad0aeacc8a5739aa8655b6de62a12ba983ece9e650a45822daeea9b4ff53340d SHA512 24858538ec6fde8f7172a7564de4027688485ff54a9eba781a7fbda5dc26693116c4292c2ddf03153336e415158dc669defcc63e3c2efd4b86c7408901b177e4
+MISC metadata.xml 327 BLAKE2B 8519fb048bfb815ce080574b10cad805e56a945705fd9a9dceab3222c92e751d6ee7460ba0e8412a89fb81ef493fac345f1518efb773bd9832f2095525a66343 SHA512 c4872a27c6d3ab704e520cf1b2c84bb9db1e22f2269e91a9e0593f030cc5be54ba9102e872ebe45d3598451401bcd66e0989cdeacb363dd4f5b39053a1ab697b
diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml
index 45889fd58f9d..ec5d4ff1ab88 100644
--- a/dev-ml/parsexp/metadata.xml
+++ b/dev-ml/parsexp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
index 71ad687ce124..fef7fd77106b 100644
--- a/dev-ml/parsexp/parsexp-0.14.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 86019d08db0d..dcb0c9d25f53 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,5 +1,3 @@
-DIST pcre-ocaml-7.2.3.tar.gz 88307 BLAKE2B 1024a0d7a490fb31927f67af4c9a5e90c8d3788b3998a8af1ecaba9d6d12d1a1be91dcb2bdc1c49e6e81f0909d1dd9b6bc200f908c68427650985491f35685c9 SHA512 3df4bdbbed5e1ecf4bdf15fc461f2ea65e1556af9c1683e194c8824e21da5274dd80c22c1f6676fca203305ec4244d47e09f0ef8c601bfa95f7237bb07c1ee65
 DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
-EBUILD pcre-ocaml-7.2.3.ebuild 709 BLAKE2B dbf57cfee3ff256ded13d85881ad747fee1802499172f20528cb30ddecd9d37f7b9adcf81419d042ab72d3924856559189b4416044b368b450b403968cd02995 SHA512 2c6e5106604be7c0f0e686fca818c618e64660c0bee5584fdc8072c9a94180c037663219d5453bf47b821c65aa3a12b7b1e0d891b79f2bf20d3c84e0f323138c
 EBUILD pcre-ocaml-7.4.6-r1.ebuild 717 BLAKE2B 0bd70c8f70604015568c5a5d7a9ba819836874561b8e3d0f9574849e03b4d667f2a5aa25b233fb3958a8b317f8be91ddb200c1a5ff6bb23d23dc13ed0591073b SHA512 f8bf6b2ef96cd1c7c528cf2939cc7e4a5d6b601f5726d0f8109e71fb066a100463207ac33903fa8699b1d3103a1099155b47c1de40f82108ac4269d32623c3d2
 MISC metadata.xml 386 BLAKE2B 49822d22e21f6ff482bb8f1d7564ffa4450dd9d8c9f8f09865cb6ded1b9dfc90f0310afe74b6e9f21235f1b70e732e780866231c18fe82822308c9c278071dff SHA512 d5100530b8d43a6849d513e0262002e0ad610fd1cfc378245f08b88629cf3e0dbefa6dab7a94752dac9d9fd4f7994610b33e63d274cde6e9751887979bb64794
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
deleted file mode 100644
index eb845aa29a3c..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
-HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
-SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=dev-libs/libpcre-4.5
-	>=dev-lang/ocaml-4:="
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
-
-src_install() {
-	oasis_src_install
-	if use examples ; then
-		docinto examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index a1b604d116ae..3ef062cacf66 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
-EBUILD ppx_assert-0.14.0.ebuild 759 BLAKE2B 8fb384aeca146859a512c9f7b048e707b8daee97bad28a0fe3265b352eadd1411c448be5a5ccf7fbd7b8e5aa7d5b0489cbdef2b0a05b8fe2ccc89dc02144c772 SHA512 29ad6c719a797090cb3862083347884c4ba905cd0d322d13a86d39b6bd452e4c77f27b2d5053c7e7b2f4ea09931444eeec93b689a5b7cfb890d7b5343dbfd1c9
+EBUILD ppx_assert-0.14.0.ebuild 757 BLAKE2B 786041fb4c2dd55760d00111d8ca1f195ce12f9dd281d37dadf7010d62bc9ba8f7a82a8c5228036eaee46c482c7ded24b7a3c3922242279cdb9d9595e006bc29 SHA512 7a4a00d675b63aa741d084d68ee84101d624e1bf5492e13a06a85959719da6f19cc71d57dbfda9657935b71b686445026e2fa55302567b5ee327a99b43c31b5a
 MISC metadata.xml 330 BLAKE2B eaeee64f3cb9dc4bf3441dd056378a9505934294b4181499dcb9be9f182ff2c10fe00c73f748cb7cd5b9aebcb4ed33c08c0aa69ec7f35ddeac989e4997730f23 SHA512 d05d2e3223b8b74b81c8c6f742c000d4bae1d538759b3a517656797c98b36db4870556664077b46e7b8dd309b027b2afce096b62f69eae95081b6bed02af8835
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
index 02e954f54f4e..4db2bc4b5920 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
index 71f40a68720b..6cccd02e1fcf 100644
--- a/dev-ml/ppx_base/Manifest
+++ b/dev-ml/ppx_base/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_base-0.14.0.tar.gz 2953 BLAKE2B d62187d4b359dab01f88054ffb53a434402af022849a633749f3d60b625967a30b6c2ef58b838ef2ee6261d675da60f03d062ae1dc8391d5a4f0bb9cb3d719b0 SHA512 d41f36e3ddec7bdffaa93d8ec4110a197ef4d4af4f9173e060b0f1c5d9c95a33ee13379e41dc027f1103faea3b8ec4e314387b0844a7fcb78d0770ffa44c99e8
-EBUILD ppx_base-0.14.0.ebuild 702 BLAKE2B 7e69ec5f088195943e12860e77d888e9ef8172b33ee453f4a9752f3656269092180ac662abf307e829b567d876a36155719f86f50d07aaba54b15b30b8438f6b SHA512 76953de69bacf09998aba36335fc2203c9f491ce56ed88ec04937df0b18c641f30391511b464857218c5cfbb0d6a3f57bc5a62935b531f747d90f18206b1ec2a
+EBUILD ppx_base-0.14.0.ebuild 700 BLAKE2B e65a818e0d7caef334dc59ffbc780f179cc78082ce8d391c7892afe7c97ca537cacfb6a54a1e6eef6836e49ba142f1ec9cc7e1eefdb1ac77013be360d54a1b08 SHA512 972d9ec4534aab311db9a698711d6ce24c44441e9c123bdf68f23fd812e222759bd49c95ca9158d68d54bf094ff32cdeb5b3d3921f9532e38bf98b88d30e288f
 MISC metadata.xml 328 BLAKE2B e1b7328cfa327457bf60415f4804f0495186b938be4e3e100d1ed396c8e9479b2837e613c1d7d088a29844049d45c35ee0eb7d5c70f73b21440769e85af440f0 SHA512 1ebbfe4c55a306032694f13d87c4367debb228c67862d8dce7dd2132533bae52091cbf1183cc970f4a4ae5db62e5cc82f3541d052633f34338487f7d62741b03
diff --git a/dev-ml/ppx_base/ppx_base-0.14.0.ebuild b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
index 55a844c68940..5ab183c7db3c 100644
--- a/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
+++ b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index 74aeb4e0b8a3..b5ad7f424b23 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63
-EBUILD ppx_bench-0.14.1.ebuild 615 BLAKE2B 726f06decde54745af712c9211baf527351d5f4fd6057819ea7b1fe1b339f84a56226642fbdef0f7d24a6666378f3e711ed4b0be8dfd6b820b8294dbddffcdac SHA512 336c56e7b100611e99c34e5d44bcf35f35cf0e6efbb55244160be182088aae90ffafbbf879cc0cbbde5d52825ff70ecd1bdae3ac213e4b5b144e06541da819d6
+EBUILD ppx_bench-0.14.1.ebuild 613 BLAKE2B 14ab10e0609adb20fb9484a2d5c2e61a049f9092c026225d4de90228a5d571e999c02f0fb6cb758af0179f150a6ae207935f6dc9699901667c39c38711d591b6 SHA512 5f908c4c71765e58162b0ddc707d36d6dd6536b5f492622682c299e51bbfb79bb40b37e3909245574969816fa7ff18eeedad22853496809468fbb8392add8f7c
 MISC metadata.xml 329 BLAKE2B 603e518714536ef813a6eb2372362ba884cd60bd0ff64ea434bfcac84073ca973d211fe28e623b140dbf901b77737585358f95f67902e3e4f11b49e618d382a7 SHA512 73de0019be9f826fc7092793418865c36a41ca67eeb2c8d1ff10aef5b3a0f61d78ac29489e271b7405d71a768371522847cf3eb331265e3aa745b538ccb0b61c
diff --git a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
index c121d752077c..a75b4ca1013e 100644
--- a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
+++ b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index 668eae9deb66..8b45e69f02f3 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
-EBUILD ppx_bin_prot-0.14.0.ebuild 729 BLAKE2B c50e80d37c14df1c833c54fe36f2bf84f05945c7db8791f61a85da9992a85c61f47d2e21d88b5fc03371b2d93c3a52bca396dd076dc84a14a1d3faa7774e4828 SHA512 81bfa35f78940b5e7b70660bdca2e6bb478e3dd481820cd20dbffabd7481b48b6f474df7c19144a0d773617a4917421f4224183d1220b0845f97b69bcf6dc182
+EBUILD ppx_bin_prot-0.14.0.ebuild 727 BLAKE2B 6a007fec49c085d047c40bb0f4686a3236203ab7ff6e70beb4da87989ccc3232db4dae34dc293649608f1c82fe2b0db1baf4ac5f90bd05e65154da9c6f2c2ae9 SHA512 53c68ffd99373551bcb5d5947367a485c1a0637733294c7b527a2ba9eec164b1ff46b669f2c919891d113c3289b1b5711fed44000640b0f3b289b71fe75e580c
 MISC metadata.xml 332 BLAKE2B fd73be12947f8034f214321a34f0ea94e430a27f967fedbe2532e407b6a018483e4ac02927e2b35584b163fcba3e4ad3ad6902b34da79c159c44479bf455ea58 SHA512 d2907c1f5c0e51d6dca9b80b4c536d837ed6ce3b0683a446851d1abc5d873e15c26c543eaa4a790b63e10e335ea762190f568d9e182ec780b29d41f3055f19db
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
index 446a566036e6..5c074d9d55ca 100644
--- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppx_cold/Manifest b/dev-ml/ppx_cold/Manifest
index 5a7bded8d955..278f2d97b053 100644
--- a/dev-ml/ppx_cold/Manifest
+++ b/dev-ml/ppx_cold/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_cold-0.14.0.tar.gz 3778 BLAKE2B 5ae223047858ff11f90067fcb2a6541c964cd929e45fe9d43256b75a81599d6aa0aaf37fe7274e98c64b6448846ab8c64b1c092171392f74a395ea08ea0a60d8 SHA512 3655602defe6b5cd9740eb4cfcf480eded6912674df28955502adcd0d8d6901551e137b0660a389f8be2c88b3aebc830f57089d2ac1a82f7b9efdbaea358fe07
-EBUILD ppx_cold-0.14.0.ebuild 603 BLAKE2B 2722ae7f94b5ba4ed0b18adde98d3a37ee85c730a923aac4baf1ea5fc2521aaec721a69848073af0c7ca68bfbc667106d2b964079b3b1df1c84f816c2a9b25cf SHA512 b193159bcf86b7340054268ad456e69a2065f5f8e621442a03b97b1d3f6cb41263ed59cf3dd75a5e2aaabdaae689b46f67d4a538e17e60555da559a4922de4ea
-MISC metadata.xml 328 BLAKE2B b725f5ab6ec86d11cdb6281bd31feff543275a0dc04e2f2ec86f8ca7f3ad60e2812f753d616b7121f51f24649dbdf5dcb76cbb9fd727ddd90ab9d6a828a6667d SHA512 7425343bbb1452bc1a7c890937e41c05485e609b6154e56c08d50ea151d2683d832ee501750a8abe829ee0aa84995a164a8be62c0f6ad3284f5f94b2e8155576
+EBUILD ppx_cold-0.14.0.ebuild 601 BLAKE2B 59c2b49d350933461ad0ec24f57c849f6be7141c475501d1f0614f201ed538a5cdf45d603a84385a203ce86c54927391de76842f3365f896e334331c2906ae47 SHA512 c35af1516d829230989ed450ba9e9293482766d1e620c676a79877d42764a773a4882dd579c7af8cee5046ee13f84ae29a2c4bbc9a6590053687ebba8f4bd9a7
+MISC metadata.xml 328 BLAKE2B 161637ca7a3b7b38fb50fd4494f3b53f5da228326eb8d635bc6016e3c9d8ca0a9e89d110a4a7c54df95f919a498e8ee80865880432e00ada41232f5439668be5 SHA512 0f0b66906d2063c7b288eec84c7842b5bfd47347c38bcbc9eb57006f8688f68aa941a5bbbd23eb380b236acb651822e591b4a24b723c62a6fa9fe722acf4ae42
diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml
index fce837d2f493..6f4a7fe7e1eb 100644
--- a/dev-ml/ppx_cold/metadata.xml
+++ b/dev-ml/ppx_cold/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
index c11017f1ae22..16580dc9b925 100644
--- a/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
+++ b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 783a63931227..2a957277c562 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_compare-0.14.0.tar.gz 13614 BLAKE2B 081e91192f987095a773964b56838b05fb18ea23599eeeb28d297ac81ff7439067ffa0941cf4d64921abad68f9dca90560463b9f059f35ed3147333ba697a88c SHA512 be02c8114e0915439c04b3d796029ad124e9a2e637032d6a86a41c03b81985cb0f68f65bc43c1d12221b521f6fa10006a105b3ffe95e991ed9695692fd0763cb
-EBUILD ppx_compare-0.14.0.ebuild 662 BLAKE2B 18955865048696ce18529daf5a51d422eb92d0537ac30ef4850da55e22eb07db28c88cbb25b1ce192b0697b48abbd7aacdbc98b7924bc439f1a0312a76b2430e SHA512 8bb830abf89af91f964afcc3d148d8096e21c16e5405d24affb203f53830fba99be18c28130a459cba367e5af93d86311b393190a2f3535bd6c4da00b8c6899f
+EBUILD ppx_compare-0.14.0.ebuild 660 BLAKE2B eaa6671ab14343e066a5d17e98cdb69ef01afb6cec0b6c2ef439df60a4f5e48f35671b3718eb8c22e8f13a03906fa6493cefde65a24fc3c9bbdf3b2e56f10abd SHA512 f47ec03f3f8d308a6f75752f38ce8b7f3f74acb8e2a9a9bd703f69448c05f2fcc933de270352c5d9e3ca5989afa7fb45ca9d2531f6369537f52d0da91101083f
 MISC metadata.xml 424 BLAKE2B f7b31e63898b12c6c8ea7d16abd68730c686f0ed40d36c1ebc6127a21df00317ebfa4024f02af399eb882585474efb04cc9078bcb0df1574d3df0604f16090cc SHA512 87e2fc7c48bd1c6b86b18e2cbd35d9dd30f07b30379fd482c9b25c1a49091d438df052ad4820a366df43a7df6e3c8c9ee6c7b444dc6794fa9eeb25a456771b26
diff --git a/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
index 03b01c474dae..88493e7e79ff 100644
--- a/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
+++ b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index 8b117df6656c..c3841fb779b5 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch 1692 BLAKE2B fee56511e88124c2df3cc075b99e97834794e997c4cf87bb3e5d018cacbf3b4ffeed886f3bac054e17b4d3e4695d8499b830fd2ee18cabef7381d352a33dcb9e SHA512 48e2a0e92d14533e66b59487c90d4c8bc0022af7a7db05b8708a5d71eadab011fb6c5e63d81f1d6fafe329f41328d2d0fb540888b9f6bfa53dc72330b5800f04
 DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c
-EBUILD ppx_custom_printf-0.14.0.ebuild 690 BLAKE2B 3ad8ccb5fff9133d2590fb00bdcb6dddcffb87f56a9d94f5240d2ce303da30acadf22069d4af9cb7e0bafed79cdb26e715f203abe9c0182c3061a898601f0c2c SHA512 ca0839af236bb755386b569e8a648c9672a394ceb7e65cab5af69c31bbc2e6e146a246d231e4aae911f306329b2dac9f119d0268feb68e883b27382176fbd303
+EBUILD ppx_custom_printf-0.14.0.ebuild 688 BLAKE2B 4b314cf1edcb04976df93eca86227be8a3dc6fc53aff685027e9508b4f93af0bd2148f859db05daf5663055f3d6db129ae97f189beb629e508f1caa1870de26d SHA512 ab45fa5cf1df5d92811088e03ed48082dadab0ab509765ad379cd1211e9c9786bc9770501c46b3ab32a3a4c67100ea8a3b0dfe089a42765d749744a03abca050
 MISC metadata.xml 337 BLAKE2B 0c3a2a4da646e74eba801d91e7b0347bb2d4f82f9c67c948d2df83e8bcc24de8c04c913ad8fea547cc39b3713e71da905451bcaf5a9a8a194cec7332d85db806 SHA512 c559c7204d7ab47b35dbdde65f0146c492238ea7975b1cc4ab21848b3ca6ac9118c8c4e1a5e3c6ec5e071d4c61284374ba84796491a1cee2dd21be84dd941d08
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
index 23838b5a009c..bda941ae3a99 100644
--- a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
index cd60e1c37098..30b0e14a7b12 100644
--- a/dev-ml/ppx_derivers/Manifest
+++ b/dev-ml/ppx_derivers/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_derivers-1.2.1.tar.gz 2530 BLAKE2B d0a8a214e93908cfff1d418fe1b729a7ca502fb6dc983d3a837f6846aec891627457df72a610736d929c83622202bd5a00451c1c24510a642b4c133ce60416b8 SHA512 ef0796fe2592e653d34ba01d206d4b507429882a2aaadcb89c7f807c33a417f2871b0c94ade5c92aefd9487daa582e19d88ad5a5eaa631e8162ae12f4a0756c6
-EBUILD ppx_derivers-1.2.1.ebuild 430 BLAKE2B 1d82a58f8c7462c0cbb65a8987096d05b5725daf4c6aab9620e8792bc8d3f5a07130419fbd8af24d47b179810fc1fbdebe1e9d0c6bcb433704a69afd55419553 SHA512 c4d05c74bd77588e3f535133e708bb2d68b2f033e99b2c9648332c7929a58fe3951972ed9fc58719fcc410b2ad304ebc6de87eebcbae16f191a53be3d8ac57e9
+EBUILD ppx_derivers-1.2.1.ebuild 428 BLAKE2B e3ec4723270dda6963d1dd01d7fefbaec0cd09aad905b89a37d3f884a19a4949eec059f30864aaf242dc72f1993b31982c2dd9f32bb7eee27ad48a5a9bd64f4f SHA512 d04ca2ee4daff170978c15c7431d6021015358723027f39112f5a33857fdb28a9a93bd4b2571841c2ce0c088eb4d7652ecf59b858e42ef9d964e075cf8731472
 MISC metadata.xml 326 BLAKE2B 47cfaf71bd6893debdbaf5f5e59316247e5b632f98b755711420d3159f171922d5b781778f9ea3a78d015d59eac44b8a1cfd956e6d30b7910e59c5d7fbb30312 SHA512 e9c22d0a8e279dd6345c197c5db53869f2a9cb33f2039812cfdc93e3c7c90f4b6cb4a83ab9d0b822bbd12f86d01474aa3b65e5d6b19e55a51e869d2d10e5fefe
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
index ab5abe6b0e6f..523205c4a2da 100644
--- a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 631cce6b7efd..9d7c6553ca42 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,6 +1,3 @@
-AUX ounit2.patch 4792 BLAKE2B 8580b9163dcc86993a9830b015e894fa83b136a1fb4f6c57b7feb0b398821d4ce508a45954ad5027795933dfee26861144169a680a09c65ab9d2e7fc6cc9cdd5 SHA512 00757a492c6137bab95bbedada4632b3279c65512d4035464d66e74629b2b47261f797ade6618175141252da04a14cce941132aa77a2b9922e3b08d9c496a385
-DIST ppx_deriving-4.5.tar.gz 45886 BLAKE2B 257bacda986a3830e3efd55b8e97d8c633b64740a36c7954c7b13ef42578fef8795f268e709a2b7285fa3dda1297afe7cfcc277da8557ed654dda6401a550680 SHA512 f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b
 DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
-EBUILD ppx_deriving-4.5.ebuild 693 BLAKE2B 4fcdc841312d2de7d44a9f1cbfd9ff397e999f2f123de1d5f09cc161af291e597a11fce9b43c32aa007f2233c3efa27ff73373d610abae67e814835945761e7b SHA512 3e19d8a9e8f348cf56696c4bc5878c074543523cc4bae3d4f47095faae45516c21d67636561aba8f592b7bb9a765956f8a4d462679cfcb7657f41b506471aa54
 EBUILD ppx_deriving-5.2.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
 MISC metadata.xml 424 BLAKE2B 1fe2e79c56e42f16e52478d935a44f69e665dc2910bfd0012bd085c94c3d35ce778a78cf6ab28cdc09fc3d6e5da051de6b3199f5e09fd6982dcbb83cfd3c24e2 SHA512 62b95e039b84dec56f36ea733b8bc766f392b7889fbd2604f933f8df9f9e743d42ad2ee670af2479d6836b705495564eb392d8794371934556f819813c2fb7ab
diff --git a/dev-ml/ppx_deriving/files/ounit2.patch b/dev-ml/ppx_deriving/files/ounit2.patch
deleted file mode 100644
index d81231557c97..000000000000
--- a/dev-ml/ppx_deriving/files/ounit2.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: ppx_deriving-4.4.1/src_test/create/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/create/dune
-+++ ppx_deriving-4.4.1/src_test/create/dune
-@@ -1,4 +1,4 @@
- (test
-  (name test_deriving_create)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.create ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/deriving/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/deriving/dune
-+++ ppx_deriving-4.4.1/src_test/deriving/dune
-@@ -1,4 +1,4 @@
- (test
-  (name test_ppx_deriving)
-- (libraries oUnit compiler-libs.common ppx_deriving.api)
-+ (libraries ounit2 compiler-libs.common ppx_deriving.api)
-  (preprocess (pps ppx_deriving.ord ppx_deriving.show ppx_deriving.eq)))
-Index: ppx_deriving-4.4.1/src_test/enum/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/enum/dune
-+++ ppx_deriving-4.4.1/src_test/enum/dune
-@@ -1,4 +1,4 @@
- (test
-  (name test_deriving_enum)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.enum ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/eq/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/eq/dune
-+++ ppx_deriving-4.4.1/src_test/eq/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_eq)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.eq ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/fold/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/fold/dune
-+++ ppx_deriving-4.4.1/src_test/fold/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_fold)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.fold)))
-Index: ppx_deriving-4.4.1/src_test/iter/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/iter/dune
-+++ ppx_deriving-4.4.1/src_test/iter/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_iter)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.iter ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/make/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/make/dune
-+++ ppx_deriving-4.4.1/src_test/make/dune
-@@ -1,4 +1,4 @@
- (test
-  (name test_deriving_make)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.make ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/map/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/map/dune
-+++ ppx_deriving-4.4.1/src_test/map/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_map)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.map ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/ord/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/ord/dune
-+++ ppx_deriving-4.4.1/src_test/ord/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_ord)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.ord)))
-Index: ppx_deriving-4.4.1/src_test/runtime/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/runtime/dune
-+++ ppx_deriving-4.4.1/src_test/runtime/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_runtime)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.eq ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/show/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/show/dune
-+++ ppx_deriving-4.4.1/src_test/show/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_deriving_show)
-- (libraries oUnit ppx_deriving.runtime)
-+ (libraries ounit2 ppx_deriving.runtime)
-  (preprocess (pps ppx_deriving.show)))
-Index: ppx_deriving-4.4.1/src_test/api/dune
-===================================================================
---- ppx_deriving-4.4.1.orig/src_test/api/dune
-+++ ppx_deriving-4.4.1/src_test/api/dune
-@@ -5,5 +5,5 @@
- 
- (test
-  (name test_api)
-- (libraries oUnit compiler-libs.common ppx_deriving.api)
-+ (libraries ounit2 compiler-libs.common ppx_deriving.api)
-  (preprocess (action (run ppxfind -legacy ppx_tools.metaquot --as-pp %{input-file}))))
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
deleted file mode 100644
index 47ccd56be1af..000000000000
--- a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Type-driven code generation for OCaml"
-HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
-SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-ml/ppx_tools:=
-	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/ppx_derivers:=
-	dev-ml/result:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND}
-	dev-ml/cppo
-	dev-ml/ppxfind
-	test? ( dev-ml/ounit2 )"
-PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
index 95ae1b416644..584a6fe73bb9 100644
--- a/dev-ml/ppx_driver/Manifest
+++ b/dev-ml/ppx_driver/Manifest
@@ -1,5 +1,3 @@
 DIST ppx_driver-0.11.0.tar.gz 9157 BLAKE2B 053e710c3d8cb6096c893bd5308fbe2b4563dfb2de3c006402ae363aed60db31a3bb1b7656f0565ce13d88368d8b6bef68658f81190dda397562d462828618f4 SHA512 d7ef318f6f0c6e4c56537584bb50b6673b294b67ac264208b7c8b4bcc9d0ca6baf1cbea752459b12d9102bb84a392047c907c65afd23760cac1cc4465ed85ea9
-DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
 EBUILD ppx_driver-0.11.0.ebuild 562 BLAKE2B cefbb4d569843a80cf4ceeaf883abf4e327a315cae57bccadc66019851f492a360277402d58113a5ae52f6189586c32c4daeb41fadad1ef2c1ad4b56b2d444ab SHA512 4d0d99d02640f86514ee70365d94b9c0b9bca05f5102ab0c11e3ca0d9329805b771a7bc89f9dbc1b17bc78110ce7dad92472a32413cd238c4740aac2613ee429
-EBUILD ppx_driver-0.9.1-r1.ebuild 584 BLAKE2B fb729e4ae41008ce616f784cee3a81048c46df5e27050b4118937b7fe71b738cb75813c06db95e161dcd43c587b8659d43e8927c59b9b9057e51ae826925824a SHA512 13c48ae64e7d2c8f2c5e39125873eb573d2aace46ad87989e11bde24d16b3bc4ca47a340322adec8a22834f74495e2f4dd7e6e1436932bdaa45e469f7f46ef91
 MISC metadata.xml 330 BLAKE2B b26e242c2907dec64f194c92a1e3f967cfadba1966632646d2903c2d010d59d45de6ad7da3d7a54a6e380f076bb7f3a6a15fed04d16552f913b1f86a1ed8128a SHA512 754889cdf700f13e44cb022e9d2750c63145b51b792a67e8003162baf40a0f7402835d14f573db348f99137f47375f169232e85a10cd881b1882cd7da1b7253c
diff --git a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild b/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
deleted file mode 100644
index c950b017789c..000000000000
--- a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Feature-full driver for OCaml AST transformers"
-HOMEPAGE="https://github.com/janestreet/ppx_driver"
-SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-ml/ppx_core:=
-	  dev-ml/stdio:=
-	dev-ml/ppx_optcomp:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ocamlbuild:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
index 9208bfece415..d5eeb44b4efd 100644
--- a/dev-ml/ppx_enumerate/Manifest
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_enumerate-0.14.0.tar.gz 9487 BLAKE2B 7f87a1c9c2ae0b365b5fdc44b906ef5330e28586aea741ca51dcddd8b0cf591e28f59e21d4050078c42072b96a96e5c6430d5ade4334d49aeec142db058ee3fc SHA512 d7f61ba792af81395c76e51bcb81b467ae4b67fdc3022d2e55ab0682bb4710e9a96852457721567a9f13606bd4290dbac8fd34421b0dffbabdd9debd1268ecc5
-EBUILD ppx_enumerate-0.14.0.ebuild 593 BLAKE2B d8510bcf7fcf5abfbc4000a8d65eaace7b7a3173e6cf6dfeec7e7412baf4bb5c40b857b01167e4fa2b3d383c71e9cb6d2872bf763e3492375565b9c64f0dc08a SHA512 c3099733d1bfacd1ee14e068de11ba4b13a1baafaec7af72d9a9c822744007ab7533388a4b2f2d553b1bfc51f371b92d83923a08ade83d5d186318822c02008d
+EBUILD ppx_enumerate-0.14.0.ebuild 591 BLAKE2B 8ed5f74aa5c89ddbdafdb46d7f69edeeed0ecb95b8fa7e471cb1bc0308d01ddf9c30c852f815366baff57344fdc004d93f59ae9137512e0e6e36834e283b9735 SHA512 2d24bd5722b71d2aaa3cb10ff2d04311094aacd2ae4aae0339fbebd84876d23f77b186934cb8c31171dc0192784bd5cd92e3e19d2d7ce68d36c24ea72fa14e50
 MISC metadata.xml 333 BLAKE2B 3a42b489d3adecb6f1e0fca9a618da3c7605c75a7c082f6f5994c5cddce8edb236990e70e19972784f63495bfae2976b40445ccfe8ab54f8e995f43f407485f4 SHA512 ce79a07e2dac8be109cb6c0de8ff1c7e88ec520f4ef897311142821d809c2983f7d307d3b74ecd432f2c4c90ad45b1dd3db476178e5297fa212fedb7fd79e47f
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
index 6d7dcb16fe3b..7d6b66fb0ab4 100644
--- a/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 8f7496e8c963..d66f3cfddefd 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
 DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
-EBUILD ppx_expect-0.14.0.ebuild 871 BLAKE2B 681861e155d7e60e6b69a1278b49f6eb78b15554bc70e7606e582a53bf9e98b51979dfbbfa6bfa65c4fa9bc9527a9568141758e6d33e878b4a448f4c6052af6d SHA512 8523056f59a309dc600151e4911db248768ccd2151275af320539b403d368bf7de3774d7784cd148cee1af58d0118794ba9cc904f7f18b63d524109e94a0ea76
+EBUILD ppx_expect-0.14.0.ebuild 869 BLAKE2B 458e3ed359a5a9ca0bb597e03ceed5d6310713de23336b7b3537246218b5687100745aa0c3c55ff7b1b7d931b802419736ac0d93ff9216fd0d36d64bc28f6b9f SHA512 bd12f065567069707760be84f93a850098474ee979f606ee5c8feabb7c99627e409687879c725bcc14959cca602c04fadb55dbd69de9cc46d20c13d853e7c44c
 MISC metadata.xml 423 BLAKE2B 4afccb4025d3128f93e902c5948fa54e2c616c6e1c915913ca08924c587c28f08f83b1750a52ca6bf3143102053eceedb7ed3834bb2499f345343c4430a073a1 SHA512 6d42ac946be64e8159ac5171de263c321d782c604a2c21a0b46e76b68774e6baea8ce168398da506ffa0d745e884d5f42f4753d8c978169134b20f3af10a9312
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
index 305ce345ab0c..b055cba214fa 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppx_fail/Manifest b/dev-ml/ppx_fail/Manifest
index 2fb3ab3620e9..393d9e76ab92 100644
--- a/dev-ml/ppx_fail/Manifest
+++ b/dev-ml/ppx_fail/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_fail-0.14.0.tar.gz 3773 BLAKE2B ef5c7a84808045a9b9ddb78556061ec0d9b04f5b08d5cb4096c353d0e38aa3bca360538efe53cf5faffad6628634d689504c063bbb563790c15a4f3d327f8c14 SHA512 a683430e5cdb50b52846b45d0e25a7b2498f14f34153319cb3ffd30e7b6e493f36790ffc5ea82ec3fbb0281a29e13bb2df10a1754ec32f0e5faad0890b6d211e
-EBUILD ppx_fail-0.14.0.ebuild 578 BLAKE2B 2dd3a2f14e2ab1a1ee194c560f317b50bd9cc21eb4501d4f4e8db42a9e20b8165dd3cc4e176df48f77d7ef6a96d2b5969c974b1b6ba8af823ff4a47616fc97ba SHA512 3856c7fd2943c53f6b46f930c1eb85fd3703e47e7ab69b9ae60f6b9d186bb8db29a44aa0bef3624292c5a6fc2614d9069f98a214b88b5e712d3326db50b12b8c
+EBUILD ppx_fail-0.14.0.ebuild 576 BLAKE2B 936f99444ff26a33c72c3913f579e352cd3ab5884aadf1b3b80d9b9cca28b3bc24491a24cb3fdb4e671cd95ea8268537caf7a0e8dc3ac77f60c353a0a8a66bce SHA512 59d93d5362bbbde1071198e5187f0c7b9f93678ab95142bb225435e57ccb2cb099068c10f22ca67e4705fc9a759a643b9c0d2c24ee1e56d019e23bd9a8d4c5fa
 MISC metadata.xml 328 BLAKE2B d09fe18ea7642f2083ebca4f813869ce5eee47414bf3af2406e52923b195372b7137053ed85fa3a60736b85990c6798f2bc0f1ba69e011094a2f7e4006bcb074 SHA512 5de95d96b1297f11516645aa34c9f9f833c72dd4a640e1b1a800531968765019174366f3264798849765012f1761d8f2177b7daba31ccda1493ed003ac23de1e
diff --git a/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
index 3428894412e1..57cda6df142f 100644
--- a/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
+++ b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
index c09a2e08c1e7..e9857bc59766 100644
--- a/dev-ml/ppx_fields_conv/Manifest
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch 2477 BLAKE2B fa3c0da65865573142d3f552492fbda53f0015297cb5d7899e5b3c0c9f1cfca8c040a3371620a81de6a9bcd5c6983af45567a81e1fd38122f7790eeb58c752f5 SHA512 b18dcd556c4a88035ed3f5367cdc19986960c247114fe5bdb5f78b3f4bfc1486a488b4393d6d8ff4ae78e2b924252e30f234932ca846c5803f7db1e058e702d4
 DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d
-EBUILD ppx_fields_conv-0.14.1.ebuild 668 BLAKE2B be5bf9d0a8070b3fd5d0a5697b084c2623462a81be92d94e423ee2cc8a7fad0883134bef4f8dc9e9b8e4ba6351a3f63c9bd40799986f92e3e3c6ae19b526b7a7 SHA512 36082e5ca41c6fd3ee42da175ccfe50d4d23bb1e2145c6a1e500fea24612b7a2d8484032ce2ee02c00eee84a43fc69c951fd59740dbc14859d74c4208e0ef100
+EBUILD ppx_fields_conv-0.14.1.ebuild 666 BLAKE2B 24decc34d304de85a93bd242fb3315ab3c46e750b236853d58ccc24e7cad07eed86a15cad5faf635acf0bc36cf518118f0ccaff9cea2b1350ecb603700a9f2cf SHA512 603d7bbef438e44e16da1449dc0c6aad3dc7ed1c9ed3ec86e0003ebc04a152a583b5f5875833a491659689c0af8e8f2cbb45f924ca9ed35b5b1f8bb8b67bc4fa
 MISC metadata.xml 335 BLAKE2B e0b5f44d914f2c0f4be92d8dd9bfcc7d31c9611967e3ffb8613020da75f7743626a7a3ca3997ceef4dee553d93a877ca4a4dfc71479f1ef8519de4b7f9eccc69 SHA512 286086f10f94d23ddedabd099ecd0f9a4017e0921fb4fa7bee307a6dc6340a3c54d2d7aa630b7b2f28b496dbddc482ef56916b3d989928f1bcb6540fc8e8a530
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
index 6222abbaa828..862352382c77 100644
--- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
index 58f39b22768b..ed968b94ee37 100644
--- a/dev-ml/ppx_fixed_literal/Manifest
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2
-EBUILD ppx_fixed_literal-0.14.0.ebuild 629 BLAKE2B 5111450fdb8cae3100d3f8c5aae845495c8eaefb5c199311d117684ac43d315d3249df3ec3ec9ca58e025ec3766bc4a2e95b0e91e4339a46e355910c32c476dd SHA512 6c81cb5c31d6c4fb921632097cbd82ca64b23cea7d6ec0d11834a63e9a14b60332734ebb58a3d284a8da1acc3166021582ab53bd01442135f525e59ee8645142
-MISC metadata.xml 337 BLAKE2B 1aaea70bd9122f38e546ff2a48009fd39f2b056adc520249fc8bcb7b6ec19cb35ea5c7e53f0a62d82ab2d27d3c5eaae6b8e5fc8a16e92a8051c2ec2dd79b284c SHA512 d128764c0474937a2edefaaafcd80e59260d5812e4783406e053955abbaeff51cc4baf74acad5349bc7b27174eba629b2b3f7e29f7439e3ce55d47b49d082ef5
+EBUILD ppx_fixed_literal-0.14.0.ebuild 627 BLAKE2B 7ff7953e8ec7122a4e1957cae9b88f057f843131798391059e8647b7b07cef15be23fbd2c3725b143210986f9929ba448a5ee386ffb14f3c5a3b9fd015a329b8 SHA512 86756976d5930aaec4cece8d1d868f4487a80644f034ce540e0946ea37be5da37e9df568ca4195d350de9046b0afa4bdda696b329cca0f909722c64f26e9f57f
+MISC metadata.xml 337 BLAKE2B 34380a09897533dddfd9038fd6fe80bcea19ffa5176c227bc2f6afb15cf7215c10c7eaee0189446ef86a9489dab174a8fe048a33140ae10105158c53c5fe9ae0 SHA512 fa787728a2e1b6184e32251363e8df67121a46711bceaf5b2ec2a97dd2b18c596662448b376266a53fe9775d206492fb7907dc0f4f944c7025f82ababb6a5bd0
diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml
index 257ae7bfeade..bba8ca659214 100644
--- a/dev-ml/ppx_fixed_literal/metadata.xml
+++ b/dev-ml/ppx_fixed_literal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
index dfa5ef596425..11abc0059531 100644
--- a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
index f68ce4641922..110c2ae7cc95 100644
--- a/dev-ml/ppx_hash/Manifest
+++ b/dev-ml/ppx_hash/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_hash-0.14.0.tar.gz 27859 BLAKE2B 0d89eeec154e62ae42ddaff6b0ccdf827ad768e0f19dcdfd4f8b940f594856c8fc036fa02a2462666f2ee4b675e1594837d196fb92cdbb9f8bdf4e171ce90374 SHA512 21d68c0655c21fcd0cecceb8c69e45706b57db160e49c3b112e67cc874a8084946dbae8709ed99f24e7282182c7238cf95ef00bec3ac5a271409e9d5f788467c
-EBUILD ppx_hash-0.14.0.ebuild 700 BLAKE2B cfe896c1a299972393ba55abbf9317dc412604f935c4e9d45cfa891a2cdb5fcb2d77587f7ede0be4cec31ced51807e9fe3c5c7240e4ca9f7d185b6bf870212f1 SHA512 3927eeda58381d91ec7bd60a67d8fa3401f3474f04fa050c698c379ee1d524fc1648897ef5e5f9e2aabd56da091c20f3e3c0cc823c1a07020c38f25332e13cb5
+EBUILD ppx_hash-0.14.0.ebuild 698 BLAKE2B 42b99542c0fb2ca150ac19ce7f38bcb446bd09372b64259e41d30c063638f568d986ad977c05e0e526e9de30c0160f4197a055ba8ecc4c91af32c3eb1a97a851 SHA512 7ff8dd17a993279c0b62a398dcd502a9bd867268d5068e2cc00dd41530ece5b6d9c0be95b5f5411e27a20f24ad996ac4933bbb6fe69c037a6ad579f3da48ecee
 MISC metadata.xml 328 BLAKE2B e3bc65066fc6191e3fbb581975d600b3d163c84a52a610dbee0ce89ea9c66acdb00802dac0106cd01b4ccc6ee5f66586d72f80b9cada5c42b2f2c26dc2d87756 SHA512 68886429b8ef42f0e0c873d2f23bc829b30a1a795c9267f723ab08c6ff2c4a542da653bd00eb8ec4cfa63a5ca8c26f3ab0174919b3dde8c92747ee2891dc3cb8
diff --git a/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
index 8386165b8744..4d7ebf864361 100644
--- a/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
+++ b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest
index 2efef2967335..26c8a5dacae2 100644
--- a/dev-ml/ppx_here/Manifest
+++ b/dev-ml/ppx_here/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_here-0.14.0.tar.gz 5005 BLAKE2B 1711ec047c85af76d2343895e54889fec6e9aa29d4d188e83ff9d9ee12cecf42e4ca968a97f341a818f87efc0cc6ccb7e26f025e8af2195c341cb57325aec62b SHA512 3386e9c727f93be86de1daee2e94c9b7a22bcb4bd0ef20bd2c40ac227723ac36c9ac04fd3e16121731227a9b5256898594e0f33860864edf6f15797b98b114da
-EBUILD ppx_here-0.14.0.ebuild 666 BLAKE2B 65ea398a155c0f9f377fdfe6e807cd3f03a919293a08f6fd9a166b6d7bed1f5b62ebe4242d4027c06a6e311c221081b675addab4721e9c079eabe3bbf49689ad SHA512 60a4c3cfd3a0af40112752d0e6bfcd7355a41a230594e27af101689c7ef28537107c16032549abbd3e60b3cab23cec38ec23fd880251292a898fdc9bd0b15611
+EBUILD ppx_here-0.14.0.ebuild 664 BLAKE2B f3d61eee887a4a7a18a17a5c1cf114f1011a73d2acdde0b2ee360bcac5cacb2860fefdf4fade7362e7330e98c37eb87ea0162e0fd285675ad97976da002f00f2 SHA512 dc1a49525bb36fa18c8bd45eb56e5fc5c8658ad7cdee842d0a61047eee648870469c511ec360a5bc343eced11ead5705817f8f561460a03657492214f0ae50ed
 MISC metadata.xml 328 BLAKE2B 237c41f5203286b25de7ce745ff90b0ba2300827a054fb00cd00779abd0faba6657e0d29f5d6b07e7a318c9759725a029091de2e94e3bc354e172450bff3f1e9 SHA512 695ad950cf7bb20dba1394f7204baa066fd5aeed13415cf0ed4b67c425ab275d35a624d710197ce62e51f414c5ad8e8b32ec1f692f5f87070ba6ecd8d65c8c91
diff --git a/dev-ml/ppx_here/ppx_here-0.14.0.ebuild b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
index 80ed85817c68..a42d1d443867 100644
--- a/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
+++ b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
index 4a18801766c7..f94e27675f51 100644
--- a/dev-ml/ppx_inline_test/Manifest
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_inline_test-0.14.1.tar.gz 19683 BLAKE2B f40e462d8eca18734883fd0b8777a9c69c0cc2741df8e95ade64685ea0b8d51dc614db6a4e93016fec0e2b521ea803a52b85d4b6e030239f6736f4f89da5a721 SHA512 24bda655ae8e1110d9550730281ab908a1795b1412545717a06e01143a80f92ba0a9d42cb20c4c9283f0725003a5c41c187bd46732ef2dd724a4714d9d41814e
-EBUILD ppx_inline_test-0.14.1.ebuild 697 BLAKE2B e7eeddfe21b71cd6bba00d7d1bc9a4c42cb88551fbbeaa1de9d965fa1a818250812e3abf6453f0f52d9354b24a859b59ae47aa89340c7aebe90b8b8f21988429 SHA512 6746c9906a1c321d221764c3e79187fc40eaccb2f73d089faac5ac609f3396a97d09cded55265eaba7a06f4e9e7cb41ed2766779e7473c0910c13747588d0379
+EBUILD ppx_inline_test-0.14.1.ebuild 695 BLAKE2B 52c70e8f03a892cc604ab8dd5a1727dd8d7a61a40c679a9b965beb7b79186a31bb51069e164faf3344b34f4ea4c3a5eaa74e9bcf4847a9e982e6ce5cdd17fa44 SHA512 56af31a42e48eb98af2b10de9edfc5450d1e9022f515661a0371b317ffe6ec6516286f7655426991ccb4a780c9f52c41b9b88e3e50202649b25c65d2ea3bca31
 MISC metadata.xml 335 BLAKE2B 411e745b4816ad16d72cd6a1f2aa65e9764f7bc07afcb48d27e7a72086a231abfef2eaf17ddc3f91a1f5efb71b35ce58321518c2df4d29e89bf94a05e96c67f5 SHA512 d12a744043bf4c3806f26de92e9fdccf972ef02bbc0e904cfcc6f712fd22551ebc0e45bd6c01dd3b6aa781ec19a9a987fc7688b1ab9e73a00221309e454702e7
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
index 01f0f451ec1b..f227e47f512e 100644
--- a/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index 6b21d97cd5eb..25ae226cdbab 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
-EBUILD ppx_jane-0.14.0.ebuild 1209 BLAKE2B a54c66c814cb650a1d5ab7413f397e5ce6d52eaff29279b18c16e9ddb999372d855a3a23b3987c963ea8f0367a5f54ce34c11a11c851240bc0447405caac3cc6 SHA512 335c20cc81cf8ae6c9bb67f8a9cbfa1d24c6c3e7660509cc6042f2f1311121134d68ebb57c64a409db357fca8dc1b36ba5373b7c773d2afea44f94cf4e5f2695
+EBUILD ppx_jane-0.14.0.ebuild 1207 BLAKE2B e6f796e0a99a6f05ec02d066880656647944778175e3854c77d8b57021987c532d779d6020ab8d78eb5de52cba19ab11cda15faea6746380629b3e97b1c25dc6 SHA512 98de1e543c454766f7670c6d46e257c0aa31d1a5b200a610e842fa2d0935786aa78f24bbd6f9d04083312554012e207146f59e02b1f0175b9076539845da377a
 MISC metadata.xml 328 BLAKE2B d5721b2e76d6c81a526a2c1f5fccc7b3b8aa440be22c18e64decd28d640d3358324f9a5343ac6a398054bb91c19514b447eb2215e841ad7af31608e037fb55ec SHA512 a04207d7044dc3a1203beeedee4769be6cb409f228cbe9783161c566ad0920e96125aed62958a3e8ed14c577eef647de22d5c53ded7228173f6d3df7d478d5a0
diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
index 2068749d8da4..41b3332c6a2f 100644
--- a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index 9797aef51fa9..8285b25f270d 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c451c556853aa54d8dbbd7040a76df37ac8942ae05cdcbbe6d839a64d5b471f53a2fce276e547a17e68490c1ec1ab19 SHA512 3561b7668bafc421fa82c3c80e019185924bfc8cafab6ef81299395061db78261005bdd34be5bed8a80bec84306b9294e6398a3a1ee0a269f7b8f3942953a6a4
-EBUILD ppx_js_style-0.14.0.ebuild 641 BLAKE2B 450e289eb856d3f3a9df45a21581544b832684601f4f622269f3f9d67176f491b76bebce9678fbd5f5ea3af6d933c564c43b920a69fa220b1d6dbde360bf55b7 SHA512 4c1dc6b604cda33d5afe3000ba1162fc3be6cfe079397805d9a3b57fb64d99d610a830380d87cd55a85ab744fa6e749d71507002a082c7ada52a1d5eaba984b9
+EBUILD ppx_js_style-0.14.0.ebuild 639 BLAKE2B 332ed8a7de53266f4fa072469728fcb12e5bfab3149a66a266834df0da3b4008c5cb24edf02b3878dcd330f62101e7827f5d3f08b4f646870a6e2f7c85a8c082 SHA512 6737230fabcb79de6c254910c769d57838076655e0c7515ae50166573a6aef48c76a15a1bfd3763668819ea4b4348af7c4a36566a120a6470d36cea1192c79ec
 MISC metadata.xml 332 BLAKE2B 2efc9a64be7da306761ea6261393aa5a6f00d658668791e30f83fd13effcc70d5c3ecea46a49534e38cb9e02402ca9b1d17a699ed1d85ece1177da815048c47d SHA512 8abe379a3bf4e2212ec8566b9ab5fa6f82f5ca522953e12019f97b15c090f05b090a3364f39b62103a3c75c8a4493a7a4a9a112b0cb3acba7677cbd385e2f486
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
index ded2402ef64e..223d5c4cb6a7 100644
--- a/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
index f0c651df8968..26dc26716835 100644
--- a/dev-ml/ppx_let/Manifest
+++ b/dev-ml/ppx_let/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c
-EBUILD ppx_let-0.14.0.ebuild 593 BLAKE2B 0869bee1108b4cb06000323b75e912040f847f472ffbbef747f43cebd6d80903a95b8723aa7ee49f834e63cb3a330184167959220d230249c256c0ae8c05fc2e SHA512 257c72c254f6cffdd2693ac95829ef639e6639fc84404ffc0a75b625adc93885d4b4fcefca580103a377415cba1ea820b8fd3398002177f859ed9204b99d1dc6
+EBUILD ppx_let-0.14.0.ebuild 591 BLAKE2B a98fcafca1ed96553a6f3802704295a4daab9116ebc3239f1d12d3fe7e9bb0e02a497ad4644ebc43e2dbe6cb61ff41f4cb66d06dc16694634f35284381fa61ff SHA512 ecaf64608c25934ad9627e462466217bbf377605b815100b7070568c38f9c44e712d2ff3e82789f2abe209a0061031dd15b4a645939bca4bedad03d6086dfa39
 MISC metadata.xml 327 BLAKE2B 0cd5041ec372afcf534df7c3904b2796f7adae1be8c2ec6b4342b032a7a945b04b395aeb93178ba331b1e44f6d159213cf3c327045805b98961f25fc0cfd0c41 SHA512 15f1f3965d557e5cd2d9a56d5d76cfb0371523f1e27a6c0cc65832c2eab083a8c2129c967e51defe000f76da18b24bb771f1a59e0828307ae9b07d7903486ff7
diff --git a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
index a9a17ea3d12c..4d5ff4dbcd46 100644
--- a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
+++ b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
index cdca20f8c170..e5336796e59f 100644
--- a/dev-ml/ppx_module_timer/Manifest
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7
-EBUILD ppx_module_timer-0.14.0.ebuild 694 BLAKE2B 655ba14e20e5ee1898e5d28c47079587e9aae31f8b1af09d7bdd54169b156b1677edeee409c8c6f8a2807a5c6e6d0a817102a0cc3b0369ebd14060a146207831 SHA512 63a0eeb9a99f49da3b019fdade0ac58b106265a188f5fa556fda70beb493227ac9c137e01e99b21fbac5c5df008894eca1f9aa0bccccfb2d0dcd3b0291b21a43
-MISC metadata.xml 336 BLAKE2B fcd9193e61914fe9c93d8cfe3f70b49d1824f003d1e335ce82b97396d258ab33137f3d4c2d75e6a3ea34fd81b86fb9f246074745eaee78e22103d4a6d7a312cf SHA512 8d07c2758fab53cb742090d7c33fb1f5af751d6e7bd0c2c7e8386590b41125476102451676bddd65d01a536cdbaf2bf86f31f9fecf672566176ce45f11ca951b
+EBUILD ppx_module_timer-0.14.0.ebuild 692 BLAKE2B 258587e1182bc023fe45c2aaf6f065503e8c2d235689bad7efa4b9d9873ee453c8c6f9066b40441819abdd940d84a0b4cbc3e91476cf661fa2611557a45eba0b SHA512 70a2e09069f3accc597cea9196065f82458d487a99a9e725b2f8cc0ae8bd0cf1e32d5889d89f72a537418d12e58d0f8ac9ab64185d63bf39b2e18a42bca7459b
+MISC metadata.xml 336 BLAKE2B 63ca9a1f5c581ff63e36cc764fe40e11b100af59878ea506c8ef86e501ea0a6c43897aea511d18337db4aaedb8d675b9cd8dbe3fb24d611c513cb28a7f814375 SHA512 e48cdddb0c3196fd0ea66e617802124c88cf402a09edc1e3323f243ebe7bf52dd829c64a4977bd9d27d3180a4ecf075a20821d5e6d868918bfb7be13a0999d2f
diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml
index b993e4623ddc..b916abe0f3a0 100644
--- a/dev-ml/ppx_module_timer/metadata.xml
+++ b/dev-ml/ppx_module_timer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
index c4cbb0ffebea..7d37e549cc5c 100644
--- a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index 4319dc359fa4..5bc848ada26f 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d091e9a453d87f9173708c865c419d0d1e89dc315225196ac5e275de7957649ce7c09d056622998aeb3555b274c4e1e6c283193dd6f SHA512 cb50911a137c0fa0efcafdd9bd6cfa0e196c20816e7696bff7ad8aa81d015f18b534c8f0fdf47da0ce4289409cd5fd3b01ef051d3139fd30ac834d91a80ce47d
 DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
-EBUILD ppx_optcomp-0.14.0.ebuild 690 BLAKE2B 44d959ae5e7ae27fec8df9b331129a76e259fc63428075d7b78d56052744d82a90c701821f0aa99c0d1ad482f6425e8664e0c3bf769566b61afbc21a8898460c SHA512 c0f6099d65a593edc4c42e303b48c42da5a39b2348299bf47b58495097045c4c2867144d95837ba9eaf4095db5ec369ee74563d07c745ba19b7b9ea213a40b0a
+EBUILD ppx_optcomp-0.14.0.ebuild 688 BLAKE2B 433e1f96b3758e705bf0896c8b61c88a6a17d6d5b6298beba3e52ac72816374343899fed09b3dababc26f862251267455df400606917b10bd406d31b8dc00f61 SHA512 b393ee83145a552f568d8c7302dd878d02ace806fb158ff7b78aa489500641d0152919ae937f9cddc2912a87f793db7163d186efe5fb4c1a31858b273eadc642
 MISC metadata.xml 331 BLAKE2B 849b5e0d1adf1511346568c3ed8cf159eebca2fa7162f6a128fb67c36e3025664ff8a2965c28aeec97deb37b237ef64af014b87119083a5ed0b2ab322f1f1251 SHA512 5743f8c155c33c49d6e9a3ae4def1849553c8ff74c30e0e0694fbf9a798c4cf74b6c1347596ad7a849d564b6aef2423ddf7fbe25df8f2114548753d5f727d6de
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
index 192dfe96d1f6..c640433257e5 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index 6511114daf77..1afcdb02815a 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40
-EBUILD ppx_optional-0.14.0.ebuild 525 BLAKE2B 7ac241a1fe658836af2b3b74f73cfbc0b5c70c708b35f4d4f7d6afe6bacf02bbaea4c0f75d8c784315b2812d51e363809d60583bf7cd2cb90334b914b93688b6 SHA512 3b8c3593dfc58a652491ac5d2e8b062fd2d1bf93b4ef5b221f12374f14d7b415ff1c41b211ee815e57293a26e11338073a83c173555b76991b199af8b959c077
+EBUILD ppx_optional-0.14.0.ebuild 523 BLAKE2B 4682dabcc4c6f6cc91226d7c33827dc26f74d3618f89c5246b9a8f063a13b143994a3a659d79970a071d08654778a96154a15c2446eaa748fc1d0f7cc7536266 SHA512 99d2529aba45394cf9c0bce1b3c3489c8635821a7c8e74bdc2b42c958c5c4f3b029ba3dacb6587ce051cca64b7d4834ce9e7b90e335781c1bcd24f106c87c099
 MISC metadata.xml 332 BLAKE2B 0824f2e9534fb0da9c6173262e70e59d7734d171ec01c274504636f71ead682799e16f7aa6d4ed90af336f3d68b2668eee86371c6be191903b81147b885ff53d SHA512 9dcc5fdfff88c79298e80a8dac25bd130a53ab4f02fda52336cb753de685d45c7769c8b0a1697e5fe11b78acfbf19e8798790ba4c6e4c697006107762b5f88ee
diff --git a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
index 79616c701504..5ee22661a10a 100644
--- a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
+++ b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index d195b2fc7c9d..0c9488e6b154 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a
-EBUILD ppx_pipebang-0.14.0.ebuild 603 BLAKE2B 2a0b2c447e5e85df77b90adfcfc86809aae910b24b021fc0f1e0d7abfcdbccdb123e7f243478fc736180af919f1e5dced050d4d80df5169c3bbeda3045da3513 SHA512 18ff913ce6420bbb463b76ae47ce937f462baccc98ea2e189b16b09495658fab61d9df48d2ffe1955ec61b0a6d7e90474f3a35f1276c8187889a8d468f4f4f9d
+EBUILD ppx_pipebang-0.14.0.ebuild 601 BLAKE2B b40b294b0f7e9e6fb5ae7b6fc004788ed6a4b9c487d74d50ad11b7679b439c3d33d29c4a3407d486d4332cc1eeb83f4b8e9e42b5ddd71e3b29ebe68c448b376a SHA512 17078bb38053c196d591430b31d9600c52b159c13e61b81d50cc04414804f3415db048a30feacedbc334a762f964936709945fd7d0c83d6b678857987795326a
 MISC metadata.xml 332 BLAKE2B 14afd3db00086d729807a4c4305a3e884ba3ac50c56933ca29e9a9cccc93760b9eea1f2faa70ce2da7a4d682868af4348c6b1633e375a5162a768a440f646df8 SHA512 180f11fe1d90e525f33b0cf5c58e7d75845defa23c0d3b4d1b630e1f264048728f08a0f146912036830185429ff496b716269720f34e5b38528fe242174e6855
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
index da1187d697e5..7889e6653321 100644
--- a/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 6735b6226ba2..50c11ae5988c 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1,6 +1,6 @@
 AUX ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch 1548 BLAKE2B 2adef4e4a978e6a01b9f18aece888ce12c5ad0498411d9072c6ac4787e22d4053e89acff47e22d388305754304989e52c646eb93dc2652a93a0bf9b816c172f1 SHA512 92d4a04e54d290f90699d0c1f59d8805062d3949987787dfa5c033091948ededde5cc1d97d9b0be1b5a0b4168ba7e85720569f72e9de5325e6891357de800468
 DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
-EBUILD ppx_sexp_conv-0.14.1.ebuild 701 BLAKE2B 0fee3dacd8103901206c5b83d7373239db0214b8432bc11c30cfc3fd69e0e8910ba5aaa03013f5ae3981e8196a854b0f7fa4251e6ace1b648402fd62591c6469 SHA512 d0ac12f94a04d060856fdee7e4514e1812b95f110be66a6bb3ecf4be89b4ef721e717bac8d55be1a3b67e8b492b7c34e235d0a488decf341ab95fa8192984b1e
+EBUILD ppx_sexp_conv-0.14.1.ebuild 699 BLAKE2B 629dc5299189676f1535cce0ec12e9230a35e230a975c52f06befd417cd189088afdc25394b070daee6673c7ab246fb15eaa7519d3fac8d3410af1f18ec61ba4 SHA512 2a79625f9d25c80a06e831ea3a786deec6a4790deb595aa0d769fe851b26107c28a69ec9f69f17aa194a328ac24b922481428e21c7f3c75e41adeb86c59fab8a
 EBUILD ppx_sexp_conv-0.14.2.ebuild 712 BLAKE2B 7b4bd7f4d94c354ae22bdeab2a555c6e39772c22d8bdda8cefb1238161def9e9e193248bb2f9f05cb2477564ad2932bdb37a42be14cc47f40e1bcbf2757b3eb8 SHA512 a32b7d862a1b694023c22e068b7733cb5b2474e06c5324ade51d8942558750eb3164e708611e9261683974d55f979aa35d1309dcb992cc915172fcb302a8729f
 MISC metadata.xml 333 BLAKE2B 45f215f8e13fc5d782348eda68fe18a1975f6b1e5a7770b2d6f28429f26314c53d2b6bedbf4f195e5868123b5bf40bf208efcc83c2296399dad4d4fb3ac0b3a2 SHA512 7c1cb3a5c022fef141fe5144f122b4a11d4c4584f76998f47e0c57411ad3e64a545919ebe81939d941358760193aa062a5fe63737072f8e53afc46fae605463f
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
index 5920fb45dfcc..042c0aba3716 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index aa665de0d02b..223b7ff47885 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch 1680 BLAKE2B 0e5af99fccc4cbce9edc29b2f97c93816b7d07f05930e9f64f109c669391fcb745f226335b369221ce704d8c572ae46713446a5c5d4d9ad15bb0657717dd794c SHA512 bdd8677849346b9c1a20991477e84ccc0a886d668008a5bd6febc48603faf649d7c333536a587dfc4c0212802a73e0f7a17e1e0b61ba8168768b8bdb03c6c95c
 DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23
-EBUILD ppx_sexp_message-0.14.0.ebuild 748 BLAKE2B 9040e4351bfa84ba65582f33a85417e41b5e6e21949bb7eb5479a8b2d9197d56631446bc2d51826b4218c4e3f2e3e0e71795570b7b66893e78e5a75563003c34 SHA512 1e9d4307a0e9bafcf0ba421e0c46744fc0e21050488692c8c4597e1c7eb12eccf43ee02c9352f17ef59489b6955c9f3239bae0e9c47891968d2e5c3bfdbc193f
+EBUILD ppx_sexp_message-0.14.0.ebuild 746 BLAKE2B a31a98d9627c3502d5521ab638e8a3ce4b0496de7e79f03eaf4c1cf99a9aae25836f7ee6db029fa064acf8eff6c81259ed420550214b35c11be9337be0386d49 SHA512 b337fa8bb7530678bf900e69ad971164018a42523e6c605a3ba5d6a54086f5a3c8df620fb04ff8947e134744a971a031bf694feb8c0a313e63d20364db847c22
 MISC metadata.xml 336 BLAKE2B a45b57026388e3f2fe8e287bd04c2eb6303d48ad5105853f4700d51bdc118029fed73463e88068af76e520569f4183761c163e9b8bdbb4b6b2941d305f8067cf SHA512 f47319f87ec2fbda8fe70a65e99a427a86711ed75d57ab7365fac6050d00ec919139be5eeb2b3cf7ed82defe6daa65743cbbbb3e9cce3e0dcd122965cfde24d6
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
index 6b3d54b46b6e..0dd048555349 100644
--- a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index 0756991965ca..a70e8de19748 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_sexp_value-0.14.0.tar.gz 7740 BLAKE2B f495d0b9032a73cd6a62292185e77cfe6206bb06564e663c04a20c9430dd4188da529bef6428a7a07309109ec7fc51d3909ac58d5760c1fab618f59eee8a6b63 SHA512 d33ed503025e07588a21ca6796004dd53ddfb9f67f3527d066c4767734fb8723d0a9d31082d285ba82996d8b69faecb624f116046ea8048637f05773ee3e89a8
-EBUILD ppx_sexp_value-0.14.0.ebuild 657 BLAKE2B 72bd9b30a8acb037dd788c4f391da73d8ae8505e0ff87f7877e30ded9a2eda89afd5be976fd2350fbab79dd12060ca65ef44e164ff54b85c4a247ea519151b55 SHA512 788a85a9c8ec9b9682c7118c6aaf588de52163635d60a63607b69428d2632f8874e0833b903fa48bfa0988b96735756c58e27ee628b8536cbcbe6b7c9685fb16
+EBUILD ppx_sexp_value-0.14.0.ebuild 655 BLAKE2B 970e3bc8518e6113f2bfe1b8a3117eae572127b2f4090d6a724aadcc40e1829bbeb1812a4b0a6db6d3659f7cc173dd185c64073c5631d049b3985a1b8ddd77c6 SHA512 55835aa3b86f031717a8a5a97dc282875a74e745a22614da345c11c77020e63cd7273cce6d7a4fc5abfaac03d38fa8b882d3bbb817788f7fd2fdd762098160af
 MISC metadata.xml 334 BLAKE2B c17548f659e0297d185796232a140f6d2a2c85e1d038c056e163d3934224cc4b3850ff03817ae76d4063d4190490d78bafcb43d528b1f0faf6ecd0b84e3c65b7 SHA512 cbb908f8f3ba3fc50735a4b9f7009ebaeac63d9079ac95f861d080bb6a53cd05c53a9aedfa386a60a9c7a6928bd1a4eea34a9c9b6b7d6835ff3ebf37c7aa281c
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
index aa5e54305d58..aac05f0dc7ee 100644
--- a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
index a7cbf6620bbb..8e2ac7288bb0 100644
--- a/dev-ml/ppx_stable/Manifest
+++ b/dev-ml/ppx_stable/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74
-EBUILD ppx_stable-0.14.1.ebuild 585 BLAKE2B c6ddfc184b17bbf6142952303ca55b7ce325c0f9764b41598eff707633f875f7feb1e8782807bd893fa813ca0ad424e60703f96ff5848560fd53f4279208825c SHA512 e557a2c8a5a97b83b47b529a9d4e154c4e3d1bc8f2583da6a379be5b6af33866d5cc219b3e1a32af44879512c5a968f070af9e012cc9fe47a7f256b80927d6d8
-MISC metadata.xml 330 BLAKE2B 3b852bd33543a26c8ec12308502baf80a2a19337135c7e64d62184919ee6de8725f46296cb34e4fb7165d1a7c3962f7cc7b4ec07c4b6c5bd53d8fb6de07e07ab SHA512 edfcfb94e81c48d1ff01524b7c3687a071c95299852fbec37383d6af7ed39be811fc3c3ec0a935f5b1cb2230738a8a3ada5ff8b2c1062c061cf78e46fb417b22
+EBUILD ppx_stable-0.14.1.ebuild 583 BLAKE2B ec3b22fd820eb7b1ceb75855d0c6e0e54a9db2e588545975214668f7a0e9fa51516c4eb22ef937dcc9907e1e6f4d90835daf338942db4d5560fa31ecd6c2590d SHA512 eac6b8b74ae95c57558dd05cd940ffc66eae11453027d36fa066e5fc6daa474df12bdc114300c626f4cd2c886c693d7e30a1f32d688168ddfafb307887265fb7
+MISC metadata.xml 330 BLAKE2B a9207f869866fde8c1559c5a35872bcde90de1b8cbbb1f8e09de6601d701ac15f99faba97f1f7464d17f559460de43d3c4b3e69b58dc52b53e9fd8ded5daa7df SHA512 2b64814e72b26fb8c3679b281cfe2cd403264adb809cb9953adc5e82411b5ab195275d1ece57a531fb433037b65939f5816b7d5c8be17885aefbc6bc84ecae9f
diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml
index b92f10916eeb..0eb54d519244 100644
--- a/dev-ml/ppx_stable/metadata.xml
+++ b/dev-ml/ppx_stable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
index 52084415f542..90e19f0869ca 100644
--- a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
+++ b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
index 713bfa2fe1eb..bb0065f9c7b5 100644
--- a/dev-ml/ppx_string/Manifest
+++ b/dev-ml/ppx_string/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee
-EBUILD ppx_string-0.14.1.ebuild 654 BLAKE2B 839819fa38a4f62f8414347b388e503258518f8d6eccc17f8046afb6ecf4c576189e9b4ab36d5f541f10db32eb76606effcd4e4ee5bb1a8e4e5d9e753ee604f9 SHA512 5194714a5f860268558899c6d4a364ea9ae8ebb4994797e19814e4e1dc682789f22f10066a18ac81d6fba28921acc6929f92bb935cec0e64a3b6c0923d564d60
-MISC metadata.xml 330 BLAKE2B 8a254f960154cdca219a8a0839d20a0b1b59499050aad7a319a14ea9d25488ae8f831522f06ad207e2b54d67ada15c3f8a55ac31fcfff24bbdb7d7992c371681 SHA512 039ca9055143f9795534cb4c0092f6618b7f091e0cef20cd2e831a67318ac20ce7fcc0118f45058c8f4665ca30585f6e6ec87f3a65fabd27dc9d4f3433ed1eb3
+EBUILD ppx_string-0.14.1.ebuild 652 BLAKE2B 5759e77eaa8f7dd892089440e5fefb0a07581b15a53951204ee875153c59b90d65e44995e294b472aec60883c78f99e75a5adef52c2cd96294fd2ba66d65667c SHA512 b0e8ce951303d61325a392487c2d28347c6a878993664c4d84694d17e5e4b2a318a18369d6706bc4f47e16bff51a106a01414106d7342005b61e9a47c33a5a06
+MISC metadata.xml 330 BLAKE2B cb8dd6866f7f31221ab5c1ce02f7f291615be7eed22296a3cd99e66cc0844e381141110679cb13ee5319aa0fb71d30d5d27873a1509a6fb28be4688cc6fbf0b6 SHA512 893b503bafc9493e3e8b7c94e64d828bb8df9ac4f4c9e2383745fca8bd6173161ddd7832f409eac13cdcca42d9bd0770868ff71130d9e280588eccc338de88d5
diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml
index 1350c31c1a0c..d8a1d8c4676f 100644
--- a/dev-ml/ppx_string/metadata.xml
+++ b/dev-ml/ppx_string/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
index 7afdb1228d1f..6d14169a4de3 100644
--- a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
+++ b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest
index 4683fc6660b0..3d901e13314b 100644
--- a/dev-ml/ppx_tools_versioned/Manifest
+++ b/dev-ml/ppx_tools_versioned/Manifest
@@ -1,7 +1,3 @@
-DIST ppx_tools_versioned-5.0.1.tar.gz 43741 BLAKE2B 0ff7dc5a03265a7e9fea6bebe372cee993f35d2d2ec451d5f77a1c7de51f91526bf15817882ff93033b3fcd51014efa12841a92cedf243870a22790f00807e9e SHA512 4d47f82c5a05f880dbb3d10caac6de705b9609c488d62be84eb1ebe22fa8c4e3716fad7c546035e955bd0e304d7940f23df090470f86c8d862b549b9db387acb
-DIST ppx_tools_versioned-5.2.2.tar.gz 60068 BLAKE2B 0b965d2124852e8ea3c8f4187ef320a3054eab4f969bfd64f4bb647e1381cc6f571b74d5176a6da59003ada89982a63b605f45231fb0bbf4ebec7da959e76d1e SHA512 68c168ebc01af46fe8766ad7e36cc778caabb97d8eb303db284d106450cb79974c2a640ce459e197630b9e84b02caa24b59c97c9a8d39ddadc7efc7284e42a70
 DIST ppx_tools_versioned-5.4.0.tar.gz 91817 BLAKE2B 0de64bbc0e7626306389eb350119262e1b1dbf1c643a62d4b2363f06203567e719962fc64727de65aa204a488381f8e48bbbe1243e9908823cb242222162bc88 SHA512 7f0421dbb42b43acc4f7892ac1c4c0ac13bdc188400d308688c4548b228aaf8bd80a4e2294672b50c78ac61e3c8df148c98d16b59f48292f02be40e7fd9640a9
-EBUILD ppx_tools_versioned-5.0.1.ebuild 617 BLAKE2B b3d4adc9fbf220290a43518c1e8b4e492da1b0f436c36a65178cf0d8dc49f74a6827626945c41f4ef60d9276f8b3b690557934ccfa16a7d9f13bb757f241defb SHA512 3b3f4533b733db9df97cdc4e8eadeebd5310d770824f2adf133d1c4306c32b856cb88534a4a6dc08cf6c5e41085a45d693fdf443e3790161087ec4b15f3b560d
-EBUILD ppx_tools_versioned-5.2.2.ebuild 570 BLAKE2B 90d573ae62e77b36775d568ee88d06a04798cb7180e25a6cab992dcc2fb61c068bf8701a2af9fa3f207363b97bf57bef86debbf976b43d842b6ec23ed264b6d7 SHA512 6cdf5d3365e272c7f35b593fa20a88b5bd682c3fd863809d0184a3057f959aced86bd08f6559faf4ca0e465c76cf082d7aff38e3801c0f25f8742d00ec01b2dd
-EBUILD ppx_tools_versioned-5.4.0.ebuild 552 BLAKE2B 0d0bd6faffab1e15af8588cda0c7da4959c7ec9410d1e7ce327a8fd7d16a91fc2ff61c2f8af4699785f620d4c0a85dd238f01752f03fedb4e3b10a3dbddd0d32 SHA512 6c2168c2037c98597d0d3d67b9c5a2f7d4bdad78b69ed184ac68017de8505424ec7f2a460d3349d38468c5983c5d8e181f9965e04299fb194fc8029ea823726a
+EBUILD ppx_tools_versioned-5.4.0.ebuild 636 BLAKE2B d26e979787d28b2bbf049ef6957d75a9539951eec305992d1478df8b168ab147936890f2c363a73cfb1cff8cb05833eeb693692924e9792f467e87c16019cf59 SHA512 2ed3d1a14db7ae726f66e9367bc092a7ea319c50aceffe901d13f4569869a878c850eff18a58e378fe573205c60f1ffe26dfcd0e71330cb39f2ef9fa2bf2ccc7
 MISC metadata.xml 259 BLAKE2B 7eda702609d74350eca7463158eacf7598d2b05f8732a80edd45568034ba1c3d352e61edf401fcafee796b7d2ea04cba596f48d89e7b87550aa38dd09b4fed3d SHA512 ecd1ae1ee7a930abf6b5aad8f2f1004cee8a7cbb75b0a1e5b5c0b6de48b77ad5b415c260e1c374e6a2cad979fc63d2ff552633c012e86c41f417b271aefff15f
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
deleted file mode 100644
index ec7f405d4dfe..000000000000
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
-SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/ocaml:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild
deleted file mode 100644
index 78043c28ed6d..000000000000
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
-SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	dev-lang/ocaml:=
-	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
-"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
index 91702c092c62..3fc8939ea917 100644
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
+++ b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
@@ -17,6 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
+# https://github.com/ocaml-ppx/ppx_tools_versioned/issues/28#issuecomment-694146771
 DEPEND="
 	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
 "
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 45442c01a27e..9b7e03e28a78 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
-EBUILD ppx_typerep_conv-0.14.1.ebuild 656 BLAKE2B faa12181b56a0ca2c0f01237e914d0cf245cd109053eca1add458170f847a0d9b83d66e585a0e247f4a8fbcd64d3ab6882e6aceac63a1c434e89e1f2338f708d SHA512 5c0a97f9f6c679cbb8a615e0613b5dc3b2652ec54b804f656a6ae4073c817ce2ff331881320aa440c173e76571b8a8deacb1b19e4a7f35f4f1e7d65e31e2915c
+EBUILD ppx_typerep_conv-0.14.1.ebuild 654 BLAKE2B 2bb653c4348a9f83308c62bcb518e5db1301fb08e24a88edb7d12a7e79881b514c81e14f64187cb91984e6b67fdca3c2e0c490c7ca78255ad609c5cc69f13944 SHA512 2eeaccc68a922e24e012917bce9e53db806942e9f2583789f078295acd6914e28bed2b08fb43df97de01395ac11d42244ad59d3783fd3eb75333819d6af5c923
 MISC metadata.xml 429 BLAKE2B 5eadb1c68571205a84395f1944c065e3792f0848953bdbcf621dc09efb6dc15dc6d6b801494f96e6a4d214f3789ace26c1d5738cab42c8572c52036e7806b067 SHA512 dcb09e7d73640b136757d18fe35c7dbcbe70bc6f4d2706e2361727e3757045c01d9bc5be6fe1577fd35f34d88c7fde70bc7b9212351b6bf6b0ce153e6a5f2468
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
index 64a51b9c6d81..35c02ef0a8cb 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 2b23820b0276..e7650d7d125b 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
-EBUILD ppx_variants_conv-0.14.1.ebuild 666 BLAKE2B 44feabeeee398aaa1023bec7b4d52c1ab2f1bc00d5d77e461d43218309946ec4f9b8167fca7aeb440d7f6da6cd11e43acf916486f8a59a9e0a7103f81141f864 SHA512 b325606eee1aeff94b4c7ea68f3615e319d7687783cedc0d37a4dde2176863e8847b9db5b5188a6841fd31f994b8ba06d4f04d05384af1a6cea82448d88ac83e
+EBUILD ppx_variants_conv-0.14.1.ebuild 664 BLAKE2B ff37f6685ad3c48f862dcd628d59016eacfa9d8e7740ac07cf0cdea0018080c3279e516f61dbe9cd6c8b4be3dc1bb1e5f493cdb0c041f4a030a8e5bd20c1faa0 SHA512 369332b89c74b0e09f0d69a173150347cc998c7507f4a0f78031e42ecb35a4f40cb04e6b77953afa8a8d379208328d8318ddf5041b794ee679402114d1e4a195
 MISC metadata.xml 337 BLAKE2B 5254872d7404a8e6a56798027330a413825b7fb00b840779d2abd6daf6e59dc6d989fd7023c2e8e94f96e6961e78b99e5d832b3f12811a7162d28d5802ff910f SHA512 a327e1e31bd3a43373bb9146f138a35664d831e41d0bc91d35c9ac986841bd1f9e56fe268a14abb9bd45d53e59ae327e36a6756993733dd8eab70a6af86db23a
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
index 40282deda141..25e5ce54a273 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppxfind/Manifest b/dev-ml/ppxfind/Manifest
index f66dc31d0adf..8eb0abc4a818 100644
--- a/dev-ml/ppxfind/Manifest
+++ b/dev-ml/ppxfind/Manifest
@@ -1,3 +1,3 @@
 DIST ppxfind-1.4.tbz 4083 BLAKE2B 3661827c897a74af21f0d10c9435b74845fc4832cb1b50a510fdf7c33cd877faee5ddcb8307c65903a4692fcb58ca264e0c0b44433a34a59a12f8eb2917e12e9 SHA512 f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981
 EBUILD ppxfind-1.4.ebuild 463 BLAKE2B 9f1b416fd01c6621dd0b56642f6ad9713e34a1697472e01769cbcd2c5bcc11b5040ae34c819a1231750e2398c8cd2f6a9e0f9526556414f58d9ae88fdd32c3fc SHA512 4f87f4d8cb90357d95492386a05e2fe710426fafe0abfb304d53969333c863dd59fe204cde6a700bcbdb165b5be0e4d63be19c289729946a3ecf0c77a33d6436
-MISC metadata.xml 414 BLAKE2B c09d6721562d9bec0edd96a471ebccac898bcf53242d7fe286f6815a946838e416ca33e006a565364017250a52a033184da2cc72056ae16aa67a6d13b4dc93b7 SHA512 737bf56d97c461a15fbc67bc0f0259285cd737dd5b4301af3d81f161a0d0ebb7723f5b2d7ea1bb884ef1377ca838a40bea2db2610d9f46c42831d63d69b8249a
+MISC metadata.xml 414 BLAKE2B 680eb2e62729304a134260905fd085ed8d8bac2c4aef35a3242a568cfff50647d4f7f1f73ae4ad42aea35257c6bc68bcf3530c96c4ffda377372765be510b699 SHA512 fe230575c04c5e9a907b313cb70c2fa1f3005b80daeb9378cf06755b93844620aefb4256f0c4612e35ba3ae4851ae38ba3fdce95c17dceca54f27560ae784c95
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
index a5ded19769e9..a63014b289a3 100644
--- a/dev-ml/ppxfind/metadata.xml
+++ b/dev-ml/ppxfind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 6ae2549d55c4..98351aa8502d 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -3,7 +3,7 @@ DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011
 DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 EBUILD ppxlib-0.18.0.ebuild 761 BLAKE2B 40f8e9ac892537578d8eb96c5429f55154df6309f27a8724c4fbfaa7837066bc0622e814ff4aa476e28d5dff2160d91a50c3ffb77d3657077c775904fd6084ef SHA512 a52e6211ad464a40dd1cfa2487c7c08f6e728882160ea41694298cc9b08fc203aca2e7daa7a33cdd2bad089f3ae3cf41e568396c37630397e8901891c9c2d4af
-EBUILD ppxlib-0.20.0.ebuild 720 BLAKE2B 21a724e49a2261959680c21117fdbf1db1ff1f4efa9fe22f93d05d106e6cf6c6487a7dc39e1022f42df1ff6b85554fee5f256e9fd613d402fb8c0ce4f582e5c8 SHA512 16fa9ca11081147b972344d4db67f54aba9e63aff4e4cd327b2b704661ff31824753119a9a3ed6897145cc61d5cb697430db59b738c1cd98513d8889fdca666d
+EBUILD ppxlib-0.20.0.ebuild 718 BLAKE2B bcbe2675a790ec9efcdeb45d1c94f1992093e61ba128ca58f562cda548a4113ac4b05c7837db8de0974c793a79adfe994ef02e04c216e4d2c0455b40662377e8 SHA512 1dfc324b78552da53e495819c766bba9a3fcb05b2b3ba2ef840bed21bbdf04b781030aae0b267c8190563ca17553034ea4ff050226bfcdecaf32becb6fee03a4
 EBUILD ppxlib-0.21.0-r1.ebuild 793 BLAKE2B 43d4d93deb4341d9f6a2db4649010f825136452a39a8390070f4d759cddba1645f6ac19712103de9ecddc0d0094126203f83298e5705e337a0cab2c05507f6e4 SHA512 f7664fece24435d4d7257a31fad08fa3355a8c83d04bf3901105a6474442d5064c85cb350a88fa9a1bda1a7a821c5ce758c8bddba803a154239077caeac9a6d3
 EBUILD ppxlib-0.22.0-r1.ebuild 824 BLAKE2B 41c8dc3159fca69f1c2dbe7188349e066bf3f4231db9f0b64948f9340b178ba134bdc48bae16edac7109f439fc5dfd676c4f96359ffd73a3121e19585251cb06 SHA512 a83abb94d9b45b2834fc040c588ce55da6b1d942f36b9f93d5df0c861ef3793e926c0a44d2e0eb6dd310b1ff2cf1e6971e0e5740bddbce264a314884c3ab450c
-MISC metadata.xml 418 BLAKE2B 4e11f61bd5b22b4ce2527e5c9910956df486f3e7d341ba6e0936731f79eb866ada1bb54a4a9113854d65683caa3640a2782a1684cf388068b0800e507eae0bf6 SHA512 e7574d67752a664b5619861e1192cafcdf5fa49fdbdf55404992edf261a48b2771e6d3177e6f70238020a8d253f6916b1971d01780724487c910b0ebe29079ef
+MISC metadata.xml 418 BLAKE2B fbe306f8e657c33bda6baae44d70d9c3845ec4740d35447b7f8ffafddc82d95a36f05a13eeffecdc84c81115217d9a1d994a5ab75d83880c1ed838bba25bb46b SHA512 3ba6a3720e58bcde0ffd86650503483b1bbfb8c570d83641827ac8006b3f8c124320cf1403e9a73d9222a094d9b1e4715577bd143fbb0175342decbb34f92d80
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
index 196ba5d9bcbf..41c7d3b61556 100644
--- a/dev-ml/ppxlib/metadata.xml
+++ b/dev-ml/ppxlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
index d099b3ee8c7f..d7f81c1a3a3b 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 04b12824d178..e13369bc6fd6 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1,6 +1,4 @@
 AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
 DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
-DIST re-1.7.1.tar.gz 132948 BLAKE2B 79a3114cb6221742e7e26187080a7029c8e17f728066ce4f4420c0b69be6377bb651f143a97f55f7976074ce9e48913489a51c586f9c79ed6adbcb6c9a595924 SHA512 0df5b0db4c8ab7017576516adbd8edf2e7774afbdca63383cbdb0f2f2b023efb7215366a6679c8810f3b70d542e0181e6b6d4a212b30531cb5d0bef0a6033747
-EBUILD re-1.7.1.ebuild 620 BLAKE2B bcdb6a222cbee47e301d95d2584f0736fdc01c9d6d45acda6d236cbdb483fb0a8ec3cd49714ab0c23ced55dce1e4c712f4f546050cf763d0c728e7e11b1c8f3f SHA512 0d1fa5be3107c7259579be0877c9ea6342fc322dd230a6efa77ac9da3daa63c511f86724077a6c3090183e2cd223d3653d64d047dbbff822be21462fcf841c90
-EBUILD re-1.9.0.ebuild 611 BLAKE2B dcf20503c023305d19bf5f65149fefdb220ce58f54eaf18206264e7d2af5cf6c4abdef573c038a27258d0271e6f16aafba17382aa064b36ee6d02d1eb37e2295 SHA512 dea74e82a70f6c78c3ea7458a7c132a1b3be083d1b7315b4928ddcb0d31f683c8955aff05b90fa06e9b57186ff4fa56a7dd35d18ff609bd567fdffce3a59037f
+EBUILD re-1.9.0.ebuild 609 BLAKE2B 6b4c1fb2172a7206c587046346c6225556264f3daefaf2084d1ebac8cae6e7cd7362df2a1848ba463feefee0b78990e504fffaf93acc66d97801d9a8af8a6be8 SHA512 a011dbec8598f85552ac61ea5095258476c4df9d7ca82b8b1fce4caa6f8ef43b08e3765e39de150f2985895f7f739ad9f74552cf1351589cebf7b9ff9894ab9d
 MISC metadata.xml 416 BLAKE2B 877ee7f0c0ba969e27f1a3a92b45c10eceade5829cd4e5672fd10d49fbb897db3a0ae7d78f5521d8c79c6682179711b26ff601d19cef561de8e2b96f2e0d636c SHA512 accd0aa3847614a21c35f644ce36802938f98257d130da9efb0a2d7fbb140091feea92f8c3613520334cbd55116f16b64d1e10ff80e26dc8f97df83e22aec742
diff --git a/dev-ml/re/re-1.7.1.ebuild b/dev-ml/re/re-1.7.1.ebuild
deleted file mode 100644
index 2900f6f2fc5a..000000000000
--- a/dev-ml/re/re-1.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Regular expression library for OCaml"
-HOMEPAGE="https://github.com/ocaml/ocaml-re"
-SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-ml/ocaml-re"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-DOCS=( "CHANGES" "TODO.txt" "README.md" )
-
-S="${WORKDIR}"/ocaml-${P}
diff --git a/dev-ml/re/re-1.9.0.ebuild b/dev-ml/re/re-1.9.0.ebuild
index fed254d85991..8b9d2f20419b 100644
--- a/dev-ml/re/re-1.9.0.ebuild
+++ b/dev-ml/re/re-1.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/re2/Manifest b/dev-ml/re2/Manifest
index e7debb302521..eebab22d0ee0 100644
--- a/dev-ml/re2/Manifest
+++ b/dev-ml/re2/Manifest
@@ -1,5 +1,3 @@
-DIST re2-0.9.0.tar.gz 388868 BLAKE2B e4a16d9c417099c0aae331adbb09a5b1da597df576232f40d991aaafb751a936f92771df4dc17b869e1b90d86800d0f4313fd51924b0fbb04c1ac8c06961704d SHA512 d11cde52c151486025e05318930253f37312eb6498698ffd3b271f4ba0c83cae0ff8c0c1a11e01b6ab333770400108f3de33fd68f73ab6df1c832e7edffb5e77
 DIST re2-0.9.1.tar.gz 388911 BLAKE2B d6d0673142e2523c0d5fed2c19439bbf7c2ace401558f4c40f0302445492ae17bf67076c4faeb0e25eeb8cc01f463f4804317d4f6a5113586be77df18ec93874 SHA512 a92dc39a1d263dd2bbfad88f0ea0936fcadd1d03cd735d9db151412919713cfb4d8329f1e0fa454917d8faa49480e8dd60af9331b0863548ab267b647bd1e192
-EBUILD re2-0.9.0.ebuild 521 BLAKE2B 4a50fb64a536b6d94fa2ae9e92fa0d797eedc37999ba2bffa9da0767504abd68b53b7273aa251db6f2fe6a82b03306cc8684e68af9810a31e1bf987e85b300ed SHA512 94caa7fb09a0ad87bd3406e5237c9d80e2855ad3bd2e36cad7a9c5103e64f00ea2c5b58509333da0e8afaf12f6aeceeb9a338e0ef022763885a10f736f81285d
 EBUILD re2-0.9.1.ebuild 521 BLAKE2B 4a50fb64a536b6d94fa2ae9e92fa0d797eedc37999ba2bffa9da0767504abd68b53b7273aa251db6f2fe6a82b03306cc8684e68af9810a31e1bf987e85b300ed SHA512 94caa7fb09a0ad87bd3406e5237c9d80e2855ad3bd2e36cad7a9c5103e64f00ea2c5b58509333da0e8afaf12f6aeceeb9a338e0ef022763885a10f736f81285d
 MISC metadata.xml 246 BLAKE2B 71c16ea01f8455f814a717e9bf9e954fdc0d950374a51fb5f6ba39c04a33b24d502d5ba72b1ca94df36d77b61a4a38d3f371d603967539761d836f49ded019da SHA512 575e02776f35b8b43c8ca52139384e0ee642a664685e3dbd85da97a2450f70e62b8604f34be6edb253819e448e08d014a48299cd64806bac792376a6a723d335
diff --git a/dev-ml/re2/re2-0.9.0.ebuild b/dev-ml/re2/re2-0.9.0.ebuild
deleted file mode 100644
index e77c46fb6030..000000000000
--- a/dev-ml/re2/re2-0.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="OCaml bindings for RE2"
-HOMEPAGE="https://github.com/janestreet/re2"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-ml/core_kernel:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_jane:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
index fed3a311f1e6..7223be693625 100644
--- a/dev-ml/react/Manifest
+++ b/dev-ml/react/Manifest
@@ -1,4 +1,3 @@
 DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
-EBUILD react-1.2.1-r1.ebuild 654 BLAKE2B 0e8b94ac08451fc6a55bda1f718c030baf09228e3024af1f89bb9167d185e90b12d4797c1055ae53d4e4e4f23fd4313183c23067dd3511ecf30cbc84a763bbb1 SHA512 b6a768cf787e9cf7f6744931761b002699ccb8322ed5e00ff1b9aabff4dca4d914ca23679b391d5c1277e8d787b98489c1adf96a9dd5a8ce488e36e0ea9ba656
-EBUILD react-1.2.1.ebuild 648 BLAKE2B b880919996694717b60c3fd703dc0b94bde370170cfae93e65078d9756d088d0f4f2e4c4d68e09643140a9685cd274f4300b0f87fce8c8b2f33c959fd2e6748f SHA512 a6bca798f789abf1d6ee227c1e9e30c1287f598cbd0d7b18d1c64af00225c5ff85f2df048d65754efc86061d81b8363fdd6f06fa8d56c17eee88e27729c7542d
+EBUILD react-1.2.1-r1.ebuild 652 BLAKE2B b5c0d6a51fdf2f4b10ca25a254967eae227962c02d69469dc5a07dd001e67713dcd138819a9910b62a5df2982b2e6bbfdcf96f3aacbe46afd63dd7759359d14d SHA512 f2cfabe5c2d6cbcec7b4536b4b446161a3252c9d54181f924b1b4bf8f472fa9a9727da628362d5e003699eb7e5404d6a85a8cf9a5c7f84c8189c96e57a0f23fb
 MISC metadata.xml 803 BLAKE2B 81ae42db1eee6a5ea870a1fb7412bbf7727170dd1e9a42a6bca98ebfccabaeead3423140ebfc7bd04dde30add471de9e950c81a845a1582749302e1218ec1110 SHA512 b23c33ca0645d4c199a6b1d77d857d869d9f63e09ab93238819db8750ff7818d5bca38c6df6baf9c74b8199eca015c0a1bae93c747140d978052ccdc51e5904b
diff --git a/dev-ml/react/react-1.2.1-r1.ebuild b/dev-ml/react/react-1.2.1-r1.ebuild
index 10975bb41ee1..275e826b5074 100644
--- a/dev-ml/react/react-1.2.1-r1.ebuild
+++ b/dev-ml/react/react-1.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/react/react-1.2.1.ebuild b/dev-ml/react/react-1.2.1.ebuild
deleted file mode 100644
index 6ef6b7a499ee..000000000000
--- a/dev-ml/react/react-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit opam
-
-DESCRIPTION="OCaml module for functional reactive programming"
-HOMEPAGE="https://erratique.ch/software/react https://github.com/dbuenzli/react"
-SRC_URI="https://erratique.ch/software/react/releases/${P}.tbz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	>=dev-ml/topkg-0.9
-"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test 'true' 'false') \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
diff --git a/dev-ml/result/Manifest b/dev-ml/result/Manifest
index 90ffbc5473f1..c02ab49af7b5 100644
--- a/dev-ml/result/Manifest
+++ b/dev-ml/result/Manifest
@@ -1,5 +1,3 @@
-DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
 DIST result-1.5.tar.gz 2291 BLAKE2B 76010676aa806fac3766e9ba70b770b3bd01347b1365892beba4c33415d0942a9368f0437ee5a8339b355b939d1625b2fa9c8ad4cf774007637eb51f4b20f11b SHA512 5ca3aab3b46bff7f4fa4517b5d823de196d7a97a8b94a8e416a5e237061482f4d0030c6a339291d5aa8f68020ee11aed743b730970105a2303e6a93d26ca676a
-EBUILD result-1.2.ebuild 558 BLAKE2B 560d9bfb3c44de592e39c47d686245197856938e5252bfd48b7ecb7360ea627bd09eb238bde86a98fd9718ad9953d806018497f6e83a4fd1e197b75e827369a5 SHA512 1aed03ab8fd938812549462d050ac430a9b07833c79444d91f11cacd698308741751981b02776484600ca1a4c71387d192415ebbc423f25ed780260618bd884e
-EBUILD result-1.5.ebuild 381 BLAKE2B 34cf996eb2645cd7f4cec2e7c11dc541584daea7f7a7fb482f52bb5adac76ca82e64db1f1f6297e05101f164abc7a2e3391dee92288b1ac7b060fdf8134cfb31 SHA512 a0f1d73bf9772df02d3b00d90d965d733b750bf99c8f8081f661ad224d4313e18944057fcf889bb7987f1e5f121de7d600ce3124f6cee02f9910cbac7c353ee8
+EBUILD result-1.5.ebuild 379 BLAKE2B fbadfd6a5f7763940f1495302a5a0b89ba65667a335f439f00cd7eebcdaaed325444b56ae1de45a2cf1297df7616ef8b92159021f24819f8af1405c888e5f680 SHA512 bb11d480653513c66ac2090826682f32c28c785ec494102745e2ba08ecdbf9d9aeb497a457ed147ca44a185ca4ede7f26e23ed898d08b9782e770cf972158c05
 MISC metadata.xml 326 BLAKE2B 654b7ffe8dd0fc4cb37f18afd5f9f39149e7244beb54f42688965c5b67eca7093b81d7ba4349e49d66943aef48e69e40a5df83ee2e3869cfb2513e9b836ab3dd SHA512 b667f60e0e7ce8439e7b100b99046324ee1dd2eee5379bafe48334b7bb63aec7f49df08e18a46febd8c8185fd4b0dfcdaeeeb91f11b32354e88264f2a234fb9e
diff --git a/dev-ml/result/result-1.2.ebuild b/dev-ml/result/result-1.2.ebuild
deleted file mode 100644
index 97acf4417036..000000000000
--- a/dev-ml/result/result-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="Compat result type"
-HOMEPAGE="https://github.com/janestreet/result"
-SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/result/result-1.5.ebuild b/dev-ml/result/result-1.5.ebuild
index f1bd1f5734c5..56f5303821b5 100644
--- a/dev-ml/result/result-1.5.ebuild
+++ b/dev-ml/result/result-1.5.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 91228c04f875..42653807674f 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,9 +1,3 @@
-AUX META.seq 137 BLAKE2B e40237cb64a5c1a7378e88d2d0ed186b3c9926453a92321b4cd3769e3e18ed63626484b7181323f6c5d552c5dcebe2a30d9d5305e4d4dfd0c110d5636d6b0f7d SHA512 1ad76cc25bf663d5d35e5ea9057bff11e7882d8ddc4367b6e38a761df0aa7a8fe76de2fe3b7080a575572dad26556261a05f6044906d7874df89e0157e35e623
-AUX seq-0.1-gentoo.patch 309 BLAKE2B c80895e464359e67350ee3f0a183f3dfde63d718775876acad3905446c62dac229ad173b334020f4b2d51807b37d15e526ea98fd3ce2bf27ee8fe751c77c6d11 SHA512 0f93ed7035bc7138518b99471d64cf6144cfd3d4aeb08445a7fc6b2ae631a96a242a1dceaa5014b6503149ad24a1f048c1f0ea435ff38e8c76452f0bafffe540
-AUX seq.install 30 BLAKE2B 4f3676729c9b48eb67adc238eeb6162cb38c0cbae4ba8aff46255987c6dfe64094bb9706a0d8e97ce2a423ff48dd01b426571a2e96ef6a487cd3b6b4beea6020 SHA512 915b9de54aa9e0489876094ed83690c653c0436b4e0ef502ab28aa1133d10f3b30baa190306629ccc94b5bfa837bff4426ed32e627cfad8954d32e0d8536a6e0
-DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
 DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df21d4f0d475f097461992e4619f817ea7ebb20a3023e9d175237d636ed99bb8b1ca7b097c805daffbe8 SHA512 b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb
-EBUILD seq-0.1.ebuild 721 BLAKE2B 9c51848bdd583c605856613c7f80fa5c6c8bff817043cb907dc72450de50c780b1eeb73336c9aa6dab884afc43c97cedb152a2d8abf725901cbaa46011676298 SHA512 9ef41b4d2b1dd58754c85521550dc096e636e5d0e18fae22e8b300b893388594d045bcbbb2b30f83dcf41d1a1e59bef9f1c24f98149f262193645116938d44ef
-EBUILD seq-0.2.ebuild 405 BLAKE2B b5826322c233cc314f95000e0545f568b482baebd95d89a37d05c9cd4fd443d18bfd1c22a9b09c10e86e392580aa6ee642a53f0275e3a6b84cb9e8da87e6d437 SHA512 a9a6ce70ad5852a620c0d90da9dc77e635706df1d3cec41804c7639a878d715ac5ac70a3859ca6cc3645012878af29b62e22281354583b5d3b92eedd405e5425
-EBUILD seq-1.ebuild 552 BLAKE2B 1cc7c58894503841b2288a628505382293865565982ad10e466ee41aefe3823f76d9f7bc8dcc7751ed7539258b31585d75eb7e3d9348cba462ae8795a373dee1 SHA512 663eb04eb4c7ddaf64c72f9d3923410eec0a3d6d2b323de7c15dbdc886fca311b39ca3799f5133849eb85ba2f05565004a750f3290b0026e3292e815fdb98f1f
+EBUILD seq-0.2.ebuild 403 BLAKE2B 8c58bed29e07e93c0515e0208748dbc147a8acbfd0607ad2af1c49fb2981916f01601691e27c0f644c980c984627758a5fa50754b8c3e9d2137cefa3376340ef SHA512 b3cc81ebfe29d816a852cf708da2a0991fc10e2c595031c700736206d80d1c78c0dff59c04f56d3ce0862c06d53fd23e8c31f1f6ad8ba63934f20d7a5e2084da
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/seq/files/META.seq b/dev-ml/seq/files/META.seq
deleted file mode 100644
index 06b95eff3f8d..000000000000
--- a/dev-ml/seq/files/META.seq
+++ /dev/null
@@ -1,4 +0,0 @@
-name="seq"
-version="[distributed with OCaml 4.07 or above]"
-description="dummy backward-compatibility package for iterators"
-requires=""
diff --git a/dev-ml/seq/files/seq-0.1-gentoo.patch b/dev-ml/seq/files/seq-0.1-gentoo.patch
deleted file mode 100644
index 1b3de2b9c12f..000000000000
--- a/dev-ml/seq/files/seq-0.1-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile	2019-07-21 21:17:32.334645928 +0200
-+++ b/Makefile	2019-07-21 21:18:28.565894767 +0200
-@@ -9,6 +9,6 @@
- TOINSTALL=$(wildcard _build/src/*)
- 
- install:
--	ocamlfind install seq META $(TOINSTALL)
-+	ocamlfind install -destdir $(DESTDIR)@LIBDIR@ seq META $(TOINSTALL)
- 
- .PHONY: build clean install
diff --git a/dev-ml/seq/files/seq.install b/dev-ml/seq/files/seq.install
deleted file mode 100644
index c4d70206e13f..000000000000
--- a/dev-ml/seq/files/seq.install
+++ /dev/null
@@ -1,3 +0,0 @@
-lib:[
-  "META.seq" {"META"}
-]
diff --git a/dev-ml/seq/seq-0.1.ebuild b/dev-ml/seq/seq-0.1.ebuild
deleted file mode 100644
index 74a6685d686b..000000000000
--- a/dev-ml/seq/seq-0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Compatibility package for the standard OCaml iterator type"
-HOMEPAGE="https://github.com/c-cube/seq"
-SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-lang/ocaml[ocamlopt]"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-QA_FLAGS_IGNORED=(
-	"usr/lib.*/ocaml/seq/seq.cmxs"
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@LIBDIR@:/usr/$(get_libdir)/ocaml:" \
-		Makefile \
-		|| die
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/ocaml
-	default
-}
diff --git a/dev-ml/seq/seq-0.2.ebuild b/dev-ml/seq/seq-0.2.ebuild
index 0e50f4101b32..2f4f1e6fa6e4 100644
--- a/dev-ml/seq/seq-0.2.ebuild
+++ b/dev-ml/seq/seq-0.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/seq/seq-1.ebuild b/dev-ml/seq/seq-1.ebuild
deleted file mode 100644
index 36f5f1234a69..000000000000
--- a/dev-ml/seq/seq-1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit opam
-
-DESCRIPTION="Compatibility package for OCaml's standard iterator type starting from 4.07."
-HOMEPAGE="https://github.com/ocaml/opam-repository/blob/master/packages/seq/seq.base/opam"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-"
-BDEPEND=""
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}/"{seq.install,META.seq} "${S}/" || die
-	default
-}
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 3be8e1c8195a..5f185dcf8f1b 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,3 +1,3 @@
 DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
-EBUILD sexplib-0.14.0.ebuild 548 BLAKE2B 05df183c710cf26be1824f2e329562ea81781ef57a750ac4de101dbda5aeeea29f00c7bea18f6fb5ab42aa167b66f1d366e3ff574e44f99bbca68339b92d8235 SHA512 b3d7762d5d9b30d9533e86aab5c547df6717778f13e364d62994528bfa912ab1f4e48b6e9754dfea79a0a9afbb3c546efeac83c85562e39a58b3cae6c14dcd34
+EBUILD sexplib-0.14.0.ebuild 545 BLAKE2B 0f3aacaa1d06e4ae269e4a90da3fdb1cbe19ff00d36397f728d20ccb5ae5cafc485a6a830894722178131d7dfb8f5071a222716fe3d1019d5cfba81c93ab5917 SHA512 45d67983dbcb339479cece82786f8258ffb1fd2c9830617f9bac0541dc4926c4952148c6a1d86e09877db5e4c6f94cb101b4e3895ff415c99f1d7b3ac956c6c6
 MISC metadata.xml 388 BLAKE2B 23f492dd7a7797c6277c5dccf9905c219db4c09b178c391acef1c51305e1506622f9b25d3ed04167fc2f660c206e1aea215d9687b2c65c8380a33ea4ed4cde58 SHA512 b542052f955aac7e88fa6dfa85c90b73ed401a79a60dab436274d8dcb07eb8d4876ced76a07b42d8b342327a4287d070c2e72546156bae2ccfd8dcf04fb71f68
diff --git a/dev-ml/sexplib/sexplib-0.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0.ebuild
index 8c27901f85a3..525092b9c5b0 100644
--- a/dev-ml/sexplib/sexplib-0.14.0.ebuild
+++ b/dev-ml/sexplib/sexplib-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index 538db05159be..05ed312f98e2 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -1,3 +1,3 @@
 DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed
-EBUILD sexplib0-0.14.0.ebuild 481 BLAKE2B d2ea4d405787fffb613578f97356a2bc2030dd45847ba43023d2da4606fc07afed894bb4e8b9a27489fc93671372defafeb427aad03e669a9d332740378cad63 SHA512 7967a3438618131324c03839182fcdf54615250d1fe7f7b1fa4052a8549f0c2c1075319b00aafbbe0ef3221f9be5bfd0a7d7eed7fb87d3ab2a2a65a6fa64d83e
-MISC metadata.xml 328 BLAKE2B 3a2077d8c80066249fe3d5401d0e25146e1ed79066f956b3af8e5163b17c79e8bc889cce6b3e8ecd75965111c6bfe574948ec65234b8ac7245042688ba3dde0d SHA512 8803fb7e2bcb8483ca7a3eb32ae4d55ee55c534f9440367c88b1c63c6d77114167c592fb641854f7a9d14e7afa5c374c5350347b6394e5b08f7d49815e57617c
+EBUILD sexplib0-0.14.0.ebuild 479 BLAKE2B cb66fe87f84a2b13e4a93cd1c393d09cb59c0431000e0b302c5cb8c0fda6be1c3eb77eeb214a292ecaa8944d4bbb7924da1be6e8bba112ecc0e2755c7e98ab88 SHA512 3c107e459850ad277eeb064c4302a543d5d75849e40a762b2247eaf47af0eb4e8bec54693eaf7640596b3c4bebd19624a776c720038d779c70de4d43fd2c28df
+MISC metadata.xml 328 BLAKE2B ae60ce4e068ae91b8aed0a8c363395843f666cbe8cc102cd612847db1023829d2cfe8ee0651a5082790ee86c900f5f2e67b3288d4be3057e498c1a1f88fcd528 SHA512 e042bc403d3684f026b5d8413dd73b176c661bf636c88319167336f3b0d6303cdc690459fb326d40c6ef6abe8e4a769e7a2cdf33ae85b197241668f0cac05854
diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml
index e579604e5a49..87919029451d 100644
--- a/dev-ml/sexplib0/metadata.xml
+++ b/dev-ml/sexplib0/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
index c003d63f8e6b..9b306a168349 100644
--- a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=""
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
index d6e5d0e9e8bf..ec4793ac5119 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -1,3 +1,3 @@
 DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
-EBUILD spawn-0.13.0.ebuild 455 BLAKE2B 8a22305c8a814952211825747752b718e6448808a7e6975c237caa80c66c9aa6832e8ee21b2d5479a0377a1d357a7712f013b88344e6a1112769dd911db11b32 SHA512 797ee44588fd5016372ad425a77ef38a92004f50da93b237a078a4cb7a3977c4b68a6dfe186d516598836954570e7002d5443ccb44163a6c91c9510d72fa8544
+EBUILD spawn-0.13.0.ebuild 453 BLAKE2B fd5176e78cbe1bfe8c8f6206c529ad971ed22b165176221cdd2c841738ca1070d3b83e8c58cdc89adf103c0a02ea063ebeffcfcc32bc6f8bc31f3eee5cb6da5c SHA512 e48a10c70d884263948e5ce5c7341de84db98ca53194e451aa64158931df57150a2d754efc06361f463f0465554c5ff5574e7f565b89cdb82dab2d4a35997567
 MISC metadata.xml 313 BLAKE2B a8144e4da616ceb017946a2ff4cf744bfb0f935f5d87fc44e323ad101b25bdae8a5ddbfaf6a6eddabe9c378bc78aed63900ec9d331daf6305c67283c497b9726 SHA512 87762ad2b10550b2fc0722f9b3b68c6beaa0b8ee983380c202c70b239c04a1856bb992b4b4a72388776b12da064c08648f356dcc7fa0aefadaa682875b42c65c
diff --git a/dev-ml/spawn/spawn-0.13.0.ebuild b/dev-ml/spawn/spawn-0.13.0.ebuild
index 45c1bb209e5b..a1f1d0234890 100644
--- a/dev-ml/spawn/spawn-0.13.0.ebuild
+++ b/dev-ml/spawn/spawn-0.13.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="ocamlopt test"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
index ff4c577262a4..eaf31617cbe1 100644
--- a/dev-ml/splittable_random/Manifest
+++ b/dev-ml/splittable_random/Manifest
@@ -1,3 +1,3 @@
 DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94
-EBUILD splittable_random-0.14.0.ebuild 570 BLAKE2B 92c70fd19ae8a382a4638659e29f5a7116ab196cd61211a76cbce3683546b4c821b0fd2796f986ff45459525e6387179d5f1260d25f03efcbb36e4d9edca5f93 SHA512 83ead549b5c1787b4efa8df59f4683eb8dea7568836299c795aa7d80198b92461a19fc3c63c8f04ae6967f4c67d05b38d3db6f90b68bf120f175e629eb8963d0
+EBUILD splittable_random-0.14.0.ebuild 568 BLAKE2B fa813db7d313c3591a676d74167d2df8949e321b1363f58105d4020b2ec83cd4f1a5294335b17bddf7c05dd05cd622955baf386c5ee2b1672ff94b1c39e7a8b5 SHA512 7b865f1d95d87ce8a22974d32739a3d2f76c402d836a7424bedf44935709846c2697ae5dd607b3ecf758485c5e3b8a73344221bd7b09e79cef89c5a670d4be5f
 MISC metadata.xml 430 BLAKE2B 2323c7b20fffd2605de618161fe982795420edd0730d5fcc9f89c976f75437658ddb4f9c6ea3d97d886d9a80a9afed0a8d0fd5c089aa3634aea5ae1d0103290c SHA512 a50abf0618dad0f6a8cc6042351be77c33311485deda8b872224fd287f5f98555c92706ebe649162eac8cfaf5674178859f6d53261f3195257a291ca2e8f4a82
diff --git a/dev-ml/splittable_random/splittable_random-0.14.0.ebuild b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
index ee54d3cff62c..6ece5e89246a 100644
--- a/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
+++ b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 08d97b25a937..7324e1f12ae8 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-0.14.0.tar.gz 7867 BLAKE2B e9aa9727489bf59350fe87323689a5c4f5bf710bb4932b0153c4ad742db5fe03a05728d86c281796cb77d1aef9ba2cc1b236630cb125d1d182c54c344a0ee335 SHA512 74cac04bd6b1be8c13f739445185286a910f66877cb61c8f22b4027dbc3f82021030d55eb7c8471bac850fc7c0f86462a8e26653c7a08c95fb7eea16512c5f61
-EBUILD stdio-0.14.0.ebuild 474 BLAKE2B ec97ce44d3dbe16110b7c1962947399c06d588372a175b74ba67c071b338925c262686d5a54909f3e7546e37814c2e57c4ace99cc3e776d8dbbe61605857a2e3 SHA512 4345a9a243707de83f66fc2407724de16077dd972edacd7240e3f1bd438bb12d48d5e51053bda131542ba2ebcf5ba9e408490dd52d7e04e5e894f2d186e3af64
+EBUILD stdio-0.14.0.ebuild 472 BLAKE2B c54d4980f81a2d29835e824c43ffae0160cfb87a3125c6cc9c4ce20495fff4ba0f3b671277c685866b566847c6211b0fafbb9d8efe4a1a15e79a3d618659791c SHA512 43488b405f611d4bec61e09b15d5709826849f02b43fe003726c4cbd336f26cfb0d11dd48f96a56a33e0f8429c9e4d90c8646e1ded08918db95a4e295dd10e41
 MISC metadata.xml 325 BLAKE2B 9e2084c9f60c4c54c73bff9b53e44fa94847ec3aaaf1e0bef8b965e90efe64c5b43f95f1d4eb096266203cf51b06ddddb8d5106b1895f6b33a5df43608134140 SHA512 c287d74c6ed1a0e22fbfc82198e9e458ad7e340bb45a56a220d054089e71d11241026c849c2ca236cb3c8fd7450dcbf37bfe6553cea621f1c763a712e93b0de8
diff --git a/dev-ml/stdio/stdio-0.14.0.ebuild b/dev-ml/stdio/stdio-0.14.0.ebuild
index 5d922b21da51..be66683fed96 100644
--- a/dev-ml/stdio/stdio-0.14.0.ebuild
+++ b/dev-ml/stdio/stdio-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
index 6298170f2aea..354cc56e7f0e 100644
--- a/dev-ml/stdlib-shims/Manifest
+++ b/dev-ml/stdlib-shims/Manifest
@@ -1,5 +1,5 @@
 DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621
 DIST stdlib-shims-0.3.0.tbz 10163 BLAKE2B 442f07a9b80fb915a0254ba814227798c838f9fa4c6e9a94c4b99c22ca25844f121de235cb758707179275da9200cd45cbb6e68392b0217af97c6e1bb04a13a3 SHA512 1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980
-EBUILD stdlib-shims-0.2.0.ebuild 496 BLAKE2B 295814ebf6c2f12f5ee10434d23b4e808948f541f66222e7c433b66b3ce456c1dd3c48542293484a002d8e20d28763c888f9d0befbae2c7820784611cf55c184 SHA512 78bb2cc328f60f7f798d17db0d148d6dcc5b8398aadeec9092a20648246c59db51047c2ae2d3beb8f10ab1c75931985f90323c3aafe0ef539693d86811951534
+EBUILD stdlib-shims-0.2.0.ebuild 494 BLAKE2B a7d0c4c475cbb22d4525aa9ea9e108bfce0ed399a94a4ad8de49ecf9c329c0c3aa6db7426328db8136d27ead0abcd3cf1cda957d54c67967c536191c5890ae6a SHA512 2951bfb90d39bf477141f17be4f51c9327c793c2515940840869e62e23abeae7586c1dca3d43751a96b852558d27bfe9b0c9d8a80bf4b4432b64fb670718c612
 EBUILD stdlib-shims-0.3.0.ebuild 500 BLAKE2B 36e6915b87f419b81438d29cae60bda9e8e22d6edafd7b8dace20bb48e99e777551762fd7dcb4536172f3b26dfc60513df744852b87b86eb7304ddaff6a11537 SHA512 d5c897e0b0c6f336bf9351f4cb2c2f2496adb42dfaccb8f3951f25da8541eefda46abba29d7fd22f6a4239ef469aa4ff2fa263a300bf5e90099b672c286fe087
-MISC metadata.xml 864 BLAKE2B bcf80992555101e1ba8eb6ca81df5a810b7351e4ce141842082c1981988b0a8529a83971f6f90be2a03cee9ba13a83679c5bfab6ed218e997b000c996ce6a0c1 SHA512 533ee9f2bedd5163669b6e23763ed90eb3ff180465a453e2a5d87271c0f4ac112aed7f073e88acf79eedc0d7495551e4670bfc1256a19053a2c021a91442a123
+MISC metadata.xml 894 BLAKE2B 97a8f415e8b926c1483e4aa32b95bfdccd93277b46d92b826ae46b548e0b34238c848b06215007b4776a44f9ed611216e3d435fbb9409b4dd8e6e3f1b4b14611 SHA512 b95ade77de5084183db144628a4564513fbc817918425d4f686c92e008d5a33dd5e5244466c9ecdbe8a45251d5dc243543e82a2e3d9922d413f0afd32b91e35f
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
index bf7379a1dd2b..f24db56fc6f5 100644
--- a/dev-ml/stdlib-shims/metadata.xml
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -6,11 +6,11 @@
     Pervasives module functions on Stdlib, which is the API in newer compilers.
     Does not add newer Stdlib functions.
   </longdescription>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rkitover@gmail.com</email>
     <name>Rafael Kitover</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
index a55564e154bc..5ce9d879e11b 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="ocamlopt"
 
 DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index 9aa8c5ea4196..31d5cd81b46c 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1,3 +1,3 @@
 DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3
-EBUILD textutils-0.14.0.ebuild 491 BLAKE2B f5c0f076960ab6d36a591a9e4da10149e6504e547fa1512154b74d79a1107622baca88d35b24ec62a1d9539177e30fed37b4352eeb36473f463361b50008fbc1 SHA512 582c2e082758f41d0a58e4026f77ec75fb0f4349b466f1a9848f1e52bedd74800bb39abf7864f722bc565d81e10f3d3bd876c5de36d03a30b9068792a75ac341
+EBUILD textutils-0.14.0.ebuild 489 BLAKE2B 5a42ce7b392b7f50af5d051c7bb8ea8b3e905d892e4d2ae9bd8c7c704f76c5077b62fdd2d3f24d1e37518641900220399e1ea87ef23dcf8e3106ffb4c104a6a8 SHA512 47d2a7f8f7b351315bb725e787870b17c1b954316d0a7999592b85f0d1d5b7c40053163f2c6b0204cace40d9681a175cedf27488fb292746a95401a11e0e81d0
 MISC metadata.xml 327 BLAKE2B d06cc36e2e983cc8cc69227bf433ba4b29bffe8643dd538beb6ce439641c95e05201d1f3e78d7f056d5aa1e6f7565414265f86b0f07e944b65304138214ff64d SHA512 3de39a1111c4ca8ff9bf815403d58cf022562307774efa80974372df9c97bbb6ccdcf4ed08eebc055a444b325615c807fb90975b89da3f8d46c3627300eb022e
diff --git a/dev-ml/textutils/textutils-0.14.0.ebuild b/dev-ml/textutils/textutils-0.14.0.ebuild
index c20aa12fd620..601afef939a2 100644
--- a/dev-ml/textutils/textutils-0.14.0.ebuild
+++ b/dev-ml/textutils/textutils-0.14.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="ocamlopt"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
 
 RDEPEND="
 	dev-ml/core:=
diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest
index da37bb72573e..c215205ba3d3 100644
--- a/dev-ml/time_now/Manifest
+++ b/dev-ml/time_now/Manifest
@@ -1,3 +1,3 @@
 DIST time_now-0.14.0.tar.gz 3666 BLAKE2B 131d4b585ac981fe306ea93f17e332cfabe86a3f8f4564a76e4dc694f9c624e91fe0f0ce26a4ada9fdf0239033fcd29065d76a37e6fb4b79927d116531c04909 SHA512 1b6d1a754e46f1756aa2aad3590e5052999f567630297491d62228ad733b189fbbfc0589b7bafd74e9f77ca0c0421093054e9062d2d5a7d7ed05930be67e9a5f
-EBUILD time_now-0.14.0.ebuild 528 BLAKE2B a9e8e972c6734fd8e7b3467c0811b974d8ccd2b2dda3c1993ded80c895b545f8f6dea3a0a4bef7b687b9a6ad13843fc81f7df44d8697abe2c0d14ea8f3f26fab SHA512 76df30ae1824a162ff98df9f8cbbf4b14e80b67b2a689faccf48210c15b5ac1fc38cbaea98428dc03fce3fe0de1fdbae78b3d0276e5f3e521ffb49aefe5a67f2
-MISC metadata.xml 328 BLAKE2B 563dcd4d5d36906144c5cfd7aedbf719431104073eda4634b914e76f72083ee174989c40e169495d376f9e7d92ff2f52a76d5481a6b27eec99c6288a5a7b2304 SHA512 827e7f01c055215b6b0dff4cd4d652d10ff84e26b5919da370a16c9c256e965567bfe07b5300d8758e335e0b7bf779230eb0fcd8860a148a89b1f1e1c664a0af
+EBUILD time_now-0.14.0.ebuild 526 BLAKE2B cd2e65998bd1211069f2662683779c4f2c211c05664836719d045ca1dcf9f20436577d1028c701af5689723854c47bb5d640c1408672621f73e539ba40e2ff30 SHA512 6ff347007f2e5578e294c6e9d6e4072054a33608b1a46cb6a1cbf12c5a03feb41fc4b99fbc32eced8ef42aa2ed8fa6b1892c11448675feb6a9e7905773ebf4db
+MISC metadata.xml 328 BLAKE2B 7bece66d8bffdc60fe19322d0bcbb3399014a8d0c02e369225ddf381bba64832eadb90a348e287deaff33e07b6ae2e4245e92b32be56c94da9d9306435a83cd3 SHA512 6520a6d79931c9ba0ed6a6962767ea01dedb35d3cef816fa3dca0ae4286f2cea6f2ae1b62a85c3345b50a8f28b36b2265dc16b078966a1c1b9a0211723d08761
diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml
index b78a86fdab86..7f3d529ba9a3 100644
--- a/dev-ml/time_now/metadata.xml
+++ b/dev-ml/time_now/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ml/time_now/time_now-0.14.0.ebuild b/dev-ml/time_now/time_now-0.14.0.ebuild
index a813f66ff26a..57701709e5d4 100644
--- a/dev-ml/time_now/time_now-0.14.0.ebuild
+++ b/dev-ml/time_now/time_now-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
index f21adbcf7f08..07ea3296df1b 100644
--- a/dev-ml/timezone/Manifest
+++ b/dev-ml/timezone/Manifest
@@ -1,3 +1,3 @@
 DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5
-EBUILD timezone-0.14.0.ebuild 467 BLAKE2B c265449cad3e8af552a26d070de2986a2b6d53c2a50a52a6e33b53289b7a2c0827a10f5d66cc6eea88270db798380122f41c6e14f272137c791b77917d7158b9 SHA512 d50d6371213895cf117d8738f9765ef7a1cb3a031ed2e149d51ef6fc30ec4c556691e5078b9b697a18fa1a7fa6f7e8107277d9276d6290c9a6be7f40eadc61ed
+EBUILD timezone-0.14.0.ebuild 465 BLAKE2B fd5f71c7613b996659bcba8b3d52149a5a72d81cc3ad9a22443eb445e6e68f3c1d5e5cd9cfe4725c5150aa96ec79da7d17a6851c966e4578881124e6a230fe6e SHA512 67d4a470d9c347214f54325f764e03e52e0c49f1dd543c382f127549efd67421cf6a623d1c771095ad9d46ef001d454851170eb2655c3c4e40c98351b44ddaad
 MISC metadata.xml 316 BLAKE2B 0420d2ac2e256fe77d345a1d94987fb49548fbeb41253292ea9f8ea3a751af2059eadcad46e3548b8430620d5cadff55968992b703bc3e9c0b4f63d374376763 SHA512 b0c3fcadaa449d24b6b977aed28906c9af8a664829181a67566da48e17379f7df703427cc2a09b22e91eba0996bd0051e4d5a98dbc28c7ad76d87428dd334372
diff --git a/dev-ml/timezone/timezone-0.14.0.ebuild b/dev-ml/timezone/timezone-0.14.0.ebuild
index 023d688e6b60..96fff0a6988c 100644
--- a/dev-ml/timezone/timezone-0.14.0.ebuild
+++ b/dev-ml/timezone/timezone-0.14.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="ocamlopt"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
 
 RDEPEND="
 	dev-ml/core_kernel:=
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index 0874b3369bcc..4c6cf42da9e4 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,7 +1,3 @@
-DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb
-DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f
 DIST topkg-1.0.3.tar.gz 122302 BLAKE2B c3c583fe6d9c6602c9eeae6ba76f0b8e1eda754cb2ffed8f6a9b51eeea53a2d16ad0af5bf3bf1f257233481efd1e7fecfca7185773dcb4258f6a0a8195aaf61f SHA512 b4f3393b142c5c2d71bb4a25f5af020831bd48ad5c354b68cf5a2df2044b534024f0568da93ad26ca383c97ba4277b4878dba7ce9267146f3805c67f52950cbf
-EBUILD topkg-0.9.0.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
-EBUILD topkg-0.9.1.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
-EBUILD topkg-1.0.3.ebuild 918 BLAKE2B d2516c3dd6d6f79f6327ee7f17470c3d78707b0d7bb2634cdb2e86f7fe47c77470e82d694899ea84c1c59b5267501b2c1c90b7f3c822520b5a832af99d203bae SHA512 7a0ca2a97fd0b3ababc3b7a41fe15f2b4e3e818b2eb95fd5af02c42c67979fed0a999446ffc57f0e31c42fdbfe1b21749461ce69611f61c4d99ccfcec618806a
+EBUILD topkg-1.0.3.ebuild 916 BLAKE2B 7dd8e37be175b40619bb839898bdf718f512c40b9da5dcf161ae2450686e69ac4fbcea35dba3d76d529dcc7e31b31fc6aad4ebddf7e636d6067dc10cd2c5c9eb SHA512 142e65e46aff6ea85e88c2eca3a855d1f53510d7200256fa595b7f8dcfa9bf060fb05b456adc234196041c35d8051f4c8ab7ad6ad4e001b2bdc9a99f24e571eb
 MISC metadata.xml 323 BLAKE2B f100a88587e1fed61b21439574a4ab40316daf7389f6ccc48d58dd2c3c52dc78945bfdb68b04759cf27b27ee4830f8f58ed88fb13f1d3b250931cced000f0449 SHA512 d2a20e5e628dc479e33282f2ebd612004040ff05208916aa695db6393f762ab88e3bd19814c25a532b825a0720b6974f9c726d5153d668dca34ac528e4f51bff
diff --git a/dev-ml/topkg/topkg-0.9.0.ebuild b/dev-ml/topkg/topkg-0.9.0.ebuild
deleted file mode 100644
index 773af719a185..000000000000
--- a/dev-ml/topkg/topkg-0.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib
-
-DESCRIPTION="The transitory OCaml software packager"
-HOMEPAGE="https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
-SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/result:=
-	dev-ml/ocamlbuild:=
-	dev-ml/findlib:=
-	dev-lang/ocaml:="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	ocaml pkg/pkg.ml build --pkg-name ${PN} || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
-	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
-	dodoc CHANGES.md DEVEL.md README.md
-}
diff --git a/dev-ml/topkg/topkg-0.9.1.ebuild b/dev-ml/topkg/topkg-0.9.1.ebuild
deleted file mode 100644
index 773af719a185..000000000000
--- a/dev-ml/topkg/topkg-0.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib
-
-DESCRIPTION="The transitory OCaml software packager"
-HOMEPAGE="https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
-SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/result:=
-	dev-ml/ocamlbuild:=
-	dev-ml/findlib:=
-	dev-lang/ocaml:="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	ocaml pkg/pkg.ml build --pkg-name ${PN} || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
-	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
-	dodoc CHANGES.md DEVEL.md README.md
-}
diff --git a/dev-ml/topkg/topkg-1.0.3.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild
index 3b5e20881e4e..15977974d687 100644
--- a/dev-ml/topkg/topkg-1.0.3.ebuild
+++ b/dev-ml/topkg/topkg-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-ml/result:=
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index c55587f3a05c..bdb073f59524 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -1,3 +1,3 @@
 DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1fcf805c30d03e95990ccd6d5fe2f5604931dc213fa921683de639717d288b2eac620cc2a4981cb792a65736e8d SHA512 53b719ee06d06d7833cbe57811fe54d57a36055fa8e4255909273a267000e20628b8b8f6d27c22385753ea461d461f87a1eb1fc9711c52405a89d1493f54f37f
-EBUILD typerep-0.14.0.ebuild 473 BLAKE2B 86764a8040c919be19bacbd12f89543ecca94394699b98f2bb3c33903b489e45e87b8273b6ff1597f8bd3e14e138fa2d99114d5518ad0063a1fe755c27264da2 SHA512 1ac1ab45ba8b3db3ce8a2659e1c675bac78ba3faa9c79d51528195bb1d9a3e37fdce1031e4f568b3cf55637efd4f1bb6bcafe1c02b5e307475bc548cfd19b3e6
+EBUILD typerep-0.14.0.ebuild 471 BLAKE2B e98795a8188d795003d20a9d19115f6375f7e65db0d9f8821eda989be07b8d61b2bc438608434bb47b1d8383c37b57872bf10bbfa0236630acdef81edda2b3c4 SHA512 f5979c75cb9c9e90b34989f46adc8df26bc937043f5578319f75f2f0008f94a714b6e61e63fd48e2bb2a73b02e7ddad3c8960cae678fa846cff379177c4cd2e3
 MISC metadata.xml 420 BLAKE2B 46e5de2aab539049d08de2d9a076cba55f5b16e3de8162da84fa434ee2ec4f445c2c89fa0998db56d50746ebe577bf278c9a5dddf27b7625701a7a5b7508ed34 SHA512 cb92f3d9eda9bc6b99e06c68d8e5d8aad2f624da1e088a9a79a68cffb794c42c36f8498f10d29d70f49903f06b775447a544ace32dd38074479be9d50ba727b4
diff --git a/dev-ml/typerep/typerep-0.14.0.ebuild b/dev-ml/typerep/typerep-0.14.0.ebuild
index 08a8295007a4..9f6f8496d0e3 100644
--- a/dev-ml/typerep/typerep-0.14.0.ebuild
+++ b/dev-ml/typerep/typerep-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/base:="
diff --git a/dev-ml/uchar/Manifest b/dev-ml/uchar/Manifest
index 1035f59d95ac..6453bc56f193 100644
--- a/dev-ml/uchar/Manifest
+++ b/dev-ml/uchar/Manifest
@@ -1,3 +1,3 @@
 DIST uchar-0.0.2.tar.gz 21815 BLAKE2B aede9d42ac2d9ccaa7af2f40799916f30cef0d6e292b7909b5131b5d28c979362b7624a88cec8ba2e7bed1dcada60d8e512ed70d2a02dafcf4ad701c60f6faa6 SHA512 487a9706cf9dfc9b9c94442a51766cc211687d6ebcb4dd3c94d09cb1ed6d7fd61e966e91a4121fe2d1681b2fd6bfee9079d3bccccdb6d65ba2111524ab5dd1bc
-EBUILD uchar-0.0.2.ebuild 1130 BLAKE2B 0555d920a9d50ca417c38f1ef6dedc7905a4f4e727d22f161663f799a175d58f8b08ccbb6d1fcd86515f98d4a3c075e92de5af4d7d37833a2e8bd6095e27315d SHA512 37b53027bad343dab1fc7a311b52efb84b5212a377535f2caab3ce36f5447b4d877b99a4a0d4e723c6186c13d1af8058b16102482bac1cc29ffaeb91e53e3af4
+EBUILD uchar-0.0.2.ebuild 1127 BLAKE2B c714a4723ea009f892c72267b8f9a9a38e782966289b01bee0a265f7ec286a2bb88c934de7d506a82a50264a100e4e7027b95ed6b5462dab37192cda23805520 SHA512 f3bcc18b07877ad85e61b019c1a3c9cbd2cbab5679a90440d5d6e71097edaefdb50070518364e1220756b3125ce8fea018c7438d24fcfff10974280a2b06cf76
 MISC metadata.xml 243 BLAKE2B a3e4f129d7f5796628ecb9265929b0511688445247dbd8b3f27d64f566b8daf072d0ea2512f81f74b1cd143aa3bc3c69c2f02ae81a21cc0407d95e6019f41966 SHA512 14a569797078c452b1fdd7fc67ec59627a62638d8e8570b5f34bd7e7420a5110d0843eb58fca2960a7bc79514c6d26de50bc79d3ca6c4d9accfd0ccf49becc0d
diff --git a/dev-ml/uchar/uchar-0.0.2.ebuild b/dev-ml/uchar/uchar-0.0.2.ebuild
index 35733929699c..6205a24af531 100644
--- a/dev-ml/uchar/uchar-0.0.2.ebuild
+++ b/dev-ml/uchar/uchar-0.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/uchar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.03:="
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 95b3ea43b8ec..4d0c119e493d 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,3 +1,3 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
-EBUILD uutf-1.0.1.ebuild 1563 BLAKE2B 47acd2e5cd8d225d7c2b87a8c25053706dc83d3ee6c7268ba13dc6acb53548a97829354ab3f194d66bad1cac48ea46db67dd2781f681fb48f5893414408b8758 SHA512 b389f00fc16cea814d96d3625216c8c55261bc04d9dcd8352adbf1f6fd643d7564043037e59d128ad4cc2375480c9264a9acd0d3dd3232c1d8a925ba24ba1bea
+EBUILD uutf-1.0.1.ebuild 1560 BLAKE2B 92fe17e6e2f6c623ef664daaab4efefdba780620cf5d88271d837ded7ed80271e0252548beced6b53a5402a2e8b9f81c9e924e4e1bedef153df4cc77aaa88bae SHA512 0100b5357d033991922f481f9fbd03a61352b1795ec0b73e18d7543630bbfacd3959677e6e35aa0d6c18066da259dcba6dfebda4a65c28e747aea9d5a04f0c5a
 MISC metadata.xml 390 BLAKE2B c7f6ffb069cf171a47ffaf90b0bbd742d50baa96260e98b21738651722d3006e176f4bc5223932986b2640aa1f091861c7a027f5b4130ed2af77b7ae1e2701bb SHA512 b23f82ba753956db53103340358857cbdee18bc34ee5d5db86d68dc6f04ea419b3f64df7e5fa54ac84e6122eef7236daebda8fbd60aaa7fa59d45714d21aec4a
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index b4143691ff6e..47b4c9ac86d5 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index 31a8c4efa106..79ec07716a80 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -1,3 +1,3 @@
 DIST variantslib-0.14.0.tar.gz 2951 BLAKE2B a3197f7e06d4340ae73d76d477fd1e0ce038b4829aa3a9d0e0ea3e5251f9ca7c43798005138993a16c860ebf4d08a7e54621359c2a030f3866b62a02de4c326f SHA512 0cb18475668eb8e6091f8a779587f0d643dd0325b0f8518e53469dd12769a3ed6fa4f9c2651a21f8b07992d7b29f6664c4d3bf49f46ed6d7002de07b5014e4f3
-EBUILD variantslib-0.14.0.ebuild 459 BLAKE2B 256c8df230e785f9a3e7fa5bffc0545153e0e7d126957bde9905dac7a5db4406dbfc0be96fc150005062a8c1a54cd0582efd00eb8475865fa37f7b80d955096d SHA512 8ed8887ab90b716f2397e0c78738fd9ff06a68d1693ffb48e967a5892a2f15f00352d681403b0bf962baa2c54522c3b41e468abd9e1268b43e9e833ef49e61c6
+EBUILD variantslib-0.14.0.ebuild 457 BLAKE2B c8c51fb957a2073757b37ebb45a8cb6c280e17776b38b1c8ae925ca7d8f8ab7a6b9463d4524e0053bd556eb5a83e344c88ee28a0718dcfb8c0970857de4fe1e3 SHA512 512bd0062fb8057b696c4c9930d0a9baa0af9fab24ddb3e1f5ead59853708a5a455311e97702cfd73c2dd6a784978095c1dac189b3bb5aa873cd2a13ea66b844
 MISC metadata.xml 392 BLAKE2B 9fac74caa06597173406f1c8296a3ae475a5bcae79285f6183c9848bb334c4c638ec8a27aeb5bd76d3dc4c565fa621735f54410577767f65e7a081160b4916ec SHA512 cf8ff30836ce92efe8473004198b710f0fc9deaeb595ae3666596afca05f4fcf4087f8e1efc2f9e511cc24ccb5093dafe35eef1b2325b83bfae8d15e0111d42c
diff --git a/dev-ml/variantslib/variantslib-0.14.0.ebuild b/dev-ml/variantslib/variantslib-0.14.0.ebuild
index e0db277a3c7f..57f91947614d 100644
--- a/dev-ml/variantslib/variantslib-0.14.0.ebuild
+++ b/dev-ml/variantslib/variantslib-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/xml-light/Manifest b/dev-ml/xml-light/Manifest
index 27e06fa697b1..f26edc7dcab7 100644
--- a/dev-ml/xml-light/Manifest
+++ b/dev-ml/xml-light/Manifest
@@ -3,5 +3,5 @@ AUX 02_cmi_depends.dpatch 492 BLAKE2B 1b6094d0b024c9381ae15e73ca593835bf1f4d3d2b
 AUX 03_cflags.dpatch 1681 BLAKE2B 7d1195efbce6ffa26bcf6e7bc33faa2e27f20991d08ded7a0a6eebc615e99f42d8c58a1092d9db90ecf047398fcc701419f1ca6959876a462922d8956e2d9f98 SHA512 314d30a73cd6a430a367a38b50c10afaf1d307b8ce63795315b093be8500dfb5ddac98eaf5a60f32b047a62f203fa59d9e6dd5c342e7ec7132b78fcd734de51e
 AUX 04_dtd_trace.dpatch 780 BLAKE2B 358cf04728f0d8e7bbe7e29568ebe55b4e07b51217e7a308437ba2dfc202d76ac7cdd8d3fcf40e201124d625249c1a93d5c496a9834f34f7ffa35f872c0424d1 SHA512 14cb78558afeed100e6f085233b001ea5501ccb3020c2437362870031b1a14ad7227794bc81c3de9567cf0d797c0966c515ce56245e429a149f097895c06f771
 DIST xml-light-2.2.zip 22130 BLAKE2B 95b4bc23be63ef5c6faf529877aaf753e3c9fee99948dff82bab5e3206ea718a71ce1e03a2bdba17ff21c040dc8774312ce752c97450f0420681926524864f58 SHA512 b3be968db1ea8b9f8cc439fc8a685083227a7b07469af17c31993229a506f2ff6b1b0cf2097f4198a71e1d858d166f36c99bb26720136633c233a790764087ed
-EBUILD xml-light-2.2-r3.ebuild 1263 BLAKE2B b451f16112c819fd56dc6822db1243d64d069063df2b2df7d885ce061ecaeddf20f78bb1c1aa9b84e1438fea1f3a5c9ba7bdc58b14e4246e7b7535095361278c SHA512 7f3adaeb12b4b8be892e5e2e6fa7554c34f0376bf63fea62b4789cd9ccc602a9dc176ec6da18904ba1ecd7286dd7ea788fd4cc602fe32d27e1d0c7b74ca36a97
+EBUILD xml-light-2.2-r3.ebuild 1261 BLAKE2B 0d990de3a6c4f19042b2bade2d123e5d60d2ca5febd65f37ef714a0d977852e8a9fe6fc265d4590890217ce63abc30f3a53f10ac427976bd558b0e88ce6b1299 SHA512 0645c8c3065ff24bbf74c8e0ef8e7e66a402817767508765faa81e77718cb2c033d9b452d26982849b148e4b6c4750d3cf8cab15d5892a8486d3ecf0841f8e39
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
index 471691f1602d..acc3930daa92 100644
--- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 3be414c949b2..a8e17a81d86f 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,3 +1,3 @@
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 EBUILD yojson-1.7.0.ebuild 768 BLAKE2B d7fc71d5d6c18f70f172fa3d3bf39e16d9b206d17ebff4bda65a9a1779a2b32e454e6912d2aa62db5b8bb29b263bab32503c3ded92526951cad7b9bfa732675b SHA512 6ff1bd5e9122cb8e312b29376efa45bd052900b7639a747674a0bc823644cfdd350e82fdf80956b37d73ab1add4975c59ce8943844a52642d6471fb8bf63640e
-MISC metadata.xml 472 BLAKE2B af78e0eeeff9b5b49523f0ee84fb80a8b159742ae7e2c19c83ac2b78671665b69ced7dfc80dda4e4c09ac9bacab1e5473e1e2e38923d0e570ce44e9fc4f193d9 SHA512 b9aafa0f9b92b182fb031b57409a0c40884a1449140e19edc14f61dd0e5e7a6168b813a8156d21d8120b783b30c141acc8bfa82af22547b98aa59db2db234cb3
+MISC metadata.xml 502 BLAKE2B b903ab96c5cfb53833dd2e338986e78000948dfcdfc0b7411081b6ab5bc50b044451ff490e8b6fa4d3ce823eda74edd5f88cd2453a242259c81f01103b5a063b SHA512 a5d534cbf28775ef1d733b7fc446f6d4202ada623e267c6cb56cb8abcd42f1220ee24c9d6d646a4ed1a4bf3bed42de64e0c6346c84b7f0b2d19b487dbfcb546a
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index a6f01f34da1b..02bc47a8d9a2 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <name>François-Xavier Carton</name>
     <email>fx.carton91@gmail.com</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 150e7b8ad651..2887f1bb6b57 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,12 +1,5 @@
-AUX zarith-1.9.1-ar.patch 221 BLAKE2B 6772e1a5c30a5b9dd6e170860b82e82bd2e5dc5b145d69f20354bcc9fff037098ad03c8365347663dc49499ec72da15f098e186e5b1721f8acb65b7875253155 SHA512 34a5e88ea485ba12b37c7e0fdcd6e21ad64453802fcc48fca39042d52d7b21997888c3c9e76754fe0ceb326dfb2a9a443ba3794b9628ec78f94aa5ea791ffeb2
-DIST zarith-1.10.tar.gz 95543 BLAKE2B 4effafb5a4f90fe48282feb6a3deb07cde4e465c52149d663b1185f82c20ad7e72a02e5965cc3d589ea873f82c33f69dcb47299bbd6a9fa7a6fd686ce14ad61d SHA512 94958feccd3be863b4bcc7887f5108099962402ab6eddbae42420cd04323aafe930dac75c6f1f3d50d8f57cdd2108f1b25546999bac3f03a0a682127d5b67612
 DIST zarith-1.11.tar.gz 98909 BLAKE2B 01deed333dc79dfdb5748c835ef80403c7892e36e461a1c65e5bb97f147b32df2e6cbe8f4e9b916aabc3bd2479bd97439a68d9cdb123d15b7c9ed0e3e7f784f3 SHA512 7c0645d63511d42b763cd0a33b3fb139c26d23ae0cf59cd651388644cb8e7c43a83265d55d69ff3320d8c4586c4f8dbd9c3412197bab2e110c38e6e7dac88b83
 DIST zarith-1.12.tar.gz 93695 BLAKE2B b9622e2f397887d08fb8a8520419cf459e99906c05a897af91258b17d92d3fbbd2314a0a4be8a56a07074dcb0a0d04c896b3b5e69526a6c81a8a07b657d1bfec SHA512 8075573ae65579a2606b37dd1b213032a07d220d28c733f9288ae80d36f8a2cc4d91632806df2503c130ea9658dc207ee3a64347c21aa53969050a208f5b2bb4
-DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753
-DIST zarith-1.9.1.tar.gz 92321 BLAKE2B d61def81600cb5f3ae931eabebcdf081b6025dd24b1deae46a55f5db4f2c67d44b38b9cb9d73fc7fd9bd76c81545294373e3df5969da217209079a2912a8e285 SHA512 e77620c66a59d35811acfc45c7ef3f0d50d3042194654b1f5b652a2ed5fb9d5f88e9173222e5ced286c61854434da05a4d96668089faa66ff2917afa677fc32f
-EBUILD zarith-1.10.ebuild 1470 BLAKE2B b582fe34fbdf05490c4f9b78da27d72030a612793331899339d3a5668a4ba1e87d614449598545b36ed33f142f8e0667f3784c341cfb927cf8332643e1b127fd SHA512 00feec6fbb015cbf954a8af57673984c4d50a664b0bbebc6a72dbc627053bbcc8f4997a5ff3bf347cc0d741e14f657a8b3c21a9d79152386d170db168650bc98
 EBUILD zarith-1.11.ebuild 1349 BLAKE2B 94ba51ff6528da6c29e75920680d596852c403c957755633999f17cbb218ce8af091ff18efec885e6378a1dbcb170001deb82ad1bc955eb738865e3b9bbfd9f0 SHA512 72384da49f4aed3f07e4c86560cef28b40a308a76b3ff7acea064b432f0f2d1f50dc9bfe9bae04215e21359e5569d75b156a62ae4cffc6bfe863dc2d6d9c05ff
 EBUILD zarith-1.12.ebuild 1331 BLAKE2B e5c30054936820f77f807d9d82ff048217a7add76c052a266a5e8e99d0bb3fa18761c632d3e4c12d71c3d8756e86610be56b43c2fe168fcb6d60a331f01de3de SHA512 ae8ae01e1f96f4fa95b2df41a07e01ee112ea20cfc9a75e7e2ae8081b07b47b0eb21a23ee28d6695cca03dc24041a863c11c8fe9fa0c694c8b9ba90e40ffe670
-EBUILD zarith-1.7.ebuild 1324 BLAKE2B 25281d39a44be1b345fab0ba5ff4bd34c1355a2f9bd5a80ffbe8d3d7685bec4ced72865c29a56f69b9db4555a35eac0c752b6752d0083c3d2a018ad50d8e47ba SHA512 33c9759c47aef05c74514d71077b2ab791f83b4d8b46bc32b12b75ddc7032dc4fe5b04ed7690e6a251f54994b5793d0c1c4a5eeb06f53f5eacb5ec5ff18267bf
-EBUILD zarith-1.9.1.ebuild 1460 BLAKE2B ae8dd8e3eb7d55a6ace369189c77dde72d156c830fafa37f74218d0ed4f96ba40867ddf9f6ec7d2ac3ace0c2a62d8e7137f6e63705de28b3ba8f3b3e9fe1d342 SHA512 5abcc22e0cb2a954a24dc0b4fb517c72dd09631b7ba89f64609dbe2c648dbd5cec79ac7f93973d9448f9d081189541e74e17adaae8043031a9ae73e536d8f528
 MISC metadata.xml 384 BLAKE2B 2476ec65036f286fe12f1b64916114abb08792a1c8840be05fe48ba075c9beeeeef5d01ea1a920ca91144fda6d946c86c045c8a853b698bd08d0c02ff93c9bba SHA512 4e0f0e30d6b928341d9610efb0d42717476bb76a897ab3b350782b101cf7a4d3fa5b31d61499552073c987eac1ceb8bc0c9bd9103115f50ee9b52939301ff1ed
diff --git a/dev-ml/zarith/files/zarith-1.9.1-ar.patch b/dev-ml/zarith/files/zarith-1.9.1-ar.patch
deleted file mode 100644
index 122cf0797dbe..000000000000
--- a/dev-ml/zarith/files/zarith-1.9.1-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure	2020-05-17 17:46:29.826822055 +0200
-+++ b/configure	2020-05-17 17:47:37.699808615 +0200
-@@ -22,7 +22,7 @@
- gmp='auto'
- perf='no'
- 
--ar='ar'
-+ar="${AR}"
- ocaml='ocaml'
- ocamlc='ocamlc'
- ocamlopt='ocamlopt'
diff --git a/dev-ml/zarith/zarith-1.10.ebuild b/dev-ml/zarith/zarith-1.10.ebuild
deleted file mode 100644
index 6ae953c8daea..000000000000
--- a/dev-ml/zarith/zarith-1.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib multilib
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.05:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-DOCS=( README.md Changes )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-ar.patch
-)
-
-S="${WORKDIR}/Zarith-release-${PV}"
-
-src_configure() {
-	tc-export CC AR
-	./configure -host "${CHOST}" \
-		-ocamllibdir /usr/$(get_libdir)/ocaml \
-		-installdir "${ED}"/usr/$(get_libdir)/ocaml \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake -j 1 HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-	else
-		ewarn "Tests require USE=ocamlopt. Skipping them."
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a
-	use doc && HTML_DOCS=( html/* )
-	einstalldocs
-}
diff --git a/dev-ml/zarith/zarith-1.7.ebuild b/dev-ml/zarith/zarith-1.7.ebuild
deleted file mode 100644
index 21ad63c4e898..000000000000
--- a/dev-ml/zarith/zarith-1.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils toolchain-funcs
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.05:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/Zarith-release-${PV}"
-
-src_configure() {
-	tc-export CC
-	./configure -host "${CHOST}" \
-		-ocamllibdir "/usr/$(get_libdir)" \
-		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-	else
-		ewarn "Tests require USE=ocamlopt. Skipping them."
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dodoc Changes README.md
-	use doc && dohtml html/*
-}
diff --git a/dev-ml/zarith/zarith-1.9.1.ebuild b/dev-ml/zarith/zarith-1.9.1.ebuild
deleted file mode 100644
index 04d89fe5a523..000000000000
--- a/dev-ml/zarith/zarith-1.9.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib multilib
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://github.com/ocaml/Zarith"
-SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.05:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-DOCS=( README.md Changes )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ar.patch
-)
-
-S="${WORKDIR}/Zarith-release-${PV}"
-
-src_configure() {
-	tc-export CC AR
-	./configure -host "${CHOST}" \
-		-ocamllibdir /usr/$(get_libdir)/ocaml \
-		-installdir "${ED}"/usr/$(get_libdir)/ocaml \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake -j 1 HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-	else
-		ewarn "Tests require USE=ocamlopt. Skipping them."
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a
-	use doc && HTML_DOCS=( html/* )
-	einstalldocs
-}
diff --git a/dev-perl/Clone-PP/Manifest b/dev-perl/Clone-PP/Manifest
index 86f361efef5c..b2f20ff5081e 100644
--- a/dev-perl/Clone-PP/Manifest
+++ b/dev-perl/Clone-PP/Manifest
@@ -1,3 +1,3 @@
 DIST Clone-PP-1.07.tar.gz 9508 BLAKE2B 864239679a7af4362a01b3f250e073daf3751c07de8768793a3d5c0517a4035216eccc69d76b25ec1669b71a799196129f459ff18bd7232922ff8fa23de6e46b SHA512 28faae5dc42ff5ae850fe9f664dca8b52ff77823c5f157c62c52254fa4f1e217d3344f6e79a2ddad169f934e7be262dc79f32e885cb1d25db182050800ac805a
 EBUILD Clone-PP-1.70.0.ebuild 433 BLAKE2B da280e1fff380e39e31ebf163185abeef26ae9f4ab4e6e752ea148dec926ad0b9ea4e9191de02839ee2c68620bfbed6828ef410bcc13db8f682c7a43c3191780 SHA512 bcf0e99fd91c7125a711554fd88fd19f21a1f11479ed828877ca923aae4ab1b9e27eb33560671010edf3b0ad2370c8f6b5db49ba46cc022bfabb51d4d6627080
-MISC metadata.xml 505 BLAKE2B 9d62d88076769145d5a2c29f3439957eb8ffbc6e4dd1d0f39171799bd9bdff1ddb37ee72f4ba4f75233527cb2a75031cff7cceb5a1889d90f24a972c2e355a33 SHA512 55e5e1badd6af0045c0f5b79992026bd30b0f529de15346433293ea7e5c7ec182ae86fcee845803bef6f1463ae35e1d28978fe3111ab077a85e17c72ae360591
+MISC metadata.xml 519 BLAKE2B 2155021673b48902ba1044f0777a79eef87e791a9cfedf3f3fe06aa095e31fc7ec2ed4c4b8735e8bafe7ad4c2910ff8ac6a8065535c1a31a9af86e85386aa25f SHA512 4388a52e4a68f4851549956ebab0a12749e6f0f2d8f0650027755d711c8be7a6cf870da3cb8da8a49f09261a224ab837eeb3354f7002985ba8b42caba4574c9c
diff --git a/dev-perl/Clone-PP/metadata.xml b/dev-perl/Clone-PP/metadata.xml
index e00d4e068ded..31527e4ee29e 100644
--- a/dev-perl/Clone-PP/metadata.xml
+++ b/dev-perl/Clone-PP/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Data-IEEE754/Manifest b/dev-perl/Data-IEEE754/Manifest
index 81ae9d9e0c57..a4dca89b0fe7 100644
--- a/dev-perl/Data-IEEE754/Manifest
+++ b/dev-perl/Data-IEEE754/Manifest
@@ -1,3 +1,3 @@
 DIST Data-IEEE754-0.02.tar.gz 22181 BLAKE2B 1732e8503a2c879fca0486b2c635afbc6d7a4e2c50cdbce5917fffdb0c4611a6b07986b7f6043bd4d84d62f8231f026c63dd6798614692406f6fc2b237b56a79 SHA512 b343489beb45c5540adaf8da3edee39e3cbbe99098212df83b4b341af600990d0568f1455d768cbc234c09ae18afd087218fecdfa64bf2830561bb538b42ab1e
 EBUILD Data-IEEE754-0.20.0.ebuild 513 BLAKE2B 64b16837154929fa23e9e298caa2ca38619481d799027f12f3610e0ec26e1fb26da08533d29b0ec596dbb38becd560f46f9f126c4271418e0fc445fbb000713c SHA512 86165b66dd2cfdd6f9111e854b4425d8e04709a082676f263bbeff96c476a5a7d6ce6b9e8639610c23dcd8d673ca4b401c00411420a1c8ade5a1169b96c32cf5
-MISC metadata.xml 513 BLAKE2B 0e5cfd0fcc2284185d47461eba2a834a2dadd5110b30fb99648b0b6e9417cbb81ea6d05d3aa000e0ee9f24c4e637bab53f61ef7badde4805023baee1ec93ae99 SHA512 755315ef4e3d49455c34a00e13210e528e5ad44bd13363a030e68cdcab41ab93367d36841684fc0329cd44fd285d6143081882cc2467bdf07c49b7fb4b5433fe
+MISC metadata.xml 527 BLAKE2B dd1ac0f64ed54462aaa69863ab2eb8e4bd3861114584e40b1d96e16ced19e5b96a847fd653d87228eae3d7ef105fb4cdbe567ba6dc3b829fcde25471ee68e968 SHA512 67793d5de0020fa216ba8f27aa51c9a8886754f806d71bee879c0b97c4f6631dc75c48a7a9c10f85da4c37c3e6985791e7a48651a22d8aad8350b18540804e81
diff --git a/dev-perl/Data-IEEE754/metadata.xml b/dev-perl/Data-IEEE754/metadata.xml
index 847285dd30a8..978221b60431 100644
--- a/dev-perl/Data-IEEE754/metadata.xml
+++ b/dev-perl/Data-IEEE754/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Data-Printer/Manifest b/dev-perl/Data-Printer/Manifest
index 549ff795a260..1bc11b02a912 100644
--- a/dev-perl/Data-Printer/Manifest
+++ b/dev-perl/Data-Printer/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Printer-0.40.tar.gz 58847 BLAKE2B 04e9f7e682e1b38fadea6b3069f0c2c5e011e8703e2ed553bc609635387755b2c1a7179255fe61283363b26770bd369a6e7ee35e85da2d5663f821e106e950a0 SHA512 9aa92013c4d1f43a654f2e40f797a20f2fc5576d9496bc40bfe4b63e3f2c5893ffb4b83aaeca9c27ca09ab248e18ec44c1a0ca5a34cf140f62522f7adf15f446
 EBUILD Data-Printer-0.400.0.ebuild 731 BLAKE2B 46c74f6d1b87328ed344e101de04295e2cf69311a238948c152e11101262e7392f2780be76c1f3b22cd1e1f0c9ea05ea296775659da5c1b4ef43f2fa1e2db311 SHA512 ba8ba573d5c78f7383dcb44cc81af5b6738ce54fd8508ff734fc8c18f4a6bef7ed992e3e9d02509177f2872edfaaff836a6769fb220e08338ba3b13d2d3aa2ce
-MISC metadata.xml 857 BLAKE2B fc999fb5b994fd679da67222ff1318b19141854c1a693126d94d712bc4cc7ecf3d53d11e735081ab7bdfb5d628bf783c627d0dacdfec417fbf426ff7c4a363f1 SHA512 b2ef3339624d01de828c14a929eafea1c26616d0e71d85ed97e73536c10e0d5386be5850a2563994c5129b3b2626dd802849919f07f02431ecbaf4e0eb2424b3
+MISC metadata.xml 871 BLAKE2B 280f69a967cc57a09c9f95fa5bba0f6557c25981b4c28c53922634b71937f657ed15bbe4d4788802d25211ee58deb6c68cf1d79920ac25fc7e20fcd1d343ee79 SHA512 d5dc094bc9e5608e8298a883dde8e6ac0fed9deb677933a61cf052c9bff9ca4bd269c3dbf58b1a8a80a97ed3462f6aa77c245320d6a7beb9f6b5289fccae110e
diff --git a/dev-perl/Data-Printer/metadata.xml b/dev-perl/Data-Printer/metadata.xml
index 50a4718fb7d6..9444e6327244 100644
--- a/dev-perl/Data-Printer/metadata.xml
+++ b/dev-perl/Data-Printer/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/DateTime-Format-Human-Duration/Manifest b/dev-perl/DateTime-Format-Human-Duration/Manifest
index 2fb4f3513791..d92da8305142 100644
--- a/dev-perl/DateTime-Format-Human-Duration/Manifest
+++ b/dev-perl/DateTime-Format-Human-Duration/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-Human-Duration-0.64.tar.gz 17683 BLAKE2B 4681255fb5609307f87009e60d4309237fe9aa5e5994f4b1d716373396aeec5327db1414184d68cc10faafb80884be973b55d5e2140db2b746c588e95bc8d357 SHA512 2ae94d56e1176adcdb55b2f1291a04e15c50c0116477be18b49f9b95bd3ac0778c0bc280df323df213e3fcd8be25f8d91227be1841ce68b4cfa86be479d34376
 EBUILD DateTime-Format-Human-Duration-0.640.0.ebuild 369 BLAKE2B ab5e98878c691f814c12aac51fe25264810402fe36804c436da4819eab26de66bd94c544f99c1597f433efa26bcdfcd1495013b079a013f3a0f0ad51fc4660d0 SHA512 dc6eaaf28cfb39588f2db3e0e48e4adae4440d3fcd6d00dc115ff7a63606c3451754d9ba318e030b87d16988a70672e7f03c770336841ebe71c49e2baf845187
-MISC metadata.xml 1296 BLAKE2B ef493d3f5ed9532bacb678491c55e5322d49e542430c3a6d868e1658d592e3abba5afb38cd2956cedbcfb0ffd8a6c7b969a7a1c7f2c6060bcf5671d5737bce91 SHA512 bf42d3ca58cb728606d3d3f8ef87c8f9b484ab6fa7fbe43e4e3165053dca20fbc07e103881457ec2c98da6cdfd159c431446d93b3a837966a4ea459ead62a7ea
+MISC metadata.xml 1326 BLAKE2B 2d5f75d8081103031920e31c234af67c04e646a319be62df69c1d54135c030ea29631ff2f3dfa11091753add6f8c8ae4b237efee65e3b533dd3035dce5d0d1d2 SHA512 e97b94f61438b435d5e579016912c6a95de08185d78bdcabf207db10a52c2df4e2030bbc43fa07c801f5dec4883aad76946f7d51dfa1e4fa00da5cc1ff4bb67d
diff --git a/dev-perl/DateTime-Format-Human-Duration/metadata.xml b/dev-perl/DateTime-Format-Human-Duration/metadata.xml
index f7420c9756e0..72a0e1e7b680 100644
--- a/dev-perl/DateTime-Format-Human-Duration/metadata.xml
+++ b/dev-perl/DateTime-Format-Human-Duration/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c.affolter@purplehaze.ch</email>
     <name>Christian Affolter</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-perl/File-Copy-Link/Manifest b/dev-perl/File-Copy-Link/Manifest
index 94b3ae96a0c1..8e856ad44aff 100644
--- a/dev-perl/File-Copy-Link/Manifest
+++ b/dev-perl/File-Copy-Link/Manifest
@@ -1,3 +1,3 @@
 DIST File-Copy-Link-0.140.tar.gz 11157 BLAKE2B 4f751ffef556ac7cedb57bf8189f4e57a1e64210327c9bd28401f52c63437a88418fc41f5c1f8624b7b3bb66496eced9a36a3ed3cc320e614a6b6cb9dfb28548 SHA512 d937d8353c4be3070591c7e28ea177e587326936cea6d84d895d0fd951e663e506c5680f0d8acad756972db7c70147b31078a2e2595bcab4bb56879b97f3c8b1
 EBUILD File-Copy-Link-0.140.0.ebuild 586 BLAKE2B a1e4309b1f3b832cde0d6cbea9fa8c05660e12cab230ee65a246a9a3e0b7c7069a8f63f62ab60d81eff81ff03e0226f5ad0c7047b17451fbe10e6f55c77a59c2 SHA512 5ddc4155f29b4424c2db59b5c915e1df493b764c762ca921ae109c4ac5e78a28e413c733c942665c25530c0f1600ec3d8af1f20151f6875f809120c349848881
-MISC metadata.xml 1088 BLAKE2B 710a32a76fd2672288a982401fbf586fd5df711673e934a1f519fd3b3431acfc33c122e26c57ec2502c4371f75799f805e5bb4613560b221a3681e9479060204 SHA512 e0d27b9ccfaf0a78843c818d7f9ad13da52c2f98cb2c9e732da6c78abb83ece2b1ab47959794c514fbad5834f6d994268427a1ac327a629f039761f69a1c429a
+MISC metadata.xml 1118 BLAKE2B 3bbea820a99a312d55379185d7454c38afa6fff542bef0c6af0ec701b1e01f6acad1c556b6c05d2a4feafa737ac0a5d803eab37f67f4c034b833759f10f6c8d5 SHA512 5bea692c6fcb9f89d3d15c411022125bf1cde17f8a9649b3aea41750e025b041494465490e49a7b38c8ba5cfdc12045b88b27050ef6d1339c650e93d00929610
diff --git a/dev-perl/File-Copy-Link/metadata.xml b/dev-perl/File-Copy-Link/metadata.xml
index 73c28603daa8..edb630008661 100644
--- a/dev-perl/File-Copy-Link/metadata.xml
+++ b/dev-perl/File-Copy-Link/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c.affolter@purplehaze.ch</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-perl/GeoIP2/Manifest b/dev-perl/GeoIP2/Manifest
index 046f0a61e3bb..038665c52bda 100644
--- a/dev-perl/GeoIP2/Manifest
+++ b/dev-perl/GeoIP2/Manifest
@@ -1,3 +1,3 @@
 DIST GeoIP2-2.006002.tar.gz 249915 BLAKE2B c1635de576e0c7f0ebad85bb3d850d6fbc979108777c494ec1685b4ce68b87c895e46df904b9cde5712b9d6aa9f6b341b66c024459f6cf88546f2e6ef6732c0f SHA512 a552c6487b340aa928cfc6ce037724cf0fa98332b731388734bc2b25e7d1a31e2c45c0cd12b6c962b5b483172837587254d742fb04cbcec67586d92dae71e356
 EBUILD GeoIP2-2.6.2.ebuild 1046 BLAKE2B aa40e3b353af03f6a528f84e6ed858a2e677ccb8d5060b4812299bbfe145ff37d694ece23554fdb79a9a677b594d08fefee2166b26d8ccac3100cff59d443759 SHA512 5d96ac6289af197b2bfe33c9e151d5a4a361e075ea594d9fb1ea5969f885496dc82f3c8db8165fd4f192cbbbe8b5af65b4940d2e20b6e30709787326a3db8483
-MISC metadata.xml 2989 BLAKE2B 27618fa92f55207e9a545f9a791ac6cdc347dc6a4f26df5277b0c1981963d125e9347a45cf0cc63272e0d87a1074fa5a6f8161d3dc6b94d4128351773a77c1c5 SHA512 ced2873b6dcc53dd28572c82984acee8529fb9e273549e934670b04528f09dc2279f051fe107e293707900295f48a4bca1def60bfb36edca267564d76fde9e1c
+MISC metadata.xml 3003 BLAKE2B df34e693cf400e78b9a87edf24d10640103896b280e35d11afb44dcd002b064edbe3e74bb5f93370eb7c528584f5eb49f2581056956808a838d3cd6dd45ea30e SHA512 dcb8475c58476624d8662e26fde403b8df2c3acbcc59b919d09c791447c3c86592a329c769a154dfdd986e9d3024c00db5df9eebb53d95961fb2409ab788569f
diff --git a/dev-perl/GeoIP2/metadata.xml b/dev-perl/GeoIP2/metadata.xml
index e3f764df66cb..71ffe600dcb8 100644
--- a/dev-perl/GeoIP2/metadata.xml
+++ b/dev-perl/GeoIP2/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 560c84d00753..25c4c62b971e 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -2,4 +2,4 @@ DIST Gtk3-ImageView-4.tar.gz 14329 BLAKE2B e4dee495e83392cc14e8fbd050658a1647bfa
 DIST Gtk3-ImageView-6.tar.gz 15444 BLAKE2B 1f026895328912443d4e08fbeb2ee9826818c09b00d06f087417f141d2c5b193e13840a09162c47fc5c0d642d0738cf290038a541f5e14303382a14a0245213d SHA512 68fc3371fe3d62163523d81732f0716fe15623a53139e8050e3bddc12c694a9ae2e89855b9926e14b18803e9c7a586b925b613e1cf364cb449b850fe70b571ab
 EBUILD Gtk3-ImageView-4.0.0.ebuild 681 BLAKE2B d34bcfabd119e76879463829d87fbda70d0b1a0323fb6826156a4d36c1f4f441a52b591aaf3e51995bfe446fa973148516b16026bdfb109edf4201017994e9de SHA512 c40ad0ac50852b261eb6ea9ac7d87cfca47ea725a00008b0f84e983e4ac5ffa86c99955708e0fc6b66957fad5fec27891d4af6b156dc922ba087d0feea27f47c
 EBUILD Gtk3-ImageView-6.0.0.ebuild 694 BLAKE2B 3cc1f6b35ac13d0ff603908331432c92f08e920b96fa35b49bf3c466f61581e49504a927c47bd4c7bc684a43b4985fc0ab2013b06e6bcddd7520c9d0a97968d2 SHA512 4427496e10a434ef53268f1036c443e0e44113faeeaaba383f8f6adcd4c3dbc3ecfc5b603364e3376cf8017731cdfb9e0e0e7b108d9d91d1425d4e62c1638bf2
-MISC metadata.xml 922 BLAKE2B 7cc2b876b9e004190d7c8c85718fc9f343f4950f7bd372c3d08c7cde064d0e7097459d4b4a7662a01d737053cb1849c8092939357dc358d83318bd0ab0695cc4 SHA512 9578c565fd1062ccf5d81d5ce4f7bf30fb819682ce404bc5ae69e9e549073c3c8015e71c27a70e8657cb88278c7fe8593b1ac89633d260501be4bf246f5b42ca
+MISC metadata.xml 952 BLAKE2B 767e779369ef5947f563c8fe2bb5592058a4c6ebc29a3be7ca49fe7a2ef586484afb15e46632e6db87e5eb92932602e10cc7a875cd3803537866f5ee1d52dec8 SHA512 a2e7a668fae93388d88a2c2db675d715a720866425f91885702a362e3932ed60ca6b1a08dbef4e44623518d4b9c224948bc51e7db315d8088f3d3a6cdd96b47f
diff --git a/dev-perl/Gtk3-ImageView/metadata.xml b/dev-perl/Gtk3-ImageView/metadata.xml
index 12276aedf7db..74cc4507df14 100644
--- a/dev-perl/Gtk3-ImageView/metadata.xml
+++ b/dev-perl/Gtk3-ImageView/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-perl/Lab-Zhinst/Manifest b/dev-perl/Lab-Zhinst/Manifest
index f86aa98850a0..d8496a1b8762 100644
--- a/dev-perl/Lab-Zhinst/Manifest
+++ b/dev-perl/Lab-Zhinst/Manifest
@@ -5,4 +5,4 @@ EBUILD Lab-Zhinst-0.30.0.ebuild 578 BLAKE2B cad773f6930534a43a067d9ce1add67f875e
 EBUILD Lab-Zhinst-0.50.0.ebuild 578 BLAKE2B 489c3995848040e5941be83c0686d8e0caf627f67a49599f61a75c8693dcfdbf8312b67d9dc092fd2e8b3c89c18979e49c44adf328864c1489b809a8ecd7354f SHA512 0861e9771a605b34e66fa93c16ae50819ca45f920c11cef4860f824cc7ab72e37bc62effb8cf80111afcbe6644edf3d77781da4fc500770a1f82a258913f4fe5
 EBUILD Lab-Zhinst-1.20.0.ebuild 578 BLAKE2B 2b4ad529fd6870e2c433e434551205f543ab74d6c641ccda09603a869d6e5389258a137ea8863c7cd88cf6b8faa4af7a075f4d3535300c758ec1c0be07394f1d SHA512 4222055e11b65d5b61ad6609a5c58c213bc1f8fdae0aa64a94251d7cd630895da31c3889dc2d30210a516b2420713430306859a9d609022bb5c8b09a2dcff7e2
 EBUILD Lab-Zhinst-9999.ebuild 608 BLAKE2B c4c16a1002610bee50d953f1ee5674e0781dbe35e971394e46a7e6de66e04feb08b3d2be12d4353d3d2b4bb6a5a74c1ee0756a5f94ec1af0810eb50b3eaa6772 SHA512 b2acdcd78a2810737544ddb3ed9411544d0d40392ef00c3f8cba510990b4acbaaaca1b70b861e9da47e3e5337dc32b52400c489f463170c8108847ba869a3740
-MISC metadata.xml 550 BLAKE2B abc2679f48dfe5b6191251cc1e1021518be33862977c1cc2f35d69fb08a6657529d134a533cb02eebbcb6f0933d53770000572b840c7302032a1494aa0285b83 SHA512 786a475284535e92a843f45c1714cb1015315de8f4092198a14d3e806b9b609de2a7d009cceecc2f1ad7589933c18b76f1e81aa94fd6ed82f625c13db8335ac1
+MISC metadata.xml 550 BLAKE2B 8447abe177b248b5fa3ec4a0d1ef99fc0097a3b2390aeea67d3b1e5a2a0591ef712d580308d712c22341a2e034cd4d5aea9ea307a91898771792b14eb573be1b SHA512 61987a49f4726cb2ee085026fc529236524710b6b1e22a5de7fc32dd3c5b6848159aeb4c1f682c3786ae96eb1347e6da033e59d6c63a60e17d2de13160a5a7f6
diff --git a/dev-perl/Lab-Zhinst/metadata.xml b/dev-perl/Lab-Zhinst/metadata.xml
index bca1acc57a98..2624da5567ac 100644
--- a/dev-perl/Lab-Zhinst/metadata.xml
+++ b/dev-perl/Lab-Zhinst/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0166254643b4..e98fe829892d 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-Int128/Manifest b/dev-perl/Math-Int128/Manifest
index 61a6e58f9e6f..25d854784d07 100644
--- a/dev-perl/Math-Int128/Manifest
+++ b/dev-perl/Math-Int128/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Int128-0.22.tar.gz 103698 BLAKE2B 1b23468c07c95681f7d94496edb7d0c26e7e4003b3ba74675bc0da0df1efd327e30ee88071242ffa6fa677de942c61c496eb346d00d59b27c461659a34231b46 SHA512 8384891e6a8e6e1696a7fe1d5da8c27c229e7926c6a16ac1114e812dce3a8a75f64d9d1128d2c63f17753c91c54c72dadbd3837e140624f9f1e47d462dccb74f
 EBUILD Math-Int128-0.220.0.ebuild 768 BLAKE2B 7045abb4d7709b8525fc479fad3564581af49bb8ed56ce4e511a7cf15ea0411f5b435c44606bb76b07d1be14d9ae992913c4dc2a11629d4fb3c2b9ec4aa3aaed SHA512 441965f524ba55b7014802ecef4bf2dfcae36dc9b77002c19855d1733f40d0665b947bff179922864181184293b5efb600be4210d2faf5dbf33ea43fd651eb83
-MISC metadata.xml 647 BLAKE2B aa06859609a95a98fe6a1f21ebfc11c1ce38a5ea26af457dd1509be029cec5338d06f93da7c80b280507a1b4b27ab47bd2ffd549c634700523c58eb152fc7c5a SHA512 133d9b8cc0a6bbdf4c9800e102b905aeddf3f732cfbcd9a6003dd1ea9b354a366c7196b28e35bfb94b80d176a66204037d301ee7a6b0f77bf5b6e51a1561f028
+MISC metadata.xml 661 BLAKE2B 94d3c827ba28ab9d754456266a93208e374a8c667acc7cb0e9bb98bf5d26481a12c793878cd44dd581733e37f1aa6cb0eada9e5c0d88bf4a9805568f39b3ece3 SHA512 b6989c91f0649a9990a1f6aa226e73f84bd8bb98f6be08762d3f6c53dc09a2b8796da53a3518af8bf83952638e2dd3efa05af787825a06ac2132a1db6c8e3672
diff --git a/dev-perl/Math-Int128/metadata.xml b/dev-perl/Math-Int128/metadata.xml
index 39c3208db96f..792397321574 100644
--- a/dev-perl/Math-Int128/metadata.xml
+++ b/dev-perl/Math-Int128/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Math-Int64/Manifest b/dev-perl/Math-Int64/Manifest
index 7fa4ceb39307..a66e7b213664 100644
--- a/dev-perl/Math-Int64/Manifest
+++ b/dev-perl/Math-Int64/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Int64-0.54.tar.gz 119664 BLAKE2B cf12dd1f156c92cbbd2f87913737cd1a4b48ef3d879e340506241bea6debcdc2313f8c1503597f54a0d80e6e50f16cbdba5be112e4e6df71e1f2c38575c423c3 SHA512 03677df499ebc3924fabefbc6fb863adc2f765341a9697305b03bb24477b391029e65cc492c831a24e282e26e850082abbd0e52dda198aa041f3f4f41cc4f995
 EBUILD Math-Int64-0.540.0.ebuild 756 BLAKE2B 28f4013172edf3cb41191e8a9f6fb48cfd0cea959aa50517d7cdddb1243009a22f4e53a7cd8a4c5943039fa35663d15b1f17da9c30cc5e797b867ec6dc899b77 SHA512 117b2ae5859659f1e0635667055ae46c7d83220d5575423864d4db266739aea9f7ff681fbc73e35f102648293dd506306234156a9fdf63f4349274f546f60d9d
-MISC metadata.xml 722 BLAKE2B 18e431fced9526df6ee2595919b3effbbac89a1b20051ce694007b1398a3e3698664ad5df5eedad9a19fccc8b6d21c0fe8f6286bab5dc5531cbbf79c8a99dc62 SHA512 9f536545a2c8a8bf4e9e5fa04684ff58f414f0fdcf8be5421785b0a3a04978bee8abe86ff79ef9fa1db02b48a0a832ed73e349143eff594a82b646ce40dbdd4b
+MISC metadata.xml 736 BLAKE2B 3255603a1c5ca9e4a8407465fcb6852a87889b36fd63d5f30345349342b8bfc6a2f3fc972ae337d82840df06821843ba87680240f3cb067c149c1c03967836fd SHA512 c2851a2ab205cce07705c67aeb63dcdedd8a548b33d496764cd8213e6898d6390ed3132ca4c0860a58220513d8936e1cc2e1947e5e9d76b7d4638573ee3910d1
diff --git a/dev-perl/Math-Int64/metadata.xml b/dev-perl/Math-Int64/metadata.xml
index 1906443cfc40..17926a43a58f 100644
--- a/dev-perl/Math-Int64/metadata.xml
+++ b/dev-perl/Math-Int64/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/MaxMind-DB-Common/Manifest b/dev-perl/MaxMind-DB-Common/Manifest
index a4b37ba45199..b0345bae8ca7 100644
--- a/dev-perl/MaxMind-DB-Common/Manifest
+++ b/dev-perl/MaxMind-DB-Common/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Common-0.040001.tar.gz 22195 BLAKE2B c242abe2786bebb4f045d8e454e5044fa7c53db77b589e2d49f37d21f59d221e5ed543aa15c906cf8259b15b217b1bb103f5034c1ffdb10b6c2d89e2b5e97183 SHA512 4748ac66e09ec3c8017b7365562b8273399c85f359c35b22868e1b86e80e8a59a3a3fbfd851becf0ac997657b4e8288057204a2e14bb699815676f3214f6345c
 EBUILD MaxMind-DB-Common-0.40.1.ebuild 1028 BLAKE2B a42db06d50bfe8fe868dd23a192627566e8ed9de83f07d37f886a1a13d978da8ea63427ac22d30337e3ed5aba9452f649d586ea5c17f10ca618ed4ecf6f4acc9 SHA512 9bc55b766cb2074118b38bde53aca23d873d72ace8939931c94875380ebd65115f396a8158ad360aa9b94c9d3cd725ca5b6672d3b53e7d065f0bc8b12c16a9b6
-MISC metadata.xml 885 BLAKE2B 62c498c09416853821cc2896188df2a689042b89ad5aeacb48d5e7ae52acdf1a861ffe1a38045f31a22a719241ea41db22afd3cd69284e2b53ddc13b50e2ac95 SHA512 7528fd249e3466e097880e507a45698c43de182c9fe128fe562aee15ec07c0f6a8908d735c95c9e18a1fa24e0cbb639fcbcfca24e111f29a4cf49407d9f05763
+MISC metadata.xml 899 BLAKE2B dfcef0c60fd32161b5955be5ef384a58151cdcff3f76ea8f6356289955939bcbae4916033fc444f857e4683a19763650322361778df0a937c6bb0a09ba807c2c SHA512 04f676d745519b8d976ba549cb27edaeed9423b0e379676f5a592c9c2ecd3a2c710715dcf5aa4bcb9c2bf2e226bb745dcf0c2f75e121137d0c918a83df7a8415
diff --git a/dev-perl/MaxMind-DB-Common/metadata.xml b/dev-perl/MaxMind-DB-Common/metadata.xml
index dec1ce3b6fa0..09b7796ab6bf 100644
--- a/dev-perl/MaxMind-DB-Common/metadata.xml
+++ b/dev-perl/MaxMind-DB-Common/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/MaxMind-DB-Reader-XS/Manifest b/dev-perl/MaxMind-DB-Reader-XS/Manifest
index 763cd2441acb..b9eb3f3100c1 100644
--- a/dev-perl/MaxMind-DB-Reader-XS/Manifest
+++ b/dev-perl/MaxMind-DB-Reader-XS/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-XS-1.000008.tar.gz 309693 BLAKE2B 6b6d964785126c26e9920eac3716529a1fcd75bc4ddd2a68f9c00ba8a5d189991344bc1f9adf7ccf43fc09fe0c404b5ccdea5eab95c18b65a990c0468f1bb30d SHA512 183cc650fd953db66233d7118dbb5a699965816847643b99a45927791104fb20c5bf04757236adf7b88c8a85edea54098d0034856c8bb31a17a209da62423661
 EBUILD MaxMind-DB-Reader-XS-1.0.8.ebuild 983 BLAKE2B 6574dd60958e63ec3720a1c778652eaa229687c76cf2954c35e4ddf359e85a2ef8dc63e1a2cb4a53d806ec16c74c77e11b78a5e5d7a7492ecdecbaed05be5a6d SHA512 29b93ab9fad1ae897885e1899fc694ba5c82575a20fab1f4034df977f29b5bf566a9584ce3157f93c10d1f0bb4afe8a0a93fbb25c3da338f5bdc34d8a7c3a987
-MISC metadata.xml 531 BLAKE2B 2df7b33fdb464e620009bc9c8ea1e97d8e9cb999b3890d248b8cdfd722d3ce4d340e17db7fa0531f96cca15784d6efa27b63d50913dda9bb9fc72fe2e03fc03a SHA512 bfe7f591256addff25df8309e8de2feb1daf83c00684c4bf136243db6bc9fa80a960e4443207149b1057b118ad2f444c372b30541f531357f458777f3eefeea6
+MISC metadata.xml 545 BLAKE2B 40765f0aea6b5ee75d0a72b421fd243a2b0838331c6e8c2fc3fc9e41c32d446dee370a8648a93e242e34908f7f526b4f9e08fac1e3b6e756a4574cdf1556881f SHA512 e4f9bd0ffeb4659a2f99bf58de3b13e2ce97133a2ac84fa458d87afff854242f52b0909a65b2de1fbc9f42cc0366f78c8775b3f1185431c9ff75efa4f13634e8
diff --git a/dev-perl/MaxMind-DB-Reader-XS/metadata.xml b/dev-perl/MaxMind-DB-Reader-XS/metadata.xml
index 40db420faf17..e81bf2f5bc61 100644
--- a/dev-perl/MaxMind-DB-Reader-XS/metadata.xml
+++ b/dev-perl/MaxMind-DB-Reader-XS/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/MaxMind-DB-Reader/Manifest b/dev-perl/MaxMind-DB-Reader/Manifest
index 886ac9e6fd28..beab38cd0378 100644
--- a/dev-perl/MaxMind-DB-Reader/Manifest
+++ b/dev-perl/MaxMind-DB-Reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-1.000014.tar.gz 230327 BLAKE2B 0ef7fb605d6ef9a0df1a879b01256df412a38925e6d9bf1b7e5451c8a07caf9c93c61bdf471808ef7bfdab2c0abfeaba5db9a6279b630f9eeaed43bfb7966161 SHA512 3cafa359668497b046d2ead814df03350f323fa67dc3f14b7d9d9297f406d0a0b6fcd7f05b36b05a8e087b112c32579d591fe20a368f4ea760e142ccd0802d86
 EBUILD MaxMind-DB-Reader-1.0.14.ebuild 1138 BLAKE2B ab373ed3341cebe88fcc34346efd5c0a8146cf71d7af7e22bca8c361694c2dfca2e72e4ba9f0e321ed32ceacb6fa270f12b68cdfbb7738ea4cd1a04b2bfd380a SHA512 9d502a6744a453800af99fe839c411d55e0dd753bfd531a1532e997000bdc4f0f885570cfa843fc6d1d3c0af3957ae8df54e3e909ac5f960ba36bc8e08a61f56
-MISC metadata.xml 1251 BLAKE2B 816ef7c0680366a19e7f82dafba4306cf628f430f45325f3ab2349ffbf05298efc5ad78f8562f1bf928a2e5485d700e2b7ad2ea95ee14e7edabaae11e58af8ea SHA512 1c9dcc5deced3c65963286b7a3386b34e461f14cf40c2341e34f6b1fbcd53ffd07a7f907c50d98d5196a699f34b56ab6ae72e26bd33cefd1006fba9b00c61505
+MISC metadata.xml 1265 BLAKE2B 388256b1e59282e4e064d31129b397e296941503bec9fc99f6e48a124c1a3aa4a7185752455b521269c1ce074e875f0b35e6c6963b2202c6effd94b4718d5b8b SHA512 bc1048e72cde4351ba5d2b0a635079f7d053ff4300b512213253a542b58d0f1d1de6645a1002f2ee7a76ae43376f1be1dbaad00bead6c19b70e016f4e6d7329c
diff --git a/dev-perl/MaxMind-DB-Reader/metadata.xml b/dev-perl/MaxMind-DB-Reader/metadata.xml
index 240185fa2397..a1c2d9bfb66b 100644
--- a/dev-perl/MaxMind-DB-Reader/metadata.xml
+++ b/dev-perl/MaxMind-DB-Reader/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/MooX-StrictConstructor/Manifest b/dev-perl/MooX-StrictConstructor/Manifest
index 062c7cb44033..83f7bfad3d4f 100644
--- a/dev-perl/MooX-StrictConstructor/Manifest
+++ b/dev-perl/MooX-StrictConstructor/Manifest
@@ -1,3 +1,3 @@
 DIST MooX-StrictConstructor-0.010.tar.gz 14817 BLAKE2B d013ab60dd467d598a4617b3bc354df329d22114e2b4ee53a1f62af99c5ec7797bd8a48056cb43236429d97c74f6f576c2fa764e3c527c9a056f815675a5177f SHA512 17748ee05c1679d3cbade89b40a6f884bafc45244298f1dfcc5441dc81ab807394e6aafce483e302da8441ccb954aa1c7438b4449fcc373ecdcf81ad9e7cd864
 EBUILD MooX-StrictConstructor-0.10.0.ebuild 607 BLAKE2B 8096a0cc40ecdec8f3cb98b9519a92f6ca20541a4fa1e84da92cd48dbb597247d7eb30d24ac3a385fcda35cfd765ae03ee0288cf9c08101d56cf419590fb4d23 SHA512 52d8e420c1a27845c14033e354fd75cd33e8966e0b6a70f2e96f31c28dca43d1375dd436e03e3104830588538d33928dc0f4e302707625c64884785228053f66
-MISC metadata.xml 634 BLAKE2B 9d8dec55ab4da2466c5ae1f3ca5375215498fa36f8c93a4c3236aa5d30a0ef2c4d16ed57db2783e486c2ab2d883852de74d634624a2be93c4160f071db875365 SHA512 4065e52f000423880c0d475e3868d8cf276242f15119c19dbfb05a38dcfbe1e8acd8c4c8525940a31bfed8ff3d80a9c43ddafe364e589852e4325600609692b2
+MISC metadata.xml 648 BLAKE2B f5c2275a44a62c18a09a72bc482847ae14e4666d1ebdffa48cca7267f8e9f50186f911df62476c0525abda397597046bd1a5fec81a34f97b36b3d06729ff16b2 SHA512 f6fb4895d6152c1a7af5cba73e8c78719d02483c47e8789f9bcf36194c34d8eb2d993ceea69da25a9109a2d7fc68bda2c4fa3d8df1ff7e7f0fc2260daa948f16
diff --git a/dev-perl/MooX-StrictConstructor/metadata.xml b/dev-perl/MooX-StrictConstructor/metadata.xml
index 7f7d59c64a43..987eaa7f0f1a 100644
--- a/dev-perl/MooX-StrictConstructor/metadata.xml
+++ b/dev-perl/MooX-StrictConstructor/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Net-Works/Manifest b/dev-perl/Net-Works/Manifest
index 54aab0201773..41751982e12c 100644
--- a/dev-perl/Net-Works/Manifest
+++ b/dev-perl/Net-Works/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Works-0.22.tar.gz 41150 BLAKE2B 212c9844714e5a245d89bb37411d83706c4c6197bd28cc7a348341954d093c2480e1d0b9012342c5603ed3a2d3e5936df3064580e9489be4d7dc474b24655c44 SHA512 c85be8600ccd9e7cf06365be80909229ea5bc62d909fc8433e23af9abec3c31b4856d546b84d5cc378656800362c5d458061d26bc5927dfc437ae8c27d0d1d3e
 EBUILD Net-Works-0.220.0.ebuild 1003 BLAKE2B c9be6df200c44c97835e8945d36d6e20c7095d25d86e30909c9c0dec41ed651ce552f079f068d17a2b0ef7d87aa29d2eb1369b106c3668614cab23791560290c SHA512 3fcb68e0dec592d966cecc3187897c017a666fdb354741eeebddcb5739873780e9eeed9a01b0ba6c31091b82d5f9be68ddf4c749fe54405034e7e051a337c549
-MISC metadata.xml 833 BLAKE2B 0dbe3b3e4dd577872c897c913bbcc3a64abd4adcf466e24326af9ee9da9dc2cdc16a201ff1e7e65db846d7dde0b7e6cf381f1ddab8974a6bb781694e86ab15dc SHA512 e13b1eb7621cc6894e7d30eac47a9f6292daef8f5737ad4ac6521fab1be37dc50adf8dfdcdbbc663bae06b74aaa6cc6ed2bde4b04bed7eb28f4e5688ea650569
+MISC metadata.xml 847 BLAKE2B 6e336fa3e1c914c8a7815795a81b47dac0898c5408690f16da9dcb45589edd03491df4b54c8726df2a0e0caa3702e1849112ab1264d21997449c7c3128d0f11b SHA512 105729ecc65f60cbb8a102cde6e2b2eba8549a137d4554d1c72f2a569fb53aa3e1df051a01f44792fa81c6a687b178bb2ef7f345864758a4bd55871d5e2db942
diff --git a/dev-perl/Net-Works/metadata.xml b/dev-perl/Net-Works/metadata.xml
index 9a0fd4bb09f8..53a7ebdd8128 100644
--- a/dev-perl/Net-Works/metadata.xml
+++ b/dev-perl/Net-Works/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Nmap-Parser/Manifest b/dev-perl/Nmap-Parser/Manifest
index 5050af193240..aae9c97fecfd 100644
--- a/dev-perl/Nmap-Parser/Manifest
+++ b/dev-perl/Nmap-Parser/Manifest
@@ -1,5 +1,3 @@
-DIST Nmap-Parser-1.36.tar.gz 41802 BLAKE2B 4c71a1d5a585d3500d151f7192868b7553c0cd862b30f4044e320a16937f3714ec38af5c7b245845087a3090983be9afdd15aab70cc73d1cc7ec06819d509733 SHA512 f5f15b520a6fc3b6b001f61e8c4632ae0cb4c3998b278a0a8d96ec4677d74627cd19ae0ca29f6007e5c3bfeb6aea5d56f6270c84b736dcc7964a6fbff957713a
 DIST Nmap-Parser-1.37.tar.gz 43495 BLAKE2B 6ea01e65de82db2119c94d985dcaac52f4f17db81c09fcdd49748ab6365e7827f014f6c3b6dd961004b0b764860d2934d2fae2b81ebe20a3965d1826e82b85a3 SHA512 9820c556989ebfd6e29c50f093cbc4dcd6e6e039751c2e92e35521a233495092b71f176448efd240decf1ccd223befb25f136452d2136226a00cf9ccd3fe45e1
-EBUILD Nmap-Parser-1.360.0.ebuild 511 BLAKE2B 22b6f81227d7442de5c5c550e093d7ceb63fde82445a1c11c33a142be6fed9c350121cf652b51eae03cc291b1fe4baf0f333d8b1b989e464e6a2cf1ce6d50822 SHA512 0dd61177d54cb2c4aaafef3a950a29ff480fe61a3d89f9c75987d9d983b098b0d2378ca1a7a512d3248c0cda831f2dee6f0108c4895f1e90b7703bcea1a7db7e
 EBUILD Nmap-Parser-1.370.0.ebuild 417 BLAKE2B e314cd43dabe0ed2aeba67318e244c563bd8884af2d6bbcf05701598508f96462e537f0c3b68820f828371afed9e0dcd11d40361864974cc3a95319db32fb5dc SHA512 4b92585892e1739d228a6281dbfe8dc94ea58a4666463dede5ed6ead7a5d032e83380aa876ed70768fec7d5075fdb56e51df77b945c0725dbe1ce255d579b10e
 MISC metadata.xml 828 BLAKE2B 00c0bf24dc27423474a8550aac6c71daa69d45852697646a756f534039bbfee7f75a20448f1d1d919cd31460d1e37fa1c27f77a67383bc762b69d85adc95d610 SHA512 72011b4ba9508a5c12f32e572fa01bdf83c08e57a5e9236d836f94e1d59585ceb6c997c6106d482565ee2d8a0a3e7ca0bd30f8fdfb220ede3c94f950817ca6de
diff --git a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild b/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
deleted file mode 100644
index 231dcc29363c..000000000000
--- a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=APERSAUD
-DIST_VERSION=1.36
-DIST_EXAMPLES=( "tools/*" )
-inherit perl-module
-
-DESCRIPTION="Parse nmap scan data with perl"
-HOMEPAGE="https://nmapparser.wordpress.com/ https://metacpan.org/release/Nmap-Parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/perl-Storable-2.0.0
-	>=dev-perl/XML-Twig-3.160.0"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Quota/Manifest b/dev-perl/Quota/Manifest
index 5ddbc48d9ed4..b7be0f0ab2b8 100644
--- a/dev-perl/Quota/Manifest
+++ b/dev-perl/Quota/Manifest
@@ -1,3 +1,3 @@
 DIST Quota-1.7.2.tar.gz 50436 BLAKE2B 6a90e545fcb3739f4f10cbe5caed7ba5a3542c19a8f1b68baeefc12dab77ac27d125e3de083c1cf6d68c29fe126c8e4f2eaddaa1c55c1974de0e0451011f6c7c SHA512 55ea9fbf027676b0e6f7a6f97fd3e75749860ebefe0127791a0d8cd8a427676eb1f6bf1ddf1a3687666752430faef877eedd12ccce39b7b76466fc7bfc628433
 EBUILD Quota-1.7.2-r1.ebuild 1006 BLAKE2B 97c7c37da8e6a61bccbc0678fc2643456da6541f62a1c09e9a92352ce2a3901cc786c813f498dd4cd8be4e79b5999e0e629a6ef8098dcb36549d12ff136fcaf6 SHA512 73b45e6cd0820c8daf5c429e803a0af2276036afe0b4fd6c4af314c8b6cf34c99e3072680f48e3238ac31c027a2cf85375668476ad424b6e54100615efe38e83
-MISC metadata.xml 923 BLAKE2B 4226cb835ae02feba840870aedc88b8a40e9a7a1af86fb7ce8c374b1aceb1d4f057f9ecc3347422aaae280aedaf01df1dec1e98d3353f479a61537281efeb6cb SHA512 1f5174e5bddb4d3ec278305eae7529c07c052e9e82033b429aa23390615964123968a1d88d91fcf31724bc4cb4761c026958dc616a58f12f03b058298ce20762
+MISC metadata.xml 953 BLAKE2B e3b91c3fd76fd19e786c0cf99a1edfa06b0c2524097f68c3351181eaedd282aa6dd13a83409d650a518b58deeb6330de4faba1aa06082fa05e2cfe8d9cac4a07 SHA512 0314f8d15c479af42c3e0015482ed135d978568181869fa2c88908ba8e29d0f187d6e0b8dfd0ce61cf514a4265bb982f51746bd41a32381513595d9a7abf2129
diff --git a/dev-perl/Quota/metadata.xml b/dev-perl/Quota/metadata.xml
index e140d3e33331..878a433b682b 100644
--- a/dev-perl/Quota/metadata.xml
+++ b/dev-perl/Quota/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c.affolter@purplehaze.ch</email>
     <name>Christian Affolter</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-perl/String-Escape/Manifest b/dev-perl/String-Escape/Manifest
index bbf1042bb91e..811f819ba64d 100644
--- a/dev-perl/String-Escape/Manifest
+++ b/dev-perl/String-Escape/Manifest
@@ -1,3 +1,3 @@
 DIST String-Escape-2010.002.tar.gz 11629 BLAKE2B d012323bdf10b9c8e47c90dfe1bbb064e09c7a0b00c469d9285d8a9a7ad1ee80b1d30b1fff1d5218d4491a36780174526273775dac790db2f22c0a22cc01fb14 SHA512 668e196bbd95b4e9e5fc9ae3aebe0e7f1990362973bd027f2f3728f212786bc2104141ced3e024006b3ed22fa6345b968440029c98b87cbc299ac192221724c7
 EBUILD String-Escape-2010.2.0-r1.ebuild 468 BLAKE2B 3710d142dd3d0e7ef5d668a57a19929e6614f9e2e76c85235e2b8e2347db0bdda5adae22011485b9362002886905b6e77a4170a8515c30c30935bf0fd1562d3c SHA512 ab3cdba30adb4185275f29e310d20c0a43a5ec67515ba762176c7024fc1155ec5b254a919863993d5613cdae3296e0ae6b508264ea577550ae3117e65f0a3347
-MISC metadata.xml 551 BLAKE2B 19a510a8adf7fdd29d513127ffe01425ab07f930cb085a5d651718b69f9be1dfd12eea409a1d44a3b450dd19cd451353af94b0cf94bbe5fa57eaeb8db8637ffe SHA512 27e72dbacb74fe0593a9d3414268aaaf0e4c82ceebbb718afd956b16c82043975a2a5359c4b0f704cc989e22b9c57b5ea6b24025b95529718baa13d93a9fe55f
+MISC metadata.xml 565 BLAKE2B b0887617aaa3248c80a45a34382880932ab29e7a418ea937078d6edaca5e0e6e75389a9de35e0d2d5d182ae4e866c665e326ab62ff94ad1126faf068b36e682d SHA512 c60a5a0b84c5fe757fc6491531c2747e28ba5537c652f49b98dc77013f7dc8dbd6064080989aa43f2314952e775ee5f3f6aed3d843d6d01fd328ee1247cc12ee
diff --git a/dev-perl/String-Escape/metadata.xml b/dev-perl/String-Escape/metadata.xml
index 219beda6b880..eae52b16d660 100644
--- a/dev-perl/String-Escape/metadata.xml
+++ b/dev-perl/String-Escape/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>mb@cattlegrid.info</email>
         <name>Michele Beltrame</name>
     </maintainer>
diff --git a/dev-perl/Term-ReadLine-TTYtter/Manifest b/dev-perl/Term-ReadLine-TTYtter/Manifest
index 326048fc10a6..fa5c271f740c 100644
--- a/dev-perl/Term-ReadLine-TTYtter/Manifest
+++ b/dev-perl/Term-ReadLine-TTYtter/Manifest
@@ -1,4 +1,4 @@
 AUX Term-ReadLine-TTYtter-1.4-nointeractive.patch 2438 BLAKE2B 1ea21dfd1601f5da349a25f274de4bb937e83aa49ed8c26f21ca2414e1ad51f4c40d408d929b68e096c49b0a6430f8a80fb2edd289fbd566508de24699972adb SHA512 7d0676503454f46df59e5e1b6ff6c8f63a31df949dd1ca13198c4ad5bc837bdf97bc1f44a04a43e2461e84d086c824623dea34d2f30aeb2d2e5342bc2d07132e
 DIST Term-ReadLine-TTYtter-1.4.tar.gz 52093 BLAKE2B 47194ed428729bf97d8337731b25ac0164cfe9f853854b5e2aad6936f7ed34fa8552bffc150ef405f97947a63cc12259634c5b084c21653c03b6c41af61c6e3e SHA512 6e49c78a935259e99cabe5c9750fd5e90e205c754955d23c50227bbfe3dcb40d56ccc447d3f516ff34195d3fb411b13ae61a6c32c776231f794d2fca9da8fd1a
 EBUILD Term-ReadLine-TTYtter-1.400.0-r1.ebuild 373 BLAKE2B d67cf6d069546b43a76c4e4d31389b0b6a3fdafc95b238c9baf966a6cc04dd904906ad58b0674c2a638714e7bdce5ede2cdd089cfce302545abf3ac97e467083 SHA512 62f4e506f220eec159a2788d147ee44b2d6f406c45647e8ab51e131cae46a9a994e9f5e5354aa73d3bdf6e079c8804232470020871d3e0cb3c9247dbfbd343ba
-MISC metadata.xml 909 BLAKE2B 282901ae74553c3f2b842fcd26a9b8092b0209c908f18e6d4e09742952a8ce591f302b54d2950c9a4a3162b279e82d26a3120f2165856244f4fe074eb98e99b4 SHA512 a109c56b55ac6fc9fd1c9aac5ec66e3d492eea7972c5f7f57e2ff5378b495dfffd28d689b2ae7562a4dc8fdf2c31baf2a89850040c4a7ffd393c3252fc051d97
+MISC metadata.xml 939 BLAKE2B 06e7e790039e6dbaf0627f9cbe6e5181ab40ec6d4bfbe1dd7a2dd1923e442fc5519798a2c1c4bd8fb70df90308f821ae359a65107b56690d5dc2e11977ca0106 SHA512 2d1213d195718a77518fb583fb47ec72de8806ba94b85c447f4e4b5fb1d5f9bdc5620863d4908d603370a879ce96dc5f8b5ca01ab270d3d91b30c00100b1a9eb
diff --git a/dev-perl/Term-ReadLine-TTYtter/metadata.xml b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
index c1dbc5646cff..1167c8e11f50 100644
--- a/dev-perl/Term-ReadLine-TTYtter/metadata.xml
+++ b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@nephros.org</email>
 		<name>Peter Gantner</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-perl/Term-Shell/Manifest b/dev-perl/Term-Shell/Manifest
index 5e6c9df51ea2..ef8b4f6f4af3 100644
--- a/dev-perl/Term-Shell/Manifest
+++ b/dev-perl/Term-Shell/Manifest
@@ -1,3 +1,3 @@
 DIST Term-Shell-0.11.tar.gz 36357 BLAKE2B 78ad636e2415a5b11ffefe6f391771a429025f8d58138c91c794a3f9e40dfe66eb34e6dce73139e736f46302991f84a0e3e35230c5e53f7d94a76f168f523d12 SHA512 407a8b2cb9d6ef8aa2a5efaa4708289c30f0070ff992af954f158d0191b0688faa1a2162668ff2b9a3fdf847314d4b5bf5d6f1beef860f10adcffd524ff95027
 EBUILD Term-Shell-0.110.0.ebuild 836 BLAKE2B 5a11e6ce4e3b59746d087cb71c605791ca0695c6b438fa858e5eec2a71571af3f37687c29a38ebf9033c8532ed4f60d9145fc048419a8640fed3e96a6399820c SHA512 27a322113241d0d4bb43edfbdbb0ac78aeab345395aff7ed6d7032b3387fc64084c146efda393a1216c40bd25f211e2d085efe13f96d7f821945767024464fad
-MISC metadata.xml 684 BLAKE2B 83bb0ca8f51d42a6a355c9c32a27faac4f3603998d608431fc0167663e5481a88988926c52cd2fc3108b45fbe7951aea14e541c64b21b0393bf3d60f04143249 SHA512 a3b4fad1dccf15732d781363b4358bed3d61d4a719e671a784d39ec0775989f9bdf50172d04a1fae64d1d15979f46b186a697a75446b36ded69a2cb82434cdc6
+MISC metadata.xml 714 BLAKE2B e24222b6cc6445ad62c579d18e53cdd7158d4c1f3544729a1cf69e09acd853d04f929904d232a3d66d73e1caba38f5fedf031c7969a6e2b243a216cb422c0f9c SHA512 55a6e1edef87cb00b069a61f08d670a1fa4c2538b94c819349e60f819f2357828adc3e968a29fb0254a47c9ef9af7252452dad138ea3c2ec96c3298ac8699452
diff --git a/dev-perl/Term-Shell/metadata.xml b/dev-perl/Term-Shell/metadata.xml
index 04270d39a1e5..37ff9cb9cad8 100644
--- a/dev-perl/Term-Shell/metadata.xml
+++ b/dev-perl/Term-Shell/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat Hackimov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-perl/Test-Bits/Manifest b/dev-perl/Test-Bits/Manifest
index 0b4f11819ef0..f63c8fb465f6 100644
--- a/dev-perl/Test-Bits/Manifest
+++ b/dev-perl/Test-Bits/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Bits-0.02.tar.gz 9651 BLAKE2B f6c12cec4866a5ebacb691ccf55b932b43bfa8d38d65e1c7d9cb937566de23354449b944e5eb6cc03e726d9f403efcc5149fa619e82a4bfd23d21fb3b87adb35 SHA512 4fd995f23fb365d31fbb281b8dfc7494b5a99a6f7b372c09ea16623aedc82443a3847399ade867285979e928c49c91aa85a45d8c34207549936b6eb6ae89ce6b
 EBUILD Test-Bits-0.20.0.ebuild 827 BLAKE2B b9b79a1c8063c6a47daf3a3b0bf42f42e253b78ef7e879cd0e255d02e38b1ab1682f33770083ea0cc5af0dbc0079ec7a5f08779d4fa08073b530349393160de4 SHA512 da926df794b6a09fcaf7551b12446a417ee0ffae8ae429c9c243ec9957f79814c62197cf74f850593ff84dbdd6b23d9e27bfacf0e5a64b407fc1143627571cea
-MISC metadata.xml 507 BLAKE2B e6b11f9b2ebb61aefd0f0d6ca39013fd562efa3e025d08da24c4c4eefa655ba1524e0ee4a9e7afc6cbf80c2907b23ad833c7e30e9906259f7b25bebe83f668d5 SHA512 cc574581e0b6fe776e1907286b14783b1a97399ee7e90244bdc7de976fa615acfa84c6c54873f2c88ed8b43afaf5fb8ebc30e576def2a2f9a10b23f8876e87e8
+MISC metadata.xml 521 BLAKE2B e024b9ec11f670637db225b09eae72a13e2de9c487dc419087a47f21ba7a6d57cd9fb521b6461ef32ce805daef9b5e70ee1ddf333f9cdbf036481db3eddd9eaa SHA512 d189dcc86f082c360de72359efbfdfd5970febcbe6d95f1dc38318643a9501975cd9ef4c207f35325c046f7d75386ad9a4a94a5dfc34a8fea83012ceb4a9c60d
diff --git a/dev-perl/Test-Bits/metadata.xml b/dev-perl/Test-Bits/metadata.xml
index 2fea183f46f5..91bcd1f6610f 100644
--- a/dev-perl/Test-Bits/metadata.xml
+++ b/dev-perl/Test-Bits/metadata.xml
@@ -5,7 +5,7 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
diff --git a/dev-perl/Test-Output/Manifest b/dev-perl/Test-Output/Manifest
index 98eb56636bbe..1f6e89b79a60 100644
--- a/dev-perl/Test-Output/Manifest
+++ b/dev-perl/Test-Output/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Output-1.031.tar.gz 16821 BLAKE2B b0422d320fe43c78b12ef3bc4ac64279541fe6d68dcd8862dac65ae44d552ea07e2e73dc42a3ddff59725a60df7712ccf152cb841bc2b1c8224e5e57bbb5597f SHA512 b443d5a4ab7be1c308b74ebc9a1a50022b404886e8a1dbd2700d974ead506a6976ec6d5c141528cf1c2833174c3afd9023362cb0b4e000f0e878d2e3e9f90e90
-EBUILD Test-Output-1.31.0.ebuild 789 BLAKE2B 8c67f3705286bccdd38d678735581101d9e355b1d89e150daedf295a6f47a99c3c25b6f1d61c3b6b3d63b7a5a63d311d5cbc58308038be4a89ed7e19e6a20e06 SHA512 e6a71f25085e5d158dbcf6369fd482fd820183f8d66740fc5c498acc2cf392d591823cec94d825514ab0e6b919f307a37b5c4849bb837fd256381642b0460708
+EBUILD Test-Output-1.31.0.ebuild 788 BLAKE2B 42c7f13b56fc7273e077836b2b37b2cb251c1cf19aa18ad5fd3b04f038f24e5c394dea80173e3df5f7114f3281836abd546240edfdb95556f90abd320b2fa81f SHA512 5a456e7c52b1332051206f2c885a649cea8c98e1369ed78952b44e295570bc70c0181cf6f78620f439989dbc3cc958d384d22dec7fcb7fa5d0c1c31102de846f
 MISC metadata.xml 394 BLAKE2B d7c608101d492fbdfdb5b4362fc14466adb49e4bcd1490cc8688305f216c0f95042fdc9609ecf8e4bd9ad5b91efed5cac5d1e7e0f8f2c934330471b80af7765b SHA512 dc8f6c32e3e94813b3bd7fc74b73e1b392383360e012a906ced6445230baa7ef8e591b7f4a6d37b5cf87733c21384a740b26dce9fa0b3d4bd267dfe2ff0367ae
diff --git a/dev-perl/Test-Output/Test-Output-1.31.0.ebuild b/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
index edc3815caab0..53a61d523a89 100644
--- a/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities to test STDOUT and STDERR messages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/UUID-Tiny/Manifest b/dev-perl/UUID-Tiny/Manifest
index 83934e65abf7..0ba55a12c802 100644
--- a/dev-perl/UUID-Tiny/Manifest
+++ b/dev-perl/UUID-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST UUID-Tiny-1.04.tar.gz 14790 BLAKE2B 6c65c5eca99e686a823cc790d95c527db84a6460c6c11dc3272eac52bfd1e18e9c361cd13427a9c2535f6541d98acf6dbce5d4ab30688aba92277f8ca96d08e0 SHA512 a28b0684a558ba0e81bc99493904c0ca43c8c145d53a9343e5496695054138f1791fe423c5e714344c58a8313b46f635a3ad1cb2eb88389f6906b6cb47ddec26
 EBUILD UUID-Tiny-1.40.0.ebuild 426 BLAKE2B 6ee3d22f5e627fa1bb013f1a6a439e9693d51ffe97e78c7c3eb2700c2d647633b835dec27db96b9f52f91dd720f4ae2179f16e191a2d65798a03567fe7354b23 SHA512 2492a5af0ceefdb18e61040f752e33892a89cd1abc84fb513fcdb9e6aaf8755818d69abf2baf5b9235c3e6192e2ec46d79cd3472b2af4b990d7d12e9d430682f
-MISC metadata.xml 801 BLAKE2B 28a52cf9c1b84feea533380cf7ed6a8a49c983d1d56b759dec18834865cd7d04e5129b505a3c2d98083e303f3f73eda1a896c7c1a25bbc0a4bff75d6381a6dbb SHA512 890b9f35c20ea4c407dbdb72c278d1c22214088b4dfb4e54131b5b1d4c53a70f475bda5f57974a5dc20ebf35ee2190974d0deccc48fb1bcfd56fd08f3c090f2c
+MISC metadata.xml 831 BLAKE2B 3a1a4edda197f8c3031e8b48fc3da04f5a7863719b34f00c75bfbed44c46a1e0be2de4fe2f573678c5fa5e76ce9255c0c257bc748276c080a0a9783868a2d81e SHA512 62c6f9ed9cfe36c35276ed3628ce41074e144925a296f37c6eb0cb4cc59bd0f057c5c692836fd474d727055ea56c32daedeabafdf339c00ca6eae8f196454e32
diff --git a/dev-perl/UUID-Tiny/metadata.xml b/dev-perl/UUID-Tiny/metadata.xml
index 262156ba9c1f..b040ca91d837 100644
--- a/dev-perl/UUID-Tiny/metadata.xml
+++ b/dev-perl/UUID-Tiny/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c.affolter@purplehaze.ch</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-perl/metadata.xml b/dev-perl/metadata.xml
index 707e230de5fd..712cfd2e3b2a 100644
--- a/dev-perl/metadata.xml
+++ b/dev-perl/metadata.xml
@@ -41,4 +41,3 @@
 		językiem programowania Perl.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-perl/perl-headers/Manifest b/dev-perl/perl-headers/Manifest
index 8a94c70120c6..f6c48c3cafa7 100644
--- a/dev-perl/perl-headers/Manifest
+++ b/dev-perl/perl-headers/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 1175 BLAKE2B e498f2e1d6412f8c0454081395fcdaf995b9f79e373ab3dae7ed3183622b2db8bc18ea46e29f07a55cae92b0a0c468a24065c66f350292cab1d7b7747a079e35 SHA512 572e519c4f8ff15865c9e42f1df6941ea5c20b86d75e9a5baf9ac5fe42e1e769c3a440c310170c9cdafcdd113d4eeb079e605c22be2bc46bae98d84b5c9caf0f
 DIST perl-headers-0.0.1.tar.gz 2141 BLAKE2B 48f32c486427c30d7eba06d103a9e72d19f817dfb2a55db6aca1e28670cf03d4180dbe6e5b3031133bd517045b827bb76d085dfd786a1263dc1773fdcabb210c SHA512 a9a44a957d863c6d99c0facb324a32e3fee55ec50e34481dbe37c09f6afe103b0cae234ca83d4d591a01d1e620d262b0e9beae53001db1fdde885f9a57234c7f
 EBUILD perl-headers-0.0.1.ebuild 908 BLAKE2B 360544115a74e155c1072b0d46748e4d12a2d1dd471bb4d993db43749ce523923f3de34e123537d7399afa854911bce30198869387872d1d90dd60c3c40c545b SHA512 e9b66765d931e3f938f11ffafeeff126a1653a26efffc91ea988a96888850cbf807311c3748124648699b91391248f4ab4361a7b9ae61ec3c8ef4b3d944873e8
-MISC metadata.xml 601 BLAKE2B 0eb5d014e3970d6ae5cee77db58ad7fbc924a034ffa71ba15b18507c2bc29122b3c54074494aff0cb6005506b339659d0bd851ecb7ba020d65af5442f43faef8 SHA512 377c7dcab7f0aea413af089c8a2da457c514122564c1b24ec41103f16bb9ec9b86600019bd839efd54ac20ca1785f898d6141f1dce3570b74af90bd2237dc33f
+MISC metadata.xml 601 BLAKE2B f1cbd690fec0a75b3573ca5cae108cc9775f8319606d6b1c291659711a51df985cfcc886a5ba00c3688dd7f102d0ba4efccaae399e9ddc50145c3407c91b56ff SHA512 1001afaff236f51b89ad096fd13cc66205484f80c0c2e2a08745db951179fe62f0a975c89e90f6887511bf4d65bb9c8bf801f82decc02ca2a53bde6cd4ebd371
diff --git a/dev-perl/perl-headers/metadata.xml b/dev-perl/perl-headers/metadata.xml
index dbe923e71b35..4d922b5ce44c 100644
--- a/dev-perl/perl-headers/metadata.xml
+++ b/dev-perl/perl-headers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 52eef2405a15..03afbd25cc3e 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Auth_SASL/Manifest b/dev-php/PEAR-Auth_SASL/Manifest
index fa773bc36d64..43a7b1ef9bc3 100644
--- a/dev-php/PEAR-Auth_SASL/Manifest
+++ b/dev-php/PEAR-Auth_SASL/Manifest
@@ -1,3 +1,3 @@
 DIST Auth_SASL-1.1.0.tgz 9380 BLAKE2B ab04812883b5b1a88fe1440f23e206e39676807c69bc029e81e539eb5588a4fa15bcb6f867f109a5eb86d0758bf9fb4f30664a8fdac7aee59a0426f5da6e6dbf SHA512 446ffa37fe7669d3993613167b07fb173c2e17664dcfb56d96a889b4a0cb2c83cc73d307aee15fc8fa7e666502835c15d09c32d8a491060bdd23c9093346bc40
 EBUILD PEAR-Auth_SASL-1.1.0.ebuild 331 BLAKE2B b35c4ee0e7a91ae953a9eb372feabda419b47944185fafba890d36aeaa5aaa47ce9d9781020135bdf0e70c99168324613627f0b4e89857ab70555aff4298cccd SHA512 22bfa1df7b40441c98981dddd6e405330ab4e0a56a1bbdf1242d26572be5cbed64b4ae60f4ec8b93450f6c18cdde1cdb9377feb1143331bd416898cd2d4f5e4e
-MISC metadata.xml 311 BLAKE2B 32a29fd08f7c52c73d282412b70345efdb2c759e81dce883b039c6a4180e5c0177fc6e8f997d7d51741bbe1e5969a578f900901c15a1b893d9458bd0341ed4ec SHA512 a7f236f4833cece9f46d1073f6ed444150b0a7fb7983bc94b0f465f77a4b7c8ef6c7b6b3f212d43b30579293247b04a1790b6218e89c3578370a842e50c6467a
+MISC metadata.xml 311 BLAKE2B e646208b997bead8ad42ddb5ee40ef843969ddb3c9c0309bc1b47cc930fc9e8767b9fc188608435be7a4105336c0f964d06b645e4d520311571ecaed6caad681 SHA512 55d469b879bda85098cc38e7fddc6e39dfd3577d6b3e08768fb474ebb2d1013016acb856e4ce92e1cc88ef6f21ba6ed3b8946eb3dbb7d16a7832f5b231db61b1
diff --git a/dev-php/PEAR-Auth_SASL/metadata.xml b/dev-php/PEAR-Auth_SASL/metadata.xml
index 9946b319b747..60c5dab7b70e 100644
--- a/dev-php/PEAR-Auth_SASL/metadata.xml
+++ b/dev-php/PEAR-Auth_SASL/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
index 2b47c3f705ed..819c8c9d12df 100644
--- a/dev-php/PEAR-Console_CommandLine/Manifest
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -1,3 +1,3 @@
 DIST Console_CommandLine-1.2.2.tgz 40705 BLAKE2B 1cf2fd7ffdafe1b6e683d40e24c07bc12c9e41469e42595f40778f0bfef30457b32f80b966835a690724e29216348be0fb3f98a83947459d48f728896a5a056a SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603
 EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1415 BLAKE2B 0ee9aa6d43574b48b3df8fea97562e31e0a1b9b277cce791646539a8698aabd93a2692efad0f33ca8740bacf2076e56e7bc795418f9bc3ddcb436c1bfd66c04b SHA512 bcf823f273152bbe66c64edc831afa7ebdec2626c4fb4e20899bd5d8bc50f1d10e554683d307c733a0de9f6d1dc7bc231b30466c0d124ba94f9f0f230103bf89
-MISC metadata.xml 397 BLAKE2B ed50944409b7944c1da567241dab1e2e287b15e7a03c662c0642540b4fa1c50b6d048f6c7033b7fd1c598e5e2edc07bed8a758ec8f71e56e0c4a459f7efd9175 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84
+MISC metadata.xml 397 BLAKE2B 0873f44d5b565283d688f2265425b57dc82c0154644b9b0cea0d4d0a84fd36598ad64b071c2f794033098c00d9578b284302b4715b8353784dbdd1af9a7b2486 SHA512 15c50feaef365c6780048687268073493a485e360b4be9c9313dfcc87957584fa31ad3198d737d18c50b2b67fe9b1335cc6e454a21c857a1e47e8bf6f198afbd
diff --git a/dev-php/PEAR-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml
index 9362a60ada6c..e0533582c0e0 100644
--- a/dev-php/PEAR-Console_CommandLine/metadata.xml
+++ b/dev-php/PEAR-Console_CommandLine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
index c0408c86a46e..2057e5994ce9 100644
--- a/dev-php/PEAR-Console_Table/Manifest
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -2,4 +2,4 @@ DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6
 DIST Console_Table-1.3.1.tgz 11492 BLAKE2B bff94b2ae1b6d23eaf9a60deee4e78ee3467eff9d53c1d6ac8330347647b54700d4b3cf30be84c071afc34a4517b3135f6b18011418ea5dfc0e2841da1a30874 SHA512 abac68c20bb670b29f405625edff0330ce5af51763a50ee7482c3ab9d39c7335134d77c0f1a94ce4914c2f454d493a685841e07628eb2aa58cc66617521b6a65
 EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 393 BLAKE2B 8acebb119c5b03439edcd15a8c93510cfaa74503dbe1ab97be89f7158cc626ab70be25de32e14acf164f4b222fb46ee6ccaf4a7f5a3105760a7a4ed8c951d5ae SHA512 fc624943b50571afa9939138426718d97f164f95c415df78dcd2c479b23360991e6665f388f0a906b5866568c480ed215be0ad10c57b0902059b173de4e46e3a
 EBUILD PEAR-Console_Table-1.3.1.ebuild 519 BLAKE2B db1ba783c2f66dfaba8b3d9ce33f96ca1c80e252877cce22b2ddb9c8a7d240a3184b8f77c54f6df5b97136ceecf3f46f4ba85a4131f0f4a077bb79d5ef05368b SHA512 b587595848b4ce3a8915b29a8a817317001ca11a246a35f6d673b11045881287964c68681cbaef2e6458547d80d4629f6ac32ce060a4764670ebfa371dd57f90
-MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
+MISC metadata.xml 315 BLAKE2B 809a88ac453ef53b2af0fc5399f5000e372679326000cb63df6c84cf6e161daef9d0ff8dff8fd5b2cd5a2ce44156eed7ba5580edeb6c872730aaa1f1222699dd SHA512 026188cb63de3a0fd0e02e3b683612b78a408431a6867ee9e2aa83c49ba788a57542cff211c6324f3cbaa968c36c34bd1b41e9e9d3a17271956a4462cdeeb769
diff --git a/dev-php/PEAR-Console_Table/metadata.xml b/dev-php/PEAR-Console_Table/metadata.xml
index 14e7e697cfce..15baf4c385c2 100644
--- a/dev-php/PEAR-Console_Table/metadata.xml
+++ b/dev-php/PEAR-Console_Table/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 8533528a9400..1816d4591653 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -6,4 +6,4 @@ DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1174 BLAKE2B 763b350b56b5dbd7b114e36f28ea69f3f4290cf8a8278dc12d6276460ceb2ca63a19260e6a4db351928ba03352f80f43915e8aed6a84deca1d7677f37e21856c SHA512 60caa2cd7c97087a7ad80d995d1ab113913968652e1990d7df0113b97d7e0085b2a721c58c5bff581ae0291d4e7f3a5734bc7365b69edaa3a3f12b1edf0f6f85
 EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1120 BLAKE2B e91c8b18e150d98435b792ea12c84dfd171d63e7963b9b073156d1b4b49c86ce68734606211cc1340aa66ddba675456d153f3da4465f3c1c4d3b4df7949adf36 SHA512 7b8246c9ef8257bb14a3b4378b69d7dda5a022247c9f94162954be9b9f06a3173d67365387927f7a0a875b4882deaadcb5111e98b097f984739a9319dcc233a9
 EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1169 BLAKE2B 73f2ff2985933c651a3f039c421657c5639bdacf08ccb352b590a80c49b3070bfba44ab8cda1127aa330a9d6c410ba0ba4c949c7dace6ea38bd13c2f5a731f74 SHA512 909814a3e395b0b5a078d41c837da720304e24ad2340146eaefc704ea4698da5692542cad335129d791267a600ad21c4ed13302449d1d1bd18368b0e8ebe6c2d
-MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
+MISC metadata.xml 515 BLAKE2B e0f68b35bf651484ec70d5a2ee768bdca8c7d6f4e4c241d5702955f8e16eca1d2907f450c4990b6146923a2aa88ab60c1e5761069cab0dec5c6066153f0a3584 SHA512 5defe97d319b929aa56c2784285e235124fa6e29a27e30890bc0b35b76cdbb4a3a700fb653dbbbf6cac6d0132c16683c722ded8c32a96e30d5656613776d77be
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
index ce4c99ce49a4..6d24d2bc5e13 100644
--- a/dev-php/PEAR-Crypt_GPG/metadata.xml
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -13,4 +13,5 @@
     <remote-id type="github">pear/Crypt_GPG</remote-id>
     <remote-id type="pear">Crypt_GPG</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 4ca3630d0be4..3ff8356b34ff 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
 EBUILD PEAR-Exception-1.0.0.ebuild 684 BLAKE2B c8d0efb6b79cf6a3cf25430bb35f1ad4d2dde38739310972874179c2fed867c36bd72fec99a483278a5a094d4258f82e918ae32a00abbc4459754d861b7116b9 SHA512 911926590096355f403971af90976eb9f156e3ed08efba7b6570fa1636145a9af693c9f29b3f2170b4aa3a4ebf34e424e5ab03eda554bd39a958f9314fab42c8
-MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
+MISC metadata.xml 387 BLAKE2B 6252502a9c87fbd9661d95aadfb5e0c97f585eb63a196de865690e09216c9f0e1cc6d25035c014a0d59a69dfd605a30ddb88728c4e7cec295a810fb70c36c912 SHA512 1b04eb2e9c576527651ba9a35693f3cee64b519d288da309e3e3ae2f8ba0ec7d35fb1238d7fe70242fd66983884e8121ee17f09902a2942c24025f54cea0edea
diff --git a/dev-php/PEAR-Exception/metadata.xml b/dev-php/PEAR-Exception/metadata.xml
index 37885d3bad10..d627ee6970d8 100644
--- a/dev-php/PEAR-Exception/metadata.xml
+++ b/dev-php/PEAR-Exception/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-File_Archive/Manifest b/dev-php/PEAR-File_Archive/Manifest
index 7824686bb7ad..76465cea4d41 100644
--- a/dev-php/PEAR-File_Archive/Manifest
+++ b/dev-php/PEAR-File_Archive/Manifest
@@ -1,3 +1,3 @@
 DIST File_Archive-1.5.5.tgz 62598 BLAKE2B 8aa82e244f01c2ae6b5761fd4db9eca0ef32dbdfcbf3ab107936eac5ff4d48f875312c691232ca2bf259f6701863c16c3b137488bf0f33960ae9fde80ce0b3b8 SHA512 528449e59e0853bbd73e2d7cb14cd11748e68abe889781f0476c6206e0d15e1c4b0b457172d88e73f7bb31cde3b6612ab3e86d8862322e0921e00db331f1d1e1
 EBUILD PEAR-File_Archive-1.5.5-r1.ebuild 684 BLAKE2B 7587f636234c8de63d73149faa53c6003ad93f7d93a3a2e001d7f21a8fa1a4799daede3610f7cabc8ac52ab3c7dff8d52e1058abb307899f989a5867843bc4ab SHA512 51e519e0e00b062b385f0d4db2bcc73ba2a685e5dffb38e32b43c15a06041dd0c6a6b10f026b5b47af12cef88432d421c667eeed6d32ef8320bd06af0bbdce8e
-MISC metadata.xml 314 BLAKE2B f15134512e7946608f8fd7cad48ea26d03e1096163da6cf211b93cfb50b31f8ba83e2dbe3ff4e02a745466c808ad0cb74f6bc476843e6e549884cf2a7d6be00d SHA512 bf5f29569f76006e3ee0a8a0dd2fdd7ba95fc9152d74206dcc22af239a177066bcee480e2529b63ab1e7caf3cb755a2c0d33a7e8790127baad4597e55eec077f
+MISC metadata.xml 314 BLAKE2B b1e1a1c27beca8bdcaaf5b7328d3e182847a1a9cb87a15ba241fe843dd498fbfb0c52d91878d4a602516bf316e0dcbea5083628ef1d74e6f0f12e8c90c4880a3 SHA512 fe2d2bd1d62144af42b7d476fe5c24d4f4014407456c5b09dccd0b2e93ee99ca7614e70dfd649f82e3202ec8bef1baf4890889c95ea88935c712d2c1f0901edf
diff --git a/dev-php/PEAR-File_Archive/metadata.xml b/dev-php/PEAR-File_Archive/metadata.xml
index 5d4c59b9bcb3..dad5f85241bc 100644
--- a/dev-php/PEAR-File_Archive/metadata.xml
+++ b/dev-php/PEAR-File_Archive/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
index 8cc8e6812648..59252022f09b 100644
--- a/dev-php/PEAR-File_Find/Manifest
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -1,3 +1,3 @@
 DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
 EBUILD PEAR-File_Find-1.3.3.ebuild 1181 BLAKE2B 09d6fe1789c53aca00a6755916953db26b55f5cbbc8f74c0b41e93a7aef891aa564387910e7a16df16f127b4ffcc5b0b6705dba30706d61ec301aad68e2a6b2b SHA512 56794baafab32b7b1f4c78f0a70e55380eaed0a4962033ce9cb0bd89888b4b536d807546bc4c65a7a17d8e3b5f3deda8e0c78a10ad6524d73f3a0b7888a63316
-MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
+MISC metadata.xml 377 BLAKE2B 2e2d19ce7ab78e51d44c5a86098fe84749f1876aa2bd51592e7d74af28c678c87cf6ac966d701e7e2936281804309be9a5d107f238e9bd085f9da55161f60c1a SHA512 2fecaf5f765d453a6d4745e85e7b6aec326e7cd4eb7c2cc2a8f2c492d24e2f1d50eee7f01073e9b7b5e03826546b7a2dc424ecceafc9b25441c7a2592a3e1276
diff --git a/dev-php/PEAR-File_Find/metadata.xml b/dev-php/PEAR-File_Find/metadata.xml
index a200773ff92e..5d3d9ddeb2db 100644
--- a/dev-php/PEAR-File_Find/metadata.xml
+++ b/dev-php/PEAR-File_Find/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-HTML_AJAX/Manifest b/dev-php/PEAR-HTML_AJAX/Manifest
index a265d257c4b9..0469172e1990 100644
--- a/dev-php/PEAR-HTML_AJAX/Manifest
+++ b/dev-php/PEAR-HTML_AJAX/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_AJAX-0.5.8.tgz 140357 BLAKE2B f1cab1cd49ff711267c76437eca6cb7f482118de186722003bb66354cae5b7df9a5ceae8e335ac3a018fd626c74637503d7f9f32a91dde58639b51cd7da6d869 SHA512 3a10f516c6fe16d98d31290bd29a80a10fa830429a529b0cf6d03009f56d56d906e786b3f304b1c94b98e96290057cc74f3373acdd352fcf74f9616962ff9ce8
 EBUILD PEAR-HTML_AJAX-0.5.8.ebuild 496 BLAKE2B 2620f9f4027664bea46a9b7ad5732efff983ef5c856606f814ed7d9672d9da65d6823ceb05878e3fcc59d4ece87389172df71589098b537cc2973ab741eff370 SHA512 6cce6e7bb731350e86c43a03cc6c7ab821045236c713861d40c1dd21ac36ad033c65e0ad2b12701fbbbe9dc12f16184849168befb8aa83bc0dfa4129dff85454
-MISC metadata.xml 311 BLAKE2B 17bfddef528b52802263c6e296322fb75c1ac2cd12b78c39f7282e5f51f19a97f81c926ef63f610f0b61cfbce14b9d8abbcc7bb80645a2ffbb8a5d9eaf08fa31 SHA512 a69d94c266770a2c34f27c1be4e91d67e61f0889923989b0364204004cb612b27e74fb5d4dec938052a451f11e9daafeb2a2f1c734dc527746fb36e3011158e8
+MISC metadata.xml 311 BLAKE2B f3ef53dfdaeada07da30a67ea4d84ef345df9b7725b716def6148fe2c56f2e346004509bcc5b27d097e40518f2b5cb150d1c8180eb8a37aea4b0f67ae2217239 SHA512 0d2d5c0fb7f56f9aa743ccb1c3034005edbdbb848780163812f30a2910c896013e7e82b0cff1d7e9e24f78b2a75ed3df8c5937834bcb219efbd53ffb90224630
diff --git a/dev-php/PEAR-HTML_AJAX/metadata.xml b/dev-php/PEAR-HTML_AJAX/metadata.xml
index 819c64a6c2c8..d7eb71f3cb2e 100644
--- a/dev-php/PEAR-HTML_AJAX/metadata.xml
+++ b/dev-php/PEAR-HTML_AJAX/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-HTML_Javascript/Manifest b/dev-php/PEAR-HTML_Javascript/Manifest
index 2da4556af279..faf044e33194 100644
--- a/dev-php/PEAR-HTML_Javascript/Manifest
+++ b/dev-php/PEAR-HTML_Javascript/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Javascript-1.1.2.tgz 8620 BLAKE2B ea7eb4296b97ec6f2c0f3d32d3cce367bd8472d13dcf1c6d04dbaec2a649f9bcd85b3f913a4c384ba43c983d33fb7ac10aa8b28983c488f7662efb4708bcf4f8 SHA512 2ac6732f9156af318be8d17d1aa9c0040e5367faf29d6e968740d2fc9ab5806b3a08ee1b33f1c1fd618768a1c50ec67b8ffae6975dda7aa77234ef22e0ff8545
 EBUILD PEAR-HTML_Javascript-1.1.2-r1.ebuild 434 BLAKE2B d0e210e9c377e4e9e0c7dc07904e186ffdf87ef0a0bab14111eb4fd84ae826f3cfaea43cfc63f6a74e220b270fa8ccbebd9d5aed47ceb0b61a21d7d5e9cd427d SHA512 35cf0cc1bf403cd5f5d35c3ab5aa608050b7ab3dfdfdf121ca342022154d8c89660a73d091efdf061f9fd40b226c3fc8ccf5f3396f59a8ecc123f91090401eeb
-MISC metadata.xml 317 BLAKE2B bf3c184211f7eeca242194a13bab4054fe23ed3bebb0077075de372192b0c70972caae805cbe91f428639624231135a033c5812c1060207f4bb941ada72351f8 SHA512 016d945969562fa523bab4c76645d4a78629e30af6fc300b5462f5147fe31bfa883ad949112d76df0d243985a3bfdcc74364e3b9c42b12de034c978dc898e839
+MISC metadata.xml 317 BLAKE2B 417601fc79a46710de07b39c95793a2caef14fd34c8657a523aa6ba4e8dce075687485d4ca085a4d658ba4a377bd72007813cb0bb0ce3cee42074bf2e730c744 SHA512 32dc7711d64e948b9d7cbb607e3532fcc04e54393380f4e1adceb16fc16ece27006902433744f059fbfb9a945be33ecb981b10d479e6854c186d80324e479874
diff --git a/dev-php/PEAR-HTML_Javascript/metadata.xml b/dev-php/PEAR-HTML_Javascript/metadata.xml
index 9a8bdc350546..4787860c3221 100644
--- a/dev-php/PEAR-HTML_Javascript/metadata.xml
+++ b/dev-php/PEAR-HTML_Javascript/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-HTML_Template_Flexy/Manifest b/dev-php/PEAR-HTML_Template_Flexy/Manifest
index 6ef167f36019..6e70943f27aa 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/Manifest
+++ b/dev-php/PEAR-HTML_Template_Flexy/Manifest
@@ -1,4 +1,4 @@
 AUX 1.3.13-postrelease-fixes.patch 1937 BLAKE2B 5ef09498aa13ade77390b7aa5a7d1bb5170cba6fd990e27ad2f95e2af11be7cba542077fb6983e4057d7ee7f834bdaceafb2530caa104cf0dea8ec79453e814c SHA512 8e525617d5ea6958628acb583cd6eb5dbc5ed6eafee36cef82b543d77f32dfc741d65f2acf62cadd9441fc609bee25d7bc5dbb0a66e6a02a0e19c81ec815b676
 DIST HTML_Template_Flexy-1.3.13.tgz 213779 BLAKE2B 3e5cf6657095d86bc8910c4e57c33bc943cf135b2d655b29f65aee997f946b2f1b3eaad445d1f529ae2a80c0c6420c76bf5c560a57e3ff5791964f92ce0fd85b SHA512 c99257c6f5451dbd2176251295f425950e359b2c0e76c1627718b4306ac12417eee697882250b4b5571397d8e47d6b3110770d66ebc91d021cb66064b86b5ad2
 EBUILD PEAR-HTML_Template_Flexy-1.3.13.ebuild 484 BLAKE2B 018c30b8c324ff77f517f64238fc8bf77782263f8328c82a121515f37d02ebe43fe25316763fdd3eb7060a7418c880b9d1e21975eeac92545cf0912311ed577e SHA512 e0b61ac0c686930e64711fa166f89e8938f22cc2a25e3b58ed401e7f56e5bbeb4f008f5c6440cabdb2e08d29ef75f4194d4f496cb6ac1a0329a5c4545a8a5701
-MISC metadata.xml 321 BLAKE2B 1f66fa934126f0a2173994a87f47a13747fb2ac1fafde475a91718aa52aede36c9b07b6ba8b4647088dbdafbfbb4272981ab0053fda527e73ef3add906d7ab52 SHA512 1ddf85f84e478fc10a7aa1431fe3eb933e9b09b49c5dcca1340b95cd7e880ea2af158b12bcf24fa9b0c523258cadbfb49bb14065484b8797c713ee4f0494152a
+MISC metadata.xml 321 BLAKE2B 1ad995f7f0fae38a7ca3c87da5f62174ef2b9641b09e3acf10cdc08af6179cfdd2ba93e10ca0e0d492c4336c0b4c90c03a9419e1216f102bbfc49af262f77060 SHA512 51990aad06b34a9775ff579a2353db7d26cc02476e2c7b44f3003931b01a47bb85865f8cf7feade5dc9bb2c5bceb972e27e05092a209e734ff235548558e427a
diff --git a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
index 86cd30a85001..177eaaa943d0 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-HTTP_Header/Manifest b/dev-php/PEAR-HTTP_Header/Manifest
index aadb0f155967..60e2053edd26 100644
--- a/dev-php/PEAR-HTTP_Header/Manifest
+++ b/dev-php/PEAR-HTTP_Header/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP_Header-1.2.1.tgz 10682 BLAKE2B ae8545326899f30c528e45e16735fb6da4ad2da3f066cd62df74fc0561085869d8d4b9ea82fe763095d87a5da1844682bd0f89676c89bebd1cb3f489a5d29ba9 SHA512 3d4245c99445042c6fb8ac8133be742f5009de8fa10e7104f0558ef091ba449c201fe0727d9714470e0d2d0cf8d8639c3d9b08801cb0cfff2d3d6e457364e137
 EBUILD PEAR-HTTP_Header-1.2.1-r2.ebuild 493 BLAKE2B c9ad47706e53aab08fceaa886f908eb7c7ca7eaba75975f9c412074ea1f4806468906dbd3c43dbd685441bec7a6195474f23eb8d8cc5d416ec434821141f1d11 SHA512 cf466cf5d101dab13a5b491ed4c4c4b01b3c10d2b196efbd4e67385ef3614fa950047406b1273991fabe057924901f49036c770821f2a1acf3fdd2aecfbf58c3
-MISC metadata.xml 313 BLAKE2B e4bd6856cb0bf9f1f6605209ce129b69ff8d37e953a089cc870aa62bf4cdec53491009fadcd5a17c8368fe90ace5d285b851309ce8a17b871f992fed995d4927 SHA512 d2570b235a08acc81bfc6d77dc3ae0d57238f1129e28a7f6304e67e7fae830ad6cf6ec39ac3701c270db7a0f59c82adcbbd0d979a9fd4bf1fbddb68f2f59f82e
+MISC metadata.xml 313 BLAKE2B 2b2f7b44122c03a8cce3644731e2a2819bcd43fce3378faa00539d15baac597c66c3c1dd0667af83bcf6343809fa599dfe0d7984719850923b87e671ba165c7d SHA512 9438b86bdca640fda1cf97fa5de910f0876f894972cf92b22f833261c99b8f283572d725c8e5e270d90f1f9fb1592e316f0a7166e20bfd4efc48c835de4d7daf
diff --git a/dev-php/PEAR-HTTP_Header/metadata.xml b/dev-php/PEAR-HTTP_Header/metadata.xml
index 76fbdc5bd27c..da7866059839 100644
--- a/dev-php/PEAR-HTTP_Header/metadata.xml
+++ b/dev-php/PEAR-HTTP_Header/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index 7abb217bf759..9a78f64cd263 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -2,4 +2,4 @@ DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec72
 DIST Log-1.13.2.tgz 46801 BLAKE2B 529677ed8a840742840a8ebeb5f5c7d4e8a8af257f9c3b1cb9ff990e42e760e0040f7df8d94794f40ec5654cf33e1909b7b48ca3f656d2a2bc0310c6705d6c24 SHA512 a4adaf7ee2af600a6c14ed398159c61a7df73b2c6be928f0ea6bbaf90d4b0e866e5a169953fa7819e293cd5cb29c6aca762ced79f3619dfbb38af1ea8731b1c4
 EBUILD PEAR-Log-1.13.1.ebuild 1349 BLAKE2B dfde1d63591fbe17aa07f2b21f1f9283befecf9c97de833dccdf97e9f31822274fdf28d79ddc28e074212db1d3018d82ec8264c589da5cd76c54f97ddb0850ab SHA512 034c474601f96cf2f1d08e1b9517809417e332d78b69b473f4c26c2c17b2a7b24b591d9f502ec42beb9399ed79a96f3a97f3684b9c0de29cdb85f830d604119b
 EBUILD PEAR-Log-1.13.2.ebuild 1355 BLAKE2B 9b3c58f6b927d4231a010ca39eac6d374c855a175a4dae4f19f4a1e6cbf62eba674e589d97f5bcd41f21e96c39dc1e23b9050126247019d36bf6c1729a3d2844 SHA512 a1c01f4d37ef9217f8dcc7ffdb8dddc3d0530630a9cea89d6aace531461b45737d7a48819f90862b1293a1b385c24e0ca07114b24eb0a92f5e143daf78b59ca2
-MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
+MISC metadata.xml 305 BLAKE2B 78433e4d5c5d5c6ee0346bb8982aba7b44cd3dd8ab7bac01e1b2895734c64aacdc4f805a2eaca7c8d5e6ae95df313cee5934b4782651f64df4f8b248aa702ff6 SHA512 a89d3cecf9e9d8c545a9d70d3cda6b5adb13e77c8d86588823d9b6b4ff146d3323aeae0bd675e30cb5652b254203669097ed5755d3f0dda103031f9a329aa23f
diff --git a/dev-php/PEAR-Log/metadata.xml b/dev-php/PEAR-Log/metadata.xml
index 509eaf73bd24..0b9fa8b836f2 100644
--- a/dev-php/PEAR-Log/metadata.xml
+++ b/dev-php/PEAR-Log/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MDB2/Manifest b/dev-php/PEAR-MDB2/Manifest
index f649a1b073aa..09883355b11e 100644
--- a/dev-php/PEAR-MDB2/Manifest
+++ b/dev-php/PEAR-MDB2/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2-2.5.0b5.tgz 136834 BLAKE2B 4736cd205f186b56af4ad7b0c6a83aee5c042d06202464b4226d76e0e37608472f4650f6849de1912f6e47f35ff41ef6fe55f6449835f86ef7eb7ae8bb6e02e2 SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc
 EBUILD PEAR-MDB2-2.5.0_beta5-r2.ebuild 872 BLAKE2B cbabf3465595da80c68053835cfeb710c4a3aec190d5e61d331cb6614c73fd9880f8bbc305d6d85650429e29265f4bf0892f61be395e5ad67e607348617cd903 SHA512 b872b8a961293f6a7db85717cf4812fc68ada07e88613e48713416882d37d4dd95cca8b491113890b3d1261d14b77a41c1bc462a829c63087cff72b5999e38a3
-MISC metadata.xml 306 BLAKE2B c73f196a4a888c22bcde1298962ef829f5993b71d8ac5ded01f41b5fe2e91f599f8c9ed64e134ec26db62d9cc3c610397bf33159f3efde999ccc9cd40ab7bd4e SHA512 2edc3e48edb9d3788f5af8aea2797a72ff699c3fe28ed7664ebc1b1abe5d25616a54d3b9ace88ffef2399113d1678add85153b469d113f6e9e82808390d0373a
+MISC metadata.xml 306 BLAKE2B 05a23bca412cf8aa2c4f27265803e7f9d0541c7fb816df0a6519915b67d31c0260ebbbe0f99b8e8656aa6fd725b46432d727a12725c0234d1286c68906613809 SHA512 224922b9e4bae0dc17f47baee6e5e5237d3ad1afed5512eb7469b5740654cd50c73445defa751ea2567498f286ca1f79ee48fca8d6d435b0d01159efd6df5b30
diff --git a/dev-php/PEAR-MDB2/metadata.xml b/dev-php/PEAR-MDB2/metadata.xml
index d6d5e4dc957f..d6eee2d3d100 100644
--- a/dev-php/PEAR-MDB2/metadata.xml
+++ b/dev-php/PEAR-MDB2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/Manifest b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
index 30a85f36914a..37098ec2b1a6 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_mssql-1.5.0b4.tgz 37246 BLAKE2B d53ad20004cb96d4c927ff897ae37a28b907c08e8ec9298e18e9c237bb58eff6d5d5e60b466608db6a143a71fec6d519a60d6da502cddf7018a777f65d278560 SHA512 9d8634508eaaed7ed35c4a2e61dcd31a20049f519dafeb6ac07541c4121ebe6efebf1db42d0352aea90971f3fd272085278fef0aabce4a527cf61bb7205321cd
 EBUILD PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild 371 BLAKE2B 8b7fba2cac3fad06884ca358d4d5506d596325b690456386d859a264f5cb4a430f70c723d1695dbb5dc78eee4635a9fe82e85085f4a9bf81863a6313e530a09a SHA512 0e2201c3ad683d0a4a51fe56c747d4dca7206b71c772d6b4c370632ef6ee80462305b57a10033e7a7d91141aff4a6a7ddc2a0d1d9df69ad786bc241d1b26fd03
-MISC metadata.xml 319 BLAKE2B 4038d7d1c024f4120bc52e536a246ceea95c8433cf951b285593b4f2da914ad625497ec3fbbfdfe36cfaafa0b5abe53a3f5d14a21a4828b43124863e046dbbdf SHA512 2c7cff072e4fc3e17e551f9b464ae273ed28fd38b267653befac2762c344b4cd34f3d98798f0c91ce5bead59b41c3fa2f5fbac0b989f9660a585ca9fde4184fe
+MISC metadata.xml 319 BLAKE2B f081f4480d02b756072f56a9b3b7c4ab03b624002df4a56657f59e3f30884035da692f32088cb8aded112a5f72ca59bee14bd2523391e50f46924a2b58a27cd7 SHA512 046805dccd9ead52697d85fa0f4ef83d9500c8dbc3ceffcbe2aa83e5d855ffa467a53df86db50c32c05d3d785c1739fb8796ecf597e4ffc1add4024cd67e4529
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
index e525c9a36124..bfa764ce1662 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/Manifest b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
index bbd3f6211609..a5515d49e8e7 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_mysqli-1.5.0b4.tgz 49450 BLAKE2B db8341c8d9fb6f121daf0bf8d5004b57afc59a0dbe5fa662591d2026424acc015cc4b23848284f639c8d614ae01b4f43a5d185ef6b8528df79079356f3f0cbeb SHA512 cb4ba5b34b241f1eb6da72e63f47a99c939ac895530b20d077cf94fa96a9b36826aa128386ffa10e51488f8f3e93da9015805f6f28ddb8729e2812ff240ea894
 EBUILD PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild 380 BLAKE2B 9e2c8d9ed0cf38ab745a243a885e86e4b6f87916781595db8834f2b3816d98797deebfc4d6be4da4a089d805c6daa4dd852173d01284dc0804137b5183496d16 SHA512 f24f31b8c98b039e3fc0993fb6f223033fb92af8115722508d4a0633917913ae86b260342fa75235280acbab8bcc7c20f794b3805cf9e3bc8d6f4e8893ed89b7
-MISC metadata.xml 320 BLAKE2B 42ba23a1fd9dbaf48892260221e3f4eaa6943c59a275b7c02191d9b35d9eeb2a23e991ce48a500ee3c99b6b6638d8102e254a14b377d13b139a195d17e6899bf SHA512 27fb6b627b6937e4d0f8e294e0a193baba97cc52f463484770ba81ddbd08fdf5652b7d0b3ea39f270efca14fef0fc235c4549743cf47a192271f9c73d9c81498
+MISC metadata.xml 320 BLAKE2B 21fca6b313f4f414bf5b4d52e694c594af2f9f6d069fe7827a84b45de3703b4a2b257a18eb8e46427ac8767dee720b2c786ddcaa6fdf0c42f46dc27a3139fbc8 SHA512 318eba61bab9f3a5c78c02f53aba6f3ca886ac8b5e55663f06417600418a10a3bc9e8cd8b82ef64f58faa1956a5febb5ae9219aab3020871cf44ef2da45f7193
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
index d81856f5053e..9fdf27a5ba30 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/Manifest b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
index 1621630f3581..42c3b5e44ac4 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_oci8-1.5.0b4.tgz 44672 BLAKE2B b680fe38ee212cf6ecdfab1b361b710060ad239fd9312783da7e61d52ee84da81f8eda3afc5b4a4fd5bcb4d2dd82922c4dd0f601a13b1d89fd20d79e3fcdcfa3 SHA512 2b4327a06c43cb28a16ead10855377a6501bddfe30397b5af9c7037ce67394e9a9815578b24bfafcf0c8c20ab87fff89f7803b5b99afa5e5d2a278c78588c3d2
 EBUILD PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild 352 BLAKE2B f1d0f8c6ea6f70b2edc3feede7d7bad5517c854c1ede19d2d16a608daf9e126886fb6b31352c71b6d15910a15bb4ae522c0da7c9228c43e456068791ddc95652 SHA512 870c6582063acdc55320189e9c02223484028395ff34511253f6296f5330a2726089563046d009f0935d37459b56285cf3e31257a96494c09b30355f4a67f190
-MISC metadata.xml 318 BLAKE2B 2945fa5fae124aaebdc13d070a63b452b5cb68d16cfff3d35a300804432fa193a3b50c95d1fc45bab25317d7ea974b5de6eb3dc5e5047e7e9043072b9d48a814 SHA512 dfe4a599ae014abb2451d8e2d1558b7e1fbbbf150755e660cb94fb15bb27f77e9ce6b6d1ff8b51155eafc8a51ed420b84bfccd041074a446b008e8e493ad22b3
+MISC metadata.xml 318 BLAKE2B 6c4528901cd68f1db19ae6315c3df70d0b1799cec2aadb959ac217b6e478a3e3d56038ee5694cd1fde80cd424f6355a43e8c9e11c1d137b3dcd5f53189c6685e SHA512 22879e3099cdf765425a14df5e51b49c93d0eb5a80e165632a66bddbf0cb61735545409b25e45855fc107388804aa9af23d206ef5cca614d1a7d6f671ecaf8f2
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
index cbf802ed4eb7..68a347a1a1c6 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/Manifest b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
index a9c371ba55ae..89753bb548d1 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_pgsql-1.5.0b4.tgz 42404 BLAKE2B 344d952cd745f66e3636c90c2262ce643a5af79a9fe919ddea63a76a7e4c9b97295b06e083f2b8866702b131bf5458380fee66b9cc6aeb5bb2190fdd189a4b03 SHA512 3beda16ee937f3f3af9217f778ae21bb67abe21bf338efa7fc7df0d512bad41cea5b10d4be26bc8055a0107cb14a814ae5da3db2d4346d479082d31cd1cec091
 EBUILD PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild 381 BLAKE2B 64874fb3ca320f6da830c0d7e37db108de6292d774591f008e43ca5b579dcf3c5af403954fbb7c3de8c9d1f28efb4822584bfeddd981923a7766c46d699a96a4 SHA512 25efba5364956e298264f6675d36c218fa4c9c70bb8258cee8d467a3898210acadf28a5ea4694749d5d75daee181d671ad7ecbde50d7f91696bea6c51042157a
-MISC metadata.xml 319 BLAKE2B 4be4d41cfcd4c23a3b5bff9c77d4f1d374974039f86d8263b04cdaed33da08bf15e8215c9626cae2df54c104bd93efe6bb2f4d0cd17191de1fa73c86344c210c SHA512 9081f4495127df0d74683a605330aa2c9cd615eab65d41e8b5636b6614ac38e6e679e49eaf3d7dd9e23e774e9b389963cb3ec2eb8d6f673532fa4d22ba12f357
+MISC metadata.xml 319 BLAKE2B 192ede32dd1fe26684c6a2d0b8982c58eb45e8febcc2fbce6ea640a8c4e936dfff37b4dd645a2d60b5b0ff29ca85b76fa6032cbfdb0b1f9388a621d973181ede SHA512 9b6562deaa5d112031919777ed2f9c49b741ea1e13cf22c93a6ff18276f9cebfffc7a27266af45ef09be1145646e3e63752ac7450c774530cd3121436d17e4a1
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
index 18ab0c34e2cb..ad62d2e06153 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-MIME_Type/Manifest b/dev-php/PEAR-MIME_Type/Manifest
index bb0abaf32596..0497dafdf105 100644
--- a/dev-php/PEAR-MIME_Type/Manifest
+++ b/dev-php/PEAR-MIME_Type/Manifest
@@ -1,3 +1,3 @@
 DIST MIME_Type-1.4.1.tgz 21807 BLAKE2B 9f90e1dd4505ded94ee47b913814b21a7c9ab9bffabb330005ef5f04bcd9a7c89ecc5bbedbc65c60c63e4769fd0a50bbe0528b1622a25a86a4b7e1873f840f9d SHA512 f70507a44c0f81381baa0532a0f1337932cd69d054b96367b6ee98873fd85a51721f876b9aab679a18aff10b151ad1b447ff1c3f92288827e74e32b2627cdd01
 EBUILD PEAR-MIME_Type-1.4.1.ebuild 524 BLAKE2B 6b30fc67b83b07ad120d23aed9e69498305b504a262f3fd56d8d8cd47da27d78da9735e025686f81ee6908df385f0d98951542409c5d2051b75d0669dc388336 SHA512 c899ac3e784322e89f944e5d5603d7727f0caaa7cbcf9c300f5d220d0e53492227cba734e5b4c5b9e9a7a58615a38b6c3e4f51a5912475df39a686f4d405e901
-MISC metadata.xml 311 BLAKE2B ca0816a4957f3b5ddcb64ad8f5c9c00078a8a36c0f51b7ba40dfd2086c3de48a0fed47b7d35a0b12458a9c80d4c20db80e1c7d91c8b6a3a4e68d6d12ab8cd50e SHA512 a2528b21a2d20151b73bedba498db404cf49fad1dffd51bb74478e8ca97b3d5c07bb6a2e988c75a662bcd28af6c5a5e6b5184cf3e835787262b430b61d20049f
+MISC metadata.xml 311 BLAKE2B 67763dea681c53b522e76df5ae88cf4017680f55b01232f1b64a1880aeb6fbe5b922750a4f2205c76716a83d6ed630e7ed886d293eea2a02273b30ad2d9a5e3c SHA512 6e3a6638d91afc74101a5708e557c15f5e6ba8772a4c88e2218a4049ec260c58bc73e4dde8b87dfb2b7afc06e5eb37f80031c03ac9ef1e5875ea2b4fb5123571
diff --git a/dev-php/PEAR-MIME_Type/metadata.xml b/dev-php/PEAR-MIME_Type/metadata.xml
index 0ee12f20bc59..dbd2241364cd 100644
--- a/dev-php/PEAR-MIME_Type/metadata.xml
+++ b/dev-php/PEAR-MIME_Type/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
index eda5f5862206..f34108454360 100644
--- a/dev-php/PEAR-Mail/Manifest
+++ b/dev-php/PEAR-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
 EBUILD PEAR-Mail-1.4.1-r1.ebuild 473 BLAKE2B 8d82c172aaf9b26b7964913d8fd002e9285fb63688b4bb55afe80ffaff659eed912cc5d02f9f372f692ebd02a26e455348334d8490899e5d225614270e3b1466 SHA512 0a5e1303a430ac4b19d7041dcee129a381d6c0dcc1f85433e7acd3132e2c707ad0e3c397545ef7360583e373a4199d80d97bd90445abc4df56a17e04a9b1423b
-MISC metadata.xml 306 BLAKE2B 82277e19d97f3d3d90c3a7785f58bc83fde319d3713254686f3607c1f5a8750b806080ed4a9db754b5cb5693af5bee73137b14ec368519a4a61b4f15341de91a SHA512 cc21c255e8437d641d2eb2950b641c543bdc8725bd8b7f27382f6355f053c781d36778fdb7fa630270b60ee4580c06cda52dfb3d757c1bf9735915c398df99fa
+MISC metadata.xml 306 BLAKE2B 2c092a619deb9cd37f482fe91e811863ccf87eb3875299a2c0be4b2ab214fdd27ec7d854fe761a3879532df26c1240722d7f0065bd0d4261c7767eddde6098e9 SHA512 49756774f081888d2424c51996c4e2daad28f3a7c17c4eb13e6fe669bfce5fb884bab0fe6af3db7e10b8c3a344365049445a8b9dd57e1cdc6a086ed42d75834d
diff --git a/dev-php/PEAR-Mail/metadata.xml b/dev-php/PEAR-Mail/metadata.xml
index 95e37f18a0c5..d44800881814 100644
--- a/dev-php/PEAR-Mail/metadata.xml
+++ b/dev-php/PEAR-Mail/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
index 9c8d8ccfd18e..dffff16918e9 100644
--- a/dev-php/PEAR-Mail_mimeDecode/Manifest
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -1,3 +1,3 @@
 DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
 EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 480 BLAKE2B 227f83adfd1585ab08f1b42dd86722d2bd428ebf320044654da037d98c1bd5b964b96086697555c0e4a721eedbfcec5f9b1d8b5ea0cb4cf3bbbfeb444c8e2427 SHA512 18ddcd6f6201484794d380533546fb352871f3d683bc7773c7665902e8a31d3ac7685aca5c27cb28edaacca2ec35462a2ad72252a89ae3aa1fdef3eb06ec258c
-MISC metadata.xml 317 BLAKE2B 00a849c6fe77dbad0b85efe11bf5826ee7d1527a66615400579b33ad6da1bfbb9e86c70bacec14fe304d20e5672cfd394643b4df5caac1af6fe9991deab8ab59 SHA512 00a0f91819696baf2e347036e70f5c32925ed6694144dfbd68e3aca5a62e3c6a157eabc8b4b74d3392008468eb23ee9c4639031e31334733e33be85bc19e2237
+MISC metadata.xml 317 BLAKE2B 717a5b21bf1dffb0b62ceff4887d822d4ec077887da235ef8e1f388e923235db0f585416d6862bc1e7e37873c8de8d654bd1d89c1ab69cc7d95fb45c96b8dab3 SHA512 f6a99db3dfc9d23af60b4f6389146d6a200e583baf91e07cb32c6663824ebb2290fff2bd0c7cc499fd89363debb91392a9ce273240e68fad7c2a6a218686a873
diff --git a/dev-php/PEAR-Mail_mimeDecode/metadata.xml b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
index 05eb5d939819..fc41100f6739 100644
--- a/dev-php/PEAR-Mail_mimeDecode/metadata.xml
+++ b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Math_BigInteger/Manifest b/dev-php/PEAR-Math_BigInteger/Manifest
index 96077c7b3aa1..b291dbc43eb0 100644
--- a/dev-php/PEAR-Math_BigInteger/Manifest
+++ b/dev-php/PEAR-Math_BigInteger/Manifest
@@ -1,3 +1,3 @@
 DIST Math_BigInteger-1.0.3.tgz 28009 BLAKE2B 21bce67edff73b791322e364d15a1da2c57e9559aa4684b435fe6a8f17a14ce30b81d8ade0fc46d995a1c8f61843ec239ba1c09394adfa9cf77ccf448ecf3d72 SHA512 c8d6d638a6093b39e0f95e55d4d7488ddda1ad512504a97ce62a78ffae969b0d90925d6252b26230e5664f84b0a6b70fb456a678fbb291ca1a068cc7c539f415
 EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 640 BLAKE2B 6a59333654139d4691caa22cc7c0fe6a201310bea1379ad0b38afc7f40c989da0f3747cdf95ebdc89dcb9bc00304f21be3dfc4be0b199ab7c3a7f3da4b25a448 SHA512 082ea25496982e4ee1e483a25680a3b45aef98e614245dc572b124ab2aa446c177dcf5f3dba49f8c6daa2011cea69ce442063d797e48c9fec8d9e91937b8447d
-MISC metadata.xml 383 BLAKE2B fe5d5ba08fd329fb70f87a71af8c7e496a439c956de7222679c06a910c9bcf853cf454d65f5b560f378b7236e2e9e4365006e03256fcd7af69e39040e9155ee4 SHA512 b6c4d19556a70c765b60a6c9c8ef2389fab9ae7a07f9d6d4ad032e1c87b87396de7428a6e4b4f4980c8423ec12db9febfc487a32b5239a3ac948569e2aca451d
+MISC metadata.xml 383 BLAKE2B e0e49d45b98cac41efddb82207bf0350edcb1b54f7cfd0d5baf1c641f5aacee5051c6be5ebb1c4005c4a872a3a891ee690833da1cf6b42a02f267f16bf9cfce1 SHA512 ec45b1780216462cc0b4e673308afd21f0a46bfb0ecce3d9fe130d58aa4154a402ff6f9ed7ecc3ce45eb65d0f984126064a263f33445fe5f16fb061dcb8638b7
diff --git a/dev-php/PEAR-Math_BigInteger/metadata.xml b/dev-php/PEAR-Math_BigInteger/metadata.xml
index b84d917340c4..dc55a2b192a1 100644
--- a/dev-php/PEAR-Math_BigInteger/metadata.xml
+++ b/dev-php/PEAR-Math_BigInteger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest
index a856ebb2963a..753adc0645b3 100644
--- a/dev-php/PEAR-Net_DNS2/Manifest
+++ b/dev-php/PEAR-Net_DNS2/Manifest
@@ -2,4 +2,4 @@ DIST Net_DNS2-1.4.4.tgz 83242 BLAKE2B 107e57406fcc308e3f83c71df0425081ba3d6638f4
 DIST Net_DNS2-1.5.0.tgz 81188 BLAKE2B 5cddc998a376cd79adaaaa1e8cd5198ed463563159d342916adb0c77546dbf4d07214a55ba71b8c0e375d47e4ba6e96a847bc71e7ddfead892dd2c57a010d40c SHA512 c0125c1c8bb7ce6256d0b57605de0adc3a2a706f4cc22624f0fac88629aa0f138cdb258742f2d2224893c565e2d7dde9f14f2a4dde86831b2e015473c28d5e4d
 EBUILD PEAR-Net_DNS2-1.4.4.ebuild 362 BLAKE2B 0b208e032ffb7a9b9deb45839b1e840f43df0961066bc3d9111894652d7168dbe260b2537b5df05bb96acd8e30b8b6d8c755e63278faf2fa652cb35c5c478436 SHA512 bec210587978a1523cbe6f9c4cb24e14dc870ac9d22921177524d7c4c333bbf4add241b5de24c2e5bef9ae0f61d827615c6bfbda0554a5da2b222811426420fe
 EBUILD PEAR-Net_DNS2-1.5.0.ebuild 359 BLAKE2B 03668387f46ceeb41be0bf98b9e1490b982ef06277ef0f2d23cee3c2fb4b6dbaa4289113e1d1e8740c120cb64ede8e58d2c3f4bd40b6c5afee6c3e86be345c3a SHA512 997a4bb41e09385157df22710669dde6226892594b393d201635f995390254aedb03bc5a87d0327ce4b7c8d6e9f268795238cbe12e6ca03d89eb4c744218af84
-MISC metadata.xml 310 BLAKE2B c5dac87062361446d899a645418ae14a5fdb979f958087c4c2ef4cbe3afca4a37586a58bbeeede802af76f7f2d1c654eebb64eb17be4393359fffd1335faf2ef SHA512 897094fc61846e1417e87ea8c9d76f824babb9ffa1fab3ffb5a63f2ab1c24842ebcf360a33c971a172fde70017a179e23c2677d5eef5939c01bb132fb1aa1e4a
+MISC metadata.xml 310 BLAKE2B 53b201f33a573f281285308729ca7b0ef60d6ab1063422d06bb58382de5535726b51d0fd716991fbaf2e9f699c3fab9463b0a1a646967df0e8e969434957b510 SHA512 07d111abb07ae4a0ae9e1c4aa8f03bcf483d52228291b0ddd914841d457ef518e0607b283c1fc64d1d3a6e2b7f5b1b57884adfd4a33a2b1d3ceabf510d934d31
diff --git a/dev-php/PEAR-Net_DNS2/metadata.xml b/dev-php/PEAR-Net_DNS2/metadata.xml
index d2a18e6d1465..115a72bf6b04 100644
--- a/dev-php/PEAR-Net_DNS2/metadata.xml
+++ b/dev-php/PEAR-Net_DNS2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Net_DNSBL/Manifest b/dev-php/PEAR-Net_DNSBL/Manifest
index c193ee4adb7f..01ac2230eae6 100644
--- a/dev-php/PEAR-Net_DNSBL/Manifest
+++ b/dev-php/PEAR-Net_DNSBL/Manifest
@@ -1,3 +1,3 @@
 DIST Net_DNSBL-1.3.7.tgz 8125 BLAKE2B 635258a5062ff0a7346b289f9cf429103690d71485417c948d7007e4b344dbadb25097d9f0c8731cb7eb5e72b3d7be561c7d872490d859a2328bb97f9a75350d SHA512 6591b81e5e4b98092daea3e27993099028581052a7907b79b4231d549b4d9aaa6fddbd53fd8bfe9734ae41fc85c46f2fc17e5ce50e8303fa5c166dd4b3062ea0
 EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 705 BLAKE2B f5340544831ad8992520df64dd0303afa41b58ccb4098dd687b8173f7f535905ef5714f9764b9d747a3da448b5ad3361b4a6e8878ac2eacc586f3c9f1ab4f16c SHA512 6b5c63222b1b279175b235a94f63688537d32334304b71017e31a18eb82a108489a805a7b3522f50715db6c0e56d946b8bbe03bd7f8a13a71e5c4aa531ad50ca
-MISC metadata.xml 377 BLAKE2B 27b6b2942faca1e2e82de44f5ad600bc3adf30660a0426187bcb9f5b626b19d4695cf847004f20f064461e59ac0e8272020c6c7a9a965a0873cb53c3a5976ec2 SHA512 6aa25d965c699af2196695de28f817426190fa58e7f19285e5130b538e1f650f526179c75f9a6b9b478a2099e400d42fcbe04e90ac987e9fa9bf5670dac0dafe
+MISC metadata.xml 377 BLAKE2B 66bcc40b6b1ac45bfbece7040c2e7059abc610298078128bc314745fe541efa3f2facbd1342070acc70bd9ec0c7a4333811aee4fe066b97c937a7046c6854658 SHA512 10a3d0b5bf64181e9160d4bdec9e03c77c6ebc3db43ebbb25c9a5ab1294e91e033b66336b87bce3fabaf9cbd3864a8d32b19cae223a8ebe5bb961ce8ddd1ecbd
diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml
index 285f8e4bc995..d1b90bd1a469 100644
--- a/dev-php/PEAR-Net_DNSBL/metadata.xml
+++ b/dev-php/PEAR-Net_DNSBL/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_IDNA2/Manifest b/dev-php/PEAR-Net_IDNA2/Manifest
index c39bd404f9bc..2c9f3d6762b0 100644
--- a/dev-php/PEAR-Net_IDNA2/Manifest
+++ b/dev-php/PEAR-Net_IDNA2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_IDNA2-0.2.0.tgz 24624 BLAKE2B c091a8f9c3c13105308f97c0e44c6abd80fed015617ba433d83d294efe69e5431ae5b92cb019e17a603a056ee644ae096359f6638bcee3aea8a53a86ea98f6a8 SHA512 728c79bd893d7202376cf9db7a285b69b6821db89621a454081f7c7b01123141950395106f11699c991733314a05f4810f3257dbab0b29592856b35dbb471e54
 EBUILD PEAR-Net_IDNA2-0.2.0.ebuild 303 BLAKE2B 5093fe86da917b8e839a0855dc4f497b4188e475b0ac884e722c1a4895782cce2a4efe7da2092e779402bbd2337e776ae23c4eae580405da76ad50d785fcf079 SHA512 da7e74c80d10b7f6b3e19d003de3149dae79d0220f110b8d5db3bc9593127e99d76365af4b42b7bd33468fbca5fd8cdb8a9ad819e0c0214f3db36ef4f555d9b8
-MISC metadata.xml 311 BLAKE2B 7d0d1642573ab0098a946a22188c08bc7c8cedc62850f3b55eba30f4cdfff8855e6c11319bf2b75933a6c2a4c087d68f90d8e1ed34011d159d50921137d86890 SHA512 5d05aa67ce365f0962cdd21e084d45e42753c346b79e6b757a2984115664507f1a63997a20cacfec9ab4fb4ff430b20c9f6b2e453b75314f033f5d93d1f28160
+MISC metadata.xml 311 BLAKE2B 84387f63e9a55cd2d3657dfa25cdd41bd85192dc596d62f5a98282b22aa9e52ca0100bb052cfc3969aad4f3f911b9dde7421f4539a79689c555b139436dd9f8c SHA512 3a1e33980a0ccbd96de59ae64591737521010ba0cf10cc0d40f92e50e8f8e3a1d03f2269e02d62006cb7e192708887df0dd31b27813c32f0603765a05c9e03e9
diff --git a/dev-php/PEAR-Net_IDNA2/metadata.xml b/dev-php/PEAR-Net_IDNA2/metadata.xml
index 9724e735d5c0..f268bf668c36 100644
--- a/dev-php/PEAR-Net_IDNA2/metadata.xml
+++ b/dev-php/PEAR-Net_IDNA2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
index 9613cf98f8e8..dc09ed7d6525 100644
--- a/dev-php/PEAR-Net_LDAP2/Manifest
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_LDAP2-2.2.0.tgz 97180 BLAKE2B d2af13f0723f0fe998ef6a1fdd83e664ff5dd16c04d793c4a0b9f233449f82cd16c3156b0f2fb47f26d693d423c9bf0f6fead695b898e89a9e16cae932cd5718 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca
 EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 749 BLAKE2B 58499e476862655c9a51e80a53e559736768853ec29227b4eed3077337fe938fd9719a56ed6a181b3cdb99ee7aa2d5cddbb508d7d0a8f674439261f95c852d90 SHA512 f886fa7888c791e26da066ea43d359463782b3fa260904beddb5842bbc982f373f571c4901db925897436a69d1e93dcfa1217748f5beb8778dff93ea96c53dc6
-MISC metadata.xml 311 BLAKE2B 62823d5e3195d3f703c214d2250a37832c982904772148388dc89751b3b7d6776e2253819738eeec24a550aaa00092ff91d78e6e1f5ee1475104aabf8028a4c2 SHA512 a885b79978595cef0b7f647b110fa2f5687b72202cf87abd3bf1068b38be8a8cc5e2866c54809a0cee7dc1058f7e9990d102e4b4312a9de96a9f961fdffe831b
+MISC metadata.xml 311 BLAKE2B 5c07c006bf40d8aed8b5dfe44b77e12dcbc003a54b33c6e197982166e044ef7bf7d25f0a22de60b2bc11c25b487cd0c49ecf129ab735918f52f5833d747ea966 SHA512 38d438ad9be741c8cdce8e468332ad6005d31bb8498877fa4948fbc8ed15fcb5cd498e22c48d632af680eee96c52c77a825348c6fd31e645f1a95393cc5e4ae2
diff --git a/dev-php/PEAR-Net_LDAP2/metadata.xml b/dev-php/PEAR-Net_LDAP2/metadata.xml
index 0afa568d58b5..63daabb13569 100644
--- a/dev-php/PEAR-Net_LDAP2/metadata.xml
+++ b/dev-php/PEAR-Net_LDAP2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Net_Ping/Manifest b/dev-php/PEAR-Net_Ping/Manifest
index d8bbf21ac3e4..685d68397151 100644
--- a/dev-php/PEAR-Net_Ping/Manifest
+++ b/dev-php/PEAR-Net_Ping/Manifest
@@ -1,3 +1,3 @@
 DIST Net_Ping-2.4.5.tgz 9600 BLAKE2B 5fcfe6cf9e96406734e5d728f5e714932bc7c9622a944e3aba81a11cd0da2d8ff5e7026f59fa1224baee70ca295b1d9236503d423c25f1570b28b7332405a03a SHA512 92faf073cae8b98f3dad52602f1030948549df313cf0e317928183ccd9127add521c35b657586e13d7826138b0358cd7ef99419fadfaa5cc34160df379c246d2
 EBUILD PEAR-Net_Ping-2.4.5-r2.ebuild 614 BLAKE2B 930061378518dfe61a8a24f44493c3128a8ee75b6bffaa8a92befcbc15dca351140698965f0e2c62642b5ed93da479327cc63b4845d6df14fa457a4bf4999b61 SHA512 df6a5a6f5679d63ee454893fd38ff6914863b1a00e6d6f8901ab77f9faeebb492439ff8f71fbb1a55cd000a148a36438196b97b754b9ff9cdf3d66d98335d18d
-MISC metadata.xml 375 BLAKE2B ea74bb046763cf2db484a0c9ae02682614543552081af3b63a414730fb1dab47f0bf1e4215a9cc1bbdc74c562ecac66c92c9ec64b50317d6ebeffd4bd7cbcff6 SHA512 89f2a2093394ee1aaea0b6f2cae286624cd76606a6c9fe77936e0e776ff13b40b2c8f0b9b54488db9c3a5f2e201f9ebecc32632d942846580ba4ab54dd438026
+MISC metadata.xml 375 BLAKE2B cadd027fb4db925b524ca6885ce324f71e77005f4a1d362c5bb930c5cfd75fa23976aca7de26739262f6877cc4e7317520f4ca573d578822ea4a8b8813b0e22e SHA512 db3c3be97d9338752868ea1586b78e7ecf71d3616706107e145b8fafdaf592592a77ab9e792ca983065349483b8c0403a5dab16da4cc4a5069458f15b5c649b5
diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml
index 89d951a346e0..89cc6c090db5 100644
--- a/dev-php/PEAR-Net_Ping/metadata.xml
+++ b/dev-php/PEAR-Net_Ping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index f3cb54c1739f..3288da1a05fd 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -10,4 +10,4 @@ EBUILD PEAR-Net_SMTP-1.8.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d1
 EBUILD PEAR-Net_SMTP-1.9.0.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
 EBUILD PEAR-Net_SMTP-1.9.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
 EBUILD PEAR-Net_SMTP-1.9.2.ebuild 730 BLAKE2B 3bf897ed9f051c72c48b6b12797d545c223a4aea9a31e3ff90f489af1d8700fc368cb380f4029c9d86448dc2ff8a802a971d9c11eae824fa933b3e2cb297bc06 SHA512 23e786910de520c7a61e9a50090e7a57b065efedd40a5cfdcb08a2f14dbff9520e52e8300a5e522ffd9b6e8693d1c1482f5e8b4cf567ef2b0d903ec0627aee5f
-MISC metadata.xml 488 BLAKE2B 599d14f0128115db0ec6ff80d664e286e1b28dc8b0dcd5d0a94c1f3229b3290af47beee88825567ec1aea4eddd799a21f178a05849658e2d0f6bf0a45ceec94c SHA512 4833cacc6321078ce7696ac7f456e1ed368300879b71a133eb81a804e985207f5baa10b8305dbfa716f08057b74bb374347f9211924ecd3fb7a1c44562eb8aac
+MISC metadata.xml 488 BLAKE2B a27cfeb64814808ff6c2e65507187e38592f953bb8cf5e0d194324da6f004bd1f378b41ae6cd89e7a6d831ec872f229e958d22adb3597e075c1bee42b9f0e070 SHA512 1b15542e69cb62a44ccc996872d2f3a246810d164a3cc63f96a86a18de1c0a1f8e53c8d5641d3454dcda62427a898b18aa0a5469bfb85182aedc4b9eaec6c967
diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml
index 651aeefaa6e7..dfe1c134cec2 100644
--- a/dev-php/PEAR-Net_SMTP/metadata.xml
+++ b/dev-php/PEAR-Net_SMTP/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index 808e895f6051..c25c995dd4df 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -6,4 +6,4 @@ EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 779 BLAKE2B ff68159284b352aa4622dbe128
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
 EBUILD PEAR-Net_SmartIRC-1.1.14.ebuild 542 BLAKE2B b83893302467febf4d294444c9bdfe1c902aff437b199cb519228fbd74ec15f5c350f0e09c16390a7626129cf22fd384ab875b61129b6980b082556268bc6e0e SHA512 f9f78d8fd37608299b72cd9efa58e27a7095e5e6d57c81c272a641fbe040fc20a1ed40d4b63899ec4d51f10c90d38a9f6258b313e759e1a6d8d4e4ab665246f6
-MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
+MISC metadata.xml 383 BLAKE2B da1f064f86d9b6e0df8b09faa143f842fabec427bf3c13541648858d0d7fa59c3b7bfe3c2c5d32d92b93f43330667144798fe0ae16ba286fdc771db636a9bc63 SHA512 239940c7c4e787b386629c1a4d8129751070b520325c363aa5d65aafcf33a595995ae1de5e1d3d1e61f45329c61a1d575c4b4e9e2f1f2baa16720bcbc0a9ee88
diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml
index 67ea094e12f2..341edc04699b 100644
--- a/dev-php/PEAR-Net_SmartIRC/metadata.xml
+++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_Socket/Manifest b/dev-php/PEAR-Net_Socket/Manifest
index 15850c669893..61d612d5e99f 100644
--- a/dev-php/PEAR-Net_Socket/Manifest
+++ b/dev-php/PEAR-Net_Socket/Manifest
@@ -1,3 +1,3 @@
 DIST Net_Socket-1.2.2.tgz 6903 BLAKE2B a0ee530ebb2962de8560d5cb2147ee831d62c5deac056a7f4944b451853b3ab65f1f46332700d4e18a1ff6e1cce138bf46f5053586bc7f8073143c6aa101e9c6 SHA512 fd415fbd4a6801b63cda3168ff275fdeae233a3cc4c62f9bfe561f83f24f89795a7e7ad862641a73bb6d6e3c0da8b56cd00e7e7a1db616de040ea7883d84caa5
 EBUILD PEAR-Net_Socket-1.2.2.ebuild 329 BLAKE2B c71f1302ad4cefec4f0120686a8f6dca5929020e911c6b3d57809a1026ff8d0275824d413e658749bcac05baeb6c1b9b5c40a9ae61fc0d37e72313f3aecd3f1c SHA512 2a3c52b649cb3069ce83dd88a468753f5367b8ad536a13cf7fed8733e2159dae11dab5dfd78221ddda8c20c1494647c4d4a95cac89e4eafe2d91811ea1c08e03
-MISC metadata.xml 379 BLAKE2B 233538cb7305e5b6f2cad2b743cbae9116c3307b72ae0645e34fdaf76f72b1fcbe9618f4ba35ab5b3942bbc2a5fd7491e4cfcd7d63f1074fd50e27552a0003d6 SHA512 bde8388227ab4467df4613b0ab02b20286f3700c3c48649dd445085c98f9885f7e46603b2977ff539e5b2577c6f703c7d397a5b0a14538f093698aaa0662deb0
+MISC metadata.xml 379 BLAKE2B 5b56b75f6963223b908dfc9650cfb640afe56bd6c05c777568f8b0246d09024ba995e7e42187af98b7bbdf9effe3ecfd9be215a2d923d758e2c270a38461ec44 SHA512 ee5db03f1fac61a99691b12f47fd076b4423707aa8e2f547e7c14dbf8ae86ab94ab61608185d3491c2f62cc23ca30103d3657f517cb742621ab6c160cc6bd51c
diff --git a/dev-php/PEAR-Net_Socket/metadata.xml b/dev-php/PEAR-Net_Socket/metadata.xml
index c548abcd6a8c..0f52819d348d 100644
--- a/dev-php/PEAR-Net_Socket/metadata.xml
+++ b/dev-php/PEAR-Net_Socket/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Net_URL2/Manifest b/dev-php/PEAR-Net_URL2/Manifest
index 4b64312f662b..622b2e6776ae 100644
--- a/dev-php/PEAR-Net_URL2/Manifest
+++ b/dev-php/PEAR-Net_URL2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_URL2-2.2.1.tgz 20010 BLAKE2B 5c8e5db577ad01dd247b72f82b9014e7cc4ef94955566b65b4210c7371702de8b1b67aa2d8bee27c5d88cabec069e3a334630429547dce2e611ce0da40210b08 SHA512 356eebcb7b077e8a57d19f7a0549c973fe4923fbd83836ac000c1068d7f19c42ebebef5e07a2a5880737d0f8b2398bb32be9fa97ef931a1009d6229dfd71b495
 EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 346 BLAKE2B ae026c4d51407041ca6bd0e2fda399266d081d490f59701af646ab0c4736cad88fc8a19704d4d56e3bb116e2e952d749ef8f180b7b7644ee3fb752c4b9dcaa78 SHA512 fc7d1798da32a8799953266c7131a0e8213535464467935d6c8e8d21799298d4a7e9bbdd0d847623b8f967f4b6053929148147ac79327eb44a03370bc2a182d8
-MISC metadata.xml 310 BLAKE2B ceeffe3f581bffc5354ffa5ae85c80bf3395578d2300566cab9ae2405485c06bb02d6a55eed89d33eb2af4be3e668073d6fed96614b4a40390ec5339f243f8be SHA512 ee52f22f04cecdd1a9cb93ad11d75a8e9889f988e189995707c28a3923bdac05c330c8f9e658717e3d0713b5f1dcdc772f4ec31fa216ee15006bc67340fcd84a
+MISC metadata.xml 310 BLAKE2B 0aa6211aded07f36e45d3db97f1722606511d7dc8a4a1063c9d8564a8b118499e08f23a91a05f8ce956e796edbd3bcb68ce34e223dff83d5e889ba7e54d87df8 SHA512 521ad08b1698c09eb4c9069f9b46440455e78fa5313d3d0d6feff6661df863aae80f347f03ed23a29ae6b10def577187809cae4dfa95a511311dddc06a79dd5c
diff --git a/dev-php/PEAR-Net_URL2/metadata.xml b/dev-php/PEAR-Net_URL2/metadata.xml
index 5a48f3cfcb85..85371818ed52 100644
--- a/dev-php/PEAR-Net_URL2/metadata.xml
+++ b/dev-php/PEAR-Net_URL2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index 42f71a168b40..b74b4e056f3e 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -2,4 +2,4 @@ DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e7
 DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
 EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 726 BLAKE2B 550c34ba274b495a67bad4adb7f63437bfeb49b0ab296533727017515f5f30e9a6eedeea43a32eb819c7550c7f70bc4401a0db2ee35ed2385d3b4bffe72cd44b SHA512 27801d0003bfcb8270ec774c4234756bf545587943f8ba7d1692302fcd9ca9f5725f851f535c41158ac6506f68ad940720b836895a730c6770cd040a287265d0
 EBUILD PEAR-Numbers_Words-0.18.2.ebuild 549 BLAKE2B a0616c4038cb2ad5ddff43e904659e584667fdde486b1e8b278562a24f3bce80bd6eea7c064f210bedba129f9ece3c5850316b9dc73cdbc969ef51dbb1308653 SHA512 5376a071214ae52c4dc5575cf5dd917b37d7b117e802617370ba4b83258a93ce332938ae7abf3f61714d3edb996d3d557a40c1b0e5bdc9b7955b03aebaff434d
-MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
+MISC metadata.xml 385 BLAKE2B 60795ed369b842688c6c616ce551d540b1358f9ac180a54e41e8119863280819cd2f2b13d1b260aa1f8ceaaaf381cf180f88db1f2ecdd5c09e1dfa49d3d5445a SHA512 257ecbd7cfeb6b5227d7f4d75223a20153995e14142c3fcd85a7bd324ccc960c1ef5726793b1961ead2f31151953dceb72246a7769792c489f85d0656e24c5b6
diff --git a/dev-php/PEAR-Numbers_Words/metadata.xml b/dev-php/PEAR-Numbers_Words/metadata.xml
index a956dfe209c0..d2c15155b757 100644
--- a/dev-php/PEAR-Numbers_Words/metadata.xml
+++ b/dev-php/PEAR-Numbers_Words/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index 30b19b01ea61..3fbd353665ab 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -1,3 +1,3 @@
 DIST OLE-1.0.0RC3.tgz 14233 BLAKE2B ca8ae3959b618a0cd9344a3b07c8587f4f1d10063ff6101e8f27d0c4c8b0d08a0a258ae40ac9b7ce30622d57cc6bfbb2a5b4f5b393ef69e25c276813ee70461e SHA512 36a9bbe243d0f172bcd3fc5dd0926a0e42389b4e222cca90678f41bb968c70e4d04c959f3fe3bad1704543ecbcda871a248aa445a1dc6c2f0b73925198f5b07e
 EBUILD PEAR-OLE-1.0.0_rc3.ebuild 363 BLAKE2B e3c573486d39a42f0095d684961530b3d01a9dffbba7424734b52000ed4942f8de5467b8a19cba5f1453e7e329d74f526c11ad9be5866bec63e3c298a08ee85e SHA512 c4feeee7cf6a3ba09feebd8c45f9c7c6ae5680990b9c61c941542bcf035eff11c5f67442974cb1eb1b348a63fd8e632b99f6ba5008676797748535eb08ef156c
-MISC metadata.xml 365 BLAKE2B d3239ca6d5ef2cac6033276506a09ac2dc02805de0cc194f700be394828c56d754d364fa1b12895f3a78d2fc7145c57b8a097fbbc02bcebd006da21759a42793 SHA512 3871e3db946f3c1d55f06eb228b38e4b3d596b40781c0062c5aa5dad7b785312db6ddf41e16f372f3541c1eaf30264b78bd84db2a4c2843376af4111a50479ae
+MISC metadata.xml 365 BLAKE2B ca1b66f9a56270a8d2d354ad481edd444667a684f88c216844bb709684d7dc0c4c74b109728d7e17e1a1b11d0c67a027a35c8115744df59c3ec51bc510825cc7 SHA512 3ba9cf354ea5c446d0d5696890e640c2dff7bf8c53193493a785b84ad0d91f40e0da7ee95bd3993ce5b6f8682cb26a170ce9f95e699d43cca890cbc162cb64bf
diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml
index bf98d49f17fb..bae519a4738e 100644
--- a/dev-php/PEAR-OLE/metadata.xml
+++ b/dev-php/PEAR-OLE/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
index 5695f5faa5a7..2cd6e7fbc5ea 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_PackageFileManager-1.7.2.tgz 38104 BLAKE2B 126578a570db3e92b8c3b3d04588a77e81b14ed6b6c40e9a6c90739d2ae86bfaad8cac2b5ece4deaea9ea1e356d2645997402200236e394f68c0dc5fa9eaafe5 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056
 EBUILD PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild 426 BLAKE2B ea7ad04a92fdc84aa9d7ff2cddfd2cede42c93772efce964406213060cd3982515ce047ba3da25466062d2c5f19d21e7c405d830e54e76cbdc77a89690643a37 SHA512 5eac9a418d350650a680bde42b0da7c800ef10cfa7f05e1ccc6db7d2baa11639b8ab98fcf8c669ee755319b39af3427fdbd42f9618ee2f23367d77d2c61bce7c
-MISC metadata.xml 325 BLAKE2B 626bdcf012d0b1bf419e317ae321a2de1f7e902f67ab5bad48d52992ded8537fd496e9e11c5e2bcb8bca10c5b79820bf34722f9192e6cad8df5bb24c97e83f60 SHA512 81cbf761721cbd85615855d2bd77c3d7354c891c62ef2daaf711a2e32ebda7b968366d5d8c3c8322f2a8e122c48933b796439340d1fd1693e3db2dc36c2c324f
+MISC metadata.xml 325 BLAKE2B 45e6cf2f42cf6d7cf7448c7ef74a39f88bbcdee7b51c3f635727553e50d4e96106b9d0f5e46bc1cf4def8fc2864e7ffd89a4ee0345c0fcdde411c68e3aef08ea SHA512 b9b7fc6515d1c167ac3e794801020be63e714a3ba387c2b544b568d5f26ab68b28112d906f8f1ac38263715312cd5f346a4387418dec6728fc8f538441bd0322
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
index 863e4234d892..fab171dfd1f8 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
index 6901ffa659ed..c70d646e4a50 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_PackageFileManager2-1.0.4.tgz 43365 BLAKE2B 5eae7eb6f2ae91487ab83dc048ff2fa4c63a4f8208e88e0897340ef63aded28b355f22aec8e12e4da918ed1f24434c6269b53f4755ec80cf4edf7a240e03e545 SHA512 2748ebb21158521a74246ea410f9a30ae6d4b41e88aba543888238c5fc53060e6cf5c537cb95f595147690a2cbdfaaa34a6b3280924ee153cd3d47f2deb3a636
 EBUILD PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild 387 BLAKE2B e41776339c8d2ebf530126add435d4364d6f51fd3eb996c4e3d9420fe3434db1bbd2fa9811e5b8a27c8854fb6898cfdb0f5112fa731e5932abfb826758b45605 SHA512 b67af6ee028bc546e29922385f7b3e023a2b83dfb0f438939b9345473962567729a3752dc2b287077f7f16328e534d34a8357c8763f6ce43d798d62f8d284cdf
-MISC metadata.xml 326 BLAKE2B 12d60b4e028e6262c9954ed790f50a24d93b9fd0b3bfa2b94f50c0576b9cdacb7e61dfb1e394a581e700de4163df92d979a2873ed4b13e20dd12fd8811174954 SHA512 11103fa47012eb0dee5fb6c58c151873ec563fe56ed6a9ea1787a4a229f56ba6848eac9498936ef559f80c18985202a28205f8019bbc1c9956e7e0e941c2add4
+MISC metadata.xml 326 BLAKE2B 6fee22b2b5af25e12d5e2c78959764c4db5611a64c0caf7516ebf519becd2042c8a9ffdcf51e0c013865863a46755954dff946bd40bb579094db685811e014ec SHA512 85f7acd1b80bd817807ecef0d127d2f4db159b0784739e60c192a5b3289f6b5b1b67a04a8d0fd613cab1ed8a5969fae832df71cee5c5274267ff846669f40bd6
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
index 984194e45118..b809fc597ff9 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
index de3472b03167..2c8422391713 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_PackageFileManager_Plugins-1.0.4.tgz 20967 BLAKE2B 5f883e117af879c67badb5c9c8b11e1211b3f9ee3b0516d43ca489ea05d6d4678281062a1a75da15e2158583169e7c31ca900bdea83137d991ed7dd923abb2e6 SHA512 7461ba3dc6f51263383136041d217e2d0d7607c5ef9f8766e08466118f2c869a037622750dd7bdcbbf2a114efde096b3192bbf5229f62ea42adfe83d36451fa0
 EBUILD PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild 390 BLAKE2B f2ab2088bdf0733d450e628027d2b70ea6fcda5697c5aeae3bb39e677a9092ada5423f98746ada52c9f74f777777968ef7dbac4227b0fa6154a60b355b608a20 SHA512 4ba0b3af245b548fd7bcd7479cca31a46148bea2300108a0b6642e7dc5cd6b6c60e0ed0da4d0f9ac9127c0580834eb00325152ec40d88b3136c8f86332a869dd
-MISC metadata.xml 333 BLAKE2B 1b5c3d38a23c4c4f0bbe1ab548123cf248b14fc2ab484e78b6ec7a27e6982b61ae460bef0f5694683a1ceecfc3450befa955097aa1f60d39704a3fc62993c2b5 SHA512 45c6ff507cef1c260ffe4651d51262b857f213b1e47dc2bb8a13443b87cb82a7cddd7d88565b0a59c10a66ebc62da94f54863151f45c3c79ffc217560c7037d9
+MISC metadata.xml 333 BLAKE2B 765ce867c6156e5baf7396438791e861b4c4dcf97d00e85e1d2cb62e55eb1f84c1a6468dd21250a880fae6605350a3498b79529826b3bce32b5f5c02acf714c3 SHA512 b8b1d3e8aa347170204e2bf7f5f5b8a962c37040090d32b9d54559c55a5b7d44a6605393aff0ecd70aa0fedbd8e972371bf8dea66aaaea17a8fe8d118836c530
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
index c41e99d84be5..d9b3b31f5004 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-PHP_Beautifier/Manifest b/dev-php/PEAR-PHP_Beautifier/Manifest
index ad022a133364..0ecd203078f2 100644
--- a/dev-php/PEAR-PHP_Beautifier/Manifest
+++ b/dev-php/PEAR-PHP_Beautifier/Manifest
@@ -1,4 +1,4 @@
 AUX use_default_error_reporting.patch 1576 BLAKE2B 0e1deba63910c3466cae3751bba060f58033772eb8a8ee9d09aee2c8a073a2b40f089ed6cd75ca82d1005d27fcc30f5b7c0585fa73bad28be5eb172be45444e2 SHA512 f1e6c53c9dda6d15ea5609e07986d3ed8206152b554cdb2ad20c702128d8b3a9e757f3fcc2ef2c6e9ef7501ca169786301261bd6fb4bc57d946322853d20c2c8
 DIST PHP_Beautifier-0.1.15.tgz 74408 BLAKE2B 9d9a59175b404592d43b2539f47bb33807c23268408e88d570974633f17c3bbd2a05909c80ec966df73e7571a23462a93ec789da14fad80d0361b4a2dea43bf6 SHA512 1e2c7060295c6a13424339e7d45a5dfa9b02749baeb96f8efe55b4951243a3285ddffc815ad0432aec7a710646bdae33bd40abe723faf4ff35a50dad2258efd6
 EBUILD PEAR-PHP_Beautifier-0.1.15-r2.ebuild 1091 BLAKE2B 8fc5aa78b9f3eeed7ac9b3f1efa0dcc276e68a3042255174593a21f4bbfe2e8067f9eaaa4aa4bcbc1da427dad12d5862d6ccb3ab3294eea21b12327a443cee2d SHA512 74fa8e49fcc750bf2c208020949efa9d1505b172b96d449715fc743044b3bb70a38ad9213ba6ffafcc65311021d6fc4c16802909e96ff10b664e0c03f191be79
-MISC metadata.xml 557 BLAKE2B 46eae5572188b52c50c0336f27a6ac551db7f603a68f7747fb82ad77808017a2faf19f8f55d3a52622f76a5563042b69db9af99b2378746aac945176b02a50bd SHA512 da17e6471c97a0ed98107a29a6569ecc69c54c1bf984eab09a3402858a18a69d7471ae55571bea4c9b84fae96ef8bde166c94a4b587327d7d20249cd06653e8f
+MISC metadata.xml 557 BLAKE2B ccc1cfbb993a8687566bd13554506b6909abcde0f09b79ac747089a3fc65a33076e7860c80dc5e50f2a706c66267e83c6ede3c7dcda81e95932e51c0576e2076 SHA512 46e12aaeabf1d4964efce81183a7304d23350ce0b03c90a45d0079fed2e54a3f4614a72997caf43b7aec3cf5645594544ee7b70964d9fb83cd2304d857a25a88
diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml
index 6ef7bb57383b..9321b4869241 100644
--- a/dev-php/PEAR-PHP_Beautifier/metadata.xml
+++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Pager/Manifest b/dev-php/PEAR-Pager/Manifest
index 9fde977c221e..b525cea01525 100644
--- a/dev-php/PEAR-Pager/Manifest
+++ b/dev-php/PEAR-Pager/Manifest
@@ -1,3 +1,3 @@
 DIST Pager-2.5.1.tgz 36596 BLAKE2B a41317844cd79852dd2df88dc1d3fe42f68c1dcb6308846dee119e29b5c2b1ecb16cb2669029be4b31f13d3e6a1ff315f92847554d0b18f5845425a714ea9593 SHA512 59c93117196876e87ced8549b94e31255d280bc6a47a3d2197677d118c6bba77a4a4f404266f03eb42da5da1682c13e19610fe37c244bc9aa379b14931779f71
 EBUILD PEAR-Pager-2.5.1.ebuild 291 BLAKE2B b6ed5335a36ed89ed0c8caadc7c0bc47374c54b9925b0793cc9c952e431c33965c50659444372b8e1435636f63532abe7c751162d738b1abec71784857bfbf4b SHA512 bcf80d9180f5a8a338aaf7be1f5acbbfbf6c3bc7aea9a990a31bfc068dcdaf081a72ea1d5f9093679b82f6676e7edcee2152733c692fb429da3d2dc6a6e5f023
-MISC metadata.xml 369 BLAKE2B 56492dbfe99972e9578a8c20602d5062261b5ce0f0348a76cec46c816d5e41b60fbf4ed9ee77548e6b545ed4024cd6e3e972b29ded9ad71446eb5e9a12b2c7f3 SHA512 5bb1d6cb8e32ac1072ee2f8224112a2758003ceaf9caa327ccc0c3c546ac4e4148e2681fb9d75376ad75c7a38a67d6a3bee4b238e6874f2729e67667cfd6ab65
+MISC metadata.xml 369 BLAKE2B 6d33ed61f48b498378ac43d57acfcb9ef92dfdab8934d35e58682e11f02488aedbcc64f013a1edf8ac70d5509f8f03b97e75b98b604b80a99f0f2aa3b0be3f48 SHA512 903fca1f949c799306ae767c1d308c3484aba3f8a0ccdcc230857a272ab1b61fe1fd4078e8c006f68c45d4984eec9d98ba2301365e39253e96d3c39c42010c97
diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml
index 98b254948694..3562bff75a4d 100644
--- a/dev-php/PEAR-Pager/metadata.xml
+++ b/dev-php/PEAR-Pager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/Manifest b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
index 535b17ea0bbd..e57cf877028f 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
@@ -1,3 +1,3 @@
 DIST Services_W3C_CSSValidator-0.2.3.tgz 10721 BLAKE2B 87f1bbce3337d678d8292976f8877ac98fa83487a15ae27ff693ac544754ae144b2a00bddc852d03092456e1b37080a56e09fe47bb48830b79fb4328dbbaa01c SHA512 4f9fb73ec57e374018b389f50918eaf87a63885f75b0ae2ead067e949a451ddbe40da8020672834e891106b5d470fbe451b3117233678b5f6f6a85f01d2a8aef
 EBUILD PEAR-Services_W3C_CSSValidator-0.2.3.ebuild 602 BLAKE2B 451ccd1b5595c000aa7145e9be3f350a5bdb4c2eb64ecb9384a2be23f3c34ec0b53ad078218bd4d20e160e59e01ff9c967eda689efbae7c973cc5897fff78c86 SHA512 f6ee53b4cd1ed401ff0d05906b65ce662b31535ca0ad5504b151026a07a05aa22aa53eb601db625dac686d18ff912635f3e017d993bcb6cb118050e2ba57c8ec
-MISC metadata.xml 409 BLAKE2B 34baa9b9145f9fd1bfb5e09c92d72b3f59d4d5bfbd95207cb74a474e799f22504ff683ff95fde8aaa30253bffe6987b5cd744ef083a4caecef4abd67ca45759b SHA512 526ec73aa8b62aaa2bbccb161d4ab73915728fa482bf4bff05b0d31ec4c2c213527582e4e285a3511350d7a96fe8d7c229f425a6892d5340b4260fa239ff836a
+MISC metadata.xml 409 BLAKE2B 993b5712f4c600a0c7b50bcdf1e2c47448f069e010ec7a61f0dcd206f35766e6aa3179ac995185bdd7a3dff877e47b9904e175e075bcd9269a97cc087977fd91 SHA512 3e154baa6ea6492ed2c224441b1f6d2b7be721979a52454ac818351d82b77e676d8b4ca2566aac170cfac984ebcae0bc123e6dc03c132b0009d7d06fa4eafa12
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
index ac2b40f98b48..eb024985cc14 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-System_Command/Manifest b/dev-php/PEAR-System_Command/Manifest
index 4ebc214f0313..20f8fe880b63 100644
--- a/dev-php/PEAR-System_Command/Manifest
+++ b/dev-php/PEAR-System_Command/Manifest
@@ -1,3 +1,3 @@
 DIST System_Command-1.0.8.tgz 6528 BLAKE2B b1aaf2a55f65cd020d7d619dae7c758480241f2be77eea0777cab12ad904522b8e4d8021168e1455fa8c89fabfc87c7e89a581af267dbfbab174898b0d6b8e97 SHA512 37aa9624fe566cdd8613ffd021ba32c2a3f0818b8881933dc1c2e12e2e03773b98b4295b46ef54baca26fb07015c0db2b87e44136f46c09f820994905241acee
 EBUILD PEAR-System_Command-1.0.8-r1.ebuild 592 BLAKE2B 12d459ba9a742712b96b10c52344512be2462340137cc5c83fabacedfcf31756150b0c2444bee1504a3719d7f8279d522b903b79c5ac08f69b7cdd9e018cc314 SHA512 8e3bea08e83e42e349c22a386447cc580edae8ff9dcf37249543b966859f7098c07e09b3d1eb23777a8eb59a64c55d9288653b628f243ab8d2fd4e2869f5a392
-MISC metadata.xml 387 BLAKE2B fde6b0c7f1677ebc0e0e40377031d806dae236925943478e278552d9b54c6db74dc9096f975731293f0edb2493faf453d3c830e29c2678257ffa08b72c02e9f6 SHA512 c0b80ef4a3417735c450179e72e2aa67528225c307d64b4ee214e6c1c765529fe0d031c378c4f7570681843a7c5fa6eec9b224d903befc55b2e362cb10128dd0
+MISC metadata.xml 387 BLAKE2B 5f90f7013585dca030aad8be96ae50ef2805e32b0c22cdddf52ed81d43dbbcbf68b82755661e4a053c45233dd7acd2ddf43e06f9f84374edeef69b1c0807f550 SHA512 d066b6ef9021f108566cec7ecf8e4624799123dd4fc7980cc9456bd26023f5c1204e070862e4d1c238dfef585aeda2b6a2e41c1fe937b4642006257b068aadbb
diff --git a/dev-php/PEAR-System_Command/metadata.xml b/dev-php/PEAR-System_Command/metadata.xml
index 4cf233814b10..ec63f2f5e427 100644
--- a/dev-php/PEAR-System_Command/metadata.xml
+++ b/dev-php/PEAR-System_Command/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Text_CAPTCHA/Manifest b/dev-php/PEAR-Text_CAPTCHA/Manifest
index 54d7729ec051..281082679789 100644
--- a/dev-php/PEAR-Text_CAPTCHA/Manifest
+++ b/dev-php/PEAR-Text_CAPTCHA/Manifest
@@ -1,3 +1,3 @@
 DIST Text_CAPTCHA-1.0.2.tgz 197084 BLAKE2B 69f8d14e190ac9ec4ed74631635c3531fc0d6e40e08484e5fc58595572100976cc6279396aa6fe0cc0f46bd564f21cbb7fa3474647e62076882ac6a5bc0f4866 SHA512 334cee581d9750f69e2fcf6fea948334926960dce6a374dc4e1edf1609d97393c4a08fff867e50e3fceff60b350ab6239bb44c14b78d6c63c8b11be097a8bc43
 EBUILD PEAR-Text_CAPTCHA-1.0.2-r1.ebuild 612 BLAKE2B e32381502d7ecf667a426bf754af6d03b55ae64139b40896c0d30c8159590fec7df85fad1ec50b186191122900a9393f65bfbee0eb86fd1fde0608977aecb3aa SHA512 0312160071aa1cd05bbee94b0719fa1a959b13f4fd10d77d169530461747f173a60abba6b0fd49f349fdb32da2aa37fe5eb2f472a752cecf7319bd2373e0be8f
-MISC metadata.xml 314 BLAKE2B 14022daf2a73a75f9e45e2684404e36320cec033f2e6315e7f76752e0061319c6e0c1f1abdb8f50478e051243c568e968e80ca23bcdd5fa3f7c3cd0ba572d767 SHA512 692d382c5f593666c7a15961ef529db383bfefcf0b192ef5596c754c3ff76ba8386b09043e1ac6da3446ca3edf8e7a7483b510844b68ab6bf234fce7976ab57a
+MISC metadata.xml 314 BLAKE2B 3753b8ae56f8bba2d9275f68e6dac8204443cf188bfabec3649eb7083ea6d20c192ba4648b0433bdf4931387339a2b83b09514fc5553e3911647c6c268574f2f SHA512 48f827be524cc5614cd9b59d5ee6e1ed3865ad2d0860e4220470a054cbfad63ed8afbcc0b1000528fb91b28faddebeb4a60da0ece2803ba974ada52436b0d8ac
diff --git a/dev-php/PEAR-Text_CAPTCHA/metadata.xml b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
index ac0fac62939e..c0702f18b969 100644
--- a/dev-php/PEAR-Text_CAPTCHA/metadata.xml
+++ b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Text_Figlet/Manifest b/dev-php/PEAR-Text_Figlet/Manifest
index 68007672fdec..3219c29f99d5 100644
--- a/dev-php/PEAR-Text_Figlet/Manifest
+++ b/dev-php/PEAR-Text_Figlet/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Figlet-1.0.2.tgz 8775 BLAKE2B 7c397479c00e193409f47d5419aa35fdaf7440f6991882a9a517a319e3240523075f7fa9bdfbffdef9efd1b6ad98bb7e2679c3fdde6cf87365bfe93290571b02 SHA512 e17578a2f4ebd67adedc57cbeceb8191a7ddc712efe0a631cb696d79392bc025ecdd0b389078dc65f6e0fd676d3e435178ae280cae9b9c11d8c4964152d9db06
 EBUILD PEAR-Text_Figlet-1.0.2-r1.ebuild 1199 BLAKE2B 1cb5357e893e55b7b5e9d3a6d4f7c9a9f866a9ac73054898c109caa1c0d7a8ec8d4eaa568d72d7fb24f0813d107e458c2486d113fdb100e30e09206a7c21cd61 SHA512 42621a06eb78299264180258f877cbf281c6ba851c5e74a52900551d52b89b99659892861d54f2a7101173a59f080ee62b583f094b156b8676a7a9a393fed37b
-MISC metadata.xml 381 BLAKE2B dbf08ca44df263501b3fc88f396d919e1666a75ce7aca83ced579a655adc1177c9a703fe1535a1c6cb398b5599ff3dca6e42454a9e66ce8a9314baa473c62a1f SHA512 9a9014f230f3fc8d925d93b281404523b8d11cdca0b06d18420fd0483c18593ef9d00dc8bde90e463c8419ff0063cbc39e56d8de220866148f6a9a779e275d97
+MISC metadata.xml 381 BLAKE2B b1b264f58b6020a1216538bcd1c75cc38bb74249ae91a28c0360199889f00e0845cb52fb0f5c1fcbe6efaf46bec9f3f08428cf5604ccf3f47972aec9985a0be1 SHA512 42a73ee71d269efe281ba43f9721962c89748162e86b308de3ce5d13d5d195ae7ca579ba9cbe806de181d65b0f03cdfccf628bf974b49e3154bfbaa1c1ae4aa1
diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml
index 57978d029999..422fb9a63b17 100644
--- a/dev-php/PEAR-Text_Figlet/metadata.xml
+++ b/dev-php/PEAR-Text_Figlet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Text_Highlighter/Manifest b/dev-php/PEAR-Text_Highlighter/Manifest
index 4c037e2457dd..138a6cff90d6 100644
--- a/dev-php/PEAR-Text_Highlighter/Manifest
+++ b/dev-php/PEAR-Text_Highlighter/Manifest
@@ -2,4 +2,4 @@ DIST Text_Highlighter-0.7.3.tgz 138384 BLAKE2B 9cffd6dbe3eadf0a6e0465a6845bdc63f
 DIST Text_Highlighter-0.8.0.tgz 138657 BLAKE2B d2d1c9374f5b2ac88c1bca7e91723e0a67ee8205f92b3d840669eda2f37cae9601f31eaf7373e4b32f5d4c36569115ed6777cfa562a1cd465a289f8f5f626a66 SHA512 9774fa613f95064629b749f2514e173275a4a15f46b649b208ca668ffc85118b5f26197ce3c9311fe8c1b200a76d30ed2e745929b0d4f1b54056732f4a5cfe05
 EBUILD PEAR-Text_Highlighter-0.7.3-r1.ebuild 870 BLAKE2B 3174da74b72477850954838133406a4f2a7145ff57c0fc30ae2d73f8270579aabca16fdc7bbe82890ea6dd907250860938d964f5bd2dc520955f9d3d902c9b8e SHA512 28daee341cae05f77abc46c412c78a6b5791998479984b84145cad36c62545568ae229bb87f9fb7eeb7dc352d4046f40ee6d969b2dde2a633db629cd04f70d0d
 EBUILD PEAR-Text_Highlighter-0.8.0.ebuild 627 BLAKE2B 9ddf12412dc6d14d0b479d0042f043c3567876070f4e46148ca65a0da9d22488fcd646e2d2daff899ec8d01c4ffe736aadd6a16770dc1af38ea28f9329b4c531 SHA512 eca9ce847a3aa5ccd2d40d12886e7e0762b0e272a5c21dc3610b731fdf09bae9ef75e9570e83898a6c2933fee5cc91d8f0a8ac3bfe20a258eb96c9f8b2c8e393
-MISC metadata.xml 318 BLAKE2B 5253e98310510ca989d8e961869367b1dc99ab14c71fe435439377991dc9a9e774319ae082bbceea306b51ba822867c17fe4483ae37df94e0dbf37b7a87c001a SHA512 685d80a2af63fb76899a86132a149a086a3d38b14b4ee98b10d30b591492cf503fffe75e4065d99d81843579dc836cc4401f8cb461a2e4a85f658ec35cb657c9
+MISC metadata.xml 318 BLAKE2B 97f41c2c36f14f6399dae4fe11d60eac8f45d7720d6ec65405c850cacf7d4826d9653661677a32e7b6f7e78d24dc661bb4ec6d34bcc50f2855f44e06d7db8272 SHA512 ca6f4b6b40e6ca0d98567068fa8b85bec6ef0c699826970b064c6cec0188bc2d2fdc8de1d2192741babfab1b835033e96cbe93f9c843aa8f3ab7561e130497bc
diff --git a/dev-php/PEAR-Text_Highlighter/metadata.xml b/dev-php/PEAR-Text_Highlighter/metadata.xml
index a9eda71d7435..ed8567959038 100644
--- a/dev-php/PEAR-Text_Highlighter/metadata.xml
+++ b/dev-php/PEAR-Text_Highlighter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
index 5e6649c2b010..df1c846a5188 100644
--- a/dev-php/PEAR-Text_Password/Manifest
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Password-1.2.1.tgz 5631 BLAKE2B d765606e7082076f92d76d3a2e7a0721950b9fc81b267a51aa3ef56ed92706105486d3a62a6ec81e06dbdb41a15d0a7e9add8ef99c87b76af6445fb7bcbdbaaa SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9
 EBUILD PEAR-Text_Password-1.2.1.ebuild 644 BLAKE2B cea9c1da24470e7307bd65897b8a3372aa8b18783aff6169a95483010923ab6a0a0a8a49fc9126e525cdbfebd7de68dba0cb144c03199067601208051d115fe3 SHA512 811185b7b5aaf3cce302aca17ee0dd41b4fdb952adeaf9a07a3e92b41a19bd4fa82a4697483e87df9fb471dab564b067b59710b38935f2803e9365d967548eef
-MISC metadata.xml 385 BLAKE2B ae61061345cae297a5e8b33dda7940d439f7e59b44cd6b7f298664737a821fdd4abd60cd52655261a999fd850620e4ffe51767931c7edcba6354582c6bdfebf3 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7
+MISC metadata.xml 385 BLAKE2B 92c025a7216a2653dfc483ef6914988735b3a23c65edcbda42169e9e472974103a86c8bd4623499f200ed90804441506527e02056c5ab4d47f9b2806f7d0e6dc SHA512 3b314388888db0aaf01a9a6778369b7c2fa7ba61fb26cb3ad83e328f5f523684ac04826f807b253487141ea924a8a40f8d63a329208c72432ec100c2b0e26286
diff --git a/dev-php/PEAR-Text_Password/metadata.xml b/dev-php/PEAR-Text_Password/metadata.xml
index cf70151de8f4..bea5e06ee13b 100644
--- a/dev-php/PEAR-Text_Password/metadata.xml
+++ b/dev-php/PEAR-Text_Password/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-Var_Dump/Manifest b/dev-php/PEAR-Var_Dump/Manifest
index ebc9f0cbcee0..fee9997d075e 100644
--- a/dev-php/PEAR-Var_Dump/Manifest
+++ b/dev-php/PEAR-Var_Dump/Manifest
@@ -1,3 +1,3 @@
 DIST Var_Dump-1.0.4.tgz 17426 BLAKE2B 60161be980edeae902e64c387b30466511b5cc0e6395f02334346c82e0393577c041fbc272577caa48510303bff3c1bce8e0c3c6708fade04a13b22f28b84b79 SHA512 1d31fcc3519feeee2ec94fc6d8b919672cf4a1be80d6b63c0a52b30792b9c936a7b984033a4357a64cd937193a55daf67fb649444f8303f1332f7d7c793b2e89
 EBUILD PEAR-Var_Dump-1.0.4-r3.ebuild 907 BLAKE2B 41d6efc8a6dab0038726ddb9fce04e4fbe9233a28e6a197ba8fe000afeb79d1d4ee5dca048601946c76ea8d8441f6a0ddad4d7b167df60f794be4d286a38a019 SHA512 6b2dc80cf203c6f594397183c2d68aaa29a98de8b5f0d47dd74b6e92ab03356f80456c559d96d7d941e1a736f9d84bb49d5404e7c47fe1a333903df9619c48e6
-MISC metadata.xml 310 BLAKE2B 8f57f1c9b2897f821b7845e5f2a3661fbe758dc2792504fa8cbbae495d6339dcb56e86ffd36e2209826acef8c0756bc3b728f41db345c4491b98130a89b0321a SHA512 6fbd4f6ac4419473c097c4f09f448e0a2d81a7bb3d8d93fa79fa4ef0b2cff7ca463cd985b60bc5e7572230eb9296e37c446adb781c5d68e95510b999ec1dc66c
+MISC metadata.xml 310 BLAKE2B 3159506fad2bae9b69709d89ae51dffe8589f2021142265aa53839841070618d191258fc1b89d4b6c3ded58a7acfc5def8605532695dffa0fdadf1da667ae43e SHA512 e46dfef8ca67d89318382cddbd803a55496f6aa94c6978aad4b277d64c00dcabd612631a8cbd010f5d20e33e49895e3be1fdeef3d78bc28d41b61a33322c087d
diff --git a/dev-php/PEAR-Var_Dump/metadata.xml b/dev-php/PEAR-Var_Dump/metadata.xml
index 08b46f8f0cb9..eeacdbbaf53c 100644
--- a/dev-php/PEAR-Var_Dump/metadata.xml
+++ b/dev-php/PEAR-Var_Dump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest
index c6004fd46005..b0431f434a08 100644
--- a/dev-php/PEAR-XML_RSS/Manifest
+++ b/dev-php/PEAR-XML_RSS/Manifest
@@ -2,4 +2,4 @@ DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a0642349
 DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8
 EBUILD PEAR-XML_RSS-1.1.0.ebuild 487 BLAKE2B 8440250374caa8e0576b6fce03b94365a20fe427d9426c940a0f2d157b1fd32d908e260909fb751a11741f05c5dba16f35de902202d95b46a232c33186f520a6 SHA512 f7057116b01bcb37cc34080458443c1df0e4a1d4ac539643183883ff5709f496620797f635a3e17cfe3b6ffb85137c4e45a5a67a0d6a3d83694f83a9e4b1e41c
 EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 744 BLAKE2B 77fb85bb46773022fe8a017ccb3ab4e923e604c0986b6d7b0ed5ab7a84af0d5812769cf87dc8b55014c4cea1755567dab608dcb0597c5f9b8d73733ff9057065 SHA512 e8d9b93a30bc6d13ed42eaa310aa656166e05e32375b9d9c85edf17175fe0693881df55d3fb0cd469be5193fca8f66a2aa158e68b5623a5385a60c76e3c6dde0
-MISC metadata.xml 373 BLAKE2B 23ac6ae6766ff928da3558d2c05d6ff025f56b76045044634d1706b046bfd1fe741dafc1ed10489113521f23e2ccd95f8d529d8be240948ee90f09ba236d9dae SHA512 e5be199ccfe81e85816b693f8b624ad2346e8948717dd26496e8e9f4b048c9189515fb11cabbe55a26f81e448937db5f1f16f37cb59bf3d24c3e3a68725e4e30
+MISC metadata.xml 373 BLAKE2B 50b9e47af7337a1e49c7b90677fd77810f20f19772c3d2733392b88ffdbac1e37caf4d2a417344a765bc6ae6a3c0590b00481eb8eec223cef966fcee5128cbf3 SHA512 25e8edcd34569cc9bf99f530f44d3c104700764817aed6081867a143c5c0e6a159883aba192348c5ac8a22cb07001fad5fa0f5d91600cfbae6e5c752f74a4464
diff --git a/dev-php/PEAR-XML_RSS/metadata.xml b/dev-php/PEAR-XML_RSS/metadata.xml
index 5df328cb979e..8539c587325f 100644
--- a/dev-php/PEAR-XML_RSS/metadata.xml
+++ b/dev-php/PEAR-XML_RSS/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/PEAR-XML_Serializer/Manifest b/dev-php/PEAR-XML_Serializer/Manifest
index 35c7a42b2626..71d17ddf31e0 100644
--- a/dev-php/PEAR-XML_Serializer/Manifest
+++ b/dev-php/PEAR-XML_Serializer/Manifest
@@ -1,3 +1,3 @@
 DIST XML_Serializer-0.21.0.tgz 33362 BLAKE2B dc7d9f5d40f538e4cdb6a9046bd5ba4d3970fe710dca5b809a808e057f782628aa124a6f541b800f55e15c5f5aaef335150c7342a2a96845ae60eb275bc897a3 SHA512 f547fc92d5b102681229c8c8830ca8201ba529c06a720ad761f2c3cedd757d858711c3d8b0dbd2f88b0815758561acc297cee002162bdee6002c1c7310c8f67a
 EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 649 BLAKE2B a59c1d35d6d2e7f9901160c1223686168b9eba22285d9091c6b87fcfb7b490d593fea9a9b26715924af4b20b6b413e5cf966000781897e5ba2a6e91024865fc5 SHA512 a6fe647853b0f61ed9014d94922d5d8b62b9bc2ccbf6dfc3b297416d5ce230ba382d1a010c240329ee449e03822e0857cca0dc73d8e70f47eec6dc3c255a5856
-MISC metadata.xml 316 BLAKE2B 901abfe1e0ca8a6a60797d2376d048547811123601008200b10f48784af8d0e92eca6bc0ce38d8d2b2cf8c0c98d47666bf9215546cf53d7a1558dd8018c03c8c SHA512 c8b05d370fd3dad6cda63253224f1e5cb331efbbbcc1915d5ca90551b79754c6a18f590278595128a46c39d8721f913ec5dbe01b08874a64584d722853dafdef
+MISC metadata.xml 316 BLAKE2B dd3260a83148722fc29dc44c2b826b543fd6aa73fa731bb27df352a25e292eb2b3faa53c69341e271d11290bae8ca717e3234d881ede368a9e14b9b3e3aa1541 SHA512 2869216622e5ee32b77e029c16fbf52d1695ee3ad81e66d63e0144043afbf0b0c332d6909629b7fb488b74a57e79d83747dbe76940187dcffb1b2b0a4d236da5
diff --git a/dev-php/PEAR-XML_Serializer/metadata.xml b/dev-php/PEAR-XML_Serializer/metadata.xml
index 0be2be4fa674..4954ffe101ae 100644
--- a/dev-php/PEAR-XML_Serializer/metadata.xml
+++ b/dev-php/PEAR-XML_Serializer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index 05df9ff5578e..cca2265e847a 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -3,4 +3,4 @@ DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1df
 DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1
 EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1951 BLAKE2B 3869286b1e8b8decac2ba671dfec87f6ddaeaef477dd71df4c2b8ac33a6b99681d347f8a6179f732b4a27d83e3ff29e9139b95e8ad91042eee0d2a0f05ac87c6 SHA512 b4aa6e448363d1a9a46a55e0b4e5c17ab542e0395ae8ff7236ef2dfc615912050f0b23a113fc7a02acbf691328ee4d6592f625a6bcc6575da7072c4e68910fbd
 EBUILD PHP_CodeCoverage-7.0.12.ebuild 2779 BLAKE2B 4da5a1db8e259e4bb4d81fafc27c301da2646c4357f37b3e8a83a7c569954b28db06f903e1216525f9ab8370e556addcdd8763e2133e24cbcf6870032a66c30a SHA512 6f5619a0a77154bb12fc0423b7cf5f103adcc248be5abae38206055a76258ba89cf7e67e576f027be027ce19c1776c858591a14ad31c9b83a5b3ddc33a171aaf
-MISC metadata.xml 363 BLAKE2B b7bbbe2ece6838dbb09a821ccc5828da676f85cae4b4e68ac18aea083f22004a00ceffec959d13066f6c64ceb1de6a8852371f1d4d559ee4e2b31a757957e5cc SHA512 14cd926668a3a076c639f765f3e6a8d35b6ca06849dbe2ddbf7d3ee86055b6aa486332d786ec70f5375ba9b50cf43c025210b820a4543b4ec7719f10f60f3c29
+MISC metadata.xml 363 BLAKE2B 5abdd3eca40aea2e59ace5acc56c532867eea9c257f5f7bbd2763f6c19039e33b622145d3fca613816b24eaa226c59099f43494fec52e6c68b072c2373855d1f SHA512 244b05f91938f8c8c75c06a16a4e90c19b1a63760932a66327c3e5af24ee798a5e9d3b45c8d85a80907038fbdd537c8b190e781a1f3aa98091984c122707292f
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
index cabad4a1dec3..e257fd4519cc 100644
--- a/dev-php/PHP_CodeCoverage/metadata.xml
+++ b/dev-php/PHP_CodeCoverage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 18bbc156db16..c76fada3c8bd 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -4,4 +4,4 @@ DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf05
 EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 EBUILD PHP_CodeSniffer-3.5.6.ebuild 1445 BLAKE2B a7d29b2211a6db7ba565908923e1bfedf6cf4f97d0f64374a34237ff854f3c7a1f29182c41a1b1199ea6de8337092af01eefba5f760c211e8e8df21ec10f8f6f SHA512 2ba7d933623e6d552c1676ff2a8e3b8cd407be3e365921b24a0cbe56875883d951cda7d9afee7dee044403ca94de6ab2f592c18337e0af4ca16fa950b6b381f3
 EBUILD PHP_CodeSniffer-3.5.8.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
-MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
+MISC metadata.xml 329 BLAKE2B eaaacdc51abc6864a1cbe1b7a1cfe2aa12e184c39e90246117cfb6481be092b30f3797096ce3769f3932332a1d6ff2761bb527f23a2bdfe0bc191284ef6c5163 SHA512 6fde0d31cc1a5ddb750421437f1bbf819fc418792d0a20ca913f7baa644a9f5f471eaf74f4bbe6713860e6d3d3b555a08faf5786d1d419250f6b965c42384a3c
diff --git a/dev-php/PHP_CodeSniffer/metadata.xml b/dev-php/PHP_CodeSniffer/metadata.xml
index ba2d843b67b6..2cc51883b469 100644
--- a/dev-php/PHP_CodeSniffer/metadata.xml
+++ b/dev-php/PHP_CodeSniffer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PHP_Timer/Manifest b/dev-php/PHP_Timer/Manifest
index 1786fc928a84..324951b20ab2 100644
--- a/dev-php/PHP_Timer/Manifest
+++ b/dev-php/PHP_Timer/Manifest
@@ -7,4 +7,4 @@ DIST PHP_Timer-2.1.2.tar.gz 7090 BLAKE2B c99dd69433b3579e9ed81f06188cac280b6ac38
 EBUILD PHP_Timer-1.0.5.ebuild 428 BLAKE2B 088b5bc82c21cf4d4643ad12d65f9212fdfae73070c1115a02359a42976504c989ce3e80e3418d8b5cd14dec927f5a045d68d38cec7fc5cc2dae0d89c72f3cd5 SHA512 cbcb03add37089682373e881678392138f9ec5672d52227f0aba8a23e6e5d99a0d54c17ed73a11a4b77125529553c89c7e2e2780b6138f0e5bbaef9c07307248
 EBUILD PHP_Timer-1.0.9.ebuild 747 BLAKE2B f58d3a148ece769ba9aa3e6198a6ee184717548426772920eee9b574433df6534fb623e937e310e757c1a3375c372c1887d98d5a38d670438a4e62c521be06cd SHA512 ba5b9c74a3dd64cc3321205cfe59682a006dc9ef06c0f4c663863ca49ead09f54da740f27d0df8b09311a8d8c87864110ade76200eff7c8edd11bf54af2e32a3
 EBUILD PHP_Timer-2.1.2-r1.ebuild 795 BLAKE2B 1a68946c77401ac9ebcb8bf5879d2d63c9e4265bad5eecaecc355a1493793ae82f96bad5695bea48ead2f8e911bf399f5e77fe4ea1a990d32d1135cd83b9255d SHA512 69a6a5888ee79b9530e98d71b3d0415ef4be67f67c512bfe6a1376e40a7eda1bb7e338b21d7a529fa62e2cae16d88eb78c4c519e020b85b03914b00424cccc24
-MISC metadata.xml 355 BLAKE2B e9eef228fa49186d1ee26876e70c430b29121084fd836f8b34196593f79fa10676104311971cc407c207bfcdc05572cf3f13edb31c6d4dd46c0de1a089d21dba SHA512 f75d8d1d7900621c87bb40728e4eaad1d4c6b9e412854cd01236276a9c858575694d9fa3dd412092a618efee65c795aa9d6b8633d6539ca9cc86065821115176
+MISC metadata.xml 355 BLAKE2B 6dc3ffcbc7d154a843a83ffec419fdaab870fc33a3a6ff5a07e72bea6e564697617f1b69ca602140b9be064ce1d924fc14f7c63ff0320049b43f752ae6a46cb1 SHA512 da999e920af0bebd53ab5f8dd97da23bc5856a8cf300f5f5d447fc96a6a1627bc947e8d0e5d254fe876016963616c7a7d9c8518e38e2bcf2b020b8557ca5dfae
diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml
index 5de672a0bb89..92e5cab77515 100644
--- a/dev-php/PHP_Timer/metadata.xml
+++ b/dev-php/PHP_Timer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index 8d8bd04726ad..30799cd629be 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -1,4 +1,4 @@
 AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e420c85b5b54de78c0b9a9a4ac39e72103c18e89b5cedb8d8c9c6c2441d6921f0f1034127ee9782967eaac SHA512 26ca45e5761c3a1fc9d89276271763fe5ef5b0c9107978e9e6415d4708da831b1b2f536d642b8e16f8a32cd4247630602d21ef5b5017de6684e8707613625d87
 DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
 EBUILD PHP_TokenStream-3.1.1.ebuild 1369 BLAKE2B a2989e5824a79e8bd83d8c182f6ea1c37b9b27f259357cab03df45124230e7fc333cbabd231a28c9220120d339cde19b849aa8e8d0a3c274a92056eddf249b95 SHA512 541f2356b3c3843397b8c2a1faed04f415f368b3fbbc9c0f1d33b1b33bedb0b6910c81ceb86e3ec2bb5b65cda3bb0055b04c0af49a9746681a027b33097e7816
-MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
+MISC metadata.xml 338 BLAKE2B 61aa082f4c9e389a4ecd788fffd83abed35a148ad0f769859ebf594664a57ff87339f0f1ee14ccebfe70fe437d0ec9c8b546423ffe8c223e60bb3252c06ace46 SHA512 005ba1c1226001f9fb00082140317a7e21a5d1c0bec00e43cf053f44ead7ff9c50ae9b4aa3e0b71f7574462bfcecda30f4515ba327a8ab9c916b4dc9799cdc71
diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml
index 9c577274761e..c227741f682a 100644
--- a/dev-php/PHP_TokenStream/metadata.xml
+++ b/dev-php/PHP_TokenStream/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest
index d2ed303628b5..3c94fa0b6e06 100644
--- a/dev-php/Text_Template/Manifest
+++ b/dev-php/Text_Template/Manifest
@@ -4,4 +4,4 @@ DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d
 DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca
 EBUILD Text_Template-1.1.1.ebuild 504 BLAKE2B 80a2d58f15b1b3daa5a5b6a8064d4103cc9f249e20c05f1e9b9a8cf31ef7ceea72865446ac82d8f0aa3b82d7cc285980029dc6f55270cd2807a1cc6298e39b93 SHA512 1187b7899d014e0ecbcfb314f60f521c7206c9b306518b208ddd66b052975b6afb75086c112b0e55a645ac1c9f4ac26610f564b8698ab922d962e83aa7894474
 EBUILD Text_Template-1.2.1.ebuild 755 BLAKE2B 18e71c7fe729cb72aed7c2dab880552978a1e49e0d12616af1504eb6efc1bfb51d70cd753799ecbb9b55da6d7aa2650f4dbc07143e3b6220c27806cb82245496 SHA512 5f37bc5850963eace43ba3d8c8f202af01953c21a1996585cfbee0a7d3d974d202ab3179757ac97db0a98e14a275f3d7d4438f94fb42fb96117700af97d74513
-MISC metadata.xml 339 BLAKE2B c5e702f4976f584f0e7e9818f8c1c12a3ac5cd693faa20afb9f60444306f8be4820efef2cb1786508efb51f80241998abeb1c5b7cfe530d4ab86f4e8617be9ea SHA512 5a723a5167a669b4fe417f81d895d9de2b3ab6767b54f68cd246e8f3e446c841ddba918cb83575cb3c21b1051a1973e4eecd8f5c9f7c708b5911fe4473fb4ce6
+MISC metadata.xml 339 BLAKE2B 6b690c78b862c07041ce598f2ee8fe091bb3ff2c47a2865184d07ba0a8ecff2765f1d89d6f646b5a0e3b578c543ae9afd829a49304ad764c5d12045f4f80ef15 SHA512 8c20871a73e5f06c5fa2ee3dfaea372a002116d586af90a8a2670e28c9faeeb7bff1dff0efc68d2025f9bdd4be288a316db88d0688cc597e39f1700eaa97e69f
diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml
index d3b52475bc18..601a1f87ce47 100644
--- a/dev-php/Text_Template/metadata.xml
+++ b/dev-php/Text_Template/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 0ec4ca11e132..b3738adca507 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,3 +1,3 @@
 DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15fcda48019a2a7788d8913d20a05c4aae98f2345d931b8f593bd32622a033fe421b55d0c687b10c7e1be05 SHA512 3492512ec04e523a30562d49aac1be617a2cee80fa363b0fbf13b25b44818a4c85af018193f79a6442419b1f7022cd7ec417e3c34641eb8096750441dcbd22bc
 EBUILD awl-0.61.ebuild 690 BLAKE2B 4d05a6e4cd627f8a5b197990e5619502a5102e391c81c171c57efd7eeedde4a4396b4a051449845e4e3c0e4b55cd8219d7cf8556f81de895d55341f2b5ac2d21 SHA512 7885a6ea48607e8afb12ae1f17a6ed58d225c9bc9225f1a91c0d26c12f97cbfbba01e2381af3aeecb9ab720170e511807ffab925a96822d62dcdbe6349291342
-MISC metadata.xml 607 BLAKE2B 7dbb1cbff742ad363e2ceba2259f44ca5de4abf9d77b61fc6e67b427b9c065589f0bbdb9ef0c2a998c0fa5d2dceccc37b9f9f07b9abea983e961ca9c32e3860d SHA512 329e26d79c646dee99fb39942b7f3e4c754fbee5b747d1575537c5b177ac6d0cbc6711a468630d6f15d0b31fd531c75b1b7237dbb54249ffff3ac8b63a53dc84
+MISC metadata.xml 637 BLAKE2B 98930e2cd3f20ed5d8010f73aa58e858aab70bf3dc9fd166d1ad6031b3adef002536d87f98a39a8d563c47d947c2100727e658dbed241cacfc9fb21460dd2210 SHA512 4c0bbb905012054b9a8deda85cc2479c1267664bc4fce51f47b297f543bfcdb2fc1fb664d5a236e19d10f6eb5851f69f4d56bba9890633fee4472365293c2fc1
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index 08c762631e2e..067f0aa933fd 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>till2.schaefer@uni-dortmund.de</email>
     <name>Till Schäfer</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index 59eb2d5321fe..3a41e5187722 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
 DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
 EBUILD ca-bundle-1.1.3.ebuild 549 BLAKE2B 19f79b2a3c41f87809872ebeb277cb52d83a2e78e57081d7e85b28c1b43c862015ab44fa9c2b4a1bc278759b549b455df3f74deed54b47caae7c14485935aa29 SHA512 d77f24ba5c2ff78d54363994e05b5866c4dbcfe572de78658ecfd65906dd48bcf48d5ed11f9f6327305c55662db0c479ef168ce66b2ca0360141f2406c82daea
-MISC metadata.xml 843 BLAKE2B d66b37ea7e1468303bbf544d3492a5f3108810a2a04bd5eec1562fa3b873e22cfc7922b46c96982900d8a0c7af7a22e4b33e9700057d32e238c35dd7fdaf5d06 SHA512 9cf3344f7122a81e5ce4b114a53af7c2cedc76e9607abffb906c70263b0c9dfab0209ee06be67ffc22d3da2e386fc376cc3aee007974e5338a259f853c5452fe
+MISC metadata.xml 873 BLAKE2B 43fc27e52651ec74bebf712dd5aecdfb54fde0fa1112886a7ca7b5f9a458bdb88232a6726671a1ab7961fda6f87a4b02f0abe280d971bcfcf6bc3ed6f5ca2882 SHA512 499c39c8bbd5a3c2c83d35abef67fdda17d894534b72b2fc0ac98ed7506cafbbeeda453dd6dc0ee61f7d5afa9635098974e322fe275eaee76dd82a1a9c37aa3c
diff --git a/dev-php/ca-bundle/metadata.xml b/dev-php/ca-bundle/metadata.xml
index 1fad9628ff21..c95ddcd36f8d 100644
--- a/dev-php/ca-bundle/metadata.xml
+++ b/dev-php/ca-bundle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/cli-prompt/Manifest b/dev-php/cli-prompt/Manifest
index 9501468f5722..f2357937aaa1 100644
--- a/dev-php/cli-prompt/Manifest
+++ b/dev-php/cli-prompt/Manifest
@@ -3,4 +3,4 @@ DIST cli-prompt-1.0.0.tar.gz 7538 BLAKE2B 650bb080c77471515d9baf31d1c5ea13fbfb4a
 DIST cli-prompt-1.0.3.tar.gz 7563 BLAKE2B 5f4ba04f3ed1e98b30c5ce840fdb0189422b6c83e6df82b3a617eb120b4dadc840287b3ee559b6605f1b2a9eb873abbc446a9ed3ec1dfeba1158a7a27ebee951 SHA512 e7e7bb0ae5173b784ab7dac4453b23d039abb68c11b21bfd3756f7f37da413744dcd76d8f8769ace023f91f0f2a8f78421d432bf96fe0781c05a9584b0f0f64d
 EBUILD cli-prompt-1.0.0.ebuild 536 BLAKE2B c63bff6a789b815aeb911d8e7718cf056c79cd418d0be6a2330c81cb11a02ec59c3aca0f3898715e22c25e79b52f17096023cafd7f105df898421ae5362eac06 SHA512 de432496c42dfe1819c89d90b37404a2f236d83c8072969d36da16776ea3070a50023d333fda107cf454ccf9ceb878a5666bd7090e23f77cfaa0cb2b43ef2bd2
 EBUILD cli-prompt-1.0.3.ebuild 533 BLAKE2B 47fc3b7308de999c3ed4ca592a84adb22fbc6b2f0736602788dc0e6fecc6df3eeb353bf489ab4d3cf3dc5c30ae3ddc029cd3a8c91e349cf58806ffa27d85d30a SHA512 446b14dad2c14f7b7c64251087a8a236ef3ece44f48c662ee1ba955b7f30ebb6c5e48de33ef3d8d3a0c423903d6c482d5a5b4614f607c898c0db403804a71f04
-MISC metadata.xml 708 BLAKE2B ff80a057a2ccf142b03191ef285e81ec250e145998eabed54849b6ad7cfe42f0b009b463268f6d792de97718310afdfab8c1f5c86e4853761958f1079284dcbe SHA512 87e434fed2ee3d6586a6e4cfdbc866a9aed25ad26c28ebca1cda29109031212430a97f0dc8d40668ef20fc355529f9141d03ab14ccc49e93a9ebf427294f6c78
+MISC metadata.xml 738 BLAKE2B c260ed717a945896f76ebf6cbfc2d37925fd2ab035f5cb630c4579062583974eb7b536712ca2558118b39b64ce17bf0c5f6d5d5fe5caed87ba0812faf7f32d35 SHA512 0ee1885721a23c8b274f81b54d6d07e87fc3de82d981a11d74dc81b52c5d065eb2051d0c257bf067ebed16fd7a43ab9b64b9899ce85ffbc5d0d21eaba2ec6515
diff --git a/dev-php/cli-prompt/metadata.xml b/dev-php/cli-prompt/metadata.xml
index 4b3fb7237dc7..681ed26c3908 100644
--- a/dev-php/cli-prompt/metadata.xml
+++ b/dev-php/cli-prompt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index dcf04734a237..0953d521f4bc 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -2,8 +2,6 @@ AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206
 AUX autoload.php.tpl 253 BLAKE2B 421f8bd3aa659c6add54e46094ee1d8806ab4fd33ee915515fbe94d241b6a1d5f222b85a720733c5e48369f3a737d5696cf4f8343df7fe809b3a7e4ec38854a1 SHA512 0cfa3e377406d7eada27c56c50b57943b096ea35ec23b2bfe1c926bc4eb276151578d3cfbfa28c76b3358875db35b9e2460204d50571da2d3df6d9a665514da9
 DIST composer-1.10.20.tar.gz 429016 BLAKE2B 29dcf1e32974230075e56c9b11e53316a1bada9a6ccf43f3357fc39577abadde566df962bb9bf92cc9806a012fbd70c18aba5daee87090fd10de273643d92ce7 SHA512 5b85ebc6a0612c01bd2dd6f6a57526581a821c1a45163ef85511bd0e629b10dc464776b56fe33be192b2a3f07ce818dc40cf2305d9f65ee10287b2265e198cca
 DIST composer-2.0.11.tar.gz 494980 BLAKE2B 7095b27ff770c890261a622d2b96febeca226fa307fe14d74df0e723fdf2ade8b04ceb85a25317f4f6b2f5cfc9dce27223738e61a734d6b4c3b4069c03ad551a SHA512 7f2429b4cf0dd237b17d393837e18e12886a9b0641130c8d6e490b37f85b8beee54a2b58003e63b7b157104edf70dff211ca44255ee60bf904b3fb7d57f186d2
-DIST composer-2.0.9.tar.gz 493134 BLAKE2B f08818ec05aeebd79501e221b9cef10425c7dd60b9aca17ca8dad2f6967258d6b1a8d0d1b383b0c7dd1214ce6416f666bc30785bcb5978c66051ef2e03d17304 SHA512 4953bcc0d2e9ae61ebbb3615c262ac05762fa0165db2114118eb5c2bb014bc4341b07c3b8739575feacaad92d2460b89486b49f4eb49b80ce4a9de36a1152b48
 EBUILD composer-1.10.20.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.11.ebuild 2103 BLAKE2B d46051503b70b8c5f27b4d6b7310cccf74afcc2736194ea1dbb5a42d6aae193406c466e6b6f79f0a0e0573e73131b8c780d28680daa9b9ab8a462cf7deaa97ea SHA512 dbb17d0d0b34d31ec6c315e3c6e21c3e355237eabafe94568188620da5e0d706a5fba97c74a29408b4fdf9d87912574e96aecd52a020fafdd917f966b46e7e62
-EBUILD composer-2.0.9.ebuild 2103 BLAKE2B d46051503b70b8c5f27b4d6b7310cccf74afcc2736194ea1dbb5a42d6aae193406c466e6b6f79f0a0e0573e73131b8c780d28680daa9b9ab8a462cf7deaa97ea SHA512 dbb17d0d0b34d31ec6c315e3c6e21c3e355237eabafe94568188620da5e0d706a5fba97c74a29408b4fdf9d87912574e96aecd52a020fafdd917f966b46e7e62
-MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
+MISC metadata.xml 804 BLAKE2B 7d5f809e3017ddb3836c494f03798eabd9f604ba6987ee1c0b6a21b0b6697e7142557f03b066e7b236c9330cf8505a87c906591fd571545294b70f3b70f2377f SHA512 cada8e3b771827502011a1f074082ef7193b014b7ac2e1efe3f17e6fc126d712e64afa0ec6177e8c0d37681d5d57daa04637e89cb10a783c6278c58606e12ab5
diff --git a/dev-php/composer/composer-2.0.9.ebuild b/dev-php/composer/composer-2.0.9.ebuild
deleted file mode 100644
index dfdecde74bed..000000000000
--- a/dev-php/composer/composer-2.0.9.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"
-
-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"
-
-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.10
-	>=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-1.1"
-
-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/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/composer/metadata.xml b/dev-php/composer/metadata.xml
index cdbe7f339484..1cb173ff9a86 100644
--- a/dev-php/composer/metadata.xml
+++ b/dev-php/composer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index 01d56b41e08b..97f281850be7 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -9,4 +9,4 @@ EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 71bf053159eb6c319c443d2312
 EBUILD doctrine-instantiator-1.3.0.ebuild 697 BLAKE2B d649a6ae7e681c1caf12860c61eb8380c4b5b11b4b41f7a20c441643b24102808cad942df3530731cdc4a48b6a00883b97cf76c81210f21c8c13a19f2e10a777 SHA512 457bc64ede2268c0c7af6bd7e748183587dc821a9ed138b300687c25b54fef9464d10b5c1af2e3a63d095110c2324973a7cc2c73c4b5ab28a9ae920e88517e86
 EBUILD doctrine-instantiator-1.3.1.ebuild 691 BLAKE2B fa8b507d7101f0df1dbf8bb8d8e72157e1bca5acae40ddc811cddb55d05c9c2e7528f9e4ecf210c822f7b48775d4dd1212ef7d03124bb5d084142ffaddb8ce0f SHA512 698174458102f27a52279a0ee310ce61747d5f9c7689902de73b18143effd9ef48891faab77b956bbd5f832ed6bd2b493fe00d7f7ed9686b208311c7bf885eeb
 EBUILD doctrine-instantiator-1.4.0.ebuild 816 BLAKE2B e101e961c66c3766310f29dc90b271bffb87c23fa838a7a750490c2b9f9447ad50c1854f84fa54319c6ee9057de9d822f8446065c6cccc8a60ab01c034e69704 SHA512 a48711d3efc2b3e4be11fa7fd1c21beac92e6eb773f0905acedd28cf9562bd54c6118f733bf0bb88b70efa18af268506d4707430453399f91021c7cca9b0962e
-MISC metadata.xml 349 BLAKE2B 14a8d6114be042ef2172a8dacec2a303ec4414cb0dd83f6e503919b51f40887f2e447160df2964b04d9c5542ca989b1236258fce3ef4250b9dc17307deb75afe SHA512 16a380830b6e002a090fa981659ba9b75244ee46089d041380e9a289309ac97ff41be35847bd5753f816efbc58d534b9b1a383983f946c2d744e24d9f54aa612
+MISC metadata.xml 349 BLAKE2B ab8e41a4014f6b791fb2be41f27c2521de7b11f1f28067b6c13796f102b9e6b53d49bf23162e7e8faed85b4e496f174719134b5c49b28cba3a2f70bfc843920d SHA512 b40b32571a99781105f60ccd41aa3e3ecc873b2b46f14b2216064095591afe171f1b5c69f6680eb3af7942928f8406e9728ab93d86e499d581051f974572625b
diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml
index 9e7a740add19..75fefe8c5c64 100644
--- a/dev-php/doctrine-instantiator/metadata.xml
+++ b/dev-php/doctrine-instantiator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
index 41b0c19dfa69..d03cffe64ccf 100644
--- a/dev-php/fedora-autoloader/Manifest
+++ b/dev-php/fedora-autoloader/Manifest
@@ -1,7 +1,3 @@
-DIST fedora-autoloader-0.2.1.tar.gz 7634 BLAKE2B e2827ac332a7b50f94383a11b33f25625d67984491fc46dce6ad01d6e4b986c489062464d09ff5ed32f29c2d623ff9d59579fc007eceb1279f660695feea72a0 SHA512 81501dbc0668c1cc6d6fb030e0d9ee91d31db8fa32b3348a0215dbf20a3ef1d41bc398124e1d7f0c1d5ffa8fce8c33e60a3182eaba6ba740d78b4a7f6db2aea8
-DIST fedora-autoloader-1.0.0.tar.gz 8504 BLAKE2B ada69f3f3126b2c233b0ab933e52468d8303dbaacfc27364f490ce7b093043f92913ecc55180b460828573f0f204f5e7f4d10b3149ef6f5b3cee1d645fa6ac58 SHA512 a8e3330d961a9415a817d41ad9feb91018aa398607a2adce1f8386d491581773226f6819ac3d90827344898fbbdb32c0881af3f122efdad021f7ce70a07cc66e
 DIST fedora-autoloader-1.0.1.tar.gz 8743 BLAKE2B 4ba6ed275812036f171138e05f5aa56611c6430bc5e440dac5ee45ad975f2300c70c0b964c8c5e0681028829738ad1e4abd69b14e83e10e5215ea9ec7f2d705f SHA512 dd27348e23b69f03e64c2608ae9fd8caf54baa60327c944f46ab5f4cc762677baacc21ba0ea97cad5d97e9f168b1b3731e0ab2bb48df394c07aaa61fd9d66de6
-EBUILD fedora-autoloader-0.2.1.ebuild 721 BLAKE2B 1f3303e37188c41dcaa83aa43185654df099fbac8a70a1d0d4be5b94c27caad0fc356c0d46f65387189f6fbe7218631f57cb69bfc830556f7994b0def5288c1c SHA512 570f7f41b243b7c07ec2dc83b470b2920307f06b089ccf23231e87e5619eab7a6446292a5a87ef3134c36c45980ffa5e2afdd4930005db7dabaa72c4deb63b7c
-EBUILD fedora-autoloader-1.0.0.ebuild 718 BLAKE2B 97334b3097831daec99ed17ae46513276c6d89f89a5eb98499c0729b7a5127810a9e5c7cc8e38e4944efbd70268a2ec3ef15e3df174f330ebb7fee4fe4aa474f SHA512 841ae8fbac7f68ae0fe8c035ff0da1ad41b557666fc26357eb19119c9bb1f9f6c85cdd189b9b8688b4d25de8db559525d1d3ee9525c45428b42ebd96336133c5
 EBUILD fedora-autoloader-1.0.1.ebuild 712 BLAKE2B 1133678068cfc42e48fef44b2956d8db1d2fdea609f7a4765a832eee8762fb731a8450045f0dd9776d948501eba043181d7b57263f6044e5cb66239f01320d0a SHA512 9e00fe9f6fc3f893cfd3cc86ac88fb009a4bf8717905a7a7c772a314198f40d8e882fb097341da1bfb5ff565782fd90200472ea1e25386fa2b8c4e2252e26809
-MISC metadata.xml 735 BLAKE2B 48038d393e6901374f0cd0e145f4906667330ad8b87a1247aa3c7ee39f826c20fdcf750870d2b26767f691ba55c10ca7c48b95e7a2b8b91b0e96be80324f5402 SHA512 cf6138febed92380ed990ac58aef05847e7d4f8aedcd22e6a5099e37f595d4088cc1a59f23d48ad8d91ea2f1648dbd480e9913af052800a139f817e7511b388f
+MISC metadata.xml 765 BLAKE2B 820a60c5d52542b4f7c4b0c29f36b63c8ac41279a379561a67f6d46f71abeb04e803ae634493cf275bdbcc799ede722c8ac4a77a1492d8de499d062bffccda1e SHA512 66cb2e3982a76c0e30ad5153a9d1f037dbf15e1b9e4f019b8d7f45a1eacdf1b00fb7015b41af951944d5a436dfcc944426d0791300df4cabb8f7d77d347e23ff
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
deleted file mode 100644
index 10f5e60589cb..000000000000
--- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
-HOMEPAGE="https://github.com/php-fedora/autoloader"
-SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/php:*"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-S="${WORKDIR}/autoloader-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Fedora/Autoloader"
-	doins -r src/.
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit || die "test suite failed"
-}
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
deleted file mode 100644
index ee12d3f5e31f..000000000000
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
-HOMEPAGE="https://github.com/php-fedora/autoloader"
-SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="dev-lang/php:*"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-S="${WORKDIR}/autoloader-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Fedora/Autoloader"
-	doins -r src/.
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit || die "test suite failed"
-}
diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml
index 0a1e7e2c6673..abb6b8880a1a 100644
--- a/dev-php/fedora-autoloader/metadata.xml
+++ b/dev-php/fedora-autoloader/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
index 72e397357867..d060e4a9cbb1 100644
--- a/dev-php/json-schema/Manifest
+++ b/dev-php/json-schema/Manifest
@@ -1,8 +1,4 @@
 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.8.tar.gz 31179 BLAKE2B fc422b4ea632299308fe44104ed66365441879441446d47bad1da89182da0c1aba04877c279577fe7e8fc9f82e4677bc755558a4f4fa1893362d2b93e8743a08 SHA512 04a96413a12979ee42cc72dc7d6cd73ab26472c46cffa1ce65d7e2338867ec6cce48da5a058d4c8bb849a8fae72376272b814f3a808ed3374af9c98eb8674fe5
-DIST json-schema-5.2.9.tar.gz 31336 BLAKE2B 42d1a36810a28050bc543a4d79a3701444e86176e3c514ac198c7b6e8300edc615652c0116e44977c2bbbcaad17da96a4d32642cb304b653efe417e6a5aa67d3 SHA512 4666df39ad50a284687c216b30ac50a5ef4019260fbe0ecb052c820f9c029a904c07fae7606df3ab24b1ac18f651ca4a93ee83847e76361fd41072ce04ded222
 EBUILD json-schema-5.2.10.ebuild 860 BLAKE2B 432497563470f73d11cd08b98f72090b921a16d27ea6f83474db8b5fe670fad37e94976e39b19364cb9a9aa16f252b72a742e97efad775fa211b10d37166fa1b SHA512 ebaae8f90dbfc358b2f3ce19a77639959a09bea54914213f85b908c5048383cfd5a2a5da94eeaa566ef9d77ec69e7501e404a3ebe610f4aedaf2f4f67bee3f33
-EBUILD json-schema-5.2.8.ebuild 860 BLAKE2B 008001378526262ff2ab40a288cf887a86c7b40efadf763933519ca2ed24df8986133c91235fababdc922b4ef7c06db5766f073e5e251f68aefd4e0312c13b05 SHA512 ebc9d17959a0903632ef71e28475d912f945ed02b3b28af81bbbc135c42ec590a328dd544d30d056a8650afdf7bb239763b32612cb10a9e4394bc8f68ab7c921
-EBUILD json-schema-5.2.9.ebuild 860 BLAKE2B 008001378526262ff2ab40a288cf887a86c7b40efadf763933519ca2ed24df8986133c91235fababdc922b4ef7c06db5766f073e5e251f68aefd4e0312c13b05 SHA512 ebc9d17959a0903632ef71e28475d912f945ed02b3b28af81bbbc135c42ec590a328dd544d30d056a8650afdf7bb239763b32612cb10a9e4394bc8f68ab7c921
-MISC metadata.xml 563 BLAKE2B 9d0902f5c59a312a5c5047034dd6bfce9faa9ce7efe2fe1202279bc1a627f79954b4ddd4bd53930c2315f1eaee2184a3b86b1eedd4e2ff0ae1a90302771d46db SHA512 b06a96f4503b71ae1d040afcd3ab4d95ee77e0f9bdbfabd46f7d8400ba0dfe09a332a91b10baccf564c8218a7e129889c37a7b4ed2f865bfe69e368821eb5b27
+MISC metadata.xml 593 BLAKE2B a68b29ccf5133a7c4cb1715fbe9539bb10469769db9ef1f6d526b81402353399e943079f374340393a13b3a840b3d0e8b71213c2267ae863b22b0ee53180c136 SHA512 1a107de444658b5f0bc0bf413eaa85faed542a9788b47a5f60b807663b8f19c5bead35871881dd4aace1e886d9fe9d2c0dbd77187e9d27a3b81eb69f52eded21
diff --git a/dev-php/json-schema/json-schema-5.2.8.ebuild b/dev-php/json-schema/json-schema-5.2.8.ebuild
deleted file mode 100644
index 0c8201a0dd70..000000000000
--- a/dev-php/json-schema/json-schema-5.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 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-php/json-schema/json-schema-5.2.9.ebuild b/dev-php/json-schema/json-schema-5.2.9.ebuild
deleted file mode 100644
index 0c8201a0dd70..000000000000
--- a/dev-php/json-schema/json-schema-5.2.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 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-php/json-schema/metadata.xml b/dev-php/json-schema/metadata.xml
index 1d0f49201d8d..a7c4a1c3879c 100644
--- a/dev-php/json-schema/metadata.xml
+++ b/dev-php/json-schema/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index 9d7f91edf3b4..a2bdd1e26509 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -3,4 +3,4 @@ DIST jsonlint-1.8.2.tar.gz 13729 BLAKE2B 80cbe2e1dc6bcbc0d75d04f34a36deb8b53ebd7
 DIST jsonlint-1.8.3.tar.gz 10588 BLAKE2B af54e4bedb66e28f61c338f5161109cf1df45dc4aea7c5ab27d728aa4ca6cc0c1e76575527abffc0a1ff8b52465cee40935829f71b3b1a0284c0512827b5bc3c SHA512 c2a9a16e9abc048a1899e51cc78995410b8aa44d5afdab30930f7a7d88b174844ac0f547b0d0da83bc4a71ca0457392e586afbc97cef5de36e0dc2e032732bfc
 EBUILD jsonlint-1.8.2.ebuild 887 BLAKE2B 0743d13b44a4a5b8c203fbed8c0080abe564f59e1b5951339b588c2e33df9c356e1622b8c2104abdf89bbb78d09f47fdce25508809b121abc3517f6da6fee994 SHA512 086309631776a66ee68a796c0dc791722374637bd06d971e92aeeb401b5b302dc9e04708004c1067fe4dc698838aaf853a405c297805de19fcc7bc46a37b88cd
 EBUILD jsonlint-1.8.3-r1.ebuild 676 BLAKE2B d45dec7ea71a37d220b6b45ede8a98968e4757d9747dbe50d1dbaf690552330ef6cd76a853cf6dc161e195e2414f2833634846fda2de186b93a9b03042e3c1ac SHA512 abbb70f69ec35178b17ef10e9cd7a37af027d75a57c95dfc2ad79ee9b755f86d36261ab45e2b10c05e024462b601d08397f3ce60e7eb292538051f487827f08e
-MISC metadata.xml 554 BLAKE2B d3e5440418af5ffa8bcf2188f4733fdea1f0b352482b36611f97e3574dc8046dcaa492961d9934215656ce954e7a20506f5208df1c09f052fd7cf06f83538c9a SHA512 78495ee38c55d98dd9368ea8f185d4c0a19f98b49da20aa9721c975d4df4279fe4df842fe55e351ebf1280569172be0877705266d2cfb90e0c52f3374506595e
+MISC metadata.xml 584 BLAKE2B 7dcf3ec13366a729fd1720e5fab46a2e165b11d57045188f06701d6ef120ba6f4754187583346204bd0652786cb9931bab93878e1911f4a8aece900c9ddd81cb SHA512 1a608824102621826fefd6a2106d4f5513c2f907dfff78fd106454eaf772670479368fd86c000291426a3009cd18506aa2e04f0b25e3e013d2eb7dca1b158628
diff --git a/dev-php/jsonlint/metadata.xml b/dev-php/jsonlint/metadata.xml
index 2ae75780ef58..99bc258e7da3 100644
--- a/dev-php/jsonlint/metadata.xml
+++ b/dev-php/jsonlint/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index f23b8724e443..68c9775d8c2e 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
 EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
-MISC metadata.xml 585 BLAKE2B 0b6a50c15e2fe822a2a3cb52b7fec01677d4fd8601f9b3d0fbdaffedb951edda038d721bf4fb10ed49c3e87823115069be53495630ed2472c982084256c9d1eb SHA512 ec754283b76dde98c10ae1bbd0c11e24e53162d4829e3d32ca9c32b9dbfdef4df0494ba2fccdc0ba1c05c9aa58086c5064124daff69db00372915c530089b2e9
+MISC metadata.xml 585 BLAKE2B 547aff16af7e7a3180a43f700959afb7bfb6e372342087580165538edbe917f42538f266ddffacdacc859bf62d6d32dd02c9dffcbecde2978d3aa754b26508db SHA512 3724602660edeb1e111017949a99e511e49a830050a466564862a418de02fb8112663c1b892ed61e7bbc317e0e25eb70e10025236eb22895f3386e1a9a9d47e9
diff --git a/dev-php/maxmind-db-reader/metadata.xml b/dev-php/maxmind-db-reader/metadata.xml
index 5e6d2f4ffe63..329d808d30df 100644
--- a/dev-php/maxmind-db-reader/metadata.xml
+++ b/dev-php/maxmind-db-reader/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-php/metadata.xml b/dev-php/metadata.xml
index 9d56fe4cb951..6ef3359ac60f 100644
--- a/dev-php/metadata.xml
+++ b/dev-php/metadata.xml
@@ -37,4 +37,3 @@
 		programowania PHP.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
index e34e8666115c..87af83aa381a 100644
--- a/dev-php/myclabs-deepcopy/Manifest
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -7,4 +7,4 @@ EBUILD myclabs-deepcopy-1.10.2.ebuild 764 BLAKE2B f2de112ee134d352fbfddfa252ac02
 EBUILD myclabs-deepcopy-1.6.0.ebuild 648 BLAKE2B 3da41b18a1bbc4dca10e5e5baf584f7481aea034d80ef374beb9cd87e2296b2a359debff7467a31a4a0ac6e60fafe9638169d1a3accf5ea106f536be7a60a44e SHA512 3f134b492e679804a8289fff6ae651138355ce95f201e6def51e9f40b5c2873fc23d8905cdc74454430e04b16c23c8f04750d44aecc8d53f8845dc0b7f4f7936
 EBUILD myclabs-deepcopy-1.6.1.ebuild 654 BLAKE2B 216541ee72e5454c8ef5a1fe23a664e43f10e131fb9d221c66a12a3430addec7dad56ce53ebbb90166645f5d28e9af93bee0c573ceb5c2eda6464c0ef389a23e SHA512 8956ac9933609b03f71ad2149660b7c224c0ba33abbbbdabfc88179748f6a78ff182c6668431cd48610929b1b6dab604eccfe72cd93a4dc772a382c73fa3bd13
 EBUILD myclabs-deepcopy-1.9.4.ebuild 654 BLAKE2B 40936ed9f955bbb554b48ec355cdccc9b5402135ca88d5c84da460f459ae2f69cbcecfc1a124d0d9c6438c4dcfe0871174c5322892e95949a284f96f1698eaf9 SHA512 28c15466c4bf23aba8234121d5ce207bc29dee38bad1294dec822a16665a269cb2bb283e873e1999daa6786b3f58d326a83ad9085dfbafd7ef2f03fc3118a6ad
-MISC metadata.xml 344 BLAKE2B d392ec45385ebd13e00a94b77e0a15a8f09b28e80897f4e4ca90a23553597ed39a3856892cea1d6ddad54565d21081375779141015db71bde5932791ced070f6 SHA512 d49b06b89749ca29e8bcaae93f764af7967f9d9e9b3b5d4ca0e8f406bb3bdacf2ca8ff130c8806dba2255a28ed5109b284402f8364ae9fdf45bb8ba5b14cdfa0
+MISC metadata.xml 344 BLAKE2B 033cf2b3b8632d8abd12a0e76ce1ce20eef10331f97d0a3b7303bd7dc17b953d77f3796627c0258a17a20bf15a6e7ac763acde9a995b1ab20ac73433c240d749 SHA512 cae99f5a89140eee0a450a47c3e8b0ab944f3604ee88e69264fdad4279fe3b4a4573c8dec20566281b592e1bfaa9f98c6c881e4681675ce3a03967dffc9457d6
diff --git a/dev-php/myclabs-deepcopy/metadata.xml b/dev-php/myclabs-deepcopy/metadata.xml
index 4398079e0ed7..96b9e4bda654 100644
--- a/dev-php/myclabs-deepcopy/metadata.xml
+++ b/dev-php/myclabs-deepcopy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index 83fea759d703..6a6e62365226 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,3 +1,3 @@
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 EBUILD pecl-eio-2.0.4-r1.ebuild 493 BLAKE2B db326dd5383340a4f28028c490dc977b8e86e403c4cc10fe3d23cdc0fed8a84c084a5e7c4be8a37a894fa608ba623ab724a83eeb64de110a781cb16271994e28 SHA512 0ce554142872b0b4955e8744b9c9caeedae295a1d731b5738e517f69d08482e5317b2f556fa01dc052c28080e5fd05d1190ca4aeaa439894671b3486cf7bd7af
-MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
+MISC metadata.xml 384 BLAKE2B 74a2d7fdbd62d0b6fba6517ba79f075a641aaf8ad94fa73cb6b4c288a9ea19d59e096e8f6a74558fbcd6dc545838802a961677d2884f55d49992f210f1f4213d SHA512 f8d7f2b4b39f64110a406cc2493c7c04761764dd96e9ab4085e8c5b049d6deb659c655f6631acd09ba0cb7145b43971f1daeeda219bc65dc90365838f13dc736
diff --git a/dev-php/pecl-eio/metadata.xml b/dev-php/pecl-eio/metadata.xml
index cab0186846a3..a7f2cca502fe 100644
--- a/dev-php/pecl-eio/metadata.xml
+++ b/dev-php/pecl-eio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 <email>rrosmanov@gmail.com</email>
 <name>Ruslan Osmanov</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index 905dac57245c..9446bd705942 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -2,4 +2,4 @@ DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90f
 DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215 SHA512 b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4
 EBUILD pecl-event-2.5.7.ebuild 1169 BLAKE2B b313db6c4bf2c79faa925404c180bcc40d44b835774a17201c3c7c8f73afd32963448479c55690fc73e360169ac415f0f111bcd5ca9afec5d6c26132109c3837 SHA512 aab9e0cf772a537d934e3d401b9ab333eb5901a39831400fd6966eaff6acd97e0f20411c24038409641d21ceb2e89ca68c79ab876e6a3a23e13821caf7b1803f
 EBUILD pecl-event-3.0.2_p1.ebuild 1280 BLAKE2B cd71bc9764f4e91f80ae62784d2a6ddfff2f1cf0d962f0add9f62005bf7fc93fef3534920af77a6943a5d75cb95fffa48766abaff5b02525e65f0878df350466 SHA512 6d2e8157c2eed7c6ff71ab6733dbcaf38c318f2d19f1e501613a9fe3651d2c9306aba5befbb010a92c58e1c16bbaf846197cf9aa608d63ab70ced18814bb3ee5
-MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
+MISC metadata.xml 461 BLAKE2B 99778698b9472f2069d047eb6ee043d2ef53900145c81e1eaccb3ad40d214e37452ba3af0e63dd3253397a4e1783e9457162a6e0e87f6e9c15f6ce929ec1c37d SHA512 2f3b601065f8d986c1f4827c2e3d27178b3cc75e6170df863d1cb199bdd85aa2179cdb952d48cb27c7245c63433f6a891474c15d948db1313a5d1e7abf40e4b2
diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
index 2bec35385627..34450cf3ba65 100644
--- a/dev-php/pecl-event/metadata.xml
+++ b/dev-php/pecl-event/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 <email>rrosmanov@gmail.com</email>
 <name>Ruslan Osmanov</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index f6b4f24a6ba5..cd96229a9cf3 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
 EBUILD pecl-mcrypt-1.0.3.ebuild 726 BLAKE2B 869726eb6c6e36082f3ca9e1c23f993d46b9733de66a087a4e0139f8703f2bfb4759ca15d259bd4c9f2a13e5d752ef63e33e533a3dff150f5c8e9d3a3490e397 SHA512 a1dfe478a62d2f93bfe5cdf93da2ad15a0d731f2f4869c1a37be2fef187b61884d87e86e661d19b122b53123035eb0fed8fb7738133198f8e71762a3d9309727
-MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
+MISC metadata.xml 409 BLAKE2B afb1dccf077ef8a65f22ca59276ec5f33bd6dc4e2916b80615b508cfd6cc9c55f7a9720ec9dda5fcdaf805600af4d05d2b997a454865e2e22f115f42fcccc5e2 SHA512 fb0dbbe2d864a9a8afc0598ac495d26f8ea2dd29dc0939e6ec4fbcee4ddf1b2bda231a8661f8f2788d3832c51d6415de62957d8d33c8d876f81a35a2b139c4b7
diff --git a/dev-php/pecl-mcrypt/metadata.xml b/dev-php/pecl-mcrypt/metadata.xml
index 1b662aaef98c..051239844a94 100644
--- a/dev-php/pecl-mcrypt/metadata.xml
+++ b/dev-php/pecl-mcrypt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index ad8a5e1b25cf..0ce519a59732 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,3 +1,3 @@
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
-MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
+MISC metadata.xml 568 BLAKE2B 7568c14297b6c9d91a289ecccaf51548928f633f034b9468725bf149060a66782a36bf4496e39a55e4d658ae7336d105566f14d413fc299dc4ca85ad689932b8 SHA512 177558b878967a84ceb4f9bce0fe15b2bc8e3539863d66c0de1fc273601f2cb24aef9ef1c4cf7a4817a2c1fbd8e0635d35c0dae6cd6ea72ffe70111944cdbcd9
diff --git a/dev-php/pecl-memcached/metadata.xml b/dev-php/pecl-memcached/metadata.xml
index 84a83c7ea788..a3a0e753fbbd 100644
--- a/dev-php/pecl-memcached/metadata.xml
+++ b/dev-php/pecl-memcached/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index 9d25fd37ccff..e240ee1a2179 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1,3 +1,3 @@
 DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46
 EBUILD pecl-translit-0.7.1.ebuild 660 BLAKE2B 832e82180a85e7995e41bd4f6ea6c647b8d2ddfc43e1108b30f6aef7c6e070a8c8ef349e9b0028f555df783b534a4c3195fa53e888e76e71c523f08ae780edd9 SHA512 0a820e3782cc17a636b7ff60ab81ae42a96d8386432f4a1350d5714cbeda34fac61fc8cadb5cb9c26c9058400a79ba3c1c7d8a9cac5b1a0a0e9195d728270d0c
-MISC metadata.xml 325 BLAKE2B a089699f9d6ab5df97554c8ff39057077aa28eb48f636adf1d2f85eafb3a4952d7c1dc5b86e1bf1e147bf020ed27119a3567c23b7fcd562ca44966970addbbc5 SHA512 b81117beceea889e292daa2bfad712b51f40a2e12e826388bc0d0f2ae2455dacbcdb4a041fdc72bdbfcc123af11c87346643fd0298b0c2bc726c13ede3a2ea5e
+MISC metadata.xml 325 BLAKE2B 5b39dfb873e41e66a0a3134263ceca6f6357a08d615351d1c9e1ce7d97f0b0aee85837dfb3a7c76d0b825179e1aa32ee04f4fd23cced7d51492922d075718ce9 SHA512 c3392cbf853b619a26286907e8890505968d21b55a8fa6ff8a15e5bdce93b4fe2e67d9335dfa0ae7ea443cf8691918041c4ddc845022a0ca0961a285042f1217
diff --git a/dev-php/pecl-translit/metadata.xml b/dev-php/pecl-translit/metadata.xml
index 92808a053d08..8b3c2e229aed 100644
--- a/dev-php/pecl-translit/metadata.xml
+++ b/dev-php/pecl-translit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index f1ae982e3397..cdf9b3c0511d 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -3,4 +3,4 @@ DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6
 DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95
 EBUILD phar-io-manifest-1.0.3.ebuild 707 BLAKE2B 43809d8fc3bbd0e6e6937d7fee43c7d33f7ce71a08b215c7008c05a9a02addba0f598eec5136a227a433b8c45ed68ac7be58831586b1cbd52abf41ecd7edd414 SHA512 95db205b5928a1272f816f1fd8ccaf4baf1457b4b6e9e5c9138aaed5533e05cf4b8272dd641ac7e35dd13a35ea223ac8ccb4a47a8fa9cbdb0950c5b0f936f1e9
 EBUILD phar-io-manifest-2.0.1.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
-MISC metadata.xml 344 BLAKE2B 627dae6eda92fb35dabea0e5b5bc023a92bd350c7828cb0bb39397d7254e1ed4d6f24c16b127eea35df4258c65985368bd3dbc0c353af8680ff216d8840e88f9 SHA512 0cd7c60c7182625c7779665c027bb0467531c3e00308413a4e02312b3cc0ae3fc2819dc27b24b92c9f723b0bde6168f11a6624a76da724d212cb0b99b69ed679
+MISC metadata.xml 344 BLAKE2B bd742bd87965fd81dbef6f251c37534218ae56b8f47ed1e55476e87eba173caca416bb39c385f7141091890de31d44c460698fc58367aa259e70842711fd6568 SHA512 5093e40406018fa3f1e83d86c8c46f38d3296c8274f864a8eb603d337efb6cc4c634e02fc0971ad661008ffbc31d11376dda1cca9f25e9d168761f9f8a86896e
diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml
index 6d8979386a51..98477e04d046 100644
--- a/dev-php/phar-io-manifest/metadata.xml
+++ b/dev-php/phar-io-manifest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index fafa251814d1..9130fef2fe03 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -3,4 +3,4 @@ DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 22a4f8426c14662781534e63ddb62e4e
 DIST phar-io-version-3.0.4.tar.gz 6574 BLAKE2B 95456e6980465cbc613fd3b835e11b4bc2cc8641234a88003418125bd27bc52eccaafef506a954cda521d269abb1b14129a8c8cc1dd082d01c85c0cc05c465c5 SHA512 4bc3dc68545d2ba98606bffb3fa289af7668a0df8c9ab67cd2e3a1fe7790e9ce00d4e3642022d8224ef5f3bd0ab0797b68ee73301530a1893b18c123fecf47d2
 EBUILD phar-io-version-2.0.1.ebuild 620 BLAKE2B 8a7c05200fae7e669a14342501ab4bb363818501305b3de329e86e3a36337a9c486041b253b3e3044cddc7f2c37c2700264a405750ea03ec18b8b0939ab291e9 SHA512 aab971d688553fbb2893c69396ccdca1a86aa13e08836bd376f2b6fe1239df4ea81c528a13d386726e82f7d688d5f73bb0a14a5c56ab0ebb387d403ec2fee8b2
 EBUILD phar-io-version-3.0.4.ebuild 782 BLAKE2B 60a058929a817fa62fddf3fd74a0a2c436d806b744f7aa50964cfb1de1f15a4f0cc9e357f3be6f5593fbdf6737a17be81fdf77a3e61058f4d935444800f2dd85 SHA512 5f62b547bc654a93b38f7c2484b799576cfc7324576e0a1185a95f4480d6ace3ce9c4a73fc50cfaba9e1aad5d22476047df3af53c75e4d39df91284f2951a606
-MISC metadata.xml 343 BLAKE2B d20b3e63391086da258cc1bd0b9daa3f582442ac5b7b99df1aea9ba6f46d65277ebb67c7d917ac43fe2d229765623a5aa89f2149ac53a94ab891286155b9fcc9 SHA512 d10bccd90c97e0902c76a6676d4a29a8bff2525ed3b9407d9abded13399416ce1830b6a9f18f45057b2636de97a945055092bcd593b9d2ac72668b4887f04bbb
+MISC metadata.xml 343 BLAKE2B 89fbe28552e1d4ad3eab9e1c957616ca42c2f4d911d95f0e378096f146812735700eae991a877cb221637e5f50e689d72adf5f824f30af70e7158bbf580d1e65 SHA512 82a23ec3f1172fdb29bed30eefdf5a47cec1200c55854ba0c50b1c141e462a3af022aa96e38a0e6b79254d543cbea0be392e483bbe0df31bb846d68e473c0fb3
diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml
index 6c3ddbcee7c9..cb69a2563f88 100644
--- a/dev-php/phar-io-version/metadata.xml
+++ b/dev-php/phar-io-version/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest
index 531de6986972..1267a83aec16 100644
--- a/dev-php/phar-utils/Manifest
+++ b/dev-php/phar-utils/Manifest
@@ -1,10 +1,4 @@
 AUX autoload.php 261 BLAKE2B e3aef92345eb95b936a4b3edc12e9518804c9f75087d73deec3882c113a913a17f2bad46c6a2e9c7c6e396e795863cf930775b566cccee77fb275013fb29c0bb SHA512 9e4820ee718f642ff95baaff3cd848b868465d5b6538377517f384aa6e0198e0cd3298e98ddd4ffa86e6669f438a6ce8236f4d56440e9e77b3df20599699753d
-DIST phar-utils-1.0.0.tar.gz 3152 BLAKE2B c4dfd3d659989bc22adcc14c79e28d623753988742d2fdd178dfd98590b629083ad85c9f112ab23c6213fa70cdad838ebbdc01c45551892ed9a20a3374abd28c SHA512 bf3d7074a3f1101a7f03e8fb8a5bc1456674bf2f9ded6a5fc5fb2f892c1cc3c4643fab6c003851ed12ea16ce6390f482cf897beee7d7c38922b6c54c90b0934e
-DIST phar-utils-1.0.1.tar.gz 3251 BLAKE2B 4d12701c53c3a17a141dd35210bbac16b84be7bb6d87b459d13114b09188487f86aedc13afbf510a2e01741a72e1929e25ee5204b729fa5b23801e429f844a58 SHA512 a1fb09b712add948f7b5c19e2f9e81869c76f91dd7d41c981b3f06870a6f7a15d0c413338751587642e3dc538e181336b9fe80f61148ce304025434e9d01d6bd
-DIST phar-utils-1.1.0.tar.gz 3742 BLAKE2B 8be6dd17cd7b6641b52a30f58d0f5615e966b8eaad0f2d9c2927eee98f24a840b4751ba779af2d5b27e05c2ab07333475c22896e165589b4091770356039bf82 SHA512 2d715da6deea878db0ff9dce1aa7ec46c4b25d74411df2498a55228ee9fec9bdc350003f829495dfdebf3f5bbec58810afeaa58c7f762f32af6f26ced8569e58
 DIST phar-utils-1.1.1.tar.gz 4211 BLAKE2B 370c6e325dcef6fb8ac2ab12a661f59d1c5feb5135aa8bdf7c0b3beb31f90a309994e959b68a96d9da2ea2ae25d38ee5bda1d86a647b4958ce81bece3d02a935 SHA512 bfe7ce821767588032a2db8e2b80d827f33a5bd9049d74d6d1871b7e65878cf78a86162ed67e96edd363a3520f53723bdd496914e96d4ef8629880729bd812e3
-EBUILD phar-utils-1.0.0.ebuild 540 BLAKE2B db97fcd60bf5c51010548dd186b3957f277b2a2818d8cd60b7cbc62457a96850956012a44ceddb663931fb2ee4035cadca813373ce5f16c9046c667abcc47ef3 SHA512 d3e797a0fdfa3a43717d8947fb0b4e1d1dc3720ef9303dd8dd27ee77e3e6bbf603d00a2b4fec9dddab7f1d6f9102e63ea7426cd13ac226fc701c7c28d84be6c2
-EBUILD phar-utils-1.0.1.ebuild 540 BLAKE2B f46c41b1c9949a8544be7a0ae5eb8af7bc9702ede67076972ddb6f7b17b5cda174d91b06e4ba5b9baa9da7d6be22a215dbae139378f8251343cf97a5b76a4f5f SHA512 06c23e48d0e8158d37977e903c288dce1c9462bc37cf814356aabe03e25edd90acae57dc83547697f3c7692220f793959b20762943a93cf2af2939e2f4e2047a
-EBUILD phar-utils-1.1.0.ebuild 537 BLAKE2B 24488b103cf1e17a63a1befe6984fddc842c6d7a8133f766fb390b7f666a0e11f69f99b1fabde66b1a270f86bcf0ab05e26c0b886930d5f0a01d223316eadc3e SHA512 3c1b7f9bbce383b9d97f3a260e47b394c14d9697e19d412a9543b12cfb0bd30a31b18296846c6278838a9490a2e13ac7ac76935846231bef409618f0a7fcc6da
 EBUILD phar-utils-1.1.1.ebuild 537 BLAKE2B 24488b103cf1e17a63a1befe6984fddc842c6d7a8133f766fb390b7f666a0e11f69f99b1fabde66b1a270f86bcf0ab05e26c0b886930d5f0a01d223316eadc3e SHA512 3c1b7f9bbce383b9d97f3a260e47b394c14d9697e19d412a9543b12cfb0bd30a31b18296846c6278838a9490a2e13ac7ac76935846231bef409618f0a7fcc6da
-MISC metadata.xml 556 BLAKE2B a3de468f81a30e44f49765548522ce7ce0ed18a1841cfec252c258bf7e5ad7c6b481005c6449993d25a764e118f3d37aeb19a829546a2e00beffaf072590cd1a SHA512 771beaa6f8b71c05ab0bfab8f8f9d8e362b6d5427d8a4706af53215d4d2f774fb02a24156e66a2b2ea2263dc4af471329eacd9d1097f538954ac2a642f8c55d6
+MISC metadata.xml 586 BLAKE2B 66fdf1ac8ada5bb1763a36b33900388fd7bc45d78ee97867c2319c15f3bab6c29369454f1815d6c7d2bb0464c22808d257fa94e2f57c57bc145bf0915fe0d1ad SHA512 aa07f33d570db29ff18d3e4a1fbbb35a66b30da5b6d70147bfa5c42cd58586d2e6ad37a36d2b2c9de700b9374b71a5687406fbc3dd9b865d60cbbcb49df0be20
diff --git a/dev-php/phar-utils/metadata.xml b/dev-php/phar-utils/metadata.xml
index a6efe0c9d951..3500cb35f8d6 100644
--- a/dev-php/phar-utils/metadata.xml
+++ b/dev-php/phar-utils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/phar-utils/phar-utils-1.0.0.ebuild b/dev-php/phar-utils/phar-utils-1.0.0.ebuild
deleted file mode 100644
index 6607a9e370ae..000000000000
--- a/dev-php/phar-utils/phar-utils-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHAR file format utilities, for when PHP phars you up"
-HOMEPAGE="https://github.com/Seldaek/phar-utils"
-SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[phar]
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Seld/PharUtils"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/phar-utils/phar-utils-1.0.1.ebuild b/dev-php/phar-utils/phar-utils-1.0.1.ebuild
deleted file mode 100644
index 9ed73f9e628a..000000000000
--- a/dev-php/phar-utils/phar-utils-1.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHAR file format utilities, for when PHP phars you up"
-HOMEPAGE="https://github.com/Seldaek/phar-utils"
-SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[phar]
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Seld/PharUtils"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/phar-utils/phar-utils-1.1.0.ebuild b/dev-php/phar-utils/phar-utils-1.1.0.ebuild
deleted file mode 100644
index 20800e163108..000000000000
--- a/dev-php/phar-utils/phar-utils-1.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHAR file format utilities, for when PHP phars you up"
-HOMEPAGE="https://github.com/Seldaek/phar-utils"
-SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[phar]
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Seld/PharUtils"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/phpdocumentor-reflection-common/Manifest b/dev-php/phpdocumentor-reflection-common/Manifest
index f8dbc1b65a6a..6cf0907d6267 100644
--- a/dev-php/phpdocumentor-reflection-common/Manifest
+++ b/dev-php/phpdocumentor-reflection-common/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
 DIST phpdocumentor-reflection-common-1.0.tar.gz 7746 BLAKE2B 0e7119b9a55e4408160c7e04f569831b491c801f4a12e4b17af21eb4a1fcd9b7f84f23548551f829506649d3accbd3a890bae7ba8ef4390051f45f68143f76a2 SHA512 63d76282d0921535af70e084d3621d8cc6b07f49bc5348429a340730212f3c99f8e64636e43cebb3140fa4f6363b4f2a0c02cbe38036a28123e7bbeb67c61a0d
 EBUILD phpdocumentor-reflection-common-1.0.ebuild 681 BLAKE2B e37871a37bb6d81b4e44cd46fcc43cd3c0e3fcd4a79927fec92013b230a578b95e1dceb81ac3bed232808dd16de45233ae546879cb4704c7760f55e5f3bcab4f SHA512 623d75e344435d39c4d2284637ab006f8d752c88805e114d2545ec1547bd4a8eeb8777b7bb73de9e3c3b363a959decf9c57dee25b4568986857be621ef70aed4
-MISC metadata.xml 334 BLAKE2B 1b34b1832ed2c8cde0a91717334174f49fb69986aceac768cecf15e1898acf8b5e1ed12ff361be20cce83e8e8b7c31c87408b924b5e6a8d17700b5d6a88285bc SHA512 9db658eed874814225b9a118d88b900e7a6965cd629da7aa98cbbac2f1708425ae463a9dee7ce12cf9dc9b78cd2c123a0b5bd4056ca25feb47e5747112a4d0e5
+MISC metadata.xml 334 BLAKE2B f627c7b9371002968e9ffdc09631a733c052b4b3781b5036b5c9ee9fbf8979aa24f88d19a8928e71ab4a7ce8d0fc5195a63feb37256ab52df47bfd3878b10ad4 SHA512 415bb591e0544fbd4ed7594f434c211f6f1836ff4572cfb666520ea4aa3be8c36194029b17e94539b7ca303ad4eef5d1f32ba17d6d63498a8bbcf54698f9824c
diff --git a/dev-php/phpdocumentor-reflection-common/metadata.xml b/dev-php/phpdocumentor-reflection-common/metadata.xml
index 99183602ecfc..349b1ff23b6e 100644
--- a/dev-php/phpdocumentor-reflection-common/metadata.xml
+++ b/dev-php/phpdocumentor-reflection-common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phpdocumentor-reflection-docblock/Manifest b/dev-php/phpdocumentor-reflection-docblock/Manifest
index 5506225a2725..436a1170bae0 100644
--- a/dev-php/phpdocumentor-reflection-docblock/Manifest
+++ b/dev-php/phpdocumentor-reflection-docblock/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 499 BLAKE2B 8e159b25c5682a68259674aa256c667da624f17b1b784c93cbdcd792f4fe4066122f5848ddb99a7011022b389a1cf2dc955c1b45c4771446363f1e873b32b3ac SHA512 9674ebd512047c27ac986eb63395cc4762c4b0dce3ad5ba1fd76284767e1c724c1b61855a32d96fe925bc1d8c1f76e8c12e016156028a66f7d909dbbf4d676ad
 DIST phpdocumentor-reflection-docblock-3.1.1.tar.gz 42935 BLAKE2B a18fbc5012a28e9f0ab59c6f485bec692aed5e7d245845be1c20a34e51b646b3cfd57d84f10f60a5e64c3ad0cc916b1bd97f07629035d3d4991056665012bb39 SHA512 43f1824db3a7a3793db88817e3cedd6379c8e9074fac1a3e781d049a74a13bde3c519c0a9b2a9219d7869339ab16276229d5d3d9398d9bf7f6cdac6dea5a12d5
 EBUILD phpdocumentor-reflection-docblock-3.1.1.ebuild 764 BLAKE2B d46e1f285e26d86f68f6b4f98582de254dcfebfe6c6a8db4fe64738db6c3e83b61d51e40033f979a587ef2f5d9e5304efcf7a55ad8dadffa41081f27a5688223 SHA512 97f334299dcdfbde49ced42e0147a047eb14fc0f4a0e8688229234313684c63b9f766f996572bf05a39fbfa3f655da46a3d87d0af8bb701aced1c88e8ae4aae7
-MISC metadata.xml 336 BLAKE2B b7192560a302045b5f417f3e9c1330c0e73b0fe6c95b79dcacdcae41db70b8b4ef749b7eec902dacbd9e11750d5487c6260013446044dd0cc4a610bcfc83a697 SHA512 6e525276f4719b05ca8d891b76a742450940dd4b6a2bbdb839a5c7556f3ddff370f3e504f9a05449161105b838228519d5d14be2d3994335d7f8e4f90d7eec61
+MISC metadata.xml 336 BLAKE2B c48f65f6653c3bd723e15d1bb2b0d043fe201bc71cd49dcf3b9237d130a45f619686826095f97d4fff22abc25f51f7c0aa6b35e89018113f750dd61a1a7b57c2 SHA512 bf4cf4f58c0faa693eaad30c059cccdb7786bcbb833ce1f01896454fdf69464c8c815c35223648efb4d13b0e2fc5291d56f8901ea5c6a67e70c3faea5fd80fb0
diff --git a/dev-php/phpdocumentor-reflection-docblock/metadata.xml b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
index b6164cd9043f..d6bbab08b840 100644
--- a/dev-php/phpdocumentor-reflection-docblock/metadata.xml
+++ b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phpdocumentor-type-resolver/Manifest b/dev-php/phpdocumentor-type-resolver/Manifest
index 8b2de2c30df7..554acbc01671 100644
--- a/dev-php/phpdocumentor-type-resolver/Manifest
+++ b/dev-php/phpdocumentor-type-resolver/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
 DIST phpdocumentor-type-resolver-0.2.1.tar.gz 15231 BLAKE2B 1c47c8de34bf97cbfd7fa8c5c138a61e77f8897ab8009ae24b4a05e83bd58b9a0990bf365d3578d6b15f642cdb53b9a62a6485887350e19763320d46bf59d7b7 SHA512 888d165b397831d7319116c71dc34a3c738601bdb9956d250f80ee89374a9f063449ae9a82a43646e9156ad720e84e5d951c35dee746a37354388cd1f69d5154
 EBUILD phpdocumentor-type-resolver-0.2.1.ebuild 715 BLAKE2B 41d42f7d49773d1b961b5562fb14169e7c21f97076afff95c31a7a282b46c1152502b176945013b71375e38dd98afbf07fb6570a74dbbe6b852bb0c851f45bfb SHA512 6dd66b417ee0000f544f3225a3e6e21d58e6efdab583d2bf9f205e8955e217258987b72e0b7f09f22015019b3e19ec021f5da6c7fb32ca7c7b17da29c2ab2520
-MISC metadata.xml 330 BLAKE2B a68bfeb6fd53ba7c9ee80e5ea5ea50bdc531eccd13caf0b6e9efc0d4585a6d05e782312bfb4bf4fac4a3df596f029cf0e42a23d9a70ea66fbbd95eae1e259d73 SHA512 3c2e71a10cb0191aa7ab5332bdce3e38465514611dabd3374bb29fe4411f68e0382e5bcc66a0782ba56b1bbc823dd0f435f830809c1bd36e9fb142a68774f353
+MISC metadata.xml 330 BLAKE2B 4b2bf051d78bfaa22a3df57f019e612077b5ec7c2b2b00b98bdfac2099183084be9bbee5d384b4e949672e47ac845da0e0731992bebc6b9e8b4da9cc0ad6e341 SHA512 48d975da359e94308a0db9c2e2c0491b11467d0d3506f68a21fbf0e3640618a781d1f17a90993a90cbfaa6a200557b02f0c7d500c2b70ff800c8892a56b6cac0
diff --git a/dev-php/phpdocumentor-type-resolver/metadata.xml b/dev-php/phpdocumentor-type-resolver/metadata.xml
index 4f1ebd70ec3b..92320d9ee877 100644
--- a/dev-php/phpdocumentor-type-resolver/metadata.xml
+++ b/dev-php/phpdocumentor-type-resolver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index 6a1360f5413d..6c89831b2212 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -12,4 +12,4 @@ EBUILD phpspec-prophecy-1.10.3-r1.ebuild 825 BLAKE2B 27f538a59e3ff75941022ac9cdc
 EBUILD phpspec-prophecy-1.7.0.ebuild 802 BLAKE2B abfc5f92049c4e71dd79579a4645b161e727f02056baf5117ba6f3a1eb711acca5ab7be3f28bba542451eb9e22d88c6957641f64f66538200341a923f02178b9 SHA512 3fae447e08178a76ef01975982121c5cb487116c3c4e5d92722c0c89bfb73b4df06148a4c5a79f9dfb6acc3a3793c08896128f06be721e2d7feb626e86c3a071
 EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
-MISC metadata.xml 344 BLAKE2B 862d3227366245b26de4c433fd4c985c5358655df4f6fece38147a62fb7b2c715380e895f364e1bae4e1ec71959e0426404817423b5fb1d166bb1b7028ef07a6 SHA512 f1c533cb9c8212ee4b1cf622db35756a9b28728a500f93925467d2e07f00fb031bbdde8a2ed64a892f21eaf8810172ec0fdb16cc3f01df150bf271b0ad9bcbe5
+MISC metadata.xml 344 BLAKE2B ceba7edcb8959af55c2e48a0ae3c3ef1244b466a9afcef2fbdd4b0b032582bf11a2da470a6ac91a45e05506b2c3b111b212484bbf6342882f2e49260f9ab8ec7 SHA512 e9ffd6467fde4e03d2e1c578546da453ebe9032c668ad79dfcf2ed97247f0e28146f018b71af0d14e284cd459a3acec307094be04ff951b40baf820067e7cfba
diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml
index b76362a66e78..4e057ba93af9 100644
--- a/dev-php/phpspec-prophecy/metadata.xml
+++ b/dev-php/phpspec-prophecy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
index bffd6f41513d..bc576c7df5db 100644
--- a/dev-php/phpunit-mock-objects/Manifest
+++ b/dev-php/phpunit-mock-objects/Manifest
@@ -2,4 +2,4 @@ AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232b
 DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
 EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 747 BLAKE2B 07af8c9782243a1a0f569396da62f995776b988509edb6d671ff090f4e933d8aa986bcdb3b47ae47fafc158292ed4319b5771df1910df8f65ed296005ba771a4 SHA512 edee3af146a8e5ddf58b1ba1b24191b6bc4c20993fc3f46b0b8b6180a857d9b213bdbce050734630d7af734500843a1e3745c0636ac7e092a0e105c7d9c2517b
 EBUILD phpunit-mock-objects-3.4.3.ebuild 743 BLAKE2B 7a17e4f97f1f4b6f38412b2b1b8f16726d19ba8c5a0865f2b44b51f7c75d79d883bd23a762f1d70dffcf63589b43ba0e72b1b38dfe551b2dae85fd5bf7833131 SHA512 6fd5a95ef93b094df720c288727ce63504cff8551e5af7de711373f7cc46c0d0844a9ef634612007e1b225ac6f06949b8f9c5c687c7bb71557a5bcdad11eb889
-MISC metadata.xml 342 BLAKE2B 1dd45edd9b24f97ff402f3b3821e9019873024d52cf1dad8541fbb165393ef9b6f38834744c9093ea033eec4b901c91e59713d3c879a6f93c8ae5f3863980b42 SHA512 81c56c098a010d97eada1ff754710726c9ede41eec3605bd7dc0e69e5066b58afcab886d4a55fa2977482cee82f7c203ae6f9e794b4c190359e66b5a756ece51
+MISC metadata.xml 342 BLAKE2B 9466436911567c633988326a5a876940756ad12dcc0586462da22b9226946b53bd08a99528aab6c15c3191b96a56fa852407cf84cfb7569b30f2cefa7605175d SHA512 ecebb6724a5ccfba4539bfaf2beb7faf7c3fd0cff2cd5b46b0888d5e43fd53bd9bc6e26cc11cf6757667cc550922b986b6f782aceb85b05cc1ec0c880c12c3af
diff --git a/dev-php/phpunit-mock-objects/metadata.xml b/dev-php/phpunit-mock-objects/metadata.xml
index f248b11380b7..a377557cec14 100644
--- a/dev-php/phpunit-mock-objects/metadata.xml
+++ b/dev-php/phpunit-mock-objects/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index c518b04f58a5..df0fe7533839 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -2,4 +2,4 @@ DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb
 DIST phpunit-8.5.14.tar.gz 163158 BLAKE2B 8be0765b89cd7c7f91c7c8753eda9be46a38368c1b538b9e1a06b6f7e5b2cf2c37ef806338b7f4dd213962bfb8f7d749e1a97dd65d0e877fb2ffdeb747dcd344 SHA512 589cd74bf44c16ee0bb0b0e85f3468b0fdbd7e6ce968894954918094d49a0fed46570cac2fa2367f417715bf64f942f5742a292b09edd91317bbea06624ac313
 EBUILD phpunit-8.5.11.ebuild 3124 BLAKE2B dae0205a8a36f5895cf73b607b0dc206885b70126b4c78a4db83da64013f21fc0dc162ca120505129ada7cd2527bd7bc0eccd34188fe35f3937ecc2badececf2 SHA512 e8806ef9c92bcb3b9c2bfb2551864d6d2aeb92ca0b00389feb94375247fbd32d2154ba17c6d2f960421c1042dc236ae22b056f26991083c8902e1a97402c9d8f
 EBUILD phpunit-8.5.14.ebuild 3188 BLAKE2B a14aac210c05b2b726f763d58737e21a58a804c3bc7c3f6083446e8f78693a9bbdfb07644c32c6569d291e386d4d0f8461f36ddd7b4afb1d3a207f3765068863 SHA512 b126f5d94f53775f03f04186f04d30310323235bdb4b5e7636014e2b6bb46a43f37bdb8470bf7cc8995fc2121eaa34ad39fe0dfb994456b6d7fcb2579faea02e
-MISC metadata.xml 353 BLAKE2B a652d809f292e3ff3c73fa46bc060ec1bd1a2d21e72b0c5e195ce4ec343d6667a930b1f4e5a2aeafb79bf90ac3cf956dc70022e970e31d6d88731ce949380795 SHA512 551af54d66217054d5bf7bab7737dd4d58eb4abb89e73e1e0f05928ef79d02d404883fca1609e116e359ed63788c21992b6f2205b6bc4544b5f2a16dd0dfa136
+MISC metadata.xml 353 BLAKE2B 4cba647facf7227601c5361669b706a5db6c86b798b5c8c2faedf86baacad77bdbd65eb1000a45fab567b9f84c31d2e37acd517071eac608cf7fd51943cd461e SHA512 d180f88f4633794d1e9157dfa9f71928288ed36c62a13bed51d3853d365db47e0465aa53eff9f36dcc46437fde0fd06bd4c775e7572127d331839f71b27e586b
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
index 74464b97d410..cecdb66c098d 100644
--- a/dev-php/phpunit/metadata.xml
+++ b/dev-php/phpunit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest
index e42d32a19a5b..7f8a9df5719a 100644
--- a/dev-php/psr-log/Manifest
+++ b/dev-php/psr-log/Manifest
@@ -1,10 +1,4 @@
 AUX autoload.php 258 BLAKE2B 64c22f9d35d5b8a66d0823348273123a8440eb3f93b3627767ea9112f23d488422137e5abf329d68b4f320032e1dd74ad5e17b914ca3158036d440e6acadb696 SHA512 ced0c315c49aa13275c6b06ad0c10d2601654408aa4bd535103ac518c977554c7dfaccb31a7c151ada94dfc9c1198a3c4758ce6a020d6a70041aa9cc3fea634e
-DIST psr-log-1.0.2.tar.gz 4755 BLAKE2B d56a388a94b7cfacbe082280736e5ef203c271de0aec159da56c1ad17efb3bc92e8b4bf45b9d9f5b6fd4c84c107d0c1bc28ab329fcac3b43d179233e1905497c SHA512 a95cf38a92e7259d615d48cf002c4a0a0b6d6a166a345dc40e7636f913e7a787fdc35d4279741d90e04f9b564b608a138ce2e59115014da6be9d779de2a01bf8
-DIST psr-log-1.1.0.tar.gz 5710 BLAKE2B 50f5ba979752cf27728ff7a60931f52ffad90db77ec86292af4e767f83734ec2b89d949c1276e85c3bd66f398f1526d3db1d423ee2df245326290ef2f8216112 SHA512 6ba19f184e397311ebda490bb2e1e4252a111b5aaffd6d5df73dd84a823a17c0c76607a7783e678e72c71c5e4a26b4ff9433132f96b108db9064da873235ab15
-DIST psr-log-1.1.2.tar.gz 5777 BLAKE2B 0cde3a684f5a46ebfeb9adbcc98fdcb41bf19ade489ad1b3325bd63157d5e942eeb9481ef3367c5cd133820a9474d9ed25ff0485cde5317fc2ffa00c4032ad51 SHA512 439fc3bf72714a2fba4b4d217c1630f7ffdd8e50522a7e45548fc6740edefbd6a2433d461966a03de1fd12a98949e85133e484049fcb538856c297726793eb11
 DIST psr-log-1.1.3.tar.gz 5863 BLAKE2B 6eb823853d69900f6b265448312cc351f3bbe90b26cf3f01bc108c9508a40d19f8cf52bd157da3481d6fd4bf96f0e40932fa5501226955a87e23bd84ddb36ce0 SHA512 e78f0d2343f0e5e59d3d343d9f122bea9962f8fc9bc66e52838c6ab5047929bfd5178ee63713f12a93889da28d1bd5c8e55243d42110264e32f7d5f207a597bc
-EBUILD psr-log-1.0.2.ebuild 533 BLAKE2B ba31a5751c781fe59f2ce5b73c565d4098ff011f44410cd2249435db0737c33b7fb58b441a8a4b560724bba3ccbdce68a12fc16f2f896a8ab0b7c35927cc21e4 SHA512 084b128cb1cda9b2a285607062dc6ccd33d9f4dab7ed0a1f0c67e9f719bb29a583e6446082edfd7a0f26daedce176bd28dfb5b31aad9a1ee52fa3e22a83c1377
-EBUILD psr-log-1.1.0.ebuild 530 BLAKE2B 80d6ee7b8db8b73f9500402646ce0751602ad55f9555619bfdc49b845fe31ec2484224f91c0d9e7cc1e2297e4af65b4fe94f3ba97b50840fe200fc48c2ea0ff7 SHA512 f2c834352d3c6c85187a88626c17dd58266211ce3f1451bed7d0ec2aeeaf44dc75bd0cb20436c2a95d54dff940171a856274ccc4ae08733084ba10c912ddf820
-EBUILD psr-log-1.1.2.ebuild 530 BLAKE2B b1030a3c833c7f0747d69a03a64f220005db36db605807f034c1c8365a57de5b96b23e1e61560f1a1a54e2f397aea7fa4566f8cec7e9382c2c24e78c200c754e SHA512 7dc7dc9a59cecb40c2f8a1c0a764de2d2eadacdfa616335b4a40cd645d0529108946210c85e1bc0d47ca684599bcbac3e4b25480bfabad047ff130319ffe903b
 EBUILD psr-log-1.1.3.ebuild 530 BLAKE2B 4818ceaa08196b06e867991509afb72e657983093deb30518bbce78a3b137393db0c9865627a1f3ec94a8a63a838bbf408fc21c0f6b90429216d91cc5439c543 SHA512 83b18c805b32f264899264d3bc47df87b0d6dae442c5fed9f5bff56f72569ba098ad11c28de34be0a78f7b7de0349a8e51ff0bff4cbf2b7aeab15c22a38b9a30
-MISC metadata.xml 802 BLAKE2B a50b772abd7bebd2cf16fa744d0be648addc253b3c5be3c5450786af67bd66d11f2522bc27aa8b94ee3fb33d1d52225291e134a25a85468eb533cd0ef22007d2 SHA512 40f97201809cdbb080091ad04a06c6d9fd890ee0834be17591fcd91ae69a8af45c19f7ba09b6da85ea06b4b7ff8057533519a780b8121a02ba71bbc5ee7f0cff
+MISC metadata.xml 832 BLAKE2B 1c7f2430fe2e012eb2403555c77904434a90983bb31aaca2148a52bcec595101131018f14dbef72a497c88d35065a15fd915d15cc29b0d106cc04a109b72571c SHA512 2715e1f3e5d6b1cf729db0551f8f00deba0a777ff9181c85852a6824a0188834af95cbcf404d3e7563a4588c1aa71e6f8e9199eed7aa7f40c8686d65a68c72ec
diff --git a/dev-php/psr-log/metadata.xml b/dev-php/psr-log/metadata.xml
index fe0e94c1cd9a..898d1f544b35 100644
--- a/dev-php/psr-log/metadata.xml
+++ b/dev-php/psr-log/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/psr-log/psr-log-1.0.2.ebuild b/dev-php/psr-log/psr-log-1.0.2.ebuild
deleted file mode 100644
index f8330e5d3cf8..000000000000
--- a/dev-php/psr-log/psr-log-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Common interface for logging libraries"
-HOMEPAGE="https://github.com/php-fig/log"
-SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-S="${WORKDIR}/log-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Psr/Log"
-	doins -r Psr/Log/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/psr-log/psr-log-1.1.0.ebuild b/dev-php/psr-log/psr-log-1.1.0.ebuild
deleted file mode 100644
index 72dbbfd0efa5..000000000000
--- a/dev-php/psr-log/psr-log-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Common interface for logging libraries"
-HOMEPAGE="https://github.com/php-fig/log"
-SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-S="${WORKDIR}/log-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Psr/Log"
-	doins -r Psr/Log/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/psr-log/psr-log-1.1.2.ebuild b/dev-php/psr-log/psr-log-1.1.2.ebuild
deleted file mode 100644
index d283c35317f9..000000000000
--- a/dev-php/psr-log/psr-log-1.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Common interface for logging libraries"
-HOMEPAGE="https://github.com/php-fig/log"
-SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-S="${WORKDIR}/log-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Psr/Log"
-	doins -r Psr/Log/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/reactphp-promise/Manifest b/dev-php/reactphp-promise/Manifest
index 4efcc912cd4e..3cc244a4d14a 100644
--- a/dev-php/reactphp-promise/Manifest
+++ b/dev-php/reactphp-promise/Manifest
@@ -1,3 +1,3 @@
 DIST reactphp-promise-2.8.0.tar.gz 17178 BLAKE2B 43e5a9eef0f774ec4de7be44fbab300dfd78a23b21de2acbb39e44af49ee95b2532f66b711acc4ee152522d4725e1e29f9abae20d0ac2e18fba3dbb3f615cc5e SHA512 8c882c96b47cc53f791de964303014feb00a73594a510287ea352ff619a8432d88f4c094523d4de98234f985f7351cd244bb094484a257aa36357e85eb0ee62e
 EBUILD reactphp-promise-2.8.0.ebuild 909 BLAKE2B e6beedd68edab2c3ae503427f7583d3b252f5d80fdd8493321863a1f967d06ac6af3d4869195b5f3aa81c21360f48c3226920dbf3ba53b71b87e5b6d3386ca7a SHA512 71328bf38f39ba27ff2573195321cf4956771a5843b1f35f8b164c93a801b4b6cbf0d4648957077da3a3c697ce935542bbaa21730bb3008e27382fc0bef11d84
-MISC metadata.xml 344 BLAKE2B 88de1a794f1b94149fdd01834e7992368c05e039ed6c29131d4dcb01cd77a16d6abe848b89c34829d60b075e20acee99485048c491e371c8209dab12251fda16 SHA512 af2be4270745346e5749954b1ea03bdf37cfec87e8f091aea83867fec0235bc138141353cd81adecb3e37b6bc95209bd234c90217dce017fa0d2f53d474f14c0
+MISC metadata.xml 344 BLAKE2B e6a7195d4aaca376f5b8e5faf1a66e3c54de79294f1913383effdc6ed471a94ff0399f599e91d323cb2dd98286267ccf66f640a0292fc19892bccaaae853260b SHA512 08a7cb59abb4ae5517967531618ab437417dc55fe75b9fb9af3ab4034123d40c66f920b4274b5d49782705efb8db7bf4a49de86eea1fe85604ba7beb2fd599b1
diff --git a/dev-php/reactphp-promise/metadata.xml b/dev-php/reactphp-promise/metadata.xml
index 3ea1553292f1..f58805830cdc 100644
--- a/dev-php/reactphp-promise/metadata.xml
+++ b/dev-php/reactphp-promise/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 414b4086348b..735ebc546e95 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -2,4 +2,4 @@ AUX scrypt-1.4.2-php8-0.patch 1277 BLAKE2B 1bccdc8deb053f13e7075f0d52a14a0f0767f
 DIST scrypt-1.4.2.tgz 21585 BLAKE2B 6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab SHA512 34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
 EBUILD scrypt-1.4.2.ebuild 395 BLAKE2B dbb271382adf2201d669bcf774ad18e766434b9adc391f76eb81a7e6c31e485a192b298d15daa01be4e3cc467d003b8eecc522e8c808a52315c10498bd55eb39 SHA512 991c793096493e35138ec3998e13ed78ca9c6899223e0b3cc0340980de965fa1fcb3c30a08f5997381f00632b1a7606aef35aa2697e78e94b15cdea79c3e8df7
 EBUILD scrypt-9999.ebuild 414 BLAKE2B 5262f81f837afb03250dd545892d45586df821b04661edb35ea1d826c51b7b2638fc707779fa34307cd3e5924f4182fd9bd959a8135e58845a52361db32a3a1f SHA512 7711fc2f3b8094c691823440f3dd87d3973b54a1e0139e6d2689ecabd5a24241388dc2f77ee52f46435914cfdc2de8768628897398383c09afa7957a22f829eb
-MISC metadata.xml 791 BLAKE2B 54438dacf2c3e77edf475a1f695b58c4606f7492d39a74688ba4a2f36afeacf94560e63748fc097e962d6fd79883489281463c31449591f8fe6a84602c126658 SHA512 b551b92c17a66648f281b07d638af5f6e4fc703ecece2b594bd7d1b0753687c1f0e67e0607f4eeea5f708f76e348a8cc352ead97e5264368fb3e070d8d748419
+MISC metadata.xml 821 BLAKE2B cae08ea24c50345ef0ec955281cbce6fc1661d571d9e8452c4cbdfe08e1483a365ec5e30874a8252c597d0963f5d0bba8308a34e33a6ef44c3f8a4c88c681504 SHA512 7051a774b971cbf19152f4d53fd8e75e15ac5f3701dcc12f6fdb8321a612c90874d96d12824e399daa6e72e233d75deb5f27fd183eb9cf777c0f805b31aadccf
diff --git a/dev-php/scrypt/metadata.xml b/dev-php/scrypt/metadata.xml
index 7fd91a5b5f80..eecb8d72e99c 100644
--- a/dev-php/scrypt/metadata.xml
+++ b/dev-php/scrypt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/Manifest b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
index e2394ebdb04c..cb033324f1f9 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/Manifest
+++ b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
@@ -5,4 +5,4 @@ DIST sebastian-code-unit-reverse-lookup-2.0.3.tar.gz 3047 BLAKE2B 8a61edd4fe312f
 EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 657 BLAKE2B d2ace7796f508a244da8d65ecd13bd1966925924b58040b422765f6dc83e2fe8f4ba192dc25de8b98df75d59dd1fbf161d5c9b61545f24dde9d98cfa39e3252f SHA512 4045e1ca0be768806782a6e3a2b21c2b3c8ecc853226e0435a36b79c9007c712ea08b0524e65c8deed1f077a0626adcc8a476ed17186ac37aa0d2f1d0ab599eb
 EBUILD sebastian-code-unit-reverse-lookup-1.0.2.ebuild 806 BLAKE2B 26d31955e52efd9c58cd551661389889bb434f07264285f4a2697a4bbb88ff40b0611296ae5a2e4ee0aa03c771684d8a818a6874bdb93ee8804e479f47880eb9 SHA512 d0f1bd7ca077c6a2d5be3852947ad91e72ad5d92f696f8cd2f33cb976f8c77b92795a987ad2613cfed924849709af2effc67b8c2a637a98f485890cd24516cae
 EBUILD sebastian-code-unit-reverse-lookup-2.0.3.ebuild 806 BLAKE2B ab9100808147cb0a81ca112134ee6e6f42560e354ec0b3d12af97ee3eebd260afa8b3fff9385aa88747e6a52a011db654d74d303dc264535ca7757e1be31d8c5 SHA512 9ff5cc675d1b8b1d1e58c34b6297e81735c8d8cb232f98c1bbdd8bbf8fe21ebefba401562de8b831d724ab5a554307f18592be1d915d20a627beb4e5869930e6
-MISC metadata.xml 346 BLAKE2B 9379848a8118427efc3ec84f4896f1ce436658dfb852aaf94bda1b2057d47647dad6486664ebeb4eb0498462ba0c58b5d902ff5df748f7555e91ce652d60ee68 SHA512 61330d4e03be274063d0bae2f4259a6c4a0f14d97d68dcf6dafd7fed090e7c76bac945d67d925f4d512735c2d5145c50f14f7b1ca17c31ce843113c2c7f6d723
+MISC metadata.xml 346 BLAKE2B 602aa9f766ddbe1e577d06989bf73722e64fdcef7296d20ad73d9df90506d8101dfedc586e933c7dbf2ad11cad142ac9296c7db022a8bcb49d5f7bbcc88b3ca4 SHA512 9aad180f66a8dfeef9a3ef33ae6104a0552e4acf33438d9c92f4b043f175ae53a7f430b4619d269acd700affa9e11510a4b07aa1a1549972e273819e63f3746f
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
index cac51766daa3..f502d06de0ed 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
+++ b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest
index c71a1bbdf131..053517f7075c 100644
--- a/dev-php/sebastian-comparator/Manifest
+++ b/dev-php/sebastian-comparator/Manifest
@@ -3,4 +3,4 @@ DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413
 DIST sebastian-comparator-3.0.2.tar.gz 16305 BLAKE2B 3cc8551fad28542823fba182abf6e9f33bafa0fea004ceee7d2b192f250678ec7f2014b7e9ae16eee1ec84ff37e656f5612a0d45d3bc10c5959831d39d851fee SHA512 05d5cdb5ce6346325c3f7c6f7b6669de7d599e0b65a95505a85aca887df5498d5baa22f22e9065bf185ac50df1abc969bf86263d31a3923034607938a5eace58
 EBUILD sebastian-comparator-1.2.4.ebuild 681 BLAKE2B 46a10b2c9c09f727210587fb649e56c517b094e8056818b22c54235fb7a7d6b417bb158b9dc3c31fce22e7dab26d6734b7c9fd814f4a8d258aeed8dba1fd1445 SHA512 c736c946ca19ccc2052f050a91351edfa7e1b33bd3fa519d1741b6b902d35bf854007b8f30955d3fde45316b6d36ec9f85e94d1e89526826dfde01c1047fc0e4
 EBUILD sebastian-comparator-3.0.2.ebuild 745 BLAKE2B df2cb1f7b806baf82112e0a3dca50785a934b10bbd654f3f6637f27b8dda24da98c4c5d96596a3c255835ec89331158e1f7dba9faac4ccd81099953ef33f0325 SHA512 ec611830d1622cc0597b6df947f8cb18071d86570d134b894f399228314ba6b2b8529f081392971cf6be1cd8332c8277d2511c764100a20f7471a7ad6ef992f2
-MISC metadata.xml 356 BLAKE2B 636ad67bf8d13ebb8f427143c0870a7ef693d3da13be0743f5929f5f9c4f4ae9e4019adbad9837feeb03305c0b44e73d175447ba04ca69d2a9b8312ea90f27e4 SHA512 46b571cd317a48a229399123f6581517239a86a21c4bd6ef69c3e118b8fdf9b4d10f7507d5f26736b1a6acb9603f43f8b5d8bfe9881c0dfd72845e82bf78d7cb
+MISC metadata.xml 356 BLAKE2B d7263b8db80bb64da47278cdaa53f52281adc328d5430624d91ba5edeaab89ed214fb3469ed3c38fdfbcb20f76008538f16ccceaa61aac6189256c32c5fce312 SHA512 12710941c14803a3f0600dc8362d5bc5bf824596189b4bef1c9bfe2c1a761dccc3b351e150af7101dd193e8cfd21a5fb632c333e886c041977b58253d4c7f0b6
diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml
index 607692ad79b5..c10982b0fbd1 100644
--- a/dev-php/sebastian-comparator/metadata.xml
+++ b/dev-php/sebastian-comparator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-diff/Manifest b/dev-php/sebastian-diff/Manifest
index 1064443b6a5c..f17d65b72242 100644
--- a/dev-php/sebastian-diff/Manifest
+++ b/dev-php/sebastian-diff/Manifest
@@ -4,4 +4,4 @@ DIST sebastian-diff-1.4.1.tar.gz 10310 BLAKE2B facb81bb6ec7a60714493b531eecd0cea
 DIST sebastian-diff-3.0.2.tar.gz 30918 BLAKE2B 33c307c97d30573c913e4a696710c7b0091b3d0a612661b900dfdb749e4fa5c8970d993c0ee8828c4b0342336c39db4c74702114a5a6ae0daf650fc625baade7 SHA512 c06176de492970f3e55a5fdf1901eb56299b3e49cb838b8cdcbb93bc9cfe9fe9c1b693acb0c598c618760c4de0e49deb2f7bad15a929bd13ef08d30fab41b677
 EBUILD sebastian-diff-1.4.1-r1.ebuild 591 BLAKE2B 683a255a8897b37b0b532ee843fb4c98a7b83079062bee3f0788c0e5600f107923f1ad2ee3f5c283d660079cadd8adde9df3d4a5ec0c3aa63a9c9fa3e5807dbf SHA512 3baf37a51a6b82885cd8ed1f1549a211f65343a6b40c74adfe8d0c96aed24d1beee1324cf2a5caed73881640b5fd09d29736783b6f4858cf670d6bf2d764a117
 EBUILD sebastian-diff-3.0.2.ebuild 611 BLAKE2B aa84b059ab182c61078a4f3de0f459aebfafabd679d5fd17719b7cb6bb2b9ddcebb86b9dac208e72049601637765547301a030cc53754542096e5e76d41b5876 SHA512 54832729ce94597634a5c088edea71f02249e10ea976ccc3d06515f7c94c9521b6d655ad8c44fa63d0a0a8458e49d76ddaf45c87ea4d104b679bc38cd65d4745
-MISC metadata.xml 350 BLAKE2B 1a471ebc6fa39c82a3a02267946e753fcd91fef846b94b9192e8b3ce2be553d46b64294787a5ba69fb224717bcc83a9a210558a767c839b9afba19e55d092d38 SHA512 5e5a3b33a24214290b5c5478bcb2c12efe7b869ca7c80c74037f57c826ad84e5b913c7b2b961fa230299c8896c919f2802848ce4788c6a18fce8820a9c9e558e
+MISC metadata.xml 350 BLAKE2B b94e75c23ac085689a321f42d14e5cef00faf9badfbee1f576851dd20f0e3c936234f74d1bdd02072b6c0060f2f8e2658bb719e8242eecb883abc27158ffd515 SHA512 da0db5ec566ef6fd95c8423448a98d5b2ac54e03903fa56db120f7f1826001f33eec30e405e8324f9a754cfd7afd1c0e9daa1ae70cfe831cf2836f5082c55d8b
diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml
index cea1ce8254e2..4dfd55b95825 100644
--- a/dev-php/sebastian-diff/metadata.xml
+++ b/dev-php/sebastian-diff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest
index f59bf26d974d..f0f23e859a71 100644
--- a/dev-php/sebastian-environment/Manifest
+++ b/dev-php/sebastian-environment/Manifest
@@ -4,4 +4,4 @@ DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df80833313
 DIST sebastian-environment-4.2.3.tar.gz 9622 BLAKE2B d90b181c3aae7c4ea8e172e5b7f897f8a93bf1edbeca19cc8a7a6f10963730ece1f267fed325a6734b1677b75cc8f5b84a5aa55be383a40b1ec2aa7a603bc668 SHA512 871a15297196b21364000d72afa73c2319e741a284c5446443ae3cacd8ce1a07b1ea3b1d8b6b1a88356fb261d093b889508cea63706341413b15f23348f77e80
 EBUILD sebastian-environment-2.0.0.ebuild 653 BLAKE2B 33caebb73f94e98c40beef6956f31a9c4f4d404adb2b204feb0e458af606fd2ae6ebd84b937cdafb23a6d8a2d0f2a03432c5141afcf2bb71007c6519b7549a61 SHA512 aab4ef44eaae4d69145908a49cb68e18416232a365eeb66f764016a93375f6e66b7946e1a268326e5385ec8e25411617864dc3111b5d8de5fe0971d1e749c35a
 EBUILD sebastian-environment-4.2.3.ebuild 673 BLAKE2B 883d349290faffc20acf6849ccb97af8b3fe9cc1498786019347a5d640cba2143b43133cdc07f3145dde12301d441ca8d4eae05ce4b5c83ccc53149d65b9939d SHA512 013d69d39da8d260cf7d8a344781d0aa84ede6d77ecd1fce6f4cd071e5cb7c73c78ff38f34be04c24c60bb1cb01f2d2be7abe6437e30cd59bcf63a660abccfe2
-MISC metadata.xml 357 BLAKE2B a9d6bf189d4ac0061f03896a36687b4ed3626f5bd4daf7d8136d3492e35a81d531afb019a5e2814d23743c0d3a095d7ac189a15336db5f6bd2fa9b8ec2447d9d SHA512 1d7fdc1060d04e40a7f9369a3795395c554729e06ca6a172e37257a57abb474be5e813b18252d2d5ddd05c0d90442a59eacca147a89dbb024717fd3cc4cc9f43
+MISC metadata.xml 357 BLAKE2B 89f53ed5b4d479ef4439feeb24996e612ba2003d7e328995438619698d02233d4e33137576971f939c2f86d4116ba14530aad90ce108d72e6c3d3dd4677fac24 SHA512 225e09b9fa43749dcfffa98d20fc6941e39e337b51e624cf349ee081ae3e5e5721c33f87a48699a98cb547351b25e6862ad241d75378379861e9d1ba6a66fa4d
diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml
index 4e30d328d8ec..d44f1c505211 100644
--- a/dev-php/sebastian-environment/metadata.xml
+++ b/dev-php/sebastian-environment/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest
index 110a59114370..70c05bc2d46e 100644
--- a/dev-php/sebastian-exporter/Manifest
+++ b/dev-php/sebastian-exporter/Manifest
@@ -3,4 +3,4 @@ DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2
 DIST sebastian-exporter-3.1.2.tar.gz 9996 BLAKE2B 214acefe5679a45d5e67ce635790a12002aca0e380a087e96358200001400458ce907bb4f424ee3683b2fe17fb4bfbb674ebe0afbdcd51b24c654de2b4075736 SHA512 bc6cb070c8c7cd5262262337950ffc70081137c4513c427cc94ac491e2ebe0e91ca4caf7858eb7957f9abe5b4b2b2d6237020a0a6df556439191724f3cda1db8
 EBUILD sebastian-exporter-2.0.0.ebuild 665 BLAKE2B f7d755d21dfff3a5da126c36d1677e5e7cd1085dc22f6ff0dd00168f6088a84d40217e0d0d3ca75501fad18a3517b069059ebf0b5398f0d703970c754bbc5255 SHA512 cc3cfa93a635da141a211614171dab797cc52eeae3545e2a46d119cc1be75f27b210df196b75ab962a366f2982a3e0fa329fc5c985ee5e8659fdca0afed54cb5
 EBUILD sebastian-exporter-3.1.2.ebuild 663 BLAKE2B 68d83020f9712eaecf652633f6ee174c9f04dd353593642f5e6c8432177f499f6aedd39dbb592ab0f659564391f449f316e779bd3d5483d1d9d47b8ca620be73 SHA512 1be2702ef1196a6017bc8e0941fd88b89d056b5306f48c085d787d638b54a31978560bcaafb0d02294b9c787169b414efde52ae55810bde19af9637d3d3ab7fc
-MISC metadata.xml 354 BLAKE2B 98fbc942574b6f83f0f6c813b8823cadcea2459e6664e21a7c18d8f82938540cdc7b0ecebe24956f01823a10e0a052f28a81d3f0c5167ab27194159c79c1f9a0 SHA512 88dc57df25b23a03d548cda33354e0ccb0e95496635b2818e24ca1fafba7e07fcebcc9f568847e9da14d31cef766c480dca1a8b52f4c3ad1f96a94171cfbdc92
+MISC metadata.xml 354 BLAKE2B 82e66fa3bbc0aca5e1003aab0e1e3342e7f17a98ac292d8e2827aa74729335900581fffb57bc4ee45b73b139c2a1878cadadc0028de66cac66f3462b12d6bc46 SHA512 7c0ce2e5e32a0d5c5e42f6e64ce3cc396d9cde6117dea91367a31ce42760cb6065cb0db71954afde2c8d7df110acf4fc45a1db1881a5314d7b475306e3537f71
diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml
index 55f315d88b25..14106ec24ebb 100644
--- a/dev-php/sebastian-exporter/metadata.xml
+++ b/dev-php/sebastian-exporter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest
index db44c12fda47..6a45dc7aa3ab 100644
--- a/dev-php/sebastian-global-state/Manifest
+++ b/dev-php/sebastian-global-state/Manifest
@@ -4,4 +4,4 @@ DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac
 DIST sebastian-global-state-3.0.0.tar.gz 10550 BLAKE2B 58ad62cce7f94805add12105b3000c54e73624c780fa12970e779538f3ff06f145001c6d19e98e817982b092be992b4e1e55638f727fb3e7bad9d12c242546a5 SHA512 2a081fbf7b26afab0eeaf1933887dea12973c6cde1fe7115fe560d56e81ab69dceb7b3431818c51641778f6526abb0055e2a27420e53b2fe90e3f95ee57b01d0
 EBUILD sebastian-global-state-1.1.1.ebuild 617 BLAKE2B 8e35757bf526a669ef11bc65d6f37188f075238828980b227e502b7d27054c908aeb0b2fad9476f73eaa057fc203d175491444094a2c75d244a07ff1b531ee6b SHA512 31c674dd5317b14dce21371a46b5b226d9d3d2646ddf903fca06a8cea111da0d7d7841ca183d10611743ee017ab805e1d53049acbc204bca5dcdb7ffd26db323
 EBUILD sebastian-global-state-3.0.0.ebuild 764 BLAKE2B dc0d62e8f2a4f505a6ab6d2cbaafaedb90b0b3c040deabfe03b4f3505abc5a335be1a2c8971e20bde43e1c1256045e7d6d78361de1f2ddd14c72d1dece48fc30 SHA512 38fb47b90a0b8318ae0738b347274f6722964921f06cfc687126ad8003d6988cd336b65b928e7e80ba8ed547ec5177a73bea62d7aaf97c95936c159f6300703f
-MISC metadata.xml 358 BLAKE2B afc1246ec82514a6562ff2644e2e7f06b866087159e9ef4b24953dfe77ffe5da3169fe04875bfd255dbe2123955b5345f15c73b9034feaf1d25e1ccdb6196c0d SHA512 b4b198b8e0e596c7de7bd1e7078256c4eb750362196677e8116d4a70fc9a84e1f91b946d466649a8b32c25c89e937efb97b5b78c463106b7cd159eb5b2abf00b
+MISC metadata.xml 358 BLAKE2B 5300cd08ed21c336e493577f639ebe0846515c69fec7547037313d099696c7eb8eddd03f86048f799e771246b0c99baf21a79914487a337922c956880ed1facc SHA512 64d691d834a8a43c6d078fd93425e0a047fac27b6000902ffb4cc213fcc60881a86ba57c4dcc4eeb0d8539fd6fdf63af0e62e0f2069ee4ba432266ac503c069a
diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml
index 35f3da7eb09e..5963ae95ffc9 100644
--- a/dev-php/sebastian-global-state/metadata.xml
+++ b/dev-php/sebastian-global-state/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest
index 8f45b58db3a3..98b9d736bd03 100644
--- a/dev-php/sebastian-object-enumerator/Manifest
+++ b/dev-php/sebastian-object-enumerator/Manifest
@@ -4,4 +4,4 @@ DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eed
 DIST sebastian-object-enumerator-3.0.3.tar.gz 4989 BLAKE2B 8d2314daf82280dc746cdc91c3c927d012440ef162a59918e038a15775f0113cf7bc0ae0eafb83d6d6992cdb2680bdd92935789584305906747fd71f13fcad5a SHA512 9bbff5081e1627d7ab98e01830cf6245f15b3ca96a56f6074e090f10862d19d0849251d69bf1117d3634b7e0ef86e266b2e9d4062e75eff9c9bc5f994dfe9a2d
 EBUILD sebastian-object-enumerator-2.0.1.ebuild 716 BLAKE2B 7789f4498282ff900bf102c41573ff917b4b39213cd02d1ea98e421befc7f3ba515827e5c7f8f7040ce775615918d4d3feee3cd206c0cd4c0573fbfa0215fff0 SHA512 70300787755c1ebc577fe27ac833a7ae8433ab5132723d0d7df843a938dbddfc0ee6549c43525ab59d3c7b75f7c6ed8b1f96bc115ee4dad7e1facce3b09c00f1
 EBUILD sebastian-object-enumerator-3.0.3.ebuild 818 BLAKE2B 8ee64d5dbd92a4707cdca5e6e8abfbe4660dd8697bfddec2bf039c77b87b66235591e12479982c47e3fd19e5254aa205edd59a1e9dd350c2a785fd2c91f75ca9 SHA512 84aa4646558a1402b6d8607bc4c7d775ef7a3f1218c7f02763942a31c31f66d12002015dfeee1e6a20f6422f2d80d234d3d1af52aa22d949b751624c7ee4b13f
-MISC metadata.xml 363 BLAKE2B 04c75a4d50992629372192c06cc6865e55a2d2e1e6518f26c854bf980eb9f229f65515d2ae26f7adfbcc851ac378d2b86e798af03e10fd2b03a9ccf26bb26d72 SHA512 6f6e82c1888489ca51656125630297556653a05c3fdafbfecbbc0f3e8d32a4732497bc2b58695e349db0f1bcfdec7bd1d18d8bc6b70a490e62f5561c83ed7f3c
+MISC metadata.xml 363 BLAKE2B f22156af9c8387c8182684458091b163ab9291aa6210b71554b208b9f4e49496af39e2b504a20c1163299f458a3fdaa89c8df57e17878ba9dfcbbddf28167243 SHA512 0379b05d3a7d35f69fd60179a3cbe52d0a91794e957e299defd018cf013a36417e7a04d5d98935d8d06ed9452a60754dabd9c39d932eeb9f280dc20ac224ecdd
diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml
index a2011f318354..492ff122fad7 100644
--- a/dev-php/sebastian-object-enumerator/metadata.xml
+++ b/dev-php/sebastian-object-enumerator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-object-reflector/Manifest b/dev-php/sebastian-object-reflector/Manifest
index 4ddd4a408692..193d854cd72e 100644
--- a/dev-php/sebastian-object-reflector/Manifest
+++ b/dev-php/sebastian-object-reflector/Manifest
@@ -5,4 +5,4 @@ DIST sebastian-object-reflector-2.0.4.tar.gz 3366 BLAKE2B 9ceb1666e2e1e3679b6647
 EBUILD sebastian-object-reflector-1.1.1.ebuild 717 BLAKE2B 48a067ca4518e7950796ca7c0be679d9d816a1ddb5961c2e96532d7f6b022301faf0142f66a1fa1d82f78d292aa8736879d0fa42acdf08a9bf8fc29748071bd0 SHA512 e36cec264ed026051a6a5091607f18f4b279af7da73f75ceb40ef2e101becffc42a7664f46c817aeda40587c84f35819574f6f8ce3cb968bb468f1d78a0c78cf
 EBUILD sebastian-object-reflector-1.1.2.ebuild 820 BLAKE2B deb09d89a06b213b09c4b0605f86f05be8187fe94163774bcdaf80317b00a50ae14afa29989708556c7c3facdf79c16d92b3aced4da5bdf4af66c1598b14dc7e SHA512 5afa1597ce718e9af74f1978b1a2553de37352e2507ecc72ac4d6bb03c16b08374076875cad7e89b01fdcde17968c2ff3988dd3bfd30c8f14f8705b0af66a672
 EBUILD sebastian-object-reflector-2.0.4.ebuild 820 BLAKE2B 75410b3bce7a290423c6541988161969b90f9b7603fefd82188b78b8c4d55818c28868d3db62e4b8ccea0071d8a3177cebc10db5c101dd724db0e8e3fe23ad57 SHA512 2a4b7419de80105749b5496577980a2fea40e9051392694184781c63a6b1adeca60bf68e31935677dcf2a1074b7e0c3dff402c1db0221e30c37904dc546455c5
-MISC metadata.xml 353 BLAKE2B 9c3c8177e59ace145b822fc878e762ffef7186cfb2e364cb367b00fa3682b7ddac31cb0b381ae4aac2a61eec1948951112713471db2e8a65d342d14174de0cdb SHA512 c91559b117abe0d49bf1e30c57f671899b00a211c30119c87214befa0d15e8de6f0cff09d215e57fa07bba199944bee6490ef036d91019596cac582ef3305f67
+MISC metadata.xml 353 BLAKE2B 5d23ce160745a10b28a571af9f0dff4064bc68ea5b85e24b3f667b67caa6d27957fac29c421c80f0470aa935d870ff324f1d42b00f772ee46b5465b4124ed40d SHA512 58c2f210373726cbaa1479b8088e1514bfc6e3c39c0d270d6ed3cf42722ff4e186a2cb7a32965314214904265a710f4d660782a4bfd553aa6060fb986ff1d852
diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml
index 3a5878544210..0c15891ac5ab 100644
--- a/dev-php/sebastian-object-reflector/metadata.xml
+++ b/dev-php/sebastian-object-reflector/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest
index c960cd72d9bb..cf631645fbef 100644
--- a/dev-php/sebastian-recursion-context/Manifest
+++ b/dev-php/sebastian-recursion-context/Manifest
@@ -3,4 +3,4 @@ DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a9
 DIST sebastian-recursion-context-3.0.0.tar.gz 4414 BLAKE2B 04a0aca4b6012013306c813109c0ed6f60d2f4f1381ba6506398388b5065d69375191290d33cdc4b82359dc30b1fd98ef61005a657fa8db302472597950255b5 SHA512 0fce5709cb22818de6bbfda1ba2a99fea511d5b36bcbe7955661d756a6f82ba84cbf8fb4eb421d6b51ae9e36a8edac56c5bafbccf8b665a0296883ea0dbb3b91
 EBUILD sebastian-recursion-context-2.0.0.ebuild 627 BLAKE2B 8aa67f9beca4a2fe2f7f61dc680d0950f0dfa8d0c75f21f99f3bbfcc9c2e94c050b5fcd81c3a91783cd4445afbfdf4f8dfa47f19b9e406237ea4b8d4ee28f5ce SHA512 b7c36a9f0051065edede6a9b8fa75e3582309db0335b86b53a642ea55111aa0dc914509225519b490ec16083666940d9916164d6693f37c424cc1f3e0b6023df
 EBUILD sebastian-recursion-context-3.0.0.ebuild 625 BLAKE2B 1e15db0269cd1f1632eedb38d57554c479ad529593eec800df12f145919d7351ae4e341afa795754ea58815fecaecbde5c3af9b688f7713619db13e983f90ac7 SHA512 bf77b6a08f8300871b8199d17b48138519a5b63ece57c809b359ef892ba919b13b67aa49a0315613f57d9114f14f3cb18da055421b7c1c15f0482a56e0f18a59
-MISC metadata.xml 363 BLAKE2B 3a8ef2876b60dcff78f5e0d2db46054b95c1718a7c5abfab2c7f70d440e12dbf8083ce0802803c140dc828055e1c68cdc886f9cf98182e54836c81ffdeae5e7f SHA512 f615edc91e536b9132c8ddb35823c183756b1cfc2e6453d44de860edadb88ac7958e8d45dfc2ae27a5a82a2a044484bc4504c1895fdf50c1e027ca0b3e8bf30b
+MISC metadata.xml 363 BLAKE2B c91ce57abb8367b7636fbb1d2393786cefc2c591418ea584c8b3ff88cd8f6cfdb889b439572b1f23f2a45dc021dc0eaf5dc5310e8a1050eb77b53d7c5622332b SHA512 e0f0d4b3cf850a2298105dc4e40f8363bd75764196afa5d3eec42347c69c0e1f0f9fcb1d8559490a4f57dc9a0944edb338d81a6a2ded99e4dc6589915d073333
diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml
index 86013f0ac3bf..21c373eb5ef4 100644
--- a/dev-php/sebastian-recursion-context/metadata.xml
+++ b/dev-php/sebastian-recursion-context/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-resource-operations/Manifest b/dev-php/sebastian-resource-operations/Manifest
index 9aeb6a956f65..1cdac640e542 100644
--- a/dev-php/sebastian-resource-operations/Manifest
+++ b/dev-php/sebastian-resource-operations/Manifest
@@ -3,4 +3,4 @@ DIST sebastian-resource-operations-1.0.0.tar.gz 6449 BLAKE2B 0f748d4792a3d470556
 DIST sebastian-resource-operations-2.0.1.tar.gz 17772 BLAKE2B 8a98c2735973f063fefba9079bf10e1b4a1317eab2e9326bf338d50b2c278673ade93bc20fb415d4d33046575045d0e2d147b5b1ba38812c84031c7a691d1946 SHA512 991716a948f3492b2f3c886f07485fec26ad7e31f8588a2cbf6deff8ef4791e403962578590b117ed43def7753a5f44f0f8c8f92994bc58295d58db3f7d71021
 EBUILD sebastian-resource-operations-1.0.0.ebuild 665 BLAKE2B f1ad93e3bef34cb6493c4225c8debd96541b990872256e8946bc914b78d1ebfbb1ef7609c8dd029034eb6af6361d72d8de94e471e9c7dee0227eec3bda2dbc3d SHA512 068f5dd4c36da6dda3cb86837e12ddc2cd052b7c42b2b5f1df44767a7a709510c14d867aaceb8170daaead01d227f0562485243bc2c8e42c6186805a46c8e385
 EBUILD sebastian-resource-operations-2.0.1.ebuild 665 BLAKE2B 0721d98134778438e26433db61636457de5e0e2e7a51307166e2aeb6a19e95ae1af444e0c3748e40c103c2c1acba8ab1d67417bbf9b83eefdf6900b9ebf2eaad SHA512 a668e7c3cd58f5637b6950dec9bbf37c6f53c6430ad1ed169e59298ab7bb5e7f15a53469718a7fc27c132b018fe9fee2ee7f58a884e3bcfd266ec011b42c026c
-MISC metadata.xml 365 BLAKE2B d36b220ed03d86a7d237c0ee5a56e6d6b07ba8f50a6e09b826e531e5582e903e85471c772023c65b9b0c663240ccc2e4e7b55d412d467ee1fe5147b8cfc525a3 SHA512 0fa057a65ed2d59547620502847daa0812ac4bf9ebe1819621c139c9667b9885cc3190546e4867138562459c46f60af4b966298464138b01cd95f637a804f6a6
+MISC metadata.xml 365 BLAKE2B fa2f83a436ca93f621395ed23a88dc53f9c3b48e757fd5d5d35134d6e7f36a3a6e68f220c9a2370d9a6bac3e47b73f690f845ef34c0d3f0456575d3999ae59e0 SHA512 20c9dc70e65a5cb2167e2354a52694808623056b1655971e2f7d69e8bb8823fe7a450dfec4e7184cac5d593192f55c02ef0c00a8a46c82d29c271f076400cff2
diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml
index 01f9ba8700c6..f4be19dca0e2 100644
--- a/dev-php/sebastian-resource-operations/metadata.xml
+++ b/dev-php/sebastian-resource-operations/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-type/Manifest b/dev-php/sebastian-type/Manifest
index 96743b7446f8..d8335e742de1 100644
--- a/dev-php/sebastian-type/Manifest
+++ b/dev-php/sebastian-type/Manifest
@@ -3,4 +3,4 @@ DIST sebastian-type-1.1.3.tar.gz 19031 BLAKE2B 5e0d191cbc9315661f226aca14849ac4a
 DIST sebastian-type-1.1.4.tar.gz 19091 BLAKE2B 17a10d98c7356002b474ebab2c128631593ee175033fe9088a6fdfc29f020e33f1f090c1fb47c9890c686d41d207f5c8d2f6fffccd1e53341b8244b2633f55a1 SHA512 5320cad60dc79b213f30ec7b962d9e178ca7e49053eac040a50df3cea05579741f39bdc13872fb1b2d7c779a8e201767ee9550f47bb39cfca9fdac763886390d
 EBUILD sebastian-type-1.1.3.ebuild 643 BLAKE2B d3b7e19e6e08c54cf2e0e8df825a49c219b983ba684c941ee9339ecf7d310d7c4fc6bb855004f09c8eb82dedbc7ff8f90fd32fdd5bbd3c0693402c0f40992b0b SHA512 144b092cfad744f4b82ed13964f211b32bd6d5de663f981531a62ae232890db6b705cdfb08ca56f8a2416d82bdc0c37592f003e45f5a08d10ca0cbeb17c7d64c
 EBUILD sebastian-type-1.1.4.ebuild 805 BLAKE2B 6e1bf0da4d3de7b57b66590b2375c4f8c807a51646212f45082d3f294499e813c97dfee28409769bc7cd10ba5081fc40d9fe327bc9fae76e3f628898fb7a4dee SHA512 95d692c4bbd180208490ae1d4e296abd4cb27416a0a1ba3a3666c73d17dba5c86acce6c8bac345e6baa49d8ee2a3f2504075a0a9298ed40795b7c239e3781c16
-MISC metadata.xml 350 BLAKE2B eb58243d81ac1addd4c61eb07d51fe0d542795e7b74f1cd436cad066f67a6ce74c4645c9530205c174cd1433cf50fec610eac79be91bfcb094cccf2b740a7659 SHA512 c6329de1536c442a1a1285f90b0d4df477310d0d7eb3e3edab6c21947f01e0e48fb75b76b6548ec7f70e0c170708050a97f2ed0f4b1ddd4a7fc412a9f6ed406c
+MISC metadata.xml 350 BLAKE2B 39db3437984f75bcd20c21c3186d1b2b3574cb4b3e2490cc38c953fa25ae2d10480a16b572d0d7d8a040481abf34764a03dcbeb0d0945a6789c016b0e4713e57 SHA512 15c183481fc4959a1a6f1365bb8ea08f0814efedb8d45ba0729da65ba128ee65abca447882b43240c3e67357c8c69d9f0e3d950b50440a74bd22222e7c953216
diff --git a/dev-php/sebastian-type/metadata.xml b/dev-php/sebastian-type/metadata.xml
index 326e8c45cbc1..9745bd5bc7f5 100644
--- a/dev-php/sebastian-type/metadata.xml
+++ b/dev-php/sebastian-type/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest
index 734f783cd3eb..358c907e8312 100644
--- a/dev-php/sebastian-version/Manifest
+++ b/dev-php/sebastian-version/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 305 BLAKE2B fd6d3f90f1a7b421f68876765e7a5646c291bd7a72b06a6827c1472f5a772cfd4afb23a597ba63dbce0cb2dd999d2ea43b61c9d8e559ffa5ae4a7c3669f9dc9a SHA512 8a3e0a151a2d6b33e168907a3e30778104d2f33ece499b9f6836be807a16bad4f234fddeaae61f56a69f085b3e7e5e4434297e2557b36b62c8e124ba041cb5e1
 DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661
 EBUILD sebastian-version-2.0.1.ebuild 688 BLAKE2B 4bd34673ceca41597ef71f039eefc0e45685bccc31306137f207f5469bd55d2e215757ff815b596b5b5af6328a5223561ddc84669d87dfc37afbaec2a9355fd8 SHA512 d3b1d42fa10b2a0dda8eb5dce073f76b92e515eb9ea0d35e6fa1c5e868884190df9b31a11b5ee3c9190e304636a57cbc77fef0d588a4976a4fcf978a2b55c652
-MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
+MISC metadata.xml 329 BLAKE2B 65d1598348a6e5995310cb49cae936b06562fabd2cf644bad078b726f6976b5ccfd477b1eb0ca400d34d2cb8cd8f06084a63918b79ee08b4cc9e27dc6f3b8383 SHA512 83354b37c7a5ad9468e5462483aab66e2d1293b19c9e23bfa13b7c54e3bfce2be378f2a4119408d68f7fd86c15e15603a44ca373b3143e7296bb9c35db4f1c06
diff --git a/dev-php/sebastian-version/metadata.xml b/dev-php/sebastian-version/metadata.xml
index 145e45a7391b..9738b305aae0 100644
--- a/dev-php/sebastian-version/metadata.xml
+++ b/dev-php/sebastian-version/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
index 29ae0c0912ac..b332aab359cc 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -9,4 +9,4 @@ EBUILD semver-1.5.1.ebuild 650 BLAKE2B fa3328c96907a5076d8bdeba7f212aca9cd185023
 EBUILD semver-1.7.0.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
 EBUILD semver-1.7.1.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
 EBUILD semver-3.2.4.ebuild 678 BLAKE2B 9af1b5890e3f142927f10e8705575f0f10801225dfe8e833cd0992ea1814dd77dcbc589af3416052452b2074e78a288a73f0ba9eebab7499d7570dcf3d73937a SHA512 55b2c8fcc02006f4f07e251dddc32a63fe4cbe06625553b2b3976339bde26f3cb1e4a47b54808cf93f0c3851669f8f0abed045d41acfe65bc11043b7d1310de0
-MISC metadata.xml 553 BLAKE2B 7237fb4cb467d7bf22fe07ccd7b6cfc9d046ca184aabbad0f70312a4874b37aa81fe315921d574b19e115ee9d12c978524fa27b739d4a348ea276e341769c275 SHA512 abce730eef9026ee6e6df2c217624d8d588db4aa0ea7027b5f933e24d1ce5f277f24f033b1bcbc1185b0cdebf9e1f289137e75735a7bbb41f899c1e31c88efae
+MISC metadata.xml 583 BLAKE2B 47d3c278f97d8292fe430bb84dc8b28b6b4338b4c903823d0fb1b2e98fe54177fce446675229fb65aa16896ae88d45e1550d782daa4c32f2a16a8ce4570151a1 SHA512 3ffb5991ef530a2352f31f137c4d3e5609f7fbda4207e538938e59675dc6f505782074f8dfedc05d9e96ca07908b447b2b3de5290b29fa2cad3442653d160ef4
diff --git a/dev-php/semver/metadata.xml b/dev-php/semver/metadata.xml
index 2f918e246af3..6ec5f5908294 100644
--- a/dev-php/semver/metadata.xml
+++ b/dev-php/semver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index fee1e64ced5c..804b5434fdfd 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -1,12 +1,4 @@
 AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d7a1565c4e2422f6985c0b66ac73ce706c4cb53261d05abf3b6e5f0724bdc34e497fa2e1abc959 SHA512 6dd28dc205943fa5fa8fb7577a88926573533d553e86577ec2d2e34045ea744731ea08c9dfee277dd1550cac033ac53d1648aa8b28fc78eaa73d0613371aaaa7
-DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
-DIST spdx-licenses-1.4.0.tar.gz 11318 BLAKE2B bbeca0301c98bcbefe9ab09ab3f421480a4a777cd666dcbd870c193bb9af3083853561a3a49ea37a4534bef6c8f7e7c31d85b62355ab11dce006fe5f36864a10 SHA512 0ed7bc6e42e7cebe0763dcda8180d1c20da3f79587457e04be0f1331aa8464a1459ec584a8ef06db76b90eff1b6fd365196a2402384d00ddb5352afdc07afb0d
-DIST spdx-licenses-1.5.0.tar.gz 11576 BLAKE2B a427969df68a0ecc0f1234b1da3945c50f5f8163d182ec47a1fef31d309f216a410db95a9dd9e5b6057659a4a0afd5fad01919624e0b6ff0aee20d5bfff7d88a SHA512 184dc4c07f1d7b55539d32e4793c3ffbd8aa5a0b23439965a44450154e63e9afb74adb82031544e9e76e2ea9c5f57308d876c541dbd1583d498d3db71097fb06
-DIST spdx-licenses-1.5.3.tar.gz 12132 BLAKE2B c4f4086903769f8dffba496ed07fb490bd8def142be60c808726e52f4e059df1ffb1a2e8bd3d557b6c531c62d7e64776da1d482ff5958bfc687c11ef963925eb SHA512 b6e7fbaa422ff6d2f227f8fea24de514c0e2c34c7381930f1aabac9523a56565ab2a3df524029143f2e305967dcc0af09721ed9cf74b6e8780306c91d42c74ee
 DIST spdx-licenses-1.5.4.tar.gz 11804 BLAKE2B d6e2b0364f0f6d728e93a0c4e7796e2461b3be03b17ec30ae77db898b1cca3b00a970a9a64d55ddcec1f115be2bcf69e870c6f802267d6a0ed0e05befb87120f SHA512 0912d6060521c0e88e9570af84f8197cc009d060233d4adda540472bdb736fe9ee077ab424d6f46ddbfb7ee23783c34d3282f88222fd305282c54f164b14c5f3
-EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
-EBUILD spdx-licenses-1.4.0-r1.ebuild 592 BLAKE2B 51d43eb90c272c90b2f74a8a7569039604ed3a8e1d3e1aa84823aa2ecebfff13c03d518096f7ea087f0cf91268f0e9f5df64199872fcaef5aad68de9ed45d3a8 SHA512 b5ce0761d3bbb97547a639582e9d27b10033ed229467d353fc692907f54f9fa1cfdb70c313accfaf2cc14c705940bcc7e693d1a6162b38c685e104c4558dfd14
-EBUILD spdx-licenses-1.5.0.ebuild 589 BLAKE2B 98b09d9588f1730200ccbf89bb508b57e3ce0a5d845945c20b853e0eca19dcd82c6d03e1752918da5d3b7321338bb923b1c74fb5dd7974fb597fb6bc9609c369 SHA512 f067b98af3569e534c20ee26c170c41794ff303601d4da917e33a37cf6b04e51dfee1bafe1b128e10f41369d2d90e32f50e15828a559e2104a2e37a3a24d9d87
-EBUILD spdx-licenses-1.5.3.ebuild 589 BLAKE2B d833a009d0c37e17b0570069667325e9d70f0e7005bbdfdcdf92c2af0239af7b2a1f75f32f3e230b82e44bef36ac46c289f37291ad02a62d8be89e11692e2047 SHA512 1aed6d44847dadf8d8d305b5874f7a67cba24c5dab981e9bfe59461f2dacc361b9043ad8aacd88c15098a28524f8ddae930ec583d981ff35c1b1d7da3112c9d7
 EBUILD spdx-licenses-1.5.4.ebuild 589 BLAKE2B d833a009d0c37e17b0570069667325e9d70f0e7005bbdfdcdf92c2af0239af7b2a1f75f32f3e230b82e44bef36ac46c289f37291ad02a62d8be89e11692e2047 SHA512 1aed6d44847dadf8d8d305b5874f7a67cba24c5dab981e9bfe59461f2dacc361b9043ad8aacd88c15098a28524f8ddae930ec583d981ff35c1b1d7da3112c9d7
-MISC metadata.xml 560 BLAKE2B d52fd83bd32b4470ce773f0e8d7c3c1910b3a029c642fafba03acb25328a865f233a5f35b58f34587cd49ae0aff08398f6961ecd7792da669e89569294a629fd SHA512 c98319f6801a27dcfc2a7dafa4975809011d5496e9700e750908d058136a91b03b6c9728835969129a39b0911fa85803461bd1ec01786c843e78a143607965fe
+MISC metadata.xml 590 BLAKE2B 0251a43e134724a48492f0a8f009a25cc35a432621317e889e58d56b6986e8163fbdbd031c9dd4da3277050d3cf54d2b3a4f796a8dfcad61178bd4d3a3ee4311 SHA512 88e8f8ccdf470bab909182860d5f455b97c969998299650f09a76c35b21dfa5632e39d24d023ece6cc4524508a25e74f023e132ba80a9c74021f96afcd94087e
diff --git a/dev-php/spdx-licenses/metadata.xml b/dev-php/spdx-licenses/metadata.xml
index 5c417692db5a..0218de4810be 100644
--- a/dev-php/spdx-licenses/metadata.xml
+++ b/dev-php/spdx-licenses/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
deleted file mode 100644
index c23832e1773c..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. res "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild
deleted file mode 100644
index 57236bd1ba3c..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Composer/res"
-	doins -r res/.
-
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild
deleted file mode 100644
index 8b9ab0e5b041..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Composer/res"
-	doins -r res/.
-
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.3.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.3.ebuild
deleted file mode 100644
index 98621560f378..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.5.3.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
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Composer/res"
-	doins -r res/.
-
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
index b7e2e5d5f764..4f5016c294f5 100644
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 577 BLAKE2B 4a36bd333f27a143517c8e81c4749dee06a4f6ef228f6b0af7e94d544118b2345aa6860abeb9386998df5c57e2689d467f075344cf7ed0882baaa8f0d6a29f85 SHA512 ef699576d866c6a2c8893f8ca5c74d6b019b0cd554e3dfb2946d96cf20c9117e7a6b966c3386f6e1294dcd55feb05df437166711008242cc52bcb1a94ae5e8c6
 DIST symfony-config-2.8.20.tar.gz 52587 BLAKE2B 540ed96ebc9d3c5e6d460003c47e2d0612037acc2e40ff413d4195a1f7d48e7e7edb2b0bbf17f982d9ea48242439d819f2b6b442dcd22fa7cc9fa0b29ef2b6e7 SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675
 EBUILD symfony-config-2.8.20.ebuild 872 BLAKE2B 463e0674de0f8792b526b8a009d38c57918533bbd4d44d3c2e1ac69fa9e038c488359e0dc06d3c128a8beb1be61f544dd67e87b588733c78b36c357149668d3f SHA512 3f0696de9e9833de718fd4cc35272e62c77c1577165f579c95d326d23752251548aba23403a2e93804f88573e09c0925316279fc0cc4429254042b61cba47638
-MISC metadata.xml 825 BLAKE2B 0360fe3b9d09d22a1a2511ba9632137f06bbed62ecceb5da51a0f634fa603c8bc4cba95cb66cf35a9024b6a7f01502234fba33ee8f4f092a1b32a20b7f2628f1 SHA512 3feeb922f4e961b192ecc9581b468a10121bf522ff51e48ad2cc61e358b2f994037ca1cecb603c5543f74f5753963e8a2a3438de1602b18efe9b0175ee2d7b53
+MISC metadata.xml 855 BLAKE2B d07b8673409bffbb2671ba85c8f0b1597e16598ca8a3230466042790a32bc12b0e4449d3d8bbd1fd248a5708e3973832df653d6369c7fe57ce3eeeed2d92feb9 SHA512 b8e5e423fd45dd2d999f4cd0439cedb4247f30592b4af5e163cf1b1325900e0334649b221264b1a2c3b9ee70d0c35385889ae98bcce5c163180153cbd5f5e5b1
diff --git a/dev-php/symfony-config/metadata.xml b/dev-php/symfony-config/metadata.xml
index bc820db2a2f2..be6f5818811c 100644
--- a/dev-php/symfony-config/metadata.xml
+++ b/dev-php/symfony-config/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-console/Manifest b/dev-php/symfony-console/Manifest
index f57d4720a945..b5d586768c02 100644
--- a/dev-php/symfony-console/Manifest
+++ b/dev-php/symfony-console/Manifest
@@ -1,12 +1,4 @@
 AUX autoload.php 536 BLAKE2B 1a65551494d6fb49e9e21cb397bc5d53ff2fbc1c09af6c426e2b142c5fc440290ccbe18ec1a3451053b856b334ee99c5016e3b645ae7eb0b84452155cb484dca SHA512 cf67d18e3717b9498386be165095a26679daf3a815fe314f23cf14513ba9e3b97f51c1052e9df18106c735c5b41262de0f3badd59517d1a94dce2f1e53f8fa2b
-DIST symfony-console-2.7.9.tar.gz 116610 BLAKE2B 1b1da6f81a88b2887a6a5eb5553c4aa2d3a013b68d8e469e27da42409d5bc50208cc0ff8983afd22163a724e61cf7637728939f2a92137f0b1619ad5a833ba2a SHA512 3de7d78b92c8f0c99d3c90e83a23f6b61eecc195cf92b5c9ebea03a1dc85d2166287e619822238a2f2cd54a430b4a38c7c88be3ba74dab0b66c6104e980a088b
-DIST symfony-console-2.8.43.tar.gz 131451 BLAKE2B f3a0c57f6c746c9cf18b0b9f6ae32aea055f0c3d5ba0c1a43d5492efcfab897184db49dc8ace1c465ca8b04194d10f1acab6b2c1ea2d3c62c3aa54524f514f39 SHA512 e5177052bb826fe5f023c569e24440588f75d34d4caf56f69ee1a88a5e7d3b639741c1262600543d617b80d5a086472d54b45f48e7eb79375759d4e5cce742d8
-DIST symfony-console-2.8.48.tar.gz 132206 BLAKE2B 970d4e7526681159aa76fdede0e533875c163cb7fdb2156f0eebb9540602c8e29b3ee8b5a9bb5509a629b9a910d00cfc5625f203a77807ed0da670a0e41e4be9 SHA512 358e0f44e516ffdb626bd7da29b415f1a563bd400b627991928e5014aee8a5ec9bd1c61fa4f6c25f6f28b1f88f6f16d9d718bdda22b9f3b906db4cc85cfadb1a
-DIST symfony-console-2.8.50.tar.gz 132180 BLAKE2B 25611de88061feafb6fcf26bc5c89145d02ddacff1f6bc3d81a30ea89314a33c5231dcf050f5c22817eed3c2bb7e2defcd820bf586436693c47a9ceca7384ffe SHA512 e1229f8855ad6d48e75abddc2953c3e48c6ceb025536c748c4aec75e9b1c4c482bf36de2070b62c0d31904e45df02b3241c42b48e24c2d609c8280b6126a49bd
 DIST symfony-console-2.8.52.tar.gz 132191 BLAKE2B 0eb276cb1d7faac0e21558906d4c7f299901cd06911d8bcdbf5842dec508ed5ec48bd8fc32d186dff24968471549912083864b726ec177eb53cfb11bcbae7604 SHA512 a066c6e81e7cb64a819271e188e25fcc7bced16a9f2408fd55d765dff052d331b2e68df05b2c107070a67c919eb46619a5626aaf4866620d9075653390824e5c
-EBUILD symfony-console-2.7.9-r1.ebuild 666 BLAKE2B fc6405f880bf61141284960755ff4e0737edd3a1dae204316289b930035aa14a6afa7afc556a06ab181737f339d717d94e9fd5abb219204d1cc39632f29b6fcf SHA512 0e65babf5287b41f5e2ce9d435e1fb5a8c3ec3326f6be7a70cb1a4aa5b5e38ea03fd9473ae86e3dc59950e127380fcc275c6d86e6783f5b41237fc0fb26d9ab8
-EBUILD symfony-console-2.8.43.ebuild 666 BLAKE2B df20a7988cf452daf7225a10e1faa82ef2e38142e9788ef51ae0f8d0fe0744b6f77557c8624ef77120c77a93acc15bc7bcb512f1bcda7f9503432cb829d53b3c SHA512 87bcd21dda39c819e492275fde4b123360f5724e0d44ba33e857840cfc1f2f6f0680a4089eb6218ba5d0e74948b035c721347cb078b833e8172b5ae272de7ee3
-EBUILD symfony-console-2.8.48.ebuild 663 BLAKE2B 1ad76e0692275d73f79e19621f599d8b662602631ffdfeb945094c416a33e1efae1e0f2084e9be4fa2a57f736a3e37277816618b704c65c871431a2dc7998c1d SHA512 80aa352748e9a6956c14bed659a3b01685077ac34805688e03e8bed49794052dfbfa54b7e04770655524d5b3e3a6a4641b4394f6378209781937345a6ce2b9be
-EBUILD symfony-console-2.8.50.ebuild 663 BLAKE2B 2e03e16e05cc6f8d8a02b8ef6b26e59e192e1d53355c150c26a5c9a48d96be67c556dab083e937bfac805ee31cb5fe900c0833cdc931b624c9f428ec87c80779 SHA512 d3b8c317097ebe81025c8b953116c3be6d51a4b3910c4c220f8522a63669f683a54c8a735d3b80ba9b65201a2aff1387cd6b44428b65da4e2c485c84adbc099c
 EBUILD symfony-console-2.8.52.ebuild 663 BLAKE2B 979248dc713cee6e58f8f4fd8b6fefad918c649dde75b308d127dcd736791e499426d7a4979a9e322f2f052aebbe80214c3eb3fd3c31646787a53c55996848a4 SHA512 fe410c552ec30c28aea00dcdf4790cee2c4e02f167172e12a5db826e3405cf9234f4bc1378a5540473044cf343cf9a52736a6d63e0128d5ae194cd0da8b5ddb5
-MISC metadata.xml 553 BLAKE2B 56c187059eae6a0c3386b76867a8350b37130ce86ffb3716a8e9d56b57c955844ffed160d1eeb666353115f138c27424fa51ea32c4d1f819c9fce9d8baa7a71b SHA512 981bafd71e85988d1567409c909e194a06744e36db9263cdf0ec93c5132ef0d53f294459ffc8f36ea3b2c32ea134dec95fd4961ab6fa7a538dcc91c2e3b8c793
+MISC metadata.xml 583 BLAKE2B 5e08d093473a34280be6a3bdf6e49f52d7a766680d02c067b10cf5c299eaf9a7b7ca581f302b69272192443a93784e1babcb6a21bfd03f73077ea0285455ec38 SHA512 0494c7d0a9c4ea9035d49d675c2d0709db092cc4064ea0f43df3c800be28a247e5473ce60fe9785b0bafeea723cf970b48e833fe4d4899f798e3e6928a156373
diff --git a/dev-php/symfony-console/metadata.xml b/dev-php/symfony-console/metadata.xml
index 54bccee4bb3e..9db86af2e1bb 100644
--- a/dev-php/symfony-console/metadata.xml
+++ b/dev-php/symfony-console/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild b/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
deleted file mode 100644
index 1cdcfc26ca55..000000000000
--- a/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Subtree split of the Symfony Console Component"
-HOMEPAGE="https://github.com/symfony/console"
-SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2
-	>=dev-php/symfony-event-dispatcher-2.1.0
-	>=dev-php/symfony-process-2.8.12"
-
-S="${WORKDIR}/console-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Console"
-	doins -r . "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/symfony-console/symfony-console-2.8.43.ebuild b/dev-php/symfony-console/symfony-console-2.8.43.ebuild
deleted file mode 100644
index b543b5440226..000000000000
--- a/dev-php/symfony-console/symfony-console-2.8.43.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Subtree split of the Symfony Console Component"
-HOMEPAGE="https://github.com/symfony/console"
-SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2
-	>=dev-php/symfony-event-dispatcher-2.1.0
-	>=dev-php/symfony-process-2.8.12"
-
-S="${WORKDIR}/console-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Console"
-	doins -r . "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/symfony-console/symfony-console-2.8.48.ebuild b/dev-php/symfony-console/symfony-console-2.8.48.ebuild
deleted file mode 100644
index e3887444f9e9..000000000000
--- a/dev-php/symfony-console/symfony-console-2.8.48.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Subtree split of the Symfony Console Component"
-HOMEPAGE="https://github.com/symfony/console"
-SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2
-	>=dev-php/symfony-event-dispatcher-2.1.0
-	>=dev-php/symfony-process-2.8.12"
-
-S="${WORKDIR}/console-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Console"
-	doins -r . "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/symfony-console/symfony-console-2.8.50.ebuild b/dev-php/symfony-console/symfony-console-2.8.50.ebuild
deleted file mode 100644
index 3586a72bfe27..000000000000
--- a/dev-php/symfony-console/symfony-console-2.8.50.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Subtree split of the Symfony Console Component"
-HOMEPAGE="https://github.com/symfony/console"
-SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2
-	>=dev-php/symfony-event-dispatcher-2.1.0
-	>=dev-php/symfony-process-2.8.12"
-
-S="${WORKDIR}/console-${PV}"
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Console"
-	doins -r . "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/symfony-dependency-injection/Manifest b/dev-php/symfony-dependency-injection/Manifest
index 3de28a506af2..5cadd438637e 100644
--- a/dev-php/symfony-dependency-injection/Manifest
+++ b/dev-php/symfony-dependency-injection/Manifest
@@ -3,4 +3,4 @@ DIST symfony-dependency-injection-2.8.20.tar.gz 117123 BLAKE2B 469b11d55bbfdffe4
 DIST symfony-dependency-injection-2.8.50.tar.gz 117771 BLAKE2B b71535619a45a03640064b987a7b5996dc991458c737661a983782d7af53bf89865bf511dbac99384f8ece583b628a2cde0def2cdd3e8c133055d84d9dbed1e1 SHA512 690b3f373c2fb549115f7fdb35880a2c94bf7afa28be2c75d718373e8925897f89d5e34f82b709b11cd8940547289345a8def4debe657f495a0b636a6aa72baa
 EBUILD symfony-dependency-injection-2.8.20.ebuild 1225 BLAKE2B 0e86710dcd78ec76c9ad18e1cfdbde03f47c03b2cb81462ec15e6636515ede5fb1c2870fca93f79d23e356def7daba3946da61bbb7b3511074818447c6e7571d SHA512 0a356695ee5aba4ad3484447f091db58a1ad133fccfa00d4cae723516ec84fa153fa77ab4a05dc86dfea37dc6d9607c111647cba7178235ba1bb5d87441901b0
 EBUILD symfony-dependency-injection-2.8.50.ebuild 1224 BLAKE2B 017345586a3e9704ed645b02e8813ca986326af920b911ca8cd8d74d91bb524ed9f9a669c0bd51685160db977727381572266e83c2b279e1f4efb9e74295b826 SHA512 93906ac3db0ee4142966dd53957c71d46e6595d6a2ce8c1a3c5c8e707b99ebf82798e2c08faec0c6470a0e6f85ae17540e3cf73b2e6deb8336842802ef04a495
-MISC metadata.xml 743 BLAKE2B 6b4332ed5a925353809cddc1b6136ec7f3f657039372b9ba7ea1e93285ecbfb780b09a7882f6b573a6d942eaa7a2ea1a6e0db1475dd9bc89efbc5171e7abd3ae SHA512 0a3cc149f3df429f4a6aa1e9941ffaa5969cd5f41444496ed120653e546fb240ee0afcefd44f984536c5bd48cfe867828ab6df5687b375163bb7aa7e3a05976c
+MISC metadata.xml 773 BLAKE2B f3dfcaed23de28b097f3d996138c952492d21fdc1da4404cbc94ef75aeb07657ec96ff6d35493b4712a91d6ed61ab05d55d4f53ede4ffc19dc19fa2c949dc219 SHA512 2ef7eff030fece015120d27fe3dc915ef0b11300789a0fd08c1626d14903ef5211568b606ed93e89c22d2fecceafb2c9e6ac09691dbb4d535db4df6c4afc7910
diff --git a/dev-php/symfony-dependency-injection/metadata.xml b/dev-php/symfony-dependency-injection/metadata.xml
index fad21997665b..b37e97d4dc2c 100644
--- a/dev-php/symfony-dependency-injection/metadata.xml
+++ b/dev-php/symfony-dependency-injection/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest
index 1a3eff208b06..e923016f1365 100644
--- a/dev-php/symfony-event-dispatcher/Manifest
+++ b/dev-php/symfony-event-dispatcher/Manifest
@@ -3,4 +3,4 @@ DIST symfony-event-dispatcher-2.1.0.tar.gz 10271 BLAKE2B 0fcb3fd95643a24ff31d4e6
 DIST symfony-event-dispatcher-2.8.50.tar.gz 15682 BLAKE2B dff817cc540074caabef6bbcd24fedee8bc377fbd688ead9d7a95df9987c79446bac630f806dfa190572a214393676042682b84bed58a6e0d5bb47d0dfd64986 SHA512 ecb5e17d5f0639c49fa35e9dc33d3b7d6a7792c95d9020ede9ceebe0de5e0192101607ac6f797e35a7ea5ced36231e616d76fe4f8ab74c0d42014782de590a35
 EBUILD symfony-event-dispatcher-2.1.0-r1.ebuild 924 BLAKE2B 0762359c76570d8372745e26cf343ce0465c71084c2cc62cc263edf4f95deebd7319f8881f51942bfa9e179927396895015d0b41e7f9d1ecbc49fd8886c2df1f SHA512 8131fbbe4c13d18ac4fa4f78acf9ba1e9e9c5f0aae58ac2149f009edbc311ed8498b79f48042f024ae622cbb446b918a141dc0c57f6cbb2de2396e991055e940
 EBUILD symfony-event-dispatcher-2.8.50.ebuild 927 BLAKE2B ed521528565045ebbced171760d07c6753f38583cd6fc845490ad7633d6b5be6730130f43178f25e0eebb5e304ab363675c37e0068c46650fb6bdc92763e14da SHA512 e988ba3fdff007880c5d60d5093898beef3469949b565f4ae923847a52d97c56086477d643604e27c2728c9134ac6cd235b7e2e683cfb0615e9380e394aaa46f
-MISC metadata.xml 775 BLAKE2B e25fad462227e8d7ae05cfe82044f57c9f8c5de7dc8d88d8151c549a2e040dbeaee82866919dda13efe6d8574e3160725fbd9d42019593177d03ea352cadce9a SHA512 11095327870ea93690d14782556a5c28fa6cf2a099ff63b9f8d0ced042f79e4fc96d4b7b33b9fe4820eaf8159385a6b8056ddb32309d376675646dc1e262fe00
+MISC metadata.xml 805 BLAKE2B 982592d44f81e01b3adc8e91e61d46eb619e71a21e2863691d599a94dce2e5e8655ca17bbd674748dee784ad233eca922a6145bd61f745f90b15e3b9aaf2f681 SHA512 7570f763b1d904d1c3dc4f1bf9e8a4826081a35529bee46b8b8c64c8592e79035d979d1f972f747b0f32d416245790ecc2eb95dc0a2940bdc1bde9b4e13343d8
diff --git a/dev-php/symfony-event-dispatcher/metadata.xml b/dev-php/symfony-event-dispatcher/metadata.xml
index d12fba00b1aa..00c47e10e312 100644
--- a/dev-php/symfony-event-dispatcher/metadata.xml
+++ b/dev-php/symfony-event-dispatcher/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
index fc9287732f4f..465e6067e5fc 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -3,4 +3,4 @@ DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B dcb9752a5691834aa87b3866b6c2
 DIST symfony-filesystem-3.4.36.tar.gz 19282 BLAKE2B fd084715356b49588ff6a589372ab1958e3bd58b3af690b554ef1562553bf57504ca184fea06a3aa58ea12381773cebb57e11ba385be5c23ebce3f9e576413ec SHA512 2a43d22e64adfe50a1915f3833c70962f90a8da3cf7bb8b7bf30b1e0f17d6bd4857b35687207e019037d24ad71f46228ddd6eb46713117b82a92f94653cb2384
 EBUILD symfony-filesystem-3.4.28.ebuild 913 BLAKE2B 391eac0cf1dd4052206b1c23adb2d4ba9135a208ed1aa3eff465df5e6b10afcfe904c13f5e00fb0c460c893bde234eb7de86a23966ca8bf0919e47dbd8ee4807 SHA512 5b83ca824b09e73e5c4e46b4aa5ea27fbad9266a36c95f92f775e2ae93bfbc62b4c71b8a383339bcd2a871aa924d732c91e7f557e2de7c94a13a43f5159eebac
 EBUILD symfony-filesystem-3.4.36.ebuild 907 BLAKE2B 042ae06eb86ac2aa8f12bcb6bb23fed4fc159d28dd04f2c99078bc51f10d453718e9f3ce4e1d58d43eecc42e1c50587148667d7594fc5e50333464dbd26de14a SHA512 c4a5e239ba0b30ebcfe6c2d84219ff24a5b627b8823146e77a13e807909607d5bcd7a5ec839143181f7470263e6868da286447229d1b7e437f93519ef574baa6
-MISC metadata.xml 556 BLAKE2B fd2254fac85cf870dbe618404d078bb9f985ca1ba465b45b84620f0dc88b60aaefcf08f2666f1950866ff25b0939bc87b6d793ae5cedab0832d732c2f2e686da SHA512 827f6009464d7ecbd4a275df296e50d8dcdab0aff7f10298391a174e162a89c34a5324c80885e360dcdd52a2028b2153cb01dda8a9052e2bbf34ff0d3156251b
+MISC metadata.xml 586 BLAKE2B 32c2a97ea559c52f75f61feaa7f7421a76a35e73fa4e5d3a3041da70ff66b44205f69978e199e9c5d777337b12a5dd4965fc0a87103e7c45bb71e182d3b7db2c SHA512 9aebed3826897c7714f319ba5d60185020c212b256e2ad9398cb60a3b6e82539eaabdbae24948011940ed0f6263f77cae3d95af55af17c5a6db2ddc8a894c070
diff --git a/dev-php/symfony-filesystem/metadata.xml b/dev-php/symfony-filesystem/metadata.xml
index 45fe0db2707d..b2cb0eba12ad 100644
--- a/dev-php/symfony-filesystem/metadata.xml
+++ b/dev-php/symfony-filesystem/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
index d162d08146be..464b5ea1f913 100644
--- a/dev-php/symfony-finder/Manifest
+++ b/dev-php/symfony-finder/Manifest
@@ -1,10 +1,6 @@
 AUX autoload.php 272 BLAKE2B 53ab5f647a53f82edd22bec0b29d10ac89a488bdee8cc67365190887c65f2233f72a2db01a82f7bdace894fb0a4ed1b31b3b7c6856cf36e7900512d4afde7063 SHA512 b10296ebdf173be6e8b4d98013888778269d08915e1e30f1c00f59dbfb15af5b8a39d59a302b3ea65ba811d8c51c975b876fff1a3adf2a6cf6cf129172525f17
 AUX skip-file-time-sort-tests.patch 1211 BLAKE2B 84e77e610c1c57e54063d50e7ed4fe70e7678954ea7917c9096a723aac16906427e1f9a27092e3dc8e908cd9b53d266d7651704469ab29832ab596792edf98e4 SHA512 bf8e229ab4d9afbe991c60710eefc4a741ee87671dd3fef386548cacfff160e56b455437c9af94dc1e88253111d10edb3133762c781673e962428150589231e3
 AUX symfony-finder-3.4.28-skip-file-time-sort-tests.patch 1026 BLAKE2B aab5d755792961baf53217710f9d196663f5dbcf96cb524a5850cf681abdef6c0b60e2af08e4c7e01f135f95d750d3c0532e190dd009f7c9213adc70085b2da2 SHA512 836689dce3d9ae230a0d2d8ae7df6f9cd592853f14c6b56f0daffe9ee474fd3ecdedbd05bd9a1e344d6af5c2ec6ba04c1fb5fdbc60e70a843e6e02ae3de922c1
-DIST symfony-finder-3.2.8.tar.gz 24452 BLAKE2B eed88ea672381fa3a0fef9390109fa7b89b8de87f4e0174fcb24c009044818b7c56846eec0b3240eed1c05fe7d682713fdd41c84e5d766cc2632e5576b38b741 SHA512 7eff457c6c70bf58b4af7e9adbeeb68a1ad684b95510d929f137545be6b755ece37949687f4de27c7fb4d5f208e30c6b0b3a32a804f7a6a6b8ed0d4ed7dfd9cd
-DIST symfony-finder-3.4.28.tar.gz 25618 BLAKE2B 592a10a5e8d7f1782242d79bc11ebfde6d528025a65bb18d5c36b238c418a3df10e637a285d0859bb79ab152aafdad5d61d32396efed6f6fe0e800aff03fae69 SHA512 5b1754e47eb484fddfb1d29f181efaabb371e62c2afe5c7c1d0552ac82de81aff0fbc6594498b859b64cd34cf35e57cf29110d59e5f376263f1b136a4d184b69
 DIST symfony-finder-3.4.38.tar.gz 25631 BLAKE2B e15224294373f35222ba5af10598339714892d637e7ee6e52ad6e0fd22802c3ea7fd9eda2e172ff0f73a3788afc640ff8093440ab71f1182d13783f96d5b70df SHA512 60987869275547b097ce8492164a443f4535d41d8b4453da3aadf96af536dd1ed6148fbb7100959e5ca7f560b2333359c9256e5d76a71e98aa6e3ccd808df051
-EBUILD symfony-finder-3.2.8.ebuild 960 BLAKE2B b9be05dabce7f2b73f61063d51b69ac6b48825113c9f5c72e77a09489a76686ef3cbaf410a0fb6fa5ce189d9e339a0b855668b56eb08e3ca58fc18b3bd71fcbf SHA512 55c995258c4405fa2417ed1d14d19cb9a15716e6e8489b682f8f96cc54f1cc864bc9e7f277f53a0947b6c52c438ab3e7e4b35e4e6f1b371b95a6ba34c71784c8
-EBUILD symfony-finder-3.4.28.ebuild 973 BLAKE2B 8feee88ca9bc72477f719e5c0182905116f8ded4bca3e678c6241833604559e22963fe5e26ce1e2b2134b06177e775ae3127a65d695bb767755636724ea34b69 SHA512 8745fdeb25cfa360259bd7d7477a3db2cd5b898738739aed7b0f7924963aa95da8502ffc1cafa6d2130f97c8f513847d4fbe1821251d9576fa716d42f47a8bca
 EBUILD symfony-finder-3.4.38.ebuild 967 BLAKE2B afe3b904f5e03ce69c5365face9ae140ca4a4203a4f1988bf020d0a3e03a3d12cf08479780a47b148d5795953c9456b2017242bfc86ac31acb35b5a7a64b910b SHA512 36cf43f315132643be93289749f2fa20a6f634c0f5f1631df394b3b2e9d7a95333ab0048bc8fdcaa7ca40bead3504a6819ac5f558bae3a199fdd61fa7522aedb
-MISC metadata.xml 552 BLAKE2B dd2331101e081da98439b2cd4dca5417dc76b1b0f0d0b0f18b10db34095343443ebc003f9acb212210162ac4b8e4fc332c2a161f5643d6dea3eb36b57da1118e SHA512 8229082f23cb3f58fa275f20480795958efbac7344f38cf4deb12facc3bfba254746ad826a32b245f1e2837ba2d39c46c642b7a4b0f333f3f68c3882ae6c9e95
+MISC metadata.xml 582 BLAKE2B ee6746dd2dd6dbf616068a28f6ab4a5f6cef249af275f129d222863a7cadba15e12e6af3c7c725ec591f968324e6c3234da00d993c5c403740b1ae7bb3a456c6 SHA512 76521a8adf388dd0ff302477529660cdf3832c1ff70e2ece89e17f012f2c58bf6ee194df648430ce21e64fbb8264d248ff4bb38b6fc4113a0ab19305e6188bd4
diff --git a/dev-php/symfony-finder/metadata.xml b/dev-php/symfony-finder/metadata.xml
index a27d4f31ef83..990080d5dde3 100644
--- a/dev-php/symfony-finder/metadata.xml
+++ b/dev-php/symfony-finder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
deleted file mode 100644
index e23f14897771..000000000000
--- a/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Finder Component"
-HOMEPAGE="https://github.com/symfony/finder"
-SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-finder-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
-
-S="${WORKDIR}/finder-${PV}"
-
-PATCHES=( "${FILESDIR}/skip-file-time-sort-tests.patch" )
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Finder"
-	doins -r Comparator Exception Iterator
-	doins *.php "${FILESDIR}"/autoload.php
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
-}
diff --git a/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild
deleted file mode 100644
index a798357e9391..000000000000
--- a/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Symfony Finder Component"
-HOMEPAGE="https://github.com/symfony/finder"
-SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-finder-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
-
-S="${WORKDIR}/finder-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.28-skip-file-time-sort-tests.patch )
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Finder"
-	doins -r Comparator Exception Iterator
-	doins *.php "${FILESDIR}"/autoload.php
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
-}
diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
index 41b43376fed7..a9b9d6dee323 100644
--- a/dev-php/symfony-process/Manifest
+++ b/dev-php/symfony-process/Manifest
@@ -3,4 +3,4 @@ DIST symfony-process-3.4.29.tar.gz 34684 BLAKE2B 87f79a17ac321b395a634f0b83a0d21
 DIST symfony-process-3.4.38.tar.gz 34424 BLAKE2B d990ba77e1d1e9b00e1b22381c9b3c454d94a8705ff7bd9830b59a32108f590efbb7e434e0f11421ccb143aa72d659d7211062c07c0cb36d18aae1f01e073b3a SHA512 14ff5f874904166978cb4021c87fde42611f05505498a8257089f97ae6f65051427c0f8e720a28b57e64de436818967676e35ddfc273e86b809ea0bf590662af
 EBUILD symfony-process-3.4.29.ebuild 980 BLAKE2B 8c1858094e929565c68f17752abb7afce91f041848ac83df321fb0971f2af3c64afe4816b8ba1bbf38c49b2cd984e8ad2a8dc0a0afb114cbadc80e1db646cbf1 SHA512 d8ffa811b7f68ce0acce37fd7f1c4af08d8ff1ac9d9c1b4f1f19d7754b198e13f9b42e39bf236ea2d6c5c7dff3719fc5a4f023e5483d541cbcdba0a75cc03e8f
 EBUILD symfony-process-3.4.38.ebuild 980 BLAKE2B 09e7f76e081893252becde8b59b7704d34722c8869ae1874e919c75ad5ce06f6bca5e57dbc19eedda5b9d64c5dd73fba4d6801f95044185508181b3193ff9e41 SHA512 cb6af4ea246bf95536e58cf7737f9a17285fc8755b90a5dde54a42ccb1c666b9c448d3a2aadccbd67bdf55c7134a272534a182e6bb8534a93a1252bac9766fd6
-MISC metadata.xml 553 BLAKE2B caf015b61522b58369841a4bf8af22d46c9aef99133a7923a0111e9df9790e702b966a9ad18903b22eeac0591b55037e661aabab3068628e580d2ac1d86b8c24 SHA512 ca8784c6878891357f331f4d7b878e9d495ba1c11fedf9ece5955f229e3538e44c989f30bab8b6639488ad3c28cd809498c1aaf8dd7adcc8dabdca1e702c3dd0
+MISC metadata.xml 583 BLAKE2B 6e6b6939fa7bbdbe5ca55878e795a5b5cafb2af0073a566c88984dfac39888d8d467e01224807d110e9060e234d5d5ce45704ce09dadae82fda109b02875b24d SHA512 c8cf93ec48a24ed0ff69da292551bb18333f47d5d4e6fb2c647d901bb3de1300bd5ae7359925ef0afc4beaf44b8bedf8b8c77170883ce46dfd8c8f30471fb88a
diff --git a/dev-php/symfony-process/metadata.xml b/dev-php/symfony-process/metadata.xml
index 3113f6da4aff..fbfab081f2a4 100644
--- a/dev-php/symfony-process/metadata.xml
+++ b/dev-php/symfony-process/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/symfony-yaml/Manifest b/dev-php/symfony-yaml/Manifest
index 79ccfeb47b0d..7b14c088890b 100644
--- a/dev-php/symfony-yaml/Manifest
+++ b/dev-php/symfony-yaml/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 276 BLAKE2B 1eac0f1626d3639f38c44ee0408a44c90961773c155a5ee40dc20060acac55fca1ceb6b07579d136120dd5070b1383677a7bee3134325eeba5e5ac62bf8b9694 SHA512 1b5cff9898160608f4fa4e639d73ee3f561136797a9d85216b9342c6a7b11cf4b5fe3dc548baf3494a0a9387761ffaa1f0bb09aa1ebac181705000cf6ac62a84
 DIST symfony-yaml-2.1.0.tar.gz 37056 BLAKE2B df1eb0164db026e8157ec8e61941b158b252c048349acc37a060ab44e27004653c3deafc48d6d99e61cda1d67978742d1dd7e74e144adf114d8bcc39610a2b9a SHA512 984fbd624d4bf70ae964da60d55b6d9883642eabce54f080c04d3d12b4d64e63f036683bc12052b0958bd4575f1b693f1453b2505e5e5666ddf2fb13c40e927f
 EBUILD symfony-yaml-2.1.0.ebuild 852 BLAKE2B 627f623150f289e73cfdee239274312be71717460e8cc051c0a3da8dad7173c1f15b26d4343b659bff66a4d1f669673d7fc1e0fda295b7589fd916e7dc82a50e SHA512 1c9b87b1a1c89ab921e636ecd9f78ad81a67a2637f1a39b6409b765ae57564251cb8a77d4587fddd2d9a76617275ea0db06802c5a08c01c4b83560daaf6a5331
-MISC metadata.xml 550 BLAKE2B 26e8d30c1e3602eb8ea66381fcc72759a229bb3b9e169704a33d68a7b859477dc5e21e8e43bf740111d19c0615c752b6f5bfb2a2dec72930c46ad831f941793b SHA512 d07add0236dd007745473eab34703e8c8b068226622e799c6275c77cd8d4064f2e233f6fbe4b1f957c5477f0c78ece488d78114a6f8464899f6ef5a444d45509
+MISC metadata.xml 580 BLAKE2B a077cc504fd96a15a285bfa9dc8d6a2fecd237756d8e61f9470ac8fdd8dd1a95c0072dd63f111d81b303fc41ead5abe3cc01881fed7fcb6aa05ac426b104b946 SHA512 6d1a833f1d1ba63bdbdd7d533ab86e9393e35187651ffabd25958406cb618128907bc5ea58a1d046bdfc9b82ef76e4665cb7508596c7312484613d31a8a86900
diff --git a/dev-php/symfony-yaml/metadata.xml b/dev-php/symfony-yaml/metadata.xml
index 29f464615931..fa154916059b 100644
--- a/dev-php/symfony-yaml/metadata.xml
+++ b/dev-php/symfony-yaml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index a142affd1060..343b9503adbf 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -4,4 +4,4 @@ AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7
 AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
 DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
 EBUILD theseer-Autoload-1.26.0.ebuild 1869 BLAKE2B 1c74d34ddb15bdb822076ad8563a63fbadeb1aa09cb8b10c621d7cd5f9e007643fa113942c8b0bcd68ff8c7f16e7195eb4028c4f5ab5ecabe0dd221171ede319 SHA512 639bd20b7fa4e5908bcbddf1649d3c911096f1e7bd2c630c8d9c3e12794cb95f37f8fdbac3fa133a5069a4f88d180594fb9287a2c5ce42a602efd2130eef30d6
-MISC metadata.xml 344 BLAKE2B a6462dd72123a37e3dfc8b34b3a77d2b1e961540d4a060a87a737bd23354ec272651a6efef3ea1a01cddf223138851d6d9c8ec1189098971f1091643a40e7980 SHA512 4afcada292a327c5d9282a5a3efc8e67f44be40c84ea02379a45cde08155655ef90ed2022d16384565352763d90722d320c04fab1e99a39280d95dcbe4178a3e
+MISC metadata.xml 344 BLAKE2B 6de9b08e902efb12368cca1d23ba9f17e22aedb613cdc2e5de7a6a0412af570dc4cf3b0f0ca6371574c9587c4dc59393cceb2edaf678ade5fdfbba205cef3476 SHA512 78c9486aa19c85376809e7910c6ff0ce043fc629a483cba29e64f912f08ae314bd4db27f9a2c3a6aa557e8b4e38b954476dc65790b9a44e610e1d74b428e003c
diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml
index b5b10907e1ee..667fdfa8de4a 100644
--- a/dev-php/theseer-Autoload/metadata.xml
+++ b/dev-php/theseer-Autoload/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest
index 25c8e7dbbf45..aba7ab1e4e47 100644
--- a/dev-php/theseer-DirectoryScanner/Manifest
+++ b/dev-php/theseer-DirectoryScanner/Manifest
@@ -1,3 +1,3 @@
 DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf
 EBUILD theseer-DirectoryScanner-1.3.2.ebuild 569 BLAKE2B 9cc7868d3e01379bf6cdc8004a18722ae44ceee0f8378e3b411842e9d6f6b327ed3e2d2c3471dd4d3391b525e46f107ea3e0d6406323229de50dacacd3fde250 SHA512 c69db59545394701099c913ddf3217ca5d41de653f3397f598739ecb3b6e858f9690a2962868c6d22e81461116b80d21806e9264717740367375c96c92f94026
-MISC metadata.xml 352 BLAKE2B cc33c579159a7fa283be2b868e0caef309f4bc6f1283e77ac845904aaf0179a6b55f2e6bc3e3c51d82f001dc48f34332bc81064daa6c728826abafac142c5ab9 SHA512 5a32b870b9363ed96e504d73a1ed59a457bec9430f57b65f287a37f3024bd6f233dede113a4f5c40a5ee8b537c23e0ea681cf1b328533579fefca0dde1d1aa2e
+MISC metadata.xml 352 BLAKE2B 826141ca0e388135b0d4c4dcc3fd27e8c3f1d2ba34a62162209882cc6f0555392ae48844eb737fa6866762551bf3ef1ffe2a930cfff2088eb09d307faa3c8f0c SHA512 7fd0e055d4ec27bee84b621cdbed8f276c0f0abc67fbd7548a40d1367cd8c682a2e286f7b85341b4509c711845a1c358d23de02e6fd9eb9738f9425736a80953
diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml
index 39ec8ddf1672..d26b2c68d2d4 100644
--- a/dev-php/theseer-DirectoryScanner/metadata.xml
+++ b/dev-php/theseer-DirectoryScanner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index 6fb2c1a02db0..1c2769b6c0f9 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -5,4 +5,4 @@ DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68
 EBUILD theseer-tokenizer-1.1.0.ebuild 834 BLAKE2B 79ca12311b476cf6528502bfb4302b7e4d65a96c20e9c5c18494bb52d898181099730d78dbffaa6d0e2060c993b85c2629c84269c1e9629df396058c5f2b80ce SHA512 9cb0686954506ccdc4ce6a2e972bf54c482e260205700e521085609872c88f7d59fc966077a1ba062d621502a2f59d5048f2af2279ef08061f7b42a19df655e2
 EBUILD theseer-tokenizer-1.1.3.ebuild 834 BLAKE2B 02ed175c1a5d4c8395b1d049125316dc19a1b87404ca27950869a0ea7e98972bee58ea656f386341f6d623627c797722e69861f59dc96c280296423cbdfb3ac2 SHA512 9b5fff439ac870a1cb80cab1bd048207616bd810e627e4c8c1ab72080565888e12b626d670292d68574a814444a6e299c4feaf073aef1b6e4df0407e9656c95d
 EBUILD theseer-tokenizer-1.2.0.ebuild 805 BLAKE2B aed1ac6e06ed8cef37bb091daca130d9d7f2bf9e64a78bde0b9c1b539fc869283e8c3ded87944747e23ab9fba7cac64af226f514f26dadc18a7de2d520e96133 SHA512 87ba6d245b5a0f1451dec4cfd3cc164e2505cb8816a813043d89362f1d13236d453616d22978d443cd82f5a08e7b5fc7ace69badfd24fa0a43054e7fb8c0fe10
-MISC metadata.xml 345 BLAKE2B 93ce326659b030a5d9a46549917bb20f1d27846295c184f427e74e299c70f0d9a58669e5d55de719450adf42c6875e9973578f0843ee8ad79fad492885b58530 SHA512 a6224af2b7f41515a4fbc5ea420865d50106dd0d21e37d245e89d1f0ed55d5a9cf5cd53f157c841c868795fadc9f74f8b30e76cdd56731dfa3804368ab234417
+MISC metadata.xml 345 BLAKE2B 00fc567d4c2a299386f12b8ef965350b96c728f13ea8cbe8de3ef1f9679c9f8a0d8589c30848730958912423c924ab95b5e2736d199e4b3c3f2390e874e96788 SHA512 d92145e182ab3fb70af9692db83adf85f4ce93e1f5161fceb5d5c454bc76385089191be7a6536c1bf3af868ddca1c93db605686f57fd7127694e2bff4aab63fa
diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml
index 5e2f8abe6e8a..97cdb9aa384c 100644
--- a/dev-php/theseer-tokenizer/metadata.xml
+++ b/dev-php/theseer-tokenizer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 508b75778009..7269b54b3c74 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -4,4 +4,4 @@ DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f77
 EBUILD twig-1.40.1-r1.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
 EBUILD twig-1.42.3-r1.ebuild 1381 BLAKE2B 7eed6dba35c53dd75bc0537106c71f21e884098dbc624e6a0bb74c20df3e8b9a9470a4b0406db30552b9e1fd426b35395b948b41922705d81f0263d76b947173 SHA512 2913e54cb00cfc43599ebecfbd1af319bae8e01250aa666524edd6f5f483adac859f98fcb53672f9fb87a43e6829bb8246438d1ea60202323da3086eaee16813
 EBUILD twig-1.42.3.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
-MISC metadata.xml 438 BLAKE2B 412d85f4f682c6c8e279082834468d3a59cbe2d9fbaaef1f7674903a59e68982d3ec6059f61517383a05488d7bff960ca36dbc869f588388c98511fca5662e5b SHA512 849a7ea4878de239a4454b63f63ecf3ac959ba7fb49d83b0cb60891974bb1cf2c330d27188f6b2ca7cee2f2ad5aefebeb4b914f3eb50eff4e09c973d8ca80339
+MISC metadata.xml 438 BLAKE2B 4865d9695c25c97d75d4eef4928b5b6aaaa0078e6330f9d03d42139af01c4c9ea8838fab9d67d46def8d3050923b1d732515a1c807a45818de8d77f657dd3b21 SHA512 05bbadf989160c4138a7da304168f425c4f66bba70764e6970e37b6278d3f366fd245d2ff6e892fdad3d14da82223674ffb8ad808614e47574bfd7726b335e91
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 26aeb448aae9..3a1ebe231eea 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-php/webmozart-assert/Manifest b/dev-php/webmozart-assert/Manifest
index 044ba43c2142..7f2b028a36f0 100644
--- a/dev-php/webmozart-assert/Manifest
+++ b/dev-php/webmozart-assert/Manifest
@@ -3,4 +3,4 @@ DIST webmozart-assert-1.2.0.tar.gz 11866 BLAKE2B 86cb0f299efff9822ea79964153b173
 DIST webmozart-assert-1.4.0.tar.gz 9241 BLAKE2B bbe5d42732c99700f11db6a3a8b6d6753d60b3e6fbfb8412383459199139f31e3ec55e4abee03295adea19c9c48edb0f13a11597b654fdd0de0a7823ed545586 SHA512 1ed2328de800bb98b7c00264009182934006ae146d86aa313f3478b9f3a7e6eed9dee026ed80d18393724840711ecd9891ee34178676470d12cac8124f819309
 EBUILD webmozart-assert-1.2.0.ebuild 652 BLAKE2B 48dbcfc8e9ec45034fd69cf8b8bc7a765b7225c5e4576d1589621591d8a7d1cfe99de23f8f18bfa33cc5c8e4badac8a85497e25dce8abc5c0d5db88e39e459ac SHA512 33fd42609aec1f4858fa49eb4f20c329e8a2ce30f9ef0dfafab6206d754f2f711f39307067cb5fa41f03715acfaf50504bfb0aff57673894fa0718f07a27aa3a
 EBUILD webmozart-assert-1.4.0.ebuild 660 BLAKE2B aa39d00b2bc04c94fc3429bc16cdf8674eaa9cd135554c87e1b247fd5ee6ea762bf5deab1681ab8c36c1c68c7705f20814affb2e40ef70144ab36d645c8a40be SHA512 03798afbc67ba06f1473d4b8003e3cb6818e4a81bf7075f43af2a1bb676da155507f57470154bd825af175a95fb5e9321d4ebaccf96b141f01670964ee633b50
-MISC metadata.xml 314 BLAKE2B 4fd853abe0d4a1c6d7f1e64b55116e8e02d4b800ec5ef7d7026a004d634b5c50dc40f8f826465dae59138cc1bad91ff842cb0cca348fb8d8acc9b3a75ca8cb4c SHA512 fad867b572c3a97beb2cc361fccb6cbfe6ca7c9bd421937c99783f25287cd2017df54b8d7b5f067a1f65528d3bb284140a9decc3701e2ef753cf6eaa4c2511a1
+MISC metadata.xml 314 BLAKE2B ad8f5099c1142c4a8cc9d7cc505be02444bfaeae7bb6f4ab62dae755fb6d6ff9bdeea09c0ee0daa3812faec44134d28d4af90f13007c0b0e36cfcb6e77b32324 SHA512 46f3e8a3c02c73bddb6e7a46d9306982db92e07d688d9c0899832b509d5c10e6b2229750e71335af94f8701eaf4f3b60bdc2f0a8304850180d491b98adc1c7be
diff --git a/dev-php/webmozart-assert/metadata.xml b/dev-php/webmozart-assert/metadata.xml
index 9e8b6de4665e..0988eee357e7 100644
--- a/dev-php/webmozart-assert/metadata.xml
+++ b/dev-php/webmozart-assert/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest
index eba4852b308b..8f8719911db4 100644
--- a/dev-php/xdebug-handler/Manifest
+++ b/dev-php/xdebug-handler/Manifest
@@ -1,10 +1,4 @@
 AUX autoload.php 273 BLAKE2B e898a6f52339faf4a22f81207bef6a9c8620e5756b30c462f420f8b6c865ee7af33f3d23e7b251e096f25882310789da5e2f50e064ab614d59eede463befc26a SHA512 a7a63031a709deaaa2cc8a673f22252df716fd7e2d531e6207052dc3acb361cb8384e7456b949e19e00753b9693fdd0d7c65e6105c7f32d86b8800b4373ab57d
-DIST xdebug-handler-1.3.0.tar.gz 12363 BLAKE2B ad89580e57728a444958d72f236fee14665f6fbed998018a28b181cdfc3a448da0a06dc335c3d95413eff6f6b92fc3d44ac8c03da282eb3dc65ae14600430825 SHA512 ed0206982c5ffab3c8ff56dcf8055230aaa358fbe89c15880cfce33abc27adb3b13f75bf7d78988f6bae4d0d072c66f557cd93082e89e7ca7993b257c04a2c61
-DIST xdebug-handler-1.3.1.tar.gz 12589 BLAKE2B fcee0a2412473f5e7a07defa96b991803728f831c8ab0dfa053c3ff8671a2dd187d5199e51ac90579830f5a005038411c2097be8a1f1370e8e06d090922f508a SHA512 a00d9cb8e23cd6bbad6c25f82c8db314451a88f49d90e755a9c81fa57794ecc79612481e031d60cdb2ee4fd4e256ffc02e847c76089daf720f8811659799131e
-DIST xdebug-handler-1.4.1.tar.gz 13190 BLAKE2B 05637bbe52896f779026258e5b69d6fae03d575e8a497ea983fe67354af6277a7769ec32ce3c10682ce2f654c135086710836005561211b04958546180228d50 SHA512 ac79debf0cb6a31f90354115b6fda1d373b148691dd0b86044ae7a257f2fc6998a773e1b150519d12e6dcbeddf326ed38f9b8fbdc0dec736ebfc4cc6e83a462d
 DIST xdebug-handler-1.4.3.tar.gz 13660 BLAKE2B 2edbd2755102ced0183e6d7ade341ed830b4c1d923f453868d29f39aa7de5159758fd162a369246adf4551a8a06c0bc6f1a29921369e47ba645f9aed2707a5b3 SHA512 ed92ca769276e66611de3cf9d44a03fd163516b973486ac5339dfe9cd9fbab8fb5f754799f59505f03aa5eb4ad175e804c6e61d0a5db63a558edf7ef1aff438c
-EBUILD xdebug-handler-1.3.0.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
-EBUILD xdebug-handler-1.3.1.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
-EBUILD xdebug-handler-1.4.1.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
 EBUILD xdebug-handler-1.4.3.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
-MISC metadata.xml 476 BLAKE2B b4633f1f38fbb6e7a1a62cae819e0ac0ad72171efea4a371535b0728cda77f4ed25a98af77552125b9b02b8dfe2e8c053b23bd0af32286d0faffd626072bfa2a SHA512 45602542f487a5670b3ff938809bac80bdb5c6875549f31704a0e3b319128b685c51aa6fba145b393be20ead836582f24ccce3fd212c9c2c09979c6024524880
+MISC metadata.xml 506 BLAKE2B 157d7956eb9b73d81fa1ce8a11ef4dd47823dbbf90e1b14faac17b5e8ac4123bcc2251853a2734d78b2bdee40fcd48b12965fbc4e944aaf9f08505f7b46fbe19 SHA512 357e0451d64f922af8c28a37ab95c9004c3b2eef8c2a2f1fbc767b30b40e38103e9bb51f71d6039e043cf702d44d528885ed5345d7ced0fff93c118166eb447a
diff --git a/dev-php/xdebug-handler/metadata.xml b/dev-php/xdebug-handler/metadata.xml
index c8975b897e71..3572103e75fb 100644
--- a/dev-php/xdebug-handler/metadata.xml
+++ b/dev-php/xdebug-handler/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.3.0.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.3.0.ebuild
deleted file mode 100644
index 806a747fbd38..000000000000
--- a/dev-php/xdebug-handler/xdebug-handler-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Restart a CLI process without loading the xdebug extension"
-HOMEPAGE="https://github.com/composer/xdebug-handler"
-SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2"
-
-src_install() {
-	insinto /usr/share/php/Composer/XdebugHandler
-	doins src/*.php "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild
deleted file mode 100644
index 806a747fbd38..000000000000
--- a/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Restart a CLI process without loading the xdebug extension"
-HOMEPAGE="https://github.com/composer/xdebug-handler"
-SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2"
-
-src_install() {
-	insinto /usr/share/php/Composer/XdebugHandler
-	doins src/*.php "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild
deleted file mode 100644
index 806a747fbd38..000000000000
--- a/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Restart a CLI process without loading the xdebug extension"
-HOMEPAGE="https://github.com/composer/xdebug-handler"
-SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader
-	>=dev-php/psr-log-1.0.2"
-
-src_install() {
-	insinto /usr/share/php/Composer/XdebugHandler
-	doins src/*.php "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest
index 1d028f4e1932..aaf76293ea04 100644
--- a/dev-php/zetacomponents-Base/Manifest
+++ b/dev-php/zetacomponents-Base/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 2999 BLAKE2B 7e178de212e6f26e621509ced47998bdf501df0a7ece33f98b943c5bfcc4ca32a886e0a09cb83975f83148a29736be50298281f302094f6fb32c91a695c97d76 SHA512 70f2f358fffd4b9d7a9af07badf2e000974ddbde9230797ef4cc955a73326c665e947278ebf3967d81b93c97805293ab230aea7aa3bb98a56d7a3c34cf20be94
 DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05
 EBUILD zetacomponents-Base-1.9.1.ebuild 591 BLAKE2B 46742e05fa84bad59fd2634b0c96a646f129a35c7977d4ab8c69269e395106fef81efde3805216364d807a464dd6c5fd4b5e04cb21e77f1ebd2f9801aaa04245 SHA512 b0122d1d9418b572176cf818e4fd41668b54300bc9db66305d4dbe0d5036cd2fbb2c3c7355ae9f862717c4cf3cbdcabc2faeef98fa66c88e4e0a460ae7dfbe58
-MISC metadata.xml 347 BLAKE2B e8a48007cb1f9901276411018f45a5876d2b23e2299f2462542eda461a936704f47db5c8582a127a26f6811083bc7e8d83ed54e7a970092470a114da3c25a82e SHA512 6edf189396de4ff53200c4420843109d5e24b70f1562a8729850665384c8dc68598ce71fedc4e8601012c66954cbb501a7ecafe751e8230107313c9ae8d99cc7
+MISC metadata.xml 347 BLAKE2B a9acd89ca0cd77e41337e6d1dc6a78629ff18c38ac6b40143ef083c061899b5de9f813e732c28cfce156b5e38d04715c804264f05ffbc9f354545da7fbf0fff0 SHA512 ab3fcbb02a479ac46bc6aadb729107b56c73ebf9d204755667a844276a5edb1d0ae93cc409e42ffe26a46c13388b6aa9f31e3522d4bd698650c4da4a0e2c42d3
diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml
index ebb455ac49df..0edc8ccac85a 100644
--- a/dev-php/zetacomponents-Base/metadata.xml
+++ b/dev-php/zetacomponents-Base/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-php/zetacomponents-ConsoleTools/Manifest b/dev-php/zetacomponents-ConsoleTools/Manifest
index 3887951a242e..925063ee5b47 100644
--- a/dev-php/zetacomponents-ConsoleTools/Manifest
+++ b/dev-php/zetacomponents-ConsoleTools/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 5729 BLAKE2B d5bc237ca40ba53da13e5c4781e7aab556692e86e02f53aa97c407a4600552390a3160cea2deec437af5abadc116f0e840ad337da4d396c6947daaaf5d258616 SHA512 49443855b2cdd5c01b98b232c2afb7a9e7a689abb40c001466fcbc502c25c2239aadba07849ad64787c7269e8408c202233d40dccf1cf7a981ddd2f932e91ae9
 DIST zetacomponents-ConsoleTools-1.7.2.tar.gz 932028 BLAKE2B 18469bb11af5f4facf7892df765c9511c699c2f362872da7db13dee3a380286a306809c90f28ad4bc4cfcfa99135e7d35b659a242f507afb91b84fee17d16f4a SHA512 871c9a6827c3cc77275b538dc09d21135affe1f06364e83a7a27b7a9eff4537b509e72fffe3d5f6b1ebb0086d489df2b29af276bdbc0276f163b1f9168f82253
 EBUILD zetacomponents-ConsoleTools-1.7.2.ebuild 629 BLAKE2B 5f3cc2eda1c38db9a95a5598f806ba719593b56631926253b2cd6213739fe9e826cb05e270d3f0f4667a2af4700083834847526ca25065275b88e05ae9394a25 SHA512 01712826e75327ce58c8648cab93ab18209c7f0383de49930dbf58535f5ba6d941b49255a3122b8cdeee4e315640cb52f3a959572953698cae633248a302b267
-MISC metadata.xml 355 BLAKE2B f76f774107128bbcbf2da848613cbf8d54eddb82b0c7398fd0c92f14c0f5e391a265372078b2dd5b46f693bca00ae4f35812566d82faaf07b89460e3a6119f18 SHA512 235ab45d3399014dd2427c38c7302b7a0e3203d5f40191e2ff2b62960dd2438e78288d4edad472e809a33e3f667f3c3a24655c3e3318706b52681193b819340e
+MISC metadata.xml 355 BLAKE2B 1d2e5bd4e9256bf0d229e0f0751ce71d2055e005708b2868e2c3db7ad9350bb43a5b37a288ae9803b283c87dbbe7131717a39af12d8b905b373fa6feecf8f71a SHA512 099537f1485fbbc9479f2e051be320f76c74135c631da3fd88da9a6bed4a99cebe5bcbc83242af814c2bf5d06304391082b5f0dfc57e5259da4f1ce603a9a4c4
diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml
index c6624274a367..e795f5a99f52 100644
--- a/dev-php/zetacomponents-ConsoleTools/metadata.xml
+++ b/dev-php/zetacomponents-ConsoleTools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 0942692b8e01..b9b8e6b4902a 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,3 +1,3 @@
 DIST APScheduler-3.6.3.tar.gz 96309 BLAKE2B 6dcd49ec3ebe4f815a7fd2594c438dfe99d9de720a4319a3c7c202deba1235740e478357dd78ef74ec3610652b23a58f23c1188fcddb3b2e48b160895f3ed06a SHA512 4c348a4f37a7973633554a69635f334b3c293c8942fe853b309b4b65335f5d4d553d7d42fd4661b0e6a36f5e97446d296a2c8971bdb51dad3bc8ee6b6d3b20ba
 EBUILD APScheduler-3.6.3.ebuild 1830 BLAKE2B fba93aa327d6526694a5ac7dfde1f5119813b7d56ed557bb85e68482d2dc2c1f928508fafb924e35684650f746bf497aaac78bada2f89b90d9f2f2e22f05e6de SHA512 16325c915407ac6462046e7621df791c2253eedff48776b7f4b267e06b14c1d18e9f636535fef51fc7773f38a1c14eb21a68bb0b38ff00e4ca23a0b37d18a543
-MISC metadata.xml 353 BLAKE2B e0c141ff0ac5a9f98c3b55871de97976f15324b722420a8def45a053b2fdd0b992c44bd6d1c4824c479700871951423ff13f921043a5dd8770ae73a279deac9b SHA512 48d42b0d3fd5ab07ecbd8554cef11d06bf5d7616e777d6e76103699f305f9aee7bd8618294d5548a62815a621bd4fe6ac4d32c008b79ac7f7334d6a29a261008
+MISC metadata.xml 403 BLAKE2B a9cb9d18b06c206a2a3b89fe6a460dd477db5d591fad97138226e9caba4fd73512f47fc13d23b383d868cf9ef4cee74b4b2140e5ebb51c8c8cc765bad8c64c20 SHA512 b029f17fe0d3c8ab572fc92c45c41659c3c3dcf5bb487d1c862d65fb9f1c4215bcdade0958c3044117c97ca2442cb08dac89b3cd2817f143f807a608fcec5004
diff --git a/dev-python/APScheduler/metadata.xml b/dev-python/APScheduler/metadata.xml
index 345688745de9..0186fb52b907 100644
--- a/dev-python/APScheduler/metadata.xml
+++ b/dev-python/APScheduler/metadata.xml
@@ -1,11 +1,13 @@
 <?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>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">APScheduler</remote-id>
 		<remote-id type="github">agronholm/apscheduler</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/CppHeaderParser/Manifest b/dev-python/CppHeaderParser/Manifest
index 33b7c29bde5f..080da6ce1a20 100644
--- a/dev-python/CppHeaderParser/Manifest
+++ b/dev-python/CppHeaderParser/Manifest
@@ -1,3 +1,3 @@
 DIST CppHeaderParser-2.7.4.tar.gz 54445 BLAKE2B a089df97dcb9aed7821614bf354d0fcadd67dfb387bf5873c585683401d531e465bc05631147b4d5c5b47fe93eecbab1faa34fb517bb92bca6d6c39e07c316b9 SHA512 223550add1e391eb535d1b8be08a54b9d6fe97ca6dbfc54407cdc17a5530a91ef6be4ac920d6841b9f479bcbd6c823512b08565ad433f62a87e993cf393932a2
 EBUILD CppHeaderParser-2.7.4.ebuild 437 BLAKE2B 5c05994d4c79b91744e20a330e143cd0ccfb9e6707d43d07ba20ac535f9779ebdafc706394726bd14ee906a0577eaaf734dc31e9ff8733150cbfb57b1c14556d SHA512 045ecd04af61566667c0bc21b5b0f39d7b5b9c654fda9354cdfb9a648d2b6d6e324e30c6d5fd2109ed3b030c79f302be02161bdf64bb4f45bed4cad553ccfab1
-MISC metadata.xml 571 BLAKE2B c3026a1089bea1b5170fa389ac89a4ccc81884d2ad59bfe034d672ebe6a20920a2ca1376ae2615cb7bad0c75263bc854c782b3b79e934a98ee356310e5a90407 SHA512 46870c75a9f2a146064e1662c6abc504683240d9f88da218b8354a353abbaf9562c92ce2147f56dced4e6f258af34014b5196ab80188635a9de660c71ed5532c
+MISC metadata.xml 585 BLAKE2B 4c3991dc4282c3f5cc79a464a6c70ef1de00dc362302c7e02017418508022215a50be0889842f11f946f1253344874998ec50a48df165feaca168c389c6094c1 SHA512 915be82d315f5cd592395f275e76fd0ac253640cf503c59837989dd9facacc65bea240e3d6145cdc38e5edf74cc3fcba6ff8146b9c5d7c9f9851e3aab9542801
diff --git a/dev-python/CppHeaderParser/metadata.xml b/dev-python/CppHeaderParser/metadata.xml
index dd2a48286565..61f70a8c2a71 100644
--- a/dev-python/CppHeaderParser/metadata.xml
+++ b/dev-python/CppHeaderParser/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-python/Faker/Faker-6.6.1.ebuild b/dev-python/Faker/Faker-6.6.1.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-6.6.2.ebuild b/dev-python/Faker/Faker-6.6.2.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 7d0e5d81071d..78f2747c2b99 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -3,8 +3,12 @@ DIST Faker-5.6.5.tar.gz 1058615 BLAKE2B 2a730b79ca11a80b33f5249541e2de68e5c53832
 DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e30da92072937308341f22151764c8a72361c93112b5818dc9858e8e565ab2b45bd0fabc9e59613c1015e6ea63 SHA512 8ae2014b27f07b41afc67dc9a3d65e39f1073987c0c4bac6da5d625145e1d43783e4134bafdfe4e94035be9ff4367e5a19ab63635bf8ce7ff353a8745cf96269
 DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d
 DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47
+DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a
+DIST Faker-6.6.2.tar.gz 1115505 BLAKE2B 40bc09cafa1dfdda05bbf6c78380c5c3c0de85157dae856251063b0f099e32a08009a223dff70e3b3c037d572e4249cfee942b8749f78bd52506191dc180a13c SHA512 b6b75fd1891644e49d47acacfab9e705540003f18a8df413683e7ff0a3fb1283ede9f6020b19aee1a242a4a002ac1a34713701f283aae2089ee52d84c00764f4
 EBUILD Faker-5.6.5.ebuild 797 BLAKE2B 79802fa2f75b54f955f02417689548235864e29e38d53afca8e80f5c9d07327daec7f9a877440420ddf80a3e63a873744cffabc9022715519abf75f4f4660a69 SHA512 4d4cd1bb4f17dfbcd41eec4e5dadc73d66438ae552ff7be1ec3dba2f8a61c13d902f857185df3d3083a53adf144ce4407d2ca95be6cb7d3bf3661326bf478501
 EBUILD Faker-6.4.1.ebuild 682 BLAKE2B 592c09b3f0caa3336c660c348a9a2cb09f6eb2e97a5d5c7594fd4d8d884062cea8f16d5c27867b282f59565dc0ad075832866f386158d6ab553ff68126f5555a SHA512 dcb4a5100c6b5779d283890a98c4bca15a1d77051e82802c0d4ab3eb264b2fa89b3230958b02071e367b65a9bf489a2de7c13aa79bb901ac886b4dc03001cbfb
 EBUILD Faker-6.5.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-6.6.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-6.6.2.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/GitPython/GitPython-3.1.12.ebuild b/dev-python/GitPython/GitPython-3.1.12.ebuild
deleted file mode 100644
index 9e290b1a5529..000000000000
--- a/dev-python/GitPython/GitPython-3.1.12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5
-SMMAP_P=smmap-3.0.4
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	rm test/test_installation.py || die
-	# broken with git 2.30+
-	sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.13.ebuild b/dev-python/GitPython/GitPython-3.1.13.ebuild
index f1e63e903be0..ef1dd01cb94d 100644
--- a/dev-python/GitPython/GitPython-3.1.13.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.13.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 3cd7a67745e0..5384a26e9629 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,13 +1,9 @@
-DIST GitPython-3.1.12.gitbundle 8721154 BLAKE2B d00ba18e53797ebc2067de8422506db0fafc27860cd3f99a36ad4740956518cfcab98d8211d595e1347c22df3d0ac13557881f471829c429db1527099f53438e SHA512 c84c76668bbc593998cf834d18d0207ae282cf0fd6fd22e5491435884855bb2b6699b61e51b35e6bbcfc4cd2f3c15aa9b435115fe5b0957ab4c63c7aa640ed6b
-DIST GitPython-3.1.12.tar.gz 171126 BLAKE2B e74a613f5269893f29f41add6f39c34497613b728b14c4c65c5fcbd52bee52a2ef53c4db3bc63f843ce4ec1e63f3988029852e9195677db32b704d0429480130 SHA512 4a2915991831fcf0dc0326d9e9be0f06fba1e93560d07c19fad5cbcb9ff04262e7d2225c5174a8c2f55e4c44b1c027bec4ff61d7dc137d8bf110ab96026742cc
 DIST GitPython-3.1.13.gitbundle 4434559 BLAKE2B d8a2478d40f908d7913d08a3a5e98bea3a50366659838a8d3ec335ce7864e7ddbe290de0581b7c4315c83f1cd9ed517af06a7b9232378ee299090accde0b595e SHA512 6d62488a3c9ff66b4f25dd3f1419835591379736ca3faf57055121a8ccb5b8da933e3b37836a6da59de29cb62b03ebef6c38d7387c86dc95da2206024c58f289
 DIST GitPython-3.1.13.tar.gz 171249 BLAKE2B ec653a40654e42d93ba552e1b0a40c5241cd7f86a110f1a0570d6a3ca35cb7522955650a171a8a4113248e508f84a4f5cd021edf941fb41057aec01ef6f30194 SHA512 9618be674e592e3653eb8f59e5878f72b3583d2052184f6321d24130e4cdd16236c9ee4823ee38036c2361685d78ab7ed79660746506a8f98285ab776e1c98b0
 DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e877bf3dedde61665754c1d4b14b98d0ddc863666ff1dceb313174a908f8fbacbda0586e53e874a1397e6eeb562cf1ddf1f SHA512 ecd570bdb85dfa64f42ce447bf381868d584eb56897954d893ba1f1ee193fa4e45f3847fe842a67276da0cf155a2501ed4c25d34d300a9776b0f068b659ba014
 DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675
 DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
-DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
-EBUILD GitPython-3.1.12.ebuild 1680 BLAKE2B efd292f601d6f32ceed82c3c0c05f4c4a20682e2e41ffa1b2acdbe9965c2fe6678981527bedeb75ad82a1d1ba8d30dce9fbec219938d7c127236a559a05b7cab SHA512 e308352b1cac84b55de08c8b9ac5726d5c3c24f04deac6e1c48bdec8452ebb1a7846a19e29480219ac185813dadebfd536844d67b35f4d2d78ab2163bc08e036
-EBUILD GitPython-3.1.13.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
+EBUILD GitPython-3.1.13.ebuild 1690 BLAKE2B b7cb06228a18a6458c280ace5d2ccb81970600d4bc4dabf8729d83968d2a85adaa95e2b4a46c116299fd3f8a12d0aed34e465a5a86995a4e8101861390ac0abe SHA512 955e3ac9e207b59d86155794ea933c81bee0271e2a0e73b053b48be8b084d01a8dbb3cd00770507165d1ab66a01535d0dd5e05029f9fe3e047eff0e663f86a54
 EBUILD GitPython-3.1.14.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c0b68158f2e9..f0c88fe75d38 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index 861324ef18df..f7ed28011767 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -2,4 +2,4 @@ DIST MechanicalSoup-0.12.0.tar.gz 44505 BLAKE2B 7c303f7ae4dea12157d5c845a4dcdc69
 DIST MechanicalSoup-1.0.0.tar.gz 47572 BLAKE2B eace6cc4eaf50f01f8a7816d4d87a9345676b6921c8fe46b3280ac83463b241b2e6175b91ee1a5f907635c07ee8cf66324cb2e7938736b81e9a4f849f9159548 SHA512 00e2c5220c065b517301d9381a9bc5019f6f75dc5951a5ab4427fd7939b296b6b33a20b8f8a7e82c6feed2c9100e3481f38a424d63065883d71a6927119ad88c
 EBUILD MechanicalSoup-0.12.0.ebuild 1135 BLAKE2B 1838a181f145a30f89545ec6c6543a878010e547cec1251a336dc0d36ef2d1acd260d6f9bba3fc7c8d5763fd85c1e7570823075b1fa2f3b1bb649036922cbdd9 SHA512 50fb4c0601fe528d8e3bb47cfd66fcf8f67fc808673ed761d7a24e209f0e5189c18fd4214c22e4fe50947a47dd480b0a558340c8c605310ee6146df3f8d873db
 EBUILD MechanicalSoup-1.0.0.ebuild 1135 BLAKE2B f061513d3ce079c5f3d8fcb6a6f643061a51e9009cc23a63eb2412894d8a452e5f257b3f9fe7d4705e765eaf63a8aa689635caaa8cc3923532f4a67ac1be6c03 SHA512 78135892a45d7929c21d66b5914fcf5764aa1cf11b3f068efb2f419299d87946425a8657fc1595b34f768c80eee87110474a4b20553d6cd2e05d46101456a55e
-MISC metadata.xml 550 BLAKE2B e580cc1c3eea5cd7a96ff564c5bb7606498911f997c326cd962ea54e7c73e6521b08d22a7de40f5a7784f3a6386aaaa6d8146ce64d8bcdc4d5f3f42a1855f821 SHA512 cf6d0689bb22256e261d2b964ec9ad05508467f68a115ded56b73fe27dad9f15f53a202f6c71e36b6219a5e79d99e01befa04bf239637f16ced3658d41d06314
+MISC metadata.xml 550 BLAKE2B 3347d385f75d19c6036e5d71f026deb04eb968d746287c4eb54e14637b6d5079e05dd2037cc4772545992916fe25f545f64b4fe857ebc4b430522e0015bfd65a SHA512 d2b155b167ba76c4aeab5300efe8350407fd884374fbfd8575820e047ecb51acd79ad2112b84e6904ea42d79847f35f50950a2080c8f2c20a621da519023357a
diff --git a/dev-python/MechanicalSoup/metadata.xml b/dev-python/MechanicalSoup/metadata.xml
index 1565f268e779..1376b0b222f3 100644
--- a/dev-python/MechanicalSoup/metadata.xml
+++ b/dev-python/MechanicalSoup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/PyICU/Manifest b/dev-python/PyICU/Manifest
index 81af794129c5..3e615e08130f 100644
--- a/dev-python/PyICU/Manifest
+++ b/dev-python/PyICU/Manifest
@@ -1,3 +1,3 @@
 DIST PyICU-2.6.tar.gz 233826 BLAKE2B 318b87b878f8d49f47f48780567751671f5f88902c4cae9a243a81300b002ca6ea2336aee38bfc76a3037326f15f197fd71819173b678c68094d16f8db51864e SHA512 ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
 EBUILD PyICU-2.6.ebuild 470 BLAKE2B 360a7ccb50faf72ab2bfe751cd3131691f7c065649adcb70ad3c68cd5c36f0dd636beacd28da8fe668d69234283430cfaa11906b131ce362be3e297b6cd068da SHA512 fea40e121324b7df6309e6a01324c0da95c21d651458ae4065640d4a7ead4d1063c15cde1c4b30c0d320452416890d97580c007c6aec6b7e1706b2e1231277c0
-MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
+MISC metadata.xml 366 BLAKE2B 391119c12d296e145d3a29ca1aa651e0878cdfa4c91125b53c1bdc116ba36f96561edd9be0b0ed40e9bd4396dfc838011acd3880a6602589ff2626b07f08e77d SHA512 10e828ff3586ff4dba1f9abd875f16427a21ec1dcef9908b40bd64f26ae055328cb14863d2935c5ef10a72f602f1b3a13f8aa76799d2466a94a75db9e08da029
diff --git a/dev-python/PyICU/metadata.xml b/dev-python/PyICU/metadata.xml
index ce15e15687da..7110df2582cb 100644
--- a/dev-python/PyICU/metadata.xml
+++ b/dev-python/PyICU/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>marecki@gentoo.org</email>
-	<name>Marek Szuba</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">ovalhub/pyicu</remote-id>
-	<remote-id type="pypi">PyICU</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ovalhub/pyicu</remote-id>
+		<remote-id type="pypi">PyICU</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index 291ee898ec35..fe16695a5e36 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,3 +1,3 @@
 DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659 SHA512 8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
 EBUILD PySensors-0.0.4.ebuild 463 BLAKE2B f1dfb8004003b93c2d31b58d611b4d7a01bd3dc51fbd882863934fccde8de566884a3c5a89f51be31f1fdb4aa68eb245e4fbb05c1b5c840360bbaf8f125c8dfd SHA512 c2a96ff6161ffbbe1f7e30bcb4cd4a4f7e7707974bf7a045832af84c23424668868bfa2091a7f095fdaca3eba40e13423efaa19a2d332581468d6306b1bdddc0
-MISC metadata.xml 437 BLAKE2B 42315c93aedaf44d9ecfda30cabe8751e9fb8ca2621dbfcb434fda1581a5d6ba415a025c37fbfe1b03de8121bd4248aaeb6159e6850d08c692d6b729953dfb81 SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f
+MISC metadata.xml 437 BLAKE2B 268f04cc1efd918c04fe50dbfe9c058e012f91dcd98ed49a5260f985fffa0810ac287d477bbcc212a46e487db62b2781daef690554db67c9782f5820f4c1d985 SHA512 97d23b98eec75eddb92a51de3b6f5258e48770dab896bc2a6b7554f4e30a2e663ba30ac505fad9c9570e2a47bc45bdc458d0e59a62e8b29d2e3709a28b363900
diff --git a/dev-python/PySensors/metadata.xml b/dev-python/PySensors/metadata.xml
index ca91dcd4d1f1..1ae9b078e143 100644
--- a/dev-python/PySensors/metadata.xml
+++ b/dev-python/PySensors/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index a7ac01e12f29..eadb7e73c650 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,4 @@
 AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
 EBUILD PySocks-1.7.1-r1.ebuild 1251 BLAKE2B b0282817a22e426b7aec570d23b877cf03975addf3d9422b07fcf1e690a5356f9bbb2acbc347666c1e05512ac70866e318097b53e4ee6c4714ca746f4b98d43f SHA512 a2a3b0ee330339c7240843806e32dea8028a3935433567b9cbc7fadfa9857047cb77a4768ba0df46dfcdf74aac67e08970f7477cde668640426d88cf2b12f440
-MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
+MISC metadata.xml 499 BLAKE2B ed49272da46497a0f3801982987b2ca067d14fd5b062599741f196c4497c7f5689723bd56cb6f071404efd94725cb8e6091bd4207c9cd7d1ecf6ec5768385070 SHA512 0d0f290e39aefa9bc99390fbb6193e4e6a88bb573b4fd338116ad81930310366199368ff97ae1b9559acf4189fc69045cc6106fd47833bd1ffd78a21bdd9d3ad
diff --git a/dev-python/PySocks/metadata.xml b/dev-python/PySocks/metadata.xml
index ecba000b419e..60c80b67d4ad 100644
--- a/dev-python/PySocks/metadata.xml
+++ b/dev-python/PySocks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 0e3157b7e2b6..9b836307e16c 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1,4 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r2.ebuild 956 BLAKE2B 3a5efbef2e6ec3f5c2c175940f9f4825d578c57a7fa701db6ea9e8ca0441fd3e460f258e585b1b96ef28a482dfa25c31d6c9d13dfccda5c381743fb3f34d244c SHA512 b190a298d525dd9d02a3f110ef62bc40369e5d23a5c58facab74140da08ab1651f0a74a7c9e183550dba049df051aa4e70da6f049a1a1533b30bb2f06e13a02f
 EBUILD QtPy-1.9.0-r3.ebuild 4249 BLAKE2B 8d9f5f2649006c32b94f06dba70da730cf134e9a0f6ba7c69c41c86878159b60f88a5fd5c8f4b70db92215a2285ca74cd4758c2efa6c22e2bce27bc60156704f SHA512 6e4e0940b2033d8f7ce61ed34977cb5519e035d6643a86d7dae43e684503a840f6e9055d8c3151c4574d4de142b679a6a71522ff7df2e1091fc9f848ab30cb59
-MISC metadata.xml 2850 BLAKE2B 3548a7feb6ab18f1ae067a5faca9ac68735ca171c2d23c6400714a581934adcdc86910e322e606f010e7111d63263b06efea15a170c5379aa452fb407b8218af SHA512 e6139ad7820b1cbf18d322b305e2cd3e884fc5939c3cd1522f658a644701dd632c96749ff158963c4c7e46eea2898ff7e60530b17104dbe4281ad8320551cde4
+MISC metadata.xml 2880 BLAKE2B 450b5c73c1124218ba688cc9a010657d03fe32398150334884574404c1a5767223f7a9481ee42e545e032d7ad2dec8a0537b7bf3251e0e14a6696f1d0c73e0d1 SHA512 175e7a513706bf9c50f04b8795f19df660ef0e228a6d65e7c4c998c07ac181da204aedbc9905deb63d74a65742cc80d7935bcc0d694fa8bff5e386b79bb5ea26
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 5b164c14610b..582ff9f96b87 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index 3426959c597a..292b4308f963 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,3 +1,3 @@
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 EBUILD abydos-0.5.0.ebuild 897 BLAKE2B 1355c70ae281e6b3e5ceda7e8fb81b5e0f5c87fc0f3893f8edd03092a1e2846d99621681640696e0f321e6d28d2410fce5081e99cb279cce5fd7fcc8e1e02e0d SHA512 c1254a8d79e471b767c1f59bcb175fb99dfcf865a3bdb800b47e0a114046f302bae6692202169a6735860c940ba38b86a842339320ed83c7bf0816050fc5002b
-MISC metadata.xml 523 BLAKE2B e26545369a3e282f2433db497da8613a87178928384a50ddf632508e36418cefccd4a352f77e6942b2c250dd4e9d4e84bf4cf035e5a93ee8883156a6480d317a SHA512 95b83696d06387ec20a470039a7951d8a054f9e621b82c2448540575e68f0a0fa5c11cfa9fb49a106b3e13f8bc5e81029cf4d3ca4074fb1900a4dab5eb989cce
+MISC metadata.xml 553 BLAKE2B 93221d7e9495adb27d2632793d456d5e6617ef1d58b50f94d67d9d6f6634a267c43759e3f5dcb796546521d351a2c5d00a4eb7cb89eff83a1069e84119866bba SHA512 ef17084694a95103545be71478cb523cfe23afc03ed4dff9b5c01de49bfdbc9828a18f81a58980671c3bd016944b65781b15dc7e2d0edf6549261bc56d1770c4
diff --git a/dev-python/abydos/metadata.xml b/dev-python/abydos/metadata.xml
index d0ada16d5525..eadfd95b06c5 100644
--- a/dev-python/abydos/metadata.xml
+++ b/dev-python/abydos/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index c5c9836d7b55..16efe713e23f 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,3 +1,5 @@
 DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
+DIST aiofiles-0.6.0.tar.gz 13585 BLAKE2B 4b81e8369f91b0406c9bd5025c4b5da91418dc810065f1979ec862299fd16976105b89282b22a3ae2e0151cc550c927524795d3c5d69c82809faeb4e16179b8d SHA512 2cf9e340eccfef3934bbd86338a235368b99a10e34526e8267232cef14b12e3d79d40350d82874841d5bf7fd0acf779b663288c57d150096f1275586d51583c4
 EBUILD aiofiles-0.5.0.ebuild 558 BLAKE2B 887803d5fc7848bd9dedf53d1023a184823ec5e4b70ec2f47b75f39cd86a20d5f3c2843fd3ed5d985c092f4ea94eb29a09f90c68aa22738041141acc8825c56b SHA512 092fabb0391bb5d1f4dafd0e3a73092a2add492de61a6ce8a60dcc8f2e33ca0704982db72db83cf56d5717b9e73a7dbd7e34f5202d4672c407b56b09bc4ffa59
-MISC metadata.xml 556 BLAKE2B e68a3d48d149f43e0ecde9b93b845477f855f755290c7dd9ce85ef237c7cf3cebccbd2b68e95ae7ca4dc0a840032240fb477abae8dd10a8c87a7aa873eec2243 SHA512 314a2583634cf75e3253efb3ec4e264fcdeb312ae920763226eb8976e1c772bbbbebafd85a00be986a36ac0b05723e878d0140ea751322e73cf5c538b4933f94
+EBUILD aiofiles-0.6.0.ebuild 490 BLAKE2B bb2a36efd687f42e147783b49d1c5c1dea02541eddbe8c267eb3a98add168a37e1eaf2693be26602a80cd797a17bbe1ee727029b36285b1150d5e4b70ffa661a SHA512 a8e39c7aada13241ac7d2a033015a27add05cff3fbd70f74170e267e0f3ff2343b54f2400e2f5f678fde68aedcc5ec581548418f890163ad182c6552f564a466
+MISC metadata.xml 610 BLAKE2B 8d1109f3a6895e60aee18ed8a4a8118cc932f98594ca66e2442fa68f95f6998548512b3b78b74d0dcb0ef24d0b47ce2d568e97b0e554c0010a4b8f9f2ec44b4e SHA512 18fe02ca00665f20134ca3cda280705aa489b929e79a4fbee72345d994b741ea6ea27e6b9f2ac5f494672d7f85796e908357e51146126a729bdcccc46d094afe
diff --git a/dev-python/aiofiles/aiofiles-0.6.0.ebuild b/dev-python/aiofiles/aiofiles-0.6.0.ebuild
new file mode 100644
index 000000000000..abe5dc248060
--- /dev/null
+++ b/dev-python/aiofiles/aiofiles-0.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="File support for asyncio"
+HOMEPAGE="https://github.com/Tinche/aiofiles"
+SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
index f316a59679fe..89520493bd94 100644
--- a/dev-python/aiofiles/metadata.xml
+++ b/dev-python/aiofiles/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Tinche/aiofiles</remote-id>
 		<bugs-to>https://github.com/Tinche/aiofiles/issues</bugs-to>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 37f82ff994ee..6b89b1c6b0ae 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -2,4 +2,4 @@ AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae9750
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
 EBUILD aiohttp-cors-0.7.0-r1.ebuild 962 BLAKE2B 8fb1c8cd02cb0393ef4466b6210746f482ec35830359e9f6e60a6c06e087a89d117e2ddf7fec323eb672a041a31001d7eb6f37465a697802b57d5a810512b126 SHA512 1d43f1db7f13edb45d8ce0aff5ced1491247285395d43a02ad179480278c0f17f8d8f3829deb56e37ae0fd069485027b9f106aa66788192232a2a446182a83dd
-MISC metadata.xml 503 BLAKE2B 850a82bc644b9678ffdc44bda43f74d9aa364abcd1490dcc7db045a35fad3fe7b3b45eb8c33d6c27afe4a7a7ce44295b2d0ce432058ce2bffe3511eca03d5ba8 SHA512 de084ce8a763b74a9a069a22e75ad4d331aa99aebc7c10cf8fc2f571695df148590d4945775784c589d6baf182025ce3f6e536989a50ba7f9bd278605965a813
+MISC metadata.xml 557 BLAKE2B 21b5e820005b6104d5472c1b04df6fd7233eec1787448f8f63a8779d68619d42b8198d114320d42d2ef104320c210fc337512fc764c48e2a53f27f0fb0598be8 SHA512 739012d38b824fd06c8f720e8cb8f715d5c9ce31e41387e40d8f417b52f1eb21ebfc9614108eedd511020a7dabf508e7072f620e03a880a222a525c283aac795
diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml
index 7e698af58c38..8bf5bb16791b 100644
--- a/dev-python/aiohttp-cors/metadata.xml
+++ b/dev-python/aiohttp-cors/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/aiohttp-cors</remote-id>
 		<remote-id type="pypi">aiohttp_cors</remote-id>
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 9a5542a3be8a..01dcbd123b32 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
 EBUILD aiohttp-jinja2-0.15.0.ebuild 1080 BLAKE2B 79c5f9ac7a6d1b25fc494a3574c9127f42de3046433c5a3c07bfb1ebbd0b5764d73e30eb87dae1486be98a8cde8e299ba2e28913d832f980fe7327520055e4bf SHA512 dadd8b7326252f151b00440d2bcde8eed37493c9c44283bfaa860a8dd308d9581f8e66a14d181916826ebcdbad1ab87fed70d5fe14b0765ceb99966183ead5a8
-MISC metadata.xml 384 BLAKE2B 37044e46bf0ffa1925c6b50e3d2298993ecc3c8f42e18c52bfec22b620dafcabc77cb63f51f98337470f0edeb600c6b96c0b518f012bcfd3147a0f91def9d30f SHA512 fa82c2fd1f793d00baf665208c6321db03f037782c592f84d5efef68c271413ec080cd0322fc308cb4eddbb3e8667b907036eaf4cf8e00a800b9657bd9b366e1
+MISC metadata.xml 408 BLAKE2B df678e57a82a1c6a818983506af4a0397469497ec15da8a70aa021b77b60b4b4d14f8c37d821c655fb1c92dc75da69bd37ac487d9937d87c14d6338de8bad803 SHA512 bd5b6da5b67af78a148ec4a95378caa391dee95591b6888028d5427000d38411931559332bf0508c201691e04b8b417acbc5dc026858c546e6843d6779607e22
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
index d312e97052bd..f9d1eb44fbde 100644
--- a/dev-python/aiohttp-jinja2/metadata.xml
+++ b/dev-python/aiohttp-jinja2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aiohttp_jinja2</remote-id>
 		<remote-id type="github">aio-libs/aiohttp-jinja2</remote-id>
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index c332190b016b..0eef3e104ae3 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -12,4 +12,4 @@ EBUILD aiosmtpd-1.3.2.ebuild 627 BLAKE2B 25c69f1ea753d119197475f1a4b769d973ad74f
 EBUILD aiosmtpd-1.4.0.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 EBUILD aiosmtpd-1.4.1.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 EBUILD aiosmtpd-1.4.2.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
-MISC metadata.xml 461 BLAKE2B 26a357ec03cbd43372f7fe77a2b7ba7330c9c1c18695887c5e297f7d769d3af34ae456f30743880098080f3c6740180bbe0e7e0be5a02a0059096b18177968cd SHA512 67f76d5cf941e2276006c55471a101e0be62e79a2cf3c69d74fac6566da9ef44b14fa29d7fbe57b72d2452318465d4b43aa9337c1cdac798b874a3b3ce2f1734
+MISC metadata.xml 507 BLAKE2B 33868c5cc9e291f19231b1fa1bb16d444fd339ea6dc522e3b3bef39a972a17be7fe796972bc45948e948a69bdf2c9d64dab53b443c4ac4297029299aa71ee6b6 SHA512 3c16e4cd36d17923d8fc67a695ed2f1a5d0aa60674357d938c1303837e399782406f55012f2cf428204203919a6fa901b84acad7c48568dee94cc1eb011d5442
diff --git a/dev-python/aiosmtpd/metadata.xml b/dev-python/aiosmtpd/metadata.xml
index 733c44fba3ef..33766b43e66d 100644
--- a/dev-python/aiosmtpd/metadata.xml
+++ b/dev-python/aiosmtpd/metadata.xml
@@ -3,11 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/aiosmtpd</remote-id>
 		<remote-id type="pypi">aiosmtpd</remote-id>
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 5890909dba1f..cbe91d18ef8d 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,3 @@
 DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
 EBUILD amodem-1.15.1-r1.ebuild 592 BLAKE2B 19bedecc070ca6472177add7cda6ca1c6a166c7dce2f9910e41c837f115a6d4b8d887b9ea50808f34aa97517c15dca6bfb76203c8106e156980a8a80ff00ed00 SHA512 6cb8c9dab01249327c1cdb80fa6b21e7b4a9dc1eca682d6f6bd31c4c98cc497946a88d5576afcfa30a880153f7654d1896e5c68761c5cc1e0b8df250579da115
-MISC metadata.xml 514 BLAKE2B a9a520e6446c6d3713bd0e56d69d19f2ff0731dae551184279ade5591b300446f4fb2b4db14f495fbca2bb3fa126de168e6c0d8d27fdd8ac3737b15c7472b997 SHA512 6544f7a44ad78931b88b85d7046dfc03967076efc5ff5395c44a84cd7a649adb1bce38221fb7d86c4569cfb912ae4fb0ddf031f27109fbc8ff60e187f4eb4a83
+MISC metadata.xml 569 BLAKE2B 676247b7bc7d89b0f6fa2d591be617e02493c5c4cb7b2cc5879cf395136d5466093d2da0d08314e95c03ab1b12c00dc014ff717b7cf5018b71a08793c553dd26 SHA512 50d0c0ae9e5ab4155906706df3db3741db9c938a0d8800639c30c22052f0012dda8a78ad1a8608af01f823e93fe88f762c0c3d5e1fda5754d2fe133b36a40890
diff --git a/dev-python/amodem/metadata.xml b/dev-python/amodem/metadata.xml
index 142f79bfc21a..fdb6453ae205 100644
--- a/dev-python/amodem/metadata.xml
+++ b/dev-python/amodem/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">amodem</remote-id>
     <remote-id type="github">romanz/amodem</remote-id>
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index 2cbf8660d06f..58ae2d2b5755 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
 EBUILD ansicolor-0.2.6-r1.ebuild 705 BLAKE2B 947fee39b97c8d54cd417a6a0dd7f49c23f9cb85f3c60f9abb2ee14915a5e097353bc848db31a6da73a7dec9d2b500c8ab127d185169bc69522307b449e9292f SHA512 758eac8f5f525bc8999a0306404d5b276c2db89591f6515cf1801524b8e798adec081f0de7e0024eca1857ad95d7572b3f4b5eb395650fd5573ef261624c4ed4
 EBUILD ansicolor-9999.ebuild 707 BLAKE2B cb535dffd18e59e94fe635d7910856496ba16404decc460e17cd5c147cf40858c2dbae20d97aa9724d25b6f2c4d35ab84e1c219474994e876ee2f93f7d73fdc0 SHA512 6b8c4bc62878bffd9c6198ca67c5f5828ee7c40f401e8484783992e4a534462f8f3c0ec1166ddcf0cf219273e8fa3d816b9d96214c06e12ec57fe88da47f0ca9
-MISC metadata.xml 495 BLAKE2B 4abde6382c00405991e92ff16adaad5840999eb0d47d426991fed3528ad79d26973459c926c412bed73c402810000f4213e280a60f9720ee42e3dcfaaae1bd68 SHA512 22215a33ff2270d816624404e2f44e4553d8d03cfc1627f4475f61be0912d7b25fe740fda0317ea2ea8e85891f4e4f089b46275fec9d49672f129a16f5a076e8
+MISC metadata.xml 549 BLAKE2B 0f0c2290e8418d5ad42ea30e721735ae1201f3c6e0c493d42def746a4f0db7f099079cdfc564e8c0efec8c8e1e89c1f5f2c169e29beb5629fc80167ff2e3e946 SHA512 88ecdaa27c61a59062d0fbf0fab3fb2140f90787919fcf4fb1f87b7cc9b73fc071da03c92412b666661af2be6f23601fa6ff5f9fd7c8bf7e0f1bf6533115c81e
diff --git a/dev-python/ansicolor/metadata.xml b/dev-python/ansicolor/metadata.xml
index 50b2ecb53677..dbbdd0271494 100644
--- a/dev-python/ansicolor/metadata.xml
+++ b/dev-python/ansicolor/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">numerodix/ansicolor</remote-id>
 		<remote-id type="pypi">ansicolor</remote-id>
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
index 90bcd46bc529..feef299aa9e4 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -2,4 +2,4 @@ DIST aodhclient-1.2.0.tar.gz 41043 BLAKE2B 2ced3205427291470e2bacdadfb4328e5bc93
 DIST aodhclient-2.1.1.tar.gz 46687 BLAKE2B 5f229e36f1b840b346fb4c85ca52185d6c3714c9f75e269ab7cfc8dc010c3afb08d387d06d419fb81cb3b8b1056afe970bc6e8c91dbe5e62c048e7c1f1fac36d SHA512 acb8f2571caa248a35625335f5c04794ff24c16bc775cad8f78621dfe159645d6ed39da62722fc990cea1c5f86b4bd08f40d1c5c82d08b632f913367fc723386
 EBUILD aodhclient-1.2.0.ebuild 967 BLAKE2B 8b7ab25698f6e05947ed8c05a5afcfb38bf55526f5ae51c1089b002a99e1aaee9a273794fedb21a8c7f66ff742425a9ac6b6797edcdda260e875d7081dda39e9 SHA512 99ab18d691cf87cc65b081b23a18b17b2c981e428b0436033a9c03aaa917ff44810dc61eb9dcbe494fac926a6a5c280f2e4949e918c0b5dad3de786861df6f4f
 EBUILD aodhclient-2.1.1.ebuild 1019 BLAKE2B 9c090c2b1900eaa7bfd97a1b1ddfa70f815b687bd978c773ba2c6f3b7fc01bd4bd02bbe7016b4e0d18730d1b1f60a70604ce2c4894cc9058f66e0a9e3398d526 SHA512 c26fef2829ee1fc4bf23322313f25d0fea6cdc0de89e6a3ed3b6b99752281437edb34082597590a64ac46515ad051ef4932e761987037e245614fca4e3d0c349
-MISC metadata.xml 508 BLAKE2B 660be31fd4d21af51f9a60e32567bbf24fe4a4e910b814bc3c68ab76e95b794a102f7b1a1c3177f8f6ae97175539078270372fc0f9fece1b77cd63f215ce8426 SHA512 3af0d53dd364ea1baae12c85a3fb3188717872e348fab374c83ef01f04a53007298cf03ca5384abe4264ac66218e4fb557f1e3c2fb66fedc592d345ac10b643f
+MISC metadata.xml 532 BLAKE2B 3a8dfac5fc96ca3b971fd14649ddacb1f0f33367d5e126740aa60318e050489c5e7aae14eb81fd268724c813feb9fe27b54b29840cd3f75982dd39cd52d25107 SHA512 4a7977cd0815542aed0e9c1c15ac71e7e637bdff8f612d9686317254e581f6cc0c3713de22b60caa2630cef3284df8a3c0e00b6b8a83823530fd8ab42ba7d48e
diff --git a/dev-python/aodhclient/metadata.xml b/dev-python/aodhclient/metadata.xml
index 45a7e697a598..1397f01bdcf7 100644
--- a/dev-python/aodhclient/metadata.xml
+++ b/dev-python/aodhclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-aodhclient</remote-id>
 		<remote-id type="github">openstack/python-aodhclient</remote-id>
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 0a8a7bce1904..c1c2b672a391 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -5,4 +5,4 @@ DIST apispec-4.3.0.tar.gz 63351 BLAKE2B 3d5836df242cc0562ce9e8ef47dc352cdb415b8e
 EBUILD apispec-3.3.0.ebuild 744 BLAKE2B 0311796a7d4b89bba060af564c738a8de6222d928f2ab8d2969492d68b0ca91effd9704f039458d8683c9d69cb273983613b51ab2faa84b1c0989d7e44323311 SHA512 ff45807bdbda616f267d80ec26863489906a74fb0f61c4e513608378cd8463b96be8e4054dcb1d0155f5bd093cc43b552302d26240575c0b37f9b0908c102960
 EBUILD apispec-4.2.0.ebuild 918 BLAKE2B c03e6a50bd745c964565716f1ea26d7a4175a3fa63ecf2ec5b1cd7e3c422d343d28f89e45e09ff97afae4e929e8dfff7f97947092f74bfd568bc08ffc46300f3 SHA512 77bff5d3ae51a5bd9eac28036772b5e388f6f7141ad99a254cc97777df666c6690b9229c3cc7f3b00fdd197d978492e7ffc81ffc103108539e6c85bebfbf15b8
 EBUILD apispec-4.3.0.ebuild 949 BLAKE2B 540516d3d9bc6d787499ffad6b65426b9e3f9fb1f0609bf3f65ecd6e42fb7b23cfbcc6c41e51c5c5744b5a8bd10d675f2921046d43cd25f300db586307fc89a3 SHA512 bf4a208f4f650641c276ae1bca69921506e4c0fbaf11e7a4327266e7859971f1bc43abb86fc359e5b564088bad60fdc0c427364dbb38b389f79b26fb720dc00b
-MISC metadata.xml 453 BLAKE2B 48150c71b84e20876ada7ab72bacb3cdbd5903c48a8dcf1e28c59fb11a1635293542de392dd0e7369288c49fc487124bdd2872f638bfeea564e17f67706a495c SHA512 ed82ee79628cc4a32142d7dc51877beb5e67d03a9f49c00114c49bbfb5140388c75f752e5cd29743dc5d7baffb81bab78a74bb1548e6f65de8097b673448d5a9
+MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/metadata.xml b/dev-python/apispec/metadata.xml
index bdc70168fa4b..7adc8b65039f 100644
--- a/dev-python/apispec/metadata.xml
+++ b/dev-python/apispec/metadata.xml
@@ -3,11 +3,13 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">apispec</remote-id>
 		<remote-id type="github">marshmallow-code/apispec</remote-id>
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 6369ff5603a8..92b3774f9b32 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
 EBUILD argh-0.26.2-r2.ebuild 497 BLAKE2B 07f1fd92b1d231a3c292af028ef9c107fe618f9a30e49626208454dd4e6c109305a0c97507bab0543132afc1bafca50597acf63d7f9313684f9b5794708231cd SHA512 96b7188873c93fdf3d529a285e2da218ffe6987ef591cd2f343c91b90085dbccae647d250e7fa85609c09e05f9cfb89135b93b7e38d5c83e01d7c2768ec18d9c
-MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
+MISC metadata.xml 331 BLAKE2B 44a5708cae63fc94540b35012ece30776bc5bbcb99848eb2c4d5e0e86238fc4ececabc011f1a40c78942b91409a7b31580f311cdab02b450804461f620f74768 SHA512 21243b065ecfd9b4a9350b474f66cd50462e35d83e1130f7a1a1a6033430f085c79b763157cfffe2e7133a4e8e2da7a274659f24fefd742a1898884f56c464e3
diff --git a/dev-python/argh/metadata.xml b/dev-python/argh/metadata.xml
index 0e0938894bcc..9f9610ea4f84 100644
--- a/dev-python/argh/metadata.xml
+++ b/dev-python/argh/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">argh</remote-id>
 	</upstream>
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index a984d2b843f9..04ad58077418 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
 EBUILD argon2-cffi-20.1.0.ebuild 761 BLAKE2B cfeb34105b247e24feb448a1a421446d97969f7e73612eb7c067e1b3a37eb6ac119b3069cb2d3af2eb33bb28fb162dd1845c8fcd062c8771688144adb7769be2 SHA512 36cb356a84fca33c5725594efde3b0b91ccaf123de440c28e5c378e791948a3f8d26574e8de54b90031e0acb0c5e96a852ccd62edcf0461f7f4a8d24673970ef
-MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
+MISC metadata.xml 665 BLAKE2B c3518c59bb9d83d0fac8ecc1018bbae9c48e3aaa134f7416e77c9cbd35ccb26db34c195af632fc08baaf36760cd1cdc2eba111fdf8f70b0c6636502c6a837c24 SHA512 4e65e93862880357bec44f00a75f16995c3841a4a83058e00d87fa6920f1d0ba3d4af060c6f7942245a6b4fc0a9a71ed467353e5f403595d4306d52517c07fbd
diff --git a/dev-python/argon2-cffi/metadata.xml b/dev-python/argon2-cffi/metadata.xml
index 12d0ade52d84..d632e5b4ab93 100644
--- a/dev-python/argon2-cffi/metadata.xml
+++ b/dev-python/argon2-cffi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>m.seifert@digitalernachschub.de</email>
     <name>Michael Seifert</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 2019649da179..f01c2328b007 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -2,4 +2,4 @@ DIST argparse-manpage-1.4.tar.gz 33661 BLAKE2B b2f6a0bb7ef3a95470e73c4c94b9fef42
 DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
 EBUILD argparse-manpage-1.4.ebuild 530 BLAKE2B a9a24f043bd6aaddc41f02443f7fc86992e22108247cce483abbd481dccf776b28f3edb6339b2686f52ea295fba5fbcf9b4be49a1964b350a5f37a49d1bf826f SHA512 5b0a34ae6dd2b2dbbfc765e86add2db64397142616033576b1e173cf640abdbcfb9e68134b7793dccc67ae422b4488c9ef1bb3ab8c779aa371d67804e59d48f1
 EBUILD argparse-manpage-1.5.ebuild 529 BLAKE2B e055a40c4be821b49921cc9047b87ae863b450c5f862cb6cfc520e5952b59e6a64c6c4b508eeb267cdb0baa5d577ca9f5c41f0ca2d50fb33c21f3c97f5f36903 SHA512 5e0c3a8898301fc07282da04b7b8b6820f847554536a089c521b26eed19ee6102001c35e14614a3af47770ebfde1d634ca7015363c862a171ee61defdb03c866
-MISC metadata.xml 393 BLAKE2B 782aeee413c875a64465132ed14d6cea83d95b5e6bd54d62550c5edb6b4cbceb55526245ecdbb21673206d3c02c19acaeaeb3b2b5bf88e2348adbdd14fcd3f9e SHA512 b22f22c55a2fc6f0ff0f9380a035657923cc8ca03d6d6047a62f939ccfeda6389498042e7dba5016bd12f89cd207580250203027530e491ee863a982525404aa
+MISC metadata.xml 417 BLAKE2B dac8fb5658980e9a0b11b4d0e49c704e988948dc2eca5a8a1a3e526d84ae91041c566a80be001f85fd7876737c45ce13ec4e16c92234c3ed813072c579f4ae13 SHA512 d605fdb17f23fbe1b70f16f0032432ba9cdcd96278b5d14f52f0050fca07a398986c6d56bf2aaf020416c3d74bb0ff22e37a2116ea061d43420ee8e87b2397af
diff --git a/dev-python/argparse-manpage/metadata.xml b/dev-python/argparse-manpage/metadata.xml
index ad3003519fc0..a43b41463960 100644
--- a/dev-python/argparse-manpage/metadata.xml
+++ b/dev-python/argparse-manpage/metadata.xml
@@ -5,6 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">argparse-manpage</remote-id>
 		<remote-id type="github">praiskup/argparse-manpage</remote-id>
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 4d880d1c9ba7..23a261a72fa0 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -8,4 +8,4 @@ EBUILD arrow-1.0.0.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f347
 EBUILD arrow-1.0.1.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
 EBUILD arrow-1.0.2.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
 EBUILD arrow-1.0.3.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
-MISC metadata.xml 386 BLAKE2B e605d85f1f0360d1a0ea7f78dbfd058597a0c1bf86a7464b3fcbf6951ee5faf5b39b82563d63b2922fe85330ba78e57291242b1260257e3f787f772aba99f91d SHA512 1aa5206e180fd0a879d97ae70ab8b8cbdc4e9196232bb4aca9c09e7fb87bca840a450ee55c046c8579b2bcb13386c8691e6ec970f64b8366e887780a42825851
+MISC metadata.xml 386 BLAKE2B bc1174a003d7041b7741307be147e5d1e6035982b4174cef130017825d20b6a35835f3decce36e7c8c5fd4cee7d9ea77cb083850bc820f241fee1407665bdb5c SHA512 88ca68a6095f8c900c55d4ca1159d78c4ace39b326b1d5c9086d27177c9f5026d83d32e7c8bed3813a623e2be22243c3fd6a268d79ca528ade6f42bf3fe5a7e7
diff --git a/dev-python/arrow/metadata.xml b/dev-python/arrow/metadata.xml
index 05383d664514..e0bf4ac97537 100644
--- a/dev-python/arrow/metadata.xml
+++ b/dev-python/arrow/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index e5351c19fa3d..3eca3fef541d 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -5,5 +5,5 @@ DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
 EBUILD astroid-2.4.2-r1.ebuild 1870 BLAKE2B b6fb0fedb655a60c9771384b11adb8132d8ea9ca54e61f070e74fa029eee1888a736287a71e094b90ad304bad7f517e3cb52c4813afb4b2321d36d25eb5cab86 SHA512 3d36a5d9fb124927ba9fadb51c22356d99f190c6ede44fa933286de16c4101e45a484489d79e8617e5642ca3a74ef77b55c8cc5f71d138c3d41dc44d740f67fb
 EBUILD astroid-2.5.1.ebuild 1195 BLAKE2B dfc4ab4e910998b63dbfcf769513edcb98cbd6d16e037f1ce1d8484ecc669d09ed3047f43ad49a43ffd34c1882c632156f90a6d2f48f8d7516980a6e59a2d18e SHA512 5807b77578ead30897ae28bef16e5e696bf7663af12984f17835f22af111868d4d33ddfa2d2ddb1568f4c784afec6fb9c0f90f05c41d8e222c6c277f355d372f
-EBUILD astroid-2.5.ebuild 1837 BLAKE2B fa11dd5895f1c711d8c2a388186304adeddf0f4707270f9dbf51a000f16a567429c52ec7a37ac79ad1531bd2633241635c5817cbf885bb7463817390fae6931f SHA512 1c83ff367c6c5627e491b4bfbaf33fd3b1d111ba6820e851ae3fa6670c05c31e19192549310f71d5624421c91534b13204293117bd9cf3fc2be9f310543eda1d
+EBUILD astroid-2.5.ebuild 1830 BLAKE2B a35caaaca26422269b69e090aeab58f3bbd7eaff296d19af8bbcd18ad9d321844dbbae11fb5a5e8127dc7198e29d0542a03d6d99581235be60e95670e241547f SHA512 487c40073e0b032c8e5a9f45ec562954f94d4f9d9fc2ab5799df8c576f4cea5237b91838044654dbe20d2acea5e9f7455fd3b6817292564dce31b603815ec5e2
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.ebuild b/dev-python/astroid/astroid-2.5.ebuild
index c706f0484515..54a703340a6d 100644
--- a/dev-python/astroid/astroid-2.5.ebuild
+++ b/dev-python/astroid/astroid-2.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 4bdf3f73d61c..5976c7cc5b93 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,3 +1,3 @@
 DIST atomicwrites-1.4.0.tar.gz 11790 BLAKE2B 98a262f46acdfb94f56175368bebe3dbd5d46c1bd694362f5c9211c7be2016821c9a833f1061f41f77adadb3a26b6c6d3ac1761a13bec1f9ac2c3c0a35a58ad2 SHA512 493fd15174880917650643db1fe85e2703add730189c23fcff11ceb87175f546b9251050ade506d0b48300e0f2a39ee5a4dcd4da8cb3e27680fd05553d6662cb
 EBUILD atomicwrites-1.4.0-r1.ebuild 564 BLAKE2B f965dee1fe423d796ec5f7fc8bb1f43b77453c74dd19fc44e826579da45a143c8697081c8dd2017f513512ecf0d1d778a7df0ab54221b3af64002b32e053b999 SHA512 e8405fe277904852b9920e4599af1282254de29e8eac4355544ebcc105e24daeed760ebe3b7529c9f09a1e7e20c41b89de1a49262f09209d1ca08ad880f18c5b
-MISC metadata.xml 563 BLAKE2B f94f86b14e9060fc13a8cb562f340ab33fdeefe40165c9bba0da8b6c70e7ee789aeadffd7a6bfad97fbfbb8fa98797905926f173719c7fb5aa02b640f178c73c SHA512 7cfd438d7dc12815ae8f91e042397b1de749a0276dd82eea86a3a6edc646d3c79ca077de27b295a1a1dcfac2b89d44581de97b6a0b7cc5711c818a434c31def4
+MISC metadata.xml 563 BLAKE2B ffa883428c4ec7d5c5eae8233a498ab7bc8c2497d48c2b928223129e7a90b3f92b5f778d1838bba84330a07d1e68875374ecf9162bb3d4797bd9f12ff87a4eee SHA512 62f4bbd25c63975370e0a68bed597840b8202eb7b168aad660902f105a8b073b1be0ee2cae56f925a142b853e1aabcf2813799befc3e3b8b189b5e74285c34eb
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
index 13f0b6a55a29..f77f0714caf7 100644
--- a/dev-python/atomicwrites/metadata.xml
+++ b/dev-python/atomicwrites/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index 2e1c2da51671..cc3399f2b7bc 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -4,4 +4,4 @@ DIST atpublic-2.1.3.tar.gz 16373 BLAKE2B a93a53fbee7b46eb949090d6c8ffa911db613b9
 EBUILD atpublic-1.0.ebuild 522 BLAKE2B 8bcbf2ad0ba8691cb8dbc3199a315ce2ed5568e4e9abbc7549ed1629e0f3952e069a7f0c4d557f2db961c1bc27ab6e76235b4085a1e9a835f758d935bc6083da SHA512 8e2ff962969fe6e4d963c5df19bb48e724168729f6017f977513519602e14b0d885dfe66b7d13c7cea92b7dff68fc0e7ed54dbe864c49c292c129af0312d36da
 EBUILD atpublic-2.1.2.ebuild 667 BLAKE2B bb29f24f2e9f4f6c784b2fa5c3b46610207a659a8fac5eadcdc11c39f3187247d2199241f4c4a1aa6d71a7b7e7022bf16fb2f55f340cfc42833efbafe896e543 SHA512 6c9d5707924e3fe049f6535cdde6b68bbd0964f238c960ecde943cfdc501ee65c7c93b76d7410b7a28eb1163731f8b3cf2e1a1b92e065751928729897997efe0
 EBUILD atpublic-2.1.3.ebuild 667 BLAKE2B bb29f24f2e9f4f6c784b2fa5c3b46610207a659a8fac5eadcdc11c39f3187247d2199241f4c4a1aa6d71a7b7e7022bf16fb2f55f340cfc42833efbafe896e543 SHA512 6c9d5707924e3fe049f6535cdde6b68bbd0964f238c960ecde943cfdc501ee65c7c93b76d7410b7a28eb1163731f8b3cf2e1a1b92e065751928729897997efe0
-MISC metadata.xml 457 BLAKE2B b91ad6dc30ac1c073112ce5c1acc0a548bc82f2fd1c500baf4ecf1a4ec63104b38b9ddd7a4c8e2cfa3b664f26648f790f69c516d690224ca89bdfc6008111770 SHA512 09d0eaa9125e43241a155e97eca8a80a3a195e6a76c37a8ea36902836f7c7fd9920f7b671be2e7ae569f0a7c373365a7adc441b5e1fb1aa792828d8605fd84c2
+MISC metadata.xml 503 BLAKE2B f3bf46b390579c62b3a7d52d8bfe93596a5a05ec7c6d8e04e82b7c124e2293eb1a1d3f9bffeceebfb8c32de64a6efab61ba52ed54e2c329071cba3bd734ac9f4 SHA512 970d9d4e24d9b168ffa7ad5c447f496274b45fecea7a389252261eb286c31eb65a1c224d31549040fc74f30c5729591ce1859b17c6cc665ae980b756b9b898cc
diff --git a/dev-python/atpublic/metadata.xml b/dev-python/atpublic/metadata.xml
index 1f3c4c7a9717..a383d8c8c890 100644
--- a/dev-python/atpublic/metadata.xml
+++ b/dev-python/atpublic/metadata.xml
@@ -3,11 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">atpublic</remote-id>
 		<remote-id type="gitlab">warsaw/public</remote-id>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index f5801d7205ac..0caf88c8b019 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1,3 @@
 DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
 EBUILD attrs-20.3.0.ebuild 832 BLAKE2B 368252001e4430260eb7c62166a87671f5ad97de0a913bde62d5289e3828393d15d7b1b17277b23fe46d0368bc7064bbd569d72a9a63ed8bf9fa3dd6fca39742 SHA512 3dc0b007976c46b456ff853b5fa617c69d3a9750567e96d9b94ea2414919c43409e63570213e7fb9d60a44f9d8bd2ecb64ba5314414a702a6b37264791063f18
-MISC metadata.xml 520 BLAKE2B faeb38666d6eedb08951c10cc1affa171731fd5ccdc4ca482946aa9e94b887d493a43282c6fc48835af03badaf59af17f912a8d3d1481297dd5596c4784b4951 SHA512 a12b5bb882626a823475b64cd56ede72349b38ad19b70696a83558553a26499a85371e0c2996274b98b0e076e00fc2041dbb0a9af485780c54a3d9a36d7cdfe5
+MISC metadata.xml 520 BLAKE2B 48d3940a42f60eaa0359e1095eebfed747fff50cbf51f3a7bf2f8c569340e7474a4e5b4ac98ef24ea2ac21c4ab77d6a04b9a0ba435578826f1c3e769e79d7435 SHA512 d1c5ca93d410b922d97a6dd6dda32f4c2d1c47ec686cadfb6bda0846a5b623cdfd09671eaa6ecfc29da0dfaedaa02eeeeda24bbf5e97b8aa2fcd6beaaba95177
diff --git a/dev-python/attrs/metadata.xml b/dev-python/attrs/metadata.xml
index 70bc2c424c5c..57a4968ece0e 100644
--- a/dev-python/attrs/metadata.xml
+++ b/dev-python/attrs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index 236327e7551b..e9af93e23f32 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,3 +1,3 @@
 DIST authheaders-0.13.0.tar.gz 93319 BLAKE2B b4370a9cf3d6a5e9772be97d07ac24d1d4a97e24df07d65f74b22bbe4c85c8cc8d4a0e933b2c84b4b159aa7bd7572530e3784118e17f3b5caf8a4365e2bbdbaa SHA512 dfaccd9dedea8bebc22b831c481c733590e11a3483e42b45f0b6329bdaa98eec0644faf8da8b92c56c2d48a43eec9c52f8ea9a3c67ae841c46a7085cf0572177
 EBUILD authheaders-0.13.0.ebuild 695 BLAKE2B e28b8f70a496bb33dd88ca60efaa0d9fb78c2969e8a42432bf1712cba061dff84e97928f0edb3cc21a1230f8060c70d753d37d710ffcf0fc28a968a53c95d6d9 SHA512 f78353d6a2cd75c7bab5a05d17e7056ea5773e634f28fefbe6a615344fb92a55a34c980f4f45d6f718204b5bfcc8e0cec0ce928b503de39578ccbd45d45690a2
-MISC metadata.xml 407 BLAKE2B aac794530afa2277f1499a7386f48ed3761720ca40cdb4e7a5336c21ed187c84c2b8c9ef0d803cad4d51a631ec03b92ef2f07183ac2ecb93d3f2d0a4fc0829cf SHA512 5789776556152b80e997c19e18ca0370576b5bf634d762106ac5058c6c4530a00113ddc5582732f2060b2e0f56319e9f9099cf0020acfdf64380dadf1d509412
+MISC metadata.xml 453 BLAKE2B 39308b05fdeb6893fd85c6f0d70db1a4a65cd248dc4bf306ce1b943e30b00cbef93661c2a399de4ac7e5d65e25ac454c9b2b9809cd740c58d20ca21753772a0f SHA512 7e0127e96f89f94e232c202ec37d24b80bebdecb6f29bad5ac236cf4f929909b80122d253ae09f79153e07a405c89deaf388b2044adeba4ff8d8bacfbe37bbd6
diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
index d7a8404dd952..acf4ae8def22 100644
--- a/dev-python/authheaders/metadata.xml
+++ b/dev-python/authheaders/metadata.xml
@@ -3,11 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">authheaders</remote-id>
 	</upstream>
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 50152cadbc31..2d1f68e28519 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,3 +1,3 @@
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
 EBUILD authres-1.2.0.ebuild 553 BLAKE2B 0201cc3c4adddbc73191f683efedd53912cfcd878c176903e481be3dda01c67a763dc16cdaac72c7cfa64a50d0e1b01643284eecc8acab3ac0f127081c960aab SHA512 60063592675b7010ff6b0f86e239bacc4790acfee3b3b033507e4c1d70c0782ab0ead01cce19dbcbab1b2e958e235d3f5b26e77bd8395e87d55fa817dc698970
-MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
+MISC metadata.xml 683 BLAKE2B 8c66c741930afb427905ccbca0c529b1d8f1d53dd4e5b90714675fba5fae17240bbf4e4262b3dd4740c66fa54b936ed9bf2c027b52a43275d717dc0eb9f9062d SHA512 5070d5e73efb249f4f15f5a5fab3340fb64797ae728b30ce01c99ad6b8cff50d8c0d8455dd5c555dff5c953d35b2705196f5fc47faf1e8dfd4dcc6c071e71f6b
diff --git a/dev-python/authres/metadata.xml b/dev-python/authres/metadata.xml
index 3772cef1634f..e88f77ce3df2 100644
--- a/dev-python/authres/metadata.xml
+++ b/dev-python/authres/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 	RFC 5451 Authentication-Results Headers generation and parsing for Python.
 	It also supports Authentication Results extensions:
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index ce8ba6d031f8..4d6e52766ff5 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -8,7 +8,7 @@ DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f
 EBUILD autobahn-20.12.2.ebuild 3038 BLAKE2B 063b7a3996d586d09fc14f110f50e6d239c8d6cee97928742c29afb5d961f9dec9e4ad283e314a13e208c0c4b335b8716128a2d81bd81613b7c567ab7cca651b SHA512 26848497db0ea8ec1ce565f66645c82f3660209fe74299dde2c07730a53ae77ad36fd54e66c2da1c88462db0613eeffdff665705c1c6d73810de6e48d3c43e6d
 EBUILD autobahn-20.12.3.ebuild 3094 BLAKE2B 0a1435ef4d1e9d0f957377a751af0bc7e4486720b627c797cb290db2ad1570a4297d161e90c0f3aba34701b385c3486bcc2ceab9a6b798b5c3b82329766a2afd SHA512 3aa3276154faaddf3db0b615364a2c65cfd19f112beae9dee0fd83fd1963ab272a01be6bde878ae283c7e5489d55232209773978c4af5b250d379b6ecc2675a1
 EBUILD autobahn-20.7.1.ebuild 2995 BLAKE2B b1a4536d3153fb71bf0c83d89bdab51beff8cafd9a3686791c8697d8d249505843fb9ea7059ebc5e0d299884731b472d9e6255b2c8e800378c0a12336151361c SHA512 b64c89beb8c60179b8fef2dd9fdfb69b32a1bab0adf5e39fa3982bffba9cb55d2cc046216ee29f1a2248b1b15002a6e1f5e1e48f19507385dbde7235427d5157
-EBUILD autobahn-21.1.1.ebuild 3145 BLAKE2B 5f8844a8228ffbfac12b6c36e782f07707f62336fa9c098ece49f4d23d1ac934f9ee91ea26abfa662fddceb6ea5302912ac3f237d62bff674be3788279aa5f3e SHA512 c7515208af81cce17bd51d9f31da17335938777f0386e2c1ed205f809cfec54eb8ffc3407127c4b5d14578ec644abc14e62b93b52b57ff63132f4c094733c345
+EBUILD autobahn-21.1.1.ebuild 3144 BLAKE2B 2e5fde2e2aa2dc0405b4e52648c964b34ffbcb6435f8d48c0380dd7a2d7544a4bb1a8b2b5f72e00f1ad6b8b6639ff42238dd47213af7b81c6d6cf2c2736ef663 SHA512 4701d657a96a30ce3abdac31c6969331153780b751235fc704087d1f882cf88c71ba71b2e7332bb49ffe5594a77f10673e8cd3d25c9fe70eb77f8501eb23c678
 EBUILD autobahn-21.2.1.ebuild 3108 BLAKE2B ca119cad37f38de68e006a7e7947ee27e7fc2e7460a1e5f1cc292772ab93b3055e6915f6413f98f52d9d814bcab946f59f48085da833717572b17da17d052a41 SHA512 9a755eecb6e8c856f95f5867cb3144470352515a1641eb473ec9532b945c2bdb8d75fd6278bed8ca71551153518b5753d6cd0cb6cde9c14f07e5a131653db4d1
 EBUILD autobahn-21.2.2.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
 EBUILD autobahn-21.3.1.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
diff --git a/dev-python/autobahn/autobahn-21.1.1.ebuild b/dev-python/autobahn/autobahn-21.1.1.ebuild
index 124c2b905ac4..41c2ad9c99f3 100644
--- a/dev-python/autobahn/autobahn-21.1.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.1.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 35d5a4c68014..cf241b8f512a 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,6 @@
 DIST autopep8-1.5.5.tar.gz 117991 BLAKE2B 74e9bfed663d68f4a73088fccd879c538d40c564e7527b067d549a15361dfba2adcb853a8895fc61da50972f947ce23900f8067f5b8e715f73d6a80c6c27ef5b SHA512 9982271805131a7330d4a2a46eda65c05f079925393686f2df7eb92dc9e172003f9d788663cb8c0c8849dbae4f64c518c310eb65c3df308a12700abab084c39c
+DIST autopep8-1.5.6.tar.gz 121134 BLAKE2B aefeb4cc53ac66fb6eaef4d7af286d6249e7139e5409fe6f6b3568f0c6216d758dd73a950d043e36b6f19cf5de83f62e28ca318c45a7e40ffdeac0f7a9e06cdf SHA512 d283c3e2021025097c6b2f95faf7db12664b7d1f69f82acf9fe94e20fbd49cfcb28ad47437aa3148503c59cf5c2690a842fd795f869731290c80dc9feb86637b
 EBUILD autopep8-1.5.5.ebuild 848 BLAKE2B 611f5c07e00f65d96e6b9937c3901a1e8eadbd5935305930f5cd51dda81d08161a936a826efc84e360b3200c642e3eb0e17fd13129596a8ba410734090bafaf9 SHA512 e2676d967fd0e231c6a10ea09f779bd9248d531e881d35c841f6062058d2bcb3a683745076db4c2a468752d7a15c5c5fa34e3c307fe3153cf63aac8aca9f1c37
+EBUILD autopep8-1.5.6.ebuild 852 BLAKE2B d5bb196ed46298a4ddfd92d11283bfcb934926225eb387a5c3f1f2204ef1217a0423b7a1679342af6dec7b8946ed6f9e106dded2d974be06531bfa2b30561bab SHA512 d1348c3d901f9587052fb2328ba788ec5b19be9a38b3cf33a1a7c9bdb4e1ffeb72b30c7a86fd9b50e6f752048b05c46ca03307a0e012608a4199a3ee971e5da7
 EBUILD autopep8-9999.ebuild 852 BLAKE2B 8fff8cfdccb97703fa9d3503c9c3c649de315241d0791f1927161e3385cfa0945566b3ca78c04a56a147f2a4f7fbff603810b98bba1f6251c821bb6e004c7020 SHA512 13ca0fb94ff41a20f23e416438c90205123f522906732d6b43d759b87d70f5ba6d7479512d695440180c2a8b1744e7486d5d8f10a81cf1d77b23586fb5be564f
 MISC metadata.xml 403 BLAKE2B b84ac94eda3fac9977c2a936d006626b0fbc918c24d8f08f4b7620b778ea5ffec298945bbe6baf5353fc00888ee97c7f3c48493ab1c83ebe1586a9196da13a59 SHA512 7e2fd3edd7e82fa2474441a0e54ebbca38dd95f2dba7ba717fd839cf11bd21cb00d5ee56c7b8dc1b377e24a33b098d2932cc06de6c367e1c812b448a9395f18a
diff --git a/dev-python/autopep8/autopep8-1.5.6.ebuild b/dev-python/autopep8/autopep8-1.5.6.ebuild
new file mode 100644
index 000000000000..d3ff82ca62d1
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.5.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index b4447d35876a..38ce4bbe67cb 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1,3 +1,3 @@
 DIST autoprop-1.0.2.tar.gz 11040 BLAKE2B b53bdbf79947002a0c319fa84c6033908948365d18a85dd2fd4139bff2125752e0bc3fc8f19e5d38c06cdc089f423cc8a720b8040593cfbda9c04c84b7cd4ffd SHA512 281c30fded6d79ed3bbb0de5b7a37c2cc5b985a4980974503b5bbb5940cd22f3c09c3b3d9d513d5cb95239519519b277bf43536407fedb593a43122ee32a8db6
 EBUILD autoprop-1.0.2.ebuild 433 BLAKE2B bdb7b42769da05c744bd5d0cef90ca4cd306c55ad14825f161c440a7c6d7f4868048ccf0640fc381542b6d724ddf6fdde1e3476abbffbd6566fafe1480faf3e7 SHA512 0f1e41541307ccc4ac2216ce355b8b67fe02a862346ce43f9d643d621ac1ddabd048026259de1d4d02f803e4996ec8aba04beda2e63ef26c6850925e00ed2164
-MISC metadata.xml 1346 BLAKE2B 34fdf541b76f3059380e71b1b512ee803e4f9665e885be4edde3ea342caf694c4c9dd11ef9928c4a1d92af43372ffb5d89868145bb980726ec2896cf4c3d881b SHA512 094c5e6b27ec6fe4fd81e1db79edb29b494731d5a911b9f30c9d1899025f704e60e5d028055b6e5fb9492054c4248f3ccb7faa356b75229486cde412757d96b6
+MISC metadata.xml 1373 BLAKE2B 1834b80ae221a533414a6fa59a1d7ab6974306069a96cc1e7c61321b6c038a6451e897a77bb662617dcd3e8b80da5411ba5f2d47708496928310e0e09a4339cd SHA512 c9bef2ca18ddcb333df280a7fa4aacdcfd729e0f19164d5577fd4fc01ec904d068fda24cd8fe724c6dcf4785167b1df4450f096555c80e715b262ab11487ce86
diff --git a/dev-python/autoprop/metadata.xml b/dev-python/autoprop/metadata.xml
index f84836a68a1c..bf3801e62778 100644
--- a/dev-python/autoprop/metadata.xml
+++ b/dev-python/autoprop/metadata.xml
@@ -5,6 +5,7 @@
         <email>3dprint@gentoo.org</email>
         <name>Gentoo 3D Printer Project</name>
     </maintainer>
+    <stabilize-allarches/>
     <longdescription>
         Properties are a feature in python that allow accessor functions (i.e. getters and setters) to masquerade as
         regular attributes. This makes it possible to provide transparent APIs for classes that need to cache results,
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 82db175379cd..a4dee8df9e32 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,5 @@
 DIST aws-sam-translator-1.34.0.tar.gz 831469 BLAKE2B fa6820ef8640b649c9866d3e33ca5bb889bb8041ad15ce93b672ba0d84a3396db03ac55c877f303359f20ef1afdcadb257b84616a4376640279ff47dd9d86b43 SHA512 704bb55c99485e37d8fda853ee8b4f36472c8ccc83951bbc48eaaf2a0049765820c9036ad48a0c03b2d267378e5bf3c3155986ceee2e6efae8bb28bff1e68ec7
+DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
 EBUILD aws-sam-translator-1.34.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
+EBUILD aws-sam-translator-1.35.0.ebuild 1332 BLAKE2B d4a6f42398e4886fa6f7e102c5b5a6d7cbc10cc0b4f07050d5c0fa85607d767a1dbedb30fe58781465a826008df77d9dbc13dece02087a482481c4ce12c082ad SHA512 9f3e91c9b7ad3d160258b36b72383a4ce605d4a62661918201f80f4392fb59a8368831d64f4bb287cf0be019940125c9eb5be2c4ada1a14e524146bc4b0b8e8e
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
new file mode 100644
index 000000000000..aa02cfea0947
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 120cc9c24453..60bc33f7c6da 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,9 +1,3 @@
-DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8
-DIST backrefs-4.6.tar.gz 5995313 BLAKE2B 5bc6c6b496dc74f1a73a155b7825a134ef84458c0396bc2e678e93432c37b1355f782331fce978dee1c9968cc683c3821ae8975bbd20d4e19896277a6bf5b0c8 SHA512 96aeba6aab34ea14a48c430b00e242b3468054cfccfdab00a66071434e65df4378caffc32f47eded48b5054f7bfcd0caaa04bf103b9fa282ddb5c6119c46f88f
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-DIST backrefs-5.0.tar.gz 4120151 BLAKE2B 350b59c31d75b18df249f7bbd1625c2183182581dbf4b473c6fe58cbb7722b71a260769fd918d992e5aadfd8f4e848449609de2d307e1dd95aeb6125d5ac7a03 SHA512 c1b7f70f02171535609e3abfb4ad38174b63b935b4f904759069cc8cf9ea6c8fbeeefedc2a150c2d9eafc70ec29a4c5915809d7a8931e0a5af7e6df1ff5b136d
-EBUILD backrefs-4.5.0.ebuild 1160 BLAKE2B 3019e87ef11cd026909dbf59f318ed0c719306bae5c377f87a38901ead4c9e920a7165432405831bc1c1e0cb0821b45a44779dd4cb06e2b7b0b2602544a5c55a SHA512 7add8d07ac9c1aa3e27163bd04165715f512282498f20bcf6576ad3e3a042bf1eafc746738882c22956f871ebd310b09808dd4e47a508b1c8a43bdeaec3685bf
-EBUILD backrefs-4.6.ebuild 1163 BLAKE2B 7b43e53ace42297cde8a502dc7fe582ec60418a22dc41880c1e4a872967cd20981d28b8f1c3c6232cdf57765b942a69effdc4889c284d33169e5715f09fd6bbc SHA512 e99c18cd90188d422902b184d8084cfcf407df87a3c9de527c96eee66e62c2421b49096c8e06d4bc3075d68766116deb96337ea2f4341360ccd80a9bb33cf3bb
 EBUILD backrefs-5.0.1.ebuild 1163 BLAKE2B 7b43e53ace42297cde8a502dc7fe582ec60418a22dc41880c1e4a872967cd20981d28b8f1c3c6232cdf57765b942a69effdc4889c284d33169e5715f09fd6bbc SHA512 e99c18cd90188d422902b184d8084cfcf407df87a3c9de527c96eee66e62c2421b49096c8e06d4bc3075d68766116deb96337ea2f4341360ccd80a9bb33cf3bb
-EBUILD backrefs-5.0.ebuild 1163 BLAKE2B 7b43e53ace42297cde8a502dc7fe582ec60418a22dc41880c1e4a872967cd20981d28b8f1c3c6232cdf57765b942a69effdc4889c284d33169e5715f09fd6bbc SHA512 e99c18cd90188d422902b184d8084cfcf407df87a3c9de527c96eee66e62c2421b49096c8e06d4bc3075d68766116deb96337ea2f4341360ccd80a9bb33cf3bb
-MISC metadata.xml 1074 BLAKE2B 2903d804d13b3967e1dda39870c9f945b0b9327758ae8baf402112331836a4dbfd8328f6308a84ebdc5eee9b5f5a25d0d312de274cd57d47665fdcf2f44abdaa SHA512 7b23341b90d9a243e73578d2a30225318418997adc58d04db568a5771323af6d25125b65282f5e8f33d736da590d5cd40c3ceacb464c2c93422233bde1212b44
+MISC metadata.xml 1117 BLAKE2B 9d9fa36a86847c15e217f83ad293e3d0c62d85cb0dbe72b553b6bcee1872d24f0b19d68c379be2883cb7986c047f07e95e30cf5a9310a73e9db6310d867bbea5 SHA512 49784dc3c57a1e87ced2a2928d98bc957fee456cbca1f3d18f1fe9fabf8b1b48cd43372b9086acc195f8283cdb18f04e69d372e4fec949ca4d61213e0bb60f6f
diff --git a/dev-python/backrefs/backrefs-4.5.0.ebuild b/dev-python/backrefs/backrefs-4.5.0.ebuild
deleted file mode 100644
index 76f334eeed6e..000000000000
--- a/dev-python/backrefs/backrefs-4.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs
-	https://pypi.org/project/backrefs
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/backrefs-4.6.ebuild b/dev-python/backrefs/backrefs-4.6.ebuild
deleted file mode 100644
index 72b44d4b44cf..000000000000
--- a/dev-python/backrefs/backrefs-4.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/backrefs-5.0.ebuild b/dev-python/backrefs/backrefs-5.0.ebuild
deleted file mode 100644
index 72b44d4b44cf..000000000000
--- a/dev-python/backrefs/backrefs-5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
index 2a6c9f9ed89d..cb009855b9a4 100644
--- a/dev-python/backrefs/metadata.xml
+++ b/dev-python/backrefs/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 1fedb4a9c2f7..4faf0ae92656 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
 EBUILD bareos-19.2.8.ebuild 525 BLAKE2B 7276dc23ab5c9c4f77f9823b1a2ac8bdc7057cae3b22c81f91238c4a8abd52cfc3fe6e0f7f6f359e8c86c5a68cbd856b039a949aaf68a2b03336e9f2d29d6783 SHA512 7ad407ddd5774296cc2cbda0e9990818c2b556945b18a321e25743cb90e0c1160c6771bf9477d9facffb623ec7ac841d03a72a169e7bbfed6f2e496639f3cccb
-MISC metadata.xml 328 BLAKE2B 47dda9d82b55f78bbf9b78f8ac463db48ede507dd62dfecd1fec01426e834f2669203956b0a5da31ae133bb0f362ab1263123318babf65abaa6619e1feb209f1 SHA512 c16ba92ff73595406f24c4f2cb18bb2059d7990273d2c91c4f83486f1349ab0ca3d709f27f929956987b60a24ff8426687dafc7f79be0d32df0a176ee2528d93
+MISC metadata.xml 328 BLAKE2B 349833d83da7fc08e938a5de92f212d232cc91cb3ffe295afe2a70feef1f55e466ad9ae33d518519598ff9dfbff05ef449ca1247a02581536f62073e3f96d7c6 SHA512 540595607116ed282250e8202665400e5d204b772c94937c156252acf8edb9f2dc3929d3023de01ad0e87045c4d12a7511a1fd658989af4b8bfecf35211568be
diff --git a/dev-python/bareos/metadata.xml b/dev-python/bareos/metadata.xml
index 4a5a7ed6d64f..499338fcbb21 100644
--- a/dev-python/bareos/metadata.xml
+++ b/dev-python/bareos/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mschiff@gentoo.org</email>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 709ad06cd986..31fe0fd7d482 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,7 @@
 DIST bitarray-1.6.3.tar.gz 57799 BLAKE2B e6c1c1b143d8be4b7aa8e9a02daabaada56dc37715ec2cd36d970767f482cd6239b2ba2f5d28b96e0eabe8e7163077aad6584dadea0d8d10887a385bc96dd68e SHA512 11605959b8d94ad3a2ec947663401a6987058ec6298bef7bb6368711c3aa1f9d47b2245bd820395f0b75399f24065ad38e038e6d1d91f2535af48edbac9de3ba
 DIST bitarray-1.7.0.tar.gz 58400 BLAKE2B 04c7abea55e41914b56daf23efcf3e365d9ff1aa7d7e59c0e9b400a882d0080f393f1e07e7e0141fd84223e9b42fb2bce22bbeeb79543dcd49189b2cd302e24a SHA512 211f678977dcbf8adadc93204a6edbf915123daa518616ba6a8587d0b29f3873281bdf796c60ea12988b37b0fba4e6ad5fbfadde03eea7c3ad5179af246fc492
+DIST bitarray-1.7.1.tar.gz 58441 BLAKE2B f09fa3ffe2cc6534984e9da05ddff767dcca59075f5f08977237eab592a8e3e28ebec2d2bde89a21bba14f4c59a5e0411be50abfe562ebfbaaeca01339786dec SHA512 f45461699f5e48b97001c64c514cdafe208fe31f7cf6c211aa0fb2f32d46028717fcbeb38b812bc8f349226537a3ec6dfec97bc7ecf7253d484332307504abd0
 EBUILD bitarray-1.6.3.ebuild 554 BLAKE2B 51800881a48929c4ed60f5db5a6ab4c4ee05eee904db2833f344f6a22b7a201e695b57d80f6aee9dcad937c58dca4c4277905634be9d62acd661d6138b7236ff SHA512 bda6a3406692187c4cf0882c7d3437f922df41726163cc5306ccb1c445079a0dbfd86382e6c576743ee56cf588833bf5fd4b58c4c56e90879bff83c9cb9e3c7a
 EBUILD bitarray-1.7.0.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
+EBUILD bitarray-1.7.1.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-1.7.1.ebuild b/dev-python/bitarray/bitarray-1.7.1.ebuild
new file mode 100644
index 000000000000..f28d7d9d5c18
--- /dev/null
+++ b/dev-python/bitarray/bitarray-1.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit 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/bluelet/Manifest b/dev-python/bluelet/Manifest
index da790d0a4b3c..41de53536b62 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
 EBUILD bluelet-0.2.0.ebuild 599 BLAKE2B 900a518c98024158533c39d1a2eac93211cd3dea8b6b45663d0ed93355bc5a9df46a2c41cce45810346618b4fd0503ead84defeabdc641ccf2cf906c35441f32 SHA512 c3942fc0645ffb4e504a888b1d6c37f116ca379a96a06f299170badf25f38da5a9d4ae284d9c6909b7fa702c5ba5af9db5ce32329bfb90e6f745643ae055b442
-MISC metadata.xml 1239 BLAKE2B a8ea39d7e922bf92f0e53f2514c139621e967d961b065d1cf48eda0b081e6b56780bc6633d45ae1b0afad9e6f163eb1c71d4250a540e072efdc636ba7602195b SHA512 a14464e816d5e89052578f8086e306012d36765714f43ba8ab36320fb0185fc9661060c8cff4d59ea700b19d3948a615dc664c2cb15b10473a69e1540999828a
+MISC metadata.xml 1269 BLAKE2B 81deb86ae49fba3390af52fba78cb2ebbc6467b80d9d856d27581adcaf1f673e7d8fdc938a27db1ced499d641c058129e1ae42f0da9d5c58e01ff4a4e2e06273 SHA512 0dcaa324ef30b111633a84db9ac4e6f7013f2e9bd5aab8b1ae8cc4d9e1af160d548d7f6cb33cba32989d80e5aee003a0691bfe0b5d0072c164056d543cd13060
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index 1bc472c3baa3..8eabfa2b9665 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d1ff2055045a..562537874ffe 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,6 +10,13 @@ DIST boto3-1.17.23.tar.gz 348518 BLAKE2B 53e918cbb39f4cc1a5fc9303817efe7fade551c
 DIST boto3-1.17.24.tar.gz 349323 BLAKE2B 41a15fb92218d9aa936300054805b4cda52f373165e6d9f1f0b9f1edc0035e95a1134a407dd740856f8d28878e77ea669e6589ca20ab7af616390fda575d661c SHA512 57bc612e1f86edd2264364ad35c4a334a0ed98173d4f1e6808dce0b3c65dda4eb550fa231520aa67259a185d37e2b9e61e5ab4e1d7c41f7a0f22f270d1a07867
 DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d682ff585915061a495ce26ca6c12a5e844f9d4b73fca105c2f40e3fe7c1aa5bee045af284f45e74899cde3fde2 SHA512 d24c118a4af747360f226c9c6e98e26ad3dacf34f13dadb084fef4e7404d1141c66cf5d7074eeea2c792b134e7b83174bc0be0c387c478fd61de646118b41b9e
 DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d
+DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb
+DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
+DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
+DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3dd735a378e90949fd4d533df494b93ef1b97c09057336bae63103bc03f8ce1e9500a5293c617fc8267bc35e89 SHA512 d2b6ac1307ccfe71fba12ea5838726c52c4f45a9467a9b0cf01c4e6898fa0744f6c7ea4cca7294b025dcd21b9e1f15d8aabd15c56e2796035b33e8e3c52f1e45
+DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
+DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
+DIST boto3-1.17.33.tar.gz 352659 BLAKE2B b78e3ce86b32d23ade26d93d0c3ba86020a94becb42a866be6ee02f268819eb78fde398b4bd3125c5be6b493b28434c448411b9bd83eb631a3687019aa384ae0 SHA512 452cb1d165afe03a7603999033348524212d62742a026bc51677f5b64e9de98be2920c89f7aaf5999dd676c0c9ff098af055edc01edd97bad239815263ffbd38
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
 EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -23,6 +30,13 @@ EBUILD boto3-1.17.23.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.24.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.25.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.26.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.27.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.28.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.29.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.30.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.31.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.32.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.33.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.27.ebuild b/dev-python/boto3/boto3-1.17.27.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.27.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.28.ebuild b/dev-python/boto3/boto3-1.17.28.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.28.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.29.ebuild b/dev-python/boto3/boto3-1.17.29.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.29.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.30.ebuild b/dev-python/boto3/boto3-1.17.30.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.30.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.31.ebuild b/dev-python/boto3/boto3-1.17.31.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.31.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.32.ebuild b/dev-python/boto3/boto3-1.17.32.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.32.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.33.ebuild b/dev-python/boto3/boto3-1.17.33.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.33.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~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 1597318b1876..7da71fb16f3f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,6 +12,13 @@ DIST botocore-1.20.23.tar.gz 7499542 BLAKE2B abcc28ec69d30ddff06ac2e2f3e2c0dcd73
 DIST botocore-1.20.24.tar.gz 7503493 BLAKE2B fdc1de907a8201ecc63435b2f3cef38ec40ac8cb6b23bf20140db3d5def46dae3a6d66ee0f1cf268bfa63fa9cbcd7f0835570a91b3c538c3303350499e3a1964 SHA512 26ab23f2b3fb8c5b6b0fbd3045761ae81b4abf07c3457307a3b79f7b2a3840b5f1bca5ca669aa98d2465c9c39bb1250f93f2254bace5bfc75849745804f29061
 DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e42159dcc506ff3f0a730e3602166ca52bb1a4a2ea8049b86fe6409ac521e30d1f0ff02deec8550a4187579b9a43f9f SHA512 010aac3c0021c7406471cae2c0b13a33dde620b2d7e5df96170971459b9f425d9ffb2a3ad08a650c3097924ff12b34354983ef36336e2afd0172fc3a73f988e7
 DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9
+DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc
+DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
+DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
+DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6dfb17de231e25db411223a55bc897534e90aa2d7f2a89a21378f8dbbbae52e553333292c1726d11c60cfeea4f4f7a SHA512 3d0d2cc120a1aaa225ebbd2a9393e0d413653c44e55f99094f36d62993737a2f2b5d63a64225e207c4a21b60971fb40eb8c30059efe77cdad6681ce00d4da5ac
+DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
+DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
+DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
 EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -25,6 +32,13 @@ EBUILD botocore-1.20.23.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659
 EBUILD botocore-1.20.24.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.25.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.26.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.27.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.28.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.29.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.30.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.31.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.32.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.33.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.27.ebuild b/dev-python/botocore/botocore-1.20.27.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.27.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.28.ebuild b/dev-python/botocore/botocore-1.20.28.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.28.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.29.ebuild b/dev-python/botocore/botocore-1.20.29.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.29.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.30.ebuild b/dev-python/botocore/botocore-1.20.30.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.30.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.31.ebuild b/dev-python/botocore/botocore-1.20.31.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.31.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.32.ebuild b/dev-python/botocore/botocore-1.20.32.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.32.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.33.ebuild b/dev-python/botocore/botocore-1.20.33.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.33.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~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/bracex/Manifest b/dev-python/bracex/Manifest
index 742c89af0205..1374d3f86e3f 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,7 +1,3 @@
-DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13
-DIST bracex-2.1.0.tar.gz 25148 BLAKE2B bf0c2b60713bc17dd40b9617bc8066e44b5654bd1a12948109a496588050efdf6a31d5e1d31a587cd08da9033520c2f4e0db89a806acd628f7455b6a34a03c2d SHA512 ec1deeb466cf456ca3ab93ecd429b23f59fbac74215cd0de6c447f67be2bc40552dc7ba71331771d765804a190cdbf17eb7c255e976c1fef2f7e47d3351dfdce
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
-EBUILD bracex-2.0.1.ebuild 1047 BLAKE2B 6e95538bd6fb2c2ef5975dd6de844e52fd792b829d8e3971444a13b8a31a22cacba982220625c6c04a21de88fb81b3fce819689d7e6f4d40ddea893a5bcfe7ba SHA512 16e52304611f7eca1b4ed555b6239fac7ccce63f510a600e3c64cce15bb86735ce2cc37517022d5443b2d0f3fb05340580d43d708862ec0b87d36dc390f6fd5f
-EBUILD bracex-2.1.0.ebuild 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
 EBUILD bracex-2.1.1.ebuild 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
-MISC metadata.xml 1198 BLAKE2B 0fd219ffba7d698f8dfc8bfb131e2baad454e2cdea289d8cf0875bdad2cb818d47596af1f47f98c0e1861ef1097e877425fbc15014b5711447747c63511d2e9e SHA512 3ee15cdfed6e6a8cc0304fcac06b1448e413a4d6e7205a1164297f2343cf38672fd3bad03436554e631be757b6026a678bf071af07c86b74dde9ae23df3ae23f
+MISC metadata.xml 1241 BLAKE2B f021bf4d5dace81e1793b1c406b340fda40879d43b45c5671da8b559f06669057e24be540d3fa8f81ebbbcc967e9c12dad360678b1495bcd3b4f9d18387cf101 SHA512 2d9f779d3e054ef89557b7528df5e9a3b9a10f8f2f04db629c1c47007314faa8d83496518477be79a9959cf702a25e4f213935c937dda2411e81d308123c8f99
diff --git a/dev-python/bracex/bracex-2.0.1.ebuild b/dev-python/bracex/bracex-2.0.1.ebuild
deleted file mode 100644
index 3219582fd350..000000000000
--- a/dev-python/bracex/bracex-2.0.1.ebuild
+++ /dev/null
@@ -1,45 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex
-	https://pypi.org/project/bracex
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/bracex-2.1.0.ebuild b/dev-python/bracex/bracex-2.1.0.ebuild
deleted file mode 100644
index 0af93ef28dda..000000000000
--- a/dev-python/bracex/bracex-2.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex
-	https://pypi.org/project/bracex
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
index f0d91e4ea335..59ce61ec8aef 100644
--- a/dev-python/bracex/metadata.xml
+++ b/dev-python/bracex/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 122bfafe7ef4..24f53fb97deb 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,7 +1,3 @@
-DIST breathe-4.25.1.tar.gz 76931 BLAKE2B 3f910042f3822e5887da8239ba1a65bf7b1c8903a514c359ad64c58928fe8fe6b867a99351e18fb394a0a56aa0dbecc040203406a1e64961266fbd69aaddacfa SHA512 417adc7facbd5ec9eb69ec79028987fde537cbd928e3d552e7020377b683816b1b670614daa24c2047d711043f0a9116a09e8c1ca7aecb82db97b1f6fac872d8
-DIST breathe-4.26.1.tar.gz 183929 BLAKE2B ef31c8b900aa2a943dc592b630ce60ecf7ca484fb455aeb081b4c7783f7e25ffe169343a98f2a2635d243c25962bde81b6bc116e6a381ce0a8a6d116a7fb6686 SHA512 d272b99295f2d7d2d118aca61f3ecbe6679a2cf84c143d7fced8387af129f68996e07e513870e6cc2573e39a6005a76e36337b0622bd3e46edffccfbd59ab74f
 DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d6856c377c9ad147da4a9eed980904f09cc04d9524bb20d6495d593c3fb3aa05792b1f0a6a8ce58bff4ca3c29d643 SHA512 b5fc79f8d7728b39e5667d1d763b02a4c0556d9b79ee6b138dc7b1951d9896d18cac1d418401edcb5eb7c4da416c77f177b40b34f85a7ea823cc2d8a4bf6dda4
-EBUILD breathe-4.25.1-r1.ebuild 767 BLAKE2B 432eb6d33c10ba963b27222783a32d94d1baac4b8c065eb57ba7a4bc174eeb41c0f17a1296a221cf612dccf86fb414b2a1cb5641c6e002c8e3188c5c96284b0a SHA512 753c8679b263013821cffce3118750a17c346ab60f0b7b71cd573336b5032df974942ac0e0f4c874f9359a5fb8f058abb1a1da56794fe243530cf50703dd29f8
-EBUILD breathe-4.26.1.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
-EBUILD breathe-4.27.0.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
+EBUILD breathe-4.27.0.ebuild 833 BLAKE2B e49bc8ca94e518b112e89c603ee47a8b97cb75bf63ece7356a6739f741486c3eb62ab61319ae2e2dca76e2c43251b5c6bd3fc11423f0e06ea3ae94c2eb5e37d9 SHA512 ec64df5edec42b7cb8770d65b86f4965269fc564f7367d21fb31558e6e08e9b03fb36d18f997339e3e66e0169e29adcc0ab3deacd18f5e9d77f83f330e7c010c
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.25.1-r1.ebuild b/dev-python/breathe/breathe-4.25.1-r1.ebuild
deleted file mode 100644
index f9905e8b8895..000000000000
--- a/dev-python/breathe/breathe-4.25.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
diff --git a/dev-python/breathe/breathe-4.26.1.ebuild b/dev-python/breathe/breathe-4.26.1.ebuild
deleted file mode 100644
index 335bb076fa0b..000000000000
--- a/dev-python/breathe/breathe-4.26.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.27.0.ebuild b/dev-python/breathe/breathe-4.27.0.ebuild
index 335bb076fa0b..2b72e5f1515e 100644
--- a/dev-python/breathe/breathe-4.27.0.ebuild
+++ b/dev-python/breathe/breathe-4.27.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 7027f9e4174e..7266e1083286 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -3,5 +3,5 @@ DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a
 DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
 DIST brotlicffi-1.0.9.1.gh.tar.gz 22589 BLAKE2B 14ebb3f6168d334abe3ba72bd88697ee98aba87ace6aaf634395ef50ecd9325723f0da0a9ce56a5e4dcfebfe3183a190e2ec183eff95492b25e3542161b32322 SHA512 669c73ed6dd18be6b916bb8cfb240657dcc10d67df5a32b3359f05cadf75aa654c27b53e8b964251f6d6cd74870e159efddf87ef0cfb59b7777eacd3cda66852
 EBUILD brotlicffi-0.8.0.ebuild 1340 BLAKE2B 48039a8d87f6a9108fd9bf0556a596ef9e69ffd5e30034b960023696638de4cb1f7d87e3c24d936c57f642926cc049714cd4f013f8ef81dc739528357f57b0b8 SHA512 b31f7b9941c0bcbce2ab56fe2158ae861f5cfe87edd0981e361a8a15000a885a886f0967d16a93a25547c9a83efd8c933553ce2f0774c11f098cfed04583468c
-EBUILD brotlicffi-1.0.9.1.ebuild 1431 BLAKE2B c451bf329bb4608bd85d45c7d5420eefbc340c2cb05deca13a0dcf5014d33dc33c9bb5beade6e61dabf64e35afa09e47641d280f83d65f041b382bc73edfe1b0 SHA512 13178ba0fb237cec9c345853670f4375e227e741f3f8432cffe1c11a7ce9ebc5e7f20c00b05a4b128097de0b77f78fb8216ac3bc94f3099f60e92a6907a3e575
+EBUILD brotlicffi-1.0.9.1.ebuild 1424 BLAKE2B dd67807ef9042427f1d3f2db9919f0938ac9fa036797dc98b7b0a2eca110f79292fab27c8f314aa64bae3dba50c4359ec896f10799ca36fba6c2b490fc4e6358 SHA512 da9c110153113322183c6a0a3e2fa80d7e047c0f9a1834aa114b4c6e4839f109c138f3577a7a16451583c2a7d33966ee32977441d527ef9a80f7f8c59a7963d2
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
index a0aa1519e853..0ef276a501d1 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index b9708addf93c..9564c56e94d9 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,5 @@
 DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
 EBUILD cbor2-5.1.2.ebuild 791 BLAKE2B 4857cc41aea07863c682974d6fa84cfdaa2924f7bdbb434682fbcfd681ef142debb90ba4eb8a8bf21a80be3479aa0fe11b35bd942b2304a60cde081267637c01 SHA512 faf1ae283ce86f9d59849e32e618c5380491511d8f9daa45b3fb64278e214448ca9032064ff632dda825e4f5245b8b4336ad9c6140cfea2cd8bb428b683c0033
-EBUILD cbor2-5.2.0.ebuild 774 BLAKE2B 0170d1710b721f70ba757f8e3909e356936e4de08cc7e0c2f9e0409b43b5ca4773cbcc0a30397446cdac1986632c0c5ef4f959bc21fcb99aebcd45283b960dc1 SHA512 a4a69dde7678552b6d5800ee135c5cdee52bb740dfe2d68d502573daaf2fa98cbc946b28b9ec3067da11e8da9a7f4a6580826ff0f6e906ce5172af9b5184109a
+EBUILD cbor2-5.2.0.ebuild 896 BLAKE2B 063f14614963d60c90aabf14f001bf724ad3b135c6e80329dfa6af71632628aa528223c605252b18e52d07394fae67451f5d1feecf23353e054b1bfd517a374b SHA512 cc731c63785f9d929f456553b4c2e2f7e9bfd3e50067cad9def7c08c58e43a0af05f5caa72a4b171ee3058f22abc8b93bf1016de696d19b6d5a590cc81ca91d2
 MISC metadata.xml 893 BLAKE2B a56c40664c6526d741a1f4e6be15cb582e0a0402182545262e3f1f489441e94a2c17072c01797e95cbea02d40b2d6addc14027596e4cd2fa49ccb4cb0feadd09 SHA512 1695d3be04f9cb86ea83f3676f5e8628b196b7044bee019ba8ce234500ee1501d013144155fe86ca8f21a10abb35074cd98fbec7da9db7f33c1046229fca9f5e
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index a423f3fda5a9..2c4aa4f6195e 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -11,23 +10,13 @@ DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
 HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~x86"
 
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
+distutils_enable_tests pytest
 
 python_prepare_all() {
-
 	# remove pytest-cov dep
 	sed -e "s/pytest-cov//" \
 		-e "s/--cov //" \
@@ -36,4 +25,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-distutils_enable_tests pytest
+python_test() {
+	local deselect=()
+
+	if use arm || use x86; then
+		# https://github.com/agronholm/cbor2/issues/99
+		deselect+=(
+			tests/test_decoder.py::test_huge_truncated_bytes
+			tests/test_decoder.py::test_huge_truncated_string
+		)
+	fi
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 8172510d31a4..b47a97345151 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
 DIST cffi-1.14.5.tar.gz 475055 BLAKE2B d8a1f83aace8329216f5d36b2e8a27f62803fe9ad12c2d29aa1b3f730d1beb8bad0f50e17102c8673471a7bef57b0755157c4e1bf1a50779ed20b1cfcbb2043a SHA512 7428b3f6e4ee9f3b91011e43304dd63e5cc48479120ae58298c646c1ec1f5c24525d5f08655a7fed70c5fad7ae0c2e0539e512b5fa49d2bc57669c4ab703cc2a
 EBUILD cffi-1.14.4.ebuild 1540 BLAKE2B f08c6a66b21ad371e414e81999821fd7ee49b6b7bb436b8f214161cfd24afabfa490e4faeedbcd72f574b2f96bcd164c40cb4b0041105dd1deed61cb3217195a SHA512 28566fad5dcbf8d0775671c2f17ebbcac70a3a14af9f666a35e425ebcf3b37cc85bd90781f017092d0b27b60a920c6d63ae660e80f0fe6c05fd8a840947f7651
-EBUILD cffi-1.14.5.ebuild 1515 BLAKE2B 78f0578a98b206e53a78a0665c4d68bb9259d06ab2b0761973335638ac432d4ac87d43c365504870e7b278f0e5c12f358904f39d411ec671d210f220471e6541 SHA512 544f8f7d8920764260049d7e713ed4d16e07c938bf2f99066bcd67e69e495f799466a5450b51f11a9905a1643a7057573b51ce471fd090c7efb62f05c4a4e3e4
+EBUILD cffi-1.14.5.ebuild 1509 BLAKE2B fc5ac48fb475106823506a16a1a3e2885231bce2e62f1269994363bc9655eff9bbf1d6748e87ed043aa54137e06b0371c00247202569010b8f7200f37df8fd90 SHA512 f736e6fe9eb28f6c2ec8a4227fb34e5178d3729a8e83fd425189156ad26f027422559fb9d521c214de8a3c68cc6efcd18fcd865b58efe0fe262f253ee0332dfc
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.5.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index fb0d73cf7ae2..985d93d6c73b 100644
--- a/dev-python/cffi/cffi-1.14.5.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 29e3e9c8ed4c..a1fdfe93ddb9 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,12 +1,8 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-python-lint-0.44.5.tar.gz 5657765 BLAKE2B e35fca9cf8232bc802666333184a52b544bad5858ec8e4c16fe435ea5c421ca25296bb9d8a3bf351276dc1e36ee3101cb0c950ca9d8ce87f5dd2f64cf347ba30 SHA512 e23e415f7d5dd3933e70e7c5b0d9d001bc9aefd0ec67ba9245b4cecbad0c5470376439c12d2cd532eb39e900a325de52c4856351bba2ca27cdc0760ed091ccca
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
 DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104
-DIST cfn-python-lint-0.47.0.tar.gz 6326333 BLAKE2B 450190ab374f491c034a93edfdb0d5c006c8468deee285dba676f055557f4017ecbfa68ffb10a052ea2d46aa4c6d94870261065e26bdd4a753978fca76778914 SHA512 b2349730993758578226253ae6ab942658bc3d9326d75ad1ec029ce093112697fb2a15ee63377dff210a33111de9940b391d276c0ff4894a2b68e545f1783fbb
-DIST cfn-python-lint-0.47.1.tar.gz 6446725 BLAKE2B b4e2ce6bfd51a919f93eb5a13d5318392b9e3483d6e8d4645f7c67b82e42075d047b9e565e488413dad9196f79a15b01639af158b0335f0c9360815fd276324b SHA512 8f568d29e0857697fbb82962b6864bdfed930f052fd5f125e993222ebc17bd325ffea373261c0dda5cb899af3a8e4dcf9fbf8d06d32182e1679c491943811bf8
-EBUILD cfn-python-lint-0.44.5.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
-EBUILD cfn-python-lint-0.44.7.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
+DIST cfn-python-lint-0.47.2.tar.gz 6478541 BLAKE2B 1955c6aa43512d4249741db982a6e4e5fe46daa3197d028590269d74690de2f67a1615e4907bfc434fb1e265770780a5c0da2a19c2bdfa8b44dfc7b0386e4405 SHA512 26e2e4cc26090e6da54ff0f90b9e35767e1d5677321cfb84ff00f820477d6ab576e7f58219346f48eb838dccf662df3a8a75e709cfa9690868d85130745f0cc8
+EBUILD cfn-python-lint-0.44.7.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
 EBUILD cfn-python-lint-0.46.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
-EBUILD cfn-python-lint-0.47.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
-EBUILD cfn-python-lint-0.47.1.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.47.2.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild
deleted file mode 100644
index 864a47207182..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild
index 1b41006fc099..864a47207182 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild
deleted file mode 100644
index c3edcec5c4eb..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.47.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.47.2.ebuild
index c3edcec5c4eb..c3edcec5c4eb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.47.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.47.2.ebuild
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 7f6e99a1d394..76f1711d976d 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,4 +1,4 @@
 AUX chai-1.1.2-drop-Python2.patch 915 BLAKE2B df25014f5b067205d3506d420c0dc4925e17ca893212f46f29278738f5d008b9ec34eaa07090af33f22255538d50de49fabf4803edd7b6827b26a6cdd07f44ed SHA512 8278c76ad76c68c7a5cfab6bcbcf7a9b690c736d8377a05c9764f368f32b4804e980700cc7299cd758439168e222b0971f97a02bb99d936d511f648f3400fd30
 DIST chai-1.1.2.tar.gz 107807 BLAKE2B 6cedd108f7275c3dd03167c7ad49695d95c27e1b0c752247e170996f001c7690cede7c7ac8de8e374077ea9802534b8386b0bd2da7197f0a47085ad9f9e470fc SHA512 81191b11a8c5c6bd1fbb0c43fe7855d6e6d9be54b4d0ddc42582a23b9df03249a91ba8ca50b5b74e76aab73a101377624e041b6c47ea6cba5267d4b58eaf77e5
 EBUILD chai-1.1.2.ebuild 462 BLAKE2B c8b6f14753c48788cfe2cd1ccf711239de3464da12282a798b1d57a7d8f460043ee652de75504c679fd280de052417a23fc23a444230a28af9c195b953acbb07 SHA512 e2539ee8aed386fdc825a516218acf88fabe8e3559ce3a9ceb3313081add61c30d5e87081879184320a714dcb1147a09b39e55f75aa8ffb854184091b7627dd3
-MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
+MISC metadata.xml 362 BLAKE2B a057b85c0d2fe96df8ce55659ea49afeb05138143fd5e8a981f1c8b7c1397e90de017c268a1106ba4ac9a060ed9dadee54dfbe65e048d0979bf7d5a2c426665e SHA512 3526122d7650db77057caa9715a75b2e19b848349bcb2c446795c33b08afb91c23200a7ab509e23c6458f60473880792a7022d766a06229be43f29d2f67596d6
diff --git a/dev-python/chai/metadata.xml b/dev-python/chai/metadata.xml
index 14b6b0db498f..c4297d00b689 100644
--- a/dev-python/chai/metadata.xml
+++ b/dev-python/chai/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/chart-studio/Manifest b/dev-python/chart-studio/Manifest
index bf40d222a572..76b9cf6d6771 100644
--- a/dev-python/chart-studio/Manifest
+++ b/dev-python/chart-studio/Manifest
@@ -1,3 +1,3 @@
 DIST chart-studio-1.1.0.tar.gz 51680 BLAKE2B 02aeb188dae3c1ff73faea891b0a9bef775ecac58e79ec4a43f2c0e0ca1ad71f5ba0cd93bd35779e7358b9495549915e23acb2817cb7ecd3becd4afccec71077 SHA512 1ee049b79df9e5f781cf279f03df718597ef4c0cc0dc02975a16b5a8f34f9330636453868f54e12e9ec8484a23c3481dc6a367995b359e1a4c2363860a962256
 EBUILD chart-studio-1.1.0.ebuild 521 BLAKE2B 8141a69fcd48682c4bb94db16b027183df0b6d98005b5b0e9de489f96210c654d41593994a4a0586bbe55ba4cd671e2fee5659895b09c1e95970e0530afc3fba SHA512 9d159e88790eb4ffd52aa170ea65b0e5f7d4a3415bec44638da362fff0577cfc0d6ad93307fe2112447310ffb3ee9ee2eea30a2e437ffda570972d63f617dd21
-MISC metadata.xml 710 BLAKE2B 633a653c6685aa7653f7bd98dcaf52b79d2cf21697312e0547572ce2af049fc42c46769e6072af0021228bd0ab9a2b79cedfcc7aac8c9334eaec035598124d71 SHA512 cadd4997b878844c4d425f0c2c4515f9ed8d91258ff393b317b8c7f946cdcb8ac8c00ed0c15731e3b7b58b02759f621aa0f4e773817cef6de5aa3b962456fd31
+MISC metadata.xml 724 BLAKE2B 1508771febfbd6ed56f55b9db32cd255b84139e53b63341ad90e4f95d71e9c4f2f74d88a55ec4d1b66f1b21004017816e6cc74d62eb8f8e0850823502d23598f SHA512 2de0e70fdefd14ba91b72046f31af45a5f68be8d8955f746e6a35ee71c639217caf2cd2d8d3f44687146fa39076eeec15c5186e113599000528c429631e0b5af
diff --git a/dev-python/chart-studio/metadata.xml b/dev-python/chart-studio/metadata.xml
index 301f9875d592..41223b467a27 100644
--- a/dev-python/chart-studio/metadata.xml
+++ b/dev-python/chart-studio/metadata.xml
@@ -5,7 +5,7 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e037cb4d88c5..d09300708899 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.0.1.ebuild 924 BLAKE2B 78a1cdf53d24ec466a677857d438f341595bb8f9b9cfcb7d8102bed1131068d5140f3dced794e52de9d6f6d3e273e60482554894ffd9326dad976d6bcc7ac72c SHA512 16ef8f0862afdc31cacf3d3c5e23f3af94d9f4178656b2cf65bcb65c9f3969fa86fab5d43b9ece4cb237842fb650e0756d59078bd8390466289c02d074ec4c16
-EBUILD clang-python-11.1.0.ebuild 926 BLAKE2B e99ef100250facaee5b99b053a1886379e78e16feeedbd16db6a7fc5851a8f49ed56885100d4ae51476b6eceedf5094b174a56b2f61f7310e4c082e03fde469f SHA512 b8da10973bb33b04b3cdff83a1bcecc7ea2c307cdfb93c5c9799683c0361574da77cc735eea0f4c70e5c5571ec93bd9cd23b0b3b407d82606c0758b093c90a57
+EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B dd9cb9a70ebfda2d3a440ce5376033e459ca1c206d3b28b1375c21d214597baf705bec6d9faa824c767adac688c4e4b82aed4d531d1139039b21bea39823d897 SHA512 71778206002d4e1d1c340b9083bbb297a66a30d905e5d3a74869c7ecb2b325497f428a4f18e1cc12b5299db192c21877e9edd1f9675b0e2d7cc7ae13545ea7db
 EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B eb88d06b0ea6be7b7918f47b0eec30b399ff1cb64819a8b784cd0242d0455e38658bf89703c376846010c2eecb6c051e963bb8c3e47821dfd7efcb7416f1aaf4 SHA512 4eedf397fb83180c54a1f1b6bd9523abbcee38331866d35ba35e2b106f60a6fa5afd510b17c691807f674bbbbc46777c6bb240e2e11d2549f2c2f48532517606
 EBUILD clang-python-12.0.0_rc2.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
 EBUILD clang-python-12.0.0_rc3.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
diff --git a/dev-python/clang-python/clang-python-11.1.0.ebuild b/dev-python/clang-python/clang-python-11.1.0.ebuild
index 9b562d893ad1..33f1dfa8da5f 100644
--- a/dev-python/clang-python/clang-python-11.1.0.ebuild
+++ b/dev-python/clang-python/clang-python-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index 3cd76e602891..f131c7bc9b14 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,3 +1,3 @@
 DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
 EBUILD cleo-0.8.1.ebuild 622 BLAKE2B db13d0489a89cec6630dccbf51f6d907b641987da04a32b51f7fd0dc437fa84eff49ef6dedc41c09480c82c42ee117f380b4401dc5c83b6a97ff9104cc4bc033 SHA512 5d76c38bf5f183ae918289b7b05e28749bbece0de7aea0379b90dbade92a1e2da0d2ea608891729b752cdb130818eb64d2ddc996fda82814ed5ee35ce8f880ab
-MISC metadata.xml 532 BLAKE2B b91577228ac15276ecced8723c229787c443d953c5f0c0491fdc6275f84beb2b04946420a64909bb555f20a8503e41878ea304c1f13e58c1b4ac7a8af9703cee SHA512 de3ff2272ce714cccb698faf5277b6b45657b53f590de7f202848d9c0da00723abef00fdc478599265aa0b432e31493ef171d3a8c9f306a1ba46d82beb2106ec
+MISC metadata.xml 562 BLAKE2B 04c1812ceba289cdc88590bc98264bb36cdabc1ab5e68598db7660102c8ea7e73a224684b786ac70fc63f0a9af7d441bc8f49c228ad17f0af4ef5ae7d11c1bfd SHA512 d96f90c9703f2ed8dcfd17cd5337b9429ada60de6efaef892510d2ba3f080bf41d69161e845fd46ec9b885fca12dd97b51d96566345152b4bea5e1e1e6a9abff
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index c57752eb0781..22e0263a3469 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index 1b17cdea8d31..d4a3db9a8b55 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,3 +1,3 @@
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
 EBUILD click-log-0.3.2.ebuild 533 BLAKE2B b5dbefa10c70f06a4b5be86561b11f29d0c27f1ebe54916fcc3b1b7aa5aedd0b9fc49bf58f1be72d8e8fce2863708ebd591d29768915b9aa2aa5e8ba91f36743 SHA512 66ff945135d51d23ed1b8c19cbc40f6c22743e48beb96e7db0116eccc9769239d6896de6387cd0a7b7c2e0d54da18e07c1f6fefa95a919f4f65e8033cba78816
-MISC metadata.xml 352 BLAKE2B da4fa1487d5ee53e0f682676dae2d9dbdb581ebe4289d2673ebfe4ab09759b6d7928c24b28cb4ade9a4d55e05c6473356590190327cced4f2b87b723d15d1c2c SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4
+MISC metadata.xml 352 BLAKE2B 074401e90afb56f3ff7629b43ee84b4e349ce3ebad89331458881b954598d3e47be78aaa4743c206df472be0fd1b8528f32290db769249790612f75943f2e618 SHA512 33cf781998cb3d633b4d09d276b882f189027a273b36f46919e0eec88e4592d8af10753fe5f690988f7cb59323d8d31d5ea4a980460810de99b166d5dc0c2c55
diff --git a/dev-python/click-log/metadata.xml b/dev-python/click-log/metadata.xml
index 7e29ce9dfb6b..e27822d83e81 100644
--- a/dev-python/click-log/metadata.xml
+++ b/dev-python/click-log/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index 0f5505aa6868..0f26aefad039 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,3 +1,3 @@
 DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
 EBUILD click-threading-0.4.4.ebuild 592 BLAKE2B 6a73c50f92e8354f72def92ace6ea2324ad5b9a13ece58d6c33d5c590690413ff2786b85d05e42a1a2190a8d7cbad8a05a95f1171a929b4c7b542c39fba5890b SHA512 0ed381d2b1037d1a75324294db5e63b5dad0ea4c854833b0cf918f2a27a267aa433b861ec94db1d5e85d3ea0ca3e6a92eeee9df0ab3dcd09f1203dd619568919
-MISC metadata.xml 364 BLAKE2B fed4e1a2699583fc6fe19fed19523c6f452639fb8a6fa7ecc3280207808d83d993e336d2482341390bd63ef8dc41746ba3a476995cd34c436e8360ae2b2012f1 SHA512 bdc9d9789f853bc0bb5a1cf03141f34baff1dcd7d4d169256213b08df47487ffd29edfc5e567239881b00fa81c6452ec50b19670676039044b80d6ee5dcbbbbb
+MISC metadata.xml 364 BLAKE2B c32b7b0c548c7443487f628dfeb3b802807830ead46824d1aed757130ff614755890632afd33101de65b939d9a7fc34cb5cd5b236ef60af14c03f55938a95ff1 SHA512 e78befa435da19a782ca4d10c229602fbd0a7cee69a1bc8bd2bfb7c1de6bc3e5f36a7c18aee7400aa57bef8b5bfc66ef685e58db9a74b897c4c1059fcdb6d4c5
diff --git a/dev-python/click-threading/metadata.xml b/dev-python/click-threading/metadata.xml
index 954de9756124..c3bf270caba3 100644
--- a/dev-python/click-threading/metadata.xml
+++ b/dev-python/click-threading/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index e64da9117411..b2709be8ebd3 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-3.6.0.tar.gz 80464 BLAKE2B 2b7efb07123fd9939c5717d6bdc1685d2e6474f3852e920c8d93f8a3e7ba20e433dbead97040ab035c4081058b621740ff64045c282a0568393fe8453da245d9 SHA512 ed4077e8b9e848dbd8aebb076b9f55086ea861cbf22322f7c9fb03a66b88bd60f5c09c6914481fe5f02bad25c0183e245405d9ac54d37b6bf0f14c9c97bd7684
 DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
-EBUILD cliff-3.6.0.ebuild 1166 BLAKE2B dc3b46b9e2ddd54f6cce37ba5c66ca23492f777f015c6719cda6ddd9a4228062d074952a405ca8ebadb1a825477697dbf10c269fe9d6afb43d5d7126bbfa0287 SHA512 2a80ae5c68a3d99e060c1b53ef05db30d8c15e12b01eb6b5285560dd50ef605acc5683e03080d9f949c40f52ba0cf0c2dfb40da6db36647b085addb6727c484b
-EBUILD cliff-3.7.0.ebuild 1166 BLAKE2B e89da7bdd0205270da5e3fc9e42c6465004edf82c46933f4024a5ad039db7ffc29f93351266442031a89c6b3c5484e7220427cd819dec08feea5beefca6c8a83 SHA512 1931493eea1badeca99161b6fcaaddafc7d4106204e3e9cfc8e6de861976d5e6cc5643d020701b5f96c255b88533ea7699c56a5f904f5ddeceefde5058b6014c
+EBUILD cliff-3.7.0.ebuild 1161 BLAKE2B 2f3fd9440836873ffa59625b35688191ce9cc2e56b97b5635ded63d05ed1fd5b0b4a31af630c5d150391745951b1f463452e21e0b0556be81176e44304fc4e90 SHA512 144648f6f9e8e9723a15af1201d4e2cff8fe26724ad158c0eb66d6eb56a3523d9b36a6cf0d5f4a35eb16ac48712f95464c608fa5511afb7208d2c029efabdff1
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.6.0.ebuild b/dev-python/cliff/cliff-3.6.0.ebuild
deleted file mode 100644
index cad6510ed236..000000000000
--- a/dev-python/cliff/cliff-3.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.7.0.ebuild b/dev-python/cliff/cliff-3.7.0.ebuild
index fab20af93f82..5254b30b3a81 100644
--- a/dev-python/cliff/cliff-3.7.0.ebuild
+++ b/dev-python/cliff/cliff-3.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 9f7777fc5312..3aa6f24b6de0 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
 EBUILD clikit-0.6.2.ebuild 830 BLAKE2B 30f83793e0507e4209cdf0ce32e87ba024c8599f1eb3b87ba56bb200b062247e867fc15300a293b32f0a125a7165fc2deadce0911e5af334e3c7a5d940c5de53 SHA512 8a9e9487c0ba53dd4a4bacb51a7def30f397719a8070ac47ab80748684b69f3e1ad5e5b67c24598edb0c02e92c462cd3a40ab9d7ae1dbfd97c5c8b4e1ce21f0b
-MISC metadata.xml 538 BLAKE2B d7d6dd5979929cc05de8a1f46879d3c393dc827931c38581431f10fa434fd2abbad81c20c47877b05d0717931342bfc9cda4ea76a42157a61991493a2f27d99e SHA512 17fc0e1601ba8604fd49f7217b495ce59166a1ae4fd5bc7f656b7158ff33c8fedd46f6d1aeac8324bf918c2e91ba79d5cadce53c677fdd1479afef8d14cfc4dd
+MISC metadata.xml 568 BLAKE2B c63b5848942ed31f00c5cdca7b28dbd3820d937374e76324853699dc267a825a2750a8836f39a7f93c41d75b430cf6b12c5db32d4403037300b2cc1288482dbb SHA512 174b989593a1d42bc8f535761a01b4158e79a89809675d58eb2585d400118b899daa8754888b097f0b39394e5b522be09a409441b33795ef9d37e11e29df8495
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index 7bbe5b12b85a..b4ae56656370 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d6a299af4c62..78575b07a9a6 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1,3 @@
 DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
 EBUILD cmd2-1.5.0.ebuild 1406 BLAKE2B 59f9dff3907bd69222f7f9f9cd1fcfb03cf08cad75ee951942b58dd29fa9e4b950883631f73b079c1b887fd348ce71b99bcc66a959fb831f4f9114f1b984925b SHA512 313d412dd2e175657668e9b250541b9d2caddb3db078fccd35a75b20e4d5e08a0ca9523e26dceea0c359d35fa32f7281344397e5faea30db519ba4a7b0b8089e
-MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
+MISC metadata.xml 521 BLAKE2B 30386914ac906a5e6f08eff94faed7cc964475aca24a8055cd0636d602a1f8812936ae6a0560e7c31796d3461c07fa010e0b1d4d11eb1f6d3bbb6d414f475e5f SHA512 681e363e25381946d07e03d94649c8be03b50fa2415100be0374a69cf6225a284d37fddb002cadde62ba3ddba88e91c32d1d09e4a81266bd0fcf7eccab963bf8
diff --git a/dev-python/cmd2/metadata.xml b/dev-python/cmd2/metadata.xml
index 8275fed1c8bc..78359abe88b2 100644
--- a/dev-python/cmd2/metadata.xml
+++ b/dev-python/cmd2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index eeed982a8f9c..199ff212b022 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,5 +1,7 @@
 DIST ConfigArgParse-1.2.3.gh.tar.gz 27858 BLAKE2B f8dbb1dfc9312107abcd0c715b93736cdb86a7742270932d13b768ac7a13f805902f026d5cb34e196a8c5c659af65c13698c2cc301b522b99bb0c019b2c0e68d SHA512 bfa8f9ca8ab5c6d4cdf2a7e7c577c99fafdf7f743c81057bebbb6045c45de2cdbf5d738f7765e5dcac5a45baa92e2a8bc7ad3879776b9cf4862e3da94e78c4cc
 DIST ConfigArgParse-1.3.gh.tar.gz 28274 BLAKE2B 0ea46747425d978da0de35e7ac29c91ee637f1c793265eeecf702ec504b1d1083d31bdaa48134de2916733f845cd68690af2ff0765b3a5bdc98365d03aad4492 SHA512 7f7048babacaada3495ece42d6bd484b07d648c2b2c1a8e700379aae6c65d96c37bf15a20f90281e2c0d83948e22986689c4b02e0388d9bf01e77d9d1561b0c5
+DIST ConfigArgParse-1.4.gh.tar.gz 30079 BLAKE2B c070e245665bc331efb3a0b4d2e5ad0486859a7f28dbad2669d897d1857b58b1b1b48cb57d34ab2e5de5c21aa2a3554d728d6e48d5aa4c3a8c494fdc2ad9f615 SHA512 a2284da53e2417022c60dc637c6e4f6c7eea6b56790926982e35483bdcdce0cb349c09d02968625ac3888a0cb13cd0b5182f739c31a95425f9daf12c8b00f5c0
 EBUILD configargparse-1.2.3.ebuild 724 BLAKE2B d4c63814f7c0e638961e225b5e70c9c0f905065940aeeb0fdacb9c5b686593c2013b7423a9b8605264d0be8428306469568132d85881e5dd8d9c88aeade3e7c0 SHA512 422753e0534d5a8e0f762604ba4c7ce3651818edde0b00d1dc9c88eefdfb9bb9f3de70d249a6d8197ca51cd813c87e3bddea226a4e0cd13abb6724fc8fff98a6
 EBUILD configargparse-1.3.ebuild 726 BLAKE2B 757e0a3331a1c4d444d683ce1c9e9cbaa14f0c2710d384d20321a16dff02bd4607af89f240de4e916138f82f0d9432bd5100031bec8d4668e83f535e0a1009df SHA512 9a45b05452df4ec1c51ca6646d99180e09cf8bce88e716ff1c5bf0d948a1c1dcf73ecea7ecb814329228164d8d9252fa02deacd441bc885d162f9f57e51e817f
+EBUILD configargparse-1.4.ebuild 770 BLAKE2B 5a8bd6e5f7a62b050be366afec306031df76216f74f33f1c320af62cabdbe48dde5207ef539a89d4c77923bfe2fb64b6341758429503cdfbf87fd0c20d6ce5c8 SHA512 d05444669f81301fe15c616c93460939d99681ded9cf1b37403c7405d674e736ef5835a37570e2c2fa761d2b6fad9605c5acec8004484caddbb23b1fe82b2173
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.4.ebuild b/dev-python/configargparse/configargparse-1.4.ebuild
new file mode 100644
index 000000000000..7a65871f9e14
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="
+	https://github.com/bw2/ConfigArgParse/
+	https://pypi.org/project/ConfigArgParse/"
+SRC_URI="
+	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index e86728489fe6..395ec44c1eff 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,3 +1,3 @@
 DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8 SHA512 7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d
 EBUILD configshell-fb-1.1.28.ebuild 512 BLAKE2B 4112a432bad38003c2b99bc80b507d9d46e500d6b73ba8a07bbb06428e92c43830a2970cc560aae4c1c4b55731174e597441f39c1046a8b3efd24e6bf97b435b SHA512 3782c0a69974caf37b7987f190c1151ddc0169785c6627185ae9e57d77707d23cac0fc4561633f28858283902d437a40f01bfac2af65394aead89335f7b788bf
-MISC metadata.xml 960 BLAKE2B f18a51e6e07f655d13446a233be2545e415c2b54c05b65e50477997a03be60043b139568101236af8c94a2b55b42d3ed1c98954e8eedcc4a6dd1ee8b660d9091 SHA512 bad17976b4d235d19c2830bb79a3caa0beaf4b09603f3b04a5fce001a65e6718ec7b629404a6daddab4100b3d2dfb9f37b5eabcac5ecff99f86f90f8c308ea6e
+MISC metadata.xml 990 BLAKE2B 95fb55df369ac8e568f6b88572ed629e8414d09cf4dc92f70642a05cbcf116fe8674932bf9b07acd6998659fea4378cb48a10b6de5b0f4736be68068b5e8a0be SHA512 bf19b525d6b2bc1be9b2abd223c6bafa4b150ba5941312d5d999070433d74787cfec1b03f9a596b0c4c6254c620837a54abc6806f9f32d206152d0ecff2554ec
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
index 0ade70ce933e..26b33bc76426 100644
--- a/dev-python/configshell-fb/metadata.xml
+++ b/dev-python/configshell-fb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index b3f6932b0a6e..37b4a2fc348d 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -2,4 +2,4 @@ DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1f
 DIST confuse-1.4.0.tar.gz 36020 BLAKE2B a11becf564c84177f919b4c6936dc9452a2821d9dec190167d8eefc141c424323a2cf1934e608028ac07c7290eb4e139a9051904b13fc4ea00594185db10ec2c SHA512 4a06568f3369d08f177e9f639f59511c565961b15b6a8bc3a7fd244396b47c19c163aa05abab96cce5078b962a98763fc0c5739ff8bbd98a5976696ad6240c2d
 EBUILD confuse-1.0.0.ebuild 947 BLAKE2B 7646728aa4896f5b02de27f5e306d7b6abf7a3ad2e498b2873bcaea4bf38aa990da5bd0af75fcc30a56c13502c22fffe95f3adbdd07b72ede9986073274c1e30 SHA512 2dd66790b600af49ceb0c817f305cd57cb31b940fe9ace76abb0665336444f3e7d7eae7162f2db3166a26483ec0199d7aea633a8d798c5b3879c0546452b3bd2
 EBUILD confuse-1.4.0.ebuild 710 BLAKE2B ebab635705b36a72e14154e960ce881be1a3a080c9e694d4a4dcc52ac052c0dfe4588b205f4d4d17c9d21ecc0d48f5899ebba0cb918ba8513e38835b5cdb5647 SHA512 7d89f06d6b4a2890860dc2b8856ef49c137b320afad37694b4a058928a15385a2473ad2fa362547afc2130fd95fde77d3876bbab2591f484a6db9e193a5782c8
-MISC metadata.xml 746 BLAKE2B 0bf69273ad54619bc158b823837952e24962f31420f00bb239bb647dd54dcecaa03c18b5d587a1c3c56f8f60a7e5e1f2125d91643a6f01e2cece5e2002989acc SHA512 ad6c5bf41154439c02d4b4fdbba4f49542f9149eee175bccedf504e3b9a371f62a578b2710154f32edc24144996eb343102d434f752269aea651fafa9c87554e
+MISC metadata.xml 776 BLAKE2B 4adb1f8dfc17178e0a31a60768e7faa81303a3a89a3e7a1ebcc809f46eed06743c07afc69d702bc4da7da35d18b8e5186a52daf19a1aba9a15e7ca5fdbee6a37 SHA512 5d5641a7653551fe9909155009ab10f627f29634fd00ae0b142aaa442c4f8d947114c27e56945fa4a7b0e492689a4348c25f359aba47c6ec893f73f9493abb38
diff --git a/dev-python/confuse/metadata.xml b/dev-python/confuse/metadata.xml
index 0f6926bfc340..f084faa2ef82 100644
--- a/dev-python/confuse/metadata.xml
+++ b/dev-python/confuse/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 526dc49eeac1..1a9344d76e46 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,9 +1,7 @@
-DIST construct-2.10.58.tar.gz 1184881 BLAKE2B d1dfa005542505b0a154f3c0ae74a1708747b1e7b9f5dc650b924169fa54620719bdf5bb868e616ae58e8890f547eaf3bad5b02ef1f7f7ffeeadffaa87413041 SHA512 8547847e3fa15c020ab7d178b229c5b93744b48497c4cf809a93527be5776eacd52783a0fa38583d694c262c119835c989fcbe0936eb247ca844d252c4bdebb5
 DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621e0fe901e5f8bdf9c0aea61e3ddd2174c71767601be3533092a6a28748597cd1a044e4721436748b9a2dac81b81b41b SHA512 bf5867efdb9e1a27ddede6844f5f3466714e38dd97aae09c6990582989801605eebf90099fb3a0ab78deaed4f3b6be38421b635f6332461efd033d5fb8c2c1af
 DIST construct-2.10.60.tar.gz 1185983 BLAKE2B e263c15db9d8055db854508f767906e51fb260c47e2df17e2786277a3ed66e9a8599f21299b21d0629997c6ce2afd7651e18aee4c7f22d3e38bdc5db5bd53bd4 SHA512 597e4fd9f0264450fe221e100041a897d25794bea4dd5cbf5f58df8a0829a34490daff10764e6329ade165df631ddce661dceae4417d8f55472b2fad2a53e53d
 DIST construct-2.10.61.tar.gz 1185872 BLAKE2B 03eb83b707f607f65f13f6430815af3f91f728e133cc1a889f4ff37e34b249cff8f8b13ffb764fbffbba2bec699ce94173e3b80498c42f8fc7628a125b659188 SHA512 dd25f9646d55c4914fbb506b795dced01a5a2d58a9d8378ceaa4d5ba666c9547e96f7a658e8d521ef9a3f53065e89b90e0c8560bc2eb4095b9ff8077b840eec4
-EBUILD construct-2.10.58.ebuild 970 BLAKE2B 2b58bb1c15f9c7d09c1dfecb2acf5d8caa92d3fb3e784c2c6541f8a5c90bf74103cf6847cb69af0c960cbf6793cb4871891d096cc2a0a700240e2086da589124 SHA512 277dba7e98ad829646f21de7ce2254a474bd17bfe89de4d419a6bdbbfe73aecc5a5eaf9721c1b83d8fc61c0e11b8df6119acc1bd3946c9c43492af7126990b4f
-EBUILD construct-2.10.59.ebuild 1015 BLAKE2B 8e32535cf7d7b191659d8a526ffc8d1a95d8560fe2ba5c45bf3030a03e0813ee69f450a8cd641c3cb3a208f326ec90d5c46d4c2373d6c587ef32cd1a4361c918 SHA512 cd9992730f698d77c4ae101337fe77d7845e140ac0f9d53f19db386feaef3f2cc24f1af49bc4c9bb05d013791adbb03e30efb60da76560a4d620f5ace1be7768
+EBUILD construct-2.10.59.ebuild 1013 BLAKE2B b5711fe7ac6b15cee8e6ec6bbf56d7eda79080b667d7f9be0f936b2c73aecf14b5a4592b549113e76824a3dadffaf41ef96ff2f5ccb2f2799fa983afcd7fdda9 SHA512 54d9f8a6f75ce3e7ba482e895aaefeeeb24b85ec166cf99c66f673aa2f7dee67343add9814caa367e2ca82ffbb8b9051fc5ea32e94197fd6a7814f95212d97e2
 EBUILD construct-2.10.60.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
 EBUILD construct-2.10.61.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
-MISC metadata.xml 515 BLAKE2B 00b3219cc089dbf190241934b982a6155be3615af84adda69d91e4b7b3bb9c695dfb72561ab192174db13864631add00baa99a514106b989c9c46f60562b09e7 SHA512 bd35a07c3196a166cd5f8839f4877dc44b98a739914b2268ba8855839ec7244ecc4ff3d2201db2e2f309dd870677ca8c55b7a4560727fe0ced815fb63f0cf5dc
+MISC metadata.xml 529 BLAKE2B d84b9d53c6bf6326dca24517df887c8edcb5ddce3c991bbcbbbe0b88df079f26e42d7bd1c634e6c769c9c784976f183e1f74f05d5476be4a5aabd22ad1be15e0 SHA512 6ccf55b1d39223fee6b243d86f918d236f8dbbc7583b7af4ca0c30d539a3998f74ed5d405d8f7381ca9a06ace0a7b405db0eec669e6bbbcaa33b6767639428f0
diff --git a/dev-python/construct/construct-2.10.58.ebuild b/dev-python/construct/construct-2.10.58.ebuild
deleted file mode 100644
index b5c88e1c3afa..000000000000
--- a/dev-python/construct/construct-2.10.58.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm tests/test_benchmarks.py || die
-}
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.59.ebuild b/dev-python/construct/construct-2.10.59.ebuild
index 09b4e4cc3146..c6e6d2e95211 100644
--- a/dev-python/construct/construct-2.10.59.ebuild
+++ b/dev-python/construct/construct-2.10.59.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/construct/metadata.xml b/dev-python/construct/metadata.xml
index 1fbbfd23ddbd..8aee3012eacd 100644
--- a/dev-python/construct/metadata.xml
+++ b/dev-python/construct/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index ebbcd300cdfa..0eac6ccd3584 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
 EBUILD cppy-1.1.0.ebuild 449 BLAKE2B a0f5fc3e9a85bad250c51f9b19c3f98a0e4074c45eed04480d7507a245ade459bc31c6cc74b79dfd8fdb996bd785cce6978a00c883a4a113b8931fd94313162c SHA512 037478af21cee122c2402d82938b2895d1920f003f6177b3e191214e63562732a7939168e8af21e091f338be660402537e1236829c1b1f31c6e9e370f840a270
-MISC metadata.xml 825 BLAKE2B a57826e675f337f60df2024e4f1e719425112c70a192e3ff45e091f2c75cba7587572ebf23e84b52cc78783d67ccb6ae96a2214407485b886cba09e29ad99f92 SHA512 2c92243896cfeadd31868b9a99d4a36d7d1c88931bde44385c62f8450e116b64a19f7f7d613b81584741281697228571a3073f18267ab49341f4a6c2493e6c83
+MISC metadata.xml 839 BLAKE2B 5e5a08edb8c9ac805cf2a0d1bf21050705f59a89888bdb3f7dc8fe2379a3de10d928161f21360d0a690fb2270819716c8dd72c436098f62296935f30d81a6bb7 SHA512 6b64081cea844ec746723a3d9efe90bfede222f00b2135a80003984d3689901a7879f00f9ff3465fa5fe3e60dd923318653f1fd5582e9dee861fb6d31cc23649
diff --git a/dev-python/cppy/metadata.xml b/dev-python/cppy/metadata.xml
index b3b734f45ba5..1594d171a6a9 100644
--- a/dev-python/cppy/metadata.xml
+++ b/dev-python/cppy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index 0e7322c26f4b..890d4da19022 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
 DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
 EBUILD crashtest-0.3.1.ebuild 496 BLAKE2B 58083b37da7cd656c70b63becbfafebbd4fb4d905d8ef59c46a860257ff3a72e3c6d2e1fb30c67557c735b87817a86ddf4c15d93452af4da0d0b230720695ff7 SHA512 e183b4b3af17d910565883079f1ad1b811500d4d3ac8b2503767abe85413d10ad1813b5b0b220c399b10d4963624c2a4be58c65077c012e5e4e45210b7ea241d
-MISC metadata.xml 542 BLAKE2B e2c84e93c6fc4c14c59968e0579e5c85ee62de87bfbe904ef1f8dfed6ca8e138bdd529ac7372b461f98e74066d6e0d044cafd9f4028f957ab5a935e023c35003 SHA512 e510ae258f7df4c8cf54c755af29f36283bf0e60dd0c9eacf566d8cc0c8be56db46e1bafddf68cc2e9ba02531d3c5df86f4c7df423ff18b944d000cdf5a148b4
+MISC metadata.xml 572 BLAKE2B 213f7f6ae735e695aadc141239a0b53f9c54ba2d66af99706981d576d62510f35cdaa9b1027edc29c20566fcd2b4189226cc654949d1f5e57cee0dc1a53f175b SHA512 6b16891e6d38c00eff2575505312ad0c87da0b812a9d6443250e6ed254bb13a5ca42efd8f127d477622b6758916cf9cbb68f148ab1f6867d6b3c5d4e824b1b4c
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index b3c1cecc09e6..0429414d77e3 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 92001774df60..d394334b5689 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,4 +1,4 @@
 AUX cx_Freeze-6.5.3-buildsystem.patch 430 BLAKE2B 23dee2067c28e9e5ef610b6f76e2a25709d021dd2f2bc2da830f589f06e5487b0f4c87230e6bba62441fc17b1133e352a0731934d4e524bc941de14d4acc397c SHA512 8d87172b1ef949c029d619096fd7123ebcb0ebdf14b029e783ffb0c751e068cd215d8996c628b7bc328bdbb82a129e94e3c582930d7f0da1201ac646e8287464
 DIST cx_Freeze-6.5.3.tar.gz 112334 BLAKE2B 77558e35ca13bc598a810ea70acfe59901c036daf37b2f9582c4f2761680d54d5be559e9abbf16bd995d7f4a4e7bd5d8793e0b53c24111767d54a69c633c9b46 SHA512 37ba5c920306ff62a21ab46c1b9fd6b1780864095d00223776c308fa28e60a5473c74e7da4e7478725de14b7f5628d8d8445f42c0671bc502e5e2d8ecb5ffae5
 EBUILD cx_Freeze-6.5.3.ebuild 519 BLAKE2B 1842fbf6cda4f8105dafa6d63ab181b6b7754554c4f94567220b0b668153c7e568afa1d5213a639bc7c4b3339fc747d054a60b2288c3423bf02e3bcda4926ffe SHA512 0db8a39d2d403049ac3af39f0849c76d1978f5591279dacd32062f447e1a6aeca0f91c604870413cd8a258f093e7d6f1980fa68a77108887c470f84a9ab36cf9
-MISC metadata.xml 383 BLAKE2B 13c4a4f37be666e88f46028991368ed9433f9b8a4ca7a8effc5ce8891097de998172f2b5bb48abc8d70b83924d53ced878c26587a8be6c7e7de5b5bc56b9aa21 SHA512 bcb366bc6b6951f6c79e6fe14b1ee96bf7c803a57c81f48461eeb2779dfb12fe67127fe301c01c7eb2ceb33690f64f8e83a28a9a78168a0c2470754326301637
+MISC metadata.xml 383 BLAKE2B cc6ea0876b2be777bb2d986b6e20f2dcb8fde13c24f006b0d183a5617d1e97814d4d208269efae00a50cc122d2fb6ab1033971bc266ddb5a449ec758c748c301 SHA512 6fe30a7f6e40c62d0f4e83a204371530a2b11f83b1cfbddc56652574d6335fdbc8dfada889721f6a41c507aaf38a2885833fbb4f67c4c901d8ad230ee0ec7f16
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
index 5fee1ea6efb2..680e63114f90 100644
--- a/dev-python/cx_Freeze/metadata.xml
+++ b/dev-python/cx_Freeze/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index 82fce8276860..a4bd7ad88c83 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 590 BLAKE2B 68950b1e0f8c5d0c4ec09e7ad7c9a6f90419b5ad820cd406dcaf08068c15e380c5dcebc3c9f4723e883703d4b200179ca9ae5deb26cb9e6d2b64850ec6ac2172 SHA512 3743825bb7b8a459304aac20450d5b11f4bbbae3755013f9888c6034bf608567fd1c2879901772ab5ef3ff78a6356cac3ca69a0ff54dc52e60e09aa5443ea36d
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 608 BLAKE2B 3c7f09fe8aac9ad64e8559656aae72fafece5f31ce7403d1ef0380b46d6cb2035173241f4997a5b400423c48cc093b3add9781cdd18f469e9c9e1540581a01f3 SHA512 8ae66886667e95554eeb0e5431d8c5f1ed521ad9dff3be3165459c09fc117e69b44384c99362db76dbebe05e20942eca60400079b13ee9e58d2309af897275a4
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index b7d373a71772..9bda8da9ba41 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index 80ea7ab1ee61..3a86f50d39a8 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -2,4 +2,4 @@ DIST DBUtils-1.3.tar.gz 91733 BLAKE2B 8fb3fd16208c27fbbbbcbf1e7b9de2d4d2e8008916
 DIST DBUtils-2.0.tar.gz 92911 BLAKE2B 1822f85b9da1bd7936d01f8069deef10e8ab9b7a5c89de718071cf4783f2845357ccca0e85057d430c57f33a2a7c6d239f632032397bb1f0013a40e42383b5f1 SHA512 7818eab572db4798d0a7a2eaed6c4ba91c79c8517da56db21c07525f0097ca80c0beef1c9608b0b80c3a93f1372f37de7c8ec97f2e33dc4dc4a3d464c5981d13
 EBUILD dbutils-1.3.ebuild 1012 BLAKE2B 07f797d18ac9b71d87a21690aeafc8e72446b41cbe2d79726375c32f5feba58fd5d95d9ba038925d4eea5ff52ed5a7cad7e2186b095b54cbe162ce673aac055e SHA512 88c342c551c4e99a7157412bfa6aa1daec371043907c5cc935356e46e9d26f04365f1f85940d51113302cf36a9b6f6eac1d23cc866c6616e6967124599095830
 EBUILD dbutils-2.0.ebuild 990 BLAKE2B 0bc02f3d9dff4c30bc423bc01710bc5af4da8d14e826d4fb820ed6a3fc875bb7cc7448a7634b7be326b7383b01f6d2d6168fc8c7578d0ac4224db5b671082824 SHA512 e5d04f01b774d745a5704305b39c5adbc527588b545ce87a37ca4459653fa8602bba253ae2e657758228d192f02337004e34e1fcf0f009cc6dd14ad7c889bd8d
-MISC metadata.xml 873 BLAKE2B c580cea1451a08f7e143041608c2cb39fb01cb67d5bb2b5f734672e27d02cd9ab7c66d84645b3710269838c84c2fc28f2e79b66f313fb9c308bd474307754e82 SHA512 06ebcd8a96fd0c1e3152c45fe6df8e622945013d1822e47ad5cc87979d204fa0ba7eef61031983f91f74261b28792fe18ca6442311b85b4c074d2155e352e62c
+MISC metadata.xml 903 BLAKE2B 73fdef24409624619e49420a13f63e0166f751cda32ef49e1216ca19a93d7bb2a937ff5ad94ec0424dfd88361daeee7a89f82faa3ea864a61342e9c2e601179d SHA512 8c08f9185a918ab9eb2b529cca13866837f83427da2499fc8ff26e30f71c021a17a7a4711f8e1e8ef43863fac120428459e3c188df6c53c053c9068fda9ddcbe
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index 5f3a181b8872..87e9a30487aa 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 09b5d56a4303..82d1d8b16af5 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,5 @@
 DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
+DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
 EBUILD ddt-1.2.2.ebuild 617 BLAKE2B 2c6384fb5b3f75c07ef4dca2da30fc65cd572fc76ff36fa3e0090dd4da2b613673ae8bcab6edb10fab9d8804de309a1c9c9664c95c4506ac9d56d42c062ce0a5 SHA512 5771f0000c0986b276b4c122d72893ce4059b728cb1c66abe7ba80216910d5ce629a81c56063a60173385a3553d97691001da194987449ed508acb41a52e1bad
-MISC metadata.xml 626 BLAKE2B 38700523353a601a81f8051783177167efb8f07f07348b6123070bf6933fc4463f2ff86a9a96cb5fa638bb92f695a5c932f6567eac7ff3db4e6f7488f0e135fd SHA512 e846017dd044c76958586bbbf7578d49f93a2b2231827a8d779e18649c3b1a6307cef13f12f01241d7fcbfc2bdb880f1dc9d7adee1b41dd9697a5e1644af0800
+EBUILD ddt-1.4.2.ebuild 601 BLAKE2B fd2e31753a74b3ea22af4495582282e330e093bc87783c75bd283b0a1e2411e8f96dccc6f6e2c10582e8bdbe377d5c9404330e6d2019116158fc08da7083f4ba SHA512 b11d3ab30a0022463af68553d8ab44b290a04fa0b7423df635c976ff67863dcf8b4c4f46805fa9ee25c0fa28e4cf0a0d204317f0a6edcffa09a9fe4827e47ec3
+MISC metadata.xml 636 BLAKE2B 073d2c7d879b92927f8fa037b79eb9a947b3acc9decd241e8c1ba50352af45f27480c02061d264ae3eb5187061b2f2df1465ec6540590edeb871d29eacfbb7e2 SHA512 9dc659009767cafa7509e00533ffa037fad5152cc2e35b1631e764d0120e9dac532718859dec4fe6368fb6f44adaee307eb264820ec8d2e8d8cf515e7dc4e563
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
new file mode 100644
index 000000000000..209e1ee4913f
--- /dev/null
+++ b/dev-python/ddt/ddt-1.4.2.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_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ddt/metadata.xml b/dev-python/ddt/metadata.xml
index 8b1bb73233ae..6c62a2a24385 100644
--- a/dev-python/ddt/metadata.xml
+++ b/dev-python/ddt/metadata.xml
@@ -16,6 +16,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ddt</remote-id>
-    <remote-id type="github">txels/ddt</remote-id>
+    <remote-id type="github">datadriventests/ddt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index f7bd0ce01cdb..7cfde9bbeead 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,7 +1,9 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
 DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
 DIST defcon-0.8.0.tar.gz 424547 BLAKE2B 4018479d0d67603af58680c1150a143f92230c77b6fd6bda6741ed3f42403c7a7eb2ddc62632ffbf73096fffe8f089975b43a5bb88562ba059fa09ee2e0da12c SHA512 a7b0baec983a3051c7cd804b93983318c14f56a1a88f8f95699b0429740d7b3b27f6f6ab21fd1c31b542008b6f0924aae39e609fc4498ee64c0592272b536b8c
+DIST defcon-0.8.1.tar.gz 424712 BLAKE2B f2f2e3e811eeb163a875686dc6658376dfd9c09a8a9e3de2e6fdf512f25e93d5f6d8ac9ad3c31c70ecdcdd2c30b0e6a3d9b7a222bcd7065feba0b2e805e8eead SHA512 40606bd861fc7100d955e23ad6efb3879572179c81b730404afe41cef1e45ae5f54efb716af61866ac226ae057c6d85a123f4790442c085c054ff3cb5ec84108
 EBUILD defcon-0.6.0-r1.ebuild 593 BLAKE2B acc65aafbb0131f2f39150d7f37ef57e155b67b3497a5ba0e34a1461fffc4d25fe943fe19a2710899c4bd8a4eeb3251673b61838db1a9207616b2d3cda28e392 SHA512 b8ec2d630d5eac98a90b6c860c1d08e05a0748d69a2eac930c562e5427d6f50df5d1811c135d29d82b95938ee1ab55de2a18ae04c937dbdaa5585c036b2d3311
 EBUILD defcon-0.7.2.ebuild 594 BLAKE2B 765b1df4c1f71a1a76d919a80e3e21abc70566b702a6f1a7c0a0ade312969cdea1c402429611bab53c5c9bd9d107d0d2e50f0b72a28f2cfc3802b787df097f85 SHA512 4816d505d85c62af4eb7a879606bb1fe5f68731ee90be8ce6ced5cc1f7428b562a3e0bc4a4650f2ae0494d8ea232dd5f177850d86fdf3869aa2d510f5212d127
 EBUILD defcon-0.8.0.ebuild 687 BLAKE2B 59f66b848721f21914c58a055ece033656c10b6e07c5261d5ff467408944a7de9855615bc2864914e20fb42126810427fc6553b43a400a616698af8d42ff22ca SHA512 9e39007d876fe338330343de820717e1f6d26f9568a3e43f22309df8c95880c0b5c58ea6bcaba0342e70676ddb965dc68050f56c6ffbe77d2ee163c90bd2fed2
+EBUILD defcon-0.8.1.ebuild 687 BLAKE2B 59f66b848721f21914c58a055ece033656c10b6e07c5261d5ff467408944a7de9855615bc2864914e20fb42126810427fc6553b43a400a616698af8d42ff22ca SHA512 9e39007d876fe338330343de820717e1f6d26f9568a3e43f22309df8c95880c0b5c58ea6bcaba0342e70676ddb965dc68050f56c6ffbe77d2ee163c90bd2fed2
 MISC metadata.xml 392 BLAKE2B a4d2092bcba7205623f44d3f461f3c9f869c9a9e7521b491232f9ade8c3f457c0e60c435b7f0751721279441e493ab0ece6b6da0f6d89a594fc34a18c4d37088 SHA512 70bb099659e2c90b33ecb2ecb2bc3b54bfb0bc148ef872a564df8470ece1ba0b7bf07340a5c6ccfa4f0a9ca574dfb652117dcc88df33ac2bf11a5652c66e0aa6
diff --git a/dev-python/defcon/defcon-0.8.1.ebuild b/dev-python/defcon/defcon-0.8.1.ebuild
new file mode 100644
index 000000000000..a1f46cf8b2f5
--- /dev/null
+++ b/dev-python/defcon/defcon-0.8.1.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
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 8e24095138c7..8fb51139fcdf 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,3 +1,5 @@
 DIST deprecated-1.2.11.gh.tar.gz 2968469 BLAKE2B 5b1b8872e8786897a51ff96a659ceef0deed81b3cf02edc1f69b6ee504a3c4510621b56678dd28fa795231dfe8481daf3a77bb151ee117fe0541af1983412548 SHA512 343f62a7a658569de885ac923a1de7f7b4cc5bf63d27d1b13474795ca38cc52932e35133b45d05c1b42d498af56f5945fad5c49b3cbdebda70337294da5d84c4
+DIST deprecated-1.2.12.gh.tar.gz 2969891 BLAKE2B c5fe02ff2c0588c5c6fb1e9054ad7851943c4574be633aa6ae37a466b3cac9889d8ed119962fcffc2092ab844a6d18a5d72766141e149bba2ba0c2dd4ee5131b SHA512 ff9b03a35b688474b6d5390347c4acdf5e19fcee5f7fcbb61a456c6819adbcda72ce00200d55b92c65873addad5abf9d1d5617bf477f64beb08ca23f10ebaea2
 EBUILD deprecated-1.2.11.ebuild 787 BLAKE2B 81700df1ca147cd751039da2d5c085a2b77e1bcc359eaa3baec42f562658bcb11eb7e2bcf68e0c687180a5b4015ab313fdc5725ed21b925e6660bb9f811591d0 SHA512 793efa65a94b4d8f9d9216f5374ca35fc0ef8eeef68a5ecf0af3b70e0be08b6779cc45a8c8380b189512ef0991ccb4ba9665fc9ab1921d9c2265cb0c2ade31e6
+EBUILD deprecated-1.2.12.ebuild 789 BLAKE2B 19a6074b6cdaf5024001e5887aac551d1b5f3e752a9c85f3b8116a13c20dd33fbd77e6cb776aef6b15571dd614d053271af4fae0d72abddbeae2c6d368dd638a SHA512 cd746e095ae9947ecc01e74b7c1132a179a00d37b7665d821723ddeafc27cf7ed413cf87f3623b74027378ed466cadc9d5e298e68173d35ee6fa5384ffe327e9
 MISC metadata.xml 315 BLAKE2B 8016c6be7019b2ef9b31533e8a75480e8f57eb09f0d9f5de5ba53093fbd1e04fc4299f0b18ec4c56b89c2ee06718d3bab8442a28cf457a7fc87c99469738ca05 SHA512 c5c38075210982e49af49da7e3094c4aea053e3cbfce85fa7e8549d842cfefdf3f9d537b85380370093d3e9bc3d108822b1c620eadf369267cbec865c4d5d15e
diff --git a/dev-python/deprecated/deprecated-1.2.12.ebuild b/dev-python/deprecated/deprecated-1.2.12.ebuild
new file mode 100644
index 000000000000..1b72f93f7450
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="
+	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_deprecated.py::test_respect_global_filter
+		tests/test_deprecated_class.py::test_class_respect_global_filter
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 9122586ab507..5781d287d3a7 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,3 +1,3 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
 EBUILD dkimpy-1.0.5.ebuild 802 BLAKE2B 120302d5ae310145c957c8bcf1bde3905565d4f1bf0de9c17befcea22755cb2888384a010e6f0be2c89bd903de7cad832bfc206683e1b9282ea63ea6a4988b63 SHA512 ed64d47b50ee11619dd2952e031793290ae85c858a1c304d0c3f87df4cb65f12ae69fc7dadc8aea3b7f97c2fecf71871749dedc4a0894143863d4edfb4addcaf
-MISC metadata.xml 508 BLAKE2B d2f83ac64b3f8c6f7f2a935d0e3c76740869a69ae03c5cf0094a53c0452162ee56760b089b5ad362d8ca0c2f13f300656bc10ad6392a88b34a7d2636b780fe4e SHA512 317c735b66d54232e493ab554f051fbf5a65adbc7a624a36a293e0fbd86ee3cf8dd48f34a498194901cd62ba65fdc6b2eb585d673e1275f7782a694611c33060
+MISC metadata.xml 538 BLAKE2B 47b914d061c6cecdd3dae020f02cc6e6918f8e07a889e276ad1b48ee98d0b7366a3971c2c47068b9764ccfad4ffe5cd94733eecb600bcef501fe89739421ae1b SHA512 ef3d0f27d8204057316388e62502f5cb700e3bedd80fb761380f76da3de0f046cbc144675e1f88244131ce10fe27a47654d7f0727e459bfc7943b2e85b670018
diff --git a/dev-python/dkimpy/metadata.xml b/dev-python/dkimpy/metadata.xml
index bb2d1e3795b8..85b8e5958df1 100644
--- a/dev-python/dkimpy/metadata.xml
+++ b/dev-python/dkimpy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index cad1d274189a..ded5b926d238 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -2,4 +2,4 @@ DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 EBUILD dnspython-1.16.0-r1.ebuild 1208 BLAKE2B 92504043644a59c6ee6d14b26734b9ad6e3b1f294891c4774f6964081338184ad0316b070a2b9d088a4034581eedb0e2f438556dc9db11d608817462e6bebe0c SHA512 2394781da6a08d92c3f0fc7ae0c4fe8388059ec497dfda522e56e3c36185f45c4300ede46ffaa849f6209883618957e6ee2c3ad126d4a9a7b3ddb57b5a872c25
 EBUILD dnspython-2.1.0.ebuild 931 BLAKE2B 3e7d0ce8ae971b1825dea9a56dccbbad7206b7457915fbbb20ef0898f539d0405531874a448e223c1063e4ca4293c3f4fa1501d88638b2a1dbd301679df384ec SHA512 fd3ab54001e5b576849c1e12895793e94c1bef9b0bc6ac8a702b988ef8fb54e6945eea4d7eb7a9b96a6896a68ad2329416dd44c72a32f6e546bca3c0baf003f7
-MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
+MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
index f7d785e66620..e21320bf4648 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index c26f3154f43d..5bf814c5f31e 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 536 BLAKE2B ee85c04bfff5dde8aad41b5fe7507402400d8de49052c564be029fc15d2e7efec6692171e4f94b4cfa22200679fec7b544c3db08b296a85bda74e8af99bf96a9 SHA512 2712f003f234a12f46bbde8371ae92d5f69f9f600c66cd4a91c7770c810e5cbc0c7398fbff2c17bb9ab0d69c384bebce7ae1b2139877e70bd1e2da82060ed691
-MISC metadata.xml 396 BLAKE2B 9d6ed08e6f963cb03406050e1ec934e9fd0484633e7989b52d5277e6668ebdc919d60f8b0898b0ccec076e9839ed07c6cf5273e14a289049f815cb119e4c13d9 SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d
+MISC metadata.xml 396 BLAKE2B 0d99d9adf86b3df99ecd9caadaa9591c2273a48e6e6bcfb9f27ba779b725fe7eb074db30ab856add3755d38df90ac9215f0326c457dfe834e94ce185e59b8295 SHA512 80229a027a295b73d98c58cd8f00b731324b6ed7b3c6f4c55169f0c5d3eb89521a2ad45611206ec9b972edd9223e7a3c1aa4f601932c1e37b5183106317ffc2c
diff --git a/dev-python/doctest-ignore-unicode/metadata.xml b/dev-python/doctest-ignore-unicode/metadata.xml
index bfeaa471bce2..3f017a289e73 100644
--- a/dev-python/doctest-ignore-unicode/metadata.xml
+++ b/dev-python/doctest-ignore-unicode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index 7dac2d33b721..073b2f37e860 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,3 +1,3 @@
 DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
 EBUILD doit-py-0.5.0.ebuild 620 BLAKE2B a4369d14ec71f9f19f23e6cbc7d50014562a593134112f26f0edcf56c4fef53bb4df9c19196a487af276b4896d910db38909c5732f59c7dd047bc05a4ef58123 SHA512 66accf511b6a4f9192e40cb6994135a3dcbd80f6a372c87cf10f456246e6095c06a07855cd9c112e958a91be94904f7f10e88dbba5afcc96f75980e462356124
-MISC metadata.xml 543 BLAKE2B 258ba834bac2b209a7e4710f187a7cfef1c0fe3b305c5e9ee741d31ce13d358252dd21a577345f8a2542380f77e3ad16ba52c045b119de8fdc6efa8f5f00cda4 SHA512 0308572ae0c85a8aaa8494ba8cd29df7ca6ea012ef77055d67b940d99fe6d1cb6629d4a6a49887e7f06e628e94e1fdb47121cb2fd2397e101dc0c70b0522bd58
+MISC metadata.xml 573 BLAKE2B 3cc6a35f485d4ee5c9a7ed55a006c6cdc5b0b388eac68e27e19429b78086d4cc844c1fbdb3dc1b3e3110d39fb1c055a1cb450fe8e8b0a478c6cc4d2e94df1b97 SHA512 71c86358901e64c2af64f61ffdcac4592427f09afb780ae08f088f849d3ca66dbb080093b15c94ba457fcb999c6f73d090d733a2eb14f5e66e6cd16720bce7a9
diff --git a/dev-python/doit-py/metadata.xml b/dev-python/doit-py/metadata.xml
index 2f12a5900820..fd826365ae4f 100644
--- a/dev-python/doit-py/metadata.xml
+++ b/dev-python/doit-py/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 48f60714195c..7499273364c0 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,3 @@
 DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
 EBUILD doit-0.33.1.ebuild 1284 BLAKE2B 4fd1e101314cf06828f5ca4e467524b2872bfb648cb1d7335d8e2e738b19ef3c718bb2e7dadb750d594e733eaa72d8c596ce1b69efec52c8462cdcc10b0a7745 SHA512 f96fb9cc2636a7cb004179be02a077584364b2d65a653fd15af23f044b8cc8ec610e3fec839164e0403fd00c1890b2f27750a216cca1a784b48b53e91328369a
-MISC metadata.xml 537 BLAKE2B 14f6b2a75d51ca56c61e5700fd7787cb6653722ace4de42510ba1c781523a2050793398d2832aaaa92d87c04ce1f30ba86d0fc2c976ac2d1cd0e0ae5fad8da99 SHA512 fe7a8bfc06411b14d6df95f79c46fc66b68a4c9db0f15a63ece8c905a5dfcc67ef0a1a5f5af09ba0bad80317b93c2336fe788cdf6d390d344e1fed6ab02db889
+MISC metadata.xml 567 BLAKE2B 412cf78186d00f20da2e7271073effc71a3a4c986b702b420b81f479d1f9f150416c8e9f71def4497f283945b4a0ae2ee126776617661c6b7f998649638af348 SHA512 689eb9d1f541c17d5c0327ff71364b7d4b0ac91a43f3a438e524f36e063399ea32415fd28ed3419eb5b74505de1cb02acab15b63276b682d5b9c9f5b19c9045c
diff --git a/dev-python/doit/metadata.xml b/dev-python/doit/metadata.xml
index f766ab5256ca..452fd3c5332a 100644
--- a/dev-python/doit/metadata.xml
+++ b/dev-python/doit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index dd4246133f94..97f1864a3756 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -5,7 +5,7 @@ DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b5
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
 EBUILD dulwich-0.20.15.ebuild 1622 BLAKE2B 4575bf17b5e18a6c9b24e874ecfca0d0570011c7192ff015df65e0ef61410dd3f9db3b0d514cbba33a58321bee9c94375460a4d570b03355b11f55d7263cfdae SHA512 30e6a165a3b63a84d4e107b70a6a7a9bbe9fac37dfd7ca1b195b282a51c4a5547b948fcb5e7a57801d3e782c2cdd654261864ba46f7c9c7f8ca3aeba05b91297
 EBUILD dulwich-0.20.18.ebuild 1623 BLAKE2B d30b2cc83dfed6b4497f7995bc7a5ce80370478e54dd507e061d088cb291484f1b8d518e6f46a5a744b11c67e0a16086ed18b62355c6ce9776460cc0636a0672 SHA512 ebfed958f09bead470ad802824438a7f6d3ee6a934a87f7a3a5b812b61322a9ce390af4d179fd94f95471fede1711315a183a4224d385288949b7ddf9d7bebe8
-EBUILD dulwich-0.20.19.ebuild 1623 BLAKE2B 50106cd3c4484d1e1feace25a67f11531fb12d8724684fa007b3bdb8a4705ef0d4089c6ea6d0acfc78b33a4089ac4a3ee372552f32140ef80e0bea2390a17477 SHA512 1de83698c4151d82879edff3acdc605597dfa7e6dfdbf5a6eea427088c4b5bba1810c7640c183458262a7a8e3252e76cea760ec52c1ff97d93e65f174d4a09de
+EBUILD dulwich-0.20.19.ebuild 1622 BLAKE2B 762f7f22e8fadab0af20458eb9e8e8728587e7b7407b9efe36aea1168e31bd06ca5ab00d134e373cb7164c9d86c0bc47ef182fb33109883dec2a4ef756bfe399 SHA512 17a7eef4f7ed4a79477434b887ade22941b724775f8b6f8ed56ab3f69fa4c1dca17ae788dec4eb3eea54892e6c16509e377b97b29b7d501b77c048b7bd6775bc
 EBUILD dulwich-0.20.20.ebuild 1634 BLAKE2B efc98f7ef54b9d9f4edd2ade18aa8c6033357c5215b4258b6aa6fa12f990501749512871676e506bdc2723aad490f44f73276b749f83d462b410860fdcf70548 SHA512 b2d2169bc5693b78f8e3c29e460d2d0b658fa68ee8002aefbd513ff4e7791dc5122d138d4ecd238b6f7774f96d59e445d43a17c5964f9f68fe6563ec6506b881
 EBUILD dulwich-0.20.6.ebuild 1616 BLAKE2B d82dd9edb8fe9e96bf7bd7adc8d78f8fefd1e3a853fa851d5de6c5b48310d7bd15bbde07215586efc8721ad0408bf69ed5ea3f350415b337dc4a1f2d0109c6bb SHA512 867cf515ebb647f25bcb356f924739e412aa9746cc4842cbbab63ac23e8431ef2a06103fa3324aeff6ee04a9f66b3b142f06b7515cbfd2a20be6ec87e68f490e
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.19.ebuild b/dev-python/dulwich/dulwich-0.20.19.ebuild
index d3ea995081b1..ea1538d83065 100644
--- a/dev-python/dulwich/dulwich-0.20.19.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 1587649ace8b..b1b7833c7eef 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1,3 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
 EBUILD easyprocess-0.3.ebuild 640 BLAKE2B 38937850e2431502e56759991db3dbe672d5f3258068536524bae4127c53228f8a804066136a8e0b1bc581afd57cc7a8c3cfa3decc3f4d0201edb70df190bc5b SHA512 7b79a5453fd0ea8ca2490b82ba1721a8c85a22dc7ed42ba5033c9c879be3f2bdec782ee3eef03103acd605fcc56c4331ee76fbab87b0703bf27bcaf9fd915498
-MISC metadata.xml 449 BLAKE2B 78b6cbe4127b69d14901485e2e72b3d65e17facfd76458feb0c89684b7ba8e94d3aca5f31703dab839739b603e84e4fcdba56708a1177d7420b1a33c6155566a SHA512 5c5aa93a5d443b975c6420c57db269e5528b0be826478ed0f14c4d8b906da29c4c0dbdaa856645480d631c8d850aa71a7290999fd608392cee9613bedb3e9d7c
+MISC metadata.xml 479 BLAKE2B d8c47aab2a10f66d4b8501f6e6209d449301a050289d77ea6cbcd620dfc37ad5005bc732408425c593bb2597a10868b8f3e64264290641f9e7d8efb984930af0 SHA512 5b4127bbf1719ea4ef3edd6da93c9c54e1b327763c8e7be7f09ab36983d046242d46867a04f70bf7d75e0c6216b9f7b0cc6b390101a48b8d34902a44eef003e5
diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
index 987795a65110..1e8b380c0d75 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 15d8ed5382e6..b0f379470032 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -2,4 +2,4 @@ DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
 EBUILD elasticsearch-py-7.7.0-r1.ebuild 2935 BLAKE2B 13c8802c1a2e3b44387c461bb7d6c3b221b0a0c275231353925e0b1887c58d97775a1829148e63f9454576697c6fd117b95c4a3ee25da01ab0a00031f9347722 SHA512 0686e343f49de18249d7c4650c9ca3b81873d06d62054534cddd0465a9b33f31a4f7ad06160039851777562cfa746396b092726d58b93329f1b07228be2f8409
 EBUILD elasticsearch-py-7.7.0.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
-MISC metadata.xml 505 BLAKE2B f91672ea101edbc85c7c726c3f2cc996f028f2cbb1688138a1cc8f3f4afed6531820bab6234830b75698efaa328ba38faa660b6c598ec3fb9dd6091eb5b7d37c SHA512 4e93c374721a8fc667640fc5cb8c78d0540cc4b45e4a06c3350a402e419465275d54d83d47ae44cc8f16c86e26b140456c98d7d3097d04b23f1ca66776b8c7cc
+MISC metadata.xml 535 BLAKE2B 50be35e12f13939b5bba95815e72e85178274802227dabf66a30fa4784038db423731ad3a2cfbefc026c64bd48963dbc10f265cfc7186662bb7855bfd4da32eb SHA512 dd7a1e75f2781281eb0d80056eaf4e16fbd1e19b7d8c8cdf6d713134861fcb01eb780d48ce1efb095b6ba684a18ff637f6a443be5a87e6b30649dc769404fb78
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index ae9502a12af9..ee56f35252a4 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 05918ed4b9ec..cc1f0701b80e 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,7 +1,5 @@
-DIST elementpath-2.1.2.tar.gz 204979 BLAKE2B d247e2dc3ed685e2ba9715ed44665f1162bb8c6983e9b4010d7bf32193129b43983fc31dc9db8f76e618dfeef81061c3d5515a6e369f5159636012afac272abe SHA512 3ba7802d4a4f81c73743963b8ee8cc293973430b521f67615f344d78bf259fd371630ce09d0acff223584ac5aa11cccdfe47fe34b0dfd5ff64faacd181e10d28
 DIST elementpath-2.1.4.tar.gz 208691 BLAKE2B 8317c8fa90d7feaff76357c19ed8373644d60985b1d53a1e0a702e26bf80887523a0f1dcf601800ac1618e8f681b3898b5d56fb4edbbffaacbb4a0efe58f67b1 SHA512 d965bd58254e601000da5be309ab18d3f5964cbc1224092e5e38b4523eb3ac2f7ae6e71fa6c3698b40b13484ed1d07bf93c80d45a9b3ad04f69f63bd18a42975
 DIST elementpath-2.2.0.gh.tar.gz 222412 BLAKE2B ac05a3ef816713377ec304962732c60f587972e903541748f0f4958aab0456da9aafbccf66d981b852a98d63b37224499af89125e34dae3fec6094f793f823b3 SHA512 db9950fc1d02d3207db73ad0066d681a8e3b293817e2b4fe0c133eff9e8d822f72d2fca4cd631802765d3ee82c2cae69beeae1332b427adac90bca61978d47a9
-EBUILD elementpath-2.1.2.ebuild 679 BLAKE2B eab5968905b8fc6c6872de574ee336e1bccef21c2dda88dcaa24b3b77e65a6125eba54f67e4e56a220aa7c387a3cfd1e3cdf05da722da75c17c18c84098f0551 SHA512 efe4c68ba47f3cc462eb07079a3302e5a82250003199eac7c4b7af5b778af7f0f7df1f1d5d314901738ec0f32935e89faed7df904068293d7c26b78e7f10fbac
-EBUILD elementpath-2.1.4.ebuild 687 BLAKE2B 6d1ffe20524a52d47dc91355a368caba5492011b306744423f717e49535922e81b59c85394184169624300fa9ec05ef36d91c8e2212c5661e323af471019cc40 SHA512 a28f0bcf270d0b0b31240d9c0e3efa55e3dd698d5155d255eea8f065f1e0d3d5c62ebbf3d8a20cd6888a04541e0362957482147c9ada94837bb14c60bccdd5d9
+EBUILD elementpath-2.1.4.ebuild 679 BLAKE2B eab5968905b8fc6c6872de574ee336e1bccef21c2dda88dcaa24b3b77e65a6125eba54f67e4e56a220aa7c387a3cfd1e3cdf05da722da75c17c18c84098f0551 SHA512 efe4c68ba47f3cc462eb07079a3302e5a82250003199eac7c4b7af5b778af7f0f7df1f1d5d314901738ec0f32935e89faed7df904068293d7c26b78e7f10fbac
 EBUILD elementpath-2.2.0.ebuild 734 BLAKE2B 99b4edf3644f4228e31ce338ced8664e83d346bdfa3ccfe1464391a0886dae6450a86846ec1c7e97666bf8fad69c453cc176dd6c3c7d0fd52e4eab6883b6928b SHA512 0cd6e57ad641928f76c7188720b7b94d7b71baa94b020e76bac44518a0b1613e9fdef7367ec4f9994ed9c59b05a0c702cb6ef9db1edad0ca5e48aa3eb10cd555
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.1.2.ebuild b/dev-python/elementpath/elementpath-2.1.2.ebuild
deleted file mode 100644
index 4d73295e2eef..000000000000
--- a/dev-python/elementpath/elementpath-2.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
-	https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.1.4.ebuild b/dev-python/elementpath/elementpath-2.1.4.ebuild
index 73b63d2a6ee3..4d73295e2eef 100644
--- a/dev-python/elementpath/elementpath-2.1.4.ebuild
+++ b/dev-python/elementpath/elementpath-2.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 4b3596e4cbd7..d36fae0bbc19 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,3 +1,3 @@
 DIST entrypoint2-0.2.3.tar.gz 11542 BLAKE2B ef1ef511e02a3c5601d3147af241965fa78361a8cd070b5f0240f3842cdd49b3f93a32af4299568d201382c8c5a694ec7f85191c5880d489056744f59cbcd346 SHA512 c02ca02be9f25533c6a37a3aa372cdb75de8419349e279f7bd82369667a75943fc2fd0ba5afad49281d623f8ac4d6f97ffb2dbdb7b72b4cdc9afec80e763bed5
 EBUILD entrypoint2-0.2.3.ebuild 546 BLAKE2B 45248bbe41b1834dc97c3f0d23e6f5e74747750a4e50d845acb2d399ca60ac3d735c19c6cdfdd62fda90b277102d24a53dfee2eba66427a6c397696503987eff SHA512 7ecc7903ef8205db6998919932bf6aab6b4b0fd74c15dd777bc77ec47f07277cd824cef875bb3ee37cf163c611743166acdda64e55b15735d3ab82671ac51e49
-MISC metadata.xml 473 BLAKE2B 4cebc84f93a2dac87dd4a865de27f607cb1f945f33afb2fbad493a1ddda4c947b5503eb21c55c72be0d6145330f097a02d0eb93baf4d22e8924056e14c50bf2d SHA512 3e684c9a6e8a344aae9b662329c1e8af851118469bb8701bf3ef449fc0072260869daf819546c296e29ffbeedf2095e5788d01162b3c96286af49aeae6e5f8d9
+MISC metadata.xml 503 BLAKE2B 0b2b1941b2badb8b0fc0bccfef4b2b64b6af7603e15f62813074109be26b4384496f3ec39ed8e9c59252034c672e731f36270a56e4f4d243decdf38120d50618 SHA512 872e404b60b1ada1c6cf8666daa42a2e57b51acfe2360370788c2f9feca2d74d8fac33fc146b85821e7da73625d6c8fd983a23da68badb0579487be495eb5fd4
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index ba153c9918fe..fabc974a5cb8 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index b9c9b6f6ddeb..a423d52e8752 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,5 +3,5 @@ AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f81
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 EBUILD eventlet-0.30.0.ebuild 1831 BLAKE2B 8f45971352cc6fecfe468a0c59dba62fc62ddd06ffbdbdeabc69cfa579734eb7e20261a5458ed6f178a1d29d45e3dbfc590ae593715f92e1c889a4513fa2e4f5 SHA512 256c6a0502e18cd4ead3f607c42c609c6b811f6b069fd392f37f1f83ecb28b344659bfbf4569f388e7d0b3698a3167fcb462b3fa85baed681c041b60fc6c6024
-EBUILD eventlet-0.30.2.ebuild 1793 BLAKE2B a455fb6b2da27ead1f71dabbbe00554cf5bd3fc5da88cf9f461e8c277c7c054eb86f34383811d0752918aa75b9053d8bb4a65d3851562f2e4895e2a4ac7a8736 SHA512 dea7c740cd2ea05f3ec7a22332a6fc279453bc5f141c5d89a31504235c3de220895d0b3fbab29501cd46c574d3e64a19363ca0cc291aa2cb02088254c252ba4d
+EBUILD eventlet-0.30.2.ebuild 1791 BLAKE2B bcb3254a77968390161f352b2d877372016a0f990c55fb93fa410187270ea1fe02759ae7b1b21eb215b2d00d80c4fcd6fd6adf6d17dedd916eaf7f15bbe73715 SHA512 1e52f125598d0949821b41ec33af563589042ef266ab36ddfa13db5ab1eaca9270489659a740e3b58d1d09a355c9895a9a9e919c8b198a039fc6491fcffa2d00
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.2.ebuild b/dev-python/eventlet/eventlet-0.30.2.ebuild
index 24bc5ac1c1b8..e34678ddab00 100644
--- a/dev-python/eventlet/eventlet-0.30.2.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.2.ebuild
@@ -18,9 +18,9 @@ IUSE="doc examples"
 RDEPEND="
 	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
 	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index 02d9caad3ff5..83e6a1dccfc9 100644
--- a/dev-python/exam/Manifest
+++ b/dev-python/exam/Manifest
@@ -1,3 +1,3 @@
 DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
 EBUILD exam-0.10.6.ebuild 424 BLAKE2B 0ca86628fa3b18b9c9f732320a0261f9efbd94f93aa4b9b875afbe6cf059399c7ddd448f0934e6c0740d40304253b413b5f5ed51e9e64049ed0680e2b66679ae SHA512 641528dc07269731abfd96604c798d07835504b3ac3d7b81c4e6e9d758fc3c2539a7bce8668e08b2730e8f26a040b03be209d7c11ec513f157ce5c16b8f3ab52
-MISC metadata.xml 1700 BLAKE2B 9448f77935050f99836bbf1aae4fd140dcadb1c620271eb5316ff92ea9de74f5958467c53ed0cfc36f1cf931bcd85b8492eb73029fe6e66fc6688edbdee6a113 SHA512 592bfcec70460045e61e4e8abf6043e18861018d27b2ca7684f364242c790bd6e2d984bdcfbb9aeed696f6d6f2f51790c53b11a09653fe8e8b39fbac3ffc051a
+MISC metadata.xml 1730 BLAKE2B 8b10814eed310f63863f8511e65c5a7534b13f39ca865ba07646b7703b20fd1f84fca088fdb8af13ca2faea5d685132c57c90bf5d2d91517b4a960c3ee098b27 SHA512 0578cf9ac285831447e88a93fdf2717d54392c098a1bfea7726100e6b0b0653b63171c0045afc4068b3b56e71bb798b0c78a71ea8b150adcc05ceb4f38919c78
diff --git a/dev-python/exam/metadata.xml b/dev-python/exam/metadata.xml
index d79043f73e5b..f2cc06095d78 100644
--- a/dev-python/exam/metadata.xml
+++ b/dev-python/exam/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 21dcb39dfe8c..857c582a274c 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,11 +1,3 @@
-DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
-DIST exdown-0.8.0.tar.gz 4864 BLAKE2B 084e359b5797484486d9554f85e07bc671da5260bcfebc5cdf20583b91f13e52f9a4332afd8b69ab3c80313d18e1f1bd0d36415a2297589c5bc65c04fde18046 SHA512 cb80d355666b57f4c35fd5776d01deb36b35547d87d152d5b5a26d5c46ecfda28af10c54a3d4ac9bd6b69f99ff3e62b07cfcade07b4cd1f51969562931aee687
-DIST exdown-0.8.2.tar.gz 5255 BLAKE2B ee33e23afc86befdb421c8ac82742977a35f5cf2931aad5cdb5fdd4096682160810bbe09661ec59c10c86f7214bf67b8dc705b9e0ebae3e818c3b112fab91831 SHA512 919b6f8d57546c308b488cc47bd8d51700ffbf758477f3d0cc9de92936a2a70828475edcea011488d653f1d53309fcb2d951ac945e76bdc9a5d015f7ac34e291
-DIST exdown-0.8.5.tar.gz 5522 BLAKE2B 30e3d6e2f12aaa5783605b8a65c391e59b563a86defcefc8f5e322f93cdd4ccc561f6514254c41109047509b77e38202365b798c2b1e7838bec9275a607d0539 SHA512 709c0f2fb6d0944357c656f3beab7f151a48000a430f863cf56c529a49ee462c1c168f9708d77fd6fd5ef3fe29b11084303da1831726bb01943e1b817ba733a4
 DIST exdown-0.8.6.tar.gz 5480 BLAKE2B fe383a2092691afdb2a3fd8cfeffb78f62b23bd4dc8f8d5365102084acc8670c9f2bc3e4a0ade95a50ceffc5cc142c39dbd3e505678a238d6f39b82f6553071a SHA512 28cd68ed99d24c79a7764f7603242f2b1426f119864d39424b1326cecc5bc922ed610133099e7d03d384c485f4f67d1fefcaadee4e1f69ac8ece08136eb858e9
-EBUILD exdown-0.7.1.ebuild 952 BLAKE2B 0f696fd01e8307bef9da0962b93e9f65ea4512b8a61c0b0feb0d14b23635ed51331733bfdb5d243b4c72a5a1c82f5f567473a6fbea460898504648740bb44c40 SHA512 26b511a610da0f6ae791496aa2f5f62da209953905ed7a589aaa1af88cd3381dc9264d78df2682e453812fd29ce66828f0dba1bb2c90f7fa2892ceb6af9a0e07
-EBUILD exdown-0.8.0.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-EBUILD exdown-0.8.2.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-EBUILD exdown-0.8.5.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-MISC metadata.xml 599 BLAKE2B 699d7f94911474352dd3e72e9b07692febc2e75d72fc6059508d1801ec2e4687a4267e317b0516609a93caba8a1179fe759740f6c0b552154c46095c5ba20b0c SHA512 444f5480850243a17e72863b4d4ac23a4c97574603dcfdfd7df3bc504f0f407407b22284971f4f61651467feef93060c3bc5856de3ba7bb1a270a9d3d5a144fc
+MISC metadata.xml 629 BLAKE2B d9dc203013d701528ea7d879612250b25fa7c67c3c3378b4b106e848c10d997765d44de372e0ba5b2e34ff44a37ea1cf347971d58c7f3545e60e22f0735e29c3 SHA512 f4f656a6b2ec713b358564715611c69a2eb2292d17dffe58ebe9e450cafb943e9242dc92c63680a9cda78e5be92a7ad6001763fa1edd956fb1094732bd77fce5
diff --git a/dev-python/exdown/exdown-0.7.1.ebuild b/dev-python/exdown/exdown-0.7.1.ebuild
deleted file mode 100644
index 6121e9c8720e..000000000000
--- a/dev-python/exdown/exdown-0.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# setup.py was removed in commit ddb8a613bbc8ba7d079c1b7abbca5ce2d53ef9d0
-	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
-	# it complains about file not found, setup.cfg does exist
-	cat > setup.py <<EOF || die
-from setuptools import setup
-
-if __name__ == "__main__":
-	setup()
-EOF
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/exdown/exdown-0.8.0.ebuild b/dev-python/exdown/exdown-0.8.0.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.2.ebuild b/dev-python/exdown/exdown-0.8.2.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.5.ebuild b/dev-python/exdown/exdown-0.8.5.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
index 20313363a6b8..38ff0546051a 100644
--- a/dev-python/exdown/metadata.xml
+++ b/dev-python/exdown/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 612d3ae1849f..26cba6ef2fb8 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
-DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
-EBUILD fido2-0.7.3.ebuild 1065 BLAKE2B 2a1d9cbfe3e799cea753ad033245c0a07896293f9110546d27ef142281169bbecb7ee211a7f05900aa05c014e8d18cd5a4d277eb91a982636294d1639d066e66 SHA512 e2e234af86388b43365a5fb50543fb95972ff67af3b1b4c1ae0d9950461708aeecc5e8319cc3a6fa5f2416de91a766ef2ef04e2d93ebde6ceb02ce60ca7b9b3e
+DIST fido2-0.9.1.tar.gz 206395 BLAKE2B 9a9b5d0dd808de896c91aa605540a1968aab7ae543336521d4a206f27bcf836c57e88aa6cdd0bacf71db8d16a0f94c2f9c16b16ca415363fd0b5e145a448ec18 SHA512 cde8c247fe0875129a890866ab76d40b2bd6feee86ff1ccb4b9ec5e6dc037e569fc8d969b51a456b5e66c6f7c67e18d14c3917375d5de85bbe7da5af3254f797
 EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B 03714bfe2468a2914760d886b9e9913c6e671510280cbe5e29d6124e6cf08e2894cd91bdb8129ebd28b2f26da62f7f969bdde2a3bf50cf4995a07d06c5ea0791 SHA512 877bcb037b68c29aec4f2ca8312643f3783d2cea4f5eb09adb277a8f9504b7c16f0146ab6fb3a95cc88de7a0b0721228773d3edbbdbe55054de57983a8c3c484
-MISC metadata.xml 589 BLAKE2B c9c7be67189c6857e4c4dce022289bd43ec0d9d2ef5376a2369d942f61f59309f6c211648ca3507bb740471cd3c0876846fd992e6d56d5b9828aaf86a57693bb SHA512 2197002048163ef201936db666780dc77e635f318f10e8bf9a4843042f05ca001044695dc47460ad758cd5520cb454b9678f51a30cbd640c86a1a4923a66f426
+EBUILD fido2-0.9.1.ebuild 1325 BLAKE2B 2b9b7a5f813091d184d4dc5d00b9c5ccdc1d9fbb3dbe21c95a0fee0fc74dbbb7a68074462bbfcb4ebf52b38f715d51dcb19829f4b418832e20b6de6f1f55185a SHA512 97196cb390e5d4109fadeb05527cb20aa88c904eb141dc45a863cc2d82fc0ded3774b67c80054f1c5ba87a2f62e7b7ee1d1ce361f25c1d15355eeed732b6da4c
+MISC metadata.xml 825 BLAKE2B c5e9aa7ff7fe2d8c1ad6c7d62fc99252765ef71258fbc6fb3a173b2e586eefb4da24d400c261e5888c3a51eaf5c7ce6fccfb3f01444d4c27778ec5dc098e3457 SHA512 89922697e33c94ad57635fdc4ebf316ed8d1f1eba307ce06f116aefab570613958e84b863e2f806d522fcce0a7c0010bf366c4eaa5777f8bf2d3087966f54622
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
deleted file mode 100644
index c6da07ced17d..000000000000
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python based FIDO 2.0 library"
-HOMEPAGE="https://github.com/Yubico/python-fido2"
-SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	examples? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pyfakefs-3.4[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${S}"/examples/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/fido2/fido2-0.9.1.ebuild b/dev-python/fido2/fido2-0.9.1.ebuild
new file mode 100644
index 000000000000..446d15dd1580
--- /dev/null
+++ b/dev-python/fido2/fido2-0.9.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+RESTRICT="test" # Tests require <dev-python/mock-4
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Disable tests, <dev-python/mock-4 doesn't exist
+# DEPEND="${DEPEND}
+# 	test? (
+# 		${RDEPEND}
+# 		<dev-python/mock-4[${PYTHON_USEDEP}]
+# 		>=dev-python/pyfakefs-3.4[${PYTHON_USEDEP}]
+# 	)
+# "
+#
+# When tests are available again, remember to add a custom
+# test phase that runs 'python -m unittest discover -v'
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index 3ebed6d78bfc..9bc3de4b0261 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -10,6 +10,14 @@
 		device over USB as well as verifying attestation and assertion
 		signatures.
 	</longdescription>
+	<slots>
+		<subslots>
+			Reflects the versions that introduce backwards
+			incompatible changes. Do not bind with ':=',
+			unless you are absolutely sure. In most cases, you
+			should bind to a specific subslot.
+		</subslots>
+	</slots>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Yubico/python-fido2</remote-id>
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index 55b201f959cc..6029047acec1 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.2.tar.gz 7591 BLAKE2B 59c55e054b04098ad2e1c95d3464f3582fdfe2a83da75c8cebf556e2e7e32abeccf1bf69ec2d0b5c9790179d1c905da21b27e60e1c9810b62502c455193851fe SHA512 767a599aacbe87328b3e36bd85e0841870760ed9bd95dd3a4a9084edc6f0ae89f8203d565c2b075f16f1db21b647c17b2aa59b08e4702109d7e5f79f36d9f3fa
 EBUILD flake8-polyfill-1.0.2.ebuild 990 BLAKE2B 25fe460961a967e32883d64f5335ea3b59e7e147527cc537ae6f5494d941ee5b17ec47fd3f25ae43bbc84d78b8536dbd86db9c2075dabe25250e999738077d75 SHA512 556767770f148982f5d09f2b8f62f9b1ac5250f236013b863cb07e4182bc059f85f3d21d0240508c545d216aff250d1007716c8750e47be882fe017524d9cf81
-MISC metadata.xml 296 BLAKE2B 1b6ed3723bc9c8b200aa8edeac760400493117046f88144e6684c41326de6b5c0c17fb474e9d25a6f4b75ec55d3a699ea3f0134d204e95551f143f8bb935f5f3 SHA512 8a15e9dc8f9ff3ffcb88147950d11ab9dfe69124bb8aa9293c5b3582044ddda95acc0f62453667f53a732dc98f984ca40c8739e965edfa3e8db4f61ecebcdc1b
+MISC metadata.xml 296 BLAKE2B 482debeedc50fe66cc094eaf32300f68a956fc40c3246f7a1542185b7b0ab1b9fe6aca59575c8ed8bbd9887da47b0ee6ec5d37b3205a6f8f104dc9ed23c5a714 SHA512 74a9b1446fbdcafe8d31891a7f176b501bf89c5d31e3e3221a23691280d447df21b6aef208516ef9e891b24244025c072900dfcbbfedf42253001e9eeb1afab4
diff --git a/dev-python/flake8-polyfill/metadata.xml b/dev-python/flake8-polyfill/metadata.xml
index 43729a6574c5..2794ab4c2eff 100644
--- a/dev-python/flake8-polyfill/metadata.xml
+++ b/dev-python/flake8-polyfill/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index fb458914ac0f..c7acbf2c69a8 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,3 +1,5 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
+DIST flake8-3.9.0.tar.gz 164144 BLAKE2B e265a392445038b04ee2d8c24a763b4b1eebe9682295b70d14c07dbd739b34abbe5f76bc01dd31df7c666a106b62c5312c0522d6771c5649a91d2720a9d14467 SHA512 bfeaa13737f23318da8673c28f0f10463c0aad71a01fe70797321de3b9b7efbe7b5d0ee0664b8440db6b35d7f29f157848757d55fcac531a0c6da6371d681b65
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
+EBUILD flake8-3.9.0.ebuild 1195 BLAKE2B 07d56ee894e891b073cb5d6e547f89d35771bad3b775abef2a2b27d91e4c56e2333ae45b1d59ed59a6b1d582c25177157e694bb4fe3c577cb57abb33a1e5944f SHA512 4e92a41c0d0de016ffd51b11d2174320e24ac67e5afd6f1f13abc67858db57c3ec8718fb525b4b235790dfbef5060b518d7f88b1f6aa4d545c27c8acb94751d1
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.9.0.ebuild b/dev-python/flake8/flake8-3.9.0.ebuild
new file mode 100644
index 000000000000..4b9b899ae918
--- /dev/null
+++ b/dev-python/flake8/flake8-3.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index a7dd7097260e..51d575f7d975 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,4 +1,4 @@
 AUX flask-api-2.0-fix-pypy-tests.patch 1150 BLAKE2B 571b48be64f135706a010648b667032132d38fafad20fa86220766c3c4a2a4953260cdeb1933936cf0369886f171736b0a55415b73086c2f4492679f3a091b9f SHA512 df0ab5fb20ef9d79ba1c1c3aa9b33b5b7a426039dbd18743297d1c6de484ea94047edd6b4a8b6a18060b8ed494c283f1091f622c11060170a67bd4480e640453
 DIST flask-api-2.0.tar.gz 235593 BLAKE2B fadd746d91cc2c797a2e40ee6b11532eb0184a1289a692f8de844501a6656eaa1e87d10811119f267344185b22ed5c12bca43198d64d50ca8055ce95d0f62f19 SHA512 631e69e5a786598e6b5ef7e02c5c4f293eadd84d86fdf0155771d04fb6e87be5686756db90ab265cc097ae3d623c31dcebf5096a62c660d6f7d6fb1c3f3d4e3f
 EBUILD flask-api-2.0.ebuild 760 BLAKE2B 887d1cc647103e5de7db20c092d915c94728e2f06df720344c9115cb292c0282abc8ef63e3f7fb93656524f5aa296e00307460ec198b6f37e361b0fe61f62844 SHA512 9541d4fd66f21049d9588ad72b538b7ad2d9a5361919c14035f60d04fe230f7ec69b478ebf169ebdcff344f450550ddd98c7f239b0bbc3c581a09ace52215c8e
-MISC metadata.xml 697 BLAKE2B 73e47db3cece37e9477731cdaf957c4999a65d48dafea006b4d0d80bde1b03108829059964aaebb93da5f0dcd1bd34f91cdc8eb87b49ec7bec36c73a216a44fe SHA512 d1f831d61b1b6d06199ab2b1946067c8844271e9829036fc14b8f1810adbd1475b354fa0ff3a093606d520dcd51f9fda6683b657a1f78afb8c510f0cc9307832
+MISC metadata.xml 727 BLAKE2B 5832271f0039616d55e2f3df00abf1f336eb1b4727154056ccbc62dc368361e7a3459cdf9b8ca97f0a0e6bacb6f63b27be41b05cf731730e758278ef202589ec SHA512 4d75d9aa0cc7585c2e51b375f8eb6a18a574891d586184412db572b12a2a4be4ce7da2b3fc8cfcab3c5139b10e96fa1736a6ae496ccc8b06b9cdf00f7c598411
diff --git a/dev-python/flask-api/metadata.xml b/dev-python/flask-api/metadata.xml
index 210c0aa750ce..cd722970cb9f 100644
--- a/dev-python/flask-api/metadata.xml
+++ b/dev-python/flask-api/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>davidroman96@gmail.com</email>
         <name>David Roman</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index b8a957e8a3dd..83d8c830dc13 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
 EBUILD flask-babelex-0.9.4.ebuild 956 BLAKE2B 1e5c32739f0568764d0aa22200f7135ad3a944bdfd33bd946d378a88d075e4b94d3c1d8c24d2a744d408efd2b290dd0afb29e60aabc23cd0eda56d2824031534 SHA512 d1013c3a01a6bd34cb56e327bcabbcd94fd3b6bfc6e5e14c630fc5e12e12c3d0e4edbe061067e00c5d189d9defe11a73df70800577182e6ddba8b0a9668de964
-MISC metadata.xml 413 BLAKE2B eef637e58f0b117400dc66a32777b299aaeca4d3c518660e02e71ec002e1f14ff03e2c84632aa1bb0fa8d22e7fa2f3f83dfd79be154ac1dcf9f5067c80d34280 SHA512 6a99b26c0b81ec377ddf9c0ba09479883a6e12b8141c0e2f8a20a916a7b0a80340a5e025c25e9b607df5d255f632a1c6b52fb0eee5d80024367fe0dae3d5cba8
+MISC metadata.xml 413 BLAKE2B d988fae9677e1421a5eed6c0b2179e5d65512dba2703c67d8feeafb2f3d2e17038aaa77edc2f6d7f13fb705a25148a35035f06e65541748a3d09ba5732696817 SHA512 57b4a268ebadacb38980a50ad06c22066a6ee44f05fc9f8cb7f5dbd77f083d34186de3ce359e9e1fe75369fed0485fc7112b8fc70872bf6ce4e6ca0525306c6f
diff --git a/dev-python/flask-babelex/metadata.xml b/dev-python/flask-babelex/metadata.xml
index 0f8e16df446a..7af360d44802 100644
--- a/dev-python/flask-babelex/metadata.xml
+++ b/dev-python/flask-babelex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 4f73f1902e87..3f865e24bea9 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,3 @@
 DIST flask-cors-3.0.10.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
 EBUILD flask-cors-3.0.10.ebuild 817 BLAKE2B 2e277e31015a268122b0c7f94eda77b1d49e9583a106d0fd8868a055250d42284e90c4913c41c1f2a338af51504b5ec5c09c86512f78c8657573e713051c0131 SHA512 908ef79e9ebd4c23ab6cf23a03ab09951639346d57d983e46fecedee51216c2b0c7a003e47be483545151dc05d99850dfc42eef4daaa174006ff8eb82887c8f8
-MISC metadata.xml 539 BLAKE2B e07720b476d151810d692a4dc4d0bc5712fdc9477731272e46de0f65a14fdeade798c7c9e91e4eb85e49293f7e52a2c03bfbf69fa6b024a2ecb8cb75fc469073 SHA512 c90f218c17ba4e11e9d3cdfb057179ccd58fc95242cdc8b4fb213b326ff7d7b267a5ce8b68851bc0637e1d6b0bfcea8ad7f73e371818b25706cdde635b35af9c
+MISC metadata.xml 569 BLAKE2B 8cb54ceea61be82baacf0dd03401d12eb982116091252833ceaee249672fee76ce287356769c1890f1e497ac08b83f6206c25db9231ba5538b48ad4428383868 SHA512 abd43f9ab7c53b9c72abe72e9edb5934f0cbf5b5ca042b1cdb443155db24509314962f750bf10c0e766613c17dd2371828b6fb05bbe51fe754373bf40571777c
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
index 0e9ee1d0e8fc..f567dd01a1d4 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>wking@tremily.us</email>
     <name>W. Trevor King</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 07bcd5ecc214..d076013ef5dd 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
 DIST Flask-HTMLmin-2.1.0.gh.tar.gz 16395 BLAKE2B 259d3af497343d35fabb60e4aa1a832782de47fa78f2e8c6bdaa47a7e78efa8dfa756e87d0d03b5972f3e051a29dfff53b370cb1f3ee1f8a9e401d06c40894fd SHA512 3d3ea40bc5d802f41b0d3a99fcca59407b3948d9b4fe2300bc597bbfbaa851435276a7dcee4b6cc08cc52b0674a53fd655b7bb1c6504bd53ea9963600626a59a
-EBUILD flask-htmlmin-2.0.2.ebuild 686 BLAKE2B 3d1fd554d80e7586b2a01c1314e1f874a88916908dbb825077694ac643984919aa8766801530918154f249e88dde0e47c57104919af93675bd7afe64a60babd9 SHA512 46ea2fb8e635e09b818c3507ddc00fd55ca283d5450c1936bdeb1e880bc2ed079cef68d56aeeb157941433c6c195a78bf2669ecda489627035f073d9779de788
-EBUILD flask-htmlmin-2.1.0.ebuild 688 BLAKE2B 89fb28c34e6bcd035e980785ccddbf7e55503d23a61d70a6cf36782372187e1046e51d3ad34a202c6e0789f5e145c9dc1cb9766d42ef0c7cda408aee57a0594b SHA512 8de3b8de34c932ee1161003d3c5ec507ed4cd9bf54be2db3cf1eb8ac2ab9bad0abb003b42f0fe4e30172696418c7daeebf50d998887793cd6a9238c0e3688a1d
+EBUILD flask-htmlmin-2.1.0.ebuild 686 BLAKE2B 0fa530b64b984afe5d151f9d756094e74d10db39c01b7f7e422fea46260e2ff0412181604e51212ee803e0125ed10ad2e184b0f59415a827afe1e7f7e8069741 SHA512 7e4c58a64154084382eea8e7b10c6880c2df3f98e5a595e18a9ab7bb86c1c6f5790d94d80ee115d2a47d66dfdb7b14e39b4c72a82bc2422666bab5f47316e705
 MISC metadata.xml 516 BLAKE2B cf0f7b9d8a2c71b61b3aaef427acf7f078ea346f03a6765232167739cb91de6f157d858837d3161522034b8d0d5e0c51f074f877c812a0a16b54eff1eb17de77 SHA512 5669f2c8f5acf049f91c8daae2595c1f35e46e337e8f285dcf3263905e3d5495d61db274b82b2ca554badda14b38874f6bea3d3bd267d873137743154f42a1fd
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
deleted file mode 100644
index e09c7b5859a3..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
-SRC_URI="
-	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-text/htmlmin[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
index 96693eb4eb74..ce87db21f13c 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-text/htmlmin[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 27de691a37ac..e40308225b64 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,3 @@
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
 EBUILD flask-login-0.5.0.ebuild 944 BLAKE2B ef717bc604899ce54e382597d191781b2d30b470179f4e36a5efe6787aaa33b64037a279eb79ddd9a1c6e9a12a94710dbf359ca8491524c235aa8c29122734c2 SHA512 0fdd16bf0ff7b99403dc7bc43adc80d764c2f5d19ee8927d6194614bc9615b000799e09d0f3bd4c3b6a5911f60da58ce7e65f9bc35a8325a1358dc68635dce04
-MISC metadata.xml 403 BLAKE2B 975f428a5370ac440d4b4c6d257a91ed91fa463bf62491130010a73f87978b68468fade0b44fce56854b52fe0b64c3b77bfa676025b5ccdfd75214c3e43b5ce6 SHA512 5b702e0e8a7d848d1f09f0282c790132a8fbd3bd44596a3e9ddcf13228f93dd67e38c332fa444fc21eb4999be8fae38c64d576b5b59aaa73d650c3efc9c420f4
+MISC metadata.xml 403 BLAKE2B 6d3c96df8b0f4b87c4b08c55049c64e75d953228b7070f1fe9fce68f5c3cbc824d2d3d8430916678596102cf04b9493243a6c9d18d0c2e99eb2ffd24e63229b6 SHA512 151fcb723bb00f89e28147c2635a23834eac59fe2fccd250da22f386f897419071b31fde15f41289d48343803a7a6f1a14236c796c1772dca5f3a947c66a3d96
diff --git a/dev-python/flask-login/metadata.xml b/dev-python/flask-login/metadata.xml
index 43477f894bb5..01aae2c4ee2c 100644
--- a/dev-python/flask-login/metadata.xml
+++ b/dev-python/flask-login/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 95a1fcf3d574..e8467bceea14 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,7 +1,3 @@
-DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
-DIST flask-paginate-0.8.0.tar.gz 119687 BLAKE2B 0c73f1d72938fe2cb322ec53e1ce3df083c81f1b2bc58f150af1e602c7e435aaa844534283f83337cd9840f8ece69620de9e63e3f8017f848b5dc2fb54f19848 SHA512 1958dbf5675b24ae175098c740e08cc3aa9d2088f6f10768083a740fba3a87cf4b5255ddbc5fe72d286fb04817f527fba9fca5b09af2929851c5ac1eefe3b4d7
 DIST flask-paginate-0.8.1.tar.gz 119751 BLAKE2B 954d39e13619784b1a79abc9f26fc2b3827309f9a3b77cacdd40c8f8d9dfec4c2967894e2d571e26841245da6d264dad71a412e425c87aa0c07b3520274de7c4 SHA512 ca226c79bd944a19760048c1289b554ee048f4f8d1f231f5545423843b7c0616d52ee8024cc68628e11c5f528972897d7fdb1630f87063bbd0e40c4dacf91224
-EBUILD flask-paginate-0.7.0.ebuild 593 BLAKE2B e3e4894d94073a8dd1809a566b8d9e79a94c565897db5ce76998d5b1c5ec9f5d81df582adbb518c5a41c8b13980050e961e16fcca4864b9d6560df09ff98a3e8 SHA512 9f423f1966761c70360696b3a2f32a9d3af157d8a80e76fe4af1be557217f75574e73fe1827852e2cb8a16f48f7066653a8f35d6fd3a906bbdde772d9dced969
-EBUILD flask-paginate-0.8.0.ebuild 560 BLAKE2B 7e9d684795a9e73c7528f685e06885dfa05b3a8ba1d42310956a34c2529f398f1d590621f2392792f2c1a55b285077f713b6cf167db60698d10bab78c0128596 SHA512 ce57a817c9e81870adb83d6798a624ba2205dfdf8febf32808c3efaf65eb028998d483e589364dee4b77d97f7598fae097f7affb1978e889a13f308b1c284ceb
 EBUILD flask-paginate-0.8.1.ebuild 560 BLAKE2B 7e9d684795a9e73c7528f685e06885dfa05b3a8ba1d42310956a34c2529f398f1d590621f2392792f2c1a55b285077f713b6cf167db60698d10bab78c0128596 SHA512 ce57a817c9e81870adb83d6798a624ba2205dfdf8febf32808c3efaf65eb028998d483e589364dee4b77d97f7598fae097f7affb1978e889a13f308b1c284ceb
-MISC metadata.xml 628 BLAKE2B 00e9d81fc31246bdd6226d7d2e92b6d4b95bd91052d158d8b96e8c3c1f9d5141045c68cb251fdba8d0ede3ecb9a860b1856bc2ad9cae3c79f7930f88dd0b32b5 SHA512 31725441999fdbc2206d7b596e48f5b071f00ae832ef54bbfa9f47c6fa4b0acb45f6d5018cd40009b22b70da1273bda7d553faa10bd6c158517f6212cacae95a
+MISC metadata.xml 658 BLAKE2B d653b497bd85c508ac526d621e45f7a9135889604d68db4cb5b238ea1007d9e15db32071554662021690827396d6317ccc3f00d4f970f65093fcc4858efc3e91 SHA512 2098d78928c11db33b74b532500b60f6aefaa6536b896c8437d624786e1ac16105e7802f3380d5df2a7c9951b8b60de83b7ffff797920077c61805acea9bfbe2
diff --git a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
deleted file mode 100644
index 42b0832a9781..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
deleted file mode 100644
index 04652ff0b78d..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/metadata.xml b/dev-python/flask-paginate/metadata.xml
index 1dbd31f8f231..0c2f7899d3bb 100644
--- a/dev-python/flask-paginate/metadata.xml
+++ b/dev-python/flask-paginate/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 95e46ccb1ac5..a662de878779 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,3 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
 EBUILD flask-principal-0.4.0-r1.ebuild 592 BLAKE2B 1e0414a6557cfa77b6962908a5d9f174f9fad4f7431337cf402709ec3bc9a754030f6ac51b6620e3bafeef7ffc08525ae704efbc1b0f9010a4bf8910f4e90285 SHA512 87b13668beed681e8fc0b7f4fa1048ea47680d451e020d31659266a640acde6545fa52a7fc8ce0120cbe7570c54dbf1620851a7930effa0e7e80d5b7baf21926
-MISC metadata.xml 409 BLAKE2B f2ad03406d63fdc273124b854addd27eb6bb9ef9e2545f70e355bacf4e0bed0da90a0d948bd4a3b2dc6a8e652e260cf3b2fba5098deeaaab68a4911ca53ae1bd SHA512 82d71983f641909784e85f97d70523b34363eec4eab42d2a8974256e012ed9d5202f5b77a4d7c9642a9715c11733adb4f4b26b0ba13cb6ec018d2a6b1adf35bd
+MISC metadata.xml 409 BLAKE2B c116108b6feeb2743dd8fd340ca579427bd9f640dfbdbb0813c807fc83b76c15e3e40cd3cf39acc4bae3e553c93bae88bd9c22424ffa31b32a14d9f579536fa7 SHA512 c6b6af0278184fb5f5aa9b2f71c6af27820a3dd65fb851191c1b707e5088e20b957e96174c395d66cf6d1fdeab30371ccdaaaf399703dc31f4e4ee4a3ed00c49
diff --git a/dev-python/flask-principal/metadata.xml b/dev-python/flask-principal/metadata.xml
index 9711ac72e3fd..a68b893c082c 100644
--- a/dev-python/flask-principal/metadata.xml
+++ b/dev-python/flask-principal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 99db9ad55de1..c07d862b5967 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
 EBUILD flask-sphinx-themes-1.0.2.ebuild 542 BLAKE2B a4f70f68ebd359129a58bb7d2bb9383c728350beaa465bd742716a7b0345a08e51ff8ea28ca6411d451c1571bc31549d3d9387e8ea8ec50f79127d5a151fcdda SHA512 2baa39bc12b78a09acff099981f22c07f229af66c161e74783e2146850328c24182aa903db1fb7c7ff16d1912536774025596f40ed3b4fbaf3edc7c283c79dd8
-MISC metadata.xml 503 BLAKE2B a425dd302c3c1254405877b96d657eddc79611ce4d383d2cb0345b58987aa73037bb6f6eac18250c3f1a6d2c37980de8e18d0a8b52f9c4b661583ae562eb3a27 SHA512 c77b32565154b02799b53c0b7b9bf5e2329a287aeeb0c0ade266b5d7773d06d743d79dc90cb3399c70ae436ec698b3b1b2f040fae0475998036e9f40af870c05
+MISC metadata.xml 503 BLAKE2B f9e7d350693898ab972f1dc1faaafd2d35f05bbfa23a9dd2d6fe2f21b5afa7f0d24ff0224a7f20e0a1fe45741e72a9833359faafe5aee523f9a6e6ca513cecdb SHA512 7ec82d7215991e08614a79e8ff759dd4f831319947f637775e7da89f7e545beca88d69b3c78ad02d115b7e064e81ab272b658a1c681d8afd30b3b9c8f02b59c3
diff --git a/dev-python/flask-sphinx-themes/metadata.xml b/dev-python/flask-sphinx-themes/metadata.xml
index 44b990bda085..3fe619687b32 100644
--- a/dev-python/flask-sphinx-themes/metadata.xml
+++ b/dev-python/flask-sphinx-themes/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 9ddfdd83641c..3832eb8ca82d 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-SQLAlchemy-2.4.4.tar.gz 132193 BLAKE2B 044885af05463bfe377ef503baea6fe8b4a988e1f23aa6e8165ba76f85626d5b596226eabd7d69b984848149c8401b136806e8a68ed568d4cce97acbf402cbb4 SHA512 9d952a39f3d116306ae15c8f802780c987e54dbe519612a9b699bb77e8a45f272e90f994697f881283d1eaf5767d42eaef2ca017d22c08e48596d385d942b1ee
-EBUILD flask-sqlalchemy-2.4.4.ebuild 700 BLAKE2B e012699d865e7d8633c9c4d2af7f3f814d8a890c08e60ff84beedece6ce41176951f3831ce6a3dd01f3acf7032f481ce7d249d48d349010c0c398f73675d11c2 SHA512 2638ef3a3f35113872c17dde5e908fe9563ecdb9eeccd59c8064c843b5976c01afdc7b01c8b1770e666703a8e35dee5da9c628b77aa48f5a3a5e3fc0868d3aac
+DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
+EBUILD flask-sqlalchemy-2.4.4-r1.ebuild 697 BLAKE2B 639e445866ab39eb3d13311479546b0680730eb41e38e1c0cb39088091060f053c2f59710a8727c622bd3d8729f7b17aaa2ee028f089f5c9d028c9b94c13834d SHA512 762a2a2462767f16f15e707597cb5b84dd430a19324151cbbd0c01b267f04ff0299e209b7db5b719f078804993af5c312fa73779c6430ed6676d768f517799e7
+EBUILD flask-sqlalchemy-2.5.1.ebuild 702 BLAKE2B 9fa45bf33cf6f89e6bf2a77b129179166341be6fae5868bb1eefae0a0fa33021843981e52ed4a9616dd64f25503c37a6f8bbc4ef6f86cc8c927626f66d7791cb SHA512 ad72127f0e49d7f0fc10c450ba0b915a2811198fb4e83398aa60f0d9e46dff46b20e32b863eef38bb232883d73fce091f2923f8bc8df1317077171ef28c77c35
 MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..7d071dda76d6
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
deleted file mode 100644
index 8f39d7cecf39..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
new file mode 100644
index 000000000000..534c2d8a08e4
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.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=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index c144a36c5d2d..043b003d943b 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
 EBUILD flexmock-0.10.4.ebuild 482 BLAKE2B fff2ba5ff38dfbc29ca1d46bcaeaf420cf281b340c55dd1bb94e4849363d27526a575d4e713cf68739153bc0001b5e033c9d35dedb07fbd7b9b2bb772e215cb6 SHA512 92c17bcf5552727f4e78fc0a249d342fde3f0edb28038ac96e767e8852fdd1d10609e1837ad664470908cadf085427786d0e27bd872a609e1d40cc68d689b075
-MISC metadata.xml 627 BLAKE2B 11783ac18217aab3e01807480f034400a47be4bad123c8eb23ebd1b91c562a01c86b4dc42612a7f50183594c44916bc42c4c48dbc9b57d23c7ebe4caea0e9acc SHA512 c352d2ef1e38dde5147b46323eeb4a0cfa669582e8933f28a38c37b9d19930010465190fb909aa088590732e7a97997f58dc9b4390f704c13b751fc51877a9ff
+MISC metadata.xml 657 BLAKE2B 065a19cc94f756b0702f9b52010d5ac63af8d3b8f67ea307a073f0ff6046143e2d2e4f4266df5324192e42c4ce823fff646188654207cd87277d854c986d2667 SHA512 c2cfa313f94d79e0cce3213f53449582e18edfdbdb244d9771aed0f4e610e2a7ab225b0d7d51483be9c1ac9763c376f051b45fffc1f83ca44bd06017c0b29a06
diff --git a/dev-python/flexmock/metadata.xml b/dev-python/flexmock/metadata.xml
index c6d684cf9f17..fdfb3b68303a 100644
--- a/dev-python/flexmock/metadata.xml
+++ b/dev-python/flexmock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index c565def2bee3..386595e36b1d 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,4 +1,4 @@
 AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb26bbf8e1e249bc506e5c8550e5531d3252f93d99cc2bad9e317b61d10f1d87e3094f3dd8c1c2d34a85b9049 SHA512 2e628275e3db217c9d5c1a593d3ea6a8539902737da8ed2d98f96f5fc99e0e25da1d427ea153f8279f3de0d7afde14684a7898c7e01e55ebeab4a5572479724b
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
 EBUILD flit-2.1.0.ebuild 1405 BLAKE2B 4fceadf47ffbab46a393ce4e31cbddc5282344ea7aff580a1c0f7558338b05af097139a3f51cfe53ce028c8a8c9531c0d50e1f88188eabaff90304003bc46039 SHA512 7b4fc9b6809ab934247f113ef01ecc90fbd4af2da44914d0fd4549b858ba3337cfa3e5d4561091d4021cd29b3651a11607e26aab668bd7ba4bf5cc31eefc50af
-MISC metadata.xml 382 BLAKE2B a64c13a8d32d2bdd74412e7fe0f742be1db8ac68ddd7b335be1a7b6a53953108a0d99db35932b5e07dda371695b5da3162c8805bc58df0eddfd6575be7d54144 SHA512 844c64182ed86828ee8ac533cdb72f9e56106e37051570f9ad1c83d4aa9d3fb5cf2257448363e7380175893aed21d96322c54c4d94eea8358285d561b6c08568
+MISC metadata.xml 382 BLAKE2B fc966604e8ce9f4f1d09745dfcebf3f5ca4ef00471079c13aa04c52b31d2cc84512a9509151a7c96a216dd80368c5d00e2802ba0c8bcbbbf386c2bbde3ee82b0 SHA512 de756a5fab204417b2a52b90ca02e9b38cb4a261ee4133e2e986d5cab06fb82172e2f8d2bf8d177841a4dfb24af45e3ec39ebdef7075fd9c6daa436d1c481f1d
diff --git a/dev-python/flit/metadata.xml b/dev-python/flit/metadata.xml
index 48a322e099ad..277c51bf2044 100644
--- a/dev-python/flit/metadata.xml
+++ b/dev-python/flit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index f36b10b2aff4..21a42256e22a 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1,3 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
-MISC metadata.xml 387 BLAKE2B 80b0a547d8f1c60916e68279805d3d60473d0674de329a5c3077e4dfb3aeb1285f9236c825e121f9b56f3ee16f9a5dcc65b667cbfdb230b99f430b38735d4bf0 SHA512 97c77a9eb206814534d35eafb4f64a3a613d7e2bbff8de5f929c94cc0e9377c13e7305c2e5f05911567172214566f4d7ec03fe1514ac307fe59b3a457cbbadbf
+MISC metadata.xml 387 BLAKE2B 558c51622108fda31f6d402dcac0a289a358a2ca78394c2bb426ad37522a72ae7528db2f926529c376f79431976cb31861f504e9298d443f4fb56d6c029cd06e SHA512 5e0806b66ecdfecabf8705ffe986dc33cfe6a9e33dfd18d4c06ff2e31503f59d35b009ec1ab1d01d01df612c7a2889d81753d9900fd12edc6cd1838ef14fdf5c
diff --git a/dev-python/flit_core/metadata.xml b/dev-python/flit_core/metadata.xml
index 12ad08ae74e2..099e985116fb 100644
--- a/dev-python/flit_core/metadata.xml
+++ b/dev-python/flit_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 9f07ce5599bc..010fcfe25355 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,4 +2,4 @@ AUX future-0.18.2-py39.patch 2789 BLAKE2B db6c0cb0a030d166f01b95721e560d346f8a80
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
 EBUILD future-0.18.2-r1.ebuild 999 BLAKE2B 0d0e3b701702fde088670fd8dc39f8f5880abc004cc69056b029c5a295ee876160a6a41d95c26dc564522b7fa6287f4d4f2f23ad131d47e6df6ea7196565f4cf SHA512 ad8be598d2890d1987a56463ef6faa0d7b7c8d37b7cacf9cf407f08433ed8a6f927b5cc04c58d6c3b530d7b5740ac7c9b29ffe079ddb36c864c99e2c7a13bf5c
-MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
+MISC metadata.xml 309 BLAKE2B aed48a59f4d7e6bcbbdda701092f113245a3492797c5fda1edd32812e124cfd84afdb08347b6bf7800131ca5d3f1630ec7f50356c4e97ac6095fafa0d500c23c SHA512 eaa309de211ffbffb38049c113cf6c5e11faf86ecf7baab4a02b831ca1fe6a57ab0fa442b7cc6922fd8cd8c5a812c71de00d8970ebb79fff36cb435893761673
diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml
index c7fc9479ce4a..a1c88b13d359 100644
--- a/dev-python/future/metadata.xml
+++ b/dev-python/future/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 56fb2b2a8c10..c14997e3e344 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
 EBUILD fuzzywuzzy-0.18.0.ebuild 632 BLAKE2B 20c7dea4a1916fd6f421bbc945c8905508b121e460074ff9f701c99d18d663037340ad5a5222594a5304fe7885209102511464b3f46b0b3029f4ce13b824eac8 SHA512 277080f548b9fbd8c960e51b433005c921a20a987005055d78ed74e758d43c4bc3e08ca8fb7da3167fb2d6b09e313a3af7494c8adc784023ba5644351442e6e1
-MISC metadata.xml 396 BLAKE2B f783c63a60a9adb732460390e5ccd5b54965a300dc92aaa7759b1f6dd24c169ddcf54cc93114a1a93c83217a4578cc867140126173727bf7f636b84f0fb4bd6f SHA512 b0f13db55f102301ab24d18b8bed4b1825de409fb883bbc141e5e9326ad6395ea6694d1d9bb65f4f832767e6e3f145094dd8950ba9ca6c0654f50ee706bd09a4
+MISC metadata.xml 396 BLAKE2B 9d393923d1967fdc5ed931d8a0767c3b9fede9d39371349e1a6a6e1119d6fe5118ab2191bb264ecb119d28cc2f2f07816b5cfde02da1dbda0b0226a838913a9b SHA512 66404a0ba9996258fac47a0e31d6d4d8bab13ee48bf90adbbc6bb5c268ff7d4a504b6e6840bc5d9217614c6d8966c931e268af20f32689d4f233c67c6c576442
diff --git a/dev-python/fuzzywuzzy/metadata.xml b/dev-python/fuzzywuzzy/metadata.xml
index 66a1230eb8f9..4c27976a89f5 100644
--- a/dev-python/fuzzywuzzy/metadata.xml
+++ b/dev-python/fuzzywuzzy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index dec78b8537a9..052496a3561e 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,5 +1,3 @@
-DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
 DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.3-r1.ebuild 768 BLAKE2B 64b743e20ec9db15c3982a0426577dc166ea5badec0a4ee9e9783b8433b15277cd73cb97c9dacd14db19b4818d434e00df0de6a530c5d5ea1ee9a3a322a7a4af SHA512 48e11856b1b79fba11f6582e79fc0ff1deac78df8f97d6670ae198b304a653e76119347e5039b5b27276fb95aef188ac6b996cea724d58de97df2bc86cb71358
-EBUILD genshi-0.7.5.ebuild 772 BLAKE2B 165e0d164b1500f341bc4f332283f106be27bce98da25ef92befcc87505eaf533108c6981c4ceff95c991a6b28e089248c40503b562d9559c198b61f4d8440fa SHA512 57108343057a8777bc1825216cb66d8a45bd3e310cb3e700b9cb29f636a169249f6f7614ae9b6075b89171c017ce656e4f18341c299b7e3c68ed207463b066c5
+EBUILD genshi-0.7.5.ebuild 824 BLAKE2B 602695955eab507971382b9bb3629b65c886f096ea6603a28c1fe930a1765b86943e5530b226a12a2f9d4cd9a5f30ada8a6efddf86b3876e077ee4d7e1ed17f8 SHA512 a855686406b39a5238c2e7f7706abf3f29156b5eb5b8ec248beebbd92665ebee3f87a0a9d574ee92cef8ad7fff269261c62782658132aceca4b5f124a1ee7cc1
 MISC metadata.xml 388 BLAKE2B e8c4b18a11c58ef5960d0fa0967f1f0b65726366d82ae288c5190f7cf77321add975f653e1be53fe0b6959004f24b4dabf18bd2c0b2459554a82f2e6a8dc0398 SHA512 410dacee9c67277a3c4b5546d78d2ad7eaaaf46ab51181fddaa14c326480216e8b5f5ec19dbf0ef8f444482cdcfff834457ec9707a6e6b628024ce57cbb67081
diff --git a/dev-python/genshi/genshi-0.7.3-r1.ebuild b/dev-python/genshi/genshi-0.7.3-r1.ebuild
deleted file mode 100644
index 981ec7cbedcd..000000000000
--- a/dev-python/genshi/genshi-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples"
-
-S="${WORKDIR}/${P^}"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.5.ebuild
index 277bb83e32e2..fe7f34e0cfc5 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.5.ebuild
@@ -4,19 +4,21 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
+HOMEPAGE="https://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
 SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${P^}"
+BDEPEND="
+	test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index be4c1315b5a6..5dbe6cd4c70f 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
-EBUILD gevent-21.1.2.ebuild 2183 BLAKE2B 64552697e225404bf9f9a976343c9012152f530a1b19c01f8647321321620364f968faa1f8f850c10d61a61739a77874100d3161fa49af4f08441126a4deabce SHA512 98400060a87d3777499392e79e2f1b403b7c97162d3065a90fd5d4ea628df79e91cfeb7d18dbf4e595e5b285e050a4d1d5188c14198014e6c424f96ef0bd8b54
+EBUILD gevent-21.1.2.ebuild 2159 BLAKE2B 15016eb2ce1be97f577b2fd99392a58c5789e58f5e8ab3b93a9e6fc602caab27fe6ea4ad24d73b92b7afa12b5feb909550c6e353985d32702200f85496cc37c2 SHA512 f81f54bac47ece0f6a6eec7d3bc45d897e57876e4d15ab8c2921fa7db6ec7f6e20441ab178fe3cb802189646b666ddbc5491ca53d587649dcf51bdb1add500af
 MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index c4efd5a1371a..04a526a33eaa 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
@@ -23,7 +23,6 @@ RDEPEND="
 	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.17
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]"
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 6ef43264fb3f..68e59322b013 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,3 +1,3 @@
 DIST glance_store-2.3.0.tar.gz 212933 BLAKE2B 69f54fbb44de0e6e9608e38cf0b43ee6fb7df7758d19b6dee6f15fb00a25ce885610ef9c779d2138c08f5d3a28760121ef66edade0b23619685d5f985433247f SHA512 59499c1fa8b596faba0918219b76e5e7d51f6c7e94d14b99f28b2a9f87b456e638bd42fe33124ae9507043a975db6e5b5762e5979258db35b772f41a08d59be6
 EBUILD glance_store-2.3.0.ebuild 1657 BLAKE2B bda7a23b7de7f5f5a77e4a9649dadf4b310ce19cd98b03513f5bcc6272f383af6ac8d09bb62094144579f9de789b9997e83511743aa432dfd55a3aa0dff58665 SHA512 7de10ac9d197e23b527671ecce5ecbca10d29ff6f26be7a7bff1003c045a8eae6a87e7548d1574dc5046b909679026f093388b4e4d7eb571c646ac7cb28a2906
-MISC metadata.xml 756 BLAKE2B 446a0d4e98d1ceb702e5414c1f2b5b3d7dee58a853779df1aba88d917e24c5699f30b9b88a26b4e28393bb0b7f6e0e86db4fd6d63f1a9e06f9af707936f9c01a SHA512 7f2f27c0d280555cd49b177a1a983a544a40f9edf4b303c2000afbe1ddcaaf8a60dd693c0945c98bcdc15d7e1d0d0ce8a3b40183a54fa4ddc8972da796ff99c8
+MISC metadata.xml 756 BLAKE2B 85e832efa46d12b756cbd40391a7bbf7e8441d0b38b5462d1c04154bb9b4bd0953a5adda2446ef6894eb9d93b41d02b1d64d5855bf2c35aeb5a422c02d783c44 SHA512 9d2b9719b7d332258a1b6b0fa453b41d2a62afb6635b2caf1af542ebd5390efadcadad9b114307e3d5c86b319a4ee537a1226ab890f1640d0805eef58355ac37
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index 1daf50ebc007..fa7fc1e042a9 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 26408bc6bb87..b2b3e3a64abe 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,5 @@
-DIST google-api-core-1.25.1.tar.gz 131189 BLAKE2B 3b5ec782b0492a699d146539d95f613c07aab00735a08287eb93f3d458f98bd57b5e46082fde37aa4dd9986c24443ea22707ec18ec8a4dd2f80f5bb937bb4153 SHA512 cd29370b5a3eaca2c9b5076b6df12b114f28132fcbae63e7574dc9380b7caeea4c1ed476bc332ed16845efe85a44775391ba4f6ceb705b7ece49837056cedc25
 DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
 DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
-EBUILD google-api-core-1.25.1.ebuild 1220 BLAKE2B 998bc8b03c3c5e1364def5a34324dcf2a2f83a7e67b93ee39c56660392abd0240833963aed60746807476a24ddfb2abe33a695e7cc1914c339f63946404b2b3d SHA512 a6521e2eba9b86d54f35660429f21a280032ac316bcac7cc835ea7cc6eefdbef08ccdef41f8b380556be21d66f49d95cb4806c14dea5de4f202cd35c9f7e58a3
-EBUILD google-api-core-1.26.0.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
+EBUILD google-api-core-1.26.0.ebuild 1220 BLAKE2B 998bc8b03c3c5e1364def5a34324dcf2a2f83a7e67b93ee39c56660392abd0240833963aed60746807476a24ddfb2abe33a695e7cc1914c339f63946404b2b3d SHA512 a6521e2eba9b86d54f35660429f21a280032ac316bcac7cc835ea7cc6eefdbef08ccdef41f8b380556be21d66f49d95cb4806c14dea5de4f202cd35c9f7e58a3
 EBUILD google-api-core-1.26.1.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.25.1.ebuild b/dev-python/google-api-core/google-api-core-1.25.1.ebuild
deleted file mode 100644
index 5da7f339137a..000000000000
--- a/dev-python/google-api-core/google-api-core-1.25.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.26.0.ebuild b/dev-python/google-api-core/google-api-core-1.26.0.ebuild
index 452b0c651760..5da7f339137a 100644
--- a/dev-python/google-api-core/google-api-core-1.26.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.26.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index d06a6acbfa78..594f1b04ded6 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -2,4 +2,4 @@ DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
 EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
-MISC metadata.xml 642 BLAKE2B 546e4e4860b520979da6b022c0ce1f201e160d6eb08e1b18f2d32666024941250260577fd01e39053691780ac714619de0733c030397a15cc628e7338e703699 SHA512 66690d78d094ba83ff090bfc85110cbc48e727eca5d85a5fcd3bda727b356be13950027f74920fd0f11923afdb914427ae58c23b4d16c9134322a880291e2206
+MISC metadata.xml 409 BLAKE2B 4b38459e52530c4fd9b3a6c3bd632a8844401d09be81207ae05a01ca1c7c8982493ea16b62a1377c0368001a5c9e08fb1ef8a34a7b29e6b4c09c9b206f7ab73d SHA512 62191a46281e5e7f0f361c9b7705b8d84b9ac215508092b3b23dc92fadb31f7cc71c0ddd76fc6ba366e86cf4a1644d14c91de32f89060beaa8a0f7988ea5d83d
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
index c8fa5fd039a0..ad78d5438748 100644
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/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">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project">
-		<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/google-auth/Manifest b/dev-python/google-auth/Manifest
index 1b151af010f1..a37b105e0264 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,9 @@
-DIST google-auth-1.25.0.tar.gz 121940 BLAKE2B 9c7346b134153321fe7116cc77bdcd0d07b2d4a5264d4a982f23a44458ba17c03ef8d204d2c6bd697561c11563bbff1d093ec4563700910ea3bbd9a063006005 SHA512 1c83f18904b646264263c8ba20c13bcc61572b9de397331564b1c2e65083a27e6393dd9435b03789136d2fc2b43750f784d21a3dc670a58cc4bade9de267f195
 DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
 DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
 DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
-EBUILD google-auth-1.25.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
-EBUILD google-auth-1.26.1.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
+DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
+EBUILD google-auth-1.26.1.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
 EBUILD google-auth-1.27.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.27.1.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
+EBUILD google-auth-1.28.0.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.25.0.ebuild b/dev-python/google-auth/google-auth-1.25.0.ebuild
deleted file mode 100644
index 4686417faf35..000000000000
--- a/dev-python/google-auth/google-auth-1.25.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
-
-PYTHON_COMPAT=( python3_{7..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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}]
-	"
-DEPEND="${RDEPEND}
-	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/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.26.1.ebuild b/dev-python/google-auth/google-auth-1.26.1.ebuild
index 61a646b39ce4..4686417faf35 100644
--- a/dev-python/google-auth/google-auth-1.26.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.26.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-auth/google-auth-1.28.0.ebuild b/dev-python/google-auth/google-auth-1.28.0.ebuild
new file mode 100644
index 000000000000..400d08da8e38
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.28.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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/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/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index addc85754cb8..0ffda0afa17e 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
 EBUILD graph-tool-2.35-r1.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
 EBUILD graph-tool-9999.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
-MISC metadata.xml 422 BLAKE2B 1c7f3c8b1248d17d74731cc9ba33296c89d48fa7af3fcf167ebccd238110fbcdd9e3a158a031fda91d9e9d1db339442d9d6dcea1c8af79c65e4092027b6e670b SHA512 59688166d701de2da4a9c1e951c70b228881c7fa4d80f10057e073605360be8930303a1553ca86d901d292f26d1300e95b177d97c2e89321be6eb1bfec78f41e
+MISC metadata.xml 436 BLAKE2B f588384060513f0fa8ad9c77222cc04da4767e56521404f532f4e1ce61f2f0adc7aa2b7dea2f1b194703b32db7982fe61587a4e7d4bd7e0af3ed240e49c4ddde SHA512 ec4288006fa779dcb7291d2aeffecfef11bf516f6a4a8ff856f67ae21a8cc25252e49b65df7b8657ee8a35f224275bf188b05c5b10d202a5111b281b8b47e561
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index 2c253e4e96cc..67774a99618f 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index f45cd67e49ce..cbe00e3e01bd 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,3 @@
-DIST guessit-3.3.0.tar.gz 157901 BLAKE2B 8022e69f763d09912349e193d3273a95adf6cd533d28097e3e17e5a5d3a9f18b623024bac6b00b3aa78ac43cb6ff179a97344e516401f71e1ad23743d033604e SHA512 5569572ed6d7910b320e1742b902325baf3f3455598e17a7e3bb36ae5da0e450d4bc2db0b1651a8d4df7354e0624216c1093aace48ef607b3146933fbb83a918
 DIST guessit-3.3.1.tar.gz 156178 BLAKE2B 190b61eb98c4945eb2e14bbc3387a2eabff4e0f2fccf42f3b957d2b081d83d96333f3931837ad77d6b09c12aaa174eb8adf993d62ab9de7b74d8f0c55282a77c SHA512 42c87525ea2d9c808e30b50db674862f5362f26b95ba5e6bc163df03a261d9b24daf4b4d525677d3e6d53e8e7f637c3d9e0ba3f25f4397e0658b618f50a3248b
-EBUILD guessit-3.3.0.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
-EBUILD guessit-3.3.1.ebuild 1032 BLAKE2B d1bcb45fd8d0d70c6b7413c7725813eb49fcd185fa87007e90f8b3556a6a3ba4db0be8cba256efc69355ffb12d2c4eba75ef2955bb38d2f57c36ac7e024c36d2 SHA512 cb99c0e7922030e87c770c1eef32797da728fdb8c89a38168b6b0fe35109457684c23c10088c6c8ebccd36bf1438ed0710f39dddbe62e8041a34c13c24c5a3f7
+EBUILD guessit-3.3.1.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
 MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.3.0.ebuild b/dev-python/guessit/guessit-3.3.0.ebuild
deleted file mode 100644
index b7a5ba657f3c..000000000000
--- a/dev-python/guessit/guessit-3.3.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit
-	https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/guessit/guessit-3.3.1.ebuild b/dev-python/guessit/guessit-3.3.1.ebuild
index cbd2a8e83fc4..b7a5ba657f3c 100644
--- a/dev-python/guessit/guessit-3.3.1.ebuild
+++ b/dev-python/guessit/guessit-3.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index f134d9bd25af..72bf3aa499ef 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.7.1.ebuild 714 BLAKE2B b5075b2ac2f71d1435ca507220e0d32be2211b4e9fd1a88bc8b0f499f348e806084c656bd61622fe64d1baf44577cda555f367c6457251932f9ea0a878e0c012 SHA512 c302b7b52eb36e25f7b7383abc94d3455df8148b223dac80acd6562036e150bb6356c968654cebc4a2dbf166b9ab391931a178b72ff38060bdf8c995223a2bf1
-MISC metadata.xml 445 BLAKE2B 3766233b1cd7a60dc6a6698262e59b531aa0e247ebe08e93d9528751ed3dd606950316d03c1efc4458d1928d205af1af248568fe3f9e3d0721ad94d42be6c8bf SHA512 990e645ce0d9b22c6d286580383ffe5e13a592cfef876aefd8a277d3eb13a427115617b55e88310b32662589b825acc6dfe98dffadce6c0efca071a1fb014104
+MISC metadata.xml 475 BLAKE2B 552c9f13fe2422e6199a53d4e9ca75828a64f718f27cda6b6db30afdb27022d20b852d962c17acfd7f5effd6452a31a3d60443cbaf272f083c8287dfc4568de4 SHA512 f6836b6cb2947624ffc7a614c283983801e48be6ec829e102e60aef348b1bc0bd9d6c8032f15494ffa9cdecec2d76ed63a8ed5b484460c7a4020562da1846673
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index 27e26cd85d06..44eb352f91e9 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 5c5210a9845f..6c22fd013e13 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,5 +1,3 @@
-DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
 DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
-EBUILD httmock-1.2.5.ebuild 482 BLAKE2B 70c044c1b7a0cc01450d339c1c5fad718425bc5ff77eff3f8ec7a4f1f177d8cf7c0bffba1ee7cd1a1aca27c53e35ee4c6b05dd6dba49abc38653dc8c9d67751f SHA512 de6bc60814215ca9794b428154eee0c548af7d08f228aa5b0777474d3a6602c5da2a37b2a45bbe7affcc5b21709bb13b8a3be042c319d8d7a29f9e86a30fd572
 EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 70c044c1b7a0cc01450d339c1c5fad718425bc5ff77eff3f8ec7a4f1f177d8cf7c0bffba1ee7cd1a1aca27c53e35ee4c6b05dd6dba49abc38653dc8c9d67751f SHA512 de6bc60814215ca9794b428154eee0c548af7d08f228aa5b0777474d3a6602c5da2a37b2a45bbe7affcc5b21709bb13b8a3be042c319d8d7a29f9e86a30fd572
 MISC metadata.xml 315 BLAKE2B 72d19fbdfd4936491e318de748e0ed3951a2c4e31c3c7834039737da8e61a0cceb1fcaa682a22fefc996216931b877d1d54759cb23563c257273b3582052db43 SHA512 58c99bff32f43f1a2e1a42b0fa05bc6ee37d76e55c3061d09272ef8172f1a1efbf4f9fcf11234c49b2aebfc1a55256aa4e246ca676ecfbe49f167ce820048e15
diff --git a/dev-python/httmock/httmock-1.2.5.ebuild b/dev-python/httmock/httmock-1.2.5.ebuild
deleted file mode 100644
index 58f0ae3fc225..000000000000
--- a/dev-python/httmock/httmock-1.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index c821cff3c6d2..9db3078ffcfb 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,7 @@
 DIST httpx-0.16.1.tar.gz 965347 BLAKE2B a6c5bcdda595ffcfb824194564ebd93760a9180e60665a9540fc6a2822b1be4273b940fee61cb4b49c2d97a5f4d71b1caf32deddec18d2fb636465b3868aece4 SHA512 d76b2c94c655c187ab150f20b16906034574d017a67c4a06c456d55071434cc0ba7752bdceda86aa6b1a1fe9109fa11594e4ea679cd7d2a77898fb40fa5153d3
 DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505 SHA512 9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd
+DIST httpx-0.17.1.tar.gz 1651788 BLAKE2B 445e61dba5a2648191f57352b664a33785af01bb9ca29c7f553d10111894d0b4011a6987bdea880dd3fc87a60ddee7813a2d51e12178277b60ac27ac6fa930ef SHA512 260040e266144f56b8d1cd085e0d97f2b570c685560fd2bc6baca633e8c9e88a666d0ba072048d63f826dd380df7116ce676dcfb48406e39a7480c44f73368c6
 EBUILD httpx-0.16.1.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
 EBUILD httpx-0.17.0.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
+EBUILD httpx-0.17.1.ebuild 1255 BLAKE2B 32ef44049e9f25d489e9067fd060a27ada135a1af8814246289501621799d156106ba7414e15ab006e1b3efd9e88604b9e8a0c30962e7405aa87ac03b04536c0 SHA512 f584eeb324071170302ee466a6e7c59904937bd10b26943d3d8e184ff42784574414b9f26365da04c68e577f779b93470510acef8462e38df2f90d52e4bc7693
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.17.1.ebuild b/dev-python/httpx/httpx-0.17.1.ebuild
new file mode 100644
index 000000000000..8c321dc80c6a
--- /dev/null
+++ b/dev-python/httpx/httpx-0.17.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	<dev-python/httpcore-0.13[${PYTHON_USEDEP}]
+	>=dev-python/httpcore-0.12.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Require Internet access
+	sed -i 's/test_async_proxy_close\|test_sync_proxy_close/_&/' \
+		tests/client/test_proxies.py || die
+	# trio is not currently in the tree
+	sed -i '/^import trio/d' tests/concurrency.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 6dfed43a66c2..b12cf1eb43e9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,19 +1,11 @@
-DIST hypothesis-python-6.1.1.tar.gz 9107792 BLAKE2B 50d3b284f0ab1b7c1a25fbf1488b8fea74c66aaac07d58e3271f187e54579011311ef3c20cf5525e84058382c516e6cf1495201e8b6fbd45fe28309a25fda0e0 SHA512 7d6ef548333b860dd868a9aa2a220191c237ac8e843cff835f423332fa561377ced29a9703cf0a49c76594a986048c1b1a1b8df5b38b2848410cfd7708168d58
 DIST hypothesis-python-6.2.0.tar.gz 9108590 BLAKE2B 73a6b71c68aec1ec51f791187bbe5be679d5e3b4da9e66745767dafb109d298b0c61bd461ed838a0c75884d155fb408bddebc75d1cf887629da5cf5d6b053e03 SHA512 b249124f90d1d68aa6e106965b0ae78e37f095be0adc1833895f0895357d46c907074e2abe458be566708ba006b6c4375908b40ef89d52300fd41ad63abc2e52
 DIST hypothesis-python-6.3.4.tar.gz 9112374 BLAKE2B 78867f0ff142d6059a20c437c3fab333de06eff5247d93c1e70f75d801e54984c20da01322b7d4d4999cb30f2c59c6e7cf955fe60ecc0e90b452b8ddf6b6f2ff SHA512 7baee8758d86afbb0a8a16e18b2f14d3870ee2f5623857fc691ca1afc7f0c6555b367fbe758ff02c08af492b4569ef2aeb8d61bf3bd91ac458312a43b02d02f6
-DIST hypothesis-python-6.4.0.tar.gz 9112974 BLAKE2B bb2312e1ae838e9a58741709f5d55d9593991c2600330f4917c8e8f86eb8219a0826e87aa810ccfa731e5a14f1d0985cb3342c73ba5b8ad5d8e01419689e180f SHA512 2899557ff872b45347f8865ff9bf07da97e2bfc3f4827ead2d4b0648c664bd9ef7ae3d48e5f5158b4dbb2d5063831ae8a1a7ef0ac97f2ae21318c6198850865d
-DIST hypothesis-python-6.4.2.tar.gz 9113516 BLAKE2B 115f16b4e9a4fdc4b39942cb593dc397066c556862cb79baf3c9d9c0c9d1fa46e1e855b91c73d8f93135e9582f6293d896245fbfa31bca667cb522f1d4955adf SHA512 bcaf876c197f196f27936fd6b5294cfed5d0db2f528ee95b9ebf6ae429a41dccddfd6fd66eebf8e5ad7ac512d8ec20f1878a6ded9d4c10013b732262c9454799
 DIST hypothesis-python-6.4.3.tar.gz 9113616 BLAKE2B f3761a22b574edc0b001a25c836c3a845fb3a1396dbc4afc2caa1f31870793cfca8646e6b9b45386e835fce97b9bc68226018c50675931e48968e9502ad41844 SHA512 010d140538bd6a361326d00bf38a50ffbbe08adc55cc7597cf69563b5d028335493c1925bcb91f618afd87f4d754e8109776be89f229e8b25b91510fbf64d7bd
 DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
-DIST hypothesis-python-6.7.0.tar.gz 9118149 BLAKE2B 5c9601e6ffd9f2e20b518fdfc30f74ace1ee906604fca35c942a59370349c1166a1fd229de0bf5d3ebbfc1851fb59f92be65b112aeadc3bd10d4f628e3648e6e SHA512 fd57845f696117eb5d97f533443c60446adb95eb4dabc772c84eed268c2942001fecfc1460b42c2a83fdaec88176ff87a881f925a6e6ab5485b44f0878054d2d
-DIST hypothesis-python-6.8.0.tar.gz 9118818 BLAKE2B 560220e7224235ae395ef457344c5b998236265d2d4be30be670e8559cb290554313d23da0fc4a16121cb01e0ee39550d3e915cb3e90d3a344b3cbcfe3a34b7d SHA512 cf151ad89e5882fcc97e8fb447ef07deb90de6c9a3d2ab770bc31c156cbf1189f330a8297c8847180c8c98099a759813bd798e727c3f268cc7f87a0a523993f6
-EBUILD hypothesis-6.1.1.ebuild 1849 BLAKE2B 9515ada34767c85fad60ece3c12a46243e74e242c579c19b091683f74c69a729c0d3cc564aadbb1f67ac44f8a91e829b036b5960fb3f0c5b6e2eded695e90b52 SHA512 c5eac04dba95a69fd204c9787a02b2ff69dd8f5d20bf622a5f6a774bdf59f3f990894b960fb47428bb751a42ee4651d6c149e4fd6e0b18f61b3d5983625f6a42
-EBUILD hypothesis-6.2.0.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
+DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b856124a312b63f087a6fd200282e9b0a0cd6fcad1a42a6008406bc347f21bf9cd6c5ff2db79d013987281f59365bd9d91550d SHA512 2f25e994438479b5faa15b2038146ab385445bf2722b0951ff55f324b074248d7322c4c6f3e9c659c18d0aa94150eea4c6567a7ac24debf2de4b32bab37a4dcc
+EBUILD hypothesis-6.2.0.ebuild 1849 BLAKE2B 9515ada34767c85fad60ece3c12a46243e74e242c579c19b091683f74c69a729c0d3cc564aadbb1f67ac44f8a91e829b036b5960fb3f0c5b6e2eded695e90b52 SHA512 c5eac04dba95a69fd204c9787a02b2ff69dd8f5d20bf622a5f6a774bdf59f3f990894b960fb47428bb751a42ee4651d6c149e4fd6e0b18f61b3d5983625f6a42
 EBUILD hypothesis-6.3.4.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
-EBUILD hypothesis-6.4.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
-EBUILD hypothesis-6.4.2.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.4.3.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.6.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
-EBUILD hypothesis-6.7.0.ebuild 1782 BLAKE2B 379ad45339122b922c698b0beef73d7c98555abe8fc13a2253b23cc0679a137d64165c29f2a63814081fe65c3f92267dce259d096428e32711083173b20bceaf SHA512 19afdc10e149ff2145bd5b3d920766407c724435beafa7911f60491f366eb825c21df97339cfdb96aa818c9aa4debd21423fcd2f9b0afdc5191cd5611c1a281b
-EBUILD hypothesis-6.8.0.ebuild 1758 BLAKE2B 851664ea210f1d73d74597e16cdad4a3ecb7a94f69876aa4fe1518b7cb90041e148fa703d4260ce0321f99b561a3352e45369ccddd2cd3b9ade733e4f7f42d59 SHA512 75a7c6d83e2d9dc1f6b6571876483d8ee019b82b0eb1ee670d2db92c3541e1acdc344ff8a8fe6ce2dac3e7ea3b56c9672149f21f20f490aebec0702975aee33a
+EBUILD hypothesis-6.8.1.ebuild 1758 BLAKE2B 851664ea210f1d73d74597e16cdad4a3ecb7a94f69876aa4fe1518b7cb90041e148fa703d4260ce0321f99b561a3352e45369ccddd2cd3b9ade733e4f7f42d59 SHA512 75a7c6d83e2d9dc1f6b6571876483d8ee019b82b0eb1ee670d2db92c3541e1acdc344ff8a8fe6ce2dac3e7ea3b56c9672149f21f20f490aebec0702975aee33a
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.1.1.ebuild b/dev-python/hypothesis/hypothesis-6.1.1.ebuild
deleted file mode 100644
index 60bc6007a399..000000000000
--- a/dev-python/hypothesis/hypothesis-6.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.2.0.ebuild b/dev-python/hypothesis/hypothesis-6.2.0.ebuild
index 973ce1a66b61..60bc6007a399 100644
--- a/dev-python/hypothesis/hypothesis-6.2.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-6.4.0.ebuild b/dev-python/hypothesis/hypothesis-6.4.0.ebuild
deleted file mode 100644
index 46ee7df74d3c..000000000000
--- a/dev-python/hypothesis/hypothesis-6.4.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.4.2.ebuild b/dev-python/hypothesis/hypothesis-6.4.2.ebuild
deleted file mode 100644
index 46ee7df74d3c..000000000000
--- a/dev-python/hypothesis/hypothesis-6.4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.7.0.ebuild b/dev-python/hypothesis/hypothesis-6.7.0.ebuild
deleted file mode 100644
index f1a7844b5d55..000000000000
--- a/dev-python/hypothesis/hypothesis-6.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/pydantic
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.8.0.ebuild b/dev-python/hypothesis/hypothesis-6.8.1.ebuild
index 75d02aad2bd3..75d02aad2bd3 100644
--- a/dev-python/hypothesis/hypothesis-6.8.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.8.1.ebuild
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index d0653952ca57..245ecefe693f 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,3 @@
 DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
 EBUILD imageio-2.6.1.ebuild 523 BLAKE2B eab51a9149b1f48b4518639a59761e9d8289217ff6d3afbc85994e7c965705d3c9c3d1fbeb008d44a4ba1b07ffd95e0bbb3c02c01f9198c876b7e1ec6c2b0168 SHA512 9cad77951c91476a68525aeb8bd78da8c7587e8472438cc84fb28dfb8e6d11c5096485464d789b1c870c966a048e0ec7065210c7191b468b3c02a898a25368e5
-MISC metadata.xml 803 BLAKE2B f71025edfebfec354283c74f2cdab70302cac14b1137c7c193a89f5b37ead8b98cc7146918f2a8c89606e4ecca8aa08cfb6dc0fb2791c3b4a90c3ba0457d12fd SHA512 e601da5f6705a759d7f3e32ef907abc69b8352242b0d98874e0811a1537b0ae480a01132d9c19ab2cfec6c0cf8022b4bde7fbf577ecce070ce80171f87935820
+MISC metadata.xml 833 BLAKE2B b35810f51b774249322a1bee756b441e5c1fbd03b98d5c74856c22167c60d249921efa5fa7f0b5717de605cb6feeec7ccdbf787a0b3fcd060e154c2a1208e954 SHA512 a8e2e7f9f85d174aae3d7d0d7eb90a5be4c0917dc2cd4ecf5e9a5ebfa632425d18bbe2a2c038e17fe62cd83f3cdd5fd72079a8101b59c40c38ce9edb2c6009e2
diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
index 108e928bfefb..1629892fca06 100644
--- a/dev-python/imageio/metadata.xml
+++ b/dev-python/imageio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index aef2c1fba163..5faae41fce81 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
 EBUILD imagesize-1.2.0.ebuild 520 BLAKE2B 1aadef34f0e813948fa23996a27ab80e367aa0bf62e50c8e6e609ad6eac7f9a712dc9dfbe3cd40d9000dba5f5761daa4473e5a8815528c09a13d7d6fd9974f51 SHA512 e86833c4058714837eafd6cea35c7d75f75281da281d8f10bd8d3c53e1180c0378ca68bded444407ab5759482878c72a6d210352d5d899b182638d37cc8c2070
-MISC metadata.xml 459 BLAKE2B 5ed30d61f2b70d64d2dbaa60ebbb559e33bb9232e9119a8ff13c6aae6a5f4df361d2c497ad35570a9bcb1352d48e30623196c3758b2fc46e7b5327c2b0ef1eb5 SHA512 9073715f3624d37bf197b005d1998b96d05c0b876e29c3b4ab12aec5fef0a3739e78ffa0c45f4ace103a491f0a691f94624dca6256a5761b62abf6c828d420b2
+MISC metadata.xml 459 BLAKE2B 55933c293a6441f69b47f9166925382254383ac600436fd822279fcd63dd9fc576d761bcea24e7b5faf9812f554907bb7635b1fe4a2ae85de6fd3d5c01f0fcf2 SHA512 b9ea9fcab45671b1c26c5128b3350ec6637c1c558855f3cf4637c7d1ad126842d66b5d914b9f1d7594df44bae73ac636ef0fc631b16e2550f5a7fa81ccfe91ee
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index c4bbd550eece..8d34c13cf35e 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 1e3b63e6ec54..446f5439df4e 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,7 +1,5 @@
-DIST iminuit-1.3.8.tar.gz 496459 BLAKE2B 71920535b48ea135b34c9f55b0ac0aecc290ff68dd9a27e549ad643caabb4722899ed8eb3e413850ceb965910c39452c59c3ff4cb93416e4f945534f9a518071 SHA512 4c0069389a5e53b6e082ef82e56226427fdfd66c51b6c5bc488ebb2b113fd98ab6494d26c94f97255eec775e6441bda5c506b402ad13ad8698c361742e8cbc60
-DIST iminuit-2.2.1.tar.gz 371183 BLAKE2B 3b7f1c2930a490c458d1f5659e7cadabe782b74d4426a1b16c56acb3f3c2fc3c413d6765156ae681cf838d184db674d5f66fb419324b43c5a91944b8f6190eb5 SHA512 21f04b82c646c4bd6a9e5cc1b8bd0503e1693e994bef83f57595935733cc238231f57337a38fb15abc62782228de73b960b39ae46250a4124ea4f7fca8d8c5b9
 DIST iminuit-2.3.0.tar.gz 371854 BLAKE2B e432da9281c5d50eb306766b65e20a1d02b0fcc06ff0c9dd44f60a8cc840f406e76b4d3c5643a6ab36b9ed0f29f0a327f6fa16b859522853ca9211470691334c SHA512 e3be69040bd5a5d42fcefb5bdc8f20e002eff22fe46d83a9a4cafc66d6772f57169c336c618f9b14bf819042f922e3c37ab88db4dacd36b3d2f1b2ceb8e2d081
-EBUILD iminuit-1.3.8.ebuild 807 BLAKE2B fdab3a99d4687a706839802c16ad4c89c0d54e05b4457edcac5285412630b46f016ae8280cef938f0d0d6648d8f8b4148dc8d690c4c517bad670f822eec88039 SHA512 08709f2580df40237e46e93931428c053abfc1bee1c8a5553e5fb7fdea2f86be8f78286fe836d7be75df9c7872e48123a6bc743e3b86e9d3569fa706248b9007
-EBUILD iminuit-2.2.1.ebuild 764 BLAKE2B 3d1410fd47b44d3586b13785266435ca3adf902d2a78e6430e2b468c681f82a17a7865e5836e58f483c54ac173d1807c918b19c30cfd4dfb851e2e3a8d96078b SHA512 5407735adae0c13b72dcef88e6cca326441f534a77dd38d9b0243e45dcee1bd80a4a30663df44f6b3444b48e76c645c5b0947353a4ef64348d15f1a639a7413f
+DIST iminuit-2.4.0.tar.gz 372122 BLAKE2B f6590bb67d8c79cb8398345a76a7af7e95bec83864ca950701a97cc3e0543c6b6f2aac8340cd814586328ca519387f592dd45115348a3e5c1096c87799db2f81 SHA512 9c5664cc2b21ccb0f09a63bd5484dc65a6226d385d073f2430a0d5230a3c624694b37adc911e787d87bd6d6541a5d322dcf937a0bd82cdbf9362cb53edb4a7ea
 EBUILD iminuit-2.3.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
+EBUILD iminuit-2.4.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 MISC metadata.xml 493 BLAKE2B 6b9a29fc8851930ad4c8a23ee8e10983f68dd21eec5637efb12cacd6a20b154746333918f6acd81c71422dd3f54128e210448f6ae9710c180939d38c4325840b SHA512 8715ffcb3ac90a2ef0cb20efaefa6375b4bb901c5b7e224702ce951a6dc5b963a64ebd57ad55bc46eece978a9ea4c24124a2ae09dde2315d7fc4a79fbc2154d6
diff --git a/dev-python/iminuit/iminuit-1.3.8.ebuild b/dev-python/iminuit/iminuit-1.3.8.ebuild
deleted file mode 100644
index ca8a0d0383ba..000000000000
--- a/dev-python/iminuit/iminuit-1.3.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/iminuit/iminuit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-# removed until ipython and matplotlib get python3_8
-IUSE=""
-#IUSE="test"
-#RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#	  dev-python/ipython[${PYTHON_USEDEP}]
-#	  dev-python/matplotlib[${PYTHON_USEDEP}]
-#	  dev-python/pytest[${PYTHON_USEDEP}] )
-
-#python_test() {
-#	virtx esetup.py test
-#}
diff --git a/dev-python/iminuit/iminuit-2.2.1.ebuild b/dev-python/iminuit/iminuit-2.2.1.ebuild
deleted file mode 100644
index 3c8fe149531b..000000000000
--- a/dev-python/iminuit/iminuit-2.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/iminuit/iminuit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	  dev-python/ipython[${PYTHON_USEDEP}]
-	  dev-python/matplotlib[${PYTHON_USEDEP}]
-	  dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	virtx pytest
-}
diff --git a/dev-python/iminuit/iminuit-2.4.0.ebuild b/dev-python/iminuit/iminuit-2.4.0.ebuild
new file mode 100644
index 000000000000..a949c1e97989
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.4.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_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 65ff6158e76d..e3d469247c2d 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,5 @@
 DIST immutables-0.14.tar.gz 79451 BLAKE2B b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217 SHA512 244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
 EBUILD immutables-0.14.ebuild 475 BLAKE2B 1b17a7270b9430dabe58feda72720a22149a403537063fc488172b5c354a36c64d1bcc7310991293c6e4452c1b9274bbad7ad998014e23b2c5d863a5522a84ff SHA512 f0279e96f8311c222d030e6a6ac1c24520e0746b0c77607852f4c690b9c98b1b62bc4fc6a6dcc2b4aaf578e0175c41b21278dc3c4b6beb1635a21f93ed83ca4b
-EBUILD immutables-0.15.ebuild 479 BLAKE2B eb158e2c1fc24c7ee55d7049bffe031c28f461856f77d3ee3c494d58ae20e99443b9fc302a805dc41f2291cfe4043a14508d7acd889bf8b5ad8a17ba1bdbf396 SHA512 cea5d8ec18ff06f2ee9117718d899d7353606d2abb4c987516c5cfdf140072497033554586246444fd2c5f2861586d2bd767c4ff863c56792676299a8f164fdf
+EBUILD immutables-0.15.ebuild 477 BLAKE2B c190136731068a576477d554fa6e1bf8d66a5a5b7f5f8f2e4574ec8ec3b7c662791eb24e8ecab61f19930e7b3dc0ce8b57d43fb974f5809147816828d0825c97 SHA512 85971724d316194698cb392585414fa2e1cb483b29badec86ad1a8eeb21c1d337bb9b84bdfe9d4f34318a331531217bf1da44af292d45642e7dfb83c79e084ad
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index 566e65b092e6..240ba0445cf0 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 9959e364be38..16dd53788fc7 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,8 +2,10 @@ DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a40187152
 DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
 DIST importlib_metadata-3.7.1.tar.gz 36595 BLAKE2B c4eaf3671ec48610ce310a2609625ab77496252953c2d0567cc4824c39a8601ef99fb3ffd5d7968eb7aa358aaedf0ab81d87271afdddac68d7bd3a70971b153a SHA512 b301c6c72b185d893e5e400dbd9417b2ba94122073d6cb163c9e9949fb13762ddc57b34dbba1330b55bef47073fc72a6a4b5689adf9af819a68be603c9d64c9e
 DIST importlib_metadata-3.7.2.tar.gz 36644 BLAKE2B 11e8f0c012d405a7059842fbc0aa1edfd8313a01b12b36e40c5a542b17f6ebe5284e945967f080c5934758820354f131df81e84d1fa4d5e6ac1660dac055a914 SHA512 ecf630c83c08895d566fbf3f435d4bfc5c0336dff1c682e6413598749c13720211aad4085dd7b9a88ca4218ef5514cd730a6f13c2c53be6cc349edd142106204
+DIST importlib_metadata-3.7.3.tar.gz 37193 BLAKE2B 0de5f4ece99db9ec4f86e9b967c8583d06a5bda939a7bdb137dba3c6a9d7fd034802d9fa0eb5bf209ae5ada89ebd0f3120557d3fa2b300739ebff2ff1bb6edb8 SHA512 1d6ee80edb3e5efb56deb0676ef42ba72fdaf124504023954cb3b1192e5378c3370a35b5e77708f3d9a19c02f0d89a1ba08a919a7aaec5e284f54c2eb3c61fc1
 EBUILD importlib_metadata-3.4.0.ebuild 1124 BLAKE2B 4638a48f81b82f368fc805c11e5ae2da1ea40e21de8bbd2eec56d5189d8d1b7ee4fed82e922f4767c77d2f490785baa0e2a5827cadf4df067dbfc7b73fb17452 SHA512 f5e6c62d3528d0f2dc4c517f23990c0b6b46f51e4beea035287d7762eac87fa677b7b9045fcbfd16cc74374b5180279e4cf8a18950e53f9a415cde93331998e7
 EBUILD importlib_metadata-3.7.0.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
 EBUILD importlib_metadata-3.7.1.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
 EBUILD importlib_metadata-3.7.2.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
+EBUILD importlib_metadata-3.7.3.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild
new file mode 100644
index 000000000000..c7a1cf5de753
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_{7,8})
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/imread/Manifest b/dev-python/imread/Manifest
index f432aff172a4..25f04f0276ad 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 af19d0ce55c1650448d8e8047ca5d8f9dc9f2eaed7f28e400a9136ffa86d9600672c482b622615035f8764fbea0661dabfb379011da886d4aaa79ffb991331f2 SHA512 fbdd047c4ba753d3008e38d5d95a2c37eaa3971885a584e7c8d0a32b222edbc5328d7916702a1e53c903107d39468f63b3de6f3fc6d48093c1a8c1d8a9eea7c3
+MISC metadata.xml 630 BLAKE2B 93a4fb70862764f6de127fab8f761d04f568d755d224dc0196b285c13966fbdbb7670ab96c8f8a01b279f63d319b2c4ee254b184a7fa532596dfe33e595c0d2c SHA512 0f156f922d31d45abc2b390e2a2bda8abb3a8b84ef9cb1ef48d2ed8917574b9bf4f4606d3b40b3cd6bf5dc41fe721eab734707388e6fd1040b2593580df95cf0
diff --git a/dev-python/imread/metadata.xml b/dev-python/imread/metadata.xml
index 3b66827d2fe8..0fd0da447123 100644
--- a/dev-python/imread/metadata.xml
+++ b/dev-python/imread/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 17ee2f7b8441..d6ed9d11cf4e 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,3 +1,3 @@
 DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
 EBUILD indexed_gzip-0.8.10.ebuild 805 BLAKE2B 8a9d1c94f2492934ed0c0208ea1a525707130c21828e0a7cd2db7fa75b2bf6605a8715bedd312d738da6fa722afd7cea63b5fab610113367e9d1be21a49b3fa7 SHA512 85ee0d4b7a0777350647f4bfa2afbd2e4b97874507bdad69c186bbb898802b2255945e956f062f10181bc98f01ec25c385a7abb2fa2ba0291f15b5ce1869f405
-MISC metadata.xml 896 BLAKE2B 775de7e8d9fe3dcb30c4852e9ac05edcf05ce0430ff8a53fa8d3ec0178c4d05e5a661debe0e1673f1a7433e509ac49962839fb4e2546e836aa0bca8c9d19f319 SHA512 7b46296017391091887e48957ea3ab31821b7aca47170a0d6b2d7ae9f3f69da628ad18d0dc818361b53a0a466b471ead20ee303f617a0e0f39a44dafbc35f6e7
+MISC metadata.xml 926 BLAKE2B 86dec52a10883f8fe610f84c989b5ce11b6ea80653e977ffd9797ff70159db47c2541c98cf9757f813ed743b64d66c1a8cac21f3981eccf588d8fff972334bf4 SHA512 4f1df7ec9af73aebed4127b05bf2a77480571b6e983bc68f9366dcf480aa5a5e873cdeae4c0bbde6881c7823c4e2f684c52daf19ca7dabb93a0ac1dd27d14ebd
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index d295ea3458be..cacf75bd775f 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
index c6a5c5790b81..5d65d677e11d 100644
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@@ -2,4 +2,4 @@ AUX influxdb-5.3.0-pandas-future-warning.patch 638 BLAKE2B a8cba22ef423b5162666f
 AUX influxdb.conf.template 476 BLAKE2B 50416cccd720729d28b50d6cd4bcd6582c959b932c75f8dc64525e96be35242cd8dd36b3f689383e22b0eed3925b0c97dc42dbaabdd76dcc3cca4d5f49d8cc0d SHA512 3b8f9dfa149ed0e8aa25c8db8b39968e01ba7f81b9db037a0e05740c27d617dea8101efc9b9ddb00bf354cea7eefe5ad318b2ba309276e5ba4500bc3dc9db62e
 DIST influxdb-5.3.0.tar.gz 66683 BLAKE2B 28dd955fb26eb9a984bb910f26655720c566c08a8178f8aa08b5eb66a6f02933a6f3cb2d26981ffcfc3fd9a017fae2ad27b61f32e2a7916c55d723ffea5b248a SHA512 49ae48dc56ea8f6c6d4103f33207a35af4877c292ff4bfd32ebf8ff35fae816f570e64657406fdf9ef13092c69e7e2d1f0c641124445d35731a4a37812f67242
 EBUILD influxdb-5.3.0-r1.ebuild 1131 BLAKE2B 15908154b071d18142a1637b13bb571f717dd97e12e76462e7073a751fd59fecde4ff402a242fd60b077f896c0ff6071ff32aeb59d1eabd3705bf103c005f786 SHA512 791860c62c7e65b45e4988ef02199fd6da4eecdf3aa9854d8b8b7543b62ba2958abffa179ed722b37fbeaa937ed588e7a1489915b5ba7bb1cdf7c04d0020f57c
-MISC metadata.xml 497 BLAKE2B d0626d2e8a84dae9647d13d9cc6971ac9249d0b77352cbcf0b081460412225f6854770d4eca768725aa57b329bd9213f0c4db3cb5b5bd859a604b9826abe3fbc SHA512 49f6810c70b348acab0cc59581a7e0cda7d798edc68f34127c7eb65c6f70643f281de099b61efbb7af1787db2d9ae7f49d1bd45b1cfa7e2ac67737e743a45cf2
+MISC metadata.xml 527 BLAKE2B 88fe30a3737872fc6927e3891bc2e741eb969dea0fc85876b039b403c0cc26396ebfe65ada6750fcf47b0d9048bb30273ada10da84b1f2ffe514bc7927a1f04e SHA512 3550ae9eb19dde86751637a73a41d84029d0d49e419a8f258017bad578af1c186bbb0e966a744cfec5cca80572b70399c011990ec65b51b7dd043e49247d169e
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
index dbf971953bfd..a4258d45396c 100644
--- a/dev-python/influxdb/metadata.xml
+++ b/dev-python/influxdb/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bugs@chead.ca</email>
 		<name>Christopher Head</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index c2f281308870..3d7395fb7d16 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,3 +1,3 @@
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.1.1.ebuild 533 BLAKE2B 709b1340dc2e21cb112ebbe0f48228e326d6c5a33ca4ea66bd30eabdbc9f3e2ee01647eefe52a0b2777f6e6ad193a8c8977ee279193f81b46c83606c2d48b30c SHA512 e24209f26a586154b455a2e04f22af9c869a4ec2c2a9f5d292a21bc08590b6ecfd3c37da5e7b0d92371649ceb829be1022eb7fa45f0e5adb9254530a0d9781ef
+EBUILD iniconfig-1.1.1.ebuild 539 BLAKE2B de3067181df69df1380e1de348267743d3eb4f44eec56cd6c2f36e3bdef4153fefe1f52b8b1e0aa0b91654d8b4846afaa21baf9374eebbf4d81d9b66ba2662b3 SHA512 183b5ed2d68424f3ab0a8c6815b1bee1584427ab98458f743d15547766ac34874ba48946f5c0a8930dc3d55839cc49ee13a63115a078ac286f5c8509ee08639a
 MISC metadata.xml 314 BLAKE2B 4d711ba8f750f4c66f8a5131c8d0549d8e13099fef027a4b2267f6bff083283b06d80e9650acf6d8df819fe3be27fe6f18d24dadfc85aab266064d43c32fb863 SHA512 7b1ec3fe73060f3145298dd94d741f7998a9372da8ac16290a25bcddb88d9c5780b4c93fdbf439ebee8ef19b147d41145640a9483af4d4554a6c6f5761f72992
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
index eb0291bba45a..a6c0d55066b0 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index 25f99f03272e..be51cb9e685f 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -4,4 +4,4 @@ DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b4899
 DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
 EBUILD iniparse-0.4-r2.ebuild 626 BLAKE2B 74dadcf61f92367b3b17ffba8de16789a6e237434d03175de8dd3900271cba73a6494a961069010215a79f48f4f3518b5052d321504155d9c0182a5a13d5c411 SHA512 8d86d7c83ff0784b8111a0e992372a40fd1c6f3f0c0bb4eb95495ac8823ef9540375d3a4302041ea2cfb58a526dacd5320297eb3ca3d76defde0c8b0eb8cc9a6
 EBUILD iniparse-0.5.ebuild 549 BLAKE2B 5ee96d647dbfd7cd41b9d242158946d4d39a213df0293b04a4f3d3815493dfdfcafa5310db6f9b50e77c48202540b4a2f2b7346959a0770e682f44eeec33c45b SHA512 f3e862b85afe7bb59bbc49eb82c9be256729d9d0742ca338a15591fae8dca7c557d89b1452766cd53bf4e3a10b84309e7745cd755ceea5ac86336b6f80e28be6
-MISC metadata.xml 335 BLAKE2B db225b7a8475401eb48d840d8482c13963f0418882d80a62dfddf915345739cc5c3e54a5036a0ad38c33477d25b5f4ac4213abc3431af99d0d979b6be0f972ca SHA512 abc779cb492e6c55674ed6b633ce9051d5b9496208798e00b563e9783373d57c00ca41a2696276b86ae165d1e3f3debbbf0a1f3348d9978328df75a4d01615b4
+MISC metadata.xml 335 BLAKE2B 8c6ab85fd5019293bf35f10dc2ccdaf54d5ce871361a3a074f86b3b87cc1fe38ce90f47fb3cd2eac3212118c8db21d6166343af5de2a7f144e647427a0b89807 SHA512 a97b8da0471080deb4dff6e38d0ee3648a34df6c582af17485e405fc3300fa23738e70554606f444e16c1dab8cc8c26c45f215927dc42599dde1e233e2c31327
diff --git a/dev-python/iniparse/metadata.xml b/dev-python/iniparse/metadata.xml
index 5e768a680b72..a09a25a8475d 100644
--- a/dev-python/iniparse/metadata.xml
+++ b/dev-python/iniparse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index 2809fb4143f3..12f335f029f6 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,3 +1,3 @@
 DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255
 EBUILD intervaltree-3.0.2.ebuild 481 BLAKE2B 2571ec7570e33c1a38813a67fbe52814b958298eacc311a79de4693932f611de9f49b0673998967f439efc089d2b30355c7cab3030cdacac66c8a1e1af4d01ba SHA512 4376e20c205d4a92b6a7fffdfb081d8e68052ae3f61ec6b39780a0f277bc57fd2a638e0953d15cd7369eeb39cf3e40dbfc919f87f0afc0bf64cbac4567ff1cb4
-MISC metadata.xml 336 BLAKE2B ad3c5d5f7951cb6e6bdbcf930932da989f42fea6f01fe9d31c0a6741b1f9362de9e5af66d2a610692290537f7dca53f468c0845d3ca931b8a8204b91770ef7cd SHA512 4149796fdf18a600f444b1716e32116eedcb71a535e206e3e1233b91071967fb8419b5b15710710508f25fef609a8cb2a68baafd4a91d72e962acaf42a8feb2b
+MISC metadata.xml 336 BLAKE2B 2aee29e9ca9c3701c9920d855a1c14477cb67dc720738c5c506ac1780287700ad20660aa487c4cf68ffc2925077b21c5f81589c5d409a36f70f992724968071d SHA512 fae90702b12a57f497536254f8eeaec0139a5a0e5d13781cc995d952683eb6fbe4818f7b9d213faf89db80c8fb0a55f770907033a6643b560d9f978ceaf61660
diff --git a/dev-python/intervaltree/metadata.xml b/dev-python/intervaltree/metadata.xml
index 16eae33e858a..e0c886d5343e 100644
--- a/dev-python/intervaltree/metadata.xml
+++ b/dev-python/intervaltree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 767469673343..1befa1b94548 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
 EBUILD intreehooks-1.0.ebuild 860 BLAKE2B 5406f1318b43aa81b3a994c21f2c8ce038ab91fbfe7e5b96433834e7dea95007df064aa311703bd36726d7baed8a11ec2132ac9af043611418db6da835fe2942 SHA512 97fc95a8c0d7b5f57d8177fa9bda000785f6df1ece79993aa43d4beeb476f99e9900079997e51188a5dcfeab9de1a7c3a1ab5c62b338f31e70df417fd7a01cec
-MISC metadata.xml 396 BLAKE2B 8d8701c70f58552593bad0d44e6408b468d08af5d9b9bb6a2ef893a76e1f63abf805d3398780d696f97cee05f6309952347c68a9e3a7e50024ac4c504a082340 SHA512 a683537e004fa251701bd397f45f00a79cd39b20a94af709893c571066ceecd2a4b120641454a8311c6a12fbc9a7c8d1f6df3050e900db393a17b50e59e79274
+MISC metadata.xml 396 BLAKE2B 7a7135eb22e2320fa89acd56960cb899f5f012978c61d6c177b02847907729724ba5f86d6ab8f5e6a04667512f1c8d2de8e4b6ee99b47b00062fd0194ed9f054 SHA512 a4acec94f49fa4eb1fdc476740668b6293847e17da1c8472312ac08d7796675ac51a29dec9485b45e894d8d1b0f9149cb9e7ae8c3d02ab5634a8b7d6e8a85781
diff --git a/dev-python/intreehooks/metadata.xml b/dev-python/intreehooks/metadata.xml
index 34d6356499c1..b877c5c9271d 100644
--- a/dev-python/intreehooks/metadata.xml
+++ b/dev-python/intreehooks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index af62718fb010..971efdc39293 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
 EBUILD iocapture-0.1.2-r2.ebuild 499 BLAKE2B 61482d60e265af49572f2071d2cd8bb115eff95f73bb9bbd2e9b0cd9bab182a37c8aad9d9ce9257e1d15aa42aadcb343b78741ba1c6970a5c609aedb583fb83f SHA512 9354468d61b6296596440fd44f8c58dd29dfd0ff78f4c109090d85b49449eedf7eb41d1e398e5f1b29087f0f2c4e45cba4f7bb0c239a0de2a9ec536e7093eb98
-MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
+MISC metadata.xml 368 BLAKE2B 5cfce1df114286d06d7dc4482bdc3d9475c50a17cd9778acf6cfbd04fee31e171db4ffee2803580f2865f07e646d63ecc2ca878846609b7cf43fccbddcbf8ee4 SHA512 3d11406f243fdf87bb03f9d2d9b7ff9af902ff006b6095b037c15ba2756f9519fa1289123f24163a211b302c1d4df484d66fb68688413dab23580575d55f343f
diff --git a/dev-python/iocapture/metadata.xml b/dev-python/iocapture/metadata.xml
index eedcfcf90ce0..0a49dfc542da 100644
--- a/dev-python/iocapture/metadata.xml
+++ b/dev-python/iocapture/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 64097ccfc0fb..37dcd294a81a 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,7 +1,9 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
 DIST ipdb-0.13.5.tar.gz 16145 BLAKE2B e0bae825c2ce6b640e73e8ad8615f5f4e9c18a00e8c081a66ef0adab3429792a07c8434ddc8b236f938b7efd263c51f29bfe3f8d232d8bca20ab0cc2eff8165f SHA512 3ec05dec884a0006435fd7e5eb68bc76c6dacb1b0dd3f68c10c8c2a9dd3991bd6e498dcfb3877e5e534240ead1194787049ae3815fb8579b7bdea2e8c91970c3
 DIST ipdb-0.13.6.tar.gz 16303 BLAKE2B 92c5a3b5717c6cb8f1afc8b13d6ad04a0964bb82221e5637818c085f6df6451b806b74bea6cfb1b3f18db7b3a8101bcf006160f9ad0ab241dbcc088dc0fd0321 SHA512 d46d92e55fc3ca35dfa29aed9a47cfb841cc09460ba7724dd553d719f8e8deddeba33a39e143914c32a5e41d38ffe086dc4b64c6c53b984a6c83546ae5f46319
+DIST ipdb-0.13.7.tar.gz 16437 BLAKE2B 3f4ca56f0279f4bccc14eb12df48e03b938ff2de0e77a5fff273f82895dacc8d079f5ebd66f63568f62f3f1ae3f266695a6bad23911a872b5ed0f1628d32d1aa SHA512 14ccccb645bf3fb303d82718ed9f1e7fd19d699c9a875358b336135b40f9492b6c9c260c53fa87f38aa381e989e6f6c801f081eaa361c8e929c6e1b0bbaa300e
 EBUILD ipdb-0.10.3-r1.ebuild 536 BLAKE2B 07e119a2fefe2dd1387c75988a0b4aa9fe73e47d288fa8e1e51fa75b54ab60f06adac72a6bcc2b8e68aa5ecceecccebd392d0c08a32d6514b3370106c54b89ec SHA512 17fce962ef688d754ac4c3f0fd251d5c66bba339b25c7b902e51b67f64280b0e12b47853081305a6c6085165453369014aee6895a94f2ef62b1874dc568437cc
 EBUILD ipdb-0.13.5.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
 EBUILD ipdb-0.13.6.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
+EBUILD ipdb-0.13.7.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.13.7.ebuild b/dev-python/ipdb/ipdb-0.13.7.ebuild
new file mode 100644
index 000000000000..4b895e23400f
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.13.7.ebuild
@@ -0,0 +1,25 @@
+# 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="IPython-enabled pdb"
+HOMEPAGE="https://pypi.org/project/ipdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( HISTORY.txt )
+
+distutils_enable_tests unittest
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index 4c3c5144c392..72ac2cf106b5 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r1.ebuild 419 BLAKE2B d7026f11bfdf8d3e22a70124507ea04ffb375d9910986a53a57141f23da19883dd3b6ab2e8e6e579df80de7debb57e9b4a289c5c24fa25f9cb688bcbe487c802 SHA512 ade6f79a7beaf41de643a5197d209abb4ade93c9264a5cd59b4a51ea788aa6f355d6c960c1b9abd93c16918fa1b5466f1de1be62478cbb04d8a6acc4c2190905
-MISC metadata.xml 836 BLAKE2B 4dea2105ba7319f4068c670e25ff874be86c94dd128997eb53e3909a4c20b741ad145b823bc6f5d543554fa69d386717d90dce7c5a5c4644daefb99cc615d95f SHA512 1508f1c25aedcd8128cb5caeca6aa1b344084fa635a3f1634a73eb7bddeb900ee6d6462650d954510f5d0ce23128b1473932fd487791cb68c33504b507dd78c1
+EBUILD ipython_genutils-0.2.0-r2.ebuild 524 BLAKE2B 5cc55fb3605f569f2a834008d5c2efd677eebf37f6978a4040dc4687579c133e514a6d6dd1a78938018e821cce7d5fec6fbf5b1ecf14c77313b625b69cd53e59 SHA512 2e0a21ad88833a2403740378265f711ceb23dad64664ed7724b08af4c35fd7ed2a0807fc772cc9d8abb7890c48bc347d0d09eb95e135c0f7fbf1ecb6b91baf48
+MISC metadata.xml 861 BLAKE2B c2d0b90a2e95e3a71c9309011c5dfe8bf711c2143e91c288d0ee42bc9cc1143e17f2cf2a6257bd675c17dd33ec3bfd764c62ba90f40204bb30ec6135e35a811d SHA512 f56d734c089641d8e615121f026702ae47b46be7b8b8cf0dca3c42b866b1c8f1f5240041834403a82ab6a22acb3a0986b11cbd6fecc9171655dd23f2509a1e0e
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
deleted file mode 100644
index 3cd68c1222b1..000000000000
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Vestigial utilities from IPython"
-HOMEPAGE="https://github.com/ipython/ipython_genutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..f65b6cb184d5
--- /dev/null
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
@@ -0,0 +1,21 @@
+# 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="Vestigial utilities from IPython"
+HOMEPAGE="https://github.com/ipython/ipython_genutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+
+# Needed because package provides decorators which use nose
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+distutils_enable_tests nose
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
index 6f8e61b033cd..c48cf7e58d75 100644
--- a/dev-python/ipython_genutils/metadata.xml
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription>
     This package contains some common utilities shared by Jupyter and
     IPython projects during The Big Split. As soon as possible, those
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index b52fd036d198..df46187cf165 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,3 @@
 DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
 EBUILD isort-5.7.0.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
-MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
+MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/metadata.xml b/dev-python/isort/metadata.xml
index f56f0238fab5..075f1dce9e03 100644
--- a/dev-python/isort/metadata.xml
+++ b/dev-python/isort/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 56a2fd3db083..ff7ba739e0a3 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,6 +1,4 @@
 AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
-DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
 DIST jaraco.collections-3.2.0.tar.gz 18195 BLAKE2B 51510dd5053563319eac1c412deadac0a5f99ce3144d44150b5835ab92a05529998676fdcb577a5e725b19b4953c47c662e2f3eaa791de955c2493014713dd11 SHA512 cfea2de312781ec9d7a51752570432ec85e62834d02582023378ce0815e0c25f4d4e6afad8486559aa4e3f6fa6e602df917fdb11ed7a72423bea7ae816675258
-EBUILD jaraco-collections-3.1.0.ebuild 1305 BLAKE2B 72d1428410fdd7650acf922562c08d996e1978dff0b930ba0de74329bb53047d9771c931d59264054f24494e1d54b01739e488928f88e9a77773b07a5aa105b8 SHA512 8a10477dfcb76cbd604ec76270600309d151eca321488a890fea294a69fd33bd7b3dc8f696cc497e31816df83ec735dac0961b4fb66199a387da1e11d7df9b35
-EBUILD jaraco-collections-3.2.0.ebuild 856 BLAKE2B 9b923ba6734b9791308661c9a8467fe13509591394fc7b9f5ee2290339465b3a10a55a2092ab1ef00568c68b3f8e6b1322762afe0dbd5f6d19606007305a9bee SHA512 3d954cf162c6e1977d02724083d142d944c3a89bd820bf04a6244fea2140e23baa307102465fe455ea0502dd1dd8112093244bdf4e25fd5e112d383a222aee10
+EBUILD jaraco-collections-3.2.0.ebuild 851 BLAKE2B d9583c048298326a2572ce1444a3a5c5972b4c9a27cedc57328a2cfaee1dd96d0bb5ad7624194b8d33799589cb6979e285eed1fe8e62653eef69338163a13512 SHA512 d9a4873c56c7851fc8c43270fa898bfdea0e82792a69b5aed73bbb1bd86b39dd95ac31c28e4c025575ee2e9eb7d008609c9cc002096914fcbf364ce8d7e21eb9
 MISC metadata.xml 683 BLAKE2B 39d22a937701983234b04b29b79785efcade578cfb3d94f694eeb1f5fe90e82831891aa689df78ca118e2c53d7be1ad61046a12656d430cceaaf4f72630ce827 SHA512 7493fc3e325c36c0cefeb6683a97994e5c8627d4e9bc1ec0b0fb2c595c1ff10756ecc2738fa62b991e6a7993b847d780fdaffdc609171bcf255a13b37b7ccce9
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
deleted file mode 100644
index 198c443a3e10..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
-)
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
index 337b892d43db..fa997469f46b 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 13e94f07012c..2a19c034d7ef 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.envs-2.1.0.tar.gz 10207 BLAKE2B 80a2888ab655b1c524a80d33f8c15b08257b2d4415bbc30ce0d60f8f4a019f8f1e0f05cefcb2b4f64688a0e6ccabb227c5824c27c6f63f6ecb926e0dc1ad208c SHA512 e9cbe17a86bdcda17ba1378373d729d850a2a4b0d0924a059dea0fc448964d55522da99a27c507475973b5d3cbc822ca184ebdb877207019f1daf6d5fffcb7d7
+DIST jaraco.envs-2.1.1.tar.gz 10190 BLAKE2B 3b191549fe8a5cee1a964559f7ecba8305ac22cc1980191c7fd967a8fb5eac7c81cd8a2752566e2d0e820a9d089422d11fc5529f56d4266cae411ce13e304bb8 SHA512 c71aab9748cfa31c27bb7899117e15d2836851a47a76b638177facc89e894dfa2c4168da2d5b1873b1eeed0d785d23137e56e198f92fb83deb26aab38e342ad2
 EBUILD jaraco-envs-2.1.0.ebuild 980 BLAKE2B 28bcaeddc3e27b1b7602ed7c6dcfb06b89957620ff1239aa93cf48a8ac6333b7e39261f97e3a246eccadb701746757e099b07000674568eb698246468aef6ade SHA512 8e1ab36698af00b71b9ba365bd9f276680fe231796916a4addd86ac2d095f002d4781161d8b09906c4c531dcc71ad627cee2c4abe5ff8d47a6e302764eb20fff
+EBUILD jaraco-envs-2.1.1.ebuild 818 BLAKE2B 8c8af93951e2c37bae252a0dd0040b5f546e52221d70df3d7d221902226ce6d41834ab823b89055f6b8417ef661253163c0e5c2bf57e1469b17d097da3b32351 SHA512 5b35d998271cc0fdae110be3e6c063b42cd68ba65e6795cd360c1dd84550f2ac3e2003c343e5a66164a7bf6c106418e10f287e1726f859b556661a395b0bcf75
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
new file mode 100644
index 000000000000..a044f6645ec7
--- /dev/null
+++ b/dev-python/jaraco-envs/jaraco-envs-2.1.1.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} pypy3 )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Classes for orchestrating Python (virtual) environments."
+HOMEPAGE="https://github.com/jaraco/jaraco.envs"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/path-py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
+# toml is required by setuptools_scm
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+# there are no actual tests, just flake8 etc
+RESTRICT="test"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 7811f9483ac9..07022a0b54df 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,7 +1,5 @@
-DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
 DIST jaraco.functools-3.2.0.tar.gz 16863 BLAKE2B 8085ebb0afee777073cafddc575286e765c5af5871c4bc45974eed1af9650d0edbbedf5233c5f9db080ab348c9c6151a1b22a7c21af6364fd56a3098640b0908 SHA512 aef71a96341a2f65f825a06e28b06b754a5fd52d4b04396f3ab5c264f27f342353d77485d76f081b35a08dd16ac06fd5bef3267cdc315320affa25e433964eef
 DIST jaraco.functools-3.2.1.tar.gz 16888 BLAKE2B 87dbc4a68f508a3c3169496c3f57d9844e90a6523b5526e486bbdcb1de996fb31025100e25929c0527ed27dd57ff67c90020d7cddfd70ead2a78e69ec8f65f8b SHA512 279dbb9307f864e3616f9b91ce5d55068df166a30695c0f81bcfae0bc2a1e0df5fdccd157210df3dd73ad73a6a955c1344ec441f925a651cd13a7f460e7a88e1
-EBUILD jaraco-functools-3.0.1-r1.ebuild 1381 BLAKE2B 7a7c76a28f436e050fa26646b972f285860c90eba3a3e61f359a6fa20065630b37415a523a6c0bd2c41991d30ae4f699ba134795c7d636bb0da6f3700e226385 SHA512 2eec210383b6930a220a14ca0bfac3a75ffa1f7e58aa2633ef3efecee5b1fd29b933f4828f101b1cbf1155ea744881e04a12352ab4f1feba7961f6b92583ef48
-EBUILD jaraco-functools-3.2.0.ebuild 868 BLAKE2B 769a20554c3fc8e69ea292965f024de9e77ec1d7926dd089a841949bfc40511816297b992ac2a6e1544bab4db27cfbe306c2fd716d6ef6794961e1219dd10532 SHA512 40600c17575227badfd10e2afcb2eb946f5d217643c9a0e70c636d001cc6a9867f6f323e1e0285e1d21184f24b29de768c6679e0c90f8fb38c637fd99da2960c
+EBUILD jaraco-functools-3.2.0.ebuild 860 BLAKE2B c9472a997fa643d05181c86b8d8a4096f976b13b4573bf225d14acefbbf656d784f0dc6086ca38f7b7565f6e427d077cbb2a4861b1f297d1aa2f68dd970db984 SHA512 fc5d135d0e9c51bef36a11f64a8c234a534a26beae991714556bc31f2fee81e3f8863e1e798c853c22ce37d58ffa748009f933451acd4d2dba1b46c0fbcb2d42
 EBUILD jaraco-functools-3.2.1.ebuild 868 BLAKE2B 769a20554c3fc8e69ea292965f024de9e77ec1d7926dd089a841949bfc40511816297b992ac2a6e1544bab4db27cfbe306c2fd716d6ef6794961e1219dd10532 SHA512 40600c17575227badfd10e2afcb2eb946f5d217643c9a0e70c636d001cc6a9867f6f323e1e0285e1d21184f24b29de768c6679e0c90f8fb38c637fd99da2960c
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
deleted file mode 100644
index b47e919b60ea..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
index 9005f03c9d1a..8f34a5b396a7 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index ddff4bfd6bfd..6ce9616065bd 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
+DIST jaraco.itertools-6.0.1.tar.gz 20096 BLAKE2B 19240d015cc2cb628193c1da6f8ac8eca2c79c9b7ddf1eac909a27bcd80c6b06ea8f7f2fcc435071ff7e9c602d9d8131c258deb910eea0d5ae0f8de69f4901b1 SHA512 60a4bf4335bd159b1b2ed532f4b72c47984a8e2afc03bafb7ccb53095da787cecbcb6207bb2c521266285bd5bf0550f1a78dd5323266bde6e00937481599a506
 EBUILD jaraco-itertools-5.0.0-r1.ebuild 1691 BLAKE2B 655df0629bb86f1104d1895f5aa30600f300405a151c018eaf4afd7797f607d0c1679e31b127276356bfe34bed2d62c4231e2ae5ab4ce6a87edde91e1a6ed09a SHA512 bdda6dc2386e8316c57003f1030b576261dae7d89a4f8a1b0b1018c5a2cc020f1d01d29824d23b6c930e440bf88e39ead687b12407625cf9a7750ebfcd254c1e
+EBUILD jaraco-itertools-6.0.1.ebuild 1225 BLAKE2B df2a294f2cd47eeb6d30bf5b340893afc873ecbe647710692ca5bb1ad350380fc8ea3c862bda2c4567d7f54ef5276e39b2e301bd7308cf6e5c7924cf4a457acc SHA512 722c628fc872c9cc14a929bced5dd3f6a7e1a92cf4fdc60ea9a748d977f54018099022c06d5dd49c6bce49eeb59b2ea24be0a73bf2b15562168703c65a560864
 MISC metadata.xml 574 BLAKE2B 34119daf42496fa9353422fc70d8d5bd03936b9382e02cba2f554a4da87069e7e2de34458a99bbb7a894089ea5ed8a119dbaa6ddb120fcfd91b0fd4aa49da7e0 SHA512 33d73c1d093721f5037ab3ed2f8121827d9de51194dfef1794f6abf4ff68db118569ff8ff19fa3433c804be422d1b9ca08aa62bfdbbb696297ad1970d6ac011a
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.0.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.0.1.ebuild
new file mode 100644
index 000000000000..280d2694c465
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/inflect[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		# https://github.com/jaraco/jaraco.itertools/issues/7
+		jaraco/itertools.py::jaraco.itertools.always_iterable
+	)
+
+	# needed for doctests to work
+	> jaraco/__init__.py || die
+	epytest --doctest-modules ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index e81ad443019b..ce1e86f7aef0 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.packaging-8.2.0.tar.gz 15295 BLAKE2B bfa8ca1547586122a5e142681be573ff0c7b95e0a5f5df25cf32dbafb4cd105509d6f7dcd9673e9f31bfe9284811721d778596a5ca3d25e41c9b1d88e8eb90d0 SHA512 469eecdc0648a0262e901462c3447450b1e3ca229ffd3747ebfedc7f80e84ff293680ff84bce0d83ee356bfa35fd0db64c7b0d61e02bad191bcdb5713c770789
+DIST jaraco.packaging-8.2.1.tar.gz 15393 BLAKE2B 8e30dcbb6c5dacf55fc62041e14c18ec852e39761ff5e00202bde89f6224eda8fbc090272d9470129be6014d8777b134908280dde10a0fce712b29167b122bb5 SHA512 3235756833bb4b0aff8dc832adb6e269bda622c5458493a302c6d487547ce224865aa367773f42bd456553c69cf451944d9b50d148761a40a775f59a398ec02c
 EBUILD jaraco-packaging-8.2.0.ebuild 1209 BLAKE2B 615ced19d2369609bf54ea3df3845f46f023fb83d630e2f89fcc676b1e8413b426c85b7a6a335e5991ca4ffa353e5bdf7b1512507c13f3466470c49f6235f467 SHA512 43f09d81494312f5ab71158f549fdff68fe6a9de19cc867743a330dfd5b19e18a7221ec0d0626b3e4b88cbf2f14dc034f6d0518039ccaa222eecd9288f377e7a
+EBUILD jaraco-packaging-8.2.1.ebuild 831 BLAKE2B a71d932e3dfdbfbbb7b88a8dd93d7a689de01b089b21ae5089274972964c346accf4d60f81d7ab2a27ab5111dfd210f3fd9fb90eb6ce9fa44d5eda7ff1b383d9 SHA512 245ba9a7a48c5a963a9efafd81a6200ede755f1cb625a9ff28db222c735d53f0cd8853d62e0b7ec116b711068721cbe0a891b616ed6a540350f44148e05d73bb
 MISC metadata.xml 675 BLAKE2B 36430dbb7cf6f29c913d02aaca81aeafa88e15cf44529c81835ae95c1b7a023a60d0116d50f04fbc424ee6aa49a2fe0eb56ed93b3a91cdd9d3bdda3d0377be91 SHA512 1532e2554229bec8576d60f8bd6b1f170fbe7a869f6b3505bd84efe33472b66b83cb08a5b4cbf201966d7e140a0571a89ff9dc3f821ded1181213841e551c506
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
new file mode 100644
index 000000000000..9c787b386a7e
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 505d392e8355..45513d22981f 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 947 BLAKE2B 668f59215ca6fee00b6ffef16dbe726ea34800bb2251bfa6ba72f8804e950db95f4a51a39df0da7360926efa11a1baf810319b57d1cafc67b11dd8821a057283 SHA512 a78ff4e4031dd743e8715f66482b52fa30f3c692555d24572ec209aa90be66292407642e31b41d4b9b57ef3e8162f9c930b7d1643ecb4b703e7a7da2471ec3ec
+EBUILD jaraco-path-3.3.1.ebuild 953 BLAKE2B 82de2e1479968837e989382aa290cb4a25114129cd45b37afa694c4420a1e496d4ebce27e1a46016e7877e97d9ce6410f6f62c31e963914ad54ed997accd4896 SHA512 b37876c9540a3736ccd81797b586c5f87c2007e1a77e45c46dc72b1f21900eaa7de31bc78252fbd5a819a6603360cf06f961be0c54d12d55ee58388f58d7e667
 MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index 4bb46642db13..d87eb9f12185 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 5e547be56a84..08ae5eb94fe0 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
+DIST jaraco.stream-3.0.2.tar.gz 12784 BLAKE2B c9a9a1f940cd29cde67b624b0b7ac2dd426888f71d29f4bc4920eab5a7ba15713e5d5e57504e9f4f69f25d08a8cb2e2a1024c91c89b8c3aa8bb16023d84f33c6 SHA512 fce486caa9f27f3cfe7775858892d2865fe1c1656a8d369ef9321057716f25d7a737abf2a28fe7827efbeba2daa3b7992ec4fd18807751bf1fee6f48b238ab01
 EBUILD jaraco-stream-3.0.0-r1.ebuild 1288 BLAKE2B 68a93e0bf746149b7e0c8c3c9fe591453922e02fd6f988396a8351abafafd4d61afe4b86eaf6a49c6d84145719fac4ce1b363d70270d0c1e2134146619c7d08b SHA512 4f33d6cb1918011727d1e65671aee9f66da9b2aa6846e3764b16c8efe97423f04d16f177a0722df3577ce70e89b3e95f80663f65cb58e9cb2ad0c47336423805
+EBUILD jaraco-stream-3.0.2.ebuild 711 BLAKE2B 59df9484724f79dc21882e35156a704a99d8ffa5ded85cb33320212faee0bd1e8d45282968217ebe9b67bc2bbf74c85e9726355ae3e206fa999e270a74d18150 SHA512 4fef9ecee1f492e7dfa4bb27b2718ff72cca82c57fe1277782cd57f34966feaa932162fb364ffb0d6a829cf98e69561e62e990ee8ba0d85c239d72d097f5b9d9
 MISC metadata.xml 626 BLAKE2B c28ab97500af030d20cc155fd74e8b918f68c84c0335b1a104956db4aae0801f028ccf46d41aeb9ace3618ec77bb2c19f2917150ff6f6309a82b507be57cf3c2 SHA512 2b870ff52a49ab3e2f81322dd811fa1603341aade274f12b0485f2af7f8d0794873a4801a9e648de632eacba61e45f433a0624aeef283add6ffced35c19bece1
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild
new file mode 100644
index 000000000000..ddea28b787a0
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 4179c6f465c3..f292a0974fa0 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
 DIST jaraco.text-3.5.0.tar.gz 15453 BLAKE2B 53a3553f09a6c33734684477fe1228b159269a6a7e38aa8381af54f17162d1658be1f91157fd092544141bd086fdded32bec2fa0103c4c6978301cae3e199a04 SHA512 da566f1a6d8343d05c51ca3f4635212094ddbc84fe9b460dd7630030a9b5bb28c97ccb0de5928da50230a182985c7e5bce8903d4019ce5afb89067ad938dd152
-EBUILD jaraco-text-3.4.0.ebuild 1241 BLAKE2B dc94c90299a92e956120a393d00dfc95fb2c289e5117e3eac59180cb7767341624f0567f8d682e2bd75f38ada051e7b955ce9fbb7305cae70bd15aba517ee521 SHA512 e2a7cf42291efca0bef7fc8260faa59e503330aa5eabd87768719353b216a85b3397f6b8d362ba23d214b47d1b0995932ff9898181e0fb6abad9304d96e478d6
-EBUILD jaraco-text-3.5.0.ebuild 778 BLAKE2B 78e2fccca36614cfc931a5fb6c7c6e4ce9a5bfc97fe294982883e4e8b641efe52d018928a20651d8527887da103f61ebff8933cd22cd801ec219022e096f1ea3 SHA512 41630f8370de81195dd39d28d44dbe58486745946505cade3b2bcbbd397e6dc3f0ba109d21e8ad08c1f2cb9c91ef0dc358c1e4a48f88555b1f035aa1bfd9516e
+EBUILD jaraco-text-3.5.0.ebuild 773 BLAKE2B 253c4dfab951e61c3db6c548e75816a23e96144ea7330636feeef6f21aa142d897250f85e3864bd55eae40f462e97f74303755d1565bc7d97b888e10d0a61010 SHA512 d23fd648a2dda4cc0889b1b2d3627b019dfc12ffa4581d8f953fbdbb639e449ad24752a789fa8c37b550d4ad09b78c7d36ffb23fcfe1b74a6bf7b116fa459068
 MISC metadata.xml 655 BLAKE2B 6bd01547bc069cfdd2a6d8ef05d0f62b17e54b54ac3d45ce3c66d765a5db88c52750d3f80053efe8eca8c36163deb36268e5a1683e65813d42fe1f033306d4c5 SHA512 94ad62364c1159d64d69d8781ed42f642d3877c2e6776f0d863d6b89fd085199d03a65f251b9fd1c21628d3210160ef120250ad7956d1589b8e06207831d2937
diff --git a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
deleted file mode 100644
index 787d8a63c4aa..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	distutils-r1_python_install
-}
diff --git a/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
index b2d7ec6c12c2..7c949ebd7b9d 100644
--- a/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index dec7c7e7eae1..54f7ddc4eefb 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,3 +1,3 @@
 DIST jikanpy-4.3.1.tar.gz 725938 BLAKE2B 5e011ae4b6d267ad6a6a99b2d28a3f11c4b8949cc1682524d966ac441cce9c527465455573ec873360865f9b913bc14b5c4448ee681540a01bbb95f67c38dec2 SHA512 43170c3512393c50fd859e7481cdd6cce874bd54415959c0660d0804f10546bd22b836bf3c27a86946fc771e92192e28dd8ee02c71796f799b4cf748102d5e3f
 EBUILD jikanpy-4.3.1.ebuild 675 BLAKE2B c8e320f2608a914e8b4a3fd2a9904f7f273e8eecde82c445705248795769c2caab393801f5a50ff44603157ea205457a014ad91151780f3736e3512b1c5efe80 SHA512 652152bba9b93a07d2244da71ed67bec4ca58d22fea4e49732feda3a44af3e4768196bc02fcf352dab16f617d4fe7a0f00d4320924eafafe43d249a67632c9d4
-MISC metadata.xml 378 BLAKE2B a984a5ec0db760455227f9506abdd294feab0fe6e5c18c1a489c789e80b38c0ab854b0c195edd7c132932396c4c5628be65677f6ab945371d0d8414fc08a03a7 SHA512 4ef2469712d9af410a4000b3ea5bbac2bb3c837042cf3bd0348b53d57ba463652eff2ae5dec045fcfc897740f2810a43c03b94e79a55b72ac15154e31be230be
+MISC metadata.xml 378 BLAKE2B 42d8d375cf3177bf5b51d1a76abac225b6eae66c32e2a396a96f055ad49eabc64966b366b9caa3809a63f68bdfd7cee9e1dffc2d790e88f338b47cd62de4f9c2 SHA512 b9e2e1923e975edfabebbfa85155a742f650ee118c467186dcacdff1443d32bf8c376218b89bdd589403ce8d015555921f5a8acdbd62c12dbe352e43a8e9d679
diff --git a/dev-python/jikanpy/metadata.xml b/dev-python/jikanpy/metadata.xml
index 12ee3e1826af..175f1e469dd6 100644
--- a/dev-python/jikanpy/metadata.xml
+++ b/dev-python/jikanpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 7fb1329c4aa1..c13889a1c010 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,3 +1,3 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 EBUILD jinja-2.11.3.ebuild 1557 BLAKE2B 9f89b1707e43a902914a67b735993eaaf6c33585d4cc54fa6fc7ee7342dacab13102166ee7a6ac0233f3c090dafd883fd5ef23b15ad0090e76aaf1b4feeeef5f SHA512 c57d98de0e7e6f2e04372d0b1e6bc8d9a76936b0d6697f5afb935999efe44e2acd3d0a3a7228a09ad3bc229012cd55945fdc987eeb8e176ed6803c8ae7f7f950
-MISC metadata.xml 466 BLAKE2B 89bbd7d238c94528f0ad8cca2fb358456f88403f06f517e71ca36ae63b01e8309a7ddda5c9063a01b90e8321445013ab5bc93ab33a1219e48b36a02f5ca23d60 SHA512 81af66b462fed2f8e9bfc8c3120e2e70dec933d0300a3d32264c73ce7606b6b3b375c4d4ed0c9f92ccb91c046c20ccfef17f1ed50a95844eccc3ee5baa0b56d0
+MISC metadata.xml 466 BLAKE2B 76540215466d45bb582810d8e8fad3db88cf0ccb7d4340d3ddb2c6c85e3ce552fdfe81517466382db89adf660269711a0fb861cf881487d7e4d1ce474114d6a0 SHA512 3ae5a895f264984d8538551346b7031c712ca244c154ff435847949db29239ca1c7d9ad88f82dd7cdd02ea8906600b6d7f7d4c0c6dec1f025a5d5e1173569c10
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 00e97962493e..ed75bc76bac2 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 97a2df1bd6ad..26c71fd5b4c7 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
 EBUILD jinja2-time-0.2.0.ebuild 594 BLAKE2B f140eb9df242854659fc5b8cef33c0da91354d5646be42e7e4b7691bc1bcc9b02343a70d84ebf14cea6911f2d5c735a2ba16b278221d4f3079886a09bc080c14 SHA512 2e2c02dd4bf426679a71efde4587e86e9065976b0957c42aee92d8681096d10a2b88eab7b90ece8c41266a33d0d92cb0587cf50a88b723ff2d3637653942ff61
-MISC metadata.xml 399 BLAKE2B 0285d9892b8f0cc34cefa7075d87446b623cdd6903462050bf79b4acb7f9f8b85fa91bfe78f96b572deb358799fba9813511dea9f10d9626692956f361433297 SHA512 7201a78d046c873b53b74e515afc7d29972592ab2b4c71d71292311feb72404cb8973160c0e852d51402972a262d28488f2fb474b80d11f510da2b88ea5a9202
+MISC metadata.xml 399 BLAKE2B 496b65cfa2e0b71b84ad70a75d216e2f88b5bc03d41e8165697c82eb81b20fce56286a045e31ed7bcc4d62c820c57c4116f7bbe05bfe7c000b0e73a03bb1dda1 SHA512 1ae1c7236959197b30a121c001248fe67f5057f35fd9160631ddd0e19f47b7c6f47fdd82e936380610e0903375625150d75b09fe93f8d74ed6e45eef67e05012
diff --git a/dev-python/jinja2-time/metadata.xml b/dev-python/jinja2-time/metadata.xml
index 45b0dd336bb9..b986df65f912 100644
--- a/dev-python/jinja2-time/metadata.xml
+++ b/dev-python/jinja2-time/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index b362fdef2884..a9096e967707 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
-EBUILD joblib-1.0.0.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
-EBUILD joblib-1.0.1.ebuild 1167 BLAKE2B 38bb93fce3235dc2fa170188629092b6dbac8284e513cc07bdce24aca0c2337e15215c6c729acef9498051ef520a39c11c4a2a87eb29037da9aa69b742123e13 SHA512 5f5e403bca9c84346285a9413d00ba0ac2190caca9859e0c3af0b811d30f3f25842e2502fc69a5ccba00da2198c1b8cf894d125e64fccd48d2c7ae1d7f879966
+EBUILD joblib-1.0.1.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
deleted file mode 100644
index 6066ffdcf33f..000000000000
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-# joblib is imported by setup.py so we need ${RDEPEND}
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unbundle
-	rm -r joblib/externals || die
-	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
-	find -name '*.py' -exec \
-		sed -e 's:\(joblib\)\?\.externals\.::' \
-			-e 's:from \.externals ::' \
-			-i {} + || die
-
-	# https://github.com/joblib/joblib/issues/1115
-	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
-		-i joblib/test/test_memory.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-1.0.1.ebuild b/dev-python/joblib/joblib-1.0.1.ebuild
index 3a8beae1a370..6066ffdcf33f 100644
--- a/dev-python/joblib/joblib-1.0.1.ebuild
+++ b/dev-python/joblib/joblib-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 848f78ab783c..9afb7d2b9475 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,7 @@
 DIST josepy-1.6.0.tar.gz 54066 BLAKE2B 18afbcf47d97e9677a3b75be50a4e61dd7748326eca1a7b736c0c9edc3918b2082c1cac8b32481bb631bef106b0e9895b24be054600f22f38bb45401333a28f4 SHA512 d08eb731b1027cd0b57639ac0c3d987d99d78daa54a9fe22d86eca90c9c5ab73bd8193d3fee4f98a4c55392015d1c5ee32fbc6589f511a6951033377cc2e1168
 DIST josepy-1.7.0.tar.gz 57186 BLAKE2B 8bf89ab844b65057838c1b274d15d8cac7ade2af9da04fc5193e9ba99e2062913cf5f819766d16c66951622299a06bf87a6cec41079e350f460661eedff4e924 SHA512 cd3c509acfea58eb92d7e0a8d28d6138569cb42ac85b75b284a48517afa634f6c739f3d62198ee0a17bb60a159af4012cc9ffa77378db680c418d52660d39ab4
+DIST josepy-1.8.0.tar.gz 57507 BLAKE2B d395f08db9c46d37555f2cc540ab7af79356e32b60763acfa2116cdc08a46e51d75f56e6d393dd28c7dfda5f2012db5f4d5b5cddecf74809a01ca3dfebeb598d SHA512 50cdedfa4cf67055ae65dfeef2328ba7bb369fb8b763b425e4ca73108555c9cd04f12a644309c2f2e1db50e1d227be3bdbd00037e509d2b2d82565c213b81e4e
 EBUILD josepy-1.6.0.ebuild 800 BLAKE2B b6fc9b6658d2145f247827f66dd4add6093e6efbf8e567028e1e5f12a42f3515d93dbbf54fc550db288ff6578f515d87a61c34c12883bb51adfeb1673c1fc8b5 SHA512 68f2b6dbcdc22012abffdee6a895ef2b04c29ea823100a676d0eba6244dd93ff8f197b3578d2b4afa9856c5f8350402e54b3e5b37cefaa2aeeeb857b449162d4
 EBUILD josepy-1.7.0.ebuild 800 BLAKE2B b6fc9b6658d2145f247827f66dd4add6093e6efbf8e567028e1e5f12a42f3515d93dbbf54fc550db288ff6578f515d87a61c34c12883bb51adfeb1673c1fc8b5 SHA512 68f2b6dbcdc22012abffdee6a895ef2b04c29ea823100a676d0eba6244dd93ff8f197b3578d2b4afa9856c5f8350402e54b3e5b37cefaa2aeeeb857b449162d4
+EBUILD josepy-1.8.0.ebuild 786 BLAKE2B 123e7af0372f0a07e14f458452008b60180e32246eac09954fad3000a9d396df6544b5cace6beb8f12bf95c397dd8df21ed1134a71fc8fc961fabf0925ae3409 SHA512 7daa074c59c433701d26370fc975ee05daaf3da2d28c52783ad06bad02ea4594207c4222d51f9475c9ffc4925647f21619e398b6b7cd13e432d167cdb5d63675
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.8.0.ebuild b/dev-python/josepy/josepy-1.8.0.ebuild
new file mode 100644
index 000000000000..436183e86d19
--- /dev/null
+++ b/dev-python/josepy/josepy-1.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 06ab707cb14b..3615e6acdfdb 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,3 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 EBUILD js2py-0.70_p20210218.ebuild 1104 BLAKE2B 7468b86817d2cc6eac70d19d84a28667520ac46b075e1967dffedcf8042fdde7f5974174816977aaca8ebcac026a2fe363414f61e618670ac72ac55b5a8b57de SHA512 13c446847663b6b574f74d0b6ed7873c4f28a2bdefb944a12354e05c6c9cf2e19d86c0db302378adc9f4464f30ff544cffeb6a5a85526c855f0d50b28d319f84
-MISC metadata.xml 542 BLAKE2B 6f64decdab352e206758cd1f72a8cbd44a3f2139330bd13a8d8c57af739b5fb1f830258e486cf830c7074c00311aac5d370fb55bcc4ea3a45ca2b9a467f338b6 SHA512 d813c7c3b62569eb7e2c11ce0688d76a69bfb1de1508857032a678e4a053bb075561a4ebe7f376f9c4c9a34f962da700d78c449c20515559904910b146b2e8e1
+MISC metadata.xml 572 BLAKE2B e7e7fe7278ecadeedc310b4adbb1cc21c7c6a5e6cb522c31695196561e30f7bbfa0fc1e29315f931d3068ef6ede674e153e81207a7e5002d9adbe68c88e2e904 SHA512 c914912aac18c8984d4eb8ceed3d27a175fe89def2ba9bf778c3e3d8c729ad030125ea8f1096487b4c35cb9c1aa1f28a3d7a168b2c8992f6d58fb477bb9ca51c
diff --git a/dev-python/js2py/metadata.xml b/dev-python/js2py/metadata.xml
index 586c77123d23..fd0b3b582843 100644
--- a/dev-python/js2py/metadata.xml
+++ b/dev-python/js2py/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 508af710122e..ae3bfc3d8d01 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,7 +1,9 @@
 DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
 DIST jsonpatch-1.30.tar.gz 27787 BLAKE2B f3294e3382baac604c31c12a790b0836732a66fdf3b6cbfbab58fcee4558140dc84a408af94f2f5861aaa17fcff49ac254f42364e5d0ba1039af0a2fd518da93 SHA512 190507eb6d6b4a81e7e804690672863d5070c140a47090b70df36d8180644618395ffc179dabf6ba24e44268b74f670abdfd260c54dc3251b12ef4b7ad17d093
 DIST jsonpatch-1.31.tar.gz 27910 BLAKE2B dbcadbe3b3937b8a543cbf871516ee047937c1a53897c535c93ee01ab301970048f4f584d1f4e96b5780c95c64a94263ee55f52efd5ba0d0c0147680ee8f9ef7 SHA512 9f08014f311d18b97f0f0cfcc931f2615e0ba5079ff5994e9ba674e079be715c3c8de3ce1c1958235b34dcbe87dee09b103295655880273ce91652d2191704c0
+DIST jsonpatch-1.32.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
 EBUILD jsonpatch-1.28.ebuild 841 BLAKE2B eda03acc39dba59f02ad14ba31a9817a94791a1b986cbbaf918d88a7bfe466e2585138a0f21cdef26631fcfc2637d463e4d1bb030c7c2d9812fd55e6d4efb24b SHA512 300e06017daab02ba62ef66b386ff2d3a6ccb0f7a9566c8d094e82b6d2a752ff8a015a59f9d8a5be84bd03bc0d8677bf8123e79be9a6e7d2210810c931629cf1
 EBUILD jsonpatch-1.30.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
 EBUILD jsonpatch-1.31.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
+EBUILD jsonpatch-1.32.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.32.ebuild b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
new file mode 100644
index 000000000000..9b885b42ed8d
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.32.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
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index a83c694565be..9ecece38b3c9 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,7 +1,3 @@
-DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
-DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
-EBUILD jsonpickle-1.5.0.ebuild 1441 BLAKE2B 3e53b617db74e0562b01e2a501cebc92cdf2d3ec58f197300d00eb2914ebbbde79165c85173cc984f77018b59aec611c73564139f1898d1f1bd0019973537d43 SHA512 375c0138302140a53373b6e5e1095812348b5d7bd994797866f2fab66839e6df894a4748c18ca7a2e0ec5b3932a234ba4fbe700035c0180746120b50fdc6a82e
-EBUILD jsonpickle-1.5.2.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
-EBUILD jsonpickle-2.0.0.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
+EBUILD jsonpickle-2.0.0.ebuild 1332 BLAKE2B 39fa4fab94851065890cf91626fef0676522962727a436b3c0b17fbeffc8bda61a7864612c6e56eaea8fb8dff3ed122ee05f1d45a2dadeef71157471ca69b6d9 SHA512 a6d934dbfaf4bdd7363caa3f83c08a4201983e7103bf520e0bc12ef56fcf690425db18b363203dfa691cf864bc865eb0fc0ef7c97022ed7f96a97891725bb111
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
deleted file mode 100644
index 6e5f3a477d2a..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	sed -e '/pandas/ d' -i tests/runtests.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
deleted file mode 100644
index cfb3bc401537..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index cfb3bc401537..629cee7b6893 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # There are optional json backends serializer/deserializers in addition to those selected here
 # jsonlib, yajl.
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 038584a9f7f1..884509a480db 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
+DIST jsonpointer-2.1.tar.gz 8190 BLAKE2B 5b9d0b0a27c6e2d133de67cf0ff9442e639a06011005f94cb425568fd3e5678b4832e9467720261fb85669e8b83eac73b1cfa8058adbd78d46339cdf8359561c SHA512 4eed8c7fa908ce3ca79884e98b1b0e818d24515f6b7b2067daa49ab6dbd989be4bc43f387e980773c9fc17bca89d2039750cb0df76675259050e3f48c16da3b6
 EBUILD jsonpointer-2.0-r1.ebuild 605 BLAKE2B 148cada85f537a27063fc9be28b11ac46215fd2baeeda713ed8f0cebed9c8cd6505140327eeaf0480fa743ee4082ebd4def018abfc9131e8743b2da6db560a23 SHA512 416c8eddc44eafb46b9ba3e089e22047d126a7515c125e3fc49ad2768208ff76fa5c7f966df71b7ae73951da4a5938ca7286f49b387d341964245a8ddd77e535
+EBUILD jsonpointer-2.1.ebuild 612 BLAKE2B 333d97b40e0fd6b70617e6d67007d40cfeb977159c82509a251fc04b6a686c0f8166ae55a120327f3bfd84f8c9ab45330e997e1f597d98d135a777a4c321b48b SHA512 ca7e0a92ef113d68b46ece7373daef83cce4a75dbc4c0cc9bd1b9c98ae1089f281186e893d634f8fee765696e6111979aab5b0781644e3d3536d6067f422ff4d
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.1.ebuild b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
new file mode 100644
index 000000000000..fa4a6245c51e
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index edc22611314d..75d84f1feab3 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
 EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 35bc7f15d4384203d13b607d8cf91a015a45303570a2eb4900d80523669f65e0582249e2ef90a4c8b51cd6c6fcd7d06eab081817ffb6bd8750ba5f2bfbc6c650 SHA512 1d55e128966614a8363703c520417614d7d340da01b695939bb8a1edc8990a17313d8a81e2820896a9660b44037043a9612b465b6b694ac61cc2daecd5aef055
-MISC metadata.xml 388 BLAKE2B cd509bc386cb2451225e5fac906d88e5720ef865edad4e8ea28b96f3cba1fa79d595746110448cff169944f50fdf30b4ee683a4e3c56007c2d085fbe4a14d51a SHA512 e3735d6d95f247cf0aa0fe681e256388fe77319d45a6f812508e8af5c37176148b766b0db62e6c11ae2421609e483aca84ae4c6395550eff9873c89377c607fb
+MISC metadata.xml 388 BLAKE2B aebc716b9ae4d2f7137863ca8088929b9f5ab0148c175eaa84bf96d7bffb6985585a847200951ed13614667482e46080040863206ebef731defeb81e7ef8b941 SHA512 4ba5f30d7718bfe05670d3b66cf7725bf1719c515dc2cc814a79f5af4a6ee64779ccd8fc5740bacbcbeac25ec196b710692988e2547c647c3da99e30186a5e7d
diff --git a/dev-python/jsonxs/metadata.xml b/dev-python/jsonxs/metadata.xml
index 11c75050514a..6b8c634b56d6 100644
--- a/dev-python/jsonxs/metadata.xml
+++ b/dev-python/jsonxs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 77fa6cfacdc8..4b10921ac6e8 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_client-6.1.11.tar.gz 293651 BLAKE2B 73a8567927c452a6a6a591eed04d592c6bb52211214e6d27ae816a2ce07a61c3f80991a2209b42c1d679ff6d3ead564f6ac97e6500473e0e5bd86bad83db07c1 SHA512 3cd6c3d299ea7097b04ad88b08dad8c23d90c5feee18bf441434a6069151b85717c4d00d2c186c463995d26383442c4f63c86565b1606e60afb61426515f9a11
+DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
 EBUILD jupyter_client-6.1.11.ebuild 916 BLAKE2B 1990debc99f8b0d521dba190cd798b436f95a7c5c3ed521ea582d5d00f24b34956ea3ba474bd435067ea2a11ab6b0f5bffb9d70d65b6567c95ddfa534425706e SHA512 8ba23fd56807471edab7da0d32d599dcd60410bf7e890b960e35ea940488c94552a642d3da0eaadaa9fed161666ea4a5701d303c560bdaaccd189d638fbfc405
+EBUILD jupyter_client-6.1.12.ebuild 919 BLAKE2B 279e30d213e6c5c3d9c7032783c1be0760ef7c5d72cb04d66ede06abfbaa15423021f4c2de7017efc6abc9901c5520ddc5c5d2984606f47cd70f5f58cecd5dbb SHA512 8e6592e6f7c3e19073443165113b2b5f029d59a3f22fa67c022f7781080f1091d73eae44c8a8d1385f5b8a439608b6833f1c89cd066e9e2b08a3ca5d55dc3038
 MISC metadata.xml 779 BLAKE2B e9744283eb51cd9df5ca7a65a29d80e7712e22a1c4f039bac233a4301a821bbf616a59bc5f923dca0edfc16e32fee9a676a6aa90fd8011beaeca68ee97d63355 SHA512 3e07a943513fb5d2d0e689572c39084c63ef2b54503843897dc1492adbd9fb217a3a26931e48f2bef2fbb99e32900aec85968a9597ddf54350e174ccd82a7b4b
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
new file mode 100644
index 000000000000..8f92382aed2c
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		<dev-python/jedi-0.17.3[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index a356b6a69c8d..ca7109fdda13 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,7 @@
 AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
+DIST jupyter_console-6.3.0.tar.gz 35313 BLAKE2B 980eac57de949654bf99d99eb74d8600d73d0699ab394e0ad4c5e937fdc278477442e0e95887c95f631ba1bc2b2469c36cc6e4bca8d5f11f97c4943c2f312c4f SHA512 777d9cf8b842eccea108a1857c421fec1bcdf8c226a6947d7ff4ee5d5da4bdbb50096e9e63638053d8eb200e55c093c753010ffb1460dae5579de16aad4e64a6
 EBUILD jupyter_console-6.1.0-r2.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
+EBUILD jupyter_console-6.3.0.ebuild 869 BLAKE2B c8b5bc4a91b7c62f96c69ab6a02f375848d3a8599d2e3195c8d61e435888fd02e48fb1f8989b84ae9309b3cd550cb2fe31e3795164d7b0911c5662891517ba25 SHA512 c226e6b28994f958f6463a89ecbf92ac3a09f5eb6c96f0de19bf2d41725c1373825d6148bc2c59ab1800cc2d7d4955be6e0b1c14089cd3cceeea1abbb03e0e59
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
new file mode 100644
index 000000000000..7a54103742fa
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
@@ -0,0 +1,34 @@
+# 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="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 0ebacf1e7449..e53794b2ff84 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
 EBUILD kaitaistruct-0.9.ebuild 352 BLAKE2B 052cb18460a97a79ea48138a0bc5c14cd70808045f2e2c437acb161b142c8d0325216adf5d8e8b83cd98073c6aaeedb4ad1c506edff6e56497b376122f2047d0 SHA512 e1d5261465173260edad4534f106a4daafe93558683780015643f98bf4bff7ae495730f168d0ee68cefd232ff2882dcddc67d4b89e33dbe171177ab7a2b245c0
-MISC metadata.xml 778 BLAKE2B 54b1b487d1a267101bba4558451de2efbfd3cc995f65da76f96999cf6d11572196a940002287faa3127c343c0110103a68872a5a0e53cf2285e616a9ebc7332e SHA512 c35ef9a23fa48d359deb4226113bfb031ac52dbbec82a08a8fd0500be29c3c946fc6e167811117021afeb1c02533e43b6dc9368c80b98174958777e9ff7669d1
+MISC metadata.xml 808 BLAKE2B a5e5f5479ba83b742eaed4f90827f5c64dd1eb4d34f592e663a53f7cb68feffdec886d7b3c242049b427528114ca11d7f41b7ae9d8589fbbc8bfae59a26f3afb SHA512 8a18e0fb22cb6b891ef02f445aa7aebbc161a7488bfa624eca4d7406c37bdf20095eca372390884d58b2a0cfc696a3f42d78a19b154ad17a39155f29952d4f32
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index ca6306e5e4a7..64ea1f9a58c4 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<stabilize-allarches/>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>
 		<name>Matt Smith</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b922631b98fc..3984bef87707 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -4,4 +4,4 @@ DIST keyring-23.0.0.tar.gz 48218 BLAKE2B a71e86e91b874d2b82477ebcd93687592864095
 EBUILD keyring-22.0.1.ebuild 1082 BLAKE2B 8008a84045abbe9c0f6a8be39f37406db51be0c832878ca48116912875eee6327aa22adb59411048ecf479d1485bf5a942a01c5beced336c682492a63a95bad3 SHA512 dce2c1374f2b235d2fb20c99d327074b8b3b661d31028c48c4262e8e142f9e961915dffd04a0697118efc829dac852c27ebe0fd1aa0fab122b76d28a3d61d9eb
 EBUILD keyring-22.3.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
 EBUILD keyring-23.0.0.ebuild 1044 BLAKE2B 49cc49e8960e9ab998f5931d7f91732de0e9c84cddaf85e5790b860da5a5bca53f593a7a28f985ad45a070286bc91a50bc0acb074b379ae305f55bbd36d0b37f SHA512 dcf85e379d56afffa5ee41c24d8871810dfe8ff5e5088af7a2f77edd5a9a1eab87094ae4809f210e6bb1e49c4ef6765c0a72189053b945aab0043da406451729
-MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
+MISC metadata.xml 610 BLAKE2B ef90c15fdeffa82a8a08a063d43a4045e98c8ce21f6055c3671bbf94c2719c4668e0a87b607b9dd39da073283dfe5b7c3490fcbe023014c0337ea83def27b893 SHA512 98b2619a52bbf177eebdce6f589e2f777992963696a75f0481db849825372890dc631b14da230f7bb3e92aeb5e8c60a0f7931092bb9e273300a5133eeae00112
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index 9faa7f300c0e..94c464341423 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 84b92d14f454..8850ffd27395 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,4 +1,4 @@
 AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
 EBUILD kiwisolver-1.3.1.ebuild 626 BLAKE2B bcf09f5ec20cb2ee4860df96356327c3e950498c7612441c0485890134bc111f21271648b06d284e2602996d3ea8eaacc712e4102b1a2a6bfc9e3c4967953a9a SHA512 8a11ade2e6e59dc0e596856e4e5c4c7dcef3b368ab401d4ddd41613740552a21533023903227b9e781fc41718b14b1f0a1b9b0950e664d49ce6edf026ee3c842
-MISC metadata.xml 589 BLAKE2B b855a937dd7e70011622983e63e7b227aace077f4fddbf2fdc558a941e446384561b3f0f798e97db23ce0b6cc2f2aab6af9a0eb7e2d6b221c7f511d5145d239a SHA512 df0848bd49ea1b4ff9d1fff0a60e288054c319acf1fd82776b24c07ac1dc8587d2db0d6ab34fb0d194dffa8734b44796b4f2599a20dd8cf6f68b4f68489696a9
+MISC metadata.xml 603 BLAKE2B 8cca666ad3603069161814bf8af2b73129ee8044369d5d341c6b1d7163a8c1e05506e9e4d8185a14e60c992b02703de6e79049e6583011c46043754af922c956 SHA512 501957059473ec8f0dcc0f1de442edc388b9d18fa8ff48460969547f7adbb4acc7acdafe06917b359152cbf5fa0a2ce0aaedebfc569d1802e487f0042a091b96
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index edc9848e4967..9f35c49b5d4e 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index f78a0ac6a312..a018b2a28b20 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,3 +1,5 @@
+DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70f153a0d9deba8b39ba3317df358fe1ddda738f320ff689a7a8965ab157fefea7eb121ea980c6a6d8ca1b42d63941c9 SHA512 277be4e6d56d8e2747df434518d6d7918c149a67c3f6af3f978858be86f3fae9248989823c2429dbdff4a1c1615753607f5487fd9d6705cfafec698cb9d47e4b
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
+EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
-MISC metadata.xml 503 BLAKE2B 99d3c5991b02f4c0b0daf656b1e6f38e38f04622715b0ceab73b40951f4bf1e97b52e6ebe06767948660370c93382a294efaa7d768937659e66b3916a44b3a31 SHA512 11eb50053b35b3dd0a92f0923d3e7c00abeeee046cc3a1113c5ae33993627e778fa58699b90bf0d4915b00ab8635f2200c4a4637754d9752a60874c419c6d4b0
+MISC metadata.xml 533 BLAKE2B 5fd09d685663433a17206fbffbd3eb2d94f0d9a4d90ca5be3915a24d6390da7788b28dd718f5ba0975d1e3402aeb666039bbb1c38948bfc7b145f3b1ea5d245e SHA512 59872af1a85b64f0ac2a0afd7c72af7e43102dcb9cc10d4ed95cf65fee33a6240fe471f52bc91ea679960cdf89bc181d898b7239551071bd96759a8cc788e063
diff --git a/dev-python/lark-parser/lark-parser-0.11.2.ebuild b/dev-python/lark-parser/lark-parser-0.11.2.ebuild
new file mode 100644
index 000000000000..ae23cc260e44
--- /dev/null
+++ b/dev-python/lark-parser/lark-parser-0.11.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
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/js2py[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" -m tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/lark-parser/metadata.xml b/dev-python/lark-parser/metadata.xml
index 2b5b3fe9fe82..ee09f2e5e2ea 100644
--- a/dev-python/lark-parser/metadata.xml
+++ b/dev-python/lark-parser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index 46fd1c9d8c96..9d81de170084 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,3 +1,3 @@
 DIST latexcodec-2.0.1.tar.gz 30131 BLAKE2B 8af9cf81a1e0a8b72bf4eb1be206d2f2029598372872f1c43d8abe5e69efeba957d610102f44a5da552325f5525e1668e52ba2cc6c9a2d3f4b7c59c375f040e0 SHA512 e7f23b91904e0bd4a3f052f5f201b125e84c1f94a247b869e14c8f45ee8bc2c478e8887a792efa8c9b6d2b7fefed43fc66e797206b6e40aedaedc68ce7865cab
 EBUILD latexcodec-2.0.1.ebuild 498 BLAKE2B 0a62422087d54ddf603ed2edc4bca11089db678b90138ac5c161bb30381bb25a07021c8a79dd4f350a3edf8c12145a22e40759defa631338c94e75371babb38e SHA512 dcaa15efe2f61db1b674dc6121d54362a4db69aa74ceef03e60d89a367a8ed028411bbadedfa884ba2dc821b15aad988f3e829423d72fadc9c465ecbef38b67e
-MISC metadata.xml 1130 BLAKE2B c99b347b747e56a3e423ea01537e4914f9dfe92ca2b376783c96557302476c18f29dae3c678984b6facfc8f06337d877991f73e8a0c70cce97eee70ef8ff464c SHA512 1bf81362b8c58717db3b8ef78eaf8627025f5c5891b496c0a3fd7d18fb62113ccf26d87a88a9acb12d7be31495d8987e50b6a594e57784d502107919ce061138
+MISC metadata.xml 1160 BLAKE2B d2986a4a033cf7f44aabf97de75849955ee2dc92305eb93d0b400a612f3798c734a1a425870130c5458b0931b66b7e2d62c2d1e6c84834061194f4389c0edd82 SHA512 cd8d441a57c36583ed04fa0f22e86e0f4134e85b4ddf0e6400c368eaf48d948acf0e91a0713b1c53e1c8eba51919a51bb1c3a024944d78973c614fd57c6d6d03
diff --git a/dev-python/latexcodec/metadata.xml b/dev-python/latexcodec/metadata.xml
index 0618add19786..b802a41aaa63 100644
--- a/dev-python/latexcodec/metadata.xml
+++ b/dev-python/latexcodec/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>william@ewpettersson.se</email>
     <name>William Pettersson</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index f34aefe59119..9c3642453d04 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-EBUILD lazy-object-proxy-1.5.0.ebuild 936 BLAKE2B 3bf3d97b81f4873b2b321d3cb782c8166c4ac9122740dff3ba84eab1d9a466d79574c7b60c09fba37c897aa3d52d5b91c2f13d2f05bfb889cd7ca471850905e4 SHA512 867b6eabbf8e62d04f881febeca820687b90c71347c9c59d0f72045458c03ce6d81c350fcffb73d88d05b1a7b81bda7e14aebcf9bba0c3b5e4ea070c20938eb4
+EBUILD lazy-object-proxy-1.5.0.ebuild 935 BLAKE2B aea42f65db2955a7cf51701845fedbc7f45d64c1baeeaa87c1f7ccf21e6fd9c6bbb852e1a86ed098a1d93f6f86a4e9fd55704314a442bdd895e4a9d7446d6d80 SHA512 a5fd1e871f2e41e91e24abf8c9f8cc95ca40196b3916f498250636d151a9a669d57d640c7973fe22c0cfee451964fe301c25c762bb061d4f37811cccd964c66e
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index 7e8dd99b89a3..1e451ed1343d 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 6f48409e34e1..666e3ae5e369 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
 EBUILD libarchive-c-2.9.ebuild 463 BLAKE2B 27b5db365d378f7d75a97bfe3c3b70c4b4d9ffe944f7fe5dffb7477ccf90d0c9cc18e9e7cc24f760372d74c01aae227c57a0c26a128f6390f7189deba92d7c9c SHA512 6321ddb395fd4c05c8076f5aa6ccaf133883afaff3bff98b0818175e693170eb5cde798cf2ad8c9d7fdb8e990d362dfdb4399b6b4ff001dc202d69bc3b935097
-MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
+MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/metadata.xml b/dev-python/libarchive-c/metadata.xml
index a5c0bafa9bee..5eb7d2764824 100644
--- a/dev-python/libarchive-c/metadata.xml
+++ b/dev-python/libarchive-c/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index e1122998ff7b..258b08d3c600 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.1.tar.gz 316227 BLAKE2B e4b4955a2ad0722d76e79979405c8e549b911d31c3fb828563e1e52cad9f9fe72cf543bd5e2ac2383faf85a44f4f0258253f7d45394f37d30076425660ebd031 SHA512 8918154f9fc4b0618d4729195414b2d8c5818a3e4dde2d4e084a73c01c3f6a2d46028a35b4e11759bc001266bcf03423319230682507c6952c9b0eb2df17feaf
 EBUILD libsass-0.20.1.ebuild 886 BLAKE2B 94a8372dbf0353ecbd32a27f5fb2842654eccaa9093a8a8b437df1dd79755e93d9de2af16d48407e20a60fea6386d08ca02618badba2f4ae72397fe4b7bd6c38 SHA512 8a3754e235124aed45afe5dfb3c5b741300c33d4a7d2f3fb11246fb1949e08c9862bd9df4ae4a1696484e78726fab5cddec0fc496a99d1eb634e3a604b27d5b1
-MISC metadata.xml 445 BLAKE2B c347b1db66e282f3fe602fd5f81a667bd839cd5134abd65e069d075ad16d5bd8e6b4bdf447dc605cc9bbe044ecb103890ddedf47b28c9388ddafc78c9e8bc1de SHA512 ed72a3d8b34495479c4e2fe9af937ea18687bab675394f04f3504a66d741e20edfd959f0e7c850265da709b667a0d94b52ce59e829500a62af660cfaf905a43e
+MISC metadata.xml 475 BLAKE2B 8a6ef9c2f30ece13a6999c9c1a3f367464e8174f30bdd271bccfdd1cb6ecb115c55d82d30d7088d8c6ee3ba0d5924bd30b45fcc2a8664b1860b5637fbc8b9412 SHA512 1571c99f8c2e7631869972da697f784c3b0670ac6bec93ba9ecb0e78024e75a26800b0e21fb424d218a89c2b9f8cc965973df7a2d6e6fec900a310305ee85907
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index 2bcd0001e9b1..7038044626d6 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index cc1c199bf3e9..167e30ffe872 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.0.0.ebuild 900 BLAKE2B 90b478966ab5582ca0a073dad5450f29068bd75f107e48fa1371304c9e9d87e202b9e85f5cf03b30c54c3f3e4b2c950253e987cd3c44473797cdfe031f5085c2 SHA512 0c461cf8ffee04344f22291b06298ccb63cbc57bac6849a39da9accaf64077046f5ed927db13963ba961536f84f2d71449fafbd5e91bb602a56ff3e5ebd8fa7a
 EBUILD lit-11.0.1.ebuild 902 BLAKE2B 1b2524d3c5216f47c0a81ad24594af8af9310904434a9dc4a32be827aa41fc65d236c6bd0c3d1dbe7db904b81ff6851ab36dcc128e16a19d3ae959f1fb27f5fe SHA512 fbec68212c533e9f37f46b2a421ffc4ebdfedc21a52bb92460b61dfc9eb9d1ce9d70f7d293abcd963b3ff5d297de417ec6ec33066849434a0aea6058ff5416b0
-EBUILD lit-11.1.0.ebuild 906 BLAKE2B 9e7f47f55e7f33ca5644f654e8d6f200442549b6698c18f0bf6b6cb78a5ccbf8151bf08cbd103003445d87f4816b366cc281aaa3c2318d12025c5afbe813f0bb SHA512 bd5907f22002671d674fe0f5cc40fdb3895ce271bf3cec2a1c0047317c11153aa98dbfee415c165fe9c9637a6d809a182f50e0240fca7026211a10a247f38d99
+EBUILD lit-11.1.0.ebuild 905 BLAKE2B d4f5c76fab1a808487033b9863ed35831f9c26926b6808ee4075e9019e5d255fab2996d948f70f9757a881708d88a9997b69c4a2fdc62f70a4800fbbae8ece6b SHA512 8142c933c360f9a7bd5f3752fb4e04ed9d9775c4057ec0a8b18af82662d5f31d040c918c874add964b353892293964ac8eaea1395782e36eead1fedb0b43da03
 EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 124a91bfb39964af4222f3dcd88250c2c91d9c399e87b00b721e14b75d08f9aa9f2b55a105174bc8a2764664c287812e823621e272742b83f497d2f9ee9f8a1c SHA512 238e92e87e72989a6818be202f5602dd94fb4e8f9a172736d9f0548feb1770d7befe77fc23b00ddb5182dc7e8649cf7e639b50ca26301fcb7bb596ec8b59401e
 EBUILD lit-12.0.0_rc2.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-12.0.0_rc3.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
diff --git a/dev-python/lit/lit-11.1.0.ebuild b/dev-python/lit/lit-11.1.0.ebuild
index 4cb68ab291ef..8d29b5c5a77d 100644
--- a/dev-python/lit/lit-11.1.0.ebuild
+++ b/dev-python/lit/lit-11.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 8003049b8ce9..5b3b9d9a0ca9 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,3 +1,3 @@
 DIST livereload-2.6.3.tar.gz 29407 BLAKE2B 39f030dbc21bec1b132fd9d43f9072f4c35d23ccdca56819e2c6b35277e9eac9caeeff7052fc766359e34bf415319f809ebd45927bd2cc223be7ac88594feef7 SHA512 ccccb17cb4d835eb9e812f8076f871164f6afb2fdc1aee9e35c5ef2d75be2c0403cee51d4eb30b029d7b35522f357ee8c3e9df926fd93511ba7d010ed2a69e8e
 EBUILD livereload-2.6.3.ebuild 1130 BLAKE2B 1452bce11e913390c12a60318322be973559516bd18cfef6b304dd2837b432f63250737581f88aa9734ff023b96aa97fbaf3bccbdb26d42c582a18baa8235eaa SHA512 645754ec27b4006d3d39d9e81da6762c3d0278c7fd42a8506f6787bd25220316366ede9730191c9831f50847dd943970a05ee034b1da8dbb484067b54c60a494
-MISC metadata.xml 537 BLAKE2B b5d26d82e9a663eb8228f89a8353a9eaec58bf7a3e8e622053750e0e699fabd91b51fbee6818aaeb7e4df914e53c5f2b6af0fde6d7fd4344b61b6d12fa674086 SHA512 4cd0d36af6a3a1650cf394b760ae014a903f5a10c84d6937cd7f5c4781faffb23de628a25253454853da4a41a8d45a722b819667828ae1e626b8905c808c71a8
+MISC metadata.xml 567 BLAKE2B f61a2d3159e27eda307ad8345721a9074e1bd4583e5a37892aa063f810cc5b350e00dedc40389fd440e0662607b2843e37658b2afa134035279c507af1c4478a SHA512 3071ccd89e481e3cd8c89b2d449583b94d8322dab15420240ed4033265a8cf2776c98176b0fe341f6b2e1131f7b427d3c4f55feafb91e79abe2a733be031a1e8
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index eec58e62f9ed..7f894d64d357 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index fc69d69c88c2..4632e1ae3a43 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,5 +1,7 @@
 DIST llvmlite-0.34.0.gh.tar.gz 210438 BLAKE2B 832ec28047a51b2874a0de5885445b9d77942a70f86620dfb0b25ff0b17395b6009d31d5e9f27ddf02c19ae97bd5b325fc49227fdc0499a9f5fa3bde44e6b564 SHA512 5540df4ebad835e294c00cc09ab1230a530566f563f751f890752f6e22f7b2a04aedcbb53dbbb8e323198d05c80bc9699b593d919eaf1af60fa6f94ff6f50bb1
 DIST llvmlite-0.35.0.gh.tar.gz 228089 BLAKE2B 5cee01244552cfc1c2ba979709170484ed253f52c5c47a4a254bf7d26c935ff0d2a858b7a7f4ec7719644495383128adab11a1287849cd426b7997da4a59efeb SHA512 345b6321277749a169cd87e152261ef499edbf18d18ef7085017c111f2892eac0241529cfae9c6eaaeb68cdb4d726965ed03b4d5a836501dcbdaa73d3c0796fd
+DIST llvmlite-0.36.0.gh.tar.gz 232059 BLAKE2B 2d1ace28003d52271fb20f086ba37bec1f2f72c0092ea7a8fa2a1ee8d30c319f9625938a8ebdb69dec5dec63d5a67b598a071401e5e1db9de973d55fd889dc8a SHA512 a769255f276e429def4d6f8d35d516df3ae3e026fb8b4af33c1695a9ea24c64a84c38943b530756c4ffc5c619611158e947de391bba501223dbf2a4cd21d53c0
 EBUILD llvmlite-0.34.0.ebuild 1354 BLAKE2B 54b3c4532cb14dc86452f1f4c4feb5f514928b28d65058011bcf6d324ef66c5a406854d780521e3b495ecd38540b3467a525464b7fc7f94cbcc70b18bd1ce647 SHA512 50b07c9575afd16f03810a519fc3646111c6071567cfaaa538690240bf578c5ab076fc80c26fe12a061d283bd681ee709482aee4c8da642621354b22437bfacb
 EBUILD llvmlite-0.35.0.ebuild 1355 BLAKE2B ab309fb8dec4f96fd85708aa99b0df199f3d25f5e6a3159f387dd65eb6a7357a8075849d04ac89414eef4f3d9e2e65876c471485a0736b97ff60c1451e65664a SHA512 186ef8e395d2c6b8c3d8e9546701cfd0a03a1135ede981a44c72c762a49dcb6e904163b73051979c0e683cc27f0a2b4ca741e938dfe853266b1cf81c41415aa6
+EBUILD llvmlite-0.36.0.ebuild 1358 BLAKE2B b3d53cd42478da789057cb38e47f033f7d4cbcc8920a66a6266c337377e95411c1e585404b6fee6f304e980bdda2d90404723acdedae6a30ec6312ace1f6b3a5 SHA512 8f7e7e5c5aa35dd5272ba33f4390359a8dac23929c348b00063e9f36f735338a2f39f3a934d5c459f323c00a6b6fc9c6f770354a1cb24ae0ab8dbfc10942dff1
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.36.0.ebuild b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
new file mode 100644
index 000000000000..be873c251504
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.36.0.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..9} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 4dc081cbf117..644b619a89bd 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,3 +1,3 @@
 DIST locket.py-0.2.1.gh.tar.gz 5988 BLAKE2B e50ef1794a49494434c730580510a4283685e924f6f3efb95067db7d566fa4808409fc339f3c8e3276ddf09f622cb165e9dde90094f764f662558ea32f85516e SHA512 517c580a3420283f945d28607fc765c571edb2c0fab52d5c76f24226d2ec85727d1ffe0c03c5f87f6ce6204e7db4d3c8f6e408d767a389bd93d34cc0de3e8bf7
 EBUILD locket-0.2.1.ebuild 568 BLAKE2B 603d44978a7bd9638ef93f483393d9cf5c1bc6741fd8f0f02ff6c9b4e88dbee764b174a3a3358d7d251ef7adaff8a41229c37d689c37095dbf0cdf7707ed949e SHA512 664bbbd999304b02184ff56043ddd8568945aec03292efe95c0e1d38f31933a9043c793cb39f19668b79b8a1286316f8477ab108ee6ed416d62913e9518dbd36
-MISC metadata.xml 407 BLAKE2B 731eea26051fcca41c8f1e20800bf36ac5a71b1235434977aa6b78cb949e019c676a6d7967f38348d6193d5de982d301ac924eb278beb40017938b1d35fb7b5d SHA512 7887bbf500b72670e3a9b88f17db104688bf509596f14ecb1a04f0db0baf4667adc262ee50079eb3d586752f09ff0022a0a4cdba76a83234ce5b5d3637f4f920
+MISC metadata.xml 407 BLAKE2B 7eca13df87202f2d7451be08d5bcc293e3f37cd6d663ae204c38b25e57060e635ba436d8740af2f1cbcc4ac71eb41f77fba5638ba11db6dd7ffaffaf7bd32250 SHA512 9390efb7c0ee77d79cef09ca8e8a73cc8c934b82f28b8c4facad95babb14cddb2141e220997ce53b302f31b7c4394892c42af956d95c79951497a06afe701484
diff --git a/dev-python/locket/metadata.xml b/dev-python/locket/metadata.xml
index bde8812a2876..ec9ae027d17e 100644
--- a/dev-python/locket/metadata.xml
+++ b/dev-python/locket/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 4ab367a1baa5..d273cf1ab089 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,3 +1,3 @@
 DIST logbook-1.5.3.tar.gz 371901 BLAKE2B e37924e06613ccf27380004b159966b7b42ec7b766afb6904751eafb3d774c5a9994b9d63f834fbe949fe345953c0da4693e093d717b589046412bd4056322bf SHA512 c9068324f12a189ced98e2c02753489847fa533ce3a3af07b62c73e9959c2e014d47515d47e756d031639cb220a2c4a9a380cba4cb3ea1b190c50106decba686
 EBUILD logbook-1.5.3.ebuild 1067 BLAKE2B b288beb4ffacb540c778b4faa51a885ac438c9eeeb8711f307f400e82933922b20aac19e5026a76c1d882014de3802d94c07593b97af7e3ba3dba3db4eb76325 SHA512 b27ad978506f980ef21b6ebf77dfc8712be635c2e3d341431eee5efe51802ab8769b93893abf84c599882c340860f5d231827d78c89904dbeccf1443b857cbad
-MISC metadata.xml 488 BLAKE2B 4546c024069f161d3d4e0a7f110255ddf8ca0bba8b6bfa2b13f5b8180a0fc750347448736edfee66b04a4c3e714037e137a1d7110338cb4d2d5302cd929fe467 SHA512 bca11f6fcacdd0bd1cb3a39457a1bca71761cd08c3295b8598b5e16cf900705bf2ec917dad3d6ccd78f1fd58c736d813edb12a6e1779dcff2a57868b4aa2f2d2
+MISC metadata.xml 518 BLAKE2B 24cf900c81292224d8d3338685bef3a236a6bb52f83ef57623420b270650c2dc676f8793aca159029d487fddfbf6b6f2205543d931846241d11574c520e55da2 SHA512 f2ccfefb8e64dc932e222ce35816ae9f32fdf4f8afd56c17f4aef715fa4356155bf2ac8b75f55182b7a5898ad4aa6ba504b7e991bcf8c105f2244149f3a069a0
diff --git a/dev-python/logbook/metadata.xml b/dev-python/logbook/metadata.xml
index afcd9f5e9ebe..84575468e260 100644
--- a/dev-python/logbook/metadata.xml
+++ b/dev-python/logbook/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>a.zuber@gmx.ch</email>
 		<name>Andreas Zuber</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/logfury/Manifest b/dev-python/logfury/Manifest
index 5edfd12bc8d8..7e1ba9f4f2ff 100644
--- a/dev-python/logfury/Manifest
+++ b/dev-python/logfury/Manifest
@@ -1,4 +1,4 @@
 AUX logfury-0.1.2-fix-requirements-remove-dev-tests.patch 382 BLAKE2B 5dd6b9eaf0fd075d26e800470f7ef9f7303968d5cf33904e0b82bf87bd351a3346016c289c997eb3e746bc22abf78d0bf67e56266082b8aa22c09dbbdd20ea0c SHA512 b6acce332ffa358e39421158fa686b3f6d8e7a11e19544b0da8c419c371622465c60813cdfb0595cbc5cfbcac0c277c4bb55a13411d6e22968e7b2eb3b8d5662
 DIST logfury-0.1.2.gh.tar.gz 15854 BLAKE2B 68fdc692b552c42f509760ba3b6b30d6bdb0066b1179851d9a47e6f8d7b651e3518348ae60cd0726d867d015448253ac058f083c2798b3e5cf7e2e7d86db3929 SHA512 626965bbb8bdebcd7f71fa141de24c7f725933a32f0a00c8799d9778fb41913666c2ef0c71660bf6d00b160b9e34baff682520f4c3570fb0e347f070f010172c
 EBUILD logfury-0.1.2-r1.ebuild 709 BLAKE2B af95efea6e1a44bc6d28aa76d7f3adb1a6a086872b18dd6d24c604455b033ee485b46749cd1715122699c2615fbba8d8a46b703f9608230b2ec47f91ccf6e34b SHA512 8289f0d924c6203f4d10a8a7ce0f44003d1b9d29966a5a079890c1ca3b326a6cf15ea471c7855066b1f41d89a9f27cb954af3a4a5163f2f59002f2111ed74371
-MISC metadata.xml 519 BLAKE2B 4ead9ab47b13e36d475ee1ff1e5e32f3f368cdcfc563e06c6109efe300c8acaf887bb6004836dbdeb28e04aa49f9583ec0b3b6a26e91cae29745a3c9f4188713 SHA512 33badf9dca290ae2548ad447e7c1751c82e926cc00fe6fa622e4fd308922d0d208535de7a74b0b908e0211aee53afece21c2f3b399d2fb2ae1f633fe02900cc3
+MISC metadata.xml 549 BLAKE2B b40b2afd80da533ed36dde0b3b5cdf8e8a8f5046988dac6e22aa62439e81f8f41e70b45a4a498baacfc00b791fbdfef491249505f7beb27528041567fb8a5356 SHA512 c2d3d2a28331231872978cebbbf4d6da0e3014fbedf7598b002b3b6f8795af36c8ae3cc70ce4d522933527f20e9144c3646364f6f2597963782fb6ef51c744ec
diff --git a/dev-python/logfury/metadata.xml b/dev-python/logfury/metadata.xml
index 959691b531c6..9ffd51adda3d 100644
--- a/dev-python/logfury/metadata.xml
+++ b/dev-python/logfury/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>william@ewpettersson.se</email>
     <name>William Pettersson</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 03cca0b765aa..78cadf0fefd4 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -2,4 +2,4 @@ DIST lunr-0.5.8.tar.gz 834919 BLAKE2B 970cc12fb30bc849d4ef846818f93fa7b7701b1155
 DIST lunr-0.5.9.tar.gz 837871 BLAKE2B 988d4b6a59a868b2e06d5454dd1e4932981328ddfc6312027f22dd11228547c6ab21c096f3e673ea5aee0745fcd718ac805bc2067b834ed64841a8592f4317c1 SHA512 e2efa0b22af79140befe9d16e8f9fd3cd57f5413b466447eecb9a21ad2f50a6b31f27510bc7558662f418023290350730e6517b202b9d5ae06428ccdac12ebd9
 EBUILD lunr-0.5.8.ebuild 1059 BLAKE2B b5477761c205f3638b85445424b8e75fbabaa7e4b5898d0a2005e096c51d4ad8d582525b8f0a15943cd46d21cd9bb7693036d168d9e1e3371d529d65d694790a SHA512 2f7206d376c36be97f0563a7e06d7c4cce5f5c99dff1a9fa85110a40eb6d97fe408bed86b193514432e57e7d602b57061628663a3d11e78fd3571030d87da1e9
 EBUILD lunr-0.5.9.ebuild 987 BLAKE2B 6ccf15125f53f4f738187cbaa07b20b2179794bc2686fea8a091499c073f2e63718c7b53e56ac78e3ce613bb0af42137bfd865ae4b1d637d2a4fc18938c264a4 SHA512 f7c8dc472845b35c2a0f8e184328e606422d9a078b235ab03493f0f8bdb7d2a6d8af22bdf34b38b6ebbe21b4a412d528afb5b9b5ea573a2ebff2df4f84908a87
-MISC metadata.xml 531 BLAKE2B 24f03a1bfa5b46b9329b1a60fffa7cd83a8443e8c2a77a8a605e6f488e81fa8c7ff85571d50eac8a30f466f6ebf71b3338ad641a8f775daf39b3c370743ca808 SHA512 da9f5d1f03263d8864d5846de7790bb7e9e1ad1a010c7a15abc618b1254960a656b86af2bcf941bbb77bcad6fae9d01eb33758ff187bc1f827cd8de70c8ad25b
+MISC metadata.xml 561 BLAKE2B 2ef3c2b6ff4aa7a600c7bc651b3dcbd27191957372348e3919c1943d373beec9d404aac40881110c0526d7750bbc2e12c2beb4b6d47dcc633241cfa2496b870c SHA512 5b7bd56587f53dfb2b746d8424fd1d9f4659074acfce99c1ffcd299d2eb1d70169c069ac40803016cac78f60a4569d26ad7c82c55e6f4412e8987b2905b5e7be
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 49413e57b56e..bfb6f4072224 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index c8ae706a8032..d251d39665a2 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,7 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
-EBUILD markdown-2.6.11.ebuild 822 BLAKE2B d1c0b1c327749c1e466280cee75ba4d332787955764aa93c38b62ef5fa43c677a1dd8953f0593095eb84261a1dcc9a7ab7973a3de8a5be90bc14a9861d65f616 SHA512 1157aee6ebd2534421b4731876bcd83f1f1a88496da81a833ec3dbf2617f7f8450d0fed1aed9ec7bf3a8ab5cd5c2654571cb79c72de8a665f714caae9aae9684
+EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
 EBUILD markdown-3.3.3.ebuild 1075 BLAKE2B 7a3dbdc4535c2efc623a7bdd8d83f167fd38f238bf8fe4baa33497ef6ca1e19641ccfd0f4b25e2da1e80edfd628679b8390c037772b64f13f0f8022d8a9d438c SHA512 c9d718aaf8e7b9b6ab425f90986866c0b0a23af77f59c340ca0ca384905384ff6c379e1a9033bc8dc636edbcf009076d9c70262746e634cab8e241f8f0e79450
 EBUILD markdown-3.3.4.ebuild 1083 BLAKE2B d67987834a7615e183497110151a93fba67a0a27a2ba7017c0fee76bd0e6afdeb9ba3f626b6fedb473610e69ad593f961ba489d74a1ee177f2a31b99b43a791e SHA512 b904672d15dba86de463b19420a5838d465803f2fb7f2eaf83c9c8ee06e72b313757a6de5d95bf7755c485aab1b5f2e59873a0e96d8849ddee1a29dd598405d0
 MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index 1879cab8d47b..c52e5e760917 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -16,8 +16,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
-~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index c78032b72ee4..e60e31891994 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -2,4 +2,4 @@ DIST Markups-3.1.0.tar.gz 20146 BLAKE2B 426c6f050868e423eeb7f01cee930b088c4b6f77
 DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
 EBUILD markups-3.1.0.ebuild 928 BLAKE2B 4327e366240016b1a138d54c1b64df9f6f07a2c63484e96431f3157f6d4b796d4f43e6dd78b05b0514d6476b6cd5feaa996e931b7b194b19bd24b081627cdb82 SHA512 e8336de0269333efddf51d09a28a9baca1acd91a4155e26ce40c646bdf3757092f260c307f74c37e5728bf8c607dcd1488aa807d1903759a9580dd4d543fa21b
 EBUILD markups-3.1.1.ebuild 980 BLAKE2B 7b83ee24ab073c39cd7c6727791db04443426551b8c47b3525d3892d6b9ad7e47f4a0e60d1c6fd9cbd4f5d0df0aa36da68aa3bee4bdf59d393ddea28b6f3b867 SHA512 6a8bcd678feb239f4bb4471e92ec9c5abb0c397e3a7f0469cebfb4e80d09e8d9deccbc6586fb4906767d3e7a9dc7d8c4e724a12c4e71ccc5b096256702d90be8
-MISC metadata.xml 650 BLAKE2B 377d385b80c22d12306b425a4fb0605a1ad72fa2f9c18c00eb328870033957ca878acbf22a1cac03efc28cd1477d7bf8777926604a555ca39255ca3e97a21e27 SHA512 e403dade9bcf926f7d7488a373d16d75072f4c1b9b5abc53bf15337864d269bb5727e6580e99e6a78e51a31eb4e7429a090e8d44ea5375a586e0629a15fa5a68
+MISC metadata.xml 680 BLAKE2B 863bfbb8aeee26e72ad3c6e9cae490e82b67ed54fabf3adc11e98f8894d181e02cb0d174babf003cbdfec1f8a4dcc6e07df47f952683a46e7a4f1c6e3bb2e8d0 SHA512 8e71b06846e8ec4ce1cb2a4cc9aa4e172912ed9a77f76d6a7e9b475432e65d39fbb130a375f35ac429c398ff4d2b32e5ce99386668a88a8cf715660339a961f4
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index daa6f7664d24..fbb42d8965dd 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>holgersson@posteo.de</email>
     <name>Nils Freydank</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index d50e4270f1a5..d51e2066d8a4 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,3 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
 EBUILD mdx_gh_links-0.2.ebuild 470 BLAKE2B 36d60c03ffadaf1d1c45ba1961cb0e4a5fd834f185a6beaebdfee8442ff200d8ea880b97f4240bcaece1060b2ebfb0fe18e5c4966089ee03da4db6f70c1d269d SHA512 1b0fb80236bb3663f3d876ca87e00217ba16e156eac32e72137e0a845ef1ae8b977d265f585688a1731b08cb3cc6d21aad653f8a790fdd8311060e74c9c598b0
-MISC metadata.xml 450 BLAKE2B f5d8a19aeb44805912dd44cfea84f45c74dcc989d5ced9e33d002d9e2ed806939714ee79eee5893ea1bb2d3d5ab925e1bd57acf77b87b3c516d675973bfe67a4 SHA512 81ce8f4a5a1c80552c82f0dae939484bece0244a985377203e0336fe4a39dbf9ae13d01dc2bc2356728137062e471873fd5424b2dfa114ff162ee70846e285ed
+MISC metadata.xml 480 BLAKE2B 03a3390e49378d91d9f11c8a9d5a708de510ef9682af7ac866ec84dfcdb5ad5ca6a02ebe8cb2695e220297a9c240812b13df1df671c384578c0dd4886915cdc7 SHA512 8e1e109d25b50bace2864672ffa4a4530b635ba93d4067c1da914d46b53986317f94ff2633493a1b63f20145e94e607b850b0d82bf9545d6daa0e7911f890fb5
diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
index ffb6095beaa8..e045d417bef0 100644
--- a/dev-python/mdx_gh_links/metadata.xml
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 37f3c105ec31..e51240d96c52 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,4 +1,4 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
 DIST metakernel-0.25.0.tar.gz 182808 BLAKE2B 40fbd44109e3b9e88fa8065138e7ffe3b42320651c1731249a10c443a456a5eaa5c91110fcc223f1d557aaa1acfee670a3a36dacf78e6bc9b2ecba0e39f7cc21 SHA512 89a46d3b746a0f4c435dcbeefdb485257c2813790849f95bc0508fee7c2a892e688fdbe2dc9db5f2a0c69ed4917e8de81753492e686337d5e1ab692e9e51ea5a
 EBUILD metakernel-0.25.0-r1.ebuild 567 BLAKE2B a4746723d861dcb63c7fe8bccb31103e62e419783df07b2e7fd4f48edc15dd041135eab083fb12e5932af43a90f9b3a9de46b236c73530fa8474b407fa356d4b SHA512 f3971eea99d5b07bade4fa6af3629644225eecb0f2e428cf84b736c016901ab7f44f1d0cfa04de7df95243a810bf45ddcf3dbc659a85992f6604f14a486cbe43
-MISC metadata.xml 634 BLAKE2B 18f77a465ef02244b5ded5cea7751fabeb5d1fbad17c2e47239228e7512512eabaa79fab71f480fd11d33af8b43ca6859f4749b81c14c2e93384b051f1ea3590 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad
+MISC metadata.xml 634 BLAKE2B 199a54dc9e50d1b86e7f5d0010c903ceaefede96c4a42dd816abeb249c4e805c1ad4a0019aa043afbff72ffaed8c95a49a43b11873137dd99704d8a46b9a1411 SHA512 f6b6ae46caa419c057514a55c59ca931e72eed064a926e5fe9c0edd0daa3f901b84face60ea6f27dff56b65fb0d85b19f33581e1d8f83c81c8ab21edbd591544
diff --git a/dev-python/metakernel/metadata.xml b/dev-python/metakernel/metadata.xml
index e0c68c929e2b..f78ec846aeb0 100644
--- a/dev-python/metakernel/metadata.xml
+++ b/dev-python/metakernel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index eac1b4e64b1f..3542ffe55313 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
 EBUILD mkautodoc-0.1.0.ebuild 640 BLAKE2B ec22d2c25b8ad03cda5941ecda997ffee8f004fb036e560e36ed489af30000e13ba1ee332511cf65ebf8e7d0ef19a9de3cec2e3d9da88ffd56a943ef0e1e2dd4 SHA512 463b98fed20cfeb1a3d9caa826c8f7bc17c1591b1cc96ae8128d4ba749848be8518a48cb07b68d07e4ec89317974902f9fbd1bfd596fe3aa771741da19ba3a6f
-MISC metadata.xml 509 BLAKE2B 8f1b4827849c3bac4db1ceaf5e9930dbee77a07f0cc1ec359189747eb76c665f1b8160087535e88ab44b0762baee6f1f4e57f631710a83b3c4860e582389ac0f SHA512 dddc21e8b45636a67ad28a5e5485d60499e50234c4ea32ea8c0cf618024d4474f7761ed00f7699c30de2b46b0aebfb53a32a0f4ed2c5cba3d264146d172cf871
+MISC metadata.xml 538 BLAKE2B c988582a704d246ee748bd43b226b03649e66280a346834f408f5adf988b823c0818e31794f4ea8aa17f4528ef7a7e8366983261f60fd7e2f9e27b0752925e09 SHA512 501a7e559572746f090bf3cff337c178f9ce7c83b8b5677400e87f8835d284b2db5568bdecd7fac503fe31d1555c41348099e977e84b5119eacee9f265b1e2e1
diff --git a/dev-python/mkautodoc/metadata.xml b/dev-python/mkautodoc/metadata.xml
index 0858ff1d0d1b..5aa1ad6b1bed 100644
--- a/dev-python/mkautodoc/metadata.xml
+++ b/dev-python/mkautodoc/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index cabfa8a0891a..bfbeee1de4ed 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
 EBUILD mkdocs-bootstrap-1.1-r1.ebuild 465 BLAKE2B 316d3187f172bbf48bea584fbe9d46d08ce56c2054e3d8faa5692384210a8673a360bd8561289349e0129245c760a3b0e15b3043a6570e06f0f4ff88ad7ec1e5 SHA512 28c59af00cc504549fa9b0c0eaf09ca1ddb35d36b40db4d04b79ed8f473976b61fbf185634d4131e22ecb79cfa1a18e04dbae1ddb2f5d89890c9852dba67813c
-MISC metadata.xml 541 BLAKE2B 3e39a72b66c3d58605e6600f8f3b1c82111e49a2e9bf2bdabac3db591d0a75607063f27b53f45203010f591a575de5fb101d789a67b1929f75bb4a0ddc223773 SHA512 6c2211d7d2bfab79690338ee531faa0ce53057ce034351e3e89c12e6d7a7be6855cab6db2889f314edf47dbfc203e5cd70af3d426ae3250dd46b5553188d657b
+MISC metadata.xml 571 BLAKE2B bb21d5751c9183ef640b5b6ae8496d609b5830bc3642faf680f5c9ba787ef0464886356358779922b77fd3809fc27e2ebd6185c4ba8a7e442da2ccb4afe286cf SHA512 0c77fdd87194acc9485ccded07764e4e9a641189a12299ee47228c6d89b4586443aa730c11f91230d2d6bbc075dd678f4974c373a1c9b377ea176562b77cdbe4
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index f07ab710ca25..5cdbc5c72e22 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index f0e670efb74c..9fa9dbf115ab 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
 EBUILD mkdocs-bootswatch-1.1-r1.ebuild 468 BLAKE2B eee2b8a93c83deb404bf061428fae731d1e48588df7021b1c9001b54067f18c0d1d38d820a3e0336aa0b9287300562c8d95ee0d06d769502598afcbcbe616477 SHA512 472e95800d4bd80fc2e8b833ec8d60ea547020e861df3c004e5138a16567a118fd70380c0532c6896eb87cde943f778ac50224fb1492d8488b7491e2bf38dd2d
-MISC metadata.xml 543 BLAKE2B ede63e47862c51e9a6bb05a99dfb0ac652ca0769a63a99aa44d84aa76052c600cfae5aa3a234956c7b5a31956f4860cd24ba54667dffbd9e1413abcd3bdcde0c SHA512 0b1834c6d4350246bdf437d980081cb826d3e9085a3e532385b89c8c84a946ede96120587856b023709e0f25e9af5c586ef494a970fdb089f50c4fee58c3fdd8
+MISC metadata.xml 573 BLAKE2B d56ffda617986bd360813b095b5d3a4b830df448bb5a18dadf6cf7e520119320b04b63e461c7266c61eb212db37cbb1730076e5364ec5660acb1653c2b6c103b SHA512 ea6393720fc82ec709c23873b0e59956fd5cfbb6bb9bf493b02b96ebde1426a75596c973262d5bf2104cef9d2f1aa14a63a01f32851292ff4e629b9b2c4a376d
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index a28fbda87e67..eb2e8b48c60d 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 2be9cf960a9e..af3d86ecc9b5 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
 EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1157 BLAKE2B c371bd9d3ff8aacfaaf9df302c6bd6bd03241c939c28ae39168e2a5556f28a65ddd6b04d13db10a02354cfe14a4c44c7b333f5ec94dd88d77706d25e0c504483 SHA512 04e0a37040e0006c71c6899d4a55bf013e117925fd631fc025d62d8e1af4cc732991328e5c6c2054d340c360e62a1cd94b62e3d6da95a87961b0bf88be122f3b
-MISC metadata.xml 587 BLAKE2B b3e4153e7597a2174cb069dd1152530513a2ec479cd06b17514a4b205d716048526b1dd318cebaacfa41f7b8457d7303ce1703bebb429bfafcc85bc934ae2721 SHA512 6be3633fa700424d843bbe6fb5e39286c91f589b1f60900749d0bd18a49f5e207fb78d568c82ba5b1f2cf24b8a7cf13375dcc7acbbe36e719dde817ef2e0dc8b
+MISC metadata.xml 616 BLAKE2B fa9536dcb351375dc34b169db560c37027605bb002a8a6e43e575fcf12a28204872757b28c4fe0f4bbd6eee550ea712e9d0675e7fdd57c4fc1402b5dffe97653 SHA512 9229a7fbb2b1169ccc2eba9249a308d50f674968766e501a1b2a065b4ce1673b4c070be6857428e66c95f557f627a7f9d8128a0af8a10ae4d7cc73d61cbd01a3
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
index bb319d114c9b..151d8258f97b 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index ca6c0022c5d3..9bb8aff09964 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
 EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B 5aff45ced7b694314adad5854b0b792caddc074eb3e3ec44d30452b80cf2ffd5ccda2a632bbd89b8b5cbe085058ba81ef93c09cba1cb363ea926b1e0277a0fb2 SHA512 ed80b80442a4483238356f5fc7b6373d8a8c8f3b3bd73e5ae29512c8ef869de28004dfd914869a6c5c17bf81e4f6fc171ecab4ebd10be7c48757e656edd45285
-MISC metadata.xml 544 BLAKE2B 4010ea926a1bfc27af9d61e1d57f34521409ad6ef838f7fe10d7bd57031a636a88e73bd29c76c250ed27df27339e68c509e7ebc8198ea329154daed39624d207 SHA512 b7b65c65a66e718e402a954adc4b40916e3fc7d776b1172fae0fe3b4d098d89938b305b4281741863fe988edbc3d9a2b90426752d59f25375a9c778418b6fc0f
+MISC metadata.xml 573 BLAKE2B ff96020fbbc23286d251b03756ad484be6d2010e9c04d56f1e320e07db50262f12c5a1faa75bf38ba86a4ad1f075246a019550cf9c6cda90f0545ef0e4ca0f6e SHA512 135d88f64134554a02ea7aa228370cc8b689b2d97da5e6b34922e392005b4e031460fc0688aab9af3594b637b484d3687bbe5202e0dd296a17d4ab5815c0b25d
diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml
index 878e3e670559..e769e9c72d3a 100644
--- a/dev-python/mkdocs-material-extensions/metadata.xml
+++ b/dev-python/mkdocs-material-extensions/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 6eb43e42d1bd..f5ccf8e9eaa6 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,4 +2,4 @@ DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6da
 DIST mkdocs-material-6.2.5.tar.gz 5373656 BLAKE2B 7e04a4a284c0749264be819a0b42bc93f924c84b40df9f718392912f97b4cc2288dac7d7a721047c0ad24ed4bb73e4a2d00aaedfbcdd9198c59180fcb2eb286a SHA512 3925c03e2f7e71cf25cf386a6f7c6e768c059a61201860dce186f095c84cb311645628fd8732f10e9106bd818e348115c1f22457bba7c128f6bc89e980983bab
 EBUILD mkdocs-material-6.1.7.ebuild 816 BLAKE2B 6ce78beccf0bdb6e185e0ca97ba608c0e66ac08628452a8d422f56bb9ad060d65b28b72ca4494bae0c7793795d3e7832dbb2ed382e412574cda083c3b0514758 SHA512 5262baf73d87bc9c6dcbab632c0dc42177925d9601abc784be9050aad2b73256e6a814fd38a8a2be960e14a93c3fb267975b8f25769ee3afa12840f4cb742c07
 EBUILD mkdocs-material-6.2.5.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
-MISC metadata.xml 1131 BLAKE2B 908836f444c410650ed620f0346d3d9fd1d34527cb7605ca9ea16c5327a21399423842a857db2804a8dccaebad4ae61bd4cf0dff2362833ba38756aa6dc17879 SHA512 da9a3f27bd04808da31cc9ba1a7fcfd1064a89f8fdda5337110e2472b3e2b95987b01332ea9dd5f70c092bf8ced4baea22e016f7ec3dc813e99053c2f6ea4ecc
+MISC metadata.xml 1160 BLAKE2B 31d6beecdab5974437ccfd36fce0f55c6f2053d2fe8375ead6e587e81d75a71cce0bb6f6bf7a6d0e4eb32c060400cabe083a319e6218ebcb5055a82aa993bc1c SHA512 052727224f734f9cdd17e5f58cf6e3136398176e20f00161dab9ccac2cb42ee5615ec5d527f38db49872cb5eedf277d4d3ea60f0d565e5d45396312a455c61bf
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
index 14b90ae1b176..5fbac730121a 100644
--- a/dev-python/mkdocs-material/metadata.xml
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 6836c71658da..affc82b07c07 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -2,4 +2,4 @@ DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
 EBUILD mkdocs-minify-plugin-0.3.0.ebuild 619 BLAKE2B 21bc69da07457a68305d4fe09e8e624af1de6554bd611de1a1ba66ec30438143acc4b2874792c6e5aa4b9453b1f1d3cb70312f157f2d7cc11e5e6537c4a56294 SHA512 e24e345cfd128b0eefd7770a1e8a868c6be60ef10b90122442336d88eb0673bf711754b144cac5bdb0a9ac385b63f33848f82887b2b513e0946ae80b21a0aa9d
 EBUILD mkdocs-minify-plugin-0.4.0.ebuild 619 BLAKE2B 2c55c9644425537c9b4958f39398e8bf2c22e0d931c0bb285d466e9f6a4efdb3b70f1b941648243a26be27de138116f34a0d7dad853699264c8f76917949943c SHA512 d4bc048cede7ed6993c9c1960f41a8e1f95a0225dd9d2d725b9000385f77b3819e23689b2212a85227b8327ed8c0505adb62380c16dd475086309cd78648e8d6
-MISC metadata.xml 530 BLAKE2B 4e36cb35c704c21112be2be62ad527339beeb4aeec3d4b42d1b1f35849403bb32fdda46a593741c6fda4c1e33cefaec505d382f3bea1ad6e17b82038223a48c8 SHA512 e522a55624c75108a9758a2a4faac669e9c980526825b9a1dc3a0175888e8367753f5eb16ae70075580905b0c1c199e883f045d6153807240e56403b601891ba
+MISC metadata.xml 559 BLAKE2B a20332314576b266df4fdfbe67fb99caa0fb40fcd3d61fa3eaa9d4fa38ef112a0387b9fdb3fe610fd08467591730baa31612661274934213b99495100b98ce59 SHA512 cf5b0ec5129513104977be351ecb07a6b696a98a30053e9c8cfb146755279e166962734cd358980a9c65ac86ffde730d05d134495f54fb00bdcc009e41878709
diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml
index c68438d47fdb..2b161723f428 100644
--- a/dev-python/mkdocs-minify-plugin/metadata.xml
+++ b/dev-python/mkdocs-minify-plugin/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 97f522997951..defa84fba9a3 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
 EBUILD mkdocs-redirects-1.0.1.ebuild 542 BLAKE2B 81db33554f47e2998252eb9c47c984740453cb8ecb81569ded3997d8b91a03174121a67befdbd84df2cc5e482869d8428193ae263928a0ad9940ee964bd15987 SHA512 08db637eeadd621fe4d9d0c60b0e7a46b9e089bbf9f66dc1ccffed7643e46eb999b8f6824f72b03e2b6832db52f2323da45de2bfe138cbce651c0d53666b92c2
-MISC metadata.xml 521 BLAKE2B b80668d53661025005cf5543f3a760fef99c769f442d2f9b8229806ce13c24fd10af333e85efd3c3cecdc14bdeccad4faf5bb8de1ddcdcac70f16b2cc8c8a96b SHA512 49ecee5ea894994a5a486125bb8775f043052c71acc31fec85e8adf8d8401cc8ef059cbe3523e19fa59372c43d9e6bcbd6b83d53f13d166b9481191d4b61bdd6
+MISC metadata.xml 550 BLAKE2B a8f22dec30a643db8f3aa8ce29a326949ebcece9ef2951cdc6f977dbcb1f44fb5870dbb17491b265938e28e3517cf8f6e37a7aa8def6948f91476d5ad1edb2c6 SHA512 971aad6e3b870dd5a156abd947e2543920bdcc329c4d33d7594f8ba3491371a6dee6ba264658a106c9e371ae81989c8d771f4d85fdef6862a09e68049939176a
diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml
index de03ad6b9f39..05479ae9d00c 100644
--- a/dev-python/mkdocs-redirects/metadata.xml
+++ b/dev-python/mkdocs-redirects/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 355509a71f4b..305f0d3ce6c5 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 EBUILD mkdocs-1.1.2.ebuild 1353 BLAKE2B 14ed1990f54f4954dba6afa3b01f967508412573e2826c7feb40c873a2f55000df8186166ea7a31f8bfadd6d040f357747007f889c19f072026bb86887a3a43f SHA512 7d24f6aa455983535ff489f3a34509e236b336a65750b383429dd7304e3243feddc6bdd94164545284f5a29b7e111ec3911591b6e478671637589c24d50a3d11
-MISC metadata.xml 521 BLAKE2B 2cd114433c25c7a1213988ce3da4c91c7869e9c594815b9ed763f8955c52d6717aff4b68d4111a37ce1cc2d69e01e72c9e7eed5423eb9b047f744cbf68e0f3aa SHA512 5825cea77fff9e1e11f78bb3ea7f6d6f6fd55ef956b5041b47e593617757209a6d86dfdea8349876603e0b5c80a11f217232cea03b730a8cec2412dde2918341
+MISC metadata.xml 551 BLAKE2B 1ebea5ce1cbcbc6cf90bab20c782b40f6bd59bbb3b3931427627a5d879310eaa41c4de30836580b28b69e150817cb9e20ebd7d70073583696fb1d6b42b761b6c SHA512 cf7f3b7bc75e945ea95627961ac6b21069d5a31b5244756fe9ca364136f5b182be2529d98b9924a778533988e8c6dbc145dd9d023818040d97060690b0d4f0b1
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index 34ba23ca3971..d15529bfacec 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index bfe08ec5ebb6..10848d445a53 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -2,4 +2,4 @@ DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
-MISC metadata.xml 1113 BLAKE2B 299eb7a3b73baea4bbe7b4de3646c1eefcec2cd387ca4706b75813722ebb7e63284eb7ec5547ca9bcafae207d837adc057ecad6c553fc9c9df63abde55d5935c SHA512 cf9c484755948b144593a79bbd1594c0993ca875c0c12c6a4f0ffaec3911c0681617c179ed34008b2e578475385a64912dca12709af73831fdc00fc1bf552dfc
+MISC metadata.xml 1156 BLAKE2B b3947a8cd0a6679baf35b04349cfd7ba91a4b96172364e547ecaad3920409adb27acfdd8971e45b8799964dcf9ec335985aefa26f13d26be9679ec83d3d76d8c SHA512 6cde58694490de57f25010c94271e56fce0910120dcc9d3c57456421b233327b0bccf6d20fe2d427c9d34798446359253828ae924363d06b042e2766ee5e961c
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
index 4f0fe0e6ec8c..3cb9e6d21529 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index c750b3453150..db09857d10a7 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
 DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
 EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
-MISC metadata.xml 619 BLAKE2B 9b3bdbeeadf2a214e0e6dd41b6177080fb6ee475db19be125bc09efcfd1adb9624ed262ce3e739801eff91b7045bbcf3a51b78ba499a7c446a3ad7389493bb72 SHA512 b0bd3746abb8f97dcb9dd4893aa00612c2444fe1d39ad9b0b203f135f4422642809bee2c37e7fe3d783ced47c50bd2624c19ced3b9218127b799096ca7ee8182
+MISC metadata.xml 633 BLAKE2B a72f01eba3907efcbbe35aa6c6cfdd7264df5a4308b2ec0bf45d34337b8c185b678aa8bd9be9ac03e644735571494959a603625a970b2814c7f3b992b49f9e43 SHA512 636471d2bf5300aaa7fa2a97599b53181e379f2ec240ca58dd3953a5615d474dc9c7adea9b16bdac1d15574e0e31fbc4dd83357d9eaff5640051b86ee9071266
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
index 4d02ca4bac35..fd666817a89c 100644
--- a/dev-python/mongomock/metadata.xml
+++ b/dev-python/mongomock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 9961d20bfdc4..81f4273d7994 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-8.6.0.tar.gz 88371 BLAKE2B 79c9020c641e61d97c350ec9004fabfc4a94969d17c517e421f63f41aedf101217906d5bc1d397dc1ed7666143b15ea7ff0401a2a6b3fccc1d08f3cf9ff55eff SHA512 9fb6cbb1d303c79a1c67d1c473a161d71bc5d88c8ebaf290947c1a6e64c2a224478063c58ffc4d1dfdcb2931bcff9cd165bd8724a9e78e95c6f163000c138a5e
 DIST more-itertools-8.7.0.tar.gz 92857 BLAKE2B 65966fa2939fb6908c25a658e96162238056403e2b67d41d027c11cf04c01a09f954ea1a75363e0f615ea3e5fa5b9cfa4289ef18942c68122f10588f37f797ab SHA512 0e80dd5e08ffbd1878f414e1e8d036046ecfaf74c638a79d277d72e8357892b73735cc18d8a022c53916acc3733ebde4cb8030c5cecc354d6469933d91c66c13
-EBUILD more-itertools-8.6.0.ebuild 676 BLAKE2B ffa1071d515c01269da27ad0aba0bd0571cefd00c74a2fcefbb4cd3a8596a85ed02c12b83b55db2eabeced1d5bca16846fe1522db4cc135ffc7100d4e070776d SHA512 8875ccb76028b2a94e9415dc580e013dc3d677d8864560e3bcbac60c768a184b5567a26563bba33bea8a221a7e4e0e93ae2804f7fa06515bef584f59042cd810
-EBUILD more-itertools-8.7.0.ebuild 684 BLAKE2B 7ceb0197ce1fee4ab3b9c4bb48f1ce8605fdf5b115d23a4892b052ce21d57c769adab0dccf42a91b2c0ffff9e7e541d48625084684af7315ced548694f611451 SHA512 faf19249da5b913db81fab5032408a6deb72107ae474049d109a3f8a0e8bf11c960ead5b6347fcb7712b09520ad8e22eec5cb041555b97a0cb74077a486868d8
-MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
+EBUILD more-itertools-8.7.0.ebuild 675 BLAKE2B 550f19e2b0c04f6d145a66747368296c5ee54f3aebbda167630054a0a9f35616eb57e2fb4d79e8ac212e301aa65c8d9d5f260634d4282bff971fe3e1d82b52fb SHA512 29e8b24bc7025ed57f215b42e33700910de7ac3c5f98e211c371445c31425f28a5ab20d3d91b08e98d8ce179f4e10b537e8d98186b9dfc2c4a31e86c1cbfd88b
+MISC metadata.xml 487 BLAKE2B 32273e3af64b6c58907948a20fa547f733fb0c1a1bc8d8cf580657d4ed19f6eaff7f9b6e8f930887d5af7052682bad3ef1131a0c10ba2474791f01b450b86e65 SHA512 5ce5d78097a243fe8ad553783a5de64c1df82ef77f0eefc9c55452bddebe472622ef6c95d28be9247739ad86cf68a1854ac66c5725555728a46a080ff26a6c8e
diff --git a/dev-python/more-itertools/metadata.xml b/dev-python/more-itertools/metadata.xml
index 5da8c1c29648..0d5997026087 100644
--- a/dev-python/more-itertools/metadata.xml
+++ b/dev-python/more-itertools/metadata.xml
@@ -8,7 +8,7 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">more-itertools</remote-id>
-		<remote-id type="github">erikrose/more-itertools</remote-id>
-		<bugs-to>https://github.com/erikrose/more-itertools/issues</bugs-to>
+		<remote-id type="github">more-itertools/more-itertools</remote-id>
+		<bugs-to>https://github.com/more-itertools/more-itertools/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/more-itertools/more-itertools-8.6.0.ebuild b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
deleted file mode 100644
index 18ea7d9b26ad..000000000000
--- a/dev-python/more-itertools/more-itertools-8.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
index 5a0f340bb74d..c905f82e778d 100644
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index a9d28b704ef1..0b5340966008 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -5,8 +5,10 @@ DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7
 DIST moto-1.3.16.tar.gz 1761006 BLAKE2B adb48ac770e0753403fd41309ebc2085e5d9cdfad5dc791d9cc1216af10e55038c37526a8549a034a3327d821c56b0f6cdd775a17336285bfc637c09191dd78d SHA512 80a1335fea8d6dd42b4062365da4719d26cd6c18e5c186c950bbb844dce44e91ffe5e5173742f3b60d6ba2cab93d45359b43c2cb0ccf74d16009986457c243a4
 DIST moto-2.0.0.tar.gz 5054551 BLAKE2B be9b18909f90b22fe57d47e2eea50144b4ac8046dde0123249079f53c8f3c2ea70513b29cde1030ad923be7d50c6021351c8aa9c65bc0b95510a4f4de9d4d111 SHA512 285eff39004b291d112c455f44e30fe441d74c08aff614f5c97e7c52a68edb200d7077722f1e7bca38a63694aabf2ff56994cd1229e449b2f1afdf3945735fc7
 DIST moto-2.0.1.tar.gz 1530088 BLAKE2B eb35bcbc8b22044ae86eaa6eb1f71eb24174a8686ef06d475c870ef629d0a525719c4f153cb0a55fa27f3c33568a5796a07ce903800468557dfe275de3da3623 SHA512 d650140c76a2090332fd9f4c8be84379d4e578a63125d473b821d59bff9f93ee8e696268e4784df13f2ee3b8b6967fd10cbd94750f37e63967ed679b4a301682
+DIST moto-2.0.2.tar.gz 1534459 BLAKE2B b4609f332e8f8eb8d61250919eca805f82a6dfc468cf0b9cfe81f462aae9f93373efec6165c818589abe60955abe061a273148a36e4b1f8534ce9fa7e59f5cd2 SHA512 b478f9938f8e7b92c3e718a1aea5907c2070bda42995050d39f8e62cbd7cfd30fe4c9cbd7e7475f5a50c71c3370a89f53480adcf83df1fe08968125f2a1427f6
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
 EBUILD moto-2.0.1.ebuild 2366 BLAKE2B 25b780427da33dbdae8cb9ea6bb0c834a02ec745f40e7ad94c27cf79c9fc13bc4a91d6a3ac0e4627ebd77a36ed0ba1daadfaca963cadf32a860d4ba62b34df99 SHA512 38596bc35536b0a1598cdf2425a164605b5b7614c776592b1f76279334dc1ccf91440e88e74511ebfea239095a1180d91c740d05596645c82982f45e39e0c8f6
+EBUILD moto-2.0.2.ebuild 2325 BLAKE2B 03477444689961ddccf57ce58163c0a4f7516403893e8a1af45534a3f7c9c6327a807ad0a2653db9ec59fddb3f4cf4d5c88511e12f415ef6877e25323953cc2c SHA512 3ba13c962c687978edad112685d36ceeb2c43828091ab463e6b6a134e01f6459a3a11b4160830102f5e2c9637c95b5a9f47625208e147c38e1a614415ce84702
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.2.ebuild b/dev-python/moto/moto-2.0.2.ebuild
new file mode 100644
index 000000000000..9116b3688f7f
--- /dev/null
+++ b/dev-python/moto/moto-2.0.2.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_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# network
+		tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names
+	)
+
+	epytest -m 'not network' ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
index d0ac24a1aa29..264401da3721 100644
--- a/dev-python/moviepy/Manifest
+++ b/dev-python/moviepy/Manifest
@@ -1,3 +1,3 @@
 DIST moviepy-1.0.1.tar.gz 25746520 BLAKE2B 5e18841596e967a1531eef5d7cef8f96a636486923a874606c453bfda92d8ca8657afef9eb46c2b4b3bf7ae58d138866d7497cd088509d403dd6722fca8e8ec5 SHA512 3cdccaa13dd31529a17d480fcd01b5f89b421eeb618425e9fa9a114159d65aac979022507c3f9c64921af60e4c9d7970e6a3223d7942c08e67d7e696618e9abb
 EBUILD moviepy-1.0.1-r1.ebuild 877 BLAKE2B d00005237f655d46b3b5c9bb47600eaa78a7f272cd28d6e0320286fedbf690f0074770640f65286368af957ad4d72e73195cb6a2a51a0c85f61253f8c10f5cb0 SHA512 ae1a9f359f9cc4c79f1c5661753fb43d268356824c2f1117a5fee4415fa00e217de5fb4c6807f91d4cf5aae066346f2c9b2413032ea4b5cee4c9775df0933f3a
-MISC metadata.xml 772 BLAKE2B 54a129493d505417db898102816351de4da9ec7524605a6982da4cd6948e31dc5320e688c1a6008ff7df413c1bccbea26cf5a19e8f0f1a4aa096e9fb73797a31 SHA512 43eee375f6971184c4a0a48a728283c9a2ceba7c89c85f17601f27c5c7ee6f504e5da1956475d151f0b1668dbfa4999bd939450c8bf0599d7d248e384cda4e20
+MISC metadata.xml 802 BLAKE2B 7c1e5e502686c1260d21894dd920b5b8e1ffa152be993f03a3b14236d9c88d7e4b80b7a12d57412392398f59a983e23010cb031c8c21694321941283cc75753e SHA512 62c65ff78c212f0bf567c9a0768d91bef8f2277a5d59834495ae1fc7c2c3adc3b4599eb76f5dbc5c2631dd5235848cf4126d6c3fdb9dede30933ce0e6726b06a
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
index 3465de072bb3..79f90cc3af2a 100644
--- a/dev-python/moviepy/metadata.xml
+++ b/dev-python/moviepy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 15f946abd7da..48663f8be796 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,6 +1,3 @@
-AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
-DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
 DIST mpmath-1.2.1.tar.gz 2135690 BLAKE2B a21e0ef04a025f23e32dad5839db411708266c6cf3408e97ec5c995f197b14f446c1d328bd2e9f50e1c48a2e08239ef7908fcc3aab8659118fc1e0e78106a47e SHA512 2dd908bca26162adcdce0493146d009e04d3d96db965ff2207c332504020fa6f5a5e2af97d38e8fb3e7442a26c1e93a756a8d93b378da720ab7c07753f700d10
-EBUILD mpmath-1.1.0.ebuild 1031 BLAKE2B 050b254a31c7e1c05035db520f86ff95b028baa99df08b143731a09dcae6b172e4b0fe9307e8c779f314753248548ed91a8050a32e000982ccb6b53ecefa6381 SHA512 2f483ffce54d352fa7746b7051136fdf645768cc4d0c00c02e98dc602a80265866673ae1c7213945ccd1e3288adf968eeeeb0f5321e7f5ff1a00ec821305e401
-EBUILD mpmath-1.2.1.ebuild 989 BLAKE2B 2d2ebc833c62002dfe38033f8ca46a498c3e89ab6922b09efc2171d95be130a4d7ee97782672e10dbc59ce0885fc3fcb34a23b9e96f7b2a2a9178191540158cb SHA512 f178b31d5676654e0017cdb87cede1ebd49982bd7d4bb13c8de77064987aa7974f0e8ab4b7f7874a8fd5aa91bd8e216454ff37720e6144b639067b52317cf2fa
+EBUILD mpmath-1.2.1.ebuild 987 BLAKE2B af17da1c36d374c97d095e7b8701c52f6c6face6d1a380204c7dc7c3375515af615348cacc401527ed660e2a8055b5cefdffc37c1196c9bd6a79c6237cddc45b SHA512 d4cec3b0136f2ce54cb62251975788178545533fb1fbc09c56028347887a33ccbc4d2e05822c55d8d583b2f93e2751b26e08dcb235d1eba7e13543a34782e736
 MISC metadata.xml 598 BLAKE2B 56e7cf984af382507983ca0cbc48ef70cf5eb508882509bdb9eedc3698790f662c42e2868bbfafd67efa800c90e6e9fb6294fb0f17a859f8dcd0b6acd7a779ee SHA512 0a70ea57a15514b2686d8c2bc5a96a17045dfb2d27edada2612eaf1a901dac171243c666828979d6e0f532779132580761d9d7859e7883f77a50055c50bef569
diff --git a/dev-python/mpmath/files/mpmath-1.0.0.patch b/dev-python/mpmath/files/mpmath-1.0.0.patch
deleted file mode 100644
index 3a88f38c9927..000000000000
--- a/dev-python/mpmath/files/mpmath-1.0.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U1 mpmath-1.0.0.orig/setup.py mpmath-1.0.0/setup.py
---- mpmath-1.0.0.orig/setup.py	2017-09-27 21:42:12.000000000 +0700
-+++ mpmath-1.0.0/setup.py	2017-10-02 20:36:02.919554100 +0700
-@@ -15,4 +15,3 @@
-                 'mpmath.functions',
--                'mpmath.matrices',
--                'mpmath.tests'],
-+                'mpmath.matrices'],
-       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
deleted file mode 100644
index 19af77bd55dd..000000000000
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gmp matplotlib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-1.0.0.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	pushd ${PN}/tests >/dev/null
-	${EPYTHON} runtests.py -local || die "Tests failed with ${EPYTHON}"
-	popd >/dev/null
-}
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index ee062f0cf511..7960b10143a9 100644
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ b/dev-python/mpmath/mpmath-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gmp matplotlib test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index f66cc3be3c2e..47dbc91350b7 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
 EBUILD mss-6.1.0.ebuild 763 BLAKE2B 81f824c319d1d42ac0de9855bade1cfe92923d38cac3bb24f2be774a64bc5f7df4d8b46c5be8c4c8fe27126b7f26b38bb3150e55e349a60f8a9358a83720bbad SHA512 3cff7e7a92418b11cf0d3f793d692b1b7f4a91962b4da3fb7dc789817255efce69a3772763eed9ecf7afd0c8c74ba9ffac73d434fd9efe64d17834d0b5bcf0ba
-MISC metadata.xml 465 BLAKE2B 184f01f04e05ae8e344b8f8de0f46654d1e663c88c563cbb70c88a3d2815d67761b6054454734dfe9097599301ed8053db1dd56a34d2a83d47e9a4a64b717acb SHA512 54d6699e8fc5a291b72626c53abe99cce2ff803389b8f3258acaf72db28cced92cfe4a86407cbb98a80f3ecafdeff322d36f8e66c7fbadcf73a9956c293abbc7
+MISC metadata.xml 495 BLAKE2B 6efed58076ec705d1be08cf4fdc7acb2fc8855e2464d33f553f5acc264a069555467ebe493b76166d6eea5fb7df63a68f1de5ce2528dad44921c65328629d793 SHA512 8b119f8c31a0f36236ce1a1b5beb7fd929aa6ff0e1534787be00a00c128c3e39e52a923a6758ebead3c1b2f92a0fc117caf34d8aec034a0427bed310e8f88785
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index c2887188cfa1..a68d10c6ebbc 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 4b07161a1fb0..2513b1b41308 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,3 +1,3 @@
 DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
 EBUILD munkres-1.1.2.ebuild 516 BLAKE2B a985a7d51023646d0f1d5f663067606c2ce5f87a7e4b0b8325fbc85274bd411d2edaa8fe7b21eb0e4ae19ed7ec05709e6c901cdcf49ad3264b24a92421a77431 SHA512 61b7ff6ae93e67cbcccfd7697b663eda9116d8deded8c9d2864d8d789a87013baaf61fe936eb43b40b76ff19192c63bf555202b2c58d5b7a8ca5972f9f831f74
-MISC metadata.xml 688 BLAKE2B 65040255d996c7256eada45681cd0580caf8922cc53e33d5816c73c73ac5686d6d4c6240e7b5904c22a0944c73f944bec9e565bea5ea53ae51deaebf777a0c56 SHA512 471f6eb808f978275dee54f9404c36a5a39d47c72caa9aaa5f2ad3bb455983f9c46a3196d1246d6830a50624d203b8dd2b68391b09b9b2e933c74bfeb877baf1
+MISC metadata.xml 718 BLAKE2B 75958d4473d05b859b977e6e34b05705fc0368af0650a7ca57ee5e9804ab8ea67d975c0747427583a906989363c938abe196f5b96f03612d7684d8ee85bd0948 SHA512 89ef689f80b8393d33c6137b3e0be7625c26e58d7fb81432d86ff012ca086357fa3a31b24b9789bd43554471faeb8a131d112594d520f0ae35c486c4ad4cf32c
diff --git a/dev-python/munkres/metadata.xml b/dev-python/munkres/metadata.xml
index 0da8fb305585..c7517b699e04 100644
--- a/dev-python/munkres/metadata.xml
+++ b/dev-python/munkres/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>joshua.downer@gmail.com</email>
     <name>Joshua Downer</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 48181afc36fd..9834361a0f72 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,7 +1,5 @@
-DIST nbclient-0.5.1.gh.tar.gz 69197 BLAKE2B 3c6f3e70c159f5209c637caf7d85ba8114fbcb47dec616c2b15db4dd80d4316a55d55f37fa7a1ad40ec3672c449ad1e693de3cefe0b37e8d67c4cbda3dcd6771 SHA512 a19b09d24fa7e6ba892d6cca65cb73bd37e3e13c4413324598bccc143ef0dc0cf91c5a549614d06b55368a1dff2bb8ef97e8079d08620b308b677a9b01740129
 DIST nbclient-0.5.2.gh.tar.gz 69270 BLAKE2B 8365e8097846239f22682784408a944ba6fa97ed71e8a57f0fcd6f87630ccb4ddf3f7a2636aa051342be00d8bac866eec2e259d4c2e914ea437398a562166f58 SHA512 e5c5dae3be9fc37078d358093307f45f30ada67c52d4cdcde56a09846e924d892f6ac98d0acf80207b59de2f4b08f64d12f62b98733e7776cc2a894d6e3516e9
 DIST nbclient-0.5.3.gh.tar.gz 69340 BLAKE2B ef2908037b350879b4494a9676550754b51c218c0b344c8f26882fac63d3de65b37329fc8aa586f71f0fcb24d0508c2aec81d1066021abd4c66ee1b220574ef8 SHA512 16a92bdab931c2cec133389bfd491c9f3f4ca7ff3b11a3eb70fcdb568a0aecb8cca65d5a1fb25ff9a6ed6d581bed04de8e51ac2d856fad386b22aa6a2424c991
-EBUILD nbclient-0.5.1.ebuild 962 BLAKE2B 820852a503819aedb821b50e033c90eb2c5aa95a68f5b392102f5c70921bd9da673f2613c21bd27a5511b6701a4531e316c847642beb619bdc48b8bffba225cb SHA512 ef727ef408af13e654980a8654edde51ab8716f50c8ab5876157d9fee9d66fc5591ef0407d03c8798e2b90eeb90726118cacdd83cc3df78925b9dec42a4feae5
-EBUILD nbclient-0.5.2.ebuild 969 BLAKE2B ac9c965e63e0751f2295bd87bc81150f4abe68410502191ea201fd2bd0cc24f66a461a5a683eb88995b01a613b2e6fb1857e044e086098ad5485f96d955c3081 SHA512 608dc11371bf89bbf3d50033bd98a01da4a3d8f6673e970bc714595ded4d590864b9dcf0799a828815fa2185be8b9531b0edf49965b48ffe0875b18252b40a22
+EBUILD nbclient-0.5.2.ebuild 967 BLAKE2B c3d4b535396ed2c47abb2eb234f81fd281e5387ebd4483d14a6114b11f0fae022b00febabf3922934de0f823e18f22c1fc71b52820200f631df1bf1fefbdf642 SHA512 aedd1e131924c62d3e2dddb9f8621ae4f6e5f6bd044a230991207f22d515ca1fefee1113297c42a2a9c1be6127514730b3e93388f19e2dfd7fe106dc7a950621
 EBUILD nbclient-0.5.3.ebuild 969 BLAKE2B ac9c965e63e0751f2295bd87bc81150f4abe68410502191ea201fd2bd0cc24f66a461a5a683eb88995b01a613b2e6fb1857e044e086098ad5485f96d955c3081 SHA512 608dc11371bf89bbf3d50033bd98a01da4a3d8f6673e970bc714595ded4d590864b9dcf0799a828815fa2185be8b9531b0edf49965b48ffe0875b18252b40a22
 MISC metadata.xml 404 BLAKE2B 72a6751149738e4d2cacf081ae2fc8e960bf0314cccd4bbb2fe7b7edb568c9fc7f6de518b66bc7dde4c712aad07f424e77bf419b9a88a67110258acbf954bf25 SHA512 3430db25e62ec960e7f36bef9ef56341f1aa2654396421071fbfefc9464c815c6ff53b5fee9d66991c144e0d2996db930b5a5bd775c88ee1d5b961a01137cda6
diff --git a/dev-python/nbclient/nbclient-0.5.1.ebuild b/dev-python/nbclient/nbclient-0.5.1.ebuild
deleted file mode 100644
index 89fc2c7c16d6..000000000000
--- a/dev-python/nbclient/nbclient-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/async_generator[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.5.2.ebuild b/dev-python/nbclient/nbclient-0.5.2.ebuild
index 6dfa8f2ac375..ac9c8e17af10 100644
--- a/dev-python/nbclient/nbclient-0.5.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 2f7cc4f5db89..f216b4d9b700 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,4 +1,4 @@
 DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
 EBUILD neovim-remote-2.4.0.ebuild 701 BLAKE2B 9b3594108d497413ab2d92c35ca744b35c0991b277cc2f7042d41c049bc5191edc176a4e1bf2169f88ad9148ba24745a5200452e691f8eaaa9b6ebef6317cfa6 SHA512 e82848595c8c8263b09386f55db706d0898f709ae042f75d62d07d0eac8dae8ae86236232f5750acfba83f4a4d5ece242ab1542f4d622e50470e7c82dce45737
 EBUILD neovim-remote-9999.ebuild 648 BLAKE2B 1b0a4a13373d1839b707f6fea524bea5feaf9eabe3d714e990262e21f3d9765eb111323c5fcbcc2bc8707be33acd4f76305097d7bc6293968ffd20ebb76fdf62 SHA512 c98e9f416f80a0a6910d19c05a8aa49dd0eec68f731d3fea8fc3a6690d1a2e321a0035d9594c3c8b88a1758c8d664d25cb904e306c339a0a717fb3073647ce1f
-MISC metadata.xml 437 BLAKE2B 9a9450a94c9a14df768aa3b7c14cd46e2cb08c39cd1de5b91d5b9eb6ad6f12f4d359a1756f9f59bc034535a95c6f761f4088d03bc61889cff56efe82ac8ce9c4 SHA512 4a1bff2728dfda4de79b6adc9dd84362ed5d44b4dfb6d602ae773dfc40b96538afbbf7197afc840c1809e52ce99844de7bd3eb7a3fc9e64c069aa3a0073aeebc
+MISC metadata.xml 467 BLAKE2B 374fb7a5b5bd4bf910f51c0a688629216576e1990c0d8dcfcc0d2987531b16df4facea20419784bc192fcdd28e0fe22de3a204332f3f7137b6fba8900db60549 SHA512 29cd272d68aa63e8f0865d9ce405914d33045c84177230f024a09c56389613e9365d4dbad7b24bb5cb61ff3778246fffd6fcd26c625755e83a434fc607a46e12
diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
index 847453aa122f..58b78f6f9570 100644
--- a/dev-python/neovim-remote/metadata.xml
+++ b/dev-python/neovim-remote/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 6647d222723c..b6515fa4ff96 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,3 +1,3 @@
 DIST neutron-lib-2.6.1.tar.gz 453572 BLAKE2B 6b79394a91cb7e6efcf66c0c8bab3b722de9a5408182472fa9dfe26b4a6c630889fc9aae0f7f0bab4917eaa830cdb230788d9a3520b4b8a526dbdbb361e0379b SHA512 d2da2b0d73cb5accda8219ced9fb68344a2c75d98a0d33cf5d52e703a8ea0afb3c6bb0a85445e453b512918f1c3fe7b97fa1a587a648e6731205b421c05319b0
 EBUILD neutron-lib-2.6.1.ebuild 1971 BLAKE2B 1ed9006a4a65790bb41b0f3502b0b8a2162c80dccaf07c00e02ae0b2cfd25e5e5c10c653b0f976853a4bb23eef6c5af37481805eee1b4d0be39b9e9d3f4225e4 SHA512 ea512f2e59a0c714b7924109b14cf845edb245e0e43ceb0a0308aeb0512dd409582baee692d739b3c0097c043437c21debedf83ecacbe77c1f696d846ca91ce1
-MISC metadata.xml 413 BLAKE2B 658517cb94e25afd7f2c548c4510272b3b34c6bd288fb2c210556b905160227b17fcbe1e5a6f0c0fa90ed33a4f709d7c0c55f16462880e6d9806f181845df056 SHA512 d04274afc2cfc3ef4ea7cc385eb5e6c5f3b4b06f42d66be6c6f11b8d64f992486a3f47c40c568c86ffe367e2a122b4416e0df676971af43e4e57f4b84e556bdd
+MISC metadata.xml 413 BLAKE2B 61a1181048ae56aae0f062dd6021e53a4b5ebcc485764c5b885f62a1f56327f5a4c1e10b40be31d9b6d920906661131c45a8761c0b96859aa2670141565d6fa6 SHA512 71b756890d76a32e198a24516612b947f4a83509b6a034f0ced4ced951df2be4f9c1d97c11b5db571ec6f2ddd97f1a9c77713a60acbd08cbe2f6dc3b38bf179f
diff --git a/dev-python/neutron-lib/metadata.xml b/dev-python/neutron-lib/metadata.xml
index 668c3f477945..e35c56febc02 100644
--- a/dev-python/neutron-lib/metadata.xml
+++ b/dev-python/neutron-lib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 35fae66c9bda..42556a24f46e 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,3 +1,3 @@
 DIST node-semver-0.8.0.tar.gz 18449 BLAKE2B 171374808e18b1f3fc2807abb9b99ecfe18a392afbc59ad056f0524e374ef4a27e5a56acf0c3927c6f351503981d743e4e63f108bf0e5bd5eda62f04e24191d4 SHA512 665ae0dbced16e0f05306614b1577464aa1bdac666b35cf2e7ad4b8844a6814dc7e8672f0dff3043c7bd048aa455d671efd268052ac59166293b91d1dff17784
 EBUILD node-semver-0.8.0.ebuild 755 BLAKE2B c1162c42ac20fdabf24cbe273d89fedd003a2712d77000027948b9f70d13e6cc80e97ea5a3b7a2b97194c480f62461b22454a1947fe4e1b8693bc35fcd813612 SHA512 32c081b68a7a89b19b88553cc800c58a8ae513ecc8410f8d16fa8ef319ce7c849b4f5bff79eb9d84ba24c6b4466864c0803aad8e0a96ba6f4669c535a3cdc4e2
-MISC metadata.xml 605 BLAKE2B 7cfe8d1f1753673c5a5884ae1bf5c036c781eee42276b6710a95b017f94ba377e6853fa57d9a3db26cf06efa18898aa2af5352ca208b3da7be1b477328cce73b SHA512 2e9de4eb6887f874ef872f0749d103098e115030ed705fe6498b60789e2e75883c3fe210fbca7f48c0eaf379393a81adfbeb385d886ae22ad87d1250bbb63981
+MISC metadata.xml 635 BLAKE2B 9112ff9465958d40a959344f23c1fd703b8305cf580a16b8491ab478a005d2adf57870eb846ccc81de354e3eeab190de2e10156ae48ca228552b6437ca57aed5 SHA512 e5d5cd9aafa495dfea4538bc6c322986b1d4187d3e9c3bd22bd37cab8e1cb00a9fe0a28349500a41f892f6750b27aa598eab5b8932867fd6f61482da29870d9e
diff --git a/dev-python/node-semver/metadata.xml b/dev-python/node-semver/metadata.xml
index 94f09142203f..02305b859bce 100644
--- a/dev-python/node-semver/metadata.xml
+++ b/dev-python/node-semver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luigi.mantellini@gmail.com</email>
 		<name>Luigi Mantellini</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index c21f4bb896a4..7376e58c3dde 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
 EBUILD nose_warnings_filters-0.1.5-r3.ebuild 516 BLAKE2B f6ab900dbf0a6f12253519509470a7053da3b1c00507bca044ae69a09d24fb61632b97686347d85ed8cec20474d673981e71bdbeedd79131ba40d743caa72270 SHA512 0a8125aa001e2a381358221dff6dcdd2b7bf825001f9f2bb7ffa40ea1e41006616a753737f1d68dafe4685ffd2a216c7eae2da7cc32b20ca97e4e5774447eb55
-MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
+MISC metadata.xml 393 BLAKE2B 2d913eafaf1a4ed0f91821c1f762365da85e445d8960f964044bb9facf9e099790e23fbb0e809fe256857b118dd282e9dba09e75e2d048414afbc1a21045ced5 SHA512 9e366f3dc84ea9488c736cd1165317d9886cd37362b61e1579685a9e84899ed3f9b92fc36d7cf72e26826f98e70e0ad4de7aaca462c1b768a8e0db703c1e0a86
diff --git a/dev-python/nose_warnings_filters/metadata.xml b/dev-python/nose_warnings_filters/metadata.xml
index bc60ad566a29..f62fc771d57e 100644
--- a/dev-python/nose_warnings_filters/metadata.xml
+++ b/dev-python/nose_warnings_filters/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index a49e82b76848..c80fc17e92a6 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,4 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
-DIST notebook-6.1.6.tar.gz 13926673 BLAKE2B 944f92d468ade0f0d3fbe01d46cb2893866fca067b48c6a6cefe653b9941bbde0802c7d9ee17b493bcf6391d1b0a77e710f5b5c8f1d58ec692b40753ac0692e9 SHA512 d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040
 DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
-EBUILD notebook-6.1.6.ebuild 2365 BLAKE2B 3b276558ebc84b23adf6dee04f157692b4dcebde15f868aed293227e24573f48ad5a8f4bb9c2af956225b996c4ae53e48fe738b67ecd612c49c22e634e02174b SHA512 4c20c79fc25cd21fec5b76a8fb5f63cb5b1fb0b389d02ff6801233dc67d4d1dd7b19660b97d721a5c9b496e9593de34a3ec4026acc0c65f9a72d3311a468272b
-EBUILD notebook-6.2.0.ebuild 2366 BLAKE2B 1e08d8141a606ba583fe3a5bfcde87b368e5b62e8d6a96a1f097d8ee2db680181bd59c95d4f05f3eddbfb119a974c9e81061054191e5dc8897aaa8a183cfc4c5 SHA512 5c0653d82f673f625eca9e171316966fbc819eb27a43f400592256fed634999b1da79ee5e0d49fdc45ec3d1892725f73f10f776e42cc71c93fb478c610b5e574
+EBUILD notebook-6.2.0.ebuild 2364 BLAKE2B 4bd09e25ae0b924706f491ed6672a7f685540f3f047258f6ae97c180b64eab2b8b33e9a34bf7178d6d23ed73a7fff76720d383973f6e9b6b8c6b6269576dd13b SHA512 c51b9d74be2e6a40237147814c740f9a8f2f15c084670b956aff57b62a330f0eacb6f625232ffd3984018de807f790a96672cd5bf166c4fc4adb918445f7b0c3
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.1.6.ebuild b/dev-python/notebook/notebook-6.1.6.ebuild
deleted file mode 100644
index 27a1e9d27f90..000000000000
--- a/dev-python/notebook/notebook-6.1.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# require geckodriver
-	rm -r notebook/tests/selenium || die
-	# trash doesn't seem to work for us
-	sed -e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_manager.py || die
-	sed -e 's:test_checkpoints_follow_file:_&:' \
-		-e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_contents_api.py || die
-	# network-sandbox?
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_culling:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	sed -i -e "/'bdist_egg':/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-6.2.0.ebuild b/dev-python/notebook/notebook-6.2.0.ebuild
index 095c5d5f72c3..2308c2a8f0d6 100644
--- a/dev-python/notebook/notebook-6.2.0.ebuild
+++ b/dev-python/notebook/notebook-6.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 2f5b7be41e6c..90e51760c4d8 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 EBUILD notify2-0.3.1-r2.ebuild 727 BLAKE2B d9f5bbeda7365aa426ed34c64c505e8fd47fbb4b84259add3f15ad5b3a5408e9db2967764c140963a92d3e25a7d27915391f21dbde87c83816e258a147558578 SHA512 9a14a919cf90bb572d6ac13813c714e73a213ca2a92e17ea041681af3fd294d4fb75a9f0e262638729421e84bd89a481a27391376e7d263b9bc980338528e342
-MISC metadata.xml 489 BLAKE2B b8008265f01e94b29af87b7ce88f599b8e9bd9d3b770b629b272a63adf4ec9c853f50be4f04db466ef3cd7efde409ab43468e78ac440bcd97fd830545f4345eb SHA512 cb89316199cea678c8d8f890f0dee36f27e27808b8c87d735d9d2e60473a65fb7597980ef948259eea4e6ac61899d7d2949459e33d92b7693b62f11920e1578d
+MISC metadata.xml 489 BLAKE2B eabe7e987fab3a3fe339557ee676125ac7bb5a5e95c2526e96d5fde7d37b0c43eadd1bc83f367e2aee8798f69263c7b35c6328b4efd315a5f249d7bbc02f248a SHA512 1510250bad67679a9eba2e5758512500b70bf61d428c208fb6427e75b69886df94f19b6c3a57bdad4427bff62b04f33fba0c5ec4ddba6b96be38a1b1af17f015
diff --git a/dev-python/notify2/metadata.xml b/dev-python/notify2/metadata.xml
index eae066226980..90626504f894 100644
--- a/dev-python/notify2/metadata.xml
+++ b/dev-python/notify2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 27a2d694af49..46c5c872aff2 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,3 @@
 DIST Nuitka-0.6.11.tar.gz 2582563 BLAKE2B e65c3a01f3283b24aadefc47a17a41ebae116265946c24f2225fa7f3f6f824a0a822c76aa2fa1ff33b5a00d4d3762bbac7cd0d090d2627274155b13a48d8f0ba SHA512 c1ead8430f0af3a20d7a14ae3cb34b9a4675c18f0c775e8833b5722cb0acdd8213b28639e52067b3e6758b8b6cc516b05151cfd85560630c92b872dae05a88b4
 EBUILD nuitka-0.6.11.ebuild 1188 BLAKE2B e330144fc75d0d8ac39391ea205b221672f8b93f4034e14e978bf4e9a306fd8dda244ed9184edb1a6c9fe8703f89f60ffad688216963246b4bea54e494026513 SHA512 ee23c9d30112bfd85e7a313fe2cb044d3ab1eadf7ce97d1dc03219d9c1a444dd1414e04794f50bfa87a096d0b33ca58792757c7cfc120ba10cb84d71dcf1295d
-MISC metadata.xml 811 BLAKE2B b82c8f4dbb8b39e58fae657df8945060c91fce0eb33f0e1e16ecebffa91c41fd306e8c04bcd799dc736dc3bdac3ce843f30af04b18bb4d36407a43c07ec65d12 SHA512 368becbd858e0963f23ceffa612de4f15087a9b879d3a4efad209668a5c897d7881b82c0de9127d31208825af39c60785601a3f31f3191af7fe99285f103d18f
+MISC metadata.xml 841 BLAKE2B efca2f349ecd0eeff87ec403e691102ff6f8a2a3b6e61ebe463064d4b4d7655bfb09a7fee840371b64df4426f8e9f6db0d801e9e0c5bb020c362bc9eeb1e9c93 SHA512 3a32cf40d2c9f66e25a7410c2fb2dff81e927f4bba6ad492b5a9f127914678d23d2fe3d73cee540bd4f336995bbbec5efa2fc05b38eec30333c313f2b43599cd
diff --git a/dev-python/nuitka/metadata.xml b/dev-python/nuitka/metadata.xml
index 1fe2db787345..ea8a6d087e33 100644
--- a/dev-python/nuitka/metadata.xml
+++ b/dev-python/nuitka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Oz Tiram</name>
 		<email>oz.tiram@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 8e7f8848e282..94d3c7d0f9cd 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,3 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
 EBUILD openstacksdk-0.50.0.ebuild 1327 BLAKE2B 207b2be9aa48232bb8be93bee2f464a415c5e52224173d1dea7db0b72a48e8c6a68f22b3c77f592f639b5cc140001ec6b4b1eb0582e34f943e41fa8865bb249d SHA512 a99a96a8819ee99795090790a2e7b078f292a2a22ca1ea3f2fea2a4fec40a6861b78648d955c54059aa1cec2241d1fd81a3a49ff42a9207c6bad88a8adac5430
-MISC metadata.xml 422 BLAKE2B 494677b8584cbe66da574453bcd96b7064788636c4a8227765575e54ce9782f0da98e0fad87ed5465848b2f6aa87df8be2650aefcbf2c432ec567f0bc62bf93e SHA512 349dd1957e47f53229506d7e93c947c9e0d5a2fd6d63000590d4c5b0eedef6a1d0e2e0fbb220180446a2920fa56a35057328252ed281b98b3720fadce2639c8e
+MISC metadata.xml 422 BLAKE2B 57e22147ab28f2b4be494dc46b385575826275561dec468e72c4a1ccb753961cc57b5dff26fcd392c302fdcaabe7cbbe1418fd32bb1064a5c48c5d56a3a2a6b5 SHA512 f66f341a5c0ad49bc89dcb8e167c2c6caaa95f7b52f6729300969196ebba9eb48616bead34031dd1633224161117200529a3e0a2bfee7ad9e25bf5375529bccb
diff --git a/dev-python/openstacksdk/metadata.xml b/dev-python/openstacksdk/metadata.xml
index d8907f230220..b52cfc9e9d77 100644
--- a/dev-python/openstacksdk/metadata.xml
+++ b/dev-python/openstacksdk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index b0f7ee536439..48821ceabc7e 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,3 +1,3 @@
 DIST ordered-set-4.0.2.tar.gz 10658 BLAKE2B c07a4f48a6b0bf74ab11dc25a2d85c401bbcde825b63ff4d6e3e6ee12139f22d803bda3db57937ad3760c0c665f0ec3b44bcaab832c2604148dd0add350f515c SHA512 d7031ae90fdaf116c27415170a7197be34ff4b977a03684a6fb53dc453845a97cd32b9666ed3ae58fb7bc722ff3b2b4f2e156578841033759b490b359a5619b4
 EBUILD ordered-set-4.0.2.ebuild 424 BLAKE2B 3634b29581ed1347587c1d7b755283755ebd76e40be94f40dbb43f55f4b52bcb5b7b0a823e5710a6083e4e5d7232a05a97e4784226a05d705bfe9b41297fd36e SHA512 2473903b04f686b7badef902fc7b42fe2009f8f719aae84a9b6ed4d22f9d0118dbaf184161e4ce83aeba4bcd907264afd0644ac89aee474422d461085d2f26a4
-MISC metadata.xml 622 BLAKE2B 1167641a84aab10005d9444ace4e2029b90db6d321b48541ce3d77330d10ad4c7e6bb5e8eb86b30772b745d27e31b3ab90a476f268eb834d414dcab3e68c6a2f SHA512 ffb270f086a8b81c1168ee3ca44e88dd0ff3f36d6aeb8695eb28f5c11ef7b23695e83eda5bd1c9aace2ba421e96ee2cf138674cdae97fa3b75cb696c0a9a4722
+MISC metadata.xml 651 BLAKE2B 4d5d41e1900c11830a2412f632a8e16bec514a02fc235c7c1a8c79f4fb27e86366707951caa9a547f94a9bb4636f80373d8043dc610efce4ed6fa26e6962ea83 SHA512 5b70d63c9fa2cf5b087df88824fd162fc99970d84b99b683f2fe8c517dd7913f842a805500a666e4fa11d3bafff9efda414c9458585339ebff2dd6bf250c0214
diff --git a/dev-python/ordered-set/metadata.xml b/dev-python/ordered-set/metadata.xml
index 91e03d714ec3..d5edf7e27f85 100644
--- a/dev-python/ordered-set/metadata.xml
+++ b/dev-python/ordered-set/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/oset/Manifest b/dev-python/oset/Manifest
index 68d4b1489c04..01667438b077 100644
--- a/dev-python/oset/Manifest
+++ b/dev-python/oset/Manifest
@@ -1,3 +1,3 @@
 DIST oset-0.1.3.tar.gz 7345 BLAKE2B 1ef3fc6e0acc0bdbabb139a968ada851a0b1f19785b30c1f65bc3205600ae868add111487404b0e71b03cb5c2fce9d3991c32c5b0034ead62da058807efabfe3 SHA512 d34d11e76740c85a41be3d055710fe08afa7de1839ae43d76c152aa5838dad5895f0a0d95c5a2625a94494fc462e08f79a7614756ee5748c35e434176ec21121
 EBUILD oset-0.1.3.ebuild 370 BLAKE2B f37ae2e55496a4cc8af9216461790b1233ff2480114728b775b88d3ab68dc51a002a6297ba599ad04782a334c4dacce4752673c1f2eb2848dcd88962f5ba337d SHA512 61769509bf1a14e698278e12b0fc555fbc366c5da3c123a115a9551f900c3bca44f0c9ba753f872f50744bbb6d3b8cca4e0827843120d32614898c59eea27b63
-MISC metadata.xml 442 BLAKE2B 17ca75e361ede71e3aa3ce26844a3798d85dac16e20d0fe5fe1bcf20bf4eac76b54b64b5694e9e7c58573087508a7c67753351ebae4a9578c94c24aafaab526c SHA512 0b0eb11ab18acc4e3c16d1917b7bf5265eb6b87481defa5ef9d22daa204ed92c0e8d00c9317b63068001d0111cf6af994e0e046d5e1043658f52477c7389711f
+MISC metadata.xml 472 BLAKE2B 1c278571adea29a16c713e8eb917932eeb05440f5520cf5a59f3dc9e061d380632a0d0958f2a004c754cabd01ea5f51bd9d634f49d71288daffac0f7d6006956 SHA512 4b216bf306b3caeb799716172888f8e3129aacbfcf9e333ffef1b65e336ec12dd937f388a88bc9ac71f5c11931ab98ff8e39d4d69e6464fc011b12abbec3476c
diff --git a/dev-python/oset/metadata.xml b/dev-python/oset/metadata.xml
index 4df6b944a7fe..ce5437234e2a 100644
--- a/dev-python/oset/metadata.xml
+++ b/dev-python/oset/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 7440a2a9dfad..6c94838dc840 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-cache-2.6.1.tar.gz 60918 BLAKE2B 89def6f66ccb68e8725571b4f9fcc8a98c8b18dbb23186b1ed3cc09ae02eb786608c744f6ea7022fd3a832d206fe75916f74f2c000125c853993dc95f13da8f3 SHA512 20696d9a9feda9368fc261ccc124ab825b85373b2716110dcab7101346467dbf4d9e8a48b689a76ca837a8c4e97d03476b3573623ac57602f5d0e558110dd551
 EBUILD oslo-cache-2.6.1.ebuild 938 BLAKE2B 2d15aaf05aed84da1be8c102caa07c609e64b6518d850acd6d2aff5bd4771e83f34ce695acbd6c4074b576faed3f593c521565063230b2968d976eca79975491 SHA512 8cac051ee93314faa3376dbcc00dfc34aa305ab8d90a150f217c79ff84b4e99f82f5f0134f8a67d9588188540bceba723a1f0be8dd378639a0012a931766aa19
-MISC metadata.xml 398 BLAKE2B f9997c49c6a17064ae392ff66df20172b131e2a6df98a2ad9e86aeb111d4cba231d553cf934f513d5dbe22da01e496083ea3baec31004c1058aad5722528199a SHA512 68cbe59a88b5df92314715c25ff263874fa64193da50899c89bf9f0df2f065769d75b643994b7c57101bb9847345758bb792a649d0f7fd53a06ae85de9161abd
+MISC metadata.xml 398 BLAKE2B db4ba821023354815aa4d25d3603acf1ac9e1acb335fde9b3b9deeb8d1f963f75bf08c664a5175d23fb14d048d4f6631c4e5756e29335aea2b0b41cb1c2f2d42 SHA512 721e447a7d09b1c39dfb29bb60cb77b97eb58adc76a7f673b96238be9aff0f5a235f16ea739aaf0e372b57194f599b6fe9cbbcc4b1e4b0acae3bc2ff1542fa1e
diff --git a/dev-python/oslo-cache/metadata.xml b/dev-python/oslo-cache/metadata.xml
index 15c761858c57..1ce09e717369 100644
--- a/dev-python/oslo-cache/metadata.xml
+++ b/dev-python/oslo-cache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 3d8723531b3e..34ce7c49be17 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,3 +1,3 @@
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
 EBUILD ovs-2.13.0.ebuild 484 BLAKE2B d3c32e970e0218d6f90d2854e908ed1917e8c8051dbde803e97a6298fb48e7f2b5af90b3b38cef3714d28a56f50a911234c0bebfe9ed7c3c87cf04780b23bff0 SHA512 38574730e3aba44d029952023fde8a845c4efa7a57ff3c7e15669bb9525a2c4f702d5750d5d6890eb9d3a6b510aa133af237b75e88ae8342f85bd45a95589d18
-MISC metadata.xml 375 BLAKE2B 19b2550d0f82a3aa091d80fe888a2d1d1ff657a8cd74da54e47a5d7a888a8180309385b1677fe99fa76dbf94547f7686ddcc5abccec70b711c52922815f3f969 SHA512 c30b29dd16ce17b01bb126ea62b15ec72e740584e50ff5b329e29902969c080e7761fef4aa59900ccfb8a87aa38205e59afacc765cec513680872d53726e7444
+MISC metadata.xml 375 BLAKE2B 82239250acaea0ebb9108d9797e33ce0a22a8a8d99da19a54066426014e684c52edc3ae9e0099078142de0c0fd2006d1a892defabaf873341dd2876bd262706d SHA512 bcb2340395b1f5525b4a82824f531c7054182c42ff7dad23740a36d93d480f733230bbc7a32da6c9f23952ebc9792917f31d5ad8775eb67e25f22dbf7c915e39
diff --git a/dev-python/ovs/metadata.xml b/dev-python/ovs/metadata.xml
index e4b456ef3e39..8240249c65f9 100644
--- a/dev-python/ovs/metadata.xml
+++ b/dev-python/ovs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index ecfac83718ef..f36595a4977e 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,3 @@
 DIST pandas-datareader-0.9.0.tar.gz 261026 BLAKE2B dc8211ceb718124095896dce9de0d752f2c5c7bce022dd5197a6b3851ad8727e298b34d0657f76c9c40ca31b1cf76d8a467af251aa9131f921990e6f4f9ec25c SHA512 5ef2e06b6d02e2bc213387f8649e02c9ebd6df679da8ce433d4e8dd2c66e8cbc214a9cf9a4bc83ac2c7ad917cf72a9e6b09c9398623718736114efdc2c3e2815
 EBUILD pandas-datareader-0.9.0.ebuild 966 BLAKE2B 4c6f49be7b8b57dd9167046d665109fd45fe96889416460e5fb55e012dd0c4ba03c05a65d87bad462336fd4ac17a7d564869e24cc58c883c3ad85d9a2600ba00 SHA512 1bb64bd7cb35e8f80e3f54a86737fee4222f2052944ab6f31a63a2e5891ff6cdff59ec181ddfa5674cb1535d441f9f72c95002a45b42d05702457986ec314f6e
-MISC metadata.xml 748 BLAKE2B 70a14a335497d3442aec1f3bb178df945728622aaa31d990083f277eb4157b32b79462d2a9b6c2dab1f64bb776fd712c2156c309c236ab63fd2e7f6a5729feab SHA512 2dc752a690dd84ad0ed7b56002f6991dfc3c9fc1c9c21d630dbdbd7f69289e3b97c68fb8d3b3a512cb11041656dc4c59bcf6f7a0279e093b7845729ea2a6dee9
+MISC metadata.xml 778 BLAKE2B aefc06a42b2978ea58cbdd08eb89421205280459a539c6e98ed2f4930f8f9f790a2d2a79a10efa25a6fa65a932cec64a49cdd0bf64c78b79951d8c06917db7e1 SHA512 e5e31c35cd34c82273cde55dfa51b0513fde2c4e69b6db9c2f0c83d8cdf53b85f42dc02ccdcfcead16f9e7e5d457f598096056a88b6ce419c30b645737170698
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
index 13ab35c61692..7d9f908e4599 100644
--- a/dev-python/pandas-datareader/metadata.xml
+++ b/dev-python/pandas-datareader/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 8a6d840e87da..553f1573f852 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,7 +3,7 @@ DIST pandas-1.2.1.tar.gz 5459053 BLAKE2B 49d99e7217d52f1233cdff20628da9028b7a8ce
 DIST pandas-1.2.2.tar.gz 5463571 BLAKE2B e27e032bb9d6abb6f40d1a15bc7e9796690f0bd099e5fc7704cbd5b40b37c0f277b462116bd7582263abef8f728d3109f6c4c425cac427f0c750b019fd5e8ad8 SHA512 288ec9f3a2042c2a376340ddc25b4e2d9d3c4de146468316378269d4b70fb271241acb9aa5295415d8bebabad859a9ea9dc95aa71a68f06c2eba73809b9b30e2
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 EBUILD pandas-1.1.5-r1.ebuild 5874 BLAKE2B 01bfc318109bf7234187748e7f2907534bebe6fe032a991c56c479ffbf068199094d8aaad6c10a64d1afe84d2bf66afa052cc056187f01e36e1b52a5d617c898 SHA512 1ef0dc09e253691c9df3207c895c867203180f2617216e6291e909bd8a1bc05155f6c6e830a13b4657a5bb3e976be7a0f11f3e39ad3c5d5e05913ef6a1b00e00
-EBUILD pandas-1.2.1-r1.ebuild 6183 BLAKE2B 3091341a86a89a0c1424b77ae716efd2ed28594b285b87ef491503f084b54556121270f307cbbaa2ab34d1200e3ebc394859951d9c6cf63b393769d4d232f396 SHA512 5df3a288866cab94f0e13dfc32d68ad1bef7cbbb86197046a0ae871698d22c34c000c12ec24803a15d51df8c4001ad51e3543a1620953e8b2219e3cbc3ab92c5
-EBUILD pandas-1.2.2-r1.ebuild 6184 BLAKE2B 9b37c5e90374b0dc1ce93c7446fa149964e0b731f6540c7d18973e67afc0d851984100ba7128b6a9a617af013eefc2ff225916799a9c4aa5e30fa8814a5fc58b SHA512 331df46bd67535831ae807ab7c3d889bb177907187d7c66627901ba71e62cf553cded809b1e6bba3f30db67fad937488e47313a3fe758022e97bf3154a5564d1
-EBUILD pandas-1.2.3-r1.ebuild 6184 BLAKE2B 9b37c5e90374b0dc1ce93c7446fa149964e0b731f6540c7d18973e67afc0d851984100ba7128b6a9a617af013eefc2ff225916799a9c4aa5e30fa8814a5fc58b SHA512 331df46bd67535831ae807ab7c3d889bb177907187d7c66627901ba71e62cf553cded809b1e6bba3f30db67fad937488e47313a3fe758022e97bf3154a5564d1
+EBUILD pandas-1.2.1-r1.ebuild 6197 BLAKE2B b79d9a3d6ee85f59d8e1166baaf18d22e7ea48153b64e18b95306007123598ee0efc38b8653ce3e607d911261f4ffcbd3d233d8f0660b158a058e6c58463cd69 SHA512 2f9ecc7c9c3d9092edb3b024eb31d1d31e3c3997e34cce041fd0a9fc09858fa4a2a50616b34a46245af959b8e7c4d11ec7b70c404eca900d217de458ba551476
+EBUILD pandas-1.2.2-r1.ebuild 6198 BLAKE2B 87cc9f91dba3c24462b8bf2e06e67e16ce4808facea7f0eea171a8b54cbbc844563ba644e9b81041282e85e2fea53e1eb885ef57d155d8bd138b747d82245591 SHA512 add13e762742eec440f078c8f7b6ebdc6372f4b0308397b475828983b4f8b0383360ac9f24cf6f9ec7334805e95a01e1c0b5f4246fe3cae07706a9cc29ba787f
+EBUILD pandas-1.2.3-r1.ebuild 6198 BLAKE2B 87cc9f91dba3c24462b8bf2e06e67e16ce4808facea7f0eea171a8b54cbbc844563ba644e9b81041282e85e2fea53e1eb885ef57d155d8bd138b747d82245591 SHA512 add13e762742eec440f078c8f7b6ebdc6372f4b0308397b475828983b4f8b0383360ac9f24cf6f9ec7334805e95a01e1c0b5f4246fe3cae07706a9cc29ba787f
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.2.1-r1.ebuild b/dev-python/pandas/pandas-1.2.1-r1.ebuild
index 05a432d36557..e8005c2752e4 100644
--- a/dev-python/pandas/pandas-1.2.1-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.1-r1.ebuild
@@ -141,8 +141,8 @@ src_test() {
 
 python_test() {
 	local deselect=(
-		# broken on practically any hardware/CFLAGS but the one
-		# the patch author was using
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
 		# https://github.com/pandas-dev/pandas/issues/38921
 		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
 
diff --git a/dev-python/pandas/pandas-1.2.2-r1.ebuild b/dev-python/pandas/pandas-1.2.2-r1.ebuild
index a79b5b1c18ca..5ff9e82c2133 100644
--- a/dev-python/pandas/pandas-1.2.2-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.2-r1.ebuild
@@ -141,8 +141,8 @@ src_test() {
 
 python_test() {
 	local deselect=(
-		# broken on practically any hardware/CFLAGS but the one
-		# the patch author was using
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
 		# https://github.com/pandas-dev/pandas/issues/38921
 		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
 
diff --git a/dev-python/pandas/pandas-1.2.3-r1.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index a79b5b1c18ca..5ff9e82c2133 100644
--- a/dev-python/pandas/pandas-1.2.3-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -141,8 +141,8 @@ src_test() {
 
 python_test() {
 	local deselect=(
-		# broken on practically any hardware/CFLAGS but the one
-		# the patch author was using
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
 		# https://github.com/pandas-dev/pandas/issues/38921
 		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
 
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index 26c584b722d3..e2d81ec83cc9 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,3 +1,3 @@
 DIST partd-1.1.0.tar.gz 35497 BLAKE2B fb9461daccd5f3215471b201bd30be1fdd499f929490b1819899c7396d1d541fa46c629c26bcef5567df259ef0de1ec8effc3b7b498dec0235a4c0117a1c6014 SHA512 5e26c4a63fc2f9a290b211c1fce291da6b3354b4d0fdf941d29ddad1252629c94275ac360d33c88d11ff4e36a4f4d6bee42edd867c92eb7ef0d2697472c9a338
 EBUILD partd-1.1.0.ebuild 723 BLAKE2B 03ea30e316dce3de4941146f4030253f7c2603b8643f9b1cac375a415528ef9e5463363dc86dcf2fdbe66a836f3828a1d35e99017d1c15c2629ebbebc4c0bc9e SHA512 8a3b50b6769fa81ab83adce49e7bc85b89cd17cebb9d99920ccb50fede5f22e253277d1f066e051c06f17f8634eb45bdce25ee942c82b8c0f0cdc3d7e0e78f01
-MISC metadata.xml 693 BLAKE2B 54359382c87dccb8adbac9fb9adb2d19a1f633f493c1931108b58143b7ed67ff8f0098d7dcd5d9d1582a99089d28cbe5c0f05412afd06d7365f8611256599412 SHA512 1adda1906f8aed4bcc47a385007dd9a8011ffd335fd0faa9f5fb30ea11ae2c547a941a2d1c1f3e3bfd34d16171ddacc651c0e0cacacd8079dc708e4cb3b9e8c3
+MISC metadata.xml 693 BLAKE2B eeef98e5858d164721e62fdd97dad746d228423be302597c0cbafc2d4835802f33c10b63744c98fa52a11c1089888781d80555f3b29c993860c0f668c250c0c0 SHA512 eab347512f7b6519d61afb10fa404c311406d7fdd49d4525205da719f48c7688e0fa4dec52e8ea2933a50a4981f407680d8d36b0865827e85c4c1e8b3a5b3b47
diff --git a/dev-python/partd/metadata.xml b/dev-python/partd/metadata.xml
index b784f51ba4a1..92b723e68830 100644
--- a/dev-python/partd/metadata.xml
+++ b/dev-python/partd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index eda2ab001da6..4d19d588219d 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
 DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
 EBUILD pastel-0.2.1.ebuild 452 BLAKE2B 950b31500751b346130dfc0dd42d1dcb9376c3718e3bc3b0b13050ebf2755b00c5ec85847166b9d22894bc03f684dbfab1c9fc1fee6baf2d2d9bdbda57b6fb6f SHA512 ba55488c57bfb59a05b79e68a06b6a81855d9833629c149d73625dbd521692a01d82bea3b98670a6337cd3881db0e78aed1fd5c7018e9b9c8ad1d581053286c1
-MISC metadata.xml 536 BLAKE2B 819da0904b2ec3f82cb2987ce164877d252cf84126d2a87fece657268380db9b27d47462e5e167d8143b7afb003808bd6e548ee5637ade4ea1c6f99ec0de8bff SHA512 ffdadc491018b89a11f0d64c323c1d3521b0a5c151253bb2d650b151a432436e3c0eccb3675b08385d349c4a61f8c889c54291ca557c367f9513290107427109
+MISC metadata.xml 566 BLAKE2B 73c98f5eba401f195c2069f7332add8390d4d67ebd33da8c37ac493a389d0c41f17e20abd862f7fdc377a40fa1b70be77de01f1cfe12795d4bdd74be8e111bc4 SHA512 30344b137ae2b9a8a632c29292561d30ea7a7c006a289612a1ad6eed334655584df0a61ea4bd79d481cab488357354d23bd033a96345f12996e2f46449b84cc9
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index 3cd8e1fa015e..042366cde629 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/patch-ng/Manifest b/dev-python/patch-ng/Manifest
index 306d7a54ef6e..dc949abf3e01 100644
--- a/dev-python/patch-ng/Manifest
+++ b/dev-python/patch-ng/Manifest
@@ -1,3 +1,3 @@
 DIST patch-ng-1.17.4.tar.gz 168306 BLAKE2B 78067e3c3d296a21f8fd4155fe770245ba4457cb9e37003f5e7667c30827878a8c06d62c77bb1fdaf61b96a813612a7c39800d7040b13a9d18f0baeccbd86ba1 SHA512 919c04c3adfa36672f3db5f1761a12ccbb08ccfb890015bb0d27b1801c8c7dba99c4da01674b269703a7cbf39df5889f5c446551bb4cf7039dc383c23d8a5db3
 EBUILD patch-ng-1.17.4.ebuild 664 BLAKE2B c4617e4c718a4e20b3ae1408e798d513db71b9679cca901b0435b82045e0bf078d223752febfb5f49efae9e1c79939f7611513da6f426d6c6eee86af4a0bcc07 SHA512 05df4d2cfc0e3c3568f42c1651e3f1c42a912e5a6eb7540483459a62c9025728886cec8b613d2c2b7737d31156cb10a170469da4b8d43fe03a8ba0bbe8f6c136
-MISC metadata.xml 525 BLAKE2B 26aa00d23b21fbe597d8f43c36dba421ed607b0da33cd59ffa0f38557b96c4c5edd531b68f164786c0d4459c8f59c0e18ba837e18211a712c65d20f2fc428a8e SHA512 eaafbe66708f645f59554b92bd6a9a84ea9b083d34ac6a5fb3146ee7d13ee13765f57c82d9a6bd97f11f479be25e42e080702ea89ca631e42adc2ec17949e3ed
+MISC metadata.xml 555 BLAKE2B dd625cebae55d5a0e1699c7cd3595947ea9f1eee90dd210150de459b924d57efeae929624ae6fa51f933e6fe8c39305ad2508010d90607405dcb473145c28f27 SHA512 2d94421275630bfc438213f38869152219a06fdaa0cbb5d32b4c4114ab83de6bf49cf4538c817edd1b560f261657d1c50ea9abbb400370deb0159a22dd59dd81
diff --git a/dev-python/patch-ng/metadata.xml b/dev-python/patch-ng/metadata.xml
index 8bb19e7661ea..82672d5c97e8 100644
--- a/dev-python/patch-ng/metadata.xml
+++ b/dev-python/patch-ng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index bf21663d9c70..f81536eec6c5 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
 EBUILD path-and-address-2.0.1.ebuild 464 BLAKE2B acd139fd4d711c5b2557dd04c8b979f70d734819d4729b602c2f0b0b2de9388f628c6c247ef1abaaf2888f625fac6bf82a23b7ebd505476ad8cd99f29ebf01a8 SHA512 b5b5230971f9eb728c6345b2ecd2799517219a45cacad7e114c1599ffb3924223ac9e25d5896778f2186c5582a2dc9cd7939dec344e774074e4930378f37437a
-MISC metadata.xml 483 BLAKE2B 8c9f07db6e59b3644ee6cd6002d117e0d1539b3a886840825fef835019b70d7d94d093303268046a8726f7c20d2ded1d32ba6c39db5bc4e26f4832efcb16b3d0 SHA512 3114dd2f6e876d73596501c46df4458ea5142675bec42244619ac6438f10ff05c454aa7c1f060e950cfeecd106c1fe230b8fa329521ec4f383a071afee49a1f9
+MISC metadata.xml 483 BLAKE2B fbf94e2696f78ef6fcc6896681f099a6e24544c731a713c3c18d40de6b953c42a26aafe1460d2472d4f7666d137f50d8b250c4fdc509b2b57915d1548f2c44bd SHA512 ed626cb3c0d04cd78d5c9feb2148da4eb14f7101cb1c38b3563976b7e4ca62a14a1310d35969839a2eb239ba6584512f8479e0e5ee4a859b9902a2b22adc13ad
diff --git a/dev-python/path-and-address/metadata.xml b/dev-python/path-and-address/metadata.xml
index b83619ba78c2..9654e2a71f5c 100644
--- a/dev-python/path-and-address/metadata.xml
+++ b/dev-python/path-and-address/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 2b42a336bd38..ff580ede14b7 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
 EBUILD pathlib2-2.3.5-r1.ebuild 877 BLAKE2B dae2179e9f5127721ecc002fab5cc8e85c32dfa181f38c6aae0e26375b8e33a2ca5c9327b5cbe38c8e22f6458a0199315e8c1422fe64f333f2e148efec7aad1a SHA512 d103e4307fe96a04bd7f99d624604f0cf9eaf52309da9566be29cce41f206dbac331a1bfc7a57dfc80c2669fb97d8bbda6dd9eed5d6492cbcf0f3a5b618d4811
-MISC metadata.xml 463 BLAKE2B c5e8381d9902bc251a106ec336aa4981170fb7fedf69c4b71ddd884a7e9389d906fb9b51328b80bff434bd69f8103826783fc12f827b30866a1dec5405e63c98 SHA512 e00cb650f5e170feb4186dd440ee85e28ce345447b16264e323a50ec719b19c68bdfeb5c691d468045aa1c57df43e5b12e569b410ec04d39d2d6d1e1c61e2003
+MISC metadata.xml 463 BLAKE2B 1ade185c5ac11844715bf67d798fa910d2fde357f1953688c28d94477e2b5a68613178c8a3eaba42ae8285a49cc94b37ad5a559d80771f763ed06a2dc952747e SHA512 45a09691f2b57c336a752f4a881aa1d91173102d6b89a33e7583e99d13c18610fd29f248287cda00d31bbd265a68f11b60e911644f6689c76c1704fa2c901100
diff --git a/dev-python/pathlib2/metadata.xml b/dev-python/pathlib2/metadata.xml
index c1476c3d72a2..d8ee6f7bfb70 100644
--- a/dev-python/pathlib2/metadata.xml
+++ b/dev-python/pathlib2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 0cbfff86b829..38c85c723a79 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,3 +1,3 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
 EBUILD pbkdf2-1.3-r1.ebuild 513 BLAKE2B 731eef082d531bcd6049376fa9ed7f8ab1d5d3ef18e28a7271ebdeb9250010727925c6512d3b80f1179f90e1dfaec7f0d731bf79472bb20ab72a9e21e15a1e75 SHA512 b534b53657f6fa67a15f037899c277a711ff48ae839bd7efae5455ba2af8b8552be8459f55d1e6e8c65c77ba0e9243e058cfb0d61eda0f2deea62acfaa512d7f
-MISC metadata.xml 484 BLAKE2B 4ce23d6736927047d0ee59c636e9604083c545fc1680ed90dde2465607a20993d17754025f4bd4349e290ba92a9ef34968014e68198342dba92a4cdece01f5cc SHA512 e54cdc2cc3594935b89509a992660df90735360bab5402e81169060e32ad90878d4b08adfa18694127b74970a25c011330215a0ee01eea57c0563c7fd9c02190
+MISC metadata.xml 514 BLAKE2B 49289e7be4afcd682c52ae899c20801d69d148281fd543108ff17c3218d7d2d6cf70c5a8b438e5e54d45aa5df8faf74055cb5a92901e77d9ae946d6dc7689f9d SHA512 ed2fa0998f4f19ac8059c959e0eb350e589a9f816c4da6b1f40dd388f7a4483e1b4e33ba4d8532065fbcb3c19f5613a814c45982ae3c125940e0abce6fe23f74
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index 98439a9b8566..bdf0bcdbf6ee 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 87adb76e51ae..8bcb41915d2b 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,9 +1,9 @@
-DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
 DIST peewee-3.14.1.tar.gz 879443 BLAKE2B f7a1967006e517c56a4a2b10bd9c097e87dca4135038676b096431e6927fa6f0a7e2ad13c036a1a7499a9b3a140a4d4796399f9c1e727e7e8a0770ef3483a3ce SHA512 f8b8bddd1e32e05d75a2f1cc5fcc8b9d98397107e4e4d3b19b444f20f4b8243d740643c858d20fd0ceb8b30de859fe17079fc611ac21cf289c417e1f857f1f0f
 DIST peewee-3.14.2.tar.gz 881173 BLAKE2B d784f133b9119e8c769d4259360f73c801129f1eb498591f716427d54ee518e74d851cec951ebb65605f50e18eccd1cdd9e6b5fbb527679345bb681d2248b30e SHA512 8473cbe8df69c4aeb6d8fe7e13fa5f7e462ad8827d67698e244b44944532289ba7941f4294c21f12ee51378037bc9ba2ed28a9682e61ba1c67a7c04eb72ff6b5
 DIST peewee-3.14.3.tar.gz 881613 BLAKE2B f64a73c9e8fd94b67023cbb360ce4dabfd373319403a7c942a1f845d962200ff432b4b8d84482c9e42bc5251fbafb05855f308b3aed818c14dc0191ef4e84661 SHA512 e8b3698e5c48e917b7eb4f9572590a66d792abe8ac15157935fbcc9478580f4ca41a0704cdd7412f853e63a8750ac2d5d5075c9a67d0d67d5d32bd5c8048b6b1
-EBUILD peewee-3.14.0.ebuild 753 BLAKE2B 3bbf8da2196374f36d4947a258e8b09e078d1618f7f2d6ab91bd47b3e0dfe09b04df345a24a8bcad55e758f857838c1c21425ccc775818057f8905234178ac61 SHA512 e8327280be86e1c60a3cc6fd8ab0894b235f3c8388d95b453dd63e61a3bfd6cec32a0cd718e6746c8b43267bbab7d8c008ef5f742d72738e53129855391173b3
-EBUILD peewee-3.14.1.ebuild 755 BLAKE2B dc9d43fe216113450d0a211fb0d74723a24fc3f895fb33353a840d2a0eb8bed5692a04cead776e5f22107c5306e27e30e1b0d05a07698ea53f9e9004b4186559 SHA512 e607644cfc8305bb00bef66436afa638577fab33ecf54857ad5bd06a72837beb357f6ea794061a876379b8910c877951697d6e222b5a1b2283d534ac337e10b6
+DIST peewee-3.14.4.tar.gz 882123 BLAKE2B e20848eaa7cd93ea5fcea152ffbfdbab694d9fea7ee8b945c029fee8d6c4a263317fbb0506df31d490611a2b2ac0718b0fdbea875f0013eb1f3f71941f12a26b SHA512 261856f4b691b8f5610d041a049148f213c22348a7e50514f7792932c1f4e8735b4dddb8a29c42e583c38e89551df2f05951d81bda0c47a80dc1eeeb0345f30f
+EBUILD peewee-3.14.1.ebuild 753 BLAKE2B 3bbf8da2196374f36d4947a258e8b09e078d1618f7f2d6ab91bd47b3e0dfe09b04df345a24a8bcad55e758f857838c1c21425ccc775818057f8905234178ac61 SHA512 e8327280be86e1c60a3cc6fd8ab0894b235f3c8388d95b453dd63e61a3bfd6cec32a0cd718e6746c8b43267bbab7d8c008ef5f742d72738e53129855391173b3
 EBUILD peewee-3.14.2.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
 EBUILD peewee-3.14.3.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
+EBUILD peewee-3.14.4.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.14.0.ebuild b/dev-python/peewee/peewee-3.14.0.ebuild
deleted file mode 100644
index eed96cffbc6f..000000000000
--- a/dev-python/peewee/peewee-3.14.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.14.1.ebuild b/dev-python/peewee/peewee-3.14.1.ebuild
index 3c298bdb8fbb..eed96cffbc6f 100644
--- a/dev-python/peewee/peewee-3.14.1.ebuild
+++ b/dev-python/peewee/peewee-3.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/peewee/peewee-3.14.4.ebuild b/dev-python/peewee/peewee-3.14.4.ebuild
new file mode 100644
index 000000000000..618fc5042135
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 9a8aacba86ab..44c427f12d98 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
 DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
 EBUILD pendulum-2.1.2-r1.ebuild 1012 BLAKE2B 3e955eea1323fa65eef885518e0773b2f0fe727e420c015c6cdafb95ae8e47b55caf3e21884d69ff3cf367004843ad3bfc584db22edeb2b0bf13ecdfcb5c9d23 SHA512 a980cf7abd15c607ec43ab5761c2c96909d4fb21204099cec3cafd8b3b0bbd91a80dca7d1439ece4eac1308397335c43d9a2f845b0909f58024122039ecd4d67
-MISC metadata.xml 540 BLAKE2B 8a5e21fb3d1e62ab29a72a1a6fbd32be6428f9c33c1a4a9245b3a0c83da045eddcf41c723df1e71ce15c1c52f86a2e8d9a9a2c0c02cbec4f89a6b26f893b9b2e SHA512 c20802488e42236eb7e4192c9c3f8123952aeed089c5c15693d2037d878283ccab4ac79dc80825e0167a115f8cf0defb48cd39228df3f30e1424b8d86c5d12a7
+MISC metadata.xml 570 BLAKE2B 15ae55b156af111ff5291fe2798b288e06e10e3b1e7c7d520fe7a643deafe2d76fa5dba377aface144328cf777b1f5986a1dac44c6b0760d7f6ff0ef9bc1d0e7 SHA512 4c271613e8fe8352daff06611e33463bf5c30b7f796a1790c10581ff32dbac5cff5cd394c9e22f942c1f25715b9a1a2827fd2e78a27fa77dce855139338ce4b3
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 2f9cf790dab4..46260309e735 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 09d7091d1bc4..8c374a83fb61 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -2,4 +2,4 @@ DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f224
 DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
 EBUILD pgspecial-1.11.10.ebuild 636 BLAKE2B 9b93d173d141bad2e04a91026534e9264085e24eefd26f0e43c01c0ca795b57dfe7e93deca8e61bd4d4dd3a0a54873b3c97bbb9c322c8b07d0c92971d36381d9 SHA512 a2e6123f1235fe8af6cbe631d6795b1df9758078396f5d0659afffb6cf83304ba74f752be75143fddc8c10c212ef6703c003fd1d0b7d757749982d71f9c09c32
 EBUILD pgspecial-1.12.1.ebuild 686 BLAKE2B 59bfd0546e6aa127a4511916a7c361f115e2852c9c0706a249289f1dea09ed8db475aaaf4b451bc68d8e900e55dd4f8631339a257dda4a15a3dc8a0e0c76b1fe SHA512 5a52f96408ad5f4454551a89a02a8ff7373a928a11567fc825fd9f74cdd285b0c015c3a97313a99712c0aab9c25771828dc0c69ff80dc61df36f1190bb2110d9
-MISC metadata.xml 673 BLAKE2B ce5e774e5131520d65aacf93e9521aa81a6310b37fbeb1254898f2254d080538d5d0ea90cbad6132faa9af3e227845888fa6b6dacede5f09eaae3fac1b7b6cc3 SHA512 e2adf6f8d7f781a42aab4f2269667ca41fcd1615ba2ef13f7f844efb8a2db74287cf6fc2940e00a1fb00a80d62c928ab083b6e45b2dac216addb731c90a3e6ef
+MISC metadata.xml 468 BLAKE2B 7fb95be81dcba90a99cd8ac20a7eb3bd93d926ab8da91d328806fd5d6516a8f32c46ba8721a9d490e1243eb2f1954e2ca35d4543bc8df0d2c53f60dc280a8a5a SHA512 7b558945ce12f4be5c135118b3ca4d9e565ddf5ef978c0b84af6687e15f2d26efdcf27f55efc1c85fe7b9a023a506cd219490d2baf9607cf099e921b0709df0d
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index b02c554129ab..2e7271b51206 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/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">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		PGSpecial provides an API to execute meta-commands
 		(AKA "special", or "backslash commands") on PostgreSQL.
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index e83f3128fc5e..65c63e44683e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,7 @@
-DIST phonenumbers-8.12.17.tar.gz 2257177 BLAKE2B fb47b020d78c1f91973c5a316b1c08dafaa7847650c19ac012304f855701fbe6ef5068c26c125a52c69bcb02c68e7465e376f5f521c06f25c92402d60416eb6b SHA512 59999dd64c78d69cfe39c3fff7ac41e57739e7363073fd871c7ede6088e0b32085d92e560954cdd3db1c986cb2f17f884fc2ce04b23cd7d10eab1ea4b8b5c4be
 DIST phonenumbers-8.12.18.tar.gz 2257229 BLAKE2B dbfea2209ffa671eb619fffd8e10da793718b36dd193eedc5ea02ffc69bc967a5ed7f6ee2cf6dd2b85621d3b9dad33c552b839abe7597155d702f59a3a8dd140 SHA512 01efb25e5f47b314cde706c8d064fa6c3e6b3ceb76be775fba456720036bd69d95fb03b775a4c510dc6d7cad662a30208839f93fdf6274f82488e06ef35ce508
 DIST phonenumbers-8.12.19.tar.gz 2257568 BLAKE2B 6e464e1d86485518b6d891a0c57ff86f3d7ecfa3f67316e85bd3352b4b7d86883631a625c9634e79a82228960aed4fe4b0d250e23aa90f48327f617ed27766f8 SHA512 4807db073ae05dedab6e2d8c9a46c6a318cad78d12d192f63171e59c48e40fdbbeae7192106b2279dc2a2360f929138b6f49df0d42492e740174e83d11d81253
-EBUILD phonenumbers-8.12.17.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
-EBUILD phonenumbers-8.12.18.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+DIST phonenumbers-8.12.20.tar.gz 2257751 BLAKE2B a35423ac7c80a8533e360355d4beed5219ded5619b2da3c2dfd6691b9d270353107a6e43f29591ee86f1eb8eaf058b5c5f307b560e33ef9b25c662f02262aac3 SHA512 79fe102b9619564a2b43797440147da8240b901eea30e199b5e4ebb3555a1b95cdbd5153b5938ef6bea9847f71c62b83a0d258b7c8f477f446385b74450305e3
+EBUILD phonenumbers-8.12.18.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
 EBUILD phonenumbers-8.12.19.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+EBUILD phonenumbers-8.12.20.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild
deleted file mode 100644
index e1586dbb97b8..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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/phonenumbers/phonenumbers-8.12.18.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.18.ebuild
index 8f5b4d0422ab..e1586dbb97b8 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.18.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild
new file mode 100644
index 000000000000..8f5b4d0422ab
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit 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/phply/Manifest b/dev-python/phply/Manifest
index a44989dc49e6..f2ebb18900e7 100644
--- a/dev-python/phply/Manifest
+++ b/dev-python/phply/Manifest
@@ -1,3 +1,3 @@
 DIST phply-1.2.5.gh.tar.gz 35624 BLAKE2B 99fe9704cef570ad3055fa6c5aaaaed866d3c41c1479efbd29bb3224ae666d2ba13ccca61e6d67a8a0da4542dec79b5fdd201254e1ad638de81fa762049f4d13 SHA512 f0e4d0a6d2dfad5163fb68660602482b6de58c0dbd60d8db2f1df0622a9da3cc24e5fd309299a4a9ccf7abde081644a9a91fac8a2800520859199060f4080dc4
-EBUILD phply-1.2.5.ebuild 800 BLAKE2B 350db63dfb4f5389b09aa90c9893157b3f0b042018e0dcc525265beedf5b2797b9b4b94851146395134ade3a54be7a8629c96695382ef867b513b7f901b61fe0 SHA512 fdf089f769aede01295d47c0b8e0d8019a91243de8bf72c1446351a25db8d67565ad479575e4acbaee07ab028f4b43d3ba03a55bfad6fad55e80c56ab2e1c930
+EBUILD phply-1.2.5.ebuild 799 BLAKE2B c8357135d06ec303ca5ef733c59cf5947d44c1d1f6241a578349e3e8f9466b8cdc6ba08b58b567ba72cb43521daaf2631ff1f5df4c5deca755a0c61d816140ca SHA512 e37929965fb6a40859b6669529e5fac9378fba70731356f46bf008adc972c73c95430a40af7f7c5f0cd536d0f060fcd0db9872009746ba133877b54caddda85b
 MISC metadata.xml 364 BLAKE2B 32f89060e0ce7bed45287e0d206ba333b07888c7b32c6e76f916c7a153cab420440f4cc9a0b16e9747949339155ac013696f65ce4e4d7dbda69aede6fb8531f2 SHA512 67ec43a111b7cbdd46954b82baa2d528d2cd86d25f579500bc556069b67aa5055abf78dfc3c51afd095e282a240c295f5503ff5a1c0292a996d3f2315fbe27f5
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
index ac2a2fcfc582..19867796c40e 100644
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ b/dev-python/phply/phply-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index cc4e3a75d502..cf381833ba20 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,3 +1,3 @@
 DIST pid-3.0.4.tar.gz 16228 BLAKE2B 386565071646ff5b5152c52a8a0881f54369540abaf34a82be399d5e579c763df81553393a6d9a9659beeec5f6b531c74eef7cd13f6dc6f56ee76783863c52e9 SHA512 71656511a12a27fe0c7106cd82459484071fd7a0d34f187bfd2f59dc484b6a86f2ae840eb04609c5ffb2c1f18dafd831b02c0fee5015cf840e6a1f26f95ec495
 EBUILD pid-3.0.4.ebuild 446 BLAKE2B a1d8edbc9ceac3bac573d68795274276121b93d31d2fa1046351b840f4b903847087bbe56cef47459a9495898761442392947a55551e6813a463923f3dbd7f23 SHA512 cc2f03843ad883ca23f6a5d95b03533f89e0ca4750a80c7bfd42ee2480ce634d226a587cc1392c3f263188e819b97dd9604fa7c231de8a6caac4a5536ca6593c
-MISC metadata.xml 560 BLAKE2B 5af715f7414da897d42890da7399e0eb94a6a9e565168490a30fe6869ea5377cd7c58dfbc1b130f2998752ba0fd2ff0dae9f98479ab22909dcc2b61f9c1abeb3 SHA512 3ca1077fa0948e659fe7673dd885ba306512f75b3706314919de74910482b99c112f4e1cdf2ada3ceff9ebf18bc72dfb46c263ce4da396e1400a6402757c2dcd
+MISC metadata.xml 560 BLAKE2B 2a2d6c25540e28a4af6cf91e470482e7fdd7c8939218b161d06347260b068f6ebf9dd01f02589026784c99c2dd4101969295e5593fd5edc9a1d7fdef45c6602a SHA512 7bbbb4db8178a19b4db97b9f076b778d72460e759ef6e307dd082146eb997087ee14f488424f79b47883664dcdc2793a85118dcd0d6aa5f45478cc9308e3558d
diff --git a/dev-python/pid/metadata.xml b/dev-python/pid/metadata.xml
index 4e998d163a95..45730b7f99fe 100644
--- a/dev-python/pid/metadata.xml
+++ b/dev-python/pid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 5dce2b38a2a9..a2a55700caa4 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -4,10 +4,12 @@ DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437e
 DIST pikepdf-2.8.0.post1.tar.gz 2370159 BLAKE2B 336f2034f3a0207d1f5522b13ff2d0a02945862341eab78de00276cfeb9cb9c2bce17d2951b388045ef40e59bbb225988ed6443642a129b1b088908326c04bfa SHA512 8021afbc33625d5990543e315769534b9c886cb1487ad20ef00d00246c6b58edc0104f717fcfc575347e33533144af79114c5828303901d907d4756a052fcfba
 DIST pikepdf-2.8.0.post2.tar.gz 2369810 BLAKE2B 67b2f88a0718076d9f28148342832ec646443b6bdf0f9ca3717a9a9caa6518563564f25e4532c3ebc5d05e18b78f2db4a9bab17f0d0cf6cf329dcc41f7c3332f SHA512 adf28106dbf58bf4b29c3930280c6f54c04ac4fc40adb4d9e7fe3a288293b077f2e4b063e4be91e661c835b474ba2b46167ce05d9f5d2c7c13ae180f6b3b76dc
 DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435
+DIST pikepdf-2.9.0.tar.gz 2371794 BLAKE2B 7a32542d428d67e1eb940d34ba7efc21bb3002cc573e02de383d7beeb795a0680709c0fdecb933fc7b63a09cc1fb616df9fd514d734f13b6c0ad022c6482c64c SHA512 e1c5ee04946f8c43d20ea1ff857ec463cf8ea531d5d579d0855669401b8dc931bc3ac08be20e3231aafbbc5fc8984608cd8f8aece214ebb7068c21e94981b9a1
 EBUILD pikepdf-2.5.2.ebuild 1482 BLAKE2B ed869023041dfd2868624ad0e1e1c54bb93c2f19575ab2747d9f917911e0f9828b1a26b3e48749f8b14b5415ba9aed3ba168eb1eb6e8ef38f2bfa7d3e78ac596 SHA512 56732bc004bf3aa895df1ab72912e7941084a196a075be91357dc30eb19f87177318b2fd39ef7edb264fa7ec3e6f41598d84b749bb8a09af7efe2bd249c47a7b
 EBUILD pikepdf-2.6.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.7.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.8.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.8.0_p1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 EBUILD pikepdf-2.8.0_p2.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.9.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.9.0.ebuild b/dev-python/pikepdf/pikepdf-2.9.0.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.9.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+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/pilkit/Manifest b/dev-python/pilkit/Manifest
index c52c60067e06..f4b00700afa0 100644
--- a/dev-python/pilkit/Manifest
+++ b/dev-python/pilkit/Manifest
@@ -1,3 +1,3 @@
 DIST pilkit-2.0.tar.gz 160077 BLAKE2B def84c3444c5ffe7e1b9c016c2fe15de222d6765e7ce4652ef2f6864af59fdc89b9bde5c7a63097838ab3fc054c81529dcb4a13cd3fb3ee8a0f141f6b0030c10 SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51
 EBUILD pilkit-2.0.ebuild 656 BLAKE2B 12a5a0759e15a2530e62469e068c80e4e0c277f872316294f58294beb6276d0e8d578799987f27196183e1e4b099b28267ffd4844e7e144f370c1835c46fa289 SHA512 6f76e7628acaa7bd18acccd48f62ee42a347f23cfbdd2f5ca3d49c431f5f6c77750506de24dc89b45ac85c91b286c27efd6ecebf5f21b08e6841bbbad77f82c5
-MISC metadata.xml 577 BLAKE2B e7c419d819dbafed2aa0ce7b470f370ec17db804c479b5bc031f0d14f9650ed188eff40c1b428e3a3362a7e340dd7d5e1a6306068d70bdd56b6aa6f0796bb2a0 SHA512 cce0def750ad671b397d8a8827944f64f235009862f472aa8a70c7c0a240ba3cda7f65de0c9f0c6c138a9e7cf236cff65f5a1cc417465e8eb3b1c4d4dc7b5d01
+MISC metadata.xml 607 BLAKE2B 561716a82c52f375cb1795838a40ba9ddcb014eb988039d7d3c83b49dc81ab2560e2027358faab70b0d450a88f80691702110ea0f96bca40bb612ccb7c381e58 SHA512 daad1d0ca1099be6b2e8b245d5b620c2538964dde91446b7f79e4f6546cdd7ae081068d9e4d63db8de8c3c2dd529d4688cc4c2e66165124b988fa3a61dd57df2
diff --git a/dev-python/pilkit/metadata.xml b/dev-python/pilkit/metadata.xml
index 8a16dae100d4..2f2e6698c538 100644
--- a/dev-python/pilkit/metadata.xml
+++ b/dev-python/pilkit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas@gstaedtner.net</email>
 		<name>Thomas Gstädtner</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 6de579fc95c3..d4d5ab0b2b49 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -2,4 +2,4 @@ DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7d
 DIST pipenv-2020.11.4.tar.gz 11574683 BLAKE2B cb2ac4ba6b07377a3a5540b23756afac38a02691e495ba93031815417d001701b919221fd83d0f9e6b94d4f28c1fa754c2c31e289830305a8c8ac75d847209c4 SHA512 c9015eb9a449fa517f31619d1fec5d99882da915a50e189ba6ab9c7c147862f9734f0df200330d666380afe5d2cf52d18015c539635ca6459042ab50d3ccd059
 EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 EBUILD pipenv-2020.11.4.ebuild 1432 BLAKE2B 00d2dd047f89341579febf843f12432ecd0e867f81068c230d39de68eb0b3e2f6c8816f37e573930cb582f27987c9656306efb4e66942b7c58f3a4a96d100d81 SHA512 cb76b0fb86259e84fec328352a02001bd8c5f1f519ac5bbaa429316e6a8c6b3da0d90c838864224a02c51dd289958308bb30ef88f1031499ebebeaa43f79b157
-MISC metadata.xml 612 BLAKE2B 98320e022ea9f2425e3a499f769490e2ff0372fbe5c1fc2f77f0b3bc89a9ab10816c7b45571a6526645cbc437f067cb170df28535722d324e1c7e88b4200e7c8 SHA512 c3c4c875d80c3aaf0ec9ea42ffe04641e60f0c54c9b9dae661cd19d488cfa230c8d8bd98cbbcc4e91f53428f66cc44302b0891ffcf6fd6e1501fcb7d258eac65
+MISC metadata.xml 642 BLAKE2B a652239b8d21d5c30d7893bb530bb89af62e0642824d4954bdd41719d1f1b8afee5e8ca4cdc7859995adca8fe0ddbca916e4876ed10104fa9e69f76147227f71 SHA512 f9d9c4433c8bdbe9bdb4c62f8da158d59afba2052a899eb14c245c1109cf82f690e513581aa6028b4ceebc836a32df5b8961672fed833a08b8ef2ac8a442a860
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index cc9727b55cdf..9e33b1e1facc 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>oz.tiram@gmail.com</email>
 		<name>Oz Tiram</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index ea990b4c9310..286b6fad1903 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,4 +1,4 @@
 AUX pivy-0.6.4-find-SoQt.patch 925 BLAKE2B fe3224f5aa0286204e81352b0e6c331654eb15fc509a219a4924cedafebda305182882c2de51aef504ae9a0432beeb4a67c5f80aafc24dab7a40c3a3d37c34dd SHA512 02a9c530759901488073bfa69c7a97d3814d4daa94f4724158ce037e208016f2fd025ac5020717ed80e5f561721d5be6967f0f44521738248f492fd11b7044f8
 DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695
 EBUILD pivy-0.6.5.ebuild 851 BLAKE2B eb167b1ece4c0a504358c51b877a3903262a66d96dd96c7a856e085125192a757923af5d8e7b769a63a965207f8de6efb0cd1998fa556e819c8b9904d83d2ab1 SHA512 9c11a39d5b57615fca65a9ebd2f44fa839a8bd45059ae742b467064a72248fa4a9285495eb0666313c1717aca9148b2c6c619ccac2c59fff2e4b5237ac463a72
-MISC metadata.xml 604 BLAKE2B 18c7c03dfaf7406ba6002c2869f626514ff169a9462d180bae6f65524754653ef32079a9d932f7e8d8d975ad715ee3c6faee65bce796ce3928331d99ce7d509f SHA512 a3bae67bec6a71ae6e1de0da1cc5c21c3699ee513b8eb3551754d5c1b0dc54922c305a07338938e588a0e7d3e980870867d526b2f0e6cad8535ce940e7ebb188
+MISC metadata.xml 618 BLAKE2B 095d0cec730919daafc8b6a5f6a7ae93b98c92716d8d2a6d3b4cd50ddc5f076a6d1a30e82c59d218f270ac3334fc3561eb87c79fc43a02b3181d941846d5906d SHA512 fde49deb73bb20cbd39fdcaca4dd0edcae817c0436807c0d5ab494adb0bcaace2c9115cc4355b962b01d77e72cf8f06c7ed22212fdf8601c91905215663e71e4
diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
index 4eea4e74a790..158a191eec02 100644
--- a/dev-python/pivy/metadata.xml
+++ b/dev-python/pivy/metadata.xml
@@ -5,7 +5,7 @@
 	<email>fordfrog@gentoo.org</email>
 	<name>Miroslav Šulc</name>
 </maintainer>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
diff --git a/dev-python/plotly-geo/Manifest b/dev-python/plotly-geo/Manifest
index fe902a8906d3..c8d0023ee1a6 100644
--- a/dev-python/plotly-geo/Manifest
+++ b/dev-python/plotly-geo/Manifest
@@ -1,3 +1,3 @@
 DIST plotly-geo-1.0.0.tar.gz 23718591 BLAKE2B f78b36cd7ac6ec10e830f6be5758ed31ad2382882454d96ef652a73a11aa9b3be46ea24fd3f49a6189d9fd9eeaa89ca6777c691be9fc65f4d2a04a4d2bd58823 SHA512 977621c0fc84a6c72b2a91bcba27cc25b277f32cc87a7098675b3d7cb8c468a8291ef66397f3ceb45fbaa3484eba53d7649f809cf9d02af6309562af0b4fdf4a
 EBUILD plotly-geo-1.0.0.ebuild 409 BLAKE2B e70d1c143f50e9d96ffe68ecd75a351ec5adcf2ead863527b5c88066926f9aa908e3d473719ea72a1bfe0b739357c468acf1cc1de3359c623126ae94e987ca07 SHA512 be035039e8005cee4988609b817c68f1aed4bd2d9c839e96a0484e962b6e87f614de31dcff98e0e8c048c43eb6c2e6208728300105bf1464cddb6c78785cc249
-MISC metadata.xml 710 BLAKE2B 633a653c6685aa7653f7bd98dcaf52b79d2cf21697312e0547572ce2af049fc42c46769e6072af0021228bd0ab9a2b79cedfcc7aac8c9334eaec035598124d71 SHA512 cadd4997b878844c4d425f0c2c4515f9ed8d91258ff393b317b8c7f946cdcb8ac8c00ed0c15731e3b7b58b02759f621aa0f4e773817cef6de5aa3b962456fd31
+MISC metadata.xml 724 BLAKE2B 1508771febfbd6ed56f55b9db32cd255b84139e53b63341ad90e4f95d71e9c4f2f74d88a55ec4d1b66f1b21004017816e6cc74d62eb8f8e0850823502d23598f SHA512 2de0e70fdefd14ba91b72046f31af45a5f68be8d8955f746e6a35ee71c639217caf2cd2d8d3f44687146fa39076eeec15c5186e113599000528c429631e0b5af
diff --git a/dev-python/plotly-geo/metadata.xml b/dev-python/plotly-geo/metadata.xml
index 301f9875d592..41223b467a27 100644
--- a/dev-python/plotly-geo/metadata.xml
+++ b/dev-python/plotly-geo/metadata.xml
@@ -5,7 +5,7 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index b45be32e05e2..e9ec858e92e3 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -2,4 +2,4 @@ DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1
 DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
 EBUILD plotly-4.14.1.ebuild 613 BLAKE2B 5f45698653121c6f20f3f933c236fccb8a4f152806795e24686425afc75e57dc1337736a63e60c982587d4b30e315c21fce0cdab78075e5cfbab1539a03be3f0 SHA512 18a4ed69b6b3983ce8b6cb1ced62bd11502569b0a8f381ba479ff69fb926c8892798ffbc7315872ee0ab24f071806f95a785712bf22eb83d8365bed4288faa21
 EBUILD plotly-4.14.3.ebuild 613 BLAKE2B c8262ca7e127883fa49b223df7b3cc0875bcab0d835995d08a1eae9a9dc8ecb8b2d88dde33bbfc67d8dc5386d72acd259439be5ec2c80a183f234558c43792fa SHA512 e6d3178b59fd81874e7f3ec607fa65e8767095eb0f4ba96e1f81b035a69fb169f01c6d3b4453fc6496b1c2d7cd91d8585d004cd2c15a1df9d4791abd96f1b28a
-MISC metadata.xml 710 BLAKE2B 633a653c6685aa7653f7bd98dcaf52b79d2cf21697312e0547572ce2af049fc42c46769e6072af0021228bd0ab9a2b79cedfcc7aac8c9334eaec035598124d71 SHA512 cadd4997b878844c4d425f0c2c4515f9ed8d91258ff393b317b8c7f946cdcb8ac8c00ed0c15731e3b7b58b02759f621aa0f4e773817cef6de5aa3b962456fd31
+MISC metadata.xml 724 BLAKE2B 1508771febfbd6ed56f55b9db32cd255b84139e53b63341ad90e4f95d71e9c4f2f74d88a55ec4d1b66f1b21004017816e6cc74d62eb8f8e0850823502d23598f SHA512 2de0e70fdefd14ba91b72046f31af45a5f68be8d8955f746e6a35ee71c639217caf2cd2d8d3f44687146fa39076eeec15c5186e113599000528c429631e0b5af
diff --git a/dev-python/plotly/metadata.xml b/dev-python/plotly/metadata.xml
index 301f9875d592..41223b467a27 100644
--- a/dev-python/plotly/metadata.xml
+++ b/dev-python/plotly/metadata.xml
@@ -5,7 +5,7 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index addceb65a891..5c04d6d73f43 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,3 +1,6 @@
+AUX plumbum-1.7.0-test.patch 1434 BLAKE2B 1b857261671912f2f708dae0b3aad50cd0d406697b451e31c314d8da931a279c8cfe2ccc80459b93b8f4c32ec7bb6c858c81014e6081719812eb76f8f64f79a3 SHA512 bec0051177757f09dcd53f9b6ed95ef83892c28a6e72e18acfda2e01c64660975d3fd3e82542a574f036cb48582325a8ad628ac6dc9d19d8e2780ba50c617015
 DIST plumbum-1.6.9.tar.gz 311240 BLAKE2B e5f833a5c762f3e78e5f47649306c7c29e6276b3530ff45fc0c12cc4efd3bf89bad2b6b7f77e4b3e3a0a47671f9b607e667aba8f654c28c05be570e0a7491a07 SHA512 f165f4905ec34cfe072f61fb28b43021ca44c0c3cb1e505faa04332d15920d832bcf084782683c4950113e30a3fa29734846b3b6f31604e1a635c9c125e38ef1
+DIST plumbum-1.7.0.tar.gz 318890 BLAKE2B 19ae8a37dff38ac3d263d9400e44ac174c46ff8cef92cf45b9ea31d6d344543fba66de3fd0fcd15acc205af5939f11be6c56e6cd9ca39a666f92f18dcd29b9f7 SHA512 0a12891278c12bb98b8bbb825448375240ee347eb3ca166b9cbb4da3e083979d947a7bf0a843fd9a0b7c9a13d09f24e988ee877f29420a3f29f40e387eec8826
 EBUILD plumbum-1.6.9.ebuild 520 BLAKE2B 5c2cb8e217932f49f659c27725e637ec233e75c5cb4835e540ead7521096c9fd48c66ec9ee5e04bc1f5a6620199b041f2cae28efce809d00c5201076eb4231bb SHA512 8b630331b6998b172c5580e7b12ed12cf9dde1fdc1237257f9a61342a64f5a02ce4d1f6f63dbd54caedacb8ae24170e2244717dae7c4e86055653bcf585e7b07
+EBUILD plumbum-1.7.0-r1.ebuild 1497 BLAKE2B dbef6d32f12156cbb99e94ead5e9dd9709cf64b2b3ee4a4d8618c4f0a69a041818327e0531f54054916426ef0b04d12be14d3e42fac94330ebf5251ed7e5c0f9 SHA512 5a8bb4e7fc32fd2ef77255f1a50360a00ad0eff5da5f06bff29539daa1e320fcd852c85ca71e21ce73ef6fba51bd9c6aafd9f3104a938a32fda3716629cc2756
 MISC metadata.xml 753 BLAKE2B c3723646f700efe4448d60c83c7b636db5b618076e6baba2201ab84f7f55953626df54c6d9b7ee368420ee4e94605b5e0129bb4e40bd412c7737a987c8aa0cd2 SHA512 5d1ce42aef769e6681ba77cf4f8f493697f9ec20cd648ce68ace94be9d6b022144e558f222a9950966b8d0e3e2c0297438e174ea02e3ce329c038e58c9573490
diff --git a/dev-python/plumbum/files/plumbum-1.7.0-test.patch b/dev-python/plumbum/files/plumbum-1.7.0-test.patch
new file mode 100644
index 000000000000..a79c5f67d18a
--- /dev/null
+++ b/dev-python/plumbum/files/plumbum-1.7.0-test.patch
@@ -0,0 +1,34 @@
+diff -r -U2 plumbum-1.7.0.orig/setup.cfg plumbum-1.7.0/setup.cfg
+--- plumbum-1.7.0.orig/setup.cfg	2021-02-09 02:46:57.071159800 +0700
++++ plumbum-1.7.0/setup.cfg	2021-03-15 15:51:13.873287602 +0700
+@@ -66,5 +66,4 @@
+ 
+ [tool:pytest]
+-addopts = -v -ra --cov-config=setup.cfg
+ norecursedirs = examples experiments
+ timeout = 300
+diff -r -U2 plumbum-1.7.0.orig/tests/test_env.py plumbum-1.7.0/tests/test_env.py
+--- plumbum-1.7.0.orig/tests/test_env.py	2021-02-09 02:46:46.000000000 +0700
++++ plumbum-1.7.0/tests/test_env.py	2021-03-15 15:50:18.943289430 +0700
+@@ -14,4 +14,5 @@
+ @skip_on_windows
+ class TestEnv:
++    @pytest.mark.skip("Something wrong here")
+     def test_change_env(self):
+         with local.env(silly=12):
+@@ -23,4 +24,5 @@
+             assert len(local.env) == len(actual)
+ 
++    @pytest.mark.skip("Something wrong here")
+     def test_dictlike(self):
+         keys = {x.split("=")[0] for x in printenv().splitlines() if "=" in x}
+diff -r -U2 plumbum-1.7.0.orig/tests/test_local.py plumbum-1.7.0/tests/test_local.py
+--- plumbum-1.7.0.orig/tests/test_local.py	2021-02-09 02:46:46.000000000 +0700
++++ plumbum-1.7.0/tests/test_local.py	2021-03-15 15:50:18.943289430 +0700
+@@ -168,5 +168,5 @@
+             assert parts == ("/", "some", "long", "path", "to", "file.txt")
+ 
+-    @pytest.mark.usefixtures("testdir")
++    @pytest.mark.skip("Something wrong here")
+     def test_iterdir(self):
+         cwd = local.path(".")
diff --git a/dev-python/plumbum/plumbum-1.7.0-r1.ebuild b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..da3985d2cb5b
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
+SRC_URI="https://files.pythonhosted.org/packages/ed/ba/431d7f420cd93c4b8ccb15ed8f1c6c76c81965634fd70345af0b19c2b7bc/${P}.tar.gz"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}] )"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+PATCHES=( "${FILESDIR}"/${PN}-1.7.0-test.patch )
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Need sshd running
+	rm tests/test_remote.py || die "rm test_remote.py failed"
+	rm tests/test_utils.py || die "rm test_utils.py failed"
+	rm tests/_test_paramiko.py || die "rm _test_paramiko.py failed"
+	# Windows specific
+	rm tests/test_putty.py || die "rm test_putty.py failed"
+	# Needs sudo without password
+	rm tests/test_sudo.py || die "rm test_sudo.py failed"
+}
+
+pkg_postinst() {
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "Remote commands via ssh" dev-python/paramiko
+		optfeature "Progress bars in jupyter" dev-python/ipywidgets
+		optfeature "Colored output in jupyter" dev-python/ipython
+		optfeature "Images on the command line" dev-python/pillow
+	elog ""
+}
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 3c7a95adef85..913f12ca6b8b 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,3 +1,3 @@
 DIST plyvel-1.3.0.tar.gz 149379 BLAKE2B 0a4fc8c3073cc8e103ab217f8e7971f04d9e6d1862dea7ce3d2634ba9646bdeebdda740fe6cb2e83aeeab513601bddef374355c4f6c9f320ce6b4b14ff2b2bf6 SHA512 fc1b84f0e98bf3edcdc2d7eda4f18313186538bb419bd297f694330e60512a6ab63e8d2fabaa825023eb5570f175ebbc22b8ae81e29603b1a94c1abb37774e99
 EBUILD plyvel-1.3.0.ebuild 712 BLAKE2B de4f335fb79ab1c7ed03d7263d8256eb0aa63990cf6e8b77040c999d5f2a48fe595e59ffce93d4b48cd58f50f58ce683843c936dbe4deb6797ee1f61a9a043e0 SHA512 776030a62e9d48a09343947cf049bce82be13b9ec264ad7cfc8ec39b30d04217735306047bbf92c12c8bb5a58b9cd98a4a9cdd06b88fcb5ffe25aabb37cf9781
-MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
+MISC metadata.xml 432 BLAKE2B 104f398c338d136f67c24b43c90896b50fa4ad1a7ff2c7b4aa395aab0d16ccb2686a97f15e6aa090fbfa52ed60fbf4f8bb062439367bce20c36e91af1a3de68a SHA512 850af8f1bbef92f2b496037854be6f2b0c92d1ab1d3314f8bce773b89427d80b89d9121aff4294c1cf1903c2caaa24aeb85246c77434420871ed377603a8259f
diff --git a/dev-python/plyvel/metadata.xml b/dev-python/plyvel/metadata.xml
index 73166464dee9..887e44dc22a8 100644
--- a/dev-python/plyvel/metadata.xml
+++ b/dev-python/plyvel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index 57a79ae63798..54a3c1bcbba2 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,4 +1,4 @@
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
 EBUILD pockets-0.9.1-r1.ebuild 495 BLAKE2B be6d60d07e47f29ffb9365453ef7b7267117f06421cdf83a27f90caeea8c9094e9a9281113900120808360fc13e60acdddbed48c26eb45d51f026719c7560c1c SHA512 c641ea921252e0c9f79d9e01af1c2f02a2343e83338263c711b62be6d4331fa9acb37f9ae8438f1daccb369ce3e9136799e9a4909e09749c870c303bb92bd118
 EBUILD pockets-0.9.1.ebuild 483 BLAKE2B 9053ce2bbd69a691fb297566438084e838ff23ac490f63803c90c0ca4670275b51a60daacafff817d64fc64ea92b386c0eac12482b09dfefe241838694ed0812 SHA512 567721b7f139168950ff6d5bdc3ab3818a74910dfd0a50f37390c1f53f49a2f447f8d74df31025bc971f0deeae474a4173a31270d19ee96d59308b66141738b2
-MISC metadata.xml 331 BLAKE2B cb17ecc8fb5618d45d09af9211028e4876b6523792f70d20df4104b9dc72f132a592ba961d2571632e34a72f213eff0c06e02d1700c82d4f46ca48ea9d9fc844 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb
+MISC metadata.xml 331 BLAKE2B 57ff3f70f5b0cb42df8457080661731a0441e28a962e97106bcb0d7b53250d28dbd1278bab79ec649aa23e13ac6244b124df55119b62a55877381dd1c917f6ef SHA512 4f0519feb2582567a86b066ceaefffe6d1b11c7b50afe60b5a730045bcacfac0a8b24f485cd4ad3faed9b03fec69278d7eb8ba33fe72269bdee274ac05185707
diff --git a/dev-python/pockets/metadata.xml b/dev-python/pockets/metadata.xml
index 6c00750775c2..e51fbf707757 100644
--- a/dev-python/pockets/metadata.xml
+++ b/dev-python/pockets/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 67ee64e32531..193c4c63f807 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,5 +1,3 @@
-DIST portend-2.7.0.tar.gz 12732 BLAKE2B 147d47295d702e6e4a41da1af91afc72ecb2a29713431aada6c98fe527c96f86a88a845cc1afe6507e2fd0d749e146f8b349df13d2e1fb1ff2c0a12fc7d6bdae SHA512 8c81e524e94c4902806a6d33a2811d405e6024796fdbfb5ee1037a177b0aaed4c1b87b76822eee5ca55e552ffa569f4e619d0c1645f0d10c17f8d721ec73787b
 DIST portend-2.7.1.tar.gz 13538 BLAKE2B 56e9b7ae4fb9371322cbecf12d9367fc48f0138cf9fa8cb25cf7f0b7977d83852f328d89e93ee2e266e77b393bbabe75d091ce85f688e1ee146edf64e470aa60 SHA512 079bfc286491753e980b5000ee716031225439523a8d9a79c2571359adee74ee024dd680c41adb966487dc39eea3d0dbeb928c5c72fa21ab897283310ef21906
-EBUILD portend-2.7.0.ebuild 789 BLAKE2B eb5b5ae00ce2bc10f7e1da8646fb43fc49d85f79a4b4a1f31ea59fb3f90fa2299e4241006c0cd4e85e868dc504d454917a5c0149e397259e05d5d267f682962e SHA512 1d0468521bc6fbf802b95a7de28934d2c4aee3bb78dc04952e9d5947779627ac497fd3919c7988d791da48aa0ed196c9f7dbbcd8c01d128346f55675ca8e1e60
-EBUILD portend-2.7.1.ebuild 626 BLAKE2B 6035901334c6d01b482fda9a17be7dba872fe8995f293e3125ffc99930c164bb9d1b28dbb5bee971be6977d0ee3169c025782a40ee2d8c72891c527c693bcd86 SHA512 aa09fbda4bebd3fbfc6385460c98cd19b539cda636c514623bd67b74e8f2b40465a51f890b501fefbe1ed61d8a82f35afe0ceb6a91c13b060de4728c8f45af58
+EBUILD portend-2.7.1.ebuild 618 BLAKE2B 1bcdc3bb32dd4f8f164d9308656e3b04822b842afa67575ebc6419c80c42088bb5af9e5d705049c053c0031f06fb3d451a56075816d0dd55cc57941db0d607c1 SHA512 ee72e1820a516b6a64cfa0a3652bc7af8cbbe550c0be94ad080863d4a8d7664ed0cae9e94dc2151f0db60180441925c8305f87608becf23dc2f6bfc643f755af
 MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/portend-2.7.0.ebuild b/dev-python/portend/portend-2.7.0.ebuild
deleted file mode 100644
index 85442e091efb..000000000000
--- a/dev-python/portend/portend-2.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# avoid extra test deps
-	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/portend/portend-2.7.1.ebuild b/dev-python/portend/portend-2.7.1.ebuild
index 951cb59e9aec..0c390c77cfa0 100644
--- a/dev-python/portend/portend-2.7.1.ebuild
+++ b/dev-python/portend/portend-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
index 38495276402a..c522b8adc084 100644
--- a/dev-python/poyo/Manifest
+++ b/dev-python/poyo/Manifest
@@ -1,3 +1,3 @@
 DIST poyo-0.5.0.tar.gz 15276 BLAKE2B 515e04ee365036c96646e1d7aeae273d541298d4d817713e04c4b8be5d7dd12938099a5ed8ab1dfd137d3ff0108a0e86163b99135ea2aa739eaae67ef74484c2 SHA512 aad4334a2aaf63cafab0ecdbdd6f94e9e3d412e6476d7ac13a4399b4af0f43b1eb910e6a3cc7438e84262bc39413fadbe91674534e1e66f446d738c1328b9905
 EBUILD poyo-0.5.0.ebuild 394 BLAKE2B 937fcf96d9e9185a0e45742a77594a4b5dd70a4a7a4986c9c68666764e26b07d8bcd04e2aa2795aae49f0823ad93601aba700d97ca1346fbc91da7a248e95299 SHA512 1f64e9930669a23668e0a4687a3e39720a719a6f3323ddf7ccdee35f24e8c9ec43e39212fbdb729a8672a315dbcbc364f7542e307850a003524a1e595c7633fe
-MISC metadata.xml 385 BLAKE2B 5e25f24f46871d150495aa515ebe44ba4ff6ead7a1ff5f7b5baedd568ce4394cab99226f5d09df25870ff87d5bcc078c7a82ca69f2fe43e3b1f0e84822d073be SHA512 3ab05157c11862a04fc20a868d57c19766781017900758cbb6d3dcc01bd5b6e36a23992e11c478a71dd2f3a26a4d2eb952a097b9327384ab6b629311ae596af5
+MISC metadata.xml 385 BLAKE2B 3e3a3b6897e00da8c01c693f3d93a632d4098b7261e5bc1fb7cdfda42ba86adc2040f8b626b9d5c9c20d9fed7ca74939c665c2304c2bbb9e4db44d20b823abda SHA512 1d3081a06c004e0cdc779caeb2e69dc7c81a357792720cb39c74bc3cdce5b49ecf6d96370bee49561a06cd9c9d4af2bfd0e8698e95132400f6145d7b9085def5
diff --git a/dev-python/poyo/metadata.xml b/dev-python/poyo/metadata.xml
index cd7b09373ce7..46d0c0a7727c 100644
--- a/dev-python/poyo/metadata.xml
+++ b/dev-python/poyo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 53075518a082..95cae016019b 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,3 +1,3 @@
 DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
 EBUILD progressbar-2.5.ebuild 420 BLAKE2B 6161b542858a46747f4ed393dabd55504859c6e257506787f6fd914939ade11f0e49e1f2d652fa205d3a48e0fdc802909a136fc16ed5d248b9e57b3db6a02c02 SHA512 05991fc488eed325592ec80820d8c2a0c454db21cdd868c65df01fbfa12e1bd37447b910be7a1565b90af9f457120e093050b407922d543bc07c4e4a6edfc4dd
-MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
+MISC metadata.xml 324 BLAKE2B a143a83cc686718426619242b90f0139f22cf6141ef01ddfd46d51f84f25333a9e4d7d353ec58bda2447a6ece08912ced63584230002e546f647ed6703b7fa16 SHA512 87a0152b2e5d45b9b96690826e3f0f5365d76a5555d7492f60af8cbae01cf991f266048540c2c50f88610c36ce411305af8e583d13f5182046f2117e4a17745c
diff --git a/dev-python/progressbar/metadata.xml b/dev-python/progressbar/metadata.xml
index 6ddc4ee3c402..e423316f45c9 100644
--- a/dev-python/progressbar/metadata.xml
+++ b/dev-python/progressbar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 82103b35f7e9..6c6fc9e6fa4c 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,9 +1,5 @@
-DIST prompt_toolkit-3.0.10.tar.gz 3020391 BLAKE2B 397ab28e5a362c84df7286be27be11acd4c6666bf77d63a1042cd76e6a4ee0b8002bad6166d858dfa6f07f8da41c6513c13fe2500b55da1dbc6562038ed974ef SHA512 71cdbe28064f28a2d88f369ee4550cc02b2609841b51d8fa7e8028304e77f34c6feed5d4549d62a3cbce27f95a4ebca1066a6fd869fbffa1799a3dedef2df6f4
-DIST prompt_toolkit-3.0.14.tar.gz 385647 BLAKE2B 08e4483846ba0e6cc69828840a0791e1b85a7db91718042e9a357741164183c0ccd241130c83b980b88884ba32bcb60714c7f920731aa6ca91186ed6f256bafe SHA512 7767861d9f6e5cf88b398420187e4b0a075aaa4645cd8c346db104101f89bbe7c0da2a6518c82066da5efa7376db5144451416ec7b12e92360972f8d4e25d018
 DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
 DIST prompt_toolkit-3.0.17.tar.gz 3033301 BLAKE2B 86ba94f2e0c9e998c53e5e4ed12961c85c667b6d0356d17cfcb1856aef933f88c1c525507e76a833970444a787641c7316bc7496787ffcd61102945ae91b73bb SHA512 ef78b3aaf953f20a035f8a1f58262a8e4c1ae6b88c02c523bc51237bed22f52e229488d0113901bcd94835cc7120ccb4beb75cc9c9d99dde4e8f21df7bfde8a4
-EBUILD prompt_toolkit-3.0.10.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.14.ebuild 597 BLAKE2B fb5db05ae055ba17a8e0dd2f3db0a1e84053785b28db2a0ccbe37270cc96994a2ee74fe2764d168f079d46f22415125ce4ba6b427cfc21a7546b3b22d865e0c9 SHA512 bb1da9ff1bb8834d1fbc815395c4d0c50d3e551cabe8fc603dd9fb11bec0c466fd8f5fca2b3dd02a8aa8784e1d1b0f27994b9655110130455f873c9b60e101de
-EBUILD prompt_toolkit-3.0.16.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
+EBUILD prompt_toolkit-3.0.16.ebuild 597 BLAKE2B fb5db05ae055ba17a8e0dd2f3db0a1e84053785b28db2a0ccbe37270cc96994a2ee74fe2764d168f079d46f22415125ce4ba6b427cfc21a7546b3b22d865e0c9 SHA512 bb1da9ff1bb8834d1fbc815395c4d0c50d3e551cabe8fc603dd9fb11bec0c466fd8f5fca2b3dd02a8aa8784e1d1b0f27994b9655110130455f873c9b60e101de
 EBUILD prompt_toolkit-3.0.17.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
deleted file mode 100644
index 8f045fd79e7b..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
index fe628251486f..8f045fd79e7b 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 82b792f07311..df9e521906e6 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -8,4 +8,4 @@ EBUILD protobuf-python-3.12.4-r1.ebuild 1747 BLAKE2B dd29d5b90951e57bc5a64f8ee24
 EBUILD protobuf-python-3.13.0-r1.ebuild 1821 BLAKE2B 1ad689be6b15a3d334ba98a71187059fc77137c9be4357200919185887a9a111d1d8e2772afc0a552c52f4f3f5b3d01e6de0dc8606b33bf41379eaf54a618529 SHA512 ae7027d8366dd82b52e17ccc7f7ec5b5286ab143f2ce172792bcb32ec3f2792f49d62f91fe8b3b271207d891872d35518c08632eca26e18d4c50fc37e69690d9
 EBUILD protobuf-python-3.14.0.ebuild 1620 BLAKE2B 006e390772c6b76fc91026e991fcd800e03259be617c9c35ab97201d9b34d680ac98f651457b35090d0edbca0026233273600a8155d458d93181542febaf278d SHA512 f48b96e11ba26ba00b42f9bd57a185a93648f0725149dd74d4fc0319b81e6c45458ed8ff0202b91c8991c37ec664e6bf256c567e43f88772705b42fe4a53a29c
 EBUILD protobuf-python-9999.ebuild 1521 BLAKE2B 669efa900f2ec6e211f3b57f8ebc9379d6a33f22284d569a8f6e6e2bf0624afa0a2522b2f1e81a6227475fea270a9b70776d5c5804cb9664570d0246df727f8a SHA512 32f1dec830fb3f88ceea118dbe92b8c1b3b584c0005e29ee9c8e699c84da591436b574c7e5c1eca1a66aeb09ec0c1032834f75102ccbb540633b80845ff21aca
-MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
+MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index fc2ddd9a8987..2c5cb49de341 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index 62140267a607..3ad489cfe60e 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1,3 +1,3 @@
 DIST prov-1.5.3.tar.gz 121405 BLAKE2B d3c854b9631e68ff8d71e90992c6238ff3a5a0053efe2970a95e3f4584e12637774ef23f3d00c2c3594ff250175cc706f1d5f4d04abd6b24cbb920f588fd6716 SHA512 b205b978320c032c07e96f75a6c6edd4f046e4e219a41234c3fa12dbfa5514d16d56bba602617b95417918ee457c6a7f82dc228066f8a21edd28730fd20494ba
 EBUILD prov-1.5.3.ebuild 637 BLAKE2B f8fb3c233e4654e75b8ca1045167babe4e7fcf5e5bfcbfec3e1ef09e99e8e34045783883fd14b08c687767ca3b99daeb2eb68916692ca701f610f501aedd2eb8 SHA512 21ce69e9c63130d8082a23dcab8927ad5e4b384394ece584c03e095801bb66f9f2afb6b7b0d15ce8253fdeb9d342acf9b267dfd0f0cdb0e0681d14b00f27365e
-MISC metadata.xml 627 BLAKE2B fd646f9056e549fceb4139925b441e564aef041abd9f4205a39b020731ba86991f10664501265357d12a72b32fc5e34100d1516c537f28bdc21732fd6ee0d47d SHA512 1f8a4f451eb369a0fbe136bddb89cd2e61b5900bf4c28f5cd452101634a0b5fe33644d26a9683dea337d91b88ed9fee2c1060e456b7a4576f164a9b5092b084e
+MISC metadata.xml 656 BLAKE2B 83b3b41fbb9a5b71c96410ed587e8aa42cdd986800dab292c9f9af52e0d2140fe3eb023e8eb55ca5e67e5fd2d13aa88d8ab2c683ab6d0cf54780f79a9e11bf83 SHA512 c5699b580c106d18473fa5840ec1e3b073310138e26bf4b3e5cfe2f6932cb5cb7c2a0de0f176486b1217a1c7c18f880e0a9c7bdd4a7d9c7973bcac46262be96f
diff --git a/dev-python/prov/metadata.xml b/dev-python/prov/metadata.xml
index d993abedb96c..07d64264dfee 100644
--- a/dev-python/prov/metadata.xml
+++ b/dev-python/prov/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -18,4 +18,3 @@
 		<remote-id type="pypi">prov</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index a3f6e158fd51..99bef449a643 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -2,4 +2,4 @@ AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
 EBUILD pweave-0.30.3-r1.ebuild 1371 BLAKE2B 1f77826512802801e4f18786f7a140ccda82cac14c0644798602d3964c1d47067338d4cfed9d2b54e1771517f78868e780fb3060d5788cc6453a28ac9e9ed978 SHA512 79973c9b0e624f3cd60da235de74c6966c665788f10f46e19a5e8f50204357dbe28dcc060cd9251fe9ecf86fd6e819a0c193b0c90c87b102a7a35a29271e94b3
-MISC metadata.xml 444 BLAKE2B 13ea45e583127a391582adeb305b4bfebe98f667792d77e2379df73241706ba2afacae1aef74db86e97d344c2dab0342c2aa8220eab4d6bdb309a9fd422835d7 SHA512 0275d849386ff44431d6f35279f33a5c971503949535e72bfba94aba6cb5bc1a38369cf2805bcd2b153af52751e1cb0229fbea7abdee1f79330cff197ce5a01c
+MISC metadata.xml 474 BLAKE2B 2f34e832ddc9bbd21483aac27c4e9dd90b56c91b5f8074838eed78f215eea21b097c945514cc4012e16077c1ff7a9ab29ae9bd1d9d17998067239fe57c16c1cf SHA512 d6f59c259eebda10accb40b9606b1436d2064c03e74713468697d3f6d5479c60f55b659c1309cc1f534352e7d954d73b952397f6788de61a4cc83283e6b54483
diff --git a/dev-python/pweave/metadata.xml b/dev-python/pweave/metadata.xml
index 4e2e050964db..3bea03a73f76 100644
--- a/dev-python/pweave/metadata.xml
+++ b/dev-python/pweave/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index acdef7123685..b178009e5c81 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -2,4 +2,4 @@ DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e38
 DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998efd602b6228f21db6e5b3257563b4f7352221eb7f354ebe431910b0b8dadd52558233261df557c6a7943b7ec138c4 SHA512 fd291533dc5e78d75851e61ef2a754d9bdb62cbb5e04c86db0d6ea2d074a1e920b1ff50c136df3dd640cb64deaccd4f187c5af02c586a3d28b8c74dfe4143893
 EBUILD py-cpuinfo-6.0.0.ebuild 528 BLAKE2B d600632563dda508e9de69ef4120651646b82a9c919051261faa6b2e303f6a1ace445a431e7540eb8f3fd9c76eb0588bd1840bce67a626527e96c22a1f1b79fc SHA512 d3a4fa095d1460c345b1b3046c3ab08bce7059d3b6a7256dc52ef5cd321fa93fdeefaa77afc475ee3d4a49fd5a5b979629552add27fe5defe84d31e4df58eb86
 EBUILD py-cpuinfo-7.0.0.ebuild 502 BLAKE2B 8da0ce27db88039ea6c7e12f015433a466e440006b6e24a0d14c8a047b8abaade732757e3a276419b24844b156b4052abf67a3e4f5fc56355ea0eee63a9182a7 SHA512 884577429bf5fb17eec88d51836945657cc6ddb14fb4d693d9a5d40b181ca98e47c20a98d1a9dfcc9fa057a49e7639c8e0c59560fed396c5e51234482d812a00
-MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
+MISC metadata.xml 531 BLAKE2B bc7a99b8d7291478da528dfaddf83ef3297f97ed7b1516a81291f36fe7387c7611b4ad84cad47a16eed622a1976e6e418dbc7a2d9e4a853ecd60bc991c1ee438 SHA512 e951485f6fdcbfb48512aafab5fa3bace39dc72a327888de2e38dc209490a5d7e897974b45e3fcff3fac965cc1e283a8a2bf15ceee131c5a48dfb593044928d7
diff --git a/dev-python/py-cpuinfo/metadata.xml b/dev-python/py-cpuinfo/metadata.xml
index 61b8d8981414..8b175ffe09c6 100644
--- a/dev-python/py-cpuinfo/metadata.xml
+++ b/dev-python/py-cpuinfo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 23ad701141a0..738a240648a8 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,3 +1,3 @@
 DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
 EBUILD pyacoustid-1.2.0.ebuild 692 BLAKE2B aded1d5c2729a9a08abfa266943aa768070f4b2ced5461c1afe6fea633eed8c0c5335de04be1cb159902303c53c061403250a737116aac9399bbfc02ffedd415 SHA512 e016e1212819d5718bdd7c0ad8dfdc89f39cdb4ac298b240a1142d4be184071b848df6b88a79ac85ffdd397d0ef4fd8c4aecad7c07432ac6534f6c52704aa609
-MISC metadata.xml 911 BLAKE2B fc4c4a10000f8c9ebe95b4687cfa087b930b9f4ad3b2a94e8e6ef8e3d210ba618824cef6513ecedc4902172b3255b43096cd8e132b7e0a68498fc70b9b9bfb59 SHA512 fa81f319c0c6e6963e8b37570006e411374191551411005945dc64f0c75242a7585aab6830f13b527ab0efc7f2ce56e260571c372c93c8c026a775f49709cbee
+MISC metadata.xml 941 BLAKE2B e2c0f2ba00e81b39ca18239af61369b3bc9ab8c9443ce0f38b0fedd944ce66970e08228596aeab5be7b7cb65040255bdb8a3e5fda27d58b13b5ae41e6de4e4d3 SHA512 56cd3cd86aa7685345ccb2618b98195fe4d890a8a91c4ebef2c9655c2941a5e49199f4600858a42101b555180a38bf62006278fe16e4d69d0a6df3e94b824f5d
diff --git a/dev-python/pyacoustid/metadata.xml b/dev-python/pyacoustid/metadata.xml
index 2bc252775293..4b42be103549 100644
--- a/dev-python/pyacoustid/metadata.xml
+++ b/dev-python/pyacoustid/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index c23ae5f7dfa6..545c2ba8c3d6 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
 EBUILD pyasn1-0.4.8-r1.ebuild 593 BLAKE2B 10470e9ca8bf1db920bf5bca31874dd1dd5b0616bc7f9210d48161ab2f5c243e8c073fc60a2459bd54191cb6265fbddbc65265e595d50fa775ee967b725fbc24 SHA512 15a9bee487db5bac07444a1950035b7a5a696ed682a519cfc348723f68a43a3ea1eb9d5bad04bae18667b6d720f39ef31f98215d4a4d342ce9bb50fefedcfb04
-MISC metadata.xml 400 BLAKE2B 9adf4eaed1b7630e838706dbf581c27980379da5a2067674d642848047c73a90716dca904ab9b1b1147eab772474679b4692c341493b51f44416a49010113e46 SHA512 dc1546a7c210d82019f6dfb188015bf299e58be58e8e3b7a37afb04de85ae875dd63f38b9e2e8983958d86a8a9bb1aa723a3ec57106311605fda146d4d38f055
+MISC metadata.xml 400 BLAKE2B 1b95895b1f394ae898e3020ea8deb32c25f4432d2a50d7e0610a718440ffa9332067e34ee7ad0a6457a44b6d129de509c4cf1099fc6b6dca9cada1c7de1e8613 SHA512 7dc53765dd68fd979bc652e3021df38bb9301dff8ae72acc77478cfcfae1802342fc197770df63308c17adcbce6c4b6bec64255645004a8b885dc73afaeea316
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index 4d0b9f3334a4..b419202f0d64 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 18de9313adc9..95c6e52828f6 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,3 +1,3 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
 EBUILD pyaudio-0.2.11-r1.ebuild 1089 BLAKE2B d60b3f15260e243d3554b75163a9c2edc68fce53fb1ffeda485db96c6afd780658c6aa163a4b4336804a97928a4e2ce5d68f5aca281bb81e20a247fc3177e2ea SHA512 bb3dac722884879e9dc74740880f7ec49b83dff05e28027573a25c25cc1f97e3ed84f1d16978107b93d923b11cd6872b9ef6af38f9b17c6eaa46c37ed9032ebc
-MISC metadata.xml 598 BLAKE2B 21f9980ccef4c432d1191c9917405468d75b0e9a18895e70dd7c9abd8db14fae0142ef359e63816d6ff7bfad9a054118142d1b5e0a540a4a0c04e795ba290a93 SHA512 d6d33616d6f1dc38e6504807d9b4040d052e4c96099276dd8b6b5c456dca4a7dcf24f25f13813625a4ae139ab2fee68156cff696ec5658753bb282a260f17955
+MISC metadata.xml 628 BLAKE2B 20ce589d0f26e26b1100de8b36fa3e5529a9fb812946512ec0f9659565b9ad62b04745ec066e848b1553e6dbf9db11c7ea2d7d4dfa10124c34041d008c4336a0 SHA512 30201d8ad3a926f1e8a79ae94209298ab14d8ad327f22ba75ebc09c5721cd69dab7965ffb6d82a5db595601b487f5a04104c16702b4153181bb0459200d481c1
diff --git a/dev-python/pyaudio/metadata.xml b/dev-python/pyaudio/metadata.xml
index e1eb80143bbf..63bcbc986c1d 100644
--- a/dev-python/pyaudio/metadata.xml
+++ b/dev-python/pyaudio/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 354962325886..5f6deb052f6f 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -2,4 +2,4 @@ DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
 EBUILD pybtex-docutils-0.2.2.ebuild 550 BLAKE2B c2e4f7f9c86187f3b7cef9958b42520f581069ecebf66fb8eea66eb91862bd74db981e123be82c9d4212a42c26b2a48587e5e6fd4caf64b195084d8c6fd2c5e0 SHA512 b82b33269520d226dac81bd17693dedb4fc407cd67bca1d238209262e1e454031f880a18e4d68c94f0d014761379a1f91439063300ee3cd1dce3d9febe7c1e16
 EBUILD pybtex-docutils-1.0.0.ebuild 519 BLAKE2B cbbae5e244ac1fa35e72793e417ea929844bc1871e8e8070c1e38f38188d329f953de8e62e24269811d2fcf20ca54eeefd5588dc8e2ce941516406dad5eaf604 SHA512 cf105c7c72a509e9adea923063775492e3371c59a640cacb8ba557befe4bcb541b64682b219981083ccb0c87085164aa16119f320d80479743ef2b9cedd4e5ab
-MISC metadata.xml 520 BLAKE2B 64dc3b8876d4414593c121a311674bacebb561db03300ef8deaeb338a81eeccf5eba4ce73399aa363772e734740af130cb473e2e8de6c85c003a609edfc213c2 SHA512 bdf60da82f1dcc5fdac92f0c636f428e9808a705248e77dc3391421e4067badbc548d9481792fb27866b50a8487f9a6f714522f80f6ef4db354eb21ea08c20d7
+MISC metadata.xml 550 BLAKE2B ccf2aa474b5271ed751945ff17b446f6f2de7b9beda22e8a7e79441bcef2955f93e9ecec15f9be196bb041cb75476464805e696dade44269ccdce2089f26a135 SHA512 ad156d81b65fe70ff053b2bd78b00afb7338cfcfdf0b31191c852a1fd1cec2c53ab4db4d375b433d2b041c4b7a73de351c3d4c5d1905ebc7c3fc19eee576ddb4
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
index c212a7a9b54f..e6d5218bdda9 100644
--- a/dev-python/pybtex-docutils/metadata.xml
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index bfc64ff3e257..42beddab6a63 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -3,4 +3,4 @@ DIST pybtex-0.23.0.tar.gz 400649 BLAKE2B ae841eb98588fea55dea59a90be4ea5489b115b
 DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
 EBUILD pybtex-0.23.0.ebuild 763 BLAKE2B cbe7bcc848e40e2b55b9dc8e63ed0dba479accca9538676cb0fc23a40fa35d03c02be31796acda8ac2f8528af18ec74256989e48f9dde98c65a342238302a8eb SHA512 5bb9b9d14091f6aae1f246eac11460b33b9e4061ff159b52fef7ed7a5ec05aceaaa96fe8d2f7b79611725c2b216b8e0ff990b81c9b918394017c920114f42540
 EBUILD pybtex-0.24.0.ebuild 704 BLAKE2B 1a4350bfd74869b673c6f6e1087729be4f682938aefa28bb6b24c91426306078aee8b9b87d0289dd520ad895ca904e85b241cf194e7dc991d46fcce5eedfacb6 SHA512 98144f8fcd3738d2d5ede84c8c3e834a8d1200cd691107a78719765f46d6721211de9d7de32c1aecf6113bca0c44524a2c6b2af2260ac727997d3292b0881cd9
-MISC metadata.xml 522 BLAKE2B 62e314da62e360861bbe2fe0a8c71dab45a03aeb3161adde5680e19b3d42d51c75294d288b7e7d89483e9dd9392f52b935e1ae33e0f732376284d988061743ec SHA512 9a27f72f6b1c15e6f30f33afd02c830949032c5315bd3b4cde8fe136f82602b32b1e1f7fafb12c58d2decb18e14bc88dfc507014b263dc1911e2e4cf74b677a9
+MISC metadata.xml 552 BLAKE2B d2ad25afab203d540cb43364d63b5cf816b76e2c5f83aeba6a70fc8fbb38ca8c83ac43bb231ac138dc5df874b7f4777c24aad4dac4c30e8c58fbc502e4b29aed SHA512 73bae3b0aee3e77ab33785af0edb0c7ced7478aa8f8a55c54eb0de10f98dc6291913fa24d92e70243226ab479162ac3095db5aa5d6f65fe9d3316d2f39f5f198
diff --git a/dev-python/pybtex/metadata.xml b/dev-python/pybtex/metadata.xml
index cf290da2e8b7..18726b475ce4 100644
--- a/dev-python/pybtex/metadata.xml
+++ b/dev-python/pybtex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>william@ewpettersson.se</email>
     <name>William Pettersson</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 889f6a52b39f..6c639938c8f4 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,3 +1,5 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
+DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
 EBUILD pycodestyle-2.6.0.ebuild 896 BLAKE2B 9cdff512bde9d6728005fed91d5246076749dae9d3bf90aa6bd408fe997366eac83d11ab97dd527798068be87a12d4e23a281f0f8fe1c2e0759a9abb757a08eb SHA512 60c98a82bbbbde8873f5d5f2d2ff49a2a0fb8787f22a392793decde5453bb887f31d3c7c1e2000c51aac0f192a8b400282903926cb05c20f0831c70d855244d1
-MISC metadata.xml 360 BLAKE2B f3f8ecb3bc2ed8eab2e2283967a5a7a94a5149302e8651e819204810bfc7fe43689f0b1c35824a737fbffbd5967845ca089a539dcd0b50704b6d5a219e3406a6 SHA512 2364901eb99136d33c8343c14fdd7d0f83e6328c311a5a8395068724a2d15d8dc6c6ade8026336ee92cf105e589d7fc960780f70c938f67f48c797503a956e5a
+EBUILD pycodestyle-2.7.0.ebuild 872 BLAKE2B b3796226136f4c0ba08cbee34fa7ac0983c2fec94bc58d3ba67217636f08a475eccd21d5736837c4fbfae1431318a93526803c5aef9baba57747684cddbab620 SHA512 3a3d33aaf458a61460dab66ad6a892d3a17309923e8b5404d05949d14b25916a6e1b19f61ce57e60cdfdff961b42583b08a7cb3aa1962554012c695c36736a90
+MISC metadata.xml 360 BLAKE2B 87e79216747cc8ad94f6862c47bc9dc89f7f2060f8386f4d7c8cc4ba27ac7da428bd90cb4ba063883e5ed158b82d50276579ea7201ce84bb165fd70018747225 SHA512 45f5de422ab2b65a88d3baa6c87411d4f5bb5adfd7c7d45fe1c28bfd45d8c3ab0b391eca1e5117c1301b32ca62ba023b04199ed5efe13b84d176004ef6ebe3ff
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index 27bc28dc8541..588a34161552 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
new file mode 100644
index 000000000000..e873c0815a43
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+}
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 0bf05643defa..d022bac561b3 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.7.1.tar.gz 3526373 BLAKE2B 9adcbff206bc856fce1eef1784734c5604800cff350d32a83d53a4eaf965673adac797f510662dffc70fcfd76a7102fdb9321ead89d765954ffccc9338df446a SHA512 ac4d88b2398bf0364beaaf3e2e468be9131dc0f8088bfce8be18d9eb5a7c093db84a364931884fa7c493dfae81036ec63bc7c689ebf49e961eefc0c4853a0131
-EBUILD pycollada-0.7.1.ebuild 985 BLAKE2B 05fce9643f5bb4fe31caad90ff47dd2b60819e7952a70ad8375548cc08f8ee7a346541540cf1911d3317c715852b65186464c8f78ac5128b33717a826354277d SHA512 037cc96b04213d8d5ad9855ea5bbf1abaf51756c2f04c7fcea68f0dcab95a9114e4d937ee3a6abe412b9ad1a01f2c81f50c7d46c7bf9cdabac3068c3271440b4
-MISC metadata.xml 715 BLAKE2B fdd72dd228457677702a82e955c3700ee09bcd8d0c15a3e6f09f48051fb31b40842133cfd7456000b76a896d20804b9857921b8e700e55f2a2c860fef21b14cb SHA512 ef02fac58304610cede2334c166357ae733c5caa8eb025fde5dc6efdd29544e481367041a623695e21c590e12ccdecc6ff4f73bd57b628d08dddc78cc6f997cb
+EBUILD pycollada-0.7.1.ebuild 987 BLAKE2B 768cc873e5fc12023099d48e6bed940caa672ab0546c20d2d27d8dd176dc5dda3def3920864565f9326370ca49088ba3743e1275c061dd8af645b7beae19e612 SHA512 694a70674bbdf57d0d30c4a64ac0d64ace7e87f737ab53f4aa1b3a8d615d1c355ee8913333c784e9e6370cf155e7fe3f9290224004b410228fe98101bce4a24d
+MISC metadata.xml 797 BLAKE2B 1bfdd2724432f602e3650988be1ff58aed19ebeccaba5f3fec92372818ad1117e473247699c9f7aa703d08636a39ff27a57dcf8acda3159f019f1c34368cb844 SHA512 e218453e021b9b850eef85117378c1e95a659888a85120a3e15040cf36955a95178d26b20f0dc949507171656685caaafe2a2d214685b1e0c1fdfd8b3d64b8dc
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 83b01daab497..73b12ba6c1e4 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>waebbl-gentoo@posteo.net</email>
-		<name>Bernd Waibel</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-A python module for creating, editing and loading COLLADA, which is a
-COLLAborative Design Activity for establishing an interchange file format
-for interactive 3D applications.
-</longdescription>
-	<upstream>
-		<remote-id type="github">pycollada/pycollada</remote-id>
-		<remote-id type="pypi">pycollada</remote-id>
-	</upstream>
+  <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>Proxy Maintainers</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <longdescription>
+  A python module for creating, editing and loading COLLADA, which is a
+  COLLAborative Design Activity for establishing an interchange file format
+  for interactive 3D applications.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">pycollada/pycollada</remote-id>
+    <remote-id type="pypi">pycollada</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycollada/pycollada-0.7.1.ebuild b/dev-python/pycollada/pycollada-0.7.1.ebuild
index d6e0f56b03d1..95554b5dbc4d 100644
--- a/dev-python/pycollada/pycollada-0.7.1.ebuild
+++ b/dev-python/pycollada/pycollada-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-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_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 19a14fcabc07..389732f8b97b 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -2,4 +2,4 @@ DIST pydata-sphinx-theme-0.4.3.tar.gz 3279359 BLAKE2B c2a57fc7dd70f8d57a0b56bb45
 DIST pydata-sphinx-theme-0.5.0.tar.gz 2556070 BLAKE2B 10682a631314991b89e05f95ec67b133a87391a00048a06505cb6c38d4106cf7162c9d150866d0099a18512164e59224601fd0e132e4c1de56b47c42ab357f9b SHA512 12731065d463cffadb78b50d31815eadc41ce5214087c7b5d859fe58bb672e318323880a9b915c7d4e5b47e5bf9a8a1b90d14695f2440e4f70d129dbe5d3a40e
 EBUILD pydata-sphinx-theme-0.4.3.ebuild 978 BLAKE2B c1195609b74e8a79b596d12ca3546ec6e2a338c4bac68bb5aee54d206a8954038fc4d2b88380703f7db0a516d33eadae8557fced9194b07a9589723536aab1c2 SHA512 8bfd6a630fce8520733d012c22b3496786dc35d3f5a252f5e5b23a05e58b5a971db4feac105ea69682ceeafc2a07f83d0e4dedabc38cfd93a21ba4e43da6b895
 EBUILD pydata-sphinx-theme-0.5.0.ebuild 883 BLAKE2B 14b08df2c133696eef59bcb47ad391802af4deab48a63fe0f119e6fd59b8cd7678ea5b9526a69db83edae0f2dc537695f3f84ad58c2e437eff5f339ae1491d33 SHA512 6a98b8f53cd49c818dd9e704894646d37e28f401170faf45a74379ba97fcbe6b2c79a690b9c2c0c6e36e6a30667a52905557d9d7f60d086ee915ff058ecda1ab
-MISC metadata.xml 582 BLAKE2B b4438cce7d7df99e76b61279181bfe6b249df6fad33895afeec44bfc25f44589804b51c6542bc7f75866d7b30a10d9b083bbf57de27808e55db15f0517c096a9 SHA512 3f2984b687c60d565bf1a2b8890b6c044c138484003fd67589035f5a1217c866f0157e0ef9956ccf5c35adf337be822ca34dd3c70394855c7c4916bca15deb17
+MISC metadata.xml 612 BLAKE2B d6f4bb41753cce10173d9cbbd3f6310c7923e41f676dd3f593e9576ff889f3a4056165679f3c774844e9a87236af846232df08783c06247caa04b33255151380 SHA512 46b43f8e79feceb01f66749fbd4f04459a1b1922c967b3a9a43b78f8fb6668a0b8acb8fe1da3fa61f785a2e0408cb2b360fb67875219a84bfbda09c6d58ad52a
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index 989dc41dde09..8eca5b011329 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index f3dffdfd66b9..e0ca4a60ec3c 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,5 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
+DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
 EBUILD pydocstyle-5.1.1.ebuild 909 BLAKE2B 78ffa0615df8e0b6ee603a26d800321f90d0528032084f515a284c7b8c3af58dc75be2f47abb26eff07143ec2464235735441c15c5d1835d1a9ab29b199a78dc SHA512 4da34c492a74c28dcc9b2212b9a79d7cbbb557b2c4cbd8bfa74f29a5f6c70f59dee98f1fe4d55c5376a1bac106ca0fc475dfbf560a1e8415e371e147793055f7
-MISC metadata.xml 787 BLAKE2B 15d107190e09858b1c4642148e64d288ec11c96509ab438488cb1aba5ca0640a8ca779c585221d6bfb066c5983f6f243c2c74fc099dbd4b09d026ec48dac662e SHA512 1d38ca977db0ecf99ce5c8a8bf6b57f897b7fd1d9b087075dcdfc5891959a6bf15baf0a8ae44202fc6a9645d08a0a0c52fa6e1e39ce08f7d6eb80f797476cd70
+EBUILD pydocstyle-6.0.0.ebuild 875 BLAKE2B 8b3b39f07dfa8c85baaeac6cbd3cd775b63f357f63b9ceda46e814ab0d7901bd44268082f51227a222548d871eb44d1b92fba2c7c3530742863ac0ac6e2fdb8e SHA512 f6436fd155f5b2bbb5a8e0d3edd3a325bbdf77fbbe20b1b7339496c69c84760cb46e6eb797f2e7625b96cc77164da90f75e897127589c6f06af5b7f39fe592a8
+MISC metadata.xml 817 BLAKE2B 850fe7b35b30a2d302a49409979b3ff43916b19bf2e970da7b1cad7e76cabb66c217fa68198959a1c2595766398151221643184812d98165045e7498b2d38932 SHA512 8e9b85d0e13750e8beacc06c3c448a6a9e3876216d882f34c7a0f75bf64911aa8335dd38221af8852fa399008ba740c5dd3038f465de14d55b465c3114754920
diff --git a/dev-python/pydocstyle/metadata.xml b/dev-python/pydocstyle/metadata.xml
index e21c2c68f714..0923fdb760e9 100644
--- a/dev-python/pydocstyle/metadata.xml
+++ b/dev-python/pydocstyle/metadata.xml
@@ -9,11 +9,11 @@
     <email>monsieurp@gentoo.org</email>
     <name>Patrice Clement</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
new file mode 100644
index 000000000000..13f713bc7638
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+src_prepare() {
+	# no, seriously, you don't need to install it yourself
+	sed -i -e '/pip/d' src/tests/test_integration.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 327f7c1f730d..a8a4ad72f159 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -3,4 +3,4 @@ DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac
 DIST pydot-1.4.2.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
 EBUILD pydot-1.4.1.ebuild 921 BLAKE2B 9fe83e9bc4769bf75bc0148e04b2e45ca2d5a349fa84aa590505651a3ec85564662e2a15d070fe906df251b7777312d760fa7ac9a61eee2b4be39d3709ebb91d SHA512 eee5e4069681e0a24116d919d77f0c0e1158edd9ad7aec3f5e9a3e24fa4a7f1ffb09e03cebe69b35a0a0ac860813b8577381966c0979f3cc6f06bc5edac7a4f7
 EBUILD pydot-1.4.2.ebuild 870 BLAKE2B 4f5df3506ced7df19443271d67f608ebfa3885e8c19f18efd440d0c3938bd47815691339d29a64fdd19ebc7b906a870f11d8bd53b7d99884d3214f02d6e02fc0 SHA512 55026fab8691d8c647967ab533ffd347039f35d5d0e44cafa4b5a8fe23e0a0a300e704fd5dc78266f9f16f2022f6b994e0562844b4fd4488c9ec9549328cfea7
-MISC metadata.xml 371 BLAKE2B bacf89a8119699a66d6747fb44ed332c702888255a5c43bc5aab332de7de3a74369f904d7acbf1fa24d7bce044b46168206f85f4a5c24c8d6a06f7eb340b6c50 SHA512 595a09120356df285eca84fcca5f676b149580ea8df2284f2eb60b1c9b594b8e01088f0fe8a37b285573fdd79c0065891038ede2f526676e0fb428b44697b08a
+MISC metadata.xml 371 BLAKE2B 2593c34d4b9be527091b66e955309dbf0212067a131283eb68fdde7d9b46e124eccf9d0b492a777ebae61d65b2ae72ed79f2729b51a2512af05a6b6e42f94588 SHA512 00e92e9c7ecbaf0e53463ba97ea63973786cd9948cdfce8fc3f4fdf5cfa3973b6a6433d5369c1d956085b44675a5abd994b193b66a07c09ec1a5eb2f78aadb1a
diff --git a/dev-python/pydot/metadata.xml b/dev-python/pydot/metadata.xml
index 479f36316c2b..5a80b3c92244 100644
--- a/dev-python/pydot/metadata.xml
+++ b/dev-python/pydot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index da5a7997774d..562e66d14e25 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,4 +1,4 @@
 AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
 EBUILD pydotplus-2.0.2.ebuild 585 BLAKE2B 3d41c9d3aee7de0082e00bb1282505b4f9596893d1f06bc284e677c0e28aeaba72ee4acd5d0e4a3c13d62fd56a2b2a224dad1ac80e712b9f0ad6bfa74e9bdcaf SHA512 b3f1f3da9e5dd8db7fa7f0d76c1474fe86ff5cd04336338ffa890d932df6835384db1789bf52d39b4e2b2cb10c026dfb8d1860b4f167ea5157e5d7afe45dc40d
-MISC metadata.xml 611 BLAKE2B adc010aa3996e00e05e4c8658db14b7ca20c0199864e74f131ff5a8ca0e850abe8b823576a9d77fd06184379437baed7b9554f41c68816fe0d112b9d513a5ddd SHA512 f3540cc6320a0896ebe432d1ed29e90d62960781629d3f9478189eca6ac149dbe7efecf31b6036a021a67b808fa5057ae704157a5bc9324cfdd835cc96c4de40
+MISC metadata.xml 641 BLAKE2B 9e863ac2660bc1c85b171ca98b3f6703528096e62a145c87c0d6433b849b69202ad92e82e6ca0ff5570ceb592ecb6e3f0158f395c164440a582f619845ac38a1 SHA512 7535da1f220bc8d12f565f7e5207e334670233b44f33aa8e8635c85a32d3ad4ef4ab8e7b588afe6628a77b7a4da526cb53b5364088f22c96da2749506fdc12c0
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index e8da67c1c7f1..52baf8c04342 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 666ed597b9e7..d385519d7cb4 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,4 +1,6 @@
 AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a17bcf39804e6787ed2627a77d3b068a8ac1d7951a207c83e1d76812ac77b889d6b4cbf0b1cc30cdd8c59f8ea886ef373 SHA512 47e1c624358edd34b3ddae023275a81ce529594689c3b67ec2c7b5acec84b9c9f426b9f79151a1ec3dc89b39335f11e03cb22db4f4c63399e876f887e3f3ecee
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
+DIST pyflakes-2.3.0.tar.gz 68452 BLAKE2B b108dc79ce916e1d1c05b13a167b11bf5350672f5513d6642c0c9f6b46a46d558acf1cb5035f6d987a10087242f2e1040d271c4270d1f510156883d37a7c658e SHA512 e65e534139b7739e742eaa07e8803387f20bba0332247688c864ef8fab74d5851c68e9705cecae158c8d178ddbb08d54aea7ce77910979be1cc3fea57687fce4
 EBUILD pyflakes-2.2.0.ebuild 738 BLAKE2B f7588634e0315dd9a578facb16fecc05465de1502329ed933c699259e76dfb47b82e494a3666edfaf41db3ef3a52bba7aaf7b8c1556ac3b24a0a381e88ebc4b0 SHA512 a34ac88d1c188197bab8132d1d4b12bcef21e63518430489454d652d9191fdd981cc484c0b28b84c585f276bc290fa1ea50071d85d866eef2dad1b166573eef5
+EBUILD pyflakes-2.3.0.ebuild 657 BLAKE2B 48eb014a7fac3963c98075cbf6727bf0d725b53ad95bfc618bd15ea0505167f690ae8e2b58dd5e6deb153c78c0c90131ef2a57cb26168e92558fb8aaf689eadf SHA512 72af1ee82da463e11b6e545653c618725326c6d1798cf778848c10348b9663c00904500384f162044263e652ceb066f84eb74f0db008028bea294ee81389b3c5
 MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/pyflakes-2.3.0.ebuild b/dev-python/pyflakes/pyflakes-2.3.0.ebuild
new file mode 100644
index 000000000000..160f694fe25e
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+# Uses pkg_resources
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 470625ed787c..2675fcaa8bec 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,9 +3,9 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60ca609be444b04f547cb2372090da91d2670307ce7068b964458e6ac1284402439bb7809c9735135d5e93a71d78 SHA512 1535a872c43e5f75acdfa7d325fcfa0f0f826e18602b28b228cfdbe068a382678c21568d80873f7af4f0b318e693adb38afa4d632f8294f716a47188abe5245a
-EBUILD pygame-1.9.6-r1.ebuild 2292 BLAKE2B 7216c2990d0f80f6b76056b5e7da097e0888a946087e81bb5263cd65c10602be95d572332c467ddbfb28609903536ce88e95821b8beba735ba296dc12c18659e SHA512 d5d852abf051adfa719b3c3bd4fd6c9f6ed27ea8c7383eac133c859747042c1ff7718cebe6abede245b13daa522b25f5d7fd718a51ecd8e74a6e41db17641bf8
+EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B 32d2a0539d064892d65ded4f4977c6c1e52f632ddf32d4e138a3a5a1a29a293a5762608e394d236bc0aeee71b041f184f2b05f86760c16d67dc07c0a230b5a16 SHA512 e39987d08942f0cfd5c26f482e28fa2ba39210a4acba7ff7f8b409bffcaeacb8937152e4d4aca1c807d7c4b05d8aa9c2b0a57f54296f9933fdddbf95e094fd71
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
 EBUILD pygame-2.0.1.ebuild 2040 BLAKE2B eb35b62f6a140de7c6cd79a5716d71ea0ed5901b069a0a9ca506607d2083a054fa94790acaf3776b7a5bd1924d9d27113a2dd956b6fef70247a74432acbdd307 SHA512 d410823c290477ed7930c620b1a55e94138906ae8801eae0a4beca682505834979c16f58d8a0345687f39bf45e57750e74983b63602779803d817e6699cf5cef
 EBUILD pygame-9999.ebuild 1737 BLAKE2B 54a56dda9bda27773deb654df0f280b239993068497be42aefeada5e7d78eecc5e325b5d7cbdec7f4abe9c9c8618263f6d5e1d0f26fc364f8321c82246472f26 SHA512 bcd9a20d10734b3ce5ecd3ea8a9e36d9474d92598ab8825eb13aabf80357c8a89fc8c91808ddec07620b4f3cc29e176535ff8098b9c3a99c2531dcbe74d46b08
-MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
+MISC metadata.xml 408 BLAKE2B 3b5028539460678f64c03fbeca341b6c5229ee15783d699436aef13eadacc531584ca740596df7af7c37fc55cdff67ec8b3be96d131bbfe3f1b6c0d88a32f3ad SHA512 f176a42dca2164a1bc81104e8f235da3c6f4cfd6d14a347a0a01b0917454d763b8f5013e902bb916880474854a8eef4e9db51babf303a94d2b7494419485d5ec
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index f00627a3b5f9..42c5a7753b8e 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 61a94fda0e1a..b18281a37212 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.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_{7..9} )
 
 inherit flag-o-matic distutils-r1
 
diff --git a/dev-python/pygments-github-lexers/Manifest b/dev-python/pygments-github-lexers/Manifest
index e4c32cc2d100..b314b17b009e 100644
--- a/dev-python/pygments-github-lexers/Manifest
+++ b/dev-python/pygments-github-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pygments-github-lexers-0.0.5.tar.gz 6337 BLAKE2B 21fb1a0627c9ebf42d86d6cceea3ebec4339ef29b1d881d8b3bd5f90060ec2ba76a69ae4bf9e92420a10950ae20c7ea7ff44d5fccf8add06be1f1353cd8b7800 SHA512 429a8a81eb0228c806b6fafe5e1c64be92e719170b1af666aa9c9c7923ff4058972a167193dd0ab1ace0395fa1f6621212f800b07dcce4e59970fd905e046d71
 EBUILD pygments-github-lexers-0.0.5.ebuild 493 BLAKE2B 6ef5e46a9b72ac627b952618d334b1f7aabe28eb4c951118b20d12d52caeff4955196a4d2e259a41cebddf0c928ce1380cf94157ef47e443f33e6e787e35967d SHA512 e0ce29d08c8d53dcc31b67436e6a6963106780291a0f0ade770675254c44ca585a0c5a9b0a3c594041182b2e225d6c2bb96beb08e2770707f648e6eadd0a1d34
-MISC metadata.xml 415 BLAKE2B 10624085521ef08b9c4940e52e0cb82bf448b185bc047d7aac6a21c8d040fd44527681f5d283b481fdeea76968b95ae051eb5fbd36046233580f7e4c85ec62d3 SHA512 073350b39334acb9eb53919267c3c63dfea0d68b277ce7abbbb52a9790a10456c412e9e01a565cb53c775d98384d61ccb28e62414dc954781c62c7aea78b0bf9
+MISC metadata.xml 415 BLAKE2B 3b27412383a7af51dea042367841b300a81ab124c7ff2c6baa8d625a8de51bb7c255796a1f52db5713b03b3f4157e3b0cd29a96e1a881f07b96d018b20a1285a SHA512 61ca55165516ae744bce2f81f495375d23273383cfa51f78732c5805f9936cfb4123218f1212d14cb68f33f97d6696fba6cc9e6031f9693a1223f5b008820627
diff --git a/dev-python/pygments-github-lexers/metadata.xml b/dev-python/pygments-github-lexers/metadata.xml
index a3d3849c6879..8c45e184394f 100644
--- a/dev-python/pygments-github-lexers/metadata.xml
+++ b/dev-python/pygments-github-lexers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 6d39094b920c..8ba47f54f3fa 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,7 +1,5 @@
-DIST Pygments-2.7.4.tar.gz 2325473 BLAKE2B 48e45f8d58e4d06be71cacbfbcbee57c69fe0b4c344c1dde2054912f1b74c67db19c24de2661acab7026ea78420ff90e4596e1a89b783ce79ebea12c8d3a7a60 SHA512 84fb2e0c52e4683d52524ee1d70c11a9ff6cc0b21fe6aa3e1a6c4fac393f87267756b1c04b7c2555799e387b2e9ca7d2e7703ddc1690a642aa263ed27510e030
 DIST Pygments-2.8.0.tar.gz 3999484 BLAKE2B 5267a4a9e18a01897906239d2cb4f508675e0de3d9a33ae9b144424b18883da53937d92755f8ab1ddc7b10a248031fb693b4012407079aca1d08c8924360e75d SHA512 7e3dd2119769b704d6bbd4867c85eedb0d3c8ac415280fb35a1194284511c6fe6c5696bf6515e14da7a944b7ad5aeb945a71e79abcd1a42949ca30bbfe2e31b3
 DIST Pygments-2.8.1.tar.gz 4000119 BLAKE2B d88a3a3b4626a33c375b85ec076120e3561d1719ce45f9f85595bf87f7e813416be934f7ea0022fbfbf1a8ba3f2be1c76f693ab9ece5325fe527a4922cf46318 SHA512 223835c78615207ad590d364ba9a0f4bc9b5815baa080e60b9b71ce7b8e1ebfcc7a292d2a2b1cd358c08d820fc89e02c4060876d37ee17fd9e2759c9a0dcc80c
-EBUILD pygments-2.7.4.ebuild 1234 BLAKE2B 1abc07b72f10c8bbc95dc597052682911eed7fbf49b3e9f37fec207cd602c3c4837200c84eaf00abccbfeba93641caa1ff033379902f69a04479c17cf72856f7 SHA512 cbe478ba3832cf4a28fac676e2608e7758052e4a166316a77fd26a69eb20995b4d04939271ad40c54bd58d26c423667e6609fbee45dff4bc5c24a961efa13b5c
-EBUILD pygments-2.8.0.ebuild 1248 BLAKE2B a13c017b5279c248b9cda129f413d7f725955417fccf38a4a0ad3877cc13fecaa9f90381037139339af83777dfd01c0e5eff9e3621b45afa487621a486b18042 SHA512 5ddb26823783fda50bb0c97626cafae831ed16977666b88e093ebfc464d8919f5c689b64f40e9e15eefda9e3b8aa56b240ceebb3686228fcee88598d2164e7be
+EBUILD pygments-2.8.0.ebuild 1239 BLAKE2B 0084c991bcd07be752533e24f59092abba753bed242cf649dbe73fe2d17f26e442da92e6c48eac075a5580e4ec2fc422142bab304cec78dd46ef6c6cfbe71752 SHA512 babbe7e09bdd78473c6fb915259ce9343d5774f1d71e9881f10ced57d316027f68fce5857bc0890bbf202310871fb2b2b2becef8a7c87c766dd1e7e8ac24ffd0
 EBUILD pygments-2.8.1.ebuild 1248 BLAKE2B a13c017b5279c248b9cda129f413d7f725955417fccf38a4a0ad3877cc13fecaa9f90381037139339af83777dfd01c0e5eff9e3621b45afa487621a486b18042 SHA512 5ddb26823783fda50bb0c97626cafae831ed16977666b88e093ebfc464d8919f5c689b64f40e9e15eefda9e3b8aa56b240ceebb3686228fcee88598d2164e7be
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.7.4.ebuild b/dev-python/pygments/pygments-2.7.4.ebuild
deleted file mode 100644
index 60843dcca483..000000000000
--- a/dev-python/pygments/pygments-2.7.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	# there is a known bug in regex engine of pypy3.7
-	[[ ${EPYTHON} == pypy3 && $(pypy3 --version) == "Python 3.7"* ]] &&
-		deselect+=( tests/test_crystal.py::test_macro )
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.8.0.ebuild b/dev-python/pygments/pygments-2.8.0.ebuild
index eb9fa4c20022..b900dcb8f524 100644
--- a/dev-python/pygments/pygments-2.8.0.ebuild
+++ b/dev-python/pygments/pygments-2.8.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 87099ee22b9c..7b26c969952d 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,4 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r2.ebuild 527 BLAKE2B 28753d25557ba5d5c988716c706e212c7f2fd8b2e7faf943d4a78e4fecf5134539c741e0a24c2ff4f4340c1a42c510514c12d345666841663ba1e42ef9d49df7 SHA512 e1ccfc5feb478a7e5901eb1bb531bd0782d391750a2eb1f33110aff630edd6354eb830caecb271cfd64289228cdc07a21c3c1c1ace7d0ecce59be286d4b56195
-EBUILD pygpgme-0.3-r3.ebuild 563 BLAKE2B 8b9fdc3a59440ee8c13d680888c41fc5dda9cf1973108b81f5dca85fb604ebf99ad385d743e1cee4adedc89719192bbc8a7b30c3c0ec67a3b0840b6dc8c1bc4b SHA512 68b1593d3ae358a1d73d7ff158ce51fcc90b3848578d2f7851b937f3475a3b48897dfea983479f4b5abc5d8781b8a298fd7cb8444948be5814e6efee57c0abf5
+EBUILD pygpgme-0.3-r3.ebuild 560 BLAKE2B a876a065522270394aee7ced60ec299719ec918d799ed94fb59b0c37d0d8f6d71c85cabf274d8914e747f34f74541fa1ed09148f44bc6cd3f9f7feaee5b47e01 SHA512 68ae3b53e885aa14e877f2b92eb0eb047adaa1bcc0f5ccf445f14cb6b6b966c326ecad1ab07bc2449030633020ed07d148d82e731a52b10c188939187c970006
 MISC metadata.xml 595 BLAKE2B ae2f409ef188769a5b454cda93e565cd3cf2a80ebfc6ca97d4ecf31e87fab1a1641e975212e9bf5196e5dbc1f0c75c4b853301a2e5f33fb2a6b482d1a862ea8a SHA512 c7638d6b3cd9f113fc8b0d159a081ca1ee4381c9f1a9aa1e733c6b41db819fee0da9f4d34fddf11827daf5babaf3f1c2ca5dbe274f38bc8a4845ab45d2d53179
diff --git a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
deleted file mode 100644
index 4b42660b91f4..000000000000
--- a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Python wrapper for the GPGME library"
-HOMEPAGE="https://launchpad.net/pygpgme"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="app-crypt/gpgme"
-RDEPEND="${DEPEND}"
-
-python_configure_all() {
-	append-cflags $(gpgme-config --cflags)
-}
diff --git a/dev-python/pygpgme/pygpgme-0.3-r3.ebuild b/dev-python/pygpgme/pygpgme-0.3-r3.ebuild
index 0f5f53075db2..9d7e3958ce4c 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r3.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 3e98591fd995..8390964bf16d 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,4 +1,4 @@
 AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD pyilmbase-2.5.5.ebuild 1528 BLAKE2B 53c15d9d6f57246d04bc1ce5e846973fcbdaef51af9f2fd1610c2a4e8a993b01459650d4c732c3f83b585ae654c2d41ffc33e1412cc048047ac5e887dae14ac3 SHA512 9f956a1b3e8224ab95e6e364b8b8f80eb4b68a52f4c3b5b9dea85cff7320a9f9dcb66170ce45dea5ae1bf48dadbd1592430fdbc8b2b9a897aa1c328adf286698
-MISC metadata.xml 660 BLAKE2B e1a4d9bf411ee4d67651d4783313d813652953abaae6b04b2e1fb11bea190f2d8611778fba87623ba859b6792225759686fcdce3f7b7690f569e64bac733f2a9 SHA512 740e753bc83c71ffd08c20d33a34a3fce7537d87b168d5ccec51f0810c1253e237fa6a97dba18651f17a8d9fa4a730d3d916ee46731efaae817651282e37c219
+MISC metadata.xml 690 BLAKE2B 857ad16bdb3ab2ac35ca5d8e41a5e2302aa7e130c0dac5125135ba92569959b91278cfb3da987e4647aba4dab3898d7de9c6e340e20551379592a1c90d236882 SHA512 357ac1026fdacfdac7ced27c40fcf936a14dac7a044e8b168de7ac126811df67fb9e9ba01f8ee0fcf40ef86906abf37880fba6a782f27f832ca889de04ea4e58
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
index 3aff5af80d0c..eaebbeae6027 100644
--- a/dev-python/pyilmbase/metadata.xml
+++ b/dev-python/pyilmbase/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index c42e2b8d3ae3..59968bcecb0a 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
 EBUILD pyjsparser-2.7.1_p20190421.ebuild 744 BLAKE2B 34cdfb147af916180e0ed06aa43fe7eb6e5d9b877b107f747edf763ae43b3bfe3959cfc85e01cc69c15a697f9156b8292f1ea2fd42bf4d9b3e1a9c2ffde4dc7a SHA512 71b4fb433125d1da59d9c2ed931144358a09a6c637034eaecaf590ad57432f8edfc1c0c918241649299e161dcfd97bea1ed9a51d54ea0ddef383a1cfb96ea1ac
-MISC metadata.xml 552 BLAKE2B de13a805265568997c7b7d48e6ceb7e412f5ba9ee0e00fe096f68655fc072c777e115c8b7b47e21a369f8b6f58ace7c174f88d6742b0086cdeb89ab45d322dca SHA512 3a30d39bb19e1f13d986132c58b62c0223a0bf9367e8357b0a3d0a57387573addf9e7f2a2c51c7236f78fa683c38d7dde79eb654f0c0e43aba5fe68b7fb197f9
+MISC metadata.xml 582 BLAKE2B 5abbbf08ca42bed861709c7e8df70074112efb8d5270cd628fa26902f9083a242ad9ab63a6aa1f74824a2eab29738c46a3fb0684182fbfe5d692ff35d0c86570 SHA512 ca17ca99b83926f956af099be27eb359f4b2b9be425e68e95abaab8163667fa744b12734f6b8e5f72a7e3e1f9c3d684e4b1c23e3b954495575ecc934f2528c3e
diff --git a/dev-python/pyjsparser/metadata.xml b/dev-python/pyjsparser/metadata.xml
index 12f59667a6d9..02f431173e83 100644
--- a/dev-python/pyjsparser/metadata.xml
+++ b/dev-python/pyjsparser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index b7a495553150..712af26cd00a 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,5 @@
 DIST pylast-4.1.0.tar.gz 39592 BLAKE2B ff1f9f025701ebf741e53d96c2ba0c34d7a165d1c248973874484ed0c2e5e24693631f31de516fb4a58ea14014cb38c60fe04b9d116128a6a259346f16085dc2 SHA512 90be1cafb9252c2c19db9b179350269dc8eec82545487394d671d411e4fc2ca10fcd85259874f72c39674474c75274446cd8c64cd5f2274ef98ebf5ba7fbb351
+DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
 EBUILD pylast-4.1.0.ebuild 800 BLAKE2B 9c615769c20c12fbe4113f99a4365c3add0ca22e040267d216085583b6e0db753738058ae5f1f7d6cb156ba402e29a0288e009f3b051348c6f2286ed25bb3024 SHA512 2913ca565d9a38a8ae0c37aeb7718e9f163804076882f946160502f11756b32a6067c334fe7eefb25f4da0407549150673823f75a5562b893e8b32fc5a5fb8ad
+EBUILD pylast-4.2.0.ebuild 716 BLAKE2B 405c7f80d9bee24f870d472ccf2d986bde96aee83648ef10a6188350810902eefb943d88eb7ec7c67d120287230dd35732d227ed4b841d166f720162029e9eb6 SHA512 424f36660fbef8e6f9b41243af25585bfa1d81f3788d153caca01e07a497a4106797711a4ac2b10f12400ef8fe792a477db106f1068b7be3ead46616877e2f23
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.2.0.ebuild b/dev-python/pylast/pylast-4.2.0.ebuild
new file mode 100644
index 000000000000..7e90d0011881
--- /dev/null
+++ b/dev-python/pylast/pylast-4.2.0.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index bda27b2f252c..b2fd24e95ac7 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,3 +1,3 @@
 DIST pylatex-1.4.1.tar.gz 301482 BLAKE2B c68c8bbf70c5099b3c3146922afe94dcf4f90bfc8644fa165ee27835f4a24642645f9849f2f9fd69656dc07dcc4807869275aacf33a1e5b9c59e539801f8e821 SHA512 55a5734e4d239cef4bcaafa0ba64eea013ba3e86d137de5a5f8311d70c949d783e2e7aad24d39d16a6febbe4bddc34e47248068e1328fe3f95f39a7c7019a3a9
 EBUILD pylatex-1.4.1.ebuild 1263 BLAKE2B 8ba4f3356e5ee3c4154ea9588c76927213150207ee86173eeb12bb2ad784d98511c61a3419856e2f8d653af983429201e41063537cfda349c5aaec6b3f1bbb67 SHA512 34fc9d137a0bdcc1ab8e3d3a6dd5b981736452d0cb8131030e02c0acf76a67ae5894fb9d9b884d42ea9a0e54287dc178dfe968637b060bcb50224f202d693b83
-MISC metadata.xml 743 BLAKE2B 10bb0e8cbed22f4fce7f22b92d6fc7a3fc4a784066a978889619a3943483cad6035343c98d4cb4fd65fdd25b02d7e51ddb9c18d5e78b62a71aaef8b1735fd9fa SHA512 cea3b0a7f550a7d515a88a14a6c71811322519ac0365e1bdd73463f20f12c7825778bdef3da1e43df9978d15fb53e5de37fc1e7195d39aa96b3ac79c0370a57a
+MISC metadata.xml 772 BLAKE2B b52d73480bb802c587a03e7a2e060f330abfda0db707e09f752c6ee7407ea05d36afcf24c20b87a1a7b6f6c253e7c52e560e8efcb288ac8a5bb7f6b07975151e SHA512 7f6970f707980003c3f398bdaf5f76bb30eb169d0b2fb8fc6e8183c7a71701498af51f0a8d2e852b7333a2f7787e257c882e1343231335000a8edad9ee7a784a
diff --git a/dev-python/pylatex/metadata.xml b/dev-python/pylatex/metadata.xml
index faabdac55f02..2357d8455ccb 100644
--- a/dev-python/pylatex/metadata.xml
+++ b/dev-python/pylatex/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index f6102d71787d..12b6c1dfb418 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,3 @@
 DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
 EBUILD pylev-1.2.0.ebuild 416 BLAKE2B 263689cb5f823718569112bdd193ea6f222281c37d399f76c6cb31a42f901645044673ddb2c54a76ac875a045379bfd0024e45177ee00b9b825f545fcc2223f4 SHA512 6457c40d491df46b0f7535d99bf642cbd9345fe460944571ffb2294fbf601c2d6630cb0c49a04a5683f851a7f075a31f9d2301a24a1407d748c640f2df9681a0
-MISC metadata.xml 536 BLAKE2B c6dae1bb2b1c4cab0e21338b8a15c921ff1902fe8a529106cd607f66547eac618fcca86685a6da17d70750a308d5b9e674dca21c0d1df743cb39d8408d8754ff SHA512 f6f55b11b0aa71af41f9da612f1a780cbd81a3a1149492d0893176be97d541dd6634a924e77347bd3ab08a2d83671bb9a8ecaec1c8fa7c84835e9a3705be86b2
+MISC metadata.xml 566 BLAKE2B 488a77ccff558eba537987b87b7427d0576c62fa873cb41028886252577b4af65b7525764753656c1b3913885b16a0b2c093aff0e2f066e7bb1a612167a9d447 SHA512 f028363b0700c96dca3ecb2286da5a27cb45c61e1fc17fc99d9c510f7b324a688927ec7129478bbc1d38036be83234a11fcf73274c46d8c82c9229c885c035af
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index eabc276bcd67..cb2cc6da3b27 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index d86a4873d3f6..fbd1fc3e8a4d 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
 EBUILD pylibmc-1.6.1-r1.ebuild 1530 BLAKE2B 7b5f7cce5951e290ecf61f492ed4347f4d7d67245dddded3c736d0a9445b8b5af521db7038d846fc3277ccefadccf6fcf9fafcf795bbf4c62c91720e455fc602 SHA512 c3be2a47e5a1cd542023c3464268acad04bc2519ecb78b05293003b772ca211b8ff82dd9d9fd738835458a098d69724325fc2075363d377de5862d89c3d37f25
-MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
+MISC metadata.xml 366 BLAKE2B 6e4905dda317b44d4e8128caa80add619aafecef48be108207fb9e4a79f025971bcedb8c9617fac9771a703e14bc41b4014d2c105854b62b3efbbae9180d8169 SHA512 170d8b2b6e6ee2f667efb92a89302b52378efe79754ffc211958f256b9c316672a9fb7b57cdd139662232467dc6fb366b3130a2b9bce6f30e5c46c49d696608a
diff --git a/dev-python/pylibmc/metadata.xml b/dev-python/pylibmc/metadata.xml
index 95a451d858a8..b1ee00c68c73 100644
--- a/dev-python/pylibmc/metadata.xml
+++ b/dev-python/pylibmc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 686c30b36604..6b101ddb019b 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,13 +1,9 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
-DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
-DIST pylint-2.6.1.tar.gz 694232 BLAKE2B c169939a49a9a8f3225e120cf56df12fabd8d1940504231d0e1c3783dd8b87beb24e7095e15b332189043d5790b69bd2a41b0baf56cffccb4ef5d7cfe2be9cf8 SHA512 6a6bda57ed22df8378aea3de3fe3b97deb7c0742abeb08463d3d2e0f0cbf6bd2166861456b3fa7cd2d7cf148b052fc4913479c3f632b8e92ebf8d26189a122b1
 DIST pylint-2.6.2.tar.gz 680364 BLAKE2B 59bd18d5458f86a7279a7fc895f1564fc575c27e7ad7b4a668456d6005cc2a4d920e2221c2ec3f447c1c63376e1b35f1e1c5177c355f52872d3c556aa63ae462 SHA512 75e88aea23e4e68714451d22b0a6a2106a4821c05cdd7d077e12ea7f6198959ebdace6824b1e2fb42a632051e049a2c84eb93990a7b6af23c7fee7e2f56bf6ec
 DIST pylint-2.7.1.tar.gz 708916 BLAKE2B 606637ff25daccba741ae5bcdecb6a2be50bc17393009193a29312b4a218622d23287a0f0c5a81e79e77cc54dfe529483ad01fa39445103f240addaa3ad58bf7 SHA512 eebf1d3da5ca072cb912ecffebf183c79f2f8b2c2b14044751aad202d75d06d1c06abb561d4581990b92fe54c06b570a1de39b792b0d729cf300c01c82c4e3c0
 DIST pylint-2.7.2.tar.gz 709177 BLAKE2B 5e4daeb19b6b18d570f4d78b01cc5023d5d245840160fdbddb194ab7036118742ffe3075ee27c37bd7a700d11d9006dc9abaaba9cf9596ae1b63941f139da7ac SHA512 800b210fbe5665db390d5c885d103856dc474b4e43d2f752bdcfcea36121132c26eecdcb67620c4a90456823f11a33568de4d37d59eea692dcd1751d931420f7
-EBUILD pylint-2.6.0.ebuild 1595 BLAKE2B 883e2c8a47ad5bda161ced7eb0e0c5b233d841a5190544b6201f2abe76b4f9d3893c6dc56e1fc5e526234fe29bd053cf59f12dd1b3b486335ac210e9ae3d1564 SHA512 b8e0432af850450909cdf68962e5ac82409b462350fedf158badc8b651d43d9ea599f4c57ff5c609287ad0020bb89984f701c7af28402114d30b25148a354199
-EBUILD pylint-2.6.1.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
-EBUILD pylint-2.6.2.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
+EBUILD pylint-2.6.2.ebuild 1594 BLAKE2B 5366dede47d8cc419a23382872e7938ff1922e9b2dfa31a342d82108622a044b52604428c1c65533ae967a7aba0af1364c8de3ceb20517c7b506aa5f987d83ed SHA512 56cc68bbaee4a335dc38072b176dd58eeea72757b127b99590c8743ba5973c14f6da8f9f1aa5d708fb68805157e1c2858c0e33bb261bfdba698c9909370f5718
 EBUILD pylint-2.7.1.ebuild 1727 BLAKE2B e07d6f741c58a76124132176c4f6332c9d3f9bb103befb18f76814c5cad9bd6c79e3e90f7e694ef972b19fdd3379c15bb32925b5da8cfff07e5e2504b664a4c5 SHA512 cd3b03bc30673c727d2e8af8fab9e09e87535b613e4e43a66cb3ecf40d7859f14a264cafdeb06af4f8be5bc531076448c15676e462fe017bb6fa01df99b465b0
 EBUILD pylint-2.7.2.ebuild 1773 BLAKE2B 68e534aafd63231a8c0e6ace09da37f9fc56980dcf86ed284e906915d0aa26cd0e028788da442fb0faf95d52ad24513fedf9ce28441bed36e5a3af9814214804 SHA512 4eec70ae69c69be749f335f555753ce067b05ea9873a8b7c49e549369a67757768632429c52f085271a338bb4925af0d9e4a9f23bfb9c63aaf6622e8fa96a073
-MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
+MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/metadata.xml b/dev-python/pylint/metadata.xml
index 49c908e83e85..c48298cd987d 100644
--- a/dev-python/pylint/metadata.xml
+++ b/dev-python/pylint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pylint/pylint-2.6.0.ebuild b/dev-python/pylint/pylint-2.6.0.ebuild
deleted file mode 100644
index be1c0b96def5..000000000000
--- a/dev-python/pylint/pylint-2.6.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
-	<=dev-python/astroid-2.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}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-tests.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# we don't want to run the benchmarking tests
-	rm -f tests/benchmark/test_baseline_benchmarks.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	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.6.1.ebuild b/dev-python/pylint/pylint-2.6.1.ebuild
deleted file mode 100644
index 7135b98dde48..000000000000
--- a/dev-python/pylint/pylint-2.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/astroid-2.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}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-tests.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# we don't want to run the benchmarking tests
-	rm -f tests/benchmark/test_baseline_benchmarks.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	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.6.2.ebuild b/dev-python/pylint/pylint-2.6.2.ebuild
index 7135b98dde48..387a8d2c4933 100644
--- a/dev-python/pylint/pylint-2.6.2.ebuild
+++ b/dev-python/pylint/pylint-2.6.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 # Mirror requirements from pylint/__pkginfo__.py
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
index 5234f3047ebb..5e6d0f0340e2 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1,3 +1,3 @@
 DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
 EBUILD pyls-black-0.4.6.ebuild 672 BLAKE2B bc8f2814d68463e21af47c15e8cd2cd6b5471672aea30d9e3beb0fdc78ac13f26aa58718523c87ec7c5553e73a3b77d69cda1038f6d43bd455c91741a8e91287 SHA512 583e9f27cd2f7447aa74efcac2219f9cbb41f28cbee6e89d268b5f3884b10b427b08d3ac1273417194d5f0d99dc361014b9d9faec01eb9f59d86f7ab09a90f16
-MISC metadata.xml 505 BLAKE2B 7d94d682d88b4bd10bd85d1a0462785d92bd8fb4c655bc1a8ba095ab7504fadfb95d92fa66b6a192a3e35ac0456ef06b01092999a64f490298f6feed05a2c828 SHA512 d7ffd158ced5f40d242e407994df64061691e392ccadcf186d032b5cd1ddb450c89fb09996c34109463559e70a6c59dc5a889ad2f757b1768f013d26d4a08dcc
+MISC metadata.xml 535 BLAKE2B 0da518d32903839dddfe62d2413287418df9cd620a42d62bdc2eac7911c7b8212f2511787e650f7d6a515de86a40b36d7af72632b8b86c53de90c51fd17b8939 SHA512 9d7b2a82551e4d1ceb77503a68b417e2994645cb299dfe4b48a5e7d5e1940a8d7e402a41dd26ab3533c7bf7120d695dcd4b760ee7986c5da78245a67c5314134
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
index 01a6beca43a6..d3cab5aa08b9 100644
--- a/dev-python/pyls-black/metadata.xml
+++ b/dev-python/pyls-black/metadata.xml
@@ -5,11 +5,11 @@
 		<remote-id type="pypi">pyls-black</remote-id>
 		<remote-id type="github">rupert/pyls-black</remote-id>
 	</upstream>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 80a308386e3a..0e16d43acc75 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -2,4 +2,4 @@ DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a
 DIST pyls-spyder-0.3.2-gh.tar.gz 8781 BLAKE2B ac24e0433c2e5ba43274d6266bc7532e7a1f1b0c3c34b9acfe10e5c7d789937536e81c4b19f96090f32d34c932529c0f4c23b49d2b01e7a0b628f8c2dd6f7611 SHA512 c08910ebaf161ceb712f273f054add1f3a202684b001d8d95650555bd67fa5675b3fef9e3d62d0d1b9da0f5adfeae9ff0fbfee44e4362856550d77582dbc6e95
 EBUILD pyls-spyder-0.3.0.ebuild 593 BLAKE2B 393d2a7cd130260dd81158408652872cf35dd270b02814e696e05e86e2a8cfdab94aeece5d184321583864b25ce61db57c95dc55194bb1f0d798f2bc26144b4f SHA512 e1b485c45aac28f1f31b32c7cf68f6fc762d02c7bb8f87f4420cf57f7119df2b9f6405bbddd4caa87fefc5dbc8935a0ca190c069e57d19a0c46273ffd85fba06
 EBUILD pyls-spyder-0.3.2.ebuild 595 BLAKE2B 184d4ff0d6b9478d2c6ebaf35de2a7cefee5cca5fb4b1ca404d951482ff0b2b7a5826fb56cf2774eeb84913752acdf2e9c14b888565837f3593b2d05cfc952ac SHA512 07875d3126ea57a1b3a43f7f50d91d6b779d66e13eef40c2f7434e87e996be3e6c130db9654430fc1ab31e71ae0bf323ed9799f21946ccb3ef136efb0c084ae1
-MISC metadata.xml 554 BLAKE2B d92e4696e31a986927d50e9e17fa0d202681c4c323430ca9dc7006a203e5fbac10a2a33107dbdaff9b3ab21a5473c678f282a76ba63178909e687a07cb0a82a0 SHA512 83e82a6f5fe43cbcb305046744600881214625e891b708d45ec6f31ecb41e9f6f4e6524d10d41823aeb6b43f3e96e6e484d9e579f30de7608228449cafebe27a
+MISC metadata.xml 584 BLAKE2B 68e80afeb533c195a73554ec8498d9a419260fefb7bb084350d446088bdb3af7f9fd1c06add2cb32ac31f751c06271acbed27e65e656c7cd9314a3bd2b844a84 SHA512 e17357b928f91acb0ca60e4c2797c607d117a307d9bbb9e0de81fbca48231a42c8842872dd962897aedaa233f83dea8454cebec3545b04dfbb816e86fa5ae4ed
diff --git a/dev-python/pyls-spyder/metadata.xml b/dev-python/pyls-spyder/metadata.xml
index 880fbaa4fef0..3a143bba6eb1 100644
--- a/dev-python/pyls-spyder/metadata.xml
+++ b/dev-python/pyls-spyder/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <upstream>
@@ -6,11 +6,11 @@
     <remote-id type="github">spyder-ide/pyls-spyder</remote-id>
   </upstream>
   <stabilize-allarches/>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 65b0259b7023..596eaeb5b373 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -2,4 +2,4 @@ DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9
 DIST pymdown-extensions-8.1.1.tar.gz 650451 BLAKE2B d72b4ff60747a5f2142b778d75ba438757f35e1bb45d1cf005c9ec7b187b8c6aa1e890ca1bf01b3a202dfd38c8f813c928041870a30bb2e0fc035e2a5ff9809e SHA512 a1472858b6afeb9b582cf97a4471e09e25dddcb0504d58f8aa703802fe0c075a0af2fa8e1895f02b48b5959297c37cd1feee789741d93a1739f9d19c3341b108
 EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
 EBUILD pymdown-extensions-8.1.1.ebuild 1187 BLAKE2B d06ab2588741497006b6d79ceb4ed139dfc194c3bd38eb72878bac1aed762679cb9b3a1a040072323d54fd77d766e60285c501462e48174cb7ba0e4c7a3282e9 SHA512 8834351713a8403334c5022210d3a4c915bd99fdad7b97ab8621b8ea104b5060e4871abb624b593936684df6a8c44414dee7a2e711e0e6e75d6e022dbd172030
-MISC metadata.xml 629 BLAKE2B e8f715260ad9d3944d7f15d7e0c30861419bfbcdb77d79fe6821d63922e0158fb5bc2c2bbcea893e138e19d6cdf1fc7f548b26ff771f8ba566e758d3a2d357ee SHA512 1409ee96dd4a5112b4f5239d24936e223e9049d307260fc6acc9e4829693977095cdbe20e3548f88ddcfbb6854e81e3bed33bb0f2020e743546926d9d34a46c4
+MISC metadata.xml 658 BLAKE2B c3c02e20a11ffd755742b5870212eb17977c133f331e84ccd92c4e7f152ad3a08844feb92b0709ccd7ef527af5abf782e9dc7931a48e26df7564dd739c71499b SHA512 46ac38c817c306a627f9a25dce07fcd74bf75be663118e024641412f09d235f3c37777dd775eafe091a264dc5d39a12e142aec6f82e3dfead8da8d97bf5e10f4
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
index dae957f6e7d7..8e69a6776f50 100644
--- a/dev-python/pymdown-extensions/metadata.xml
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 34babeb9296b..a5509bdb5fc1 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
 EBUILD pymdown-lexers-0_pre20180905.ebuild 558 BLAKE2B 9f9f3c1a239fbdf3abf143926d83a8066b7b500c52b0410b31ecc49245b0b82b5d47b51a7faabf476b1f3476ee2063ee2d943685f8553aa0b8c11290356d5d1c SHA512 8eb46df0690ef63d4913bc06cc938b39bf01ad5862d51992112bcbce0d8258dcb87f23649b87fae1ccb8f97e2822303f359c06147833be6fa3baef0ed3651bf1
-MISC metadata.xml 588 BLAKE2B 55ab9bfc993d7325dc4401566659f63d6392f9421b083e0d7033088fc2157da85fdb6b4a7cd79ca1f6adb51c940c798f52d737389449fb474ad3fc0275a845c8 SHA512 93ed978bdac93d4f0fb46ab6b2ddfd6b6fcacf0b8723ec3091415fa6ed84983c06347a90a8de3b8bd7d7b34a04897b8a4821aca46bbc8f66d4f4752e14200dd6
+MISC metadata.xml 631 BLAKE2B 3acbf47f898f92294a65d0a65ce121238acca668c9802d0eff4e82c652d4bd7ed1e655f0f5bab12c887a405b707f98de4da4e234fd5fa11d8503d44bcb6dd94d SHA512 79229b1d5c5a080abf915b4a43e8ba23c7369ccfcf79824d1c6ef3d9cc3f36a009c7a8800a87bd33d20133875b725d570fba8662928d643a6d291c58c9a78e3c
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
index c0315f8bfff0..924bc0a43c6f 100644
--- a/dev-python/pymdown-lexers/metadata.xml
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
index 4b83b7e25777..6d02f3489ee2 100644
--- a/dev-python/pymdstat/Manifest
+++ b/dev-python/pymdstat/Manifest
@@ -1,3 +1,3 @@
 DIST pymdstat-0.4.2-r1.tar.gz 14798 BLAKE2B 179c88a8999b4908586a3bc1698de9df25e94203b723b2981f9ac6e1b2ef47845c9e625c1daa40990dff7e90aece34fc471c3c5a0278a85c4c526d37574e5fed SHA512 7c9815b365fdb37ffe37c65d280a3bc4370f09fb8dad18ff9c68f61b8cc906e6b8d8e0fe0dd1570e68349f535f23cfb8afd52ba805d78e795d5c6f9730f7f2d0
 EBUILD pymdstat-0.4.2-r1.ebuild 765 BLAKE2B c8109138ef19422aeac933f37a5e1fbb858d9ce0a445f2e7fa68e268cc1a80f20352976191ccc9e6a0aff7a5a4840bfa86c756a338de7a825ab392cce8a9429e SHA512 58546f0dbd38059254f58a05ccb12dc319ea7fc820df5ef58b8b04040f8c51804a26e586fc24ad2f619a03db0b53e932d41b4e3266a19fbd083a90a3949e5098
-MISC metadata.xml 511 BLAKE2B 764b07013ad9a90442a60051d2cd17184b5058b24d1dfe08f0eac50102822e13cb38941e52b1f2a330682ab62d3b0f2983120b8985f0efc86e7dbc051d569f85 SHA512 54862557fb9d9ec32f94086ba8df5dfb5f4e4e804f1ea280157418b46ff9ecdedee8b3e333ec2643b8a09d54c769d010514789c3bc75fa28c75623b732a088ac
+MISC metadata.xml 511 BLAKE2B 1c45d5fbcf29307f98a9a78615ffdbb4126562f8666823019374f7196f3bb12e2b293c9caa8e4f7a31db46215244e5c2d318c3e4247bdba027b69b40583b38a8 SHA512 47023cd0ea65d3eecad51f1e6d3cad0a3326b65f2ebcfbbc7ea7e817a04f3fc064f04292ae63613bd77a1cbc644775c66c322d3f8d9f18ee13d3c1f54a5ef508
diff --git a/dev-python/pymdstat/metadata.xml b/dev-python/pymdstat/metadata.xml
index d6b6f33633cb..d5958db38daa 100644
--- a/dev-python/pymdstat/metadata.xml
+++ b/dev-python/pymdstat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 6aadee8cb61a..d158287561a7 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 EBUILD pymilter-1.0.4-r1.ebuild 684 BLAKE2B ae9cb43c50913551eb180d828d75be1d32f6294432c4867e4a32f20fc2b5d079fb847bc4ce3044841603156e467522d6501c7c4f22419a787926c36bb02d79cc SHA512 f4611978a398b87c540b02b508f5375eb2d2615b4b668329277793710d70c4371b7566faa1f991415b7b998db8ed7e92bfde5b6900943143092102da4985eba5
-MISC metadata.xml 791 BLAKE2B e9cd350b7cebd044c9ad0f4d1d827ad3d96ab85ee5179a3566193ff991ee21053da9acb676cfeaf28587bd80647958976b6447dc0cb575a24e9dbac29276f27b SHA512 662e6e7e25c11c44515014ffca38d808b87425844106ee0654cade5fa5a258e1e6659d43eacf70f1664815072d7763576951f1d51f8efaa702a0a155c696100f
+MISC metadata.xml 775 BLAKE2B 578127ffbb86a3b9546895ca6296144290dd2db38a44788f671e29c1f929490292e765d04e9737281e14f049e28fcb898c3a4798103eb51e922551f6d5ffdc39 SHA512 50134d299c6d90f10eca5ec228685018fa3233c7a99bd67e483d37da92f7c5ade06f4d4f8c44b4ef562471292d47d962b250a06305ece6eaf08e819a35019eb8
diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index e2404273484c..2165f8559c55 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
-		<description>Proxy Maintainer</description>
 	</maintainer>
 	<longdescription>
 		A python extension module to enable python scripts to attach
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 56be3b40ebd2..2cb728d62e30 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
 DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
+DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
 EBUILD pyopencl-2020.3.1.ebuild 1458 BLAKE2B 813176a34b1b1d3110bcd6535e9a9036bc62b720c7b24926e791437ac1ae9cfc5e08705632a1ce059f2ee9e7d7917d0b0d22310200d90967e734202e8f2f2abf SHA512 f163387b2fe9a65dd52b94c5d5f2c12c4a105cbfc47f5d4c2bbf3327668f0bd646ee0af37e737fbb862f278d0e239e503d29992fd9ca44bf87a23c0d743cb2f4
+EBUILD pyopencl-2021.1.3.ebuild 1459 BLAKE2B 59d479bafd5c8631579ae52b0d1ee05da5580223dae30fc56c71b6f8174f7a04743a3ca7f41adb53cb7e3eb4681d43200a91b7158bb48cd0e21174d4443375c0 SHA512 1c338fba025f055da1dd75891f90898ff36cc8976ba1a34ae0c6b0157d5c5c5f53799d92bfaf01839a45940f09f8000bf213658a3e315134c85bbaae6bc1974b
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
new file mode 100644
index 000000000000..a9a305e869f5
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2021.1.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+DEPEND="${COMMON}
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index 01ca17c96f57..bae972b8c02c 100644
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,4 +1,4 @@
 AUX pypcap-1.2.3-mktemp.patch 379 BLAKE2B 66a6fc449ce5863a0650a7cae5589b52e307559d2ad7220aead363b7b55f816e794df5829a594044efb35b0d283a52fa141445851247994c91d8fbe30353cdb7 SHA512 bac25f5f1b6080e8abca6c1ee7229070651abda020ac67d7d83b1ceb6141ae73dab8aa8a29966760021eea55d28d2e7b124919a29ca6ce1d1cf8caf0e0c9ce67
 DIST pypcap-1.2.3.tar.gz 151087 BLAKE2B c40e83d46b37deb4064877dfcf64582ff5da272a0d416b51faa43c4bd20625b473c624818aad70238f9429fac2455ae5b0516279faf1612f76f289b53d55417e SHA512 e4f701b6637fbcaf847d72eddc1ed344438008c2f8cbd334c9ce5fe17c9ec36f1f2cb1a146a218b8e464a7eb9a57217a8834a82a035ee96c3c1b56ec70e53bff
 EBUILD pypcap-1.2.3-r1.ebuild 892 BLAKE2B 4e1874cf078f6046eca22ef17ba2a53833c2eef23e2ec4a8d22ba9b077eaf287d22a10b830f5020d47d1f46c51301c50c179b2981a217a7ca6092e26a1748f16 SHA512 194ee4366e0d8f2ce3fdaef614db4d8e491c68d104236e96c3650f7c8d850b39e16f0ae6d9296d9f28a8fb8032a057fdb797334b84b7858a990c9f9f8f974128
-MISC metadata.xml 577 BLAKE2B 395c10694cd2a574aaf106be5e2487caa66b4b0234b6110d5c83263f5b4bdf9f9c7239ceeaf07f3cab99b7cb1582683fbc54051ab2b686360640e256c6c03084 SHA512 f50b1b47d18538d5a9ef3888eba98cca67fa919a5f3315fda54d098cfea595edbeefb62038035b07bc1b74cad3fdb56399c136512d6cb5b71ddf240594261c98
+MISC metadata.xml 577 BLAKE2B 2446b20c84c720fd5413469469a50bd971048967653c72c031a8b369288bba568f3fe3cb47e75f34b42e9a1160ae518f6933a1f3b6a52c14d0d23701d6d734b1 SHA512 1ed3833d121e3c4668bd51c366da43fb95e1aac90f3e8fed3745582adcf08bc56146688b06c369af5c782e691249b3178c16a9bd0397f8349504eb02d97be2d9
diff --git a/dev-python/pypcap/metadata.xml b/dev-python/pypcap/metadata.xml
index dcb1e52969b7..b5fb9c2198dc 100644
--- a/dev-python/pypcap/metadata.xml
+++ b/dev-python/pypcap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index d33070ef76ca..20ddd88d93c2 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5263 BLAKE2B 02d7989efa9610528133d6ebc5fb595065080485ba26e87211cf5ddf69f34f7d7a69631139bb5f5767e21ee960360803b82ebb1891762b2729546e9a0b98b21d SHA512 c30c387278501c4e945decb1d7cf4508590b15d0785eaff296d4e9701e36e143ef8c31b8cb85e5ae71a0f8705a13f7ac538eda105a124e5d280b64fa2596d19e
+EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5329 BLAKE2B 2b1952617d09a2a7c33055bca8b6f892014acc7af99bb82a43628d7ffebda9f664732e6385311273981d89d38b654ef4554f734790cd75255fa0974bf4206a02 SHA512 90a7798aedcf5985ec53125c7cb34951a5cfa645007e4e0468884c261b5f44eae18abd0bcf4e4f6451a480c238145d211e994e9e9d56775ba7a162327e61d1ae
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
index 3061d9aa33ae..5bf04f0ffd9f 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
@@ -18,6 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index f4aa63dda3da..6551b0e7c10c 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
 EBUILD pyrsistent-0.17.3.ebuild 602 BLAKE2B d528579874b940b4445ef1b3c2ae5721d34db8a320bc789c4bdba4a2a7f7a58b24f75347865163d39076a2e42fd459cdd1c39fba903f92545c8619eb219928cd SHA512 742b93932b0df919699a974ed49ac074c90352c8ae99a6f6b828f21b4284f41c9a3572931c0633c5037ba48e8b728dae33a3b0840487a00a12c0f1300cff8dab
-MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
+MISC metadata.xml 521 BLAKE2B 45117f7fb0cdd4111f444279144a45d49984102e114ba758260dc69b313ec818a4556a57a682f6762522a71a810855ead85ee667dd7524de16d97b37b77d5cf2 SHA512 f16890488984b1d31c74bb697f38d0d880390f8633347db56ef4633e77f502bfa56d9427ac55bd0da4d3edc6e8e1897f6e76b37ba75d3b4b738217607e0883fd
diff --git a/dev-python/pyrsistent/metadata.xml b/dev-python/pyrsistent/metadata.xml
index 0f975ff05a3a..fec68b00b7ee 100644
--- a/dev-python/pyrsistent/metadata.xml
+++ b/dev-python/pyrsistent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index 05ddc411f515..da12fde0170a 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -2,4 +2,4 @@ DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a9
 DIST pyscreenshot-2.3.tar.gz 34543 BLAKE2B a9ae6fc51ac62efabca7e9b4e08ee8ee05d778a3f8ea0bfaec5f0958bea7f6dd266e18a938350aac6fa1058fdb378cfa69cf6c5490768c39d7312be51e3d2630 SHA512 6919e4529a932b9a6e3dd28d60c628447b0e6f25df567db742b5bf14455373ad7340237bb4b77696c436be6f31211030b206d7152f4b61d16d6745f439f84425
 EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
 EBUILD pyscreenshot-2.3.ebuild 1013 BLAKE2B f50256cbfc64fcafdf7677b8400d70e9d8604d5e543a66b9db6eb3728eedea4d33bd3265bba4bf6bb32836e503d96e99d586a2f32fcfa94158e50cbbd2bcc01c SHA512 c0dc3e699c1498b14c323e74d04f52a9ebf8ddcc3235a25dfb8ddcb4c4496e8192dcc90b64724f2829a029f4aee6cd7adceedc8f31439ce00a31cdf1e5a67006
-MISC metadata.xml 450 BLAKE2B bd7e7fa6219b153954486f9457cc9ed56a055ee8caa2d04f0f6d587b7df88a8abe4b51165c1220ae1fbb7a3a2314f10851a6bdc35336305829e31a82d7004d4e SHA512 dd24b4495cf676ea8c90ad639d2177b27c725e21bbed0d6a64f0a4ecc5226c4a332c018306d3dd231409063cd179215c1e80c6efca1001ca9a36f58472fa82a3
+MISC metadata.xml 480 BLAKE2B 916212d3b9c19cad063299b97ac2b6c62f310edf2cc9dfe98640640b195129be5c6b918514687f55b21fde57e2b01a27f66cce3e6212066351d7b3407208c4c4 SHA512 e1dbe4255579b5087ecfc3df62757765e29d47785a50ec845589184978362601e2b31e818870391a59e5608ce8869469d0ad9ea2c2966f262fba5624183d5720
diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
index b7811ee04d45..1f7f3dc660de 100644
--- a/dev-python/pyscreenshot/metadata.xml
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 936a390f6225..07d7f0cc6533 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
 EBUILD pyserial-3.5.ebuild 865 BLAKE2B abd998c081f105d913a09bd289ff2635c91608f4c6e1f114d6213c23b7bd408016397cf1232b52490a2a7c0b5835656d6af556258767c50fc62bea2d04c6dbd1 SHA512 71bad0c6ce74ed56b3e77489db9cab100fc0e423a82552a3adbc5aa3d40b9ea7b22d0021d4deaf66b343ec3552337ec9ae757e6a16218607e36a9e9e4b5f5e0b
-MISC metadata.xml 445 BLAKE2B 97ba2ebe1dfa4c6efc0225dd2f4f41638bb890fe5d81ed855d67c5b0dffeb45070a2938a1d2c32c2be4337891132a09b29d558ce541ce5951e24dd7f44ea7a0a SHA512 1b74a8d88afc2dc709c2e2b7ce18ae341761e3e76d19bafcdffdaf4169651f7f570d997435ce8321e93b692fe52e218ae4cbfa7f34bfac992ac477e4168bdd24
+MISC metadata.xml 445 BLAKE2B 26d6e406facd94a007c681bb0b9071d6d25356710e63f0da2669c740b0b715cf708fa74bd39a96f7ab2215398ba0573dee5cf66ee9302e32839f304402a67c9b SHA512 389db127fd40ecf72ad3e66a8d2861cd4b0ad9d9e86f7515aff087b7595a854eea6008b5425e16b328e52eb480232296a0f76ce7c07a183e2e123d06967b6451
diff --git a/dev-python/pyserial/metadata.xml b/dev-python/pyserial/metadata.xml
index 422b88fed441..bb733dabd87c 100644
--- a/dev-python/pyserial/metadata.xml
+++ b/dev-python/pyserial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 96eee55aaf69..483016f0d93e 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -2,4 +2,4 @@ DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d
 DIST pyspelling-2.7.1.tar.gz 149449 BLAKE2B a5faefac163850d327d64b75776b5f360ad1e1337cb3784c8d0a167e1240e92a202f4ecbe86d768341a7512b36c83981b5fbf4058a2142a5b627f40c0e60c09f SHA512 be0cc9be343e2d5d2c16b2dc9cb6f83fd5f60eba81c709711fef37b880363db8b76e86ec048b57ab270be59803b101696709bd474d4f0267c99f55c906ec7857
 EBUILD pyspelling-2.7.0.ebuild 1339 BLAKE2B 02605cc438f1292b803cf477d9ece6ee8ac5acf66c3fa51b813f3edae8faf57033e13547a08704a9f8a1ecdffced770d40c180770031c1ed16396357ad2f4e07 SHA512 2bfc52570bac76a50854f4ff3a6aafbc9f82894a16c7a1096d8b3e25d07f6dc33806068f815b2c8d982f62b14a62762b56f781f56625dd4aa84401347b8f9325
 EBUILD pyspelling-2.7.1.ebuild 1339 BLAKE2B 02000bbde0c75d186febae4b45309228c2c9b6430a19db3b0ce7b3d4c613452276ec0b8e2c64bd2f037e2bb1ed450c11e8a8d810d066f0a41e32a089fce7f7b0 SHA512 0eecb02ded18f6ec79f96726f17cde843160a467a6ac7f665cd266cb7bc663e0c08888fc90e17fd8f29f541d3cd403f265f81972bffe409f2718bc885474f26d
-MISC metadata.xml 1868 BLAKE2B 06a6aada2ff7c6634c7baff2eb5ebbe5e6f884a44cd9828b6aac350bcdae480b6ff3fae5a3060721db386e80558167ebb50937afe209ff2cf2cb5296cdadf4f8 SHA512 89c47e531f6aa5a2e7525732a30d3b9e62be48598a6ea61ccd3588223e01ca4f54fd6cd9359ccc6d1fe9a269cd865fabf960d18cf084feb0c7368f5beb0fc446
+MISC metadata.xml 1912 BLAKE2B c5ba9a8dfe7afc00a3c10b7853074677dd21416fb8823abf61ab9322c0645667ccb9c43aad99f30f755772be7c7eee4b3ef191481f266cf3d4d6b5ea1ea108b2 SHA512 9c8f610ab25749b203f61a37cd69277ffc72a44d3750734374c560b6e053e1cf60176e268c6a794036edb13ac6d19a7ddc19a4e3beb620fdb1a4914564f882b3
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index 6299093ac738..b29a76e72b38 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytaglib/Manifest b/dev-python/pytaglib/Manifest
index b7d4a95929a5..1fd56943abe0 100644
--- a/dev-python/pytaglib/Manifest
+++ b/dev-python/pytaglib/Manifest
@@ -1,3 +1,3 @@
 DIST pytaglib-1.4.6.tar.gz 467771 BLAKE2B ad0237829d203cc3fecf90c8d1d4ce6a98702afa2a6e6d51e3d3dd6a933c31e3c9f7bc9c4d5efa6eea33e630b3213651ed5afdc07db1cba058a9036ddf459ab4 SHA512 4b438759440790b3c850cf165b553f7e6066bf0064e041cca3e46831046b12a87decd4429772ea0c50e1b27cbbd2c82ba709361bc01aa2e8ec3064458aeae0ff
 EBUILD pytaglib-1.4.6.ebuild 453 BLAKE2B fc6a5a687943846a443e04d1836f4b216d283e6f95a9afa1f8397dae8ff4c34188b0ac4b333a56ead7aa230e131c8e98244912510613c9ca0a4a7c69f69f26cd SHA512 4ba895eccf4b3d2285ed535b7257cc1d9693bc25d9e8f286d08d8354bf3f367bf58917ff0b6c8de9842cb9c02f387ce818e79f04b2068d4b5936f171cad7c457
-MISC metadata.xml 381 BLAKE2B 7479c1caaec26f8428bdb07a20018a66fa00bf3ba2d6cf9c0d204834ab5450536d5c21f4e0266606041ec52408d02811438adc085e0c02d5650b2bc00381083d SHA512 a278b1b37ec3a259ffaeeca9657b99e09c243b27f4105f8d66fef120a6cdc4a2594ece6b9a381a7062a94d91836e17ddb0fcf35170c2696918ff3bece944a308
+MISC metadata.xml 381 BLAKE2B e76dcb65f2ce561a27f2f9bd9f34277d0261b917bc7f3152c54c547d2d2aab2565069d61b1b4a78a3c3896be72aff5cd75733283b2f3c2163780b35771b9d616 SHA512 4540197447193c2cc4ec4c1ae546794997c4b328da105953d2cc2b024cfea23f5ba8d794c1de1d222b870f3e23cf21815ca896330bbdfb23f82d4ff0a7131083
diff --git a/dev-python/pytaglib/metadata.xml b/dev-python/pytaglib/metadata.xml
index 46eface240e9..231cc3ce0cf1 100644
--- a/dev-python/pytaglib/metadata.xml
+++ b/dev-python/pytaglib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 6dc3c1763293..78f9985b818c 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
 EBUILD pytest-aiohttp-0.3.0-r1.ebuild 548 BLAKE2B bc41bb7754063ca40c08714f2ca32b05eea3bb6f9500afea6e6fe8813f5aaf6b4b889bf608fabde9116586904f4f3994f93c01d0af3a1a3bd4f76ab44e084f3e SHA512 ee4b30294605a806617b01eb06ec1ca4c21a3c534775b1b0231dae3530604cfa968af803a28c2ac7be6e05bf6c9970d7d4d9c30998faf58539704a6002cb7731
-MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
+MISC metadata.xml 382 BLAKE2B cd3cf0ec70a8506a0a36c6be50dd70b68c1397c9bac788f15e012d10a4b35d5912c53f4de68bc7cfb3b4c03e84efe053d18b6a16bebff26fbcf935ad6d282645 SHA512 ae3b23c6b0741388a625d45f65e5b51e6ba9596eae3cd26378cca840656cfbe61f580705c82766b8a39dd7c603263bb66299c11d4890ed24b2aa6804bf008791
diff --git a/dev-python/pytest-aiohttp/metadata.xml b/dev-python/pytest-aiohttp/metadata.xml
index 61d57668b0ea..858375b20dfd 100644
--- a/dev-python/pytest-aiohttp/metadata.xml
+++ b/dev-python/pytest-aiohttp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 9ff7e9f59ebe..9bd250b6dd10 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
 EBUILD pytest-datadir-1.3.1.ebuild 608 BLAKE2B 93752c42ec68e91d6b931709cc90f9980244dc1d700372d01ef87d7f8b81f829ccafb532c33f00e87b8c219070a09769297e003edaad68a701c6ba863641cb12 SHA512 877a9ca6c2211675e9e854b64617d5424f7c66d06b52b7f20872ab3022f6bc0a02039eb31fa7fb335ef9a4fd039b1a779e232e348eda49786b88516e4374523b
-MISC metadata.xml 452 BLAKE2B 809273858b896b06ff326266bac2bd1f8bce11cfa5436d2baa48cf10f008452bf696583c05ead6078a511dd6c43bc1458dee928e5a83a834314c9943e60f8c54 SHA512 a902c94acedf489927581d41bd13430498b695c2b5750b51d8da45361943b036fc8cfdf4e40c151b2e4ebe257babdba4ba45c89b1037bcf6497252b29ec032c3
+MISC metadata.xml 482 BLAKE2B 1f4d90482c5d81dd0e42efbe95a31cc982f490375d0819eb9bd879f760c348a8ac880dd82f88c243a741b563578731d1db1e9bd06e3c9a2e2e95f7af795557f1 SHA512 4c990149b361c88b150a9e0cf1466da9a4113fd4fbdd4c7d9c666dd72d871cde0e48c6702ea3afc9c345fbc4951d2f4cd5727b0d0320fe036d945bcb7d0b8599
diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index 88b19f00ca55..161817b6a08f 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index 8c431b1d1d14..112e678717cc 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -2,4 +2,4 @@ DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4d
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
 EBUILD pytest-faulthandler-1.6.0.ebuild 747 BLAKE2B 4b1c07cabfc292ba543dbfb3fd0ac154dcf82a15e4019a4c2ffbc951dad94ab82e9b742d7cfc6e53cc2d7e984ee926322de62080db9cef01ba995c3c51df5837 SHA512 83cb68adad83c92089f7d9b400de93c5f5d46f38435aa8ff63fe51c6476f159c3bf846ded527f7fecac30d149fc792fcef69e9d85c4851c668d4bd005e1f2203
 EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B 9e7e5f4c37aebb033b7a093fdee08a18e786dbd838182b93bd5d6ba848f307bf63bff147f644d1bd62c92b5c58686099b448b73e201e1c0388df961382b49f50 SHA512 46ab18e1c5102feca7ffe08243a18386acb6bc5cd73030109e0a90acb1fe0ffcf5a83e76577a309ea7de935fa264e00ee8f90ac2793a60dd53673e41b9428720
-MISC metadata.xml 457 BLAKE2B b60877a1c09f68aa69b75c8386ce1b8a338f91bcf54e875cfd45fabbcb4b254d1702c58fee5d2144d424bf890e57a2c9814c517670dd6bb430f3ace6ffde3ca5 SHA512 dfdf0734d59cf307da8c45c92b13831b5375569bca715c7021af1e932aa37a1c21810827184f3e78c93e5bcfa7a2c10639ea96219f595a7e7f5b68243f52aed8
+MISC metadata.xml 487 BLAKE2B 3a095e6b04a7945c7b338b806bc757a0feaa2d1d151e57319f28f31b1677ef51536f6f94f3376b2103bc003400c7754f006cf9b8a991d34c65a2aafd457f682a SHA512 115f8068bdf7832334075342445002a2b55553f2a8dc05bbf29979e06cc512ca5834d7bcbc5ab68b639b7e62baf1005f30c7b149a3f9585854b228c2695f32fb
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index 19f4441aca92..fabb80400e14 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index ffd9d5f13e3d..8cc566c6a4f8 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
 EBUILD pytest-lazy-fixture-0.6.3.ebuild 503 BLAKE2B 4666133476f9b554866fb503de3adf25e0b88e357adb829afb46d9f93b15274ce94d145969a0f3d60449a531a61aa4d1713189528ec200a6fcfc8a4d744431e1 SHA512 170a29e96b39f2ad281d3cb507285c16b7d4215b375b9d6218550f202085948b42fc8b6a10e18fe8c78efed632b45d45e43e2e0e19f08d829b9d2b380f66afcd
-MISC metadata.xml 457 BLAKE2B 483eebf92b80b8533bec0c5ec1f1b14290cddd5bfe15cded2cfe2031a14ce902e42e4017b87828daaf6758e76ad0cf1cc85bc95af34edb458f5d10a25d636b14 SHA512 486831bb72ca35c899f39c5da7ecf58e51fdd43df4e57f53ded11f128c2d618eeb2090d23d97704d3995bc8044373b1a0688aaa0aa478726289f5c7a5f320a55
+MISC metadata.xml 487 BLAKE2B fad1e8e2f327ee191701f87e2c6b3df2e51eb432f992eed1c115784ce54f0181b296eb03fff201f6f6bf5ddb77e03100c36378a6e38ca1346c317b628ef3867d SHA512 92360d670b2ff46dfa9473a16384d56caac7e2f4bf1d1735e6c1d61755e26cad010bb67c2090579fbf808b10f19b1c79a3d79bd4c49f51b5db4b8272ce41bad6
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index e4c15cc0a50e..60c6536134b2 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 69f9f525c270..f8ab9a675985 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
 EBUILD pytest-metadata-1.8.0.ebuild 615 BLAKE2B 2836b250293ee447cb8bd008e807de5df5ae713723e19ff53983450d6f9190ad406d1397847c2d34f7f201563f0e2966b0dd174b863348ea546c8e2d47ffdf7e SHA512 3526ce2217b13b484f5659f5961e455c98fe6e87a463e5f92471549e16fd3c30b6dbfaa8963339d6522c42f854d3a5a6a2f9e74c3f6f2d1398b22ad18be16ab2
-MISC metadata.xml 384 BLAKE2B 8024f5d5853f139e54a68c100aa021a51df69091041fac8ced7d30d773b5b0fc3360e8c6b13ba988828e87580b320e8cf5dd650ab630572f209225db932ffde2 SHA512 e932dd150d0b12c6055a7842eab3b31f8c08e28392eb668e6641b1a30008e713a982eae530c1fc9d99f86ddbaa1c6f19d4044280d23908069b41ae1ccb22b790
+MISC metadata.xml 384 BLAKE2B 2fb7e2ded2eb44e76996997159b81fc25b160b41b298c9ae48216c971f2722ba3ac1227130df8124cbf391dc17a62daf228069ccd78c3405cb1e26ede1a6d9ad SHA512 3862d8f512cd6c2d02b816b2d1eb914ae028be0b04b6726429516fb97a55f46a37f40aa030285ccef061c17c4c651e4614b1ea5024f797f8648ed29c25aea357
diff --git a/dev-python/pytest-metadata/metadata.xml b/dev-python/pytest-metadata/metadata.xml
index 04c8b96bca81..39095ccb30b6 100644
--- a/dev-python/pytest-metadata/metadata.xml
+++ b/dev-python/pytest-metadata/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index 649202a66494..fd98507c875d 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
 EBUILD pytest-ordering-0.6.ebuild 843 BLAKE2B 8bd85f21ba97a507b10e5e1d1dd0f3b310e2a8ee5b6d36d988de32f363b56b986b6358cd528d3745d18cbc79cd1f3168f5607b57c2f04be063ea6a40537bea8f SHA512 4be22b60ce01ba44f57b7e769f5db81651b36ff87e9b7b382f511c579a496755d67b07bd449944e594dbaa50904ba6ee0a11f5433decb6717ea86b0646e918e4
-MISC metadata.xml 515 BLAKE2B 3cd3edaa8c256ff8a310a444a3e8ce7e5454d2a7c6919a26c3d81c412d5d5897103c2687038210009ee34168451cab2d699a30378bda377272ed9abb09ea39cb SHA512 80315251c22819d1a5c0223e9dc7eb842671c1e7a4e4840e5e0778cb1b4806bb420e39a42592c706f48a6d07ff0f135f081db69c9298df0ad4a22e35adfabdd8
+MISC metadata.xml 545 BLAKE2B 69689ef2a054b43c42d93720be179b8d168b3985fc6b37a46ac84aecf0b83fd0f027bb05e31f1ceb061efa56d482930a99c712eed92037d24c2a2a8db57a3121 SHA512 f1d7c3c3da90c9d63d48be612e9ae9a5f9b7d4a95bbcfd7659e47629494516bbd6f00c1a7071aa73a5cd3c210d3af48060e8c755368fa4b5df00845ba4e6e478
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
index 1b77407bcd6f..06edd209fc66 100644
--- a/dev-python/pytest-ordering/metadata.xml
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 607a89813323..7d9e880a2d1c 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -2,4 +2,4 @@ DIST pytest-pylint-0.17.0.tar.gz 11660 BLAKE2B b536dcaaf0ac652dcbe66018fa22e1207
 DIST pytest-pylint-0.18.0.tar.gz 12448 BLAKE2B 9d0cecb08fc87d7e2aade47af3f2677431776a425726c281e9abc5fdeebb84f38ab4a97e405ed407b1cd241eb97a8cd90e878af61f818b46cab5f9fba5ca3d5f SHA512 a0716104d288774d4c3ab596f30a33cf439df5031647912574c31eefc3a84e69e82fc362f77e73b437c7566a596d2ff8bf51a332626a7fa7468cea3b916e9ad9
 EBUILD pytest-pylint-0.17.0.ebuild 1118 BLAKE2B 2afc692f96d558d956eee04d70b2a516babfff606a858117efeb3f5efd0631823f3a99706dd10441d682101ff994f732f8dee84a2367390245f28cc85bd25086 SHA512 9047a6777d0ea48b040b4249531b2e5254dd535202a3bba2745614286f4d2d628e9a99aaf950515374cb2d4dfee17595a3b61c0da109e63479b4fb580fbb5626
 EBUILD pytest-pylint-0.18.0.ebuild 827 BLAKE2B 5a3cf1127d9c4cee9f363d8bd6de620d874ba31ae2e0294f7a76f6951d78ae3f9b607f68686bc087dc78af438c5f5da17d9cfd3cf1eacfff89c2be76ce836321 SHA512 b3a35d0585bee70baff8fa77ab3e14c06c9c9e78d3d8a1c9ac08ebe3925617ea2ad1c9f4c559de5a8f495ded9fefae5be087b0bb4ece907d76326bf674a0a4ff
-MISC metadata.xml 474 BLAKE2B 4d013c02cc0b5fc2353986b665fd919f8a678d7f4e39e628b6fce39cfca8139a619dc4e27c5de67f2271f9e00a802e1422e8d61f5f4d758a3cab0c1b00692819 SHA512 434efa91bad6e55caa520e409598c6504a11c116f4ffdddf77f7fedd9bd9135e2f90e2fb4f1bd551c492c0af13134a12b75f6f29172326e4218471f1466c3f81
+MISC metadata.xml 474 BLAKE2B c16a6d4ce8d2507c2f9b3c306c4a815c0883ee1d348aadecf301b1a89ea176ce43aba3c3302dc886904a67648f08fd14b3d31664f85f8bd052a65912311d6efe SHA512 e5526e505baf19a283049fd9aaa5299e8b26c84dc297b0f84f854b211c34cc6ec79aab2e9297eda2fb25b56f4b106ba078df34189fef756e378e7c2e84f0bbf5
diff --git a/dev-python/pytest-pylint/metadata.xml b/dev-python/pytest-pylint/metadata.xml
index cb65d5c32b97..94a658402b43 100644
--- a/dev-python/pytest-pylint/metadata.xml
+++ b/dev-python/pytest-pylint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 202701d6ff43..5ccc0004ae1f 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -2,4 +2,4 @@ AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 EBUILD pytest-qt-3.3.0.ebuild 1186 BLAKE2B 170bbde7f87dd7e77d6a07120176087550577fab22b81749db2003b889ea33edfd0947493f2c3e092b955973dea63e3ed7ad43da47ab5a97da8175536ae50d2b SHA512 f2c01fb7fd902e11f20937d0abc947f44d2da84087cd7db5ade934e0bd20168e4d94512d3156c85d9bccf2bd8df8e64d713bcf1f0128c427d238364aca8a344a
-MISC metadata.xml 507 BLAKE2B ab074f723d086ec00320b7fe05de816f2a4986ebf2404e056845a40e6a9c28c7a7db1c042a690ca9df575ef450391291f1ebeb133c8dc3c5bcfe6de487d838c5 SHA512 f1aaafaa52baf8d67c9c7d4dec0ff921f8b5749c5cd32072ee55e8a0b2c05a6dbad8ae1847aa720f3d863bf7ad0b6d8d7610d9ffd2b841f0c0e2ccb276c22854
+MISC metadata.xml 537 BLAKE2B bb1fafe8cd84735962bb5dccc6c45619642a38ce17456a6a609d26e5f135c3c21ed0fc7e9651d477d7e972410a729de9b4a6d2e0eafc8c663df81b36783ec5aa SHA512 fe750266b77e746e7dc98f3d51e69217db039a510522d79bae869e2c243a86248d3ba605a97411e16dbd8d0b34e1adcca2ff73e265c531ab205e1b2c85ba552d
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
index 9360bd83723c..9addeb33e0f5 100644
--- a/dev-python/pytest-qt/metadata.xml
+++ b/dev-python/pytest-qt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 3c805d834501..9314ca304d6c 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
-MISC metadata.xml 581 BLAKE2B 0c89ac086ea6a4df82876ebef5710c1e5f83a198c7f6554d25d2f4a79b9ed4522477233fecc66f8212b9d67c4d051e6845a4ee5a82320e95c8e5d1b3b9fbaf3c SHA512 2332331595aadb30675a3c78a19a5fc072b780ea17526f97450c16510b697711ce879289aee329801d0b16c6d058a375d21a718e386eba662c22a8d8f7739748
+MISC metadata.xml 611 BLAKE2B 542127f5b006545b2c2036c3d91adcf504aec9629e5eeedfe45b4914ac6c23caf5855da2bc2201637b5d8b4b7c61177002012834f5f4447eb101a996e0e16c77 SHA512 bd62c7af970d038b0800167000f2d6a115014e14e04ee742d65954ed082552b32a8489b7c555f8403247f149662bb0dd85dbe543d5e770e55346e8a6ebca9f8b
diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
index 12f2d08e3acd..e07abee2b047 100644
--- a/dev-python/pytest-regressions/metadata.xml
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index b259dc487b7a..c89204d19ffc 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,9 +1,4 @@
-AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
 AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
-DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
-DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689
 DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4
-EBUILD pytest-xdist-1.34.0-r1.ebuild 1034 BLAKE2B e2573dce203013c0000e8192e72e3df62f055824c94b89ce085a820aeffb186ed7f6c57759c74487678d88912fe58b218498b57a3f388e7525c07fb7866c5771 SHA512 ec4462b37f30387f804e11857f081fc5cba69b271a566659853f2d5bec3321cdc90a316a4e1f884a3623462744775718d6a3d4849202a73a29ff9f4da41b0011
-EBUILD pytest-xdist-2.2.0-r1.ebuild 917 BLAKE2B ba82a931b850881ebb8bdc71223b8301c3b00e59767fb76bec17e5a4ba86aa569dbd906e139bcf878011471fd3c99a5053a7c760e53b20dac3cdacf7d22080b6 SHA512 1922065b4754c83f19739e10e378462d57af202d6fc99241340ee34b4de89c5d39ee0c3ab5da146cd3db2ba992ab0a25341a63ee62df1f19a2263cb198cfb61a
-EBUILD pytest-xdist-2.2.1.ebuild 932 BLAKE2B a0b0594a3cd1cb199c76089eec90e18e50123b50879b71c8d697c2cac925c02db7c8fd75ab0704e281b9eb59f23cda45654d6ff0c78fc4c3452514859d0fc2c6 SHA512 fcaacb88dca7e1912004d37dcdffec8478eba13f1f2ee2ff3cb5a6b7ed519d6ad7a272a0462226db0987a29f22f45ca684e8f83d10e0d323193ce5ea019704a2
+EBUILD pytest-xdist-2.2.1.ebuild 924 BLAKE2B 396f5c4a171b3eabe016d21318d2e2a8c38693cd6848385434b4e4b34e1f8216ce181a7eee22ac56f93b3e988b8201c78b0d3d5be866abab39a38eda15a387e8 SHA512 f29bb5739260b82249e2e4ea3449719ab2743c294cb1c18efaeaf71d3239748aab4034135a6d79a9a2e2d7c2e18588a2d6822b41fbe07752e63d2cfa33182e45
 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
deleted file mode 100644
index 8595480c01f0..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 31 Jul 2020 20:13:24 +0200
-Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
-
-Fix test_config_initialization to be correctly skipped on pytest<5,
-by explicitly checking pytest version (idea copied from
-test_looponfail_removed_test).  The current conditions are insufficient
--- the outer check wrongly assumes pytest>=5 will always be used
-on Python 3 (which is not true if you need the same version to support
-both Python 2 and Python 3), and the inner condition apparently
-wrongly assuming that invocation_params attribute is not present
-in pytest-4.
----
- testing/acceptance_test.py | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index 7f9a551..29c5d9a 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -2,6 +2,7 @@ import os
- import re
- import sys
- import textwrap
-+from pkg_resources import parse_version
- 
- import py
- import pytest
-@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
- 
- 
- @pytest.mark.skipif(
--    sys.version_info[:2] == (2, 7),
--    reason="Only available in pytest 5.0+ (Python 3 only)",
-+    parse_version(pytest.__version__) < parse_version("5"),
-+    reason="Only available in pytest 5.0+",
- )
- def test_config_initialization(testdir, monkeypatch, pytestconfig):
-     """Ensure workers and master are initialized consistently. Integration test for #445"""
--    if not hasattr(pytestconfig, "invocation_params"):
--        pytest.skip(
--            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
--        )
-     testdir.makepyfile(
-         **{
-             "dir_a/test_foo.py": """
--- 
-2.28.0
-
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
deleted file mode 100644
index 5969b49e86cd..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest4.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
deleted file mode 100644
index 324d6470fb73..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-services-conflict.patch
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
index d27d1d1c78ab..b0684c4521a2 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index ab30b23ce5df..33def591620d 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
 EBUILD pytest-xvfb-2.0.0.ebuild 765 BLAKE2B 56d9422573ae2d082f6726f9d5ee5845b2d833cf7b21731df5c16e0fcd6693e231215b55260fa7997b78e135f6b19185e1ee2d7d34730f2389db405fa6d7bd98 SHA512 e00ff840b4009968b0a9c73466eba0e7e6df57e9facf02cb294eb852db00bb89c1397e0a1ec72d9f2bc1910160e13e044d1aee43aeda63d96d48eb00f605d978
-MISC metadata.xml 449 BLAKE2B c81ca6de80742154c839172120e31332b62437e108f53f5147003053ca5f162fb682ee8dd9e5f1b18a038a414fff1cf1aee012b852b90e71c8da8543deb8eba3 SHA512 8c4f4047aaba0f17409d085c33851698af87167a2256b3592dbf19daa4ef405356ff2109cda21a03ad3203bea7cdd897c767619795f0b2acfcdd55b7f2d1dc2a
+MISC metadata.xml 479 BLAKE2B 1d0427df88aa1f23e585453431eaa90b7deb013c5a48782221dac97946437a8a79d785e3d7f01c6d8272a51917e509655d44e3794fe08e6e676bba37804c484b SHA512 16b9efc376d0aad8e3db0982d616c413c01d26f1e44756a4e02ea68b999dfa457e5eea47d6fbb675fe68096fd780a4c1945f2554922846c0559baafe0fbc357c
diff --git a/dev-python/pytest-xvfb/metadata.xml b/dev-python/pytest-xvfb/metadata.xml
index 0181a5d4c842..8762625bd5df 100644
--- a/dev-python/pytest-xvfb/metadata.xml
+++ b/dev-python/pytest-xvfb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index adbdfec7ceef..772f85c90496 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
 EBUILD python-augeas-1.1.0.ebuild 597 BLAKE2B e38ffb64fcadf0beedd8c7f9c8fe52ad2f327abc2c93657f7283742245e28606a60ca1d1585804bf161af8838b0d2b392901f87f7bddb7fa0b99903e2f816a62 SHA512 8c2685d95b4a45612a3fc1420f6debb05f77bbb4a4d8aa248412f3b5608dee2896a81b09eb015948a2cd9cc2ca9992fc97d7351b997b0228769fbf3ddc7d2910
-MISC metadata.xml 422 BLAKE2B 32ea953c135e9cc5fd7fbee8f5371975f0ec23cdb87b257d87d8b969d7d725232db169a65ece36e1d9765906c8dad54f63cc47ee61d554ff18550b403be1f498 SHA512 613157be0df0ca791d4ceef9caca1d0e1724716125321b9672778e984b9b87070c05af2322a3d45969e6211a3671c4e0383ba699f5d5854ab491d5c6113fafde
+MISC metadata.xml 422 BLAKE2B 659e3578e5176a84d6ca554d44deefda0a3006a850dd5ae331b18d879191c7b62bdc136f71132c5c39cacf2665edd23e43a05f3a76b7bbd8b795b1c1bb3bdd02 SHA512 15bc6f8333ec035dcefa54171b0f5c2bb7c228182b75449d0a2b10bffbf97c5f4d8af77c97bd88c157326973df0b956abfa42ffd98cf971f61507aa894834cdf
diff --git a/dev-python/python-augeas/metadata.xml b/dev-python/python-augeas/metadata.xml
index 22c6619aa5ce..04063b2eb1f9 100644
--- a/dev-python/python-augeas/metadata.xml
+++ b/dev-python/python-augeas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index aa5375d2a9b0..c6470900e4c7 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,7 +1,4 @@
-AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
 AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717
-DIST python-debian_0.1.37.tar.xz 308568 BLAKE2B 7747ed21d3d6e06d5342ace6de83b79a93c76e44e8fd6d5738575e154f6d55dacd5dbb27d0210fac6f0a9db95b6d95b1fb9106da64ffbe7f77ec9d1a3e829d49 SHA512 0c13d6ee008bdcdfc28ac35d031a8486994a79a90d6b817349f09936c798211333604fd967bfde720fbc6b089bbec8e52b8c0977c430517e6f8c23d370fdff7c
 DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
-EBUILD python-debian-0.1.37.ebuild 895 BLAKE2B 3e13132caa9248cf1e2e28ef0c10a3b2671082b9972c41fa0e1ef7dcf5a8f62fc6e29341fccf85987b9985d3feeb965abdeb6df85a6f70151aaaec976fa4272d SHA512 6d6eece96f41114b6954d46367363261ca36b44e0b6cb4dcfe8e0c4d770bbc165fc8fb3344dac32a76ba728af10dccbc87a8dc28cfdc0fc06d61896ef4c4eedb
-EBUILD python-debian-0.1.39.ebuild 898 BLAKE2B a950d0f95180c5513aef95ebb8a1b466ee5ff5d91a92588b896cdc8a00f3e02bf6f3a7daff19533543017cafb5b9939543eea425c32384fd11142e1eb0bd2511 SHA512 9ce85e513eef337347d5aaa6696eb3358a12f7d4fc28ae6e601a4232286a92367a6f65fedfbbb5065f65e14037375f99aa71dcdf18d86a17126558ce8b3e0e8d
+EBUILD python-debian-0.1.39.ebuild 895 BLAKE2B fb7c8ffa21edafb840b8087ccde9c91a62571ddd65aa12c13db24d26c3ed643c0365ed0fc04458ecdd2b13e2f433c7cb10387f80cde652a94410f5e16250748a SHA512 ae69f7a467682520a865e1ab67a28a7b60b3669e9ed0b67dda4e3f05f8f78f3d687fa9906b393f849fcbb0417cebab9e6e00b785358b932c716e66e47acb64d5
 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch
deleted file mode 100644
index b497986b6dab..000000000000
--- a/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 76b7c4e7d16e8f792323f8d14ebdb1678d9d12b0 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 30 Nov 2019 23:18:05 -0500
-Subject: [PATCH] Disable apt_pkg support
-
----
- lib/debian/deb822.py            |  4 +--
- lib/debian/tests/test_deb822.py | 53 ---------------------------------
- 2 files changed, 2 insertions(+), 55 deletions(-)
-
-diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
-index c679f4b..2e85956 100644
---- a/lib/debian/deb822.py
-+++ b/lib/debian/deb822.py
-@@ -1913,7 +1913,7 @@ class Sources(Dsc, _PkgRelationMixin):
-     def iter_paragraphs(cls,
-                         sequence,                # type: IterableInputDataType
-                         fields=None,             # type: Optional[List[str]]
--                        use_apt_pkg=True,        # type: bool
-+                        use_apt_pkg=False,       # type: bool
-                         shared_storage=False,    # type: bool
-                         encoding="utf-8",        # type: str
-                         strict=None,             # type: Optional[Dict]
-@@ -1955,7 +1955,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
-     def iter_paragraphs(cls,
-                         sequence,              # type: IterableInputDataType
-                         fields=None,           # type: Optional[List[str]]
--                        use_apt_pkg=True,      # type: bool
-+                        use_apt_pkg=False,     # type: bool
-                         shared_storage=False,  # type: bool
-                         encoding="utf-8",      # type: str
-                         strict=None,           # type: Optional[Dict]
-diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
-index 7101727..64a724c 100755
---- a/lib/debian/tests/test_deb822.py
-+++ b/lib/debian/tests/test_deb822.py
-@@ -40,8 +40,6 @@ else:
-     from StringIO import StringIO
-     BytesIO = StringIO
- 
--import apt_pkg   #type: ignore
--
- from debian import deb822
- from debian.debian_support import Version
- 
-@@ -465,11 +463,6 @@ class TestDeb822(unittest.TestCase):
-         for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
-             self.assertWellParsed(d, PARSED_PACKAGE)
- 
--        with self.assertWarns(UserWarning):
--            # The StringIO is not a real file so this will raise a warning
--            for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
--                self.assertWellParsed(d, PARSED_PACKAGE)
--
-     def test_iter_paragraphs_file(self):
-         text = StringIO()
-         text.write(UNPARSED_PACKAGE)
-@@ -487,10 +480,6 @@ class TestDeb822(unittest.TestCase):
-             for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
-                 self.assertWellParsed(d, PARSED_PACKAGE)
- 
--            fh.seek(0)
--            for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
--                self.assertWellParsed(d, PARSED_PACKAGE)
--
- 
-     def test_iter_paragraphs_with_gpg(self):
-         for string in GPG_SIGNED:
-@@ -556,12 +545,7 @@ class TestDeb822(unittest.TestCase):
-                 test_count(deb822.Deb822.iter_paragraphs, 2)
-                 test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
- 
--                # apt_pkg used, should not split
--                test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
--
-                 # Specialised iter_paragraphs force use of apt_pkg and don't split
--                test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
--                test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
-                 test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
-                 test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
- 
-@@ -607,27 +591,11 @@ class TestDeb822(unittest.TestCase):
-                 s.write(b"\n")
-             self.assertEqual(s.getvalue(), packages_content)
- 
--    def test_iter_paragraphs_apt_shared_storage_packages(self):
--        self._test_iter_paragraphs(find_test_file("test_Packages"),
--                                   deb822.Packages,
--                                   use_apt_pkg=True, shared_storage=True)
--    def test_iter_paragraphs_apt_no_shared_storage_packages(self):
--        self._test_iter_paragraphs(find_test_file("test_Packages"),
--                                   deb822.Packages,
--                                   use_apt_pkg=True, shared_storage=False)
-     def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
-         self._test_iter_paragraphs(find_test_file("test_Packages"),
-                                    deb822.Packages,
-                                    use_apt_pkg=False, shared_storage=False)
- 
--    def test_iter_paragraphs_apt_shared_storage_sources(self):
--        self._test_iter_paragraphs(find_test_file("test_Sources"),
--                                   deb822.Sources,
--                                   use_apt_pkg=True, shared_storage=True)
--    def test_iter_paragraphs_apt_no_shared_storage_sources(self):
--        self._test_iter_paragraphs(find_test_file("test_Sources"),
--                                   deb822.Sources,
--                                   use_apt_pkg=True, shared_storage=False)
-     def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
-         self._test_iter_paragraphs(find_test_file("test_Sources"),
-                                    deb822.Sources,
-@@ -973,27 +941,6 @@ Description: python modules to work with Debian-related data formats
-             self.assertWellParsed(paragraphs[i],
-                                   PARSED_PARAGRAPHS_WITH_COMMENTS[i])
- 
--    def test_iter_paragraphs_comments_use_apt_pkg(self):
--        """ apt_pkg does not support comments within multiline fields
--
--        This test checks that a file with comments inside multiline fields
--        generates an error from the apt_pkg parser.
--
--        See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
--                 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
--        """
--        try:
--            fd, filename = tempfile.mkstemp()
--            fp = os.fdopen(fd, 'wb')
--            fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
--            fp.close()
--
--            with open_utf8(filename) as fh:
--                with self.assertRaises(apt_pkg.Error):
--                    list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
--        finally:
--            os.remove(filename)
--
-     def test_iter_paragraphs_comments_native(self):
-         paragraphs = list(deb822.Deb822.iter_paragraphs(
-             UNPARSED_PARAGRAPHS_WITH_COMMENTS.splitlines(), use_apt_pkg=False))
--- 
-2.24.0
-
diff --git a/dev-python/python-debian/python-debian-0.1.37.ebuild b/dev-python/python-debian/python-debian-0.1.37.ebuild
deleted file mode 100644
index 86681e27da74..000000000000
--- a/dev-python/python-debian/python-debian-0.1.37.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/dpkg )
-"
-
-PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
-
-python_compile_all() {
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild
index 12bcdea23192..372a80438504 100644
--- a/dev-python/python-debian/python-debian-0.1.39.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.39.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index 2f054ca06bee..eaf5b1b4cba7 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-designateclient-4.1.0.tar.gz 60526 BLAKE2B 4df143ea429510aea50235ee80ac8712d436201b54544089860e452e652c220b5fa954ee88b61c30150a34655c6d38839f5d40d5860263a5456a2d65773bd58f SHA512 ae99fcf662b81ec0d14c3536dddd51e3b2f945ff5e62669efd1e2f0ad1f820884f427af6b9112c3fae5e7d0953f2008132e6e6e9fc1ad7b155c993a62434b90b
 EBUILD python-designateclient-4.1.0.ebuild 1177 BLAKE2B 49d7cbed09168181929bb7449b354bc36fb42a8920aeda58b7707da1d98718eb250565647b6f381d3f0bb1a93d49e5f9f198479b5acb3681bc89fba1faf8d2b7 SHA512 75031ff59eb2031f0ee4cada3c8c48db3aa9a9fd7fc4c2735fad39808d772f25f76fe7c91432ecd105a31bcfc7e4b43d0bc05db09474679a3825f3216c0740f6
-MISC metadata.xml 644 BLAKE2B cd06dd4310b9595594428dba982b32781a84cd16915fc153dd731e6e745b0484ff39853fb4abbb5266f0a7e459889cef0aefea374bee04fbc1152868b21a6564 SHA512 93eae21ff08ea6ccd6b6bd9b55ce9e08a3328af609d0c85e1510a87860e29db9b42119fcc5bb666ecbfe0437a95ac0271eed1cab6c4be9a58f4899ad1dcd485e
+MISC metadata.xml 644 BLAKE2B a67a87d626e71ce471e8000ed8756c683b803aaa45772f4ecf2c5921732d01aebfa771c0310e9875ef9902a7a386356a7641c128ed69e2341cf1ff78cb788465 SHA512 98267d6270baf3661b3cc774fac097f25c4e74a3c9e337689877c1dc6b9502c33d3e1267ad955aac317daf4fd33e4fb41d68ae8fea4906f4c01dda7695160443
diff --git a/dev-python/python-designateclient/metadata.xml b/dev-python/python-designateclient/metadata.xml
index 8f1c055b0d79..e48df58b966e 100644
--- a/dev-python/python-designateclient/metadata.xml
+++ b/dev-python/python-designateclient/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 937a0f36a952..0376f86a7965 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
 EBUILD python-email-validator-1.1.2.ebuild 819 BLAKE2B 02a620ac8f752d7f62728444f9274e6d527f0d495096607e3d6d18343ae3a3d455ff576ab31a8ca156029505ac33e20ebae096eb6b9e64d68b9794c17e040e6c SHA512 841904d5aac2ebb6aec8d40004c31b1d78a90c7a89f61fda50b88c19a10f174320ebe6ffe80f56216f9cd90ce410b55d46d68443782c3a0d063ba6e9ba3daa5f
-MISC metadata.xml 762 BLAKE2B fa66973f32734b810addac910f42d2e3ec8117934d555a1866e90f4c427f5c19f8204674bdc700e98ea112112f083f22adbca58fa29f90266cfb9e52cad19341 SHA512 8c0371c9d5605a3ecd4ee5d354ff78a53738726e9882114db49bb442fcde9fead3ce7934d9c4e8af82c5d44fe80ac34910681d700eed6ee97862bcf77889f851
+MISC metadata.xml 805 BLAKE2B 1fd2c12a04c3b2d824dd0a7a5d5ecc2ddbe716682aad6b24b39eeb12af9b33d3a6b10d511b2d6a98935a3ac9c3a5c11a2b9f8cb97c6ee9678ca2ed6d00483a85 SHA512 21ca57aa5220b3c3df3e0e1f532f2f377bec7b48bfb864f8aa531592cc274f8b9eb70f418b52372613f72d2064fc7f73508127c54f47dc53084d87537d173e34
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index c1a47f0f99d0..774e7cd21687 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>xp.vit.blr@gmail.com</email>
 		<name>Viktar Patotski</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index ca761d015df8..6d707c660847 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
 EBUILD python-evdev-1.4.0.ebuild 759 BLAKE2B 31ceb49f75f235930bf1e95db3fa25c6f70e7fea944f7cd299d4e622aa9c376f75bca0fc61eb2c5d06c0169edf70e315926f99344df422144d664a58b1c53059 SHA512 f1c54f7d600cf5957b0806f45a5dc52ca0cab693c1d52fc158ad2d5c0d7238f6f33c303fe469354d5dd6ca2da969350aeebdb745aa5c16e6776fea5d59c66fcb
-MISC metadata.xml 427 BLAKE2B 7c797c3e574c9f3fed201cbf35d42d6a259d4fbbd69dbba280e184a6c8b2ddd82f008be20d80cb74aead9b1389e53d82b38cdb438713e6ae8e7dcfb3e4a41bef SHA512 e73122f3c3a0b515d6929c78df917bb62a80722e409e2bed91969dd28b8e7e36ea7eab954739c2cbc575e627e42d526cf35b71a1977ae6e6308b029222235c2f
+MISC metadata.xml 457 BLAKE2B 0655c72b7383d76dd0733f978fd91248a7f5a6e740354d80d96db64db44adb62de5c9123f81c08c7c10441418d8e8086586d8e73682f0185cb4dda505304d096 SHA512 5c5a5f99ea76aa2620ee61eb277d6edae6bde115a50284e7cd4bd805d327623abe368a9bbb5413bc7c074a77198a8a58095c7a9e6806d0e34fb760e9eebd88a9
diff --git a/dev-python/python-evdev/metadata.xml b/dev-python/python-evdev/metadata.xml
index 3d9deba29f16..64eb0ac0ac8a 100644
--- a/dev-python/python-evdev/metadata.xml
+++ b/dev-python/python-evdev/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 37df15f48cbf..f089ff310755 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
 EBUILD python-gflags-3.1.2-r1.ebuild 822 BLAKE2B 5e039b367693a82bf5fe191dbb35adbf125a58637934d84507e91563c0601fdfc9bd060562b270cea1cd85a73298702d99c9951f4420ae0da4bc47823ec8ca6c SHA512 2ee39eabc9b12ab0725e486bfcf33e142d773767ad0ddab0e97d4bee51aa932dca82fee4ac7237a23c958fe39d40f09ca956c2015cfc54141a901161f12facb2
-MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9
+MISC metadata.xml 400 BLAKE2B d46a510552c2563f3c27284b162ea1a99134a907342d35c19c18e972c2914d1719721821d675f5149cf31c619cdd106a3038ae6517755ee9eb695c1bdbe4654c SHA512 39a2a0400bc6d6e5444f9a90e3aac170c54964f0b031fe20926a262cb7ec85c31fadff6c0c4da1200cc6f257b24a2950e06302bccd22e61de44184ce6a10b8b7
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
index 3dd29bbf1a9d..f4b3bcbdc78d 100644
--- a/dev-python/python-gflags/metadata.xml
+++ b/dev-python/python-gflags/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 6d91039f5f8f..14ac9896bf2f 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,4 +1,4 @@
 AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
 EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
-MISC metadata.xml 459 BLAKE2B f052cd6b712a1d4dc7d0116ea6985599b124d57e46bc529f86aee675e31e5a7c4367326590a6075d470f765c1d6c0f69289f517136b4cac1b29a7328f82f9123 SHA512 20ecd3f908a796cfe24f6e0d544d3440c219dd6a8441e099e53195b2898219a3b3e8aaa915ec5f59f21b49eef363aece1f863e8cb7c479a2f1eca6a21a8fd6a6
+MISC metadata.xml 489 BLAKE2B bf176488a6f0304d3d9224ddaf533ab4b3df2b967799110afdfa5368000d0b5371c689b2d8437b9d13bbcd484685a596d5bd79fc8e993373feb62a354309899a SHA512 139446bcfac77f4d4b10e26089d3a9ebb130d061b1a3dc220a288422e0c02f7bb0f7532f6f741e3a78705df6e30d9256709efc797c967779bbc022b6bacf36db
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index 165531b18aa9..2a7e631036f8 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index e623ab6fa7be..1236fde211d6 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
 EBUILD python-language-server-0.36.2.ebuild 2442 BLAKE2B d61537a5a1132ea6ff586fcb534f770776a6f6872a711fa743745ab703bfe08b5569b8dac52c0fbf9dff86a2f11a241c10ba57eb8829aed7ca3ec89343a6639c SHA512 9a50540cc100d5ddd97e59c5dc677227fc8252247785e703fd3f530b195554fa9ebff32f2f7af7c6174dc7d00646561c262631e9b519d42dbf1a417618f13c6e
-MISC metadata.xml 484 BLAKE2B 2f8a311932b3cae28a62cf8aeb9488a3a5c96435760468c538355cf859f66675043f2be9f417bd6996325046c40c2dc9793e75c51389e3ae25f374c86d27ca84 SHA512 3695d28540296a6e2add93223bccce5ea3f4f5d1b607ee8139ae5eb3ea065eca70e61f89b38a927f20683b5a25884e568265fbc8ac007012838263e82e375b76
+MISC metadata.xml 514 BLAKE2B a5982be16511774dbf4bc63e33eb4370194920873e43dcda1f9914275c17bc6c4ca16acd3289cf69277091b967d0d96dbd0dfd973dc2ae14e825328d449d2173 SHA512 a9b6d7621c33dd0138890e9d8550efed80d19db3b549c677a28025c327f2c5119168aeb05eac4d1cc5098741a904a25cbda1818527f081d4bd9f44d56e561e44
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index 3e115bfb71c6..b05ceca6d39f 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index 2e8a5b79832f..0936bbe1ef9b 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,5 +1,3 @@
-DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
 DIST python-linux-procfs-0.6.3.tar.xz 18808 BLAKE2B 02fdc0349dd456819f67f82d6836a44e3285e16d9654dd52b58ac7d86e48bc559feda18f105db7911ac5f670fd0e6cfd5c6cc69a958a3e8494813ff244f8b06f SHA512 18e42bf12456893740c5ec950ffcca86945b1ff202a6ea3ae6ac800145771a39b4ab7e8bbb440210d48d0fe9de646e334095afd0b20060e2e28ab3fa844f6140
-EBUILD python-linux-procfs-0.6.1.ebuild 585 BLAKE2B b0791cf9458ff3efb9c3f16372271214a7acbb9e9b005526419ff952beb52ad5d28ea85eb7e8db114b95d76a023abe36a38dc2e5a7ba269c752461adebdb6fc5 SHA512 7d70089c7980489ca8392b9b1259eeda6a000a7827f3d6e26d65064876d9ecb95192e3adc6efbd9e3bad30a221de8e19157240f9409b93379448223e9f86a210
 EBUILD python-linux-procfs-0.6.3.ebuild 591 BLAKE2B c457c5be2464cc6ca9238f060269da6056f06a57d5a19f125ecc6de03e230779afa4e07cfee1c003b32720b03d5fca40dafb87ff1e185b1ef8ceafe983659b3f SHA512 9b40b275c1dd2955bf9a1e9712a69937fdff8760db639b65e229c4efff0ec79f90cbc402bb64b71608a876a172060644d1e858a8ea0ee0479164d2e7e8ad959b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
deleted file mode 100644
index be3dcf4ed6c6..000000000000
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.6.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
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
-HOMEPAGE="
-	https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/
-	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
-SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index 00e571a6bdda..1ce68984825c 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -2,4 +2,4 @@ DIST python-markdown-math-0.7.tar.gz 8320 BLAKE2B b402a6c1c3ef93f8716b88c0ba3561
 DIST python-markdown-math-0.8.tar.gz 8509 BLAKE2B f91d0dbd6073d724f90a1265a64f2375be51ce25f6bdf808e1176a582c0e98aa59a52d45d67c5e37f674db5b5b7dead572a93950b9143f0950a0ee20b241e4a2 SHA512 d35e0cba68fb4ec099368d0d4865a5ad1baab6fbd23f7457312ab6893c3864287c41c32f560bbd8cddb0afff6522640f9b9144a02774539eba4e1302fac05bcb
 EBUILD python-markdown-math-0.7.ebuild 888 BLAKE2B 828efca52077d8c74862db193696afc84dc4352a13f886167a0cd606b92d19f3b0c3ff5f8c451fa0335097f8d7c01d21cf15c036830f5d6bfe4a7abbba4daf67 SHA512 2b47515689a808624cecc0c17d4c15dad5859d5c88fc6f713fd4d99d9d2462afd4d83a5b1028940823c2d6387a8ed6531830c8251fc0a467e512c6c9ce10a96a
 EBUILD python-markdown-math-0.8.ebuild 473 BLAKE2B ccfdec63fd4692cfdcce4a02bf2b01389fee33d87205f60a1fdbdfa752968163966d1ec5cd3eec97d5a409510f2e92a61d533641e480ae10379c531dd20db280 SHA512 7bcef0da0a36be07dcf76853d9557d98ea4b0be8257dc510c4ddcc4888a8e8ed62ceddc704b10c2ad5483df13ce49988d1c61bb11971f2bec2ee1ef91dc81d97
-MISC metadata.xml 642 BLAKE2B 98bced2ef156614e4c32985a116ab66da51ba1e26926aee127e9e2e32e1856092d8e6e945facfc700bc00375e56729b961670f1aa94f1daed847727506e44d69 SHA512 5fa1cc7d05722e49e85467b40467c18e90401d02a256ac703ff2e888030d5b6412eee6d201df092b8d5bf72a9c8b99c176d6eeb854ab6af7051a71ff2f83835e
+MISC metadata.xml 672 BLAKE2B 7590c226e3723785c7b38550ed209aee1eb48e51fc2cc077bfcf8355776f9fbb5f71605b28e9e8c0fdea987a0e6ed9c871c1f87352eeee249ed75730daa1adf1 SHA512 58b0c0e518d9ee33b7c7a94ba55ae837bf6638f1a59c99ea13d31718c88e6b8081faabbcffac6cabc988d3df4acea2b1441e786e5b191775d58167f35b9d22b7
diff --git a/dev-python/python-markdown-math/metadata.xml b/dev-python/python-markdown-math/metadata.xml
index 1d05563a467e..0c20ab2352dd 100644
--- a/dev-python/python-markdown-math/metadata.xml
+++ b/dev-python/python-markdown-math/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 1c5790987958..f08365c52942 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,3 +1,3 @@
 DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
 EBUILD python-musicbrainz-ngs-0.7.1.ebuild 913 BLAKE2B 0fe98b5476bd9a16e97d53157221d065772273017f36627cdb564f7352a6f23e61bd820c7cef7bd869a14d2d8a6025eade07d0fa72ad009156ab6adffd12fe57 SHA512 233b95f8c8d71d64edf2fb1fea56d722e3d1fe285943606c53ed6cc6fc8d75f49ebc229569cbd3d82243694f1b83ebf7ef992991c6ee435b19a632d1066c86e4
-MISC metadata.xml 925 BLAKE2B 16281f4ea69aa24a9b41b7dcb42922c989d706beb155631858038b40d012c0723a9a1b464db6905f0fade63c49750a75a3e522c115919922b2d9c6596666e3c0 SHA512 c02c6eadf2e1980f0c971deeef6b8e45733feedf00ab1002c590a3090346776194037b58318e196fc1511c1a9dee1c8ce9ad28be0a6579a3364d386771695957
+MISC metadata.xml 955 BLAKE2B 68571b0c8d1a72425ce23f600363146ab2e365d561236c618b46333d1bf3a75035e05c131b3c45fc1ec1f6e4171c78446588533d54221ed7cdf4b43453d71053 SHA512 b2f68817a2720a15364672ba29629fd9f0b1efe49e46167f60b1a5a7f3223bd2cda6d01bf31732c01d3cb1703523a6e0245be051278a92a221d796fa3b7d83e5
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index fe216de26831..68f51076f4c4 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gerion.entrup@flump.de</email>
 		<name>Gerion Entrup</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index b3e7e6f7b71f..f00fda676e38 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
 DIST python-redmine-2.3.0.tar.gz 67915 BLAKE2B ad31d63ec5bebd33ff436f04c40fd49e35a79751c353ba1e343bbb03048c2d1662ec8ffea5819561b675e366f8cbad48a0e0a0a59dcaa563a90301ad4f1eb1cf SHA512 a317743a561cde65c17356a317d3aed082149d648aaa7487858c8533ceb286d08b6610d742321f6593fef8b61b1a4526963ddffc4ab180a83795d66773154b70
 EBUILD python-redmine-2.3.0.ebuild 473 BLAKE2B fc95561962b4289512ee98c17a01ab554db5c58e1d3ad9e8155e33662a7901d15e880c2abff35a0fbb6e8a0b15fc24af6c1119b7593a7f2c68eb896877df3fab SHA512 6e2babc8d8c3cc04c7b4d020a71650fc63691e349da691f374808bf8632c861bf4a5bea3897b688d14076e1873cec88b9ea0f5717fa136156d7f836d6acc9758
-MISC metadata.xml 400 BLAKE2B 03f628bb2d3dc4fe61613c08dff75e0534c475d637150a9c895e23e613b5c32188f78b298fb1b754d0df6e617f5d7c28e5e20f1984fe297a6d550b2debfe290b SHA512 12d43f2ec4712a7c01ed86aa2b1d05eebb907a8a6bd787ec82aff8ea2a97cc6708255dfad3d386550bcc72887d1b273b6ff3f958bc22e5bbdc4bd8a8d28a57ac
+MISC metadata.xml 400 BLAKE2B 7869d1348e69b8d5b68ec4b111d2be6951ba78aaf10f086f74272ee9fa537713b3df06a5f5e765e1ad31e438fb069bd0c62542581cfccebce962aa2e665bc36e SHA512 54433c81daf2cb7b21cd7ed2796742251fe65db4d0fb827dc8c1c160a480a0df026d985a99edb324cf8cbfc2f8720cebd7d5b16b94e443845c4a19d0e49752bf
diff --git a/dev-python/python-redmine/metadata.xml b/dev-python/python-redmine/metadata.xml
index 14e8319ef215..3a856b534c01 100644
--- a/dev-python/python-redmine/metadata.xml
+++ b/dev-python/python-redmine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index c87f7b24d06b..72b198b030ec 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -2,4 +2,4 @@ DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 55ace80e2b6c0f3b22ef75356bdd0d0d885edfa30fbb2022fb0839fe42ec968cd4331a08d081fb81ca39c10b4a506c052893addda6963ba576e3e99eae6092f9 SHA512 0b6479877191bfb5513a86fe807fcd119970f88528a138c5cb0574008cc59e0f9265df5c873061023b1b8ecd1000b95aa338c3a13dbbe6ecbdcf34dfd2119933
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
-MISC metadata.xml 606 BLAKE2B 26da67fc21b653f901da03a5d1da280cc8739b9adc99cc16f5bb8c01f01c1d89b36fad28ebea33ee6c28e1ebd28bc948c0bc6385923589ebb64812c7d1e2d4a0 SHA512 14889db534b873cc79d1f060c5c82615c975623d8ee4e540cbace144efb68fcc7ebaef73952908a509849ca1bef3eda9010f620b8e5cabb92953c06b75c53f68
+MISC metadata.xml 636 BLAKE2B 67238b65f26d08870b390e38a5366992fd40770f843201ebc930689a3e0819d2446e4dcb9b7b128873ff05ad964edc58b478a4134a563669c718fc890337b054 SHA512 144bb0c8a9249471ef29f015d18349c0a142426b28fbcedf21f83fc9b66b5634e3f1a2e7aa53544d57a2045ca3cf4eb3b76f07f8296253517c14f9d6f8906d46
diff --git a/dev-python/python-slugify/metadata.xml b/dev-python/python-slugify/metadata.xml
index 6ae542e5f505..d7a9be634346 100644
--- a/dev-python/python-slugify/metadata.xml
+++ b/dev-python/python-slugify/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 56fbdbcb4b47..671981cb66d3 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,7 +1,3 @@
-DIST python-stdnum-1.14.tar.gz 953637 BLAKE2B 5772fd2284dc9c255b544c6f0d1f4d1ebbaa48547cf1ba9aafb082a4d649ce90574444b298a333c9fbac5e232d2ea144f2e5bbd817fb6e7b78ea66081ed871b2 SHA512 d17643a2e4d8efc5f554c9c114399802e6dae0ff60b6ab0e32ebf6ece7c87a96287dd1c2e68e4fcd97f8ab475a267de5dad41d726470690255a2a0aeddedbb8e
-DIST python-stdnum-1.15.tar.gz 1037630 BLAKE2B 7d4bc086a5c0e272b7c55ed5bead9561375b6410b286c6d1d78e49dfc1473a9021646fbd363cfa532bc3eb1a54284b253f46ab28f60d2d411efa0992772a02a0 SHA512 e6f1d921e8ce64a11f9c5572e7eabc27bd7c71c34017fb795c45fa585701fcc78ff81c15b1a9bd48b8d9975e1fbc354b3923942c6f81e8fe4dfb8f611e3ab9cc
 DIST python-stdnum-1.16.tar.gz 1039599 BLAKE2B 98197fca412371757b7e7ec242d30d5fc43352b9eba7677aeb3a475dbe7a379c4f88797192b8e5de97493186562d1d21347703643be7798316e22f28c6a144bf SHA512 29ad92a8d1d3267c56e3d128700611cbfe3bc7a27a1420bfe62851f110f3f23b1d8927771588ef043aba366913bf7a5b0eb72896ee50343f3adf72cdb071415b
-EBUILD python-stdnum-1.14.ebuild 518 BLAKE2B ea2ed5e0eb19624cb40e7623c9ae17fde5e56e82025924db33302ef22ea3e3f0e9f9268bd3cd9efc92f16dd53907f6aab399c7c15d126d64e0a2a7cb1e2e0c17 SHA512 0d6db9a8da39cbd5299156a4348441b8b08ea2e0e9ab7abe92f20b1d862f64d16bd045d8e20613e499001fcf3cf11ef7ce1f51ef6aa5a82c95b7ec0ddbafc1ad
-EBUILD python-stdnum-1.15.ebuild 567 BLAKE2B 46fcc7014aa6fe5b8086e6cb4259de1af50f731cce5cf12c030d24214f424c763ae57a7321bee61e27c85c859404a61c0740af248828001d21f75627b8cc6a7b SHA512 9b2035fcaa3d1d4b72fa1cfca5ee1f2513f054c201dbc4aa221403cf6513670fe46fcddfddad89aaf557be9bbf2f679bb0b7f5180c4d1e06759379e0c1df95aa
-EBUILD python-stdnum-1.16.ebuild 569 BLAKE2B 896173e47c27b84233f0c4392aa595f9e4828e78eb6cb8d30cc001038b7b3a85760269eb6bb6e4f4527ce2708d281864566831661c1b3e0f6dcb526e2be88723 SHA512 c900226ffe46fb59a117843f3b5b435b7fe53e8f11e6e826f64fa8fb6e61f5fcffc14a8f75ce620a9a88da4e9372824603027519699c1e1a9ec20bd516bcc1e5
+EBUILD python-stdnum-1.16.ebuild 567 BLAKE2B 46fcc7014aa6fe5b8086e6cb4259de1af50f731cce5cf12c030d24214f424c763ae57a7321bee61e27c85c859404a61c0740af248828001d21f75627b8cc6a7b SHA512 9b2035fcaa3d1d4b72fa1cfca5ee1f2513f054c201dbc4aa221403cf6513670fe46fcddfddad89aaf557be9bbf2f679bb0b7f5180c4d1e06759379e0c1df95aa
 MISC metadata.xml 499 BLAKE2B e444fa5be3b1988a7d386f191372618c345589b3dbfd7828ceb7513b9b4f6b39a78c210d3cd8c7f9af0fb4f9b51ca433cffd7165cad812edaab1bcdf55de5607 SHA512 da9ccb3df8edaf54fbc964d1f32419242b1f2f9d3da928e85253a6041072c3a9a0f25e29e4c466d3179658e47ca65a88cf148db44b052fb14570dd8143a70354
diff --git a/dev-python/python-stdnum/python-stdnum-1.14.ebuild b/dev-python/python-stdnum/python-stdnum-1.14.ebuild
deleted file mode 100644
index 44071335679d..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vies"
-
-RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
-
-DOCS=( ChangeLog NEWS README )
-
-distutils_enable_tests nose
diff --git a/dev-python/python-stdnum/python-stdnum-1.15.ebuild b/dev-python/python-stdnum/python-stdnum-1.15.ebuild
deleted file mode 100644
index bfb61e91ad09..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.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
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vies"
-
-RDEPEND="
-	vies? (
-		|| (
-			dev-python/zeep[${PYTHON_USEDEP}]
-			dev-python/suds[${PYTHON_USEDEP}]
-		)
-	)"
-
-DOCS=( ChangeLog NEWS README )
-
-distutils_enable_tests nose
diff --git a/dev-python/python-stdnum/python-stdnum-1.16.ebuild b/dev-python/python-stdnum/python-stdnum-1.16.ebuild
index 7ee9a4124ff7..bfb61e91ad09 100644
--- a/dev-python/python-stdnum/python-stdnum-1.16.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vies"
 
 RDEPEND="
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 8327b214a7e2..0f3a3be4c2aa 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,5 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
 EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1088 BLAKE2B 3ec25c195dd264c4a9c0a05ad005261165978b5d40eb936216c2d05590f392f43cabdec1d958060b803d724c1fcb4b6dbb815e2336b699e85173b416811786f4 SHA512 1e3a31e62319f067c1846b3409fd2958010e636b4bfb24475a896e679556962066bce307c70a481fa12f88d004e718e0817735e24af0d51e11c6e514ec8f7785
-EBUILD python-xmp-toolkit-2.0.1.ebuild 1083 BLAKE2B efca3af8e4edc76f48be6a2919f3771a5b687cc0a30fe227ea1385d6e9476267203192804ea8df820503482262de45326b6f902d6a6ae823b984b5037f825bd3 SHA512 2ab3e73d0d578770d933d12733ab22994c5b1a68ba552ce68ac107e98caca1a56251553f661ed78f83cd55e0e7ce78372a84275e19d646e51af346ec15012f30
 MISC metadata.xml 416 BLAKE2B 5ef9300ed19a8ed256dd6c6958c2350526d5946893c3346cc17550d15754030315cdae84355872f64e09e890a4dd2da5742f8ded5945e3d4fec2f569cad075ac SHA512 64943f03cf1585d994471560ab50e7f2cfb7c7b2f234fa38b6dcbae004987741f4f2faaa728c2570fdc7b776140d68c0437960118ffb3067b03a67de90656935
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild
deleted file mode 100644
index 391d15a271c5..000000000000
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
-else
-	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Library for working with XMP metadata"
-HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		media-libs/exempi )"
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index d6e25197d9e0..c9ac02e1e502 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,3 +1,3 @@
 DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
 EBUILD pythondialog-3.5.1.ebuild 732 BLAKE2B 8b7bbf72082e9d2f771e5bad198e36200dcd7304e68acbdaaaba13b029703b48e24e4ecbf7f67a2c49286b93d543686f9aeac630679cc5c1b5a41948a1a56e52 SHA512 e98bc26387aacf553f07319696a93db711e146671c062bfd28478c1d32fd7860cb691f609ec19a26cca00a9ec42096885be7741c2d515667fc943f69b53c2f02
-MISC metadata.xml 476 BLAKE2B 7b503ba47b66c7d0429557590fd070e977e0ffa1bd9b5a25f29d396996ef7efeb0343cd6ffb5324b52c22f7fdf607824ef1f15dbb90cde51fed66160cfa5c7e4 SHA512 0797cb8228d91a59931a9b36151bed33e8a01dba279b503d5d76e70b2674a2ec7dc0ab04f1aacc4f5c4571ea397efff8c087e701e0e6304608c1193de0c1102f
+MISC metadata.xml 506 BLAKE2B a94d321a253704b271e4e9ba43cf1479e4a5dcafda570f6b2c7bdfe8ab96aef918d0e04db4d3c93ac56e9988045e21c15565f06d7a37cc27cc508a35d75fba43 SHA512 670c1c6188bfbfc989ce1bc27f694d3739fb622f830dd5b0a2d69df5d9eed443981c2a6d08dc09e5975a0db5d5a0abd4dc94c31e99bb707cf8647ef1062d06b2
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index d39132dbf3ae..87b917f24650 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ilmostro7@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
index d4601f0604b5..8fb22ddd7d80 100644
--- a/dev-python/pytzdata/Manifest
+++ b/dev-python/pytzdata/Manifest
@@ -1,3 +1,3 @@
 DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
 EBUILD pytzdata-2020.1.ebuild 530 BLAKE2B 52fb544863be2facebae577958106dd4a1b19d9e8fcb5b8f119e916cd39e79f44171f496255c8e4ef7c9ead580ee7336ba9f8d1016e54a00c13d67dce4c217c3 SHA512 8a58d6c01d01687b0ec1063a3cdd14b6831d32a41e79a98f1c17217c5690b0260a7e41ed0879bbfc42b69e5e0cbeb4f12e3eb704b59bd86277d0ef28db4422bd
-MISC metadata.xml 540 BLAKE2B 9d449ea1c6dfd3e908dcbcfbe93dc52c091ca5126e6cc41d5787618fc22d064d13a864a60053a7033db7ea14aa69c0bcfae491de9061e4268244d14527312432 SHA512 f3a9584fe0f05cb20abbf1ddbf0061edcce493da0d0b51b550ede073a732e2dc735e1c6d28e1ab37de089e44ff17e150a78e5ad77ee9fe60ec8386c7f9535fab
+MISC metadata.xml 570 BLAKE2B 70dff9edfcef656e24855124e37b1dc70c6c6c1dadd311de440f8a02a49217aa402bd042235020a000d6abdb33586d899fbad2dde1e222f74ce6e3c40837e2ef SHA512 c95854a376b49daf8e0f026edea0fed36da851c388b02d23ac685883bdd1aba670cfc548ba9f14928f0a3797223d3d5d6bad1d21ab88b4f1536cb93bcc60f6f0
diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml
index d3630d930517..9413c73073ef 100644
--- a/dev-python/pytzdata/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 68898e57c5e2..2f2fc00d8307 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -4,4 +4,4 @@ DIST pyvirtualdisplay-2.0.tar.gz 40480 BLAKE2B 8243f88a3878124aebf45624ab5712052
 EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
 EBUILD pyvirtualdisplay-2.0.ebuild 1383 BLAKE2B 57eadd7da3a9c5f32936a282416785f7c3c78e3c2ad41c6307a184f742e20951351863f3b03e29cd09497c259df13d433bcb52227ebea8667c0789e0810f2ec5 SHA512 0365e68ea9ad8600139c197ca8b21539309b08c197f710e6f0db191cd404ede12dc81b43431b4fe1ec6cecf4400bd58797140ff96c8b831d7e1ad2cedbefe49e
 EBUILD pyvirtualdisplay-2.1.ebuild 950 BLAKE2B e351abd07253bea2a2a16421e96fc3d6e853e6f9a0851969da6d39bc23c1378b8cc9637ae4a8177afffc1b091e6c0ce9a06dfd699bb905d02f4b5e80eacf6d89 SHA512 68d0bb13e235b2515ecc30da4135ca5ea401c2aa9e7148e232b405204a02468f31727caaa6091788e362a9c47bc0adacfb3eb2093046d78d4a1246256d9fd1e9
-MISC metadata.xml 555 BLAKE2B 226c0f1bf5691e6e3c2c7e092df25cbf3f52d5aa9138e393228381de08acdcc64e3860a7c8ccda30135ac702ffcc57718a4c4c1ea12846dba20e34812a36b6b7 SHA512 0d29bd64e163061ad69b87bafd41fec8ea618437ddbdc1b7597e2e5182cb516a266d8246e0a6f10d01b6feaab96552c9e35b619afb9ba2cd55d2f5fe23366462
+MISC metadata.xml 585 BLAKE2B 6a7eec78522e0548c86cd6219f01884f27a9fe27201163dece6a1c90cb151052740a55253018ab5ced22f531e67a416143f7ea4289e529e1f753b870f041dbdb SHA512 17f6cb4a609ec4b994fc93f095cece8a3b7aae30575bfb8ba637e0bd7ac93bd31f2267feaf9ed1b58202b5fdc5b0de808a6e33d7f0c87e855f2caf4e52f5867a
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index aac1da403ec7..cfc9cd8d992d 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index 556007cd3963..d4b1bb887abc 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,7 +1,3 @@
-DIST pyxDamerauLevenshtein-1.6.1.tar.gz 60737 BLAKE2B b03e80dadd7d748b2788a85b84bc0fe088905ace412b71302176a2cf5a23b1f109af50f7e5393b4dce42bfa99bebb2793376bf40e24b5ac4d3cc5e9076c1e899 SHA512 941c621035719e42402c59d7baa602b3147caf7564a4771e4e301c70e04534f72c21f13eb0e15f4382f5eae1aa149ba09e3223c6292588facce43d6cf4af91c8
-DIST pyxDamerauLevenshtein-1.6.2.tar.gz 55354 BLAKE2B 6a7e754fb1290be0f47b1593c6e5606985a64a4d1e2a00d3065daa0e2dd826de53eaf6d6718b32ac0286f6516a8b6f8e431a3773a60a618906197a921363c4b2 SHA512 7bada4cf879c1115114667ae2531634995ade5f1696f55482c1ea99235a6041831f9ff43b3b0ee0d464b46e94283645764e90b4270953000adee937ac656fb36
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
-EBUILD pyxDamerauLevenshtein-1.6.1.ebuild 574 BLAKE2B b18ce0dc6d8e0f928773b179da1f992db72365777f6fd010972d4c97723bb40cba8eb8c9fa2e78572fd1e4fc29d2d84db359a49ba3317770fde5dd1b2f89cbae SHA512 2cb66ccb0e9823c44b506f8b85e09b7eb261573c4012f124582be11d53a9e58cb55a946967f8b0cd677b72e21182f1a7220648589e0efa80e57e1e4ea36eebe2
-EBUILD pyxDamerauLevenshtein-1.6.2.ebuild 582 BLAKE2B 0384d2b53944be69d961f7777bcf5c63a4aeaecff7edcdce451f0bee01139429f4ce53e617e4200dc61f767e111f40b91a2c6080ba17379635f32f579eeb311e SHA512 556210c071182805c7cd467efb239791d9b99435a144641c3b051780fcf513fa183cf840298e566ffcb678857358f26d33bd9ea8f83cbf191c432b6a145298f0
 EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 537 BLAKE2B 0a27b4edbc50e4f3c26265c7ecfbaf2c93f97f52c1148ae3ccd9fd862c64046002d26f130e64fc5370c160eeb7ecba818ff14f0f656c80550566229a943813a6 SHA512 7fb9e45deeefb58540d3e4032c549fe6822d4a4b76b41086e3b61872c60e44b0329eaebda6f2f109778d68c9fe14bd6319cd56526c0c439fe68c5c81183f5bd8
-MISC metadata.xml 531 BLAKE2B 4044b64b10b37ed21f58429fa25b989c95ec5be790fdf337bb9879066895b1399ec3dd1e4a13fd1b40abd1d428542211902f9227fcac9893dc162e67c8ba4733 SHA512 a86baaee1c17a28c918de4f8901c662723a82eeeb55d118d0c518506bdeeb36dfa7a7cfa4562d0b81d14c3ad723dd225da18316e9a8edfbd973fbd4f084f1d7f
+MISC metadata.xml 561 BLAKE2B a1ddcac9ddbbdfbe6112a1f2dc1ab08743ddeff2be63ef9ab916cb6453378cfd4f1da6ba8981c2313296772d9510ba5f34473c6e204a8f42fde19eee558d95aa SHA512 00f898bbff420f09a7019a09ae0905ee7267cb6bdf834eac4fdca948c5cac90bb29ca7d56cd0cdd9b0e8a23065b1830828a4c3a4f3d4b96022bbbd99f3a7a4d3
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 29698d463b01..8e37617bffe0 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
deleted file mode 100644
index 39baaccb24de..000000000000
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
-HOMEPAGE="https://github.com/gfairchild/pyxDamerauLevenshtein"
-SRC_URI="https://github.com/gfairchild/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild
deleted file mode 100644
index 109b69ff47d6..000000000000
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
-HOMEPAGE="https://github.com/gfairchild/pyxDamerauLevenshtein"
-SRC_URI="https://github.com/gfairchild/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 5125a624b1dd..69340262c683 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
 EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B b22052ffed55f621e0485e5408ac225a30aa8512c7067c7fe7ecd51aa370f7c2aa9a3f791d6af99b3f3e3ce0d595d618ef8d3c28488cdf55c48dbcc384b3cc6e SHA512 310b02d55f42ae6c7df703636ef6eb02a874958515d5e5c341db8f9cc4f8d777b179b4e2ddaa21761938e7a6e8920ebe1075ab637188a8cb4fe18aae5ac81f70
-MISC metadata.xml 448 BLAKE2B 0f7c5cbe3725c350d815b4e1e2e621a491c5c07b8a135c501d342313dae728a01e3c871edcb404099a3b85906392e33dcefeb4a217350fa5b8e6d2221e2daf71 SHA512 9795f59bc1899b5ecadcc121d54b5cc1a2576ab0a4bbf867fd6b4a131a1222eec7d0fd2745f7774a0acc9c39200ae69bdaf51412cbc4ef8aab0e91fe92b2dfd3
+MISC metadata.xml 478 BLAKE2B 6c9c92b5b0b68ff780f40962bbeb1fb21953281e729f3c5f875f2d9bf5ae04923198bf6f88dbdb62865679b844f66e405ab0627675f4e4706e655be45b62d4ec SHA512 465fdbc57c68aa1aa6840b7104a96105fa28ac122d067776c5bea98d4a94af55df92bde6310b2d8767a92ed066d49e7ce34c541c8813aa2c84f77fae48cc7e62
diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
index 80481fb1e9bc..3bac6413413d 100644
--- a/dev-python/qdarkstyle/metadata.xml
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index de4a1c1163bd..2f5e40e32811 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,3 @@
 DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
 EBUILD qtawesome-1.0.2.ebuild 775 BLAKE2B 3b79ad78a8b90f48784cc2f12c736bc6ec56cb9700a2e135c7253d756acbd50758ba2bd197aef7e46dd4a7c43436126fa5c28caff1c56a85ac4c6277646fcb64 SHA512 4f006e817a9aeaddabcd6fad05309a6797f34d9f7aa912cc8b90e97fe64063fd8d8e8e5e04ed01b55052f6d7822de0efa3476afd90cf10f24a3ac0c95172a7d1
-MISC metadata.xml 932 BLAKE2B 348589aaf4ce3cc6a9df0f5dcb54a85a7493d0c0f7f2d88cde63345a92a149ac762a303f7d3b8f8820fd795276a1c94039c5c6da6aa38e57464fd19a12bb8663 SHA512 8fed0b82049cce4946b0e92e051ca928f34e9dbb8f0fcc81733d598d8b35e50b2abc17f6bc6cbd1c376fdb32544c6fbbc6eef7c695db5ca44498795fdab16549
+MISC metadata.xml 962 BLAKE2B 8a2a6d829c78de627696aa04712597a37cc551b86706de2a79da1ee8d9d1985c2c199cc77257170d74b1000185539f8a10d85ac59df0e46e61ae896fbcd91725 SHA512 245d6b4e1b77ad09bd00ccdbac262d5653cb909f57a4e327fee73201666ff426d1d1ecfc770661e6501fc5e8fde841367c4f49a3527e09a5fa519c3b85d97afb
diff --git a/dev-python/qtawesome/metadata.xml b/dev-python/qtawesome/metadata.xml
index e1f4c1c28cf0..ab6d7816c152 100644
--- a/dev-python/qtawesome/metadata.xml
+++ b/dev-python/qtawesome/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -9,11 +9,11 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index d17a41355567..f249800bea38 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,5 @@
 DIST qtconsole-5.0.2.tar.gz 428499 BLAKE2B 42d71e1a1909f8e07705fd5e7e64194d865b70cc67377ba631bb75fb8678faea4d8dddce90a2e84c0898fa074a88b655290bcf9ee1f9aebb39f91d2370908dbf SHA512 b74711c0444b74efc2fc31c631e6a87cfc05045d8ae9eb8253a9fcd1c82a1ecb688cbe50dc2f3dd4dc5d47c6e2b4fa027ac22e77b7ac37e1ed3fa0a9d2b677bb
+DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
 EBUILD qtconsole-5.0.2.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
+EBUILD qtconsole-5.0.3.ebuild 1273 BLAKE2B a3e2959edcfa6efaa7774a8c9099efff7a9a28ec9c581a65bbaab87427906922a5f14fe89a9f2bb16f13954e93924a9d3eae5528f865cd8879bc31365bed6df4 SHA512 9b5da629c938ba2c67a0c7399bc8c4d31504c17eff0dc6704137c4ff0685144569731230e63e5509dcb33b5554bbdad794481a76f4ca0eb7feee82ad712060c5
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.0.3.ebuild b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
new file mode 100644
index 000000000000..9fea2d480c04
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 67aef47614a5..381bfcec9a18 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 EBUILD qtsass-0.3.0.ebuild 649 BLAKE2B b1242d761094f744e68966021e49d28de51506d75f8d715e4d2e7cb2cfa0ab6e5ecd1da745df69acf2984e932c45b308e2793adc260dca92cf02b61fc5133cd5 SHA512 9bd5830b61fedad4bbdf140291cbb487000040aef9fb873003189f801d7fa983a1e7c325e7708aba695412e20689332ec5c193daa10081eaaede0caff9f501f4
-MISC metadata.xml 444 BLAKE2B 1415afd2bb97b293ef5a5c70eed089bc1a1d3d875b1bd21dcf8b9a18095dbaeaa4b5067522e6c506e4292585658f1561dfd35ad4f2c8c95a395497f45c896402 SHA512 855f3ad20cb365e14240a9ff7a267a9e7694d1b1d87611d58bcb0b5332f1751c0295708e54848b2f27159d81c65a316207027040243dc59108e5b3b74f8c833a
+MISC metadata.xml 474 BLAKE2B e8249a4fa6e7460d35ba5db5c76a81917e54a028520b03d8902a1a109dbff8dab8c31969c78edb8db4af1604565469de1bf2c3f6eb8901c9d4dcdb6902392b00 SHA512 b5a3f8293a02f9b1a22d51f843cae65d5529673f5e80c69640091609ce6bdd19751b73fb0e4edef6c6c2e5ca19ecd54383f31c14f57c6c018ba5ed679986c6e5
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index a83bd6e4536b..f4b2c5f82c3d 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index f3c4a52a0093..0c23e50d9a7b 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,3 @@
 DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
 EBUILD quantities-0.12.4.ebuild 813 BLAKE2B 9a1ef0ea6fe3046a53e3b171ecfdff6801807f8936e02544a4b5665bf3c4da95f0c7877c0e9338b4cfe3a280769960f3034484ce359a8a7a8dd062926bcc16cc SHA512 aab5589780bccf696e77ccd4a9360c76a6ef5d1adf20938ed878b13b7ef78483fd163468be840a5f02a041cb29719b15151b7da950cbcb4b14fb65f489374813
-MISC metadata.xml 515 BLAKE2B 6745bb76b63c90cb4c7de8c1b103e9cb5b0fbb9a3b0f5635f02e37f05d48236f9f203d8b6cb540921254226dc251111c9f1e90713fa6f8441db0ccb568ffeefa SHA512 9cfdf5931dec119f380401ae62a1226243a41cae42cd4002e80a324eac3ab50772fd31b4a54c3025d53d8b6aec2e64d0fb0703b71a98f03a413e39042083e96e
+MISC metadata.xml 544 BLAKE2B dab969c411e379d68269b491b7a0d132c3512d7bd7510e1ca58b2c1be128515df401a2b61533ab4e188edbb1385ff6108dd0387cfcbc5cb351eb9dedb56e5ac7 SHA512 21475f5b2b97ff228bb0e8cc6b86ffcbf422fc8e20c267eb40af57bc735a3ece6e9ecc4ccb9ed4a8533c2a18d21b300197382bf9be297584daa4f81329f64d5c
diff --git a/dev-python/quantities/metadata.xml b/dev-python/quantities/metadata.xml
index 7ffdf7f0ad4e..8065a3f7e296 100644
--- a/dev-python/quantities/metadata.xml
+++ b/dev-python/quantities/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index b23dbb0119ca..20e2dbed0774 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
 EBUILD ratelimit-1.4.1.ebuild 515 BLAKE2B 7073794194696d691e50036afdfa5edee465cadac00ca2b159e6d624b5a907208e5ef479d43ec1943e1575bccecff76bdaa9317c74f53603490e206849b732d5 SHA512 df9131a1012d99335fb877a5146a0188b6293f1e6b1a5658071fc4c211c1f45feb74d5e504cd21697a91b7b732e36484f3d170287a3d70471e79abe16dacedc2
-MISC metadata.xml 765 BLAKE2B 68d98d775076ad4ee6ab837c291a7acfd0263e78c85ed9391f546663f0b831baafc35d863b3acb512e197ccd8bd026e7bc64eeae3d8f8454112cb75b3cdae9e6 SHA512 d2e8549bd6d6b20cbac9e6023f3088c50ad386a57d7d06a52b154bacd62b84850f3ae16718b92e02f5f2b48f856d55c60727cc0648392aab3bda4ca0396a1680
+MISC metadata.xml 795 BLAKE2B 7f7f299b3996eafc699e0ff404d42978ebd8dda4aba085c3cb965d4b138873e2288e3632f92c4e94a3f689853f7dc92d419b9cd03eeac6c9044d0a881164f5dd SHA512 88cbe1d6d7e4602f762e9eeaa50d4fe626ed84a14f0b60b0512e7e974310fdc32c52aa184b290b1e9a7c9a1d01eef96ba87096c87698ffaafffa24a4e7c9f748
diff --git a/dev-python/ratelimit/metadata.xml b/dev-python/ratelimit/metadata.xml
index 20a240f44f6f..d191e88e1329 100644
--- a/dev-python/ratelimit/metadata.xml
+++ b/dev-python/ratelimit/metadata.xml
@@ -6,11 +6,11 @@
 		called more than once within a given time period. It prevents API providers
 		from banning your applications by conforming to set rate limits.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 97723e1ec82a..bf902e6130fb 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,5 @@
 DIST readthedocs-sphinx-ext-2.1.3.tar.gz 12261 BLAKE2B 3121b75c2a157a61727f4bc5b15b7a5d0aa23a177593fd7208d558de4ea9d89c48c788a843af833ab9dc79b05baa32231086ca6e4ea4c69ba793fb5001becb12 SHA512 f9b03de7a5ef8e6707960cb05b1be8115a55292820fe3fd43efc6d7843b9e55c8c537a53653967e1879ff27c5856ca66f145fc6e8f98891fc1f2682e425e2faf
+DIST readthedocs-sphinx-ext-2.1.4.tar.gz 11218 BLAKE2B 9851da181b9d181715436dfb350bcaa2f8f6c5dbf56941d2f26457976cd5f5f1e32752b0fa39c65a7ca4f4f304e0e83bb9cd34dcc25a039e6f970d7ca6410a38 SHA512 dc3e70f55634e6769a0cd8778644389838884da7f175464e56c7766a1cef257bf6d4bd317a4dd4442fb46fc21714f5697991d1b2a764e40857eefae340b15278
 EBUILD readthedocs-sphinx-ext-2.1.3.ebuild 759 BLAKE2B 42f961030ed3c1f4fcae1b95d7cc190a943bffd62af5b4b89a27ec11f3b8a375c0a9e752325763221d6955b24e99ed12b463fecd3e5859ce20945a26d21d96b9 SHA512 c24b914c987ec5ccd8d021200afa66d4d45e5a464f4f69a83076b9a0a57942d6fcb82a210e4d413aff0fe1dd0f9ba00b4a9d95dbadbcfe5f9fdd4e8153bdeaa9
+EBUILD readthedocs-sphinx-ext-2.1.4.ebuild 767 BLAKE2B c6cd2200bb1863474f3fce40e7cd5515cce15c192574ea54e7b2272977b3a316e3528e754eacc6f918426630d89cc746d42ce8f5a18962e2f51df9e15e009c3f SHA512 d4d99ac6245126e2e014db03a4647321588c41655bc1e6fcdce39154558439b24cb866d863d9446b8abc954a98415a14acd42a4beb2117fbded207b07e1f455e
 MISC metadata.xml 349 BLAKE2B d74b06bcf26cb258eb33f7b445a1486eb04880987c3227e891fe3fdbd39c2108dbe4a89b37e76a57c3d204d0388081306cbefcaa5a904de2c718b33f3832f0dc SHA512 ad5563a21425a463bb85e37b2f0d4ce12703999d89ba943f8bc879526b83b58462c8dfb1c5224862216b0f959ee0e44fbf99e940eea6159674a27071a669c99e
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
new file mode 100644
index 000000000000..68b9817de11a
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 7a151aeb3db7..f386022bfa17 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,7 +1,5 @@
 AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
 AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
-DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
-EBUILD recommonmark-0.6.0-r1.ebuild 788 BLAKE2B 7eecb95b3802d0afbb47fc612fd6b7e7f5bedd5c4da7dd0b6ddccdb9d3f2ddebdbfa7228c9970205e103a4acec0035344f3007b34a056e4055bad7ba8dfddc85 SHA512 478d1740184172f09b6b3bc6d0e5985f9e2a4476a6dc80c455f9781390aef5b537bf588c04f725a4e807a9a90dab16d822a922dd57a94b82f236a64746d408ee
-EBUILD recommonmark-0.7.1.ebuild 795 BLAKE2B 314cd527d89f3e613ad147ff2a80e0315723253edfb95530a55c1fec704f2388350de0c706126fbc9b3095e79803456d76488f69e0adeb1bf4deb34e8e0c2587 SHA512 3a5c2262ae4a89356abc7a3d3480a0ca3e455e0a826071aedffaaaa13ad4076d7a3920ce5f9d244a67f4d949d8dc75f1ab02f6b924b5284318e8253368422862
+EBUILD recommonmark-0.7.1.ebuild 788 BLAKE2B 7eecb95b3802d0afbb47fc612fd6b7e7f5bedd5c4da7dd0b6ddccdb9d3f2ddebdbfa7228c9970205e103a4acec0035344f3007b34a056e4055bad7ba8dfddc85 SHA512 478d1740184172f09b6b3bc6d0e5985f9e2a4476a6dc80c455f9781390aef5b537bf588c04f725a4e807a9a90dab16d822a922dd57a94b82f236a64746d408ee
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild
deleted file mode 100644
index 87668d90b2ec..000000000000
--- a/dev-python/recommonmark/recommonmark-0.6.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
index e9b2fe6b79ce..87668d90b2ec 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index aa18cbc13f9d..4c0847c4c3ef 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,3 +1,3 @@
 DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
 EBUILD reedsolomon-1.5.4.ebuild 735 BLAKE2B 9b7d02ff45b23fe1d17c01f3121e5a4261064053d6c833aa27adaa711414b89e28cfb55554bfc799a4e2e4d5e4b551824e326a7b79ba9d692efd4e2a335fe96e SHA512 5fe2437acd179a366049de32d5a89f0e83e28a2c18a6b6af257fdbe0f0c9045252c6ff58cdf2517ec403d27dbc5a0407f709b1e13e69bf412275d85ef5b37a26
-MISC metadata.xml 501 BLAKE2B fb51af37fc1436893f06069bfe83fb21c641ee2d06305e84ef7d0ad63d0111b5afaf5e8048fa78a85e3f74e00dddf358f6be4d0f7a5d85f57f24eb936107198e SHA512 c265d0178999601864ebe8b70e79912661169eef09412bcb187ff9e2446ec9893fd618bd96d49458ccc598a1221bbe46a055ee48ef24363bb91b9b9eb1451729
+MISC metadata.xml 531 BLAKE2B 623cc06ce0149ffef2a717db569d1d99fcc31234931910f8fd23b9c040578b35b33f359e1d4eca137963fe8024928862ce61c7603063145252dc7391a0fe5678 SHA512 b68fc9745c26deac4c360ba8f3829becb3fc3ed5f1035ad11cfad38ae581a5d85ccddb798f595d22571228cb524ab309e9247c7fecf09ea8b8aaf25b98c8a049
diff --git a/dev-python/reedsolomon/metadata.xml b/dev-python/reedsolomon/metadata.xml
index 3c10820d5616..fc16b4c4df89 100644
--- a/dev-python/reedsolomon/metadata.xml
+++ b/dev-python/reedsolomon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index c86761186d90..d3567c9cf1c7 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,4 +1,5 @@
-AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
 DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
-EBUILD regex-2020.4.4-r1.ebuild 896 BLAKE2B fe084a1cda19b8e89f043a77f946acceb06bb0373973a5fb8b02445d0b5c2789b81e2025b58f1190a816f574c0a86197f273b2a17a0b09b0b3c8ec1b0ba025c7 SHA512 133fd4da4e67a997a47a2ea8f918639382569ed5d7ce7b1a02830ea7fddd28ac72b6365132aa8580c2637bd8f1ea86da856d2953ab209aab12fd04725fe1bd11
+DIST regex-2021.3.17.tar.gz 694380 BLAKE2B 9388038519cc4c11a332dd1fc9b4f742af3f69453890e148971105bb4a5e73f562f7eaa4e2533548066e87aade2f64b507a6e65cd4b0070a26733fa2675190ea SHA512 3eb5e307e5e3656ea88de9f762522412192c687d0f0a4175dd1c605c9142386b98035b177f73c8c0daf10e629e9a3a3cf8851a25cbe6f10a018ba252cb348b1b
+EBUILD regex-2020.4.4-r1.ebuild 835 BLAKE2B d3fbf85b42a50969b970a451ab638571f739a7382c6882f795aa8c95b96fe6824c9d7bb64822427bdacadb7cce5552f3ca0991b6c3958678ab048498d174bfb6 SHA512 4c50797036036552cf01a712a90b410f7ffe523e46dc0f61230a205df9f8e86b191aa831cd59ee6948560d04f7678fdbd67f85003cf904371e06d74e0f536367
+EBUILD regex-2021.3.17.ebuild 812 BLAKE2B 52e76a296d5e299194b7f45557f1866135c56ca475eb56594eab5af17160d4a64ded5dc9148525642593711cafb37dc13482807827f02e79c888073d315ac834 SHA512 a8847f4ead0b698cf140bf674c9a8263bcd5a8c0a2a6df5b059c73c6890e4175aa56028b7350d35b9686fc70ad83e1a2be1843e5bf7d1484dc8a0c8a10379ec7
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/files/regex-2019.11.1-pypy.patch b/dev-python/regex/files/regex-2019.11.1-pypy.patch
deleted file mode 100644
index f4bfade16eb9..000000000000
--- a/dev-python/regex/files/regex-2019.11.1-pypy.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -ur regex-2019.11.1.orig/regex_2/_regex.c regex-2019.11.1/regex_2/_regex.c
---- regex-2019.11.1.orig/regex_2/_regex.c	2019-11-23 12:25:18.247350004 -0800
-+++ regex-2019.11.1/regex_2/_regex.c	2019-11-23 14:04:38.357427925 -0800
-@@ -18636,7 +18636,8 @@
-     }
- 
- #endif
--#if defined(PYPY_VERSION)
-+/* https://bitbucket.org/pypy/pypy/issues/2909/pyobject_getbuffer-fails-on-arrays */
-+#if 0 && defined(PYPY_VERSION)
-     /* Get pointer to string buffer. */
-     if (PyObject_GetBuffer(string, &str_info->view, PyBUF_SIMPLE) != 0) {
-         PyErr_SetString(PyExc_TypeError, "expected string or buffer");
-@@ -18670,9 +18671,11 @@
-         /* It's a new-style buffer. */
-         str_info->should_release = TRUE;
-     else if (buffer->bf_getreadbuffer && buffer->bf_getsegcount &&
--      buffer->bf_getsegcount(string, NULL) == 1)
-+      buffer->bf_getsegcount(string, NULL) == 1) {
-         /* It's an old-style buffer. */
-+        PyErr_Clear();
-         str_info->should_release = FALSE;
-+    }
-     else {
-         PyErr_SetString(PyExc_TypeError, "expected string or buffer");
-         return FALSE;
-@@ -19904,6 +19907,11 @@
-     PyObject* module;
-     PyObject* object;
- 
-+#if defined(PYPY_VERSION)
-+    if (strncmp(module_name, "regex.regex", 12) == 0)
-+        module_name = "regex";
-+#endif
-+
-     module = PyImport_ImportModule(module_name);
-     if (!module)
-         return NULL;
-diff -ur regex-2019.11.1.orig/regex_2/test_regex.py regex-2019.11.1/regex_2/test_regex.py
---- regex-2019.11.1.orig/regex_2/test_regex.py	2019-11-23 12:25:18.249349992 -0800
-+++ regex-2019.11.1/regex_2/test_regex.py	2019-11-23 14:08:49.283834618 -0800
-@@ -1,6 +1,7 @@
- from __future__ import with_statement
- import regex
- import string
-+import platform
- from weakref import proxy
- import unittest
- import copy
-@@ -240,30 +241,32 @@
-         self.assertEqual(regex.sub('x', r'\400', 'x'), "\x00")
-         self.assertEqual(regex.sub('x', r'\777', 'x'), "\xFF")
- 
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\1', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\8', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\9', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\11', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\18', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\1a', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\90', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\99', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\118', 'x')) # r'\11' + '8'
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\11a', 'x'))
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\181', 'x')) # r'\18' + '1'
--        self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
--          regex.sub('x', r'\800', 'x')) # r'\80' + '0'
-+        # no idea what is broken here...
-+        if 'pypy' not in platform.python_implementation().lower():
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\1', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\8', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\9', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\11', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\18', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\1a', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\90', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\99', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\118', 'x')) # r'\11' + '8'
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\11a', 'x'))
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\181', 'x')) # r'\18' + '1'
-+            self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-+            regex.sub('x', r'\800', 'x')) # r'\80' + '0'
- 
-         # In Python 2.3 (etc), these loop endlessly in sre_parser.py.
-         self.assertEqual(regex.sub('(((((((((((x)))))))))))', r'\11', 'x'),
-diff -ur regex-2019.11.1.orig/regex_3/test_regex.py regex-2019.11.1/regex_3/test_regex.py
---- regex-2019.11.1.orig/regex_3/test_regex.py	2019-11-23 12:25:18.253349967 -0800
-+++ regex-2019.11.1/regex_3/test_regex.py	2019-11-23 14:19:32.075730389 -0800
-@@ -2,6 +2,7 @@
- import string
- from weakref import proxy
- import unittest
-+import platform
- import copy
- import pickle
- from test.support import run_unittest
-@@ -562,6 +563,7 @@
-         self.assertEqual(regex.match(r"(a)(?!\s\1)", "a b")[1], 'a')
-         self.assertEqual(regex.match(r"(a)(?!\s(abc|a))", "a b")[1], 'a')
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_ignore_case(self):
-         self.assertEqual(regex.match("abc", "ABC", regex.I)[0], 'ABC')
-         self.assertEqual(regex.match(b"abc", b"ABC", regex.I)[0], b'ABC')
-@@ -588,6 +590,7 @@
-         self.assertEqual(bool(regex.match(r"(?i)n\xE3o", "N\xC3O")), True)
-         self.assertEqual(bool(regex.match(r"(?i)s", "\u017F")), True)
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_case_folding(self):
-         self.assertEqual(regex.search(r"(?fi)ss", "SS").span(), (0, 2))
-         self.assertEqual(regex.search(r"(?fi)SS", "ss").span(), (0, 2))
-@@ -687,6 +690,7 @@
-         self.assertEqual(regex.search(r"\s(b)", " b")[1], 'b')
-         self.assertEqual(regex.search(r"a\s", "a ")[0], 'a ')
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_re_escape(self):
-         p = ""
-         self.assertEqual(regex.escape(p), p)
-@@ -729,6 +733,7 @@
-             self.assertEqual(repr(type(regex.compile('^pattern$', flag))),
-               self.PATTERN_CLASS)
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_sre_character_literals(self):
-         for i in [0, 8, 16, 32, 64, 127, 128, 255]:
-             self.assertEqual(bool(regex.match(r"\%03o" % i, chr(i))), True)
-@@ -745,6 +750,7 @@
-         self.assertRaisesRegex(regex.error, self.INVALID_GROUP_REF, lambda:
-           regex.match(r"\911", ""))
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_sre_character_class_literals(self):
-         for i in [0, 8, 16, 32, 64, 127, 128, 255]:
-             self.assertEqual(bool(regex.match(r"[\%03o]" % i, chr(i))), True)
-@@ -887,6 +893,7 @@
-         self.assertEqual(next(it).span(), (4, 4))
-         self.assertRaises(StopIteration, lambda: next(it))
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_empty_array(self):
-         # SF buf 1647541.
-         import array
-@@ -969,6 +976,7 @@
-         self.assertRaisesRegex(ValueError, self.MIXED_FLAGS, lambda:
-           regex.compile(r'(?au)\w'))
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_ascii_and_unicode_flag(self):
-         # String patterns.
-         for flags in (0, regex.UNICODE):
-@@ -1013,6 +1021,7 @@
-         if not (m0 and m1 and m0[:] == m1[:]):
-             self.fail("Failed")
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_properties(self):
-         self.assertEqual(regex.match(b'(?ai)\xC0', b'\xE0'), None)
-         self.assertEqual(regex.match(br'(?ai)\xC0', b'\xE0'), None)
-@@ -1672,6 +1681,7 @@
-         self.assertEqual(regex.match(r"(?|(?<a>a)(?<b>b)|(c)(?<a>d))(e)",
-           "cde").capturesdict(), {"a": ["c", "d"], "b": []})
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_set(self):
-         self.assertEqual(regex.match(r"[a]", "a").span(), (0, 1))
-         self.assertEqual(regex.match(r"(?i)[a]", "A").span(), (0, 1))
-@@ -1749,6 +1759,7 @@
-         self.assertEqual(regex.findall(r"(?V1)[\w--a]","abc"), ["b", "c"])
-         self.assertEqual(regex.findall(r"(?iV1)[\w--a]","abc"), ["b", "c"])
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_various(self):
-         tests = [
-             # Test ?P< and ?P= extensions.
-@@ -2578,6 +2589,7 @@
-                         self.fail("{} not matching {}".format(ascii(ch1),
-                           ascii(ch2)))
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_named_lists(self):
-         options = ["one", "two", "three"]
-         self.assertEqual(regex.match(r"333\L<bar>444", "333one444",
-@@ -2975,6 +2987,7 @@
-         self.assertEqual(bool(regex.fullmatch(r"(?r)abc", "xabcy", pos=1,
-           endpos=4)), True)
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_issue_18468(self):
-         # Applies only after Python 3.4 for compatibility with re.
-         if (sys.version_info.major, sys.version_info.minor) < (3, 4):
-@@ -4199,6 +4212,7 @@
-           'x right').capturesdict(), {'mydef': ['right'], 'wrong': [], 'right':
-           ['right']})
- 
-+    @unittest.skipIf('pypy' in platform.python_implementation().lower(), "broken on pypy")
-     def test_fuzzy_ext(self):
-         self.assertEquals(bool(regex.fullmatch(r'(?r)(?:a){e<=1:[a-z]}', 'e')),
-           True)
diff --git a/dev-python/regex/regex-2020.4.4-r1.ebuild b/dev-python/regex/regex-2020.4.4-r1.ebuild
index ab7ea301540f..f3243ad82643 100644
--- a/dev-python/regex/regex-2020.4.4-r1.ebuild
+++ b/dev-python/regex/regex-2020.4.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..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -16,10 +16,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
-PATCHES=(
-	"${FILESDIR}/regex-2019.11.1-pypy.patch"
-)
-
 python_test() {
 	distutils_install_for_testing
 
diff --git a/dev-python/regex/regex-2021.3.17.ebuild b/dev-python/regex/regex-2021.3.17.ebuild
new file mode 100644
index 000000000000..613b0c430603
--- /dev/null
+++ b/dev-python/regex/regex-2021.3.17.ebuild
@@ -0,0 +1,30 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 228de3e9ac5d..bf9b2768a237 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,5 @@
 DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65
+DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
 EBUILD reno-3.2.0-r1.ebuild 1100 BLAKE2B 2e2123dfa3f760d88220006dc9bcbf915999c69473a1c2113f18b038ca4025b33cbaa31ab06a879d55ab7bcc5c2e80eb911c5b5cf8aa395bf5e3ee3db08cfc60 SHA512 5501d3ca55123aeeb1eb161e6542c6aadf9c3bb85b2e1802316e97c4ef5230d2887c31d58f47b56c7913df23f44e9809d5e37b24178695e5b617ff36317a8777
+EBUILD reno-3.3.0.ebuild 1103 BLAKE2B 231bde082a0b1179e350b769a84d0dc0796c826b087aae42bf53b3d28a1e59e2051a00f8e60e64a13e67ae0600bdca9becc3c7adcf00bdce1be8bc25e70f127c SHA512 d3f9df7acc97f0fbdce0a97f14532a4620c6fdb7942a08ea6de76a7427026434abc8816c0c8b912822031468d1098aa02385bdd0110707a9d8689d5207c9ba3b
 MISC metadata.xml 345 BLAKE2B 64bb3d1c4711fd517770e90167d9edcab33908e0f9ba511b8ae1c0e1ad6181bd4c4d2639d6cf802aeeef8cc77e623d749a3522e73e53514ecf39b30b77f8072b SHA512 127fc0515eae674566848c406e6695ca20d7db100d1378713d8900f25b2ec957eb89eb7f075aafc3efb48b3db7b290e88480248c78bf94456f680c528c7e6269
diff --git a/dev-python/reno/reno-3.3.0.ebuild b/dev-python/reno/reno-3.3.0.ebuild
new file mode 100644
index 000000000000..0dfe678e41c6
--- /dev/null
+++ b/dev-python/reno/reno-3.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 29abb4b8cfbe..7d48adb3f09e 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -4,8 +4,10 @@ DIST reportlab-3.5.60.tar.gz 2905122 BLAKE2B 8863e910dac03d5fd1d53880bb9fe83d218
 DIST reportlab-3.5.63.tar.gz 2908785 BLAKE2B 0af6f72063e4a1f4464bf8d847575e23b5d96ced3bdbafa518e56503194e98aed5e07c17fbf6cf07d3d95ef91b3d0d450233024b40368889dc1ef5d8792050fe SHA512 39c940a585695752095b868fa631396193083d9d270512e0e89e766e02d749745b6d0438f2d9f5ec2ea58c7da6aa538a0315fbd7483571ebc2c460035e12a1bf
 DIST reportlab-3.5.64.tar.gz 2909252 BLAKE2B 5922ec3083238c2884d7ebede5593a15fa537a8bd72f5cf9b6a84bf1673fe43be2df9f2125f033400c766fdf78a07f4c919b331bbd2215acb950dbbcb971bced SHA512 ac4eb9a7c337ebdde81dcfa9e6b9609aec7fca8451d383c28b9d58e0ea73bd71c328fb2362ba5805b96e10c95dc166d5806eb763c5c325a6d72a9474dce3c422
 DIST reportlab-3.5.65.tar.gz 2909468 BLAKE2B cec88aa00299d329a44379798824a8694f7547a9bb35685b202873387d0b40cdb2bfc864257ee2749c8cc24ed1d26e1ef22c1059fe2e27df38cedae71d55ceda SHA512 a143ff277ab4e9bf667d8334aca9d5b0c959b64eebbd5eda8d6fed95b09cd28544a33bbe5f630753f167b54e63a1a5e04f841c8892712e93d2f8739e9651269a
+DIST reportlab-3.5.66.tar.gz 2911372 BLAKE2B 58bc718157066a82eece18141e08547b8360dd653d2365fdbe1708fee2f1f8dffeced60500b4e866c31947fae00b78ab9853983563fb89e5b34827173c71a534 SHA512 81fac9fd751a451bd5bf6c91efcf9e250ec1c028587c9ed76129d7fd20c4efa17ea0ae45f08dd43a33adf6f4a2c5338a557e869b85d0b6405626720b0e9221a8
 EBUILD reportlab-3.5.60.ebuild 1427 BLAKE2B e28248a50f14aa4b7c110fc965fbe3a2b723369f0ab9ceaf1afaf32b216ce224557cb3d08eef46ab510a96371840df2b4a162d881dbae65652a465a3166e7034 SHA512 9b5203054f7b4f52a4440ea2f6500928c9be0ba8dfdd3f392512d7d7caa3be2bb23f28e25d2fb9ea01e3af984990af454b15e398965c9d7da13ffd8aca59c907
 EBUILD reportlab-3.5.63.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
 EBUILD reportlab-3.5.64.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
 EBUILD reportlab-3.5.65.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
+EBUILD reportlab-3.5.66.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
new file mode 100644
index 000000000000..71dd8dad099d
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.66.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=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 853089c7d7e6..49525c5d6836 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -4,4 +4,4 @@ AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c48
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
 EBUILD requests-toolbelt-0.9.1.ebuild 1179 BLAKE2B cfc42193cecd8ed5ab18b97b6ea8746d587650701876a1147400d43d5330dd56c69ea136929f4fc12e061ebdf6c8166b2aa0395931507a645a67936065c33ed9 SHA512 9b572ca80e2d6bdcc37243d3b480a98ec31275fd463c9df600d4c80c93ae135f9dc813f0059ad09dea0ff35cccfbae26eadea26b0f1c83a7790f729152a3fb7b
-MISC metadata.xml 422 BLAKE2B ee5e05cef3889e6bfc8e252aaf7bf6752ad4d094438684ae545ab5e20d119f64e0eb7c26de9f7cd5ac8c649b50963c8ee2002d22eb8dd86527ec94b93870422e SHA512 aef79a2dffbcf613f549e48b8d47ae013e5880e5f507b3677d37997c167ad01d8d6bf2671b04209ba2a7179765a883490e8ec1168e7e01a0dcf4f4695663058e
+MISC metadata.xml 422 BLAKE2B 534e8a61bde6a16b268927910d9621c524477410a0dd30bc28928cf80296383845f594da0cddb896d83b1dd0e3c20d4bfa768054e19281b50b98c837e59bb69b SHA512 952ddfb8afd26d322f64fcfb561a8cb724cb0240c7ccd83a6b102025b04d56711f3283f03a49c3de820e13b4220eee6f3a72d629ff2d0122b347b417b4446769
diff --git a/dev-python/requests-toolbelt/metadata.xml b/dev-python/requests-toolbelt/metadata.xml
index 5965c53ff5d0..41679f961b8c 100644
--- a/dev-python/requests-toolbelt/metadata.xml
+++ b/dev-python/requests-toolbelt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index fe9c62638f64..a4286bc432fe 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,3 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
 EBUILD requests_download-0.1.2.ebuild 810 BLAKE2B f4c278f6e01b3e7050c8d9f6cc7521d18a7116e8c016e037075d06c46bbab5bd8258495a5f85dbc68ee0aac1079ff6e05668e816fe0765dce2e08081830a21ed SHA512 90a7cb7f9d4562c4d8060f416d69ca69705f564020b6e7df58409e52041513024cd21624057c437e381c83f8d65e15d3b095c8f4e1ec3351a4b323c34527e3a3
-MISC metadata.xml 433 BLAKE2B 41e0f8a24f94d5c494977f9236ba7b092ace4c2a70522d781cd345e1745db154c7adb022553c45e723c8fdfa13f728f69d47fc9427fa6532ce5c21c4615c15f6 SHA512 79669a88c885d1bb85fac0e76a1be6a602935e146c5b7ae1f1ed4a1ba826a99a76a7b71e9aa49dcf56a20dbc0a7f32cbd5de5e9e703ce798400062683dc7177b
+MISC metadata.xml 433 BLAKE2B e4aaa3e5f3675b4afb8ceb70aa2ad1fb008004f4f9c3ed6015e7c7979c8a2716e4a2a8c6ccf4dc128739276463d423f745e241db8383dc8eab2a8d7496818a81 SHA512 6cd28a07b396dd6a651761f98eaff3b20679669f48c0ce686f30682a64786402eea1e0f5bccb76351b822437176b699aba2a2d2ae0ba9fca672a1387ac5c7d93
diff --git a/dev-python/requests_download/metadata.xml b/dev-python/requests_download/metadata.xml
index 0239f8e8d29d..c8b3b5dae978 100644
--- a/dev-python/requests_download/metadata.xml
+++ b/dev-python/requests_download/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index a8d2f51c95d9..a22c9a0e730b 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
 EBUILD requestsexceptions-1.4.0.ebuild 566 BLAKE2B 435c95ae7b591197c75860bee6b94298c8b41fa88bd651717fe85aa222ba8e5df2679836400aa4c7d4fb4a22b22abcb573b3c161df0bfb7617995f4525373934 SHA512 590fe35a72a12fe39fb99b5a0ac6978db4eb99e17816b35e65fe317ad6ef97716b92390db47937d0443cf78a28b44691cafb353252ed0911a364f3247c897db0
-MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
+MISC metadata.xml 846 BLAKE2B 05ed6dab6649f4130e09d5f42d9e8fa16a3890265b536ed540a70aeea96a279246fc1118ad68bc3723e9ab8b50be3dabaa39861a3f80ec8b0a8a409206df5e08 SHA512 0cdb7c612dd10cbe0b2e75e0dfceffe934a826cbcd0b727b3e0c1249c54183be4cae6123215bd7b7965851738e3adbe7e0f9c403b3672bf3df53e943e0376f48
diff --git a/dev-python/requestsexceptions/metadata.xml b/dev-python/requestsexceptions/metadata.xml
index 26800899dbff..b196a8bd4743 100644
--- a/dev-python/requestsexceptions/metadata.xml
+++ b/dev-python/requestsexceptions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index e71274c3826e..1772e03b23bd 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,7 @@
 DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
+DIST responses-0.13.0.tar.gz 30265 BLAKE2B fdf111b143fb47cb9d175a3718dabe1d23199e02719ece741a6416d25dc8ecf5fc67243c9f8d982b758524db45145d494131aa3f3659f04ff60c147da0fd9947 SHA512 84a542a4d1faccb3d530357db6e1edcf666c82a2eb3bfd86a5478fa96878bd42f82ffdec358f68e954838f5dd7dfa4aa6acf3dad7e0d1881fb8816a422b0e755
+DIST responses-0.13.1.tar.gz 30290 BLAKE2B 823ef6e9e6d760d4516770255c96a8ccd326be8a1b864eb176497b613f9ec97bc0916e8f80e32275859f91129cd1b7a90ee9c8620721ea6ee03440bc4e7500cd SHA512 b6628c5890a9034c003fe1e7ea656474fa553c56fe29e025645f28d524368d4f4e65268ccb384fd514f620fc5f5d008937697161868efefb0760d56a9174e1d6
 EBUILD responses-0.12.1.ebuild 783 BLAKE2B ac8aca7608761d27aa87a55d8ad55c96c5e2b7abb07632af796014fcd22760262e95c48859d7fdfd704631a32ea12eb44dea8fb10c6326658d5f9febbecf3862 SHA512 c3263774ae782325f4007f723e7448b932c24a0fc0028c0ac75936f0269b306ece91aa933983be4075b5b8069578d4a9028f28f456d16d14b0b614abd5b9c750
+EBUILD responses-0.13.0.ebuild 767 BLAKE2B b6389d96abf752f95fe737992b7434efdd4d37247b119e52cdc433f911b1a88f41534f3d815dae2439fdbc21703f00eeb40800ad9c3134c91dd4234d141644cd SHA512 da6a908baca95d6bb0240b0d9f3e98b2ce72aa90553d077013d696bdb49ea26adfeb829d14f1f5263528907792ef4f41c77ff70c24935302dd1d84816dff93d5
+EBUILD responses-0.13.1.ebuild 767 BLAKE2B b6389d96abf752f95fe737992b7434efdd4d37247b119e52cdc433f911b1a88f41534f3d815dae2439fdbc21703f00eeb40800ad9c3134c91dd4234d141644cd SHA512 da6a908baca95d6bb0240b0d9f3e98b2ce72aa90553d077013d696bdb49ea26adfeb829d14f1f5263528907792ef4f41c77ff70c24935302dd1d84816dff93d5
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.13.0.ebuild b/dev-python/responses/responses-0.13.0.ebuild
new file mode 100644
index 000000000000..d3c967c158e0
--- /dev/null
+++ b/dev-python/responses/responses-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.13.1.ebuild b/dev-python/responses/responses-0.13.1.ebuild
new file mode 100644
index 000000000000..d3c967c158e0
--- /dev/null
+++ b/dev-python/responses/responses-0.13.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 4119ee0946ad..8c6372d782c6 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 920 BLAKE2B 9110de166e164bf25f64331516fde67b26938b1dee76877a9d791afda3d627d01d4dbf40131b8b088209725328a5047694a30f2f9315233a5daa6602ad252bef SHA512 7424e74c9b66470bb074bd5bdb75247b0c26dd8e02ecb11bf38bc0ff5f45801ae63fbfcad4f3e069bc2f79ae499c2027f1f61ee98cb5e9ebece42446763d9b2f
+EBUILD rfc3986-validator-0.1.1.ebuild 914 BLAKE2B e02274cb88cdb74792789eb854de347f0f9c77444bba85763334f84481de05be31bfe01c55f67c77d431fdf76ed189320756f3f49e09705e3799679fbcb8bfee SHA512 c30eb10ef0bcc8a36c016b9355bf12a0ef136198b85e0fb13b4f528d3bfb473b0da82db1f119a7ef8ad78b31234cff99269e776df968f03554912fd5cac382f3
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 572f5f4b80bc..46d467bf672a 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.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..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index b1d6e43343b7..2fa142a27a79 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 658 BLAKE2B 8ca874d8b29f75b78006b235589cdfcb146722d6d025961f7e4ed0196e5daa88015f7a4e9fbb9aa565ca772ffa0e74adf6396f5422dd621cb7940dfe1b98dfda SHA512 2a42cdc95783320f6aba60160cb19494d9ccf407212f630cad5cdf801cbe451ca09d4011564d5459756fc7b34e46a007422487891e673f156ba75607745525b5
-MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
+EBUILD rfc3987-1.3.8-r1.ebuild 652 BLAKE2B 9b0bc05eebb2a9b2bb79824b6eb3719479776a500a5b102bd3aa18690833408660f80a5895dbf993ef5db0df31d592edbba803c9556b4837bf9cf70f29a5ea18 SHA512 f4e6deb76a7f024dae37df67d7f623c5fa63dadf695c7fc9aa4abb35b1d6b76a1a4f1709ed2e7887ba217294f3ebfee7b8259e8a6522d28a01ca9194af113415
+MISC metadata.xml 596 BLAKE2B 4411d89d5052a1827d821c16c9e5ce0f2f78276cadbeab36b5ed49e65c9c0eb8f3b212c673af8cffcf986e348730a62815295cd8ca167be4ebbafaaa8dc4037d SHA512 bf3a9d195591b70271b33d3b102454fe486e8029e9fdce90e21e349d6cbcc5218e8440eacec042352c2c8231bfc1c6d64f4b542fbc0c5ffa806bcfb52495d142
diff --git a/dev-python/rfc3987/metadata.xml b/dev-python/rfc3987/metadata.xml
index 4f54bb6d329c..9acb7cf7a6df 100644
--- a/dev-python/rfc3987/metadata.xml
+++ b/dev-python/rfc3987/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 20f47e1d0367..1010ce55d502 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-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..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 1e692e2b673d..6c04cf477812 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,7 +1,5 @@
 DIST python-rsa-version-4.7.1.gh.tar.gz 65085 BLAKE2B e63200a7861f13177d042ae92dbb9f8eb4ba3c30174e21b12cb4d84d9a39d3cbb59d6dacec5d4e3d2375ca100bf48c12dabff3f90011f3a3c795ece9e863893f SHA512 f06eee5d6e72c11cdf68ee756ffef7fd9d002ee93939158593ee6d0b5cf1abbfad31c50f6cfd4676d9f64247faee6019d8b214d22324706c82d07068f55ebd94
 DIST python-rsa-version-4.7.2.gh.tar.gz 65177 BLAKE2B 513d6f346813d6bc67de23ee419d70f310155303df40174d47343786f735e00446d8874f51fdea0d7dc890bc8986bb2861746328d7200e8704197adde99d68ad SHA512 4ab64868be00b74b64931453f684bc7f68cfea92cee651e957411e4dc5084e5f8e300fda01cf5187df2f3b455ea40d233488a2e777c9d669d457f67325b420f0
-DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
-EBUILD rsa-4.7.1.ebuild 780 BLAKE2B d9c370fb59e4964b639a33d60a4f28e47d3854e74ab202195c8dd1591604a08721e5171dc925cb6cbb3a2c440b08cbfae0a7ba4d5502fa798ac19e5dfe7fc11f SHA512 e0201c9e469df1024c5b4268e93e42e3d04496f0d57831a65810c03304819029114ded6a56310c7427aa6ae01627635002a373654ab2ca9bc7d79b613de5cab9
+EBUILD rsa-4.7.1.ebuild 774 BLAKE2B a80b2c99b3cd93077b792a7872e459bdef913cd10c2d94634b18a90f6b8ef2311c174fdd632a3e7d19cf62308999c71a3fb5e2c4774b28919e0d0fbeacc56951 SHA512 5942870ffbc0bd0b3c63135c7b1d98e8999bb93f0ba76b6be5eabce4a690494fb0f5535f1043e12a04e28a7f239defdd490335154bbcd5e8dbeb8048580516e0
 EBUILD rsa-4.7.2.ebuild 780 BLAKE2B d9c370fb59e4964b639a33d60a4f28e47d3854e74ab202195c8dd1591604a08721e5171dc925cb6cbb3a2c440b08cbfae0a7ba4d5502fa798ac19e5dfe7fc11f SHA512 e0201c9e469df1024c5b4268e93e42e3d04496f0d57831a65810c03304819029114ded6a56310c7427aa6ae01627635002a373654ab2ca9bc7d79b613de5cab9
-EBUILD rsa-4.7.ebuild 774 BLAKE2B a80b2c99b3cd93077b792a7872e459bdef913cd10c2d94634b18a90f6b8ef2311c174fdd632a3e7d19cf62308999c71a3fb5e2c4774b28919e0d0fbeacc56951 SHA512 5942870ffbc0bd0b3c63135c7b1d98e8999bb93f0ba76b6be5eabce4a690494fb0f5535f1043e12a04e28a7f239defdd490335154bbcd5e8dbeb8048580516e0
 MISC metadata.xml 341 BLAKE2B 0175c0ce5e0939f8f3645c278fe6a8b5fc9f31c68e9b2aa312792a411005cbb23e5715c6806be3345731d37c438c5ad44472647616eaaac6ec53eb84aec9f66a SHA512 2100e90d14980a2b492c3e940e2cf2298e5933be99eb2bacae8980862c0a468a006749cd69fa7597c642ee90c091dabae9752b1cea0d46cb554f4e2c6251b91d
diff --git a/dev-python/rsa/rsa-4.7.1.ebuild b/dev-python/rsa/rsa-4.7.1.ebuild
index 32aff8b85fb7..3ba7e7813aef 100644
--- a/dev-python/rsa/rsa-4.7.1.ebuild
+++ b/dev-python/rsa/rsa-4.7.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rsa/rsa-4.7.ebuild b/dev-python/rsa/rsa-4.7.ebuild
deleted file mode 100644
index 3ba7e7813aef..000000000000
--- a/dev-python/rsa/rsa-4.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=python-rsa-version-${PV}
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="
-	https://stuvel.eu/rsa/
-	https://pypi.org/project/rsa/"
-SRC_URI="
-	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	rm tests/test_mypy.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 04eb314b1897..c6627e26d5f0 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel-std-pathlib-0.6.4.tar.xz 18844 BLAKE2B 714b38dc832839d9e915f74aa45a7b3e277578e89ed23c55599d598bd3a3de3e8231fb2f3890c60e065d84ae146ca5071305ea0bae750b1a42808a58d0ce1d01 SHA512 079e423d1fa70629429b0af8254a5034ca198b4e131205c3fac87cfb320d6821f3290a457db84550a280db1aa46542a8db81555cfaa3c8143a31515704e5f45e
-EBUILD ruamel-std-pathlib-0.6.4-r2.ebuild 827 BLAKE2B ea0ef8635b857021b5188396c4f56fd23ed53f17a40b5600d9642677f41ae118427eaa6a36fa2248aa4089231438824a4d6ac5a74a4831af42c67bbcdd0c275a SHA512 f466c4586aba90b39dd8c2645545485d4d64277c0c68d06ee76459123476418d57ddf7438bb81964714e09154299651c5066efb97734a663f57982f12e66e6fc
-MISC metadata.xml 753 BLAKE2B b34bf595b1fa759bec45178246d351516ebc1de0291ff2df61096e9b54251d17836f83d6a139ed0fd92187f89fce05c39145d28a32a40eb301bae05877c6aa54 SHA512 ef872857daf0ac20451c9248756ac22516cfa8fa0c5067a0dd2be35b4ac9fa755c55ff2dddaff65c021b105accafa0d48ebe1f8f63c4c616b8b3eac69e955e27
+DIST ruamel-std-pathlib-0.8.0.tar.xz 19068 BLAKE2B e1709bf5af17a843a7f5aec8009c4ec337cd1a4a526315e8834924909613eb5cc50c2ae1a1acc74c97a876fa347767dce627f2dba1fb874032f0989f7ee6599e SHA512 eecbb43e3867d8ccb166a0d528b3d7cfc04ed6f2df5e2048ccec4d7fd36117ac4a3984d4143025f6b7fd51867de879fe02e5dcbc4b275fd40cab1609bcf69536
+EBUILD ruamel-std-pathlib-0.6.4-r2.ebuild 832 BLAKE2B a6114940efe9a4fa7c17512c1757ef8d5e329c53b6dbbf256850c719cc54687c55801e5611257d6c048793c295cdcae8d9b01fb64e5cf9a340355d185fcc83e3 SHA512 147f70f65fdaab66b2eb542a5ec42150b871dc512ce8cfb398a1f2679439962ecc581f1665c855d2cb93fc3f7197539cb8c4891a92b665af3ea8a57e653efdcc
+EBUILD ruamel-std-pathlib-0.8.0.ebuild 832 BLAKE2B a6114940efe9a4fa7c17512c1757ef8d5e329c53b6dbbf256850c719cc54687c55801e5611257d6c048793c295cdcae8d9b01fb64e5cf9a340355d185fcc83e3 SHA512 147f70f65fdaab66b2eb542a5ec42150b871dc512ce8cfb398a1f2679439962ecc581f1665c855d2cb93fc3f7197539cb8c4891a92b665af3ea8a57e653efdcc
+MISC metadata.xml 783 BLAKE2B e18626bc4707b35464676b50433d5a3f7f187d3b37d6e73d943c7cdb92d8279d0c330c33e13f68a7de05c3b55fe0f2ba11414a2200b00b3a571f66852e223644 SHA512 7406b28da3ad6239d8eeb1b879472f1bf6af343642cc901a1e0023f94e361eef32130d54203128ec0a0ed3bd7b807e516b9e41b47fa52057e090cb29599cf9df
diff --git a/dev-python/ruamel-std-pathlib/metadata.xml b/dev-python/ruamel-std-pathlib/metadata.xml
index a930f0e9cad9..c94b729b0d07 100644
--- a/dev-python/ruamel-std-pathlib/metadata.xml
+++ b/dev-python/ruamel-std-pathlib/metadata.xml
@@ -9,11 +9,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild
index 6145fde1e296..dcbd6c7752bd 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
new file mode 100644
index 000000000000..dcbd6c7752bd
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 2c5564fb7d27..b4c229da965f 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 688 BLAKE2B 0d14ca6ff3bf7d1124eca6d423e9fcfe6de03527af9c542fa94522adb971edeb1a4710a7b06f398fa30b9919eaee753d550745562e835ee145398ca636417407 SHA512 c7020ae9aef3b28ec01ceea3fc91663824daaf382b47dd6676e0054dedfd138bde2c3b11e276f3e5a01299ad939b0c8eb4ca2a6c469fbb8fcd613d7786b903c4
-MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
+MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/metadata.xml b/dev-python/ruamel-yaml-clib/metadata.xml
index 946ed7ddc671..74cb64c51750 100644
--- a/dev-python/ruamel-yaml-clib/metadata.xml
+++ b/dev-python/ruamel-yaml-clib/metadata.xml
@@ -9,11 +9,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e06c14f326f5..f1e3c619e492 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -3,4 +3,4 @@ DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.12-r1.ebuild 738 BLAKE2B 34ad19df9b4725013b1d300374123a7cef0bffa383f544b80be2afe4c38f53855c8aba777c4addfca0835b7de4ebb303a7ac3b54649c04e58bc3b8db3f682acb SHA512 65535c7f50602cc4d32ac24dee681020782468f29a3882c2312f639d39c740c887fa2075c448e1bcaab1d87c57e3d08926a1e7e09fbd09a4da0163283f866411
 EBUILD ruamel-yaml-0.16.13-r1.ebuild 1239 BLAKE2B cb5c19702d96a6d952ef9a53debb09730a3fa865e0acdfa4b09404661694f6b4bef95d42a92a42cfd17ffd7eb5a33b88520a7dc1246029fc49708720de3c2f22 SHA512 62414542ba33ebcd37d3439e53862df7752feed6bc552c1bdcd169ed34163abe6957a803d2aaaf94b46fc6455e89b42e1cc6e0eac6e2c6b13f01047e4b933f1b
-MISC metadata.xml 739 BLAKE2B ff8160bdfda16166cd750467eda32d2040765fb4acde3a640f0b62fddf1eff8890733ff9d2bb30d52977838edfc49d5328dbc756b5a1ce5670a8bbf6a46205bd SHA512 c8bb594dd0fbc94496c5b1b563ae4d2266d97704f116338d1dfd37d4a2bd829bd96e469e499228ffe44330c26b68c6a18d02aeccb20fb39bc8de2d8a3701a083
+MISC metadata.xml 769 BLAKE2B 911a62c04917e49aecfdcccb14ff6ba636e6911bc82db8575e5b494d415a2780763d8022e672c0ef65154e90d57deb2ca10cc90d9448bc0fab2014fadf37195d SHA512 c005c5349d9bffd0ff7c4504ef7cc614c57e61a1cab2ba24be816db1fba00e9a305d1beea4303562746b2c02b4a7816a087aacf596b78325f71cb51a53779e15
diff --git a/dev-python/ruamel-yaml/metadata.xml b/dev-python/ruamel-yaml/metadata.xml
index 4a6a33a39d5f..81ff79eb96d2 100644
--- a/dev-python/ruamel-yaml/metadata.xml
+++ b/dev-python/ruamel-yaml/metadata.xml
@@ -9,11 +9,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index bb731b822874..c1d2922b43de 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,4 +1,8 @@
 AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
 DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
+DIST s3transfer-0.3.5.tar.gz 118959 BLAKE2B 8666ec91058752a1862582f886d373bd4eebbb3684571e1fcb0648e2c4ef3f24366b4e496960715487b6f1fb7fdc96f0031ee48259984f2bcdfbb2a8fe3d33bb SHA512 2a5a0b3163a8ae7097d82f897afec97533acc0d1a03271b5e261bc0b98a9af5a0fa0d594cc4cb701c1698bbc347d10b2b105c4393f349bfd5ef628d1844e7ddb
+DIST s3transfer-0.3.6.tar.gz 118877 BLAKE2B 0567b69ee71bd470b3b5bccce3db3e923eee6d8744d9e0e5a1789f3ba5f419742859f530ab43295e5ccb7ffe3c04da8db7ef92c973afac97ff2580bc13c6934f SHA512 3bf97f080b63a88f2860051ef9c0ecd4f06adf1a22eb5bd57c543532f7e85c39f722f0c9cd24022ac0ed3a54ca48a089a10b86703cb866730e265e53acbe602f
 EBUILD s3transfer-0.3.4.ebuild 731 BLAKE2B b81ae9a3411f6f4e5633da1fef1b34108e01c4c34dfaaf0d55bfc318984fcb670dc7414acde89b4789f37bd34c370f89832d3ae30a84d33a91a348b422860961 SHA512 19232c442fc89e2c7272255507cb9c21f23eb4cd3c04848798a799f9b089934b8dec296120ce6b211fd686ae1a9ae3c00f5573ec932c21d5828ab2312474c7bc
-MISC metadata.xml 502 BLAKE2B b996c37a4c744bcd72c760026bcc710ab8e70df0f9866167ac2628303edf5bc795943e686947de7c2c01a35c13a0769ce79f43efcb9d369cf0b1f2dc3a2b28a0 SHA512 8dc4c948f34912f6b4160afbffdfd9ed4f148871f4add56010943db1185fcd7d8af27e57e97a0ed293bafbb7c395636958218e023ba4507989aee2eca308ab24
+EBUILD s3transfer-0.3.5.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
+EBUILD s3transfer-0.3.6.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
+MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
index fcbcd1b6cd19..8186b1326278 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/s3transfer/s3transfer-0.3.5.ebuild b/dev-python/s3transfer/s3transfer-0.3.5.ebuild
new file mode 100644
index 000000000000..48ca166b1782
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/s3transfer/s3transfer-0.3.6.ebuild b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
new file mode 100644
index 000000000000..48ca166b1782
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index dfaff6367ec6..eef6cc157a91 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
 EBUILD scandir-1.10.0-r2.ebuild 582 BLAKE2B 8671a7958f2c8779601ca7a1853b7700fd5b68cb7c7b1f7882edc52539731b29166a2d6cb131096781f3fc051124f0402fe82be7c189e36125766debfbf51a69 SHA512 1239ec3e92c6fa76f7f6711aa3b76a5809fae003ebb618536ecb2a409dc201d4c8a1949d17c779cac330354a196448f0cea86dc8484ab04cc6bec17ea92bcd56
-MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
+MISC metadata.xml 495 BLAKE2B 00d10b6da8a863dcdf900e71725b6ca73dae721ad8f703a21b7a1555a496b11dedf38bbc13902a76cc28fee79ce305c0033d46bdaa8c1c5fc7be71b291686c9f SHA512 016e2747d2cc92f4eb80d1e15f2e33096415d743af5115b4b947f1f01648b35e07ae8b779d0faeb726d224d28a5ea49218b825d4170fb2a3321b638c6ba4c9a3
diff --git a/dev-python/scandir/metadata.xml b/dev-python/scandir/metadata.xml
index ddb3745e14bd..5652b3aaf8ee 100644
--- a/dev-python/scandir/metadata.xml
+++ b/dev-python/scandir/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index c3a97cf3200b..bd91aa4ec82b 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,3 +1,3 @@
 DIST seaborn-0.11.1.tar.gz 261397 BLAKE2B b281da14eea5e9038af0d79ed07531d0006294d63ff4cabc308a460f1107a7d045793383d200dd2dd63e18b43cea838dfe245b675dbc5c308960c105348e5e26 SHA512 ea33cfdad8c01986291e07b906011f4104995f26a88b2775e155fe4abc28f6f5e224b15d4150a246ef1e134d72bd3dc6f534f7c0d370ca99d5f15cd84e10ccde
 EBUILD seaborn-0.11.1.ebuild 834 BLAKE2B 44e550a9150479ce05a9789cb5bca3efcc586704dfbf0cb7f79ffce97eb80412067524fcf1770f1c5e87f9dedc6a3ba5108bff585e170221620ae5d7bccc4aa6 SHA512 5017c34e1d5b44c4d188db1d1efa5ab0c8eb74592792d1d2eac720537aa7a765598c7a314eb80e169b7136024d93fc5b16d441fb6d7dbf06e809b92211337c07
-MISC metadata.xml 1736 BLAKE2B f73d41b886357b8c627f96ae28b388594718c73e9324ddfa207b7f621fb7f34a1da20134a0713b8afdeb8eeb6100784694b139f6236c5b6d26c465ce756f72f7 SHA512 d2eb33d9acb5062e6391f5d667d855dc7d0fb8fdff155a37856a25a1b7912d49f7843457a95020e0c89f7c05a9360155259ea4c102530137bebb99ab6b857e3b
+MISC metadata.xml 1766 BLAKE2B 45006c8b5d868060cdcb0957295e071daa0092544e8ff68bb39ecdd6d0a6fe82b2e4f4e39bd409c60507c7b8226fab41ff4eddd06b8182c5c265e970ad1960a8 SHA512 32cddb46d3b961274d18cfed1566a80cb7d6917cc6df72f5c73bf7bf15c76287ed5aca3d80d7c6d3384072a7a94a58acb373f279486d8328aa29260f8ace3c30
diff --git a/dev-python/seaborn/metadata.xml b/dev-python/seaborn/metadata.xml
index eac58817dcea..3fe3e1e18cab 100644
--- a/dev-python/seaborn/metadata.xml
+++ b/dev-python/seaborn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 78cd0b3a6df1..e612e7b5002f 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,3 @@
-DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
 DIST SecretStorage-3.3.1.tar.gz 19566 BLAKE2B 0b1ab822ee29f3d56148b558b3029fd882f1d10ceb3e026586de2e9bc72b7ac1b35df11052117a7c07524ca72d004ef56d99c845bc3600984fe84e5300f3dfee SHA512 5e874d08c9e00626a217db96b131884daf92429a91f690b32f62052747275ad0effbe2b4abe048e67fe7f81df97507f8375408898ff986e6f883b5fdfbf2a76c
-EBUILD secretstorage-3.3.0.ebuild 1133 BLAKE2B bb91143eae619193b0844501319a8b2a1e12c6715a2293073bd411b4c4833608cdcb7e1c53675413e1e308e6d0dcd3e12a99d27be96636f8e03f30c58ee45df5 SHA512 e42c993cb35df37b1264f9e6ea43efa96155e706eb6388031f6cbcc6ee50bb142f8acea1cb93df03325bd09de72eeae78314412727112a3fd09adad8fd1089eb
-EBUILD secretstorage-3.3.1.ebuild 1141 BLAKE2B c021232401aefcde9c273d1a5b6ed42f99c59133a040ff12bcb087185cc9eb72d77efb5e72b4ca190e705be31c7a054b80eb9a8041509db96843f9e00506ece0 SHA512 888cbcebdead6a643dea37b5bc89fcfd9c74ef5956af34ee65fd561209b1c1b3676c7754914fc0049de66736ec309cedf100a29fd61212514b8f332bb9269cc2
-MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
+EBUILD secretstorage-3.3.1.ebuild 1133 BLAKE2B bb91143eae619193b0844501319a8b2a1e12c6715a2293073bd411b4c4833608cdcb7e1c53675413e1e308e6d0dcd3e12a99d27be96636f8e03f30c58ee45df5 SHA512 e42c993cb35df37b1264f9e6ea43efa96155e706eb6388031f6cbcc6ee50bb142f8acea1cb93df03325bd09de72eeae78314412727112a3fd09adad8fd1089eb
+MISC metadata.xml 401 BLAKE2B 1e09ec717263668ffdbfd377d7ee0eadc43561eee8b5ceff7458a811023cdec32b22c0f319dfc78ed4d12c90b7a62aad5c0e724d6f96af3c7eb2dd9c10266292 SHA512 a6ae799e1f90431bca1b4c7ff19a89c8f4a12e927f35b18c2457749ee37e92c56204dd526b85cbacbadc75f07f9e4f1e84a1a48eae2f79e44b43e5e7590455dd
diff --git a/dev-python/secretstorage/metadata.xml b/dev-python/secretstorage/metadata.xml
index 6c2d0a0d1cf3..24ec4d49c5a2 100644
--- a/dev-python/secretstorage/metadata.xml
+++ b/dev-python/secretstorage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
deleted file mode 100644
index b1f1ed749489..000000000000
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( !hppa? ( !sparc? (
-		gnome-base/gnome-keyring
-		sys-apps/dbus
-	) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_test() {
-	case ${ARCH} in
-		hppa|sparc)
-			einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
-			return
-			;;
-	esac
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/secretstorage-3.3.1.ebuild b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
index 4a0d3fd09248..b1f1ed749489 100644
--- a/dev-python/secretstorage/secretstorage-3.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index fc4c1de00ec1..bbf8105f62c5 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
 EBUILD sentinels-1.0.0.ebuild 419 BLAKE2B 01d42e26044bac3ec65072517ff5bcf2522053705519ecd0f04d3b8821e0b341baf94928afd6d0a65aeb1bf17e47cdd7c7917c4b7da4f685a61f30cfd58781b5 SHA512 30393a5d19b3d25d64c2c15c2e69a14c8a11ecac04c1c52cdad208b0556250042228f20f7788ba8867b69376cb0ff9712a0592c432c4d661cbe5ce397d562073
-MISC metadata.xml 755 BLAKE2B 213fb1ce0889204789436f59fc25774bcba7cacc2d51e3b7490dc913057a4b6d4a315d802421d7090239aa4706ab52b8c18c90a8c18ae101eb78d1758aef9f30 SHA512 d095b29efc4477e3f31ce24f6ca61800074bbd868ba50e891b1ce4ee7508e487d565f0d13e1b8c78b77a27c4621918baf37e1bb3d31f241dacf77e8c25f1adb0
+MISC metadata.xml 769 BLAKE2B f11c8decca22381c0210a1eb47e43610b3a3d304a011d9536ea8d96e59b76364fe5657430e6c5a7b03fe59df989467a5d1994ca7afcfca84e53161209916d6f7 SHA512 d431b74df62663b3eb774b3f6e1522ef28eed0addabd3b8a2aabfb21bc7a76f024f7725dc8de7e7c330b3f4ad84795352ccde94f3e28b1466374f2be83f31336
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
index f7f50ddafafe..36db561eed8a 100644
--- a/dev-python/sentinels/metadata.xml
+++ b/dev-python/sentinels/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 1286b2cb46dd..aeb0331c6f2b 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,11 +1,7 @@
-DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
 DIST sentry-sdk-0.20.1.tar.gz 210762 BLAKE2B 64ff322667374c914aa00a80ffa5eca2d92ec0965bc6bf7bdc65cf89e75a3cd5f5db32cd7e442caae515348b1f7948209e9810729f4fbc913730337f06444b73 SHA512 cd7871bd3da31340752477058fcf788401910a4e0b4ac38d53beafbedcdfe62b3216d6d2bcf2d1998e8c3e02886da76f6a8aa2809ba1e473421f96257890e75c
-DIST sentry-sdk-0.20.2.tar.gz 210799 BLAKE2B 7a7b4350b664ee6947fcba64aa07a4e9f8ec274de7433d64acce55d490ea91f97a19ab7116e7af3109f806c91261f50127c72627bca1bbf76c43ad4ac89455e2 SHA512 3fb2d4ae960c86582e778afb0fdf12f3ff9103a83fb12a6c920bd6fe1e210842d29d2cfba12c254199a491a5b42288df0c388b37a8709fdabc9e6e9687b178c1
 DIST sentry-sdk-0.20.3.tar.gz 212130 BLAKE2B 48084039c493ca2903f56426913ea8f8f0480b759157270fe6ea4dfae72f9478d8566f8a86f6f863c06adb01379e980d5f873372f401a8d3f255f62f8a149b45 SHA512 0392fcf0e718f7d06200fa44fedf1aac46a2f61d11a8252ca339652d5385a377545128c1c4b9e31e1e1a8c8c9a8c57ded569b829312a748d84ad98696a897944
 DIST sentry-sdk-1.0.0.tar.gz 213707 BLAKE2B 9fa3dfac7d82c9e2c81be6f4edafbc27ab19a2a96876885dabe72d2dbd6cf392b80e453c640affb94d84f35b227b12d56927bec88e01a0ebfdcf8a466470a909 SHA512 e91ede3e5e31c2acba7094bd5c6a95280aa8367b1fcd524fc9b100d2a3a253efec1ed3d9c72465f5b2ef5276c834906d622b84e1650b65d2032f4acaf2fd1ab8
-EBUILD sentry-sdk-0.19.5.ebuild 2791 BLAKE2B bf6037e1865b83df6d926a799773cbf003e1bec23ff601e7e255d75f62e19f9350f5e066fac70fea809d4dd4aaf8d952532124e6edb028a7ade52831a3de7b34 SHA512 75552b6a55fedf3d05e346345aa153b030fdf13cc6f09c0ad433ddf321a1a0d126735fbbaa2665dc6ea5cb11ac85ef7b083ea9159b3c3bfd782c353bf99be792
-EBUILD sentry-sdk-0.20.1.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
-EBUILD sentry-sdk-0.20.2.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
+EBUILD sentry-sdk-0.20.1.ebuild 2129 BLAKE2B de023c5d35c37959a0ab94b11f0d5f4b1d45dc362098fa894c20dccb4fb96603ef11b9224778bb557c82a4ac50735f64f8239999c019c730a2c73997c9678cb8 SHA512 9771cc9b03b1b64bc558498382e3565d5144e9de3db487435adcf08d0c940c252307507f91462837d01df5309bfa3e0b85ab2097bb6214f59efb603e10f52f5a
 EBUILD sentry-sdk-0.20.3.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 EBUILD sentry-sdk-1.0.0.ebuild 2280 BLAKE2B 1eded6b4d30c3973cbc3c9f1e5811803b5a4a2376f3886ae8bf3331dd8fff3c847bccc787fce03258e1f3200812880d12abb03e3fe1fc6a07ca6654935d35960 SHA512 4fb27231fde3b323312072e2eb6d1ca97165d7b27515f7a349e1b54a4ae92d490fd0971cad2229162f32acf7693c8ac0c62d60c470fe7ee3d3bda2006054af4d
 MISC metadata.xml 509 BLAKE2B 5b68b368764625061ea2eadc0161570e46760904015f6e1e3e97a7a4dacd3604a18b2cbfb665e816981a40f95ec9c4f0c4a0447ecc968cbdf1fd21dcd4149193 SHA512 c42a1f7972313d3369ba392347b0efa700ee9c9b01d3275b3973b8137cf00fca693288a1af57c355b2d87525d9fcb7a320ad571fe8be5531472a8710f9b287d1
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
deleted file mode 100644
index ecccf0e1a85e..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		<dev-python/dnspython-2[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/aiocontextvars[${PYTHON_USEDEP}]
-			dev-python/contextvars[${PYTHON_USEDEP}]
-		' python3_6)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests require Internet access
-		--deselect tests/integrations/stdlib/test_httplib.py
-		--deselect tests/integrations/requests/test_requests.py
-		# wtf is it supposed to do?!
-		--deselect tests/integrations/gcp/test_gcp.py
-		# fails on py3.6, hangs on py3.7+
-		--deselect
-		'tests/test_transport.py::test_transport_works[eventlet'
-		# TODO
-		--deselect
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		--deselect
-		tests/test_client.py::test_databag_depth_stripping
-		--deselect
-		tests/test_client.py::test_databag_string_stripping
-		--deselect
-		tests/test_client.py::test_databag_breadth_stripping
-		# test_filename: apparently unhappy about pytest being called pytest
-		--deselect 'tests/utils/test_general.py::test_filename'
-		# test_circular_references: apparently fragile
-		--deselect
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-	)
-	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
-		# broken with contextvars on py3.6
-		--deselect
-		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
-		--deselect
-		'tests/test_transport.py::test_transport_works[greenlet'
-	)
-
-	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
-	# Needs to detect sentry-sdk in the installed modules
-	distutils_install_for_testing
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild
index 7b31e702fe53..d3a5fb8d4d3f 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-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/sentry-sdk/sentry-sdk-0.20.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.2.ebuild
deleted file mode 100644
index 7b31e702fe53..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.20.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests require Internet access
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/requests/test_requests.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# hangs
-		'tests/test_transport.py::test_transport_works[eventlet'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-	)
-
-	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
-	# Needs to detect sentry-sdk in the installed modules
-	distutils_install_for_testing
-
-	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index e6aedc515f6d..7fced387eff5 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
 EBUILD setproctitle-1.2.2.ebuild 561 BLAKE2B 071ebfecebc8777dd8bded925797d10d099e9a3064e0006177007d5c880ff00a3ef60815d9aa719528de835d6966ac2abca881f6d3e6715c5b56c215e7bff853 SHA512 25c5b629543ce643b8465afc52efbaac16f51dd9bfc2f4f56b59d78c1e7d72a6efc9fd55ed3edc760b58f81153ea157a9b43ab9f569d9ce16c9fe5b919a9a5da
-MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
+MISC metadata.xml 380 BLAKE2B a4f3fcd916d84f435535d148dc0f50bec06410d0502048b1d72b06db2a7f9007c00e80267ac3e3cd99cd7c22ddca64c08438a0882ec3c2bf0db459f49673ed2c SHA512 f2f94b9cf710b4bb43273f6ea80846b114288deae9c3c802ac40f62c2e9ac60ca5f2d7123d807832d1e265b4b7e423e40e39c28a09ad8e2a387ce12d04e5c096
diff --git a/dev-python/setproctitle/metadata.xml b/dev-python/setproctitle/metadata.xml
index 70895dc7b522..6e7f3e21c2db 100644
--- a/dev-python/setproctitle/metadata.xml
+++ b/dev-python/setproctitle/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0f03edd5ad31..50a0eb6f4a42 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,9 @@
 DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
+DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
 EBUILD setuptools-53.0.0.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
 EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 EBUILD setuptools-54.1.1.ebuild 2198 BLAKE2B 9398a7ed3e4503cddda05dc4a07c875899fd0343943cf681dc1b374dc31a552aff18bd481de62f3f9b6ef22a629c867c66189ba1757771c071ad2cb755e661c7 SHA512 0dcd13c80cb304998dd9d7ef8d0ce73bc346ed550b4c1606d27b8d93a559c4bec7758dccdc2e54ee5107e61b11dffe875b5d847077c139ecbbc8095bd8c481d7
-MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
+EBUILD setuptools-54.1.2.ebuild 2204 BLAKE2B 2bc528a9b34c3ba3138183c7102a959e067360d804749640c6cf26a4cb26c139dbdef5ad3273046098153edc65ef118540e8fd1cd15b1886c81befb4d60a41cf SHA512 1cac63fca82cd8ac8bb3c0f0fa901b709f0a792a00232a9db47e75fe34f47edbc545d80b8f24071b326d23ad535c23cc4a77fb1bf2513bac5b2c668a15b00a54
+MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/metadata.xml b/dev-python/setuptools/metadata.xml
index bd9e6b5273a1..dde2e200028a 100644
--- a/dev-python/setuptools/metadata.xml
+++ b/dev-python/setuptools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/setuptools/setuptools-54.1.2.ebuild b/dev-python/setuptools/setuptools-54.1.2.ebuild
new file mode 100644
index 000000000000..533095efb380
--- /dev/null
+++ b/dev-python/setuptools/setuptools-54.1.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..9} 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="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		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-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}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	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
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 3eaae667e0c8..16a9df59dfce 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
 DIST setuptools_scm-5.0.2.tar.gz 52273 BLAKE2B a4166b293f26161be8748f0c4b819dba0c03186a95d0c06b6fd6fdee7910de60e034ab81f6f1d89f7a1b47381441deb8a38d05421aef3287b35705bbddee33ee SHA512 1e92d03e2d8473425c146a885eb641e98895c43afebcd3c66c1455ace2d81f187b87681072f8aacc5e8be166577f00138cc7c53e4b7d77cb1b598f835b72b010
+DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
 EBUILD setuptools_scm-5.0.1.ebuild 1197 BLAKE2B a94beb25a56928405b785bea232e2568addb05548294d028a8a76b10c8b9b8596ee38851ca9d61df2bf6c9d3f822378d4fbf9482495103493488495e51a3f14f SHA512 07841d4e3f94719fc04990f2c3d3834837f02fe17e357c864a46ed87830434e454d2aadd54685b8067df9d4f14cc09d6436eeb6e1dcce9b9fe92ae90c9e70014
 EBUILD setuptools_scm-5.0.2.ebuild 1066 BLAKE2B 929685bd4d33137734e7f37851da49ea1b1f28e0305377b665e7f7f5af46d7c02b402b227d833b4d40597710d0329756d807b499a13b744c87c813293d98262b SHA512 3ac8fddd4ca46970ba63c2c3647d6b9449adb6bd99e5962d0541d116652457217b6394bdd4aeec3e8a71f1b70a1a0957358969f17c615ecb715905f0301df082
+EBUILD setuptools_scm-6.0.1.ebuild 1066 BLAKE2B 929685bd4d33137734e7f37851da49ea1b1f28e0305377b665e7f7f5af46d7c02b402b227d833b4d40597710d0329756d807b499a13b744c87c813293d98262b SHA512 3ac8fddd4ca46970ba63c2c3647d6b9449adb6bd99e5962d0541d116652457217b6394bdd4aeec3e8a71f1b70a1a0957358969f17c615ecb715905f0301df082
 MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
new file mode 100644
index 000000000000..07d1b0659787
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index ff5d65f431b1..ffc505b6551a 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -2,5 +2,7 @@ AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd970
 AUX sh-1.14.0-fix-sleep-test.patch 1231 BLAKE2B 290a33009a7046d2a461e623e6e3fd7789ea04a2a54cb086f98bc7fcecddcda6cb3ec3d85429107688ac4d1e5e3dc7555dc924e64241f54fe1875832ce8651dc SHA512 a69ae0ef2b1637cfb579a2c7c4de903f191af9e32f1347add26a2efd32ecb6085799b5cbc96eddaa59d6cb4a9164f61df54b5ec1449b98705fac60526a2b3ff2
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128
+DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4
 EBUILD sh-1.14.0.ebuild 670 BLAKE2B cf5c26a6e9badefb7b18fb088e2dd0fb7f5b0049dcf444979209d4f4ae66cc98aecaddb792e0300c81f68533a2152545eafe41b17f0b8285fb7195bec9084096 SHA512 061db572ff56d84710023aa9c0cd5eccd67ab2142751bab19f80990f4898b81496729683854fb1ad3b46cebd0d295d03f7a23d95a2512b0e27bf70877cf9ce69
+EBUILD sh-1.14.1.ebuild 583 BLAKE2B 544da65ace9dfc530ef5adccbe666073a14a806d9312f10b0a1751ebb45a57debe0a0fd828ca3cbcdc24d1d68ca4d355d7f19a39a7f3f36e2a56d3a75af4aa8b SHA512 8c62419e0a896a23cd0941ef6464b811081a22dc8c76c5deda4ed51755f84962eee571fdcdcc6205e34ce7d548375d186b54f327dfd15a619486f36b1e32ead2
 MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
diff --git a/dev-python/sh/sh-1.14.1.ebuild b/dev-python/sh/sh-1.14.1.ebuild
new file mode 100644
index 000000000000..27df45dc064e
--- /dev/null
+++ b/dev-python/sh/sh-1.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/slimit/Manifest b/dev-python/slimit/Manifest
index 331846b7fb68..1b62df4b7a9e 100644
--- a/dev-python/slimit/Manifest
+++ b/dev-python/slimit/Manifest
@@ -1,4 +1,4 @@
 AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
 DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
 EBUILD slimit-0.8.1-r1.ebuild 971 BLAKE2B e12621d231fc740759ca0e3016be53ce0eae76950a863e06d1602ea3e77f130fa5d5a96670f61d4a54f7ed5294be3721c8b224f846374c1fb9aa0c3aa00a8381 SHA512 fe4f16ee9edbfdd83d30a06505e7f0a814dfdd90555ec51002b070a4ed9246e80fea88946c94d9e4c34a78084e5ba7c51e72c6dd6b938307636352f9b48dee5c
-MISC metadata.xml 450 BLAKE2B 477b890023f3da5e50de40166a164423db80c9d8dcb22baa1257c3b898206e6cd2afc74388ad80456cb49b94769a08779305ad0ff6af983bbd4b62a866a7366d SHA512 0c15d836769644f4492c90ff13c6306d2d4f950aaa0badffe014262ec4492c7995dfb836464b5dcf570f368180d1d2bf8e6babc5930e128b2602bd033b7fae09
+MISC metadata.xml 480 BLAKE2B b3143e1d196b7904d7e2941f230b6eb473e91a97957ecc2dd989c79272bc116d09f8c5340a267599c5f535b3376511f95a3fc34b5cfafe0924337d0df5f048f3 SHA512 25cbf46f9d6a5246e2640f173c27265d177cca27818032bd172adb353a8da175f2645ba582e0d0f5f520e3665e7d4bd9808be42effe009972817892a53138331
diff --git a/dev-python/slimit/metadata.xml b/dev-python/slimit/metadata.xml
index 1e181f90851d..56e9bec3e814 100644
--- a/dev-python/slimit/metadata.xml
+++ b/dev-python/slimit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 9b69017d8d9b..0727a08ddb6d 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
 EBUILD smartypants-2.0.1.ebuild 701 BLAKE2B 7419fa0feacf804f1e5059fe0b34bb31539feb05a41a6cc95b80927ce7a92574ecd226cfae98cdaab6e5647feb1b61af296545d0125311d32f26aa1ad451366e SHA512 155996e0e7fbaf62ee3ec861f1834fb8add85a0432eeaafa96ae412e5b224db344c807b8bf8d769c98713888ffc56d3db7d887c3d7cb5e321e65d55f279fcf46
 EBUILD smartypants-9999.ebuild 701 BLAKE2B 7419fa0feacf804f1e5059fe0b34bb31539feb05a41a6cc95b80927ce7a92574ecd226cfae98cdaab6e5647feb1b61af296545d0125311d32f26aa1ad451366e SHA512 155996e0e7fbaf62ee3ec861f1834fb8add85a0432eeaafa96ae412e5b224db344c807b8bf8d769c98713888ffc56d3db7d887c3d7cb5e321e65d55f279fcf46
-MISC metadata.xml 577 BLAKE2B 61e86a5d1ecf56b59ce939d3716ce898e920eaa38a099092e04d69f59e5b10316e2dd4629c5ed976b2bbadb9aefded3df294a02247afe79cf7a062555613da97 SHA512 72792157cc48da82a0f0118c6b9b3d855e2b284b7913162dd0d2f58483471f6042125df8e443a3fea5b7b580be0a9c67c287e68b87b477145db0df2e764d61f6
+MISC metadata.xml 577 BLAKE2B f9fe52ecf09ac488bd7e76ea4a119175283dd96853e4ede042c3a9f009ef696e79be2aeb600bec5f5e631c462ef5ce8b83f15e5fb8ba51a840aa26c8b79dc0c2 SHA512 00633c0b741819bc6d8202bc826e88182cc058b8fc043fe4b5c093b1966679188a9612526c79ccef2d253c72fa67b582c1109c123b3e62612be00788238108b8
diff --git a/dev-python/smartypants/metadata.xml b/dev-python/smartypants/metadata.xml
index 5f9e81afc7a8..ae7568154bd8 100644
--- a/dev-python/smartypants/metadata.xml
+++ b/dev-python/smartypants/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 782b9eb4aafd..2d6fc349b819 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,5 +1,3 @@
-DIST smmap-3.0.5.tar.gz 23228 BLAKE2B ccc36c33e9239f69a41eff291dcde7e455a84d886c2b087464b1b084ad8506b9d0f862b083635d51465089564edbd27ed0b7c9c5a0d1e58605b3db6f84dea857 SHA512 82d0167ba439164b5b9e6ca6081558b7f32af364f7935aa40500b34ca80e0fcf8d014e53eb2963e189d28ef18c8dd48da0b515392d149608fc3179fae3f69ee1
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
-EBUILD smmap-3.0.5.ebuild 485 BLAKE2B aa69721ac98f184219a36c1f3507f55ae53bd22c32f445ce467594f7c71ee91c412daa0cdd78eb188bf660c7b612291b6fd26c64d5ecdeac182ac93b357d4bb6 SHA512 7911d4ad2f47b7c50c415df887ca080e3fcf425467a4da67d2892fee4e498153950b27871d720fef3bdc1c8553c75a3b2cebb1b0f726953a867c3b2dcbbdbce0
-EBUILD smmap-4.0.0.ebuild 495 BLAKE2B 3df420392b994d505a0c10a5846b811da7c5ec4097e19115c6e88aa64db5a36d043cffd103ee04293f10f140f0e7cd7d7d0ad9df4bbfd6e691a8ff28ac6d396a SHA512 ed220f419964958f2eedc156502d6097d056657816b697f7f0eacc8de1ad302c47912197ecab047cd4c2dd488238129a83e5e79c3dfeb8d10bf49c25136a53b1
+EBUILD smmap-4.0.0.ebuild 492 BLAKE2B 4214b2e75fac5d518c7a650a80062457b01add28474940fd045e8db2152404683f40984ce3ffb3c96411930c8f6ea298ed009597a54d3770d120fce740f90095 SHA512 5ae74ef4464819989282b31041b38cc662cc59f34b212779a65d999c187ad634a31d5789535c52f149372f0943deff1e7f942946c45f46635a3d3eedfe048b05
 MISC metadata.xml 411 BLAKE2B b6d13ec428eae8529a38571afc5c66e1c02f812667c0f27bc1db2d23a702d7d49ebe877087d2af0136eb4a34d6422c00cb132fe6e526c24646a742e167e16caa SHA512 8020f425757423d6be45a200bdd9ecd261a1f81fa148c16a08c343f8be83f558fb6bcd614d2579f8e82a139efaeecca568d8b65310613707fdfb3ea1367594c8
diff --git a/dev-python/smmap/smmap-3.0.5.ebuild b/dev-python/smmap/smmap-3.0.5.ebuild
deleted file mode 100644
index 98acaf2978b4..000000000000
--- a/dev-python/smmap/smmap-3.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap/
-	https://github.com/gitpython-developers/smmap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 x86"
-SLOT="0"
-
-distutils_enable_tests unittest
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
index d8eb6b81b2a1..fcf2d3d3c805 100644
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ b/dev-python/smmap/smmap-4.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 39268a3cfff7..1ce09d16cce9 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -5,11 +5,15 @@ DIST snakeoil-0.9.0.tar.gz 271675 BLAKE2B 7dd65335fd79a7d335e5047ba928d7c156c575
 DIST snakeoil-0.9.1.tar.gz 271045 BLAKE2B 74c45d38d294e06940d4a339e6d6c6e66d84b7fd174b4d79a9716262bc1902d47dfed1751b44183f9119ccb3bd50e11700951d15070a15b94d6a7b20f77c5919 SHA512 94d8baed4baaab8c3cb3631fed4e6cced8fa32c953bba2ec2afd0cc99eb9b526dc58e5e9efb402513b0416cda21a0811b14a2a98044fd1d5bb7f6f2b349db24a
 DIST snakeoil-0.9.2.tar.gz 271441 BLAKE2B 754030285f03c83979c74da6cf8ee585486631e2dd1410c0da4a8e4c59a0367d911af3bc82ecf9e04438e3227982af8789662022ae5dfe5e1d83863aa2ec001e SHA512 664c91236500aafc81157132c5138d14972e9b74a344fdad65064440acdca0cbbdcef63b1d3b4d09f120a14a1eb40bbc8e7801fbbf2fc3b289b615cdd6caf61e
 DIST snakeoil-0.9.3.tar.gz 270471 BLAKE2B 2f8c3737c560a756e6fd5450c900d1fbe49b0200e1c4427a312f90d14da22e2e403a710bdc768446b3b03166853d6a0965507550ee837556d273817a7f634282 SHA512 18aa892fe6d225823593f8199f029a1a866052b1cebdf4f77dc57916e6a2b15982b6729d3004a8616eedddee5e3bc260d2c5b2f78170c4d008d1f2e46cc26ce1
+DIST snakeoil-0.9.4.tar.gz 271395 BLAKE2B 6aeaf03e2c2f48a85ce926f1b8e0b86271c608695694358cb6eea56b962c0731b909c16bf37844031e986fc7ebca3a7c4cae5cb94ee55122584bf83981d8c4b6 SHA512 853c3fef517e7161a61ae0622fed82ceffdc110cad4ef7d5e2166728f506228d0802018dd351956f1525f0d27a4150e9885b2cc7c71788950261f72d8d7c4cc9
+DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 23757057ae12f52670278b905bbc32c5fe937587cd1db49eed123ce31163f4c3d1fbc2d1434c290aace0bf14756790b35fc6e48b176f790c5635628abc7e716f SHA512 44cd2098f4bad925f8d4fcec61d4367f963bc4a10566ca52542c4eeda5019527166ab9f358c3b289a5c6c1ff7698f770da84cb799f57d68196ef9c28286aeb94
 EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce7c16bffa2902eb14d3b00fc534ca566f9a22665463b5ca48532a86f91ad396292b2774e9ed9a4c46022bc7699 SHA512 75db4d4ef4b92d0cde7c42cc9f7bf9bfd0a5aa1d148aff6dfe9b32bd695d121f4738cfe2805d48a1db34e1bf4a7d0766c82dcb51560b27cf0749cffed0c0e6c5
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 EBUILD snakeoil-0.9.1.ebuild 717 BLAKE2B fe7fc18a2b270b859857d1a2127d48e42fd36ea9a39d6bb60879df026e4074f96811acae535727b7e030a8bb811ec7084fff1422758e8594394c1e53f4d16b60 SHA512 38d9fdab976098e044bba394cd4b3df90d5385bb9f6022c44075fd2d303d7ecf8978a70559a77e637bd9bf28cd24877f1cba52d656721b8365bce126abc8df95
-EBUILD snakeoil-0.9.2-r1.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
-EBUILD snakeoil-0.9.3.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
+EBUILD snakeoil-0.9.2-r1.ebuild 754 BLAKE2B 6e5e5442cd12e899d3f9db272d8cea23adffa5d4116f09210d33cbfa0556bcf20e986cd20f82c14ed072c50538496f42c9a2391b848a21cb614126f5efb74b18 SHA512 460b437e2f5f4bb240edbf28b4acc4ad872add8b96ff9bcc3b8fe4548ffa751ef0f9c487b003ad2cee97804fa1431b3d5259250863118a3a6647ecee08c9fd73
+EBUILD snakeoil-0.9.3.ebuild 760 BLAKE2B e639d1bb661abc02fa5edf43f5aec19ddf15aaba227d787e030bdcdb2e53f3466fd0827cb03979d08917972eaed8fefbdd367b720149ab846d9e4da870506719 SHA512 f3fe9aa38123c2556f7d74c378f0edecc811e781a026658c97ade4f39fc0878f0dba2d25187d6345bf71b0dac6b6700b5cdbdeb791b0e8c20a05fc71243d0b5c
+EBUILD snakeoil-0.9.4.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
+EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
 EBUILD snakeoil-9999.ebuild 780 BLAKE2B f45e83fc2a91d592ea3a2586a1162345e9d3f4520226ab5ca7cffd372868cea009a6c08844bfd5b417e26a41ebe435d027ca82b3de614b7641a2d330ad66f2b3 SHA512 8c3f35c0136e4866d1443c91d7fa43445f83d2cf86dc4272240322e89778495af1074f61d165b74d301c5a9d5775fe8391cc5e9aeda3e9781465425d3dc30261
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
index 221b582e9b7d..33301d8a9ac2 100644
--- a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.3.ebuild b/dev-python/snakeoil/snakeoil-0.9.3.ebuild
index c15346749758..332550f5be15 100644
--- a/dev-python/snakeoil/snakeoil-0.9.3.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.4.ebuild b/dev-python/snakeoil/snakeoil-0.9.4.ebuild
new file mode 100644
index 000000000000..c15346749758
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/dev-python/snakeoil/snakeoil-0.9.5.ebuild
new file mode 100644
index 000000000000..c15346749758
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.5.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_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 516d21b72486..927a354b051b 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,5 +1,5 @@
-DIST soupsieve-2.1.0.tar.gz 98150 BLAKE2B 37f6ef00f42d164ef57be88135e8a942166f53a39ed5643d6ae0468916a66be04c79e4e70da6ad38f8adf6fac41cb8bccb7edcfabd7e1a07083ab8a043d5203a SHA512 19cd4ee596d189a001bbaf9f047e6c9eff569e2149ef5424bfe55c9b4325d856c957de87d55510335f748aab322dbb847b06b48931fbdeadbcc3790259c69eb1
+DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
 DIST soupsieve-2.2.tar.gz 99261 BLAKE2B 637bed198a62a7f92f6b3c022dcb9a579c15a3dcb1e3581b5a18b9ff804c2075c976c3478f86d2400841c177f3160dc05da41991ca56731c91e6db5b95262671 SHA512 26402c831c19c9b133442dd8ea31363e1eadc3cafe172b933cdbc746df6dc9961e930d4fbe8399b847848bf3fcd5893d2449e912ed0cdf8766468997acf5ee87
-EBUILD soupsieve-2.1.0.ebuild 760 BLAKE2B 39466ad182529dbc4fbc41d248377c4256f12c686ef51c6f95789fe6429ed3ce6cae992fb43462f9b186338d60a93f3d1aa17164cd93807fff7b4601453a9625 SHA512 15ee85c05e85241be12e20d7596c563d556cc6abf7ca03f3097831c3a6e57f7dc84a46e6ca51a6d756c26a2571143763acaef036298fac8c569da250095a8f35
-EBUILD soupsieve-2.2.ebuild 757 BLAKE2B c52734af37da6491b6e076f329d07a13c8f6a794a0f4471ddad2927e1d7d7dd5100cdc459449811e5f3127c24a46742fe09f91caadf377ee1dade6581a9a0070 SHA512 9661ea4c31f73380179e84e1593068944396b9f439e853bff7f4ea9241005180202b2d45e511b1bacf464723413d9730c01993e9de96861bf62d28e8edefa249
+EBUILD soupsieve-2.2.1.ebuild 716 BLAKE2B 8ed0f3b1c9c3872d0d55cf502fee7968f958ab7573334a9a7cb272ba8bee1e2a4a83ee7edf63c9f6a12cb4a613b2269c2ae4117bca862673a59b6e955df183a7 SHA512 4a8267e6fbb07a3f56226dd94484714b3937037bdfa7f5d352ddd30a60fff94e1ef48826b5690e7a57508077233cd0124d212d368416cf7848f00a79be47ae10
+EBUILD soupsieve-2.2.ebuild 749 BLAKE2B 44429a899b62211112f7162e4a39f1d420009aead6ff24da64f2cab1d732dd53702ab3734bc8bd835724e97b10d82c08fbe2ea6c9e1f5b91374eacb984ac7119 SHA512 d561cc99db56fe9e10dc015b5b04bb6926dcfa54f3836ca6db5e118e802eb4ec18455a4bc55bf636cbe199c3c65bd3207dc61fdc470e214c96812de396785fcb
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.1.0.ebuild b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
deleted file mode 100644
index fa3ec59001bf..000000000000
--- a/dev-python/soupsieve/soupsieve-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
new file mode 100644
index 000000000000..4dfffada94ea
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.2.1.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.2.ebuild b/dev-python/soupsieve/soupsieve-2.2.ebuild
index ff825943ef73..b02fe20d6de1 100644
--- a/dev-python/soupsieve/soupsieve-2.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 7039905ede09..fde7af4d5e98 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
 EBUILD sphinx-issues-1.2.0.ebuild 630 BLAKE2B 534adbc5c138acc5a25b16b9a5f6794a0388af442a51fe5e2898e3127fd6b31b7a963bd3e6fb576fc2c8bb30e5094d7dcbb85b3d627744264d83971f4cb64af8 SHA512 9b5e7daacd184cc3a89540ae5ca662e943fe096145aded9b1971d76356a51cf4a499906aef1761af85e1908eb97cd4ddbc81e5f176b658e558cbb53340e8b125
-MISC metadata.xml 458 BLAKE2B d34c5cd0485863435a8d1b3a1cd92504faa9339d336891957f71b48b6ffe3284a6e65c41df8f0215965bc04c4e379f36fbcef031e596446b51bdce78003593a4 SHA512 dc8495272631a939ad1231a08f4e37585a3c442c8d13c5c9bb790633c1ed18885394ade5edb7dfcdfa3caede4af25225ae90cefd4c0ac5be83ba6e7911801607
+MISC metadata.xml 458 BLAKE2B 75d607d8ba82c59848b0bf07558eae09703128191cd8c043c86a970be9b31bb6697233fe22c65520a0d416025353b5f66e8936f13f07ab593aa5dba35769aec7 SHA512 b67c984d20abb117bcbbee5da75ecf07f12ed03713da79249af3747a4252da2e629d6c4a4905db809b7f35ae826e3eb9855c4fe5207e4078a697783f7c502b12
diff --git a/dev-python/sphinx-issues/metadata.xml b/dev-python/sphinx-issues/metadata.xml
index 0805c69064a3..80103dcfb7e1 100644
--- a/dev-python/sphinx-issues/metadata.xml
+++ b/dev-python/sphinx-issues/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 8ccc9fc74816..a7d80e82cae2 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
 EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 61470cbdf3a1457303318b303134f87ddf59408dba82e025d6925a3b99d1e5f049c340e924a20b6a06adc023725f1f067b1a979794837c156ec700d4a713e1b4 SHA512 94ed82bcb93b4ae92babd84f521efcbc15c9706a57cdc6aa4c437bceb40a06261371b0742620ac2bf0555c5e06ded5b9ba0c1f2bd9dbabafd1d6a62980e48ad8
-MISC metadata.xml 457 BLAKE2B b72273b15ab11152a936bcd89763670e7d1f34032136a615c99379819f4cd3385efe806512438d498861473bd55a8c082a86fd51e4153ba9f91a26d2cbb9e825 SHA512 5d9f4385ab787b8e71b1206d74f05d5c116c5f27cf192a1d21e0abd2522dd945069a16e05bb2ae058cd4c9f98037f5cb634685b4c0f7152b142afff82a2ee21f
+MISC metadata.xml 487 BLAKE2B cd1893cf7aac66ba03474447550655309b4e0be7b46b2f96b57c053c6a8373acf8446b5200d35abb34d95d0756121b10670b6889cd52ac5498cef6869c56c98e SHA512 ad911309ac57a83d25b3a0d38150ef9175835e930fcea5d4a7340c576da101fdbd1a9a0b64e74624eb3ce68249c6cfb06b1f1665e0f3daabda5a3531c71aa906
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index 624e6919569a..15279e67f6c7 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 7a955850eaab..124cc7100e10 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
 EBUILD sphinx-panels-0.5.2.ebuild 687 BLAKE2B 299300167bf675d0c93afd131180eb8828831f349c9dff260277108d456ce55b2d1fcea21b2a5d9883e68e4e4a53bc4d2717334d2c62aa4ca8c22d8932cdc54a SHA512 845224a377c62fef4b30a551beddfd02e0db89eb9d09c5de15f149a764d3c499b402ce01aa31bea63c42afef1c2280fd9df342ffae2f8774bb4fe527e6868ce1
-MISC metadata.xml 475 BLAKE2B e4090a3e1358a4464858c23b69b613bb14a89bc25481767e24ffa431b54f14f81947ac91b4f1d0cec68b2ad5cc0b5e21e84d9a8a76a4fce57715320d159dcc19 SHA512 56a46b41fd68bf6b7b6cedf2f36a3e4d75753ab511210fafed4548b8b4cfb0bbd0a5f52dad0324bbe86d5d075b88335f11f59e8a47883e4d000392b1973d0457
+MISC metadata.xml 505 BLAKE2B e7c326c2e4cebd6cd8aff0b4dd4dfeb449b0f3ad2f08ed904e821273f378bdcf6068696a191f2aa133fbe1329bc2ef2d9c5a594db5dcb0f6c53ffb49e3800961 SHA512 2e97196e48784d3cf4fd569c635a413a344941ef3bc8ab3f199992831737f067971e47c3485b0251e450825efe8180ea62f419590ff19a0da35a1a2d8d09afc3
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index dee113881a32..0082b334b6a4 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 5f88cf781caf..17a35a581b4e 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,8 +1,6 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
-DIST Sphinx-3.4.3.tar.gz 5997116 BLAKE2B 73a488564d5889bfc6d7f6f797aa3b144b03cf5f086a4543c3f4b2a452b353f4d799b80a14a0d4118e227660b7f9367fe8f3a2e91f6127cdca489cf4fad215f3 SHA512 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
 DIST Sphinx-3.5.1.tar.gz 5905170 BLAKE2B f374a65d66f404b2a7486c58a0e13e228e0de88985fed18cfa74e8219759af6afb1bb05cc10b6a8ed8ad7b413889b7282de7212010fe6d3bd30ce04fe9b59b9a SHA512 31a9253e30d5616c99161455fb61ab3b8298b5364d5eeb5c7b23466182913c99fea4cec14d088b6b64a530cbfb60d691ad093a6f6a0f9060f847f0b73d5e6b3f
 DIST Sphinx-3.5.2.tar.gz 5907358 BLAKE2B 59b2789d7f3cc34622f34c54b5d614be7fa22d9d61cbb6c096ac7efe8f011331f51af12986d505245a30c9583050ae8c012ac736cd8ff5234f528616999dc325 SHA512 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9
-EBUILD sphinx-3.4.3.ebuild 4228 BLAKE2B 03956198ff8572f45558478db5d23e045c52ea99c6cc30344b9d9db119fb495b8948da092a922857c2089e388bdb7ddf5f2ced2dd4c3c865dad63779271743d1 SHA512 853b855364f0559bf63e8342d91a3dda21aa04d67c349108f86522a8968602b61e9a60fa6262a7af1e18ac50bdfcdb4e8283fac384c879eb087ff15998569cae
-EBUILD sphinx-3.5.1.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
+EBUILD sphinx-3.5.1.ebuild 4181 BLAKE2B cc76d605fe48b58a6b38c18dbaf9cd8f1947add66f8e799765ceff4a856235f69cecd5b46e24b0398064e853565e7de1bd3de8b7e0ad29a0b67ad130388ce162 SHA512 b926f1581cea0085e5cbbd52c2d6e1bfd4fd96af85a2bbfcf4241f338614d04cb2cb955e5bed7d19a0afea6accaddf2eb62c656026d30d84c82e839caf835c09
 EBUILD sphinx-3.5.2.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-3.4.3.ebuild b/dev-python/sphinx/sphinx-3.4.3.ebuild
deleted file mode 100644
index 0084df7a7d29..000000000000
--- a/dev-python/sphinx/sphinx-3.4.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		${RDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-)
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_build_latex.py::test_latex_images
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment_py36
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-3.5.1.ebuild b/dev-python/sphinx/sphinx-3.5.1.ebuild
index 86421550c2b5..e2e6c8771f8a 100644
--- a/dev-python/sphinx/sphinx-3.5.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index e078e42a1ed7..c134b1a6f00a 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,3 @@
 DIST {PN}-v1.0.0.tar.gz 9793 BLAKE2B 07b99851b264dc913e4774217e43692fa72d4f654cb8e3159f919952a25125de99a6118e422b36ae3661024adee2b34f94e45d9a1b801ea80936f23cc65bb861 SHA512 d50eddcf76bd5dd6f35b5891c96c0df2c7646c06603be6c526035ea2ed886b62dd8919749cef9b29ece0584e8a5e24a02d6f5e711dc20c2eadd76c020029292b
-EBUILD sphinx_lv2_theme-1.0.0.ebuild 560 BLAKE2B 89fb24af11e88e41fa49ccee7032ea7f711ecead4d02599993c132869e28a92288bbef550f530fc2b294710de55039a295fc568e8368e47fee6b53f3855bd9ee SHA512 821c63187f249f508afdffa747795f0dd0ffb0271bccdf3c542522c0f305ffdc1f926799cc4b794ee60c66ca1a8ce559f7a4facc2c5d0839d43d647dbdd4c984
-MISC metadata.xml 428 BLAKE2B 26d3ff896e1e61ee7096f56048ada2ea17e8d9f232006816f555a5bc174bcb9ffc592eaff6c2bd6324465cdbc24039b5e373db3014af61f48bd2d6a97c738d38 SHA512 3f0582cc9ee9fe891ffbde6f43f00dd1b625eb442b5974c10d7364dee5b89ba1596ee5bcbc41dc6ee7c550498b8124c5f7c9cb86f3b7636c42eb5e89e4891a6a
+EBUILD sphinx_lv2_theme-1.0.0.ebuild 554 BLAKE2B d6ad7c493292737f33cae07e58a6c4108d2f6585c7dd861c240a21c05c4e3fddac600386194baad342f97583d2112ed003a472f46afa736191237c65e784a0df SHA512 ee4d14ad1fb46ec4f95cbacc549ec9465998a01ae4877de5181e370145be3efdb562513f0a2b5f70ccd7d32e0d4c1fcde3b9e1b3cc2046e10602d72ec33cddc6
+MISC metadata.xml 428 BLAKE2B 44682c327177ec1dd09978a294329e8a23e25dbc5b382d802e5cec4a281b4345d147b6348ee6d2008d9e8b9463b35c0c3feff62f3c5d4c6083618fda5a7f8629 SHA512 df698193da79c7d54795ffc35f22c043b7144b62f833d50dc3f1403cc878954fdf294ec2668d2e6750ff4baf0043ab81bef28e927abbfd61bfc252625b8e8e3e
diff --git a/dev-python/sphinx_lv2_theme/metadata.xml b/dev-python/sphinx_lv2_theme/metadata.xml
index 6722854369a6..3fe2815ecb1e 100644
--- a/dev-python/sphinx_lv2_theme/metadata.xml
+++ b/dev-python/sphinx_lv2_theme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
index df6c7200619d..3a5a72a53681 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/{PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}/${PN}-v${PV}-${COMMIT}"
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index c0405c4ef909..38b100634a3c 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
 EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1049 BLAKE2B a6f1ba2f618695bda48b65521c75213e90636408ab2b9aae083ebdcf8974f4425031041d2119e5f0ee4aad6763c0761596d051ca4427330179f8b353287185e6 SHA512 9f6226ba54d70f0eb93af8ec4b6c5fc141b8ef8a85e6542551781c558b25dddee385455eab7c8a62b5d738c0d470ed5313a9ab31d0789542baf2aa0e4cb101c8
-MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
+MISC metadata.xml 372 BLAKE2B 68f844dbb9c910e8df3e4efa74b074a01c6f0f1e0bde6a13f4e98303d917a3f49769f0b49be53e2c76429a3f3648a29f59de17d5ce3661aa24802fdc74a40d48 SHA512 f67668ca0e50834df86b7467d793c197dec76691efd10f3ceaa8fcfebd965c67351207e496c21e3f5acdcf0ebf474cd52d329ce9d05a9b8508397b5186ee885e
diff --git a/dev-python/sphinxcontrib-asyncio/metadata.xml b/dev-python/sphinxcontrib-asyncio/metadata.xml
index be0d1e129d10..63e4458e8c25 100644
--- a/dev-python/sphinxcontrib-asyncio/metadata.xml
+++ b/dev-python/sphinxcontrib-asyncio/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index 230f647023d3..b39eff26babd 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -2,4 +2,4 @@ DIST sphinxcontrib-bibtex-2.0.0.tar.gz 135555 BLAKE2B 8a542ff7895a89a8dbf6b8ed1d
 DIST sphinxcontrib-bibtex-2.2.0.tar.gz 96027 BLAKE2B 77ca45e36f1730fa6992cfe41763a34e2a0bcdc99c520412591be3c219dcb7a8af240cc74d08c260548475b88b6cfba24b82e7bad2ab21b24c0e9cb62590792a SHA512 fa78d35f04825f841f757e2708d0ebbd3617a7bf20a893249eaee7e435ff2880ffc8bd23608356904ce41fc11d7fd49bab20f3da501d4a217593c52d99caebaa
 EBUILD sphinxcontrib-bibtex-2.0.0.ebuild 717 BLAKE2B 68a5f0e8ff7ad027deab9d1c265b4368969891ff7a04f0afcb7d914d69afa6ce9cd225ab7f473cec0d054193bb30e9cb5afd5d12fce04a2bcc879166dbf90c5f SHA512 d6a3b48beac66e0d5ec41dfb7d0a84bf2117588043680785a2164ac7a4433b1a0d63c9a09a457ea7298cd0babbd050910fd2811cb4e46f5c7c1f4562ea3e8836
 EBUILD sphinxcontrib-bibtex-2.2.0.ebuild 792 BLAKE2B 0e3002f9741dfc7343d49bfe75fe2d8683ba5f1d7b3ff3a001c5fea45289c8c23f51925ab51bb6879ed88b3c6ab968ce9870168979f25336683291c6dd47a3a2 SHA512 7cd7b81c93902735eec977b1d815c9ba04f10cbb35b5ec40a9e75d5d248c9ac440700f5bd5289662cfea241a0a1aa1c272ebc2385bf41548cabc600b6e7729ae
-MISC metadata.xml 530 BLAKE2B f1d70822ed84bb0da1bc7702416f944107b1d7812c853b5e4973d5c28c9722051860f0979f8f19abc23ec555cab46c046bb2264a1ad3ec6b4f422ae4b5408471 SHA512 c4bc4d4e3699247b24d4ad57cd88c1688bb46348c7b989b631b46d2313a0da380856e08bb311a39bad5fbce06680bff8753cf989a76691cc09092fc644db4574
+MISC metadata.xml 560 BLAKE2B f58275cf099cd6d49fa993bf8142870a5e41d4d6f73245b705bb66f318234d631245ec6b4d9141267fe402786ac8fafef016303dd4fa20c1d81d850844483225 SHA512 996c69a3e10055cf523dc85cbd454cc4e72a3cde94482aa9fbfdabfb718fff2709cc55c9076a6432e3029dea70c1e3faa674aead6eacb4c94264a4654104c93c
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
index 786ba057ec12..9190fb38ebae 100644
--- a/dev-python/sphinxcontrib-bibtex/metadata.xml
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/sphinxcontrib-httpexample/Manifest b/dev-python/sphinxcontrib-httpexample/Manifest
index 4ef68b4c1089..4fd305aa27df 100644
--- a/dev-python/sphinxcontrib-httpexample/Manifest
+++ b/dev-python/sphinxcontrib-httpexample/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-httpexample-0.10.3.tar.gz 30489 BLAKE2B 1100f28398d0d23559fb7ebea8263be5da6f2db09e9d5f48513d80d2cd580d2ff436df84b532eba8fb0c30eb3787a86f57f75750aeb0857b52af09885ba9a124 SHA512 de776f20e566a5b2ec4fcbad82d2ac39988ccf651a14d38d353dfd9cda7c15289acbb41db56df9189e42c2637bfd70fd4915d19d4ee718ddd4de476ddc34151f
 EBUILD sphinxcontrib-httpexample-0.10.3.ebuild 1113 BLAKE2B 068149c9c2adf5c30b27d6ac50c84251f6f1919c9c7e271016b0086515012afa035d6f6d82d64b412b0fd89433c93da17e94b0585f9b5e08ba4fe1ff4c00e670 SHA512 ff5a379c2120dce16b75da95ebb34b9b83d87daaa790d8dcb554840675405fed01702b028f8189d55537b32bc1587fcdd3ebcecf1772b601682ee59a94a9f786
-MISC metadata.xml 558 BLAKE2B 25a799d590b3d33831b946ff993c3dd8e6592dc67511179cef8f972cd06180d3ebe957a804ad476c7502e0304aa922a1d3532d397c387b2f76b4d4eb74cb6feb SHA512 a47c281c7e4fe5da43e0b197e330f628e2ee1bb85c05d8e1921f7c41d3b4bbcead1870d9168dca3d9f7b4c56806de6aded564463adf9366349670ec4ef072557
+MISC metadata.xml 572 BLAKE2B e258706460b5c450fa8c6fdb53a61493908b5ebe62e3dc12ab5f7bfabb54f45291d96775ef20aebc939dfc1a50323656bfe29a5cf7c8c88224ab132fd7a84ea7 SHA512 d315b222f0ca2763944cff5c35ffa29f227dafc2178753ec65e7386f7fb4d2d84f9d72aeda90ce737bb58ba524196e3c9935acc5de7650137aec3a38f91a659a
diff --git a/dev-python/sphinxcontrib-httpexample/metadata.xml b/dev-python/sphinxcontrib-httpexample/metadata.xml
index d1cf45af9cef..c9535ea9d40b 100644
--- a/dev-python/sphinxcontrib-httpexample/metadata.xml
+++ b/dev-python/sphinxcontrib-httpexample/metadata.xml
@@ -9,7 +9,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index ab1d22b9021b..13ac6c534e6c 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-programoutput-0.16.tar.gz 23714 BLAKE2B 1e5136faa89a2f303008fb0e24f99f544464d30f5c0c072db4e2e25cb30bfc3cd4af6157f6c8dc7ddfaffd8f6587435c5947b6981c34daf2d6029736fdc22870 SHA512 6003b8ce43ed468b01f6bda02c6f58c0518b38c43a75f1ed0869dd8df2ee215310246b7feeba90f213547644c1bdb0164cf1f44f44879ac054dcbd6d6f48a69e
 EBUILD sphinxcontrib-programoutput-0.16.ebuild 813 BLAKE2B 205d7daa5d9a412c84fe21dc932b03af9e9e9dde260801cd79ff071465ff43c0dc4cf67ad031310ab0d8f633f1a167cbb35e94a0580f103a5b98e979f15ed6ec SHA512 3f9339e16ca995b5a2d48af75f8a1f284978e0e0cae1f44035c25a5608aa0a9e15d637bd59f6303172c2f2390e3aa29d64583ee5fd2e29e02f022719d75f951b
-MISC metadata.xml 1326 BLAKE2B 0964e588730512016b32f10f2d78f13944b82f70681f532d0573939a564b0175bcfd740dc867e9f9dbf1cbb6229d4a318f056887fdc419e5e072d871d4b1f994 SHA512 a1dcd016a6e38dabf5530628e5c4624af094e11efd0b582ac2c01f1960d22e7fee1c2b5105ef1299f8a6c4708885bb34d2c4a68f7fb946fe15ab7615994c9389
+MISC metadata.xml 1356 BLAKE2B 26ce7a37f737618f8788ee73f94f25cdbf5063044ac9014235f907932184168912a75c4c9f08cdace99522b2d8f157bbce8da79c7e3a55953d4692716c738849 SHA512 1f950132a2e93fe93bebcec0146fd343548b2ceb2f4d2cb99ac4e4afe428282e81b87ebdec77ae8191d51f35385ada447939a9d92f0b8e3c36af1b4fab0cedd2
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index 1c808e6aef1a..b457485a4f7b 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -5,11 +5,11 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>lssndrbarbieri@gmail.com</email>
     <name>Alessandro Barbieri</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 530e25987274..1b0b45ad1a83 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,5 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
-DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 EBUILD spyder-kernels-1.10.0.ebuild 1236 BLAKE2B 7c1d4a27dc1538e24f72139f4e28324c6abfc995395da615b37db9eaba7e62db6366c990fa954093213c8109460669411b9f0c0dcb29351339aa6226e1df1b3c SHA512 de0cbc3b385b2e785d9e33a835ce700008b1f61ef1373bdcca5412ccd5b9cbbb5670960b1b5c996a7019ad194a55217b4d74200e19d3eb8cf0bda24883284fb8
-EBUILD spyder-kernels-1.10.1.ebuild 1340 BLAKE2B c86fa76fe0f0043f4d8bfb1bdab61fa52e598c9b33a7135aa9dda56fb1b7f467c0b313cecf508e7ae1fc3a85cdebfcd4c08a17416f171f14c81dfd3a0a00cfe6 SHA512 98892df16bc92e9346cd5457ddebf057713a463b176a7e4dea25929740dd1460f0c22125d1d2d1a2e0cbe3d733dee3d5bf63d561790700747f3a601c8c247363
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
-MISC metadata.xml 642 BLAKE2B 4d1ec2e5bdbe47e459f37b32953c64c302bcf82e3aa97c8d166c17f6f2bacc4382ed5e74606487e09f2db30230bf90162191aab58f2b8aad3431d3cbfb56339f SHA512 567aaede7b3c5ae9a0dfdfb80f742fa41a96576e48498729b3dcf2366daccd9f9f2bcf3417485aacbfba9bd4fd3cefc59b0126dfc885179413ee194dea0d2cbf
+MISC metadata.xml 672 BLAKE2B 716551e2444afe3cbee3dc5c1fa2af4e684f2a7f5db7e6aa955c4de2c36d2738eb99188fee11baf5dd8d458fcca9d1ba38742efb9570963882f03f523946e155 SHA512 0c7054d766fdc2773ae2aac9f19b14a9b1b7e0052af435e0cabba2cb24784e1aba77cdcc071cedbb3a5d981b1f9314cf868e99efaf13530191934311c723b80d
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index 5edfa984aa8a..71a1ecbef09a 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <upstream>
     <remote-id type="pypi">spyder-kernels</remote-id>
     <remote-id type="github">spyder-ide/spyder-kernels</remote-id>
   </upstream>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
deleted file mode 100644
index 59557f004734..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-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/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# requires dask[distributed] while we last-rited distributed
-	sed -i -e 's:test_dask_multiprocessing:_&:' \
-				spyder_kernels/console/tests/test_console_kernel.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
index 5f66f8f781cb..8a7d6b0db1bf 100644
--- a/dev-python/spyder-line-profiler/Manifest
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-line-profiler-0.2.1.tar.gz 71109 BLAKE2B f16a5ac743b91a441b23b497a5aa8d1ede2f458a2de3e92d91c2f3af32621b07efa0fbf6646929a28c085117006044c8bf34f911c57bc221c12b1a71b949440e SHA512 2e6cdd8fe5387c8c229fdc503937cab3a30b72d2eb2a23a14de49584d317a1ed89eb76ebffbf03aed7a8aa5a183677c316814d50c73e79c6175da6a46e5937fb
 EBUILD spyder-line-profiler-0.2.1.ebuild 761 BLAKE2B 09f9c98f25290f1502d7deb585b845f65da7d3ecde21459ba23bd850be63032f6ea16ce102ee326bb1900efb1a1193163fca0d7ed61641e613a723c0871234e2 SHA512 1f14b9e93aea7cc1d59557bd047081fcb6cc8a0a6e10c3106b65d73221efaf6c6ab9ebcbb8b7dfab2c98097bbc850f19e90c77d0bb5c52b1e427cca0de159179
-MISC metadata.xml 458 BLAKE2B b7a3249e9cfe8ef12acbba3a833d6546930b31fade0ff8a175e87fa4f11c2f7c2cce9707a2a9e55e888c0819651827d2116d1082e0081a8aba0709e10de90d67 SHA512 83305aecd163aca55ccca7788d40fae38e3220bc99c824c4072c5fc1b7e2bce7e9ec984c4dbb745cfdde9d37238c27ba2971c74f95e8a49053c021dd84a79b99
+MISC metadata.xml 488 BLAKE2B 6fc1cd4d4e9a2416e49b13236f963ae757442840dcf8876e4cccfb4bac39e1d7daa8ead2f9ba8465d6586c16bd9218441ec4d61ae6a03c95db05b701151045a0 SHA512 a8463e7f2ec39a9c793d73f653edaea76dc708008930ec4745c80a6a1fce949a81d04058511f33f0ae3206c428e211ce04f476cfc9811e876e4930e3c4dd545e
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
index 51c57d3fb52c..29129b7b5d63 100644
--- a/dev-python/spyder-line-profiler/metadata.xml
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder-memory-profiler/Manifest b/dev-python/spyder-memory-profiler/Manifest
index 18e748ca8326..6313525e4a51 100644
--- a/dev-python/spyder-memory-profiler/Manifest
+++ b/dev-python/spyder-memory-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-memory-profiler-0.2.1.tar.gz 16802 BLAKE2B a42bddaa1a470b1e23c203033daca9870d873a5160a9600f4e2932d30e15885fa63c90e334d0e92e7ad6d2ef380f022c94753d5fb24b451259f11f44803c390d SHA512 14eb5ea0e5a87cbdce6dc4bbcdd7e3a4f3dec566955431173ade068e1b110f5282fefc960d94351bdf76be125f099414c6e3b776ac4288065139e222c43a30d9
 EBUILD spyder-memory-profiler-0.2.1.ebuild 769 BLAKE2B e86fe75db0e08a151aa1e00058a8c81b13c67cfcd55eb64861e784b15b39b95b5479df9f9e44e48155f2a2f7d6dbc34373f687fd9da444611e6b88d2bbf2b7df SHA512 47f54d78a83bc0ce969a1a4237fab8945d1d5bd724cb5ae496c6b03f2f22eba20a876c33dc4af3608ba199e46d4a921e038aaaa0d9c903f308789fa77828bfc3
-MISC metadata.xml 460 BLAKE2B 4b8c789517136daa9eaf1d68f68d176ede3b51c6d731f2aed379eec0a2e7fab22a151eaeedeecde69021ed44c06784a5629beb53e12dc3c714519e24dc595ca4 SHA512 8d8edc1b46a3d6c72a0cdba477a419f846803ee29ecf5f61d9629b702b430cf3c54dba4164dc3ab005ff188cb9083a83d6f3987f022f84f03041f47f0b17de77
+MISC metadata.xml 490 BLAKE2B 5a890386b8d1aac8ac956f95c5d3f57a9ae86b3e4a287c21dd7c1ffd874b4bf3e32f61f59e363f09bcd1fa7acc96fdaf23f9d1ef8e96ac89ba77f1513b7c290f SHA512 db58d004f143d52a42c83ab7d3637fdd178f1bb5f634af1526c962ec46007d4668f07ce8da68545e98fc3cb0d6173420514007c77f2a365f7ffba752066fef66
diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
index 8d57702fe441..89aa9aaae139 100644
--- a/dev-python/spyder-memory-profiler/metadata.xml
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 711e6bc75295..44fd91f7b004 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
 EBUILD spyder-notebook-0.3.2.ebuild 1186 BLAKE2B 32f1258e3ac562a125d77845a8d3c1b84a84a1e822afcb2e4ad4f6ba299f16048569b02d7b6850328711dcb048385b0884f3f46c99dabbe610399d74da48630b SHA512 087edafae14b540b348586aa98285ccded49cf0a9d5946459c4eb9f0cd20488c6d8adb83fca5c2c7f72ff2a1240fe2aa80cc347cf6715abaf51bd52d743d4d3b
-MISC metadata.xml 453 BLAKE2B 85e86a15f42d0ef745aa417ae51f95725c8dc9b609ab55549a39dd0dc1ab5e8c48637e792b0d848c7a00b9cd2115987ce08b1871c2ffcaeceb44508c85ff0a71 SHA512 1017abac649d9a726fea8d22317c0c1dda117ca605bed467907ac4e0600888a9b9debc1ce2b5cd09542a734de3e4313e01c71b8b8b9bc498a95b04bc76a740a0
+MISC metadata.xml 483 BLAKE2B d53af858b227855ed342db4f61ae964280654043d6286994417d7846bd1faeba85ba99ce098704791b3175ac6a03dec03f850e064d2b526a0c00bd5c3d1ff977 SHA512 be6452b081e7adee4ffba760f9b96841b732ddce90a89951fb281038e0b84fcb9eb4e25244a6fa4a1ae1e514dcd3777465a31ae9d6c7970cf68a1dd79e778edc
diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
index 21d0219b1ff0..1c70028ab8b1 100644
--- a/dev-python/spyder-notebook/metadata.xml
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index c07f900952fa..4bae42f66f26 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-0.5.0.tar.gz 10070777 BLAKE2B 2b556597b62e822a94102c393818c9b479292f1e9b61fb70a48f9627bc5ccd493eeb5624406cbb205970a2b1613bb47310d92a969cf190dee296e34daafb7c2e SHA512 8a73a46adbd628a80a8a7c8f9f50c8ed4a00c64adbb6f0934a32840397f9a5840f516380728abe1e31b659415e82bd38d1a5418bae43229b61e4e6340fc8c19b
 EBUILD spyder-terminal-0.5.0.ebuild 599 BLAKE2B 460124563b849eb3f079663c0d7562325f2845011f960e34b17f21e6e852a2b66e478cc3b6cd0c935860cb77fcf5e7ce08783633851084234d3635f24d4589dc SHA512 b36bf553d304a4e8ddfc685baec76968c29478ffeb51fdd3f26fdf6259157a99eff67f8884c94b7b7d7e88ab0a147d9a81e51f992c41554cf5385fc843da6be6
-MISC metadata.xml 453 BLAKE2B 37c06884098780e2ee05bf9f84776cd3e71f8abe03c951102bbb782281fc88b0618e26546f4ba066e7c654d6d75a3157bc28fba8d00ba0063f5885307835413d SHA512 f5ac37e29ccb15dc741faadc36f0e4485defb4fdc2e79ea48d1bb754e7a1681b1f4b2e8e55ef098961359200c9f686091c5d352e195079dc6ca864177293bd51
+MISC metadata.xml 483 BLAKE2B b786251e4884a81701556bcae78ffd9ad496c0f155ed7fb1ab3d69b36701fcf192a7a45924da5cde428dcc1c74f8a0fdbd6813de686a0f874ae44124a4ea2d66 SHA512 92c04d74fa5d86a39b04e95d77e5c9a3fdfa5c6f26682e4d07c613a57af320ebc0ccace92a7f0898aad1e35a1a9f821d58d4e0b2fcf6364015506fe434b82a82
diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
index 07953662c9cf..2e544ceb6ba4 100644
--- a/dev-python/spyder-terminal/metadata.xml
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 1f624f695145..4a55abeaaf07 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
 EBUILD spyder-unittest-0.4.1.ebuild 1085 BLAKE2B 47c1234f68356d866e4bbeff0ec49bf59d0084cc0350f2ca2ecb508b18d25f64a228efb0be41d670eff0987c2bc338a1eb6b99835394d81ee091fc812b2b1caa SHA512 7d802ac4dbf44408a6e27792ae7a5532bdc869ee27e9ab177790a1a0af4fc9d750c87a6d4ab5a9db52910c8f3b0f270fb6e58f46338cce7fdb0794121724fe0c
-MISC metadata.xml 453 BLAKE2B 8a1d0ddd42d8b61a4c63659327f2239f788aec9fa80ed7ee8cb33c43019ce0dd9a4c688b6389aecc07528104df374900a417add5d75b84fea39a59617d4fd9e3 SHA512 4cc16c845c341876b8ca84e6fa636e14782424167dff8e8d49822d9aba1012d25abd32a35f3732c56fb85455cfc7fa75292cf6999b67b2b147e07c0751cbf3e8
+MISC metadata.xml 483 BLAKE2B 9df64e65ed7d3042d80546b087e2aec81444449de8450331e4288e9864d7a0e0a00c3b53ba52df207158e2ec8ef8030b44b42225fca5dbe5639542cce562f798 SHA512 ac7438bf6531f7e605983ad4450eed123c16e90e6fb02caa24bf7a6350d48ee8f8b39205717bba5fe96dcbbf0ce617a4ef003e4579e55880d80f31ef3506ea02
diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
index 52de5cb4741c..4ccb533c1b89 100644
--- a/dev-python/spyder-unittest/metadata.xml
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index 2e8bf6fd5a59..4812e0a0c33b 100644
--- a/dev-python/spyder-vim/Manifest
+++ b/dev-python/spyder-vim/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-vim-0_pre20201026.tar.gz 293554 BLAKE2B 1ee4122e5a149d029d67f93acabacf81af47b2a7d9902ef2c3a5bc289e5c532c8b2f15ce59cb0b8bb16eb6b3ea461c3ce44ff85f6f8d022cea5e5b482987a8fc SHA512 98b479b4ab2be5e1cbe730e1d4441c5d557d32ad7caee31ed2e6c936d97554ca50f3f0b0d2cef68be7742653946d3c87a01938479664de4066e22b13441c58fa
 EBUILD spyder-vim-0_pre20201026.ebuild 804 BLAKE2B 821e92cd04d791f41e2b04559f87028a6e7e4d8c3dcfbeb23c19b39c73e55b2e4f4bd4d73d81b9e7ab9d32e81520669b8580bf2f91c5780b339bbd5f04d20363 SHA512 b7259a999e3e1b1d6e25212ae940118a82d013f1e390036dbcafe591846a4cf9047c9b9d523a2527d6f33e16cc8fc5d426c9d2399e33aa94bb36b83db5341185
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 405 BLAKE2B b99c289771000b60c9ef3eab911cf0ce49e8fff16b7f46fab23ae9a956c3ab3c96a861aa9fb7df08f6c06bac5196f16de55aab5d470150cbe8192949e393b1e3 SHA512 6b36b9af9c1e5466d0c87d9ca0771ab45e5efe0e2b763908fdab2b6f13f276c89120889e535ae2cd94230e70174512fb814791257b4fe60b5f7d59bedf188731
diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml
index 8fc11184ab00..fd05ebfdeec8 100644
--- a/dev-python/spyder-vim/metadata.xml
+++ b/dev-python/spyder-vim/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index b9c3aaf6c150..4915b165656a 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -2,11 +2,9 @@ AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0a
 AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
 AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f730f4758f03b97688d3ecf5709e8c7b37af82746452520c2f3135722b4e387f3ef9d9219e1d159b8abe937d8165f SHA512 052f249b5f6b2195a472750f42b16721de9e8020481cb57bb5e180267507df6f6b5f1a36b8a45f28b64d098c8a02a4814c1c03f1efdcd1ffedaca77a28ad8705
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
-DIST spyder-4.2.1.tar.gz 12156626 BLAKE2B 4a009c8b2ebe1b71bb60c568d5e6a3d7616fba7f9988669e97a2454b6369421a8603495271ad4c275cae9ad7207f2666b28ecccb121b4cc5554a3d1a863a1579 SHA512 56975e851a05dd023d851adaff8e9a747f9b1aa626db8ce65f805e41c5c47dba017332e81bf9efaae65671e06bc7632a519def286568a8ed2f48b41aa285de62
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
 EBUILD spyder-4.2.0.ebuild 8406 BLAKE2B e634bfeccb37da403424636e1c1425ab375bbadcf34da1c9ef3b3a250fc8675a0b213259176025b7565d899bb56af260dfb2e761c07b5ba16112b1b3783afd35 SHA512 c190334f7bf444d8872207de4021422395ebb5accbb4273d17b88c29811fc45c71bd72f1a3a069659825ae3dda645b8f179bfbc7c9613020733ead734619dafe
-EBUILD spyder-4.2.1.ebuild 9232 BLAKE2B 661fce13032a96659195fc27082a872f4fe191ecec5ce6f13881eb6b5972ef85d4a490ea79e3ced696e6d84b32a3732f50d914d7222f4db6c391f77e318ffb0d SHA512 20426a6f6b5d3da3fefd7bff488c8362c2cdc432f06b25e76b248f58bd182551c4b95bd684d41597e05006590ec44756ced930680eb76c6837971b834b000224
 EBUILD spyder-4.2.3.ebuild 9616 BLAKE2B f19fe1a411bf3ed4ebebb4faa790933f1310401e97b7d3c0195cb8bd8eedc0dfd7eabeeded4bd94439cc310c9fab82c22f921b6ede55f51161f555f5c1675103 SHA512 676b5feca5dd1eb03e4f8326c027bad7abd21ab52d887d3a396afa49cad7ccf57c3f6e040820e51053f328f0d10486609f79d3e54230111bfd16387b6e4b7a3c
-MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
+MISC metadata.xml 1443 BLAKE2B fecb827811cbb6672fd0ee1bce862d8c76282ee07c9ac2874041749f13085ce0257712bbcabc853be4d70568fd9f45c5b7279a7d3f5a3afa85c73fbd5ba89400 SHA512 3b86d1796df6f421f93526e8cd3aa95b104620e2620216fcd2f5f3b517f7601dcff7afb1d16bcd5803db6c77698039f64e46bfbd27e680323304dc0f61f20681
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 47504714a176..a2a17e0cfeaa 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/spyder/spyder-4.2.1.ebuild b/dev-python/spyder/spyder-4.2.1.ebuild
deleted file mode 100644
index 858a74eb4022..000000000000
--- a/dev-python/spyder/spyder-4.2.1.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
-
-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-util/cookiecutter[${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-language-server-0.36.2[${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.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.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/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.10.1[${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}]
-"
-
-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
-
-	# 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
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		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 63b8cc8c326b..496b58737b76 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,9 +4,15 @@ DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc00326295
 DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753
 DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887
 DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1f8abad23aa26c74e2a9a2172bee5a6411b2be95bff0f1c6e39d3a0de0839adc6b43f4cde597a18d4cf930e4c37b11e SHA512 dcd1a0878fd58ee49691bb7e8a2571cb40cc942380a4fe0e66d3abb1723830f178e7b3944c5c2d69bd3aaff04cd2ca171bbabbe34f59f54bcf4b9ee2782f9570
+DIST SQLAlchemy-1.4.0.tar.gz 7440276 BLAKE2B dce64f2a5fe2b67be2a6d79680a774603005773ce93d0a03e6180b9bf7f3105a8b3bca88a2b4a3bcf15305a8271fc45a2bf22d9776ffa49c2d03c586095e7174 SHA512 03d66e96f3a1358b5e68e49ec47c3cfbd6daff86505d4dd7e9f65967f8566f1a55fa4b896dd95109e0c4dbd2684579e12c35bdeb7076d6c06af683b55736cd9e
+DIST SQLAlchemy-1.4.1.tar.gz 7450731 BLAKE2B 9868347a3ccc3519fe31cfca41f318d0b0832aa301c7c91a073fd877f5c29289aa91008feb31096a62a939e70eded88ee21bfc586d09f68ebff4f48ef4e50c8e SHA512 8d2f84aa7edfec65a1f2286210c8728c39f1411da1b0cb6f60cf6345fc692646ae4f2a062b2e4b2f04fe9000678d682c939645f7affbe518821299ae129e8ea8
+DIST SQLAlchemy-1.4.2.tar.gz 7464092 BLAKE2B dd4cf617a66ed4eba54e41ebaead189409e09e434bdfe8e6f71e2fd4bd9ea574acef8feb42290a3fe80f602d2de2160b075633449b0b543e44b44f0fc7c867bc SHA512 b436576d6c72d0ec285b926f5741b6bdba14fa959248be1c4bdcc8b87dfc512653e48fb2d356ab85d0e90a374c48de5311f43f4f3ce6cb64876e1316c6169423
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 EBUILD sqlalchemy-1.3.22.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
 EBUILD sqlalchemy-1.3.23.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
+EBUILD sqlalchemy-1.4.0.ebuild 1544 BLAKE2B b2408ddb2e8f9a7dda967b386d226947da67fe625eee160b9de4ecf6f6f93f4cd26f661ce1cbd72d9e1de9f2bc98718534a4a5fd54546adfae3fd0d9d8887a70 SHA512 eb89a72a18f18f5608fe9f5d39f31fc5e62dfc3faf05deb2ba423f9411e3ed9883f59e2fc91b242ea59449bad862bd43b7b7db8a6bb34b66160b1e951cf74e10
+EBUILD sqlalchemy-1.4.1.ebuild 1544 BLAKE2B 9da523f66661de3d95aa92d2c01ad2f767bca2d92815f544fbccfe621fac0127caeeb4c8aa22364eaf54458660ae4e0a5a4c4c67ad23658959ab8308ff7f1a33 SHA512 0883f2712d6981a34b438801c942b23dc7aabd491747149eb365b735c4b68cb53d17a60f2b592da70513544c2c63ffc231bc801e9b2c24b20b420746881937b6
+EBUILD sqlalchemy-1.4.2.ebuild 1544 BLAKE2B 9da523f66661de3d95aa92d2c01ad2f767bca2d92815f544fbccfe621fac0127caeeb4c8aa22364eaf54458660ae4e0a5a4c4c67ad23658959ab8308ff7f1a33 SHA512 0883f2712d6981a34b438801c942b23dc7aabd491747149eb365b735c4b68cb53d17a60f2b592da70513544c2c63ffc231bc801e9b2c24b20b420746881937b6
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
new file mode 100644
index 000000000000..2c82efecc27e
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="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}]
+	' python3_7 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
+
+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/sqlalchemy/sqlalchemy-1.4.1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild
new file mode 100644
index 000000000000..f787e64a4497
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="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}]
+	' python3_7 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
+
+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/sqlalchemy/sqlalchemy-1.4.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
new file mode 100644
index 000000000000..f787e64a4497
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="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}]
+	' python3_7 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
+
+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/statsd/Manifest b/dev-python/statsd/Manifest
index d52f6528cf7d..315409d68e09 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
 EBUILD statsd-3.3.0.ebuild 504 BLAKE2B eea03f6b6f7066684351c303b2a0e48ae1d0fb3da33bf3bb16c26b6a9bcc94eea4b963664604e9642d755f887c098573b4dbfd30dcb090220acfd0ab0e228f38 SHA512 c04aa3af961134f69d864d23070ab377b38111f38ea55566d127d6176159eae86b76ecd53fc3890f7204db627095ee268bb51bf95386fd76d88577e6dc898bb3
-MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
+MISC metadata.xml 498 BLAKE2B 5b04a0ca7dbdadb6dcabca0314db852b0bd1bc5a9034af6d0ce278be50e6ae64f089f3735cf58b34446e03c7a3ece7af7d9526ef61c7d730b3a95b5670239dbe SHA512 6c083a1ff7255ab9f40c56358411f9bbcdffc52df95b928f518927e632fc4d892aaba03340b3fe9e0c7b7913d375f2d3fb3ddb2485f5f7a42c2dde23397c77cf
diff --git a/dev-python/statsd/metadata.xml b/dev-python/statsd/metadata.xml
index 548cee11e68a..509c3f5743fd 100644
--- a/dev-python/statsd/metadata.xml
+++ b/dev-python/statsd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 0973577d4a2e..0d4770bf79a3 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,10 +1,4 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
-DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
-DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f31310663c4dc6582421cd64a040e0b64917070aef5962515b07a8e92c0d690d43dea19d8ee9b71c7a3c2548e903e69125 SHA512 a9cbba0c8cd7e11bef4fbb303c204d5d4db4eb9f3f93f608b9be5b3c0d7feccc08dd84b4904557fbd1c12f49f3376b2aa7fabd06daf5649fd72c16b7041afac9
-DIST statsmodels-0.12.1.tar.gz 17392393 BLAKE2B 10443f3d4063c312a822fd18a062481300ca55e2ac93be41c3819619d0eafa1756ebaa79d941032ece20b9bfbf4567f0635718aa0a833556daba1aa748d60322 SHA512 43d1ab2261f740055bbed6ed5e885e39e0444d575aa3bce61a5dcd3737714138e9c2fc93c8caaba279883860dffc71f6fe75888ecdab8a736175863cfa00de2e
 DIST statsmodels-0.12.2.tar.gz 17470078 BLAKE2B 7b2a17fe350489888fd05d2275b597ec7cb0f32dcea97daa5c06a973fa53a7b3af40d494c735e30cd65deec9b5dd314c0513454a7c2d2c40e22fd6de3aeb40c8 SHA512 ae4872bc7300ef564407daa8b4076fd70fc180965622ed2173871579e063e2143e000540089923fe171dbb191b7dd872077d8ba6794fe23390331375ec7ce810
-EBUILD statsmodels-0.11.1.ebuild 2206 BLAKE2B 7dfec0250fa61ef241b786609fde70a031dd62b6661a37b28240bb3db1431ae3f6369d44c905f7a658248c31e4aac5a18bbe194846d066b4f40b608264dae513 SHA512 45ff4220ed6bb0e128d17058c98fd560eefdf4decc541770b0bf9a5adfed95558be3426c489af453371b17f6da15ca93c336c9fbf312c668385c903a757a0f1f
-EBUILD statsmodels-0.12.0.ebuild 2016 BLAKE2B 1843135cbd9b9feaa80523eb6383ee8458d4c364908bdf23270e564b7eaaaee3e637ab5cb6b8789bd946a9b9a31b0795cd5c2cfadc6cf69daf4a1508f686257f SHA512 a7000a68ef9954182b7b3d08064cfc15f66d4732ce9312398a6434db6c344a6e8c51bdf3669be24e0947cce15f6dad63f4da00a486938c51874e2afdf3b9737e
-EBUILD statsmodels-0.12.1.ebuild 2016 BLAKE2B 1843135cbd9b9feaa80523eb6383ee8458d4c364908bdf23270e564b7eaaaee3e637ab5cb6b8789bd946a9b9a31b0795cd5c2cfadc6cf69daf4a1508f686257f SHA512 a7000a68ef9954182b7b3d08064cfc15f66d4732ce9312398a6434db6c344a6e8c51bdf3669be24e0947cce15f6dad63f4da00a486938c51874e2afdf3b9737e
-EBUILD statsmodels-0.12.2.ebuild 2016 BLAKE2B 3dfa18391bc68db377c8df44353b418b6f8abde0a822418586e8660892f9cfdf2daee78678faf5dd93705cacec9e2e03ee706d3ab027ac572e035741a271e951 SHA512 5aec85f4407ffdbfdb37248f85c5bd480e82af7673a765c6db884d73f1043c67d2a21e91b5a4b68271cf9ba682ab57081716d4ddeff614278acd228ac36f9142
-MISC metadata.xml 1313 BLAKE2B 6ac22c4e2ee393a800f2c30b81f5343f8370e8cff1522ec96d95f0582d2d8ce8250b2c9a0120e2925f77c22cd516fcf4865e19982971ebbb653ba1df07815e38 SHA512 cfce7637265b19fc29fa537e591ff6ee348cfcd2d8b87463a1d2a04e549eb934bd66510d72f727f093c1babfe69ad6c6bcd590b159f77cd7d55d179c4722d4a2
+EBUILD statsmodels-0.12.2.ebuild 2015 BLAKE2B 5eaf681a369ac8ff514007caee37c4172e1861458f7cd6e26e8e99a72b433459c43f155e0b18662e4d6b24cfef699beb969e99a36a62256b58af687b66565c33 SHA512 e74f144154e59f885a4b88feda42683c7715b62e1c22607ed500d2471b51fdf2ba745a6d638c93c8859c723dce7cdf1f145d4a86f8e8e7b85dcefee7d96935db
+MISC metadata.xml 1343 BLAKE2B a08942814d2fd32d84c562d0d83b3e63dc2ff687808dc892a2871c0a07a100a5f379f61fd934aa3d1557d0dc899d08b57affb2e0ddb540726163166c6adddffa SHA512 6d76846584b1152e7e40e52a523157c0d99ee9addf92c2813dbe3e1886169f66cfb64b2532b24e76e4f128e12a19e147c3748716f1dbf28793118a73ad162200
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 714de8c3d6e6..3442a3af8360 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -9,11 +9,11 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@chymera.eu</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
deleted file mode 100644
index c480931abe36..000000000000
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/ipykernel' \
-	'dev-python/jupyter_client' \
-	'dev-python/matplotlib' \
-	'dev-python/nbconvert' \
-	'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
-	# these tests require internet
-	sed -i -e 's:test_results_on_the:_&:' \
-		statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${EPYTHON}" -c '
-import statsmodels
-statsmodels.test(extra_args=["-vv"], exit=True)' \
-		|| die "tests fail with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-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 "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
deleted file mode 100644
index 54a47e5b4697..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/ipykernel' \
-	'dev-python/jupyter_client' \
-	'dev-python/matplotlib' \
-	'dev-python/nbconvert' \
-	'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
-	# these tests require internet
-	sed -i -e 's:test_results_on_the:_&:' \
-		statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MKL_NUM_THREADS=1
-	local -x OMP_NUM_THREADS=1
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${EPYTHON}" -c "
-import statsmodels
-statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
-		|| die "tests fail with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-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 "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.1.ebuild b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
deleted file mode 100644
index 54a47e5b4697..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/ipykernel' \
-	'dev-python/jupyter_client' \
-	'dev-python/matplotlib' \
-	'dev-python/nbconvert' \
-	'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
-	# these tests require internet
-	sed -i -e 's:test_results_on_the:_&:' \
-		statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MKL_NUM_THREADS=1
-	local -x OMP_NUM_THREADS=1
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${EPYTHON}" -c "
-import statsmodels
-statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
-		|| die "tests fail with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-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 "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
index 1f96e8caebb7..d67ff026af47 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 02f00f1cfcbe..8c3f607c5a26 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -2,6 +2,6 @@ DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53f
 DIST stripe-2.55.2.tar.gz 215652 BLAKE2B 28bf455a202df7ff7529f932eda50ed4942e72ccf0453b7ff50bcc63c4f3d2177194d2dd6a95391cc5fe7a55c26abd5ba1225fc830ebd9d23a20ebffe2b82911 SHA512 9e14edf57e394837fdc4457bded274b45c309353488adf81a5fbea67ea4c3321392c5316c9a60dfe975110791672b8e7d1dc7ae14994a320c41b1efb7f75695b
 DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
 EBUILD stripe-2.46.0.ebuild 2027 BLAKE2B 1913565a4739d21feb214e075635a3b22dfaa6377912d9a765cdd701715abd5ae7a9ebf1554418c834d4fb47d58e4da770d4cb370dc910bc092bdefac6a9c70b SHA512 cc4364ae7196abbd62054fa4ad7ba84f6c59884c73b3e755a5c6c783edf396a38f5934aa5034a8347b0cb7963a8b651ee41c3ae1fda3ec96cfcc02d3bf080250
-EBUILD stripe-2.55.2.ebuild 2031 BLAKE2B c3c3353a3f119fa9c5887ba19e47125fd479e2e553bf4701d9111db7af66564e37ea1ed5d96120759ff662b479945bb3901643fafb1c278aa2af4349e4e0a79b SHA512 783a5a88a81570300f3c64d8383fa9b49a3c48cbde7a60c0cccf92e3644eff6a41469d1c88122c7bcfb82cbaac4688a19de6921dee097f695cf01305c8dcc7ef
+EBUILD stripe-2.55.2.ebuild 2030 BLAKE2B 3d66cbd7974690b6865e33a527b5fb662b7b9cf1877bac4c80979e16657fde3549f5c299b29f4839b9ebeb27d6305afea9e799e4e0f0197c70c6734f25100422 SHA512 4d9cf8b5569dcb7137ae6069197fb2868915beb01cac9628f2094be22ddde294bc9e050b3c1e3cea55aa1265feb8b0b46f1d569054948056bce860d656632b5c
 EBUILD stripe-2.56.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.55.2.ebuild b/dev-python/stripe/stripe-2.55.2.ebuild
index fcc7e8aeedc4..37fc6e6833d3 100644
--- a/dev-python/stripe/stripe-2.55.2.ebuild
+++ b/dev-python/stripe/stripe-2.55.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index bfb0cbf1caa8..df5862493f33 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -2,4 +2,4 @@ DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef
 DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
 EBUILD svg-path-4.0.2.ebuild 542 BLAKE2B 2d61a1161e367c5fd9bf347e83bd26d0664bfb34af2b53d0ecdf2e03f5bdcb03fee5472f6ca55efdf9ea3e18124a04e0ad0af432be59f5a40babf048ce933934 SHA512 f32492194196cf0fb440006de8451c181796a1818cd580d471be29164bee30c91a83ce53070968b8b6ce20eb49ec881ca78c77f939ea56c816a4dd36c01dba3f
 EBUILD svg-path-4.1.ebuild 468 BLAKE2B 01a11bf1cf711996d5df8e1e4ce7ada0b61680f72cbc89903ebe852506144a65b5d4c35ed6d7dcbf0098083d378d7b08bec765c897cbcda513dfedaf58eadebc SHA512 b4f03b107909e4b1c3715d674ca0623ed5b271887188e6681efc61074955e7a59f36635e50373c60b8cdbc02372983586d170d2fa9acf8f6d340d4c0bd855712
-MISC metadata.xml 806 BLAKE2B 16a56882cfc16d46821ede4ef988ed486c27ddacca9e9de6b57587e6e0eff073564449f6b33f041277f4191899d32a0bcf54519ebee4987b0871585d0ea5edfe SHA512 244bda2ddaea69616288a8b707d79129f3992e92ab3c7c4f6dd2c9e922ee411dca09b14b7519969bbaec540c83dc9e17617b1848b4f5e4c2f8344d0a3174356e
+MISC metadata.xml 836 BLAKE2B e42666d5dffaf97d7ed3e761f566b6cfbefb5bf7d3d163d9db956ecedcf29af50df3aea7ec01286e00d3b0c4180b5cb2a65e2a16869b7a2db7a68ac0bd53b332 SHA512 6a6daa93a77c1e7cd7c2f929fab5672433512aa8ad236e295689311b016447c8afe92d3445b82486957eb58ad3a611a4be9cdaf88d8a1c6e64ad65c8e36c3d8b
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index 6f2217ce87c8..7e64024dc695 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 0f2fc65be58e..7ea3706d0cd9 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,5 @@
 DIST symengine.py-0.6.1.tar.gz 112123 BLAKE2B 3b55ddd834c7401a5a211e5e20bafbea68b172738c6388e72b1e6a6e62719e19f28356fb6156caa6cfbad59d051de45c0e103a89d675e3453136cc85e638f327 SHA512 09f452757e3c99dc9d896a322a07d58f57af6d57a9eaa615b9f4f3d834cfc91f6a79de955a36ad94bc30c962365272ef0afe401570583af49c015295ccd7c4ed
+DIST symengine.py-0.7.0.tar.gz 107575 BLAKE2B f3651d8ee0dee83184871a25fa8535802efead1912684d309e6ab6b63ada53af94146ddcee3df8f87530063991a1d6463d2b14799bb9622606ae5eb37792938f SHA512 73df1c9c678127d3a17e2434ad326793ea00f6c6774301d1da372a8a33f733593e873d98866d31315f22430b427fa76d5f1270b6b308a7473d9877a75db3aca4
 EBUILD symengine-0.6.1-r1.ebuild 1174 BLAKE2B 5cd488162dda470b81f5f2600dc751969fb63ab1da2ecff9b71e91f2e854a255bbe0cad04173e3a50f75c2a2576c0e4154229821095b28ad0d8ea952c955ab14 SHA512 063be7cac53f6aa39516dfac4f028962f27d487942c0e9e1c135f8e275ab2365a57eef4a3f04dcfd110216f345c59ea2551a2f59d453a984c0e1dbfc9b3813b3
+EBUILD symengine-0.7.0.ebuild 994 BLAKE2B 918647a258b4fa1c7ef849cb4be9738285db2b4c3c0362a5805a6ccb70c1b9211b9c905e6c6fd8e476c46c2984e726ff41e50389cc51f37834d9bfb4e85a76ee SHA512 ab65aab548f97ffa35fbd04bc6b983a015293c5bd022153ea1316ecf6bcf647a044c2bfaeb663ae45c9d87ab949e522ba9de535c9c9cf2da00f91b40148d9e3a
 MISC metadata.xml 403 BLAKE2B e8b8f7b50836a7774a3f6326785fdafe1ca7e52086b163deaf97a76be9440858b56a88aaed86f05db71794e2b5999731205da73250f49e093935bd69346afb3a SHA512 5fa64eb4fc76db979dc3bfec18c47db689dd326ec682a0141aa001843b267cbe479c43acd9a0ef9d5725baab11b16873d9c2b85fd50e8527af2022e81da2f8e0
diff --git a/dev-python/symengine/symengine-0.7.0.ebuild b/dev-python/symengine/symengine-0.7.0.ebuild
new file mode 100644
index 000000000000..6de666c67a51
--- /dev/null
+++ b/dev-python/symengine/symengine-0.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=${PN}.py-${PV}
+DESCRIPTION="Python wrappers to the symengine C++ library"
+HOMEPAGE="https://github.com/symengine/symengine.py/"
+SRC_URI="
+	https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/cmake
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/symengine-0.6
+"
+
+distutils_enable_tests pytest
+
+# the C library installs the same docs
+DOCS=()
+
+src_prepare() {
+	default
+
+	# Don't install tests
+	> "${S}/symengine/tests/CMakeLists.txt" || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 3d8a051e42fb..ff049e1e293d 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
 EBUILD tappy-3.0.ebuild 838 BLAKE2B 27c52c052cf87c282a0cf324bef1c05a4ef94c05a133ee465f72c1b90475c58fc7190cd986c934b9e6ea699841969cf16126e404bee3587633f9a7703921147e SHA512 4692b625309ed790883d6f6d5ed359e1fb5b6c1993ecaa6af0ecb52d15a99304855bc57eea89fe51a8199c0f9a9607da481cf676c1b924c8f6da4658b19b2494
-MISC metadata.xml 490 BLAKE2B 153ff2aacd864fb1099440d2eb72f5bfcd21363d59f65cf14f5ce0ab8c77e7d3d5c83ad386173f20380fde707b704d8b16acfda67bd5949aaec9d5efba2c25f7 SHA512 5971f431b6f188cfdf8b4e3718e5f3ae85826e1a7d1c02bbb5b93475048a3ebecdca38840e082aa7fee18612a654192281db59f29dc66b47251407dc0dc5fa55
+MISC metadata.xml 490 BLAKE2B 532805af86d95cb00b5560a182df636f7798c8c534307fd3a2c7acb17f76ae98fd6a157e650c2c45f5241af61e331b2dfc2fd2c3b7ae2ad954511bf7904eef1f SHA512 afddd6e3d26e3e0961c29521217bb7c1ed08d287fb5ef25dd0fce8c24b879c40c2dec7aff44010b6ab9522f8cf8bbf121e5b133b65be3dc3a3467110f7e0adbb
diff --git a/dev-python/tappy/metadata.xml b/dev-python/tappy/metadata.xml
index bae44b5a6697..35e9bce4b8bb 100644
--- a/dev-python/tappy/metadata.xml
+++ b/dev-python/tappy/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<use>
-		<flag name='yaml'>Pull dependencies needed to support YAML
+		<flag name="yaml">Pull dependencies needed to support YAML
 			blocks associated with test results.</flag>
 	</use>
 	<upstream>
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 15fc8e344927..ea1e02f04746 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,3 @@
 DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
 EBUILD tempora-4.0.1.ebuild 1067 BLAKE2B 4a26375aa6d421dbf08543290c47e8c416faefac07261d250c90be77d12a335d56a93ea2c78e6a3fb56d26a43c2db9e03d0082d6ff75c3dcfcb4490c56934e1c SHA512 a68dc08fbcbce3de95ce9671c993f3a34ebbde5d216893b3f343a35f94f6c03133d7fbd0879d6c33017cbba2302625f6e0142c94542eec03cd2f3dbf27a9502a
-MISC metadata.xml 639 BLAKE2B 4c3b2d750f191352c17f91ec5915dd9469480057e5272a99e305cf7f2d54a2c631fb39007a49e69169f318392564c7a58974d9483c8fb94bebc583badbbefc6f SHA512 ee76c478ca8cbb146783f31893d9b330a0b171f753ec071df2cdf6ec2fedb28f6dbb9a7d047efe1fedfbf4ee1c3ec6d7dab2889b0f358074630b12d066e52d65
+MISC metadata.xml 639 BLAKE2B 0d9a50a66ac1bcad2bb56a48e3749b50f3b0ed4163d5d1ca75f097f0f67a1dd3104720075c2e2e484e8e9c119f18f62b9217c413dccf62ec19d7558c6b5c65c9 SHA512 a5faad13de686702dae7b796a6a2bf7f0195cd8d1a4154fe006435140cc4d789a9c42251c072c21dc099569b65b67d4bfe02f115c3d4c5a25d76f28532188e9b
diff --git a/dev-python/tempora/metadata.xml b/dev-python/tempora/metadata.xml
index afb95c505b7b..816433ebcd83 100644
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 8972e45cbaf3..cecce7f3abab 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,3 +1,3 @@
 DIST textdistance-4.2.0.tar.gz 34519 BLAKE2B 0432705c57cecd66fe8c9cd4c12293220f1aa72e26c17f7a99d0a312d6ac7c2bb769a01dce9fc950a578f50a490616cb76dbafec541cbe1d61dd8f645dd51281 SHA512 8b58d02824d0c94ece9d0322180dd25af7dd0cef708e3f981efa16e262373532de3d68aed7dffd2008cfb04f30495a1792f2f22e9f1d8a802426d464c20d7b07
 EBUILD textdistance-4.2.0.ebuild 767 BLAKE2B 70d3967bcd059de0c3ae0edcdc3b617d8a4c95d2a358abaee526e9e9406b69fce312d167131148fbebb27569a961c2bcd3256f46eb84dd3d992748c8576cd810 SHA512 f33b0a85fedaa54a0269ee3274b90cb6bad8cd3a81a2b7d74aed9d3b5fee3312fe24d802831180bf8a12110bc44fca36075bed6b409c0fe826f70d89aaf3929a
-MISC metadata.xml 508 BLAKE2B 9967134390c9d47f2c0a1c38b26864600ff7e8409875f431996f45b7b7df195e63c078c92f8af8645f5a7d3f5d3ba4edc2c71da524852736c0d4c8cb354db7b1 SHA512 c1c1b65ed3b26f98251ab2c9ead7073a2b3662f7ab4872064c1590a9600c602b1647f753dbd5dbfcbd7f9364e2c0bdd0e8876c1ecd3a93cc1e6005b5df83dd28
+MISC metadata.xml 538 BLAKE2B fc2dba7f2c46f4f752358ae4eb765f35641f4f91e4d65c92915226b358866d645e4ffbc4760db48ab6f88207b0da7be7850551e5dad6e9a8b216ba89f59e308d SHA512 de6da8111ffc5abe45b404c6f2981396935dca2fd583e0db9c48bd3d294bd76a7cca47e2b1bec6684f0b338fb496ee943f3e0da8f6d0e0bc9396e25e37a770e2
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
index 0114deddbc45..7a0bdfbd91d4 100644
--- a/dev-python/textdistance/metadata.xml
+++ b/dev-python/textdistance/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 9e0130f549ee..711c8fac37e1 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
 EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 25f2171f6f80354c16dab87bb230a3eb9765be8871cacb3a3c4712e83c763024ec0e40cf8f193382041670365693d39198f5624821c48ae3eb3fa596188c4c3b SHA512 f7f6e6a1c5d43cc8cf005efd2e63cf20a078f1a8438bee9ef0be62be77aac993e5fa8eddc26d032ec34077edc67ed2cd216cc8ebe10e4d5d203313214a13e298
-MISC metadata.xml 529 BLAKE2B f84df808d5dd8ba2116da158d589a55f571fdd4641c31b8ae077b6f7550c10c02666eb9e65e51ab929cf8e149decc368901ad2229506d172c8b9a672fab589ff SHA512 e424e78bc3d309ec12147a05a250b58b1e6468940b6b417e01b1b74705762f63dc3ded2f880eb4f1b5a066aaff70ef5dd12c4546a83e1fca60561b0e23293984
+MISC metadata.xml 559 BLAKE2B 3d63834a9b324cb620b7054f52c7e43df06c74905a343832b1ca52eaf4b20094cdc37ee13a33bf3745cc1581adc84346087d88007859f6e878035eda7e51fd03 SHA512 ffba596825067ed3c12bfe8e41fba37dfcb27949bddbec28d21b805fb3edab996f1d00421fd027d8a182afd6c3b7fce4b87afc1127b98f430573a4008e860728
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
index a1562d89ee7a..469357ce4cb7 100644
--- a/dev-python/three-merge/metadata.xml
+++ b/dev-python/three-merge/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <upstream>
     <remote-id type="pypi">three-merge</remote-id>
     <remote-id type="github">spyder-ide/three-merge</remote-id>
   </upstream>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>andrewammerlaan@riseup.net</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 66ecf3149c93..f9b1ca18a646 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,7 +1,3 @@
-DIST tikzplotlib-0.9.6.tar.gz 589081 BLAKE2B aacd1374caed3dc86e6a93479b7ed0d0a79a2f96acc3817e630860794dc2f77c0d908d5765ebd500160d8c459b51131645f3633a084627b55aa2f26f5de87add SHA512 447dcd9da8d5cebf68b9f1a1f06d82370d5adf731524ea17c4f570bfd76dfce06e65f92df0ead732a02b42d9bdf6d0fde9e004bff50204cc5e33cca6c014a257
-DIST tikzplotlib-0.9.7.tar.gz 589052 BLAKE2B 2960ca341364c003e6c708fa967209c4ab13847f2b7524b926985d73ab146777b314e3df2066c8dcab2ff4c1eb8a46dc4a89f1b85578650cde8c9fb5de5743e9 SHA512 0903f774e3f95612b9b68b4e2254f2c0403e5c603dd41445e359587c4e917c373a12485bc0b8ba30b354eb7b93bb754531489c898dbc4479466c071a2f9b0f3d
 DIST tikzplotlib-0.9.8.tar.gz 589858 BLAKE2B 81bb2ece7d3f5976d928095caa3d8d51b619c97a4b36eea14f4b4477d31e78a978c2eeab81e9829bb9113e70f0035a572a82a229fea61ee08530d57334fda986 SHA512 a2b25d9820fd8185d4e7a03fb0669fa4c9b35aac9b371b0a873174d615bd40615f1fafa4208d2019af0b7ffe80a8eec6b56ad6075104f6c3a4f8f237ad5b4466
-EBUILD tikzplotlib-0.9.6.ebuild 1431 BLAKE2B 44a9cabdf7cab0881932d8bfe06fe56265e5c57521ec31dfa9e66306e1a48241f37aea97f8769d8c8672cf85c73210b10418372cedb5c87b00f850f71bacf2a4 SHA512 1911e14521d586cb89186ce8deec6253edc15c46e342d7e84af065b80b98c4e3f66e0a81ba10fe32077b577161c0000e13dd662841ca68af680e62e3daf62d58
-EBUILD tikzplotlib-0.9.7.ebuild 1012 BLAKE2B b01ce8208ee5d2e59cd07c6af272e358164919c4aaeaa3fa9286962dcfcd201d1b7c947a54dd8db8d89856866dcba31422b03a8a09afa4b2233a1e0659aedb11 SHA512 83cb654f079e8f847bbf9d725b49e133a2eb845ca1644b2a4de3c7ba806901279db7a741050499d0073ca0601f35c22a05edfe3da094b0cd3e92ff195b3d0752
 EBUILD tikzplotlib-0.9.8.ebuild 1012 BLAKE2B b01ce8208ee5d2e59cd07c6af272e358164919c4aaeaa3fa9286962dcfcd201d1b7c947a54dd8db8d89856866dcba31422b03a8a09afa4b2233a1e0659aedb11 SHA512 83cb654f079e8f847bbf9d725b49e133a2eb845ca1644b2a4de3c7ba806901279db7a741050499d0073ca0601f35c22a05edfe3da094b0cd3e92ff195b3d0752
-MISC metadata.xml 1064 BLAKE2B e623b13a4cad8a6e29197ea6f4052de09304e2dd10901d263bfc50459283b3b9705401d267a87b29fb11805e32b165b4a8d9b4cced5fd3c940bd056ff2fdf47e SHA512 ffb6d74bc2e8db98b1a8c4a48cca672a55ec20dcbcc9c529883954bf65badfc0fbf20d81884175164399a514af2bbf0b89c3e999940baa4ecee9309a3d2f7d70
+MISC metadata.xml 1094 BLAKE2B 28719520b74f1095a2e42b38bffcf42fd95d53bfb25f18834c173a5081296a7e6925e0a1d1ff1c86bfc3e01527514196bee12b7e9aad23b8f08ebb869c129ed6 SHA512 e72aaeccc8755ae04cd2f83bd82d34da5288d78fa16ff6d63a7e1e385563446aa0f04d9afe7b1a294d4a21fcc2c74c1730db34cd0b8e141893b881ff3900e831
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index 1ff772a7c7b5..660770e53447 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
deleted file mode 100644
index c6df920586bc..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_prepare_all() {
-	# setup.py was removed in commit f04323cfa575caf8a25a9236f55fe6baf1a33b20
-	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
-	# it complains about file not found, setup.cfg does exist
-
-	cat > setup.py <<EOF || die
-from setuptools import setup
-
-if __name__ == "__main__":
-	setup()
-EOF
-
-	# Lots of TeX errors
-	rm test/test_patches.py || die
-	rm test/test_context.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
deleted file mode 100644
index eec9580243fc..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 367abf5fc346..913a214a4413 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,3 +1,3 @@
 DIST tooz-2.7.1.tar.gz 94084 BLAKE2B f2c49af8ba98144c61c9658d7737d737f0892bff92abe8830da6c0b7bd06905519f9a5c0e89c5d511705bc8ccbf764ad2bbb3bb12f175077ac0fd6896e0b4b23 SHA512 a2c4827daac059e1bf92789226f48c40a328db855b1455b06e9f8949f8e0ea685e6d0ca3fd7ff5b5b309f2f395e7d8e42c2585a68e2c0f3fd9149f0efc829c34
 EBUILD tooz-2.7.1.ebuild 1081 BLAKE2B 564054eb9891b481d2b2e2852f82bd9e57cbac849ef4458c6019ff244982778df710bb7e9934667d10b81c1170bb3d59dcbec0fc67c0f759108b8ca2f546c2aa SHA512 c47f2b70c3ba977f2577ce54323cffb56d121035a98f5ccee2414c19ffe77f334c3661467658a86f889e652df93e60392da1c0272b6ca2f2c3fcd1ee2b60f405
-MISC metadata.xml 639 BLAKE2B fe1f88333df6b985013cbeaa1924f0de46591679aec6700cd0591c3ea4cc401fbb0a0de90c28d5c0900a98ef807e4435f84ffbbec69b79474736bd741b82bfb0 SHA512 5cd34bc93a56132a292bdacd9cd4c3430e0377a7964c29a915ecbc45b7b5bf7e8b980a6d30f60679be6a30741787c3b78375a25f2f36e6a00783bf4c87784dd3
+MISC metadata.xml 639 BLAKE2B ace15148ae562bc2c6e199891b4fe24158454a4eb8a4093a3da31a428f44b19a2c6ac9a908cb67a1712b51e2e329581fbcd7b6c50f3375d9345999dfb4d4d44e SHA512 d8f5d3fc8689df27570af9e8ad6ddc8ec0eaed84365a42afc550c0ade04c8ee8556bbdc7968a2571a86217e7bbf6307c4c35ba4839610b017380b5eecf4c7945
diff --git a/dev-python/tooz/metadata.xml b/dev-python/tooz/metadata.xml
index fff2f293c09e..827a131f4ca5 100644
--- a/dev-python/tooz/metadata.xml
+++ b/dev-python/tooz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 5317033f5a7a..2b679549d84f 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,7 +1,5 @@
-DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
 DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
 DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
-EBUILD tox-3.21.4.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
-EBUILD tox-3.22.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
+EBUILD tox-3.22.0.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
 EBUILD tox-3.23.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.21.4.ebuild b/dev-python/tox/tox-3.21.4.ebuild
deleted file mode 100644
index 78e1824c9517..000000000000
--- a/dev-python/tox/tox-3.21.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# broken without tox installed first
-		# TODO: figure out how to make importlib_metadata work
-		tests/unit/test_z_cmdline.py::test_tox_console_script
-		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.22.0.ebuild b/dev-python/tox/tox-3.22.0.ebuild
index c21ec8453e95..78e1824c9517 100644
--- a/dev-python/tox/tox-3.22.0.ebuild
+++ b/dev-python/tox/tox-3.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index e45deb3cc359..df46a6c20e8f 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,10 +1,8 @@
-DIST tqdm-4.55.2.tar.gz 162632 BLAKE2B 02e49f442c8d5ad3799de143dd8a188796293253e836c24d04e75aa45f7cbeecb967f1503467ca7486dfd412538da6f7a3aa4c674e16f0da3954f44347c5a498 SHA512 f61f28f2b8f7c4d848e31a3d791822a0433573b36aa900d055e1919b555b84ee36d988c6f51d6951355e70821f4d24bee72bdd4472262ea55ea012ff0556b0df
 DIST tqdm-4.56.2.tar.gz 167040 BLAKE2B c1754cb262977688365c6bf17ec6b6ec31704cdb22aaf05261653c4c9609bdbd16863a15f58a7fe0fb2c0983513b091be55dbca48a0a7b1177a4d017d6800ce0 SHA512 8e7ec199c43a3cdb69bdbfaaec33c11ce8b337255eff4ae6af9928c2a2c5adb065698538562020c9f0a29a63671cbbfcf2c4c9ccb25bec0ec1d8ae8df66516c3
 DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
 DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
 DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
-EBUILD tqdm-4.55.2.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
-EBUILD tqdm-4.56.2.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+EBUILD tqdm-4.56.2.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
 EBUILD tqdm-4.57.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 EBUILD tqdm-4.58.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 EBUILD tqdm-4.59.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
diff --git a/dev-python/tqdm/tqdm-4.55.2.ebuild b/dev-python/tqdm/tqdm-4.55.2.ebuild
deleted file mode 100644
index 9f4656c29579..000000000000
--- a/dev-python/tqdm/tqdm-4.55.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.56.2.ebuild b/dev-python/tqdm/tqdm-4.56.2.ebuild
index 0bf4e4570b83..9f4656c29579 100644
--- a/dev-python/tqdm/tqdm-4.56.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.56.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 67e336b5669d..14ea1cb44a55 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,5 +1,3 @@
-DIST transitions-0.8.6.tar.gz 1092437 BLAKE2B 14a8f50bb3ab34e5a6589c1ccc14482373fcbe670d64cd822ef483da10d5e19771bea28ce26690907862422a7687cacccb8c82f5f623ba34888e88dbf2601945 SHA512 9ada9075074a1201c0858786ea446e5dd36576e154238dccbebc2523da0bd46cb676e7eb4abf1102207b2e674d3214dd4869b3c51a6b9e9799c38bd6be8aedac
 DIST transitions-0.8.7.tar.gz 1094059 BLAKE2B f8a524751567e450818e8e1219af661661985ead8014a060fcde2af5b7c16b3d2d87140804a85cb92d003682aa237de81865336f011f0b46805ba3d2839cf415 SHA512 0a7300a38facf46fe999f53114dc42040ee6aa423f08e378727d0e083a543d1246cb83ca08a861d4e598560e55124905808649e25e57a6002bd12992ba91dc8d
-EBUILD transitions-0.8.6.ebuild 849 BLAKE2B 8762e70a41840f5496932b676a6e871702c736a047960bfef143e71f41eeb5f4bb900d1444f3db3c27f7364aa5b7044ca03a826a981b08081d75f3b5813e0833 SHA512 2bb087181d62898093f9d3452e39bed029268ab343b5df1035655ced623c8664b41849c9f9a6dc0902e52807ecb1f6003a74f58c0436cea9b7eaebb8b69b6da7
-EBUILD transitions-0.8.7.ebuild 851 BLAKE2B 41ca9e87edbfd5fe6e5bd3344436c2118372de8bcb2e84966b7924a367380220fd13a677e0736dc7e13f4a11ba6bd60c7542b5b5bfe4af3bb3820b97724bf53d SHA512 83730b0aa27f41e164af10a448c6411ca666bfd3e3ce8b8046a7acba78317fe080487f7af2126f6455edee42140dfd84ba4bdff1ff5368ada7d4bf86cd8dc452
+EBUILD transitions-0.8.7.ebuild 849 BLAKE2B 8762e70a41840f5496932b676a6e871702c736a047960bfef143e71f41eeb5f4bb900d1444f3db3c27f7364aa5b7044ca03a826a981b08081d75f3b5813e0833 SHA512 2bb087181d62898093f9d3452e39bed029268ab343b5df1035655ced623c8664b41849c9f9a6dc0902e52807ecb1f6003a74f58c0436cea9b7eaebb8b69b6da7
 MISC metadata.xml 862 BLAKE2B 32352ca5b3a7877cee77cdbde85ad75db077f8b9de8e7d38bcef726db2e071095fb17c41075c457c226a0756ecc321cae83fdc2b82a21480a30cccf2e7b4ccd2 SHA512 23ff20aa82f9d97efc8b0a396f8dc289c91d3e8ffd3335757369bc45012319120614e276c719d9e5f61b7877ca37689a7f6576ad1107bd8d5135857f2fbe0b7e
diff --git a/dev-python/transitions/transitions-0.8.6.ebuild b/dev-python/transitions/transitions-0.8.6.ebuild
deleted file mode 100644
index c4dc2836302f..000000000000
--- a/dev-python/transitions/transitions-0.8.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="
-	|| (
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/graphviz[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.8.7.ebuild b/dev-python/transitions/transitions-0.8.7.ebuild
index baacbad3ee0a..c4dc2836302f 100644
--- a/dev-python/transitions/transitions-0.8.7.ebuild
+++ b/dev-python/transitions/transitions-0.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 4e6ecb6da75a..d8892b05f01b 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01bab881e6070820f362c53f47b5f88e192bcb7a18d2bf667a678378110046f70a035d42b67a77e2dc70829da323d69f675d21cc SHA512 1578fb8f96fa83ad97051a20f02d6570f96f2346d99fc86172718c995468c318f318f27f2ef259bd5dc10521bda4ac7da17385f72b726d7ea3c0fe65af8f313e
 DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
 DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
-EBUILD translate-toolkit-3.3.1.ebuild 2865 BLAKE2B 241cd7c4edb1c7ac600d0b426510eea52e85eef01318b3453afa9b9f35cd77e23c79b93e1566e16b2a4fef07a71d1c1d4e68edea50e9a96e8ce817e76cf0cb34 SHA512 33c174b4ed4d7eb7563ff060324971da0e39cea92bd59e35291aa787bfbc8df805ae4f020c44fb6a74d063d715409f44535b10c13b2c2ae2667568192c21d95d
-EBUILD translate-toolkit-3.3.2.ebuild 2491 BLAKE2B 7ad339b2a37e1b74108560616ceabb9c905f6e5e66ad1d3478f51152216f1b9da462d6dd7435d72f2069930164f7d44bc94e5cd774b4af55c51b3a858ce8d951 SHA512 5b7f8d55e330e34157b721a17c65a45811289964dff369af62047ecd19e4c48d6d6dabd495fa32e1ca29a65706c53418cc599ba77ebf5679bbc9d2ea076ba214
+EBUILD translate-toolkit-3.3.2.ebuild 2490 BLAKE2B b9a141e9ff4920fff39ee14ab65433e9d7ac5ef14b7080730e1c1f7d165fdfe539a507d3d8ca73329864cb84739dded979ca8a31ab1f36c426f14e71f42bb1d2 SHA512 a9cad20219d6b808639501bcd1288731dca962576d880efac3c083b5cb953b04b0ddec236ac3e924e55dce1d74c0a8547872be3bb9036914d7b5bcef52b40c3e
 EBUILD translate-toolkit-3.3.3.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
deleted file mode 100644
index 34d7b5c496f9..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Not packaging optional phply for now.
-		# Seems inactive upstream.
-		--ignore translate/convert/test_php2po.py
-		--ignore translate/convert/test_po2php.py
-		--ignore translate/storage/test_php.py
-		--deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
-
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing --via-root
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
index db64c6cc4c27..894d0ead037f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index d8a40285210d..1adf6bacc0b9 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,7 @@
 DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
-EBUILD tree-sitter-0.19.0.ebuild 567 BLAKE2B 6fd61083f9ba8e7466fd3da1244fce610bda372ee03ef5f77ae6ba17d2ce2a30c40a5d9fdea22d9424eeb2b39ec92887cc9f9b62d33c48065d4bf671a8f77030 SHA512 255574fddfdc4f63737ec3b231fd45aa629952c1ab2c9639f9d189196599966969138a1dd567f4cfa95f6a39d34053800b994d15e2269b8bb69d2b9a0b9fe0dc
+EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B fa80bbe5d90972f86a7a6bdd66515a0b691548fc2dd673685ca00474360c007321807cdbda71f37993c8c0c26cc6a200c40377f6a5d1dab0b4b3d4f65e2e8f96 SHA512 110d0044b754b2d5b979d31de7901905080927af9bc6794c3c831720895beb4fca7f715bf7d145dab2ec9b4a0b2176cce0e4b5a333c81408c54a7a194b20ff51
 EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
index db8a7bdabd25..3abfc8316950 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 6f63b3f1e9b8..838b1daf8afd 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,5 +1,3 @@
-DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
 DIST trustme-0.7.0.tar.gz 27853 BLAKE2B 97313cfe10260c67e29b470b9b65d4bb190b6e3be9b6944599a3c318d87b984f44abfe581420cd0ef29afc8165029c67129104cfb7ccf9d68e3c686424de34ec SHA512 3b2aa69dc617c04af3a83ca424ef19b5eaf37495ba4bc5cc55004016a9ea63c8df3585bb7fe52709b1b18a2a55e51d6a1a2b21ebc12c57ac18133b20c958b1a8
-EBUILD trustme-0.6.0-r1.ebuild 859 BLAKE2B a9733c6b931a4c2f139b2b7acd92b25754ae332c52daea9ac0271202506cb12732d6f6133f862ac85995c3b021e6fa4f39148eeb26d5acf4e04bb16403ae9096 SHA512 817d20b4aa6d500e153744529a4c3512a5bf11a53cdc2f94282361e7fbc275e10845b996feb413b545ecb41bbcad6a8e0a174f2ce39212967e57dc41f2b24ed6
-EBUILD trustme-0.7.0.ebuild 817 BLAKE2B 69c339f5f39689e1bd38b3ac23558e6d0f5e01be58b0e25a2b76145653541b4f41402822d4c41729143442376f6faf985dbcf15fc77beb4c2fa5a1a7739df9ed SHA512 4c245833bee1274fb8e0152ccca773a43b74fd98b873dfcb8784d44d310f146c464c279f90516bebcecbb0b92a5b6ca2fab95bcf5230fc6087a8f99bd83e8f82
+EBUILD trustme-0.7.0.ebuild 809 BLAKE2B c5b49682442490bcce3d1f9ab39eebefef476486242fef7fae449ba6bcceda65680e8e46d42f43e06c7f2a8bdb228dad797aed6340165ef69be4bd04b82a2b53 SHA512 faa7f314f0e6acad4d0d212dee8c56bfa3e09d63a2e32527f92c9d6490be1563c418d017685b605eff3f85067d9073f605680c7c2b9ae38f16dd34d981378f7b
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.6.0-r1.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
deleted file mode 100644
index a0eedfd68361..000000000000
--- a/dev-python/trustme/trustme-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.7.0.ebuild b/dev-python/trustme/trustme-0.7.0.ebuild
index 7b5a4fce6c51..c57a34cf32e7 100644
--- a/dev-python/trustme/trustme-0.7.0.ebuild
+++ b/dev-python/trustme/trustme-0.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index c2e41a6142d2..f41b0dd02a80 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,7 @@
 DIST twine-3.3.0.tar.gz 148996 BLAKE2B 60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97 SHA512 94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
+DIST twine-3.4.0.tar.gz 211582 BLAKE2B 6b309880e96142a666f0113343f6a7a604ec6058f58429befa4709366d8dd8b6ddd0d2cd69d74653d12a74a615e6e3ad6b7d96892aa5beab00c934be2fc4b8d6 SHA512 6ce4757048fe7b5ada8a384fa185e80cee8412ef7f0561f55a5cbec39c0069522b57e403f148b9b55c55330a577873a5e9597ca0a6b0fb0cce6b377c8df07e4e
+DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
 EBUILD twine-3.3.0.ebuild 2143 BLAKE2B ab9f9adda54d8bd18276294df01df2aa8777540f6f73299a40def7ebcd25fd9883de55d663dae62b6dd42a93b0935356e113128bdd57ba9154b01ef4760a1f21 SHA512 ad1f93f394baf4bb0e08a571e3e4dca65ffc36d24ccca199f2fad8c2ec265474b57b0fd6fd59c3f652a5a555e7e9a454aaf055e7d9b61c261e1954e51a09b2c3
+EBUILD twine-3.4.0.ebuild 1807 BLAKE2B 2871da06907498dc1b17bb3716ba6b97f96c0dd0e751f2952de5a906a70762eb311401df8702ac88bcf06e4fe9c85ba5a43f4514d829c9ef1b2455950a0d3377 SHA512 c45ce046c23d1d43608ae5118df80ada95c293217d31c00e16818baad2f4461cc895c40ca6e74ab452d0bf634ed6cea6fd870b13fa603fdb6677a3a646ba8109
+EBUILD twine-3.4.1.ebuild 1767 BLAKE2B 1635f7c81fc68fb41606bd7c4cf30090a36ae445239264f06b2d703d100656ea1061e932216f88eed520826b92d390da230fab38fa0c9fce467db9e6af9da4d4 SHA512 a720183c8a06e9eb10778086fb90a7e710609c198cf352e67d986b114066569b5690565c7b5da5597bbf1c2049b750a12069a0617bfecc8a65e35a94809851a4
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.4.0.ebuild b/dev-python/twine/twine-3.4.0.ebuild
new file mode 100644
index 000000000000..e71049c037c1
--- /dev/null
+++ b/dev-python/twine/twine-3.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="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/packaging[${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/twine/twine-3.4.1.ebuild b/dev-python/twine/twine-3.4.1.ebuild
new file mode 100644
index 000000000000..58a2549a393e
--- /dev/null
+++ b/dev-python/twine/twine-3.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="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/twisted/Manifest b/dev-python/twisted/Manifest
index 9560f0b9e408..444a0ffb9997 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -13,5 +13,5 @@ DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f58
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5777 BLAKE2B 163fac4a0cdc830f9be404a69c43287f8594f2a71dacee4d4b37a56e5fd140c060b1a3e765e63bcd4b1a4fefff0bb30a1df007b6f7ad0f01adb0b6ad8f1687ee SHA512 124513b07e486caf4655534cfa0fd3c34facce3f16fe42977d41f2fcd7fa032e3dfd0ea85cf461941539ca8e0768e015809f33c798e49582aaef657aa02ce499
 EBUILD twisted-20.3.0.ebuild 5611 BLAKE2B 598bfa6c58c1acae83610bf1472d49ddf65ba75689e7c76eb356af50b1c786b5201dfb696afc7ab0ac0439878e2119de9f359250d2ba373de146ebe9edb5b37e SHA512 bbebee3ed4a72f34d346dbc38141f2a461b61c3d3a8ca99be711d16ee10a8759aaefc9f780daa0ee2dca589b4f273fb47c69b6b694c19a437ea3ef94d3ca2d14
-EBUILD twisted-21.2.0.ebuild 4704 BLAKE2B 3034fdbdff9136be6c1cc398b4dde6bfff1242bbac8eac7c2c8e6e6e03b84e5f9c1c039d2712d07c19c44ff9373cb5d1193b4966892d920dfa0087523a6418e7 SHA512 f715f1fcdd397080fb3fe44bfac28ec17a67adefa3b5e2066a2fadf0bfdc40df6fc76c662f01a8811c67b16b313a2f1be96f21dffa9f50013e5fa9a61ec7501f
+EBUILD twisted-21.2.0.ebuild 4722 BLAKE2B 4360942c350e618dea84527bcd0a65e699483c30c20eb7194ddaef6dac9cfa6b0ec69d22b7d221c8771ca7fbb30b94f95d60981d831117ed4e4d98076e95f120 SHA512 a33710254d411021cb0a1549e034978ef8d06c80a9c7bb22584d1221ff27d8090654824dbddb58b1a8bbc2975c6dc9f6309c5be0ca63553d52a90dc60375fb8b
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
index 4dd4707c1690..eba3e3a2dff9 100644
--- a/dev-python/twisted/twisted-21.2.0.ebuild
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
new file mode 100644
index 000000000000..b4aec0ffe28b
--- /dev/null
+++ b/dev-python/unittest-or-fail/Manifest
@@ -0,0 +1,5 @@
+DIST unittest-or-fail-0.tar.gz 2445 BLAKE2B 42d97fb3bd7e825ecf521ebbb435ca3973f83e107d86848f2c03d6d2321c9b87ec68db159e658bd5eead5321b7085ecec5350947818f55141eb18eb72719e2ad SHA512 8df21f5e235e03f4b5a8ae351420ac667612afddeb52a27bb2d4812bedbea87ba857dedfa37001a72872529b7c1984d15ddda93edfa6f989f0990b72c4b57baf
+DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
+EBUILD unittest-or-fail-0.ebuild 814 BLAKE2B 31c165d9d5db28ab11a3ce7411fd9b2ff78efe736cdfb442f6341bed74fea93362bb3feae09c19107a97c87a7ffe91dbef1a314b7dc2f3b62f35ca10cb8800b9 SHA512 f96d8e77783db57cde54d9f96dc4aae228d84c730b1468af2418aa067a1c8907cb6fb2a63b953c95ef0e0b92cd565db78167aa366d9630522ae67119cb793826
+EBUILD unittest-or-fail-1.ebuild 814 BLAKE2B 31c165d9d5db28ab11a3ce7411fd9b2ff78efe736cdfb442f6341bed74fea93362bb3feae09c19107a97c87a7ffe91dbef1a314b7dc2f3b62f35ca10cb8800b9 SHA512 f96d8e77783db57cde54d9f96dc4aae228d84c730b1468af2418aa067a1c8907cb6fb2a63b953c95ef0e0b92cd565db78167aa366d9630522ae67119cb793826
+MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/unittest-or-fail/metadata.xml b/dev-python/unittest-or-fail/metadata.xml
new file mode 100644
index 000000000000..3136117dc036
--- /dev/null
+++ b/dev-python/unittest-or-fail/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild
new file mode 100644
index 000000000000..707e0b2b5bb7
--- /dev/null
+++ b/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Run unittests or fail if no tests were found"
+HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
+SRC_URI="
+	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Warning: do not use distutils_enable_tests to avoid a circular
+# dependency on itself!
+python_test() {
+	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
new file mode 100644
index 000000000000..707e0b2b5bb7
--- /dev/null
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Run unittests or fail if no tests were found"
+HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
+SRC_URI="
+	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Warning: do not use distutils_enable_tests to avoid a circular
+# dependency on itself!
+python_test() {
+	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index d0310a72d5c4..e2c983b8f5eb 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,3 @@
 DIST uranium-4.8.0.tar.gz 1027286 BLAKE2B 5e068255918ca3a6125c308a64d47fab30260aa475505edad2abda664d2c2db7d821d4219ff682d4de90e16de2e36d257410a44f2752c733994739ca160e55b0 SHA512 a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd
 EBUILD uranium-4.8.0.ebuild 2290 BLAKE2B e553eb81f0c169f298f4d3b87f4b9f0ac91e2f524ba00b546546d40bdfadb6e1634543eded46d9c8323d74737ecf5dd58f99766192a271df5497c648fd57ea78 SHA512 16cb8e532b91afe6f1f404e0b19c56ad3dc937a5fbf4364b73e01bef9717175cb62d94c539200e35814e9a7b7447b5f9c5808f95031502f283ea213b7429a895
-MISC metadata.xml 1164 BLAKE2B c01d7f647d3ce77e75df7e2e69e0c186c28c66505a43d3833746a6c7fba2ebec263ee05cd41ba10b1d459057dd429828a995eec1395aaa08d36a2f26b5096f5e SHA512 39db8c033fabdeed44349cee366f0885b41fe810f232a03e92cef805b706ae753d32a602856f93bec3a97de7cba4c00ac9f5de2ec857d66f8303280b0fc5838c
+MISC metadata.xml 1208 BLAKE2B 4a7d789c09e42ecb831e92bd363f6fdf1b161d685c8a95d70f296e17306ffb5af19548ae845487eb366153e97264ba1007a67aabea1bfb3a241a7f98e7f63e4b SHA512 1a2f2e068fb647ded2277e7eb6530856534aed8815f82eba0ecd2c0a4f505327396a46b503ba1a486f35c1986af492234625e6f58a10dad762a833bf823405c7
diff --git a/dev-python/uranium/metadata.xml b/dev-python/uranium/metadata.xml
index 6a55bed22c10..4d1bdb2a9716 100644
--- a/dev-python/uranium/metadata.xml
+++ b/dev-python/uranium/metadata.xml
@@ -13,15 +13,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index af57496a6caf..bf1309237037 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,12 +1,7 @@
-AUX urllib3-1.26.2-byteswarning.patch 881 BLAKE2B 8d913aaf47edc874ce8b367e02aa01b4f4f59724cdd02f980ebaefb24968bd3a9cd3804f20d78984c5addce68c7a332b3e94415f348cb8c998e0944299150d6d SHA512 9d9306a5fd884c5ec6d05c74a10c1ee458604e1293986eab5c6b4061ce7d8df4796f5833fe1a8b4bdcb9025dfcf1a10ac000aa9da6f01ff13647299cca655131
-AUX urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch 3500 BLAKE2B ed204b228bbe0410fab37bc8d8ae6cb8f4849f3e31c17548e77bb0984712e298a7a5c486664debebcacd19dd1ac46371d583019a6ba279e5ead3a1d09f6b7a49 SHA512 e52cc96e11be6050df1c40f3c024de89423b5ffe4bdbcd98a0dd775354c999cf2ee9c99835b2b7b3c194bf8c15aed6a8b62b81c6c9d142afd1227614c50d88be
 DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
-DIST urllib3-1.26.2.tar.gz 286877 BLAKE2B dc5884e2561fae476ba8695cf9e50abb63d8dfc45ad6219d07ba30ecae48e5f27fbdd9a324c0e71f739555c90a3653f18eda513f2ea45b76abcd8c6c714ec0f7 SHA512 4de7cf844ed0deb83c4129e1b1742eafefe95035dd7ffbeaeaaccabca8bd361de9fa240882ea4dec16a7f0b5c5684416656f0d58bea15e7aefd4132024a25c9e
 DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c065344f1e377c2f4a695fc0778cf4cb503dbe243133a20d5779ba4bea455213c62aa5dc3815a994acb4e0adf46b6 SHA512 d0dde67880212dc134add3e16e0aa391170963ed26b9a7eb65399235251131ce25488268df7b2f933afc71c9a94e55e08404f9326c0bf5142869dac912d3ee01
+DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
 EBUILD urllib3-1.25.11.ebuild 1879 BLAKE2B c6a79fb4d9b36011fa0c0602e2853c1f8f289e3e87ce04da163d6c4af39654f8fe47e98c380c9e6f66f749118be3cdf237b66f86eab599fc0c0fc695a26ebdce SHA512 ff5c93995e8dc5c6b4a62e3c8035629ee79db816807a81805bc10dc4b30e51e0ee87fb47f51d13755f1097ccc1c76c26a69a0fe7f432fbd5ea3ac312d2783385
-EBUILD urllib3-1.26.2-r1.ebuild 1988 BLAKE2B 26f5b04b66559676c61460323f2a3a53ebd802581960ee674a76e7a73976f2033540375fbebcfa73b3632ae1c614fc7f649c150a324219031037a84c789b4549 SHA512 edb984d5f3733124863f20d7da469963980b14fa54de736947ddf5109e73aa86d27b9fadb9cd5e7c7bc877d704f56976d829add6880168a10f6aab4a2f5283d7
-EBUILD urllib3-1.26.2-r2.ebuild 1930 BLAKE2B 91598ad9fafe2c16e899efbce7c7d51b918b8b7ca25c421ec10541b2e3198c64d0403e41e06ea3bfb18b5012d943385bd249cb08970ea27015b8dcecf19c0038 SHA512 6d7efbb902fcf41841ae28c8e3a3444d10a6245d7f7014efe5b38c30c7871f730b20423070e6889306d595a369a5114bb7432fe3bb54edb8a18736d0c133af22
-EBUILD urllib3-1.26.2-r3.ebuild 2337 BLAKE2B c2e6a5e27d1859743e802aa67164f40700036034706320841e9dfa26b3c41b9a01045d18c677525f893ffb10ac891f13d37d89fa532aa34353a9148e160c4152 SHA512 a0e37882b07b63dbb10608399893d93de90cbcf97cdb29862121b94ea57176fdb5e50b2f7eb999b0b05ae9264a79ab6d038ca56fefa31588bffeaf379c26be33
-EBUILD urllib3-1.26.2.ebuild 1891 BLAKE2B 323e3851652351ba52778954d3d9731afd4846702049e14497836b250b352b4176daf83f1e4c45d8ab141474df2693dccdfbf4bba371ece5f47f1f351bdcd3db SHA512 e427406ad6efbdf95dc470f3c9864c52c70374bda2958b447770edff68f67f5fd00a2cd91b4c5d79070208d485cc0a6b1b380d3ad153cc1fdc7c96e50d264da4
-EBUILD urllib3-1.26.3-r1.ebuild 2245 BLAKE2B f43196d80fc5b56c121a5cf0b50a265f7d9725bbeb8f05fb63e63fbee63027ff0cc4f2b3dfbb1ad085fac0106ae46e4ede71d402a167b3231056c524292c00a0 SHA512 03d7aa95f3d71ee58827c4d4d30717a51e2e41c15849d621c11265a29df37a23bd1a0c8ab2d65082f98ce5dba965f2801ef43848a6bbfca8ab8ff3d5f9fc74ec
+EBUILD urllib3-1.26.3-r1.ebuild 2236 BLAKE2B 1a82ac8ab31b5e3dfd01dac2fc3031b401ba3f1fd64fd796534483970ef9821683de544c1dc7b73c76ef274ceefd447e117ddc8f957ef8f36157863e8ec1334c SHA512 02c8ec9f32621eb34dbcebdd932add480c833a8e261eab52d96c1ed9f3c9df96c4fdc0ddaf4ee62336cc46681560982b69f2121424730284a132538fb134d578
+EBUILD urllib3-1.26.4.ebuild 1930 BLAKE2B 3a84a1ce3c4c409e474c0f7eef48f2e0858ae9034a48355c40f76b15644fbfeb348d58c31d984801fa79d60a5fa72c88427e75cd88fb049411ed6deca2265548 SHA512 2ac8fe4580351db9133005ba5a784a70297dab93b3c2afdcb856bb6fddf06d62e6c455a707e0922494b23cd9cbee21cb48a008ea7a4b955019d937cebe4e2a09
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch b/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch
deleted file mode 100644
index dfa761c5631e..000000000000
--- a/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bab9ca9f7148d6a7f15b83cfa1126bf1c8ceb17d Mon Sep 17 00:00:00 2001
-From: Quentin Pradet <quentin@pradet.me>
-Date: Tue, 26 Jan 2021 18:04:17 +0400
-Subject: [PATCH] Don't compare bytes and str in putheader()
-
----
- src/urllib3/connection.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
-index 660d679c..387f3770 100644
---- a/src/urllib3/connection.py
-+++ b/src/urllib3/connection.py
-@@ -215,7 +215,7 @@ class HTTPConnection(_HTTPConnection, object):
- 
-     def putheader(self, header, *values):
-         """"""
--        if SKIP_HEADER not in values:
-+        if not any(isinstance(v, str) and v == SKIP_HEADER for v in values):
-             _HTTPConnection.putheader(self, header, *values)
-         elif six.ensure_str(header.lower()) not in SKIPPABLE_HEADERS:
-             raise ValueError(
--- 
-2.30.0
-
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
deleted file mode 100644
index 2af65e84f016..000000000000
--- a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Fixes a hang on test_proxy_rejection.
-https://github.com/urllib3/urllib3/commit/087d4de8487379033970898866625c00e0d51c85.patch
-
-From 087d4de8487379033970898866625c00e0d51c85 Mon Sep 17 00:00:00 2001
-From: Quentin Pradet <quentin.pradet@gmail.com>
-Date: Tue, 3 Nov 2020 17:15:50 +0400
-Subject: [PATCH] Fix test_proxy_rejection even with two localhost entries
-
----
- test/contrib/test_socks.py | 34 +++++++++++++++++++++++++++++++---
- 1 file changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/test/contrib/test_socks.py b/test/contrib/test_socks.py
-index 1966513c1..ed716f188 100644
---- a/test/contrib/test_socks.py
-+++ b/test/contrib/test_socks.py
-@@ -1,8 +1,12 @@
-+from __future__ import absolute_import
-+
- import socket
- import threading
-+from socket import getaddrinfo as real_getaddrinfo
- from test import SHORT_TIMEOUT
- 
- import pytest
-+import socks as py_socks
- 
- from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
- from dummyserver.testcase import IPV4SocketDummyServerTestCase
-@@ -87,6 +91,26 @@ def _address_from_socket(sock):
-         raise RuntimeError("Unexpected addr type: %r" % addr_type)
- 
- 
-+def _set_up_fake_getaddrinfo(monkeypatch):
-+    # Work around https://github.com/urllib3/urllib3/pull/2034
-+    # Nothing prevents localhost to point to two different IPs. For example, in the
-+    # Ubuntu set up by GitHub Actions, localhost points both to 127.0.0.1 and ::1.
-+    #
-+    # In case of failure, PySocks will try the same request on both IPs, but our
-+    # handle_socks[45]_negotiation functions don't handle retries, which leads either to
-+    # a deadlock or a timeout in case of a failure on the first address.
-+    #
-+    # However, some tests need to exercise failure. We don't want retries there, but
-+    # can't affect PySocks retries via its API. Instead, we monkeypatch PySocks so that
-+    # it only sees a single address, which effectively disables retries.
-+    def fake_getaddrinfo(addr, port, family, socket_type):
-+        gai_list = real_getaddrinfo(addr, port, family, socket_type)
-+        gai_list = [gai for gai in gai_list if gai[0] == socket.AF_INET]
-+        return gai_list[:1]
-+
-+    monkeypatch.setattr(py_socks.socket, "getaddrinfo", fake_getaddrinfo)
-+
-+
- def handle_socks5_negotiation(sock, negotiate, username=None, password=None):
-     """
-     Handle the SOCKS5 handshake.
-@@ -334,7 +358,8 @@ def request_handler(listener):
-             with pytest.raises(NewConnectionError):
-                 pm.request("GET", "http://example.com", retries=False)
- 
--    def test_proxy_rejection(self):
-+    def test_proxy_rejection(self, monkeypatch):
-+        _set_up_fake_getaddrinfo(monkeypatch)
-         evt = threading.Event()
- 
-         def request_handler(listener):
-@@ -429,7 +454,9 @@ def request_handler(listener):
-             assert response.data == b""
-             assert response.headers["Server"] == "SocksTestServer"
- 
--    def test_socks_with_invalid_password(self):
-+    def test_socks_with_invalid_password(self, monkeypatch):
-+        _set_up_fake_getaddrinfo(monkeypatch)
-+
-         def request_handler(listener):
-             sock = listener.accept()[0]
- 
-@@ -592,7 +619,8 @@ def request_handler(listener):
-             response = pm.request("GET", "http://example.com")
-             assert response.status == 200
- 
--    def test_proxy_rejection(self):
-+    def test_proxy_rejection(self, monkeypatch):
-+        _set_up_fake_getaddrinfo(monkeypatch)
-         evt = threading.Event()
- 
-         def request_handler(listener):
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
deleted file mode 100644
index fe6cc7704231..000000000000
--- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
-)
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.2-r2.ebuild b/dev-python/urllib3/urllib3-1.26.2-r2.ebuild
deleted file mode 100644
index 5d6d29d94f13..000000000000
--- a/dev-python/urllib3/urllib3-1.26.2-r2.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,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
-	"${FILESDIR}/${P}-byteswarning.patch"
-)
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild b/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
deleted file mode 100644
index 33e9f7fbf871..000000000000
--- a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
-	"${FILESDIR}/${P}-byteswarning.patch"
-)
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# upstream requires updates to this periodically.  seriously?!
-	sed -e '/RECENT_DATE/s:date(.*):date(2020, 7, 1):' \
-		-i src/urllib3/connection.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	[[ ${EPYTHON} == python3* ]] || continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild
deleted file mode 100644
index 8ccfe1bd51f0..000000000000
--- a/dev-python/urllib3/urllib3-1.26.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
-)
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild b/dev-python/urllib3/urllib3-1.26.3-r1.ebuild
index 4917ce1c8286..25ba58bf0bf0 100644
--- a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
new file mode 100644
index 000000000000..3bcb2bb67bd3
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{6,7,8,9})
+	)
+"
+
+python_prepare_all() {
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
+		-i test/with_dummyserver/test_https.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	[[ ${EPYTHON} == python3* ]] || continue
+
+	local deselect=(
+		# TODO?
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index c70056920f25..632b01de5129 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,3 +1,3 @@
 DIST urwidtrees-1.0.3.tar.gz 292930 BLAKE2B 91487debf4878fb58cf2505366a4762a4c755b53eaac86e3ac912d2972c66442828e152749f34e73ade10fd1b912054e4047900e0b54b960629909c1b03e2270 SHA512 f7d69d359ba24345a694659fd9432335679f4b505a5c0e33baf9fc0c068935148c393aff8e11cd5f2c12aa26884aa37ba86e9b3a763472e382d73dd57fd32cd6
 EBUILD urwidtrees-1.0.3.ebuild 667 BLAKE2B a1a5756b5d2fb36d8710f5cdae280e43c57d1eea9a5f419aa6de1de6460a60630d86854a93b98c6ceac99af62b0b312d0e894688236cda410ed4570a76c91932 SHA512 ce8cd0cb94d1cb95ee7ea39782cc870ba56056273cdf6d40b55e09bfb216ee91f6b937f06485eef062890fca496f567925a73bf6a8707190c69995024fb61f8b
-MISC metadata.xml 668 BLAKE2B ca8e96fbb2a3ccc7514e4800780a1e0e153edc50a72e7834bc22b3ec539272ea5b9e39060f55698985c8785e92cb148294888976de60628e2094578db92853e1 SHA512 0e2b5276ab8bd5d16f94c28a39cebaacacc297da93fbd25f0d9afeb150af820930e0ca63e6adff20ec53fef4274062e8c607b5aaf1ef07df6d34cfce0b6c9f35
+MISC metadata.xml 698 BLAKE2B 23c148f1ede0f31cc1ed077576156d8805ac0e563068daf427da283d927f164f8d39f02d01b68bf7132e311b8ef1f2bd08264fe0221bd730811f6b85c4e5fd39 SHA512 637be3889fc2d6f65183d95780bd699b9b8a6f50a3b06972ba7d07a7a18adb0c0717485bc0b0fa42c1b5995e5c81f3a10b47adfd597337b7fcbac3a4cf3b84a5
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
index f8156c81608d..560019f7dc3d 100644
--- a/dev-python/urwidtrees/metadata.xml
+++ b/dev-python/urwidtrees/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index d6c3ba2a32d7..7b06f9db9987 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,4 +1,4 @@
 AUX vdirsyncer-0.16.8-click-7-compat.patch 1192 BLAKE2B 33dd29de4c8497977a11052e4dc98290a981f470bdcd936f7dfc57e61a408332317805edbb0ecf50fdeb6256b91ece21f3b9582748cc5dc63cc687a68e9ecae1 SHA512 3de4131b447f789da4ae0da99f7f9f2d62dfb37b01b68db5b1c2ea68477425038681b4428024c3d743e18e2f0c3a069552066ff8743b85d2ce9bb31a4e850e9f
 DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
 EBUILD vdirsyncer-0.16.8.ebuild 1464 BLAKE2B b6278599faede40a85244c68e0a63ccd3538e88c880533d781053318730566fa323552e9c959baf2bca2cba2a295a116dad2d999e2f3536920f7b14b884f3e46 SHA512 ddfd72e5c1c6b289ae9bbe06bc691f7cf1427ce4807fa90f2636a30e599973baab9be6bf400792436e2571b2b284949d0840130cfb6df0c9a9baa6b69e03cc84
-MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
+MISC metadata.xml 349 BLAKE2B bfd548e2d3baf91dcabfb4bb6f22639236d5705e41e6bea9e698706fd34a56d0e4ddc67bf4e4c7e30a4ff66597ccd90846ab8af68bd52d565ef96463b82b7f36 SHA512 8868c2b8c017001f483d3f11d5064ce877662411ec053635953f125ae8a988ad8e83ac21b7b491a2be3d1a54eea2b85bb1b26f86955b2ebef3cd75ec8802272f
diff --git a/dev-python/vdirsyncer/metadata.xml b/dev-python/vdirsyncer/metadata.xml
index 161dede1c475..06fce01547f7 100644
--- a/dev-python/vdirsyncer/metadata.xml
+++ b/dev-python/vdirsyncer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9c409814bdc4..0cfb584b4ae6 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,7 +4,9 @@ AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
 DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
+DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
 EBUILD virtualenv-16.7.10-r1.ebuild 1846 BLAKE2B 59818b64498cb3ef09d0b95b32e24873faa5a0760681362ebfe5bd3fdd6b1cd914ddb1f0604b5b7bf22ed108f0b096ef7e2a738fc9717ee6dc4260a45f46a882 SHA512 e7c0fe99c605ad2dd5c0c83f168ea70dab48973134c8819924f4296ffacefccc017048f237506024b9c8ee4a84580a31ca76370ca8eea9f6c079f0eca773e37b
 EBUILD virtualenv-20.4.0.ebuild 4014 BLAKE2B e1319708866055e80b6810abdbf159dd221b7b381a256602d67a6b0e28e68eabc683132c81d1b2245a89327911b2eda7a95c82979c6219d78fbe9d820a6ba250 SHA512 c80fcb7d31e2eb60d4bd29d859a4b8745b4930d09f9e61e43d94130f39771c3d0f18b87019288142228a0046516a1868f104029e195159f13f67c91a3091d838
 EBUILD virtualenv-20.4.2.ebuild 4028 BLAKE2B 23cefc6f58bcd644d5d742aa2b1be4e192e13a7fcd6e126e5146d180cb73e41efc969f48f21f5b8326e347be1436e3d4ef495826750239382320c58b52863ee5 SHA512 82d8fbec453c3aaab3abbe2c98e696ed2923a079cdcc4bad6ea4754363c2f35185254109a389e868addd6748eca41fbf66d04be6d86101901f7c4ffe19ee1c01
+EBUILD virtualenv-20.4.3.ebuild 3911 BLAKE2B 6e498563282286bad71cf85cf017ccf96fd688e6dd5af4602a373b5fc6dc5a5c72df2a77b1eceff344363cb404f4b700497cc1625c1177f728870b78a5745fe3 SHA512 e325a5a5855c15434b2dfe22c90ec9e794b4baa0b16466049a69ecf70e40e3fcf65e7a25ab5de5a36970dc377d7ba82cb876525d3a843c26b9be48aeb47b908f
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.4.3.ebuild b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
new file mode 100644
index 000000000000..6c1427f47b1f
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 19d037c49d45..1ad2f9795dbb 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -2,4 +2,4 @@ DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9
 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
-MISC metadata.xml 471 BLAKE2B 783af68032a1e8249b608a515f00f95441eb14959ad95fbec52c35641d00a7665a483b6c6026e6b254b5e527379cca9eb82c348dabc5b3461f7ca9ac973e97ce SHA512 f29948818245b44ad679ffbdfe11622e37f183648448ab3b23b6d11ace1e5c045984f6019e3dd1267662d9be691fcde78e4e2839638d0bc7757165450c0df57f
+MISC metadata.xml 501 BLAKE2B f6420cd1de6a67bf49f89fc7de036dd478ca89bb8c8e6721ac5a69cc23506e4485c6093e91de5d144eef0335c77c09fbd322c2f52a3d9a9d0a842f4c012b1b02 SHA512 66a2a8c0985eb92a46697204453bfaacfeee2ddf1033ff8ccc7994265594523908a6fbaf7fce0d8b8da617ea228e343db7cdd63f46b735049996c4b9a7c33955
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
index 6bdb075d75c3..2b47efc97038 100644
--- a/dev-python/vncdotool/metadata.xml
+++ b/dev-python/vncdotool/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index e35be94e08e9..24d32255b275 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,4 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
 EBUILD voluptuous-0.12.1.ebuild 536 BLAKE2B a38ff11aaf00bd538a5442f469c76a0503ba2cc03797928da6a7859f9b5b7f252829fc755746e3c64ef69f478d899f4c1117351e62a9c07dd57fba40365e3506 SHA512 4ca9af72f499ed14df192d9141001294710a0f9e4546f384da6321bd3242dd2b13b61dd5ee639d3d1dfadc53222ad4ebd7ef119c9d367b6b6f3f949400e9836c
-MISC metadata.xml 715 BLAKE2B eabd841d6e3b41642a3572c0f46f0c22cfd61f7afc75e53992dd3e32a3f94e0ce5014e6fcc2bb40d01ad53c7afca5806cb644ce432a40105d574f81bc0830ccb SHA512 4e17933aa52bd1ae97997122285712acf1bb1cf6b40e7ecc454a55b9fa729a34bb8bd0173f949ecfd9adf80f19e6e2d8b4c173b8db599d4cb434b5aa06dab9ed
+MISC metadata.xml 715 BLAKE2B 92fb6bc999d76837e4be608825631148540662d16e6e37aa0d456e56f8a541a383e20a06973c2bb6ed0fbb9863d70ef38781017a18253d891518c91ca8306b83 SHA512 30893147da484d6aac982527f9a00c59d7a283239482eb65f9d191751443d436e65b98a66f0bf9857df51d4497235b84db9dfa12da6d23175f638edaf6fe6396
diff --git a/dev-python/voluptuous/metadata.xml b/dev-python/voluptuous/metadata.xml
index c7e7ebdee23f..73ea6429981e 100644
--- a/dev-python/voluptuous/metadata.xml
+++ b/dev-python/voluptuous/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 42f8ab0c0de6..b41267e1c570 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,9 +1,7 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.0.0.tar.gz 95475 BLAKE2B 8955a1428d383ed78691274dc52e1e58b3ca4602eb89ab67a81796a685bf15948d77edd4a704b0fda7ea3a7472f3545389c99c4e0247f05df34372ac6ccaa8e8 SHA512 749c43524c21b45cf3422414ffdf38d595c6def66f164fdb77b0e1bc87dd1a971fed21b17036c3a96d64d3f28b7f3c0e018b26d4bcf7769c68f310101e5eeb61
 DIST watchdog-2.0.1.tar.gz 95093 BLAKE2B dd59b3be1ec1a33d3f015710c14f3d2ba6e652a36841e7405a879625d588a3ec4d18c4791e6d8808b0be75079588ced2fbc6ac103645520ab94f085ae8fdf3ad SHA512 25e93505daeb3d0d9947212099af3a975cd8c75a1cf93ea5fee59de50471becad2abdbbec8a44afe94b935599768f78605a48c196c3c3ed6123fedfb4768e3aa
 DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af7398ced73aa332e57472cba2f5ce2ce1b96a31d3f5f3a525cabf81d5de528d95d0c59148150f407abb8ebc64538e SHA512 6134ad22b350b7b2893b564c4f02bd35b1be515fa18dd7f7000b191994b5ba48c5bf573819d2f363de227481a6bb8a0a14973e7c6611de367df2a3f228656ed1
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
-EBUILD watchdog-2.0.0.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
-EBUILD watchdog-2.0.1.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
+EBUILD watchdog-2.0.1.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.2.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.0.0.ebuild b/dev-python/watchdog/watchdog-2.0.0.ebuild
deleted file mode 100644
index 31b479a03ebc..000000000000
--- a/dev-python/watchdog/watchdog-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	# broken when django is installed
-	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
-		tests/test_skip_repeats_queue.py || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.0.1.ebuild b/dev-python/watchdog/watchdog-2.0.1.ebuild
index 31b479a03ebc..8e5e59165960 100644
--- a/dev-python/watchdog/watchdog-2.0.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 1e28b07b2bef..14092db05d3f 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,15 +1,3 @@
-DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
-DIST wcmatch-7.2.tar.gz 105087 BLAKE2B a28bd9d02468f3ca83d606ee7f7d5c9b6b8883cf6e0c04b711765aefafce189f7f524a490c6831a739b579be66af5f4b1c7b6373da22e170211e611677c5788f SHA512 6fdc0a3cb6d66b323c509a5ee34c1e8df9a46a93fd1fc0921dfdbc17ac604934fdad3df5e8f253aa6a880bea2e81bb26ec097b9503c920433c5827ea91b327d8
-DIST wcmatch-8.0.1.tar.gz 105948 BLAKE2B efa23d89f01b91dfb06885a9dcce94622c76e889fa7a0d8ed839cba1eafac4bd3bd1f9a8ccd95d0c7f3a6d990346de2df2bed05a1ac092b07076c548e61b77f0 SHA512 ae99df5ea8f2d1c9e0e120ba23c36dd7b0b13832e5ee599cf08dee2c93f624bab550d937743a3063fac8cce6ce18f56582380521aa3860f220abdcbfe9461dec
-DIST wcmatch-8.0.tar.gz 105910 BLAKE2B 228295a28511ac8c534feed31459dc3e75316febc377473de6d30075886cf33262d6f97931c134b5aaef9109216a4b50383e884e9f3f370849e8a1ac5af5999a SHA512 94bd02e02d544746b678704bd77c1252bd569f1030316e2617f340ee81266dcba398a1a6a15d9460203e681a4825a853cbebee3681d8d338a17ef9ae8d9a03ce
-DIST wcmatch-8.1.1.tar.gz 111931 BLAKE2B 0ec1bac5b26d3f45dac1b24eb3994b803e2297d064277965f6f46e23db3841f008dd6d9ebe7914c68e9c4733c5455cdcdb9652be0f6a1dc3674eaaa28666a91b SHA512 1e31a2a9edf25a7d7e64f8e64a6d8b5e00595ce4c9ac4780f073a2c8d0c123d33860f0843c8313de51478e927746f5b56902afda7b1dee0784dfb3231eb807b7
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
-DIST wcmatch-8.1.tar.gz 111866 BLAKE2B c896c67437e28faa0accc47f2faacedfcd9baf8f3c795f4c4429eb91bc22c0e71668db58979ee81356d5ead73e244ac2d13053ef421b8e212efd3a3feadc4eae SHA512 fdb06c46d6ea83f02f2a4ac8743431d1b7821188a6ad9f845c583707091cbfd1231d1970ba3cea92e993583ed91ee314f04240dcb9285f6bb5624bd4dbae8743
-EBUILD wcmatch-7.1.ebuild 1282 BLAKE2B b20d13b6cb341a90220bf601da53c5988e8bcb8f343236140b86e32b8bdf5d53b69b289f4a944b9544a5f950e9d285cb445c5d039f9b7bac4c16013eb6f69978 SHA512 a6e4a2b56a383e50ce8ac772e8db214da0a8e76bd420ad61b58cea1e624c429a73d010ca1400867fa2c8652c3636d0d02103468feb23e0d265be938507dc6e0e
-EBUILD wcmatch-7.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.0.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.0.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.1.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-MISC metadata.xml 3008 BLAKE2B d7abc1a9ca8152f4e70c187503e1cd05181cb1d67343c5e2d62112e35171b0b528444f2b13ae8f2a0e86f29837795915b20f465fd286961decccc22052eea1f4 SHA512 331e3a2470fdeb5d88e92e8c2461c5253bf09084c5875d458ec0aa5263bc19240dcf3fdc85530c621d09e9498c5dc5d1a4ee47abde709edb6b51bbfeb50df29c
+MISC metadata.xml 3054 BLAKE2B 1bf6616d3bece8ce2c1509bf9fab839757815a157feba7f96edb6012ad96ce7985de7e82f6d5448aaeafce5c323d216ecf856aaacf20f549687778bc7f204574 SHA512 3a934efa28323c04f175c5ba54b400ef5894fec706de3f93efb029ef01e976ef4c96354f66b8a1c43a177502b8002bc4d605107b5543625bdb44f45b81aff076
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
index 5e9ad1b81332..5320e20ee0f2 100644
--- a/dev-python/wcmatch/metadata.xml
+++ b/dev-python/wcmatch/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -44,7 +43,7 @@ Features:
 		Allows for a much more configurable experience when matching or globbing with many more features. Adds support for ** in glob.
 		Adds support for escaping characters with \.
 		Add support for POSIX style character classes inside sequences: [[:alnum:]], etc. The C locale is used for byte strings and Unicode properties for Unicode strings.
-		Adds support for brace expansion: a{b,{c,d}} --> ab ac ad.
+		Adds support for brace expansion: a{b,{c,d}} --&gt; ab ac ad.
 		Adds support for expanding ~ or ~username to the appropriate user path.
 		Adds support for extended match patterns: @(...), +(...), *(...), ?(...), and !(...).
 		Adds ability to match path names via the path centric globmatch.
diff --git a/dev-python/wcmatch/wcmatch-7.1.ebuild b/dev-python/wcmatch/wcmatch-7.1.ebuild
deleted file mode 100644
index 4fc94a4a4728..000000000000
--- a/dev-python/wcmatch/wcmatch-7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch
-	https://pypi.org/project/wcmatch"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# no such file or dir ~homedir
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-7.2.ebuild b/dev-python/wcmatch/wcmatch-7.2.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.0.1.ebuild b/dev-python/wcmatch/wcmatch-8.0.1.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-8.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.0.ebuild b/dev-python/wcmatch/wcmatch-8.0.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.1.1.ebuild b/dev-python/wcmatch/wcmatch-8.1.1.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-8.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.1.ebuild b/dev-python/wcmatch/wcmatch-8.1.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 4c78441808d8..8eac24659cbf 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
 EBUILD webencodings-0.5.1-r1.ebuild 692 BLAKE2B 65247d87d8553072c8da00ccff0062560e906f6242ad1d1e4bd7bca40c7936669d06a8878d2bc1cf7e67690c54aeeadf7b0cce74870dc53200ce355b5a502c32 SHA512 222122f0870c90ce5f1f36029c2b86b5f3e3cd7727bb6eed6ce512cf2ee8cb623f8714e8bee890e4837244dd63fddcc4e70a40ebbe8064165f8afca36b5e62e9
-MISC metadata.xml 601 BLAKE2B 1611511f6d29c01cec657104f06188182e5bdffdfd95e0d1df407e9ce6697f3b89294221028b5f1d20cc09566ea505a33e8f7be068c7bd17cae761a0e2b96858 SHA512 aed1b164cc066e122462888591003a5a6cd8ffc4a151a8c986f763a262f35674bb7d741268f1efe413857335e455d9ed24c1e9d10e0bf37142158e20fd460dec
+MISC metadata.xml 601 BLAKE2B 7aae19bbfaa3f6438cabb4ffea7382bae8cb0943c067196f243580642178fb5d8904cc817185c9c99f5acd66d262f7f662e4157f3c98406af82126e337d619d1 SHA512 a42f81e499be46efda6ec91c4f174465bbcce9fc7fbab0b65bdfcb1a7a15b56eba95510d83a2910ea15114e051114b3435d35c3b934777c67c9397cb80e7c1e1
diff --git a/dev-python/webencodings/metadata.xml b/dev-python/webencodings/metadata.xml
index b0eb178859e6..be3e42a4ab28 100644
--- a/dev-python/webencodings/metadata.xml
+++ b/dev-python/webencodings/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index f14079ff3c64..77f1ac446fcf 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
 DIST wurlitzer-2.0.1.tar.gz 10638 BLAKE2B e5350a3920ae072f93a0043ec368766d8e190558b3e897e68b272b06d0d6ff7907f2aeecfd41a99b54804a596ad9f7d7062995a5c465724a2b87419ee801daa3 SHA512 06f67b666c2a364b5ee497fa2f0ab8640aeb2953b678e35b13e1558ab29bc5554f479731f9942d8f033275f5151bb9f86408e0f04b1120bae0f29b27649d783c
 EBUILD wurlitzer-2.0.1.ebuild 567 BLAKE2B 226ea4df6f1c673a0a1c8a7c07273358d1a08605d09f46c1991d773a1d97b9a3c267185cb2603d70e8dd4b1b7fe35ea15793564f50069e8a67b5a9a0354b45d1 SHA512 dd96836c083d3e107ff11786a0484f6c27d315aada50b0a2e5bc993eee7b838c02447282b9ae50b6f955d7ed580a0f9290e0afb2669d14358256fc3f6b68b13e
-MISC metadata.xml 502 BLAKE2B 78c6bbe92aa4613160a279a017e5beeaf5b5b9e6c2414572943056061138a6120fa87d4e768166d57cea6e1e3ac3686c5d1b32223f1824a30e630e8f0171d0d4 SHA512 5c51e4c9bdc3945ae89079b53a65795b44d188f7cae8893ff981bc628892f69b1352a11718adc2f1f3a06fc924cfefdd1c1e5ffc594671298830e6dfb2c806b3
+MISC metadata.xml 532 BLAKE2B 259f964c223a5889699b49d49bc6152f6febaf6abbb5ec05187917b028c53f77cea4a48f7c57fbbc519a137ea6e72ee69368c46de5fc52cef7dfe9297abfaccb SHA512 8671caa64f777b76b176b686c6fafa6a0921f916d02de6a83e0229cfa9b5da8e8da8c1686413babc0d9b68894d529d2b8278579af1f99ee709f22d92f2cdc45e
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index 6371903dc20a..067874164e2d 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrewammerlaan@riseup.net</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index ca3069451d45..55767441eee0 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
 EBUILD xapp-2.0.2.ebuild 561 BLAKE2B 1f414320c5c90b1327885ff87a7595981531624c770ff49a992be274a466c170ea6ae6c1c99cd71904bf3507e535bb74a47592a7d1c04c17055ac90025783125 SHA512 3a13b8c5a56f9c0099b13b0a5b6e3172e5c8b08e253ac5adfee0522e3a405648af543e18a925051052b438d2eb96e0183dac89af57923c6cfab40adedce39ff9
-MISC metadata.xml 608 BLAKE2B 6b8538c23ad6bf133bbafb9daa5309af7f815bf08b47b35e178a61fd39a2cde883f0ab20c69937485db814952faf764a2850a7e304e3f776c694feea4c982301 SHA512 5e06248d4f598550cbfb5bc3a29fd598d38c3a4d219554852a0b01626c0b28efa0b2238b6c866ec3850b6a55d6014ab1148e6ba7137e2c0da4ad9f31ec62e7ab
+MISC metadata.xml 652 BLAKE2B e2fb278453317a585af31610b53cbad20c658888e1cf6db4ceba101393cb9e06d3c257f5c5c42dea492bf07740966e8ab0708495540b2af9406859e2f3a31ee8 SHA512 c7245e531114a6602b53f6338951784904c2f877cd4db9bb0f5a99b58e356ce9e9935f92df734249024fb9e7462a317171dc33e0dc03c82be58eceb972070f16
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
index 584d5f15ad46..f0eb26363477 100644
--- a/dev-python/xapp/metadata.xml
+++ b/dev-python/xapp/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 2724f10dbd27..04259aa20e52 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,4 +2,4 @@ DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df
 DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
 EBUILD xarray-0.16.2.ebuild 934 BLAKE2B 4402d76bfb14c4090254bf12d8bb7a5dfc222d86d706e24ae6bcd6f31dcdb255a216145a45f15e86dee6540fda985ff22b9783cd5c05a39465ad013cadb9d946 SHA512 6e74373e5f62a76bae465b1d99c1ac5a130001901faf325194c0e078f0495ab31005df60e63bb7daa9d64475ea8adb0a50468d2d5837cfcdb8632cd935111382
 EBUILD xarray-0.17.0.ebuild 870 BLAKE2B b0f280da2d5c3724c8082abc030d4a878c027fb177ee395b069909561e2c0616e9074faca18a6c74511cbddc14708a0b2e633d1586ece6b0409d67390bd3e13c SHA512 bc2618907da939eae60bd5108ad42086cd77e877863aa1113b5e0238c50dd05e9881ac71294529c35e04656ed018e757c8d2d7f56428845d3442b33934a1f2c0
-MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
+MISC metadata.xml 508 BLAKE2B 173d15b73f7a3566c657ebf266b60c4c5b8b92e120fe5eac24bc7fc56faaf9378812386506914372aa9b65e49decd11e1f0e55b33ae41b1c51cda2a20f1bd23c SHA512 988742c143bbcd35de2bd649c72eb8db09f3310014b9a93033e383e1c8c6e799492616216b8389f272e46aa2afe925279550094049b9df2850f1fa78b6071966
diff --git a/dev-python/xarray/metadata.xml b/dev-python/xarray/metadata.xml
index e1094096d65f..7f79be113693 100644
--- a/dev-python/xarray/metadata.xml
+++ b/dev-python/xarray/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
index d9b82a7a81d2..c0cbb3e5561b 100644
--- a/dev-python/xdg/Manifest
+++ b/dev-python/xdg/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-5.0.1.tar.gz 4120 BLAKE2B f80ca1ec0ac064d64a2603f101301d427e7b64133eede1ff0770db0b7ba4368c8640b2d2eea8f1d28a52874a6b632ce83d969c38a036c970e20c2abba3a1f98c SHA512 c6da757cf0fd11a03d97506f7b898b902f560cb74cd9a90ed55550d89bf60eef5e32abe2aca19816279621e6ad0ad7899c7326b126a777231c67cc6cb30b766f
 EBUILD xdg-5.0.1-r1.ebuild 496 BLAKE2B a74f2ae47967c71bf0743ce426c6ee037c26f21f92d53d6083b84f4de9f447ee73076f0509de97dd3d5c4a43b1217e54fee471f7d914c46c9edc4a7446ff0688 SHA512 a88d3467b63ae8109d6ffa776c65e4984e1a09fb34eb1a2dd49829e69299e70ad8e1d12897ac37065c8ad09102cb5c01a03c4724e6684dbea623d0bfbf5c820e
-MISC metadata.xml 512 BLAKE2B 30af9ed234e57029ac520d0e0de3f5f819ad876d2b771d3e61dc7386f51de8e2456330b58df6c58ed66481e97b5af1065690ec016c9cfcd97e248d36cb97be36 SHA512 8e7a91ab41040620c24048a500c00b37b6808ea2605a6d544683f84045ee68d1d111ed60d94b0ad49937abc5ceaebe16db9a06d897763ba5e0df68677f01e994
+MISC metadata.xml 542 BLAKE2B d815abe897dfd37ab9597d5c10676cbe6b1db53524455ac8aced4fdee49fe375ce03e0f6ae7525890c8be378986b8f19ca16ee248f66d93cbc39701bffe2776a SHA512 1f2eb6872e2faf63ffe50e77933025cc1748e7c771474ca3029affc4299559497410aa05c3c5ef2dc4c183c018374c96ac9564cc5a7052b3e47442e520a69544
diff --git a/dev-python/xdg/metadata.xml b/dev-python/xdg/metadata.xml
index bd98a9488610..01f861cee2a7 100644
--- a/dev-python/xdg/metadata.xml
+++ b/dev-python/xdg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Kalin KOZHUHAROV</name>
 		<email>kalin@thinrope.net</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index d8907f6a933d..6adda7cf4337 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,5 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
+DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
 EBUILD xlrd-1.2.0.ebuild 649 BLAKE2B 281e08cd55d05a5c8c749466bd11d1e3840aff8b25fd204cab482c00f908f3293519adcdf764dd3a1bdd66fa823519b2347b0944d895f7d929a7501b5f58b94e SHA512 c626a7334b040d338b60487e1e82f174adfefe6d7c09cdb4c6b361a36052a08dc49c172b0156a35618d65d0b444c16a3156975fa48e7b13e754549aa659410a2
+EBUILD xlrd-2.0.1.ebuild 555 BLAKE2B f5376caa8fde031390e5a9e54828932e2f8e4ea66dd96eec85e33c2ccee369250da6bb19770e44c91cf23dcc906315169d81f410818150a4c699e2fd2da0eedf SHA512 fe18810d0c8c58f95158315ea880770b589834ad358e095a907b1ff97e5b3ef55468bc389809aa622679500197d4e5e1f77b0744f9e44c3f01c110aef1b1c1cd
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
new file mode 100644
index 000000000000..af980a3294ce
--- /dev/null
+++ b/dev-python/xlrd/xlrd-2.0.1.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="Library to extract data from Microsoft Excel spreadsheets"
+HOMEPAGE="
+	https://www.python-excel.org/
+	https://github.com/python-excel/xlrd/"
+SRC_URI="
+	https://github.com/python-excel/xlrd/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 6c0d06afdd42..5450bc7b81c3 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,7 @@
-DIST xmlschema-1.4.2.tar.gz 331747 BLAKE2B 013a74e7d929e46d497a55ad67888f0dd25b60097e390c3ad3b69c9a87d9e5a83bd68873336137805d755a47d0e5cb5b7347403ee38bcb7457e70803c6aca2ff SHA512 a490d1686f3e8cc7fd45bcb51f00ddf8b734e0c928f8690f9988232f8781fa070f7f03be7473ed5e8b3d1ab67bb08e123c79b408c3daaebfd2df0e94c8827888
 DIST xmlschema-1.5.1.tar.gz 349788 BLAKE2B a46aa6619594de4db31158f26def3dc070629cc29112aa02555c2479f57883d7d5afb82cbc65e4193d607b2572049ff7da8cf3cb14850b0a6f3166ae87d86928 SHA512 5e8b3adbf8c5b4ac6a85a2d9b62212870cdc6639634f9adf9d16499d86b9cc73fd1fc6ba496f14d840ecefc60f175c62f077a62bab68bd057150889d5ae0a872
 DIST xmlschema-1.5.2.tar.gz 350754 BLAKE2B e00a25e12ebef613f4d89522e059fcbd41f28920da62bcf8782e6c345b44133072dd578ef547d51e547ed92e5424fc9a885f1c789544f83d5cfe1743fcbe2f30 SHA512 8ab6de10c40aa96f57c4dbb37af2256ec46b28a844f3ad7a44f6184ff38687581c7f038ef87374f49fb204f48053c4693a98fa79059e9074745e0d2a6f353bce
-EBUILD xmlschema-1.4.2.ebuild 772 BLAKE2B 1593c3bfbe810a9e0008274d7448ae5b3f7136acef53029e0e573290356ad4bafefd2609fe9da0574c91f74e5e27b398e91a9abaebbaac470ac61c87635d0ea5 SHA512 4dc128cafdcf184f1d3ca3b8795b61e5d20ef9f3cded82bee83bed46e479c58b814c3158a763d3b6219acb9ab9889536f93cfe526915bca07241b3da0d79692f
-EBUILD xmlschema-1.5.1.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
+DIST xmlschema-1.5.3.tar.gz 350684 BLAKE2B 5dfcd2e00339caa834195729cce1604d17e5aa4705150649e22bebe3dc7b3ac6ace5dccbc7b6313c5cadb5ca29992853191afff2f76f05d18c10294131a904cf SHA512 3d86dc407d3181bf5c34b2d6aead9995eca1b7210b39ce3cb95c5655fa0cac0bbcc9f15c6ac016aca69a23f19befbe0525d6f13644b68fde348dcd0fd03bfa73
+EBUILD xmlschema-1.5.1.ebuild 809 BLAKE2B 6b29d4d472ca9956ed9120a9e0fb827dcf1f0e85580356655a6a91e14e30d74748eda7360b04a5abf8b0816f8b6b396189cf8759ebaffbcdf439982e2850dc42 SHA512 abea1108261b85c6259d9a409e78b5a7526ea3a41eec59ba046378d16550927778571605a40ea1035630af7d954ab7e98c2d2f84ff8d1e8a610a17b2a9344d50
 EBUILD xmlschema-1.5.2.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
+EBUILD xmlschema-1.5.3.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.4.2.ebuild b/dev-python/xmlschema/xmlschema-1.4.2.ebuild
deleted file mode 100644
index 7b6ad7f7c18c..000000000000
--- a/dev-python/xmlschema/xmlschema-1.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.5.1.ebuild b/dev-python/xmlschema/xmlschema-1.5.1.ebuild
index bb3a6af5bf3d..74b889d26665 100644
--- a/dev-python/xmlschema/xmlschema-1.5.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.5.3.ebuild b/dev-python/xmlschema/xmlschema-1.5.3.ebuild
new file mode 100644
index 000000000000..bb3a6af5bf3d
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.5.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 188710fa6f44..9faa8c0777e4 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,3 +1,5 @@
 DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
+DIST yapf-0.31.0.tar.gz 176856 BLAKE2B 080867363df59615d1df77ef51645cd68d931251807da83c5b9d8737a89b01e8dee7457a2b524a76ad2eb21b859ad78168a30f706ef70c3b07bcb94a98990752 SHA512 5f376e985e182aab289c41e4071fd98c0784e5292974e2efcc4beaaca68cb83068b297e228a46f51f0d9370634dbd32948bdbd03e6b65c76b43efba0fe0d3454
 EBUILD yapf-0.30.0.ebuild 456 BLAKE2B a49e337cacc708031032a0116941e0355e99a6414ab3e5998b262579546bc47fa9cf23e8b5851fc5ab98e47610d3f4472a38f2c931152d50afd64f255b67bf60 SHA512 51183a95a50b3a420ed7316b2697be292bb74db941b53b5bd3ed82c6e7acc8186fe863d051249ae8237b2d0cf4292e7d3f81bcc20671fa1708495b4f74c744e4
-MISC metadata.xml 727 BLAKE2B 3acd37b0cded42ecbf0b61ff4f00f42931faf26e9a6037e85fff98100cb19b56ff047e4c0dc460ba072d28d5fbea90b8bc4c3f2da68671f9a9058f6473428aa8 SHA512 e763eefd7d6ad3dfd308b96d6eb4f2c8267cbb70007bd3173dd3ac78b11330d55a036f36d6b934fcc9883d2734b170825598012e31af0a914111f3d5cd89785b
+EBUILD yapf-0.31.0.ebuild 633 BLAKE2B 6a2fd35fb2970559342599bdee8aa6dbd8f1b7ffd352c588454fbdfa721b3fb7913e2458bde29c7427d1a3d9a6b7a61ca280fde286c8332384050ada82e3b747 SHA512 6e74b737d344685b1df06b31e43112a55728061533b578df65187afbcf8d8df94b642432d69f6617ca505927a95f5b22c274174623e7ec541cc16cfe898850d7
+MISC metadata.xml 757 BLAKE2B 069cfc9b7a6c7b01e7dbae1e3c971f7fdb9a39fd0c28b3e8a66a2ebeda44320f828c5544247cc7c03e2035c5c9c38fcade775e5a9b5a8725a67e23ea0b1b6c8e SHA512 8ff6be2cbfc43583ddd7a9868087c9e3d66ec7a4fae85db5926c3734f04b38a453525867aa683521a01fa548fc8b30672e0b5ebea2a9b88944cf7b756aa02115
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index 7a140e2fe76c..2b797e12b1d3 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/yapf/yapf-0.31.0.ebuild b/dev-python/yapf/yapf-0.31.0.ebuild
new file mode 100644
index 000000000000..ae91972059f2
--- /dev/null
+++ b/dev-python/yapf/yapf-0.31.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A formatter for Python files"
+HOMEPAGE="https://github.com/google/yapf"
+SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 800e6888d494..8427c7e921ec 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,4 +1,4 @@
 AUX zconfig-3.5.0-py38.patch 4463 BLAKE2B 05d79cd68ba04ca55fb03f49ce5f2342e4806d921ea8e8a516a4d5ea841187be90a1a5a1a5ac4c14ed940f8c58773260a27d6617cb3e2c60b61f7764d1357ac7 SHA512 5ba6f4d6742d926bea2c19afa3ac130f6f6fd2527f3689b793a498e1a98e1f735216102ee49a5e4246af7f86b671b031a7b3b026001f4965f321f774a9590363
 DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558
 EBUILD zconfig-3.5.0.ebuild 923 BLAKE2B cbd0d03bf0fac44fc514f12aa80447fa9cd583e203fae09785f4cf4330e8a7b92214e93fb8fea1f448dfd321279bc58dadb72bce6c726e8f7faee884d03fc89b SHA512 6954cfbf485c7acf8e076f8cbde95e1d8302dd9d19ae3dd4aa1ffb415b3ea102edd8b9169778c6de84d8dcc269e7e090abb9f122cdad903a194cf2c5b3ce77c9
-MISC metadata.xml 1517 BLAKE2B 171f2c7c76e86375f6d0bb0a50f17abe2e1dc7544a8989b3233c0fc54fa330af0b6f50a23a844988a4732d5879145c9fea78740ecee4bc1c8d87deeb7c45e740 SHA512 afcc2a2fbf0592562f726c4d2c5dac31cb401c12e06121b49d3f5c5c177fb90cb88ef9eba9a995e09c66341b948a8b5703bdf98da3e30addd1b288f5dfc2b4f0
+MISC metadata.xml 1547 BLAKE2B 3a8a54bed981e280caa705613b73307be8f9224cd2e441d79277117977e0d73b067f98d6a7404e2e0ba0b89f5313bf126343e0db4ba0c1c6e2d074e0d61b0a28 SHA512 2d943495357baba2834bce89510210154341838a7c6c8af64cf3593ff65bdee850737a4b3fa5bf3b887849115d38144057c813d34aa577d5fbc0cb1292420d2c
diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml
index 82055c0c5fe6..6220f67c54ba 100644
--- a/dev-python/zconfig/metadata.xml
+++ b/dev-python/zconfig/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index c4b584223de8..a5cc8f6599aa 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,3 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
 EBUILD zeep-3.4.0.ebuild 1100 BLAKE2B 7e843619c6d9d9ec04f543ffb5855163e707353324d5a0255e16b225203a185cc2d8f3c83373a81446cb05d1993158007b0421fe5930831c8be8329eb71dd424 SHA512 639fbfe9b47b3eaec46020e0098a7cea2add9eef608eb1607832452a465d26be0f5f99214aa03857d98f5e588324f032b9f9fa1827fbff3965ae1bbae986236a
-MISC metadata.xml 501 BLAKE2B e687afec70f3c42b91871c4a5fd797626a9a6970368256d5bc5f69653125ac00f5a46a409e25da431ed5f4a7e3c03f7521ee80ec863178473dafb3ee6114064e SHA512 32553eaa2336be92c78412d2253f4e299c793fa9a42c8c4f3d969880a4b356da1d43d62bf1ea7866b1e462075b10b1033a7a3713086bde6d8eb0bcd829c6a144
+MISC metadata.xml 501 BLAKE2B b8c8d3138c026a20af68b919d1605ae32145216e4cd7d229d7c2ccf50034275553741638240b479fc9a6f42ed3b2fd46814aa81bcb698bbbef533c48bbf55c4a SHA512 4d066a86568b6e20c0e899e836d53c606d342589ca425b8c0fef615ac29876e3ed67adf1993161f44eee8c263e372ec7ae506218a39c74cfa7bd891b3ef10a25
diff --git a/dev-python/zeep/metadata.xml b/dev-python/zeep/metadata.xml
index 3495af6962fd..1cab8ed34b8e 100644
--- a/dev-python/zeep/metadata.xml
+++ b/dev-python/zeep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 1260977c33a5..c9727a19752d 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,3 @@
 DIST python-zeroconf-0.28.8.gh.tar.gz 62107 BLAKE2B 94b910be9f95f8b50bfcd5fca102663713234d40a0cf90c5b94b2ab4e85ffd7363747a0fee2f7a72a3bfb74faa1cab703dfb8bfe3cef80a0495efe2c81d0c2af SHA512 ba599fdd44ecdf3da71ee2a155a47e6cf91c8f4fe3efac428f6e99feda052019423a8a3e775d6cc4624697fbfcbe207829a41ad76105082fe62e81eead2f7a34
 EBUILD zeroconf-0.28.8.ebuild 871 BLAKE2B 772550912df25c87816e8b876f67d30202412eea4cdc90e2d78145ae1f56569f86fc4b6d5b90f2994f843b9ed705eab59f9d0797811fbf522fe46ceaaba4eb59 SHA512 5fd62d1e49db89ad884b0484251e20940685ee1af8c26480caecff6fdf9ec10ad03d67fb92caabfcf6e79214de34b1a4709f318d297f0904823d87973f58aca4
-MISC metadata.xml 412 BLAKE2B 6a739488228910f36342ec3ad1eab50ca3c58c5bb1004d23e465009179dea3452558f3119f6c4e4a6b7b62bd0729fc3ace9a8c2be673ce6b1567181f7acf50db SHA512 86d45467ddb20b64dd7f868fabd1a8ff98469f8fa1cb99ac5f6ce1535e798da06bf78276d8d242b04056c07a195b8406bbc558c09aabb55c25cd875c44b96bd0
+MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/metadata.xml b/dev-python/zeroconf/metadata.xml
index 37922c45a3e2..8e1002cf98a0 100644
--- a/dev-python/zeroconf/metadata.xml
+++ b/dev-python/zeroconf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index ebdef6b29f93..1b7a17646420 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,3 +1,5 @@
 DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
+DIST zope.testrunner-5.3.0.tar.gz 141406 BLAKE2B f3434e9f22514fffe912385f61d163e42ba1dcd9e9d3f2b3f1d504b608c73804fa38b14a5ed1bf288b75b98ef106024a27de925c404ad67be6acc6c1d6c8f06d SHA512 6fd9375c7b58847868aaf04e85722fcc2b1fe7a8e4ae2ec9103dcb091e6f837d649557ba014146876f814345240b20863bf1584f32212b0b1b28c38ed343b87a
 EBUILD zope-testrunner-5.2.ebuild 979 BLAKE2B d276c1fe01844f1c157def257119706ed0b241171f62b53deea2e70569f2d62fcdf6d754d274610a78c55020c670ca1797a61bc3b2ca3769aabf47abbb636c14 SHA512 89c2233d5caa6b8adf7eb5d4b909e554bc7d57e10051e53e18e97d3759cc5570423ec98fb6e6e381e1a6839fe45dc71799da443df4c01f73d22454ef9b211493
+EBUILD zope-testrunner-5.3.0.ebuild 983 BLAKE2B 326dffbafd007a86acb45a2da14a198b6657d41e8896e90cf6219290a12971bb6636402ce543f50d01b1ce5a6f7945a80c9267b70c8ab380008facc79f5608a2 SHA512 47cd4ed7ed1d8879bb479fef902f73ed9321dd75a0945cc79729d07f09e8abec3f43201e2c8f04b4672e919611ab3ec11be47257309dd860d3e4b2cfb5996653
 MISC metadata.xml 412 BLAKE2B 2bad0bfc23c6d11a25bb7aca8590bcd9efc8cc181a7aea19583dfd0134ba45860c787ea557374d8477dd336d8c54ee8a2f6d0e9b638b3f6c0e717924656b8fb5 SHA512 c147c65955c3436f1668f2b295cb63db1ecfe93a36ff944cee7abb3e4e722198223f05d2187dd637274f906e729dacd73f8285c91bf0b462082f5260ae52810b
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
new file mode 100644
index 000000000000..07f992c4b75a
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 1a8d8f54cb25..abf223db65ea 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -4,6 +4,6 @@ DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
 EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
-EBUILD zstandard-0.15.0.ebuild 783 BLAKE2B 89e7f68224ee060cca75e92bc1bc714b1163752204f9fbc9184463325847006ac516874eee2b5cbaac862cd0a9cd30767667843ed3b9b26edcf131643ff4e14d SHA512 f88092d3e344b66f42082d85880fb3ca6ff7c3856efbc662a660ecebaa765e05d8726210cea88dc50d4fb0a9725f639c763961ec7fc609854711ed98b4d5b118
-EBUILD zstandard-0.15.2-r1.ebuild 1049 BLAKE2B b08d6bc0fc7dd761c0555ae913feec4e2d9efc7466ff9a63b05d0eb23bc400e7fc75c3747b74438a61e5d9444f2cb27f9f73ec65e70b99d4a0576b864ad8f5a3 SHA512 20ef99bb5f972af33cae31a00d4959ca6774a2b5c33eb41363ec380354915fbab2048ea6e949f6c25b4445517af3048b5ae6e8fa2e1286ab0d4217c6c8a436db
-MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
+EBUILD zstandard-0.15.0.ebuild 782 BLAKE2B 77cee07bc39839f2ac0b4f30921f67bf86be7e54290430fa17e395d0f867298e2f28ad7ba2af91e07d98130aababc8400a7a63c1cbf80145a69056ef6380a2e1 SHA512 370197c9bbdaea367cf9a85e437ebc859b171387432747bf6c5f61ec8b9f3d821a5b3fa2de80b5dfdcb1ae1b3b1caa29c10ff833b52431d57f9c43d1e76d9aaf
+EBUILD zstandard-0.15.2-r1.ebuild 1177 BLAKE2B e2089e7c8719fb8d24fc6464cd7b44a13e3e87c454d0e75184185e0463ba9db4a50fa54e207e026507f0137d53e84908081acd85e787f6a66013dfa523e04c2a SHA512 b0d3b7d18a845f97c3e754496b86169fee89dbda298d71efd194df438509e0cadedd9f84fcb0811ece8a9193689d9541a172d91f477f947cb49ca9a840e5d19c
+MISC metadata.xml 377 BLAKE2B c14803b618b3badd945f8b01ca90ed6f809d9d2648ccb59554f947fbf5910e613f741f83cc020b70831ebf70b579a0e1ed33d3f5f72b858ff280082938516196 SHA512 fec606ee1d05384ce4433e90433e54925443afae244ced5276787a6f416a96017dbfd03dd9ec15c2526a943ff6348827e13719152478fb2cf609017cf8359a45
diff --git a/dev-python/zstandard/metadata.xml b/dev-python/zstandard/metadata.xml
index a78cce7ae832..85172884ee7a 100644
--- a/dev-python/zstandard/metadata.xml
+++ b/dev-python/zstandard/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-python/zstandard/zstandard-0.15.0.ebuild b/dev-python/zstandard/zstandard-0.15.0.ebuild
index e36e8f81b24f..a61f946bc5ba 100644
--- a/dev-python/zstandard/zstandard-0.15.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index 1fe9edfd1a63..5d62182cb8c3 100644
--- a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -29,6 +29,9 @@ src_prepare() {
 	# the C backend is repeatedly broken, so force CFFI instead
 	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
 		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
 
 	distutils-r1_src_prepare
 
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 798946cc5b3b..b549da016f6f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtstyleplugins/Manifest b/dev-qt/qtstyleplugins/Manifest
index 0f961df2d41d..f120153aad95 100644
--- a/dev-qt/qtstyleplugins/Manifest
+++ b/dev-qt/qtstyleplugins/Manifest
@@ -1,4 +1,4 @@
 AUX fix-build-qt5.15.patch 2651 BLAKE2B d4b058715e76f2721bd39c6499289b959daabc1ec765af1a87d0796eb934a49bfd589816dbfba6e374c5cd61a3d3b2526f25de21108fe6a0a7f352f57e899e5a SHA512 181bf85ad054ed5788f1bd4c32116729d57f83b8a4fdfcab3d3185ccd1e557b9492468c11c53a8a54c858967bf8298c3bd1a29bc100a8ffc6561ec543361f8b5
 DIST qtstyleplugins-5.0.0_p20170311.tar.gz 306394 BLAKE2B a59343602062ec1d0f215acf568322a5be874552b0c03dec75f268cec2123b1baa30bee524e36c9d522a8c935a58f204b5362feaf028df87ca10ea01dd29b3fb SHA512 e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d
 EBUILD qtstyleplugins-5.0.0_p20170311-r1.ebuild 888 BLAKE2B a6bfbaaa0ae9d995e9b5ed2255d13edc284f99cbde42a616b3bc151bfd8280de4e49b01243b63796a4370c35886af46c96803a36c22d4b9fa04e406ca420479a SHA512 52243b94a39e95f13dde6ee8864f240027fe051d7182ded70dfa9aa95d01a5e184aaa2d994361a8c765d2bffd2a914f02135699c8bf5ab96be8fd602c3cd8818
-MISC metadata.xml 329 BLAKE2B 0b6512d88b304129461ebe5d0bd6c138528a7d0379a7407736b1d82de2266c265adcfee0ef077a6d2fdf0a5588d6758f2af4c31d6c5a4369b437dee302b14c8e SHA512 be6bd88cfb8875c8c07782b217f4701b2b325199d51e928ea9c4fa45a09dd7e69e04a1f314fc8c0301c5efa1a2ee8e2cda8d276108b5ff3c6de46ec5e3bb5ba0
+MISC metadata.xml 329 BLAKE2B 19ab70f93028bfd189bc408d036499499be6c2f4d2abfa8d3a0c4ded439bd221b2d8249e25abd974f2dc602ed6d70f79cdde9e206cef22d55b980ad48da5e407 SHA512 4d4a8da15f2ff438c281f127871ac12fc5a4574fc56beebf9bfc3bb7b0178a536139d9140fa352ce4bf411f9e1d24db9e7a53e20bc40e913c347a90eca14fc38
diff --git a/dev-qt/qtstyleplugins/metadata.xml b/dev-qt/qtstyleplugins/metadata.xml
index dc9c7c4c678b..92ab4b14710b 100644
--- a/dev-qt/qtstyleplugins/metadata.xml
+++ b/dev-qt/qtstyleplugins/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 9ba712bdf902..fbce60f7c2ff 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/gennodejs/Manifest b/dev-ros/gennodejs/Manifest
index 76ba5757f78f..5a6166d69e2f 100644
--- a/dev-ros/gennodejs/Manifest
+++ b/dev-ros/gennodejs/Manifest
@@ -1,4 +1,4 @@
 DIST gennodejs-2.0.1.tar.gz 14902 BLAKE2B 36e2531addf02cf16c75e8186aaa3722c973b5ae9a70377d1e8b59cc4f5f5e33214198736c432fbbca14cd44c065d637009764a16ae4c4ada0bf1288a68f76cd SHA512 53a518e494235b5858497385a31407fee06337ab01fd0733201af2cf916a76a3b81098f12a12e38ac0945b04a5ddabb1a155d14f4fd3023591d3e478e31d3648
 EBUILD gennodejs-2.0.1.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
 EBUILD gennodejs-9999.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
-MISC metadata.xml 350 BLAKE2B 1ebaa467c6cdc15850439e260685172ef9c00f5b004f628b8c600b077a96b920567f404f943810640d6e383f21c249b8f4179dbe68549dd148a7bb7e3f806b77 SHA512 42fac74570a816402422ae5dc0923ca8a39e41229c895fcba7c7bdc261326b3b540fafb926c238ddebf99152a54e89376fa2f11112c3849e69225391af3daed7
+MISC metadata.xml 350 BLAKE2B d7a04c1a326e0c7d99abc7d5853871acb854d3d6921875116903e97236a4ba02eee8d1432e65eb8da172c1030f9e102311e11391d1dc2e5147f3fecfd89209e5 SHA512 c954a9176302f5db3506a7e592d9e69d84520143b668b601e1187a316d30cd5b1b651ca6a965d6f33149c13c506513026c2527db11521e5f539c731195008a99
diff --git a/dev-ros/gennodejs/metadata.xml b/dev-ros/gennodejs/metadata.xml
index db3d69bedeca..86d63e3a8f21 100644
--- a/dev-ros/gennodejs/metadata.xml
+++ b/dev-ros/gennodejs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ros/metadata.xml b/dev-ros/metadata.xml
index 19cf5d441576..007ae95a2dfb 100644
--- a/dev-ros/metadata.xml
+++ b/dev-ros/metadata.xml
@@ -5,4 +5,3 @@
 		The dev-ros category contains ROS and ROS-related packages.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f7916b7c00a0..631408aad9cb 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/aws-eventstream/Manifest b/dev-ruby/aws-eventstream/Manifest
index ddec27544304..14174fa23164 100644
--- a/dev-ruby/aws-eventstream/Manifest
+++ b/dev-ruby/aws-eventstream/Manifest
@@ -1,3 +1,5 @@
 DIST aws-eventstream-1.1.0.gem 8704 BLAKE2B 52018f2466f24b5c4ca9463321d4bad94579c6c98ef7fe0de34376da1e9ecfa0171de3485f65266a8b6be99c6eab956b88b367b8431c62aac1b46107f47925db SHA512 40af0ad738341bd879458060c5d5b1cda3d539ecec18e3e14f2c36582368e246a1dd510480629f7f29e044dc6f9d3a028af72650a0386491931f5a2691ac5d8a
+DIST aws-eventstream-1.1.1.gem 12800 BLAKE2B 723c94153dfd0eac18ed76caea9637a483a421bec5ff361b763c772c817f99896c04283c76b81e2469f9eeda7a9fed6bb4fe976f322847f028523cb6d068194d SHA512 ffc06f10438b707696abf477da42ac753189dcd7688758998f6d0daa4ce87e5d6dc71b2b982af44d1bb33ba47bc50b18cd6023cba0f4649f20e3aa9667a845cc
 EBUILD aws-eventstream-1.1.0.ebuild 415 BLAKE2B f87fcb051fa03e33b4b7e1d2a7f423bfb756a3b0886976ad19dc3858cb4bfe231aa23357a568cc5fd09135a25bef161317f532b4399cee4f102d9c30506b5ea3 SHA512 3037c2c4e04f39824c5a11e5e4c76eadb1dd6be0410a4a78f8618adcd1f74c314ac6f672ca209734cc8c0b6b4dfc89adcbff9f36fd432fd433374507d0713d30
+EBUILD aws-eventstream-1.1.1.ebuild 453 BLAKE2B 871902afd4b2b87ca26473eb9c94b6dffb2e3e51c63fc22ed9b97d0b13ff1b8771708b995f3b99299b0b83291250ec1cc73853d8c37918abfff501a5676112ae SHA512 4842b2bedb29c004c11ca3cbde851e40e00a0577e33e4f9374ab263349a34855f8a21c8891663a705797ec7497751c0eef87c02a310561a16b81604c1f47b4ad
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild
new file mode 100644
index 000000000000..8b74ad43f326
--- /dev/null
+++ b/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services event stream library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index ff037633f3d6..cb854dcb121a 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sigv4-1.1.2.gem 11776 BLAKE2B 120446bb7ba1faf4236952b7dc53e0e88cad35476b2a56d188b73c1b3e4a4a93e835597eda5ebde02c0d65395045e9400e41b9d291f076cf73803286ea3151a3 SHA512 2d1f016e5a093a167d4bb6ae8774e5073c6c3c182a4ab64edfcc3cb93cdb827bdf2dd6731eddd096b8940db4cd751dd451bd4cf445c5b15ac5349e6d150281c8
 DIST aws-sigv4-1.1.4.gem 11776 BLAKE2B 3b365817f3228bea3fbc4903ab59b3949eeee6570dc68f12bf20f2edce1f2910b54d983389bca11950bc06d37c1c0cf9038bf0b301096cd02747fba97f8fe71c SHA512 58a0f94846edacff7a6037ee0fd2f77636241b1ad4de9882a4afbd9785879c371f2d6137c99e9232141bfd1d235aeb70422b2a4affd867b073db1b50c607ddf9
+DIST aws-sigv4-1.2.3.gem 16384 BLAKE2B 55da04b54005107075e3e4ef6a16de03e25ee355938bb1846f2c1ab79f1d9c72b0d272acb8b8c58eb7803710f3ad9be7e2d137b0c387d84d4841f7dcb0fb82aa SHA512 5d3aa9256f5e0fec5841ca5c9ca5aeb9a32cb4cf69f30221476d380c22e8f1863d2fbb4c826b89634c65f8080b83debdd84efe6e14e31f0a01bcf18b9fd71750
 EBUILD aws-sigv4-1.1.2.ebuild 469 BLAKE2B 6e21d9caab716d4a1e0fd43a03378ea284fcf6ecb91757b7275b869b4977159d815bfbf5119b8f008d18a649c1aaa4f0aacb7c32c5f7e8cf25313a867f17cd77 SHA512 392f07912c83e2f07507c13d69eb2cea57a2baa76fdf0e92617aca97408c383eec269ee8087a3e2dec45c35a573d331b9534b6222f4d2e0ebd70d2b411246c43
 EBUILD aws-sigv4-1.1.4.ebuild 476 BLAKE2B 2698a2225c6b20b396f90a99ef8968f9d177c0ddeb53c40924c5226d26b3f271290b5f5d9a674f3d98eb01a115529013686f6b7e7b7ddcabde16e2a2c65c7c01 SHA512 679f2b240cf8dec10e7b69759e6453644b5b8716df4271b326238e210a2aefca625fbae497d20aa0861d73badd7d16b23ebe98148c072207793bf5316b05e82f
+EBUILD aws-sigv4-1.2.3.ebuild 483 BLAKE2B a94e6a949ad9223d1cbbc048eab8083434ad490a21945860502423e80e57ccbe0eefef3431143757122bac2141db1f81d90fe45daacd362dcf3ec9ac1e5451e1 SHA512 c7aa3fedd13e529034d390347e53f8445709ec62eb15feb9976403c02e58b7f217ab0060d4e823179d39ee09813e55e3e266bbd25bf5171f476884e0aebaafb4
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
new file mode 100644
index 000000000000..972cfb7f058a
--- /dev/null
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/axiom-types/Manifest b/dev-ruby/axiom-types/Manifest
index d9ccde7d6f54..14bf19058990 100644
--- a/dev-ruby/axiom-types/Manifest
+++ b/dev-ruby/axiom-types/Manifest
@@ -1,3 +1,3 @@
 DIST axiom-types-0.1.1.gem 23552 BLAKE2B 26a9c7f242d331951a85d8a5819eb00bdf599c7f891eac2a7478d0f28d11a6f90c6c81a9beb4c6cedbe540684fb99382148568d28bf5cb55aecc85987c8913e2 SHA512 1d1eb7680cc7370e81506acf8a3a5ca2e40e8c375cc6e91176fca2b5ba388b87792b0e0872e6847b7f8ab27f3fc52f4cd4792875c97f579ffa4578e3c414d2e5
 EBUILD axiom-types-0.1.1.ebuild 738 BLAKE2B 3b960c99fc784631d8d67fceeca6e44c16b12b6725a8cddd2dcaf977cd321546a190b308fbe8d9fd635669785ff05a925d1a20711b9ee71e7b0a9220e64bddf9 SHA512 f775fbd234e8d13e8ded63c382aae377842dee67db880c678bd70c38286585a9e2cdaf993e9a708849133e301ac8bd8a2ce8e0efcb3c32f6dded2bbf6e8a2da1
-MISC metadata.xml 398 BLAKE2B 53ab62259975f7b7aa7413bfce595b9c05459d9fc2052fce262b5921003bd3a2915627b57fd325c4422d2bc5b7125c80b609f0a8ca1af6a565a705a88311dcca SHA512 99d1d06e2af5c9ee6ecdadeceac40ea7ec7f3774ed5de1b817bb2d96db7ae1d2b147755a32f3b16c721afe0c28470d8e7d19e31af841d919d44b0ed6969f31ca
+MISC metadata.xml 398 BLAKE2B a9a1ed58875d542c00a75ddebd147cfb7bc39c0cf30db0bf2ba160bb5ce81a119a48c2afb796c0695f81bdf05bd466b28539c985f55055eb2655e584e1d54fc0 SHA512 d68a1da47222c050fbb6075feb8ce0657261612deab3442a50e62af3efc14d811964fa3961540dff23f64c806bf3ecfc0f9fa49ef9c75614a7a7560e630dfe56
diff --git a/dev-ruby/axiom-types/metadata.xml b/dev-ruby/axiom-types/metadata.xml
index 4c5e3f50b0ed..8a91ab51b2c0 100644
--- a/dev-ruby/axiom-types/metadata.xml
+++ b/dev-ruby/axiom-types/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/base32/Manifest b/dev-ruby/base32/Manifest
index 92a60343b8c8..a91867783007 100644
--- a/dev-ruby/base32/Manifest
+++ b/dev-ruby/base32/Manifest
@@ -2,4 +2,4 @@ DIST base32-0.3.2.gem 8192 BLAKE2B de7d3484f54a83b497da2ea79a51237df9e058b0d9317
 DIST base32-0.3.4.gem 9216 BLAKE2B 370c18e0e4689a3f59d7a75c03ecd1cb43d1748fd2239d3b9755e529c79863af8ad1c747e445d1ffdce7d900ea5300a12d1b63f6045798e4abd308efbe4d79fe SHA512 43ac8e2d2e801401f57d8013cf55cb5ab19a6349e610af151220a18f1b997d3a29d1423db93c4169a2b335d988e8458be447415d2bbc7745592fb3eb54dea0ff
 EBUILD base32-0.3.2.ebuild 512 BLAKE2B 25305b187def18759e5c6d57cde7a26bd603466d7285414227d28c0a9d4d9b03858dae6485edf3b0e386c20d963c2cee5e5955aa4f5cc8205a38f552c4fb5404 SHA512 dbd67173addbf836b8740ab5e90fbcb7c7a07ae5c6dced7108ed8dfd790e31a488bc7dd59a8aeaea630dbe17f251209b42c51ae2c0755b86f64fa4b4360821db
 EBUILD base32-0.3.4.ebuild 512 BLAKE2B 89e9c83f858c1910d3bf441db558d45bb6b01f23eadb6d68a39845fe93de8ee2f0a9038be7ab1c9b1940ce34538c3eb59cda756163d8a73be90361a407d6082c SHA512 3cfce8f5b54f213ef7f5bc3f569d37d9a07aa4d1d0c945af837dc962548804d0bed4e82600615cb341201ff05fcb39b1203978fee65a19c26d1db3d967fd328c
-MISC metadata.xml 377 BLAKE2B 96f1048aa5b11f93d3cfc10229d3481900c39d0a521aa9fd7bcc3a450dabcc0818d7efa51e42bc1a7ac9ea3a9893eb52ca6fc76c71f08f6f413e8858d83bc01e SHA512 7fcd9cabc07727f1d5820edce2b421bee0e7de1f3d89c2664fd39e71bad11616f4f2af615d6624ee861bcb35f5540664cecf48e709b1b80b34556174f50197f5
+MISC metadata.xml 377 BLAKE2B 577c7f62ebe56eee77823463d20c1deaa042b87d6fc79ae9ba28eacb2832de266c034f65423cdd4fd05e26331d1ac09b12f6506b258d80fc3caa38987cb227b2 SHA512 1cd362100c9198f636e7f3951e457e3d1cc70e81cfb75d440b54b397d6ce9fdf0a854c160c4e55d9086685d5d71149f8d5c7af5210a0f7efcde5afcdaf45d3ac
diff --git a/dev-ruby/base32/metadata.xml b/dev-ruby/base32/metadata.xml
index 8fe8ff8a05e0..79bf355a9838 100644
--- a/dev-ruby/base32/metadata.xml
+++ b/dev-ruby/base32/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/bit-struct/Manifest b/dev-ruby/bit-struct/Manifest
index bc84d6c61b14..f82e2dccdd52 100644
--- a/dev-ruby/bit-struct/Manifest
+++ b/dev-ruby/bit-struct/Manifest
@@ -1,3 +1,3 @@
 DIST bit-struct-0.16.gem 31232 BLAKE2B ed08c7054cab88ba0614863d706681601615b03e2dd3f19a4a1b8284dace17bf30e92ca9f1b0948c8c5e50424ab41b97f65cb65c804f771a207672b497c9df33 SHA512 8c31592d53daea5f283f8309a52c22c96c519d51c4e3c1657b36e83b802899aafe95eab9b88d9ec692e84207fc6bc952a1f1ff1354fc2b99fc327d58934bec8d
 EBUILD bit-struct-0.16.ebuild 381 BLAKE2B 56096f2d2ae299efc2f912d3dafe1d6644046004b4b55bdf95cc00a8ba3b24ca0a8ea7027a0b727bc097d8ac0c7ee4e270523c1ff820744ba2a0c2e7c6a7a54e SHA512 8746d1789d7e9402bdc7bfa063f5a6f0f6c159cbb2c582299260b818a84b3c8359f0a7da3ee3f855581aa70450a7d83bac5a9328d73c8d96eea6d89d897845d2
-MISC metadata.xml 392 BLAKE2B 58d918f32c45633462903ee20eddd6380fad76176fe1cb0e5ec4942130e49324618b3114e13acde56a8e337c9678ec00cc31b9172c2ff452707be2dbe05668d1 SHA512 65256477f8b63ed2ee5509d923f47c5fe1235af342e38422f058571eb01a80bbb0f3d34a801d691135a956113b5b16c4c7e348bb7012bd840bc3ef4588b1e6f1
+MISC metadata.xml 392 BLAKE2B 68de2170fa2465f59cc174571e74b5ae99e27a58411de173f8c9ae641e649eb2409bad25973aae1cb6e1f964ecf4490b486c2951c4d7aaa80c890fa30bff7163 SHA512 f9c67aedbeb657cc78964197a77d16117a7526c77aa4deda0e8e4f6f09b5b02eb78ade3c0de64839a4b02692b55eb5afc1dd147a63478115e8b06c76934e03a6
diff --git a/dev-ruby/bit-struct/metadata.xml b/dev-ruby/bit-struct/metadata.xml
index 4090b8488014..fb66c802d91e 100644
--- a/dev-ruby/bit-struct/metadata.xml
+++ b/dev-ruby/bit-struct/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-ruby/blankslate/Manifest b/dev-ruby/blankslate/Manifest
index f8f164e371c7..dc4aad810c22 100644
--- a/dev-ruby/blankslate/Manifest
+++ b/dev-ruby/blankslate/Manifest
@@ -1,3 +1,4 @@
 DIST blankslate-3.1.3.gem 8192 BLAKE2B ff5494661e875290a354089efbd79ba8f7af50ff261d56f99201c9a11162fe7d61c0089c0c9e4839523a7f95e3a2cf8e79cbd5db14be3530f1a86ac696deaa42 SHA512 4164c2e9ecb6a294fbd0d25f70bae36ee9277da3a75aae6c99d37147f8111c40a6cfb85ddc3819e45c361c49fd9c3fc724ecea201763f7f9891b96589226f245
+EBUILD blankslate-3.1.3-r1.ebuild 618 BLAKE2B f9ad094cc315b788a06eb1de2a75242e78148929ea140174d71a110eca6664180b64e328d4b8f1db59a6daf06e63d2318ddb53253e12fda00912e3897d858162 SHA512 f7f2a96518e71601bab7d3db7aeb5cd26f1357ea5e93db63fb189e2d53b675c8d756e02d6a134b7d196f7e0765c6075ac0ac5dadcd230df4f0f42b6b5083c6df
 EBUILD blankslate-3.1.3.ebuild 643 BLAKE2B 4fbaa920b5b895539e5064975c289e9260eb1ccf7517db3981d29f40cc68788db1c0663f005985cd8910803df8743f2d90a4ee190746afbbb82ce2ce0aee7c33 SHA512 e5ef005eb7f9db0c07bbf952b5f37226e7ab3a8317d5306f534a4b12bcde6c9888e59ff4c2ec599447d5f44b3a3056f2c381d194f5d0aa160bc04995b16cd54b
 MISC metadata.xml 328 BLAKE2B e6d8ca7038f3a6e6c026955eb0a1880d8ee08580141b438e74797d58bcc122d2d6258bce5ebb3547220d688ac0cac36fd7d5803ad28cad1db80f5694f6cbfe92 SHA512 d75ff746d7d11a9caf17f1b09d0b8edafc405e345591cd5c7046074f9ca80b0cd3fe59bb9d9c1647b264f5df6366b4ea99b0bb90c31343fd4dc6df6d8bd9612a
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..5702189fe39c
--- /dev/null
+++ b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
+HOMEPAGE="https://rubygems.org/gems/blankslate"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+all_ruby_prepare() {
+	# Avoid test failing with rspec 2.x.
+	sed -i -e '/cleanliness/,/^  end/ s:^:#:' spec/blankslate_spec.rb || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 21de6d12120a..0bceba690a87 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,10 +4,12 @@ DIST bundler-2.2.11.gem 388096 BLAKE2B 15f8bc7a0091859c4a52ea11a95efaf2ec2941aa9
 DIST bundler-2.2.12.gem 388608 BLAKE2B c9ab5f710dd1f240e651501c85dfbdb436f784326f203352c1eed6d442192fd191483933d58a1d185826035939ce59aaf3522d94d8359e510743bc3257c4eaec SHA512 538dc4eb6f342843045f6b0b8123814f8fef25b5fe56ae3b5e43639b292e674fe3a647613707a7f7f9067207a7a8c0729d2bdd9eb33ab1fdb3ff6f5d5f88d03d
 DIST bundler-2.2.13.gem 388608 BLAKE2B 1d500b18abd7dce33b4780ff6ceef05e51faf465b88908d2a85d4498e8f0fe661e6479af561118d83f0eee7e957831306fe9634698026534db8849113d5abb21 SHA512 321b5110a6c5efca245794b2999e87ef8ecd054df0afae0b6d6840ebc4c9ed428bcc31f5ec06e4c2d7415d5785e780beeb5abcff7270cf6ec11fc415cd232bf6
 DIST bundler-2.2.14.gem 389120 BLAKE2B 6e1a04b82fe2acb68a1525fcc5237cffde8a1f7fc2c3f522932b8819c55fc5aa9b8e532cdf71a8439b6d54a6b9b4bb488ffd498dbdaf92945129981518ab8aab SHA512 0edc95756cac080c7ceb5a435012618727b15893ce6fa6eb4fe1150a21894e0228cc841f4ea59825a430ee72c33247b6915708e3bd0f2729cf446c57421cfcc7
+DIST bundler-2.2.15.gem 389120 BLAKE2B 1f5b9d56dc6613626492321b478607db4a936fa70bb70369c924b721d0a8389542f0c3ec68b4abfe5c3471428240f56bd14b263c66f4146591d8b3ccfd5050bb SHA512 c6fddb5e96887d446efaf5571a1fae47a994a7d8b50332a6b7702af8c99a9c3899b97353041d7393541803a02604d61803cde4623fbb260484f6f17b9d1d65e2
 EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
 EBUILD bundler-2.2.10.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.11.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.12.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.13.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.14.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.15.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.2.15.ebuild b/dev-ruby/bundler/bundler-2.2.15.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 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 ~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/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 8e059d386ad5..7f7518bf57df 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -3,5 +3,5 @@ DIST chunky_png-1.3.15.gem 363008 BLAKE2B e94b366aced2214a052f321ea828c7de9df2d9
 DIST chunky_png-1.4.0.gem 363008 BLAKE2B 3fc484985565f223127c43eb1d55137ee9b58fc5ab6f25256dd54efddb817a5ecf78b39754a042fd09b83493cbdfdf02d0b90d150ab90b084f01c9a98aba5a8e SHA512 1276ba527723af973ca00535baab0dd3be8185cfaa77efb28c3b1ef1e949312710a616ca55711923875e54cb9c92b38de71062d2ba68b2314c7b9ce7a9b50b11
 EBUILD chunky_png-1.3.14.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
 EBUILD chunky_png-1.3.15.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
-EBUILD chunky_png-1.4.0.ebuild 753 BLAKE2B 384c8b61ab2778fa69c6bccf5271c5111f9d2a934314134ed8f245bfd441e2f578d01d3683b3e27d9af5888416dda52696a4dc5589063b8fa0123f3ef7ed9069 SHA512 6f3c9ed331448b10fbd39444afd5f0d5a0d5de1cb707ed6b29e23e3e6a0f34da3b0295b4682aafec84e1167e69c8be0054f30088fa3b53fee987744b37fcf9ad
+EBUILD chunky_png-1.4.0.ebuild 760 BLAKE2B 97d5782b94cfa8d70fdc25dd0cb0de4c46b412969de21de80f1c82ed107cf81a2ed3c5b2c3d2e9b9b536f5cd5cee91677209c596e9537f9be683d71e6511753b SHA512 c154700829444aff21e1dbd82fb6788c3f74dc14f92161dec16eeb8cf71a4be2ad0878e8c53e0bc5ee5561064e95b0de5bef552ebf9110bfc5c6b2c75ecb0e9c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
index e61c91a277aa..e6a1202264c5 100644
--- a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/coercible/Manifest b/dev-ruby/coercible/Manifest
index 14404f2de8fc..5cb6169ff271 100644
--- a/dev-ruby/coercible/Manifest
+++ b/dev-ruby/coercible/Manifest
@@ -1,3 +1,3 @@
 DIST coercible-1.0.0.gem 24064 BLAKE2B 5f9708211600621869e78742dc5421672f27162c1e09e703bb2954d67b2ad281ddf59f9ecb28722f4423cbd0c7fc8bc14bda0f1f064135cbefc24ddb94ab1648 SHA512 5de43166625cca102cd048ae5cd4113ef834b273fb798490a99eeaab423174f1fa40410546de4e0224234efb996a4aa1f2c37b093298f50356f925b8a6163767
 EBUILD coercible-1.0.0.ebuild 580 BLAKE2B e8600de5dd0d7e97748271829e4814e406ee458291010c59780cccbd9ddd1f13b8ff98eca57aceaf059dcfaa1353028c22199105ccdb0c4644c47c463f86400f SHA512 7ffc0ced430fab4ae84562e634061ac5003997470a28777fc7ea65f0ec3f0f058ee81be564c09f8533f975142644c4ec7749faec9b94b1c43ea400794e33c52b
-MISC metadata.xml 395 BLAKE2B 61cef84ade40ac40da9066fefb8efaf827d74c2593b6867885a5f9128fc2b2bd8d58d951ba32119464bcedc7e80522eab29eddb7336a17a08e82ffe769ae1fbb SHA512 07eb2459fb9aebd3501e79cdc16dd53c2c992ef8fb63f1e14bc4e88f627fc9d450182df968c6875216b35edea65e5ada72ea16f64f567d58548c8b670c130b7a
+MISC metadata.xml 395 BLAKE2B a8e11a49d1081b7ab2c389f333134d620ddec1af66a0f3c0e70b60f5daec83d76ce3d6ef06c388facaa73c6f702937253a9030b353ca53f450eff3e134e7a3be SHA512 4ec2271d9ebf2e616954ada4a3fdf80517788a955cb9d54c7703bb4314eaa544e4bc141593261cb9b13f3a8869482810f13089c5e095bf3637f096ed76b8eaaf
diff --git a/dev-ruby/coercible/metadata.xml b/dev-ruby/coercible/metadata.xml
index 05c03a0414b7..1fe7a5326768 100644
--- a/dev-ruby/coercible/metadata.xml
+++ b/dev-ruby/coercible/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index 800e8e1435fe..1c5d372ae5bb 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,5 +1,5 @@
 DIST debug_inspector-0.0.3.gem 8192 BLAKE2B c7605f246519b245d0b997e10cfc1271c6cd5a31dc44097546d51265eb6ce1d88686b1dc922addce0a58b6bccae4fa5a40611942b6babbf8dfc6b4c528949422 SHA512 38cbe0ddf2eb4285f4f7d6f12428747495230425352e1850a4395a5c27ad4c2f706eeeac1f684baea488f6e3bd4b65c8c9e0d5807d5af93d3350fa7b9d45da43
 DIST debug_inspector-1.0.0.tar.gz 5567 BLAKE2B f6a571ff9b0d4b260f2849780d795f1d89907bbdcb1bb2b13f4ff868be494dc2943d4b2b46678d159cd3d75f4f798260b87bca1b06d05d414e1ff555c66f91bd SHA512 779b44e215d5439037eab5c219a8b34ede13acd604d29996610a97ec2a4c1bab3ef69d6a47560cd1cb338e599448d1f71c13c0ce7cff374278770ae18016aa40
 EBUILD debug_inspector-0.0.3.ebuild 579 BLAKE2B 9ecee12113838eaf79c27a747b5d22eefb91f849b3c85424e193d1bd52f893501e56150aec7382845214973384d5cede9d0dceda5ec0d8e9918f819502a77f86 SHA512 27d2b822f33a5463c7a67f5beff97ed9a5648a361d7d6018efa10e8577c83d62ab41476a8e591130b137b22e1792e017db717de0f3720a2b2c753bf44de77714
-EBUILD debug_inspector-1.0.0.ebuild 594 BLAKE2B 03e7820b1dde1f93ea5adc21df5e0bb9d404813bc90c02f5dbe2c6cfc05ac552c6ba6411f1d546ae7f1c719e424c626cfef230b5b382eb4f0c2e93cb7ebec7ec SHA512 f866deb4aaa9ee15dd2f93bf61091673c48c592a66101f45f796290aced403fe1ff457df72fb5d2c3a2d1601958495ccf8067f2769508d269bde1491a8333ae0
+EBUILD debug_inspector-1.0.0.ebuild 672 BLAKE2B 393b4d0c6cf0f0c3d358935d4e64184794834d1559e7c697043da88ac8bcdae2414c848f00220721468e6c584db89bac5fe0ecc0fb31f477db6e221dd01d8805 SHA512 bf2cedfd3f0a5cd72b1a3a4e0e66405b06f072710576131de5c4bbbb83c876f465d00de345ba9ddf973d68a9cbcfdd0186b03a19ae84b2f83de8291012fe1807
 MISC metadata.xml 350 BLAKE2B 1dd62d682b217a24d9af313c9c81b84408466b076d7e170aa84491520ee7813efbf7f5d6a1bc4c7a86cc7d9196aed3b675a98cc361002807dbf59f96794f4c91 SHA512 032b694988de00daeae365ac600fbfcd4cb9434ae8e43bbfe0b5736346594d3f026e29af7aa87cdf29723d2140cd890d9039c6de1b6f850a162c02f8a7ecaae0
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild
index 381ef8b18a2b..3706e2f82926 100644
--- a/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild
+++ b/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild
@@ -22,3 +22,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/extensiontask/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest
index 683a14b7b63f..8b02a41e4bf1 100644
--- a/dev-ruby/delayer-deferred/Manifest
+++ b/dev-ruby/delayer-deferred/Manifest
@@ -2,4 +2,4 @@ DIST delayer-deferred-2.1.3.gem 21504 BLAKE2B c8f44cbb89fd249b6ab708efd923b2cdf3
 DIST delayer-deferred-2.2.0.gem 22016 BLAKE2B 992005fcdd3cb7d7b131e676a1e73f56b64c3316c4c66e984cb8c80c655e98f2fa1a72be34979c11e9f3b7def7de71a74a922e06b6ec8699fc1bc03f2cedf627 SHA512 f285183556d8414db6467cf51a6bb123b2b5db3b517295464e8d0205f25b7bad61ee9364277916e30f0bde4453a7bf4666bd71f0a54faa4506ed8d339507418d
 EBUILD delayer-deferred-2.1.3.ebuild 583 BLAKE2B 77acd6ed64a77a96b35610779ea780960b161daa1ea1b653f76285e2c60d5eb41f7ee2cb9289f5e7dc61cb469d76ed53201275df9f8e2b9893bf06f31861bfdc SHA512 80b50c96c692d9cebe734447c9524567e1d9b1b70133a77b1b8a10c8e36504a5d355d67c2734befe400b2264ea3dfef8f1f9d3cc4922164c2ee082ac3a4ccf9f
 EBUILD delayer-deferred-2.2.0.ebuild 635 BLAKE2B f7270fc3c06dc1be6ca471952503400348f74cf2c6266240259330a927956c32bb88e33749e34c7ae35a8982792eebf13d1447adaf9b0347509029151afdaa7e SHA512 603784a7d627aecfebad6b8339f2868555624d2be3f92c66640fa9c5d36d3f848284eb24e74f0aad309396a2a3136148539c4b71f393109dc5a8fc9efc8eaa92
-MISC metadata.xml 474 BLAKE2B 5e75d643a2080cbcf84a8e0173c9ac4305317f952fab14a573f45ae650aa56bdeb11ffb2efb887b9a206f04cbc9eefdfe065766b21811cc627387517f23421b4 SHA512 8d070713e84530e8e20065635f5dfd632661a491e3ca8dea97bf8308b6ec7fabce0411afad7006856559f4a8fb9f4b6fdfa196bbfebc0b993cab521ce771ad5c
+MISC metadata.xml 474 BLAKE2B 5fcdf08d3170691be2f0e7f21d7646ca237ac915d44aed8495b887bd089bb09313e703d6087903388e77a515613d8db107c44f02e36fa2a091449611f9187dec SHA512 9044834631c96347d4d100695770f9f75771e17c8c310264961277de02f59220b4f7bdc8f542297da93463ddec101fd4c865980dca57b3c3581f605cbbbf65f9
diff --git a/dev-ruby/delayer-deferred/metadata.xml b/dev-ruby/delayer-deferred/metadata.xml
index 123d51e3f71c..ae81f7f01dec 100644
--- a/dev-ruby/delayer-deferred/metadata.xml
+++ b/dev-ruby/delayer-deferred/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ruby/equatable/Manifest b/dev-ruby/equatable/Manifest
index b65bf7169900..0762e5ac41a3 100644
--- a/dev-ruby/equatable/Manifest
+++ b/dev-ruby/equatable/Manifest
@@ -1,3 +1,3 @@
 DIST equatable-0.6.1.gem 10752 BLAKE2B f544d330fd72c12c81757ca1220f209126e9200b0309d7720005c720ad7f89288cb40d3b7bca004f624f162bfebedef8341997e94cdf5f51e6fe86fa2ab0b0e1 SHA512 442a6c9afd31ec2c41f3802703515827cb8d100bea3932c1fadeb036bb96a045883050712f480ebe4f7ea9bda5dab335b0f0d9dcc90a42bf45ce6bcc504fe0d4
 EBUILD equatable-0.6.1.ebuild 529 BLAKE2B e187049dbd03d4f752c26d5f2815ec5af7c9cd735738a751d49c5dbd6b49ecc91ff85b8de35c68461503573eefa81e56c059383f251febd07ebe29e7e53601f2 SHA512 c4defa5ebe7f85a0d475e0938df7636da4c70168aeea46b2a57deca14c4bf5b96b265e74449e175d796c82262b62850e91216c3a2fe512401ccf759ce9450b0f
-MISC metadata.xml 337 BLAKE2B f320ff62e89cec84137a16e526e5407f2fa1580a410b03bf39ac7158eac56c0cf3fc466e85b88ee604ad7905ab58dc0a8678d162f5a35d64a94af5622e6a0bb1 SHA512 f236bbad502d70c2ad5c8eb7b596ff903b001461d1f59ed2f01d73455a152482a8cbc2b01c1bd88eb80b78864d4caf354a1b797b95410f9868f1a57aea89dfff
+MISC metadata.xml 337 BLAKE2B f60b1614089bbd21c24f0fa9afd24d66e0637e099a514dc474c376c119c086daf3f476428ee78e9eab8f65365be47365f0194c9ba012cb78b24b7e37c5298e3f SHA512 b78c601491cb29e39cb477b7933fe566763e281c66a486efa3c362c20db4d7486aaf1cce5d67bedd7dc9d361034c30d623e38b9a5d530223ee4933ec34299806
diff --git a/dev-ruby/equatable/metadata.xml b/dev-ruby/equatable/metadata.xml
index d24f3b19f941..7df6af35daa4 100644
--- a/dev-ruby/equatable/metadata.xml
+++ b/dev-ruby/equatable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index df0d454ea9c2..4ac6ba522ec3 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -2,4 +2,4 @@ DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de
 DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
 EBUILD erubi-1.10.0.ebuild 667 BLAKE2B 380cae4ff61608ff54a9956903f87a3bd1982e884e43dc71c7593f1551a1ac1f4031e514258418bf20f603d9aa5ecef70d3fd8ebde566558e51dbd03278ae924 SHA512 ac0e870ef7bf3c2d607eb676787b9d02f6a51bc4de1cae87d4a27d385c91671f33979f85a42559da9522a5b7d1cb136c0be26d368fcf7bb483ab488d78aaff2d
 EBUILD erubi-1.9.0.ebuild 552 BLAKE2B a91c6fa724b5b3667de2ce9b68653deee079f87a30d1f98dd963d9a2383aceb5782d5431219b16e2c86b10ac8ae6d13ec19a8d27a55470d836873226bdaa8f4e SHA512 7169ac29042525609712634b46857e2bbfa122b77f3430a77864d6987964f86ac159b653910203e40445d2487add5b79433403f9a613fb4bed22dc0d5613ff21
-MISC metadata.xml 392 BLAKE2B 69b13996a3f20cfea19c9633ae778b8fe408fb0ce3655ff27b10dd5b128ac1c0f63128f77076586584a95389b6f6d2890153b653a5ddc71e053cd50224a8f15a SHA512 011c951701fd525c150ba9ca737c502cb78937c173e5286b06f3ed3f007860eee68265f419975ea131eb18682789435a328f5d8345078781c733e7148eb381b0
+MISC metadata.xml 392 BLAKE2B f39d3930217f75782dcb81f6a0b6041b72463563cdd8117545374f1ec07e5be34602779ce884bc73b8f27fba239576d262855bc2c9905afe73f241b74e161696 SHA512 4aaa02981c98005bc036dd573c272db6aea080f9a745199cc0cbc17883d7e3185a7720f2265075833d0290c07154ce02fdd61106f11d467986f45d15e0c4709c
diff --git a/dev-ruby/erubi/metadata.xml b/dev-ruby/erubi/metadata.xml
index 23b9745782d1..0bb05d250966 100644
--- a/dev-ruby/erubi/metadata.xml
+++ b/dev-ruby/erubi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index f8e636a88c0b..8f54e63fe114 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,4 +2,4 @@ AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.16.tar.gz 407315 BLAKE2B f9637841bd2c1d369d262c77876f08bb248f6a98e0fcb10573c872d521473790ba6eaa8dfcd6a8f0da2becd2f10c2bc7fbfde0d3a44f6a3d38c9e5f363e27e66 SHA512 3adcb7c3ce90a9cb71486c5d86eeaf1f0794194f51faf149052333d2f55a8a8fbe1e5772ecf9a0ed53196cfe732effeb383a42a43942a7803aa8b27e23939d23
 EBUILD facter-3.14.16-r1.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
-MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
+MISC metadata.xml 539 BLAKE2B 5e7dc30c0696bd913c537091d3b9ea909870a833c82811ceef43633486e6434eacb22dd288e2ac544303e085eb60934619a5d8d39d8d2c70c2fccc319e00cf5c SHA512 33939edfb2a516911b9de80f36d80e1193086ac0f5bce5d2117706f976921fe23b90cbfd8a25311a9d5176c90ec7aed5987ad9821f5e410b97818782b50d83c7
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index 89ac2d179c9f..25fbf9a0d134 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index e3bb60559708..14e1b247133a 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1,3 +1,3 @@
 DIST fattr-2.4.0.gem 14336 BLAKE2B 1be45d17eac08dbadec9e0a4177f7b1ad7d39c060ce1162961aa8fe3b1c9b0107f10c17a2a9a5d27e652067df7f33aca0afb57b6a268b52999ae7a7b540ad131 SHA512 df3aa4fe187f7922fceaad3b30d4ed9c869ac194f819bc6c57dd574a27e69a74cf9fb10042163d941b0edc7129dc5ede5f92c60a75c6744bb9e8f358f5cf24bc
 EBUILD fattr-2.4.0.ebuild 552 BLAKE2B ef697b5a1fb873e06e03d5d85b447485aa7009dccb883aafd78d4ad3109cef511da2184bb69c3abb5250549805e88d5ed15542f2a1fa630b919d1f8d47ff6230 SHA512 f68d92166c206357cc63d957ac34bb3cfbe5a98816f97cc30b766ae6675294ebfd96a10f982f9bccc1ef9850396abf0554f9334906d47faf58f8d6134fcb5b93
-MISC metadata.xml 329 BLAKE2B 5c6fe8fef48e0020f35b06c9c43b662d71af522c4173cedc90ddcf99b43d8d9be89586728c7ddd149c9fea559b801e5a1ae63d96afba45f31518ed7289462a6b SHA512 5c5fd73903762213cf979cfe7e4483f565237ad38be42c6478a23ac48f944a2ce66629d81d29e4e51b9fbecbaa374ed8c23c0b352c56d1b2390d14615f4393e4
+MISC metadata.xml 329 BLAKE2B 53b4f8b829b8aeb8c28cf2435d25ff833ae7ab4fbcd372e13c92d65fe6692c54748906428b77fbb86881fe2311e5ae70a97bc0ea09d7469b5a1f5516fa395871 SHA512 dedbe4469cbc5c4498b3574927c958d05e8b6c7485d74c9e445722d3f487f0386fe87eb4a2dc514c37755b436d5009a5838ba7f36d8814f3ba20582a7499fe38
diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 42a444a4186c..5eba09814a7d 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index a14dca7f5fed..e4ff9350dee1 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -9,5 +9,5 @@ EBUILD ffi-1.12.2.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c
 EBUILD ffi-1.13.1.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
 EBUILD ffi-1.14.1.ebuild 1641 BLAKE2B 56bed9dc915a805e160af30e7f883d9cf30660937768ccfefbe38abc1f04934b98af1a90c05095855a8463f21f24a30953c8ef55e5a6311ee9463d447205e242 SHA512 8592be06dccc1b8c1464997dee29dfab2b6f3268f7ed5904d4fba10a239a3b4c3c368f46f84376fa023f37b243c2bed3111df8b75c5852b2f8cbd121cde092d5
 EBUILD ffi-1.14.2.ebuild 1576 BLAKE2B b8ea5c66d926ff7d2b7bf4c9443935e4a2274afc1a8bcf84abaafde9ec71e4313bd0392ff34aa12c47bb23852b53b559445e0b212142caf4a2d33641460578d2 SHA512 b5f3415732613101f21e60d12cfc5349e56b49eed982687d1ee98a76c4e88cd5868a6212361e41ccfedee70f237b5f7a8e9c4be8b7be3dece295e9cdcb658d20
-EBUILD ffi-1.15.0.ebuild 1577 BLAKE2B 569ee3f27a25a42e75efe80b53f38e4212bccf0a0b443abd194c4784521220b77b6c10da5b0e19d4808dcfd15ad1671f33450405fa24360dbb57ccddf5ed8c59 SHA512 51715d14d50bdc430b3d39cb81be2d977ea5c028d93c81565e1518cfcf1bf964222bf7d647b172184beb62463ea86aba8f124a7b22f05a6e7735907eb62ce84c
+EBUILD ffi-1.15.0.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.15.0.ebuild b/dev-ruby/ffi/ffi-1.15.0.ebuild
index 72f286d35ccc..244b9737ea49 100644
--- a/dev-ruby/ffi/ffi-1.15.0.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -35,7 +35,10 @@ all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
 
-	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Fix Makefile for tests
 	sed -i -e '/CCACHE :=/ s:^:#:' \
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index 469da17aadac..b2fe2e8bbe16 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -4,4 +4,4 @@ DIST font-awesome-rails-4.7.0.7.gem 638464 BLAKE2B 2cd0a992377f88ae94db8b52260e5
 EBUILD font-awesome-rails-4.7.0.5.ebuild 504 BLAKE2B bd12bf91a574795da8bc4cdb38fd15b2a26c0b4e3ea7e56ba4fd8899447bd3b600bd1839598fe205348bcca32402502bd25086884dc952361985234fb5e810d6 SHA512 86e283dc31285900b211cb8d46ed839738c598a50a0e3ed74fe1bcbcd25409bacc95c00d07f9f76210355a2da3543df997871a02eeeaa0f4030d4ee483858ae9
 EBUILD font-awesome-rails-4.7.0.6.ebuild 473 BLAKE2B 7fdfd09bded07b47a341a737e1c797624708aea1f42f76024684598b28698d809a726b4c2397a92d7a13cc481deca24820b32df736e9f87a4e4e530c1c8de1c1 SHA512 4df12db43411f62244f3047719d69dba0ec61102edf89c69e39dd206ceffb41a0a3740cd5977ce1259f2e93c36697953751b2ba2817d0c48dbafc2b93f162887
 EBUILD font-awesome-rails-4.7.0.7.ebuild 473 BLAKE2B ad1e66e71aa46de1f94a0bac17186fb43cd9c26b602ebdccceb26462b10660fb66545b34598d4211d17ed0e1134b79123fbff782168b2138c9d37809f5f3faaa SHA512 cef55f3bb2916c13b3ca98211c3410ce2d07eb6835b24db10b7b64fcbf23cb3d4c73743e61dc4453cf7329ff73c45335fb108d80039616460d5226f64d8d347d
-MISC metadata.xml 402 BLAKE2B 19fae051a5a4cfac29c1e758ddde9a6e7d84651197fab379d1c4151c020059b118f4315fcf179c5545b209cd1b84715b3568443821d89ad8cc2f09e8adfbb3c8 SHA512 bfe7b861172d217672aa5de2699621b309e733255de720efbdc740991206e546666a4af42f26f45253dacce55d3db377a0cadea7cf15a34df8291e0e7184a5f4
+MISC metadata.xml 402 BLAKE2B 0de5749b6887f24e4a3ca7fad7ee08fdea1375d16d65eee2048ab08416c7ba54cda721dc13b338d57108a4c98bdbc49d1ac959658ee578852f41afcf04655d97 SHA512 9032c88cbe72c002561563a081495646bf88d4778b89260d3e3490a1b24c1ccf5e0ca67f1241952cdb3f6c41a7067bbe6809efa11e4b025b0731588e680b4a17
diff --git a/dev-ruby/font-awesome-rails/metadata.xml b/dev-ruby/font-awesome-rails/metadata.xml
index 69feb6173941..51b06f9bd4f9 100644
--- a/dev-ruby/font-awesome-rails/metadata.xml
+++ b/dev-ruby/font-awesome-rails/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/forwardable-extended/Manifest b/dev-ruby/forwardable-extended/Manifest
index abfcac06e361..14fdb315482d 100644
--- a/dev-ruby/forwardable-extended/Manifest
+++ b/dev-ruby/forwardable-extended/Manifest
@@ -1,3 +1,3 @@
 DIST forwardable-extended-2.6.0.tar.gz 6602 BLAKE2B 2ad027f671bb308a02de8b0620df9b9dfdf49d08e9f6fcc6bc60becc57e3e7d184d131a2acb689d08dec26c4ec004f5791b4630ab653f974a0accdbb5f46331c SHA512 23a682e06ee823b076d6b9925a1ef4ada4f1fc7fa63b02d1b9122485204b62f55c191866170b63b34891934c762ac903df46bf5a2b17055d7504ee7a70627a8b
 EBUILD forwardable-extended-2.6.0-r1.ebuild 757 BLAKE2B cddc4f7d50a1c6795a7547645a4541e53b1520a3f08570dac662cf06f378c5aeb3c39e4e7e6aed34aa503d9004245e61577ae86ee7fac599dd8342a9da13ac73 SHA512 972447dec9820acff449e0ec0a3de06bbcb07904287a3af52c711efc1040d90f9ba83e262ab6655de307bb2e09d9ada5fbf229efe0cc7381a90915500783cb77
-MISC metadata.xml 420 BLAKE2B a8eee09dc7ebf7ab036a2c90207ab3cf040d7022bb8b6786a915bb4a04b1e1885000c16ce20c81abf57253900495f63b46865cf418b2b4659553525f85e3b161 SHA512 79be9859ae890718b7b75b27279f1e7a2651b1f1b55c7ce6bde87605ff589afce1a6478e5411feaa305d4ee933a7d9545d718250d6e734615be703c333c917e8
+MISC metadata.xml 420 BLAKE2B 224e3b6aacf3757a33764859f4b893c0833d484f7f08beeb56867bf469e21b9e0ac9e7fca8a15c069aaa509b2dafc6606a375c6720bc18a23657448ba33fa67e SHA512 83237dc773598a6a553818e08d4ac41b3a9be51b0449828341a0b3f6ebc9eb06c5fff28e62806d4c4d9cc418e5b8afcd849a949a32c594f71470dd76261eda2c
diff --git a/dev-ruby/forwardable-extended/metadata.xml b/dev-ruby/forwardable-extended/metadata.xml
index dcbb08df3463..b6e63d3ccfdd 100644
--- a/dev-ruby/forwardable-extended/metadata.xml
+++ b/dev-ruby/forwardable-extended/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/gist/Manifest b/dev-ruby/gist/Manifest
index 7391b60cc4c5..c670d1a47aab 100644
--- a/dev-ruby/gist/Manifest
+++ b/dev-ruby/gist/Manifest
@@ -1,3 +1,5 @@
 DIST gist-5.1.0.gem 45568 BLAKE2B 829a307fb2f03afaa4b4ef8308e8afc03a1218d91f7ad1d104c5988e928d684a9fe8a54572b83d05ccc9aae5186ece7ab7ac5f8b43b0b0ebaa50f8706f22a90c SHA512 4684885142065929fce87a335749d5d5eac0486a3f340005409d178831b5ea616f8e8f34b2e43f1afd6e392cf91883bcfc4b2ca26183aea711420563b22aeccd
+DIST gist-6.0.0.gem 28160 BLAKE2B c231eb3a165fabaac104f5a3e2e10668f15ec8fdde4a5b7a925e35372854f44f0cbbe72f67f6777d42402a1b1d028c5c96d254f0860ff1cde78d39b1d15ba898 SHA512 ba1fb6636a2312c6cf598d2bdb181e354c19496266a65e097e0d27db8702c08ab5fab7744cc2a6911578ae1df0bbacb5c1e2712b18d090dedb69458ce6817cec
 EBUILD gist-5.1.0.ebuild 515 BLAKE2B 01d02f522856051b926c43d913492ec2539b3a95b48677c8b22b9fe328a684a6f732d81effd6ed46c8c7bead23dd50b6ac29d256d256d4cf77130804fcdf1251 SHA512 13c788ac3aeab8c44ce253d8c6cdf13b91ec5cbf6ffa4682266a14fdc8795733892be4eefa43e23055a2871fc2d8427308b6d3c0ffadf21e8bfa2a459b276af4
+EBUILD gist-6.0.0.ebuild 483 BLAKE2B 47e964be829c30b9c1c3ba75454b3ac85ee7bf657c3abf1615429e75ea103f085ef81ef1de7da9939c8709c198b5dafbab8df90835ef3ee6351ddaac0276307b SHA512 fdf79a7e2a16b1dfc42d3f6c16453c6d5d47b8942783b86cc0e56515736bd3adcbaef6d959f3e601ada249856406762e09845ad90a7c215231cd3e24015bfbc3
 MISC metadata.xml 439 BLAKE2B 05117be30c76742036f51144ba7a97d10894dd820b5bcaadb22930534d294799b440009404d6911556d455c57742568d4a9c0bfff18e2ed9a4879b2ed091de45 SHA512 9b6d72a535ee7dd8c38743dafb7356899c3c0666cec7aee6cc53522187222a2f955292b5438577ec6bc690501e570f31c70b9f67c0364c0e3f55b10954656bf2
diff --git a/dev-ruby/gist/gist-6.0.0.ebuild b/dev-ruby/gist/gist-6.0.0.ebuild
new file mode 100644
index 000000000000..b929beb9c1c8
--- /dev/null
+++ b/dev-ruby/gist/gist-6.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Potentially the best command line gister."
+HOMEPAGE="https://github.com/defunkt/gist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# dev-python/txgithub also installs a 'gist' binary.
+RDEPEND="!dev-python/txgithub"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 9a68d10980d6..3c6ed4601ab8 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,6 +1,6 @@
 AUX globalid-0.4.2-integer-time.patch 778 BLAKE2B 5414dffd32180cc6306f26076583d804ed4c26bde10c941944647e859383516ba2cfc5f68175ad11bb97fc9098e71cd20b8dcf462c22337abd49a97bfbc6923f SHA512 2c7cbbfc3c1a8740721f85647d504d947bf9911897429ae2b006c983dc39c03bb02a11ec2e695b8c4f5157c1d78aa8a96f3800b717e37e3c2871340560170ed6
 DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
 EBUILD globalid-0.4.2-r1.ebuild 771 BLAKE2B 1cbb9c4519c92b261ac79a4724e0486673d1d8612be7fa99ddd9ae3433e1efc6d42f9bf3bc4bc7cc52b14417222ef57d9576aef66ba627e92ed6cb0a40bdca0c SHA512 811b75c6fe582e7bd0dae989064370e53c871809ac6b2560f3ca0911854044d7b629a5fe24354003fbddb2b4ef12ac5aedc1aef0ece4b6feb267f084901b7568
-EBUILD globalid-0.4.2-r2.ebuild 822 BLAKE2B 0b8cbd1ad98c957e552d35b1d961fb7089dda0b2702767293d851e2247210b7af3e37f5db67f6b43aed5b755266bdd564f60e533d64fde9f45a977e84f02f0bc SHA512 f3cf8a874c958859b11ef20cbff3fc93972c3efaea4529bb45c074fc13ee19298f9aa236137b39a4651bd01165a7a293a68a561f669f906a3aba117d7b4fee18
+EBUILD globalid-0.4.2-r2.ebuild 828 BLAKE2B 1f2fb67010d33eab7831a911f7a7cbd95a056ceb214b6741c38cfa6932ab2fc4513735990c29edab19392b454fe2af9292c3f872204059d3d6c6c95d3cf0feb8 SHA512 1a38d7cf266efdd9938fcf0b739fbd67bc4bab4586fa2411a1db7d07e7f622d19ea7bc264a422f26b5cd3726a14a5861362b9e05afe4c174cd81b3b06d175c7b
 EBUILD globalid-0.4.2.ebuild 774 BLAKE2B 7141669a7747eaa4b73074a8a6bba1154ed997c8691bae1dcc33dbd6fcebad74baf98861884abd9d76a6819e806fe5907e245eeb0d6d89cc6ad5aa4d520b0827 SHA512 87db6271ebb3ff86096dca8a0b650c981261d05cd0c79fb4f06c74f509ce82f3c53d13b836877575361a79074d51bd81de81ee483aadf8692b186f72240ac582
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
index 8a4c361b25e6..556a7328ac76 100644
--- a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
+++ b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-integer-time.patch" )
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index bc4c491eb28d..a08ed137169b 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,7 +1,7 @@
-DIST google-protobuf-3.11.4-ruby.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST google-protobuf-3.12.4-ruby.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST google-protobuf-3.13.0-ruby.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-EBUILD google-protobuf-3.11.4.ebuild 956 BLAKE2B 1e795340a36991275e03f543609698517cf1134f5df4050ca5842b03800bc44344f3d7fb545fb8ef8813f7b71fb9328d4c7e92e2aada725a71c42a6656d57573 SHA512 82d89231f92b7f7d928a666f8e20d5709ce392712876506c8d3771d8fcf96ee870fd47bff6fdd927b06f1f451d869b4e5fe2a1c020d809f5d89bdaf236694851
+DIST google-protobuf-3.14.0-ruby.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
 EBUILD google-protobuf-3.12.4.ebuild 957 BLAKE2B a23e4806a8ac69f5ae65143214e23632b215b80de65d24ab6c52cb8f54b66aefb0b80acc2274047caccdc14429dd89fe98a17a7bf236fa616448ebaadf33bd49 SHA512 02dcee02c57e781f673e02706e3dfb269ad75a04619082b7759002c18ca10ff54b24282c5ada699eee09706aedb82d0676b825069cb996ecbe155e5d417b36d7
 EBUILD google-protobuf-3.13.0.ebuild 964 BLAKE2B 00217e4f50fe1246dc87d4256d283a00d5ae2c2c261cd82dd4b6a8e7d4eb6eb0b20693f12253139fac62d14bb91dd1af93a74bdd4a692ef7c8f96c12ebcbc44e SHA512 f883eaba02e0cbee13958c3f43d5f780058cadfc2142e9fc2ab93a5cd494ba854d233fd7cd94eddb229c4517aad44dab646ab4120a7ef19e5fe78eeaccf0dfc3
+EBUILD google-protobuf-3.14.0.ebuild 875 BLAKE2B 0ba58cf1ef620cc261b81418d8106f1bd7474940fec7c7b453ca28e7f094d7a3ab8240fc78565fa349de9c284f1729a55ad924385a01451ffd7f59d07aea168a SHA512 3aff790656a45462744057116394d1a189fa3ef48ac4a207888999264655aa3ad71602e5bf91e1777c8e755154a77077294e9e5e7ad537bdb2c7bd561fcc7b0d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.11.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.11.4.ebuild
deleted file mode 100644
index 95bcaa6b4caa..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.11.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
-
-all_ruby_prepare() {
-	sed -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^  end/ s:^:#:' \
-		-e 's:../src/protoc:protoc:' \
-		-e 's/:compile,//' \
-		-i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/google/protobuf_c extconf.rb
-}
-
-each_ruby_compile() {
-	emake -Cext/google/protobuf_c V=1
-	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
-}
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild
new file mode 100644
index 000000000000..a59259f3ae89
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://developers.google.com/protocol-buffers"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
+RUBY_S="protobuf-${PV}/ruby"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 2229d3126445..a5dc678029a8 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,5 +1,7 @@
+DIST gruff-0.12.1.tar.gz 27157241 BLAKE2B 18e0fc5398c16bc6eea9e628b4be887e9bd9e260e23476fbf7115a0db952ec036d36e5d28edf1b0dd121bf6193cc01fd00d629ba88da33b796db5618e3d401ab SHA512 553419952279cb26043d394286de26b0b63a57495a51e595d344cf8613bbf08b6838fd07d77e8c9272a1f3cb45042f88b9d3500ebbb6acca2bae8c6ded12b3bb
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 DIST gruff-0.8.0.tar.gz 24712264 BLAKE2B 836ea41e8c7a91ec09ef5356e4f021f99381be4ba437bd043ac628a31ad02f1846cfcf182c2ee038ff90918386413cc9d213d9958412c2bd0c89b1ee2d5c481d SHA512 867fdf50c41bf0e1040ef954c00bced11df0c3d382333aef42f6325a30a950f2ab04e0a5beedf1ab5c3cb23d1682b56d2a398d8afc8d7aa665980ddac4e6cdcb
+EBUILD gruff-0.12.1.ebuild 1588 BLAKE2B c278067dd23bf1f656678a50a59057d04da7ac8fd451789b3b858c8fe32bce3c823f1b2a4d487578edcc741c85d806f296f26001e8d62828bbec737ef6f98470 SHA512 73f090a75de7ddd94a7a0e48982307a261b11fec481da88b47d34fa4951e4678ceb5f9ffd388b0b966a340c90520212ac04b689675c9a3d29cb05bbc2fd607de
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
 EBUILD gruff-0.8.0.ebuild 1416 BLAKE2B e77119bba425b5ecc75e1adf342f10e41487fb012a94fca1e8bab5bfce2d55f682756cb9acceccf3e04ca4941ceb096ec298777d9bfa12437ad4047d8a160bec SHA512 97c2e62b99ce63e11355fa7e94f530d909b31342360b91a93ac4c8d8ec01b57607535b404c8b1781608bcf46b958c43119bfc2974b6edc6f6ba299e941725748
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.12.1.ebuild b/dev-ruby/gruff/gruff-0.12.1.ebuild
new file mode 100644
index 000000000000..9c7cd283b200
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 84dc745035ca..1abee1c1ee8f 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -2,4 +2,4 @@ DIST haml-rails-2.0.0.gem 13824 BLAKE2B 4d885be047f972cea11d3c7d0a9e56d557763d5b
 DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
 EBUILD haml-rails-2.0.0.ebuild 688 BLAKE2B fd58aebcbc7818b4d3d9789372fdcfd5502b6d6790c30cd83df11ec5fffb54f54566c6ec57fc460f7f6738d07ad9e75658b24bb0a562badf9da5894bd6e17d60 SHA512 8319af2f3775cb135f55eb409f2892f3ea542d54b7ee8d15a232acd32288b23ca0a4d3b8a803c2c9ba0877825c0a58414030e38be1f59e11780e7894e9bb3ac2
 EBUILD haml-rails-2.0.1.ebuild 681 BLAKE2B 829119916d34445f23d8bbe4e733fc5df8a332a06fe4135f7a9b83b6a7f072eff733961888d5f60030472ef6114d43207b1e6a312e0c5b258d519b05096147c9 SHA512 826133a2a3b2260afa46b7074b644c92b6dcca1f7ce89803066d85617c6fb87b7ad8841a78555e885cfdee548f635595da6d5f5e8b60ba1bab347199b98fcb81
-MISC metadata.xml 335 BLAKE2B a5cfc94870073cefe663542cff943ea70824dcddbcbc07d34ba6f1067caf922fbfba2a75cb7215c20271bdb7f3b7c16bdeb7ab3ca0d2adbc46a1756a2d079849 SHA512 25a5b3c96a272c61b756d168146ca0f3492d14b8672192afdcedcb3690de723ac0915a7120fb03db06fab6b701ebba205cbc57c49f681720fbbbe5a612d01e0b
+MISC metadata.xml 335 BLAKE2B 00c2a8da3d6d0f138c7c674b28ff25404140e7e2c2413f029c8ec9aff5daa2f3eb5517b18679ff708d868402dfa0373ec855cc4c664f50978ec85269725767a6 SHA512 651f5728561bbd3edd474192b38fd753ff25def147e269eef89c4c25ba94ce9b7837806600ddbff28185fc71a45b28205fc2f5fd4d7dfdd37e4f3d92c3d6d05c
diff --git a/dev-ruby/haml-rails/metadata.xml b/dev-ruby/haml-rails/metadata.xml
index 5092561defbb..82824037092b 100644
--- a/dev-ruby/haml-rails/metadata.xml
+++ b/dev-ruby/haml-rails/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/hashicorp-checkpoint/Manifest b/dev-ruby/hashicorp-checkpoint/Manifest
index 63a33dcd70a2..f8856912e5b8 100644
--- a/dev-ruby/hashicorp-checkpoint/Manifest
+++ b/dev-ruby/hashicorp-checkpoint/Manifest
@@ -1,3 +1,3 @@
 DIST hashicorp-checkpoint-0.1.5.gem 13312 BLAKE2B 4318cc7748797732ea3719965debd9621136a097bdc6a9bc6577d563eb69c4bbabe8451396bd9281874c1b4adca690fe443f0a98eb10857b1f6b561aa732b508 SHA512 77effab526b798da1739c19021f3832bea7aab9503a159909a712f18da7a0cc6d750dd0783c2bc5a31f650f00f0a65dad706e2159882bae70dcf7425fdb35a40
-EBUILD hashicorp-checkpoint-0.1.5.ebuild 478 BLAKE2B 290e1e3d5c0305c5d05cadcb4a917e9f3c499b82c0428645ee30a08e8b5c4773cab30c27733a36807e1db58c4f70e93121ea99cb12082764416266ec005b52df SHA512 f49567b9fa2336dee771ae348e89008ccbdee7b0e44a9a0509e5be1492f3632dc20240ef8b298de67cfc0bf10aa5b82eafafb8aa1b9401c0e9ba6308e46e27ae
-MISC metadata.xml 257 BLAKE2B 086ca0068cde7eb257dd825a8a85d3dabede3a595198f6d583fb7d05dda33750ede10b605d53bcd22e1512c9db6decf29273fa833d7726c91d0b0f9420ae73d6 SHA512 5581b128dcff53d32c62739faaee8b0c4a46ad6c364234a38c8d1940e8a7ed8b263d41c32c90faeb475b99dfc9229bba962aea29f0189e376c702bc1627cdef0
+EBUILD hashicorp-checkpoint-0.1.5-r1.ebuild 590 BLAKE2B f3a4abd9242f48490f1d651eb1fb644760714f31ab2b21485994930ae7142292e36b2a1460d6bd9a94b1b6e2472ac50557b13a8617972c2227a4ab6bc1cc147e SHA512 4e640ab90d5106744d9575bb480ed2193ee7cd59930c44413d644b10bf870991119acfd9823ff3aa4a001f6e8c4f1005ffa8d57f9c5b73ccd04d0d95d7982926
+MISC metadata.xml 604 BLAKE2B 81c98522dedd50acbada4671d77377535ea3d1562419dbd7c756fbc8bc725648a0aa08ab897e335830ba2d9fffb5d10e33ad9aa708256aeaf99add00184b72ef SHA512 8669e60acbcff0129e7b79aa180f02ca50781fc85de99736cc23e044e9b54330ab9cb4c882135f7b1c4a8be30ee7f57e0ac52c99313ef7339c78b8e2d207e346
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..6baa1c50195f
--- /dev/null
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Internal HashiCorp service to check version information"
+HOMEPAGE="https://www.hashicorp.com"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests require network
+RESTRICT="test"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec-its )
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
deleted file mode 100644
index 1cc19dd152f6..000000000000
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="https://www.hashicorp.com"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec-its )
-"
diff --git a/dev-ruby/hashicorp-checkpoint/metadata.xml b/dev-ruby/hashicorp-checkpoint/metadata.xml
index 4560b1c7da3b..970953b44e9d 100644
--- a/dev-ruby/hashicorp-checkpoint/metadata.xml
+++ b/dev-ruby/hashicorp-checkpoint/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hashicorp/ruby-checkpoint</remote-id>
 	</upstream>
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index b66ebd4f5dca..94f2d9a8913d 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,3 +1,5 @@
 DIST hiera-3.6.0.gem 40960 BLAKE2B 1e49499ac5841d5fae884ffaf7ba7c72c55e3c04ee3023b2bee3e68e29d4827825e23ed4bb4a929d6337a1ff1d19dd1fbcad329495604c3171c3ab900e21b607 SHA512 6d76845e23732875c461d5b2df8599953f067ec84ea6648044e91822fea762118a108136e43ea9b7112511939978052f846d94e895b2b8f669df607fc90afbd0
+DIST hiera-3.7.0.gem 40960 BLAKE2B 2cec1e8df126da1ca3e46015192cdd428b595084461d5bca92ad561ba7e3b2be5d6837b3565031f174b5ce7fc32f80e288ed12dd3d3cd5d9f3a369b7f2cc6dae SHA512 583da6eb8fb30f9b1029861c7e539fa0e766bd3c4de06715225975d24e46f18cfea9b80f7e4f65535d22ae9bed70c29f999c160fe131aa0897dd70e61681d1b8
 EBUILD hiera-3.6.0.ebuild 516 BLAKE2B 3d9aad2111fb9119502a96d0d41336f4ae2f3fa3fabe07241469d00396617c4270c6eae2cbcf63cebee8b9264d8661167476aa180e6620783e107a42be6defb9 SHA512 319214d13ec6fd36a490cc74400b88d48a80462bda1dc2a98695e1c24fb6d5b1d98345129daab7c9cf3af7b8b9ba45adf3173a3d99ea2f347e6d58511f8d0923
+EBUILD hiera-3.7.0.ebuild 519 BLAKE2B 0e8f23e314568cc47ada810dfbe68bccd5c5818a4f422071b62cb481224d81e919bdd80d9dc3bb76b7f06e1b237feb81f5e41ae22500c8706d895dfa5730d068 SHA512 f79d15edfc2e5fd14059140162976df9512a191542bc7095189a473ff2d0ad13da9db8772f400f7d130ad75e8eec070c0fcd65c4230ea9015010e957fa2721d6
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.7.0.ebuild b/dev-ruby/hiera/hiera-3.7.0.ebuild
new file mode 100644
index 000000000000..c5967ff1b3a7
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index 1a881303371e..cce52406fd32 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,3 +1,3 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
 EBUILD ice_nine-0.11.2.ebuild 482 BLAKE2B f82c6d3f77d67f3625d762095f13d41b2286bd5dfee0524dfae92c5e8ba9480868b10589316f5c27e97f652a2bdf7a8642231cf5cfdf925f362816585d914cd0 SHA512 375acc105766abd661058257f73b0a1d7e1389c7e6babc722f7cbf5ffc4574f0d85a82942dbdd989e4e7ea3dd4008cfc8808a59ac0cb3d0fdfe598fdf08f6d61
-MISC metadata.xml 392 BLAKE2B 005ee6bde41af66645b9076e37091d69e098bec443d81892dff2c0f20f1e175dd8e6b770107f0ce789b6bfa48e90e51ec616f365d8975396ac3046e61f752d30 SHA512 d9b5cfcda960d3ce6c69a28fae35a92e23270c683c578d62ff24664cd9b0de6880b514acb39746097b0f9c8d92c3ebd2861f232d05454c0fab3323eacaa885e9
+MISC metadata.xml 392 BLAKE2B c266b687f07d70619208ddebacab2982db31ddb32360e98ee1ac693ccb561cf29288429a4f563b0dc03b0d8ca3d80adb8df8a2c24da351138dbf124b8f3b73a9 SHA512 9af884bfae6d4066b734267f544edd4b9cb82ec6ff01ba510cf404abd198ddadc626812978cfd3ee9c66015fe602f806d49535fa51c72df9d5a88973b32984ac
diff --git a/dev-ruby/ice_nine/metadata.xml b/dev-ruby/ice_nine/metadata.xml
index c52cc252cfcd..66ee78b314fd 100644
--- a/dev-ruby/ice_nine/metadata.xml
+++ b/dev-ruby/ice_nine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index 8af1bb0a03f4..02689866a62c 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,3 +1,4 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
+EBUILD introspection-0.0.4-r1.ebuild 668 BLAKE2B 03ec78f0d52ebe4e1230ca1008a02f4e80ed5aacfd66be177b46a5c42d1cbc315b74bcbcc3cae79c1f82ade8858dc7e260bb0b91393a62aeb33e277def53a6f9 SHA512 0eb09175257db39e6b459f01572612c4617737ae3cbe4c151e7cd1e1c47a5edde65462a8b17621abd933aa6e6b45cdebe47d83f5e7d990e282229d4a4f77c873
 EBUILD introspection-0.0.4.ebuild 661 BLAKE2B de8595ca7ed6ffd7abba94efdce727c5cd901cac295de29def41020183629df4ef8d90d2210099a7994448118e3a79ab2a5b0664576193e9b504d1619bef794d SHA512 1a75e4921d3edf5b2f13b3496fcc30306e86b688217e4a0071323c84fca1d3bf69e8797cc2a11824e82949f388a34f574cde2ee6a3e39ee61a41537f32704525
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..5554720a0a1f
--- /dev/null
+++ b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Dynamic inspection of the hierarchy of method definitions on a Ruby object"
+HOMEPAGE="http://jamesmead.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
+
+ruby_add_bdepend "test? ( dev-ruby/blankslate )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index e2ec54eb8238..0eacbc68684a 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,3 +1,3 @@
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
 EBUILD jquery-ui-rails-6.0.1-r1.ebuild 553 BLAKE2B 67558b5f8572815a44c4c2d91aa4e65a1b9c9b91865d9e988e1074278365f8b460d1dcf7e4b59dc9369dce48926fe8ccf400c462e08bab2202b1def02843259c SHA512 5992c5efd3bd770339aff9424dd3815fbddb0ba9e0843dbcca422fb74fcbee6aed17d24cdfbca3e0003bc000ed5190e9db6adc74431d1db37a4fbc898f3e4b04
-MISC metadata.xml 338 BLAKE2B 6a200e9f8a3f4c11774a587a5b742e8acb4ae7651694adc7d27240aa86a8b38613598cdee1d38bbc9b5aaa4819c702aac8e638b1cf9650619f3b5bfeb7278a7e SHA512 6af21bcb48be71d72486aa079919f8fc18c54442b65598fc8500ff3fbbf0fd49f1d3d51b86ccaab4f625fba5ac07ebb44c69fa2d7e64a4821983d0eae49f53c1
+MISC metadata.xml 338 BLAKE2B c2ea2399a55ec6edc25feae381c1fca248fcf04229719983fa7400cea3538ea59716ffa40b249bc2eaa451cf45de3e686393bc45afc550dd818cedc9cc679178 SHA512 7da764aa08433ebf4ee921aaabbefe3dff2362ebd142df007fa7833f7b14fe30ec62d5808e988f8ee6f073732a67c3df5907c7509448b20acac47308572166ad
diff --git a/dev-ruby/jquery-ui-rails/metadata.xml b/dev-ruby/jquery-ui-rails/metadata.xml
index e311b1c7b568..d0ff70781cc7 100644
--- a/dev-ruby/jquery-ui-rails/metadata.xml
+++ b/dev-ruby/jquery-ui-rails/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/kramdown-parser-gfm/Manifest b/dev-ruby/kramdown-parser-gfm/Manifest
index 90cd726f165e..cfcb3403b4fe 100644
--- a/dev-ruby/kramdown-parser-gfm/Manifest
+++ b/dev-ruby/kramdown-parser-gfm/Manifest
@@ -1,3 +1,3 @@
 DIST kramdown-parser-gfm-1.1.0.gem 11776 BLAKE2B 99a77ea02d0f48421cc6c582629f6cdc7504174867cac8927bdc26fd50f851e294c0f71ab985e9d0d6e595906c458b1f96d06903d6765eabf8b6f617c6303f14 SHA512 5662c1a50da7c8e50fd50afb5fe1dcd3bd63f4282d9940f96bb56266b63841c0b09902ce90eb3162aa89c54047970667b17299b3a7cf475bab2641604aa15d8c
-EBUILD kramdown-parser-gfm-1.1.0.ebuild 679 BLAKE2B ae58672995639b5a038a3a4e41253ae77f44c218f889cd44d08b13a1e2ab64642988858e13b708db7d1603c46811f85165f80bf12e41a527c68a41f5d7553aee SHA512 bf406bbf7c7769655ecca42282a95cd9c6f83689fbfa9fb342a1ba017ef204ccbc11e67b05dcee9158b7aa47f8fd0392249c00303b06fd298a31e81ca2f7188c
+EBUILD kramdown-parser-gfm-1.1.0.ebuild 679 BLAKE2B fb8fc25417fd94fd6a2c3342d203c73835cd9e0a1f13b0ca2a85b1832587c3beaccd91a9f96744ebe8accf3faeb19d0251b83e97a904f47d676187629ce535c4 SHA512 804ce21995d0e0f00166311e5e40e6ebc2e099ba564c1ed4e1107a79fc504635db76a2e10b404361041f5cbc10d629217f8eb47a5fa8ddeac4460ec43b5bbd23
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
index 2b46555973d8..6e2514be9de3 100644
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
+++ b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index d99699e03053..081fe4c70d72 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,3 +1,3 @@
-DIST kramdown-2.3.0.gem 121344 BLAKE2B 0494afe84123503cb1e2f31c512c1b8cace1a81a3f32488e9719d47f1614a20fb86aa007187f2802e9b5c041031e8b6258da9909cbb1bbad0aa94d519821fb14 SHA512 a3ed8360de9208d5ce658d198763737826db943d23dda7ca9cfd507a4656c39f2b19ece78af87981b1177fe01690d6647c854092b230cf3a8a7d2823dc83d276
-EBUILD kramdown-2.3.0.ebuild 1280 BLAKE2B df9590340dba99fd2ffbdeb26ffde03e2e701da8f9939c8564227cd3ced58cd5f180c3ab04490d9f09b072311d3d8bb5ae5653ca0d391b691e64f1152de08154 SHA512 3a2c92fbdb2cc4f838eff8d50acfab7f1e2a7ef162de6c76b3463f64d2b988e50a885647ca482cef7c59c4d64ac1999d376c4dcc8c4b67d24409610a7e66444f
+DIST kramdown-2.3.1.gem 122368 BLAKE2B 731e20904f238f44db594c7b8efac858187c935d9fbf8a421ddceeb1aa486f0980b502953f8eaa7e3100f7b7722d09b1da35091d28977c70cfd1ef24a080c3e1 SHA512 d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496
+EBUILD kramdown-2.3.1.ebuild 1280 BLAKE2B df9590340dba99fd2ffbdeb26ffde03e2e701da8f9939c8564227cd3ced58cd5f180c3ab04490d9f09b072311d3d8bb5ae5653ca0d391b691e64f1152de08154 SHA512 3a2c92fbdb2cc4f838eff8d50acfab7f1e2a7ef162de6c76b3463f64d2b988e50a885647ca482cef7c59c4d64ac1999d376c4dcc8c4b67d24409610a7e66444f
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/kramdown/kramdown-2.3.0.ebuild b/dev-ruby/kramdown/kramdown-2.3.1.ebuild
index a16c856eeed5..a16c856eeed5 100644
--- a/dev-ruby/kramdown/kramdown-2.3.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.3.1.ebuild
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index 5a090f46aaad..a006248d41ff 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -3,4 +3,4 @@ DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23
 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
 EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a
 EBUILD launchy-2.5.0.ebuild 990 BLAKE2B 019ae492d56b02799d0002c8a4de74939a316a90800dc50e1fe2225a87afa9dd9cf5986caf646e7ac7b520987951c4b65cca4ed475f4af6b0ed9f3a6a4f0e356 SHA512 338e0d6b709920e77f6cec7bdebca5e5804adba7e5cccdfae386e9615ed7308492e54a164742b6186dfaf7d563750f22f56b8f6ed7167018d71116d50cc49796
-MISC metadata.xml 339 BLAKE2B c85b0f849da61909275e94498530be54787a75c970cc607b0f6ac006f67bafeaa459c7704a92a22622e63912fb07f186e3a6e743df8e34ade2d55f56e2c63225 SHA512 bef54e2c7dcd8eb6a6e353b29380cfc53e842a729b584b6a6f6cd423651f390fb8005941c18c005bece74b3de4e68a0201b59151970badf3280e479e9f5e9ec3
+MISC metadata.xml 339 BLAKE2B 38d4d73836cb52b4a7a2771e032b4c146be4af4d6730de8b81e7a860ef510e7e8071a6e23ca6e67cd5b0df142172544dd6f1ecc1722ce16beb5cf6b64f4b24b8 SHA512 aeef903ca61304d96a205fadb63022e5e44f01f5e5da7d0d9211dc8dfdcfe21a45d1128ca10a4adb0ddcc4eea7bf1f0b0bbf5a6b2cd45978c1fa35fe304740fa
diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 0895e7ad63dc..cdba33584557 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index 9fde2fb2c791..74e7e5661ffd 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,3 +1,5 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
+DIST liquid-5.0.0.tar.gz 119166 BLAKE2B 429811adde3aad74c354eb9e129a0cef9c994839881246c9bfd06a9283e65eaa8b7786ff0d6cebdadf7363a9f2f67959b12b57d39bdc4343823116d3e81849de SHA512 77179bfb764a947bc3da0eab2963f951b189414ca01633b3817196d1267f8b098aba8c2ab1ce3129f8ae5a95fa8b39ad60940736a0f89f9ecd1a14b46d7d62b4
 EBUILD liquid-4.0.3.ebuild 776 BLAKE2B 8f24660c238c9bd6831bb6e60ee9985ed18a356ef53281064ae2c0f21d0aa00cd7b4dd95126519fbb6cbc40db0330af92f6ac1075bf874cb1b63825f38d67440 SHA512 7cdcaa8ee37c7c600095a678c8eb78536483a6a6fe0f18d2f8bff34b7288f8ef98cd06a8e491644b41f02e728ed1eac4bdd93a258764b349fb4488a050e005a8
+EBUILD liquid-5.0.0.ebuild 814 BLAKE2B 8595d5ac9c0042c60be21d190445d54add9f9f53b3b31ab0a8f91f1812c7076cf235e617cd0bef0ddbc99cef5fc9ce4f44c4cf9639d9f05b84f09740b419b581 SHA512 1f6e347cff859a070dbd79db8e82659943f1ccc790a0bc3429e8fc3f698e0934eebdb379cd34a47b962fec7c05ab050b7b027c01811ecd6b56866ec3ef45741f
 MISC metadata.xml 340 BLAKE2B d7b2ddfc79a4db0e45aee4759b455288a423c1f2e7364a6184fc49ab939b1ec792cbcb9175b302299217f8dda55253985a03770290e825618fbc490f44facade SHA512 cae45b7e74c0400be7b37f2632f7221e776ec8edab030e6520d1b0109d0448c3d18bf8c9590cae14403acc3f5bb6ca2aa3d29289db3ae8e10915faed16ddd02a
diff --git a/dev-ruby/liquid/liquid-5.0.0.ebuild b/dev-ruby/liquid/liquid-5.0.0.ebuild
new file mode 100644
index 000000000000..ae30ed98c39d
--- /dev/null
+++ b/dev-ruby/liquid/liquid-5.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
+}
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index be7cf5c0a6df..73cbe23c6041 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,7 +1,3 @@
-DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
-DIST logue-git-1.0.16.tgz 13364 BLAKE2B 1eaedcd8cd2a45713a39fd2bfc59fa8234903e01495072d905d461c799fb210be828a5d9685e285c44858c2a10e6016b0053686c3a7c31df64d829ed1c216df9 SHA512 bb8168b69f614f8b2e85bac982dbc85a4a0705cb8cf2d13bf1c361c120c1f66155782bccefbc9069bd9cb4595d6ae8e090c882677d52245ca3478892ce226c56
 DIST logue-git-1.0.18.tgz 13310 BLAKE2B 42669cae48b5efe5785470410b694c7330dad5273d3a788612729d0e2efb9aabb8b3024727efddb4efedc1addd377242bc5a3ad5e9ede602f0f606be4db84608 SHA512 654681b2d1735790a08d8c53f9097ca28b64c37e902ff1260c8f2fa669067d404103944f0c78c5382a10b9491d8b0a10495516d3529d68be97c62027c2812c9b
-EBUILD logue-1.0.13-r1.ebuild 788 BLAKE2B 2a5f0d59febdb8581c7765390e2a0888962a0015b0f4e3046f004d62aaf22c1d365fe39c2aaf07d9313d06c2689c6845dbc103088d03eedb56433574f66bb1a3 SHA512 a28b8ce7122eca66b8d56f77a5e70c8738aec546ddf41a1ba291307c17a9f32b00e13566a3ba4278ae0933147af5df64098e5e328ce0f9b7e375e70da4b4af93
-EBUILD logue-1.0.16.ebuild 797 BLAKE2B f0847f99df4494d16ab74589ad3d92e06c01bb3997f872ca55230374ca6435363d829c2a392a9c5550b42d15f4d8c8edc78fc1d6e5b58612f317de94d6e15764 SHA512 7a0b1be12cf593d5586b21ba04eec1575957bfe57826185da7d046451dd65d46b7ab5960fdfdf33ff88981cc4ab2e3e1aaffa4fed88acdb819834466180804e7
-EBUILD logue-1.0.18.ebuild 789 BLAKE2B 8cb54b6b348ed15a8867ed64f30a78e6867ac2dab53989b7a3f8e9fc300f5bac733615759dc7a9e373bb32e9eefd4a32ff47930ea18d5b3bfbd953d5de2e30a2 SHA512 ab6288ee92859d21e10aac6be9a1690b83c3e3ae6350605ede7d931438b5d0aad595b485d2b5b8a36adefcf454819390e2c3837b27b115569fc6b780a81ea680
+EBUILD logue-1.0.18.ebuild 788 BLAKE2B 8cd672e2e6bce6cd54251738dd6112c337d27f98eb6649cd3915e11097f739ef7477200237cfb95b545cc97517fe790b4a44b86e4b539c22c6f5f8edd6659d70 SHA512 fd115883a821ae914274b3d82e0d4611763c3d02af04eefad1b02e9307b7581e442467a9c1b286d8a8f142250438d96824f456ce5b207a9af9482c1209579f4e
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.13-r1.ebuild b/dev-ruby/logue/logue-1.0.13-r1.ebuild
deleted file mode 100644
index 0c44d02ea4be..000000000000
--- a/dev-ruby/logue/logue-1.0.13-r1.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
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rainbow:3"
-
-ruby_add_bdepend "test? ( dev-ruby/paramesan )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix path to match installed gem path
-	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
-}
diff --git a/dev-ruby/logue/logue-1.0.16.ebuild b/dev-ruby/logue/logue-1.0.16.ebuild
deleted file mode 100644
index 509da71330aa..000000000000
--- a/dev-ruby/logue/logue-1.0.16.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
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rainbow:3"
-
-ruby_add_bdepend "test? ( dev-ruby/paramesan )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix path to match installed gem path
-	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
-}
diff --git a/dev-ruby/logue/logue-1.0.18.ebuild b/dev-ruby/logue/logue-1.0.18.ebuild
index 17e7498dc659..4a84bec6ae19 100644
--- a/dev-ruby/logue/logue-1.0.18.ebuild
+++ b/dev-ruby/logue/logue-1.0.18.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rainbow:3"
diff --git a/dev-ruby/memoist/Manifest b/dev-ruby/memoist/Manifest
index c6efa767691c..e38faec40e94 100644
--- a/dev-ruby/memoist/Manifest
+++ b/dev-ruby/memoist/Manifest
@@ -1,3 +1,3 @@
 DIST memoist-0.16.2.gem 13824 BLAKE2B c3ec292126cd5254a2561317554d4bfebd11155de88138bf82a2a09b4342a0833d87cad33dc149cd40bf962843230161b766fcd5b03c55c1d55fd705a5e768f1 SHA512 8de7c73362e621c420f04e1b37c27a21fdc46c5e341c8cfbfd835f1cb53eb1a763dc43565fcc9723bcbdaa439a7c6921a8541a741646db4ef127cb8f6018fb10
 EBUILD memoist-0.16.2.ebuild 495 BLAKE2B 2dd247fe5a71d972c55e6d8776ff7be4c573ad569e74c2e24345e46e1951abceff5c3b129c4fb7f46560d0fc91599ca34a0164f9c61f40ef424b364e80e2dada SHA512 37789ef0660a4d4e051448b9a55c6240aa26e8e79cb6adc1ead108a0b409151490276307890dd33d47385fd62ab68670f876b2b12448bcc82a6b7d03b394ac56
-MISC metadata.xml 477 BLAKE2B 7054dd9012ce8821d8b86fb26a7a81fd6d48e8a98e5498920b4c95b275f70919e70dde1591364f5e8ac24201c37d8e871d2af14cd4f7505966416f459e5d8dea SHA512 019d2ccf64907ccc3d5be96240e30409602fa2831b5a0b498f06f1e7bf1cd8d433f6e3b1da26c768fe6f2c96c46347b07e9691b0660521ee0103ad1a0b3137cf
+MISC metadata.xml 477 BLAKE2B e47d9116658e33cc78c99959fb3d4026fe452fb6905b685aa15aad911471cd1202cd33c2e8f8842b7fbec16304bb84f6b496ae72508c9d54dd8f84d1602d4977 SHA512 2e8e74ee18698a79e600f8dbd5fc6379d01793a01ff0248cfc42ae48ab4debb1fa5cbe4a5217cf004a8adacc9ae99aebc0c7f44d39cf8d065d12b843c00232c6
diff --git a/dev-ruby/memoist/metadata.xml b/dev-ruby/memoist/metadata.xml
index 7b013c97b9f3..e06a3c3b9254 100644
--- a/dev-ruby/memoist/metadata.xml
+++ b/dev-ruby/memoist/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-ruby/metadata.xml b/dev-ruby/metadata.xml
index 42a8e90ecd8e..8564e6827a31 100644
--- a/dev-ruby/metadata.xml
+++ b/dev-ruby/metadata.xml
@@ -37,4 +37,3 @@
 		programowania Ruby.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index c74d3508b70e..4d4e0bea2b33 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -6,6 +6,6 @@ DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5
 EBUILD mocha-0.14.0.ebuild 885 BLAKE2B 7bdb2eaddd983c06460cac0320e6ab2f4ef3ceeb76f0e64a5b4db3f61d9338f50628d946294667a47a53b1d28e23710af1e7ff4e6efdd0d32526418ad5600b84 SHA512 d3c0ff9fa348c19cedcc4aee99ecefda3a1db963b9be5067dac4d31d074e08288f8c03455220b00f7f6d65ccf1a1573c3fa629fb4cd3373dbc238bdb890eac70
 EBUILD mocha-1.10.2.ebuild 786 BLAKE2B 6b30a8ff71632be937cbd0b6cd4300ba3313eb49d5ba980721349a7c0f85f3e3b803b69da63c05487cf2a7c682a1e9844070c0181438a60b89375c6de9f54d42 SHA512 6ae0eca663ed3c2054c258604166a56bfe2466bbafde758722f0c51393790459fdcbed2015ecef94745c53a5cd18e53b2bdf89a43b663cd5b46610ee4f0a80fa
 EBUILD mocha-1.11.2.ebuild 793 BLAKE2B 9ac48088e0140794d0cacec7d33254750e12fdf0786933dadd7358da1dfd48dfe308659fb4185e7600c2b5200652fad5b7125ff51a7c3d6913d1f55392815e62 SHA512 c5764b88fc5434681ca0126d171778c58bd4ccc0f6963e6cf2f009a82654e9d856db564363322349156c6288e563c184dab0fe54ad5a8358850473438130f547
-EBUILD mocha-1.12.0.ebuild 985 BLAKE2B 2cd0b117bb6aa760e12c627fe29fa5b488aa91f62b60e9599cd1ef0659d03bd4d125ded6bf723b43eee749b3bd53a11dd791a77214bfecf5471761abf448acc1 SHA512 2e9a52a5e5486d2ed1d1f6a585d5706f616a1b301b536c420a12e5fb28adc6232cc06ddf62876b8b7a8ca9b16920b468f52090df352c22bff64f6658ba96e6a5
+EBUILD mocha-1.12.0.ebuild 992 BLAKE2B ec903e2f555fe7c721fd177929bef26c9875e33c902926125f0bc1f1d9acdc7aeffa926fe7a58d8c93ff5bbbace076182c2242de12c2cf6c8172d5e114432819 SHA512 3a64925befd828a2adbdd139d819eddef43e97e6d4399bb3c033101ff704eab67fbbacee76674cfb325cc1290bdd0a804f9a817df7d3ba50010c1256485700ab
 EBUILD mocha-1.8.0.ebuild 862 BLAKE2B 5de8d30303f52c1d13add741dad6d80b279cebab848d9371c2f60cdedd766ea5ae49fa50508bc6395b32990113c134617b2faa44040ac990611391d54b58c678 SHA512 b94cc3498d028871591e6b84c0b3d037c058c0eeb6cbea04a1d70a8d157215fa9bc62194bf2d11fa1e5d2a57e2e848b32fd0ba0b6e737895b4f46cc9388fd124
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.12.0.ebuild b/dev-ruby/mocha/mocha-1.12.0.ebuild
index 576fc5e03d82..d7603ff12ea8 100644
--- a/dev-ruby/mocha/mocha-1.12.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
 
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 8e022dd87aae..16d9af605005 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,4 +1,4 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
 EBUILD multi_xml-0.6.0-r1.ebuild 966 BLAKE2B c5e47a049141247dbe3e93a922487cc011424d23a0e4b287d0d353740788a1b4589ce23b488a6568959f20b9a3da9c8e67547ac62990d348fd95f11c12188dd4 SHA512 8f04748d8d74ba669677a4b0ee30b037a9e13f70bf8569bfc988065c9ae6a7669bd19ef550bb28ea07086b224d5b088ab13799e9bd5da2855fb2d573e05d51ef
-MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
+MISC metadata.xml 332 BLAKE2B b2f9410f952cd03486405ead079525e5e92676639ccf29989417fe4a7e09dd46272a7113bae3a3baf65b6fbde726cebfeb88d05e18d735af0af5c74e3917c1a8 SHA512 22dc4a4887f8a01631ae5536cbbbd47d4092bf0dfd12be36fadbad833424900cd87af618ddd39372afee33e95e580a5e9dde56072b25aa078cd1029959253074
diff --git a/dev-ruby/multi_xml/metadata.xml b/dev-ruby/multi_xml/metadata.xml
index bb62d2bf56f6..2cd8595a9c15 100644
--- a/dev-ruby/multi_xml/metadata.xml
+++ b/dev-ruby/multi_xml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/necromancer/Manifest b/dev-ruby/necromancer/Manifest
index 5af792e67bc9..2cbbd6a86337 100644
--- a/dev-ruby/necromancer/Manifest
+++ b/dev-ruby/necromancer/Manifest
@@ -2,4 +2,4 @@ DIST necromancer-0.5.1.gem 19968 BLAKE2B 32bf97caea056a1290ad574a32dbd8f9f258d08
 DIST necromancer-0.7.0.tar.gz 22784 BLAKE2B b895677d0293adabd9c30d44c33131c69b9b30c24deca41d257c75d586cf44e34d68a090c8618a3040622be93fca3c4e637bb7510ff5db586c0392c47ee4e389 SHA512 873284964e55a0be0265675860b22345f7d46d8b49ccebb5cbe7a2103bfcb639443c3ad3af5d6d6f07d1bb2bc16dd945dc8c0a39b803640e866b82317d5f67b9
 EBUILD necromancer-0.5.1.ebuild 486 BLAKE2B 850a8526f28c0feaba13873dbe4e1196dffdf6ffcb4ce977fe2a40be293c4e9686ab222c17eb6f820936cf8e22dcb8153210d4152c8c160c77bfad8751071fc7 SHA512 90af7365fa603c02fb8c3f634a5abbb141dd49a5e47aef5c110cc17355843f9e7780b44afa41d26ae1bf83ba7910f6ccd6a81f542e5b8750428e7b38a389dd66
 EBUILD necromancer-0.7.0.ebuild 670 BLAKE2B cb4593ba5acc65af9772e8f2a4e6ca5eb9bdc5e58c1baa1603a41a9272b63f283048054f6f1e62eafa9a42c93bb51b26ba9c23838666642eb138f37227012f4f SHA512 2f8e9859d7b0248dd6d0fbffe33b66abfda637ec2b34f89a2243356fe96855b92ead33bf5a7b0f102a85ecfa8383828791e3d2667fb074d06567ca74f638021c
-MISC metadata.xml 339 BLAKE2B 7223f0fc0ce65869046b29a8d68e967382e4898f681032f0f55e59e8cf1292e5c7e168ef5fdf419f5f265c09ac595d923bff2102e634990243078830341d5036 SHA512 68fb1acd87765c309d044d434d996cf357c13943b11925968a4925f4734f739bf52a4c6ab0a8b2006d5b2f9b640a0aeb5926450a86763bf391dcec806530c313
+MISC metadata.xml 339 BLAKE2B 4625f3c8d82dd953431bbfde9e96d1255a4dceb76b41a3eee5e45cfd9a9119de39712f04a86d66040ab40beb36d5275a57450d9632a5b33ba3764e6b2ba34db5 SHA512 009d117c890b0d3b6c91931c413938eac4c934adf38a6f0665af12edc8f726946a6aaa9d323e41bfd94bb0d0903f75195f119760e80b2f6c1682b206958bcde1
diff --git a/dev-ruby/necromancer/metadata.xml b/dev-ruby/necromancer/metadata.xml
index 6049d3460002..1770acb46171 100644
--- a/dev-ruby/necromancer/metadata.xml
+++ b/dev-ruby/necromancer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index 930d88519158..c9174b15e26c 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,3 +1,3 @@
 DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
 EBUILD neovim-ruby-client-0.8.1-r1.ebuild 894 BLAKE2B 30c318169345d750764cb546d3cd50e47bb005c2f6eecfaec64cfca2d6636c6158e284e7f329411cdd2c283f4785bf158b2f7c1e228e8eb37dd92b36b8e3e854 SHA512 0dfb217d3f99081be176a5b603cf073918ade6ab25775d52fbfebb2b862c4e08d97edb2ec0599f31c24654acc9d5ccf9aac5c8a7dac8e126082b657cd85fdd85
-MISC metadata.xml 347 BLAKE2B 874c0ad5d49519c775bb2181aeb742ae08fa3c6e4b63de6975602ecfb3e03a8901b9a8f3eb0247152a82fe7101ed72911051ed94921672ddd47a4d5e823f9f6e SHA512 3ce78ce24378f88bdb189cc74a539f410be61e99a7c7dcbc011e0fb8f1a2e862a7a65b160f5dff73bf04009278dc77484e7ea39670ed68209a3a1ba1b8b0ae51
+MISC metadata.xml 347 BLAKE2B 3d0e5ff3904f2e0b528ff6641829e9881ac0841e236de63b64bcb06d9bd71c032d3419726c674d593535a85645ececc3514a081c78b983eceba303d98bbe480d SHA512 98fbd2d1c6d1f5308c604497caa108ac68a24ad459af2abe51c90ae41a76e0581dcb4af43199e6a71179e1dfdcb98518afd7b2a8bc4f864db67a614d47fb60e7
diff --git a/dev-ruby/neovim-ruby-client/metadata.xml b/dev-ruby/neovim-ruby-client/metadata.xml
index fac91d927f18..1c5601d77129 100644
--- a/dev-ruby/neovim-ruby-client/metadata.xml
+++ b/dev-ruby/neovim-ruby-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/nexpose/Manifest b/dev-ruby/nexpose/Manifest
index 37e92cbe4058..01a45e1c7372 100644
--- a/dev-ruby/nexpose/Manifest
+++ b/dev-ruby/nexpose/Manifest
@@ -1,3 +1,3 @@
 DIST nexpose-7.2.1.tar.gz 123143 BLAKE2B 2bf9a022c6695fa759c5193510c2cfa793b8014b36914c7806f1ee888ac8eb21466efa46539a9e9b7dab31454b8604b10b71d59faffd001254ee0561f456b707 SHA512 8c0d8b4537513396c9c7cb01330310ed30f8995890c60fdb956ad4760fda6e89a4d1d400e6b71cad1fd2d8c5f2176074c415d35597b1c8740233ebcccbc7d870
 EBUILD nexpose-7.2.1.ebuild 860 BLAKE2B 4169c4207201e77711111aca9eaf4c1ca9f6da8e77a8fadac1d87676e91c13a5ab422f753a045ce60cd952efa603c8f94194b7daf2ffe82c9a82a0a77c4b0395 SHA512 8667a8013297163241e64beff8d267568ec1cce84c96ece5522da702eb3336e9dd75ce462d1a395c1f8a977c19a9ca66d40f54e78fb80fded39e852957452207
-MISC metadata.xml 386 BLAKE2B 38f2a377e32dca943f2ec8fed27ca520a9beb62e3bde0efe031eabddf4e2e82a85c48c20d66f7abc3e392306b2c31426e0f8235aea857d343546696436f6048a SHA512 eda3260ba0add70830dc9b03a10ee372363346646b2107e6187f4691ab9043eece8fd07f6a6c9c9fa9e87e4c63bb45b818fdb5ad7b663ccc1c5872c79ae6e2ea
+MISC metadata.xml 386 BLAKE2B cf403f48decf1f8383c56eac901492154f4bc9b9d6299fbd2c68e192e866ba771a0cd969ad8659b4f12ddf87d862abe19163f0f127abe357db1757481695fb05 SHA512 e82518c57de2f6166cc1c0256102039ced6a06cea335446cf96a1f2c4b8533c752864b99a5b0c6b67240409fb0fca1f0dbee38630731e6666c8a030641363359
diff --git a/dev-ruby/nexpose/metadata.xml b/dev-ruby/nexpose/metadata.xml
index 1dd105102ebb..fddedd1e4038 100644
--- a/dev-ruby/nexpose/metadata.xml
+++ b/dev-ruby/nexpose/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index b6e877296103..26cbeb6b2935 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,7 +1,9 @@
 DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470 SHA512 fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
 DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b SHA512 b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47
 DIST nokogumbo-2.0.4.tar.gz 297809 BLAKE2B f55a08417fe46b9cb4e89ea032deab7f4ec8d4c4d377ca87fadfacf12f86fbea6c61de087e88d5de4ab29656276b014b1619ea7d83dae86aac671306ac0b989b SHA512 188ae188bd33969b7282230e18808e52363075723cef21d268af7ad1cfb2a0a93a8cc595297f467a32f475a47249f316836ea40c587f337f35ea57bd60d0699d
+DIST nokogumbo-2.0.5.tar.gz 298201 BLAKE2B ab342fa271983a13ccf7ca1fa6bbb2d250eb5027beb812c77d76bd03c971a95ff60440bc8c37ea5a482d21730cde5224c2419e89098824b1157b372974d09107 SHA512 3dd4dd83742b8c4b14e741b2b9195d227e5e3f14eb5b34992960cf021658476072a2c7f07fc21868d1347f4ba3c95e267e2cf7193b8d53c5451658e560128d16
 EBUILD nokogumbo-2.0.2.ebuild 1302 BLAKE2B 3b8e4fcb5c8c657153231f37ad723fa02dac6e87b5db2976ed69316a47967592672f16f3e1f33fb552723da73a10b934baa18a713c6e5cadc984e108009ccbe3 SHA512 2f71da7dafb5edc1fd94b70b55e5b369dcac4742ae0bc0783c6b56608d5abc099016fd83c159fc1ad16e46056f73f712eab577ebbf9c0a956945bbf8d6ffe08c
 EBUILD nokogumbo-2.0.3.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
 EBUILD nokogumbo-2.0.4.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
+EBUILD nokogumbo-2.0.5.ebuild 1307 BLAKE2B e08f59f7f2f385e6e4d73f53b9b7048bf17c47fcf70eac5898bbfc1b64e2a8f32a243ae9cab135c3a7876425a970ca2aabe1cdf12dddfcae395fe6809410bf05 SHA512 ec7719e1a0f4d4ff82e16e6e10c37574bcab4f741f9c3b6104966792a5f003ec67733e394b1f06abe8c5fd4417c6b10b96adb08acf0ca21c2794d5aa6307a8f7
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.5.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.5.ebuild
new file mode 100644
index 000000000000..5ddd1b3250cd
--- /dev/null
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogumbo/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/nokogumbo
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
+HOMEPAGE="https://github.com/rubys/nokogumbo"
+SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Contains a bundled and patched version of dev-libs/gumbo.
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
+
+all_ruby_prepare() {
+	# Define rakehome in scope
+	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
+
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Modern nokogiri doesn't have any ldflags part, rather than an empty one.
+	sed -i -e '/have_libxml2/ s/empty/nil/' ext/nokogumbo/extconf.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 180cf057a3a0..3bf6390db43e 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -2,4 +2,4 @@ DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef
 DIST oauth-0.5.5.tar.gz 60289 BLAKE2B 28a283bdb251b791ab6e0d50e6ed7db09445177bcaf5a99258c465e3783c5535f7d6acee356ec2f7559a942d1146ae8487260f8945f3138de670c20c60d7068c SHA512 9db8d68950b46b469777e320dea88e14506be846233f7c24e7dcdf9b57e761c43a7b715fa70f32a41b15ac7936a586e8b49a33af971fd0e9509d62827c69571f
 EBUILD oauth-0.5.4.ebuild 1054 BLAKE2B 0171f7c346a4aa6a1d71cfdad59223accde4e560d60d185c5e8accc78ab583395a88dcd94f26c0a937ad92d4fd3fc1222c01cd042740b91c99ec9eb6eb9e73b6 SHA512 cbf832f21e6676dfb2a0584bdc2d4e59e1594becb178babb9b4abf866fe348f20b86d9576584404b00f10fbe1943efb10acb80ea11070351700489c406ce94c4
 EBUILD oauth-0.5.5.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
-MISC metadata.xml 335 BLAKE2B 57f59b76960a57baa7a46f505fa812b1f3417ea7f026272eb513139014e245cf7f34c286a677b6b91e7bd293c28da283dca118e32f76338758bf4a2247c01a32 SHA512 a740b8de21545f432e6e1d4b72a588bd1332bca643f017d8cffa84ae76f6a3d4514e3734f24f80954b7691034411b46463581291ae405a1026b90d93d991cb96
+MISC metadata.xml 335 BLAKE2B 47e21b22542a232a341077c69c8c138cb7a9396c1316206553c56ac9492180686dc9131179748612c98c0d6f706e79c8de78a03aa2b2e33587966718eff9e704 SHA512 844bad15eb4d2808ea6d150256a969c97f11e93dcbe44b9c8bfadfbdc6215a949ce7d846dad2c41da79fd82d91b3ee97769dcb0a571e3e88cfc9072af2537205
diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index f20a3a8fdaf9..a788ed469d0b 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 08efb5e6f5f7..cdd52ea257dc 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,3 +1,5 @@
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
+DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
 EBUILD oauth2-1.4.4.ebuild 1436 BLAKE2B 44a59fa034c7072572c3cee2c7ea8ec607f65dc9aca250b056c21d69b2ecd843367d9035086d098192d8f2757e1669025c4514e945c77e66c2591283cce2c2d9 SHA512 e71b59e6f05600f133258aa212f4dcd1a55e9099f156dddddc1d39406e34c512d137f5da00c10f4ba676bf6ced4951f08cd2c7239aee6239e5a72abbc8089535
+EBUILD oauth2-1.4.7.ebuild 1485 BLAKE2B 80e0f69730cccb197b36fefe63a134fd8b8ebc0410ba90a90caf2fead878b453387873feaae4417274b8c42111ff82aa22c495235cfacfac7351ac40f5c65ca6 SHA512 1f0cd51dbc5ecff49624226a52b4c5db605bccfc2a357c70711cc88d7d4e9273df33706b6e410bb979e83fedb1f504c99b96a2a2e0a14bd86ded2943d7c329a5
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.7.ebuild b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
new file mode 100644
index 000000000000..08c977da7165
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://github.com/intridea/oauth2"
+SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
+	dev-ruby/jwt:2
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "test? (
+	>=dev-ruby/addressable-2.3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-stubbed_env
+)"
+
+all_ruby_prepare() {
+	sed -e '/simplecov/,/^  end/ s:^:#:' \
+		-e '/silent/I s:^:#:' \
+		-e '1irequire "uri"' \
+		-e '/require.*oauth2/arequire "oauth2/version"' \
+		-i spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Avoid spec that is too fragile in relation to ENV
+	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 6521c1657b13..884e4b61162c 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,11 +1,9 @@
-DIST ox-2.13.4.tar.gz 207814 BLAKE2B 8a94569e6e10b92574fa330d60aacc069a558003c7b285cb1178dfe0e6cfe02a2590283249f7a1b5adc89b41c3414b1a919367889b0296cf909eeafd88cc8a27 SHA512 a97fef40eee3616bab32394340c452138fe1cf5cec92e6457c3b2ce8866f7e5b143ee7e0191af09d96128a2d7a0ee3eb58fbcea16074ce33db8a845867175423
-DIST ox-2.14.0.tar.gz 208213 BLAKE2B a5f99c8878efb9f87d8061d57ffb0afe26329b7e987c4de8c084a3453e35404fdfe29805d9a4cf60f3e30c39f47de5721a9d5c52b87660066ee484a30ef0837c SHA512 51bafbef13b1d3e0a5f27f69f9ca21b5774cb32f4b0d55e12ec5b94b1dad3febdfda37b43b84f599d7874f5ed28fa85d094a6f9c0087ca1d9b5d77b969c7de88
 DIST ox-2.14.1.tar.gz 208294 BLAKE2B 588d9171de5db1cec6e24ea64a604ab85074ebb59be0d53afc040c9a47c64e2168abdd86271da8d1dad05803c98a64f8d12ea19297638a2f2a54a52c1c3f4342 SHA512 c82e9ec18a4003ab1e76f03b024b345b77a83a72f9f01d0dea1d9fdbf7c948638269e8331c19715b6b8bd999c2a104cf3660ff1f95cb445f13956ca0f95b723c
 DIST ox-2.14.2.tar.gz 209260 BLAKE2B b1893aca7f49d98b402f071feedf8b7d903692654620a9cab37024b9bc2f8e710c46862b8155113ad3618fcb24b1baf55d69c8c9aeec1528b477afc6d1ac2d1d SHA512 f7e34a702d7be5001f09bd919108e0da30183f4c4bbc6c8b533fc3d4892770300c76075af28d21227cf840e43ec868c7f623028a329d0e49997bd1bfeffb35af
 DIST ox-2.14.3.tar.gz 209300 BLAKE2B 3101d41491b11262e012bfd807396af12c4bb05d626432bdf4e539d90f3ffcf17c09a42c883d64e21e7f02431ca49acb00d0808593b822afc499fa4fe99935b7 SHA512 a6b9ef9b6f3fe7c73ccd1c69cecf9187c586ffeb22eb3aebb542cc22231ab929b1c76c81d3ea065c073e732d4cd12d74c7bc35f3b406b8bb1ca20edb1f5050e9
-EBUILD ox-2.13.4.ebuild 707 BLAKE2B 1852a031319f51213ada103be5f623496d42bf59af37148be1bcb8f8a8cbc3a31f15a03eec4c94a970e52008f02316becbdcd4fafadaecf9ca9b243f84c9c188 SHA512 80f3d533f0375bbe3847036881365440dcbf7179d2c0a1b892ada22b78720bca1879ecad24695afdc61992c70138fc58094f1f7222b0a10228ddada44a6d4e99
-EBUILD ox-2.14.0.ebuild 708 BLAKE2B b73770ef9835c297afabc649ccd4472a29ff182209a5f9336fbd029c9246dbfdc450d9ce777a1bf5c208b142b19bf20c22df7e3e7d270075f215f0fb07eff3ef SHA512 7bb13132c4b87e254ba69d2e56037aadc14817839690f27d6d834f5e88019d1f2001e363b105b736b84b290d8bd12d329b1be72a877d0929fda9b1cbfa53bce5
+DIST ox-2.14.4.tar.gz 209459 BLAKE2B e5e029ac5050cd44d0b80c313afb7415495203562bd08b34d4028310e853654b287920531f59f11c149715145e5aa44d3a9b1b2c8eb1c13a1095dc78a5fab95a SHA512 885aee65ae4a833dc9fc1847201f1d922e0d615831674abaa2d8169a22913202e49d677ce792bfe2d71cc9990d5a7652684f0d55606daf5f4a538d24078b4496
 EBUILD ox-2.14.1.ebuild 714 BLAKE2B bced0d68b0e355f590b3b972287b31af82d0e810b1864079d2e7444d9199cf7fc3dcc5c78bc18e8d396390dd0b290089a3ce876b98f787e12f79ecddb07a9c2a SHA512 42764a17622d54d7cbf74553ec7253712a857ea4788dce7e6735349db03896eca324ada0dafa4f29edd62a515fbcdf7bb867729ea75087d36838569b3593e080
 EBUILD ox-2.14.2.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 EBUILD ox-2.14.3.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
+EBUILD ox-2.14.4.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.13.4.ebuild b/dev-ruby/ox/ox-2.13.4.ebuild
deleted file mode 100644
index dd9b6593b596..000000000000
--- a/dev-ruby/ox/ox-2.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.0.ebuild b/dev-ruby/ox/ox-2.14.0.ebuild
deleted file mode 100644
index ca6de7a13bb8..000000000000
--- a/dev-ruby/ox/ox-2.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.4.ebuild b/dev-ruby/ox/ox-2.14.4.ebuild
new file mode 100644
index 000000000000..43ef944b9a38
--- /dev/null
+++ b/dev-ruby/ox/ox-2.14.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index 6772d114870b..1478d295bec8 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,5 +1,5 @@
 DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
 DIST paramesan-1.0.1.tgz 4981 BLAKE2B 3447281084a1d79d46f2a8b80c9b6d2ee63d9ef245e07ef07799a2ab2c730a1f99075bfb5c632c409fe412e277cfe354c8e59e99ffd38c2f1d671b7db3ace34a SHA512 6353006a26e8a7d4790d8bee88e4968df6d79ebca1f0855262eee1679789dfe1404fc345f6965377d5eadf03b88b9b8e1764a84065dde312d29fc0bae323b8a0
 EBUILD paramesan-0.1.1.ebuild 694 BLAKE2B 5fef784f26fb8f0d9393e34ab78f10fa350ab68584efb71940509af9b7700e2e6e3f9ea1ad8e43908421a7f905ec438d08477e2c7928eb3966f37db385bf781f SHA512 92df728806b398d36fc3228dc3efc98211a718474f56459e64fb4c610d3759b18da835493e299bb8ae20e7b425c20d803079298eeded6bf95fc832f3ea13ba2b
-EBUILD paramesan-1.0.1.ebuild 675 BLAKE2B 7a0bc6d1c5980049e719a41360f8e43ab5fcd087bc96e746b9df8c2ca697d6ac7683cc4ec10204da2089856d9bd2c597348291247a8a04c2a6a0d428e620a635 SHA512 aae4948cc746d863a56e471b28db0625b7035653aba792f13545e0b203fe452ff1d4037a93728dccea3e5ee85e823eb03afb2524d191a94cb9104e3afc927531
+EBUILD paramesan-1.0.1.ebuild 674 BLAKE2B a2fb0e409fd5b26f49177ef7bf07de3c4d65c6f9333afdfbb3963f7eaddc66b185309099e8dfaf5a0aba250ac042b12e1c966721a814bd08f6c52dbdc65f6fd3 SHA512 441ddb428ce9cc4f88b42bdc4bc6e1b94d3bbd825f47fc2764d3f73de09f281e5065ad87002e9f89b823ece6be2d97226eb64053b772179ce3970f7586ab153a
 MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/paramesan/paramesan-1.0.1.ebuild b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
index 70970ed52494..f0490b557b7e 100644
--- a/dev-ruby/paramesan/paramesan-1.0.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index a895c9d3e3ab..9a92b6b4530d 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -2,4 +2,4 @@ DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b20
 DIST pastel-0.8.0.tar.gz 49560 BLAKE2B 646cdf5f7cd1e62e83d87cdcdbbdc2cb2619fd570b4715191825344346053b7bf8f8f18b177a8bad6416c13858ab007d94ccf5c16b71c123e4a3d2fd03cd0720 SHA512 8066b372f08e1d6312b87744309692e3e6fd5e2737374bce53087af45141ea4f14e67ead6dccb11df70f73cbb0611ab9e20f7fb553d87a349996bda0f7a3862d
 EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
 EBUILD pastel-0.8.0.ebuild 704 BLAKE2B 206c3722e5b4c8d894fd8a89378cc15fc74b27c055050c784645b0233561f5467b98fd56ee4667a58ed4a37c80b30405db3a4ff49d66bbd7ccb6a8b923eb9507 SHA512 74c35d4b772c263cd04a2553e6d839a6ea21009cdc89e96f14815874f6baf694bbefadb765f90383806ccd466e3f8d45b099d31ea850a91e9e87fdfc240b69f3
-MISC metadata.xml 334 BLAKE2B ddfa0b28da63b435e81befc3fbf736344f8e83ba56041757fa1ab0883a73bdb0d4f4d5497b2e7a6d7b215d39ad73195fcc65105bf5baa6e4ed2081a41fdcfac8 SHA512 4432b29f441206ba0d37d7be93b3da6b06146df6d539a07aadba423fdd43f2ac765259c0179123e1421935d6b69561a0a92f2b5b5eb634f359d0ace7cf803080
+MISC metadata.xml 334 BLAKE2B 2998a15f4351a2089d4e0cfe14c2b29826aa0028924409cf2ab674ff7ca27568cca16b6071907dcc9f31cf284d1356677a9634bf943771518840906379b6a7a8 SHA512 a0f32d3a71a2969b1bfe46736321ae60a4dcf7fe304c3729f56fa7ea56c159d9bfd05563a2549335ef96308fa740c7c1469d1c1fef444fb080a407204be5e527
diff --git a/dev-ruby/pastel/metadata.xml b/dev-ruby/pastel/metadata.xml
index 5cb98c9c1082..50c2556745ea 100644
--- a/dev-ruby/pastel/metadata.xml
+++ b/dev-ruby/pastel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index 43ef38127f8f..810c43a8b6f6 100644
--- a/dev-ruby/path_expander/Manifest
+++ b/dev-ruby/path_expander/Manifest
@@ -1,3 +1,3 @@
 DIST path_expander-1.1.0.gem 13312 BLAKE2B dca42a0e995d7ef87cef3dd26251ce378df33db557c5089b58f1130ed4c61b5521012198e381853c3583601d990aeff3a8463393e89e891b2ca9c923831ba31d SHA512 eebcd1caafba5c40512cc0c6e3419137fc169215d2eac77914419d9f3a6e200350d742b13953b2dbbdd532c9ef73e950c920017a4f178941c1e04ee832e038f7
 EBUILD path_expander-1.1.0.ebuild 718 BLAKE2B 03ea73d8486924a113f6363e0645e8f329d82af7b510400842d6552afa28faaecca2a09139c1f52b81269e64fe0cdfae91278a78267754474f83a9aa6ecc782b SHA512 78b32569fb576be12c7ba35b36edda61090e30546f9892dca42c3647ae5f06767c89f073545d21b714d5b9c6790a48571b9be8c55db1f7d749e101cd49f87e2c
-MISC metadata.xml 339 BLAKE2B 46f1672ac66227d580c5f13621d10aa58b2a17373eb108a190e64203ca4dfaa92aee5dff0c71551a52af7cb58a77336f34328581fdcb75e68ecf7698071d1100 SHA512 9defdaf2e5b30460816c7e929aabc8421c4afeba6ca56a60001bff5047052a2a7f7928a683707b26582facb2886f05a4ecb56e5036fbfc4f75d4d3353fefb8a5
+MISC metadata.xml 339 BLAKE2B 0503afefba8259d6bb24509f978237f90c06779a981c8d24aa86c03b817544f4f73745c8f97f999c2d8eb44e4a2a2d0caa99ddb944dcede89dc66218ae90ca4e SHA512 0e83915194d87e06cd7a0b26cc1543b966fb1b7e7c4d877523477ed0dcff9b9534c931e604b98fffe82298da6ee51c2f70a4d8834694ca19bde82eb6c63845c0
diff --git a/dev-ruby/path_expander/metadata.xml b/dev-ruby/path_expander/metadata.xml
index fa8d63e31a9d..2763838764ad 100644
--- a/dev-ruby/path_expander/metadata.xml
+++ b/dev-ruby/path_expander/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/pathutil/Manifest b/dev-ruby/pathutil/Manifest
index 5ac6a0af16af..91324829f66a 100644
--- a/dev-ruby/pathutil/Manifest
+++ b/dev-ruby/pathutil/Manifest
@@ -1,3 +1,3 @@
 DIST pathutil-0.16.2.tar.gz 26079 BLAKE2B 5a9d1dac1f1171ee6bc447725c04883cb56a9071927f3e0fdbcb9754345ac77a6609533a1308a411cb22658caeb2a4bed49225923af109bca288cfb3aeb3d669 SHA512 d06daf365b94dacd33966f3928a53f0f00d2fca7b9f6348a7efd2b55ab5ba937459e5bd78fde241f30749a1ae55e4ae3ba1ed8945b5333464e7d3ce9666cd054
 EBUILD pathutil-0.16.2.ebuild 1084 BLAKE2B a16bc82dee4da29e569c7cbcd42767ddae2c725fc55994349b171c5a6f950d4590f7d51bdaf86fe583021fa859bd5e292be4edacfeb5b7850db968b241c17475 SHA512 042d823153f28c10af50c0d3b5e5445ac213028b5cb0762a9064aecb537d6ba5ea030ac2211e8a7257f56fd6adbccc5e76c4319f8ec2b2d1e6fcb41b0e06e5c5
-MISC metadata.xml 397 BLAKE2B 5d92c61c8d5bd93ada1cfb8cf312518568a379c6fec784480adfe804458b6de4b05d22886dcc4df14dc4ceb196cac22d485b8748533c94179c82c26fb71ef1df SHA512 ad03cd42ae59368a0642c46f3ae06ddbb14e003ebaeb79e0a93ff9212ba9fc16bcfb20e90f9f5be49cd8e79a80355bcccbfbbdc44845df0d9b678a2c4a20debe
+MISC metadata.xml 397 BLAKE2B ee72c54cd19c1679740cc5925b6843693181380b2cfcee75e71349dbcf867c7cb8ab3141d80d8425c0321624d9874caa3995fc812e6156d0d090c4c5e5a54181 SHA512 570bae7420a80bc841f5c98272e414887fc5d8833ad27eff4807f0a48f75f0fe326ffe852f77669e0e427c2bd49c56e73ec96ea99576d8fdab48ddd570d5f55a
diff --git a/dev-ruby/pathutil/metadata.xml b/dev-ruby/pathutil/metadata.xml
index 051f5bee9269..7d79845fb778 100644
--- a/dev-ruby/pathutil/metadata.xml
+++ b/dev-ruby/pathutil/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index 792268b69e39..3c93550be486 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -2,4 +2,4 @@ DIST plist-3.5.0.tar.gz 36650 BLAKE2B 8f93f8ef2fdedd9da50c4bdf9c473d3b199cd82890
 DIST plist-3.6.0.tar.gz 37311 BLAKE2B dd9bd1a7cf62974fb4b51744ab826ab65e6e02030073ec3b60b3d420982b65ceb3b1c1bb50e0f38fb68e25c366b17e7885cf5053418338ea05c324afad2df5b7 SHA512 d5991d944d8f02cacecdbdf9834379f34fd915eb3cf252aa1923e8d49a3b17c72ae07fbd53f1cfe9d0c14147729f4736838e4cea3fc286a90280bcc3de4b7fd1
 EBUILD plist-3.5.0.ebuild 777 BLAKE2B 1c7c3ada11258d96905ea5d8d31e842bbb01441423f156042e882eaeae08f09c8ea776b56bebe908ac71fdaa7bd18e025194f16f0ed92e19a2988660c442c4c6 SHA512 75634873f83b47bb9c63e8fbc0aeadb6df0a0020a686c690765c60ac68513f4c6c38c740a25c13153c34e486d18d33349dcf3f9ba654dc5f9efa3f9f72bbf099
 EBUILD plist-3.6.0.ebuild 746 BLAKE2B c0204067aece20845f245239e90bbba318c3452b66dcde88828fff9b03e846f869f846d5e5eb34392b381c5b8706e725b9844c6714912fad9265ea57f75fa5c2 SHA512 f296f72409811833eec558c609202cf4762fefed79315b0ae24765c2fcfe05579d9fa9b7d21915d003804faac789f9ac051888147e89de7a692b8fd566dd2c40
-MISC metadata.xml 330 BLAKE2B 0be0bc0db0a0b4ac8ce4b11ef9c0b67b13238e4336280a2bdeee8317f58e4a97a78fa63b75cf1aa01b00d0c69bf3b53950f68c22a04dcac35b63097041ccdb7a SHA512 9b26476dd91dbe33c4ceeac8a49208718f177262c94d272b8c79cb49806892d21a815cfd379ce38182d00c9e542df2ca1131d6bec4523d694f5582a80c52d337
+MISC metadata.xml 330 BLAKE2B 84b303ed2f0568b8a5a6b28ce91b5a17223472b4cce2cced02b2df1ce76494fe0716d88c245c0acf39db71b06e09807797e941ab183fe94ce1788b44002b0c8a SHA512 7c2ad31bcb86476c1d390e8046f6b814ca3ac7bc5d4c86072af89128a0182c69c333c58fa9ade3c64cded1c0f3ebd6b19f97ede914cb5d3bf1377f9b7b39098e
diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index d2a2918c128c..fbbf5389a54b 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 9c248b5db320..4506cc38a2e3 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -3,5 +3,5 @@ DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 EBUILD public_suffix-3.1.1.ebuild 820 BLAKE2B 70dd9a387b0a5d5882d0615c3d11f5dee05a2732bc7cb6150a2532a64b08973f8d19574e772a81102dc810843b1c3d490c1cc32f5b20e2b28aa55c144a8828ca SHA512 6cc6b9562322dbec04c08d788ff8ad341997b84691d9e81d1c40916dcc6eb22667aa3587ddf6d53c7222864633c328900c57fe0d775cb6c7b238c000115fa7ef
 EBUILD public_suffix-4.0.5.ebuild 809 BLAKE2B eee66cbd7b89bbc1157e54a6a4531f3df7cd0bead94108f1d2d6c610aabd739f7765de946887100ea883840bd20f0b2d328fad52492e907c324ebab71b38ebe7 SHA512 ecb60e099f6b8e279c05722ea72ad01b88decacc45e01c8a0c0ba58541daafafc4d3f6f385adf4cfd642a45e9759a00e625d2c5a127b07ed658476ca09b5904d
-EBUILD public_suffix-4.0.6.ebuild 806 BLAKE2B e95f551a3864db64e27039eb0e018b9006c41aced2fae0ff3d6c59f3d3ca4a9f1a76a00816f3e0114071e6542ae97c7673c7e70d7a213e7a28566378c24d2e91 SHA512 4f5209a328eb96de9865d7ec23f0b4a7c8f5ca0d21ca2eefd54760d60b5ffa8644473473d53ceff327dedde23d073ea3798ceddaefc8e5df02db7d21a9418476
+EBUILD public_suffix-4.0.6.ebuild 813 BLAKE2B b653d235fbdd79655d11303a16a9d6934d01af4b3525dee71590f1b80d99b2b2461561489285041b83a8de949d70a6e2139e9f4e9bd745cd00fe51bd4ab90a3a SHA512 a81452443f2c97481f4a710f2a29a7c5fa4db806094fa86ef64e2e9841841d5d97c27456ddc3cdd283e0573c6e3e3e903fe886d8ccbc50a4261280a8bb490dd4
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
index 6cb5a2a8d933..bf2c80a873f0 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 79145a0949f3..ff356d6ffa4c 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,3 +1,3 @@
 DIST pundit-2.1.0.gem 25600 BLAKE2B f8284e326a68475fe4c733de85597ba91e376d37e5dd24d97c1a8da2ab7f15d2cf35cf76688370f1a96c00f8ce89df2d2bb6b3c6de1ae33d6cdfe1ffd1926e3f SHA512 3201cb3acca8301a0e07fa9bd58617ee32074842e873a85a31d9b56fac5bd93c4a78d94d8b57556a011f1713712eb484ef3281d68ae3acf1c8bf1bce13f47e0c
 EBUILD pundit-2.1.0.ebuild 615 BLAKE2B 7ec237b656df019d8d2265381a63f546331fcc5edf38744ac888f8b2c39cc54145f56396c35c8aa10aca7d5c57ac73b975a36420a1a14d91422522df73385ff9 SHA512 83ae21c8d5c5704cbf8020947d718eeb97686e4b970dd497a4797131be183a4714be773856cd2b9fd541b306039f1f0016d24f6a27ecbc4e2636a80dee651cdf
-MISC metadata.xml 376 BLAKE2B 2cd1d4cac40c14c7228ed06fba336f89c6b3e5f5111cc59187ecf3a050a08cd0e77c9b1c5d805374deebcad84f835e52f052dd751481e17c84b59d6dbdac08b2 SHA512 3f0ec90029dbed0d31321b37f959b6a099e73d4d0604bddd2a1fdcf4509a36252cbf0b591aaef793392dad4125440cfdbe807a213200075310223c44c485ec9b
+MISC metadata.xml 376 BLAKE2B 6fcba35650415c087ede8be2d5a3b8f746fde5f576e5d2e4d85fb672f7e9ddb5b78f11c204b40149ebcf913d6917ae44da7d1b83b6c637b28c555506cbcf0f3f SHA512 52ef663c82cca3a019995cf51e13dc2bcc68d424cfc2a29e75047fc0612cd247362dcada6b2fa80a13007ee87b7c990432bb03b2b80fb81f1bc3f98289b9f58d
diff --git a/dev-ruby/pundit/metadata.xml b/dev-ruby/pundit/metadata.xml
index fd876cbc8d90..18ebc424e331 100644
--- a/dev-ruby/pundit/metadata.xml
+++ b/dev-ruby/pundit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index da6673278958..4065ec4ac5c5 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,7 @@
 DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
 DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
+DIST puppetdb-termini_7.2.0-1stretch_all.deb 21158 BLAKE2B bb74c11735a557bbee8452f4eb356c1ca038f8cf41bf1b5404f6f204d1d89e8bb532b8a6db8a92ebba9045e744a8a0b68629d60ab295660381a582273a0a67f3 SHA512 6dd4ee1e3d2fd069d5689cbaf0faeb417e5c12bd6d06c721923cbe92b739fa39a658675b40f0474010b3c6a6cabbff8a3fa49f8f79cbcc7bd4fbb1c68b1805f6
 EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 EBUILD puppetdb-termini-7.0.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
+EBUILD puppetdb-termini-7.2.0.ebuild 665 BLAKE2B 493069cdb3bb7b80150656a5e4791b8c8e5906a5b3b3470efb8196903e404caef5d9319fd1018939a86ad4a4156434a0b52c9b931a424ccfbb5c1008b5222e50 SHA512 281d8569336911f65b13b2d16730d2dc17c8476723746d249919add79f103c45185dabd9f98165d0ce7780e218265791584da14703e69eadc65a660cb9d526db
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
new file mode 100644
index 000000000000..57a8294eabe9
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index d22b9cb9db2a..bd928ce9898e 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
 EBUILD rake-compiler-1.1.0.ebuild 1464 BLAKE2B 9e21460bbc0bb3ab6513f6cfb8658ed89ee9acf56be05978b5b8d86fcbaec82690d7a9b2ad1a7c47bbb4a7000cbf699a0fa072cb929016c675d260abbb9e9169 SHA512 4cee0780659d23af7a1dd8aa96003dc7ca1bfd675d7257b9ac894c796a75737dab6f47cafa98b7e49440136674540171c491b4d3f8967f4217a0f62a82368260
-EBUILD rake-compiler-1.1.1.ebuild 1447 BLAKE2B c6fc8bf4cb6e9141e40fe83765b4908a78dd9f45dcafc71091ef4ba795434f2e4f5ea01b25383190c8f7e3775301df6f5b0b6fcf7186150b46e249cfa5cc5038 SHA512 d42a12e1eab23babbf2a9d9546489ce8ccc8ffad97fb6a9bf17c4d5e7bda05349581c7c0ad9665a1cac0e355f067f554b75ca46f0e496bc6c8cbc395f285d23c
+EBUILD rake-compiler-1.1.1.ebuild 1462 BLAKE2B f967963b9d4e059aaaa0ec2b08a5da3e44808ecbdc5d966ef2d39c5db9260b7656b1032884a5f93696b0d7e6f6363b61cfbde38986174ff644a738c5850acdd0 SHA512 16a0ba09140ba98e51953445c9cc686a829b6c7045a2f8f0844721eb0da6a999a07c6fd7fab76312d3b7f65077c1feea4807907ff5e702449958a66b7b930ea0
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
index 9fe226e1b917..341b4b51d966 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
 
 RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
 HOMEPAGE="https://github.com/luislavena/rake-compiler"
@@ -27,7 +27,7 @@ ruby_add_rdepend "dev-ruby/rake"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
-USE_RUBY="ruby25 ruby26" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
+USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
 
 all_ruby_prepare() {
 	# Make sure the right rspec version is used in cucumber.
@@ -40,7 +40,7 @@ all_ruby_prepare() {
 each_ruby_test() {
 	# Skip cucumber for new ruby versions (not ready yet)
 	case ${RUBY} in
-		*ruby25|*ruby26)
+		*ruby25|*ruby26|*ruby27)
 			RSPEC_VERSION=3 ruby-ng_rspec
 			ruby-ng_cucumber
 			;;
diff --git a/dev-ruby/rake-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index 360d47618c71..5fc783d70371 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -2,4 +2,4 @@ DIST rake-remote_task-2.4.3.gem 18944 BLAKE2B 65105ded7e7c98f13c33376887220fae84
 DIST rake-remote_task-2.4.4.gem 18944 BLAKE2B 3157d38346cbefe1ac522fe3d33638e65c44f58bb35ca822e5e7eab5988abbe0ed788ee22ac6f7ec2b104c72145bbd4d259effab7c2d6584f688d1b5055aaf2b SHA512 885cda1754c2f8e4a4f2ab4d688bdaf3f06924f8d5e491b9cbd61af39373a95884d2cdd78b0f964e69941f56bf0a1dac0a586cd3c7fb729fcb96ecd37715ccd8
 EBUILD rake-remote_task-2.4.3-r1.ebuild 672 BLAKE2B 2481ca698b7128261380bb639bb5305459e2cb5ae7dd3d177b4d9e9771cc1add933d7b4529730eed48fbe1cc3b095bce4aa3c8100263e2bdb93bab935311b916 SHA512 c7de14e66f2dfa21fecdd0b536695219de8a880d2abfc59986dd1543b4b16e273283a2bbbf5a9f8e576a3f9355dd82ed52adc0444940bb4096a2e46492521460
 EBUILD rake-remote_task-2.4.4.ebuild 665 BLAKE2B 08f4b03df26260dfcab313f3f88ac049569a66cf5b55f5d5c4069e1452cc6eaea5b7e853f0050ef03b88ed9078b70206232c5feca61a23e1d2a2963673ef5b9f SHA512 984a6fb7bb6b8164af703b51b89d831283863eecd3cb47948590bc56860414a61f2c50ea0c9f1a0fe261745e8bd9af8ca9a170666955bde4006ecc25e99e2e84
-MISC metadata.xml 342 BLAKE2B 04e0152e9fe68dfd8f53e6de853f9525cacca92c39ce67736e1c5416e6f0a1cd49b8f7e9596e86427e90f686414c0b779722e73c40032d7254d06aa0969472ca SHA512 78f689de3b96954e2e465b5e1d560dc6033e844fc20dddf37e03687155f731245de09221c1725cc20883dfc848368b9a4282c021341208b2eea6fd679cd8006d
+MISC metadata.xml 342 BLAKE2B 4f6b92bcc6baa146724b53d4c522b5969563ad7b46828a53dcfbbf42d9d46f8ca90d8360db0510fb415fae146405fd2bcac1ef2244b2ff1e11cb10b7afbffa78 SHA512 0779574f4a7166acd5b5228f0bbd4353a79e4ca77f2d9b3f79221df5cdef3390941b1546586d49234b12b28c834c652dbe5d05e63ec0eefaf232cf3748959b98
diff --git a/dev-ruby/rake-remote_task/metadata.xml b/dev-ruby/rake-remote_task/metadata.xml
index 7e666bcc80a2..b9bf7c93b730 100644
--- a/dev-ruby/rake-remote_task/metadata.xml
+++ b/dev-ruby/rake-remote_task/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index d5e99e93306f..348c38c38742 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,3 +1,3 @@
 DIST roadie-rails-2.1.1.tar.gz 56419 BLAKE2B 6a54797c77267a61ab63d72743fbd3f98d4137d917ddebf0335c30d03e5efb9e2907679237eea168384b54ea93bbe9be3aad4dcbf6364d411ebaa6e2ba7638fb SHA512 ceffe9746cded4f5dca83c614dc6ffb65203455775df9f56a402837018c0a322c7edad37ca05c72bc70fa8d19cfb4f9eba5b2fde1cbff7f8b28312e95140f353
 EBUILD roadie-rails-2.1.1.ebuild 1152 BLAKE2B 2f45b36d39da532391e21c071a8b163d34e5ef9b16f2a81a34bba365ce58e352ad29c07b25ea0defd2e7b1fa2a57e7d1d6496323aea58fa9fded841823d5b7fb SHA512 26bf371328d17e0966e57314a89662fb57783d5c8f42365a34adac82eea2db33faf1073a23095bfc50f8e107a592e2a86f94fa22ef08b1095d158c7d5b670077
-MISC metadata.xml 334 BLAKE2B a90c3828ffee06b0b840e728c96e4a554aaba24f0b292fb2cc835348900a852579eaf74da7b588f07d4ebb985a37a530ab94b6f78dceae2ceea7ea056a944506 SHA512 0ebe3d25378f2e38ecea332a47c249238a8884c69372579f2fbd4c2017e07932062832091271a473641675f0adbb71c6f9d4ff49694533f11b5d609264c360dd
+MISC metadata.xml 334 BLAKE2B 4b44fb970edc26812a3a9102cd954ef334972a7fb4b678587596a024eb6e0259362c729b9bb1b25fa766034763c3c59ce73467c1ce220c8ec6c22794654c32f8 SHA512 6c9a47d2bee60f737b43fdcbb2ce4f9eb9174053041e04b8affc63b0e62c52a0f8eebe3d69d0c66ab936810dcbf212a5664f39510723cfda0925cbf1391d0b7b
diff --git a/dev-ruby/roadie-rails/metadata.xml b/dev-ruby/roadie-rails/metadata.xml
index 2b1c09cb5aa3..4417a7207d3f 100644
--- a/dev-ruby/roadie-rails/metadata.xml
+++ b/dev-ruby/roadie-rails/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index 6fb8508b744e..e322948fedc0 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,3 +1,3 @@
 DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
 EBUILD roadie-4.0.0.ebuild 940 BLAKE2B 50b0bf2e700cbd1b3907b53cde851237158df1bf9c92c650ad2624039d81f2c95ec75b9da1a167941fec0f000f22f2fcfc4c5bd66bc54508eaea303108fb0d06 SHA512 dfd81ff22115c9db2297231c4d843937248bc0b7b1bfd0080542c2e46b292a0854a6460d91837859847f60a22949cb3d443d709efb4c4e186838895bf20e1d18
-MISC metadata.xml 328 BLAKE2B 1259d1fa19fc2a8d67f47d7ab4a409758d735839a384b75fb9807a1350e1dff6caa79e19063dd0955616b15a12f25040db50d2ffcfc4fdf038375032ba9b8a4e SHA512 56c3c637b8500939fa5b0c54fcb7382a666bd3d661baae8074dc1a11281aa149ed6911d19831ec62c311917bef30d10498c9c4323866cec6c0f9f267a5608ae2
+MISC metadata.xml 328 BLAKE2B 374eb5d062ad86d2f3025d8e2f5945a22a8ef184516b7ec1141b31cc02d13c03c7d59a75364c587e8b8988b0715a14634adef12ca8b4c567e6b60bb1d16b85d3 SHA512 7ca9a77eef77cdb879961d4eb114846d669cf7299ac8ed0649f4c2c357243fdccbe8e1e423b4eb2e880a451a22477768af58cd65c76f143e691e8202eca38031
diff --git a/dev-ruby/roadie/metadata.xml b/dev-ruby/roadie/metadata.xml
index 93485c021309..ef3a14fe43cb 100644
--- a/dev-ruby/roadie/metadata.xml
+++ b/dev-ruby/roadie/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 8fb7a2281fbd..df3463cb63d3 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,5 +1,7 @@
 DIST rqrcode-0.10.1.gem 27136 BLAKE2B 7fea719d6e76d340dd6db386994bffc5e7002afbc61e0b476dc639003757f5932598b81274a5ab74bc6dd25d10c61bc023668c8271e9387f7bcc02c6f4dc879b SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583
 DIST rqrcode-1.1.1.tar.gz 101325 BLAKE2B 0ba4a7cf50a45387ebf96e29e1bcc9042ac091582fa0859b95d85a5f112213cdde1f6df8f954219e22501a01729916cc8d4ab7a7ae6562cc770e63515a9a0d75 SHA512 b7d746780bc20c8b3fc59a74f00aab17b5d4a5db458c8f79a8e85146ec2d1b4bd16873792bf7970dede083afd0bc0c54ef4f5d58736b4c9847b644cbe470d0f2
+DIST rqrcode-1.2.0.tar.gz 101432 BLAKE2B 98e7c6d98436d759e5d08575ca98fa292320545e69b63a06422bdeff9a64f5514d0d74c85c7c10941d334ea6168c3b392ac68c8aee19f0c58b6f7d3c125e13b2 SHA512 8a434c72fc43f04dfc92cd7cb6e0423cae94aa24d83a1a6015a170136f1aa3b010b652546b349f15f18e48c85b06a7260ae4babf19907955e0d1b4c2207e6ebc
 EBUILD rqrcode-0.10.1.ebuild 615 BLAKE2B 4e71feca3a6be02c330e61f9672456f2548e88db45a69f0e0b6b2f68eb9e11f9653fa08c8e4e224c28cabda8f84f60a7a2b8ee7f951a0adeba000505551444d9 SHA512 0b7caee127e864598a538289f6494f331a3afb35dac683276b5bef03560dc13727f7d39213aede680630b2825a3e0d9692b8916b228b38528bd150ecdb66e3e9
 EBUILD rqrcode-1.1.1.ebuild 711 BLAKE2B cfb149a9fd78d28a279477a6ffe675299faabef2cea0ad78fc46c02f349f8b8c3f0b45506c7deecd4afad453f546837f3dd1aaec95587a6cfb6297ba3da17bf0 SHA512 9bae589bedec29e97ba05aa3f8ae03c4f3dbe337eab99e4c246366b1b7070ed25779880850ec404c30e73d0480f76d5312634ab3466ea12683542e0751199e5c
+EBUILD rqrcode-1.2.0.ebuild 704 BLAKE2B 3eefaed142a5157534474f6af0f9085fee04a6252fad6c8c9f7258f647043b8838ef9ba36cb8403e5e3d5c69c07ba1a879250b63bf80f4893751804f7eb9a8cb SHA512 e18f38705bbbc0b4d37e2a4d78a96ca1689c6fd613d26af3019c4ac150ed8d4560b0c47d1a0ab4765e54e639126df1a6fe77cc15af1d3b2b77494d322fb6f34a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
new file mode 100644
index 000000000000..291fc43e388a
--- /dev/null
+++ b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://whomwah.github.com/rqrcode/"
+SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/chunky_png:0
+	>=dev-ruby/rqrcode_core-0.2:0
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-its/Manifest b/dev-ruby/rspec-its/Manifest
index 96dbb41c4f54..b9d2c3740090 100644
--- a/dev-ruby/rspec-its/Manifest
+++ b/dev-ruby/rspec-its/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-its-1.2.0.gem 12800 BLAKE2B ac9cb1899c2c1c88ab61617bb4fb30fffba572623dede0c6bbecebb12f36d12d7e7aa94ebe584333228d63fe3332ea978a8b8b95489cc7530942d3ec33c12faa SHA512 6b390f92654f8e6482f0da30d4e721ee127f628eb305268e474d4c9fb14fca1d0fb8922cabc9a8c1372976b5a52349c5a5a774e3026f32d8050c5aea2bc9ccae
 DIST rspec-its-1.3.0.gem 14336 BLAKE2B 3dabe36bd329ee4bb9134958b1727aec2eb4e15140d3197917bebc69f7a65a7558efea8cd5fdbfa670688fdc4f5db3c6ab5fcf5bf1e5a0995668681442cf1dc0 SHA512 beff75fc84f9879095f02f4515bfd749dded877b8b4d5186423ddd78c6c16d6c5e810ebac80f3500cc7b1d23db119c72780c32888385d21d20672a26499ae94a
 EBUILD rspec-its-1.2.0-r1.ebuild 722 BLAKE2B 9484b8148bea3b439727af778101deb7c7666fdfa0cf17a3949d9b29e338c36744be83eb99e8476b9f3ac2c14b8f7fc7bd13bb647f6c1c519eac07fb49203914 SHA512 fea481678cfb1b79bdc7d30a194fe6bc0625e74cea63bc556d3aacd1f8f677625f15b6937628c2d7b0af2b6916352ff06cd6263180abd0f45de3e9a3d188700b
-EBUILD rspec-its-1.3.0.ebuild 580 BLAKE2B d395350d1e6e93c6e0a5ad50d9f55c7b2b91f0d95de437c560e95a10dec04a63b4089476d57a599301dc3eddac8c456021cfbcaa1285b0125cd6d026c0519944 SHA512 a1ea4ea9091845aefd05d148424027fd8d5296b4b0644fbcc6c43f7b7435beea4dee716e9b33e4a7afbc05970453a35ab015cc8fdd30225c114b929b4a3d81bb
+EBUILD rspec-its-1.3.0.ebuild 580 BLAKE2B 552d07077a1580ae4a736fb790818d9b18a05025f32afea1d81b42802d2b127f124205d7ceef938307965aef0c33eb7d27b2c70f924ee886a1d6c19514eed3af SHA512 ce0833b5b26cae4cee369093b3326095ef83d547c122e0a36ca1dbd237b6315184736242fb35d2557289500e997593afd247f8e90d8a5e0bc285ffdb6260a826
 MISC metadata.xml 341 BLAKE2B 2d94ba5cc1c27593199becf0754c35ed399d908b21a2165a2c40fef13e609d321484653a6b32b73778091f9be7734654534a8d2a2b4583e5df86f5713d0003e9 SHA512 5433a1938d9094ff13d5473895758e44814d6eb241c523fd21bc2ad9854c6eb4be2a88364b0dff3a6625eb85c4302d969f64e6b834aca8a354e57f0288a2a6b1
diff --git a/dev-ruby/rspec-its/rspec-its-1.3.0.ebuild b/dev-ruby/rspec-its/rspec-its-1.3.0.ebuild
index 7456f8acf85b..2eb4590ffedb 100644
--- a/dev-ruby/rspec-its/rspec-its-1.3.0.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 2882ec81736c..d7e9b2495761 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -2,8 +2,10 @@ DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2e
 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
 EBUILD rspec-rails-3.8.3.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
 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 1548 BLAKE2B f7d0e6151431a0305fc488e39a8ff5ffb09f1521eddc1ccb89fca49e3a701172facca638e36d961e97e0240fb7e00b599f1859b44288509f50f87f54091032c3 SHA512 ae240306e696068709cc13b21b0ffb83578f93bbaa072c996669f2f7e3a78a7bc81346780a6bcabe4d413de4ef95f591d984eb34b4f96840169d4d00b2fd20c9
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
new file mode 100644
index 000000000000..480dc9c27b92
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="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:6.0 dev-ruby/activesupport:5.2 )
+	|| ( dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
+	|| ( dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+	>=dev-ruby/rspec-3.10: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.5
+	~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
+
+	# Test with a compatible rails version
+	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index dd948688f908..d963e6aa5ee5 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-atk-3.3.2.ebuild 745 BLAKE2B 305ff6df6dc4edebebd436328e798bb0f189535ad20ebd38358d8a2d7d8853926663d536b2cebd8714da9e99673262176869601ddb806e611dd63c3b2446659e SHA512 594f8eab177111023f3dc3b5aa5db9995fd036a86c2f2d4a02b307950bdcbeeca638cce268bf28e672943568124271756ac8751f780b7b7b6d96ef5eaca37fe3
-EBUILD ruby-atk-3.3.6.ebuild 739 BLAKE2B 5cb8a40421a958d24f6cee62c5469723eacd672a1a11606c7fabe35f2c02ac03027cceb5636dafc70771c1ad77d35e0f1e5fbf0b6d2d5a8db30f9b3b6218f3f4 SHA512 8f8d57f9346ba9761edadcaf8637b81de31e2bd721696cff0bca9dcdcf48828f52207cbf84642a3525aa5baacd06dec43fc9d7ed003c556416b4d4116e3636b2
-EBUILD ruby-atk-3.3.7.ebuild 739 BLAKE2B 5cb8a40421a958d24f6cee62c5469723eacd672a1a11606c7fabe35f2c02ac03027cceb5636dafc70771c1ad77d35e0f1e5fbf0b6d2d5a8db30f9b3b6218f3f4 SHA512 8f8d57f9346ba9761edadcaf8637b81de31e2bd721696cff0bca9dcdcf48828f52207cbf84642a3525aa5baacd06dec43fc9d7ed003c556416b4d4116e3636b2
-EBUILD ruby-atk-3.4.3.ebuild 414 BLAKE2B de3181d389c97e443c57217901f246036b2f570012026abcf21666f557f2daf853c0ddcd2a5a2412733df6b7716f685402c4ec2c66c8394a56b50b4cad011c64 SHA512 fa5eb555aea536860519d57a4678823164b8708d10e1ee50fff9414eaff634353632097b60cae32648a7d8a49bccc61e53dcb553d06b67eb510106ecdba115d7
+EBUILD ruby-atk-3.4.3.ebuild 413 BLAKE2B ffbf281c6162be06e9312f3da3278cc3d1cbd695c2777425b11a299c443bfe2e1f982701da6c662dd060fe646c5aa6e72b100c4d16f05ca4db4cf35fd19b6844 SHA512 31f59105104485185cd2f74c042cffce0a2e33222b88591941586459273bc76b0a89bd326caf6d9c7e43a8982bf3290fc27090d32d84b81bacd0f238ed9a3667
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.3.2.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.3.2.ebuild
deleted file mode 100644
index c963c4dc53f6..000000000000
--- a/dev-ruby/ruby-atk/ruby-atk-3.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" dev-libs/atk"
-RDEPEND+=" dev-libs/atk"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild
deleted file mode 100644
index f666da65a3bb..000000000000
--- a/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" dev-libs/atk"
-RDEPEND+=" dev-libs/atk"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.3.7.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.3.7.ebuild
deleted file mode 100644
index f666da65a3bb..000000000000
--- a/dev-ruby/ruby-atk/ruby-atk-3.3.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" dev-libs/atk"
-RDEPEND+=" dev-libs/atk"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild
index 4b28777c0114..2d5a583a8880 100644
--- a/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild
+++ b/dev-ruby/ruby-atk/ruby-atk-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 DEPEND+=" dev-libs/atk[introspection]"
 RDEPEND+=" dev-libs/atk[introspection]"
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index bb9e1a7a05d6..1ed78f36c556 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-cairo-gobject-3.3.2.ebuild 948 BLAKE2B f2bff6e2005d7bf9a71d6df5fe4e10c31be92d45c36327dbd3c6652508657a005eb6aacabfa5033941d74055d7cf408889a94cba0b51ea7cd0b6fc5b1d82eeff SHA512 a85b4dde05965ed87310f07a9383186229d93e322735a9d2f652fab6f1f2811ac41426e1b4549ef403cdc83cc73014d9f7b505e2a9bb33b8418c9649776b3885
-EBUILD ruby-cairo-gobject-3.3.6.ebuild 935 BLAKE2B fc2c3813d3abc29a65342dcf389db07fa71696c03ef8d846ea249f69841f52aa3657b9ac12fcad84fce79e3c6f24637690970c2c19398798bad74b5facec2411 SHA512 19c4d1636b0dd7a7e111327e26711eaeb6f7310ce44b3bc07431b3bd1dbe557f2f36ce5458ba514408fe13868b386ccafe79a6adb7bc6c9f19ee8ad8b49e3403
-EBUILD ruby-cairo-gobject-3.3.7.ebuild 942 BLAKE2B 8ed867f41e7072a12547c7f7cc24157570e6275c7392de0125086992fdfa9dee17c7387b9579902da03c159e7e2c8de31df396508d4e24311d6c9e8283b19cfa SHA512 98a7aff2913588e40d5bf77dc2aa515e6ade11b7c2dc7b7b171dd80d9f7f832413e2581ed40c36b70c00ac4652273c0fe5bffc07c3fa0e14f088243673fc29d2
-EBUILD ruby-cairo-gobject-3.4.3.ebuild 372 BLAKE2B 202ba57005a647160cfe4e5b7aa32625836bc8ed44002b7bfe7f11206e0bef70f8225200832766ef855aa6855fc90ce54aef994924b67ac6cb79ac2c624942e9 SHA512 e5ced64f7d13e21e1254573350644e5246c17ac5c4441ecc62c25e981fc8660f0eed61744a62c9bf0817ab8dafafedd002dc0b39c179550095e0d9a0164f960a
+EBUILD ruby-cairo-gobject-3.4.3.ebuild 371 BLAKE2B 2d3f61052e1bd095d06c4d470af1d4d5ea7ba795456fa9325add3ed8ae98123c6041be9cec00683bebbf66ac575c920a194287e8ee84af7bc5d6672f04ace358 SHA512 61aae35fb3bfc8e565036f44a1f3e514cfeb1d44bf81a9545383e726275cd63ee9846a380d7dcfa35b9e64bca1746245f630fe48277bb3d835061e8f1b1fce44
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.2.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.2.ebuild
deleted file mode 100644
index 5f49d9846d26..000000000000
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
-
-DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/cairo"
-RDEPEND+=" x11-libs/cairo"
-
-ruby_add_rdepend "dev-ruby/rcairo
-	~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/cairo-gobject-test-utils.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild
deleted file mode 100644
index 00c40f1cc822..000000000000
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
-
-DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/cairo"
-RDEPEND+=" x11-libs/cairo"
-
-ruby_add_rdepend "dev-ruby/rcairo
-	~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/cairo-gobject-test-utils.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild
deleted file mode 100644
index 399581021118..000000000000
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
-
-DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/cairo"
-RDEPEND+=" x11-libs/cairo"
-
-ruby_add_rdepend "dev-ruby/rcairo
-	~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/cairo-gobject-test-utils.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild
index 44bd878f1bf3..51d5ceb29154 100644
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/cairo"
diff --git a/dev-ruby/ruby-clutter-gdk/Manifest b/dev-ruby/ruby-clutter-gdk/Manifest
index bd337defb3dd..ac557720127e 100644
--- a/dev-ruby/ruby-clutter-gdk/Manifest
+++ b/dev-ruby/ruby-clutter-gdk/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-clutter-gdk-3.3.2.ebuild 529 BLAKE2B 64f14bef9bf36216900e1195208e7f85ba84e3e55e57703fec0509dc189585ec50416e575ed4bd80b704fe0a090fd6b60bed6415df6bd33d3be8d4146581275f SHA512 f09edeae4bec7f0a86bce016ec4a5297c6c0728e358069a765d0a609a4928cc0d553f3fac3ac6fbdbee13084900b34241e13e5ab0899a48eeba4c014b55d8cb1
-EBUILD ruby-clutter-gdk-3.3.6.ebuild 523 BLAKE2B 73edf2bccb62aed21c1e37f60ca2f2b3c7c22cb540b65db3e5d3c2758dff84e9cd22cc5c9008f84d8b59daff2774021fd00b858550fc3304aa093ce72317f804 SHA512 df4dee8b2c8de0e1b64f5774121adede02572dcc266bae3212103263091818f27466a95dc3ccf56d7a887f0aa677550a73d78ddf65d8c59081375c3e7408f411
-EBUILD ruby-clutter-gdk-3.3.7.ebuild 523 BLAKE2B 73edf2bccb62aed21c1e37f60ca2f2b3c7c22cb540b65db3e5d3c2758dff84e9cd22cc5c9008f84d8b59daff2774021fd00b858550fc3304aa093ce72317f804 SHA512 df4dee8b2c8de0e1b64f5774121adede02572dcc266bae3212103263091818f27466a95dc3ccf56d7a887f0aa677550a73d78ddf65d8c59081375c3e7408f411
-EBUILD ruby-clutter-gdk-3.4.3.ebuild 432 BLAKE2B 304abb7ddff4462434c244a3f1a8a5614e43df8f34996beb8db87365da9d23c18638fc78d46dd749d68f103b95bfdd1cbc5a7785aa51e24c8c96e2f86aeeb20f SHA512 f0fad6caf7e4d17cbdac5edf68b651db2f63b6bfdf8e8ff7c2ede45ae93f5308c2d74e9139cd22217551fc6120888a9d96d0987be16107ac34bf0b6b63aeaab3
+EBUILD ruby-clutter-gdk-3.4.3.ebuild 431 BLAKE2B 4bee0727b5454f7e6c80eaadd90b14a467c3caad4e5fb98241f743fe7646e429982db97a5eddeee2aa732b1de79a55ac8dbf75ba465dbfcf537bb6ee5a3c0686 SHA512 ad8df7faab635bef1cb79560b9c5a761a413b6561ce852140afc1587774359907670d37cd26d5e075b0253ab8f0fa502ac0a336f8395a7baaf0107adbf040c95
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.2.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.2.ebuild
deleted file mode 100644
index 30398d06e4d7..000000000000
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
-
-RDEPEND+=" media-libs/clutter[gtk]"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gdk3-${PV}"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild
deleted file mode 100644
index 65defe8bb69f..000000000000
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
-
-RDEPEND+=" media-libs/clutter[gtk]"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gdk3-${PV}"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild
deleted file mode 100644
index 65defe8bb69f..000000000000
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
-
-RDEPEND+=" media-libs/clutter[gtk]"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gdk3-${PV}"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild
index 55121e0e0e3d..ac7d0d682627 100644
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild
+++ b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND+=" media-libs/clutter[gtk,introspection]"
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
index 21f9238d8b89..b91bb989e46b 100644
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ b/dev-ruby/ruby-clutter-gstreamer/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-clutter-gstreamer-3.3.2.ebuild 999 BLAKE2B 16ded0859a128043d44675108791a9c9c989b6c04f897140b6afe507a13cddd8f4244de1a7240a6d1989b8092e1d48e8d21f3fc88b3f3891aec3e2c9fa42deed SHA512 24e327df06e3bf85da727807233d025afb222103fd5d745c1b9cb5b2adf0dd8c24034ba91c818e502f9a26b9b6d0da0c8d1b90cd5d2ef75cec86eeb82f2cd4b9
-EBUILD ruby-clutter-gstreamer-3.3.6.ebuild 993 BLAKE2B 5de86f0ce069cd6b68f2317b65f992c82d0f4b687d3b2fce18f44a5326a9558c630af8e78decf205f03fe2078c60802d2f0fb25282c76adb975e0573a60eed20 SHA512 84745abaa28bedada347935699d1effebbbaa9d0880cfa753b7e4c1d393603d4499edbfe83313ac1353260f6553de258184977216eaf4476f880b83769eadf6d
-EBUILD ruby-clutter-gstreamer-3.3.7.ebuild 993 BLAKE2B 5de86f0ce069cd6b68f2317b65f992c82d0f4b687d3b2fce18f44a5326a9558c630af8e78decf205f03fe2078c60802d2f0fb25282c76adb975e0573a60eed20 SHA512 84745abaa28bedada347935699d1effebbbaa9d0880cfa753b7e4c1d393603d4499edbfe83313ac1353260f6553de258184977216eaf4476f880b83769eadf6d
-EBUILD ruby-clutter-gstreamer-3.4.3.ebuild 492 BLAKE2B ef519bd50a233755d35e24a6d693cdb20c56889210bcbc65fc3c0389e73c3ba5fd4168aacf670ff7cd72b7640895f6309c19ac23796b7c2909fd15ace6f57438 SHA512 43c6044f0013849c0ee811f1c2c2e79cd89a47d7da3d92f75374533316308cf267da9a2493ec7493e2b3051b354258256af88d8020cf0e50693c6e847851e81b
+EBUILD ruby-clutter-gstreamer-3.4.3.ebuild 491 BLAKE2B 924373f028388cc4ed816ad17f6978dc26b83c1400775202b3cc5a42221e873eefa77ca348da6f70256ba0f4340173d9bd3108b133a295c1c9ac7ceb9e654f36 SHA512 d79c679df873c63339769e45315a18914021ed366d9c2151a17d627c5e6c34e4d25d57b385fec0b47d90842c3cf549b01e2f201839e83c9062b74a3bc6e51206
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.2.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.2.ebuild
deleted file mode 100644
index 39b9e82d654b..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
-
-DEPEND+=" media-libs/clutter-gst"
-RDEPEND+=" media-libs/clutter-gst:*"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gstreamer-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild
deleted file mode 100644
index 548720d0ed75..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild
+++ /dev/null
@@ -1,46 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
-
-DEPEND+=" media-libs/clutter-gst"
-RDEPEND+=" media-libs/clutter-gst:*"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gstreamer-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild
deleted file mode 100644
index 548720d0ed75..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild
+++ /dev/null
@@ -1,46 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
-
-DEPEND+=" media-libs/clutter-gst"
-RDEPEND+=" media-libs/clutter-gst:*"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gstreamer-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild
index 01f494d0f699..d0d391d82ce4 100644
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" media-libs/clutter-gst[introspection]"
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
index e9feeff2bd73..a6ca18655281 100644
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ b/dev-ruby/ruby-clutter-gtk/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-clutter-gtk-3.3.2.ebuild 1074 BLAKE2B 24168d0a96e6f590a2c270d2c59a4164c1f31b280642ad6d3133d781c799f1050cb5caf25f5713fbb640167c7626e4d0a6f433008f9c26ff4d410fb99624ad34 SHA512 0cb9150e4a1d4e368ec8551fa05b43218aec877ae2409d2e0ed327ea23dfefd514bfba6f2b50143cf83a24f368fe91ec78343193b1800efeecd705c78dc6ad17
-EBUILD ruby-clutter-gtk-3.3.6.ebuild 1068 BLAKE2B d168a51161874ccf9793680e9903b1770c557d7a139a5a4a8912af478d2727da4f5f2d3c63d7bd9ce93bea0c7bffa98959c09e46d4ec79911619f622554b2616 SHA512 8dfc230ed3677e63d0124bd7c29dbca48eba07d7f148ce4487d807212c85b2b3039d259a2eaeca9c1f797b1d08fdafed951b17796c60b160c97196c92730ed89
-EBUILD ruby-clutter-gtk-3.3.7.ebuild 1068 BLAKE2B d168a51161874ccf9793680e9903b1770c557d7a139a5a4a8912af478d2727da4f5f2d3c63d7bd9ce93bea0c7bffa98959c09e46d4ec79911619f622554b2616 SHA512 8dfc230ed3677e63d0124bd7c29dbca48eba07d7f148ce4487d807212c85b2b3039d259a2eaeca9c1f797b1d08fdafed951b17796c60b160c97196c92730ed89
-EBUILD ruby-clutter-gtk-3.4.3.ebuild 544 BLAKE2B cd7191a397265c43206a73dd0793a3e4beede54e05fcde49638aa1e6bf8c765a559ab64b6357489dbb516a6a103941af50bcd246d068c460cf262103cf6ece00 SHA512 4847edae682030ec4a40c251b26182e03891b503955971fc191c1250b17d84e6989bd1b72176bad5c42b450b40ea2a751610062f9b9a3fbe45a1c53d28534274
+EBUILD ruby-clutter-gtk-3.4.3.ebuild 543 BLAKE2B da9d3e4986de5994e309e86fb5d09bc709bb5c453b56e4d0cd6d3397db5c5a5c7c996a4a950838a0f63985a3fba5988219dd1e2345c11d241ec5b75b7c065500 SHA512 2fbd3444ed537985604d52ad582cebf906d866dcff3c3a7be448aa0538f4250cae75ed353a8715c9d1e5f530961518b0fbeb53a7add84dcab56cb8d91a1b8ad5
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.2.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.2.ebuild
deleted file mode 100644
index 9ee06e564ed4..000000000000
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter-GTK bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
-
-DEPEND+=" media-libs/clutter-gtk[gtk]"
-RDEPEND+=" media-libs/clutter-gtk[gtk]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild
deleted file mode 100644
index 79d96f812756..000000000000
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter-GTK bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
-
-DEPEND+=" media-libs/clutter-gtk[gtk]"
-RDEPEND+=" media-libs/clutter-gtk[gtk]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild
deleted file mode 100644
index 79d96f812756..000000000000
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter-GTK bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
-
-DEPEND+=" media-libs/clutter-gtk[gtk]"
-RDEPEND+=" media-libs/clutter-gtk[gtk]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../clutter/test/clutter-test-utils.rb \
-		test/clutter-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild
index 03c739e76003..370337ee090c 100644
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Clutter-GTK bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" media-libs/clutter-gtk[gtk,introspection]"
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index e95c2b25b337..7c01d7a71175 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-clutter-3.3.2.ebuild 1197 BLAKE2B af4ec5fd75204db7fdc09fe9395ba88cd13035a71c967dbe0d26f900d64ce2381f6a8a08207978d6c01a7e72d74e58a70d58c0a934aaa1ba0dd221c7d51fa918 SHA512 b33242e15f87c66bcb4c93ea50fbe279890920be5d63ba4a979a36af9cf2e1b356e6dccc6573249c0c75f7ce85036acb4a7b38fbf1dd81a69f90ef0196d9d12c
-EBUILD ruby-clutter-3.3.6.ebuild 1191 BLAKE2B b14b0a2d7625f16d8393761334f086ce79917654de7e0362732648d48f1808d926c66f9c97d054a95132c4aa3d0ee6a3b9d98905954755912e0fae967a275c6d SHA512 a5f953a92e22585abbb401c6510727b834927f45e5763df2e2f26e760ad4973698f6f0fc77c10fc223215195e319a6c0a62ab19219ad01f26ed5d71f7fbb3de6
-EBUILD ruby-clutter-3.3.7.ebuild 1191 BLAKE2B b14b0a2d7625f16d8393761334f086ce79917654de7e0362732648d48f1808d926c66f9c97d054a95132c4aa3d0ee6a3b9d98905954755912e0fae967a275c6d SHA512 a5f953a92e22585abbb401c6510727b834927f45e5763df2e2f26e760ad4973698f6f0fc77c10fc223215195e319a6c0a62ab19219ad01f26ed5d71f7fbb3de6
-EBUILD ruby-clutter-3.4.3.ebuild 667 BLAKE2B 7d077d89d3bfd1601766498af6c30fe4674a74909c9c6a49d08639706699c668b41e2770b579acaba017d19f6ca498d49a14c4cf2850b5febb6fb6dab888d348 SHA512 b952e7f5b6a913f84bd0de507c3d68311909f99794521f7a443bbacecd279085b103b09905cce3de47ec317152e95bae8373ed3b01638117a9d7ea55f20318a8
+EBUILD ruby-clutter-3.4.3.ebuild 666 BLAKE2B 3a2e333687823af14c0e710c4206002e6387a85d02e9b3639419d944001da427bbbf524669d000a7e097a65b82f323d2c4aa9ef879e5ae4125c742da882ef280 SHA512 8994c02603447335a912a7255721a79c6a1357b43a9529a9a07386f330ed9a6a474b0b29b6e214106fbc58a268287a853cea7708844091bb9264fa3bf33b10fd
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.3.2.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.3.2.ebuild
deleted file mode 100644
index 1281f1eebd25..000000000000
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter
-
-DEPEND+=" media-libs/clutter"
-RDEPEND+=" media-libs/clutter"
-
-ruby_add_bdepend "~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../cairo-gobject/test/cairo-gobject-test-utils.rb \
-		test/clutter-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild
deleted file mode 100644
index 8a04464e3922..000000000000
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter
-
-DEPEND+=" media-libs/clutter"
-RDEPEND+=" media-libs/clutter"
-
-ruby_add_bdepend "~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../cairo-gobject/test/cairo-gobject-test-utils.rb \
-		test/clutter-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild
deleted file mode 100644
index 8a04464e3922..000000000000
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RUBY_S=ruby-gnome2-all-${PV}/clutter
-
-DEPEND+=" media-libs/clutter"
-RDEPEND+=" media-libs/clutter"
-
-ruby_add_bdepend "~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		../cairo-gobject/test/cairo-gobject-test-utils.rb \
-		test/clutter-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild
index e386d2ebd2f2..8f814003e453 100644
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" media-libs/clutter[introspection]"
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index dc90a4afa552..344e4181e607 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,7 +1,3 @@
-DIST ruby-feedparser-0.9.4.tar.gz 2705393 BLAKE2B 22d95f817d7cd80c33da804e391dce877eb3947dc249eff82884e0ba747aae9d6949418311a7596f6639470e32ce81e1bcc180737e25ab1bbc910bbfeaabdcca SHA512 0fbecb83837996c1a9483d70275cf869a62dcb53bb42d3fc8d1c7992e37c7d2c8b3194a9d0372566c4907f8ffd893c1f6ee1b2e55fa2417c5f34b71496bfad9d
-DIST ruby-feedparser-0.9.6.tar.gz 2705372 BLAKE2B 4a169fb980a6fc23f2e1aeaaae6a74607d3aebfa0a779ee52d7621196e39363886a88e5fd77ce84abaf52d956881e02f8b4f776b0abcab234cd1a4d26b012b90 SHA512 a35748bd23e87138583aaf04ecb482712a3774e1f97c471f86d97e506edf33f63651d5fd64c680d5250c42277ff3f33248fa65d2fa53d0e468a51b0d745a7a33
 DIST ruby-feedparser-0.9.7.tar.gz 2705854 BLAKE2B d64d35696dd66890013643339817cf470e714fef4ecb5ad8c12a221fd949af53b6fa3668ec2ec16ac0a5fa76eb8dedf037530881ce2545356a4bf20dc7153b01 SHA512 6283e21448cebbfc0d07c01d24be48acadb852110c9e940983a22ce3c95592aea12a99dc4763aa267ba7386c935e2f58e52427b57171aa8fcaa332c6bb440fed
-EBUILD ruby-feedparser-0.9.4.ebuild 1009 BLAKE2B a7befe6834cf5072bac6cd8f77772e16ba37e67bc5f2aca58739c0a6268da355b18a2014318d1909ea012e5d016fc9faf880efbde9cacbc3c185648d4aa066b4 SHA512 cbb07ce35e08637a0a6bc88943089d67f3e3fe41a98b3c00e6fdc5c8a0bcddf1c0c19f7dbd3b80f5dc644f1a062535f2136cf2e3d257f05b21e32e4479a0f905
-EBUILD ruby-feedparser-0.9.6.ebuild 971 BLAKE2B 22e922f929c2bc715244131edd11d6be154b0a662cd8483c46502c89d174da86064a5949a877a051c8e2a67460b2662c4f7093cb1aa52651729c75414947fa86 SHA512 a448d0196fc7bd95722ec772bf90e481e74c5cb4abf5e71d1faec4f482936d0808811ffef52b49ae1180c2d7b7694e32f50f6007c34564e6d36ae5b33845d41f
 EBUILD ruby-feedparser-0.9.7.ebuild 971 BLAKE2B 22e922f929c2bc715244131edd11d6be154b0a662cd8483c46502c89d174da86064a5949a877a051c8e2a67460b2662c4f7093cb1aa52651729c75414947fa86 SHA512 a448d0196fc7bd95722ec772bf90e481e74c5cb4abf5e71d1faec4f482936d0808811ffef52b49ae1180c2d7b7694e32f50f6007c34564e6d36ae5b33845d41f
 MISC metadata.xml 351 BLAKE2B 8ed001732ed47da11d190f32cb521b9700142bbdf04e6b486e9889f8df32ae24d9783b70357e653c3df8743d423eee547b5f884f5487f3e789f01792a6fb8551 SHA512 ed6059fdfc72e3f63ade2a463de1202da05bfe1b1b59f30b947e3c8999bc610ebd3729468bfb5ebd0b016dfa99cfd0af410dea3a4f054968fa6f1f201eafcfb6
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.4.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.4.ebuild
deleted file mode 100644
index 2d3990eedd08..000000000000
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="feed2imap"
-
-DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
-HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/magic"
-
-ruby_add_bdepend "dev-ruby/magic
-	test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Extract gemspec source from Rakefile
-	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
-		-e 's/PKG_VERSION/"'${PV}'"/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
-}
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild
deleted file mode 100644
index bcaa2442bb43..000000000000
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="feed2imap"
-
-DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
-HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/magic"
-
-ruby_add_bdepend "dev-ruby/magic
-	test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Extract gemspec source from Rakefile
-	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
-		-e 's/PKG_VERSION/"'${PV}'"/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
-}
diff --git a/dev-ruby/ruby-gdk3/Manifest b/dev-ruby/ruby-gdk3/Manifest
index fab1d78f2bf3..b125c2bf6fe5 100644
--- a/dev-ruby/ruby-gdk3/Manifest
+++ b/dev-ruby/ruby-gdk3/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gdk3-3.3.2.ebuild 842 BLAKE2B 38a653f52b02b314018f24c3bada49e22a0672935203d1c6fbdfb2e1a626d1eb2dcf91b3f2b770ea0cdc2c72e66a60946261f2e20858ed4e50350db8171e2ecb SHA512 ca0719b8299a2f2c32e97f2878d0f94d5b78503d09cbac81175955707ef63398ecbe7a0556286fbe1532ad161dfa502aa4603c016345b03b2fa48587ec4b2b50
-EBUILD ruby-gdk3-3.3.6.ebuild 836 BLAKE2B 2b2ad27273f0a1cdd67a16be2a78549a0111b820036f5c04a0134663606aea04cdb6cb73f07d16341b4f0768d77939848e7fbfd21a9ff6783e8c4ad973300b93 SHA512 d20e658848635b4e44831ca9d9c4af03f55d4a915b5ad695776397cfe0352164d08e5d90e7d2dd321d6765fa894250edca80824ec427db33b4ff8903807c2047
-EBUILD ruby-gdk3-3.3.7.ebuild 836 BLAKE2B 2b2ad27273f0a1cdd67a16be2a78549a0111b820036f5c04a0134663606aea04cdb6cb73f07d16341b4f0768d77939848e7fbfd21a9ff6783e8c4ad973300b93 SHA512 d20e658848635b4e44831ca9d9c4af03f55d4a915b5ad695776397cfe0352164d08e5d90e7d2dd321d6765fa894250edca80824ec427db33b4ff8903807c2047
-EBUILD ruby-gdk3-3.4.3.ebuild 481 BLAKE2B b47e1dbe7d24b9866c5bf447dbf225e3b808ee7fd3cff700422c0f154626c9af13c5be821344560206eec2ec5c9cc26a3907debe49abde7fb85da6bfe2f02f97 SHA512 cab9d78feceaf640142217e6145357b17622d2afcff02488bd3360eb64a62d5a7deb3b74caa3e3cb1ec554ca2e3593386e9318a1527509fcb412f35a929d0f43
+EBUILD ruby-gdk3-3.4.3.ebuild 480 BLAKE2B 3c6b8d4a0a9bede568b4d5b6a8d075d9ee17afdc81020e3b8f757c2fba1a740b394b7550a73db5e9cbe281dc4b06d7613d42407c42c40dbb4e91fddbbfa9e802 SHA512 65ed223e8f983a83fbf698f5c5f5a43926652ea1f5f3949d87869861efca17cfb6660288ebc86ee1ace3755b34f6711984632e284ef0dd44a83514f8d59adb43
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.2.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.2.ebuild
deleted file mode 100644
index eeea1483eeb7..000000000000
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gdk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/Makefile/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild
deleted file mode 100644
index 576ca4286ace..000000000000
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gdk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/Makefile/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.7.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.7.ebuild
deleted file mode 100644
index 576ca4286ace..000000000000
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.7.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gdk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/Makefile/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild
index 43edb6f282f4..ba265486a943 100644
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/gtk+:3[introspection]"
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index 370cb67bf390..c99f022ff058 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gdkpixbuf2-3.3.2.ebuild 572 BLAKE2B 6c60f1c4f68a04fddf0e56f521262f243de26a7963efd61db677e03d2476cfb983c4a4080c2e86dec804ef57371fdbf87fb7f91cd8ee58908135fa7f4fea4681 SHA512 54ad5840c0608c264ac8c98ddd61724c0d0e8bce1962b21ca796653dc37b35f6658ebddfe6edcb8eccb69b1e230d572b3427728443ab6e7010ac9bf31e44dd3d
-EBUILD ruby-gdkpixbuf2-3.3.6.ebuild 566 BLAKE2B f395f2ae2614fcca93ccad766b378389d520a81bf1ea4dfa951878731ad97b213595a4e623033e947e48501f5d6914fa5f7be6e9d0973600ef9f108969b0109a SHA512 c2345afafc74e7ed9efeb52121537852ed99a613c7093fd8f9340f770220f7f1327fc9ace3516780a6dc88a06821ea43fd647f193a8f16e60dc48f0c30b5b82e
-EBUILD ruby-gdkpixbuf2-3.3.7.ebuild 566 BLAKE2B f395f2ae2614fcca93ccad766b378389d520a81bf1ea4dfa951878731ad97b213595a4e623033e947e48501f5d6914fa5f7be6e9d0973600ef9f108969b0109a SHA512 c2345afafc74e7ed9efeb52121537852ed99a613c7093fd8f9340f770220f7f1327fc9ace3516780a6dc88a06821ea43fd647f193a8f16e60dc48f0c30b5b82e
-EBUILD ruby-gdkpixbuf2-3.4.3.ebuild 462 BLAKE2B d536487938df2459bb2af43d9caddaf101d715e3b19121c93342db4084d40fafd9fc9461f5effe93f52c5887e18faa11b7ede3cb95ee2886aa8eb37d123f45d5 SHA512 f5c24ed1c41a95d1388c0c8c42a0956ca4638bc5e2027495527e218c3be4cbaaea65aa7e65585b78f3505bc8f37c9cc9e0f398fe8d925e73a205e5f021423439
+EBUILD ruby-gdkpixbuf2-3.4.3.ebuild 461 BLAKE2B c0622759254b2dad21b8119cdb0b8274333fdc57d29d8bbed776eb41049a08957e3690f5bafac1f1dc3887dca6b93576ce88fbd4f78d414e6379512cd567cc8c SHA512 fcc7c91e58dacad36ea44e4659e94afe8eef5cff791ac781312c14cd1c9fb3c819a9213e9ae2cfdea6ff6f49c99a8f187c9ba672a8c6372afa950e04e5b869ad
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.2.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.2.ebuild
deleted file mode 100644
index 1419115f25e6..000000000000
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="gdk_pixbuf2"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
-
-DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild
deleted file mode 100644
index bdf7742116e2..000000000000
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild
+++ /dev/null
@@ -1,37 +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_NAME="gdk_pixbuf2"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
-
-DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.7.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.7.ebuild
deleted file mode 100644
index bdf7742116e2..000000000000
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.7.ebuild
+++ /dev/null
@@ -1,37 +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_NAME="gdk_pixbuf2"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
-
-DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild
index 33937efa3d4c..e60a07ae19d4 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.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 @@ inherit ruby-ng-gnome2
 RUBY_S=ruby-gnome-${PV}/gdk_pixbuf2
 
 DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" test? ( x11-libs/gdk-pixbuf[jpeg] )"
diff --git a/dev-ruby/ruby-gegl/Manifest b/dev-ruby/ruby-gegl/Manifest
index e1feb53ebd3b..87559e8ba995 100644
--- a/dev-ruby/ruby-gegl/Manifest
+++ b/dev-ruby/ruby-gegl/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-gegl-3.4.3.ebuild 385 BLAKE2B b1c6734b893e9fda2e0fa7b77585f1b08b320fcc1221155e20381e20db9f0338c9770dbdacdc1355cf7bf1127ff27c60c2a6aedfe1d8b9519dad863bb7bfaa74 SHA512 e1e16921b6e4c5a9c6722a2cd43c54676f6d64cae01fda3dcea9eed5a7d70c7c4475e0c91c9929c144b41d636aba53d0d44478ed244d2ac4ba2cb86975954067
+EBUILD ruby-gegl-3.4.3.ebuild 384 BLAKE2B 162c08e5bc265faa6808ae88ff5ccf0f6d77a5ef886adc23ae342ac7cdfcdac1f790e13261e68b16f50cb7f70ddaa2e0b9e38e580f0a303ec2003331ff6d622f SHA512 21c179e97eb6cf5dedc4fdc464c024e65b4f6e4c2fad5c4c925c07c43fd07f6160e7524d51dbb155379362763e8f041a875513f7d7b32829b9c7c2296ffb0d00
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild b/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild
index 64ef9b9a27f7..0facf8214c7b 100644
--- a/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild
+++ b/dev-ruby/ruby-gegl/ruby-gegl-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GEGL bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" media-libs/gegl:0.4[introspection]"
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index 55666c90ebc1..c1c0754604a1 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gio2-3.3.2.ebuild 939 BLAKE2B d95df9df19def9b1ca7bb0ea26561e25b6f1032cb512ef432a0c01844709b5b0c6b370f7288202b892ef9b0aa3e98a24b793fb5f76eb77d7a7c36bbd8ab3f0b1 SHA512 6996b4fcea7f4a8dc14cb700460528af7ff0be645e8d789e42f78105cb943d0e37447eeded5e1925a84a042265159577c72c1997748c96d427e131668566c37f
-EBUILD ruby-gio2-3.3.6.ebuild 926 BLAKE2B 6efa4cd83113c3be83f6ba3e3a96da06b792a2d1fd75904ab296da9711caed4ebe35012d089fa1e0b647fee1b6a9a23db19d10da4327e6293f52e808c6416af3 SHA512 bc94a9b4d91f3600c66d0b0b590f21de5bd2772608f1212977941d255c94f284a69093b6c80156ee09be5e578a706b2c2acbefa7b17e642ba415772865c1ccea
-EBUILD ruby-gio2-3.3.7.ebuild 933 BLAKE2B 5d09a0e9b86a6d6c977825734a271f95a26dc2583512610768402f23ccb58cc723c149aabc4f5c34a2a5bda424b91c92f6150bcadd446ff616ed0a3f49c3816f SHA512 b154a083f31023cbf9ee5fea53e87d78bf8006ede7338329c53f410c45e5aa2efd2f86fa6ca4433a8ddb28d4116d4de27bf131dced9005f27ae5daac97d2f7af
-EBUILD ruby-gio2-3.4.3.ebuild 503 BLAKE2B 549b47b022af6406bcd970cde12963ef14f9ded3ae3642980c613028eec77852b054c2714f57da794c15a65b536ccfe2a05e6401d6c51f3b7fc95539f64ff07a SHA512 6eefe8034e81a4eac745ace7091648d20ec13c3c53d27770bb60cf5b979a52540d2d26f1adcbf7731a9be4c2acdfb9276ad13b09ca67e4ef16107f9275daacfc
+EBUILD ruby-gio2-3.4.3.ebuild 502 BLAKE2B c01f6d337aae37bb7143ba448b71e4d8ce413782c45d7b28ec06cd7dd9779fd1b556444e3e9d6f7c301920102b2711ba938365975f53a2dc83b25d0dd37b4edd SHA512 4adcb0162ef359d59fd56f03e43986be7c39062de4547a61e4ecf0a89fb7c564104422a6d26587a280f66cfce786a2fedfefffbfe136def820a7ae6f29f212e0
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.2.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.2.ebuild
deleted file mode 100644
index d7f8a33dc4d2..000000000000
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of gio-2"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gio2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Make sure Makefile is generated fresh for each target
-	rm -f ext/gio2/Makefile Makefile Makefile.lib || die
-}
-
-each_ruby_test() {
-	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild
deleted file mode 100644
index 33d7d670feb4..000000000000
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of gio-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gio2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Make sure Makefile is generated fresh for each target
-	rm -f ext/gio2/Makefile Makefile Makefile.lib || die
-}
-
-each_ruby_test() {
-	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
deleted file mode 100644
index 4a04ab42361a..000000000000
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of gio-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		test/gio2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Make sure Makefile is generated fresh for each target
-	rm -f ext/gio2/Makefile Makefile Makefile.lib || die
-}
-
-each_ruby_test() {
-	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild
index d228c52040db..f88c2be8a583 100644
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby binding of gio-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 6e2b0f40ca06..5574845951e3 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-glib2-3.3.2.ebuild 844 BLAKE2B b28c519fe7926bd0a67f10b58e40bd055642aeed3191f08d391fb0fb1e7d56201462a4c7adcc888b66731a1090219bfa86dc4dce1d801719ef3114468e503fe3 SHA512 71d13d477e756c1cb8e749f692a70d84d75b620a3c1d72447aa9139130d0e0099595348775f4dd6bf32fc2255de1f96252cc68b15627298de4137a1bbd14e8df
-EBUILD ruby-glib2-3.3.6.ebuild 884 BLAKE2B a4872156721bc6f7a65d876c04436c68eec9c8409e91ccdfb9e1477f8c8dfa7654c373d077b519e0905e2a62182f5264fdf80bd7d9273931e6beff524a55b72d SHA512 0f995f8522b503c3f2d2fc5125eab6b2c83aa74ab2d2b3232f4e4ad69ab311cf57d8c29344f6d1b4bca48964b48ee89e0b2602f83cf775bf9e060ecd46e8c435
-EBUILD ruby-glib2-3.3.7.ebuild 884 BLAKE2B 3979bd2be0ae62c1e3913ac9b3b66b99da2c8b2d39d621c420dc5b650c62b9295d6d8701eb94239ca7abe7205e260077fa7ae9f43f1b373e127e359df548b91a SHA512 e19bb9a3f0003ad425e5314c5867a232a2822cf18ad00b2f780739d56b6e66f17c0163b2f74ee3ac7762caefab74b087dc5439f245a907471c6c6165f7be9fd8
-EBUILD ruby-glib2-3.4.3.ebuild 516 BLAKE2B 3e379a0c0b8882216bf2d108cd12cb0a6a7c77e9316e4d44626a79c6f09f6bd4e864fb4e9142320c6d5fbdb70f2237a106bee64b1f7251c268810a346e3041fa SHA512 875149c9e1eb4e7a92e70a4c16d114232524c0b0bfe6537f4eb04f89f3a7b2611515a3d9d5d5c9fe9c18dab649473e4f5e56f48a55fcb441f2995ac5952a1ae7
+EBUILD ruby-glib2-3.4.3.ebuild 514 BLAKE2B 455777466940ddb2c225eef8b0fc5b4c1bab587902700599c5b65c32447269235abf24e49a1ceee8576661ac15a885125ac312520daf1df4d3bd0c4aa9fa87c1 SHA512 9ba0879627a5e53fd63527f0ec2804c142ac6c543315b8e770ebd139393dbbfe95fdbbbe29e2060dd387b75c8576a7e59c2952afa6f234b6331830f635670435
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild
deleted file mode 100644
index 28812d439ef8..000000000000
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.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
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-RDEPEND+=" >=dev-libs/glib-2"
-DEPEND+=" >=dev-libs/glib-2"
-
-ruby_add_bdepend "dev-ruby/pkg-config
-	test? ( >=dev-ruby/test-unit-2 )"
-
-all_ruby_prepare() {
-	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
-	rm -f test/test-spawn.rb || die
-
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#:' lib/mkmf-gnome2.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
deleted file mode 100644
index b5ef2c1f6643..000000000000
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.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
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND+=" >=dev-libs/glib-2"
-DEPEND+=" >=dev-libs/glib-2"
-
-ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
-	test? ( >=dev-ruby/test-unit-2 )"
-
-all_ruby_prepare() {
-	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
-	rm -f test/test-spawn.rb || die
-
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
deleted file mode 100644
index d8f7adf0af33..000000000000
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND+=" >=dev-libs/glib-2"
-DEPEND+=" >=dev-libs/glib-2"
-
-ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
-	test? ( >=dev-ruby/test-unit-2 )"
-
-all_ruby_prepare() {
-	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
-	rm -f test/test-spawn.rb || die
-
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
index 297c9e60b4da..ad5115018499 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 RDEPEND+=" >=dev-libs/glib-2"
 DEPEND+=" >=dev-libs/glib-2"
diff --git a/dev-ruby/ruby-gnome2/Manifest b/dev-ruby/ruby-gnome2/Manifest
index b373170ffa7e..95805b3f6d31 100644
--- a/dev-ruby/ruby-gnome2/Manifest
+++ b/dev-ruby/ruby-gnome2/Manifest
@@ -1,5 +1,2 @@
-EBUILD ruby-gnome2-3.3.2.ebuild 996 BLAKE2B 0f66d5431f8935dcaa2365a3f338060510d982df95e224d658a30287b19bf402df4d2140bdd3d637dee14a835f44f64aefb3bc5e77f6ef15903ae53aec13ad21 SHA512 e8015e90a29c8f9105977a2c2c07ed5f570d762f4390814d449b78daaaf7242754cb8acfe7b30076a32deb7f1bfefef26bd6bcd85ca4de6e9a140ff139cbea81
-EBUILD ruby-gnome2-3.3.6.ebuild 990 BLAKE2B 7d9afcf39bc07bd942b5ab930544cd730a6f1904894b3fb6aeabd28f5976c0d090f91b30f4adf612ca37df76b5ade22c31d13cfc9abfca2dd7df59f459a46580 SHA512 aa050570a3c1d6dac71cc8a5e9a794ebc11cad4d577e8f77b96a4c603c9a9e6fa6306ba98ed7e33131cc75950db49c2f022d3820f3defd0e5bb60e3f96623a78
-EBUILD ruby-gnome2-3.3.7.ebuild 990 BLAKE2B 7d9afcf39bc07bd942b5ab930544cd730a6f1904894b3fb6aeabd28f5976c0d090f91b30f4adf612ca37df76b5ade22c31d13cfc9abfca2dd7df59f459a46580 SHA512 aa050570a3c1d6dac71cc8a5e9a794ebc11cad4d577e8f77b96a4c603c9a9e6fa6306ba98ed7e33131cc75950db49c2f022d3820f3defd0e5bb60e3f96623a78
-EBUILD ruby-gnome2-3.4.3.ebuild 1244 BLAKE2B 0c26f0be636102c2d63b65d483cbc33936a16b5ba5706642fe64ce4f5341f1c92767d479b026ada9afec59b047a04928531f5c0ce97e2a79548251521653b47d SHA512 3eced6056dd78e263d70ebbb92b22de4f0ec9cd5e78a4fc27f373d57ad911c5517507a9b4bbf09f00311ed2beaf25ff78c110010d3fd7b619a22ac2b0d88ecb4
+EBUILD ruby-gnome2-3.4.3.ebuild 1243 BLAKE2B be315ce8b6330075b3207254d73196f56e0eefd093c2c20eceda3fc09fb9e9490ae95f6c30604198e9c99db0055af424c0ecad4ccac5a7100449eaee9da1e39f SHA512 48ebeef1c858bf612303ed489faa48a6db96bcd999f1d3516475beb918e331b1e0e536ae9d94fd76084de31d4d211c8e89bc4027e3184ffe24896fb53adf9117
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild
deleted file mode 100644
index 1840ed9c8735..000000000000
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby Gnome2 bindings"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-clutter-gstreamer-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}
-	~dev-ruby/ruby-clutter-gtk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}
-	~dev-ruby/ruby-gtk2-${PV}
-	~dev-ruby/ruby-gtk3-${PV}
-	~dev-ruby/ruby-gtksourceview-${PV}
-	~dev-ruby/ruby-gtksourceview3-${PV}
-	~dev-ruby/ruby-pango-${PV}
-	~dev-ruby/ruby-poppler-${PV}
-	~dev-ruby/ruby-rsvg-${PV}
-	~dev-ruby/ruby-vte-${PV}
-	~dev-ruby/ruby-vte3-${PV}
-	~dev-ruby/ruby-webkit2-gtk-${PV}"
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild
deleted file mode 100644
index 8c96f6750015..000000000000
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild
+++ /dev/null
@@ -1,39 +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"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby Gnome2 bindings"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-clutter-gstreamer-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}
-	~dev-ruby/ruby-clutter-gtk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}
-	~dev-ruby/ruby-gtk2-${PV}
-	~dev-ruby/ruby-gtk3-${PV}
-	~dev-ruby/ruby-gtksourceview-${PV}
-	~dev-ruby/ruby-gtksourceview3-${PV}
-	~dev-ruby/ruby-pango-${PV}
-	~dev-ruby/ruby-poppler-${PV}
-	~dev-ruby/ruby-rsvg-${PV}
-	~dev-ruby/ruby-vte-${PV}
-	~dev-ruby/ruby-vte3-${PV}
-	~dev-ruby/ruby-webkit2-gtk-${PV}"
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild
deleted file mode 100644
index 8c96f6750015..000000000000
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild
+++ /dev/null
@@ -1,39 +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"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby Gnome2 bindings"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-clutter-gstreamer-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}
-	~dev-ruby/ruby-clutter-gtk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}
-	~dev-ruby/ruby-gtk2-${PV}
-	~dev-ruby/ruby-gtk3-${PV}
-	~dev-ruby/ruby-gtksourceview-${PV}
-	~dev-ruby/ruby-gtksourceview3-${PV}
-	~dev-ruby/ruby-pango-${PV}
-	~dev-ruby/ruby-poppler-${PV}
-	~dev-ruby/ruby-rsvg-${PV}
-	~dev-ruby/ruby-vte-${PV}
-	~dev-ruby/ruby-vte3-${PV}
-	~dev-ruby/ruby-webkit2-gtk-${PV}"
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild
index a998630ca2e8..a02ce88cfa6b 100644
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.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
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby-gnumeric/Manifest b/dev-ruby/ruby-gnumeric/Manifest
index 1f942dd80113..02d53b5c6ab5 100644
--- a/dev-ruby/ruby-gnumeric/Manifest
+++ b/dev-ruby/ruby-gnumeric/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-gnumeric-3.4.3.ebuild 612 BLAKE2B ce7b7da80eaed9dfd7fc405f3820b71812f065487b0012fba679348d21d709afc66730149d11a30d9468d0d2637958d9469c1ac2ac447dc25bae6f911846661d SHA512 4c915842d5d96871a0d9c489a3c220345c5a4c05524f5295b0c1db0b45ae39852f71c9a3f7c43f1e1840e9b09445db4ae61a70f3de9fa81abd0b2a381f40f643
+EBUILD ruby-gnumeric-3.4.3.ebuild 611 BLAKE2B 5a1d9edbb403b08534eeb57f60f240e4e1ed9bf42abc2f1cddcbde6134a43d4d0831c0c477a8b57bc48db3ddcd29960a9e2752e0b01526410f3cc4e5b346eed9 SHA512 73c44a75334195b268c3e6458adb7638e328b9aced898f475405ddb55c87244be39d8520cf0b4e2741f5dbbfcbc86496827d80b25917ab12df7f0071a43b6910
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild b/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild
index 5a0437161cc4..9019310e136e 100644
--- a/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild
+++ b/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Gnumeric bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" app-office/gnumeric[introspection]"
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index fdc153918ed4..f9e712cbab8d 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gobject-introspection-3.3.2.ebuild 1064 BLAKE2B 58395216023484a4eddbecc51d39ef4181034ae31535d0ae60ae87e31269fc89d955c587e64cd369cdc990fdeabdc96b05302c89e977dcf65e31b5dce5588a61 SHA512 2afddec38dca9c32b3e5b79fe338f52ac8c3dfc02d54e3377bb7928f3e522ecf361d8dde8e29d9d598396309c8c3f22e917101abba3be82b68167393d60ca8e1
-EBUILD ruby-gobject-introspection-3.3.6.ebuild 1051 BLAKE2B 8a7cc0ca7691fd8676a319bac7179b0bb7c9add3555238adfe0428a81cd23fbe88bfab96ed60e3a01bfbba14d34714238142df7fcab50dbe9645367d70458cc5 SHA512 23000a36802cb89711e747fe3d4a0d720409b61a38a964b51cb64942a1c2733d6ed089cafb13ce0443f05367f3ef246d237b31c001432f747d6d09b0fbcd2065
-EBUILD ruby-gobject-introspection-3.3.7.ebuild 1058 BLAKE2B f64c965eaa2288b3569d9c822aae1f51e3c483483cb77ddb5e9a00ab2b40254cdd345a5edce0678c2b1c5613e50ff99352c5e44af3f25f65e6b087f0bf53dbb1 SHA512 27ba1146a1fa3055f1fc4a28ea45206b41af3b34b91b2066971228935f90da8bb8ea5baf532da50f5e0b85be907992a8ea0a89ed70823c2ad5720c03936565f7
-EBUILD ruby-gobject-introspection-3.4.3.ebuild 424 BLAKE2B 0886c452910a3942baed599bc8b0ced5e4e465eb02b62c9f9631ad55e41c5749b005f2e96f45a29e271b2a08f9d28f13845a4b7a1e29faf36fd42bce5d4d81ce SHA512 a0c6bb3561960aad209cce2ad902611aa79d0885ae30c845d9583d040ba74acd5132bd240f3070d40f31f62e3a28af9a11ee022af34b56f78f82810fb983e114
+EBUILD ruby-gobject-introspection-3.4.3.ebuild 423 BLAKE2B 740ccf9c9b28aadae25266184062aaf43725f7283715d6d64ec21df129189b00a4d48dbed227b56d7209520b3ae034720240632f7e8b43c83275990e07ae294c SHA512 0ecb7dd26ddf3a5c0a07e3bbcf919ba806aacde0d1e3fa3400eaa7b6551338c24c74edd9bb412a59857d471ed5310bfeab484bfe9c7026679cf1ece2eae9385a
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.2.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.2.ebuild
deleted file mode 100644
index f987c9c9f381..000000000000
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.2.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="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
-
-DESCRIPTION="Ruby GObjectIntrospection bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/gobject-introspection"
-RDEPEND+=" dev-libs/gobject-introspection"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.ebuild
deleted file mode 100644
index 2cb9544a2609..000000000000
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.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"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
-
-DESCRIPTION="Ruby GObjectIntrospection bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/gobject-introspection"
-RDEPEND+=" dev-libs/gobject-introspection"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
deleted file mode 100644
index 2d2bad37ef78..000000000000
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
-
-DESCRIPTION="Ruby GObjectIntrospection bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/gobject-introspection"
-RDEPEND+=" dev-libs/gobject-introspection"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
-	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild
index 4040832fc57f..0524e22784b7 100644
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GObjectIntrospection bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-goffice/Manifest b/dev-ruby/ruby-goffice/Manifest
index 2ac5d199d1eb..36d32fec58ab 100644
--- a/dev-ruby/ruby-goffice/Manifest
+++ b/dev-ruby/ruby-goffice/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-goffice-3.4.3.ebuild 639 BLAKE2B bcb0c1534c5fbdd7506ca69f29ecf09859d055c91d0561637aec008e54b2bba8539a8ecb31d720539d3ff7deb6309e6c94d60c8e8cfa013456d875d4d9da6587 SHA512 476aae8adab2dd2c83e83eea08351d829ee33f3ad58f318b4776be414f86f9edfc1e3f094055037bcee85b78ff0f6d606f7d84ccfe1d5a8d1d8b2df0f8fdee4c
+EBUILD ruby-goffice-3.4.3.ebuild 638 BLAKE2B 2974b9c01f0c0ebcb675bcc814e6d8aaa6a45dec0c916df0229a88c02120121f00edca1bcb1b042b886f75ab136f09d7da1f90e82fb6e03192f85bb4d8e21e19 SHA512 4c35414e1c7b0c5be3a053ffaa4015af1648d1bf90ab611c508152facc5d4dbadc33fbf22e373781d7f896c7ec012e72cab5914c2f3f4af0ced893dc0a897694
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild b/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild
index 8913d2c04d0d..50e96f153494 100644
--- a/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild
+++ b/dev-ruby/ruby-goffice/ruby-goffice-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GOffice bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/goffice[introspection]"
diff --git a/dev-ruby/ruby-gsf/Manifest b/dev-ruby/ruby-gsf/Manifest
index 1a0f30217bd9..c8ae02509f8d 100644
--- a/dev-ruby/ruby-gsf/Manifest
+++ b/dev-ruby/ruby-gsf/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-gsf-3.4.3.ebuild 382 BLAKE2B af4875ca4043c9332319112c39bc7a6d38111ae3fef608fd91fd81574a2ab6fd62e342721e2ff8f8fd6191ab55cafc0fbad1ee78a90d94c1a4e7b69fa008a9ab SHA512 023b81e2969831301efdca9ae33840aa66b963db5678b3b9766adf0e6363e45c3e4ac8db85f2533f82a315300fd290d00fb7e81be1e50f9973fda6a3c17f2d60
+EBUILD ruby-gsf-3.4.3.ebuild 381 BLAKE2B c8ae18ab35d2653cdb83d02da61dbfbf489b4823ff282806c6a506f289f2c7a3aa393d16626287314d3f60dd76435fb39fa0915a129b8340fb101e987166b063 SHA512 a16b4a18b4e651aae48e20b3dde21053a0b205dba24ecd91a4b62dca81588b17d6b105fe36aa26bb118f688a112c390ff4a555a8b63724365d1fa964faa60956
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild b/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild
index 4e3c6d41ed18..a6111a183e3c 100644
--- a/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild
+++ b/dev-ruby/ruby-gsf/ruby-gsf-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GSF bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" gnome-extra/libgsf[introspection]"
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index 71beaa14fdb6..fb814ffe391f 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gstreamer-3.3.2.ebuild 879 BLAKE2B 4da901b2dcf5ee1799e5c66a8d3852a21f92a157f84d91413e1cd841baf71069a30e214fa8c09ff8c8dcb3a54ff426c8aa2417f184aba793763f9741a94efb27 SHA512 1322fb937c52f0703379364b31372f88b7f0fdf97ed354decfe2e3078e67862d7a459a8efc4a1fa6dbd0b609f3c22ef91367ef9a4f962501c94cfdd6bf3e2388
-EBUILD ruby-gstreamer-3.3.6.ebuild 866 BLAKE2B 47d51135df7ce439f0c3ab9c14d8135588e1f2fc07435ea672f6b8c4792613c8fc31c9c60180d03c90ed2c796650d41cc4a6352ff01f681f2ce5da8c210e46c2 SHA512 728a569f818f8bcae4bba2a15f2c527889512e80ff25d149f32780d9e2dd36bc0274a0c5492e272e68dab996b7b49c13d04d92a4bdf76fcf138224299f70934e
-EBUILD ruby-gstreamer-3.3.7.ebuild 866 BLAKE2B 47d51135df7ce439f0c3ab9c14d8135588e1f2fc07435ea672f6b8c4792613c8fc31c9c60180d03c90ed2c796650d41cc4a6352ff01f681f2ce5da8c210e46c2 SHA512 728a569f818f8bcae4bba2a15f2c527889512e80ff25d149f32780d9e2dd36bc0274a0c5492e272e68dab996b7b49c13d04d92a4bdf76fcf138224299f70934e
-EBUILD ruby-gstreamer-3.4.3.ebuild 636 BLAKE2B 9c8c4fe224e87079cd48d968f628395245934cb17e71f62cc61ea293312b4a8e36dc4f642da3012d02a8b82d8300edb58248d8562ef9f2e15070263f2433112f SHA512 12a932a67a0295a05f3698e8c31d144b99dedd67842c514c827460e6b9468b239e9264755e5584ebe615bd1ff15c500f2f7f4e2774319b14f377c7f842325924
+EBUILD ruby-gstreamer-3.4.3.ebuild 635 BLAKE2B f288e2aaacc1c6ac29a79283e087e3631db1d814bda3635f355a92cbcef86f61fb75592ecb24d6cc94d09c406da2afb32d613cdc107def1f9e72b97c219bc906 SHA512 36e438c6f9d693ca2f1ebd9e8857db52f724ef92d10c73b841c37d87ef52de485c15ef7bd93b3c520f87ec8db5e7e86668c91213e25c984240b528315d04c4e5
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.2.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.2.ebuild
deleted file mode 100644
index 89ff678c7db1..000000000000
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.2.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="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-DEPEND="${DEPEND}
-	dev-libs/gobject-introspection
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.ebuild
deleted file mode 100644
index 33b2feb69f99..000000000000
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-DEPEND="${DEPEND}
-	dev-libs/gobject-introspection
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.ebuild
deleted file mode 100644
index 33b2feb69f99..000000000000
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-DEPEND="${DEPEND}
-	dev-libs/gobject-introspection
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild
index fb2de67c8b1b..c6954f8d49f0 100644
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND+="
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index ad4ea4e2c053..1ec35122c24c 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gtk2-3.3.2.ebuild 1008 BLAKE2B 02b801c2b106dbb8adc453848268f93fc159ddf3d536efa8d63a4008f7b37fa1489e1a02ed60e6cbf794079d5412ca922f1ec101108d7bf382e4604a5986451a SHA512 8be9c49fb095383121f6cf98c94147120bce1fae631f42f0f8ff2bf8c8a9d17fdf069f06cc04c1ef27f77516deec9721db22427fc98a28f96378a75e8f9a71a8
-EBUILD ruby-gtk2-3.3.6.ebuild 995 BLAKE2B 2925245c0e4ab3ddbaf2aadaa47623a7d8618cf252c33268ec3ab8487ce1bff346748eb0829518bd333e92e83aa602994d2ee142cb7d9565221f4c65562865c8 SHA512 4f338df53e8f9547feae4187029e34485ec03d82cab47d76836a4acdaccc2059dc2577ca18ed33ff1dff0c84fdbe781dd58c1d34ed67107b093364a9856d2983
-EBUILD ruby-gtk2-3.3.7.ebuild 995 BLAKE2B 2925245c0e4ab3ddbaf2aadaa47623a7d8618cf252c33268ec3ab8487ce1bff346748eb0829518bd333e92e83aa602994d2ee142cb7d9565221f4c65562865c8 SHA512 4f338df53e8f9547feae4187029e34485ec03d82cab47d76836a4acdaccc2059dc2577ca18ed33ff1dff0c84fdbe781dd58c1d34ed67107b093364a9856d2983
-EBUILD ruby-gtk2-3.4.3.ebuild 728 BLAKE2B 92a0a7f063f02660b1a3d2b66f58f38de3188d09a2b5be106350668ca00405b31f7fb64cdc0270654cc61645d960145b29fc492e024d7ea613eeef1724a7b018 SHA512 69bb773554c50f9a3ba279c8f049ce9285a9f57490fb00298a1345af38c08874d36fb0c175799b0711fe7d89a2d693105b2f6678aa49adf974450186ffe9aadd
+EBUILD ruby-gtk2-3.4.3.ebuild 727 BLAKE2B 61d1b40d6074d673f291ad800892a94865afee7125422b9e3ed0941ca36be6cabce427dc8156c06ef606fd63dd9023e746360dab6d15594755299147bd95e425 SHA512 02d4d6ff96ac242b1386758e34a24ded081ad839fb18dbcba39af9e0e74530a65601e810b83b797f9ff0eaf0ec4cba1442c7c45cea1a4ebb06d645c115ca771b
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.2.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.2.ebuild
deleted file mode 100644
index bc50f1d4e07e..000000000000
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:2
-	x11-themes/hicolor-icon-theme"
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
-
-	# Fix search path for gtk-2.0 on Gentoo
-	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild
deleted file mode 100644
index 8521faa642ed..000000000000
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:2
-	x11-themes/hicolor-icon-theme"
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
-
-	# Fix search path for gtk-2.0 on Gentoo
-	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild
deleted file mode 100644
index 8521faa642ed..000000000000
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:2
-	x11-themes/hicolor-icon-theme"
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
-
-	# Fix search path for gtk-2.0 on Gentoo
-	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild
index 20148b08cdcb..b74a5267309d 100644
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index e7e1a9da4b2f..d5f58aba0612 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gtk3-3.3.2.ebuild 1058 BLAKE2B 0587095c3fe4389051eeda11cd759a0a54d463c8ea7249490651383dc34af6ae5f4cb7ecd536657c3fc60225a49839a1718e818fdaa94c04c5d7f9c8a5e2dd2e SHA512 a8e494b689b3f40fd4831f568eb8028d69faee3d56c9eb6d8c0890b6eb032e89671e1c777303f50235a1dc1500835b5aa59d65da47b84b1c7cf97d66ea365cd1
-EBUILD ruby-gtk3-3.3.6.ebuild 1045 BLAKE2B 9091b487801aa0626a8e8b25a4b6868df17b0fee885adef38188fe9d7d0812f263273859a1109a97cf70c4ed90a0f0ce5674f8d4ecd6c223454934a27d608d1d SHA512 2eeb2d395a1a933c6364d65c4be0b2849ea54321a65460dfec9827f6adc640809a9c846d296eb29c421a34634acd4a462e79dd139630da982df3515e2bba3625
-EBUILD ruby-gtk3-3.3.7.ebuild 1045 BLAKE2B 9091b487801aa0626a8e8b25a4b6868df17b0fee885adef38188fe9d7d0812f263273859a1109a97cf70c4ed90a0f0ce5674f8d4ecd6c223454934a27d608d1d SHA512 2eeb2d395a1a933c6364d65c4be0b2849ea54321a65460dfec9827f6adc640809a9c846d296eb29c421a34634acd4a462e79dd139630da982df3515e2bba3625
-EBUILD ruby-gtk3-3.4.3.ebuild 691 BLAKE2B c915e9863eafe44ef8ce96918b1c9f8ca60fddcf918365ff708cc663a4245db3abf0f853d6bcc10df3dec2037b126b8bc454c643a6f184af5792b8b3419d0472 SHA512 7f90d8f45d1a1c61b9fb25c0f1e10144b76eb2f43f7df9a7725dd71342c84d1fad556383454f4e3a86f4e8cc1ffbc3d2ccd12d4ad7e5a8e4e5cf52132a6da39d
+EBUILD ruby-gtk3-3.4.3.ebuild 690 BLAKE2B 100468d49d79a7ef4cbbef992cc5f1066bc03dbed2358e48437add5d6d9ad6eb76bd029572be87a4d4ba0650786e7dee01221b4c1b740c29af57d5daec3470d8 SHA512 8987f89c69a5b6fbb5d9c750bc274c29616f806ee8eb12e9d92e2e3759adcfb6cd7b685197134561144228da57318bb23f29fa37978141f806bba1b505c78d0e
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.2.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.2.ebuild
deleted file mode 100644
index ccd6d1e43a14..000000000000
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test-gtk-icon-theme.rb || die
-	sed -i -e 's/"search"/"system-search"/' test/test-gtk-icon-theme.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild
deleted file mode 100644
index c88b94ebb6ed..000000000000
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild
+++ /dev/null
@@ -1,41 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test-gtk-icon-theme.rb || die
-	sed -i -e 's/"search"/"system-search"/' test/test-gtk-icon-theme.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild
deleted file mode 100644
index c88b94ebb6ed..000000000000
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild
+++ /dev/null
@@ -1,41 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test-gtk-icon-theme.rb || die
-	sed -i -e 's/"search"/"system-search"/' test/test-gtk-icon-theme.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild
index 2e8e3b2e7087..a588582b874c 100644
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
index 544281518cbe..99645664f88e 100644
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gtksourceview-3.3.2.ebuild 807 BLAKE2B 83cdac45804a967523814f39d7e2e60e968a8e9a732da7ac2308d99b40e11101ac315007bda6237dc7ef99d9988ff1d23df32c29a3d9097cc65752e265eff170 SHA512 aa6f64ab4c857cda17bcddf02b89190647d01fd2bb43e8c74346bf258323003b804aaaec6b6d3d3239786e2436705b329e53fc2018a623d126fff4c0ee6a402f
-EBUILD ruby-gtksourceview-3.3.6.ebuild 794 BLAKE2B c18000605028fa1b61cd7e250f396bc1cb529357cd8642d3d9211a9c3f01a35a126cba88254d068b97781636be79dd1e25f770c7a09ffc7ebb715d30caf08ed5 SHA512 d151574b2440a5299fd2a7c0fd45a97f7fde78100dfcd3e2f287ecfb5b03fad15d3279650329102c357ca9986040ec0cdf6f4877418ce3d71ba2ce29482bc731
-EBUILD ruby-gtksourceview-3.3.7.ebuild 794 BLAKE2B c18000605028fa1b61cd7e250f396bc1cb529357cd8642d3d9211a9c3f01a35a126cba88254d068b97781636be79dd1e25f770c7a09ffc7ebb715d30caf08ed5 SHA512 d151574b2440a5299fd2a7c0fd45a97f7fde78100dfcd3e2f287ecfb5b03fad15d3279650329102c357ca9986040ec0cdf6f4877418ce3d71ba2ce29482bc731
-EBUILD ruby-gtksourceview-3.4.3.ebuild 591 BLAKE2B 73a3f6a61c39f3212ba3fca09d2cd06cdceca4bc65f9c65c207d4c1b02dc799683c22e165fe63a00ac067905f13ff90e44b0efd1ea65aba54a7fb51127be4ac3 SHA512 fc6afeadbe78a9ee7d0bee92f732326806aa3f2a90acd4acbd4039f40291a8999e85664f4176d1ad84fe191704c28b495c9e317f8d7fdded31a94e8174660967
+EBUILD ruby-gtksourceview-3.4.3.ebuild 590 BLAKE2B ccec57ec522b8a59253f4a68d539e3c251303651097cd9025d5998873c860bc1b20570f89ec2e2ce94cac17bcc228dcf22dcd4a049b82de222834ca6bb769b99 SHA512 a7b7f1559d5191f942150db2a483d47e6c53559e497445e57a890d20dbf108afdc058e388b2508dee4cfae5509a8a3bf32862898ffb600fec12a18b12e0460d4
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.2.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.2.ebuild
deleted file mode 100644
index 697ed206485d..000000000000
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="gtksourceview2"
-
-inherit virtualx ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
-
-DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtksourceview:2.0"
-DEPEND+=" x11-libs/gtksourceview:2.0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild
deleted file mode 100644
index 9627f8fcc657..000000000000
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="gtksourceview2"
-
-inherit virtualx ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
-
-DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtksourceview:2.0"
-DEPEND+=" x11-libs/gtksourceview:2.0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild
deleted file mode 100644
index 9627f8fcc657..000000000000
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="gtksourceview2"
-
-inherit virtualx ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
-
-DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" x11-libs/gtksourceview:2.0"
-DEPEND+=" x11-libs/gtksourceview:2.0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild
index 6cf400797438..20aed6fcf528 100644
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.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
@@ -12,7 +12,7 @@ inherit ruby-ng-gnome2
 RUBY_S=ruby-gnome-${PV}/gtksourceview2
 
 DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
index 48dde731e5e7..8ebd5801754d 100644
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ b/dev-ruby/ruby-gtksourceview3/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-gtksourceview3-3.3.2.ebuild 731 BLAKE2B 5d13394c88d5431e5478c946161a35c58b44dcf29e397650266d4a8acc8812f9d5517e8a2f70c57ef1e4e37b09cadbe5093b679cf99d0c3bb9e80be08e4d7827 SHA512 722676155bfbf21d6bf7b89c2f11b7ab14b6d299c357ebfc069456fe9ac508018f2939f7650789d5ed9e12c7a8fb952791bd2bb3bc90674ec5dc3482261e8c2f
-EBUILD ruby-gtksourceview3-3.3.6.ebuild 725 BLAKE2B d076147b8178b4a53f826aa55f1ee1e011f7bafae37b1e33a8f106d1b86d88f042cc931ec4340f22f0404ad3cb10913f7566e9f5bff480894c752d3bc60e620b SHA512 23e41b4a7e7f13b9f9c2a095cd1b144d62f991f6a3784deb32f955be0f8cbaa27ae696cef531ae5acf3e45b34caac9761642f8ac4f745104bbeb7285e481adca
-EBUILD ruby-gtksourceview3-3.3.7.ebuild 725 BLAKE2B d076147b8178b4a53f826aa55f1ee1e011f7bafae37b1e33a8f106d1b86d88f042cc931ec4340f22f0404ad3cb10913f7566e9f5bff480894c752d3bc60e620b SHA512 23e41b4a7e7f13b9f9c2a095cd1b144d62f991f6a3784deb32f955be0f8cbaa27ae696cef531ae5acf3e45b34caac9761642f8ac4f745104bbeb7285e481adca
-EBUILD ruby-gtksourceview3-3.4.3.ebuild 440 BLAKE2B 37c7f53474f5856b339970b4d38f15e7cb0af501c34a79b622310850bd514ea5ef195fb4977850ad3ff90f2e65c169258b2aebc34095be46aa4d52d80fac0004 SHA512 cf04222fea8d5ad7db20e3b1294900f37ec14384dfdfb050bc939e840cd5c3d430c0243096035d79ae8802d3e9e4c94af8fffb543d403b543c421f07aac2f45f
+EBUILD ruby-gtksourceview3-3.4.3.ebuild 439 BLAKE2B 43125838c836a1c0fa61a370e174ce44a1bbc73c9b913406e07755ee927af2152bb790523b93124c7e61c81edd940a03ba5ac95608d959f659cab9b551e41888 SHA512 8750c03489daaee06490e9c14fffdb58f544f74879603e30b29b3661128eeac75e175f6bcd66f8cffcdf37de840bd1a07ba4733865fca7f138645335c3898c21
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.2.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.2.ebuild
deleted file mode 100644
index e519d4ce77f1..000000000000
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby gtksourceview-3.x bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtksourceview:3.0"
-RDEPEND+=" x11-libs/gtksourceview:3.0"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild
deleted file mode 100644
index f2d9cee96dd6..000000000000
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby gtksourceview-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtksourceview:3.0"
-RDEPEND+=" x11-libs/gtksourceview:3.0"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild
deleted file mode 100644
index f2d9cee96dd6..000000000000
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby gtksourceview-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtksourceview:3.0"
-RDEPEND+=" x11-libs/gtksourceview:3.0"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild
index d1bf78f865b6..b2f0c5e16d6c 100644
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby gtksourceview-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/gtksourceview:3.0[introspection]"
diff --git a/dev-ruby/ruby-gtksourceview4/Manifest b/dev-ruby/ruby-gtksourceview4/Manifest
index 5c941f7adbc8..db9d25b2a7d2 100644
--- a/dev-ruby/ruby-gtksourceview4/Manifest
+++ b/dev-ruby/ruby-gtksourceview4/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-gtksourceview4-3.4.3.ebuild 433 BLAKE2B 559adb0be1da66004feb2a0a3075e393bd798e7629b70980a425b07203f14cc8e77b76044233f48f38d6cd780a27da8942ff6ded3febda6238aeecd1bc66155e SHA512 35f8bb4bfbe8eb89943f54f6cc9ef61bd072250caff788257b0ebfbc4738ccc0a85048ee805e465a52d6810d7d941d5103f2007f400d5fe6752927eac2e62943
+EBUILD ruby-gtksourceview4-3.4.3.ebuild 432 BLAKE2B db34c32dfd6e213bae1c374f25a68a05839b0e2d37f4a3aafb272fcef0c17d45c687988b1a616e2c24e5ab8a1d49043fcb7bf8d3431b2b4acc5c21044d97179b SHA512 3103313f6598aac765b3ab624cdb2bbb95f56a1d73537dee89839e7b709e8563391aa42fbc0ee38318db1eab9ed0c2d07c66ee2e05652ba86859f5133a39bf4b
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild
index d2593c52f5a3..164190e8b5b5 100644
--- a/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild
+++ b/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby GtkSourceView4 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/gtksourceview:4[introspection]"
diff --git a/dev-ruby/ruby-libsecret/Manifest b/dev-ruby/ruby-libsecret/Manifest
index e20717537553..75394117b49f 100644
--- a/dev-ruby/ruby-libsecret/Manifest
+++ b/dev-ruby/ruby-libsecret/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-libsecret-3.4.3.ebuild 407 BLAKE2B 958deb0b42ec2f043688d061b9c8fef5f4bdc6fcc2af8b82c79bfb68ec2d46da9091a6e6a7bb4d281e51ff4f81ccd8d3d4f5f6ca0b35b571bd8ddbac5a0fbef1 SHA512 0524c626bfd7d5be99c30b771595e3585e47deddb64e7412db4848e88623968c1779e0b203d1b02326fcb982c772b8cbcadd54f6e3fcb2051f371ce2751529b8
+EBUILD ruby-libsecret-3.4.3.ebuild 406 BLAKE2B 510f1e903331be13dff5daad1593d145a9f230bf0b68143a7373c6d9cb402b06905d1fee028feb71531089d2e03c19a1cb789ef4c1e8b458b666b0c13aafa1d2 SHA512 701158ceed191ecf20bb14c3e1d46ce1c2a881b620fbe9e2736611bb171347d7424127d9834d437488f869b2a0591d81bcde8095e8e16dd383d4c5ad4e63669b
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild b/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
index 90321b15e9a9..7808fec95785 100644
--- a/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
+++ b/dev-ruby/ruby-libsecret/ruby-libsecret-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby libsecret bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" app-crypt/libsecret[introspection]"
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index 724d270be70a..21cfb9264b2a 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-pango-3.3.2.ebuild 926 BLAKE2B b48b9c249e68dd9f4665e1b5e9a25fe87bae3c72eea5806d655fafa2f1a7febab24c8367ebc72f8ed8cabd180259e946af61f38d63943b03094347a9872d434e SHA512 84811d88f54e5d0853ea43d2150c34be2635127d1d5fe9f9db2ca50aed86c768fb38c0cca6129a436c7d08c24478b923ed972cb7c2daf9ea0685255ddac8bb63
-EBUILD ruby-pango-3.3.6.ebuild 913 BLAKE2B 6741b0a7fa5386307a09f76858b310fb18369c6b6dedb89622f07985f663d02b98d3e4714d101ef62cf418f3d43af993234ecb09c9471d6c86c936d31a095623 SHA512 fad99d0a7094be7ff495af62902c0afb4ee099ce772b1062ce3669e8d7980a3a8acba94ce2ab72aae587c45e14ee25a6af7b70cb350a261708c3b3bd012b57fc
-EBUILD ruby-pango-3.3.7.ebuild 913 BLAKE2B 6741b0a7fa5386307a09f76858b310fb18369c6b6dedb89622f07985f663d02b98d3e4714d101ef62cf418f3d43af993234ecb09c9471d6c86c936d31a095623 SHA512 fad99d0a7094be7ff495af62902c0afb4ee099ce772b1062ce3669e8d7980a3a8acba94ce2ab72aae587c45e14ee25a6af7b70cb350a261708c3b3bd012b57fc
-EBUILD ruby-pango-3.4.3.ebuild 779 BLAKE2B a93754e656ad70d1ea701a0a67ad730b2d8743cabce5ee666369c0e9b006fa149781a74f4b4613c6ac6cdfeb5b8f62d8603ec0ce5bce518476ad00e5023da01f SHA512 731841ce1dad0c7225f9dc57785a0afbca932e0209b6c643e3088ab72df49354835c1cc9600c7f2e3f401a9195ef2db490ee18adf402468b30191715dc3d7940
+EBUILD ruby-pango-3.4.3.ebuild 778 BLAKE2B 5798b54e735a91317736bf0e76237c3848f81d9d82c71770671001a951e9424a0fb822161e91a014257ca853ce2634a7fac9949602f166679d0f08829a8cd5ea SHA512 07f28887698230bef82da16ddd6505416699631b8813c09a83ae7066238ef5cd8317fa5fd49bd7f3a551b5ac00923107824f377a1f3f8ac100ba04d0f071b007
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.3.2.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.3.2.ebuild
deleted file mode 100644
index cf1e5b597b5e..000000000000
--- a/dev-ruby/ruby-pango/ruby-pango-3.3.2.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
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" >=x11-libs/pango-1.2.1"
-RDEPEND+=" >=x11-libs/pango-1.2.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Remove test depending on specific locales to be set up: bug 526248
-	rm -f test/test-language.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	# Include pango path since run-test does not list it
-	${RUBY} -Iext/pango test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.3.6.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.3.6.ebuild
deleted file mode 100644
index 880b50d9aa51..000000000000
--- a/dev-ruby/ruby-pango/ruby-pango-3.3.6.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
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" >=x11-libs/pango-1.2.1"
-RDEPEND+=" >=x11-libs/pango-1.2.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Remove test depending on specific locales to be set up: bug 526248
-	rm -f test/test-language.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	# Include pango path since run-test does not list it
-	${RUBY} -Iext/pango test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.3.7.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.3.7.ebuild
deleted file mode 100644
index 880b50d9aa51..000000000000
--- a/dev-ruby/ruby-pango/ruby-pango-3.3.7.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
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND+=" >=x11-libs/pango-1.2.1"
-RDEPEND+=" >=x11-libs/pango-1.2.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	# Remove test depending on specific locales to be set up: bug 526248
-	rm -f test/test-language.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	# Include pango path since run-test does not list it
-	${RUBY} -Iext/pango test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
index 31222525b2f6..79426d024b29 100644
--- a/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
+++ b/dev-ruby/ruby-pango/ruby-pango-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 DEPEND+=" dev-libs/glib
 	>=x11-libs/pango-1.2.1[introspection]"
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index bbcefb682441..9a388b569bce 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-poppler-3.3.2.ebuild 816 BLAKE2B b763adb627c5f3cd941b026ab16aded21c8eba3cf5bfaf1ddaef6da748dbe57d9638d08942287c86d2174149ebbf832724b554dfee07895edef2d0124fce4119 SHA512 dcc216145cb8b4e3f7dd9199033e5dae2b76efb09b77d88c4d71474e21ec0e94bc69d9da0fe34f1f0add6a11ff0692c2c3c6ce99d5aeb1e6e9eb91285b4929d8
-EBUILD ruby-poppler-3.3.6.ebuild 810 BLAKE2B 453860cddf821f0435b844db09760e5ec5b3f284fa7e58b5e9f973e0f570982dddc447209d2b293cc5472a86c0598b5e21ccecae12d6ed0d7b2f97841dced39f SHA512 18ba58fcecab5398ec48b01cbec4d47a4221a7cbede92517c2414df4a8a700eaf4cd9d38a6a398d0217965bb3c6b5f32dd382d394d7de5df5d6a05ac25e959e8
-EBUILD ruby-poppler-3.3.7.ebuild 817 BLAKE2B 9f2713edca9a33555fe7171fc962667dc5f472a6146b986cd5789156b5a65eb8d056de34d2e5e83e43881ee412f57120fb68c3f65c870e59a821a002b9e885cf SHA512 3ff8dee801ad2fd396149dde6a9aea45358ee870cb58f78c4e6061d13bd1777c1163110a3a3c3d6a4bb4bdbcc510522930cddc5df9b6caee452292aed8765328
-EBUILD ruby-poppler-3.4.3.ebuild 438 BLAKE2B b4139b04473878621bbd4317c632a70c99ab1f0edd54e742d34e097f3b8a5f2c75cbba67da61b092ae4ce6a228bab589bdeb5d165c7211b1cd02a6995bf1b867 SHA512 80ec7843fbb70f38d84f5013526b006d7b70ee3c0129c6321a66d0dba3957b8bbb957fbd78289ee384e52861b26bf9e8a4404efe7ca53b1e3491387911776f37
+EBUILD ruby-poppler-3.4.3.ebuild 437 BLAKE2B 47f607da6c1da633ccaa5894096de4c44cc067470e4447a8842df93415cfdf5beb4175d61416398c9103915feda974d657eb4e6ffb17e6277c246430be7a751f SHA512 ac96fdd59582b3a1fbfd2a28a67f2b6d964cce7a22973de5a6fc43a662a14bec7c1229e8c8a615af5c568d45461d75a2cf3d268db327172dfe394d90c58aaece
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.2.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.2.ebuild
deleted file mode 100644
index bc9f056fbe6d..000000000000
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" app-text/poppler[cairo]"
-DEPEND+=" app-text/poppler[cairo]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/if have_make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests downloading a test PDF directly.
-	rm -f test/test_{annotation,document,page}.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild
deleted file mode 100644
index ed0b2a50186b..000000000000
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" app-text/poppler[cairo]"
-DEPEND+=" app-text/poppler[cairo]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/if have_make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests downloading a test PDF directly.
-	rm -f test/test_{annotation,document,page}.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
deleted file mode 100644
index 681c77dd5d37..000000000000
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" app-text/poppler[cairo]"
-DEPEND+=" app-text/poppler[cairo]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/if have_make/,/^    end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests downloading a test PDF directly.
-	rm -f test/test_{annotation,document,page}.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
index 6d6ee1d4e51f..02da7ae88f9f 100644
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND+=" app-text/poppler[cairo,introspection]"
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index e94a83ba78c6..7462d96f7c9a 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-rsvg-3.3.2.ebuild 1026 BLAKE2B 9e47b4c0014bc754f75f39ab5eb82eff2104c679e9dc191a54410a744ff9d83019d2c96008bbb477e82c4360a60e5601aa7c50151aaa881cd59032db050eebb6 SHA512 4a114d3cb4b9c25ce570e364a319e2e513046451c7cf2f497903c7da30d66180b5deafa151c67fb4d8829f616e67cdf7d1b2716b9f1018f008d25f96f3830e0f
-EBUILD ruby-rsvg-3.3.6.ebuild 1020 BLAKE2B 21f727dfe81b014b2d10bcaad1142267d87a7d372526ee8f106334f45ef8dc8a5d10188e8fe3982c11513d09554a6c3d6e484f1fb59794c07fef2ec3d3e3cd76 SHA512 a4f7ad1698d437c2c5044168f1ef4d9ae8ca0b098b63ad1544099cde73f03d189053a2b4e1ba52282d513b0db3d9f445f1e6e513281ea9dcbbbc842dfd74393b
-EBUILD ruby-rsvg-3.3.7.ebuild 1020 BLAKE2B 21f727dfe81b014b2d10bcaad1142267d87a7d372526ee8f106334f45ef8dc8a5d10188e8fe3982c11513d09554a6c3d6e484f1fb59794c07fef2ec3d3e3cd76 SHA512 a4f7ad1698d437c2c5044168f1ef4d9ae8ca0b098b63ad1544099cde73f03d189053a2b4e1ba52282d513b0db3d9f445f1e6e513281ea9dcbbbc842dfd74393b
-EBUILD ruby-rsvg-3.4.3.ebuild 644 BLAKE2B 8e8dc2dfa3ae2bcbed4bb061e8f803e117074730c351e9525f099c94d288c1669683a525fdadd8970b3f31f1ab010704c9712f409f6ab49e2d6c91e33b36e5d5 SHA512 caabcec76ae53f7bf8ea83a52a6a55c5616ce8035d053c0b14b8af1a5151156e5c0fbc779a5fbfb24e619012df6a4ed3e8315688930c668cb5524a3f20b69466
+EBUILD ruby-rsvg-3.4.3.ebuild 643 BLAKE2B d3a662fea5317cab4c172f871ea9c8e05bb74be70f217925893bb7879b5977392f7da466ddd4014c03e21f37bb88b0e7ecd3c875f3cbb7ef412b440f0bad3450 SHA512 12f3ca1d16e79d8790eaacf97ec2de2d0f3a8474b0bf5c121387fec2ace684e096efa210720df51af8e3a8197b4e46b2191cd49f50c8bf8accdcb3e9bd4669ff
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.2.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.2.ebuild
deleted file mode 100644
index fb6f57589d74..000000000000
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME=rsvg2
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/rsvg2
-
-DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="amd64 ~ppc ~x86"
-
-RDEPEND+=" >=gnome-base/librsvg-2.16.1"
-DEPEND+=" >=gnome-base/librsvg-2.16.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid test that fails and may be version-specific
-	sed -i -e '/test_unlimited/aomit "version specific?"' test/test-handle.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild
deleted file mode 100644
index 43cb3c718d48..000000000000
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME=rsvg2
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/rsvg2
-
-DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND+=" >=gnome-base/librsvg-2.16.1"
-DEPEND+=" >=gnome-base/librsvg-2.16.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid test that fails and may be version-specific
-	sed -i -e '/test_unlimited/aomit "version specific?"' test/test-handle.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.7.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.7.ebuild
deleted file mode 100644
index 43cb3c718d48..000000000000
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME=rsvg2
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome2-all-${PV}/rsvg2
-
-DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND+=" >=gnome-base/librsvg-2.16.1"
-DEPEND+=" >=gnome-base/librsvg-2.16.1"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid test that fails and may be version-specific
-	sed -i -e '/test_unlimited/aomit "version specific?"' test/test-handle.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild
index 3f5bdf446216..b08e2854aefd 100644
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-3.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 @@ inherit ruby-ng-gnome2
 RUBY_S=ruby-gnome-${PV}/rsvg2
 
 DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND+=" >=gnome-base/librsvg-2.16.1[introspection]"
 
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index b4d56e3e32cd..261ec8792e0a 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-vte-3.3.2.ebuild 530 BLAKE2B 97f41c336e9de696a235a86ee9cf2a7bea1381ee11de8bcdacb68e838ba24bdbd871de2880565fe587ab8211657f6dc28b752361609b00ce29254488cf91efc5 SHA512 f7c655e38ed6c486357f748542362d8cf988218e3ea7653b2f152a0a867dc728cba70001e25875090936c740d0123aed95ee860cba2b30ec7bdc374f750f1f87
-EBUILD ruby-vte-3.3.6.ebuild 517 BLAKE2B 73ac599865087afcd9b3044150fdc4a85eba6582884932cf4ce6cb2484ccbebd6d17be80223b926b462ac4b8b81097f02726476f6098c5eea14b857b559799e6 SHA512 32481dd3d8842593725c0a461fefbf6cd38902f8dab9ebe68cfb8f00f796819ae025e87d525f263dda48b86562ef28f472c70f55ab9d0016c32365fc934f1a5b
-EBUILD ruby-vte-3.3.7.ebuild 517 BLAKE2B 73ac599865087afcd9b3044150fdc4a85eba6582884932cf4ce6cb2484ccbebd6d17be80223b926b462ac4b8b81097f02726476f6098c5eea14b857b559799e6 SHA512 32481dd3d8842593725c0a461fefbf6cd38902f8dab9ebe68cfb8f00f796819ae025e87d525f263dda48b86562ef28f472c70f55ab9d0016c32365fc934f1a5b
-EBUILD ruby-vte-3.4.3.ebuild 483 BLAKE2B 7945f2e4a5a1febe07ee0ce9c6b5218b4e34d1bf2014512411de62f724687ea5c0167ed69b300915e77b3e095dcf190d18268423aefb1817a3078a4e01b1fad7 SHA512 a28c0b3cfa52e1c238d9089c0427a09d807ff05aebcadfe7c91f23dee5aeb0ddd06357503ed8c2b7f595c747c4c586921cbcc865c4e46b38c58d553793411b6b
+EBUILD ruby-vte-3.4.3.ebuild 482 BLAKE2B adff6ac88ae2caabe072d7171765b62163ef97c70575407a4ac1c84448c17ba770278e27fa501d102fc6b7bc702c1adb7e2b5381063541809c70edb40a8443ed SHA512 6553e852784eae9c638be8f4b314d8b066cfe5e76a5965b4f96bac9092029a3573e8c6d3595c0e2d05e69ac3ce33a89de42cdc25c396009c50706ec6e093f9e9
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.3.2.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.3.2.ebuild
deleted file mode 100644
index 9441905dca85..000000000000
--- a/dev-ruby/ruby-vte/ruby-vte-3.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby vte bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" >=x11-libs/vte-0.12.1:0"
-DEPEND+=" >=x11-libs/vte-0.12.1:0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-}
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild
deleted file mode 100644
index 488b02382616..000000000000
--- a/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby vte bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" >=x11-libs/vte-0.12.1:0"
-DEPEND+=" >=x11-libs/vte-0.12.1:0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-}
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild
deleted file mode 100644
index 488b02382616..000000000000
--- a/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby vte bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" >=x11-libs/vte-0.12.1:0"
-DEPEND+=" >=x11-libs/vte-0.12.1:0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-}
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild
index edbbd7d5ef4d..ef669ac0b306 100644
--- a/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild
+++ b/dev-ruby/ruby-vte/ruby-vte-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby vte bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/glib
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
index 292292eeb8ad..92724eb5c584 100644
--- a/dev-ruby/ruby-vte3/Manifest
+++ b/dev-ruby/ruby-vte3/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-vte3-3.3.2.ebuild 739 BLAKE2B 65f5525b3dcd7b63716853be32146ad2d1dc8ad8f34c2c97fa99ab887da27a0f5b2b3babe3930b65393502074594dbaef2e3a0a6fd508f4d13d560d47f70b622 SHA512 01f07583dc50ccf7ed659800787cf8e89523d2d0ff916dfe9c51e5fe09d56d19cbb4940eaffe7f3384a0d6774d1c9fd9a88222ff918ea638a48a52cad10901a4
-EBUILD ruby-vte3-3.3.6.ebuild 733 BLAKE2B ed95ccb0e5d6669fd30d379bb1e8d8f9150b8a45279feb80a542d8591a7f570b2cc4b3b09ae6c94df6dcc0563366dba422befeb52993b594aebe8a9693b6c527 SHA512 e1d08e7249c1576923954aa0ca2b7db6f57ecfc076c678a37e5477b2b5be49c977fcbd4325a99a0fa1138c0070f75d76181d2d1c9318b589365847543df6bfa3
-EBUILD ruby-vte3-3.3.7.ebuild 733 BLAKE2B ed95ccb0e5d6669fd30d379bb1e8d8f9150b8a45279feb80a542d8591a7f570b2cc4b3b09ae6c94df6dcc0563366dba422befeb52993b594aebe8a9693b6c527 SHA512 e1d08e7249c1576923954aa0ca2b7db6f57ecfc076c678a37e5477b2b5be49c977fcbd4325a99a0fa1138c0070f75d76181d2d1c9318b589365847543df6bfa3
-EBUILD ruby-vte3-3.4.3.ebuild 601 BLAKE2B 9be16fb3d642635f84fd4569ed0eea974d13129c1b61469d3e6f015bc7709b71586ae09b6706fd4e59ba83b29af63af4dea15d6bf7643a1fa575ed2739f17d18 SHA512 e225d28254d387aa7e894000e8b2d83bc081c8f367158df4b7e77295e7afec4e22b345f85b1b1424612ffb235e6c3331b863071682e5fb539d13eb4fe327b5dc
+EBUILD ruby-vte3-3.4.3.ebuild 600 BLAKE2B ef91d0e21c2666e549e65751a669b6680bf1a8ffbabf589addd77acca6431c3e03565ee33dd6d9e3b3ddca1bd8909ca64df99df7a7233c58bf26a801d17cb927 SHA512 4f3131a137ef32c6db0837354b5a2b70fa9935c9113d4b13b75bbd8165ea0a9baa772bb1a8dc4aea440da7cd1294824301242df416104c577789bae2c18ad0d1
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.3.2.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.3.2.ebuild
deleted file mode 100644
index ac893359dde7..000000000000
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby VTE bindings for use with GTK3"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/vte:2.91"
-RDEPEND+=" x11-libs/vte:2.91"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests that require a real pty.
-	rm -f test/test-pty.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild
deleted file mode 100644
index 4595f62e9fb8..000000000000
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild
+++ /dev/null
@@ -1,40 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby VTE bindings for use with GTK3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/vte:2.91"
-RDEPEND+=" x11-libs/vte:2.91"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests that require a real pty.
-	rm -f test/test-pty.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild
deleted file mode 100644
index 4595f62e9fb8..000000000000
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild
+++ /dev/null
@@ -1,40 +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"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby VTE bindings for use with GTK3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/vte:2.91"
-RDEPEND+=" x11-libs/vte:2.91"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests that require a real pty.
-	rm -f test/test-pty.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild
index 9f749f1f3375..46b5feb2c6fc 100644
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby VTE bindings for use with GTK3"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/vte:2.91[introspection]"
diff --git a/dev-ruby/ruby-webkit2-gtk/Manifest b/dev-ruby/ruby-webkit2-gtk/Manifest
index 22a836850f2b..818222618e4b 100644
--- a/dev-ruby/ruby-webkit2-gtk/Manifest
+++ b/dev-ruby/ruby-webkit2-gtk/Manifest
@@ -1,9 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
-DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
-EBUILD ruby-webkit2-gtk-3.3.2.ebuild 980 BLAKE2B dc7a0f3f5ed23afd317a1568b3f3c59c5ac65e5bb187d22a8279f7399f21f2e6cbb763ecadf2825cf018beb387ba46f0164e2ab00abc18f7cbd380f85417e5da SHA512 3702c9075b1db9a5db1fa5eccb7c0883401e0cff775ae58ae47b2ff42ff3cd53c70a83260470434fbc4b83c84af078dcc7d9bf748bf9e542047d008d6db8f84b
-EBUILD ruby-webkit2-gtk-3.3.6.ebuild 974 BLAKE2B 2de494f299322e692bd20a7cfb0908ed1175487d142b2ee98095e8640971c531829cbeae9cc1b2ce3d744f90b08f4cbc2d91bd977bff6fdaf6987f17b4eb2e36 SHA512 b9a8c6d32e8071df232299e246abe438a2aa6899ffa0bf14df6853820c116370b9875bec7af24d9375c16fbfbd75857b37fdb7064b2dc3c4617bf99e58cd29ae
-EBUILD ruby-webkit2-gtk-3.3.7.ebuild 974 BLAKE2B 2de494f299322e692bd20a7cfb0908ed1175487d142b2ee98095e8640971c531829cbeae9cc1b2ce3d744f90b08f4cbc2d91bd977bff6fdaf6987f17b4eb2e36 SHA512 b9a8c6d32e8071df232299e246abe438a2aa6899ffa0bf14df6853820c116370b9875bec7af24d9375c16fbfbd75857b37fdb7064b2dc3c4617bf99e58cd29ae
-EBUILD ruby-webkit2-gtk-3.4.3.ebuild 530 BLAKE2B e68d17ba39c078232302508b8b0a713e1409752973ff7edd4e78d0b4eb678460e49d9f0dadd95a4ad062cd9b4af89e44dc5f61f2ee90ef4b576f10f7f78fdb03 SHA512 d015097443bd3097f93ef61c4edf48708eabf8b249636c7f01cfbe8e7bdb5f7fc877a0381cd029a58fdbdaecb04d6b7009894b3584acae6e7e9b48914967f9f2
+EBUILD ruby-webkit2-gtk-3.4.3.ebuild 529 BLAKE2B f6b9314f01bdd6c54d53b3a09b9e8bd2b23961bc916228784219be02e151bc33d1b4ae69e3db30758d04a2eb9dfa9ccc0dadde7244bd4093c76ccf12a6ac73b7 SHA512 75b3f7cac0dfaf0d3360e7c216cea76bdc4bdbb4f13856e104bc42aa96f0d8e15b142538ce2e547e2adeae01d3b89603902fb7707d753919831e7dad8392fa81
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild
deleted file mode 100644
index 21fa90dab899..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND+=" net-libs/webkit-gtk:4"
-RDEPEND+=" net-libs/webkit-gtk:4"
-
-RUBY_S="ruby-gnome2-all-${PV}/webkit2-gtk"
-
-ruby_add_rdepend "~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/webkit2-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/"Makefile"/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild
deleted file mode 100644
index a3d34084e23e..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" net-libs/webkit-gtk:4"
-RDEPEND+=" net-libs/webkit-gtk:4"
-
-RUBY_S="ruby-gnome2-all-${PV}/webkit2-gtk"
-
-ruby_add_rdepend "~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/webkit2-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/"Makefile"/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild
deleted file mode 100644
index a3d34084e23e..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" net-libs/webkit-gtk:4"
-RDEPEND+=" net-libs/webkit-gtk:4"
-
-RUBY_S="ruby-gnome2-all-${PV}/webkit2-gtk"
-
-ruby_add_rdepend "~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/webkit2-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/"Makefile"/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_configure() {
-	:
-}
-
-each_ruby_compile() {
-	:
-}
-
-each_ruby_test() {
-	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb
-}
-
-each_ruby_install() {
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild
index dc8ed95d6682..4045df88ac7c 100644
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild
+++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.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
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit virtualx ruby-ng-gnome2
 
 DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND+=" net-libs/webkit-gtk:4[introspection]"
diff --git a/dev-ruby/ruby-wnck3/Manifest b/dev-ruby/ruby-wnck3/Manifest
index 7dfc6ede5906..90cec4528102 100644
--- a/dev-ruby/ruby-wnck3/Manifest
+++ b/dev-ruby/ruby-wnck3/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-wnck3-3.4.3.ebuild 416 BLAKE2B 1e370357a60baa31039e254d5505276265ae86908156563f09f3aee1c6f38586108f7f64315d496c5ef5892111f8cbfa518766bdcd396a554607535d7ddbf58d SHA512 f04dc18bfb9c8ad7c125cc94f8eaf27ef28ab6c85ba6b5197e41b0854475ea509747028f1facacced6613f563c395b7be633a0ad453de02b2a8db0385037285f
+EBUILD ruby-wnck3-3.4.3.ebuild 415 BLAKE2B 5dba372c62c1296defa8b6d3f97603aef46ab543cd2762e6f915c8a559cd396d91f00f0456fb5d3241b9bea016e2e60ef251ee505beacea7dc4ed1cbbe4207a7 SHA512 c35330788b1d8ace593f54753bff5fadc8828eac85e026f71f8094854554f34503b224d85c4af2ab0891db8729b712b275a2417497d426a7e0340c94c1f2e1a2
 MISC metadata.xml 337 BLAKE2B 6db7555351891e2a06883ad8738ad2ec3c9b665f7aee1d2e2d88012af4cfc5010fc57ee5dc514d12e6eff8211eef826b800ef79464d3714bcb9d4f473cfb97ce SHA512 767011adae026ec8de76a1485e112929dc96779a579229f0d3c44a5bc640c196c5fb9ee3a3b6badd7d464f17ff3cbb6ba79080198814091d9a2e29175123045e
diff --git a/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild b/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild
index cb328878bbba..a7f27c24650f 100644
--- a/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild
+++ b/dev-ruby/ruby-wnck3/ruby-wnck3-3.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
@@ -9,7 +9,7 @@ RUBY_GNOME2_NEED_VIRTX=yes
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby libwnck 3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" x11-libs/libwnck:3[introspection]"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index e316ef27c315..3b3fd9b9209c 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -3,4 +3,4 @@ DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828
 EBUILD selenium-webdriver-3.142.6.ebuild 914 BLAKE2B 0d9273090a43a66c935e7e8d0844e910a68b5756f6f7d67f46786520b15dfdcdd33e6682a17a86c2c72721a85002364141efbbae2222334ea4e4978fb516315b SHA512 5e19bde871553bcd9c45207dbf6030c25ba1370cc32361f12286cccd13ed7de7e659aea31f2d817a76f072867f3eababf6634cd5c78a984f5271e70ab3aca531
 EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
 EBUILD selenium-webdriver-3.142.7.ebuild 922 BLAKE2B b41dedf18bc905f1b30edb8396f005255331694a8fb064d4c966671c0031525b7d5c13166baa57c5346b3af5a578d5a38ffb23f2dffeb2d3e83234aa4ca8949f SHA512 92405c0e556374d125de5025731ae09ab988ba8658fd47d14c457b601185e3552f13cf266af280bbd4905c41e37c816fd366139859d67c3f302baa1808228faa
-MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
+MISC metadata.xml 335 BLAKE2B 8ef78917e56590730261a00ee72b35e28e5f21b9327d0cd48723d10e31797986ea713b46380165708c999836c6d2f612703c08008ad85f652ecf9ad4f22e8549 SHA512 6ff71435a48b67cf35a3dad502a8e62f9dc437e096b91dc09cdc2e0487b39e2260e67ef968b91970a2609f99eee6adfe42932c42aaee382a617fb3be06b74c15
diff --git a/dev-ruby/selenium-webdriver/metadata.xml b/dev-ruby/selenium-webdriver/metadata.xml
index fbb8f9f34fa8..7f21b71e867b 100644
--- a/dev-ruby/selenium-webdriver/metadata.xml
+++ b/dev-ruby/selenium-webdriver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/sshkey/Manifest b/dev-ruby/sshkey/Manifest
index 33904fddbd3f..70efe378ef67 100644
--- a/dev-ruby/sshkey/Manifest
+++ b/dev-ruby/sshkey/Manifest
@@ -1,3 +1,3 @@
 DIST sshkey-2.0.0.gem 26112 BLAKE2B 19fb790d4eba7f57e96b57d838fb6736857b9394f678d37f4577a1794b6d7f901fe35165616c317add04d470a301ab79b55e39d64ef93b566d4c1f628a74fe22 SHA512 dfd56a8b3b4f6abe785f37b5e1a4a61799c704a864821c35beaa6ddcec51b2f9f0111ef945fdacac685cbe6141e7ce2ad0c9bae8fa4cf8a8d48354701a0e5d05
 EBUILD sshkey-2.0.0.ebuild 376 BLAKE2B f4872c96f459ba7aecc7695b526c9f1755585dbaee13c323fc7801858274105374ded3c4c23881335622a1bc0585f4c636ce908e53b88f2688a5f915acd9f000 SHA512 e6c70a634f729ee5d06c4ae8152bdd4240220ececcf586ea675a9e083aaf4dcd62fed05104014840289169a51c0189e8767e1b5832660248e6a0b36f7820266a
-MISC metadata.xml 385 BLAKE2B fbc4e3d95d9b9daf6730d746905abb421dae2ecfd755ccd8f27ea57c295edb4efa6bfe61fe1b404341a76851d3b6802ae748485b30c3275d408900ebf164ce1a SHA512 74b48960f9e2ce4390ab3919d3f0334a5633995dc437613ca2ed13e3f2de8f0e76fc79cbc5f5c8b1526976e72ce3abe9eb1bc44ca4c1721500e14ee27f63a39c
+MISC metadata.xml 385 BLAKE2B f115becafcfd7bc4414798be83dbcd6c3f7bc9dffa11b54d8318b815dd54038f329481f36a65cb3299ba7fa6a0fb945db119c1f1c40d22f0efc99596782cb91d SHA512 4b65cc677f2c724a74c418bb1ff9a899f235d30b54f81d7c6f03e6faf28572accbbdbe9c6b48c7af6d0e777dd6271488a113c1d2f6fb95157aabd70e858e9885
diff --git a/dev-ruby/sshkey/metadata.xml b/dev-ruby/sshkey/metadata.xml
index 22ca2dfdb17d..e4590273fcfd 100644
--- a/dev-ruby/sshkey/metadata.xml
+++ b/dev-ruby/sshkey/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index 57ae3c49b91e..7abd4d0b6325 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,3 +1,5 @@
 DIST syslogger-1.6.5.gem 11776 BLAKE2B dec37278ea109dba53c44a5c285962d78890ed972f1cd14789435b8bb3b922c7a3fc7b18238ee9aa239143453be3d6f73eea6c62d0bb83eb7a8901225ff2e49c SHA512 60dc7be93092196d68d154cfdf90a3393c9883ceaff35640bd0c0dda01f692953c7d1d8243d7b9327990a368d320c474af1711ba33a6b69381f56030800cc297
+DIST syslogger-1.6.6.gem 13824 BLAKE2B c70c8e727ac9f4754a42cd3be27eaa2ad19e5ec61745433a8654fd495736a72b5242242fc663b1d4d995164c42d4ea5bf3a15edeb6711abf6f69663ce6918496 SHA512 23947699de94c6bbca4a7ca4df52e9fb9ad06fa29e29f406255369728971007bb78ec4aa1748fec123658b0202e98dd6500649092456a9f579db30acbe04c42d
 EBUILD syslogger-1.6.5.ebuild 657 BLAKE2B 84f7b923c652c8c769c0f44fae5e3169b4d1d266dffdb9abdd110b5b65fcbf6cdb647adecd78b4b26ecf4b62e9bca7e34a53f0a99260c2e175d125f985ba054a SHA512 5f8706d00a6fd05ea1b6112333819009f0ab381b118a2e96fb8b6c41fcfc33f268d6e4c428d72b4104f5611ecf11bfb080f447f2cebc07e064f9d7ad67610933
+EBUILD syslogger-1.6.6-r1.ebuild 693 BLAKE2B cb9aa2ca266c616e2b424cb41037b2281106305e04ecbc5490aadddeccaba519b8454b555c3160c884c4434a274af14a27f452597a4b27f33b4984137477a27d SHA512 7afed95ff06efa67e647324ad480ef8b8979539693edab8dbffe34974205003f61c3f2a629317461a4977eab5eca0478750a1a95bc882a983cd227143de594f8
 MISC metadata.xml 341 BLAKE2B 54755e425199abb421469b9848f48a06de0e3e6a1d6a17a1e8f139a4c71fdad50f0f28e0aed181ec0af406713d83a4bfb7c61ac80484d167d18abc4cf4cf6925 SHA512 b3bd5651096851bd53bb83cfc11d74c10686b6e74cf8636c43c3dcbde677a924623f7929ba3c25d8483d42bcbd2524c35673dac328257b6e1400e6d62810dd8b
diff --git a/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild b/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..cf6087fe7a10
--- /dev/null
+++ b/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# if ever needed
+#GITHUB_USER="crohr"
+#GITHUB_PROJECT="${PN}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
+HOMEPAGE="https://github.com/crohr/syslogger"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activejob )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index fee619b37da3..68e689eccc33 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,3 +1,3 @@
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
 EBUILD test-unit-rr-1.0.5.ebuild 575 BLAKE2B 46286c0559285322b081be66a43823b3eec7a544bd2ac2f27b950e9b19f26c32a2bf05b6fc3d57254c32828a79cf537f4c8c3b6d8a43f0139aaba700988d593a SHA512 7e8f2e9f9a1d69fd465159d4f18628431bcf6760e200debfb04c30d08a27b34c677444299970338a9e99ac53e7f500cf657294cf5c1cfa011f2360523789a8bf
-MISC metadata.xml 338 BLAKE2B 85bc12a3d50f4734ae4d5188230046205dda2e902291ea368f79a75cdc183f38329fff34b04e3b0455fc8c318c1f3cd3175a596bf93a40338f02ddc71ab7049d SHA512 4bd0e95ac4f05d5671716f6b416de5436728297faae0a32c0d2a4e0ee977066a77f70991de74d8dfe4627a13adecf50683265332023af423e4003250adaa22eb
+MISC metadata.xml 338 BLAKE2B 27f664f9d84efb5173632672773cacd3e695ddf8451b96eb953b2b37f468492f344f12b76876f7f772dddd4d59b1d17d567ec87f22044425c809eaade8cb20b6 SHA512 ebd55294301383173e6b722212d90ee9c1a339c3a02ec77e434cfd8a7260360759daf4dac8bc69d3f419069c69b92a49e85dcc7f0c1927a3f2f997f9c93af9ef
diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 29ae378d02c1..53153fc20997 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 760da12e7726..4b9cee68466e 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,6 +1,8 @@
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
 DIST thor-git-1.0.1.tgz 96670 BLAKE2B db7e10a31e7de14441f26e3b5f1574200a3e7f86475ee68e6a18800c6894a5a949c156d54c2be44c1a4a79136a6d93f2416ac616aa77b296997f6b518c101799 SHA512 cd0c6e3833976b27f9d23d69f261d4457ab99bb52eb5e7121b92c53aedd6bd953616215ba01b8b931c86e9cd22b944415810230d0e868c95dc9ef712f05f99d3
+DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
 EBUILD thor-0.20.3-r1.ebuild 1436 BLAKE2B bd76a7a658afdff2e6a60ceb5be8ab977eb1b67f4825e86d216c0d39c726445c72b00491c338c8a4604f8bb933e11d60228abc2d4f2a4328cd9d5df879676663 SHA512 bfdd0f4c287a8376afb4bc661ca56c7773a7d3edaa0ff443bfdab53913944813bb2f25ee60b96eda9cb9256675bd80e2ceccd436040a4f1c1b35bd9e12b84944
 EBUILD thor-0.20.3.ebuild 1440 BLAKE2B 905f7bd1cd95ff41fd11e1df498063595634b75a368610521b7965470d1039654d39023f8301e5f3a9d196a48473f9898532227f584d311c95948a19781046e0 SHA512 515bc470d08ba459e00c8ec1f605090fed982132b29dccef1834159145542381d08e3101e625cee46bb864e26be3151a1586f5a41d26eac635b55e8f961802a9
 EBUILD thor-1.0.1.ebuild 1585 BLAKE2B a230df8fc7a52de052611cd2f8816e4b4eb008867dc827ce0f89435daeba85a4903fb6900ce395682df834b28f0dd8112be8adf4e2cacdbb69d4925a4f193b79 SHA512 dfba72978896b7983cec71fc386d39788c363b58df008170aad15e52fdff7c2832a47ad3d382f6a178ef0c6d473e8734787b4d9fe6b596a961889a7a5f97b407
+EBUILD thor-1.1.0.ebuild 1718 BLAKE2B 687c7121aaa702a62f4bc12cd6f34cd98a0d667aa8e9bc58837ec8cbce4ef777a0bc03640aa7fab838b6e7fb84835c0617efa4dde6a421f2a2c2b1162201628e SHA512 8bef0eca6d5e5a08146b3fa9e1539b5b537dfac1b374deb13ef7177d5b3a68ff3b02ff31115d507f4327fe1e9aeafb77cb2a0e9f0dcf2fb771712c137453c161
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-1.1.0.ebuild b/dev-ruby/thor/thor-1.1.0.ebuild
new file mode 100644
index 000000000000..db53dd7fc80b
--- /dev/null
+++ b/dev-ruby/thor/thor-1.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A scripting framework that replaces rake and sake"
+HOMEPAGE="http://whatisthor.com/"
+
+SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby30)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index d3ab8e42aa2d..c9589002fa3a 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,7 +1,9 @@
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
 DIST timecop-0.9.2.gem 17408 BLAKE2B defe09d5ed0a8eae143b17249502ccd2d2c022147f2e579ced45c3497424d66a420b30c11a1e00e321b5f2772c8bc5cd157a5875f8b66e5d102ac84423975dcf SHA512 d54b87c0a9a711e8c287ebd55083a6f87e31d587fbeebbc892a3e76c7d57fe0926e411dfedd0b5edcd357d995b4a6e7b57eef778a8e380a6675497988f97b29d
 DIST timecop-0.9.3.gem 16896 BLAKE2B 4b021e9a3bd0ca5e35e11dfbfe95a81689c7441315d94857de65bf4708f48f3f62eb768af7d22338edd3c283a22fa784b389979ec8474abffcb599eefb76d639 SHA512 6d6e43ac2e52a049179560fae75a37eefdfde3286aa2fb415fd553af1891427ad56babba91a36e743c8e5e0d915077348152c1e6f518483cfaa20a677db05d45
+DIST timecop-0.9.4.gem 16896 BLAKE2B a8280726c8c46573eb0bc72af7b8c6f64ba4a3898a8089eb44c09bc4f53c2c6c51364784aa332c55a45d9c8f93ab9fd3b7691020f8a58f48056cf3673429abf7 SHA512 3d5f611d9a4ba9bc21f01c8096c97892cb05d6effb26f03703a0db842fe18f9614fca3cc836a1583dd5ebbd0d50d4115acf348b7b8b78d93010aaa48b168b9cf
 EBUILD timecop-0.9.1.ebuild 987 BLAKE2B c83c2a13a095bd302e6fa8d8892f8f09a95b331ee1a8e09dc6fc908da1b58c3935dff73da1a5de452b8d68d497a054b4f901a7b141e2d10373f720a7df414ce9 SHA512 6adc405deb61fe1113946b1a89b69404c2e4232cb0663ac66319202fb8a861e7886f93f922bc43b5ebd5514cb5ca8f55f71e4c60801336c17b75d55b776eb21f
 EBUILD timecop-0.9.2.ebuild 987 BLAKE2B c508847e01b835fe7f711eda2c6af446f58b8c991dbeb5fe7cfc4bc386ca8a813feaf269eb02d2191da128e6f122b8f5192390c18655355b29a11b86ba109fdd SHA512 e6ec5e5b3ec4ffb378ce2aed83af45d0dec315ec201a6bb13f555360f05b600c029242aa9e3aac3a273b4fa3b5c22092630c1c75b4a24e51220db1398b1aa0a3
-EBUILD timecop-0.9.3.ebuild 987 BLAKE2B 5f8118740db06e722674587b3c2ea5fff770701d3b3679040c0fc81b5beed1489ce05173032c72e4ae2300cd3e153cd5af9ab6972731344d92df4f280f4270ac SHA512 d681e07dbb8e9c252f48cf80105268fc415264b0a3e3aeb42ca11663177ffc82f1ae54a5f522e828b45a530b352ed549884928d776476e4578b3d7d7c3703a11
+EBUILD timecop-0.9.3.ebuild 1012 BLAKE2B f8b228060dbaaa55fa7222cbc9a2133c8b9ed5d03c8b45ef49e17dc44c925f78c241b872be1a1205595ccf4aa6c56cc5d16ee8227c85a7f2cd7e18ba3684eec3 SHA512 c05ed7e3701dbec90f46539686f80130bdac5d35fb6a8bb48aecb7297e3511003f4940bd86c5bf6fa231bed4388d842a0e45b990a6a0c056fbc3af2cf1e1affe
+EBUILD timecop-0.9.4.ebuild 1012 BLAKE2B f8b228060dbaaa55fa7222cbc9a2133c8b9ed5d03c8b45ef49e17dc44c925f78c241b872be1a1205595ccf4aa6c56cc5d16ee8227c85a7f2cd7e18ba3684eec3 SHA512 c05ed7e3701dbec90f46539686f80130bdac5d35fb6a8bb48aecb7297e3511003f4940bd86c5bf6fa231bed4388d842a0e45b990a6a0c056fbc3af2cf1e1affe
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.9.3.ebuild b/dev-ruby/timecop/timecop-0.9.3.ebuild
index 3b1561933da5..b90d03bddd44 100644
--- a/dev-ruby/timecop/timecop-0.9.3.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
@@ -27,7 +27,7 @@ ruby_add_bdepend "test? ( dev-ruby/mocha )"
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
 	sed -i -e '/rubygems/ a\gem "test-unit"' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
 	# FIXME after activesupport gained ruby22 support
 	rm test/time_stack_item_test.rb || die
 }
diff --git a/dev-ruby/timecop/timecop-0.9.4.ebuild b/dev-ruby/timecop/timecop-0.9.4.ebuild
new file mode 100644
index 000000000000..b90d03bddd44
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Missing testdep activesupport
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+	# FIXME after activesupport gained ruby22 support
+	rm test/time_stack_item_test.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index d43d8361f1ee..911326519090 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -4,4 +4,4 @@ DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92
 EBUILD tty-color-0.4.3.ebuild 484 BLAKE2B ba416a8188443ed245feb6221a9f435069a65b438161e8300d08fc1e89e9b493ecc249589a186cbcaae053c35b4163aec73f827c01715bd03d49478c64eb8c3b SHA512 969675656462ec45b6dd49c488105bb7cf49e1a9b9ba5f1176b77062cffc44d89083637bccbf30cfd81f950ed59d8232512616c44c7a076c3a40f22503c7ec12
 EBUILD tty-color-0.5.2.ebuild 687 BLAKE2B 12658021e4a706497ac52515821e3453758c805b6ce2c6ec85d101a88e58ab48561bbc3764c745d982f3c3a7cebadf00a8a4dcce30aa900c5fd385805b5f9e50 SHA512 659dc635732228bf4b8d9e39ece4bee5c6a16d741589836e88337b291406550237aa53a90b58f84bde3faf82cb07c378d057928d3fce7c9d7038a7eb93aa065d
 EBUILD tty-color-0.6.0.ebuild 687 BLAKE2B 12658021e4a706497ac52515821e3453758c805b6ce2c6ec85d101a88e58ab48561bbc3764c745d982f3c3a7cebadf00a8a4dcce30aa900c5fd385805b5f9e50 SHA512 659dc635732228bf4b8d9e39ece4bee5c6a16d741589836e88337b291406550237aa53a90b58f84bde3faf82cb07c378d057928d3fce7c9d7038a7eb93aa065d
-MISC metadata.xml 337 BLAKE2B 65d689f4ae586a7f5eec89aa37ada3cf2d50858b0c206895f8f40e12f5ab642b82e25d140f80a3c546646ef6ef3d2030c5686b9e61a3775d7287b76e571aeb98 SHA512 1c18fad39587e39a56eb9f8627704924a152d4c6d6d66ac27822583d7d81096c4ec1b109a90d7b4b77ce5909cee3fd08c677ba01a2aff42e037c589532a16885
+MISC metadata.xml 337 BLAKE2B 0da0633a903a0e58597b8d73bb5ea564c6dc581191dcfd1311801e8e2c7cf399c6520095ac034a4d93b7938f57abaf098304a444d274432bd0ea1d497bd21003 SHA512 95fb8fed44f8a1ee5d26cd7fe2ab1f7117208a736b45e0d10e3d06f4b1174729ef3733efe2fc455fc398f17605c84c6cd050805578255073b2a1b64b483c082b
diff --git a/dev-ruby/tty-color/metadata.xml b/dev-ruby/tty-color/metadata.xml
index bb1d1133ed40..ce667eb5942c 100644
--- a/dev-ruby/tty-color/metadata.xml
+++ b/dev-ruby/tty-color/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-command/Manifest b/dev-ruby/tty-command/Manifest
index 27160b60bbc6..b56e635e1571 100644
--- a/dev-ruby/tty-command/Manifest
+++ b/dev-ruby/tty-command/Manifest
@@ -4,4 +4,4 @@ DIST tty-command-0.9.0.tar.gz 30463 BLAKE2B fc0436a80b4b73040a89f085315f50e464ef
 EBUILD tty-command-0.10.0.ebuild 717 BLAKE2B 2f73b05720fd1a712cead3132c7c7a23a41e47782fb239d25bf170f560810a11e2c439050f0ee4a85cd69c0a3f8c666b0ea7e470aa202c7ba16bd323160ce17c SHA512 b0c1c88ca136e4c4d408792a3fca7c8b677697eed0af2d4795f6c8180dc54fe7d0a2309d3a21ce2eeb92c5685e998d132211bfffdef2f83d189bb56b5dc8d82c
 EBUILD tty-command-0.10.1.ebuild 717 BLAKE2B 49546179989a39d53aadff5a809fcc49652876dc5267cb4167ae5f6a6d983ccfeca1969e40e19053e4a20f68db69310b5b260e7b1015c8bf3d95a15bd547fbd1 SHA512 fa1aace5caf0643f4ebb6d18b87de33351881d895ab9b85e952f9195f207d0169268ded5407c7d799c268328c98a00881894189a5440e8cbc7ee1488fcfb7d97
 EBUILD tty-command-0.9.0.ebuild 650 BLAKE2B ffcf3580c5547c80cbce0cda9f26aa8c169c712d00a1c6fa283fe19a8b977bc41bea18a800d1cdd701497e9e96d9a7c4299676eea45a1fe8690825ef8cc67e1c SHA512 d6fdd92c8a3ff6b4b291029d3130c0325ffc139e6144086cf829d7e60b39a452f550c63bb14564efab6b4ef1a91b4a3e0effc6e6cbcce9a17000088d8c497933
-MISC metadata.xml 339 BLAKE2B ee77cccbd6cbd65ca83cbca745047dd8ee4d0ec6e955cbc2238b0d403c9c65815ceda7737f70f05a6f01305639b13cb339509a03a7ccf93cde1c643850cc8472 SHA512 1d76e3ee88423ffcc2902c658e434afc2d6a42464f98a651a563441b76d5a236072f4324d7a2f7fe67e6061c6d4ae9cee00af26e1e7519d4ac428e07f11d3c03
+MISC metadata.xml 339 BLAKE2B 112fa64cd84b6ac9d81d1411f04775922722a1a5773ebfe28e97fb1b1f11b5b8042843261173490e71512dd0b9c91d3785df2cd876355c19f36ed7e61bea0cee SHA512 40a42bd979378639f3e6e5aba8eb988806b1329ea0da1c223eadf775051b59fd8922c98c46bc1ed40e518618ce03ad4f13415c8743dfcf50c8c994795fbec1d0
diff --git a/dev-ruby/tty-command/metadata.xml b/dev-ruby/tty-command/metadata.xml
index 9be0b27e3e08..e14385ebe45c 100644
--- a/dev-ruby/tty-command/metadata.xml
+++ b/dev-ruby/tty-command/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index edf58d915515..b14bc838883b 100644
--- a/dev-ruby/tty-cursor/Manifest
+++ b/dev-ruby/tty-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-cursor-0.7.1.tar.gz 11015 BLAKE2B 222602d7dd3ef2372555913dc59bdd4b4965ac5c3601268d0f77060835d4ae9bc9fa23d54f811e7c0a453b80786d4ef07e0bd26cc8d76f6b963787a04b17569b SHA512 7c1f664bfb3c8c46aab08cb3806b8a00d92b45195fae47e851967f88040cc64d598bdd80e37f782be83fa60dff82c607d93026ffbf003125fea8230f4e18639e
 EBUILD tty-cursor-0.7.1.ebuild 739 BLAKE2B d7b8b1f028a8cc742b8fa5039e757c6ae3bf6f8e1b475b84d4540c85547748a4f3677066df53663bd869c3879529e5e46f0c643a977ff40048cdd76d19bb3fbc SHA512 03f5817f4e0c00ee5379a616b6e074224926f6eaf51326454e7123b187b0bf56866664527eb034abbfdedd5fc22ec581d74d62533bef43df86ed0621f5c87f3c
-MISC metadata.xml 338 BLAKE2B 45f23e16fa65a93c490d600cf878a1ca15d22fc6ee4945a1fbb260e2534a3585bbb3eb4d483e3206aa9b3d4e555cd3c9fab1cf3f259e29f726c31395683fd2b6 SHA512 58e209eb6d1e1762dd409adcd4aefbc0afefcaeee160307d6ec02bf6c0c72b8dca516fdac1c6b8b65f33da43cd82cc01be38d76abe84ee22555b47d80f2fa9ba
+MISC metadata.xml 338 BLAKE2B bdac6bb02b0cae81856493016a56c9c3b3b0debe5ac10b6f6756d90efdfd417561daad174c3c5efbfc779a37953b2dd94f79b8e0205fd07b8a4ea78e713a92cd SHA512 ca2c7a398c08e9c8488f280a3fcb603bdc5ae678da282e7c194f958c3691272fcf07d0473b61e8bb4757cdc5f3825a9b12f061a02c96f24ccecc21abb5f8e9fc
diff --git a/dev-ruby/tty-cursor/metadata.xml b/dev-ruby/tty-cursor/metadata.xml
index 87a04500289e..858f91cbb864 100644
--- a/dev-ruby/tty-cursor/metadata.xml
+++ b/dev-ruby/tty-cursor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-file/Manifest b/dev-ruby/tty-file/Manifest
index 8a6bede8b9bf..38da2c9c7449 100644
--- a/dev-ruby/tty-file/Manifest
+++ b/dev-ruby/tty-file/Manifest
@@ -2,4 +2,4 @@ DIST tty-file-0.10.0.tar.gz 31033 BLAKE2B 6d91034fb9ff83f758b260b947a9556a4c4507
 DIST tty-file-0.7.0.tar.gz 26418 BLAKE2B d1fa189a5dc25a64f14e6a14e4c8e92504db262d2acd4f47ee96c1becc59a8ef7cbe18457a492583f9a5a7568dbbfe299b5b90b0ba607df09da3601ec23f8e2a SHA512 178b5da7ef4f265bc2a8203d68219e97b09746571cd485e738d79b6bf1c58e8ed85c5745dda6e094958a20bb75be6de87c4c16e8aaf807220e9ea36cf7a8aca1
 EBUILD tty-file-0.10.0.ebuild 849 BLAKE2B 53e6541e75b7f7cc45d6fb94b308946ebc38dadb008a9323717736b17bd835c42b926d8e11b9ec0c23f1e962856c07e27ee57ba2ec11661bd57ddcbdbae62594 SHA512 61268156469861f1b8b7564d2cea9df318608fb0ac208150029ef9ca879a7ac4a01ab18d927c1b0e24c715757259bf940cf68929555b18d977243a8e0a80b77b
 EBUILD tty-file-0.7.0.ebuild 821 BLAKE2B fe9282f2252807dce913c5f7f0241cd97548180c57a50e8042d128f91a6e5984b67e150494475cc88b4e52af813b743904b82d8d39885f5c428e54c06e3983bd SHA512 ab5f0fe83df5e2ee7d150464c4edb327b0cf37448b9ac79ebce6008ba8c2f40001481a7ef4d5044b86322e8a6c93ff85bafbc935156dc4cae3c1b33fc2b3ab0e
-MISC metadata.xml 336 BLAKE2B 3cddec486fe820d0ba9970ca04dec944c46777860df3c71d15f5b23806e1acb2c045f990252cc94ce22ea2d87f41b55bfd624d06abf110c3989c21170767e2cc SHA512 b1f1151d74a34055a86a4d815d6e593a0f6fa7a41f79b11cebb665759ad44001587488a585e21799dc5f1f81e5d0f846b61b5b7a4990fa2119774297bd53ef17
+MISC metadata.xml 336 BLAKE2B 74e467da979c1b012e1cb855cad291fb55c11e7aa508d5e9ad60f2f165e397b153c01fb12073a3557289fb64777debc6f100b3668452154d86f7449884572145 SHA512 1606edcef89afd54b19e7086977a77a70d1df55e49dd5028e6432287e9b0ffefca0b01d047d2d2c68ecf4d1a5595056ad0a699ff27eb084126d3c3b8bfea57af
diff --git a/dev-ruby/tty-file/metadata.xml b/dev-ruby/tty-file/metadata.xml
index 5d386b19e9f2..6fd3fdb485c4 100644
--- a/dev-ruby/tty-file/metadata.xml
+++ b/dev-ruby/tty-file/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-platform/Manifest b/dev-ruby/tty-platform/Manifest
index 4da419f7acba..28ce86256287 100644
--- a/dev-ruby/tty-platform/Manifest
+++ b/dev-ruby/tty-platform/Manifest
@@ -1,3 +1,3 @@
 DIST tty-platform-0.3.0.tar.gz 8768 BLAKE2B e4328ff961658906a81d409ffb775b9dc6363dd1ff24a05d98aafd8e85b4c304025d3fd7598f5d2884de9abf0f85dc8389105994d5b6757d96fcfe91041a357e SHA512 78ca0ce5f75bb387d5f79b8ce59603608501afdc1130e04dfb1f233325be5af8d99eb4ec08ec9848eb1d708434a8479484f36aafa9b7112ef02c51369bf75a00
 EBUILD tty-platform-0.3.0.ebuild 648 BLAKE2B 07767c65b3521f73fb1b6895ff2af0fa6160f6f1b277438a3e259b144fd2eb857d8c47339344396d7b34cb807b9a4590085533bf5292ccbdde052e9f0380b203 SHA512 da7affdb52186d8a9911446b2ae1d9698b710d47f674a763408e8201e2fa38985427684318f4efc3065438a390a18ffb7c32d7be321855712d30da8e7ab971b0
-MISC metadata.xml 340 BLAKE2B 3d8761d9cce3e2cadc0fb1f24c2e00d9eaf06b49629564a07c9440656cbb7a0761c8e1ff284f28da06798c1bd757fd14e833975c3688b5dcac13515ce1855be5 SHA512 7ac01d1fc12a66f2bdc9fd2e2c7471ed9e21bf28bbdb2d4e3c08139df0f672e8f5522db12cc1f23daa19d0a52918b66aab41d96ab245ba723b06c4d257a06ebb
+MISC metadata.xml 340 BLAKE2B 4c59f8d79bb4df560f5fa35a26b7e4cfe232834162855edd9a5194248fffae01cf37bdf97ed69d7e45f0633106ea573a7bab0b68759a87302d5a4f7ec140135f SHA512 4f167ac222abbcaaad7504caa5d77cf74153591611ce8d8d0625cbac32171bbde1598a664eaac285922ce7c8313f6a987cfa2ccf3ec650091dc94c929381e223
diff --git a/dev-ruby/tty-platform/metadata.xml b/dev-ruby/tty-platform/metadata.xml
index 8254c548c088..919a84c3fe8c 100644
--- a/dev-ruby/tty-platform/metadata.xml
+++ b/dev-ruby/tty-platform/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index 4f6a10c66ccd..5a47b07cfc10 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -6,4 +6,4 @@ EBUILD tty-prompt-0.20.0.ebuild 604 BLAKE2B 4ad825cdeb6c476bb1bfa23ba4519bce9270
 EBUILD tty-prompt-0.21.0.ebuild 783 BLAKE2B 9d318e9fc03df8a32db4cc5965f18de8fdb0763cb1af6fc27c809784d2a0a8af4dadd822d7f324f5946f57abe0e33eaa6886bed37eefba3aef11b38b1869b5b4 SHA512 81b63b91ed97e36ae060318992e1096da5fe5f022a2671614085a0b99818187530b5260b02db80ceff77c6b4b78de7fa0e88f84786d638c227519d28c74945b8
 EBUILD tty-prompt-0.22.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
 EBUILD tty-prompt-0.23.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
-MISC metadata.xml 338 BLAKE2B 6162c739121dfed6f95cefbcd4b187668bcc434678ed094b70d9963662ab44e263e357ed1c3ad51bde318509dd19dabb7e8acd26845bfc1bad1119d2a6c27964 SHA512 383567b446b991c346809d57da8c2dc269d5dee34abc0a7ec354942ac025fc868cd0d2b92ebb764d7d2aa8a4b0f86ecc5bf00c80619922cb694fe0e04445d12b
+MISC metadata.xml 338 BLAKE2B 8d0c948aefd302a8cbb6e42214b6173a4f8c0349875576c0210fa01dfa14f8574638305952feacf56ddfa087d773ee7465e5c9c19977701c5d6e5af65b5b1693 SHA512 bfbf88166ca6a7bbf39b9a0696d750cd2e75412f732a7a4267e604071e3c4bc28af3a5297cdee5b27bbeae18359710c9ec707f390fbba70e219e94e6803a6640
diff --git a/dev-ruby/tty-prompt/metadata.xml b/dev-ruby/tty-prompt/metadata.xml
index a2602b5574e6..e64d363bd14c 100644
--- a/dev-ruby/tty-prompt/metadata.xml
+++ b/dev-ruby/tty-prompt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index 07e4e57cf766..ecd6170a15c4 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -4,4 +4,4 @@ DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041
 EBUILD tty-reader-0.7.0.ebuild 621 BLAKE2B 26904268f5551e50bdc8eaa95fd1595b7cbf339a766bdb861d38b739a146d4398d1220c7e661c2c34a83d285d5b509a00d7ad447823fee4b3ad65acece56ba8b SHA512 4da0704f6cd24f89dfc470d940cc96fac7de135c24265b5aba0a87237d76cf14c4972f405031b55e7feccbffa184ddce25a0ed26b9f929d84e9354b2fefd5a6c
 EBUILD tty-reader-0.8.0.ebuild 836 BLAKE2B 4b5d75f0fa828ef4a7f74d15b74f56dd183a5d7da57e297e04bd76e80f5b58313289d57bc6c0936141b0d9c3951276e507b2edd94f1690ffd498dab123165bc6 SHA512 91b223490dd6265e52e24915633fa6357e97c6878382fb39e19ef5b99c1585cfcabf3903d7e083036c26b74856e2635eaedaea8bf52d197eeb689730b72b0843
 EBUILD tty-reader-0.9.0.ebuild 834 BLAKE2B 63728766089fcf45118c363c39c976f863dfe942a92856364e1781504f2642b0bdb9a84b6db2630e791fb3ac8db3a88dced7325437b6c06095d3d03cc927cfb6 SHA512 970d335a11b1f67a94d3b51c274479d3ae7d7e5af4584a568bc31c3a9cc8b67b7c44c903fa296fc7e3e045a1e4ebfe6d56ecff3789a162a7bc0359a2952d20d2
-MISC metadata.xml 338 BLAKE2B 5cfed8b0cc3f30ce5d673f1da4293c1f2e344bc494349abebfd50fbaaed54d86c406da141fc56baf44a405371a033ca003fe694f8e59f1ae75e7e3bf26ade54b SHA512 54f630052cc99d956cee1ea64f958780bcaeec22564531c0373f9f80ab0200dd36ba0c13fec2da032b90cbd198c1154aac4a474c1a38a6ec85847bb17775fa01
+MISC metadata.xml 338 BLAKE2B ec5b393631bf2e718fbae78e864f2e1a196b3612fdd306c9cd2dbb8e799a1022beb460aa144eb936d595658f89261ce62b774a81f09c9a2338f978d71302ab5c SHA512 abaac738d7e0f3576e26844c9b6315ed39dd3532816d2896d0c04464d7d80633b679d4579ad2059f7e3da5157a218fa977448fa0a7cc006d72652f7968f1c083
diff --git a/dev-ruby/tty-reader/metadata.xml b/dev-ruby/tty-reader/metadata.xml
index 06cd02994117..a4b2369e12f7 100644
--- a/dev-ruby/tty-reader/metadata.xml
+++ b/dev-ruby/tty-reader/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index 0d4ab797d545..e30728030a0f 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -2,4 +2,4 @@ DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788d
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
 EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
 EBUILD tty-screen-0.8.1.ebuild 765 BLAKE2B b2f9bf11857595a397643b5c527d98d4ef85fbca697ed3947a8a2f0c7f98b2f0d0c1b47014901d1c28fb307bd6d75ee8dfcf5d3808340473b7b35dece3a64ab8 SHA512 f44b4ffd55950918b0257e3e68fca9c86e34a7f6e00ae243ceba2e8b0c34b64cc5bcc9b2bc2ed5a33d2d30ab26c6d7d1a70e54642762f1d77010ae5cba0349bd
-MISC metadata.xml 338 BLAKE2B 2f3ccbde97e5c0e05c77c5857ad47d8480b8f95bfedf2904984783c9709ffb60c5dfb549ef3fa2692e5340f014e35cf48e530eb5fc0b1d7e3776a9ce73a5620c SHA512 fb282ebc41cedfd7044a3dfe421ddae089537c1095ac51ede7967185eeaeae3da5ece20be14ccb85a9d5df9fd57b42638610e4c83784e8af174db4bc8edba602
+MISC metadata.xml 338 BLAKE2B c7415669713e2429d8d7cf1a727208f00e860e959481199e88e03b8bb3eb47d1250d4815cd2c38ff544cf3dc53c5ccd05e717312f004eeb7cab716565e1db8c3 SHA512 d192914129dea0f28d740a3e0754b738c96791302af9efcecaae0de3d9a3845a37827d23876c9f5eac4f6533976f06cc070fea375b1b795c9928e651765577da
diff --git a/dev-ruby/tty-screen/metadata.xml b/dev-ruby/tty-screen/metadata.xml
index f15476d6e7fc..d1637245d304 100644
--- a/dev-ruby/tty-screen/metadata.xml
+++ b/dev-ruby/tty-screen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/tty-which/Manifest b/dev-ruby/tty-which/Manifest
index f7cc2cce433b..70e54c2cc0eb 100644
--- a/dev-ruby/tty-which/Manifest
+++ b/dev-ruby/tty-which/Manifest
@@ -2,4 +2,4 @@ DIST tty-which-0.4.1.gem 11264 BLAKE2B 540249aaeaa5458fef3572413cf673e04765c1ad4
 DIST tty-which-0.4.2.tar.gz 9820 BLAKE2B 07ac2aa7a3e42127f456045fbdb92db2ea9834b08e0fccbe81767e01817ec2bf7304fb8a41408b0c4da8ecba3caf8bc236de9cb5637c6f197fe3835d0e9b231e SHA512 573b4ed1bfd4dd66dc3337d076a6559bda57b76c95c75f1aeef8bb6d4e0c81ef72057f5ef0521a10afb2a550b8850e6311aaa56ef2499146221f33403621ee54
 EBUILD tty-which-0.4.1.ebuild 504 BLAKE2B e4c9fc62b162655cdead13e5a499ffd5dd92727890245a10bde55eb951910426da783ca3018bc17546e210f8374e0eb77d80e64fe620a860f6ae785b061c51aa SHA512 157233a369734d3a000228f13b9b3993d2cb70b68b973ce89e099bae68abd7c0f843f28c2a894d14607826c9189962f497822d49b33f61ba1c99bdf461d2955e
 EBUILD tty-which-0.4.2.ebuild 1056 BLAKE2B 73268e248573fd70bb1d9779082e308c0c289803116beca8dcbe07698352f39366f7698da11b0209a67b9f368fda7546eebc6cf747fb05efb158bd95748f1197 SHA512 0555bcdda7c07587635888825ec829041754f55c11e82a2404d3c27f7b57be13dd31e58d9eff1370d5a9b20d9c97667bffa77b2f654c5ba9ea52ca80da9da294
-MISC metadata.xml 337 BLAKE2B 123637d7c276f3090c739e2a3823bb32dda76b1d375d81da3b7577c597a5358957381f5bfeb0379abef336ec70572a3cbfd04adf1a279a51e1783a7ade883601 SHA512 44af181aeb529b6fcbc3d5f07dcfb88b6b7d161f0d6be57be3c09a2d22a9cdc32b0c281f4336efa645daa7951799387ab899765e33823f34138b29e979887ae2
+MISC metadata.xml 337 BLAKE2B 8a91aeaf1cd2959f969f49390d9318bf6613ef6154878d396b5056071657ad478334c527832aa0db276d092e3075ea57e54581918a05d278eb9dda32c414f98c SHA512 57de9c2bb03ea22da8686927fbfda138dba784099c225b4c845405c724e4e44f9c8d05c0d59cf1d5503c5c36aa8db5717bd1df65127591fd56c460ff65d4d43d
diff --git a/dev-ruby/tty-which/metadata.xml b/dev-ruby/tty-which/metadata.xml
index 5fd42b5104ca..a05fb13d216b 100644
--- a/dev-ruby/tty-which/metadata.xml
+++ b/dev-ruby/tty-which/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index c23b3c9bf8ab..0896b8d16e51 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -4,4 +4,4 @@ DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1f
 EBUILD typhoeus-0.6.9-r1.ebuild 741 BLAKE2B 84ec7c85b6b02d12e00205f961cbd2ff5d51003510c8a70a4d667233f8e1babd01e68938e394d6327ec183f7aea4de448c90a6df74bf7bba7bcba6607998ee75 SHA512 1a38f6b16551e08913ab9d194723403ac56893606ff496346c0721ef17ce6d2217f4a08b6e7719a206d83786eecaeb1fb8d38e3760080d6cc5cca1171f39d93d
 EBUILD typhoeus-1.3.1.ebuild 786 BLAKE2B d4a5cf7d5237d3ad99b38fadcc7fa8b6d6b485cc37775221e837f71f4ac81ced22dbf93e8682dcca378a7511ec3fbd9e11811afd6bb8a86125a45b1b0580a7d4 SHA512 f80d6545173a9a4ddd27c091e1ba55275f2ed7bdff6419d7e8b1ff8131d230d930936d52afd9f39d77d0c99e86000e384fb54ae347aba64573784869b0348449
 EBUILD typhoeus-1.4.0.ebuild 786 BLAKE2B 40f894831adeb5e8a40e6c34b1478500eea45fcf9f4f55ec4f5a1ddc78bceec5670bf7f4fab6e5f59fa5c31964e9b20004375cc860e8af5181319bfe1afee687 SHA512 b744bfc7b970aef3fcfc3300abf5b6dcc4d0f0d085cfa7d3e7680fb1eee0193bc8b4c1c5c5c2d00b9a2ae3e106a57fd7bed5ad97dbf3a4c890cb5105089080af
-MISC metadata.xml 383 BLAKE2B fc06c06493e84a900ad29aa3997b8291d86a81c5b980c20f8abeb3897bbe6519bbfa5681d53df1629590e353f78aa6e0ecad3596cd6976a07302ae757f30f371 SHA512 976c74c44bb50748aedfeb7fa8a4b5f35afcc24cd962ef0441f0210f14da52121531ab23072bc8fabad9954b3bb384fbc4ae016397653b1e152434288fb9b6b3
+MISC metadata.xml 383 BLAKE2B a9d9ed199029e2c7166e7a6832e572524e20354104fc7997bd573a9d942077e10a63b936b5e831a4b795a678d156b22e8c4fbf577b1baf6f8b506ed92e6c35a1 SHA512 9dbd75c94531f38b7602712f544ca58c79fef83ce60e3ef16bc80045e78ae469e68fe8a757e45d6a8743beace239f9c6e86cbe8808815fa1df0b194dae27cf00
diff --git a/dev-ruby/typhoeus/metadata.xml b/dev-ruby/typhoeus/metadata.xml
index a3f384d09ec2..e07be92a9228 100644
--- a/dev-ruby/typhoeus/metadata.xml
+++ b/dev-ruby/typhoeus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 23ee200d5321..90343d8d5e6b 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -4,4 +4,4 @@ DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a
 EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
 EBUILD unf_ext-0.0.7.6.ebuild 999 BLAKE2B 835e36429a40f5e131ed360a132f806803af67c2d5adb9e129b5f4b58fbc0ebae19c160c7be8a48c1b9b8205bf4d2d273464b0cfc2b50464e8d4e828b487820c SHA512 1495e04859d8397aed54c2d850554064dc8df694da4991965beabaca980fbaae60232bed7227b241e6aca1b2db7295bd68433d408bca9534329845ebfca5d1c6
 EBUILD unf_ext-0.0.7.7.ebuild 968 BLAKE2B 15367ac6659abe67a95ef1c3389f85b94efabbc158a6aadf10635499bd3cf8377c152051bb97ae9ff226016e657d77dcff19a5f1c8edae3cb6852cd9e8a70c7e SHA512 a040a56b4e13c991052974381ab016ed0df071304f0888b1ae2fb3a3ccdd86d26dc4193b646d89327a2183a95da011c02cc98ec8f7a72e9fb9ef73bf305ae42a
-MISC metadata.xml 383 BLAKE2B 8932387497c84133ae5fd8bf9e12f740b768ac4cfdda11f3cd97c0f1752318cc5988d5be87db518865732d3c0ca4ef1854e22ec8600d6a6edb8f49f25d4febc4 SHA512 4d7e6c2058a2cfe457bd149b3fe6d0a5754b414aa4c5588312daa025f1ac9a49224fedde60a8340562702c81431df381df106b9772d1f4c0113189ace801461a
+MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/metadata.xml b/dev-ruby/unf_ext/metadata.xml
index c1a95acc6216..124b556026af 100644
--- a/dev-ruby/unf_ext/metadata.xml
+++ b/dev-ruby/unf_ext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index 822f4bb2135f..677b7a68337f 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,4 +1,4 @@
 AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
 DIST virtus-1.0.5.gem 49152 BLAKE2B 24f422d96b10c38f9599c48a2018dac5b5bb8979acce1ee206b11d64d74a852ffbd276b78bd55b3b184cc109eb00d27ff1347d143695a4e06edfb94a3e87fd5b SHA512 468b74d6a49410bb4e59c535b9f7736cd5e4743817f19f97483247b0d259e17b069044bd5ccc787d72df972d37903eb7c9a9d6ca0c6642c550f1c84a3bc71825
 EBUILD virtus-1.0.5.ebuild 851 BLAKE2B ebd7bdce1f84cd2811b06d575f0511950b7b6ed21e53ec1c017f2d0d29576cebb5e373f30f3d7f25b4f5c92c94a5bdd77ce00ab110a0f43b85882b789a965ffd SHA512 ec398ddf48c5b59f3016c97b05b6697fda0abb8519a83f0a6a41551494dba54028e496151dcad859323ff152892124e77a533f32076fc663fb90ad9492bca23b
-MISC metadata.xml 389 BLAKE2B 19ea2d5c5c25b7fd2c9d4cc23141907def94233ae9d6e82cfa45817950fff4e8a927b361c46d1d370c6a418831f2ca8423d51fa29fd20d2929bb0efea283e996 SHA512 b8ce763b943ae56ae0ad2f49f87608d010a39f2a1bd8800572ca799d9ca28e419de8545bc5b3e813e10d0a352fb0e2253d2dd4d0ee601ecea0ec3a98e524c0e4
+MISC metadata.xml 389 BLAKE2B 10ad17905d022c52ea1f9d7827a18523727242c4a0e53d23a8d50f3cbb533f498dfadfbafb95ffd3fb5bbff49326febf03253c79d9de3129aae23fbbaedcd86f SHA512 daa5d8675a730e9acdcb8895f60f0ccec2c0eb644912906d764c1889b9c6d27d535040fb403780621b06907011c86389fa76942275bac79cbfed3cf021424051
diff --git a/dev-ruby/virtus/metadata.xml b/dev-ruby/virtus/metadata.xml
index fc67007cce91..ad877b6726d1 100644
--- a/dev-ruby/virtus/metadata.xml
+++ b/dev-ruby/virtus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 2444ddf78649..fe1e6cfe226d 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -2,4 +2,4 @@ DIST vlad-2.7.0.gem 29184 BLAKE2B 5eda039d0d618950089ce743cde95c011edd4765730580
 DIST vlad-2.7.1.gem 29184 BLAKE2B eb35f357d87daaf2903ca880139ac41c1725419fb6f0e3d00e1a31fd24697373c8d4869e31d17e6dc88ce31ecad1a0747ee2ec08a31871b4c44b32dce28424bc SHA512 520ef393fdf63daa348015306003cdd3bd9b8f162b44b31d78c170d1ece466b804226b030640a180a8538c6908c77d80dcfc13078ce295a6c59f1f5b9df9ef13
 EBUILD vlad-2.7.0.ebuild 713 BLAKE2B 3f8c3675bdec38a18a637ad4c3593524230abf7ffd889bab54d57cfa70dfbe010a33eecb9caf28c7209ee33728a784729bbce89d521676f59d90eb446fe4858a SHA512 69f35eb8a6d8b57e2fab20ccfc02bf099bae19ba5ae9b67b00cdb729d2b871752ce7ed24735bbe298fa2209e710fd9c3898278fc505a13a479ab409926da2f7d
 EBUILD vlad-2.7.1.ebuild 675 BLAKE2B d1e46f2d90d31b5b650cd2b9b0d430c7d9fa6a45802d4937ed2b454f29840decc78361130ff752233932bf487f21cdc17d37af7f969f4d4a7030923318a0d923 SHA512 a42e70003ce2d8408451388dcb128eeca6746c320556a0ff4b50732be9babc05246acb32e05291b6c55d3a206b5c188c2a41152ec9a5d4134d5efc3f6c6876ce
-MISC metadata.xml 330 BLAKE2B abe60e4d34ba6020fd10c6662ea0a077627367580a1510ca6a2521b35eb94bf734f45f14811706c50887451a6384bdac1371f6da5387fef3bfa4f177b2f48c9a SHA512 8d69491dc1b3055579ce08cb43cc3c75920e6cd9e45c174f23aefe4cd0e7a3db2e8671fcbc3730130dae0c8ae39c4f7318bebf59e13346b9b47eab8f792da255
+MISC metadata.xml 330 BLAKE2B ed4b057fad3c762800d51a14c41b21f86dc3c657e6383a2d5d39254d1c91fa34ffeb2b5c3d3082e384d8aeaadd0752d0b7e2f3f9536e30d4d975c5518e1d61e5 SHA512 c58958e39430a9a983e0daf195de0236884fb1f4f2fd8ee022cdedb1373fdea1976d71f343032b4244b85554b5edca87443c77b7a40eda1666d26b242977f8b4
diff --git a/dev-ruby/vlad/metadata.xml b/dev-ruby/vlad/metadata.xml
index ef0f10affabf..c08e8640c1a7 100644
--- a/dev-ruby/vlad/metadata.xml
+++ b/dev-ruby/vlad/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 38267f454742..927eae95b0c3 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,4 +1,4 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
 EBUILD webrobots-0.1.2-r1.ebuild 947 BLAKE2B c250be6eeb9011cfb3c3d51f1bb441b5cb68da78e414d1501cbab79a08ede2a320223a17162e37ced814118030d750354e366554675064d61a4b05196db50952 SHA512 c31c9bae02cf589bb86e205967dd2cb84526ff880ac596668d68ca289ca8a30df206172ac8941e025b27949b7b1f025248c2c168269a496299a06bb348eacb2b
 EBUILD webrobots-0.1.2-r2.ebuild 910 BLAKE2B fe4399837756c04d4d637967dc49fee807d08d3aa124b654efed54be71cdabb2df49baa7a6a37565ad3608e9fdc80843daa3b47d13b5694b63e559e77b51d10d SHA512 500148101f51d6a5bd1b536894772b7aa0b3e0108400d6ad3a8349c9307fc41c935014d6a9d5e2e4e919220809c53b1d3dbbfcdce168d5bde83fc490c8518136
-MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
+MISC metadata.xml 380 BLAKE2B c77a2f322b5faa478336339140597c1fa4d8a11dd2110211a3cf2e5f8cc50bdc64f44deaa8f9d3d3d8370ba0c5aaf4867053a87fe264cd6a6a4b9737c6b8da1d SHA512 7970e062ed7ac4b9f4bd12988d5ebfe34c211e7e0344dc1d1f4d7713b9d20482c60f9a17954db1a9ed41f72712f5488f8164ddf9439e372c72ed7f95e9dd0da3
diff --git a/dev-ruby/webrobots/metadata.xml b/dev-ruby/webrobots/metadata.xml
index dc2b266475d2..67086c9ebe86 100644
--- a/dev-ruby/webrobots/metadata.xml
+++ b/dev-ruby/webrobots/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-ruby/websocket-extensions/Manifest b/dev-ruby/websocket-extensions/Manifest
index 7f98ae324837..46345cc0e3c7 100644
--- a/dev-ruby/websocket-extensions/Manifest
+++ b/dev-ruby/websocket-extensions/Manifest
@@ -1,5 +1,5 @@
-DIST websocket-extensions-0.1.4.tar.gz 9666 BLAKE2B 21446168b3f7c4a52fe25ddffcaeb31bd1e8f2d8c459b19871cf15f03934b6e25793aa15baad639ec07a4eba399b16343b23889d05d417b83e097846e15e9d8c SHA512 928b3cdf66a6cb16a0a735ea8335b861af9dd8c4b6962a2a9132dd538d452c81dd683a7648e194bc81db4cd8b52f52203145c5c90475e00157315e46a09a53fa
+DIST websocket-extensions-0.1.5-r1.tar.gz 9795 BLAKE2B ea387b9bd56d02372740a8f42e0c8259cd2013876f86a13c8203e1e1c5ae9e0e6a8d0c2cf11f653c3517c2bff0c283370ec7a5760c29df39493c4b41d8e55450 SHA512 a80154d0c83743ffa4dd3eee1adcc93bb38907fbae4260602a91c922e5a022806413a8aa84dc10bc14b5ed2ca928765ef4c39e04ff0a0c5f9b423aff2b2514fd
 DIST websocket-extensions-0.1.5.tar.gz 9784 BLAKE2B 0e7284363876568d62988f71faeec4105600f7f09748ab8256747e14c3ce361d4cbc6834b93142e363ed38b02012aabf79d1d9e0f29ca31532d2e6d069dfdff8 SHA512 660a7f03215ab3cfee1622bca5348780f8d665314f7ad2526e114a1ace169799457e1ff30303711819581202edda0539a622e20e91afe51d7b3fd571c1a7aab5
-EBUILD websocket-extensions-0.1.4.ebuild 609 BLAKE2B c92861f8b213563eda909ae994bde20ea7c09eff2cea92b895403c24e141fd03c9dda564843d0996901babadbe30c75a796815c087c05c855ec7b2dbeb130df8 SHA512 d2f18c58017a54faba7fc4d6694d3831bf2df05c58c12f9cf4367437962438975b4a1007b8f6d3662094b6ce9a4e12e0d27afc885a713cccd7f8a5f1830469d9
+EBUILD websocket-extensions-0.1.5-r1.ebuild 641 BLAKE2B 5595dfbfd3d7de3e43a39dbe0e466cd3a4a93f1de0773a951493979368190c79eb5ab42bd393ab793320d651fc37f8544832ea96beb1c911db33e1a9538bda3b SHA512 8b43dca8ca7fd0bb2e638d821578067c6c5aabf47188e243e54312b3b47166bc5cb43dfc86b27b67bdf3f12523a7eed41d9fc9f7655333ab2806228a15727c8f
 EBUILD websocket-extensions-0.1.5.ebuild 638 BLAKE2B a4e109aec2bda240687ea50809802de99feb46d66e14089cca8438e8f5c664197112678e656add6acd4ba49eb3100a045255a76dc1088cfce2539814483c62cb SHA512 f693033d04f99aee0aa81ed8c790bfeb31f063f78638eb9566b87cdfb81b9c62b0a997b7c9a5de9ded3a25c9cf3544f693e1b8aa430d6617349a75d3668f9750
 MISC metadata.xml 356 BLAKE2B d54646b9fde8e8698cedb97ed90ce59a1f5bbd318dff97fae6dd635efa425cbba0ee2cc8d1b518e2aa6bf4a6bd31bcdd71004c091cae69765437c9f6face6f38 SHA512 a87f7468ae1610dc912186f7ead34494f4e472f0b1bc059ee3d254cb84e2657481269e2976f8218fcff2df0846d16a183bf1f5158ecf68b5e1c97f33345f4f7d
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.4.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.4.ebuild
deleted file mode 100644
index 9a098965ed3c..000000000000
--- a/dev-ruby/websocket-extensions/websocket-extensions-0.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generic extension manager for WebSocket connections"
-HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
-SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..030cd8b81b8a
--- /dev/null
+++ b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="websocket-extensions.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic extension manager for WebSocket connections"
+HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
+SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/whole_history_rating/Manifest b/dev-ruby/whole_history_rating/Manifest
index 6f9f0b4056ee..ca7d6fd28507 100644
--- a/dev-ruby/whole_history_rating/Manifest
+++ b/dev-ruby/whole_history_rating/Manifest
@@ -1,3 +1,3 @@
 DIST whole_history_rating-0.1.2.gem 9728 BLAKE2B 506354634ab0390b7805e31ee1982309a903000b69a20992cfa53196da8e685b4ea1c89df7ed96ddd4fc5c8a8974d23dc48625d3e93ebbc09121b32e0ab7216e SHA512 4ee9a3340a5bbe1a0250b469c1210663ff226a1884d13729e169d2c04ef57c615bef117a641d6ac3b29b5d72147009149c291e1f7ad8c4c8028ad3e6fb44c56c
 EBUILD whole_history_rating-0.1.2-r1.ebuild 507 BLAKE2B ec1e84d80089fee7b4ce74cc0386fe705366b9e0bde5bf698a09511c3ee70fafdcaa35c1bac614d83cb0c6daed3633f3f9a468ea888dcdd03b7a574adea971b0 SHA512 b26a7c416b99851b6c69e6af72643b46b671763b93f26d8ed58da63bbbff1e8522f8978096ca820cafe0497d16da72f98c6184d63f993cf3f59c4ce0586ea244
-MISC metadata.xml 914 BLAKE2B 68d087fab3e07ad73034704c9c7907ce67a34fe7ed22beb9c4bf0138b22c799aa97becaacc6d331fcff7a8c0a7b496edbffbd8650051a9604fa5e845bedb492c SHA512 adc3664334965a599fbf0b0ee8b8dbadfce12d2c38d0f94acdd924e1feca5ed549458be20aaabef79436f92ae772d2b40e25f559319ba9a632c2a77fc740dfc5
+MISC metadata.xml 944 BLAKE2B 8c22e77ada951f96507cdb802b9c84894b7ccd2e54f5a67aac382fecaee3d8aaedb4d85a854e6a1372494f505ce5c05adc0f61d42f36972a935b38ecdfae589f SHA512 1c82c7bebe57027d7a956d83fd79a9f2972906379d2d901c4bb2085613aa178cab48ed1df96ad6788a544d85a3d4e4ea7060a671a6dc45fcdd5c15bc746d2a5f
diff --git a/dev-ruby/whole_history_rating/metadata.xml b/dev-ruby/whole_history_rating/metadata.xml
index b39a11c910de..fe7cce2b0e77 100644
--- a/dev-ruby/whole_history_rating/metadata.xml
+++ b/dev-ruby/whole_history_rating/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>lssndrbarbieri@gmail.com</email>
     <name>Alessandro Barbieri</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index 7718aa3150c6..d10c8254d5fc 100644
--- a/dev-ruby/wisper/Manifest
+++ b/dev-ruby/wisper/Manifest
@@ -1,3 +1,3 @@
 DIST wisper-2.0.1.gem 26112 BLAKE2B 3dc78cecb80e052ec8bc308d02e5093ca55fc7d26a1dd98614907707d62d15e0cea1a20c7843ca7e6ee175800d320c3ef5854396505aaf0648161153b0e61368 SHA512 3518c218c0cb4ceb5d96260f7ac8845fb2f35d4a77c478cb56f1251fc29910a655ce070ebf3c17eaffd7d144ac54b436420bd2b2c4f72a8743f68dfdd72a514c
 EBUILD wisper-2.0.1.ebuild 533 BLAKE2B ca2e104296eac16e7458ca569085c2f5faac5a31c364e7a32b0942f47d0e43689d4a6d4e80bdab4b5027fdddb5232bd58fda4c89bf3f44b1c92659d68bb6a28a SHA512 682382fd98dc1b4c99378a8fc143bb6d6e1898df3e8f574cb4eb9812f2aee32802392d1eadcf17f7dfc55083330b565479413a8ac97790cbaf3ef6cf63128133
-MISC metadata.xml 332 BLAKE2B f42ad841724cfbd3fa650dbfa45831f50dab12619c2716d2cd6eabe43ccde962492628ea63a50697272b29c934973446557774bc49aaf51ff2b9f08fb99e6fef SHA512 9e7fc2a76a6981300d5a48e70ea9b563e221b022b27423088c2a1972a924c9361e47fb45c7dcd1203b456f9f09adce40dad17d9a9dbb5659e07f07b54b0d149d
+MISC metadata.xml 332 BLAKE2B 4bcf48a0a3dd7a92b54195584e9fadc814a3d011956d08f51090bc7d32ab14baadeb61ce4d1549e77f6a52042542bfa0130683df08cf05f06c36107b5a300a09 SHA512 a996d5e847d5f13dc33afcc1db43aa46699ef56ac194d6ce4b572d9aa11936bd62cdeb46e8632b94d3dadcd4553ca692156a092084e7fc2e812bafc65b964503
diff --git a/dev-ruby/wisper/metadata.xml b/dev-ruby/wisper/metadata.xml
index bf9897b17676..85bca04d2512 100644
--- a/dev-ruby/wisper/metadata.xml
+++ b/dev-ruby/wisper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 22b7f33c8c41..ac019a40b402 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/metadata.xml b/dev-scheme/metadata.xml
index 30a22896bc74..dc5418d301c0 100644
--- a/dev-scheme/metadata.xml
+++ b/dev-scheme/metadata.xml
@@ -38,4 +38,3 @@
 		programowania Scheme.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 3ca2bc4cc7fa..464e7a81c9c2 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -2,12 +2,15 @@ DIST racket-7.0-src-builtpkgs.tgz 122544008 BLAKE2B fa6eddab17fbdec1db1dac2debb2
 DIST racket-7.1-src-builtpkgs.tgz 126596138 BLAKE2B 734595105630352977d7f51de233c320de590744810f2f469d4259d84f19a69a84394d4f62ade130897babd21d46180659689a0c2dda7bc9559586f5c3c37be6 SHA512 9d6fb0912c7c612dfb32b4955e192d69f00b67e73c08196ef3caa7b3123909627496a6dfb36f7910ea5f9af526e99b56fe936359cbea261db26a5687ed49c38f
 DIST racket-7.2-src-builtpkgs.tgz 127050541 BLAKE2B f6235c9f5a646a6d2a8ab0ce63ded384ed707dc704927b63281c159e2daa503ffc4bad99cd33511aca05c0fa7aa55adde1e9c79032faa17dcd99f1bbd15324a8 SHA512 748e1ee63b6c32bafc58401e943e7dd31a47cfd2eb8dad6e4a40a8966d4df2fb7e4bb573841c210a567ba0f02b518d41fa69df03736f49ae9761446e71a4ab9b
 DIST racket-7.3-src-builtpkgs.tgz 127136703 BLAKE2B 3449f62d8301cf5cc527cd46e074279d34c6064631a584488407d4c7af3b10aa01bb074d0dbc59034e8e036b1f24f9921ccdc070fb7bb3ff548f18b37cd8d12d SHA512 2cba16d6513984721b82d21e279a0017e3d96f3e2a53ca773deb45e10be2b74a61d4496679eb5aa4aff9276f323a16a1506e9471a873c28ee014f7d4e49bfea8
+DIST racket-8.0-src-builtpkgs.tgz 153847792 BLAKE2B dba1b39e770954e5971689f6d2b413f1aadc6176822e4400b40b41ebf7eab00cc34b5e5158f38d1a1d8caa98fa260ef10864794dc0d4768e2ea5b2ad869d0102 SHA512 df3e14ccdba00eb4de113693a6eee22e640958b074f3ad4946e5900333fbf558c4c2653f65a89f638f6ef173d32c9f97b19349360a9d4afca82365aceb43c911
 DIST racket-minimal-7.0-src-builtpkgs.tgz 12215529 BLAKE2B 4e9d2b137edf6b188c71dd32771753a16589ab49884aba1641fac5a5f82b9016843fec3257de7d59a9b00971a7dd455e99897782794800e14a656bcb22a17080 SHA512 976fd0ab96f4bf99eb7c63f7f213af91f91de4dd2498c4f8f1440743f7571194090abf0c4037e436970235f737d0add116f5689bf495688b3667a91ef95e8270
 DIST racket-minimal-7.1-src-builtpkgs.tgz 15304920 BLAKE2B be851eb58655d5f7eb36235eeb37f3d24c94c4a6b20724a4772acccf109df6e6a9d8e0f9797530c7c3f6540e99325417ef982244017719fced75e1afda71847a SHA512 e1e839867fd4540fe15234f149162c88ad1f73ca26ba22644d58b3d8ab2809851d8b176f9f448dfd7acd3b7733a20d388c71cdd76e8a5dc6c50662e6113df6df
 DIST racket-minimal-7.2-src-builtpkgs.tgz 15481415 BLAKE2B 145823cfe8538e5f569e33303bae585cb2eebf013da27551a606a005ab84e70b0e58710eadbaecbaae4fc5c9b62b22e26ba1ab2f3158500600c0bc9d7a52e17c SHA512 0fb17ef0e7d8c03c847827118dec48486fd499777fbbf98588124f9e4725dd815e0f6df2e95f4d8700b8d8dbe3b7d678d2ffb8966ce0add6742bff554ef9415c
 DIST racket-minimal-7.3-src-builtpkgs.tgz 15549791 BLAKE2B ab03252c48b8a07ae6caeb3af67d823d8eeddd22242d2146812c7b12ade09caa86ad026fb1a7b3dfeb981e304b78c697d1f93fb9d94c6e7dbc8c3ecb09fdfea0 SHA512 e542898dab04e781b0b8a613f250a35db8beed9db33406f20d4f028b7f3629904409aadf653c68998d36948bdd46e51134d3cebe1e014b46e3dba82472c3563b
+DIST racket-minimal-8.0-src-builtpkgs.tgz 24065953 BLAKE2B 2af056758660d30f7d232dabe03d544e5e77478df71389df883b8af956fe224332048eac3a351fdb905051e3ef99b08bd0e0f1704e04919a4a2e68f8005922b8 SHA512 1e43b390f6a4c1405df0872c71c27638ec35a8cdd8508390db13bd59a43f5a4728f0660fe1afb5785f625d31fd25cdc1a6ecb9972daf99bcb538f7204956dabc
 EBUILD racket-7.0.ebuild 2462 BLAKE2B 459b155b8f0991b0c0dc030a3084a9f8bd24c6937eebdef6279f827e230b509434946a40dd0b02d96270e929cdf080c4bda9bf31c9ec52c21777c4f393d64833 SHA512 536ead3975f6eac6e8e100d195f00f8636c8f168c283e2db6fd50fcf6ff1cc0d76422f31859b94300d792ffa91af87d1fb11c7a46660f6267ddda5f4dbb3fb71
 EBUILD racket-7.1.ebuild 2464 BLAKE2B 8c76a20409ec36486e762eb34378aebc3645a33f14ad51c0dde2f2ed1fbf1a7fcf1d97543ce033f30e5a74638b27294bd11fe0f4215a9f426e5a1caf7e894dc0 SHA512 ca9b8625e4878e01a7b439dd5df427d12a1bc12245d2bc04e318284da55f4c24afd7c7c21485d8ea75db41768c61b61ccc4b1d808bfb2058fe93e4bd328f222f
 EBUILD racket-7.2.ebuild 2527 BLAKE2B f2b980e4402cd27cb1425d166e222b42c07bb6e624fc71d739c6d254141a3fdc41641d177b3fc47c85cf566f1e868baeab7181ec1413575dc003b0ac92653081 SHA512 c2093fef93c6f00f757a4535909f9a4fdce017eb440bd2099b8f8f62b95e131159a9ed9a46407491c513b79cba12d214ffb2711b9a00ed444383ad34ac58172c
 EBUILD racket-7.3.ebuild 2527 BLAKE2B f2b980e4402cd27cb1425d166e222b42c07bb6e624fc71d739c6d254141a3fdc41641d177b3fc47c85cf566f1e868baeab7181ec1413575dc003b0ac92653081 SHA512 c2093fef93c6f00f757a4535909f9a4fdce017eb440bd2099b8f8f62b95e131159a9ed9a46407491c513b79cba12d214ffb2711b9a00ed444383ad34ac58172c
-MISC metadata.xml 1575 BLAKE2B fe1e4b2308e5f676ce39f2b2f45c230e47f1fb690eaa57732cdb9a3e2dbfd11bfbec178d06655974eff966b165ce7643f8d1badf60e79ed3c97b64a338c2f6b6 SHA512 debfd31e91802544fce5a38936849b540aa2299d4a6a473fd55307ce4305b52bff0f99f6513ba5b343469a8740830f91879be4ee9e6086f63a00e2f3bc21cc64
+EBUILD racket-8.0.ebuild 2945 BLAKE2B cc68dd1c14bd2e3aeee140f7f5454e32a8cbcf0916533d568230d3c7a3aa9257c6a9f56b686f6aeb4ead43c649de41f9576efd5fc7ae4a994a3118ffe1de325e SHA512 f5baed3446472c920e2d53d98609f0c65345ac53f9a75448eb2559cca3039435b90ec63b23155666a3430cd7d102379c34470f5ed6374f09b90c410e4fb86324
+MISC metadata.xml 1649 BLAKE2B 9c6b7c0d42338d9a11250e9531ac09e556d80cadf1bcd2aebcec83ac2ef5564a7264cef60917da01a5940e0621cf71a68016f43214c9baa53e792db7adbdfac2 SHA512 2913ba512bfe2660521ce6e63da1e2e1d2c888c111b6fe322de8fe0f6e0f859a3b4e20140e004995938fc76f5bb89eaf807599dfb5bf550c8097c39ebc24e1e2
diff --git a/dev-scheme/racket/metadata.xml b/dev-scheme/racket/metadata.xml
index 69beced3af9c..339a62f46a77 100644
--- a/dev-scheme/racket/metadata.xml
+++ b/dev-scheme/racket/metadata.xml
@@ -16,6 +16,9 @@ Extend Racket whenever you need to. Mold it to better suit your tasks without sa
 Whether you're just starting out, want to know more about programming language applications or models, looking to expand your horizons, or ready to dive into research, Racket can help you become a better programmer and system builder.
   </longdescription>
   <use>
+    <flag name="chez">
+      Build Racket on Chez (Racket CS)
+    </flag>
     <flag name="futures"> 
       Enable racket/future library for fine-grained hardware parallelism
     </flag>
diff --git a/dev-scheme/racket/racket-8.0.ebuild b/dev-scheme/racket/racket-8.0.ebuild
new file mode 100644
index 000000000000..497bd4481369
--- /dev/null
+++ b/dev-scheme/racket/racket-8.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="https://racket-lang.org/"
+SRC_URI="minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )"
+SRC_URI+=" !minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+S="${WORKDIR}/${P}/src"
+
+# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
+LICENSE="
+	|| ( MIT Apache-2.0 )
+	chez? ( Apache-2.0 )
+	!chez? ( LGPL-3 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc +chez +futures +jit minimal +places +readline +threads +X"
+
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	dev-libs/libffi
+	virtual/jpeg:0
+	readline? ( dev-libs/libedit )
+	X? ( x11-libs/gtk+:3[X?] )
+	!dev-tex/slatex
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	rm -r bc/foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	# docdir doesn't get passed automatically
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--docdir="/usr/share/doc/${PF}" \
+		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly") \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		if ! use chez; then
+			pushd bc || die
+			emake cgc-core
+			pax-mark m .libs/racketcgc
+
+			pushd gc2 || die
+			emake all
+			popd || die
+
+			pax-mark m .libs/racket3m
+			popd || die
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+
+		pax-mark m "${D}/usr/$(get_libdir)/racket/starter"
+	fi
+
+	# raco needs decompressed files for packages doc installation bug 662424
+	if use doc; then
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-scheme/xdgdirs/Manifest b/dev-scheme/xdgdirs/Manifest
new file mode 100644
index 000000000000..456503f380e8
--- /dev/null
+++ b/dev-scheme/xdgdirs/Manifest
@@ -0,0 +1,3 @@
+DIST xdgdirs-2.2.tar.xz 359784 BLAKE2B 437d5a5840957c6e0482e38fcb8fa95c22e8d22001b26dd1c047d9c96e96c85fc47627880c9e92c1f5474c7c3bf61da29f8c9f28a4aa85b32d207ca29cf783dd SHA512 f57cf6e39e3c4ef7faa9034f9e42fb87a8398613f86a7d4f305810c9a845f649e56b754fc5a03fae41b368cd897527e9a8151eb16d1d91c6e4b170ba27bb1b11
+EBUILD xdgdirs-2.2.ebuild 497 BLAKE2B ff4a6d6fc36854ebed5dc4b54e5f6cbca40eb2dffbd7fc78bf66ddf8e344576f9caef25f6666a1d192ff0bb887d7fab4693728c378094052488a0fdcfe775af9 SHA512 8b766087733cda322fc5eda7878ad50abb9b728575aae91ad4f7fc1397eb4d06a94274f063b25846c83b938aad0986d7f24c68532168c64499fd53836a413116
+MISC metadata.xml 314 BLAKE2B 8e9e8559fd42cb257cd46adf553710d03be8504cc0b14203214db61dcc3fab7bd6560401bcfb62db9e8aebe021c39fa0de44840594607899b88d23e7321beac0 SHA512 77dcab99d3bead4f808db8a9104ece46bcb94eeb86989f2e104c0306c3b19f308efd0ef130b56c49d33a1b773d3468c8b3eac3acd2041ad5deb1b1527bb83095
diff --git a/dev-scheme/xdgdirs/metadata.xml b/dev-scheme/xdgdirs/metadata.xml
new file mode 100644
index 000000000000..b4295d053943
--- /dev/null
+++ b/dev-scheme/xdgdirs/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="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<changelog>https://www.gnuvola.org/software/xdgdirs/NEWS</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild b/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
new file mode 100644
index 000000000000..eb024b533f87
--- /dev/null
+++ b/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Displays names/values of XDG Basedir variables"
+HOMEPAGE="https://www.gnuvola.org/software/xdgdirs/"
+SRC_URI="https://www.gnuvola.org/software/xdgdirs/${P}.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-scheme/guile-1.8"
+DEPEND="test? ( ${RDEPEND} )"
+
+src_test() {
+	GUILE_AUTO_COMPILE=0 emake check
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b107a6c65273..dabfaada0d20 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/metadata.xml b/dev-tcltk/metadata.xml
index 0fadf10b5e15..e9a6229d05bf 100644
--- a/dev-tcltk/metadata.xml
+++ b/dev-tcltk/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria dev-tcltk zawiera biblioteki i narzędzia związane z Tcl i Tk.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index c92e8ba24e7f..1466a5591842 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -2,5 +2,5 @@ AUX tls-1.7.22-ldflags.patch 363 BLAKE2B b0b7fab12ed59f37ae538190b1988badb3ea3eb
 DIST tcltls-1.7.16.tar.gz 166439 BLAKE2B 855b61bf21e7635fc9c53838037136586552261bb0c3b4c4a52638e99358f418a2c0d606b5fb130e32004e3a34c80afea25be16f068ffb499d6636309e4ae2a3 SHA512 f63b885dbfaec5d9ae811c126bd0ff253787effd7b053282b9ee566e9fae54df940bc058a6c3dd22e31fcb9ec6ae1b286aa40efd69c3f01f5a3014aada730ab1
 DIST tcltls-1.7.22.tar.gz 165206 BLAKE2B 351a5ee6a50174db8b13c9232a617aa90480550520771004c318c063b7c9703cdf969c7d12c56c54483bce5d08a9b48c04906d2be3ef9e3de0ab74c5dac68346 SHA512 28c76a6e7333b6ed1d83234691d61c9e71a59d0a6a28182fc0f50e97cae7b54da63ac76527e3b16087f3eab0b9cfe19bad02362e485d0cf378724de534805e99
 EBUILD tls-1.7.16.ebuild 905 BLAKE2B f17482d52136346978feba421b0fd6f9e51c8f9c287f8a4331cc702c79101d338a1786285addb5ad61eb0c662b6e225d9e165ab284676030dd6f54604ff56f65 SHA512 b75ae0792da1e72be4c1c9751299c694d8d7dc5f3f52474e65fce661a69fd75b4bd70113bbb397dc0c6a9e9340eb10d3d2ff40b462d01ee18421b78a5509fb56
-EBUILD tls-1.7.22.ebuild 1011 BLAKE2B 205a8517982f2b1a7998e02d96944ce0ae658aec392bfd0a5aac533c8a8a994f15a78a63a6c29a31e523d8afbe7dcadae5cfa4808c6dcb34352b0df0527a6146 SHA512 8268e6f71e822d65b1d9c87682532586d8fa02b0f24311c61a365d874eb4df715267dbfa0f0a884e242431336c0e205e0e18609c8cf232b951c085094dfeb22f
+EBUILD tls-1.7.22.ebuild 1008 BLAKE2B a647bda4f72e570b7c8e07a6d9b59eb1f08995146192a3cdeabf88b696589562f1cb42acda55886eb5526729e237ad6c5667033f9956cdbeb2dfde5177cec0da SHA512 10d8e27f44780c018824dbce3c8a60dae0aacf97daa341d90953e9d4cf6334d6c081ed0a3bc06ab24a0388f831f661a559b34f982f878ca7d9eb3911abbea462
 MISC metadata.xml 326 BLAKE2B bb3ebe3febf02967373d484b0685609602c2fe4c229c52d078035c4d8d4ab011a3d5a4e72b46a4d75a4ab01e5fdb6d338c679f1b1033bc6d986f3815696c61c2 SHA512 6e3856770636152cb4cb2d2429dfba4ccdd4f82433903aa828ca23b3dbbe878546f7327a510ecdee93001c1d81dbc9c343c217d09ab08774c697a4b6fb2a0f94
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index 4fc34e2d08d2..937c4a1aa9f3 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 24122ad47a55..7ebc86f20671 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 703542241f17..42900662ca6a 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -2,4 +2,4 @@ DIST biber-2.14.tar.gz 1589847 BLAKE2B a5f2c1ebbcde68c8ec28d54f10f9217e710c0bb84
 DIST biber-2.16.tar.gz 1594209 BLAKE2B 60c07723c0ee869d3430d0270a2c0bf54adb63c1a842cd1bf0c6f2280bc964a404b2acd3d8a48461c8a22f7abaefcdfe346868e5a435f3e375b1466700176fa9 SHA512 12b939c194e171f4e7d8e0341b6301b55be8376eab3aa3e14a72a780e5bd8f6d61fa601a95f99c9d17894b8c10a785ccc916b23593391ed00ef31e0a8c2a4662
 EBUILD biber-2.14.ebuild 1727 BLAKE2B a06540c0fcd5e28d97566a2ae8ae5045c48091d8683a9b283ad0bc266ce2694c3b7cbcc05b7c4c4fe03f62fe9059c6277621cd677521696e548c1140cd1582f0 SHA512 f3e7891dad50f6145681888cb215ff802be5e39f694869735a6636e4163548056c5b7a14175f525a9b1ed78fc4b0943603a528a63ee8403ba07142be5eebe415
 EBUILD biber-2.16.ebuild 1777 BLAKE2B 5c1f6f1008fb29e52b0211fad7b7171f17eac3d7d48599b243a63d34757a7a4ab6e43a50bf3ceb60487960a63ab96b7d97990930c63c24393c8cca646c4f1dcb SHA512 bf83adfb250878b6b72ce57c2b08cfd1080f5631faf0e7b33de552585814988f95eefa6a90b157559be92365dac4dc4b4ba219c961ff425542105bb5f7141392
-MISC metadata.xml 498 BLAKE2B 0636fcce7046ba43b2b56c0a793b61e444e83ee7255212c5bf38f21cd89a642c92dc81b55ef34bec16bdf4a0141b824334d5b86eee8cfb562e5ba1af826f43c0 SHA512 f0b734bd7a376c3e3cbabfebe5675dc98cedf5c63c3f6b2e98079fd75eb9d64975fed2f36a618b6a6f23e4b759ad497b6b19cd28d1f8c6bb7386a4aedeedf967
+MISC metadata.xml 528 BLAKE2B f62f6ecb8f184573846289279af4d4e8c9fad181b5318f3ef4da039c8449c5fd34ea1639b42623bad65e82c76653ab863a1b2418829b4554ad80818de6bd80d3 SHA512 e00600348f687d55caeb34423aa84f9e6139190890cc30f666af6b77e864a88952cf6f0d6f0e6b5ff734f08d04185daa6195f450aaa61853033128213865bd8f
diff --git a/dev-tex/biber/metadata.xml b/dev-tex/biber/metadata.xml
index dda554e16b2b..a760184c072b 100644
--- a/dev-tex/biber/metadata.xml
+++ b/dev-tex/biber/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Jonas Licht</name>
 		<email>jonas.licht@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index e9d23329b4ce..97302e1a5482 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,5 +1,3 @@
-DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
 DIST hevea-2.35.tar.gz 1006773 BLAKE2B 80a8f80955a4eee641c53784cbe4543072062d0bf4d757fe0c8270d6370d54495eeab3a9279bd992dc45b80b23de0438ee4fe6fa932981c777b25782c42ca4a8 SHA512 dc1a5179489626176b1fcae47a9c7eb4cf9c1c6127c749cb938808697ccd6179277089fb20f4d5da7b82056d15b1d64acd9ba9884d1950a74d98c98864b4180a
-EBUILD hevea-2.31.ebuild 1395 BLAKE2B 351bf76119c74b148adc7ae10476c73867e0fc55f9784b89b8ba5eb4ea8724877935ba7e18bf7315fbf11d173e33975fdf13c20c6ce89e1cd939fc959ccd86cb SHA512 71f4e58efa14aa4f39cbb52d559d09633a717c1c26fe02a32e021c95a71e83322ea21a541c666dfa5901c91455cb328005a32f4d0af08f73ae93cab00fbac55f
-EBUILD hevea-2.35.ebuild 1589 BLAKE2B a4e58c5a84e6301310e5677d7265a6904e708c1e6aa0f24201dbeef5279a22b539563bfdc46628d895251bf3e6be22c28c52f95c90e0071c47aa78aa38adc321 SHA512 10f2a211cc5138fcc7ae1c57220204ac5e5ebf3b16c7315c5a4256e96da9e7975bbdd310ac244fbb2753afeee15535298c042128cb1fa546eff8b0e6c55a2a33
+EBUILD hevea-2.35.ebuild 1587 BLAKE2B a9b55e46402e08bcb4013d1fa36a3c23d9fe1cafb7531a784b65a726ad7717ab31746054e73b3e363fdb426350ed68be57b35b240ade8f4e5b10fe26efe2b534 SHA512 5b524e12c291380f4718772b8bc7f8d4808bfa71f7e97ba9842433d3175be60c10497ad62289048b6923d1dd351d5f6d58e8ee635ac4d9c09a9788823f1de0f5
 MISC metadata.xml 328 BLAKE2B e975d349093a2f893f0af0fc0dee56ec632e0beec6b0faf037b42ccbb21c7be7b530a6d8bdcb07d90c432f5f4f59eda56afcfccf7b54bab65b5c0d311aa658de SHA512 eac0fd6c81b46dd79a5b56e31103a4ba20ae40ac06a2941a5f11d8543c2358782882172e3fda1e2713846470f5bb1f5ed69b5bded0a60dde235a82158b399f83
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
deleted file mode 100644
index db8e695a6110..000000000000
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.35.ebuild b/dev-tex/hevea/hevea-2.35.ebuild
index 533d03c2ac19..0a0357d43841 100644
--- a/dev-tex/hevea/hevea-2.35.ebuild
+++ b/dev-tex/hevea/hevea-2.35.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt=]"
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index 97337b15d017..0a0055221ee6 100644
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@@ -6,5 +6,5 @@ DIST latexmk-470b.zip 458908 BLAKE2B b82f09227412a05fcb662530b2c6691bac72640e5e1
 EBUILD latexmk-456.ebuild 782 BLAKE2B a311af8ac0aff5f446d8ce7ae48cf52d57d6e520df65e59282a3605f986849c69bd1225be9bade4232b63c5ef60d669690072ed5cffd740ff4a97b2553cbc061 SHA512 6731634537a95f2928dd189d9937519977629be905c88aaa2e2044d6642a4600281f8ed84ebefe8f5c5166a88a4e9efb735ecff26f643b6177ee539f7a2d9972
 EBUILD latexmk-465.ebuild 790 BLAKE2B 3b76a87568185539e32c52b6f48ed306695b6fccb77339950c3f7a34f7aea0e656bc8043cbb731831f64b63e95aae59d14eb1017ee96d0ee17ca9c9f8824a236 SHA512 e264c72b3ad2e8c4481937c908afa5eed885344c54a185c7e2472dbd8e4414752e09672798c184911604947c0bb1f7aaabf28723550a98c2d3c79f94d4a26a76
 EBUILD latexmk-469.ebuild 806 BLAKE2B 5dbed5e5ae2f770940e7730914588c643112f3807714b451bc32a3c04fca4d72c646dfaf83e083696acf6141e9327a1a70fcb48b53f2bdc1a600580c1093aaea SHA512 e8fefd6ba3b85db4802572c2ea30229a097a245a9b0336203c5c1b435fe3f8b973847985e555ba07456a8e2b6a45523b9c1eac07697d4b62d2bc6982c9f864f7
-EBUILD latexmk-470b.ebuild 829 BLAKE2B b8f9e7a85a1798a8891e58d941390aeb1595d30179e267b13cefafe62e07bbfdfe6340f817cbc102d6487287b583fb83f804111e6074ef4cf3382a866f9651c8 SHA512 6ea194f7e933ed26a37ca8ed9752d4dd2c0f3e2aff9f16c0be69cbbecf3df0fd7cc1356d14b06a776ea8d04cc05da45d4c3c7f93e0562546d790cc7e480deec7
+EBUILD latexmk-470b.ebuild 822 BLAKE2B 57186a45acdac301e1203e6abf65891cad71d8e116b8b478ee28e7b56b390caed3dfc98f8372c2dee1ac549bc2030198c7e8580665c2a6a4899a3a6afa57675b SHA512 03dd5cf4a9ff4a84543cce80df84cc377b974f59e407cf792f620100700ab9a59662dcac7973fdba116d9ec20e16b3e26c322e842b6a88f025986d9ab5186a07
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/latexmk/latexmk-470b.ebuild b/dev-tex/latexmk/latexmk-470b.ebuild
index bc127260d7d5..f57f8a505d6d 100644
--- a/dev-tex/latexmk/latexmk-470b.ebuild
+++ b/dev-tex/latexmk/latexmk-470b.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://personal.psu.edu/~jcc8/software/${PN}/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="virtual/latex-base
 	dev-lang/perl"
diff --git a/dev-tex/metadata.xml b/dev-tex/metadata.xml
index d84609747040..35c0f3a50e27 100644
--- a/dev-tex/metadata.xml
+++ b/dev-tex/metadata.xml
@@ -38,4 +38,3 @@
 		TeX-em i środowiskami na nim opartymi, takimi jak np. LaTeX.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-tex/pythontex/Manifest b/dev-tex/pythontex/Manifest
index fe144f7b7f4c..1ffcaf7da802 100644
--- a/dev-tex/pythontex/Manifest
+++ b/dev-tex/pythontex/Manifest
@@ -1,3 +1,3 @@
 DIST pythontex-0.17.tar.gz 1800631 BLAKE2B 5c4ab31ccd890ca708142e83d047a46d704d2eaead611521a9f272f7a63cfb4016b991741c0338b1874d8cd2949c83b9c5ab59c3004e26540c171666a4f05e63 SHA512 ac248579f8645c225839ca9698b6193d2a7d8360a50e9a8406fae5616f54418a173635d1c2e8c47b18e85cdd1fa1e81c9435169c44f06fb19505c280f9bbaee5
 EBUILD pythontex-0.17.ebuild 1093 BLAKE2B 8c7e1b16c52ca62ee29fcd39e0f328a407873f49e203d9843d4b51244fa474660c82d7b8f47c3ab52184375f07b247e34c3a267711e0407e1b23e5012bed55dc SHA512 dc5ae4dcd2a4314c535d380aff29ffff0cc33732e7af38379aaacc0ceb6148f5766d87ca02dcb4f50c2ccd6ae4f32a436e63ed1c0e77fdbb7ddd4572d2d12560
-MISC metadata.xml 480 BLAKE2B fdf09739e0d2a40a4a3fa0c7b0e6c505531dee97e494b6aedef72b0438a56c4177b38d889f91354225e5254646bd0ef57cbdeff93a7531a58e78a2abb4637795 SHA512 87ea7295252f2dde5f1209cea871c1cbb9f25ec4c260aebfd83cfcb6653a42f24533c4131838568086eeeb437889872c66e7593366770ea7392948781ba6b508
+MISC metadata.xml 480 BLAKE2B 0ac3fbdddd8feaac11c7cd27768e304de9720ec405c7834532800dec08de2cc092016bac91e5b9f9d44b8dc33646edb3c63bae2961c58a9021c5a943be874610 SHA512 6258f6c5fd243515e27d98048171a753c8d39ef2f8b7646c7cc45db277ea73cf9b6ef124eba00c689dc668f231c675efa0db12d8536600657f7a7366230fd326
diff --git a/dev-tex/pythontex/metadata.xml b/dev-tex/pythontex/metadata.xml
index 05e2a866bdde..5957d3b8372b 100644
--- a/dev-tex/pythontex/metadata.xml
+++ b/dev-tex/pythontex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 071797e1a0c7..81e82babf5c6 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -2,4 +2,4 @@ DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c
 DIST rubber-1.6.0-alpha1.tar.bz2 97809 BLAKE2B f2b37c33b6d7ab105b2567ff0b70c5c11333dc76fd633005ae8e1ca36b91e5579a3f75d1c4312b343cffaeff74d65e1046642ea78738b6b1126d3b05b2534ec7 SHA512 7ccc367929c09e01ce8458de5b3e8596cbb549026e7a917a0959733ae63398e903dd3bbcb22493d46073771fb70049207036260104f24693c4a1736e0d534e67
 EBUILD rubber-1.5.1.ebuild 648 BLAKE2B 358b3bbef1162387694dd7a30ec08d2d35c1adcafb7a567e5ba16aa0b4c92a1615a86803168a7198c833a019e166627d3b2e43cdc4db54d48a4f7dd17ad02c91 SHA512 cedb416e03d3baafc07ee3bd17b165ae2edf4560379c7ed5f9ecc51990c9f661726f446f6943454c9ef502ebad05dcc8ac3c1cbc5036563eced1ccf20ee8df67
 EBUILD rubber-1.6.0_alpha1.ebuild 2953 BLAKE2B 2e9089d64951aff672dae56b40c0d226e60f0b1501f51b893d0b752c3fdf3144f173c66ba0249f2f068a010fbb78b4f60086fb7f75f5657c32677125dc28a361 SHA512 f2606ec0f1cb57692b45ac2380f8d246989dec57bd465f4636650ab9afd4b13e92b695fdaf5aab95bfdeaf4d7bc9bc298c2681135fdfb2e64a37d3f22d057330
-MISC metadata.xml 465 BLAKE2B 35b98091bfc187b6f15ad025bb22f275d45529b7a2d48c06dfaa0adf14012f5f71240b0b3f03933d5682f29f7df633c45144af7a2d2a0256028119ab8105827d SHA512 5feb82c15cee579697323da6ebcf8c16ad82ccfcdbd006efd98067b18ba5a635e6e19b04bd8051296dd0fc82e91ceef707f6c4073d6b062f5b006871e6355903
+MISC metadata.xml 479 BLAKE2B 46b13fc6345ba5abf4311ec9c7d80439fd319bb7dc1fd71266cd2cb204384654bbaed2ac8d99fa2d564deb0cb86c2f01e2b7af03a24cce98d02f5271b177dd35 SHA512 2f2461617cba1214ee5236899bcffa5153f4cad4948027d467630a85e02a21048fcde9abbd1dcb60293b92b49710006bd400d57dc29cb2878425362e6e065483
diff --git a/dev-tex/rubber/metadata.xml b/dev-tex/rubber/metadata.xml
index e6f72b434f14..2053914a56ad 100644
--- a/dev-tex/rubber/metadata.xml
+++ b/dev-tex/rubber/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>flo@geekplace.eu</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
diff --git a/dev-tex/tth/Manifest b/dev-tex/tth/Manifest
index ac6d0bf2eee8..f4eff366594d 100644
--- a/dev-tex/tth/Manifest
+++ b/dev-tex/tth/Manifest
@@ -1,3 +1,3 @@
 DIST tth4.08.tar.gz 1085293 BLAKE2B 260613fb9aa1e2acac5daf69db0ea5d3b6495dcb13f8eb3439a8774cf285fccf009dcdb77e33f265051bc9e9d35dda027212042678302b028efee7e4e1019e32 SHA512 c287cece1219155a5a23684b59f9c88459d7bbe7f029bfd6ca26562fa7a8f38699b4e5ce8a85a5f3544c081b5d1483f9533807b026dc85d130cf2e3eae507c05
 EBUILD tth-4.08.ebuild 666 BLAKE2B 2a9d67d5e06c6f327d6a2625ee5295b489b46826ee48fecbfcb94bbcbdb5922f490f1e27e5f38ee7db2236c82029e73e98fd0700f7b6a55cbec362d3340a87b9 SHA512 d72867fc1519fa7714c1c28a76d71f6fa8ff5c12ef92a68f3d57e92402d117f4a8fe57e4c2fb60ab2e2b5578067f83553138a714d222cf65e2c000a575d0b7ca
-MISC metadata.xml 322 BLAKE2B 2eb3263caab1343cef8ba5d1006dca8820c82b156c061e3ad879954a49d66d043959621bb1c57c1cbddaa5e13e56426ee5519cfb06f0ae05776039e621df1584 SHA512 be8a5cd22a1378bc98ca35ee5f5db177756d43d6b21d7d5d793dfbb1c3b9e0493348f727ceb05fcca7718a1b15a3b480df485dabec276c44d5397382ae51fb1d
+MISC metadata.xml 322 BLAKE2B a6342b97b2edea4f6152b7d6a162fcccc5765760ece1f053407af7206d8b40d1a4ff710c264662119b027d270afc85b6af714e36131e43b588a265310759bed5 SHA512 ac15d320f1fb5bf83675ef4a98e45de514a3716ee990ea275b9e7ed75b16aa4baf682ebd22bab03933dae59100f47fcd7ea2d348edb2540d454622780e1d9def
diff --git a/dev-tex/tth/metadata.xml b/dev-tex/tth/metadata.xml
index a74196a9e624..a680aa7d423e 100644
--- a/dev-tex/tth/metadata.xml
+++ b/dev-tex/tth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 760d9494e51d..18eb9808d695 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/metadata.xml b/dev-texlive/metadata.xml
index d31518622cf4..93ee476099e8 100644
--- a/dev-texlive/metadata.xml
+++ b/dev-texlive/metadata.xml
@@ -8,4 +8,3 @@
 		La categoría dev-texlive contiene varios paquetes de TeXLive.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5ac52c0e47a1..d4d38b002f4a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index 362869e7c07f..c89b2d8b9f51 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -2,4 +2,4 @@ DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8
 DIST abi-dumper-1.2.tar.gz 47287 BLAKE2B 93aef6a4f11ce33f04d6778d02749b4caf2eb782297957c6295d0d27f43386a92e0207b9bf6fbd17ae5e7f09964677810d6c42d3aea589fcfa46ce5f8353ee16 SHA512 cb081a8aaa548bb2360cfe55d4258c263990a4cc36feaabdafa0dc32252d19ce3ce0209e6af14c03157a144fea0e5ecb6700848f74b4da4c3ee2cdb6f0d860d2
 EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
 EBUILD abi-dumper-1.2.ebuild 584 BLAKE2B 717578d28a2891a6343928575c7e1920c9d4215ecdb5c9733d8d7c1f0e41237bbf9b1c8498274faa950adbf93d077c7b678f6064ebb9b9acf5959a07aeca8562 SHA512 ab6a32f5c940b23cff28694aa62bbbcd52f7d31afdab0a767676ac8fa169389ff07a82e3a200d04b17672aa15857fc1091d03e4dc858aaf6592c85f6e30784a6
-MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
+MISC metadata.xml 433 BLAKE2B 844c67edbd9da19821b37a591118abae5b4747cadb37b5e3f55c533fee2317fcaab096cdd98f52a39d1bd089cd1617f15155fcc25f9eae87ee81c6198fc4c28e SHA512 7df5d6be1eaa7bf63e8cdea387d5c8586e08b0319ab083112d055033663ae5cd25adfe4934bfe6c4eefe64bc5862b0c4051a0b675cf9a1f4b138a9e3ce343a30
diff --git a/dev-util/abi-dumper/metadata.xml b/dev-util/abi-dumper/metadata.xml
index 410510d0f021..92f91a0c2373 100644
--- a/dev-util/abi-dumper/metadata.xml
+++ b/dev-util/abi-dumper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/appinventor/Manifest b/dev-util/appinventor/Manifest
index 2561e9100542..d2d70c1c5a5a 100644
--- a/dev-util/appinventor/Manifest
+++ b/dev-util/appinventor/Manifest
@@ -1,3 +1,3 @@
 DIST appinventor-setup_1.1.tar.gz 85941449 BLAKE2B 35369899c93b9df1f594e9bb34883707e99685392578d46001b30857a368c0661fc48eff3877adaa169361063323239012e0b9305386df08bf5048782977f767 SHA512 fb04e6dda57e55602cc1f1a556062b7468ce9386c35710f3e84394500077c50bb7969b909cff785c100c46620794daa943c80f5feef22756a6ef8f809cf383e7
 EBUILD appinventor-1.1.ebuild 790 BLAKE2B 8f53854322b792c2271bf5845724ee3cfee2fc7645a9055235bb1c65a0cb54773985d5aca2953ac931651d2d638b87cd66815c4474ec5f18ffb28a45f45e19a8 SHA512 12e05ed2a1a79f43ff908a535ed077650f378e7e3684a3f1b6631d082c915d30b4b67b93bc401d14b75c395cf28ebeb316b6b874086000bdc8039942080bb195
-MISC metadata.xml 360 BLAKE2B a3f001a8ada9ad893348d39ea6d7003d1550bc34df0b4e4d5faa18b927824a1eb270f01e33a206491b9ea0e86bd1897ffc306d0a2b5388f53b5b1e5820b3db26 SHA512 b119dabacd1c80be435e61576233e8c0dbc64eccf2c6155a0aa769c576e9a29764ea7ed0639740f1c9784d980fcb51ca41cb3fa0cd3d3781b6926f850e4c7168
+MISC metadata.xml 390 BLAKE2B 68a8badcfbb961e1ef10cc082ea21a12c1c7f294d9b763b281178bd1cae1806372b0dbb78b0e2952bb1d053781b8317ef40e64b86889e332be2bc787a2686b54 SHA512 82b80bcb5af933eeb69832131fcb89468d754e8446954abd5715f800fe251a33f67199bb5a94f921339490422795dc0b786b19e1bd265e1b0c3d3086682a518e
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index 20e656c4650e..fc1965cec2cc 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>gentoo.power@gmail.com</email>
 	<name>Iván Atienza</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 209be8cdb0b8..7cb4d02fbb58 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,7 +1,5 @@
-DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
-DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
-EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 659 BLAKE2B 0944a49ce57ad39b193d05750e32a9bae8f8b8e2e7c9ffd9750b8a8650049a16932b3876ae174d5c2049d3a58c749583b82335d7097c4bb9d56bc425307a8d30 SHA512 f625785af87a23e9431d4f126ff847804c412f2cd20b88aaa31f10b9486d39375f07de312bc142f22ed07e537af36e64b65562eafb11d2aaa18b36bae2bb021e
+DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
-MISC metadata.xml 929 BLAKE2B 5bda8ae72f30ead09a4bdf81bcfd22632ddc01e3d247a56359c91d27dcd936e53d39951ee54d450a0e3485fab6cb76de79cd8e87d01e8e902aa425230b2e0d63 SHA512 99855dfdc7822edb3a93dc53ebab1230fd2ca72997c53641c7731fa7b9edc605cddf9b59594c26e37f0d16e691c541ae1046fbb593b7eb0dd92ea0b2f59d34dd
+EBUILD bats-1.3.0.ebuild 810 BLAKE2B f8d0e14431c65d7aaa3e2a76e749f749f14c6b14edde00c1c98a2ad3605b8f07d933db365ff9387d4939529e41f37056b08cbb2ae7fe8958dde099b781853cbe SHA512 620116401fe1d831669c93317fd04a45db787be2d2dc83a66718e95c0b5e5471536f4050551f12fb6e1435b4bdc95fda2ff00485f98beb6c1de4b0e79e231307
+MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-0.4.0.ebuild b/dev-util/bats/bats-0.4.0.ebuild
deleted file mode 100644
index 0af7a00bf20f..000000000000
--- a/dev-util/bats/bats-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	einstalldocs
-
-	dobin libexec/*
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
deleted file mode 100644
index bc519b1c1a97..000000000000
--- a/dev-util/bats/bats-0.4.0_p20170219.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
-
-COMMITHASH="03608115df2071fff4eaaff1605768c275e5f81f"
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-
-S="${WORKDIR}/bats-${COMMITHASH}"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/bats
-	doexe libexec/*
-	dosym ../libexec/bats/bats /usr/bin/bats
-
-	dodoc README.md
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
new file mode 100644
index 000000000000..0cc0631f5528
--- /dev/null
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	bin/bats --tap test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/bats/metadata.xml b/dev-util/bats/metadata.xml
index af9f791400de..f96261ed3f64 100644
--- a/dev-util/bats/metadata.xml
+++ b/dev-util/bats/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henning@hennsch.de</email>
 		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index c260b62a52f8..24054bf720ec 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -4,8 +4,10 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f
 DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
 DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
 DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
+DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
 EBUILD bcc-0.16.0-r1.ebuild 2191 BLAKE2B f37dfbd934c348952e18081c9a5226c6c3f22a0969eff3e735dd382a8a405d3d6ab6d21f7a93e99eef5586a93997f599f57c98ea31320adf0da27ead682d3eb2 SHA512 4c548079b4be151a5b3586bd0fa54c8cade52c1bdc86db44dd87466b1872b4a27a2d22224105319075597a55a19972028df3b3207545edb85e9f1ac3aff69d9d
 EBUILD bcc-0.17.0-r100.ebuild 2256 BLAKE2B 3f34b29173d23710d5004de36d5ad3daf1104e8bf37383c60ad7cf35a1b9163d4ebe10cbdadf6892d1498c841990cebcc0327fa56fb3d2c306f9890e9545b8ca SHA512 8e24201f577b7590dad0800eb46bb178fc129c83f1414e4553018654226ade53e393af432ec1ff13eae501bea1ece06061220abfc09ece852732f3d62446a099
 EBUILD bcc-0.17.0.ebuild 2149 BLAKE2B 9d95a1516f37660cb20e8d3fe7994d9d4aea9a202341d63729906f357fe220b8d4d8d74d720241ad6dce4fda1652b891f884e6c9d5d3aee035908fe1c8ceff8c SHA512 b00a2d8163ace6b5f6007e5b46c13173a6565c22a5d08815ddd5c28ff1dfcb07527c9eddb7cb6fa26501e77a11c0fce216c458b7477bcd7508b62319c8abbc78
 EBUILD bcc-0.18.0-r1.ebuild 2257 BLAKE2B 1ba922ba577d5fc96eb16a48973d3ea210c3ea95f1bd0111d44a54f113a37564598a6f7af92ddac52e5cce8b8f1f21d45557746e9f1a6972c86563cfd4d3d63b SHA512 242ee80534c9ab6fd9031160f57d9e0de7588c7102e9bb297378e7614c1c12b5333bcbae2cda0eda612460640862a956e5649ca697fe619680456deabc72c32c
+EBUILD bcc-0.19.0.ebuild 2257 BLAKE2B 1986a93182278d985f0d97959623705136f420c2bd44f3523719cc118a8cd121e3dcd771a60356553d413958c1e4d4d8401f4889d1898587f7db86c40a03f277 SHA512 6a97eb82c9118f3a1f2b53272f76c41191570c85513e36818071d229fcd55eb80db7d8fa7a205b5dd55c661d1239f5b42f14c38fc9334df1f70507cb705c7d55
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.19.0.ebuild b/dev-util/bcc/bcc-0.19.0.ebuild
new file mode 100644
index 000000000000..c78faabac7be
--- /dev/null
+++ b/dev-util/bcc/bcc-0.19.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake linux-info llvm lua-single python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.3[static-libs(-)]
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<=sys-devel/clang-13:=
+	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+	lua? ( ${LUA_DEPS} )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local -a mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=1 )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+	python_foreach_impl python_optimize
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 8e2676ffe611..4d58c7670c75 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,5 +1,3 @@
-DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
-EBUILD bcpp-20150811-r1.ebuild 903 BLAKE2B c12d2b5f335f5e0d247f14103366a52de0964e56f502d422e9b013dca58bce2c2d8a6194c69002397e4cde5f9a3243a99f03fcb146d02976b096eb61ea2228fb SHA512 9782454f880605021845b3635f4c873f2675f34a22533c43e590ad11f847a5432bacaaecb4aeaa35ada613ba2f37e2b538672bc3fcde99a3fa65167e23baa13c
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20150811-r1.ebuild b/dev-util/bcpp/bcpp-20150811-r1.ebuild
deleted file mode 100644
index bf4a9d304e7a..000000000000
--- a/dev-util/bcpp/bcpp-20150811-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Indents C/C++ source code"
-HOMEPAGE="https://invisible-island.net/bcpp/"
-SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_compile() {
-	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
-}
-
-src_install() {
-	default
-	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
-		txtdocs/manual.txt
-
-	insinto /etc/bcpp
-	doins bcpp.cfg indent.cfg
-}
-
-pkg_postinst() {
-	elog "Check the documentation for more information on how to"
-	elog "Run bcpp.  Please note that in order to get help for"
-	elog "bcpp, please run bcpp -h and not the command by itself."
-	elog ""
-	elog "Configuration files are at /etc/bcpp."
-	elog "To use them, use the -c option followed by the filename."
-}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 7bc38aaae547..6788168f3074 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -4,4 +4,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
 EBUILD bitcoin-tx-0.21.0.ebuild 2446 BLAKE2B c04f503e39e10d324786aeecd92a6d1a45475a54dd0b5b43bf0b9d72d754676904e0add0836cfafc0306262ff4315ab9012bcbc371091a1635019069f17c7e23 SHA512 f82ae432c1f1ec94e166cf2618e6c1da82f2aff3f1ccc82ab5b2553769e4fa6759a517733a4b7bf07401f0b19966ca7e3e4462833aa8a97663da69a3edc22914
-MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
+MISC metadata.xml 650 BLAKE2B fbe3b54c16dd1c935666dc6adb0994d84d7cc49a3c1da88bad93dd9c953586c43f4eb7a3d3e3ef6832e6785c0c7a503e976f43ee334af0821f2e079ea570bf83 SHA512 20f249e2987a45a939bbbb0bebc26c15423c35737368fb9ef5f9f939e2a8ad6daa24c5f11edc922e90a38735b7bbfbad3f69fcc8b407e2b0f2a8f35d3ab83b1a
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index 62d40fbeff4c..824b6d0c5c5d 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index 43319bf578b4..d66c2368f9c5 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -1,11 +1,3 @@
-DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
-DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
-DIST bitrise-1.20.0.tar.gz 4226859 BLAKE2B f358caf503e02bfbeb895ebe759aeceb2c28f0055676cc897b16ffacfadf2b0f48e7c0c495716d58d1a65b8697889eb3c6895a145bd7fa6828bbbe32280c5d15 SHA512 edb3e78fe8714604f2e514d80efc879b8a28e18846be9f7a9abc641901355b31ce6659ed30ef9c81bcefbe9816d48a6a3f6c292f8948c09c6e9330fbef154eb7
-DIST bitrise-1.23.0.tar.gz 4294480 BLAKE2B 2bc18a78822280fbca6039270ef61403cebd364aabca23b0bfd6b2e62b865cedeb046fe57641125bbddbd48922a34d89f59ed3c0b3e13b17497f485ac39c0932 SHA512 a41ddb2757f5d13675425fe943ca5834600f81233992fc80505347d87472df6268b98b82da9ea0349786647b2d7360b0a9019b41d1016ae231db348a5a0cac32
 DIST bitrise-1.24.0.tar.gz 4319920 BLAKE2B bc3a318453e32b1889310b21ef5f08a501da7be2f7da95498cbfc003c31d16490242c4972b40b74735731b3cf937b3cc55da08cf846fa2fbdf7b1d4b94bf818d SHA512 63a9fd3db3686140ed41f4f1e31e3787ca17e2e031a06f8561bfc581b01568ae5ff88bb9f81f0365bf60f4db6ba426fa3ad76a7363e31fbf31b702e7a9fe8b57
-EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
-EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
-EBUILD bitrise-1.20.0.ebuild 1486 BLAKE2B 16bd7ae58234830fe8a85828cf857b8be6a96742531f94de2f8aca024fc88afc2cb2bc4a8802f4cd02a3c12f37b62dd05bc981a34679a7489357f5de0b3c67df SHA512 ab6d0c7e346618d8500dd0308166d2195e6d711f34b5778ba097d96f90529b9e2b01714da454be938706011add5101c3b5b08b37bd00550c7fee5340505f2de1
-EBUILD bitrise-1.23.0.ebuild 1494 BLAKE2B 4d48900a79908b97c4f34b81d2cd38476cd0f92c09aa13345edf967a1cd04af8799a81e1ea45ec95795d68729967ae289f5ebc5582b3a4f166cba9caa357e2f7 SHA512 dcf78dcf576cdacb11ece035c8d5692f7b5c086662f8c9ab6adce6b7faa6fcbbc9246e1090b4f1b8e97a9c38c12ad790c53ab551afbeac0b9b83a201a74088ca
 EBUILD bitrise-1.24.0.ebuild 1503 BLAKE2B a69342ab9b8efb05350714cd0911208f0af7dec18507386525841729dcd7b65ad8876f866c25813910faccbc74e9e59cf2356cd3d2fcaa069252579fcc9ac030 SHA512 774505cb36d2a9779e0fcff09c3e5d2303c49ba397e811cad3c838c5ce2808ba7b5addaf2d3bce4452879e7d4e8373d4c9dfa7d524620f1e2b8a77f143ee4a81
-MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
+MISC metadata.xml 1099 BLAKE2B bfa625706dbbc318838dc978dfefdf3f1a574e0458f35ec2ada271c45196955e56339a313154f09d338ee3e790627161aad4e7b5251fc41185df35d71a408552 SHA512 9d31c7dac7276e5d202e06cbb1150cdc38b9005bd8fdf8f38e10aeb0bd17cf11a287fe1da4e4be8ea5b62930dfa0206b600f370c2d95500e27d340f7e7de9520
diff --git a/dev-util/bitrise/bitrise-1.16.1.ebuild b/dev-util/bitrise/bitrise-1.16.1.ebuild
deleted file mode 100644
index 35fbfb5fcaf7..000000000000
--- a/dev-util/bitrise/bitrise-1.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.19.0.ebuild b/dev-util/bitrise/bitrise-1.19.0.ebuild
deleted file mode 100644
index 2cb6e23d9810..000000000000
--- a/dev-util/bitrise/bitrise-1.19.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-1.2.0
->=dev-util/stepman-0.10.0"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.20.0.ebuild b/dev-util/bitrise/bitrise-1.20.0.ebuild
deleted file mode 100644
index 3a7a162eac9d..000000000000
--- a/dev-util/bitrise/bitrise-1.20.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-1.2.0
-	>=dev-util/stepman-0.10.0"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	pushd "${S}/_tests/integration/" || die "Couldn't find integration tests directory"
-	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
-		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/bitrise-1.23.0.ebuild b/dev-util/bitrise/bitrise-1.23.0.ebuild
deleted file mode 100644
index d5b744e68293..000000000000
--- a/dev-util/bitrise/bitrise-1.23.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-util/envman-2.1.0
-	>=dev-util/stepman-0.10.4"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
-	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
-		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	local -x PULL_REQUEST_ID=""
-	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml
index c4961be108e0..5f8e84767b3e 100644
--- a/dev-util/bitrise/metadata.xml
+++ b/dev-util/bitrise/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest
index 1ed0fee73295..62e2dad239af 100644
--- a/dev-util/bloaty/Manifest
+++ b/dev-util/bloaty/Manifest
@@ -3,4 +3,4 @@ DIST bloaty-1.1.tar.bz2 5363836 BLAKE2B a538cf5634ed72844bb128238a521caf375eaab3
 EBUILD bloaty-0_p20170420.ebuild 771 BLAKE2B 4ae64b49ea5409c692772834a7e6cd3b602551535f043caae15edd13ffb0a914189dd3cd2c0f7273e7de2041ad06516a3cdf70dca7868606c81feeed0798f99b SHA512 bb7c2e8461920737f157df3dfeadb8e8bcce290c23c88862e5870b36ebd1f6a568779117302dae9446f9343ba667f264738e120a047ed023cbe81e4ec855cac8
 EBUILD bloaty-1.1.ebuild 863 BLAKE2B c51884ed15178ef9a76090bb55ac298cb79a05e6cf884a48a40c666b8b62e252d62aad7bfe9047bda56c1daf67ab490d443604147a34bb87b42763a592651135 SHA512 2005017783c42be91fdeabdd9d20d80d42858882c19c9b35f74cfc7e358c86890a8a034854d49b55ab0ee1dde69a2b2c204f0f443861dd249d10dfd855a0d04c
 EBUILD bloaty-9999.ebuild 798 BLAKE2B c24d2c676dfcec75c3ee0246877eaa8bc094fb3abf8728af5096090093eaa2e94f4c685bcdb6ed03ef36bc4d70a65e1469e2b8a705792c44aca6994dbd6e0b4b SHA512 f2d7d6f6f09ca7cb021777e5aaf7530e3d69dcb967fe952d4fdf6e0156dad11a75cd3fab0dead023dcc58c8fbfef3be7756a43a78f7f882357f2e3a8a22eed6d
-MISC metadata.xml 449 BLAKE2B d5d4f84a73649bcf9dd3f72b67de86369c401dd65efea8455dcd42f20607d408c22bed118faed36f9768db0519b3da3e884261a7ef45ea596dbe3611b05194ba SHA512 06903ec854e5200edd588dbbab17a45364e76c324262c08b0b7fd1bf54bfd607b8275de5d4e5dc7c7ebcfe62bebbdaa6c00850747d3021bf2939db947cfef63a
+MISC metadata.xml 479 BLAKE2B 317d8fb6f9a6f2f93201bce10789c5f1d386c88d5d0ccb705ecb983e907b727d88b29a624dcff67404e92d6751ee1d8bcfce12df92a21031ad3f942b9465c196 SHA512 aeefd798a7cdfed4908b3c0d78273890578489c35cc4df763a408514065dc458f74bdf04cf24f3124566e90e282f66e5cf293ba2b15c381f978f0e6a4a640bf2
diff --git a/dev-util/bloaty/metadata.xml b/dev-util/bloaty/metadata.xml
index 36b90a82850e..c00900552aa2 100644
--- a/dev-util/bloaty/metadata.xml
+++ b/dev-util/bloaty/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ngg@ngg.hu</email>
     <name>Gergely Nagy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index fac14cf4e731..e2a7c6b4cd12 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
 DIST bustle-0.8.0.tar.gz 101175 BLAKE2B 30359a51da16631eda8f74239de7955d5887e12e7e99853dd930b12b351a0dd56425487c339ddf297dae02b271019c11329130aa0caabc4bf0c87e21600b707b SHA512 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72
 EBUILD bustle-0.8.0.ebuild 1503 BLAKE2B 5d8e656db77fbe5d4f480b3eb2c4d3bc250ec33f1ea88be44f9adb3bd770aeda50a81002432bc3f4a281228511739eb23801e6962334b154dd99f6d080c8c222 SHA512 294818518c6a600d12b38ac9b500ceb3db9f23bf61f1651a51a70e2a52bdc4c25364cd7e8b3fbec30c0f486f4a6da645bb3f6a05ffb8942234f83c26e3da1b1d
-MISC metadata.xml 883 BLAKE2B 20b27f6e236b75bc51e885700d41b3817b410d363a3fd35906e5403f805e167429227701a03ab40265199e3b436f814440ac5f6f5ccfbe9bc7d8bbada2ca0b24 SHA512 0cc6d7942fa68482f1bd72c33a4ace27b9f063a6c02be81f0e692b8372e9d8c8f683a5f1c6a858d85cd450089bfa38e23731c6befec9d29f9e875a26a39859cf
+MISC metadata.xml 879 BLAKE2B dd7ed624cc19a0709b022fd07ed49483905054c0f3f388029d6abc5c453ed9801df0fb00dea3a1d65e29ce83e7143fac94f51fe44c986256d1116df62c408412 SHA512 d36dea91a5ef5f1188f0447f422c1b68c3f3979ee80c290faaa2ce59bb1c5e39b61b8c2072322aaa4f601d95eff4132b19ea381e18deb545431085931eba9147
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index 0941fe5a2e70..56b725e0aabb 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="threaded">Build with the multi-threaded runtime</flag>
 	</use>
 	<longdescription>
-		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn&#39;t performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
+		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn't performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index d4804855aec2..8da2e84a59c6 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -51,4 +51,4 @@ 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
 EBUILD cbindgen-0.17.0.ebuild 1259 BLAKE2B d0ef9c3ac9e4bd3e553d795f54c465cf292385a29c6927f42974f575543442a92f090d91077ac6050ef059ee77f4a067609b48059aeb7c6b39099b677dcdf89e SHA512 4023de0539ae8b5627327e5856383157c01fdc4ff9f357a49e115b24e1fcf2b343a74dd918fcc35d0da6cfbe4dc37069c11f1f7253d7e097a77192dc9da84730
 EBUILD cbindgen-0.18.0.ebuild 1262 BLAKE2B d0541c52aa6a247dde67f4a2c23f7e866a8e10a3e36ecd3550d684cc9ba87b119fee7e4714d204d79927083ca0d93fba6a725b6e5da172077f3206c406167b67 SHA512 68d3b3158c2acd4e54d6030bd3bf39627cccbea317516fc9a850d89e4f3e862c538ee85d9e38944cadf7e59530e1bff885528e3187ad39210d7075543c824976
-MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
+MISC metadata.xml 334 BLAKE2B 641a12af31fbdf9200e6138f07f3d63b0ad8649899ba60ac078a57a32eab710c5731133258420e258028cfbe9cbab8078256f184b0968e9a901fd11212ebd814 SHA512 4592a95f23737588e949de9fa7a562467763d2b964787b58c5c1e34aeb55fef2f099ca9e2309e198417a8d58aa4ebca181394a7c06ad81ab1d10f185dc4e8f57
diff --git a/dev-util/cbindgen/metadata.xml b/dev-util/cbindgen/metadata.xml
index 677f50ae24fa..fe0097400fc5 100644
--- a/dev-util/cbindgen/metadata.xml
+++ b/dev-util/cbindgen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 0ea79c93c611..cb0e213f68fd 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -3,4 +3,4 @@ AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170f
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
 EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
-MISC metadata.xml 491 BLAKE2B 6f0b7012dd97eba9ad20c893d489f2793c1381da6fb86e24c6259dc54244632c09be3b0f4ce2f8259e43d86d2d01546d0aaa565982bdc13b575742b1716d66f9 SHA512 fe06ce409d20619b30f9f4cdb28acc77edd1964d7177accbd3c9597d7930f1ec260847112a12e5184acb835e436c9d30a100c4613ed54b678c545dc8d3824a20
+MISC metadata.xml 521 BLAKE2B 9a044dfb99ca308089285719aa47226d2ccb0d67bc1a927199efb6c8e41f1cf96cc484bf825de2d6700e6a288d3bc56795d4d6f2541cd3814c048d374229a562 SHA512 f9ee095d603f7ce6afb8288dcac0acb83042191f2e2013c4f26c1c06cafa658d0eb3d41a5e20e3381855544aca2d2b2a948745408e0f52a4028e4a7f54b427d5
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 23bc220af49e..1259638cdb5a 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 5ae0b7c89f12..e30f3b183ad5 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
 DIST CLion-2020.3.2.tar.gz 624043209 BLAKE2B 9a7d1ea2e83c06c27b595f042ba1a9768445ca0d79f6e2e227ed01252b49a72abf0f8c57d9418af31fc9f292bbe4d16306a1359dbf4622170f46d0e22f0b0999 SHA512 a70e9c8393ca8f96e51c2a575dbb67efee61d840198ed5d2dfff19a4d6e63f0612cbdc05752589b29702bb0c90ab1fa07859793f9bbd61d4a5afdd6a33dbae04
 EBUILD clion-2020.3.2.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
-MISC metadata.xml 371 BLAKE2B c653f9e3be558bce98e7e901ec8d83c5e4d415730e18d2130ee35b3ede543a234f6bc40046cfed81b622d64893079a7052bb6cba0bca65486d5461c673daf12b SHA512 70640a8a676dde6f366f3ad3f81709103f229bdda41b1af50f238668876335692c7f8b6806610c24df6dcaedd8d86f58c6eed1f9befe9fe66dec9d95827a574a
+MISC metadata.xml 401 BLAKE2B 8e7319368a46c0f6bacf401c7004b1ae2c96267eab37b3a0a2fd878b5b9c2da2efae52a81a586c3f7aa49a33bb20c34d186350f55478beae674bba9c6e4c90e2 SHA512 388b826fc271151a9a0223ba619f5893e2a33170d505ae032a455e6b46d2dcecf3753244b810b01e0d5f985ef916fb3b9ae2e4476bc6f47ede977077565a8288
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index c92d84e054d0..66d86a6c080b 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c.a.strahl@gmail.com</email>
 		<name>Christian Strahl</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>		
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index fbf82e45c462..f2d20fa2225d 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -4,4 +4,4 @@ DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994
 EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
 EBUILD cloc-1.86.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
 EBUILD cloc-1.88.ebuild 690 BLAKE2B a970f04b7567717cb94daf8cf59698318a0ccb7f5b8822aaddd497ac136464d37799c23faa6174601012a92578249a1d1c596abf48d6bb92d094e41fbe38e064 SHA512 22fe338db869c8e1d21dfa8f9e9f41ecf2a8036a33723849d1ca2ab2c77e53ae272ffdf70702e2c8086428066ccd9731aa066e3f43493d3360036e87dd146107
-MISC metadata.xml 699 BLAKE2B 424f272c2a398814052cdf40724b0daaf63985ef10194e38b2a22ad4cf67c90a9ee016d7e14dca738729d61b45d0cf7f2044f5801e6b35fe344ab152fe754d80 SHA512 7625ef4e35fda98f4a56ddc5a02f24af4b8a30db9fc1297092188078328ac8c2f188715251b41b3956c40a946b8791c5ec06e71c2edb271ffb0459add56dd7df
+MISC metadata.xml 729 BLAKE2B 5bf2df19190e3878bee61b9e0ce653f8a1dc590ec166e25619a0a391a548a58db2a17d7c0ae5549cb119e151d9d9d5503b0731638712c30f06bb93cf1a43a777 SHA512 7138216cf6d431a42f58db2a5c7fd19f828b9784aa17457d91ec4cb942427fc2dc2e4ad6e13aae933c621b369321611e54492a78c72b7b6b7a198c8e745bd741
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
index dd5229bff56c..37b3b8e879c2 100644
--- a/dev-util/cloc/metadata.xml
+++ b/dev-util/cloc/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>tamiko@gentoo.org</email>
     <name>Matthias Maier</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>foerster.florianjr@gmail.com</email>
     <name>Florian Förster</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 255334b3e811..95bbb5ae1840 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,12 +17,12 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
 DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
-DIST cmake-3.20.0-rc4.tar.gz 9427202 BLAKE2B dccf8c6815198acf44e8f6a6e0d080ec2ae6c13888c59a275ea2b010dc14ab4eca766a2a1e7cb26674ae67e7cb5a6700591845c945675dc2d87666624bef347e SHA512 967f0d56d5a7ce6cee3255852109cc9f121478a91a2ad387f26401e9024b3f36669ac9c393bfc20bbf06994668180fe12446936fdf5e7c2a095ee40972fa8f36
+DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
+DIST cmake-3.20.0-rc5.tar.gz 9429430 BLAKE2B 14a361c7f5a726a47b249c639c1cc1957332808008ff23a6523332e94a3f34530b7c5721b5e9000083894d52212b90483af06b28bae5b65fa753091865c12e30 SHA512 05950a0138e192875840a3d3564a81eb9e2175b64d91545996f7efe28290ec9ad3835110afb4493d402fb0cc968c0bd2142d14de37e1d38f6d8c71865f68f017
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6069 BLAKE2B 05856767d2ed7a4ba1f8c2fb38523b6e38f36da66866cf64ac2e6cc60c78aa8cd5dc8b9c3a19826e92c7c0343f9101901a401d1795a411bdbf245f3411a7e92f SHA512 f56fb725619b71f5451b5c5fa0a48e744c03ccd94213c85c965b7666b1cb14ec78eef6a4d9a21702299434a7f402077779b725d42c226b3eb5f5d3a8d2112e31
-EBUILD cmake-3.19.5.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
 EBUILD cmake-3.19.6.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.0_rc4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
+EBUILD cmake-3.20.0_rc5.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.5.ebuild b/dev-util/cmake/cmake-3.19.7.ebuild
index 3d40c53f2157..3d40c53f2157 100644
--- a/dev-util/cmake/cmake-3.19.5.ebuild
+++ b/dev-util/cmake/cmake-3.19.7.ebuild
diff --git a/dev-util/cmake/cmake-3.20.0_rc4.ebuild b/dev-util/cmake/cmake-3.20.0_rc5.ebuild
index 99b8eab6c2f1..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.20.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.20.0_rc5.ebuild
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 655fbab40c9b..e62ba4ad876b 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -11,6 +11,6 @@ DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deeb
 EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7dfbd160c21bbd3c83cdedd05a8a680e7a5e2a4f20849d20aa906244cf3699f43bc6452edbf678623cc943b18fca0064b55 SHA512 62a241a4617cd8c1f5d1416807c859ae3684b34323f08147e68d21834e6b25c844b63ed1d67738b9923d5f217071d1ec91c6485f7b31115f84a5b5b9ef7e67b6
 EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee4220215b3c3b09f2c533e359d51cf52d6433851634a7e94a30d1b467904760bc085ef9bbb449e61a33b9a724814c6ea128ac SHA512 24f38636a6945a7fcdcecdaf5e25a72fa4a8d035d974ff90117ec39f866583ef493aaf359acee65b3b4f839fb121657cc73cfd9d3260dce8a8c2388aa832bf8c
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
-EBUILD codeblocks-20.03-r2.ebuild 1856 BLAKE2B 590fcee00cfd835880e41861c831f352d3b4770c093fefdbd6fe5bd1c5f2d768b0b84285bdeb214d1e4fa2435cc1857234a560b4377cb85978ae8176c9fa8a7f SHA512 ba1b0bc9ba7fb021ff8ec7bcf940e8cd5a6972f62074f3ce979321224a4af092c831fb629b2014bb62a4cb4d3578b5a07c9e6da44e72e595bea9e6e53f42b9d1
+EBUILD codeblocks-20.03-r2.ebuild 1855 BLAKE2B d6c4104baa3bacde4ec517e18dc168d75c2a023b087e1496727501aa3bcecdb23f9e9168dff7a0f0662a32a58418454c5b836d24c80d6ae85713a557ca35d46c SHA512 da341a5f98a4d92016acb6ad996e894044926c2ec1eb77fd535b9463f823f99c3952798a0c8b4c59479efba4676fb51eeb364f76f02a31f54658355fa83eff6e
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
-MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
+MISC metadata.xml 689 BLAKE2B a9e3de97d9f9563282d9f1a8bda6dc24116b2f94aaf9edffe71ca8b6d144ebb2558771f06ccb206789db31ce39308c7e977c9e2d13b6e48448f5bc44e0362852 SHA512 9c08bffa22d33fcb962ec5511bd2a907ef2fa9dfef161035b531277c6ab8be1b18323e89b6dae8dae03ba54a4fa240a5332071f82c41667025bcd7867a1fd9a5
diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index cf1336f6f606..9e4061b5925f 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index e0bd14a62a12..6288e1a22b9d 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 00b1f7d5fcb8..6558b8d8b765 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -2,4 +2,4 @@ DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec
 DIST conan-1.28.1.tar.gz 1138639 BLAKE2B 91f277b88a2069efa3ad5f6209279888b4ac8cf5c359b7933ace6cc08c8b61a868dc8f7bb6a817fbdea378ce175229c91c9defb750326e2a5e31c4d6d528985d SHA512 b8eb4fe34b1614ebcb5e15bd0a827c5949e8588c6a04380632858e68eb4172361c96305154cc5a630254ed6236d7fd82e3a2c05962e312af3cedba41eac0a6e3
 EBUILD conan-1.28.0.ebuild 2463 BLAKE2B a7783520d53cd295fcf3ceeecc1f81c3eec33dfee2c00ae031e5fcfccb6025100d3c8e5606dd747560e466da3bd121c25594d442fc58f03a45a31e915a6a1910 SHA512 1cedc6f6ef4326d20c10eedcc43ba5646f352d494c094842ff00612778edc30f0b11509c229f2708c6ecb93ba333c8ce0e25b874d4421e2ebe79952acdc88d60
 EBUILD conan-1.28.1.ebuild 2490 BLAKE2B 89d467c461604d9636e771e5ed2fc06eeae74e835028e760e1977f31d7206141b8a06721a70c36b60d74014a88e50ec3e656cfed395acf740d15833b675648ba SHA512 b9ebe84ab7326f0ff432926763304c35ce7e394f0b590f06ea674d5a9c1c2784cf4430b7d32e4280e3bb732a72790c26fd62284c6d7b9ed5f3b8b0efbf542538
-MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
+MISC metadata.xml 769 BLAKE2B 912e435ff8d086998d1bd865a7162d5a99d3a0ef37ee7d6fec986cd9b01cb2c391d2cf1f0a51ee4fccfab5ef779aa03d65858dbe008e6dad3e260f90d2f6ee54 SHA512 5730a569221578910854ed135c963a6fa60cca712e48818cb7fdf97da1d57fa83f64ddad9b4ae994b6ec6d59071e98526fc6a905d43f7088dc1ff99a586b95f1
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index eec79f76ea9f..5d9619b58f68 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>azamat.hackimov@gmail.com</email>
     <name>Azamat H. Hackimov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index e4fdd73b23a9..24deb369da2d 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -2,4 +2,4 @@ AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9b
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
-MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
+MISC metadata.xml 329 BLAKE2B 6c2335992c9d68c7854c593e8f1290bc3e967706fac92fcc365d12f7813dd5490d8ef5921f0e1e61d0c13fa9b1b43ec20c8e7d95fd1ba926ffd7cf82bfaab4aa SHA512 0d318a3a6a0ed5b048d9efa5dff3e5c447ed3545997cffaf1d494898b3d35144dacd2cd9fdb8fed3adb1d39d9621b23734d04b7f6026256a891c3b1c501681bd
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
index a263231b7fd8..7877307ed7c6 100644
--- a/dev-util/cookiecutter/metadata.xml
+++ b/dev-util/cookiecutter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index a039520a06a3..7ff4e5774c90 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-4.0.tar.gz 1163749 BLAKE2B 2ae0f4658662ead0fe5a46a0ae521edf7677a7b64e3c7ce9bad374c4f953ea5a548cdfe1d9128821ab5031211c10f02d0728085e68db02e0d021ea16d8b38f1c SHA512 69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7
 EBUILD cpputest-4.0.ebuild 592 BLAKE2B 73d7c038ea6741080f10a88417eeb709dfeb31eb52909a7d1000f5f83ee3b446534c6daa0a01017ea44b3e0239a816897b5c098193ea5d2606635376403fe1b3 SHA512 de73bb6a00890c7359ab44ef539a849dd6cca1b7267d580dc302baf2ff1360478a6a5b25d3943572dbe08ea35fb33ae4c2bae1e54f623ef9d8cfbd11450dfba0
-MISC metadata.xml 450 BLAKE2B 6db81d287cbc9fcdc9ba0705d551c1acf638a54632702b36155ae2adf7f66410e8139f6b15d99d7f4f5ebf3e5d53aaa922bdd3d922def13bc1072cd2ef108b06 SHA512 fb8d104e5fb4433528a4b9a0a3dccfaae507dba49c0e0959db2b2f5efdc34e7cab0ecfb8c0101be1fa1d933bc36f9344d61f8f5c02ef8185c84473deee9e3221
+MISC metadata.xml 480 BLAKE2B f41963581448d203d06e41ef7892cec637c8d4bb7c78e8d246481ef9358c4cb0bea34a86e43fcbb7d54fbe27077d645f027aa0be763e1510e90fe3217791f823 SHA512 91b23ffa9d22b46901ef95fbabbc14d00a12e391e34f7c3a5f5ccbd7ee6356db5b6d0b6f0955bc0829d47dfad7f0a78f60272cef49e86e0c9235e34dbc218b57
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index a927ffa0fb10..e782d2cca8a4 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 90fdd2ca407d..017e34bd8b52 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-168.tar.gz 1569627 BLAKE2B ad0dcfeb40b4747877a5b0366706a57fea87229d23b4c7faa43e5dd12d8d950df52f42e74df862c52875e4722f046481ceb7204e74df11ed20188522e9874d9d SHA512 55025ff1a4e7664631d15c980aef46e6db4b22501989b1d58812a18eacb0e8c87028e6bed1599842b1ac072e0797d49a9d0796419a9678956c2f779b8909b6f4
+DIST diffoscope-169.tar.gz 1569438 BLAKE2B de2da2a4629c88e71aaeb694595ce04e7bcb6f24b9e84e47b197272c61bd8300922aed4b5d012a8b27abd4b8c4d62d45bc7361195ecf43498baec72753e15d2a SHA512 0207b97784218a324f4b51ad30b95a4c5f3cb072ff757b0617b87f1e8fcf6cbd0edd2f93e104206ce9c2870177ac56f3af171fff35bcaa40477e7c09b0921460
 EBUILD diffoscope-168.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
+EBUILD diffoscope-169.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-169.ebuild b/dev-util/diffoscope/diffoscope-169.ebuild
new file mode 100644
index 000000000000..a189ed464d44
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-169.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip zstd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
index 1590e3a83d0a..326ed77c8a2b 100644
--- a/dev-util/distro-info-data/Manifest
+++ b/dev-util/distro-info-data/Manifest
@@ -4,4 +4,4 @@ DIST distro-info-data_0.46.tar.xz 8632 BLAKE2B 2f19c670afd37a02279b420f795dd5aef
 EBUILD distro-info-data-0.29.ebuild 429 BLAKE2B 4db3f1370a5e2b3f81a36f9f971d3ef0b3f8f63caa731e06d76321655ce28345cb087761b700c039fc4ae86fc683982dfd39e7c7ea341ba2cd3272b635a94e3e SHA512 afcfea1a2a5bfdf74dc35205a191a3bc634223083243a56cbb3857132dd93aefa4d35e4ba8a5d641f3448dae18bef4262d8c71a721cee8bcc155458ed8db5793
 EBUILD distro-info-data-0.42.ebuild 448 BLAKE2B 200eb6268d8b44263352a770c0bbf5a5409cafaf94e7400f32a7170393923a661c3445b0eef73bb015470a5918aed95ac4db90c13596a8760fbda84411a379e9 SHA512 b456a4737d63d51b37b16a97ab55e7390bcbb0bc8fa1c633d7f99e0b1cca3f9d2e376c8260fc4ab426a3afc99cf5bb2add8f7051126ef768f33edd5b68b2e53f
 EBUILD distro-info-data-0.46.ebuild 428 BLAKE2B 15fddacd3972adededabbb2073101b2d0754d00e15c5355dc4db57195c6397435e17e3849c8237696b885c99a6bba2d58bf0fb9a8cdd593a35859f0d45d26466 SHA512 56759f6e46f3853774adbdf36d123bed8bb73a9d09500f1f060588425f2897aae980f9aa75f9c385f1e3a602ecf6842b91cdd1ed5a13aed197744e4786439ed8
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/distro-info-data/metadata.xml b/dev-util/distro-info-data/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/distro-info-data/metadata.xml
+++ b/dev-util/distro-info-data/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index b4b0801376b8..b43e32d4d242 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -2,4 +2,4 @@ DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb6
 DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
 EBUILD distro-info-0.22.ebuild 1968 BLAKE2B 9c2e9c64077fedc8dbe4be14065189e6cb429857b6bcdf1d7f015fdefc0a3003c5e4440313099581975a2773290fbf1adcea9908e55f37f2d7e38231c3a4e6e8 SHA512 52c783c7292c7a1545673117883fea87011a9ccffa270a53f6d459dd49835e0e75c53fe5dbae5351083a878dba18d0fc6cf861ff205b7dc34e62642d02cf82da
 EBUILD distro-info-1.0.ebuild 1989 BLAKE2B 7db23cf154f0d6ce2b3d25964785c22e407a2c67f83c8e360f7bbd650a65dd09e43c66f472c306834afb2559969e8ef6bac8541b0e87625a804d0a2e52d1044f SHA512 a34a1502ad6bb72330c1c410486c05184a400b5bf197dfbf72cb746c34e01687c4619825376e00a3ce2999c9bceb272a934798a5926d84052cb3b5fbeb8a1dcc
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/distro-info/metadata.xml b/dev-util/distro-info/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/distro-info/metadata.xml
+++ b/dev-util/distro-info/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/docker-distribution-pruner/Manifest b/dev-util/docker-distribution-pruner/Manifest
index f5f0ba858a2b..bb9cd3429984 100644
--- a/dev-util/docker-distribution-pruner/Manifest
+++ b/dev-util/docker-distribution-pruner/Manifest
@@ -1,4 +1,4 @@
 DIST docker-distribution-pruner-0_p20170401.tar.gz 6245783 BLAKE2B 7fd29631ff4072a4ef7a9486d8dd9f4b17a2238f94c93e670e7b7af4ba93c8a6577e9ce9f2d248d5d16fb7279f4517317e2c63413424250f14f01d4c47628f5b SHA512 8e2bf3c9be37f7b16299e1e7219d646e2b037ff40ba244bb2262905ab9864b212d7f96d844a096b057c6111440d66236f8ed5eb4a61e95f7a81bac3516f65cdd
 DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
 EBUILD docker-distribution-pruner-0_p20170401.ebuild 874 BLAKE2B 80edeedcfba5656cd343bc91a32daca30557e143b27585dcfb42f85c30d2b4ab0231a812ed5e97f9ff1e1ae987f6a871fd595114f1c7e3295bc2d4a38a099250 SHA512 8300b5002ce41c619fde53b0ca820b48583091b5bc62c3e4b495b5c0d5187061958312534a23b0b91fc0e64d69536849eba31f6eb3b9410f6d00cbe62b8c4313
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/docker-distribution-pruner/metadata.xml b/dev-util/docker-distribution-pruner/metadata.xml
index b372191c798e..7a38bb900964 100644
--- a/dev-util/docker-distribution-pruner/metadata.xml
+++ b/dev-util/docker-distribution-pruner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index a0bb546f47e0..91180c7789f8 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,3 +1,3 @@
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
 EBUILD docker-ls-0.3.1.ebuild 1351 BLAKE2B e89b9f857ddefade7c200913d879e807f32e32e9da2ddcc7dc19d1f081d2fb78dc66ed093140ea748e24650164a0671a99b87f92db717bc6beab4231ccbd1d16 SHA512 22bf7455ba8a43f84fbf2af83a2e9434723399751b8dd768f710690ecf30fcadb298d7c453560ead2188634474e9d6c86d56d3c16a7cbab4770f5d5230a7efb6
-MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
+MISC metadata.xml 245 BLAKE2B 476a73abadb5a9b79bf4529b9332a43921d93337b146410b20868bb24eb4095b96d24d177173cfdea63f6fb319225153ab4f0b325607e40b309fe063fd3c824b SHA512 4f30d91d4945294fec7285dc610abafdb477249fec9e54419c064035795f4bb6fb1257367c24fd0aca993910dad295375ef75321b813919ba64cb78131dafa02
diff --git a/dev-util/docker-ls/metadata.xml b/dev-util/docker-ls/metadata.xml
index 06d6a6e291cb..c629886abffb 100644
--- a/dev-util/docker-ls/metadata.xml
+++ b/dev-util/docker-ls/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 2e4be7e995f0..58d49fccdff0 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -2,4 +2,4 @@ DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df3
 DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
 EBUILD dput-ng-1.28-r1.ebuild 1879 BLAKE2B a089ff7d09249df94644d9895d1758c3522034f953f3b67c5cb0a1ad5e1fb16d6dfaed04466a386b97f18489f3ad64eecb4e94769a89a8e34eb178261e69ebc0 SHA512 90effe3d5955c3efeb248534ccfe60ca0014a2420a6ecf91b1bb4a25a2d367e241f3bfbf124a95d3b7126b1ecb629e871be5407bef3766be67c844fbb7958497
 EBUILD dput-ng-1.32.ebuild 1887 BLAKE2B 1bc7632022db9a31432a0e0aff656dd85ed98285e5bba4db7f396fc5f4932df74257bd3def1e254b2f5fdd56aba0988f9901925cd88040636d58ba3c961d2c3e SHA512 d3821e7902422740155533c50f24751427c0518f4a1af1417683ef9b470c9aa999e458333dd3d98a0bfcfa4d4266cb0367162ace06f51c60914c679dba3b29f2
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
+MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/dput-ng/metadata.xml b/dev-util/dput-ng/metadata.xml
index 425c7b2eae49..1e17568d9a77 100644
--- a/dev-util/dput-ng/metadata.xml
+++ b/dev-util/dput-ng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 464bfa6d19fe..a9be909fc100 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,12 +1,4 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938
-DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44eaaf8a2cde8da6f65a870212c2d257740a6d4f94da24f365ad49259d53c4f5447921b22754c63184001029620 SHA512 b378a504da5b00c6280b9efda7348c2d61015ce6477f3e4e4466f58d9bf6837457cd0aa9263b7d921093cca5ee26c4fab9950f7f75ca05d27ae646b3bfe22f9a
 DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
-EBUILD dwarves-1.17-r1.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
-EBUILD dwarves-1.17.ebuild 933 BLAKE2B 8cd67a6045d31537c2165522db80a34986107df4ba9180d3d5f6f2733d31ec88fd81dab7d6ff3b6c90485a1710bbb39df90cb7badb885bf0057e6999b0a3af16 SHA512 0a2487163441ab6570c36f0ec812e26fad471ce8ae6e9db5fecbe657c8b9f437b4a85641d756a9c38db2dbab37e0a1b5e798eab3ab0da8ffab83a79df267a6e3
-EBUILD dwarves-1.18.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
-EBUILD dwarves-1.19-r1.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
-EBUILD dwarves-1.19.ebuild 930 BLAKE2B 9a82ee9483d21c5b0d89dc02de73a656a3269604a76906b10b4e0e368812fdb4650195b67c6bc46ac1dee85c58cee119cd52bea6ab3a01319287ce7e8650e940 SHA512 5e6202ea6aefae993358b0439ecf1d75659a69533e63fe486dabc40d3faa63bf05693117662c951730c60f57bfc40c2692eeaaeaffb1076fa14d38ea8bddb558
 EBUILD dwarves-1.20.ebuild 1024 BLAKE2B e0a14962d98c00a5e2cb51355b2872665ffc085c4038074975860269e927a65fb0f0d05cf1f2553a10042ed50d0de5c1efc8a0ced01e4baf7a37b03ae88c8e52 SHA512 df1491907d9d5a56fc41d1277b2921d48fa8da9c8864ac52d0989888c3165e0a3ee6645fcff3d86bb948777c058b685eeeb83671107a2a57064db752f32db096
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.17-r1.ebuild b/dev-util/dwarves/dwarves-1.17-r1.ebuild
deleted file mode 100644
index 02626d8bfca6..000000000000
--- a/dev-util/dwarves/dwarves-1.17-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
deleted file mode 100644
index c3afae1486d3..000000000000
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.18.ebuild b/dev-util/dwarves/dwarves-1.18.ebuild
deleted file mode 100644
index 02626d8bfca6..000000000000
--- a/dev-util/dwarves/dwarves-1.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.19-r1.ebuild b/dev-util/dwarves/dwarves-1.19-r1.ebuild
deleted file mode 100644
index 10618245f8ef..000000000000
--- a/dev-util/dwarves/dwarves-1.19-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.19.ebuild b/dev-util/dwarves/dwarves-1.19.ebuild
deleted file mode 100644
index 7624739ac404..000000000000
--- a/dev-util/dwarves/dwarves-1.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
index b8a840f2dc60..b5c5fc39ff4a 100644
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@@ -1,9 +1,3 @@
-DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
-DIST envman-1.2.1.tar.gz 3033981 BLAKE2B a48c46d35a122ad86274867c246f1af998a983a67e8d30214bc6f3a989ad6b435a61ebad7f128803ffb9dcfc05af261b99cf3316fed93412c6ee1da873cc988e SHA512 bbec25964d868077c88a01ab827744633b325eb955809d4ec48a5224f6f8530c31b297b592f0280dabd01007bf75fd6ac3609c4d19be0332ca114d36725c7fb6
-DIST envman-2.1.0.tar.gz 3133726 BLAKE2B 8c5c87d43bdc22838036fe25ea6b48e702163d474169181257cef6f0fe4fba01b18f870d9bfee5f56b30cce13f47f6af70f4e55fcff221af77f14550a13ebb46 SHA512 c0b7ab5355332fa24ecd4166e3fdb1f02e589ee11288768a382a9556d2c3061b1930061873525e19b71451a47c72c09f5b7c6191b8564b0dec2a9c29dfbcf222
 DIST envman-2.1.1.tar.gz 3162514 BLAKE2B 3aad5bc174bbbfc52ffe219fae7590e3ebcf7ef0a5390add53e27232500b777f562d3c4662219732048f1a700f6a11da6aba490b3495d57d4da3610a02d544c9 SHA512 5d30bd23a2aa828786663f184707d776ddc0e71ee09e007f8075b99ce0c415db28e612a785ab1acd8767cfd8623939a82a7c0fc71e0fd6ce8d8ce4e0b0048cf0
-EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
-EBUILD envman-1.2.1.ebuild 869 BLAKE2B ed7a46805b4ee9acc2746795b09d812bf012c2975f7b75d501d94409c3a14312c9c4c985cb3191512203e9ce5fcedda346fed15c39bc79c4160f509a7041e49a SHA512 6dd367bd5ff737cb782192c35be6251a60a049f2a69a196171a2b2415b57d896a1c5db8702689ad926a6a445227cac50de83e00aaf2429cffb52133292357f15
-EBUILD envman-2.1.0.ebuild 865 BLAKE2B de902e8487a1978ca7de1283449ebeae631a01a10a54b26351ee3a3a7ab67327d28c308e4c56bf25cd22832906884f92f71c4faad7e616b181e875eb5793fd08 SHA512 b274313029889346172143f43ef85c234b55c683b0db93f37f1a52ba0222d3585d56e656045ac76d629578b8eef76a06c99ed3c9d12343a186b0d8d5b1308a61
 EBUILD envman-2.1.1.ebuild 862 BLAKE2B b938d2ad3381020be36b1ae3bc545b6684ee4e08a13c892722279ffcfbfef282638685bc5900f5d20eb4ce68ba49b26ed69fdfc33e02606d5d05298677ab4c97 SHA512 d799c413839ff772964c7101120fdf8fdeafc64ba4b64f09a5ac9c476e45683a28fc9037336034960d1fbee248ce228e3b894a08a18f63ca50ea7a1407d2e567
-MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
+MISC metadata.xml 972 BLAKE2B 657ff0da14d738f26a1ee1d2b4cabc5911643206c98d838e654cf2847c1228708daeb09eeccd4834ebe839a68353520c81ffd33b8143aa41b437b7ecf1a35f07 SHA512 6162bda597f2b568c1a20c8bc0b34b6583d0f8436e616609c27c984090f90009677144cdd8709269309e7ef3549f0278a21fe184fe043f3e4394e75e2d0e701b
diff --git a/dev-util/envman/envman-1.2.0.ebuild b/dev-util/envman/envman-1.2.0.ebuild
deleted file mode 100644
index 6713bc5a103a..000000000000
--- a/dev-util/envman/envman-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	dodoc README.md
-}
diff --git a/dev-util/envman/envman-1.2.1.ebuild b/dev-util/envman/envman-1.2.1.ebuild
deleted file mode 100644
index 6909eb936e5a..000000000000
--- a/dev-util/envman/envman-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	einstalldocs
-}
diff --git a/dev-util/envman/envman-2.1.0.ebuild b/dev-util/envman/envman-2.1.0.ebuild
deleted file mode 100644
index 20bf664c7e84..000000000000
--- a/dev-util/envman/envman-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Environment variable manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
-}
-
-src_test() {
-	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
-}
-
-src_install() {
-	dobin bin/envman
-	einstalldocs
-}
diff --git a/dev-util/envman/metadata.xml b/dev-util/envman/metadata.xml
index c93a133753ba..e5ee1b331336 100644
--- a/dev-util/envman/metadata.xml
+++ b/dev-util/envman/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 99c242990e17..2d8da91a6f0a 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,9 +1,4 @@
-AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
 AUX geany-plugins-1.37_use-stdbool.patch 1392 BLAKE2B ff3e64bb921b01cd35943d9fcb0a860d65ac71eb70298456c36c84713e71431838cb05823886faaa1d93050b759090625513dd263187649b89120cc3217a202d SHA512 9fa5960d9eb6418de7acb8efe94f9148deae1cb72864c149abc4ae1b22e23f53bd6905f72a901e052f33a445d31d8c5c0cd3dd8efe535ee58910585e759b0dbd
-DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
-EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
-EBUILD geany-plugins-1.37-r100.ebuild 3055 BLAKE2B 9983e26e9c6321b54e88e8258044983df16416982b9f64fe4285900e6fdae9f8775e63fbbf1c6314038c37ffec84ca825ecc72e5899418387f23daba6050c2e5 SHA512 2191e647cb73b6fad45127943109194fe7d6042032b6d3444fe7f09814e71a579da87e471347eac4a17532db77c6f1ba41efb8bea0b64c25203d4090aa28f8d1
-EBUILD geany-plugins-1.37-r101.ebuild 2961 BLAKE2B a297d54487b57a38ac1ab4ff323bffdfafe1f983555b62e2e399fb88ea718a1f5c2f6e7ab785bf49629048df2cbf0b01c88e7158086d25832d7f01ffbaf54d26 SHA512 d038947715bd19eb7df1db3a6f731eb7fd1b18f47a6dc809ebdf38f785f25e5b3480c0902faaf2e08b1fe88abdc01ad7206b601cef3de0b3f7233ca752571794
-EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
-MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
+EBUILD geany-plugins-1.37-r101.ebuild 2959 BLAKE2B 47de3cee422c58a9a6c7e311b0e63f6ce48eeea824ec9c728a503212022e230d0fa48de5ec67ec3cef9c7d98713138ba69253a01009a8a7d480ec557fb0cf66c SHA512 a70bd981c05c18e174e4943b91dbe39828b17aabe93e44b2c8f76adb675de304f91eada551ff8763edcfd1e954003efc6940732a3e5364a6e77006d55403ae20
+MISC metadata.xml 1200 BLAKE2B 60891abe35d87180eac8f9bc6a9377f3b3152b7bb3d5862cca5f31d423371302a9ba8556827e5db0e893ab82d73efdf4bf3c89c16b0c751ebc4d0e827c7a44a9 SHA512 ce72297d075ebb4ad7397116466706c35f767a60d5ed15e4642f27e0ec81bae20a1f6acb1154f3b8e92f8d83b480923890529219ef3f8b743e01b0a1928aa5dc
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
deleted file mode 100644
index 25e5ac4ea28e..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dominik@schm1dt.ch>
-Date: Sun, 23 Feb 2020 19:15:30 +0100
-Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible
- with libgit2-0.99
-
-LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99",
-from libgit2-0.99 and beyond. Arithmetic checks against this
-variable whill hence fail. This patch switches the checks to
-compare against the LIBGIT2_VER_* family, which should be more stable.
----
- git-changebar/src/gcb-plugin.c | 6 +++---
- workbench/src/plugin_main.c    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
-index b7083199..a911815f 100644
---- a/git-changebar/src/gcb-plugin.c
-+++ b/git-changebar/src/gcb-plugin.c
-@@ -32,11 +32,11 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
- /* 0.23 added @p binary_cb */
- # define git_diff_buffers(old_buffer, old_len, old_as_path, \
-                           new_buffer, new_len, new_as_path, options, \
-@@ -45,7 +45,7 @@
-                     new_buffer, new_len, new_as_path, options, \
-                     file_cb, hunk_cb, line_cb, payload)
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
- # define git_buf_dispose  git_buf_free
- # define git_error_last   giterr_last
- #endif
-diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c
-index 6fa6fc84..25ecdf6d 100644
---- a/workbench/src/plugin_main.c
-+++ b/workbench/src/plugin_main.c
-@@ -36,7 +36,7 @@
- #include "tm_control.h"
- 
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22))
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
deleted file mode 100644
index 854fb5782672..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="!gtk3? ( !markdown )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
deleted file mode 100644
index a7b45aeecd51..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit lua-single
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( ${LUA_DEPS} )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
index 7512e75d44a1..6d06c1275d7d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/geany-plugins/geany-plugins-1.37.ebuild b/dev-util/geany-plugins/geany-plugins-1.37.ebuild
deleted file mode 100644
index a1018068f128..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index db5b9d2b0d41..979845bc227d 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="ctags">Enable ctags plugin</flag>
 		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
 		<flag name="enchant">Enable spell checking using enchant</flag>
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index c2c83af080d9..84f326dd927f 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -13,7 +13,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
 DIST github-cli-1.5.0.tar.gz 396453 BLAKE2B 728939040d263bea4a623571d03589628f69bf3887b0bd79da14d36da8fa515c1d646c00b2aff154685369d0e1a4ea5b16ed788f4989addff28af233568f3208 SHA512 a75bf4ea913310f097dc158a1b8ce73453402af0647d918007afe7fa05cb5dbf1bdff1f4dfc4b4b0a301d68ed447428088e956fbcbc755ea9396ffb6cb77152c
-DIST github-cli-1.6.2.tar.gz 419795 BLAKE2B cd34782f2afccc976487082532a15e9c9ca6ff0d12b89469e4234290a62e98d1207f111e51a8d7cef2a4ae926046b1705e59cf7e95364fd0981357f79f6004c9 SHA512 5aed724fe508d118c35d5efd089b1d0b7a220ed4713567fff528c692c402a8ee5245aef62fd8f219bead5e2d55dc92f9f2ca60e2c048e43c04dd48f125cf56d7
+DIST github-cli-1.7.0.tar.gz 435572 BLAKE2B 303b9e7ddd23a538952d0f2f9fa7f18f4523ef5ff9c1779d5d1988a709f4b26991934b0481b1ac3adb6ae70e1ba5601171fbe91fe1038e40f527c0359d974524 SHA512 27d50b698dcf137a192a80e3bf8ca9c5b393f566acc7d504f4285c236d6e1ef6e9195afcb3025f5c0442b2c538f18db6c2d86e5ce7074af59db384e91b01bb39
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
@@ -148,6 +148,13 @@ DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod
 DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip 22492 BLAKE2B e82ef3edaee9b1060bbb2933f101a6298978cf568e79626b2d327d970da112d433ba4d5fd267b2ba1040c85de93a83d8649acb584f35766720506f2b2a950aae SHA512 5e6879cca425ea5b46f6acdaa71c63ca9da3f4d056ba50b8c037552595ff18151d0b399955c5037281a868c8c126753d95a36ed00ac2106dbe8d4e1fba915daf
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod 45 BLAKE2B deee82c732b1293068a504f976dac3949cfc27be1dc7ac3b82592b3b69c3bdc59452a4d9daeca0d6bc87dc2dc38062915e5b33bafa5073140c7e55d752777233 SHA512 7724e9b2ded9c666471067a7f1484630366fa91861ea59c86db0a8afbb56fd24ed9aaeba6c6beda12970f208395f9829c9e854586ba55acd28b5cf3765e65071
+DIST github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip 10305 BLAKE2B 32865c53f9f3bae9b47c406dc8c33b35fe35cd74fe105893ad2aced99dbae2f4c76912f28872903c251f85ea61246ee2b77f1a5a93acd29e6f16b9bdd1eebcef SHA512 aa5184acf872feaebc24389af0e67938d7347b0813ea224ff5799dea9abdc0ca8620c336fca9b28cc23d31531067578964ba1d58037266bfbd59d4f36f586a81
+DIST github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod 105 BLAKE2B 38e253824f75e345a5c8183f2d691c11625baab82c55f0488ab0e8e90700517a4942fd3105dd3e9aa2a495b7b5383e760a15c2a4ee7d5328f3301bb04f478d5e SHA512 5ba24b125bc8e8ec720cedc56d426be715818f5c3d9b3779026caedf7a540b3f2b4c0097e9b002bcbe10ca0cdbd3293a034fa5792f76d056cd29996a5c2905c4
+DIST github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod 420 BLAKE2B 69d19bcf04af4ff9dd5343aa1000151ee7231cccda034b1810b8289d7e3e443cbf66d7f6b4110f8ff8959cc7a935d316ec98ccb0cc6e933dbdda29e44f96c577 SHA512 1d0e9abab589f422864fb58872c0f5188749379c76ae7498cd66313a8fff18cf322ad66425e4462d4dcec001f91b36aff8e450f47d597e475891cddeac72cdf0
+DIST github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip 128499 BLAKE2B 069b6d10ea7cc9d22034e7889652d12d0a253c32375f0e138ae7b8178818b88dae2a4c20a95fd591eb95c7955571ab3fc8b179fa1b2416cd67c7b76efaa7d1e0 SHA512 1177920ae8e1705a70bceff1272969639958447cfc44b1ad1d3ab1cb490632ee89cf2507fc083623f88d9a959b05c943511a237a3e4ce8d6fae9db60107e08b5
+DIST github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod 46 BLAKE2B 0268917d388205c33d5717f9f405ff0fd46077d8aa78597f879a83d5a94394f50862f012a29ab7a9fd545915601a63e9435d29b522ad8b2b3ece469bfbc8ca32 SHA512 282906eeaa17b0bd648ca60830c232a640d81a504a248745b792e54255e4b0bbd71b49b044105328d42860fb49427defc9268506c67bce067b708d5ec7408557
+DIST github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip 12666 BLAKE2B 5ba82f4c8b59e064ec4b1d06f002fec03d4e26a8649115497caad3a5beb981f7d5756b7046f09a9975abf41b134de78df2c5edbeb22c33941903e66970524f6a SHA512 2fd289e8e5fb60d0d6a9e5e6b3ed4279311f67987b670ef7a924ec5d85388005ed8594f363463929dcc42ba1b855635f1ead51faa351ee06fe36a42b17a84316
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
@@ -354,12 +361,15 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip 1543048 BLAKE2B 072e92fdb409e64a2123db40fd98b9705b87fb3cee94355874125daa6c6f65bb8b7ef3b58b8f5ad321b1a89d3cf3667475b2b7d9017e049696a33a9df2bac78c SHA512 ab2dbbde4ddcda3c66b54f574ffc90fe70be3c11d0a914a4410c764e91b0c20f4ccfd36b9af29d639808d3155e645ea5afc5a6942cf36a5e7d1a318f037cade4
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -427,6 +437,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d
 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 honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -434,6 +446,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 EBUILD github-cli-1.4.0.ebuild 23946 BLAKE2B 92bed0b0cdb4dfbaaedaaa0a1422469442e0e29c09b82693afd9f06ae170a7b52ecbad5e8e8a14bf6b26c8fe3eba9439ccacbd0991ff0eae7682e7efa6ace240 SHA512 31d547fa6b05903ca5cd486c28c59b4aab8babe5f6ddec9e6650adb8f17a9883573bce1fb457dc5770187a6b3271f9fbf0cc738b617df3416ded496627c99f8b
 EBUILD github-cli-1.5.0.ebuild 24088 BLAKE2B 915dc87d77bef29406bbf88aba29c98c197bdc9d6a9a4cedef87a2f909b9070250da3caa0bd9188f1a2cba823eb42e1dbce60f20bc9d96f94df020c87b282a6f SHA512 6844b174514097335920afaeccd08266b312202b3c9d8064ba12ee9b8956f1126f8edc73479f33c07aef1e61e718c7d91383eeed3ef323fb7bc972f981082026
-EBUILD github-cli-1.6.2.ebuild 24144 BLAKE2B f82595ed627ae2e6c1daf29c6b26082c4c40201bc33e551ca93c8878738cec603752f1b0cab3d7e24f4d9aa1500c0a91d517670f3aeeb8bbd6f7913963e12119 SHA512 59b81a1f1935cf84374148d4bb62c73c4e63975faa66dc5e1624d50046a6121ce5201f59cad8ca026dc202611cc1757e3aeef5b22d088441fc11ab8208e43bfa
+EBUILD github-cli-1.7.0.ebuild 24673 BLAKE2B 3fc5070dc9d6a2db4cdae414c35813c0e7ae9a207f55ac5bb73635dc75ac1112fb324e12a1e7db2424a9cd0fb8d200b5254588486e6b69afead2fe7b141da3b2 SHA512 18613c00fb4b2379ca6c5b7a709d287d8a868780c802d7dfe8c913fc806b7169a41a0b7f21efa3b6118a2706027618ce6f9df6df9d481e721cf0d63ef7d37239
 EBUILD github-cli-9999.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
 MISC metadata.xml 332 BLAKE2B 54306af02dde121faa49501abda73a96982f0e2aa0c34b1bc3698594d558b52aa4f98cf2c966a5d3cc2df698cade7461d99de437a92edc41958d0057c8cfd339 SHA512 f3aec1ccc8b69282598c560f63162fae9fadb47e784725e0d05631d2b4686bfd001f6b0a899dab39c977a9da5788b5c38f796723653f80be2b65525ea5e7f930
diff --git a/dev-util/github-cli/github-cli-1.6.2.ebuild b/dev-util/github-cli/github-cli-1.6.2.ebuild
deleted file mode 100644
index ae5398409433..000000000000
--- a/dev-util/github-cli/github-cli-1.6.2.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/firestore v1.1.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.2.7"
-	"github.com/AlecAivazis/survey/v2 v2.2.7/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/MakeNowJust/heredoc v1.0.0"
-	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/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.3"
-	"github.com/alecthomas/chroma v0.7.3/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.2.4/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/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/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-	"github.com/briandowns/spinner v1.11.1"
-	"github.com/briandowns/spinner v1.11.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
-	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
-	"github.com/cli/browser v1.0.0"
-	"github.com/cli/browser v1.0.0/go.mod"
-	"github.com/cli/oauth v0.8.0"
-	"github.com/cli/oauth v0.8.0/go.mod"
-	"github.com/cli/safeexec v1.0.0"
-	"github.com/cli/safeexec v1.0.0/go.mod"
-	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
-	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.3.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.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 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/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/enescakir/emoji v1.0.0"
-	"github.com/enescakir/emoji v1.0.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/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"
-	"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.5.2"
-	"github.com/google/go-cmp v0.5.2/go.mod"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/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-version v1.2.1"
-	"github.com/hashicorp/go-version v1.2.1/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/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/henvic/httpretty v0.0.6"
-	"github.com/henvic/httpretty v0.0.6/go.mod"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/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/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.4"
-	"github.com/kr/pty v1.1.4/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-colorable v0.1.8"
-	"github.com/mattn/go-colorable v0.1.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/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"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
-	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.2"
-	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/muesli/reflow v0.1.0"
-	"github.com/muesli/reflow v0.1.0/go.mod"
-	"github.com/muesli/termenv v0.6.0"
-	"github.com/muesli/termenv v0.6.0/go.mod"
-	"github.com/muesli/termenv v0.7.4"
-	"github.com/muesli/termenv v0.7.4/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.4"
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rivo/uniseg v0.1.0"
-	"github.com/rivo/uniseg v0.1.0/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
-	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/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/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v1.1.1"
-	"github.com/spf13/cobra v1.1.1/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.7.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/subosito/gotenv v1.2.0/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.2.0"
-	"github.com/yuin/goldmark v1.2.0/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-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-20190530122614-20be4c3c3ed5"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
-	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/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-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
-	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.4"
-	"golang.org/x/text v0.3.4/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.13.0/go.mod"
-	"google.golang.org/appengine v1.1.0"
-	"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"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/ini.v1 v1.51.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	)
-go-module_set_globals
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			${EGO_SUM_SRC_URI}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT+=" test "
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-1.7.0.ebuild b/dev-util/github-cli/github-cli-1.7.0.ebuild
new file mode 100644
index 000000000000..ca482d4bfe87
--- /dev/null
+++ b/dev-util/github-cli/github-cli-1.7.0.ebuild
@@ -0,0 +1,504 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.2.7"
+	"github.com/AlecAivazis/survey/v2 v2.2.7/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/MakeNowJust/heredoc v1.0.0"
+	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/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.3"
+	"github.com/alecthomas/chroma v0.7.3/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.2.4/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/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/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/briandowns/spinner v1.11.1"
+	"github.com/briandowns/spinner v1.11.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
+	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
+	"github.com/cli/browser v1.0.0"
+	"github.com/cli/browser v1.0.0/go.mod"
+	"github.com/cli/oauth v0.8.0"
+	"github.com/cli/oauth v0.8.0/go.mod"
+	"github.com/cli/safeexec v1.0.0"
+	"github.com/cli/safeexec v1.0.0/go.mod"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.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 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/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/enescakir/emoji v1.0.0"
+	"github.com/enescakir/emoji v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/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"
+	"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.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/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-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/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/henvic/httpretty v0.0.6"
+	"github.com/henvic/httpretty v0.0.6/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3/go.mod"
+	"github.com/itchyny/go-flags v1.5.0/go.mod"
+	"github.com/itchyny/gojq v0.12.1"
+	"github.com/itchyny/gojq v0.12.1/go.mod"
+	"github.com/itchyny/timefmt-go v0.1.1"
+	"github.com/itchyny/timefmt-go v0.1.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/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/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/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"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/muesli/reflow v0.1.0"
+	"github.com/muesli/reflow v0.1.0/go.mod"
+	"github.com/muesli/termenv v0.6.0"
+	"github.com/muesli/termenv v0.6.0/go.mod"
+	"github.com/muesli/termenv v0.7.4"
+	"github.com/muesli/termenv v0.7.4/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rivo/uniseg v0.1.0"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/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/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.1.1"
+	"github.com/spf13/cobra v1.1.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.2.0"
+	"github.com/yuin/goldmark v1.2.0/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190530122614-20be4c3c3ed5"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/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-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78"
+	"golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/appengine v1.1.0"
+	"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"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	)
+go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+RESTRICT+=" test "
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	unset LDFLAGS
+	# Once we set up cross compiling, this line will need to be adjusted
+	# to compile for the target.
+	# Everything else in this function happens on the host.
+	emake
+
+	einfo "Building man pages"
+	emake manpages
+
+	einfo "Building completions"
+	go run ./cmd/gh completion -s bash > gh.bash-completion || die
+	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+	dobin bin/gh
+	dodoc README.md
+
+	doman share/man/man?/gh*.?
+
+	newbashcomp gh.bash-completion gh
+	insinto /usr/share/zsh/site-functions
+	newins gh.zsh-completion _gh
+}
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index d7f3799302b6..0fbb442f073d 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -3,4 +3,4 @@ AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf9
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.6.4.ebuild 1697 BLAKE2B 91fddaf844d76a6b68f3372cb78992067b4c5c552c4dd8bdf375384cf0346382becd9da6de7cabf5358271c3c0df1573d27e4bec7d8625ca68df35bb0e01c104 SHA512 39a8ae3a8b7bedcee0bb9ee7a490555d8640cb098da23042e5d3b81967f2711bdee8ce8631c02a2aee3e6f3864022f4046793bf47f9c20ea628adc9e176c67fb
-MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
+MISC metadata.xml 412 BLAKE2B 80451fe26f86f4f2e5d7e9aa7618517dc576c11970061d3f45509554a522e7b7f3e46a34cbb55321e2c482a49d277dc5c73889e453f846a619b836171e22b926 SHA512 16e000084a98ac86459f1e4c6193a8cdda17194191edc0f9478b50b60bfbbc1f6e555a6ecbaf6c5a7fa84744fcc85ae8f8a626927387759543438be847d3e108
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index 8dbeee5f3285..566066d8bab9 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>naota@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email> 
 	</maintainer>
 	<use>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 92a70307dc5d..bce3a4208b7a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -3,4 +3,4 @@ DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc249
 EBUILD glslang-10.11.0.0_pre20200924.ebuild 889 BLAKE2B ca2ee26c46fa049f042b37e7ff9e8d10175c3a195e810ea6f840c16c72d0214fdf187438ccac266a3923533db0cf16ef121dda96e2371a1054c329d9c71696dc SHA512 d08fb9ea49b0ec7a2f2d367ab6f903111758847e0707233715142c4ead94702e81ad01f18c0733a50d1ee79a858a2bbba02d393612dd5890b45517c33d6f8e90
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
-MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
+MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index c277a8030673..4577a9fb6988 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">KhronosGroup/glslang</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 021a58ec9618..46bb3c965d8d 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
 EBUILD gyp-20200512145953.ebuild 1605 BLAKE2B 01ac4411cccbc243f96a0bbc1241a8f126e324004db0ab0ff576c8a7b6f386ace0dce51fb0e6eac87e793ed3851700ddaa97b5b2a9ae599cc3df7a7a8e2e3316 SHA512 f234adc429a697b3925ac91702b4b3cb398f3b2b03339efc6d645519f52752cf0d08d1825bec9b7a9149db37e82231c2b166172fd0608044d98d0eb3cf377354
 EBUILD gyp-99999999999999.ebuild 1582 BLAKE2B a1ebaba4e2bd2ada60cfc78599e298fea52d4f59c99054b3f779948712749086a8e63184f94fd76d12306e9afe04bb11783c89993068ec6146097ecdda961c02 SHA512 d478ca981d03d2f6d18ab4f1a7a63b433260ee2ff03546ea750d9636bb83865c32596330c97df6a50ca1b032b477dc36f5b2fd7c1b91d70100e1612a03cfad8b
-MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
+MISC metadata.xml 410 BLAKE2B 7b2731279aa8599e77a19c158b27de326fef97aa7124475e14b141890752b1879a4a41ad32236688dcbbd7ed1b4823eb5d7fcf26641b5322abc3e20c60cb0871 SHA512 c2edf0810bb34f1a042f48d8a8be616506916e60e61fa0eade20abfc38f365ac11eda040c6232ceda3691f8697e7479547a1198cd1d5d9d49605f5b87fbe6f7c
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
index db283761922a..e130c460034a 100644
--- a/dev-util/gyp/metadata.xml
+++ b/dev-util/gyp/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index 4ebc8173e33f..7d6666c983e1 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -3,4 +3,4 @@ AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126
 DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
 EBUILD hermes-2.8_p20180315.ebuild 1136 BLAKE2B 92245afac3ea67f50b05c4ea6139a71aa54b187b8839b2e5514127bfeab88ccde12590cafdccb491b75f15fb76eec6e413340f4e12354fc762de74947d3b79ea SHA512 8e6eaaf7dd80e25d524ed4877474432d8a6a78fa8f882f0cf261ce6f441711751f66d1034578ca8f0c14024e3e3765f488071bbea271edcca372b6edf784fc61
 EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
-MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
+MISC metadata.xml 370 BLAKE2B 758ce0d00e5bf3bff6078c8456cfc9e7fbee1d6d16c66596cae76a4e5e25ab7ca2ae31c7913f8755cf5b6f0f28b938ab662ee0d1dcb679d4f1b0d67cff18049d SHA512 83028f7048a0f199f412cd4e20ebf3a01d38facab41346bbee98c63c47b75dbeb0d4b93af8ae2dff8d56cb98044752cfd7177b107869925f56f229a9b449f9e5
diff --git a/dev-util/hermes/metadata.xml b/dev-util/hermes/metadata.xml
index e97c4322aa87..8c843a2c3d41 100644
--- a/dev-util/hermes/metadata.xml
+++ b/dev-util/hermes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index f4c4f08ed5b0..1588db70a04d 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -7,4 +7,4 @@ AUX hip-3.9.0-lpl_ca-add-include.patch 418 BLAKE2B 7d1439e51b1c5e20fcb1768c5f33b
 DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
 EBUILD hip-4.0.0-r1.ebuild 3817 BLAKE2B c01eb20493f27e9650d1cad3413b7fa14ef799d67e8b02de235d1e37a4f6633c8f0f6ea73fa8f075d0a10ffb2dbe0ccba4a65c4a505e665be7d657d5c773641a SHA512 2b5b58f13d832572f547f5ba4e67daf62b180523424e1e4605e96d1b7d834b700f8aebc95b047ab08ba36e16098aa07ddf7f9c91654672b00edc863bb5c25d68
 EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
-MISC metadata.xml 582 BLAKE2B 2b99c57a359c2ede87080fe4205b41092abedb50c63f4d6124c4741f765f8167322ce901f27db5a34fb9822852db043d13bbe0e5884916ce845a3337719b25f2 SHA512 da4a80f011b027d3a56743fe0196f5c85a79bd9a1bec6749ab908a8a372008ffd2b47198dc9913d5343e6c9ec7e7a05823727f6fae0608130542ffbb2fb3e357
+MISC metadata.xml 596 BLAKE2B 32b0fcf237a501e546584504ead6f5cc817f5f7891715df60d9e6a8863a87d779f6ccdb365536338440b3bdeb1f541dc481f2a29c014506519f6c62f9834ef0d SHA512 b67b87b25453471fe1337c78095341c00fe6e76a4d222390cb47d1b52226f7ebdf23c1f66f5926819a384ac1473cb1d6f22f5467ec1c600a5a96eef5e24fe1d2
diff --git a/dev-util/hip/metadata.xml b/dev-util/hip/metadata.xml
index db491e13a348..464f8cb17073 100644
--- a/dev-util/hip/metadata.xml
+++ b/dev-util/hip/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 9f5c122c9188..865b4c7da5de 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,9 +1,7 @@
-DIST howdoi-2.0.10.tar.gz 25921 BLAKE2B 6af903f11ca240eeaf773957a34f8eb585067c589d3a51b449f044bcc5b4e885637d3f4e7f266fbe39ccebbfbe6da7f12feba75f196e99d4215c270a58afb506 SHA512 534d292bfbd3b2c44dd4101faa5642ae71d6c0161d45fe082dfb4129e6a594d13148970029e9c91e3672911fe55ab570fddad352c1efa405e6312b3c3c16eca4
 DIST howdoi-2.0.13.tar.gz 26143 BLAKE2B 39eb23c94ec8883a88a1b6205af69668396ab4bfeccdab9994bddd3fcbe90b78d2348b4b3b9b935bdaa936edb1fce31c05aab6308195612c535d516e5aff332d SHA512 b44e506ecbaf8d10590168ab62ab4e943bfe832e8b981109647c9304d46956afb343239575e1196dbb3284c9db9831839cb9933aca0eaff037f6454434c8194b
+DIST howdoi-2.0.14.tar.gz 26675 BLAKE2B 901a39d7f9dd9f2dd5931e0c9710083280f067687a6be985188f459cf9b82e89993f352128e3dc616ea6395bf853762f1d8a7b1fd79c0e457d71af8859e9dc7f SHA512 7c913a0b3d6fda60a140520406956c6ada291ae9e9d7116a10adcb1b31a6fc6d22d221285e852d07bade33e1c075f0dc489eee39c3f4db420454d4813ab33254
 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
-DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794
-EBUILD howdoi-2.0.10.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
 EBUILD howdoi-2.0.13.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
+EBUILD howdoi-2.0.14.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
 EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
-EBUILD howdoi-2.0.8.ebuild 695 BLAKE2B 2ae9852f20f40a24cae7afcd591022d1c824ec2d34bb1939ad3321ea92e6507071245fba5064fe229128eebb31d6a99c4067d7fe53bf1b3558f304332fc71c52 SHA512 526ac025b6ef755e21b26db1d3fc0fcdd672ade3b24c642a151a95c4546dba4e391728352ad6056ccacfad7e3211255eb8a2b3075a7cd9483700622a983db134
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.10.ebuild b/dev-util/howdoi/howdoi-2.0.14.ebuild
index 8fba32c5aa56..8fba32c5aa56 100644
--- a/dev-util/howdoi/howdoi-2.0.10.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.14.ebuild
diff --git a/dev-util/howdoi/howdoi-2.0.8.ebuild b/dev-util/howdoi/howdoi-2.0.8.ebuild
deleted file mode 100644
index a9a2eb1a0456..000000000000
--- a/dev-util/howdoi/howdoi-2.0.8.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
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index cd7658655862..3b84dbf3adb4 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -2,5 +2,6 @@ AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28
 DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
+EBUILD idea-community-2021.3.1.203.6682.168-r1.ebuild 3954 BLAKE2B 0a76c751daec71affcd5b117559798b48862a89e1494cd27b328c27e5cb64fe59cbfc0ca28475e7572f418cf62920aa79d69a29c07f740e05bc031b8e1ec819d SHA512 bc0833aa192e0ca5fdaddbb8a27aaa7bf4fc9fc89cbad122c919c700f57af9f291fe59e5cd7b7a1c46479693922d0015e28e1f85000690d57d5d0af69e00f887
 EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
new file mode 100644
index 000000000000..e6baaa247430
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		~dev-java/openjdk-11.0.9_p11:11
+		~dev-java/openjdk-bin-11.0.9_p11:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index fbc1494338c8..992ab45f0915 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,4 +6,4 @@ DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bce
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
 EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
 EBUILD intel-graphics-compiler-1.0.5353.ebuild 2471 BLAKE2B c8874af4a5ba31cc8d977b52a8d2c2a41f0c9ba8957b900bbaafe3e4474a4cac42d1713f2797edaa0ccfaf02b6a35f1f075e80138171339ed9deb784e54a820f SHA512 1ae9e4cbee369646bfa05626e5358a1540b9fbbfc09c55c464f2822abfa7477e688b299bcea224c7796bee175a3d2f71d354e2d4e2f5f7ad91b03b1206a7c966
-MISC metadata.xml 262 BLAKE2B 6c3ab6eb29647b8d630b1421eca7289613438d56dfa180f85efefbb922d8d2772a26ac2360715dbce23f5b5acff73ccc5cf8d85c90a666c0475f232ed1a6a2ad SHA512 58cf8c27cd031f7653e54b8187dd99b885b5ff336c8db4692a9ee64ecbc6f503d2c41921410114d30c1ec49da925bfc67f5f7da61dd6f89a0257eb1f35c9b6ec
+MISC metadata.xml 261 BLAKE2B fb9fbab5069434d85556da8c100fe4fd6f92aea5909300e58766c1df329317b0c7ac692479aac7e579a994a0c215aa2a87743fdab1e85dec9a120f6a6fa79fa2 SHA512 45a7c84c8dd3ef024aee1d481df406cf4cf47e57ad1205e23874e897b49fd84dfe2adfe0c1738c94e9f6a45c4eef611117b24f63b5191b777dffc63ebb330768
diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
index 9293e0f2fc0d..36d27b8681c7 100644
--- a/dev-util/intel-graphics-compiler/metadata.xml
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">intel/intel-graphics-compiler</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 1529c62cdbeb..87dc7a130e0d 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,11 +1,5 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
-DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
-DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
-DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
-EBUILD lcov-1.13-r2.ebuild 859 BLAKE2B d43e1aa8b6117e5296d73da09d943961a86218ccea9f90d890ef0f49835df8fdbf28ebcf78b2a30f57749a54ef22a2cd24a982f66e969f7e80b83803cb8ec66c SHA512 449744a363d44e90cd7fd06cc3beff631a74fd93e6d905c897016b36ec23e85554b163a8274ad951de6cda21adcd4291b754353ae59a6d26e278b61fb4e9b7f5
-EBUILD lcov-1.14.ebuild 809 BLAKE2B b856f279855281d6f25dc6c5ec751e5c4400df33d22a5e098525e0aa1b69edb8decc207d9becf6bbf6b2d53238046cc13dcce9e458a003854cce6349d46aeecf SHA512 4ab08b43adda29c198e59f67e2ebf648884389df131e03eb143bbf777905525d96b59041d8034aeebeaffd621e4f2a22e6d6d4f0c985f20fc09adc95346bd1ed
-EBUILD lcov-1.14_p2.ebuild 1399 BLAKE2B 6ff038ee856a577be12b4f0363abc0f39f181bab519501a77e19398f95885e7a0e8fc83a1b2537df1e0032addfcc29592e1bc2dc3c81a594cc200d54188ec289 SHA512 eba73e1e8f396b4945225e87da9d0eea550611c40b3c5f651ebf83f7a0ba3708acfcc735753023e01be080e60261476ec352a569b6d6a773a2afbd637eff00b4
 EBUILD lcov-1.15.ebuild 963 BLAKE2B 12eb656eb9177ee422a10eb25188a9f6c53817e2251264a397e3a08d220970a848ffb69aaae4e40c986d66a186b52f696c9b1dd9319d696d45b1a12f06a70e9f SHA512 e9602ace4785304ae11ea186f3cb670ec1b192102d011ad1d9c8fd3feeeebdcf6c2ba23c9652f442c10a226216484a31ffb866cc63b2abbadc58cacdd95b8cec
 EBUILD lcov-9999.ebuild 920 BLAKE2B c39cab5754c576571ad3ce4b3151b987af87973a896695a3f25edaf95fea78f2ea812243e047aa6564a25dc52d06d8b7566c23025daa0fcd00bb6e2f54bf5f43 SHA512 b1532e9099ed0a39ad83bd96ceb1b6adf4b6bd4a558678b2a9b32246137996657343e7f9af3b721d40726bd14ee4ac1e76e77b8c8a2f9aa57466690709862369
-MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
+MISC metadata.xml 589 BLAKE2B 2da1ae87352bd12158e6f8ff144b89ae5c35c6beeb3f64756998a6da5fc1cd2278db42b5f1148facd12ed1c8f763c700c353c5a7738223bf4fbb30ae223cf9f4 SHA512 25a23b168540a73b2eb5af5aaf07b9d80a8b6affe40395ece2ed2c426e28e577abca0cdd42537edb6f255143573b341b52e10a3333782c3f1b4d7f80af260a0d
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
deleted file mode 100644
index 309969b8a69e..000000000000
--- a/dev-util/lcov/lcov-1.13-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	png? ( dev-perl/GD[png] )
-"
-
-PATCHES=(
-	"${FILESDIR}/lcov-1.13-gcc-8.patch"
-)
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
deleted file mode 100644
index f5ded7d1a5c4..000000000000
--- a/dev-util/lcov/lcov-1.14.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
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	png? ( dev-perl/GD[png] )
-"
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/lcov-1.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
deleted file mode 100644
index edd922a3333f..000000000000
--- a/dev-util/lcov/lcov-1.14_p2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LCOV_V=${PV/_p*/}
-DB_V=${PV/*_p/}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="
-		mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
-		mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="png"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/JSON
-	dev-perl/PerlIO-gzip
-	png? ( dev-perl/GD[png] )
-"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches/handle-equals-signs.patch"
-	"${WORKDIR}/debian/patches/fix-undef-behaviour.patch"
-	"${WORKDIR}/debian/patches/reproducibility.patch"
-	"${WORKDIR}/debian/patches/gcc8.patch"
-	"${WORKDIR}/debian/patches/gcc-9-support.patch"
-)
-
-S=${WORKDIR}/${PN}-${LCOV_V}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-
-	# Broken by https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da
-	rm -rf test/lcov_diff || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index 90c86767b856..5314f02f8a93 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marbacz@gmail.com</email>
 		<name>Marcin Baczyński</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 8c4f14544dd7..b8cb5d431a58 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,3 +1,5 @@
 DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
+DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
+EBUILD libabigail-1.8.2.ebuild 1505 BLAKE2B 01be3d9285ee4fc4d4c6b507f43db1c2fcd3bd1c8b57b41ef6027da7904c6cac3c8caccee93681675a6a17be521fe761a806c4ce91f2d0409051e10d4514f14e SHA512 dcf3d5792b3eda9aaa842737e8de88cb9be6cde9755c3edee35070e1176a11068c3a26461ac27e09bc13cfa6d8e633e0fc3643e6d27c3585f961799bf1ee517d
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/dev-util/libabigail/libabigail-1.8.2.ebuild b/dev-util/libabigail/libabigail-1.8.2.ebuild
new file mode 100644
index 000000000000..65225b855535
--- /dev/null
+++ b/dev-util/libabigail/libabigail-1.8.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools python-any-r1 out-of-source
+
+DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
+HOMEPAGE="https://sourceware.org/libabigail/"
+SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/elfutils:=
+	dev-libs/libxml2:2="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	test? ( ${PYTHON_DEPS} )"
+
+src_prepare() {
+	default
+	# need to run our autotools, due to ltmain.sh including Redhat calls:
+	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
+	eautoreconf
+}
+
+my_src_configure() {
+	econf \
+		--disable-deb \
+		--disable-fedabipkgdiff \
+		--disable-rpm \
+		--disable-static \
+		--disable-zip-archive \
+		--enable-bash-completion \
+		--enable-cxx11 \
+		--enable-python3 \
+		$(use_enable doc apidoc) \
+		$(use_enable doc manual)
+}
+
+my_src_compile() {
+	default
+	use doc && emake doc
+}
+
+my_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use doc; then
+		doman doc/manuals/man/*
+		doinfo doc/manuals/texinfo/abigail.info
+
+		dodoc -r doc/manuals/html
+
+		docinto html/api
+		dodoc -r doc/api/html/.
+	fi
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4fdcae8c9cf9..47c6e0604950 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
 EBUILD lldb-11.0.0.ebuild 2384 BLAKE2B 3b2d520abc4918dd63464f0e7716545e2ee9e1c4592a2acc82df183884ff544343000ab99369c3d4b28dc3349e5816b652a2574998cb6ce2daa2c567e67d0c72 SHA512 6fdd05a0e945cf43735be94eccd31928dcf9a16ff5934cc1028495d6446ad474b0e461dff7b4326475116c4762200dae21986f600d4edd8f2f066e2e3d27da0b
 EBUILD lldb-11.0.1.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
-EBUILD lldb-11.1.0.ebuild 2347 BLAKE2B ca289b5db493e7437ef0c973e8f500d5826659640c53371cbd934ebeb9f6afe519dab86e840fc3b1593f3e06cad5d939640a1ccf2d83662dd8771fb654c2ea18 SHA512 a92cb6f9379787b0cf52d1f6548d3fde5ff3d39bb629e5bc6a56d6755e340d1d7e883fde11122f751c2af87c71dcfc46f397c49a036342cf453ce2293252802b
+EBUILD lldb-11.1.0.ebuild 2346 BLAKE2B 49a25f9c9f6c5962519567484a2fd26f0b843f173bd645d30d27cc48c6f9ce4741dcd6be318fc1291d18b64a5476fa7acff5ace3e377adbd4a89c238b5a19528 SHA512 229c0c3be9ff7e3f6dcf7dc5b30ebf0a6682684ec544a2ee66fd9b903a11cef117beebf2a7cd03cd8ab81d15bee5069054deefe08c8e36cbbfc2bde274522f9b
 EBUILD lldb-12.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-12.0.0_rc2.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-12.0.0_rc3.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
diff --git a/dev-util/lldb/lldb-11.1.0.ebuild b/dev-util/lldb/lldb-11.1.0.ebuild
index 88ffd4918a1e..82663a8165f4 100644
--- a/dev-util/lldb/lldb-11.1.0.ebuild
+++ b/dev-util/lldb/lldb-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
diff --git a/dev-util/memprof/Manifest b/dev-util/memprof/Manifest
index e605c13a996f..45f3cb0247e5 100644
--- a/dev-util/memprof/Manifest
+++ b/dev-util/memprof/Manifest
@@ -1,5 +1,5 @@
-AUX memprof-0.6.2-binutils.patch 212 BLAKE2B 0d96ae801a90044478219132d422f44d67f8362a8f44c76236d6c3fc5d98ae771842f45b1ebcd24d2e61b1b467a006bdc0d8645cb4407a74a1debe08595b2edb SHA512 f0b5d6ff79d04536f1b0f2e7275eb795c4fb816f973483970d9fcf01ef07e6216e89890d7a5a367004883b2a5b7d6eda344397641fbd7ae9c921a7f8674a7001
-AUX memprof-0.6.2-desktop.patch 754 BLAKE2B d6e57a85f552dff99fe62e5cecc69956a426fb988ee7f8e7e8c00b50e427a1f9dd7c29c5178d3003432708d473c2ef469290ec74908743801939e8d603d7529e SHA512 a9e96331aac0b5c1eb50ffc24d6e242479d8e3642fff762f529ec2d3ad97e50262109e15ac80ddbeea8bd87bd4c5ac9d5c7f27989a93422140e5edbe0087b375
+AUX memprof-0.6.2-binutils.patch 216 BLAKE2B a2b0b9a8445e7015d7475bc2158d0fa175ef551d6c856220d1f5e6ed9b18cd0e729569fac3fb5300ce168e158a679772e02abc15a7f52c5702f3ebd5a5704b42 SHA512 554281705f92c3e398a1d10bc810d75f3074fe5c0a9879410ce574487e30e4c47b19795b3812efdcfc088451951bf9d4e4a68a21624139bcfdb5c458308a0ad9
+AUX memprof-0.6.2-desktop.patch 758 BLAKE2B d600c34b5a7cef6536a5dbb4a5feb75b2344a8d3b3288b9aff2578251f586a7251eaa5b8e4be0a16687432055ef4e9ffbd25bd31c2f1d10e4d776b4173e6c34d SHA512 60d5e12b16d30272dab56cd1cab3ac4b5cd1f9ff6f099285a8eb699dd1196c54e9605f162e3ce2745a478cf2c00f989a0685b39b961ac7f6b86dee06d39744cc
 DIST memprof-0.6.2.tar.gz 534543 BLAKE2B bc4b98d13ac2a789540006c69b185c95ab9a8c059250e53d89e3baed8d80cffc506ab27e081fbab914390d77c4e67371f2632363a90e3a8d804799b00b5bb208 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7
-EBUILD memprof-0.6.2-r1.ebuild 830 BLAKE2B c85bd0d3d84cd11a187af5f23e2973cb50d8a8723d49cfb73b2f0e42494576b6d654a04b6c52d81bc30da17fa8ad9be0db2f6ca9aa8116bf70d16913d3e35823 SHA512 c81b8412eec7ae10abea8da9a2308bdd97316f4428816242a6c8a792f1b287a7de82ef6c0b7db50212f4729ba7a6c12c498786ef7860481ecb485b80c9d53a0f
+EBUILD memprof-0.6.2-r1.ebuild 815 BLAKE2B f34a215f49bc613e6e8760b8dfc4ed9ae3158458ffd639ca3a0a0ec00663fe7cb32049f48212ce0a8d7cf33c930510e21e127eb9a5908fea3df816a1bc1b5dd2 SHA512 24bc293ebe172e9151cff8a78f82cced938b3f1b0a9f7e677ab6cb5835721b6ee5625680b863b7f230fba592bc1eb2230f401e72c5e74f377be4b6284c69be52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/memprof/files/memprof-0.6.2-binutils.patch b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
index 2a7f80993d5e..c38e8d95b4f2 100644
--- a/dev-util/memprof/files/memprof-0.6.2-binutils.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
@@ -1,5 +1,5 @@
---- src/memprof.h
-+++ src/memprof.h
+--- a/src/memprof.h
++++ b/src/memprof.h
 @@ -24,6 +24,7 @@
  #include <gtk/gtkwidget.h>
  #include <stdio.h>
diff --git a/dev-util/memprof/files/memprof-0.6.2-desktop.patch b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
index a49b5697aaca..9c1cd7a2f995 100644
--- a/dev-util/memprof/files/memprof-0.6.2-desktop.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
@@ -1,5 +1,5 @@
---- memprof.desktop
-+++ memprof.desktop
+--- a/memprof.desktop
++++ b/memprof.desktop
 @@ -11,17 +11,13 @@
  Name[uk]=MemProf
  Comment=Check a program for leaks and analyze its memory usage
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
index 5bceac4e7801..b2216864763e 100644
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Profiling and leak detection tool"
-HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
-SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
+HOMEPAGE="https://www.secretlabs.de/projects/memprof/"
+SRC_URI="https://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.6:2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 DOCS=( AUTHORS ChangeLog README NEWS )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-binutils.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
 
 src_configure() {
 	econf \
@@ -38,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b9cceb836cc6..1d42bbb87833 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
 DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 EBUILD meson-0.55.3.ebuild 2264 BLAKE2B c8909e4cbe395ff0e4f4cdf6a7c33d2a8688b1f6b5126dfa41e09bb73aac586093a028dcfc734aeb1b4f9dd9d788f0f890bae857d8eb0f292e22bf1f2a5d9ba0 SHA512 4e307af8de8551f15ea84e373442146ab6f7f3c7b572e49818d7758dc1e76d995a7443cde371a97c7e4efad422ecf299606c7d56543830979cbae1a298f13265
-EBUILD meson-0.56.2.ebuild 2339 BLAKE2B fcbaf754dd02101128f51aebc293f50e0bbf335c1078aa7c03fa773216e7fc32f9de722d5496d37f591863e5d2e11c31162bd19921133e52f3e3fa016cdbdbb8 SHA512 2a6520065467a231d7af76d1cb4859ed878727f9ff091c273688deb15552dbbe199965c1e20e7f95ab3a040d6e03214911c324819e0559bc0514ab8fe9fc8aa6
+EBUILD meson-0.56.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
 EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
-MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
+MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.56.2.ebuild
index b21b3c263ecf..20afc602e2bf 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.56.2.ebuild
@@ -10,7 +10,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/meson/metadata.xml b/dev-util/meson/metadata.xml
index d762c3aed0a9..aba1d26bb84e 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/metadata.xml b/dev-util/metadata.xml
index b57240b4ca92..3eb8d2846b3c 100644
--- a/dev-util/metadata.xml
+++ b/dev-util/metadata.xml
@@ -37,4 +37,3 @@
 		не попадающие в другие категории.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 80945d4b88a2..570d301d8fad 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,7 @@
 DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
 DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
+DIST opencl-headers-2020.12.18.tar.gz 59558 BLAKE2B e3956e86df3877fc3a73f748be082b9189eda6b52e6fecea19de788cea61fd6486c2407eca0e89bcc73dc873bfefff55affc4ea8142cd09ae86c88e5bc93c723 SHA512 e083c373a2afd81932daa91d4e7fd449ceefae32ce0d7378def19511f35a96005d10f3b38c55def4754dc34dfb311471e8418a5ede389df673eeb7295110060d
 EBUILD opencl-headers-2020.03.13-r1.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
 EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
-MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
+EBUILD opencl-headers-2020.12.18.ebuild 609 BLAKE2B 0fd1055b41fbc2b3b996afd9a51d0ab7a645fb97cba6bef71857e725445e13d8a1e624089e7a4fe5ee0ad291789245f8d6cd0a7d37aa780dca2d336e97df956c SHA512 f93611aa63aa761b28f07a8360f0c7f02f60a515526b89f696238a9250db889c10c85dc699e69bb17c050c20a291a41d4747e6641b32d7e1bb12ae2f003a695b
+MISC metadata.xml 1054 BLAKE2B 30fb473e3841df882a700e175f5abef4d5ed0c198c60efdcce36622bb8a1dedf69c1b1a9f745f35b0f2be64fcf13f4c5ca2cd5503dadbf7021a74469f10438fa SHA512 85d2d58484a5def1de36b0922a796658cfcd104c2d25ca6e9916287768955b5a9dc6fce5d00f93211e9ad2b0a743abb07637a78131b6da3bcdfd880c86b7139c
diff --git a/dev-util/opencl-headers/metadata.xml b/dev-util/opencl-headers/metadata.xml
index f5bc8eb8de51..40897a6cb9ca 100644
--- a/dev-util/opencl-headers/metadata.xml
+++ b/dev-util/opencl-headers/metadata.xml
@@ -21,4 +21,3 @@
 		<remote-id type="github">KhronosGroup/OpenCL-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild b/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild
new file mode 100644
index 000000000000..cfa9d86451a7
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2020.12.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To avoid file collisions in /usr/include/CL/
+DEPEND="!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 7d4dbbcf9b95..c5f05ce797da 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,11 +1,3 @@
-DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
-DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a9542409bcce13cefd49fa83a47c0262f48e74ff951990211de9f85fc32efd41bbd4ed286b3462aed86df68afebc8 SHA512 b2a3ae27612c78fcfcb2ac655437faf2cff6e587fd10033b39ddaca8b92b634b93ecd0ae7e3ee43253ee716a2c0f7da532b3ae0ce33c59d1d3896f9187d9a657
-DIST packer-1.5.6.tar.gz 16037500 BLAKE2B 9409aad981b3494a442fc6854481853494b12b74532ed3ac8d210d4e275a8f4f18bfb6dcfd7c36c4e97b3d5ba0263155fc8f08592b0123705c5d341d9183e6eb SHA512 993f54a1bf98abd5bc450bafaf202fbbfbad009b661d49783ff82cba9891b8556340801680c0fdc33b90396a3101a2ed93a11798ad51c10d7bd5f81fef4f5a31
-DIST packer-1.6.1.tar.gz 17334870 BLAKE2B c6db96de6a96c337ca2b2e7f273be21b4410e272817622af849346f38fab7212119aec1fcfd71b0c67bb00e8aad879485fd21cd42d7054eab4a37251fccc3ae7 SHA512 3b4b21eac425fec44a47a5799dcb5387099de06b777906a4b7c5bf169c71d8b82ab4296a21c8b60daefa4546d5a814b8d9f23e4d2afcf0eb91c3338d8f327ce7
 DIST packer-1.6.5.tar.gz 17900733 BLAKE2B b267f5b861de9eb4fc88ab747560aef30825897e1f42038ff443185c6591afec039e12a4639ca22598704a7ada68b8af373c67f7391f9884566fd0f431b3c0ee SHA512 17df612ccac44f6ee987cfee0f5b0422768302a40e7e4177c47e427fd0aa09be136ceda40272e6a1cbdeb52587b5c93f2fe7158f787e19399149ee514fec001d
-EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
-EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
-EBUILD packer-1.5.6.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
-EBUILD packer-1.6.1.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
 EBUILD packer-1.6.5.ebuild 697 BLAKE2B d3a064c070aeafd3284eb74b3ad93e7d2e3295426de77ef28d674ba273e6d91cafc12d7d95b0086dd7a0e2cf9a100f688e65fba0da102cd9f26b24f4e936febb SHA512 e67cb808d480047f76da9bae46fe5ce0066c04fa1f5f41ad30bff603e24af50d06bbef6e2092ef5bd203f6e16e92de6e9777e686c24f46742503bd60cf037860
-MISC metadata.xml 1377 BLAKE2B a2c25ec31f167d12a441da18cfa141e1d19001e2fbb0cd4df5d8c613edd0ebbc95190541b6586380dba6f62f6f4c4715ec729b22d4f30ffbfe1a7fccb13f5a8b SHA512 0f949311fffa40abd1cf6722068b210e1d06270d25698dbf17554722fcdff847dfedd6e47650a5091d2afa1ecf960e50937a2058150051a4af98a485ac9435b2
+MISC metadata.xml 1407 BLAKE2B 76e06a879e52fb8538d9f6f692e91c589896e5574ca497e0b35a2a51bc3abf049842b27c5b04ffa1ec009e61826f524a3634c0dcd1c93c2eb95b7fc7b57b42c3 SHA512 9cef2540558ca98a457aaf738aa4c0743eaea6a830a344d18ceb5012f3be021753654269fb3b93c0dc73f7ad1bcfc3c60d87912dbe7888f966c90794c6d00821
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
index a2b26dedcc96..489636ef7cec 100644
--- a/dev-util/packer/metadata.xml
+++ b/dev-util/packer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>xp.vit.blr@gmail.com</email>
 		<name>Viktar Patotski</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/packer/packer-1.4.0.ebuild b/dev-util/packer/packer-1.4.0.ebuild
deleted file mode 100644
index 5a13c74a3fa0..000000000000
--- a/dev-util/packer/packer-1.4.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=7
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND=">=dev-lang/go-1.11.0"
-
-DOCS=( README.md CHANGELOG.md )
-
-src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
-}
-
-src_install() {
-	dobin packer
-
-	pushd "src/${EGO_PN}" || die
-	einstalldocs
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-	popd || die
-}
diff --git a/dev-util/packer/packer-1.4.5.ebuild b/dev-util/packer/packer-1.4.5.ebuild
deleted file mode 100644
index ab0e1cbcd571..000000000000
--- a/dev-util/packer/packer-1.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.5.6.ebuild b/dev-util/packer/packer-1.5.6.ebuild
deleted file mode 100644
index c1237d3214bd..000000000000
--- a/dev-util/packer/packer-1.5.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.6.1.ebuild b/dev-util/packer/packer-1.6.1.ebuild
deleted file mode 100644
index c1237d3214bd..000000000000
--- a/dev-util/packer/packer-1.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-mod=vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index ee2c1a669065..81c94775e666 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -5,13 +5,17 @@ DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d714
 DIST pkgcheck-0.9.0.tar.gz 585528 BLAKE2B f9fa2d11b9510d84b5d9381ff033de14ca5ec74cf84d50f3f8847c1585c38bd02f534b09cc017e04d6f322ebd95c8396d95eca299ed1327cd25fab9e42973be3 SHA512 a6778785c23eacd80df555c77c8a77ef66b16e2a601fbd9405f85ce8520079a6f1366aeede3a1758abc8db606bc4608cb4a7e1ad421a8416bdb35b3ff3af9d6f
 DIST pkgcheck-0.9.1.tar.gz 591753 BLAKE2B e4c8840c022b77dde34ad461367eb1947f269c8a0ff12e9dee2c8e373d1926f58f9d104571bc5de233975eda73509bf39eec533de03f78cf82fa41bbd10bcc74 SHA512 9adcf2fd5b9652e834f96f8a7652c97d28c4ec5a8b8704cd4c7c4ef8463237fc15f4c46e36993d0e72de5aab068b108368378d5481cf4d5df974e4a78adf6072
 DIST pkgcheck-0.9.2.tar.gz 593674 BLAKE2B e5d02e914e90db28540ca350d91d38ece9cea1f8413ec90b877bb41896cc7b710e451658c7c6cea3f4cc2f834230a986d18429c8ac3f23d4b317b28e3af8d74f SHA512 2bbced17dcc1718576aa4ce2401fc856cfb6256fe437295c25716852645841c6a28d1c1276f3a5943ce27943ab36bd3ca3ef9bf1ace20138368371a793a80b6d
+DIST pkgcheck-0.9.3.tar.gz 460029 BLAKE2B 3ef3aa6c338c5b379e4845302aaaacc5c71679309f45985e1dfa71fb1e62760c4f94ca43d34ca4ad75ecd1f738d9bcb0140568b4e4826ee6a14586c21d0c1a03 SHA512 5613f65437e6cc1c55330eef8bc354ad2f6e325a03c8353186d17a8e9dd21333a3900f91a36c1af0767ccda56f30d425ddb848e4eccf9d20ccba3f5de5098fb3
+DIST pkgcheck-0.9.4.tar.gz 609445 BLAKE2B c0a8afe0a008069dc54e977b937c00c3b21c2a86af16b3339348e0f6ed454084a97745f59afda2489a65cfb23e92b35bd3cc464075e8729b8dd1c1cd8e8e5ebd SHA512 821ecabad722a51c85ae9d9b32bff425c56f9f5ad719f70ca3a60467f9978acaab78a27ff7d9b41d0572f749ae2a08de960fb8e470f50095fc6ee67668a0e4c4
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1-r1.ebuild 1341 BLAKE2B 226ef3dfaa1d376e246648726efdb599b2b75211d2ae36da71533db09f76e3c41832692d813ddc3fbcb90d171d5d6df4bb598a026400d51ca23cf09600b6546e SHA512 ecce76cd05d58945652d84f4adaec6fa44ec91d8aeb1b5b910828acf98fdf15b807b4e2c77b41c1502c04b23990dcf3eda5419b37eede537ed5aa17333da33c7
-EBUILD pkgcheck-0.8.2-r1.ebuild 1365 BLAKE2B 05608be4393f1058d5d3c79831e5a01138056e55b5f67a4efeaabd07005a01b5f5f73f14b45dfee76c4982acaae5e1c28a36fa5a792dca8e16be5da96d4f9391 SHA512 12be2b9125e3f0fe5763f771c759500e84028cbab0c46aaf37d47f6ae25a63473b63f35ef3296dcfd8fe2eb4c8ab514c0d6de30c4457fb730d3e6f8ae5152763
-EBUILD pkgcheck-0.9.0-r1.ebuild 1426 BLAKE2B e62ed959fbeefe699e90ac619406d8552d28d4cede6def95d3f6826d892ac4e68155a9428affc231a69498b11ffd6944777bae5992a9911a43051f36cecd1b51 SHA512 5608eabeaae655a60240b4f4576199f74c8e94ed7aee8536be2e7e2063ea66344e20c9aa8a410ac4b44a3dd63699e33f3631e1376af1a83084c069c8716b273a
-EBUILD pkgcheck-0.9.1-r1.ebuild 1500 BLAKE2B dcf03bfbf0099db0e3b6e27a6a6e3d7ac309392548f5668b5acbc866b980b97124a72d294f9f4a253397369373c1b945c2f131d6e73f3d4d6a249eb0c7ac1bc0 SHA512 9500283e6ebed04e4923971141ccda4e4dd9762765e660360b24390a4c5cd40b8ff35a40584e008336564fcda509b88425b06f1adf3bcd8bb3c844ae8f2ebe1a
-EBUILD pkgcheck-0.9.2.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
+EBUILD pkgcheck-0.8.1-r2.ebuild 1386 BLAKE2B 8038faade06c55eed6be95c34e5a7ad01d5d0e4e1bb36db023327435456ce608fb975f785890b055a587b888ef7c23d1eec626dcc69211f11b49315e737cfeb4 SHA512 9ea5244aa12ba08a5ab1e80842c6f991d1ffa1eb121ebba947a02ae6679052e58680e5cfbf0c579cc9476ada71d2bb5d8bf58565d0490b549379229548af290f
+EBUILD pkgcheck-0.8.2-r2.ebuild 1417 BLAKE2B 0b635b4a66c79928fd2ae21de749e456686dcd77d66e7fb413c39c0b645c3252c4eab7d77f1725b038fdcdd84d25998dcb79b9ee1a0c80b6063510d49d9f15a5 SHA512 3ef8917647484400d8a46e2942e598769e01918f381117877815535ed0dc6e683640ef49dc4cec2f5182d80c2ef06184ce823f9beb6ecc9203490a907db813e1
+EBUILD pkgcheck-0.9.0-r2.ebuild 1471 BLAKE2B e11a1f5b4435064308cab3acd07ea5301b7b0d463786c0037ec217c5378221b8c6d53ff34faea6365c08c8fa38bc6ac5c3b212ea6b156dfe4da0f43864dc8ea7 SHA512 32b50f2db0deb57931288e6fad53f899441ea2034722ae94c8485971657a47e2cda11920c119322ce0ad976107d7b2b5169a80bfb9b7d705b559f081fe68671d
+EBUILD pkgcheck-0.9.1-r2.ebuild 1545 BLAKE2B 5a421d8b7ed67ac8712a7b64dec324785c582696ea188c556fcea09089d1fd239909dd73d9ec6c934eb611509ecca058e915e536b4dab3e0552406bc145597f4 SHA512 41bb42a7cfa5eb458a601abd53a9b357b9377c472d9db5fd712ec7beca9fe21ebbef4898503d2cc2f14b34e716530aaa1e4911dc244bebfb1d905a2afdd1d995
+EBUILD pkgcheck-0.9.2-r1.ebuild 1545 BLAKE2B b9362796ea299c1c4cc0efaed08f2ef54e7f4f0daa44bc735b5808319a905194004e272590caa5297154d0f0c10741f1261dd55ecfb1f7625c4b4eb6e5fc5f67 SHA512 8da319f22d2506cf254bf23e8d22d83e9689f858ea89ce484a0157481b42f93b1f70a5630de8988fa9cf2ab8aaee04031e33b428c126da7fbf8e04d024650fce
+EBUILD pkgcheck-0.9.3-r1.ebuild 1552 BLAKE2B bba0c6003224d4620fba6a8dbc2d0954a45cf0558f7d9e1aeb0abb8a851f20d00373be9b556db4ecdf44964f8adee15a7b354e069d67228f009ec5a6163a0d37 SHA512 ee0d8ff0e909054a06ccdc89cec5819ba7b8a7cd694da79a32b70f2e8b2cd2709d44ea4ff34efa6aef4b8d9c38106dff0c2df7c0d32c2d7b487361b249fbe334
+EBUILD pkgcheck-0.9.4.ebuild 1507 BLAKE2B ed58c351d977d491d464d896a8519d88ed1799d7bfada82c2588249ff4245b5efcb65a2df38fb3a620f5573d0fc542ee7347338c8bd58fcba22118e1f0106f0b SHA512 dff66a95a5c5ec85d886f58674b6b9bc945f2664c666105b2e8e4989a2cddcd324578ca1abcbfbd56bfd98eabc99abd222662882163a5b51d3813e8b899f1279
 EBUILD pkgcheck-9999.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild
deleted file mode 100644
index d625f9d99b44..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.8.1-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
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..4c51a0245288
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild
deleted file mode 100644
index 940c596c1165..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.8.2-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
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..a0ec54b06b5e
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild
deleted file mode 100644
index 01cc542dcbc7..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.0-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
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..2a6517ae020b
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild
deleted file mode 100644
index f4fc9d8e1d48..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..90f85d834a8d
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..305c632e3e48
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
deleted file mode 100644
index 18f0ea5c49f8..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..3b4b3965e984
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild
new file mode 100644
index 000000000000..78f8b6d343cf
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 89b3a0f725a8..8e35b276d428 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,9 @@
 AUX pkgconf-1.7.3-darwin9.patch 517 BLAKE2B f6f2374bb32aa2e9513df0c91e51ee41e0c8d1c847c3d00ac3a420a6299d3abca74d211b0e3b52a41d1a64d737d18d4348e5ea72ae5537425d14e8bac1fd1a67 SHA512 f55e795a503d5a0349968a6b69f3aae6335d90daa38c6f829f7ce54ab63beedde48e37a59397263aa8dffefbabc1bd9d22aeeff8d0111f7e317b580272aa3d41
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
+DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5
-EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
 EBUILD pkgconf-1.7.3-r1.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
+EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
 EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
deleted file mode 100644
index 40e4e28319d4..000000000000
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
-else
-	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf$(get_exeext)
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	econf --disable-static
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-	else
-		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
-		rmdir "${ED}"/usr/share/aclocal || die
-		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
-		rmdir "${ED}"/usr/share/man/man7 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
new file mode 100644
index 000000000000..3923dd6417ea
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
+else
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/3"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
+	pkg-config? ( !dev-util/pkgconfig )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf$(get_exeext)
+)
+
+src_prepare() {
+	default
+
+	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config$(get_exeext)
+		)
+	fi
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+	else
+		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+		rmdir "${ED}"/usr/share/aclocal || die
+		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+		rmdir "${ED}"/usr/share/man/man7 || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 4e6ba965f0e9..39d1a5cb8109 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
-DIST pkgdev-0.1.tar.gz 26075 BLAKE2B e7f7a83d91ef923bdd38465e7c70d6a2d0693d945273583937b4f444e26493887c5aeff9cf6a353dc02c42786d635eda7cc0fbfbc888be2b0e4eee883b5bd9c6 SHA512 1714857c3d66655226a4217ec8955662c5e37022c92183bdd8e61f91ff46f335935af8d6badf79f7c9f894a56b970ab0109f9b18ac7f3e59722d096ce2f24664
-EBUILD pkgdev-0.1.ebuild 1533 BLAKE2B b52d4e7310632fab48a5879e1990eb9d5789b9e7c19c743926756b8d4dcdaee43dd055ef6e8a400999ac933fa1450859a24d56af5980eccd8253e06c6d459776 SHA512 f8f85c891036270e560853e6a27dc13272164ddb410b4372dd6b185d20aecd5b593fe5f335dc590a04fbed48fecea999906ed665f872d153d73664d752e9cc75
-EBUILD pkgdev-9999.ebuild 1532 BLAKE2B 35f3dfc9677eb887f97cfc736e61d10d950e8cbb3e49092ad201ebd547223a68230af7bd053ab695f72a71e1eb7f356b554c8bccdad25065b0a6788c58645245 SHA512 ad2abc4203f8a06a633f1ac1b41067091d3b1467d56bd855ae52d6cc4f42cf3d22562c27ea4f7a5850833e99739d9fdcc3657d993843081ab2e879de3c0fcab7
+DIST pkgdev-0.1.1.tar.gz 31435 BLAKE2B 94f0246bdbc4ee91e6d570969df60ede6f756745e46b41d3a66f1518891c67f15e6daf4ba4eea91d0427346e9d5336b817b7ef918acd717fa7cf704e0151ee7b SHA512 30c70e11fdfb414b2818559eeae250f1a8330187a9b7006475a539aa7fbdeb81b4b0a564fd79105119f697db80845fbd6bd42d278c9339781eb674843cd49717
+DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
+EBUILD pkgdev-0.1.1.ebuild 1533 BLAKE2B 9370cf9d8343d9bb2ebc040561e87d5b5203cb237684f581afd61166a82fbcb92a27f0a68f47e6b09203ad6d101893592ce713147f5ae99ec73326ca711953f2 SHA512 a8a7468cc49526b34cbaf3aa19812681365fa2f14feaa46e8f15980b0a5a31c84e26c1afc191938bf823dfa22d63552a12b30974d53d5015840f0f09d595be31
+EBUILD pkgdev-0.1.2.ebuild 1544 BLAKE2B 8ae62335378a5dc3e826e3db386cca2be16280f41582d4f30c1cbccae31202c608f7cc67ab1f1f4695efc3055338ed3fe3d7a2432502d98d58e698e182017fc9 SHA512 f43bae40fa31725cd7d6ec49ddcbeb1d6cf142940ece6c73f9d7c06d16d6e590c08e56ee87c3aaf407adbab086b2c2be356896f0fc4a23b607e0b4f3ff7e611a
+EBUILD pkgdev-9999.ebuild 1544 BLAKE2B 246fce7c899c709848e29dac7b74cffd8d44dda6be1c7db7b30506413d303ae467bef09be70039406ed29b9847f619447ffd8d19ad1989a362c9ea1864e14b30 SHA512 08602dcf3e3934551c9b774e6e000210eee08a48dbf2c948caf03efe7d7e810bf4af8128e06e264288c3c3f9356bb947f65677f02701489dc4c2c624f015d47e
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.1.ebuild
new file mode 100644
index 000000000000..310eba8bb7b9
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-0.1.2.ebuild b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
new file mode 100644
index 000000000000..d3bd40f87aeb
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-0.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.ebuild
deleted file mode 100644
index fdf04f9fc038..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 041813b0cea7..b94c6c1d71d8 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcore-0.11.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index a93639bda2d6..73e0de6b9edd 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,4 +1,4 @@
 DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
 EBUILD ply-2.1.1-r1.ebuild 1109 BLAKE2B 24dcc519455d9575a3ca3367823c4bf36814f486eae96ad8d79b7ee5e865ac3a329046e3c7ff8bffc47c4fb3274089f0c56ef74f3682e4a0f34be026659a9787 SHA512 09ad3fde619012e5246c2f8b646a6d3639f60edd9d000491d7026f8fd4302775151b45b6b8a08dc2f9f93d44ce034de97387da3784f8d9e37ac92d30d34aef6b
-MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
+MISC metadata.xml 703 BLAKE2B 732e9109d3233783cc936b6af7b3f4ec2f6c3a897cd390c4d4d89960b19cabe1fa80f656d48e39bd2f060b8cffd8a2af1c88011e3a3256134c3e062ff2f7a192 SHA512 da85c8189060d95c6bdaed68f824c4d0e3ffe5a7c6766c27efa3e2e5403c08b07ed964aa745a80b37ca84fdb6767113378bbff1f1035781df5a711745507d8d4
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index 28ee2e30136d..b6666629264a 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,15 +4,15 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>luka.perkov@sartura.hr</email>
     <name>Luka Perkov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 21ec03df2fc5..1cc3684225d5 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,3 +1,3 @@
 DIST poke-1.0.tar.gz 6698818 BLAKE2B 4f66e1e5f2aa1c33bf2b2b823e60662c98fe608f53526f5ea5117f84540c75b7f3196c53fd80858c10e12f3005ccce0ff9a457fba7b439f2fecd4c4bad061bfc SHA512 e7c567e5e14fdd5a45e9568c972ba7c93e2b8810428f16d608e638654890854e3dd49ba5f91c9c49bffe4cc846e1ba823fe1d4c9ac2673cde535cb46c24b5a62
 EBUILD poke-1.0.ebuild 979 BLAKE2B 33b10895f02e85f773e705232d8e2cd063424c2c4cabbc0f29a9a812162decb18f50296d0becdd0dbc08a8becb0bd56f5491fd475cf625a322aad32f9b02f2c4 SHA512 a268a3ec5c3d271dd4857c6a4eb87c0abeb5211f9c09af8ee6ac1ae3d13fa9c2b267ac02b85181cc2590d1eae0ff1e7a961684ea1373656e49923644923ba6df
-MISC metadata.xml 373 BLAKE2B 7c574ccfb12bcfae133a365a31a0398e7c555bfd41b59bd031e6453ac40a3f8a100146c234ceee6744e6816a533179cb0acdf8b1b7f3883b547854d7f46367d7 SHA512 ae9674b2b8c7d508c8ff0b8b975dbb469b0a6c5d00bf6262295c5c38b7d2682be22c88fd89ed0a3d2ba70365cc7fd06b584eec0f827f8657d2af368a7136e08c
+MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index f44bceafc510..81c0a3800a8e 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<use>
-		<flag name='machine-interface'>enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="machine-interface">enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
index 941eba9e9dcd..764ce7340476 100644
--- a/dev-util/qdevicemonitor/Manifest
+++ b/dev-util/qdevicemonitor/Manifest
@@ -5,4 +5,4 @@ AUX qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch 1316 BLAKE2B ae704d
 DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55
 EBUILD qdevicemonitor-1.0.1-r2.ebuild 1135 BLAKE2B af435aa2a1fede750d5bb0b465bd5e54d99c157981c12b1427f4e8d76f32d0218a96becec4a56283e727d17edbac71c5da67d8102b4d58aa7bec9f8fabfaeafc SHA512 f3cdd756461c34ea4bd31c8c8cb0c62ee7389a87c23f85dacae929f19d056a8a43c9d68744a5d33ff130423bb0b828b4a4a2d020d19fa826e8f290bc07bb5aba
 EBUILD qdevicemonitor-9999.ebuild 915 BLAKE2B e05fb16f77410c0478ad212b0ae18616cc8c98072b1c06e81163df9fa55694af652eeaf6d5aba943ceb9c999187210922827d12d4cd41425279e1ecad8ef5fdc SHA512 4088257b67415a9ec932ab62b2ecdaada1c544df2f828279249a49b5346a8fa3dd906561cf2549212e0caebcac8b43c7c8cf725d01c9c778193a0de9b3f16be9
-MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
+MISC metadata.xml 492 BLAKE2B fd5462bdcdb9d6515164448000c9ceb1a3c32ce58afbc988f7cfd096c32470377235b873bb35155f470a40e1c54bbb7fbd61a587d4bb6d6d051511e547a3e8bd SHA512 34d717131edf32dcdef69591f956a5c403e6b9d17a76581721b5fbccaae072277c09bf3756c469be870263725b608c3e6c6e9a104b73d3ecd483fc679d21c1d1
diff --git a/dev-util/qdevicemonitor/metadata.xml b/dev-util/qdevicemonitor/metadata.xml
index acda2b8dd0ff..5853dc91a0aa 100644
--- a/dev-util/qdevicemonitor/metadata.xml
+++ b/dev-util/qdevicemonitor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alopatindev@gmail.com</email>
 		<name>Alexander Lopatin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index 3c544c2878ab..eb3175a293e6 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -1,4 +1,4 @@
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
 EBUILD qstlink2-1.2.3.ebuild 896 BLAKE2B bff4a85e44a9d3c953dec3d8038babd412f7f872974d2cda1bf9ad86d44b4890d93f6ac48173ed571bc91bb408c45d689988f92f4e7d2b79f59c2f02c1e35c50 SHA512 ce9a1960c7f2d93ab3e16131662e3be5793ce7fe1fc4eee84c8d11c20dded840d33446da8151069b9fc94f6d33f9e5a10c0684f81f3997b30ceb72905355e39b
-MISC metadata.xml 593 BLAKE2B 8e1e6002217c771828cabce29eb7a4392412d9fa388f3e76e9db83e232f586b87e77114d2d3b6c4162427027237020431dfdea2287924539a3d0c1be3dd0d87a SHA512 db483eeddccf6c2642e090c8ae0136e028156ec05152b5fc3ac9cf60fa59310cac3cb6477f4c5d7c09c0fa4b3abe1b7535d402203a23ef4f0e3fe1094a4cebec
+MISC metadata.xml 623 BLAKE2B 6a8313e6ee13781728b230b5642695c5edf5ebfab47ea129431e05a5ff80ce81f07aceb1bed8225be592f86ecb9775c49dd2fa59975cc5b7a641317f2778e8aa SHA512 fde99fe3ab53bbc9f82f697c9ba6caa34600cf319f681c891fa9f22ab9052adc57e2f1458a4d858500822a16e3c4fa779aaa7e0c5e962454c8d9b8e3245fe1a9
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index caa2d5863828..8f63ee935078 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>no111u3@gmail.com</email>
 		<name>Boris Vingradov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3f7b939cc208..e346b303e994 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -3,4 +3,4 @@ DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d
 EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 EBUILD radare2-5.1.1.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
 EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
-MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
+MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 45f16b33e569..4f934568ee58 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -5,7 +5,7 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 9b518ad0488b..1152ede85369 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,5 +1,3 @@
-DIST rebar-bin-3.13.2 839684 BLAKE2B f7aab86b015549bb13a7fe2b3b0c64fc6b8383f46adef2fd50a080983a411f936d1c416be60eac70a2ea72439831c9a5e0e85381168ca973d6fcfbfa198e0987 SHA512 33cb7b083cd0e90159e06d6b21c1e8047cc5a2d49c469ae15449fefb8576427f2088977a294c677548f0543eb06cb25ad4c165e8df4b373e3562a7adc6125a94
-DIST rebar-bin-3.6.2 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
-EBUILD rebar-bin-3.13.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-EBUILD rebar-bin-3.6.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-MISC metadata.xml 939 BLAKE2B 3d451a472d9986f1aee67c4ede6ddc28d56cac865e0fd0a33f957f3007126d47d7cb3bf87916abca0be68138c167b138d884b38da65ca26d4dab79e42b839c58 SHA512 6e6e0a14df5031fee427dc518e0b69cafca6b8dcc429fa8cbcecacf78a1a56796c9cc6a545a6e9506a752e749c06a4ef7cf4cdb889ef2c6ca53bcf0f68fa363b
+DIST rebar-bin-3.14.4 943940 BLAKE2B b9196c44407783f5cdeec6d56acad20837b2f9c550e5dd1cc16d7190a5dd9897cf4044720175db216f154beed093fc81b4a3c26702e7f4675473924dc7508530 SHA512 35a8ca34a26c7fe0b7edc22ca0589b3813827ee6d59f49e7b2669186fc6183d4efd33c258a4659f14421bbe2b2d7c7c464ab7fd36f87297faa3c6f812945eb2d
+EBUILD rebar-bin-3.14.4.ebuild 601 BLAKE2B 6afd6e93bf2af1241125dc220b926b02e26858ea889cb08329e0724e342f85bb0eedb72178cc3cad97ab421fd7bbac1fd1e2f08e9cee8e4a8ae78b8f76aa8a58 SHA512 b68fc00c68544014bc89d00456eb03fc6e134e053b870d4b3ea6cd2d5e608a918fc3259850ddf099d8d55a5751c5c01aad7546c485063db758c48cae36c55fbd
+MISC metadata.xml 1186 BLAKE2B 2ab14359cd530e009f7e793334b93587adf02cf7a43ecc51cb710fe10bb59b5ccc82ccba8323b7b28f4872871048cce8d7acd468adb2d9d62ee426ed268c08da SHA512 7da7c4e15611f93e3692fa462e024ebb0f9b447a93c518ade6bb151a548a65437a285ae9bea4334ee84790ed75fcaaa2e57872f0ae117dbec66bd9f2d6da9031
diff --git a/dev-util/rebar-bin/metadata.xml b/dev-util/rebar-bin/metadata.xml
index 4c134f3392dc..504a42e86ef7 100644
--- a/dev-util/rebar-bin/metadata.xml
+++ b/dev-util/rebar-bin/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Rebar3 is an Erlang tool that makes it easy to create, develop, and
 		release Erlang libraries, applications, and systems in a repeatable
diff --git a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
deleted file mode 100644
index 4f7f563c355f..000000000000
--- a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
diff --git a/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
new file mode 100644
index 000000000000..40d27f46700a
--- /dev/null
+++ b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${P#-bin}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://github.com/erlang/rebar3"
+
+SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/erlang"
+DEPEND=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/bin/rebar3"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
+}
+
+src_install() {
+	dobin rebar3
+}
diff --git a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
deleted file mode 100644
index 4f7f563c355f..000000000000
--- a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 1bdd9693d122..28998c2ce71d 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,4 +1,4 @@
 DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
 EBUILD rocm-smi-4.0.0.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
 EBUILD rocm-smi-9999.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
-MISC metadata.xml 630 BLAKE2B de855b379cdc08578676c7344606c42305f466d417558a6529f9c7a15679b2c4a71b7f460c0b553c99280524fe33e2951b2bd494c496ad4e4d7302c53aea7549 SHA512 6b59dc67647f0ce170b287fe9ed95d50deae676887874d02a713eef672c184e57e2da59fa917c36b3fdb0bc9cdebf7a4b0287ebffbbb698840d9e2e076b05913
+MISC metadata.xml 660 BLAKE2B 6286b201788d800e5d712d9528bf01bdff728a146f31ee31fddd05d650fba9957bd7cca8a94cf99e1ff6701b91f83e09466a147863dea76d721ab60c044eabb0 SHA512 5cad9f4870cd8d01ff0962ec818dd3dee7797d8eb260b5773d5853423f8ec4541e0d586a686d801bc345166714a263b1481db57aa389df9720e82ea77a42d04b
diff --git a/dev-util/rocm-smi/metadata.xml b/dev-util/rocm-smi/metadata.xml
index c968d7fd87f4..eb9ba00a8a38 100644
--- a/dev-util/rocm-smi/metadata.xml
+++ b/dev-util/rocm-smi/metadata.xml
@@ -5,11 +5,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 1da95a25de92..ebb92736922c 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,4 +1,4 @@
 AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
-MISC metadata.xml 588 BLAKE2B fa0a772d2f9c1b7c838f62faa1eb05c451dedd2c58f9164aea2c57a8f0e81d1f599dc0fe337143d7c2d705492b67ef0e9e890b518b07ca2c168b18723895805e SHA512 3581cd68135fccfb9504071b5d388cc101a19180ce5311b0ba404f0c0c6d0e14a3a9fea08c7e5d3e641b475ef6c616a3c6baf38470dcf2e02a2d08b29904fe07
+MISC metadata.xml 602 BLAKE2B eadd55217e056e8331434427e8ba60908453ef2e74bebc1dddce93627d6ce6c2c7d94aed9ac4803a44c68da5eb0f43ab39d7fde1566c8ad46250d05870a66d1f SHA512 0acfbe065cdcd66a61f8dd18b9112635e7ab28add42b1783428aedeb7e8f9af43568ca4e3c47ce1e16ef83ce5cf9aa3f49fc17d77d7344d1c0939f477ee548ca
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index eec4ce34fdda..0197d1d32ccc 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 50cc2a315d38..6172604e44d5 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
 AUX rt-tests-1.10-musl.patch 10825 BLAKE2B 64195bfd2ca512721701613a1aa881e3d17290d75bc3ec991bdc8c7092b8cc9ba055fe86a5390350158c7b3a442bcd35f07a3eeb148fe6c701a4ada7840934cf SHA512 3a5c47315e3630c38600d359af4f4b9ef572c7db7ae550fa57512b72f50bb5d762933aba3594876b66ba37d85dfecc3ffd6c0172c951f8c48d4ff37620cee674
 DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
 EBUILD rt-tests-1.10.ebuild 903 BLAKE2B c989e36ce497c25a3354344c5f62638a0d1791087414884636bf0bb596451b4702773ab198e3257d0bf3961cbeb80168a53f0af3f51ee998558ae74dda5b9a7c SHA512 99d386c80e8e9a8d51f2e467361fdbce6f54c2fad1a6b4cd956c6ff9515081809265595a9603b62dc82e786eea8590a29091b4d145b1429554e337347b71574c
-MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
+MISC metadata.xml 748 BLAKE2B 6603446c7aa66d6586f9e8dfa53c6338f9287c3ecf6768b67554832fa45ab38f488dc54d077947e46973c251d454320adf8788ebd8b797055604b26c878a428e SHA512 c2c39041a28bfc866667589c67f8c3a8b044489fe4b10b247ee770f41b84fa75b1d55eaf70d94e0e43d27e82774aff982c4fe72555933baaedcb208b01d17cdd
diff --git a/dev-util/rt-tests/metadata.xml b/dev-util/rt-tests/metadata.xml
index 991f708b4de2..36f895b4b9aa 100644
--- a/dev-util/rt-tests/metadata.xml
+++ b/dev-util/rt-tests/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kurt@kmk-computers.de</email>
     <name>Kurt Kanzenbach</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/serialtalk/Manifest b/dev-util/serialtalk/Manifest
index 86b5f78067d0..a84488720d4e 100644
--- a/dev-util/serialtalk/Manifest
+++ b/dev-util/serialtalk/Manifest
@@ -1,4 +1,4 @@
 DIST serialtalk-1.2.tar.gz 19214 BLAKE2B c3b07e7134ac2884bf5dfb8db9433485b21b325fa025c1ea198e01e8a9037ebac5190dee2e450727adb3711615b2a2072f47cfabd84aa123c9759623f06701b5 SHA512 4634e4a044915841bf4c2ba141b479207237b1d078a3af47515adebbca3feeb8e1a8e86a673b8a77595255b017e51bbe3e3567e4914b9d603ba676525a7f1dc2
 EBUILD serialtalk-1.2-r1.ebuild 482 BLAKE2B 125e9ee0c6c01cd1ebfce153e8c0d66e3e7422b309fe9f176c149dd93794e160c7c9bbd41dfaec77ffcca8ebd3495c292522178e914f34583059100e24599bbb SHA512 0afb85341590b86216b5a2ccc9731915b0484b1da1bda7eaa83c1d75adc99fa32581d1ba967e1d5f4e32162e7281d0924e2567379ae25d279a2ca39b1594f6e7
 EBUILD serialtalk-9999.ebuild 484 BLAKE2B 3ffa80f188568337f991df8605c453fd4f5f31d1253ee003854643772ca3f6748875f0c73aef291e0318614b68e182c69f22476f95b94405089871e4ec6ed4dc SHA512 81e4590049aadbbb062c7622abba69b2d3c6b8ed38becac7ea8a57178e00e55f1cd0e2f6ae45994b516e3f4881f16028102b7d446886f71aecd34c5258840186
-MISC metadata.xml 475 BLAKE2B 4fce004e271bc77dd68ef59184469081f941d5bcc27c6710305d1a7b1376c531ab557aac8997a9ea3439a1224c8b46b32d00c02b60b536f2d90f82a02af2a13f SHA512 7b2a2b0436c52b0548534b479dcf93f68803badded46ae6147145412060286685a5e094865082b9e7614ddb6b515e8fd1b309b4879e0be8258b152a0f4867d91
+MISC metadata.xml 505 BLAKE2B 34b296b4c523bd1aa9dc7777c746f579e2ae4781487802c0582a3532db2a5aeac192097e04a65cb0a88b3a4b562efd857a948ce79c6aaa05568190b848efa5df SHA512 20805377396f0d72b48d6f023d5fbe6a76e4601a8c53314056909b34d84aca8afc2bcba5a33b708745c6324e6b8c9c1b8211c1bddd7b26d6343792a391d22451
diff --git a/dev-util/serialtalk/metadata.xml b/dev-util/serialtalk/metadata.xml
index 0dd8b67910d7..a71c3ed22f56 100644
--- a/dev-util/serialtalk/metadata.xml
+++ b/dev-util/serialtalk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 89325dae829a..b46b2fdef6ec 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,6 +1,4 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
-DIST shards-0.14.0.tar.gz 61662 BLAKE2B f590b8eb876cb7a5d5bbade13b3ee78db443ef24f9abefe9ba662a7018ee0e543950e84ef388bd3cf81960883a60de4eb2409616790c0caef6d06f8fa19ff288 SHA512 214f038f3ddedca8297fe6deac1d12a632b7563c5eda796771f925abe7f197c637328eb1fd1fdd51063131e51fcc73edd6be59c9b213779b6ed5090e8a715fe6
 DIST shards-0.14.1.tar.gz 61664 BLAKE2B 35f5626096266a86561f9b8613cfdb5f628e2ce247eb511dc0896c600619dcc7660b5b2b473fa0d9cec07010a5e13b8614fa63475acffe17a79cab8503cc6485 SHA512 be51e6d5459f0537681bea9b5c7ff048c33cd67fbb9effa20e6af8ac31f8ee0534f2012ed03712b5204451e7a48b932b0c44011dd39a7b47f81c85587579fcdf
-EBUILD shards-0.14.0.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
 EBUILD shards-0.14.1.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
-MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
+MISC metadata.xml 333 BLAKE2B 5aaa8a509bd10e9a7e109960503d257388133ade4ec87394855e78b8e19b7bde217cc129ac30ca61c7ec7d893216a3843b4319dc0509caea1eb60dd5beab54c6 SHA512 982fbd4d41b30594cec235354f7d8fe091f3c183ba49bfc28497fd00f94055a06ac2d72e8160fd906d79f853d864b6d00d298fc00bcc0ece5c69085912ae9a33
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
index cde3551f9733..a6998f23f29d 100644
--- a/dev-util/shards/metadata.xml
+++ b/dev-util/shards/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">ysbaddaden/shards</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/shards/shards-0.14.0.ebuild b/dev-util/shards/shards-0.14.0.ebuild
deleted file mode 100644
index ed35979dd3c2..000000000000
--- a/dev-util/shards/shards-0.14.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 multiprocessing toolchain-funcs
-
-CRYSTAL_MOLINILLO_PV=0.1.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="
-	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_prepare() {
-	default
-
-	# bundle crystal-molinillo to bootstrap 'shards'
-	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)"
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 2ab8b4c3d6c4..cea85c1b2587 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 EBUILD spirv-headers-1.5.4.1.ebuild 520 BLAKE2B cdc4447f89db8ce4c51313de7f062404c0fbf6b7f30fe33bbaf2853f597c702a0ee406ef626d717e022fe55c2e19104aa67840136057b44231c1054da5ce8961 SHA512 20637f37df7f01a551d19ea6e1e324f4022b0f9a7652fbb69a39fba38748a7c2d13a698233233d666ad3ae5867914d2f2fb75b50ddeb6ba26e12c9ff159ff4bc
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
-MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
+MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
index e0db081821a3..898d15df3054 100644
--- a/dev-util/spirv-headers/metadata.xml
+++ b/dev-util/spirv-headers/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 75bffd965399..b3b3a19b7ff1 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -7,4 +7,4 @@ EBUILD spirv-llvm-translator-10.0.0.ebuild 1266 BLAKE2B be273ccb5a212aae3dbed3bf
 EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
 EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1555 BLAKE2B 03064f9e4cc3acd127f98ff1485e73db3cbab63781e24a447b829990418e7dae05ced9b3af77ca7f73613e3b5d04fa91e14a94a06809abeed596d5b4f476bd1d SHA512 cf57d2357b1b1b5ac35326648b9dddf179f9a8a0cab92f8271fc809179e4cf4d01af7b17f53841fcd29c5b498ae00d725dde558fef6ca89cbeb6d59810036a13
-MISC metadata.xml 364 BLAKE2B 203073aa7deafccc7b4521504756fdf2f062d089e132b3175394c3bcc19b72d372260b911bf451a0b362194599b09a9d59dd018fdea8d2bb36d70c631ac1d167 SHA512 770937412a353d713452613168a44fa6697a19352c4b04f51b68fb93aa194f079120d095660b55477ce4d4bbf9eb9c587b2cc7d39d6dbf87cf0ee8181cc1442c
+MISC metadata.xml 363 BLAKE2B 8dcf09b8fc5a238a4c4c841973d13f9046440c08ea0eb5240616836e5891ad49fea580c72d83f52eba6f11781a177245a62fe2746cf0e2404c3ce843136a9588 SHA512 721f1801ac362a45601b9928280210c68cd971dedfb2a2851c97f6899ad9fad68929760e7b5692c9fbf97a66a35619ec8e9d3fda2adb051c76c0d6c77d72d0b3
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index 59d8ee72c1b1..13135f7c6360 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -11,4 +11,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index ea1205927b1c..f9e6dd6605a8 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
 EBUILD spirv-tools-9999.ebuild 1230 BLAKE2B eba1cacd83dce13d51dd9198ebbd2f0f65fe141ccaf7938bd1ca0f1f78bfa72bc8b759459060eba98ddff7b08a65b18bb1f3f0e916d933779e3130ca494deaa5 SHA512 c3d7bb950afc4ac2ccba4850ad3a843d7e691e78fd581cd8c6007d005e18eac5b67951e3485a8432d628458411180fff4e3d7299b87aa6783f89c08bda3d5412
-MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
+MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
index 8199d3b4700f..a1baeed0243e 100644
--- a/dev-util/spirv-tools/metadata.xml
+++ b/dev-util/spirv-tools/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
index ab3b75c425c5..08094c78d9ba 100644
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@@ -1,9 +1,3 @@
-DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
-DIST stepman-0.10.2.tar.gz 3087278 BLAKE2B 224bc6141678d4155474591d7094956ddd230086315ccff8ec2f91bb2d72761f46daa864086a449fb5d79dc2f7ec6f8935fa62a9a5be41a2f0aad9e3de84ca20 SHA512 6b7f1e17ff14e8a0a69056f6a8fa00043b53d818e61603fc2571a42a73e2c88edae1bb233fb734e1796c581c63f7aaf6e91c425525adbb2e1c3429cdc8dfa1e8
-DIST stepman-0.10.4.tar.gz 3173321 BLAKE2B b8dcf7eb7ff5afba1fc12b8bf8d4d594b7c86cf26346de053fd8b50010d6a8dbbf55c6e33eef9e9606c672516319b8bacd66eb8a188eb915280f92d027fea253 SHA512 9cd66e45f9a379ad785dc9a35a022d7f9fadeb9707154890d6c6ee17c716d5fcf319dee80c121f9eedc53baef71aaac3a60a6f32135c05113b97f9a5fc7dd299
 DIST stepman-0.10.5.tar.gz 3197451 BLAKE2B f6a4fd2cc0396c5635d7d45a6d88166669dab0bdfed2d53cb8c809c122ee84039660704326c996436d62797db58d46f35bb73af2415e875cf748be9137304280 SHA512 6bd325e1d50d75bf2a38b89c1faf5275914a3a7f00de0d072450253121d9931c4e32ca85300319aaec90ca108223600d3ff1195276df87b11148d4771c642471
-EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
-EBUILD stepman-0.10.2.ebuild 799 BLAKE2B d2e4bf1e47c302e80aa19a705c8a6297714834e721c53da69df8234e8e43e655d4be1d3777e92bcc3f457a1570531d08b989880b393ed05099e0048249e31099 SHA512 12a7cbe7df5a571055e3787e5ab337dd996967dc01267d6627ba0f15544bf8ba5e9275f1d1c8b71685ed91025865b33fa6eb0c703bc5c6078a1d04403f37b962
-EBUILD stepman-0.10.4.ebuild 1197 BLAKE2B 8067e8f30073f7c992c6d68af486b9e8bc80321157132f10777e23f5da6b3a2f05523ea25ffd1c79b072ab6ddde50c4145bc01dba47a84368c809c0e16d612a5 SHA512 3e386f354d56a561d25ca860dc0b4ed1cd1cae7afe205f28ababf1dff4da5743f18b17c2a2b508a6914711e2d34b0d6b09a445f6ee22d02e71e29c3cdb220367
 EBUILD stepman-0.10.5.ebuild 1194 BLAKE2B 956cb529f7277a81773462a8a6dff4e4d109fec668e280392c44286fde9c9fbdb45c4ff2f9009cdd6684b0149387c198e62b9137165f99e120d37175adc1c72f SHA512 0c8b35f6e3d951d04cee097db6ecdc538f103ed84b24fee524829ffa5fe4ccb9fe62d44ba3347e95e190bdc8450f1684b8ed1ddfdb24ed715962f24e7aa3823d
-MISC metadata.xml 942 BLAKE2B 29a5ac9fabe873c653e59f0afb8e19e23259d5e3116769c6c0371de83b08b89b09ad221e8116f06eca5f49659e25e80fce02f6085a5f16e71cabb6aa4bdea176 SHA512 58bef9578f6df469253ba9d10a2e5e374d1462c9e90b9e1870fa5d812ff5d4d34a834a6afaa4743b7a106116d8f85d722c412e6f2cc03cb27b7e1fa3c6459d1d
+MISC metadata.xml 972 BLAKE2B 75758b4ba1e9ca7d52a2165141b9f3c3be156598e5855e255f2030dda2178ac7aefcd7100460461bc8bf7c4cb3999db14bb21fadfbc29de1a5fb46f26c07867f SHA512 c7299e83b81bfc2859bb8aa5ebc1e7bb107d448798000b9d531509266984f4e09e6bcf3ae61bb24ae32600d2099d774e1157e6d7199bc771635462704a2197d3
diff --git a/dev-util/stepman/metadata.xml b/dev-util/stepman/metadata.xml
index 3e39f8636d3c..6f594b598601 100644
--- a/dev-util/stepman/metadata.xml
+++ b/dev-util/stepman/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>karol.wrotniak@droidsonroids.pl</email>
 		<name>Karol Wrótniak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/stepman/stepman-0.10.0.ebuild b/dev-util/stepman/stepman-0.10.0.ebuild
deleted file mode 100644
index 4b0b891bc494..000000000000
--- a/dev-util/stepman/stepman-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_test() {
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stepman/stepman-0.10.2.ebuild b/dev-util/stepman/stepman-0.10.2.ebuild
deleted file mode 100644
index c91e20ce2292..000000000000
--- a/dev-util/stepman/stepman-0.10.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI."
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stepman/stepman-0.10.4.ebuild b/dev-util/stepman/stepman-0.10.4.ebuild
deleted file mode 100644
index f95a6153f9c0..000000000000
--- a/dev-util/stepman/stepman-0.10.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_test() {
-	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
-	rm update_test.go step_info_test.go setup_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 46efd9e7f1ef..5fd5f11a6357 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -2,8 +2,8 @@ DIST stripe-mock-0.102.0.tar.gz 555895 BLAKE2B 60062d92b58b0e65727675a2744ca15da
 DIST stripe-mock-0.103.0.tar.gz 567107 BLAKE2B 76dbc6bbb1d62ea68c30291fea894e563a426790c8928e7bc5a444eca8d48c8bcc23067459c1a249449af305a6809c70168918543087a1ef5e38cf7609421a7c SHA512 65ec61ccf94d1931389c4a16288dfac4d820a6fdf641cad1028347dfcb298aa4370d97d2dd4e468e17b8a702ce6b7611213b0707f1d5e37cd20aec46772e6a9c
 DIST stripe-mock-0.79.0.tar.gz 462829 BLAKE2B 7cb1365f3fabe4ad286b7f80bc4e1ef25764c86b090aacd543239ab35626271638fe5bde7131431cf233115451ba1c9e9df53a69ff9948c5e04965a67ed5038a SHA512 46f6900eb2d8ee37b1f8dc9a0603ee6182cc70889f92c2d9a8a976670211b2f37feb33d53d51364a05a91c130c4358cff3e0b15dfe61a7619132ef568266c27e
 DIST stripe-mock-0.88.0.tar.gz 504374 BLAKE2B 2414de64ebfd1ed4842fc85e77e940da4b08cc647abebc25259d402db23bf010ab69c9660ad80ad3428f27df4036e706051fa44dcee0d2c0f6e1f089994d31d5 SHA512 eb33249ff0c135d1e74bdfaf5d7ad04b1d7ff05d1472e30d55eb819f06795ec7a05ffe73e90b0dfdd3ebcb54f0fdfa6c0ecd1158ca22abc044e1c2e212984517
-EBUILD stripe-mock-0.102.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.102.0.ebuild 583 BLAKE2B c59cdf187cc4ae59b76404a32fac3d835c797e12f7622f5c40788eb3b877750e3abe7d71feef513c889aa36a1162f8d222cd528098cbccd84eeaca44425ddca0 SHA512 484f105ae4fdfbcde6e8687b6ae9b69621ea08afd4f5efa23c03d4f6cf5fa9ca68c8e8cafa5c4ebafff983be0a2ea7d1016f7ac66c8cc3ccbe60cfd28352e353
 EBUILD stripe-mock-0.103.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.79.0.ebuild 584 BLAKE2B 9052a35ea96059edaed6c0893930a2708f76cc8fd14526372468912a20fc38e1a3b93ae7ace2811783ff5c20fed4ed852e7ae01b0d5c5809f7554dc6a13673af SHA512 6d905c6ac495e5b644761cb5a19714360a4dba45f9c673481f5f5afd262cf96ef7c43dc505cecd4146fe14f99d34ff7cbbcbb8d31cdb81e38521fce04b353198
 EBUILD stripe-mock-0.88.0.ebuild 582 BLAKE2B dd8676dfab0891cc40b5922fe235ba58960c644a09734cbe60a1943d14b54395e7079a87b817b375bcf45536ad3314eb9751917d7a0aef68adafb6072a40b4a2 SHA512 a640eefff3cace87e30b6fc09ad3686139f8ce9048afa3115df14845a64602ccc76681bb34e345c1d4703820209d0c57961dddfd4aa1c6b435e06151934e4ccd
-MISC metadata.xml 725 BLAKE2B 5581ffca5d7ed165d7f01d0d158e4ef45454d7a917d1996e62b9e1fab9593d6ee63c6042149f3581944747f896292dd9f65d462b019768658f5adf24146093a7 SHA512 808daf9ba987547a9d639c70bf6d78d4d1769481a9023a54005a79106a5cc7bbf90c9edec7551f3284fa055a2ffd368335405d558fd1bc5578da3bd667956ba3
+MISC metadata.xml 755 BLAKE2B 27b837f64385f50cf83e0bd5753560f5b6878d8ae5984c6e99deaf02138791e397e5755db1033ab3b4863f75edc90caaa91309247789ca54d01362178670d862 SHA512 bac1e56b0fb021b43712b31e98042f8a30cdc3f365ce928da35491a8261f04469c666afe8e21b82c9b3095b374ffc3312a8d909e4e24a87638b0de8551ff5d10
diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml
index 2f64d0144cbb..66770fb3fc7f 100644
--- a/dev-util/stripe-mock/metadata.xml
+++ b/dev-util/stripe-mock/metadata.xml
@@ -5,11 +5,11 @@
      <email>cedk@gentoo.org</email>
      <name>Cédric Krier</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>m.seifert@digitalernachschub.de</email>
     <name>Michael Seifert</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
index 05a7220e34b0..0d362eb78a2b 100644
--- a/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index c330720e2675..8ddd8cede681 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,7 +4,7 @@ AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
-EBUILD systemtap-4.0-r1.ebuild 2829 BLAKE2B 08d2fd325a6b6111cea070e6af3a99f4928e023bfb90cb6d550bc083cc08c3973f845811ffb6196944fbb5db7d298e35bd59b2c1c29e759d3ade0defec73cf41 SHA512 ebc821c97c9a4f61f38fc289b315e84b40b1ea46b4920ba347eb43952149fd8523003cc08854beabfdbacdad08d551d4281336d5291f0794198ee61d95f219fd
-EBUILD systemtap-4.0-r2.ebuild 2899 BLAKE2B 5d0346dc179f67a1a40c18f08938830d086c6c4741329afe31cada2e9e7b06e0f21e5e4334a77f1b635a0e05606e63624676591ab47e0bb7756fdf24dd25d7c4 SHA512 12ef285fbdf9a5ab4f6fdf5a96f5c59dae3437dc52ca123e1e18bc55262de074b4d1b00fa326c32ab2be34c0a036524e2f3df0d4d422b105fd59f2507a57faef
-EBUILD systemtap-4.4.ebuild 2865 BLAKE2B ab50a603e442c631c493b4a1121a85c641c08f5d6cfd76b68ba53f8d009e6c9a2a830299d32cd4a8a4a49f21b8462183aa6da0b59a9ffc60f7129d114f781dd9 SHA512 c72407408f48eca5634f0ad9c533eeba3a0cdc7a7afd276852ab311633642a973112daf5b9e95526419183c4da82cf1c8e16008ef6af6c2e3a85e9366560f9e5
+EBUILD systemtap-4.0-r1.ebuild 2856 BLAKE2B d49b03f84101093365efe67a0b477a829e05403dd94beae937059c52e4088f890ef577314e2a7f5f8174933e0d84cdaa01ca5a0ed01199af995eac1acc441067 SHA512 08a10f72bef1df25fcc735728680e4d493e5bafcced16adebc3fefe5013de31d33956349284b338ef7a318d81c124e2903b2e13d086bd8d0edc6bdb426d03420
+EBUILD systemtap-4.0-r2.ebuild 2926 BLAKE2B 7de3ae27e0e904f805f80138bcf67a366094a091de2bc4e432cf8fce6a091853fc9e972478b0f04babd6ab51f413e9fe96b41ea98fa9d17061fb71db1af4ec83 SHA512 959dba0ef465ed1ab64274c892dbfc6ed50abc3804cae620731c9f5907c35e1d8be269d557575681a069fdb4067f38e537d565d3dee8144010bdbe30c0c8522c
+EBUILD systemtap-4.4.ebuild 2892 BLAKE2B 725a690e263da0a13c04291e201f3771d2866da3e31e0832f8aba3b0ae5bcfc3802639e6888ec0a0ca2b38f9c5c63fc867d1444067072741098d80ff027c96ec SHA512 027197b55699f6c69f3ec482249d980ff33acf54832fb5e971084f46a683db8dac0b1d28d94ce6cd927abf41155bbae26bebbb0ee92a89ab059ded2d6548bd95
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 8756646eff70..de5dabdc1044 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
index dcf1f8df499f..cb49b3599c90 100644
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index 1e32ea4a68ac..5a3e3efea14c 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 450da37a9fd7..4feaabc1e235 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,4 +1,4 @@
 DIST uftrace-0.9.4.tar.gz 1068091 BLAKE2B cbf9ead0e2c0e8d59be379e65617cfa310fd4134cfbbc8091c489913f108e8a7a0b81e33d46032f3717a5bb8127cbeeeb246e3be0c37da03981dac4bacc07119 SHA512 f73ad4461051b9c61668161e077897d118ac556d234ff204e32bf14ecdc2c0df148da30ea5d5054641e79ea20b29261d6f637908f5047f5669207ef244865358
 EBUILD uftrace-0.9.4-r100.ebuild 1137 BLAKE2B 78c1fe9945a099d538963d188ebf91f83018620659567b713a0c0b169ed7aa9c5687ae126d534b0d060f95c4f8897413baebff50acceea6b31f45060136bf815 SHA512 2a111b38989d73bfb15af823ad98417946200a71fa6851e22828d7fbc5ce4ff30157bb4908c41f993290e9b9e4a7558816bdc02eba45bb6737cc53e9a1ee7a7b
 EBUILD uftrace-0.9.4.ebuild 906 BLAKE2B 1dac005c9729ba654a2fb47bb9f62ea3133980bc13b15082a0f456ac11916e405eb68a0b82f2fb4aee8fb08195cc02036dd3a642be920e1d7815b26faef9c709 SHA512 6d2efb66d03e8f0aa828167d7803da3582e43e87c885ce5ed70d59b150d41b3db2206dc50358603f9ab98b418e6ef299d4d6b3161760ae24264f57723ed9ce31
-MISC metadata.xml 438 BLAKE2B 573900b49b5a09077887b8703137b6e33cfe992340299f397601fee032b474fc1127ff96f07a8db6da9bb9592e0ef1f45c996dff40fefeb63a15a233de2fee98 SHA512 b272ef1b4664a53c3d00445285a550f8bf9abcb100417febe7e177b803cc2414b32bf5c6900113dcccea0449a5e23c14543b349c3e6452f5ca1a37d6639214d3
+MISC metadata.xml 438 BLAKE2B a270f82a149c32758b8d0054b5f1204add5dabd8812ce01e6c9ed9e0a71aa38bfef9def386f8a2c6f67cae59c63e58fbff8b3f00a3cea5a334ee41434f3c6fa1 SHA512 774d0ec195987c0b98467e03a18c1eb4e2880d5c5d63e3864b5aee84981e0539197d74530a64068399dac7c0eb28e7570a0b8242e0ecf049f79d995eab884a8d
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index ae2d867c1726..3ba421f6e224 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index efc23cb0b1b3..b44f1f8447eb 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -3,4 +3,4 @@ DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656
 EBUILD uncrustify-0.71.0.ebuild 687 BLAKE2B ece80f3cab177715aadd0bc203e6c0b816b7c2e05f18fa0594e35e0306e8c8ce0728613dbd62b2ebe2a92533c40790c1f17bd558fb8a9e3a0d3390bf3af6cb57 SHA512 071f8557bedcff76bf46ce3910926655135bfb889401bc39e23b404c840579e0340de24576a9dae7b78faf455ee2db8ac707df59029783c7da998732314ce1dc
 EBUILD uncrustify-0.72.0.ebuild 681 BLAKE2B 3c5527c916bbfed4fc622a4a3deb22c6ce7af796cb0361de8bbbe8ae0fc762676cb431f72ecc20e1af629ee1ce8a8200a1b746b46e4f79f58f37d18b36a9483b SHA512 f7431a6210854a32bbe36d6c9649750c26b88806e83d20746d195cb4f632a2b8a6de91d1566d36eb53739f46a9d90bf72174c3c8ac7c1ed7bbecf99239f4b192
 EBUILD uncrustify-9999.ebuild 695 BLAKE2B 02437173f4bfa7935c22fdc51f53e0cafe4dad47e6ef453697effc254b048a63abe8e6cbea8f741b7781a5c902bd52fb1b4ceb0a9f8e8d192de96d251d211ade SHA512 389d3547d295c03acaf3cbbfa698dd62ad2c33f1227e2d421fa97be8da29bff05a3d3644714fc5f1c3dd5cbacf2bb57a7251a6b1b9811ac16ab3bb09f0b7a1df
-MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
+MISC metadata.xml 499 BLAKE2B 835eb2ba7d168187f396d660d70a5eff9d8ee5c6cf90313eb8d5fe08bba7246eaaefbef28e88655553a4af18d49efc379bfd5ebeb4f15b9fc0e833a272dc24bc SHA512 2fa746b88bd158f9d7cec94c1e6bccf2d0bf3c6154c9a8fcb49faaeab7a39644b2994f0e4f979b3230f98955e82537f6761c93c46ca013b1edee8a6b13bda840
diff --git a/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
index 370ea023f4f0..57b44e86cc58 100644
--- a/dev-util/uncrustify/metadata.xml
+++ b/dev-util/uncrustify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index c10caabb6600..ff6a6880ae31 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,3 +1,3 @@
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
 EBUILD vbindiff-3.0_beta5.ebuild 399 BLAKE2B 2589d4256b28d30778a743235e78cdc2dedf5356d59b1df362befeedcb0a450caeb7886458b1203843112cd3f57b790d93e549b223fed8369bb6aff2ea061492 SHA512 a0e0961d4e7ab4bb9b9819c5af2b45423b60039559646d1e610ff75f44aa19ce3933982e0bc48b0f9d8097dc899f64f0d489593af491d5b9895c38abc3bd60df
-MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
+MISC metadata.xml 331 BLAKE2B 62db8c95752ea477fec8b7a7bb76c5cd7c6075f8d2618c476f8da83917cd893e6878ed63bc5f8ef039d7c32fd3e1dc8cf9418a454b94adfd889d7445198de023 SHA512 99149387b18568a36c5057f0b19d1a467632ffac30cd1917688ff1d590f673ba700e16ab42d3b5b2a214f5f933b4ff0c666bbcd7d2675608ca9368f334a9904e
diff --git a/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
index f842cb0feb5f..3174e2784a40 100644
--- a/dev-util/vbindiff/metadata.xml
+++ b/dev-util/vbindiff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index c89f0f391248..0660cb0f3dac 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,3 +1,3 @@
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
 EBUILD vint-0.3.21.ebuild 886 BLAKE2B 50abf8d296e0470e98b46f881bd4093c54684d7d93b64d19ac03d86e4c89fbf8dab74bf7c7e87e28d90195e9688991bfcf57db39f776c9966945f94f31805cd0 SHA512 c54bd92dfbd9400728c2dffa8fffca797d5270bace822c662ec18d04030114315114aad16b5ad48b27fcfef253cca6571a47686f540e6fbda37578abe068ae20
-MISC metadata.xml 553 BLAKE2B 2fa32b5a72b9d9fd9587db124e7786d8f4a4607084016166b36f02cae5c6b7d4ed375c462ffeb770fb0799aec8a20e7509a627219cd21109d1ab2bb4575a901f SHA512 715bf84e6bb405197f1667a8e03bc14d4e05ab6393f863bbdd56a56c8e92789fdcc4ad3ef0d3e65934e4a8f759acf50d9e6f52aaeab4a3955e6d9b9edba6f891
+MISC metadata.xml 583 BLAKE2B 231be31465fd4051462c0fe55416e433dddf9bc31e736383cce4e8c1623ed0d1e0a08cab983140502779183ef363479de7b3faa959cc6e9204eb2643ab61ea13 SHA512 0e49d9d4b776de48850ef366829fcfd67a4cd34d7ff6f45430d25144f58420fc4fd0055caf587331997dedaaee461c8757e5118888068b47df87b878991adfac
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
index 0daec353c951..b6565be06544 100644
--- a/dev-util/vint/metadata.xml
+++ b/dev-util/vint/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
index 8b68f753d4a8..f12eee4a2c5d 100644
--- a/dev-util/visual-regexp/Manifest
+++ b/dev-util/visual-regexp/Manifest
@@ -11,4 +11,4 @@ DIST visual_regexp-3.1.tcl 71183 BLAKE2B df6541179cf06c49f6bb40a0bc186ad45aaf535
 DIST visualregexp-icon.png.tar 20480 BLAKE2B 589ea0480f68c442cfecc2638f87a901cc2d75237deefae49616b6626bc1073f14ff9c009c09a28c2e93b2f8c1ae3e4123a05e24aa73f2f6e0bd9fb53bfad15f SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2
 EBUILD visual-regexp-3.0-r1.ebuild 935 BLAKE2B cb5066717a3ae6af48b7071e556e8ae1f42a8f7cdc4a8e529ae6ece3dce0db594677be95fc974e142daeab59f81d2fe66c920a3d20bd23a0f06d38bf60c4bbf8 SHA512 19f39420f473fb8a9b049c4fd377abf1ff230c9eeae397d583afb0065851660413ff2c339e9f9b82cd5c62018dc8d9435e0b596f662bc4cbb830071f1de19078
 EBUILD visual-regexp-3.1.ebuild 1237 BLAKE2B 4acfd1028cc591f2ee852a845aa43f0fe3928ff3bfcaee16b552de4794309a59b4360a73f65529b33bc80bf4891ce8c922c260831052d82b5e9d496f1081df35 SHA512 532ecc703222531147989096acbee3523aa39ce79148bb46a0c2ebcf0b5aa7cfe760fe1773dc4b0837f41f7ced5517373bef2b4d43687f92269834cc1c711dea
-MISC metadata.xml 365 BLAKE2B ea9b3d852fce83839d993c8118c21d945a2944fbbdd476cea7635b2e7361ba030d33a433fce6c6ce2bc44e0a250d2d0dbc9f6e30d1c1c692252251cfc9181971 SHA512 9556a7d272b95bfde71df2994d8ac26639f3252cd743f9caeeea8b516a70dfd031dacf42dd56df19394c03223001e09bacb094b68256641764d139b3880e9ff1
+MISC metadata.xml 395 BLAKE2B 99fff524ddfcceb143a1eb1e6436a9c8f81fa972d80d3ec5609428be2b236355b8f33bad4ac41ed320aaf9fff6c770a63aba8e54db28eb0c9a3871fd7a913876 SHA512 96785ef8ec6aae2f17b9c99f2cd239f6a695bfb349739155fedd585c8787dc8649248ffd7039620fc4c7f8cdcfedc6512e39bba1086231bf3f31fbc127a293e6
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
index 61d19ccc4a52..302b0c2d20e8 100644
--- a/dev-util/visual-regexp/metadata.xml
+++ b/dev-util/visual-regexp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>quentin@minster.io</email>
 		<name>Quentin Minster</name>
 	</maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-util/vtable-dumper/Manifest b/dev-util/vtable-dumper/Manifest
index 48e1512c14b8..1fb960c32a46 100644
--- a/dev-util/vtable-dumper/Manifest
+++ b/dev-util/vtable-dumper/Manifest
@@ -1,3 +1,3 @@
 DIST vtable-dumper-1.2.tar.gz 16033 BLAKE2B 5674918fa91f7dc266da2a0fe9d4bfea1fc6643fa6dba5a031add4a758b7e6d729cad0c1be72ef3f374887bda3cbdfa3e5a0e68a9ab8f502dd29c711f5a5b55c SHA512 b1e052b95af1fa557e2e2eb4faae79afd9b7a87c664c546d43ff92de0f118d6f5fa9e792671e546a5c05364af6149b066705f94c2c590dd103e0067004a7543f
 EBUILD vtable-dumper-1.2.ebuild 551 BLAKE2B f80ccdd061181b47c0aa840504a6ea1631a1b26a6784670412c7e0bd270874667b2bc368b96535dd3e04717cb853894280529f36427a4b8b89d88547e3466933 SHA512 c4d83121a25b48d69e3738b12b350a2f77334cca40670f9b5a93a2a4a3d968cebbe4b807d0d7f4383f80ba7d11b039a346baa755cfda3d41a040aecb587f4471
-MISC metadata.xml 436 BLAKE2B 7b226efbd5fed222de490c97d8eef802dca2acc22e644cd4c13ae25175ace4ecd6aaec117a0b0117aa5540159197dbf256302262b62dd8980786e9f8b7ad394e SHA512 e3070f8ddc5ad65ec16e6d8b49b1d71f48a459d5e12cee08d4a1bc12eac903918842bcd4434de4a0a2c77a37be95e3691c8ba94a2cec0f1857665f464b907e55
+MISC metadata.xml 436 BLAKE2B 3fcb763a2c7182578b001109debd64a3178b40438676f7ac326c0ee9c7a4ae48e57838dd8a1257f16bcfef0cf7a7fd47966f4cf918e5ccebbbc88acc513e12d7 SHA512 06a65fa0174b572865e320c8982c0c6f96479c38bcbca9a2daf8c7b6bc613376f0016d0de0a63e39aee860dbbd4eecbc5fbb409c261359d1543bca43a2bdf5f7
diff --git a/dev-util/vtable-dumper/metadata.xml b/dev-util/vtable-dumper/metadata.xml
index fac2ebc49305..b19bb9a8d88f 100644
--- a/dev-util/vtable-dumper/metadata.xml
+++ b/dev-util/vtable-dumper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 8ecfe79c6e00..a087d33e4db4 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
-MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
+MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/metadata.xml b/dev-util/vulkan-headers/metadata.xml
index 830c78812893..de2b07466f94 100644
--- a/dev-util/vulkan-headers/metadata.xml
+++ b/dev-util/vulkan-headers/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/Vulkan-Headers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index c01e623d7a90..fa3b5cc86c66 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
-MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
+MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
index 9d9218cb035e..12c000ac20d3 100644
--- a/dev-util/vulkan-tools/metadata.xml
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -16,4 +16,3 @@
 		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index cfa7b05b3a87..9668f5653008 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -2,4 +2,4 @@ AUX 4.9.0-changes.patch 2974 BLAKE2B 71163fce5ec3f62e174810f485a43fe0a329757004c
 AUX 4.9.0-python3.patch 2402 BLAKE2B 9378a4613048891e6d4b461a9442ff7585dc9f137c03de417c62fad5edb78f138e417e35abe9283f33bcc7da884a2b2e885ebfcfa638c183c1521660af97c300 SHA512 68490ac9eaed522f81e51bc1a2bd98f93282f929587c8e865baa519faecc921192f9e751a5ef8099a5ab6e1e5523855ba4bf8aadb2656506e632cb97eff16839
 DIST watchman-4.9.0.tar.gz 3508045 BLAKE2B 413b779f02736442c371af1d9e18e5c84f05f9e9465c114dc4bdf79cbc1d823f1ad3167abef22818652a924ca2cb563c54d18f7599b987f579655d8a2b82162a SHA512 3c1222ba41383b26c2c427415e75abdb4bef5a95001438c3debe7cf3ca654944ecf08e432c5ad0aefa2a6554ae73ff0f6995e7f4ee61cdb2cde80f8378d3a704
 EBUILD watchman-4.9.0.ebuild 1160 BLAKE2B 0b161235121928f955ce1ec143340562b970cc3dcc869745a68ea7491ea813ac0f61880aec68d6f2c555c4dae8a369231fd0cac42aa44998ed190508dbf9da76 SHA512 d083c55765de1866ce247bce16e5b1f1ccb40281cfadba352f879fe94b129a7c65f1305fa44f174c53073483f9714ac77d7359f0589c7859eb1981db5a71aebd
-MISC metadata.xml 672 BLAKE2B 96db77114305163124079f89946b3824baad223e6a3e64c820904d0c9f05addec99e746e22a76f22eff7d4e533788bdb0a39d7ddd566f012be4f8fd37b8a68c7 SHA512 3b0a92388bc934b430a7367760373d033975d47a3a96efec80eae5570acd10648f93e8ce85dff74d51f33a08faa53161bb7c90365575e01284211e3261382a78
+MISC metadata.xml 702 BLAKE2B 5851e5a0ba81aa282d1a013ce5415b5f7415bb20a0e4da24a5d198908ddb8df4d1c96de7d59d5d354705b0ef4d8b4041cde467dc8d48eaefc614c87f77deff65 SHA512 d26e3f1e4cb84708dd1ff5c2de3c669c53c2916ab26379ef3cfec4d4ab0afb6fffffb3b53527e53d51fddec5b11ba777d74fa6932f3d98b054c73cedb2265f5c
diff --git a/dev-util/watchman/metadata.xml b/dev-util/watchman/metadata.xml
index 0dc2b75aa0cb..e1493f500696 100644
--- a/dev-util/watchman/metadata.xml
+++ b/dev-util/watchman/metadata.xml
@@ -5,11 +5,11 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>adrian@planetcoding.net</email>
 		<name>Adrian Moennich</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f07c1542801f..70a9d7e4e4cd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest
index 245488fcbb5e..15676b6b75aa 100644
--- a/dev-vcs/easygit/Manifest
+++ b/dev-vcs/easygit/Manifest
@@ -1,3 +1,3 @@
 DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec
 EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72
-MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
+MISC metadata.xml 393 BLAKE2B 4e6384d199282453f5abaeb4b3fc89a44a3eae88d7084e6619c2ca3abb7162b476adfb9dfa938c20a24c84f879962455922082a9ee4765791531afd4b8366781 SHA512 610ff6d76acaee2a052ebe59b637f1baa26293b675683f4322d5364b0bb0a41294e654fa848eac866cf0e25788c72cb5d32fc1aba3bcfc5eb2275b4892a504fa
diff --git a/dev-vcs/easygit/metadata.xml b/dev-vcs/easygit/metadata.xml
index e8523f5eab18..efcefa58be0f 100644
--- a/dev-vcs/easygit/metadata.xml
+++ b/dev-vcs/easygit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@culot.org</email>
 		<name>Frederic Culot</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest
index d66b6f1b8d67..792d18844df6 100644
--- a/dev-vcs/git-big-picture/Manifest
+++ b/dev-vcs/git-big-picture/Manifest
@@ -2,4 +2,4 @@ DIST git-big-picture-1.0.0.tar.gz 2952246 BLAKE2B caf28b57399bbdc2c80feda70e2a04
 DIST git-big-picture-1.1.1.tar.gz 2960674 BLAKE2B 00b3117f810b78965e5a260000689c3275f078307f8e5ef90e6a032036eeedcda743c6eff3e3a1f53744d71d9b3bf2692efc558d5f5b20eada9a9b2e21559796 SHA512 1bf1b620d73cccb058034bc8920adcab117fbda8b921937aac6b90e2162cf4b334cae934b0395efdf40b5e9a363e7ec69090ca943c839829dedaa40428dbdb13
 EBUILD git-big-picture-1.0.0.ebuild 716 BLAKE2B 8783643bfe34e5b43efb9545bd901d022d984cf000c6eb04a182e493df52e7713db667a476d20dd9db1df9a492b1740eb4193a0771eb03bb2b39e40792dedfab SHA512 b234296687ceb1aae19757d42d4baa822233889087dcea91fd71efae7f5759cd4006b4d9bbb884049261c499828f7a8e3fae83a926b4423d48b35cd8f8eb8792
 EBUILD git-big-picture-1.1.1.ebuild 876 BLAKE2B 5c43832dc4e02c9164a6ae4c9b4488eabdee730572b5a5535fc0519be22c0b3ca97670ce675dfb9b92d6498e171252cae0348a9091a8b356746181d4db120c98 SHA512 0fe6e14a0c7c3bd76ad1c659f0094210240ce25403068e86d74991b6c4f17701a19a0c8bcdd8c18ee65e311d56205614cb74cf09d626ad8bc1ade515b7ddda05
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/dev-vcs/git-big-picture/metadata.xml b/dev-vcs/git-big-picture/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/dev-vcs/git-big-picture/metadata.xml
+++ b/dev-vcs/git-big-picture/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 579ed4b41cd9..332d8415f249 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -7,4 +7,4 @@ DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31
 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
-MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
+MISC metadata.xml 594 BLAKE2B 13b00c0c9e670e5144d90689403127d05c55306213d7aa8fcc04c84a4006ee507542ff89a29c0f969ce97f930fc511e1e8d8f453ad0e6d39340449c530d8f3f3 SHA512 a6eeb13098e2e39aeaa150afd71e8b52405238021943c45335e1bd5cc70eafa79d2bdcb4564db32b9e1b96ef78c5740abac358d72ea64dbe90f279e72c8fe4f8
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 4f507e2ec3d4..60cd890892bf 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>me@bearsh.org</email>
 		<name>Martin Gysel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
new file mode 100644
index 000000000000..91e7029915b9
--- /dev/null
+++ b/dev-vcs/git-extras/Manifest
@@ -0,0 +1,4 @@
+AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2
+DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab
+EBUILD git-extras-6.1.0.ebuild 1160 BLAKE2B 85d0d2077e00e01276b55f5ed70f9cff1d69546abcb93678e3f92e188190871058c75ec80594cbea5acf34bb972b7f3f2206b29863032ac01ffe88b7283bd822 SHA512 656f125a60213ac1d9e1477753fd110e5d78b3dd6e6852ae347114acf8b0518179105e5f46e2c71fe05b122d2e11e825aae38781ffd19f5fd07c1d016119df6b
+MISC metadata.xml 317 BLAKE2B 81e94ccb8505cef2f0dd08b3cfa09c0f00f8ec7ba52f507cdb85467d48d10d7edf311beddb8f766fbcf10a49f62245839dda84a194268a0a5fdfb66ace18015e SHA512 b9353731d4665fe680aed7ffd9236177651ce2bbf6a7210652055cacf5fea38ee5fb7caecaa7cdeefcd7068fdfac85a1fa504135eccc6dda56929a5c1c2dde1b
diff --git a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
new file mode 100644
index 000000000000..c1d606c3a38c
--- /dev/null
+++ b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
@@ -0,0 +1,12 @@
+We shouldn't install this manually via the Makefile - or to that location.
+--- a/Makefile
++++ b/Makefile
+@@ -69,8 +69,6 @@ install: check
+ 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
+ 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
+ 	fi
+-	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+-	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
+ 	@echo ""
+ 	@echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \
+ 		"and put this line into ~/.zshrc to enable zsh completion"
diff --git a/dev-vcs/git-extras/git-extras-6.1.0.ebuild b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
new file mode 100644
index 000000000000..7ee7468ae07c
--- /dev/null
+++ b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Git utilities -- repo summary, repl, changelog population, author commit percentages and more"
+HOMEPAGE="https://github.com/tj/git-extras"
+SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos"
+
+RDEPEND="
+	app-shells/bash
+	dev-vcs/git
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
+)
+
+src_prepare() {
+	default
+
+	# For now, don't force including the git completion
+	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		install
+
+	# TODO: Unfortunately, none of the completion seems to
+	# actually work for me yet(?)
+
+	#newbashcomp "${S}"/etc/bash_completion.sh ${PN}
+
+	#insinto /usr/share/zsh/site-functions
+	#newins "${S}"/etc/${PN}-completion.zsh _${PN}
+
+    #insinto /usr/share/fish/vendor_completions.d
+    #doins "${S}"/etc/${PN}.fish
+}
diff --git a/dev-vcs/git-extras/metadata.xml b/dev-vcs/git-extras/metadata.xml
new file mode 100644
index 000000000000..a74e708790bf
--- /dev/null
+++ b/dev-vcs/git-extras/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tj/git-extras</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 2a98335737d3..92f63d19ed1a 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -3,4 +3,4 @@ DIST git-lfs-2.13.1.tar.gz 2526962 BLAKE2B 3f3af1c0f976a17c108159fff15a065600f32
 EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
 EBUILD git-lfs-2.13.1.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
 EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
-MISC metadata.xml 446 BLAKE2B f6678414b5292ac89330446f6e140a70f998e9932dc0852a0de0bdcfd6406fa9bbc0aa479973ef0cebedf6bfa6a041bf9c3deb94df0e58c2bf57655b0d5f30aa SHA512 f63de45e71c0b09ef762289665523c39f5d89687b1d92e8ef632e8fa74af3a2150ef29a05e30846a8378f100360ddd275f4a0f63f57c480abf21adfa60b81d81
+MISC metadata.xml 476 BLAKE2B 19aa325991d7694677a8d5e50154404b678416fc4b446c33fdeb9ae3db078c06845fbfe11ebf37bd1afcc1c35f19233bcc290b5f47ff16ec0305ceb7829758b0 SHA512 ddb583c724ba2b948f66c3568352a10cb09067a66ec98596f8dba11001f5101cb69e9fdb74b29278aead3b123ee6bd69a4a4f785d72bb1a2977fb129c89ecf02
diff --git a/dev-vcs/git-lfs/metadata.xml b/dev-vcs/git-lfs/metadata.xml
index 0b79785e6d58..ce896675e9ac 100644
--- a/dev-vcs/git-lfs/metadata.xml
+++ b/dev-vcs/git-lfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/git-publish/Manifest b/dev-vcs/git-publish/Manifest
new file mode 100644
index 000000000000..1131beed3d62
--- /dev/null
+++ b/dev-vcs/git-publish/Manifest
@@ -0,0 +1,3 @@
+DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025
+EBUILD git-publish-1.7.0.ebuild 913 BLAKE2B 8a95cd61903dd64675c3fcde220b41170aedd9f19e79fd6fd9a435e03c8b887717a0fcb82cf18d599adeaa82feecbf4300c00a5580a392f4469c9978bb8affe0 SHA512 7dbcfd568e2186c352f495ac27d79798df4f0aeb039acb5feb0d6df851ba028e127f636e0befa012db47907778e28a86cc7df278615d1723ed4c1c8e9bcc8bee
+MISC metadata.xml 576 BLAKE2B 1dfa47470c8ff5c1fb852d1e16a8acf4984d08be910e666b8910b95dd693f08bc0507bbd83c885f28af1777838eff713906f33c991a7b08de6ff82ec3f2cec2e SHA512 a342fa5037d547429908fdc3b61b6acd153896a3875164555226bfe8d11d6d4c465c69b217c2c29cc5a6b35504c784f1c706e87fe18bb68f2c5099a4fec1a083
diff --git a/dev-vcs/git-publish/git-publish-1.7.0.ebuild b/dev-vcs/git-publish/git-publish-1.7.0.ebuild
new file mode 100644
index 000000000000..7a000d781109
--- /dev/null
+++ b/dev-vcs/git-publish/git-publish-1.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit python-single-r1
+
+DESCRIPTION="Tool for preparing and storing patch revisions as git tag"
+HOMEPAGE="https://github.com/stefanha/git-publish"
+SRC_URI="https://github.com/stefanha/git-publish/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git
+"
+BDEPEND="${PYTHON_DEPS}
+	man? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+	python_fix_shebang git-publish
+}
+
+src_compile() {
+	if use man; then
+		pod2man --center "git-publish Documentation" --release "${PV}" \
+			git-publish.pod git-publish.1 || die
+	fi
+}
+
+src_install() {
+	dobin git-publish
+	use man && doman git-publish.1
+	insinto /usr/share/${PN}/hooks
+	doins hooks/pre-publish-send-email.example
+}
diff --git a/dev-vcs/git-publish/metadata.xml b/dev-vcs/git-publish/metadata.xml
new file mode 100644
index 000000000000..b97d2e99f3b7
--- /dev/null
+++ b/dev-vcs/git-publish/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		git-publish prepares patches and stores them as git tags for future reference.
+		It works with individual patches as well as patch series. Revision numbering
+		is handled automatically.
+	</longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">stefanha/git-publish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
new file mode 100644
index 000000000000..3fe043e08608
--- /dev/null
+++ b/dev-vcs/git-pw/Manifest
@@ -0,0 +1,4 @@
+AUX git-pw-2.0.0-version.patch 278 BLAKE2B 8ff5fc1f4928449095b5b644a5d933ffac72feec36b47972ae9206416e75b2e8355defa1e15a4e3a75b4a6ed6b35c634b4ba9c93d2d1d1a0d1e35d5c9223465c SHA512 02ee7fd042f9ac2869da210c90a11a2d98c7d22d3c5f416aadd7bbb2d1faaf01a76ab12d575ad646a78979fe047c8e005af7cc7031012a9ce1b7d229db13f8f8
+DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
+EBUILD git-pw-2.0.0.ebuild 1013 BLAKE2B fa1c26120c84e82d9426ca31a6817cbd6034a02d27e8cf816b150a7b2e356c5dc252c0519c6611372713845479a8f3b6376e725e83d5393f9a0e26187a369910 SHA512 f7384c234dc3fe17a3111c5f09ecb9f0de5758c90f50f905c4a964fc8b3b42b86cd771f2ab7706c0981f1f3d728511634ac1cedcaa7f3fd904f6da82930311d6
+MISC metadata.xml 572 BLAKE2B e9bc2b6775ef17fe1a1975e40e374a9ee1b3f98e51e140acee6f3a9caae0eddad1aee41cd417f36847fccd75da5505ffed28daa0680e15177fea3e8c6255f88b SHA512 021c311570c06714ed3ee803e8139790205f57d8731796e43f83212c84ffe4cd3462f29cff53489255f0518f561da26adde8c13ee3858ff5738d923b0f2109ca
diff --git a/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch
new file mode 100644
index 000000000000..92706506c697
--- /dev/null
+++ b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch
@@ -0,0 +1,11 @@
+diff --git a/PKG-INFO b/PKG-INFO
+new file mode 100644
+index 0000000..9748ce5
+--- /dev/null
++++ b/PKG-INFO
+@@ -0,0 +1,5 @@
++Metadata-Version: 2.1
++Name: git-pw
++Version: 2.0.0
++Summary: A tool for integrating Git with Patchwork
++Home-page: https://github.com/getpatchwork/git-pw
diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.0.0.ebuild
new file mode 100644
index 000000000000..8efc99b1623b
--- /dev/null
+++ b/dev-vcs/git-pw/git-pw-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/getpatchwork/git-pw.git"
+else
+	SRC_URI="https://github.com/getpatchwork/git-pw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool for integrating Git with Patchwork"
+HOMEPAGE="https://github.com/getpatchwork/git-pw"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-version.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/git-pw/metadata.xml b/dev-vcs/git-pw/metadata.xml
new file mode 100644
index 000000000000..2845f37880c9
--- /dev/null
+++ b/dev-vcs/git-pw/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		git-pw is a tool for integrating Git with Patchwork, the web-based patch
+		tracking system. It only supports Patchwork 2.0+ and REST API support
+		must be enabled on the server end. 
+	</longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">getpatchwork/git-pw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 2119e917949b..7055dcf33cec 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -2,6 +2,7 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a1
 AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd
 AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df781c77f4e5fea1f5f6f42a0a5c9ff74d08909790dc961abe4896016128a01992c1ceeb61236d4d11c9ccfdd4b8257ecd89829aaac435 SHA512 1fd1a3af27e2945d25cb24a60678c05aaa32edf312d2750d7aafa26bfcce1877d88e49f649c3ac572f75e8631fc979f82d75b3e8abbc02d1750421d4cda41321
 AUX git-2.22.0_rc0-optional-cvs.patch 14182 BLAKE2B ec4273646e5b45dc8877e0e41e03be4a2e6f1591f90834e5521f4322abcd9ebd75021ada8992fe90a3572dce7b87b4c8cfef772367cab8a49df67369a7d2638d SHA512 ce155bf2b1515ba59f4186265d679acb0975b4e3e658de80e03776308d00e508b0776af3a946ebc19c963e455206ba54b68f60d94e491570966581db3d94d28e
+AUX git-2.31.0-darwin-prefix-gettext.patch 893 BLAKE2B d350b752473346991e1ed38a39ffa06dc828e180b49e47a4c0c23e9e152d6f9ae85e3c6975d4f23a86a1c11e08496e4017dfaa6458099dee2ffd81ee4499c45d SHA512 66950d46383dd91addda04bf675b81755f13d60c419798858acd56045b470abe6c19116308d382e12b5a860b332e926a2d11ec6cf333fa35a6fbbd5e44c62af0
 AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6ba4c01fcc0341c2ed37756a8fd7edeea7760be9455ec5ed695f76debee3cea894ced0a988b4baac80e14cbc918106be36dc7a SHA512 35221088fe49254d9fa9186d12b40c58b20f58289a119e64071cf20d0952c52238f546bac4d16e634a768559587f0acc6567a546bd79c9f709dc9b158938c81f
 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
@@ -13,46 +14,30 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
 DIST git-2.26.3.tar.xz 6009184 BLAKE2B 12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee SHA512 a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398
-DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4 SHA512 6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f
-DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
-DIST git-2.30.0.tar.xz 6325652 BLAKE2B c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6 SHA512 2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
-DIST git-2.30.1.tar.xz 6327976 BLAKE2B 3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624 SHA512 b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
-DIST git-2.31.0.rc2.tar.xz 6394212 BLAKE2B 749b2d18969bdd3fd5d72273b9068775cf9c1042553879f8e7abcbbf3c0b8e9d99a5365939b8df5012dcc499c2bccb5651f7943f76389ae315bc1fbaa08298eb SHA512 0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3
+DIST git-2.31.0.tar.xz 6414252 BLAKE2B c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793 SHA512 b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
-DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
-DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
-DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820 SHA512 3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e
-DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe SHA512 e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49
 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
-DIST git-htmldocs-2.31.0.rc2.tar.xz 1357684 BLAKE2B 8ea0ebc11650bf4f67e15fcdb1c6a7b8e33b5740e50c5817d09c6d4dfc23556b8735347807ec08d56c4124a38e3892c4690984a57d9f24b80a919b5a9820c5f2 SHA512 dfe7f2ef385ddfcdebe83f4f785bcf9c710357635cbc26702c6dcdd056e62075f937d92802c056dda678db3d9258ad7f75b8cc1d11ca86a26c022827c22ea10a
+DIST git-htmldocs-2.31.0.tar.xz 1357332 BLAKE2B 06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583 SHA512 31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
-DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
-DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
-DIST git-manpages-2.30.0.tar.xz 481792 BLAKE2B 9f6273e36e06a0296506d43b25a826cef9e459fdd25ad2f844de323b998fe9b5a7e5181b21257e7b297ea4ce2e16cfaacf7f1c7486ce26b59e39e643361d4745 SHA512 9593d9bef8b3bdcd5645cf89e0f0c53989342414363ce85cfd46da181750c92e8f6dbd860c6badc9d871b383bb9cf273b4fb3af7f6d46a8df6b95fddeab578ae
-DIST git-manpages-2.30.1.tar.xz 482128 BLAKE2B 2e7f3943b5e95a3b00dda95f74c519889218e908aa3872f5ae93d88ac9602ad389e9be9df99ec7daafb0a324c03a3a50c7f3c697a1a7e9f35f795682ba85fb4c SHA512 1cd535fff2a658d9ecb99c1f26663e2b37df429dfcff417c298e00fb5de107ef54848447ad63c2f78d8621f431f8f8b92bc871474a701db48deff04a0b595d07
 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
-DIST git-manpages-2.31.0.rc2.tar.xz 487804 BLAKE2B fb146efbf7f31b45e6c1a15e8fac1c6cc75d067ad16e588fa8a71bdbf970d26b123a6453cfc0210a454374fe319a83cc94b0df95134b602b67c2f1e1f895715f SHA512 b4b776ea9281557d3a521de7437723217178422998f81bb81b4843f02fadf38a743c7d74abb36d1354ca87fc352b442fae02bed11d2612b1f35dddac89ff8e64
+DIST git-manpages-2.31.0.tar.xz 487764 BLAKE2B e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3 SHA512 9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787
 EBUILD git-2.26.2.ebuild 19084 BLAKE2B 4348be0cbf86af5f34de7b2ee0dcf3b02df62d195f65c5ce7eb09076702300e0d333217c4864b14ac6df705380d2a7b619834f0b13e60494bdd2246ece72a22a SHA512 f27c49be5bc8a168f6adc14694d638fe4c1fbf52308f25d28a11879d9c6e5c68e4a06636587fa3956d905a72cbeb24d4f179249c0266d89cfc6a0eac025a926a
-EBUILD git-2.26.3.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a
-EBUILD git-2.28.0.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a
+EBUILD git-2.26.3.ebuild 19091 BLAKE2B 67e8d52c690cc75858ad7196dd221827f6e7749d37e9b711335c5db3ec1c35fcaeeb6ecddd47dbd01b5fb6a36a4ff7caaccead3dfcb2318731c411810443342f SHA512 10fc52f037962124c665f169df5ec7ffa9169abee0ac937c4e027438764b54092f33daab2a9024f9979cdab12de0a5c17eccaca054e4363ca1b922db36b286bb
 EBUILD git-2.28.1.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a
-EBUILD git-2.29.2.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
 EBUILD git-2.29.3.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
-EBUILD git-2.30.0.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
-EBUILD git-2.30.1.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45
 EBUILD git-2.30.2.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45
-EBUILD git-2.31.0_rc2.ebuild 18161 BLAKE2B 795c3728012f6ad96dcedbe8e3c2e03e31626f22d2e45ca45c9eda10d2fb216967fbde702df46f93c782ca0952dd5dc0ca9764d206b9f7e5478c2bdaa85c96d1 SHA512 fffa13f1250eaf7939d0f76c9880ff1a96798c4f7baaf554dc34a61b0f6b71a6fe4ca202241eaa05e424bc95721230791731b2d483c11e48a32ae9ecb79b1bd1
-EBUILD git-9999-r1.ebuild 18131 BLAKE2B c147b3e77564daae7663cce91e149e857f48d98c58c831e7008810f1329b28f42ba2a5f652590679b8ac02b201355aadfcbbcd61569db161ba1baceca27ab29f SHA512 b6c8ccd2c2fb7e711fa5b1c99e0971e7e4f3af59e2ca9a8746a8b4ce13edda3de31a020897098adea6f7a4022d7879740ba8a100befec8801da061fd114e56eb
-EBUILD git-9999-r2.ebuild 18131 BLAKE2B c147b3e77564daae7663cce91e149e857f48d98c58c831e7008810f1329b28f42ba2a5f652590679b8ac02b201355aadfcbbcd61569db161ba1baceca27ab29f SHA512 b6c8ccd2c2fb7e711fa5b1c99e0971e7e4f3af59e2ca9a8746a8b4ce13edda3de31a020897098adea6f7a4022d7879740ba8a100befec8801da061fd114e56eb
-EBUILD git-9999-r3.ebuild 18161 BLAKE2B 795c3728012f6ad96dcedbe8e3c2e03e31626f22d2e45ca45c9eda10d2fb216967fbde702df46f93c782ca0952dd5dc0ca9764d206b9f7e5478c2bdaa85c96d1 SHA512 fffa13f1250eaf7939d0f76c9880ff1a96798c4f7baaf554dc34a61b0f6b71a6fe4ca202241eaa05e424bc95721230791731b2d483c11e48a32ae9ecb79b1bd1
-EBUILD git-9999.ebuild 18131 BLAKE2B 90df186adba58af90be02856622c7b29bdc6263674ae44450e0ba8975d0440c3e611c442129edb144c155065fbb16d7e9f2d97786e4dc49fd9de4c795a7c469d SHA512 0708239ad240da7f73ce182a74cd6e4b2ed3c74e0e4bd6b610863e55f56661b39f3b2ad151a4d47773ab6f53f233288570b37e5ee83ba07ef2e04986bd51c62e
+EBUILD git-2.31.0-r1.ebuild 18041 BLAKE2B 1fbaf00be28d7487b9ae0cf842b485db87435c0b1ba7002911a292f9f8ff78fa66add40e4d485e5baf44ba974834047dee8e491f64edbd300a1746a5bef37331 SHA512 08ad3f2e7e778757847cff4db3be86f9095b1d7b008768a643d79c9d5ace9252112fcb765d0eae1ef0a9017f8a5e9f263c8edc23ccb669040959dba6c76437ad
+EBUILD git-9999-r1.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e
+EBUILD git-9999-r2.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e
+EBUILD git-9999-r3.ebuild 18043 BLAKE2B 535ca9bdeca810b85d662ac42542ea9aa6ef0b4fb0d86a09ae17945e29455d4e5d0d80c4576e884419a70122b27172dc5f4dac7af85c35b451127f8f1898fd2d SHA512 74ae37c1b42d70922e320a94847e43f2e78a0cd5c2aab0bbce3b29024cbbbd5153ac2fc6a566ac51ce72c5f15d2c01773d15a6d86fa8a9a27c5163e450a96e74
+EBUILD git-9999.ebuild 18013 BLAKE2B f83705958b6840a071dcbeba4fae1b80b90f0abbf031c2919e31908bbbe4eb06a607a924ad84fe5f41d525f6c99000b8ebb3a68ab189efe0721826b071da0e9d SHA512 8b8b019f6d187ded2cc178627ef5415e88aa48dc2bbcf2869cda9a4b643fdedffde3a8fe58a7986db2d462a6f2ace3f991b3d82393dddfa8c0694e0d9403237b
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch
new file mode 100644
index 000000000000..df87def6073d
--- /dev/null
+++ b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch
@@ -0,0 +1,22 @@
+Don't examine outside of the prefix for gettext on macOS/Darwin.
+https://bugs.gentoo.org/757309
+--- a/config.mak.uname
++++ b/config.mak.uname
+@@ -136,17 +136,6 @@ ifeq ($(uname_S),Darwin)
+ 	HAVE_BSD_SYSCTL = YesPlease
+ 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
+ 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+-
+-	# Workaround for `gettext` being keg-only and not even being linked via
+-	# `brew link --force gettext`, should be obsolete as of
+-	# https://github.com/Homebrew/homebrew-core/pull/53489
+-	ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
+-		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
+-		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
+-		ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
+-			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
+-		endif
+-	endif
+ endif
+ ifeq ($(uname_S),SunOS)
+ 	NEEDS_SOCKET = YesPlease
diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild
index d725b8e79c39..90969c232b98 100644
--- a/dev-vcs/git/git-2.26.3.ebuild
+++ b/dev-vcs/git/git-2.26.3.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild
deleted file mode 100644
index d725b8e79c39..000000000000
--- a/dev-vcs/git/git-2.28.0.ebuild
+++ /dev/null
@@ -1,711 +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
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Authen-SASL
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso(-),perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND="${BDEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex perforce '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads '' NO_PTHREADS=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# For svn-fe
-	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	if has_version '>=app-text/asciidoc-8.0' ; then
-		myopts+=( ASCIIDOC8=YesPlease )
-	fi
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use subversion ; then
-		pushd contrib/svn-fe &>/dev/null || die
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=()
-		use nls && use !elibc_glibc && nlsiconv+=( -lintl )
-		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
-			|| die "emake svn-fe failed"
-		if use doc ; then
-			# svn-fe.1 requires the full USE=doc dependency stack
-			git_emake svn-fe.1 \
-				|| die "emake svn-fe.1 failed"
-			git_emake svn-fe.html \
-				|| die "svn-fe.html failed"
-		fi
-		popd &>/dev/null || die
-	fi
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake install || die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	if use subversion ; then
-		pushd contrib/svn-fe &>/dev/null || die
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			# Do not move svn-fe.1 outside USE=doc!
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if test -d "${d}" ; then find "${d}" \
-				-name .packlist \
-				-delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ ${cvs} -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-	elog "completion."
-	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	elog "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
deleted file mode 100644
index d73a1120a380..000000000000
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ /dev/null
@@ -1,676 +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
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Authen-SASL
-		>=virtual/perl-libnet-3.110.0-r4[ssl]
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso(-),perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND="${BDEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex perforce '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads '' NO_PTHREADS=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	if has_version '>=app-text/asciidoc-8.0' ; then
-		myopts+=( ASCIIDOC8=YesPlease )
-	fi
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake install || die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if test -d "${d}" ; then find "${d}" \
-				-name .packlist \
-				-delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ ${cvs} -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-	elog "completion."
-	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	elog "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.30.0.ebuild b/dev-vcs/git/git-2.30.0.ebuild
deleted file mode 100644
index d73a1120a380..000000000000
--- a/dev-vcs/git/git-2.30.0.ebuild
+++ /dev/null
@@ -1,676 +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
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Authen-SASL
-		>=virtual/perl-libnet-3.110.0-r4[ssl]
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso(-),perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND="${BDEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex perforce '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads '' NO_PTHREADS=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	if has_version '>=app-text/asciidoc-8.0' ; then
-		myopts+=( ASCIIDOC8=YesPlease )
-	fi
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake install || die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if test -d "${d}" ; then find "${d}" \
-				-name .packlist \
-				-delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ ${cvs} -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-	elog "completion."
-	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	elog "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.30.1.ebuild b/dev-vcs/git/git-2.30.1.ebuild
deleted file mode 100644
index f6a6fb30a9e9..000000000000
--- a/dev-vcs/git/git-2.30.1.ebuild
+++ /dev/null
@@ -1,676 +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
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Authen-SASL
-		>=virtual/perl-libnet-3.110.0-r4[ssl]
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso(-),perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND="${BDEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex perforce '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads '' NO_PTHREADS=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	if has_version '>=app-text/asciidoc-8.0' ; then
-		myopts+=( ASCIIDOC8=YesPlease )
-	fi
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake install || die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if test -d "${d}" ; then find "${d}" \
-				-name .packlist \
-				-delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ ${cvs} -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-	elog "completion."
-	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	elog "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.31.0-r1.ebuild b/dev-vcs/git/git-2.31.0-r1.ebuild
new file mode 100644
index 000000000000..bfb176d4710e
--- /dev/null
+++ b/dev-vcs/git/git-2.31.0-r1.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2 )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	if [[ "${CHOST}" == *-uclibc* ]] ; then
+		myopts+=( NO_NSEC=YesPlease )
+		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.31.0_rc2.ebuild b/dev-vcs/git/git-2.31.0_rc2.ebuild
deleted file mode 100644
index d27d54e5bd79..000000000000
--- a/dev-vcs/git/git-2.31.0_rc2.ebuild
+++ /dev/null
@@ -1,672 +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
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Authen-SASL
-		>=virtual/perl-libnet-3.110.0-r4[ssl]
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso(-),perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND="${BDEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex perforce '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads '' NO_PTHREADS=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	if has_version '>=app-text/asciidoc-8.0' ; then
-		myopts+=( ASCIIDOC8=YesPlease )
-	fi
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake gitweb || die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man || die "emake man failed"
-		if use doc ; then
-			git_emake info html || die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info || die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree || die
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake || die
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake || die
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake install || die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install for git-subtree"
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
-			"git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-	elog "completion."
-	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	elog "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index ed601ab85537..ff37be69674c 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
 	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 	# See https://git-scm.com/docs/gitworkflows#_graduation
 	# In order of stability:
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -59,10 +59,7 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
+	pcre? ( dev-libs/libpcre2 )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
@@ -132,7 +129,6 @@ REQUIRED_USE="
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -206,16 +202,8 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
 
 	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=(
@@ -272,6 +260,11 @@ src_prepare() {
 
 	default
 
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index ed601ab85537..ff37be69674c 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
 	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 	# See https://git-scm.com/docs/gitworkflows#_graduation
 	# In order of stability:
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -59,10 +59,7 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
+	pcre? ( dev-libs/libpcre2 )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
@@ -132,7 +129,6 @@ REQUIRED_USE="
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -206,16 +202,8 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
 
 	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=(
@@ -272,6 +260,11 @@ src_prepare() {
 
 	default
 
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index d27d54e5bd79..c60eee31d41d 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
 	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 	# See https://git-scm.com/docs/gitworkflows#_graduation
 	# In order of stability:
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -59,10 +59,7 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
+	pcre? ( dev-libs/libpcre2 )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
@@ -132,7 +129,6 @@ REQUIRED_USE="
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -206,16 +202,8 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
 
 	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=(
@@ -272,6 +260,11 @@ src_prepare() {
 
 	default
 
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 564bb8b7b751..ef8a11391cf3 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
 	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 	# See https://git-scm.com/docs/gitworkflows#_graduation
 	# In order of stability:
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -59,10 +59,7 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
+	pcre? ( dev-libs/libpcre2 )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
@@ -132,7 +129,6 @@ REQUIRED_USE="
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
-	pcre-jit? ( pcre )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -206,16 +202,8 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
 
 	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=( -lpcre2-8 )
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=( -lpcre )
-		fi
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=(
@@ -272,6 +260,11 @@ src_prepare() {
 
 	default
 
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 21c87dd7e0ba..997e83d28931 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
-DIST hg-evolve-10.2.0.post1.tar.gz 822791 BLAKE2B a6d33b7afe4aa366d3d9f4bf69aa3512a7e1d4f70a6a0fc600b97dbb6bb99be437a2c7ec75b78fffe4be9f42f1d2e2c3acbda79d82852ae83885bb206863b0ae SHA512 474f3cc8812b0dda368118c1f3b86be55191ddd876e7b457fa8c8b62c06496a903e551c2692daebef8374d7edfb8c298657a62d52a43e684e22a45b1ccc3307b
-EBUILD hg-evolve-10.2.0.ebuild 814 BLAKE2B 3ea1ce5c29b9a3413b4ced3a4e8fc1143755fbea5ada0fba277100ff8b79e2f3246374c0ea999e964c048060c5e191f4a199b260e6dd30b30c48f25b747fd524 SHA512 dd2b6aee1576d6a5764295c4c7549ec6ed85bfb9c078b8ef5f54b60a3db9ac463cf37682a51e34841e69ba8504f596983293dc08eadd452c356f0ffbea8ccfaf
+DIST hg-evolve-10.3.0.tar.gz 831866 BLAKE2B 5c56d214be9cbf31adbf41fd35f020e196f009435d1afffe61e24353dd1d5ecbc245a6525e1dbdbe54bc71d59f365d8a8a6aa860797d979f0c65b88f3623d3bb SHA512 212bf88bd5b5841a17c5cfa77a6ccb4a1e314e16d4ed19f54653f56f108c1640179b67331d6fe365b09e38ce51f3b0abfbecaebd1e0a0ed2de34c81d79110f87
+EBUILD hg-evolve-10.3.0.ebuild 782 BLAKE2B 8e1792d9dc8bb45640a380d035d4ecadee72bae319e866fb49ffd97a5829005fcbce3cc3dbed2ed586b9b8d5ff4df2cdf785c9b8a8556a498bdfe1db86288c01 SHA512 0f329a03e2d0e30fb6433ac10698d9cf5fc556783271558c6eb1b1bc0a9b741685c24201ed6f2d5d194a40c0e682aa0f5b61fa546139038353daafff7921e81f
 MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.2.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.2.0.ebuild
deleted file mode 100644
index 362e472bb405..000000000000
--- a/dev-vcs/hg-evolve/hg-evolve-10.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="enables the changeset evolution feature of Mercurial"
-HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-vcs/mercurial-4.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-S="${WORKDIR}/${P}.post1"
-
-python_prepare_all() {
-	rm hgext3rd/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc -r html/
-	fi
-}
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild
new file mode 100644
index 000000000000..0aeb1aa086bf
--- /dev/null
+++ b/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="enables the changeset evolution feature of Mercurial"
+HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-vcs/mercurial-4.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+python_prepare_all() {
+	rm hgext3rd/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc -r html/
+	fi
+}
diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest
index 14635fc0fd9c..5717e527bd1d 100644
--- a/dev-vcs/qgit/Manifest
+++ b/dev-vcs/qgit/Manifest
@@ -1,3 +1,3 @@
 DIST qgit-2.9.tar.gz 263875 BLAKE2B 8ec1235c760f2473a0700e7033ab99f3e72f019dee47761b86999a7de173132cf6592e9f5652b68285cd126adc4efffb5688944f34be2686683727354ab041c5 SHA512 2c91e02d0a7ea1e4620882520c77b47ff9b28fb9c9f9d178bf98b3e728e600e8d86a9e6e4cd60c33dbe63ced3636934fb7cdd6b0d5fa58182873675e3f97cc33
 EBUILD qgit-2.9.ebuild 516 BLAKE2B 6e728ec47366a0a43c2132067add508df8ffff37a2d698390b3b2ea6090e835595617f808cf88af66da6d7441fc0f49d1ba327e93e7e039be21a3b23b9099ed3 SHA512 3e345192c98f852f106fa60da99c9f00cdaa258f1840289042ce174fae985ba2fdc3c27c01c7662a4b1d00f5331975923eae0c277532668b39f36a11efa3e1de
-MISC metadata.xml 324 BLAKE2B 1046f76dc321a6155b49edb4972d9d353d47e4103a0356cc83f459faac05985e201daef4197420cadb19f50c37eb528b990c8d9d93537822fbf0698501b3fb5c SHA512 e4e0bbc60b8af9512584b93e60d29ac47a4150691ea46bb3281c6d99acf119d0c6717497286c324a9ccc91624bbd56211a513c1fd675ec89603d431b9b052248
+MISC metadata.xml 324 BLAKE2B be472a1102e269eee7f3e7d17dcc683fdff451c68671065344be0eb70629ac66291c83445c70dfc29ccecdddaaad3e0d14190487a55fce44aa6f491277f9e298 SHA512 c70e55b0d4e3faf311575ab077a16d84ba35616365b8ff07a0bda3c17199c55211972d1decae1f29238184be73a81eca51b45242aa79c71098f6cf4b5440a79a
diff --git a/dev-vcs/qgit/metadata.xml b/dev-vcs/qgit/metadata.xml
index 241d7194c1ea..37e6df0171a1 100644
--- a/dev-vcs/qgit/metadata.xml
+++ b/dev-vcs/qgit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 025d6db14f1e..37537244ceb1 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,7 +1,7 @@
 DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
 DIST repo-2.12 43035 BLAKE2B 3a3b1997a09f08093aa2d5cf6c7a3747d6a9a6c29e6c199574757d4d87fdd57b7cc8b18bb1ddfa7c47392f73a22211f996f6ba8175448162e305106c9ac6cafe SHA512 409525040ec8fe6c6a6d923c4e23ab93f5ccc62d01d310ad6b56d55f45d88c2bf469e9b46943e799b8d5238cbc0a9610d0f64f35cf0f3a68b79cbd8c92f044a3
-DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431
+DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
 EBUILD repo-2.11.ebuild 853 BLAKE2B 02d2c11fdfb03642c325252295a25563eb38b0db77814fe32ab05e7b794efa53cc7d5a3659791d7966d50099a29632a5d1bf12541d04ad2133a78cd07e21d3f0 SHA512 8d186e9c36945e862826923a0edc092098b6134594719d87e3c5fb634b6e6d2c26679a7f56bb7712f21b37826205bd58939b96c150006a27fd9bbd466c21fac6
+EBUILD repo-2.12-r1.ebuild 1257 BLAKE2B ba3e9e8ec3699b84ccd81269089cd2b1ac1e6fa9b5aed9b41646fb92d6928563a34222619029a0a77a87d8a98feff2542618bdb83e0a52b8a1ab1a6e9f7ca012 SHA512 60ccc355c32c50e37b7c8d53083e86de4c89ca1cc05598c48c3b5768a4c175e19be7ca57c7c953079b9e819f5c706651be4ea63fd3a8fb40610b41c957dd7002
 EBUILD repo-2.12.ebuild 880 BLAKE2B 5998a5fb74829aa6844f57a59131607e7f0a439195d523ca5c80e5a8be6369b66907f1b1807c2e271879a68b61be5cbc54595da8cfed2b2178addcca3a4e922b SHA512 6bb194d147b0a0ba8757bc61bab1368b547f7135040f22d6f516672b28d73575e3aaa1c3542325fab5c615e704e3dab2a363b6ae9d63476d47476c4ea670393b
-EBUILD repo-2.8.ebuild 853 BLAKE2B 02d2c11fdfb03642c325252295a25563eb38b0db77814fe32ab05e7b794efa53cc7d5a3659791d7966d50099a29632a5d1bf12541d04ad2133a78cd07e21d3f0 SHA512 8d186e9c36945e862826923a0edc092098b6134594719d87e3c5fb634b6e6d2c26679a7f56bb7712f21b37826205bd58939b96c150006a27fd9bbd466c21fac6
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/repo-2.12-r1.ebuild b/dev-vcs/repo/repo-2.12-r1.ebuild
new file mode 100644
index 000000000000..4190dab38e90
--- /dev/null
+++ b/dev-vcs/repo/repo-2.12-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project.  The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 python-r1
+
+# This file rarely changes, so track it independently.
+COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
+COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind
+	!dev-util/repo"
+
+S=${WORKDIR}
+
+src_unpack() {
+	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
+}
+
+src_install() {
+	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	newbashcomp completion.bash ${PN}
+}
diff --git a/dev-vcs/repo/repo-2.8.ebuild b/dev-vcs/repo/repo-2.8.ebuild
deleted file mode 100644
index 2922a68a5816..000000000000
--- a/dev-vcs/repo/repo-2.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The $PV tracks the *repo launcher version*, not the last signed release
-# of the repo project.  The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/svn2cl/Manifest b/dev-vcs/svn2cl/Manifest
index 51f0063cd696..7293c2d5076b 100644
--- a/dev-vcs/svn2cl/Manifest
+++ b/dev-vcs/svn2cl/Manifest
@@ -3,4 +3,4 @@ DIST svn2cl-0.12.tar.gz 18171 BLAKE2B 88e66d4bcc3e05132462d1c9794846a644f121876d
 DIST svn2cl-0.14.tar.gz 19399 BLAKE2B 2a726a593521d40bd7a125607c2841bbca8d5915e420b2757da1a17a9bf65e784fdb8fbb5b377567e0c54ce7c8d8407c26a66dda677fb84807d07001032f87b4 SHA512 68d5ad00c5359d86979e2cdce349191bb1c64e132887e2a5222d5d9e24e901ff9e15627fd3de3884f8ad319172051c92ce18e337797ff2237096a6396b814b19
 EBUILD svn2cl-0.12.ebuild 779 BLAKE2B ff44f25a86e56ed04375e532b5ea368f78a0443f1c166f12975673ed49ed3ef058c5d0bbb354e7d576cb4b7aa70432cd050bb05e6e79b8a47f5227a5a6ec6f45 SHA512 4c6820c7feb49874deb2441376466e0c9ad7803ae3739074c1bcb703626ced7fdd4b81cc15548c26ed1c08e5ec2d2cb5f38c3f7543eb90fcf5d75c3a3715350c
 EBUILD svn2cl-0.14.ebuild 768 BLAKE2B a72e3d7611d932f641743c6f05652c57ca7e963e77eac30c36a581029b9ff91737c88413208fb15346c710287cd7a5a7537f2c59730b2c5bb4bcd0bcab284e1a SHA512 b51026d0b0482c03513bcb89dddcd5b84e3b01a80941a650ae5095eb3ab7b09c91a6d1cbb7608f7518100e65a90cb3b04a80335309c82a1e2761d02446abbb67
-MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5
+MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/dev-vcs/svn2cl/metadata.xml b/dev-vcs/svn2cl/metadata.xml
index 16853472f6b4..d095ed4b8f81 100644
--- a/dev-vcs/svn2cl/metadata.xml
+++ b/dev-vcs/svn2cl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index d9fde3f1c32f..38ca9ba63439 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -3,4 +3,4 @@ DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
 EBUILD topgit-0.19.12.ebuild 846 BLAKE2B cff23a51c81250e59d2b9f1bd62da9ad8737bf4adb2368ce058ebe83f83a18ba8101fc7c8e0440e20e5ba89da948abfd16e05133896835d0b6d7d6254a6f0cd4 SHA512 8ed16a345ad0bb066366d0cc6fb0e442dcfc8c40bfe1816db7b7de0343e9b2e0a0ce44bac061cfc8b6a5f53fb079c03a6c47f4d50662f99ef2fb334da90d6575
 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
-MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e
+MISC metadata.xml 485 BLAKE2B 5541d871698c181943ee71d1d8e88ed597e9e6b53ca03f969581b29c166f7a2bc83dc1f236bec1a1cc295895543783d5404724e7c4f8f7339d51608258979124 SHA512 84c1340089eb1a904fa2f6c8d51f6f12ededda5f137d3a80cba1652c4f66d446d1c8c68a052a09c8488dc01720635a75e68276be3a36f40ccac61cfad5405fc5
diff --git a/dev-vcs/topgit/metadata.xml b/dev-vcs/topgit/metadata.xml
index 1c551510bec0..a7497a2fdb26 100644
--- a/dev-vcs/topgit/metadata.xml
+++ b/dev-vcs/topgit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 84257ae32b45..9c1c35f3e4de 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,12 +1,4 @@
-DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8
-DIST tortoisehg-5.5.2.tar.gz 8919653 BLAKE2B 33842e0df31efd4302e210119b098b9debcf1003d320f4b0d5d0c29796ae2149a4aca70871e5f5a82c635fb8e5a12eb56572b23f691152860a386ff8dde20ade SHA512 eaac888f1171d3e4bc1de49ccb5cff550ea859d702b65548040072e3805b54c93d38afdd1a132f6340275172cb456461d76bb4e53a477d0a6e180ac85783a1f4
-DIST tortoisehg-5.6.1.tar.gz 8904309 BLAKE2B 7faad055560560eeeb776349889b45ae8b1de72614f794de9a124b6293a549eeeed1276e9b8308e077f2d171efdfa695660ad7010edd2d8ab2804f28687715b2 SHA512 21a410277469803e1af45103bc5c7196bc7128e66ab297399b98731c32caa517da46bd06389f08ad740b78c22e58244757dbad4207b71d5643b9d1284ed9c936
-DIST tortoisehg-5.6.tar.gz 8920111 BLAKE2B 3779ea89f196bbf49c5efdc957983ff674d3c70c6ef04d758b2946851300bb115173a82d3ee9d0a51df6db51ed30acfa33abdfb2e6b3c08177d9dd5416741a10 SHA512 30013a776ea7e8b1167280350b64a993ebccbf82486f93164a1eaa42e98587719503c3dd939f9ea682d4302532216575ad7a20e9e2122315f63af7d002d08b03
 DIST tortoisehg-5.7.tar.gz 8910721 BLAKE2B ebca9526fc39c94c26f28db6dd70527c528308d9003fca0d9cfb61f984a9a5d80f910d68d0d1449221bbb4e040d2919ed34fec1e0aee4d9f5ed55cbcdb8ba714 SHA512 d143c9e83d3b0771ffd4a3bd9cd50e8bc169e5d29e33a0681c3234898a7566427f070ff3ad8668709b5e4d63be92fd700211dee03e98ff16c7c23fc0870c9e4c
-EBUILD tortoisehg-5.5.1.ebuild 1597 BLAKE2B 9e54f7bfa4262f12067472327c7f314a26b1bcfddd2f02d75448101d8f0f24f1d48f074dbe494dcbd209f763517652158c34b227712339cae6b0cb028f993be5 SHA512 9b0619c45380551d89340ddb0ee87e6fdf45eb0fc30e076dcfb69b0c46840812d5f445b3f6f9d00921083dc331501bf12d49a4021745a470bd134b2a8af9ac68
-EBUILD tortoisehg-5.5.2.ebuild 1627 BLAKE2B 5701cb65f6cc0fd1df712beb56256469be11ce59e0d060b02c0718b686a8172f692a2c75cf4c073b2f278f8e4674b43799f5ecb9228e27247a47c304ba869d1b SHA512 1a9a0d8a1821f225015d0b943c2d88ada6ab01bf06d619f6e2d248fe339f27954c32b914aa45c19b3e834e73efc1e6d171f546fc45cef049cee2d85981375600
-EBUILD tortoisehg-5.6.1.ebuild 1681 BLAKE2B be33d2db298c7de97da9ac2755f1af603b5cadc73215d2f6162eb7d33564a3360db6b9e334c249a69c57f73ee565d8dbb53b82ddb3e0f2724e8a143aeb0889ef SHA512 3f0e112ce2551fad78af3a5bb2cfb1bc960216a832c3eaf32108124d7aecc48ab5aa86b3fde77235cc0aab408b849fb5f879e155b37296a58dee72f213711828
-EBUILD tortoisehg-5.6.ebuild 1627 BLAKE2B 759a34f14a3ec58a18d7edd3bfe15b2648741a21f856d54cba175553b37a7f37743f9fe366a5f0173932593a5d3cd95ac27a1498010a624bceb1eeb374b02c7d SHA512 149e92393a56c02aad140d302d8778fbe096112df5246eeb85dab122269f4b346a193aa95d8e83d93ef8acc786280d27b7ad74d1f14bc5c99256498c6a05a12c
 EBUILD tortoisehg-5.7.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447
 EBUILD tortoisehg-9999.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447
-MISC metadata.xml 774 BLAKE2B b03f2b762867838c9870f1ccc744ae17a866759efb26690e05e666f77635042d637c901905060c203f178beee3f44034d3af4813f8ec915f4af9cab928fa957b SHA512 1a4492a7f467cb8e2eadc760064768bd3bcd55deca269d643a0c07c9486b3a59c8be66ca8243efc76c65642e9b794ad334511c5ee9b6fdbbfd3b9dc7f5a64df1
+MISC metadata.xml 804 BLAKE2B 23d41703f9bdd446ac385fae5919c21684a73c4bfd468f7a0a18c9dc728964e71ee9724dfa4eacb544da54e79c2b9a5f4009ba8318d1e97f2314826cbe4429a9 SHA512 14fcda893984839424b6bcc6d6b0b966edb862fdd3b483f909c552da2775dba413b2155915480526780afec05a5ad7e3652391ccdbe5e76f7daa265fdfd6ef75
diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml
index 4edc402c7d1b..f12c72305212 100644
--- a/dev-vcs/tortoisehg/metadata.xml
+++ b/dev-vcs/tortoisehg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild
deleted file mode 100644
index 5743fd52386d..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.5.1.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
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.4
-		<dev-vcs/mercurial-5.6"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.4"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-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}"
-
-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"
-	distutils-r1_python_prepare_all
-}
-
-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."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.5.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.2.ebuild
deleted file mode 100644
index b5bdb7fe6a1c..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.5.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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.4
-		<dev-vcs/mercurial-5.6"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.4"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-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}"
-
-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"
-	distutils-r1_python_prepare_all
-}
-
-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."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild
deleted file mode 100644
index 7655deb4a47f..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.6.1.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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-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}"
-
-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"
-	distutils-r1_python_prepare_all
-}
-
-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."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.ebuild
deleted file mode 100644
index fa93e7d11ef7..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.6.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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.5
-		<dev-vcs/mercurial-5.7"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.5"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-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}"
-
-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"
-	distutils-r1_python_prepare_all
-}
-
-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."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index a6e1a64e3a41..ebbf98283f44 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 89f7b954dd68..4d0e64ed4e79 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -3,36 +3,40 @@
 
 # @ECLASS: aspell-dict-r1.eclass
 # @MAINTAINER:
-# maintainer-needed@gentoo.org
+# Conrad Kostecki <conikost@gentoo.org>
 # @AUTHOR:
-# Original author: Seemant Kulleen
-#      -r1 author: David Seifert
+# Seemant Kulleen <seemant@gentoo.org> (original author)
+# David Seifert <soap@gentoo.org> (-r1 author)
 # @SUPPORTED_EAPIS: 7
-# @BLURB: An eclass to streamline the construction of ebuilds for new aspell dicts
+# @BLURB: An eclass to streamline the construction of ebuilds for new Aspell dictionaries.
 # @DESCRIPTION:
-# The aspell-dict-r1 eclass is designed to streamline the construction of
-# ebuilds for the new aspell dictionaries (from gnu.org) which support
-# aspell-0.50. Support for aspell-0.60 has been added by Sergey Ulanov.
+# The aspell-dict-r1 eclass is designed to streamline the construction of ebuilds for
+# the new Aspell dictionaries (from gnu.org) which support aspell-0.60.
+# Support for aspell-0.60 has been added by Sergey Ulanov.
 
 # @ECLASS-VARIABLE: ASPELL_LANG
 # @REQUIRED
 # @DESCRIPTION:
-# Pure cleartext string that is included into DESCRIPTION. This is the name
-# of the language, for instance "Hungarian". Needs to be defined before
-# inheriting the eclass.
+# Pure cleartext string that is included into DESCRIPTION.
+# This is the name of the language, for instance "Hungarian".
+# Needs to be defined before inheriting the eclass.
+
+# @ECLASS-VARIABLE: ASPELL_SPELLANG
+# @DESCRIPTION:
+# Short (readonly) form of the language code, generated from ${PN}
+# For instance, 'aspell-hu' yields the value 'hu'.
+readonly ASPELL_SPELLANG=${PN/aspell-/}
 
 # @ECLASS-VARIABLE: ASPELL_VERSION
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# What major version of aspell is this dictionary for? Valid values are 5, 6 or undefined.
-# This value is used to construct SRC_URI and *DEPEND strings. If defined to 6,
-# >=app-text/aspell-0.60 will be added to DEPEND and RDEPEND, otherwise,
-# >=app-text/aspell-0.50 is added to DEPEND and RDEPEND. If the value is to be overridden,
-# it needs to be overridden before inheriting the eclass.
+# What major version of Aspell is this dictionary for? Valid values are 5, 6 or undefined.
+# This value is used to construct SRC_URI strings.
+# If the value needs to be overridden, it needs to be overridden before inheriting the eclass.
 
 case ${EAPI:-0} in
 	[0-6])
-		die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
+		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
 		;;
 	7)
 		;;
@@ -46,36 +50,30 @@ EXPORT_FUNCTIONS src_configure src_install
 if [[ ! ${_ASPELL_DICT_R1} ]]; then
 _ASPELL_DICT_R1=1
 
-# aspell packages have an idiosyncratic versioning scheme, that is
-# the last separating version separator is replaced by a '-'.
-_ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}
-S="${WORKDIR}/${_ASPELL_P}"
-
-# @ECLASS-VARIABLE: ASPELL_SPELLANG
-# @DESCRIPTION:
-# Short (readonly) form of the language code, generated from ${PN}
-# For instance, 'aspell-hu' yields the value 'hu'.
-readonly ASPELL_SPELLANG=${PN/aspell-/}
+# Most of those aspell packages have an idiosyncratic versioning scheme,
+# where the last separating version separator is replaced by a '-'.
+_ASPELL_P=aspell${ASPELL_VERSION}-${ASPELL_SPELLANG}-${PV%.*}-${PV##*.}
 
-DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
+DESCRIPTION="Aspell (${ASPELL_LANG}) language dictionary"
 HOMEPAGE="http://aspell.net"
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${_ASPELL_P}.tar.bz2"
+S="${WORKDIR}/${_ASPELL_P}"
 unset _ASPELL_P
 
 SLOT="0"
 
-_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5}
-[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "${ASPELL_VERSION} is not a valid version"
-
-RDEPEND=">=app-text/aspell-0.${_ASPELL_MAJOR_VERSION}0"
+RDEPEND="app-text/aspell"
 DEPEND="${RDEPEND}"
+
+_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-6}
+[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION}"
 unset _ASPELL_MAJOR_VERSION
 
 # @FUNCTION: aspell-dict-r1_src_configure
 # @DESCRIPTION:
 # The aspell-dict-r1 src_configure function which is exported.
 aspell-dict-r1_src_configure() {
-	# non-autoconf based script, cannot be used with econf
+	# Since it's a non-autoconf based script, 'econf' cannot be used.
 	./configure || die
 }
 
diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index ef240889c04a..1f09805f8541 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -9,12 +9,10 @@
 # Original author: Author Olivier Fisette <ofisette@gmail.com>
 # Next gen author: Justin Lecher <jlec@gentoo.org>
 # Next gen author: Ted Tanberry <ted.tanberry@gmail.com>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS add-ons).
 # @DESCRIPTION:
-# The inheriting ebuild must set at least EAPI=6 and provide EBO_DESCRIPTION before the inherit line.
-# KEYWORDS should be set. Additionally "(R|P)DEPEND"encies and other standard
-# ebuild variables can be extended (FOO+=" bar").
+# The inheriting ebuild must provide EBO_DESCRIPTION before the inherit line.
 #
 # Example:
 #
@@ -27,7 +25,7 @@
 # @ECLASS-VARIABLE: EBO_DESCRIPTION
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Should be set. Completes the generic description of the embassy module as follows:
+# Completes the generic description of the embassy module as follows:
 #
 # EMBOSS integrated version of ${EBO_DESCRIPTION}, e.g.
 #
@@ -35,22 +33,24 @@
 #
 # Defaults to the upstream name of the module.
 
-if [[ ! ${_EMBOSS_R2} ]]; then
-
 case ${EAPI:-0} in
-	[67]) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
+	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)     ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
-inherit autotools flag-o-matic
-
 EXPORT_FUNCTIONS src_prepare src_configure src_install
 
+if [[ ! ${_EMBOSS_R2_ECLASS} ]]; then
+_EMBOSS_R2_ECLASS=1
+
+inherit autotools flag-o-matic
+
 HOMEPAGE="http://emboss.sourceforge.net/"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-IUSE="mysql pdf png postgres static-libs X"
+IUSE="mysql pdf png postgres X"
 
 RDEPEND="
 	dev-libs/expat
@@ -75,7 +75,7 @@ if [[ ${PN} == embassy-* ]]; then
 
 	DESCRIPTION="EMBOSS integrated version of ${EBO_DESCRIPTION}"
 	SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy-${EN}-${PV}.tar.gz"
-	RDEPEND+=" >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]"
+	RDEPEND+=" >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]"
 
 	S="${WORKDIR}/${EF}"
 fi
@@ -93,10 +93,8 @@ DEPEND="${RDEPEND}"
 # Does the following things
 #
 #  1. Renames configure.in to configure.ac, if possible
-#  2. Calls default_src_prepare (i.e.
-#     applies Gentoo and user patches in EAPI>=6)
+#  2. Calls default_src_prepare (i.e. applies Gentoo and user patches)
 #  3. If EBO_EAUTORECONF is set, run eautoreconf
-#
 
 emboss-r2_src_prepare() {
 	if [[ -e configure.in ]]; then
@@ -112,7 +110,7 @@ emboss-r2_src_prepare() {
 # runs econf with following options.
 #
 #  --enable-shared
-#  $(use_enable static-libs static)
+#  --disable-static
 #  $(use_with X x)
 #  $(use_with png pngdriver)
 #  $(use_with pdf hpdf)
@@ -123,17 +121,17 @@ emboss-r2_src_prepare() {
 #  --enable-systemlibs
 #
 #  can be appended to like econf, e.g.
-#    emboss-r2_src_configure --disable-shared
+#    emboss-r2_src_configure --enable-foo
 
 emboss-r2_src_configure() {
 	local myconf=(
 		--enable-shared
-		$(use_enable static-libs static)
+		--disable-static
 		$(use_with X x)
-		$(use_with png pngdriver "${EPREFIX}/usr")
-		$(use_with pdf hpdf "${EPREFIX}/usr")
-		$(use_with mysql mysql "${EPREFIX}/usr/bin/mysql_config")
-		$(use_with postgres postgresql "${EPREFIX}/usr/bin/pg_config")
+		$(use_with png pngdriver "${EPREFIX}"/usr)
+		$(use_with pdf hpdf "${EPREFIX}"/usr)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with postgres postgresql "${EPREFIX}"/usr/bin/pg_config)
 		--enable-large
 		--without-java
 		--enable-systemlibs
@@ -147,17 +145,13 @@ emboss-r2_src_configure() {
 
 # @FUNCTION: emboss-r2_src_install
 # @DESCRIPTION:
-# Installs the package into the staging area and removes
-# extraneous .la files, if USE="-static-libs"
+# Installs the package into the staging area and removes unnecessary .la files.
 
 emboss-r2_src_install() {
 	default
 
 	# delete .la files
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
 
-_EMBOSS_R2=1
 fi
diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass
index 2de8d14c78b1..e4d9ae69af3a 100644
--- a/eclass/myspell-r2.eclass
+++ b/eclass/myspell-r2.eclass
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: myspell-r2.eclass
 # @MAINTAINER:
-# maintainer-needed@gentoo.org
+# Conrad Kostecki <conikost@gentoo.org>
 # @AUTHOR:
 # Tomáš Chvátal <scarabeus@gentoo.org>
-# @BLURB: An eclass to ease the construction of ebuilds for myspell dicts
+# @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries.
 # @DESCRIPTION:
-
-EXPORT_FUNCTIONS src_unpack src_install
+# The myspell-r2 eclass is designed to streamline the construction of ebuilds for
+# the new Myspell dictionaries which support hunspell.
 
 # @ECLASS-VARIABLE: MYSPELL_DICT
 # @DEFAULT_UNSET
@@ -18,20 +19,39 @@ EXPORT_FUNCTIONS src_unpack src_install
 # MYSPELL_DICT=( "file.dic" "dir/file2.aff" )
 
 # @ECLASS-VARIABLE: MYSPELL_HYPH
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array variable containing list of all hyphenation files.
 # MYSPELL_HYPH=( "file.dic" "dir/file2.dic" )
 
 # @ECLASS-VARIABLE: MYSPELL_THES
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array variable containing list of all thesarus files.
 # MYSPELL_THES=( "file.dat" "dir/file2.idx" )
 
+case ${EAPI:-0} in
+	[0-4])
+		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
+		;;
+	[5-7])
+		;;
+	*)
+		die "Unknown EAPI ${EAPI:-0}"
+		;;
+esac
+
+EXPORT_FUNCTIONS src_unpack src_install
+
 # Basically no extra deps needed.
 # Unzip is required for .oxt libreoffice extensions
 # which are just fancy zip files.
-DEPEND="app-arch/unzip"
-RDEPEND=""
+if [[ ${EAPI:-0} == 7 ]]; then
+	BDEPEND="app-arch/unzip"
+else
+	DEPEND="app-arch/unzip"
+	RDEPEND=""
+fi
 
 # by default this stuff does not have any folder in the pack
 S="${WORKDIR}"
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 634db315da9d..64aace3eb3d9 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/descent1-freedata/Manifest b/games-action/descent1-freedata/Manifest
index 36e45899ee41..a371b3decc79 100644
--- a/games-action/descent1-freedata/Manifest
+++ b/games-action/descent1-freedata/Manifest
@@ -3,4 +3,4 @@ DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8
 DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
 DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
 EBUILD descent1-freedata-1.ebuild 1620 BLAKE2B 99ad8d8cc4cd3d9ef182f7911654e765f2a66999bb6ea3c7bfb9cd95c355f8709a651b6c4bb0ebf925d8c4532744beff35331cc1d5a5fc40e1517b68bfb2fb68 SHA512 63d72b0f82c4deb7de98b5cabd79b1adad30fa32fe2053234bf08bffe7f1845c0bc46bdf3a6902b7d934590b1da3fb3e37ec06a9f71e5d751c3c765e905761b4
-MISC metadata.xml 1771 BLAKE2B 1a6753adc2f5a7b42d4c52bb3fa6632c92add52dccfa6afc7f9c693cf09fac6e2934dddc77a77508871779621e9c0629c6e55f7e50c50c17a7be9ec531331c6d SHA512 daf00ef90e3110c6992267ee43fe28157de3f64fe03465f3507dc23638059165bea419d9caf5991e2fd5e81f4f5550736ba349823e215ba57da78d6b8d6d27d8
+MISC metadata.xml 1785 BLAKE2B 16b71d9c102e199926073201f8126407346feeef840d3275b92fde857b7ec77e44a15fb76c75ac18801955449d292566af1b78763b6de00263e5cb61659ee806 SHA512 132be33c500ea8059702bf92ce8c4d79f4ceca8d4c8142d94e118805a7db532325909363afdb5b25878f49cd9882bdee57db5904da83bb001525fcab08ddf930
diff --git a/games-action/descent1-freedata/metadata.xml b/games-action/descent1-freedata/metadata.xml
index c1aebfb8b109..df87250f83aa 100644
--- a/games-action/descent1-freedata/metadata.xml
+++ b/games-action/descent1-freedata/metadata.xml
@@ -5,7 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>iansilvester@fastmail.fm</email>
 		<name>Ian Silvester</name>
 	</maintainer>
diff --git a/games-action/descent2-freedata/Manifest b/games-action/descent2-freedata/Manifest
index c24c523004fe..54a72e5a5f5b 100644
--- a/games-action/descent2-freedata/Manifest
+++ b/games-action/descent2-freedata/Manifest
@@ -2,4 +2,4 @@ DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb7
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
 EBUILD descent2-freedata-1.ebuild 1620 BLAKE2B 99ad8d8cc4cd3d9ef182f7911654e765f2a66999bb6ea3c7bfb9cd95c355f8709a651b6c4bb0ebf925d8c4532744beff35331cc1d5a5fc40e1517b68bfb2fb68 SHA512 63d72b0f82c4deb7de98b5cabd79b1adad30fa32fe2053234bf08bffe7f1845c0bc46bdf3a6902b7d934590b1da3fb3e37ec06a9f71e5d751c3c765e905761b4
-MISC metadata.xml 1655 BLAKE2B 49a8189efa4d1bf286042d9e9dc8d6df80b1f440b0d745506b5bc722449eb1dc8f6dc3d28fd408433a48af3fff4a829f26c796d1d62b73407cd0691a2eed2b23 SHA512 2548c12d629904d7a7c9bbb4c260ce928820aca4753ad922bfbcd535d39c6eaf2f0cda2763c238fa805b1451dbeb49fc4cf314f6dd7313b0c91b263047a133ca
+MISC metadata.xml 1669 BLAKE2B 6f9b2c2f1e5e2704a5ee5be0fd236dfb9a7fcebc72f63be1f3c53a46187770e7027e15aa5b2016b2d686d8e915d024db0d3a39824c52f15a09f68f4da994b7c4 SHA512 f320ede75f8726d962ead730b50533af1007594464bef1a14b0c50b310d3d62a8149e77978c9551666160b46fa494484de0517a3fb27951aaf20e21c050345c8
diff --git a/games-action/descent2-freedata/metadata.xml b/games-action/descent2-freedata/metadata.xml
index b40e76a533cb..a74be9d61477 100644
--- a/games-action/descent2-freedata/metadata.xml
+++ b/games-action/descent2-freedata/metadata.xml
@@ -5,7 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>iansilvester@fastmail.fm</email>
 		<name>Ian Silvester</name>
 	</maintainer>
diff --git a/games-action/metadata.xml b/games-action/metadata.xml
index dd0a884f0100..9d0ff1139dae 100644
--- a/games-action/metadata.xml
+++ b/games-action/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria games-action zawiera gry akcji.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 2db6bd6cb7ec..df65688a4f60 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -3,4 +3,4 @@ AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530
 AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
 DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
 EBUILD minetest-5.4.0.ebuild 3467 BLAKE2B 3350c84716902ea9b4d9eb33ebd635e43ca3c42024add64ebce0a9830ae0535e664d5ea781cecff0a0452dc8da1e0397d01796208a6cf9798c78ac24a88b1995 SHA512 09022c7bd83aa3be1ce09a7e8e59eff8b3a02257dd5eed5855f7cea480f70299b4c03532f27c01a57649e35686742a72d56b4fb5b442b5c5b1220bba6c06034d
-MISC metadata.xml 2304 BLAKE2B 174aa3ecba34e78284cc6b58a622f2aaa3312950b9c52428ea999fea12df4817348b8f0ac85259566d3c131d735be305f86e3bdb27993fb92bdc98bd4d6a6495 SHA512 b84fa111e428ab16114081b56469259f1bc3b4dae74ce530d9fc0512db7bfa500c6920e4913accabade89dcf25fb4463b116a79be969cc91e5d45e3e67aaa4d0
+MISC metadata.xml 2334 BLAKE2B 54ba41eec9bd0c5099ff5e6850cf6413c6571f2321a928a71d4bb5d01a7eb44e703c80bad4c534b7e240521661c3faca8b5c7e6edde699c3be0daf4df9bd162f SHA512 660f8c7cf899fdbff19fde69e4f5e135cdc009497a4a640f51af92579620c0d805c803c3c38b751c21ce12ed8abb93422f72f8e2a5326b2a0323384d741085b1
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 5cd60f0a8711..41104cf6b215 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -29,11 +29,11 @@
 		* Runs natively on Windows, Linux, OS X and FreeBSD.
 		* Supports multiple languages, translated by the community.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 15c71a932b45..9a3c66f5c884 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 9c9955e668cb..7255eb58eecd 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -2,4 +2,4 @@ AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2b
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
 EBUILD commandergenius-2.4.0.ebuild 2192 BLAKE2B 6f56b9049b899ddc3c253e6d33ab901f3c993aabe1b2b093e54aee81b162a340e43fa43a34243a87d4ff7f598c67be3ba7f8530fad8a25a2941f6bb696b07781 SHA512 8413ea6c69c56162c4d4d630fcd1911cc01ff88eb712bd94033955eb5dd08bc691f8572afae543de4a6b612ec10c336768791ee017b3d68249bcfcb0a56a9084
-MISC metadata.xml 506 BLAKE2B 2e4a746b047d9e50d4403cdd52984cc2f0e8ba58e81ac73b6d3e3363f60c8370221713248fcf56505ad5768f7f66dd30778d025b8342088fa9c329deb7afac20 SHA512 f7e6dd9ad5ba4e57218226ec1693e482228133d3e19332a9aa7995bf60e184a77520a59d7d2b3195429c3b56ecb857da675d467b05b1b9aeb52826500db2061a
+MISC metadata.xml 506 BLAKE2B 25e8355a252ad989de2d71ee53d2163ecf259444c76c1b2ce01975e9fb711dd54dfe9d6a0d325ffd4fa21c62042d99a530a55cf37a9d1650b6d7a7b19b50eb28 SHA512 96c6feb3c9584aef0e25ec5ba1876f300421eaa0977e7cadbd5fe419e16e39891d26e2e322db6bf22b4570b79e69f76bbf268887fc6a698cbd7f37908c675ef8
diff --git a/games-arcade/commandergenius/metadata.xml b/games-arcade/commandergenius/metadata.xml
index 8de6e6384295..528b4e42666a 100644
--- a/games-arcade/commandergenius/metadata.xml
+++ b/games-arcade/commandergenius/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-arcade/metadata.xml b/games-arcade/metadata.xml
index 992ba13fea49..c7d68578bf08 100644
--- a/games-arcade/metadata.xml
+++ b/games-arcade/metadata.xml
@@ -32,4 +32,3 @@
 		Категория games-arcade содержит игры-аркады.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-arcade/open-supaplex/Manifest b/games-arcade/open-supaplex/Manifest
index 60a9c6ec92d5..f22782a8b2cc 100644
--- a/games-arcade/open-supaplex/Manifest
+++ b/games-arcade/open-supaplex/Manifest
@@ -1,4 +1,4 @@
 AUX open-supaplex.svg 1613 BLAKE2B 8f5a6061239d9e573792890d2c2dcff6ba34e113832fc033d53c99af1ab9ffa8139465dc3b37b7dae0861db33d15cffa5da01d7a4ac69e7c66bf9d8b461fc553 SHA512 3a9a1f7fc9b0dd493e995d0dd3786067e53160a7ba0f3506282475cd2eaf6a6dd392bcfe925308845f331c7cdc4f1df872dcb1be7727e89d01ac6942100e8eeb
 DIST open-supaplex-7.1.2.tar.gz 50157943 BLAKE2B 74811edf2dbf65b21fc502703ecadaa293ac5219e0c17b6876a6c6d81c46456d3d06717b56124ce5a675dbfa2c228235479ab8e5baf33fc3618576936dc9b62c SHA512 960c916d9af142511c755babeed24e4cde71bf9b61a5d77b988c45dc9fb9065ca6c65f07b72a2c413a1a7a5158da597f72e9d4d907de9585c4a6cc410e6134f6
 EBUILD open-supaplex-7.1.2.ebuild 1572 BLAKE2B 9907a832210ba7760ab5eddecb2ba6b27b6436468f6361c958c02fda60b9df978e2a504ce44a503d8f99b35670fec7438204ad491cbdd108881de0b21b2ee8e7 SHA512 eafab6bbe277abb404ca6cc86d625ca835729bc3dfa1a68e5fbd96843e665eb7a258b10fda6239f9356b34a0bbbb41fabafafb9a8bb0b89b3ef5492f97dc24d6
-MISC metadata.xml 575 BLAKE2B dab25c54577e9b6bf3dcc8cce583ad18fa691b72feaa39e4326b9d9d4e6aecfdfc0663f512b96bbae9de9ba988777305ad20067d3c18e1752c6c10c890571064 SHA512 adb54e7ed6b9d17fb2d5ac4442e8ab2a7fa697632fe5a25519f96c6bd527a60f70a4c2460edf8046edfcf3046f31223c463f27d582ecf8b508d6a1dbc4de79a3
+MISC metadata.xml 605 BLAKE2B 132f95f06df802e95200d652e4ee5da62d47831224b37bc0e7f876adc695f90212b9b641cd6fc8564e4d93203881a94c4323a96e59799f2a86e67ffc94af94b0 SHA512 232fc31a53e839e73e43f1091f2df52ba51319eaef897b8ee188d873435708acab35fd7d38df81979dade7fc37fa21afb27f534c543b47a228e2da90fb42dded
diff --git a/games-arcade/open-supaplex/metadata.xml b/games-arcade/open-supaplex/metadata.xml
index f41123363bc8..6c809420d5a5 100644
--- a/games-arcade/open-supaplex/metadata.xml
+++ b/games-arcade/open-supaplex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index 82125b7d8028..d050d0a6a799 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -3,4 +3,4 @@ DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
 EBUILD oshu-2.0.1.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
 EBUILD oshu-9999.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
-MISC metadata.xml 423 BLAKE2B 0c302dedd0ac0c3bb3295da6a5ae4e568e848f25d2e03f3276fc37f3053ad46df131a4cff5c7ee2b83061f312c06b090b6a66fad5fd64137d2f9d97ec241143c SHA512 c30495d814265e4a2a18c4ef01e4ea7436d0cdcc14838932aa6d52d87354db8e6bff45519f7a8e333c92bd699b4e903cc1b7aad614455314788007a227857bf6
+MISC metadata.xml 453 BLAKE2B 5a476eba4e50e27ad8acd30a83b52730da9dacff8c6f1a1447b507954f861178a9df6ec15cef8411114f7566f0bc345428a5ca1f9493d2a94bf2b0050e595844 SHA512 45022b42de377cff0287a20def5de6a768773af459adc14fbcd37e71ade1aa32fec5902b5df8a40a2edc581002c24c5840c9c0a285067f1b0e1ce89459be47ce
diff --git a/games-arcade/oshu/metadata.xml b/games-arcade/oshu/metadata.xml
index 3e59d136eb7a..4e53e6f0de72 100644
--- a/games-arcade/oshu/metadata.xml
+++ b/games-arcade/oshu/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>contact@hacktivis.me</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 365c2a89c576..13dcb2e19289 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 80cffed75577..8c8103a374be 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,3 +1,3 @@
 DIST cockatrice-20200823.tar.gz 8503044 BLAKE2B a987418b25db53e5fc42627e3efa93ee7348ff341d7cf844647c6655b00bb76f2929cff91c6a1d199525fba2785f4d5da533c934ad483636af1979d52f8eea94 SHA512 0fa919009536238cd540db6ef01271a41f96aa40a3d40b468fbc400905dbdfe914cfb785f62f8135355c64cc8fef19a83604aee1ad4420bb73c8f31b9d48e48b
 EBUILD cockatrice-20200823.ebuild 1523 BLAKE2B f33ae793f11c6e009b244a8f5b6dda2fce4a9d6186de0eb8d876d91cb30eb066c8f55a11dfc5943888b36fa1cf08278683897b686e2d03023d0cb235df028dde SHA512 abb3107c2129fb064f4b93b06705aebbff02ed8d5da5e431425705b80492ce8f85111c82188fef31f8ae1353eef798262681a8c9550ced5d3deb6ade4f0e16a4
-MISC metadata.xml 1420 BLAKE2B 60fb5e1f9c453bc764b05d9b90f73894b6d7d404cfdcf16bb8ea1cd5400ab1b862f95f43f1db2a30fe032ddd2916cf7cc0dbbc8651007efa924341fce3aa0a48 SHA512 8d12c234759230fdca9d534a334b745cd5cf87ac341c7f9c95c0870e391342de747534ec083ee0c65d83952a842294e3c90ec5fdbeb3013fe90bc7be45a78e08
+MISC metadata.xml 1450 BLAKE2B c4a364258aa2fdc7c82aedd69abed77a7c6715ea5e3124b4980c4067731b044fc5377b8aac137e168f5aff1b728bded8560b660d0690e5dfb3cc1561e8f07a54 SHA512 2ce5c04a36ab4af86f9dcf76f8ca031eb22dd9f6277f47c227bc8658298a40f8f72a6aa655224956073992bd787a865350ed0152c1663c6234075cb652c357bf
diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
index 36a79b8d8abf..bee76b4537da 100644
--- a/games-board/cockatrice/metadata.xml
+++ b/games-board/cockatrice/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
index 514656ce6998..6aff451a5349 100644
--- a/games-board/goatee-gtk/Manifest
+++ b/games-board/goatee-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc SHA512 d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70
+DIST goatee-gtk-0.4.0.tar.gz 60655 BLAKE2B 628a43c4e55f7d5d16052a798c5bf7b829aca08a0c27ae176548dbb908508cb5d8bb24d3ee48d8fc8a96e89b59200672a0ed1ab6d811312c7949cbaec4353fb0 SHA512 cb95f2703d21b83e86a5a31ec2a9896170a18e8e7660c657f72e85779af92beb07dea015f3608a6bab58d2ce745f6338a0a7e8c03f46f300bf357d5392672b68
 EBUILD goatee-gtk-0.3.1.1.ebuild 1148 BLAKE2B d5d6710a13f69b4bddd0b319cfd97ebfca2cd94566d026a6296a12cae230e389e236d31eebb4fe252978c22941d0f2d0b065e6941a0803672269fef43e5e2c3a SHA512 0c0b4fdafdab2f947ed21279557fa9ec3df0747473eeb562246dd1d9eb7f9c59bddd367aed73c29ba8ac61ececc05774766f59456537ca12cb3011cc4f8ff6b8
-MISC metadata.xml 808 BLAKE2B 9d09adbd3d47ff4ff59389062d67cb8c9419465646e42d46cfe3e5273446723967979d42f10ac93fc447586b4c13ac9c8c206dee05a9ae3580b5b3d59301aa9d SHA512 513240a99caaf62bbb711d95e10ddaa546d59f4846c5bf707d19440893bf628f0e08e80bf7ec85c3e2cb62c360800b0fbd1dd1dce9f171e38534fd7bc0751599
+EBUILD goatee-gtk-0.4.0.ebuild 1048 BLAKE2B 8d46fadfdfc3bc6df42497c7cb67efdbe7348f00e5cdae11307a466a541e73ff741cdd66be2cea0f33d0718bb0cfd1dbd7a855cb88992dd9ab85b6a21ffeadcc SHA512 35629be6bb0f60611f0e46236687371fa0b4c1c0003013924bd2cb38e9b6818d3da4499a574b7050ea33ff10d7f3fdb76955ee71978343b8b88d56f95d871b32
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
new file mode 100644
index 000000000000..16c70308b226
--- /dev/null
+++ b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
+HOMEPAGE="http://khumba.net/projects/goatee"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-games/goatee-0.4:=[profile?] <dev-games/goatee-0.5:=[profile?]
+	>=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
+	>=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	>=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.16:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
diff --git a/games-board/goatee-gtk/metadata.xml b/games-board/goatee-gtk/metadata.xml
index 97b194b9e0c6..b7878815d80d 100644
--- a/games-board/goatee-gtk/metadata.xml
+++ b/games-board/goatee-gtk/metadata.xml
@@ -2,20 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Goatee is a Go library and game editor, written in Haskell.  It provides a
-		GUI for recording, studying, and editing game records.  Underneath this is a
-		portable library for manipulating SGF files to build UIs and tools.  Goatee
-		aims to be full-featured by supporting all of the SGF spec and allowing for
-		full and easy customization of the game records you create.
-
-		This package is the GTK+ UI.
-	</longdescription>
 </pkgmetadata>
diff --git a/games-board/maitretarot/Manifest b/games-board/maitretarot/Manifest
index 2b4a95860f96..a36f27c50dff 100644
--- a/games-board/maitretarot/Manifest
+++ b/games-board/maitretarot/Manifest
@@ -1,4 +1,4 @@
-AUX maitretarot-0.1.98-format.patch 428 BLAKE2B 70110e2592282654ffd9bfc1a54c0bb12fc43f4ff6cd575535f59151d16a87b047e22165ef099b6f13e48ee189f32b61fb3f7bbf91b6fba7a3e2e17867b6cdb2 SHA512 a6dfc1a6dc027b80076d29b1ffbe28f6dae6f0737f51e760edbf963e31f91b0367120b90a8cb69188307bf91537e14b28ae7202ebd3b9aad80f48684204d94df
+AUX maitretarot-0.1.98-format.patch 356 BLAKE2B 9fa408ddad772bfdaa4b92096d1493d8dfa702dadbed5412ff8702d8a76f6006c0fc9ecefbe6c38db5baedd54aa62ca6abb4db933c311f1e54c9f4787d8c2b96 SHA512 c539adc46e0d61034266ccf0128a9c278c970a82f67ddc5d750c74642c3ad219da0aca69e276692896cb64bd20a266c01484d2c2c31540800bdaad9db6bcf03e
 DIST maitretarot-0.1.98.tar.bz2 92050 BLAKE2B eaf38974482043b1f8008fac455b75d7e429f4f9ead26de6a50705ef7f3b8995c0b84b37f0ae95f24df7df2e438e5062763eb62ef526033f1e62aaff9c2ef272 SHA512 99cfe8e99b2214f729d6dc175064f827a258d008c2f67a16a77bbf18ebf73da87fae4d58b9597b582cc450762f2cc497cded26d84bb4ce3e7c25f9891bb72e03
-EBUILD maitretarot-0.1.98-r1.ebuild 580 BLAKE2B 2f964dc58e01b71577029c87735bf4ac55381eed3ff13cceeed7740875cd9798a66b9c23dd00aa1c4b7cad5b4ddf960572aa4bccad32290976926b558a20bd68 SHA512 9c872d8f81fffa7ac6539df1d8e1561e741916844258f252d71144184b3b70ef633f39483a6781f297a7e6c5e5d8efb5f3a119a801997fd4d17f85f3fc2062e4
+EBUILD maitretarot-0.1.98-r2.ebuild 899 BLAKE2B 4b7d613f1c0db1f3aae436423637642fdff315f399a47d02437c87ec5fa45865a0204d7d7d8b9eed11b37cbf95013a0638ff02aea88589b7f5a902f2e2d81948 SHA512 385b134822603b207974b450cf3d18dc5ce08aed031bb2d4ebde126a2c3cb5ecc8331dde27e4334739b5aa6ac8313b2283087af72fbc3b198a8594a28d24c077
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
index d7b5ca55b093..f01f4917553f 100644
--- a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
+++ b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
@@ -1,5 +1,5 @@
---- a/src/game.c	2015-12-16 21:59:49.400430743 +0100
-+++ b/src/game.c	2015-12-16 21:59:11.085058332 +0100
+--- a/src/game.c
++++ b/src/game.c
 @@ -642,7 +642,7 @@
  		  (game, prev_winner, c, ((i + prev_winner) % 4),
  		   game->players[((i + prev_winner) % 4)]->turn, &err))
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
deleted file mode 100644
index ab3167b6fe21..000000000000
--- a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="server for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_configure() {
-	econf --with-default-config-file="/etc/maitretarotrc.xml"
-}
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
new file mode 100644
index 000000000000..a53f75ae021d
--- /dev/null
+++ b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Server for the french tarot game maitretarot"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	dev-games/libmaitretarot"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #739142
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-default-config-file="/etc/maitretarotrc.xml"
+}
diff --git a/games-board/metadata.xml b/games-board/metadata.xml
index fb63e54520b5..55f3af25731c 100644
--- a/games-board/metadata.xml
+++ b/games-board/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-board zawiera gry planszowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-board/mt_dolphin_ia/Manifest b/games-board/mt_dolphin_ia/Manifest
index 14b761480363..fb92c15d88c8 100644
--- a/games-board/mt_dolphin_ia/Manifest
+++ b/games-board/mt_dolphin_ia/Manifest
@@ -1,4 +1,4 @@
 AUX mt_dolphin_ia-0.1.98-formatsecurity.patch 311 BLAKE2B 8b92264e591637fc337561e294cb473e03bb1370243b217dab73c3f5c67df4cd90529f3050528e29113e9f71f92a0e5381eb290e4cd9c2ab4e38e259e6fe9242 SHA512 c919fb834459d435f1648cbefe4bc36c1628586da06162b49282d650c667ab579fb1a2c53e292c0508d286c3cc6ba7ed8e1a0b9ea456c75a191486919c7191e3
 DIST mt_dolphin_ia-0.1.98.tar.bz2 92625 BLAKE2B d4b2373ad100466270f09f854337a098baf9a6744b7223786ed4cb7c4955a3e44020d61a7c331ed6fe796ffc9e787f38d814470a78a56a7a4dac0d3cdf04f38c SHA512 17ba198d344bb8ef499d6844e949155a18f8942266392150d77e5c53dc0ee32bcf6a297153f85d7a964b02de8a82f3d156e899f4d25ef1940dbc794d9b44979c
-EBUILD mt_dolphin_ia-0.1.98-r1.ebuild 532 BLAKE2B a294a8e5e791f60aacd33b24067e9ce90a52b118faa12ba602b96c00a38dfd06440704cd12f8af163e10c4f19611e5d7831d8e188609c90320709f6d363d30aa SHA512 72401906f7173853ecaf854840170abe9f47ffb2d728b7c5f18754a04015f6c16330d14a679adae5439545c7581043790dcac0053b8f7a2fc94e7ed7adb84759
+EBUILD mt_dolphin_ia-0.1.98-r2.ebuild 851 BLAKE2B de94c7d0be31313c658113827fddc4ab1255c26773b56cae94b0d0e3cf04a5d78c9e49ec35379b04fa21740e894702538945f7891ca78e549a593622b10c6776 SHA512 3fb2c50b090312cf23006dd30e224a2123ff879721eb6d3c742ca9ce704cb3419f756dacb66fb5815ef0bd2b73b6ebf79d92943ced18e66dee79a5e530be461a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
deleted file mode 100644
index c548718e2f1d..000000000000
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="client for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot
-	dev-games/libmt_client"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-formatsecurity.patch
-)
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
new file mode 100644
index 000000000000..c6858bfa1ff3
--- /dev/null
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.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="client for the french tarot game maitretarot"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	dev-games/libmaitretarot
+	dev-games/libmt_client"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-formatsecurity.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #715582
+	eautoreconf
+}
diff --git a/games-board/mt_ncurses_client/Manifest b/games-board/mt_ncurses_client/Manifest
index 2c588ad07bbb..1b28146020b6 100644
--- a/games-board/mt_ncurses_client/Manifest
+++ b/games-board/mt_ncurses_client/Manifest
@@ -1,4 +1,4 @@
 AUX mt_ncurses_client-0.1.98-format.patch 309 BLAKE2B f6d112c9a3b401c39642a8218dbf1c97e3b8376b68948d2558905f1ce6c55945a9b3f7dda6e9db03d5f8f962d5bec7197f981f37bfa38d2603753f82453231a8 SHA512 0c6a09dd4b3ad1e64c1997a7b82414666c715dd56aaa0c986fe190aaf96f49f1f4a5f773a915480503ed410a8fe15080f0cf0636c0e91854f5a5cf94893f81cc
 DIST mt_ncurses_client-0.1.98.tar.bz2 97156 BLAKE2B 48e58107dc070a35216bf755fb206b7ed1b02c7585ab0e0472acbb33432c7ef7b5671f7e5c0c33b749f975ce5ba360b51686e89a1dd3e391c040436f8229e6f8 SHA512 cb2c8d23e3e2c536d24fb9beacb35577229eae016998fb7c57204284336a53a2378ce0d7b940bec7662766f679502c7d9cbfe4118235300072e648b83c5244b6
-EBUILD mt_ncurses_client-0.1.98-r1.ebuild 651 BLAKE2B 82c57b1bbc6b73817d0667c6f073e14fdd516b2a6d61b2cddd031e4a17f9cc2e67e271e061beff4f795610bcfda52b05ebf09de9a0b49148fe303f7a8adbb55a SHA512 02ee37544430905c37aa6c34d840f149be5ec4c4e20c2b5ff9b27c1b9ee05227ca7197116bd5ffee0f205235b944d6cacc8b91292d1c87d7b82d60d842783a20
+EBUILD mt_ncurses_client-0.1.98-r1.ebuild 964 BLAKE2B 4b9dc8ddf2626aa7878b229299f83424a3788261a852e2c81b2899b4837b934eb30839da6aa09e00bb5888dbecd48ae4996a7184517cf6befd51d8ae559cc539 SHA512 8f607af4c8ca939e664fc230e7be0d416734cec7997e421f8b7e6b1d75db4731451a51c135f6c866dcc0d2d3756d9f73cbf59509f9f33193e814c745941ce167
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
index f2228134f6dd..b9aba21f1406 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -12,19 +12,33 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
 	dev-games/libmaitretarot
 	dev-games/libmt_client
 	sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
 )
 
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #716102
+	eautoreconf
+}
+
 src_configure() {
 	export LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 	default
diff --git a/games-board/tablebase-syzygy/Manifest b/games-board/tablebase-syzygy/Manifest
index ce513e3a96bd..9584477d66a7 100644
--- a/games-board/tablebase-syzygy/Manifest
+++ b/games-board/tablebase-syzygy/Manifest
@@ -1020,4 +1020,4 @@ DIST KRvKR.rtbw 12944 BLAKE2B 42839f64c0e8ec8b3be09c128ee2e8d768ce5d77ca06c3cf90
 DIST KRvKR.rtbz 3408 BLAKE2B e56df50b368a89acb767a827f17d83ec028a87c06e9ad9d18826db9ce8da6024cbc69f961cad24846ed48e839ef5e6f95bd0798455ee2e1cc6e625df573c7309 SHA512 729068cb50ed6abff51a2b8f4041edfb0d109f163d961db9240a0c74069a7e792f3904a7d712882ad25d356059917a64a84f511914f05c20d41185815f23e3d9
 EBUILD tablebase-syzygy-0_pre20131213-r100.ebuild 1598 BLAKE2B 5750013dbb20b436b231b711bf0e76b7c0c2e304a4b4d13891c8a48dfca390a987048ca84d8a5e3550fdbb90eca2f11af3b437f9ef1b28de325aecbc8a900a8e SHA512 86f0df3e6ad0364cf70d73215cca12be43517af545c60be714d79d4422c98079a4469949232dd0deae28578e2e476861454898460eabd8245357f6f262c6fdc6
 EBUILD tablebase-syzygy-0_pre20131213.ebuild 1550 BLAKE2B 25081190ea10704e5ba3151d3806c694b8308a203f3763e6a6daca825e7b58ce2643aef6bb5a27f7b4b27cee186f388736a97db0e28cb5b71ee8fb5decc2a4dd SHA512 e0b53e707638ead230bac7e856c5e8a2acc7c0cc1b88a3b2668b7350d8637113f15d7f42a74683a65cb7faac4156667445ef70aff4a80027452e889a8d9b5c66
-MISC metadata.xml 296 BLAKE2B 5d6b6728206eb5fd9aaeef1f5bce9ce5a750b51f2fd61b6777f74c3d3b130644fbfb206859d18686e6ee933149ad322dca7c23d432202a4093bbb3a3a823b147 SHA512 9b6cb3427a2633074cd27495a4053b48383ee9ad08376d6309f190d7d3833c33adc787ba5394d458be84100bea97424b0256f2c8e749b69d35d502ff8547e26e
+MISC metadata.xml 296 BLAKE2B 2cb0bcbbfe8cf198a7f2c79be211763cad76fbd427b777f02bf1553a5826598aef2854a1f40ac0e3f68f1fbd4ec847f858bcb62bee372890f2f578d0949f9fff SHA512 d1f7a5c632b9a9ad3fcddfa09fd25d41790a84e0763dc053eec3fcce884db7efe08575d3ac3b94a2605a0f8d985004d60f1b8a1119052efc42632bd6caffa299
diff --git a/games-board/tablebase-syzygy/metadata.xml b/games-board/tablebase-syzygy/metadata.xml
index 6b080aa60cc4..87d2788fe2c7 100644
--- a/games-board/tablebase-syzygy/metadata.xml
+++ b/games-board/tablebase-syzygy/metadata.xml
@@ -5,6 +5,6 @@
   <email>ulm@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='6-pieces'>Install tablebases for 6 pieces (huge!)</flag>
+  <flag name="6-pieces">Install tablebases for 6 pieces (huge!)</flag>
 </use>
 </pkgmetadata>
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 5f353f20986c..cc71fd50a7f9 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 3735a308d76d..e350cc2169c1 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,3 @@
 DIST m64py-0.2.5.tar.gz 201868 BLAKE2B 95cbfe58ae2741caac5e05bcc06af563ee398d2916d07902ba4aaf4213277eea3c6219448db5958e0a2d0ea8ea3f65c88e63cfd2938a8b4ed33231ba57ae724f SHA512 338f5e96dc4657ba2230c32a40cf0e85c5efcccaa0d5fdbe4b4dcef020b910f5d2d88e5c224f8b496ec0378051aaf44358a0438de52fb03b4ece353f55abc61c
 EBUILD m64py-0.2.5.ebuild 1043 BLAKE2B 111eb56dc00476b82232271139fd901953a4cee509240cf7886a70edd13dab7e45670c0ff7d122dd844971ffd0a3319c5ab36ed7845b2fda9b875eb46bd55680 SHA512 937341ce08af29ff6dedb16fba2a8ce96619c204e21ebf8baed379c9149a790390f31a0e164e109a3ff6045344559592afba9e0a32931af6141d988aa5a7acd0
-MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
+MISC metadata.xml 455 BLAKE2B 1004f86934a424ba938d1ca37facc1dc811d7d41cbbbfe2e009fae86a61fb5489225fa80698b0cc5bb0a4fa8e06ff960a8eda04539a6dd150cd5338b546b6d66 SHA512 a2f762d14006c558994b0ecc536f27fff5babf7cf56409bf5b03dc14449b3aa26d2b8f400d466343bdf488e016a460e12413856b5c4dae862dbdc4d62884babd
diff --git a/games-emulation/m64py/metadata.xml b/games-emulation/m64py/metadata.xml
index 00cb74caa25a..bfcd7dbfd100 100644
--- a/games-emulation/m64py/metadata.xml
+++ b/games-emulation/m64py/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='7z'>Ensure support for .7z archives.</flag>
-		<flag name='rar'>Ensure support for .rar archives.</flag>
+		<flag name="7z">Ensure support for .7z archives.</flag>
+		<flag name="rar">Ensure support for .rar archives.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">m64py</remote-id>
diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
index d22004c17644..ae265068c922 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1,4 +1,4 @@
 DIST nestopia-1.50.tar.gz 1529804 BLAKE2B ef2fdf6ffb6ff9bb5f222730869d6deadb892c0a3996e97750afee692ec1d3b997e2bfe353a4fe26b9771781f659de83dda5e4676e221f4b9beaa512d6873ca4 SHA512 6ea389d4891c7cfa36517495735ea0f34ba9427e51757113d0fe2b72d5ce5b11d7e6b7c02fd1e4e347a13bba06823e334800ff15036872e09b8561c10c7cb568
 EBUILD nestopia-1.50.ebuild 916 BLAKE2B ff9e3110417dc77a4edd3c8d12f2d12d148fb83241a67420b0b94fe95a0a3f7272ca78d0e0f08cb8616499a6efbd6b3dbef4c27055405811e0b8bc6ebeda4ab0 SHA512 77855ee12a890cc5293f08686616f80cf384bb2bdccd0e00b907188039ffff4e4f5d7f9fb66d881f585ad9c5f9323699464e5f667926601092d5efed81e03e15
 EBUILD nestopia-9999.ebuild 779 BLAKE2B 2a242f3ce4b6b3005cc336103044b641a3cd25f27600c565c542edd6329e4beb187ca7a106a93370f34acc8762eefbef193cb1e79ec753ea8add9c0bd6363327 SHA512 46ebaf1a1ee09238d26154003be235ff840ef9076c331602c4e08ce3d87c3219630523f3de843991c4f4a1015ca9a05cfedc8d3316884b60bd08d35401512e26
-MISC metadata.xml 391 BLAKE2B 988fee94de3ce9ae6e85186e39a4505c5dd6366dedb0b912e77556471c27b2fe6752e6d58001b37464e0906c34041bd8e0e3439035255269a2bee6bf307c60f7 SHA512 13f5927adfcb88e3a1fcb02de6deb376547d58b2c35ca9c3d759359d0913471ac68b90ade1cc23e9ef5161888d2589ab54cf32e5d072bbaf30166ec1e7938f26
+MISC metadata.xml 391 BLAKE2B 8b5a3dea94e857543a728e1d9d639f85c109520f74db8ed1fe1a4dd10cbbef6c33b133808ca1a69c7443b0f8b2354ad88bf3a96a151829d4e8b49c197362dc17 SHA512 c9417fc5f536b9373220909b0a1af7a71c966f764bebae59e59f012c3dbf5855583c8f2d136a0e22ea6a0c693ebb775a8913fa5355493921bd0c06ea35740664
diff --git a/games-emulation/nestopia/metadata.xml b/games-emulation/nestopia/metadata.xml
index f28ccdd6542e..169f005172a0 100644
--- a/games-emulation/nestopia/metadata.xml
+++ b/games-emulation/nestopia/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 15514c08c7bf..65e805e6139a 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,4 +3,4 @@ DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9
 EBUILD pcsx2-1.6.0-r1.ebuild 2844 BLAKE2B d9b207cf4ac343af83f0cfea554a52417f0a93c2a257f47548772a5f1038268b45dd3076b86a0ebf627dd6992280e0db6535a1fd1fcb8e26d6a7ac88caa0fa26 SHA512 70586cf8aa1ef5633fc353d90c1d4f651f2c0a6f4ff27763e6797175024e85b416a1c2f1694cc792f66ef23ccde7b2c9024ec2094b53b5eb81aab6c8bb6a1f08
 EBUILD pcsx2-1.6.0-r2.ebuild 2817 BLAKE2B d683ab3336aa6c2cccf4b800de701fcaf47073db6f6ef4cd1f5e244364f04870281d9d9168277c8ecf17f7c5dcd35e54c7ea8e009f0cfd86fd42a27d656cebac SHA512 0e88e5198ee8089992a1b36f06e1b2841df5552fb3f9bb46d89a56540c3df33e83cbd04012cfa62d78a5cbb7be1a0a10c3a136c20e84f27fcf4fb4c40e0b2d1c
 EBUILD pcsx2-9999.ebuild 2175 BLAKE2B 4f33ac335bb86e8e977177cdcc5c0d25fa71f4cedd74a67f0e3dd0880d01eaeff949e32491a3f7e377aaecb63f00281ca1640e4c4741f24dc9d8d2e89bf174e4 SHA512 1dc252b3afee9d379bab512da3824f65affd2c556745c12b5c77a672de9adeb3de1329196aa53428a10a589b4a8ae830373c2d03156f5283b12fbfa63929d6bd
-MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
+MISC metadata.xml 532 BLAKE2B 085f7d0ad0e79d279ac876f5be53f73dc2080efccf671b8c37bdd24c6ce8a5fd2d60afee10eb0d25eb2007c581fb512152f708e5d4031444ce4267ffd922cf34 SHA512 1db6dbcf78d3fe92c080a2d17748ca115f6e968ec23db16aea8cac219388270f0ea8eafe6ad61c9e6d8b3dc2d1b12ec5bbd88884d4e4dd19a294059123f2b898
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 16221929ad22..d7c2d90d6188 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 612fe4349ddd..65d6a0089a47 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,22 +1,4 @@
 AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
-DIST ppsspp-1.10.3-assets_lang.tar.gz 623227 BLAKE2B 91bccaca863ffead629a00783d9afba8d8975a76085ce48bf7e8fa515f60c7e850b7aad023a365955576fc0093c1e2f33813a41225b1728e1cf9431034d199a3 SHA512 5f023b7a4ecade3d88aa36ecf724fcf98200de05fc25797f1895ec3fa952dc01256a181f88d2fe3c283151c83ef502c63939d13160e4d1252f2d47d00bd54223
-DIST ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
-DIST ppsspp-1.10.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
-DIST ppsspp-1.10.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af
-DIST ppsspp-1.10.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3
-DIST ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
-DIST ppsspp-1.10.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
-DIST ppsspp-1.10.3-ffmpeg.tar.gz 387126903 BLAKE2B fd838039dda32f1b9d16649bd7e5a5d6fb3db74a8032d51973b01e567dd97c06c3d16b82a5176cb5828178f47619d767e1e0473a31484ab957636502a5172fa0 SHA512 74a8ee678c16578af63af3a6dd11dbd7bba265bc6581ff78c19269cff1b2896e236c6468175eb19c3c321ee67ebe1d62b4ff179163bb7162089c953a18483cf7
-DIST ppsspp-1.10.3.tar.gz 16956980 BLAKE2B 3f02abaf68a3a2acbaf71936fe70904a5065eb5c8afc8ec00804c325c597c4bf57fb4b9c7e1df7b302c085043a0ad210ca0d6ed2be89dd6ed28c9c635afff8db SHA512 522b2014810bd39a8554920b6d9bec7c47334d51537a7ca41482f629622b9e2d3dddfaaa5389b3c6c7dda8d7d3212b7ce9f6bd6e6d8498ffe370cf2cc58aac30
-DIST ppsspp-1.11-assets_lang.tar.gz 660080 BLAKE2B d8d30cf3e276f879da8efa3adda6521c3f239b908e0be18c61efa855e79790c44019d29e11f34e7d4cc6165bfd4b08f8664bdce6bb160665c114a46fa460c882 SHA512 4cc8c98f2de35e4585773dba38e39764018fcc64cad00b37976263ac63a003b8fd43bdbab0b820fbfb17fe5c205b9faa2f6d15f043e7d2e932cb72b18b42671c
-DIST ppsspp-1.11-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
-DIST ppsspp-1.11-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
-DIST ppsspp-1.11-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af
-DIST ppsspp-1.11-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3
-DIST ppsspp-1.11-ext_miniupnp.tar.gz 438926 BLAKE2B 1bfad3cb6b169cfcc12ea79d566c1897d7a3fddddac61f2c74eb129ff38d99b59dc713b1277a2d672b849fda33f54f7c99dc776080e983e908b7d2844d183fbb SHA512 99f336d44f2cb53f2f79bd65726ea5209023efe264207255161d3b8a0452082ed1830b70db81d8bf5ebbf40db66ed391eb000306b2af0918dfa171093b2680e7
-DIST ppsspp-1.11-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
-DIST ppsspp-1.11-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
-DIST ppsspp-1.11-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4
 DIST ppsspp-1.11.3-assets_lang.tar.gz 662203 BLAKE2B 0c1e0852c9ab3b3146f149713710e969c685a89deb68e5853f53426973563908350b9aca9994202ee3d435229bd7992ad5385a63fe87956c2ca142b2d5ca754e SHA512 8976b68ebc8b83ca34be1abe4499ca39c21c21af38b977925cd0d5ef456518fbb3670e8a5f35320bb5037a1dda4603614fadb7abafad8378f45f7713743fe39b
 DIST ppsspp-1.11.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
 DIST ppsspp-1.11.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
@@ -27,8 +9,5 @@ DIST ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
 DIST ppsspp-1.11.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
 DIST ppsspp-1.11.3-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4
 DIST ppsspp-1.11.3.tar.gz 30067677 BLAKE2B 7c5456d38c55c6c1d6a873d869c6df4f31d271f3dec75fd0c5b4f1f4db6ad8a22ad456ba183f0df84d8e2d293bef6c454843f8149c186a86fcbee127aeee7d9a SHA512 5890ae34f2aa4125a816a0fade46a7422385a0652ff04470c56fe653e3a2a697d55bc77f1d7d119bdfa8dbad313d6a1de18a03d1960eaaa9e987b5ddcfed2f48
-DIST ppsspp-1.11.tar.gz 30064888 BLAKE2B e1865378a5938145fb1e7c5497ce2f8818a666141df64de3dde4813d2266409210ea3304e99c41a3bb21992dfb5868e2a09fbacd6e8298e5188c40f0bcf402c7 SHA512 de3c7a275151bb29db750a1e76f4c6b44990d85cb948a347acdc2f21013e3e730c1b04d72b4c07a9a21710eb449989da57b276530a0f2403ce4d954e4122b041
-EBUILD ppsspp-1.10.3.ebuild 3329 BLAKE2B 1063dacbce06ae1ac2d6195dd237383abb4a4692ea46975c3f24e3e077ab24cf50c75934d7f7eb51f76b5e2b0630cbfa6b1666c92ed8be414b55ac48c8d43a07 SHA512 ceaf7940320c49c307e034c7aa1722965c7237bb4f0f78385869ba81006b66f4fa6d30dc4f21bc0a657833fef7f258026d584e74aed65ad3402f7b84ba9b790c
 EBUILD ppsspp-1.11.3.ebuild 3383 BLAKE2B e7965bb10149f462062a40b2b8733af337a9fef8e03103be39c0a1c2329a3d4fe84e95f6024c69485ffa5e73ef0d18875d0b46e00751794412f35841a2f4abd2 SHA512 e802d25db5db6cab4944de324da7efd26de67442afe3d3fe0023530ba6165773389d21789dac527f026715a3473e2c8a4aed6663e4263a05416bf3395b183275
-EBUILD ppsspp-1.11.ebuild 3383 BLAKE2B 4d668c861c2ce79517e15ef6103eb3332e58981188e0f43f1b31ae2b8a8f4e0b67095f27f8700a75919549fe055b5645b1f3999988be3149789754ef5d7e2cd0 SHA512 cb919d03adfa36e52924d335d0c37f603f154bce6704b972de161ed9c1e9534b6eccaf2d9fb61086b5bf09bb94e82bde620467d2352f8215d1821cb2b0c2f470
-MISC metadata.xml 779 BLAKE2B e8db22082f3f23239aaf69468a96d48db9894270e2e13a4661a16d2927caa36ee570eca7ed6f91b72e3c3d05e92e78d4aab901f322cd9fa577e736ac9cc09d79 SHA512 a587761249d04fba1450e4d42a9390284dd7f9dd3713be7fba80e49222add29ffbedd2c4b09d04b47b5f8de04b3e111d1536de73230f0cf70996809652313455
+MISC metadata.xml 809 BLAKE2B 735d1ea6afe35e4eaaa04ce6b87f789d263403cb930431c312cdf1e7413d7d4beb1358105a712f486e8c33dcb12f0e9b423a711a91c12c8d2c2df10d489147d7 SHA512 4d148735f03f70e7fa3582ac3ff7f039148501b48cfeda8bab98cfa8ddae593f67b85d25f58aa8d35cb5ff82ce838237072acb1f674ae3dc42f33e307ed31cfd
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 946bf657ce0e..020b90344206 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
deleted file mode 100644
index c2d256e9a4fc..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
-	https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
-	https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ${P}-assets_lang.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ${P}-ffmpeg.tar.gz )
-	discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
-"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="discord qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	dev-util/glslang:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtmultimedia:5[-gles2-only]
-		dev-qt/qtopengl:5[-gles2-only]
-		dev-qt/qtwidgets:5[-gles2-only]
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4-O2.patch"
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-
-	cd "${S}" || die
-	local i list=(
-		assets_lang
-		ext_SPIRV-Cross
-		ext_armips
-		ext_glslang
-		ext_native_tools_prebuilt
-		ext_rapidjson
-	)
-	! use system-ffmpeg && list+=( ffmpeg )
-	use discord && list+=( ext_discord-rpc )
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sdl SDL2)
-		-DHEADLESS=true
-		-DUSE_DISCORD=$(usex discord)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DUSE_SYSTEM_LIBZIP=ON
-		-DUSE_SYSTEM_SNAPPY=ON
-		-DUSING_QT_UI=$(usex qt5)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s "${i}" icons/hicolor/"${i}x${i}"/apps/"${PN}.png"
-	done
-
-	dobin "${BUILD_DIR}/PPSSPPHeadless"
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.11.ebuild b/games-emulation/ppsspp/ppsspp-1.11.ebuild
deleted file mode 100644
index 01dd292fa6cf..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.11.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
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
-	https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/hrydgard/miniupnp/archive/7e229ddd635933239583ab190d9b614bde018157.tar.gz -> ${P}-ext_miniupnp.tar.gz
-	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
-	https://github.com/hrydgard/ppsspp-lang/archive/567b22525b115751ee3ae2ed2c8b046034c9dd8d.tar.gz -> ${P}-assets_lang.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/0b28335acea4f429ae798c5e75232e54881bf164.tar.gz -> ${P}-ffmpeg.tar.gz )
-	discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
-"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="discord qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	dev-util/glslang:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtmultimedia:5[-gles2-only]
-		dev-qt/qtopengl:5[-gles2-only]
-		dev-qt/qtwidgets:5[-gles2-only]
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-
-	cd "${S}" || die
-	local i list=(
-		assets_lang
-		ext_SPIRV-Cross
-		ext_armips
-		ext_glslang
-		ext_miniupnp
-		ext_native_tools_prebuilt
-		ext_rapidjson
-	)
-	! use system-ffmpeg && list+=( ffmpeg )
-	use discord && list+=( ext_discord-rpc )
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sdl SDL2)
-		-DHEADLESS=false
-		-DUSE_DISCORD=$(usex discord)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DUSE_SYSTEM_LIBZIP=ON
-		-DUSE_SYSTEM_SNAPPY=ON
-		-DUSING_QT_UI=$(usex qt5)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s "${i}" icons/hicolor/"${i}x${i}"/apps/"${PN}.png"
-	done
-
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 049de16dc52f..abb2dce51d8c 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -4,4 +4,4 @@ DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb7
 DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
 EBUILD snes9x-1.59.2.ebuild 2723 BLAKE2B e365643b7c13bae7577eeda034963a946e3dd78153696f09f95503d0c758115294f4295d797b6b7be2950c0e584afcb3aeaea57d55683f7988ca286aa7b70f96 SHA512 9a474aba0c8fd071f090bec4694ebc036733b6831cfb01e35a9b1fffea049340fe2cc0b1fe840dae93df03b3740faf65ac000ec58d71adfd465d11767cf917d7
 EBUILD snes9x-1.60.ebuild 2991 BLAKE2B 9a2d5693b97f433019ae14e810e0af21ecc555db588529c6a2e8134fd59ffd40376d7f34f04eb354c580aa4a32c0c00f2663203cdd6f9ba0ac49d64639916a7d SHA512 3d78def81d6043e51dbc1a3ce764d71d3c9830bf7691bf3c20f0f986e3fb4c1d54b5b3d0ed5cefb76eee1e76072ed40463c96a0b02c588a43d3aa81b129fac9e
-MISC metadata.xml 540 BLAKE2B 8304002a086f6f81fec68536747dbf2b94b422b96995278716b1fb45857f57c78cd4d607eca32dae5a055656ae8e24d3a33159a9967786aec6b21bfc5c5e7088 SHA512 0ed9371d537f977352ae79852442e760669a93394728c17b3bf17c9ea59d906ddcca1e56d04b38bf3059dbcb3563a8830e1e836b7bd72751f2bb5d196f481651
+MISC metadata.xml 540 BLAKE2B b42e960fcbc0ab7f001494ebc804c0cbd617d452eaffbdcb2c46a89ebfac6ddf2968f4eaea83fc522138e13f6898584acee695aa3f1c8e96b2a3e620a480ecbf SHA512 cc3155bee496b7a1061f6f23611c39d909eb893b43a6cae0400ef02884267b7a674a865a848b5b38945bd334984cda2ae20da16ce793d21481baac24c428f4bb
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 50035d2edc74..707bdd3880cf 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index a670e0d3d14b..f2071bfad1af 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -3,4 +3,4 @@ AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
 EBUILD vbam-2.1.4.ebuild 2217 BLAKE2B 98fa777793850a90ae5fbcf66a216558c7510257416cab28b7704ea6be912bf5bc695a7b702e28108bca86b3d35360410e2b68a042b37841f26283c5654f7af1 SHA512 6492dedea6c134f1a556e49c25fbc08c5ba8ebaa2002aa9234113aefdf905116b0ea83d36fb909f7e3bf5df8abd62da35682f5736ec3eaff27717dea5dd3507e
 EBUILD vbam-9999.ebuild 2119 BLAKE2B 9d3e53a9c113dd5c63bc133e3bd58734fbe8c1c338621a3696d9435be51883b85994fb12f2a417bd82a6764a9641abb5c2002b0172b25de8e1012d0798b75fe6 SHA512 0dea0eda480ad7876c58c665e2d3ecaf3b90d7d20ac2ab4174a7bca529ad654650507b97272939d5a1c9ae87e454b42fa55615554d1d886c89e5c15c9103d5b7
-MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
+MISC metadata.xml 479 BLAKE2B 30759101d60a04cac0854961a1fe46483098a26cd6d4c84ae386cf2b51ab29d3a776a85349fb2844b14d7292e11bde68a8908e9b6a73a7b14b3d669cf7aa988c SHA512 51631a92a54d308445bdf53798fbb88a62ee13a8864f1bb0a27cb52026683da2a60df6ca8e535db5cd084afea66af4bbf87f505a5acc439ee726a5985fb4b5b7
diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
index 599894ffa29b..cf3a6a17ca33 100644
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9200dfd0dcf5..ac6810dc5600 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index c98ec46a49fa..52d92e12f4ac 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,7 +1,3 @@
-DIST Box2D_v2.1.2.zip 3100922 BLAKE2B 1f2d2b201517ef2adb1b1a2c1f62f94b2f7cde6f857935dba11544b931481a2b87e036269f34571b99f5272b9dd985dcf463d153b628c54163166e2ae77d95d5 SHA512 cc50be6db8d02a4ddbb61208f67b05c264e24ab96885debc708b1b284957f18193b6a57d84d378cb0ba33ab3fc9a0f5c534b8ca9f8982e7e0fe656115cb5a82f
-DIST Box2D_v2.2.1.zip 3637276 BLAKE2B 844b589b43b916e20cb594ba160c4a025b2fb98bacb7c856884ec728c7b67f44ed86151df0b005ce1c813d74c8c55ce93e5060b4b9387662870cdcda9cdea76e SHA512 3d0d4eb06d9e2c425ffafb26839032cae897a4a82f27356ccad2fc764a02c3ca6dd53b24c51196291f5492f795356fb03575f8c75e599467577ba19165ccdcb4
-DIST box2d-2.3.1.tar.gz 1553222 BLAKE2B e21eafb9d807c5f241486c875bd8ee350c3e44601801b98d9ee35e2343244f5c72998cbc1e9f687d3a72033a76361a1ff7dd3bacad50f21212fca3618e887bb6 SHA512 22e31005644ae1f5a947149dee832286b0d5a96648a0e9766c32a9a047ae839b4354403eaf7040895074cf3bd33bb298e65053cf1b5b67a6a23fbf3fd5777dd5
-EBUILD box2d-2.1.2.ebuild 1136 BLAKE2B b5d377912d1a7d89bd97339230397b968d5c24611b088163c9c74c417bc460c5b39a40338645f1a2b7dab229e53c84a9affc5bdd36bd7bdf52b76c8d33e62dd5 SHA512 29ee13578761733925b56646d9059a92e2a707968389b848f93c5dfc994c4ffd1765b1387a329765c8bb94fe44dd4b52d0d0fcc3c1147ca4688cf1dcb4ca0f58
-EBUILD box2d-2.2.1.ebuild 1127 BLAKE2B b6722c13e2eaeac8435344b19358a43b7543cf679de708b050e5e7781a10d4ffd75841dfd4f586a44528951f2ddf24a6aa23e7cc88be2884512776ef75c10b82 SHA512 d9fd63afd1d8dc17a1915faa0d9b97bd3cb6a8c000124707f2a8983b74c56fd0328f12d271454a93988eaea88121d5f93530fc27bf80466cfe97078e59537de9
-EBUILD box2d-2.3.1.ebuild 1088 BLAKE2B 1cc2a9aeaab19c31d474f1f61174496630f57dba82b7781f66ec9e517b2bad0d3794a31e07c6b58027dfaea1278760fba538e103bd2ef6810fae8e8d906fc434 SHA512 abf079a59dd9170c073bdb3dcb0c56d812836bd8b9afd160f6079fae60e4b4cb441663590eb242e74b6aa1c8faade69acc032a178d9596f44b797ddddf4f8ff9
+DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
+EBUILD box2d-2.4.1.ebuild 574 BLAKE2B 3307f240c56e80e5fd715551b18fe7a41b9d7afbd5afec2dbf1dbeec470dea259c59715121062f966fa40e9826f651d1b281f02aab3b0ba9c9ebb4b47cd5adf7 SHA512 a92abbf1ea2430dc34e70fe820fc69ea7acf77779ea57282d07df51f75241e4cf1234f8e2b6f8143f4ab9d2834ab17d0ce052c6e12ba8764b28a276d938462f9
 MISC metadata.xml 333 BLAKE2B 8744749fd1f8ee25c33a64b870a484d69549b738d2f5d663bd0e10fc09eeb40b347e1bc32cc80b7623c2aef4c4b37d185cc06f42159396f368ca2917b0f06d84 SHA512 27fa995f144fdde8f6e62aed1d6bc68e830ab912f34a2f4f24b4fa0882a42f3cabd5f1d5f81361a1ce8311a5cc56156408782e16cae8c9faa621c98c2b64bcce
diff --git a/games-engines/box2d/box2d-2.1.2.ebuild b/games-engines/box2d/box2d-2.1.2.ebuild
deleted file mode 100644
index 953853c49214..000000000000
--- a/games-engines/box2d/box2d-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${MY_PN}_v${PV}.zip"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}_v${PV}/${MY_PN}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc Readme.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.2.1.ebuild b/games-engines/box2d/box2d-2.2.1.ebuild
deleted file mode 100644
index 5663da2c4f6e..000000000000
--- a/games-engines/box2d/box2d-2.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${MY_PN}_v${PV}.zip"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}_v${PV}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc Readme.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.3.1.ebuild b/games-engines/box2d/box2d-2.3.1.ebuild
deleted file mode 100644
index 9a083d4ffb02..000000000000
--- a/games-engines/box2d/box2d-2.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://github.com/erincatto/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc {Changes,Readme}.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
new file mode 100644
index 000000000000..63093288e008
--- /dev/null
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ engine for simulating rigid bodies in 2D games"
+HOMEPAGE="https://box2d.org/"
+SRC_URI="https://github.com/erincatto/Box2D/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now
+		-DBOX2D_BUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index ba384f5fd5aa..6bc01f0a0a16 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,8 +1,5 @@
-AUX gargoyle-2011.1-desktopfile.patch 1265 BLAKE2B 1fcbc1eded032ef11ef357e03c614067b18c21a268b4a3bebe4516a0ed196660292b311c9769d66853ffbbf2535808d014991bd42155919b913965223a4523dc SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e
 AUX gargoyle-2019.1.1-QA-desktop.patch 575 BLAKE2B cce93727f67123cfe2b51003f11e1e61eff08cf3444aa7e07c174b332f5b060bc88f32ddc592ba9011ac19d8db264c883bbc0d559a8eb0107190c8ec1323cd24 SHA512 95a796e74edc7e40fe93359c069423c34129b4f21077d8af009eb9ba87427aeea92717fc20530ad3c2df657241f9e6a703c860c3c20d9025a4cb374a932ddb44
 AUX gargoyle-2019.1.1-fno-common.patch 4214 BLAKE2B b7ad557f850ef719dd946a33f8878307d6480fea4858cb4638e3ae3074730af157d8dca8ad744c19e22ad144d319bb3bc4f48adeecb08bb3e8455f8ad1130b86 SHA512 57edc11c3403930009ccfa7d583b1553bcc1f4cd5f9d5ae455c48dc24d9bf9b0328d4cb0dad59b1791fcd9d5dfadfe94fdad6af6d514abfd50de8e054edc5b36
-DIST gargoyle-2011.1-sources.zip 11291660 BLAKE2B aac47c41bd02e772c4717dfdeae8678105f72704641ea3df39105d412afe61734cc43f863b9556e38ea34287259df9f4d72ae93b3092d0372434b9f59f99483d SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f
 DIST gargoyle-2019.1.1.tar.gz 14700448 BLAKE2B b5e6d43349d01fe3484abc7779cfe3f1e94c3f6d647d338f8acbfe97d160da53b6297273e67f84eb0409623bbb4c0d8e3008d42b16a800d756be71a02538969a SHA512 0d1f2724bd6227142eb67c146557a992a6d62af172398c9961511ce5c080e517d1e12ca9bc6be27c1893e404026256257bf3a04cb05923723c0886f111adc4e3
-EBUILD gargoyle-2011.1-r1.ebuild 3017 BLAKE2B 12371e41ca78403ba1452da2a2c5dbac287912b8dbcd7afe524984b8442bb4cf5701f3073f27a64c5adadccfebfaaef9e543b883026b4eae4b185cc151eac6b7 SHA512 0daa2b0ef761c935d0e7d47fd42060ebf5db4331634bba8e1812a619d8fb31cdb0f2aec197cf7d30e1bff357ccd60888ac5107c7e9644f8ddeed9520a9b1ac9e
 EBUILD gargoyle-2019.1.1.ebuild 2989 BLAKE2B 7712b3e50dacac2367255255c397efa8464926c11818d0107ccca1a508b5e5d042876d9c8d2b5945a72a5e4f991aec3489691a43a3e3177c2b6204cfe7062c93 SHA512 1e99de443969ce19b920a88d0804678413ff100b7e10b87820e11e342d9eb4ca8d4450c0f7b26c3ac78e311f485e7df927e1860117245a5ecf2f511890141366
 MISC metadata.xml 331 BLAKE2B d9f9a1a7d19b6e1a3dba3dffa81ac1c2518a4d942eaf65dc782f7dc7b0082adb67323ad4a07eb51bfe4f87f8f0ead0e1881d8b52dcd674979fb02b3e3c95fcb1 SHA512 3ef20c56a0d8d2faa87531fe4049f045840a629e3994fa4b90f6ba2c30629747a64fa372fc37ab77df74656823cc3e09ba809c6cc0c1e7c96ace482c75daf712
diff --git a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch b/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
deleted file mode 100644
index 6b66328da016..000000000000
--- a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 21 19:06:54 UTC 2012
-Subject: desktop file
-
-fix QA issues:
-
-# desktop-file-validate /usr/share/applications/gargoyle.desktop
-/usr/share/applications/gargoyle.desktop: error: file contains at least one line ending with a carriage return, while lines should only be separated by a line feed character. First such line is: "[Desktop Entry]"
-/usr/share/applications/gargoyle.desktop: error: (will be fatal in the future): value "gargoyle-house.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
-
---- garglk/gargoyle.desktop
-+++ garglk/gargoyle.desktop
-@@ -1,9 +1,9 @@
--[Desktop Entry]

--Version=1.0

--Type=Application

--Name=Gargoyle

--GenericName=Interactive Fiction interpreter

--Comment=Interactive Fiction multi-interpreter that supports all major IF formats

--Icon=gargoyle-house.png

--Exec=gargoyle

--Categories=Game;

-+[Desktop Entry]
-+Version=1.0
-+Type=Application
-+Name=Gargoyle
-+GenericName=Interactive Fiction interpreter
-+Comment=Interactive Fiction multi-interpreter that supports all major IF formats
-+Icon=gargoyle-house
-+Exec=gargoyle
-+Categories=Game;
diff --git a/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
deleted file mode 100644
index 82e11b237828..000000000000
--- a/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
-# interpreters are licensed under GPLv2, BSD or MIT license, except:
-#   - glulxe: custom license, see "terps/glulxle/README"
-#   - hugo: custom license, see "licenses/HUGO License.txt"
-# Since we don't compile or install any of the bundled fonts, their licenses
-# don't apply. (Fonts are installed through dependencies instead.)
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
-HOMEPAGE="http://ccxvii.net/gargoyle/"
-SRC_URI="https://garglk.googlecode.com/files/${P}-sources.zip"
-
-LICENSE="BSD GPL-2 MIT Hugo Glulxe"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-fonts/libertine
-	media-fonts/liberation-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/sdl-mixer
-	media-libs/sdl-sound[modplug,mp3,vorbis]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Substitute custom CFLAGS/LDFLAGS.
-	sed -i -e \
-		"/^\s*OPTIM = / {
-			s/ \(-O.*\)\? ;/ ;/
-			a LINKFLAGS = ${LDFLAGS} ;
-			a SHRLINKFLAGS = ${LDFLAGS} ;
-		}" Jamrules || die
-
-	# Don't link against libraries used indirectly through SDL_sound.
-	sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die
-
-	# Convert garglk.ini to UNIX format.
-	edos2unix garglk/garglk.ini
-
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
-	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
-	default
-}
-
-src_compile() {
-	# build system messes up flags and toolchain completely
-	# append flags to compiler commands to have consistent behavior
-	jam \
-		-sAR="$(tc-getAR) cru" \
-		-sCC="$(tc-getCC) ${CFLAGS}" \
-		-sCCFLAGS="" \
-		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
-		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
-		-sC++FLAGS="" \
-		-sGARGLKINI="/etc/garglk.ini" \
-		-sUSESDL=yes \
-		-sBUNDLEFONTS=no \
-		-dx \
-		-j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	_BINDIR="/usr/libexec/${PN}" \
-	_APPDIR="/usr/libexec/${PN}" \
-	_LIBDIR="/usr/$(get_libdir)" \
-	EXEMODE=755 \
-	FILEMODE=755 \
-	jam install || die
-
-	# Install config file.
-	insinto "/etc"
-	newins garglk/garglk.ini garglk.ini
-
-	# Install application entry and icon.
-	domenu garglk/${PN}.desktop
-	doicon -s 32 garglk/${PN}-house.png
-
-	# Symlink binaries to avoid name clashes.
-	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
-		level9 magnetic nitfol scare tadsr
-	do
-		dosym "../libexec/${PN}/${terp}" \
-			"/usr/bin/${PN}-${terp}"
-	done
-
-	# Also symlink the main binary since it resides in libexec.
-	dosym "../libexec/${PN}/${PN}" \
-		"/usr/bin/${PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/metadata.xml b/games-engines/metadata.xml
index 9e9c62112e6b..2bc4c609093b 100644
--- a/games-engines/metadata.xml
+++ b/games-engines/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-engines zawiera silniki gier.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 525b872dabb8..7577efe392e3 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -2,4 +2,4 @@ AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951
 AUX odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch 879 BLAKE2B ac627db089ddeab8d4c34601b44d70a54e5de0a3e7bfdb6eccf3c0798df81526df5e7be97323b5c33f8594c5f83be8d336cd23c6aadd34eb7046b0ad32eca028 SHA512 67a48daeb9774694ed957e4583deddb6e19e1bac965e823c5c165165013b987d5c0ec62e2272ab5e75694270b2c0f793d5bbef4f4946e98047a17c897ce45a77
 DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
 EBUILD odamex-0.8.3.ebuild 1801 BLAKE2B a96d8efba5ca414b51ac6a3d45e381ae6fc2ecd2dcaec437deab66338152c4f5bf056ea6cb4a3d6505266a0535a39019a4f9a65c8c4eb31e05af9ab7d9284d60 SHA512 3c443abd87b5599f74413020e4f84d5b273357117717dd32b7d8ac3a76dd2c6a33a977878f765a0a793a1994fade7e6ca11c2faba425322203a4258472218cd4
-MISC metadata.xml 1530 BLAKE2B c577ff15a5e7faf7d96eda89d9467c762851aeaf320ba2f42f8f767fcd68c8a78650ec39398cfb07e0d2804a7142ea1b90fb29e9af967ddbd57b5a1ba06fd395 SHA512 456673f333febcbedb51e65b690ddbf37b125ec90a05cdbb7b130a94668cc0b4e095879d8746255f0db342702da1d048a475d0736b8dadf196b399a65c9e237f
+MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 29a83742d57b..ac392af534dc 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index ba5773fb5f51..40640b5bd5bd 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -10,4 +10,4 @@ DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 EBUILD openmw-0.46.0.ebuild 4225 BLAKE2B 1117efd4e942dea2e6f84fd8cb544524acddc42cf8befc7ed0f8895ec0faa26143307669fdf5f8e5c6cd4f7412e947a1d7c64caecc3df3c98dffc7986f0f0c51 SHA512 a75ff440c5dcb63c33432accc9eb9e3ca647c6feb1fbed910afd649e2b668c501e9cf05d58cfb8db67432d0e050e739fca0e24ab1aa5f1aaab0ec53750b93784
 EBUILD openmw-9999.ebuild 3766 BLAKE2B f8d83102b723c9be576499f7a50ba9fefe59451fb3c7ae6e9a38e19690d776488a6b015375b6830749a1de211b440c5ce54d2bdbd3ff535822940206873692e7 SHA512 80c47896eedbeec7becfcc62d1cad2131363795021fb7ce5243c268475d2495a1dc4ed280e3103e606447bb70508e1660470eeed3b819a8d4fab1235f33067d9
-MISC metadata.xml 1423 BLAKE2B 6d7f6b2805b52571b305668ff9120318c3f2d87719f8e51e644b555c62ea9aaa4afa0f3a23ff67c8a08e04cacf3bdb3d9f7295985f980c27b57b53aa7b55c5e2 SHA512 31e201da1c43b973a57cf51276022c7e39371210ec2eb505f362cad4e669b5aef1f503e2511473880f2313b91a8f1f128db425f9538f58b7fc52df24ec066feb
+MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index d1fe5ab9e392..adf9098884be 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 8752f15d3815..874338efcc98 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index e1e93b446e13..2f31d10e0c14 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -15,4 +15,4 @@ AUX chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.pa
 DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554
 DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214
 EBUILD chocolate-doom-3.0.1.ebuild 2544 BLAKE2B 9640e7b406854a3e6e476dfc11d41c684162658d52a4f37f0db316be76dd4c50cf955a36e93c1ce58e396df0c12b7225b095805e29aed30cc262416d06b78bfb SHA512 81e05cf2d3660bfbf8897b5f82efd3ca02c70dddd84cacd4014bc5c785004018c0a5eebec1333ec48912eae8eb6e7eb9c918f59bc51a33511ddcfcaf9748ca5b
-MISC metadata.xml 1003 BLAKE2B 7d7f22f55c7c99f6578170dbd54c5fb069659e84014435de02b9b4aadc5db709869037f0b3289627e2ea599d9c6b4ee8dc72105efb7618d8a0b067ac916863b2 SHA512 792c554618194cd1a36ee2ec6eab0b63efc7485ea5097059c749beba812f0af3ef53d455c62f74d558efba2a0a906c92cab82e78ccca8f4e55bb298525baf2d6
+MISC metadata.xml 1033 BLAKE2B 29efd90d416ae1858245ae325e5451acc332cf61a5f9eefe2a5da8028a3514f75f6ad8c87a5e5124c35912f7ea4b8a388d8b0fe9c5e733f05644a082bc5958f3 SHA512 e6357dd32a02f56989d0f9315fd8a77f20fcb9ae5950d35cb19eaf3d7a9f34837be51ec1c833054bfcdc742819c32db68e45d0545ea91966758f4fabcddf7eaa
diff --git a/games-fps/chocolate-doom/metadata.xml b/games-fps/chocolate-doom/metadata.xml
index 2b0187cf2a63..dbe20aab0de1 100644
--- a/games-fps/chocolate-doom/metadata.xml
+++ b/games-fps/chocolate-doom/metadata.xml
@@ -4,11 +4,11 @@
 	<longdescription lang="en">
 		Chocolate Doom aims to accurately reproduce the original DOS version of Doom and other games based on the Doom engine in a form that can be run on modern computers.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index adef9916585b..3f7f819e1e23 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
 EBUILD freedm-data-0.12.1.ebuild 1088 BLAKE2B 83884cd66cbb93b2c627af4a88b3a7399c72933d6fe38560d08aeeda08a5c15959cb7b2ae4437312c27ba72e8e839015f0124e21c756a846a3e44cdc0f0b031f SHA512 1e52fe1c6b827f7c2d02cd5816fb977d730f49a22312883dccc2576b7a9df6c708fd17c14a08203f3f135f6ae28fd909d0aab771d746644294d5b4f3a141641b
-MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
+MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm-data/metadata.xml b/games-fps/freedm-data/metadata.xml
index 5a1b13afef99..272ddacd2fe2 100644
--- a/games-fps/freedm-data/metadata.xml
+++ b/games-fps/freedm-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -16,11 +16,11 @@
 		powers Doom is free; Freedoom complements this with free levels,
 		artwork, sound effects and music to make a completely free game.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index d4b2c6e6eab2..d02f29b773df 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
 EBUILD freedm-0.12.1.ebuild 544 BLAKE2B 541a16219ff289e542e87c561484db201d4b83c8f3345e814777e1da614c843cb0da23e6329693d852fb7764c85ece0b6ff57e749f977081602559af3bbafad1 SHA512 7a5e483634a5f5bdfa3657b6bd00b8824e69117b1fc58c4aab1b5dc33e27ad232a2716b8b6cd0ad1d00e47d5f329dbeaf524a3f81cdbce34da03efcb6e2c7537
-MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
+MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm/metadata.xml b/games-fps/freedm/metadata.xml
index 5a1b13afef99..272ddacd2fe2 100644
--- a/games-fps/freedm/metadata.xml
+++ b/games-fps/freedm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -16,11 +16,11 @@
 		powers Doom is free; Freedoom complements this with free levels,
 		artwork, sound effects and music to make a completely free game.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 667ead0da509..d2d492a9f1c7 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
 EBUILD freedoom-data-0.12.1.ebuild 1120 BLAKE2B 1f56b537fa526bbe8cf92f9f429ff4ceb9e2e2ec1540a8654286927abead877cb6b69849c35374434eaca531319ca666ec948249bc423db5d1d7bfa91194851d SHA512 548927cecbaa06a7e983addc2c9a01b319d1f0b43eb4a15a5fc414b486d754191fe5034ef2b79e2c8e2108950ab994a5209ae14fe2cfce25bf869105f2b3f77b
-MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
+MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom-data/metadata.xml b/games-fps/freedoom-data/metadata.xml
index 08a722785b1d..1eb26e8c6cde 100644
--- a/games-fps/freedoom-data/metadata.xml
+++ b/games-fps/freedoom-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -22,11 +22,11 @@
 		The levels in this game tend to demand more skillful play than the
 		previous chapters. It is compatible with mods for Doom II.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 4d8b576b33e4..5527172e31d6 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
 EBUILD freedoom-0.12.1.ebuild 571 BLAKE2B 815e7a39e6b85d54e9bb68382ceb2b71577c0b1e903a8bd5eba258adfaf711c5e23c188dbe43722f80547917570affc4b780eee62869094abc7c10184b72938a SHA512 afafa4a4624910fb1d1d543eedb7c15373ff7d4d2ef50773da75e225d610263a52b6bb7e8232f9234204ba5e53795898de03e4254e399c9eba9e432d445c2d4d
-MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
+MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom/metadata.xml b/games-fps/freedoom/metadata.xml
index 08a722785b1d..1eb26e8c6cde 100644
--- a/games-fps/freedoom/metadata.xml
+++ b/games-fps/freedoom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -22,11 +22,11 @@
 		The levels in this game tend to demand more skillful play than the
 		previous chapters. It is compatible with mods for Doom II.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bfcf2da0d7bf..0114d5e71432 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -2,4 +2,4 @@ AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
 EBUILD gzdoom-4.5.0.ebuild 2196 BLAKE2B 915de421f5b481f388012a0691e98d2fda7dd69e83b516c1ff423f738f53a5ef8daf3d69f0f5ca5b41b0acd86d4d9bb9e162601d3ae3f9846efd32115358625e SHA512 81541486477c9ecb14408182658ebff6250120d67717ab0d0d9600394628967b53ed93d64ccb2079baebc7dcafea4bea8ec303e100b819dc18bd8e79549928b8
-MISC metadata.xml 749 BLAKE2B 31dc8aee9190f1a3ff9cdba8f633a277f4682c6f4341e775b4647f5456acc8cdad6f79ab95adb375b0f2ccf1236a6140c8121a97e8e5fc96c983dba9e0573af8 SHA512 89029eab8196aab0a096432df15d46e224309efeeda04528b6519d589d16dfb73108abf4044823c1c632c2e9e38389b2ed3096e7f9f3400cf8a5a7b34298e0c2
+MISC metadata.xml 779 BLAKE2B cb0548bb6c9b5c7bccca5e56e76d7d86c6977d371c1c046e9cabdc9e0e0b6f2885c3a6b429e7ae55f965959d876d57ba63c299cc4cb09e668a81bf73a817e845 SHA512 30d36b491fb892a452ce739db6739f98cb593ade08df268837114a9c797f0fe0816b1fac1f7d9a4e131358fbab75a047c26aec1d1db50d30821be02af39be250
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index a805c66b7d18..c3186a37b0bb 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/metadata.xml b/games-fps/metadata.xml
index 9df41d653f06..f9a0596eef41 100644
--- a/games-fps/metadata.xml
+++ b/games-fps/metadata.xml
@@ -31,4 +31,3 @@
 		osoby.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index b4033515b033..7401e8a5116a 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,4 +1,4 @@
 AUX prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch 1141 BLAKE2B 0fbb9af4874c3bcdec3ae822e7b1f213d68ece3381ad80a75ea0fc5f5f8b5b872fa07def7729e38c5a74b32fdf4bc33d748cc6a3f29beea58eff9a08b9508647 SHA512 4da358bca4d8034649842c7b96c22a087e18c5c8263a7e74e5c9d7225102f14dd071223dd0ba8c3f75bf9c57abd9fc475017299a435fae6dfa07b86fdd7ef741
 DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B 00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc011112bc8764da78b34215ae4c00b490f12820b26704e45 SHA512 c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
 EBUILD prboom-plus-2.6.ebuild 1845 BLAKE2B eb9a95fbee8274dd371c5dc5e402d3356f4ceeec6c7d1eef997ef5a2ab93c9fbf8191dde475d4a8bc7bb9993f99cd85444d4f03c2e8f8b644fce834b5eca378f SHA512 fd3592ba16a0ee0af7e686f893533e7bbe4900d641c383dc951cf77f25b4d6f22080b824dcad098ae04c22de41878fdc29a54c7f20492bfcb92c0cc43bbb1675
-MISC metadata.xml 1897 BLAKE2B 11935d4ca429c123e759fbe7e32ab94a8f8783fdba95d0c65bbd2780f8f86110007c897f0530407647e5aed1603bf962a171234298676779b1e32042aa4c8258 SHA512 e5d67ba4b226cf843fb473bc08727c4431382a8fede6c43f4699b702bff0dd6747306a3abf205d2fd00f11bd421493cf2c8967726bfcb5c18314ee6fd35d1417
+MISC metadata.xml 1927 BLAKE2B 5a33a90f12cc0d874a785cf75d3e58297bb7f6ff659b8b9717f88d298afbfabc78bfadd430a2c0054b7100bd382addf1faf030366839f4cbcb467b790ee7df56 SHA512 519799ce6c90146f96eee844488085f0c2d42a59a88bfcdb024fbe8209fb584f2b89400de4f882c55ea05993d054cf6542649b2b62b595cd91f020157584e28a
diff --git a/games-fps/prboom-plus/metadata.xml b/games-fps/prboom-plus/metadata.xml
index aa68b85edb34..0ad9167f34f4 100644
--- a/games-fps/prboom-plus/metadata.xml
+++ b/games-fps/prboom-plus/metadata.xml
@@ -12,11 +12,11 @@
 		variable gamespeed, re-record, walkcam, chasecam, full mouselook, FOV,
 		and other features without loss of compatibility with the original Doom.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index a9d45e97f6e2..ee12bdf6a0fe 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -3,4 +3,4 @@ AUX qudos-0.40.1-libpng15.patch 205 BLAKE2B 254b56d3933f6eaa5c818042b7875c978c88
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
 EBUILD qudos-0.40.1.ebuild 4165 BLAKE2B f998c2ae42671295d371113637686db876c8ed969a1f32e5dab66f907dbce5c86e45998e02a6ad45c70dea873033e628b130e1df51ae38d3e7e6e214c71eaf4e SHA512 9ec0d0d19f668e40a12c527f26ef777fd858fef545372afbe4a7674543f3862e5e286154ad30e1e2a0184627510e3338ff2f97856886f76db9512fb89fbcda4e
-MISC metadata.xml 665 BLAKE2B 1f84309c0351baa3d365661d5840a05358889318eb0d42c4e71a42962b730bfe87f3e4bdee7a3f79f130d4d727f33e98ae5399eaa0f0f2aea4594fd5ac648888 SHA512 c96f5c164edea2f535115ca1fdd9ff39755f2be2a3f8846eb91d22e6d12f6e0e589e6d7e97a69d0afc65464df62390117296a27bb7b4b2e8da79735b206e5966
+MISC metadata.xml 665 BLAKE2B 75a147828cd25bf29c05817fb232f5b11f33fbc12700f2cd08802300d545440aa8e800197e18ffcb1c4bd1de9997c98518cf19570954c1901b9fa3226c49dafe SHA512 d48f88a4c7f4be692bc6d5122634c5725282b1c5ca467ce75e317aa16550790a3a58569960ced134c18b5a36ee33b89a15834ddcc0ee35a4aa33ead7832e2f07
diff --git a/games-fps/qudos/metadata.xml b/games-fps/qudos/metadata.xml
index 114138906332..7316205b7737 100644
--- a/games-fps/qudos/metadata.xml
+++ b/games-fps/qudos/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
index 08806a64e462..fe940e2dacf2 100644
--- a/games-fps/redeclipse/Manifest
+++ b/games-fps/redeclipse/Manifest
@@ -3,4 +3,4 @@ DIST redeclipse_1.6.0_nix.tar.bz2 898467399 BLAKE2B 85b4d02ea95cc44d902f6512ec5c
 DIST redeclipse_2.0.0_nix.tar.bz2 948705751 BLAKE2B 00cb03320f80433db1cc5bb9b895cdc829453e64e32d0e481eeac6c5dec9332b2e763f511bee4e9917b334d3f383c2c2a2605dfbd07cc73ffeb3f8efb90278fc SHA512 179a8177ddafefb09de38629c7cc15e8843cd49ad3580093c9f4243dd0d2d2fe095e8df770c2a8f3996d4e273822d6bc955acca73f8191266adb95a34beaf6dd
 EBUILD redeclipse-1.6.0-r3.ebuild 2012 BLAKE2B 5dcaef0b90f51dc7b5d23107ebdf03101383a4c39e58fce82851b24f08431477bd21bbc17347087e3db9ad00c46a38cbb7bd1ed1f64af0246bce7b24a872cf37 SHA512 e62090569d98899300906ba5fb84a167318a568767dde981035630695adce9364445d3e4a113d41ac773d8a912567672c6bae2da6b64125fb7f5f93a8d55935e
 EBUILD redeclipse-2.0.0-r1.ebuild 2000 BLAKE2B 90f9be0280dbb5ca1ece46c8fd3631bd90dd8302778d41aba8b396aa2df1d9c0f40744a96b16075e12b5fb32d366a28390b1264ff259f17d7f5e1fdd6940bf3c SHA512 7087b14112b928efe399fc7a36b780ea4d4448bfc61731870ad14a33ac2fb57a8c72bbdf37701b36a37ab5d7c06dc8db6aa457b35ce85f5ea06e3c3f35e66ea2
-MISC metadata.xml 574 BLAKE2B 6a74f40eb547d6ebcc8ca987609c22ebf171cde9286351e2f459f8eb95e8545399dcce6107540c249bdfc0a431f3282a50ae8a1fbe6239cb1b372755dd638c36 SHA512 1f78ab3ec83d4c8887f2f15addf8935f0026a8494340b346ae4c694fd7bf753962830274c572036490d514b2683df8164f9943b6714cff8cebaba896d70d549d
+MISC metadata.xml 604 BLAKE2B c88fae4b32ee63fc9c4078c733372fd2bf6144d4e62758d470467fba30382291f6c7bfb5b9f2f353968c661a6126f52fd45b49d68cff81caff05d47fcd21907c SHA512 e9e47ab3e77b6f3e72e880320ffcaf7e7055e302b712052f72336a09e1e63f99d7e3280cafed6fe9ee0f82c3fcf7a1fca8289dee74266b152af37762def3bb9f
diff --git a/games-fps/redeclipse/metadata.xml b/games-fps/redeclipse/metadata.xml
index 82f11922de55..fa92f3c8eec4 100644
--- a/games-fps/redeclipse/metadata.xml
+++ b/games-fps/redeclipse/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitsunenokenja@protonmail.ch</email>
 		<name>Rob Levitsky</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index 20152e1fbfb4..8825a910ccc2 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -4,4 +4,4 @@ DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730 SHA512 f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
 DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577 SHA512 05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6
 EBUILD urbanterror-data-4.3.4.ebuild 1671 BLAKE2B 76bfe75221c0011abb9b28451d538591d619bd70a939fbe7a5f10012d9f2b586890988562da893dd7a36a1b6df5fcfe99faf52937ddeadb29136f7d44bdbeff7 SHA512 b3c92a2c96e684577a9a1072108315f9b97458cd9596b919d615d8b867bf80b93b74bb49a353b134f241cedc8a88ab738e06bc67a12eeba8aa3a64040181710d
-MISC metadata.xml 480 BLAKE2B 8a3fd7bc4b93959b7d499e9454896285f8bfa4e1abeccf08b3d419f278d51a1e708fbc261d69fd42964e2ac04b5c008a1b22d2f6ad3e275e762c9ace799bc8b7 SHA512 94c46a1dffab072012fbdda9831db4ed465561866d5f3c7ba01045ef6424780f690bfdf381dd32664f1237b65828fefa1199cae98c5fd23757ceda76142ef5a9
+MISC metadata.xml 510 BLAKE2B 0d50fe48f57df2a45129154684e758d95611afff76e0128d87d0eba7dd18c546e2789809700ee52df6d278528f4006ae521a7165ba3d173f35d068920ba9f716 SHA512 552ca6daa2d16164a0dd06c772f358a24d458b2a3ab9cfaa46f43563a96d2014c7cc91e28e392322be8333452bd4028f54537ce853ffa2df5e0884d388ad3e57
diff --git a/games-fps/urbanterror-data/metadata.xml b/games-fps/urbanterror-data/metadata.xml
index 866bc44b9828..fd5c8b0ec319 100644
--- a/games-fps/urbanterror-data/metadata.xml
+++ b/games-fps/urbanterror-data/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 1b561222d610..406d94da6a46 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,4 @@
 AUX urbanterror-4.3.4_p20180708-fix-build_system.patch 2736 BLAKE2B 1feaa3012915877abfc2b10b3ab602f9047d16ae7c69a234558aac286548eb91d9e49dcdc41cd51e7c0c9d28b1545a66e0b54a1cf996a370515bbba811715853 SHA512 9afd32a706d6c5de39b6fc1a7d3831873e2fbaa3e13ae41046b6e7a1e639c22bcfc7e2e61cff8d0fb87094b4dc31157c7f4d6f9ea7b1b97504bf40a61acb0906
 DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd SHA512 ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2
 EBUILD urbanterror-4.3.4_p20210304.ebuild 4472 BLAKE2B da2f63c10ffe5a9fd3b7208824e86f63b99ceba176b61fe24341799c1aa0e44692021d5915e4bd00796db0fc1277fb0ce9b3f5da8feeb9d40d94183477310e7b SHA512 24d90ac6b16264da072a62e8a3552ad617e94dea2fbc33939264f54c05891f723d8cd9634ff2b076e28715834eea978aa41f5fdf827f515708a6ccd6fef26b71
-MISC metadata.xml 1058 BLAKE2B 7e000518ec710f0a6d93d7bdaf28a512e60412bb63bccc7ed9f5d40585eb03ead1515ee26d97068c33dcf41fb45ab15b8296e40ed522fceba1a50958cc488690 SHA512 7bbd3c72cd0fe48c428fd27979289dc8ad68a743cc6e73fdf5c9286007fbfa5d0529e68495af0679c47c6e4b367d3801cec625d07a688ec15269db30d4d51ae2
+MISC metadata.xml 1088 BLAKE2B 8fed7ed20676b27ef1fb41044fbe1d712ad1be943f67397d90bd28c817fa8e7dd208a8cb6ec9973eb3e6334f4c17cb69ba196d57c287d86e5fce2b23562aa557 SHA512 5fba940fbff3f5d5d5177c1b5f17d3887c99d71c5d2578c275a1f70f28734e33e90afc433d232eb1f39140d1f7fa485c3df329f07d5aa9f281b03c4982aa2d3d
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index c57b90db2fc0..0cfcaf5f6cad 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index c58ca3330b82..088d4af21c84 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -8,4 +8,4 @@ DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
 EBUILD yamagi-quake2-7.43.ebuild 3557 BLAKE2B c2c91c9acb5f74d6b814d14cf32220f0187936bdf8e3c59faacfbe7a9b827a418faf5f32bc795d346ca53ce9add23242ad1d65b8666597cf9c1afd012cc29716 SHA512 8dc27738707ce59720a9685d926ed92df1995c772264a45c3bc5de2b6057253a992e3b3aa4e01a7baec792662e1f3fd8be7ef702c7c9c719cc7dee380e0b0d7b
 EBUILD yamagi-quake2-7.45.ebuild 3505 BLAKE2B ee81e8ec438825670f846c562713c95b7e93a1e77ac88dae61e25bad137376a3076a5dee28435ee03989eb41a40e534d847e68b809610bb2bdd7fe2a3e1c4963 SHA512 5f7391f6fc29d61b819400e9391f54788e9f457cf6d3ecb5bf6120601e615e1edcfd5e78046f50da1e0b2eb052a3b80d59b83d174bd52dabd7af4344500e705e
-MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77
+MISC metadata.xml 932 BLAKE2B c7754bc8d2a5f53d84108283e176df88686573e80e632c37f7d09e2fa2dd0d1e708adf3a04004c14c74f088bfe873593cbd0b7448fae9b0d308f312533da81e6 SHA512 b0ff273cc5e2594b7a5285e1f094ac7505486f221a46d784ba167f57a625ba1d4222369d006f9cd31ffccefd42dd1bb7015c9aa96d236be52e4484d04ed70215
diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index 62861e43ce57..1e4e7f687ed0 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 3f5f2a810465..21300e92befe 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/metadata.xml b/games-kids/metadata.xml
index 8836465ca306..18f1430d7861 100644
--- a/games-kids/metadata.xml
+++ b/games-kids/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria games-kids zawiera gry dla dzieci.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index ddbbf5c82bbe..9b19680d702f 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 9428d3ef7c06..ce6aa75e33bb 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,3 +1,3 @@
 DIST opengfx-0.6.0-source.tar.xz 9693320 BLAKE2B cb1d25fb038b3b481c0abe206426b5843c2f7b81b7cf81a525ebf8b217359c5ea50c0e1ee1ed37d5093a0186231a1e1b9134624a8b69362f6733c6c13d5e1500 SHA512 275b9040e6938bdd5bee2d39361e0b78f447a8e497cc8ff018c7874dc16a357870f8b560999ebb2f2f0b275644c7c9ce85c964875f5a798e2ec45e62a8bc768f
-EBUILD opengfx-0.6.0.ebuild 907 BLAKE2B d8735c660e9966316a17fefcbbea22cf664756554dabd2fb62e6c8518a32e3e9ead95dc9c093a7265ffa90b17f87e510e32c787d135902b97a13cde21cb612a0 SHA512 db264a6e5ddf87064c0629fd798a6f0d02440a1278d653387b83cb60ea71118de2d800721ae5ee7f9626b9b2e3395acc2f00bed385d0313530e4699792119383
+EBUILD opengfx-0.6.0.ebuild 1071 BLAKE2B fe484ff55815c0a3637832d27d592678fa5caaf6806958f88563f07d48d85a0b10a4ced7aade17572d2a03c70d2fb754e916b683afcd57388aa95d5d094710ed SHA512 23473534dce3d7c5db504ca0a57f52de1258599c45989056d5342444617f2bcd791fdbb3f1d27589de2b3d72082a7406617ad5826a7d487aeb27799a8e6aede4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/opengfx/opengfx-0.6.0.ebuild b/games-misc/opengfx/opengfx-0.6.0.ebuild
index 7e39ffe5a490..e2ab2499de5a 100644
--- a/games-misc/opengfx/opengfx-0.6.0.ebuild
+++ b/games-misc/opengfx/opengfx-0.6.0.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PN="OpenGFX"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
 
 DESCRIPTION="OpenGFX data files for OpenTTD"
 HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
@@ -17,17 +20,21 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 DEPEND="
 	games-util/grfcodec
 	games-util/nml
+	${PYTHON_DEPS}
 "
 
 DOCS=( "README.md" "changelog.txt" )
 
 src_prepare() {
 	default
+
+	python-any-r1_pkg_setup
 }
 
 src_compile() {
 	myemakeargs=(
 		GIMP=""
+		PYHTON="${EPYTHON}"
 	)
 
 	emake "${myemakeargs[@]}" all
@@ -36,6 +43,7 @@ src_compile() {
 src_test() {
 	myemakeargs=(
 		GIMP=""
+		PYHTON="${EPYTHON}"
 	)
 
 	emake "${myemakeargs[@]}" check
@@ -48,6 +56,7 @@ src_install() {
 		DO_NOT_INSTALL_CHANGELOG="true"
 		GIMP=""
 		INSTALL_DIR="${ED}/usr/share/games/openttd/data/"
+		PYHTON="${EPYTHON}"
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/games-misc/ponysay/Manifest b/games-misc/ponysay/Manifest
index 663338642d33..e47585357869 100644
--- a/games-misc/ponysay/Manifest
+++ b/games-misc/ponysay/Manifest
@@ -1,4 +1,4 @@
 AUX ponysay-3.0.3-python-syntax.patch 1584 BLAKE2B 5f13613d7a43df44662ebe9d6cb995bba3ee8629cdf45546e895bbda64bea03029db25d0dc75c2263f77fd51c3b8d2d43f5aa7d48c02089b1413f191e7888a29 SHA512 d28d85313881e2e48c3648db0f99686a2d5facd82cb771219737075043d162047190a4e7a9cadac15b20c6081add90029535e8b1e17dfdca191f6d8e994c25ed
 DIST ponysay-3.0.3.tar.gz 2139074 BLAKE2B 3ba477268d68ff9a92bad8028d0b960a2a6152057146368723fea432100a71517c0c343d34b2b1c580fcfa1945bdc273fed276cf4a10c702514e6699cda87a2c SHA512 d6ff905404192bdc207952a4a914458d7f25ddcfcea95763ae277a2a3bc7ab33e86a0a229c1b10ff7295b7a89d6e1b61406feefb6bdf9026f4076d0ed70dbe93
 EBUILD ponysay-3.0.3.ebuild 1520 BLAKE2B b7ce2ff4634cae1ba00b7448b828876a1f2c9429afc76ec423e34c70ade6bdd7948a90d767dfed53da699e9a749abaf71e96bdfa6052a0eea8de7aabd49d910d SHA512 87530f5b01423ca2a46cd002c2d9c9699b680e33cdf6bb886570e2cc3ba6d099939631475493751fbfd0c7d7f2f3ac9d20d6989392dafe8f79df56f55999eac4
-MISC metadata.xml 500 BLAKE2B a937b3dcb9fb8a11ceefa20731973096578f503d711731a22afd3fbaea75b25d37cb736af36fbe8696a0d01afca261a4156444ac6b26b9a87f30f29d785f7408 SHA512 612eee4d25e1f3e3ef18b08ac4fcf59fbee5ab179d1f4da5e6784909c1985aa816317eba1a4c1a0aae8b1dfc0bfcc63ea44ab844b1400e565a2ebfaf5d7f8d4c
+MISC metadata.xml 500 BLAKE2B ed5d8e3f63e35c09ff1c5ae4a61c9960a70c302d86d8736dca81cf9c1e3105ff2ac1d4e2cee5d3db528b7da4f8fd9c1bac616a80ab8c2b577cbc23ada560056f SHA512 dbdf76a03f36e9bba6deed635e00b92e0649f1dcdfdff030c4c93e2278463eeb75b735e56e5668d037cc5e4708cadc787037ca91cf05b0ac7a41cc3b5d20e7f5
diff --git a/games-misc/ponysay/metadata.xml b/games-misc/ponysay/metadata.xml
index 288c0bcfb305..feb6b4584e34 100644
--- a/games-misc/ponysay/metadata.xml
+++ b/games-misc/ponysay/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index bf10c1b79a51..a2b459468b03 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/metadata.xml b/games-mud/metadata.xml
index a8e01b3f7cec..e45454213b52 100644
--- a/games-mud/metadata.xml
+++ b/games-mud/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria games-mud zawiera gry wieloosobowe typu MUD.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 520bbb294e61..378f27f0941d 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/metadata.xml b/games-puzzle/metadata.xml
index abb3008d8ab0..64f38387513a 100644
--- a/games-puzzle/metadata.xml
+++ b/games-puzzle/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria games-puzzle zawiera układanki.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-roguelike/FTL-gog/Manifest b/games-roguelike/FTL-gog/Manifest
index 2ad947cb8aa8..7d59caeda41d 100644
--- a/games-roguelike/FTL-gog/Manifest
+++ b/games-roguelike/FTL-gog/Manifest
@@ -1,3 +1,3 @@
 DIST ftl_advanced_edition_1_6_9_25330.sh 200833898 BLAKE2B 9eb048e302158f1cc040492a9fb5bd84038dd9202b8cfdd08ec50a3e55326da18048f4eab0c8b79ecf47229d54b59fca46cebaa107d253eadc0cc5659da4792b SHA512 7b1d87b5def455989290366ef80652361dee9d0fd2838806d2386d8a1df44e0ab125c5538aa07b20382be4aa3054b14b4a489b39b6aa252f3cc00ead8504186c
 EBUILD FTL-gog-1.6.9.25330.ebuild 1311 BLAKE2B bc6548ad41549b80aba319c4689e49eaad0fee7676d91e7997af17ceca0b9f3b03b7dc5b561bda95dec6768408dcd1caa1fede7ca58953dee6ea5f7dcd54066a SHA512 d7a2c102c047f7f015ae9fc9f7ba2500967ad423de1ba365382d73e0996ebd101b9b232726e62dafcf78b2cbc2900f4feb5d5b4fffb06e04e33804ea6c3b9190
-MISC metadata.xml 487 BLAKE2B d1c2761fb3083ba140d1f87b1f52d179095ea37235acc3e0f2586e9b969174cc4aab34648523c6dce9f83499d05624e8afe2782101560e6a39cf61f5a9b27bf7 SHA512 69c1e069878db826f8a7c44d8d9f6349a37a60ec7777ea29886655082b6c57b152ab5cda35bd3126beef0a127472a57b0cc50b941224694446bb2de51bb90d92
+MISC metadata.xml 517 BLAKE2B b25e70920f0227617365fe7e4b5e69c0d07893a98119315822aeec613b6f1acb38b5a177635806aa3852340d311aa64b0ccb4c65f7446aadd42dee09649601c0 SHA512 58cfefe87f406c5943bba074fb5441339b493a096f5058096bd9a6d7264244b721c8b9eecd5043886abfce36aebd22d47a9ed81b5d876fab53c0002aecc02682
diff --git a/games-roguelike/FTL-gog/metadata.xml b/games-roguelike/FTL-gog/metadata.xml
index 727ed940cf5b..ccba1d1ed7f5 100644
--- a/games-roguelike/FTL-gog/metadata.xml
+++ b/games-roguelike/FTL-gog/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitsunenokenja@protonmail.ch</email>
 		<name>Rob Levitsky</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 955d25c2b99e..8ab8eaa01624 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/metadata.xml b/games-roguelike/metadata.xml
index 3d54b3c25841..56aa33fad758 100644
--- a/games-roguelike/metadata.xml
+++ b/games-roguelike/metadata.xml
@@ -34,4 +34,3 @@
 		Kategoria games-roguelike zawiera tekstowe gry cRPG podobne do Rogue.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 6013a590b8d7..879e2c057e61 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -3,5 +3,5 @@ AUX nethack-3.6.3-hint-tty 266 BLAKE2B b9c3babf39ec3e7a8c5bfaa0efc9da9f91d7a6d31
 AUX nethack-3.6.3-hint-x11 420 BLAKE2B 42d2681cd36a0bdb81a1d4c61c7be69c4fe85b43daf9e3ad28ed0a867a8e4dcb684fafe4125d4e9d4f7176274bc2def4e83bc086a523ab2d99ed89699b494dcb SHA512 44f48a5f7b5302b9e1deaf5449b3dc67ee59b1eaca14cace5f699cffa17b92f1dbf0d1793ae31dfa0d1ebc77c65ab04d67b3988fd1f934d3ed5620ae2aaeaf21
 AUX nethack-3.6.3-recover.patch 3795 BLAKE2B b00102072a9f23b7b736d1d18bc6cdc0a77f156ca963bd14bd86dadd92f5f77baee8f518f26f9dfa36fee64df39afab88ebe026da7fff3a8a9602a271e94851c SHA512 7ec01f9485efe679c734b1b8cf0292212bac38a9fdf0622b34262fe88f197c46f09d62679f362b37b36b4cea7b5c89373f32b5277949ebe72c7cf34b7941c007
 DIST nethack-3.6.6.tar.gz 5577633 BLAKE2B 7b4b12f3a711785c86208dab83f9de725c33470e056ee57e6d96c3a68f06c1d0d98343ed82eca669986361d0663ddbe56d9a74d9cb45b42bf005c2f323b3cd79 SHA512 579fde93a37a1b5df637d5bac2601194beeb455c175fbe3ef89342122c8567bb8221ce60d8a6168e6b45c67ade7d7b09c86bf202c8cbe2d6294d276be3e53055
-EBUILD nethack-3.6.6.ebuild 4380 BLAKE2B 36e98a498911557d5b1b0468178363a90968356e0f49d7738b0169304259874911f8aeed55ac2b1321b30fb417e57d43951bef1321467a7156464ba35746770f SHA512 64d443add2e1d6d684f745ea5bdf7f846fdd59325eece3c76d60ada167fb7600ca2cb2bbe50fbe7590345f599e064ef690f2a1b0004a92fab93cd0f1611360b3
+EBUILD nethack-3.6.6.ebuild 4402 BLAKE2B eb71c757da8061bb42a25f05e73e0d8c26f6fd7698042b3dbe2f12ffd95f5664004abe4ee6c945ea62fd2de6d690923c538e56d46caa4f5135704d050fd2c0d2 SHA512 2dec06bceda7bde2ad7b80c983ce3e2014d60852bc17325cc70c4def435dc034a90fbd2fcaf87134ca49a5a218b69396b7a1797b7431b1c50ad987a51dd76d92
 MISC metadata.xml 330 BLAKE2B d9b00291dbb6b3e0464ae34a06844fb9231a62fabaf95dba759aa68c3d5abf5da1472974ff60050f02c20777ff888613daf2a4350d03d8a3f4791d5c6baece3b SHA512 e58684c319e9eac0fac88dfd582731a54ee38f5b058ea2bd5f17439c919edd5c3039e0cc11cbf299aa4908da35a66a10c4c3f032b51265c1e96f5a7ed1567d0b
diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild b/games-roguelike/nethack/nethack-3.6.6.ebuild
index 1dc2a67dd6cc..2106af647a72 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -13,21 +14,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="X"
 
-RDEPEND="acct-group/gamestat
+RDEPEND="
+	acct-group/gamestat
 	sys-libs/ncurses:0=
 	X? (
 		x11-libs/libXaw
 		x11-libs/libXpm
 		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
 	X? ( x11-base/xorg-proto )
-	"
-BDEPEND="virtual/pkgconfig
+"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
 	X? (
 		x11-apps/bdftopcf
 		x11-apps/mkfontscale
-	)"
+	)
+"
 
 S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
 
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 3497b34a054f..214033614f55 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
index 643dffe6b4c0..217e68272e5e 100644
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ b/games-rpg/baldurs-gate-ee/Manifest
@@ -2,4 +2,4 @@ DIST baldur_s_gate_enhanced_edition_en_2_5_23121.sh 2892168067 BLAKE2B 7e20922f5
 DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
 EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1378 BLAKE2B 6b633880e2e9798f8657c6bc1ed56cb313e7798e6ff77b2e7dc3ef905f2f44102def4ff0c642ccc673b8940852126f61e7b14f2624bb0937c8a1c0eb29050cf6 SHA512 3e8aed5016dacd88cd0226aaa70c8875e72c76ad030181740e139dcef8e03dc3be51649f254da88286af363dde6f45ded52f2531ff60bb69c3ae783f2370d740
 EBUILD baldurs-gate-ee-2.5.23121.ebuild 1207 BLAKE2B 63700b6f469363a96bb2d39edc096353182c68e71945bb406f77e3b4af6dcb0c1d0422bad3ee6cd98cf9b688c778201373dc5fd78a7e69dee44b79d69026d10a SHA512 cff50d9b097c149df3bffe6c4d2acac644588e1e32591cc731074523ac1cdd2f7b546ef96440219baa0cf7484ad2bc029d2362aaa6b54a4cd269b3ec2aee12c7
-MISC metadata.xml 784 BLAKE2B e6527c6d760208259a31037ffb51533b2fa07d40be2f62bd3c08c63acf1418841abf657b678cfff42650430f75b1430a5f9bcf849e8688af57b853fa911aebb1 SHA512 d92e2613876c7c8840f640ba778f1cbdb62d2e65caf38a1e931bd7ffe6ab3bcacf6093155b01036f1cb3f18583842761242105019fbf1e72df34e096d7f5bbde
+MISC metadata.xml 814 BLAKE2B 59a165a1cb3b9c9285f1a7af25abb882badbd57618c8202aeda0cd3ba14248e8138c6a1f03805b98c0926a44b68ecb189905b8e681b0142af2df7513bcf1eb9f SHA512 aeb6e4d4fc900f0dbb0eebf8495ed1e5722af2fd90234893364ee7e45f2ed7ba2137188df23acef65d70e3a99c161c5b0d65245961324abd6d576e386bfee3b5
diff --git a/games-rpg/baldurs-gate-ee/metadata.xml b/games-rpg/baldurs-gate-ee/metadata.xml
index 09145c6cdfdd..7db95012509a 100644
--- a/games-rpg/baldurs-gate-ee/metadata.xml
+++ b/games-rpg/baldurs-gate-ee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-rpg/metadata.xml b/games-rpg/metadata.xml
index 69a2c2a773bf..ca961dc5555d 100644
--- a/games-rpg/metadata.xml
+++ b/games-rpg/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-rpg zawiera gry RPG.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 84775497850e..6a7f43912905 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 57fa979c110e..8f09ee6d2237 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
 DIST bedrock-server-1.16.201.02.zip 89832697 BLAKE2B 055d19866daabf8479fa051dd9ddec0b89e620c02713cf6b98299eaa9b1423c92fa15bdf0a2203e9580ce38e82321e2f2b5420ad11ea45bb01606487c5477a01 SHA512 6238dfccde26780d22337a7f0a1e1fbe75b86e43c4ecd77a551dc7d31bf22fad3705f0f9e328c00cf5ffbee252a70e94f586606aa26e23b32101e3e6a23636a3
-DIST bedrock-server-1.16.201.03.zip 89834789 BLAKE2B ccc0c7de99765cc8e609a213c0d061232dd545a45508635853bcb2540c502a931b9efcb28132728f589e728400e619bf20d4ce5f34158d807802806dd8e65f98 SHA512 b962cbf4ea912b93404945a6d5ea799a4c2c2eec3e8cbac8903511002934b98c6385752b3a723e0e6548f2fa3a046706d3db126596b5b8c90e35635921f9eb20
+DIST bedrock-server-1.16.210.06.zip 90731004 BLAKE2B a3fcdbb55d4394ae2239efa7ecb6160dce05e72f407695f4e5d39f0184d4b054f73dc362df9354f67bcd99d02a98c6a873754ed8938c3942be7ff2c4a64a37a2 SHA512 bb1bad199d22cd02c4496be811a7e2d3c8ae27ad7283837332a9a3fd3f7fe79402350dca09076b53f452da90a3a30fd74b592615986865b582d404e2f21fae04
 EBUILD bedrock-server-1.16.201.02.ebuild 1118 BLAKE2B 934d922ad930135c070f2c56bad09e89b434841f189ffc76fb6ad68738d0668dca9bd19ec49877af3e3f5eb26cee5a17fe6936f260549cf3772aac7af1dbd72e SHA512 71aadf668d37aa046c17659d43128df3d21bdc37edbd5c9e98682f80b9e801160d05d78c8eb3ab2124e469e8ff285d03c8a950a8f219781a6caf74dfe0a68311
-EBUILD bedrock-server-1.16.201.03.ebuild 1119 BLAKE2B 5f6b84de32d07a3a455534f9f42edf002fc677f0e7193902e85710f08f5de15388d9465d885aaa934936ccf6e84d124f90fd4a57bcca003f0325b81ddb800bf4 SHA512 0a4ae8e00cca802048a10309afd3d4d1254cd1c771a94b13367fd8c82e44c6db1cfb3336d63036ee26d647ed04d3d76baf7b30114b371d994efd2d03962f559b
+EBUILD bedrock-server-1.16.210.06.ebuild 1119 BLAKE2B 5f6b84de32d07a3a455534f9f42edf002fc677f0e7193902e85710f08f5de15388d9465d885aaa934936ccf6e84d124f90fd4a57bcca003f0325b81ddb800bf4 SHA512 0a4ae8e00cca802048a10309afd3d4d1254cd1c771a94b13367fd8c82e44c6db1cfb3336d63036ee26d647ed04d3d76baf7b30114b371d994efd2d03962f559b
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.16.201.03.ebuild b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
index 57b7a7bb616d..57b7a7bb616d 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.201.03.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
diff --git a/games-server/metadata.xml b/games-server/metadata.xml
index 65ad0509b916..e2ee3e7cb5a0 100644
--- a/games-server/metadata.xml
+++ b/games-server/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-server zawiera serwery gier.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 22164127140a..b73091232b1e 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index c35350ffd3ec..f07c8091fb2c 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
 DIST FlightGear-2020.3.6-data.tar.bz2 2009894075 BLAKE2B 5f8ed7c7290ede6c4b0a902d3d3ace515c2713ec237542c7f3537bfb48d99e480958344b8b5897e350ef800258408a2fe9c3058786c522402e4d88b18dfd5a72 SHA512 d29ff4feb72be167b57b9baae461c810aef537085084bfb0c0ffbb2d1575ced38a951478fa1fd395c219919528af7e050a6c5199c337592cf607da5a3c682017
 EBUILD flightgear-data-2020.3.6.ebuild 413 BLAKE2B f6358e3875cf11848406d92c0c5c98b1934ec83ba2decc9c67696328c7315b114cec9e6f06336662555b22aec7bca4ca5d971fe5968ea8a8dc7b74e0b01aec0a SHA512 9c596b8da0064d9758533fc8625901acea96cf16fa387a620ffe5e58455886c784a9c8586a5cdcd996180f3874e2a2319ebe37f555beaf0c5901fa275a98a033
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
-MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
+MISC metadata.xml 445 BLAKE2B 4a12697a57d31ef9d6a709b28845bd9720c1de0450aca5e9fa0e3a1541b7f4fe33b0bd204f074c216fc1d7bb8608337af12e48c3d29f63cc21a6a389dffc8e43 SHA512 68fa64303853c5ba8aacbb4a430705acc7a16cb7ad872935990cb4264dabb878b9c317985ad40c3161396b9c2caa626738ba26f9a7c78c2b0261aa0d8957e723
diff --git a/games-simulation/flightgear-data/metadata.xml b/games-simulation/flightgear-data/metadata.xml
index 40aacc328d8e..856f1b4e2068 100644
--- a/games-simulation/flightgear-data/metadata.xml
+++ b/games-simulation/flightgear-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 45cdf91389eb..acbb30361551 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -4,4 +4,4 @@ AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5
 DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
 EBUILD flightgear-2020.3.6.ebuild 4311 BLAKE2B 3541b75b3207f3797731eb34b4e66c58ecc91dc9c0032f2bc87df8229699fad84cb05716d974b11dc52013ca745ac03971346ac3dba3a595047db765a44569fa SHA512 fb000a0b52607725a1036ef4b934c013fd96a2c3391bf71fbda89fd3004fb4676d4920839fbefee0b00b6e2c159ae8599688dedffe9583146586092b739546f3
 EBUILD flightgear-9999.ebuild 4361 BLAKE2B 280da54950e30e196699998d2e7476463c456f0a8856b73a49fce5c72635c5d3c526d5dfdbc9f8cda98cba27328609cb7382aca9f60ecaae768d023728cee84e SHA512 c77ef924e0c401183ec31993bc6556ee515526147cbfc316250d9eef0f17fac4600b0221a9a4b6db88c7ba68920536dd4e9b5e74da6b6660610f86056626c571
-MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
+MISC metadata.xml 867 BLAKE2B f628ff317f4137a90a6fc741a11e4afeea7110c9fae89e83371be80f6d0cf4ba25bb88449cc2136792a37f73c9f6fdbbab0103aec0a284193f1b3a72d8022e45 SHA512 a3912a3cd8eacae7a214dfddf9f7a857b88d16bedb7a40c3c464958a83690879e968085c99241146714962927a3adacbec1454eea1e310f8905718ff1f8bf42a
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 2f0f827b8840..d0017712012c 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/games-simulation/metadata.xml b/games-simulation/metadata.xml
index 9a1d4a49170f..636af64db808 100644
--- a/games-simulation/metadata.xml
+++ b/games-simulation/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-simulation zawiera gry symulacyjne.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 96f73af58fd2..8e66f4f5b345 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,9 +4,13 @@ AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
+DIST openrct2-0.3.3.tar.gz 14107179 BLAKE2B 9c19bf8f88ef7aa33c345ec46c3dc70ae1221fcad075880a86bd3a577835640002126018d2a5251e063d6259cdd3cd4bde58097feb9095b793538b363b827c5d SHA512 de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
 DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
+DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
 DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
+DIST openrct2-replays-0.0.31.zip 1783829 BLAKE2B 70ef5a5ad89b531baefecfa4c673a4d41e18c4ef5586f045a2174bf39d61bc59ebd5deee23abbba138bd9b943f056134845c8710397b84fc388a5e268025b7d2 SHA512 cb26543ad44a9d2c5d4a22e666c9efce605b0de34ac7cc8f42853792f50b8eda9eb551d2e6d0724fc4d282c83043718fa074cdd5081a9f12aebdc62efd2c082c
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 EBUILD openrct2-0.3.2-r1.ebuild 3962 BLAKE2B b729a666bef756a63e6473b9a6cac608690311f08a9bdd25a90d9a644e1122e38f3d23d9cc3bf41c4b0090dc61b24b392fef6cf248487f99a50a64324dc0d89b SHA512 61f6577fb382260851bc22e87e41181973b58b2cd5cb835b58687fbffa814e7c833bf6aa3fe4b51b2d5025de157f0b02e6f0b642b7c3fc3f199407138a7dd1f5
-EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d37135db8e8d701a80658aa26906dfa5c863d2bc1096eeb8860e7cb34d9bb4b12f812010d8333a0c75b34214741fbaf54fee1f183dd6280a2b81baa9c4d0755 SHA512 f9e65e96326e2c012aa1e2bd79576dee7da6f925cb7ba835afb54d8f1b3f950a4ec8edd5d3683e423731e437a75b31f260696b2645c5434af6a240d95ea05d87
+EBUILD openrct2-0.3.3.ebuild 3969 BLAKE2B c98d2e3eeb8b5a7ebea482f9542acba6277bcab8191147a125737651788ad1cabef26197ab7f868af70efe3c9a612db5bfaedd4b7991bdb8c5437ac7db2543a6 SHA512 f1e682c3a3aaa9a4e5df7ab3d3e07a38a2424385a55ed54b48da977b4fee6e9e57d1603d1fc135de7fba847945586528563b9b352fab2c36ec51debc89471a56
+EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d6af84320469f67b4b1f494c9cc7b16041e43434cb8b30f091ce202565402faa09ac18611834d7da1170372266a904333c3e59b2407f960f1ce581d3cb49f25 SHA512 2b67063b3434caa5e5163f5884e95ffb3a0cf8f716ff390bcbc2bfefb05ec2745af9b84421446dd3016a91bdd7e0f90ab21140e5bbba21f5ea6ee319eff5d4ad
 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
new file mode 100644
index 000000000000..54af75482582
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.3.ebuild
@@ -0,0 +1,167 @@
+# 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 libressl +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 )
+	)
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( 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 ed4aa33550f6..67f3ef57ee5a 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,8 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.18"
-MY_PV_RPL="0.0.19"
+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"
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 94646ab91598..9949225b3807 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -9,4 +9,4 @@ DIST simutrans_pak128.Britain.1.18-120-3.zip 67251660 BLAKE2B 6dbebdf77985e2610f
 DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e77157674847d757a23f329aa452c9ea6c096f875d665bb2090df34886437a2d35519c83b38f03d06566bf052c1ffe3cad718c7c3dfe SHA512 f61ad804d63027e181bb99a92f48d23cf6a6f47047a1ba9e8f83383cc4e6d603c7fe260d0846613d43765d3fc933bf13ae063d8d8176f8aef41db8d6bf187773
 DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
 EBUILD simutrans-0.122.0-r1.ebuild 3184 BLAKE2B 4d9b66be5565d6abd49332d060a197b606a2756533a18c81e53b646aabc223b8ec139f471746b4e4406cb11da1a8230ba3ffc32d3fb7c136a719d0440159761f SHA512 5b7c1c8656a10c48fa21bd6f7b1c2af7575ae84464ff9de061d10d0929906909f4a626aa98728a4bbf261fca5dade69f01507d8915f5b796d00dcc292f92f8a0
-MISC metadata.xml 734 BLAKE2B a93266747deaebb5b9aea753e2bce21aae7b8d6a95fcdae7fdd33a1bdb5133446a7d7fcac775c3841a210a4fba20641ba3caa6ff0f89a52b055464f37eaa63bb SHA512 9efc8b367f5321562b107442606dd1378c4cf35234dd159acb0d0c498c60965a442ac2de95423d32e6649d2d4bb4d1c6f733c3a83bc086e32e534ba023d33b5f
+MISC metadata.xml 764 BLAKE2B 5263078399ee40b2a97a9a846f6977880e3e2db77752118322e548bd21a6e3d606e4a6d283af279f0e6c4e3328dcbd27016b938019080b2fdfc2fcd0297a1015 SHA512 0c7f3612d6d89fc06d0b20b3fc9fb7c5c31fb3e6ddf71493ef3a91cec552039c813ed6f6e4fdd3fdf95b978d04021db7cc8be1d0e60ba5e6ded3e812c157b165
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index e411589b3ac1..69503e14532d 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny (tastytea) Gutbrod</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 05eb9ca65bad..8ab9622260f1 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/metadata.xml b/games-sports/metadata.xml
index 370d356069e1..e5d41b0057c4 100644
--- a/games-sports/metadata.xml
+++ b/games-sports/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-sports zawiera gry sportowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
deleted file mode 100644
index 9b33e87f7945..000000000000
--- a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="0ad-${PV/_/-}"
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
-	insinto /usr/share/0ad
-	doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
deleted file mode 100644
index e0fd74cd914e..000000000000
--- a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.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
-
-MY_P="0ad-${PV/_/-}"
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
-	insinto /usr/share/0ad
-	doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
deleted file mode 100644
index da5bd064e6ec..000000000000
--- a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="0ad"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	ZEROAD_GIT_REVISION=""
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
-	MY_P="${MY_PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/"
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-elif [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-else
-	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-fi
-
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-	BDEPEND="~games-strategy/0ad-${PV}[nvtt]"
-else
-	BDEPEND=""
-fi
-DEPEND=""
-RDEPEND=""
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/${MY_PN}-${PV}"
-elif [[ ${PV} == *_pre* ]]; then
-	S="${WORKDIR}/${MY_PN}-${ZEROAD_GIT_REVISION}"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-src_prepare() {
-	default
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_compile() {
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}"
-
-			einfo 0ad -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			0ad -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_install() {
-	insinto /usr/share/0ad
-	doins -r binaries/data/{config,mods,tools}
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
deleted file mode 100644
index 02ffb6f5f449..000000000000
--- a/games-strategy/0ad-data/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
-DIST 0ad-0.0.23b-alpha-unix-data.tar.xz 691280800 BLAKE2B 9ee0a1c14adb4fa2a842ad734f67a40af60d063c2f1876a34c49e584017b3fc6894a6be7c6533f15031b118d8a88b40b223decdbc3b8ea95f912271ec56f3a90 SHA512 d0515e44f575737a06f27c75c0a58a5229ead474ae6d48531142015548e5986145f895f95e0fa9209cf9085c7c431f4179ff2e70c1a532f61d1cb62c0a91bcfc
-DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
-EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
-EBUILD 0ad-data-0.0.23b_alpha.ebuild 538 BLAKE2B 303bf1ae24712aedef68d8a36de3c1dea943c2e2651c00e0d689216a53eb9a6cacdd2f215de00d9b7244794871c77194407c00424196d3d825125cbf7efd61f6 SHA512 2d238e3ad08e750de3211ff76f54e91c098b044f1023ca8996553874fe4fa1550637ccfdc19f61bfef10658f132731565e3d87a6d58bd57733cd6aedfcc56cf2
-EBUILD 0ad-data-0.0.24_alpha_pre20210116040036.ebuild 2447 BLAKE2B 6ba03a5b971a1fc0d0b36c895bedf1c4cfdd5b7ab48339352c5e33bf1306be06338822cc1d849a7b1ac08fe07b21a7d845406807e0857e3aba6a5190c23ee634 SHA512 3dd973740c9438c10a7f98de3d1e55d5856d1905d3f3e49aa859224e288f7a970ddc35c9cdf7fa380eea32720e2accae779d1efdf3005d1b1e78897f74d2b724
-MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml
deleted file mode 100644
index 263ee40e5d4f..000000000000
--- a/games-strategy/0ad-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">zero-ad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index ee1b7c53e0f5..2d5ccd3802da 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index 662e4fd6bd76..a7c1035c799c 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -92,4 +92,4 @@ 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
 EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2113 BLAKE2B d576c681712e3d5c29aaf038a19fdc430a84fe934446a6ee0e54ce9b1a40321c60b6df8e6d478e3f04b49da3825d96dfa8417a5c8da2b2f82a479b1549977d5f SHA512 8a825972f55db374c65e3be2d07f3ea6ee89545f84028740040cef915c6e76efbd95fa83d20044aa180c19f8128963b1830890e896e7e5f45254c53e65c88880
 EBUILD ja2-stracciatella-0.17.0.ebuild 4069 BLAKE2B c1634f4133b344d82437aa6f937bb54f92240b9f89414967ca32abad241f6051ad9c612dbc20389923deea882a265def84bc51b98af787655f56dc491b4035d0 SHA512 052e8b3f8cdee6d217ca83ab2264691c52f0967ad33bbab71d11b75820e02fb07d2836707c99c63f05a58aa72824abf2f2bbb765524c6a87936a84db788ae404
-MISC metadata.xml 616 BLAKE2B 4ef2302ab9784b362b425ed93bcd46be22759a12278aa55560acce275a93fef62411a22019e9bf9f4f2b1fc65d3f61efe57ff9571559362c48a55041a8b9c4a5 SHA512 bb83dae139f680080f1efcf784ed535a21c995226373aed5074313d00d85a79f8f41075eac7025a76264ed36be0a1b7c205dc1efb1f5b311100c9a667706ec84
+MISC metadata.xml 630 BLAKE2B 095a713902bd996796d1988f8cb4a7e5316e83cf7bb07692adc16bde1da1339532321538dfd1054f93868b802bfd0aa9c924248cb602b1136f9267dcac648efa SHA512 e50db86a2d81709cbd781045e8ad287173ca62c13b2442cb3e492861d72fd19470f29e1f49da583bdc5834c9baf869bb109d652063204bd6cb742cde05675edb
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
index c81c8236528b..893fda004302 100644
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>misanthropos@gmx.net</email>
 		<name>Richard Fröhning</name>
 	</maintainer>
diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 4b572d86f3db..95b2cab73dcb 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -2,4 +2,4 @@ AUX 90julius.sh 72 BLAKE2B d07d935037fa998174fffd1c786ffe2dab8d6af4eb9b71f0c30e1
 AUX julius-1.4.1-rename.patch 718 BLAKE2B 00a4cfb23cb4586a7a1a4069d1ba3db7edab0f6cfeaf3f5efc396a7c2be4e94923272a6d82585173f8d2569d84c97ca2046682e85d638d9c473b22577c693840 SHA512 0401429f24c5cb3285bef68b1fa2b489ec32d7fa13d20448e8f06231b23d137ed9edeb6fcc693cbcc6f891a38dcd3fb34c519fe9ff41b5f35c8b7dec52847c12
 DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
 EBUILD julius-1.4.1.ebuild 1306 BLAKE2B 160cb72243abb56855a255f66441746552e3ffddc1bea2f12f214e43ec5a63b8668324f139b6f30c618ef1d5fbc66b0d23bea51929864146c700aeda66fa43c3 SHA512 ba54aa83edab78734f68b10a98da1ec708e6bd2af2e29cca65ee8b95bf493e95cec6bfb7c2013006e4e3fa7ee0e0456ef6a0768e97e28f7e3ebfd5b2020c96e8
-MISC metadata.xml 970 BLAKE2B 520aa602d0f8ac7f53320be45ce6ed36d05262dd5f8bcadd763a2e7c32d0e19030b0ce6b670f7ef6cd4b811a25692123da70460f6d9c7f9a9692095b5524ef37 SHA512 de3723c1436aefb2e5dbad6c286cdf586ad67b2449dd140a00af22096c9779886ae6882193a41b6700af778c6f8e7e74aaff4aad1be2419c3f0e357a89828d38
+MISC metadata.xml 984 BLAKE2B a7e03580853743cf1e3baa0d22da83f6805a8082ffcae37206dd2d50bc8b8ec8ee20648eb5a8cb487f17969c608a53500e8cb0fc615389a0faa0718277b7bc5c SHA512 c807b2848e2380a2dcda2629c47e085b3bb994d45989bd9800376e4f1e6d3cd814772d2ff7b0faf8e211436d615cf49e189c768ea9862ecac0d054d3d82e6638
diff --git a/games-strategy/julius/metadata.xml b/games-strategy/julius/metadata.xml
index 437cec0fe4d0..be137f89e3f9 100644
--- a/games-strategy/julius/metadata.xml
+++ b/games-strategy/julius/metadata.xml
@@ -5,7 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
diff --git a/games-strategy/metadata.xml b/games-strategy/metadata.xml
index 9cac05913c02..cd339f5968ec 100644
--- a/games-strategy/metadata.xml
+++ b/games-strategy/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-strategy zawiera gry strategiczne.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 89a9440ec4be..7bcda70441ec 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -6,4 +6,4 @@ DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db
 EBUILD warzone2100-3.2.3.ebuild 2575 BLAKE2B 2712f209478693da3b3e106ac00149ab01fe49a798f29c1ec3397d6d39bc552fbf63a6e915f59ec9569276dfd235e9c44392fa09d40fe181516a8814b3cbbcbf SHA512 f19f25b22e9664053c07741990976fc297ed8d6389a4449d30f14ee4616261c63d72943ed5a50f4c223fd14695de8bbdd7a19b2bb983480cac64f898be48e70a
 EBUILD warzone2100-3.3.0.ebuild 2347 BLAKE2B d0e8bb5e2c3927e309e732db9be52ae8198d6b05c8bd37f5a391bdb5d78c83c9b1299cf100dca97ebc418431bb79cba3539c32dff69fef3c7c55e6c3bb67ad36 SHA512 49ed12f8483c013d28281069c38e49c6b7699295fc2bec91b2eebf71f68d5b9b24307812818a49c013062bf84e9ef7c1638a1c5adc8111f163468426bf9941aa
 EBUILD warzone2100-3.4.1.ebuild 2795 BLAKE2B 037a86f8fc5ba28572ae80df915f5bb80a2dbae675e5fe77b5c9b5265d5c147d99445aa99d557bc94ebca9c48f39dd8684d80a5b8a9e143a69e6eee9a2662cc2 SHA512 e97a6a119be374ae9ce8413a93db1597631b7595fdfabbf3ff8fd63291ddf4d5f90568e1dde9744cc79e19ec730a2f0bced209f61b2aa34040fb7a990646a2dd
-MISC metadata.xml 811 BLAKE2B 0c66f366f816f74dcf0fcbfac1515360e651f08eb7d199115e426102a7eb90fbeb0c2615f1f2108f078d6c19183f25312232ac68e8f0c77870cfbf6577c5e69c SHA512 f066dd0af3ca1e8a09ad55e371fa03ab235f4b4360b8f944dd07df0a446f8a19b19aac20eaff84ed20184b5bcc8c8f8f6792ce379d06f6f83a2e6dcb4d5859d0
+MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
index 5d417c533f46..d095ae1493b5 100644
--- a/games-strategy/warzone2100/metadata.xml
+++ b/games-strategy/warzone2100/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 6b1003e8bf76..bb794184681e 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
index 2f231c190092..af235241c553 100644
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@@ -2,4 +2,4 @@ DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b2
 DIST deutex-5.2.2.tar.zst 172022 BLAKE2B ad290ce6792425ba7f643cfe6c09c1a3f040ad0a4c95822f9368592dde6d489d28e892a26d78f2ebfefa086c910c948ef37eb3a3047429605653b273f9b567a8 SHA512 5f3c3d3ecad3a7949270a10c3c7e3a8be938389d4846dcac171526a9fd0485e056889323d303f61630e8735e5735edc91df7ad4efaba3d0b2b66a9d719017ebc
 EBUILD deutex-5.2.0.ebuild 565 BLAKE2B 0e507e25b9617714c7e183564af787cb8fc997a08228db79e7b4657764852e695b71ff931652ffb75d0bcdc1436b9f9c5ee453ab9f6ba81e283c5bbdf68f4f7d SHA512 a89f01e8255532877c22bcf0e12232c02e02a6d794fb69cb6734b5f70b69d5d72d4ecd6794342e05d909c72c653e147d3dbf35b3af0fd6b6972fc4bcb3cc1a29
 EBUILD deutex-5.2.2.ebuild 584 BLAKE2B cb9ae5e33c9f750b106828a829884add22b3126e3d7a0e78416802c912fcdb6bd39a19ff9218bf892cab9d86f47c48bc2329e3e3149e7a9553d20b0f991ce880 SHA512 eebbd39fd366dbd057ea702aca7235e331f4afc9ccc18f40ace39b3aee44f3edf642efdfa82db45a9cba17f4183a408856615bad6d33ea37af5d0dcf96a62b5b
-MISC metadata.xml 1156 BLAKE2B 1e96da44de146da39927743f7acc2e0e655f858ba33dad38737c8f563b61b0af565d01e3aba6d911f69291e3e3d123cd3bc92c7da85f603fb95f1291a0d2837c SHA512 0c0326cb90da12fbfadaef8e99793a685da446fa201fea352540e50f9690446e0c2848412c5ac3bf1e9d4fc8cb39602f2e39172ecd84df3ab29be5752301350e
+MISC metadata.xml 1186 BLAKE2B 91b6a3a01454b2be3855b3ff499ba3f7a7759d4af526b80066e423139137fce846c8e6245cc849a41f25ebf391f3b7de69b70fefa61a337b403254570c54be09 SHA512 4e23c84b3e2ccfe0192c687f7c0d22b50256d5164ce3869f58514736714dd3119df5c4c546dca72410a59dc3eebcf4b56a8442255350e1ffd87aef7580ea8a7a
diff --git a/games-util/deutex/metadata.xml b/games-util/deutex/metadata.xml
index 5a4ca375fc21..9fe0c83321af 100644
--- a/games-util/deutex/metadata.xml
+++ b/games-util/deutex/metadata.xml
@@ -11,11 +11,11 @@
 		It is a command-line driven program and as such, is suitable for
 		scripting such as from a shell script or Makefile.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest
index f2549244df6b..6143a64350b2 100644
--- a/games-util/game-device-udev-rules/Manifest
+++ b/games-util/game-device-udev-rules/Manifest
@@ -1,4 +1,4 @@
-AUX 60-game-input-20201209.rules 225 BLAKE2B 049966d6eb8e061bec5b18b3361957ceb29d23782a0cf361bebec618d1a4b4d2924782abb601cc4bdd15ff959346c42a33ff40da17feef02acf284294bbcbdc2 SHA512 1fd23d370d17f7c98445671c1d0138db7e69b405e8c630e54a094da021fb5fb716966d1da1f22043f9dfadc42e89efc3147c9bbc04c4100383de7ca2887a0700
-DIST steam-devices-3f9f151f8bb3caed0bee9e68d421562166605fd9.tar.gz 2149 BLAKE2B ac5d242649f77e1fce2facde990872abf98d51cfe353f1ff202e577cf01f917d49aaec292d74f495cddb5e6e8e5eceb21526131fbb65178efba80ed211fd9329 SHA512 c2f60a7e3a6ca6a122707914787bf12a11cc2fa4b70195446edf24b6ea2510569dfb12113116169d98438d8be1dedab6f828e3ca28ce52c4673fb693deb9603d
-EBUILD game-device-udev-rules-20201209.ebuild 1889 BLAKE2B bb957f1de11580a1df75ea85047f673caf6538d6fce901bf97f33743d17fb00378a6432f0f422cb8d6c1859947052d2bdf3b97110773625de836e39f35d19590 SHA512 31a88f327a5f2681db84035ad1cf69cac381029c102e35801218c6ebce50a31fcf77d9cdbcb4b4f36a4b5b98cd65841cbb2c0008156a3016a5a28a15efbc77ae
+AUX 60-game-input-20201228.rules 225 BLAKE2B 049966d6eb8e061bec5b18b3361957ceb29d23782a0cf361bebec618d1a4b4d2924782abb601cc4bdd15ff959346c42a33ff40da17feef02acf284294bbcbdc2 SHA512 1fd23d370d17f7c98445671c1d0138db7e69b405e8c630e54a094da021fb5fb716966d1da1f22043f9dfadc42e89efc3147c9bbc04c4100383de7ca2887a0700
+DIST steam-devices-ebc0f6a9e30bc0db2344df298c061c2c3b01776f.tar.gz 2171 BLAKE2B 01ef2371b13eca38419f90e4d1918370b6f2bdcb40264372e7cc1f8e858d7f5c9149f001c750a53f4c4435cf286fca1ab9f8869e5855eefbdb4d89acc95bb5c2 SHA512 08f2f411e8499469de747145bb159dd97c846a6329cf7aabe3445333fa8c9570c7de52d96c3e63d7e065464b9e4bbe2917a1a4a4f44a19454d3d707d524592f9
+EBUILD game-device-udev-rules-20201228.ebuild 1894 BLAKE2B 8b269fb019ddef18b114c55a45bbe97a6a6a8a512ed7ee2515c6c462ba28e5460d6e6fcecb6d1b6b335877f84b2d74e317a850860ec212fccf6a84474c2cd6c3 SHA512 a74a49d3cdb993b00c9be369726c3edfd0ddf50fc99749ef5f0bb03e37e5e06c010b987579cbc3c6815384483a3835ffabac409d2827c9ab4c769ab2ca198c8e
 MISC metadata.xml 361 BLAKE2B e0daf215fc923f490f00c8170de858eddc62c908c9ff5f79323a69a465dc0dd6671127244ce8285a49dd3892a5e56f62bc4254bc927537198eb04efc4f88a325 SHA512 86e237b8c6a70569154bcc2cc7b3992da0982b8dbf5d9ad56e4fe11c304457e8b82205001deba4b5d9344b598453c719e78b38959816343f4365cb1d447a53d6
diff --git a/games-util/game-device-udev-rules/files/60-game-input-20201209.rules b/games-util/game-device-udev-rules/files/60-game-input-20201228.rules
index be2c499891a7..be2c499891a7 100644
--- a/games-util/game-device-udev-rules/files/60-game-input-20201209.rules
+++ b/games-util/game-device-udev-rules/files/60-game-input-20201228.rules
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20201209.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20201209.ebuild
deleted file mode 100644
index 986e181fec3d..000000000000
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20201209.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-# Although this is mainly a tweaked version of Steam's udev rules, it
-# also has its own rules and more may be added later so we version it
-# independently.
-
-STEAM_COMMIT="3f9f151f8bb3caed0bee9e68d421562166605fd9"
-MY_P="steam-devices-${STEAM_COMMIT}"
-
-DESCRIPTION="udev rules for various game hardware devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games"
-SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+acl elogind systemd"
-REQUIRED_USE="acl? ( || ( elogind systemd ) )"
-
-RDEPEND="
-	acl? (
-		elogind? ( sys-auth/elogind[acl] )
-		systemd? ( sys-apps/systemd[acl] )
-	)
-	!acl? (
-		acct-group/input
-	)
-	virtual/udev
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use acl; then
-		elog "Users of game hardware devices must be added to the input group."
-
-		if use elogind || use systemd; then
-			ewarn "It is highly recommended that you enable USE=acl on this package instead"
-			ewarn "when using elogind or systemd as this is more secure and just works."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	local SRC DEST EXTRA
-	for SRC in 60-steam-{input,vr}.rules; do
-		DEST=${SRC//steam/game}
-		EXTRA=${FILESDIR}/${DEST/./-${PV}.}
-
-		# Make changes in a copy.
-		cp -v "${SRC}" "${DEST}" || die
-
-		# Append our additional rules.
-		if [[ -f ${EXTRA} ]]; then
-			cat "${EXTRA}" >> "${DEST}" || die
-		fi
-
-		# Clear any existing mode settings.
-		sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die
-
-		if ! use acl; then
-			# Replace uaccess tag with our group+mode if not using ACL.
-			sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die
-		fi
-	done
-}
-
-src_install() {
-	udev_dorules 60-game-{input,vr}.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild
new file mode 100644
index 000000000000..a050aac120d1
--- /dev/null
+++ b/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+# Although this is mainly a tweaked version of Steam's udev rules, it
+# also has its own rules and more may be added later so we version it
+# independently.
+
+STEAM_COMMIT="ebc0f6a9e30bc0db2344df298c061c2c3b01776f"
+MY_P="steam-devices-${STEAM_COMMIT}"
+
+DESCRIPTION="udev rules for various game hardware devices"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games"
+SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+acl elogind systemd"
+REQUIRED_USE="acl? ( || ( elogind systemd ) )"
+
+RDEPEND="
+	acl? (
+		elogind? ( sys-auth/elogind[acl] )
+		systemd? ( sys-apps/systemd[acl] )
+	)
+	!acl? (
+		acct-group/input
+	)
+	virtual/udev
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use acl; then
+		elog "Users of game hardware devices must be added to the input group."
+
+		if use elogind || use systemd; then
+			ewarn "It is highly recommended that you enable USE=acl on this package instead"
+			ewarn "when using elogind or systemd as this is more secure and just works."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	local SRC DEST EXTRA
+	for SRC in 60-steam-{input,vr}.rules; do
+		DEST=${SRC//steam/game}
+		EXTRA=${FILESDIR}/${DEST/./-${PV}.}
+
+		# Make changes in a copy.
+		cp -v "${SRC}" "${DEST}" || die
+
+		# Append our additional rules.
+		if [[ -f ${EXTRA} ]]; then
+			cat "${EXTRA}" >> "${DEST}" || die
+		fi
+
+		# Clear any existing mode settings.
+		sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die
+
+		if ! use acl; then
+			# Replace uaccess tag with our group+mode if not using ACL.
+			sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die
+		fi
+	done
+}
+
+src_install() {
+	udev_dorules 60-game-{input,vr}.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index f1672011e3d3..f8087ba22d9a 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,4 +1,4 @@
 DIST gamemode-1.6.1.tar.xz 71224 BLAKE2B aafa3123a2c672197d28fafbc7331004b6e4c87808e831f5e0341fd9a690acda8305da114651391fe39e6702bac805cede9d696280d03d4cc3d03d6f4d782efd SHA512 99403a68675522d3b412424591ab7f0cef54968a699f8f68aa59a42a43df73db4bc8a84ee8f97b9f78f329ecd1ed2f3a50e3cb539458f23e7c5fbe28f7978e47
 EBUILD gamemode-1.6.1.ebuild 4051 BLAKE2B 6962384b196f2d3f762ce4220aad1467b79e1badf13c09a30a49443469391a908d58a08a016d816d185852551e9d5f8cbd530bf33c34e8948e4ae26296dfeb0f SHA512 43df152c784d3838207d8c0512e86412ccf92839bec4f80aa4f0ab88451973cc0ad4c400df93ca38f5cbcab4f58f9bcf3b48b6b8e1c24b72ded0e9d5e1f9e363
 EBUILD gamemode-9999.ebuild 4051 BLAKE2B 6962384b196f2d3f762ce4220aad1467b79e1badf13c09a30a49443469391a908d58a08a016d816d185852551e9d5f8cbd530bf33c34e8948e4ae26296dfeb0f SHA512 43df152c784d3838207d8c0512e86412ccf92839bec4f80aa4f0ab88451973cc0ad4c400df93ca38f5cbcab4f58f9bcf3b48b6b8e1c24b72ded0e9d5e1f9e363
-MISC metadata.xml 530 BLAKE2B 14e10e8800bca7ad7e412916ee250a4c9dbc5ed78feb99fbb9ec1feb6cc60cbf96494676eaf48200781f9e25bd330d97e16e7cbd46120df79a3e7affb8361d7e SHA512 6a080b2ec0af531ef9c5d989927a2bef7dd8870c27a5edccc9e61bc9c35cb8bc11c1b781aa003dbca470a2c8172b10f5317be6cca6c6d3d6bef206e91fe7e75c
+MISC metadata.xml 560 BLAKE2B b894c7d2b65e2a824fa8f1229022f44a16e4a40fd3eabc41f85df7695e50fa5da768cf3fed064de053e3a389ba8106be5434661f02e3a1ba2c2c4321f343a12f SHA512 f16e141add8027671f7844fc66cb8d8e04fa8e8b86bd1179ed5cc97d655f4ff55683ed59c57d5f1adff4c591a0fd28e10f7950ac5eb899b879fe2902004eac76
diff --git a/games-util/gamemode/metadata.xml b/games-util/gamemode/metadata.xml
index 05078a2e7821..a9f52175a9a8 100644
--- a/games-util/gamemode/metadata.xml
+++ b/games-util/gamemode/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-util/metadata.xml b/games-util/metadata.xml
index e3106a742d7d..2553c37b2530 100644
--- a/games-util/metadata.xml
+++ b/games-util/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria games-util zawiera narządzia związane z grami.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 0e15521bf040..0958e5217806 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -6,4 +6,4 @@ DIST pyfa-2.33.0.tar.gz 28872031 BLAKE2B fe7fad57e43a8efc78f828d0ff81788147fa64e
 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
-MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6
+MISC metadata.xml 774 BLAKE2B feee5ef3ecce1f83f9d9503111c31e0bf92d9d4dff8b93d44016424c105e93d29d5f610a0c3fbb18a8ff738971989d7e59d83410c00f860cdda4e428f6d93494 SHA512 8c55d22f82558fe2d4f1cfcc63ae19aa4df60eb0fcf3c087250b041e5f1025e933bc87aa22bab4220e2c02f8915f5e4486e43842349fac0ee3f01ac6278b85f6
diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml
index 9633f2d9a69b..4c0d5ae0b9f8 100644
--- a/games-util/pyfa/metadata.xml
+++ b/games-util/pyfa/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>a.zuber@gmx.ch</email>
     <name>Andreas Zuber</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
index 7446d55a0fe8..a5119f92301e 100644
--- a/games-util/springlobby/Manifest
+++ b/games-util/springlobby/Manifest
@@ -1,3 +1,3 @@
 DIST springlobby-0.269.tar.bz2 4576001 BLAKE2B bd55b480c98d74bc83f99bf32148ef2be5e1f59e1539fdb432430d5e36e653e1c3d550bc7a3c996e5df029a19ea729d456f34ae3522a2a6385a0d646697e537c SHA512 32e9b5bfc72bcfccd1487621e6035e7338977f7262702cd39ec2c43734bff5b8757a97428d1207f8e6721dd450c1cddd68e43cea416503dd1987596e61e126e1
 EBUILD springlobby-0.269.ebuild 1049 BLAKE2B 5fdab39c6447599522bf3911c6fd83d31992384f244cbe3462c15bc9fb8bc254b4e29054afc9fefa722ae6add95706725bf1417a5fe59e693f83f6c4ce85ab02 SHA512 97cec0d40ea58ad54f35f5b33e61075b5772b855b705ace3d317548dbe8593f156d14d38b214052467b769aa8304453c8df5f064c66ba58feb6bd7067ca972b4
-MISC metadata.xml 1168 BLAKE2B 52a394c332bed809d549cf76a750a35cb0c0bcb6af1cf2276d81958abafa6272e58d59d07762929ef05ccece16d5465d5c353dd71974b4ec2657ae99e3d607a5 SHA512 901e3865f60e798625d59085e38e191a256819e5aa0778210190ebc0a08f183b263c3391409079c499a2e2cb6740503371642f0c13eec1e59a8699060c00b59c
+MISC metadata.xml 1212 BLAKE2B d6b6741bd2978d62b83238cbdb6539dfe29775d42a22a9ad4070fa88e4147811b34da847407113bdc3f72d44b14772dcc990392f0d9eca2338053824cb7c51c6 SHA512 5cf27c8fb6e6a059c3b951d2ccd98d66742817959e4de6a94cb3dbcb93c15bb6bc6a37b61ed6a3e52432bda917bb80de32500c7224ee60d669237a29ae584d5d
diff --git a/games-util/springlobby/metadata.xml b/games-util/springlobby/metadata.xml
index eabc7ba13bca..6558f49fa7e8 100644
--- a/games-util/springlobby/metadata.xml
+++ b/games-util/springlobby/metadata.xml
@@ -7,15 +7,15 @@ The official lobby client for SpringRTS community games: Balanced Annihilation;
 	<longdescription lang="fr">
 Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>totocoq@yahoo.fr</email>
 		<name>Thomas Coquelin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fedja@protonmail.ch</email>
 		<name>Fedja Beader</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
new file mode 100644
index 000000000000..f7860be3c1aa
--- /dev/null
+++ b/games-util/xpadneo/Manifest
@@ -0,0 +1,4 @@
+DIST xpadneo-0.9.tar.gz 1351003 BLAKE2B dd41e687a44415c9c44d70ae4df9c858a7218eca301e61421cee4b9e80d912f9336dad15636dc38cb79128a635e33bb2b795fadebe2f53ebe42d192212364cb0 SHA512 0819af24bfa556dd330abeb1180b0a46105428b6b2c8529bb357cd5b578fe6f21e057f3f457994b21b6d5d6b207d46bdf0ff80a6415f833396595ba5e7309389
+EBUILD xpadneo-0.9.ebuild 1706 BLAKE2B e4ce9ece179256d849d7716dfe4baebff7456a9b737b2519e10c3dd5a0c4cd67cd81447cf02da52ab57bb68b39ac0e57482a63e1b135c03d708dafc9fed1fd20 SHA512 2380b84a58460eaa0a59625c5788b0f8250523c06e114818e9e9a6fb602b85bd202ba3ef5d9c55b099cc7541943d4168a36e14f57cdabd23ed0502b8bf0f2d97
+EBUILD xpadneo-9999.ebuild 1779 BLAKE2B beaffe9f6a92f66c10458e1c435b16f52167b0a475ffe3c45aeaefeaa0436849e9457dcf9cca4fd1924563308b2c069ac83bfc65541bc647d498ce1d71824546 SHA512 7b624b853869a97d3d886c5837ac614e361d93d18d067555f99529abdb877267b43ac55e0ab1208801a133c8ea6568c6cab572533d4211bab0f5c826ea5fe0c6
+MISC metadata.xml 476 BLAKE2B 88a9a4d49f902c50d87fe36c98f6f4f2c553c6cb6882966f0d4858413ed8b603f428c7b3b43d157a6ff25fb1ab26231657119e14b4a0260a159a372501593391 SHA512 9f3a4e2063cb3e30b8ba428930715533c0c3fe7defda881d1a86f5f652fc736938e88ce21e4f028f57f9edc14f6528c8a731a6689242c0d369f44a2606425fd7
diff --git a/games-util/xpadneo/metadata.xml b/games-util/xpadneo/metadata.xml
new file mode 100644
index 000000000000..32782d0fcfbb
--- /dev/null
+++ b/games-util/xpadneo/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" proxied="yes">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">atar-axis/xpadneo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/xpadneo/xpadneo-0.9.ebuild b/games-util/xpadneo/xpadneo-0.9.ebuild
new file mode 100644
index 000000000000..33ed81817a28
--- /dev/null
+++ b/games-util/xpadneo/xpadneo-0.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs udev
+
+DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller"
+HOMEPAGE="https://atar-axis.github.io/xpadneo/"
+SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S+="/hid-${PN}"
+MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
+BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KERNEL_DIR}"'
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="INPUT_FF_MEMLESS"
+
+src_prepare() {
+	default
+	sed -i "s/@DO_NOT_CHANGE@/v${PV}/" src/version.h || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /etc/modprobe.d
+	doins etc-modprobe.d/${PN}.conf
+
+	udev_dorules etc-udev-rules.d/98-${PN}.rules
+
+	dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+
+	local ertm=/sys/module/bluetooth/parameters/disable_ertm
+	if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
+		elog "To pair the gamepad and view module options, see documentation in:"
+		elog "  ${EROOT}/usr/share/doc/${PF}"
+		elog
+		elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
+		elog "cause the gamepad to enter a re-connection loop."
+		elog "- To disable immediately:"
+		elog "    echo Y > ${ertm}"
+		elog "- To disable for next and subsequent boot:"
+		elog "    echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
+		elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
+		elog "    bluetooth.disable_ertm=y"
+	fi
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/games-util/xpadneo/xpadneo-9999.ebuild b/games-util/xpadneo/xpadneo-9999.ebuild
new file mode 100644
index 000000000000..a40a337a9918
--- /dev/null
+++ b/games-util/xpadneo/xpadneo-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs udev
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/atar-axis/xpadneo.git"
+	EGIT_MIN_CLONE_TYPE="single"
+else
+	SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller"
+HOMEPAGE="https://atar-axis.github.io/xpadneo/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+S+="/hid-${PN}"
+MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
+BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KERNEL_DIR}"'
+BUILD_TARGETS="src/version.h modules"
+
+CONFIG_CHECK="INPUT_FF_MEMLESS"
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /etc/modprobe.d
+	doins etc-modprobe.d/${PN}.conf
+
+	udev_dorules etc-udev-rules.d/98-${PN}.rules
+
+	dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+
+	local ertm=/sys/module/bluetooth/parameters/disable_ertm
+	if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
+		elog "To pair the gamepad and view module options, see documentation in:"
+		elog "  ${EROOT}/usr/share/doc/${PF}"
+		elog
+		elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
+		elog "cause the gamepad to enter a re-connection loop."
+		elog "- To disable immediately:"
+		elog "    echo Y > ${ertm}"
+		elog "- To disable for next and subsequent boot:"
+		elog "    echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
+		elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
+		elog "    bluetooth.disable_ertm=y"
+	fi
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f4530b68f8cf..aa73e0e44d79 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 1999166c058e..b96dd657a011 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST dconf-editor-3.36.4.tar.xz 583084 BLAKE2B 7d7f5164a4917d13372a2bcf7f9fe7b82d630693601bba33da1c4f3afffa58e4589ff90c3e5ca3039351a681eac6584b335171f4dce9d0bfedaed52cc25d505c SHA512 a24fa44830fb0e83834cf912267de6597c1d6bf02e063af4255409d3c9a135fae409116d91751d00ee8d2319e7130606f007af76d3ec9f1380cda98ab2329eff
+DIST dconf-editor-3.38.2.tar.xz 593428 BLAKE2B 6adb53cf2326d25b31d483645df9c2883658d525a32d1eb0ea13d410724911fbeb2ba17a948e4cca5e6a19e187d3cabf0a5722f7aae4dc70bc6699c13be9adc0 SHA512 64bcf7c5cea2c70f2c4ee08832490495c8c2dfee805d6fc27583e1369444f81ef9818f83de7c71228c88322f32c258c4550cc908263f1bb3032ab67e514efb2b
 EBUILD dconf-editor-3.36.4.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22
+EBUILD dconf-editor-3.38.2.ebuild 815 BLAKE2B d1cca311a344ba79f7a4f74a65e01ddc31fb5d6116e2d30459dd42d702b3fc769aa77f94f34fccf06d8fc18c52994b662e6e5d2472066acd9e7308456c00c972 SHA512 828b65a4d05469af3b279638fe0d0b1d48b8d4eecb45e311a69cb5fd5f795255a432349d7f0e8d009087888cf44ad30224f1215b7356f316ea19a4cb39226ee7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.2.ebuild
new file mode 100644
index 000000000000..21fa99568f71
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+RDEPEND="
+	>=gnome-base/dconf-0.26.1
+	>=dev-libs/glib-2.55.1:2
+	>=x11-libs/gtk+-3.22.27:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 266cc4f7e090..e1b3bd03da75 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,8 +1,11 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
 AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
+AUX 0.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d
+DIST dconf-0.40.0.tar.xz 117764 BLAKE2B bdbc48b71e46fdc4353358cd08fb96933d07af587300a6f91bc45826aeafb3f34f482fe6e09041dd839e507b863a8e33d09bad88a91c1c868983f8afb52c5c85 SHA512 71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a
 EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902
 EBUILD dconf-0.36.0.ebuild 2104 BLAKE2B 6989287b32971b02a72e5c14da091555707dc3b3e35d87eef39a7be6981e4d90b221b8f73d029f4624815a40532a12c11ea381d69ca4f79c56303e05d2c02f2d SHA512 3d192e4cbf500f42e51d0c938581a3cded0aa883eac39b98c058c6573552a1aac0e8b0c4b7a1f92842b69e77407447352c8a204168e7b7d2bbc8765a3c7d006f
+EBUILD dconf-0.40.0.ebuild 2170 BLAKE2B 268f0db3b8cb8124bb2b5c9e9d66a5bf26807b3dd9dcd0221d1a4196049a514b9d53f10af1608bb5628a9ff99bb23a4fb8f009d8ff1393e8104c8acd436b879d SHA512 6798b88f00a2cfcc1b098d1f401a579a32131224663e6f235677a81810750914ec1b1695ee72f5d248681064999b888e1e75590a54bdff6b753145708cbaae84
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.40.0.ebuild b/gnome-base/dconf/dconf-0.40.0.ebuild
new file mode 100644
index 000000000000..d0515385aa74
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.40.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 gnome.org gnome2-utils meson systemd virtualx xdg
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="gtk-doc"
+RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.40.0-bash-completion-dir.patch
+	"${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=true
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	# This snippet can't be removed until gconf package is
+	# ensured to not install a /etc/env.d/50gconf and then
+	# still consider the CONFIG_PROTECT_MASK bit.
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_giomodule_cache_update
+
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/dconf/files/0.40.0-bash-completion-dir.patch b/gnome-base/dconf/files/0.40.0-bash-completion-dir.patch
new file mode 100644
index 000000000000..43bbe57294d9
--- /dev/null
+++ b/gnome-base/dconf/files/0.40.0-bash-completion-dir.patch
@@ -0,0 +1,68 @@
+From 43393af96308d001c30ac14c32000519253fe910 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Feb 2019 22:06:18 +0200
+Subject: [PATCH] build: Allow passing bash-completion dir and have a generic
+ fallback
+
+With autotools the installation path was just hardcoded to the usual
+location. In meson it was made to always check the path from
+bash-completion.pc, but some downstream might want to install the
+file without a bash-completion build-dep. Allow installing the
+completion file to a passed directory, and add back the fallback
+path if an explicit directory isn't passed and bash-completion
+package isn't found. This is also what the tracker project does.
+---
+ meson.build       | 26 ++++++++++++++++++--------
+ meson_options.txt |  2 +-
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b81a81a..7c790c1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -62,14 +62,24 @@ if systemd_userunitdir == ''
+   endif
+ endif
+ 
+-enable_bash_completion = get_option('bash_completion')
+-if enable_bash_completion
+-  bash_completion_dep = dependency('bash-completion')
+-  completions_dir = bash_completion_dep.get_pkgconfig_variable(
+-    'completionsdir',
+-    # bash-completion 2.10 changed the substitutions
+-    define_variable: bash_completion_dep.version().version_compare('>= 2.10') ? ['datadir', dconf_datadir] : ['prefix', dconf_prefix],
+-  )
++enable_bash_completion = false
++if get_option('bash_completion_dir') == 'yes' or get_option('bash_completion_dir') == 'auto'
++  bash_completion_dep = dependency('bash-completion', required: false)
++  if bash_completion_dep.found()
++    completions_dir = bash_completion_dep.get_pkgconfig_variable(
++      'completionsdir',
++      # bash-completion 2.10 changed the substitutions
++      define_variable: bash_completion_dep.version().version_compare('>= 2.10') ? ['datadir', dconf_datadir] : ['prefix', dconf_prefix],
++    )
++  else
++    completions_dir = join_paths(dconf_datadir, 'bash-completion', 'completions')
++  endif
++  enable_bash_completion = true
++elif get_option('bash_completion_dir') == 'no' or get_option('bash_completion_dir') == ''
++  enable_bash_completion = false
++else
++  enable_bash_completion = true
++  completions_dir = get_option('bash_completion_dir')
+ endif
+ 
+ configure_file(
+diff --git a/meson_options.txt b/meson_options.txt
+index 1b85d5d..7f5afcc 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,4 @@
+-option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
++option('bash_completion_dir', type: 'string', value: 'yes', description: 'directory to install Bash completion files (or "yes" for default directory, "no" to disable installation)')
+ option('man', type: 'boolean', value: true, description: 'generate man pages')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('vapi', type: 'boolean', value: true, description: 'install dconf client vapi')
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 3b201217bef7..d87b453a1f25 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -4,7 +4,9 @@ DIST gnome-control-center-3.36.5-patchset.tar.xz 7288 BLAKE2B 56f71bc1a8c9f5a62e
 DIST gnome-control-center-3.36.5.tar.xz 6304804 BLAKE2B c4e95784ff1877e716f23ea421d0d4997691e2aa15ce24eae35d9ecac167c48443e8f5180ff3359be75914512c240e4ef2ef8a2fdc51f1c6b15275eadef2c3bb SHA512 4a5470dc18366172198a68f8e0598647c0cae1fbcc00eec26dccf7320f0e3aca4a7326fbf0e616fd7e44ab1faacefaa9342322efcf79039122216c644c490b52
 DIST gnome-control-center-3.38.3-patchset.tar.xz 7308 BLAKE2B 72acdb825d48c7077d15f7273765db2ccbef89a839466a4482d9f6ae9eae3a2144556a048f2a6e146ea4e3435c13f0a72bf499c44d34bcbed505d6186d8bf008 SHA512 2498abd83e0100efa4c83886ce3e7f7d4468e41aab12c5338987832cb305c215abe75b4fff65217511bbe174b6b1b601af988c5588523e0346855aba7842092b
 DIST gnome-control-center-3.38.3.tar.xz 6434672 BLAKE2B e95a9a1c487e1a3d6a0e64c61fd9502d1983827ff0a26ed03a0e48339917ae49855016ac3699c3940764185041659d865db51fd95e19bbb588c62277218c609d SHA512 25b8ff6e44be5e679666ae44e12deedf5dbef9317089381cd2075efc2321abca91ac1ad268242fb16a0b7f411ad98d9ab50073f745060d6525e0648585333e3e
+DIST gnome-control-center-3.38.4.tar.xz 6434656 BLAKE2B 6201344c3ce4a1e85c8becde5df24d0aaa294ba0f135220fa1bd1ca079fb99ea30a4bb9f6403f17584bb1299b7d3edf1300fa94fca44a75bd947c84cc257be35 SHA512 9fa90b33af09fe5458c2db8782079d992f18bc36cdd6623239b48d6c8f242fa9b56275ee7c6920f313efcd2f8f1c65a43a8f3f1c100489a0bcade26d045eb3c7
 EBUILD gnome-control-center-3.36.4.ebuild 6333 BLAKE2B e2710b49f78faedc5066a8c0c62d3a712c1eaae8118673d132f418ecdf0083d3051d1150cec64101da212e6f7b02f9119c9e62d491b70169d1fb3c27e482d3e2 SHA512 1c27bd276acf3f80caea1a67487eb885752726850127bc39ee4edb4b74f7f4e0b69034f2954b29d71a4f0efa097b7d09cc983263d3269465d92ec9b61b8a6316
 EBUILD gnome-control-center-3.36.5.ebuild 6341 BLAKE2B 6e8255b594daef3763ec65ef68ec32b6e09c8087abb0c6e42003737000ea5687b40b4d52a3a066d4c3590a3a211c03fc9e60d3fea107c9ccdf5831dd9d0af911 SHA512 306f9e56bff6c11b0e2b364391894633aa18614d7a632100e333fcab7e00a64806da39f7005191403c08241d90cac28bbaba524778a2b7babc3818894858dcac
 EBUILD gnome-control-center-3.38.3.ebuild 6226 BLAKE2B d3f722ecacaa770962b4f859bafe4e9427934c04205d421b9824c1a5381314631f9065bbb5207912a7887d8bcfbc7613d572cb27bda1ccaac06d1e282f94d634 SHA512 b142a2399ac3c5d5b5316a87b10722b2af9ca40d1e88c706e6b4fd34e2c5310f3393ef3fc56575357c4f720976288c3a34efa812833af5309c8b1158b741d5be
+EBUILD gnome-control-center-3.38.4.ebuild 6235 BLAKE2B 1691b82677c5ab8ee1afd37a121fd20383be5e69c347ca870aa0a58362c2865ac04c6d247a328a4b753249947de2fe55e42c3d6bff8592b85dee98e66eafc990 SHA512 46b694410f5755a5c360e027668d6b5ed4130cb650259ef3497d8191e6b2976b61f8c7b0490b4c29517bce4472b7e6c6191b6fa06d74096d3edaedf3fc09271e
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild
new file mode 100644
index 000000000000..ac894c3d8ce2
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.38.3-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	flickr? ( gnome-online-accounts )
+	^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+DEPEND="
+	>=gui-libs/libhandy-1:1=
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+	>=media-sound/pulseaudio-2.0[glib]
+	>=sys-apps/accountsservice-0.6.39
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=dev-libs/glib-2.56.0:2
+	>=gnome-base/gnome-desktop-3.27.90:3=
+	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
+	>=gnome-base/gsettings-desktop-schemas-3.37.0
+	dev-libs/libxml2:2
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99.8:=
+	>=dev-libs/libgudev-232
+	x11-libs/libX11
+	>=x11-libs/libXi-1.2
+	media-libs/libepoxy
+	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
+	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	v4l? (
+		>=media-video/cheese-3.28.0 )
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	networkmanager? (
+		>=net-libs/libnma-1.8.0
+		>=net-misc/networkmanager-1.20.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	kerberos? ( app-crypt/mit-krb5 )
+
+	x11-libs/cairo[glib]
+	>=x11-libs/colord-gtk-0.1.24
+	net-libs/libsoup:2.4
+	media-libs/fontconfig
+	gnome-base/libgtop:2=
+	>=sys-fs/udisks-2.1.8:2
+	app-crypt/libsecret
+	media-libs/gsound
+	>=dev-libs/libpwquality-1.2.2
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( app-admin/openrc-settingsd
+		sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	>=gnome-extra/gnome-color-manager-3.1.2
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	x11-base/xorg-proto
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '
+		dev-python/dbusmock[${PYTHON_USEDEP}]
+	') )
+"
+
+PATCHES=(
+	# Patches from gnome-3-38 branch on top of 3.38.3
+	# Makes some panels and dependencies optional
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	use test && \
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	# Mark python tests with shebang executable, so that meson will launch them directly, instead
+	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
+	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use v4l cheese)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		-Dgrilo=$(usex flickr enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		-Dmalcontent=false # unpackaged
+		$(meson_use networkmanager network_manager)
+		-Dprivileged_group=wheel
+		-Dsnap=false
+		$(meson_use test tests)
+		$(meson_use debug tracing)
+		$(meson_use input_devices_wacom wacom)
+		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 902a503dac64..2fc4cf6d7694 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -4,5 +4,5 @@ DIST gsettings-desktop-schemas-3.36.1.tar.xz 679788 BLAKE2B f49f98274f48cdb2eab0
 DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
 EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1018 BLAKE2B 4a4cf4ac885691a18cd84cd6eb1914bee7c298559b8159256b6de4cc9ba89a6fbdaa9441724284c59eb07d63fc75a18db328c748b7df90aca75d4ab53d966f8a SHA512 ba32747ee607c3ee8cfb4ba431fd3f9e2ed16c591ce8e48304a55a79b0c6689ded833af4fd6b2851271c2f71cb0c0bb3c9d66d4b3aeed904fac9068c77af4332
 EBUILD gsettings-desktop-schemas-3.36.1.ebuild 968 BLAKE2B d539da134dd9ff1d8bd9ba4b014da693e481f1dfbce6ed4ce7e2ceb07d43b1370fc5866dc568b6d9485e419c65e12b41a0152286630f9e4a976a006fb33f3d5d SHA512 fb8c518b6c021ee7a56201f2d56119cde972fed10ef70ac1646fe021057c9e1ab795d33b1e8a0b0efc19b8fd3a6483c47101184b33a284131fd249dfc50f0a07
-EBUILD gsettings-desktop-schemas-3.38.0.ebuild 975 BLAKE2B 8d6f6901c3eb935e6173c02b095bf2bea9db2872a32a60cf3c6460ddd9aea239591018145173e714715dbbe33b3b169181be3259c51720a1cb8c7a53a521189c SHA512 f9235d131be2b3b3821c6f95ade04f215ba4ff20e0b2fbac5ccb27416085d26aa356549df00fa03a5c7c42f545fbbfb94162a32232c7c13dfb6b03d453e45082
+EBUILD gsettings-desktop-schemas-3.38.0.ebuild 974 BLAKE2B 050adacd85722f42ce0a99efa3b85056f2073d8e2057ddf328878e685d55de45cac8f274aadb13f3be74eda179c09901d86de54210c87571a5a121447b44e8d3 SHA512 58e524868a4d936b965f54702c2d91f62197dcd2c0fd17b2f44e5d10145c9ce9087068fb6fdd7abc1a02d66501c62f4eb12bc224ef9dbfa6e5bd1b71f86574ee
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
index 5af733e566ef..2e820a1526ca 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index ca5b60717c11..8b60bae3047b 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1643 BLAKE2B bb935777d998d3efc6c8c0a2d5261e70480333d029c691328c384e3dc0c43e06f6d7c33651f6caa2f74a57caedddf6afd67b32bf385152d8c35a447f4330bb0f SHA512 800a16b7257a787c1af9e91710174ed758c5c48b08dff158ff2a6f0606a91e1acb36e685da07d1cd9f72267e99081bbdf6e2e5a7984ebf92ce95947550f13b31
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1642 BLAKE2B e9d1e2e8cd9feabf9201430d3da48b016cd10f9349f7e9d0daae9ebcd45fdf1a9796bef5eb6d12d80bc8ebbd470fa023995f09085f93b3ec6f525eaaccb024ab SHA512 9e5f8b29ef99cbb8393592326a2e50238a762ef508f9b5a0b043f7dca09241ef418556389c1a904bc808c7dab06837582254c84439c13d024305905ee30aabae
 MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 1e832af54bea..0d55b4313bcf 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="glade"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/metadata.xml b/gnome-base/metadata.xml
index 0fe9232faaf5..53d401cec996 100644
--- a/gnome-base/metadata.xml
+++ b/gnome-base/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria gnome-base zawiera podstawowe pakiety środowiska GNOME.
 	</longdescription>
 </catmetadata>
-
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 4c4c28c8e9d8..7fab70b86c07 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 c5015b9f64b6..208476b1ca41 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
-MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
+MISC metadata.xml 568 BLAKE2B 2627bf6f826c898bcc4e42086b4f5804130f5bfca3bbabb3ab6b1a981ba1e3020e2dc3b03ca024276d432a496d82d8cdacc478364482a1424f7228b3ace35ce9 SHA512 a5f1ef966622d4b1bb6afa50b10ca2cf5cb4b5903cd39f2ee6319e3afafc9a2a86bbf76e4f96b4830b7cd911b16e0486cba7ab15ec172b4fbeca2fcc51b90b5b
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
index 3d84d898ca45..81bef139e8df 100644
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ b/gnome-extra/chrome-gnome-shell/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index ea0fb08ffce8..8e30f562aa9b 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,4 +3,4 @@ DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81f
 DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
 EBUILD cinnamon-control-center-4.6.2.ebuild 2425 BLAKE2B fb6fc81908ff306a1d552aa97623f10b3f96fcba7748f3a846eff4d60595afbafc9c2ee174012f47f6c7fa5cbb36fc92a223a6d298e70ec487d82a44970545e4 SHA512 29e9215b3e5c9bb4755777c09f6b90a425ee9c30b295ffcfdc693c0763962856915bd7629669252e0bb8eede546c48883a16d95ddb53956d3675bbd58f8405b7
 EBUILD cinnamon-control-center-4.8.2.ebuild 2154 BLAKE2B b956a520abe6024d3c47105e6231d49db258d92362d95559eabaf0eb7ae3c17dc842bd2c30cbf6e4ae017ae6d70c2ef0d1ee8c68320ce894312c372ca37a72b1 SHA512 b22c27cf6872717908298e5925d3a6eaaf4bd2497d26d3d2bb647d0d667cc20c6ae70ac1aebe60cc5c424564d9aa02cc12f231bde4b158d09ce6c52c1d2b0442
-MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
+MISC metadata.xml 638 BLAKE2B 25be7d4f085c31019ad60e98002bf4fb7eac75710c4ae9357748839ea93da64f7bf87b5c1a19ba5d8ff5d248ab6d09285a78be89eeabb5e8a58a271704cd5ade SHA512 27b0859230c32c474a9b8f89fca13279678172ab2ff1a6724ccd7303fae14817844b7ee59d2ec2ce169c0ce3b3e462ca972d4d50a8f3a2069a84c3b534861ce7
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index e9be26cc1ded..26d10b9bc09a 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index cdde22ea299a..3e48ef8d53b2 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,4 +2,4 @@ DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fc
 DIST cinnamon-desktop-4.8.1.tar.gz 495417 BLAKE2B 3947d39168b2c74ef82a1ad5835d423721d34d1f9f7099050207ba070348abfb0236f08c340bf5896672764a59d19646cb34e342ddd4c7dbb501797ab20cbb10 SHA512 57eaba73cbaf2cd91e07a417bb0573bd0af86712babccfc4f307c6745dd219f0b279277f7a740dcf21d06a6f9a656213436b2e54eda4cbdb2f1f80a5ff085287
 EBUILD cinnamon-desktop-4.6.4.ebuild 1277 BLAKE2B d9d508f32c273b768d01dc9fe0cede0d660f1f8cc0efa926861f779be5a95fd32d5a863a396b1830c7f0f120d88d447455d912bc4ded497027c9663506fbffe3 SHA512 51ea1a2c794d2c43fbf7c5100bcfa7a81a2d5b6b936fe34b65b86c370e496cf2ff4a30817e8626cd291b2012e8c711fb3dd04883a2a5a37297104054b7f1e59b
 EBUILD cinnamon-desktop-4.8.1.ebuild 1293 BLAKE2B d13cfb22b3f2e19fc74526feac885728e809f451fd7e8ccfe74284fb07eaf0d2136d93493c25951a5054fd8e5f83c396017f4b203ac66f56cbc5a108d3a66aee SHA512 c9c8d6300997d3c7ae3a9189e9d1d3de3ccd3e2223d8c27b8f479cc69ecc4e4cd67cf92249cba805bc1736d3122585a7ed50baa3ea718a29a6f9d939f76d3a52
-MISC metadata.xml 465 BLAKE2B c78166d54a50ae1dbf4580564161bb0fd0c824b0f305d8e211452d089d8b88ffab5207c2ee63fd4bc83f434023fe87ab873b9d39c61a5f3199213647189adcdc SHA512 0298cc730405fdc373e8dfd11150651d29ed9d19c98370b2bb5dd19df1cfe5d83816e45d222c0eb103811d330a6508fef09001c00d6022ffe38997bdae771f3b
+MISC metadata.xml 495 BLAKE2B 25761428b46e827092d89cdabbc5b145ab5069b3fe11a907c008a20c6853fa8df546e38f51cfbfe5bcb85c0b70b8c8d1a0a6bf0081eb23a7d27cf63d802f4338 SHA512 06b8903158444e3a21fc0f8162f508f7ca55180aa3c310c1e706a9d0e91c5769160e47b0c25ab70329cd607e2ff9e0415c098481a59e7574bcfb8e3a68dea9f8
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
index 999b2529315e..bbf25780abf5 100644
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index f9764bab9f5f..e767f28600f6 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -2,4 +2,4 @@ DIST cinnamon-menus-4.6.1.tar.gz 96294 BLAKE2B bdfacd5f4c5344833c9804b79846c5ac9
 DIST cinnamon-menus-4.8.2.tar.gz 101831 BLAKE2B 6b731c21bee03fbd69360258d7573e35b774cc42ffdaf7536e7c8a3779e8ef9e8bc3684166a02f114838144fa9b7ea71a46b439e00f90abee56da1925bafec76 SHA512 6aa44e55ebcc60236361cd390fffbccd13422355e9fb4c61c8559479892d85890611d66971570454ce1a87a459c4a7de51cd2751eae4a042490155e0a9030e0a
 EBUILD cinnamon-menus-4.6.1.ebuild 816 BLAKE2B fe4fc761d8977ff3b02b31599d3e85b5f1fbe8643125036fe1475d767f5aaee5dae3ea7669be06563c1efa57d128899ca3dbac5ee0068467389255f2f7a4558e SHA512 4d24f0612e6e5a31b756af7c07f0f2dabc6755eb02009e6bddc2ac15a5babaf654f937d891af71f996f3b0c6c6458895790de78d15c8732d5e07fb3442e7be5a
 EBUILD cinnamon-menus-4.8.2.ebuild 826 BLAKE2B be6e87668bc7fa1acbfbdfcd845c082005c7aaa026b8ac4331111d463ea3be80338beb5e642fc19a76a25ada66b95de0e57d1d3351d28eff3e3ecdd962f830c8 SHA512 e13330e80f2eb4828e67d915c2d15a612c9352318bcb2711f235bdb7c56111735025ea84636bfafa4322770a893edf32ac82d12eb4e621d90a023a76673333c2
-MISC metadata.xml 463 BLAKE2B 41f1994f18142bb9c28d5b60d6a3d2afaf4163dcf04fdf20c663361064e93d61e2ae363a6d8aad667186e39873ea85ed571e35ebd1b4f2d1ce59441a3ac51665 SHA512 14e5471c3ee6048d5e976cd8734b91f9f27818df88014e8ace1c22c9cc9121f167064dea98a36d4cc80f5c01f9adf90df095902e6ea86f80d1c3dc86447bfe37
+MISC metadata.xml 493 BLAKE2B 9fc18ceed70ace9610211b88dbba12c773874bdb3ceaadd0d7811c35eb7274599a50259eb5a8e9ef65a0b9f92badc35c3ef41733a0e5a400821b264782b79657 SHA512 90a41ebbf88d17e5d8bc482d595054bb13e701c37335a514ff1d52066dddacd25f2dd62af44ef3eb109874671ebea9b09ff9e07d1c3e256ed53691fb9f986fe5
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index 73a01d100eb4..f236795a76f3 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 298224fe155e..d95cde4a5c8e 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -4,4 +4,4 @@ DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccd
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
 EBUILD cinnamon-screensaver-4.6.0.ebuild 1672 BLAKE2B 8020bd0aecf18fa044f477bbe702d79f1ed67425e9c3cd81f84ba8a23ac34d3efee118c40f23ad54969e2d21a45a9e639f277b03b046a9ef89fd02eed90401f8 SHA512 5e3a30c36adb4de717363a092387c35ed664f01e43b9cde26d71b232dc220d6bf30746615645e594ce8fb0602477b210d858703ae9a44c41f08411ecc3b2f0a7
 EBUILD cinnamon-screensaver-4.8.1.ebuild 1629 BLAKE2B 79882f5056919c8f47e8f64616de115fb8f3dc3c3223d841ccf20b6b72b8b73f77ae7131e369aa288864c358441de1df3402cf4a703d984cc2116857952c68eb SHA512 68da60c0a1d8c03782631874c97ec72ded3733cc7bbdd18982070cb4b17a94829155a628ad5d0b07d362a4319ce74015f27607e44d81d79b6d323192c967cdcc
-MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
+MISC metadata.xml 499 BLAKE2B cdc003bc99ca0cc2d1aac9255edc856e0a0856377957340cfb2654f6e40db406169a95789ffd1c8bbc3b91cc6ad1cabacfc880f8ae70244587bddf697c0cf1da SHA512 ade4955b678ef51cad43c4809c7165fdd084a18cd89f977e0f4daf8234ddab3fdec289ad43c60ca2f85251dbc7da368113294d8f0f955b92809ef373c13a8584
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
index dc3e996b024a..c5c1c4e79a69 100644
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 544f064f046a..5c05c3a26444 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -2,4 +2,4 @@ DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc
 DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
 EBUILD cinnamon-session-4.6.2.ebuild 1416 BLAKE2B 3d4089f43abe155d7f8a54ed1bf81bc172b78e067e2c46e6a796b22844808adf17e7a29b3c83a53c9471a362266f254e2c301ebcfff5881d33ff535ba506e73b SHA512 fb06b0991774065a279b46ec857e22424b6b222814adf4b1705fc6a35e09a8186131cbb5aa267d1e2df249faa1eccf18aaeeb668c5eb2588a7a011e903fe1d0d
 EBUILD cinnamon-session-4.8.0.ebuild 1441 BLAKE2B 8671cfdab5344d90f5e3e7ef28b667b27d5b25b1dcfa7bbef8c6d3f1c67469409758eea0821003cb07b09893ee228b5ef07d59a55598328663ce50060cd6b8c4 SHA512 1c36fb317fac0f938ec5729ec6023e7b96dc93b296d86d6e87b71178ca117e9ec5c14894b366ebc68f7dc79c6a0b1bf3cb4843043836749740b1e22c2f410900
-MISC metadata.xml 465 BLAKE2B e67971b7481b6dff91982fb7b3d72db752d62b683cd0043e215589aea4a026e5150b4da5a3798b8d09d39933b0bb41c5a62bfb41ff70ead0dcb01c2e4e732053 SHA512 35772b3727591d6cd02458d0862bdbd2346cb1d7a2640e9871a7dd0fa279ae7aece23e4f0194f10d67ae24ca999fd7463c6e29be470653d520c1295c7d679771
+MISC metadata.xml 495 BLAKE2B a8a525b00061705e885d1a884c7dd9b53e4476769d59fd23fd66e8e7c717a3f9f4564f403a1f5d679b7c45ba889fc65812d96805f469e08a249c645cd3f59019 SHA512 1b8c4c3659fb88b4fd490cc8cf011c247094326dd6b9d9776fcefddd6fcfcbb947ba28fbed35a89db22cc01ffbf8a12829be981e336aabcc32c2d6430442c376
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 46942b72cc14..ad00dd22598e 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 1a7601708c53..8a86cf936f6e 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -4,4 +4,4 @@ DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
 EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2562 BLAKE2B 9ca766a67b310e90461b3dfe889b75a20e0698ac5205600a09ce92b7e5d87676d84bcf901b4669db238a73fdbba5db79065e3b68ae0df2670821dab941d99bcc SHA512 f576c527dbb4aac5145e8b0b56f3a4f5e5c3382e9f5cb766abf29fa1a6fa652af99005d7d24a3d508d2c3341e65036046ff55f34fc5b258b82a52d1ba2d1c557
 EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2350 BLAKE2B 70436726dbad58dab73be4f1263d35200c282a1ce7fe1821bd5a31b784c87024d4f860f334a1995579b984b7c49a5f646709312ea5d91a22ff7e92aabb3a414c SHA512 40e3de6507e938492a9e539b93b606ca50f36ff216896dbb78675aabf8e71bd1c22afda209647d7706376d9bb810843891f1ab46fc7c6141817bc013cfff244b
-MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
+MISC metadata.xml 503 BLAKE2B 140d4e0ca8fc8c1706d856b305a12b9cf26d7efb2f7fa3292423e3617e109c42ddbf7b651923b5f84a1f56422a0b2e780ddce2573b5db2bd3f91a81ccd139c44 SHA512 0caf37ce7de312218834db1ee57f9a5e860eb34d32fd80cd96407b0f28b678c70de171a491695b32c47fd54cd1058a145e40bc64ecb3b51d47718f2215af1ed6
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index 2f02e2341512..bcffcb690264 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 3c18624a034f..383e6f532fc6 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -2,4 +2,4 @@ DIST cinnamon-translations-4.6.2.tar.gz 11728647 BLAKE2B a1c8feb175be6bdb3bca304
 DIST cinnamon-translations-4.8.3.tar.gz 12010514 BLAKE2B a1635f08376ff85a082078e3da64d0f5159d818ba1c57ae79439168553dd8c7e80e2d1aed93361c9df164d790f8be41059e7227c76ebee2285ea53a10df4f9ae SHA512 e7e674be8c542bb34cab9e191f4124b17d0fd932315838be241a7e0fea82aaa72f35e3ecf2d01972def7bd8c4b7a697107a6a14a64ab26c0d1cea4692cf62ff1
 EBUILD cinnamon-translations-4.6.2.ebuild 1341 BLAKE2B 1b7282d32367215f6532f271b37734f6aff0b75c7d6632d2ded2d20eebbf5ea98cf6e127b2999f4d0cedec0b06282f89467cde18d01c05522fdc557e2cfac82d SHA512 5a226e61147e8e21b0cefebcdbbd9cde4d31da43f0f081749412e528034bc78efc20348a9b56af07c57342de9c3bc1630ced8d798cbc9de63050b68dbd23ddd3
 EBUILD cinnamon-translations-4.8.3.ebuild 1333 BLAKE2B bbd31170630b66a7cae1cb42468f2a3bcae3b2eac40c96c23c47bd7d0ac12a8ed18574cfdfbcf55d3776fc764315918ac458dc2b79de700d53a55bc44c6c9bb0 SHA512 92d33c5a00ea502f43a55c43427af6848488cc422d968bf729db4626f8d843db28452771bd271cc5b836fb61cf68c251b6b6960beb4130772d7c9a3168ffd58a
-MISC metadata.xml 470 BLAKE2B b0df2af77ac75dc30330b04e80fb609138bc9ed1fd470cdb25dfe8c53052bbf0ae454e1b3666e118720d0bfdfed604f1a295de04954d28798c4e51a6cff73ae8 SHA512 248dc0f84f5d43861ca7a96baf2d25959d76a7f9e0cdeeb7aac738b5a0b30eef8e1b7c113a5e3d89a0e5c0c4226e28231b98967b80b237dbfd0f4c88ebdc7b5e
+MISC metadata.xml 500 BLAKE2B b320afe0e72c5d2664e88acd7e4c532ebbe99def2a7bb47c0178c51c41c45f063fee9ffdaffcdfd2e5a0fd4bd4c73bdb924a131b0cb82c77d31442dea30860f3 SHA512 2cd989b1db3b951b3927679591b7f42e0527daaf979fd93175c4cb5ba95fde556aafbdaebc9265cbde6df239253e2c64462aa3fe89e0451653052b5245dba4a4
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
index 4ee1d196c743..c11269e5597c 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 71425e4b7532..98ba081488eb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -6,4 +6,4 @@ DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 EBUILD cinnamon-4.6.7.ebuild 5657 BLAKE2B b3b49a03cf3829dbac90c966f4135964caf0ab1b45e6c28448a517a23c9dee2125a6206c2a34b9183c9750b8c760cb14b7fc993716ed4824ed21acae178a5db0 SHA512 a377c3c1d34c69238813960238733f512a67b6002fd47d215b0b80a4ed290e37511a41bd33af783b9506ca4698060e31c97b1574f54980a7295d08ea1ad0f318
 EBUILD cinnamon-4.8.6.ebuild 5030 BLAKE2B cd1656ff0daf268ee8cb172b2ac65497e4dcf5b0a3284619420093b150dad49a5b78a47248422c97ab342989176b1407878fd12ad8ef0c17f1ec523951e855b9 SHA512 e6bf27f1db6308f84b5efffcc57aa80e4c5faa39fb5ed41a7fa40fe7ef405c0e8ebd897f456ade8de8ba61cb57ec93a505278b421da17367f6cb8918465b678d
-MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
+MISC metadata.xml 487 BLAKE2B ec4d9655fccd9121ddb07b22cbc1ad94ceaf48c1994b1e27f6b0e1d5866b70d9b058af3c36c20a3856770428b6c17c6f97973be2a2040dba63fb45406ede2f2c SHA512 f6d2d4bada61a51e2af982dea1d908d31eec02f794cd72cdb80935320c17b1c25dd91a80c8b28f1d4b7c92bf40e4ab958ec394d3fec6ea90d602d6df485cc3c0
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 433968db74e1..98ab19084666 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 26956eebfe7a..e9773c170297 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -2,4 +2,4 @@ DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63c
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
 EBUILD cjs-4.6.0.ebuild 1693 BLAKE2B 0e85f00c9a38a3b83231a5770ea9e906fd3754de9a78c70ccb05f9be4764c4764335c8af557dcf18f1caccbe2cd5d734f5553c1668d0f53b59c478a3b2112fbe SHA512 9a84918c0453f47af3e65400dfd9ff8b021e94f289d402888b06b0639135588649625e73ba1e086a07011ec9ceb3018a0a2d631f55d4ff3840c21b2cb3a12aa7
 EBUILD cjs-4.8.2.ebuild 1502 BLAKE2B f16b1a4fd392e78984d8c3c73e2aa04ceaf50c422d8aad5aecd1112bea02cd85f12ee0e732862e1e4cbce10ebee7c3b6904abc1801ad70a639a619b9a118abcf SHA512 3f02401b9061c5d2161b90db5b22fa85eddf85c6ca0f60be6fba6ecb7cc1c35914bedee6c1a74a6fd7ad3ba80c308f67ab97ffb1dcad2db6c346379d8c4707f1
-MISC metadata.xml 577 BLAKE2B 7b78b21cf3c8fa925625a56ece9a134b4c3ce3d40a8ab2dc33449c0fc37702ba6284c95f21404a864ff920b3fee2e53a5dcf85ed03b5f72fca4c8bfb32d3ef65 SHA512 e7524b00348868c07b931d72bf765f5d1690ca8c273c5d9a61123f78e57fd5d0680efc8074c6ef19322047fe9d26b8d7de843260dcf745006e585dd990c37c47
+MISC metadata.xml 607 BLAKE2B c08d54529aa035fe5008bdb76cfa944ed7eb63f183e0522a48e2b79758cce23ae56db7a87e019a8ecc767846d60c8cdd9e6e43cb82c7c85720582700f73ac96b SHA512 4971937c41e167e93266d694ff5f70d4c1118c07934f7a695242c5fc702655f335eda00beef5c97bdc84a68acef02834f6a5ffdbaaec9383c6a9fcdcb96464d8
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 3964c39d71af..d9ac4de77d62 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index a37fcbe90874..4eadfb91a132 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-commander-1.10.3.tar.xz 7474512 BLAKE2B f27f86a470bc919327980ba21c577241034290d74b663d4479195fa21249ce9bd238b12a0fae70c3cc6ab26953a595414efbe04508c73f8deb5e7c6e2de6f784 SHA512 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f
 EBUILD gnome-commander-1.10.3.ebuild 1542 BLAKE2B 383f7af858d068671ae8984f5fb54b0dafe565b9ea103acfdda52074a03f070aaa4005cb020734c9a4303e3cb262d3aad7bcd180bfed1197ea1bf4425d7e6668 SHA512 bdb982208a0f24b6f15cdb2522ba8f77ee709fa849e8cf24e2bd5b79b5db0c48f28563708ec2b41685513778a418d7fb6689fa76f6e36c941f6e20db355b8567
-MISC metadata.xml 1154 BLAKE2B a63442239df95b58fab2bce3dd1fcff690b37b5ffd90ada27ae772e118205bdab1567d5a9eabe0140827e30aefe5521d9646f46ccd18b9a5db7de8bbf9a40d75 SHA512 e38f3268f6c44152c0c071d0efc66b805872a67de1a81f19379ccccfc599c6bb0355bf1f37ee0d034f1384ca95e3c2527dadf2bcd5358cb506380f8488b00afc
+MISC metadata.xml 1184 BLAKE2B 67cebfd91081da26092e4815eb831d0357f412716fbf0c623570771593d1f0459c101706e4ae28b32fed3c2f565e90a637ca1124801d76427daa8f5951fcadee SHA512 b849ad625d93d3bad3ab84c4c03b1821dd4dc105ead084268ccdb9e0f2026669d39b258afb3e77c28eb5475732dec1073e6931d6099a7dd8aec50f5500a5da62
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index d65a7f69510a..145495440a49 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>u.scholz83@gmx.de</email>
     <name>Uwe Scholz</name>
    </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index ebe86da62675..a3e629d2dc27 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-appindicator-33.tar.gz 32600 BLAKE2B d24e18dc3697baf5f6a5466da6ba6bc4e699bb20cabde80dcfb007b339246cfb940af4407bc99d22632a1dfa1fe255a60fcf608ec50af88e3edbb2dcbceddf69 SHA512 ceb79a1fa22440210477e53e1ebca3db3ea81eb8a45613c46d37f44ebb3e063b626a073df519af978becf1c6a83d68c02a26f22bf0a9ed43e2299bbab7acb599
 DIST gnome-shell-extension-appindicator-34.tar.gz 34764 BLAKE2B 3a619f810d9ddf7984fc3b0c96735eb0f9233f36ff3cbddc5b28a8243f55d57cbc9c58b49516e99b30f35b12b6e747b7fa288fdc36f99cf7e61b7ad8cc2e84de SHA512 1f02a7cc3cfb90af8ee1a0bb39135fb3203bcc87d13cda0cf7f110db4b838a7c082eba30246a913306ef0e4b2fdb7c9f52f24f62525013ff8f1de9d054d45425
 EBUILD gnome-shell-extension-appindicator-33.ebuild 899 BLAKE2B b21b9cc8e0ff4caba11eaa8a37d0388c850c8da5feec13b6313158d8c1cff079f8f07ff9fbc4c2121bb7024b5f66e4ec23c49437c62da7d3949bb7f3315e47d3 SHA512 231365e25199991cc36994cd6d43524636baca5b97ee826f495ba23f3c69d0b474a8dcad9f9c2fcf3158fea7f25cff517f76999487087492a6476f69cd30bd99
-EBUILD gnome-shell-extension-appindicator-34.ebuild 901 BLAKE2B b896325223cadabc32b8dbe698dedb15a2f54eb34dfd6deedb2dc7abaf951eed167e57905676c69509c5690b6fcd5529a8e54040cb53a1e23f552500dcffa46c SHA512 51d87864fbfc517edf2824f76fbb492ef1fcca2ad39442479989978fd4056bb8ad9e19f280a6778518b68f745409002ca22b63557d4f449c2588dfc708bc50f4
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD gnome-shell-extension-appindicator-34.ebuild 899 BLAKE2B 3827e3dff875e238cf07e61be9caabccd2d04f1b515cf2c3697595f163da0e5865bcf2eb9f88bb1d239f04b84b7846b2382761976c7e16df069ed45e95846671 SHA512 49f7bba575fbf669f12595328349958aee645d1e7ef3572f1ffebcb8c5fa6b8896afa7c6fcab4f12391fe3834002e15b2e081db4b2e470dad3ae9808103015ee
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
index 933325eeb279..b94cde3db1c7 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-appindicator/metadata.xml b/gnome-extra/gnome-shell-extension-appindicator/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-appindicator/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 8e10af487332..ed16ffa1d1ab 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch 2262 BLAKE2B 1607c876c2fa81be04337c6bda4b574d421e9d51661309b544aceec770e55dbb3f74c6393a9ddea31f434f11a02e131c2087430a6e69213d8092bb99f12ed8f3 SHA512 e8817cd1ce672bb0e7be4ab64d24a461c0bb381503e4d0b2048d614d8adf2e1aa0067c5f728f30bd8e785a83a26a832efdb6eff75ba79b3b54a7e3b7bbb48221
 DIST gnome-shell-extension-applications-overview-tooltip-10.tar.gz 81397 BLAKE2B a9c838eb66ae49a3a195d8ce6e17fd971fb0dec00f62a2a7380fc973c9ba129611a93b904c658318e0bc80fb26ff9d65100cccd29f7f172dbef0f406bacefd14 SHA512 28bcc52b38d36e0897c949ba0eef11a94fce2e022ca3d398208221476b63b39281db9870d0c26a4bdffc07bb82e9d8942fd98820c78c6a4afe6d52eb5758e1c1
 DIST gnome-shell-extension-applications-overview-tooltip-9.tar.gz 81415 BLAKE2B 518352e80b5a3c6f8a2ff05e692178436625ea533e10a2afde82e73b6216f82dc29119c0e0a204ac8f1619de9409c47105107b94e3c4d1027c852b255eeb27ab SHA512 b8a2879f303a76e68eb5921005453e3fb73d966f1ed3f5978d9d210f447d8f780b5d9fa359aaa411f7ed8cecf72171dfcaa8da8515fd620193676b1b63742636
-EBUILD gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild 1295 BLAKE2B 1648eacaf070c02d7b64c27a7a2399eff9f24906d932ef7db66feae9c1a5eb4549b8324ea0c2832cb2c6cb5e8d3180bfaa9e858367cac2101f28fa5bafda845e SHA512 dd1f7cccd2adccb3274a42c011aff451eb3fb87ed5fa483b65f397c18a786e9275dfd6666e6804cd9b96f2d6ded8f49e6aca28d939fca6d8b9851b3c46d3b6cc
+EBUILD gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild 1294 BLAKE2B a08acb9b50e7de5074448f3d021e814a309bcd37843c498e84e11280c20bda1705a8e8898d676bf2b9366b2b83c774c4dd7b161d91d6ed809ad84185e6bec318 SHA512 26f992c4e742d0d38acbec14f6cd6ef35f266daa3ae26a4e0c08eb1af8eda7408509e3785fec191167b5c20feda935e1e88ad06886ea7a988c71ef3bc1a32788
 EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1257 BLAKE2B 56d3fe14b44a58c5d2eb9b59ffc99ebbe0448227e27a68252950d0f676a765a5983e44c554d1e06249653ef74b0655a1f516f15509baa05b3e9310c0beaab737 SHA512 faa26aa51c48098efca83872ac76ad3215d30ebf8c8493df70e32dc719da37378d21b9b87a47d45c89caf5d3958a7205496bfd08f9d4a060e67c8383ef616130
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
index 752839d2b804..ea3a9e02b46a 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index a6a530b82c23..125c53791bb4 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-bing-wallpaper-27.tar.gz 7202160 BLAKE2B bb908ccf0c67a06f80ef34edaed6257c5ae1b00570d6f3ab15a9a9c330368a2ae658f019943bf1806c1c97573cc5612b3c7dd22720d3048d628fcc2c15336420 SHA512 eaedbcf7e442d86b06f13745ac7796789bd5c7ccb0e64a4fbe10d4f6a2917ef9b4b9c1733d56c6620e0e8b4c4ef1281fd0d48151938519dd28249f07d54382f2
 DIST gnome-shell-extension-bing-wallpaper-28.tar.gz 7204530 BLAKE2B f52f8e83d203e3c2ca0f5437079d463c9e51a9ff9e594ad26fc291c362c4e340781a362beca316d0164e972b5b52a749a2afaf9ff1af74fb8eff3217deb7dbe9 SHA512 8c292129e539b415f19c732691d833463e437b06e1bca5a42f34885c19f7b8c4ab450a07956c0adcfdf0bf279ca303b1577a9723e3ce535eefa73efded26ae6b
 EBUILD gnome-shell-extension-bing-wallpaper-27.ebuild 1103 BLAKE2B 890f5954af5f0d692aa02c9935e476e4560269a3c34b94bb44d3638df6d968493e1867862f5c85fc714b4659b4f5d34048c621d552191dc812a9a18fd12fab86 SHA512 2b7bc8e72d7c4b6d588148731adf5b8d5ca981a67cd11b36aff632a6494909234e5591b39ac87e2c17d14a285e9f5895ae39704a984e199d2f946ca676f2b847
-EBUILD gnome-shell-extension-bing-wallpaper-28.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD gnome-shell-extension-bing-wallpaper-28.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
index c31bdf512404..015ffb1bd01a 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/metadata.xml b/gnome-extra/gnome-shell-extension-bing-wallpaper/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 19d4d7533c56..8abeff8acedf 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-bluetooth-quick-connect-13.tar.gz 19937 BLAKE2B 3b5c70d5302d8508d0a6165b06e41db9d256805c35ab4de095b7d97ce9bb24ee58185b6a7afec15a2fbe22ce9dc7859229670d4e00646c5353825dab1d1b4b5b SHA512 494827fa61e02bb3df0a054c7274fd61bf7d42aa4f8ece8c2b30a29a459b6fceba110b4016bd069f3cf5504561aee06fce3260cf9496b3d41516f077e8f99563
 DIST gnome-shell-extension-bluetooth-quick-connect-16.tar.gz 20053 BLAKE2B 37cf71c319a3715a7c5acb9835f1a480eb8b383e6dca48b3852ab949233137f963ee583d01e16d558bec02a9c7b604883c62e7c1b606624aecc82f7e83bbf297 SHA512 e9052d2199b8339e86b69dc317c26f23086131a6ecd8286d8058dddd185fb5cea4215fa3fb11e8b214f0a07a86cac2c45cdab1d83a529df3ab1991143b6cf53c
 EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1139 BLAKE2B 44b974fdb78c81f5215d7124220dcc4109c775af99a55f34b82bda63c736e41041bc639f70ec134bcf971563c06c411470883bb372ce1447d4c0ec5a09641604 SHA512 9e75dfa7a8448960c0c5dcab2e346a5a741332c0d577a51499f85cd0443dd55a69eaf948ca7863ac9fff3a663a6812737e7418af206d79472ac7f570c90179e2
-EBUILD gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild 1226 BLAKE2B 1bb797384ffe848a663ddc4eea0fb546b2a4fa99a36c86dab06f69f37ff74db2c00cf47f089feae50085059233d5562fcf5de5611171b424055415444c1f710e SHA512 03b2240d9522c6b00604e2aa799e5f7b329829fc68112671a8a81ccdaf9e2d711a7dc14f664d3ccda5475e2ae447a71fe85c41129e595e657ee3045bb5d13f13
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild 1225 BLAKE2B 249d716063d805bb74cde928061b9c894be2fb7128dcb0106415963db627061edbf551137c2856525c9444b91b060a057ed2194baa6a198824ac38e5e5dfefbf SHA512 a6127ca659c35a0d43145bc9d91c952631ca3ee0dc032d8da6b3c89ab052f697c266116444de311dbf97beab651e63f2d7340a6e77441f00789a900605cb3439
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
index 8263fc21dbab..9b66e6eeeefe 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index 1071e08c8161..ddadac84a419 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz 3431 BLAKE2B 6355135f9027d53b10ba1f02f2fdf90dc0acbd090be8905addc78f22f7b136464831985152d8a112febc8891bbd18ea42aedd8009c7db4afc52ba48b6d502511 SHA512 322da0bc511bbb6943713fd3fc3d75d8f32b9872ced9eeb611acc77756392d0b9c9dc1311bdb4e255d131637de6a17a3d0a76f1cebcc71218d67d2ef6078a4d1
-DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.tar.gz 15697 BLAKE2B e689b1cb09dd7a84b8c542a78fcc45dcf09af16725f44aa325d68009f189d4cd72ee435b8b66989cd18c6d1d33cda5d7a2408533f32a8da93a9b8cdd2f4f0bd0 SHA512 db29ea4ad68ed945857e2aef3c5afcc8449b5eb5163a7940487fa2fe174ab036a2a436a35dac345e3a3d96ec075460afe3ba48f5f460f14ed033ad5307ae5969
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild 1330 BLAKE2B 5fa31ccac489303a350c07a479310b22c18a1cdb18d3946b8f2345b72ac6a6c46ec9d2e6b6d8a41db5a54d8fa0095b181661cde21049a0565dca57e35ed2e716 SHA512 71643acd4848f8432bf80d199ac8e13e560e571d9d60edb608ccd98eaf82059909a74321e90ae39ba3bd25493bfce5437faf34f27badd675ec97bafa10fc67da
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild 1332 BLAKE2B 00489b78e1bffebf5c01404fc01212ca13da07581d262797d1dc0d26f7d2026f3fa2dbd202aea6b1c028f3c6a1f8f547f92cc26412a05a8c3a72f284538f0f07 SHA512 c3c4c3cafc30b73d4977f6ba96a7a02f06972cbe7047ba53f3dbb03ec8512a6dcc108af9d6622e30fc1d0e7d01ab99d3f9a593dc52159661061b3b561bfd8e1f
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1326 BLAKE2B d7cccb0f995d94d53550f77c5e06d21fb3091db4cd84225918a7404612fbc220cde74385fe46a53c46917069a6ca3b3c52265c57e8b01a0774309e07ccea03cd SHA512 712aadeda8942f32b6d7f3ad020fb2ddb62386d677bc85c53c9b4212aaada11ad7c88aad057fd0f0a47056881da6b17a03ddc3a36c239fa8dde7890e510b60c7
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1324 BLAKE2B befe19cb160c2a269b3c4dcf1f9a00d56f4d85540e59b9b4840db04d0cd1e7f1d51bc0406d8e772a1a507aee55d3f001c4739d4004f379cf485f2df6d7cee2b9 SHA512 26fbf34cce123893a05552ce239b025b604f5f64c13cbdaab82a22ccc62901a1679fe70ac07e06f096f678cc995ee59ca1e46ec28c5d7fbc1eee1b34b781a4d0
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild
deleted file mode 100644
index 8d72170e4b9e..000000000000
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.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 gnome2-utils
-
-DESCRIPTION="Control the blur effect on gnome-shell lock screen"
-HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
-COMMIT="df16335b2b7f4bbbd22b9e95a16f074ae405b3a3"
-SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.36.4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
-extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
-
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	cd "${extension_uuid}"
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
index a2add7f940a2..529d874917b6 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 95a471cfe962..8cc791838862 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -2,4 +2,4 @@ AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e12456114
 DIST gnome-shell-extension-dash-to-panel-40.tar.gz 21130921 BLAKE2B 3f5b60aaf4bece5d14adab616580e127ec62abfe3a68e3fdebe25a16c1a7e498932e350489863cc002cdb78ffacdc52dcc4eb79532da7aeb17d3cafaaeead8f4 SHA512 b59c0fe518c950b63119535cf53a51024d9575994de8a7603707d28b6503f6824324e44ca09d89f206c7d33888593e46604cb5745be366731160adace6d64e05
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1828 BLAKE2B 6180baacf1d2e4dc57afdf92d8c4f205b8459c2ae81b3df6d89fe1276792e7dc8f3d4db3ef795c88388e3814f5962b8092926e45ebc68f38b8792286e9da2ab9 SHA512 a320b154e0b349d1e15ac209d926ba8d3a309ec84db3089a4b7bb5353b7e4623ee0df165929f04a6bbfe3e67748d121d2f045e37a511a9c65d7f85077cd554ad
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml b/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
index 1409da9bdc84..f4f394ca2e8d 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,7 +1,5 @@
-DIST desktop-icons-20.04.0.tar.bz2 59444 BLAKE2B 245ca07afaabe5f4e26ed920d4d0caec104f535398a92d79cddb08ef2bef42b6cff389320c48449d6ad904e2d2d0f74140512a6b0214e7a81ab444e5bafee2c0 SHA512 c7b13077aafd1e554e425b2ef323be309b880a38bcbfa3ba849a8bbb3458a4eb42177f75b1004741b85907bc0113cc09c72566401bc99f64f47ad87013659bf9
 DIST desktop-icons-20.04.0.tar.xz 50448 BLAKE2B a93baf7cb37a3f78deb8780dcf4ec65bd20e42ecd9255924c61f457d3f6fe4cafd4865b80e414105f9e72fe835caaf034474f7e587a30b91c233edfc2851ad00 SHA512 6c411e4983901a0646d49ffa58bc9d711c33222b787795f5c237370168fb4bc7ff186cc071675decdcfaae846c1696d718b659b75120ad7777cb04dfd26dbc84
 DIST desktop-icons-20.10.0.tar.xz 58484 BLAKE2B fd41f524803df7e96394c0ef66a70bef7e2522d2dacc7f384101c8524f2193ebd0126334474c27fb2e348fc329e36cae941590ae3875a2ce966ba6d9d8079dda SHA512 b9dbeb22522f02e3fc9388a18e36f11e13932e265e70661152c7dbe2a762e820564484fdf1d16591882ae9f675f1071319d238b6190a406295f07e8675bb9e36
 EBUILD gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild 1016 BLAKE2B cebf2c21fc354e65ab3efce5315be2ef41d8467e2f7468973cd3214aaac553bcb39dfd0df08fcb4a11ab4f70f5c6781aa7fe19a8999144f4d2afab1d7a641271 SHA512 858121d02dd47c198e25c599833aafd6c893a27a9035d423e18581a750f931c10a1f7bd10f6d1be94851b292104ab4115b2eeac40586f5b8f2f6ef3daa91e68b
-EBUILD gnome-shell-extension-desktop-icons-20.04.0-r2.ebuild 1164 BLAKE2B b03de2d74f78f80794aa0221862a9733546e6539486e3d90a9e468e86e1811653f04b8dcef5ce5af16a660d9397103f3be55c440b5f0ee39a4365add76bb1e0a SHA512 b4a3219a2f30d423245bac2413f45e4dc2220d2be4df7b5961cec4a77b52fee1abdb47f049395aa0a70a0ab65b3b5e169dd0e98334d0a55a8907ddccd8b6c86a
-EBUILD gnome-shell-extension-desktop-icons-20.10.0.ebuild 1156 BLAKE2B ee700f35add0d0e69df2a88ebcfd60ef1fb2c2dfb2e8a3bedb46491758c98e4c54998a39739f6f572208670e9c2e2c98831b9e972845d3e684cb516876a9279f SHA512 02c50cc46b35effbcbad8466b17e4467b87ce84bb41dce7e421b2a55b361c392ce63a7dd6463a1479349db7b4fe89801f10bc0e800ab85926f01673e1874f799
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD gnome-shell-extension-desktop-icons-20.10.0.ebuild 1155 BLAKE2B 90b9ab08f7edbebeaeb076d3e481d913fa4016a5e161ad937defe375d207d760fbeb5d921cdcf152aa4ce29ba3d4f8144a4fded2487fc4922824ca3a813c030b SHA512 f56883729625a92699d86d25412bd2efe4ce8ce6a8e13fa3dede526e4d249e3bd484a13058f7600f8d9928d28b50fe4913ad088bf7d702b960fb21b156019922
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r2.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r2.ebuild
deleted file mode 100644
index 9edcdc422472..000000000000
--- a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A GNOME Shell extension for providing desktop icons"
-HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
-
-COMMIT="219eaf7c76b06f9fadb47ee2470cf166f2a070c4"
-#SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMIT}/${MY_P}.tar.xz"
-SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/-/archive/${COMMIT}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-	>=gnome-base/nautilus-3.30.4
-	sys-apps/xdg-desktop-portal
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-#S="${WORKDIR}/${MY_P}"
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild
index 2fc8005e6d09..1c87bfda9e9c 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMI
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml b/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index ffb8b53b64af..dca802289079 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-shell-extension-gsconnect-41.tar.gz 614195 BLAKE2B ebcf9fca448e27fe0e74bf4118528a5f8f7055ea962d4e928feceaa3257e9ff6f286a2b11631468abac1355c2506a0d8923fe56d4370f37fd7e93fe7cd8e8d45 SHA512 12de97683e4bcbf49774b6b6f93803bb0d0005f3114a581ccd7a7219cc2cb27a0e7b10d45a162c879f27e058d99b791ce33425e465651fe1f4e93f1a332a0eaa
 DIST gnome-shell-extension-gsconnect-42.tar.gz 729438 BLAKE2B 19aea0008487c5c316a6883da176ccba4bf31334abe1ce273cdba91d4fbacfa8a3e003909488e957486ea371043174eefd1ca990470f99ac4ff36ff73cd498cc SHA512 27965435ef9524021e3ce3825af73d9a8b7f602d8c73b524bcf247b6af47ad14b16e83815b1a30e148b109531fbe230e531e1a0b456f5f51c9c96a4c5a3b19a5
 DIST gnome-shell-extension-gsconnect-44.tar.gz 731896 BLAKE2B f4d51ca366bf6a3fe65713da516331a5e3beba19ed6fa22b7224be3c05433bdc125d80e04ac3a1da966ed4f671c6771a53b0cd3f94f7c81eea51f8a30415a5d6 SHA512 92ca5750772c64300c4b8760d4202a1e27d5e7f0fedc5672fd54b48e17de095b29fe0ce18df76619a2e3e3802bb4b77ffdc98b9b4987db3e9550251a61f8b832
-EBUILD gnome-shell-extension-gsconnect-41.ebuild 1589 BLAKE2B 2fe5b45b50e276f1b075d3541f78bb798a9ce254bcc88c40e9ddcf13a1668386cb97710e33db19fdcd5f71ae11603f42a8d005c6db7b13793526a5af2a328688 SHA512 c74181be8de7a50b6bb1938b9d756563bc7d9f89ecc609a1204a7f3aaadce7f2f801499f4374f8e0ce29b832575e1eace11979b83b7e76fd4446d18cd3b2ffb1
 EBUILD gnome-shell-extension-gsconnect-42.ebuild 1617 BLAKE2B df9cfa8cf83c338b36041ab932e582af2fc30578b9887173dbcbc28cd26b78f7374ff5ed3f5f8f74415f338cc5f4f0a2aaa33160564c763f26876a178a8448b8 SHA512 48e0991a87fc962686e5fc235981b9fa3ffaba7e82b19daec86f203c4d2735739465759bd55d2b1e7b06737b84ef0c4d539095a87c421bb2ecb5860690ce0732
-EBUILD gnome-shell-extension-gsconnect-44.ebuild 1619 BLAKE2B 5519a8b0133817ceed28d093caeaa80b5a6992649d4685d7e5b58a5d0fa4d26cc7301a3dfe461919a43b342a2384b11a08c02b401de8898315f9ab27f16f8532 SHA512 51caf148a025dcc87de59b82a7aefb36417e1f865c14ae75288b82ce04ab1537ec781f8a253f5e6b8f9f758c85679cd1a45676d1df9b980a3be9dcfaed1b3046
-MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
+EBUILD gnome-shell-extension-gsconnect-44.ebuild 1618 BLAKE2B 3139450dc16fa86b92c30d650fd7a47ef1b0e199991d33af3b12e6878a0e562202828338c848ed36a8cd7b2217b8ee846f93db487c24c244086d4cd9531ec37b SHA512 2b29c69580d0075237fe9e6570728edba3a1f129e62455c04d1d1c665c8d98d0080af9462d39c3d999b1b459b6d5da485cc0ca6816377992a95b18123eeef402
+MISC metadata.xml 345 BLAKE2B 77e44add98d26f7ad351ad6ba3a11852499b76435ee6e49b6c37f30aabd406fbbf65498463bf668fc5971ff03dcd7226e5f263e2e87fab7c208048f6ce6210e6 SHA512 5402440fca2d10c50ad20eac8225d99df4a0e6f13c3758f4b08a692d11e8b8bfa35a89909777b60a3675f229d2122a19861cc5832510122474be99f5c1addfa1
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
deleted file mode 100644
index 9c0438922d3f..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	=gnome-base/gnome-shell-3.36*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
index a971cf00fd4f..b766857e93e2 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
index 61da47d8257f..5bf24cbbe118 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="nautilus">Install Nautilus extension for sending files via GSConnect</flag>
 	</use>
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index 580c2ccf6ec8..637f13f234a3 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-extensions-topicons-plus-27.tar.gz 2759687 BLAKE2B 854e5c8c1f749bdb3d8b83ac98d39ddcf22cfbe7221601a80b7b961c1d0dbe8ee2242ec5378c409c786957ff47602a7828fca55a09e7fa6225d4477a156a61de SHA512 3df28397bcefda7a43e6eaa520629f08a3538c98675243af2b1e109ec913d70b55f142169ad0035d0d29cacdf8f2c908eedf222e852591ed1dd5b6aa6b34591e
 EBUILD gnome-shell-extensions-topicons-plus-27.ebuild 1191 BLAKE2B a2fd1f2cc7f9338413506b4963d40b764b7eaad155aff7018df871d1693272be70bca55c97cf62435988acefa52d9ac0d1ad37d498c3e60fd7b7509c2a3766ba SHA512 3e84ed6d7ef82ddf40b8b9ad9efa86d25fd3e3593b307cf6536568a3ec5929978a148341cbc02371e388753899435dd0d007e1c2044661cf830171d0f40d96b3
-MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
+MISC metadata.xml 339 BLAKE2B 2447959005caf5fd3e73add40ea3dbd534fdf7570c9eac45802e20a75f608b6832e17c9a3ba7a735e15d2eb812fe5fccc07a94f49ef8686d3833473c39ff13c2 SHA512 daa6bf05b44ba64d31e32eff4088da410928c6c32666e816426f5ebd27dbe8cfba302e48adebaa8f89cff63019adadb8dcc5d09e1e6bfdda2e58280384ad7d50
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
index 725b4746cbef..cd31a2f4cc24 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index b9296bc934a2..763a6569e60e 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,5 +1,7 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
-AUX 3.34.0-fix-python.patch 2967 BLAKE2B a1a2859dcd5ecd1028b1b08d266960bb0366d0a940c81a2e9e338af02b72a01939a835dca37ab05b8a5b0ca8e118e2e0b5178479aa90b61a59b3f426f83e95be SHA512 097abd98bd2124c5e2536ed7bc8f337f836da4a4dda4e2566d533c16e771d91690f43f47e7d61a9a238e2c9cf6e687a057b6857265ef3892eacfa7f2079a00b0
+AUX 3.34.0-fix-python.patch 2877 BLAKE2B 95a064d63c4f70ee3a79015b96d371b9fa394d50cbc5b9bb7561b641901775dd3f49ebaa1d29c481159b083b9fb07d9e7314d0748cab1d3b312973eb4bffdd84 SHA512 ecdc7a0d5df02b70dcc50c8d5ac03198871e96671521e3820b192ee6547953146783ef35571d5cc8c3eaf4ea044d3b60ad603f0f2fd45aad2df9a04c2a5dc0b5
 DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
+DIST gnome-tweaks-3.34.1.tar.xz 247980 BLAKE2B 55fbb16bcdb1a9ea4b5ca84df802266e07347377eab3712284973146fcc0797af59df5985725b1a95a1fba0d26b580a1c9862675978876de5eeb0de9c0060be3 SHA512 c922bf696b9ff48c8c39fd4ae06f4b72ea7b18645ad41552b0367859066d7601bc59521643335931e1cce799344a1c1ac9a7c28408de4c19bfa4127594a2ec7d
 EBUILD gnome-tweaks-3.34.0.ebuild 1274 BLAKE2B 7244b2f1d70713c9ba3fb863a024b0382ca22a2f1ecc6e19838fe970e712bf20568bd8b5966e29253c3c364f5c105e77d1dd76d5cd4cc651c988aefe5d03fc02 SHA512 3c7752d5c3df7759c5e6cfb8941a36dbcd69bfc497186197b88c46b33ca9c1ea826be12e81d83ab0d761d39b20564197ca550012d025e33262d68adda90e4f82
+EBUILD gnome-tweaks-3.34.1.ebuild 1268 BLAKE2B e7af464e2cf520e2db92c4e8b3508bb592fc1973ae478ae1d1a992e0ef92f550c06295c84f44ff6aba12ac66939ad0c3d5daa4ebc8e250dd3afd5d99c045aa8b SHA512 b0363f34e8f174bf9e7bb70a4468cc1ddd1768451025a2964a6387d2b2178a5c7b28726c388afa32ddc2755a29c723cbe91969d1c65ad4dc820ad442dbf3adcf
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
index 2501bc7c4d12..8845a0d26ca9 100644
--- a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
+++ b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
@@ -1,4 +1,4 @@
-From 0ec042734f63a3a870920b1e71f07851d335ea45 Mon Sep 17 00:00:00 2001
+From 024bf6cbccc4ceb9c1e8243f43df225f5dff9098 Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp <leio@gentoo.org>
 Date: Sun, 29 Mar 2020 16:05:36 +0300
 Subject: [PATCH] build: Fix python files installation handling
@@ -19,8 +19,8 @@ versions too. However fix it too, so that we are now warning-free for
 meson features after raising of the meson version dep.
 ---
  gtweak/meson.build |  5 ++---
- meson.build        | 12 ++++++++----
- 2 files changed, 10 insertions(+), 7 deletions(-)
+ meson.build        | 10 +++++++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/gtweak/meson.build b/gtweak/meson.build
 index 3d9a743..4e558b4 100644
@@ -43,15 +43,10 @@ index 3d9a743..4e558b4 100644
 +python3.install_sources(shell_sources, subdir: 'gtweak')
 +python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
 diff --git a/meson.build b/meson.build
-index b7da518..df49ae3 100644
+index cffa8af..60141c5 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1,11 +1,16 @@
- project('gnome-tweaks',
-   version: '3.34.0',
--  meson_version: '>= 0.40.0'
-+  meson_version: '>= 0.46.0'
- )
+@@ -5,7 +5,12 @@ project('gnome-tweaks',
  
  gnome = import('gnome')
  i18n = import('i18n')
@@ -81,5 +76,5 @@ index b7da518..df49ae3 100644
  schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
  
 -- 
-2.20.1
+2.26.2
 
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
new file mode 100644
index 000000000000..c71dcb2c2a96
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+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}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	gui-libs/libhandy:0.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+	"${FILESDIR}"/3.34.0-fix-python.patch
+)
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 4c1d40079eb7..878e984b5c7e 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,5 @@
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 DIST libgsf-1.14.47.tar.xz 691448 BLAKE2B 7be095fef159ff7a52f2cf4d83b59b5bb591e0d4fb1d69d88bc6f2eba4286337af2a2c46ac7d6603d5a68b9b6f03d41f647d34b0bee5e61244696c5ba02be569 SHA512 143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b
 EBUILD libgsf-1.14.46.ebuild 978 BLAKE2B 841d4045f10c43753c808cc6c0f4cda143c3bd303b1eb12b980a2fc9e89f558337de5f0830b5ca7447c68c819b2981b07ca3e5adfe6801a48713b7d3d85d5cc3 SHA512 9ae3aaabec5543c3a1c02fa69a82e18b15b06dd161b773cae755177b0486f03a8dd137d56085ced0f15d954b6ecced31212e37a86fb06c057f02344ac53b22ed
-EBUILD libgsf-1.14.47.ebuild 984 BLAKE2B 4166827a7b24df5980db26e8eb6d4c3679d5d9124b0103269f1777beeb72b360df08a0d08e1e84f2498483ccf3d80df9e65bb9e1c8869896839c972c10b1d116 SHA512 e552fa2f45fd7144b63342458116b90fe44c2276e099c5db0ffd693a795fa340ab4279ca403ef56314aec4e8edc35c4a84f385778eeee0a51da299028a4a3a68
+EBUILD libgsf-1.14.47.ebuild 983 BLAKE2B 07dc026f128a1afec4eba75518e78334549d52bbdd444b26f5ea9b025834472485335995cb64c3c47015bec01158097b4e972121431a8d4742c093450113866f SHA512 3cb6fab505fad47e99c8240225e611bfacc5be99c1b6b099b34f4eff63d6d0226593b0e904b7b8f311c97e1c2307f1ee8bdf480e0b14738906318f4694335ebb
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.47.ebuild b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
index f609d443dee2..8a8a7aca44ce 100644
--- a/gnome-extra/libgsf/libgsf-1.14.47.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/metadata.xml b/gnome-extra/metadata.xml
index a7fd28d99930..b974daf03e67 100644
--- a/gnome-extra/metadata.xml
+++ b/gnome-extra/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria gnome-extra zawiera dodatkowe pakiety dla środowiska GNOME.
 	</longdescription>
 </catmetadata>
-
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 7643f51e8c79..6f102a6c871b 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
 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
 EBUILD nautilus-dropbox-2019.02.14.ebuild 1348 BLAKE2B 47bad42c76c9dc763e2ff956b74c58ce37d9adfcfd53ec39299fc157aabf46677dc8ad3f309dff84223a51e28a54388bbfde391c0987a833ce3aaed70b2d887a SHA512 bc706d9ba742f574f105364922bfa96645aaa701e2891d037236d2f3ca649719776d8b6680a9f771745a589e972fd1d65e8c591f103d635ba96489a4e222f761
-MISC metadata.xml 552 BLAKE2B e6c9aca580f306553603321af76571b8c386646d110c73bfae250ab6d6efed3a16a67fbcb70cf051c13c143d15215f9402820328fe9113b2b304d506cb0ec2ff SHA512 300bebe2d4755eb54dc33fde5b7fa0c3b2b6116625356de05675b892125fa7ee23acc0bffa849eaf4f9b908d22cd093f54df898c7a12cd849ee5235e7a7049a5
+MISC metadata.xml 582 BLAKE2B eb358f22a425af53f12ca27a47f82d8eae8b3bd0529f36492e70d1335337a1bd0c7f430494d2431e19ea3305f8e29decfd7c056ab5d9fe8069fbff00e567b38c SHA512 24032cabaf2db87514114e49410d67eda72e5365486941bd76507ae7a4645142b493ec88fdf47952603e36d84d5089606fa0bcc5f1d9a6cdd8831e457f15688e
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 55dbd3b953f8..822dae2f0173 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Jonas Licht</name>
 		<email>jonas.licht@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 870274a756c1..70ec4a7496b4 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -3,4 +3,4 @@ DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0
 DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
 EBUILD nemo-4.6.5.ebuild 1875 BLAKE2B d64d8ba9cae1b3b99db4f6119c1d883e7435de1a24ec4ae84d669742babd95fe735d8784373d95534eade44079c76ca13c3cc5324a350ad3af828f431607f0dc SHA512 c887dfbb213e3c1d12e7d458802b6fbc4148732e44b4e2c68849782f45ee3b57b314c71bdaf686a4a11cf3be95b73451cd1bc57217615f0d873afa768aeaf9de
 EBUILD nemo-4.8.4.ebuild 2144 BLAKE2B 040387d15ff53178f071c2877510d68a90995e5dad795d4bbd8aac8fe6dca4706399513220843924278d2091e18dc4c8b5b7c7dfb3c2ee0b10196797c725c05d SHA512 cdd92f0cb3c2ca42eb9ecd811d70d7a52fe1e708f29459250a0a6600885225ae2d6b3be406e7859647f761d88943d4aad179751d0949009aaa6b76d96940bade
-MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
+MISC metadata.xml 579 BLAKE2B 14aee20b1ce0a9a689d0f512aa6e5895f768dbdfc4406cb9260f577fb0ab53639203c5b67e1a9a99b172e2dcb552a82e5f8b1364331969660fba2738f42df2f1 SHA512 8d9ba304e86d06573a5c8c2708f3f990a2869efb118f02a6ea4230a7c6e9b1aae99274869af2518010cd63f09e0c1c3380a3d34ad806e8ac3661464742ba5779
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index 038e09e28491..06261d13b922 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 3617a76ec078..2a9848b1a037 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,7 +1,5 @@
 DIST pch-session-3.36.3.tar.bz2 9575 BLAKE2B 1f7001c50247821b2c9771b8d16bd2b962712c033fde7af225a9aac152abb2a0505b73f5baf5913ce12e05bc7a89abcf0411b2ffa64dc0aa38b2bea0f3f41796 SHA512 b784421b27a446d460191da5a2eb6fbaf53aa4cffbfe8f113bc8c3ef308741ccfd6a208d6f6b1a50839b3a0925b22e6573604fd315496a5c59ae969fc8e6f7a6
-DIST pch-session-3.38.1.tar.bz2 3610377 BLAKE2B ef088deff17938419399b5ce7e4970e240bfc792ebb38dfda74d74fcf463859f3e0dad724744a839de87badc91baa6909b8c1a6a61f84e4c040f3adb0701e013 SHA512 738fb998fe62de4dc24685ed7c5867438d41b07115e2018668211a0f80757bba4e76238b277fb07920515f4c15a890df498cacc8c3c0f9a2cc491bd45e3b4a63
 DIST pch-session-3.38.2.tar.bz2 3610420 BLAKE2B b632119ca1b758cb3b356a8175057ee1dc7cd9b74790a989e2198ad10a5a62e392c14481cb17ac0beac25ad8f0b4a6a5bb69640ac87404dad2e616170358ea2e SHA512 ffefb2e34ebaded0b03d695b27281a3bdc6ac6ca9111243766f78f819823ce3d0fdd837e4495450be048c86ea6e09a37f1746753b728f45a5ae1e9f0360620b7
 EBUILD pch-session-3.36.3.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
-EBUILD pch-session-3.38.1.ebuild 1232 BLAKE2B 68b9fcbfd8fd4496a719e3c757d55ad901c55349cd207dade8e746ebf55aef64f2ccdf1ba70cf85416c4674bd6314ca43e85c22f580a91cf75245e37e299f334 SHA512 5364114bc5fe8212e101f6c530b7bfabdc5607d58f2fc5987922f91b597e001789a6fa83a230cd42f7592896ce9197d467a2de6b3d0841fbc73555d644f14c82
-EBUILD pch-session-3.38.2.ebuild 1232 BLAKE2B e2d75b2e06038ae86c8ee7882289fa0c900d5166f9a78bef2e87b66691717503397f4bf4a8fe30b29ed82d8de803db3a4d454db0b35e72580d42cc30e4120c47 SHA512 929b1f329322f1faaa605c102285a1c244482353379570a54b432dfa57e5dba09835d8ad20cb2bd7f375c67ac2fdab81621a70c58272d3ed19282b38c68538bf
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+EBUILD pch-session-3.38.2.ebuild 1231 BLAKE2B 84e4c986897cc9afff068882c96f1e0ea0755c2f306e9cbcaebe9df969e1ed6f3502d5d917bfa53a190c590fa3da8ec8e0ca1e3f61fbf32f766340c2b0a5d690 SHA512 d4e29f714802478d8f00722c57a25a7e59861c4d709dc87a8ec8262c77a016ab135cdf3bf5322309fc8ac8bdfe4b38ab76a344b37b055bc5ee889ee60322a98f
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/pch-session/metadata.xml b/gnome-extra/pch-session/metadata.xml
index 020b40648ee8..5b5fad3a835f 100644
--- a/gnome-extra/pch-session/metadata.xml
+++ b/gnome-extra/pch-session/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/pch-session/pch-session-3.38.1.ebuild b/gnome-extra/pch-session/pch-session-3.38.1.ebuild
deleted file mode 100644
index 24cf70256339..000000000000
--- a/gnome-extra/pch-session/pch-session-3.38.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/gnome-shell-3.38
-	>=gnome-extra/gnome-shell-extensions-3.38
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-10
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-40
-	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2
-	>=gnome-extra/gnome-shell-extension-gsconnect-44
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
-	>=gnome-extra/gnome-tweaks-3.34
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-3.38.2.ebuild b/gnome-extra/pch-session/pch-session-3.38.2.ebuild
index 894b3597dc98..6229b6902125 100644
--- a/gnome-extra/pch-session/pch-session-3.38.2.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.38.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 8a40fa8d75c5..c3c1856de351 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,4 +1,6 @@
 DIST sushi-3.34.0-patchset.tar.xz 8744 BLAKE2B 45077c7e78ebea5900ff8a1e8749f88677a6990d41cf44505437c5cbd05ce09b2ddef11de8e9078d419b1130f14d8ef4cbe7c6f15c80cee02dd72b17c4e84cfe SHA512 7c3d8e044179202a37c09436192436102a1ca223e358de1bc3857b0900c9921c72b1ab588fb08cfebe6ae440669a68786c3c1e83c1f6a3c489d4a5ce665217b3
 DIST sushi-3.34.0.tar.xz 74240 BLAKE2B 8b194be7ec831ce4f13549d465d6f1e6ba09ae4dc7ff86b1c214b79baac226654b75401d326d5d7d8fc0cc9fff28d8125aa4f5a9d3cdf54e472e5565815af75d SHA512 bde009b30106bf31199c8c3b040743de5f5c782fd540612a34055bef9a22f9a08c4ed0ae7c5fc3cbfdc67a5d12f28bc70ca5135ba227403e8d127295a1253d18
+DIST sushi-3.38.0.tar.xz 76500 BLAKE2B 6d4fb4d80fdec2e96d5cf91bfe6f0d859154e45f6bcd4677eae0e4c8bdcb20380e1cabcc6621e0bcdcc590a668798775bdb464b22298fe954c3d290d202c36c7 SHA512 c8d0dd7d9cf9d28496c6c4ac5f327bcf605994f189c476fe891d42c0c225d0368311baf06d7d6092805f729908491590bf719a9822513f96e2afe17e8ab962bd
 EBUILD sushi-3.34.0.ebuild 1522 BLAKE2B dfa69d244155f06de828f6064c07208a39099ed421667ca5ce5f89efcfca5ea610395689a025326b6aeaa45fc1ec1be3ba4b82d650c54b3cd79d8dd215fe0efa SHA512 b656d3f8541fc365468fa411cab6c5b68616f05c2b053276158fde2412de35e5531eaeda8d468cf1e752989f2ca76fe8fabb1262577739961f94b7b47096e56f
+EBUILD sushi-3.38.0.ebuild 1317 BLAKE2B 7dad0d8bf1c4aa5075b4e5a8a43db2b3bb00535dbe8ad66bafc78847cfbc11f207c5daffeac9bfacb93175a44bdae40050d5b0d448f59ff040c82f562f48ddb7 SHA512 2cb57a3f5a5cc2935d94eba48a8c94977c8f37f41406fac9bd99f2851d85c01eeb33ecf4b4e2478b32e2cca8a10a5772eaafa8184bc9596045fcf25f1b78b5bc
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.38.0.ebuild b/gnome-extra/sushi/sushi-3.38.0.ebuild
new file mode 100644
index 000000000000..9a2dfada0ca0
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.38.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="office wayland +X"
+REQUIRED_USE="|| ( wayland X )"
+
+# Optional app-office/libreoffice support (OOo to pdf and then preview)
+DEPEND="
+	media-libs/libepoxy
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
+	>=dev-libs/glib-2.29.14:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
+	>=x11-libs/gtksourceview-4.0.3:4[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/gobject-introspection-1.54:=
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	>=dev-libs/gjs-1.40
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/nautilus-3.1.90
+	office? ( app-office/libreoffice )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_feature wayland) \
+		$(meson_feature X X11)
+}
+
+src_compile() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	meson_src_compile
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index db83db530f1f..0a9c6a60032a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-3.36.1.tar.xz 640688 BLAKE2B 0851597133d04c40b69534f1db3d94f8c5eb7fe18e14d81d9a6fc7157e2bf3f63122b04e4c202fc632cf0ee511683e42cc63ba54fea1b6314b42f0a924078c32 SHA512 ae000c2d7d715474706b0da1cf8d9b6573a2767a9b5de31ef1cb95462b548b190f89d399b86280ccd61310257f71509feb92be6a0f6a69257cd91bbe14cbb4ea
+DIST yelp-xsl-3.38.3.tar.xz 642928 BLAKE2B 30c27d3ebbce1d55bb91c705e1a2ec3aae361646cfec97874614eaac1f8c51535c3ffff6a777fc19c9b85fcf5979384b1c7f4d854a41b10afc643bd68714e0af SHA512 17e66f744de0f88462fe8c1e1d484ead76551c6c0e8d7f9cdf04e670e50829e5258a8190cf58e0723eeeb3cd7fc44004ee5dfb53b5dd6f7dac52d2b8d6cfbaa2
 EBUILD yelp-xsl-3.36.1.ebuild 558 BLAKE2B 5f20d6d65c8558374fdf782f790532983ff6125708450c7ff0047759a2eff92b108b106e749eac9ec04e25b68e1f93ac2e39caf9b1496991969a7c29b24b4ba2 SHA512 2f6a47368c0158c991e676c3835dce2dff812b5e1e3ea02627d9fef63001d71ba61129652ceeb80b7a64dd878c56cb38d89ccf6ea11ab20b44a5ac48a87ebf9c
+EBUILD yelp-xsl-3.38.3.ebuild 566 BLAKE2B c32cd1766ab8d7a333990f4a01c76553266a2f5f1866168b22775db9c4bab2d264e6071fdc44cb0e568d48c5abfb350376437040c0af8a87ebf6bb50587a8ed3 SHA512 36c373e017829eb3fd1530d9edc62e502908c9dd87e2dca20c4db14d64f119e99af47c63a3552c3952ef0d313872a2971e43ad0a850d5df3490baadbd2ba83ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
new file mode 100644
index 000000000000..29a5e84f6294
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 7e76fa5cde06..0a72481bc7d4 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-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
 DIST yelp-3.36.2.tar.xz 1526300 BLAKE2B f33bbbab9c02d36d8d2472735b661f5a29bfae8b104851e202a0b825390c308500fe108b6a7741ddf0774b2657f772bf94b69051b089b98009ab49a1cc55e4f5 SHA512 eabf1513a723c208d63c728aa08da641672b93f026317258f5732371e9837ab7626d2dcaf609da7982458fe2caf76a6d7607042d073bb5779a2e3916e938af0d
+DIST yelp-3.38.3.tar.xz 1505460 BLAKE2B a9874d23b80094d4bf9d78e23072cee97b77c3f6cf0dd4eadad6d362a582559fa667862b11c34c5ca6569f4dc0ab4bf2b2e9f6f05d3100e674ecb717ad28eaf8 SHA512 7e4749b652fa60ab82a715f40be6b8e0430869ec94f47743e3c48b5a9894bc9867f8623574d27da6f3dfb3fe3269a384d02c817ef8c81188e559ab173412df79
 EBUILD yelp-3.36.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
 EBUILD yelp-3.36.2.ebuild 1215 BLAKE2B 450a2f71d7cfccb898182599d309c4f405302cd3aa962d289f3cb0d2e3d2b45c9fcd211b11bf407c4b8b7a28dcfcda31797bfa8fddd730c5fe88e275544561d9 SHA512 2886aa14b701cc96c9cfe2207f24502d831fc30b61f794b3a1783ba2ff021dd61d0b0911a7eddeed9f8938beab73cc90a285ea07f6fb169a732f25b3ff2c9385
+EBUILD yelp-3.38.3.ebuild 1216 BLAKE2B ac35d814f51eece4041a29d7620eb182705b77cb03de1ef7d5e1db13e61d3fb7a326a546727e21ae1187e69a1ef346c5a1852dff1adef8b6ed9b05a94ffdc67c SHA512 5526bd8ac48600bc749ec2771c0d5659ef908564c8131b9e32c27dd1aec608a9ac33ca2b984bc9dfb729a6fcf2fdc835a2f1380227b9548b97ac99efdddc3039
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.38.3.ebuild b/gnome-extra/yelp/yelp-3.38.3.ebuild
new file mode 100644
index 000000000000..ff02c223d184
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.38.3.ebuild
@@ -0,0 +1,57 @@
+# 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"
+IUSE=""
+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/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 396598bdd77d..640d731538bd 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/metadata.xml b/gnustep-apps/metadata.xml
index 3f0a3a1a216b..4542fbd8af27 100644
--- a/gnustep-apps/metadata.xml
+++ b/gnustep-apps/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria gnustep-apps zawiera programy GNUstep.
 	</longdescription>
 </catmetadata>
-
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index a41d96b9b758..2cf7f56a91bb 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/metadata.xml b/gnustep-base/metadata.xml
index cdf763f14e4c..456bd22473aa 100644
--- a/gnustep-base/metadata.xml
+++ b/gnustep-base/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria gnustep-base zawiera podstawowe pakiety GNUstep.
 	</longdescription>
 </catmetadata>
-
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 0197c560e1fe..89a2460669c4 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/metadata.xml b/gnustep-libs/metadata.xml
index 0cd2afaae61a..c215a6e871f2 100644
--- a/gnustep-libs/metadata.xml
+++ b/gnustep-libs/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria gnustep-libs zawiera biblioteki GNUstep.
 	</longdescription>
 </catmetadata>
-
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 90e9165671c1..d74b7e2379cf 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/gtkgreet/Manifest b/gui-apps/gtkgreet/Manifest
index 045651aa0039..236122ca8a11 100644
--- a/gui-apps/gtkgreet/Manifest
+++ b/gui-apps/gtkgreet/Manifest
@@ -4,4 +4,4 @@ DIST gtkgreet-0.7.tar.gz 26414 BLAKE2B a066cf35928179adc03e2ec7061cd9fef457a96ba
 EBUILD gtkgreet-0.6-r1.ebuild 870 BLAKE2B bb7a73be125138bfae207cf4074feb6aa14d647b668f08e2d86b9c6611f6e15d254433d3f82861215cf89c896f13eb53a40546b14b163d79595e0d3b2e773c76 SHA512 fef6696fba9ab06d3cadf1a58a2f4b6ad8a9c18450ff210c39ac4f62d5d372d56101fb4101fc13bf76bdf7b1978bbcfd8891151fea14ed2dd43b241f6cab1f63
 EBUILD gtkgreet-0.7.ebuild 873 BLAKE2B fd2bd4f4d58b2a06e8969b8cdab566a6845538628fb2b7b304ae8eab97c0b6c79f651ae77c923f5f34f6016aaffe28583e39b61bcd1bcb698e5daa7e09a30b6e SHA512 3bcb955c267ed212630fdd293bf0b9504350166fb2c3680729f4945b317b78f2c975db76cc89aa4046bf608da6f3b8e0159c2f43be2697144e568dac56ac3a38
 EBUILD gtkgreet-9999.ebuild 870 BLAKE2B bb7a73be125138bfae207cf4074feb6aa14d647b668f08e2d86b9c6611f6e15d254433d3f82861215cf89c896f13eb53a40546b14b163d79595e0d3b2e773c76 SHA512 fef6696fba9ab06d3cadf1a58a2f4b6ad8a9c18450ff210c39ac4f62d5d372d56101fb4101fc13bf76bdf7b1978bbcfd8891151fea14ed2dd43b241f6cab1f63
-MISC metadata.xml 434 BLAKE2B 5489a482f68485a08449be1c70ce5a73d5b667e73dd83ca5158152d8dc3c98881fbd0bb32fb0bfc684b638b4359435ad1071902b8213b3f06cf92ec407a54aa8 SHA512 c3271c3387c3d1168909373ab7b5c87fc6c9b3e4d859f67575c0becfd83647b91505e75e5254fb1cbf093cbda2c4d464c9ea963bb387c645138267fdbc7b1a9e
+MISC metadata.xml 464 BLAKE2B 474d6d506ff4beb2bc1d5e06e6831a8dfce3063ede6fcd4649941a015493100d1be9adeff5bd2a5a9c2bfc7583da218f965d8a2d49a7d9b66985437b2a954c3e SHA512 9c89971237432249e25f2a05b83b05f56c79836aca64feee06ba0ea95658754180c1cbfe22f85a74a392c9e79a3da39471253453b1be787b46e442ab865aca26
diff --git a/gui-apps/gtkgreet/metadata.xml b/gui-apps/gtkgreet/metadata.xml
index 024824fd2238..620929807531 100644
--- a/gui-apps/gtkgreet/metadata.xml
+++ b/gui-apps/gtkgreet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/kanshi/Manifest b/gui-apps/kanshi/Manifest
index b9155580dc4a..5c21c2866094 100644
--- a/gui-apps/kanshi/Manifest
+++ b/gui-apps/kanshi/Manifest
@@ -1,4 +1,4 @@
 DIST kanshi-1.1.0.tar.gz 15884 BLAKE2B 1085e9d8f3ff53f78cb248941269713fd7ea38c60ad0e9816acb902f171b6f945af521a3835fc9db479620e6031483f6dbab5cfc507872dcabdfbcf9d6711269 SHA512 6582bae7b73ad13cad83e4d537c7c870699a72bf6993becaafa47a3dd70439a3c626ffff4874c8f737b32b62ad7512772c2c3bf54ac2cb74879213bd40b8d7a1
 EBUILD kanshi-1.1.0.ebuild 836 BLAKE2B 30daa51aff230db79c766edd300d4591f0b9728e1718608fec03afc8d4160f6c1780688abac60aa146f29d53cce6c8a3a9c882f6ed4d1d91f4a99a8895974b26 SHA512 53b1f1fa72865063d24f8cf6e78c0cedf78664082abc1d258e8d0425e42147388cfb96816682673376bb6c6943ba0ac081294d62e287f839c7961927d70ba9a0
 EBUILD kanshi-9999.ebuild 817 BLAKE2B 1a51aef77f13910c4d083209df702f02a2f51c488f1e91dd15745116ada7e0c63cf6cc7b02d554577e73938950bc9177906b649c04151f40d3ac969ea1b09c85 SHA512 8090432f3ad0e3291b8d2615b620e9d7e838b25b8bacadc05c3171d29f1435e0b61f737af5640853cf5987c1d2a7d61ab7af659a9459385e472a5a787d257014
-MISC metadata.xml 576 BLAKE2B 140b8318ee61d4d64f0b70f321b4d5f18f3351b0dd69af73ccdda62a1a7801f51f9a627d04a809aa336bcc43a223c1047210173c34e480eb9a5d2146d92f59e2 SHA512 803bf6d770c70aade61626ff44e1bcf37c8ad763c9f023d83eaeb63467770599f9c7d3bd72f2d5a38d2d967418a7bb4f780c33dcd5f747510d8173ee7d42be74
+MISC metadata.xml 590 BLAKE2B 55ac2e4d031b921acc53dc61e44d0a6e65756879e1eb8ce504449d1eb25445c88c7911eb5d58b2f0de76797876b6d2d2a0c2c9673db1f5dced65352937195cdb SHA512 6c2641088509f6b5f4a9fc0a53c2fe7e3a6190095579e1fc8eb152b7b32f01747ebb5a109f9e7b16ef2a9e99cd75a922e57fc791865e5470494eddd55c4583bc
diff --git a/gui-apps/kanshi/metadata.xml b/gui-apps/kanshi/metadata.xml
index e82b7be5ba2b..9e79fd8a1f23 100644
--- a/gui-apps/kanshi/metadata.xml
+++ b/gui-apps/kanshi/metadata.xml
@@ -5,7 +5,7 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/gui-apps/lavalauncher/Manifest b/gui-apps/lavalauncher/Manifest
index 8615ee652f3e..c26d2c2e2833 100644
--- a/gui-apps/lavalauncher/Manifest
+++ b/gui-apps/lavalauncher/Manifest
@@ -5,4 +5,4 @@ DIST lavalauncher-2.0.0.tar.gz 92083 BLAKE2B 723685eba36b89c2807619598af4eeec3c5
 EBUILD lavalauncher-1.7.1.ebuild 923 BLAKE2B 9fe4c1e2333b9c059842924a185be6b80bfade76867fbf45c1208638ecf532dcb379bef7b98846c0f17155a2bc2b0d8ba33a6f04722689c3fb1a8618e1cd6f67 SHA512 8a0f9232e2f7fdbc3214e823df68c52f47802857c030d4b78f543ff5b1aa07f3d7496e0f68a21a084d721ffde77f0ae8893d682957832d30c5cdb545420ead34
 EBUILD lavalauncher-2.0.0.ebuild 997 BLAKE2B 1d68ed7713edb86e7ce05c06e0dd50f88eb32a0159e339a82f81249adb7771a94e0699508d1bc18e108f24ef6e2ac17d3e2783f3a9d58fb83a2c24b3fc8e1907 SHA512 eeb6b28465e28af4716f9370c142e4aec0c189aafefa1356109d26ef6b245a99d27ea0d80cf1a01eb72c895130fd635af23ace693970cc551f895d6c0633f270
 EBUILD lavalauncher-9999.ebuild 997 BLAKE2B 1d68ed7713edb86e7ce05c06e0dd50f88eb32a0159e339a82f81249adb7771a94e0699508d1bc18e108f24ef6e2ac17d3e2783f3a9d58fb83a2c24b3fc8e1907 SHA512 eeb6b28465e28af4716f9370c142e4aec0c189aafefa1356109d26ef6b245a99d27ea0d80cf1a01eb72c895130fd635af23ace693970cc551f895d6c0633f270
-MISC metadata.xml 606 BLAKE2B 5d325d4acc20c15675621c1077f2287df3a231fb205a55fc3281183f94ba42c28c926ec7d1201451e597862ac9c2bec2345ac75a56170acbeb528470316cf0bd SHA512 c21b46b612ac9aa353276d84e62c96f94b964451ab4007c8f2d0283a2e2e7f9ac7d08a9146948cd8a4f5da2b12277e77bf00de22ffe53adea128d7279f543a13
+MISC metadata.xml 636 BLAKE2B 387e0d49924f5153739602f0d9010f58dc61ba2f7e2ae6d78a5b6bd59ffd9acbddb971b4c32978815bca3c243f601586ff12a9a49b430b21e90a19ae6081ae14 SHA512 968ad5e6b2a07ca063980b86468a23d3a0c656d3fe5d1a2b894057d9cd08e6a950a4c23b6958565baa11f6fba0296bf8d9a027a3be9c01ebde1aaffbabe45b75
diff --git a/gui-apps/lavalauncher/metadata.xml b/gui-apps/lavalauncher/metadata.xml
index 1db45a5a6d9b..2a73b32f56f4 100644
--- a/gui-apps/lavalauncher/metadata.xml
+++ b/gui-apps/lavalauncher/metadata.xml
@@ -8,11 +8,11 @@
 		a dynamically sized bar, placed at one of the
 		screen edges.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/metadata.xml b/gui-apps/metadata.xml
index 282995e8541d..84b96cf19174 100644
--- a/gui-apps/metadata.xml
+++ b/gui-apps/metadata.xml
@@ -6,4 +6,3 @@
 		run across various window managers and gui backends.
 	</longdescription>
 </catmetadata>
-
diff --git a/gui-apps/swappy/Manifest b/gui-apps/swappy/Manifest
index 8619843c2dc6..141d97fdbfae 100644
--- a/gui-apps/swappy/Manifest
+++ b/gui-apps/swappy/Manifest
@@ -1,4 +1,4 @@
 DIST swappy-1.3.1.tar.gz 650917 BLAKE2B 7d1334414b5c4a7b0b53adbb40c5757398283dc0f3815ff5f4d2db6dd35d650b7e89e70663eaf7a0e111fadfcfe19e57af6a27037047f82f923409a77e44bdb6 SHA512 0d6a3ae9ed2595795ecff22fcc90640e416a1e34f11129146bb49642b4db58c615c29c1d4dcc964cc371545e73e64e99e48d1ddd0e8f36280158b649613a1693
 EBUILD swappy-1.3.1.ebuild 1081 BLAKE2B ceba7f7acf7bbd32f655594844966c0f8e7ec07744cfed1ace08057db62ce68a338223ac67729ae59c9dba7e8d169ccdacdf997e62de3d3efe5cdaca2b203fbd SHA512 3389c12dbdf7d227863ce51baabd287cb8838985941b1c1daf62c2cedf3499af7b3ee85a0180ebca930764836a2fba9999e1ac6e8637830a4b30a3458d10882b
 EBUILD swappy-9999.ebuild 893 BLAKE2B 4410d704ca4910af0626c16aa386d31f4426ab2016499a81d696d3a9b95f34a677f7826c824de15b8f2a0aa2208ad40d0e64bc46f00568d088828c7ac98c160f SHA512 9c7a4a9f8a48a4197d3cc4841998900f1a55bd4c0a46df9c26549fc4cae880a6f29cb2514c90d09546d6ee407d08e6db5dee1266bb92d0fe947c148eddf9d70e
-MISC metadata.xml 462 BLAKE2B c5d0b997c087af0575cec9cd58d01f8932a5e8fe7866a9bf910a77eddc3a3e120ab1fd9f7b53c8b2e8bcbde0ac75998851a943052dcc912ef981ebe655d3807c SHA512 ce5e2cc6d96e781aa1684e0653a951ca0dcbad1a19abef0c838dc6dd1f0f93ad51095e3ec56fe7d9eda52c77393082e6e715c5bbee999f425ca2904458ee72ec
+MISC metadata.xml 506 BLAKE2B e0009ead1f36b70d6a24b69bda3d12f3056d25e64aed124a712aa530e2a244ca817e1d86da90b4adcb24e93abfedb7228e9e1cd91ec371aeaee4f13bb7ac3042 SHA512 9511cf7c730a2cc1cd4cfff5775ad882b9922a9073c02216e55b55efd0ed915b76c088cefdc5bb560bdbf397b9b02ec33fbe9002aa57d68a5ba4103614f3b758
diff --git a/gui-apps/swappy/metadata.xml b/gui-apps/swappy/metadata.xml
index 4d6892c98d9e..eba0b037e818 100644
--- a/gui-apps/swappy/metadata.xml
+++ b/gui-apps/swappy/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>emily@emlove.me</email>
 		<name>Emily Mills</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
index c5d89ef1c7e6..8ebc2b157b12 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-9999.ebuild 813 BLAKE2B 749ea546ac884d7684006708287a703527df983e0890478842a1775e4e57debe0fb1afb5187ac360fc17c3a0ca1e584a319f80cbab0b4f104c70dd703cc55a75 SHA512 9dc55b737dfb5ac36ec2630e9aaa38f5c0bdf560d5a81bfed0825b7f5401b22216bd2bdca07cb4133a3c86027b9fcb2f9292b9876c50aefca202ccc5cfc8e336
-MISC metadata.xml 874 BLAKE2B f4a46d881ac47e43e8f214549cd0431644c23bdc53ed003a0a941bb982de2a6a51b18ee335f4153e4bd8c3ead76634061d9284f7928054231ac4c9ea56e5e3e9 SHA512 d54400f9f8629a6506ac80fb993a9f747ce59a0de571d27101fb232a87051451bc7b0688586ea8347490d9218a4326206f1d2f61200b76868bd0fd0b378a47ef
+MISC metadata.xml 888 BLAKE2B 9f83faa022a8a9977c4378ce146fa179e080f83ecfd136824a835eee83979d45f137d4de917fb9bcabf619b437023467063a53114782cc72e2dac40bf59c2c3f SHA512 eed11b5ffbca4411ef634e7c47f432e614614761b4058efb9c3427f6309db782777c51a3c4255f743bccd274888a6d2097f1e0476cdff837790fb8171bec514e
diff --git a/gui-apps/swaybg/metadata.xml b/gui-apps/swaybg/metadata.xml
index 32c06c124d0c..fca9b50d7f74 100644
--- a/gui-apps/swaybg/metadata.xml
+++ b/gui-apps/swaybg/metadata.xml
@@ -5,7 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index ddc271ab4c83..0cd1544eb856 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-9999.ebuild 1273 BLAKE2B bbff1eb0b6121c74c1eb7404138ad81b2f060895a7eb71eda9a87e9eda79e6be0ae5477b070a6b4091220b78b9aa38783a52e5681cd01cf820eca9d663f577e0 SHA512 24ad9f33d30eec175a831a6503a47d446b8d7642e3e9827d47105b60d6099965f57094848372c2ca7b68dc1437bcf96efe450c6a9f305ee50bfd1bc022b54590
-MISC metadata.xml 1013 BLAKE2B a1f387093e1a5865317461d9803e57a1e17ef21200824df37971014d0b566e7e23bedda8a35efeabcbae2216f89887cedb58566baf3bf0bbf55b799d813458e7 SHA512 7a177575d60433f1e31174fe0515d783d34f1698ea06c5c1654544f9dd4abcb4c053c6f9978ddd77c270db391fc65425731d89cf1ccc2fb564f695dd961066db
+MISC metadata.xml 1027 BLAKE2B 90746eaa42889e71c20b38dd9d656524f65ce511d2c9f988fdbebdd19504ba2f3c1ba49a4108889bb5973bd3a65cdb6879a2cdcbccd02d853678ad657fb22118 SHA512 220b8549757e9682dbcda6ff84774cab67036ba689ea818f912bf59ae2e1acb0ddbc133955d1b6d354943597f1293549da48ff9780cb3e91bd447d5068731cf6
diff --git a/gui-apps/swayidle/metadata.xml b/gui-apps/swayidle/metadata.xml
index bd3696eded17..91ff1890bc12 100644
--- a/gui-apps/swayidle/metadata.xml
+++ b/gui-apps/swayidle/metadata.xml
@@ -5,7 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 5be36ddde192..892aed364ca6 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -3,4 +3,4 @@ DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede
 EBUILD swaylock-1.3.ebuild 1299 BLAKE2B ef276cf73b8296a58bfdbb559beb789b6b30f5de0352752313ab135af7d5d9e3f3ef22b67c8834923fe465eb86f45c85a1f999427cc5f964476a9d4de5e62307 SHA512 5c1d8b253ae607e332163cdc9fc8a7a53dcca202fdc512ef59b2d8c423818e3b7dabda42453c7fda36e8847075556472249d9433dd84be6fdee887ca965db972
 EBUILD swaylock-1.5.ebuild 1265 BLAKE2B 91273004b19254fec334126cc2327ff7954169e9a153d321fd90a539efaf7048fdb4fed6a6f0e72dabae6f0e398f37866baffb3437e10c45580e4fcb247a9290 SHA512 e6d6bbcdbc090995a2ee270317095112641688f012f9a753d950daeccee636e972258a725d904acbe0d01e2ee98aeb058835ecf37284a82ffb41904d88b386f9
 EBUILD swaylock-9999.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
-MISC metadata.xml 1236 BLAKE2B 8dd1915ba42d34a368fdb876a1734143d32e0aba96f04fcfd5c6252628659e6c2753757c81cd2d4d206c1e1d59977fee3cc3af15d1afa350244ec6e87e3e6baf SHA512 de65d0db67e33dc253073067f1b84f09b17767e8bcfd37dfd5c3bc534c8018ffe61154a3a1128bdbfcc74be4786764c8d44e48d84a7c28be5d4dbd320b08ce25
+MISC metadata.xml 1250 BLAKE2B 0fedd8edef50f471c7a4cde72b417d2b625e87cdb873149e2714879b81634f21e4ad18cd2b078bdf63c8b198955abe7812823e2101ec176a9de07c9db56b2e39 SHA512 166fc66a1bf3cd3e80461e74c7022ef2fda4ff21c49d6aa2fc4feb8ea961501022861ff17bd8850422199c09c98718b9f8b73534b9ffadb9a44bf5656ec8cd00
diff --git a/gui-apps/swaylock/metadata.xml b/gui-apps/swaylock/metadata.xml
index 399b5f9ef761..f357232b5ed0 100644
--- a/gui-apps/swaylock/metadata.xml
+++ b/gui-apps/swaylock/metadata.xml
@@ -5,7 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
diff --git a/gui-apps/tuigreet/Manifest b/gui-apps/tuigreet/Manifest
index 82253bdfdf46..11d644d1868b 100644
--- a/gui-apps/tuigreet/Manifest
+++ b/gui-apps/tuigreet/Manifest
@@ -66,4 +66,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
 EBUILD tuigreet-0.1.1.ebuild 1335 BLAKE2B 143f3f92f0394d9fde8f5c94fc9c0d049d9d0b117d5838bf79bfedc38774fa419c720653a1cc10753d23c9b25ae352aae2119c7ef8d3a1ce6695a4f8c49b04d4 SHA512 90b7bdd7b4432a53784ffbf5cd5f5e08733da93db0dc9fe360abe57b710dfb4720251de64b30ae0519192e5f54a73382c53e45845d22520489f2fc779b51b901
 EBUILD tuigreet-0.2.0.ebuild 1296 BLAKE2B 9b28466f2307b576840aee8c341a50499c0108753f34431495f49fa1c75df8af493cec0abe8474770fe31a80d6cec968b414511c2f9de3a3b1508d962eb309d4 SHA512 0bc6c3494b0b2e5b1e3f2446e587238d5ac85de710ca44ec3efe7d39614bcc8f3a5e55b7d51784e24afbb8d09bc65d90b378f7bae7c13d6b4632a25f982cd80f
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/gui-apps/tuigreet/metadata.xml b/gui-apps/tuigreet/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/gui-apps/tuigreet/metadata.xml
+++ b/gui-apps/tuigreet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 59ba4d9ca293..b6d6eafbe5d8 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,9 +1,5 @@
 AUX waybar-0.9.3-fix-crash-with-fmt.patch 832 BLAKE2B 3559aeb9c31bee3749e983c017190260057a4467cc336182dd922082bf0984c2687e45057948a456d6f08462dcd3d953aed95f57e5e2ae04ac65887aa1fa1471 SHA512 60778ca7a644cd63100029a5c45e9b2e813a7e14cd99e804422515bf39115cf8d0bc0cff550dc8e21c83276b34a0c121e92e373fb0f7a671071b11f2ec54e840
-DIST waybar-0.9.3.tar.gz 135024 BLAKE2B d7b0090d0d7e25701ba7b76353737451e4ff8f145998b1a395e4c57e845be319380ac41b1a464bc7b5cc4d9ce037151bc9e7f37763ed1c0f42e945503668f1df SHA512 19dba92c5e430ce71567f149e5d208d594928a1d642584f606d55779d0a336ec4587e8a2e15698a25bdf0d26525f771d0a73b193f948bf9c1dfba5be350d4e78
-DIST waybar-0.9.4.tar.gz 137409 BLAKE2B 99dabdbb4f846823d3244a21ce51c4ebb2d9449f6c7a0f4c8c1db643d503f106988ab5e732d096109799a175df7c5168b9a1d60958e258c2ef8acb7fe2c318b7 SHA512 601eb9597089491d95bd5e055d9bffb0e33d637351ad41f9177fd4dd915b2a12587e96f922314aa7a009ccb4c1b5cf8da0553710b5ea84a9ba25c5755b9fa61a
 DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb3c0f9bf5b2d4dd4c2c80547cab65172b4f4162c2dde0b78f68d15c8b79be74113cacd2610fd2a48299e14013 SHA512 0bbb9e898e205728fc564389927fec661a8dd6a9995a6c5d318f930f4527d6afd0be11a6b71dfa9aafb05c982e0f131e51eb0eec9a3e92c28f5cb04ff780fa8b
-EBUILD waybar-0.9.3-r1.ebuild 1457 BLAKE2B 1aa1565934b694ffc23700553fe8ab25da8cce4af1599f5ac50767e33fd414f3ae6f815aca35d640e1c658ec0668e4343346df671125780bc862f96efa5ec1b6 SHA512 5bc3dec24c976d32e6f8d45263b6bc9a635354d493aeac276b97ea4b76f23fadc78dea01abf9a8a3cdc56a8fad0412c6c64a81f1a74827fc31bef250d73d2191
-EBUILD waybar-0.9.4.ebuild 1399 BLAKE2B 142db5313a8612058afd68ad164ef670682b03d98874a482a97f18489dd3d11ac707fdd3397976e7cf78efaeeb26a551dbd36706128109d304cf06c64cd47bda SHA512 de9eb9943aa3565efde0186a7fb37c001915c2614dc5ca9f15621d3801556ec4c663ffa5b1dc13c06ef76be2dc08b22814d880d39b03373f3c5319bbba390435
 EBUILD waybar-0.9.5.ebuild 1512 BLAKE2B 2afae936761a35cdd7fafe6fce3415f84d2ee2e4846b46c1b12b7dba340b7c9e05f26c97adfe6e4ca5c41828f0cd8adf07503627296d55e75ba95306223cd568 SHA512 59e2cd4fd0deef37832a1b6b9b88f6d1642a01a30a6339173c79be415a284cbd9087f39317f81de4bd374674e5f7de3340098e0ce80936be773ec62b41a37a57
 EBUILD waybar-9999.ebuild 1484 BLAKE2B e9f0652d319431721ff42fbf595f6f353c75c32a2053b1ab348bf021e647afa88ec0589adb4a65ebc403684f7088fd79a61296a39cdd1c8d1a50a2746765d4f4 SHA512 c4235c768d6e50ce3c4c407b16ad6be3d78f05607c8a90f04454a5c62ff0cbb4cfd53c602c1e67aa284a6e38044a8eff3770bbcb897f546b1f94d42787146b37
-MISC metadata.xml 998 BLAKE2B 62b8116ea495ec9375a2134e60a8fab06913a77ecd0f58b3aca8ccdc6acbf0216dc79ec8c877b241e89ec508d86186b949273ee2c58c6a2659af94465ac44bfa SHA512 5a507ea16511a066bdd22117d627f277f3e46527fac20ff80d0330be8e2a6cadbfc2009a4f9f81dd704c5d2eb32d5db9acb230e1680dfd12ac05f1c6b137ea8f
+MISC metadata.xml 1028 BLAKE2B 83224cb07773a149b3df13204dfef980b423d42cfe017733b7e9710a357d949397d8b657958e7dd15d8ec610332dbcdf67a8de34b25be6caf974e0b373946e25 SHA512 2e53d76855c8ad8e8b73426a455482e622a768b4d757022a4c61d989b0275b3aae02ce7df1bd7c386a29984e2b086e07c836b981c5051db06be3f24daf774b33
diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index af45478540b6..dcceb3fa3b55 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@jonas-toth.eu</email>
 		<name>Jonas Toth</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/waybar/waybar-0.9.3-r1.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild
deleted file mode 100644
index 44f249b15f47..000000000000
--- a/gui-apps/waybar/waybar-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors"
-HOMEPAGE="https://github.com/Alexays/Waybar"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
-else
-	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-S="${WORKDIR}/${PN^}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="mpd network popups pulseaudio tray +udev"
-
-BDEPEND="
-	>=app-text/scdoc-1.9.2
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/jsoncpp:=
-	dev-libs/libinput:=
-	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/spdlog-1.3.1:=
-	dev-libs/date:=
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gui-libs/wlroots
-	x11-libs/gtk+:3[wayland]
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	popups? ( gui-libs/gtk-layer-shell )
-	pulseaudio? ( media-sound/pulseaudio )
-	tray? (
-		dev-libs/libdbusmenu[gtk3]
-		dev-libs/libappindicator
-	)
-	udev? ( virtual/libudev:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-with-fmt.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature mpd)
-		$(meson_feature network libnl)
-		$(meson_feature popups gtk-layer-shell)
-		$(meson_feature pulseaudio)
-		$(meson_feature tray dbusmenu-gtk)
-		$(meson_feature udev libudev)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/waybar/waybar-0.9.4.ebuild b/gui-apps/waybar/waybar-0.9.4.ebuild
deleted file mode 100644
index 10d0e981326b..000000000000
--- a/gui-apps/waybar/waybar-0.9.4.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
-
-inherit meson
-
-DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors"
-HOMEPAGE="https://github.com/Alexays/Waybar"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
-else
-	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-S="${WORKDIR}/${PN^}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="mpd network popups pulseaudio tray +udev"
-
-BDEPEND="
-	>=app-text/scdoc-1.9.2
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/jsoncpp:=
-	dev-libs/libinput:=
-	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/spdlog-1.3.1:=
-	dev-libs/date:=
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gui-libs/wlroots
-	x11-libs/gtk+:3[wayland]
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	popups? ( gui-libs/gtk-layer-shell )
-	pulseaudio? ( media-sound/pulseaudio )
-	tray? (
-		dev-libs/libdbusmenu[gtk3]
-		dev-libs/libappindicator
-	)
-	udev? ( virtual/libudev:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature mpd)
-		$(meson_feature network libnl)
-		$(meson_feature popups gtk-layer-shell)
-		$(meson_feature pulseaudio)
-		$(meson_feature tray dbusmenu-gtk)
-		$(meson_feature udev libudev)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/wayland-logout/Manifest b/gui-apps/wayland-logout/Manifest
index 4ddf561b3060..d1fc133d5825 100644
--- a/gui-apps/wayland-logout/Manifest
+++ b/gui-apps/wayland-logout/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-logout-1.4.tar.gz 16878 BLAKE2B abc7cd6a6c6916aac97459e733e20cda71068654b30939feac50af94c76db393e94ec2b2df1b3488e0897857ede669e637e5db734c1323db2964fa7bcd821cf6 SHA512 376f39283851478723e3d846055ad76b6ae8b887b487cd98ebcdf87b1d95c3b5de5cad07f2d8921740c4e4102ce988833a9b7ebe662e51654316de9f85daabcf
 EBUILD wayland-logout-1.4.ebuild 497 BLAKE2B ca4a9d64008cd443db42fef84f3607bd1b66a4d313e0af5f8b847c0899165ab8612610a1194b44fba0e6ad01d0abaec6715eab63b14a2ab53d64375df4a28591 SHA512 3b66f21ff32aada6b4ac78e0959f81118ce8c127382118028eb3ee53e53ccf9565c53e2dfab01297ef59136a2ca6e178c93dc47b090c99eb92d9106727d70aab
 EBUILD wayland-logout-9999.ebuild 497 BLAKE2B ca4a9d64008cd443db42fef84f3607bd1b66a4d313e0af5f8b847c0899165ab8612610a1194b44fba0e6ad01d0abaec6715eab63b14a2ab53d64375df4a28591 SHA512 3b66f21ff32aada6b4ac78e0959f81118ce8c127382118028eb3ee53e53ccf9565c53e2dfab01297ef59136a2ca6e178c93dc47b090c99eb92d9106727d70aab
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/gui-apps/wayland-logout/metadata.xml b/gui-apps/wayland-logout/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/gui-apps/wayland-logout/metadata.xml
+++ b/gui-apps/wayland-logout/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
index a8b2adf0cf91..287375a6ceea 100644
--- a/gui-apps/waypipe/Manifest
+++ b/gui-apps/waypipe/Manifest
@@ -3,4 +3,4 @@ AUX waypipe-0.7.2-werror.patch 235 BLAKE2B e96c58d034ee9358f76ae7b8b182df645046a
 DIST waypipe-0.7.2.tar.gz 202601 BLAKE2B bc8a03c8b47ee65a158ca45047f1989761c36b7b6fb5196784637f4e937fa2e5076497079f8368daf20592351e60a12fda5f4500b7220320b4c4a73ca9e5b1e0 SHA512 b126ea9d30864ecba67447793f39dbbe8bc73ab33c79879ac243023c64930e9aae887f13c0fdcc4cdf307b0ca6766b1012915dc88c596b7c250e3b35f6ba9190
 EBUILD waypipe-0.7.2.ebuild 1754 BLAKE2B d84d254f740deff87bbade6bb9cacbf307de6f8e6d80c2ca42fd1f20f5484036d915dc2ce035f1a499455d42a4d51704bd22a788875e435b6face096a03ec276 SHA512 dbf799b5a91af8d1cec2e153884e673b99c53658cc481da209215dc5e50d385a491edb504b174b488f2f33701a249606dce0908c9beaa2830d5542348008d71f
 EBUILD waypipe-9999.ebuild 1732 BLAKE2B f62fdd096b7a58ed5ae2f5446c53cdbb04936d6fceeb237825a48b646b17078540fe0a42192dd9f3213d216c61b248e7fe7aecf86158cc47668a612861a6634c SHA512 93b9a9134037ed60c219da42ba98b57410b4d8852895d57196b18eb099340713a6541826c95e606f97b2595245c4590e7d01fe2c97122284a2781a29e80f18d2
-MISC metadata.xml 872 BLAKE2B 421859786f6562cf0e63a85737f94cd110bffebfaa0535064098739892033f1c5887bc00d5ef12b812b1f9e772329f534a4a8b919d37789feb8ac4e62222e98a SHA512 84659d98d3d25aa9d3fdadd7085365c80f28faf690848bce9a9263ad8ab04c0475a077beb6c86bc0a653bb91198101068c04c84937a510175eb3caf362b211b4
+MISC metadata.xml 902 BLAKE2B ab8d0b0794353478dc93e26672b4f026ed62edb53e2bb2b7bdee7a0af95bb5d7cfa96de58d6495bb8bfbf115e88621d7cf7c81501aa10cda9ce480d8eaf1a2bd SHA512 e28db13c5b7b0815207cc90f136ca093915713ead32450bbaac2af89dd972f5209f8c80ee94baed691ea5b4d28a774605196fa0ae58980377fc911242f005f68
diff --git a/gui-apps/waypipe/metadata.xml b/gui-apps/waypipe/metadata.xml
index 17d7e0441427..34f0e3f23fbc 100644
--- a/gui-apps/waypipe/metadata.xml
+++ b/gui-apps/waypipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/wayvnc/Manifest b/gui-apps/wayvnc/Manifest
index f003c6065408..d8177329ef44 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-9999.ebuild 884 BLAKE2B 12217ad95e53efd84149ce8d3140bb1552b41a425740e448f1d59f98d8ebf8a32b6401dac5b92895ac6dcd453af531d0940f3c74324d8714e6b0b49a3ae93293 SHA512 d13a811372db890cd7d3e894e2190852e3b6806cbeef91d11cf1fa9d7a035b219b8cc9065f498864ff943b1f57a69c52443e39db223e46e8060dd3f1c81f4bd3
-MISC metadata.xml 936 BLAKE2B cf96fe5683e483676b78f7c155ea20aa76f302bc27a9a17e69b862256da3d7c6d90c9ca113ef96de8b00f179981ee9eb8ceec8258948a588f7e4f4ea29d48f7e SHA512 21d6f94c0ec2c47a47e4d408b834af9be63d855ac7cd9a5b0d1e6ca642eab3eb80c4e4b8bc9e692be2dbf29d31167770467a75041deb196c0fdfedb8e05dfd02
+MISC metadata.xml 966 BLAKE2B 8f0d787a99e307ee38e0af773ebd1b59a2b5ffb385fc23c869613d15140d385d2f2686931ff016cd8f0c7591b5ea52d1f8d6b02f18f5cac1a615b096b15c1ce5 SHA512 cd20b9a926fa9ed2c3d94bc718b9a0ab29f62ffe059b041dd988cbdcee33223b24e4d75ecb679e6fd898a6abff2d6e6a6f96c11832f08d358159a5b5566ba1e9
diff --git a/gui-apps/wayvnc/metadata.xml b/gui-apps/wayvnc/metadata.xml
index 32c02efdbf9e..3d5e9937e440 100644
--- a/gui-apps/wayvnc/metadata.xml
+++ b/gui-apps/wayvnc/metadata.xml
@@ -9,11 +9,11 @@
         headless one, so it is also possible to run wayvnc
         without a physical display attached.
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index 2278e7949339..5ea69161df24 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -5,4 +5,4 @@ EBUILD wcm-0.5.0.ebuild 634 BLAKE2B 30bbd8f006bed48ac03341bca0c3d88e7697039491ba
 EBUILD wcm-0.6.0.ebuild 638 BLAKE2B a8513e768f39022100f503ae897b25b383dfe6a881213897427aec317727d42ea494cbe71d219889b93fda0bc3f2890a0d850abfb38b477d50f981e1ca551e9a SHA512 cb18b707f11b8601832d6c0fd52bcd97d314ea86a27d8e4eb861da00bbfea81bf8e55da36eb90f4f210c965c353a465648539beddf8ca585ba2c35f58c35c268
 EBUILD wcm-0.7.0.ebuild 642 BLAKE2B c413bdce15a85c7ba175519146d6807c1915861f814f3828f9992a1f681c26b4e01330e304a0cad82fbd6aaa91a79118dcd8831b77df01d41df675ca6cbae729 SHA512 f64d45f144fbde97af133a2ab7e0d1e87497f03477be2f2dbac62279dfc76000090d96a902fe792399d95d44b720dd3fc5d5cdc07e004d7529d7f17d502f84d4
 EBUILD wcm-9999.ebuild 642 BLAKE2B c413bdce15a85c7ba175519146d6807c1915861f814f3828f9992a1f681c26b4e01330e304a0cad82fbd6aaa91a79118dcd8831b77df01d41df675ca6cbae729 SHA512 f64d45f144fbde97af133a2ab7e0d1e87497f03477be2f2dbac62279dfc76000090d96a902fe792399d95d44b720dd3fc5d5cdc07e004d7529d7f17d502f84d4
-MISC metadata.xml 581 BLAKE2B 4c7238f4d651f521902f319da41b18b58d40a2db7e9c22f4084939fa0e70d534a7f112985de5f092c7f233f7891b50d17155b22781b32491f40c8d10f92c07a6 SHA512 a0b43b1632468feb2dd7b52fb34ce7f7c0bb8b0d8bf1952fc4e95017b0f7c8139451c78264966edab146cc3b8c255bc6724f4f7bb80479d5f119e6bbbda4fe2d
+MISC metadata.xml 611 BLAKE2B 96e3a162d25b5c9bd54bf45b75a26c38aa2b21b7efe73116a98fdebadcd96dd74fbd35275f08297cdfcdc644f6b086f31b159d830130fe66d61dad6fb553f6ee SHA512 8407bac49bfea58a0757c6d0e6e68bec43f69e284cc7755d530db23fdf0b10ce8c9af1b1fea710fa6d48ac38b5758a64d48dbc0aefcaa420c8c10e24d50289c7
diff --git a/gui-apps/wcm/metadata.xml b/gui-apps/wcm/metadata.xml
index 692d4fe3fd2e..5b32a20d6379 100644
--- a/gui-apps/wcm/metadata.xml
+++ b/gui-apps/wcm/metadata.xml
@@ -6,11 +6,11 @@
         Allows to reload changes on the fly without
         needing to restart wayfire.
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-apps/wf-recorder/Manifest b/gui-apps/wf-recorder/Manifest
index ae273a38bcbe..161c7ed70830 100644
--- a/gui-apps/wf-recorder/Manifest
+++ b/gui-apps/wf-recorder/Manifest
@@ -1,4 +1,4 @@
 DIST wf-recorder-0.2.1.tar.xz 19828 BLAKE2B b86fc418a2779521a44eaefcf0c6d5533be64b608c7c3a8a550156a07eb10053f31bce1693c33842e7313997b090b63f7908eb64d9705c406c5026a6cde09c4d SHA512 e232f4a13d4891863a58667dc87df113f13fabac5042c93143d652472287e84906b261b764869cd02c523f5b3d2331224e2bb71f66814d1a1c9c99a0d28aa40a
 EBUILD wf-recorder-0.2.1-r1.ebuild 864 BLAKE2B a01bcf35e231e188ae4248db6c2d1e25953fb5e3e4dc2fa9ae3e7c1e73d5da2b20e2b7b11ad2269f8413aeba10c0bbe282ed008bd925a58d7bd0e6cfa61a07ec SHA512 994b05efa0871452e5fa18bd78eca3ae07f4894faaa25b936cc168fdef17c6f42a5540d2f0471e2e62db78122ff796cff2e24ba6afaaf104a8d202931b06186d
 EBUILD wf-recorder-9999.ebuild 928 BLAKE2B dbb78423c7ed32557931bbb6b585d739f2a797bc7ebcb659c997cd321cff4ad9435383066621a995df26c8759b46c8042cf729d3aef761aeaebf34b7a0326335 SHA512 00b619b09d1b5d00ccedddcf5a171d4438eff9f454d92f7ae78998d29b5ccaa531bc583effa013240625d4a34cb0dbaf7d01e34de41e144815fb751f00b2c0e5
-MISC metadata.xml 506 BLAKE2B b02d0914cd7b0a284b2b125c993de17eef38c3c0c64637855075316002dae87c3cd126d4c252d00d11b0581e511b7fbdd584756018706388879ff684e861a7e2 SHA512 1ace762fc83e6ed761134d363e8505ddfe641a162b0868467afbfb9c913da190194d25da4697769f03d3af2cb20852329c1d8433a477ea53f0857472480f534f
+MISC metadata.xml 536 BLAKE2B b9b1bf44b552ea299669e1c1a79c899fb83f774c513be8da970195c48f19ede6ad1b557c087f4ed60b90ec5f10c9ff67fb237ca3c6b0ac5a969abd3952e8ab0f SHA512 443094f19010cd96dce2266bc5f924ebdd810e232e1f93b2d46c8a2485da8b8458d54741b55cd0bc5e7b7c698e88bd783c013ce872b22ccb8592508bcb7e7789
diff --git a/gui-apps/wf-recorder/metadata.xml b/gui-apps/wf-recorder/metadata.xml
index ccbe00701d9a..00a5cc74c6fd 100644
--- a/gui-apps/wf-recorder/metadata.xml
+++ b/gui-apps/wf-recorder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>consus@ftml.net</email>
 		<name>Olaf Torvaldsson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index 3242918096eb..eb1a973dffe6 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -5,4 +5,4 @@ EBUILD wf-shell-0.5.0.ebuild 846 BLAKE2B faee64563ed5ab34455b4eb063b26ff0cef9c75
 EBUILD wf-shell-0.6.1.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
 EBUILD wf-shell-0.7.0.ebuild 894 BLAKE2B 95f41d7e1c34d52505a62821152e8bd6db634da38fe836839b9da124ece5478b77ab3bf5e489e5bd38ecc126612db8c137bad4eb364ab5b84c99c05d969999a8 SHA512 751906a8c3abb9032acc962da5b464ff1f00f06412ba6677ce84ea1c6705814f552b98e6a0de6c0a177efb6a976c482f14931cd9335b26ccf9f244bb70317f3b
 EBUILD wf-shell-9999.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
-MISC metadata.xml 653 BLAKE2B 537544446f8e320beafd02fe766de2c3ff66225aba3f69b852484f5251c3c1caeb68cd50d29e036ec96167b336bc9599319fcf324e7f9ecfaa9ddeee4bb52c67 SHA512 a8d332a80f7355424abd6f5b588c8cc9ef0f84bacea3c29b50bb56735d5c1b1753bc94c72737918152bdc6241ce90e8105f4da4bea5cc9a7f94c658d833a08cc
+MISC metadata.xml 683 BLAKE2B bb64c04bcfff4291cba3d896fec7effc3aa276a75003f3ab6f488ec69f69fe8f46712b85258617cc4fb3b5fe3d4ab64806ed698629b4a6572bbd6c0b3c31add3 SHA512 08489531c8ae8ad4cfdc9e00d33644bd497d119979cb49370656f0987ca66800f562fdd7b2121bbe1a39a4176c931c09f0140e595131558866e9248fe6191c84
diff --git a/gui-apps/wf-shell/metadata.xml b/gui-apps/wf-shell/metadata.xml
index 1f968932aa5f..f270d1038649 100644
--- a/gui-apps/wf-shell/metadata.xml
+++ b/gui-apps/wf-shell/metadata.xml
@@ -7,11 +7,11 @@
         effects. Integrates with other wayland
         applications to provide a full desktop environment
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 5883dfe55a6b..6d27544de634 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/greetd/Manifest b/gui-libs/greetd/Manifest
index 2bdb87977bab..f9839f87c425 100644
--- a/gui-libs/greetd/Manifest
+++ b/gui-libs/greetd/Manifest
@@ -56,4 +56,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD greetd-0.6.1.ebuild 2143 BLAKE2B eb2d32cc98f58772f3558a0e7b83b2356cd3ba169fb5a0d8acbfb2129b47f661c50b4563d1df6098983216b00ddb0467757c12902776a39534e20c2ada7f2392 SHA512 0785013fed45095c38c4a5d7e04c95f638d1430309ae0aec4b99805671e785f21de6b360dc405c3228b72405aff0a10aca34757ac6be5fa2c48800de7236b356
 EBUILD greetd-0.7.0.ebuild 2177 BLAKE2B 014e23275dbfb097b5dc45d23d54c4857c4ed958be9c674d1d877d2146e6769335f63df5249cf4da81f783f975eeb6ce140ab8c538488700c3506a12849d25b0 SHA512 0acb65255598442a4efe5500fefa9b081a7f41f7b0655c3e34252edf273b5d38223b0cc37850f62a21a361358699524e66c65d6cd6828689dce4ba9db46557f7
-MISC metadata.xml 554 BLAKE2B cc85dc9ab0e8d2795c05e758d69e7ccb2b9f9077a3ca9b25c34d756f03ab9096692be6e3499580412b3694668e00292c1fa8a9d094c1f3028c1d0c6b958f8fb5 SHA512 5072da9cb6729b4443e23b285f53e3f04f4a8617eb190a854b9010e00ea85edb9dbcdcc8cd73b005a4675252248614c4c61f62990d1e106b74409a6b4073efd5
+MISC metadata.xml 584 BLAKE2B 66097ef49fa0ae0901a34f552cdccc61c4901778c33d2d539ae2a7dbd2610c36fd8f17bee758c4bd060dbcc43568a70c7b9556ab1a1cd1b3139e052ebfa76638 SHA512 1eec0e3811c837c03e305eaffe66564c616d559076c1b7fb7f239fc2751494806c57f95ae7dac1f08c4e808244c05c5182c83c08c4347b77c5143f282eebb082
diff --git a/gui-libs/greetd/metadata.xml b/gui-libs/greetd/metadata.xml
index e9b5ff8dd17b..3bbb9fdde1a3 100644
--- a/gui-libs/greetd/metadata.xml
+++ b/gui-libs/greetd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-libs/metadata.xml b/gui-libs/metadata.xml
index d49cae2ff9ff..ab830cc7a464 100644
--- a/gui-libs/metadata.xml
+++ b/gui-libs/metadata.xml
@@ -6,4 +6,3 @@
 		support	various window managers.
 	</longdescription>
 </catmetadata>
-
diff --git a/gui-libs/neatvnc/Manifest b/gui-libs/neatvnc/Manifest
index 0c24c55ad173..25092291c7e4 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-9999.ebuild 908 BLAKE2B f00578ef6188cdd9fc4ac9beab68cc80049440c2958c12e6bb5867dc9ad598695c405a6d048be17527c885f8b91d0231efe88c60ae9b778e753659fdb00088a7 SHA512 285c3bad698f9e6688b86119fa888914c853493cd6dd008b2efc9c0d5f1bcf993950138b9e93b7e1368381c605cb4414daf8e90cc82b612a91166ce112cd08f6
-MISC metadata.xml 541 BLAKE2B 32a1be4f0909b303747974ba13c9d0da32b2ba109c8e7db8e568f2fb9e7fb5f14cc1114fed229b5f2aa6bb7e647f504c75e77cfa108be025aac63171b053685e SHA512 175c7b33617db39882891f35890f0aca54f602c688f99b0aef1fdd0ec354beea87ee5122c358ece0233766efbbfc1e035bc188fcadd3c3776c76611a871638d2
+MISC metadata.xml 571 BLAKE2B 702805cda0e58010431105d07031714cb57bf9e62c2e41849643a17938cb56c1e5fbe3c764d96e04a9776f256ab2552168713cfb634bc9447ca4a01ad15375aa SHA512 175b832fd67f53b98e3cc31e3bfd76af84536c47a6b55153a50bf122628486b648e02ee1d8cf07b3edcb74b944389239928954561f8ff2f01016891c9e5af675
diff --git a/gui-libs/neatvnc/metadata.xml b/gui-libs/neatvnc/metadata.xml
index 90575035113f..5c5ab384cea2 100644
--- a/gui-libs/neatvnc/metadata.xml
+++ b/gui-libs/neatvnc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
index 5bac10d2d213..1755ae6252bc 100644
--- a/gui-libs/wayfire-plugins-extra/Manifest
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -3,4 +3,4 @@ DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e1
 EBUILD wayfire-plugins-extra-0.6.0-r1.ebuild 690 BLAKE2B 5d6d92253ab532244ea1d3eeac63fff69fa4311b283144707aa095b163f3a54d8fb165ed13e1b34a127c314ad8389bf6c1d72574c65ca30ff32c4679e9e9e173 SHA512 aefab13bc7c2711953aae82255f0992e4caf93c0e003435434a584e58dfbe1099abb447fb2ed678e194f543187f94e63539d0b68317602c0f5dfa96839e0a55b
 EBUILD wayfire-plugins-extra-0.7.0.ebuild 690 BLAKE2B 2d23730042b8240adbc105cd1874e795eb91902b1187e0912990142ccf9ce60277e8f3282024bb17cf623ee1a4dee36c1f38b0b3b65aadced19e065bcc31e098 SHA512 b8726e866eede97fc2cfc8bdd3ba31f038dfb043925c336a7f57c3548c829573029fe6be443096044497fa75519d0e3dee20df2ec11b4e5f481487bc659575c3
 EBUILD wayfire-plugins-extra-9999.ebuild 690 BLAKE2B 2d23730042b8240adbc105cd1874e795eb91902b1187e0912990142ccf9ce60277e8f3282024bb17cf623ee1a4dee36c1f38b0b3b65aadced19e065bcc31e098 SHA512 b8726e866eede97fc2cfc8bdd3ba31f038dfb043925c336a7f57c3548c829573029fe6be443096044497fa75519d0e3dee20df2ec11b4e5f481487bc659575c3
-MISC metadata.xml 395 BLAKE2B a08fac50820a592a0c79a1f7b376099208b70506a6d6c5badaf9c06c45639f366d8fbe17b42d8c5f0481ef5411b7ba4e6f675c917333e8dc5aaedcf5ff9a0381 SHA512 8837eddafde633e308bf550a194e21ec15fa7275a23e2fb7677e33f45d2054969a6be7059b7f0c016c376cf79ef9aaed698a63ebaf6a5a653f098d2ac2dcbeab
+MISC metadata.xml 425 BLAKE2B 5d9c660cfc12dcbf505ff9aac20388b27d799901fe762194192c882f05d57c23dbfef9e7f246ff626a6726c148c3175523999549e73692786d589144b912ca51 SHA512 e05e9cf8034efa227849bbd76817c87f3eff0cc2c29e6b15f6e70d4b3e956f28d415af8874a6034d402d6d7c47d0ff6850bcc4e11ff5ca8dc9e6a2bdb713996d
diff --git a/gui-libs/wayfire-plugins-extra/metadata.xml b/gui-libs/wayfire-plugins-extra/metadata.xml
index cfbacced2332..4442fa1c2c6d 100644
--- a/gui-libs/wayfire-plugins-extra/metadata.xml
+++ b/gui-libs/wayfire-plugins-extra/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index ba86fb07399d..73320703b839 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -5,4 +5,4 @@ EBUILD wf-config-0.5.0.ebuild 668 BLAKE2B ee167eaf5b8991981e513e91e75dbe55e12248
 EBUILD wf-config-0.6.0.ebuild 669 BLAKE2B 62e45d51784a4c62929dcc761b150fce817f0b4dfe95046e9a8da73ce6c430870bb0786a31bb008468260df3db6af47d38917820498973cde102f4258d3a912d SHA512 3af3d010eece7b17766e551a2f7cca2fbd4f4da680e521405972084bf1dfa993667df9edf9f85ab1123a50f0e9c489fdbe9459fcaf36249b780f2630bb834036
 EBUILD wf-config-0.7.0.ebuild 670 BLAKE2B 5fe30b569fc393d7b34d0bb4a1b5f0abbe3f2994e79e222fe22307aee573180c3a7cfcbd0c5ae8854c7323219b43f72a300df2899706194a2834ddd8a2923cb8 SHA512 b6fb0df3ab0b53b21ba6e2a108e4e602107e31c2915a7817067c3db2f8c1ffff45b6d672d1dda64152adddaf7b9ef6eb579fa0ec5539ee8152a5e0e1c21d717d
 EBUILD wf-config-9999.ebuild 670 BLAKE2B 5fe30b569fc393d7b34d0bb4a1b5f0abbe3f2994e79e222fe22307aee573180c3a7cfcbd0c5ae8854c7323219b43f72a300df2899706194a2834ddd8a2923cb8 SHA512 b6fb0df3ab0b53b21ba6e2a108e4e602107e31c2915a7817067c3db2f8c1ffff45b6d672d1dda64152adddaf7b9ef6eb579fa0ec5539ee8152a5e0e1c21d717d
-MISC metadata.xml 635 BLAKE2B 9152d0eb342e1cd50821c22beb370e0fb62acb40edefc5f0c2bb8f2c61852239f596975692c6ab6cbb36304a074357ee567f807577facd768025e9452072db4b SHA512 acdaed58e3430342773bec4dff0c0879c371b4cd26fb8ddf84606fd3ab2eee3f4d19b1a471b843e6880d2678f47fdf8533e872c37357639094084a9480cd91ed
+MISC metadata.xml 665 BLAKE2B d4367bc2ae5a738a1f20258d71d0d7374ac5887a2a8634ad988d2c5e3eec04253b56ddbbd664b080decf94fbac9c8e773548af4336ceaeb78f6ed261f48faa5a SHA512 7dd518eda1cde07e698fab109c535e6129527562db3c91eefc934c23c5f08f2b5f82d8572b7923d0f974df3f6c88415e467a2abf15b9925d6a491c0b3e9b8312
diff --git a/gui-libs/wf-config/metadata.xml b/gui-libs/wf-config/metadata.xml
index cf54d732b433..08075bf92d62 100644
--- a/gui-libs/wf-config/metadata.xml
+++ b/gui-libs/wf-config/metadata.xml
@@ -7,11 +7,11 @@
         make changes in the configuration and reload them on
         the fly.
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 0bb4dbe949fb..e5e12c8e330c 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -3,4 +3,4 @@ DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b
 EBUILD wlroots-0.11.0.ebuild 1855 BLAKE2B cdf38296782645752facdb54febb5a75ae7a4577809ce14ec24fb31109193810fecfbaaba16536b7633e86799d480da7426203e61309a02063b0497c0178e3e9 SHA512 5447e589bfa0057b55a2ff918a900357b59ec8ef6f33b5ed81175a32b3305fb9e803d0ba75c307179b86c289cab75d5df057ed89548f89587fcef24be6cee897
 EBUILD wlroots-0.12.0.ebuild 1933 BLAKE2B 716d5177e922e17cf03249e3be4e9277bc04e5b42b9878addad282462f1f815e2cb1d9f8a7d0da74d066926e9225e6874516e6259120d7c76352eea559bd3120 SHA512 081c33aebe7a0326563f3143411cadbec78cb499db231b37c0ba8dbec19a817fb3f79b1199093b564a99282745c95cc6212e5bfd8757e05b857890dec4c20e6b
 EBUILD wlroots-9999.ebuild 1938 BLAKE2B 090142ff895880bd3ca362bcaa7151fa84f41a32f1e594184e2fed3e9e52937e7e1c4313d9e407f7b28d1610a34b1e58297e95a33c363959896e67b01ad52934 SHA512 9382966698c381ff23d2dce9d22b7a244110944b41db08ab6d9ded7f05c6d9afd7b556a4f0baeef19c613612d9cc65612e0186fc4292bf19e2527c630ada2552
-MISC metadata.xml 1705 BLAKE2B 91b9e709f0d0c19f0bebf9db073241e2fb0e355c00d582479839ef16438f16b1a13ad8e38614d6d8863b74371369199d623fd17541890ce268efb70773b27393 SHA512 d06d9948237e0b051a919dd977adfbfea04b5c7d3cc2dc6f2b72fd50316cfcc7acc234f8a99ae143eab070a497267859acdd6646845284ecfbab800ad215e9be
+MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 07149597df5d..f3b86b9d076d 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -5,7 +5,7 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 4eed6d58ddd1..5503d9951c01 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 312ebaa440a2..3fb7a010cd70 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,4 +1,4 @@
 AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
 DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
 EBUILD hikari-2.2.2-r1.ebuild 1399 BLAKE2B 962fe480625acf9879a27af92d198cbd950eabfaa612511b70b28f02a4b28b2dbe08d7bf499625f0dd6bb990c5712b3a3e5e6bb65bde66714f0ee6bf05ae1735 SHA512 1a4b733158710d2eb623288c72f26f2895456bf149e5dbda44cfa515440dac3694b52a263b59d07b04e3cd5117579da9744c1d88ecd7ae9955399e3749a0ee26
-MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
+MISC metadata.xml 1045 BLAKE2B fcfd7999c8a58b0608cda077a5b0c6e3fe8ed49cd51dc57f22b007bb90b90966f301d846d0ebc97941a9d41a51ddaa0a79d051ec40ccd8a074c516b1a67e281c SHA512 502cc69aa55feee8b926f4848a5aa8291975ed7c33b3f3f1404e9a1768c512cc87c73b25ab402cd023e06034e2e0c4608287252305038119f82325a5d5fde398
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index 95946d509209..dbb748db812b 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -7,11 +7,11 @@
         of CWM in the X days. It aims stay out of your way
         and focus more on the task than the windows.
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/gui-wm/metadata.xml b/gui-wm/metadata.xml
index abfbde4aacbf..4d356cb3ba71 100644
--- a/gui-wm/metadata.xml
+++ b/gui-wm/metadata.xml
@@ -5,4 +5,3 @@
 		The gui-wm category contains various window managers.
 	</longdescription>
 </catmetadata>
-
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 595384c9f9e8..9f49a7db9a37 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,4 @@
 DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
 EBUILD sway-1.5.1-r1.ebuild 3029 BLAKE2B 1800f4f242090e14d2fc1c86d02ed231832553a21bfd5a7b5a0fbe31f57fc097e9f0189982e6d849e060e98b66bbfea61ffb8ed459589c2f25253844879cde65 SHA512 352a5a24dfb12ca3ada32d5fd67f483517bb8c30178931c27653460ab6ba21f5121ead00b607f00c44ca99c6aed286515704407bf9cdeb58be32f19fdf1f8e76
 EBUILD sway-9999.ebuild 3032 BLAKE2B 48f9ca249b3e85cf1dcb493fa2ac7dbc598ac3310292bddf5d80d55bbc0ade09cfdec3cd98a04d8355379d0597fbb6bfc76487902935ea394a2e01a865a9c8b0 SHA512 bf916dd627afb1ebfc416e62261d3cace2c6f52e031d41b53303341ff6275d02c112b8b455116bdf58698a1f24935c326d0f5697f213229e6d76983e386e180a
-MISC metadata.xml 2414 BLAKE2B 3ec829b97a5325d19c73ae66775fe8422b8b7099eddaa001360c39da4e79c7dd16d07fd1cff248a02325f2ec85cc96a998634911af165daba8d1a38ab2cc95b1 SHA512 b5c00bb998a82bb3318b8194c360b9dc7f95941368b07750772c57c141769992f180855b1a1b467f2fdbec2b343c70321bb4f2232cac4a3f7332a210c0669a9c
+MISC metadata.xml 2428 BLAKE2B 6dbfafb29a5e926b761a60d6d12658dfc59ed75c16e01907c6842c14ae97eaf7d3ceebc805f19a9c783a393b33360eb81b7ad3564d5cb2b0270425ce43616123 SHA512 e49f4e6514b8fd171423ded89c516e3c706141da132b28a2419f9b145627706b6cac9066a51f46ecfc3c1df15bd749bdf40168a3841d3789d13550894b184f7a
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index 1415e237753d..c338aedaf707 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -9,7 +9,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 2485eabf945a..1255f59294b4 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -7,4 +7,4 @@ EBUILD wayfire-0.5.0.ebuild 2224 BLAKE2B 8723cb41fa204ecdd6a5b95936ba385750f63ea
 EBUILD wayfire-0.6.0.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2
 EBUILD wayfire-0.7.0.ebuild 2519 BLAKE2B ebe7e65b995e74774e769257542923c63a2a662ca960f2dcadeb5ed8c9908d652cb2b2122fc8d379a3417e7fe1cc8c9a6ac7fa0639184c0bebc147546c64d721 SHA512 60938d6efbd743b87264e8466080eb0e6ff87cc13ddbdcbc168492fb0d1218244c9ee1fdb6adae5d7bdf1144157110e293f0095b2f40ca8490bef220fa166203
 EBUILD wayfire-9999.ebuild 2519 BLAKE2B ebe7e65b995e74774e769257542923c63a2a662ca960f2dcadeb5ed8c9908d652cb2b2122fc8d379a3417e7fe1cc8c9a6ac7fa0639184c0bebc147546c64d721 SHA512 60938d6efbd743b87264e8466080eb0e6ff87cc13ddbdcbc168492fb0d1218244c9ee1fdb6adae5d7bdf1144157110e293f0095b2f40ca8490bef220fa166203
-MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
+MISC metadata.xml 1080 BLAKE2B 4bdf18556fcdd4e1c5f10e658dc0c7c7237d19d3678b2cd9025f703f29f3faffc1f9c7b1adcf8aa930ad819c932d55281169cec624e05000adeac17eff3caef9 SHA512 fff94cb62f8362b451f1843bf440109e4d4a941c866197cc249e209443ec373e6b7cfb491fadeebdfb84f2165cee3ee58d498c07056f5e8cb4040b9029f41f80
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index 5765c019ed73..ebb88ce3d365 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -6,17 +6,17 @@
         Aims to bring desktop features such as 3D cube, fire burn,
         fisheye, wrot and all other desktop effects to wayland.
     </longdescription>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
     <use>
         <flag name="gles">use libglvnd to do animations more efficiently</flag>
-        <flag name='system-wfconfig'>use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
-        <flag name='system-wlroots'>use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
+        <flag name="system-wfconfig">use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
+        <flag name="system-wlroots">use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
     </use>
 </pkgmetadata>
diff --git a/java-virtuals/Manifest.gz b/java-virtuals/Manifest.gz
index 33c8553aead5..2e58c6392bb4 100644
--- a/java-virtuals/Manifest.gz
+++ b/java-virtuals/Manifest.gz
diff --git a/java-virtuals/metadata.xml b/java-virtuals/metadata.xml
index 0e8c9407bca6..a44f8e4c8111 100644
--- a/java-virtuals/metadata.xml
+++ b/java-virtuals/metadata.xml
@@ -14,4 +14,3 @@
 		requeridos por la máquina virtual.
 	</longdescription>
 </catmetadata>
-
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index ccbc1d0b2960..a3870784b35b 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
deleted file mode 100644
index 789128a9f0df..000000000000
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdepim-apps-libs-20.08.3.tar.xz 59968 BLAKE2B 9d31f3a128d9c88ad2c9292836db6d19d2892db658cd1ce3eacc4c683e6f7738dd7c9b2cd5baa004d3abc7eaedad5bb86eb9759b33b1f5677b9d80da81ef107e SHA512 22f9deec731e8ca0e3e120b3cca4e423f40dd389e7c1a8c250c220c6223f20d6e3ba6cf140e4e8d4c3231924da8632b3347edafd2a24a39737968cdc28c67bb0
-EBUILD kdepim-apps-libs-20.08.3.ebuild 1068 BLAKE2B fd48693b899438bbd00bebf8dfe38d144cc7cd2acb4719d30b4b7148a0fdb7ab872134a6e6e2e4293ee2ae8048044971fb941a14b8f029837e85cff427126bd2 SHA512 ef19bed0eaa4b7a26d798edd751dabd85610e83a3db7a22c4716d445fa42d03cafb450d837d5700beda70281e34db5ab530ba2a82d8031a1e26e7cd93ededf68
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.3.ebuild
deleted file mode 100644
index 9717911d5262..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for KDE PIM applications"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-apps-libs/metadata.xml b/kde-apps/kdepim-apps-libs/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-apps/kdepim-apps-libs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 6d9c13a9287d..953c957fca37 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index f27af1b7b4f9..80f5f437c84f 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.77.0.tar.xz 65860 BLAKE2B 62f4a540422cef50b1e04f549709ddeabe0de45f2ed25d76e09860922c6da2a6a251de449c20c7cb3b3b5ba592b85b79ba68528cb0d7f5b0d51f3f17420ca7ed SHA512 e60d0263d34c02adf1d8df2329177ac340e8eb5d796f57820b59c4f5ae62c1b59d75c985a2d309f528aecbf3f0691a919957800a398ecf9b79659cea1e011477
-DIST attica-5.79.0.tar.xz 66108 BLAKE2B 0c494e795ee56d354d125970349a4bfe73fb9d777e6df66a5de883e83ced941ed9b0ea7a89a8e355dbeff7b180f80e36cb7ab53b5a7b0ab3c679fcc26fd6f712 SHA512 7e0c7c650545b47c827627f4bbe443ebbca3273d22196f997a3c9deba48bf6549caefb58829cde6098ffc3620c7b12a6f2602ddaded81e2125937983fadd8d72
+DIST attica-5.80.0.tar.xz 66216 BLAKE2B 2b9c890dfc9bc74ee2de73af1ccec35f92d51c456387da6cb9b8406fffacb0fa06388b014449214b87d139abca6936ba224784ab62a3ef77730c9f55471434e3 SHA512 70cecfe60ce396a4cdbfa4b2d133076897912ae32a5494dfaea6f777e51f5be79b240d18d2e6b4f71f8dc4ff0f18d43243c711629c6913b8512aed0ba6b3f051
 EBUILD attica-5.77.0.ebuild 467 BLAKE2B a8350dd8e84c681b68f31f8a1b32ed1802fd1b4beb719519b2d27bd9e5d30d6ff81504c148c0440db27c6a8e7d9e514870a3af32efea95f3bbefba26ae8f6187 SHA512 12995b45e203bcfd0c3990b7a3499266405b979a22cad5a2cb19729d04e1d3c9f92f9cf697d17f7732f5fe87037b9a20846378189c23df0bfa73b3f11f485802
-EBUILD attica-5.79.0.ebuild 470 BLAKE2B a81b640ce9bbcaf07d6891bde7f4dc62ca75248c0397dbd42d1404e1403e543bc4ef92778c786186f7989ca4389acc89da6ee612eaabe82b67c2021369d5e423 SHA512 91bc31720d60f7a8c8bb952c8195638aec58a1dc475954f8e1a7706dce8b73d6f17d07c0d485ee12bfa3fb444b1e2c7fa6a5be4dd81e6f28fa2f6039a18be711
+EBUILD attica-5.80.0.ebuild 470 BLAKE2B a81b640ce9bbcaf07d6891bde7f4dc62ca75248c0397dbd42d1404e1403e543bc4ef92778c786186f7989ca4389acc89da6ee612eaabe82b67c2021369d5e423 SHA512 91bc31720d60f7a8c8bb952c8195638aec58a1dc475954f8e1a7706dce8b73d6f17d07c0d485ee12bfa3fb444b1e2c7fa6a5be4dd81e6f28fa2f6039a18be711
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.79.0.ebuild b/kde-frameworks/attica/attica-5.80.0.ebuild
index a05e53578cc4..a05e53578cc4 100644
--- a/kde-frameworks/attica/attica-5.79.0.ebuild
+++ b/kde-frameworks/attica/attica-5.80.0.ebuild
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 6726db12cb99..91caa5577966 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,7 +1,7 @@
 AUX baloo-5.77.0-no-error-w-o-index.patch 2264 BLAKE2B 252ce25e00a45c431d35b082bc2e0336a7b8dd15ca3f54a14b7f192e3d439bf056c0df76eec3ee18f70e0920d3bd0bdb801b4ac68652bebb24cc1bfa4515c71b SHA512 5ca7166cbf34717f5f1d157b118574373901544c6da9386158a1fc389c81f7ca4d18c0d613442c20cba8c76dca2e5a73b97dded33cc2885e17902571647d4b41
 AUX baloo-5.77.0-strip-trailing-slash.patch 1096 BLAKE2B c3a7a30578ec903d4e83191e80927626372b6ea993e6088651cef564e1414b62e4d4d6d9e27fe27c6ec2ee72499ec7403fd64fe327efe74e8580f15e23f8eeb4 SHA512 b6b4316043ff5c4386c4c372e4b927204a6b651146b781739113b368b51e80654616efe5dd3e093269089fd0584414e82329ae55dbbaf2f03a7702c9ed1d314e
 DIST baloo-5.77.0.tar.xz 290444 BLAKE2B decc4f6fbd785ccfe8e5f4616da6ee92fee0846aa3bbb25979ecd9cd445b0d6333ef1328221e39fb976e8ebf7c53be965b5ce58c8126a1b3cd2fa64962898083 SHA512 4d56136c3d661ad7dc11bf1f6b433b5fdc48f597bfd26ae8b5529d348750b89bcaba487c5bce874d557e76f5cee0779e2ea22c2259ce33926a1b3f26fa458929
-DIST baloo-5.79.0.tar.xz 290536 BLAKE2B 62bdccd726cef8ffb33ff4d5a5c1c9861d112dd54d00d4ac890c88594dfd6c6ef157512b489fb854a865a2db790359edc7099d78bdcf36c6a977a1f61d79038b SHA512 b0f5375f9ea56867fdf84d09c0d84b83d6c9b809769dda5d7f08484ff9cb0eb74032ac17a6a949ed4b40ce9a7a6fe68fd9414d247c0a8fa84a883f42101155a9
+DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
 EBUILD baloo-5.77.0-r1.ebuild 995 BLAKE2B c56fe2659f003a9368f355b27221d0d70e3b504e38b0379858a0c2845addc67369477a88f3ae6b82e898616859f855f5656726dc2c99aef7d6bec6b32c61114d SHA512 7e939bb0e67869105e75eae5d24cfd689dce158ec19213742d9bbd31a1ac1afafe53234e218f88bed074803d4ef757e46d80be3f5236196eaf11d78edeb4591b
-EBUILD baloo-5.79.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
+EBUILD baloo-5.80.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.79.0.ebuild b/kde-frameworks/baloo/baloo-5.80.0.ebuild
index 245f2f64562f..245f2f64562f 100644
--- a/kde-frameworks/baloo/baloo-5.79.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.80.0.ebuild
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index f234ddb293a6..a2ee5fa3b109 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.77.0.tar.xz 102236 BLAKE2B 97cc41eddaf6ed23545e5ee0d954c7e94d84b76cdb29bd195320d82090b86b70990a9dbf2a49c28a19ec792ecbd2c59e5ef76d83029b8e284c726661c6fb77d8 SHA512 15263c8d93239092e590feb147f32aa5130e8ff8ce0e1b159c15d386920cfa13c9a61c7acbb98bebc9dc64104f47157f38be7e68cdf284effc15327f50c58992
-DIST bluez-qt-5.79.0.tar.xz 102252 BLAKE2B f3111e5d258c9663c868e16072f570b59d5b90d4e039805f5f77687ad1784f5b43180fe56ab642bfa559f981ac10c9da12818bbb495440e056a31f5c5795042d SHA512 3c6da6a11e1fecfda87a04d1ed5df4fb9ffdad5e4e20a86cb054a36c298baf41980924c3b9f687ac86a964a75bc8f19231bdbfbb58fe43d6dab8ab1452242d21
+DIST bluez-qt-5.80.0.tar.xz 101996 BLAKE2B 6feeb0c38bcc1b380322d2019ade4afb7a601ea2743cd7879b13894db6fcd17ce85817ede0b87a6639abd090e0627f51218548df3caac43f1374c792fa4ae59f SHA512 6624d90b10bb742178c2da073a5a34eee534d29f0c068721961fca4f25e38c28723340009c0ecdc071999cc5f1a801b971dcf0f8297c2895beda40c53b59aab9
 EBUILD bluez-qt-5.77.0.ebuild 678 BLAKE2B 00458dde5660016ebee497088f0499446f2d4aedfd64a46625439472c725747cadae8bec69b60d26c866254ca9967b6a5fe42a1395a23e0523a24e698957dda4 SHA512 8ca0f58960278169b861b60970e7cc20f9193c9d8ffeb9b1a1a02e2b0ee35e3183d121bf74a0148e968823b936cd91ed9fdbb02e9af1359454cd2ce464c72e8d
-EBUILD bluez-qt-5.79.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
+EBUILD bluez-qt-5.80.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.79.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.80.0.ebuild
index a55ee208fcbb..a55ee208fcbb 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.79.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.80.0.ebuild
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 252d4eacc281..35da6422bb08 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-icons-5.77.0-image-missing.patch 9613 BLAKE2B b92eb0267bae9f281a5c388c98c866db1833a83936e018c4045e1151e01a63ebc4bb47b66726608f95e0ae7fbb1ca22c0732a091ced69fb8493561bd6f2638d9 SHA512 e4f09799d37a363858753d0b4cfbc45b946693f86cd8c992e9733fad3c0cebca18d2d04118c85eb7199caa2586b41747b375a75bfdae113dd46ae9bd33d6403b
 DIST breeze-icons-5.77.0.tar.xz 1993056 BLAKE2B b1fe8ca367075938791e3f79b047f779317f508f7aad7fd37fe206baa09558940e188756ddf0ecd07eed1094476ab98b5e910226039ceb762583d2de16eacb73 SHA512 def6c441bc6bfdcff5d5640ad585c66ec43b403296926eede3aa87160099909a67fa4e028b91e02cdb153bd577465ac0cbb400b5e0c211b555235a61c44d233d
-DIST breeze-icons-5.79.0.tar.xz 2016940 BLAKE2B b756d17c54d2ea5cfa9327e6294582660e621270078e8c5f81a717820a39aa4edd6df03f7743827ac191f3697c15e32f11dc9faf27789da26b0a5617b3b60aea SHA512 d54d85f2a8005060349852ebe82ebdd70e45abaaa490da084cbc2066bb086c3d27e511419cfcbcc95c48332fbbabace4effebc28f56fafbb1b8921b1a2b69998
+DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
 EBUILD breeze-icons-rcc-5.77.0-r1.ebuild 750 BLAKE2B a1be80326705a31086b3834139ab322336a92df698b8ce0081606832e4b0e218c8a543d8b1b2d70a3c4d8afb6375226004ffdc176aa097fff9782808111fe500 SHA512 2072c607571ec55293000399e97e9252c673c2950c039b5e949c87085c6335fcc7f14b0661c0c40ce161db0c0c60076fcbc31a998422ecc1fb0ab44af192e9d7
-EBUILD breeze-icons-rcc-5.79.0.ebuild 687 BLAKE2B 110f2a972838dbf796def16edda2a1463990f63d02a12780db6c36d23752d9de93cff7f4169bc47a9ed34b316710e6a180e6d78cc19c1e6cb9f45b4fd0809e4a SHA512 261f579c94a7882edc9d62b3719e0b35fcb0f33a920ca3838e529cbaf317dcc0053f01040a4c210dd84e27fee00d7a87ff209f5fc97cb152fa957a2be88397d9
+EBUILD breeze-icons-rcc-5.80.0.ebuild 687 BLAKE2B 110f2a972838dbf796def16edda2a1463990f63d02a12780db6c36d23752d9de93cff7f4169bc47a9ed34b316710e6a180e6d78cc19c1e6cb9f45b4fd0809e4a SHA512 261f579c94a7882edc9d62b3719e0b35fcb0f33a920ca3838e529cbaf317dcc0053f01040a4c210dd84e27fee00d7a87ff209f5fc97cb152fa957a2be88397d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.79.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.80.0.ebuild
index 1b150265de84..1b150265de84 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.79.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.80.0.ebuild
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 78f0a3add256..37382f567326 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-icons-5.77.0-image-missing.patch 9613 BLAKE2B b92eb0267bae9f281a5c388c98c866db1833a83936e018c4045e1151e01a63ebc4bb47b66726608f95e0ae7fbb1ca22c0732a091ced69fb8493561bd6f2638d9 SHA512 e4f09799d37a363858753d0b4cfbc45b946693f86cd8c992e9733fad3c0cebca18d2d04118c85eb7199caa2586b41747b375a75bfdae113dd46ae9bd33d6403b
 DIST breeze-icons-5.77.0.tar.xz 1993056 BLAKE2B b1fe8ca367075938791e3f79b047f779317f508f7aad7fd37fe206baa09558940e188756ddf0ecd07eed1094476ab98b5e910226039ceb762583d2de16eacb73 SHA512 def6c441bc6bfdcff5d5640ad585c66ec43b403296926eede3aa87160099909a67fa4e028b91e02cdb153bd577465ac0cbb400b5e0c211b555235a61c44d233d
-DIST breeze-icons-5.79.0.tar.xz 2016940 BLAKE2B b756d17c54d2ea5cfa9327e6294582660e621270078e8c5f81a717820a39aa4edd6df03f7743827ac191f3697c15e32f11dc9faf27789da26b0a5617b3b60aea SHA512 d54d85f2a8005060349852ebe82ebdd70e45abaaa490da084cbc2066bb086c3d27e511419cfcbcc95c48332fbbabace4effebc28f56fafbb1b8921b1a2b69998
+DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
 EBUILD breeze-icons-5.77.0-r1.ebuild 766 BLAKE2B 697f78737ca7a8d910378dcd2540c77b0ad4699318cf1f540aaae1f1cf235a0d7cb48ecc22f4953a615273994de5dfeb7cbcd4a5818948c61364ddd227dbf59c SHA512 50a8cce5b5242e6619cf12104a5810e0b63bf5d811450d6cb7c16a984f3a10bd0bb5c199a99dfdc8cc651be80093779c506474999614ebbf46f9707f51656c31
-EBUILD breeze-icons-5.79.0.ebuild 717 BLAKE2B beffcea83d2aa134a2eaf9a73cd887618ec3aecbb1852e03ae4e07b68131c7d79d765e7bc23ed8f16da22de7a33b53e2cf29987f2962ae551dd9a3c5234fa762 SHA512 2b5289aaae0699b40a65c8bd0ab5d1b1d1ac4b3e148934d8bbc845fc0974e5e5a52c495918def1fdb241893d04c09fd5573255f88088ada0f8f4673e2d30b766
+EBUILD breeze-icons-5.80.0.ebuild 717 BLAKE2B beffcea83d2aa134a2eaf9a73cd887618ec3aecbb1852e03ae4e07b68131c7d79d765e7bc23ed8f16da22de7a33b53e2cf29987f2962ae551dd9a3c5234fa762 SHA512 2b5289aaae0699b40a65c8bd0ab5d1b1d1ac4b3e148934d8bbc845fc0974e5e5a52c495918def1fdb241893d04c09fd5573255f88088ada0f8f4673e2d30b766
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.79.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.80.0.ebuild
index d51d10f7fac5..d51d10f7fac5 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.79.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.80.0.ebuild
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 6900c8014f82..e24f37782fb2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,7 +2,7 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
 DIST extra-cmake-modules-5.77.0.tar.xz 353784 BLAKE2B 08f70ab68fa1de0a8014fffb5a5f638fc49ea4d17a68de4a2061746bc95218235e18066d865ed12c746deb2212f61299675fefc4c89b2ed9d48e675925904f5e SHA512 0581b3f8f17ad452140a68e9d1b14014235523ecc2df2b6a8e6a6b3cac99a1b58470b8d31ae2eb695c1e5357d4c5ff26d656bf2f4ede7aba824eaed1e38a3a95
-DIST extra-cmake-modules-5.79.0.tar.xz 356596 BLAKE2B eb74d5be7b19831f26158a86c050952282276e0e0b75156ca81efc82adfc3472bdad9c011deda126b9d5f488671386caf87b4f243484b8ce768cdceca701ee4c SHA512 755d6a52d648fa471f18356f2efdb380397c66e69023da5859bec5d5c66f66d22636550bf3e99cbc5f2b2ab9274ac28219bf4f71a8a464a0b9761024181ea3f1
+DIST extra-cmake-modules-5.80.0.tar.xz 357412 BLAKE2B 1a564eac42bce7001b2840a052596456970e81810d07c091e47161933f906a66d20560a7d031f08660acd48c5db2d32c5512579b243dc4c0c803142cac4bb0bc SHA512 d07dcb31f8142c99270c234679cc0ab4dd13acd61e505a3623b7e2c811250acfb9f260cf355d8264bb1924a2aa61ed12fd3b5b431a4f619e33e3c7d53f2f7f68
 EBUILD extra-cmake-modules-5.77.0.ebuild 1813 BLAKE2B 8b5ac59ea6a6ee0810c8bc1729e09d0777b419b6725a8f38dd9c6300e23bf62d99f3d6563d9e473d75ac1303f8c0e87bc51de17f8306e7c8e6f4e406976fb7e6 SHA512 2a5a6c0e1269cfe4688b08e942f919a25f03b088c857da44904d813e32219c71b69e6b883ed6afdadc827c1d8f99b550aa2e96a2c378b32686b6fff1f134cd3f
-EBUILD extra-cmake-modules-5.79.0.ebuild 1818 BLAKE2B fbb8413d79452649dffd890ccde1867bc844261b78170292bbefb9c38675a2f10be490c49b2a7d08ce71bb7e8e139324e0ce84c36e58dead3289904d6c93fc57 SHA512 284836a461162269a8aa06a29b09b4cc6f87d2c7f301814c232d9ad23c420948063d0ff7e3688bf913027e129191be1f13e3bacd0830d95334333ffcea4d6154
+EBUILD extra-cmake-modules-5.80.0.ebuild 1818 BLAKE2B fbb8413d79452649dffd890ccde1867bc844261b78170292bbefb9c38675a2f10be490c49b2a7d08ce71bb7e8e139324e0ce84c36e58dead3289904d6c93fc57 SHA512 284836a461162269a8aa06a29b09b4cc6f87d2c7f301814c232d9ad23c420948063d0ff7e3688bf913027e129191be1f13e3bacd0830d95334333ffcea4d6154
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.79.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild
index 6bd09789c613..6bd09789c613 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.79.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index de1c8103d765..8ab27dcef4de 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.77.0.tar.xz 1754776 BLAKE2B 6184144a4ae91a8853de0fc8ab6e72afba493492b1ba408e428622f8028501f342a5bc9f8fd881a55935a48d2b695e5b9c920ef674e9e1613c9cd7b1803336c7 SHA512 e388fc092c0a3e3414563add6ca2a03ad6f3a3c25093293675ae0a2df594094420b75d000f2fcfa560044b1350672db5cea9f620ad9bd4349a1ebdd271624079
-DIST frameworkintegration-5.79.0.tar.xz 1755088 BLAKE2B fd16d82c3100dfa0f01cb4d0e493a59996543afac6c1ad13f3fe7c531f40ce74cce4fcc067d30dd53d120c6246883f73c8c03e44d39f7102f09e09f3329a8328 SHA512 29c76daff9e12a9bb1cfbb05e9ef704f116e0409550ba933f1b53a76de5ba11aa7d06a67b29659a0f38d8ff23818d213cc05147e45ab65c581944ffac8a9710f
+DIST frameworkintegration-5.80.0.tar.xz 1755248 BLAKE2B 55aecf28bc801ed72689bb340c28b1ee1374a913d98750a1380f91a36f6fcbe5f1e8690dffb74eb9fc642c578b5d6ca68937bfc95a52bdf7febaebe32d793ce9 SHA512 3e54729281d5fde4d18eaf7ebe18c6c17d1bb40e336ba0d91ac04aefd65800208efbcca4438a3be3f408860467c80bdf8b16b021c9892fec8f4ee55a13813ee2
 EBUILD frameworkintegration-5.77.0.ebuild 991 BLAKE2B 198f8908e578c8deee12847f85381b4d5157c387c23ce9c19eedbc0ea7760fd1177bbb967ae883a63e7eb3c107131168de83fd6e0fdecdaf34b4021978a2949d SHA512 1051c7cd297a0fc3dcca9995435adcab41c90a590e5782ad0c07bb85481d10e4283cedc878db20eadec594078a8fc38e12a3d66dad42c7f703ff3b73e3f709d0
-EBUILD frameworkintegration-5.79.0.ebuild 994 BLAKE2B c5af19730aa8f772d3fd4235c1b100a0470efad3fa2514e5acb920c671d11657e226b3c7938082fa356d86fe58ca732002a13ab7ac36c7810ceb96c8d8c56119 SHA512 4bac1d77b8b1797debb25dc0e2761d1bad5d0800800024f2e89bebb55a8735a4151a2657b631d56d4e41360127cde7271ac8b9660e8018989a884303c9f73845
+EBUILD frameworkintegration-5.80.0.ebuild 994 BLAKE2B c5af19730aa8f772d3fd4235c1b100a0470efad3fa2514e5acb920c671d11657e226b3c7938082fa356d86fe58ca732002a13ab7ac36c7810ceb96c8d8c56119 SHA512 4bac1d77b8b1797debb25dc0e2761d1bad5d0800800024f2e89bebb55a8735a4151a2657b631d56d4e41360127cde7271ac8b9660e8018989a884303c9f73845
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.79.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.80.0.ebuild
index 8fbf5abdb53b..8fbf5abdb53b 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.79.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.80.0.ebuild
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 61b5a7486da9..8ea0faf54b29 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.77.0.tar.xz 82104 BLAKE2B 250f4eb9943096e78c8d5635b75a190a3238ac6ba3d76b2ddfd167a7d99c1bbe1666ac42211faa5751ef84cc5ba4187f4f673392797d46c591715e1be2109d1a SHA512 7b5ccb6ab316488d4ecbec9e5687495531c49db52f3a32ca542314a912165f22a016047dce0fb2f5d23a78f324f85c669b2ff0114649263082fde1ca556bddde
-DIST kactivities-stats-5.79.0.tar.xz 81928 BLAKE2B f9a777378851591fa79f4ec0316728b96a1dc26b96c48492fc4c21200e6525df08b8a2bf59b15843e745b5016eff53325c4bdab7e4b1a9059059cdebeedca1f8 SHA512 2b14cf0f776952ac7f11533883867167106d0aaa75b0555806fdbec6cac06aacd803925324a4f0369f020c784db4a0fc4252fa772bc054e8c8a0bc1cfb94568b
+DIST kactivities-stats-5.80.0.tar.xz 81992 BLAKE2B 97998de9ce3ad101a2b565c22141ef777aa6758b42baea4138cfa34808c09147e1c0366c5e6ae046aca0d2327ff7e36d53b1eef9983a1d17d0f063a4ef6c4b02 SHA512 93ecac735b42509a7a186b43293f569e35d020dc9c152d4c89a096b77b194080db3fb9ecf0fbf4878f265b7893a3f18017fb3fc691e14cf76de256c93ebcdb22
 EBUILD kactivities-stats-5.77.0.ebuild 516 BLAKE2B 12a4af1e00110248185e5e289ba2e7790dfa6f4caa8efe396d6db259cd51f2309fa6f38e775eba16c051dd6a567b69454398468a7ea38c5a410832eab3b1461d SHA512 8da1daf76d0299e3eb7f7201b47e421904f9bc75814fd0b669c286291cae13986f1eb84402988bf2a1d4f98903510b2650ecb1b8f00bee23d877214a12e2abbb
-EBUILD kactivities-stats-5.79.0.ebuild 519 BLAKE2B c8a3482ac37061ff25c45000acc3e49ba1b65ff1352b642c678dd56db148c50b9cad6f586bd1c3b556dc29f4b048619e5cb512c86d7db55e143539ff360b7134 SHA512 0a62ed1b71727977dc01f40c605de404008c41e9574315c2deb7d9307809b6466fa8a24ff081090ca04f7835ccaa0cc460f16f542f4a499d1fa29751aae248bd
+EBUILD kactivities-stats-5.80.0.ebuild 519 BLAKE2B c8a3482ac37061ff25c45000acc3e49ba1b65ff1352b642c678dd56db148c50b9cad6f586bd1c3b556dc29f4b048619e5cb512c86d7db55e143539ff360b7134 SHA512 0a62ed1b71727977dc01f40c605de404008c41e9574315c2deb7d9307809b6466fa8a24ff081090ca04f7835ccaa0cc460f16f542f4a499d1fa29751aae248bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.79.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.80.0.ebuild
index 0888d85d34a2..0888d85d34a2 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.79.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.80.0.ebuild
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 6f781aebf7ed..04b4ab9a4514 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.77.0.tar.xz 72600 BLAKE2B cb451c4fb8f39d18d4fe31aa7c911c89ba0e9774575dbbe3260f69336cf40d9e95b6811fd37cde675d018680b4e07125ffb02a94f1b11f9667fe3e0f8f13b25a SHA512 e976b7c5a0888b4f164619ad3b67897e237187c217e5f7a9ec159ead8f521f11f9d543fb9877ff34c5d381d83c3d9a3e20d5430ddbe3049e146a403c88b4b7ac
-DIST kactivities-5.79.0.tar.xz 72576 BLAKE2B 5d63280830e888814d192dc8b47bac795ca9a86555f966b4ee622a0644b5b5acf68188a463a8e2ae84ba889f47c6859fa428e8b77f76df33fc98a38043baf7d4 SHA512 f3296f7409d2b5af57c5d606d83d25b6e93441c1f67354ab6c5dd9b52d661ab659afe903f51054683743da635efb9f682092807964ecc98eeba5de856a4f8227
+DIST kactivities-5.80.0.tar.xz 71404 BLAKE2B 01f0cda51ee2cece075aebef195e1df006d02cecfb3d404e14a43f6108711c27e5f0c06e16be1ec3339d43e14c2f8a53e7e3c4ce95c3cab6221c45710530ad3e SHA512 8cd5cc69f72db198b97a33947f3c9d15d3798ef42478babe18013057c74e398b0e2b49177270155d410d80e2163da450aeb88a24027281395b0682f93a54f042
 EBUILD kactivities-5.77.0.ebuild 679 BLAKE2B 4018dce52e1079da507d6e778f62de6d74bbbdc342c019ed74ae133b52a54b560ee16ebd18317b29a0e02f571dd472ac9850648363e496268f4b5d8d2a473c7a SHA512 78e12af03d59b65ddfce0b501eb66ff65c2547f6bca51cbf60aefab1829a2369df632e37b53845ffc7436a47a39b5d0ea1fb5be20e34925b0cef3edbcf94e7b8
-EBUILD kactivities-5.79.0.ebuild 682 BLAKE2B 059ef1d8789f7554277bd0433932dcbba3bf94b38376d97a45c2680e5084a02643c0cab5957e465b73c8bf61b5b106f86439725c683471331645df42a14622e5 SHA512 be7ded73eb965ede309d30aa6e73b33d3eef261ffb747a13de8f1e616a66efed5842cd2be4bae5070c9435911da3d6263e5fe71e049b1597933ab49fc555304d
+EBUILD kactivities-5.80.0.ebuild 682 BLAKE2B 059ef1d8789f7554277bd0433932dcbba3bf94b38376d97a45c2680e5084a02643c0cab5957e465b73c8bf61b5b106f86439725c683471331645df42a14622e5 SHA512 be7ded73eb965ede309d30aa6e73b33d3eef261ffb747a13de8f1e616a66efed5842cd2be4bae5070c9435911da3d6263e5fe71e049b1597933ab49fc555304d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.79.0.ebuild b/kde-frameworks/kactivities/kactivities-5.80.0.ebuild
index 8c56185f55b6..8c56185f55b6 100644
--- a/kde-frameworks/kactivities/kactivities-5.79.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.80.0.ebuild
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 75c61a7b9582..bee46966c87e 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.77.0.tar.xz 190796 BLAKE2B 570a3be85d730f64a0d771b28539aea57fac15a258143394be06311fc197c6435ba2762bb78cec1a5a94cc23a071a4b36d236a5f149acad213f1ad2aef8d04bd SHA512 a9fe594fb33e40341e9c336de0e10ec709b9ee5063620d371978e76b87dd8df668c1aec83047402cfa2586d7daf3546ba082686c628e90c20869f21feba4282b
-DIST kapidox-5.79.0.tar.xz 194412 BLAKE2B cd6ff37e0d2c823a87511ccd680b79d1c46f079d47293ab85da7e806d0b8bd4e59c1e5ed19312cfa550aa9df0d1a8992ffd308a8cd5d821169fd866406b62d71 SHA512 11b2549eab86c0d5ce30a75e024f7eb5764e22d679084f3e2e7ceb3eaffb8591d493df0f767776737f8cbf26fd72bed85a37aeb34bc203ecc2001cdfd69b14d8
+DIST kapidox-5.80.0.tar.xz 194180 BLAKE2B 2952c4f0064721a599648d498cc5815ea40270bd311e6d030390d0b160941cd59d58d86eb167974635938aeeac70f775f86fc9e4d3edbcc9e37d668ab8035b1a SHA512 71940b713e5686165091871e051f327a439494cf0d361f0db5ce765f38512a1b36895b9db3f81829efb7d56e0d589b6269ca6d820da196a6a712f06e1945b14c
 EBUILD kapidox-5.77.0.ebuild 592 BLAKE2B 61b9609b43e761b1aef0662a7d85e651602214a4de298c3bcf724b672cbbafc8bf3f67cb8cc05935acf269c26eee6bc12ab59e48815b1517e366e4a0538d40c7 SHA512 350eae7cbac429e5de6d4fd816b2604254bc470a2795e69cfead22228dbe5647f28ecc7906543e9254f3acdc42877bbc67fee7149a248edad24127d8bb895046
-EBUILD kapidox-5.79.0.ebuild 595 BLAKE2B 4ea93dac4b18d4caf2af475a6b3642e446272230195f85efdaab6ebab779097344741960296eee6db7282c29f1081a05653f262ab02ec2b8e722c33c100840fd SHA512 19a09adc3e6936331229b04a0702501fea06c12115e61b10100befe28f30868364b00dd08a169fac1c9735b5e805d2c249c983c049c633360eba10b2d6054c9d
+EBUILD kapidox-5.80.0.ebuild 595 BLAKE2B 4ea93dac4b18d4caf2af475a6b3642e446272230195f85efdaab6ebab779097344741960296eee6db7282c29f1081a05653f262ab02ec2b8e722c33c100840fd SHA512 19a09adc3e6936331229b04a0702501fea06c12115e61b10100befe28f30868364b00dd08a169fac1c9735b5e805d2c249c983c049c633360eba10b2d6054c9d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.79.0.ebuild b/kde-frameworks/kapidox/kapidox-5.80.0.ebuild
index b4a7e1a58e7e..b4a7e1a58e7e 100644
--- a/kde-frameworks/kapidox/kapidox-5.79.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.80.0.ebuild
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index d3bb145e4020..9dd12df2e77a 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.77.0.tar.xz 983452 BLAKE2B e860cb22a26cfb8c995f1062672dca5c65e531e747f3fa63c4dce509363b1c392ed934c440cb1fbe833b1a7bf4dc2e530c3c0e953571c9acf66696771f3d751b SHA512 2bc8158dd4899f645dc307cfa12fa3d6b8c85b22be1ecfc194ef486a4241e60cb381d7221fc2d3946f21610c8b03776bd5b38d548311f30d243b6a53a6ee1012
-DIST karchive-5.79.0.tar.xz 983548 BLAKE2B 7160deae2eda7049970ce630c0e454f35c65250f6d9426485e7896fc6824d7745901edfca9e5c3de9cf0181f25f42fddd2dcab0796b7295c818a1b868647295c SHA512 355e02ee09379f50fa3415fcb06126ffefdd47b98cc9c9ffcee849e8db20ec9555ac6ebbedccf22c25add2e6767be14b86150a37c4c9b6d158842f052850a81f
+DIST karchive-5.80.0.tar.xz 983724 BLAKE2B f4b6a61e3e910ca5f7978c355ca1827d5c27ebe7223cdd3563d19c7f07d8887530bb36040f0c9883a3961a2989a71497364c6c9225db0e00bd289e0fbd21ee6a SHA512 84a679a9515b2df989d4331307eb52a236d6e33ecc029e0c76732abcd709d7d4d026bde77b2b22a624b7e5fbd54d202574b858e37a3f7fbb0605830f812a61b8
 EBUILD karchive-5.77.0.ebuild 379 BLAKE2B a6b514e790be7c5b06843bcd7b4173994d5e7ce65cbce321b4d72b699e8c699d4d3f891d1b9e21e52ebc088ffef02e5a7a0d53e12c91cf42f958299918acbebe SHA512 39c9747836d485cb06cfbf6f1118f918db07016f92e49e25d19991eb43db279556984b1867611ea285e027666761a1552c42b58eb54dcca0726cb69e6155d2fc
-EBUILD karchive-5.79.0.ebuild 382 BLAKE2B ad8c6936848a4ca80c2140559e14c69501a1b81c8c21c80926953dac41a9471ec00991aae2e9c8fbc16e82c32029f80c33631539be5c7bbe4f0dcc155518279d SHA512 a0d207f7ac11bf2bbc66b381a99490c5197b1d6a3a89b1006e411c1d2b655e77ec6605dc000e23e56f28dceec876446c59a02e0c1809b24b2beec25a4fc605fa
+EBUILD karchive-5.80.0.ebuild 382 BLAKE2B ad8c6936848a4ca80c2140559e14c69501a1b81c8c21c80926953dac41a9471ec00991aae2e9c8fbc16e82c32029f80c33631539be5c7bbe4f0dcc155518279d SHA512 a0d207f7ac11bf2bbc66b381a99490c5197b1d6a3a89b1006e411c1d2b655e77ec6605dc000e23e56f28dceec876446c59a02e0c1809b24b2beec25a4fc605fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.79.0.ebuild b/kde-frameworks/karchive/karchive-5.80.0.ebuild
index 4fb5bffbb713..4fb5bffbb713 100644
--- a/kde-frameworks/karchive/karchive-5.79.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.80.0.ebuild
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 0f3cffed8a25..709d68f861cd 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.77.0.tar.xz 87984 BLAKE2B 014ce49db855fb7f07874c03fb5d4d49e8dae616c96840eae4c11faeddcd96e7a785b314d1a3119f6c138f7981a3e61e2fd546d40f57fb59d363d87f1c283ce9 SHA512 d135dbbdb3548468e87a2b06e20af3597d8ad3bf22c6e8ede8ebee05173a347205a966abf30db1af5d3e0f316a25807fb18f7219e4c58e4376cb9b749a9c5023
-DIST kauth-5.79.0.tar.xz 88012 BLAKE2B 92723799a1823d5cdece0fc98db6bdf5865e838056415168b95d08c36a4ae0337441a836c7def5a3db4c5bdf568db2e684f3d01f6d85c07dd2cacf67adb58c85 SHA512 3a1c09ade5b422b3e3db547807126d929e1f22b59cfd890ec22d85dc3e831286f424ad394273fb4bb6fabf1ebc88a6b28f520e8630ad762f394f1ef27c1dda01
+DIST kauth-5.80.0.tar.xz 87928 BLAKE2B 9383f10901223ab983c1ec7ef63d75447ad15a159694b9c333efe7911fea472c58aec93d123ac65f029b839bfafe8d559162aef8bfb6707cfc2f2397879b4cb0 SHA512 17ab01527a3204b32b1e628ca3882e27c4d4deb988381f8857ca4b51e80d136fa39faaf90cc28ca670ab8174bf757a961b6cbe6e87cc70a141968a1d1d94e983
 EBUILD kauth-5.77.0.ebuild 976 BLAKE2B 0cc8f8d13bcd80ea81646c3c139b506d3625007dc1d9e41d765d2560b42626a7a5650a810fd3074837dcd299d605f9359f4c6bb84f7a2919e91661e54e79b425 SHA512 103f1b006ae86a12d4e364ed4f32affb2cd2db42637595aa2f1f8f9705ca6edace6cf4dc6a3778958ffd82bff38f4930a09b17638347c613a4da0bc3f2dbaf9c
-EBUILD kauth-5.79.0.ebuild 979 BLAKE2B beefff0c49ba09f5932ae70c09f60a7d39174d08ffd08a19b1648d1d17e7581391e8ba1ee3bbb69cf7fe2ef2444816a50d2e25aea72655c3375f9094a49962c7 SHA512 0e5b71b97dd594857aba7c800accbae2bb4c14db199a5558cc64ddf502d03c44324479832a849585284691b7fb29d710af6310e938b7de318b108afdf9e4c400
+EBUILD kauth-5.80.0.ebuild 979 BLAKE2B beefff0c49ba09f5932ae70c09f60a7d39174d08ffd08a19b1648d1d17e7581391e8ba1ee3bbb69cf7fe2ef2444816a50d2e25aea72655c3375f9094a49962c7 SHA512 0e5b71b97dd594857aba7c800accbae2bb4c14db199a5558cc64ddf502d03c44324479832a849585284691b7fb29d710af6310e938b7de318b108afdf9e4c400
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.79.0.ebuild b/kde-frameworks/kauth/kauth-5.80.0.ebuild
index b87b08b797b7..b87b08b797b7 100644
--- a/kde-frameworks/kauth/kauth-5.79.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.80.0.ebuild
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index e7064e81b6d1..a2e260d0aff9 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.77.0.tar.xz 126444 BLAKE2B ff27d3d7a1298d52cd0a60a46286bda3b13dd6fd894ddb0806d8852443c2cf05036f79a1a0757a775e9db85973cadc7dac0c5a6a3ad7d2909455dee6af500a66 SHA512 5623d478290b8ff909e9c055735bcd6e4dbffe14eeb42b8ef91ec86a1cca68626f7e4b7d4bee7290e76cc50c7657e838527d98a73e3c1327b17ccc5290c91660
-DIST kbookmarks-5.79.0.tar.xz 126356 BLAKE2B 17c2c66dd7ff2888b918efdabc1d088a6b10253aeadbbc762191cb66f38545f0dee4e99f5d1ea8755a71cde458be88f9cbe20b968cb1b1a3f39567cd17841d1a SHA512 41a9065083944eef44d9a46b017494f8b5f6509cd9f3c98841226c344270736bed74e2c8089319cdcc5cd8a276414094c53f82970fade67e74da87c06b51ced3
+DIST kbookmarks-5.80.0.tar.xz 126264 BLAKE2B bf6ac0571293bdb5814395df7ab7ab9bca15f44978de045fff2d6af551d68e1715b1b44ecc4c183b5a7ae319bc44c06f9beb13570a4128fa23b29e9457f29b9a SHA512 c555fffaf850d93779b00aa9b5398e3286d02fe7a93844cb7b89cfce5ca8e5a694a6619daee734104bebbbb8ac5f5ceb97f2e778e476d3b0a4cdf030cd35f40b
 EBUILD kbookmarks-5.77.0.ebuild 816 BLAKE2B f9f563061e8789e304afdee4f8703bdcdae97364749437fb04d0b4912137a9212cf0fbc3b111c53edddb3e1f62dafa5f89bc442099108242a0891c6d6da1fd42 SHA512 2becb7d7944f8dc10229ad55ae7be5b78b64268c6f0ad13e997797ac8faebb3fd441c1b5a5fee4b617b28ba866f3d8b7511c46f5975295bb19e8f472fb61625a
-EBUILD kbookmarks-5.79.0.ebuild 819 BLAKE2B 451a47e5980134eb8197a5a70b3ae72c3968400feb280e6b6f41623a66941e3d7eaa46b6d9e0c77def8993a42300d7cd214796523decc98bf13bddcc00cc33b7 SHA512 7d2c1d054fa8de771717bac46e175dd5fa7edf67799fecc3191c334996d0c98071182c9ef63f9fc70ccdf29f39545f1e60ab2c1d3fba8275676f66b2717b6e01
+EBUILD kbookmarks-5.80.0.ebuild 819 BLAKE2B 451a47e5980134eb8197a5a70b3ae72c3968400feb280e6b6f41623a66941e3d7eaa46b6d9e0c77def8993a42300d7cd214796523decc98bf13bddcc00cc33b7 SHA512 7d2c1d054fa8de771717bac46e175dd5fa7edf67799fecc3191c334996d0c98071182c9ef63f9fc70ccdf29f39545f1e60ab2c1d3fba8275676f66b2717b6e01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.79.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.80.0.ebuild
index 8d622a20ed1f..8d622a20ed1f 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.79.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.80.0.ebuild
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index b211c4a4f192..53e99173f90f 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalendarcore-5.77.0.tar.xz 260012 BLAKE2B f98941ed5c92f47510e747ff3c8543872d5dc97abb1194c7093c734c065b0a7ab274e61022647226013f50a43bc882de88b0e9f5663473de9e29435279d2dea3 SHA512 f62a32b9d54c171f4659bf411f0edc44d4aba9aa608212addfc317f393f2faad441ac5640a752708166aa5fa7817449c8b9face585bdc452cc61f6dd25f7014a
-DIST kcalendarcore-5.79.0.tar.xz 258892 BLAKE2B 524ff94b1df38edc56a87e43a4927acc8f9321d215926514a088d6f3313503db73d870d3a0cce9c5b09d24d49d03bf7c2eebe4aa3379de08575f4bcf3f2111bd SHA512 fc2217bf6c08ea03635bf15153d0d9cb86dfc98f046045ebd1e9ea33c89eb20d9f373d7cf54b1302237fbbc93876de97b93592086af97ff20141547606beba05
+DIST kcalendarcore-5.80.0.tar.xz 259748 BLAKE2B 7eb9e5f6c20e42c1cbe0de675c95585a0af0c0c7b5f6e75fe153db3daf14110bad29ddfea8efc594841d7782fbe19ae896dd3b0a5e58f4ec0eb0c00608e3c6fd SHA512 701167bd708a817f6478fc7059c46b1c5138903effc7925248c108484e5f66f72fb1f2088cb82ef94d4c13671b7a8dfbfba5b2006f89d338a8ba22f95f10be0b
 EBUILD kcalendarcore-5.77.0.ebuild 519 BLAKE2B 6fea75b536daac4559a4e6f41941caed9b9a65b2eb9932f5488049dfedc38d3de8d16f2a3f70f23bc639e6072e729ff4746815e77182239c764372f8fd69cb6f SHA512 b8965fc430247ffea3f3f1a0b2e489966d7f90e05da651a1806b5a314c7dbdbbc4b3d2a9d8603ebd317253e15281b5651ff60e1efb799839e3606cee4cbab45c
-EBUILD kcalendarcore-5.79.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
+EBUILD kcalendarcore-5.80.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.79.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.80.0.ebuild
index ab621edd1b5b..ab621edd1b5b 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.79.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.80.0.ebuild
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index bd226b583de0..b7c3fe50b71d 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.77.0.tar.xz 257568 BLAKE2B 9de0dcacf7c2013958b1e6bdddc54fefacea826b05d664a34cf86477c3214d22528d276c153690b1efbc1dc6c7024db0f076056fd21f3133162f2ca222c17630 SHA512 4d6acfb4d11ae565182fbadc595fca085da614a52f43d9f1dec3ae78ad8c968be4a1b177febb53e4fffd80e860b5797c361d863a110c2784966e07ead2aa7776
-DIST kcmutils-5.79.0.tar.xz 257740 BLAKE2B f165d2e6daac5aedaedc8eec6b2bb7d6c6714f54c3d24289203f2ccd61ed2383e9fc62e30884e742d28bd133b61d96cdb4bf9b47417df8b8f08c5dcf02f3195b SHA512 a88d7ff0c659c42ef388eb8b70f3b3f3ef8fa4a6b678aea3ad09f4d5d6f590f1720a9f496194f49d64c94f38cdf314888a817050cfa5ea3d274bace3b43b87d9
+DIST kcmutils-5.80.0.tar.xz 258676 BLAKE2B fff7d18db29d1344e8ee522f27b474ee97c42b926aab841e8f4dddd3ea6ea2002f5347bd9841177fd053167aa4d20f40b083b70550567782c955fcd4d056767f SHA512 eed69f85032bd0e9c3211b0aca82932586ca443801cca268afa7dc3a27f703803ea9dd356f60107ca2b83daac36046752470092739837c9aa2c40c02335a8ee3
 EBUILD kcmutils-5.77.0.ebuild 942 BLAKE2B 36b71c3e196518cd2a9a4f9a30fd9a1eee592e7d8eedc4887629bb5fca5e17f5c202d9c9840fb659c3fa23a9aa33302af0a2edf969c61f0a2b760c103d621661 SHA512 4786a4fbf9e9c239513137ba44610756aa319d152a71a70024a25b5a7822e1a3fbdee3aefc2ef32aa3fa496e49d2e40c8216ccc0a33c6b505bcbedc246083eeb
-EBUILD kcmutils-5.79.0.ebuild 945 BLAKE2B 2255da3af0b64f164110cc55a0adc987c9f20f7a342c0dddc5f74ff19d272d1dadcefc76ba14ce364e934feef86e4041c9ee631a148f760a906de031c9d7b33c SHA512 95ca781a1b06a5f2c5c59b3b25f5dbabb4100188ad5d1e3c9430dca1b84e1cdb5cbbd8896b8fcd9a12b266dbf877ad192dd75f11a42f06a44a0e470fae55772c
+EBUILD kcmutils-5.80.0.ebuild 945 BLAKE2B 2255da3af0b64f164110cc55a0adc987c9f20f7a342c0dddc5f74ff19d272d1dadcefc76ba14ce364e934feef86e4041c9ee631a148f760a906de031c9d7b33c SHA512 95ca781a1b06a5f2c5c59b3b25f5dbabb4100188ad5d1e3c9430dca1b84e1cdb5cbbd8896b8fcd9a12b266dbf877ad192dd75f11a42f06a44a0e470fae55772c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.79.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.80.0.ebuild
index 20ca3e07e7f9..20ca3e07e7f9 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.79.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.80.0.ebuild
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 30c1f94bccc0..a8c221e8df52 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.77.0.tar.xz 228200 BLAKE2B 11e386ad10245313118171427b90d30f9c1beafbd185cbfeb5f0c220f85992a2ddc1773d0a052d189033d3f42ed238c4a4ae58e8ceb6e8dd2e31b28dbf4d0bb2 SHA512 d373253aff9b28d90193e7bdeee24eb540b5a61c720b774643712068b9669b71aef2c41e5db5a951e2ea1c5bb47536751ad4073f944a54a805db21fda628369b
-DIST kcodecs-5.79.0.tar.xz 228664 BLAKE2B bb19facf7becdb2df1951f5b2a4c32dcda955d6b821540b2e2879cf382ee15e04e8c85a3c01673ac0ddde890ec9759ec3047647bd0d48d6e1061d39ec8c5d763 SHA512 6553f54949b440f36f8039b167a7a8f380de725b2234cbb66536757c04a7d4e2145cab51dc3162a02d150e78b7bcb31c71cd7b89458d5f7f1e3570b8500b1dd1
+DIST kcodecs-5.80.0.tar.xz 229456 BLAKE2B a4221041df4e544376c17707f0e8fc3d0a6437b5efdf54c345af5bd9bba3a2ace2500594127ef851ad1330bfbbeafb533a8f6045132a0e184918cf230176db5d SHA512 27e367d12c995d96908ab0e956a6fba766374dc26c720ea97303cfa5a1e1b644076c5d68487a35ec8300204e556460d74a55be78239a073e1b3b72cebd153919
 EBUILD kcodecs-5.77.0.ebuild 503 BLAKE2B 8c2b6a0f65247d068e5fa6b6944447790f8299723883dca519e240598d8f66bb6e926bb6a34bfab2fbf4ef2929fac6aa1f382546e2a60a70ef134dd374b8e0a1 SHA512 033fbd7121a96c0898dc9b8c012fb6a0641113f66ae8679148e3ff2d651350592b65302c28952c050992ee4403103334928b14701a0d512ed3097ee3f520b5a0
-EBUILD kcodecs-5.79.0.ebuild 506 BLAKE2B d143a4d5730393f9806c190b03f2705e32d25b8c85c5ef8584f9ff6f98c6fbe2f043d25cffbefb856384601180f5bf72aa807e3e8dd765d01c1b14c180d361e1 SHA512 217540f607e4077b14cfe96046d3550b80507fec5982d05da51c6a4a9b9ef22fd9cdcccdea0c8385fb185f6ab1de1781cfa3bf922c120768e181011505bcbfc6
+EBUILD kcodecs-5.80.0.ebuild 506 BLAKE2B d143a4d5730393f9806c190b03f2705e32d25b8c85c5ef8584f9ff6f98c6fbe2f043d25cffbefb856384601180f5bf72aa807e3e8dd765d01c1b14c180d361e1 SHA512 217540f607e4077b14cfe96046d3550b80507fec5982d05da51c6a4a9b9ef22fd9cdcccdea0c8385fb185f6ab1de1781cfa3bf922c120768e181011505bcbfc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.79.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.80.0.ebuild
index 151dde78056a..151dde78056a 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.79.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.80.0.ebuild
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 4b9c7cebeb12..a8fb369a4713 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.77.0.tar.xz 121432 BLAKE2B ca1b4bd3cd2459891dbe44a90fdd48a6f2a14529598f70dfa354e0fc44a840b2f058e7aa43cf030cf0c98b37e001f2cc18a618ad39d5e04dc576ce2b7064a925 SHA512 1dbce42fab7d640083ec936586d89878d2b05c2a341bf6cdd58571b306600b8864d100a84cbfbc4d110bc5c87f6b07fe20859558d9b60e1927a012b98a67b87e
-DIST kcompletion-5.79.0.tar.xz 121808 BLAKE2B b608d9728ce2ce1d51075cea00f1ede61881a8f8b14d2eddf85fc9e0baccd585d7b86b2683c8d09dd4dcaca9ab35607a430482ab9fb1176ee886e43676b9ad45 SHA512 bcea7a8269f374cd813b31fb3b64c1e9af6b72e835bede02c68ce002731df7a6347c10f6df15b56d5c447f89f386888b8c31a48d9f66e14967d7fbcd0e7f1097
+DIST kcompletion-5.80.0.tar.xz 121488 BLAKE2B 8ab2146ab0d76e54cd348297091826d6ecd2622a08595784d4c8fef6d3f4f8d676a49decd0f7a59bfdd9e714eea6be5675003d71652809a82e5d30e54b261885 SHA512 7e0d9764c646f2b68b18d122a20a36c1d67aa4cda80f6c2e7091727ac328ec9c62d9851fcf93f2d80336b7dbe886b7087a5a0c1e3fb9a71c348e4e03c2345897
 EBUILD kcompletion-5.77.0.ebuild 736 BLAKE2B dd8ee95c13a903a46a563b9b0b7bdcb94effa6a7a9b36cf2b40bf2be1a592d407ac38c06307d0619a44f5de19a650d2d493c1fc42340a0b700b1c657113b13b7 SHA512 a1b13b4f2c1c664c5726105a54bfd611bc254b5e3f6e54843323ae40599db92ed5bcfc1b9e40b75d6d40495287d9aa0fb4b49e7eeb9a49c42423af8910a8eabb
-EBUILD kcompletion-5.79.0.ebuild 739 BLAKE2B de81fa95342f9ec44346e644c5a28ac49a1ba4f3c985a722711448d9f7217378d6d8ec24ef7e05ab8ac362a947f20b8fe6c5e4c0c180e27e044f68d9fef1856f SHA512 5218e8ff88a5fd346e7d161951ad7525304e546b3044c810c7b12a85e3207309212bdd17dda428d15bfc154ca0707353404f8ded60218d9520ecc81450190439
+EBUILD kcompletion-5.80.0.ebuild 739 BLAKE2B de81fa95342f9ec44346e644c5a28ac49a1ba4f3c985a722711448d9f7217378d6d8ec24ef7e05ab8ac362a947f20b8fe6c5e4c0c180e27e044f68d9fef1856f SHA512 5218e8ff88a5fd346e7d161951ad7525304e546b3044c810c7b12a85e3207309212bdd17dda428d15bfc154ca0707353404f8ded60218d9520ecc81450190439
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/kcompletion-5.79.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.80.0.ebuild
index a0fa08fde404..a0fa08fde404 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.79.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.80.0.ebuild
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 20e718c77b58..3153c218808a 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.77.0.tar.xz 263748 BLAKE2B f34b50bdf493bf0fbdad6decb3c6dad681de1cd4572d1567f2c99a68e1166b680c3b8cc8a28ddadd1482ae5b0c8577165d129e9ed2dd07b2c43bf07c35a1a8cb SHA512 1dbbe1492716b7ad93c2a4f8e8e57e8f6f4ad95ac845986c1d37d2509b1a3c77ab422835410a8cf4a21278ef870719375a342a8e4034c2199182cb9db8e4e8c4
-DIST kconfig-5.79.0.tar.xz 265972 BLAKE2B ad18632ebce67944b960cd07d2b8b0210a6658e872f8a979e8a7194f7406745c8ca8a7dc21e114af6c2f1fe8c7835b19755f1ba54c473f37e1630ebe2a4b0ad4 SHA512 ee22b25efefe88d762388af6d462f81afba5161974bfac97c9576b12614820657f9302472503a5dded14e65c7a56ab01a03a918f48f0fad83e996cc516981de6
+DIST kconfig-5.80.0.tar.xz 267500 BLAKE2B 007b6256fecf5dccb9aac51433e6af90390da515c57d999e349e6633c270b7d7420eedf944d7862537701cc22cc08cb656adde2bd8659b425970b82ca5caa396 SHA512 5836dded113c0e4365e9e48d56cb745e9de57dc025c0376b692151dccbe6c864f2e4a60bee02b8a171e2fbd4816adf18b6eb1b611125c379a91b0b7dc7d7e115
 EBUILD kconfig-5.77.0.ebuild 787 BLAKE2B f0e4b1ae594fbd7648940a0b3ed11f24063068a19cf08ea59e5b5944975f842f1a3744f3bb00e3514c3e690715d75d310e4eec2c94c05a3b4eab787a38209f58 SHA512 206e4a6db0f8b29f388fd23b42168ffa0040642a05463e723452ca9fa84ce7542b6a94a8093e80257c556595cf903aede318f043ab2e7702bd8b7bbb694aa15b
-EBUILD kconfig-5.79.0.ebuild 787 BLAKE2B 3f091ffe5050a87210e3c2168ea132a496e839edd24ef175a6dcf01a63c212140728767340c8fa6c68d6d43b87f45f45bb9badbe491a77e97fa53acc0d5a97e5 SHA512 2c256ba4fbc769faf1e8afc6bf8795bfe53721c4801d1bb0bcd8e6bb13a8acbedd3c1070a385e8c327dd3d99a842d70ed03be19e69e3753a0089a0c406f8b1b7
+EBUILD kconfig-5.80.0.ebuild 787 BLAKE2B 3f091ffe5050a87210e3c2168ea132a496e839edd24ef175a6dcf01a63c212140728767340c8fa6c68d6d43b87f45f45bb9badbe491a77e97fa53acc0d5a97e5 SHA512 2c256ba4fbc769faf1e8afc6bf8795bfe53721c4801d1bb0bcd8e6bb13a8acbedd3c1070a385e8c327dd3d99a842d70ed03be19e69e3753a0089a0c406f8b1b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.79.0.ebuild b/kde-frameworks/kconfig/kconfig-5.80.0.ebuild
index c03101c447be..c03101c447be 100644
--- a/kde-frameworks/kconfig/kconfig-5.79.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.80.0.ebuild
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index c10fad049a73..d5d8d6ba0ccf 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.77.0.tar.xz 387264 BLAKE2B c9fe1f2c6ac98e643c85ac7472e824380fb0041576e02f486c033e04d17381bf6bf91527f50cd5ed8316ab079b1b23a2db6a501323f2e699d1da8605af9ca534 SHA512 2b3c13860993fdaee4a715aef5a87d25e0c85ef7b8ba78b731258c06ca051094269b0404737be8b7a29d88fb78f8200ff3ec5b2d577d5f76a0725aeccdc0b9d5
-DIST kconfigwidgets-5.79.0.tar.xz 389448 BLAKE2B bda895d970c092b3db06ca6411707937467e40ca75d5b1c98248ad0c2c2daf9918bdf713699bf824b02a8e40ac59e324980848e0fcbd3f630a3dd82ed88fc148 SHA512 14e4d85407f9702eb1ec8846e94a9ad54c03cd4d7ec5910262f8376d9c06499835ce2a0fb938cf638de085cf029c5a69b7d8edfda5c1dde9855a83e9cfbf549c
+DIST kconfigwidgets-5.80.0.tar.xz 389484 BLAKE2B 0e1a442d2c5499fa88e20c0da451f28eeaf6121d8c93a7573583937542b4361ab8096bc2edfa187c0c89f2942e134cecf2814579803332508398e2d252b7f93a SHA512 f482d86ce3b893c4c0dce6fb6db005759bdfbb794114e636ff63a2a7db762e2ddaf2f53c0363561a4581967a6177b0ae077febd020d46bfc32211fab5725fa3d
 EBUILD kconfigwidgets-5.77.0.ebuild 995 BLAKE2B 7fe0aa4de187cd8131be48613e5abb54bf9c26d4de783c24677890597321d2194c066f25a3fc6d3cbd71de2aaed4d2751e5ce73e80d8740e3610ea2e5587a69e SHA512 2c476d93bafe83b8bb7ee336a6a68174a07afb24564df829f549aa2c534ff6b1b763b42939bed18572ece519b9a48cc6e07a5b3da25fe009e9113dd0eee4dc7e
-EBUILD kconfigwidgets-5.79.0.ebuild 998 BLAKE2B 70de99e00521dbd866f7c4e67f1a7edf513a03b567cebd2790c6d2cf374e390eceba6b6493dce2caed87c555a1e2ebd391a280352f8961ebfac90ed26ec3c7e7 SHA512 97f1a8c0f8ce7c10ac887499a673c52032804e3787ee82c014ae4e1fb99217e30852c64144cf086e46bdd2f1e9c055eee360c76fbbfddadd98b9a6e63c99065b
+EBUILD kconfigwidgets-5.80.0.ebuild 998 BLAKE2B 70de99e00521dbd866f7c4e67f1a7edf513a03b567cebd2790c6d2cf374e390eceba6b6493dce2caed87c555a1e2ebd391a280352f8961ebfac90ed26ec3c7e7 SHA512 97f1a8c0f8ce7c10ac887499a673c52032804e3787ee82c014ae4e1fb99217e30852c64144cf086e46bdd2f1e9c055eee360c76fbbfddadd98b9a6e63c99065b
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.79.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.80.0.ebuild
index 704b573a1c8d..704b573a1c8d 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.79.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.80.0.ebuild
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 18e4e8ea6735..0d3b45becc7b 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-5.77.0.tar.xz 544072 BLAKE2B 26e21dba6cc98d80670cc7aaf26de442501d73b0c0dce23431c65cc9425403056e959432b1005d46e9c820b9c0b8c73f59751d57fa19f1dc2aef3198cd71fb25 SHA512 82ca6ebf5dabe945a146629537070a4518aaf1fd30af294a40c85e48029a54ed6dc62637685e54a2f6f4d226b531a2efb9aaaeec0e84a53f899f14a1a9de0caa
-DIST kcontacts-5.79.0.tar.xz 543544 BLAKE2B 57b4019cd091880faa572e4de449a0d9fc70a649294251e3b9dbf814ed1f5130a389cd843f3f4e021e5719368166395e5dbf677f3ea0f689a22a28acc62068db SHA512 793fb0f2bbefab8dab60bcbed8537ad8cff334fedb408a7f55c4a3b094933906d4cd95349fd7d005a7ae1cc64a40d7d9c5fc72ef09945a9a1bb914537c280059
+DIST kcontacts-5.80.0.tar.xz 542984 BLAKE2B 7a6e8b818f072299d06069f3126076af262822268625b73bff1cf1a384991e62f801e1cc504087f37a9062d6ce6a348420d05476a625d180f6b084e1ceeaf332 SHA512 d68c4f04bc2e642689ea8076819d4844c2d1c5ac086c3d785717b33ae659354cf6351760f3f00605f945f471a426222af54f525c094d9a6da79f49ce09dfff0d
 EBUILD kcontacts-5.77.0.ebuild 745 BLAKE2B 31ed1b2f25f3b127e5ece33f8060ff8f2932c792893929b110fa245acf02743ef80e4f1be4838b24b8e45278a01059a6108c6d740732a9e837aa8c5374c89a57 SHA512 f4edfc07566f33da59ffe8a4f928c72c76bccb1df9c8af250d6b468b82250b3439585e52ecc9ebbc846cb120b0074197cc1e464473ad035ef651e0074d467b4a
-EBUILD kcontacts-5.79.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
+EBUILD kcontacts-5.80.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcontacts/kcontacts-5.79.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.80.0.ebuild
index 9c7352d00bb1..9c7352d00bb1 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.79.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.80.0.ebuild
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 39fce380b75b..22f474d0d128 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.77.0.tar.xz 402468 BLAKE2B 25b065b85804d24aef19e9f98bee79760c7d657d332e1213e7f80d7e8234020e7609a76cadf0e99149832c0ba203cdf8b061c90da7eb83e0253d513eda51972e SHA512 708b993ff8df921533ab893f68e5e997a58fc40e4b38356c1b80940ff429a5753fc5456b9b47941e078c58ab6cfde1626d6fee737400b8ac72cea9e01880b063
-DIST kcoreaddons-5.79.0.tar.xz 408924 BLAKE2B f414280dba9037ecb99b9dab3bfa14e6b4dd7a71776c7ceabba5152d86c33a892ac704476d64f500158bfb1183dafa2ee2d784b6be0aadbb3c4f7742bc7e0fac SHA512 611ffa1353f7f03f21cf729e0ef5d0c1f81adadd83103fce241ef5e1c609f129dea4879385c778f1388a67f5f0fdae7dd4170bdbc03d3a9e1b981bf1c96e0f03
+DIST kcoreaddons-5.80.0.tar.xz 410980 BLAKE2B 2af44b2b99120a7875aafb22acbcdbfd8b377c99ebea5e50053efcc9a736eda98684ea610f38180eca3e1ed3404e50779ad5ecba02d3b2cb79a9d4f05d1d896f SHA512 38e4784eb344402d31cd0be0af4f3d514d5b4b2713e781abce5896f3fef35852dad6a59e3965a25639d042ad90ca527a6e79a312ffc210594d501b5c52ee7d1c
 EBUILD kcoreaddons-5.77.0.ebuild 1041 BLAKE2B 49f2b054f21e15eeed7a423027c956a9c14ff89887c363818975cebb7613fd3574393c21bd3d2c7765cb2bd3edc46fb7571703680fddb8f78f290ce9a0748c20 SHA512 3193c01342ab7465b7a62182a0a07474e78c2980822d7c6903abb1a380420ed29f1ec08689f227d60c0a3f6565fff7a8ccf7635af4a18d177e9d0bb8090e68af
-EBUILD kcoreaddons-5.79.0.ebuild 1044 BLAKE2B ffcfd9e4f6b3bb9d75329bbb8cac00feb3bec45762885cea942346bfab1d030f16295ed39d85ba23236a64c902942e5ebf76bae36799a86f4786ed2d7f0d29c2 SHA512 80102d6b83dc7c84ab2d8fd6d6afdc98bd032abf8444141c71cd13d1485be076f22a494456e5e372155953a746b9d177d22b083bc0179be1e701f7aa2d3a425d
+EBUILD kcoreaddons-5.80.0.ebuild 997 BLAKE2B c6d9516dfda5a2d6cc3f0d6b2599f6ba548c05796fb198d0e940161aae16e9dee26e48efcf112cb1985cea74fecc9bb9eee2c23cd235e8bd67268067baef0715 SHA512 1bc0ca46c2a0c0f1ace5039c9f9360c7a970991350495f80c7efb3c57e85aff88ba6f2e5225c5756621b6661e3cdf4245df104a000161bcfc57444511c453b01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.79.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.79.0.ebuild
deleted file mode 100644
index e14805474ec3..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.79.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
-
-QTMIN=5.15.2
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="fam nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5[icu]
-	fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		-DENABLE_PROCSTAT=OFF # silence FreeBSD spam
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package fam FAM)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs: 619656, 632398, 647414, 665682
-	local myctestargs=(
-		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.80.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.80.0.ebuild
new file mode 100644
index 000000000000..9c9ffd88ffe1
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.80.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.2
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="fam nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5[icu]
+	fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package fam FAM)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 98ec179702cb..a2525f7fee6b 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.77.0.tar.xz 22252 BLAKE2B 8e5775b78d86d03c4f0cb04b3d0536f71e46e345380bbe83c94000cafe2335ebaf5e4e57e2cf8e172e6afbb8941875b52fba97352f95b167777e40ff768efbf9 SHA512 5d76d7229716a4f27af63f6d506772d6c99a0c516fa0f051d695a62f7850ab1d2d9136aaa4adadc29c9ca1d1d3bdf2d825b588593fdeba0206587270b6e17bf0
-DIST kcrash-5.79.0.tar.xz 22228 BLAKE2B d255d476916b2cafbf109f3b4b485aa90919ff9b68e6f2476c229ec992b904aad731695e5e71ba60fd31841fe79664642a76190ad12196579c3bd9fe7de17d18 SHA512 102355998a78cb7db59ef31a70836c0fc459beef710991fc15815af8e091ade1410c0966221e7a79998b0060cef2779848049e51569b255a35d629c92911c74c
+DIST kcrash-5.80.0.tar.xz 22320 BLAKE2B d7c5ce91c1a99c34624b7af6686a388813f7769ea28f25ca067bc3c91f0c1ae2727e308095ac6a0ac00b7579543c46fd96b81cec9d5cdd6b4b73efc424c4b0e8 SHA512 e56219a3d9f8beddb992e61c9f01160b9f71f692856840674577f11fb262d335b2f622b0a8463b95e1e72295a3ec81f4b590f0b54219fd9689676a1dca4eb807
 EBUILD kcrash-5.77.0.ebuild 703 BLAKE2B 51c186e25557fec43f88052efa6dcdcd54ab36771319070e3e19e53a5b6a91f80cd5f0868ca59c291e70a7a3606243668ff477b7a703e94645c5b974e487d9dc SHA512 7260142113e8f89ed2d2e4b1698f54a28ea14b8dfb9fdb7d2afa379115761785980dfc45db39f32f4d97e1c7aaac38ca91b0e088f303cc4440c4b46088a0581c
-EBUILD kcrash-5.79.0.ebuild 706 BLAKE2B 3660fa498fa3ec8a0cd88b47a6e9b293ba73bc8ec81541d344767c8c52a9924499cceec00b6c4b031938c091342624630c288056dd870c1381aad1a837abaa8c SHA512 7ba5690eaa4a50272dd0fb32908479583b3c616bbaa2be8287a03ff8a887492b76e1c48f7f139d55887009c61c640fa6021fe9759042b5097f889fa6d40dcf0b
+EBUILD kcrash-5.80.0.ebuild 706 BLAKE2B 3660fa498fa3ec8a0cd88b47a6e9b293ba73bc8ec81541d344767c8c52a9924499cceec00b6c4b031938c091342624630c288056dd870c1381aad1a837abaa8c SHA512 7ba5690eaa4a50272dd0fb32908479583b3c616bbaa2be8287a03ff8a887492b76e1c48f7f139d55887009c61c640fa6021fe9759042b5097f889fa6d40dcf0b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.79.0.ebuild b/kde-frameworks/kcrash/kcrash-5.80.0.ebuild
index c9026f018d6a..c9026f018d6a 100644
--- a/kde-frameworks/kcrash/kcrash-5.79.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.80.0.ebuild
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index ca8f27334e0f..d01e42966215 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.77.0.tar.xz 59300 BLAKE2B ad1e9baa8423d5ded0fe975b5cbe2b906ea49a7766b34f89049d1253c14ce6001ac270454d2fba539e443a4ecb0ad78497438898f57019b54ea28164a22bae5e SHA512 18f13f38c5b78be4258062ab38b6b626bc19ba6a9ff5f0b983d5d9f5e000932346362e8f9f8a6af8544ea4037b99f24640998a5978269415b63a406b82c48e24
-DIST kdav-5.79.0.tar.xz 59248 BLAKE2B cddb8e5baf59a209481fb07555e545505b898681abaa06ffa5886adf7ed1d981428e19bf6dd3cd3299c102f9d75446e08fd88274d7f309027271383f0b58df66 SHA512 11cece9b24430283fec8c164c8efe1b2e1c5afe441be819beb8da25b0ef8745c69df8ee1e7453a7e9f728f9be5fb3e2f42234d4106962a53e98d9a1420e3ca4b
+DIST kdav-5.80.0.tar.xz 59824 BLAKE2B 7e24d3b15ed973042b995acb2308f38d69820dcc86b22e2d277b561b38a3d1ca705865d6471a0b5d6c53db7752726458e9487d1fb83ec65df52f03624ca32e90 SHA512 9f572d40b8a71e588c6a9773ca5615250e6517477c33594ca8ccc78a177d2fca8eaca6224dfcdc2f972d0205b50093d238d3c6f55ea39a7d823bf797d21a8e80
 EBUILD kdav-5.77.0-r1.ebuild 902 BLAKE2B b89dc0dd041bae39cc30c04a5f3fca277527a8e79f7a6634f9027bfc3338165d476f0ed38aac42984d656ac8ff8d48de05f392aaa1c02b88bf58ab13bc45da4e SHA512 bc2477633858bea7c154580aca9807d3a6e859e1aa13fde9214e416c9cc41534492e58caf52917efe7227f5c994e6a7bdf4bcf5022059b5c625b72e945233c09
-EBUILD kdav-5.79.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
+EBUILD kdav-5.80.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.79.0.ebuild b/kde-frameworks/kdav/kdav-5.80.0.ebuild
index 925ae2c1cb33..925ae2c1cb33 100644
--- a/kde-frameworks/kdav/kdav-5.79.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.80.0.ebuild
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index bffafbd1097a..790981489350 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.77.0.tar.xz 42536 BLAKE2B 4a838036579c72e7fc466e79747423f664296558b390273b311dab8bd23565797ead303b5010b0fe10a8ae929f156a999bf038fa13cdaa5e60eeccc3cc44453c SHA512 f587d72de0ceb0231accfb697f54ae3650d75a6d16b9ddfc46aa9801ed6f4d2e2420d08c51d92606149ba25c3c67e8d8be2b7b62d7efc0adaca5d2396abe446f
-DIST kdbusaddons-5.79.0.tar.xz 42604 BLAKE2B e71ce6a4dfc64470613ebea0393d4754ffea60164ae9d3733e95611bfb5d49abe82dc3177848fb41f393a291cab9f3787de3ce2e4b35f4b4cbfc48833adefc03 SHA512 962de4b28b41ff4a1a12fc062dc449b93dfd278449f244abb3b3e4e3f7a06a86d43dbcdd02c91b732c4afcba387ab69c4224fcc5d3ac3ab2090b105dbf1df556
+DIST kdbusaddons-5.80.0.tar.xz 42596 BLAKE2B c9511ba386cb803ff9dc09e4474500eac4c31d3625d00fedcd8473eac19e7669e7c670e8dd9b421b855b550f6ddc224defb5822836d2f8fa5bbd94f8cdd2ef05 SHA512 87d3a75cde0ff9f759654bb8ec99762ae18f0d5d3dbd941987a871583811b141d9020dd0c5b25ea2f05c2b9ef521edc8423548c0587aea69c2e4fab9d423160b
 EBUILD kdbusaddons-5.77.0.ebuild 668 BLAKE2B 295afe97e54e92ca714cafcfb8c690bcc8692224a5f4d532e2c9077bd44fe6947fa236eeb00d04e7d9c17734259846e6390fa89bf2540a8f837ca8d58e899d5d SHA512 20a1b5865663c8d620ad948456ee20fb6a289d0e79c50ca0f78569787eec9901264eea85a32b9d42492e700b7797323b655897f7044ef27664feef96b3c120ad
-EBUILD kdbusaddons-5.79.0.ebuild 671 BLAKE2B dd9cf4b09439608d04ab25abadb1361d43d3763d99e5c92555911ab4eb38cbf7270876e4d7ab3b1cfaa52b3676525c74e2bcb2b0b996c12fa6bd84ae6b4cf0c1 SHA512 f88d3aebc963432662d8b9a4e96136f90d29d731cd60e1a14e375d9c0d9e060413d6c0ab4d135ed9045b7e0e538a48065337c8cc97fb91a1c07eff8b1ca14113
+EBUILD kdbusaddons-5.80.0.ebuild 671 BLAKE2B dd9cf4b09439608d04ab25abadb1361d43d3763d99e5c92555911ab4eb38cbf7270876e4d7ab3b1cfaa52b3676525c74e2bcb2b0b996c12fa6bd84ae6b4cf0c1 SHA512 f88d3aebc963432662d8b9a4e96136f90d29d731cd60e1a14e375d9c0d9e060413d6c0ab4d135ed9045b7e0e538a48065337c8cc97fb91a1c07eff8b1ca14113
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.79.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.80.0.ebuild
index 6b5380dc9482..6b5380dc9482 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.79.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.80.0.ebuild
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 56ad8fb3bf4a..2c9212b9a49a 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.77.0.tar.xz 185036 BLAKE2B 53ce685df457d3e8b33d37efedbd7ba56b430a228c32673ca01cdf401f80a8e3518431d15182dbf28f4fa4a439369e380e65c13cf9fe385f42c98d54d50043a6 SHA512 188dbb2ba5080b2b5cb9815686c0bc619921390389e2865330c6183c3cf0c6f0df6bba7009f9215f2c99759322bf1ed4cae68df5c696fd1c3ecaecbaf327419c
-DIST kdeclarative-5.79.0.tar.xz 185144 BLAKE2B a3cd4b80f6b6dc8cef01bd82e86723bb18e7c789ec9c8f37fcfadb54d0fe2a3e397335c23f5e475c888a16c326a323ec5e278318b1d95dec7d1cdbf39be89702 SHA512 67084785363c3578f7f8bef111b8c3830e82b2c1b79e4217ea2964f01b9708a9c3f2473075144e1e5c85ea740003451fac9b02d1492be5707ee939c6307aaf12
+DIST kdeclarative-5.80.0.tar.xz 185132 BLAKE2B 049e696d2387db07fa496ae35050d6a1448f4a9b20bf3ef9e5a040068838376545202a777c993fc93c8fa91081cc9ced89d73d16ee113f498e0d818464abb8f8 SHA512 e3db516267474acab8967464eb7ec7ff0ce93614efd708d76d9df5273d31cc104e6ec3a4dd8115d86ffc357e85a27afb797c5842d489ae93636d9a1f16d9915a
 EBUILD kdeclarative-5.77.0.ebuild 937 BLAKE2B 21de0ff02bf6b16f8413552e6ae7af9db4aa478004126f36c927bcf120f098ed6841b22d19de3b26c7cd91d6a1e81cf2c3e3f5e4b3a13ecc4e76e97c4b7ecab9 SHA512 df0f435edb48ac38dbb920ef9575cfb226bc8ac2a4bfcf6af6ec65c9678c00117bcbcf395f0ba7ff49202e94831af0679b7e83b28c0081d5b3443637b7ace013
-EBUILD kdeclarative-5.79.0.ebuild 940 BLAKE2B de437d8206c35e7d03035505e761c877a7ffeeb9f355952d7652d71380b33bf2a92630ba19beaba7c9bbdf27a4e51d79e5d038315d4429bae64bb4067153966f SHA512 b9cc92e4e271ecdb81b4ec772b043f53c2cf8f38bc38e5d9c03b8750a52a780575938cc82fbe91dae41c83988e79d80903a760393270dd22969211d688614a7d
+EBUILD kdeclarative-5.80.0.ebuild 940 BLAKE2B de437d8206c35e7d03035505e761c877a7ffeeb9f355952d7652d71380b33bf2a92630ba19beaba7c9bbdf27a4e51d79e5d038315d4429bae64bb4067153966f SHA512 b9cc92e4e271ecdb81b4ec772b043f53c2cf8f38bc38e5d9c03b8750a52a780575938cc82fbe91dae41c83988e79d80903a760393270dd22969211d688614a7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.79.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.80.0.ebuild
index 34815c54112f..34815c54112f 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.79.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.80.0.ebuild
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 3261ee1cd4f5..1e51fa0649dd 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.77.0.tar.xz 36684 BLAKE2B db5f14c43f694b54d685a2ab91cc8c85a1d84282d2adad1be6f42f39e9b2a667c6062f8f14d0a01b5aaace6dca17def90ffc863d79fe31c361ad466e61bd2682 SHA512 c8e2763002674a9fef349f2029bc9c1deb7a46d34e03243a333e24f892ceed2e37d2847aaf18d5bea990b32188948dfd1c0ba24afe2cf78c58a9c24530174f31
-DIST kded-5.79.0.tar.xz 36692 BLAKE2B 86319a63f72d92eda349feeba1465525bc157a9ded6b209dcf2c5ed763c0acd42d2a933b983b8391bd951676ff36f6b8d6e9294c3b731aa09801c0569306acf4 SHA512 c033539ca186c96dd8a1e1307c96feaa3bd44e8da906e4b7c98700abe7c1bc753c85ac2b63e0ae211e6bb1936f56b66f64174d21d98325bcc87038f47c9161e7
+DIST kded-5.80.0.tar.xz 36860 BLAKE2B f72d05825a8615bc85d1c8a87b0e9eb5a69d91b491b1c9a5445f6ccec9e3a1f064e1415b6aee582564140c352b1e6db0d36249d993ea657ab3128465e63089b0 SHA512 f900ce58172930e3cf6ddbb842312737140f17ce3548d49c8181370c0e3932440e23fcaf4a08068b818e6e1d61f5519a2cc1bd5967f5cf46a10ba6d7ee5d8e30
 EBUILD kded-5.77.0.ebuild 835 BLAKE2B 3b497100932f414561bd35700acfe06bfbd143ccf0c1eb19fa022eeaae50901ea74421df7de7131f5a0073b39cacaf32ac646ec0cae7b1bfb7f5b56b2ce1ca92 SHA512 282315b813c6d975e814bf432e6511d9e0cae24e0f7b30802fc1c5a2570a7790a79cfc7217def41940ca71d9b180882542585b86a2f7db40a3e3041447e14505
-EBUILD kded-5.79.0.ebuild 838 BLAKE2B 25a30c31ee7b2ffc1456db077be4399866a3d32b8ff2240523ea78358ba2e2e2f558b165fdb2ec099f634b25a8438dc4a2673f6b4ee69793c86dec2c4d9c89a0 SHA512 955b8280d99ab886cc4ca9a6aa27b33997f034b8d70441de40b393b285054d551380787ca8bec8596448053ba05fd5f7815cb07a6f173825910e0c7fe1417fde
+EBUILD kded-5.80.0.ebuild 838 BLAKE2B 25a30c31ee7b2ffc1456db077be4399866a3d32b8ff2240523ea78358ba2e2e2f558b165fdb2ec099f634b25a8438dc4a2673f6b4ee69793c86dec2c4d9c89a0 SHA512 955b8280d99ab886cc4ca9a6aa27b33997f034b8d70441de40b393b285054d551380787ca8bec8596448053ba05fd5f7815cb07a6f173825910e0c7fe1417fde
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kded/kded-5.79.0.ebuild b/kde-frameworks/kded/kded-5.80.0.ebuild
index 9ab73b764aaf..9ab73b764aaf 100644
--- a/kde-frameworks/kded/kded-5.79.0.ebuild
+++ b/kde-frameworks/kded/kded-5.80.0.ebuild
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 7f4a8a2d3acd..7409827d4d0a 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -2,7 +2,7 @@ AUX kdelibs4support-5.77.0-no-kdesignerplugin-1.patch 6784 BLAKE2B ca21bec7937ef
 AUX kdelibs4support-5.77.0-no-kdesignerplugin.patch 918 BLAKE2B fc84429d5ad857aa54664153a9221a6141389a169988f3fad018a8e5cab9b9d8ead4f9759388b7c3965c94e0fab5929c2576229ad4535e387279c6e7311dbbc7 SHA512 6033cdc41d0d15ca8c8a62923abe4729a471ebb37a7edd41d51d4a4cb8f46346b2940d8e582328c4872953a15040eabbfe20b6fa88a5505e9a0eb1c3e8b8b3b1
 AUX kdelibs4support-5.79.0-no-kdesignerplugin.patch 7385 BLAKE2B de4aee961626019e21483e96381e5dd3a78c829e74b34de2ea81d40bda122345d69203e77aa7e2f6349ee352313a9faf91167af6d1046c5588e95262ebe8553c SHA512 4b0505cfba528e16c56056d18f18522ab8a2233224ffeedfeb9062a1def8b85e7d5cb613aea4083f83f2d5979c48591c0b4c99417cd3bc945b7a6da74d475688
 DIST kdelibs4support-5.77.0.tar.xz 3546468 BLAKE2B c55686f09ddc6f06bd96f6a93906fd6e03b482b66c960644ca6a859f6f8cc851740c81098241063f692cbcb7458bcf36f4453d24380df35fc22cb5f7effea764 SHA512 4b7577d44c0062561d2d315905ee7789595e402213f5508677a3362d3371d40f3c0d2d216dbece712467470aa58128226b797cbc11e39cc4b54779c4bfbac9f4
-DIST kdelibs4support-5.79.0.tar.xz 3546664 BLAKE2B d8c100ff0aefe4d333a417c67435c339a892097fc7febd544363cd33a9c78502fb99251f5d365b6a043b1fdec8adb7663dee123a4abdb06567d74a6adaff22f6 SHA512 6bfbded486ce410080eab8fb8c086ca7682cccd8e7328a77950c1801765e9c1e8fdbfbb251b0a718497b46863c9aafe93a9274ca46b2b86bc276cc0ef277c20c
+DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
 EBUILD kdelibs4support-5.77.0.ebuild 2493 BLAKE2B 21619bda5e5518c0af8f60663376f2b8b2e0991f02d6bab57f17b5ff6f89f84d431fcc85947b6efa50bde462b8ebf9b117fcc708a85c2223a3f088c8d973df01 SHA512 0f0d08a75e35e843abe08ce2e1b21d5da8bf0f714c56a7e1cb6435fc8f2d6349fae09a8b7830f22ac602377b4cc5db62374eed75fddaf24266665b9028bab3a7
-EBUILD kdelibs4support-5.79.0.ebuild 2499 BLAKE2B 9263e50a472de0fc5b5b06b7d1e9ac7f9b547c49130b51757e7432d126ed06b40d662b5b21e5d76c19c1ba434fd9b8cef683b6785a537cdffe145dffe5768bb5 SHA512 7e2d877654ce36d3b93f092d009989b7126eab8033cffbff9051d04b6d931bbb0e5d8ba67b270bac5c9da0f0554b8d4f634b2925f07f31b053d4ece5dc261e7f
+EBUILD kdelibs4support-5.80.0.ebuild 2442 BLAKE2B de5c50fcfdc70262e1188c8d5303e0619203fbc57a6898bf3ccb0d3d3eb705cb711327b9ab4e714e1fe3ee4717659c4fd4e4be2c565941307feaa3fdebb9f6da SHA512 f3d5683b29585e3a12405b437a7855445e913d6885a836cbd69896e04ba63ae1a3edd021ae9754bb2c0f6d0bf9f2622ddf3b4199f2f38a402ea81bb8f7016a4f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.79.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.79.0.ebuild
deleted file mode 100644
index 20a43dea15b7..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.79.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="libressl X"
-
-RESTRICT+=" test"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-COMMON_DEPEND="
-	app-text/docbook-xml-dtd:4.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	>=kde-frameworks/kded-${PVCUT}:5
-	=kde-frameworks/kdoctools-${PVCUT}*:5
-	=kde-frameworks/kemoticons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kunitconversion-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	virtual/libintl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
new file mode 100644
index 000000000000..43e1d42d1e4b
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RESTRICT+=" test"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
+COMMON_DEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/openssl:0
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	>=kde-frameworks/kded-${PVCUT}:5
+	=kde-frameworks/kdoctools-${PVCUT}*:5
+	=kde-frameworks/kemoticons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kunitconversion-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	virtual/libintl
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kitemmodels-${PVCUT}*:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use handbook; then
+		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index b6720553802d..7c0496391280 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.77.0.tar.xz 51808 BLAKE2B 33b629775ee737862ffc6914b92040fc6478afbeb0fc22f82d8d80dcdf94d5e9377ab9bd2bfd9871b189467fd3c50966fa41704fab6afd085cdef9c53babc2cf SHA512 3d586bf40884623b4c969b91797dcf90567e07af7ad6d4ffc8899af7fe0d70574e4108cd96b7c009e0d3ce7cb4c1e901c2b33bdfc31b2beef60e23f0351e8be3
-DIST kdesu-5.79.0.tar.xz 52212 BLAKE2B b35736d61621676f20e7308a335b6edc44ce473b14a0565c66c2abc17ecd6ab6f7d8b636d2286a20c70d6cab4bb91cb38ad0f36834379182e54a2ed36053634f SHA512 f6f2e12a1aa904c5e8567e47a5aae038ee8237f87d3339a8d771b528d87ed8bbce1422e5a7217ce30aa79d5afa77b64cdd5bccaf8102479105342a313bc60f09
+DIST kdesu-5.80.0.tar.xz 52188 BLAKE2B 25369db6566eafa917b5eedd9e74f54aee294f6f366c44c59684acda14194703db5fdd0abbe251beff9815a428a41ab183a9f2a9d28589fbb40a731332d02707 SHA512 b5ccbb6827a18c2f8b370d64405825a4c533fac120e56a99a6d90bd01d563606ae625f2048e27fd19756d51175ecf163468349f7587540401abd5d002a7c8a6e
 EBUILD kdesu-5.77.0.ebuild 659 BLAKE2B 228857930114463ee93ab0d5a3d1ff704c5f67812f11a9903a0110392a15efcc405f9cc0d3f2d7c7e7c741feacd8feccf469b619630bfb2ad9ccd5269d9e54ec SHA512 f0570452a998fb6164315ae9f1ccac06af2bbc434ac2e38d6967e86090b3fce5c2715ddace47e799dcc5f694c1528b4dd7ece048136227b43f4b0c9d122b62ed
-EBUILD kdesu-5.79.0.ebuild 662 BLAKE2B 2eab4ef7a181a40dd672b6db7603608c4308acfcb317afd0ebe54954b38f589b59aee073265f914e52fa1dc0614de304d88b75e81e9188ff865e4f8578e38b0e SHA512 74effa213f71ca96300278a7589b06610cadb3533f2486aea1f342a9ac53b0db14e130e6afb49292edb977e7b0cc831be9b0814a7bf5cab63a293d0ae17a004c
+EBUILD kdesu-5.80.0.ebuild 662 BLAKE2B 2eab4ef7a181a40dd672b6db7603608c4308acfcb317afd0ebe54954b38f589b59aee073265f914e52fa1dc0614de304d88b75e81e9188ff865e4f8578e38b0e SHA512 74effa213f71ca96300278a7589b06610cadb3533f2486aea1f342a9ac53b0db14e130e6afb49292edb977e7b0cc831be9b0814a7bf5cab63a293d0ae17a004c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.79.0.ebuild b/kde-frameworks/kdesu/kdesu-5.80.0.ebuild
index f80367b7e219..f80367b7e219 100644
--- a/kde-frameworks/kdesu/kdesu-5.79.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.80.0.ebuild
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index f69426e397ff..597b668fd612 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,7 @@
 DIST kdnssd-5.77.0.tar.xz 57492 BLAKE2B a4017049a8ae7d4317b7366d2a49dba924e616cbec63079a23e05b3c2f12d75d27d31dbe847e3ddb94060dae9d246109cfa31e7597d95c88be0f6e33cc168961 SHA512 cc24ac9fb6947a7c7e1cd849216dadd9b580dfab204d1203e4bf6a2e3a70cb54591c115aa5fc6836f4b8d83f5eb56366f4f7ad2bea97718b774a46f2c5b6e50d
 DIST kdnssd-5.79.1.tar.xz 57880 BLAKE2B 979d62c477f28c877306d98897f55eb6829d6edeea1a9b681ab789c22ea27df3a5fa15e24dd6415052e995f708b0b58e9f5a65d2269672e3296070b5d547bc0e SHA512 4ac737ce2442fafa7d1bc2baab860892b547cd8eb67f73756ff8024d569b1a4a0608d5f28e15916a4264abac9cb94d01c9df83c4cedf1ef4fdc684b96cecfc26
+DIST kdnssd-5.80.0.tar.xz 57968 BLAKE2B 311270d202946c06ba505baa831141c841f7169f8622233e9004bc83aadfe8e5148681d8b05e8561b7ba42f3c3bb6ef90772a57191d9cb6eb40d861d73495862 SHA512 8f458a7a0e7c9fd7d7b55a79b5ecfa4484cb442564985e0c4a660b2d551d772bd177dbba7999f71a1401ab58b9ce4922090afadd31347a1282419f90a78a41d9
 EBUILD kdnssd-5.77.0.ebuild 644 BLAKE2B 9b97313a243571373bcb91d06c0f9111518bac0ae6d3650f78ae3f12a35fa22b7e22297ff4eb8a2a9c9efa796f9c9885b8ce06379794a1da87a8c7dc2e7d08ed SHA512 2c2541be0c3b9eaba2eab840c7bcb1291a46609600f7e02cfe3bc43e7a791fb066155fb6d1202a1e36437de84e7cbe003157f1d88e9f1ace967cd4cf94cb876c
 EBUILD kdnssd-5.79.1.ebuild 647 BLAKE2B ab47ce98b067f0ebda141c82bb89e999630d9519aaaa78da05d0b72d4e2e22527caa61ba8d24d3cdea70b0ae92d3b15d71c5d0d1631fc7312b8ab1cc4638d144 SHA512 fe89ec0c6d35a178631334ee753350c83b47e42efcca1801d33709b054f659ee419e9ab749812531b67312da8f329c93333129ecca41cc954e1eaa1d53be65fa
+EBUILD kdnssd-5.80.0.ebuild 647 BLAKE2B ab47ce98b067f0ebda141c82bb89e999630d9519aaaa78da05d0b72d4e2e22527caa61ba8d24d3cdea70b0ae92d3b15d71c5d0d1631fc7312b8ab1cc4638d144 SHA512 fe89ec0c6d35a178631334ee753350c83b47e42efcca1801d33709b054f659ee419e9ab749812531b67312da8f329c93333129ecca41cc954e1eaa1d53be65fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.80.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.80.0.ebuild
new file mode 100644
index 000000000000..57dc346bb8ab
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.80.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls zeroconf"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	zeroconf? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake_use_find_package zeroconf Avahi)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 2426257f3c60..4180bf431112 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.77.0.tar.xz 438744 BLAKE2B a421da40e069bf8e2c5be170850fb82d2f7381ec4e75dd128bc7c1d5e005015d4b23b367d945209dd11095faeae765dc9c5a69de40bd7fc267d590950fcc8fcc SHA512 de712640776b26ddf714920fe6d63bdd0c5aa15e162fd0d75fb8199528b26e5bf622ad56e20298e606707d1e0ee579d334c63f0d019c872a1ea35ac77735d205
-DIST kdoctools-5.79.0.tar.xz 438452 BLAKE2B d9fed48c4a0d05e2fdff24a24ba3b3eabd385fb8d80c1feb2ea3b119c1e07afaa3979dfbb87c1ffabf2d6ce862661f3a8109e391bf56757f879f7cfdf4c7fa28 SHA512 ef5710d8656d8db63b251f730d4b595f2dc708e200f36bacfdc8b62f98968fc886fb8ddf41d8fe4ed73d8e6bf56d05e1ea4f7f360be953b3a9a545b4be653056
+DIST kdoctools-5.80.0.tar.xz 438652 BLAKE2B bf470a436d279bd19e90ba5482be8a16dad2cfcedbe8a8e967cea38eeeabb1c36beda03f40cbf9967cba60021fd7d5915a44c1581e424179d57c869990e07103 SHA512 17448f08528af1537987f336b8a00249f631909bb7060d31639ec8937a4cd105d3d35c8872d37651d628ce55484d87dff188e365e290fa1321f869d0ef4f2ee7
 EBUILD kdoctools-5.77.0.ebuild 869 BLAKE2B 37d94fdc143f12080efaa1fc9ed40ea16c369658742329ff3181748f709c9349befd7124db939b25eb764a7443e1aadd71cbe191e0c01ab85ca30c82999ad8d6 SHA512 b85f8267a233075dd38066ba9939ea98279b33989e8e287b08fbf260023455f8adf260cf86ca50d55955f726f334d98e812fa2b2836a4db1a2b6977a5ffa5e7a
-EBUILD kdoctools-5.79.0.ebuild 872 BLAKE2B 28ee4d24bfc73f12b48055b459f179906ccb453f18437c9eab2634fe8bf3329657bfb1f0041d08a2b80320e3bf7c5f3cd9836213e687fedc1ebb09e52ee5b17d SHA512 16b61b4e362111d915c0ea91b280fd8ab5a7abee36aa6d002f12f4a692d2ef00a2ec4936ee19780f7da9b4028953c8b56e121d8f3b672b21f5174cf1b646cb18
+EBUILD kdoctools-5.80.0.ebuild 872 BLAKE2B 28ee4d24bfc73f12b48055b459f179906ccb453f18437c9eab2634fe8bf3329657bfb1f0041d08a2b80320e3bf7c5f3cd9836213e687fedc1ebb09e52ee5b17d SHA512 16b61b4e362111d915c0ea91b280fd8ab5a7abee36aa6d002f12f4a692d2ef00a2ec4936ee19780f7da9b4028953c8b56e121d8f3b672b21f5174cf1b646cb18
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.79.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.80.0.ebuild
index 3b3ac23b5f35..3b3ac23b5f35 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.79.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.80.0.ebuild
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index ebf7ed0cfb4f..c1b3db8d46c7 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.77.0.tar.xz 1697820 BLAKE2B 7e448a397c02fe07245082d97e3f86c56a58dd47689aabf43db16b80feadd7afe5ec93970da3705e10d2251aa89407b3c806fc66856d9f280697e1e9526ce80f SHA512 7e3b59c3505bd49c69761b2b27abfbb26f39dc5be6aa24cac197048363973ee1bfbd6d6c9e6ed4a7269b1a6f78b1356f2bc84eebb6b25d44372e666eeecf6b73
-DIST kemoticons-5.79.0.tar.xz 1697868 BLAKE2B e475277db32f6643d54c9d263c1b5c393d92e906969658e0421a1cff4064e2a243739cfbbcacace0494054bf83e88960c2b1c06c2741fa9bb84491f26d14ebf1 SHA512 9aea62a3d1adcbef133130969897f8192848922a348f5d940ef1cf74141b6fca79903b90266616a25857a5c1b153e627f9de0219c26650e990f008a912b606ea
+DIST kemoticons-5.80.0.tar.xz 1697816 BLAKE2B 744e890baf4ce5339ca29a932e23ba7b8933fd626c8e7dc4a14a703f8e83e9db64f5db8e26aefadc2eb5217cc6ae4e429be853b49b0e087df1a9e1ed6f941696 SHA512 1fe07740d3869748c3fa384fbfe480b6ecdbf9ca5e9c089b6fd11b14cea854eec677f0aece9f15fc4e96bc4b90e7a7bb9fa5b80bf938c009ef2b7f0267d03b37
 EBUILD kemoticons-5.77.0.ebuild 665 BLAKE2B 3a8526d4db0d9c4a57298eb38edf8f11c927bd6767c378fe709f9a5dfece71d1a62ee3d338dbaf065994b172dfbce3107fbff41d5b2dbb91433e2931fcbb1cf1 SHA512 9f2a49a952cab3c3c2a9428d7686d5b161233001a4281b5f75ef89b7bcf57eb9dfd29d0490c125800d93ce7082a2e27ffa34f241d20e6777b1553b51b7cd8689
-EBUILD kemoticons-5.79.0.ebuild 668 BLAKE2B d567b4b7cf7e860243cc1cf6e19532167e720f7a1927fa9492651aaa04f06e3c81cae659c6e8e5eab8a630e2ce2f09732d35120b719d9de1d8f1999e88a0eb98 SHA512 1eaa0939e21d7be266c8f4a06985d119474a5939e8201ce18d52e80fcb1409af3b5af9a5f462dd8a6148f7c45fe02120b8212931e07692703009b012dfe21204
+EBUILD kemoticons-5.80.0.ebuild 668 BLAKE2B d567b4b7cf7e860243cc1cf6e19532167e720f7a1927fa9492651aaa04f06e3c81cae659c6e8e5eab8a630e2ce2f09732d35120b719d9de1d8f1999e88a0eb98 SHA512 1eaa0939e21d7be266c8f4a06985d119474a5939e8201ce18d52e80fcb1409af3b5af9a5f462dd8a6148f7c45fe02120b8212931e07692703009b012dfe21204
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.79.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.80.0.ebuild
index 6c6f658b72cf..6c6f658b72cf 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.79.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.80.0.ebuild
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 4419ac3d93f7..db73a9ac9a3e 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.77.0.tar.xz 424032 BLAKE2B 02f59b3e9e45d0aa80b1287e0f43c824cc673b316ae7ad302bcd9d710057ab22b2124f084b7f2af1cdc2c8a432574ae18ac6e307a79617308f7d8a1388926e86 SHA512 20cd237fcb630dbda5994e28f678593b512c686e3dff937a84c228c29c26de9a8ae5f23c9a370eeafe5c137f49f832a2467d8fc7466317e38d13b5a85ec4aeb3
-DIST kfilemetadata-5.79.0.tar.xz 425168 BLAKE2B 2c7518021108a669570535b756ce7895155836bb3399ef0180d7bdd28210fd63eade2762206ae085a9cfb6f1edb283e26270f16fe4bc0fef09134142d2467f80 SHA512 dc0d031a6276e779a3c478a4f6e13f5b9af0ba47db666728b85d601883682335e3348365048fbbf2f11bfd541f3d6ca42aafb683baf1f69c2f01de5b286e3049
+DIST kfilemetadata-5.80.0.tar.xz 425304 BLAKE2B ac759d5643243639aacd2be0aa3ef4f35c3e1d6f4ae993a4868e3369445a8a3a597e6266f8a75ae83c489261bae26a2dc8eec622595fd197052cebf3e2896b49 SHA512 968bdc8e367d257c8352f7154721bea3c2102aac7f2e238384f44fcb4922aa40035352067a273f0473f8b119b813a771f04e7f494f6f955d2d988c202dcc9ae9
 EBUILD kfilemetadata-5.77.0.ebuild 1602 BLAKE2B dfaf58bf23cd5a79befeb76be693f40769eeb9e2a480ac85b2c15dc1605bbedae5461654152774af03ed19b732f9dcc7598d60cb15adbecdb9abadae3f2bd3a5 SHA512 fa1a482a754a96b12aea0c421a27c0bc2fa3f21fabfd144b967af48b276b3135b43bc0606bf0e23695ca8de2f1068599649293800d3975efddd0dd3eb2e9a880
-EBUILD kfilemetadata-5.79.0.ebuild 1605 BLAKE2B f193dd13d8166a0f330fc115da7f092f38ba368cc70c8a237a6f71156f6710752b28b8a0eabb40e9fe2487780a45e1e4bc72cbd3fbcf2fdce11b460bcd74f597 SHA512 d4b437872322f2a53304567769df0e24f2e6bf8f30c6a99b5b28e566c4a921bf70968ef83a41a20555d57369da251a522c27983701a41b2d21a7e64aa07ff18e
+EBUILD kfilemetadata-5.80.0.ebuild 1605 BLAKE2B f193dd13d8166a0f330fc115da7f092f38ba368cc70c8a237a6f71156f6710752b28b8a0eabb40e9fe2487780a45e1e4bc72cbd3fbcf2fdce11b460bcd74f597 SHA512 d4b437872322f2a53304567769df0e24f2e6bf8f30c6a99b5b28e566c4a921bf70968ef83a41a20555d57369da251a522c27983701a41b2d21a7e64aa07ff18e
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.79.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.80.0.ebuild
index 7351af06e572..7351af06e572 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.79.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.80.0.ebuild
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 470dd6bb34df..1ce0136d8ac5 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
 DIST kglobalaccel-5.77.0.tar.xz 87632 BLAKE2B 51136f6e380a913b6793ebc8e3483a42713778d9dfd3f3ba14d09496de75b2ee3dc2426f12d386590e0b00e6d61c00ab6c27eff656d5fc20a576d0c17bc9dbe2 SHA512 e35c4f5ce44f023292b154073642bcf17dd8b952caff6c5cd0368d947ccc0b53548bd149147e37a4724d78f08fd14f3315e1523dfe0b5279b50691cee0ff249c
-DIST kglobalaccel-5.79.0.tar.xz 87796 BLAKE2B 3d6bc83dda8ff877aa2344f51c1e7e88eac306fe39d46a2bfd50621814e1aea3e089a5d9ef3496c953d18c9b8f5f3adcbaf76cf8fbfb1008eeaf492b31af342d SHA512 17156d5c0afbfb7283d1ca9de72fe2aa4f2a0e8a1e11aabbe914afa2d0ba116d19a2a173e79e24fdd56d61b944108eca8954e054093c08b940f6c23c690183dc
+DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
 EBUILD kglobalaccel-5.77.0.ebuild 765 BLAKE2B d63d29ab93229dadc2c004ea0f0a2b848f68ed42719f94c44dc328540df8d080d1dd209e88957a559c1650e4e57b7a03c37183e9279d4b3e35b0f65c94305afb SHA512 57a62cc6dd8d08820fed3c28149d4f5fb9005576f01d9be80aacfa65b016659e999647fb29d9f7d0a3ac4b5410b716b912b87d822cbf828a750a50a336ec1dc7
-EBUILD kglobalaccel-5.79.0.ebuild 768 BLAKE2B 696eccce98b84e6f677eec4cbc6f582ac04c5e211bfefa16e49ed4d915a86699abdc1db8e4154139e763faad60544b4e0f54fe7ed2b4d7a4a36b8f7fa7db6d20 SHA512 71116289029140ea86e6537116a50a772ef82592d6dbf3a95c7fd7a06cf6375136132c295248938635b3e26f93094588775bb6fe43786b1fb53442e3e3a75caa
+EBUILD kglobalaccel-5.80.0.ebuild 768 BLAKE2B 696eccce98b84e6f677eec4cbc6f582ac04c5e211bfefa16e49ed4d915a86699abdc1db8e4154139e763faad60544b4e0f54fe7ed2b4d7a4a36b8f7fa7db6d20 SHA512 71116289029140ea86e6537116a50a772ef82592d6dbf3a95c7fd7a06cf6375136132c295248938635b3e26f93094588775bb6fe43786b1fb53442e3e3a75caa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.79.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0.ebuild
index 6473474b63b6..6473474b63b6 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.79.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0.ebuild
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index c371e3094025..91ace80255a4 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.77.0.tar.xz 58936 BLAKE2B 5a090d5b061edab901d450b3c02a0aa1cb40cb0fad3a48677d568d998a45bc5fefde7ae30fc4a5642abc1585958d41d8bf61f10eeb05533f6f2af42e7d2a3dae SHA512 4cea82b31b9a1bb0abeb9e0e522f6cdd2e8a14b946a299d59e792f74fa0daee5c5a6124af0b8bf03ff647123803000115d2f13379eaddac820575f4b80848311
-DIST kguiaddons-5.79.0.tar.xz 58828 BLAKE2B c58a4233f956e15321ddcd86295b30b5a4de16d6cccd3269262a7a188fc62e88672d62ec42340f363f324595bf440845c3a05606301df3b325f986ed87d3052c SHA512 cfafbfae6094b1b4a02db4f4786720d8979c186046bb9d2a18b02926e1f536617426b2eeff4719f191cf2098a99ff9cfbce6068a469d813188e300f041a0cc01
+DIST kguiaddons-5.80.0.tar.xz 58832 BLAKE2B d22aa03b84a199d9eb6f05aece22916aa0a020b6c98cc9862cfe57e4ce2dd87abc39b3e92d32f55d6b654e07083ed5186e8f3835a2566de27e52f6253cb5318b SHA512 97e4311afcdc5af6ea8dcdcce40d4c0a5c2e4a767556a7e2fac671d7691472873f526539f3c0c754da6d04987c0e180e1c0461ab747c3f0e486a5f613fa11d7b
 EBUILD kguiaddons-5.77.0.ebuild 706 BLAKE2B 670738fa2d229258b5b38d8a9dcf052616a5fd2375d0efa32d82e7594a021dc7090248796112d6071f7406a1179203a897f33bee1fa7024ff71faf532cc0f8e7 SHA512 e8ee13a03562ca175fc15f042cf0f6206ef1b355c2e62685b4f2ec36342d47cf61d3311dc717964c60ba5cfbe1a3a956d8f30044d8ee41423b58a0c895fc96a9
-EBUILD kguiaddons-5.79.0.ebuild 709 BLAKE2B 1d8e9a4304b6711b15e4688e3abfef94722eae31feaf5c691b6bf84f910c0927ee23dd576b34d5db799e2990315c7bb008ae02a57d96db29a0d457f311ed9d1d SHA512 a458c7ed4153a1ea03ef8705239d466a54db6b3115229eafb2456466c5d310243f34085e81bb525724fb046ec8babd817d52bb2bb2886188bc6684c1eb8c3cee
+EBUILD kguiaddons-5.80.0.ebuild 719 BLAKE2B 4d842123e7322a20f309f0a79579e4c8dd30c0527751e5185285aafe8f2c7b2beb563d3741a9ba4857b4f1a7349f01101c45f0c47c78bcc931d023b2aca13ab4 SHA512 b50da9d4d8b9c475f5daf1cc109f14b0fc48f6b0e810856943a4e2ab0f2722eaf3f152a57a0c61e5b5e800b43a40d5fde19658e13a8af95cf07befc8e255f16c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.79.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.79.0.ebuild
deleted file mode 100644
index e0335ed70b9d..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.79.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.80.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.80.0.ebuild
new file mode 100644
index 000000000000..fbdfcada5f5d
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.80.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="wayland"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5[wayland?]
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index ad3f41683957..3498888f5dfa 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.77.0.tar.xz 224964 BLAKE2B b33cb4d039173e37bb20a133372f8320bdef1ea6af6587e3a88fb7e86ae48ab2daff484ad6a60f66dd0bf9807040fc2afbff83934e38a7833bc8e79ebc51cee2 SHA512 d6c3be0b51fe098193b5c93ac5f905bab28256952b9a960e3f0c46f689f4b700cd636f1e6afd1f52f2268db2fff8f1eee84d168a6871f00e080c167b5e03f4f5
-DIST kholidays-5.79.0.tar.xz 225828 BLAKE2B 40e176a85038f0203501eab74ed2bfaa437b979bd400eb6e622c114fb10be56e40cc7bbf4287ae43452e541c6724c7a58e01ce789e896463a8121ade0f83b8b9 SHA512 6b30d8a421a545dca54488d5a7ba01d31b703c0dca09a29778cc1ab2ea11c3094fd868dcc6b6396f4de7f2a16c1560ab73503aa9e25e67f94901dcdb3ef16ac1
+DIST kholidays-5.80.0.tar.xz 225916 BLAKE2B 8f839f9ac529325707ae35090a593ccca524e37ae21067a59e30f00593f8ece89293de7e67b0e70a14ecee37fb05b444d21782ac7d298bb7096cfd17e4686622 SHA512 aa7665fe4d64255cb06835f7867e70978bd14ceed7c0ecd21375e889584eb5794d85af08d4756b25ca9cd8c9a7f4ab50c20ecdcbfc8200290796bc8248d7cdc2
 EBUILD kholidays-5.77.0.ebuild 649 BLAKE2B 81adfe819f24723043a590350c05c93358dd18a2966a5ff42601b2745ab24a1de9478725928e75b2e389755dc949b1a90917d6d0f273129c6d2c8d4b6c70bf61 SHA512 6bf8903909c29026b33dca0d73e4e5ffdd8f13d9068f2f9711c719bbd34792358e1ab18371258112fc668223a162d55f050c3760a6e5d33fbe7f5a9fc6c88dc6
-EBUILD kholidays-5.79.0.ebuild 652 BLAKE2B 79235f2845ccf108cee0a6c6a3353ad41efb349b6741de44f947a03393e0c6fa8ccf562aa0bc7f0b99bcf9417b954f91ed36fd46e51f540471d2185328ec5b6b SHA512 7c79dc99c7ef1c97884773f0b8a427f2610d47f3edb808a173f46ca6bf4297fcf108251292e24f74e02746a944762e73611e57b4d9de52eab8e5ea7ceaf3aa67
+EBUILD kholidays-5.80.0.ebuild 652 BLAKE2B 79235f2845ccf108cee0a6c6a3353ad41efb349b6741de44f947a03393e0c6fa8ccf562aa0bc7f0b99bcf9417b954f91ed36fd46e51f540471d2185328ec5b6b SHA512 7c79dc99c7ef1c97884773f0b8a427f2610d47f3edb808a173f46ca6bf4297fcf108251292e24f74e02746a944762e73611e57b4d9de52eab8e5ea7ceaf3aa67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.79.0.ebuild b/kde-frameworks/kholidays/kholidays-5.80.0.ebuild
index fb3d3ebf8123..fb3d3ebf8123 100644
--- a/kde-frameworks/kholidays/kholidays-5.79.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.80.0.ebuild
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 2c6d424248db..4b59de7a2b1b 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.77.0.tar.xz 2089548 BLAKE2B 6c9487884da7d23bcc4794f5a023b575da75950179d4a52cbded94ce70c47793adb0dba6d2dafc2b529faa3d32eed66d86833d8341f2d85478a1087ae307aae2 SHA512 9a38133c4dc8aa49199c78ae221f5b678fd1294781a5f37918d6ca600201d718d22ff193f3ba9bb29b298f4f488d57fcadd6e51ad40e943b3ad5b3360e120939
-DIST khtml-5.79.0.tar.xz 2089572 BLAKE2B a64e02ff526c8dd79aa72f221f001bdd3469f622be27be84ef37a8ec0ece0f63ab58f0785e9a773c05daa0bb37f9734f643c6de5ed2126b45473f5547ac95558 SHA512 3e77964bd66aee361712e06e09d3cbf92fea9603da304a064e6974a4ce00504367b3455cc435a942737724e8b26a4b0dc07de4d9da656ac9ad57049062b7ccaf
+DIST khtml-5.80.0.tar.xz 2089848 BLAKE2B 7d049fa81cd8c3a155d8a8f8a18926e857e583867a6258bb3f46d75ffe4c2894b6291988ae95afac93d2a4bc3e7469a687db7633daba7652b3a9b397417dc5c6 SHA512 3d3881376e03cc21306f13178e6aad3458460f87b61747eb2abb2d94a58b28fd5c52bc10b33a8bcf0c2ad02d62ea464c4c88ed0ffeb0ecb7df59b77c8fd2aba3
 EBUILD khtml-5.77.0.ebuild 1810 BLAKE2B 63c25478e985bc5f9a244fde713a5bdf61c15876eee83bd048621ba38798d2b293bedd93fc9057336bd5c6b92a6c709a3d87f23dfb4369e09ed91cf296dc5422 SHA512 8337ea99484426fbb5c641deb92560e5e8987ea27e44e915505756a345eca8eb95cde69559a75859ef5198ff1513e0a8d0bb7cec73edcf2afc3e810af987d198
-EBUILD khtml-5.79.0.ebuild 1813 BLAKE2B 0ae56f3d62a86ba1754aad557cfe4b810e0a254f62da9cb042e90ec75ff310c8d439de8e881e838b568f61e8772b644c5c0fc2f4c2344b28767c81e68dd7d850 SHA512 32bd984607d42521a51bf98349d5162deee8946ea34bb9d8ed05d665e0910823bd87824eb2d27b1cad347c111dd914c6ced1d51c321ede44000443ccdf01c385
+EBUILD khtml-5.80.0.ebuild 1756 BLAKE2B 26e5cd361a48c15782ce4f84ca380d27b3bc9dd4bc7570bf5543a4d735bd8be4c52442455bbb1a03cbba26403d5cefc6c1576926ccddee99007f3525b0e96bde SHA512 75e3adbb1f9be48803ee543007da3d4ab9cb5f02e6d3a9dc8ceac98cca3ad2c1b86a7ed3d36acef527d835089738c2a347a26ef8a55622eb5a9b9616258c7b77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.79.0.ebuild b/kde-frameworks/khtml/khtml-5.79.0.ebuild
deleted file mode 100644
index 5a233aba9a24..000000000000
--- a/kde-frameworks/khtml/khtml-5.79.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.80.0.ebuild b/kde-frameworks/khtml/khtml-5.80.0.ebuild
new file mode 100644
index 000000000000..59dac9b04cbd
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.80.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+"
+RDEPEND="
+	dev-libs/openssl:0
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	virtual/jpeg:0
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 9e000d7e32b0..10805038c6c4 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.77.0.tar.xz 590200 BLAKE2B e3ac6cd3657555ff6cd90359f825b140110373dc18e91fab000ca471fec440386bc37a8eb23b2fd1bb08568c7fc9c73071d6eff96deaca80ec9f60cd5e5413e1 SHA512 fc6c97b21f2b5ccf26fdead1a9dd9d9faf13d79b1ab6740d29e96d6dd3bd3b312890cb60df0f0120db0699e35445011bf3632e73efac84e4fab4572d7c8b8a57
-DIST ki18n-5.79.0.tar.xz 590152 BLAKE2B 7b2596cc2f020fdeea179ed0ecf46474b2f14f3d6bed65272f8e6af42063912674386bc79c3e88677de1cb5f2f00adb734b3a1511ed908387f8fcf39eb41c6c5 SHA512 11caa82ea4bcce074a024595ac5cbd739d368e5e5a3c46d1aa6ab54209a3a70bf3ae795487e8164e2f3c3abb52fea54a709c078899500e59228ba9070bab622e
+DIST ki18n-5.80.0.tar.xz 591016 BLAKE2B 9b116740c592c37c2f50e26e8912fd046c0909524e6ed38a754c5b4e689feb9a7796aad6d9f1949d54a98a0f4ffcff2ad64a4f60d2fee7b2203c42f6a69b5a3c SHA512 0ba5b71c40f98c77792d73fd15a97e59cfb3d7f33da5d49a48621dbeed36a893c914b61e179c6f457ac552a91ebead55f59d70266ed02e6cac270e9936cd2494
 EBUILD ki18n-5.77.0.ebuild 830 BLAKE2B 28a4ac47ae897ea9830d34013a54a48f5ef423270cabf6bb352ca2b62a3ab4ee1e1be30a81fc5248803cf6d06b1f6a0aa3db7960f1b2c950a4e06385c922e0da SHA512 ee0077c3e7100dc0fd49dc35dc6fb9f063873757bb09c168021474cbf94f9850918be8beb6275b3dfa46f1807d82bc147907ccb51e4f45b0f0c9f4bbe365845b
-EBUILD ki18n-5.79.0.ebuild 833 BLAKE2B af99e6ebb980ea3aeaf66966e6aced74421700361860e10d935ec69fef77efd3b9b3d07e518aab77d234e7238bcbf20ce5495b568eabfb3cb269b60ac89d4b16 SHA512 46571a143b7fd59924f05bf03876c2ac97c5f62c1477f90a2e3a290a5b9f877e02ad4fb3842c3eef1127edf2f1f893bad9df14f6e0f5e9b71daed9de61de7294
+EBUILD ki18n-5.80.0.ebuild 833 BLAKE2B af99e6ebb980ea3aeaf66966e6aced74421700361860e10d935ec69fef77efd3b9b3d07e518aab77d234e7238bcbf20ce5495b568eabfb3cb269b60ac89d4b16 SHA512 46571a143b7fd59924f05bf03876c2ac97c5f62c1477f90a2e3a290a5b9f877e02ad4fb3842c3eef1127edf2f1f893bad9df14f6e0f5e9b71daed9de61de7294
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.79.0.ebuild b/kde-frameworks/ki18n/ki18n-5.80.0.ebuild
index eb63da6f4581..eb63da6f4581 100644
--- a/kde-frameworks/ki18n/ki18n-5.79.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.80.0.ebuild
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 7cf4b8897201..91e96fd0800b 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.77.0.tar.xz 222300 BLAKE2B c84cd458680df4a34b073b28feb3b5aa39fbe6646954f92876e3bf5d2dd5f614dcc277ebd737626164b43189a230ff3f57a92739cc8c301d27325be457a7a5b6 SHA512 ed1069ea2edde3bd3f6a42059eab9f0d0cb734f3bc6a8989c9302ffe512e83100112a9e4c820164c1a53f8ba5489a0509010e5346601347f32fe384be16fc2c9
-DIST kiconthemes-5.79.0.tar.xz 222332 BLAKE2B 8732449b3e1d0e05f2fea3a15e4baaa70f5377124bb7abda89005dc62fc8a3bd3c753616eabbca17b97cad0589351751bc59c8b576079e4347508672e13ca693 SHA512 f2b3520aa580cac8f1908616ea7633232454bf67b2449c43cd90230dfb1b806ca6c450e2e863f11cde03d38bdbe03e0cb438bd8745c571537436be3edc524fc9
+DIST kiconthemes-5.80.0.tar.xz 222692 BLAKE2B 6728b4f32298ee256059fc52df0581dad434bca292c5cbdc50099a0b7d1671a9409722592cd55bcc2a1fef91412fce729a8dcf1b931db04f7ab0c10a3867b03a SHA512 bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8
 EBUILD kiconthemes-5.77.0.ebuild 799 BLAKE2B b2e5c66b05d7decdfc41b47a26bc1b672de6e0bda5f1d981149f652dd107a320d4f58c2f984737812ea6efba6828739f2adb1abf4004e139e9e961fa05357191 SHA512 f804b412a2395e0cdf66ad43196396ecfb142a9772ad343ba4f051f3312047c72898f3a634d37a1e4357ade0a7ef093994c816697042f0ef0f498744425dea8b
-EBUILD kiconthemes-5.79.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498
+EBUILD kiconthemes-5.80.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.79.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild
index c189858f25fa..c189858f25fa 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.79.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index e178c83da280..9a9855ac2469 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.77.0.tar.xz 26036 BLAKE2B 156b145691d51bd9e5e695ce00df04282b9484fdd86a37669962205b1471db7f81ea4d4508b822cb3649cddf51045f4239cf46c6c50b4796bc73f60f8af31684 SHA512 b95a08cd568e8ba985cbb8877ebffbfbbfd30efb2111bfda85404e683a7f9d6f60a35687806d04ceb7e19512de9367b6d0a87488dcf84187dadb8dc920d8aa70
-DIST kidletime-5.79.0.tar.xz 26048 BLAKE2B bc8738a9ee007f6f1efb90e7bb3de35de853b02bf4c0d1a8d23a71ce938250f715cb1f095cc170062ffedda6fe81b38da792fc9a421d105e37bd16c39673c724 SHA512 f06c670382d89eb01ddb739a0c821af2d189b02b332dba71f54289a0bb99ec9b45efdf7d8e470d0f04f12a5d60eb8578fb7b674213fb4d5e098a6a63255c3467
+DIST kidletime-5.80.0.tar.xz 26152 BLAKE2B 486250ac2b6c7582eb454b5ac402f3e8df114beae1b7b3d63d4541b68561693745881046add16d8bfa3fa6c7161b3e1b701508a0e89e1f509fd41bcff60ae19d SHA512 0725747f3012d73ac1b0196a31723393b77b3655bd214ee96cb6e350a81c9c68c418deb3632c159eb29c06b2a0ecf4a7c3f172975637d503f9f7dc576423615f
 EBUILD kidletime-5.77.0.ebuild 886 BLAKE2B aabef4dda8c2b5913ee279f986617296b082c94115921e2b0a510e47a123e6e6adad5902dd3ad4d3da637412767eb5c8bab0dc21b79d21b35af7951ab4cc529b SHA512 d6da0a2ddfdeed4eb5c906cbde9a7575cfe68c055ee8b4cd5ca7bd3a8e8ea2afebe32191ad952141979f6fadce8f2f2c01b985f7e52db4af0c30ee1f6024cf67
-EBUILD kidletime-5.79.0.ebuild 889 BLAKE2B 480fa1c624c075127837f0287aca6b7f72d61849b205f79f81ee0ce665288cf8f267ad7db1a92e2ee708c3117ec191dfc8b8346b510f3ca56af76934f581f206 SHA512 a08ca24bf0af45d9f57d89bd26aa2641ec32f5d350ae92f988afb092d74cad17ec8d079c50801fc65f09af058e5184333c7590975f0abfb88e349f0a213839b3
+EBUILD kidletime-5.80.0.ebuild 889 BLAKE2B 480fa1c624c075127837f0287aca6b7f72d61849b205f79f81ee0ce665288cf8f267ad7db1a92e2ee708c3117ec191dfc8b8346b510f3ca56af76934f581f206 SHA512 a08ca24bf0af45d9f57d89bd26aa2641ec32f5d350ae92f988afb092d74cad17ec8d079c50801fc65f09af058e5184333c7590975f0abfb88e349f0a213839b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.79.0.ebuild b/kde-frameworks/kidletime/kidletime-5.80.0.ebuild
index 725d78a709f2..725d78a709f2 100644
--- a/kde-frameworks/kidletime/kidletime-5.79.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.80.0.ebuild
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 5d321a16d065..84c2b444c71d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.77.0.tar.xz 548968 BLAKE2B 29c0f5182a1cc2148f77c5ca2b8a28523d7c3c725cb2666e17bdb3efb4c815a08d3431605083dfa1d4711d584fd933e043cf647bc7046b038f21f87d6afbe4b3 SHA512 dfb6ffabe3b61652a9a59bb063c5f7c0fc0286bae6f66c34f5b20f5d984925d683190c806e1ead0b8fcae991a2830c6bbece679e5abfae5189af0d08f1cf8705
-DIST kimageformats-5.79.0.tar.xz 565640 BLAKE2B 87afb1391de69481ab9aa33719a799198dc1e7f31675d93becaa5ef84c09dcce76e9b0a4898308ad011e95ae6379e7f7b7aec2f8948f8927e428e9a45f61d0c6 SHA512 1cc46cacdcf5a61915406da5725fb77cb6a7e3d3b8ba9f7ffbe8ee59eebfb90ca1dc8f7ab1b5d06023b60b62ef739cbb6073ba8ba3976d5d4ada29d17ff48a02
+DIST kimageformats-5.80.0.tar.xz 590368 BLAKE2B 18e9783bf8ed1c6171efda273cc0d05d7b7a60a38933a7c003d4155f36a13eb1ed53ec3b8923a9560c597545940108542aa13ec7d5fc13b02c6088a837097215 SHA512 07669deb80af6ed3055f34ca5ef82583deeafde4a7d2591dd479fa10db48e39007e82cf70645363b742c7f90c73d6d3f5cfcfed7e5cd80ca8856e4d0aa9e9d39
 EBUILD kimageformats-5.77.0.ebuild 769 BLAKE2B c64e91fb001934fdb7a928d04631c2dedd97793dd5bc497b5bf5703de6e271b16513906c5af1cb5bd2f25e79a61426bfaf24444f54979d6a5807866596898014 SHA512 8684a14674194a3db8c3ce177f8ce761f4ce2042176babfdc1dc27c221d7b123dd4ff7ffe0937506018a0539bc07aef53473203f303cfd33b390a4e39ef3b0be
-EBUILD kimageformats-5.79.0.ebuild 856 BLAKE2B 45c2965b384ad063cc5f7eb8f230979d77e78a30861a26fde2d96553cfe48029aecf7b976d5c101237c1a461e8dc9cfe5a6104235dee811d03ea61ffb67a4448 SHA512 83293c11360eb63eaea79e648fe0c3645f638ef88b7b8f2da5eb3b6d37c00038e1fa5ec352287b425d172f309b5286d73e52fc4efc985d429ebf3982b93b6859
-MISC metadata.xml 389 BLAKE2B 1608d53acb5699c47adce21f2a808b851354592b3169cf622f8bf6d9012d9036a59175288a602f08cf862c1532eaaf290cd6a018473214b9730ecd010e8da704 SHA512 522cc4b6c7877e9fb9565d23e590c2cedaf1a1a3be6cb9ca830613ffaf5f048ac38c6d5ad784d8599fbf032141c09fefe121e83addbaecdb65d5eaf640440535
+EBUILD kimageformats-5.80.0.ebuild 938 BLAKE2B 7df746cbb85e119c1128a6a967328c055323cdbd616c87775d36298099f38e1eda8fce8f734c350f7fb92153258539b6e801889d99d05d766ed8bcd90c77594f SHA512 7e8ec30bc0688fc8db618dcb6cf7247628b91718cbc28be7e8679f16e1fcbb090b421c77e48d9843b72301e14c10d32b9550d2976ce22194533dcff660574ff1
+MISC metadata.xml 445 BLAKE2B 9e064019f9686ca2c961e427717c51f741a60cf1d470fa582ce9f1b9fb10146c2e4a5491b6c57de0b23d892ac8a2b0799a1afc5b9a5230d6b1722f3c4b41bd9a SHA512 18cd0bceb33980ba86628488b78b2dfab4a55f2bb05b2b7108b39339b4d9b144c2c5420cef06ec10df245cc71987b178ef72eedf32ef6fbb19013d0dbc341203
diff --git a/kde-frameworks/kimageformats/kimageformats-5.79.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.79.0.ebuild
deleted file mode 100644
index 77619b2a6cf2..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.79.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-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 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 )
-	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)
-		$(cmake_use_find_package openexr OpenEXR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.80.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.80.0.ebuild
new file mode 100644
index 000000000000..1e0b558caa85
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.80.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="avif eps heif openexr"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	avif? ( >=media-libs/libavif-0.8.2 )
+	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+	heif? ( >=media-libs/libheif-1.10.0:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package avif libavif)
+		$(cmake_use_find_package eps Qt5PrintSupport)
+		-DKIMAGEFORMATS_HEIF=$(usex heif)
+		$(cmake_use_find_package openexr OpenEXR)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml
index c44e1a5290b5..4d43b5889861 100644
--- a/kde-frameworks/kimageformats/metadata.xml
+++ b/kde-frameworks/kimageformats/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="avif">Support the AVIF image file format</flag>
 		<flag name="eps">Support the EPS graphics file format</flag>
+		<flag name="heif">Support for HEIF/HEIC images</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 815a81bcddc1..a34d018886b8 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.77.0.tar.xz 121492 BLAKE2B 40c702effaab6edc1685b266fe76eb064e2f2e13e8d505dc51ef99e4b412cd9ddce470cf252dca435eb09d86b6500dd4d49b983a109b204b8fd18d305b0d7251 SHA512 5ff56d0115d2b14cf857ca62d1e0db784c6c187439e0c487009681d7beb7232e897ffa9ad095330697b8c0df881795d16f13680eed4455ffc6b0c7d36bb4e39c
-DIST kinit-5.79.0.tar.xz 121484 BLAKE2B aa41147ec99b2900e16f6c106e81344b14f35539a50d5027904facae5d61360e6bbc91e937cdb111a9c340b4a4f6c9b2c6fb72a3f0b22dabc80761a51f075b39 SHA512 050eab93a8d029f96da6495548cf482dbeb0c704211337b6c0d0b0d68c7b8614151aed671d59e26924b99da755b4daa22819f84de0b70ec02cae9500b50ef1d2
+DIST kinit-5.80.0.tar.xz 121088 BLAKE2B 5a130f604ff55301672ad35c205ea044d379648b46c03e4440b7756996df327217065af0fdfc85bee23e2b4d9f75f3fd4c3e08aa49459662cdd09b1d7c2a538f SHA512 27f1bd4ef231a70acb8e32ff1cb9133c522fbcf960890cfbcd0c35ff41978a320c48236ca755b1c603f091e98596486fb37748f4109697b58315aabe1572733c
 EBUILD kinit-5.77.0.ebuild 1134 BLAKE2B 66bf5cc5499127133cd0f0c81df194c567bfb18ca1258d2f30311bfe946380e789f86d9a69ad042f021fe777228cd1d83b82b72455fadadbcb266b6da3b84f74 SHA512 cd33e6fa236acb51cb446b0bb718bbc5da7be7fe396da10dd870f26323df7f86f16abe6c6e6226c1eed5d7df58eefca12c5e5c41e5831053cd807d9c006e5f9d
-EBUILD kinit-5.79.0.ebuild 1137 BLAKE2B 4c84b12d5d6366bcd58fb0479f93b944e606a802c38f2e61c23bc68752f1d7502412b908e00cf87542561c5f73142980c87ffe357b74f3a6af150c12a8821059 SHA512 dbadd05fc5380e874e19583c9192696882edb3066ee0b374813fe2ecb104908743a7b4fb55f83d14c702c1aea317f04aaa36ffe77348a0fa4813089b6983deb9
+EBUILD kinit-5.80.0.ebuild 1137 BLAKE2B 4c84b12d5d6366bcd58fb0479f93b944e606a802c38f2e61c23bc68752f1d7502412b908e00cf87542561c5f73142980c87ffe357b74f3a6af150c12a8821059 SHA512 dbadd05fc5380e874e19583c9192696882edb3066ee0b374813fe2ecb104908743a7b4fb55f83d14c702c1aea317f04aaa36ffe77348a0fa4813089b6983deb9
 MISC metadata.xml 358 BLAKE2B 2871358d649b4403a258b3941a6e20f5c464b418ffc8becdba2fbd9c7602e5c91942cd80d71c44984b03df7854b8ef2bca177f45686100b485dc0e05da143c3f SHA512 922ead94840c490bf035c540176e321228f5d047067996f01108e443a8bcaa34d9cdce9270573a2cf0eab6d9cf32ee57e91dbd4b220774e810dc3f4c4c85d891
diff --git a/kde-frameworks/kinit/kinit-5.79.0.ebuild b/kde-frameworks/kinit/kinit-5.80.0.ebuild
index fa069ce12404..fa069ce12404 100644
--- a/kde-frameworks/kinit/kinit-5.79.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.80.0.ebuild
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 57f6bbc5b03c..06906d4f6840 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,7 +3,7 @@ AUX kio-5.77.0-fix-default-codec-not-usascii-1.patch 1237 BLAKE2B 8244d30803b2d6
 AUX kio-5.77.0-fix-default-codec-not-usascii-2.patch 3741 BLAKE2B 7c9aba87be64665f56d87a2c2224979764227e205ccbcecfc4eba365fc35fb7ba1c3f678c6e900a0ad689367b44c2ea2a217e8c6d77ac5afc4f8e411775f800a SHA512 2a93e4c7ffb3ded5ff3e707b14b2ae0b35b529ebd5475af3072faad78d73b320c11b89942212d5883ce8ca258717204d487d331ec642ceed927a90f29a5952e9
 AUX kio-5.77.0-gcc11.patch 857 BLAKE2B a57f60686001fb291a4eebb548ece5b57ec523547f01cb878f98648a38685ecd1c29f2e3330ef1ed3a3de10034e6fb102a6b2e19d2579f52d61b19e70815e89f SHA512 fd2b82fad35328bb65237a1d96f02b127b1c8b6eb48014b7d7ef32fb597fd64368a5959b459cfc35ae078a05331e38e6333e67268b0c80a56f5b4258398be0af
 DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
-DIST kio-5.79.0.tar.xz 3309016 BLAKE2B 804989eab7eb80bb40282da92d752f70f41dc9897037a530482f92ee60f9cf339ccd802b1ff59945300e2656153ce203cc928d362170ac7c7e82dd0aa08d4d6e SHA512 7d7588ec61b3c85ec1d89e95ebee5c6d98626dafc4d80525e13baa96840e91a00a7fa6e6fd2e8055c78b22c27d37cdc395da6c23e521a4ae7ccbe4992f1f7c43
+DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
 EBUILD kio-5.77.0-r2.ebuild 2500 BLAKE2B 1c94508c137cb2e1d83580decf1c410c1ff455b1b20a1484ad8803d2d10b948ada989d18d76c40f06b3899e5a89125080f33dd98e411c2833f7dda3198546653 SHA512 8f63fca6f9494bd76ce1e40cc4184503b46d41c7511fab1528d426ea3bd1c027bc2c7d7461cf23250bbbfed80300ab6b523e65ca93c4bbefea56b85e591acc3a
-EBUILD kio-5.79.0.ebuild 2335 BLAKE2B d8f41285cf4264dd116f43f5261289e83d9eb8fb0732a52dce7a306ffc22fa216e4bb39ac4c61f17d21d2b0830e5da4a9b49f90c5500a59452451922525bb11a SHA512 77171f1ddddaa9cec45169f8582f4cdd7bec468960f4ec3c8fc494cefe23bd44b943f9f2d179238f4c8fefd75cec6a933a1198ce70a8f089900e2ea3df09ca53
+EBUILD kio-5.80.1.ebuild 2335 BLAKE2B d8f41285cf4264dd116f43f5261289e83d9eb8fb0732a52dce7a306ffc22fa216e4bb39ac4c61f17d21d2b0830e5da4a9b49f90c5500a59452451922525bb11a SHA512 77171f1ddddaa9cec45169f8582f4cdd7bec468960f4ec3c8fc494cefe23bd44b943f9f2d179238f4c8fefd75cec6a933a1198ce70a8f089900e2ea3df09ca53
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/kio-5.79.0.ebuild b/kde-frameworks/kio/kio-5.80.1.ebuild
index 2a72c6140615..2a72c6140615 100644
--- a/kde-frameworks/kio/kio-5.79.0.ebuild
+++ b/kde-frameworks/kio/kio-5.80.1.ebuild
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index fc564d9a29f4..32528e88ee3b 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,6 @@
 AUX kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch 1253 BLAKE2B 5b2711b4d853f6966d91c07ad33d36aeeacbe523166e3f16587f6ef0d16bc93f67dd1a4c62d79bc9969354aba28490b4690e047407c953971f09813329afaacb SHA512 7c846700da32d118d2662560760cd2d662856bed1a0c353b39fa25785cb18ab97614bfb599c1bff6208662bdd8b6270519e9b739a12d7785c1b4d49ffb046508
 DIST kirigami2-5.77.0.tar.xz 297028 BLAKE2B b75781fb89b3feec655fb6bc288e0c9ccdfc04d8a507c307001fdfd3c18a7204e4ea75be906d3f36595c12831d2d85b847a5fbf7e795d9b71289b305c27bbf83 SHA512 06e68f649f4cb93606eba2d0e726c004339a5410d5f559184c80e904841952af422d44db663add1144be626c4ac8b5f26eee2df8e0327d51b473027838be5bd6
-DIST kirigami2-5.79.0.tar.xz 300576 BLAKE2B 38d22b5f4c2f4e4e5feade99a28e1e1a94c168fb434f12fe2e0611e48987608c8e3da7129b45f1d7e7bc632f8730def6e43ccbd17605972c0133c138aa156422 SHA512 ac513d94c7edf5348ed047de75256fec3d6e7d04c4ba211040872d19a7a0a95be3ca1f60b38347e1162f0f2392d7c9fc35a60d630ba0a00866aad8f3fcbe3cb7
+DIST kirigami2-5.80.0.tar.xz 310608 BLAKE2B 3e3ad3190306ffc955c17ed783d6d231f7b5d37314bbc6a8a215c22d2cd0a13564b914ca7c482ad60dd1e54336f1af5833a6af7881d94cf584753007d7052ac5 SHA512 d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
 EBUILD kirigami-5.77.0-r1.ebuild 1083 BLAKE2B 32cfc3318ce1dba1a988138a7e20fec7fa2c534bed7e5afaad0886ab319097a9509f592af401fbc79787169f3dffcdbb61a1736d57c545a4198f6d52023f7bac SHA512 ee2408ebcf2be2d312908cbd719cde79dd39305f7bd3669c990480c1d551b8a9668cc976a8ac4cef4df2a55b1ac98d80aab9aacc697b62e435dce93a5949b175
-EBUILD kirigami-5.77.0.ebuild 975 BLAKE2B 581843601075e0596538ddb0bc6bd86844b27b353ad6b3ed454c485f949a42795f98133e22117b81cb2681a8cc558d0cd34a8e23f927b9f612dc31ed2c0071e5 SHA512 cef74f4222bcd56ca0b63085f044d8cae2d5dfefac8f60f926ae62dd11d3f74b07ca2854a3eca44db9ce414fcaf49252178031ce1b5df2ce42eea55f73c9f477
-EBUILD kirigami-5.79.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
+EBUILD kirigami-5.80.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.77.0.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0.ebuild
deleted file mode 100644
index c9ac581ea048..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.77.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.79.0.ebuild b/kde-frameworks/kirigami/kirigami-5.80.0.ebuild
index 22c5683da45e..22c5683da45e 100644
--- a/kde-frameworks/kirigami/kirigami-5.79.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.80.0.ebuild
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 34118a08d060..d6c98564741b 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.77.0.tar.xz 402720 BLAKE2B 8442d0d5c586722b2f1cdaf393b121157a582d47cdbdaaa05a5f492405175ffa1d66a91679428d0c3d9dc7884eacec8160bde21fe0fd93c527a6ef4d7ec2b72a SHA512 cd4391bd1168ab1015896a0037d8b55195ebc1e19813e05b4021234a797c199f8d18e50851dd4ea2ad8b4cb3ea49945343d4ba26f2afbb7c7762b815120a2185
-DIST kitemmodels-5.79.0.tar.xz 402684 BLAKE2B b678588a223770c9b82bd4377779bfcf9f261881aafca9b8dc6b840be175fb785f06ff8b0d754cedd0c3d4d52985a073e387d28e207752e9f1f5ff3c696ad41f SHA512 11834f075978d4befe65dac5f53b4660fa2ed3a88abaf8535d430419918f27b81a0c1196ef93fec3cb5d5a9594335a666720e3dc4bb946b29227753b3815d001
+DIST kitemmodels-5.80.0.tar.xz 402920 BLAKE2B 05e8cc29f4f7214c24f8bc8de38499eaa95cb806b81eb0aea1fbbb8aedb433607c3af725c526bfc80deb5461264eca35fd3a08f618c7d3179121e319883c777d SHA512 5cbbe75c977cbb8be78175bd51eb5f770309ce833e941fc6f217f9782be6c61255f340b2c4a0d89035522d280b54fc1b1b913e9cb0101cc17bbd37bd4e012a22
 EBUILD kitemmodels-5.77.0.ebuild 686 BLAKE2B 3d924dffe0c6cc6eae04c629f8572d06f7f4da1bc5721e7ad70e53844e3dc045a589766605b3435cab13ee517c3c0d0d0437e4654e1dfc6232a7ee455ca61605 SHA512 0a6e1de4f6258b138cfd9fe8af143b7e9b3969db355f596539ac2bbdeb3b7ed18731560d4604383100f7a2e678ab1638c3f2ae14b4891656845ef0517a2f5cfb
-EBUILD kitemmodels-5.79.0.ebuild 689 BLAKE2B a59384e558c8c7470bfd7dfa3fc26a65174ad65860a5fdaa7ae01d67eb215381b9795129d157d35bc6c3d4106c61f8c1ee467abe00ff1194c64c132929003e38 SHA512 07584ee138c49324c2e12685fa0fe8ea810c86c9a5aed856d087f2fdacedd808c98021f1cead22fc5d4dc5efa07b8a185af3eeba315a5753a43d7bbe084c9e55
+EBUILD kitemmodels-5.80.0.ebuild 689 BLAKE2B a59384e558c8c7470bfd7dfa3fc26a65174ad65860a5fdaa7ae01d67eb215381b9795129d157d35bc6c3d4106c61f8c1ee467abe00ff1194c64c132929003e38 SHA512 07584ee138c49324c2e12685fa0fe8ea810c86c9a5aed856d087f2fdacedd808c98021f1cead22fc5d4dc5efa07b8a185af3eeba315a5753a43d7bbe084c9e55
 MISC metadata.xml 345 BLAKE2B 6ebc0f7092b99e24519fae9baf08d02fbf70a5a648e5110e2bb55fbe37156dc13250e297c6094eee7f5030297b6371af4f7642a2b95002b8f9e2241b4a1b3770 SHA512 5c37c8e0f442b14c74035c501da0b02b9c40ac09d031a098decdf463b0bd5e77c54542aadad406ed07d7860626e668882933dea7c7a9696c922bfa5e0ba4c52a
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.79.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.80.0.ebuild
index 94e4faaea807..94e4faaea807 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.79.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.80.0.ebuild
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 082b379e32b4..693926aaddff 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.77.0.tar.xz 75156 BLAKE2B f242f8c41ba7b20764869d7dc50bdc890b6d17862e45944e9345b747f0ebe5ed6c840a770201e0c6642d55b6900001c254002a8fef9e87e1ae71dcaebf87c5c2 SHA512 248c93b8060a514c891c8e0ecad847c40bdebd2c6682abcae8a2ab2cceaadeb235b0a8c54e6bd3db6a3ad0e71dc116b9adccec9b36865c7c3da7016ee31dcf56
-DIST kitemviews-5.79.0.tar.xz 75176 BLAKE2B d5f7e0167cbd453465d81256975ed85b105a216e5ebf3941988d7a9543a09a5531ec5e8af78918140b368b5ea2b6036d3856df18efbd40a3ee82d36f079c14dd SHA512 db3c85e18f97a313663bf218ba3ac56161677eceef9a4c88507c07d76dc42058dda05e31ac6758178310120f62edfc71d3acbac13c76708a874cd52c8be12a83
+DIST kitemviews-5.80.0.tar.xz 74884 BLAKE2B 5be886c8a9d7c90ca9726ed035deb5d5cc235bc4c27d998083e3da882aed22ec345f1e33a0d895ac9989966baa7849452f05db1acf848ab207b5c44b2dd2d67c SHA512 8fbee9fdb37bb3647420e73cb609c57614c8515423b098e70060d5a0a6d7744b0e78df802540fcd0bc0b676b3304a36b988ac2a60931b7f42703243499917785
 EBUILD kitemviews-5.77.0.ebuild 616 BLAKE2B 8b7b1fac467ad1656f05a61133c39bb02bb25fb2772996a92e0a46d73169e64c22726a9a2ba89f3cca0fe0cbc8a3e47ebb1c0ab176b0be269da76531d4acf29e SHA512 ba10cd97c46b937ae7dc969e284b3af000d2f716980cb624b629a5e79a026ae1a563bb015e3b1f3655f3396491028ec4e709568c2468e654db35ef68fe354330
-EBUILD kitemviews-5.79.0.ebuild 619 BLAKE2B c0856097769aed31b0f21c47d737e7fa5d730b3664de3f86e6b0ded0e29bfe6e770853a3523cc45d86fdb5cbbd9d7a8150ff1e74da9c7b2dcb287191605f3510 SHA512 9f887ab873d9b1cd67e3478fa97563906f58b9326ba357b74d58d231de85eaaf10a3cebfda240f41722619d9c354d2c4f7ed913ccf2a28feb31ff9141b701366
+EBUILD kitemviews-5.80.0.ebuild 619 BLAKE2B c0856097769aed31b0f21c47d737e7fa5d730b3664de3f86e6b0ded0e29bfe6e770853a3523cc45d86fdb5cbbd9d7a8150ff1e74da9c7b2dcb287191605f3510 SHA512 9f887ab873d9b1cd67e3478fa97563906f58b9326ba357b74d58d231de85eaaf10a3cebfda240f41722619d9c354d2c4f7ed913ccf2a28feb31ff9141b701366
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/kitemviews-5.79.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.80.0.ebuild
index b8205a752558..b8205a752558 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.79.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.80.0.ebuild
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 7d65d3ba22b8..18f7428d20f0 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.77.0.tar.xz 92376 BLAKE2B 76acdc41bc2612053518b5bf6f907717dcad0b14de9361f4441f59ea0784789f39c2479d5b35e4a344ba713ee40f8e3c355cb8055258d3e3d513e94611c5bdbc SHA512 4bb2473e1924ec2745357f21c81bc64803db9efd30eaf06b4742b1d3fd08bba6bd5f2515b5033439d94d4b36cb8f901274b8961076cc4505c90a2599e8749056
-DIST kjobwidgets-5.79.0.tar.xz 92816 BLAKE2B 574fd141b0ecfb30f556ff062a4cf9845a3040b07062b9675f5384a52c3848a6ae9df1388b42d2758b0a2dde42d66d7fe56f6e7309593a9fe08ea528545b9fb0 SHA512 909a8e27e42fd1905e450d43d0041badc7ac4cb0d106702d0dabf3403632c8b1e58c3fc468d63e2308c2ae80b05ae3569e2a16f2ed8c82c2f00ae53dc32085fb
+DIST kjobwidgets-5.80.0.tar.xz 93100 BLAKE2B c821b04b142265fe0b76d21c19b0191aa279ec4323bc65b4b0d2602398e68c52c7b4430f527aff19f636c20b8084f44cdef45b1a5994f64ea737a550d7186195 SHA512 93cf5931acbc9eb8ed39323b9fd2e01ed46aa8c89ffb4468935434ef1ee3b62713fb3f2a599baf2d2b88c0a128f5b99070f17e722d2c678e4e29b7e1df888a3c
 EBUILD kjobwidgets-5.77.0.ebuild 842 BLAKE2B 868b3e1b4c864586527a7079c811d603de3cac112becea49e1baf4c42c3137a6964578b0197ef0d207673a1812162ce227ad04d3ba04f24ab02dfbbdaab424eb SHA512 60fa3a4abf34052c17601fb0f313b78b29bfcb42a0202e56e8a14ff4af19d849a798d7d4c00259b167739e28706c818e4a983f39abc335541f96dd9daab44f51
-EBUILD kjobwidgets-5.79.0.ebuild 845 BLAKE2B 1fb1fcf19a08ee54fdc84305036ae3c4362347be2b88f073041f27894fef0b47d1147a974944ff4ff89fad3d70d9ea4cc4431f17aa25a21e246bd5719117c1ae SHA512 773562c410ef2820d3124a3440e41e364f664a81130ad037e5135970a62f29636282e1ceba57033d34789cce23244db0a42321de12c6d59c76a3ebe73453bfee
+EBUILD kjobwidgets-5.80.0.ebuild 845 BLAKE2B 1fb1fcf19a08ee54fdc84305036ae3c4362347be2b88f073041f27894fef0b47d1147a974944ff4ff89fad3d70d9ea4cc4431f17aa25a21e246bd5719117c1ae SHA512 773562c410ef2820d3124a3440e41e364f664a81130ad037e5135970a62f29636282e1ceba57033d34789cce23244db0a42321de12c6d59c76a3ebe73453bfee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.79.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.80.0.ebuild
index 1dc58354abcb..1dc58354abcb 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.79.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.80.0.ebuild
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 5337d0ae4ba2..40f0ab2cc58c 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.77.0.tar.xz 337984 BLAKE2B ac6d4a4e19a026fa7ae84f5889b0e9dbf6809e3c3a532c335e4d075e96de2563b0a61e9b24ef7838f746b254566933aaca798264e9660a1a1bf347fb75472d8c SHA512 8ef1c829bd60ac9af5fd79d4a0985d44088f25a20e648cb33df4a9ec9a06bc1c2ee5dff161fa7530c8ecfea535876066da2909d0d4b9da42fbe27e3dd5fb092d
-DIST kjs-5.79.0.tar.xz 337980 BLAKE2B f23549b45e5954aee2f29857bf6d4d699065b853d0db8984c3424bde9a295cc8cc682b5b334668d6ac817ba34b8680d2df87449f07f7988ecfaf4c3dbe2640cd SHA512 775dda5e708ee49f55fa81ad3457336aae6125aef0b53af1493c6d037c394aebd12ddfcad4a0be3b387405d9d91e8039bd2f9d502f0fab5f983d119facb0f365
+DIST kjs-5.80.0.tar.xz 337980 BLAKE2B aa0a721e088746d45baa42492bc876fe415aa829f92d0402d9c3db48859d4415efa3dd61629e0703d6b033833b0c4195007fc34446cd5028abac5d61b663a7a3 SHA512 faf419dc9209d4ff7e15d9c807c7d4c9ae1b877d8d4ff9b32a0ceec7fa55438ce25e8758f84d934d368f1101b09bd5fcc3ecc1b19e50df3211be5c5bb9f81915
 EBUILD kjs-5.77.0.ebuild 399 BLAKE2B 1eaba452d35a4287ea14bd7b23f6328f3df7f5e007726180e42a5b02b489bcce95713e38d934b9202b6fc7fd83c182b75b1b57c82782c16c83e355d2eae2634c SHA512 817cc1494caedbcf00550c5c27e614680ee0e77d7c60b2633856cf003ef84b66a4cbf769dcc032a4fd6b2a2026f0fef254d75baa6b86d8fd2133896de8b810f5
-EBUILD kjs-5.79.0.ebuild 402 BLAKE2B c47ecfc67500b2ef08bfa75b6fea9df6635133c0c5109361b6449a0e4fc264d17351a209a0ec8778e3b981609b51db0a97224619a88a2b89ebe19074cf782ca1 SHA512 c6ab116a2a4416c6cbb089e9423e6c8c9429416d21a64ad4709729c4d1c9e0231b94539c8a0ca9168f1572ab93bb0d04b78ebd27c1cdd23841a4c33b9b485bc7
+EBUILD kjs-5.80.0.ebuild 402 BLAKE2B c47ecfc67500b2ef08bfa75b6fea9df6635133c0c5109361b6449a0e4fc264d17351a209a0ec8778e3b981609b51db0a97224619a88a2b89ebe19074cf782ca1 SHA512 c6ab116a2a4416c6cbb089e9423e6c8c9429416d21a64ad4709729c4d1c9e0231b94539c8a0ca9168f1572ab93bb0d04b78ebd27c1cdd23841a4c33b9b485bc7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.79.0.ebuild b/kde-frameworks/kjs/kjs-5.80.0.ebuild
index 103b7d178deb..103b7d178deb 100644
--- a/kde-frameworks/kjs/kjs-5.79.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.80.0.ebuild
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 0f0b8c63e384..4d4442bd5175 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,6 +1,6 @@
 AUX knewstuff-5.77.0-add-dptr-to-cache.patch 4360 BLAKE2B cdfcdcce877f360a79731d508a8b52be23682efaa842ff58aed96539fb2e0c08a6744c3a6401c52116d5b19bf869043e3d0b73d873f50cabcef0101c155fae38 SHA512 78906c52f768bf7240bd088913292d486ea74310f6071e4baa7b5ebddf7e1dc229b6aaef36e44a79a6b303982b9da5dc6c07d4987de6617a4f85b1cee28d9618
 DIST knewstuff-5.77.0.tar.xz 1143780 BLAKE2B 72b1e040041e6aca1593700a5378ca88be8b9edc3f2682c433231ee07fed5f56cea749f34dec74835cbc2cf5455e879296d388a0deed5132a9cdedb59ece85e1 SHA512 408b3dd045f13050a41389b4864888f8d261ecade50b4d3903f0982194a0a15828e459e755a001a5593cf818894cca2203ded9cc3fcdd60e23820a1d0f7c45b7
-DIST knewstuff-5.79.0.tar.xz 1161212 BLAKE2B 6538422c3fe2cf60b452ba1a7af6a4b013215231aff1049517033e51f62ffacf908be7ec3af933a7b034079ac74a5df89ef4821157dc23e35a40212812cbf1ff SHA512 00387fe5127fc19ddc1e4253ddcc07769a91b1c0937ffea22b333340f41cc3294e9ec4c6de3149822015c0a1199c3fec482d06d1c48a7878993d3b67f1d5f16c
+DIST knewstuff-5.80.0.tar.xz 1162316 BLAKE2B b6ceb6106577b52c49ac34f87a8443dd899460e32bcdcd4cc56c5f786c0e7bdfd871e1157da215cc9b7b0dfca8bb29abab6fa212e6ff30b29dc930b5a4c4b4fc SHA512 bd0c601bcfda8f4674392010c863871e511abd97c1e2971ac93bb902e2bf2e5eb925d2b64119473a182944fe91fee3d1e5a7ebe23edc58aad20e2d04a190bc3c
 EBUILD knewstuff-5.77.0-r1.ebuild 1167 BLAKE2B 922680f7fe77166a9f498011d7c23404481710b46ebe10bb62e403c52ca88cde156d50d38fd8f6b61f3b1c7b840b0804137873c8b68458a2a83e6aa2a2fa4742 SHA512 5e29540b2bb22585e3c9aecff5ee7533de0c234d346a9d715d4c6b4c10c5667d519d4eeb555639bc8301e940df50c0a0fded8d917db179c7a2e890dbd5f57ba0
-EBUILD knewstuff-5.79.0.ebuild 1097 BLAKE2B ea2639151e18d9d2b136a6db78174354e2d1dd65296ad53b3a389a2143015581acc5c9d0afa465f3b6c53f152ea06c900e2507db18a90d91482ca6ab1368eba3 SHA512 b6e931da813b9d2a3186e4ce09c13da7282817be0cef30f5d4483ed406be62661bd45920f7d157192051f026745a3c8832f74a98a6b3101366f37f69635a9fdd
+EBUILD knewstuff-5.80.0.ebuild 1097 BLAKE2B ea2639151e18d9d2b136a6db78174354e2d1dd65296ad53b3a389a2143015581acc5c9d0afa465f3b6c53f152ea06c900e2507db18a90d91482ca6ab1368eba3 SHA512 b6e931da813b9d2a3186e4ce09c13da7282817be0cef30f5d4483ed406be62661bd45920f7d157192051f026745a3c8832f74a98a6b3101366f37f69635a9fdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.79.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
index b8deb66ae70c..b8deb66ae70c 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.79.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 84186de9b51a..37302417091e 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.77.0.tar.xz 120364 BLAKE2B 1a041bda51f9fe4aa1819aecc25206daa34e8918cdb8d65aa089a6c2e60409afd64cef5c85bfd77908f432e3bed5591af2cff59382005a4e6214f20c6b705bc8 SHA512 93f017e490c5c25cac74742e08ecc6639d9f13793bca4d1fd33b1d76e45388a60d93211ad627fbe66e2a6cb34e7c53bc8ef59da8b04a48fa45829fcccf2d6cd4
-DIST knotifications-5.79.0.tar.xz 121452 BLAKE2B 994bf618ec37aca43682e61b6210a7956eba7e56c6e8569a94835e9ffc04a4a7d4183861e5162b56f1ea39b178bcb640b2bc51629ae6d4c7012fd4618922cf8c SHA512 f646078442e413358de17c5c4640143f430e054ae8394cfd3b0018d8ec6b2334cd8c8b4faab140d370d1a677da4b7907eccc97fe424800956ef89cfe88c06388
+DIST knotifications-5.80.0.tar.xz 121360 BLAKE2B fdbd56642d51d670af17b54e59d264fd687940d2788ebf88ac9718917ae947c89a8a41fd412f4426afcd5d386b5cbaf9a5ef93c6bb1b14824f112da83edab0c9 SHA512 b3130de9b2eee251dc56e9814e4deb7f9cd6d166e234e3f4f6d1328024152a961776d18b20d9e9bc20af3ed590a2673c5de4b8fa3c2f6d0cb91259c96c1c0a16
 EBUILD knotifications-5.77.0.ebuild 1144 BLAKE2B fa5c879d0925583d56f7702dad3212aa3f971129049e3bcd1faeb1d272a7aed0da6ae8532186fc0b8fb14559a0bdf4c44576b4bd07322dbd850a6bf997f188c8 SHA512 631127556dc7a503ee0787034d0f9fdcbfa432d474886bf72f174472d4c121f1a64384e54164dbca335b7c5e18655a8ca2a7c60fa111d15a40c2f0fccc8f089a
-EBUILD knotifications-5.79.0.ebuild 1147 BLAKE2B 40a8aceb0128687d864d538bceb5040eec3c67ee895f5c655aed681456ae19b0df61a5fd9eca6dbfa6c5ba9ecf1af8e98e2a8dca8daa2335a566015f0b44de18 SHA512 df15ccec223d60fd79c70fb78e10c557f5842ccfa79ffb058b70c6898adb45d0bbe1859eab2e01c36848f3496e63d1aa4a86c95586640272fe423d912adb1679
+EBUILD knotifications-5.80.0.ebuild 1147 BLAKE2B 40a8aceb0128687d864d538bceb5040eec3c67ee895f5c655aed681456ae19b0df61a5fd9eca6dbfa6c5ba9ecf1af8e98e2a8dca8daa2335a566015f0b44de18 SHA512 df15ccec223d60fd79c70fb78e10c557f5842ccfa79ffb058b70c6898adb45d0bbe1859eab2e01c36848f3496e63d1aa4a86c95586640272fe423d912adb1679
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.79.0.ebuild b/kde-frameworks/knotifications/knotifications-5.80.0.ebuild
index 09e8bd9e45f8..09e8bd9e45f8 100644
--- a/kde-frameworks/knotifications/knotifications-5.79.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.80.0.ebuild
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 7e8da20e3c81..b8d7cd1d3a5a 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.77.0.tar.xz 84412 BLAKE2B db86d02ec69c6e9950a0da9b6a432bc970144e7c8c64c11229a1c518b79eb1d859d130ce60c2deb5521ecae35624cc626abc2fb8176b6e3e9cf1aaa74840e703 SHA512 27a37657eabcfbc0c9268739859e4ac1266591463e299088df4aa7a7f1e3b6aa0bcf5a7ae3f6eaa712354eb1cd1c89bcc6814c2c1d43ac506d737f0bef0fda48
-DIST knotifyconfig-5.79.0.tar.xz 84400 BLAKE2B 4a9cb4aa62efa83c0ff6f46f09657358ae06dac426041b61724857dd5695f462eb87f119a39390e79cbc27737c13daa3d441e373f1714fdd8f0b8c883ad1db67 SHA512 dbf6128544d09e5a0a2f83ff1740c8ded1463e20fa96e601a67f0ade7e8ca9e9e5b64468c1b01ee1e26b83231db50bdb1bab42d79fe5612ea3702c2c69224f60
+DIST knotifyconfig-5.80.0.tar.xz 84444 BLAKE2B fdfb0d5687601bac7c97b56d648bb4e32d0d1b556d62069bbbf0e08833a6f1c2bb6e1b4b79484f2088038d7d5df2533dbbe01941d12f102c25de4a48385f2236 SHA512 405feb77947ed27376f72221c89ec153e95798367e2e10774501109e4eaf2fcb40402f49435b9781c992cd6e562097f20840c9f30d36d32f84367499fcd32d5f
 EBUILD knotifyconfig-5.77.0.ebuild 768 BLAKE2B 2847d83c4d7bbd3204f690460c8b8c8368b9ff11ce75d4ac8ddc2b59ca9fd7052f20c3e4a46d21025b5d5c68c6e3345eedcc0ccbf2a1477be9045848f709bdac SHA512 3a6dc4cf1510b2db5fb9218c2626ce13fe9ad650d1cdaa2783be1029bed54f2b9cb4c957cac1b69e2c58ce69fe4c738031a08668623fa8d555d6f87f2ec707d1
-EBUILD knotifyconfig-5.79.0.ebuild 771 BLAKE2B bcbc14f8c4875da84eab6bec75bf86f886ce58274c89989c310f90bb3c249de72d7d1ac3616a5dd8f0e5309d76557e8fb8bdb0a495468622adc8c72e2cebf657 SHA512 47086a427c5c6968b07e0cb22b4a17c27860fd8228385041c9ec348b8beb3a497acdf30a311bfd8a90899d32ce07bfd28045dbf831385425a791aca4c5f4272f
+EBUILD knotifyconfig-5.80.0.ebuild 771 BLAKE2B bcbc14f8c4875da84eab6bec75bf86f886ce58274c89989c310f90bb3c249de72d7d1ac3616a5dd8f0e5309d76557e8fb8bdb0a495468622adc8c72e2cebf657 SHA512 47086a427c5c6968b07e0cb22b4a17c27860fd8228385041c9ec348b8beb3a497acdf30a311bfd8a90899d32ce07bfd28045dbf831385425a791aca4c5f4272f
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.79.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.80.0.ebuild
index 80cca1ceeaad..80cca1ceeaad 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.79.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.80.0.ebuild
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 0950823f9c90..0a7692744e18 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.77.0.tar.xz 140368 BLAKE2B be642431191b17e29cf3e9f2ae8df562e8caa9f39002cb6015cc40f753c757e39d742803f19ef80cf8b31d5b1480434a270fb91da0b9a95323a31317b39f51c6 SHA512 752a5927f0df3985808b122d5bd774fe658bc6eed718a0921e46ff9577b6809d302db6f172af01f82b1e5001f3e02d851e30db12246ac433e0d94d7f11ea5583
-DIST kpackage-5.79.0.tar.xz 140604 BLAKE2B c81e9425b15fabdebe6f246f23ae4017cca26804fcc8824d890c6a8ebe62de18bbb9147aff07ac6e14a49c9ead9c6b80ad0ee4efe0b15f4f1c8d9f9dd02652bc SHA512 8f2c5451be2e140685200292a5539c728556f258f46895681f25293a4f7dc61772fe7e61071170d78f334f5d220497ac10cff89660c8399b303fefa373cfc970
+DIST kpackage-5.80.0.tar.xz 141148 BLAKE2B ce51bb6e0f06d081b2331b7e451fb51197d1a9f969c441e68f44e65a18d0aba938aa3fa9454f834343a885907695f4779b1b63045bd2bf961c792787daff8a45 SHA512 f8768f4b8d037166e7fd4a6e7bc171d23a82b63b26f391e1cb37b259b5090d1a6b1b0b96662d61a5ec374117f575bce6808a9da77b54c9971dd9259bf7c7c5b1
 EBUILD kpackage-5.77.0.ebuild 755 BLAKE2B 50e94432864843b043de2431cbb67c992933f0e13667b0015205dbe64954715bbd078aaba972f8c86e44503c5f00a9f0cd72fa11f4199a9e25278462df8785b1 SHA512 124f0f97294637f99653df5c2b73ad15d260745219e448b883f7e9ede09ecc90f120646ad3dfda6f84aa32d9117a35bd433603e1587b80cfd6b11919d60775e8
-EBUILD kpackage-5.79.0.ebuild 758 BLAKE2B 7b28c138ee6d612233938964ed627e77d4ae6ee2f3a9790a2dbb40701aba1ee4b874372208df04aa059ae8a797c4d4e1694a883f9300715f7a6d268fe6e0d6a6 SHA512 695b1a661f90ebe316bdc01b1daf80bd869aa3d064f8f4a1f5838f55f6c94e21fb79d8f69fd6608bd0fdd01e373867171978601c93c81aa37896c44f9b22d8b8
+EBUILD kpackage-5.80.0.ebuild 758 BLAKE2B 7b28c138ee6d612233938964ed627e77d4ae6ee2f3a9790a2dbb40701aba1ee4b874372208df04aa059ae8a797c4d4e1694a883f9300715f7a6d268fe6e0d6a6 SHA512 695b1a661f90ebe316bdc01b1daf80bd869aa3d064f8f4a1f5838f55f6c94e21fb79d8f69fd6608bd0fdd01e373867171978601c93c81aa37896c44f9b22d8b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpackage/kpackage-5.79.0.ebuild b/kde-frameworks/kpackage/kpackage-5.80.0.ebuild
index aad1329598d7..aad1329598d7 100644
--- a/kde-frameworks/kpackage/kpackage-5.79.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.80.0.ebuild
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 162224b965f9..5a86b461d0cc 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.77.0.tar.xz 191436 BLAKE2B f8e61705404d605d38b4a1a60b14cc50483b213ffe51548aa01285517d9331de01ba3448704eebf14d361b9766db4b874b386a1ea1954af710b3d0a49ba86975 SHA512 b04a9f3490bcf1628c162930147c0c858ba35714bdf2c3c0373eaf2fff95c62c1bf341434215c71fc8269cbbabe4ce306e5f19ff62000e4a1252f02a1e39e60f
-DIST kparts-5.79.0.tar.xz 191880 BLAKE2B a49a39633c05738962432e837aee09e6d92c5b110bbdf0612f3369d4563ee79b4ade0ab363c0a4affd60b0af2c92df37afe97baa2aba1491c1d43505c1515b8b SHA512 8c7fdddc0da297e3c6b82cc59ef09fcae87b322f90a4ea862cff4c5787709c5e11610aa5941a63b0e551bbca0a1dc32da909f2dda7f5ba49e52ce29fbd327139
+DIST kparts-5.80.0.tar.xz 191824 BLAKE2B 18fd22fa61db1eba98d74959ffcb99aab26a581c38cb4e5d696575bc31a3e5a7ed3c8a46ea16c17b3ad29a846b334ce7ce196dd86e70adc78db1bcdb193f44e2 SHA512 5954636d179062948a02659b6baea8ce7f47122c9b07420a4bed495867167ddddc642fccd985375c5fa846432a98872ad2fca6b90db162e277c76559aa1cc8a8
 EBUILD kparts-5.77.0.ebuild 837 BLAKE2B 8e61abd9be45460a5f55ac62124509eff55ecebff8eb55543674e14fce6703671d62427ead7db9e8ec3cc0092c01ee553cf83123b4432e8641eed028ee1e65cc SHA512 28a2ad4c00e4c69ef541149c06baf058e044d7e9bbf82ad9918563af8725cd5987570a2bb191f10e44ab258812e60bd58d76a2832f062d40c9fe984bed6883bf
-EBUILD kparts-5.79.0.ebuild 840 BLAKE2B d68b1a2458d4cde6693bfa232efc0eeaa29d58e6bd9e21164b203364429c07bfa61d04c0fe81b3ca6ec67229875d6968ab1a24e8ce906af577492bb51ab18597 SHA512 74350910d8e1ddde7d58102f11371bf06e497c3d7d4261ec5d32fec78b7d640dcaccc9bbf80accbb69617767d8e8a237503aafd80b8560c947abb135808989c4
+EBUILD kparts-5.80.0.ebuild 840 BLAKE2B d68b1a2458d4cde6693bfa232efc0eeaa29d58e6bd9e21164b203364429c07bfa61d04c0fe81b3ca6ec67229875d6968ab1a24e8ce906af577492bb51ab18597 SHA512 74350910d8e1ddde7d58102f11371bf06e497c3d7d4261ec5d32fec78b7d640dcaccc9bbf80accbb69617767d8e8a237503aafd80b8560c947abb135808989c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.79.0.ebuild b/kde-frameworks/kparts/kparts-5.80.0.ebuild
index e8709a311e1d..e8709a311e1d 100644
--- a/kde-frameworks/kparts/kparts-5.79.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.80.0.ebuild
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index c105fd8cc9b1..521bcf18ab56 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.77.0.tar.xz 61636 BLAKE2B ad026024f93691c432275abf0b7f057800440f1c79aa1a54d62dbc0c05339c14c7844b32c099f3bbf4f5274c418c6c478aceb0c00f5ee0d3d958d814b66291fe SHA512 578efc5dec52fa32b5c87e5054ab3501c9af92ae2af9d6595c776f213ed54002ff45fb5499c07bc69269dde69717e76410d0779fbe104243888ac3ff9dea045e
-DIST kpeople-5.79.0.tar.xz 61668 BLAKE2B a4cb33ca3a329ad557edfebf8016d38a776f1c6277539b834d3e9df1d54768f4fc1632ce1146e7fb6ca61b41470c5257c92bd06fe6bb1f4f2fd1a8a025799c55 SHA512 0bf463c1c1868e6531c2b2b82e01d48c5aa6d2fdfef6a273ac35a42aeb3a371c8a3e42f2cc73b80ff1e9e814077ddf5eb5a2645447d6433f8536910d52824a3f
+DIST kpeople-5.80.0.tar.xz 61664 BLAKE2B 1e32e011e460a38d0948877e98d2304388faef4e463cbf51fea4b2b1987fbd1e6b68a0881f0f86af14298bab973c625ddf35017d510c5acaa70e496f13e40467 SHA512 d5ffc7bf5ac2028a3f53fdd92b164e6203a3529f5bf5f867a63eb39dc583559f9acf7c75b1d01f3b67f3719f8f0b5ca3cb1a2299c5d5a9cadd844e86b46c08d1
 EBUILD kpeople-5.77.0.ebuild 870 BLAKE2B 05b09066976fe1d35f1d9b10d7ac7a3a1a622495994c8018eb015a203e3d7ee45ced510892c7c28d28765f33b594ed51b9df45c0e4e64dfbdf8d771914f7e1e7 SHA512 c2dddb4d8e39165a9180f93c07f2989acfa3d23c90ef04df4c2b844186e1acb7522fac931dee0680e20e1c35894d11bb115bdc127c8c5156434d427d4e1dba6d
-EBUILD kpeople-5.79.0.ebuild 873 BLAKE2B 1b5837fefb6670a84d2ff0a0db95cdbf2bdcb7cdd03509f073c0db8a2866c1959e0b92ca2fd9c9554cf5875d76aa1cf84c6e118bee94e926b4564adde50f463e SHA512 f947ade8281c73862a937d9a7cf1545cb2646d742fca46a3435e4afb2db481fcbc28e738139da6e3a0992930f2117bb8b44b49ea6b6586cfe2a89b32a031f324
+EBUILD kpeople-5.80.0.ebuild 873 BLAKE2B 1b5837fefb6670a84d2ff0a0db95cdbf2bdcb7cdd03509f073c0db8a2866c1959e0b92ca2fd9c9554cf5875d76aa1cf84c6e118bee94e926b4564adde50f463e SHA512 f947ade8281c73862a937d9a7cf1545cb2646d742fca46a3435e4afb2db481fcbc28e738139da6e3a0992930f2117bb8b44b49ea6b6586cfe2a89b32a031f324
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.79.0.ebuild b/kde-frameworks/kpeople/kpeople-5.80.0.ebuild
index e90e2cd8501a..e90e2cd8501a 100644
--- a/kde-frameworks/kpeople/kpeople-5.79.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.80.0.ebuild
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 69e737222a1c..e2d9f8ec5e73 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.77.0.tar.xz 31100 BLAKE2B d5e0a36c0f92de3522a2beddf7f0751bc1d57f749286ae7ff484ee4a22f5f020fa99dd4e77346d0a6e2de66fcc7c8944febaa89724757a5a3066e46bf7a871ab SHA512 c8220a9bc66596512bb36f80445c3b66cc8a63afb1dc818611bcbe960f0dcbc02338bd1ac91ef668088da4e536cc11b3c2cfe87c11317bfd5bc2f7f196f0fd56
-DIST kplotting-5.79.0.tar.xz 31076 BLAKE2B e226878f6ec50a8b039486f0fdda87876d0e6d47706a169bcc102ffc2414830d3942c84837277f7afb7dfc21cb354d4a8404fc0ec7921bd0802bc0f7186a0088 SHA512 0bf0f4f2e240654c2dc3edfdaf8f542e39143eb3023af23f202b41561f2127279ecd7a9bc931f535bff2645fb5f98d5f60a876972e3298b8b320720a8fd590a4
+DIST kplotting-5.80.0.tar.xz 31100 BLAKE2B 34e24ffbd2cffe8074e834923ecd304c5873ce79f436dad8a31f66cbc59e201c35982103751dd8fc351c6133c6dbd03e8987a5daf96b8b8aa6a453360bf7a345 SHA512 d04d35c44439da9df37e046f09b75908bd9f965fba18941b803543dbe3111f6884cf4a7377461016ec60d1f47c08e84fa994e2784fc135867d74e0b0d3edd2cf
 EBUILD kplotting-5.77.0.ebuild 437 BLAKE2B 76a2afb1f4d228b33274a70a0da5968d11d0bc9f5f4323393757479ef80f559ba8546acf2a7e8bab76778c7a33b217a7780ae24822fb3fc56bff279dd92e5a7a SHA512 2e262067a6e740c78eb7d7cdd52cbf3163d9980102f5dc859a5eedbd727ca39270c188c05aa1c187cb37018b3fe8f57d4b675fd41d5be05fb0ed464e0d3bddbe
-EBUILD kplotting-5.79.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
+EBUILD kplotting-5.80.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kplotting/kplotting-5.79.0.ebuild b/kde-frameworks/kplotting/kplotting-5.80.0.ebuild
index 71388c7ee73d..71388c7ee73d 100644
--- a/kde-frameworks/kplotting/kplotting-5.79.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.80.0.ebuild
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index a2cee14af9f4..87789514bbce 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.77.0.tar.xz 56080 BLAKE2B 94949dd6d685d12fc32c7da46ee21685f724a1ff0051063fba0f2a8e0369ff4e419fad4d3d1c716d59184c93112cf098c7b258152cbf1272a748c9b82148d496 SHA512 501bdf4102f77091ff49d6a79bf0ae3aa05e9d7a2a8fa34f7f39f0f0a8665437e783501219883102af7a10ce9cd811819a5187f1b7b85d0eeb6e9f5236fdc41c
-DIST kpty-5.79.0.tar.xz 56072 BLAKE2B 51e5d6792a3e970e05aeeeecfb483830289f01dc906c1cb324fd72a849eb436cb293759e5cbfd06f74f47d47322f89a385703ca94a127749ff00000e5f0c8df1 SHA512 44f587c6c668521d7073a7836d2e607e55255af8d112bd537115435b477e56bb88697ce3e75bf5639dd88fb09a25486600a1a71f7a05bcef3604d02fea321bad
+DIST kpty-5.80.0.tar.xz 56224 BLAKE2B 0e0e6a2a56154b8d59f88503e0a0b7e091c4f9e89a6464726a0f12890c6faa981bc32e2377d4a6eb2c70aa6bcdc0dc310738649670857ff7d122d479bd2f4eef SHA512 406b3170d80bb7a3213e8ed940c517eb97227ea442bfc4175886f0c90c031b2593695973411dc993174d1af0719c3a4365c0f74f2dcede538433dc3081ff3af1
 EBUILD kpty-5.77.0.ebuild 550 BLAKE2B dcd8ed024d7f784859f592a6ae8d7c38246867cbd6b61e6c040e3b4bf534ad1257bae719c8a3e0b89a315b32063db38a08105c57ef9c39c87fa243416109e2ce SHA512 324d33ddfe86d1ab187fae50e22d2ac7cc7db31f7eb17b106f4b19d0e387f04ddfbfa4ff0fb0822ebfdfe4aa8284da966ceacdff3a1dc7e573e1deda5a6ac6ca
-EBUILD kpty-5.79.0.ebuild 553 BLAKE2B 4754f87aaf2ea51cd1188fe2485bac9876d6a443d634810e253493ee79bf2a7d16542d299699d9f4c9340cfcabfbb3654b818666a57ac1c389148f1683a165b5 SHA512 53bb54924e672e8f1ce763cf3fc9090296c48c7b70fc3e4b57b530d3b67beca4d0c5c32ced920df86b7aea0c0dac1ec9fca3d9303b8f7d591c45b871a99948f2
+EBUILD kpty-5.80.0.ebuild 553 BLAKE2B 4754f87aaf2ea51cd1188fe2485bac9876d6a443d634810e253493ee79bf2a7d16542d299699d9f4c9340cfcabfbb3654b818666a57ac1c389148f1683a165b5 SHA512 53bb54924e672e8f1ce763cf3fc9090296c48c7b70fc3e4b57b530d3b67beca4d0c5c32ced920df86b7aea0c0dac1ec9fca3d9303b8f7d591c45b871a99948f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.79.0.ebuild b/kde-frameworks/kpty/kpty-5.80.0.ebuild
index 57656f492184..57656f492184 100644
--- a/kde-frameworks/kpty/kpty-5.79.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.80.0.ebuild
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 193565f13ed2..cf6d3185dce2 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kquickcharts-5.77.0.tar.xz 97756 BLAKE2B c91b61fb678fa48e755305b51db96d4e8704015f48aca2891975bff95464da5e48930304e04e90dda45c591fa1f46ceb7339f17332a98550f0ce97a4a03fe2ad SHA512 4c4621a150951fd73769527086279149153246eed28ce76d8110b5deb70a1b05b83e7d884d183c99d07e3834754c693ffa65029d8eaa01f4d80d763310f8dc2a
-DIST kquickcharts-5.79.0.tar.xz 101212 BLAKE2B a22f7590e4f70708c80b334045de05bff499c77bc6b5360e2c664fb0e4feae279885143a6ceadcc6aef2a74558921191056fe998ca185a71be88a567b0541e9d SHA512 b5c655ed60a05b10cd8cbeb8ca2995d8af56fde5bf834b4306ff7822f407bd324634ad441680b8bb91e17007b7a1450aa4b912208a5b0559b2e24418e763f4a6
+DIST kquickcharts-5.80.0.tar.xz 101224 BLAKE2B 1efd17ad8ab283497a294e3403ad4b929cce94fa1d7e6055cf00a3081a42eecfbe44b064f2a44db52e42df7332cdc033da51d4437030646f816763d3f79fa000 SHA512 d4183b29e031a03bd7a42a0b97f78995be60340a841b7900f3839dcb375d48801cd61ef534d3bedc27081ff925467b8881a09caf3f66994a3737da74e4393831
 EBUILD kquickcharts-5.77.0.ebuild 798 BLAKE2B 420ecd3083494bd9d515ff1fea45cb93cc1a7c364b8ce213edb6c997133743ab145b273d4da5f5f0044b5bfd38905cd8a44640a1b5a7b6e081560f76111a65e3 SHA512 4b4a4793bbcfb846aedee9f1fccb27989d0dc00c5501dcdac43c1f5589f4f471efc8cdc0dee14d8f51d9e94f6233b0e3635c60d85bd666b92b51b5f5b0fcb6e5
-EBUILD kquickcharts-5.79.0.ebuild 801 BLAKE2B 9bd352bad29b06afb8a4e130ab1269cb5272ab00ca1d4f28424000532323ad275ac47e7c4aa82e8203d05f4b690d3b75c72126f2691fb3ccf4a7642e4feae4c8 SHA512 c65d5f54705e51e5a9a692c0ed6dc32fa7cb14b314c55c807068a3761afeddfdc38b48851c35f8bcafa3c0722a0b4c39a6a7d0d9e36ea81569dcfb2449c7b076
+EBUILD kquickcharts-5.80.0.ebuild 801 BLAKE2B 9bd352bad29b06afb8a4e130ab1269cb5272ab00ca1d4f28424000532323ad275ac47e7c4aa82e8203d05f4b690d3b75c72126f2691fb3ccf4a7642e4feae4c8 SHA512 c65d5f54705e51e5a9a692c0ed6dc32fa7cb14b314c55c807068a3761afeddfdc38b48851c35f8bcafa3c0722a0b4c39a6a7d0d9e36ea81569dcfb2449c7b076
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.79.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.80.0.ebuild
index 6d75dca5d2aa..6d75dca5d2aa 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.79.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.80.0.ebuild
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 7f12b33c73c9..4960258da0ac 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.77.0.tar.xz 128620 BLAKE2B 84b459b0e98dadcc2dc8bcb7392889cac512e90a120e5117f2e8cc79247ae74080fbe183c4e778706e94fb18f87c167a5ca7649f65af680879fa94e7360e776f SHA512 8874d6eb3d167104ac25fbe81e3ee1b183955c9e2e210a1175f641ff017242be53f96bac8f276f5b129e01e52338db07cdf2c57cf4a7109b9d0d393c70d55e3b
-DIST kross-5.79.0.tar.xz 128760 BLAKE2B a5418b36808b506215fd25b5e150fe888ee8f9d56421057601589d82b87abf1155296f236ee300d52b9a5d0adcd4e276b984cf745ae531ab6af980d6eb8de532 SHA512 149c78fe484b66bf6d2b52e30e4a160e89f09d1b025be2dc52111df0e0a88b5eb95cacb9fe0a5c28c2cddb39befd749f9132c93351ddb2dc5632c025968058ea
+DIST kross-5.80.0.tar.xz 128768 BLAKE2B ac906bca9eac1899f77d70a39920b22007d5da08719f47f0a242f2cc0d2b0e9fe48c6a43b45ddcdf4e053126b6392df9013f3ef6734f0a5418e86fe6edc3bbe1 SHA512 73afba0c159f93e6ff231075e4c43e077cf37bc74b2e7eb451a038f3767a3436ac649eb5df7e86c65d4c10d2a6c31b417506384bdf2ee479640f31923539bf84
 EBUILD kross-5.77.0.ebuild 859 BLAKE2B 410d0efbe0b65ec435d968d6fefcc263c178cdc7faf936e2123c9839de1aa3bf5c6cb4b5722d7f4f939368c904b4fedb7fe06dea726117d5efac033b1e42d19f SHA512 d13ef5798cfb3a3f197b47a32069b2eac9efdd25e11e6420947b9ed7f246479ce654d9c5602a91be77c359faf4ed082c4a062dcef07d655d76f3ac930ecfd9c2
-EBUILD kross-5.79.0.ebuild 862 BLAKE2B 3520fbb25fea611af96ec1ff481be967cd42b336f3e9c7778535d250a00c514e254579badb9ac9cba88e6be647f5a955914a1712546fcd8aff57890111dd17ab SHA512 9a4ec2e03cff5bcbe9124a63012bbaaa5e044de36501942130419401407aaee1a43da761ac53dabefdb3f2479e19ea1a7265d93bcc08bbf30278a9fb3e51dcf2
+EBUILD kross-5.80.0.ebuild 862 BLAKE2B 3520fbb25fea611af96ec1ff481be967cd42b336f3e9c7778535d250a00c514e254579badb9ac9cba88e6be647f5a955914a1712546fcd8aff57890111dd17ab SHA512 9a4ec2e03cff5bcbe9124a63012bbaaa5e044de36501942130419401407aaee1a43da761ac53dabefdb3f2479e19ea1a7265d93bcc08bbf30278a9fb3e51dcf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.79.0.ebuild b/kde-frameworks/kross/kross-5.80.0.ebuild
index 91bc4177afa8..91bc4177afa8 100644
--- a/kde-frameworks/kross/kross-5.79.0.ebuild
+++ b/kde-frameworks/kross/kross-5.80.0.ebuild
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 4620e856020b..4b9bc63db996 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.77.0.tar.xz 70584 BLAKE2B 4d1a4cc72034e67710a65c49abd1cb5f1306ec84c1d014e89531eac3754baef12e8bb4613083ec4fbc9b482a5d2cb21285dd334795711820f2648ba4fee48b91 SHA512 f2cdc6a17aa090bef96e10cf60107a71b4f06f8573291602dc1695aece8de8bbf412bcdd79ada4632788bb2aa6166df3bd913f03c3f9c9ee401f1d85b9a13207
-DIST krunner-5.79.0.tar.xz 74080 BLAKE2B d935c5448ab1be22b8aaed40ec820e6475b02130ff3402a806752d9387c6969a44a99bbf82cda21c230c204ba33c50cd3abf5048e6b89ed95a87fbae5a522872 SHA512 70fe5397d2303416c3e2a2970af636c43f9e9542ed0f9d4927d613113292ff13d9030b678d58edc74486e8de292d91c65c0c33de6ef208e9d0fab972116f9bc6
+DIST krunner-5.80.0.tar.xz 74620 BLAKE2B 9c82f676300fa6bcb85ae2b14055f82b1f06c1c80f11a78fb01085989263992e44fb8c743e14991d94653d0df956239ce77eeb51c81734d391de93bea8c165fb SHA512 71cc43ec6f52993c9a9d5fb6d736734af45b141fef50675a7825a1d03edadc4edfeecd52b5e229aa387a6bd28078cb887d63ecfc259f7b44c1aca1ecfd929d28
 EBUILD krunner-5.77.0.ebuild 896 BLAKE2B 58ae2a6171ca60533d6169732cefe6b5a496d1a9943478b5123425726d7d2be3faf16bcb1be396a1229478747f169295d242488965116c8ef855c50aad9bc2cc SHA512 5c8fc21cb4f958ab02990a9fe0c621f77cc8030cd5b5c975e0c4a1162fcdc445028370a5dd33431858a7b58d59f1c1f6fbe5c699a51ea7276bfe98ded442f859
-EBUILD krunner-5.79.0.ebuild 899 BLAKE2B d34ca347f224c60645fd74a7db635fac1f3b3670f54f6f87809ca1cee3f7d346a995448988ef488ae328ba21eb362f6ef207f450384d8c9dc9116e1ace1788e2 SHA512 61a449cdf6619fb9a411ea970bdf2099beb111419234432374be9ed80e4011ec5b41b1903574b391842393e88af9199b33d245c817d1765887259daf81910194
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD krunner-5.80.0.ebuild 1083 BLAKE2B ef7ad0855f11eaad21faa18e7c495a448cbabcb359ab3f1eb68872153a663af9662349f175be3fab84e0b361b4ada15f01bea173b520393de9be6b36d37a1eae SHA512 f1f00b3881d212dc8acaad8e5c503daddfd02e5c18943ea1175d917fc4a0c6b8275b207ed624798fa69c1bd40244405f1b23dc33951c651e142a64005734c2ee
+MISC metadata.xml 345 BLAKE2B 98483681a50512c1e37b502d7114c6f44e40d3c66ff33d858e4dd111cc0f6f4eef30fd51faae0b6fde2b3392ddab79a11d2eb20b904d0d309cb598c7bf6c874e SHA512 6fc972e21befa52a3fa494c63fd423def69d798b7d422bcfcbc142a1fb3f96b2e425700ada34f29cf78b69c81ebf27d51d180dad67c33aaf4942cd647d34008c
diff --git a/kde-frameworks/krunner/krunner-5.79.0.ebuild b/kde-frameworks/krunner/krunner-5.79.0.ebuild
deleted file mode 100644
index 588ce86da5a8..000000000000
--- a/kde-frameworks/krunner/krunner-5.79.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/plasma-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	=kde-frameworks/threadweaver-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# requires virtual dbus #630672
-	local myctestargs=(
-		-E "(dbusrunnertest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.80.0.ebuild b/kde-frameworks/krunner/krunner-5.80.0.ebuild
new file mode 100644
index 000000000000..414cdb8822d4
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.80.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="activities"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/plasma-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	=kde-frameworks/threadweaver-${PVCUT}*:5
+	activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/krunner/metadata.xml b/kde-frameworks/krunner/metadata.xml
index 2fdbf33d963d..185ce0bebb1d 100644
--- a/kde-frameworks/krunner/metadata.xml
+++ b/kde-frameworks/krunner/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="activities">Enable search runner for KDE Activities history</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index e45d231e1fb6..eff5d3d52a46 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.77.0.tar.xz 260368 BLAKE2B 2a2272ee9314fe90b09ced77ba9136af89c809cea8bf9875ed5d985f1bafd90e4fd1528cc58875b7e5e2d2d9f58869d482dc6b09f33eec2c6550baf52c9502cb SHA512 738a3cccca1b5ab71cc007248750d556b425cbb7afee03229e364521b6c3021b20609a4a30fe540ec723d435dafaa4fe14c4beba9d3fe3315dcd03716bdc66b3
-DIST kservice-5.79.0.tar.xz 261184 BLAKE2B 9855d902c34d9c4d11b711a738703fb6aaf2f74cc84c29c16f9811253ccc98db0c9f59d493490201e3922ac3df533145c521b81b04ad8083943ef69a47016b35 SHA512 4726c66b7d5a8161ee3e1f8aff3439165ba6f1765d72b0b6413e36f704cace3b8bf4f0fb251cc5ff085dc129affca7b217946d73fa918e7d8f0bf72fbfde1bb9
+DIST kservice-5.80.0.tar.xz 260900 BLAKE2B f1092669f6b7402eec71db9038ec57ab39d68d950165e6e7d60b009602bef357bae866f49cd98b644f9c81afada00ef5f7f758300179d4c8ddfe0e7fd7e55680 SHA512 28f612d1bbaefa15a7241395aed249fbb6b9c467e8aa3ae8ca8691463fc93b10a83da45056ef3057c2eaece01b10d14a56b6c1fd6842162ac32fd1f8c85331d0
 EBUILD kservice-5.77.0.ebuild 1044 BLAKE2B 9442897d2b19c90fa7bb3e3d1bdc1848a49411d681b1c64c3f6c4b2e8185d78e857044e297a84e98658da09ce1862da8318816951c49d9bf8de76b083fee4687 SHA512 8633c03c95300121b86ee48a96054f353318e8999a4a03f48138992543acc787708425d45dfcc55c21d61bd208ceba668628253893ce1b1c58eb7b515165c3b1
-EBUILD kservice-5.79.0.ebuild 1047 BLAKE2B 0e3fce9ba2808178fcdb43dff85ecaf3d49af08ef1f087039398992c4ec5f6fa24d8ab9e7e65201aebfc398f988a8617e7e7aad5b1851871f4843567b7f3503c SHA512 2ba15265d9284b03f2f2e189fd6c144b568dd0eb909921d49c4922a39c952d0502fdd20c84de9c692b6eca912a42821ff862e582fcb15688f179cdaa9c152954
+EBUILD kservice-5.80.0.ebuild 1047 BLAKE2B 0e3fce9ba2808178fcdb43dff85ecaf3d49af08ef1f087039398992c4ec5f6fa24d8ab9e7e65201aebfc398f988a8617e7e7aad5b1851871f4843567b7f3503c SHA512 2ba15265d9284b03f2f2e189fd6c144b568dd0eb909921d49c4922a39c952d0502fdd20c84de9c692b6eca912a42821ff862e582fcb15688f179cdaa9c152954
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kservice/kservice-5.79.0.ebuild b/kde-frameworks/kservice/kservice-5.80.0.ebuild
index b70e6261a0bd..b70e6261a0bd 100644
--- a/kde-frameworks/kservice/kservice-5.79.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.80.0.ebuild
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index f0892dc8df56..a824742b0886 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.77.0.tar.xz 2353716 BLAKE2B 90d98b046daf540c9ea873af819e2c02594b6d9190cb2b719d742a255ecf586392b47700de635f2a91df59e396166702490d562ec22e445adad75c4f35404107 SHA512 b07968b33bfb790516470a9ebc5f282fa6318589ce33db5d7e25c68c344fecc5ff98a45f28479b81518ab193db0f880f46372c6e00224fd9744551f8a0f19297
-DIST ktexteditor-5.79.0.tar.xz 2370312 BLAKE2B e772e2b93442309ab9f41cfaf68d130032f163242b039ae05ee525a2605d210202bd70744778ec1527a8176627bb09027ff8811c662c23850d8ef96b7cc24fdc SHA512 baeed1d7df37eaf6542e9218c1316c7eae6d65c0865340e4adf4e3d75bbe2ae3be640d7ec7d3d4e2379c522c5964e214a4ea710407e4f6fabb0d80b1dc8b2375
+DIST ktexteditor-5.80.0.tar.xz 2375112 BLAKE2B d052677f8a3b81b39f95958f48b7fc899a1c6591c327a852dfbe40269062a2876cf199f7679712ce1d612b2bc13f8e79f0379ca0600c1d5e2ecf12ed3d03620b SHA512 c6065e3e4c0f2bb59dd043109b3fbc2282e82b3d023011fe726693728257e6d9061cbd07fc23e97de5a73bfac9832b5065c0bbdd8be3f5d187788f6957753820
 EBUILD ktexteditor-5.77.0.ebuild 1589 BLAKE2B 8784e2b0b8f110baeff34a17328c4f7300afa73d6521cd1783a508719c5ce59f21a2dbc2ae9127e72a8d7a34c6a9624f4bc8370af7dd29fdbf0fe0cbe93e3a8c SHA512 bf4dfcf9ca68f6a04f63754c19158920e79dd53a18abcb0d8e26faa52fd3b8d7c2133f8b25d81ae3e65f3fb3dc82997b8f29923cf3e1e6d226173da1b524c9fd
-EBUILD ktexteditor-5.79.0.ebuild 1592 BLAKE2B c2b4551edc0e46384671f89b9bfae953298a13144afeed767d7df9b2150ae7654b7c05164c73dd1b1cefc3376a4c599155ca818322d3a2b07520d45c9fa84c5d SHA512 f65679b98514c6939fd78749d362620a7ec24809ee08d46ab3839cac2b351e6a4d664e4768fa8b4533a995e313b255f57c432c4f662705c3b678fc2e0e8f62d0
+EBUILD ktexteditor-5.80.0.ebuild 1592 BLAKE2B c2b4551edc0e46384671f89b9bfae953298a13144afeed767d7df9b2150ae7654b7c05164c73dd1b1cefc3376a4c599155ca818322d3a2b07520d45c9fa84c5d SHA512 f65679b98514c6939fd78749d362620a7ec24809ee08d46ab3839cac2b351e6a4d664e4768fa8b4533a995e313b255f57c432c4f662705c3b678fc2e0e8f62d0
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.79.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.80.0.ebuild
index 9212f04f8f4b..9212f04f8f4b 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.79.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.80.0.ebuild
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 81c56cc1f2f5..7d36d107eed7 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.77.0.tar.xz 324432 BLAKE2B d8141e2d63bc25cde9f35f0c4f2c5f30fbbb6c740badb4c7f684a085ae4ac2c8edbb6de652f16eb248be7c85c59d7e6018668e167f478a1e8e5d70cfd524ecbd SHA512 e7de1e69f2b9c9dee428d877788cbfe13d628cf555d552ca1b95f37c6a12c0519383426d5c81011a774c006c5f2c1b6ab617c4e686946e9369eb9315715a5307
-DIST ktextwidgets-5.79.0.tar.xz 324816 BLAKE2B 40c8935e78e4ed7e4526add42b3941d9cd3eccffd8da8702c8959fb4b596ce2451d9ee0b763d13a51a26569b3f255d9c8091d6b66bf6d2f83f688dbb23f0ff71 SHA512 40785ee4f136b8b14773c00f2812061918de885cfc345ad1e8fb5c94fa9b72adf2af236ebd5593d2d94a9e5483f085efcb008f0e3558bb25256e2bb48151c10e
+DIST ktextwidgets-5.80.0.tar.xz 325772 BLAKE2B 59723c843df16c555d9897651622cb4117f1b070da98a53ca47684cda5e494a2ffe5d21b7fd87f867298453d56c3661beab294cf0a3763db4a6f8e6a540a9dbe SHA512 38ffbf83eb40b9756e2393ec30670d524462f212fc15b0615b2ef9cdc046ca17f30cefa904bda2fa630fe94fd1e771a76e50abd9bbb5c84ace171544520e5266
 EBUILD ktextwidgets-5.77.0.ebuild 955 BLAKE2B 8c76a5a908ac4cd4773a0074e7f6bd7488ea6971fcd2418b93001dd9a9a899287b8ed8d122175bf28e6886308ac0343842956496e91b6f7f6c7542bf5fd36001 SHA512 e4dc1372374305660995f08ee3ae794e31ef9b3e8710be1d7550b0a000e24a198efe446606d5b2319dc856a5a5824ab641b37172ee661e24967a46cf44781c86
-EBUILD ktextwidgets-5.79.0.ebuild 958 BLAKE2B 7e1e90ce616ad15f6a390b581c16527489013a2815efd926aaffe4e1442d459dcc1d1d9a3b8bebfc4d55149c860ea95d4f67a4916c7ec2b87e9488de7d366729 SHA512 ca4566c88d5ee9fb20d76ed0b342de3fa8d228b0f4637d4508c96d4617857c0f21b69ced62d75cad40ed2a3973cb0e6b3ce419fcc9aecead48925e071e29ae7d
+EBUILD ktextwidgets-5.80.0.ebuild 958 BLAKE2B 7e1e90ce616ad15f6a390b581c16527489013a2815efd926aaffe4e1442d459dcc1d1d9a3b8bebfc4d55149c860ea95d4f67a4916c7ec2b87e9488de7d366729 SHA512 ca4566c88d5ee9fb20d76ed0b342de3fa8d228b0f4637d4508c96d4617857c0f21b69ced62d75cad40ed2a3973cb0e6b3ce419fcc9aecead48925e071e29ae7d
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.79.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.80.0.ebuild
index 0fdd8d60135b..0fdd8d60135b 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.79.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.80.0.ebuild
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index b9e9407a6688..22f609cbb716 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.77.0.tar.xz 860232 BLAKE2B 5dcdf975bd100f967f0514a1847c485cacaed116fdd7ba3e300c52835444aee5786764265f2c34c938fa0855190731e899b401a53e6eaa9837368f3237f737dc SHA512 3265ef1243ca5ac98fbefb69ad5c1b8f8a87132acbe5c19de78a9e83668908ce1c37b658163ce1e6924a7535e1923c8b28f705a68529ed96a7cf2285cb4c09cc
-DIST kunitconversion-5.79.0.tar.xz 860404 BLAKE2B 298ec185ff58d47fc567ff5ecb9e0b12c7cde843f18bc33a7fddd902f34d9d4f47c3c45024aa102e8434642ea3c0574a581534ff07872d4f5522c9c6f175f291 SHA512 5e5da7df63d4db1d42f830176ee26f68788b30caa8b700f2a7b49ae0a08b190871dad593600f54e0578531803d6421cc9555dba993d76868c6d0e5929e104618
+DIST kunitconversion-5.80.0.tar.xz 860568 BLAKE2B 5d7136fbfe18a6e500460b1f62a6c93c0048a7fadaddd80700c5d46c6be18ed86ccffcebfdab65056d6448fb3ab2d82d2aebe9ba21ac9cc7489f9f25f35972d0 SHA512 ad2509c262a6f60f0eaec9c2d77105302623dc602cb44b2c3d15b0cf3186c37a24d65e18def72857d69b26eb6684f7a6d033e0e87adfd05b0a4ebc7dd0b58a81
 EBUILD kunitconversion-5.77.0.ebuild 524 BLAKE2B 6d7fd759b5caf4ad9d6c75692e8cc6419153f6cf6c5751ffaa3bea81f4447ae175fc7c0681a3a108161dd102b42903ff95606826d22db3b3362c78a30129d1f1 SHA512 71e94d9188f6de39a230235da643570b4ef1f59a84bc08fb855b91a9d993b7392708af495a1c0ca9793b14b58e9a81827496e0f190aa0138ad9fada3f61e311f
-EBUILD kunitconversion-5.79.0.ebuild 527 BLAKE2B 1a014a291da9eed81208dfff2c41e57381319a12200d68096450f981756f816eadf8a6fa817f3deae1c3538fd0688522517fc63c592a2dd68d84aefbe3be242e SHA512 9218c4bf86c9f71160768a284cc0404b827a417aa258f9d688b88648ca61dcb829f6b7007e879adfbbe59dc8e42fb785b123863ca29810b5f41ef66e9dd33256
+EBUILD kunitconversion-5.80.0.ebuild 527 BLAKE2B 1a014a291da9eed81208dfff2c41e57381319a12200d68096450f981756f816eadf8a6fa817f3deae1c3538fd0688522517fc63c592a2dd68d84aefbe3be242e SHA512 9218c4bf86c9f71160768a284cc0404b827a417aa258f9d688b88648ca61dcb829f6b7007e879adfbbe59dc8e42fb785b123863ca29810b5f41ef66e9dd33256
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.79.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.80.0.ebuild
index 75a1cfd68b78..75a1cfd68b78 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.79.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.80.0.ebuild
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 0708374fea39..fa79ea7689b9 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.77.0.tar.xz 299936 BLAKE2B a9e4f773feab5532fade0c3a5d75131a7890bd45c1d948ffcbe4f3a46fc9adb213805d8ecc1b96445da55b1b7b2628abd0f4b5ae5af69dfe98474c4951a601a4 SHA512 761206a9aedc64b30e9f47666f9b703d4db28f68ede7b2576ee23397c41dd875f51bc7444d29fc0e5e137c517b4158fa435d111559f9156183615897abf5fca4
-DIST kwallet-5.79.0.tar.xz 300008 BLAKE2B 41cfcd5007085447fda3edd2bd4aba770beb1b7965bad4352e109bac92d0673fc1ab5b09dc9f086618919f02d6ac67d602f62990ef7a2a639d164a9ce81cf9d5 SHA512 20b3b223b009ba18cf569ac9f80ed03dbc08c9e5dd2c722de4cbbea11c6b29341fc9a4e90422e1a141e9b5a6b02641822ded5436963ce0da19a8a8edcd13a934
+DIST kwallet-5.80.0.tar.xz 300100 BLAKE2B 3f192acc7c432cb426dbfe9d83a409ca7da5974451ce185ec583761695b104f6a95414e43fe56d69fcbaf0d3f777b46b9700b1678fe72d509d0116064a49e3b6 SHA512 e815210f7c0911e849b0242ba239e4f5a2c95dc39af5a03cfb68abea1b2be26c81aa474678749064179cf6311f2710cc94c634e3acfc1ca6661789bd6ba4d33f
 EBUILD kwallet-5.77.0.ebuild 1409 BLAKE2B 2546c8688462107bbf0096bb7f7e45836da3536cea94b2418347a4591c2426b536ffe6c8f54830b29a7c037faaf197ba04f450bbf0e321679e6c589ae2ce2b60 SHA512 5a1557d31216235f8c48f5c90108055be01f1e1bc97d3dc1ec59395bf693f18d3a0188e4d19208eb1c9cab9c4b4810212f80a45ef831ce2a58fd44bada9e0395
-EBUILD kwallet-5.79.0.ebuild 1412 BLAKE2B 910e7aac1e6fe9fdf4c290160d5b0fd15105f91e1268b940ebaf3223979d65b0d96e5eec93805f7e52704b9b000c4453a0dedb40bfbdd09fb2596aafa32ca41a SHA512 9165c41af02fa276f291d6cd410eafe5f617814ca5fe7f128862e7e2918aea0393e8b1693f33383e929f7270fa606406a12f241efc09123993e6db753fd110bf
+EBUILD kwallet-5.80.0.ebuild 1412 BLAKE2B 910e7aac1e6fe9fdf4c290160d5b0fd15105f91e1268b940ebaf3223979d65b0d96e5eec93805f7e52704b9b000c4453a0dedb40bfbdd09fb2596aafa32ca41a SHA512 9165c41af02fa276f291d6cd410eafe5f617814ca5fe7f128862e7e2918aea0393e8b1693f33383e929f7270fa606406a12f241efc09123993e6db753fd110bf
 MISC metadata.xml 379 BLAKE2B 884224c9038659c39bd91c3a2a3b8707fc8ea50887fcf08c31f432a2f5d8b013bd8b466685332bfc72220aa6bae689fd4f02200b04d8d4de370c2a77aeea2ab9 SHA512 bf6ad732349402a6b60b88366e62e620fb6601c44d962a12b35125760161150e6bc53535f55ab675a0a9bc048c4bdb4ee1e8e3f6cba5e4d8ecef165c6a90c820
diff --git a/kde-frameworks/kwallet/kwallet-5.79.0.ebuild b/kde-frameworks/kwallet/kwallet-5.80.0.ebuild
index 6ca3378209d4..6ca3378209d4 100644
--- a/kde-frameworks/kwallet/kwallet-5.79.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.80.0.ebuild
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 565d3101e340..1ab28ab2a456 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.77.0.tar.xz 344616 BLAKE2B 9ee3bb1691884d2f69d4b31e4163c0b6c21fd8bb1d6fb6ac5ea28ef3dbcd9bf286c39da5914f1406e2e9645f2f09c14a9bb861b8e96c29911b0e2d2cbcb93c15 SHA512 f24df9225d6a3fbcf4627a1ea1292d971bd1ac8096777c3d79e306b808dff92ebcee34d6bcfa63e729575c873b4bceaeaa1d62e3cd848774f9a536171fae65cd
-DIST kwayland-5.79.0.tar.xz 344768 BLAKE2B 3c4179647da149cfa89ebd98b08fa153209520a4e1e08202d7d6a6a4ad0ae33247dac2b324f66244a3310c407c20665aae04cced566b169ccf02c3979c296395 SHA512 781d66c57615e9d9d2f8e5d51827359c1f22f75f42fcf20f9f6b5c4b1ebed4256a023ce0fffc65508cfd42880fae895ec3b5ec38a13d2fa26fbf5d17981cbe7e
+DIST kwayland-5.80.0.tar.xz 344740 BLAKE2B b373b27c696f6a0d13ab466f6281322b9d6e12982ffd321f055b2be2a6ae8b48807b7fb20171688ce32d93653762801e1e5169acfd438c228c022e12d903e84d SHA512 d681e7910a27c76925745dd508cc553a2ddb0b7cda9af150dbd59de3b69a19082e672c586b9e4de1da3fd8027f3aa8d85f36444a20db2604c76d7e407f269789
 EBUILD kwayland-5.77.0.ebuild 717 BLAKE2B 02f3b005e0e767222243b8081790596044a1ac019010b8b1db1b1f681431099861efdfa8e9bde4b8ca18c10d2b16abe6dd3c54978190136ab7af76b4eb36f4c4 SHA512 d80c84bdb69e5842f64792bb194c7a23e1dfe519a4c76a9bae5b41bb5cbddf27ce964cb15467a79bce8c748916e7079301f185a09dd60af130e25ceb6c068805
-EBUILD kwayland-5.79.0.ebuild 720 BLAKE2B df25c4d73966abacedb535bc639526d2edb9bb1cddfc203803561fee18bedc7c75720d889629e2cf1b227e22ec2a90aa302e59a497d3a43eda31cb5913ceee52 SHA512 543c82bc0a6bbac0c9318249688c3aa056a5be9e5fed7bc7f545ded8ec8c728059b01b634b04df9e65895b94e2c4e3561c38b78121ec18de8efe777a9fa1991d
+EBUILD kwayland-5.80.0.ebuild 720 BLAKE2B df25c4d73966abacedb535bc639526d2edb9bb1cddfc203803561fee18bedc7c75720d889629e2cf1b227e22ec2a90aa302e59a497d3a43eda31cb5913ceee52 SHA512 543c82bc0a6bbac0c9318249688c3aa056a5be9e5fed7bc7f545ded8ec8c728059b01b634b04df9e65895b94e2c4e3561c38b78121ec18de8efe777a9fa1991d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.79.0.ebuild b/kde-frameworks/kwayland/kwayland-5.80.0.ebuild
index ceafa4b3a455..ceafa4b3a455 100644
--- a/kde-frameworks/kwayland/kwayland-5.79.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.80.0.ebuild
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 7a2eae1a60bd..f7f5126ca7a8 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.77.0.tar.xz 2368232 BLAKE2B 85d887637d920ff28b3872ebb7b9619a9a0c534a8b929ea82b52ab9e495c951c620e544c1520ff24266bd863abdd716787d50bc4e178b44adfb09de1b5efffc1 SHA512 cc20226da1a6fa40648caaaf6a1bacc1ca5d373b3a5429b97061de1df1dc8a7c40943fe5e6eda22665429a8e9fdf007e9edb086279d551ee07e0712308455f15
-DIST kwidgetsaddons-5.79.0.tar.xz 2370748 BLAKE2B 7a7f6c85ff4d28a810e8647c4e22ae4b279d23434d3b6c297fadf9d889920a1f916f908211ee38590a5bede0fc513ed8ce7c14d531e6b2bbc89540ee8c81efe3 SHA512 a56744bff54fa870d0576ee78cf465fdad53f74c80bbd642a1e0d8e3d6052d727350bedeb7178948caa6f135580314679436840d03aa18184f7ff2487e0485a0
+DIST kwidgetsaddons-5.80.0.tar.xz 2367736 BLAKE2B 3c1d41223bfccded39068665fd45743df6c93f3d28f1524620005a1c3f60842fd0c592abc248054d199808f26b18ba16ffb7706ec536e9860877fef6c8cb0712 SHA512 b89ffcb86f791684e2e0ad06901cec5b235d639e423ad7b43b32fe59fd3a808ba2b6afeff2a7009bd9e03d9297b3fe8e4c04794048ff2da4539baccdbfddb8b4
 EBUILD kwidgetsaddons-5.77.0.ebuild 751 BLAKE2B 5078a0e7304c029ced0824910f8b9460c495a465e68106a1daecddff11a02af4f5cab9a092b2ec2e45633089a6421e81165fb9c915397cff181b61f21a0149af SHA512 55aac9e2febe9a7b11e50c063ed33e23299079c2b9d27d5df4ad15f5be22b6ab31fec170ba5dca39be6d722b45e42ebd7d575601a7a4924933fd5e1d0487dac2
-EBUILD kwidgetsaddons-5.79.0.ebuild 754 BLAKE2B 0d060205423c532f6157a5b14fbf0fa6ebeacc3f7e2dc304b1d08785955c25657324d8fe258bc0e408525bcdf082b0939695d1b78e6ef8e9f1da447711950900 SHA512 c78faa9121e1a6348947af4a56f21c6e6e0308ff59081ee56d8f9a9afb7ad9d96527f02ffc5d3cbb9a86e3db1f1727041735c18145348299222162ddf94ce5dc
+EBUILD kwidgetsaddons-5.80.0.ebuild 754 BLAKE2B 0d060205423c532f6157a5b14fbf0fa6ebeacc3f7e2dc304b1d08785955c25657324d8fe258bc0e408525bcdf082b0939695d1b78e6ef8e9f1da447711950900 SHA512 c78faa9121e1a6348947af4a56f21c6e6e0308ff59081ee56d8f9a9afb7ad9d96527f02ffc5d3cbb9a86e3db1f1727041735c18145348299222162ddf94ce5dc
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.79.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.80.0.ebuild
index e5034aa3abcc..e5034aa3abcc 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.79.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.80.0.ebuild
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 3a02ae3e34e9..8bfec81dc34b 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.77.0.tar.xz 177024 BLAKE2B 2120e1acd15169a407522ca61cb7cc7e553f06cd4c946d715ab3ed0de5e48b238237d882f465ef08714b7a9e0418909aceb95e288a65566e7e05ea56c4411402 SHA512 629d4833047a83bd8507e0ad71e0ad31cd608d4d193e525f9f85f459a448eda7dc0472b2a5ea8616dd637979136c65f9e1d995ff655951d98259e73683acb7ca
-DIST kwindowsystem-5.79.0.tar.xz 177116 BLAKE2B 4bbd96e47abf7e4fd467d8bcc4aae5dfd888ad3995959ca07d58bbae94332114aef4ebfe35bb5cccdeb539b230cae51b6d355e52ec90614a72a1ba496a673c78 SHA512 7dff05df4b5583cb6676f370d10a3c610a747fbf47ccfca2895d90551f66077ed9382399917c2d4d7ebc351715a50e3a27a7ddd61c38d840f56ec75647cc12b5
+DIST kwindowsystem-5.80.0.tar.xz 177340 BLAKE2B 9f659368706e0b849285758f103478078f15057170397bde3aa6ab0bc27390e4eee5d7e94900302be204c5e672618b48197581cf8459b0796a2dd92ee17e8e91 SHA512 a2e928568ca4ba7e5ae904888e273c8f3e7c57661b8a32246e22330426fa2db55535b96ec7b4e74681090f15f227586d282f3f077e44bdc3e0a86c9514f6151f
 EBUILD kwindowsystem-5.77.0.ebuild 809 BLAKE2B d55d9a63f343eb58c1ad3d848e70707e7fe63b1da699c861c9bdd7158d6cadd911d526e70a448768afe6cde467ba29f35dc214b7331028f9b7ec67e7b07b610a SHA512 ad3db1e024872d2bc0a9b2fdd1c32e103cedc15a90a55e0783fdebe25cf6295ab06cee735cc0eb5b46f5aefbc98021fdb331ad9740b9a2396768f129b6870756
-EBUILD kwindowsystem-5.79.0.ebuild 812 BLAKE2B 59d3db9a14bd46a266655789d696045aa14605a7eadfc8ee5946478ed669e819aeb963bcf6248324bd55c51b447376a797bedd46594324caa329a115921c78d1 SHA512 38d06953743b85fdd2539334a8c2c43dd128fe79650007dbec5a633af65508a7528f955c21020bf7d9436f582e90a9a1428b26e955c4bc3147cc138e283b2a5e
+EBUILD kwindowsystem-5.80.0.ebuild 812 BLAKE2B 59d3db9a14bd46a266655789d696045aa14605a7eadfc8ee5946478ed669e819aeb963bcf6248324bd55c51b447376a797bedd46594324caa329a115921c78d1 SHA512 38d06953743b85fdd2539334a8c2c43dd128fe79650007dbec5a633af65508a7528f955c21020bf7d9436f582e90a9a1428b26e955c4bc3147cc138e283b2a5e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.79.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.80.0.ebuild
index 2cac1d55d6ef..2cac1d55d6ef 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.79.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.80.0.ebuild
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 620419ec940e..8a40ca25a99c 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,7 @@
 AUX kxmlgui-5.77.0-fix-key-recording.patch 929 BLAKE2B c880e82e443f2bc4ca3df5a358843322dab68c2b47f075f5b25aaa9f9a5ad08820ecf9162c23d5595898ba15af3117538268a8db26cc0cd53bc3e43c822abf2e SHA512 66c5e6dcf10742c947b0da909edb762346e55111769c6481c0820bf45b8ccc5c4af8fe61a1f76072ff33b77d62c981f419555709348b49c68c2e36b76c3d3b78
 AUX kxmlgui-5.77.0-no-kwindowsystem.patch 1591 BLAKE2B a7034d980cd0c6106b87b3bf33fc719552af846648f3139e1604a4314e5aea6273c5dec73026dc3815e90f7c4355ad457e5dad99b65bbcac4df193785e7b1a36 SHA512 6395aaf426ac1ccde9f9cd14e296f92f00d8540e5a753ececa7cded09229a9131c733081e1d9d1a93fd03948eb2a9a4c63e0785e8d1c44a9d072674254694ac3
 DIST kxmlgui-5.77.0.tar.xz 860548 BLAKE2B c862dd9524698c5fc3f83933a20b229ad8b52c94b3b5a703f64518bd4e13543f46bfa2dcf85ed21a0d19c0d72e9efafe412f6cbf6698c14e4827ad4f38da6afa SHA512 bd0e9f0b41927f6e90b71328f5e680a9d83a9c9f502edefc78f898fcab6be3cf553409b63e117c80cc8541b7a48ceb66de49fbcc6e7c8afc33a0d9fd901512b0
-DIST kxmlgui-5.79.0.tar.xz 860872 BLAKE2B 3e6c8632fb8d6ba4aba7dbbe6c8a4072b733dcd92c340aea619c3b7e45f1f66f586ac5d7f6bcf02f1139a5122d50a6baeb7ec3102d8c68505c6eed62ef0079ad SHA512 b1e7b41ea55c56c9ad24aff714d31899d03806dca0a1adc3b49c33cf23537b61a6004023e59ff638a764e967f9ba3cca6af369b54b217e629d41dc17b1cedf14
+DIST kxmlgui-5.80.0.tar.xz 861784 BLAKE2B e2a3673594806100e416206cf108fe1cab5c0647f2b68eede7608dc0fb886852587f4e6aed8d25f7ccd97fcbe5eaf9ad313a52a36ace5eace7f6a0df0fb7ac82 SHA512 ae19b33329c3c371d1cc94c83ebdae5f02b95e0e3562fed915a4f7185c7d9c639b0a0d8afaef8cb06598d1c44c48595b3f7d7a0a10c8a0c555a8d5d923361a16
 EBUILD kxmlgui-5.77.0-r1.ebuild 1382 BLAKE2B 53102ac0e8cc851b1ed131954ba69678c942c10805505e35627873e738fe27c491294f5a1c54170ff0b716834f161a701cb1ce4a60abf80f04470e4c2187424e SHA512 092c3aa992231779e7b70e0689e441315847c49759cbfc8c46d45b03788383cf27be2b7ebe32d1203363d301ceff4ebeeb2dfb07550d9a812a659e8e7a2ed1c6
-EBUILD kxmlgui-5.79.0.ebuild 1285 BLAKE2B 9e08e818264e5f23502b2df9562cce838fa1f0ce8dcc07712eed24f5a1e8b884596bee891d0ec9377ed10f4b9a05c6798e1d109def42297c2be9178022f31303 SHA512 8a5d113c1e29eb30083b8d53bc6feaf51238c4a89674afdee23fc0c4a857dd3ce2d06f1cff975f99228718006319c5890b402abbf9a7de2c272cf23a4ecbda78
+EBUILD kxmlgui-5.80.0.ebuild 1285 BLAKE2B 9e08e818264e5f23502b2df9562cce838fa1f0ce8dcc07712eed24f5a1e8b884596bee891d0ec9377ed10f4b9a05c6798e1d109def42297c2be9178022f31303 SHA512 8a5d113c1e29eb30083b8d53bc6feaf51238c4a89674afdee23fc0c4a857dd3ce2d06f1cff975f99228718006319c5890b402abbf9a7de2c272cf23a4ecbda78
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.79.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
index 45acc6a3678e..45acc6a3678e 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.79.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 3975a2e06f11..d1be2feac3c2 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.77.0.tar.xz 112284 BLAKE2B fdc5fa89ecbe9c12654a7edd8275d94710f76c15e58914bb24c56dd3c34fc3674e9c5cc1722c020691a6ab3b4dfd17648e7f773c0cef79b5c62733a4cc474e99 SHA512 6fac1daf3246f6355473e94357f716f6b2875f715da3ade76c812db77bf1680ea1edd414e3d628d150479858eda05e0bbd02fbcc4f71dc3581b9fd12092d6549
-DIST modemmanager-qt-5.79.0.tar.xz 112344 BLAKE2B 05c73e5e62056a7dc9c45311b88f72e16907487c4c0d89d41527b0fbffbbbc054fa6657a0788f5d0e99614d985f674b1e2cd627021f5b38ac313d440d012969a SHA512 2899e2cedda00d98ebff4684936cb6aec2dc73df21f1a45ccbb6f2c7a6da7357286da33aac83b5ddf560270d1c64c2a9863a73a03f8b21c259f1f1bdf77cac88
+DIST modemmanager-qt-5.80.0.tar.xz 112348 BLAKE2B a6101bc598dd6ac9ba71022658444c80c69d042c77455cc4513d1aea11c0219b3b26b398ac249d35964f06074283d31948aae864b2d762b796ad38a3a88cc635 SHA512 a3cef63558040995ac80dfab7bb6714f03c8aa66c1b4c011333a67d35d9e969ad43c09f97bb522b859313ab4cbae3415da91cf9505bdd6ebac4357aa4369c671
 EBUILD modemmanager-qt-5.77.0.ebuild 466 BLAKE2B 65bd41fabe8a375438011e6135ac03585fc8bdff0e3fef6925ad4a17572f3e76ba1ffe0f42469949b6901ddab11d7a577012992c1a8bbaff3c1033af5af4a244 SHA512 f29974296df3f065403b7f962c3a9e746cf2201e3daa6d18f6a3749a452793ac417a91f9aea3ce7c9af28b08d199263f989c1bb75659953c564f9c9ff39b810a
-EBUILD modemmanager-qt-5.79.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
+EBUILD modemmanager-qt-5.80.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.79.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.80.0.ebuild
index 921f6471f11b..921f6471f11b 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.79.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.80.0.ebuild
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index f230edd00c1c..c7f4a91b416d 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.77.0.tar.xz 195024 BLAKE2B 9cc7573dcb2318e9437c57272d1c13116e5a30622b1915695f786b7a5e62dd3b2c32ff69b1dd3714c6e28cbb6b7a48eb40ca010b417d17fcf29143141b4530e2 SHA512 f5d7323f12c9332d862f5ce82a46b0e8fc594fc1efccbfbbe312e3b374792e300e06902f7355e0682559f6f1bcba93c139d9accfe0db31c524aa3383ae13adcf
-DIST networkmanager-qt-5.79.0.tar.xz 195032 BLAKE2B ac44f62ecff41b63b8e7edbf1e5a36c9a5eaea63f7520eb9b16fdbaeacb79d943180b7b5ab99665ab3f152b7254dbceae81e7e42fa4516739d297c215fe642a5 SHA512 4395c6a8d562daad18259e5a9d38585bc6f0ed87a41a84f3aff9aabc02462c9f11d3884cdb8a07c2898b2fe58a6f2d00c2ef693b60d4b89e5733c2ff3e580776
+DIST networkmanager-qt-5.80.0.tar.xz 195064 BLAKE2B 553a62fdea48c1d11b0a12174cf901d4dbf5441efc9138d1a0b93645934b14fd134922d60a3f95aa9c6019306627c2b8bca1ae8a7b2063b6d394e5a1412844ef SHA512 df36c15cf19a3a77785ac5c231de91f64b1380df2f84b3553bd0869f245a22c1bff0418485a1b1e22aabd19c7dd2e73e193530d60950d599a08762abf9f22e2d
 EBUILD networkmanager-qt-5.77.0.ebuild 651 BLAKE2B 48b2ea8bf8c31a8ade620f366b384e15b38886d1b6246733998046f6261a8e97636d6d176a933608b6283b7c388e4784bdcf315b89ddd79823c0073b9e819355 SHA512 d05d8e7d01eee24b179551867feb343e9d0fd968ed7b69d21e56f038f87f3ba675183cb5c8030afb9766f5fb8e84a64a5ed5269763e69af94d2ce8dbfbe2e35c
-EBUILD networkmanager-qt-5.79.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
+EBUILD networkmanager-qt-5.80.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.79.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.80.0.ebuild
index 23b69f5bf65c..23b69f5bf65c 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.79.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.80.0.ebuild
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index d3056e120b0f..a76a1ed37767 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.77.0.tar.xz 236037064 BLAKE2B 4d1c2347f214726624a7595fbb2813640e0cbe4c24017664ca74ef46c57384bb065898e5225978136f23a2459d7ec3ec04e01bfa4fb1ee1480bdfd0df9ca270d SHA512 a04b0638ee02f2f1b2d306bcde9767b3b0b5d8068240a029507a92aaf8602cf99ce61a681dad93e0abbedf81295d77665b1a19a558c949323a111b4ac72f4dcb
-DIST oxygen-icons5-5.79.0.tar.xz 236039344 BLAKE2B 8c3fc3c178742f4b0fa984239f3802156f8a5c1e6453845d9b9ea010c750a6bdd827bf1117390e56f3eee730eb455a7110e158f8b655bab7b7f9a9e8a247433a SHA512 c33265aa5371b3e5477c6c37d847ddf87299db711c48ae7f72ded9e9add0fdaa354d8ae0bbd5df82160aba64004e592da1bdfa98603ba60c3956cd829d5ebb41
+DIST oxygen-icons5-5.80.0.tar.xz 236044748 BLAKE2B 1efe1890e207726e1b85c17e1c6815df9d444d027d7729b57e0da2dfe15565015c7f5fe806253541c0c07f142e85578217122c4ff2ea285a0a6a8d64226585c1 SHA512 00b88c76e7c9627011a6971dade33aade5ad3ff2aa6c4298ff52221307da90d47aaabf8360a1bfd178d6016d5fc7ee69cbe1f10f4392bd14ffd075ab6dccfbe6
 EBUILD oxygen-icons-5.77.0.ebuild 688 BLAKE2B 2010949f52ea4baab9667716fb9ac539a04129f70bea6d52ea9cfa030fbc7a070a1037e69a590f902dd1a9fe2cb56b19f0bf1f20d88878b63401919c5d59c8bf SHA512 06db743a9f26befb8c317cc16198d814f00e34b9dbaec001931b7a7a74b0f65d79b6a0b4001c7f7645ab912a357c4e0f193fec51c8b495a79d609cb8da4d23d2
-EBUILD oxygen-icons-5.79.0.ebuild 691 BLAKE2B 0ec80fdede0b27db6a87707b385a6cf12e9f44953961f39d945cf819c64be05cd8b3c57c58b88d358f27d34f9c9fb4eaaa514698567ced1c58dc77cad0acbd32 SHA512 eca98e944f5720848123c71e2825a014dcd448da03dc761689b79c46fa5ff53f462ba203d1b055cf60da5581c77ef8b5ca4cb1a595f1ec0a2d3bea3e3e26f760
+EBUILD oxygen-icons-5.80.0.ebuild 691 BLAKE2B 0ec80fdede0b27db6a87707b385a6cf12e9f44953961f39d945cf819c64be05cd8b3c57c58b88d358f27d34f9c9fb4eaaa514698567ced1c58dc77cad0acbd32 SHA512 eca98e944f5720848123c71e2825a014dcd448da03dc761689b79c46fa5ff53f462ba203d1b055cf60da5581c77ef8b5ca4cb1a595f1ec0a2d3bea3e3e26f760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.79.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.80.0.ebuild
index af70e891002e..af70e891002e 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.79.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.80.0.ebuild
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index b420dde92e03..29cf4d8e42bf 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,6 +1,6 @@
 DIST plasma-5.77.0-fix-broken-background.patch.xz 3732 BLAKE2B 19c656de212e3b2162e5f43e6ee2aface46d9169169179b6ac8af3eee01e64ec54139ac0001a6009f2a6d3cc4a59775951a3e10e8c33c7d04bf2b78543564137 SHA512 a262bebc754102709d1b41a2e5571938e58bfbcfd027dce9d0c1dd5cbdb8adee44a1c18b716976dc36d7f55b1d7e16d0536615e9f2895fa62eebb5f08cf05098
 DIST plasma-framework-5.77.0.tar.xz 3152748 BLAKE2B 717d620fd5249887d47bbc6ed8ec42f103b56c4e566b0baae3624e64403b48977b5d36ebdbb30b52ae6cbec7694645050cf76eceaf6ab28c3690bcafcf8c7a07 SHA512 abcbb0b5bf063cdda728b0fc03f0d51f0ad84b4c45fb428efe54556aeb27b4cc3c488244ba0f7e3a435c31e802551d09f758bde815ca0a5aa43cf18e916d1ea4
-DIST plasma-framework-5.79.0.tar.xz 3154564 BLAKE2B 0b323a2e32407340450f63b4fabaeeb1f6292e9d4715fa9ed36dac635ddc6ddb3588c1485bb42e411e8e32219fcb3cabbd7b8a9b840a1abda5f0f2abbbc365f1 SHA512 ee02d603b1272003e5c50d5e08a56066a2254e0c520af6f83bf1893e8b49728e556e4337c75cdf47c0df088ae72d67b2ca8edca172fa4c3871016d17274b2bb9
+DIST plasma-framework-5.80.0.tar.xz 3157460 BLAKE2B 46042d7f0809f866d867aae9ebc7590c1ce04c30a3396c81913a5c890aea96d0766b48018799a77a546ab3b3b96baa8b0eb80e86032dabdf67d686814e312e91 SHA512 6a0920a3a0e97b3775dbd3d5fe4ffa32bd978db73fc52008f3effebbdb54d27b048ff758140238d25823864111aef404d1604854d204b54440bd4c52c14df7c2
 EBUILD plasma-5.77.0-r1.ebuild 2035 BLAKE2B d1622a2fbe5566826885a46236d2129c19a1d21464a99efc610c5cd8980431f7d33147417f7c417ff226169c98992ff2afa5f94c7e5cdcf737e0efc58a087c7d SHA512 59e55e49745464b6e78b65c1f1bbd74161e0cffd74c8eeb18e397cb829f08799c0a1709da88d6176967b3b1585ea887e31d6d617da235c6019a426e0eec93623
-EBUILD plasma-5.79.0.ebuild 1873 BLAKE2B 61ec97aeabbe98de2cb75c2d4c024594663449c0ce1539f938dddf100794ae0581792e740cfee737826d7ea839b712b62bb340169b8b45d4eb8deba0950881da SHA512 9696abd6e13747f68cd9ec1c7f61839d55d36ad93d960d31da2094f5edc7dbf07107f7af8af04b16943e7f3ae7e544b7816277c2bfebade1071d8e29b8350f2c
+EBUILD plasma-5.80.0.ebuild 1873 BLAKE2B 61ec97aeabbe98de2cb75c2d4c024594663449c0ce1539f938dddf100794ae0581792e740cfee737826d7ea839b712b62bb340169b8b45d4eb8deba0950881da SHA512 9696abd6e13747f68cd9ec1c7f61839d55d36ad93d960d31da2094f5edc7dbf07107f7af8af04b16943e7f3ae7e544b7816277c2bfebade1071d8e29b8350f2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.79.0.ebuild b/kde-frameworks/plasma/plasma-5.80.0.ebuild
index 30849cdadab1..30849cdadab1 100644
--- a/kde-frameworks/plasma/plasma-5.79.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.80.0.ebuild
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index ad9731642da5..97dacfd4b54e 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.77.0.tar.xz 40940 BLAKE2B 514f0012fe8847438acfc21181e0789c2d78a0b1655aec9f618c15bf73bf33faee39db567161d5a0bafa5a5b3e29e68dcb5b8bd5afe2ad3bfa23fa850b063296 SHA512 3aa9ef9e84736e07bbce43f709169b159aa8bdebc33e65d6300a98ba9d45d1e6bfad111edafe5d38966eb21f6c799b3af31006a288e3d573d872c90f9cd7d082
-DIST prison-5.79.0.tar.xz 41148 BLAKE2B ca255c21ac9c58e149a128d72a300b8412abf4e0b4c70a490cf1402dd9b141c625f9455ee1efd4644208eb9121007cddf42339978346e15ed7a8a9bf7ea6bc63 SHA512 25b7773b1298dcda542f8671ab256add9a8e896ba0d9706233983e0d374541e1ad2f717724174982345e517712efdc8c9d746b9f830ba9bf185358e106c361df
+DIST prison-5.80.0.tar.xz 41088 BLAKE2B 210b52cc49cb218d5cf76fd5b50622a100eb3b05eb0025468abf5e473a64393514a50c84f397ef08a32c2e069eedd062af0e7432be3817a6c46828190c5c379e SHA512 2b82dda139612f7db56219b3798528ed1a9a85ce9d459d979f5b2e8e5367c8d52f913e2f806ccdc7188f70dc8b2d07d235c81e950e648c4d371f0bba40fb74ae
 EBUILD prison-5.77.0.ebuild 613 BLAKE2B bba194ed4537ba6d72c62aba5062e77684f64d8c7dc0f7b672271648311d4afdf5d0cf21730e82a9fc90765069a9abff651de751fa4f33a3cd2ff6b0385b84ce SHA512 c17a03b24c923bcb702e1be80a02beafc4866eeef7756286312ec12f1f95e0b296c85a397a4ec32b6a1ef40fa2f86be1f54236f036801de493b8230ee9df5b10
-EBUILD prison-5.79.0.ebuild 616 BLAKE2B 8c622d0ae0205676ae04e35a3656e9146ce5990102815f934195baf8044d81454ec7e77694822eb5ccb7163e9b259d986eca4a824fc305580f9ace98bfa2aea9 SHA512 dc673ffe18fb826a19988e1a4f54173205442ecc12bede9c185304bc4676b5c384f159ea375dd056ecd7e52436f968b9c85a940fdccc05d61b17df23822e63ab
+EBUILD prison-5.80.0.ebuild 616 BLAKE2B 8c622d0ae0205676ae04e35a3656e9146ce5990102815f934195baf8044d81454ec7e77694822eb5ccb7163e9b259d986eca4a824fc305580f9ace98bfa2aea9 SHA512 dc673ffe18fb826a19988e1a4f54173205442ecc12bede9c185304bc4676b5c384f159ea375dd056ecd7e52436f968b9c85a940fdccc05d61b17df23822e63ab
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.79.0.ebuild b/kde-frameworks/prison/prison-5.80.0.ebuild
index 6e96700d651f..6e96700d651f 100644
--- a/kde-frameworks/prison/prison-5.79.0.ebuild
+++ b/kde-frameworks/prison/prison-5.80.0.ebuild
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 561702548fa6..7e546fca7f48 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.77.0.tar.xz 158016 BLAKE2B 51e26b284bbeb8ac07690f4b9c571f58b89c977e87a5bdad8f56a5aaacb69b2d1130b08169fcdc7848925b1811d4e632e4c3e9c453e30482a4ed80c4d329c81f SHA512 61261ae4d5ae2327100629ace3e6b2cade9b2894bb21e817700a1265c5283b13a6f828bec47dfd8efa118fadad0f5cc89cbf8fd3e637497dd68345eefaa53956
-DIST purpose-5.79.0.tar.xz 159496 BLAKE2B 3743b29591663a4f2e3d5b8ff0e1ca7d236dd9aacac2759fe7f3e7c52ba2cd2e7f43627c51bc45cb33cfd4f7dc222646bfc0b937d42918bb92caa78b045e08d7 SHA512 e9e61f06013a47ff18ade96f1d43465026f07a5163fc443c21c2d9bf9d56435a121a8f7ce8c3e554cb2c0ec1d80795907ae8199a0fd5b81e59f5fd6f32b2f0e3
+DIST purpose-5.80.0.tar.xz 159308 BLAKE2B e7467c3ca5a39c2482c470aa55debbb29b3e0457271a9f126e4b68dc1c48db245bb1d7adb73fdff6f3bdd044fb99557bc08cf2a72de5cab998dd7a9485002641 SHA512 3746e66f0587ad0b7f62f0c262879a6f2f8a58af3753f6c4a1f28ca4996fa40ad63accb5d024fbef1269b137b45c38234cde0bfc5a046cf1c66b61064a7809b4
 EBUILD purpose-5.77.0-r1.ebuild 1654 BLAKE2B f243e023a17dba7d35125cd5fe5ffd19046c8e019d9778e6e470bf4869c918911149148ad96f6d40bb085f722320a0368f15f6064c7ee0f17b60492d54e5a38f SHA512 dab47c4c94e5ba43d8c5c115f43ca1f38c410d3edfac5922f681d4399ebd9b2d60959ee882ac5138892cc80f76f1620ff4ffaf87973d20fa575201936dd167f5
-EBUILD purpose-5.79.0.ebuild 1582 BLAKE2B 7083dc473b1afcbe395b9936b60388024dd3fd7ed0fd495dd86c1dabdd0cd0dfdeaa1ae405aff4f5e2e942f95c112892b3c8f462cad7ab336f180761a4e37ea1 SHA512 fad12fb6905af0379cbebe9e0fec15b75f24f3b83344647273474a3243e8e2d3e5a7b72139184b048812488d42ba5ab1035ec9b198754c3529f8c31138852b35
+EBUILD purpose-5.80.0.ebuild 1582 BLAKE2B 7083dc473b1afcbe395b9936b60388024dd3fd7ed0fd495dd86c1dabdd0cd0dfdeaa1ae405aff4f5e2e942f95c112892b3c8f462cad7ab336f180761a4e37ea1 SHA512 fad12fb6905af0379cbebe9e0fec15b75f24f3b83344647273474a3243e8e2d3e5a7b72139184b048812488d42ba5ab1035ec9b198754c3529f8c31138852b35
 MISC metadata.xml 441 BLAKE2B bedd6e101cd0b4233d383352c66125b30508c7bbb5f597bdd6854e02b89004e2e9aa968de63357f58fd5e196de40b7f1e4816572f828a7cc5307a657125bf21c SHA512 7d5fce42c371a15a6d05866d5d40436a05b8ec34538ce5fab7d4f47a9dd6ae4312ac4096e646df230ee611bddd040f58fa93f41688517b4205d3785f1ce56acc
diff --git a/kde-frameworks/purpose/purpose-5.79.0.ebuild b/kde-frameworks/purpose/purpose-5.80.0.ebuild
index e9607e015d71..e9607e015d71 100644
--- a/kde-frameworks/purpose/purpose-5.79.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.80.0.ebuild
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index faec43b3d68c..2065a2a8ef2d 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.77.0.tar.xz 59812 BLAKE2B 2e3bd046635bec99fe89a20975edf3ed9132836fe3db792236233e2942d58ebb35b48697e3f0582d012ac7a1d995cee58bed9b5167c0e66b6f4f923a32d30c81 SHA512 de8a24912c6de97b23c1e48cc362148256d9cb3284078107ff900af80224752cc6ec9ad568c4b65afe4c36a937dad7040eea19aa2bf4fa5d3047d4a60626cc14
-DIST qqc2-desktop-style-5.79.0.tar.xz 59980 BLAKE2B 8ecc568baaf8cff75f64015f4bfdadfc26cb18581987b156de88932f72ae569c44126736fb7a9e6b6f685797822f30b833ef0293704c294d46499b98e5181663 SHA512 81dce112937de372d43d511ef48d002e5464788f33ce4ce1710446fe5ef87d639afc95ca0e9be43b5cff7167b8b36e661d321c14f990fb6e0a8bb7f2233c8d95
+DIST qqc2-desktop-style-5.80.0.tar.xz 60092 BLAKE2B 9f3cf0859aa0f40ae3bccb8c762d2ddac244d197c06a4caf22a22cb824173061fb922f0f098410dc94edafbddc03784e0cda695ab1f7be550014fea9a0a391a8 SHA512 c5c3be2f8f1257a978136e8a3ae9942bbb5389411338a8d50cde34ec1a007d5c16acb8e0ce755265b0ba088bd71cdc0966ffab44a541c3bc7895ce2f56ce33c0
 EBUILD qqc2-desktop-style-5.77.0.ebuild 677 BLAKE2B dd85a5791e0f3ff3ccbaecb32c0cab37e8325d7a2a11e9136cf08456bf10b63ebcd08a290d399798f2dcd70f91ebffcc26a18f8dd8240f5f6f5b5b03407ac79e SHA512 37fa1a65f5c850caccdcc191ceb5954537eb8a294f94ace65128a8fb5a622ccd330f2bca2d42e1b9c195989386f5bd5273ec28b6b7c163e331d2deebad7466a3
-EBUILD qqc2-desktop-style-5.79.0.ebuild 680 BLAKE2B 9a6acae40e7e9fcd28267bbeb3b9c8cf903edf5848eecd60177b242f6f62dd5b9f5d0812fd86e4df35c350b154ce3002644472e81c97ac64311b1ddad8a680f1 SHA512 7d741e16d0c92702da9ea226703e8cb613bc3a6314da726e5f5a19512a3cb339b00ef459ed28f95cde2592e0341bb8edfe003d1fb9e0ab436af0d536c64145e9
+EBUILD qqc2-desktop-style-5.80.0.ebuild 680 BLAKE2B 9a6acae40e7e9fcd28267bbeb3b9c8cf903edf5848eecd60177b242f6f62dd5b9f5d0812fd86e4df35c350b154ce3002644472e81c97ac64311b1ddad8a680f1 SHA512 7d741e16d0c92702da9ea226703e8cb613bc3a6314da726e5f5a19512a3cb339b00ef459ed28f95cde2592e0341bb8edfe003d1fb9e0ab436af0d536c64145e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.79.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.80.0.ebuild
index ac284e1bcdf5..ac284e1bcdf5 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.79.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.80.0.ebuild
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 049d5f35d629..a226652ef7fc 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.77.0.tar.xz 273792 BLAKE2B 07ce3824058558097c205d3122f98eadb4ea4ef3ebc9a58932aa0878d1d609ff5686aaf7a375616ac98c6078ac0a4857f85d558741c6d3f59d21afcd03aa9195 SHA512 bad8d9847cecef1cf7ceb46b6e766658ae48893d606df004d531da4347a8fdf7d3619a17c6505a0cbcd5b78c632f325c3fd8d766e8c512dcdd3a5c9d89d61475
-DIST solid-5.79.0.tar.xz 273496 BLAKE2B 1ab4b5dc62caf2ced27cb1f786c3a6f4ecec8f08edfeaa438d69d5fa52e5499c6be921bfd2c37040d70e6f87a636973588443f4ce44305199c5ebe46fa24d0f2 SHA512 4db08b74b25e0ae0ee97d056e14c9743aaf7c9d32958bc83d2debf39aeda2fb32ea2e0324e788d26447a7927fadb572dc11e84e79a58ad55895018b040baf13b
+DIST solid-5.80.0.tar.xz 274232 BLAKE2B 0c080aa9b63c86465dae8fb101ec5548d00b9f207e1aacf1e384071072f143fed7b46e5f280ab816afe80844c7c2e4b4bc97594f3da18f1f8bb38293d86fa599 SHA512 8826187f729d435a64bd6b18888d48a87a9c2e910a2b91dbe081212a3bb0be5ff956190a6fb1337d0e8544d54923a0dafb4971f5dec68c2fa9adf66939a22cdf
 EBUILD solid-5.77.0.ebuild 1070 BLAKE2B ddebd5eda292317c5e7e6af418c6948adb111aaabb9f38273928634082f682596ce551ac7e4d7702076194ac9755db1ff93ae7fee792ef88f20ffd02c5cae062 SHA512 8699596df57e0dbd62c7233903416ba2621e8a99bde1d999a76a3127efff0120cb5620917eb5b4fc71e18cff13a37e38049c01081ae02d0d01ad65390ecf2702
-EBUILD solid-5.79.0.ebuild 1073 BLAKE2B 0dbd09dee6b3aecf4cf66e1861a6299cf4941f671bbc7ae05c90c4242e45c10604506a277f4a8a0d914518aa0cfa7547ac3ad2422c3a8583a5ab4d0ddf2d5fb5 SHA512 3602db1796f90c014d410070e5f3a8f6be37dfa9d363079bdfb6d910b66fad97a7c6ca375ff873fecad675ab2abc1b3acc3498d3f5b3d0880d647fb62be06829
+EBUILD solid-5.80.0.ebuild 1073 BLAKE2B 0dbd09dee6b3aecf4cf66e1861a6299cf4941f671bbc7ae05c90c4242e45c10604506a277f4a8a0d914518aa0cfa7547ac3ad2422c3a8583a5ab4d0ddf2d5fb5 SHA512 3602db1796f90c014d410070e5f3a8f6be37dfa9d363079bdfb6d910b66fad97a7c6ca375ff873fecad675ab2abc1b3acc3498d3f5b3d0880d647fb62be06829
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.79.0.ebuild b/kde-frameworks/solid/solid-5.80.0.ebuild
index a22f1f6a95c1..a22f1f6a95c1 100644
--- a/kde-frameworks/solid/solid-5.79.0.ebuild
+++ b/kde-frameworks/solid/solid-5.80.0.ebuild
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 017e564e70e2..3843ec68257b 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.77.0.tar.xz 294360 BLAKE2B e0131044b8ea1e5dc4c7508bc661b5ce61c95de148bd95ae1ca68d0b04f43db64ef4c2e330466bed7de8ccbc2e8bd31609d13995c75edaa41ad9c5407131499d SHA512 f453edf4e4becb2e4433ace3a2251f7261d4dfa549a70877fd46c37432fe6e117e542f4db1331893bcc4ac22ed99bc620e5facf03cf783a64a19ca76f7783df0
-DIST sonnet-5.79.0.tar.xz 294672 BLAKE2B b5636a5e400bb7d0ce9ee616461db2aede6aa75d52e0e8b6cefc0fcd6985ed614dd43d1447a0bd90382849008201b92a4d56be50f3a99c02d73b8a4138ffffdd SHA512 dfefe2a96ea2b700421086fe769a8e25447f4bfd6be19517ade1f7743feb5478c93dcf9946f843598f31a92ac0061cf740a39b7978d97b24f754f9b1f7abd920
+DIST sonnet-5.80.0.tar.xz 293860 BLAKE2B 64d800fa0740cfa65772ebecaf033a275be7a0b9d9e9e94a38647e44f17166836788995b64f0b11b2aa9fe319155437cfd0e905071ddbf5b52270bb5b8030c3e SHA512 703f43e6498927c781126ca556cde6034314501dca7443466bc86f78f06736ef01cf1846d888e490c88d38ccf449cb4e759207a66f8a09300ae7b4e7ac6a9f88
 EBUILD sonnet-5.77.0.ebuild 880 BLAKE2B a4e381a7646bc8dd08f579ff8a21953addcec18d8c3b8050a3e3b22f91e70e39ec5607bbfe9fe4f150a09697d83ba0db7faf383d6b35d26fb3b6f13d28ba8c2a SHA512 a06f7ebe6b4a95e74229f3a4e902a6cdba4eed584cac14c27e0b38caef737659e5b31a93d6ca8930fa5d2a5fbeb21c69dc75ac17d14010cef4aa086178fbd174
-EBUILD sonnet-5.79.0.ebuild 883 BLAKE2B 0b9340a13d67967469e15af0cafb18bafd9b0fe4a5dd09cde4b4748959ad32c1291fcc2d591fede9829e53efbbb22e018ba3531a2448c91670e9e3e232ca4f96 SHA512 815ec340330b098de6a11eeb05b0305d6aefb0488c9445820516021dc32b30a4a6f21d307bf2c41965ed03fcdadb4e41a51ca86b4a692aad824ed17e02ecc560
+EBUILD sonnet-5.80.0.ebuild 883 BLAKE2B 0b9340a13d67967469e15af0cafb18bafd9b0fe4a5dd09cde4b4748959ad32c1291fcc2d591fede9829e53efbbb22e018ba3531a2448c91670e9e3e232ca4f96 SHA512 815ec340330b098de6a11eeb05b0305d6aefb0488c9445820516021dc32b30a4a6f21d307bf2c41965ed03fcdadb4e41a51ca86b4a692aad824ed17e02ecc560
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.79.0.ebuild b/kde-frameworks/sonnet/sonnet-5.80.0.ebuild
index 83a586a6c920..83a586a6c920 100644
--- a/kde-frameworks/sonnet/sonnet-5.79.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.80.0.ebuild
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 7db8864c8777..f469f2d285f5 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.77.0.tar.xz 508860 BLAKE2B 083f3532359b015c6ba5a6853047639d73a920b8fddc60aec9c7e3daffac2afd606facd58911caec4b76e723633bc9f48eef66c392448caf97aa7ace85851a70 SHA512 98f452464f8b777bde70b62340a8838f5e3f9be87e8a7300519685ca7b962f3e4b668f810ad81b0e9eb3cd86bb824dee079b2d2ac0b22f1fab9f64b8947befd7
-DIST syndication-5.79.0.tar.xz 508876 BLAKE2B f1402c85162bf1e0be78a9a6d089c736f9cf33cb1ea3a595704de5137ac6e8653b134bd5d9306032cc86c5b7aef994601e8bbef0cc275d3fbb4e18a7750d2e48 SHA512 0476abb925878e73eba7e9d4b488c8045ef507feca3cbb973fc715322ac6e5b975270547d5d5a9e1842b83c75cc640415e5f816cf706583638a0a8763e05dc3e
+DIST syndication-5.80.0.tar.xz 508592 BLAKE2B fb6127514ae15ec952374b066035b26cf48323949a99ef6b66fba8165b435688251bccd38c5283dc683806d610dff812fc8c125221b74968176a911c517f132c SHA512 913631280479682dd23118b4a1f464930a00546c12f283b2dc9fb1ab96b33b576b6d5fbbb82477d26189ee8fd376842104269fb5a05ff54b16447c7ae3ed651f
 EBUILD syndication-5.77.0.ebuild 472 BLAKE2B 4923db5c989da553939aa5a58bccd7b07d1357101f0a5a0a3fba67571760180ecfa0f3fad8b3433ff0fea8d92797bc426f1c293fcc938eef46c75ec53e992007 SHA512 f75537e4494a0404247d4c00962b88e1f77e747e77efc811188c060c6a70754bb7b5db4be283c120b3873f9474ced2cea1451e300c09aeac8a9b91d9c7455841
-EBUILD syndication-5.79.0.ebuild 475 BLAKE2B 58d3a101497cc4c5ad7f689343b5b7081c9dfab85e42cb5e5074d359cf5cf8b5adb359106d3405ec4120ec335429d320b71530a53b77761466e17fb4a4a24ce2 SHA512 79c78e1a1237bdbbae14b8349355c9726227ab32a5948aaf6fedb3a0e71b999497b67d53eb1fbd0ab6346764d6e1fc07f05d82668a175eb59925835dc4c34e68
+EBUILD syndication-5.80.0.ebuild 475 BLAKE2B 58d3a101497cc4c5ad7f689343b5b7081c9dfab85e42cb5e5074d359cf5cf8b5adb359106d3405ec4120ec335429d320b71530a53b77761466e17fb4a4a24ce2 SHA512 79c78e1a1237bdbbae14b8349355c9726227ab32a5948aaf6fedb3a0e71b999497b67d53eb1fbd0ab6346764d6e1fc07f05d82668a175eb59925835dc4c34e68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.79.0.ebuild b/kde-frameworks/syndication/syndication-5.80.0.ebuild
index a87fc4d19909..a87fc4d19909 100644
--- a/kde-frameworks/syndication/syndication-5.79.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.80.0.ebuild
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 3536c70e675c..ad82d426e512 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,10 +1,8 @@
-DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97
 DIST syntax-highlighting-5.77.0-bash-zsh-fixes.tar.xz 95008 BLAKE2B 9fe2a2121687070f176633334ddb853f4d34ab6a5dbdff69f081d8a79785dfb1b989feb564f6a7304a6c008e4a79df8091e3e89b3afe6c5f8e6b1ead676f7bfe SHA512 e2ea8caeb75f8cf2b98060f44d39db4019cdca9b318dc7d34b538fb98659a8f98b0771a89ddaf57d35f9a33e9643dabf4eb16ce218538f1680df4e306640bdfc
 DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9
-DIST syntax-highlighting-5.79.0.tar.xz 2260708 BLAKE2B b5992ee73b12c15c8a2cabfdd421f51a0489ed6a4e47b0097ac76d3679e25c15aafa272abb0ecc0e74ac5612aa85e7f1f665527a66b02688cec9d1cc9d501858 SHA512 272c526b27da2acbdef04b4535c66aff36531221f9e7a8d0781fb8b066b4ce331e6ff31170065dbddcf9812856cf6bb531a7486dc6faf82854653f00bb5a46c9
 DIST syntax-highlighting-5.79.1.tar.xz 2263840 BLAKE2B 654b4eaa7369bafa2c9dbc72acf88c19c86827f1a3926c093caea72d538bcdb32cdf6d5d4f71080c9ebf3482f865693bb6d4d257b2fb55945f0489e05f389dca SHA512 50c44c2040458c3e330ad9ec6956b0bb55fb88a3936e46ed758e5bf1f38efaa051304db80e26dea65a1b7ebf61b2144a06aa2ad89d5708ba346afa663b44bb1b
-EBUILD syntax-highlighting-5.77.0-r1.ebuild 702 BLAKE2B 31ebfd8db51b156d515477ae8d0fa4783287fde242b0d9bcc99bc9b5438980c83e5692bc653e3402b65504e333539cf33cf71a9bc68c80b53afefb983b9d0d02 SHA512 1fb527d9ffa2e1a343d7527a7bd8f6827296862639017f225fe20580ce287687f192a3d04ea0ec255e57aa6e67f92d3ae8685ef03720a7523d2245cc52c6782d
+DIST syntax-highlighting-5.80.0.tar.xz 2272788 BLAKE2B 45a116be75f998cb9a9cbf378418d030135eff1d1d3eb21932b202f22495fcbaa67f133dc1ae55bbcac24725cca847a2dbd880a5f5c1e39aa318a5b342365c22 SHA512 f24fb943f095b44092f62eca2a52f4b0f9ad0ce705bb0b0f8a17a9e3cda7a9892794218119e77cbc376d48ebb336904f862dbdd2715d932e7bc1c197dcbfba29
 EBUILD syntax-highlighting-5.77.0-r3.ebuild 694 BLAKE2B 6950b7bb5a5ce43ed7e0fc036aa081ab03dbf1268e047934ad446aeb1da8d0ed71b04976145607002fc4760d2d197d5df99d2fb0d2630a87e98c38a3ec2eb8df SHA512 4f925b469cff2925b86dbeecaa28ef41264fad07286661d5a226b7a6765dca30fdda84c6323eaa9f0449047d271d193191db15f5e54c1f7a37329ca5827efe6e
-EBUILD syntax-highlighting-5.79.0.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
 EBUILD syntax-highlighting-5.79.1.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
+EBUILD syntax-highlighting-5.80.0.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild
deleted file mode 100644
index 64899ef1ca10..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.patch.xz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes.patch )
-
-src_install() {
-	ecm_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.79.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.80.0.ebuild
index 02499f839b90..02499f839b90 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.79.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.80.0.ebuild
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 86a03cd6dadd..72ea83d58917 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.77.0.tar.xz 1410760 BLAKE2B 7a29d5bb83e8b0e0c15d380ab37389864aec9cfec79aeb61e48aa24f1611e83fa493afbc5efcddd83d1d99094407eb4f0da49fd530af384ca7dbc0d24a74cab0 SHA512 412218520b9099df4f72467c348d0d8233e32025115589c4915ce75e5094966c8a92879f8d57a3cded352983f0db510e77b3020da269a4e0d0968404043c7aa9
-DIST threadweaver-5.79.0.tar.xz 1410688 BLAKE2B 453c0da59d9d990731028e23933a02ed379feb01dcca462163b904f219643aa2a87550607a36671a66fcbdc0b4ab60138bd3a0cc9e7b07a850c11efae13ae8ac SHA512 2316ff3d9193cd29e09d4879e7bfd775a2686ef716c5763e7436633a729dac769a6703a039067a6afafcb36f495e85f3091a068309d144c275f7c0df1235aaa1
+DIST threadweaver-5.80.0.tar.xz 1410660 BLAKE2B 1d64ed2d9c8ecdd5e3e3da650e512cad7c183007da0f785db0ca92ac81e62eeabfb50b929a0f318052b855636da72a05325fd9e6507482bddddd9418a58f280d SHA512 e7b30f2fdee4b1d4ec5153afe83bcbc238d7075214fb6623639ee5700ee62cea5b51ca335b1b08b1fc7ca471e55dda6b87e5a1b9d4660c299d6dfacfa5573e73
 EBUILD threadweaver-5.77.0.ebuild 360 BLAKE2B 0387409754b4cd356f90a0b62c535c0a26fffa5e61498896be5f34970b57d78a61446840a3d86a755d8b3bfd8fa0a77b2eefefbd8f84fce0b9caef198bb51d66 SHA512 bcb46d5f683f5434d0b3bdf5433efaf01b644c29a6074f0fb4887d1120e0ce4a62eb3e1129d4cd5e0ff14590fcf33446b080ed3b94e0a4f0552efeb2ebc593d2
-EBUILD threadweaver-5.79.0.ebuild 363 BLAKE2B fc40631dd957eceabc7a7eb9a2b783cd2829709d72b667328e3520e64e1f947b350ba689f764a51290d677edb4c1281c07fb0c27c4906c2dbc7541029a9283cc SHA512 c3deeb22113c8129be9ee11e6e304b0b9e2da5f45bc184526655157fad03f45136df5d59baec27498bb91dbae0b6e5ba9d5855d44c992907bcc0d85c6f057440
+EBUILD threadweaver-5.80.0.ebuild 363 BLAKE2B fc40631dd957eceabc7a7eb9a2b783cd2829709d72b667328e3520e64e1f947b350ba689f764a51290d677edb4c1281c07fb0c27c4906c2dbc7541029a9283cc SHA512 c3deeb22113c8129be9ee11e6e304b0b9e2da5f45bc184526655157fad03f45136df5d59baec27498bb91dbae0b6e5ba9d5855d44c992907bcc0d85c6f057440
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.79.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.80.0.ebuild
index 4529902946b8..4529902946b8 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.79.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.80.0.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index b663b0778e81..0f38740f6910 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index b9f7f7ab5c1f..170aa0aa6348 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -2,4 +2,4 @@ AUX basket-2.49b-libgit2-0.99-compat.patch 1598 BLAKE2B c8938b905715cff5e6914746
 AUX basket-2.49b-xdg_mime_install_dir.patch 1429 BLAKE2B cc1177ec5d9675d2a85c81bcbee77b02ee1fcf11f9d609e7298d4b1c067c07c818fe18d2d1aaa1fc0c159fa5fc7a2d84322eddbd82eff2dddedd81b446a01879 SHA512 224c3dae19c80ae8f0826f2bee6429391998c3baadf708aac3353ca0962646de595d9498e003b1d9d87a9e321858dc43de39a9f0866e4894791a05b28fde05f6
 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134
 EBUILD basket-2.49b.ebuild 2123 BLAKE2B 53cd3b4993893c1d5d4d2d35d27ec9a1f80f479431af7bc5b8a0739e5b1bc739671632e4613c079fb6502a2c620b4bb7abbfd8c70bb920996f03cf9d5458e8e8 SHA512 8d837ba2048a9176a3b2be7a6bb10d25ae161e1a8758d94eed617370d3051bf135127279e63666368ce3d79249d9ad2eb71212d5fc2821c299a56d3962a8c18a
-MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
+MISC metadata.xml 336 BLAKE2B 7e5c0e4fb71f835cfd5cf6ee3a61466d202bf62d4ce04e5952a00b5f1124b317ae4b824b43f1c6a30cb6dd02677f778e11b708f76b80d4578ec113e1f4bc3a87 SHA512 fd0583fcb9c8256aba1a334ea19470cc10bb008d995dbf1c120b1282a22006f6adaff6a5708179b1e200a73d2ed930d15f2088107428d5e842904ab36ac6d75d
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
index 1d8832bf3ab8..f47109bcfdf4 100644
--- a/kde-misc/basket/metadata.xml
+++ b/kde-misc/basket/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/kde-misc/kolor-manager/Manifest b/kde-misc/kolor-manager/Manifest
index ae128dc0d705..9bf712235701 100644
--- a/kde-misc/kolor-manager/Manifest
+++ b/kde-misc/kolor-manager/Manifest
@@ -1,4 +1,4 @@
 AUX kolor-manager-1.1.0-deps.patch 1012 BLAKE2B 8ac2811a43fbcabb4a61df44b9029e5ee603c38d191ad8025ad153764d108eae2a43464f7b683f9884d098b584595f457385ce1d936d5e143583715c529786d4 SHA512 fa236ba48c22ede9b774b607fa5cfe413a055571c113466e6b58a8f8a4d47c21e433fabaad324db5a3cefa4404506f0634cff619cff7cf8e2f01bddbd9be1f59
 DIST kolor-manager-1.1.0.tar.gz 37756 BLAKE2B 85aaad99c7c29e6cf58deea19d30aed4b4b09059e4f1681c005a08e6550d68cc171a1f43a775bbbab8f50476642c4956b67a8e600cb590035fedee03617f1249 SHA512 52bfc162d1162f8c75f627beed322d4a79a2fa6bf955ff669e5809975b160f5af3d8174a867fd629f8ae3c8d65a7ea8409b059786d062ff725cf5552348e1893
 EBUILD kolor-manager-1.1.0.ebuild 713 BLAKE2B b7451029898b3535ec29c00b4b8343e86705ab7721097dc409aea54e497e3396c5f1d5cf8f633b7900f968ce3326efc73d5cbee6abefaf1a5a8efd349ef2bffa SHA512 38b14e1de363c5d2cf80220314301b91af612a31e93f2c7b8c8e95b05fd6b0702dd57123411a00ed891aa1147c6473de0410e1f4725cae2c020547032a442d3f
-MISC metadata.xml 249 BLAKE2B d27faa1c4af97c82d07fbf011527c00fb5f78b54db9f25d5a10219cf1535fd3739813e14fc9e22e16bac33ca6de5a3bc278f2646d8c4606b09207c9667b27fc3 SHA512 fa397cf016d93ccf5928803e27e732a4636b84fd7409f88c3a3a81634c15ab67621cda9333393a8ce05d7245a4fe75aa303d9e51dc2d78dff95161c5e887b618
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kolor-manager/metadata.xml b/kde-misc/kolor-manager/metadata.xml
index 5f4d9f3f7c43..2fdbf33d963d 100644
--- a/kde-misc/kolor-manager/metadata.xml
+++ b/kde-misc/kolor-manager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/kde-misc/ktoshiba/Manifest b/kde-misc/ktoshiba/Manifest
index 0faab3abfb25..ec0c72a72ea6 100644
--- a/kde-misc/ktoshiba/Manifest
+++ b/kde-misc/ktoshiba/Manifest
@@ -1,4 +1,4 @@
 AUX ktoshiba-5.3.1-qt-5.11.patch 239 BLAKE2B 371cc0c4b8db4e79135b60b9f3fa65b1a7e44cba14feed270667b6e7e806d6b9030be029014a1164d41aad6bb97886552eb14c04efb734c6a9ba903cd6cf77bf SHA512 3cc37f547bab7d7de5565cc7baf6126374256dce8ab99fa263a2a5f2be138f43bc1d133d285d53488cbf7fa4143ace078aeb2d67d184cb57e9fae6daee5228d4
 DIST ktoshiba-5.3.1.tar.xz 71360 BLAKE2B 83d2abcda34c68d36a021ce0ff906eb0877c2768d1e40f676017509f4c6e2fbf70fa668b6c181bf15395a31c6bcfab629512545289c3012ff0637b414dbfa83a SHA512 730f38f8e8c8559255c3228994af95e47b00c501fce0a9fc56a0bfc27d8ed0b2f0f31767efc12c3c589e7490a41b27ab8365da22ffd4905f81d3d1c750cc3469
 EBUILD ktoshiba-5.3.1.ebuild 1053 BLAKE2B 8bef0fea21d039b7d53008bc46b0ba3ab2e93dd57245c1718c7496babf13f0ce007fa74604a00dfbb369963bac0ac7adcc93b73f991d832bc43b5e6cb368fc2b SHA512 1fa307d4d40425c17d7814a55aaa74c347178ebd3053b75b07c53584944695ab94326f6db70e79c467f5748814eee75846acd861ba51519a5fe4e1faa154fe2c
-MISC metadata.xml 327 BLAKE2B 5c24dfe918a79190b4b74c15bd3cab19fe2d8d62e73e7d518546bdcf924cd100266a7252f7ce17739f33241a36ede588c83c4634b8b5db9fb6b466d40dfe588a SHA512 30bbe9a59d5b48c08710d6fa31372f9b89c3572d5a005a7883b5d76605be3eb43cdfe396f2f44b9f62cd9bea134f574f65f5018b95b6908dfcbd5dfd4142d983
+MISC metadata.xml 327 BLAKE2B 0bb06acd7778dd9fb6ee762290c780574b23f3ae7050d2266f28cfdfa0bac3ba90617600244cee466f01fa0e0e6bae41e0c55a311d121f88b0e1fd10f4bc2f81 SHA512 a0b7865db8a676e456635a63d69966be61caa79aa841a5bafec4c7f99a42705574acb4ac879a641a9b008798d23af77e4546774f1ad35e25e3ba5e92a08a7d30
diff --git a/kde-misc/ktoshiba/metadata.xml b/kde-misc/ktoshiba/metadata.xml
index 262c0536d3ca..b0e2d119f01d 100644
--- a/kde-misc/ktoshiba/metadata.xml
+++ b/kde-misc/ktoshiba/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 57c2eee2c39e..6ff024a38963 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,3 +1,3 @@
 DIST latte-dock-0.9.11.tar.xz 719904 BLAKE2B 6d88fa42eab9e44144b33ba2affd98a74632f5aedb733bc279b5edd5db75f561af5428bcd1d9d60a4af8c1134686ea47adc9be798ee1e06ef9db515296e48494 SHA512 d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5
 EBUILD latte-dock-0.9.11.ebuild 1639 BLAKE2B a3af64d56a85ccc2edeaf43e51b72d53a81a0599a3c969ed752b8de890aac19030497d359f5e34886e65bd22105e5d48074dbde6353c3e0b26a0b2cd4666c3a4 SHA512 36287dc89bb0e5559abfc98aeea2379253c05cb7836687d3a6ad560428d986a758b1e2c32d864b20f1bf90d5c4fa148db76324d8446288a22d3971b7a21cddff
-MISC metadata.xml 335 BLAKE2B d13829999e285af46bff2cc9a481971b9fae0b308565fef00a165cae6f7d9ffaa74848818e015fde8ada30707af5a759eba203485a175b777819db0d359e4303 SHA512 57262a654c1c96e908733bd51f75dab5fc8ba18a115a70ae36469ce3b494fb54d56631ed513bcaed56f170b540e3026a7d875a2d770129161075531d7bcf40a8
+MISC metadata.xml 335 BLAKE2B f82ca43580b9ff4695a6f5ec12918e8d2b1955d17b0feea996494fa53725da09fbfcc1a99091e7799fb42feecb1e1da4f7d7ff88b0f52c1dda7fc3f65218c08d SHA512 c887c4c3536118fb9f6af0b4ff8e656d5a63e039e1725429cf1d00cbb2564da4528518ab300b6889b0feecebd0b69cacd5f206793f8c24db6a97b86057597cc2
diff --git a/kde-misc/latte-dock/metadata.xml b/kde-misc/latte-dock/metadata.xml
index a9cf6fb97153..538a92c53789 100644
--- a/kde-misc/latte-dock/metadata.xml
+++ b/kde-misc/latte-dock/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/kde-misc/metadata.xml b/kde-misc/metadata.xml
index 7b1ac0829ff7..5a06b52035f2 100644
--- a/kde-misc/metadata.xml
+++ b/kde-misc/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria kde-misc zawiera dodatkowe programy dla środowiska KDE.
 	</longdescription>
 </catmetadata>
-
diff --git a/kde-misc/playbar2/Manifest b/kde-misc/playbar2/Manifest
index bc62d26a524c..c75118456739 100644
--- a/kde-misc/playbar2/Manifest
+++ b/kde-misc/playbar2/Manifest
@@ -1,4 +1,4 @@
 AUX playbar2-2.5-raise_qtquick_to_2_7.patch 12001 BLAKE2B f3188cb6270ecf46da35b641df3f01041178bfb000598bc52247c8b2fa00136f8f800838fe4ec76218b0353b14761f5d8aebf49a3ff979c5e6c3bc570156e7b3 SHA512 85dbcb60f6d705f8eef0a0d1bf48b3d55911f60fc38a0bf61ae2127011a067c853c756b79fc2e89ee798abbec307998bba023a6fac0b0aa27d5eb37a7f9cf5e9
 DIST playbar2-2.5.tar.gz 397576 BLAKE2B 3b14289bb7aa1e89d0de14732c7490cd552d4ca1e6f5311cbf274dd31f64b738e1586c3d7eec864c5c6ca94dacefd264a2b12e0843cb28557a1b8524c3aa4ea8 SHA512 964a29a07d7fab8f02d71224684e572e4fbadbd57fdc74ee6b59477b415306c39b60ec7be392711cfac8ab0325a72e7cee485e9c3af2949f439dbeb3a247605b
 EBUILD playbar2-2.5-r1.ebuild 898 BLAKE2B 0d2bbce7cbb6639877c00ef05af0fb86d17551c00f9dc99715e92ef6a1e1a947cda180b141ecc086cd21279428285f022e25d3e47bed8b06b12bca958abf4b28 SHA512 8524854e452919a74bbdcb59440232900151895c98ec22b24677baa417b57206bbf384ac4680297cfcca3332b80728b3e5acee9a037a0745c0f75b002df0155c
-MISC metadata.xml 457 BLAKE2B 7da06d96db2c6414f29454c8eb17a4a272f461cc42edb1764c33960fe841d53a8ef029e9867914765514db67977b529c26d2fd0196d6642fe6d26b08807e66b4 SHA512 82c0ae3f064b101a2da7513c70cd0aecf52310b3be4754b4de70c06afdf31c2575c1a81934f58a297e55858e12986f769e65515786e5ddd5438dd3611a028fbb
+MISC metadata.xml 487 BLAKE2B a41823a46d9bb05a34b195187031267dbcfe9a6d1c4b18a6bc27e1e09379597659952154df05059486b7c9d3f1a2c60ebecdd75b6312adcdd2b526f49ff830d5 SHA512 96cefad96d23d91935472097a5eb8b9a3c7ab43e1b03aa333041ee45a79834af60a3d17641fb39432bbf200183176f2ac216a4c5fe0db3353d16e6b35eb2a735
diff --git a/kde-misc/playbar2/metadata.xml b/kde-misc/playbar2/metadata.xml
index cd5feeb8ee21..840dd1d1409f 100644
--- a/kde-misc/playbar2/metadata.xml
+++ b/kde-misc/playbar2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>till2.schaefer@uni-dortmund.de</email>
 		<name>Till Schäfer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index eaf9e9625335..5a10af692c92 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 79c8f0e33050..63ec59d44190 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
-DIST bluedevil-5.21.2.tar.xz 161812 BLAKE2B deeb5f1725a0bdee57e47c4078adf2e3a85fa15a6639c59db030dbda59852f92ffe57861d4a662186e116d5dd4b3f5fad93f04e492a985900640ee9c29edcb31 SHA512 ce62b23665911500c4f496e07163b60e1212cfc13aa8c08ba831eeb8a82e1db6050860386fbcaf2e88ac84f8359a13f3f47fd1d375bdc90cbedc517a50e2d63c
+DIST bluedevil-5.21.3.tar.xz 161820 BLAKE2B 8fcd30bd0700b179aef820949fe22f3fac8432baaff62623cb61a1a1a24e6baa4dc467fb762994f64fbda9573973fcaf879a2dd82bd0503c85b5a01821ec1903 SHA512 4d2cba255781fad9129f1636907cd8d45ae8fad5c78359f43c7dd31f7035335e776f078e7be843fdce36d008d1e2a0647c1dd836a9a89b6e5898659cd115c4fc
 EBUILD bluedevil-5.20.5.ebuild 1186 BLAKE2B 7b169cb6e8a4599a2de5976e385acbedbdbd70e4cd21d1bf84cffa0cbfb89163fd5baaf8e41f1b418588c51ce04ed30eb601e63415c4b4ee443114510db49d21 SHA512 a42ed02515a3c4fccd8e61f8e4b652cefdad781b96f5b09ee669f42f49aa35340484c92be3a4c7d5f9b7396f54aa573c1c8503ae85bc11052d7ad53222cca9b4
-EBUILD bluedevil-5.21.2.ebuild 1189 BLAKE2B de1663eb39b8772d69b8afe50c384d25360ecded70aabc74b2ac273c74cd10804cf840d3fe4dd72f366f6f81a1bf237d9b0252dc1ec4c6f9122934220e6f96ed SHA512 4c33bf82562a9f838c506c4ab9e51becb01d7af91b8eb14bee7112a1d56bb9354516bd0d0371a38772ea980e97349cc26959381865c7ff8c13fc844d68a0ba59
+EBUILD bluedevil-5.21.3.ebuild 1189 BLAKE2B de1663eb39b8772d69b8afe50c384d25360ecded70aabc74b2ac273c74cd10804cf840d3fe4dd72f366f6f81a1bf237d9b0252dc1ec4c6f9122934220e6f96ed SHA512 4c33bf82562a9f838c506c4ab9e51becb01d7af91b8eb14bee7112a1d56bb9354516bd0d0371a38772ea980e97349cc26959381865c7ff8c13fc844d68a0ba59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.3.ebuild
index 058498af5f02..058498af5f02 100644
--- a/kde-plasma/bluedevil/bluedevil-5.21.2.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.21.3.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index fbec57f0a51a..f85f371bad48 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
-DIST breeze-grub-5.21.2.tar.xz 3152752 BLAKE2B 8dc4b6f87088a8edee73621dba0794dfe5e3e73997de9452d945b7521a73997d5f3df1c33050111c0c39e052df79ea8ddd6d8a2049a53a390e184fd82a1e6fea SHA512 c061c62a6f557fd49e875feb552a04a8b7b0c10a388f4156cd5d3780b0c5afa8fc0a9eaf4af7922dfe070696e960fdd6eb0573461c00239488910c13490dcdec
+DIST breeze-grub-5.21.3.tar.xz 3146916 BLAKE2B f651188d7c94465cff7a0651e6dca0ce02615196f80ba944b78aa8acdffc441f9d05beb8f43b1c449486ae29d61f8540b0781339e503692f810a79736b95cb81 SHA512 5497f2823002cff36909c25045a26195ea57f61e13b1a8c843bd8a62602d239a00963c19c438987c745c0aa64a3ef8e34969718f1b46aac3c6a6fe15a450b0f7
 EBUILD breeze-grub-5.20.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
-EBUILD breeze-grub-5.21.2.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
+EBUILD breeze-grub-5.21.3.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.21.2.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.21.3.ebuild
index e7e9654ba6a5..e7e9654ba6a5 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.21.2.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.21.3.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index b39b0772dfe2..e27c9af41aa3 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
-DIST breeze-gtk-5.21.2.tar.xz 47160 BLAKE2B 11b9592bc462f63247c68f4a70130c072fd4b53fe81adb437b5018b1b156bf720cd57f3cbc8427aa6878221efba7ab76df4cd1eb1b258341b7d75273779a7a30 SHA512 43ed557436abc673e3c97944236a31464ca119567f198fe4cc1e16adf850455ce1c925290d9edb497eefe19ebeb00e616506f07174b075d3d0a9011adb5333c9
+DIST breeze-gtk-5.21.3.tar.xz 47180 BLAKE2B 0272a385d485efc8819f0f75d616815eed2b7b486efd739b4e40f0e5889506db74c9dc67f9eb29a6b2c91db2bbe8b348ee1a1f39da6c6acb6c63b2179103299b SHA512 01d47a2e4db40f688afb14cda69c751540fc404a3b75e4699e70d41055ddacefc4bcafa0275c7b6cbb82833729ade56cd52064480d36a2d0b03ce2b58d1448f7
 EBUILD breeze-gtk-5.20.5.ebuild 790 BLAKE2B a2d20d872e041fb9e76d8123887a6a81a6e3ce1ca3d10ed991f02a6ff56ae436dc0ce7497d88b0480053ee94a2fcebe2c8f91bef40fa5a939cc258b172c01408 SHA512 26d318ef28fe68711010ea601c753d29fe5e12667fe923c30dc9654c0391f86d801b6a5e147edb75794a94cf45a512c9c01e48b906c0af2e1a6e6d8ae3ef0f65
-EBUILD breeze-gtk-5.21.2.ebuild 793 BLAKE2B 0db71a373448e6e9afbd8687a9ee4c350893673b39806fbaa6aaf2c9a2ec632a4d354bd37194e5f3bce508f0cab872b6f9a2f6f5cb0acbe192d7cd5372c50938 SHA512 40150be22f419b4bd803cc85fdd63653625530535ab23d188fc8a59eacd9d35d44fd0223e18fd9c005eb6127ea556b991c55db299852338bc402654cfe4b4a49
+EBUILD breeze-gtk-5.21.3.ebuild 793 BLAKE2B 0db71a373448e6e9afbd8687a9ee4c350893673b39806fbaa6aaf2c9a2ec632a4d354bd37194e5f3bce508f0cab872b6f9a2f6f5cb0acbe192d7cd5372c50938 SHA512 40150be22f419b4bd803cc85fdd63653625530535ab23d188fc8a59eacd9d35d44fd0223e18fd9c005eb6127ea556b991c55db299852338bc402654cfe4b4a49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.21.2.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.21.3.ebuild
index 536330cf9187..536330cf9187 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.21.2.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.21.3.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 8a05339cb537..4d137648d3e7 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
-DIST breeze-plymouth-5.21.2.tar.xz 108860 BLAKE2B 2b934ae8eb7f077eb08167e59aeb9bdfc753c635525460ce9014156204afd7407d2d4c6c570498765693eef83c005da6ace7c9e45a49798cb267689ad74519b3 SHA512 dde12ca34fa0c66b7b0df119a7dae0717fd75ffbc25676c70ec1aac37a170ba974cc35621827c989eb57df737b451215ef8ee23fbccf8a21b721098e1c85179b
+DIST breeze-plymouth-5.21.3.tar.xz 108872 BLAKE2B c5b964695cf6f8fe8234bdda1d17cc8ed5debee87f898a750b90119f7d5b65c75d1f69e62c55055051ae62b2962eafdac8c061b14a600d1492e2faef034ee464 SHA512 ca2619afe371e499f92254b0f62d8d547a4d31e0c3031344de89d164e1872df40dc3034f51fc5b7af6ea73343a1e14b5eed264f8ba3bc9ea599340366a5ee066
 EBUILD breeze-plymouth-5.20.5.ebuild 515 BLAKE2B 91d05f96398d5237cc9c47352f6455bbdda760ed2d7db5ff32915cf8f21409c91802883a27f06cce68509c691111b5f7e70be824b8a30ea4e231ed60e554f63f SHA512 0e9ab01c65a53885509a2b1dade68c387a6ecec47351b2587340761320b6482d8fab508f5dc950b5eb9f8d7e63fb2aa238bb62e31cb3eeea6a7a6ff8e573fb96
-EBUILD breeze-plymouth-5.21.2.ebuild 518 BLAKE2B f898711e5d8ce6f0ca7f222c8e022a8d694d175c7129fa531c81f8b0af9b57cf4b9e42fb9ed8effc4a66eeeb0e6b42d9160caf8a76d674c76f1a7d0bea0e029b SHA512 b51d26348cb0757125cc99248309fba671f1f2228f0f52a64161a23e1a10aaed1e293feae0b55b652b4b04cda19fbbd1df7db99601d7dc8084cf1416df82d28e
+EBUILD breeze-plymouth-5.21.3.ebuild 518 BLAKE2B f898711e5d8ce6f0ca7f222c8e022a8d694d175c7129fa531c81f8b0af9b57cf4b9e42fb9ed8effc4a66eeeb0e6b42d9160caf8a76d674c76f1a7d0bea0e029b SHA512 b51d26348cb0757125cc99248309fba671f1f2228f0f52a64161a23e1a10aaed1e293feae0b55b652b4b04cda19fbbd1df7db99601d7dc8084cf1416df82d28e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.2.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.3.ebuild
index ff8cb798041b..ff8cb798041b 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.2.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.3.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index caf5f6f788ae..4aaaf48a7550 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
-DIST breeze-5.21.2.tar.xz 26283632 BLAKE2B 6832b9f357734ca8e061e1dd2ae06ec3ed19f7c179ceb107b127a5f1de2b3b9e90bf7aae30bfcd19b4f5738e7654e3445ac758b2c66a6a3a4d7e0369545d99a9 SHA512 d44344cb42f90656a9be7b99f9a4dbe795c183c989d325f63b7a2ac8d842fe431ac1bc8e2c8ae0fe6fc757021b788705c9afba75d7785ecfa7d3ff0881fb8252
+DIST breeze-5.21.3.tar.xz 26283352 BLAKE2B 3165797692fa7120576fbd98d30e024e6ac16fb97fbdac5eb6ae35975239f5bb05a205c4b0c695e53f9e04349a023616feaaed3cf96db1e5cef2aaf3b17ae14c SHA512 7b6862d5cb2524cf8c3745c3e1c697d5847e7ca9a2adb04b5ce3cce4afd851961e0caa3f76893ac40946c3772672d72ac6244a04d26fa4b608e63cfa83c01904
 EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba
-EBUILD breeze-5.21.2.ebuild 1268 BLAKE2B 11228fab5b51622697413a77b077f76a66a2d17df97d79947fdcbf3ffb0857a4fb520e09823dced6d4261a1dec534d295123ea4fad61fc426fc37774d53eb6dd SHA512 7716ec449468758f10ad4fd88c962578ae930213dfe4f783dc752dec11734109737b3494b09dfd733188d14f2078a42649da304166a35897f14d55b7e6e3a91a
+EBUILD breeze-5.21.3.ebuild 1268 BLAKE2B 11228fab5b51622697413a77b077f76a66a2d17df97d79947fdcbf3ffb0857a4fb520e09823dced6d4261a1dec534d295123ea4fad61fc426fc37774d53eb6dd SHA512 7716ec449468758f10ad4fd88c962578ae930213dfe4f783dc752dec11734109737b3494b09dfd733188d14f2078a42649da304166a35897f14d55b7e6e3a91a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.21.2.ebuild b/kde-plasma/breeze/breeze-5.21.3.ebuild
index aed61f7b0ae1..aed61f7b0ae1 100644
--- a/kde-plasma/breeze/breeze-5.21.2.ebuild
+++ b/kde-plasma/breeze/breeze-5.21.3.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index dd29436b133b..d3d886ce7038 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
-DIST discover-5.21.2.tar.xz 8425520 BLAKE2B cad477c551e23fe8068936e029df81da793ca51e4617b8735f08091e50b38c18ca0f57de8dd01e2061bc24ea7d40ee4424c1abc4c87bc39d74b74ffa1bf5bad6 SHA512 c5299c92fd67df0dac56ec80f04cad1d10cc8f4b05c7e1d2e8de5a30c6a723489aa8c44049255efee03763337cfb8d8912facceebd41483732fb111a18542596
+DIST discover-5.21.3.tar.xz 8425596 BLAKE2B c56dbafbbbc5aceb5915d39ed291e262af6d6fc713b7ed683d775c7f12a4faac501a4cad7e3d908268101b5789090c14902d37f0b67f608d5c6dff1d5c015493 SHA512 871bc2cdc7d628f76ce18a391899864344e1db1077bb29c91526ca38680f32f280c18199850418b9fadf62a682fce4fa4d94ab2177986fd4e9d99fdf3d9d824a
 EBUILD discover-5.20.5.ebuild 2090 BLAKE2B 1827c172905a2f72feff67fe2c2581fb4e5de133b04b5ecc07ef9bbff64e321954f5a23f072ed3c58d528540f50bd99f02a781239319fca55d0a98b206b0adb8 SHA512 1c4f19424f1403912d9a2ada4b001e7bd67924393c3f4ecde7199674d0b7dc130362fced07ad684955c6cc3a2a94b412948fed762e9c0ee7d7e3eba4817f5687
-EBUILD discover-5.21.2.ebuild 2143 BLAKE2B e283005809d09d563e2c29f860354b7fa790902c071c97e82311ee64f9af7a7f600e4091f6fa9501a083a3b69e6eeeee21e38c00c287fa77f517dd8aaa675275 SHA512 b8360c3ad884f3713afc9f110eb4a65d92883f7a809885a9a99571e7ea1bfabfec50d2285812cb110b0788a8cf9b6a94daa232e766912351f8aea6ee5e9b807c
+EBUILD discover-5.21.3.ebuild 2143 BLAKE2B e283005809d09d563e2c29f860354b7fa790902c071c97e82311ee64f9af7a7f600e4091f6fa9501a083a3b69e6eeeee21e38c00c287fa77f517dd8aaa675275 SHA512 b8360c3ad884f3713afc9f110eb4a65d92883f7a809885a9a99571e7ea1bfabfec50d2285812cb110b0788a8cf9b6a94daa232e766912351f8aea6ee5e9b807c
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.21.2.ebuild b/kde-plasma/discover/discover-5.21.3.ebuild
index 1b2b39717b58..1b2b39717b58 100644
--- a/kde-plasma/discover/discover-5.21.2.ebuild
+++ b/kde-plasma/discover/discover-5.21.3.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 2dc81aff4c6c..dfaf9677bbd0 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
-DIST drkonqi-5.21.2.tar.xz 768908 BLAKE2B 471a708598333058896dd981e5827f14dc2b318efac77714013da5f0d94c6289aab47aaec8faf79e80dc628dc00565b21c09ecb8052c57c9e8d0a45e66755400 SHA512 2870ac6305200eb7085bafc3e966759a901192e9214c724cb2b33eb202aaeb0cc251819ba290a09df1acf8726dbd210d52e76c1ad4c2537678a73f7d9e9b032c
+DIST drkonqi-5.21.3.tar.xz 769832 BLAKE2B 086157a6030c7523b9b2440c9079de285fdd67c5324fb5135dc95acb466c9448c601afb72908208d30ce0821dfe1f9ecd8edc99b33cf798c03f37c4e32f435ff SHA512 3345873f38565cf3057bfc54962d40f87947769c3932fd6a12dea4d7909e474e6dad7f187f6e0ea7634c9eced37bb843ddc2d36292c28f4390dae31dccdee494
 EBUILD drkonqi-5.20.5.ebuild 1641 BLAKE2B 1c068c1e5fe42e91de3894219caffb74a2addd291be371aec836117c9fad9dcb12a15e850ad4412af13737ad1f7e2cb8dbc4f5a2676c340142e460401fe143f3 SHA512 490ea4d8560d4b7853345151ed17d3c9189a25cd34c08aa6d2df54556e477de12885b5c95ac04de928d5c059c066a7c0b01da8ab45d56fe51160e267caeb47ad
-EBUILD drkonqi-5.21.2.ebuild 1644 BLAKE2B c3d630f525ad416df57417e77654c225d14f8bddaee42eb44f8ad0112bbfbab0cc23a0928c68e0c993f8550495f5779bf971bf99897c99ca32e37f192e889459 SHA512 0fd03763e16ac7586f78c10607ccf01f65e51fe7665388122789fae56f4660d4f5796eb097491deae5b1706b4c3fa0c7cc2ce83055fb72ffccea76e28741a7f2
+EBUILD drkonqi-5.21.3.ebuild 1644 BLAKE2B c3d630f525ad416df57417e77654c225d14f8bddaee42eb44f8ad0112bbfbab0cc23a0928c68e0c993f8550495f5779bf971bf99897c99ca32e37f192e889459 SHA512 0fd03763e16ac7586f78c10607ccf01f65e51fe7665388122789fae56f4660d4f5796eb097491deae5b1706b4c3fa0c7cc2ce83055fb72ffccea76e28741a7f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.3.ebuild
index eef51370febe..eef51370febe 100644
--- a/kde-plasma/drkonqi/drkonqi-5.21.2.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.21.3.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 4b44d62ba1ec..330e3133a7bc 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
-DIST kactivitymanagerd-5.21.2.tar.xz 99324 BLAKE2B 05b574e0cf931443fc9e03309583d380a9748b1aec534057c292aecd74ebbf49df970643e23cd8b2ae2f3b503c85619aac6134ae049004254d71a8103e25b057 SHA512 f988899df27f4fcdca61367599889226712d13a09c67c6dd0812c2dfbcca9e8502af6352625776e49af6ed761e08ecc8318f7bd4e3a4ccabe082c4f3dd3a5df2
+DIST kactivitymanagerd-5.21.3.tar.xz 99360 BLAKE2B 8a1825b33247ebd5e2b65b1597ce22ca6f0450e8c71a764e3b505a622906743ef64b4e2fc6616f04ba0d614efb55bff63478ba21a138036d16b132f097552599 SHA512 3464427590c6343fb12fe53ab0a645704ca6330ec4e5aae73e97f379628908ae779ace6193d6a70b9cba9fb5941fc91d41f701ef8170d29c2153c876ca792e0b
 EBUILD kactivitymanagerd-5.20.5.ebuild 909 BLAKE2B adc2e13006c15daad7e6ce0435492420f1429cec352fb7a98b6a3d3f839bd5c31c24292f03553b0cb64f41a5301ef6ba9ce362b24811d0044b09e3cef55ef2b6 SHA512 ce43e7844ad4351c4a2d635170092739981fdeda832eb1c6f5b0f41fe7066238bf55269dd86adf0ef106008578427371ef951fe489f68422364dfd7001e6b12c
-EBUILD kactivitymanagerd-5.21.2.ebuild 912 BLAKE2B fdf5dcf1d9755ba3e637697856f6823b32b0e213f9f955502b2f73ed0699ec25ddc30fdee811f04d0ef0e51c13972630ad866fc59dce2ed5dd9ab4087f57f2ce SHA512 c6e4042d983a07073935910a3991e22651c614267b770e67850a74da38c06d73846f8396e75937dcb3e0d2157fb483eed726808edd23f77e479e9e4434a80b6b
+EBUILD kactivitymanagerd-5.21.3.ebuild 912 BLAKE2B fdf5dcf1d9755ba3e637697856f6823b32b0e213f9f955502b2f73ed0699ec25ddc30fdee811f04d0ef0e51c13972630ad866fc59dce2ed5dd9ab4087f57f2ce SHA512 c6e4042d983a07073935910a3991e22651c614267b770e67850a74da38c06d73846f8396e75937dcb3e0d2157fb483eed726808edd23f77e479e9e4434a80b6b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.2.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.3.ebuild
index 7d9be6d060a1..7d9be6d060a1 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.2.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.3.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 1f695b84b195..eea0fc308e0e 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
-DIST kde-cli-tools-5.21.2.tar.xz 610260 BLAKE2B 2eb3936e8e0a497ea8933ea2ddf31d12e53c529953de001f142083e184afb48fb0db76fc687d7d198b7a703e2fe2ed7486536f57a35787ba657653c6bbf1929e SHA512 5ccd4fed60799d954a9b230207ae04ddd6633d0eeda7cfa76e1472691b362c3427d060521d230864b8f3e0d38773ed2bccb33dd329243de67f288f3de3ce53db
+DIST kde-cli-tools-5.21.3.tar.xz 610236 BLAKE2B 6a0deb27d8545c8c4a7559f646b863015b2988711b313c7fe96661ce7fd88af79c0080b369334a46cc862f8e05b5011a11b533e3fa6aadbaa958625df58180cd SHA512 ca17fa29637d03cd21d9ddb342f248654979a1ec07d97c50943d92830c9388221b5c9240a5d2bf2587d0518a24bc24786a8db14c76ca1ed3244321e17b8549f3
 EBUILD kde-cli-tools-5.20.5.ebuild 1723 BLAKE2B 27a37e3d774e414f3803b5985acff0411ddddfa730c4360c95614f9dd775ec42313730559d563827da9660d6f5b6adfc845d5e15ba17ea500e2e9ec1ecb753df SHA512 5bfa56010993cf83806cde159c7ed968758fa65fc7b0e81ef66b75eee46bf228ad3641255ee9c8700aabf7061f1dbd5ac78d8226b06e9240669873f4ccdb2029
-EBUILD kde-cli-tools-5.21.2.ebuild 1725 BLAKE2B 30712fd449ff0dcde833be319c73a003e1f846b47c7e2b1fb4bfd660bf9f4ba1715bcaad5fef5460e1cf8570a8c18c883c8572c51bd8ab79df5311d42b06e9cf SHA512 6ade4e9918f5b4671657bcae5d3a7a73e792f347c1daa45c5cb4ff6a8ebff2cd53e1e491ecaa3cde1054613acb3c4800e5beffb5aeef32365bc1bf46ba037620
+EBUILD kde-cli-tools-5.21.3.ebuild 1725 BLAKE2B 30712fd449ff0dcde833be319c73a003e1f846b47c7e2b1fb4bfd660bf9f4ba1715bcaad5fef5460e1cf8570a8c18c883c8572c51bd8ab79df5311d42b06e9cf SHA512 6ade4e9918f5b4671657bcae5d3a7a73e792f347c1daa45c5cb4ff6a8ebff2cd53e1e491ecaa3cde1054613acb3c4800e5beffb5aeef32365bc1bf46ba037620
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.3.ebuild
index d7a9e6759567..d7a9e6759567 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.2.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.3.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index b2e24aa31563..b0b184642fec 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,6 @@
 AUX kde-gtk-config-5.20.5-window-decorations-reloaded.patch 857 BLAKE2B 7db0137fccaa223cf8d58c7be61c78385659ca691aa07f067c15bbeed2d092ddebfa1f69d341a339036b2953d154742c46acaf2cf008e1f299078313c2bfc8eb SHA512 47f2f5120c135c0c814f66be6d28f4dfc2e9c2d6abdd23c09b309bc6e737459d654f6dd56119dd2f53f683e0e802d440e9dcf250054d310659b0602cc3aa551d
 DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
-DIST kde-gtk-config-5.21.2.tar.xz 68704 BLAKE2B af721c7615ff79c3d0a27bf0e09056ca66ff15e52e4aea60215bec2c9207783a63eae25a3d4655505740a6cecf63ce84172e9216e727c47ad926cecae7cf9c53 SHA512 4457fda6b9ebd8e93c41cad56bc7d001de27897690396399e8000e8149489b710f318a6058f452f087a33ecbe6965af9893273f56e839fd920df68b3b3b0e79f
+DIST kde-gtk-config-5.21.3.tar.xz 68712 BLAKE2B 11cd4e0043175937b8749ddf3f873cb911e3b5c3de7671410da75fcd359192a2f9d9e4d128ef1d8a9996223a78a771930b6898498e36277b3d947178d2ddecac SHA512 89eaecfa6b070b31672e2d3b89073c410031d47a78fa0cbbd2a6bf2d267ea17586c1fd57452997194e6defb2b7275073c360318ccc35c1dece43adc00a0bec45
 EBUILD kde-gtk-config-5.20.5-r1.ebuild 1355 BLAKE2B f0c4d2ed76d28fd0da23004b600d8bf80f7fef4765916cc4370be31ec28491a7acbc9fc6a7d2ce245878cf760673b602b0dd02bbd041f24b9ee8a671e3a1792b SHA512 34f9130c5be4a6699ac906d3f5a2b82cc59e775e2f7e868fe617a6fa5c50c832895ea40e0103eca0ff96e1189f1f67cc26b0b9a7082de7cbabc745a3e989bb9d
-EBUILD kde-gtk-config-5.21.2.ebuild 1284 BLAKE2B 1caa31b3e7a070545e6ca10e1664c56624873858ab67804b8c067cdd1de09a926b4b0844cf71f47bafc4bd68dab9371bc33a99ada369162187c30e7d1827967b SHA512 58746fec183dfb86ce170895b1b0e8bc779038674620397acbc30e6d58fbd126b535176602b463741d04073372cc2a767061bdeeb0bfaeeb092b13c4b4475d51
+EBUILD kde-gtk-config-5.21.3.ebuild 1284 BLAKE2B 1caa31b3e7a070545e6ca10e1664c56624873858ab67804b8c067cdd1de09a926b4b0844cf71f47bafc4bd68dab9371bc33a99ada369162187c30e7d1827967b SHA512 58746fec183dfb86ce170895b1b0e8bc779038674620397acbc30e6d58fbd126b535176602b463741d04073372cc2a767061bdeeb0bfaeeb092b13c4b4475d51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.3.ebuild
index beb08dab9bc0..beb08dab9bc0 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.2.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.3.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index faf115f7bd1b..03521c032fb5 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
-DIST kdecoration-5.21.2.tar.xz 45944 BLAKE2B 9e84d6809f2e80145c4bd6c1ec0e10e921a8f18ff7b66e22239bd0b1b2902f8da9d46376752b69533b223b93ae1ac774be1f627909c875c838d764e8e55bb76e SHA512 5057dda958df37c439ea03c4ac89900e002351d4545af439e122d7cef2098711823ae315723526e3fd2885fac59bacc7a456466c8764d1efc2af957062d92afe
+DIST kdecoration-5.21.3.tar.xz 45916 BLAKE2B fdf1f4bb355cf5d7d82d92bc4a844c9fce3b050c243d84cae9e6068c0d2d52b9d765fbaf08e940e18a104f11eada67bea2395693c43c8c4caea27461d6b3a3ef SHA512 7580a8b698c08e713577560c95c18070be1884f9140a8bd72202de89fdf6da9aa5f4056344095a2a6c5b85cae425a9dcc0d29a3380d6d7abd16c03f86488d647
 EBUILD kdecoration-5.20.5.ebuild 479 BLAKE2B bfad15f8c0653891ae88aedd7210aa0be9f48b8fd7e440f07f39dcd0a01978c9ec270bbbb9ced6c3b8b48fb547ff2c1a74497b1796d1101e0a1b0239abbee207 SHA512 5809e9fb0e8214bc568758ec5df8969b60d650a3f5f88064c473134d594b0a3a5a71196f5f29580a8b5161c006afbf5c9589077407410bdd953fb0e481526585
-EBUILD kdecoration-5.21.2.ebuild 482 BLAKE2B 1f05ec563a39747de006d90775cde1e0dcaa7c732cee664c9d5649cb5e890322244fe8d893cf5f2e04f8f9222692a687d5887c8f7dd36848bb94891bc199f37e SHA512 4f775a14805a61a08bbd78d9c8634356d7ab8db9352aa650425cece9530acf537eb68ee2b91cb65e78c861b4c157156a2fb691a7e6dfda7b5d08d531133b524c
+EBUILD kdecoration-5.21.3.ebuild 482 BLAKE2B 1f05ec563a39747de006d90775cde1e0dcaa7c732cee664c9d5649cb5e890322244fe8d893cf5f2e04f8f9222692a687d5887c8f7dd36848bb94891bc199f37e SHA512 4f775a14805a61a08bbd78d9c8634356d7ab8db9352aa650425cece9530acf537eb68ee2b91cb65e78c861b4c157156a2fb691a7e6dfda7b5d08d531133b524c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.21.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.21.3.ebuild
index 9af5da017be7..9af5da017be7 100644
--- a/kde-plasma/kdecoration/kdecoration-5.21.2.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.21.3.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 3ed15833697f..971dc4ad1472 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,7 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab9753df6ca0d4121f6690de8e32782b3cda5f3d42b5be2791d400189c990ae4f2820820c8da68d3e39150bbc6de95db7a0104da4c74a01ed3 SHA512 376c8b2cd185b7ee633c43067192e775db61cb05456df615c6230076ca3ed0e5ae04e7e1ebb1147cbf482094d82748b3a29d1c52fa81d5a5fbbb9b6f18ab9499
 DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
-DIST kdeplasma-addons-5.21.2.tar.xz 626408 BLAKE2B 7010a483474bc95cf83090402d6a12a90dd690489d8dbd80b3a0a90a4537769f03804c5589a63d48c2e3f2057fb1dbc072ea7db930ff5ebca6b0c2da3a4aaf68 SHA512 7465027ec8b6a6ef9d8994551ff79cb23cac7fb8e8dd62e3bd3a98fad38949c119e30d2221547ff8016b85a0830d2911e42ace94a32d8bd65042718ae67e053b
+DIST kdeplasma-addons-5.21.3.tar.xz 626340 BLAKE2B c60cc03bbaffc036e88e767114f78ecf76422ce27dace262fac263a1820a0be40fa15c4f28be10330d36a043c9534afaac3d726e317f3768f10aa8b0987efff3 SHA512 bede52c0a7ed785497c12197224b3b2400b1958237bdbb9f5061ce03517ee6c470dc8cf0b58dcefa6ff64f27af2f5c11a8605332283f1190e3ec38679a15c21e
 EBUILD kdeplasma-addons-5.20.5.ebuild 2161 BLAKE2B 2813bf768a3a911b5f3f6bb795be186afbc318f7459bede11984e5f7379280d1e4a553682a09697a9d81d8aa92c5592ebf39640d8977eae0d37fc8dbd8c99736 SHA512 ce676856febab179ed0de7636c43ec20eccc5f62252f8bb7a93cf78d0557dea85be8ff8f3035a2a80ce2b947a11318ca970e342eb518801eb09995d4f99d0552
-EBUILD kdeplasma-addons-5.21.2.ebuild 2114 BLAKE2B 7001e5ec8388f4e206e434286229b6afaed279b99dba51e092ad97e34b9b774ae78bbb924a8364ec4550067f9db0353be9ec1da6b8e53925bfc5154717ed1668 SHA512 943cc0117a8a0d93efd43739d205fefe9f0d84d1cffed4ea2a645e56ca387d72128790d036657d489ba33d1c671318e0f3d284e5b8a0fe0e1f0108c834520dd3
+EBUILD kdeplasma-addons-5.21.3.ebuild 2114 BLAKE2B 7001e5ec8388f4e206e434286229b6afaed279b99dba51e092ad97e34b9b774ae78bbb924a8364ec4550067f9db0353be9ec1da6b8e53925bfc5154717ed1668 SHA512 943cc0117a8a0d93efd43739d205fefe9f0d84d1cffed4ea2a645e56ca387d72128790d036657d489ba33d1c671318e0f3d284e5b8a0fe0e1f0108c834520dd3
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.3.ebuild
index bbd7b3069551..bbd7b3069551 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.2.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.3.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index ecf0833ec41d..f316185c5280 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
-DIST kgamma5-5.21.2.tar.xz 82576 BLAKE2B 5dade5a53ef340a75fb5b4e6839f4dbcd4df97af9e88ad73d8b7e5cc8eae25b5b22424fa5bed2eb4b2b7490c9413115a9544886e5eb691a869a0c27342afcb34 SHA512 a12a360ce4fbf9196cf72cc98e3c556df73bd949bdbb7e3018bf9bd956c7036ba08407f0012a41855426086ea2903937a959b2eabbb12d5e3f461a648354fd35
+DIST kgamma5-5.21.3.tar.xz 82644 BLAKE2B 6334989f8185141231e3201c36db533d5baeb30b331c35f39c8f9d502a63d0566633d9bcfdef3d87b80570bc27bb11d20053dc2e6ec37580fe49acffdcec78ef SHA512 56c5c8418699da1d1e860261744be4a6f496dec1db202d8ec697480585f99db04e99f69714e3baf560bf275d30da9d4c11e34eba73891ef24ffeac8b9dd13491
 EBUILD kgamma-5.20.5.ebuild 677 BLAKE2B 3bf52f57c349619543fbc9c21da7f2bc5d3f43392e1c93e443431316af858edbe98ea644f573e4b2bc60349436af3fe9891b62d18d7ebd097429e1f4213168a4 SHA512 12d05f2f9bc9a147f54ceabe03810b397f393d988050648debd992ec22d453210491ff2292a5034cc3efa3498708b8ec0dcbf5f03b6a1e25bd02942e45547d58
-EBUILD kgamma-5.21.2.ebuild 680 BLAKE2B 0ece52aedfb8ea461273608140e3c70a8f65cc1018499fe607dd7efe09861e4130be5f49ba70fac35c04047f6b7440df4f11647a58fa71e946c37ede66c74db2 SHA512 19a7a7a7cd7c0fcc890626edc802e7935a728d4b9bb5e0d7d2ce45586f12aa0364ecc96fbe43183614d2506e3521dec98c4dc0e97eb51699c62b95804e0ca3b3
+EBUILD kgamma-5.21.3.ebuild 680 BLAKE2B 0ece52aedfb8ea461273608140e3c70a8f65cc1018499fe607dd7efe09861e4130be5f49ba70fac35c04047f6b7440df4f11647a58fa71e946c37ede66c74db2 SHA512 19a7a7a7cd7c0fcc890626edc802e7935a728d4b9bb5e0d7d2ce45586f12aa0364ecc96fbe43183614d2506e3521dec98c4dc0e97eb51699c62b95804e0ca3b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.21.2.ebuild b/kde-plasma/kgamma/kgamma-5.21.3.ebuild
index af7bf1c1798f..af7bf1c1798f 100644
--- a/kde-plasma/kgamma/kgamma-5.21.2.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.21.3.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 6d47a97d5656..d72c32cafc92 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,6 +1,6 @@
 AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21f1661888d985a63d399bf79d8ab0fc502a7c85e1702b540cd6f5dcead1befc899c7fd3ae0c57266ce63817c12cc2e84d4 SHA512 6ec31bfe5b0f8cf21ae5e35b018829f1b88fbbccc39c27aeeac4e2463cf6c766cf9a5c51d832d7b06b14b3fc2cecd76ad5114e52672e0bd6b569034544caf963
 DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
-DIST khotkeys-5.21.2.tar.xz 1860440 BLAKE2B e280c6817942c33e4cf7efa30e225f8deee480df176c2738daa13cc010db7b18912e0c7f10b57bdb89706990d6e5b93e0d041e8c037f306ec98f20d87bfe775b SHA512 1805a7969d3cd0f6ac7077769e6a2bef483383aaef142082452e0941bc71985477577471499cc35bc727e61b49fbcf4e58b1ebf15730db0ae2bc6eaf17223886
+DIST khotkeys-5.21.3.tar.xz 1860500 BLAKE2B 906363046adec1a4617978082c82d3988a298a285d7a6e1968aa9e7ec908faa5466e9519ca56aceb19a2ac85aa6bc4dac92901cfbe9d816c02e00c9e61bf76e5 SHA512 f82db5bbede711979afd9b00ecc8bb6e250e31d074e59584835057586569fa56965809d16bec4b4f842a223f63369a53b68d859ed1199c73f9e0ddcfb1f80d41
 EBUILD khotkeys-5.20.5.ebuild 1403 BLAKE2B 38399ad2dab11d01440e70a695d87252cebba536ac1d839b6716cd75d334663a2e0291970eb11a5ab9f850578aae65e2c894cd7f2dfb1d076b25f2d03b937982 SHA512 acace4a1d436a6b976909b4358e6f8e94bb4ff85983af66f631fafbfc602c018ba99d6517421a76a69375e1469ce0b1e9c053b269151af1a9b161d16a05a79e9
-EBUILD khotkeys-5.21.2.ebuild 1349 BLAKE2B a4d1eb4425c0f5699d74ed4e87b0c02570fbddba4624f82ce7f4a0b848fb49afda4bcbe9e48e56fb9ee8897524402dc7475642555e0ac7ff2356c8d79900cfdc SHA512 4470d2c6d0c0c1ee24352a31f36b9588ef2601038dfdbb3e8faaee8473ec1bcba896bf80b483124a4a68de7a4dd9546c7499959893a6550583c342564a9232b5
+EBUILD khotkeys-5.21.3.ebuild 1349 BLAKE2B a4d1eb4425c0f5699d74ed4e87b0c02570fbddba4624f82ce7f4a0b848fb49afda4bcbe9e48e56fb9ee8897524402dc7475642555e0ac7ff2356c8d79900cfdc SHA512 4470d2c6d0c0c1ee24352a31f36b9588ef2601038dfdbb3e8faaee8473ec1bcba896bf80b483124a4a68de7a4dd9546c7499959893a6550583c342564a9232b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.3.ebuild
index 489ce01502cf..489ce01502cf 100644
--- a/kde-plasma/khotkeys/khotkeys-5.21.2.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.21.3.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index fc60bc976db9..a2ef33efd1e8 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
-DIST kinfocenter-5.21.2.tar.xz 1300608 BLAKE2B 5b89f542f446a380087f26f767d74487935aa49f6b907eb8497278d763167738c70c35a62c446bdd039423a2a241a507b82ce1cab54a2d09aa1d577a9744c265 SHA512 06b8326ce28dce44ea1df92c585fae7390d2882a3ea8cda10b8bd77f0542e24ef1cd12ca0bbd64bf082451702228d898942f3abeeea01ab361102efc1ecf931f
+DIST kinfocenter-5.21.3.tar.xz 1301136 BLAKE2B 9b859fb9e3035d3d1ce0ddaeada472333814d47c4db5c8a6929f4c452988f8ff7c2688fd7d3e71a1baa5061b1a4d26534c445c9dfadc18cd0d4a989937225e03 SHA512 d3ec710f2415050c26fc4321de79f188940fcb3b7f744f793ae9575acb5f11540e1446f0653bc58b1e5b8dabf387077a6eebf9490d2beaae1823a27467eb9992
 EBUILD kinfocenter-5.20.5.ebuild 2723 BLAKE2B 876ec8fa6011896043d29a9ca1d0d29f6a731a6cc76f7ffd92532afc590b95d76732fb662f562ffef0c92d967a4875460d2e584c52dd6a1b7c45066f9b8c9843 SHA512 93894982ca403bf8d813262c4a5ffe64a6d88ee92a16b82055f6011cb9a7fe31e4be8c0099b78620775290ee46b43c099901ba74bc67ad4bf0874b4d01f49905
-EBUILD kinfocenter-5.21.2.ebuild 2571 BLAKE2B 80fa094802787108a201339e487f869af21f90aeecda8aeff3436d66ad5f1b15c9f7e85376a360cbb258f81f347b07c8b12380dd5b5e74939b5f9a6c61ec8c69 SHA512 6e59d812b431d5bca6ce342447cba1c137a9024ef8582900a24a9c1e99685ad4dd5c2939717f408c42168af6fab9fd67643d75a3a51b996171033430ea7cb18d
+EBUILD kinfocenter-5.21.3.ebuild 2571 BLAKE2B 80fa094802787108a201339e487f869af21f90aeecda8aeff3436d66ad5f1b15c9f7e85376a360cbb258f81f347b07c8b12380dd5b5e74939b5f9a6c61ec8c69 SHA512 6e59d812b431d5bca6ce342447cba1c137a9024ef8582900a24a9c1e99685ad4dd5c2939717f408c42168af6fab9fd67643d75a3a51b996171033430ea7cb18d
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.3.ebuild
index 27a3658cb7d1..27a3658cb7d1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.21.2.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.3.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 1d85390537d8..8f135988d6e3 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
-DIST kmenuedit-5.21.2.tar.xz 899084 BLAKE2B fe9d8ae6db535479190f2f86e10ac5be3ba3884aa50d21d9b7d7c86bbeef4d0b8461ede7519c637f012cb7af71b030402733258e8bb1a4d7c55c40442cbdd304 SHA512 c1ecfb311d2384687d8a623e45482053f1b4ccba3534d96f2a867cf2268267865ba9152dacac046c5861d3ffedbc20fefba9d5e0d7b1d52959271be74eee732d
+DIST kmenuedit-5.21.3.tar.xz 899120 BLAKE2B 7b697dfc803989a50c3216ac5a11ea19fdac1b7766781acb01266fc94679e320628895aede1e0cb6c44eb1a16beedc734f6c820d8a31f01468e45ccc60afab62 SHA512 e7a4e1b7e6c858193d876774677e5fa650d75940705202897f500350b00b80f80e46aa3acf2eec0b751d77024088e76cfeef8494298b1967357484a7994b3ba9
 EBUILD kmenuedit-5.20.5.ebuild 1096 BLAKE2B 32b74d2ce2e60b8629a3be5c0bc2c8371b230e3b9667210b77ba40740bb5cd2bd253ff15d6e984cb44c6ed3f13f0a420adf017bbc6ab5d381d2b206e5ee4c978 SHA512 2c4598f4ca19dd8a00b2ce25b7a9185464350ecdf882f98157a6efa98bdf9a6a790c0ca3eb75f374da614448fa1878ce4e088cfa0ea01a47e110f3b1f5cec5b8
-EBUILD kmenuedit-5.21.2.ebuild 1099 BLAKE2B 74a2395ce6ae711e411a67c7e2908ae80b68531b3b5069b42a220662d882a1534c486ed3acd556b582b212f535c934cd9421f7e5d933ef19e23538507e43b719 SHA512 e12c911466e871c842c369a3356d1c38797850e1abc9ce2063c64f894fdf042d758ecee8505acf0e0dc7f6255e9fb98b7dd3dabeb08815e050899fa745615e70
+EBUILD kmenuedit-5.21.3.ebuild 1099 BLAKE2B 74a2395ce6ae711e411a67c7e2908ae80b68531b3b5069b42a220662d882a1534c486ed3acd556b582b212f535c934cd9421f7e5d933ef19e23538507e43b719 SHA512 e12c911466e871c842c369a3356d1c38797850e1abc9ce2063c64f894fdf042d758ecee8505acf0e0dc7f6255e9fb98b7dd3dabeb08815e050899fa745615e70
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.3.ebuild
index 2bf8c1c49a8d..2bf8c1c49a8d 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.21.2.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.3.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 8e4796712603..c0af78b76a92 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
-DIST kscreen-5.21.2.tar.xz 114628 BLAKE2B 325680d441fbb109ffc2c589bc8aea0e33c5ecc0fb2a79c0d7a02b7974708e6318d231955c82d41ce2be374476c7dc885da4ea4152d4e2c6a57b0a38276d7919 SHA512 c313b3404b58f97b5f2b005261a74171de5a37c769ec9348020108357dad0d04c96f4e42e041c5c8189ba3f404768ff995c24ae94e063b0f4edeeb88b8f4cc36
+DIST kscreen-5.21.3.tar.xz 114568 BLAKE2B e102946e4836e48c67c9261b51af6472d555d5af87be8bd41518b1c1dd3b6d06a668a4cc681d644927f570113ce4c19e949729b72cc37a931bd6a274cf5ed634 SHA512 e6c952e2a463c017e8888c84ca9d1bacd5b8bb1598e018c8d73e21adefd5145dd4cbc42b8816ae090d37225dbc5df0f0ae6bfd207d6388f59a08014f1c8a4370
 EBUILD kscreen-5.20.5.ebuild 1225 BLAKE2B 90e88d5de8bf1bb094912bd415f232e26723cc555be0107a85ce2c07fcde5be6ea00550c82e6e597673260c3364e7eaa1b28613e4c11944d1e48a576cf1a317e SHA512 75ea7aa848c2c453b9264c1975992e6aa8b1bd4b86f48daf58be727e42bbf0f21e1eaf670657c2ee8795b5dc721ff52715dd3d84bc185fc6727f76b71925fa18
-EBUILD kscreen-5.21.2.ebuild 1228 BLAKE2B 5af0e37ee6712365f678365b173e44f06b3654a1f09affc685eca5677abed37e317b8ee2813e7f32192fa74d44e9cd3804ad23f2300c5164bfc13c141f69ee3a SHA512 71e00ac5b1e885c8b2933d3fba7594bfb09bf49d71c61e3a5d0bfe219f180f5628c9c6f2ab8011fce87900faa3fba9810b301e0ea5fdd191b07a848c4aec5c82
+EBUILD kscreen-5.21.3.ebuild 1228 BLAKE2B 5af0e37ee6712365f678365b173e44f06b3654a1f09affc685eca5677abed37e317b8ee2813e7f32192fa74d44e9cd3804ad23f2300c5164bfc13c141f69ee3a SHA512 71e00ac5b1e885c8b2933d3fba7594bfb09bf49d71c61e3a5d0bfe219f180f5628c9c6f2ab8011fce87900faa3fba9810b301e0ea5fdd191b07a848c4aec5c82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.21.2.ebuild b/kde-plasma/kscreen/kscreen-5.21.3.ebuild
index 6a5279a3d2f4..6a5279a3d2f4 100644
--- a/kde-plasma/kscreen/kscreen-5.21.2.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.21.3.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 510c2490f057..08c0ab416ee5 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
-DIST kscreenlocker-5.21.2.tar.xz 117288 BLAKE2B 6d810607448219616353eae5ddc716a038a1c9a854436afa9fc245205e8ed129f3d3ec4912d51aa2efc455c6c4e1520c57d1e25a640d3ad178df2fd8e0254d53 SHA512 022bcda634ad64145517ebda02fc28941efab5526f785d1f1168670c215b2a90fa8b8565f0f2343f9e3c0578722e74068977d61a22b52153d5afd062c09832e7
+DIST kscreenlocker-5.21.3.tar.xz 117304 BLAKE2B 0cb2cb55b7c1cec3adfd0e782addd005fc378d9004f5dae8a4cefed0d1c4c7cfc8c4c462bbd447b98e10aacf8cc7bba822cffe1d5d15ed2996aafa090b3db5b0 SHA512 9a97bd041cc88e47ebfbacf25a57c3050a1afd867f0926f1bf435e0c88885c38252247a35b2c7e7aa067ff7eaf653deebc18b7befd3dc02c30324bc714f4bb7d
 EBUILD kscreenlocker-5.20.5.ebuild 2146 BLAKE2B 3d3dc126b774e8138200799d790f0085f97fce4656635331c378b842b38567e1cb3692c6da55650473144c457d96d167bc4b0620b06718787a32cc8d328de7d7 SHA512 9e2f4532549c8edacbe448e3291c7f3d4a40e02a3ebcd7057535ef0d380c114aad8a143378e743e9d3031becbe0a97a3b67a019dce3759517d3e53940618ab2b
-EBUILD kscreenlocker-5.21.2.ebuild 2187 BLAKE2B df5f250032a485be33101850a40aabf177952b449d980e72d11c6263b10e6a6267920e3ecbf76500fff86d86ceac9b73419b92401247346686e2f1ab9e3e40f6 SHA512 e92d78feca234fc66e52067d76cfe6dd6bdd10f57f9dea21667e80e87c4a2eb1db898b1ec73c6d0fd921110826a7c4a5e1c2afb7152db216058592e7811a6b8c
+EBUILD kscreenlocker-5.21.3.ebuild 2187 BLAKE2B df5f250032a485be33101850a40aabf177952b449d980e72d11c6263b10e6a6267920e3ecbf76500fff86d86ceac9b73419b92401247346686e2f1ab9e3e40f6 SHA512 e92d78feca234fc66e52067d76cfe6dd6bdd10f57f9dea21667e80e87c4a2eb1db898b1ec73c6d0fd921110826a7c4a5e1c2afb7152db216058592e7811a6b8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.21.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.3.ebuild
index b1c7212ccfc3..b1c7212ccfc3 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.21.2.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.21.3.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 12f89ebe909e..9f791cc2bc11 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
-DIST ksshaskpass-5.21.2.tar.xz 24052 BLAKE2B f59a1360ef0b8ebab16c121e084c5f73d89acb97c51c5e0582398b0fb0fc636a75917a4de6cf69a3739a58899d2581a63066ea4d6f11cd9b9aef4aaf921f91b2 SHA512 a57cf75d24b3f8a3db42d4defb8e8f79eb79ec8735658c7f48b2c6860c048bc3b57fd2099cd12501a43e2a674d892e568367a165770085f46f895395f8e4440b
+DIST ksshaskpass-5.21.3.tar.xz 24044 BLAKE2B e27a1940db0c94166e69e42365d1d1e83568e479b40d2e3065213e4e4f0a429a4e629ddef6a68d0cefb3785701f58c0ae67e30d266ed1c736198a0128b8d4f78 SHA512 4b7c7da2ab31cca88551ccdf7db25fd82afcaa9aab4141de9c82f774219e6d68154b953e4480687ed6cc0b96ab81f5b043c12d3d142e454c26ffda8a222becd9
 EBUILD ksshaskpass-5.20.5.ebuild 1433 BLAKE2B 6dd8e7879c893ce4ee72ed3689436ba10b2dcd013a9a65a44b2214045effdee41e5826507067bd0c5dd2796a2fd3cc195ed8d576f53ec96a90d6c235f7caa5e4 SHA512 a166ec2e7109ccfda8e8d942ebe4e8b377d1de94c83ef4d97a552a7d7ecade3a8e4eede2d06b9aa7a5bb94a714a83985ee9d59d44b244cdc2c51ec9fdb0e158b
-EBUILD ksshaskpass-5.21.2.ebuild 1436 BLAKE2B 78209e2214b368bd0e626c8cbc118853e1d470e98e7252d7695adb33a557db26e0e1cd6fbf07bfd3481fb84816685c3773134289f9ff03ffd0391c8bac7be9ca SHA512 4c3a1ea65d435496251578c5739e684cdabcdb17ff459bc2a85660222f318e1906996aa1644952f3e8956dd4b03876993929400b30a54f3e163394a0c55518bd
+EBUILD ksshaskpass-5.21.3.ebuild 1436 BLAKE2B 78209e2214b368bd0e626c8cbc118853e1d470e98e7252d7695adb33a557db26e0e1cd6fbf07bfd3481fb84816685c3773134289f9ff03ffd0391c8bac7be9ca SHA512 4c3a1ea65d435496251578c5739e684cdabcdb17ff459bc2a85660222f318e1906996aa1644952f3e8956dd4b03876993929400b30a54f3e163394a0c55518bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.21.3.ebuild
index 264ce2581b93..264ce2581b93 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.21.2.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.21.3.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index c6a8a0a54993..2fa07840a174 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
-DIST ksysguard-5.21.2.tar.xz 603684 BLAKE2B 36d8e853dd77a0c9a401dcb302ca4e5774c48b5db32c1ed98b94a5417dc33ac2cb47a6bccdbba3680b4264b969260f32debf386bf7829714716c1af88ed99adf SHA512 785ff5b6faaca4169af0bf389c1ebcefa68d21839945004670691481c19bee88cb3b821627ddc5fbbc353443cf63c03fba01f09fee41547e04fc29262e75c448
+DIST ksysguard-5.21.3.tar.xz 603504 BLAKE2B f367eeb84c591ac3cc42a816963505dcf2abf96095f1c53b1ffe6754e1f68134bf408dda7396efc70b6a3023fc3c523b9bcf55e5eb02015b208f70a8ecfe42cc SHA512 84fa804f79b84edd0334546d866cc50c81f229364ed310d1f4dd25c6cc8925cf0a9cba36f78290a964c7e2c6ff1d5159a7845d17afbf6a37b94a8089de9782d5
 EBUILD ksysguard-5.20.5.ebuild 1643 BLAKE2B d36fb83d570031f8ff00c8251ea6396d5cbd72ed88731ef5ae5700350e236136a6bc768fc878ee4e010fe2f62bd2482b2d01c34f8f05e6631ff86d17e8f706af SHA512 639fa1c575235b7e740787fb90c64a2eb87819332e0bf248b791b773f739aed18168d25214ae1bf2e8f01b1a2eec931d85a32c47b8b92ecb8402dba63922e849
-EBUILD ksysguard-5.21.2.ebuild 1590 BLAKE2B 4cf2f2f5fa67c32b6bb04b5aa6de4c235733f735097d46e21754f6d687a94524ca4d45ae6c6590c606d9099cfcb4d5442214caeed5aca06837ed68c66e7de6c0 SHA512 cd68c7295594f7cb26fa282e007c9cabf910cbe7fc3ff2dbd97bc47c1973a3294e67bb030d9955bce4327c40e9d5f9930e40f9e6be0078f3ec7d1cd1f094a7b7
+EBUILD ksysguard-5.21.3.ebuild 1590 BLAKE2B 4cf2f2f5fa67c32b6bb04b5aa6de4c235733f735097d46e21754f6d687a94524ca4d45ae6c6590c606d9099cfcb4d5442214caeed5aca06837ed68c66e7de6c0 SHA512 cd68c7295594f7cb26fa282e007c9cabf910cbe7fc3ff2dbd97bc47c1973a3294e67bb030d9955bce4327c40e9d5f9930e40f9e6be0078f3ec7d1cd1f094a7b7
 MISC metadata.xml 508 BLAKE2B 0c56534db9cc082a5aed32fc958940d305acadc6aea338945edfc1adc349b51437bcbc549fc1983b73bfe4b511a0328be0632571ada20dbc2f6cb15f7300de5a SHA512 acf19c8d5b52abe5a2c0cb8fa4c75262613cf673e597ae3b3a4ce79fee76d75fbd2632612267eb9e4a18b27d32ca9c0f5df3a9d6a68f67e9a99d87d51ed2dba0
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.3.ebuild
index 1a0b5be86c4e..1a0b5be86c4e 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.2.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.3.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 8e5736fe0859..3093265c2656 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,6 +1,6 @@
 AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b35b6d7550fc8fab1b30027bd31500bba2ef7dbb7e5b53d3d7a390feb4d81ff29646c76e3b53bd9032dd53e441409ed7406cc4630d8a6f93b2 SHA512 61bb0b7a344d9213d4dfb4258dc8e8a92ee94be7117daa9cbb54a02cfa1d1a746e57ec83107d375274f062e94759bdc59371064c712172c77740585a07684608
 DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
-DIST kwallet-pam-5.21.2.tar.xz 19896 BLAKE2B 41b2f4c01a1cc99e13f363ee2d25487e0e81a1548e4492bb2df4b8db0f646cf960a089154d322ec39886452485772a65c63ea7b0f5941fc14a4f24d8bf6bf437 SHA512 0b841dd93022efd06c32f1a0527d613c45e038468260b6713f27a5aeaf6b4c463864a982b263333783df8751948b72299c72eb8bca77992f2b332910d9953de9
+DIST kwallet-pam-5.21.3.tar.xz 19900 BLAKE2B 0aa37265de41b6e6194ea828797fad3313c12275de2e173d069c10ce9dd5ab61965a2aa0d5983e99e188fe48e3e56d240c769ba4f22b859718b165a84facc673 SHA512 66c86274dd96046a4e2ef9453f335ba270efcae36805a6058fdc7f95ed9aa10ee775e0d13b674d126351ea6175782cbc1eb8f3e378d2a5133b876dbbb2499795
 EBUILD kwallet-pam-5.20.5-r1.ebuild 805 BLAKE2B 955e48072ef94dc72e564c5d22a0a53ceac2f6e652497342b7ab9224551cd15b92a37d4a3a7909ff5039ec70e904b5a3a72860f8c24ba483c99a38e9d5b1afad SHA512 e7a5dcb9fa5a7392849c7602c5cb2ad730e12b62a98dc6b04556047db047af9c3b02827c681b487ff6fcd44dbbdb5c8603e4902338f6dc90dd9631f006be84b5
-EBUILD kwallet-pam-5.21.2.ebuild 734 BLAKE2B beb05743d815f9521942c13dd324e90fb9265d15e865d6291da95aabe6c5308cc9dcb11c1ffe2f1ca01fb94a4b9b6852ba3bb93fc01fa6f3af03851f0ec67246 SHA512 43c5cd42e4c87bc9c7dbdb03b70631b1243f04e88b044cf22d1a616d3f2f4226db0ebc1af827e804f37bf30bacb09e5670d8125fd371534a9e08d52add896218
+EBUILD kwallet-pam-5.21.3.ebuild 734 BLAKE2B beb05743d815f9521942c13dd324e90fb9265d15e865d6291da95aabe6c5308cc9dcb11c1ffe2f1ca01fb94a4b9b6852ba3bb93fc01fa6f3af03851f0ec67246 SHA512 43c5cd42e4c87bc9c7dbdb03b70631b1243f04e88b044cf22d1a616d3f2f4226db0ebc1af827e804f37bf30bacb09e5670d8125fd371534a9e08d52add896218
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.3.ebuild
index 8a587a1fcf29..8a587a1fcf29 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.2.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.3.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index ed8baca893d2..10b043f7a030 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
-DIST kwayland-integration-5.21.2.tar.xz 23288 BLAKE2B 970222d60df46b05cfe05e6ca8d54876ac4e952e23774a941339c5d23e092d5d84fab8863fd6309e1a205f0696bfbd060672d72abc189fed2383f82ce30de539 SHA512 e29a82b560f0bc489d78c5493d2e35b52f810a9243aa18f23a94552045507b6835971ac4a1a57ae3683b00460dcae3b98b32c437bbb0e2f3ee440512bdc4ef01
+DIST kwayland-integration-5.21.3.tar.xz 23276 BLAKE2B c76498ef08919c870f2cfef2cd5c97566fb4fb44a68e77ef26c6ccf65022edcafc48098446670dede081a55f8289e23a3276da10c4ef7cbd8bfd4d6d2f3c2f2d SHA512 d8a77a1c4c7ff6414c9f45b763ee44636df19e0cd5b9dac9d15f67c1f7efc2f8fa5dc0153903837331d45b7ae39dac4bb82c440d11b2538ec86b7836b02be784
 EBUILD kwayland-integration-5.20.5.ebuild 699 BLAKE2B 9a6e9b7c4d79ee888a4857ac896241f9a937d06b59c7e3cd7ee23eae6a2c17c41d21425969375f8fda76b44e11476e634712ca6eb8cce7781eac379b9d0b5b44 SHA512 5353f1632d829788fa7a1a4c6fb38cb99eae5f8005c7c343bec9ea1537c137e9af8e50770d6879dd03482956a11a4ccde5e85b9db5a40756f4498b809f4291ab
-EBUILD kwayland-integration-5.21.2.ebuild 702 BLAKE2B e731c790b15e48379fbcae8c2d21ce035ffb57a209db5bbd3fe7d566c89e36e994f7d2a375414a6c3aeb2016045a99fd252459392c4a64dcf145d29e290efd50 SHA512 f8efedf7d1a42cb763caee2a92fa9b0a21957e1ffde00dec4de8748ec976cd3e642a0dceb0adc2c195c1580c03573013ac258528c34ea9fb8b812789c45db578
+EBUILD kwayland-integration-5.21.3.ebuild 702 BLAKE2B e731c790b15e48379fbcae8c2d21ce035ffb57a209db5bbd3fe7d566c89e36e994f7d2a375414a6c3aeb2016045a99fd252459392c4a64dcf145d29e290efd50 SHA512 f8efedf7d1a42cb763caee2a92fa9b0a21957e1ffde00dec4de8748ec976cd3e642a0dceb0adc2c195c1580c03573013ac258528c34ea9fb8b812789c45db578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.3.ebuild
index 42cfe4a36751..42cfe4a36751 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.21.2.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.21.3.ebuild
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index fbcdacd9d386..556f016d2228 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
-DIST kwayland-server-5.21.2.tar.xz 219264 BLAKE2B de92e413b9e08bb0b72dc0f697657da686d49019d5012169ed05dc95eb013221c0d7534f78cd485255b6d33f37f75ce4722295e07ba462f8d813f46752b88171 SHA512 e7aca72a918302d19145e54eef7bc3c5e57c57a058a07d74422a9138a72948e8675df348cf115cef782f4c3a92ca04c35e1c5f49534328bba4004d49cc96e2d8
+DIST kwayland-server-5.21.3.tar.xz 219288 BLAKE2B fb73eddc6a76d0300dc3ac8fa8d733836328df9655eea72e19a16036cf48d12f5dcb6ebc1731732b72fc6ac4166a8094f8da5c5018a2a905e03379876ce4f06a SHA512 55a9317d7e4a1350cc1ffac37b59454c2eff09328e921c1e980ba3174544ebb04ddc29d5a25c085b6629e0591738b6de9a37f7d9970cfe94536dc2488d3c766c
 EBUILD kwayland-server-5.20.5.ebuild 783 BLAKE2B 43c0ca3b268f9ca661e2abd1aeb6eb0d51e3540a85034654af5077ebb25046b41fffe26c8246062e1dd4fc239be5019220558914e2f7d9ce40d24ec415f40430 SHA512 9f71f6e2afd18cb92be2c8db63c3f2b1787f84dd3c57843e1e55b70a2ae891cd33f7b6d3c12bc5dd7dc28661c6f43bcf4a95d05ddb92ace9e84c6fd8080cd4d7
-EBUILD kwayland-server-5.21.2.ebuild 786 BLAKE2B 2e28112087e217dedac8ef53fdb73163e386be669a26a28c75b5231d9563ac093af3596a71af9337ae2696cb5ca5db196130ffdbf2681f17cb9ba9fe8fcdd292 SHA512 5071dea6e346d76f4c3c97eaa1b1d013ba4f473202cdd41d4177448682dfad3198d53d1dab49c97134c7d16325a1f141047bd1663b2d8334947657ca286337ff
+EBUILD kwayland-server-5.21.3.ebuild 786 BLAKE2B 2e28112087e217dedac8ef53fdb73163e386be669a26a28c75b5231d9563ac093af3596a71af9337ae2696cb5ca5db196130ffdbf2681f17cb9ba9fe8fcdd292 SHA512 5071dea6e346d76f4c3c97eaa1b1d013ba4f473202cdd41d4177448682dfad3198d53d1dab49c97134c7d16325a1f141047bd1663b2d8334947657ca286337ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.3.ebuild
index 4850b06ad02e..4850b06ad02e 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.21.2.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.21.3.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index e52ceedfa455..5a4b7cf5c627 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,7 +2,7 @@ AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8c
 AUX kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch 5670 BLAKE2B 52c854a9fcc850f29a517eec5d6ced50ad840ce54f124ccd6caecb6446a67950463673e264d17af784d33b9cc44435a01e176a75aac285ff8169b6117c137261 SHA512 898105b424df78ca043d854bd811a112614b05d8df484705726c91149b47f505b6ffee494eb4cad81fe7ac10e922715e8d2b88ba11517d66c125c93070e5fd19
 AUX kwin-5.20.5-revert-new-focuschain-w-minimised.patch 2199 BLAKE2B 66835e1af9193c29735fe1f676e344927d1ed769b17e54a4b70abdd9d253c2eff22e0ea0f65fc2674c90868f008cce258b3064545619b1ed0fe36929194f0e70 SHA512 8b9c693c4293816a92b9d91964834bd52cb217c4369af442de1b0a19e107112941c6c0e982dd2757d55e861da6f00a8a95db5d95c9e2b7951f635516f149ab13
 DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
-DIST kwin-5.21.2.tar.xz 6392936 BLAKE2B 91c9f40c431501501a54484f39e48edecc56cb6b65a156417a2561bba496b251e1c6fdae25a8012abb4f69a03705a1f542f6269928464fd7e5cf5c16153e04f9 SHA512 46896c05e8b6729bed35540f7313dc22dea7068e6da794663e766a97349baa5c542372c32bf3e2adbec41b023c65d416a8ab929bd78d17efb680fe30efaaf4ef
+DIST kwin-5.21.3.tar.xz 6393736 BLAKE2B 8948b56323104a59f9c703ec8427340f7f940c59efe818cdbe81021942e50d4fc1ee04953155671dbe8df570afa2fe9669c49846c62c5a5807dd4018cd8ce656 SHA512 3cbf97d877c34b54dec1981ea01cd51a771615cf9fdfb227e6e27b1c423d80b76fd8dc578b13ae3d6311289e00173e00516a557f8f30e6df8c655d3547377a9e
 EBUILD kwin-5.20.5-r1.ebuild 3941 BLAKE2B 99593d2bc2ae9dd12ec340f2a610e23ae7870d2f88d2881707b65bd60efcc022f32c38a0420cc77b4dfa2ca542410040ef8efbb96d771af2f2743f6bd1d2238b SHA512 afacac18c55ad2325828a0d9387b024ff72884eb1de2e42fcb8494a978ec422d10c85539f2f986c3320e66a41ea85d3d3abe93d69c3e62de5373dc62f8aeeff2
-EBUILD kwin-5.21.2.ebuild 4014 BLAKE2B fcbeaf35c56c14c0b985b6dbdf0ca572bc98cb443493f0753f5b486882d13e70611f866b67ab60c4f7ef862b7ee22b7cf43e8d4348aa40442f7fdc822f8aba6b SHA512 0f84bf3a0ab0401d03c3335ad3c67601b1e41ea28ea6ac394350f2571b07ff625a7e285d436d986cd9ed6ce0f5f0080fbd3a1e736fa191ed503265e5c22b2cff
+EBUILD kwin-5.21.3.ebuild 4014 BLAKE2B fcbeaf35c56c14c0b985b6dbdf0ca572bc98cb443493f0753f5b486882d13e70611f866b67ab60c4f7ef862b7ee22b7cf43e8d4348aa40442f7fdc822f8aba6b SHA512 0f84bf3a0ab0401d03c3335ad3c67601b1e41ea28ea6ac394350f2571b07ff625a7e285d436d986cd9ed6ce0f5f0080fbd3a1e736fa191ed503265e5c22b2cff
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.21.2.ebuild b/kde-plasma/kwin/kwin-5.21.3.ebuild
index d8fe20f41eef..d8fe20f41eef 100644
--- a/kde-plasma/kwin/kwin-5.21.2.ebuild
+++ b/kde-plasma/kwin/kwin-5.21.3.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 808bc8e12535..4795ee533dd7 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
-DIST kwrited-5.21.2.tar.xz 20536 BLAKE2B ea705d7ec245c2dc7475dd3f545e78d1a3d139bfa940ab65334f51a0b8b546fde974dcc4d9d5626b74b93f9714dbd2843c43031f1edd739c57d559079699eeaa SHA512 3636d5eb5fdf0ddea9ac91a28c9302a0c090a825821540ae6592dc1f08483fb4f16705c9a0401c0378bc7b77c1f4d858af9501d1971b7419ff25c53e0a5f585e
+DIST kwrited-5.21.3.tar.xz 20532 BLAKE2B 5b88c4a2c1dcee69c53a6a9e602533f2c58ff83b3bb5b927a17465d75cc4683f53997a8d735b41b1d1193c59e793a582de0849350ad804fb77c7cb8b723520f9 SHA512 3290c62a5ae84fdcfb4783339d240e4a12bde71dcfdc0b9d5c77c5db45829295d224a858f62c9d1a647e8963263e8d272e8f9ab30d85aab88b12ee849c9829ed
 EBUILD kwrited-5.20.5.ebuild 592 BLAKE2B e61189e803740da434c1947b07f7cefebcd6d673f399d5332116741656f950a7a79f7f9159a6818b1f78fbdbf586586084a29d856355534ea97586143dd72a5c SHA512 4b772de6b79b9febafba47e68f5135607f9485a49b0c3639236288f181ba1606e2b8d057c56b7241564baa6af785770e396d45d0f78e21c026e9379b66474008
-EBUILD kwrited-5.21.2.ebuild 595 BLAKE2B 87805904849621a12e2e4ca85a8251998337736feeaad43a7bfe3e94278dfdcad12b38f78fed19c15cfb8c8c1c99604ad5d89b565e8a072e5bdde6026246a9fe SHA512 182ca4dd5c1bad07b7cd8fdc2456db2193820405ebb547fcbd0ba975f2bed7becc87e57973c911ef756904c9e8a28781d98f930b70c6a6b33ea53473c117bc38
+EBUILD kwrited-5.21.3.ebuild 595 BLAKE2B 87805904849621a12e2e4ca85a8251998337736feeaad43a7bfe3e94278dfdcad12b38f78fed19c15cfb8c8c1c99604ad5d89b565e8a072e5bdde6026246a9fe SHA512 182ca4dd5c1bad07b7cd8fdc2456db2193820405ebb547fcbd0ba975f2bed7becc87e57973c911ef756904c9e8a28781d98f930b70c6a6b33ea53473c117bc38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.21.2.ebuild b/kde-plasma/kwrited/kwrited-5.21.3.ebuild
index e2ebeb45a573..e2ebeb45a573 100644
--- a/kde-plasma/kwrited/kwrited-5.21.2.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.21.3.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 09bbcfdfc110..9e6b5e7a107f 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
-DIST libkscreen-5.21.2.tar.xz 84708 BLAKE2B e399d4f6af794473b20e6149ce5eee19f24a17ee76be8b80b142fbe449fc89b95fbf0afdea2b86cc0ba3e056d7858e96fb03fcfe849ed95ee4abc0d289760c08 SHA512 9d62775e97ce01ecca7d320f00e83db5b73a23511fcbf03560785d32f407d9a1cd1c1cc301de49103c75a6694991de503cdee5abb084b402cbea4a5b959cbd9c
+DIST libkscreen-5.21.3.tar.xz 84668 BLAKE2B d4414b260a1df3d3cfb5c5e0b1d6a561d287b7efd69390e8d95290b4472c88cdecd69195136c4f4d38129534b06adde14c56c2bb517b9336acc61ded6c3b4a12 SHA512 6c1e9b0d58fe0d14c5f0364913fed423de6ed6b315fa6d328e7d79aca66c591a47b79cb81e803afb9f6fef4828328eb70aa4c4809902dc6a626a06cab9c338bf
 EBUILD libkscreen-5.20.5.ebuild 647 BLAKE2B 5ed57c2ae5202c78bff6a157b0e13aa9e14823407ebfd1c965e450e5f3cfd3a374bd6a4e505edf6359ddab7ed0f524529548a3d9dd9ad3c993f6505c5cb22b76 SHA512 b42752e489219cca984fcffcb5c7d1910a6a2d71b4335bda4f2ffa1ebbd6b0593ae47d1ae1c0b126ed5141e56c25fbd105f99cbc954738c22f21dc5d2b746b20
-EBUILD libkscreen-5.21.2.ebuild 650 BLAKE2B a0149add0cbfd3b0d9d284bd66ae2218614406abf327314973628da7ed99c8f273a0c6f84894a8ac5d01c6f76c38032f42a27d65ce747bf7498d4ac1c3ef08bd SHA512 1f3c449d3b6b4649ce75401a0459ae1ca5864840b2f5d86b20f36e63c5558640edfa7d413785e9ce5536fa10e017653b9cdfe835593c6a01242c44e585dd5eb7
+EBUILD libkscreen-5.21.3.ebuild 650 BLAKE2B a0149add0cbfd3b0d9d284bd66ae2218614406abf327314973628da7ed99c8f273a0c6f84894a8ac5d01c6f76c38032f42a27d65ce747bf7498d4ac1c3ef08bd SHA512 1f3c449d3b6b4649ce75401a0459ae1ca5864840b2f5d86b20f36e63c5558640edfa7d413785e9ce5536fa10e017653b9cdfe835593c6a01242c44e585dd5eb7
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.21.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.3.ebuild
index 41c0ba6395cb..41c0ba6395cb 100644
--- a/kde-plasma/libkscreen/libkscreen-5.21.2.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.21.3.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index e619bf4a6016..666417a8a81f 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
-DIST libksysguard-5.21.2.tar.xz 706112 BLAKE2B a0bd668b1ebcc9b99ca9a4368f4c165632f06b16842203df8e94e14b99e4bf5bd292d27b7dafe7dec51ef836874b64203a74840248b3be1a02e01706e625d49a SHA512 9508df88feb13b6ea24a26f6dfc086f2149e612d7b3f661c13c9fd774dd498dedfc29e4bddba1dd1a8514b197f143ce92c25e4b788ac1ca4b2d5873ed8075225
+DIST libksysguard-5.21.3.1.tar.xz 706316 BLAKE2B 40315fbd3a8a3927abf67a00808ccfdfd5bdc5fd7b24af64fda916df05c70664d8ed4748770a364a34a6e465c7f73dbb5851cba268a966d580729d2eeee3b630 SHA512 399318b5a6565af1da68de45b78a8a359e84ecd5e49cdecd5cb62dbdfe69244fa1e4a5898c261bf1f48ef1ac85d593a667d70080130d3b4b55df6cf17d1b13f9
 EBUILD libksysguard-5.20.5.ebuild 1689 BLAKE2B 89ab4bfe0742a8b6c3bbd6e8d356527e78328e9ba96d9a27ecb0d19c8690d1ec65f626e43e3ce5379100f90de32a9b17cdeb82170ec8b5b44f0b29ca88195d05 SHA512 acb35714b8b71469fb5ac15ce0d5283d79d01df335e5fdb3fa97aa5102bad9554fd35a808ebf8ed466477d4b07b86ab7e35325fa9cc7f42c13f6e4b226a14e18
-EBUILD libksysguard-5.21.2.ebuild 1692 BLAKE2B 8722300112574be9d64f40d6f16ca02f0e6b1f6df5c39444f01c8980f6a6f6a2f86707934a2c347236eff6a458b9340dcfbc37ce8fab3c291709377cd2a7344b SHA512 dfca3099d64f978bd907d191618fde54909352bc70eaf4917825b1844bd6adb3f13b9c81b8a04cf729b082b2bf3486690986281636c88c1aaa7ed786fa093446
+EBUILD libksysguard-5.21.3.1.ebuild 1692 BLAKE2B 8722300112574be9d64f40d6f16ca02f0e6b1f6df5c39444f01c8980f6a6f6a2f86707934a2c347236eff6a458b9340dcfbc37ce8fab3c291709377cd2a7344b SHA512 dfca3099d64f978bd907d191618fde54909352bc70eaf4917825b1844bd6adb3f13b9c81b8a04cf729b082b2bf3486690986281636c88c1aaa7ed786fa093446
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.3.1.ebuild
index 8fe421d7b8db..8fe421d7b8db 100644
--- a/kde-plasma/libksysguard/libksysguard-5.21.2.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.21.3.1.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 84fcc3b3e85f..dc956a75ee75 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,6 @@
 AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
-DIST plasma-workspace-5.21.2.tar.xz 9712516 BLAKE2B 6b355cc1c654cad00aca204c43b887140444e172e6aae38b216bde4fa60c69a6a6d996e7190d892eb5e2768f2b250232329686f5da1964d7731808d4d6949c05 SHA512 234f40bdecdbb63df065ffa9a59b0acfd6e796fa9a66b7116de50cdbb78f3333b6247f7c0e4f68ed4e3d8b3b0eea6b7a7bf65deb1ab0c933008cc59bcef61fc8
+DIST plasma-workspace-5.21.3.tar.xz 9713648 BLAKE2B b5a2d68ddf6affcdadb54219fdbcc1c134c6654716c6744489ca4d7393743d9c7eece8ac055628e5251f84eef4867422aa53b6f6152e9ac8e7e8701bc082549d SHA512 a27ef58b6d75f9a7ad6f3f7383e66a3d94d8ccef9eb762c4c3dad8dd18522527b878416c4a5051afd13ff40935912af5eb60d68efe001129daea436b82ed07a0
 EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15
-EBUILD libkworkspace-5.21.2.ebuild 1412 BLAKE2B dc76b5ed98f5d012b685f756a5601a1e4a6b9ec28198993237c66b1fb513e9c12a78ffe1ebd04f1b9c3bfe292a3ba5b78fcd373e2585a3edb9d2ef583c49937c SHA512 17630960b9279510e25892787c051645fc65a18254f0a3b8b109162d43c6cafd8b15b4603d1472e7f6a9a44d8f880175227b3956f062eabade9f969e6780a80f
+EBUILD libkworkspace-5.21.3.ebuild 1412 BLAKE2B dc76b5ed98f5d012b685f756a5601a1e4a6b9ec28198993237c66b1fb513e9c12a78ffe1ebd04f1b9c3bfe292a3ba5b78fcd373e2585a3edb9d2ef583c49937c SHA512 17630960b9279510e25892787c051645fc65a18254f0a3b8b109162d43c6cafd8b15b4603d1472e7f6a9a44d8f880175227b3956f062eabade9f969e6780a80f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.3.ebuild
index b11c824373f4..b11c824373f4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.2.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.3.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 546a2cdb8830..0d77646a8047 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,6 +1,6 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
 DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
-DIST milou-5.21.2.tar.xz 43792 BLAKE2B 75fcc210a52daaa400396e305dc62b38720330782ec0d9335336a5560a6d01e1ce3a4e3ec614ebbff635fba77ce432c8ef575b85fd4cfdf633f554734d0253c1 SHA512 957d46ba35b465a5069e859e4cae2b01ae1f51387af409f16b1420be608c57cf7109756a8cb428dadb0b2ac437dd4a4d2682ffa921511ea334d9ab1a4f340461
+DIST milou-5.21.3.tar.xz 43764 BLAKE2B 755cf9243c8b486536a87306e499598058cc2380fa496271a8861974518969c94b1196b0d7975d72417cd84842a7546412a380debdea8510f7f5b160b9f1c51e SHA512 62f9b8052e20d50dd0ba40b2fea6326453bf6b3bbb4eb1e33f8b63563d46e746d50f95ae52f6f1686962ed3df84ff8b6d20fa636249efea6410d522f1d11e2df
 EBUILD milou-5.20.5.ebuild 913 BLAKE2B 828d57300e687005e26521d5b2a1319865ee34291750fe66d5e2e2eea738090269035d242fbb8ced5e247848d0ca8a323aaa63bbf9eea3655ff8ef8e83caae9f SHA512 122b969b228816e4d2552bb5e52acd11efbff05b4208312b59049981abf94de250f04b3b38f08ab55c6e1f2ddabb4af86bf4abedf7a7790ac84d455136fae34c
-EBUILD milou-5.21.2.ebuild 826 BLAKE2B 174d1ca45903ccb1f8bc9b65736b14fdd433c6f461f0deebf8a01c1e5412a47137d8ea08ed05dd3fcf4b0c5609fea7d3a81524e5fe4c6966d4d9c2de868a3619 SHA512 2b9c9b644bb0534b0c8912b1e62c75666a1ec5e53e8fa874257fe04ceca0a5ab1637c200241fbfdad30a823171f8755fcff6d24defebe4328aebe4967e698c27
+EBUILD milou-5.21.3.ebuild 826 BLAKE2B 174d1ca45903ccb1f8bc9b65736b14fdd433c6f461f0deebf8a01c1e5412a47137d8ea08ed05dd3fcf4b0c5609fea7d3a81524e5fe4c6966d4d9c2de868a3619 SHA512 2b9c9b644bb0534b0c8912b1e62c75666a1ec5e53e8fa874257fe04ceca0a5ab1637c200241fbfdad30a823171f8755fcff6d24defebe4328aebe4967e698c27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.21.2.ebuild b/kde-plasma/milou/milou-5.21.3.ebuild
index 34bfd6694bc8..34bfd6694bc8 100644
--- a/kde-plasma/milou/milou-5.21.2.ebuild
+++ b/kde-plasma/milou/milou-5.21.3.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 4db125114106..41c998d1ce03 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
-DIST oxygen-5.21.2.tar.xz 4475220 BLAKE2B 4055528a063e8737e64572e358117bb81971d71baa2ed2a1849cfd9dcf7c9ae3bb423e196f3be144455f7f8c9df78db727d5b5bb37835df09f6ba10aafc252c2 SHA512 5f2f98a107c6e25c464a8f0e516cf3bdb8f5dfa3a63b816b1e87e504a850c065ff8795da5a4d3fd5009e9e93f489b8768c1f4c2b6ac461331752d9c90e07cee4
+DIST oxygen-5.21.3.tar.xz 4477328 BLAKE2B 92d939c66929c6862e5d9b30a4afd3d44a5d251c930fe2845f17190f3cd19bb6a0a11d9f20188740401d09453b0e8d44f5738e08cfea5b5a2e468b61ff4b975b SHA512 f4d420a2b4a3db06a801bf067e7ccdc5e90613456bc6d5175050981e7bbc818b20cfc2a8f6f0b52dd50ff697f310e6bcebecf93b348cedccd062e2e1215d3838
 EBUILD oxygen-5.20.5.ebuild 1363 BLAKE2B 7c9c6354c95b83c9a998c7a52f11cbf6524031e3ada6fe351b3defe401f2c418f54b1e6f4808454f1141d55efdb1896d9cc388412ea97460928690cbd91ed20e SHA512 9bbfbd9f56bd3343356174581fbb912eada64ba1f2bc5c3468dd12da5b12efc5c38a88135248f76598e72590e2eb54eef7a80b3ac8292aa39afb5e6c16a978c9
-EBUILD oxygen-5.21.2.ebuild 1366 BLAKE2B f9f685072a018fc41718742036547fb54a4abb912e2ad11cc211ba3364e8975c9aca0e5ff9e80cb71d39cbcfa561685b53fd0aee17ace68ce6179bef3516541c SHA512 10fd34e2a536cfa743c69ccd44f9f44a27ad3572bf1f335051bf3c5955c8f9441c9069caaf1a556e9d15e2e3eb42895086cf9b4921bb00badb6ddfdc1c5de36a
+EBUILD oxygen-5.21.3.ebuild 1366 BLAKE2B f9f685072a018fc41718742036547fb54a4abb912e2ad11cc211ba3364e8975c9aca0e5ff9e80cb71d39cbcfa561685b53fd0aee17ace68ce6179bef3516541c SHA512 10fd34e2a536cfa743c69ccd44f9f44a27ad3572bf1f335051bf3c5955c8f9441c9069caaf1a556e9d15e2e3eb42895086cf9b4921bb00badb6ddfdc1c5de36a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.21.2.ebuild b/kde-plasma/oxygen/oxygen-5.21.3.ebuild
index 704b47383914..704b47383914 100644
--- a/kde-plasma/oxygen/oxygen-5.21.2.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.21.3.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index a99663d34a59..9839f91eb66c 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
-DIST plasma-browser-integration-5.21.2.tar.xz 203048 BLAKE2B 9e9d1a13c0c0efd0f8a62a40bd31049adee39faecc04d8834e07160f363175a55cf89fd52b0e369bf807ae22612605321fade227d3599c0d81873440afd16516 SHA512 bcd6c8027ee322f340467dfa35ef71f6373edaee1c80a9dc5c1f49f17e1da2446dfbef3b0dd3534e72a009ddf7903a36aa7102a680224e6d02a2b27cb71b7962
+DIST plasma-browser-integration-5.21.3.tar.xz 203108 BLAKE2B e9744ee88a3a242ca66e7b56dee924a43cc629d61cafc2957198ea08d61f2280e530a45b7b3473cf9243aa0b6d814c3ed05b57ecd4adc81454c3b3c42e7635a2 SHA512 82ddf808cd57c87b8cc4ade8f6978f032d38e7dc98d39480d61ec5a0e9ad85fa92ccb54ad01e3c60dce79d100d1f0a7f4d8e373747610b04cc4b9315c8a6f75a
 EBUILD plasma-browser-integration-5.20.5.ebuild 967 BLAKE2B 1828fad5558bbbd88b3341860e17c42540eb794a8fe42bffa4f5bc39cc31564cef001bd643592af374d3e4f55796fdcffb1298e9c9665bf7bf22aa5c5d5f169c SHA512 9363154d26a04e728d16688f60f357a8cf4a5d1a53ab446523db95f337fc3dba2817be615f8059f35547cdf8cf862f3712e62a05a1a0576ddb09af832702c5d0
-EBUILD plasma-browser-integration-5.21.2.ebuild 1012 BLAKE2B 66882e1122761d060b97b7c2159b4b5ed74308279a0c423c07b947249ddab66e081f5eb29e85d8df9f395f3a823cbe9eb730050987cbd66409113e462898eb0c SHA512 0b93a8bf8d6e5da64c919bbe7664dea2ec5834a7f75da9c42a9610da0518ef986c722dd20151f7deb062bdad7f716f8b8d76d5602cacf5b4b046bcacbdd2ef92
+EBUILD plasma-browser-integration-5.21.3.ebuild 1012 BLAKE2B 66882e1122761d060b97b7c2159b4b5ed74308279a0c423c07b947249ddab66e081f5eb29e85d8df9f395f3a823cbe9eb730050987cbd66409113e462898eb0c SHA512 0b93a8bf8d6e5da64c919bbe7664dea2ec5834a7f75da9c42a9610da0518ef986c722dd20151f7deb062bdad7f716f8b8d76d5602cacf5b4b046bcacbdd2ef92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.2.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.3.ebuild
index 770d65f8835a..770d65f8835a 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.2.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.3.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 71323f7537a0..62b60bf5703c 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
 AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
-DIST plasma-desktop-5.21.2.tar.xz 15909952 BLAKE2B 410a7d811eb293ec03e857ac2bf5761606e580168b3347046914423e66eb22b65945db7fa1c3455c38ef3a8564a28db114ca6ce943737e98301eb8f9e8b59aa1 SHA512 43f4288b4361f4a8ba14a39856ce33a7e92a1a3c559d6e27d664cdf62ae94b59d4e66e08a93a05784bbea2136c7ddf325ed9d348c269f3039d31382599d46e20
+DIST plasma-desktop-5.21.3.tar.xz 15912448 BLAKE2B aa30c80145585fbe621bd9a38778f2b9615a13a4105345040dfb47c436109fcd5495e5e5bc26a49f91f99f240bcbe6460f78a14cacb36713f093dcdae765d882 SHA512 1ba606732eed71b384d87953dd3083d5596b38589181bc8758b87dcf4002098ce247601625f6f2c8a52bccb3239f91c03f081555b529d459225384d9c4db9ede
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
-EBUILD plasma-desktop-5.21.2.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
+EBUILD plasma-desktop-5.21.3.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.3.ebuild
index 9c62103b0a89..9c62103b0a89 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.3.ebuild
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 67c3fb3db32d..21283d99d27c 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd
-DIST plasma-disks-5.21.2.tar.xz 70112 BLAKE2B 4983046554b0bf4a4540e59b5d4c4afa1fa6476410866c6ffcd3153c12e7c28fa0e9b9470b89569a83fa3349e5c0b80e5f39011b86373e50c67030c307e206f1 SHA512 bd8e9c8001e06e41a5c63b7ada2a39204662eb959e2b61f57b2ac5febbb61fe5292e7f148e884163d4aad293152b77a05e28fddc7cc90d824e4beaed48491244
+DIST plasma-disks-5.21.3.tar.xz 70096 BLAKE2B 1cd6a13362bfcb5bd58839b79703b5c4b6dc1376224ff73b1216513a915ff86095d9b49c12cb6c6719be1ba9bee600e16ed0596f125ef452e1806b7c84d415c5 SHA512 4e587d1cf60f547a133bdc3aee0ed6418d4f8404aa85722dfd01bb9ea308d36f20c230c36ecadb1030a4d4c5ea6fdc12db8e5f1b8fd7aa55405c3e57d1130ac5
 EBUILD plasma-disks-5.20.5.ebuild 1030 BLAKE2B 927fe7401594d9e5078d6349b599550e5a1151bdf34afb9c02ab6849a53bc868596d48973db1c025471013a7c1913d35465874f7bdef33a2c945da1815fa3991 SHA512 a32351344827faee19cf7dc2a83f28f956cb3ace3096c424c7c881ef68004b201df7d6cfdf9fde870870377d920f73b82edd44dc3918e7eb6d2010be0b7c8aae
-EBUILD plasma-disks-5.21.2.ebuild 1033 BLAKE2B 869737b0f6b0e30df52c79536b43b7b76a1234f80e4bb7feba9c63e0e7d6f01ba952f73b4da94fc4ce5d1e34a876eac834c1ee71dbb60d7728789d93d87af047 SHA512 20400ff9dd87e44b4f894a08ceecbb0014751099b3283790923d4f45c7c931e41116ab860c9f8373c94c00cafbf56db289aecdcac5b31ef1c563f2e230c497c4
+EBUILD plasma-disks-5.21.3.ebuild 1033 BLAKE2B 869737b0f6b0e30df52c79536b43b7b76a1234f80e4bb7feba9c63e0e7d6f01ba952f73b4da94fc4ce5d1e34a876eac834c1ee71dbb60d7728789d93d87af047 SHA512 20400ff9dd87e44b4f894a08ceecbb0014751099b3283790923d4f45c7c931e41116ab860c9f8373c94c00cafbf56db289aecdcac5b31ef1c563f2e230c497c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.21.2.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.21.3.ebuild
index c37f759db76c..c37f759db76c 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.21.2.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.21.3.ebuild
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 02f212214653..0bbd3230c9e4 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,3 @@
-DIST plasma-firewall-5.21.2.tar.xz 329812 BLAKE2B 218ec0e8db734515b28f7fd5a6d9baad740bf2265cf243afc82d67c29d3e34a312c9c41febd5bdf99903178a9be5a2c923992de8e8889ffa5717fb11861f16a9 SHA512 6163c7367cc376f7f291e8b175b3d4df8e209199cc393c9d4d9246926a5f275dcb6181411d3d4a969293c6a7ec3c4bc8723fdfc4b79bfd15bf022421fc76e170
-EBUILD plasma-firewall-5.21.2.ebuild 1184 BLAKE2B 06193a713d0584377d2fb365a847122648da038004bc65686364f2d47d36e51dd3214323b36c3c76488a53100d93b2b83ce5bce52fa997acde19d01240dae5c2 SHA512 f2d55d19129374343cc98b943d2b047b5138b6bcf65172304392157dcc578d1dceef83406a25cb7a252c8d8e1face633129bb096a3efe00286240960c3a15c28
+DIST plasma-firewall-5.21.3.tar.xz 330072 BLAKE2B fa05c2633f8076deba11b990aca565a931a908c5a7587f6f5b593da0aa71c65b48f2f401b58f0a91ab1860b5d0510986e3f1561f25023627b7f6c957f63c63d2 SHA512 2b0094dd6f0af41f1ad68f9ec2a1d3738af6ed0021678285082a23588d198cc08adeabc776b227204b3b780114dec64f7747b0c8dd2244948a97e3889cbcc087
+EBUILD plasma-firewall-5.21.3.ebuild 1184 BLAKE2B 06193a713d0584377d2fb365a847122648da038004bc65686364f2d47d36e51dd3214323b36c3c76488a53100d93b2b83ce5bce52fa997acde19d01240dae5c2 SHA512 f2d55d19129374343cc98b943d2b047b5138b6bcf65172304392157dcc578d1dceef83406a25cb7a252c8d8e1face633129bb096a3efe00286240960c3a15c28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.2.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.3.ebuild
index 96551e71e55c..96551e71e55c 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.2.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.3.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 50d0c918d9ec..ad857fe60763 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
-DIST plasma-integration-5.21.2.tar.xz 60928 BLAKE2B 4ca415b8a0e1cbf7ec9e0fef58aecc03839be2609dcea1b3de5263ac1d173a8b63ea20ab59526d29f80d934f817095dc9404d7946985e3771a42fd4a931274e4 SHA512 18011cda7785fa99e6921c0a163758a1de76a8b641fafcfeba9919f551eeea9cbb61156349fd47333ba9e1794cf6feaf795a2d4bfcb260982e86656ffe62d774
+DIST plasma-integration-5.21.3.tar.xz 60952 BLAKE2B 447bb473f6e540bab59cd45348511f717bd8eec63eedce050c1905bde13831b8aa2e27e9d546224cd72094b90c843edced0f7e455b9e0166f07e05957e2952e3 SHA512 3ddf4b100caf026bd01c1f2898a0c0bfb73d98a2fc7254f0a217ddcccc4983ec4cacd518b9e42ee3794ab972a79898a5c1be62affb23530c80614d0f688073ce
 EBUILD plasma-integration-5.20.5.ebuild 1235 BLAKE2B 194e3e91201852ac809135bbcb2ffe9c0a19a36bb580310af719d53c4edccb860be165917d484d283dde10a3134576887da66a9369690dd84c96496c1a0d3748 SHA512 e82e9265f293ff1a50bb8b02cc84c3fe46035cdccc8a5bb4970c29a5734e7dcf1fda1a5736a2320ddd178fb83e8ef14cf96c7503669fbf8eafd5863fec350e46
-EBUILD plasma-integration-5.21.2.ebuild 1238 BLAKE2B 96b065cf1d222f0bee22340748fe946ac96e07c69a68ac9801e62870408ea4e9a605af9a2470eaef1ba9f5c115574d9dcb3ef90f679f763e4adc1954ce983a55 SHA512 f272b795211b2010b83728f1b49594c34edfddf39b2f7f9255d9f0456daf7e6a3b2ac2147a7b832c1dc32445ee46f3b90780f9907c52f1fedacf314fb2e75d5a
+EBUILD plasma-integration-5.21.3.ebuild 1238 BLAKE2B 96b065cf1d222f0bee22340748fe946ac96e07c69a68ac9801e62870408ea4e9a605af9a2470eaef1ba9f5c115574d9dcb3ef90f679f763e4adc1954ce983a55 SHA512 f272b795211b2010b83728f1b49594c34edfddf39b2f7f9255d9f0456daf7e6a3b2ac2147a7b832c1dc32445ee46f3b90780f9907c52f1fedacf314fb2e75d5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.2.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.3.ebuild
index 30c2bb013da9..30c2bb013da9 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.21.2.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.21.3.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 5ee17069349e..76abf0247514 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.20.5.ebuild 3646 BLAKE2B e0e2f932a40c719a31a3c083c92c79d0953106ccc5f062d1214f4c93f8fd598182fa9a41910db67f1d1cff9a15164a4167fc11640060b15c4d5f8baad8909f52 SHA512 a483608e1b05606a3b93189beda17e7dad428cf183d48b8425dbb2d69124637fe34d4ff5ef499a386a7b9418f983d4181744d4fd6b860e201c1478edc4956462
-EBUILD plasma-meta-5.21.2.ebuild 3803 BLAKE2B bd9d712ddac7b4b7e47fa0cac2a140c42eb836c41d985a797f4097a88173d64e1527f9c849bb06041035291fb6a9cc40c0004c2c678eb4a4bf78648b4c9622a6 SHA512 1cafd4a047951184a0b564d958d8f4d13dfbfef3fe949f4fc7fed1aa1edf40ebb424b13084524f5460ca16ce22c33020b727809f52e993b38aae7202ee1e7daf
+EBUILD plasma-meta-5.21.3.ebuild 3803 BLAKE2B bd9d712ddac7b4b7e47fa0cac2a140c42eb836c41d985a797f4097a88173d64e1527f9c849bb06041035291fb6a9cc40c0004c2c678eb4a4bf78648b4c9622a6 SHA512 1cafd4a047951184a0b564d958d8f4d13dfbfef3fe949f4fc7fed1aa1edf40ebb424b13084524f5460ca16ce22c33020b727809f52e993b38aae7202ee1e7daf
 MISC metadata.xml 2201 BLAKE2B fba16211ef409ab937c66a0b0cff7e2fcc2f0c97261836affc481114187d8c1280cc3d06b387656f6e176eac39839b588ff536ce3d85524cf34691b09fc260fc SHA512 ec6ea4d1d873345f63df46b097b59c76bb674120b0813e7a4634a17bd0319c238f892cc7d59f745279f8a3e6a0f5df1cb5d4cf22017c15a298d699d9d22e2186
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.3.ebuild
index 05c656162486..05c656162486 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.3.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 62f0056f8794..92bd5a24e13c 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
-DIST plasma-nm-5.21.2.tar.xz 896436 BLAKE2B e45e92260919eaad99767e2aefd2bf5ec20bd98118076fd12408ff2a4165083993a90ab46b71e036e814845b0cd0ba76505d781d949e854b0a7fc7e77ccb1175 SHA512 c5d856767ef51f1e90a93cf07310f65aa94b32dbb3c2b761ae4474f69d77c9bf12f4c65da68b04f80d64c3c4ca8717661cce24bf44200eabcdade50cdb5ba3e6
+DIST plasma-nm-5.21.3.tar.xz 896180 BLAKE2B b5f0f9815314d1543b36688c35d4bc1c4a818dc466db05e916852ecdde9fe5678de3a6ceb698b44054f050968cc3d9b118fc841ee08ffa91fb1c2d3d71ac6ec5 SHA512 1d30f091936f06e0d971def64be02353235daf9675a68c95c9d0d69b361c3c516eabf0b1f8b34a215f17bc6f3efc323bd770f15ffa8e860c48da49d8eb12e2e6
 EBUILD plasma-nm-5.20.5.ebuild 2320 BLAKE2B aced27381cb8b277a01c3d4b3799cc51fc8936d867bc82112fe5511ac5cda11ef1a52bb76122974345c21449218d4185d461979a670898ccb3191903e683a7e7 SHA512 364e2fd1608293b335445c867a1f7b20d652127cb81fd6fd353f575058ab70271113765a09b99c7355662e63946aa205b4532b7a4b2a37d1cb6655956a7b48a0
-EBUILD plasma-nm-5.21.2.ebuild 2282 BLAKE2B 7c1b2813717dc39483a257860d11e3cbaac35afeeccf4662462d1f825696f989200267322209637b21a9737e3e9e69cffee871d9f612ab8e3e86155de6755fa2 SHA512 4340c6e6803aaf7c9106be05f2a7121ee2292b9dcf332b35ff0102ef5bf9a654e5e009223c13172ee289fc8c43ab1468568ad726e8618bd7b1e8c4086cea1c81
+EBUILD plasma-nm-5.21.3.ebuild 2282 BLAKE2B 7c1b2813717dc39483a257860d11e3cbaac35afeeccf4662462d1f825696f989200267322209637b21a9737e3e9e69cffee871d9f612ab8e3e86155de6755fa2 SHA512 4340c6e6803aaf7c9106be05f2a7121ee2292b9dcf332b35ff0102ef5bf9a654e5e009223c13172ee289fc8c43ab1468568ad726e8618bd7b1e8c4086cea1c81
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.3.ebuild
index 108df149cb1d..108df149cb1d 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.21.2.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.3.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 5346128622f7..d04faf44d38d 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda
-DIST plasma-pa-5.21.2.tar.xz 113284 BLAKE2B 49f38746be9cfa8f3126a4572c8791b29e112c79ce47c19acd44ee13804d3601c96c832171dc2f7ca8e9062be55280476f5c8af05f49762c9d5441560dde01ec SHA512 68cee6772a97e6fefbbc02da928273dd4fae14ff2c0342a044e6c028192e075b526df1efcae5df516cf306c94677fae86b2e3e5f01a9932cd9e7a941cfe8a9f8
+DIST plasma-pa-5.21.3.tar.xz 113384 BLAKE2B 19998304bd60e95c750890b87a652296e1aedbca5e2bf6f8d435e16e95708a9ba0ffc694ef32553b8b0e5e542ae5ba4e7015abbf679d83df86814977175f8dbf SHA512 d7383b54ce458270530abd176828ed233496ad24f9313af165c10a72f951c866c39063a31a17fe1484f867af17f39b793b57d4130db596e8e28a12eb6ae85720
 EBUILD plasma-pa-5.20.5.ebuild 913 BLAKE2B f18b9f14e13d6896ce77bb0d86c8bb131788fb23e4b14431c342b365f6c363ea9083a8ad94d1031e323812e98d5065b91988dcfaa459a7e3e9ed7efb3e4bd622 SHA512 99e8aca732b0813b6f1583a08cc66d2d0f6f1d9c99f8ce14564bebf0a8192caedc9b694de1600ab8db6a5fe0c8a5b6d11a7f30530db8825f3731775bada4e1a9
-EBUILD plasma-pa-5.21.2.ebuild 848 BLAKE2B a9bd8f4cb56285bfbe788cfe59fac4b53600540f3ef0caa82b50dd1f6f8f916eb08660e42073a0eb9374335789511dc49dd8b3a1da323912e7469fd7990c175b SHA512 e07ded7b928e6a4ea7fd7c08ee7a5b27f1872290e19b83c3e2385d49c91a3d02d823573ae48170082a97b71569bb9777875317576269fa1de03764588fce6b8d
+EBUILD plasma-pa-5.21.3.ebuild 848 BLAKE2B a9bd8f4cb56285bfbe788cfe59fac4b53600540f3ef0caa82b50dd1f6f8f916eb08660e42073a0eb9374335789511dc49dd8b3a1da323912e7469fd7990c175b SHA512 e07ded7b928e6a4ea7fd7c08ee7a5b27f1872290e19b83c3e2385d49c91a3d02d823573ae48170082a97b71569bb9777875317576269fa1de03764588fce6b8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.21.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.21.3.ebuild
index ba8e016472b6..ba8e016472b6 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.21.2.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.21.3.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 101ef04dd0f9..68d38e4bb8b3 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77
-DIST plasma-sdk-5.21.2.tar.xz 269204 BLAKE2B 45931623a64e652379e01ea70ecca9e4cfa39f4430f0bd1a5231fd08d93f153f1dee72c4cb6d056aae7ec5617a94b45b56e70c715b6d65048d9b7950f794fc4b SHA512 eff77b10f2d257eedfe97f21ff9bad94b5a7909e9962e89869b251b703b80be55c8cd7477ad47e068cd48479c77936da27ed44e708c25efb29cbcaec8227b984
+DIST plasma-sdk-5.21.3.tar.xz 269100 BLAKE2B 28d46d6995bacda25f81e045ea44c4d354f644ced73ad214e5f125c9d1633f5f47b8ce4ada2159176d7b7b3b58fd72da6450884dd32efc48d3ffe2f7bb23332c SHA512 57cc4f3e913321e28663af42325f73d1280836b82e2bcd07ea82a888b5030bde2d168f707759a4441ed56c73a8681c02c00c4e9dc52f761c076eaa3b8f810e9f
 EBUILD plasma-sdk-5.20.5.ebuild 1254 BLAKE2B cb559aa2ee0528a7eeb8e243b20fb5523815824f462c753710ddea96ad91fe209901c229364965afa5b9f642bf5e2d58f9f3574c1fa35baab1b3d6a554abd2b6 SHA512 049e651adceb62effd9bd377788eea05297b20647159ee8eff151d7accd0eb8ddbf769e6dddc2f2e3c411c39d58929f0d7a03cc76cc523e0449781b7854d91d9
-EBUILD plasma-sdk-5.21.2.ebuild 1257 BLAKE2B bd78d766a673b1391c37592898a78029e01a59028c8817634bb8a7a18ac17831c84be987c63dc25e53983fe2e95e13a9194ca99ab556bb526505b5d571715791 SHA512 c059fa133e072f96a5b89be8c33abb2a8a478ff0771010d0fcf24aa7b7a1c03c3c6ae0abd18be44bb1750b6d6cd3326014f7a6c7acc76e70c04e27a6834b0947
+EBUILD plasma-sdk-5.21.3.ebuild 1257 BLAKE2B bd78d766a673b1391c37592898a78029e01a59028c8817634bb8a7a18ac17831c84be987c63dc25e53983fe2e95e13a9194ca99ab556bb526505b5d571715791 SHA512 c059fa133e072f96a5b89be8c33abb2a8a478ff0771010d0fcf24aa7b7a1c03c3c6ae0abd18be44bb1750b6d6cd3326014f7a6c7acc76e70c04e27a6834b0947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.21.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.21.3.ebuild
index 30a3100c1fbe..30a3100c1fbe 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.21.2.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.21.3.ebuild
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 4d59d8c3d908..41e49ef07287 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0
-DIST plasma-systemmonitor-5.21.2.tar.xz 122812 BLAKE2B c8ff4b4efecc254f750f7ad404064dccc9b9ba69c4900fd8149df23511b7af0441877352d6106f39e3ac36ac3d7aa25da3c1886aefc78962681567d07d16e60a SHA512 eb066c761c522ea92a0263ad79b12c6744a703fd8fa980f8cb8d0b421c0f78fa94386bd558de82d9868554cde79284cdfa6ad9bd65aaf1da51c30eaebe6e2732
+DIST plasma-systemmonitor-5.21.3.tar.xz 122832 BLAKE2B f4befcb9aa13bd12c1a7a0687618ee5fa23b5739b4f2435e0e5bd6db414b3db64f4f19c144eb6e04c93d85f88469e7de8b1c3ebe45f1e980f9e8ea0915c1866c SHA512 ee2d1b9e931a38af5d7a08847fec0f759144c4732375a8c64718137b0aab609f46e2e7b2ea22d76d1cdbd584a206272c71e989926096e36cae57ff3e420dc56e
 EBUILD plasma-systemmonitor-5.20.0-r1.ebuild 1201 BLAKE2B a1e49bd8b4106cbda357a6067cb8854ff3d2e0b81a3fa35f7d07552b20ff2e0bb9f98770d7109b34202d077e0fdcf6fd9bf0ebe00ad644dba20a0e7080aa8bdb SHA512 02a6ccb0e36661a502fd5e7547310b4c57ded67196b194281499af9278c80671478dfdbde001a8c8432b93c9f7d3fd1b4fae53b4c1f438afed4dcd8674bb0bd2
-EBUILD plasma-systemmonitor-5.21.2.ebuild 1162 BLAKE2B e298828268ed4d3a38bdfc0993c963f6625cbf228c3a15d46704555c16d7b4a483d5f23cf79a006905d82182abb9ef8730608a351ec06a88eeb057ece69b6ac2 SHA512 4d115e4fe0631e7da440403412d1843903170082957d3842c858c7ec39a01aa8acc646e666ca53378a946134c171b91e5ba6368be642a2c836d00834a0ccbd60
+EBUILD plasma-systemmonitor-5.21.3.ebuild 1162 BLAKE2B e298828268ed4d3a38bdfc0993c963f6625cbf228c3a15d46704555c16d7b4a483d5f23cf79a006905d82182abb9ef8730608a351ec06a88eeb057ece69b6ac2 SHA512 4d115e4fe0631e7da440403412d1843903170082957d3842c858c7ec39a01aa8acc646e666ca53378a946134c171b91e5ba6368be642a2c836d00834a0ccbd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.2.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.3.ebuild
index abb5050abba2..abb5050abba2 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.2.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.3.ebuild
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 0d2f83c5a292..9640824acca0 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e
-DIST plasma-thunderbolt-5.21.2.tar.xz 56696 BLAKE2B 44f02453241cf3ce3bb32e27d9c3a1ba88a30fda5db0247d8cd9c1bff52d34a2c359e9ed3975a0d77be1b094663edde0539036d65f91c7d31b95c7459b68bd60 SHA512 5fb9e90392fe8b1e1515c1346c58b326b6014fab45b29a3af78d7509e735b52682fd464a1be98bf4e6b1b216338f9d6e85959956a9d6f4087d92601f0276fe47
+DIST plasma-thunderbolt-5.21.3.tar.xz 56724 BLAKE2B 89c7e321dfdc308d776630332ca8a20121aa3ad786d2a608a817fb7eee5cc3569f018940b7b876d29fbaee97302d6654ffb11dd169cc5171cffa8908aaf206b0 SHA512 bc3be569c6f606a80df5d712b37874262868b15387aaaeb4009f891866876398cf58e54ca76f625c0f4c633664c397014e1f7abead859c0054c18c595ddf32e9
 EBUILD plasma-thunderbolt-5.20.5.ebuild 890 BLAKE2B 45c2d0e5db8d5afcb07765774699b20deed7edc2c0ce65cc63e220023b887e47183dc34dc77c262e6ecc8320197111317918b5408e235762f66d35729ef13382 SHA512 62504d4a964d604279263fcf03d1d3f239357bad1725e680d0d4016886cec7fc65be18dd7aa522a17e4d816990b943b196dfd78e1013ef6fe245cb485aefa9b9
-EBUILD plasma-thunderbolt-5.21.2.ebuild 892 BLAKE2B 1619f3da6ae18c44b222c88b36cb101ade4f4fa255bffaec4436f9666a7cd4fb23f7168527a1f47b23b8f782167368a1450d914f0e25b7b61724092bfc5d30cf SHA512 6968cd7f758cf76d3fa0b9ec36c0a96115dd4db9e9e06f8318cc1a826c33fdc0256909d52e6ae43c40ae5fa5f185ae2c465902dbd1179af38ff97d9491de2a28
+EBUILD plasma-thunderbolt-5.21.3.ebuild 892 BLAKE2B 1619f3da6ae18c44b222c88b36cb101ade4f4fa255bffaec4436f9666a7cd4fb23f7168527a1f47b23b8f782167368a1450d914f0e25b7b61724092bfc5d30cf SHA512 6968cd7f758cf76d3fa0b9ec36c0a96115dd4db9e9e06f8318cc1a826c33fdc0256909d52e6ae43c40ae5fa5f185ae2c465902dbd1179af38ff97d9491de2a28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.2.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.3.ebuild
index 5d4f6230a1e9..5d4f6230a1e9 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.2.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.3.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 4d24ac1d5128..ecdfb83255d8 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
-DIST plasma-vault-5.21.2.tar.xz 159328 BLAKE2B 5996e0ece77414d49c228d20854ebda1ecf7ae8bf1567c479ba7642646c9ff9eeeb1cfeed23bc8691da1957460f05ff9cdd291eb95eae73c946950ad9853c430 SHA512 485fd81170b8153f7b4eadda2dc66d156aef1a44abb2e1d1ea7f6ac9478d59f51d778e41e1e50b989eefcefdca047c67fc18660466e2b4b29ce06db4c619fe6c
+DIST plasma-vault-5.21.3.tar.xz 159316 BLAKE2B 5649648aacfd780b64c13d29abeeddb07c89c653db047f3339aa4ded23b0c6ece8fb0c6b22cc651715b02765ff6abdd113e3ecb44938da415e633a213e787bb2 SHA512 a69c3ef8551d62349588e3e39b774178329c0fb0631568c22bca6bef217cb47494f40ab521bad3a104458fec74ffa239146c9f4d111e5a180d1eb72355d95abf
 EBUILD plasma-vault-5.20.5.ebuild 1274 BLAKE2B d58ac0f5516afb9df2192abcc98f61fbc6f1b626e76723a3a963859e7acd6242b1c3a91e5879c34608c161a1d841b310f7aa52e669e4f1824cb803396ad4b7d7 SHA512 6c9dc99f2a4e04a382b91b822ffb2a363c8952ed111159b8e1da9703ef553e813574a3cdc89497e29706074f6709d90eabebd6d7525d20bbcf5c63bace02d8da
-EBUILD plasma-vault-5.21.2.ebuild 1277 BLAKE2B b1a2e5e4565be74e7a08bccc9fde69613fea4b7741087f6f915771efba623634b0bfac512d7f8dec254d8a7c0de9b5b6e24f3f69d2dce2eba40f9c060d34c5dc SHA512 d0438390a8c0b1800b3cbdd90324ccb0f1cca0d7310ea4b5b5b5fc91ebb076c6916c66186276c7fadb4a0413ce0e2cf09c7617116735710d94fa6a22a1e2f0eb
+EBUILD plasma-vault-5.21.3.ebuild 1277 BLAKE2B b1a2e5e4565be74e7a08bccc9fde69613fea4b7741087f6f915771efba623634b0bfac512d7f8dec254d8a7c0de9b5b6e24f3f69d2dce2eba40f9c060d34c5dc SHA512 d0438390a8c0b1800b3cbdd90324ccb0f1cca0d7310ea4b5b5b5fc91ebb076c6916c66186276c7fadb4a0413ce0e2cf09c7617116735710d94fa6a22a1e2f0eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.21.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.21.3.ebuild
index ae3298a41293..ae3298a41293 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.21.2.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.21.3.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 99b4247530e8..b26f5cddf493 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0
-DIST plasma-workspace-wallpapers-5.21.2.tar.xz 48098960 BLAKE2B a8f9ffde2c5d878811c4020a455fbc444211b20a85d49345e9ec02ec2a83324379b36aaacc199ea46dfd49a05b20fc23ca7133fc7293fa57b047ddc7d612ba48 SHA512 97b73b3858dd98158fbb63e55a3854349d3d684015aa9a02f7221c39cd9d6567c8b95c4b0c63cd93bdd64d8f6d617f338291ec5d0cd774a0d1efba18977486cc
+DIST plasma-workspace-wallpapers-5.21.3.tar.xz 48098692 BLAKE2B 256c30ea2517a745779dfb8af9e8073681d8bddc6fa1757c125eddf431d379d0d834e5ffc9303f9867b4ff0bdaa3add855dea02dd2b1a3da4d4d3b9c4f469fe8 SHA512 75a36ce31bc6bbbfdb990be44103a2f15d2f3b6f3189ba1f22e64c6a7731af9046f69883a701714957e822c19ba0915a0b97c88ba8e429aff925f333cd9e433a
 EBUILD plasma-workspace-wallpapers-5.20.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
-EBUILD plasma-workspace-wallpapers-5.21.2.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
+EBUILD plasma-workspace-wallpapers-5.21.3.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.3.ebuild
index d290aa752bae..d290aa752bae 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.2.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.3.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 8f45fabc01e4..e6f89a8d281e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -8,7 +8,7 @@ AUX plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch 2671 BLAK
 AUX plasma-workspace-5.20.5-revert-activate-krunner.patch 2362 BLAKE2B 0f2d2220fe54b508899ae0f70ee8d266282418bf7e54be5b9c051f45dd540905dce55563f182d2ff7ecfe36c50f617b53368cb404e61e22843bb6a1cc263b04e SHA512 f027ff3c2fc200af8d26cb9307e0fa932f0c0a56cdb99740a8c84dd9eb41542ec661b54f18944cdf3856292f54184d351cdde126da82ac649ca4d95955c72452
 AUX plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch 1475 BLAKE2B 79b9ca4dff4f88c2343e294c9243a2221f20d14ebbda8dca87b371143eee618b7f9118ec1435c6168cc1be81a129ab9b6d21615c08f777355b0cdd6978b9847e SHA512 0a0c87db98be7fed51d0b193f683a60fe6119f7f47e82966bc01cc5c5afe6f74d7f3edd8939e709f2f72363741a5cbd7f464890fbe0bb88d25c4f5b235d3dfb2
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
-DIST plasma-workspace-5.21.2.tar.xz 9712516 BLAKE2B 6b355cc1c654cad00aca204c43b887140444e172e6aae38b216bde4fa60c69a6a6d996e7190d892eb5e2768f2b250232329686f5da1964d7731808d4d6949c05 SHA512 234f40bdecdbb63df065ffa9a59b0acfd6e796fa9a66b7116de50cdbb78f3333b6247f7c0e4f68ed4e3d8b3b0eea6b7a7bf65deb1ab0c933008cc59bcef61fc8
+DIST plasma-workspace-5.21.3.tar.xz 9713648 BLAKE2B b5a2d68ddf6affcdadb54219fdbcc1c134c6654716c6744489ca4d7393743d9c7eece8ac055628e5251f84eef4867422aa53b6f6152e9ac8e7e8701bc082549d SHA512 a27ef58b6d75f9a7ad6f3f7383e66a3d94d8ccef9eb762c4c3dad8dd18522527b878416c4a5051afd13ff40935912af5eb60d68efe001129daea436b82ed07a0
 EBUILD plasma-workspace-5.20.5-r4.ebuild 6402 BLAKE2B 9421322f197d94628fad7ea6fda583c2b86ca5858f83989d85003f141a5eb7e7fbe69761f71c653abd3d093ec7eae610e4db5769475c5aedc82da78e2b5cc2fe SHA512 f23ce6fa49a5dc0f8515b76c2a4c9425b4c41891ae4e1e06b211d86a2826df1bfd54bf26496f1bc53f9bac422a81151fe53e510f8c01287e7dfdfe10b1e5b06f
-EBUILD plasma-workspace-5.21.2.ebuild 5986 BLAKE2B 2a862efbf9e65228326184b614e2d7f0b89700777be2a92f447242197d699836d104d9e2b1f46bcea7ba5e9644f9d50df2b40367fb68b74a48ee3238b12cb13e SHA512 91891d16dba6ae51e7d9ad2dd9f4d2e8e7310b132cd1a84d9c2309022343748a17a599aef84ee105a88a76533c3c69b051f6df7819fa9e55153ffb8269754d21
+EBUILD plasma-workspace-5.21.3.ebuild 5986 BLAKE2B 2a862efbf9e65228326184b614e2d7f0b89700777be2a92f447242197d699836d104d9e2b1f46bcea7ba5e9644f9d50df2b40367fb68b74a48ee3238b12cb13e SHA512 91891d16dba6ae51e7d9ad2dd9f4d2e8e7310b132cd1a84d9c2309022343748a17a599aef84ee105a88a76533c3c69b051f6df7819fa9e55153ffb8269754d21
 MISC metadata.xml 723 BLAKE2B 14f4d2f1ec1c0e8d511be9b01aa0f3ad09bc7bb8e6b26a9ad770834d38bf1539443a4e81af7c4237e094f4964ba7203d9dbf4ea3558a07b6df12636e48294d67 SHA512 2bcfe167618c426ac72a47160a6f62d4b9b93624a7926f978b347c64212e80c7a9678221fa0799d303860e84dd9f3f8aa96e6f64a5a67335817dfbf24010eece
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.3.ebuild
index f5bd3552dddc..f5bd3552dddc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.3.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 2345a0ddcf94..86004a7baa3e 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78
-DIST plymouth-kcm-5.21.2.tar.xz 43132 BLAKE2B 79e62782fd5ee17ab7ac754cf3dc78bfc17aaad6a718584495de4f3f43e7921d4358fc9fa0feb77d424db7d84e3191752f2886bc5c3adf14b3f5a76f136fe2be SHA512 56e4b4e3f69775e80d2eab9dcfb5ca04ef22a10c1c2b9c8bf3bb07747aa780e5880233ab3839b82fda205d255d31f80ef91f3d57c248c569c775bfa643af5ae3
+DIST plymouth-kcm-5.21.3.tar.xz 43144 BLAKE2B d9982d9678c9cb8a719dafc6b520222816832ab731621bfdcf07bfd08234f53966d122ea30b3e562f8eb03ace3a64b6a9d6727fd8cce07ac379dd809214c87b6 SHA512 2d5b2efa96c504af14244bb0e9bdada0cc8f889656ca89076ad11e5b3aad5ad5dada594965e3a2eee883ee9bf56dbf370da2d9ed6bdef73ef9cf9fefa25730d2
 EBUILD plymouth-kcm-5.20.5.ebuild 958 BLAKE2B 56cdda9d404624a30ac92f34adeda79496b7a934e9f0452e45ea728e453c9de5a911ca11d6d05c204fbbc2fde66636668fed7c7d88b2fdc1603ea9200da7d3f5 SHA512 f8939dc468cd8b68aaa391e81dcb7f7e8128a8d65eded3487315377186541d057526e73f6049a845969f27a8f39e68d012a81c4d357942e8ed231284001f8a54
-EBUILD plymouth-kcm-5.21.2.ebuild 961 BLAKE2B 8edb2c68e448a4fcb16f60d39bbaa473f15712e8faf90e0978930205836323eb845a9b0e84ee1dd2725ebf49319bb6aa22c241f73a911f412931bd5262d18a19 SHA512 2d35693c74675d089e64bc6a881d4cf20c96d360169f791f84edee4e86c1310dd2952f4361c9a9d400faa27ed1f1774d9a3441845a114711742cc3a0770a2542
+EBUILD plymouth-kcm-5.21.3.ebuild 961 BLAKE2B 8edb2c68e448a4fcb16f60d39bbaa473f15712e8faf90e0978930205836323eb845a9b0e84ee1dd2725ebf49319bb6aa22c241f73a911f412931bd5262d18a19 SHA512 2d35693c74675d089e64bc6a881d4cf20c96d360169f791f84edee4e86c1310dd2952f4361c9a9d400faa27ed1f1774d9a3441845a114711742cc3a0770a2542
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.2.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.3.ebuild
index 9ed282fdf179..9ed282fdf179 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.2.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.3.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 4f0bc37c44f8..2905a5507e3e 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328
-DIST polkit-kde-agent-1-5.21.2.tar.xz 45704 BLAKE2B f90b23e430d917959217f19c03df9be9a3e2caf611164616bbd22e6832aede77590d47bc618c37ba019378884778594bc48142e2c5ed0eab8b8352e4a8a65c66 SHA512 7c2b8b2be739044283d85c3cc79fe0910cf87da4e897f43e644727679e81fbf7e5824855d6a6019e304b840894d390a85c81b4f76fe122064e4fd4dc7f1430fe
+DIST polkit-kde-agent-1-5.21.3.tar.xz 45704 BLAKE2B 924a21439b0cee0acd39fefed2ba1b537c96c86e2b3ea7dd3a0eecdfd88983322b3f629c56fd9ef31cb8ef65ec5366bd59b648cb7c1d19914559ecaa37c36dce SHA512 27e1790d291e81aada2a135cdcb04f36750b0d9e752fc3e61017fb95637ff305a3ef02ee084e5f77cc8f216cf01a5164245ec3a05488412eef6d5e23c6c016ac
 EBUILD polkit-kde-agent-5.20.5.ebuild 797 BLAKE2B cf8202ed6dd97e164233f887d8361fed86fee23aa12038c10eab511e32ae2d12a1ff35cd782da84700a5480e8ea361892e609fc064cf049b2406fa07c1f64c0f SHA512 00c522ce0838c4fe3adfecd94a16f5bb0459e6fd987e9bb3d8e936000259b55a6e69ad54e75fb78cfebe80d268650a4d8784ff844cb4e8fce358f98fdc4ab85c
-EBUILD polkit-kde-agent-5.21.2.ebuild 800 BLAKE2B 92a7c92b7900cfc9fd4860b88636707f9ea40c3f9142fbfdcb02e52ebcacf1f4dcb4e4b803c1eeb4512a4589540a5401341d0c18bef3a3747620d8c1536f455f SHA512 f4745d2ec23a291e566a7ada84ab96cb053550b037346fc5d73391b4e4e1bc3d319e4a3537b5ccfcc14711ec8674b863e87a819a858bcd28e3daa187b6ab8f2c
+EBUILD polkit-kde-agent-5.21.3.ebuild 800 BLAKE2B 92a7c92b7900cfc9fd4860b88636707f9ea40c3f9142fbfdcb02e52ebcacf1f4dcb4e4b803c1eeb4512a4589540a5401341d0c18bef3a3747620d8c1536f455f SHA512 f4745d2ec23a291e566a7ada84ab96cb053550b037346fc5d73391b4e4e1bc3d319e4a3537b5ccfcc14711ec8674b863e87a819a858bcd28e3daa187b6ab8f2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.3.ebuild
index a1b389c8f03f..a1b389c8f03f 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.2.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.3.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 95ff9ec65427..ec2712f3b405 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
-DIST powerdevil-5.21.2.tar.xz 614292 BLAKE2B a1d0ecea6c732204ae92df03d16b77d82943bf8efec350687b50c268a0455859d3b5e9c3e4db5ed3cc7b46b9dd96c6c68c9f5f8cc59f796ad56c6a5c45060eee SHA512 e9bbe3d04dffb6637bf3a5803616fca0462869b37a7b73113b22e2e732ead333aa06cbcba10374810c353f61a07f47dc8dbdd65e452b1c12e21ba432dd2e844a
+DIST powerdevil-5.21.3.tar.xz 614332 BLAKE2B e7156a1b9a56e40195889d2c187c9ddec82dd0a4627aaef2b0ec3f3d66b6a9c63794992ed490d985a85f4d5dbd485101b27224c2765d1396cc82c3ecbcc9e36a SHA512 74811da2f2b2e80b0d63938f291b88d952ebf95343863e4273f0204063d557101fb843dcd78423614fef93140384445b28cccade7ac2dcdd7caebd1876e033f3
 EBUILD powerdevil-5.20.5.ebuild 1944 BLAKE2B c607dcdde420cefbd792c3da32155ddbe3d9135fad8651d030154e601696c5d17487e98ac1a566d6fcf36b2c81b2e93792580097c9843d8b49207d10a9c5c625 SHA512 9f856f88e9ffd80d1b0a3a2679d6fc07b03752d6039ab6279ce1ce3142a3d934ba8a57797f68338a6a5c6d103e5ed3c861606b31ec30f4c29107a369917d0c89
-EBUILD powerdevil-5.21.2.ebuild 1947 BLAKE2B de023cf73d2f0cc42eb56f96c85acdc8b4e6484950584c41dcf212ce8c3668c3f1b8d0d04d0a0df8430a9db0dac28137ab1f126c998bc8d97a0705874a273be3 SHA512 e2f6dd8e020594a000ea107baf2cb74b4396e1364a5568054b4757631e7035823621b08157a0732c156eee77c7d67a1dff179a95164aad57d7e68bcda38b6198
+EBUILD powerdevil-5.21.3.ebuild 1947 BLAKE2B de023cf73d2f0cc42eb56f96c85acdc8b4e6484950584c41dcf212ce8c3668c3f1b8d0d04d0a0df8430a9db0dac28137ab1f126c998bc8d97a0705874a273be3 SHA512 e2f6dd8e020594a000ea107baf2cb74b4396e1364a5568054b4757631e7035823621b08157a0732c156eee77c7d67a1dff179a95164aad57d7e68bcda38b6198
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.21.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.21.3.ebuild
index 88affe646556..88affe646556 100644
--- a/kde-plasma/powerdevil/powerdevil-5.21.2.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.21.3.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 2db8c561aa81..da21060744d6 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f
-DIST sddm-kcm-5.21.2.tar.xz 63272 BLAKE2B 19e93d7556e51965ed734773d150931bde42b5d25579733a98d95fbd17467879151e1a726a4d38e7208a0729f74a6a47a5f6a42ab8a8bc82ec177735948bd5e4 SHA512 564e49e4c1d92bad2380307206ec977fbe3145c605e3f3face6ba3672c2e05357a2e19906f30cfd5e6af753413b4a24aa6d988e9be7c7ba15d8735bf2a2fc80b
+DIST sddm-kcm-5.21.3.tar.xz 64252 BLAKE2B f2a764f12591d5626862b195732186a8fa5b51518380abe8121ecb1f88797474eea30b88211c3ec4c24b26de7f30437e80d4e97cdb43b9211ac3c714c9e1b36f SHA512 5901b9575361d6b2ba0284719bc55a160d3cd8d86d1b891c8a0eef55de910ae5c091cb2ccf13678af6819ace68b2ad142e06d6dda7c1b24540fab36d78da5adf
 EBUILD sddm-kcm-5.20.5.ebuild 912 BLAKE2B 2725b43e1a871a9cfe473112129e2ede2c720561a25edc40781f7334ac3d897040935e648a9f4bbe702db72d37c627a6d26a997bad7d7951fad3fd1bda93f42f SHA512 e231cfd5380e8c39b057fb9e8a723aa5b1c411379a314721c2c257c6c8f3940907a1d3f11544186f61fcb0f93eb8bf10cdfcb90181d080ad92fb279d5f39c956
-EBUILD sddm-kcm-5.21.2.ebuild 1075 BLAKE2B be6fd62070598ddbd67e0a1e8cc2d804991e21cf70aff5ed91e97a61564093ff6207d1edcf187d4f9a815aa146b0c2e7ccdbe24ea24bdafcb559161736c9ec91 SHA512 a33e7d37c1c0b14123b3eb53d95a165f7be9ed5a266329df30df1372db22cd3e8e29c05fa85f7c181a9d803eb125a3ab953cd9a46dcc713f0a6da7de1e42c520
+EBUILD sddm-kcm-5.21.3.ebuild 1075 BLAKE2B be6fd62070598ddbd67e0a1e8cc2d804991e21cf70aff5ed91e97a61564093ff6207d1edcf187d4f9a815aa146b0c2e7ccdbe24ea24bdafcb559161736c9ec91 SHA512 a33e7d37c1c0b14123b3eb53d95a165f7be9ed5a266329df30df1372db22cd3e8e29c05fa85f7c181a9d803eb125a3ab953cd9a46dcc713f0a6da7de1e42c520
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.21.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.21.3.ebuild
index 6cead9a95c39..6cead9a95c39 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.21.2.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.21.3.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 23c857909f76..4a48162c1d29 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994
-DIST systemsettings-5.21.2.tar.xz 198168 BLAKE2B 2fe2fe87936ec11b9a6818698744fefacea75b3060978f677ee0da75cf73657253a05fec78b18d5340c82fd75a55be7f7eec71baa9247582a905cbe382ff8457 SHA512 caefa19095160dd99eb33e658631ab54e9dd895e1fad58b8f529bd89199d692b88e806ec9f8ebd1725badd324f0caddf0880a02a6a66029bcea3bb9bff109fac
+DIST systemsettings-5.21.3.tar.xz 198240 BLAKE2B 04c35e1d753347689a05edd68fc03bb71f3e2cd04fd82d82ae6534b0b533e27c0c75cea1995546df1b501033c8cf300080a65fe29d1c46d709a6cb0ea89e7196 SHA512 a4f1e40f81508302ecffe236048c8baa8ddb2076ecfa81300e49ca8430c8f0191d3ed9bf5b744656637e50c475698ea7bafdb3753199cc2c7a367fb547735b60
 EBUILD systemsettings-5.20.5.ebuild 1703 BLAKE2B 1635bf7c59dde6879e89f136108f888e660dc0d233ef86d80ebeb4ca8f582c9199a9b841b89c091f1715b89cb2ec436118be708edf09e9d83665bf0bd85424d1 SHA512 af49d529a55f13610687a7b01501824b8fb9165605e952ea832eb1ff2b4225309f229490551bb3e404bbc641826c4801e322e8221f77ca08a4828519b4a0a655
-EBUILD systemsettings-5.21.2.ebuild 1706 BLAKE2B 75cac4750269fc9e4c1d9b44dad22042bbbdf93a777f5911792d7e3e636b3509b38aedb327a18730236986dc9dc2d7fde3b61b7b4c10a9e58b8670790d5faf04 SHA512 dde98e16ebcdc9bdde509a992ceac08846a73884c19a41cb4e8189a1bfffa6e2f131307957434c0043d26d7d48f0faecf196ba422929d2d1c83b87120fb6f32d
+EBUILD systemsettings-5.21.3.ebuild 1706 BLAKE2B 75cac4750269fc9e4c1d9b44dad22042bbbdf93a777f5911792d7e3e636b3509b38aedb327a18730236986dc9dc2d7fde3b61b7b4c10a9e58b8670790d5faf04 SHA512 dde98e16ebcdc9bdde509a992ceac08846a73884c19a41cb4e8189a1bfffa6e2f131307957434c0043d26d7d48f0faecf196ba422929d2d1c83b87120fb6f32d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.21.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.21.3.ebuild
index 4a60d5472e1d..4a60d5472e1d 100644
--- a/kde-plasma/systemsettings/systemsettings-5.21.2.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.21.3.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 7ea168c37b42..b55191871969 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1
-DIST xdg-desktop-portal-kde-5.21.2.tar.xz 82504 BLAKE2B 65387ac89b1435963595c7152d7cf0780c98091d1f8b372f542bbe6dc30c800f1138374cdb86b599e5528d5dd0cf02d4b13e124a7de3b261e8a22b37d0005407 SHA512 ff412d087b075558c9268a99aab076f755985325c9db051f444a701bb863979a2152ecda581fa53529bd95069e7feb8ffc5db555d17bd098e20a172d2ecbb99c
+DIST xdg-desktop-portal-kde-5.21.3.tar.xz 82504 BLAKE2B 55c9fa0a5339d57431fb2b126a3c2b745c69c14eee7cdbecc096ad501947561ae1601f230d2ef85f94cb6d2ec095661bd84b18c424b4cab0dc3c8ad107051b4d SHA512 76c65aae8f63986880f0c06a8d8700b55dabac8229dba924dfe79ce92c2309b1023c7f7044a2fd760b53a0fdd5bf30f21d34bed337d52c77d93dff4837046569
 EBUILD xdg-desktop-portal-kde-5.20.5.ebuild 1098 BLAKE2B 605dabf48ead7954293cbad4674f56b275c426875236d896b4824ce2c189fcde97ea5b34290b1f7712b77b3f39cd2edcdc88359f12e77d3802e32c33a96ad8e8 SHA512 88a0f4b23d16feb7386fd021c3d5cb193f56d05069c38dcfcce78e9aac888a54bbc7bdee64ee5c42931e933dcb80235e8347b47592198f69bbab0fddbe64af43
-EBUILD xdg-desktop-portal-kde-5.21.2.ebuild 1101 BLAKE2B db908b14d1110a9d0565459c9ba59c2ad61fb01e8a2f0c051ed4c162209060163b2363401618898e912673d3446bb01523640062c905ae6ceff7e32f00dd7288 SHA512 3f98463d46c5b594ad09e644fe543ff9cfbb111a026ed361dcf5e44d507b061c7768282a4ffd70c011abfc473032c3689a99eafbab5520214f903adfdaa1c43a
+EBUILD xdg-desktop-portal-kde-5.21.3.ebuild 1101 BLAKE2B db908b14d1110a9d0565459c9ba59c2ad61fb01e8a2f0c051ed4c162209060163b2363401618898e912673d3446bb01523640062c905ae6ceff7e32f00dd7288 SHA512 3f98463d46c5b594ad09e644fe543ff9cfbb111a026ed361dcf5e44d507b061c7768282a4ffd70c011abfc473032c3689a99eafbab5520214f903adfdaa1c43a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.3.ebuild
index 1fc676793fbc..1fc676793fbc 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.2.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.3.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 4c2bfb67ecc9..2f5a9dff56f5 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,7 +1,7 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
-DIST plasma-workspace-5.21.2.tar.xz 9712516 BLAKE2B 6b355cc1c654cad00aca204c43b887140444e172e6aae38b216bde4fa60c69a6a6d996e7190d892eb5e2768f2b250232329686f5da1964d7731808d4d6949c05 SHA512 234f40bdecdbb63df065ffa9a59b0acfd6e796fa9a66b7116de50cdbb78f3333b6247f7c0e4f68ed4e3d8b3b0eea6b7a7bf65deb1ab0c933008cc59bcef61fc8
+DIST plasma-workspace-5.21.3.tar.xz 9713648 BLAKE2B b5a2d68ddf6affcdadb54219fdbcc1c134c6654716c6744489ca4d7393743d9c7eece8ac055628e5251f84eef4867422aa53b6f6152e9ac8e7e8701bc082549d SHA512 a27ef58b6d75f9a7ad6f3f7383e66a3d94d8ccef9eb762c4c3dad8dd18522527b878416c4a5051afd13ff40935912af5eb60d68efe001129daea436b82ed07a0
 EBUILD xembed-sni-proxy-5.20.5.ebuild 1008 BLAKE2B ec20ad28545f19387f66e83b6b084581aa9cd9714dcc77d69de13b4ff691fbe7c7c94fdf2fe9632f5db3551f97a135eb4d6a0a6d922d114ed80cf31896ac84d8 SHA512 2af9311890058f23bd5dfda125b6d6585d1174e945af9c60d3870026a5a4de7f4aafc5df3fee0f3807ea6d9b225761740be0b16ca3e629ed8986695e5fbde680
-EBUILD xembed-sni-proxy-5.21.2.ebuild 1011 BLAKE2B 6abdf4c21db6ca55b1553b3b295a8e4cabbf91a86fb5c30f9a52c4de21ecc82ac508255c55646eb4f72a8c0367f7e8127f372e2b193363eefe63d5d97e0aef6c SHA512 643cb0f0dcde66fab7882ee80c945c5766ab43193560bcdbd6d70aabc0f8a2a7337ed3903de1effacc63a95707f7b7e199bb12d10931d690b075f95b14837b4e
+EBUILD xembed-sni-proxy-5.21.3.ebuild 1011 BLAKE2B 6abdf4c21db6ca55b1553b3b295a8e4cabbf91a86fb5c30f9a52c4de21ecc82ac508255c55646eb4f72a8c0367f7e8127f372e2b193363eefe63d5d97e0aef6c SHA512 643cb0f0dcde66fab7882ee80c945c5766ab43193560bcdbd6d70aabc0f8a2a7337ed3903de1effacc63a95707f7b7e199bb12d10931d690b075f95b14837b4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.2.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.3.ebuild
index 20c70be4cbba..20c70be4cbba 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.2.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.3.ebuild
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index cd70c2b83f9e..d7287fd26be8 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 9537ec3004a0..2a1f90f7d4fe 100644
--- a/lxde-base/lxappearance-obconf/Manifest
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -1,5 +1,4 @@
-DIST lxappearance-obconf-0.2.1.tar.gz 418312 BLAKE2B 2bf9de28e478e7b91fec67c9d0a8577897d54a7dec978dbe315ee8dc050dc5b3ec5cb44c00bf5ad9b533b000a3a9820e5d5d14ae690667ee74dfa55da8156a4b SHA512 f37a981005ba7c4d1ba0a00ec189d6978cd521b9742d0356f1b29685646f9cf78953c449bdee48fabff21e98f676d22c9916d03b0256d59e159f2947e4a41c5e
 DIST lxappearance-obconf-0.2.3.tar.xz 290204 BLAKE2B 3f222419e147232eb805e8b86a29993fefbf80008cc3cd98d048a0b3b2799fb3672571f87666917136ad17c1b4b6bd649194599d684bb14a574ae40d0d127d99 SHA512 cec56238b2b8ea86ab310fdf3d9d43ef665aac7762018a296803ef7caccb6a5a7854c4b17e0028152b379a373602ede30edb02811a9a370ba369b62bb3caee09
-EBUILD lxappearance-obconf-0.2.1.ebuild 440 BLAKE2B 9f6bf8a9da541ebcc30e35aba691d551db4051ee0afd3c875b84a4e14adc7646f7ef575378b52ac05359447acd34357ad1d338c5abb0275a267eeba369a1be60 SHA512 61e90d815459ea36ae31632063d9c44188338182ce236808c1adebe99bc9057c4a7865a2d5ad3bbb8ce88dcb41971c0420af32576f7295b01f17b1580088bf37
+EBUILD lxappearance-obconf-0.2.3-r1.ebuild 880 BLAKE2B 9d8603bfd7a64e6cab88aba080e4eeeb4580816ff3b7475ec4b0522b648274c8636d07c212ca1829dc0e18439394e28e15a6f3bba122e11b88bf56d022e8a7cb SHA512 6fb944a854ad2a9bee6fb7d9531b01c810a03e56afdc6035285bc1c95c2216fc62b94454177f81d0754a7a5a27bc463885272534dcbdfa835765ad41f9492a15
 EBUILD lxappearance-obconf-0.2.3.ebuild 508 BLAKE2B 1395bc10582ce059c70721ec2c390476b7d0b72a8402badf044fb98d41dde2a0fbb50805e185a64e93c2aee31ec8faa326d1e7be6189d557dee604e3c56f0f50 SHA512 b926e31dcd7f7076755b1275257c5151084c1fedc72d270574b3cd80c1c9d892d718591a2b4b248b3d3604b8c32a5b5bf42fbf4def49a7c8be40520cc9a47009
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
deleted file mode 100644
index f5174e1d6d53..000000000000
--- a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="LXAppearance plugin for configuring OpenBox"
-HOMEPAGE="https://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
-IUSE=""
-
-RDEPEND="lxde-base/lxappearance
-	x11-wm/openbox"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool "
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
new file mode 100644
index 000000000000..ab03ab7ac90f
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-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="LXAppearance plugin for configuring OpenBox"
+HOMEPAGE="https://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+IUSE=""
+
+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
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
index c9b97b51019d..d5900120558e 100644
--- a/lxde-base/lxappearance/Manifest
+++ b/lxde-base/lxappearance/Manifest
@@ -1,4 +1,4 @@
 DIST lxappearance-0.6.3.tar.xz 165656 BLAKE2B d76d3d9b270e18e46cad44d204d1d5e4faf20bd6c292bf8dd17c2d570fa0276f183489c39f115c189b525643dbd03d0a1b1681f7fa0f61171bc822d8250ef513 SHA512 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c
 EBUILD lxappearance-0.6.3-r1.ebuild 887 BLAKE2B 996ce905d8bb6d5cd10eddc4bbf64fc8be6945b6b43481eda564bff5386f61bbda66f93ec710becf4a8700f6d1ac8c6e3200a4cc4064aa12c3f5f88b60e2ca7d SHA512 4572a766c97c791202da1029fa129073a532933fa025918e9c9574efe38a80969a891940889b0eec350c34b7ef8f0a083fa127738515e24dbdd087d6c4b38c39
-EBUILD lxappearance-0.6.3.ebuild 548 BLAKE2B c32288e4a082b562a794aa9ebacb672a1cdf29d3a073d3ffd08b2fbd4d35ffdb8aa22de013681842767f11c324034a9019bf8bb68dc3c2df63acd0f6c001a7c5 SHA512 0abd933d6b74d3e659de7f936f5c292a33a5b93580651fe80ff62b1b6b609b6bdd704a11b948f5b2e972834d86f2685aa407dfe9418fa4e03a1c14ccc0c9425e
+EBUILD lxappearance-0.6.3-r2.ebuild 646 BLAKE2B 00e63cb1790851a5823ae278ea7c621c45ff95406c15c23e6a73b0e4625b83458682dabe645585cc95a050004e5c612ffbaf4fea90fec6ba3be2a2a7eb60e111 SHA512 2f818d703347d4255d596afc9a0d854b604d62b2a95931235c96668d2521d01c2ed37e2b8effe36640c3a5bad8f6c2b01e89eec6472f336268f7b462a7d37a22
 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
new file mode 100644
index 000000000000..7871a1c7b61b
--- /dev/null
+++ b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE GTK+ theme switcher"
+HOMEPAGE="https://wiki.lxde.org/en/LXAppearance"
+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"
+IUSE="dbus"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3 \
+		$(use_enable dbus)
+}
diff --git a/lxde-base/lxappearance/lxappearance-0.6.3.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3.ebuild
deleted file mode 100644
index ed729a1760a7..000000000000
--- a/lxde-base/lxappearance/lxappearance-0.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LXDE GTK+ theme switcher"
-HOMEPAGE="https://wiki.lxde.org/en/LXAppearance"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus"
-
-RDEPEND="x11-libs/gtk+:2
-	dbus? ( dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		$(use_enable dbus)
-}
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 048945e67f13..659489450977 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -2,5 +2,5 @@ AUX lxde 1989 BLAKE2B 80163b00c1de0dbe9ea02692c93bf041fef792d75d976a086ce7d66fe2
 DIST lxde-common-0.99.1.tar.xz 889656 BLAKE2B 21c0ca21adb6c37d27bf39ee474a0e1d80c62d2ffb7ddadea3abb839163a307c81b8a6fa6ea6def00a0e8bf22ca9953bf145840371de65195e7036ee891bb0b5 SHA512 f5a14c44d827ba2355efd10c78732157f5645392ebbeb8e2a8126340a36eeba2842eff0c5338bb36623e5fe2da894c89d60a45c0b177704e2260413d63232b05
 DIST lxde-common-0.99.2.tar.xz 889948 BLAKE2B c01b3af5499ed4efe3004c922563c752999921cadab36a7fd5fec56762334c93d22ca7a28e9a8e8ce3462e128bea493740d5aa9931c4bf26cdf8a8dcd1bfb9e6 SHA512 9eb939ad411ed15c6bae880541b5c021ce5f3dd66df8662865e2f7219159110d8bf6059a707e55863d04617b17a15ea517317c44f88982344369aa85b7128b6e
 EBUILD lxde-common-0.99.1.ebuild 705 BLAKE2B 0b7aceb84956852da07a19dcb03d8fa6f939cf2cc59d1f2d376bf06708bc904e2bcf72402b9eedd5142279268611d0019f2aecb468f00c62f04db741ddc35ab3 SHA512 0504b8762ce3b7ce34d99e96bce5ddf057a7d0ed57ed85a5cbde45f383bec955431a3130d26740514fd595fb0b8ab666fc03d21b7324cc950501f740662ab213
-EBUILD lxde-common-0.99.2.ebuild 692 BLAKE2B 3b5326f2b9cec3f0810d1b0867e7f057a9ce473bdf3b79e5c3469e9e1e3fe13caa7106e15a597cbd05e74a551ebe503746eb2b02be4ebe12b3739cc29bbb6f02 SHA512 169e791ab1748ec2918ccefaad625ec7e826c93509c4aa48d0f546836d54a8f8b3fdc5a4890cc95dc17d816e350aa6df158727f72445a0ee5ea6d3c4957d41e8
+EBUILD lxde-common-0.99.2-r1.ebuild 658 BLAKE2B b8969991e2c09a6c6063f30316ad8aa7cb0b494b8c8a1ab59e8374fabd99b56ee8c14a538998fa09bdcb97fc9e439e6c9e4aa18a941b9aac6ff4d143f665273d SHA512 640854b2cd21b882974c003a3aa0d101eb4815c9a78211fa43616b89fb00e0565f6c83dedf722fe621e198926483846329d2776a93dedbb93d47b32a190d4c98
 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
new file mode 100644
index 000000000000..764cf19a11d1
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="https://wiki.lxde.org/en/LXDE_Common"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# install session file
+	insinto /etc/X11/Sessions/
+	doins "${FILESDIR}/lxde"
+	fperms 755 /etc/X11/Sessions/lxde
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/lxde-base/lxde-common/lxde-common-0.99.2.ebuild b/lxde-base/lxde-common/lxde-common-0.99.2.ebuild
deleted file mode 100644
index 10fbab6dc927..000000000000
--- a/lxde-base/lxde-common/lxde-common-0.99.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
-
-DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
-HOMEPAGE="https://wiki.lxde.org/en/LXDE_Common"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-PDEPEND="lxde-base/lxde-icon-theme"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# install session file
-	insinto /etc/X11/Sessions/
-	doins "${FILESDIR}/lxde"
-	fperms 755 /etc/X11/Sessions/lxde
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
index cde835397fb7..ea63021477b8 100644
--- a/lxde-base/lxde-icon-theme/Manifest
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -1,5 +1,4 @@
-DIST lxde-icon-theme-0.5.0.tar.bz2 4545598 BLAKE2B cb09777b87cb65c62dfeac384b19b94506701112f4264c646567a8e7be446642eecc7c459caad17fa9af8c7ef0507d2b17417d11c56201511c305ce15d39430f SHA512 4ca3e94b5826f7fe87d840feddf0c130fa77e8f14f22a59d9749252a5106d54661237e3c9286f4880d0aaa50bd330cb4bfb9d663ca35d6ee4b9e3c2af30fe9ab
 DIST lxde-icon-theme-0.5.1.tar.xz 4469552 BLAKE2B 0c2b6cb3c60fc5260c2813db84977167b56898f1388bc034180c2efd6b7d3fe5baea6a18f9cadbf984d3680100bf2c5ebbc8f1130491c41b1223efff889ff4a8 SHA512 4ae0e7efd610bc68c4fec2fa00e83b4cc61a313fa4207c213d592f7c8f40bda79117e45dfe7df537baddc8834a55f8ab8864918655136d938a7201c7520597b5
-EBUILD lxde-icon-theme-0.5.0-r1.ebuild 612 BLAKE2B 9a1b49d2deee9eaa80c6f08429aafdf391740c7e17efad497d058a0b2391b01ab7c950f5c6a8dd0fc5c782635aa41d98e474aa6ce874c3786b8aeeb24d75bf7c SHA512 27c6ae7488c5d4d2df1833b5ad7e0760a19bb940b3ea8225d01a3daac3ba296dc8ea83345097e280afa1af9d07c21ba8b4815b9df2bade3102d23cee93dbc26b
+EBUILD lxde-icon-theme-0.5.1-r1.ebuild 402 BLAKE2B cef96c6bd7483bcd9355a2984a0ec3e0efa7c9ec02a99a23c58e9f742acb5d64b7a7390986576677001e821504990182c591dd35d92fb8be14f3935030cf5859 SHA512 de132271c8bc0b2a35770a64babbbe3954975ef30b6911d883f4fcef5b55ed7c8b7e6f9878181e240bb4ffbc5639838ba53019d634450f484776e9d94c7482b4
 EBUILD lxde-icon-theme-0.5.1.ebuild 604 BLAKE2B 21bfa9adebedf6534725d451795c9a51ca3efda7d44c5f26b40ba3ff8ac0232334aefc86db42e211cb2ebcf719b4daf05507229280050d05bfcf89bfbc839f8c SHA512 1062b9c13986c3e3cae14b678d52d753c1c6b07267c6d12414ca595f9d893458fb72e0feb06a4e1fc203b878a7e1d25fe23fac8ea588058f63995f1105319cef
 MISC metadata.xml 241 BLAKE2B 98bfae51c09ce98581df5fe14356401f4bd8dc35ea5589a8c4665239d63d5576d97de1786790c399c5d5c0df7c705e3817078cd231951f912653d536296572d9 SHA512 5ff3ff6f88249ad29e84c55fd91cdff0999f9c6c9d9cce1f5ce52d7ca0214668ebe6d9111640f5666e6688c6126d52d62dcd69c0a4949593926c2073f428eef7
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
deleted file mode 100644
index c14a0f35afbd..000000000000
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit gnome2-utils
-
-DESCRIPTION="nuoveXT2 iconset"
-HOMEPAGE="https://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	!<lxde-base/lxde-common-0.5.0"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
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
new file mode 100644
index 000000000000..911b666ab3da
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.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
+
+inherit xdg
+
+DESCRIPTION="nuoveXT2 iconset"
+HOMEPAGE="https://lxde.org/"
+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"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 10132099674f..88486e886f2a 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD lxde-meta-0.5.5-r6.ebuild 946 BLAKE2B a38b9765a9f93bb327d1ceee3238ee52b6f0856b99d6ccd3f7237c29f4df713ec75726f7ac613556c6219cf928390d939566fa9c00e174c532e3df26a40dca1f SHA512 38aae97a243b8b69252b06cc941b3ecb7803c2ad164c6df56241d4817fd82102694db6a623cb2f4eec1b1a2054771c8d6a31f6854e48924bb6bbebfd06ea3956
+EBUILD lxde-meta-0.5.5-r7.ebuild 985 BLAKE2B fc9c360f4a7385eb2e50361133dced87839f215eca52074ba8400a90ce01f42e1bd2d28be6349e43f278e9684763ae208a3258f4d9f90170a3a0ecd9798d4aeb SHA512 b16410ffb6bb813784f3e73191fa9c15f27213792c0b82c97fb6cec3fae834dd7442309e90e80de698d63b7691bbe7d80eb0b884435c6ea5869f0415e247adb4
 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
new file mode 100644
index 000000000000..be2acbb50c58
--- /dev/null
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
+HOMEPAGE="https://wiki.lxde.org/en/Status_of_LXDE_components"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+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
+"
+
+pkg_postinst() {
+	elog "For your convenience you can review the LXDE Configuration HOWTO at"
+	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
+}
diff --git a/lxde-base/lxinput/Manifest b/lxde-base/lxinput/Manifest
index 8faad2e8d087..9881d259d0be 100644
--- a/lxde-base/lxinput/Manifest
+++ b/lxde-base/lxinput/Manifest
@@ -1,4 +1,4 @@
 DIST lxinput-0.3.5.tar.xz 145356 BLAKE2B e3c96a1232329afa5030adffc17af4adf9afc3eb1049f860fe6ed115eb35d580c24a69a21a9a858790b9213b7d4dc716ab9e30becf42b4f9645f2ec642de538c SHA512 d5233f03c4314ac16fb548db56ae2d17651b29d8a59bfef3e6e6805f6b9bc8100b0711bbc72e31a6bc458eccc6fe1b4a38cf097dbf6a1b04f600bba58ff03f35
 EBUILD lxinput-0.3.5-r1.ebuild 847 BLAKE2B 870cf45c0a23c0aa33a593a2c83f46e2d694fe770dacc8bbe9eef6f2b65c48d4761bc09f734d38f6578cc1e47e3327bb927812affdd89327b40cacd8740bff65 SHA512 b9c98cbb3d826c07c61617f88b7a12b8a035363bcf719b1e9c6bd3b8997f242b1f19d467846eee50f177f6e18a82ab30548609533b0fcafc4b2f7e2b825dbed4
-EBUILD lxinput-0.3.5.ebuild 470 BLAKE2B 83d22dc446152ba2fb7a5f2ab2bfa082b8391729f3df3855a682dc50ca9f09318c94455607cf62fa97353c2f38225615f3c85eb1af5f2979a86f39be1fb0b2c9 SHA512 d7cd19bdea6ad60c4a7aced11a8dad42f038308eca252b808d47a33ade32c7973fdcb46ade29c657b22985f348edf90bf484af9811207bd1909188f0af4cc36b
+EBUILD lxinput-0.3.5-r2.ebuild 547 BLAKE2B 016c724d0f442739bd5ad0a5c34fe3fc87176f4f0963309a5c135c84c02f55a2f1a00666ee5caa214cb3226fcbba264ee60ccd0edbb0fe6b0354ad353d5bbb61 SHA512 53603aed96375b121d2575090c5d4cce4af6b58c3f1b93e6362a7fc124480086b2408f7f9adf60c1f4ac264a5b2c8c71479144ec7d3e681000b30e3f02112453
 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
new file mode 100644
index 000000000000..414ef3254f96
--- /dev/null
+++ b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE keyboard and mouse configuration tool"
+HOMEPAGE="https://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxinput/lxinput-0.3.5.ebuild b/lxde-base/lxinput/lxinput-0.3.5.ebuild
deleted file mode 100644
index 259073e29dc4..000000000000
--- a/lxde-base/lxinput/lxinput-0.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="LXDE keyboard and mouse configuration tool"
-HOMEPAGE="https://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0"
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index 2502b71ba29c..7ce0fbf41e9b 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,3 +1,4 @@
 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.ebuild 674 BLAKE2B 07b729242ba3f233279ba2a429573cd62434d19848dcde7c8f54cc59dd79f5b66bf68995e7865a88fa27413fbc1b0274e300f3f732bcf504f98576e429d22cc0 SHA512 c02f47e78894ab730f0c6aebe3bc3ea0f92ec3d44049c6f8318fce537431680b5bf483be8a024a120b6dd1acf3880c4518d8dd7d8a1aeafe091446d3a53fff67
 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
new file mode 100644
index 000000000000..e472c53f384c
--- /dev/null
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open source clone of the Asus launcher for EeePC"
+HOMEPAGE="https://wiki.lxde.org/en/LXLauncher"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/lxde-base/lxmenu-data/Manifest b/lxde-base/lxmenu-data/Manifest
index 5b7311e659a6..6dfdbf12f562 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 519 BLAKE2B 5ed8028dbe5ffac347c8f2d7e8841ad7007b1a62df7f3b59bf0a4c732499b39331b0ee3c17dd78fe3482dfbf6bd18f3b1563c181a8a63f2cec187cf097ab23e5 SHA512 12a18399ddabc568777ead2458ce5cff4a87971e416facfc38c390d07a0baaefcb84306fea2fe2e6b9df2444433244d81f41f133850e8fe58db4874785333ecc
+EBUILD lxmenu-data-0.1.5.ebuild 510 BLAKE2B 5a290a085beef9fab34cce8cc9aac8bf8bb4e71907cce41d524f8a942984016b432774eae9534baa63301bdad1781f6a7b2643d36f058ad1fa6c07b3ac152bc4 SHA512 9f6d9d6b979c91480d50020173dd0f3a8575cc5079e1cec1c4974e5117826545dbf63ddcab996af8f2f05c176e41afb6395af5c34fc9bb352557f5a6e9643f75
 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 a7b67eecbaf8..d6ecc4fb38fe 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.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=7
 
 DESCRIPTION="Provides files needed for LXDE application menus"
 HOMEPAGE="https://lxde.org/"
@@ -12,10 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/gettext
+BDEPEND="
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index de9793fce87d..57c24b3b9d06 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,4 +1,7 @@
+AUX lxpanel-0.10.1-fix-pager-panel-width.patch 1123 BLAKE2B cc4e0063e92b0cad0a9477635dff3f013aee4e71626b61c5f5a1e45d5c1bc374c47eb5448cf69086215b8c1a1a901cd78629acdd5d2b1a065ca3cb8853a7e792 SHA512 ffd529b5facb9394cc5ab6501688aa20e32a74da198e6e7004325dd9fa6ca0ee01697d17913ba1115aa7a4267cfcaac855deb8b7a8e98a6de5b330e39efaeabf
 AUX lxpanel-remove-gdk-pixbuf-xlib.patch 845 BLAKE2B 8dc597f7538134a5e7b04f61d415f90808dd7f9d19cc6cd2cef998d452a828158032e05041eb038643650de07fd3c89ea680e0f9f6d3e9bb427d9ad2717264d9 SHA512 73316023668d65286433297e7ebf82a21973af398177a4abcb755d09c8aa201c2c70932fe24b642092d3157a3fdf97a1c9746a47d719aeb0f2324751c4fd5220
 DIST lxpanel-0.10.0.tar.xz 1544700 BLAKE2B ea210feee23b2da1c9f6199bfc274c46e1142d6397ca0d1d8359329068ed6e46eaebff90fb220ce14121ed19cb5c60014230c7a7e42867318317845751418a7b SHA512 3e664eef3cf0f37cf4609f53f1f40f5d50e94ae088c497be0439851ea8f1426ef6ec1373d146e2e0ef1b9f51f557ae19eb5fb1059b0e5fcd5b1c49fd76207a59
+DIST lxpanel-0.10.1.tar.xz 1548276 BLAKE2B 2ea8628c9c4c7a77d65e58cae0b5656209db63b455299fcda00fe79aae1b139860ed8993ade7db68bbc65f61b8911f40879f1ef9993dc12f15f7480d3ea72cfa SHA512 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef
 EBUILD lxpanel-0.10.0-r1.ebuild 1931 BLAKE2B b1fdbb2c6dfc9d868bfefd35734ba4891d5e628583a04ae4edc7758127656da075f8a5417171a9b8672a7d10ecfa6030e61df627bc8a7f8e957df84a890838bc SHA512 f665ad7a88b9988474af4f550cb9f883dc78f2d118cb87578fb80053cf9c0e0b1b767979f575e9efd6a5d282c8781d77cd5e92e8353344f61ca982603802b811
+EBUILD lxpanel-0.10.1.ebuild 1634 BLAKE2B 4ca15ec4e011e39cd496e7d8d3c70e933ef8dc157a18ff997807e42b1a971a5f2cb7424d797b49799872480c7a6a91a6d4a85bfe3bab57efe491885ae7e4fddd SHA512 92e6e2c2d1d247d22c3ac3d3e1a190c107b2ed0c0fcc25f9a06bcb947a0417a344d96d57d74b9bbebcce14de05c3adf5e749ca148a64a911dfd63a9ba184b55e
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch b/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch
new file mode 100644
index 000000000000..4d53fc8f783d
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch
@@ -0,0 +1,37 @@
+From b46e3a39786a5be04bf9cc3844dd184308cd7495 Mon Sep 17 00:00:00 2001
+From: Ben Walsh <b@wumpster.com>
+Date: Sat, 6 Jun 2020 10:38:15 +0100
+Subject: [PATCH] Specify GTK_REQUEST_CONSTANT_SIZE. Fixes #773.
+
+---
+ src/panel.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/panel.c b/src/panel.c
+index da9e718b..b52fc796 100644
+--- a/src/panel.c
++++ b/src/panel.c
+@@ -293,6 +293,12 @@ lxpanel_get_preferred_height (GtkWidget *widget,
+   if (natural_height)
+       *natural_height = requisition.height;
+ }
++
++static GtkSizeRequestMode
++lxpanel_get_request_mode (GtkWidget *widget)
++{
++    return GTK_SIZE_REQUEST_CONSTANT_SIZE;
++}
+ #endif
+ 
+ static void lxpanel_size_allocate(GtkWidget *widget, GtkAllocation *a)
+@@ -413,6 +419,7 @@ static void lxpanel_class_init(PanelToplevelClass *klass)
+ #if GTK_CHECK_VERSION(3, 0, 0)
+     widget_class->get_preferred_width = lxpanel_get_preferred_width;
+     widget_class->get_preferred_height = lxpanel_get_preferred_height;
++    widget_class->get_request_mode = lxpanel_get_request_mode;
+ #else
+     widget_class->size_request = lxpanel_size_request;
+ #endif
+-- 
+2.27.0
+
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
new file mode 100644
index 000000000000..f8edfb798dc0
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 xdg
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa wifi"
+
+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 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+PATCHES=(
+	# https://sourceforge.net/p/lxde/bugs/773/
+	"${FILESDIR}/${P}-fix-pager-panel-width.patch"
+)
+
+src_configure() {
+	local plugins="netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors"
+
+	use wifi && plugins+=",netstat"
+	use alsa && plugins+=",volumealsa"
+	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+	econf \
+		$(use_enable alsa) \
+		--enable-gtk3 \
+		--with-x \
+		--with-plugins="${plugins}"
+	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/lxde-base/lxrandr/Manifest b/lxde-base/lxrandr/Manifest
index 8060a1817810..508f5d6fb7d5 100644
--- a/lxde-base/lxrandr/Manifest
+++ b/lxde-base/lxrandr/Manifest
@@ -1,6 +1,4 @@
-DIST lxrandr-0.3.1.tar.xz 132468 BLAKE2B 04ea378eaa550a1610f4083524c48dab6e261301dc30262fc34049d89d3b29b02d8ad2c521fc3beab1be416b54560dcb87bb2fc27261e35cb27771fbc7bbe9ee SHA512 525cb8800045f26cb1ecae994e1663db4ce41fbfcf1eabd6c50de38988324cd50f51167fa0caa6872867955c0d18af115bed1d4ae896cb15871efd477eb01196
 DIST lxrandr-0.3.2.tar.xz 134072 BLAKE2B 8c8e7985b20c4b90d610b51ffbb7c6f02096f9b2550ea69f16bd0ae8840456a605d646d83cb2a70550a84aaca87deb6496b811fe79990cf36994b2b66aee7915 SHA512 9f00f885e4af3544d9bf8a7581d5b9e3049c1fac174c119dda8c85f2f94aa7be241b6e06e5fe86596a0fb65a38bfe1983ced91c064339a60b19f506ed337ee4f
-EBUILD lxrandr-0.3.1-r1.ebuild 892 BLAKE2B 082bd76098036a0d4c70d9bd2d3a1d3a5c97fe80e82a9e34d2f2d9ea0a2b58cf47dff94509303f2dc0a7bf96bb2e590991fee0f2ab3cc58c6a62375b1aad0cd0 SHA512 ba1350df87448ef6bed8d06d1d14b0499ee78c1130e28eb5e098ec8414dcd1cb655ec5f554cdf19e41cfbb740d34f638f1adc1bbd5a5f74177f1bcef1f3cef78
-EBUILD lxrandr-0.3.1.ebuild 582 BLAKE2B b1928c45e4cca0c55152720040f22768ac16e859607723784076e81dd72e32178454bd7d3cc061c69df08ab7ab2d0487a790f8e8e4955aa1633b6a40a0ff22b7 SHA512 a9fdf68eeac208a32f63f64cc8837a0e10c6eb9608cdbd16f6cdf499d8b3f86a4953273f400f3e6967fec61438748fc28c6b3148a53d8a1710910ef07ed5dc97
+EBUILD lxrandr-0.3.2-r1.ebuild 599 BLAKE2B e0c40758cdb9d1b71172e7a4e083bd10ac021e1253a6bf7088593036c318c8769734265497a28c52c01affc0f5ed309019f339e51c04a49d2d97e08b44f11ebd SHA512 2d361e3ace772fd7d4c4d70bf654312969c6f7e36520cab6833efa023f1d326ebddb8884d3de06ef38e178335b972c047c6803dcb3db829ec9345c2745fdf918
 EBUILD lxrandr-0.3.2.ebuild 888 BLAKE2B a5d7cd0161755d4fd3650b6ea369f43fde2d3b0d39c02d16cf0dc851301372615855784e9f1a509b710eddf872099f2650d39c99689f0deca9c0c79a31ff95cf SHA512 bc12a64f2dc5d75260281ff864053581a9f283db2aa4c59632ae7e3e9087d4fae4eece1bf8e38dd7fa0012910707b358110c1ba996023ab50a48a6d328eb53c3
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild
deleted file mode 100644
index 57b52d1c2d99..000000000000
--- a/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo
-fr frp gl he hr hu id is ja kk ko lg lt ml ms nb nl nn pa pl ps pt_BR pt
-ro ru sk sl sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n
-
-DESCRIPTION="LXDE GUI interface to RandR extention"
-HOMEPAGE="https://wiki.lxde.org/en/LXRandR"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXrandr
-	x11-apps/xrandr"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
diff --git a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
deleted file mode 100644
index 3046d10ad579..000000000000
--- a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="LXDE GUI interface to RandR extention"
-HOMEPAGE="https://wiki.lxde.org/en/LXRandR"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXrandr
-	x11-apps/xrandr"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS
-}
diff --git a/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..dad80fd04fd8
--- /dev/null
+++ b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE GUI interface to RandR extention"
+HOMEPAGE="https://wiki.lxde.org/en/LXRandR"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-apps/xrandr
+	x11-libs/gtk+:3
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 59669182bbb2..adf58c1581c9 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -2,5 +2,7 @@ AUX lxsession-0.5.2-fix-invalid-memcpy.patch 1010 BLAKE2B 6ce3b44341851babacda8b
 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.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
+DIST lxsession-0.5.5.tar.xz 422564 BLAKE2B 27910f84ecd8df8af06649235d33604eb83e8203f6a485a7450a91887de691d161acf8f51d8c1786f8d073966ba88d20296275adc131b9fa1c670c0f9e3ecdef SHA512 12e25214485cf855b380a5aa91eb536f31536c98f5a50a1115cb4bf8ff884c7cdcd40c69a1502eeb9f4d3e6169e0607d6488ef3152ee184662fee39fe7a04d54
 EBUILD lxsession-0.5.4-r1.ebuild 1287 BLAKE2B 5d8ca8b941dcdf099549076f0b92fbe27c4596c6951f8c9c7fbaa612d401437cccc115813e6da5c102ffc6cf9a32405e53bdfe67aa3b8260a3eb5f2bc679f340 SHA512 2b9539f0f03181159a7b3d5caf80beaa83430183be10f98c89b39e658fde69c9280fe42d493371d59fa0ae7d4dd28823cd1a534541a0fa6dd4da5147d879968f
+EBUILD lxsession-0.5.5.ebuild 1154 BLAKE2B 9f07d02afb7cffe7338a7c30a9105de2ad094458d5bd20f96b2a02bec4790eaa197961cdb9e00ec70d35612457757b032eaf124f252243efd024ae90e87fc81a SHA512 5b6466bfad977d23d09aad2b3a447b944460ba27cc203835c34483306e86c840e68182f8e72db5a86e577ed15b434c8e59ae254d6d94a66592bcc8372f3d54d2
 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
new file mode 100644
index 000000000000..d932ca86b560
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	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
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+)
+
+src_prepare() {
+	rm *.stamp || die
+	vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (logind), and suspend/hibernate (UPower)
+	econf \
+		$(use_enable nls) \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index 5c9e32e652bd..4492adecfef8 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,7 +1,6 @@
 AUX lxtask-0.1.7-fix-no-common.patch 2102 BLAKE2B b0329dcdaf9b958b3376d3a641fd392980affedea52a432bfb7b88c5dbb6145ead473b4eb6ec52cd49f76469c706bc241b5b3b618d8d12f6fccea2bdc5e860c2 SHA512 74b8f187836a70e7c144b5e0f7b0fc06ac1bd2c8db5559360c709bb441293b0fa92ba41e9b02f7e455d231ddeb6d7822dd8e3859c20252e0bceab391cefb6d2e
-DIST lxtask-0.1.8.tar.xz 137288 BLAKE2B 05a69cfeb8d4801cc0ee7fa502f23d98992e3eff7c5d02ddac8c46942da366224a669704d174723c9857b13396a23aa2bbe4ac0e35afac6f6c65b0e9869bebbc SHA512 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a
+DIST lxtask-0.1.10.tar.xz 138116 BLAKE2B 38fc7e4192a04a3748d14148d7defe71e766f802b869468c25aca971d58072824377da374b72116c924310a5a001f65680d878a6bc0afd59609ede63a590fc49 SHA512 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a
 DIST lxtask-0.1.9.tar.xz 138000 BLAKE2B 1f26cf4c4ce0ab64cd6b3bf6b7539aead92da2a816f66f4dd53d170f48aee8d824993b26d316535dc23f8539c33f9b31c89a631f2bc8ed4778675a3c001ea470 SHA512 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d
-EBUILD lxtask-0.1.8-r1.ebuild 965 BLAKE2B 403261a84811f1f5ce3b5eba2c38a124c4ea144160c5ba18161aec57fc4986b42b073512f5819e1603178a7acff019494c1eff7bd0f87838baf370b75b729654 SHA512 2e42807ca81f0ec0d4fca2077b403a45301cdb791ec2b2217833903ba62a5f479aeb17b1fef7abba1ec4c3d15d676b5f06e79b0ebfd9f0f4b6d7de56a6fb48b2
-EBUILD lxtask-0.1.8.ebuild 582 BLAKE2B d1c44263e026b4797dba64945f4390af83de51fe59228b3aaf6e5b56a97d9f2297c3dc3cc2a65dbdbd460fb158330d45a31304abfcc84c16207b0de0d557d43a SHA512 913f9f5f9fe2e3f1c350ebeaaf6973da45c9caefe00dd4c1891cb0f57de76bd85619e2991880d010cba5edb9cb000417865993de477eef19d37208e3af836850
+EBUILD lxtask-0.1.10.ebuild 519 BLAKE2B 27abb40d47aba76ad5d6e69bac75e7043e2ccafbf4f93e5296e372db06ad4097b73998869d62012fa272fa1b782ed2762b63df870a0e884a830549287e8dfe87 SHA512 bcb4b0bbcea1f96dcecba98ab472be8938c79336c9828962837c0716540d04cfa8221c48e8b5f91cd9d23ec0a9915aa6887c5953d7e86818d9cd3c9d3b5f308b
 EBUILD lxtask-0.1.9.ebuild 961 BLAKE2B 8b1bb356b2cade617f539b2f33ef8e03b8cea77b64c3d7b56c0cd0b432921256eda8fa33087b9b2036e103c10040001d513f6412f337eef9e61bc4f62d27cf83 SHA512 fa9bff1720d91756246c6c0d01cd9444b35dca4b6339ffbff5ea8c2ab76800e53c36deeca25a81d2a547bb807686d66174b6fd11f8ab14ef5e5256cc3550fbea
 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
new file mode 100644
index 000000000000..ea0221a2b864
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXTask"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild b/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild
deleted file mode 100644
index 59b4a81a99fe..000000000000
--- a/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr
-frp gl he hr hu id is it ja kk ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt
-ro ru sk sl sq sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-# Upstream report:
-# https://sourceforge.net/p/lxde/patches/535/
-PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
diff --git a/lxde-base/lxtask/lxtask-0.1.8.ebuild b/lxde-base/lxtask/lxtask-0.1.8.ebuild
deleted file mode 100644
index dcf6b6512c01..000000000000
--- a/lxde-base/lxtask/lxtask-0.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-# Upstream report:
-# https://sourceforge.net/p/lxde/patches/535/
-PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index ff0c4cd0aeb1..35eab8e87455 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,6 +1,5 @@
-DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
-EBUILD lxterminal-0.3.1.ebuild 1161 BLAKE2B f3e6cfe7b16e9179c81ff214158b590f79a973f4ea12ae3df6362b8aee666001abedead640e3ed6850b3ad4794da89bd0eddbae41a75cfc1529f0f43db73953b SHA512 18f8e12479bed318421d45b72448475c4a3881b4218dc4c9ed52aa0ddbc38daef479020ced5031007b374870ccd9f61383815ab7e9768a107a0d5268f6d801ed
-EBUILD lxterminal-0.3.2-r1.ebuild 734 BLAKE2B b9274837b5a0f2b22fe23b6c20f9dbe792e4e5b2659ba31090b45140e093b8a80f96b6ac5d863302f19f76f38a1c3f0bf937197e78785dffd38534de77d90c2f SHA512 2797db75cef1f72cf75da51add8dbfaaefb8e621173f30337c98539414809e08d6960c6b9135fdd69c547317085d3d5eda35d4f8e63b1e3c778622b43c159b4c
+DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
 EBUILD lxterminal-0.3.2.ebuild 1160 BLAKE2B f0d3f51ec81a087fad85d7f5014442238c970072f1a6972e332058bf73b0452253bbe419ec06d23923164946a94c4aadad19a39c7937f8fd93349c1c000fe01b SHA512 8dc1d952d6b2abd05cd6a137ecfa389066147f3ffb8460cd6f5d6dac3c1ae55fbdbd70d405a861da9f40fe30146c7765c6ad2794f7cad4fb57805f9467da30f9
+EBUILD lxterminal-0.4.0.ebuild 735 BLAKE2B 089490e8a7da688bd2ab339ed7ff8556a092ac4e42fc2a77e735392f8a097b621aca1f8b2273d84858be577d1c55965afbb47eb7eed308537768fb8a3df649f1 SHA512 db3ba508e985adca466eae401d0473931a7a1aa334179a3721bb35f6d003dbaf20b715e354b27a4d9f6f6258b96b49667fa810c45d5442e9fb691cb4c13fc31d
 MISC metadata.xml 319 BLAKE2B 95e1ebe72dc9680bad73dc167bbe202f0d5a943da478ce2beb8c4bd0f15eeae7676598ecca89b0244cdf8292441b6de29a94738b33cc4ebe07783827c6b756e1 SHA512 096769b118aac41cbdfcb9e07eea65860556df150eef61fb2e21c3354c49db5f2eb4bca67c287b217ee42bb8bf643b21b27e02c0b754e7fbbb7d493cc237b805
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
deleted file mode 100644
index a20e5520b167..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn bn_IN ca cs da de el en_GB eo es et eu fa fi fo fr frp gl
-he hr hu id is it ja kk ko lg lt ml ms nb nl nn pa pl ps pt pt_BR ro ru sk sl sr
-sr@latin sv te th tr tt_RU ug uk ur ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit autotools l10n
-
-DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/lxde/${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk3"
-
-RDEPEND="dev-libs/glib:2
-	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 )
-	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.91 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf --enable-man $(use_enable gtk3)
-}
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
deleted file mode 100644
index be9747b86519..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-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"
-IUSE="gtk3"
-
-DEPEND="dev-libs/glib:2
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0 )
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.91 )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-man $(use_enable gtk3)
-}
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
new file mode 100644
index 000000000000..50c4a08d1e48
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+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"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:2.91
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-man --enable-gtk3
+}
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 855e27f616bc..5c0959a2483b 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,4 +1,6 @@
 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 786 BLAKE2B 4f3bb20e38bd8d8dd6c16b1c4730628dedfc22ff2032f17a7fdd73fb9ed605ba4b0120a1607c6317dc46c918d6454e0e445cd52c32a876ea0d3af5d72d998262 SHA512 88ca314e21d2268c2f073c74ad8a3237f55c114d2f90ada032802387ed472d5b0af8f7c2661a0f09b934bd8f8c12312a3e52c2d54828d8594607abb0c09c64b2
 EBUILD menu-cache-1.1.0.ebuild 705 BLAKE2B 7a853e20f267223f9a5f3c0ff8dbd0cec87bc578833620d0da8c67300f185d7512916286d7abca89ef0cda338fa8e845cd01ee844d8e9b08682df39a93f0e903 SHA512 9313c2765c7ebf260f3c1c3480f70718a3c4fae63bda870d433b3e63ad8d0991d44935796c11b7a8810335e31a3b67974610506f05649147d8b9093a538fc23a
 MISC metadata.xml 320 BLAKE2B ff914db078fa5bfac7bc5184362f6a8c211945f0c1e0286fb3d7ba4da205c108678206272559fe5f5217380ed867a309c8e920c0d4a0cd5773e0b4d8ff9466c5 SHA512 b5a290c4ae3492e59e38159a1ad9aaae97abaad29ae07936db417f85b5a002f6d325d2b769a9222880b3235ed2bec0e3f59f930a9e2ea49fe4c2094549e84060
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
new file mode 100644
index 000000000000..faa91fff3e92
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
@@ -0,0 +1,37 @@
+From 97e5de8682c0c44fe4e6a2df864c5fdf76cd77cc Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Thu, 30 Nov 2017 11:36:18 +0100
+Subject: [PATCH] libmenu-cache: Fix memory leaks
+
+---
+ libmenu-cache/menu-cache.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 5025d72..273b503 100644
+--- a/libmenu-cache/menu-cache.c
++++ b/libmenu-cache/menu-cache.c
+@@ -379,11 +379,15 @@ static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache,
+             else /* separator */
+             {
+                 item->type = MENU_CACHE_TYPE_SEP;
++                g_free(line);
+                 return item;
+             }
+         }
+         else
++        {
++            g_free(line);
+             return NULL;
++        }
+ 
+         item->id = g_strndup( line + 1, len - 1 );
+         g_free(line);
+@@ -923,6 +927,7 @@ gboolean menu_cache_item_unref(MenuCacheItem* item)
+         else
+         {
+             MenuCacheApp* app = MENU_CACHE_APP(item);
++            g_free(app->generic_name);
+             g_free( app->exec );
+             g_free(app->try_exec);
+             g_free(app->working_dir);
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
new file mode 100644
index 000000000000..a7684ccc41df
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
+HOMEPAGE="https://lxde.org/"
+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"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/libfm-extra
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.diff # upstream PR#19
+	"${FILESDIR}"/${P}-memleak.patch # git master
+)
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 889cf2a55a25..0730209908be 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 9bc692f860a8..90904758f3e1 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -6,4 +6,4 @@ DIST alot-0.9.tar.gz 224932 BLAKE2B 6063b9974ec54b51521ec52db41519bd9f16cc8da611
 EBUILD alot-0.9.1.ebuild 1451 BLAKE2B fef418ed84105d42e9c584d519bf5e51df206e45d8395a55c5abea4ed33fa51f45076b3ce36c177cde8621671039dd6e53c6e50de7df132dbde60b2473c407a1 SHA512 e784edc5d94d2befa333de761f420baf8e41d8dbd4af8cab575af227dc4672134330c2112346e2c82c7fe80deb0c3afe2eb59a8cd2d22abcece2ae0cab32b4a3
 EBUILD alot-0.9.ebuild 1559 BLAKE2B 629d83b7486801e1a944cee11dd93018059e394251f01e26559f4aa823e51e8336081f7836130d8adad09924e79f6cf4234477b376e28085380d1a74483d8a4b SHA512 cf5e0ca63ed15240d58ddf3e1a4689988ce3d78b0fa7cb6f997ed752e8b7bea9284f0c84ce8c6903804e15cc08d28e9c99bb9dfade96c71e690ebe493dd45541
 EBUILD alot-9999.ebuild 1657 BLAKE2B 1f31a842b9ef2f7ea905841056fee3832f308a37b670f94498a4d3e784be4e1fcca9f9e74a5d186431e51097ccb6f7d1914d63c9e89bddd73b48209759fff42d SHA512 4a38225e769f1992d17f33814abf8c0a5f7a3a5d07c5acaa8732ed1b23f4497de0a0679a7d5e87840a9b626281f4edd17c25eacb9270ce448e27269b969f8354
-MISC metadata.xml 713 BLAKE2B b17cf5b9a7b0b53c104e28962f5ea1e907b5d2f6cc7bf2b9d3ae3a86f9be165fedf1d89cfe618ae829e42769fd8e83b0774d512701d1b405586a293ed09a69aa SHA512 c0ac54ad568ab6cb8e349468e9b20cb130fe59ac98016aa6dccefc9ebfdf16632c75d4325ae28bbaa5b7b1665486254bee0ac6deb613c9e573ca1070ee6ee853
+MISC metadata.xml 743 BLAKE2B d0caf88144f753ea9db7357916d368592c01ac70e4d8e353e900abcf8b12080db1101007d11494c814274bdcc4f72c1c0e0e346e6e9db90c8276f08b8f8a7269 SHA512 23483422ed361b501d520230378a9ede436235b81199ea80eb1d7f1c73a4e31c205b497f8746a289cdd99d4811f60af72446a393c13e3d6b5a0dd3de90129685
diff --git a/mail-client/alot/metadata.xml b/mail-client/alot/metadata.xml
index a1305700ab6b..d8f5d0a3a1ff 100644
--- a/mail-client/alot/metadata.xml
+++ b/mail-client/alot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 74247ec2170a..53e7054d8fb1 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,4 +1,4 @@
 DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
 DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
 EBUILD alpine-2.24.ebuild 2218 BLAKE2B 526c1d347fc5a67b99cac7fab0cc2e3863801359455d613b26ae99e1525602207e4d4a619edb3f92b1f6d51b691763d2cb7812825bd645ffdd7df43595f7d20e SHA512 5127654fa45563faa21e5bb5e3930c1b1ff648f777544458ec7cde18136bccc87cf9d6cf841aae49e9a68a8b0262a49e7df47e8d036de6066cbd2fe821ea4ff7
-MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
+MISC metadata.xml 761 BLAKE2B 9c8efc6c9d67abcf64bf3ff45f4ded20a8676bf9345aa0164ff0aeba0f111eb598d6a30244006ebd17ea6343bc0add24a2a3450eea4dbe2ecf002c4e78a90614 SHA512 758ab136a5d3f07ea0d7d44b58dfe25e4f07f094ef4eba690ff76964cc7ea8f5bab7fcc790a4719ee2268ad614b282311e5c64673f6a2960ccf006202fe052cc
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index f37867c6e471..4e2ac276cfaa 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-client/mutt-wizard/Manifest b/mail-client/mutt-wizard/Manifest
index 78dd21b60535..e53752ca68c7 100644
--- a/mail-client/mutt-wizard/Manifest
+++ b/mail-client/mutt-wizard/Manifest
@@ -3,4 +3,4 @@ DIST mutt-wizard-3.2.1.tar.gz 33468 BLAKE2B 60087ca8b6cfe2f69e1f078942ef24be8d38
 EBUILD mutt-wizard-3.1.1.ebuild 1201 BLAKE2B c3feccca682feb4f6c58b7c7ec1849c0b0b09672d265973cdf364c89d6b1c3f7767a16fd8f42b739a34c712837ce9c333506d3ff3a321f7b9cc819e22f6bc1be SHA512 e6d2b7bc60f2e2d0ed45186b7ec1b1b11c8fba521fff93939871751b6f9ef6daeba1412eb7a2db06906642e5ca1f521b07c8744b0ecc493459e783c3dd762f87
 EBUILD mutt-wizard-3.2.1.ebuild 1211 BLAKE2B 774ddbc942ca54264961e39753f06245e569c6f944ec49e2ee133a62c4ec24673bf10855c3f6193db06e7bc1fe1d8dfcad55c6a06c38816fa565b636c5c23691 SHA512 738e15078d4646df2b74765cd189a7d3f81a180d98e11a048aafbdc1d17998f36c0bf4fe40d36d22d7ebda3ce26256a7d38760d92caedf59a7775cacfecddb7e
 EBUILD mutt-wizard-9999.ebuild 1201 BLAKE2B c3feccca682feb4f6c58b7c7ec1849c0b0b09672d265973cdf364c89d6b1c3f7767a16fd8f42b739a34c712837ce9c333506d3ff3a321f7b9cc819e22f6bc1be SHA512 e6d2b7bc60f2e2d0ed45186b7ec1b1b11c8fba521fff93939871751b6f9ef6daeba1412eb7a2db06906642e5ca1f521b07c8744b0ecc493459e783c3dd762f87
-MISC metadata.xml 661 BLAKE2B 0fb12b65b9bec3fdede05001ac566f826aab3eac22e38985c2b408133b575923aa8a6cd53ac0a118f8f6d546b7f11a4a87209147cbd4ab0f299e9f33f169787b SHA512 05597986d8114f3fcb752f2ae5ed7dcc8eb23bafa67f67db6c1fdb8d3cf404762c7929d0fb1837a1a5f7c971c539d0d277897892f3ac43530276912d64a4cfe7
+MISC metadata.xml 691 BLAKE2B 93eddb8c56354b675aa197bb8703f32d8c9fdc2c4738229353a5f5ee80f1b1b3dc52057738e6ba59d77ea79ce7692106b6c1e685d104087cff3d6a80242f0c92 SHA512 c6c0b6d777d1a3adcf2fe815227960bb4922f48d3908277cc4dacd64c5531bfd7bfc70ad6a985eff2eef22c48238d657bdfe92cb5863a25fa760d6f95394d865
diff --git a/mail-client/mutt-wizard/metadata.xml b/mail-client/mutt-wizard/metadata.xml
index 9dcfae8270a4..a7160a072021 100644
--- a/mail-client/mutt-wizard/metadata.xml
+++ b/mail-client/mutt-wizard/metadata.xml
@@ -7,11 +7,11 @@
 		offline email sync. Integrable with a lot of other utilities for additional
 		functionality for managing emails.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 9c8395a8dc15..c9ffff584496 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,4 +2,4 @@ AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce
 DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
 EBUILD roundcube-1.4.11.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
 EBUILD roundcube-9999.ebuild 2278 BLAKE2B b24a78ee7af91a78d4f9083634444e6f7a5d85d730862a23a76b68b9cb4d34f0ab991c031a5a3df5fc3e500ce24f778904c3e9bec73d177b19050231f97564db SHA512 3b53bc1aee8b1521ac094cc3421b8a92b1e295fcaf1edcd6b40f3fda4d67c765ac4a52a4e6b5fbc59c6f5097a51ae1ae61fa8f1f2de24fbb2508e1fefe8143be
-MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
+MISC metadata.xml 997 BLAKE2B b5cd9926232a99e10bbecc0959e8bcbda0bd16b6adc3bf79031b9e6eb696f596c98b6cf075fc177fa883b912c0dfba9458809a025395f4827757fbc7046d8997 SHA512 cfec343fe60d9c6513456ffc12ab6dc391651c53e91fa89699e7e7aea035ad6063f655090d7dfe9bf761dae973bfe968c19a015d9983a5ccfceede54df38e277
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index ea20d1f28957..9564101cfbeb 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index e6894ebd0b01..25f08fcb1ea0 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,70 +4,6 @@ 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.8.0-af.xpi 548342 BLAKE2B 4165c5723013c15bab04013dc316f6c7574acdbdcac676d9971b35d6eadd13ed0cbeb2d4425faaa0d0b73b543920c7a2b4d569bc8ebc5f3502030dd85950c3f4 SHA512 6919ddf5549197a398a75ea9ec0e8074bd521772e9b1a0977f9322e4967fcf4db09ea708e07c73badd3ffddf351443719d0010b80edaead75cb3b75f8eb1b0a7
-DIST thunderbird-78.8.0-ar.xpi 648607 BLAKE2B aa6a845c9fee67edde83c77864bcefd4987d6e0de7bbe74dd393d04a29b3ab13d1063c5c05700e8f9aec4ed272d2dbc75c0b90977fa92047cef1abedf7cfac7f SHA512 6a607ca466ba05bbe439b3188a470782e3f5bdd1346c4d24eafd7ca7127c4f456d26de006208affda019a010e4290e1e6940943764ee03af6b4c0933153601ae
-DIST thunderbird-78.8.0-ast.xpi 561254 BLAKE2B 86b08175ae6aff2d3c32068cda3a814d6a7a004032f9998b5876a0c6c75ca619effd7c4b647d5dc92110f82da4c78e86dc38dfc180353a2eca5ba5119029ae8e SHA512 009df4311c18d408211bbd40179cc566dc248a9ff38eeabf7373b8a5551493c92486aeee114a09ca831f759e1ba321b56ce370f7f4be7eed82f0e90e6af5e449
-DIST thunderbird-78.8.0-be.xpi 666671 BLAKE2B 6f7d5d82f1e596678e0a2341e2be5ab53ac12fcbca51187ed27f9736bf19b606e09fb2d4f54630863e942e549e9499da8fcc01d8ab2fa1e50aedda347e2f24a2 SHA512 c3b4f7a251b558f5cd3925f99d47e03372ab2512ab538c98451866a58c8c0460230316079699ddecfd0e725f09a6cc0765d4194f5751da80814587bbe04bdecb
-DIST thunderbird-78.8.0-bg.xpi 672415 BLAKE2B 9d750e1fbc1bef06c645e79ca6588e428eae3a5c5d35e9d5a7b7df967faa7596a7332e52c251779b2d4768ea8c8dbdfa22dc021b63d5beb1d2adbf6b551bfee1 SHA512 58468edfcda578fc9b262524d38f31857d59411a4e63a608c5db517bfa9bd7b7bb20261ee25647ac74f5b48bc18c9ff542c8715323d59a63b2f01a0245e43647
-DIST thunderbird-78.8.0-br.xpi 604536 BLAKE2B a33c63a80b534e48f5cf38205b3711673a02b3de2163413b99d652cc048b9ee9726192d67a53636343bf2e1f80e6b7e9bbc8f37bda0fb00e994ae64556037b8b SHA512 f28ca741d5860347964388fcbdab173223ef56766c37051dfc05ccde0f1e77184d57fb41dced3636967f895ef1f92119b99982cb37f2e991ae833ff5de00a169
-DIST thunderbird-78.8.0-ca.xpi 620451 BLAKE2B c32b0469dccc4cae5bb4bcd3ced1a503df8cec0ef750bef6c6d11057b9549e327a93bdeaf293d0fb06a00e3b8cfa8c8bd2e02f5d464f2c1d6eb482e23d899537 SHA512 60fb3eb0e0e24c5a52ea5b3203fe1a2c83920579607cdffa5054e6a8d861e8963598ff23c24fb7e0fb5febf997e9b79126046b0413a01b5fc067547cffd64879
-DIST thunderbird-78.8.0-cak.xpi 635653 BLAKE2B ce92ac946377fb7144e50dfc170946360d673bf29095a7be4aff0dded75f34307c25679750b7ec766a98711e0f07ca681556026c99b073b51094a4ed362d527f SHA512 64e8d64f9729dedc63eb5a140237f060e5a4a37fad6fe1c71d5d04738dcead20ab44690c6cf12b1bcdca31a3a7ab2f6f06c4985ac3cd7e9356fb5c0370200f4c
-DIST thunderbird-78.8.0-cs.xpi 635349 BLAKE2B ead7ef55525a86804386ee118eb6f40dc850d3f83d9f70534b7841510a80b6eaf3ac3c8c306852bd610207c9f71409b3a085f2e173edd9a47ac49e627f78aea1 SHA512 3ba9a8ad0ad92c1f95f60fecbc5b06e9b4afc8e5862c19c5d7204a014b689e9022b05f7f25e7bea76a12bb53bc35fb2daeb0bafff248002490193e5a96091155
-DIST thunderbird-78.8.0-cy.xpi 646245 BLAKE2B 3bf8ae9c19903c49618ea9837f00a35ac61ca76c3b1b6d63544bc86e5d5fdf913646fde3fc2fadd12da373ad388bdf9527a2334d6ffccf73a776ffb97ae2d49f SHA512 e2859b10dd6a21cd534ed066cbf45f73b020624c0822ffe7c00a9bd38fced0f1e0d6684e907c855475e68d031934346d8c79a4280f91141b4bc6a6c3684b0f88
-DIST thunderbird-78.8.0-da.xpi 620998 BLAKE2B ad2d11535c67bb990da63b8c34bec78afb9ff2dea92f3fb82628b34c5cb144925d8f977937489a5c8bdbc3ed118ef26e8a9efd6bc866f694f22cd0147041f1ee SHA512 5df2c6e9d88554a120613839d07d13c7d181dcab4cb45941122ebae16311f810ff82e99464124a5de672c41a1dc99fe89a54da425ceaf3df0053e340049ace4a
-DIST thunderbird-78.8.0-de.xpi 665187 BLAKE2B 5f4326eee7d7b566d273e62dc8924f20d6ff515d49523552ef3dd982cf1b2c6646844785bd56bced0df65a3149c2c349d54067106f6d0c85b315698c4afb17d6 SHA512 7178f9d97fabc04d46e6c1b0857709ce88720f44e316868799e92e6c96a7186a5c978635f72f63cc5568b356a03b85a9e4bc4067eccef9bccc8a1e6ef4d61517
-DIST thunderbird-78.8.0-dsb.xpi 666773 BLAKE2B c8348d6df73e4d60bd4df2f71052862cda7b25684efd2b3a658e98015423546b5a2762e8f6c16e40960b29e6742390394a6223c939f105a34012f0a29d15a8ee SHA512 2b1eabf4fd17d1b99acad9fc0741093dc4d79fd94fab023868aa8f61d9e7dd92b53d2a963754584d2d4cf0ab95a167292cd4cf8a3d50d724f5ba4513c2564334
-DIST thunderbird-78.8.0-el.xpi 774460 BLAKE2B d9830af62f3e07e4655ccb4efe7eecb1dcd512cb2b12169b1a40388d1cb65a387cbf69d23f0c29c1764b9478fe427373665af7056d544302af6c1016d8ea789f SHA512 9753aca2e05439818e5d45a6bcbc64c48f3342a3ca7414378fd8edd72304637404b29581833ced3320640b8cb6bf66f5410a090f76df331cd56beac013c99a9f
-DIST thunderbird-78.8.0-en-CA.xpi 611769 BLAKE2B 88f182b41a461f19cedc03c3dbe54637e50bb08c34fc78c10aa680ec8b7cb97fd721b8758edbf49c3be0dfc8fd4784452864010a296d7cd9a1ffc9045fe06ce4 SHA512 cbfffc53c1b5fd4fce0037aca6ad8d795e997ed260583dc2794428da89dc43cb4a73e1ff04567b902266603421ad52e2d82e9ad3bd8b702f938d2db1b7532abf
-DIST thunderbird-78.8.0-en-GB.xpi 611186 BLAKE2B 170d4dfe3ed46b2ca6e912ee4bd4ebb297486104f4b9db4f7720ae2a44ab74a18b556e9b6a4212bb7e386b0cf7b7c73b8630d1be3ffff1acc1f8dc55c452d322 SHA512 ee301f1dbdc7c687b6825e7636121c583a6410465bef77965b3230638a4584dd45caa75b938d001a2b378a58a965e324912637fecb06a96b841aa0f11897899f
-DIST thunderbird-78.8.0-es-AR.xpi 657788 BLAKE2B 2c58fcc67575130a21f3c863247e300f79f675737857dbe2f48510bc37e9d2f982c8d93972b86087aaeb59a3b9e64e62e871a8f37f6e6e45f123e593f3b56444 SHA512 977a2dfbe08e86b5b15c5165d77a0c8b4218fd3a77c7c26b9d6ed60422ca2467e661b0fbb9a5e7fb0e791fb2e6c58743a2a540bd10b0efe077cd3f2a24f3c515
-DIST thunderbird-78.8.0-es-ES.xpi 569795 BLAKE2B a383ded35dab81b3777cc2431455df3b680110a4769d638aeef8d42f38744965a5c51d04ec9d9d56cfae5e7bfffdb92630e9159dadbc102cfb41a594ca6dd83a SHA512 24e84d2b01313466235fc0979b8d2547a453d4fbb5db42c606c3e95241a1e0047aee7e130f5095ab57a71a3f581c3bb312aac8a92c7dfe0b4f8b89d1072eda75
-DIST thunderbird-78.8.0-et.xpi 597734 BLAKE2B e14bb1b238e3f1d6e83a1b2cab5b8d4e7c72dc9d134128a190feeb9d8d1bd30aaa543f9613a93dc164fd54e31eaad53700e777fc21f98cf58dc26ac2d97360f4 SHA512 9cb6647db768f9693e93b9dc81f2fcc13c87465dc713661ef26f0e238bc7d61fd393749e26e85aff434fb5de253f8435cb81ade6637456cfc6a5cf52ad362522
-DIST thunderbird-78.8.0-eu.xpi 632966 BLAKE2B 181574e2029b48b613877c306a0802fd90e040b73e93a6cfa1ce1cdb38008ac4a598350ae1fbde9e5bd075f7f70e8269003c1f37f31f8ca9c62c35fabcea1068 SHA512 f00eda0202e562e64e0432978d2b0ab778189d28288c0e7afbe91a9e12d084b0b0e3c8b19ec329ab0112155713c67876fe9d81a9218e537d8e751b59a57af9b1
-DIST thunderbird-78.8.0-fa.xpi 639752 BLAKE2B 2641ae1d68498c9ea3f35917ce961d83f8248e320da3d4737f316f1338c548cc10384303095c7ddf6e16e8b67538e0b535394bb4cf879cbddee9cda6031ee0b5 SHA512 48c807a6ac991434a425122d41c8aaf0eefe184949c9113268a9d2cb872f1d6afdd189e48b04f1bf172a61f9ea0eef258396fea8621afa5fc99a74079afeacfb
-DIST thunderbird-78.8.0-fi.xpi 642446 BLAKE2B 9021bf414f4456c4bf31100fa9971c1d86ddbeafdda00afed720168e26259e8fc3662a01f6768e3e03dc11c35bd128c36aecf1ad3d62b910079df1ea1096063a SHA512 c1cccb2c151496009e19e11003f0ecb9b790a8d38eee729665ee5f0a60e8301a42187a6b7d6994cb01f429d282d4eaea8f8456898eb3ed02b35456e9aa029e80
-DIST thunderbird-78.8.0-fr.xpi 669487 BLAKE2B e3fe0ff95281e34809deee629ba2c4b373a51283da037a62b214f7168d2222166140b36a770cd77554c594240940eee0f297a40bd0f601bdba558477b168f98a SHA512 1db2d3a5315ef3354d62e0d3137f6c3a67686379b57d77db37c9528e9d7be2769fb0fec69923de792cd1c2e6f9d2021d18ab335bdb175f12b46dba4d761f29bf
-DIST thunderbird-78.8.0-fy-NL.xpi 653081 BLAKE2B e9f6970daa8443ce773d4f6cb1034ac80fbcaa26459d7b5462dfe55fb2f641ac5972e0170f066b1c6f274be3fc31de4c3dc6fccec5093d884be9eb294fb34f25 SHA512 be36ab1dc00f94924671aa208e5d0ce9026c207a905943e6858de8c3d1e5c3f3cca17090e43371802069079e05eba7d3d1fdd1a076d3f998959fbc1fe33a97fe
-DIST thunderbird-78.8.0-ga-IE.xpi 600699 BLAKE2B be75208495a5e984a5ca52d044be90ed08594f03f24c8aef2ff518907e7f8a1d5efff472664a45cd40bb75c209f02bf1c9b70454441160ad521ff0bd09a6b88b SHA512 f3ca1e2a43f67b30ece5ca766c6446a09ca840be153677947a0648365a36d863e2b6f9696856a8a0be489c3162c80f61b9e47984c6f139f9dd19841af2b14ccc
-DIST thunderbird-78.8.0-gd.xpi 609386 BLAKE2B deff30da088dcf3e8f001ac8b7c734aceba8cfb86f4ccf53887a0dd6ad4da6ab600eff9b0e6d276ced2f69e47b02463cda9a751c48cfc78de2c7d27e1d65d873 SHA512 7c1f1f955dbe7c93179e5cb0d4868af1c99947202e886016d74018aee79d29fe93a1fceba7bc14de2ccc354532f9a7b0bc27554041cd78a4bc064ba2ea5993c6
-DIST thunderbird-78.8.0-gl.xpi 615725 BLAKE2B feef84503450168170ddfe839fb21e24ee28004495c60591f55da021274c2db6d5871760fd2df46e99def462191c9a60cb565d0def417a57a3af78d8165b6271 SHA512 2703e48c68aaf84c7da1c71f59784e9df8cd0986da9e3174e968e41300acd51ba28adac97e293eef2f41c32fc7818037bb0e6df7ac9ef9a6e502cc1400107df2
-DIST thunderbird-78.8.0-he.xpi 640504 BLAKE2B 017cda134569d13b0e0200f0a63fef92925f6e37c465cdcecf5203b3e6994eb0ae4187fac66f538b8956db1fd6d1be824a76ce1ccde401394be7f82a0b8c5ade SHA512 84e4695b4d68b4adfb39a6937857473cbb03385f7508cd3644888ec27c9508e4a7fb370d80731ba319187dfaf0af62e46030c36b872dcca7995abfdd2caf188b
-DIST thunderbird-78.8.0-hr.xpi 629030 BLAKE2B 3816d4da01efde04b61912113b1c306c129a2b990788d64daaf2c16ee962fe88da4826c4396dd2414134e171f89458e283e09511c068da739053c4ea5bd0d4bb SHA512 09e7c9d85e59c0bb4a4c4e767fd240bf28a0271c4146bc1a77bb77fb5b23307fea046c711c1039e9914944f62287b2be749a2c2e1e1632b6726e6d8dbca6192d
-DIST thunderbird-78.8.0-hsb.xpi 668598 BLAKE2B 051f0348d5f5c61ed0c2b256fc3877cbe9ed66053a085aaa8e61fb7f81ef5ad9b3ec1f254b3e52d965fd0e2e60c5305da84c7d661e303eea0b2ddd34cf461c74 SHA512 04893aea2509b5d36283700a028e85399a25543308f70cae30d0023bdf580b3bba1aca47a042170029cb670d3ac16d5b4a48aeef7c29080a4c1c8e68050d74d8
-DIST thunderbird-78.8.0-hu.xpi 679835 BLAKE2B c66d7819ac1a878fddc35864472181be7b3b25718c13b9b9db8d075e3c234e224414ec3c1cc5028cf3f0f9ac8eaae142af61cae01b286df2607b5df3e6e42c76 SHA512 b79e5658913c27628ea94a3c8b0d52aa17dcb9009afeaf138dafd4d70945ff90c466666676f634c9f4c5808dfc71587ef72628e576b1d6389e6bd576130d41a3
-DIST thunderbird-78.8.0-hy-AM.xpi 713331 BLAKE2B 84f0385c330658fe89adc14e5a33b1298ddce4cb03ce2d79207f9165b9e9b2de8bd659c142f207f0d383bb24d8f6d258679149850501384305153ba2bfac1bab SHA512 779b0fd7be93ae028d3af8dfc1b90852fdd39eed6beaeedfef7608dd9b7d020e692939d441b0c59fec5f3cfceefacd36e2aaf0fd7b10084df97ce5630d59e069
-DIST thunderbird-78.8.0-id.xpi 620677 BLAKE2B 473a0ee4ffc941bde1ef51d3d604bcf34926b7134a638ff2a1b5352e72ae6dd4d6d3af2def8913d69ff668615eaaacd5afccccd8ed7f92f746fb9540128c7feb SHA512 e1416db889b9be0c023b4578cdba75adcbf9d4b88b29f6e00d5647c09aeaf1ab1afdcbd88f2fe2e3151454452b4077011e20fc5517d3ca528f36b2cfdfa67ca0
-DIST thunderbird-78.8.0-is.xpi 581648 BLAKE2B f436e88f7fd4aa3a45796dd31a26e8e356dc64f274b8b47fd96629c9a117fa30e0532180b895c15d434ca7472d10b05174e18bffd692314545515afa96e419c7 SHA512 6c4e2c9ee83130b64b150e85446df8b979af5984630de3a32e0f11f5a39cead50068a532c5a5971ee93ee9242190c176bf2ca4ae81d48d140e4fbef37bcd7a41
-DIST thunderbird-78.8.0-it.xpi 572965 BLAKE2B bd14e0ea976377cadeefb826843805481ccba23f5c287ec11190b0dcccd5a08fa6c859be4b105d5a5a56152a142ff9ef33d763996276ac5a51c7d686c43dcf62 SHA512 22024982614c700e1fe7ef048b83859e099d40499b57559758a03a8ea116dd36c1ab9820fa7ef550558c09f9558515b12dbe786f3d7b6d27a3ec077b8fee4d4e
-DIST thunderbird-78.8.0-ja.xpi 722454 BLAKE2B fe11bc934e89893e7f352fdfacec5b330b0bacfafded38d4574e96e1762a5a9ed9caec370fc1ea805d30d7a236b9927840a3b331dd86d506676daaef0a581816 SHA512 92f2590362935cada2769cb84e3f27395353953493bf15d1e8e6cbb8875cbeb594d071a3208d040ce4c79da501066ea2c082923ee8faefc46c3e158a4c1a23f0
-DIST thunderbird-78.8.0-ka.xpi 717017 BLAKE2B a9fd20a0064e7ebaf9b990c8bd0cb795331656ef5a8a8bb523262e46931048d00f4475d128787d90a2a8062b4c0207672ebb1bab8d93073e434cbe5863ac8c07 SHA512 a1a85daac4b3751db10ca9fcab144324ead5023245f02c10c2d712f7a027d6ff5dae5ca04a5f6e0875cb7fa9c2ddc0376d503c7cf06cb878db5c27ca8d9d5a7c
-DIST thunderbird-78.8.0-kab.xpi 651922 BLAKE2B 41bff182cfe72c270cd94e15512c8b134ab4d384dc7ec52bba86a808192312886e3256ca5c128f0523e99674789b516089d6239e432a6b694da0bdc01751d154 SHA512 49a75c15a0b6ecb97f518181afa711e15cf2c7e3b2e368582166d4e092fa9beebcadf4e572eeb729d8531f1ec5ccbfc688edde024c733dda5980be09101ae52b
-DIST thunderbird-78.8.0-kk.xpi 720468 BLAKE2B 21815445c1665808abe1ff93a77252d2f4622971b80e5210828746020850546e350c8764b8b7de5b4b22b7210662bd32df14d65ef84ade8769bced175cba310c SHA512 db40436d08152560134671e6e5c52e3ef1d5981561523519fe0bbffe88c2b0e305940fdb034837715aa1e7f2d40e9993f90f5614dc949fb4bd35aad3afc22efa
-DIST thunderbird-78.8.0-ko.xpi 688207 BLAKE2B 2666812be58bb367bd92f98712e83323ad61677431e8a3d1283bb943382b182e16b28ec58f435ec59861d819abeef1ebdd37712ae4ad94324d629c1a969dc2b9 SHA512 2e1b468fb2f74cebb4c8d1978549a12bf2472b8dc07581281e8eb993b2454c5c23c1fbf99adbc4360daa00b4f6744b1d7e45d165e3c835a1a656f0dd22976e9c
-DIST thunderbird-78.8.0-lt.xpi 660298 BLAKE2B 5f1bfe651c3af4fb008fcbce06f31747fb5145fc92180743ad08ff2a9afd585dd8b1a2cbf9fd2f2bc0dedae3a70319aaa796d4e763d4b8ea5ecb0a96e8900d68 SHA512 0e454ea9c7a87d34235d11ba843e9801bbd2a093366f5d845a2eaf0cc7e07430409f266a09f8608750e2bc78564e8a0a24591b95ffc2880452546e60f94b72a0
-DIST thunderbird-78.8.0-ms.xpi 572174 BLAKE2B d72c780ac2766622b72eaee552b9957750d0cca30b7ecef4ef1a5bfaa26f6c34a32f86b3e5200d03c487514b83abfa99ad3e82cb14d9bf98544f2968dbdf4976 SHA512 7872308796d453a7d04423f51d6e8e47ef320e49b0e43543bd0e381acea30d4a4a0539c2a5d29529fd5b5bfc0ffc9bf6f113229bc413f4c6e4d8a2a492ef1c17
-DIST thunderbird-78.8.0-nb-NO.xpi 637239 BLAKE2B ae4daad96278e5b4154b4be4675a84d838c1d3def8762904a73d33e20e458c1a676ca4796f46fd72742195c3d76565f116849fb2512ac88b46e9de7f1d46149e SHA512 ba07b4ea6a9e46b707306cb18074bc67e318195a1fd257d2632b90ac6de8c5c45db178dd04e51e2b168a9021ff278bd487597bd6840da1883f8874a37c0be17e
-DIST thunderbird-78.8.0-nl.xpi 644359 BLAKE2B 41965faf73c3c0f9fb017965b47468beaf4faa9e5dfd09b66cc984b1d0931963b0fa8f34fe641f7392731d86425e29ddfdd474b5f0d2debeb5d3af4d9a33701d SHA512 1053066a04e48dfaab69e409389cbc248b03aa32b9806c77f1c5ab2e69adbc9fa5d91142f4b87d8407d01daf958a035e73d44f7f0c3d1c13c141c79ff19ca9a4
-DIST thunderbird-78.8.0-nn-NO.xpi 640690 BLAKE2B 46cc9ac54bb43b20202213e033b7153be0c3c5313e48e44442f85c90a56222b77185511c244d67663205117391e02cb7ecfc1f28ce997be170bcc3a4bfe35d34 SHA512 1c08b8daa87b50ba0474d55a4d72161796e58e76e23a88e6c88035bf019aaad9834a625f8fd45cb42d106043252b15f346296573fdcafb7d11643ef2c73376a3
-DIST thunderbird-78.8.0-pa-IN.xpi 633219 BLAKE2B 4d508e848a9bc05aeaf4c54ee34d061187effed00dd2610bf27cb28df166866dfdf17e2fcf2745f973b6945eeb444bf6ab165f26b18f366874559e8acd28921f SHA512 65993d2cd037692b6b56eba803fe027f7dd5ac567dce89ae5d4929ffe99501d681976b3b0a99b9c74ec7b40223aba30de002923f87e8ec0ec7e38bfe0e49482e
-DIST thunderbird-78.8.0-pl.xpi 637132 BLAKE2B 795bdc308f7dbf56195cf6cf9c4a71d017795f367caf61611515cb37b4057313299efad6823274e56a7b23fb0daab5aaf7ce89fe4e24b9d4a043b7af56326c4d SHA512 cce74e59f21757582e83ee05035682dc6371f3e171226dcb20284c5528f9415c07254a3b1643e74a9d361f1d2441fb6b4d9194fc84630d58a35213bbc3bc3394
-DIST thunderbird-78.8.0-pt-BR.xpi 649415 BLAKE2B eb9b29ff21191682e402a31e63a6c24d6cb870f2608f525933a18da4e663db1d9cd6faa6979724a297c79e2dc1f0398ecd89ea623e1d7972cca675f5712cb2ca SHA512 bb6c5a9d6895de4faf6b19500d9c244976ec11fa88b16226c15fca17264a09f1ee7deaab7eb7b2b9b22b176c959a05aec578d9b28b4c0415f73e42300cc6d097
-DIST thunderbird-78.8.0-pt-PT.xpi 655502 BLAKE2B 450bce6537e58ac2750c7c8790270dfe994cf38e4bfb07fe322b9d1e6fec47665b7535724326cd4ebf8a0f790b30734db29b123b9289325d355038b2fd622fde SHA512 ec04f1ffb87cb5c83f1a0d1fff72d39e01621e35fd506344cf50217ba056428f6afb52a89824d89ae2968041a9f4a316532deecb10ea4621ac9eb93524b0299f
-DIST thunderbird-78.8.0-rm.xpi 646531 BLAKE2B 09ff8eb94d3d7b2d25104d4c17ad957ec6046a37f4b45d6c88a5d60c12e00eab5833204ade5f69f06bf689548eacc92e7e7db9b69bc06efd2bf1b0fc2b0d0755 SHA512 1bcfc9d9139fb30e0c65b688b1bb483d9c0cad0830840dd56b958c03e842400922351a5152a0c3d7a3e843fde35a51a26568a18ae664697ddead2a37c2fcbebe
-DIST thunderbird-78.8.0-ro.xpi 662627 BLAKE2B c82d2130d5ae2dc7b57b21f2f4465fc5d775ea71d504decaec25ccab59a6621816636a7d9051986c4809ebcbf617c2b88a0ec81ddd8a254bd74af62e871f2380 SHA512 7ba6221fb3282b13c399aacb5d68063a0bb4755d222099f74d63970a4b9087170e40a87c190b1201f1cbb2a932479bdced737cb52ae29715b64df0b827e18aaf
-DIST thunderbird-78.8.0-ru.xpi 756189 BLAKE2B 10eea9117fed75fe4cd4cc3ce74e36bf72047164e569dfc74f3fd38814e82e0c7597a9ec9577f92e7c59f482b56689c44b7186f373f3997a40a2a3ebbbd2fdef SHA512 79a8c316282f73bd2c717f8b01cea00d7899fe22b0e295c31350d81a1c4ab7e663d0489102284355daebbc58c3b1377a7f8495484a128cab9f5cbeda99bb8682
-DIST thunderbird-78.8.0-si.xpi 651103 BLAKE2B 9ac083d464dfddac5d265d80bf4d411e8c2f66f20e05e000a64e063da6e33176f400d4e47f27eb1adcf970e2aed563ed5f4ab62d0e34e29c3a2952405daee55f SHA512 673d7a600704c4539acc6a7e800f0403197303648633c860f38d330112ce6e17a99132019f95f011ed4f2073221358a758765577980565d6b941547daa0e83f6
-DIST thunderbird-78.8.0-sk.xpi 643225 BLAKE2B 249d1d14f0097792677ae71e780ba21293985f40db4acd9ec95111499554a53b4195730399f9aca514ca0ead37d3839271115fb38bb58756c139924269968bfb SHA512 44438e9c6fd938630ebdf768659acca14067ffbb7831e889def33109e09f24d551a5f181925587ffddf7d54c8abe5a4320c8c7110459bbba44f3b867c450d1d1
-DIST thunderbird-78.8.0-sl.xpi 632384 BLAKE2B 2fb5c7668b6933ce48fd236c3b38970de9219214aa8b215260f5753b9e2d4b1842c41356c43aa16825aa073ead5c3e68dc19f94e2bae6889f3f3d2458c525f5d SHA512 6fe972a136683994b595743527640d51f4d0bb3880b794df5c4c611a349dc56f5968a651b3fd62bec58511a6fe7c6ef7d30a77e7c469b20f1060b4444be4e2ef
-DIST thunderbird-78.8.0-sq.xpi 657816 BLAKE2B 9517fd6f8c35534350905919d1f0bb97a1702b8ad3a10f29861e9add9e88b4d489166b0fefd5fbd4a8b229169ab35dfb8ca2a6b390b82d4f984095e4de3ab3a8 SHA512 e9e9b22d813f5b825f660a977d3107caa7efabd6c9b8a7a2e9371cf18d5dbb3364bf400dce589864fd4252f9513227e3396589561939595e19ae575bb4b3d2dc
-DIST thunderbird-78.8.0-sr.xpi 683123 BLAKE2B 5deb3e13d436744c4b7f8c52c5eecfb9abfbdc069993fe7cad47a9b2e73e9685ca670c1ed0457e769b1e8b4233d88f275194ce5301adef77863d4d6685d020fd SHA512 0026010d0aff81ae619e1db8e9d595e1c51177aeb45c1e98d04d6ed276f3dbe4cc4758898d1982a6443f35869d0cdc89cb44ac9f2367a00fa2ecb350e294e0f3
-DIST thunderbird-78.8.0-sv-SE.xpi 648867 BLAKE2B a6c7b6137a8d540a506f3405119725dfc68c1136be2e715f9d72e25ae0cbbc4ed91f659f560cbc1c069aff8cbbe5fe1b7a094d87f73c2b2d5da557deae21d6d6 SHA512 1c25d41ceca01c6300c9cc42d643e59a5d97ed73aad810c148d2845dd51d28561bca1342f4d86da61285a511cba39aeeeb455325c38334586d5acfcd1d1e2768
-DIST thunderbird-78.8.0-th.xpi 712027 BLAKE2B 39a6186ed96ab458743ae3d03b938a694611a441340dd1dcccbc7ca3de8fb765e42387edcb529b228196fab01dc785ed13cb882d839a50dae98a10fbafec4278 SHA512 58f730506782d014ea1e0e0ba8a6c9f6226a3d3d617e793350703fab925606695a10f5eac396c9c3aa3d294f41989e94b7c5220a3af08c01e031cf6327c3d123
-DIST thunderbird-78.8.0-tr.xpi 649070 BLAKE2B 7d5c22de6bde5843914b05fd3aaa4679aa947103e447e0a5ac0d68cadabb2623a065bc973869cdd79223067aff334e2ebf87e4642d9cd2dba67b5cfd64857f4d SHA512 bcb6026d3deb8490998feae8504f729bcb559ad6c7dde330d6f8fb2a1e4eeff090e7ce1313fd2a6a7e8a44fcad519a4f2c8f2f40d739b4ad17cf0bd795ca85cc
-DIST thunderbird-78.8.0-uz.xpi 586600 BLAKE2B fbe31d8a104bbd3c3900c449bbac350144a11255f4fb8ac060809a221de2ebe364205838b43eaf9f6183451bae45e3b68e34b84e5a63bd9d0dcf636c99c7803f SHA512 09ea336d739be09ec97371f75f914a5b36f89042f1b8eb88bb2f89951ee55820ff74f3bc5b8ac17bf199ce0778e5404891dde4fc71bd4e671336c44b6171caea
-DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be529900bced5e1ab42f82f9a8e7c7a1ebf1218b5cb36025318f7c774e135951476226d924223754626ddbb3e9cd59418eea4 SHA512 9bdf8e207003bfc9b82919794d7c8d94dc27d4acef4527fce2dafcbd8721f92c63fff72ae0f59f8f44d16d993e85a8c32672a62be8767172027565b1026c324a
-DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
-DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
 DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
 DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
 DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
@@ -132,10 +68,7 @@ DIST thunderbird-78.8.1-uz.xpi 586596 BLAKE2B 063839b8ffe5eeeef1b6bfb09a303e5b79
 DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c22527f69a27b532bf475ea62f35c39d196e6a08ae0cac5cbb1bb27030c8069069c58c0ec0225e47dc076b7969c44efafe SHA512 95c9b9c4bf973a9b09aff80fc480509d17c487cd32a087befe810eda8169778e723fa6eff09bca13aca5e8a1b87566e3913d1eb11c03593a4c55e9ae3ca1113e
 DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
 DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
-DIST thunderbird-bin_i686-78.8.0.tar.bz2 68251310 BLAKE2B caf9fcff16701892f52af6224341b7f7d25c90c7e8f31fb0b628e0624fe70f8ca48cb0b9405a1174c148528da5ade3590b44d5c0e47f921f6472509d3acb1c06 SHA512 5cf0bd3c7e72e077d8e4f8570e68a6e9a3644f77ef311e1d4af8657c38f122b09becb5f2fb4f66b77c808e8713efd1816f075e42920d3b37ebb9949a75b8db28
 DIST thunderbird-bin_i686-78.8.1.tar.bz2 68210803 BLAKE2B 05ba9cb1b965f3494804387a442daf9a8a9dcbca97aaa2f53243a403e344307c7dadec389d00b3af470aa5bff222ac946a666f6a4afbd4c79186c223dbb24e08 SHA512 1d0bd3deee03fe42fc411baa6fba230a2e747e775d125f7c5a5738377200b34efe88cabb356e6e59aa3e0e8db649ab16c6b19d89a3dab17f8b5df75f7326b621
-DIST thunderbird-bin_x86_64-78.8.0.tar.bz2 65386410 BLAKE2B 2ee6e42f95d7390728cda599bb6499ba0bcc1b1d6056d5ca83c3e5030b9dcde4ed52e7a831988e67380b2139daa8bac82f28422a5c53ed120fc71eb8a7ca53d4 SHA512 c226fd32ec0aa430f549d4d394e521587491ebdbe4fd66e4b21c37bbe47d8bc0c50a9e7bc79dade1bca1728794dfaf2492c3ec46082dc026a4a14dddb210141d
 DIST thunderbird-bin_x86_64-78.8.1.tar.bz2 65303564 BLAKE2B 466300d2a738151100935e625388a78bb487ad1862145dd1f7ed11c44fe9ade82133e5857823054eba3191cf9ac9e7efb4514630a5684a4e186aa5fe263e7c93 SHA512 c68838bcdd7075cb3c253a2c1231fe85d8d767cce75f4f76009c69dc845fdaa0e30fbe94a6f3b7227339006b7c88b77128f16ec348c3e6fbdd516ede828b97f7
-EBUILD thunderbird-bin-78.8.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 EBUILD thunderbird-bin-78.8.1.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild
deleted file mode 100644
index 908f3ef026b2..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +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}/*"
-
-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_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}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# 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}/chrome/icons/default"
-
-	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^} (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 ! 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-r1 ; 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/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9b23d3f3d252..facd8ed97a94 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,71 +7,6 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-10.tar.xz 66396 BLAKE2B c29b723e47c58b10885b220080568aba751e1b73c58e28fce62a2da4c4c3ba8c71b63e60448d17599a3df4446dbd9f9387b4b2b75da5ed1e545591aafe8ec83c SHA512 6bb9caf1f6867b894ab315a73f8ae6f381b5c80c90539f38e786ee653c72c0df055aade854faa23f22cab2253f54abaf918a756945b76ed88f5a224ba8a8f12f
-DIST thunderbird-78.8.0-af.xpi 548342 BLAKE2B 4165c5723013c15bab04013dc316f6c7574acdbdcac676d9971b35d6eadd13ed0cbeb2d4425faaa0d0b73b543920c7a2b4d569bc8ebc5f3502030dd85950c3f4 SHA512 6919ddf5549197a398a75ea9ec0e8074bd521772e9b1a0977f9322e4967fcf4db09ea708e07c73badd3ffddf351443719d0010b80edaead75cb3b75f8eb1b0a7
-DIST thunderbird-78.8.0-ar.xpi 648607 BLAKE2B aa6a845c9fee67edde83c77864bcefd4987d6e0de7bbe74dd393d04a29b3ab13d1063c5c05700e8f9aec4ed272d2dbc75c0b90977fa92047cef1abedf7cfac7f SHA512 6a607ca466ba05bbe439b3188a470782e3f5bdd1346c4d24eafd7ca7127c4f456d26de006208affda019a010e4290e1e6940943764ee03af6b4c0933153601ae
-DIST thunderbird-78.8.0-ast.xpi 561254 BLAKE2B 86b08175ae6aff2d3c32068cda3a814d6a7a004032f9998b5876a0c6c75ca619effd7c4b647d5dc92110f82da4c78e86dc38dfc180353a2eca5ba5119029ae8e SHA512 009df4311c18d408211bbd40179cc566dc248a9ff38eeabf7373b8a5551493c92486aeee114a09ca831f759e1ba321b56ce370f7f4be7eed82f0e90e6af5e449
-DIST thunderbird-78.8.0-be.xpi 666671 BLAKE2B 6f7d5d82f1e596678e0a2341e2be5ab53ac12fcbca51187ed27f9736bf19b606e09fb2d4f54630863e942e549e9499da8fcc01d8ab2fa1e50aedda347e2f24a2 SHA512 c3b4f7a251b558f5cd3925f99d47e03372ab2512ab538c98451866a58c8c0460230316079699ddecfd0e725f09a6cc0765d4194f5751da80814587bbe04bdecb
-DIST thunderbird-78.8.0-bg.xpi 672415 BLAKE2B 9d750e1fbc1bef06c645e79ca6588e428eae3a5c5d35e9d5a7b7df967faa7596a7332e52c251779b2d4768ea8c8dbdfa22dc021b63d5beb1d2adbf6b551bfee1 SHA512 58468edfcda578fc9b262524d38f31857d59411a4e63a608c5db517bfa9bd7b7bb20261ee25647ac74f5b48bc18c9ff542c8715323d59a63b2f01a0245e43647
-DIST thunderbird-78.8.0-br.xpi 604536 BLAKE2B a33c63a80b534e48f5cf38205b3711673a02b3de2163413b99d652cc048b9ee9726192d67a53636343bf2e1f80e6b7e9bbc8f37bda0fb00e994ae64556037b8b SHA512 f28ca741d5860347964388fcbdab173223ef56766c37051dfc05ccde0f1e77184d57fb41dced3636967f895ef1f92119b99982cb37f2e991ae833ff5de00a169
-DIST thunderbird-78.8.0-ca.xpi 620451 BLAKE2B c32b0469dccc4cae5bb4bcd3ced1a503df8cec0ef750bef6c6d11057b9549e327a93bdeaf293d0fb06a00e3b8cfa8c8bd2e02f5d464f2c1d6eb482e23d899537 SHA512 60fb3eb0e0e24c5a52ea5b3203fe1a2c83920579607cdffa5054e6a8d861e8963598ff23c24fb7e0fb5febf997e9b79126046b0413a01b5fc067547cffd64879
-DIST thunderbird-78.8.0-cak.xpi 635653 BLAKE2B ce92ac946377fb7144e50dfc170946360d673bf29095a7be4aff0dded75f34307c25679750b7ec766a98711e0f07ca681556026c99b073b51094a4ed362d527f SHA512 64e8d64f9729dedc63eb5a140237f060e5a4a37fad6fe1c71d5d04738dcead20ab44690c6cf12b1bcdca31a3a7ab2f6f06c4985ac3cd7e9356fb5c0370200f4c
-DIST thunderbird-78.8.0-cs.xpi 635349 BLAKE2B ead7ef55525a86804386ee118eb6f40dc850d3f83d9f70534b7841510a80b6eaf3ac3c8c306852bd610207c9f71409b3a085f2e173edd9a47ac49e627f78aea1 SHA512 3ba9a8ad0ad92c1f95f60fecbc5b06e9b4afc8e5862c19c5d7204a014b689e9022b05f7f25e7bea76a12bb53bc35fb2daeb0bafff248002490193e5a96091155
-DIST thunderbird-78.8.0-cy.xpi 646245 BLAKE2B 3bf8ae9c19903c49618ea9837f00a35ac61ca76c3b1b6d63544bc86e5d5fdf913646fde3fc2fadd12da373ad388bdf9527a2334d6ffccf73a776ffb97ae2d49f SHA512 e2859b10dd6a21cd534ed066cbf45f73b020624c0822ffe7c00a9bd38fced0f1e0d6684e907c855475e68d031934346d8c79a4280f91141b4bc6a6c3684b0f88
-DIST thunderbird-78.8.0-da.xpi 620998 BLAKE2B ad2d11535c67bb990da63b8c34bec78afb9ff2dea92f3fb82628b34c5cb144925d8f977937489a5c8bdbc3ed118ef26e8a9efd6bc866f694f22cd0147041f1ee SHA512 5df2c6e9d88554a120613839d07d13c7d181dcab4cb45941122ebae16311f810ff82e99464124a5de672c41a1dc99fe89a54da425ceaf3df0053e340049ace4a
-DIST thunderbird-78.8.0-de.xpi 665187 BLAKE2B 5f4326eee7d7b566d273e62dc8924f20d6ff515d49523552ef3dd982cf1b2c6646844785bd56bced0df65a3149c2c349d54067106f6d0c85b315698c4afb17d6 SHA512 7178f9d97fabc04d46e6c1b0857709ce88720f44e316868799e92e6c96a7186a5c978635f72f63cc5568b356a03b85a9e4bc4067eccef9bccc8a1e6ef4d61517
-DIST thunderbird-78.8.0-dsb.xpi 666773 BLAKE2B c8348d6df73e4d60bd4df2f71052862cda7b25684efd2b3a658e98015423546b5a2762e8f6c16e40960b29e6742390394a6223c939f105a34012f0a29d15a8ee SHA512 2b1eabf4fd17d1b99acad9fc0741093dc4d79fd94fab023868aa8f61d9e7dd92b53d2a963754584d2d4cf0ab95a167292cd4cf8a3d50d724f5ba4513c2564334
-DIST thunderbird-78.8.0-el.xpi 774460 BLAKE2B d9830af62f3e07e4655ccb4efe7eecb1dcd512cb2b12169b1a40388d1cb65a387cbf69d23f0c29c1764b9478fe427373665af7056d544302af6c1016d8ea789f SHA512 9753aca2e05439818e5d45a6bcbc64c48f3342a3ca7414378fd8edd72304637404b29581833ced3320640b8cb6bf66f5410a090f76df331cd56beac013c99a9f
-DIST thunderbird-78.8.0-en-CA.xpi 611769 BLAKE2B 88f182b41a461f19cedc03c3dbe54637e50bb08c34fc78c10aa680ec8b7cb97fd721b8758edbf49c3be0dfc8fd4784452864010a296d7cd9a1ffc9045fe06ce4 SHA512 cbfffc53c1b5fd4fce0037aca6ad8d795e997ed260583dc2794428da89dc43cb4a73e1ff04567b902266603421ad52e2d82e9ad3bd8b702f938d2db1b7532abf
-DIST thunderbird-78.8.0-en-GB.xpi 611186 BLAKE2B 170d4dfe3ed46b2ca6e912ee4bd4ebb297486104f4b9db4f7720ae2a44ab74a18b556e9b6a4212bb7e386b0cf7b7c73b8630d1be3ffff1acc1f8dc55c452d322 SHA512 ee301f1dbdc7c687b6825e7636121c583a6410465bef77965b3230638a4584dd45caa75b938d001a2b378a58a965e324912637fecb06a96b841aa0f11897899f
-DIST thunderbird-78.8.0-es-AR.xpi 657788 BLAKE2B 2c58fcc67575130a21f3c863247e300f79f675737857dbe2f48510bc37e9d2f982c8d93972b86087aaeb59a3b9e64e62e871a8f37f6e6e45f123e593f3b56444 SHA512 977a2dfbe08e86b5b15c5165d77a0c8b4218fd3a77c7c26b9d6ed60422ca2467e661b0fbb9a5e7fb0e791fb2e6c58743a2a540bd10b0efe077cd3f2a24f3c515
-DIST thunderbird-78.8.0-es-ES.xpi 569795 BLAKE2B a383ded35dab81b3777cc2431455df3b680110a4769d638aeef8d42f38744965a5c51d04ec9d9d56cfae5e7bfffdb92630e9159dadbc102cfb41a594ca6dd83a SHA512 24e84d2b01313466235fc0979b8d2547a453d4fbb5db42c606c3e95241a1e0047aee7e130f5095ab57a71a3f581c3bb312aac8a92c7dfe0b4f8b89d1072eda75
-DIST thunderbird-78.8.0-et.xpi 597734 BLAKE2B e14bb1b238e3f1d6e83a1b2cab5b8d4e7c72dc9d134128a190feeb9d8d1bd30aaa543f9613a93dc164fd54e31eaad53700e777fc21f98cf58dc26ac2d97360f4 SHA512 9cb6647db768f9693e93b9dc81f2fcc13c87465dc713661ef26f0e238bc7d61fd393749e26e85aff434fb5de253f8435cb81ade6637456cfc6a5cf52ad362522
-DIST thunderbird-78.8.0-eu.xpi 632966 BLAKE2B 181574e2029b48b613877c306a0802fd90e040b73e93a6cfa1ce1cdb38008ac4a598350ae1fbde9e5bd075f7f70e8269003c1f37f31f8ca9c62c35fabcea1068 SHA512 f00eda0202e562e64e0432978d2b0ab778189d28288c0e7afbe91a9e12d084b0b0e3c8b19ec329ab0112155713c67876fe9d81a9218e537d8e751b59a57af9b1
-DIST thunderbird-78.8.0-fa.xpi 639752 BLAKE2B 2641ae1d68498c9ea3f35917ce961d83f8248e320da3d4737f316f1338c548cc10384303095c7ddf6e16e8b67538e0b535394bb4cf879cbddee9cda6031ee0b5 SHA512 48c807a6ac991434a425122d41c8aaf0eefe184949c9113268a9d2cb872f1d6afdd189e48b04f1bf172a61f9ea0eef258396fea8621afa5fc99a74079afeacfb
-DIST thunderbird-78.8.0-fi.xpi 642446 BLAKE2B 9021bf414f4456c4bf31100fa9971c1d86ddbeafdda00afed720168e26259e8fc3662a01f6768e3e03dc11c35bd128c36aecf1ad3d62b910079df1ea1096063a SHA512 c1cccb2c151496009e19e11003f0ecb9b790a8d38eee729665ee5f0a60e8301a42187a6b7d6994cb01f429d282d4eaea8f8456898eb3ed02b35456e9aa029e80
-DIST thunderbird-78.8.0-fr.xpi 669487 BLAKE2B e3fe0ff95281e34809deee629ba2c4b373a51283da037a62b214f7168d2222166140b36a770cd77554c594240940eee0f297a40bd0f601bdba558477b168f98a SHA512 1db2d3a5315ef3354d62e0d3137f6c3a67686379b57d77db37c9528e9d7be2769fb0fec69923de792cd1c2e6f9d2021d18ab335bdb175f12b46dba4d761f29bf
-DIST thunderbird-78.8.0-fy-NL.xpi 653081 BLAKE2B e9f6970daa8443ce773d4f6cb1034ac80fbcaa26459d7b5462dfe55fb2f641ac5972e0170f066b1c6f274be3fc31de4c3dc6fccec5093d884be9eb294fb34f25 SHA512 be36ab1dc00f94924671aa208e5d0ce9026c207a905943e6858de8c3d1e5c3f3cca17090e43371802069079e05eba7d3d1fdd1a076d3f998959fbc1fe33a97fe
-DIST thunderbird-78.8.0-ga-IE.xpi 600699 BLAKE2B be75208495a5e984a5ca52d044be90ed08594f03f24c8aef2ff518907e7f8a1d5efff472664a45cd40bb75c209f02bf1c9b70454441160ad521ff0bd09a6b88b SHA512 f3ca1e2a43f67b30ece5ca766c6446a09ca840be153677947a0648365a36d863e2b6f9696856a8a0be489c3162c80f61b9e47984c6f139f9dd19841af2b14ccc
-DIST thunderbird-78.8.0-gd.xpi 609386 BLAKE2B deff30da088dcf3e8f001ac8b7c734aceba8cfb86f4ccf53887a0dd6ad4da6ab600eff9b0e6d276ced2f69e47b02463cda9a751c48cfc78de2c7d27e1d65d873 SHA512 7c1f1f955dbe7c93179e5cb0d4868af1c99947202e886016d74018aee79d29fe93a1fceba7bc14de2ccc354532f9a7b0bc27554041cd78a4bc064ba2ea5993c6
-DIST thunderbird-78.8.0-gl.xpi 615725 BLAKE2B feef84503450168170ddfe839fb21e24ee28004495c60591f55da021274c2db6d5871760fd2df46e99def462191c9a60cb565d0def417a57a3af78d8165b6271 SHA512 2703e48c68aaf84c7da1c71f59784e9df8cd0986da9e3174e968e41300acd51ba28adac97e293eef2f41c32fc7818037bb0e6df7ac9ef9a6e502cc1400107df2
-DIST thunderbird-78.8.0-he.xpi 640504 BLAKE2B 017cda134569d13b0e0200f0a63fef92925f6e37c465cdcecf5203b3e6994eb0ae4187fac66f538b8956db1fd6d1be824a76ce1ccde401394be7f82a0b8c5ade SHA512 84e4695b4d68b4adfb39a6937857473cbb03385f7508cd3644888ec27c9508e4a7fb370d80731ba319187dfaf0af62e46030c36b872dcca7995abfdd2caf188b
-DIST thunderbird-78.8.0-hr.xpi 629030 BLAKE2B 3816d4da01efde04b61912113b1c306c129a2b990788d64daaf2c16ee962fe88da4826c4396dd2414134e171f89458e283e09511c068da739053c4ea5bd0d4bb SHA512 09e7c9d85e59c0bb4a4c4e767fd240bf28a0271c4146bc1a77bb77fb5b23307fea046c711c1039e9914944f62287b2be749a2c2e1e1632b6726e6d8dbca6192d
-DIST thunderbird-78.8.0-hsb.xpi 668598 BLAKE2B 051f0348d5f5c61ed0c2b256fc3877cbe9ed66053a085aaa8e61fb7f81ef5ad9b3ec1f254b3e52d965fd0e2e60c5305da84c7d661e303eea0b2ddd34cf461c74 SHA512 04893aea2509b5d36283700a028e85399a25543308f70cae30d0023bdf580b3bba1aca47a042170029cb670d3ac16d5b4a48aeef7c29080a4c1c8e68050d74d8
-DIST thunderbird-78.8.0-hu.xpi 679835 BLAKE2B c66d7819ac1a878fddc35864472181be7b3b25718c13b9b9db8d075e3c234e224414ec3c1cc5028cf3f0f9ac8eaae142af61cae01b286df2607b5df3e6e42c76 SHA512 b79e5658913c27628ea94a3c8b0d52aa17dcb9009afeaf138dafd4d70945ff90c466666676f634c9f4c5808dfc71587ef72628e576b1d6389e6bd576130d41a3
-DIST thunderbird-78.8.0-hy-AM.xpi 713331 BLAKE2B 84f0385c330658fe89adc14e5a33b1298ddce4cb03ce2d79207f9165b9e9b2de8bd659c142f207f0d383bb24d8f6d258679149850501384305153ba2bfac1bab SHA512 779b0fd7be93ae028d3af8dfc1b90852fdd39eed6beaeedfef7608dd9b7d020e692939d441b0c59fec5f3cfceefacd36e2aaf0fd7b10084df97ce5630d59e069
-DIST thunderbird-78.8.0-id.xpi 620677 BLAKE2B 473a0ee4ffc941bde1ef51d3d604bcf34926b7134a638ff2a1b5352e72ae6dd4d6d3af2def8913d69ff668615eaaacd5afccccd8ed7f92f746fb9540128c7feb SHA512 e1416db889b9be0c023b4578cdba75adcbf9d4b88b29f6e00d5647c09aeaf1ab1afdcbd88f2fe2e3151454452b4077011e20fc5517d3ca528f36b2cfdfa67ca0
-DIST thunderbird-78.8.0-is.xpi 581648 BLAKE2B f436e88f7fd4aa3a45796dd31a26e8e356dc64f274b8b47fd96629c9a117fa30e0532180b895c15d434ca7472d10b05174e18bffd692314545515afa96e419c7 SHA512 6c4e2c9ee83130b64b150e85446df8b979af5984630de3a32e0f11f5a39cead50068a532c5a5971ee93ee9242190c176bf2ca4ae81d48d140e4fbef37bcd7a41
-DIST thunderbird-78.8.0-it.xpi 572965 BLAKE2B bd14e0ea976377cadeefb826843805481ccba23f5c287ec11190b0dcccd5a08fa6c859be4b105d5a5a56152a142ff9ef33d763996276ac5a51c7d686c43dcf62 SHA512 22024982614c700e1fe7ef048b83859e099d40499b57559758a03a8ea116dd36c1ab9820fa7ef550558c09f9558515b12dbe786f3d7b6d27a3ec077b8fee4d4e
-DIST thunderbird-78.8.0-ja.xpi 722454 BLAKE2B fe11bc934e89893e7f352fdfacec5b330b0bacfafded38d4574e96e1762a5a9ed9caec370fc1ea805d30d7a236b9927840a3b331dd86d506676daaef0a581816 SHA512 92f2590362935cada2769cb84e3f27395353953493bf15d1e8e6cbb8875cbeb594d071a3208d040ce4c79da501066ea2c082923ee8faefc46c3e158a4c1a23f0
-DIST thunderbird-78.8.0-ka.xpi 717017 BLAKE2B a9fd20a0064e7ebaf9b990c8bd0cb795331656ef5a8a8bb523262e46931048d00f4475d128787d90a2a8062b4c0207672ebb1bab8d93073e434cbe5863ac8c07 SHA512 a1a85daac4b3751db10ca9fcab144324ead5023245f02c10c2d712f7a027d6ff5dae5ca04a5f6e0875cb7fa9c2ddc0376d503c7cf06cb878db5c27ca8d9d5a7c
-DIST thunderbird-78.8.0-kab.xpi 651922 BLAKE2B 41bff182cfe72c270cd94e15512c8b134ab4d384dc7ec52bba86a808192312886e3256ca5c128f0523e99674789b516089d6239e432a6b694da0bdc01751d154 SHA512 49a75c15a0b6ecb97f518181afa711e15cf2c7e3b2e368582166d4e092fa9beebcadf4e572eeb729d8531f1ec5ccbfc688edde024c733dda5980be09101ae52b
-DIST thunderbird-78.8.0-kk.xpi 720468 BLAKE2B 21815445c1665808abe1ff93a77252d2f4622971b80e5210828746020850546e350c8764b8b7de5b4b22b7210662bd32df14d65ef84ade8769bced175cba310c SHA512 db40436d08152560134671e6e5c52e3ef1d5981561523519fe0bbffe88c2b0e305940fdb034837715aa1e7f2d40e9993f90f5614dc949fb4bd35aad3afc22efa
-DIST thunderbird-78.8.0-ko.xpi 688207 BLAKE2B 2666812be58bb367bd92f98712e83323ad61677431e8a3d1283bb943382b182e16b28ec58f435ec59861d819abeef1ebdd37712ae4ad94324d629c1a969dc2b9 SHA512 2e1b468fb2f74cebb4c8d1978549a12bf2472b8dc07581281e8eb993b2454c5c23c1fbf99adbc4360daa00b4f6744b1d7e45d165e3c835a1a656f0dd22976e9c
-DIST thunderbird-78.8.0-lt.xpi 660298 BLAKE2B 5f1bfe651c3af4fb008fcbce06f31747fb5145fc92180743ad08ff2a9afd585dd8b1a2cbf9fd2f2bc0dedae3a70319aaa796d4e763d4b8ea5ecb0a96e8900d68 SHA512 0e454ea9c7a87d34235d11ba843e9801bbd2a093366f5d845a2eaf0cc7e07430409f266a09f8608750e2bc78564e8a0a24591b95ffc2880452546e60f94b72a0
-DIST thunderbird-78.8.0-ms.xpi 572174 BLAKE2B d72c780ac2766622b72eaee552b9957750d0cca30b7ecef4ef1a5bfaa26f6c34a32f86b3e5200d03c487514b83abfa99ad3e82cb14d9bf98544f2968dbdf4976 SHA512 7872308796d453a7d04423f51d6e8e47ef320e49b0e43543bd0e381acea30d4a4a0539c2a5d29529fd5b5bfc0ffc9bf6f113229bc413f4c6e4d8a2a492ef1c17
-DIST thunderbird-78.8.0-nb-NO.xpi 637239 BLAKE2B ae4daad96278e5b4154b4be4675a84d838c1d3def8762904a73d33e20e458c1a676ca4796f46fd72742195c3d76565f116849fb2512ac88b46e9de7f1d46149e SHA512 ba07b4ea6a9e46b707306cb18074bc67e318195a1fd257d2632b90ac6de8c5c45db178dd04e51e2b168a9021ff278bd487597bd6840da1883f8874a37c0be17e
-DIST thunderbird-78.8.0-nl.xpi 644359 BLAKE2B 41965faf73c3c0f9fb017965b47468beaf4faa9e5dfd09b66cc984b1d0931963b0fa8f34fe641f7392731d86425e29ddfdd474b5f0d2debeb5d3af4d9a33701d SHA512 1053066a04e48dfaab69e409389cbc248b03aa32b9806c77f1c5ab2e69adbc9fa5d91142f4b87d8407d01daf958a035e73d44f7f0c3d1c13c141c79ff19ca9a4
-DIST thunderbird-78.8.0-nn-NO.xpi 640690 BLAKE2B 46cc9ac54bb43b20202213e033b7153be0c3c5313e48e44442f85c90a56222b77185511c244d67663205117391e02cb7ecfc1f28ce997be170bcc3a4bfe35d34 SHA512 1c08b8daa87b50ba0474d55a4d72161796e58e76e23a88e6c88035bf019aaad9834a625f8fd45cb42d106043252b15f346296573fdcafb7d11643ef2c73376a3
-DIST thunderbird-78.8.0-pa-IN.xpi 633219 BLAKE2B 4d508e848a9bc05aeaf4c54ee34d061187effed00dd2610bf27cb28df166866dfdf17e2fcf2745f973b6945eeb444bf6ab165f26b18f366874559e8acd28921f SHA512 65993d2cd037692b6b56eba803fe027f7dd5ac567dce89ae5d4929ffe99501d681976b3b0a99b9c74ec7b40223aba30de002923f87e8ec0ec7e38bfe0e49482e
-DIST thunderbird-78.8.0-pl.xpi 637132 BLAKE2B 795bdc308f7dbf56195cf6cf9c4a71d017795f367caf61611515cb37b4057313299efad6823274e56a7b23fb0daab5aaf7ce89fe4e24b9d4a043b7af56326c4d SHA512 cce74e59f21757582e83ee05035682dc6371f3e171226dcb20284c5528f9415c07254a3b1643e74a9d361f1d2441fb6b4d9194fc84630d58a35213bbc3bc3394
-DIST thunderbird-78.8.0-pt-BR.xpi 649415 BLAKE2B eb9b29ff21191682e402a31e63a6c24d6cb870f2608f525933a18da4e663db1d9cd6faa6979724a297c79e2dc1f0398ecd89ea623e1d7972cca675f5712cb2ca SHA512 bb6c5a9d6895de4faf6b19500d9c244976ec11fa88b16226c15fca17264a09f1ee7deaab7eb7b2b9b22b176c959a05aec578d9b28b4c0415f73e42300cc6d097
-DIST thunderbird-78.8.0-pt-PT.xpi 655502 BLAKE2B 450bce6537e58ac2750c7c8790270dfe994cf38e4bfb07fe322b9d1e6fec47665b7535724326cd4ebf8a0f790b30734db29b123b9289325d355038b2fd622fde SHA512 ec04f1ffb87cb5c83f1a0d1fff72d39e01621e35fd506344cf50217ba056428f6afb52a89824d89ae2968041a9f4a316532deecb10ea4621ac9eb93524b0299f
-DIST thunderbird-78.8.0-rm.xpi 646531 BLAKE2B 09ff8eb94d3d7b2d25104d4c17ad957ec6046a37f4b45d6c88a5d60c12e00eab5833204ade5f69f06bf689548eacc92e7e7db9b69bc06efd2bf1b0fc2b0d0755 SHA512 1bcfc9d9139fb30e0c65b688b1bb483d9c0cad0830840dd56b958c03e842400922351a5152a0c3d7a3e843fde35a51a26568a18ae664697ddead2a37c2fcbebe
-DIST thunderbird-78.8.0-ro.xpi 662627 BLAKE2B c82d2130d5ae2dc7b57b21f2f4465fc5d775ea71d504decaec25ccab59a6621816636a7d9051986c4809ebcbf617c2b88a0ec81ddd8a254bd74af62e871f2380 SHA512 7ba6221fb3282b13c399aacb5d68063a0bb4755d222099f74d63970a4b9087170e40a87c190b1201f1cbb2a932479bdced737cb52ae29715b64df0b827e18aaf
-DIST thunderbird-78.8.0-ru.xpi 756189 BLAKE2B 10eea9117fed75fe4cd4cc3ce74e36bf72047164e569dfc74f3fd38814e82e0c7597a9ec9577f92e7c59f482b56689c44b7186f373f3997a40a2a3ebbbd2fdef SHA512 79a8c316282f73bd2c717f8b01cea00d7899fe22b0e295c31350d81a1c4ab7e663d0489102284355daebbc58c3b1377a7f8495484a128cab9f5cbeda99bb8682
-DIST thunderbird-78.8.0-si.xpi 651103 BLAKE2B 9ac083d464dfddac5d265d80bf4d411e8c2f66f20e05e000a64e063da6e33176f400d4e47f27eb1adcf970e2aed563ed5f4ab62d0e34e29c3a2952405daee55f SHA512 673d7a600704c4539acc6a7e800f0403197303648633c860f38d330112ce6e17a99132019f95f011ed4f2073221358a758765577980565d6b941547daa0e83f6
-DIST thunderbird-78.8.0-sk.xpi 643225 BLAKE2B 249d1d14f0097792677ae71e780ba21293985f40db4acd9ec95111499554a53b4195730399f9aca514ca0ead37d3839271115fb38bb58756c139924269968bfb SHA512 44438e9c6fd938630ebdf768659acca14067ffbb7831e889def33109e09f24d551a5f181925587ffddf7d54c8abe5a4320c8c7110459bbba44f3b867c450d1d1
-DIST thunderbird-78.8.0-sl.xpi 632384 BLAKE2B 2fb5c7668b6933ce48fd236c3b38970de9219214aa8b215260f5753b9e2d4b1842c41356c43aa16825aa073ead5c3e68dc19f94e2bae6889f3f3d2458c525f5d SHA512 6fe972a136683994b595743527640d51f4d0bb3880b794df5c4c611a349dc56f5968a651b3fd62bec58511a6fe7c6ef7d30a77e7c469b20f1060b4444be4e2ef
-DIST thunderbird-78.8.0-sq.xpi 657816 BLAKE2B 9517fd6f8c35534350905919d1f0bb97a1702b8ad3a10f29861e9add9e88b4d489166b0fefd5fbd4a8b229169ab35dfb8ca2a6b390b82d4f984095e4de3ab3a8 SHA512 e9e9b22d813f5b825f660a977d3107caa7efabd6c9b8a7a2e9371cf18d5dbb3364bf400dce589864fd4252f9513227e3396589561939595e19ae575bb4b3d2dc
-DIST thunderbird-78.8.0-sr.xpi 683123 BLAKE2B 5deb3e13d436744c4b7f8c52c5eecfb9abfbdc069993fe7cad47a9b2e73e9685ca670c1ed0457e769b1e8b4233d88f275194ce5301adef77863d4d6685d020fd SHA512 0026010d0aff81ae619e1db8e9d595e1c51177aeb45c1e98d04d6ed276f3dbe4cc4758898d1982a6443f35869d0cdc89cb44ac9f2367a00fa2ecb350e294e0f3
-DIST thunderbird-78.8.0-sv-SE.xpi 648867 BLAKE2B a6c7b6137a8d540a506f3405119725dfc68c1136be2e715f9d72e25ae0cbbc4ed91f659f560cbc1c069aff8cbbe5fe1b7a094d87f73c2b2d5da557deae21d6d6 SHA512 1c25d41ceca01c6300c9cc42d643e59a5d97ed73aad810c148d2845dd51d28561bca1342f4d86da61285a511cba39aeeeb455325c38334586d5acfcd1d1e2768
-DIST thunderbird-78.8.0-th.xpi 712027 BLAKE2B 39a6186ed96ab458743ae3d03b938a694611a441340dd1dcccbc7ca3de8fb765e42387edcb529b228196fab01dc785ed13cb882d839a50dae98a10fbafec4278 SHA512 58f730506782d014ea1e0e0ba8a6c9f6226a3d3d617e793350703fab925606695a10f5eac396c9c3aa3d294f41989e94b7c5220a3af08c01e031cf6327c3d123
-DIST thunderbird-78.8.0-tr.xpi 649070 BLAKE2B 7d5c22de6bde5843914b05fd3aaa4679aa947103e447e0a5ac0d68cadabb2623a065bc973869cdd79223067aff334e2ebf87e4642d9cd2dba67b5cfd64857f4d SHA512 bcb6026d3deb8490998feae8504f729bcb559ad6c7dde330d6f8fb2a1e4eeff090e7ce1313fd2a6a7e8a44fcad519a4f2c8f2f40d739b4ad17cf0bd795ca85cc
-DIST thunderbird-78.8.0-uz.xpi 586600 BLAKE2B fbe31d8a104bbd3c3900c449bbac350144a11255f4fb8ac060809a221de2ebe364205838b43eaf9f6183451bae45e3b68e34b84e5a63bd9d0dcf636c99c7803f SHA512 09ea336d739be09ec97371f75f914a5b36f89042f1b8eb88bb2f89951ee55820ff74f3bc5b8ac17bf199ce0778e5404891dde4fc71bd4e671336c44b6171caea
-DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be529900bced5e1ab42f82f9a8e7c7a1ebf1218b5cb36025318f7c774e135951476226d924223754626ddbb3e9cd59418eea4 SHA512 9bdf8e207003bfc9b82919794d7c8d94dc27d4acef4527fce2dafcbd8721f92c63fff72ae0f59f8f44d16d993e85a8c32672a62be8767172027565b1026c324a
-DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
-DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
-DIST thunderbird-78.8.0.source.tar.xz 353232724 BLAKE2B 3c691393e0dbc71f345557632c734138cb7e603ffadbc364837c3fb759be07bac3f8b022b3e1261a7d850fc33bb917d7bb8fe314ea4c39dec6286d882f1c7f00 SHA512 c7d31ab6b2863c14fe7e11df4e805ca0ecd1f6e6b5e7d5ec73939500c5125faeec213b4df25f23a5f152345027926356b7df47efcfa60ff0f9e5b825119f0e51
 DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
 DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
 DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
@@ -137,6 +72,5 @@ DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c225
 DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
 DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
 DIST thunderbird-78.8.1.source.tar.xz 352875768 BLAKE2B cbc099669575a198d7c0ef1663848327f52fe1fe30473122075dd4e5e4327c006e03ef6b5bb9e741c782276dd5c8b43fbec16d8a11369c684a252241ec3ca931 SHA512 5158f7663acf3d00f45b457d1c172dcc95978d6782775faa4ec3995d3a799dfce668302e2c4b963a5607add831314fac76d516e45863a1971fbd4a6b0c4bdb10
-EBUILD thunderbird-78.8.0.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
 EBUILD thunderbird-78.8.1.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.8.0.ebuild b/mail-client/thunderbird/thunderbird-78.8.0.ebuild
deleted file mode 100644
index 3289668057eb..000000000000
--- a/mail-client/thunderbird/thunderbird-78.8.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-10.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-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: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] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			sys-devel/llvm:9
-			clang? (
-				=sys-devel/lld-9*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[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/trojita/Manifest b/mail-client/trojita/Manifest
index bd984341b61c..99c0c554500d 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -12,4 +12,4 @@ AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 EBUILD trojita-0.7-r6.ebuild 2140 BLAKE2B 922d98c9a52bd7f65e572898eb8015daf08eeb791600b9baded7cc316fc05362ac8b646c872e3477516d60686d1a1d480f4f44d69bcf7d94278fbfe911f71b71 SHA512 61fa729de435589b39d61fb7faba570ef2422fb502960ce742eea41f6853c89020afcef918dcb00820fdb0c38610f68948601feb7910a543d37f4bb39456288e
 EBUILD trojita-9999.ebuild 1842 BLAKE2B 80189d12128508e5cfbb520fe3ca38f05c27966e5b4448037d638b2001cd326e5cbce94999a599b19ce55a2a30d9b23926108a0138d96e7ae89b0586ce1b6726 SHA512 1ca293cafab7231724698f14cce7304d63fe4ba06ad9b963361f0a52de3da04d16df6b8f0f7775c40666a9a607e42825ad698c3e73f1bed0db94db50921a927a
-MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
+MISC metadata.xml 780 BLAKE2B 117c20afab1c8b8f3d01da38432c57ce58a7ba9cadc19e7123c8229d6b3ce0187c6e3d16e66b397186b4de5510bcd098027cfb041369211e121734cc745acb02 SHA512 c37bf7f0ceb7136eabcfad065755d727964004d039142013363d23b16b6ed702f00329746f2270ebd51a1ab6e3f2a4bdf71849dd1c6edd120842b8af3d465255
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index d5712067bc92..ecd3a192968d 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jkt@kde.org</email>
 		<name>Jan Kundrát</name>
 	</maintainer>
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 9cb0521868b0..e6ec71caac74 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 5f82204c0ab3..61818bebbc5e 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -2,4 +2,4 @@ DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e
 DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
 EBUILD afew-3.0.0.ebuild 1158 BLAKE2B b04a876512c1687108e83a5c95eb2b3640195dcb300e206e00706cbe95731a114619dc58228f30bf53aa179a51431a7a2b863542c39cf8de37777201072a9da0 SHA512 ecf235b1e467a267b4dd259bfc8a9966a4bb36eca4330a126acbdc7020dfdcc7c48248c3e6645527c7e69dd809903309b030158813841b83ee990962d2ac1d06
 EBUILD afew-3.0.1.ebuild 1298 BLAKE2B 057eb66dde33f333a6c5cdcf29b152ca4a9142509a10586155a2dd8ea6a6d86b3562f37f4e44c8ebe1864c7e83cf88460779b45734d2974ccd07c68f9f3dd232 SHA512 17a881ed9f3ac448f631c18870fadbba54ef52e7b9b163559b4e20692dc198590e2707b7cc8057cb080f4b6a26d7f552562553cf156e7163c0befef12e70e3ee
-MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
+MISC metadata.xml 1030 BLAKE2B 1e2b0865e7bcbfd0203db5bdf91b2448f52e8dc3c72fa73f5788f870c496c06ba1a14074dbe90cf5393964f9da6ebb92376663d5999d1b71e661cb9af18eb90a SHA512 adce4d721d0c42d08134ba88ff79b2bc03589a16650d85f60b3745535c666c4b3a7e29b0612b080d8ebb8115a4293273ddc1174e10c4a32f521b49874bf1df95
diff --git a/mail-filter/afew/metadata.xml b/mail-filter/afew/metadata.xml
index 1bc940e5054e..3013292dd6de 100644
--- a/mail-filter/afew/metadata.xml
+++ b/mail-filter/afew/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -23,4 +23,3 @@
 		against any searchable attributes.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index c8a18ae157dc..180bcbe796ab 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -5,4 +5,4 @@ DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91
 DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
 EBUILD amavisd-new-2.12.0-r5.ebuild 4913 BLAKE2B 89efd4ca3df89f9875e7952d58a2440e88448410ed629ec77dcaf775c2a15cd5b75ba6af7b425855970c187864a1691175476c6f6d9c16f48f2f27e5440708d6 SHA512 b20582782a78fe683e4b33e5982ed5d9d6e676b7bf3c3ec2c0f5235cefbe709aa9c51bb8a31c8c0e95fd568865b7bf87dfd41e2f5ef462a2b9b126b269d6f80d
 EBUILD amavisd-new-2.12.1.ebuild 4918 BLAKE2B af107963f6342e4168a36036283982ddeb45a2f368319bce6ca74ff009b884fba0bcf5ab22b52e12cbd9b009d00ae9f2039f6484bb32a18ee32140ab08315b08 SHA512 d3f28f1e33889a8dcfce5abcaf6340cdd699ff2ddb8ffc4639dc3304be67be339463f75a5d305d68e46182bc6dfa4860dcbbeaec4d6afe713d1f374a2ee58b6a
-MISC metadata.xml 868 BLAKE2B e42a68930492d173c2443d86db2fd12630096283795a682cbf25075a162a8b76110f29c0826a8190c40bc6b80c8ebaf29de654ead212ab9b54f2e5e79ab7e9dc SHA512 1d3bdaf290a814086c1ccfd91fa6ed33872e9b30fd9c4899fee6f7718b9148c48e489934e972f81f7330b8177b85768333164a023a2887726d325f78e91e33db
+MISC metadata.xml 898 BLAKE2B c07ac7546a58f964a8130c8f5b185315fee9921ca3e22a3d070b10bf58c36984bdbb911566140612834300e23aad792da547387ebe81e072644aeed2616d4e14 SHA512 e159f7199342aefe61f0a52ecc381509bd5317348f671e48ff4670e050e43e7d47e854d811123a0dcc8f85602cee37dff6667fd915ba3d86f6f849052366b699
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index a4f1bca475e5..c6699b09b7c8 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index 1a1271a5d2d7..42f4159d2790 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -6,4 +6,4 @@ DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
 EBUILD milter-regex-2.6.ebuild 1268 BLAKE2B 34c4321f989434b0e3c0eda399ab1c6d55b5283c4cc654d75d54153ccae399c19c8b07d7da083d26022fa1c1977bf388d422f20fe9ba3d9e0d5f6af14aa1d742 SHA512 adddee9bc0c7003c138a49db2dd595e83a911f536183af12f0988921022e88457f5c0ed9a82d901d741e80cd216054b4d783476da6e01840fd47b7a86a543c34
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
-MISC metadata.xml 696 BLAKE2B b6735f8b042cd7f064f4f7edc2b0ac8293e0c1e4641090e8890e13ea8b9642e1f3bdd892e629261006c607216b71c9a912b8b48a24c568ec1b1a1f15ff2a5de8 SHA512 df7e66be229bc3c32ab7d0b7ee8d035840d7b09df8f9070f0a2239a063e6fa7a67b4ff25926b57211b3b7b9d3da43cb96b9e1355ac2f0d693abc248eac3b96d6
+MISC metadata.xml 726 BLAKE2B d9fe810fe04582c3c061ce0158041d6e86b7970c52beadd71fe4f183238ff6be018ad47c072f5ddb91d3d243f2d428b34ca97263ef0b4112df848bfa8d8e22b9 SHA512 390a6d4ebb6d1d2189724496b5d7da6ef9cf19c2e432c65b747091de8a24bdea4bf8d66564afadedea4e59f381f88b060eda017882da5b57efddf603d9c11fd0
diff --git a/mail-filter/milter-regex/metadata.xml b/mail-filter/milter-regex/metadata.xml
index 4fc21959c12e..0e2aea024b19 100644
--- a/mail-filter/milter-regex/metadata.xml
+++ b/mail-filter/milter-regex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 0ce1b3504a66..519cf54aa709 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -4,4 +4,4 @@ AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7
 AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
 DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
 EBUILD mimedefang-2.84.ebuild 1804 BLAKE2B 77fc78dfa93e63c3b9d3bc754d8e2e0dcb03ec718d547649e52df8708ed5d9dd24e50449a4f61ee2d7f29395355ad49c33f0699d8049fc13563f4662f7002fc6 SHA512 f1625c0fdcbb8f17b26ea644aa7b478f197172862142287e7e8d55563c73f0b00053e066a38ed64c88e3a7b2994f9d6f4055dc24d68e5c2d157a7fc170ca8719
-MISC metadata.xml 620 BLAKE2B 2df23d7643738fd2ed38e36a7f8bd97fd95a6d302436066e3ede1457e845a1967bb6717ec113133f16c99fc024a21fb68d8d72534a75024299b7f9b95003a030 SHA512 bb1300cf05b4a91a89453448a5ce5f375edd643195b8469e77295ba00ad9ec3a55130aa53ebfda24c74e138b7ffa9d9874f07ba0b25f428f200bb380b3ab04f4
+MISC metadata.xml 650 BLAKE2B c598bd23b36b57a4ea7a77fde7d689e4b7fd2b0d61f109dfa21a63f707ce5c37762c329a52539fbd9ed29980d4bde8a5a96b84cb506963eca6db91a3ea6df220 SHA512 beabb44ebd9b6aa360023318e7d2974838a99f4178115d0b381c56582d63908ba4a3a7cef9c49352bd3a08b76ab027edba69077f2c3251a2d01d2e84b7389c0e
diff --git a/mail-filter/mimedefang/metadata.xml b/mail-filter/mimedefang/metadata.xml
index be8b6de0ae7a..4c478214ae24 100644
--- a/mail-filter/mimedefang/metadata.xml
+++ b/mail-filter/mimedefang/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rentorbuy@yahoo.com</email>
 		<name>Vieri Di Paola</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 19b0e31d5198..8f83ea320c76 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -8,4 +8,4 @@ DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c
 EBUILD opendkim-2.10.3-r17.ebuild 7363 BLAKE2B 5cc57036ef479bdb184b71ae32afbe6a4a7db4221207d47aa2650ead052f6ce9e9d2ff6a9b58e73a0fd15dff7a2a394c2d5eed6f43f2a09c638e5f4e2033e45b SHA512 cb8cc01ff6511d5679a4f2b3117a5a9c5eacf22f24a726bda70b5ba877c9dc96494efd0ef2e062cd116854266f217b4ffc37490f2cce94426566f0d45b3585dd
 EBUILD opendkim-2.10.3-r19.ebuild 7528 BLAKE2B 1b4906f2be4579f6d3f62ce5017be112233d6375ca1f94cbcf6bb15b279d855c3ade46f3c0fd71a0effe3ec205eea4198d0feae33a0759e7150db07cc45166a0 SHA512 3c8b0194e6fc80c842e8a3384348191f5112e63d82c01bb4225df296000dacb3cce9729156cf2eb3d4b015f24770567df679fceb74a8b4485c1b24a4a05a1c9e
 EBUILD opendkim-2.10.3-r26.ebuild 8212 BLAKE2B 4abd77d632cc6df73472c0cfffeaf7919d4af3980cab736a5e83d54bac6fa3770e6cb43fd35c3fff114be831ff3e15e220a8e86e200460eb6a77c434ea733122 SHA512 ed44c7abe81538f9033e83933477ebbf5d9da2546303e203d060fc3768f53696bec68ae570bf3473cdf64f33363e91173bb7c293f8b2622240164706ccf0ca99
-MISC metadata.xml 1942 BLAKE2B baf1f8f5be8cca84723fe3a17e91a2684a41445cfc707aadd1073febff1102505cd6fbfdce3756bb6f6c1529d9b7506d1baa5f50799c79ab4be79b4dcd17e9e4 SHA512 10256aaf84cccecf4a78df6a2572e1abc296c2e200269a2f5693a1664431d556d3e79a0820076965d6c56d70056562cfac458add472ce47043734edb8e228a90
+MISC metadata.xml 1956 BLAKE2B 2f2af8f3fe2b66d08b72d55b9c1b3c73e3016e083466539827b5c3e02364605229972407e6953bd63d1d027310a2e5f4f8b5ba12cfeba86c5a578e437f42a963 SHA512 92239f5f0bab0cd81abe7f10bac347398b88d183cf1551076e2dcfa2000bfb192f3985779201c10be9834c51807f1bc4a5ef0d37773565ed90a265bdbc78e104
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 47cb0241dd48..a758a44a6e66 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>klondike@gentoo.org</email>
     <name>Francisco Blas Izquierdo Riera</name>
   </maintainer>
diff --git a/mail-filter/postforward/Manifest b/mail-filter/postforward/Manifest
index 714d77d11e4b..42b88a6579d7 100644
--- a/mail-filter/postforward/Manifest
+++ b/mail-filter/postforward/Manifest
@@ -3,4 +3,4 @@ DIST postforward-1.1.0.tar.gz 5707 BLAKE2B 2dc994628820b40caf3b9c65ad6be48e220ab
 DIST postforward-1.1.1.tar.gz 6086 BLAKE2B ecf344af646b745fa9860279f6c91ba5ab74a5dc93a1cb09168091b01ebe5e804062afa32a51b34f65c5c89c08e401a8a4e1beb145c07bcfb848c970f6f4e1f7 SHA512 1f29e1731ef9fd1292f932a8e195577ce238f69c2e6ae1ffac81a577607fda98563b454564841011ce077cc8453e5ad78d2ab904fdf0fea67c15a69f6b2a3d92
 EBUILD postforward-1.1.0.ebuild 1233 BLAKE2B 1c2b462dad4f4e60977805989c53ae9add3adec82cd3c5f4e2526579f482eba8bf636b69f9ac8e9abb2c4e730526dfef0ea7b854a0e9723b249f13d90e707192 SHA512 021a0d20e6f2e22cb9073e8563ad3a2b6e6daa345b4eb95b9bb45a860f82d1ff8db5f1e12bcdc3e88faadfb4be354e9fce0abd8121fce38888fb86cb0b445e3b
 EBUILD postforward-1.1.1.ebuild 1221 BLAKE2B a2ed2666cec751cef0f1c1322d9d53559e055f5a2ab7bc3b0600adf5a778e496da930e1f70297f241969ec2dd42638bab1839031aee834aa077d4de9e88a49d1 SHA512 4b9add52a203c7139960aba668abe613e27349bac9da5f7d486c630a9a7cdbcdfd7b31f523438d586cef0e3936d98a0a36ea005fea3dae74681d14b71fcf9a88
-MISC metadata.xml 486 BLAKE2B 478f6cd3c58e0235b4ddc697254bdcadedf4d2b2895bdd840b69062072ee23a2185935eade9bf596fd8640ec5af2fae7360353c9120b6bfb42d03b727ed41c0a SHA512 50563f5896bcf6f4ce8f2bdf3da492c8ff0ddd5162366a64c0c0ebb3f9125431e139ebcfa0a2b4a7aabae929d366862c2f687b638469e135d3a8a1b0e1d21c3e
+MISC metadata.xml 516 BLAKE2B bc65cc7cd67c7e80fca3d05fe327e8f817023c645643fa7784b9da3c73786121463efe8c70a6b5c771a52342e8565e02a4fd5ca5c76ad66bff775b0240f135c7 SHA512 2c35ff8e29dced81fe95bc1f1ec902a284d49ca3a2f3440eb9c3c320d2c953110055193b9b89c01931a57caf8134cdd793a70628a982f148558f2a7d932a0fff
diff --git a/mail-filter/postforward/metadata.xml b/mail-filter/postforward/metadata.xml
index e9e4ddc46066..bef51e924285 100644
--- a/mail-filter/postforward/metadata.xml
+++ b/mail-filter/postforward/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">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/mail-filter/postfwd/Manifest b/mail-filter/postfwd/Manifest
index 92b35ad7a6c0..5d6b87ab7e39 100644
--- a/mail-filter/postfwd/Manifest
+++ b/mail-filter/postfwd/Manifest
@@ -5,10 +5,6 @@ AUX postfwd.init.3 629 BLAKE2B 08d4a9ea497827b3f2062b36bdf62812fef572edf2eae4be9
 AUX postfwd.init.3-r1 416 BLAKE2B 3643658faf4edb22aa1e1de2fdc3a3ee6f436f30a08b0e0046279e4b44b051a8f943afcb7e268b14fc7d13f3e822ad379cc70d53459b9c43191db9d80ddb4e81 SHA512 86bef531d1c6bf27284b0de13eae372ff9b5c62eb0ee04957e0ff740c391d221544f19e8dc0bd58408fe9effac9387afbf1ededb9e0ebae02d92478a77463eb9
 AUX postfwd.service 596 BLAKE2B b11a4f82fcf52556dc0271c29c68feb268b5ce9afc684b81401fb6c8272c177ebe13ff8f64ba9350c84d5fd62ead30d7f9598e69c8012022665d3900a9c899e4 SHA512 5b8e7ce6314cf61eaea13eb582b7e215209fc43bfd506fa1b1423873efb208ae5da8f8a9651358653bd91d436965f1582cc1bf226b0b44ec442869e66c0254e9
 AUX postfwd.service.3 572 BLAKE2B 92963bc0a479994a43556a8e1afbcca46544351ad967d448dd2255a9af13f7b1f69242421f7bc14f0ac6f0a2840b90af4d68b07eb98576bf20cff8ea3b8c6fe7 SHA512 0cc4942230d9a435cc9a49b888de95dcbe038da087eda03cc1f6347cb67e8640ab0810f55c921afdc0456c21a9cc06f562c395538b0548c492d7aadd8cdf9478
-DIST postfwd-1.35.tar.gz 354609 BLAKE2B 8e85db37d7f81be4613d9c2e411760af48650125af7b22439e3b47a8c3c7285564bfcd7a9fe4eed35d2603ddf80dcdf11d75f84afcaf3e57d53c4e986068f06c SHA512 7b0e8c8a755f085c108c45b28ec8c32139581ce129d0b8586f1876ae87f134a4fb1606d45105ccfa62351ca2d3b87f001ea52aacab0680f3345c41562bec5207
-DIST postfwd-2.00.tar.gz 265346 BLAKE2B ec67bffb5f6959e9516965516688e72f337f717a3159a094dc0373331a5fc09a451f664643a7f3e739b28d4137c130acfb39129b8557b4d41f4d445679f52623 SHA512 b9994b7dd96f1460d66ef35f173c5a4a4d72beb5b955092349304eae2672182874f07236fe5512ba3d0ecc68e2f0472e76b3667ded011536b0cf6f2d874bb039
 DIST postfwd-2.02.tar.gz 265781 BLAKE2B de63bdab4f7c1b117a16ebed2248f1e89b7c973bb34cee1b3fbbceda8c9d9b92d180fb5de8a332732b69a05d1b157be1c95d81ded003641d78665064a4881432 SHA512 23b48ca7218fba46f4b1887c4c6724112866c2e22e56f749602ba74430c4cf4c8418b9effb400ea4a468a5f137c764cac9611879e37d1585cf6d0b31dd41060f
-EBUILD postfwd-1.35-r3.ebuild 2249 BLAKE2B 27265ee578452dcc2ba2ea26715da9096cc69338e1ab468291a8d7cca41ee086efc3c2c073351440a941a9e9647f81b1c23405bc75d6db1e22847a567d14342c SHA512 1d54c65e8a5bb3ca5a7a9c0d010298c59ac9dcb840108cccf4e02afdb6d433f84cfd658415347baa7cb677f26e0f8547a7be56aa1daa394bbc80315adb114cd0
-EBUILD postfwd-2.00-r1.ebuild 2364 BLAKE2B 43abdcb97314874953742729023cf679054d49e034f39b10ce9c491c25c0c5c813270d4cd0ce1f824efb7927247a1edbb459a649accc885451194469d603fcb5 SHA512 e42a004bce7b32f365ccd6f337f68cb5b537c295747845800c24044934877797a40e19fae977d07f19cf8e692645b1b6332f844d5a8fd1f13b76e79fa96f99d7
 EBUILD postfwd-2.02.ebuild 2364 BLAKE2B 43abdcb97314874953742729023cf679054d49e034f39b10ce9c491c25c0c5c813270d4cd0ce1f824efb7927247a1edbb459a649accc885451194469d603fcb5 SHA512 e42a004bce7b32f365ccd6f337f68cb5b537c295747845800c24044934877797a40e19fae977d07f19cf8e692645b1b6332f844d5a8fd1f13b76e79fa96f99d7
-MISC metadata.xml 1223 BLAKE2B c42b60106ab2dbbed00dcedf73347b95c4011afe1a12c76b6d4aec3d186f1c037e79e9c47ab9d5a56dc26d4fe3291b42218748a42856c5a46b23857087de8b30 SHA512 e9e6433e9bec304617bc0d57977781991b7891e1531224fef8db93df3576367c624785be9c844453e1747e798e50b8e8d93e6114143495183a8ad47228b52376
+MISC metadata.xml 1165 BLAKE2B 8138b0b92b578b7f09793f69a91478da8852b8073e11f6149f6c87dc5dcbe1b8e8a8de0888819370fa002de253953facd76010b0257a7fca249b905649bfc76d SHA512 990b922de7d972da13b32174870ed963a7f2484064e2e2ee1536f43e25b219be722397b3d578ab2dded044b5cb894735eb2f66cb37ac150e08a7ba9f8fcfd3df
diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index e192a97b4308..e9407a0103b8 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c@roessner.co</email>
 		<name>Christian Roessner</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -28,7 +28,4 @@
 		grouping, date and time based dependencies together with DNSBL lookups
 		and policy delegation (e.g. postgrey).
 	</longdescription>
-	<use>
-		<flag name="tools">Install additional tools for testing postfwd</flag>
-	</use>
 </pkgmetadata>
diff --git a/mail-filter/postfwd/postfwd-1.35-r3.ebuild b/mail-filter/postfwd/postfwd-1.35-r3.ebuild
deleted file mode 100644
index fda2d2a93fae..000000000000
--- a/mail-filter/postfwd/postfwd-1.35-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user systemd
-
-DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
-HOMEPAGE="http://www.postfwd.org/"
-SRC_URI="http://www.postfwd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.16.3
-	virtual/perl-Sys-Syslog
-	dev-perl/Net-DNS
-	dev-perl/Net-Server
-"
-
-pkg_setup() {
-	enewgroup postfwd
-	enewuser postfwd -1 -1 -1 postfwd
-}
-
-src_install() {
-	local BIN="postfwd2"
-	# programs and tools
-	dosbin "${S}"/sbin/${BIN}
-
-	# man pages and documentation
-	doman "${S}"/man/man8/${BIN}.8
-	dodoc "${S}"/doc/{${BIN}.CHANGELOG,${BIN}.txt}
-
-	# example configuration(s)
-	insinto /usr/share/doc/${PF}/examples
-	newins "${S}"/etc/${PN}.cf.sample ${PN}.cf.dist
-
-	# plugins
-	dodoc -r "${S}"/plugins
-
-	# tools
-	if use tools; then
-		dodoc -r "${S}"/tools
-	fi
-
-	# start scripts script and respective configuration file
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "${PN} has no default configuration for safety reasons. Every"
-	einfo "mail system is different, so you should craft a set of rules"
-	einfo "that is suitable for your environment and save it to:"
-	einfo "   /etc/postfix/postfwd.cf"
-	einfo "You can find example configurations in:"
-	einfo "   /usr/share/doc/${PF}/examples"
-	einfo
-	einfo "If you want ${PN} to start on system boot, you have to add it your"
-	einfo "default run level:"
-	einfo "   # rc-update add postfwd default"
-	einfo "Also remember to edit /etc/conf.d/${PN} to your liking."
-	einfo
-	einfo "A plugins sampe folder has been placed under:"
-	einfo
-	einfo "   /usr/share/doc/${PF}/plugins"
-
-	if use tools; then
-		einfo
-		einfo "You can find additional tools for testing ${PN} in:"
-		einfo "   /usr/share/doc/${PF}/tools"
-	fi
-
-	ewarn
-	ewarn "Please read the documentation carefully and properly test new"
-	ewarn "rulesets before putting them into production use. Otherwise you"
-	ewarn "risk accidental mail loss or worse."
-	ewarn
-	ewarn "Visit http://www.postfwd.org/ for more information."
-	ewarn
-}
diff --git a/mail-filter/postfwd/postfwd-2.00-r1.ebuild b/mail-filter/postfwd/postfwd-2.00-r1.ebuild
deleted file mode 100644
index df52b4a6f052..000000000000
--- a/mail-filter/postfwd/postfwd-2.00-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
-HOMEPAGE="https://www.postfwd.org/"
-SRC_URI="https://www.postfwd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.16.3
-	dev-perl/Net-CIDR-Lite
-	dev-perl/Net-DNS
-	dev-perl/Net-Server
-	dev-perl/NetAddr-IP
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	enewgroup postfwd
-	enewuser postfwd -1 -1 -1 postfwd
-}
-
-src_install() {
-	local BIN="postfwd3"
-	# program
-	dosbin sbin/${BIN}
-
-	# man pages and documentation
-	doman man/man8/${BIN}.8
-	dodoc doc/{${BIN}.CHANGELOG,${BIN}.txt}
-
-	# example configuration
-	dodoc etc/${PN}.cf.sample
-
-	# plugins and tools
-	dodoc -r plugins tools
-
-	# start scripts script and respective configuration file
-	newinitd "${FILESDIR}"/${PN}.init.3-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.3 ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "${PN} has no default configuration for safety reasons. Every"
-	einfo "mail system is different, so you should craft a set of rules"
-	einfo "that is suitable for your environment and save it to:"
-	einfo "   ${EROOT}/etc/postfwd.cf"
-	einfo "You can find a sample configuration in:"
-	einfo "   ${EROOT}/usr/share/doc/${PF}"
-	einfo
-	einfo "If you want ${PN} to start on system boot, you have to add it your"
-	einfo "default run level if using OpenRC:"
-	einfo "   # rc-update add postfwd default"
-	einfo "Also remember to edit ${EROOT}/etc/conf.d/${PN} to your liking."
-	einfo
-	einfo "Or - if you are using systemd - enable the service:"
-	einfo "   # systemctl enable postfwd"
-	einfo
-	einfo "A plugins sample folder has been placed under:"
-	einfo
-	einfo "   ${EROOT}/usr/share/doc/${PF}/plugins"
-	einfo
-	einfo "You can find additional tools for testing ${PN} in:"
-	einfo "   ${EROOT}/usr/share/doc/${PF}/tools"
-
-	ewarn
-	ewarn "Please read the documentation carefully and properly test new"
-	ewarn "rulesets before putting them into production use. Otherwise you"
-	ewarn "risk accidental mail loss or worse."
-	ewarn
-	ewarn "Visit https://www.postfwd.org/ for more information."
-	ewarn
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index beb178f9eff7..f57f50196282 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -13,4 +13,4 @@ DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a179703532
 EBUILD rspamd-2.6-r100.ebuild 2744 BLAKE2B 2b7b8757bafa478ee1e024585b1b9865753bde923144a39fca8d5bda996891db1e9e141a9d6cb6ee5c9d2e905f83fdd0905b75b692750797cb1789cedf47ae2e SHA512 8bf9154733f4e394530447dba1bbd3c67b6ede15d400c36ec0657b851f074274bcbbf8e564ca506567579ce9ec3c061139c3eafd9157d3235da7e717c2251ccf
 EBUILD rspamd-2.7-r100.ebuild 2744 BLAKE2B aed01d2331baa44011232783865fcbe1c8871aa4dd3a3cec2532d6f6cb9157bc4b9a063824550ca066401bf1b22bd7e1c30be3fc18828847d5d4464fcf6da7c3 SHA512 1efd398b58dd60820cda605c4d43d18ebf5ff103d086fd901d8d189d9c310eb242599d74b12155b8f60318fe09cd65aff200ef833fb1d8406c2bd421a5dafe95
 EBUILD rspamd-9999.ebuild 2746 BLAKE2B 882abc5ea6b55c70fde959e3d2f130ee4292dafa410002211cc614c9df12e04b7a163eb3205ca51afdc72d5ce139d557d7c4952be4edf3801e91369ce720d6c2 SHA512 91f4436ef16115741acdaf17484408fedb28039f5915c156de4d96831d87a270137bc4532a98e0585a2bd7551b6aa5973ba7c0c48142549d5f7db453919198f3
-MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
+MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index f0f82f46abdb..a8969fdf4ef9 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>c@roessner.co</email>
     <name>Christian Roessner</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>arkamar@atlas.cz</email>
     <name>Petr Vaněk</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest
index 0b607661d551..3d2ce956db7c 100644
--- a/mail-filter/sieve-connect/Manifest
+++ b/mail-filter/sieve-connect/Manifest
@@ -1,3 +1,3 @@
 DIST sieve-connect-0.90.tar.bz2 46481 BLAKE2B d6bc466caffa3344537b1777b00a66f34697139d474763862c5296367f1e69174078a5e864225c1e967fbc5677c97d3ef71a4b75b677952d7b4993a5b8a08108 SHA512 3b4d4a6a7eb7d48f8b2dbc4c302c3de1a2a193282c7b2d25581e1131d6c7598cc2a47edabf8b108e94e0fd1a9cc50e48a103c133dba233f180f12d36c0da0718
 EBUILD sieve-connect-0.90.ebuild 700 BLAKE2B 1c683f20f790634bb2e6089469e4ca318f7c4a18d09eecdd9f8de133d8fc7d3093e765a4b3bd3062e790a684d1bbd36afe4522226e7683ab7a621bf2084db044 SHA512 51bd0ad057466dbd1c0ecdfe789b22b1a9ab0b509346a1d937422547a07a051fba9de9cf8e0d3cccf6eba94d2184a601f90e72b3643dd1685838dd921c4aeae7
-MISC metadata.xml 2216 BLAKE2B 9a9588705d82d6c6c7d19c17aa7039169f1093a906033ee01bdb6f55eee5ad599f74de26d41aa9655eb32ab5ca16d058b1202c1532fb6a7e4620a025305560b4 SHA512 af2f045a99755c8224f19adebc36401e59b7932dc323063bec97a1135d0d34f77548d5ad96f8e7193b82284633a7e39b5ded9edae20f244b0d74ea06dd3489de
+MISC metadata.xml 2246 BLAKE2B a77b37b684d712e4d1eac249fba2d3cd7948478c54d2335d8b3b4d978ec55085e1f8bf8c991ed45783e3f30e924e86b808b4a32c003a1f578de3f17355076d67 SHA512 22774bc0dc5e30c5846fa3e9beb8bf03f8b19cc175356c9ac5cfceff737b899f919ada993ca91a8a76c62e0acc4efc90cb193a95b67b30ab9f3d1cfc03704e47
diff --git a/mail-filter/sieve-connect/metadata.xml b/mail-filter/sieve-connect/metadata.xml
index 96497728e28a..06e2aa077d0d 100644
--- a/mail-filter/sieve-connect/metadata.xml
+++ b/mail-filter/sieve-connect/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 120ed28c18a9..2a8d6f02800f 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -2,4 +2,4 @@ AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
 EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
-MISC metadata.xml 554 BLAKE2B a5d8c99d19476f1bb337117ec670d81fca6ec22198276eb2d81831c787652acbed6b4f2c895f337e78e54b7870fd13d34a55c4ba783fcc086b48ff6b341760f4 SHA512 756248356f113ab607ace3d3b4688f09d5e1d4e908bd65b1bbdedef9ed607cac6b458c43fd6db8abf21874e1a8e0bc04d0c5b480c29ea96ff559ffd2d1c65bf3
+MISC metadata.xml 584 BLAKE2B 7b9eb68b60e32518b342233018acecef078dadbefb4b759778002843df60ba7c3019d41f5b724d4410ed62e5e77c9fa9a8f2e8a40eb5b137e289604b4b2c297f SHA512 8a00dcfe18867e4798126d5928645965c36f923dc1d60fcb1c01ad34bd806cc097da4363d06b19f4b5ed32345b6ec587474475b3c5a5a8a3dbe168b947089775
diff --git a/mail-filter/sigh/metadata.xml b/mail-filter/sigh/metadata.xml
index c279265b0563..533c0780701a 100644
--- a/mail-filter/sigh/metadata.xml
+++ b/mail-filter/sigh/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c@roessner.co</email>
 		<name>Christian Roessner</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 65869498fc3b..7ef79300fa43 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -9,4 +9,4 @@ AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403
 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
 EBUILD spamassassin-3.4.4-r4.ebuild 9597 BLAKE2B b6143545ad7d644a9b871beb76280cf91c4b7a1c4f027b86e732ee3b7e416c11723afa81cc59d850bbc20d00e7f2335b258e4e4b6cfc238b9a27998a829f492a SHA512 9dc6d93468aa16cbf118fe3c1871b7b112b65f8d5f6a53df4dbb273dcb8e50790f48ed60d5790f1bd55fb35b3d1b799ff1e011857826fb5a57953a3e2d9321b8
 EBUILD spamassassin-3.4.4-r5.ebuild 9639 BLAKE2B 64be74a95194f2d3bd33d182775fa3367ea0410744cf8786394de74b68ced727ca3f86914030864e3fd46e35c790253d0f1c78da1282f44ea3cb865b646acf69 SHA512 ec54561690656c8a7b7c5796e71945b8ca9693d56027a32021825924396ecbe7fb75454d77d84b720d640d8786a84d68760de7e1169c58329dab0f2173fc454f
-MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f
+MISC metadata.xml 609 BLAKE2B 81b169e5c10732a699a07de2aa6327aed5a0c1c8ef44eb6934bd7c37bfa5c80f2f433ade2998a3cd57da68c1b773229ed8aeb7b64c1ed2d58c7ab529d2649b72 SHA512 e0ad537ae894ca5ab2585d0b5dd20357325c409a4497fba096c6b6cbc88cd99fb937af1085c59e164d510a5d5033c6fa511fadc4ab77b1fa2a5bb6b2c514061d
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index eec4aadcd854..8a287d20edae 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index f2a455fde0d5..ca4949b9f9b1 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -5,4 +5,4 @@ DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
 EBUILD sqlgrey-1.7.6-r2.ebuild 8425 BLAKE2B 80f5698cc229439f5ae8f04ca118ef55b5b38536f28f8526c4e26f21a27993c085bed14c74ec96b8255992d68dbe2688ba35ead05d52321888a1e59219360513 SHA512 e1852b976f89d8721398dcf66224e70bac48a6bd97dd6629fc4a9b911a8c380a3c563dc1f633aafde8163b58c1e4e1cb0a8f0b29207e1016b74d1f8b73347e98
 EBUILD sqlgrey-1.8.0.ebuild 1645 BLAKE2B 85b101cfd67e073a7bdcd6912b4ea51ee82660e15fa3ed40a043506f8623a3d94e74ddbb18025ab564963ad2856eef73a7ea042754be00fea95b460690ca01a4 SHA512 f42d5ad7a647b97cbc2e3a63dd9e1ee7d033b579f58868c06281cd62076594a40ec1f7786bf2479f80bb1a347ef1b810bbfeaeb1287905e3aa1910d112aa6391
-MISC metadata.xml 465 BLAKE2B fb0b2972766b6f5729e744b4028af9765e05150af88939f26256c106fa802cac8d74254404b655fb3713d72e6110068d7490825b9148777e1f2217e67f971189 SHA512 1b77ec96e116140f08e87028fe2c4c3e9e1b9428f89f9cb8349b9bdb3fdeaf7926f506aa55c7284fd430350c3091cad52f14a19ca1a9e9c322144a2001cb1999
+MISC metadata.xml 495 BLAKE2B d71772d1e3521cf45d0f0596e0507b31a4a71919abfd05f113498bcb3f73f68295fad905266be85f1bb11b9f56d1de6e715332fdcdfbfdc272ea7e1b4f5e696d SHA512 c35db2f9c06d1660c4766d09abc6ab05360cafcca7f27aa8903dc788f58323ba1a47bbcf9a2b0222117a898823e46015ff7198ad9cd1532c77efe6a03d5a4239
diff --git a/mail-filter/sqlgrey/metadata.xml b/mail-filter/sqlgrey/metadata.xml
index 2c49c7b239d6..5ffa9031be64 100644
--- a/mail-filter/sqlgrey/metadata.xml
+++ b/mail-filter/sqlgrey/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">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo_bugs_peep@parallaxshift.com</email>
 		<name>Philippe Chaintreuil</name>
 	</maintainer>
 
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index cf4d189b9b4e..9e4303eda9bf 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 0502b2ba7cc7..eabcbb5895b5 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,11 +1,9 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
-DIST msmtp-1.8.13.tar.xz 359536 BLAKE2B 824d88b571ac1dfd78046f1939fa83c4fad9679bce993c20d073df5cd431deee1ca36119123d307d788be13d700901c13c54ba47496f2148cb9fbf9e2308698c SHA512 1b466fc518d0468a8febdf238a6d422fabb95be8158d2e52e38aeb5e5b21661af9791ff8ed82f72f111cebe2ce1b93deabeb91dca4f06f09cf765152095a1cfd
 DIST msmtp-1.8.14.tar.xz 363988 BLAKE2B 46953512002365f8e80e1bdf80f8513845bae62bcfcbe8334642b7a51f2d7da7719e3c1812d43e2a887162d45a1b29893744f452f6ac7dc205fd72a578eec39f SHA512 fa274849082553b14aef922c43b84fa6226a26638747ed3ef6baae9d97ff753b24f5eca055426c2e0355df81b2458f524d940faf2a7db771d80fb027e9f45e8b
-DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
+DIST msmtp-1.8.15.tar.xz 370736 BLAKE2B 08673535603a7e768b11dea9d1b6a6e00ef9e6948c891572d39b0a8ba1eb1413d1ab71ff877cba1427ee58c25c87b817b4f20f3aad207a8f0a785306fcecbd8e SHA512 66c722f65590785f005631f0edb46f427cc4d9028c71ffbb1fb4eaa8d8fdacaadbcf24f81edc41e464e156b2beb65ecd1166b3d4aad4630ccd9fcaaa2e72e2a6
 EBUILD msmtp-1.8.12.ebuild 3297 BLAKE2B bf4ab8187207ab3b758b3cab1042c69d8f75cd64425f1300e7944f35278bfb2b3e37e52a474b6efd9711f736b49839be859fed8eba929d381c658615592eedaf SHA512 9a2668b03d3085c43ca58cae3483846064f15d065e2c00b36563272c4910491b31265ed735950a7809f2823b0e02d28589bf524e8b8d8a8466cbbad6fb0739bb
-EBUILD msmtp-1.8.13.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 EBUILD msmtp-1.8.14.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
-EBUILD msmtp-1.8.7-r1.ebuild 3307 BLAKE2B bce3e2ad1bcd0c52d563cba4cebea0882e2c41a4fc5630b2818b37923650fe14609f977b93ee26c3a9a8e67ab57fe7514b268ace3d702271fd1403476cc5ba11 SHA512 a6479befe38bee42b806029c99a038c262cdcd35d4273724d9199c008a8e056d610acefbff4beca8a79935ec7c9bd3018a333ba1888bde51d2aad26b280fd053
+EBUILD msmtp-1.8.15.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.13.ebuild b/mail-mta/msmtp/msmtp-1.8.15.ebuild
index b886b703970d..b886b703970d 100644
--- a/mail-mta/msmtp/msmtp-1.8.13.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.15.ebuild
diff --git a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
deleted file mode 100644
index 8cd0c42f43b3..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed 's:/etc/aliases:/etc/mail/aliases:' \
-		-i scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 46d177585bff..17aa02c2d446 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -18,4 +18,4 @@ DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d32
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r14.ebuild 4652 BLAKE2B feed5888be36a94e43b1c5f75052e7465ffa309916cee70b6e3699f2620cb648e3d3183e00a64491b25ab81087e0a4388d8794c7746c353ec89efa727edd1bc2 SHA512 0227a491cf5df61eb504efade213e9d3a3e9aaf8a5cece99a78f359e1f9a94e70a6fcca2ade6e9bc925cd28aeb80c0c03216217f0fbad1564b72b88a8e94fd31
-MISC metadata.xml 720 BLAKE2B 9bd0209a0db8075a22507fb63fa9f045959323da3b4c53e3d9da9d412fd39ff3576dc29c6d2af9db949e5fee4e98e166bbc41ce1d48ba0f8964e85fbe99728bb SHA512 57330a6fa33d3c65b0fe1289f89d356bebca6e7c8ba47cb5edfe53cd74938646ca60e3d001facab1fa5c4071fee7c3a8e0ad2ba2b4604aea3a8525c391991715
+MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 208703780530..4b2019520312 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 382c4be92ccc..f7dd6b2d38dd 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -8,4 +8,4 @@ DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079fa
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 EBUILD notqmail-1.08-r3.ebuild 4406 BLAKE2B f0d602fee3621157d4ad0ed2959f590ef8d72562870de0e908a9a86d138e425a580f793500f104b6850f959f4ce0a1db6e2a0cf17ad142e2c98712d049520586 SHA512 a95239e86acde78492cea9ba9fd06f4611cc6ecf746f3fa83c1df2d06e07c4c291a355548b0d0415c43eb4cd240ebc3dc90958afb0bedd45ba910c42bde8e456
 EBUILD notqmail-9999.ebuild 4381 BLAKE2B 675d7bc4c06c71380def3235f181ef552a5f4fa8e4635f3a5ab21c0fd20da1194a0df71afd07c29efffd767d0d83b87ce5270f1a71b394aef1c1873370102b89 SHA512 3982a9fbfeda56bcd92556703a71a1acb18c7c2c0fad389f71edeef940a13a9957c371e6310224a7aa77e0ccfebe6544fe53a31e2d4ca54e5624692b4d7179fe
-MISC metadata.xml 777 BLAKE2B 8e69eece4987057c0ba550b3e82d92f28dc308c77e71db483146a7e3b09fcd8bb22938d44009ac1dbb437c8cfdf44ddee07fc9b76feefa83e018249311537cb7 SHA512 54cff14308dc5240e9288cb63490cc1dad34d76963d166f94cce00a86ae1fd31e4e0be3144a9dede5bf7973d89dafa2f3acc5b438d95a594400a1a56cdf6f5b0
+MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index 1547ff2797a9..820271ff4d05 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index d72a43a8bd0f..4ac0f4b615be 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -4,4 +4,4 @@ DIST protonmail-bridge-1.5.2-1.x86_64.rpm 55876213 BLAKE2B 28be6035954352b5d8d10
 EBUILD protonmail-bridge-bin-1.4.5.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
 EBUILD protonmail-bridge-bin-1.5.0.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
 EBUILD protonmail-bridge-bin-1.5.2.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
-MISC metadata.xml 583 BLAKE2B d5bbf88c5cd068b08f99a7ccbf85a78b5117b57ed30e1c469bc2f2144b78e7657c3a0699ea12de200b5d3176c82d97a1696117b9055c4697642ea76de4c4afdf SHA512 f6a038e668763b497c626f464664a3314913e0fc9c9f4f069ac14c22fe8b2543973be2028c366fc32ac89842879b2b8eb0915ff794f8280fd7908b35eb94967a
+MISC metadata.xml 613 BLAKE2B 5416b2d2d8163513d25a25be489a3c4b7be70066c8bedc75df9527617e1f3c57ec23d7ffd95755d355d07c37b043b80c1375c2424fc0ec3970fe9b9722e6c67c SHA512 182afd3b72bbd3b167b6240268644dda3bb09b057dfa8a2bc6d06a9c665ffae56297618635c71fab0fc18657da9add3e27d7e5920421b8352b7c5d1fedf642a7
diff --git a/mail-mta/protonmail-bridge-bin/metadata.xml b/mail-mta/protonmail-bridge-bin/metadata.xml
index 3608d94506b4..5ed086f2b4a3 100644
--- a/mail-mta/protonmail-bridge-bin/metadata.xml
+++ b/mail-mta/protonmail-bridge-bin/metadata.xml
@@ -9,11 +9,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 7157aa6fb732..61a546c271db 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -1,15 +1,9 @@
-AUX qpsmtpd-0.40-badrcptto_allowrelay.patch 498 BLAKE2B 973390e64b71d241f09e17918a767bb92c6a15461f5368683b6b281d519bf1d4ffcc8f768d0a11f13dd3eeb98005d6192bc4cc0983479276a430031a597d89e2 SHA512 542a36cc410386873fb1eeb39debc443615f39dd0cdfc0e21e914542515ae75294904778f78324e5e5ce03c39542a1e00be0b4d3c7a114b14591f343078ec8c7
-AUX qpsmtpd-0.83-accept-empty-email.patch 1599 BLAKE2B 0ced9f49cb05a9342c7de6509843214a62b0926dde65287397ca7bf36033e0b0c86b1ad9569676708678b0d85d7886456c86e7be704bcf1049635aec4873e307 SHA512 859235361dd238a2d1b1fc5d34e951ae184b4c66031b3ffee4c7e33aefc0fbcaa0987aab290b95d08e576da47f69769aa403ba4965f2a20fcaf431412e2a6428
-AUX qpsmtpd-0.83-clamd_conf.patch 706 BLAKE2B b926bdbff93cea9b27ae1f70065a94101a39ee76ac75f9a71ce597df794286effea705b4c729f01efb12bbdfaa26a67562d7de61bfc95990cbb9cc2897eba7ee SHA512 644daac5c73a0997707a4195bd70faff436205b274fc2d89043ba2d07b76a2b97462a5bcbbd7146f3a6914f6243e973a0a168740dc97068dfda28eecd3ce2366
-AUX qpsmtpd-0.84-Net-DNS-id.patch 1069 BLAKE2B 2bd2a6a4ed219f19e1e188df11b29fa5a946b42f4bf7fb026282f7846f9a1e216a4db366ef2e3333285b88f3c154347b799f99184740be5ae03fbfee94421f96 SHA512 daf8e3c03c80f926cd0e94519945941dcd5b376ab5a1e99c3d83d26f800f0d1b69d4bb5c739483916f038fd7c1190746a2114f72416550f01d9a05c62e63d9bb
 AUX qpsmtpd.confd 617 BLAKE2B cceab176e6b1955cbffa27c6e10b55fa6df1b8ea3362f2c69ef47761d1ae477885d5d2e1ea34b452e6bb974a6e5bc377985867ebae385710d33e3677d363453d SHA512 d6dae42a493de7ac7c00e5b1aa2ccb7e1f3b3a2f23011ce854252d1e988d029adcb46407f2aff78cf8c4b832ef38e25a6fa2ddac4512acf7a455ab5f031201a2
 AUX qpsmtpd.envd 74 BLAKE2B fb17b28391eef250998033fb9b682bb7e1a4e97b410fd9fa3b8e5801f9899c7429d1dba36c0ea453ef7cf1ccbe297bfa4dfd935630a4773abaa1cd0b9927efb7 SHA512 2fe8e49d55df9216249fda126cf632c82b19740878f3f8aa3044b4f98d435ebd37933fa786dd89e9f538486251239f87f42942f3e12673d096aca9f5b9cb3ea8
 AUX qpsmtpd.initd 2058 BLAKE2B fb059ade05f13bd85d5b8850fd24e469d035e56bab50d3159512e0f9846d537bac037a2a95d45db0d52f12ccd6612be9310c4f3cdac561ecf447df40f078eb44 SHA512 ee3477b3de6f7e7bd5c6460f78d04b3c61fa7448805f53067e4c0c7437d896a47ed3beb2c0bce403b7541a06561f8698aaa4f12e1e4a885412472b8f06d1dbd3
 AUX qpsmtpd.initd-r1 2054 BLAKE2B 4e8ecb536017aa8995ed16e460b699ac0c7c4b4263bbde386662a498854cd39a9b57144b9b0804388f9a8db3971b6ceaaae2525a8caed6e8f30026d00cd98c09 SHA512 5c62c18b249fe0566b958f1a43f4d31f376005ec393d493fd419b89f0a08a23a41d6b8b24c30d4e5cb7b672a545ebeafc9b5645e3b1e2aa8c7bfcfaca20f07ff
 AUX qpsmtpd.xinetd 526 BLAKE2B 1adea2cc681c9902e1c99479ac8d8d2a750de7241273e0fa42b5bd23ddb30b2ad9e4bf4ae70d798507a9ab5437d85bd39216d8a1ffe912a3fe5f33ff4576cfd0 SHA512 b02331ea352573ea6bb1a46b1df343d2819ebe39dc4a42ec750c9a59f49a653f01bc933d7a2ee32e86fd386395137309de8202970465a2a2d8668fa35ae03994
-DIST qpsmtpd-0.84.tar.gz 178260 BLAKE2B 6a92d6a70f3abb84fb3a59ac68c61ecc36067f72bd6c86986bc9069f220d86352bce3ca674f19430fc1f1e724e98b7112df19e7f0c19a504b4204578f10fadf3 SHA512 a12491c123d21b4e3965105bbe88ad7e7e61551a3ff4e96eee78c83dcb2afae62239fa24d710092a7ccf60097699901c42d70df8183de6454bef4fb26843358d
 DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
-EBUILD qpsmtpd-0.84-r2.ebuild 2114 BLAKE2B dcfa006a1178670222b7286881fc44c287f2f1421402308342285d88e02ddd5ac12e53263d46490a55dae67c3cc410f6844135b86277422fa9d4ef1410983045 SHA512 7a4c2acf1d0db44581326de850d83596a1473d28efcde62efe82e565bea5bbd811d6094280e0cef4f6b758e5ee76fb281526df97200ce79ea7702cac78ce15a8
-EBUILD qpsmtpd-0.95.ebuild 2208 BLAKE2B 82f31767ae1407ca2ea6eba942409e5d3a97b10c281aa0ba7e762623e113a30ac9041d022740bb63df15a4d2bad3c7be920f3f4b067a932babe8904a12d563f9 SHA512 688f33d870d73d41a34a0291c477f914d473b7b65dd7f817a7140e05f65be6a767c7bcf22b3a5a67c3bf6a536524ac66438b6a3a50e376acfc7fbbec121c1d37
-EBUILD qpsmtpd-9999.ebuild 1925 BLAKE2B c113e35fa3454d09f661b32899d4d9a77567df7ca8452f0006a1f374a83fc23c4d78639fb4ac11fe62b3df07288c52424156c98d13c66ce902f1675a19159a40 SHA512 8177e87ba30b99aa55d448dd6cc361de0d90182372c8ee9b335c8568638a4fc5640bf3fdd6373d7ed7cf4b7686a586301e80b10c6a617578d7dd130bf5e0cd9e
+EBUILD qpsmtpd-0.95.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
+EBUILD qpsmtpd-9999.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
 MISC metadata.xml 377 BLAKE2B 8bbb87961e42890dfbe28cfcaf4dec032314a0eaefbcabc063706606ef8cedbf95cad32958f2789da6aeee564c7fa0d690ef15f491cd8cd220d03ec5943140e0 SHA512 14a288d1baefa7a16d7977bb91c341a7a70b6f29c3617e2fb3b24bbe5f6c378b428664138ee630cf6d94a0613a687d385adacc4e73f6c1531c82c9e63d0db95b
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
deleted file mode 100644
index 1f9f33f9a148..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qpsmtpd-0.40/plugins/check_badrcptto.badrcptto_allowrelay	2007-06-14 11:57:24.000000000 -0600
-+++ qpsmtpd-0.40/plugins/check_badrcptto	2007-06-14 13:26:42.000000000 -0600
-@@ -3,6 +3,7 @@
- 
- sub hook_rcpt {
-   my ($self, $transaction, $recipient, %param) = @_;
-+  return (DECLINED) if $self->qp->connection->relay_client;
-   my @badrcptto = $self->qp->config("badrcptto") or return (DECLINED);
-   return (DECLINED) unless $recipient->host && $recipient->user;
-   my $host = lc $recipient->host;
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
deleted file mode 100644
index 2e1dcacc46c3..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Accept messages with no body.
-
-If a message has no body, there is nothing in the RFC spec that says it
-needs to have a trailing \n for a blank line after the headers.
-
-Thumderbird 10 generates some emails like this, which will always cause
-plugin errors when $transaction->header is accessed otherwise, as there
-is almost no checking that $transaction->header is defined before usage.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Thanks-To: Jack Bates <ms419@freezone.co.uk>
-
---- qpsmtpd-0.83.orig/lib/Qpsmtpd/SMTP.pm	2009-04-03 06:24:21.000000000 +0000
-+++ qpsmtpd-0.83/lib/Qpsmtpd/SMTP.pm	2012-02-25 05:52:14.000000000 +0000
-@@ -632,7 +632,7 @@
- 
-   my $timeout = $self->config('timeout');
-   while (defined($_ = $self->getline($timeout))) {
--    $complete++, last if $_ eq ".\r\n";
-+    $complete++, $_ = '' if $_ eq ".\r\n";
-     $i++;
- 
-     # should probably use \012 and \015 in these checks instead of \r and \n ...
-@@ -648,7 +648,7 @@
-     unless (($max_size and $size > $max_size)) {
-       s/\r\n$/\n/;
-       s/^\.\./\./;
--      if ($in_header and m/^$/) {
-+      if ($in_header and (m/^$/ or $complete > 0)) {
-         $in_header = 0;
-         my @headers = split /^/m, $buffer;
- 
-@@ -691,9 +691,10 @@
- 
-       # copy all lines into the spool file, including the headers
-       # we will create a new header later before sending onwards
--      $self->transaction->body_write($_);
-+      $self->transaction->body_write($_) unless $complete;
-       $size += length $_;
-     }
-+    last if $complete > 0;
-     #$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
-   }
- 
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
deleted file mode 100644
index 801dc477df9f..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' qpsmtpd-0.83.orig/plugins/virus/clamav qpsmtpd-0.83/plugins/virus/clamav
---- qpsmtpd-0.83.orig/plugins/virus/clamav	2009-07-20 15:36:17.000000000 +0000
-+++ qpsmtpd-0.83/plugins/virus/clamav	2009-09-16 01:14:22.903329780 +0000
-@@ -151,7 +151,7 @@
-   $self->{_max_size} ||= 512 * 1024;
-   $self->{_spool_dir} ||= $self->spool_dir();
-   $self->{_back_compat} ||= ''; # make sure something is set
--  $self->{_clamd_conf} ||= '/etc/clamd/conf'; # make sure something is set
-+  $self->{_clamd_conf} ||= '/etc/clamd.conf'; # make sure something is set
-   $self->{_declined_on_fail} ||= 0; # decline the message on clamav failure
- 
-   unless ($self->{_spool_dir}) {
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
deleted file mode 100644
index 6331e98cb48b..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Net::DNS function nextid() changed to id().
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
---- qpsmtpd-0.84.orig/qpsmtpd-async	2009-04-03 05:48:34.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-async	2013-04-15 23:01:49.952857659 +0000
-@@ -145,7 +145,7 @@
-         # print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
-     };
-     if ($@) {
--        # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
-+        # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
-     }
-     
-     # Fixup lost kqueue after fork
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
---- qpsmtpd-0.84.orig/qpsmtpd-forkserver	2010-04-08 05:29:52.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-forkserver	2013-04-15 23:01:49.952857659 +0000
-@@ -285,7 +285,7 @@
-     # all children should have different seeds, to prevent conflicts
-     srand();
-     for (0 .. rand(65536)) {
--	Net::DNS::Header::nextid();
-+	Net::DNS::Header::id();
-     }
-   
-     close $_ for $select->handles;
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
deleted file mode 100644
index 2b65df3df8fb..000000000000
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module user
-
-DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
-HOMEPAGE="http://smtpd.develooper.com"
-SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postfix ipv6 syslog"
-
-RDEPEND=">=dev-lang/perl-5.8.0
-	>=dev-perl/Net-DNS-0.690.0
-	virtual/perl-MIME-Base64
-	dev-perl/MailTools
-	dev-perl/IPC-Shareable
-	dev-perl/Socket6
-	dev-perl/Danga-Socket
-	dev-perl/ParaDNS
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	syslog? ( virtual/perl-Sys-Syslog )
-	virtual/inetd"
-
-pkg_setup() {
-	enewgroup smtpd
-	local additional_groups
-	if use postfix; then
-		additional_groups="${additional_groups},postdrop"
-	fi
-	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
-	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
-	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
-	epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
-}
-
-src_install() {
-	perl-module_src_install
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
-
-	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
-
-	insinto /etc/qpsmtpd
-	doins config.sample/*
-
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
-	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
-		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
-		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
-	EOF
-	if use syslog; then
-		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	else
-		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	fi
-
-	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
-
-	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
-	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
-
-	dodoc CREDITS Changes README README.plugins STATUS
-
-	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd /var/log/qpsmtpd
-	keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
-
-}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
index c49137a61108..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-[[ ${PV} == *9999 ]] && SCM="git-2"
-inherit eutils perl-module user ${SCM}
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
@@ -47,7 +47,7 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 	else
-		git-2_src_unpack
+		git-r3_src_unpack
 		cd "${S}"
 	fi
 }
@@ -59,25 +59,23 @@ src_install() {
 	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
 
 	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+	cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
 
 	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd
 	keepdir /var/spool/qpsmtpd
 
-	dodir /etc/qpsmtpd
 	insinto /etc/qpsmtpd
 	doins config.sample/*
 
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+	echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
 	if use syslog; then
-		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
 	else
 		diropts -m 0755 -o smtpd -g smtpd
 		dodir /var/log/qpsmtpd
 		keepdir /var/log/qpsmtpd
-		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
 	fi
 
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 801cfb710759..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils perl-module user git-r3
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
-# This is a spotted development fork with many improvements
-EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/smtpd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	# This is a spotted development fork with many improvements
+	EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
@@ -37,6 +42,16 @@ pkg_setup() {
 	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
 }
 
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${A}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+	fi
+}
+
 src_install() {
 	perl-module_src_install
 
@@ -44,25 +59,23 @@ src_install() {
 	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
 
 	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+	cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
 
 	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd
 	keepdir /var/spool/qpsmtpd
 
-	dodir /etc/qpsmtpd
 	insinto /etc/qpsmtpd
 	doins config.sample/*
 
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+	echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
 	if use syslog; then
-		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
 	else
 		diropts -m 0755 -o smtpd -g smtpd
 		dodir /var/log/qpsmtpd
 		keepdir /var/log/qpsmtpd
-		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
 	fi
 
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 9dd6c1d73d99..aef8b358e7d3 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/metadata.xml b/mate-base/metadata.xml
index faf505708ede..9ae3c26beb42 100644
--- a/mate-base/metadata.xml
+++ b/mate-base/metadata.xml
@@ -28,4 +28,4 @@
 	<longdescription lang="pl">
 		Kategoria mate-base zawiera podstawowe pakiety środowiska MATE.
 	</longdescription>
-</catmetadata>
\ No newline at end of file
+</catmetadata>
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index e22e3c267104..f9085e8d56dc 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/metadata.xml b/mate-extra/metadata.xml
index 211105c47dc8..cc82d2112cbe 100644
--- a/mate-extra/metadata.xml
+++ b/mate-extra/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria mate-extra zawiera dodatkowe pakiety dla środowiska MATE.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index 14634b727882..daef5ad21fda 100644
--- a/media-fonts/Humor-Sans/Manifest
+++ b/media-fonts/Humor-Sans/Manifest
@@ -1,3 +1,3 @@
 DIST Humor-Sans-1.0.ttf 25832 BLAKE2B 4190361e42ae30a5870ba79a1125e16569c6eeb2ad6fc739d18068c36d39dfb33d46ee0d0944af6f7b61fdbd7cffb992ef6e69bcc736d322897b612305fa9bcf SHA512 f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
 EBUILD Humor-Sans-1.0-r1.ebuild 470 BLAKE2B 1cb8726f6b05f42ddd634386e6aac1b934de3e8894c0fb30dc07b05d4d4f628988be902f2e4595fcd4bc4cbde80adcec5ec4836eb13bbd6a300957d1cf403de3 SHA512 f399b467438de103cb65cae033172d1ac861104550c1849a3a78773592ebe4eeb8a6f54b98778cda4dbadaca194c94514c22d192c4e3c0e7022c7d5220a65746
-MISC metadata.xml 369 BLAKE2B 98df7da8c24fd35dda26b7017906df3541ca67660e101d77b0ca0f4f4d40147adf8cc412f356c194746458c762e0b3d7909efeff3ddefb50ca7ac3def79888e7 SHA512 89a0d92aae8d1c68a9c7e9ec1a103468252b90f7537183205bd77a6371f98b6f225a290bd101c7b9f94a178f2dfeab01864087a4835bc9d6d0d5424b8c424fbb
+MISC metadata.xml 399 BLAKE2B 18589286f55caa559d9c006582a0a4ffb6d167f2c993bd33cf9688ac594ba284f93992f21b26a7f2e4b128c05a59743a28fc3e4c89e6d7ad17e56ff9c8aa8416 SHA512 d21f88d0778e3740b65408dc1b451c215a56dd05501751ed5a5767883a8942ddf494cf9182a88d4c8143d88fa5e84af21b40a9b018a42659a004eea91f7239c1
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index 15a01a677fea..0f83e01f8c15 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bb90402be9b8..69bd5499232c 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 7ea11a28dd91..f2ee2ae54ede 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -3,5 +3,5 @@ DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2
 DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
 EBUILD cantarell-0.111.ebuild 1257 BLAKE2B 0a1b39b702131c214092b0ccb1f8e5cab88aee5e1c71929203fa18a86b29d37da70ca99104ec78f141a3e2f48f3f25ee6d8be35e781e9f73e5b9e19c289e2cd7 SHA512 620544a6c62c7ab30c8da32f47b72c5308c11e67ba921967e777da1c56cece0142889cce753c0676ab42c4a8a096cc7a880f04e3d1f336730a70f720daadcc1e
 EBUILD cantarell-0.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
-EBUILD cantarell-0.301.ebuild 1059 BLAKE2B 010173a7bb93ef64eb54bc9733fde9531fb66a77a8a2dbcf5f9d9021ea500edc4468420147a18889d2df01bf95f522d29797e282e09b563bfeb8f33c381a3ce9 SHA512 a6ee8e359af6097aa9042ed7f297bc66d558c1a44165604604700435e052e9fb39a3bd7368702c948e90f94904ebd87e23dcf4f00143e89c7853118e1e5e095a
+EBUILD cantarell-0.301.ebuild 1058 BLAKE2B a14f99b30ac0902cb6397d5786a145efdfb344e4b3230bea0aacc8a0dfeb7aa8efe4ca1567ff34c7d46455daf0570ed5b62f84ef37a6661a6e742caa4ab15548 SHA512 3a9852e32bfcbebb4cf3614024b1f6bc2a7297d305ae73bea18bff428988c95d4d5344b8077ed3c3b9bb199d2731157839e994a55d0df20d8787b2fdc67357ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
index 85fc727bee7d..1f8f9dfcb3d9 100644
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ b/media-fonts/cantarell/cantarell-0.301.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 BDEPEND="
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 647cdb0eedf9..109eb84dd7b0 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,5 +1,3 @@
-DIST cascadia-code-2009.22.zip 8217333 BLAKE2B 0c3e4cb95cae4869c911ea93e16b496e249778150fc208a04c392cd6321245e2de822953ed79346201e73dd8ad3359f6ec99b3f156f33b49b9f698413d5be568 SHA512 3ddc0b243b10fa36ffb89d7f63cce50b39bdc6b263ab124c9c34840eb7e775fc84366dffc1785b3b5cd48b1fda045f5f90d8e0301ffac754a0b7b9d8063b3d04
-DIST cascadia-code-2102.03.zip 8676365 BLAKE2B eb72c4b2459619fdabc43a137853b9df67855965b27a7370e5e0607055ae43288644035ab49211715a84d0b1f1214a840728bafe81e38ee26ad38d67defa7b82 SHA512 167629f5111db4bcf7e51937e5fa072e16ff2dcdc8a3f003b70afb2f49ab15d839c1f6261d9c0ef15a71a45e0f04a29a5ae8102e8dd6cf6a00e8b003cf8b5fcd
-EBUILD cascadia-code-2009.22.ebuild 521 BLAKE2B b56d561d133a1c12ae4a73bf56608f72506a21b6f2202ade0716e028c768e8b536a4c5e9d82e4e48470d6067466d69f30cf1f86c1033664aaee150439cec135d SHA512 22713cf2f49b39d0163e7309fa70d468bd5e17d1ea82fb0e7d908af7050ded1236f9980bdea2682298adf64ffad6a6763b3e6ecfc18e25d9736e12cbabed64d6
-EBUILD cascadia-code-2102.03.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
-MISC metadata.xml 642 BLAKE2B 48b342f9f8e818fa5b1f48d7124c9c38eab178c08e54f228e1474c0ba59248d528cf491f7e94db93f468a5128755ca814e1790560c760ecdaf2ef16e48e9205d SHA512 59d1bce26c031793c04023b8011f044f76c7d647774e3c6c4f12280d60201994a70c0d95f7c64de2518f86e9050a200456a9ee2373fe6941a642f7471109b70d
+DIST cascadia-code-2102.25.zip 8666729 BLAKE2B 86e11e003fcad686f0ad9ee38af488447fd0a6c95b0f9a89e945ca173c44385af0090a50e26b355ea8019c7e33ca45edcdfa7cfddcc0734fe224c96c8d941acf SHA512 4b0b1168bf3f1adbff362ed2d7fa1f548643e5c9506866e12dc26aefb8e807b7515e0c49705f03faf1a44c037d414ba3ab3f2189d29491711d6e802035914002
+EBUILD cascadia-code-2102.25.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
+MISC metadata.xml 672 BLAKE2B 08b9d480c2c90dc663a0150d8d0ab4d8025fc8557488e3fa1361961817c6ec70b08e43f035f806726e0d68f19a2b8dc39f6c36e8fe0a63451628b04e0f5ae80c SHA512 8c8f161c846a81a82a1169c67b9d8e9fcd5696918f7e59d334b13f4903f0e0feb21bd3fe21b523ef3ab618fe813aca82ee7ebcca7b1d5b114bf2f7ee6d3a8183
diff --git a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
deleted file mode 100644
index ac79209160a2..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_SUFFIX="ttf"
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode-${PV}.zip -> ${P}.zip"
-S="${WORKDIR}/ttf"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-BDEPEND="app-arch/unzip"
diff --git a/media-fonts/cascadia-code/cascadia-code-2102.03.ebuild b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
index 3726a28cc6c9..3726a28cc6c9 100644
--- a/media-fonts/cascadia-code/cascadia-code-2102.03.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
diff --git a/media-fonts/cascadia-code/metadata.xml b/media-fonts/cascadia-code/metadata.xml
index 6e92b8e773c4..cda11dbe5954 100644
--- a/media-fonts/cascadia-code/metadata.xml
+++ b/media-fonts/cascadia-code/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/comic-neue/Manifest b/media-fonts/comic-neue/Manifest
index 44e38663eae8..07b35977acba 100644
--- a/media-fonts/comic-neue/Manifest
+++ b/media-fonts/comic-neue/Manifest
@@ -1,5 +1,5 @@
 DIST comic-neue-2.2.zip 1547231 BLAKE2B 3c28d2ada0c9c634084b67694b83ae765594d7e732c870bf6db538967b922146863b023e5bf1407b08f8e9f77b264d867175fe5dbfe1f6a7e53a6fcc2e83f16d SHA512 4c13a764a8a5f1fb23bfb47b1840249286fded918d243227d360ae8005165de2e0e02cafca59a82a306129689d67347950d47ad5d8ae49bb165c0d4a18bd2d91
 DIST comic-neue-2.3.zip 2093174 BLAKE2B 80b345e3c61839d1abb803cc8a97d3b03bdf906408a9eb96aafed9e67d3b0f4a99ed82adef528b7fa4eecf9e1c2443efbedc32ba8c08e5731cd3ad180bdf3aa7 SHA512 37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5
 EBUILD comic-neue-2.2.ebuild 418 BLAKE2B bc6d0287f1e3d230141a2d7df1fcebd3a20d6ef8433e26a91eddf3f6befbfb9f2d942cee55703f9fd29bc8980bccb3fe90b5e7a527b0a53d3cd99b8ebff758ca SHA512 434a072b4925694307047899709d30510eb7bc89345b9bcf9091b947bfa42350456c293cdc46e5f9aec0ec4901a5d42b6f711fa690a5e3cc14d2aac6eed1ab0d
-EBUILD comic-neue-2.3.ebuild 516 BLAKE2B 2ea2f718743670fa6cf5f9591b8f52f0748df3331cb320d208c0df15aae6dc8722547c885c343b0efed6d4cc64bcab0c2dcac0df28525576f2581f347ae18162 SHA512 90b19f75fa2ff9476eea609bd835e35bb10deaf10decf3e6570350285ce50352e9f73d944075a363ea733254d46afe59ec776b138b1c2762c77c9f8c0a5710fe
+EBUILD comic-neue-2.3.ebuild 511 BLAKE2B f8759469707cf2b5cd26fe206000093af43fe7eb45e135fbcd78fac043c707059a584bb452fe6903c34b37d139eb01f023c6c21e05a51583d4074a7bc0aed026 SHA512 7f1f14be57220373f77098ad14d12decfae28d309b46cb465576a3ae96c87b3b557bec8c7b98c5b364b3b4ad0232df4a2118eadc46bb5a6aeba5dc1cb2406e40
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 07fbb94be27e..6932b1f00995 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com"
 SRC_URI="http://comicneue.com/${P}.zip"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/croscorefonts/Manifest b/media-fonts/croscorefonts/Manifest
index 5dcc0c421792..37e53a04b24e 100644
--- a/media-fonts/croscorefonts/Manifest
+++ b/media-fonts/croscorefonts/Manifest
@@ -2,8 +2,6 @@ AUX 62-croscore-arimo.conf 830 BLAKE2B 3a9c244065ef41a2352d00ba89befa53ea0a250fe
 AUX 62-croscore-cousine.conf 852 BLAKE2B 4616f113926cb805f819db360580271bb787dfe4c4bea52641cb9fce7fcaed78ff67fa8a5cf85ee0064cc42c7e92a27199b93d7b7dc7937ff5da4427a9e6c9df SHA512 c15aa19cf9c0195e80d337b2d4e9203f3e69f8194a593405fe776e747582c9333dd04097ca834f168fefa6b7bf012bc9bdae14fa983f79774e22e55a0914f949
 AUX 62-croscore-symbolneu.conf 366 BLAKE2B f9903ab279cc6fae210896409deaf118bdbffac68135be5e5360dedc89be1ba81e13b490923c7d322f739df507096dec8269024d8e5b48c7b985871b4b21a4f5 SHA512 2c0a0e37422cbcfe59fd9d18c0491b208537a2510b6475cdc4fafa8700628b152a5c09256cec274c79201455976988fbea21b1b600e3713f6ca9f6d0b633aed5
 AUX 62-croscore-tinos.conf 842 BLAKE2B 6483ec81aa6d93385081ca48c128a2943ea5e3f58696499d65eeadb5d59abdca1c81ecd2ce9d9d1c950db9dbbb65376014014c6efa13ffe5f2460d8b69eb8b9e SHA512 5cffeedc50c0d4c664a4f0939db603b0c0cbf48036ccd04f68cee1a40efd4bade3aecc6ae704648229c0e8ae8e18c6ea40f43cbfd2b6545f4f6fc3702a1d3d69
-DIST croscorefonts-1.23.0.tar.gz 2696327 BLAKE2B 915ce0e294fbab5687c3021912985e2806f066684a16b68f41a04fdd66ba2a3af494f62ab548cee48a734891faf59b19aa5d9e33a56f41d99e00f2a58717d7d4 SHA512 069444d57a59bd21d5b30c4b9d32a0e7b649126b2f1d10d992155c08adefb1d30119deda7818e388bb184aadb3f8dd20ee0f26c9d14b3e53bfda7fd682acf3d5
 DIST croscorefonts-1.31.0.tar.bz2 3223864 BLAKE2B 4fc011557f81c19d4bc79f014c438868d2a63fe8932140a51523fe582a62a07ee1e51799bb3b13cb801a6ac0af72f23abade4cacccbc4adb3523f3a8d440ea8d SHA512 dcd5ebb854f78353a1d91bb74a5ac7b5e237040994c7e2a69cf68511f06b10006fc3a490840d48c12ee7f862d2dfa3106c9e1787a726a4b158eaea5cd5ba8842
-EBUILD croscorefonts-1.23.0.ebuild 746 BLAKE2B e8f9049758c9cd7d53d773e313d25c7c7c6556da4aa7c3f7c38a2fc92c5cc2d04d0637e0ccd223ce94d2d02df055d64a79bafa2994c010322e41708cb700a9e0 SHA512 ca60b6bfd351b25b18691fb5efe46595cffac1317aa6401c5304a2995bce021670d6ed08c1b0550c06896f47179d553addc4090cc39c309caf1547f15f14cb52
 EBUILD croscorefonts-1.31.0.ebuild 744 BLAKE2B 954af1d2255bbeeae92522ba37539ce5569347b0005f243341142f7ec21ba5a6a45f9101bb9ec80e321b6b07f33862ba98c885b85ca5bb6b89d3a09a687910ac SHA512 008c42421d3d28ffd5959dca19d62b70daa5437f16a5adb8cc5d68bf67c10e23a9227cbc03495d67c658ecf6dfe5eac184df885fb37eabed5ee42c2b9bcaf767
 MISC metadata.xml 790 BLAKE2B 1299513e819f53f388bb8d639aa070cc00acba9d619656e9891ac35ed043ef61d9ed285f11113bc27803201d0f6e0cea152cd2fc314f72db1ad65ecf1be837af SHA512 9ce6c85eadb03a6f058f1ed2c3f3d68db160627bd88513c8cf3886e5e6556ccf1582391a1c6c96dd0ca8baec1573acb88df4495e1bdffaf37f6c069fd9d08a41
diff --git a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
deleted file mode 100644
index 04735a01288e..000000000000
--- a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Arimo
-	https://www.google.com/webfonts/specimen/Cousine
-	https://www.google.com/webfonts/specimen/Tinos"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-RESTRICT="binchecks strip test"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	"${FILESDIR}/62-croscore-arimo.conf"
-	"${FILESDIR}/62-croscore-cousine.conf"
-	"${FILESDIR}/62-croscore-symbolneu.conf"
-	"${FILESDIR}/62-croscore-tinos.conf" )
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 3603b0a882c3..f11ca379c970 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,7 +1,4 @@
-DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc19092d1dbe3cf5c8d02f22affe70cdcb5e0d5d2b787917c43bedfb9b8ac37d1537e3d79a9f6e948baf0c4415ac78b00b SHA512 a00ad39b3f02dc3866b54b522b299d65a571bf7c0625b8aa4f7095fa15010cebecb8b2a51a3716336c48531acf617b557dd4114b670910560e69d2b315715cb4
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
-DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.35.ebuild 1975 BLAKE2B 329ef5ba2587f36f4cee4657ff77aa777ad63394ce4df37da73f596e3eecd4d436f697229c77a65e12d7b6fc199f9016a5eaecf1ab399f6f25f9c0b25f4dfaa1 SHA512 f0394d96829677ef52a6cde45972c1e6d0e33d872fdc3053fb176964784fb5ccb16e246ccc5542c3383635c82a654b5a3d673621ce7e1963a151f3e2cfb808ed
 EBUILD dejavu-2.37.ebuild 2040 BLAKE2B cde88b2163d76c87d2bcb905294d2ba6c32d66c91ecba3e22e98f916e7951f7ff1dc21b64d428e7618933181d111c4194bf61086dbe4c7f517c5409a8bd07504 SHA512 7a2ecad59bb45284e58c4ae1a761fe2041c822c0319dd992eaa33436037b8b63fc5a64ec32cdf1ed5d9e2dc86ec6377d464109bf90033addb0faf8b054d25302
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
deleted file mode 100644
index 8a36bc5c3102..000000000000
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
-HOMEPAGE="https://dejavu-fonts.github.io/"
-
-# If you want to test snapshot from dejavu.sf.net/snapshots/
-# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
-snapv=${snapv/./-}
-MY_BP=${PN}-fonts-ttf-${MY_PV}
-MY_SP=${PN}-fonts-${MY_PV}
-
-if [[ -z ${snapv} ]]; then
-	SRC_URI="!fontforge? ( mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
-		fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
-else
-	SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}-${snapv}.tar.bz2 )
-		fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}-${snapv}.tar.bz2 )"
-fi
-
-LICENSE="BitstreamVera"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="fontforge"
-
-DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
-		>=media-gfx/fontforge-20080429
-		dev-perl/Font-TTF
-		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0 )"
-
-FONT_CONF=(
-	fontconfig/20-unhint-small-dejavu-sans-mono.conf
-	fontconfig/20-unhint-small-dejavu-sans.conf
-	fontconfig/20-unhint-small-dejavu-serif.conf
-	fontconfig/57-dejavu-sans-mono.conf
-	fontconfig/57-dejavu-sans.conf
-	fontconfig/57-dejavu-serif.conf
-)
-
-FONT_S="ttf"
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
-
-src_unpack() {
-	default
-	if use fontforge; then
-		mv "${MY_SP}" "${P}" || die
-	else
-		mv "${MY_BP}" "${P}" || die
-	fi
-}
-
-src_compile() {
-	if use fontforge; then
-		emake -j1 \
-			BUILDDIR=ttf \
-			BLOCKS=/usr/share/unicode-data/Blocks.txt \
-			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
-			FC-LANG=/usr/share/fc-lang \
-			full sans
-	fi
-}
-
-src_install() {
-	font_src_install
-	if use fontforge; then
-		dodoc ttf/*.txt
-	fi
-}
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index e93fc32c01d7..09f5c0139957 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -3,4 +3,4 @@ DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
 EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 EBUILD fira-code-5.2.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
+MISC metadata.xml 426 BLAKE2B 51de3d7964aa09626eafe8df4ccd8f3d14d5014f345a20c138b252a9165a082993c0f71e4c3a7fb69d2a269eb4b5270d364e4fdf70921b6cffe24ac7698f4ada SHA512 7b0f3435a1df7115af80f9484fe11c7cddcaf3e7d287da66aeefd810a5e5a982324c0a6fbc2ad0a817d6fc0b1fdaf7332607b6124043395bdd1a64755065a0cc
diff --git a/media-fonts/fira-code/metadata.xml b/media-fonts/fira-code/metadata.xml
index d3698aac3028..c97e44b664fc 100644
--- a/media-fonts/fira-code/metadata.xml
+++ b/media-fonts/fira-code/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-fonts/fira-mono/Manifest b/media-fonts/fira-mono/Manifest
index 720987fa34cf..84266dcb9ea1 100644
--- a/media-fonts/fira-mono/Manifest
+++ b/media-fonts/fira-mono/Manifest
@@ -1,5 +1,3 @@
 DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
-DIST FiraMonoFonts3205.zip 1210827 BLAKE2B 99152a5b62ecf32369b84ba3b66662cb5db1662d0bac5f7c2d1cefb7e3cd0e72be13a2177f2d08e77cae30cebba2ad5c55b0b34235c55317f9f726dc774e82f9 SHA512 d1a05ed2610e6d1c688b5709bd30ff6de4597c93db99d049fca9f8a8b3e2bfd2faf2de2a6d23a5b24efaa502e0cb2f23f5239cadc0bb5cb709d04da1d37cba15
-EBUILD fira-mono-3.205.ebuild 620 BLAKE2B 6fcb2844dfc850e42cfb9e253a8565da03fa3aa0f0d44665507bd9c40fe753c98ba8384e1f8889daf2336168ed0274db33b3d424a358edc42d498501508ff703 SHA512 0f9d49941b2f4af815c9711a98c5bd14d9906b7fb6f81fb84b951b63bc1cc725f96e72e5fe9b31b47d2e1af501b63954586efae003d2f463bca411f0ea739310
 EBUILD fira-mono-4.202.ebuild 823 BLAKE2B e456d3b60223c32987a2b4110695e837f786616f663505d346f074d831d878ab732419bbf56bcabb2cef279af401d448e320774086c0e41295def40db28eba32 SHA512 5328bf72d79093e1b515c7b87f73c16a2eb0a2beb019adb2c90e9d8d94230503c9bad4b17603d026397b7cc99471e89dd9505225abd6b686897e37e17365aae8
 MISC metadata.xml 399 BLAKE2B fbe1c1518e1df8b646fad2460005cee18753f93d18a0e0737af0aa5d417c765dbf7db63716a93e9d8dde13b4d9e7afdbabc9c61a00c154ed72dda20c45a586d3 SHA512 ca38f2f10617c0ade03647233010ead6a9c38f7acf9a768f2daf8beefe73956b9326f3d876ea98958d003a4abf73b8b0db3942475e5b6d3a63c24597731859e2
diff --git a/media-fonts/fira-mono/fira-mono-3.205.ebuild b/media-fonts/fira-mono/fira-mono-3.205.ebuild
deleted file mode 100644
index 777bda1a12f3..000000000000
--- a/media-fonts/fira-mono/fira-mono-3.205.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraMonoFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default monospaced typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-1/"
-SRC_URI="http://www.carrois.com/downloads/fira_mono_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/Manifest b/media-fonts/fira-sans/Manifest
index c8301a4c6c40..d2bbadfd550a 100644
--- a/media-fonts/fira-sans/Manifest
+++ b/media-fonts/fira-sans/Manifest
@@ -3,5 +3,5 @@ DIST FiraFonts4002.zip 22975177 BLAKE2B 6dfc143568605ecd4fa956d8ef567ce4d86e187e
 DIST FiraFonts4105.zip 27227111 BLAKE2B c8ef15673735537c0d849c3e0dfa46a0b9cdcb7fff1d82d50d18b0119192282fa3956f57fa182420f71479f9479a4b8da5f87cddedea2469fd01562dc7bf8ee3 SHA512 f451e99d761ae9e714461e1ac244ee1c12af11751f61c94fa7ed10bf04bfa26520fbf50d1aeae55346348aec932481888780ae12df27349c966ba79a3eeae37d
 EBUILD fira-sans-4.002.ebuild 616 BLAKE2B ab99924f4db432c8cb3ed7753a15b8942a5c6e50b21bea8598be0d708e9c4203934f8fb7b53bff92503ec264b1a5c6d269bea95c9626f6126ecd7bc1e3613c7a SHA512 1f49ed133338ecfab566b7717a86951ee3d6ecc6e46eec9cfd38fda015a6f408f6f8597998f40c0d1bc4f2acfb104fc3379864284290c849ba87a50b921228fc
 EBUILD fira-sans-4.105.ebuild 600 BLAKE2B 20ac4479827bae8547f702c6fbf767c7c285780c4ed06dbdaf582e5aace1ddc0bfd7a2c3eb9409463e0b0430ebae78fa94a701b554faf22b60a05e1a3e098b6c SHA512 26959ebef08d1f509f0b5ea44fb19b08308a74ab59f9e915de7dac0bd6c8258a524fb2c96e9ec60a680bd21390cca6b27b7e0691192cb5cba512121bdafb925b
-EBUILD fira-sans-4.202.ebuild 823 BLAKE2B d7127933080cc7ed896492c3c3d4ab33073f381aaff56da33a8b7e63880952301c18d37cc7af7a2df16fc66cb80602dd7dd9c4df854f41d46462e61408bd40c5 SHA512 c437e27c99c01977fc39eb59329af8da281f8e9ecf74da51d86e7223e2a12a0c54006683ce39ad60565c76ddeceb178b660ec67c3a91d28c1cddd57465abeaaa
+EBUILD fira-sans-4.202.ebuild 821 BLAKE2B 718e502470fefbad825758eaa10193ed08ba4ef73aa0620d24adc0b4fb6b9e07fc0e0740328dd68d8ac066da080c1ceba949b238590f065637f51c7166c39cd8 SHA512 59137446baa4530261c015f8ec2a04aab3ce01a9af72eb547d51f2f8093be89c0de366b7cec32c6903a139e009611608292bff12084abeb46455d954ae938bc7
 MISC metadata.xml 399 BLAKE2B fbe1c1518e1df8b646fad2460005cee18753f93d18a0e0737af0aa5d417c765dbf7db63716a93e9d8dde13b4d9e7afdbabc9c61a00c154ed72dda20c45a586d3 SHA512 ca38f2f10617c0ade03647233010ead6a9c38f7acf9a768f2daf8beefe73956b9326f3d876ea98958d003a4abf73b8b0db3942475e5b6d3a63c24597731859e2
diff --git a/media-fonts/fira-sans/fira-sans-4.202.ebuild b/media-fonts/fira-sans/fira-sans-4.202.ebuild
index 90dc65ee232e..bc843c1d54d4 100644
--- a/media-fonts/fira-sans/fira-sans-4.202.ebuild
+++ b/media-fonts/fira-sans/fira-sans-4.202.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+otf ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 961142f4153a..5ddbc03e96cf 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -5,4 +5,4 @@ EBUILD fontawesome-5.14.0.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5ba
 EBUILD fontawesome-5.15.1.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5baedb6b1b89f0281afa2cf4d66868481e07c8eb80c288d6f87c18c0f43caa1cfcfb624fc5a43213cfaf91678711d642 SHA512 453ec352c4216b648b963ab775c2b7f4ea928230c0f80bfa5d48aba7177cdd088ddb1bcecd9741cc0b4365baca617b4bda03b1ebcb33c48d3b9fcbb8eff90613
 EBUILD fontawesome-5.15.2.ebuild 754 BLAKE2B 69e3e74b9c30206da3a3451be57a01982bd7c0ccc98ccff87c4a86eabb687719b6810bf8945ee6c56634106085f6284eb7a78ae0a5e9f51e88ae7defd9baeab8 SHA512 f1e2d758b48be58ba56f744cf0ac43fd8f1765d2f638f4f8b33a9d96ce41035dd435a99e7d2f86d7f36a2de1edd1a7cf86177be70cead9c1306e286bb5aa8148
 EBUILD fontawesome-9999.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
-MISC metadata.xml 532 BLAKE2B 2a4d5bb78ff9948de3569171165e91bc9391863412dab5236ff996182671decde9ba0339d059c3ec2e58670c362ea7f49dab9b5e1abfc6d277c62a6c8f2dcd08 SHA512 862296f7e1ea8fa2fd4acbbe2d679df47076ad290bc6d571f15971c590745c47f3c7dba39d823411a0228aff71aedbb77b739fd4cfac990eed54f48c85406904
+MISC metadata.xml 562 BLAKE2B ffd93846055a9550e8146f9bd31e50f27822f7c2220ee0d8f059d9a7661b6fca8e7ef25d901fac389c1aa51de7939470fd1314e76640331c75263c65bb3bd76e SHA512 36e019943cd70848f6f62f0540e7b5b579e95c1ccc190abc3c1ed8418d3a0febdebbedc1a6efebcbf9220b0cc5aaa6c863f4e4d92047767bb6164bec7b6793a5
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index 795d5dc16535..42226d316edb 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/hermit/Manifest b/media-fonts/hermit/Manifest
index 9590a323fff6..8b9491e32b84 100644
--- a/media-fonts/hermit/Manifest
+++ b/media-fonts/hermit/Manifest
@@ -1,5 +1,3 @@
-DIST otf-hermit-1.1.tar.gz 15077 BLAKE2B 1435e521e2e6c50f910fe6eb7cf29513bc665766478a4584ea06455d64a70dfd81c80447eb2d282a511f13bd24fc6d119e0e57f0a4469dcd355a13e0920b76cb SHA512 ef87f69bfbdb0f84b16e42e06a950a351fb1203fe599dfb7cf6b0c69fb260d99e24b67c741d738f9250fcd1f14aa162c8f285fed7e6481ffd55e78a1f1617d58
 DIST otf-hermit-1.21.tar.gz 42646 BLAKE2B c67dcaa34a5fc5f8280547107a817deb4a40db7c6b3a0b2edf8d92c2dc230576bd7fd194bff1943fe481a143a027eb56484fae30ebeab5c6a563d9bdb07011ac SHA512 5b980068d349e67d78a33a100d9b38eb24c374d0cf6ac69676df0e8dd441451acc0112089634c4b408f1afcb49501bb9f5940ec6c18910b5c11f7f7f31c739ac
-EBUILD hermit-1.1.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
-EBUILD hermit-1.21.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
+EBUILD hermit-1.21.ebuild 377 BLAKE2B 79491f21dfb5755ce45df7fa0ea820f4a83b38db691801ae90dec64ee0888274eb4bfa7d7df786b9c0c1b37aa90db4a6b7e10067f238477082ee342339f4eb2d SHA512 383be4cb5576fd1fd90cb9d43c3a34068f95efcdf20781e87fd2840c8575c374d742d7e1b63877cf03a68eeff099e596476cf7ea9118ee27e5d37a8e203f73b7
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/hermit/hermit-1.1.ebuild b/media-fonts/hermit/hermit-1.1.ebuild
deleted file mode 100644
index dffd2a5cc5d3..000000000000
--- a/media-fonts/hermit/hermit-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
-HOMEPAGE="https://pcaro.es/p/hermit/"
-SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/hermit/hermit-1.21.ebuild b/media-fonts/hermit/hermit-1.21.ebuild
index dffd2a5cc5d3..449a4bb83c1c 100644
--- a/media-fonts/hermit/hermit-1.21.ebuild
+++ b/media-fonts/hermit/hermit-1.21.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+FONT_SUFFIX="otf"
 inherit font
 
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
+DESCRIPTION="Monospace font designed to be clear, pragmatic and very readable"
 HOMEPAGE="https://pcaro.es/p/hermit/"
 SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
 
@@ -13,5 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-S=${WORKDIR}
-FONT_SUFFIX="otf"
+S="${WORKDIR}"
diff --git a/media-fonts/inconsolata-lgc/Manifest b/media-fonts/inconsolata-lgc/Manifest
index d8188eccad9d..57de2e27ebf4 100644
--- a/media-fonts/inconsolata-lgc/Manifest
+++ b/media-fonts/inconsolata-lgc/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-lgc-1.3.0.tar.gz 274350 BLAKE2B d8864cb189a0c3019850a123bdd15b6fb9275059b3fef48edf0a6f53ae4a7304b1d1f2c10d1ecbac2c9e65913065dc9b68acd8530df38df6ed72575dec317cf7 SHA512 1958246e38f12b6f6675eb26ccdfa35d870e44a2e50e1263a7f0268e1e4af9fd2870a11dc8dd0da452f7c436b4a998782b5c80233803448684602e36c658163d
 EBUILD inconsolata-lgc-1.3.0.ebuild 511 BLAKE2B 01a12077f8edcbd69ad1652df57380965e304369617ba481ad07998923e3864c2eda039eab19ec5edc9866eb81a8bcc0b81149cf9eb750cae438787d492d9acf SHA512 c8f195e8870de64e6db7d0540bc4f4fca439cdf132af616f80ca4a85752a267901fbfeaba6ebec42d4e9d4a4e28ebe7282cf384ef0011fc678452cc8c618f0a6
-MISC metadata.xml 472 BLAKE2B dd3215a7a9a93a0497480773191dae3399407515a54e0bd58692fdc0db2d2b1c63d52afe677b53f399c5918552e25de96ef8d413598cef534d721fc94eff2b97 SHA512 0d72c22820f6fad11ce1841ffd3f511be9e8ade45392e15f97168ecdd073c9c6e56488d322472ba79f452cc7687ec089a320aadbb4cc487376d91116f3169985
+MISC metadata.xml 502 BLAKE2B 75009d2339078a1e3db3eb0436be24dbbef0a2f387cde6517a9065d4cde3b72a1d331ac5ec7438ca479dd7aa6e010606c60e490efb40d3d103ba537c3c46630c SHA512 2e4f7146817a21e2c6e9bfa9b20a5222b15e68efd082ebe1ea12fde2006739de83bc10c4729fe511d6737efc79aac0c40ddcd1f23336ea1fabca038434903f9f
diff --git a/media-fonts/inconsolata-lgc/metadata.xml b/media-fonts/inconsolata-lgc/metadata.xml
index 6614cda1761b..9f3a027ee99c 100644
--- a/media-fonts/inconsolata-lgc/metadata.xml
+++ b/media-fonts/inconsolata-lgc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitsunenokenja@protonmail.ch</email>
 		<name>Rob Levitsky</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 715061528af4..39b297adfc9e 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,5 +1,5 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
 DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
 EBUILD intlfonts-1.2.1-r1.ebuild 894 BLAKE2B 86c75a4b62ff840f20ffd376f2b164f004b1f175e79b42821975328cb840f8b52d9967fdaa0ca2ae6a650d971d78a3407d47c4392299d56cde09c10fb9221d85 SHA512 42116031b3ee138300b06f8a21bc86c5b11f9f19a1d954ed296cedfe9f1dd70c17b36caf15194dca758b922844c05536d92f630ba1f4afa5f328a17456cc2ab2
-EBUILD intlfonts-1.4.1.ebuild 744 BLAKE2B 6ef4a79f94724a0f2d3d58c3d500cdb3a38dd2b344d4832b2ecf3d6d06b996e39706040613eb27d8d2a48f85baaba3274f5fcbbde1b1b15a8c16b3bdf5627f92 SHA512 8a099df46dbe3916e95e571b90e0df317892af50373874328cfefb6d3d2f84af147864591b1d5630853c0f3fe33e0980032b33151c870984859aef02bd70bbde
+EBUILD intlfonts-1.4.1.ebuild 739 BLAKE2B 42e7df928aa7a0e9ca06b1633e497ed2af6f5f9364563bc1bc57d2c18220663549fefec56e3e515c413afb88520d09c9078295f0a92a9b485dc7b2134c92a653 SHA512 1f7887952afee7095c31147cc16b3288f88b5b3f8601d7be252d5ab67f08c202a779c759ef9eb26a3c092df2f71fd52b05d1c8c0af2bf223588e8ec37496b925
 MISC metadata.xml 370 BLAKE2B 7783e99cf31647a374b109157e9df67f528f61cb89d4f7936172a7e001b10e0cfe45a96aead40b4618a987af0f68f44b6cc7ff2536eefdf8ab737ca072daf06c SHA512 c41b35cb543c1756b194ffbcf0c14935ab70b588dbdd4b51615901c5c7244eee2566771b6b070ec13451c0dda638f20303a12f3eab39c17c5dad6a548d7ca83e
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 8cab818529f0..57905969451a 100644
--- a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain HPND GPL-3+-with-font-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="bdf"
 
 BDEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index 7d3664329352..d9e4b674e558 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -2,5 +2,5 @@ AUX 66-ja-ipafonts.conf 800 BLAKE2B fb6de7c153a0560fe601b112ffd2d53ea6b8e528213a
 DIST IPAfont00302.zip 20113208 BLAKE2B 25c6e483b08350347dd8ecceaa1ec04cd1e39d9aeaf988e9d4bfdd60614dbcb3b275ee07da1eb26699499b1e9ad661114cd0222fcb32ed183218b30024b212d4 SHA512 58dfbb6b7ae5114aed28588d05d48649a2f216011d7bd2798a62558f1f55c9b998ad510f7b7a0ab9d272f75bdc69de1110bd67205ac61d221b0ce8fd71583685
 DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
 EBUILD ja-ipafonts-003.02-r1.ebuild 660 BLAKE2B 4df69d689be4d2c9d4ff7d37109652ffea7a73468e94385eb3b09fc910d7d9b0ec7a43cecf42150d42fe3ba707e810f3c529aee9392a332a834b30b1186bec2d SHA512 5ecf88be5cebaed3b86f775b54e8264552c90984ad15747599e03180287037d430d0e4cd10dfc6eb47fda8f7751285048f73c02cc2cabc155c809e5a4e304d06
-EBUILD ja-ipafonts-003.03.ebuild 673 BLAKE2B 81712cf7f843c6c1339d8de6d6603e66596822af30c1c9370b830ab6ab36616bc21c9c6333d8f5bc41ee0e7d0b8326d2e049716eb6ccbe681354c1b847981556 SHA512 61864661309a90233483aa118c67a3a19e73b1d3eace5fb5d86249fae612c08e6a7d1a3c30221228f3ed19ada38bc627f6837ab67c5d426175c8af054f278312
+EBUILD ja-ipafonts-003.03.ebuild 646 BLAKE2B 422ce5c20bea3370620dd54d7b1157d1adb513564b87cffce0eeaececa60cf4e36385dafd91e8156075c16b1d1e67646ff3f09dd3479ca6d82ea60cdc44ed0f0 SHA512 3651ec5c51eebc95659f21dd202cf8f57da04479341b0db193cf3d783f264e6efd7a0f7cb25824c10ed672006a3ed4ecec2502656add0456785be0b3f9620f23
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 49d9a3d1c6f8..3d8379098fdc 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit font
+EAPI=7
 
+FONT_SUFFIX="ttf"
 MY_P="IPAfont${PV/.}"
+inherit font
 
 DESCRIPTION="TrueType fonts developed by Japanese Information-technology Promotion Agency"
 HOMEPAGE="http://ipafont.ipa.go.jp/"
 SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="IPAfont"
 SLOT="0"
@@ -17,12 +18,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
 IUSE=""
 RESTRICT="binchecks strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-arch/unzip"
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
 FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
 
 DOCS=( "Readme_${MY_P}.txt" )
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index e51d0c088973..29ed9c732052 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,3 +1,3 @@
 DIST jetbrains-mono-2.225.zip 2981614 BLAKE2B 5ac8dff566378da7e9ac23218cdd696be8ff612a7f9b4f87668400c0c0bfb3a1fcff2a2a813a1c7527e1a105125c493e80abe4daefdbcd837ef59492d7bb3e5b SHA512 ce72c2d2a2f769c6b8a9ad70e7e09b82cf66a0928534f18556238e36fec690737c89077f6521a67850bfb0dc79bb2260b5c86ae4134d76b2210755d5053ade0f
 EBUILD jetbrains-mono-2.225.ebuild 464 BLAKE2B 3d95970258e6dd8a05a4cc0a682c7d876dc68f78905d6baad2539666d44708803657d65178f344d092c91f8625c89e42b115eab127f0f16f1e0e52ddffb0fbbe SHA512 ad9097dafe28bcd4a08821df6ebbd5a05c6ba143625e988117c4ee7106cd0e389123a4c5ddff95c0d93b05f1b24113e0a8a41e4f587850add600cc422cbebf65
-MISC metadata.xml 446 BLAKE2B 616fbc05a7e6130dacb8ba06191f0cbced65910683bd67e581dbbce48fb7db68de84460a1a1a2b246c96436dc7347b3bb33c91a4dd46fad1aa52001d406bd33d SHA512 04d88a4c4d059801e7acf933d3217b3552dbaa99b08d1319e0593e5e3b6cc93eac491dd5fa17620ff30f3606f9a9ddcd27907fec564e361dfd184692f1e70dd1
+MISC metadata.xml 476 BLAKE2B 3e8b8232486e28e3cd56fee7ab7b55e3522380d81bc15af748962d1a9c8ec3beda3c3a33172090c666ab57dbce98644973259cacb163a16a53940db168b5141b SHA512 56a235caee2582b1181a0889b87299a6669fb6fb81e502ac976938745858404e173abbd091eab220959901bc18062aae938c7a55ba45aa7462f5750a458cd101
diff --git a/media-fonts/jetbrains-mono/metadata.xml b/media-fonts/jetbrains-mono/metadata.xml
index c4c2aa2c7ca1..a2936dec442f 100644
--- a/media-fonts/jetbrains-mono/metadata.xml
+++ b/media-fonts/jetbrains-mono/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index fb5e2191236e..460295f11bec 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,8 +1,8 @@
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
-DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
 DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
-DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
+DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3cd75923bd77dca5d42ae3fa4fbe7be9fea104779caadcccaf2608dc6423bddb3abd199defcaae3161ecd997268078b6781e SHA512 826c002008c2c753957ae4228d8e5dac5b1de995eb7cf392e9cbef9a23bb438ff56303bb9e8ee45a52fb9797e5685b89749f6a689413537f9cc7ee8067dea463
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
-EBUILD liberation-fonts-2.1.0.ebuild 1260 BLAKE2B 367ae5c4f14a5922f41a39ebdb112ce3491af4f9015ecfeda58c7f3c12ae61dbf05ee55c27d9b1d13899ef5af09ec5da2adfe80b6d8d0170113fdd4af1016d87 SHA512 be59c886826d09fe8d23ee90d1c2b31b3311cc90b68c8d4f9a1b65d9a68da5ef84509e7ebf3a6ae4f6695b929c2f3ad6c34495984f94c27b2b503fb61d189706
+DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1267 BLAKE2B f60735a91a98b46366b8b741e18e0602994c9630feee641309e8c8d4bd7100de07109d3b7b5ec0f84cbf18a767ef3e18c77d640c5931b2153c482275027fc1db SHA512 fe42c6bebcc1c3aa988cbb42c97802cbd5c8ca0ab8beb0fd9dd14a26e3598b907416434e54c1b3fa1d1090827096a341b63457bcb83123cf14b5c4968baf8f36
+EBUILD liberation-fonts-2.1.3.ebuild 1273 BLAKE2B 236d8dc19cedd23307e82b8b94f91b2ddbff471ab8f0a62295e2b425802e9f30f6f6bd7a2a2713e322c2861dddae42a9be6c0f05ed284e9f486b960db61d58ad SHA512 0636f745d6d454480e37aa9c0e85e2b2b874a374b8f8515662cb0b55f652a9bb81a88b4274abe9863ffca5a261356aa28f3bad977c24994f399f925077698e1a
 MISC metadata.xml 347 BLAKE2B d87f084f711672ea5d33cdae481ac57f5359a87daa9dc6b27267d227e85a935abbb7abbeec64f3610c2aa758d59c46ad4d62f5f3cf90480c0a385a270b099f9c SHA512 e6b5b7a4374456a468c2a42536858ad64ef12b0156623685370350895f4e0210210d9c5618dd1c581733e114b5b54ba5cbc11bc42f9274040418d3695988144a
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
deleted file mode 100644
index 1e17e3729cbd..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.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
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178407/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178448/${P}.tar.gz )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-BDEPEND="
-	fontforge? (
-		${PYTHON_DEPS}
-		media-gfx/fontforge
-		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
-	)"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if use fontforge ; then
-		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
-	fi
-}
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-		python-any-r1_pkg_setup
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
new file mode 100644
index 000000000000..50e68dfeca19
--- /dev/null
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit font python-any-r1
+
+DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
+HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
+SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/${P}.tar.gz )
+	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+SLOT="0"
+LICENSE="OFL-1.1"
+IUSE="fontforge X"
+
+FONT_SUFFIX="ttf"
+
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
+
+BDEPEND="
+	fontforge? (
+		${PYTHON_DEPS}
+		media-gfx/fontforge
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
+pkg_setup() {
+	if use fontforge; then
+		FONT_S="${S}/${PN}-ttf-${PV}"
+		python-any-r1_pkg_setup
+	else
+		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
+		S="${FONT_S}"
+	fi
+	font_pkg_setup
+}
diff --git a/media-fonts/libertine/Manifest b/media-fonts/libertine/Manifest
index 9bd5f456220d..afa6bdc1d608 100644
--- a/media-fonts/libertine/Manifest
+++ b/media-fonts/libertine/Manifest
@@ -1,5 +1,4 @@
 DIST LinLibertineOTF_5.3.0_2012_07_02.tgz 3001259 BLAKE2B b585611591674d2dbbc616a572afee7d89e3ba7244a3b19abee2e99937da1db8047739a79ada23f2d0ef5febe39970e08b907e347994996da922a5131a3669fe SHA512 a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7
 DIST LinLibertineTTF_5.3.0_2012_07_02.tgz 3673659 BLAKE2B 46107c8521a5cd680fa7b2ebc7dec969c0bf326f7598dfe850570771ec79b10cc472953be045a539a4fc414c1612f6865e1b6b86f390514ae14ed601854384c8 SHA512 ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273
-EBUILD libertine-5.3.0.20120702-r2.ebuild 729 BLAKE2B 6e81ba3cf6b06464cd3f8e14ac290af5fce8ad127413bcd58be2b2e47b981196731273026ba0b02222e86b7f5a3056c263f08caae842f439a2605bf658a62cb3 SHA512 acce326da070b0b061050070ce298147de580763f54d5e479a65f2d2ac597deabf779d5d55c55e8f67c981e3f6b6a53fa0a6d8c20ccdbc3d4630b291289adeaa
 EBUILD libertine-5.3.0.20120702-r3.ebuild 780 BLAKE2B 2d53ff3cc413520dc06df3750db98997e6c3ec3aa50efea050e71f14842ebc39dce8d82afaca74d5cdd4ef628885d82e3da5b91fcd32e9332d9219e873cc4230 SHA512 26c27c833ae19325c2216c01c1969dd3713ec0dcb08d0783bf7269bab50d6448e6939aa274b55b7f8eca98809bac4f7104e1686e1e7ba1c77ea4834ecd225387
 MISC metadata.xml 332 BLAKE2B 04e9e26384b60d2cd97873cd832ef6d71cff61e3c3465b3927de2d34b5473b6f921750be6f2c0eaa9b3e87ed7eea9a9388e3775713153617152bc75a8d323179 SHA512 494bd65f738485e4876e0309f61515f6b42a61d3ace6a403af533d268e80db72833387731656e6c14ed7faf73e2f06288f31c46c81eca174338d1f817cd2d961
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
deleted file mode 100644
index 44f9d6c23dd0..000000000000
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_DATE=$(get_version_component_range 4)
-MY_PV=$(get_version_component_range 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
-MY_P_OTF="LinLibertineOTF_${MY_PV}"
-
-DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
-SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz"
-
-LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<x11-libs/pango-1.20.4"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index b9b4ce138eaa..ea077784600c 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,4 +1,4 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1-r1.ebuild 528 BLAKE2B 20789105b21ef06ae5c09560337179327307494949e406353444e8412c97b859ee1e08961d28043ade8cce3928f744cc1b98b5bfeb3103b0d25a612b3340472d SHA512 75566dc942b38b3c91df6bedc689eb86c1b271690f9cf68fa5daa37a56dc4848f4ec72946476aa96ad87835a217660dff1d9a7f92d35ce6ec433cc0e8533655b
+EBUILD open-sans-1-r1.ebuild 526 BLAKE2B 2e6f3608cda93abd44ae64353c0912111aee98a3cc28b8b120fbc5370d7563511a8ecf8cbe1200783603dee3344dcce78549325d986a765bb08041594c41ede4 SHA512 f32d4673bea4087d7b9070ebadccdf975824c5a256e7be288fc7971ceb1a7d2a9ac6e16e7222701c6a753601eaa0e4ae0045352f2333a349fa5fd5f76852c7dd
 EBUILD open-sans-1.ebuild 469 BLAKE2B 2087672d2f82bffc5a84e2616764b7eaa57dee6d0e8523a65f7c59ca435e2388d1f786a38b6170efd3c79297e06365c886b09ca82022c4578f62cdf7d3d71086 SHA512 9ca685e72c3c926c0cd23e0a69a3eb8fb42269b106e7a4be3a8401f1dd4b997f1533f23c76c701deda9d28616e78f6a004bb9f13cd72804677f7c90ce681b60c
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index c4e5872d1e1c..925c27bcd92d 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index 53383881dc63..d6877f81032e 100644
--- a/media-fonts/opendesktop-fonts/Manifest
+++ b/media-fonts/opendesktop-fonts/Manifest
@@ -1,5 +1,5 @@
 AUX opendesktop-fonts-1.4.2-multivalue.patch 5022 BLAKE2B 71ab1c289670854ed2c9649dfd338b04dfa21c4fdb9344d58f245c1bd1825765fb9ea41025b5ec31475e032362149e3f5692af665a889a4b31a2a27e011adc8a SHA512 487053638d9fab66151a0dc15b8b721388c16812ec1fc1402c43ec2efdc2cbc2a8100a412d62f7cfd90afc8f5a5385a4a96a8eefbe9a0c8a9a3446f44ced9f61
 DIST opendesktop-fonts-1.4.2.tar.gz 22246044 BLAKE2B c00a55793278f900408b2958ed932e5a7cd4d7d1a7f01895ab13516f551cb0791bd1360a0978297a73ab3c57e2fa4f9f6fc5ac633296bda8f6125f0c0da432fe SHA512 09a5d8a8357f88716c68eb70ca1464c069645aeffe3aeef72a195f1e22e3baf260f655cddf7a8d8d2542c6a7420b61206b11d887af162277da84899a67662b50
-EBUILD opendesktop-fonts-1.4.2-r1.ebuild 695 BLAKE2B 95b5d154aee23863cfc3f3177955ab368538427fc0b6644aed87b7f28a719c3a459463c933d3663e584f64d7c8373a07320782697c24aa4ea29c76dadc3a546c SHA512 91e646a25bec73ae7aa891e890c13adfaf6a8f3adf49a3409e6f16b7680e746934e2043ab91ecc8d894fb0d88cec44ca2de6f3d37010f96936575e2998d64e6c
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 675 BLAKE2B fb020d177b8f1372ba9bee8098becbd7e9cb813b2dd779f4e5a046f1e547c6e568c5706a9908de86e076148c43ce6f9292767678ad2320bfcaff3e68e03bc91c SHA512 62073fc5394107a9762e61008a4d0263a7f439ca92410fdb460b5c9ba00b48d4cb86abbb4e7193c603be2629e5f9b1a492ff09e7ab591d450ca50f5a9ee60320
 EBUILD opendesktop-fonts-1.4.2.ebuild 622 BLAKE2B 984fe74ff9435c8bd93ba7aaec9ac27d1342821132160d8d90736fc0f32b91f8b502fcf07459d98949ea6a4cdb78a63460477d61cde2053aaf4a97957ef0e99a SHA512 557e43bfdc73594ee64d22f0f08285ee665644bf2d396a8cd402818982454a35b8fd1ccf09a3fd7ac492306a68549f35e2cd7e3d26335bb03accbfe0d57ae1e7
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index 235577e63fa4..c1f73d605bbd 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
+FONT_SUFFIX="ttf ttc"
 inherit font
 
 DESCRIPTION="Chinese TrueType Fonts"
@@ -12,16 +13,16 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 
-FONT_SUFFIX="ttf ttc"
-FONT_S="${S}"
 FONT_CONF=(
 	"69-odofonts.conf"
 	"80-odofonts-original.conf"
 	"80-odofonts-simulate-MS-simplified-chinese.conf"
 	"80-odofonts-simulate-MS-triditional-chinese.conf"
 )
-DOCS="AUTHORS Changelog*"
-PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )
+
+DOCS=( AUTHORS Changelog Changelog.zh_TW )
+
+PATCHES=( "${FILESDIR}"/${P}-multivalue.patch )
diff --git a/media-fonts/polarsys-b612-fonts/Manifest b/media-fonts/polarsys-b612-fonts/Manifest
index 55a082530c8c..5f6c557aeb28 100644
--- a/media-fonts/polarsys-b612-fonts/Manifest
+++ b/media-fonts/polarsys-b612-fonts/Manifest
@@ -2,4 +2,4 @@ DIST polarsys-b612-fonts-1.003.tar.bz2 2823506 BLAKE2B 31c918285f6072d6cc8bd44c2
 DIST polarsys-b612-fonts-1.008.tar.gz 5178817 BLAKE2B 3675c57002bb66da32f1ab0d1b2c487a11a12cca4098b9c3943b20a11bd4f49b8ca7c82b063a53b66bd99ee33f5167b46e9576c2383ed05ff3f4e8868ebdd58b SHA512 977b7bc6f1a41243cce381ddd0a5db2853df21a738ddc86debfc13954653fbfcffaf1c869b6287ea20482cc10ad479934bf6b70edc1e14dc656a22b1b64c64f3
 EBUILD polarsys-b612-fonts-1.003-r1.ebuild 528 BLAKE2B 91c9de4e91c41a31fe6d9b73a7cd3b71d83f9cb133d447075cce6b88df2525e42d2959cef1870fb239f42a89fb0116d74077421e1f0f3e81bfe4f764b1ba7333 SHA512 3b5bf7efeb73bed85090615a695736d6ec14e78a62d9700f60bde51d988345fd9e58f4b6ecc925713c3c98e73ac0823889e11a8f61a034fc7d25a4f4a9aa46ed
 EBUILD polarsys-b612-fonts-1.008-r1.ebuild 496 BLAKE2B 18d899819800de3e262a8e10592e552f4592d2ba761dacb06a259819a2a5638ca5236601efdf419dc40b5076faa135b9a05e57a8527557e0fa8011dd4b3ba308 SHA512 d74bb32c60a910b3e1998bf2d854c9f969a2da1c1252623a3b2163a1944f78d9439f4f2e271f71de6f8ad6b9e5657fe3ca22192e875abd83bc79426ee0f23598
-MISC metadata.xml 547 BLAKE2B 8f7833eed4fe368c250fcf32a0abc4993c4a5966ffe1085ac2826a3c0924eb126aae96914f2235993a2d47d878e10fc34a3aa42e9dccf1cd3cbe5275a13831fc SHA512 6da5fd376c417a7a0d995c7259d11369ee93715f35b298f0e00c412fe9d1b8a1e34beb2a7929ea38380646bdef11282b82777bb2729a2ddc4022120b19f5a697
+MISC metadata.xml 577 BLAKE2B 3c1b69173c1cf8e2089ca685bf63b377c069d6e66882f9dfd38bf8e4d5291558db2360ed4e75be1f89105d596a19a521e075c5898058d864bc2c59edb0170732 SHA512 85669f96e7f01e8bcaa629d6c639eb21a98917f9d41acec9fa4460e2fdf76b0ba267b3498d8f29f25ed467cd37836a6c385fd41a49ed368eeafca53589ed2f36
diff --git a/media-fonts/polarsys-b612-fonts/metadata.xml b/media-fonts/polarsys-b612-fonts/metadata.xml
index 8503115f591d..b5e6c15c7202 100644
--- a/media-fonts/polarsys-b612-fonts/metadata.xml
+++ b/media-fonts/polarsys-b612-fonts/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/powerline-symbols/Manifest b/media-fonts/powerline-symbols/Manifest
index 0049f04e76d8..113156b71eed 100644
--- a/media-fonts/powerline-symbols/Manifest
+++ b/media-fonts/powerline-symbols/Manifest
@@ -1,5 +1,3 @@
-DIST powerline-symbols-20150224.tar.xz 3972 BLAKE2B 94ce0e0f8ccd8e8be451c1e85f7b0ecc06a1b9d4513e40e7b80e0ef584109de96922d9211f2adf04fcc3c87ca9e450d5d2764787c762c19bd78c67fdded11f3e SHA512 85a4edefa692a7e28fd91c8d34c33b70424bee105f807aa1dcc182f64df3a66a29dd400892313b0d8ead59f9883e14f47c1a1afbf18af317b93f6aefb977c031
 DIST powerline-symbols-20170508.tar.xz 4028 BLAKE2B f0ad0360fb1bfe2c160c531a8ce473bdc746800c4540e56c8a1c27500883922c67354d9d7d8478a9111d56bace51a730ac9683e6e21be112df7d0df288f7cf0b SHA512 6908cb029b28002021530ea330c9ce5626f6bc5ed2336750cd2678f4b314d043289e29ebea61003836bb0cbca9bbb91a1b748f1cf24e4f07932eaf18bf28eac5
-EBUILD powerline-symbols-20150224.ebuild 558 BLAKE2B 2d051a37677de615eacc8bbe30b5166da76aafe02d0758d3683e9f45ee77d1a8766a28f8f882541f7638022db8055abdee0ed898927c0fc7e8c818db19341947 SHA512 5c408455c2bd1acb025c7809dda9fd0fd7a955a959799435b323ab18e0e06506f0db6164a20d5d5621dd0875c5cfc3ca4241db2de6d10d6870a9bc6fd26e54c8
-EBUILD powerline-symbols-20170508.ebuild 558 BLAKE2B d931c17ed6a7791ff7f4092030ffab4d45350b4ee5764b9410f048f6e563b08af8bd0b59da4a2bf0453212f21876e5f635441d1e0a033b59be4a241760ff99fc SHA512 1488e56a0733eb878c8338445a26ebf8380c2a30d9a845773cfa636042a66870942e0764412052b49ea4156f062a790e4499468569c040bc6d0e3dfcb472ea6b
+EBUILD powerline-symbols-20170508.ebuild 553 BLAKE2B 1ad83faa16376e69dc6842b17505e2594ca83c43947e7b9c193b584c0b4e4c4865a5529e43734c82915da6f7ef594e7c08d0322bfcc5a17c851601fe776dabef SHA512 8397f7eb1b103223851786f331832ca6106529955f6eceb52bf8963768e7c0dc0ca8b30ee51c3c6689966142cead39c313edb3b0071a0233a43cb80de19457f2
 MISC metadata.xml 332 BLAKE2B cbe33e2b2c8498b788b64ed38c2cebfea9e82813cb2c45771e5df4ba1d8040ff238900f3eb95e3de2011773f647904d114e293446030f51378e643b1d6a04d80 SHA512 628ae420eba99a6cb254b362d6477deec328910ada7d5dfc1aba9c3d3001e46b2e39acf2aff3dbbed4418504147a19de5974619922ed6734b5f092e177f114f5
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
deleted file mode 100644
index f03cb115598e..000000000000
--- a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
-HOMEPAGE="https://github.com/powerline/powerline"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-# We're redistributing just the (unversioned) font from the upstream repo here
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index edcc228cf761..e48ce54b5a1d 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index 9f5e0e786a0e..a9138a964fa5 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -1,13 +1,7 @@
-DIST quivira-4.0-Combining.pdf 311026 BLAKE2B 98544081c6effef9ac7cc535507fda6af8dc9d72ac4653faeba3e578387596a9dfeda3944b42be354861dfef4c68288768e609351cc1c86d677fac94118af5cf SHA512 f904b8587623782093db25d2a069e32ba671f6f1a60ea3b8c8374ede3f48ab0daaa2e0cdff5acc72e97422c00c4f7286a2fe9503960d666429073379282aab9c
-DIST quivira-4.0-PUA.pdf 354040 BLAKE2B 9710d626ee104eed3758702b3c1b668f22ced8e38d822a6e084f71da15e455b06ac31b4b3557a2a1a8cdf404195ccd315f3a78bf3f9be489aae294152cbaa289 SHA512 a07a41e1e0027a03f7f1f4e81ddfb50b09a8dfad4f1342a32aab71505e6ce9ef2a7a8733145887651b20dd472c58b4167faa34945f8ca61bc4e016859a65cbba
-DIST quivira-4.0-Testpage.pdf 822289 BLAKE2B 9515a8dff0178638566af96b23af533b11cdde5a5399d0ad599bf1d86b0aa9d8f8fb11ea01f4c05bb15136b3f924606e9bed57e2dd3e5a11d05f8a0441cd6a0f SHA512 8ed238c9aa03544308dcd471eb6145aa81423a6877a2a5e6d1022277545317568ba642871eb2f3c03c38a9d3030e3f94d8c30469b6c331eaed553b81db154585
-DIST quivira-4.0.otf 1475236 BLAKE2B a42490f1ae75912b217993615b5bb3904c2a96200dde4c5d209a3dd6e25232ab74b2dd38e89f8025f8400620f69ebd7b9fb845fa46a94f198cfb47cbef3d66f3 SHA512 2887152660a8908947c1baa83025c408ac11139067278bce6c8a789d846cf764b9a464dc678ee6acc2b555c9f0d40be3464ac102a97fac8aa9bc04acf926f1b6
-DIST quivira-4.0.pdf 3877062 BLAKE2B 5147d57277be608aea1e250df26fddb5c6e3b9bf201c47d1ef23cde50d8b8d68b59d7a2362dffbfa6aeae4d95adc7616a69d8688fc87f11d8513b74673ddfd5b SHA512 38469819d0b8e062ac2b4f35ef5d8be300ea36645ffc7841428015191d129e1239ec0dff1605cfa0af76fd32ee1e590ed4a146117408afaa9a826328115db4a7
 DIST quivira-4.1-Combining.pdf 152768 BLAKE2B 4b0bd89ca5077d57c6643036343b79a460c9215a70cb4a11642a7275c0d2304b0893dfb3aa6abe2dcf8fcd18abe1d508b0ca371c81132b020128cbf53e890d9f SHA512 87bc7bdc5e0c4584c70d65268305d1e6fbc11ba53dea37f958175140934e90d224d9d6764d693f5a5b8dbe888b547dd862f73b6f99381294ea9fd9be079d716d
 DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06756277f8eb266b1d2fccd36f148c549d24d30752b64112bdebf9bf0ff6419e0013e46d3b1f4cd6f68e19229d SHA512 9f235e0ff48fbf0d8ff024640a9cd0e408a648b0fba0fc37cda7aaf9b5c7c9bb106d5a0ac82381d1d960068da01e56dd255c883da48b3d3d9120f8b9ff451324
 DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
 DIST quivira-4.1.otf 1549016 BLAKE2B ec99585e4998c0411d4d5fb364d97ab479069549be475cb195b0b1512ac94c66ba5beeb7d07dc26cbe130ab44090f189e20d71a794334831808ddf58d05b63c1 SHA512 8f76c0e05aae7db9f4a155725f024dd019500bcb14fb1398182f897798128dd2ccf13840446382780b0c4873e6f8dc2d8a2e1c49e9bf17266b52248beb919c65
 DIST quivira-4.1.pdf 1632238 BLAKE2B 755dfd91812cc7c49875f9ccaadff9934dc5d7f86ce4cd2a1473d7c43aeb83f54dabf67985cbe14690ec4655b847c78bd9a92dc277520c63964ac548990f6a9e SHA512 7863b8c4aebbf9e1c8ef6033b6eacb9bceb9d52502ba90c87924809485c3071931a6f1382072bbe5ba1e39aa844d2e9551fefd746929040230ea6ae32b2ac748
-EBUILD quivira-4.0.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
-EBUILD quivira-4.1.ebuild 1186 BLAKE2B 2402c0c4d7489c6453f0239eec1fe729e5e829e18b0156d07a90f651df491d304e75e6148d977622f1028a16431ec9074af0c9815c162aa1c4b51be7fe54d0aa SHA512 3aa6517ca57e3db28de074907039bdd295b651612993d25b4191c0341f43b1504d67c3eaac20ad51fad780785808a08d3676ad8f5d6430a86cf54c94860804f4
+EBUILD quivira-4.1.ebuild 1196 BLAKE2B 09ab7f130f662b7fa71b5dc1bf847fafad24490f0c1c5b65f5277e8cb3e0ec14b31257a4cc0e2dc42b29c572dbafa493a4900653275b408a4ab6b45aab7b9994 SHA512 c83d66e1e7c9de36e0ffd9a18eb2dedfbfac48932dad03d0496a3482594b779c2f118a5df86c622717edc7aa2cec4ea3d0c8453214216757bcf4b1d87c45149a
 MISC metadata.xml 584 BLAKE2B 24a5dcc1462e9cd796888fffc048851540811d9e75cdf5b804832e4f29f9fe4cafbaed037872c251839182b9f48e56a9b2a655089f72d45583a44c708e50e47e SHA512 bc10043cd40ac32b7d4309fbec2d702ed02b56d8cd822ed324c39e925c66c3bd070f3472d605c0c28e6ab64f8c401e1f87ec7977142a29c98d4484a7c1010c7d
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
deleted file mode 100644
index edea0e21cfbc..000000000000
--- a/media-fonts/quivira/quivira-4.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=5
-
-MY_PN="${PN/q/Q}"
-
-inherit font
-
-DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
-HOMEPAGE="http://www.quivira-font.com/"
-SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
-	doc? ( http://www.quivira-font.com/files/${MY_PN}.pdf -> ${P}.pdf
-		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
-		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
-		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
-	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
-		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
-		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
-		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
-		cp "${DISTDIR}"/${P}-PUA.pdf "${S}"/${MY_PN}PUA.pdf || die
-	fi
-}
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 8ae94696b6bd..26c1d7afa8c2 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.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=5
+EAPI=7
 
+FONT_SUFFIX="otf"
 MY_PN="${PN/q/Q}"
-
 inherit font
 
 DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
@@ -14,19 +14,19 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
 		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
 		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
 
 S="${WORKDIR}"
-FONT_SUFFIX="otf"
 
 src_prepare() {
+	default
 	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
 	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
+		DOCS=( ${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf )
 		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
 		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
 		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 3f96ec72b7a8..0721874f3e31 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -7,5 +7,5 @@ DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3
 DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
 EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
-EBUILD source-han-sans-1.004.ebuild 1439 BLAKE2B 39a21713aee74e1af975a004c07dc97a441c055a17e10993b4244e743a3fb8d5112deedb5cfc2dbb1216c65cd9248fb4414f7221cc2d4a26185ef98ab5f33477 SHA512 3063b5a2771a947bd2f30773c4377680bfc94dab8d703ce9d63f076df0feb2976d2ec464ace8e8178235ebbe7ca2362eb2c9fa78204352f5a14bf472b72be064
+EBUILD source-han-sans-1.004.ebuild 1434 BLAKE2B 84adbfec84eefc96362021003db661cb903d63c980777401d2d03d3a405d135fcdf4a2685acb9ea934ae7d19d3899be216f6bbe48b3c0375eea08e332c928fda SHA512 18c7437e340cce1c456eb86bd007cc4423e6118d71c4162fcdb5dc6f009a6d57873875fca1ae0e7d7802df798b1ffcaa7a66832b3777bed6a68f453a1092aa79
 MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 44b627b242ae..462971468a8a 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index 1423dc1cd7ab..dba5fd889a02 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -1,14 +1,6 @@
 AUX 63-source-pro.conf 820 BLAKE2B 7a84b7f3aae165d17b9c0983846fe609efcf20e87c882f2a2b15de6ec437ef6bf3ad455489aec6e2d4550705114a10f303bd1f37931464bd52943b52bd6b01fc SHA512 507bdef3f29b29969e05417d1c2d82850d4d94575cbd270b679dd65b0f4f4c5516c6db2938982bc86a444e77167e48ebd45bbe6c87fa583668cb58a7bd6b37f4
-DIST source-code-pro-20141211.tar.gz 2329732 BLAKE2B a99ae99d29054de940ca17c2f2b993f175588a983a034fbba9750eda9ffd655fa1f8038526fa165e21390902f0161d4648147b31176bef38ffcfa5f6e00f46e0 SHA512 85ec3768d72a56f2cab6ddfde01cf5c32871ec376c710d0dc3f7ac72e7bdfe9810c507b7ec8486d2802a30775e4bb87245d2dc00ee4b837956f9cd54f33811f0
-DIST source-code-pro-20160608.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
 DIST source-code-pro-20170111.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
-DIST source-sans-pro-20141211.tar.gz 5503301 BLAKE2B 926750667a1a12cc36edadf6a2b07f55d408c2d0ceb25c26ecb7381a2da135e2f3add8aaf338b5eb94f83341db0981562034b95f0bfbd2692783704974f78f65 SHA512 9052a010e0635db84a3f09a3fa71a13db9c29c528b88f8a1f11d24f9a6f2be361d77fd902701e3fa674989034f01706cda1c600447c9f11db8c35c49c093d8e8
-DIST source-sans-pro-20160608.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
 DIST source-sans-pro-20170111.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
-DIST source-serif-pro-20141211.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
-DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
-EBUILD source-pro-20141211.ebuild 1252 BLAKE2B 2c40005ac4e80b34c9915084743bc34319f19467b838d5dc931021e1ff8e0be59fe3d5269a27df5b02a92141f76817e6c764e8e10de73fd05ae7d26510013a70 SHA512 cfbf1921737ae9e300086c8b5b10a7ebd97753916e0b7b844dc7882eaf98bc010b330a11c0e9faf0c52690a6852d40274a4820439abb839096a2fd24944f47b0
-EBUILD source-pro-20160608.ebuild 1303 BLAKE2B b12cd8d108ae7b8de8db1e593ba82eb7e5b418799bad9f6ffbe8a0cf70586a75305c655ae9145b8ff9f2ce97cb4fbd6de195ee1b82123c2929bccd9038606cf7 SHA512 c5065fb83a0e46ebd3d1dc61786a5349f5a6c81859167098020c539920f678be4bca96759885b8abb9edfd99d78ba887085d981603e38642cf171a26368c725b
 EBUILD source-pro-20170111.ebuild 1297 BLAKE2B f7a03099bcdc5d2dffbacbad00fafac6a228a15878bf9f5f03fa7c0d6c5f3e23c9ebfe144f4b5977ed08c2ee372617d87058421176b061ce79b74ac7d2b1ee80 SHA512 a6e998ad0bf11495bf3a8086c6bea76f0ce56ecde76df6d10550e8fabbf386818f516acc385d8f778e5fac674f54a779cd606b3c36d2334f5375f38e28078208
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
deleted file mode 100644
index 9169bb303bb6..000000000000
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-SANSV="2.010R-ro/1.065R-it"
-SERIFV="1.017R"
-CODEV="1.017R"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
-	https://adobe-fonts.github.io/source-serif-pro/
-	https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
-	font_src_install
-	for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV}; do
-		dohtml ${d}/*.html
-	done
-}
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
deleted file mode 100644
index d6fd64638e62..000000000000
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-SANSV="2.020R-ro/1.075R-it"
-SERIFV="1.017R"
-CODEV="2.030R-ro/1.050R-it"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
-	https://adobe-fonts.github.io/source-serif-pro/
-	https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
-	font_src_install
-	for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV/\//-}; do
-		newdoc ${d}/README.md README-${d}.md
-	done
-}
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index ba4f3c231d35..4c1040543a1b 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,3 @@
-DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
 DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
-EBUILD terminus-font-4.48-r2.ebuild 4050 BLAKE2B d99b80ccb89a8b19c10892bc0d4a07380d0025d91fee9cf4d5d70dffff198fd65031036e1a341295835bac0088074f41e1fa6969f02a33cfd3435b1783bb97f1 SHA512 24a6a5b6d802f31aba25eaa7b9d0b0f6905847e70d3cf73728d9d7fc7023b9fd43eb8e1dc13edfe87569f199532740ca4c9ec3b5eeee6e254b6c402a96863ff5
 EBUILD terminus-font-4.49.ebuild 2688 BLAKE2B f9e88bcf242d44a2a45fe87f57c87e4911f8ce458435bdd885ac0851d8771ce39c623acae61a0f98821df89634fdece9bbf3a6babd16590aaecff284555c450f SHA512 f04df99d5b13f877e485828c413b2ed02b11e46dd25585817180f616188e9059517fd5cac99d25b74227f09a0acfbf442463ea1fae9c79673cc81c2fe3bfbc70
 MISC metadata.xml 1787 BLAKE2B f83cf459e35bae521d4f6176c7d873cbde7413ca52241feaf442c818a9e1c30640cca1127788737da53eb659ab73913471d830f0234198880fca33aafe811678 SHA512 8dbb13ccb276600255a0188254098e78540f54b4ff5a481909c94e15519b1cbf58dd58f5f4c44adbd48252da22579fff8d1d4301eb798c466132ab820609affe
diff --git a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
deleted file mode 100644
index e66975cc3c1d..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit font python-any-r1
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${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
-	ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	${PYTHON_DEPS}
-	virtual/awk
-	otf? ( media-gfx/fontforge )
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS=( README README-BG AUTHORS CHANGES )
-
-REQUIRED_USE="X? ( pcf )"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
-	use center-tilde 	&& eapply "${S}"/alt/td1.diff
-	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
-	use ru-i     		&& eapply "${S}"/alt/ij1.diff
-	use ru-k     		&& eapply "${S}"/alt/ka2.diff
-	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
-	use ru-g     		&& eapply "${S}"/alt/ge2.diff
-	use quote    		&& eapply "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	local configure_args=(
-		--prefix="${EPREFIX}"/usr
-		--psfdir="${EPREFIX}"/usr/share/consolefonts
-		--x11dir="${EPREFIX}"/${FONTDIR}
-	)
-	# selfwritten configure script
-	./configure "${configure_args[@]}" || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-
-	# Follow https://bugs.gentoo.org/728308#c5
-	# build ".otf" (bitmap-only) fonts out of .bdf ones
-	#
-	# Important details (copying notes as-is):
-	#
-	# 0. Pango 1.44 now returns floating point ascent and
-	# descent, instead of integer. The functions were always returning float,
-	# all right... but so far, without a fractional part. Which makes problems
-	# too, for example in Scintilla based editors such as SciTE and Geany
-	# (there is a quick and dirty fix).
-	#
-	# 1. 'fonttosfnt' adds 0.5 to at least the logical (OpenType-scaled)
-	# character width, ascent and height. Haven't checked the physical (pixel)
-	# metrics yet. With some sizes/applications, the fonttosfnt converted
-	# fonts do indeed have extra wrong spacing, 1 pixel horizontal or
-	# vertical. It has other bugs too, but they don't seem important.
-	#
-	# 2. If you pack 2+ terminus sizes into a single .otb font file, KDE will
-	# (may? YMMV) use *only the first size*.
-	#
-	# 3. OTB has a single set of logical metrics. So, for example, the logical
-	# character width (which is relative to height) can never be correct for
-	# an .otb file including both 8x14 and 8x16.
-
-	if use otf; then
-		local source_bdf
-		for source_bdf in ter-u*n.bdf ter-u*b.bdf; do
-			set -- 	fontforge -lang=ff -c 'Open($1); ScaleToEm(1024); Generate($2)' \
-				"${source_bdf}" "${source_bdf%.bdf}.otb"
-			einfo "$@"
-			"$@" || die
-		done
-	fi
-
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# 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[@]}"
-
-	# 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
-
-	einstalldocs
-}
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index a7906d2665cd..7b71378e133f 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,5 +1,3 @@
-DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
 DIST tg2_501otf.zip 2559336 BLAKE2B 8a4872f1a694765e56ef6e41fab523ee80a9b69de255add3160068131a10f226cb237572b1184f6411afd49936606af6b6809f3a5aebd502122d062a4dc23f55 SHA512 a335e0bfaf16a157c290fcd40fcf8786e8677f14189a8b6fe56ff112f008aed198600248d8eb1334bbb689b9979996e013f61bf5bfa6f0549b6a910d03cb2929
-EBUILD tex-gyre-2.005.ebuild 496 BLAKE2B 49655b7b6b70367710e97497db163deed50573243db8bfd361e4d9544c675c2d95e0cacc7810a00878da4b56aa8aa988fad82a04a42b88c36ba95980d5eb9101 SHA512 d232d0a9e63bffdbc9e39ade1665c75888c622389fbfd192374caab1cf7f5da81df33858e01ad5573e8c57f37efb1456c8f1d6b25ef742ffdc715d3805147817
-EBUILD tex-gyre-2.501.ebuild 544 BLAKE2B 316ff7ff66650518e04ec26a33330528c6bd01b2f8871ecea464532dce1188eba37c98656af5532605a43e36409b268b33238f28562ae5dc43044171b2834310 SHA512 7a6644461f3ef64d6c5f1e1cd03777de4e3805a6587c800806e22e5f212e0d8febd69d666156c5e46b1299891b72d1fa3ac9dd544b13b7084cf4972d1b600d3a
+EBUILD tex-gyre-2.501.ebuild 541 BLAKE2B d6c66c6a4c5e25d38a3b1b9e5d757b45650f853714e34d4db8fbe3cd6355757f506d33909910418c91f342fc24d9edcb9561e2414feb2490ba47c616a8313a31 SHA512 b305e8d2c0142ce99bcb75168dbcc00ef9b5e6670bb0304e0729942e58a00b20f12e97a06930ca100482f27239a3b4072613a973fe59a961e9e33245cabff721
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
deleted file mode 100644
index 2e47c60fea52..000000000000
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Extensive remake of freely available URW fonts"
-HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
-SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${PV}otf.zip"
-
-LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
index ad498a6c96f6..7d0f6ccdc7c7 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
 
 LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index c8dcc58084da..3cbc433b5312 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST umeplus-fonts-20160402.tar.xz 1763132 BLAKE2B 3e1406085d8dd1f62f69455efd53e0a51281d9a2a7220ef21a588d551fbd9c078110cbbc3e35ddd16cb9d31ee29d418c128b92fb4a5f980be654d57447d60157 SHA512 36a2ab6f2919e3e4ec99662a296f56dc765fc55ca1de3ea7329030312c88cd16c589ef2a945f4b52509d52b029cef749371d3dd4c1aebceb5c0811d5b7313658
 EBUILD umeplus-fonts-20160402.ebuild 458 BLAKE2B 89cb39bbfcbf7723ccc27671d101ee9e8cae22d52f53c7642ed0a00d27a08f88f496c147e02b3b9e2b731232818e1219ecb13aad5b691b71c1f06e7af77fdc46 SHA512 3d5b1f238a504d1a57e7a7ac7dcf1ff14ac86f37fc4f424bbd4184e006d98947a32d2003122563382dfad37e16a7d779aab1cf4e415a56df61d46913ab6075db
-MISC metadata.xml 462 BLAKE2B 793b6fc2171ca5b21ffec9ba0e1cc1db18a3a2f1aed87f6d6289dfb169ad134099a91d130f695318517a2b57bd787901d9337218759a18f08a4749574b01a382 SHA512 8ed1e9ce4072aff8eb29a156521a6076dce96f61eb36b0bbf09d9d6fbdef433049fef2326de34406fdcb79876c71d40a874cfcae0ddf8fa842caff0288a2f12d
+MISC metadata.xml 462 BLAKE2B f35780d07febaa7013c19dca08640407b0dc1594b24698ac4ca18e5f5aa6c4961c4fa9c456d72d36724c5739357bb37664470aefffce89ac640b1d9eb18483a7 SHA512 0e97c1316aeae497618d0dc919febc7ce9c9fbf35dc204179db31be3a62e7746db036f335249a5946562a61acc79086ef401ae2804383ad6d3a5eab0fc35fdb8
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index aec3c8272b24..461d81f58ce2 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 182669cae4c8..f16c55e2d910 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aaphoto/Manifest b/media-gfx/aaphoto/Manifest
index ece575aa15c5..ba58289d0bce 100644
--- a/media-gfx/aaphoto/Manifest
+++ b/media-gfx/aaphoto/Manifest
@@ -1,3 +1,3 @@
 DIST aaphoto_sources_0.45.tar.gz 134057 BLAKE2B 95a55a1f612a9e30967083ad5d59c6be0f815e2dfc55531660ae20eef9bfe7411aa2c852d0b016e04506ba4956b65674efe3797a66831c39a473ea49c8e8ecbe SHA512 203343a51a64a0422f4af2f80523bb7cb90aa04c10b64bd3aa3091460cf5de1bb86d677c564809813703a2c65f15736bc8d4e3c9273b3f3a72ca7c89f3311599
 EBUILD aaphoto-0.45.ebuild 771 BLAKE2B 1b339448bdc243a51cb2f80e119cd8db9f2b5753e9bb749d7ccbeb4b1e388164bd15c4690a93ee92d7100223d89c2fc8a93f1a01ab6dfaf1e0e69a46a2952699 SHA512 a0101bc5546fdef9720fbdf046afb37ed527a055ecc4579d94c0c7475d734714dcf5ad28be9227e4c7d2a930280c8e3a2afbbc40ef9f06be3c732b70a0490235
-MISC metadata.xml 442 BLAKE2B 99ddebd8a8796f5939503bbc98e678dc24106ab658846bbb598dae2fb5db2d7f4c8e53167441c97c4974a9bdac755b466f7129cc814237b206fb727f17b34312 SHA512 1eace312288be3ac4aef3dea8cff7c119a61c9f97ef8ea7de3b2fd6afada044a2ee3f6a189164333c4eec7cffab87eb869dd004ba7cceb82fb8aa87559b3d8fe
+MISC metadata.xml 472 BLAKE2B e125bdd1cfeaeecd9326993e2721d69c0f73226edd4e1b1a90579e1443e0e548a2675657b864f18e741b879734451b7cc21cb6e268b77e3a59e35759abdfa1d3 SHA512 9e7bc56c43f66289d7928bd8211a1d27413e00178ece3b0f1bee4255fa336cb1cd5b1215bd448d455363580dc461ad0710c7ffb32792e620baff7cc8bea442bb
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index 63c0cc7c9a30..7b748a28a767 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 6c2acdb8b370..9f15d0f4c0e3 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,4 @@
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
 EBUILD alembic-1.7.16.ebuild 1252 BLAKE2B e05bd0776543434d0375db0574660f939b9e8a30da1066b4399775554dadce0e9cfe06abc571357c373bb3176b6d07dd8d0566ab2558fc9456686e7e678fbf58 SHA512 4c24d13e574f8ff4572e61bf6de62eccdf07a3cfa7f5887b18a170c55fde542a9dac3dea9bdab733ca0ddd1f53961e971c18a2d4e52e5ed30c7f5472b6597c0a
-MISC metadata.xml 865 BLAKE2B a70a3ad887cc4a8247ac1c275c6a3dfd8db13371473c7f5548d629983ac521b53df0fb0fccebeb6505ef424f5c6080682552bbf825b8b2457731e91ad223b5ed SHA512 be0126102a7a6321349b5a680ba600dbef3f8bd757fcf35518672c39525633c3862bf4d795dddbf5d2ffbbc4ae639e20162656a482e916a808ff5af970e7aaaa
+MISC metadata.xml 895 BLAKE2B 4529e89d7ecc7b70e768104a6200fffbbcb42786f15c963aba54a3697d78cfe7006d7d2e7063a1efe2958ac651c5c2175b1aae2e2c3f6cb29c7eaba7de9d6b1c SHA512 5677c55df82cabd36468d0dc458dda3684304168bbe5eb9d229bba98e58e17e4f24db12ae56a8844f4dce87fe38bf42159d73e96c3e62a96f77f3ead15db851d
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index cbe5fd8cc576..3c7f24c84661 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index fe3caa775187..14d2498164ae 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -10,4 +10,4 @@ EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1
 EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7
 EBUILD blender-2.91.0.ebuild 9056 BLAKE2B 8d797eebeba043fe2b1d8d74b6d5aa7ef8483efc9b9ea748766d95ddb89e805daa129b2c0515945b4ee89648119812bd2b7dec4a86398c905d2f085ddcbed8f8 SHA512 84ff05f097fdeaa37c795ac11aaf01ecca1063f126b08ada97063a15f5de1f14e9823dc6431c94a4497e09eab7b2932fcdbf661f0a1866fac2fafd24a8a0bd83
 EBUILD blender-2.91.2.ebuild 9062 BLAKE2B bd6a1673c0530c363808b102b53cc66266cdfba9d35897ecf1e2a43368f3428d3244cfa12c6f8006d8a59c1b7bed03b138fee29f2c7ca8da8278ff3651a18b5f SHA512 53e707329532bb29acd6436a1096f7dc65d9315cdd562c78fb05da171eedb087e09a8cc4c92849de30a9b834cd4b2393f1271789dc6bae2c8bc49e851268fca7
-MISC metadata.xml 2733 BLAKE2B bd7234217670288e926c4c71dac113fe478dbaf3f13a5e75ba1147a72b636baa8a7f6ccaaac6cc40e5710342dba4d49e35af8e0ebc439528cf3335cbf7f2560a SHA512 c955e7ffacb639e9bc5d5582bce129bc282f3838a113a5ead9ee2db13448b608b38e77c112036bcb57932302da15a537e2d1f9f82a8393444113340fdb7c8e51
+MISC metadata.xml 2763 BLAKE2B 233d1caced71f79aef161db337bc02ce80089d9eff96a0dff058660a01557dd91877d1a99e10ce20bd1a2637cee4cd43fb3f87868d2fb20aff751830b8d1bfef SHA512 13e4a08f83744aec7de708f0c4d1c8f9c7b96823ec5ab14600e16bef48fa682b565605d52701d1ca60b07329653e42da6b5a42fea0e13e68c4af707fe9390527
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 18a7b03a8de1..6fc1b5f9fa50 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index fe04006e9428..1974d3ce5b7a 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
 DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
 EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
-EBUILD chafa-1.6.0.ebuild 767 BLAKE2B eb2c4aa4a41b02c12696ef877208c45c338e3b4c9076cb0dade84e0a04cab6c1f1bbabd67d825e546b911ffc657ccd1794144012abb3ab74871a7276804e8c2f SHA512 57b78dbd02a6b49a757cff05e869f8526b07412a837e6056a86b35cb99ec2084ca5711126d9b970ee83c5c04e99403de5c21bcf1eeb17a915318dd87397a95e6
-MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
+EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
+MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
index 2c7e6798a528..9f4b4afc62fb 100644
--- a/media-gfx/chafa/chafa-1.6.0.ebuild
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 715490a53a10..6a8df65e8958 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 7afd3a85a493..81bbe345b220 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -2,4 +2,4 @@ DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47
 DIST cropgui-0.5.tar.gz 853934 BLAKE2B ac7cf32495e3ac728223994f79252fd98a0a5cf7da79a9c6796ce3d7b213c797b16250be5d23a1bc6bed492f142a95411d6cbd42fe34242016c4e0181bfd90c4 SHA512 2babea9ea6089c74637c9023ea08c2ae4f666fbf44bb73d7a301de6fee6848e65a86fab312e765f7bd05e8e03bf3e92942d718ea84a950412385a8e0b6aa0630
 EBUILD cropgui-0.4.1.ebuild 1096 BLAKE2B 2005691ab239e023ca2a4d864744f9bae1348e3c7d6fe43925359fd119a53ea5562e3daade2c9d929296c7b61cd6e46a8ed978d8defd1c928e568ac36e8e6eea SHA512 59a123bd2e8d6c69bbf8aaf3f4f1cbe67de5834dda7439f76a3ca31da46048aaf5e78c32c3b438400fc128bfa42a295b10f468e507349c7f2cae66c6a9b0df9d
 EBUILD cropgui-0.5.ebuild 1098 BLAKE2B 3318e877827c04f942ce5963567524659b6db686d7f27be34f7a9da79af855213aa065d42f1741a769a42cb027a7019197eb42da18b0c1253a7bf633d5246de0 SHA512 89c2284f236870bfcfa46e1b2842cc9b4fa56447e318fdbab67c7160ce6146668d74ef7431d621969523b905345e63f68faf6bab38f61d7ce38be12b414e7e89
-MISC metadata.xml 322 BLAKE2B 90aa45b1eb0991ece5ae99458d976775a725221c0a472dc7f7667ad8b72c322f549aa33099669d5122807d5965348950edfd2c0bfa811435d11149e4577a230c SHA512 05b261ca819100fadde1548385d1632b157bfe6ddf1c7a876703f51d04a8aaa68f2d0aa18b188878c07fa27ed54cd65ec5ec4c4c042788fbbb525271ccda07e3
+MISC metadata.xml 322 BLAKE2B 41e38e0e03bc0006be2c8f4218b27e8345ddf0bd634c36cff282d8c6156978007be555a64a867fb6c5fa99f9f95e7cc92981cdd456aadb8e3b478ab91f796818 SHA512 c94b0036ea0f2844fd78173a55c788208bb84229990a4c5f55ab0eadea54ad5ac7889543b380b2586bae4f2af5505e282ae60ebb6586641ca01519f79f4aba69
diff --git a/media-gfx/cropgui/metadata.xml b/media-gfx/cropgui/metadata.xml
index 27aa4f80ba4c..204c8fb5b8d5 100644
--- a/media-gfx/cropgui/metadata.xml
+++ b/media-gfx/cropgui/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index ad6f49aee482..c3d161830065 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,3 @@
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
 EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe
-MISC metadata.xml 1038 BLAKE2B 888ad9975a914f5af17e3e43582eb8b2d2cd032cd157fd043271c2c17d098d24a8d8390a70c05587b180a3ff973c854f073fea60f2edfc8c89ffea40c914decb SHA512 100ef5e05d7585bbaaea67d0e91026dfad180d4d007dc4b833dd995cc1726706d53b7b67aa6576a91a7924be9280eec706221556cdcff1176c839c81423d09cc
+MISC metadata.xml 1082 BLAKE2B afade1233826e2557117dbeb80c2ade8e4f7541597d5bc071acf564d3dbd399206143346e520bba58f6ec17afe2f1c706a89372034d7ca2adabc2e7b3adb83aa SHA512 eeb78698a502dff0913b523dd6d2bd9bdb2ba3bd5eadef5b060de9a2d3323a35b9e7ee710744ec0dd141819c08be75df0b0f598b61f14c04575cc47c1d254026
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 615b4b60345e..40586c7e4f41 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index c6fa039d313c..b049d183c4f5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,3 +1,3 @@
 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
 EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604
-MISC metadata.xml 1536 BLAKE2B c2dc9d4c9e4027fac86acdeed68d620bcb97c5d5e458c2e11b03ac78cb1f7dcf7946d8ba3b84a071b8bb6f5fbcfac4e736ac25dd73f63d28e7f13abe9e3a6597 SHA512 b47c97c4ab56a5274f0308d7e4e168cd426f2c2c801a156e0eb8b5a12ed06f4b33fe7eedfd7f8c7f9e0c377be40655fc30b0dcb98f4ddebc4ecedabb47aafb74
+MISC metadata.xml 1580 BLAKE2B 4d90722e13b98fb9bace7319edfabb1e1d6257052247b6f449f990b64e2d67db1255de37d9a325a0b69175654fc8726505ace4c2101aa686032b6d0d430e81a4 SHA512 00cc2ff186f099513736c535c8731e21f945a82d2762d2a79a0950e9a96aa2bed57a0ed9de3866dadcab2f1ad25f0e8a8400059e744f104d2bb9a02af34ec27e
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 9bb6b008a456..c4a0df226df9 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest
index 1da8e94491ae..a9fb45d90c7a 100644
--- a/media-gfx/dmtx-utils/Manifest
+++ b/media-gfx/dmtx-utils/Manifest
@@ -2,4 +2,4 @@ DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2
 DIST dmtx-utils-0.7.6.tar.gz 54888 BLAKE2B 721d67f85e73d245595d189acf1f974b518b079d02b7c57fa786b15ed075bd08219a2720b5152341449d517eb93e238274b440388557a64056de6cf6db9fc392 SHA512 201f8f5bbe5a1edd23104883d03e09842252ad7d07dd416b67c11740275ebe32c26b7fde904fad8bf2b18f1b3f574dedde1cc85f0e987f93d293d030e4f8a79e
 EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820
 EBUILD dmtx-utils-0.7.6.ebuild 588 BLAKE2B 0c2de7fe60aacd6af505a21a55e0fb7aa6766c04a0cc8d89af73a440d2478b93ee3b7919a442dbd29be5f0e0e2d32f85ebf01813f729b11143c0489b7e4a0630 SHA512 1a98592502070d1f3e4f808f47a2abcaab8fa1b1f235c2451f7b11f224d65ebb7169628067755963d734c0f30fcbe34ee819383f9ad7a05c411a579ad12141ae
-MISC metadata.xml 784 BLAKE2B 6d400f2933a256e39be8ef48286af7273c78d5ea67be927703c82471e0ad19720adc05dcc71e200cb0f373bec626690b38e4021a5d8f0f7509949001f84b87d4 SHA512 3ae4b194dffdc41978674a602861fabe327c9c9955583bb1ceda7910c4fb24563d2c5045c9f5e37a0d0b4f94951aa3b3c9dc7e5fec69a927f30cc180accabedf
+MISC metadata.xml 814 BLAKE2B f0fa37f0d673f117190e7009d52e4a7374cfda01db1f14f345231359c7c2413729e0e0b33409fe480aac2c0b9598c773051815547ae1b6e535576d572a10a9e8 SHA512 9a4f521b124852d9610d8a84862b1daaff3b5d8fe3f16a36ad048526b53430ccab3246d45cb2d3c2ec76ae1b0d78e73fe6dfde246d7fb9d82fbce53157e2206f
diff --git a/media-gfx/dmtx-utils/metadata.xml b/media-gfx/dmtx-utils/metadata.xml
index 3971294e52ef..b3e87979920e 100644
--- a/media-gfx/dmtx-utils/metadata.xml
+++ b/media-gfx/dmtx-utils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ahippo@yandex.ru</email>
         <name>Andrey Mazo</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 8429c8bd6468..55d3a93f21a7 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2116 BLAKE2B d7879884824581dd5f3d481b2a8760659986708ad802cb6841380ca55164fe63e9899c8fc8a774260a9f01646d3b9f971113b36583da59300feb92b363d19b82 SHA512 51840f63f8f56984d549051b88dde704f150d122f316cda1277900d4f18da8b1da45b0ed5bca4c9dfd7cf6ddc9efd5926b8e84dbf4e234971275db17bb4a555c
-MISC metadata.xml 251 BLAKE2B 278d9c0c00f53a3c9ce230c748c38f879e6e6ef6cd3a7e8979be3202bf047c790c94ed94875d24c1b4c2726a199ba50fd6a93b6f7b7d7cddbac47b6a9f261f83 SHA512 a8f496154037503d0368c14170261e70e348512612f133e3323a73c450e27af0cf266db2d2d76f61db30e1dcd979823b9ff730cb7ac43a28e24ccbf2c6768b07
+EBUILD engauge-10.6.ebuild 2115 BLAKE2B 5d48548a59aa3b9fa06ed4d02b31c719ef8d41af8632cfa5c081846b41f3a91fe9f7044118fbcbd20b5e6e23c1bc6af2757282f47effd89d3123b767894ca63a SHA512 b5754a3d46e86bb4dd4aee9dbffb08b166fae2af089d1630d0d34d9a2fd0a10c8ee2be6a4580fde792d05bf3efe2df0f81334da4c46b7fb70696bcc1a1055a5f
+MISC metadata.xml 343 BLAKE2B cf936a8340fd4266de9732db4288c7ef99b9f54d004da63e13e22dfe07b9a55124844760a46f7b4609c14cbd443e1575be2e2d705220197bda8b4eeb838c52b7 SHA512 ec67be582e6b1a4fb6d9aa401f265c25823f0c9be3671052f602dfbeafa1c2bb307139e47ead3736ddc58b453143246e6830da99d04fc2412802f649f83cfb1e
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index e1145ca2e153..57437e9947cc 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index fa3fced03f31..339348097beb 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">digitizer</remote-id>
   </upstream>
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index e0843179de12..5bee1378c560 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,9 @@
 DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
 DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
 DIST eog-3.38.1.tar.xz 3655616 BLAKE2B 1e0265dc798413e9b2588c36879a526069bc3d8788339e97470d8d0b738e01cd2fc00bc3db118721fd45a40e5829e225d9451d4cf868e0c9a7bfd74cdc90c06d SHA512 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
+DIST eog-3.38.2.tar.xz 3614956 BLAKE2B ab442006b2eca1550d072c57af989e748f130b07088e724ccf8e2d6e6b2cf132e06ff2ff89d9333f6fa3cd701c27cdb616dabf125f14dc5a4d1b92d14a85be56 SHA512 f9af91a76b85b8e1250f3ecf04cfc30ae35892282fe65c810358d27cc7e0aac3cafe50dcf815c54c6056c24eb1107d6f5ecf8131f78559095cda5024d255ebe6
 EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
 EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
 EBUILD eog-3.38.1.ebuild 1592 BLAKE2B 948a363a67e2e8996650fe2838cd5aa1d786159a9a7ab7cc6bcd087c98bec57926a99bd65b72fe52c88c1ad55a42e8e670ac823fc3f014aa17331dde8ab4f438 SHA512 e7e942076a528403b3b3419bd1f0855276cf5509bf30a5ad63d4f176a44bb58e15ab749f47ddbd865e9e80c4dd2b78c9e1e0f6e1e41316a3fb8cff7000081556
+EBUILD eog-3.38.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.38.2.ebuild b/media-gfx/eog/eog-3.38.2.ebuild
new file mode 100644
index 000000000000..e0fd2241d634
--- /dev/null
+++ b/media-gfx/eog/eog-3.38.2.ebuild
@@ -0,0 +1,71 @@
+# 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="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # Not packaged
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index d29099f1ef9f..830362417ec3 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,3 +1,3 @@
 DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
 EBUILD fdm-materials-4.8.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
-MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
+MISC metadata.xml 993 BLAKE2B 77d82ae5e13ff1d4de7936ea4c79348286208b7294a21e85e40254a0eb7268cf3fc042bfab96ed4356dd01735932fb17e27416140da74b51844fa2c689d7ca5e SHA512 b78c7d7de99992f28771a13d3d1f7addcaef1216ffaf235cc5d2f997bff917f0e788ed07e2a97acfb79a188af080e9c3debd6c2ef06d5f07d288ebc763a4a6d4
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
index f29b491fa4de..d9038453ff8e 100644
--- a/media-gfx/fdm-materials/metadata.xml
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index e0d59cb71df5..22376c33e137 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -2,4 +2,4 @@ AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 EBUILD flameshot-0.6.0.ebuild 1126 BLAKE2B dc0f3b785a508b06a24f6427c661f0cf3b4b3dd4cac145da7930336abcb717f66cbe2650fd40f8cba7e1b9d3c0af30cb70f5bdeab09848ec32a1d10d5a86d81d SHA512 307f2d58679069fa4047abf3b154499d30790a1b8a38757939dab11cce03e83218ffaecdd8f7e889ea1058740fbccf289a017b2bff5bf7894cbac5817cf99ab2
-MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
+MISC metadata.xml 396 BLAKE2B aa67921bf3b8f848824726187c8645c3d48e4a4b3e629ac32fea19e9764408871beddb474e10b9f8f106ff9caa9d0b0fbd87441f14275383c95c3062d47e071f SHA512 7b9df389d3add92f56cc7fcd95fd4986883860e088d678c20d9ca3d47c80faa45a2242bc74b8d54b54999279a8be1d7d04fac5f741db5876e45577c6df8413aa
diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
index 49f9e82790bb..b0d56d9d0268 100644
--- a/media-gfx/flameshot/metadata.xml
+++ b/media-gfx/flameshot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paul.kalug@gmail.com</email>
 		<name>Pavel Kalugin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index ae5a6846c67f..df8491dd9d05 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,7 +1,7 @@
+AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 797 BLAKE2B 1bd09caaa265e370b70efe9dd23171a61a98920d659c2f19bb3ec07bf77b1d59712c135f421bbc3164bec6c2b19ac0886185bb6200c45cefaaaea94d5cf54222 SHA512 b449fc466a22300c8a4b0a5b223d68b0ef4437512abcdf875580efc364570b157a55e283faa0ddaad5fd4ce98585bf6dd043b4e7a2a7aa86e98bdb9e8a846a30
 AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
-AUX freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch 1054 BLAKE2B 8665cad381ba62a792d706acf8bec0d2801435249d9004be8df5a01e4de34c0a5dcd85722d77284fe57b2c341d2d4fcc5b70e3f2380c7de59adb323466498bf6 SHA512 efbd53039803d301a5f76984d6e23a43563d888511cd569cc1a656a7900cc4bd93f8bef6e658f7acb42894501ecf50b941ff4c08a89e5063524813300f503b50
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
-DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34
-EBUILD freecad-0.19_pre20201231.ebuild 9028 BLAKE2B 0d1394446de1d57f8072c802ab552feca50f216e72cd2fce0c068bcaa4055ef12dd0a4492c4fb774c6169c684b2a5b42fb79bae4ad68ca251555c0635b25ba4c SHA512 0ff3a13ece5feddc1f4af871ec7c1817e8620d49551b9465e12771d3af719f17729dc3d7b563e7f93e7bd36cd2399ef1dd20c26e967c8f33eea36894daf8c173
-EBUILD freecad-9999.ebuild 9001 BLAKE2B f575d610bf27b8e77ef37f20b9500220d101e4badb0a7998895581efd6088b6587a1852ea231273d71f450cc44d113191add1c602958f69f79881bfb3d4773dd SHA512 037497da3425242b3094d4cd51e21a767260960a3781b642f5cb5735220a4b4758071403f8403107ea177c84bccd4d11b47800911b5358a25be8e62bb4400d15
-MISC metadata.xml 3801 BLAKE2B 45881fcae09c1c9c41c413915c6db4454f72067c798f05e1cfb6ee6342c01834b090c84f5eb350d4b1a7cee58fa06ba03398d45956f9869f45c044140c68b318 SHA512 f1c7100c60a3e82aab72c2dac17b1fbff50a50587db562a7032a62732c1412bf97544015986926d5b3abef0ab966d145001785b714051a887206c30d526470b2
+DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
+EBUILD freecad-0.19.1.ebuild 9049 BLAKE2B 3b63090e5fb618d45171eb616c77657ee9f398e5459cb38664b95cca80486e6697aca645652cfba38ac4a5f20c750bcb06c8840565a295e8079a59763e49ba20 SHA512 34ba9e577377f9e5f687813a4a5629bfdacdca1a62c82bb4d71a7ceb726afd7de9ccbf1041f83fadaf3a6394ed7aa32c7d4f08d695523842cc56b72b0450e064
+EBUILD freecad-9999.ebuild 9091 BLAKE2B f56e1e6230b94b06e73b6a57d8d38d1096924969dd553b18f14c11760bd5de0602d2bc33a9264e8ba201ea70b53a2122b64f82448216d769ce57d5cff1cbdd22 SHA512 9dbef04ebc1448d6f32525d19205f05ff2eb55253acc7c7551030f02e29e384b87627c4e81da3a6bf0df84cc3c65178d82a7c2c2d6a46ca03281663e55990d28
+MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
new file mode 100644
index 000000000000..c8772febdee8
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -0,0 +1,29 @@
+From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 12 Mar 2021 23:55:09 +0100
+Subject: [PATCH] [Gentoo specific] Remove ccache usage
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b17736..38e482a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,11 +8,6 @@ if (POLICY CMP0072)
+     cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+ 
+-find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+-if(CCACHE_PROGRAM)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(FreeCAD)
+ 
+ set(PACKAGE_VERSION_NAME "Vulcan")
+-- 
+2.30.1
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
deleted file mode 100644
index 26bb4421077b..000000000000
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 31 Dec 2020 13:31:47 +0100
-Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4dabf7..17b9fad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,9 +8,12 @@ if (POLICY CMP0072)
-     cmake_policy(SET CMP0072 OLD)
- endif(POLICY CMP0072)
- 
--find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
--if(CCACHE_PROGRAM)
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
-+if(FREECAD_USE_CCACHE)
-+    find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
-+    if(CCACHE_PROGRAM)
-+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+    endif()
- endif()
- 
- project(FreeCAD)
--- 
-2.30.0
-
diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
new file mode 100644
index 000000000000..4a113baa2293
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+	inspection material mesh openscad part-design path points
+	raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull
+	sci-libs/flann[openmp]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+	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/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	arch? ( mesh )
+	debug? ( mesh )
+	drawing? ( spreadsheet )
+	fem? ( mesh )
+	inspection? ( mesh points )
+	openscad? ( mesh )
+	path? ( mesh robot )
+	ship? ( image plot )
+	techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="3G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i cMake/FindOpenCasCade.cmake || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=$(usex arch)
+		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(usex mesh)
+		-DBUILD_SPREADSHEET=$(usex spreadsheet)
+		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_CCACHE=OFF
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			# sandbox needs mesh support
+			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_TEMPLATE=ON
+			-DBUILD_TEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+			-DBUILD_TEST=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use headless; then
+		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
+	fi
+	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature "interact with git repositories" dev-python/GitPython
+	optfeature "work with COLLADA documents" dev-python/pycollada
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
deleted file mode 100644
index 9d1447e685a1..000000000000
--- a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
-	S="${WORKDIR}/freecad-${PV}"
-else
-	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${COMMIT}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="ccache debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-	inspection material mesh openscad part-design path points
-	raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-	IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} -${module}"
-done
-unset module
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-cpp/eigen-3.3.1:3
-	dev-libs/OpenNI2[opengl(+)]
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	>=media-libs/coin-4.0.0
-	media-libs/freetype
-	media-libs/qhull
-	sci-libs/flann[openmp]
-	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
-	sci-libs/orocos_kdl:=
-	sys-libs/zlib
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	cloud? (
-		dev-libs/openssl:=
-		net-misc/curl
-	)
-	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
-	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/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	ccache? ( dev-util/ccache )
-"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# draft, import, part, qt5, sketcher, start, web.
-#
-# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	arch? ( mesh )
-	debug? ( mesh )
-	drawing? ( spreadsheet )
-	fem? ( mesh )
-	inspection? ( mesh points )
-	openscad? ( mesh )
-	path? ( mesh robot )
-	ship? ( image plot )
-	techdraw? ( spreadsheet drawing )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch
-	"${FILESDIR}"/${P}-0003-Gentoo-specific-don-t-check-vcs.patch
-)
-
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
-
-CHECKREQS_DISK_BUILD="7G"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
-}
-
-src_prepare() {
-	# the upstream provided file doesn't find the coin doc tag file,
-	# but cmake ships a working one, so we use this.
-	rm "${S}/cMake/FindCoin3D.cmake" || die
-
-	# Fix OpenCASCADE lookup
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i cMake/FindOpenCasCade.cmake || die
-
-	# Fix desktop file
-	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ARCH=$(usex arch)
-		-DBUILD_ASSEMBLY=OFF
-		-DBUILD_CLOUD=$(usex cloud)
-		-DBUILD_COMPLETE=OFF					# deprecated
-		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
-		-DBUILD_DRAWING=$(usex drawing)
-		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
-		-DBUILD_FEM=$(usex fem)
-		-DBUILD_FEM_NETGEN=OFF
-		-DBUILD_FLAT_MESH=$(usex mesh)
-		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
-		-DBUILD_FREETYPE=ON						# automagic dep
-		-DBUILD_GUI=$(usex !headless)
-		-DBUILD_IDF=$(usex idf)
-		-DBUILD_IMAGE=$(usex image)
-		-DBUILD_IMPORT=ON						# import module for various file formats
-		-DBUILD_INSPECTION=$(usex inspection)
-		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
-		-DBUILD_MATERIAL=$(usex material)
-		-DBUILD_MESH=$(usex mesh)
-		-DBUILD_MESH_PART=$(usex mesh)
-		-DBUILD_OPENSCAD=$(usex openscad)
-		-DBUILD_PART=ON							# basic workspace, enable it by default
-		-DBUILD_PART_DESIGN=$(usex part-design)
-		-DBUILD_PATH=$(usex path)
-		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
-		-DBUILD_POINTS=$(usex points)
-		-DBUILD_QT5=ON							# OFF means to use Qt4
-		-DBUILD_RAYTRACING=$(usex raytracing)
-		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
-		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
-		-DBUILD_SHOW=$(usex show)
-		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=$(usex mesh)
-		-DBUILD_SPREADSHEET=$(usex spreadsheet)
-		-DBUILD_START=ON						# basic workspace, enable it by default
-		-DBUILD_SURFACE=$(usex surface)
-		-DBUILD_TECHDRAW=$(usex techdraw)
-		-DBUILD_TUX=$(usex tux)
-		-DBUILD_VR=OFF
-		-DBUILD_WEB=ON							# needed by start workspace
-		-DBUILD_WITH_CONDA=OFF
-
-		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-
-		-DFREECAD_BUILD_DEBIAN=OFF
-
-		-DFREECAD_USE_CCACHE=$(usex ccache)
-		-DFREECAD_USE_EXTERNAL_KDL=ON
-		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
-		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
-		-DFREECAD_USE_FREETYPE=ON
-		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
-		-DFREECAD_USE_PCL=$(usex pcl)
-		-DFREECAD_USE_PYBIND11=$(usex mesh)
-		-DFREECAD_USE_QT_FILEDIALOG=ON
-		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			# sandbox needs mesh support
-			-DBUILD_SANDBOX=$(usex mesh)
-			-DBUILD_TEMPLATE=ON
-			-DBUILD_TEST=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_SANDBOX=OFF
-			-DBUILD_TEMPLATE=OFF
-			-DBUILD_TEST=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use headless; then
-		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
-		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
-	fi
-	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use plot; then
-		einfo "Note: You are enabling the 'plot' USE flag."
-		einfo "This conflicts with the plot workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	if use ship; then
-		einfo "Note: You are enabling the 'ship' USE flag."
-		einfo "This conflicts with the ship workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	einfo "You can load a lot of additional workbenches using the integrated"
-	einfo "AddonManager."
-
-	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
-	einfo "support. Some of them are available in Gentoo. Take a look at"
-	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
-	optfeature "interact with git repositories" dev-python/GitPython
-	optfeature "work with COLLADA documents" dev-python/pycollada
-	optfeature "dependency graphs" media-gfx/graphviz
-	optfeature "PBR Rendering" media-gfx/povray
-	optfeature "FEM mesh generator" sci-libs/gmsh
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e2cb13d51fc2..47d3587ffec5 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # vtk needs updating to use 3.9
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -16,17 +16,18 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${COMMIT}"
+	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
 # code is licensed LGPL-2
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="ccache debug headless pcl test"
+IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
@@ -91,10 +92,7 @@ RDEPEND="
 	')
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	ccache? ( dev-util/ccache )
-"
+BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -121,12 +119,13 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="7G"
+CHECKREQS_DISK_BUILD="3G"
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -204,7 +203,7 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_CCACHE=OFF
 		-DFREECAD_USE_EXTERNAL_KDL=ON
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
@@ -215,6 +214,8 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		-DPython3_EXECUTABLE=${PYTHON}
+
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
@@ -242,12 +243,12 @@ src_install() {
 	cmake_src_install
 
 	if ! use headless; then
-		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 }
 
 pkg_postinst() {
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 599d1643a221..57211691f591 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Gentoo Proxy Maintainers</description>
+		<name>Gentoo Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="addonmgr">
@@ -18,9 +18,6 @@
 			Build the architecture workbench for working with architectural 
 			elements
 		</flag>
-		<flag name="ccache">
-			Use <pkg>dev-util/ccache</pkg> to build the package.
-		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 125f349b1ccd..a35719e37637 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,5 +1,5 @@
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
-EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
+EBUILD frogr-1.5.ebuild 926 BLAKE2B d2922cb892bbb39075cd5bd0639ee5fd9884e7147376fe51854f2fa3db7a2d7908e813c5e2988afc017f1fe1c0c52bb13de6259e707cc1b99550956ec24b171b SHA512 e48d0ce41802dc1f3b44e5b3ad829097fdbecc407ac1e5e2d22b12b23c700cd09f5e6095a587c81eec2c29100f87664a479c8bb6472ac8fb22f4e0acf3c0bb70
 MISC metadata.xml 386 BLAKE2B 5b6c13b6c0a981e0e1fd0c7092204999a4849c2339bb35de15b69bd04e736f8f5d1ea905f429f036852e34a7c729e744518f0171ef29c6cf016fc047332b2838 SHA512 660c88d236b1c2ba2ea1e20d0d2ea9a3acc5a9f8d0306b3ed98bfec2d616e67b9e8aceb137438e6b0a6517588252a676c715f6177b9e369d09019064254c8f53
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
index 2cb753483f16..c10fdc5a79c7 100644
--- a/media-gfx/frogr/frogr-1.5.ebuild
+++ b/media-gfx/frogr/frogr-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 # TODO add a useflag for enable-video or header-bar???
 
 src_configure() {
-	local emesonargs=()
+	local emesonargs=(
+		# bug #714132
+		-Dwerror=false
+	)
 	meson_src_configure
 }
 
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 56566d613ff7..373e1bfd3db5 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,8 +1,3 @@
-AUX gif2png-2.5.12-makefile.patch 1049 BLAKE2B bbf558d2fbfeea6ea5c4b8bc863541f2118d93994b78d80390cbad4179d739e2a547a06359a13d0e2a0c2b9dd056a62e0a7a954043e69ea35a57e6082c1bba9e SHA512 1c0278626ead4640eeae69408020007fcc96fd6078fe6abcc5ab81c1fec2a89eb8ccdf134bd22c8b4e26abfe390aded4fda3a9d9ccf600e2128bcf1ebcaef735
-DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8
 DIST gif2png-2.5.14.tar.gz 221609 BLAKE2B de1e66a0880579a2d4d3681ec8cbbe3ef37da1cd05e40336b398266f386d629645f9d45738098c9e3f9528cb5dbdd5c37ed00f5d5c8bcd85e0a31fd375f38a76 SHA512 a1ea3b64da64274a3363089beee748605eb24d3e05bcace29d26618a9ab3580f5ac85da893af16975c91d571866625e0883f0a4b375e82c468754f84f8982f03
-DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
-EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
 EBUILD gif2png-2.5.14.ebuild 671 BLAKE2B 3a90983d055427448a29149199dccd410939ceb0c8ccc69b9a82557876f32453e06967398f385853b5a76c8e2575a5ea083722a31bebb188e21e1044f7baddda SHA512 02aff990a2e72dfcc2e992a4556ed9798e948297695b95ab6540bac398f28193ab84c21069e5382b023f744f45f57e68b80caaca7b5fe400e8d5c9fd8b5024fd
-EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
deleted file mode 100644
index e99180f8686e..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests.
-
---- gif2png-2.5.12/Makefile
-+++ gif2png-2.5.12/Makefile
-@@ -2,8 +2,7 @@
- 
- VERSION = $(shell sed -n <NEWS '/::/s/^\([^:]*\).*/\1/p' | head -1)
- 
--CFLAGS = -DVERSION=\"$(VERSION)\" -O2
--LDFLAGS = -s
-+CFLAGS = -DVERSION=\"$(VERSION)\"
- 
- SOURCES = 437_l1.c gif2png.c gifread.c memory.c version.c
- OBJECTS = $(SOURCES:.c=.o)
-@@ -28,22 +27,19 @@
- web2png.1: web2png.xml
- 	xmlto man web2png.xml
- 
--check:
--	cd test; make --quiet test
--
- clean:
- 	rm -f gif2png *.o gif2png.1 web2png.1
- 
- version:
- 	@echo $(VERSION)
- 
--prefix?=/usr
-+prefix ?= /usr
- 
- install: gif2png gif2png.1 web2png.1
--	mkdir -p $(prefix)/bin
--	mkdir -p $(prefix)/share/man/man1
--	cp gif2png web2png $(prefix)/bin/
--	cp gif2png.1 web2png.1 $(prefix)/share/man/man1/
-+	mkdir -p $(DESTDIR)$(prefix)/bin
-+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-+	cp gif2png web2png $(DESTDIR)$(prefix)/bin/
-+	cp gif2png.1 web2png.1 $(DESTDIR)$(prefix)/share/man/man1/
- 
- uninstall:
- 	rm $(prefix)/bin/gif2png $(prefix)/bin/web2png
diff --git a/media-gfx/gif2png/gif2png-2.5.12.ebuild b/media-gfx/gif2png/gif2png-2.5.12.ebuild
deleted file mode 100644
index 937a694a8ebb..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=media-libs/libpng-1.2:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.12-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	# this release lacks the NEWS file that is being used to
-	# query the release version
-	# https://gitlab.com/esr/gif2png/issues/4
-	sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.9.ebuild b/media-gfx/gif2png/gif2png-2.5.9.ebuild
deleted file mode 100644
index d0cd0123f513..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 3baa790257ed..642fd41afbef 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,4 +5,4 @@ DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.99.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6
 EBUILD gimp-9999.ebuild 6990 BLAKE2B a24f11b76b68054be80cb854083aac1894049fd7a0d63b22ac0159032423c6f31295e767030a4bb48c5a63073d8a50dcde1ca43f345323c538e46a1c2344265c SHA512 f645dcdd4118822cc7149f36fd0c2e51dd40620375c72de9dbc0b6abf49916bc9fca907793ee5a97197bac7ce87561809e12364b42dd2c4ea9bd7683674c34cb
-MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
+MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 88724f7e8aab..14bac946e354 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index c8dc5d1a9588..42405e53e159 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
+DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
 EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
-EBUILD gmic-2.9.5.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4
+EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
+EBUILD gmic-2.9.6.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index cd2efec6e1b2..5e85c6f688ac 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gmic/gmic-2.9.6.ebuild b/media-gfx/gmic/gmic-2.9.6.ebuild
new file mode 100644
index 000000000000..20cad100504d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index e2731758d2f2..a15f37527210 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,5 +1,3 @@
-DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f
-EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1692 BLAKE2B 3d0166786e13eec846261a767964d0d33c51fdce2f14d38e8a53bfd674cf4c8bb9fb5a782c2cfee72beb8dc95802f153ce991204f771f02b8aee8777e11efefb SHA512 54816af22aca7b54eb212f16fd208eca5dd8ef1ac2f66a811127395bcef896d344589f22112f9e74878568e58dca9b49cd5cac85768159542eb8c846d9a372cb
 EBUILD gnofract4d-4.3_p20201029.ebuild 1475 BLAKE2B f15026f582a54433bdee4b1f3dd30088b7b21b1760b905d8b20e205bc5301cd33aea19eb32d24e65787cd438cece03936abfe9618bf8d77dd15e8a7a9643250d SHA512 df41fc77faec92e3ad3e4ec4323b561471ee7affbf463851a46decec2f3a46e7a963481e1c5721942f9ffca62788d29c6e5edcc9e91af7656e5e0ad4f2e81031
-MISC metadata.xml 504 BLAKE2B b5087f6e8de7658fdb35b694f16dff28b7ecd6c600c787299df812174613a71ef605595531cb97df0e098bfcb10664c40e9e091b76a62078626d944387b2cadd SHA512 03e3638abe60e3a4350eb1770d5fdeb287e3eb83418d266b65ef839031e6eb6d82d5fb2546611038819c1fb302a69a047c9283b922bdb055110722cb4fb2f20f
+MISC metadata.xml 473 BLAKE2B 00f94873b48e2f38dd5c5098722a32628a2e71907f5aa84aaad9e5ed42b3513fcb6d9e1ca580b009bbab2583e8bd0c18adf78f1d61c48f745694d872222a503a SHA512 9a8841fd4b12d5ba954014f6218eddc4a3742de5e0306befe9b463b538d89fb55653fc883675ce267bc3fe2ded3e12a0be2834c02ff0b79b054f5a84b2a94375
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
deleted file mode 100644
index ddede64604e6..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 optfeature virtualx xdg
-
-COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="https://github.com/fract4d/gnofract4d"
-SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+doc"
-REQUIRED_USE="test? ( doc )"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-libs/libxslt
-		x11-libs/gtk+:3[introspection]
-	)"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	virtx pytest fract4d fract4dgui test.py
-}
-
-python_compile_all() {
-	if use doc; then
-		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
-		"${EPYTHON}" createdocs.py || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gnome/help/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "Optional missing features:"
-	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
-}
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index d11e338560d8..dbb54e8308e2 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">edyoung/gnofract4d</remote-id>
 	</upstream>
-	<use>
-		<flag name="doc">Install user manual</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-gfx/gnuclad/Manifest b/media-gfx/gnuclad/Manifest
index f65b0c633738..a5596140c7a2 100644
--- a/media-gfx/gnuclad/Manifest
+++ b/media-gfx/gnuclad/Manifest
@@ -1,4 +1,4 @@
 AUX gnuclad-0.2.4-werror.patch 391 BLAKE2B 976bcc89bf56580acf13de66f1b540f06be7b0b6176c23cb9ff18bb3549737a417c26754286ec18593ba5c12e2d2ae87f4b02d08a94c7ee802bac2caa7b1914f SHA512 fc3680bec6a41d5f6b948d59990916add09654fca38e2193e34174838a24a439d9d8123f15dc2b2aa30a1cbc763bdc2025e1bfcdf3b1a1a112b6f8d8d5454b26
 DIST gnuclad-0.2.4.tar.gz 287763 BLAKE2B e70a16b6e2d032cfc0d79b7ec68386e1e70c98d4c30cd046157d4bac42fd9f91ad56fe18bc78a2380055ff952227572016381a5a6bbb88a74f6eb9e187d5d39e SHA512 881b1feab8cb7458223987c5a36359e31e7e00e94d60cd0002c289930b99236947aadbea40f96aaa6aa4b5d7953278bf581edbd6df3cb660bca1505950e66b67
 EBUILD gnuclad-0.2.4.ebuild 594 BLAKE2B ec2072f392436c07d1f2cca4c8aeb4aa8c61d5f62c9426d95d21df35fc3ad78c3250a782240607007af071d248fe5ba3b6d9e78876ed72e5cb07b01c7b355db1 SHA512 080ffef8684b3147e9977bcd0a192515cca30b9779b9d0bd4f7893caf7c14f2ef2510d1f01c2f62c7cb14d72ce7a8fef2e1f074e06db883f830a339d0a6badab
-MISC metadata.xml 339 BLAKE2B 289743dbfe86bb16fbf2b479b1c5c2767b99019f2f43da5d0ceae35cb561dc33fabb728ceb4d709ab8965a1f6b0b51fe63c5dacc68166e8fab41b3b89a458af0 SHA512 a7b03367e25abd644a51dd72a7d21f3cfd571662233afc1094434373865ed01e2865b16f7e02f313448be372306be2ec842ea03e5015d68657b2c926fa365628
+MISC metadata.xml 339 BLAKE2B 3f8e3ba5bb3fc795ea8f1fca8ab94889f38398260984b1a54b26916dd5c31d3af028867e33735eaa586165e9b952b449bad8d7e27578335b5422f6eaaa987de7 SHA512 15e8a8f12066f1f44e7ecc9c3c61fbadc9dc499ff2b6be34c26b256406129ea8fda121b7b429c1ff86741583faec24b73f8e3b139c2b84baebb2e7e3933047c2
diff --git a/media-gfx/gnuclad/metadata.xml b/media-gfx/gnuclad/metadata.xml
index df2c9cb19525..2cf5bd315939 100644
--- a/media-gfx/gnuclad/metadata.xml
+++ b/media-gfx/gnuclad/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 184a7383ebd1..c70d288759fe 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,4 +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.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch b/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch
new file mode 100644
index 000000000000..b832d364b3ed
--- /dev/null
+++ b/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch
@@ -0,0 +1,172 @@
+From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Tue, 21 Feb 2017 01:06:06 +0100
+Subject: [PATCH] Fix displaying images with GTK3
+
+We have to use the cairo context provided by the draw event, otherwise the scrolling does not work properly.
+
+Don't paint the whole image when scale == 1, it's unneeded and slow.
+---
+ src/image-view.c | 86 +++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 44 insertions(+), 42 deletions(-)
+
+diff --git a/src/image-view.c b/src/image-view.c
+index b367f2a..820b843 100644
+--- a/src/image-view.c
++++ b/src/image-view.c
+@@ -24,11 +24,10 @@
+ static void image_view_finalize(GObject *iv);
+ 
+ static void image_view_clear( ImageView* iv );
+-static gboolean on_idle( ImageView* iv );
+ static void calc_image_area( ImageView* iv );
+-static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type );
+ 
+ #if GTK_CHECK_VERSION(3, 0, 0)
++static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type, cairo_t* cr );
+ 
+ static void image_view_paint(  ImageView* iv, cairo_t* cr );
+ 
+@@ -37,6 +36,8 @@ static void on_get_preferred_height( GtkWidget* widget, gint* minimal_height, gi
+ static gboolean on_draw_event(GtkWidget* widget, cairo_t* cr);
+ 
+ #else // GTK2
++static gboolean on_idle( ImageView* iv );
++static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type );
+ 
+ static void image_view_paint(  ImageView* iv, GdkEventExpose* evt );
+ 
+@@ -268,16 +269,13 @@ void image_view_paint( ImageView* iv, cairo_t *cr )
+         {
+             cairo_rectangle_int_t rectangle;
+             cairo_region_get_rectangle(region, i, &rectangle);
+-            paint( iv, &rectangle, GDK_INTERP_NEAREST );
++            paint( iv, &rectangle, GDK_INTERP_NEAREST, cr );
+         }
+ 
+         cairo_region_destroy (region);
+-
+-        if( 0 == iv->idle_handler )
+-            iv->idle_handler = g_idle_add( (GSourceFunc)on_idle, iv );
+     }
+ }
+-#else
++#else // GTK2
+ 
+ gboolean on_expose_event( GtkWidget* widget, GdkEventExpose* evt )
+ {
+@@ -390,6 +388,8 @@ void image_view_set_scale( ImageView* iv, gdouble new_scale, GdkInterpType type
+     }
+ }
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ gboolean on_idle( ImageView* iv )
+ {
+     GDK_THREADS_ENTER();
+@@ -435,6 +435,7 @@ gboolean on_idle( ImageView* iv )
+     iv->idle_handler = 0;
+     return FALSE;
+ }
++#endif
+ 
+ void calc_image_area( ImageView* iv )
+ {
+@@ -460,7 +461,11 @@ void calc_image_area( ImageView* iv )
+     }
+ }
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type, cairo_t* cr )
++#else // GTK2
+ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
++#endif
+ {
+     GdkRectangle rect;
+     if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) )
+@@ -470,51 +475,48 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
+     int dest_y;
+ 
+     GdkPixbuf* src_pix = NULL;
+-    if( iv->scale == 1.0 )  // original size
+-    {
+-        src_pix = (GdkPixbuf*)g_object_ref( iv->pix );
+-        dest_x = iv->img_area.x;
+-        dest_y = iv->img_area.y;
+-    }
+-    else    // scaling is needed
++    GdkPixbuf* scaled_pix = NULL;
++
++    dest_x = rect.x;
++    dest_y = rect.y;
++
++    rect.x -= iv->img_area.x;
++    rect.y -= iv->img_area.y;
++
++    int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
++    int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
++    int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
++    int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
++    if( src_y > gdk_pixbuf_get_height( iv->pix ) )
++        src_y = gdk_pixbuf_get_height( iv->pix );
++    if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
++        src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
++    if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
++        src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
++    //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
++    //        src_x, src_y, src_w, src_h );
++
++    if ((src_w > 0) && (src_h > 0))
+     {
+-        dest_x = rect.x;
+-        dest_y = rect.y;
+-
+-        rect.x -= iv->img_area.x;
+-        rect.y -= iv->img_area.y;
+-
+-        GdkPixbuf* scaled_pix = NULL;
+-        int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
+-        int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
+-        int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
+-        int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
+-        if( src_y > gdk_pixbuf_get_height( iv->pix ) )
+-            src_y = gdk_pixbuf_get_height( iv->pix );
+-        if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
+-            src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
+-        if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
+-            src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
+-        //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
+-        //        src_x, src_y, src_w, src_h );
+-
+-        if ((src_w > 0) && (src_h > 0))
+-        {
+-            src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,  src_w, src_h );
+-            scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, type );
+-            g_object_unref( src_pix );
+-            src_pix = scaled_pix;
+-        }
+-
++        src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,  src_w, src_h );
++        scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, type );
++        g_object_unref( src_pix );
++        src_pix = scaled_pix;
+     }
+ 
+     if( G_LIKELY(src_pix) )
+     {
+         GtkWidget* widget = (GtkWidget*)iv;
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+         cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
++#endif
+         gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y);
+         cairo_paint (cr);
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+         cairo_destroy (cr);
++#endif
+ 
+         g_object_unref( src_pix );
+     }
+-- 
+2.11.1
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..5b657769e158
--- /dev/null
+++ b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="A Simple and Fast Image Viewer for X"
+HOMEPAGE="http://lxde.sourceforge.net/gpicview"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="virtual/jpeg:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" )
+
+src_configure() {
+	econf --enable-gtk3
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 1a02dd3781b5..ac6e0560b5ca 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,4 +3,4 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 EBUILD graphicsmagick-1.3.36.ebuild 3164 BLAKE2B cae9c965cfac059d0c065866f117f49761e0b0f49c0cd1d718d5cbf195f30f0eabea216f9cfaafe549ea4ab437ec97c5ab21d5cc0afdca17ea9952b9334668e0 SHA512 caea74a3f09a26518841fffa306ecd62ca50f6be8de25014ae649cbfa3465c8742b11c69109a5335b544670865ea7592639ffd2f69064ba4016c97b65fd2e80c
 EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109
-MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
+MISC metadata.xml 1276 BLAKE2B 4784c9dbeb0760b1b0b8f83672a85dc318d2829dcfbe547b0e25da66128194db0662efc77bdced2c12e0219df3f6a660273d7966c8b2f320b320cbb3c210b814 SHA512 17efe89b6dcc8e93b7b4849af215210faf64e95ec34f39accf58bc2c9397818389126fe7de7ea0f2091a9e24cf282dc33b4c65b69545e8a8c19b2de57280325f
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 8e4554b3141f..c298b7684be2 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+      <email>sam@gentoo.org</email>
+      <name>Sam James</name>
+  </maintainer>
+  <maintainer type="project">
+      <email>codec@gentoo.org</email>
+      <name>Gentoo Codec Project</name>
+  </maintainer>
   <longdescription lang="en">
   This is a port of GraphicsMagick(TM), the "swiss army knife" of
   image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 4837af683b30..1077e72e5d9d 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,5 @@
-DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.10.2.tar.xz 489484 BLAKE2B d699b471bcf701a83e87d982b7faebeac4a420083df35d875405483ea05fb4b28c9626c7b662629130801852a1602d6a90ea9627fdeebfd42ec25cf57a4e7835 SHA512 807af9af9c1451f761e1f64a0ebe132fc98252100202c0af0dea53210cd30bed5f4c293a8f5f52b03b493422053420c1506ca32a34515c90b7a5290837bc686a
+DIST gscan2pdf-2.11.1.tar.xz 494704 BLAKE2B c6773b3fadd7765074c5401ee22b46c7056a51a77b10bb769149428b6dbf4503c4fb8df96d9820c8f24a49b20e28c5e0796e835dfbd64272b364a83e64fd0ff1 SHA512 79ce0a3e032286bc1365e4355fdde57e321645a375a6310c1c59588a0d2cca0a9ea9a1e0462a2df3936e96a69fc0a6e32eb09f0c4207fca102d0f06cd5e50ac7
 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
-EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 6f1e069c628d5d3abbb137c7e248783881122eed602420b0d43461b54fb8c7395cf1f40f30b42bbd8577121305b3405f486666fb76e64bb20fab381037bb079a SHA512 6bc6808d5c18b208a2b1a0ffb8778c2a4db0b99b531ea7e861a9739adaf42d5a1aaa8fd95e95ee2c930e1b435113c247f1ecca143b9fcb7fb98d78d7db10fcc0
-EBUILD gscan2pdf-2.10.2.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94
+EBUILD gscan2pdf-2.11.1.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94
 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
-MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
+MISC metadata.xml 469 BLAKE2B 6d8cb7adfd43d79b53f341b8e2082d595e0bd3558f16d392f5ed1c3f546a35d756b50e5703d86bc4fddd3be76ed4155e6d67136102cdfafb987e43f85d370808 SHA512 63a285046bafa848d3bd50327266afcc8eec08d9c2130c6b07faee85457878e1348f9d1b22c4ef7c4578a759eda024315005051827af57266adfb8b5cb9c3492
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
deleted file mode 100644
index 4052a9af56cc..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit optfeature perl-module
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-# and others on Wayland and the console
-RESTRICT="test"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Date-Calc
-	dev-perl/Data-UUID
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/Locale-gettext
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/gtkimageview
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-mydoc="History"
-
-pkg_postinst() {
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
-	optfeature "adding to an existing PDF" app-text/poppler[utils]
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild
index 412081e98a73..412081e98a73 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild
diff --git a/media-gfx/gscan2pdf/metadata.xml b/media-gfx/gscan2pdf/metadata.xml
index 79c9ea23cc9f..7b38aaacf797 100644
--- a/media-gfx/gscan2pdf/metadata.xml
+++ b/media-gfx/gscan2pdf/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 734118adfedb..f074a2f9b843 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -2,4 +2,4 @@ DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e870
 DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
 EBUILD img2pdf-0.3.6.ebuild 561 BLAKE2B 2a2400caf780866c957a7f102bf587eab18fe4f3906b585d24b173b07ccb8f40e9c29844e5e40a58d8555707e0943fea7ae098f2e186133a08cbafb1e14f9621 SHA512 6d03d49992770664c2cd3cbd25e6416d07bce3b084c5ea8ef45863b6f0beb5d8d0f9d07e03ab10f2c56f373fbda308d02a98927cebae89e0d5fe9132662e6429
 EBUILD img2pdf-0.4.0.ebuild 1234 BLAKE2B 121a5c328b846954b7b10ecc4f0561677f260fdd109b672ca3d76f547cd0362cd34794f8d5b599e1d39ef226b64beb5d54669cbb4777794d112b79f9402d6df8 SHA512 4a0e069457d40140e05e4a8caca931d8da22fa0885d16f5b2ee9279ce8654ee0c1b4a77db1cdb615b1b415dae52d33f79897ead0e324379cb2a1c89206d468a2
-MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
+MISC metadata.xml 1150 BLAKE2B c2965f6da972330edd169a1503dcd77cfab0b870a5a6a3cf5727e80692088ceac35b559bb52580e50a70c1298eaa3484cecb380b912636fe5262f7c95e2dd19f SHA512 bab59fd09cd1eee4fb3f3896f9c0553a89ab878f9cb34a87efd324467712958bf5213c8e9d3d5de84b7a39d09c6e4d5dc0bc15281896c09da2858446761217d3
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index ca964c7924b5..892d1db997b8 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index d8bbe22472e0..71ea7c5ae0ae 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -5,4 +5,4 @@ DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d
 EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
 EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5
 EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d
-MISC metadata.xml 662 BLAKE2B a0da452f9b0ae95ba99c7b3b05ad2a4b3530c25f1ed833bc3d394e409d80d44310d58684735eccfe522aa452d94c6a362bc3210dca7790960a571c0425cdd2c0 SHA512 3a7c33c7fc5cf71e874546212bc90e8969d112b3b2bb2b15564fa42e980ba18be42ddb14f57db508a45ea62640b625d0d84a2274617de08150058c86e6bbb266
+MISC metadata.xml 692 BLAKE2B 075c4adcd3f302d2aa23e6e67213baf23ebf4665b1fb40b6e3de390715bbbde163ff3e596785b74840db74f3cdf24324c2e718de19d4ea5f280130320fe586d9 SHA512 65f74a9aac990f9977534b2ea39fbdf1499f5b5645bda71ea26cb78efa3cd92f22ba38261b272bd64176e1d8528a8639aedc24e96e4a1444d00ca6c6936e24b3
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 196a224f7464..f403e4f5cf5f 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 46cf19366bdf..5be319b67b55 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -23,4 +23,4 @@ DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
 EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
 EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
-MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
+MISC metadata.xml 960 BLAKE2B 7389b413fcd67894c73c6f0bee48fdb999a2020516a4cd892c02852ed72d07c436c46fd29541701da59859a6528aa110fcd08cd1c250f2017a9407c05b0cc1e9 SHA512 65955c2c44b37e2cdd62266e46b4343cc22dd16e9d40f08f1611e7e42448677030945ad4e0ffc663c3f5b3bce8532040bff4c055cdc7c458fefb9b5f95bad902
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 650852b4e4f6..38f698177cb2 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcin.deranek@slonko.net</email>
 		<name>Marcin Deranek</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 95ba5775c52e..57f23a25c7a7 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,3 +1,3 @@
 DIST kuickshow-0.10.1.tar.xz 896900 BLAKE2B 50e6bf055a76d0668fe6f92d411610908e9098b5cb14df89403d7e6462941e137390e14a6828c790c1b7067b9f596e70c40d40e2a64c6a0887b1f11251911219 SHA512 c2d812a0e97be1b5b0db1f6c90dc1347be2ffccd48403b46e637549b608a395cdcdb6b36e842b1c5039d18861cfbafd4dc7283bb69f530548a3b5193a586d4dc
 EBUILD kuickshow-0.10.1.ebuild 1093 BLAKE2B 8e348ee2bdacc91715665889986074da4ecdb5ddc3174c39f7dce247e8d6d0d389a41b4fca8688c9c08e39b09913a9c0fd27d67d119f294a0b5a423f1384f89e SHA512 7f4d1d4d32edb2859786c777872ed3e9126d991b4ad2c1240c21cb9a474777aa7cd9f57b2bd1e3252615523fa97995d84ad2da309e71f48030589a5607bd4de5
-MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
+MISC metadata.xml 398 BLAKE2B aed31745382f12d6c97f524780103c48078a618501d3ed4ea2845e6e4d7fa74090d46a043527162cf3183e2d1ddcde9f500729f2efccb958ffc03c7250d5da62 SHA512 cc4d87aea5776c4bd51fe4f86366acba9cb96a1657651ea5ba4610d361804acbb8046bff4dc75c2b72f98e69b3fb7be468119d1d760e2d75861cbf7e35e0a54d
diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
index dacb6f1032b2..6a59662bba65 100644
--- a/media-gfx/kuickshow/metadata.xml
+++ b/media-gfx/kuickshow/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chrgerloff@gmx.net</email>
 		<name>Christian Gerloff</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 101075428227..c5152e08b152 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,10 +1,8 @@
 AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1209 BLAKE2B 9a6ea44db62524b454c37abd236d9a7186e3dc5cbda4b0d55a4f96216bd74db13e6bcf8d9d06a490e7ba1a717f7ec8de320780ee3699e10e1c700f441a4d18a5 SHA512 fad1505e2037b87f031838643443d0e2f728855d4a1929b1cae3f37b3d2d22c2408f11461b81818d4c68f52c99d981a134ad8c0ae738fe9240b41e4a460155fc
-DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
-EBUILD libimagequant-2.12.2.ebuild 1403 BLAKE2B 40d79a5387b2091818a33cf3c5620558fa9543f9e75a76a7ed310ac751bd2a8b5f592340f591a831f68604873365b6141c7d388552d31162e1b259df8e7bfa57 SHA512 268b848f7d11fe9568b13a2b90b57e5f6369cad1f8043d47ef06c8ddd05909e9da83844b2ef6367125bf2c7e86a158fd82ab99ec257b5a290e90fbb9bdf5fb58
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1247 BLAKE2B 92006ddcdecbd884658c8c95014efb3e0213762c6af664dcaf3785dda29637f1515e68bbbc9398aba926ecb17460ec4eff80e82c3d32cee6c66c4cd162f91abe SHA512 630037675eada9f300fc5db6fac53e626ee92f3374e507298c195d0c887af8321ba4b68debc35e4c21bd8cd07ab34ffd5e452d002a95c44b50cc71792f42d940
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
deleted file mode 100644
index 5ecbf05fe927..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use_with openmp) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake shared imagequant.pc
-	use static-libs && emake static
-}
-
-src_install() {
-	dolib.so libimagequant.so
-	dolib.so libimagequant.so.*
-	use static-libs && dolib.a libimagequant.a
-	doheader libimagequant.h
-	einstalldocs
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins imagequant.pc
-}
diff --git a/media-gfx/metadata.xml b/media-gfx/metadata.xml
index 3e62cd89181c..368e59219497 100644
--- a/media-gfx/metadata.xml
+++ b/media-gfx/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria media-gfx zawiera programy graficzne.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 86280a884b1c..0753de2717b0 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -2,4 +2,4 @@ AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd3
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
 DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
 EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
-MISC metadata.xml 629 BLAKE2B 90f781b587a61b126e78d8d7e11bb2aacc1db7c58d5891f4781bcca8d9531d5b1373ffd35b0771ea8dcfab81493807742598846919fd9b657270d46f8265c1c2 SHA512 30f91e05861aa50f5d0af624459ea92cd2649fbad374bed1b0dc30c2ab2532df8bd6b27f42f23bc7e77480141bcd5760a5804c46d121b3fa1170a90fd1d0acd0
+MISC metadata.xml 629 BLAKE2B 84cdd9e5e4859d5f70e0ef828ccc611e97fc313c7506d377ce58b395d3a35505c824f1190b916a0e170ce0ca5f4c06de473c2ed0b982c923858d54dfe3b53a36 SHA512 c88959c5f33a6fbbbf48ced0257d11409e58db48f3811801b47ad13c7c5e4bf40c3b5e11689dc47143f97dbcc880978ff202ffcc417d0d9699a26f8d3b0470ad
diff --git a/media-gfx/monica/metadata.xml b/media-gfx/monica/metadata.xml
index 272fc1e5253b..e3a51f20e210 100644
--- a/media-gfx/monica/metadata.xml
+++ b/media-gfx/monica/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index c1369af9ec23..4974d73d8a28 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -2,4 +2,4 @@ AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
 EBUILD nomacs-3.16.224-r2.ebuild 1906 BLAKE2B 9832da7bd304ba68983a470c0a190cb25b9960ff168a2ef57e4859c24b0220834714788d3c122875504b4fa203a3c811582b2571541c97c100c0f7b39fd12740 SHA512 00271ea0a48a50396038dcca7f08442ebcb63676eaf8fbd5a5c54412a8b238d3f2d1bf4f2e11561f35576b25fe487a979004738aa5ad04edd97429f34d820fa2
-MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
+MISC metadata.xml 594 BLAKE2B 47dc6a23191194cd7a1367145458781804269008667729b7815df23fb122f8f56e167cdaf3126c63b7da9109b8d0eda87ad28d772f2d60880bf541db211a51c6 SHA512 9769958ddcc86a53250908068a8388cd320277bcd8bda112a2deb0ab8fb9cf7ada2b177b7510ac6318c6b2b0d9fe3b6767088ab5426b5cd8a9143a07898ad9fc
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 5d40018fc73b..4962c2c5f92d 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 10d5c2c0bf06..b98355eb6fd3 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
 EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
-MISC metadata.xml 1272 BLAKE2B 2821bf6650664d0effd47957979eedee7194b41ca4de6c1b0c2e248e8b5deb06cbe9a7b2c3bfb263f74c4cec4aa5ff7789698f943cbc59492d3ebf4637487489 SHA512 090bf25e68133962ded9a9f457ea404bd362118ff76988266b5f023a7a21236d932aa95267af4997298117585c9dd2ee71933892973d6b8055f3edf112ab3f4b
+MISC metadata.xml 1302 BLAKE2B ecfa92988aa0b2d51d3a3cb862bc8e211b192c9dcff2868338a6974fc1185adf79a111a7fe6c1826e5c96a550ce6ee2bc396be98c964d0c5d6efd99549d9047a SHA512 3aa225219dc2cb0346664dad3cf484b0d7467c8c254637d5619e78d3fe4d87f81d1fd835e36acd0cf825777cf712d2f9388aefe2c97610eb76ade642d46586bc
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index be0edabb6659..91aa6e1321f9 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index c1c304faf3e2..81c44b0192c4 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -11,4 +11,4 @@ DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a
 EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11
 EBUILD openscad-2021.01.ebuild 2314 BLAKE2B a9b9faf82fa7212da43685b7feec011d7cadf983a4da8141820ab06423d21734c377be62e426f86d090b39092f4976f03aaebcdf2d3669552f897065ef5fb73a SHA512 a9f2d5affe0d715fc22641c71f034383428012f0ec4f77711db20684e7dcce26c26f4609b050402e76a0e7e78a88c7c619bbfebe7036a99375d31fd62c442700
 EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4
-MISC metadata.xml 1402 BLAKE2B df38615dd73f29faad439e184a2cb6a85cc3ffddf17e3bc1d1bd82e6cb44c2a65c27ebc351d21dd7bd63448bdb5d9d4013eeb8a357b6d8a9ac7c8cac870e7bcd SHA512 bfe1861a4e2d50805f21eeb2ddec537a623175bb8fb4b782d54b0ec669000cc9ed0627fc1fdb5ecb7550396f3e3328a7c06b0def031d6ee70cb3bcb0b20d6763
+MISC metadata.xml 1432 BLAKE2B a3521113144173687a24d729db70bbdbfeaf312889ba7461b8440501992da1d457676fbf1cb233cda5affdc024ca932b891e5751785d100fcc0af4ee1da8521f SHA512 ea8b7a46e3de907858841b305e3c6815da5a0a77bd11499beac33de70cf11af72b1332225fa762a85626b6463a7e0a46b35b4140d23a3d25d8c6c60cd90d5b79
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 3ccb815587c6..56612a76fb96 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 3f5522fbebb6..459f2e52ac50 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,3 @@
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
 EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
-MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
+MISC metadata.xml 483 BLAKE2B 1bf3e7b5b52878a5a985d77c599103b95c1216b49e5d0a1310f4733b077163bf7c2816e651f789e1feb71e2523c650f8dcd4c4fa5d0cd893b1794433c2eacaba SHA512 bb7db97672a8195197d42d1b8476699a0e3758c102c9d64bfd6b6193259d201465869faf7e84e22319707521e15c2a0e712f008339f75b97015683a019284bc0
diff --git a/media-gfx/opentoonz/metadata.xml b/media-gfx/opentoonz/metadata.xml
index 83ff81ea39b7..2075a63003c3 100644
--- a/media-gfx/opentoonz/metadata.xml
+++ b/media-gfx/opentoonz/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index bc57e8b465d4..eeeeaf05c4e2 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,21 +1,7 @@
-AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
-AUX openvdb-4.0.2-fix-build-docs.patch 1436 BLAKE2B 5093138c7d1dbc7177c7a956b0b9e82a7661253f29ef3d000664735190791028439b403680d220acb748d7dce063ad5781d91802444295ab32ce91685540178e SHA512 e8908dc4eeb6e4e6694c6ceabd8a5965f04d74a53ac733436e45d0e954e8732205daf149fa2d0dddbc3894c276b52ba3db20acc2c6d091d9b008c7d85ff8db23
-AUX openvdb-4.0.2-fix-const-correctness-for-unittest.patch 1654 BLAKE2B 339e70de004c4a5b626100d8db21c4bf23e20953cfadb0bd8becf64116c2f47e8f83566074df4748d1ad7642a557e18f6cb4889495dbfbc8c826dbfc023f39c5 SHA512 25098a15a014ea3e78cb61f4aebce9c217a6e1ffc650df4a372c5b0639cc08b48e24788671d885edc9ae3ed89a558a8896ece5c122d0e17f8267d6ee3bfb1ea8
-AUX openvdb-5.2.0-use-gnuinstalldirs.patch 10981 BLAKE2B 5ffdb1ec77280bc926d57fdccf9aa74db470e6031025a79e9503196bf4e4fa1984401eea8e5a7cb386545417014735a17bcf7dfc31aff79b8ef639ec82111255 SHA512 7ec960e07f1b1a81b32445e4cfc3769abb1d75d68076b825857fc12410525875bf50ba316da37d2a189d62162ad28c12530905d6c8696d1caa11b6d6752500a1
-AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 3343 BLAKE2B af20c099993e41a5d067146c166891ebe9bbde39ecf6329fc13d7830d6554388ca17721c44d598aa1d13db939dcdf5d1ea18a8ac9824d36c4899f3ba12ea7447 SHA512 7ffcc699342463bd79406c74b225e8c4033243f62c6d1ec6f8f0a94cc42e8d9262849dfaa1b3ed36a7818e576341ba90071a61350e7854a6993766a1fbd8f38f
-AUX openvdb-6.2.1-fix-multilib-header-source.patch 1536 BLAKE2B 8c08943217c457bf5137464f225db04aed64933f8b6e5257909d470193c5b64bce321b40029b30897967e17574514753e7787dbcb36d0e66396ecce674312f80 SHA512 331d47d2b0e41853ef6ce2d652e3ae3524f197188a0e1314b082e4c16eaffef7e34ebaf4b12e26cb519e6282bcf9747529f93ca9e85c32b4b26fe81efaa74749
-AUX openvdb-6.2.1-use-gnuinstalldirs.patch 1583 BLAKE2B 5ae011f52122231457e9dd0e3f93191d0965ae23f414459143cafb95c2b9b35d6672b095d4a94f2bb327173aa04456c7cb8248770895a8a0ca12513696ceb39f SHA512 b600367c0e431315436f142e1a4f1cffb780cedd9de16b215211109980132c60ee608c4b4f8b02605c0f55ed423f7e674bed6bea37687eb45c6f9112b54dcc1f
 AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
-DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
-DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
-EBUILD openvdb-4.0.2-r4.ebuild 2619 BLAKE2B 33f31d97f1597c29d1186193ed501c07ed265770d191226abc6d2670fae8878ff8d4314b2b33788b9e638dc6a495aeb25304da2775179981a7916b03df68db47 SHA512 5af992b65fff0ecd20b38f1858b26252bf24c7595236cd9dd0434cc50af6994a88250d103c2708d80422a9a2b5435552a8a1d73c73a3772d2d4b94a058d844ca
-EBUILD openvdb-5.2.0-r2.ebuild 2417 BLAKE2B eeaa6be3d881283150098057b3f994b5380b64a51f99ed1aecde37c7e3c159e55089dce55eaad0eee735a29ca2206f1888977d4db667141311261ee0e1e5920d SHA512 0b7496c770dc053750d720e18cab541dca4f01171adbd4a6d47877645ea26195ac8cfca9816cede88c2c1187010541648a0333def582c31d4654ed5101834745
-EBUILD openvdb-6.2.1-r1.ebuild 2293 BLAKE2B 80218e96b43e30642a1cd47f11663ffb81d4383532a84f81c642ea5a6573bae1fce38d3a018c17d8b9a832dc0697e2d63ee1352e7030f09232149aa159b8c49c SHA512 40dc6ed45e3801eea4324da01828b7ea119e4e27888e5376cc249727a7fb07c03e1db90aeeca23964cfb39f47b098ac4b39941a1be20774dcde521e8d7d97ef3
 EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f
 EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15
-MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
+MISC metadata.xml 1406 BLAKE2B 0b9cf9b01f0728bca3f886372a83d983b8ce8aa6612109bf8422a4f21aeb87e6657751388597d74d1d54a57efdf7c9a97b386042f3b988e219cd59c157cf0f52 SHA512 2333d91681f215927b2b2680879066712b285b845e6fcf509681ada38a0212e37190bb06af2d53f419749d9afa89286b2690f03bf2ae662fd7e163bd9f98bd23
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
deleted file mode 100644
index fbb29883fe2f..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2017-07-31 19:16:32.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-11 12:37:40.179360277 +0100
-@@ -3,7 +3,7 @@
- 
- FIND_PACKAGE ( PythonInterp REQUIRED )
- FIND_PACKAGE ( PythonLibs REQUIRED )
--FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
- 
- 
- IF ( NOT OPENVDB_BUILD_CORE )
-@@ -92,7 +92,7 @@
-   ${GLFW_LINK_LIBRARY}
-   ${GLFW_DEPENDENT_LIBRARIES}
-   ${GLEW_GLEW_LIBRARY}
--  ${Boost_PYTHON_LIBRARY}
-+  ${Boost_LIBRARIES}
-   ${PYTHON_LIBRARY}
-   ${Ilmbase_HALF_LIBRARY}
-   )
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
deleted file mode 100644
index cdbb9440a1a4..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-When building with doc USE flag enabled, the doc target is not built by
-default and the missing docs cause an install failure.
-
-This patch ensures that when the doc target is defined, it will be
-built. Otherwise it might be possible to fix it using a separate step
-in src_compile to build the documentation specifically, prior to running
-install.
-
-This has been tested and is required on 4.0.2 and 5.2.0, but is not
-needed in >=openvdb-6
-
-To reproduce the bug, enable the doc USE flag and emerge openvdb 4 or 5
-without this patch. The install fails as the doc file is missing.
-
-To show it is fixed. enable the doc USE flag and this patch and emerge
-again. The install succeeds and the documentation can be found at
-/usr/share/doc/openvdb-X
-
-Patch by Adrian Grigo
-
-diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2020-08-18 12:17:15.261321103 +1000
-+++ b/openvdb/CMakeLists.txt	2020-08-18 12:17:37.101397373 +1000
-@@ -394,7 +394,7 @@
-   FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
-   FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
- 
--  ADD_CUSTOM_TARGET ( doc
-+  ADD_CUSTOM_TARGET ( doc ALL
-     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMENT "Generating API documentation with Doxygen" VERBATIM
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
deleted file mode 100644
index cb2660329948..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Blosc changed the signature of blosc_compcode_to_compname in 1.15 so
-that the second parameter is now const char** not char **. This causes
-compile failures when using openvdb with earlier versions of blosc.
-
-The fix, which is backported from openvdb-7, is to check the blosc
-version and cast the char** to const char** for modern versions of
-blosc.
-
-The bug can be produced by emerging blosc 1.15+, and then openvdb.
-Without this patch, the compiler will fail with
-error: invalid conversion from ‘char**’ to ‘const char**’
-
-To test that the patch has been properly implemented, emerge modern
-blosc and then openvdb with this patch, and the compile will succeed.
-
-Fixes bug https://bugs.gentoo.org/734102
-Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13
-
-diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc
---- a/openvdb/unittest/TestFile.cc	2020-08-19 02:11:48.945711312 +1000
-+++ b/openvdb/unittest/TestFile.cc	2020-08-19 02:13:31.106074899 +1000
-@@ -2666,7 +2666,12 @@
- 
-     for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) {
-         char* compname = nullptr;
--        if (0 > blosc_compcode_to_compname(compcode, &compname)) continue;
-+#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15)
-+        if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname)))
-+#else
-+        if (0 > blosc_compcode_to_compname(compcode, &compname))
-+#endif
-+        continue;
-         /// @todo This changes the compressor setting globally.
-         if (blosc_set_compressor(compname) < 0) continue;
- 
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
deleted file mode 100644
index d72f835adaa4..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindBlosc.cmake	2018-08-28 12:20:33.331930720 +0100
-@@ -37,7 +37,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( BLOSC_LOCATION include/blosc.h
-+FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
-   "$ENV{BLOSC_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -49,7 +49,7 @@
- 
- IF ( BLOSC_FOUND )
- 
--  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
-+  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE STRING "Blosc library directories")
- 
-   SET ( _blosc_library_name "blosc" )
-@@ -75,6 +75,6 @@
-     SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
-   ENDIF()
- 
--  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
-+  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
- 
- ENDIF ( BLOSC_FOUND )
-diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake	2018-08-28 12:20:33.333930718 +0100
-@@ -38,7 +38,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
-+FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
-   "$ENV{CPPUNIT_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -53,13 +53,13 @@
- 
- IF ( CPPUNIT_FOUND )
-   
--  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
-+  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
-   IF (CPPUnit_USE_STATIC_LIBS)
- 	SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
-   ELSE ()
- 	SET( CPPUNIT_LIBRARY_NAME cppunit)
-   ENDIF ()
-   FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
--	PATHS ${CPPUNIT_LOCATION}/lib )
-+	PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
-   
- ENDIF ( CPPUNIT_FOUND )
-diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLEW.cmake	2018-08-28 12:20:33.333930718 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
-+FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
-   "$ENV{GLEW_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -51,7 +51,7 @@
- 
- IF ( GLEW_LOCATION )
- 
--  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
-+  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
- 
-   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-   IF (GLEW_USE_STATIC_LIBS)
-@@ -74,11 +74,11 @@
-       FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
- 	ELSE (APPLE)
-       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-@@ -107,11 +107,11 @@
- 		)
- 	ELSE (APPLE)
- 	  # Unices
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
-+FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
-   "$ENV{GLFW3_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,11 +50,11 @@
-   )
- 
- IF (GLFW3_FOUND)
--  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
-+  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
-   SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu)
-   IF (GLFW3_USE_STATIC_LIBS)
-     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3
--      PATHS ${GLFW3_LOCATION}/lib
-+      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
-@@ -64,7 +64,7 @@
- 	  )
-   ELSE (GLFW3_USE_STATIC_LIBS)
-     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw
--      PATHS ${GLFW3_LOCATION}/lib
-+      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
-diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -38,12 +38,12 @@
- 
- SET ( GLFW_FOUND FALSE )
- 
--FIND_PATH( GLFW_LOCATION include/GL/glfw.h
-+FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
-   "$ENV{GLFW_ROOT}"
-   NO_SYSTEM_ENVIRONMENT_PATH
-   )
- 
--SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
-+SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
- 
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLFW_USE_STATIC_LIBS)
-@@ -61,7 +61,7 @@
-     FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
-   ELSE (APPLE)
-     SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_DEFAULT_PATH
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-@@ -84,7 +84,7 @@
-       )
-   ELSE (APPLE)
- 	# Unices
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-   ENDIF (APPLE)
-diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -45,7 +45,7 @@
- 
- FIND_PACKAGE( PackageHandleStandardArgs )
- 
--FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h 
-+FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h 
-   "$ENV{OPENVDB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -56,10 +56,10 @@
-   )
- 
- IF( OpenVDB_FOUND )
--  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
-+  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
-     CACHE PATH "OpenVDB include directory")
- 
--  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
-+  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE PATH "OpenVDB library directory" )
-   
-   FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
-diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindTBB.cmake	2018-08-28 12:20:33.335930717 +0100
-@@ -42,7 +42,7 @@
- 
- # SET ( TBB_FOUND FALSE )
- 
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
-+FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
-   "$ENV{TBB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -57,7 +57,7 @@
- 
- IF ( TBB_FOUND )
- 
--  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
-+  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
- 
-   IF (APPLE)
- 	IF (TBB_FOR_CLANG)
-@@ -86,7 +86,7 @@
- 	LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
-   ELSE (APPLE)
- 	# MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
--    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
-+    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
- 	IF (${CMAKE_COMPILER_IS_GNUCXX})
- 	  IF ( TBB_MATCH_COMPILER_VERSION )
- 		STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
-@@ -32,6 +32,8 @@
- 
- ENABLE_TESTING()
- 
-+INCLUDE ( GNUInstallDirs )
-+
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
-     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
-@@ -414,7 +414,7 @@
-     )
- 
-   INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build  \"${PROJECT_BINARY_DIR}\" --target doc)")
--  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
- 
- ENDIF ()
- 
-@@ -423,37 +423,37 @@
-   INSTALL ( TARGETS
-     vdb_view
-     DESTINATION
--    bin
-+    ${CMAKE_INSTALL_BINDIR}
-     )
- ENDIF ()
- INSTALL ( TARGETS
-   vdb_print
-   vdb_render
-   DESTINATION
--  bin
-+  ${CMAKE_INSTALL_BINDIR}
-   )
- 
- INSTALL ( TARGETS
-   openvdb_static
-   DESTINATION
--  lib
-+  ${CMAKE_INSTALL_LIBDIR}
-   )
- 
- IF (WIN32)
-   INSTALL ( TARGETS
- 	openvdb_shared
--	RUNTIME DESTINATION bin COMPONENT Runtime
--	ARCHIVE DESTINATION lib COMPONENT Runtime
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- 	)
- ELSE()
-   INSTALL ( TARGETS
- 	openvdb_shared
- 	DESTINATION
--	lib
-+	${CMAKE_INSTALL_LIBDIR}
- 	)
- ENDIF ()
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN "python" EXCLUDE
-   PATTERN "cmd" EXCLUDE
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.336930716 +0100
-@@ -107,6 +107,6 @@
-   ${PYOPENVDB_INSTALL_DIRECTORY}
-   )       
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   )
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
deleted file mode 100644
index dd0b83540aa3..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-This patch is an updated version of the patch created in dracwyrm's
-patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
-correct IlmBase and OpenEXR dependencies are found.
-
-In subsequent versions this functionality is taken over by
-altering the directory the header files are searched for in
-multilib-header-source patch by Bernd Waibel
-
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-28 12:25:19.807755722 +0100
-@@ -83,11 +83,12 @@
-   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
- 
-+FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
--FIND_PACKAGE ( ILMBase REQUIRED )
--FIND_PACKAGE ( OpenEXR REQUIRED )
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( OpenGL REQUIRED )
- IF (OPENVDB_BUILD_DOCS)
-   FIND_PACKAGE ( Doxygen REQUIRED )
-@@ -111,8 +112,8 @@
-   INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
- ENDIF ()
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
- 
- IF (WIN32)
-@@ -184,7 +185,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -192,7 +193,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -246,9 +247,8 @@
-   openvdb_shared
-   ${CMAKE_THREAD_LIBS_INIT}
-   ${BLOSC_blosc_LIBRARY}
--  ${Openexr_ILMIMF_LIBRARY}
--  ${Ilmbase_ILMTHREAD_LIBRARY}
--  ${Ilmbase_IEX_LIBRARY}
-+  ${OPENEXR_LIBS_LDFLAGS}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   m
-   stdc++
-   )
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:25:19.808755721 +0100
-@@ -9,8 +9,8 @@
- IF ( NOT OPENVDB_BUILD_CORE )
-   FIND_PACKAGE ( OpenVDB REQUIRED )
- 
--  FIND_PACKAGE ( ILMBase REQUIRED )
--  FIND_PACKAGE ( OpenEXR REQUIRED )
-+  PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+  PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
-   FIND_PACKAGE ( Blosc REQUIRED )
-   FIND_PACKAGE ( TBB REQUIRED )
-   FIND_PACKAGE ( ZLIB REQUIRED )
-@@ -29,8 +29,8 @@
-   SET ( OPENVDB_LIB openvdb_shared)
- ENDIF ( NOT OPENVDB_BUILD_CORE )
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -91,7 +91,7 @@
-   ${GLEW_GLEW_LIBRARY}
-   ${Boost_PYTHON_LIBRARY}
-   ${PYTHON_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   )
- 
- SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
deleted file mode 100644
index e8cfac755d3e..000000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This patch changes the default location that the header files look for
-IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
-and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
-
-Without this patch, compilation fails as it is unable to identify the
-required IlmBase version.
-
-Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
-
-diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
---- a/cmake/FindIlmBase.cmake	2020-02-02 01:03:55.000000000 +0800
-+++ b/cmake/FindIlmBase.cmake	2020-02-02 01:09:05.000000000 +0800
-@@ -168,9 +168,15 @@
-   PATH_SUFFIXES include/OpenEXR OpenEXR
- )
- 
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
-+  set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+  set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
-+endif()
-+
- if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
-   # Get the ILMBASE version information from the config header
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
-@@ -178,7 +184,7 @@
-   )
-   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
- 
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
deleted file mode 100644
index ac73d82f9c34..000000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-01-08 22:16:00.493079361 +0800
-+++ b/CMakeLists.txt	2020-01-08 22:16:44.790285583 +0800
-@@ -252,6 +252,8 @@
- 
- enable_testing()
- 
-+INCLUDE ( GNUInstallDirs )
-+
- # Add our cmake modules
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2020-01-08 22:16:07.362646127 +0800
-+++ b/openvdb/CMakeLists.txt	2020-01-08 22:19:54.638308684 +0800
-@@ -492,7 +492,7 @@
-   install(TARGETS
-     openvdb_static
-     DESTINATION
--    lib
-+    ${CMAKE_INSTALL_LIBDIR}
-   )
- endif()
- 
-@@ -500,14 +500,14 @@
-   if(WIN32)
-     install(TARGETS
-       openvdb_shared
--      RUNTIME DESTINATION bin COMPONENT Runtime
--      ARCHIVE DESTINATION lib COMPONENT Runtime
-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-     )
-   else()
-     install(TARGETS
-       openvdb_shared
-       DESTINATION
--      lib
-+      ${CMAKE_INSTALL_LIBDIR}
-     )
-   endif()
- endif()
-diff -Naur a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2020-01-08 22:16:14.452199013 +0800
-+++ b/openvdb/python/CMakeLists.txt	2020-01-08 22:21:45.311324663 +0800
-@@ -232,7 +232,7 @@
-   ${PYOPENVDB_INSTALL_DIRECTORY}
- )
- 
--install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION include/openvdb/python)
-+install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/python)
- 
- # pytest
- 
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index aac3bf03086b..4690483cd9cb 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -18,12 +18,6 @@
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
 			Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
 		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-6.0.0" name="abi3-compat">
-			Disables newer features to maintain compatibility with ABI3.
-		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-7.0.0" name="abi4-compat">
-			Disables newer features to maintain compatibility with ABI4.
-		</flag>
 		<flag restrict="&lt;=media-gfx/openvdb-7.1.0" name="abi5-compat">
 			Disables newer features to maintain compatibility with ABI5.
 		</flag>
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
deleted file mode 100644
index 841627eb807e..000000000000
--- a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="abi3-compat +abi4-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi3-compat abi4-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
-	"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
-	"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
-	"${FILESDIR}/${P}-findboost-fix.patch"
-	"${FILESDIR}/${P}-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${P}-fix-build-docs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	# To stay in sync with Boost
-	append-cxxflags -std=c++14
-
-	local version
-	if use abi3-compat; then
-		version=3
-	elif use abi4-compat; then
-		version=4
-	else
-		die "Openvdb abi version is not compatible"
-	fi
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
deleted file mode 100644
index 30a8f69cbd0d..000000000000
--- a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi3-compat abi4-compat +abi5-compat doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi3-compat abi4-compat abi5-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-build-docs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local version
-	if use abi3-compat; then
-		version=3
-	elif use abi4-compat; then
-		version=4
-	elif use abi5-compat; then
-		version=5
-	else
-		die "Openvdb ABI version not specified"
-	fi
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
deleted file mode 100644
index 5179dddc6da3..000000000000
--- a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi4-compat abi5-compat +abi6-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi4-compat abi5-compat abi6-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-util/cmake-3.16.2-r1
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-multilib-header-source.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local version
-	if use abi4-compat; then
-		version=4
-	elif use abi5-compat; then
-		version=5
-	elif use abi6-compat; then
-		version=6
-	else
-		die "Openvdb ABI version not specified"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DCHOST="${CHOST}"
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index dc9686d47faa..f8de6d8cfaa1 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,4 +1,3 @@
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.7-r1.ebuild 1276 BLAKE2B eeb891d29b9c9d82e7c1c116d165fa2a25c2b9f33ff6f203f9ccb9d7b67ccef93479de68167dadbe759a4528a2cbdbebd5d53d5ff2a7e84e972d3b102c92ab64 SHA512 100d4f63355561d080ba04de7df9a1b8ad4e89145a458ac4363f1c94da78620df146206e5fefc7991f38ea3d355c69aa0cd4e7417b19be76d694034cf2df9bae
-EBUILD optipng-0.7.7.ebuild 1278 BLAKE2B 9a7a74a421262531b22ecc233ecb31a6aafe08594277f72c13d31397570f19d928b207be4badfd2b433c51f1f1cb5b66d99101369689156c620e02b6f07cc6a4 SHA512 592f16ca8af44761a574ae5dce71cc49f8bc05bb45fc815f1e74cc3105ab6fe428c151ecf9fd5fa1434e9a19b89816b64cef9e9c2742fb66c5deb0178a7b02e7
+EBUILD optipng-0.7.7-r1.ebuild 1271 BLAKE2B b6de3c8946621ad6a2bbeceeebf9162c63e65eb8689d6312447938efe8c025c56be5de8e518891c4a59c883aa6b4c71487d3eb29bfd821db3a239ef6c5b8d2e4 SHA512 d20427ac00acab76579f96fd120b0b27c7563949697effb6a61e891fb4e817fcd4a2d1dbec43bb2399f29e60f05b7363c3c7b1afd70b8aa3a541df3e6da9ef4a
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index d09924d7eff8..7891be669fa5 100644
--- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
deleted file mode 100644
index 6afec58daccb..000000000000
--- a/media-gfx/optipng/optipng-0.7.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=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-DOCS=( AUTHORS.txt README.txt )
-
-src_prepare() {
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
-		src/optipng/ioutil.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-
-	eapply_user
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	einstalldocs
-
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index cbb9aa68126a..cff8189822d3 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,3 +1,3 @@
 DIST qimgv-0.9.1.tar.gz 670033 BLAKE2B c1461791af4e6f73e36ec85968102e694f87acc904d270292ce8133206f9987f061ed02045d19058f76e448ce0410e9ffa38341253342b63b8a521183abaa1c5 SHA512 dbad56ebced421cafe6f5e03314fed5ed47e1c98405bac24a89f28f2684484af4f1fa6cc2b37f79e6afa7a1375f76881a8072646405691a47750a95032e02e2b
 EBUILD qimgv-0.9.1.ebuild 1200 BLAKE2B 07a1c8d6973b5057f6b35787dc80320b14e9cda3508e6fda87647ca317934a95713bbadcba240e98cc18c60ea0b24c823b1908ed1b12b2dd6da947df31a6dbcb SHA512 bb7846e169df31b8fec03c5ff3c3fb25f80728101b574635ac97f26af2560bf668ecc70f713b0cd54888bde2d00cbf6e7065828b8e0dd865b412d38a4a26863f
-MISC metadata.xml 533 BLAKE2B d0ca121069311bd9a2f996eec811bb5e2ad4c329d06a024f97d561b3d322e60c97fb40565c5d6de5b53f15f258a33f5e5ae98ac2ee3219bb05f7e61b68c29b00 SHA512 3f377ab27c3f1a18276eb86d05428f5414c28792270e51b61ecf25e8a89a086646988ab7cbb43a89b5ab8c8946daceb55ee5ca15ca1ee35e30fbfb2b1dff87ad
+MISC metadata.xml 563 BLAKE2B 1b8f06bbb82b2cdd850109cd43522f2ba1810064e9516abd1ea3bcc3d23f97d923bd8cbaf10a716e0ad031073d1947f7688d49a4b40b5fc85cd17d618bc14393 SHA512 21edcd7ebe4fe11c3bbb7e8ea7bdb0ca48b639775d6919c816d8d62998d56b377ea3aefee532505f79ed338e0604e536199f3a7098f1d1087561baf462d503c5
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index 09edd32618cc..67e6d0aaae86 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeff.no.zhao@gmail.com</email>
 		<name>Jiayi Zhao</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index fcd6a487ecd9..26a05192f0ab 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 6aae652f09156896e9e746762f80df9e49b5433034f196aed56cfaf145289972806da4a899c7dee8eaeffd5a2e45fcb70c2d4ba344d37dc266d036096f3e593b SHA512 3227db2f0a07d5042be87a7c8e82d5516c6697df41312d78dec6a0c642cc02bd52b8685577c51f8b93173c7212bb8c7080bb057d687ab04ff729359683e3c280
+EBUILD qrencode-4.1.1.ebuild 810 BLAKE2B fa910f059cc13a5c29c9a0cacb514b41951342f447f94a2475ca2dd1d3e7696e101e4d4bba128fa65bec3b945f6e06ce257d39d5839bb724d69525513c0c50c8 SHA512 9dae35f9d8d47ea645eae4e5d39eb940181dc17da2b117d1344566e45178b5e4205e3cad23c8289e3b2bf128763d7e48939a983fd393deb03798c1492740e017
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 94c2c12fd48b..e30ccba4b199 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index c256627dcbd1..d8cda2007479 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,3 @@
-DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
-DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
-EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
-EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
 EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158
-MISC metadata.xml 365 BLAKE2B 7f954a20d61ad3c5f034099555edf9141e5d24b3dca5b47f8c9f53ef9f7e9422d10dc458dc3b4693288d182f579173a58b85708920a4b1d52576f07567397306 SHA512 ca26a61740ecd1b5ed7197bbc06c91f48e2955db05e2c7952edac28f99dc394504140672148214d202d61d673e4294ecc037457dc0f77bf4b790fc36e668eee7
+MISC metadata.xml 395 BLAKE2B e0084b1d83ad44a411b1d9e8af1502f1e316bb54de76b4bfd985320b701bec7a25ee0edee70da14f4e5aace94ec437c8a8918ebadb1b79e6c77658924d270f96 SHA512 3a80a8d6a966d11806f07eddb29cdc1407c1925addb7952a6f1734c446818c79acfcb0777db6e114b5765d39cbb4d380907a4c4cf477ae77217452bb2c75994f
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index db7bb13ec0ef..ead2b4f098fa 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vivo75@gmail.com</email>
 		<name>Francesco Riosa</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
deleted file mode 100644
index 8af21b12f820..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_rc/-rc}
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	dev-cpp/gtkmm:3.0
-	gnome-base/librsvg"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
deleted file mode 100644
index b51ffe1ca52a..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_rc/-rc}
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	dev-cpp/gtkmm:3.0
-	gnome-base/librsvg"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 9e0cc60f9f0b..490843dc9753 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,4 +1,4 @@
 AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
 EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1218 BLAKE2B 8ff23f43d569456c80b70b3e8b3296903f4feb7eb4837ffd16fa8033e6fb63306e02a7053d193877f6dae06eeffcff0a2690ed6a260f1e8fa2c07060281faff3 SHA512 200ab229ffbbdb64de5196a5e0e3c36ad0790bbfb95e42c8779f0697b6be67b01d2750d13dfbd22a5da09b2293a979ede57e12e6d68a2a21d5b5c19dc5642ed0
-MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
+MISC metadata.xml 373 BLAKE2B dae0358240c22b0e32527d07c38c88b46d48e7e2d54993484bdbb50fccbc6c45e9ef9ef0ec03740ac0d1bb00a4080183be59cc791076fd69ddb067b858e6e721 SHA512 90aee2eb26b919c8e6dd18874a65b6e22994a1d8bb3058ca4fe1df604f7dd6e0cac1b22bbf3d5410c97b6604a913f7327deeef43cf0ecccf46d8df1fc25d974e
diff --git a/media-gfx/sam2p/metadata.xml b/media-gfx/sam2p/metadata.xml
index 7dab55141c22..8675e7e5772f 100644
--- a/media-gfx/sam2p/metadata.xml
+++ b/media-gfx/sam2p/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 017d291da88f..1e7fed71fda6 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,5 +14,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
-EBUILD sane-backends-1.0.31.ebuild 8666 BLAKE2B deaca6c649ab0a01ade4679512460a9242faca1b9027a4c373566fa3d7f5962491a71570c93beae98ff87850faf1c278a2b3d0fca90fc60396f1149355676394 SHA512 d151baf548ae59b4488919b0b1f696f4320c853b709adf011f58d58b10f342f780bddda39fa7c16490792c65c101e35af5dc6e1711e96c2aed6215f3f9605761
+EBUILD sane-backends-1.0.31.ebuild 8660 BLAKE2B da356bb6b7aed6bfca528df6db8b49e6451d2b31443003f0187d2b56882ff2d3eff17b3b8f0cb8ca7703a5e4871d6586165e54832cbcda4d923ace23732f264c SHA512 d8b0c1627dc073ac557e6986fa37404825bbf958ea1dea967d13281a349ffa57bc67a67bf4b1bf506138cc58f23fb2e9b15e324a871d6eb49922a20c3f8c97d5
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index f222da2527c5..621a5997d9bb 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 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 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 5f92dc2f18dc..7ceae0241b3e 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -8,4 +8,4 @@ DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a64115321
 EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
 EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
 EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
-MISC metadata.xml 911 BLAKE2B 39abbf46851ded99736fe0541b9d11d05a198e1b9d66e66b1ecd7ff0eb1b1f03c45a7de0439f634ae35954db60bd96b9587bd2014a4f3f2ad561c293d2b0db8e SHA512 9898d7e38439bc5f7ab4ca91ed8dcddd073bc5e4da2c05aa6003f6550b90355d98725765b625e9ffaab40245ec86800908a8300843e05ca092b6e97a8ef3495d
+MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index 41ad86d64fad..f2a29f739d2e 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -12,7 +12,7 @@
     <longdescription lang="en">
         Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
     </longdescription>
-    <upstream >
+    <upstream>
         <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
         <doc>https://manual.slic3r.org/</doc>
         <remote-id type="github">slic3r/Slic3r</remote-id>
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 60990c38872d..aead3c5e5148 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,4 +1,4 @@
 DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
 DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
 EBUILD solvespace-2.3.ebuild 1561 BLAKE2B 0e50f33d7fa511cacdc39bee095e87627afa0f981638fb83fd4e938576f7339536fa9ca7b8cd722327f40376cf269aadd64c939ab755e272dc760e3964f8115e SHA512 3b6801f393df905510f5e5b967a05c825219e2fce973787e46fe9a2af87931ecea38e412d3690ab601225180413b3bda63aa0156d4bad698f5c749106b0eb476
-MISC metadata.xml 1255 BLAKE2B ad5bd3d58bac3c5a6c8542944163431deeec3b219e89302db02b180c3d13af43d41f116243b8ae789af5eeb642b71e8c825241bcd42ee78ab1bd8a0baed24efe SHA512 06429b78540c7a12f28718908e3b5af16e2e99eeab4ae8ba37450dc9e7c87281ae0e2bc20e15da6796451f01f0aef9b544f03d5ac14692f349f7bbfb60d0965b
+MISC metadata.xml 1285 BLAKE2B 334458d57d900cc6ceff7f5f45452eed1a501ca0b4349f6b12a9b3ffcead7e82ba7af35e5afaf262858f95deaafce6d011f6e94e8848a5d9a82ada0699643d11 SHA512 eabafc95662dfc2f842ed84b909fcb547630ddb5cbcb3fca12cc73a3eaa120e6292c105c7aff7a7d32fc2582161f39b11070122cd83f9296d211f02e389ad4e1
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index e63161bebc65..eae5c0980215 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index f95d9142dd06..b57f94911534 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
 EBUILD svg2rlg-0.4.0.ebuild 936 BLAKE2B 2e0aebff38e5ab9c797c26f160d1ddf7d1cab3521d496d5b8c6cb87c9b9ffcf6c09b094fd242f9530a1c1fddd164d232be121a7addba7ffa0ea1b43e549ab734 SHA512 6023cae7de3ef7faa5755a763cb5c51b2d7e0664b873cd9091cb0532101e2dee3a297d286316b3b6b688e8a6dad4f13758e57fc2d7852db458a2269647afb423
-MISC metadata.xml 326 BLAKE2B d96665aae9ade2c5c20694df4c2b415d4d2932d5c00ae1eccb1282d29bab978e84a04ed8e55e1afe48b5880b6bc4d77553501e32251236b94201bb127b16f8d6 SHA512 e8eea3a85411a27856a2b6e5cf6386cc12cb452783c9efb707be3a7b801dfe2fe7d1a1081c61dc24980186551cc50a21f161a7202ff7d9f1f052c8310730ab1b
+MISC metadata.xml 326 BLAKE2B 21a97dc9ff57665d8fa9b2f1b65c837ec87ea45b49ae280126a6d779c905439e0e8871157f19d22f36c391d870e3babf0950e81547506dc88d6466bbd000bb53 SHA512 a8767f2f5ffc953f77a37787428abbff8ffe135a77b2fec796e1a7b0f70c9392a3a0ff2dda9fca6af1651159f31ade73c7f982662fcb23a40ab6c3d91be9c226
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index fd173a687384..a931df149d7e 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 5d3fffa3beaf..51eabb043070 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,9 +1,3 @@
-AUX tuxpaint-0.9.20-gentoo.patch 6029 BLAKE2B 21b038c0fa9f9f643db9ae5782c57bcc0b5adcd89a3fdc33fb80843932bc6ecf036de69c7040a395bc684a81bccea23ea900d262deb23e57837f0fa8c4de2bca SHA512 c9a0c58aba35d93016b1ad63607df132ceb4ed597c398dced8394a536ac668adb2ef0758d4620cf8ba9b22ca874e491615eb9386fff19d7291eb006e62397c42
-AUX tuxpaint-0.9.21-LDFLAGS.patch 853 BLAKE2B 2f68ff92e99697342b1046848b489c7281fa034fa66ae53e512d4eff2889cf32c659eec3ac5ad6ce121e55d871cd76d9cb20839ddd7efb9311cac68b99bc8865 SHA512 d2012c76d2d666d58a89a18f110f6cb136f4ed6819a3d169e4ccdb95ca1cb55469d80aa965f2c1bf222e1957218e4bd64bad47c67b0e6994a47c6ff0e690c812
-AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1b817214e54a470b06170c45e9e0ec78563a600b9251675063ba37a5d97fb63e2f13f37f3e50b0ffa3038e7027c0c0599 SHA512 c860141816023bf0d36d7aac33134e213d0dfb111d9e123c4e1470753eb2a34c6e93046def09ee2a566de1f7b6a9aeb1638f408f935ddbf9c62285129bee7d0a
-AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
-DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
-EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
 EBUILD tuxpaint-0.9.24.ebuild 1674 BLAKE2B 5ba887bd2e613c42def2cfcd2ef6bc2b37ca5dcabbdbc4dece2255301299532b2d3fb203443e47d9e771758354cac65bf582c465e80d6d662ca384be5856383a SHA512 26c1c718f70a796cd0950c6f8abd82665a2230e5dac9d92b43540003cee6c18dd3044895d1d74a85a95afe196edcdcacc72ae3f8f9aa8f5edbdb8656d724d667
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
deleted file mode 100644
index 00af3cb2a867..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ru tuxpaint-0.9.20.orig/Makefile tuxpaint-0.9.20/Makefile
---- tuxpaint-0.9.20.orig/Makefile	2008-12-21 15:04:36.000000000 +0100
-+++ tuxpaint-0.9.20/Makefile	2008-12-21 15:42:24.000000000 +0100
-@@ -137,9 +137,12 @@
- # Icons and launchers:
- ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
- X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
--GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
--KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
--KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
-+GNOME_PREFIX:=
-+KDE_PREFIX:=
-+KDE_ICON_PREFIX:=
-+DESKTOP_ICON_PREFIX:=$(PREFIX)/share/icons
-+
-+ENABLE_GETTEXT:=0
- 
- # Maemo flag
- MAEMOFLAG:=
-@@ -200,7 +203,7 @@
- 
- #-ffast-math
- OPTFLAGS:=-O2
--CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+CFLAGS:=$(CPPFLAGS) -W -Wall -fno-common -ffloat-store \
- 	$(call comptest,-fvisibility=hidden,) \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
-@@ -232,7 +235,10 @@
- # "make" with no arguments builds the program and man page from sources:
- #
- .PHONY: all
--all:	tuxpaint translations magic-plugins tp-magic-config
-+all:	tuxpaint magic-plugins tp-magic-config
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make translations; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -390,7 +396,7 @@
- windows_ARCH_INSTALL:=
- osx_ARCH_INSTALL:=
- beos_ARCH_INSTALL:=
--linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
-+linux_ARCH_INSTALL:=install-desktop-data
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
- 
- # "make install" installs all of the various parts
-@@ -400,10 +406,13 @@
- install:	install-bin install-data install-man install-doc \
- 		install-magic-plugins \
- 		install-magic-plugin-dev \
--		install-icon install-gettext install-im install-importscript \
-+		install-icon install-im install-importscript \
- 		install-default-config install-example-stamps \
- 		install-example-starters \
- 		$(ARCH_INSTALL)
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext ; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -581,17 +590,50 @@
- 
- # Install a launcher icon in the Gnome menu
- .PHONY: install-gnome
--install-gnome:
-+install-desktop-data:
- 	@echo
--	@echo "...Installing launcher icon into GNOME..."
--	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
--	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
--	 cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
--	 cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
--	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
--	fi
-+	@echo "...Installing launcher entry..."
-+	@if [ "x$(PREFIX)" != "x" ]; then \
-+		install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
-+		cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
-+		chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
-+		cp data/images/tuxpaint-icon.svg \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+		cp data/images/icon192x192.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+		cp data/images/icon128x128.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+		cp data/images/icon96x96.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+		cp data/images/icon64x64.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+		cp data/images/icon48x48.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+		cp data/images/icon32x32.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+		cp data/images/icon22x22.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+		cp data/images/icon16x16.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+        fi
- 
- 
- # Install a launcher icon for the Nokia 770.
-@@ -684,9 +726,6 @@
- 	@install -d $(ICON_PREFIX)
- 	@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
- 	@chmod 644 $(ICON_PREFIX)/tuxpaint.png
--	@install -d $(X11_ICON_PREFIX)
--	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
--	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
- 
- 
- # Install the program:
-Only in tuxpaint-0.9.20: Makefile.bak
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
deleted file mode 100644
index f864a8382f09..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Makefile'
---- a/Makefile	2011-08-09 15:19:01 +0000
-+++ b/Makefile	2011-08-09 15:19:43 +0000
-@@ -871,7 +871,7 @@
- 		$(ARCH_LIBS)
- 	@echo
- 	@echo "...Linking Tux Paint..."
--	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
- 		-o tuxpaint $^ \
- 		$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
- 	@$(RSRC_CMD)
-@@ -1043,7 +1043,7 @@
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
- 
- $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c  
--	$(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
-+	$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
- # Probably should separate the various flags like the following:
- #	$(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
- 
-
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 2970eac15516..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- a/src/tuxpaint.c	2011/07/29 21:27:39	1.828
-+++ b/src/tuxpaint.c	2011/08/08 17:59:12	1.829
-@@ -13425,12 +13425,7 @@
-       {
- 	png_init_io(png_ptr, fi);
- 
--	info_ptr->width = surf->w;
--	info_ptr->height = surf->h;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->interlace_type = 1;
--	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
-+        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
deleted file mode 100644
index 295684918f50..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 26 19:16:54 UTC 2013
-Subject: fix underlinking
-
-https://bugs.gentoo.org/show_bug.cgi?id=484434
-
---- tuxpaint-0.9.21/Makefile
-+++ tuxpaint-0.9.21/Makefile
-@@ -80,7 +80,7 @@
- windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
- osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
- beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)"
--linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
-+linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB)
- ARCH_LINKS:=$($(OS)_ARCH_LINKS)
- 
- # Install a launcher icon for the Nokia 770.
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
deleted file mode 100644
index 6c8458138345..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="
-	app-text/libpaper
-	dev-libs/fribidi
-	gnome-base/librsvg:2
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/freetype-2:2
-	media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
-	docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
-)
-
-PATCHES=(
-	# Sanitize the Makefile and correct a few other issues
-	"${FILESDIR}/${PN}-0.9.20-gentoo.patch"
-	"${FILESDIR}/${P}-libpng1.5.patch" #378199
-	"${FILESDIR}/${P}-LDFLAGS.patch" #334571
-	"${FILESDIR}/${P}-underlinking.patch" #484434
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
-		Makefile || die
-}
-
-src_compile() {
-	# parallel build may break things
-	emake -j1 CC="$(tc-getCC)" \
-		$(use nls && echo ENABLE_GETTEXT=1)
-}
-
-src_install() {
-	emake -j1 PKG_ROOT="${D}" \
-		$(usex nls ENABLE_GETTEXT=1 '') install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version "${CATEGORY}/${PN}"; then
-		elog "For additional graphic stamps, you can emerge the"
-		elog "media-gfx/tuxpaint-stamps package."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 3343c98e355f..3c6ad96b9f23 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -4,4 +4,4 @@ DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc
 DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
 EBUILD valentina-0.6.1-r1.ebuild 2189 BLAKE2B aea847aa2313d46ebf889531806f1f9c2a5e1d4865c78faed42587ff76d5908e3012da8af7add2f794c1aba39e924d88800a638cfdaa6f791275cadb06bb1e9c SHA512 d52df819ca46613b322b6de0470180b689e954334838adddd61b12aae3d3217facb731f957c5799830461caa03deaf8463a89ca3b1767af4bc8e2b4632cdc8ff
 EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49
-MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
+MISC metadata.xml 334 BLAKE2B adb795cf61ba0bad2643a8376b1afc2389eef4950c489c44e2b69cb7e403ab9e740a7e624b0965381fdb9966f97f7ae31dfbfce38d94e5825b136bf3cc6ac58b SHA512 d68f81b9908fc9646594320b1fad29670274b96189862c262cb0d8d8f4fe22f5ed8cbbcc2b788fdbcf391288e7b6574467259f4183e5d96c355221d97afaa133
diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml
index 2cb24851e365..6e90b2f8c60f 100644
--- a/media-gfx/valentina/metadata.xml
+++ b/media-gfx/valentina/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 89d649e091e4..8c658c7aacb7 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,8 +1,5 @@
 AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d
 AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978e559f3f0bc4095f5b7750c5d3b54ada39c43631275b0e619a0aed04cabe6a6ca7c0237bed687f46db0eff226f6ab8a6184b08783e09628 SHA512 6ce85095c0cbecfa4d2e9da1a9fa76aec0ef38a585d9aa588403fe9afb76b3faf041144b050e56ad6ec87769cf164c4d7f854003a09d7e21919205903f0f0c2e
-DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
-EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
-EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
 EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef
-MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
+MISC metadata.xml 552 BLAKE2B 77c212a8a42d4ba1b3eb02559c1bd19e6090553dba0c6807b75dc64daf79607f153e94a6ed0643f4a11ab67f6f674884eab46e7f43197b5c6be85f4c9df8013c SHA512 0023614ec058c607d318aa20cdbff5b5caa1f41baa4f7a1c94323ac212ba714ac5af0772b8a09f709328d1e231104eb569317fbe7bc57fa86a7f5c34a20bb5cb
diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml
index 0b0a73b6d999..3d788b8d3146 100644
--- a/media-gfx/viewnior/metadata.xml
+++ b/media-gfx/viewnior/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny Gutbrod</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/viewnior/viewnior-1.6.ebuild b/media-gfx/viewnior/viewnior-1.6.ebuild
deleted file mode 100644
index 501a6fa864c3..000000000000
--- a/media-gfx/viewnior/viewnior-1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils autotools
-
-MY_PN=Viewnior
-DESCRIPTION="Fast and simple image viewer"
-HOMEPAGE="https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior"
-SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	media-gfx/exiv2
-	>=x11-libs/gtk+-2.20:2
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	dev-util/glib-utils
-"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-src_prepare() {
-	default
-
-	# fix for bug #454230
-	sed -r -i "s:(PKG_CHECK_MODULES):AC_CHECK_LIB([m],[cos])\n\n\1:" configure.ac
-
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/viewnior/viewnior-1.7-r1.ebuild b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
deleted file mode 100644
index 65dbbf38b891..000000000000
--- a/media-gfx/viewnior/viewnior-1.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-MY_PN=Viewnior
-DESCRIPTION="Fast and simple image viewer"
-HOMEPAGE="https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior"
-SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/exiv2:0=
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/0.17-Replace-calls-to-getenv-with-g_getenv.patch"
-)
-
-src_prepare() {
-	default
-	# That script would update icon cache and desktop database
-	sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build || die 'Failed to remove post-install-script invocation from meson.build'
-	# Don't let meson compress the manpage
-	sed -i "s/subdir('man')//" meson.build || die 'Failed to remove manpage compression from meson.build'
-}
-
-src_install() {
-	meson_src_install
-	doman man/viewnior.1
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index d3983135816f..3af3759fbb0b 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,13 +1,4 @@
-AUX wings.sh 182 BLAKE2B e9facdbcd7520af19045bab0ef89e835c1e2f1d7b4e8c8d45d64f189a3d2e549336b166f54d77efae68858848ed0ab8aa3c8bacc9973a348851e1ebf52e66f4f SHA512 3b0d606638eb8a2875a90716f18f1584925d56ef43956bde3344e494311a39181171b4ad358a8c9bc20e826c7de727b4aca9d70763a3fe6ee0806747ea32c791
 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df
-DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
-DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
-DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
-DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
 DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
-EBUILD wings-2.1.5.ebuild 1180 BLAKE2B 5bef1461396a3add3e4890f6c5da41bc8f05ed6c83a505af235c589c4f8ec82530cef1abee5ec245fb57bb5cb4399bb9f6a5224e6266c8bb3bd7e9b9bc3b4be3 SHA512 07d6bce373c8cb86aefbdb75af8d993f5ba26df4a5efb57553a9bfe0ccbeda95212989d1857f34afd46c3edbb8f659246790f7b638ba9b447d2365cfb11d28e2
-EBUILD wings-2.1.6.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
-EBUILD wings-2.1.7.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
-EBUILD wings-2.2.5.ebuild 987 BLAKE2B 41187682d8691f9e16585b1dec9648ba0a92d3cb2ffd6ea2e3fa839e4072daa27344086bc4aaeade4b1c0a4afa458717ab65d15a1e395b2b0b8842ad6a29bdfc SHA512 8e6301935d3fea8c0c42151ce31611db965f6a288a72995a3ec12f8e61b8245637ea9683b7fdb2e9c7328c8de2b0b746b064dc6a84444a7ba442661c00f8283b
 EBUILD wings-2.2.6.1.ebuild 1118 BLAKE2B 7256288278684a98dc329f50c2b386e8823357ed592d88dac9322beffc83fd9928b8f3c28249773cf123aee4b80ff920a24ff6300f70aecdcd63103fc460c42a SHA512 b22c3242f8c7f0c756fef38e2fc8fcf971a3de0bef2b8999453ff32ef18588b4f7df39a484a9cbd7caa7a70fc7c14f8ca09bc1ebf211e8107b3befbcc72545e1
 MISC metadata.xml 563 BLAKE2B abcaefdbfcdf37907b5f05dc7b219e27adfc1e8fbdb771833aef706b2e56df205c97c8d827ff18b148242a6d784caecbc02e55ee4ee9bd8d6fdacc1177d4b4c7 SHA512 b78da01e4913d05c103c1a99ab5cfc9567cd202c84be3338713459c7a4178d9faea84feb62ae26592a694745b1eedf01dcea557ace1e36f4dca86c0011bd05c4
diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
deleted file mode 100644
index 3fcebe4b1252..000000000000
--- a/media-gfx/wings/files/wings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-ESDL_ROOT="/usr/lib/erlang/lib/esdl"
-WINGS_ROOT="/usr/lib/erlang/lib/wings"
-exec erl -smp disable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
deleted file mode 100644
index be3e01a0d82e..000000000000
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
deleted file mode 100644
index b6561579ab68..000000000000
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_compile() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-	# Work around parallel make issues
-	# Set ER_LIBS to the top source directory
-	emake vsn.mk
-	for subdir in intl_tools e3d src plugins_src icons; do
-		emake -C ${subdir} opt ERL_LIBS="${S}"
-	done
-	default
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins priv psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 82b7081f1d17..606798f664e0 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,6 +1,7 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
+AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe025440481bfa8a68085d4bd0a46decb5dff9c6ce743ebc0dd30bcd8f3333fc45e041db19e420bc86ce1d1965a084a788882c7d68f1423c884ff8fe SHA512 861683353000e0c25991b64ab70af3839641d6e01f48756798acd5903124890d646fe4f9ef54f6c22c4d857994f2d0adc415dcd83534fb85300e6dbc5128631d
 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 3033 BLAKE2B 30c47e083bb1b15226142ac35265d73745d1e6bcfd8b1b03f8d6834e6b1f6ce7230fe3f610b45e0360b905c9c23d86bd5c3536ba85fba41b44985cabe9905cf1 SHA512 a72113718e7cf63bdf5bb4116be027cbb61d121c988460754f239a6484ca62e0dab237784e9443856fccd640ba160ed9bc8783dde5b59b65f87d82bf6943aadd
-MISC metadata.xml 1060 BLAKE2B b9000a78998846ab5f48afbed71afe450edcafd0251e2fa1390719d766b74b803732916f943c458c56ec6e50db6a4f17c1bd298dbfd20bedf22307e8aa58bb48 SHA512 f61ba34063cc4bea75398a379a82f666f0b85b5d9f1ade9ec98b358ac7a758809fa4c7fd7f919ae10dc6f491b7b1d20ea062a0a1d77f051ad504925849ea8b69
+EBUILD yafaray-3.5.1.ebuild 3105 BLAKE2B 32a01a24dc8273fdebcb5e51d537341e25721e1c30f68011e7cbb76c10dd376ef3699d3714bc5ba6c473786b5f4611ef010f675a9efb95cc815c36f19982fa90 SHA512 181ad2143517df7b6965300f5f1ccc2f80398d32e1d07c71947977ad4a1c336134fb7296d6e93ad493140dafe69790b3cc8e48b6a118aa78d4573d27fff2e012
+MISC metadata.xml 1089 BLAKE2B 642427525ab36b55b7fefbddbd48f0f4133abadc830c23f7278e5ac2f37643d7a4b228139c3adfe10f7049b5674a4d7440d0e1d3d656f478e88d96ef485e9781 SHA512 ce02f7dd179775bde5ac0661fc2ae838281ac8e25ccba802c9f96b14351cc6ec5aca6cfd6f3882028c9981f398d40554cd5fc5c32afa393212585bc9d9b0bfeb
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
new file mode 100644
index 000000000000..67cb8ca3aad2
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
@@ -0,0 +1,39 @@
+From 2f7e31a06679798c15f737b2725d246a12bcc6b4 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 12 Mar 2021 20:43:20 +0100
+Subject: [PATCH] respect distribution CFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00dfda9..ade65a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,18 +234,18 @@ if(NOT WIN32)
+ 	endif(NOT YAF_BINDINGS_RUBY_DIR)
+ 
+ 	# build flags
+-	set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE)
+ 	
+ 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
+ 	else(USER_RELEASE_OPTIMIZATION_FLAGS)
+-		set(YAF_CXX_FLAGS_RELEASE "-Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
++		set(YAF_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
+ 	endif(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 	
+ 	if(USER_DEBUG_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_DEBUG ${USER_DEBUG_OPTIMIZATION_FLAGS})
+ 	else(USER_DEBUG_OPTIMIZATION_FLAGS)
+-		set(YAF_CXX_FLAGS_DEBUG "-Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
++		set(YAF_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
+ 	endif(USER_DEBUG_OPTIMIZATION_FLAGS)
+ 	
+ 	if(APPLE)
+-- 
+2.30.1
+
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 1200537158aa..b49def01d4c5 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -29,4 +29,3 @@
 		</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
index cca93fade785..2b65a4e8f72e 100644
--- a/media-gfx/yafaray/yafaray-3.5.1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild
@@ -46,6 +46,10 @@ BDEPEND="python? (
 		dev-lang/swig
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
+)
+
 DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
 
 pkg_setup() {
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8cdf1f30b56f..70c493e060c3 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,5 +1,6 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab
+AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
@@ -11,5 +12,5 @@ AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
-EBUILD zbar-0.23.1.ebuild 5286 BLAKE2B 8134b9a4418963c437be927b68a087b8d18fd533195dc05892b091038f500d62a86f23540ae81659dffa973abbfd8603a62c3839924f14f17405c48b8c60ff52 SHA512 34b395448f86e886460be4687f144c961779acf1ddbdd4e9c460fd4848543285d8084e1303c6d422263e143877f98b75b4a556899d98236feaaca4791a7f9081
-MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
+EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
+MISC metadata.xml 961 BLAKE2B c3ad2c531212c82cef3e1fbae09030591863b82d2b404ad65b696b5ebab4d5abe85e9f0e8733e543af393b395940241ddfc3885a0a3654b33d88ce8d60253e91 SHA512 635d3ba26ffc33e712944153cbd062eb7a6b83f492223ead8e67ff7d6e9c1f336641af56e52d1afca032c3a5716d36954d6222cbd0a076d12d2f4f0159683317
diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
new file mode 100644
index 000000000000..be9547ead111
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
+https://bugs.gentoo.org/775656
+
+From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang <byang@debian.org>
+Date: Thu, 31 Dec 2020 12:56:26 -0500
+Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
+
+One of the AS_IF() macro was not properly quoted. This commit
+fixes that issue.
+
+This patch closes: #132 (fixes this bug report).
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index df0220a8..db4bc902 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
+ 					    [with_qt="no"])])])
+ 
+ AS_IF([test "x$with_qt" != "xno"],
+-   AS_IF([test "x$with_qt5" != "xno"],
++   [AS_IF([test "x$with_qt5" != "xno"],
+     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+      AC_MSG_NOTICE([using moc from $MOC])
+      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
+@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
+      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+      AC_MSG_NOTICE([using Qt version $QT_VERSION])
+      qt_pkgconfig_file="zbar-qt.pc"
+-     ]))
++     ])])
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 064f2be75872..14483e82c58e 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index 2f529efbe041..d74a878a969a 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -84,8 +84,9 @@ PATCHES=(
 	"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
 	"${FILESDIR}/${P}_fix_unittest.patch"
 	"${FILESDIR}/${P}_musl_include_locale_h.patch"
-	"${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/zbar-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch"
 )
 
 DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index aca4ce9ebfe5..3e03c8b3f369 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
 EBUILD Field3D-1.7.2.ebuild 796 BLAKE2B d15d78c64f8fabcf4648232d536d054e63f87e23254150cc3fded4e23fbed9bf10362265bdbed64fabdab8ffa4c1fbfef8221a0830ee814be7d6aed32cfd2fb3 SHA512 9ef2edf4968ac27009d5447a72ac0ba1925f09e5b0c686ed378759d3b3464e8a944cb3b85660f39bcfeab8c9d25ad330bb1568633d1f002b5bdc79c02bdce0c7
-MISC metadata.xml 708 BLAKE2B b783e8e9cc226dbf51d9033659f49ad45587757791112f704a799a081b02d34f4ec772701f7b88c3bbe1c31a10a2b9bb80ddd51eb5d61376367bb99886c6dad8 SHA512 421af157753908d4743f552d65c649b8852ec4811a9b58eac99b63d377cf3bb289beccc5a6a8c6862884a48c8ebbc4aa9deb7f62fba4d329e17346712ab0f514
+MISC metadata.xml 738 BLAKE2B 54b6f297754128e0782bdc31cc415b6c8a163042c1298ed5168c86bd9d3c4b2a217460480a29e4af9c0c5d88ec480746962f4d1b71477a251f7eabe5d9ff8483 SHA512 65c03d6240be5a22c27c63b43aa129151e9a6fdbb947728ac0a2ea4edc2b02194d0c08edbf12301e127136182b54ed2457ad543d883d4b113190cef08ae89bcc
diff --git a/media-libs/Field3D/metadata.xml b/media-libs/Field3D/metadata.xml
index 34763bb24f95..7c20c015eead 100644
--- a/media-libs/Field3D/metadata.xml
+++ b/media-libs/Field3D/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 41db74e493e3..4a6a5d589cac 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index 3227b926aa11..509c391aef06 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,3 +1,3 @@
 DIST ampache_browser-1.0.3.tar.gz 73608 BLAKE2B 057143939fba168e55e450bf7a702eb9f0093432191de5103117b0bd661618704183d40bf468aea08368cab2f0a3eab63c7ca016a305793cf922d03f02380058 SHA512 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c
 EBUILD ampache_browser-1.0.3.ebuild 607 BLAKE2B 1b22490b3989ea447cecf7d3e026f93e3ee8ead1f37441cfff1fd408caf5baeb9ef9357709fad3d11d8d4f29bf5e01e1880936422bcbf38fd19a5b1366c0ea96 SHA512 8c806aaa54a8e27171c9519e200e062f0b53dd39b27adab2268adfa10194fb62e59a774708b39208fb13644d0759a195ef7ae0eadb1a9ce23f576b8d74502c50
-MISC metadata.xml 470 BLAKE2B bd5d864586a58f4f52c781bf056cdfe0f3ba9dee7544c2e89a050b5c07534257b6d464fc5ee85c3da6e8ca3b4ab8a840682e3e3e874c221834fb5921e8a5c2e9 SHA512 08a104211da6abdd2eee64dd4a24647f838a324d3a20a430d9ce676df02e5a0785562c34a06c7d0be43a9e3225ef767ae320d401e2199f0633948823e6377429
+MISC metadata.xml 499 BLAKE2B b8907a1516bf5a36ff6dea40a51f09432369e84cd4a4c2fbe595f3cf589b90ae4957480f54f52c5283359ce3ea760279c3ce472fe3fb7058b43f66e962421ae7 SHA512 0455bcc3e0eb06217d7bcfebe3f58be67fa7c92a99f4977ab0c6c5e5eed1212288e037b60992a25c71b95410fb2f434852fa934ec59096c0e40c20910fed64c5
diff --git a/media-libs/ampache_browser/metadata.xml b/media-libs/ampache_browser/metadata.xml
index 495779750ab6..6a17c98f84cc 100644
--- a/media-libs/ampache_browser/metadata.xml
+++ b/media-libs/ampache_browser/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>openhs@tightmail.com</email>
 		<name>Róbert Čerňanský</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index ca40f2976b00..971dcb3a9434 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -2,7 +2,5 @@ AUX aribb24-1.0.3-add-missing-curly-braces.patch 935 BLAKE2B c9ca9e029ffe686a12f
 AUX aribb24-1.0.3-fix-default-macros.patch 1511 BLAKE2B 04b32f01928d66389c771f57886634275ba2375f793710d68d10d51a395beeb94b2eee33865161af0d43307515147c11b69bbd9aae3460962e781ea7c9a96369 SHA512 acc4efcdacb196a3c8d1d5d9af4e44e48cd58e634dc065eddbb859627c1bdeca2202a9bec369125a8bb51ec2818767a59b06e7ceac01a4be00ec6495788306d6
 AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c171785f25b39294c78f8f4f0d2cf610298d0ecc951071b758c33bc1d68230859f032f9e7191a11dd6f7995c4e112a62705a87a54 SHA512 ab9cf73d508d5ae4d570ddf50cb6e914738312951aee49ff010df46d37fc9fd3be67accec518bc43562a12e228fa0d420f005a29c5d17bf1c38bf6bc3a8da090
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
-EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
 EBUILD aribb24-1.0.3-r2.ebuild 854 BLAKE2B a105663d20dea83af10b3c0957eedd9021bdc962cf93cca0df1547f8a7093fb1bc3ce68400d418aa710e510ea4e9aed516f1b785300355fad7cf4c080f1581b0 SHA512 ec92fd6c633a985bb8fbdc432cc74b78dbf8dcaba026f7c90eeade7733dabda87be1875a001e3cb8b44c514ae332d8aec7d43ccafa3d4582a975c6461a28a872
-EBUILD aribb24-1.0.3.ebuild 616 BLAKE2B ce1ecd3b136e91fd0982f9905c99326241293146fa31a13ab4948943200df4f40dd850e8bd0c5c6b0b60d3030f895d544c8352ecafbdc6c8e900080da6a4eebe SHA512 6f40d29f3a3c0b69e2b00ddd754b75648619d23b76549eb8e6fa9e0c3a0fe011be923dc01bc76c6e2ccfd5aee361c38feea3fbae762d3a92ed8b5adc240007cf
-MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
+MISC metadata.xml 392 BLAKE2B 6b8691ab4a61accee57c860dc05a845954a59479e265fdfeb4e57eff84ee2dfd324c60919f3729e1df1ff7527d1ba35a79b9852a122ab49adf5e7bf4489d8289 SHA512 bc3f578e76eba42f06bc775104d77acc9a5a8ce6c09e8aae1b1aaeaf57568e1eb69aae9d79ae5df017b8db3974ddd21c28352c1bedcffba3bdec3db151b69061
diff --git a/media-libs/aribb24/aribb24-1.0.3-r1.ebuild b/media-libs/aribb24/aribb24-1.0.3-r1.ebuild
deleted file mode 100644
index a6cba5266077..000000000000
--- a/media-libs/aribb24/aribb24-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for decoding ARIB STD-B24 subtitles"
-HOMEPAGE="https://github.com/nkoriyama/aribb24"
-SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-static
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
deleted file mode 100644
index ffeba8187ac2..000000000000
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for decoding ARIB STD-B24 subtitles"
-HOMEPAGE="https://github.com/nkoriyama/aribb24"
-SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/aribb24/metadata.xml b/media-libs/aribb24/metadata.xml
index 9c153d03a61d..e9c9d81bc455 100644
--- a/media-libs/aribb24/metadata.xml
+++ b/media-libs/aribb24/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcan@marcan.st</email>
 		<name>Hector Martin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 75bca9f63255..908a431da8c1 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,4 +1,4 @@
 DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
 EBUILD babl-0.1.84.ebuild 1754 BLAKE2B df007b372ddcf5183259fb0cd84733dd6e199c876517a20c6befd0b771e04a4950a929282cb9e0d67246cdb7a521046ee22a9b7ac286ed73d50b5d23cb0e566f SHA512 874afe0607634738fd4ffef5a25df48c118d7a10f1e47919e085a3a2e34e38c9aeb21bac3af17c2b32e41cece3b9c4520395629d516574374319a7010a5a74a9
 EBUILD babl-9999.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
-MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
+MISC metadata.xml 400 BLAKE2B c5653da1c91643fe976b5205210a2636b060ee941b6a766350231bea4bdc0fd2721fec6e72b381905dbd6470a3c72f32661d00eb53837afe358d62cf96b8df24 SHA512 fd1ee3b3dedb0ebff804feb04c144350c6a9da8edae2238b846132d21b8916ce8850d15c6063da2bcc2b97a8faaeda96b1738ca485f0ab22937cc8a80ebc5f46
diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index e7e7a5da0ad0..b1e6755fbab9 100644
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index a05c302672ce..63fd46503a7b 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,4 +1,4 @@
 DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
 DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc
-EBUILD bcg729-1.1.1.ebuild 1221 BLAKE2B 9d7bb232f5b2a2c159e74b6aec66d61566e893a16e9558868089f950e152d6310d75268866ac31f8de996e7fc249e33b108341eb66cef1355dba6bc8726372ff SHA512 199dc4599680259e836f86af3ed94db724dfb7bddd62d84ed249e588ff4a1e6ace63ef4c9929c21565e1b1f81e64656606c48650279c856c2c93b620740d66b2
+EBUILD bcg729-1.1.1.ebuild 1222 BLAKE2B 762ca156f6cb81568bc111cc1f63c564f7a83489401de8f5dd69d0bcdf4839d8e0c1e12f1285a2bdd4c7bc39c9935396a20b22238f82f0ecbadf8065a9facf68 SHA512 6e02f9d81e5497876c33b73906ad4171a80f3707c0e9ba93bbda243ec71257886a14f20c14862dc8d19ce75865614245c67fc413078896e837595ca9bcab73c4
 MISC metadata.xml 318 BLAKE2B f7971ede10d80284559e2a3a9dc9088ff06c588d993f1b0dbcb13667a10495d0390a4ebe2c4e65b8fca8d7369c8600e7f446beb280ce04ef66debf52c0f26ba0 SHA512 b2cd9ed908992ad45a31d4f15954385f5d9bfd7f4659330695aaab3b7d1d1dcac1ed56680c77ab786ea7454b8032fb70332cdd06a74f2e40c3162bdb6d4a0a31
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index cf638a772cfc..b0918c6a824f 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 TEST_SUFFIX="tests-20210101"
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
+DESCRIPTION="Encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
 SRC_URI="https://github.com/BelledonneCommunications/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" test? ( http://www.belledonne-communications.com/bc-downloads/${PN}-patterns.zip -> ${PN}-${TEST_SUFFIX}.zip )"
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE="test"
+
 RESTRICT="test"
 # Not all passing yet
 # TODO: Report upstream
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index d38829adae73..a23ee170060e 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -6,4 +6,4 @@ DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a143
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.4.3.ebuild 1344 BLAKE2B 3d972ab4b4912089f91da2ad2f60df3731ec672c633938bc5ae986facf7d4ddf8b916753f44bffca062cc7334a8ff415dd2311c92cac68b01790f2b003595188 SHA512 bfc148cbbb5cf2846b8bf2d162ea77364207a02bd0b8457362cfa788660a94350776cf5ad4ab8b38d299c560b4a432865fa54592504f31412b44f31fee39b4a8
 EBUILD chromaprint-1.5.0.ebuild 1276 BLAKE2B 32373b8684f8cf429f6893eb147a387dbdcda3328a7f204ed5d004943a116320fb1cb601355457d3b7d0a6e350367c78e47f3d31e74730e0272806da1bd3524a SHA512 f745544934e666fdef0683768906b0332ec6d13c625477c9f2f0656dba19fd59691b428c685c80032506ae0d11acc1a214c1d114336c71e76f5f4b836ff89df7
-MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
+MISC metadata.xml 502 BLAKE2B df06b1e73d069ac54fae83766cfc89cb668c9c43c22e6ea50be9b3e40dd172b6400152804bd9f13fa63475eda8acc1791f0051174af391a22aa58b5899c99e3f SHA512 c7941613a5b06a74271018c079d1b483d816c558bd0fdf0be390e14df90dfa0eeb4769a9af3348d42345516899b828257b583815357b58b11033be9025135b22
diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index 3856e662d7a7..2be9d6f2aa6b 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 0549ae6c3073..1ed2eb1cc914 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -6,4 +6,4 @@ AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce
 AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
 EBUILD coin-4.0.0.ebuild 2763 BLAKE2B 50e79002571255b544aa0e69151ed5b7e86fc916f6c4ba5f500aa2ad3a006817017ef2fe85653d801fc6a8927ca386664a9807f8a52636c501b4bf09ca00e0ce SHA512 68be6c6a83e9ca4b6f5b644d8744b88b28ce5d81801652f90ff0e5067c8c2f7715bdef818557b41ede049d9adf0d5f9ca51e8253f996723244c1d60a9fc6bb10
-MISC metadata.xml 455 BLAKE2B 66b502796e3ec2229c84491f50ccfef1f1fe4694a4272cd4db8323d67803740ba21e5d5a592608ae4887bc04bdeb80e6819a0130805b2702c1e880c8cdd5715e SHA512 913f9d064f160c8191244f284df8df21690e2e42864badc726dd09e7e2c529e2c831c77452c4e9218bc490347d1c03f8b9b5318078908d820a8a5f31eb016f47
+MISC metadata.xml 455 BLAKE2B 4f758c80686540bad749a9435f691e607d8f6c9a887fff9ae1103a97a127639b0424c33610325e3d27520a19fe8e86b7f033a1a808661eb90d8bbf7a14d3dfb6 SHA512 89fd0aa7f56add853a4c4019db9e5155488d3c039d61411fa490f659ad92de0d92e596982e6d11d4e93adf5942548ed77abb0e52507ce3d3bddbcd492f1b5421
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 8c9ef4c9014e..4cc8278876dc 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index f95909c4fbeb..aae5a7d6ff2c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -5,4 +5,4 @@ DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd
 EBUILD gegl-0.4.26-r1.ebuild 4918 BLAKE2B fed1558637b7204e42276acce1686e082c30872da393ceb587fb65fa5799868e6a3e547fd053cdfdb4d03944e13e739f6e7d0f612b145a20275a94c851fa3330 SHA512 be8f2fc4138d83fe1d302ae195a31d5da438be83daad88c729bf1bdec28a31c8677a469143e1a8f59de8ad48a8032405c04396ff6b05f2b9e5a726232752c395
 EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4
 EBUILD gegl-9999.ebuild 4579 BLAKE2B ad31fb273d8f344da9e3e9b3574896170c9b1a433cfdcf4af98c6c3d335ea177086acaf00f9b1c6f3de081b87a000a3620e2271c0e44c66ffe740fa29343988c SHA512 90b820a15cd92aaa9f33c062219e78af5f93145ea1fd0b89966bf9966ef98e69bcba6d95cda47c511a2e8cb0f129058e7203c84aa100497c92a80397916a24f7
-MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
+MISC metadata.xml 580 BLAKE2B 604088ef1ce307cb04f44e6c204355569136168f6f574a3b58a5ce374b9e9d4e41476107f11cd5990d0ae39ace5db5420e372c7c88d409b38930cc8b6030b3c0 SHA512 a59cd50a65117f265616e2b595ec3cc95a59f9caac46218fb137af2f62067c5563a4dc53930188b6adf13b0548f02b637bb8312863ee1976ace90ec509e4a2f1
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index 3aa9cb9ab8d7..6445ed4ffd22 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 06a4dca1fab8..e1ee8cbf4552 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -1,11 +1,8 @@
 AUX glew-2.0.0-install-headers.patch 457 BLAKE2B 284563a64b8f7c01fb13f0dda57acd3d9ed410035cf1be7a8bf6dd9eb07dd84d0ce6a725b8a1999123e61a8de3cb676340eb1092db048e898b84ebe745906441 SHA512 a1a46eb47b4ccbde3dd11d97e4b0be6000a5dfba87e4c9d65d142e572beabd6b6efad2ee278062bc4dd57bb001b65300245fc301f36b11b429b760b4ad385346
-AUX glew-2.1.0-mesa-compat.patch 560 BLAKE2B 385adc6854a8b6cece3c1c5fa5452c7cdb5f99cfa13ce4818c500836803c1ed6dc6f4a6ab43f1add19ee76adf8daf076458a5cbd64012f2c1b6a9802bd98d791 SHA512 15117b0e22786311df0fd614ecba5230d5ec083d0d6acd457b7ae301f75a842c56e4ed50cc0187709fa11cdb2b59e3edeed2b5bc8cacc1b23caca4c1b837e520
 DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
-DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
 EBUILD glew-1.10.0-r100.ebuild 1908 BLAKE2B 59364c25acda1a16267dd8cd552161edce0666c0871a1d79bd70ed1229da1ea2115e1cb8e53609a3471b534ab0a09268335ed1024578787eb857b05028682e52 SHA512 88b6c7add297fbf7b8b954b761faa14020d614e96bcabc51e48d9dcc7da98c022062173c19188d996ad5fa294d989a9df14e62fe296259bf84093bacdffcab27
 EBUILD glew-1.6.0-r100.ebuild 1881 BLAKE2B d32880f9de5e91a332f2b42e3c3649e22234ac152e1216d944cab4be1866887673a2fa14de3e0136984b13dbb89ce75d125cef8a338507651185ea9f2b25a8e5 SHA512 a628e0b5eb4e6dc1691688ad59223793686e9d899046a1713195dcc69c7a467cc8acf23ad9ed5f5018088342b9c27bb51d08b58aec9c73c0dc87781c11417e42
-EBUILD glew-2.1.0-r1.ebuild 2485 BLAKE2B c2392a9ccf544e793c9e818c6933d222a0885b848beb38b1cc45b706e12455018a756cab16d4c06d71058c58aa06650e31339b2dfb4ab71a9cad2686de5aef4d SHA512 840c78fafa0f0c533290c9a9e9cfa68f3a8a1c3ff33c7f39118b229eb433a6638fa13dc47733d5076451e213bf63b7adafcf7202d1c62932e8cac0de7dfcb582
 EBUILD glew-2.2.0.ebuild 2446 BLAKE2B df522bb082823fd231b72a622bdd81a07c9722fd491b309ef29b1a8fb4017bf0c8559d72daa80b69075d0fe37915d27573d478c735d73acc0e822fbcd19cd823 SHA512 5bece96e3a75a5c95309ec324a26e5915c7b41c18d58c78ad97ae248eca97cec5d339fd178fb9431d4e0f0466491cb490cdda370935c2b0b99fc04f62609baad
-MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
+MISC metadata.xml 367 BLAKE2B 0ad00ad189fd494aa7c89bb30ab03d4bd13f05876bacb215c7cd5ab4b0dd61a35aef1ea0857b3143bf065438e9ce01ecf86ca61fb059fcea53ff9796c69d00c6 SHA512 b7df9f67584854dc8b6010bc804cc8940aa663c5640b2ba2c9c260ad5776b9ceac9c5afbcdb3eb5f37da75cf85b59eeee911d37661e318c3f5fecbfd6ef5b9a9
diff --git a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch b/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
deleted file mode 100644
index 391420e8138a..000000000000
--- a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/include/GL/glew.h b/include/GL/glew.h
-index b5b6987..a9f9e4b 100644
---- a/include/GL/glew.h
-+++ b/include/GL/glew.h
-@@ -93,7 +93,7 @@
- #if defined(__REGAL_H__)
- #error Regal.h included before glew.h
- #endif
--#if defined(__glext_h_) || defined(__GLEXT_H_)
-+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
- #error glext.h included before glew.h
- #endif
- #if defined(__gl_ATI_h_)
-@@ -109,6 +109,7 @@
- #define __X_GL_H
- #define __glext_h_
- #define __GLEXT_H_
-+#define __gl_glext_h_
- #define __gl_ATI_h_
- 
- #if defined(_WIN32)
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
deleted file mode 100644
index 8688c0b15c13..000000000000
--- a/media-libs/glew/glew-2.1.0-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
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.0.0-install-headers.patch
-		"${FILESDIR}"/${P}-mesa-compat.patch
-	)
-
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	default
-	multilib_copy_sources
-}
-
-glew_system() {
-	# Set the SYSTEM variable instead of probing. #523444 #595280
-	case ${CHOST} in
-	*linux*)          echo "linux" ;;
-	*-freebsd*)       echo "freebsd" ;;
-	*-darwin*)        echo "darwin" ;;
-	*-solaris*)       echo "solaris" ;;
-	mingw*|*-mingw*)  echo "mingw" ;;
-	*) die "Unknown system ${CHOST}" ;;
-	esac
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		SYSTEM="$(glew_system)"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-}
-
-multilib_src_compile() {
-	set_opts
-	emake \
-		GLEW_PREFIX="${EPREFIX}/usr" \
-		GLEW_DEST="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc README.md
-	if use doc; then
-		docinto html
-		dodoc -r doc
-	fi
-}
diff --git a/media-libs/glew/metadata.xml b/media-libs/glew/metadata.xml
index 055629524908..a123c0ed805d 100644
--- a/media-libs/glew/metadata.xml
+++ b/media-libs/glew/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Games</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nigels-com/glew</remote-id>
 		<remote-id type="sourceforge">glew</remote-id>
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index cde14cb51d71..9eb2d24ef565 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -9,4 +9,4 @@ EBUILD gmmlib-20.2.5.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc
 EBUILD gmmlib-20.3.2.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc4e481343079d82702ea37b8f6040fc2a5786530d269a19fc9b7b40bbb8a85a701009ae13f8643420b347c210 SHA512 1414c4b738aad2d13dd78e45db2d5dff3e5dd9bbfa946991980e0df21bcdaa6d9b87e83530d5bd01b6a9d81ebb1df214ae3f9b26377e9740c022e73f08756817
 EBUILD gmmlib-20.4.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
 EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-MISC metadata.xml 490 BLAKE2B 306c3fddcc4a5569f5bd040f7cfb545b78a052d6786b54fa0751cf980b753d9097b09b2a03c0c9d11be40c0dab7dde2a92d1c1bbeb3775e1e77dec847230a93d SHA512 30cbe0310e14e2ebd354ece2d7b710db50ee9cbb7d697370f5bda57b2b823f9d93a6e3c07844c3f8d90b91fabf9236ac450c9fbaa5aca5438ef0d4d5feaaac0b
+MISC metadata.xml 504 BLAKE2B 504d2971f8948eda1c88d8e6a2b83651552dbf753e7cc1e0230afd075e49350533f5498405b75ed79e54f793a7a6d72571b83a2ff57222ee3960e496fb5923a7 SHA512 60f62309d8e03e23178486bfe6d3e9b23e472de83b2ae5ea1e44da0a26d56b41c12601d3e164e5d3d33c8cc9873314c35f5892abe4059912c39630c4477289ff
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index 61c45b70c770..da6252177ce6 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -4,7 +4,7 @@
   <maintainer type="project">
     <email>media-video@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>k2k@narod.ru</email>
     <name>Evgeny Grin</name>
   </maintainer>
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d4d52ab6ee96..a2d0c46878f7 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,6 @@
-DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
-DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
 DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
-EBUILD harfbuzz-2.7.2.ebuild 2661 BLAKE2B a6bd48d29506d99817b97a68464f7f662b72e6c0e8df0f72def1b5ca25cc145645cd96663487b4c3152fb6b99837167700677f4e2b8785f23d93cbaa80abb900 SHA512 733df9dbbe4036f88f66672da20c58345a42f602c097cb846a75c34626dae380d70cef4ed4f0e4a8909518c93ffb9dbd5ddad8a9f98d6c163e395b5f33860353
-EBUILD harfbuzz-2.7.3.ebuild 2670 BLAKE2B 7440f374a018e052194a2deeec2f810839769466de248dc1d9c66db2bf5321f3706e8e6ac186b9457fa1e3f189489746a4c707d8c0763076b17d255e90a0f193 SHA512 a62aa5bb0e35b5d68022c43985eaad257306900ba4399b4e65c9a4fd3f99b78d6220204eb2148cb936c84656a3edaf55513afebe74b996b8b7cda033e89e12af
-EBUILD harfbuzz-2.7.4.ebuild 2768 BLAKE2B baf2486a8dd32b590c304d7c1f2da1e0318aa8a173d8249088061b38998ccfe5625f5af245220f312b0dd2a5589f8931748df0d340bbc2b338f3d024e750fef6 SHA512 b52d9c5aa13a76c713670b19090d042d3b8e7c74ca0fa3e95cc02cb9155a39cd8e6e890c99623130602b0f1226f5e75f368d96773129a79ebe6759d6fc26be57
+DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
+EBUILD harfbuzz-2.7.4.ebuild 2767 BLAKE2B a1c4735ac9cbc60c398c2aecd86d6fdf700caf0c47d19cde266b3b471874e9761ad72f30299adc812ecbf9c65eb2c8928ebbe6c5f6d16d985812d0f1779d4dc0 SHA512 66f1d810305e2108de21d7fab29f499bb9992c32adbf88dcc37acc9aceee3c8feaca89ee9be8c85b30b6d358fe0d1c0e63af99cbc2d9847cf345e49e30aa84fc
+EBUILD harfbuzz-2.8.0.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
 EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
deleted file mode 100644
index 95ab9eb8acd3..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-meson_multilib_native_feature() {
-	if multilib_is_native_abi && use "$1" ; then
-		echo "enabled"
-	else
-		echo "disabled"
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local emesonargs=(
-		-Dcairo="$(meson_multilib_native_feature cairo)"
-		-Dcoretext="disabled"
-		-Ddocs="$(meson_multilib_native_feature doc)"
-		-Dfontconfig="disabled" #609300
-		-Dintrospection="$(meson_multilib_native_feature introspection)"
-		-Dstatic="$(usex static-libs true false)"
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
deleted file mode 100644
index aa205f2fc508..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-meson_multilib_native_feature() {
-	if multilib_is_native_abi && use "$1" ; then
-		echo "enabled"
-	else
-		echo "disabled"
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local emesonargs=(
-		-Dcairo="$(meson_multilib_native_feature cairo)"
-		-Dcoretext="disabled"
-		-Ddocs="$(meson_multilib_native_feature doc)"
-		-Dfontconfig="disabled" #609300
-		-Dintrospection="$(meson_multilib_native_feature introspection)"
-		-Dstatic="$(usex static-libs true false)"
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index 30f4061f3c5d..0a5cf370b8b6 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
new file mode 100644
index 000000000000..dd5ebd99dc19
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+meson_multilib_native_feature() {
+	if multilib_is_native_abi && use "$1" ; then
+		echo "enabled"
+	else
+		echo "disabled"
+	fi
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local emesonargs=(
+		-Dcairo="$(meson_multilib_native_feature cairo)"
+		-Dcoretext="disabled"
+		-Ddocs="$(meson_multilib_native_feature doc)"
+		-Dfontconfig="disabled" #609300
+		-Dintrospection="$(meson_multilib_native_feature introspection)"
+		-Dstatic="$(usex static-libs true false)"
+		$(meson_feature glib)
+		$(meson_feature graphite)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index e5298c68d6c8..505bf5145c21 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -5,4 +5,4 @@ DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
-MISC metadata.xml 661 BLAKE2B 3392b45aa602d98cd1f9403766c7829cc2744893629489e267d2a6c568a5d934114012f8b6ec84acda5bd42f06c3b2ebad8bf25cb540a27b80485696c82c7469 SHA512 6a0773377471b23316f73e7aba924a7421432a1d75da858354c72685eb6602cce7c7e16a5232ca47df3d8f9f3465f1bc5c1f58259733fcdfaeeeaa2b0327bdef
+MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index 3c2a8e7fe57c..5c5c3591f7a6 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index f65e382d008f..a37724090828 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,4 @@
-DIST intel-mediasdk-18.3.0.tar.gz 6313246 BLAKE2B cd8658252594aa8cec08839783c41e2f6e0a9c56366a35d7f900a7a625df77bdef8dd9d69feea1a1ed93c60699fdae5d90ea131ace39641cbb396c9ea9ea07f6 SHA512 7a5f91b2ecdca375dd5dd4c1678d61b34d96b0f4dfa1b64efe61962f66eab9bfdfac6cecb9610180c8cdcb624c467716fe5f34027950bfaed1dabd6add7585ee
-DIST intel-mediasdk-18.4.1.tar.gz 7636782 BLAKE2B ced3d0892f884a099427b2f30516f58ec634fc968d9fa89fd3a38e4713f1bd7ee6fdd2a5f178b8012cf07494d170b97fc796789179112ecea06fb1e829a3f2f6 SHA512 7b4396792a259359a9d63a44a471bb48cae580f43f5ac23ed13b8b0b18e2040b44e94fb29264bd8c8d5f99856ce39a27473f0ffa6c6328d2f9b127556c7ea35c
-EBUILD intel-mediasdk-18.3.0.ebuild 809 BLAKE2B 2c4dd2ac73a2f9e0c2743fdbe5005077cc18508e31e67e89c551117288eef5840face13e2249add33b5e07765f42b18be77a2e4f72d4397e52563f279d9e1901 SHA512 e309764a75224a324687a4d7f557104fe115cd9844b1d81890e0d06ef0723c0c8ffb4a1dd51b738e654f74b5795008c3829b1b42da9c7d2d02f70bff1c2e1644
-EBUILD intel-mediasdk-18.4.1.ebuild 839 BLAKE2B 729f269dc573a8f84af0feae7fecf0467949dad707c44f5ae5bdea387c0579fbb51ca9b5a3a7f4b367b4e409eebfa9e2dbc5e159407ee8e2ceec1dbcc1a4c646 SHA512 73f27870a72610d0007610c9aa13d5cc77217cc9957877aea6ffe495d86070d6a2990f3197d748d1a0579b877f358edd4aa64897c875b2b06b4d3d5599261f92
-EBUILD intel-mediasdk-9999.ebuild 809 BLAKE2B 2c4dd2ac73a2f9e0c2743fdbe5005077cc18508e31e67e89c551117288eef5840face13e2249add33b5e07765f42b18be77a2e4f72d4397e52563f279d9e1901 SHA512 e309764a75224a324687a4d7f557104fe115cd9844b1d81890e0d06ef0723c0c8ffb4a1dd51b738e654f74b5795008c3829b1b42da9c7d2d02f70bff1c2e1644
+DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4
+EBUILD intel-mediasdk-20.3.0.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192
+EBUILD intel-mediasdk-9999.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild
deleted file mode 100644
index 84124095543e..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-18.3.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=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Media SDK"
-HOMEPAGE="http://mediasdk.intel.com"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/libva-intel-media-driver-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCL=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
deleted file mode 100644
index 505c3be4882a..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Media SDK"
-HOMEPAGE="http://mediasdk.intel.com"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/MediaSDK-${P}"
-
-DEPEND="
-	>=x11-libs/libva-intel-media-driver-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCL=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild
new file mode 100644
index 000000000000..930261567424
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Media SDK"
+HOMEPAGE="http://mediasdk.intel.com"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
+	S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=x11-libs/libva-intel-media-driver-${PV}
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCL=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 84124095543e..930261567424 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-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 cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
+	S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -37,5 +37,5 @@ src_configure() {
 		-DENABLE_OPENCL=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index d14501c260e3..1d7a1c263dec 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,3 +1,3 @@
 DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
 EBUILD kcolorpicker-0.1.5.ebuild 743 BLAKE2B f14f659014ccf0f984498f0a84c4459e26711c3952a3b37099280dc95b5c0d9f110a70858f56a78f8ef6fd99cfbefe086cbe6239032226a1c9dc0ef0506d76d8 SHA512 2abb05fc432dcc5bac30a45b7211d251090c039aa50ca396b4c0ccd1a4336205efa1040d724ac333c76fbfb65071097c2ad343649a56a4a6b39a57edbcfbadb8
-MISC metadata.xml 582 BLAKE2B 5cabe4fbc89f6b33dd2193707ce455544c8e61139ea78d03220a4acb6833d7d085c8d3470ab0031ead6072d766987b93b4e1f15694898f25b8358bf550868598 SHA512 1b722a703324f146d71a8cbcf807b1e8be67708bbb3af541dbbe1e42958c9f47d5eca36e93f967521f37a2b674068265e7d2c2c7853aaeddfb93748b83794c8b
+MISC metadata.xml 612 BLAKE2B 236c23c5065b8dfb1c1416a8ecab5692b660f24a9451ad56a66aec10d2c88b3efd55dbbccda943d05c873d9d3d1aee3cf28d676703535a35762a9125d0267b7b SHA512 ae6fefb02537b26dde3bc775a2d59c15f1f99225ca183b21f56fda9b7ce1538e825c0bc2e3b001b261565a3191ed11a13b2fa6ac07e2151812e8f2ff351344a2
diff --git a/media-libs/kcolorpicker/metadata.xml b/media-libs/kcolorpicker/metadata.xml
index e8952720fcef..f7dc2368e22e 100644
--- a/media-libs/kcolorpicker/metadata.xml
+++ b/media-libs/kcolorpicker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dflogeras2@gmail.com</email>
 		<name>David Flogeras</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index d8eed87c472c..9d6fee8ffa52 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,3 +1,3 @@
 DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
 EBUILD kimageannotator-0.4.1.ebuild 841 BLAKE2B 9969bcfe22955dc6d1325e6041fea55a36a6b62c39b0fa66977984a58cc71b4d40b2edeb553b783e46534e66f029568f7f825af66987b6f93d2d3dadadb69834 SHA512 9887a7620a1f996a9987071f83bf7f8f3288f8d2f0fac748ddb05ea427316669459b8292e26d3b624907707fbb6dc690435717431c2003e5c7023dd45bf0d1af
-MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2
+MISC metadata.xml 397 BLAKE2B 2d096ac4360843336191b34452b62ac986ffc35a49e05e8d3bc4db9693eb64c99d8b180a14346bad2e0e97d70d77cf759dd33f724796c857e77c6d29b6e5b9dd SHA512 e86c63f5c2889d1d5901c1fd5f3bd906c6b3285f2ded680d1bb3960f5a0ecf07b842d5c5ac25e0b6c30daa3c4183daac572ec56b10078fd626a0533b8946aaec
diff --git a/media-libs/kimageannotator/metadata.xml b/media-libs/kimageannotator/metadata.xml
index 325675c5861e..599a6826fca7 100644
--- a/media-libs/kimageannotator/metadata.xml
+++ b/media-libs/kimageannotator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dflogeras2@gmail.com</email>
 		<name>David Flogeras</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 2633601df7cc..b121ee2c3140 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -4,7 +4,7 @@ AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd36
 AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7
 AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
-DIST lib3mf-2.1.0.tar.gz 15882048 BLAKE2B 9466e1fd30d82600dcc52f61709c1430ae3c129358225162a343ec0d7f489e14572882a9c5239ccd63ea66ee7faec1563fa5aa0e788f28d18ad96db0ae7b9f36 SHA512 05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
+DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
 EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247
-EBUILD lib3mf-2.1.0.ebuild 1433 BLAKE2B 77a7906db88af83ace93bd42f4dce4058bca3d798cc96a11f694cf5ca7fbb9251aa5993fbc7c6b27be565e5a3065e79cea7bf7487fbf459d283d964a79ad9b06 SHA512 6f6fefc60f490668f37ee720ee815d50404514853f200280aa53e28b2c1dfa611aad24b9dee97ee7bf07e0c7b8f752aa786577877a39ebf75fc851dae11b96dc
-MISC metadata.xml 693 BLAKE2B 9b222dffbdd2718cdde2fa6b3ac9b53a4b353900e63fa90af886705a5b1667aa5ac38d9d7b026ee45c6a0f90c7264676476f7ed95b4f2e030842f53a48c8eb73 SHA512 bf0c3889b8c7ea456c3132eb182cb9fa46270ec632114e71f94a818dd1916770aa63627677778e7e4456c94500eb7b4227e03ba44191f34ec8c8a7736b6432d4
+EBUILD lib3mf-2.1.1.ebuild 1490 BLAKE2B d61c1693fed466314d95fb022fbf72fcb0630ed0ffa09c82e629d03d63c22988113e1b60c80afc82e8080b01f5de739928cc62f289b01d3ad8f37aab64e4a06a SHA512 68187b38d7bc7c1faceb019c11aa010c4f1ec69031342d69c44a24eab897c8fcb8aa33c21c153d66ad5b8f087fabcf89bdc3309ec4a3c9db51ef6f866b1a9943
+MISC metadata.xml 723 BLAKE2B 487aab86ed2e1105547a270a4f1e717e65d1c838d8f8f336b9b6fbac2969b1a2649b366e9484f2acdb73415a1f65792621e708725a3e5f7a257fa0d4b93512ae SHA512 4b006ff1d394ca718d20b890ec35cd21d10a433dee4778303ca8c8e12fb161d83e2b54907718d59d8a887a24f3706e2b379c0588263cdeec08f80041c55ca9ee
diff --git a/media-libs/lib3mf/lib3mf-2.1.0.ebuild b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
deleted file mode 100644
index 39ab6d0de474..000000000000
--- a/media-libs/lib3mf/lib3mf-2.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-# the included ACT binary is a statically x86_64 built one
-# see https://github.com/3MFConsortium/lib3mf/issues/199
-# no package available for ACT yet in Gentoo.
-# Keywords x86 and arm64 can be re-added after we have a package
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-cpp/gtest
-		dev-libs/openssl
-		dev-util/valgrind
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
-		-DLIB3MF_TESTS=$(usex test)
-		-DUSE_INCLUDED_LIBZIP=OFF
-		-DUSE_INCLUDED_ZLIB=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DUSE_INCLUDED_GTEST=OFF
-			# code says it uses libressl, but works with openssl too
-			-DUSE_INCLUDED_SSL=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( CONTRIBUTING.md README.md )
-	cmake_src_install
-
-	cd "${ED}/usr/include/${PN}" || die
-	ln -sf Bindings/Cpp/${PN}_{abi,types,implicit}.hpp . || die
-}
diff --git a/media-libs/lib3mf/lib3mf-2.1.1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
new file mode 100644
index 000000000000..35900c26454e
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eapi8-dosym
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+# the included ACT binary is a statically x86_64 built one
+# see https://github.com/3MFConsortium/lib3mf/issues/199
+# no package available for ACT yet in Gentoo.
+# Keywords x86 and arm64 can be re-added after we have a package
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	sys-apps/util-linux
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+		dev-util/valgrind
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DUSE_INCLUDED_GTEST=OFF
+			# code says it uses libressl, but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+	done
+}
diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index 0e6ade406c88..7907c9b23f8c 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 1b534b66a081..78814be0e893 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -4,4 +4,4 @@ DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
 EBUILD libavif-0.9.0-r2.ebuild 2726 BLAKE2B 4032da82246d4a3abf95dea3a731386f956c8cd99e0efa654703b03d50bded33fb7885bb8db77407dca9d35e412d868d13bfeeb35a590031f041404226ad012c SHA512 f35d29f062547d27b1943d3425a7dfbcefac3f6e55cceccdf075d5a5bd4a62aac256602b4b96071891cd66241c40bf6e34500388177c9fda98e7ddedb4379998
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
-MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
+MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
index a1119e8ee76a..83b6a9f33506 100644
--- a/media-libs/libavif/metadata.xml
+++ b/media-libs/libavif/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>dnovomesky@gmail.com</email>
     <name>Daniel Novomesky</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 97e73f41f16b..170158a5a38d 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -1,5 +1,6 @@
 AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
+AUX libdca-0.0.7-slibtool.patch 864 BLAKE2B 67e8bc01ae9b6911215d25eb2bf86567332a11410e4e755d532d19efbb6b88bcfb0d7050aa4e25aaee108ee00f9ff1faf1bfd7c89e131a0b3438e68116dc5dba SHA512 65bc66482da55b2d08812819789e9de56ae019073b57f462fc0ffa86e5dc033daea2f25817f08714093511fa3a5a7d57fb72cd75a9aaa847721fdd0ca1c120f6
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
-EBUILD libdca-0.0.7.ebuild 1322 BLAKE2B 72d80c5f1a3ebabffddd9d98fe78a1b219b3e4b4770d5d03748f394c930e086a583e5b0e82f5b62b5ef96dbcc23483dbf855deda398bd8ae98c1c0e9c89bd8db SHA512 50e0a63121bfe6b0fdc61be0b6c17e9a120023b6ea1c0892f9c21c4dc581024c7bcfcdd6d52e25d3f729045f0eeb71da2a5d811ab2f84c4364b15af249d689c3
+EBUILD libdca-0.0.7.ebuild 1364 BLAKE2B 56b893da56ac8fae8e7d21302939fdaa226f97bb95766a797482ab6ff41c3e7ff307a72921516ac3ca7c28f72b31fd1dae499352bc44736806971b89eb290d38 SHA512 c790547b7a2eecd94821dad401a26e1fbdb9f2ba2acc3127918e10119f25ca8dcc607c115678b19662c038ed739fd4dab89a16e98e31253543f5c3b8d95cb4f4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/files/libdca-0.0.7-slibtool.patch b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
new file mode 100644
index 000000000000..cd6b89d060e7
--- /dev/null
+++ b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
@@ -0,0 +1,22 @@
+https://code.videolan.org/videolan/libdca/-/issues/4
+https://bugs.gentoo.org/775602
+
+commit c54898d587fda740b10e32055c5464eeae289889
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 16 10:21:52 2021 -0700
+
+    build: Fix -version-info and -export-symbols-regex typos.
+
+diff --git a/libdca/Makefile.am b/libdca/Makefile.am
+index 05bdaca..891fb25 100644
+--- a/libdca/Makefile.am
++++ b/libdca/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libdca.la
+ libdca_la_SOURCES = dca_internal.h tables.h tables_quantization.h \
+ 		    tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h \
+ 		    bitstream.h bitstream.c parse.c downmix.c
+-libdca_la_LDFLAGS = -no-undefined -version 0:0:0 -export-symbol-regex dca_.*
++libdca_la_LDFLAGS = -no-undefined -version-info 0:0:0 -export-symbols-regex dca_.*
+ libdca_la_LIBADD = $(LIBDCA_LIBS)
+
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 177a74cd0a33..a273f17b90e0 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -19,6 +19,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.5-cflags.patch
 	"${FILESDIR}"/${PN}-0.0.5-tests-optional.patch
+	"${FILESDIR}"/${PN}-0.0.7-slibtool.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index c1f9b1489f58..f4b24445eb7e 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -2,4 +2,4 @@ DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420a
 DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
 EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
 EBUILD libdvbpsi-1.3.3.ebuild 927 BLAKE2B 254ae502f37717eec6cf629464d2f05a9ff965ce3bf4be50e8538ff4f671f9a4f4676472124492d6f87f9d7faeb86f49a4f47f14eec94e9bdc1adcc3f2595b43 SHA512 670204f62ed10927d9d30e2e37f97fa7f9df4f4074bc2969c72013c6fae854076fc8b4ac98700c1515db61327c3526517530f5f496db65e4afe2fa7b821bf7e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 258 BLAKE2B a542b7d3d6fe41d4d6804f23d3f4eae32151dd6a261fd9c53df59afc03381e2621ef74094f612a796d2bfdcdc994b210f47935bb396e4ceb58e9901ffbdbd50d SHA512 5744904454b157ef1753d1858d293f35e7aa0d9c513a96823f5efc1ea7fde3bcbe2a50ae70f56be9c9c15463b820d45fcdfd52773a58d078252aceb0e93992f6
diff --git a/media-libs/libdvbpsi/metadata.xml b/media-libs/libdvbpsi/metadata.xml
index 6f49eba8f496..ff82108a6c99 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libeot/Manifest b/media-libs/libeot/Manifest
index db75fd619a16..a70efaea374b 100644
--- a/media-libs/libeot/Manifest
+++ b/media-libs/libeot/Manifest
@@ -1,4 +1,4 @@
 DIST libeot-0.01.tgz 38651 BLAKE2B ba8362035dca9db2adef636ce153f4fd1d75c20cf0f9671d6f1aa64e055dfbe7644811f44751e11eb4660f0902c14b66be8cdbb45c85325bfd5dd5b37e388b15 SHA512 ff8c3d92b948159171c76306d4a74758974c7ee26c801c5de48805f182b542015286b1e53cfc6dc4524494becb74fb55185701e06fc9be7c16f2d89ac0275941
 EBUILD libeot-0.01.ebuild 699 BLAKE2B 0c11508aa73202b5d6c7f13f0b727e75a2c47a7ec29925924f8aeb0f7a8e72e3c2ab41a4a86a0d039ccdbf3ecba815c93a07df04e038d4f9f276a9b99888fa0e SHA512 320ec7130a189d83acaf070d33afd43e887be53cb04d26a43a84343ef9d4806d20ae10b38ecbfe028e28bfe8b2d95d3355ad7cebe4349caa7b1f666974c1aa22
 EBUILD libeot-9999.ebuild 701 BLAKE2B 86559b59fb7277b41c41fc1946ece801593d14efe3f5e85764cffa7298156e05985bbbd2ee4c537962a053231893cf57f1c4a3781ed435878c4f37bbfe085240 SHA512 69703795571e69821014e21606cef15e2078266b19fb052b2bd7d407127467182b2a4595a991542900337ae9c37a2fd2325a33f48996cada59d937ae1b82912d
-MISC metadata.xml 337 BLAKE2B c6d31479b9350645a6c6107ebab0c4f2d0d8e1d718fbe2aade40545c91bf838741aca0f302dd9cc6254b34a7a82529d04bae46355438996473540e7be6285f09 SHA512 f6e8f0e47210206c618ed9d2bbd96bb8837ca31f33ccab14ee487f9922f079f404ddedd563e4213f551aefa3216291189bb89da61a0ece6ed27094ae8226063a
+MISC metadata.xml 337 BLAKE2B b8636ce208e245d250593a208f1a771817442b9270a374a4338769a06f17986f677339e76fd9b803944df5dfa4e7705fedfd5704bbe923e86473d04de95183bf SHA512 699d241b170761e48b15613479a695561576c49eb850e79952e920cba10c96a7cc8fc1dbb39a94095b1298c5005dc0a15e646826ea6924163b53d0c1a9eef14b
diff --git a/media-libs/libeot/metadata.xml b/media-libs/libeot/metadata.xml
index 1064a16ef160..9fc4ed7a61dc 100644
--- a/media-libs/libeot/metadata.xml
+++ b/media-libs/libeot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 95232a8ca1ae..4af638cb2208 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
 DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
 EBUILD libepoxy-1.5.4.ebuild 1141 BLAKE2B 3ab8f35d56300ea3056e3d7f97b9cf5fe95a22a7059710f87800de978b11db4448d17b61e51f5e9e86ad750005d7d113a2dde5acfb02d82d98dcd4e163315f68 SHA512 d1467370eea40684490e64712f11451ce6bfd680cd23e13304e4214825670e2e9054952f31db9c094841e35ff1eb561146850be1747e48c4e414af6e62d1ee73
-EBUILD libepoxy-1.5.5.ebuild 1159 BLAKE2B c151e56dbea8c771a29f379925402838e3599eaacd12777755f28a50d008e6e04231c69da2d0798a754baa8cd96e822065394893066e59045ddcceea6b1d7544 SHA512 e9dbd11a1391132143bb542c54e0f7b632af634a92732ec8a106ff67ccc5a5ae83ef5fee9011b3b2d46517c427b298f3b85afc54b9366bf908af8993918c6368
+EBUILD libepoxy-1.5.5.ebuild 1158 BLAKE2B df22c79551600f1284886d5f7b6d67e982e3f4fbc52806f5f64bbac846371a32880de40f3865db1c48d46f0a8efe801784343ad742048896f062e11c3a3a1603 SHA512 28c53b4fb5c39a7ecb9f4dc424d10facf27d0cc029e10380779fb03720010027b47d2341d3dea6d54b7c138fbdb99d4dcc7af8992d5214e450d864386fdc2a92
 EBUILD libepoxy-9999.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index 2c9831ede9ca..7813206efeca 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 8bac85d7adf1..5fde51e30b2d 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 2643 BLAKE2B e2392e18990b9f71b60d244c53f51aacb2bee2ef0e32f24fbe0c918add43b6677dbf329bd32f6c52b69bb4b45633845bfdf5a51a61f0252b729614373f5f2f07 SHA512 88cd7177fec1cf2b8df7852de6e42731351835b972bdbdf5e448f20307a089cbe66d39fe1b972c620366da2d889d566825d4ed75a4aea99688eb90f0f58dbf8c
-MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
+MISC metadata.xml 596 BLAKE2B 4e8cd1f78c34bc23f8f93a0e37df668e8cfb3afff1e0468ac6e5d90ddcd7bde6d6056f602ca1b6d8979223a439c2a81f99b4abf620615c7fc96d27e0e03f4ab9 SHA512 317d5a82f6594de45b1c4006d70204c4f44f085868521673ca9f92e97db4d6e6c3f02cd7aed39b772f5abfc251dc833a52d72938b2eaa4963824c7454d62c703
diff --git a/media-libs/libffado/metadata.xml b/media-libs/libffado/metadata.xml
index eda35ae2cc67..5dbc78bb37e4 100644
--- a/media-libs/libffado/metadata.xml
+++ b/media-libs/libffado/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcan@marcan.st</email>
 		<name>Hector Martin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 0f13e86ee541..294c919b9e36 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 DIST libgphoto2-2.5.26.tar.bz2 7572381 BLAKE2B 671ef19b1d427a4c9d31bb383b4b0513a6423780910a2fabbcf9d9f45e9060a833336fcda0ccc6456068a702e94f1fffeece41a6f08b882f4e1e65b317e69c52 SHA512 d05a559447ac867f4826d2e20b83831dc4b4776c1e3edc9de0867050a4d39dc45b25a33ec73806282e16f75adb1dded3b59fe428bdb1dde4365c12d7af244cec
 EBUILD libgphoto2-2.5.22.ebuild 6170 BLAKE2B a83709b54295c4994ca246aca207bc5376688155cc29f3d6df086718a7f0dde4db7e9bcb2aa3c686b76ead993e806b1b59dc9754292a6c287eb4d237e9d5f365 SHA512 fcc78f218b711f4b363cd3cfa72bb6dd83ccee3e7656e4382a8160021269a4405429037d387bf0645779603430fe292aa8aed14cd10ad54565ae85c4af9dfa28
-EBUILD libgphoto2-2.5.26.ebuild 6157 BLAKE2B eee3979efcd1506da9e90d6d9e06ad25b1af4bb523c239606ebfa17d3090719c7631474ce497e5e08dc661a5486048b30cb998525ed36c7d3f84cd5a4dc7c46d SHA512 f0038cf1a934a392c5e9aad2f60457559c743b9aa15653e36720e722cca416c93025854c47338010b959e28b61ddafae9acd10eae9dc22318f897d65e000251b
+EBUILD libgphoto2-2.5.26.ebuild 6156 BLAKE2B 01413add0b6e6fe0ba35b79109d2e2fbb2a9036410aa3deebd7dc7a4f890c0abe2d801e4436756215764becb14ed55862854f283c67755993d708c980db17293 SHA512 a5dbad3cf94cb0a4c0b78ee0f0f506033fd18dcf6318c3fd5d9c31725de7dfa24796cf91e6acc799d9ada7e5def8e9a70ccd6c6b3e6bb6400c0542ab07ab2d0e
 MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
index 749274cfef82..22c68ebd81ab 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index b98ac594959b..074145d5be84 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -4,4 +4,4 @@ AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
 EBUILD libgroove-4.3.0-r1.ebuild 1034 BLAKE2B 51ff73ff9ca7beb103c59ec0fa2ec93d3f5ebfcfabe90856635fc4646b1872a498d236b7d816e03037a6512eababa1ca30d2ff4afbd1c1462d27d0607cf51966 SHA512 b3bdb7c215e049b88341244b7b2458869ef949fa9e039008fa561696b2057c38686954852a217674279e5ffc2626181cf9b4fefafe12cd2078727d028906a8df
-MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
+MISC metadata.xml 1232 BLAKE2B 8dde123555809ef33f9f167cc089911344664c56311fb24ca1356a57ec125cb557e22b088804cfe4a29a518b2543b766631951a13e675f7abd58f15e447dc09c SHA512 c4f7ec84107ae50fbc6d728e05628949812018f4faef54a5e2e93505faf7a47e5a533ec1912870f10a18b1412d8a5aa9d5460b26a7723a785b55f3a3282027bb
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index b3286a1df8d5..9f57676a3887 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index b4df71846212..a9292b4ed140 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -3,4 +3,4 @@ DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
 EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B 24f96b3e66c295f77841d2f6e5fd0bb50aceb6ab549925b82b87129c260eff20a8e49a85060d88a343097bdc47388dec7ef44efa4a7ce6f47744b29f2075497f SHA512 e6519e4fb53f129baef66b52c471cec82ee2380c91bcb70675221628c68792dbd330226cc44d8a5928f2d8707ee14b900713226fd42008c655863c3fc16a7719
-MISC metadata.xml 381 BLAKE2B 5ffa518c826118aec9b46d3e964d52f21ef19332b0ee956cc153b992eb5c85af27ebebfb6891156262eb19e65b0b47f076d0940b490fadb42f2b04d16889b550 SHA512 4cf06e9cd0ab6bce4c38f2b86c4875864924616746fb18816f647dfb4cacde6e7678c2f7a20c0de94194e9227d6133efded1f81ac2064b7d0532b445cf041b38
+MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/media-libs/libhdhomerun/metadata.xml b/media-libs/libhdhomerun/metadata.xml
index 70e8a88d6f28..7e23aa8c7dd3 100644
--- a/media-libs/libhdhomerun/metadata.xml
+++ b/media-libs/libhdhomerun/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thebitpit@austincustomerrands.com</email>
 		<name>Wilson Michaels</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 6041086f09e3..033277b7f2d9 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -5,4 +5,4 @@ EBUILD libheif-1.10.0.ebuild 1832 BLAKE2B 9ca2ae7db0359ce08c1438d21853c274fae7c9
 EBUILD libheif-1.11.0.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
 EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
-MISC metadata.xml 1008 BLAKE2B efdcb0e8e478a1c4959b60f942b45feb79f9209157e29b8be19ca862a1f19b4ffad223a531fbb400351650db09285e12007a4d5f55c7762806496cdd8d520e72 SHA512 fd7c1bf830f32c9a9d13cd2471c403ce889dda643027b191e36cc6c1dd9fac4c481946c221cbf186b380bf26cb816b7f8695ea3aa5f57fde15a366c21197203d
+MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 1b9b2ce7ad74..b6cd60663a54 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
-	<flag name='gdk-pixbuf'>Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
-	<flag name='go'>Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
+	<flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
+	<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
 	<flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag>
 	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
 	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index 9f75347c5ca5..f4f7db5a0f33 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a
 EBUILD libiptcdata-1.0.5.ebuild 1147 BLAKE2B 4ffa018e573cc36037329c9b92385e9ff48f13f5aa9ad096eabccc01a47e09c46a97a69edaf70718873d5c8d8eb8081b37287a657473e3b9dc5077a949d709ce SHA512 f1fc1cbe03b7f746af923c779c10a3516e4d8c963bae69344b406f8655e2959066416da4de2c7da6fb66ac21350b89c47fcc50619223eec037999f349e9de5e6
-MISC metadata.xml 1088 BLAKE2B 6871a600af857b89a4d372d514754a1b8c1989d0ca33ad418baf42a9f7baf088e79dea0220a054dfb9518b5edfc766dc5ee39d3c0336304cb61d7e22aa7e8e3e SHA512 bf7b79f193dd31cca18c658a163b1619fb32f92db3310da719725c611f15ae5711ac11285b53063a3e669644e12d80a69804fa04a0050df3ae998c5dcee7d2fa
+MISC metadata.xml 1118 BLAKE2B 4c21b4f165ab3ace10c2762de1e7a512c481151e9d593b1fbbec4d0694bd42e66ac7daed620481a311b5bce7614fcda4283039cd0475ee3d6b2da86edd17a203 SHA512 254be0ab245616bc7952bf02220f8f82d80b772f36f00517688580ab5af7e133602ee33668aaf80a13ec656a4e195401b2b00621410339169ed49d155b3b6953
diff --git a/media-libs/libiptcdata/metadata.xml b/media-libs/libiptcdata/metadata.xml
index e578bbc24402..add8d6517f17 100644
--- a/media-libs/libiptcdata/metadata.xml
+++ b/media-libs/libiptcdata/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vivo75@gmail.com</email>
 		<name>Francesco Riosa</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 9fb55763e2ec..2e429e35e1f9 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,5 @@
 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 1183 BLAKE2B 2dd7af04fafb9c9af1f56b5b0b4e95ddc5d4090277f4fb5948c1bf8a7b55c058b23a13265d6338e111d9a4d843ebb2de2f38157d2a9116ae02abf00108c59d83 SHA512 58f8a7f24783eb53aaa6fb037f8288762e52a7174786ff5be329443a56badf17d1105d3cc661b2a3c04d67aee3476bd7f1046edb455bf39167c36001789574ab
 EBUILD libmng-2.0.3.ebuild 1221 BLAKE2B 0463241e6eb9f36fb561c0661d213838b100727b4e7ef0ef81ae9e903b330b365a711a23f5d70d5400d509b66c30a3d321d29bf0015999b80ff03fc93cdb6bab SHA512 739abb6ab344fa3c2f30897af3eb7ce99a9ee913863fc6784a725fc617eb0e60967c36f1624030724b98e909888f36a9532a540158bf4b1f432b92f679e8926b
-MISC metadata.xml 243 BLAKE2B 1bcbf4a3c9842a0c6f19c77c1bb17f80a5ab562decc5f4eeb25133e967062740c401fd4b8be8edd9a1e346827ebdbcff2e5b94d6b3d3411786c90cd0300dd9c7 SHA512 bf875271b80f39360a138083a69ef53ab64ce04d52e0155de091fe8f2f4742dafbea353833549bef28b43599e91e5a3f3f3dd79801c2fd3302e7cf65007d95d4
+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
new file mode 100644
index 000000000000..02fad4102451
--- /dev/null
+++ b/media-libs/libmng/libmng-2.0.3-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 autotools multilib-minimal
+
+DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
+HOMEPAGE="https://www.libmng.com/"
+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"
+IUSE="lcms"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
+
+src_prepare() {
+	default
+	# effect of 'make distclean'
+	rm Makefile config.h config.log config.status libmng.pc stamp-h1 || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		--with-jpeg \
+		--without-lcms \
+		$(use_with lcms lcms2)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc doc/{doc.readme,libmng.txt}
+
+	doman doc/man/*.{3,5}
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index afbe76002326..a81b3f0f7ddb 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -1,7 +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>soap@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmng</remote-id>
 	</upstream>
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 05ae40a5f169..80e1d115126f 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,3 @@
 DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
 EBUILD libmpdclient-2.19.ebuild 1016 BLAKE2B 5e0bc98e524e1e01f2d2005c94647b2f0aa4641db23a4053fae1efedbdf72643e93ca73fc503333eb09b6e1a51af01c9f2067b0714156c98eaca9a3c86fc411e SHA512 281f679771417c870a096958ba8800cdc68e91ecccd03668c4b3e522d90039cfdeecc0fe7fd36416ca088a18c5eade023b938a4962cc6a45021b9d70e0904075
-MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
+MISC metadata.xml 348 BLAKE2B 6f198fec9246336bbed2abb5203ee34e7f8fd985834838491538e8e5f30f11be11f0a6603b1b13481f0ed0d87a40205c0770418b3e6fb919527babd29596584f SHA512 4d3abc1317b813c67a423258e79a29adfe5c5a456ef8164ec8fb1aee020d9c0f9eb205704fea1bb13d36eb9cfccb5c853646402322df354d54324d8de56a150b
diff --git a/media-libs/libmpdclient/metadata.xml b/media-libs/libmpdclient/metadata.xml
index 4f46ced83bf7..53caf6956cd9 100644
--- a/media-libs/libmpdclient/metadata.xml
+++ b/media-libs/libmpdclient/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 6c49a0894984..2502fad65b85 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,3 +1,3 @@
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
 EBUILD libmypaint-1.6.1.ebuild 1399 BLAKE2B f148cbef7f43874d9e12727dde9cfc952d8cf32dc9ea8b8c26640c0d6499286eed59a3421d2d54215a4e70491cb7542bbc1c9fffc0479ae2d1359ea319f34bbb SHA512 dda2f380ae6b35e254828a61fdaa0e533a354883b8e353461ddc0af62767ebd3c4e86aea926e976ead2669fc58b5a2b32b8e3d5e602eeae95589c47fbc21f203
-MISC metadata.xml 407 BLAKE2B 3c25822ad0cf7c7af7f8f322d35ac4394880dca10ab5f07c7131cd54b7f49398456d2198560130b9c43785f755fb728e2f76eb90ceaed1e00c972dd64bfdb8e5 SHA512 9710f70829c3dd64ff857b49020db0d0217b1feaff1e0b37a0c6e94672bb845d959a14c99b0e82471f272855ea0a00e69e8e74326ba6c00060f5f3b325ade1fa
+MISC metadata.xml 407 BLAKE2B 58fc66fd0988af9aa8346d5fecfa1c44dfd149449d8eb82caf6f89ac98b097a06730b84d43fad6be27d07d76370b0882ef81cd32178557e97e1a4e350e1198b2 SHA512 2c421d05d719f7b7bcf079bac1755f02a9d5346e52ceeedf2966082842b0c12713f02f736c1f6c05083f6f1c66152c1315160606f571bdaedfd81707a147ea45
diff --git a/media-libs/libmypaint/metadata.xml b/media-libs/libmypaint/metadata.xml
index 8a8ba0ec52ca..3639d9072b9c 100644
--- a/media-libs/libmypaint/metadata.xml
+++ b/media-libs/libmypaint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index 38ab651c0f17..dcc49247a55c 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,3 @@
-DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
-DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.3-r2.ebuild 649 BLAKE2B c41050281a2dde479892680c3ae04871b547461cf8a67c8f6fab3cf06ffa76288463ff304150551703fc5b9eb09a4841c2305a39ab92794b74e5a2450ce32ba2 SHA512 7c865ae990c5537faa9debf990fbd3cc6002e1089ddd1428f5269ef60de7ebe80a715b116cd3f3b29270545d0dc1ef53e1b48a506cb6d4f9a0bc23221ca177fa
-EBUILD libnspsl-0.1.5-r1.ebuild 650 BLAKE2B 4a4f71ce652858187906b093f5f4871aeff8efdac62025fffc51202e32ec51e63cf695e5a7329e5a2ebdfc93d7285fce4de849df649d8386d8090799fc899633 SHA512 34cace588eb7fd1c61395abac61042e12e825a4d8c2390c63065f84180c46c7a14f24d30fcad5ae19067889bbfa1840be1e5370732fd7ef62412643c9d3527c1
 EBUILD libnspsl-0.1.6-r1.ebuild 626 BLAKE2B 961ffa3b20fee692d06e07c7e642d83e960c3447a15a61bb4bab846893b6cd56efd7d6fe73a0f2b3eca745b799f641ec1e7a64a70dee7e3bb551ac9864f697aa SHA512 6a5eb8efc5269cd2914d03b7706fcf640621ece48007d5efbdd8c5507e584e8f4caf4e52b887ec2f4ea4b4de6ea8e6815fc5a58e1140f1baac7c0a92e0409151
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
deleted file mode 100644
index cc0ffae7908f..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-DEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
deleted file mode 100644
index 79f812a2e741..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
new file mode 100644
index 000000000000..a1e15e075b09
--- /dev/null
+++ b/media-libs/libopenaptx/Manifest
@@ -0,0 +1,4 @@
+DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
+EBUILD libopenaptx-0.2.0.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
+EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
+MISC metadata.xml 475 BLAKE2B ce3ccc5f113c6178230b372c55e9992731ff55477bdde2efcca199b73d7b2ec66419dcba89c3f368ff9b7ef54011bd92c6cecaf9b3cd64b5a6ab8ea2e0b0d1ec SHA512 7bde88afdf7a137ea5ec1b491dda467eec36d2897f0bd009ca22066614db64531fe5b343cdb426b1e80ef6cf8011db1c43a0a525b9b302496e04cd7d2e97dbc0
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
new file mode 100644
index 000000000000..bac055db1328
--- /dev/null
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Reverse-engineered aptX and aptX HD library"
+HOMEPAGE="https://github.com/pali/libopenaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pali/${PN}"
+else
+	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+IUSE="cpu_flags_x86_avx2"
+
+src_compile() {
+	tc-export CC AR
+
+	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR=$(get_libdir) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		all
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		DESTDIR="${D}" \
+		LIBDIR="$(get_libdir)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		install
+
+	rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib"
+}
diff --git a/media-libs/libopenaptx/libopenaptx-9999.ebuild b/media-libs/libopenaptx/libopenaptx-9999.ebuild
new file mode 100644
index 000000000000..bac055db1328
--- /dev/null
+++ b/media-libs/libopenaptx/libopenaptx-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Reverse-engineered aptX and aptX HD library"
+HOMEPAGE="https://github.com/pali/libopenaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pali/${PN}"
+else
+	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+IUSE="cpu_flags_x86_avx2"
+
+src_compile() {
+	tc-export CC AR
+
+	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR=$(get_libdir) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		all
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		DESTDIR="${D}" \
+		LIBDIR="$(get_libdir)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		ARFLAGS="${ARFLAGS} -rcs" \
+		install
+
+	rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib"
+}
diff --git a/media-libs/libopenaptx/metadata.xml b/media-libs/libopenaptx/metadata.xml
new file mode 100644
index 000000000000..5e724bf54f34
--- /dev/null
+++ b/media-libs/libopenaptx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>joakim.tjernlund@infinera.com</email>
+		<name>Joakim Tjernlund</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 44b36d33125f..6a5345977a06 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -6,4 +6,4 @@ EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415
 EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
 EBUILD libplacebo-2.72.2.ebuild 1887 BLAKE2B 33b04aca370df443ea0be685beac68a201595685edb9298bc8f48540b966ad891485f11e3622d96d28c09e93dbb949aae2588d4763e820d67941e0e327041b42 SHA512 2c9fafa906884c9408a36cbd10e12ada226704431c795a2afdc0e1a122e8b2b273770e5d7181efc38beb0bec45d5e19457180e44b18242d28df2c311f0938fa7
 EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
-MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
+MISC metadata.xml 837 BLAKE2B b3da2bf7d7bcd290fecdc1cc762d9fbdd747e2eaddf114eda7a2700048de5e8087815a98420a3fc1d2d38665e4e28d575f61c0917f8087dba69ecc90943cdb2e SHA512 20768ff4d0bd79cc4d1b9748b0f76874ffb8c060f0922dd913acf97c2ab77259dd5cd5c3dd2dc0b856ca249ac5a68b5ff0e7181d6bce5c7905473e2cbd935151
diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml
index 8538c991f885..898246a18559 100644
--- a/media-libs/libplacebo/metadata.xml
+++ b/media-libs/libplacebo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@haasn.xyz</email>
 		<name>Niklas Haas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index 7d3c7b5030db..29f785d16311 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,3 +1,3 @@
 DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
 EBUILD libsoundio-2.0.0.ebuild 988 BLAKE2B 7551d26be84375a57b51888b8fc72f575f5d04b44abd9e8d3280446ee1f1e9c1fd363a3ab8a7d304d096ff8a05525e61376785614559e202e5a4acccc2a20efa SHA512 619a8078913d0b4af32f9381e54aaadf5f35d74ef478f04e970763b503d9b932be9557a73b86a20ab4a943ce6a013e0be930657d99faadf6b159b86877c1e1bd
-MISC metadata.xml 901 BLAKE2B 8ef7fda2362a78865ad8321bb4724bd9caaf269ace631ada2bdb70fcfc6a8327637718fd1c0134445f51e127e1fe24a55a3527c8b319505bfee25e1e674b127d SHA512 156acbf89a915ba57049e365ef53abaf6c1c986d6ccb07e679bf1f7e39de8d708c8cc321aaf8588a7c529e878fea8b182f1eef60748c12287e4dd6ff16c77fb3
+MISC metadata.xml 931 BLAKE2B 4341fb0b96bd2db96f70db36c1f43d1a35b0bc707bb99d42641026e95fba29ec59a98754e24d5a8ac9ecb7c862548fd54dd5a5bcd95097d63dd68108c0d2548a SHA512 4ca1d7f62d3ecd9c6fd8dc524674f5475ce21f5f4e875a9cc87d74843ae2dd7a5445d52f104902fbe617b0b9e7209916c5ff16483adf686ccce1d6522f2fd335
diff --git a/media-libs/libsoundio/metadata.xml b/media-libs/libsoundio/metadata.xml
index ee1f8b21b59f..d3ab7af3b55b 100644
--- a/media-libs/libsoundio/metadata.xml
+++ b/media-libs/libsoundio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 91595932b8b2..548f86bd59c7 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,3 @@
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
 EBUILD libuvc-0.0.6-r1.ebuild 789 BLAKE2B 7b54213b0e68a9c660ee0159c012ad7f24eb0025ae91770bd5c8395c842c1dccddf825b47fc35366631cf269b0575f79e9fa1aec46906d472af638314f37b2ee SHA512 476cce36b9c961e877329baec2b56750d631e4d5836cbd8e4d16fbdcc5de57e88a7909aea5a51520a8d0e4e1986c2b029b0b6ccc3093493517118a18d3d3a6d4
-MISC metadata.xml 446 BLAKE2B 1c36e6c623d067d28deaec19f5d5b07e7c6509fe7ec3c3a1955c5edc863c38ec6974b2c5c80487b929e64f8e3c03275e708c9a0151151b3f06f1a988af5d9714 SHA512 19c938d7b3f171395552c4758f86cd6d80941e428967c14490d8ef09f0d48b215b8458d1695f390c257e81cc376f7c401e8405f8103c6c68c2b744cafbdb4eb3
+MISC metadata.xml 476 BLAKE2B be17d1664beea3c2f7873c3695a21247b49f44d77e800a36f098867dcdc1e87dda8247dc2a1df101667f39ec018eea7aa71e6c5fb373f0923f1ba20ac98ac94e SHA512 d29fb1cba23ead453d517a351547f98d21fe62f578da3e2603811d4f3fb3f7254717beb76d45770a656469320eec65e4775a525375c7df22697ecfb35fbb9fdc
diff --git a/media-libs/libuvc/metadata.xml b/media-libs/libuvc/metadata.xml
index af18713bf7b4..681013513268 100644
--- a/media-libs/libuvc/metadata.xml
+++ b/media-libs/libuvc/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index ec6d34bb7cb2..8030fbce2fab 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,3 +1,3 @@
 DIST libzen_0.4.38.tar.bz2 129706 BLAKE2B 3e40e31663f655885f47b7674936a765cce032da25fcc3f57604b116414bf4348db363a4745bf98126879de9d2de5d4443af1fe3a1f64a7bafd3525eb1ca38da SHA512 d946cd2349848925e13a3fb6aab5ad4f5aca28bc89b3263faca3096d7bbcae3a4ff9ed2552bf005b4ca1f4c8c8f59856f4c4aafa7c734ecebd078e6fc40a9a0b
 EBUILD libzen-0.4.38.ebuild 1294 BLAKE2B f186937dd8c346d7b039cd0fe2280f3ca3bb68ece9dafabcca17c4545f9b78c23b95b95c735878a3f1524af4ad8e37b5b44ea589357c6f58b4217a9a6f59aead SHA512 5af4b5142f22553706efc7a716d27b00fcd9f479b77e553f60c76249d71966fc72dc4431a3d9b7f8a85c2f24d8fd999e145d5db9fdb39611b7bf1a701ebc89fd
-MISC metadata.xml 391 BLAKE2B 4ca07b5516ad1c5d98991b668b2affbd1790a6bd6a0b4d266e10ed0b0f613ed1d1af538a2a2b0e258f68be98ecfa223c5e907526f811a5ae41e26597aebfb238 SHA512 5ccf372b5f508aa40d170cf71fffe84456b92527a9eb40c18c25c7b82b9c12d52578efebe2ec8914d401225c3fe188c06c55e5cd7e1510d8f43fb4f2603208ba
+MISC metadata.xml 391 BLAKE2B 5082e2db6447f896ebe2f3279ada901b96ddebe24d971a59e20b4200d559949006324d28dc0a41e13b134679a91ea869bf6028bd92bd9392f78b22692be7428f SHA512 b2ad828a68dd56b14f88495cf6c2c848ae1c97ffb87a4b9537fcadafd146bea30ff79b227759a5a900d2a8ca32dcafe583bd0384a3a87fdff5bdd7198e658a00
diff --git a/media-libs/libzen/metadata.xml b/media-libs/libzen/metadata.xml
index e816ffd19d67..7af01c3dee4c 100644
--- a/media-libs/libzen/metadata.xml
+++ b/media-libs/libzen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 79524e6de0a3..d415ca96b7da 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,5 @@
 DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
 EBUILD lilv-0.24.10-r1.ebuild 1792 BLAKE2B 7cb6e3a3c046d518152359e1561c27b7d48cf6b0c09e1b9fa5122d1d71776a18732b7e4b8751f5e2d82a3d50264d7f91a3e3a71bbc1c54ecde27501bc813b624 SHA512 7cb8e4da42e9c0a6edbe448c2b1727b6028e96dffa5dfaf64ecaab5a8c43ad5547e2c7a91de1d8c1fcfcc88eda77d3482917cddfac88801cd5ad31794ac0579b
-EBUILD lilv-0.24.12.ebuild 1807 BLAKE2B eb42f4b72bf742683f7b12cd20b62608be226c63f8aaa214e730df83b29937be76a29c23e0de18f4d9197cdeda017e4e5c38f171be9e9d40beb91c39091dea1f SHA512 d0ec5274e6b5b4e57f665a593e45501e980c6c867e53b932cb747ecb184a205271859af5ceeeddffdb090f292cf09b4dd326ef473453029a725ce592ffa0c72b
+EBUILD lilv-0.24.12.ebuild 1860 BLAKE2B a8bdc6872a714eeb4ba72b362590d9ffb445bdf07141da54e6f6beeb2030132f5e96be8e3361ea69b5c511ff8ec66216c293dd55291892c499ddd9c506bac735 SHA512 6d394dc16b72c90d61da30c49528e91a07eb36248fc5d43c61f0cfaf12af5b6a31f43b0772ca9f06081cc019b67fcc7a1516c8bde06e82de8611996bf56b11b2
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index b133e70dbc24..f8b1dce47c5d 100644
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -21,7 +21,11 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+	)
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/unittest2[${PYTHON_USEDEP}]
diff --git a/media-libs/metadata.xml b/media-libs/metadata.xml
index afd918587f7c..5e26ebc9b925 100644
--- a/media-libs/metadata.xml
+++ b/media-libs/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria media-libs zawiera biblioteki multimedialne.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 402b2aaa2b62..a4e84f02d2d6 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,4 +1,4 @@
 AUX musicbrainz-5.1.0-no-wildcards.patch 1316 BLAKE2B 39eb1691ec5967432cbcc166fda63f33cbb5d1ca9761ba47839733d2e78a84bc425e7b7fa200f397d6f6be982ce48688048db73ca55f2e0c84537f504b4afdab SHA512 2768c4c054fb3b1df312e7d9d41c0d9c618ce50ada9013739251933a4f84b32d147d6033507395d8d189b2d203f9c4c982d07375913907bd374587fabd8402b6
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
 EBUILD musicbrainz-5.1.0.ebuild 986 BLAKE2B 5a5f0c70a31514905bfe999e0ac1f2c6c3ef5356da4f46cdd4caa18f74153031cb96e1d86cc7fbfdcfc9c14e442f26f919ce6ac013e982a96c7a6b7bb8fb9388 SHA512 0afae34601c907240d37ec42d524ad3af793eb6c496872a1f5b1bf243020873dc00dc00d0e2900daf0b92f1dcc79ecba02755084e02b595a5fbf2f4dffb216b4
-MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
+MISC metadata.xml 416 BLAKE2B d6c327920376ba376ff4a72d6fbf6dd8989deace31ca17363ef1d786eb31643dedaac0fc2ec10312d47e1e0f03cdb0d51d61c7c70f7147cf33e718fe98b7b531 SHA512 71fc953a2be818c8f8c11929244fad3709e10ea3c38ccca986187aea02b3e8adb6b3280763399415a5f8680ebe8a8e81181480a245cf6b0776987a4b0a5c1d19
diff --git a/media-libs/musicbrainz/metadata.xml b/media-libs/musicbrainz/metadata.xml
index c691828f7cac..bc056ad185c5 100644
--- a/media-libs/musicbrainz/metadata.xml
+++ b/media-libs/musicbrainz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 211ce11922bb..bef0c395a7cd 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -3,4 +3,4 @@ AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe2
 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be
 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
 EBUILD opencollada-1.6.68.ebuild 1884 BLAKE2B a108f1d9dd924702fc1b9c5a13ffbdf3a416b134fab025cc616a7637211cdbcf63b39d1043dc33c37a166c0bd93422d560eade6f54bcf68c3204b148708d1c08 SHA512 5c6b6056432859f6e9b7ac530a1c205051b0d98482e2597356b171df05f2f880a865dbd96070a9eed54f75800ba58cb92ad763ac65646416f12d389d06f35ae6
-MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c
+MISC metadata.xml 488 BLAKE2B 4f9f9f640659848a0a9778e0eb0b01f5010452068702f6db244b636a8958afd7e702edc3609fb381fa4dca47e156f653864d791e19cc09ff21323875a4580c97 SHA512 19e46bb89a2fd280b5a6721ad7e4dbf40ad9cd478bce6e8f796c3b34cb57a3e46e41782344384e341fc9d3b400abae63574f9a391c2b19c84526e62aac2f01ae
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 936e18ecb590..2286263e64c2 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-		<maintainer type="project">
+		<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index b115c7c27d45..fb826d445585 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -13,4 +13,4 @@ DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47e
 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
-MISC metadata.xml 674 BLAKE2B e6f57d2c1adb7d004da06cd8667031bcebbd1dbcc30dc4e8e7238fc6dc9a57dc5277c8b94e66510533933fe57610c5899e1e1ab82679c66c4c705a35052cc240 SHA512 027357eccaa8494c0a79b19f14a3e7356f08255d7c62b227701d98d770b3d58f0dea1bc71bb87989e453379bd9eba7ecc658ac7d02a44b6e983db7767864ac5e
+MISC metadata.xml 704 BLAKE2B 7315b803d664938f38c13ec83a4d4fbfb3364fb5816d816243efe2b350517d561f9aab072df80c117f998fb139b789cd5aade8774f4a118d475ef0146fee0e24 SHA512 041be55dab737fc1d1b94ed930341818e9296a3e24c9838f91605ca001f198493d8784e9bf25da2ed03755382714d5159c5ad6386075d148bb2d1de665980540
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index 451183e24bfa..470947824a26 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index f2316242f871..939b97148981 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -10,4 +10,4 @@ EBUILD openimageio-2.2.11.1.ebuild 3691 BLAKE2B 7e640ab4c09cf10203da1e9bf05bbacd
 EBUILD openimageio-2.2.12.0.ebuild 3693 BLAKE2B e0f42d05f77ff242450463ab151072bea1632218e1dcad771ef738f8c08d535a6f3f338c731794c4fe745ebf640f00e994b0a0cac180972ee780da444d5a2e76 SHA512 032289072666f3c2ffdadcceb00d96450e0d4ea6cb66373f24a1293e86be0baa02af1df0f5943f3c0de5035f8972dc964ef13e2cc283b96a01a7d111053192eb
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 90500e5e8bd4c94ac24506b2049a1f875961834f1822aec9cda7067b425a6f2f55df02be32c8e6694a5986c11edd4789aa04bf0622dd66f7e5193706e2d0682f SHA512 6fc5f91ef2eef33934dd7a151383fc2fc165ee97fb77133308641031309bfb96871b2ef5a8b5cbc9baa563b21c3de834378d651ded46cecdda4d11d72eaa53a8
 EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 95bcd6666bba47874bb02eec536c1dd6d22b821cba96106916276fb9dbaad5ed592d78363bd44bf39e146cc9c753b0dc7b7a333fd0cfc5572404d3e3861b6c39 SHA512 ee932fd014b3ecc44e0cc208613b3e9e2ce9df9bc4b0fbd516232ff52ea94239da42fc057a42caee8c6e546a19b12c49a64c6286b96ca6b3407781b11462825e
-MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
+MISC metadata.xml 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index dbbc1a37515e..41adefb69298 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index f8c5804810ed..3f9c82edfbab 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -4,4 +4,4 @@ AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
 EBUILD opensubdiv-3.4.3.ebuild 2364 BLAKE2B 69170fed94197b2f7d1b8163b9c87bec8135678a18675ada98018110644bc3a842616633812df6529d5b12cb11f6b1fdc413c248cd4ee8cd2cd4c3039b30e54c SHA512 0b0e981af5d29f3271fc2cc1d710e071de2b27989aa407ebd215eda91163882ee1970353841dda060515a648d91244317379ecb89121f8894e0dc679cad01af6
-MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d
+MISC metadata.xml 1035 BLAKE2B a4f87026bc56a4a4ec261e0a1b10627a95734a3505f4213972e98baa02ef254f0c1bbb7acecff34d1b793af2aeafa99b3bdf04457fcc6c2ef73fa2a2de81fde0 SHA512 3b5013ea78f9ee4017c02c15715f9409add88fc028f3c2ce51f4c0797c95c965a34ead28a7e0193f5e53d273b5162ad02dfed0d9b253cbb2292a672f85c8fd3d
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index b043cddb4485..863e88f13bc2 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 827c7d6b503b..f3498cd61031 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -3,4 +3,4 @@ DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16
 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
 EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 74b8721250769b65c88f9f73441262414390c0d7d3ade2ebc9e15be7d7b14d6a58e578b11949ed1fc0f76373fd3ffe26b2fd1168f44e73d9fe029f07dd024ddf SHA512 2f1f7510283d594ac97e295e3201c5dc4470a0002a4f8067cb153e210e1145c96aa47755a3f6b57b2690b6ee2b300fa6cd0875fb438912f58303106c2ce3a952
-MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
+MISC metadata.xml 840 BLAKE2B b0294327cc49b976989b7d718882aee135eeffff27a7d3bfbfd005f3c40ffbecd231aa627877b2dedf993c571b1502ccca033c3f857cadfd0ce0c4f09c18ea65 SHA512 0492eb77870d7c6a4fc120d0f53b72568e87483ef48c8954e5d3bf21941448917f0a541c71be413500b5782a8eb255dc3a7cde61b003561a697a52b8222ce9f4
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index 5639117c55fd..6dfbb31540eb 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 3a7e1a18c5b0..ee9d16cedce1 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,9 +1,5 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
-DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
-DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1148 BLAKE2B b0c55730e21d0676f6174448b1b52214ab704ddf5ff2057c4c10a104714009cd0129f821866929b79afcbc18bf0f2dd2ecdaa11f49a1fe65e00a1a947dc4a6ca SHA512 275f28c68464d6480c175971d4626f22f4c76e296f674704110a787a7bc96e7ef95e732acb4563adc99f9230af5c66a7d1cad989743f6aee81376243a968fd04
 EBUILD partio-1.10.1.ebuild 1016 BLAKE2B f299a2d45d8d7cb384e2036a48a6bbb8052460c341d860d8548b282c27f0a6ed95a0571e7839df7c934a3e83db7abb9161670e79ac63e7bfbce6e9567b88e858 SHA512 5f522ae58b71252dd1da74c73c80ac75bca3d9e97bd4f76dd3c3f152a77254894bba0a193dea97f78341c25a2801fecd031836af0dc82a1e9102e327049960b6
-EBUILD partio-1.5.4.ebuild 1005 BLAKE2B 181022e1927fce74730a795e92299cd21491e8f65c6a9da11a84d3edb8b8d818314bb69011a2960f89cbeac69757ec05180c2015cea7919c126c1d4e3ad4c71d SHA512 69f26f13def6dd5fc1ae178c82bfabd4c05f4eb926eba32f09585a37ff05fed405c25146e7fd4c98aa121d70d8d2c810e707477f4c24330b636bb1bccb75682c
 EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
-MISC metadata.xml 444 BLAKE2B f9a6abe05db032e6425daecb9a5ccb29f5f0a1a2642f1184ccee43b7473efd5d1b014c656e7349b9326d7e7a7e15b3ae035a287ab129e69235c81b6dd0f9109c SHA512 78259bbbc1fce6259ea0c6ab0b6cb19aa570407ccb31a58183480c954a385941ecad95667318494d87fd3a3480e59faad55e029faf050d371a61592151d8544b
+MISC metadata.xml 474 BLAKE2B 17b6c3123d091a184f3f4ab7cfada12093ef4f40b155a6a0b3a83f8149e2528f66c7c07ef9e56be732ff036df6c54cafc40a7d8ee0a4469df988f8ca9c0d3c91 SHA512 5a2c7db28263503590afcfa1f52f837f9e5e9a7b366e1d0b89e6a04d124b5b95f19c4776ba75cd08bd95e77ced97e3717835c9ef28b6f9aa99fa5b954b83f36b
diff --git a/media-libs/partio/metadata.xml b/media-libs/partio/metadata.xml
index 62877a1e8fad..e75d43683a19 100644
--- a/media-libs/partio/metadata.xml
+++ b/media-libs/partio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
deleted file mode 100644
index f6c43ab7b930..000000000000
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake vcs-snapshot python-single-r1
-
-DESCRIPTION="A library for particle IO and manipulation"
-HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
-
-MY_GIT_COMMIT="2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5"
-SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freeglut
-	sys-libs/zlib:=
-	virtual/opengl
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.1.0-Rename-partconv.patch" )
-
-src_prepare() {
-	sed -e '/ADD_SUBDIRECTORY (src\/tests)/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
deleted file mode 100644
index 738c1e95f811..000000000000
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake python-single-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wdas/partio.git"
-else
-	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Library for particle IO and manipulation"
-HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freeglut
-	sys-libs/zlib:=
-	virtual/opengl
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index c19e7a1694db..ec4b09faae43 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,4 +1,4 @@
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
 EBUILD phat-0.4.1-r1.ebuild 760 BLAKE2B 20e447e7ff68187fab020745aeaeb0b712b3646f9305426bae45c004fc81273eee22fccb3a6ebea186b61d6be32cedc16b0e49be62030c33b6e916d034cbb59d SHA512 3c50e1c82eeaee3e9c87aa1b5bd81ed317ab8d06cc2b5b2a3ba3bfc024c2d1db843116ad16933301015c8ff017554f200cc655f42374180790b983990cfbb7de
-MISC metadata.xml 335 BLAKE2B 1660913c7b57ba6458607889251f8459e48444ccf4c62786ab8525e12df434fd684c57663326a7bf028ba398582087777e981afecd54d104b765a990a8eb2f0d SHA512 699f64a5b2b97448646e5fb9562e653dd2996eb419bbedde43c2ba9fdb17a60c6b8b57883a18752a0838d06ca054f724a243dd10d3ea35f8da8db8774f01a587
+MISC metadata.xml 335 BLAKE2B 738611cc2556b28fe188331b8f79cc70d597fe6e0bc1840163690062674b4c97f1e51a7230d4ef0aef7e6355307e853261ee21ffcb7383665a06bd46387a5536 SHA512 ec33ba62442191f9943c431fb9313a4dd94ccc2630e0b37deec07ad945e65de3927e0d8e1d75a438fe9419353ac2cf7f1a4e392f13c1fd087280d9d3e72588b1
diff --git a/media-libs/phat/metadata.xml b/media-libs/phat/metadata.xml
index 3669d9445895..7aab9da675d1 100644
--- a/media-libs/phat/metadata.xml
+++ b/media-libs/phat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index fe6e9c604950..1a34f5cdcf7a 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,6 @@
 AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
+AUX portaudio-19.06.00-slibtool.patch 1722 BLAKE2B 938ad05ed0dc708d3617503273cb1fbd4ee1885ce7cd96025f115ec9073c831a9d500c4d43ece1ce0b2c38591faa8823ab24c9b54fb8523ab6d8db7349d26425 SHA512 7e472350e3bfdaad566ce68333bcacbf5d3353743d003916d7b8f0036cfe2bcee2cd619f05d955723f7ef58188ab5096620fafbb074f153e9b88cff1ed30ccd9
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r3.ebuild 1643 BLAKE2B 6a0aa9824a5facd8bad84d4ce4255121d128673a8a330b42416c9011a12d2bf53fedc138713f032665f05eb0c1e60cc8c88d2d7464ecc858a2765bc1c280be21 SHA512 5dd1e9534fc80211e082d568ad24a2f6287d0a4f8a37be0ce51de977699b713ca0a9f6edb49c51b585c5945d6910e06e3eab208deb4b4a4a83fb192344667304
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
+MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
new file mode 100644
index 000000000000..d7b67cf101f8
--- /dev/null
+++ b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777072
+https://github.com/PortAudio/portaudio/pull/451
+https://github.com/PortAudio/portaudio/pull/452
+
+From ef36b577c844d28e90ac276c59c0b4d0fbf853c7 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 18:23:43 -0800
+Subject: [PATCH] autoconf build: add src dir src/hostapi/skeleton to fix out
+ of tree builds."
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..967bba38 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -146,6 +146,7 @@ SRC_DIRS = \
+ 	src/hostapi/dsound \
+ 	src/hostapi/jack \
+ 	src/hostapi/oss \
++	src/hostapi/skeleton \
+ 	src/hostapi/wasapi \
+ 	src/hostapi/wdmks \
+ 	src/hostapi/wmme \
+From c2dd992caa33b0927fb45228f0de0a2d51401f65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 21:46:12 -0800
+Subject: [PATCH] build: Fix builds with parallel make.
+
+---
+ Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..10f8e8ed 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -220,16 +220,16 @@ clean:
+ distclean: clean
+ 	$(RM) config.log config.status Makefile libtool portaudio-2.0.pc
+ 
+-%.o: %.c $(MAKEFILE) $(PAINC)
++%.o: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.c $(MAKEFILE) $(PAINC)
++%.lo: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.cpp $(MAKEFILE) $(PAINC)
++%.lo: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+-%.o: %.cpp $(MAKEFILE) $(PAINC)
++%.o: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+ %.o: %.asm
diff --git a/media-libs/portaudio/metadata.xml b/media-libs/portaudio/metadata.xml
index c870d0eef0ab..f6d41702b01d 100644
--- a/media-libs/portaudio/metadata.xml
+++ b/media-libs/portaudio/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">PortAudio/portaudio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
index d7d2cd1ee3e4..d19d45237994 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
@@ -29,6 +30,7 @@ DOCS=( README.txt )
 PATCHES=(
 	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
 	"${FILESDIR}"/${PN}-19.06.00-AR.patch # bug #720966, trigger reconf
+	"${FILESDIR}"/${PN}-19.06.00-slibtool.patch
 )
 
 src_prepare() {
@@ -66,7 +68,9 @@ src_compile() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
+	default
+
 	use doc && dodoc -r doc/html
+
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 84db69497f6b..6dd51d236f48 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
 EBUILD ptex-2.3.2.ebuild 785 BLAKE2B a4bc5f8b72221dd7e13748113f19c383426e5157f68222ead0ed93b075aece503e8c2c5a4d9d35d550759fd6727ad113fee8a0410ca14f734a9a2159083f399d SHA512 ed1ed98de5a28af3c0922f69ce838206559cba02dbb478bc53d6c7815cbc31378eacef4ef3f6497ac178a498b45f490c95a171b6f33711df27782ade04518755
-MISC metadata.xml 442 BLAKE2B c2d8c5008567c10224514df3263df6ce9a3b5ab1fb764ae62c08b0aff8cf8bfc9152d86364b9a2dc5e5cd92b8ea9dce9609db65645908cfb137a6543e8e23aab SHA512 029c88e1a08bdda8d6518b6f2a1050e52ac121154550807ad52a34252b526216e52783477561567cc49d213c50d23c296f90e8f3d6da1e03dc6a6e2bc18e14ef
+MISC metadata.xml 472 BLAKE2B c59643e6e0527a9b83d12e3e864dbfccd83da24e3ded944442c5ec41082ddf9f7a6c56979fda08f6e16895e1a1c07444b43fd3ea0242558dc2c2a5cffcd42ef9 SHA512 e405c4998659dd9a9d1b815700f2c4a55f6f621c9d9573a00eb36dc7725009af4032de710ed0312ebd765066cb09140b1017334b358ed93d090906db2cbc4e18
diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index 53b937457c3a..90e6453cfdf5 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index ef02519e000c..e90e81284a02 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,7 @@
 AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3
+AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
 DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
+DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
 EBUILD rubberband-1.9.0.ebuild 1790 BLAKE2B 24e0049a4d43e50ee0a6f7daa723649ee0eca5950d077a8346ebb52dfd9e27c32683c72bad74f052c599fcf7ee9719ad98dac584cd7288a84e97fe0871718cab SHA512 71a2a8c41387c86f250e5a69031c2a5c267daf24f5eb4b4b7f5e3d72014f5000ba5ee9620e249563b593bdef7509683693f9a52fcaef622894e094211e8e0e8f
-MISC metadata.xml 415 BLAKE2B 316ab3a0d89221f5db790350e3d6fb609656ffac3ab36ab1d53b1ea56d537005f41d5d4fec24e14000ba8dd32a094da7d05c1e814fba77bb4e209599129c685b SHA512 7b34bb720df7941a22d174b9f83407071110c9421b4207471f44a74c1bdb5cb6ef7b085386277c3d1f852ba48fc749e665337bc5d3b9fe862e76378a6d7ad4a0
+EBUILD rubberband-1.9.1-r1.ebuild 1442 BLAKE2B 42a5dcdd0c26fbebb29ff58cc1f5e0cc1e68e7d430da0c674b69fb55745cb9629d27c1113dd88c7e3b1333a6f0a455cf911485b56a1dd72c22084a7f516ab063 SHA512 2a38d074ead0493c2de9a6268c67c3865e0520fe872ebe2d728c40cea333b309b226ea582fe69fe09b987717043eb535ca40b1612d16b30629802bc1717aad6b
+MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/files/rubberband-1.9.1-build.patch b/media-libs/rubberband/files/rubberband-1.9.1-build.patch
new file mode 100644
index 000000000000..2d8faaee795b
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.9.1-build.patch
@@ -0,0 +1,177 @@
+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-libs/rubberband/metadata.xml b/media-libs/rubberband/metadata.xml
index 652b82c85b99..01203b0efece 100644
--- a/media-libs/rubberband/metadata.xml
+++ b/media-libs/rubberband/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo ProAudio Project</name>
 </maintainer>
 <use>
+	<flag name="jni">Enables building of Java Native Interface library</flag>
 	<flag name="programs">Builds also executable applications</flag>
 	<flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
 </use>
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..211b36068f7f
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.9.1-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 meson multilib-minimal
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ladspa jni static-libs +programs vamp"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	jni? ( virtual/jdk:* )
+	ladspa? ( media-libs/ladspa-sdk )
+	programs? ( media-libs/libsndfile )
+	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		--buildtype=release
+		-Dfft=fftw
+		-Dresampler=libsamplerate
+		-Dstatic=$(usex static-libs true false)
+		$(meson_use ladspa)
+		$(meson_use jni)
+		$(meson_use programs)
+		$(meson_use vamp)
+	)
+	use jni && emesonargs+=(
+		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	! use jni && find ${ED} -name "*.a" -delete
+	einstalldocs
+}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index f7707d2a35f4..897a78b66f35 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,5 @@
 DIST sratom-0.6.6.tar.bz2 347297 BLAKE2B 0cb1949486deb5e8f823b17c98fb415dc44b0cefece647b6c5b3646438736ee9c7afa617bb00a68d61a31c80f6e643758f48602f647655aa4b185b2cc5fff893 SHA512 ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55
 DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
 EBUILD sratom-0.6.6.ebuild 1207 BLAKE2B 6401aff2bb8d49dc156287886a37da05065e49bc1cb13f3e23d61e8d867c2b43b7cf51e9cf760e9254c82a4e6846dc77f0834d5552ae0c2dcbc753e5fb8a109e SHA512 d209123d39be88b8b2de3cbe84d5d931943068db4b6d1416be7d36df7f431ee80f63f3c24e6433c43824227df8e39a631dc9e34d70c7821cb822d0761e75336d
-EBUILD sratom-0.6.8.ebuild 1225 BLAKE2B 908b9d1ad9e29894a3cd2969e76d924719d17f694b473e8df1d7d95901ab8e296e6569d86e99aeed4241871793f5d9eab1f53167e23ff69ea6846885c7f39fdc SHA512 311de6115c435aa9409149701c348267de89d4b26a9b25e21d879096f6732c57d2f72ee6dfbd053b2e8d9dc218378e050043022074547e3a20fbdb0adb41262b
+EBUILD sratom-0.6.8.ebuild 1277 BLAKE2B a62f206b78822f10186ef75662e0d7481610da728a4b477b6dc64e4bdf171f5c4c0bb2f78ad7b28b6fc22938a9e9a78f9d86a5b2aa48ea40437458bc9bbe5312 SHA512 9c114712ddea81fee880f40baae12d44b1cd977c6b044a76a9b4bda33dfa1a18b24d4874b5015ffa7538db168c1bea0bdbb2c1b685d2ca40aa2c6d44d09a70bf
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
index 485729cbfc34..ca089457cb44 100644
--- a/media-libs/sratom/sratom-0.6.8.ebuild
+++ b/media-libs/sratom/sratom-0.6.8.ebuild
@@ -19,7 +19,11 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
 "
 RDEPEND="
 	dev-libs/serd
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index ce6dee1279ba..fa8c72058f8a 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,5 @@
 DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
 DIST suil-0.10.8.tar.bz2 357003 BLAKE2B d5445a8a539d3aaca94141fe0a7bfce976db9602fcaa563d0e5661ce7d281ac48679110e5545d3a3aa4d3c488c5ce7a00f2f06bd67e56da26943885a71480648 SHA512 1d68996756ac593b2b2da6d9554e3257944cacbc8d70d90ded0f6ad5b5877778a08c779a12c7b4527d492f9c480613e030ab6933532f758e16221daa9d5c2dd4
-EBUILD suil-0.10.10.ebuild 1090 BLAKE2B 0b8d89df718aa7a8011c87b57e6fd5f55a95ba2355ab6969f802c6930f28ba6aab67b840e70f993ea4d640758e6eed3aa2d2ac324983e3c2660ef346f68b0296 SHA512 eb09b762218987cb9155386e8fe56b8d5d39efa8448092c5aab8c4d305bb10733dad94c0d0e9602b9df0e2420a0e658049964bb45c70b868e2de4f31fb145d14
+EBUILD suil-0.10.10.ebuild 1087 BLAKE2B 0753f3b0d59ae9e56d4cb92ee79d8d70bd89ba87a22e70bdd678c16b62fdf886346003639e2bc60a068979bfa7a942d1846e537395b6ca23ea425ec9a6b0aea2 SHA512 a9b9c757e78be221752f63441d4bd2ad27f21c585898ab24dfe5abcb8b2971da5bdf7d4d6ef1a25289a4d565888294466960f6ee2e4cf0101baad9797f5cad37
 EBUILD suil-0.10.8.ebuild 1033 BLAKE2B 3e698fb6bd09a3fd76fd9c538bd03af87fc59ce7eaa2864b9db93c07304d29d6651dd6ad8bd692a284f4b3d25c70a5e01f692996a6500ff81096339f2562fa6b SHA512 28f367ea81c46dd7324277ccc9a42881ef43e56a1de0ab74cce01cd717328f65ee266d9550c2360fe21067535d470a95b0f0fb21754560a25d016f1818a86323
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
index 8774c5bba0eb..eed4bf740f4c 100644
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~x86"
 IUSE="doc gtk qt5"
 
 BDEPEND="
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index e3d2504cb00b..f0906df6a22a 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -2,4 +2,4 @@ AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d14
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
 EBUILD svt-av1-0.8.6.ebuild 1153 BLAKE2B d1bc65b830f32f5534a8f92565ce861fe66fb93d20ed85d741371c23187e2f523a354d02174ab5e32e7a9dff6348ab7a31ec2bdb0b53c401f91cf66a50ce746e SHA512 fe370dfa044615d3fdded4beda28efd9de97410d251638051b8e1e325764000f4005e0b014a919a91b3f80ccfecaddfe0daa7bb4bbc4fff69198a762dd4095b5
 EBUILD svt-av1-9999.ebuild 1055 BLAKE2B af96eb94a47185ddf01ef21ccb5044ecdaa5ea3eee428a05de6bad22022d8777d4dfa31a6de1290200504d01b27a5129fa92b02832eaeadc653b8043b98be589 SHA512 45326879f4d0069b712a1ab85a5fa4b1ab4324f7eeb21c7735821dced5e638bf7430e4f2357511cbc2f596d7364316268194a406981e6c7fa617cfa8d077535d
-MISC metadata.xml 531 BLAKE2B b276b87582bf66d16429b34b3c55c522b459700dd11010c85210ba8377538bd91b74fe65f6464dddef9f3aca809b9d2e836ce67875574960a6dbdfea34fb9172 SHA512 99100bbfcbe32caa3d5a80121a512802cf01da9b439b5baae5ca88a694658a50783d42bd047e349367a42dca2c724684bbe216fdc8e433d8aa4a58ac9cfae2c6
+MISC metadata.xml 561 BLAKE2B 009974d51481a9e04834da9b466fe4f42a6c5605c48fc9bffacfcbed248b10c5c684d4999ce41d18016ae9168e493eaad6203634f181bafe2d5e212c0e623614 SHA512 bec2c1832e4621f6b28cc773632f68fef9d40a26e1268258aba5dc911d6941a6b8d9e85cc53f2dfb7ad1385ebf90506fee0641a3759cb6c6402d082ef1752516
diff --git a/media-libs/svt-av1/metadata.xml b/media-libs/svt-av1/metadata.xml
index ba30acda57ab..732224856375 100644
--- a/media-libs/svt-av1/metadata.xml
+++ b/media-libs/svt-av1/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
 		<name>Theo Anderson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<name>Proxy Maintainers</name>
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 51c046dffe69..8d48ee57d5df 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -4,4 +4,4 @@ AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a78
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
 EBUILD vidstab-1.1.0-r2.ebuild 1725 BLAKE2B 42f08e1069bd7fb5ba23debdab5fc2a4dcf650007c270a131b3c6ec8f6d71c9718d1be48253732d7e8532818c1fdc6c1adbec59d546ecbc6a0cd81350ef41830 SHA512 efe8d6bf64c3f8633a8bb6056136fb1bd541ba4ca11fdb6206d6efd975535c044ea1d70192a495774d3f5b150fa4a18e198986f29904b6720b401fc36c3d4ae1
 EBUILD vidstab-9999.ebuild 1488 BLAKE2B b565db3fd850dc761e78713c5b04cfe9d762f81567f9026b4e6a91c695b007432c5a28c030eecbe0128a2924d28a69e059c36dce3daf83af2cc1ef27b5c51187 SHA512 8e4211783d88cbc004babce13cbd41e71ec1105b1151eff03189eab336a3f7406481d19540dee08bd71324adca1e84efbbc3f77591c22de3f2ed4000808119f7
-MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
+MISC metadata.xml 614 BLAKE2B 4bec3a88f5122421a26244cfe1cac3ffbdea562cc6cfff35caea9c494a291077b4ff95eb361693b10448a62c7ae7880c863cf5f9ba181b9c11c2a8a050ce32c5 SHA512 2d1be66c2d324ad1fff723bcb85388c3cd32d924df04bf41ccc50ef7fe1ed75d3937aa291fc90997275c231ad15ea242107ae031cefc6115d869c66da60206f7
diff --git a/media-libs/vidstab/metadata.xml b/media-libs/vidstab/metadata.xml
index da5303a4c0e3..ac74a0cf84f5 100644
--- a/media-libs/vidstab/metadata.xml
+++ b/media-libs/vidstab/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <name>Kalin KOZHUHAROV</name>
     <email>kalin@thinrope.net</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4b254160cb98..d35239cbc9a1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 1aae6c33c685e3992dad9456fc09a174c0e13a2cab4d9b34ff95636f52a539b7545ff450c0fa03b069eec903eae1e5732495608b936603b5f6797478c9335db8 SHA512 142d147fae940ec7215ddd610a80f417e1049e3eea565b15bb17336e23b061268b22497f1a5048a8a7a076d423950762aed5c65658d8aa04cf2f15f06ccbc50d
-MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
+MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/metadata.xml b/media-libs/vulkan-layers/metadata.xml
index d87b452b7dbc..8cfd00fc4065 100644
--- a/media-libs/vulkan-layers/metadata.xml
+++ b/media-libs/vulkan-layers/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">KhronosGroup/Vulkan-ValidationLayers</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 47aca2b7554f..566ef3fb45b2 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,4 +1,4 @@
 AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431d7956cf66774e50549f8a7e8d6351d370778b5c3b75c98880a1260f2ac98b812f1fc51cf97f7f86d38ebf7f147714cd3e7b1d SHA512 4487230e87df2b165abb6e59fad6929fecc72c44509a60162976d5d1b54a2a584f04713c7f8cf77e9792213495656eeb45606c330d3c16be05084d4429cc9f84
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
 EBUILD zita-resampler-1.8.0.ebuild 1004 BLAKE2B c254e7fcdddac56778da0e9066090acd697fda81665bb5d5c20d86fbddfcddb198f6708c6215c162daa2f5404942168e12c495c676ee7154101a9f3e1b5f516d SHA512 653b5c5e325ec8904d181a2bcf7dea1acc3a7d0910494e334fab6f794760a466185d8e4ce39a673c3d7e63a1cfe12036750d50ed229eec8338b4dc8c5eac8fcd
-MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
+MISC metadata.xml 722 BLAKE2B 04c1f51900e0a7e8089b2bfb97f0d1e50836c6693a98548195d9bfe4e5df5b8b205a5cbce69b89127432395058d8838e821057db74cc548fce0d0e03330cccce SHA512 c3ef923a1692d2212c70b767de8f80cac05725ff0beac490356c3095a11f6d0dde6e896c63e2b5c4c5b05acad1531dc17132d6dc799446bd0909bdcc22a85c61
diff --git a/media-libs/zita-resampler/metadata.xml b/media-libs/zita-resampler/metadata.xml
index d939c6084b53..2891a1d66e76 100644
--- a/media-libs/zita-resampler/metadata.xml
+++ b/media-libs/zita-resampler/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2fcf9524ec65..9d94e4a41d1b 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsaequal/Manifest b/media-plugins/alsaequal/Manifest
index d2388ddcb4ce..f0e556fa20ad 100644
--- a/media-plugins/alsaequal/Manifest
+++ b/media-plugins/alsaequal/Manifest
@@ -1,3 +1,3 @@
 DIST alsaequal-0.7.1.tar.gz 15761 BLAKE2B cfcaf4ce108a08cebf9410b5f44360f9eda87f9ca131102aa5bfa8319482b1cc9e622ff5d3c7b5fde9bd2b0363143a66ca357cabad9718600af0d28da842af7c SHA512 ede59a1981c43c70a128d555834b7f1fef334d7c718aa6fcd389ed644b1842e32c9afddc3ab8f026ef20c7afb260ad7fcddec0fa80c01174a72076c55ccdcd83
 EBUILD alsaequal-0.7.1.ebuild 864 BLAKE2B 60f7a86cc39d70a9a89886d6d1beb96516ca103d41c736dc936c93bba13b485c56b9c759bb565002b77559e4679b819acca1778b558ee11f2161ce19ad04100a SHA512 cd537adcf2f9d56ba481268f68c2675c35f53608a3a051fb64521016adc7713b63c53b2ffeb744a8d1fb8554913f4076324595feb6fdc4c363ec0776973cecce
-MISC metadata.xml 472 BLAKE2B 6f2942d5becf87e53347f037e26f00795ccfe7186fb754801d8ffded27d4f088dc94d5cb77b3cb08e04a55a2be61b9abb24740f7dc8204dff111aecea860e0b2 SHA512 a589e692ad04242ec3c70f4f4afa792d3e3127fb4cbd730e816e174097288a9cd5344b0ffb1d8eb9ba9de91bbd41bedbfb08a7b404641100cfb396a04a8b7d5f
+MISC metadata.xml 516 BLAKE2B d4d33349f66366337324cab021c98dab65883568eb6994214220897a3ae92538647dbc224609abffd5027ef4c9a9e0fa95211a9f0c51251add6dbaa796c7ccd1 SHA512 bb16f31a79ef73be194422e30cdfcaf4b60619d9894bdf8f99c25f9bf9ac8233a4d193cda92b3f0b9056ed97bf4e5ee3163b426edad7868a8df82280502a4381
diff --git a/media-plugins/alsaequal/metadata.xml b/media-plugins/alsaequal/metadata.xml
index df391b3e9aab..b9298c5fb69b 100644
--- a/media-plugins/alsaequal/metadata.xml
+++ b/media-plugins/alsaequal/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bass_dr@hotmail.com</email>
 		<name>David Racine</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/gst-plugins-sndio/Manifest b/media-plugins/gst-plugins-sndio/Manifest
index 57a764eba18f..3f4d13f6c8a1 100644
--- a/media-plugins/gst-plugins-sndio/Manifest
+++ b/media-plugins/gst-plugins-sndio/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamer1-plugins-sndio-1.8.0.1.tar.gz 7482 BLAKE2B b4f03ec7a5e8047865ee3148832a8df07a71f02a28dc170a77063aeed32e4189062a074a1afcd4316416750cddc8175af89120f695c1bf7396e3faedbbf42e85 SHA512 9b07b25e0d2c04dfe24a5c01a316b39209129f27178b8dec7abe95754875868f734c3adb32cc3ae2b5c74040855db15480e983c4921e03a800374464c07b27b8
 EBUILD gst-plugins-sndio-1.8.0.1.ebuild 651 BLAKE2B eb568a10efedb78af3491393e630e11635342a7856b6c8113ed1ca842101bd4892da28c8b1d85cd2c4fb20ba3798ab7f02ce71d778e7d91615f7e48e5c3370c4 SHA512 7c542a2fa708b2bd6d9e89c087d202c46d6fe87fa04858508f53a79391fb1811324ac6fb1564317853ed05359e9c550cf4c20cf279309700caf555f7ab39a896
-MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
+MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/media-plugins/gst-plugins-sndio/metadata.xml b/media-plugins/gst-plugins-sndio/metadata.xml
index 9df017effeb6..fc3c6c671309 100644
--- a/media-plugins/gst-plugins-sndio/metadata.xml
+++ b/media-plugins/gst-plugins-sndio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/gst-transcoder/Manifest b/media-plugins/gst-transcoder/Manifest
index 3d4d720f1acf..75ad0e2c7801 100644
--- a/media-plugins/gst-transcoder/Manifest
+++ b/media-plugins/gst-transcoder/Manifest
@@ -1,3 +1,3 @@
 DIST gst-transcoder-1.14.1.tar.gz 37919 BLAKE2B 2687150ff3d609245449135d5725840aab9ed83b487bebeb0daf86634db27b3e68a5aca6ec8fb21ae5bf7e3c3808bc8729db5b24f75dabdf2bff7715a456fb9e SHA512 22dcb75bb706193e67a840218a69df797d5f833935e87d8df03838def5d426d94b25972ca4db8ae2f20fea915d18ef0044ee928a2dfe240f3134cdf1fced7657
 EBUILD gst-transcoder-1.14.1.ebuild 1130 BLAKE2B 3539b98990779cb0fd9db520537dcf858f084f119feeef65e533f038ff194ce58c930f2a1fc8bc31ebe292f0d9b7d86e09c7df68cc377c5c8c73d9869dcde223 SHA512 e2297a52a7b4dc0fcb232900c3cb4afbba1b15462a9a938744a6566f2e33eb32738261b03b9137f36bacce06b2d3b4d1ddc1bdf9f7630716d3894faa5f0f83c6
-MISC metadata.xml 352 BLAKE2B 392190d6cb4c329367131948f5a2edb6af72f843f48557e5a1199a07fa2f381289653a17838033b71448068ee9323e1a7799b06aadc7e7b94bec18863bd01483 SHA512 09f7d341340adc8de8cc9beff4aad3a1439c77be168d34e8b49ede249180c72bc8ea99c9d9b9b4b22ed4accaa78094e1436f603f0acf7ce2e5fd8a8ac4c49fd1
+MISC metadata.xml 352 BLAKE2B 1a5235ce0b573e3d90026b96fc2c0d82ee9e01096b350aca26cf999b8d8a032c0ce456158d555a55c93a2a09a0273968042bd8e7846ae98c785a832aa96291a0 SHA512 0480d71908117c09665949e3cb348033cb18b21fed508daf1d9f5e765d13fa4f92ef0c42744cb613098afc59aa24693fd28c6e7efa28ac1877dae0c54460e8e5
diff --git a/media-plugins/gst-transcoder/metadata.xml b/media-plugins/gst-transcoder/metadata.xml
index 560ef25122ef..4ee2f37864d5 100644
--- a/media-plugins/gst-transcoder/metadata.xml
+++ b/media-plugins/gst-transcoder/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 2781c41fd534..8b5738a0fc33 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,7 +1,5 @@
 AUX ir_lv2-1.3.4-lv2.patch 433 BLAKE2B 3f831851c2354b4695780a6df057dcd3885855ef19bffb0cd0a12e2671d18fc789a7ffa5ad38176a006e5ea2f43361caa8baae50157db3898af2b2b965bda3f7 SHA512 cb2208857e61912fdd1e2f6b5c7e81fd3bb86ae2d8195926d1c23ed99cacc8bc90a1758767c6f9733696a8aa128573098cefeeb2271d9df5bd0a751689489963
 AUX ir_lv2-1.3.4-respect-flags.patch 2213 BLAKE2B 110fc8963f65f4e520b395d7ead9605d94f65030e61277ca7d6b5d34d41c3e847a6313d67c7b0b0e2ab7a4fac77e3aca2f022179ef0398cf27562df65aec308a SHA512 88d9d7739be0ae0b202e94e1d4f40615e876419624ea8af743365c761fbe440c077c40e7dae3b4f43b29fa4e7c33e2dc2931c2334101d835e14f13782f594de7
-DIST ir_lv2-1.2.4.tar.gz 126123 BLAKE2B fab75bf18b642ad59bcb53041462a0d37c84554f0cf6e78c5cdff69ee42a21812a5176083e325018454f6a0a990ce309abed1eea71eb6022ec5981186bf6f29c SHA512 28aac050352380719512efe3346ffddeddb75972e749dc9433cea92973e1ae838c65c6d7196646199218ff3362b24fa9a5e1a3578e74a0b9e268d21083874977
 DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
-EBUILD ir_lv2-1.2.4.ebuild 953 BLAKE2B dbffe6edc29622b0e9c530aecf935cf5ce17094c47a685cfd5780777bcbeda9a379e73e4e8bff924445338e76ec41272a6dae8795751a7f60260f2b863f233ff SHA512 ecd86f25e7652e5bbc9dfd177cc0eb0aaea474728730fd1955b318c6bbc90fac7d91f06a0b7df100c3a94839011b5843947ca6c2c03c9cb42e3fa93a41c38110
 EBUILD ir_lv2-1.3.4-r1.ebuild 1403 BLAKE2B 0744931a106821c25366de148df9e35a0446024ae764a164263472376e9258b554be7b89e77f7fc1b4098bca7d930a64fc48860e17b88dfb164daf8a63980449 SHA512 4cedc7b1685ccdce55d2a24b9dcdeaa3ca77a9a6e3a2461e8c54a6015245e900962d512ce680aa4484d341a8645d69fb00fdd52a0464046027fe9420f53215a2
 MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
diff --git a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
deleted file mode 100644
index c02368823b0b..000000000000
--- a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
-HOMEPAGE="https://tomszilagyi.github.io/plugins/ir.lv2/"
-SRC_URI="https://github.com/tomszilagyi/ir.lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN/_/.}-${PV}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="tools"
-
-RDEPEND="media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/lv2
-	>=media-libs/zita-convolver-3:=
-	>=x11-libs/gtk+-2.16:2"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
-)
-
-DOCS=( README.md sshot.png ChangeLog )
-
-src_compile() {
-	tc-export CC CXX
-	emake
-	use tools && emake convert4chan
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr/$(get_libdir)/lv2" install
-	use tools && newbin convert4chan ir_convert4chan
-	einstalldocs
-}
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index f09aedb281da..8c1c50076484 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
 EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 884 BLAKE2B 1e69301d94bf4bf583c66ded081ff191234fdc87218e9e372c36dd0caec7368290bff4bea2e13a9fc63f2410acd0387d07ff120d038bbff383b96e910369e0a2 SHA512 5807c66ba348329784067c89ff6eab698bf3b037d7d0d9b613f604b0eb24cfeadbd7a771c129f71474ac37421288fa6d7f1781d7da5ed02b4d97befb47dd0269
 EBUILD kodi-imagedecoder-heif-9999.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
-MISC metadata.xml 495 BLAKE2B 50fee8ac28478455e2f841b59e31f3dcaf5bc6a7e224ce9674f42f79b821d6c9b460705b952f42c492ec5a2ff91a8dc8cb075e1b1a3782d422bc2cc97d40ef23 SHA512 bb68b1780e35d7a9a1b194402912f60906fd6b599bfa790056af14cbd51b7196c6756fa6dccde1bf1526d910e0eae44e88a4267aaebbf91903df9bbcc48ce05d
+MISC metadata.xml 509 BLAKE2B 1d779aecbb0c70795ee2022e634922fcfd0951d654a63ebf777b6a69d9fc5c5d2404dda687de298cd81ee40f836d6088fc57136db337f2c506f65c7419a6f245 SHA512 8fee416035a69cf7391eeef4d5c679d6c4861616d6999d38d32c3ef6acf7d76ecd552b3246a125b8d026173d45b28568698bf6e61a2bfce3b3c8a6d9d4dcd2a8
diff --git a/media-plugins/kodi-imagedecoder-heif/metadata.xml b/media-plugins/kodi-imagedecoder-heif/metadata.xml
index 43e482f1bb34..9d6782bed1eb 100644
--- a/media-plugins/kodi-imagedecoder-heif/metadata.xml
+++ b/media-plugins/kodi-imagedecoder-heif/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>k2k@narod.ru</email>
         <name>Karlson2k (Evgeny Grin)</name>
     </maintainer>
diff --git a/media-plugins/kodi-imagedecoder-raw/Manifest b/media-plugins/kodi-imagedecoder-raw/Manifest
index be2eaccd73c5..22272b9b8f2f 100644
--- a/media-plugins/kodi-imagedecoder-raw/Manifest
+++ b/media-plugins/kodi-imagedecoder-raw/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-imagedecoder-raw-3.0.1.tar.gz 51343 BLAKE2B 04fb42a64dfd712bcefc6c81af6519566c1cfdfaf97115dec28d4cb05794b918baf4d50179bbc43faac41294b8398f615e6562a310503b13bd18b2d236559bde SHA512 ac4c3a4d042bb8c18340efb2f2929f6301089a407731d6cc371b7b888da978bfb017e0e563d614209bce396f9425c4a618b6109f228c4943282ab4b823f159de
 EBUILD kodi-imagedecoder-raw-3.0.1.ebuild 884 BLAKE2B 1a4214d97a41f14394cb703087fe016096768634b4b6b941e17971305e02a103cbe1b7fe9ebf6eb047fd274823c110bedb55186fec8f4d0d20a66d386ed279b4 SHA512 6a9e04845544e7493d6fd5277cd9a3926736193c337ceea33dd2b10fe025abace63c18824b6d3cb28de5737dd3b55ba278986cb595c6d91d07559641780e25ea
 EBUILD kodi-imagedecoder-raw-9999.ebuild 872 BLAKE2B 64b8d15b4ca3cf877cd1a965536911c9ccb5af8397fc3cec65a5648dc6fe1bf846bf9c22e425938a57ac21bcc720df69c7cdf3819e8bbe3ceb59cbff3b2956b3 SHA512 14c3d76a0fa85a7bc1d3fa8efcbc8cd7de3d75064778c2e624f58b80d60fd9d3231266c142620f42554b373644c1acc0355eb8a7cc732a2608b7cdad740fcb02
-MISC metadata.xml 494 BLAKE2B 0d474ac752f83269cd0f1af90e9b0915a7e931ae48568a0db1b3fe282a7acb5ab1b4a818dac52eb87e93226308d00d8fe3845ca6e8a0b16c2a2c06bc56482707 SHA512 3d01ac0d2ee617a08e5dfa5613027f24997427de28c416564b9cbb7152b1beaa2a55df9be344f8d3edf2ae0ebfb406ce0c2df57f4a193c4bd438d04723fe02b2
+MISC metadata.xml 508 BLAKE2B e19da72a167cca7ec58192943f8ff4cb0ce8fc105c3cc1fc169bfadba232e8e2c9665a8c830d86674d891c7cf50e9cb235e6639be85411cd613451e7a5c17b14 SHA512 fa0adb78c2c7b5a6fee1f177313ddc6fe1906b4c5e385e2c190982b672dd8ba77f0fff7bd1adda7acb773864f493016f0bfd0b02647b5f6132ab8e1965d2e820
diff --git a/media-plugins/kodi-imagedecoder-raw/metadata.xml b/media-plugins/kodi-imagedecoder-raw/metadata.xml
index 0d9eaa00feeb..92cf3e8086e4 100644
--- a/media-plugins/kodi-imagedecoder-raw/metadata.xml
+++ b/media-plugins/kodi-imagedecoder-raw/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>k2k@narod.ru</email>
         <name>Karlson2k (Evgeny Grin)</name>
     </maintainer>
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 57212b5aded8..46004298d8ae 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-hts-8.2.3.tar.gz 181557 BLAKE2B ef26b3bf29cdf1f57e91cf2fb74adf997e2b33cdc6f50d23bd86812317f44f3ba921049df92daab19a5bd534bb07c70b6bb64219ab24df02004758782328cb0b SHA512 ee40dc22827959c663f97af1c1140337c592caf1b6d64503b5d1540bb59f284a90a27df4da2547c382b2eefa1e8754eaea35bf83203ef2e8eb447de93b858b04
-EBUILD kodi-pvr-hts-8.2.3.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
+DIST kodi-pvr-hts-8.2.4.tar.gz 181581 BLAKE2B 83a0743944801b9f431a0075268f53493089807a110b22a99a1242f6be58c1d0c4e44526a61797026ca309d573ae0cc94c73d07719ad2ceed9581e91daece2eb SHA512 8e2f3d5106cf1fda0876ffe6cdc7b22518ce9f7a05782e6812ecb4f6a532555f863ae16a9088201e42f8eddd2ff71e73c4aabcae11d4169dd586f6042850aee8
+EBUILD kodi-pvr-hts-8.2.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.2.3.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.4.ebuild
index 2229139c850a..2229139c850a 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.3.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.4.ebuild
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 43d3a7bef9c9..bbbe8fb0f84d 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-vuplus-7.3.3.tar.gz 273471 BLAKE2B 1b16cce69c15fc5bf1cf188db2fe5f3178025692d37125b8e5ed43a4c92539f0b5fb616f651223a184483cf8883dfc917fd2e18fdb1f16ef2402e2c10ecc9415 SHA512 5b4cb03eca2d904b091d271576b943ce69b79f3f7468e0d415abe90717903623204831fcbe1118e2d105fc3570a32bd972f8c4ec0dccdf9f427069d8081ec501
-DIST kodi-pvr-vuplus-7.4.0.tar.gz 274465 BLAKE2B 8186329d833e1d06d11f9d22367b5cb8b09f30696550d498384b80032799eaa3ec29cb650529c5fe220e67e80e5ed511e7900851eb73569018445b87a4f51f47 SHA512 01a81d004959193a0428e56eecbd0b41912304882e986736f9f11a4a06e85cea5d615c0efeea9236f1d4acb8a3faf588d5b9d7ebb4b15f76cf02d1d86de326ce
-EBUILD kodi-pvr-vuplus-7.3.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.0.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+DIST kodi-pvr-vuplus-7.4.1.tar.gz 284978 BLAKE2B 3c42273ae1b62e0d97e589e1153fce20110c526ca133c993013e56afccce420ad3ed792caca8694db3ef707e1666e24061ac5ce7b2e92b39f4dd5ba8e8d1b934 SHA512 771283160020f9cb4f51e73a5ed86dbe3322158ea732c2a34d464b1586bf5f4dd77ef12181f9e4e3079551603d004d2f575728d9fe216b5ba868d4a9f5924569
+EBUILD kodi-pvr-vuplus-7.4.1.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.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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.3.3.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.1.ebuild
index 20323489f843..20323489f843 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.3.3.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.1.ebuild
diff --git a/media-plugins/kodi-screensaver-matrixtrails/Manifest b/media-plugins/kodi-screensaver-matrixtrails/Manifest
index 5126a833aa80..89bae75bf70e 100644
--- a/media-plugins/kodi-screensaver-matrixtrails/Manifest
+++ b/media-plugins/kodi-screensaver-matrixtrails/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-screensaver-matrixtrails-2.6.0.tar.gz 855189 BLAKE2B 6a8525da2661a6d34deb28d068c791d7a7fe9339426d258cf4d96facaff3baa6d6e115e3f1333fd8649704d7f836d09dc8570548f490f0986d33d70abe2532bb SHA512 8770021c999539431a5a6acce1e892639133c0856d30d74c7775038c87a922aaed216806cbcfb71f680593f9227cc3ed45b10631b70f489b7dfda2e4221381f1
 EBUILD kodi-screensaver-matrixtrails-2.6.0.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
 EBUILD kodi-screensaver-matrixtrails-9999.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
-MISC metadata.xml 502 BLAKE2B 3aed11a8a0092acf679fccecee47e42275d4b69242c2d74b50c8d4c723acd9574dfc74b1cae83943fc642115ef1a3ae19452d51e3f1a32f91492b413674aae36 SHA512 e3d3bc984f136a536f61d2384d7b62a942b20c4e8d750d2450a958b0171db835d0725016248653a58a3c9522557f816d026f94985015628fbdaa07bbea084576
+MISC metadata.xml 516 BLAKE2B 0a7b8878e0a2ba87f2127a7c3cc916ba2af789ca6989c7814010279d876e54ae3d8d7626fdcbe9b32b7a420b1efd54fbc17cffb576cd2d057419ffaf9c87eeb9 SHA512 02222e09cb23119ba33a15cc6f5560ba4b06fa1e1a871a2233c1939187f01cf67273d75a4980e43f88399019fa4ada1ec89f8b341673d7852640e73604d06884
diff --git a/media-plugins/kodi-screensaver-matrixtrails/metadata.xml b/media-plugins/kodi-screensaver-matrixtrails/metadata.xml
index 6584d4783bbb..03f5c77e6b1a 100644
--- a/media-plugins/kodi-screensaver-matrixtrails/metadata.xml
+++ b/media-plugins/kodi-screensaver-matrixtrails/metadata.xml
@@ -5,7 +5,7 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>k2k@narod.ru</email>
         <name>Karlson2k (Evgeny Grin)</name>
     </maintainer>
diff --git a/media-plugins/metadata.xml b/media-plugins/metadata.xml
index 06ee545bd257..bb160e91cb8f 100644
--- a/media-plugins/metadata.xml
+++ b/media-plugins/metadata.xml
@@ -35,4 +35,3 @@
 		aplikacji.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 8cb20ac2d1c2..56ccaa5d8ad1 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,3 +1,3 @@
 DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 EBUILD mythplugins-31.0-r1.ebuild 4062 BLAKE2B 7c511a8eebd9dd6584a0dfcf1c3f2bcf6982f32aed529f5d786d50b503c4427fec73078c009572567bebdf092fb5dcce1f32bcc73db8e568d52026094f3f25b5 SHA512 96be78aaa73b20d7a78a775773e333b168c230e34491983d8205d70d512da93b295c279ce21ed61a9a04ad9040003713470fcd80dfa0d8a32e085b43e6596494
-MISC metadata.xml 1579 BLAKE2B 572a1791032bfe81701ecac3b48b90fac86f68e8f5aeda3d228068cdc33fd8d22fc192322f84e68f96fa5caedf86b5231ab6ff6bf308aa9cfb9b87c4c627af22 SHA512 847c7f1276c7848db254625b2e162dc59bf7d711e8b7602bb388032deb0f54532949bdc94037b9838ca99514bc58847e76b3e3ebd8022ebf2d2ee8eb029d105e
+MISC metadata.xml 1609 BLAKE2B 879eaa35dfa61918b8ae0c36e95d9d10039b7d592fb872f1ac102039741a60715123cf7b1f45a47455c527cb6362cdfc68effc6fbd8d1032e8e9c87d0c3054c0 SHA512 8b597015d2c962713b34366dec82e804c4f50489395165176f9ddb59312cc4466035132418b01befedbc52e21ba19aac88977d372ba2be026fb67d01a9d94927
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index 6e7af06cb88f..08c36bd0d963 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thebitpit@austincustomerrands.com</email>
 		<name>Wilson Michaels</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/swh-lv2/Manifest b/media-plugins/swh-lv2/Manifest
index 753b9b4881fd..07e8d0fa051c 100644
--- a/media-plugins/swh-lv2/Manifest
+++ b/media-plugins/swh-lv2/Manifest
@@ -1,3 +1,3 @@
 DIST swh-lv2-1.0.16.tar.gz 159206 BLAKE2B d8a3e46debebad758e6300203f8cedf71c47799a85b1e95b11c258e464e73fdafd69f5bc80f419bab4f1b6541bd2038d75f5ff9ddc0088829a9a690fa24483e5 SHA512 1ded2c570b7f8385bb702539f5e1573fa23c6ddfb2b763af149b4ef1a32e394590b0b4fffcd006fca362b51318c1ff5cfbaeb40e4341cc07d5241aca1ac2eba0
 EBUILD swh-lv2-1.0.16.ebuild 735 BLAKE2B 6b092c801af5daece6ef7ad32e43693018ba10e8bc6ba38e7107917598f53dd084cf5040f62df8f43912d853a0306f91a33df1d6af571e06b7c039e3ca5d188b SHA512 b828b109e26b370a44b0cdcec8392bcfce13e2cd5ffa5bb83d0b712689873f5a0794aa12e212c4b9300442d8e06abcfe8de3a86e8096b9ed6b8ed56d4b0a7ccb
-MISC metadata.xml 331 BLAKE2B 7a9a10a04c27ff979fe7cf6f905c3145e12987481b911b09a5a2ad1793093216985a97d8d39954e7dbda552e5e353265798879b5ad83aa0b4de784083587cb66 SHA512 c378dbceb9ab7272575dff0ffda3eca2a02356d8082576d3eb9466a63f215ad6246f9d3ead32f5311137ee324a1cf2367acaaa1419b1f832088c4668b1ec4d6e
+MISC metadata.xml 331 BLAKE2B 38e11108265d98a5cc59f9c9e65d169f3070f435cf0c1237725237be208f3b0f7c8244590ea29ef2a2d6c645400c265fefe34c88d37868f0521a985d8e5cdd56 SHA512 fa789e6f8f2dc65d6680ebb6f387b2e9d1ab72caf3a8f770db06b7dbe9c88018d5d088a77392cbd59f783ab0bc7b3be9c523b9bfb2cb7e82a6a2823f739ee51f
diff --git a/media-plugins/swh-lv2/metadata.xml b/media-plugins/swh-lv2/metadata.xml
index f438e8e9a0cc..fccf2d45aefd 100644
--- a/media-plugins/swh-lv2/metadata.xml
+++ b/media-plugins/swh-lv2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-plugins/vdr-clock/Manifest b/media-plugins/vdr-clock/Manifest
index a06c59ac212c..46f71b79a958 100644
--- a/media-plugins/vdr-clock/Manifest
+++ b/media-plugins/vdr-clock/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-clock-1.0.0_gettext.diff 12163 BLAKE2B bd71a05730af6713a944fce7b6273485d2f2719131fb093fe3fec1e1247b537f1da0b06011d8ff67987076d8781d766e093532cb9f5bd68ec6ba261ee0f3eb43 SHA512 144415a10d37fbc9faf7aa0c60292dc85b4d145654e44b4152bf0fe9177be992a6395d7dbf83ef6ab8ce9c0fbd2c18f54642b4a4dfdde0e25843129f7638d353
 DIST vdr-clock-1.0.0.tar.gz 30136 BLAKE2B eeb778675ae1dc3fabc76e4d48557c93fda378bf501cd06ad9b195535f01ded00277228e3c4f054bc07d7a8bcaa5e39c8c4de153d3b1e9cd7279c98d5860dd86 SHA512 04d69abefb19e4b249edac621a7cd48f7f0e776a339a05157ca18fab32fc1e8f674e212a24d10327c7dceffe75efee3e4b0ca5215641049d428b4358c40b72fe
 EBUILD vdr-clock-1.0.0-r2.ebuild 574 BLAKE2B d2dfbacb9c3e6bc356a3e8a17d634725b1a6f58df2e0c4a181c19639b9da13b116cad9413f19e090efa1125e4f1897426b988dd86d220efd524e4107f65b2342 SHA512 6269a8f2116d64a7ebf4a1f74aa906036428db5ec3b226ca6458b577952f27586cf191ee4c3be55b4979a0ad4f16d8ab994756d3586bbec9e6c3b3e9c3e7ce05
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-clock/metadata.xml b/media-plugins/vdr-clock/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-clock/metadata.xml
+++ b/media-plugins/vdr-clock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-ddci2/Manifest b/media-plugins/vdr-ddci2/Manifest
index eaaa6a4121e7..3ce2494bce6a 100644
--- a/media-plugins/vdr-ddci2/Manifest
+++ b/media-plugins/vdr-ddci2/Manifest
@@ -3,4 +3,4 @@ DIST vdr-ddci2-1.0.5.tar.gz 26306 BLAKE2B 991990ccb1a0f1648a3a3e0e9d7fb49165e0c4
 EBUILD vdr-ddci2-1.0.4.ebuild 692 BLAKE2B 43b38996a99fbc0f1357b534f3d216d67be3a2c11bdab2069e1822dab3fd095cde0fccc62b1a8929b1e19784e30c717bb80262ed88c45f4d683666782b1c18d6 SHA512 ce35c526ce40bef219a3bc81c31748edb9d327b810c2b867fc1ffa6b336bee71569baf95f17457a9af1ea29d5510f0890b1efb43b2fc271a66e1afc22ff2d70a
 EBUILD vdr-ddci2-1.0.5.ebuild 692 BLAKE2B 43b38996a99fbc0f1357b534f3d216d67be3a2c11bdab2069e1822dab3fd095cde0fccc62b1a8929b1e19784e30c717bb80262ed88c45f4d683666782b1c18d6 SHA512 ce35c526ce40bef219a3bc81c31748edb9d327b810c2b867fc1ffa6b336bee71569baf95f17457a9af1ea29d5510f0890b1efb43b2fc271a66e1afc22ff2d70a
 EBUILD vdr-ddci2-9999.ebuild 692 BLAKE2B 43b38996a99fbc0f1357b534f3d216d67be3a2c11bdab2069e1822dab3fd095cde0fccc62b1a8929b1e19784e30c717bb80262ed88c45f4d683666782b1c18d6 SHA512 ce35c526ce40bef219a3bc81c31748edb9d327b810c2b867fc1ffa6b336bee71569baf95f17457a9af1ea29d5510f0890b1efb43b2fc271a66e1afc22ff2d70a
-MISC metadata.xml 429 BLAKE2B 25724417e75461b6bb09dfa30a115b1ddd7106b4b074a92a5fc9ce13383e6c144a0a58e947ce6a6ff19f0ef54c3c4c5c7c2b9a712530b4d7b9b1de13d45e9479 SHA512 74c9899e79d500a1cfaed7612018d640ebd97b121b8f27ae6b089ff05d745e7c316c1dd5d74deb092f9212681537f1cb400097f7c4e3086b29db7bc046963c0c
+MISC metadata.xml 459 BLAKE2B 1a5d813e71375438d801db22b9919c1df3adc448d3a56f1eb80b524e95925843f3e4faa1f6c5eb83ed0975befcd0fc185efa7fed1ebf5a3105250af714a543b2 SHA512 a4818617104dfdc8ad384445c4eec07b5f8caf98907cba729337c8a0a904c7f9b22757e1eda417e54fc47ae7378a0137c20b456cdd969d39a42820bb57f0b706
diff --git a/media-plugins/vdr-ddci2/metadata.xml b/media-plugins/vdr-ddci2/metadata.xml
index 16a8fd56d9d8..02eb850940b3 100644
--- a/media-plugins/vdr-ddci2/metadata.xml
+++ b/media-plugins/vdr-ddci2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>d.scheller.oss@gmail.com</email>
 		<name>Daniel Scheller</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
 	<upstream>
diff --git a/media-plugins/vdr-devstatus/Manifest b/media-plugins/vdr-devstatus/Manifest
index d4a3a2abba05..6514794569dd 100644
--- a/media-plugins/vdr-devstatus/Manifest
+++ b/media-plugins/vdr-devstatus/Manifest
@@ -5,4 +5,4 @@ AUX vdr-devstatus-0.4.1-recordingfound.patch 648 BLAKE2B b284f4426003366d57bca26
 AUX vdr-devstatus-0.4.1-vdr2.3.patch 4093 BLAKE2B fbd482e58f90e6875d2305268c005964a5b6bae9e56503d6a68d68462eb7f24c85ca7baf0e7071f4370192ec6eb2bd53eb2b3d92c5b27da578aaf621e4686298 SHA512 733840fee27c3c1a920815d547a9ffb30c76b02801ed000de917ac914879d8b3fc6093d356846c988dec8c9649411662fdaec6af1de9f578838b77e5b404b60b
 DIST vdr-devstatus-0.4.1.tgz 22469 BLAKE2B 36e60b2d754209f5a2e30ff62114575565d9e0acf21e269797b39e9e487831288a7fcf0c12b32d2ed40f4c626ce6f6514169a767035d704a84c33ead25eb65c0 SHA512 4dde8cce6b4aaa6e0ce22b2cd5ad718ab04e7e5967a3cb2c05ac64946115b6291d395e36dff38d479e5a7d5c3c296feb4df7f8dce509c15ac0d8cafa179b7177
 EBUILD vdr-devstatus-0.4.1-r1.ebuild 928 BLAKE2B 009af33b09537b09cded79f0495f0089997ca887067d1b233147b1b25c1ae52c7defe66503ae07037f0cf126a2633366c6c694b4cec412fcb3a1bf5bec6d8317 SHA512 898d5a361b925824fa2d7b583094f9a317d5191a0bc10931e682310d2d725637159fcfdf32752f470a16032740de2de2236a9a499411cb2653ba1f71a6d9ec95
-MISC metadata.xml 490 BLAKE2B 3d67b2f4a08b03617814ff8bcc5329013574024173a6e342c2830c9fac0a7fb41f4177df14624bd806a2bd199271633d17f0ba4f92060280f9dff4b127514bf1 SHA512 d43c7f27ded08e8079867eba9311fa817b7afc7106774a4eec245128058117b5d10a781ab74654083b04032407c986b5f50fa92f279a5328ad10b87d1aca5b59
+MISC metadata.xml 519 BLAKE2B 91f54fbfd4fd09fa834c2f124aa29e9b57d35af1ca9259056661720ead41ab9a2f41d18492fc7cf18d16e8c4ff9e0b3d69aaab81475c18cec205e145edb2c05a SHA512 0bd45a9cb55f21dc97e1ec6dd989c0f0d4fffd31a8be50f0b17e27d84d76978fc817bcb3c90180277b774b631e7f4dc3c2a5ea95eb41c3a8e02ba933d2501cdb
diff --git a/media-plugins/vdr-devstatus/metadata.xml b/media-plugins/vdr-devstatus/metadata.xml
index b97ab2647da7..4075ddeafc69 100644
--- a/media-plugins/vdr-devstatus/metadata.xml
+++ b/media-plugins/vdr-devstatus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-	<pkgmetadata>
-		<maintainer type="person">
+<pkgmetadata>
+		<maintainer type="person" proxied="yes">
 			<email>martin.dummer@gmx.net</email>
 			<name>Martin Dummer</name>
 		</maintainer>
-		<maintainer type="project">
+		<maintainer type="project" proxied="proxy">
 			<email>proxy-maint@gentoo.org</email>
 			<name>Proxy Maintainers</name>
 		</maintainer>
diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index 16a5fd36553b..ebdbd61f2f36 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -3,4 +3,4 @@ DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798
 DIST vdr-plugin-dvbapi-2.2.5.tar.gz 95270 BLAKE2B dbab07bc7df8fdc7ec009b82723631a5e61cb1d4a9afdad16e32282a3e71d6bc87e7c78ec8cea73690606bda504c19bdd9123d1ca7a4e712b15ca884c77dabaa SHA512 7036705ddf706192774f511cab813c64d092a1db1c635003e28d6960d3d46ef484f44b86c15fae782d29ada728eae1861d009d91cb71ad77cb0a1b2ad316069b
 EBUILD vdr-dvbapi-2.2.4.ebuild 2944 BLAKE2B b7fa152f39022f3a908bb63b7c95b33cb82797294cd5c4848ae03637ce0802e02579bb3123bc565bf18dc46f1571bdf10e52cb4293af113fe7eac09b76a6ffb8 SHA512 738838a5318bd04cfdf1f2ee84992fd25d7b3da42664fe2e5aef1c5a63844231178c43563c275ef522c140e54d8fb7e0d838d9cdefcd4a5b104ac4517c299460
 EBUILD vdr-dvbapi-2.2.5.ebuild 3056 BLAKE2B 7e15e8380ce9b3c2a131bc6a2d49d2e0805ffc10ad0f477b9691b40e11f2d1ad8cc907b6b9069ff239b31cf626ce29eb89fe0abdf78b4f9e8dbc3fd2a0b28fd1 SHA512 7f3965f918bec1264cf4849f65a948fa85ac712117d16c6e27acba5e983f88c8f7750b1f73ce70f27cf94188df1fad5e9785cbcca03da6f3a5ff55e8e1fbe7d1
-MISC metadata.xml 594 BLAKE2B 2a02df5ff3859e36c760f72ba49f97b3d827677e0c789c88ced7cb4e3ae91ad0501060d20db3e4cc33d2226a5c986203f03ae25ed29a4a831e7c218b54b2235d SHA512 0e0578c9e7fd629759210d01c1442c17ad107f681d53c1be7b067a961335dfd74a0d681af56d85dfbbbf948aa7c687e15325929350cb9d475ca6a1424ccbb46a
+MISC metadata.xml 624 BLAKE2B 307e07b5502c5d941ddcee7a1f0f84ce5913e14a25e1623a421846495fd0ccbba65a9569e22a28954c1c0a440e5d663f4c87c32a7821f7fa0b4b3a2de7135b3d SHA512 6feefa36faac01ef2e8ff3e5a3040f5b9528d66bae055a1d376495d30b1af5a45ca4ef9906f18220bc88a5be27a556b8e94773e9dc33fda20082120ebfbe9362
diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index 83c39ba7b73f..5011ecd2bc58 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index 767e91596c05..3ee008a2c9b6 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -4,4 +4,4 @@ DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b
 DIST vdr-dvbhddevice-2.2.0_p20180420.tar.bz2 37812 BLAKE2B 3a5e88f2dd6e94934fcc563cf8606ffb723126976a5effeac8f9e7c52bf12b0c16076987469ecc7f248792f99fc8e3d340242a287c5e9494eb594276afa4f591 SHA512 d04e836a70241594eed4c92ab4c9411f54b8f0e37745ab5a19955895fc5a9cc3e6c5408ad910630481523debf75ebee362a83d8ba73b309a42e73cdec3fe136e
 EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6
 EBUILD vdr-dvbhddevice-2.2.0_p20180420-r1.ebuild 984 BLAKE2B b08658b4d128b427ca230e7853b1636ac19b120e50ee8438fece56fea2437a95ee1af65b5d059f3c4be48e8cefa381b50ac6f7fdef3e6ae5733c197a21b35369 SHA512 1bff1e9c0f08c271270bbca90b8bb39c2779b55aab11d014400e3716cd81433fe6ab0cd8d50633f70b9ab7730fb9a449c92b2e0e75b6f1b6f2e942308b55dad0
-MISC metadata.xml 565 BLAKE2B a629f35ce42591e8d978f8a6d5876f709fecbbef016776b2f7dbbac1c35dd4b22507398532db75be26b84cf4d0bc611bdcfe7e8219c11918be6bfb2e5580e96c SHA512 1d507d140eab426dc90ef53fe5f842f97128052a6c6ec27eb09fc5ccf23378e76567a59ee7830d8f195b0557308e67286144855ec22e28f8a113c700d8e53d59
+MISC metadata.xml 595 BLAKE2B d550a0ebbd3c4568def20da19be41a50cb73958c86366e5d441446e8a2a014ac3c574c41da973348b60b9b7278a7fd5e40c1c9eefbc0c4ef9afb77d6f2987e23 SHA512 e1c8bd64ee98248b93a6c94ccb1fe308fe2642d2d5bbbcaef0595177316ac8bf50a8b09c0ff05479d98dec66dcbe031050387ea1819fc5380c7ac31fefca1e4c
diff --git a/media-plugins/vdr-dvbhddevice/metadata.xml b/media-plugins/vdr-dvbhddevice/metadata.xml
index 25143612c470..03e664f07113 100644
--- a/media-plugins/vdr-dvbhddevice/metadata.xml
+++ b/media-plugins/vdr-dvbhddevice/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 8ac795ccfa8d..e927cf701ad4 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -7,8 +7,6 @@ AUX vdr-epgsearch-2.4.0_makefile.patch 1524 BLAKE2B 48ccd25c22e242d9c2f42c40afe6
 AUX vdr-epgsearch-2.4.0_p20200402_clang.patch 1186 BLAKE2B 85dc9f066a907635c6335e671fff1741c0cec1816f7b35ee5103f4d97b021f499ddd3d27a67f3b97783e464bb64b4c54932bfc48309e38d6715207faf5228995 SHA512 fb87ae50b7997fa3e429448f47f15190e11dd6da215b16582b8a8689c1b039295f61998b4d7116b97a1d5090ea2edb36d8ae6eec3e6328fb384feaccf399100c
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
 DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
-EBUILD vdr-epgsearch-2.2.0-r1.ebuild 2405 BLAKE2B cd48805ac512e1e493eebb8743d45af92addf2c58362672b054d5af56518c7fd1b8738c935943aa613e85a78bf19cf7cc4044cbf082e10ba40c0a53e2c3cd17d SHA512 834614271358f7753eaa2b66665e0af0f19c7b33ca52797982c18dc08a2a5268f1c301f29f36d41368855254843d2ee4e063eeee9d0fb13452f434228b27d036
 EBUILD vdr-epgsearch-2.2.0.ebuild 2304 BLAKE2B f5c4f3fbe477295ebb203d7edefcda859af50f76ed7ec7e18e814661e9c8cd037bf961f6f10874d1d59952e2ec34dc5f6cffcdd96c0227adef6c7c643a5a4c75 SHA512 e6ffcc191385616ba709499b80a9c54d9041648c3a2ea02c95cec877f84e0d949c47f5d9aa2d19e8b52a12387edf4b0f38f54ae9f10a6be2b1b2b1b1f14bf7ee
 EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2492 BLAKE2B 53afeefc9248ae9318c8fd48d67238d3df33cd938cc0f42dbf9b8477681903eedc043bb53fb079e473ef0f47bcb22825c1434edee2660c458739ee90029c5463 SHA512 3ec9992c40baef8f9a0e20a9591752c65b6f724428cef2d441d966f9dcc8bb4f88eb8f52a2b0c54385e1bb3a38e18f0ccb861e6bb500fd76395b6270b329341c
-EBUILD vdr-epgsearch-2.4.0_p20200402.ebuild 2485 BLAKE2B fd7865a31511456cb24fb5f06b436a2e45669a9589aca5ef2311a4c08842972e7ac37df0ef775aca5dd0d531ad3c9f64294ecbec49bbd85d21d6e9142f57c456 SHA512 08edfb1c53eb798f9e233c615ecf293ad21ea267a2194e691fb5d121099fa3a79eb773439384f8e3ab71c528a8e48c5007133be8e95ee9244ffe74d2bc64f99c
-MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
+MISC metadata.xml 846 BLAKE2B dc6acabb12fac7762e08746152b6c532f58a52f8a991261dd481b93a097218427e10c04a8f37488f796a8af9ca89f6caea45c7b842ea29a33a371ee401324fbc SHA512 ead246cb97042112c9ea8a979384060773f5369c3c78fd083da14271a7531202ba1bf32f3dff656ebb4ac9e06ec692dbf5e6ed0de9320d21458505452fdee375
diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 44d42030c0ca..b53647e303b1 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>martin.dummer@gmx.net</email>
 	<name>Martin Dummer</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
deleted file mode 100644
index 25420e6723ec..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
-REQUIRED_USE="?? ( pcre tre )"
-
-DEPEND="
-	=media-video/vdr-2.2*
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/groff
-	dev-lang/perl"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*
-	usr/bin/createcats"
-S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_docsrc2man-no-gzip.patch"
-	"${FILESDIR}/${P}_clang.patch"
-)
-
-src_prepare() {
-	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
-		|| die "cannot remove untranslated .po files"
-
-	if ! use conflictcheckonly; then
-		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if ! use epgsearchonly; then
-		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if ! use quicksearch; then
-		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include conflictcheck.c
-
-	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
-
-	# Get rid of the broken symlink
-	rm README || die "cannot remove broken symlink"
-}
-
-src_compile() {
-	BUILD_PARAMS="SENDMAIL=/usr/sbin/sendmail AUTOCONFIG=0"
-
-	if use pcre; then
-		BUILD_PARAMS+=" REGEXLIB=pcre"
-		einfo "Using pcre for regexp searches"
-	fi
-
-	if use tre; then
-		BUILD_PARAMS+=" REGEXLIB=tre"
-		einfo "Using tre for unlimited fuzzy searches"
-	fi
-
-	vdr-plugin-2_src_compile
-}
-
-src_install() {
-	local DOCS=( conf/*.templ HISTORY* README.Translators )
-	vdr-plugin-2_src_install
-
-	diropts -m 755 -o vdr -g vdr
-	insopts -m 644 -o vdr -g vdr
-	keepdir /etc/vdr/plugins/epgsearch
-	insinto /etc/vdr/plugins/epgsearch
-	doins conf/*
-
-	doman man/en/*
-	doman -i18n=de man/de/*
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
deleted file mode 100644
index d8abad551173..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
-GIT_COMMIT_ID="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
-REQUIRED_USE="?? ( pcre tre )"
-
-DEPEND="
-	>=media-video/vdr-2.4
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/groff
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
-	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
-	"${FILESDIR}/${P}_clang.patch"
-)
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*
-	usr/bin/createcats"
-S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
-
-src_prepare() {
-	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
-		|| die "cannot remove untranslated .po files"
-
-	if use conflictcheckonly; then
-		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if use epgsearchonly; then
-		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if use quicksearch; then
-		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include conflictcheck.c
-
-	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
-
-	# Get rid of the broken symlink
-	rm README || die "cannot remove broken symlink"
-}
-
-src_compile() {
-	BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0"
-
-	if use pcre; then
-		BUILD_PARAMS+=" REGEXLIB=pcre"
-		einfo "Using pcre for regexp searches"
-	fi
-
-	if use tre; then
-		BUILD_PARAMS+=" REGEXLIB=tre"
-		einfo "Using tre for unlimited fuzzy searches"
-	fi
-
-	vdr-plugin-2_src_compile
-}
-
-src_install() {
-	local DOCS=( conf/*.templ HISTORY* README.Translators )
-	vdr-plugin-2_src_install
-
-	diropts -m 755 -o vdr -g vdr
-	insopts -m 644 -o vdr -g vdr
-	keepdir /etc/vdr/plugins/epgsearch
-	insinto /etc/vdr/plugins/epgsearch
-	doins conf/*
-
-	doman man/en/*
-	doman -i18n=de man/de/*
-}
diff --git a/media-plugins/vdr-fritzbox/Manifest b/media-plugins/vdr-fritzbox/Manifest
index 27ea029084f2..0e42817a5c92 100644
--- a/media-plugins/vdr-fritzbox/Manifest
+++ b/media-plugins/vdr-fritzbox/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-fritzbox-1.5.3-boost-1.67.patch 597 BLAKE2B 8efc4aa1ff4418bf9d627032a89d3975d264446266f92a823ccf467dfa8a593ff3c99768e9ae3a8421fb9bfc72145ec5b114997c4f653f5fc786cff45375d13c SHA512 97ab8e2e572be18dea596a6b66eae5d1929c7178bc5027abd6035240fab0fa76afe26170007e7c84776f11d4c452fa39fc8140a21adcba5eb78912984809098a
 DIST vdr-fritzbox-1.5.3.tgz 132207 BLAKE2B c9a93e922eeb2126279409e3948c44cb1fc3348d44fbcc2c1116038d66fc77a707d3885a6d587c8996138fcaff134bb78db4dab2d122caf0293d2d8d8770e985 SHA512 d396bb1386ffc4b53867c735d4ffc710c4266067e011e17f2d4aa597ecceeb502d2c6e23a1df69f929503b2cd5d07f4d57869c890040b1ae9af1742c044541be
 EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1003 BLAKE2B 9deec31f2456624d46756f804d2dcbeb2ea70393d91e0ca5bb1dfe5000cb349401702c8fc168d3cf9a5a1503c64f56b1c70d6b0f91a8ca5dfdba4da11bfabdd1 SHA512 4c92b5d74cbd5cb732bc5769d13adf5e22ae8e156c6e3e7912fea6175d793f5b773a7bb2a0efa6c4574cc03538a3092f5e107451c31aa08c51a34fe3f8b04266
-MISC metadata.xml 330 BLAKE2B 6f2fc336e9406fcc2413210e07d2396d1fe4faff1e8be1ae7d16428e5df9c46f7c00b2f183fb9e6e973014e6ce46379d12774e3597f3caf901f812f5c90b5360 SHA512 b0521cb557fc56b09d61f9dded16f511d306151642b7a45cb243132d216531459d519a5abd9b38c23c7799b03bbaea8f8e2122a9b28ae200940fdc8a194cf0f5
+MISC metadata.xml 330 BLAKE2B 5cd8d714a3b5682eb5488d30ee4e7ac0ffc32adf99df1b9e0779722fb4e85268e4a57d1cfac793117f93d76e42929ad9b22bfe352d55ed509946f51db9136148 SHA512 262ffcc4bc66991c986e3b89bdf7f5ce988e796248547fc8a6faa67b57c162bce8e3e7d59f548e953f65a3a889eacc4ab1a8e9fee74401604b7ddedb7416723b
diff --git a/media-plugins/vdr-fritzbox/metadata.xml b/media-plugins/vdr-fritzbox/metadata.xml
index 6e66cc576330..7d63f78a0c9a 100644
--- a/media-plugins/vdr-fritzbox/metadata.xml
+++ b/media-plugins/vdr-fritzbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-plugins/vdr-imonlcd/Manifest b/media-plugins/vdr-imonlcd/Manifest
index 3e9886a4fde6..e837870a2fe8 100644
--- a/media-plugins/vdr-imonlcd/Manifest
+++ b/media-plugins/vdr-imonlcd/Manifest
@@ -4,4 +4,4 @@ AUX rc-addon.sh 165 BLAKE2B 7d761ab823ae86d365047cfb01251077e2f3d880953888ef2fdc
 AUX vdr-imonlcd-1.0.2-freetype_pkgconfig.patch 816 BLAKE2B f0494f58adff0fbab89262ebc65a65c0610e3a6198014139c860f705a9e0011759b471d9c1f5c7f4472a08b98a533ee1d0cf34a0ec7a13773e97b5a027c9bc39 SHA512 9d008137b6b8bd42051f6019f7b3d35aebae510536124dfe3e59d9a677fc2223910af9f5012bc334f5c3c0f3fc5539ec2a381cffe5039338804e015fc02da572
 DIST vdr-imonlcd-1.0.2.tgz 44517 BLAKE2B 1cc675978ca2c8270592c552ca383468628382c28aca08f74c55aa40dfc4154797f0e49e038cb2a8c07d66dbbf9d3fed190256809e08c4dea9b379a29cd96acf SHA512 ad1f70c3c3f4754251bd47d23ac2c56503860461edfb6e91d8dfa8e1d585da9fdd36ad300821eb29ef727e5a0875aa41d5def5f6f89f36f06efbd4a5da2b2fae
 EBUILD vdr-imonlcd-1.0.2.ebuild 970 BLAKE2B 6eee8b638b6c42963ed78c31a1fde4e95cbf2618266eb7065d48ee7604a6987febf4b0342a183a7ee78aca7a820b6f79b0aa3256241b86c6ec3f0ca787f07391 SHA512 a05b1fbe2b298e9db3d3208d209e9fa11fc49afaeb68a1447ec2149885ef82ab87676b9de9e9bdc58aee0147354f33fa4db8dd96993628c891b166fdaac79602
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-imonlcd/metadata.xml b/media-plugins/vdr-imonlcd/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-imonlcd/metadata.xml
+++ b/media-plugins/vdr-imonlcd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index ca670c9c9361..f11ffcae127f 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -7,4 +7,4 @@ DIST vdr-osdteletext-0.9.7.tgz 101400 BLAKE2B 52cabda446701ce4898705487e47e5ca51
 DIST vdr-osdteletext-0.9.8.tar.gz 100954 BLAKE2B def803093a3726a7c9b1905e04e5790ad3959d8d66664ccc3b0147cf4ed5ff37389525cbc1504fed7e8da782c5c9e58128e35c6adaa1f4ab04ad15cc3e2ae8ba SHA512 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58
 EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d8f7292fd23966f42f1d4080948d04c168d3c91df83454473ff13e8179a3c6ae21b8988cebd633723280a2635f9d119e51 SHA512 6b06ee1321f69fadb3eb9a1fd3af39c7942f85f35ce19ccac8ffb0aa45e9353a608d0f4fa4acdc75e367e5341262a4f9e13922d6a027b9f62b1b9a9d0a6e2644
 EBUILD vdr-osdteletext-0.9.8.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-osdteletext/metadata.xml b/media-plugins/vdr-osdteletext/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-osdteletext/metadata.xml
+++ b/media-plugins/vdr-osdteletext/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-permashift/Manifest b/media-plugins/vdr-permashift/Manifest
index 64fbe63b8097..399918cb898e 100644
--- a/media-plugins/vdr-permashift/Manifest
+++ b/media-plugins/vdr-permashift/Manifest
@@ -2,4 +2,4 @@ DIST vdr-permashift-1.0.1.tgz 49184 BLAKE2B 2342f0d071afd7f38b6109a514f124760aaf
 DIST vdr-permashift-1.0.4_pre20200301.tar.gz 52894 BLAKE2B 710a8373fb1bfb8d51eabb43db56c79a29c3fbd34f730f02bc73bfde6f1da68a3fdae221e06f71c25108bba6b5dc87b0a975d6dd62beef64738649c0e796a191 SHA512 a9e78df00d43ef692092ea299e13520ebc71766a7ebdbf3c0963e535014c837b3556b2fa81b444680830c703b56f459ef2ec01904282c0f34b80e20cba96a5f8
 EBUILD vdr-permashift-1.0.1-r1.ebuild 542 BLAKE2B b4e9a67bfe416d0edb93bde06d87779291b478cd024a96bfe6cc553637b23b23b108ddd463665e7deaa2a56b1459c63faaad2e56cb8baad26922fdea7e4e9f52 SHA512 6336d6e88a6da5e580e8fd0fbf2b19cd58c01bee3d4b4184dd70eb79ef1fea79521a3a5684ec040073e7a052da6e004f3936d36b7613054d9ee0d61d725d3429
 EBUILD vdr-permashift-1.0.4_pre20200301.ebuild 728 BLAKE2B e0be0f58afc96a95725de8ae97e2cd546a9644940df9f81982ae7696bd16736d23d2d2c0e53dd054c90210200eedd53ac64c4137da13c4fca6e2d7f74b6a36b3 SHA512 171d7f77db285e7e022be7ce85dedda47be59b7e89ac4a43a464cba73817295c924b6eb5215cbac2ae37194f0e9a354a8fb371943d80f313308d20487810333c
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-permashift/metadata.xml b/media-plugins/vdr-permashift/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-permashift/metadata.xml
+++ b/media-plugins/vdr-permashift/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-pvr350/Manifest b/media-plugins/vdr-pvr350/Manifest
index 021392b395f5..f49f7588a65d 100644
--- a/media-plugins/vdr-pvr350/Manifest
+++ b/media-plugins/vdr-pvr350/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-pvr350-1.7.5.tgz 48676 BLAKE2B 42af0c22704aaf1ac51ed3b5b8af76e8850ae63d09d110db140a2c8eaa29448800da291642d753bec894c345e58e1095453db4b902eab51e6188efe5be3e94e6 SHA512 dd29836afe4e56b6ec083210920964645568c2680c170d435b379593f7f8fc1a5420e10af53126cfb82be4764aee47d2233b8fca3efece0ccb221c1a94445d05
 EBUILD vdr-pvr350-1.7.5.ebuild 823 BLAKE2B 7cb0e4a8618e3137d722a203d66a6c2d11f3134508ab74f252750d4e2a44b9ca06f457e65ba0f9f66e76469e06a4483cd6df33460c9fd3f0a653a46bd9df63ba SHA512 2324b0778870cd31b374758825dfc42f7f618779419f700cf429a38ad7975532af8999cd2beec9aa8efcdecf138226e8c9b30bd0032580fc0ce3174874079929
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-pvr350/metadata.xml b/media-plugins/vdr-pvr350/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-pvr350/metadata.xml
+++ b/media-plugins/vdr-pvr350/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index 004ba93dd2c6..c7502b1a528f 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -3,4 +3,4 @@ DIST vdr-plugin-satip-43b60b1566878104240cbae5b1e322bbacd380e1.tar.gz 74697 BLAK
 DIST vdr-satip-2.2.5.tgz 74669 BLAKE2B e586297f0f0c1ca776d4c9f83b46da7f7afe82b80ac7e79ec2da7107c793f5c8a5092590ad23030a435e2d034b084373b9b069bac6ef81822723d33ff6c7fab2 SHA512 3f8ab1d9e84843e71bc6fc8f712d178fa3d304d0959ec977de1b11829e27b575feb78735c6770b15d4dfb8f4fce933aed7df07a6d9ba0b20e937aacd3c643a21
 EBUILD vdr-satip-2.2.5.ebuild 797 BLAKE2B 38e3e9ba257e3e7237c6918bf4935d6f50796edad3d04265c4fb0f36f9477e1558093f08deb518c3fde8377ca396a4c24e90ec1fda46a4f19d4d7df2bf7284b8 SHA512 3ced04c065278d0d593a11ee9c2fcbbaeaedaa6fd0586ff5a0ae935c050afdfece801d28dbc73109a0b8592c10b690bb574134763b62ad88ae6350b0134ef64d
 EBUILD vdr-satip-2.4.0_p20210131.ebuild 1067 BLAKE2B 0b2cc81f1718c98a5559310098bf47a9f7028cae7c22e0d7ec13f1fcd067135dca0e1d9225cfe811fb0efec9215a8c84bcc0d8ba621d9b9edd29037df9c247fb SHA512 38e0f6cb84aece67a69e466d8dcab7333a78da01840a59c38ebd0504d0f43a7a23c89e61328efaa6daf5ac42d2be5acc02c04e9615a7430192e59cbc17f87643
-MISC metadata.xml 567 BLAKE2B 4915f7c9f78f6b2c42ad151a32a5aa84b035e1abf87bd5fb5404990298dd9f03ecd9f7ed8af1d45f81366c3489b56ef6f8cadd13052dc89618f1c5f25ba85f98 SHA512 8bcce4b0085a8f4fb5f2d88de85a12babfc2bb8a1d5652f8d186c7beb1888175ddf1050de84c521b82dbc8e137ed2da006a035c204883fa7734261b7ac79c91d
+MISC metadata.xml 597 BLAKE2B 3769259fb6cf0f798c25656fb99dad805d291338542bcca76dac37b426a3ef8b9720358adb35f4e151bf2744071768a487a34bd37997111ef54c68e46a8c34b2 SHA512 ffb5c4cb39c4e3b2a84279e157d7fbc85262590a023bae89b7af7b249af19dd27cb683a6ab5872c442354213d133f191debbb9b58d98613f26fb6e426a231aad
diff --git a/media-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 35945118910f..61224ae34f4a 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-vaapidevice/Manifest b/media-plugins/vdr-vaapidevice/Manifest
index d7ab9ff81861..f72e199a1a64 100644
--- a/media-plugins/vdr-vaapidevice/Manifest
+++ b/media-plugins/vdr-vaapidevice/Manifest
@@ -1,4 +1,4 @@
 AUX confd 1427 BLAKE2B 04cab6d1c6f63a0c4aa0b25ed0f9e36af763a0520170025d956b344b37c979a5ffc6dc42a18e2a1ef25027cdfed86ce801fbb5ab3db256e43d4e7cf5df468363 SHA512 a12d06e2a3fde12de81ea65ddad1113b0e11bbea5bd236cddede17f40da7f234b2fa429a48238f39828bd72ae36e7f9e07319e45994c76a624c098f284411161
 DIST vdr-vaapidevice-1.0.0_p20190526.tar.gz 122374 BLAKE2B 740bf6244205eacc89cb9517fc25f7a947f67f14eda990688f86f6c6ebb3da9d648ee3cb6798d4c27bd8bde04c4354b35fb4d4a5d0ed30dcdd1e04293d0744a5 SHA512 f67caa3f052479ac8339700766471f0f36369b152c84c84ed7479ddb67235fa527465dffae6f3b0d57f6cae12ed3d4c290a7cd65ad32af1421943b8adcad8e5b
 EBUILD vdr-vaapidevice-1.0.0_p20190526.ebuild 1152 BLAKE2B 700fb6887bc2e3be457d4cd55f3735e71b1a1da7e70970d7f18c01dee887de77a6afe35ef81e261b6c4d7ca5db409958f27fda0beb9b54b1280cdff9622473b5 SHA512 c3ca5eac9cd89815504cd79e0db98b5e069f5e84afec5d27ae7b0b4317bcbba226caee847dfe2ac2ad83085f565e7fb46f61fec869bc31cc27aeecb4c5550011
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-vaapidevice/metadata.xml b/media-plugins/vdr-vaapidevice/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/media-plugins/vdr-vaapidevice/metadata.xml
+++ b/media-plugins/vdr-vaapidevice/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index 6691e9e7ee81..fc56ea80167e 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -4,4 +4,4 @@ DIST vdr-vompserver-0.5.1.tgz 97156 BLAKE2B a4c122cd83eb9f228ec2acb53b3e4ca0774e
 EBUILD vdr-vompserver-0.4.1-r1.ebuild 903 BLAKE2B f0d93998228dc226f755ade90cbbc4eca2e8649ba535bb54fe487c35aa13dc1a991ee220c497cdabe0d962a4794eaa91b06bf9a091f63bbafa26edd9d392e179 SHA512 e6e847029ccdc5761d23368bc55448182442ec5c34a29ae8e541ad5c4392f5138de7f6b465c7a8a7de9c545eef085a9d4d8e1b19861d1bdd8c272b595cef1f6f
 EBUILD vdr-vompserver-0.4.1.ebuild 854 BLAKE2B 020a908ca53219ce24969cff4bbb0540c879bbf101631f1659e110846e5c3c2c7806f71146c536c126ec34bff564cf10918a3240154f2fe5a3331b1f17e9e1fb SHA512 bf552e032180bd3e5deae1bdbe7c6f22a9f599444e2cb59e04afd39f5705e3c44f81346fdf81b2d7adc1b25df852d85627d824d41f538fb6a7b8aabf4a33e48c
 EBUILD vdr-vompserver-0.5.1.ebuild 707 BLAKE2B 77d7b39df7cd54e8ece1ae976e7551e880f41d09fd828569e149c2a0bc7fcc0aac3f30f8c0e7336d1e3476cdc1d5cb5d424754f383ac6c5fb4337e25b1d37303 SHA512 df50d730f2360c87da3c0c8e211de96ceb54f58c7aa2d53772a2b820941555e263f49c4fe70851e6cdd9b15031435b73acf1b075c894c8e1edf36cfbb21ec48d
-MISC metadata.xml 463 BLAKE2B 9277a5c1b07bbd14380fab32ae4a95c62523dc07d432bcfb4ad8ae01ffcf3558f9d6873e3e0c6ab975e6a1c2bc81bce7c64acae4ee03840304236bf1a42aa141 SHA512 d1f13b57fbeb18dd49f3b5b22197e483d8d616f8723e3ac5b0102216c619beb1304ee21f0f15d7f0c3cf2e5f169cd52be1881dadad02d6f0c4cdd12e72315cdb
+MISC metadata.xml 493 BLAKE2B e6f11b4dfeeb1ee7c402a0fffa80a34f852ad6222a65dedd447ec9a246e3267720663b6fceaf8fe9c3c8b68850d80072d26053b0f259e0942c8727386f6128be SHA512 74031e7d0a17edb6e2c83690f8bb82a559f94699785cafb74b4e2f46751e16019bc53fb433f3137ff4c51cbc0c82dd015b0342b724b18a08c55b528b3fbea272
diff --git a/media-plugins/vdr-vompserver/metadata.xml b/media-plugins/vdr-vompserver/metadata.xml
index 9507ffc6fd1a..635a753676b1 100644
--- a/media-plugins/vdr-vompserver/metadata.xml
+++ b/media-plugins/vdr-vompserver/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
   <email>pfrank@gmx.de</email>
   <name>Petric Frank</name>
 </maintainer>
@@ -10,7 +10,7 @@
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 1b6f98773e81..7aa045107bd9 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/adifmerg/Manifest b/media-radio/adifmerg/Manifest
index 9b67e06e992d..a1e6f1095035 100644
--- a/media-radio/adifmerg/Manifest
+++ b/media-radio/adifmerg/Manifest
@@ -1,3 +1,3 @@
 DIST adifmerg31.tgz 47460 BLAKE2B 14bf6a85ba5a22972e1cf1fae068a4eaa92bf0e205904c3e11bcbe83aab800f2da02d9dc4835e75189b49590c005aa3412f19170b8f6abb39d84000d006f7384 SHA512 851a90d4269d79359eb76168d67f980fcbc551ee8ef221e4caaf9ba6fde756aebe03d80670b7cb5e91e20aa5ef81d772ddaedc204b3cf57cfdbb62d593575fa7
 EBUILD adifmerg-31-r1.ebuild 566 BLAKE2B 547dc7779900efaeabfb5dc35c4a08d89d49ed215209dc7c6d9862d89589c92d9137f7501cb7a1e816f728f1f73099b5cec21328d09ec26afaff8a8bd5f92a92 SHA512 f4cd00857128b2a6d5fe9f114b07db83f3633cc522b272ca643bdab9243108c44da00349327dcb95fcc293371dd3b52f3557cd8f0030403fac2b52455d998faf
-MISC metadata.xml 328 BLAKE2B 578fbe7a61b751e3b4f2bf9c247b11c685fcc346e8a8874227b301ec9bf4e8407156e5108e847458f59e666075c730b749ae1497603b18853d06c2193ae65932 SHA512 9b80ab0dc1d5409d09e1a11002770f0c22658bf7ddd513f648ab10a74687409a21f9bb882329b2bf42e154e5bea7f1f2f9b064261499dc0be286cf259bf5802f
+MISC metadata.xml 328 BLAKE2B a0089b49edd24a23f3e5a8b9e32a1ecdd80bec9cc9913aa6aabeab3452bf762acee5a8441ff1faddcc5c30cc444f96c0b798e8f4dc64370ec2967eeba12c7c6b SHA512 43e9be1bf9f65f039d047cbfb370860a7c3f6e70e17df13ce5fcff0c1a92846b3acbca61817098cb414c078fead77e49640aaba10e637434303a312b10c08a2e
diff --git a/media-radio/adifmerg/metadata.xml b/media-radio/adifmerg/metadata.xml
index 1023d5962205..515c722308d1 100644
--- a/media-radio/adifmerg/metadata.xml
+++ b/media-radio/adifmerg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 170c0e4d2d2e..07dedb731df8 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,12 +1,4 @@
-AUX 2.1.0-makefile.patch 523 BLAKE2B 8a0143b80422ee19a0bdf8637de065d3af6b4aded30e3437b8ff3b05b5704426e9f890d915ba5e50429ebba9f4f77da9b15865d6a3b8e8233976c0b165e8dd09 SHA512 26da9c578cab7f2fadebf6818f323967e28383fe3e2429d3ef614c43bcd50155bdf1607f353beedd91c27b45045dff1787ee9d2844ffa800f7da53e04b045de8
-AUX 2.3.0-database-connection-refactoring.patch 5985 BLAKE2B e4b68f4e0c9b91aadf6d052726573b3adcba0eede88f81abcc316197844a69bfc60b4377d3833546797ae6ec8a1191dcf5a9668bebb3e63b5dca2039bab8a8ba SHA512 25a3c0fe60dfd6ccac9ca30d82703b2a376c8f58fb09c696431431ffddd17ddc78b5094a60a459fe754598c1093cbed1ff8d6e66d5c6317d3bb2be757df76820
-AUX 2.3.0-makefile.patch 531 BLAKE2B 8860b129afa97fc9c1d444e0356950afa554c25a2cab8bc508a319e5bb85d57df411ec5cf9e813de4b0991f79694b47070b6933e649c4bd32f44d2de4c4400b8 SHA512 a8c724ea250518d701bf0b458114caaee410463fbc954288d8127a743955cff133fb0064561b1a2fb7b077c66f667a1398cb053210b0b21cda3185638baafa7c
 AUX cqrlog-2.4.0-makefile.patch 1651 BLAKE2B 9258aae8d919ce89df3108c7e421463d7e30090eaa2fdbdc9de3d5cee8c890ec58d553992342665287f5133db1ff04ff0dffb772578253934663ef5626673244 SHA512 75ae44d33a2eec6ff00b0845656ea015ca7c4af03de4ceb8c29864e649c6e8427c00e0bddd51bb07966970f7dfc0a590853cf7b752375ca024f01ff2a7586355
-DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
-DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b8902a7cf959b72ab9a667cbaea1f8a829bfb6b3abfb2a9112f4aeed2adcbed825b1f347ceba640f1ad3903b0c246 SHA512 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000
 DIST cqrlog-2.4.0.tar.gz 12361259 BLAKE2B 1779abd8983b66e966b73c157e322b489c3b4005cbc84952af1d708f7d9623efa7f6abc0515ab09f13765523fa373a2829a41da43b4b0f2edaea05e1b182b5a1 SHA512 aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a
-EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d
-EBUILD cqrlog-2.3.0-r1.ebuild 888 BLAKE2B 620c1c07c29b9347f41a8a0266885fc5a1ac202322e1e1d3741e7eec448d7ccf1f8bde9388b1ce8e266db2ba39d88d1a26b965e101f90d9639504e6c6aceb888 SHA512 ee32b7466b65fd7e6c6160e52d947c1a2331604bc1c3eaf9ceb1c959261f187d62f662b5ba19a486cb1ce75a0e430b50bb74000638619304bfbb8394bd284919
-EBUILD cqrlog-2.3.0.ebuild 951 BLAKE2B 1bd1f5a05104c7d05ede2175c289a478d5bcb71369c8593476899c592d23057865b19a9063324f2b13c11640a45ead03a3133321536d8fcf06d10604aae9c84b SHA512 f21a6559f3ac0dd2ee9c16fde8f34e768171d35cdf19b9aa86053aa97577784cffc3f1cfe0be433d36c1a1c287c1f15a59b979396dd88aa3ff3f896a39c1f78c
 EBUILD cqrlog-2.4.0.ebuild 730 BLAKE2B 5395114fb930a31f0463d7da0e24ebdd15b87d917231ee071aa2ab4e3908b96e70cccf00628093751517bdc574500743eb3368415b1d1bae8a0a584ee3bfbdb4 SHA512 69bc58da810b96dfe1ca225c7e9f2386095e1b2619aa519e118141caa998ab6f509e44874ff072b7d5894063cc25664a4935d6947bb633db9171ca4636581112
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild b/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
deleted file mode 100644
index 6e07afef90a5..000000000000
--- a/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-DEPEND=">=dev-lang/lazarus-1.6.4
-		>=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
-		virtual/mysql[server]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+
-		x11-libs/libX11
-		x11-libs/pango"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild b/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
deleted file mode 100644
index 43d58b5490bd..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/lazarus-1.8.0
-		>=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
-		virtual/mysql[server]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+
-		x11-libs/libX11
-		x11-libs/pango"
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-	epatch "${FILESDIR}/${PV}-database-connection-refactoring.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0.ebuild b/media-radio/cqrlog/cqrlog-2.3.0.ebuild
deleted file mode 100644
index 3b72a623578a..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-DEPEND=">=dev-lang/lazarus-1.8.0
-		>=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
-		virtual/mysql[server]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+
-		x11-libs/libX11
-		x11-libs/pango"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
-# remove strip call
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/files/2.1.0-makefile.patch b/media-radio/cqrlog/files/2.1.0-makefile.patch
deleted file mode 100644
index 8499213fbd53..000000000000
--- a/media-radio/cqrlog/files/2.1.0-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 4edf8cf..1ec6262 100644
---- a/Makefile.orig
-+++ b/Makefile
-@@ -3,10 +3,10 @@ ST=strip
- datadir  = $(DESTDIR)/usr/share/cqrlog
- bindir   = $(DESTDIR)/usr/bin
- sharedir = $(DESTDIR)/usr/share
--tmpdir   = /tmp
-+tmpdir   := $(shell mktemp -d)
- 
- cqrlog: src/cqrlog.lpi
--	$(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-+	$(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- 	$(ST) src/cqrlog
- 	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
- 
diff --git a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch b/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
deleted file mode 100644
index 810bc5b5ba97..000000000000
--- a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b26102b097ef6353a20d18ccdaf7a3a6a30185c7 Mon Sep 17 00:00:00 2001
-From: ok2cqr <petr@petrhlozek.cz>
-Date: Sat, 15 Sep 2018 07:12:30 +0200
-Subject: [PATCH] database connection refactoring
-
----
- src/dData.pas | 126 +++++++-------------------------------------------
- 1 file changed, 17 insertions(+), 109 deletions(-)
-
-diff --git a/src/dData.pas b/src/dData.pas
-index 9d72d27..bb56598 100644
---- a/src/dData.pas
-+++ b/src/dData.pas
-@@ -162,7 +162,6 @@ type
-     function  FindLib(const Path,LibName : String) : String;
-     function  GetMysqldPath : String;
-     function  TableExists(TableName : String) : Boolean;
--    function  GetMySQLLib : String;
-     function  GetDebugLevel : Integer;
- 
-     procedure CreateDBConnections;
-@@ -267,6 +266,7 @@ type
-     function  RbnCallExistsInLog(callsign,band,mode,LastDate,LastTime : String) : Boolean;
-     function  CallNoteExists(Callsign : String) : Boolean;
-     function  GetNewLogNumber : Integer;
-+    function  getNewMySQLConnectionObject : TMySQL57Connection;
- 
-     procedure SaveQSO(date : TDateTime; time_on,time_off,call : String; freq : Currency;mode,rst_s,
-                       rst_r, stn_name,qth,qsl_s,qsl_r,qsl_via,iota,pwr : String; itu,waz : Integer;
-@@ -1092,49 +1092,6 @@ begin
-     Writeln('   ',DLLUtilName)
-   end;
- 
--  lib := GetMySQLLib;
--  if fDebugLevel>=1 then Writeln('Loading libmysqlclient: ',lib);
--  if lib <> '' then
--    InitialiseMySQL(lib);
--
--  try try
--    c := TConnectionName.Create(nil);
--    MySQLVer := copy(c.ClientInfo,1,3);
--
--    if fDebugLevel>=1 then
--    begin
--      Writeln('**************************');
--      Writeln('MySQL version: ',MySQLVer);
--      Writeln('**************************')
--    end;
--
--    if MySQLVer = '10.' then
--      MySQLVer := '5.6';
--    if MySQLVer = '10.1' then
--      MySQLVer := '5.7'
--
--  except
--    on E : Exception do
--    begin
--      Writeln('FATAL ERROR: Can not get MySQL client library version version!',LineEnding,
--              'Setting to default version (5.1)');
--      MySQLVer := '5.1'
--    end
--  end
--  finally
--    FreeAndNil(c)
--  end;
--
--  if not TryStrToCurr(MySQLVer,fMySQLVersion) then
--    fMySQLVersion := 5.6;
--
--  if fDebugLevel>=1 then
--  begin
--    Writeln('**********************************');
--    Writeln('MySQL version assigned: ',FloatToStr(fMySQLVersion));
--    Writeln('**********************************')
--  end;
--
-   CreateDBConnections;
- 
-   MainCon.KeepConnection := True;
-@@ -1148,13 +1105,11 @@ begin
-   end;
- 
-   //special connection for band map thread
--  BandMapCon.KeepConnection := True;
-   BandMapCon.Transaction    := trBandMapFil;
-   qBandMapFil.Transaction   := trBandMapFil;
-   qBandMapFil.DataBase      := BandMapCon;
-   trBandMapFil.DataBase     := BandMapCon;
- 
--  RbnMonCon.KeepConnection := True;
-   RbnMonCon.Transaction    := trRbnMon;
-   qRbnMon.Transaction      := trRbnMon;
-   qRbnMon.DataBase         := RbnMonCon;
-@@ -1194,7 +1149,6 @@ begin
-     Writeln('ZIP code directory:     ',fZipCodeDir);
-     Writeln('Binary dir:             ',ExtractFilePath(Paramstr(0)));
-     Writeln('Share dir:              ',fShareDir);
--    Writeln('TConnection to MySQL:   ',FloatToStr(fMySQLVersion));
-     Writeln('*')
-   end;
- 
-@@ -4166,70 +4120,13 @@ end;
- 
- procedure TdmData.CreateDBConnections;
- begin
--  if fMySQLVersion < 5.5 then
--  begin
--    MainCon      := TMySQL51Connection.Create(self);
--    BandMapCon   := TMySQL51Connection.Create(self);
--    RbnMonCon    := TMySQL51Connection.Create(self);
--    LogUploadCon := TMySQL51Connection.Create(self);
--    dbDXC        := TMySQL51Connection.Create(self)
--  end
--  else  if fMySQLVersion < 5.6 then
--  begin
--    MainCon      := TMySQL55Connection.Create(self);
--    BandMapCon   := TMySQL55Connection.Create(self);
--    RbnMonCon    := TMySQL55Connection.Create(self);
--    LogUploadCon := TMySQL55Connection.Create(self);
--    dbDXC        := TMySQL55Connection.Create(self)
--  end
--  else begin
--    if fMySQLVersion < 5.7 then
--    begin
--      MainCon      := TMySQL56Connection.Create(self);
--      BandMapCon   := TMySQL56Connection.Create(self);
--      RbnMonCon    := TMySQL56Connection.Create(self);
--      LogUploadCon := TMySQL56Connection.Create(self);
--      dbDXC        := TMySQL56Connection.Create(self)
--    end
--    else begin
--      MainCon      := TMySQL57Connection.Create(self);
--      BandMapCon   := TMySQL57Connection.Create(self);
--      RbnMonCon    := TMySQL57Connection.Create(self);
--      LogUploadCon := TMySQL57Connection.Create(self);
--      dbDXC        := TMySQL57Connection.Create(self)
--    end
--  end
-+  MainCon      := getNewMySQLConnectionObject();
-+  BandMapCon   := getNewMySQLConnectionObject();
-+  RbnMonCon    := getNewMySQLConnectionObject();
-+  LogUploadCon := getNewMySQLConnectionObject();
-+  dbDXC        := getNewMySQLConnectionObject();
- end;
- 
--function TdmData.GetMySQLLib : String;
--var
--  lib : String;
--  Paths : TStringList;
--begin
--  Result := '';
--  Paths := TStringList.Create;
--  try
--    Paths.Add('/usr/lib64/');
--    Paths.Add('/lib64/');
--    Paths.Add('/usr/lib/x86_64-linux-gnu/');
--    Paths.Add('/usr/lib64/mysql/');
--    Paths.Add('/lib/x86_64-linux-gnu/');
--
--    Paths.Add('/usr/lib/i386-linux-gnu/');
--    Paths.Add('/lib/i386-linux-gnu/');
--    Paths.Add('/usr/lib/');
--    Paths.Add('/lib/');
--    Paths.Add('/usr/lib/mysql/');
--
--    Result := MyFindFile('libmariadbclient.so*', Paths);
--    if (Result='') then
--    begin
--      Result := MyFindFile('libmysqlclient.so*', Paths)
--    end
--  finally
--    FreeAndNil(Paths)
--  end
--end;
- 
- function TdmData.GetDebugLevel : Integer;
- var
-@@ -4315,5 +4212,16 @@ begin
-     QSOColorDate := now
- end;
- 
-+function TdmData.getNewMySQLConnectionObject : TMySQL57Connection;
-+var
-+  Connection : TMySQL57Connection;
-+begin
-+  Connection := TMySQL57Connection.Create(self);
-+  Connection.SkipLibraryVersionCheck := True;
-+  Connection.KeepConnection := True;
-+
-+  result := Connection
-+end;
-+
- end.
- 
--- 
-2.18.1
-
diff --git a/media-radio/cqrlog/files/2.3.0-makefile.patch b/media-radio/cqrlog/files/2.3.0-makefile.patch
deleted file mode 100644
index da6ac782c488..000000000000
--- a/media-radio/cqrlog/files/2.3.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 0b1d1ef..8d6eb2f 100644
---- a/Makefile.orig
-+++ b/Makefile
-@@ -3,11 +3,10 @@ ST=strip
- datadir  = $(DESTDIR)/usr/share/cqrlog
- bindir   = $(DESTDIR)/usr/bin
- sharedir = $(DESTDIR)/usr/share
--tmpdir   = /tmp
-+tmpdir   := $(shell mktemp -d)
- 
- cqrlog: src/cqrlog.lpi
--	$(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
--	$(ST) src/cqrlog
-+	$(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- 	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
- 
- clean:
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 1b4e17391070..7ea5abaca187 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -6,5 +6,6 @@ AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bf
 DIST direwolf-1.4.tar.gz 17554878 BLAKE2B a8eea6777df93d66d67c993c23eba86f37ff1e23d95df842b17be1a9a0b83c4bb0b7b14b97f43a1756512d060e50136712d1d9d499b2567eabbe1092a2f5edf0 SHA512 597b0652e910642d5a3c538297e4306f9317c29b3629e7fd96cc33b92b2f09d743cea8b8a0cc6451347dc0877fcf1f3933a420ae58e33ad7be7d899f80036eb3
 DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
 EBUILD direwolf-1.4.ebuild 1588 BLAKE2B 636e95a3e21fdccde9e0593cb47fd013941d1cdfdda74881cf145e43638359144585e3c99b24c877e45343a3ec0ebfa522694abd8c929a42816688d1a56b0840 SHA512 c66ce7a380bb9a767605094936d3b74269551d1fdf41e5cbad32d534595535019e6918c7616b3a1e0e74439b418364f96e526b4002af79d1eeb48844a7a97431
+EBUILD direwolf-1.5-r1.ebuild 2100 BLAKE2B deb75671e19dc27cc43e32e903034502ba0db6fdeb9707eb5a629ad3eec26966267252e01679429122e3ba49400e8aa7313f9e544d700fa54278a47772a4a975 SHA512 2334e2bf6f07f30379a167bcf199a0c1384ce14602f57abf9542309830ad37ad418a6e68226e6f15f8c2fff0edfa542ac5e2ea52584066b07b569150953a92dd
 EBUILD direwolf-1.5.ebuild 2098 BLAKE2B c9a37621af73c18f4ce33dec0a530b65096fb3016224e35677807e59a3be277ffdfa6b0f5fc056a1cbfbafd71118a56c5cdf23df39d7b0f6abfa5aa8679e2482 SHA512 ceb9e5067d5b00044c713d6a06a806a37c456c5dbade6e3cd5bf41be197b736c08b75982a5d5ac78be0334aa90fc750ceda3c8e5a976dd74bb340121338e12ec
 MISC metadata.xml 404 BLAKE2B 597de8502b1c38246c0bf473f69767d8ba0a9c45942d790718f7065677768f175143d5eb0428baf07697263beb6abc77d0147ee814132ac9ea0863e832fb4122 SHA512 a27e29158ac2305c89b2c64cd08618a9d3f655604ce8ceca49494d7c82e030e0294eaaa70c84c7105768e6d308b57bea336d9f036b64eadd146c765a9697b92c
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
new file mode 100644
index 000000000000..1bc1ce3d60ee
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils systemd
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps hamlib udev"
+
+RDEPEND="
+	media-libs/alsa-lib:=
+	gps? ( sci-geosciences/gpsd )
+	hamlib? ( media-libs/hamlib:= )
+	udev? ( virtual/libudev )
+"
+BDEPEND="hamlib? ( virtual/pkgconfig )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md README.md doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf doc/APRS-Telemetry-Toolkit.pdf doc/APRStt-Implementation-Notes.pdf doc/APRStt-interface-for-SARTrack.pdf doc/APRStt-Listening-Example.pdf doc/Going-beyond-9600-baud.pdf doc/Raspberry-Pi-APRS.pdf doc/Raspberry-Pi-APRS-Tracker.pdf doc/Raspberry-Pi-SDR-IGate.pdf doc/README.md doc/Successful-APRS-IGate-Operation.pdf doc/User-Guide.pdf doc/WA8LMF-TNC-Test-CD-Results.pdf direwolf.conf dw-start.sh sdr.conf telemetry-toolkit/telem-m0xer-3.txt telemetry-toolkit/telem-balloon.conf telemetry-toolkit/telem-volts.conf )
+
+INSTALLDIR="${D}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}-makefile.patch"
+	eapply "${FILESDIR}/direwolf-gpsd-API-9.patch"
+
+	eapply_user
+
+	if use gps ; then
+		sed -i -e 's/#enable_gpsd/enable_gpsd/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use hamlib; then
+		sed -i -e 's/#enable_hamlib/enable_hamlib/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use udev ; then
+		sed -i -e 's/#enable_cm108/enable_cm108/' Makefile.linux || die "Sed failed!"
+	fi
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	keepdir /var/log/direwolf
+	emake DESTDIR="${D}" install
+	insinto /etc/direwolf/
+	doins direwolf.conf
+	einstalldocs
+	systemd_dounit "${FILESDIR}"/direwolf.service
+	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index bff58d275c9c..f04512225f10 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -5,4 +5,4 @@ DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4e
 EBUILD flrig-1.3.51.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
 EBUILD flrig-1.3.53.ebuild 496 BLAKE2B dc5ffe3cbfe399585de2aaeae75343ca3143742cda83b798d4f690a24fd52fc4fee4d0fe4bafccc98669de7aaa1a7dfbd01132e9dcb7caaf7edb422a8e2d1a70 SHA512 0bb2ddb590127ff929650400cfbf43ea2dcd299acece85fb3cf93bd78e6ecc786a2e05c00ef65886c87ed6ac44f481b55bd624c2553dc5c24ddb0442d99fd5a7
 EBUILD flrig-1.3.54.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
-MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
+MISC metadata.xml 325 BLAKE2B 5a0f279d13c08ae0f8f26ccab563978f7aaf5b4919bdd1b4eb0e5ef102f40d86ac46802d43f7303e97106ad6fb3f52256b03222623bea4b1ce1f7c5350dcceb1 SHA512 90a892833f50bb0d2c4cf95887f83f0fa2c1afd4f33c498e72e157ab9713677127511b44e13d9c4146b6aedd0876acde69cc89c6b5a80a0a847a00683945ffca
diff --git a/media-radio/flrig/metadata.xml b/media-radio/flrig/metadata.xml
index f928b39d9611..3abc8c4279ae 100644
--- a/media-radio/flrig/metadata.xml
+++ b/media-radio/flrig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-radio/metadata.xml b/media-radio/metadata.xml
index bfa71f070f00..613bf85c63ff 100644
--- a/media-radio/metadata.xml
+++ b/media-radio/metadata.xml
@@ -30,4 +30,3 @@
 		radiem.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 2475657eebf8..e32b56681091 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -8,4 +8,4 @@ DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f9
 DIST svxlink-17.12.2.tar.gz 1622039 BLAKE2B f67e74605d371f37bddc06f2092d7c9c355a549df2dcfcda3e48e3238dd38d57e195f2fe7edf390e3d48324ef8ab4accf18975ead9216259e484d96597275937 SHA512 cace3894da3b94ae8bd41c47c76c9c6203cb7eaaca6d2c847509b733ed4a6a1dc9ca8c4c16c060dfb0d9ee2982f2a0a2746aa06a5507640d5ed9c9b4fdf90f7e
 EBUILD svxlink-17.12.1.ebuild 1672 BLAKE2B a78139f14e1a4d8d8351a7367230df9f5522d3c92124f5c21e4e3f19b181c42ce28d0f52f99398e7ba4a851d7068faa1c54627cb7f4987e258b4329b0b614950 SHA512 bdd8c8ce8841d96fc1ed63287d0f9bf0e8c07b0918449a231bb87debbe1820c890fc64864c41fb0cf07b15393e5cb5034b0e655f4200fb93144f08f4237ee1a3
 EBUILD svxlink-17.12.2.ebuild 1795 BLAKE2B b46352f97710784cf73ecd7e4abbfc0f6087b503bd7c23d5cd295a83579b155048b7e15d62e8632b8dc09d9f81ba3897a38c035cf85082b7b23103c72400dd1c SHA512 4bca680ce3c89d77f0491f31f43f2436fe40e17e433735b71493c70ff299671eec036393f90c0f45ceb0979906d3e5c92598cdc7405dfa777af631a2596d6f67
-MISC metadata.xml 696 BLAKE2B 51be8858bc950793e0044d7d8dfa695f3f4c1fa0f373be8908d00c0fdc73ee0fbbe06b118a28da147978ad204d63f2eb02183c961123d71c078fcaa9cc8306f0 SHA512 8e514fc2f15af5d7520a371ab802aa2a024276514d184f31b00b96c09b06e7b7c69904a0ea256f17fbe9e97f8da4cd908a91072284b274ba6488982e92182bc5
+MISC metadata.xml 696 BLAKE2B 6bf4c1b0c6be3993885cf24eff479637cb6b99a6bc7b5c671637d12115c125fc63be37753bcaa4abe029504da13f5ed023a7de238ce1b386b4be3baf6944c72f SHA512 fcf27a9ed0fe5b05a6053a8ef965eb9e5a43c9c2510d59fdf14aa0144291ddff290e5a55c08403deffc31d1b5b43db1fb8d2fc92b4784c119341f7778052d4d2
diff --git a/media-radio/svxlink/metadata.xml b/media-radio/svxlink/metadata.xml
index 8b69810841ee..3b8f3022aaf5 100644
--- a/media-radio/svxlink/metadata.xml
+++ b/media-radio/svxlink/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8e58ece43cfc..0f538f1f2a3a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 56d350cfd3d7..a595c86ce8d8 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,11 +1,5 @@
-AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6
-AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
-AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
 AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
-DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
-EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
-EBUILD aqualung-1.1-r1.ebuild 2418 BLAKE2B ed3f80c963cfb65720f43a0d0f895b6323f3be1a06050bea5b20231c8431fb3c91124f14bdf9295744a7cc605d1f899a52826d4337404364145207af5b2c7d98 SHA512 fba638ffd7590bf25d0072678abbbe33d6c4121f0bd955ef830ad964089b956cb3672cee2e06e04c67bdf6997d67c1c1f815814f455da70ef18d5974d73100bb
 EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
-MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
+MISC metadata.xml 918 BLAKE2B b095813ec060712043d858b8e1ab6e4b5bcfa9ec2dd8e3b2003310774c4d1bf51d9a97c5335d1403d079e044006c4dd4a70e72258cf21f412bcc54facf57f003 SHA512 734b389036bed628f85a69b992efc5f144121c2edc9cc3f08bf7f00b8cbc73bcdcebc5893f8ceb9188de86a605ad6d4013451f45ba3478baaa5d16dc50643531
diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild
deleted file mode 100644
index 442799d70ce8..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-gcc10.patch"
-	"${FILESDIR}/${P}-ar.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
deleted file mode 100644
index 0e4f24b9cf57..000000000000
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ifp.patch"
-	"${FILESDIR}/${P}-var-collision.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch
deleted file mode 100644
index 3df4d75eaf1b..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac
---- aqualung-1.0_orig/configure.ac	2020-08-05 20:00:50.758797358 +0200
-+++ aqualung-1.0/configure.ac	2020-08-05 20:01:33.198796503 +0200
-@@ -25,11 +25,12 @@
- 
- 
- # Checks for programs.
-+AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_PROG_CXX
- AM_PROG_CC_C_O
--AC_USE_SYSTEM_EXTENSIONS
-+AM_PROG_AR
- m4_ifndef([AM_GNU_GETTEXT],
-     [m4_fatal([GNU gettext is required to prepare the Aqualung build])])
- AM_GNU_GETTEXT([external])
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
deleted file mode 100644
index 111ee70c8774..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman <jamie@audible.transient.net>
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
----
- src/decoder/dec_lavc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
-index e2c81c6..5268a64 100644
---- a/src/decoder/dec_lavc.c
-+++ b/src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
- 		return DECODER_OPEN_BADLIB;
- 
- 	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- 	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- 	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
- 
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
deleted file mode 100644
index 620bcb873d95..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:02:32 +0100
-Subject: [PATCH 1/2] Remove unused variable.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), but it's not used anyway.
----
- src/playlist.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/playlist.c b/src/playlist.c
-index 35483d1..96fac75 100644
---- a/src/playlist.c
-+++ b/src/playlist.c
-@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
- GtkWidget * plist__export;
- #endif /* HAVE_TRANSCODING */
- 
--gchar command[RB_CONTROL_SIZE];
--
- GtkTreeIter * fileinfo_iter = NULL;
- 
- int playlist_dirty;
-
-From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:06:41 +0100
-Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), because there's also a global timeout_tag in main.c.
-
-Also correct the type to guint rather than gint.
----
- src/ports.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ports.c b/src/ports.c
-index f17a5ab..f4de59d 100644
---- a/src/ports.c
-+++ b/src/ports.c
-@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
- int n_clients;
- GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
- 
--gint timeout_tag;
-+guint ports_timeout_tag;
- 
- int out_selector = 0;
- 
-@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-         }
- }
- 
-@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-         }
- }
- 
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 66cfd45a7245..9977e46bd398 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index 1e52e42bd56f..7a9cb859d4a4 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,3 +1,3 @@
 DIST ario-1.6.tar.gz 1151747 BLAKE2B 2a9a5d9c9e528f92a198270a4715a225d254a8fd6800004928ef39c4ed792bda2a82eefaa45824d5422598f9fe242b6b621768780655b009043cc3447d8d5643 SHA512 93057da62616e79f6ba6f7204fabac37417fb34c350b53eeea61508f4c65322fabaef7a9fdbe7beb8dcbf92c8f86f0d33caf1ffa0ad76de8050fe72d57408ec0
 EBUILD ario-1.6.ebuild 1203 BLAKE2B 0f77060a6fe417ac70cfe7ae51e3fbf8d997f2910740880bdb43661ae25a75ac1795c3c21d19cdff8f556fe3394b80642d8626d1ea2c180156d44802e18b6fcb SHA512 7b7e5f39b7b811d27e5c819ab1ffe7f3ced6ced7cd98a48bf363fd97cead49032fc7e6b56c9f96783f2db25ffee4f64589a9b8d9e829533bb7daae2257bdfa46
-MISC metadata.xml 596 BLAKE2B 2de1c54642e0228e54445c0036d60f652fe1b4f8fb8e3917761819ae2918714646ecae8b9c33f94fdf99feee342d5959eb2ccde95c07c29cb20894efbe8f540b SHA512 aa1a8084967904d6cc2a2b46a87ab39281d562814e28f1dfa2720ed0b6ad185b6b382c41554414415cb08644f0c5393d76bf48f39265cb9935dc28d878c05666
+MISC metadata.xml 626 BLAKE2B 6b07467f1b7c47fc9213e344459e7fd274c52e8ca0d2d70a080122e3807224d81028389e05f5f30b513819d947eaec4f7ebd080e8e849e1ed7256ef02226a8e9 SHA512 f8533db2984ffc4f27ac25e72afd93f288f0ef51590484d186dd705088711193c76af67205ab855793413e16e43e2509465c75092773d73b772f6346a25acffc
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 948969c65670..cc4087ec341d 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mail@evilscientress.at</email>
 		<name>Jenny Danzmayr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/aucatctl/Manifest b/media-sound/aucatctl/Manifest
index 43b8a1ea9f15..9b2d95c04f85 100644
--- a/media-sound/aucatctl/Manifest
+++ b/media-sound/aucatctl/Manifest
@@ -1,3 +1,3 @@
 DIST aucatctl-0.1.tar.gz 4364 BLAKE2B b0ac47bdf03de82599d4ca1403d8937b70e9f10b18d3d37bc0ab022eebc31d7643943b7c4c8fef058cc9b09fcc95b24fb6373503a6ddced33a3f8c2253c30b95 SHA512 35ca3a3aec94fb0ed439925ac52d190ad0eebd4cfb124d5ad329d1d94c021c38b75bd4d4859c74756c861c0a82c5d22777ed0dccc950bc37c3156d6ca28a33df
 EBUILD aucatctl-0.1.ebuild 646 BLAKE2B ce255d1ed50e9b948b378b8edd62d95ec608cd0c65e6081fd06f752ad48c0f0e96f7be8adaac396f993b8a5625ba642b91207438ce7bd0da27eb89c460957f18 SHA512 d3aaf613c8f63a12a173f8d09c2f6e9aa2c6b9cdae8e325b73b7d68100aa5e06997771d1a425b245d23eef06367a29939a84fc5fd6f9e2fc9e4083ac48c91b39
-MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
+MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/media-sound/aucatctl/metadata.xml b/media-sound/aucatctl/metadata.xml
index 9df017effeb6..fc3c6c671309 100644
--- a/media-sound/aucatctl/metadata.xml
+++ b/media-sound/aucatctl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e71e5f59a0ed..dc43bb0482b6 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -7,4 +7,4 @@ AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39c
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 EBUILD audacity-2.4.2-r1.ebuild 3951 BLAKE2B 0c4a89c17417e84e9934f62b360afad1ab812122109650a7769f96e09bec2b3ce94e8833787522b78ce61d09bbf6e096087e29301a5b20d236b489f62812e459 SHA512 4b7c7a277d22c42b949605c263ee099eed93b1f68e036c887985d3e3516c1355dec6f3940ba92dc8eafa1b4a95f3e16f4c10ab81f9d7de119c76d914d1740d9d
-MISC metadata.xml 1188 BLAKE2B eaa473c8b3c3f733056574cc6622e1c57af8241c86434c1a204dcfc8e9149da4f6f82bc610f2541add62d2a6e7dfa786082f2b9537319d45ca45ca3cf65dd039 SHA512 8c25d530d234466b7476a2355a6003702fa43e7d5fae712172e935a617d03fe571e3d57d6d6fc249ccfd6002ade8b13d3831751414b43cb037c9e6dbc739109a
+MISC metadata.xml 1202 BLAKE2B 2d3da00c349554901026197a6c383b16138b4295c113affdcd6d83cc370fc3d5f3c5010971dc7feda71942d998a0043e3a216e646b6a72c2eb6f61bb06ccc178 SHA512 999f3fa992af333d1b64fb558c44e43ac6978f779975bc929a3c615c43c831e5db4c83b4e39240ac1dade66a2d2afade7b8e5828b88cd75de8ddb0a2284121ad
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 2457f6d4ce87..65e44eb77f16 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -5,7 +5,7 @@
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>richard@audacityteam.org</email>
     <name>Richard Ash</name>
     <description>Upstream - please CC on bugs that concerns upstream</description>
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index 674e3304f962..f7f5f47c1cb0 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,5 +1,5 @@
 AUX sfxload.confd 165 BLAKE2B b183f16572379c928417dbc6037bce0739462def9cde600d1298677b4e55bddcf5df0407124c966519946c960847dcdeb1c44fe62e25192d361400df7fc4e959 SHA512 9725e28b10f512e6e8e3cf121f8d442b3f0148795e676760b434a02c9a4e19945915fd93d6fa012448f041d17819d32b38445a0946819e398647bfd5ce31c38e
 AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ffccfa36f73fb7e7df722e7914eb39c1a3c08b32b8da6cd1d58abfa8d3b0ba427a9748aefac7b801 SHA512 dd3522d112a0efefa1786ce37b9f9be3ee07eb50b0a618d7adb386ff007d9e9e907dcd9e184ed5122118723d702caeadc190018f0af5ad393c931eb0a549f31c
 DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
-EBUILD awesfx-0.5.1e.ebuild 874 BLAKE2B 94eec36a39990400606f6b0ae723cc9979ff20cbc34d83d249be442d6cb4399871bc27532fcebd262947d8d13c0968e6613a830c59888f05561fa955a3c31441 SHA512 d2454c980f20345313aee66e3d47e4036f1e890b4246822e19b51b6906e67b17d34d971670d0ede3792b8c304fee5115e719112b4e8d750f244b6723aa7473f8
+EBUILD awesfx-0.5.1e.ebuild 877 BLAKE2B 5df7bd23e316d5804fe6d3379ba57c152caed96399e726d004170b047ee31aacad5b7c2a92a8b344b5ff816d3faaa3980d066b53eb5165e696b7dfceaad885e2 SHA512 66b5a68571bca8dc4647684d5c07eea0d46ed298f2a796822b5d7eb6dd50e49a14ce0d382b3085cc74a3dc0c6c6ebd7ba01f77481cb3e8ad8e796c81abc588bb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.1e.ebuild
index 47f55331e13c..abcec8dad33e 100644
--- a/media-sound/awesfx/awesfx-0.5.1e.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="AWE32 Sound Driver Utility Programs"
-HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://ftp.suse.com/pub/people/tiwai/awesfx"
+SRC_URI="https://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 56d4ff422182..2a1cb8d5f583 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -4,4 +4,4 @@ AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db5
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
 EBUILD beets-1.4.9-r5.ebuild 4478 BLAKE2B f0342eed66d624e5c03585bbeabf1223343b5fc58c8623b9b61e084018224582d4fb47a813cc7a2e4643a018ad66ef36d02e99b27e8a321fc545e89d4cc86f87 SHA512 c44c784bb9dda1d1072fd1061e4eee51f7c6caeb8dcdeb1d5fdf071991d27a4b189e9a8075b3ea6b002a0219f17d4bfc5164dd2f735ad9011e92271000b04440
 EBUILD beets-9999.ebuild 4478 BLAKE2B f0342eed66d624e5c03585bbeabf1223343b5fc58c8623b9b61e084018224582d4fb47a813cc7a2e4643a018ad66ef36d02e99b27e8a321fc545e89d4cc86f87 SHA512 c44c784bb9dda1d1072fd1061e4eee51f7c6caeb8dcdeb1d5fdf071991d27a4b189e9a8075b3ea6b002a0219f17d4bfc5164dd2f735ad9011e92271000b04440
-MISC metadata.xml 1751 BLAKE2B 6bb63691dda759b84a5b5f7b407befa4a0773885c6cd7a70e39e68249fb807192673b4b91555b270d51d6783b5d55d0ca9d4d32058c1c9b7fdf51925d9a0df7e SHA512 435bfe841f81de86083a72319a45fd2d8daa5206c1f8442a3b4b30d5c0f5692a23a7d6d7003d5cc7441f204bc05be4bdfa9097ecb5dcec0be17ba5c72ee1b763
+MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 713634ce64ae..046463bc3bff 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>guillaumeseren@gmail.com</email>
     <name>Guillaume Seren</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 7cab1667a53e..d85cb27f0f04 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -2,6 +2,8 @@ AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e
 AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
+DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
 EBUILD cmus-2.8.0.ebuild 3784 BLAKE2B edbbfe140b7c6adce8ae96a5e6d53db118ca7492f37388201fff09cfe0fd0acd56ec6e8adc90b3455a722c731dd0e7b301a4f975be60168928fbd427fb7f0620 SHA512 2357fdfe2a83b2f70bbfcb1debdd3ded1de6e4d0bafd28f414e241a54ff9dda3661c2c775c11bf76b05b129cb2b3d3cc72a6d17e1777dffcd22b6a47c59a5202
+EBUILD cmus-2.9.1.ebuild 3665 BLAKE2B 7d943436e815db5cfc4f8aefd1183220f92f002f294392e6b6edaa58398bc9e6742435fac718f15cb6fe3a5b2d42fe9f2af2cbf0b8b3debe6aa2d36811e6d199 SHA512 82d8caabb8c593351c3c86018a5ddfd236f3d402d024c77b9554372d695426ab1bafda00e4768237806b60c9455fbca14e6fc76c84470c823f2bafe23486705f
 EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade
 MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.9.1.ebuild b/media-sound/cmus/cmus-2.9.1.ebuild
new file mode 100644
index 000000000000..cdf68feabd80
--- /dev/null
+++ b/media-sound/cmus/cmus-2.9.1.ebuild
@@ -0,0 +1,145 @@
+# 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/_/-}"
+
+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/darkice/Manifest b/media-sound/darkice/Manifest
index 58256f1cacec..9a44d85315f4 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,4 +1,4 @@
 AUX darkice-1.3-include.patch 636 BLAKE2B 3598cf32c662453b1d4d7607b5c032e637a951fcd67943515f28bcccafb6e1110f64916563de9406a96d439990ee683a4151805ceafe08d8a44b52d49c30ae51 SHA512 14b461fe4282f9389d8a97d4b4942c0b7866860aabd91589bd6294a34796b6a0e74658ed8a0e43273fdc72bf776c14b6cf8889a1f31975ab6609f34021fdb434
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
 EBUILD darkice-1.4.ebuild 1325 BLAKE2B 42128b9b5a5587593f9234ea484b692c02b15f4e94c3405dcc5ec70564dfb9ef65f34c0d33f69ae4b38f2d2488dc5d0d2c62bf042f7f0cf4c269b40f502d0b1d SHA512 9179a504719e084cc5c60a66da6e7aaa649f5eab006cb2fcebe4b26a826cea0b0be92fcc73dbe39b10b3c31e8790812b66ef603f1f5eedc98926a052ef078ba7
-MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
+MISC metadata.xml 524 BLAKE2B 5e4e0267ec28209454127341db06aa8674c70459f598f9b94303bdc3430c16132cd3114ad6c8da58b62e09ad7b783d54aea181f9f66a4221b80e906b66c785ed SHA512 e32cf454853266966d8ebc6a21451598c40cff3d79b2e2d28e1579acadf277f2efe81375c31ddba1a6d4827c5e1263c23d229c3489d70cd613e46a78f63942b6
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index ca82233e961f..99a3a083944a 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest
index b126ac4033d0..fe9e5c0e7769 100644
--- a/media-sound/darksnow/Manifest
+++ b/media-sound/darksnow/Manifest
@@ -1,5 +1,5 @@
 AUX darksnow-0.7.1-Makefile.patch 2081 BLAKE2B 5564965d0458cd330295b34b202dc532acbf3fc50eabdca285bda04ec1facdb4710e295e7b853dfbba89cde110c740cf9f37fd85f8d50f2c50115f0b6a604e08 SHA512 6d9d9ae3922278e9aaa11452550302f31f6060ca9141266f4253784556deba9eeb1880401579b5c220051221458e0b359b208994fde57f7ba4a62404f0ce20b1
 AUX darksnow-0.7.1-fno-common.patch 9078 BLAKE2B 14dc4dccbaf81ea341b812f3787afab4f5fee2c204e77b0657740dd75dbc2ece780549b45d74ccd05b89d24524f229160362a97c6e6c0f3e7b49e2f2a5b038d8 SHA512 712bdc6397e922af0cce14279af67fcfe1b9ed2d2524f4b0ba6892df502c8d887ef50e91f1f09b79dfb124cc470ec96ed3788e420ea4c39f66b044da906094be
 DIST darksnow-0.7.1.tar.gz 78928 BLAKE2B cae99522f8ae32bbd2c05c73b70896e71b5805fd6bb4054be0e498af1a502e7039a46223aa03bd781cab082e63f4705d2fae688c6f8a698dbfc8fced056e2684 SHA512 0ea1ff9f085127185d47169df358d2940fa9e52c52408bbaaefdf517402ddcb37b2df8b8c65bb22c3493820b47a3b4a2571cc819e81c70718684e8c3c3fe77ae
-EBUILD darksnow-0.7.1.ebuild 767 BLAKE2B e7c9be347f216a3c0f416860e57deb05dd4099db2315574daa10824414e658f36a79698b3fda76d815a7bb226f5322fe0c9a4c774b25c62c67536fe7a76514c5 SHA512 a92ea936952b287eed75aa24c050c0886102817efa000b50b0604e587b81a2530ed47776dbb4b1e6f754d1e8f1204953b42a7f1c7659fefb4e513c94ab3bc0a5
+EBUILD darksnow-0.7.1.ebuild 770 BLAKE2B 865c7550ba2261ec4e8d34971ca3aaf5c25d7a1029276d635c2cd2d97dff9f7cf2521496b0ae038a2399d434dd2e66215e6bd564e86a259ccf503952466f17d9 SHA512 1323832c61a281ba35c83c95dc8a54eb55a5f8f491a5e1a4df678dce0a169e4fa342ba81045e0126fa08afb2d961edd1570d6cdf641005a18efef854360ea65c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/darksnow/darksnow-0.7.1.ebuild b/media-sound/darksnow/darksnow-0.7.1.ebuild
index 1a877cebfda6..c3fb853f1770 100644
--- a/media-sound/darksnow/darksnow-0.7.1.ebuild
+++ b/media-sound/darksnow/darksnow-0.7.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
@@ -6,10 +6,10 @@ EAPI=7
 inherit autotools desktop xdg
 
 DESCRIPTION="Streaming GTK+ Front-End based on Darkice Ice Streamer"
-HOMEPAGE="http://darksnow.radiolivre.org"
-SRC_URI="http://darksnow.radiolivre.org/pacotes/${P}.tar.gz"
+HOMEPAGE="https://darksnow.radiolivre.org"
+SRC_URI="https://darksnow.radiolivre.org/pacotes/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 071c2778b091..bc679a76a089 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -3,4 +3,4 @@ DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd
 DIST deadbeef-1.8.7.tar.bz2 5029039 BLAKE2B f6ae0d664553435fca566593d715f8f9fab13711bb0e0488c80b9c7ff88a28425d1e3de2ee4c57b87722705c5ede53e0390b81cdbe6ce804d781dfe934dc21e9 SHA512 49a9610f8aa8d9853cd4f9a38d103f9a902993a5ae1990937a3ac5a14a4f8533f4233002893875aedf45f737d1a95c7cea189c61d6387bd8be7f3535d60c96eb
 EBUILD deadbeef-1.8.4.ebuild 3646 BLAKE2B c2c4363e5e6f3e319bb6c69a7d94abdedf4a18edad70a7a0c537184715193f81670ad9e82df87429a7b7a90061f7b639f90447a182da1a231cd6029de57e6c46 SHA512 2abd44b486596e15ca79fcd7b6f7c9fbe1b6f037d5fdfa49afe0e6af771c7d26e36d3d2190b6bf63d6101fc38e21d787a76e9832c3df7d704a051a47cef31662
 EBUILD deadbeef-1.8.7-r1.ebuild 3986 BLAKE2B a11b7425de25d40fd4245d16fb1ad2c98586736c62dad67141b242619724582b63c94b3da03a22acab7f228255abd47b686879007747cb4a9467343d23cb2f73 SHA512 df1b8647ad68e47ece5176ba0238190e0cab779b07709664068244f504a1aab68d49a8267e6d296e217bc1418a9aebed7b6b084b07a18734294c2f922eaec6ad
-MISC metadata.xml 832 BLAKE2B e062743afe851439a7ac29e3547e0296a7a00b6ed93d875f8725de185e5ce6b677432fd039257887b47b294d692de2f0ccb6cf9112a2c843d443ecb528b82cd6 SHA512 96aaed52c8959177be8a6d7ad30266cb8a73475119c27ec734dbab0126d19a139a3d513323d0020c42dae822cb12344959f4b9440c01f8ddd578b8dbd1241aca
+MISC metadata.xml 832 BLAKE2B c3eaa58304b47d9b0f5b5c4fa4acae25059168b8fe701c6d6026b29308c83701c48fe94af352143cb0c6f395345bb603aeb0e4caa1dfda0569b15596c983f2e9 SHA512 233a07eb726d61324a0794d4a2dbff75c99b33a9b57e10fc6ebc46fa0e029ebf7191d2241b2f45cdb8fc95fdb0d8046e1420a98c7263b57561e5055472b032cd
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
index a0345ca21308..8872cd6c2e22 100644
--- a/media-sound/deadbeef/metadata.xml
+++ b/media-sound/deadbeef/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,13 +9,13 @@
 		<remote-id type="github">DeaDBeeF-Player/deadbeef</remote-id>
 	</upstream>
 	<use>
-		<flag name='converter'>File format converter</flag>
-		<flag name='cover'>Support for cover art</flag>
-		<flag name='hotkeys'>Keyboard shortcuts support</flag>
-		<flag name='lastfm'>last.fm/AudioScrobbler protocol support</flag>
-		<flag name='notify'>Desktop notifications support</flag>
-		<flag name='nullout'>Dummy output driver</flag>
-		<flag name='shellexec'>Define custom shell commands that can be called on tracks</flag>
-		<flag name='supereq'>Enable equalizer</flag>
+		<flag name="converter">File format converter</flag>
+		<flag name="cover">Support for cover art</flag>
+		<flag name="hotkeys">Keyboard shortcuts support</flag>
+		<flag name="lastfm">last.fm/AudioScrobbler protocol support</flag>
+		<flag name="notify">Desktop notifications support</flag>
+		<flag name="nullout">Dummy output driver</flag>
+		<flag name="shellexec">Define custom shell commands that can be called on tracks</flag>
+		<flag name="supereq">Enable equalizer</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 2c73fc25cccf..7d5fb4509627 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -2,4 +2,4 @@ AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d2
 AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 EBUILD denemo-2.3.0-r1.ebuild 2979 BLAKE2B ef184232adff0cc1119acc79244b8637a8ccc39953bb93018078595a286618e88f787c9e2ca69da31c81af9c310a602d12843b44cc04486e0a9c905106f64d99 SHA512 7ed1ef229552d8d279bee4207563446ab6915f7033565c6149ed92e9097ec81d89afcf0db6dfb77fc7372bd7eb9517126d8b0ed97c8e61ac82eae3d4352ae6f2
-MISC metadata.xml 1274 BLAKE2B 8a6295efa303234ef42f968bcd6dac26806930d268e8be965bf9a11d65a4e36a8a3e8c94df2e6cfe1166035ddc6b4d0e014addb05ac188c58500cc9c74cc4f68 SHA512 88c7d18f20310dc32b7b4c0ecb20ffa745263ab6b2cb41adcae79d7b90629394961414b197240bb80afe14e2d64ea373bcdc193dd79e8edf750dfd9356556b5a
+MISC metadata.xml 1304 BLAKE2B c2d8fec0a0692500d9ca52e8380a3e0c81a3ee31505c06d648521a78d1bcdc2066d251f972c0e12c893439d0d3b093766c1954f2cc7c127edaf4dcfade79408b SHA512 67fecffa9ac7a3078447c7dd32a8caae6eb531e9c9c6b29d42802d72c2f2e5ca3de3bfd0d5a23eac3aff720b366377c1cff355da02672ddca448842b5aff8fe0
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index 8c5aa41f5cf3..1a5992d485fb 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index ecfebac70f82..8325c14e987c 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,7 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
+DIST din-50.tar.gz 3684789 BLAKE2B 31efae8f031e41b04d0e1cb9dea011572b9516ed9962687d863b5cd2f77ec409a9dc6b449a299869a89abc554e673aa05bae1350a06cc850b898b878c02e8daa SHA512 58796353df9180dc6b12bfe71579fb3dd2d7ab029dc5f8d09b4f8a3cb6938db054702dc4c7344b8d8852926e052f9bdf304b9a71e3d8faa9c6a209ef0b94ff4d
 EBUILD din-49.1.ebuild 1080 BLAKE2B 36e9fa12d77c754afe7bc74ba7ded2e2b30b6cda8dc2181b2348268499be0b015d3508420248918f80ddfbf4f6075eb54b39d574aff5f3c897073bafa27a5a2e SHA512 67bf71cc6c1ba1529173e992d79889627473163f74649fe694171fe3fd064d14aea4d17c78272e8409692299f4cc8f138dde535ca537f5b42e41d38a3cd8a369
+EBUILD din-50.ebuild 1088 BLAKE2B 65769a94489db13d04bef01362d880a26001cef3d710984bba9296ae87864e7c513fe1d5cde9d9e688b339f9f67911c411f0dd308199058051b8ef7c3c98728b SHA512 628f076dac522c08477b053f4a9b9df62b9593e4ae8cd0b25425ff1854d56a2cab20dc2c17d91366f519e8747a25a4968218689239eb3b198460c7bcaaff34d2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-50.ebuild b/media-sound/din/din-50.ebuild
new file mode 100644
index 000000000000..4bb7444159e3
--- /dev/null
+++ b/media-sound/din/din-50.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-49.1-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 78eeec141987..f288924e75cc 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -2,4 +2,4 @@ AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c
 AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f
 DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
 EBUILD flacon-5.5.1.ebuild 2054 BLAKE2B ef3d11a1597614da229233d9d4e4a1392d30c2256595da59ae3aeaff3b778dda71647b82bf959fec2ae254936fcb469387756be4089efec98c59a98cdc14a0ed SHA512 600151bd572a377631447c31d3b765b9ad12ff1c5b3d8951c232f2563a24183f2b3b45e3213d004bb7a763e36dc69136bc99655f595f6f818c7dde2a7cd80087
-MISC metadata.xml 245 BLAKE2B d65195b37ab70bec146facd788d5a6239a7795c578130cb5703bf89e7a92da8acf8f4840e7f867d61359b57f0b002396a9e959cb9d2bbee2654003bc8ee061ff SHA512 be2b5dde02a39ab7345c9918796ce93c2356899fed6beb96b43f93b81eeb96a74020d2e606a5a33f95dfafa1bdef23620ab3214c2744c5e418beb7e8df1e9ae1
+MISC metadata.xml 245 BLAKE2B 0d00b7e6c2866c40032e69e85f13d048eae85c3f76432a991964d9a29767afa3d57272ac0b99c1ba51d9ae1aeba9472866e1b2a8f5995c7bac30137b8b3195d1 SHA512 ed40120cdd2c935c574c273f3a6a3940d7c4dd9d8ee73e8e6d7d22cb04cdaecdbddf75e88cbb7e93057364d2307459fec0821309806240f6d0531264b6439bf4
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index ef795ca97504..930f435d3609 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 96d7ae8c5563..e29eb3035946 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,7 @@
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a1e7b4a27c78adec51c6d82f7c53cba9178c87013f1a9c0ef62d26b1ba876fad567e4c8bb41b8d478632699876e41d SHA512 22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190
 DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
-EBUILD fluidsynth-2.1.0.ebuild 3305 BLAKE2B 1f9639e9454da96e7c09ca17d3b456293b5c405d47231851b1c1f549e24edcafc8ae4c98f1e60bb1e6962a98e46305241f7a9a3df6119b19d47e9f4b03468539 SHA512 6e897cbb09f4e42f67ebe34eec8059fccbde7d58b2cd442c5042903ec1b2d6ea38f5d5a38c98ac867a8d742630753fddc9707cbd5156a094ce938996aae6cb4e
-EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
-EBUILD fluidsynth-2.1.5.ebuild 3305 BLAKE2B 91b46677a39a776ac412e9494f0338d1ca74bd11c222492e52c01302c5713e3ccc51fa50f1b1bee457a0417a9c44af759a059c10334a2fddc4f759be845077f7 SHA512 1b06b9539b20fac1687e9751068cb9888b9625b3acf3b0ccb8c3ad9a5422394050c3c23653380506af4a5d2ccfe34f734e4dbd40a757fcadde8affb8a7959d12
+EBUILD fluidsynth-2.1.0.ebuild 3305 BLAKE2B 7a8a2c5109ba689ec1357618732255ebf80154e2e615cfdba59b3c9f4575f4877ae4b9d5c93ca66fb22fd1648f45f5897ef782c89ec695da6dc53113257ed75c SHA512 966ea80eaadb1cabe36066a5202ffc499f0015a8968035865fe8e3418ba2210ef858a9ff6a35f5be5d25be24761457ad49e6fee730577e818d00437a95015f0c
+EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B f123f57cc9ebe5296841bcc0cb68610ecc67a8e48146a638b2afcc78ef8365adb9f133483f55fd1ae26819ccd84c9914af94e1ebc3867bfc595ac62a6205b7b2 SHA512 babbc1609f66e34b8eff8d206f4b7bbdc0b037e60de748262b050031eb3da59e86e3b9ed3704a3746a06e5db4ad0e0142eb00acbdca16375d486b97321bc7945
+EBUILD fluidsynth-2.1.5.ebuild 3305 BLAKE2B 7a8a2c5109ba689ec1357618732255ebf80154e2e615cfdba59b3c9f4575f4877ae4b9d5c93ca66fb22fd1648f45f5897ef782c89ec695da6dc53113257ed75c SHA512 966ea80eaadb1cabe36066a5202ffc499f0015a8968035865fe8e3418ba2210ef858a9ff6a35f5be5d25be24761457ad49e6fee730577e818d00437a95015f0c
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index ad79a07d4339..8da1679f5162 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.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
@@ -7,7 +7,7 @@ CMAKE_ECLASS=cmake
 inherit cmake-multilib systemd
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
+HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
index d5fdde4142d4..98db025980dc 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ CMAKE_ECLASS=cmake
 inherit cmake-multilib systemd
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
+HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
index 1e6ba4d38771..8da1679f5162 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.5.ebuild
@@ -7,7 +7,7 @@ CMAKE_ECLASS=cmake
 inherit cmake-multilib systemd
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
+HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
index e91efa8f7f4c..1734eca907f2 100644
--- a/media-sound/fmit/Manifest
+++ b/media-sound/fmit/Manifest
@@ -1,3 +1,3 @@
 DIST fmit-1.0.15.tar.gz 295365 BLAKE2B 9424c1fac390adc7fb8746ce05b354b31bc9f4ef8dc49bd8ca2c1362d9b57c1c0d8b10e110faae9d48363dd02f80967c767ade0e67096c27bcf5ae1c9d1fa8ca SHA512 44537669391f5043efe35b53d9693f8ab6a151918583d35439c1b29feca4a707225038512c9a2de734ada9e9acb3b4b191b866038edaed9fe8d1fee09c540aac
 EBUILD fmit-1.0.15-r3.ebuild 1575 BLAKE2B 790f981a44be415d88333836fbb63aec21f3796fd94acb281511ab96d37d6d5cfb3bd70246130913a284f0d457c277e582d6e0bd1cedcb0e7c6834090b116b20 SHA512 84fbd172aff618d33fb51603214e3eb743cc30440a52157845d13d3385133f7280e672c84c7231ffe35767fa25780e9baa7b3a84c9a964d718958e5bf545ac3d
-MISC metadata.xml 251 BLAKE2B 41d57d683fe855b6ee6b161b1c9bcc193e33ed5c184df3738f693f0c078978a6d7bfde323243822cd5e0679122e6241158f0e6ecd237fe8f0e7e770c95d7fd19 SHA512 16072c41732d3c5486b4066a8f17cc829688c24772a002ea72c1deae3dcd78f4ee72bd7948782ca970fdb2e5cba66a16db205a384de036186814b2345f2f103c
+MISC metadata.xml 251 BLAKE2B ada66d7dedf51999323f35a1ec77935918b31724a9986e9f7fb845d8dccf0f3f60b50b2e18777762d9096e9b29e5d2b6a33ef6bbc5d26d65fa10f06404d788ac SHA512 df32deab0f62f37c46e14de4ac17490b555faa4b9d879a061d96e4d511eac81f106218eb659f0510ba4ec243dee031d168e4df844fffc38e5dfe98db81d02880
diff --git a/media-sound/fmit/metadata.xml b/media-sound/fmit/metadata.xml
index e375cff00290..daef7cacf2e2 100644
--- a/media-sound/fmit/metadata.xml
+++ b/media-sound/fmit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 5ec8edc49eca..8cdb0050b706 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,6 @@
 DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
+DIST gmusicbrowser-1.1.16.tar.gz 2369434 BLAKE2B 952c4a75d8018b890a787e69cdde06f1c1d588384e220950ab46d0ddcd785cd30d477c52926421b72c7cae4078342e6f5f07fa0b41fe6d0ef2a0b4ec4e15c8ce SHA512 76213a6634208c66cff33ab947450553e656d121e8aff99e47bc983f752f6095019aa67bef834681594a81f6f5fdb241bb98d374027622704d961c1d816bd12a
 EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1438 BLAKE2B 42055af696aefcdcfe264353563f87544e52c041383954d0f90b0546a5efd82b88059961dfab2d4e39eda855d3e9fc1bfda803d372ac65273c0d814527bdfec6 SHA512 a1c8bd62631f1e28c8e6511a8a63a919d15845cfb35beb5ac4da32e787b44b169e5d92df1b1b18f533b6801fb3301d48e39eda6342692b6dfb4c5930076c933a
-EBUILD gmusicbrowser-9999.ebuild 1440 BLAKE2B 8d1611f9509e0e4404a2277afb900a8e071f3c35038d1c3e930a92e39577b7d745edd1d71132ac3e990e14f6d8211b1a613de6bd6c8eaf1d8d5a5e82fa65667b SHA512 acf5251d8a414ce24afa2abaacd5e3c0dce043efc0f0b8027f21ab0762f490941a4eaa143a7f6ff67504cd8c5834e9b948fbbf28a8019d00154e211084c4eb3b
-MISC metadata.xml 348 BLAKE2B b91fd147f7a4d685c51832b198e6508db2e62e5529168b9a27b78d0bb9bc2924a3e8a0ae182117882001631b028f28803082c3069f4a9bcd2d4ecc77279b3987 SHA512 a4c9a19bbcf91e47cfb0bc72bce2d01f4dc32f8ad34f0a430f98faa5822092aee3d139a06b7d8e8986553100bcab03194ca49e602371bdf2a1dba6d090dc9912
+EBUILD gmusicbrowser-1.1.16.ebuild 1174 BLAKE2B 08c9f2a8e8c051d7140fe001f7264c2fbe5e2c54e03edb2fe2ee896f505ed43cf6a6288843ae18141d01984cf128192fa849774a319214522c696c45c13d2887 SHA512 2e53db37a8a08d3acfa1e6ebdc9596bf65b31c8da5458ed77a9b73e5f0295b39f521509ace1296f8f9e8da9517930c7a630d3d15de1638ae310a3643a886f97d
+EBUILD gmusicbrowser-9999.ebuild 1292 BLAKE2B b4afccbea10450521e079aa4b69373a454b177baaea7c7f95cacd217cec81b8a66e69487e80ea257d55c3502a4436b0837667e973761d681d20b449aca0f0219 SHA512 a37a9f3c65866cd0586fa3f6470500dbf452bf7b70f152e1f993301a639bf5c4dfdb3c44a971cbf7a2dee73686872c73f5121a037474738db9c92789bb19a383
+MISC metadata.xml 479 BLAKE2B 920ff946c66abe6386665a9d8d4546359c4bc3d77fcc8bf6cc293f5e79dfe4b5259481ebc4d54b595c6a693e06de39c7eff63acef17b47149eab7903442ec772 SHA512 62897e2c761749f2587bccf4408060a2c7a8d07eb5122849d4d5f8d20445fbfc3debf6d336a38c54b2b472847ec25a9a3cabebdc879200b0738772cf39b5d222
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
new file mode 100644
index 000000000000..ea8fe1e9691b
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+SRC_URI="https://${PN}.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	gstreamer? ( dev-perl/Glib-Object-Introspection )
+	mplayer? ( || ( media-video/mplayer media-video/mpv ) )
+	!gstreamer? ( !mplayer? (
+			media-sound/alsa-utils
+			media-sound/flac123
+			|| ( media-sound/mpg123 media-sound/mpg321 )
+			media-sound/vorbis-tools
+		)
+	)
+	extras? ( dev-perl/gnome2-wnck )
+	libnotify? ( dev-perl/Gtk2-Notify )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# silence QA warnings
+	sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index 6813cf60326b..c6fdb5a5b4f9 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -3,28 +3,20 @@
 
 EAPI=7
 
-inherit eutils gnome2-utils xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
-	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
+inherit git-r3 gnome2-utils xdg
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="https://gmusicbrowser.org/"
+EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
+BDEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
 RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
+	dev-perl/Gtk3
 	virtual/perl-MIME-Base64
 	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
 	dbus? ( dev-perl/Net-DBus )
@@ -39,13 +31,18 @@ RDEPEND="dev-lang/perl
 	)
 	extras? ( dev-perl/gnome2-wnck )
 	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
 }
 
+src_prepare() {
+	default
+	# silence QA warnings
+	sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 1663c00e8552..00b4a88c802f 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>Sergiy.Borodych@gmail.com</email>
+		<name>Sergiy Borodych</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/gst123/Manifest b/media-sound/gst123/Manifest
index 763e15ec26ce..a15952e2ab50 100644
--- a/media-sound/gst123/Manifest
+++ b/media-sound/gst123/Manifest
@@ -1,3 +1,3 @@
 DIST gst123-0.3.5.tar.bz2 125468 BLAKE2B c8e6d9956f4371fc70d43768f0cf537b1c7281b49b3426be4d7b16f6f4c80057e50068f26546a93050d9e0c08284a33264e2a61aeaddab34ec1e09188f2145e3 SHA512 a967e4ba00b9ef744aa7a80e24fb7aa452c29b0b024a3bb446570ae9254ea295563deae1a000e9d363f57ce7aa11e537b124ccc672a98bf3230d371dcfb7e4ee
-EBUILD gst123-0.3.5.ebuild 571 BLAKE2B a98be522350e4a200d4e11f1b8f4338c2aa483f252854bc2e5ef65892045771685489c3d718c1d42f58a399e8f92b2a9a6870d134df5df3c76600ac7e0fd73fd SHA512 60b697a89fda50eaa056465c37d272f2f0b0df2cf21b9b9f0ea6ac2866129ab9bebe9a7cbbc2daf02c190f83cffd15324b801181c6cfa18a6c8d006732c0493e
+EBUILD gst123-0.3.5.ebuild 578 BLAKE2B e0ef31135e3b345281d786816a7cb444ab5351e221fc1579baac75ddab26a3be274a186574725bba23664dfc78c0e228895d8752c0825c2b2ac7d1e43037d2bd SHA512 ffc90ce3a32760fd5a3afcb20c63c80e7ccbe932871089021cb7a4b5b8d1182aed11d2233cabe95db37df4dbe6d9abec3a1a7a5a468f759c8c5d263d973ea83b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gst123/gst123-0.3.5.ebuild b/media-sound/gst123/gst123-0.3.5.ebuild
index d62b71ae8d3d..89f6a151b333 100644
--- a/media-sound/gst123/gst123-0.3.5.ebuild
+++ b/media-sound/gst123/gst123-0.3.5.ebuild
@@ -1,13 +1,13 @@
-# 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="A GStreamer based command line media player"
-HOMEPAGE="http://space.twc.de/~stefan/gst123.php"
-SRC_URI="http://space.twc.de/~stefan/gst123/${P}.tar.bz2"
+DESCRIPTION="GStreamer based command line media player"
+HOMEPAGE="https://space.twc.de/~stefan/gst123.php"
+SRC_URI="https://space.twc.de/~stefan/gst123/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -21,5 +21,5 @@ CDEPEND="
 "
 RDEPEND="${CDEPEND}
 	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+DEPEND="${CDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 655a5c368ded..bcc9a234dfcf 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,4 +1,4 @@
 AUX gtick-0.5.5-desktop.patch 776 BLAKE2B 945b1eaff7d480e092d93b1cce83653aaa474e36172df20233f5e09cfc07ede22260cff87664ae767a39ab05e7c83b7bc401b8cf5a85539fdcd9338a78556ce4 SHA512 d61fc78e86e4bfd47e23987236108ca36bd19df90363c2bd625f4668e9a325ce082c423d90fdf0600900d391e6da21d719c620203c5052b54d9eb5f20c9d948b
 DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87
 EBUILD gtick-0.5.5.ebuild 1059 BLAKE2B bb414004dc67ae6fb55f93ff74ee7ddaebaa664fd41b728ae6c581195bd2691447199d8f628ec78e57af7d1ebdda667fdc554720b9ad1d2b19dc09a65f3b4a7c SHA512 0bffaf48f5fb97b45eaeffb06a62edff89a6cc5af8db6b3c444daff34cbc2a040c8d3786915927685c601cc5661b951b743cce89ef81843e22ba8228091e99fc
-MISC metadata.xml 478 BLAKE2B 5dda5dcbc5d1ca329e38762dc8d6d95a0f2710f97cce2fb4937ac01955c64031a1957900ff2cea5a61a0646436f900b735b3126df7acf9bcf7be48611e7fc0c0 SHA512 7e474d535527343cd3c97b3da68da7f8e98ce5db90e9f868004bfa5d0eb30d99432e56a3d789045e54f66d2932c47a56418896fc9be2771fa9b305be2be4b004
+MISC metadata.xml 508 BLAKE2B de362cc39e39070e73e81049a8522f2d45907dd9200e17caca942cf1872a48a81b3b859ec99eeab206775c97e35087f2291e61c309c1ef52277d18764df611ef SHA512 0dd8c2f5646adeadad17938696ab83d30556998635a7b40ba1b8fe98edab5d29a4c18faa2638521ba7ec4d252b5a2e9e5b113689a198548548344ef65cba94a1
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
index 1dd556888a36..e36427e19fa5 100644
--- a/media-sound/gtick/metadata.xml
+++ b/media-sound/gtick/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 8faf8ff246f7..d7ae0cfaa95e 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -4,4 +4,4 @@ AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11ca
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
 EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
 EBUILD guayadeque-9999.ebuild 2269 BLAKE2B 91638edf51c355d60f39c3548efe82cdba79e1a0dbc8d98d09f2e341a8069982adcc761fc6b60f44dbba00884de831c85b971efaae12f9835cd832810187f053 SHA512 2c4ae18463836d9671797971f671f32895d28bbcd95f8e6b88d4a2932ab6435a6a0c1bd4992d9b702343b1285421414b00a5c58981598031c6e384321f88ef58
-MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
+MISC metadata.xml 410 BLAKE2B 92ce0fce05356c9b3d8df583b3cf2e0e9c6f69c71704805b2dc4a5cd968bc531a4e60204dcf613a04a0069a470970d4c373c6200127f1dd7a27e1fbb8ba14588 SHA512 f10dd99c46d772414ace7c456ec5ada7d8106efc2c908a774cdbfc73cc63031635b69bc1f4890c192947adeeb5ff1ac82455836207d9d5fe82d9fde34ab1d35d
diff --git a/media-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
index a7ec7781ef07..04739bbe792e 100644
--- a/media-sound/guayadeque/metadata.xml
+++ b/media-sound/guayadeque/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 101cd61d361e..f00bb9f0eacc 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -2,4 +2,4 @@ AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30
 DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
 EBUILD guitarix-0.42.1.ebuild 1828 BLAKE2B 6d247803d4c1a6efa833ac58309e7ff3c0fcb9b164d19e62a38edac0aed13fa9c5228f350ac4a4e9e5036c63607b58e970cee8691807f6e87db65c471f274700 SHA512 8461dc20dbf0c332ee6786f4425c80abc8a9c2e219140c80104f88b05b7107a092939dfb8f0b6335ab753b98e05dac8550e334ac55d5be80f393a75628f361fa
 EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
-MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
+MISC metadata.xml 691 BLAKE2B a152f7233be0d10e41c9202b118f26fb4ab3b8c60b7ef57e7f2cc45753d72b54c3bf63fcb871c908ffdc58745c889bd8a3bd7108f5177c24af2803f6f9ce32c0 SHA512 77dd24f6db6a79fb12136b4e1d5055f4799a75a02f7bdbf14fbae6532b7187f40506db39c2fcf14b5852ce3418119b3583130fc3c5459d0c5b42444a83f75ace
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index a17618d6ef19..03de43c1aef3 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -5,11 +5,11 @@
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index c89b38ff2e75..2438d1dc1698 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -2,4 +2,4 @@ DIST jack-4.0.0_pre20200706.tar.gz 198987 BLAKE2B e45c2457c82901c5cd63f726be3a69
 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
-MISC metadata.xml 481 BLAKE2B 2bf3ebe03e9ab9b81437608a57cdae359c6afd2f083d19bb75a046fe0c2617e8fc7aa2d78d9ba7b190ac0f7749b71bb6498d12d95c6c62a3dd5c031d0a8af425 SHA512 da4b26c98824b1c2798f941ae95e0bcb4cdd6ef654dff4965d28b3fa8f3952a6162e028d793c9a9e9f866d74c22b3ed74cc99779efb84cd0eef5134c89dde8ac
+MISC metadata.xml 511 BLAKE2B be22d1c6187e0a7ff31a8a6f423b6b7653a2f7205e5e0a10613ca7c66874e84e15cdf0cbe08dfba3ac6ca147f7d70a3bfb65ba447280fdccb0d14adbe942a60d SHA512 0c3d517ceabe0e8066dc9bef24736a46a61ac64d2e577adc0865a15a16e36dfa0537e8beba1d795c52658057ecb36b959f4840a7b526552c6f38320cd0ef00b8
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
index e89252b7a39a..008719d2d2c5 100644
--- a/media-sound/jack/metadata.xml
+++ b/media-sound/jack/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index f0a2f3c47bfd..80469f4a5abc 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,4 +2,4 @@ AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef87
 DIST jack2-1.9.17.tar.gz 975827 BLAKE2B 7841f2714dd2fe72d7f5d72fd93a24a63b75143d81bed5166d8b2b29af4acc487157f78b26290aacb45fb2a2c82c18156d8fb45f49bda8780cb6938ae72ffedb SHA512 dff611273e23cea6fe258114c65e193f01dfa0366ddd4e6a026a3d676a32002ee744bc70085fb8568cb85395399072beec2c7f7eed8d9ec912332a2a56623521
 EBUILD jack2-1.9.17.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
 EBUILD jack2-9999.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
-MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
+MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 61e6667c2b4e..ddeb1e502dd8 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index e05fa3c7df12..cc30af2a2a54 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -2,4 +2,4 @@ AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
 EBUILD klick-0.12.2-r2.ebuild 1082 BLAKE2B 7e6dfcbb58925f4443b809b763406f6aff75f2a3b89d64221f8f55e1addf76d35a1d462b6dc87aba29c295d9b783c662e6486051148d5683ba2c350644fe3364 SHA512 8afd68cce31cbd913b6a308ce21eef9802360dda4deca7ea0908defd5daa1c744fadb93b4a282b88d487c66aadf8d0aa31a04ec7133ad4d3ea5b9390487c11ad
-MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
+MISC metadata.xml 545 BLAKE2B 4aab06c4f32e54c49e8beaa53443eb10eaf79b1883998c1c1d9af47c1ea2b29051dd7b6096414b1960839f5187fd344dd3ecc78c4691b6af31819f49f72bdf2b SHA512 b23662bc73eb39d41704b18a639711715d8c5358484eeed7c0613da436d233875c488586ac882005b625af3bc708713346be70088d468e1b57078fe0ead2605e
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
index 807ed60afdd3..113f0699e257 100644
--- a/media-sound/klick/metadata.xml
+++ b/media-sound/klick/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/loudness-scanner/Manifest b/media-sound/loudness-scanner/Manifest
index 01e930439a1e..e2191988f708 100644
--- a/media-sound/loudness-scanner/Manifest
+++ b/media-sound/loudness-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST loudness-scanner-0.5.1_p20190709.tar.xz 65360 BLAKE2B 122a14b1700e0b971d423bb3c6395eddd49663d8980ecc57dec85cbf45b67ef72b68203b15ac21b040af824b71641635bd72c67b40b0ba757ed536e121c7e3ae SHA512 2160a1dcba92efeb308f65e2dbd32405ad6c9b72355a4161f12579d767757e709c0ffe17df988105210cbb8f05f727f6b143cbe0540edeb8c7c6585b14998fe1
 EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1832 BLAKE2B 1ce330feeb0b33bea49443a147ee53a5211e23063c1592d6897bd7721e084573ab9fb5cea19a3043f4471b8983d52fe1985de28cf72f694a7815fc61dcce00f7 SHA512 94344bb6ec4eb2ba400bc850249480ec010d3e3f8282926986e8d6e98d2ccd105fe6b1c2768cd65acd235161b0228cd55aadb819bcbc1499729bd15f80ed9d18
 EBUILD loudness-scanner-9999.ebuild 1806 BLAKE2B 93c728e56472390121a4c6e7cd6bdafe22e58ad32c12ddad411df929f613166b6a1cea49c1839b50c5571e99961915f95758414b681c3e13b91924d18e431ec2 SHA512 c7a9c460654e1103d2f98c2dbc67e84eca5b6e0ae2f308462b68de0179e483712d0e3898a76386ead57432b2acd04b4d52833f204469c14e4f2236fff8ce602c
-MISC metadata.xml 977 BLAKE2B b68f84774b5494c9735661e858630eefd51bf8fc48fadee3b75237e688c96454355a0e9d728d4c0d919ed1c92871b21f7b9c4e694e9972b4f833f259bf5e8a1b SHA512 d1cfbef820d90d8b38b2baf038b06bd2bcd31c307c42f3edbf79c2d0dea98ee04b5fb30bcfc61b2336767b1a6e1afb6c2dd37cf7202f56a3673767ca471f7c74
+MISC metadata.xml 1007 BLAKE2B 4093b4a33413e8c996860ea387454b9ac3c91d2bad0b6ac2a4240d73de5496b8321c2d9ac08c119d1842d08ab3686ae30d9ce2587bee7f1408e637653650a4b9 SHA512 16ca135b96ce7b636f3cc9d39fa52d2f8d9d18449f27e0583a3fcc835941f7806901b2e898ddc17ea53c8217981ef3706125c9cef138ea0f284d0cbee2c602d7
diff --git a/media-sound/loudness-scanner/metadata.xml b/media-sound/loudness-scanner/metadata.xml
index 399d30caf9c4..85416081988f 100644
--- a/media-sound/loudness-scanner/metadata.xml
+++ b/media-sound/loudness-scanner/metadata.xml
@@ -5,11 +5,11 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Stefan Briesenick</name>
 		<email>gentoo@sbriesen.de</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/metadata.xml b/media-sound/metadata.xml
index 84c7cb8e83c3..db8b1273a8c2 100644
--- a/media-sound/metadata.xml
+++ b/media-sound/metadata.xml
@@ -38,4 +38,3 @@
 		Kategoria media-sound zawiera programy dźwiękowe i muzyczne.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index e3306d1bbaad..c2e6ac3495c7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -6,4 +6,4 @@ DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1
 EBUILD mixxx-2.2.4.ebuild 3176 BLAKE2B 854b2c6ad80e0ebb8f2dc04be5c0cee2c4c524510c45e5083f1366ddcff4c6f26a83d16b5ff6b32a98eedf0bf4afe20707abef965926f0955f045acf7d75088f SHA512 29d0169c5f7248db1d365837ea7348f60add692b766986420ea0eb731a74e13233d7c412646f06f2242dd389d2a5483e19f79d108840f43e46473e464aafa002
 EBUILD mixxx-2.3.9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 EBUILD mixxx-9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
-MISC metadata.xml 849 BLAKE2B 7b6df4e7a68267848242fb26c50caf028960d3f3059ee74d0d0009be20b7385ca4fdfbc9a36b5cb5a7897e23085ddabddef6ea7a39a88874e3be8051753cfdb3 SHA512 e99a796d33b8a3b67993386565a61517b554b957548bcdef159a48571ce4cc5a1bcf2a4e4171c9a8d965418e2d469193f5682f1ce7068f50b958a3908a683fa6
+MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 5e69aa297bf4..c20e54f82f94 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
index b1300703d319..7b74a756bbbf 100644
--- a/media-sound/mp3val/Manifest
+++ b/media-sound/mp3val/Manifest
@@ -1,4 +1,4 @@
 AUX mp3val-0.1.8-open.patch 477 BLAKE2B 8478e14f62b66b104de26e002a6f04271d96ee45c587ccb62ba808597531d8aa9878477443efeb62e2dcda534a9f213c11084634c9f0006301f330a0a420d29d SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22
 DIST mp3val-0.1.8-src.tar.gz 21406 BLAKE2B 5b2a3697db40fb9c450c6f3c23834e137b01b5a0e5787079e8b50a2b0c4e98e988077680e54541a3022601a81aee86950eded02e526c41ea0f11804613852de6 SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604
 EBUILD mp3val-0.1.8.ebuild 658 BLAKE2B d7da95024eb81c221fefd318bd2b107087b06ee51416c175139259acbc784420004d63ed7d35689d8320cef5243519e241323eb48685866ba46dbb8a1921ab84 SHA512 cb456c94947d4094f38a52e6eda4db07303e9faa5bbf238f4ec4594697b086c8d91be82ee440d266404cd116ba59ed66f956eddb32a47e8ff8ef23fde1b58602
-MISC metadata.xml 356 BLAKE2B 8991536711d8c613cf540d78fd32dff104540ac3aac9bcd67663ff9297c6e127638c6f494bd4bf660b30355ed528f2bdbfc5f305bb45dfea51d2625423d849f2 SHA512 57d04beb9754d651fc336dbc8bafb21a8d8bbe169e40049a730865e3655518b94e886f940865765e2ac5da1c3ddd284eff01904a8e4c80e405b8f32c5aa285e6
+MISC metadata.xml 356 BLAKE2B d78183bde56e737fd0ec71b6ddd4874f4c9cc3f3ac5a5f35b2c43b620d072a0bae5742dd817bef544fd922f8d8cec6999f811514d5347dba08c9e43296a90e0c SHA512 2a204f56617098d2d2c59a5f5ce2e6cfe8043b00131a352f6f67eaad3334ff3c96068e33e0be1c4d08b0a71a4cd8a826e978af520b90ea2b113c3926ef5cad0f
diff --git a/media-sound/mp3val/metadata.xml b/media-sound/mp3val/metadata.xml
index 9883d35b70f1..35b719e580d7 100644
--- a/media-sound/mp3val/metadata.xml
+++ b/media-sound/mp3val/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index b8992c8de6ff..f6421c78cdfb 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,4 +1,4 @@
 AUX musique-1.5-unbundle-qtsingleapplication.patch 273 BLAKE2B f2150b1d54201e8d7bd64675dfc5a73a1c74abcea9c34d45f52f4d414f56c6b26d97a8c12f1d4823b5272fa32ea866b6c1d1c8052f8304a46823504203a207ed SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641
 DIST musique-1.5.tar.gz 377072 BLAKE2B 839b6096bd70171f807cd4177c2374f20089e1a8f22e59fb76d251c743cb3b9b8c86eb81131d15c6291bae1020df7380ae007689a23b67529978de9ee08ed1c2 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e
 EBUILD musique-1.5-r1.ebuild 953 BLAKE2B 58aee0f9a8778f11f941953a1f9fd3ae76379ecd5519fd8ee09f1c50fd3e1765d74ca9fb3e88ae6abac97644066e6eb4fa137c834d6a2b29b2729e2ab46aaeed SHA512 0e8b2f43cc6b1d13927ce7a967602682454c69e1cd711d0da7293590406a719e3bd5eff4f2f1cfb193b8942fc2cf1a025cc1d0d031276ce5c2d2b16b979d00f1
-MISC metadata.xml 333 BLAKE2B f4794f441a21ea4bab3f70e58bf10828861815424d33768ff8068ba57b955c07d5fa2596e092ba4582fea3730105eb397d9c94b9994e452fb042e4b92022da92 SHA512 b2dc7bd4588fd80bc4bcce0e80102d4522d9dd2a946807ef25ff294e96621da948bead8d8bf0db19b9b65cb8d3934fee69e1f73ef57c3eda3ea429928766a897
+MISC metadata.xml 333 BLAKE2B 9df0076e670d9766652d09426447a9815c97edb47ade67072513c1cf639b293bd8397edc7c1eb5fcce35da0e3012d5aa6ad3c7b425090f974bb2076ccbca55e0 SHA512 b6c202685e8dc63967764bcfeeeabc7f1ad80846f1008a993b2d8cb629a6676540d6f2f23f17d208b22996df473de5ae90068adb2c3d1eb93b1610b4e1dc735e
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index 451f4c376053..5efbf1ab3fe7 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 5984e5b597ad..d5467ba5c850 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -2,4 +2,4 @@ DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e
 DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
 EBUILD ncmpc-0.34.ebuild 2019 BLAKE2B ee88c9f5ad907768299060708e08e40a8dbaa89e53216bb250baf8b576a107af68aa13e27d7e7c16a6ae537d62dc9bbd6149cf40590bf45369cf4498bfe9ccd6 SHA512 a573e412cbfc51bbbe3b1f1a38b95521cc22e151247c2f78cf67e63b3aa46e1a19926954b68fbdcdda8fad441b224e9a67100885c2f183e6ba2101fd2757d76d
 EBUILD ncmpc-0.39.ebuild 2023 BLAKE2B e59c9883bab2ea245c4ffea0c1b714ac914fc91af2840762d99994e8e175c0c577153eef3e447dc8f5aa0d3635d39c98e0c7b26d318e8216e1ef6dae9111d814 SHA512 b78020dc31e6edf60c8ee017b406bd61ce6985a2067dfe01de15a66dd84e153f2fea76e6e0cc492bfddd97d5a3afc4b03372419d3bf2320d05e1617b8c3fc8c6
-MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
+MISC metadata.xml 947 BLAKE2B 5f5c24100750fd5a31a9728bebfee746e2a928ba1b5282de5d22775f3e29d882ed326f052898d3d30589eea298ec8160570486b90d3538b3cc5a582c55653d74 SHA512 c06d78db424871c5f3ad42afc476b1c3ccb9cc6621edfe5d496b7e259a973452b9695b07bd52352093d9e315bad95c556be05d2996d761e27ebddad3e43fba67
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 43e440230e03..0970bccac4ed 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index 0164ab83f6c1..132eff7e0bfd 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1,3 +1,3 @@
 DIST ogg2mp3-0.6.1.tar.gz 13257 BLAKE2B e3cdfe4de8134a2dbb86615f96606befe985f8aeddf77bd7e3f62b9364596ccdf0c9e5fe542bd2c7e459cb12bcb8f6dbb4782cc4934391ef98edacca88c83080 SHA512 24f24ba342631fbb4743153dc8f4c2b809b744ce01ec99fda442d2a39bf3a774ad2540fd35b6b7940516e63353979fcc30a14214100bb80c9a486ea65ae95999
 EBUILD ogg2mp3-0.6.1-r1.ebuild 614 BLAKE2B 437ecac878793934653e2bd6877c8ba8389526744cc5c67e135387d3ed35ee62163655c38a7dc02786ff3347fd601ce43d9326d6e1fdd9994cfc44cdbb02b34b SHA512 96e647434e5110351c5fb61822bc49aaa324c2c16ab8cabde1b8b7787050426a72e9e313bae1a0da1a063693010a153c34d7180c2457373eabd0dd4ebfb94910
-MISC metadata.xml 780 BLAKE2B 234c25b6f649afbccae547a90da27d4414c4b357e0185513e73d86b3ce01eb99c36399fab8f62d6b840cbdf31558ed9d6aa7204b135a9c64936c623effcdc5fd SHA512 aef8bed925fee6d914dd3f1ab3315b40743715c2499f72459de8ff3765cdd774755ec3a31872228cb6a8da8726cd3aa4256079431641c188c26c0c0553b51342
+MISC metadata.xml 810 BLAKE2B 2f1603be452c221f69bee63530f8d7ff5bf8f8341e6dcd8176150fae12c6ab18c0de9a225c0e55c00398760ab3ab23c921dcc83e4b0586386b510fc0d026328f SHA512 312c138ac3a57f76b3e11718d694aaa3e82ce2ee22be957d6b80a82b789a5c8d07da860333d61e5de882cf97d6aee6469659f50c2ec06bbce636585562e0c65d
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index 5571068144eb..ace2b810a565 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -5,7 +5,7 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index a03e91664344..2c2038c5ea61 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,8 +1,4 @@
 AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
-DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
-DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
 DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
-EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
-EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
 EBUILD pasystray-0.7.1.ebuild 999 BLAKE2B 311f499a2c1eb72326a348893098836166330425c323a9cd6ed117f0619eb7a8179d1c883344143d0d858f7037193451c5b3c0486f47dec52bb192aad557e5c0 SHA512 74b5e0e8fc57f0bcc6c6285dffb7c60a1a9cb32f9d96d05b64a429a6f79bf0c638434529cf36323387fff1338cc5f6bbffe3362efe1d6a0179f4e093d7bc635f
-MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
+MISC metadata.xml 665 BLAKE2B 56e3f4e8d410103f68151907eb18480ef65852005c2aab9114c8ed90d834d728104bdbe54e578603fefa6f0fe312256eee6c9b1bc4a0cc8f3df3b4c552f8e60b SHA512 7558ba66153d9ae2ab0c41eadd5cd297c7d93484155e4d587c636453b9537efd7d9a3a6366e6f26c17c2f565bf60ed10e00da7b83c1f3d6824b4db306f7f2d98
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index 0fc6cc1825ed..ce515100d4d3 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/pasystray/pasystray-0.6.0-r2.ebuild b/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
deleted file mode 100644
index d4c1899f2812..000000000000
--- a/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils autotools vcs-snapshot xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/fix-missing-gint.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pasystray/pasystray-0.7.0.ebuild b/media-sound/pasystray/pasystray-0.7.0.ebuild
deleted file mode 100644
index 2a40a2718dc9..000000000000
--- a/media-sound/pasystray/pasystray-0.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils autotools xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 914884783ad5..b625318512af 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,7 +1,3 @@
-DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
-DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba1ec65346a219478b4807c600218e1b8fe971892e7df16ad49273721a5b423bced2bd3441e9f89497375d4e0d84 SHA512 9c08a3f1d5517d7f4270ed92f226453618fc9f0688688d1af9ff55f0c77efeb1b67daa4adc481546215491550f8528095d376ab099c8ddca05235bfb34b36eb7
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
-EBUILD playerctl-2.0.2.ebuild 893 BLAKE2B 4c7298c6c3bd2ea410d2806014a53ca5d116cef4d816d347629ae7a9626a7f39a3bd6b9f2968e4aa15d6f9d86c209c8867e27237a198693a7a9481e3850766cd SHA512 861dd884b243df3975481e2b45e995f8db602705b9ba2be1e01a121cd8bbd0304af39ffe28aa8a6d9651256121b24e9583fd26bc3429b616edc09e67ab75c1e7
-EBUILD playerctl-2.2.1.ebuild 1128 BLAKE2B 3edf328c12029aebf3e1777a3d66d679549f3a1a9014dc3583713d9202d33836cfc2f13de5c7947b97897d8bb0dbcef37542aded0e33624d5cddde8a9c9875e3 SHA512 b8802416fbe90360c78b69ee3e2e4697a1561a9c44d5278279de0a36b4f57fb3282bc5be18ac86d23ca7ade83025d7fcffac00b278f22a924431c4b1b2b1e67d
 EBUILD playerctl-2.3.1.ebuild 1202 BLAKE2B a6aa753d25f13e67f3c07ad2c84eb5a8cfca681fdf79b104697e775495fdcd79834a0f455bf9975713768e15b37c3d895468f897dc58dcb5cb6501f9fc1d7542 SHA512 d542fecca06ef234072c715be3ccca5771864eeb05112750ac30376e95655e4833d6fe1d44f060a4f556b853f1d27f7cfdc956f1179ac1a0f3639a8eba33b418
 MISC metadata.xml 343 BLAKE2B ef2d8052365e3c1907a5f191523ae0abd08d81fe0da46e4429192003a4a8560d7bbe45507b0fcbc1600241e89fa3fd64c84e4c208f501a0fd0be26175c2b0c97 SHA512 8719414c1c680915060a614b3fc30b462562b953c6b5fc227f6525a8870d59010ce0e7c5c5744031ff14d4c8514bb6f451ae697f1adfd1f617de490070ea2c38
diff --git a/media-sound/playerctl/playerctl-2.0.2.ebuild b/media-sound/playerctl/playerctl-2.0.2.ebuild
deleted file mode 100644
index 4a6d3b7aa9fa..000000000000
--- a/media-sound/playerctl/playerctl-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc introspection"
-
-RDEPEND="
-	dev-libs/glib:2
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc gtk-doc)
-		$(meson_use introspection)
-	)
-
-	xdg_environment_reset # 596166
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	docinto examples
-	dodoc -r "${S}"/examples/.
-	docompress -x "/usr/share/doc/${PF}/examples"
-}
diff --git a/media-sound/playerctl/playerctl-2.2.1.ebuild b/media-sound/playerctl/playerctl-2.2.1.ebuild
deleted file mode 100644
index 1c7dfe34655f..000000000000
--- a/media-sound/playerctl/playerctl-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 xdg-utils meson
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc introspection"
-RESTRICT="test" # Requires dbus-next python package that's not in the tree
-
-RDEPEND="
-	dev-libs/glib:2
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-util/gtk-doc )
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddatadir=share
-		-Dbindir=bin
-		$(meson_use doc gtk-doc)
-		$(meson_use introspection)
-	)
-
-	xdg_environment_reset # 596166
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	rm "${ED}"/usr/$(get_libdir)/libplayerctl.a || die
-
-	docinto examples
-	dodoc -r "${S}"/examples/.
-	docompress -x "/usr/share/doc/${PF}/examples"
-
-	newbashcomp data/playerctl.bash "${PN}"
-}
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 21991dccc51b..c5262c612811 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -4,4 +4,4 @@ AUX pnmixer-0.7.2-fix-possible-memleak.patch 620 BLAKE2B 1eb39431bdb5d7597575687
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
 EBUILD pnmixer-0.7.2-r1.ebuild 1152 BLAKE2B 50469e88f8e4851b6f47c17eedd0620a2d0f9e91cd4fe0deea92d9ef18792d9dde160887b141dee78e81a75ae5eb92b33d5dc389048660c1981cdc789e423967 SHA512 b9dac5065a4c566c682dc6c082006bb5844a393b1889b76ccdef00dfcb15091e1ea87c47742f05365100b80c35feac571146b011b66d2c9dcf89ccdf9758ab0e
 EBUILD pnmixer-0.7.2.ebuild 1010 BLAKE2B 38e73b4665b30b1401f44b5f8257b2b37dc6ba39c401e45f26558f5943718574efb90f470c26a3fdd550b3d5246bf1cc986829e0c94c4360b9c5ca33ce3259a8 SHA512 762319ccacd5e8e08921603bfa85cd147c2455cd53c8739be709bbad966f580d41ae307f353b04ac8d8b37b9f7c5ddb0bc9b4d69c976331afb539c157cc7e34d
-MISC metadata.xml 2311 BLAKE2B 15ea04569ba81121b6f5965c2214a3b165f0f82ad9410b91fdcdafa03477fb5429abe4dd8e2f93dd78acb0f4d725d62c7927b74b1112bcda5a7e1699675ee68f SHA512 e2b368365561ca414b44a7228dcdab0bb4cd31d26aaa9ea24ec87bce012edabe701c77e6930b7ffc11710e5372e817fb0f5a46accc2318218e10677f9a710a5e
+MISC metadata.xml 2341 BLAKE2B 3e14fa1e6d7cf81cd1d61370d955171fdbf1dfd624d164a839db2450cf3b96351bc939ebc30f206d01a4ff6895b2e1ce54da772c0f8ec8af14304b73ee02f7d5 SHA512 fa5350d5ef3ea5cae858ea0f5aaa5619e1d7f861df7d99b189e0e8eafe485d1692b37871a906a8cb7478191e5b108c4fed5ba2515f1e13288f4b0eb71167238e
diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index 6c7b2a84125f..18c072689466 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/podget/Manifest b/media-sound/podget/Manifest
index 9a92b1aa1796..9a9e0f1fdcbc 100644
--- a/media-sound/podget/Manifest
+++ b/media-sound/podget/Manifest
@@ -1,7 +1,3 @@
-DIST podget-0.7.14.tar.gz 63356 BLAKE2B ac0f591691930f67b82bb08ac8c4b0ce10a6d793ecfaf5d0d07e6f618d47fdb3ca5371d94165f49e6d7261cb8d49f8146748e89846c811badbbff1a7cbc9885d SHA512 a54d4cdac88f220f470304d9b50ef00c01540ca2e986e4ffc80d9d5aea4ddd6b80484e243f742967dcf800780a8fdfdd55437f9fe710e536ca6a5d6140374022
-DIST podget-0.8.1.tar.gz 66284 BLAKE2B e30d7c24ee12ba17c8ceaa5773c0bc1474d39b7be4f998b42e5fefcde8d2e019273e597dc298770f710fc72aea803abd9320b6b6cce6c9f2ff60efed02f25e65 SHA512 d2cadeccbba71b04e74863656dfd600e99b95ec58b09a4ba4713c401dd37aa24c339031d251cf5b4d2ee1cd4efbc91b41d8eca1a488def2dc3b5a6968b0a1d20
 DIST podget-0.8.2.tar.gz 66786 BLAKE2B 855d872df0dc07c43f9766b9e736da217a5303a963088b3414385fb055a45fa3f00e86d6f9b39fc4ea1c77b4882962666c34cb704acec5c115b6c4f9382d8210 SHA512 4e61b4d0197976b755f07445a371368cdc090e148c378b86b925ec1d23e447a4d66d9cc68c2fc8431246bc016d44161340bdb30195481d01d8fb00cf142fa696
-EBUILD podget-0.7.14.ebuild 627 BLAKE2B 95080338636223a5fb1d593d32c3e7f599a6338dadea4929f0c10ea4e4021b7f35932858c309bab4801ee579ea745bd38e3f486c0a88fc62275e0f0e480fe5db SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3
-EBUILD podget-0.8.1.ebuild 627 BLAKE2B 95080338636223a5fb1d593d32c3e7f599a6338dadea4929f0c10ea4e4021b7f35932858c309bab4801ee579ea745bd38e3f486c0a88fc62275e0f0e480fe5db SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3
 EBUILD podget-0.8.2.ebuild 627 BLAKE2B 95080338636223a5fb1d593d32c3e7f599a6338dadea4929f0c10ea4e4021b7f35932858c309bab4801ee579ea745bd38e3f486c0a88fc62275e0f0e480fe5db SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3
-MISC metadata.xml 496 BLAKE2B 1b41ca75b28fa5360570670ab52df73187a2e8a94972b855a6410f1dabe99237dba74db4c5137002d8a38a7c95bc5d917551ecd8b5cea77a1c241c7ba8e51a82 SHA512 8dbe29f566ceddf1dd6a946e63b24a6c92e85e0bdcd1b598aa42a7839604010eaed1760a344205a30f0ea002cc029b6aabb47fe8b66eb5e35818def6fb68e834
+MISC metadata.xml 526 BLAKE2B b7aea16a15a9ce7a46a35f1f1bace12d294f09183d14e0127fde0aeb6f96d5d6e3ca3cadfab0e2a78791e3d8cc4a39cf5c1023a7f0e9ac088545506c0f68e35a SHA512 f8147ef3306cbfb65462dc8ac1e268333b788e6008ed07d8b5521ebde565bd2d4f7b4766de0ccb99cf76a59f8492b430aa9ddffd257f866d70d4522f10abdb23
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index 4f4416b228ce..01be0498bae8 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitcat490@gmail.com</email>
 		<name>Michael Niehoff</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/podget/podget-0.7.14.ebuild b/media-sound/podget/podget-0.7.14.ebuild
deleted file mode 100644
index a2eb5f346793..000000000000
--- a/media-sound/podget/podget-0.7.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
-HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
-SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
-
-src_compile() {
-	# There is a Makefile that we don't want to use.
-	:;
-}
-
-src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
-}
diff --git a/media-sound/podget/podget-0.8.1.ebuild b/media-sound/podget/podget-0.8.1.ebuild
deleted file mode 100644
index a2eb5f346793..000000000000
--- a/media-sound/podget/podget-0.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
-HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
-SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
-
-src_compile() {
-	# There is a Makefile that we don't want to use.
-	:;
-}
-
-src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
-}
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
new file mode 100644
index 000000000000..fb215b8977cc
--- /dev/null
+++ b/media-sound/puddletag/Manifest
@@ -0,0 +1,3 @@
+DIST puddletag-2.0.1.tar.gz 1227152 BLAKE2B 804e9ca9629a9d78114d6f4b6afbe9032cb414678ea6325679c21ac18867bafed8f1b16aae5fbea18995ecc800d35594c478a5164b377f3b4e5dd75148fd3246 SHA512 d84ba360a6cd8c3ddb6628e30276df58d059d9e8cbb2d1255320ca273436c69f05584059c2e768a15871d3f56dc08d7ac96fef9a9c7c077811bb9fdfde444610
+EBUILD puddletag-2.0.1.ebuild 1103 BLAKE2B 76ef61af662c7c3f37f761685a45fb9798d76b033fde5bb412b4e4f0cdb50c4f618b4e5f895c5258d54226ee43a70f3fd1cb39ab2c76cbfe9f99f7aaee38c898 SHA512 7a2f73d4f1ac110ba613da7c7fb1e39af9018691ac86b4fdb455daed8d85e8b53586aefe9da89e50b8406e8720b189eb63f65e491e4896987010bb0ebd3fa099
+MISC metadata.xml 624 BLAKE2B 43e4b655ee24f979d87e5cb9ff36660e61134be2387ba11bb7ce8f3e1d89506be280f3ee5281609c70e3a40fea7826911e565fcb46bfa3d335723addcc2d87ac SHA512 bc1964b64da168e51908436b1a358ba37c9443795bb838a0cdaa0a8a423db4d926c39a7a3582f6fd84367fae027c1930cb4818eca71606d21e4780078165c3f7
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
new file mode 100644
index 000000000000..805e3cbf7030
--- /dev/null
+++ b/media-sound/puddletag/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="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
+		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">puddletag</remote-id>
+		<remote-id type="github">keithgg/puddletag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-2.0.1.ebuild b/media-sound/puddletag/puddletag-2.0.1.ebuild
new file mode 100644
index 000000000000..51eb70028ff7
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+DEPEND=""
+RDEPEND="
+	>=dev-python/configobj-5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
+	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
+	acoustid? ( >=media-libs/chromaprint-1.4.3 )
+	quodlibet? ( >=media-sound/quodlibet-4.3.0[${PYTHON_USEDEP}] )
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+"
+# docs
+#	>=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
+#	>=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
+#	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index dd61a74c313c..d7e408027d8f 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,11 +1,9 @@
 AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
-DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
-DIST pulseeffects-5.0.1.tar.gz 2032470 BLAKE2B 8422d4a9dc3f0b6218921389824eda9aa0de902903edcd382bb1d2a4cbb0e539333ddc43c632b1653b410c68018a97cea18cb1a2e1f20ef72e9930fc28ae6442 SHA512 5cd8fe334766e3f939998c37651444da516e3eaf83841c34504d77dacee7f2e00653abb427e7ef7d909755b468689bc419697d97245ba906589df4b9d3cc5b83
+DIST pulseeffects-5.0.2.tar.gz 2051616 BLAKE2B 13df099b5f49c1a7be89fe9b684c68c03c750fb89854dc4a5c94cb8dfa04bfbb5e7ce0f70529db0c3b2706cca3918be1a93f70d558494316a2d577b3c68c53b5 SHA512 3cbfcc82c4ed052301d3f700e897a99bacc1a1c66000d2c837ebdb0516c914071fed9334bba917956aeb2b37784ea06054461aef5da95688ea74247311d09300
 EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
 EBUILD pulseeffects-4.8.4-r1.ebuild 1811 BLAKE2B 58e33cd0dfc818d9ec00fc9b9bb6a48b4eec41262a3904282d770a5d8ed4649a08d9103778e4ebfa6c90e890fe9159dacd0b44634d9024226bb807d63f990607 SHA512 9c7721f01c43a462d9a152423e247f76fe9fd0cffdbbabb4990cfb04436f62369fd490dcf5f41a7e0f2bea83015ebf01fda36303eae5caa8c43e8b2bb037e42d
-EBUILD pulseeffects-5.0.0-r1.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
-EBUILD pulseeffects-5.0.1.ebuild 2156 BLAKE2B 64b331cc21021145fee479356978a95bff6de0e2935ec6802f36518c4ed66f7cc6385fde09e4f63b3da8766cbd7839bd96235e83851fdb29171db7cabdf7d27a SHA512 3d9eea5372e4da48e56256361c34ae24c65f2f11195a58fc73daabffc2a6e71c00a88e50fb1768fc135a43d61912c5e2c178398d3f6a6d3091ecf74769ce93ef
+EBUILD pulseeffects-5.0.2.ebuild 2156 BLAKE2B 64b331cc21021145fee479356978a95bff6de0e2935ec6802f36518c4ed66f7cc6385fde09e4f63b3da8766cbd7839bd96235e83851fdb29171db7cabdf7d27a SHA512 3d9eea5372e4da48e56256361c34ae24c65f2f11195a58fc73daabffc2a6e71c00a88e50fb1768fc135a43d61912c5e2c178398d3f6a6d3091ecf74769ce93ef
 EBUILD pulseeffects-9999.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
deleted file mode 100644
index 8915be106aa2..000000000000
--- a/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-video/pipewire[gstreamer]
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt "5.0.0"; then
-				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
-					elog "PulseEffects has switched to pipewire as it's audio backend"
-					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
-				fi
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
index 2e8da24b5479..2e8da24b5479 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 3b32774b2f70..99e366027244 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,6 +1,7 @@
-AUX qjackctl-0.9.0-disable-git.patch 543 BLAKE2B b4ddd7f6d85b5c93a99f1b7d5a32062a8a45cee77964b151e2aa686ee43fec0afe88e5188eb17f367234872eb555eee3b3a68a0b342622c154ca2d4bf6b614ba SHA512 5e30ab78dae12707615e8db396bd180b958713feeb738f711ab19908a51126bd85ddf733e1be04eb3bac54535bcaff6a20f51706802eb5373c96ab67c6fe8795
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
+DIST qjackctl-0.9.2.tar.gz 1093486 BLAKE2B 43e3f3d48295727d7a3848ed6c59c72fb6c2947476720af802d53d152848a355aac79448d88fce78c2b12fbae54d64b4a1582f334b2a416f0b235cdf8d557e40 SHA512 87e5cbf241139b1e225ea2e2cc45b6f44f19fddf866560e5b9e690ef3a2f7a358ff6a28065841c9599b321568a85d5b4767907aff071c4a768608fc273a7e8fb
 EBUILD qjackctl-0.9.1.ebuild 969 BLAKE2B ea4a22964f1f02fd692be5e8ead07bc08b624a9d3605705df84090b8707fa9e602efea6c2216c8630ba51df8211d5aece717055ca1b7b2ca42bd1bac0e7452ab SHA512 8d1c56fb6f13cd30bfd54b05575c0467c3002bd38c852facbc7576c4d4fef7da41f6e08cc48a8a0261e6df31a928ce153e5731ca0a85a781f9517a2af1e0a0c9
+EBUILD qjackctl-0.9.2.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
deleted file mode 100644
index 08dd2e56ba8f..000000000000
--- a/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f622eb9..2252e26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.1)
- set (VERSION "0.9.0")
- 
- set (CONFIG_VERSION ${VERSION})
-+#[[
- execute_process (
-   COMMAND git describe --tags --dirty --abbrev=6
-   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
-@@ -24,6 +25,7 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
-     set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
-   endif ()
- endif ()
-+]]
- 
- set (PACKAGE_NAME "QjackCtl")
- set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qjackctl/qjackctl-0.9.2.ebuild b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
new file mode 100644
index 000000000000..15137741a070
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index be1b622424bc..e37dfec4bb81 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,4 +1,3 @@
-AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
 EBUILD qsampler-0.9.1.ebuild 1142 BLAKE2B 300be269a1d3a1f7fe9de4f005f4e4ad5da41e389785e3ae4f7f9e37d28d4a8e86e87b63670e53b51b43121fc96dbbe8915b54fbff8d1e7187a2cf952894ae2e SHA512 6ec6ea3673602e1c02cc12fab0db591c12519a012503646205369df95ce37bcf5fc8d95cc210524da871f1e7a9a8be7e3c4268ef25f4d11322daeec0a6256d36
diff --git a/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
deleted file mode 100644
index 5da44d8a8175..000000000000
--- a/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9756274..f88b2fd 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -111,7 +111,6 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 6fb417bf1305..a25659bfa201 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,6 @@
-AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80bb51b4530bb06f039b35006106e5f88bae29e1a813529cc70d861cef134e680036964c034c9f8c9f2b9bf11e115df5c213489e27890de5 SHA512 95d1c8135ceb2afa1b92410ec26a0b6586bd5bb419e4d91f83944d39fa3a877519e60e8c0bda9e4365fa358e9e2fecbd80a61bddded22a745265bc6ada95bbc5
 AUX qtractor-0.9.20-include-QWindow.patch 732 BLAKE2B 0bf5114a1e0a3ef2fa320a421fb3b23287f2d98b78b54a42378ee39cc06d4139e4d19b26fe1c22de5533a98f478a4d93c8eafdbb79587bc836183e203aab9f76 SHA512 3553f36025412f896d5521952f68dbf566651b1379fe2ebdf2d503ee1a5e38353cddb02ee4e70edece9814ed8234634823d8f5a6621d8fa08345b712312e19ad
-DIST qtractor-0.9.19.tar.gz 1943040 BLAKE2B 33ccb2e4002a8a666dc9f325dd7f14e66a2f624e0dda9eb916f8b958d01e2a8f72b5e8390946482e6170de9e2fcc28a4efcf8447b6610b21003288e7c7b9f9b7 SHA512 cab7ef6dc259ba570645a7f20efd6816377ae9707e004370f24745e00e20df90be9316543c5cb5ddbdc6bb1c749053bfb964e53ac97dc8ae2dd468e371274bfc
 DIST qtractor-0.9.20.tar.gz 1944885 BLAKE2B 7989e827bdfb72cf8402a87a2e219fc2767fa971ce8f958cd8fb5aa0536aa12d486fc854b2d3a407de9e2b0ac3d6737420163d39b194bcd1d08e831f26cfab0c SHA512 663d43f0ca2a2ee8deb260c29c7dc39ac36d2a4f4f3b1b6e3074e66fe5bb60c37a93fde89c09ceedfd6848ba1519de8d38d613d68b2693356fbda97a5d1c2c00
-EBUILD qtractor-0.9.19.ebuild 1544 BLAKE2B cdd6f8c325772d378ff9be04814e647b832d584e0102be1e3822a7bc8d5bde80b2bb078a343af256833fff581eacc5d354452258aea7269f7a3088274fa7bad6 SHA512 4341868dbe80ee10aecb83fb5b86c95e60a316cabd36888568bf9406d428cba2a58e1b9c832784b32920baee00d8a520f1aeab6e724bc5daf223db2c8fd0bf9b
-EBUILD qtractor-0.9.20.ebuild 2481 BLAKE2B ea9e5e11421ec2b9e396e1f9afada13f221d001d93e0d21da7eb39ef5f912525f69db15c567ed036be02b585febc58427f5f939ba6b345950dc4e07ed4e454d7 SHA512 7e9a4ab0cdcd0cfcb2f00f7c6a344fd5fe2a0c2294db62f24ddcf18b0c4645f84d0d5f44c254c217b196525eb18577ac5a3d07ca19dcbd862a63b3733e3746e4
-MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
+DIST qtractor-0.9.21.tar.gz 1945423 BLAKE2B 8c76966695e6054cd0d3743313f50de1bf4f741dfaad0d60f41ae87bd531ce394d11c7fc719c75ee159bf0bf7dd3037679cb93d7d4295132a7dc2fa6d89a786e SHA512 12d823c4efd557709d83e0e5ace6cb84ac066a0eddbfdbac0dbaf6b75e6bbe37c0e3548270e80fb89f318c58db4b0ebad95daac989eb7d6b8f82b8cc7ccc3a3c
+EBUILD qtractor-0.9.20.ebuild 2479 BLAKE2B c7f668f97089e930a4696337b6047311bb036c6e8540c4757a078918a5af292ef14fc7beb187ec9b98cb6522f5e407df75c7c73678e4604b684ba2c452973201 SHA512 5eab625b2868eb37856b3dba7b7d51e6aa93a5a9b7f1e7da7adf05ec78f03efb51608cda940cefac9377d220859e62ed5469ea633d5b4e294b7b8b2e45efbc3e
+EBUILD qtractor-0.9.21.ebuild 2426 BLAKE2B 2caa11ef0be835eade433bcc2548537cecc65eef249fe57d440a87225d66b58984100ef5fb4a405a081b75d34ecdd39c4ef39590aad1fa5737c6627857d475ae SHA512 ee635717edb53514ef53141c83027925b2920611a6d138e9caf1494a313f4c4e8db3a8004bac4d563a924f7d3ed9987928f1c9c0a99c44150f8c9ae60b4fefa1
+MISC metadata.xml 890 BLAKE2B 449553d45029499af8d185e9e524674f035841e5e36fc7acb8781c82b4cd8f804c87075dae592481294835cddef2a40dbbbd7f9ca7e507e6191680b25d19eef9 SHA512 bf1fc12e5da4b1106ee3a84d510c255fc9b4ab9f1a59c1827b1f81df3ede0cbd0916f5cb95d04872b7771ddc03058ea6d7a16c826e4bb5afe42438f0347b8486
diff --git a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
deleted file mode 100644
index cb4d5a4bbae7..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 42849a9..3f05f9d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -346,10 +346,8 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1
- 	@install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
index 5169d9fae0a0..d11ddfd83aa1 100644
--- a/media-sound/qtractor/metadata.xml
+++ b/media-sound/qtractor/metadata.xml
@@ -5,11 +5,11 @@
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>simon.vanderveldt+gentoo@gmail.com</email>
 		<name>Simon van der Veldt</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/qtractor/qtractor-0.9.19.ebuild b/media-sound/qtractor/qtractor-0.9.19.ebuild
deleted file mode 100644
index 372261f84c4d..000000000000
--- a/media-sound/qtractor/qtractor-0.9.19.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
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-liblilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/qtractor/qtractor-0.9.20.ebuild b/media-sound/qtractor/qtractor-0.9.20.ebuild
index ba0b616769be..caf7388cadaf 100644
--- a/media-sound/qtractor/qtractor-0.9.20.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/qtractor/qtractor-0.9.21.ebuild b/media-sound/qtractor/qtractor-0.9.21.ebuild
new file mode 100644
index 000000000000..881edc87fb8b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.21.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=0
+		-DCONFIG_VST=0
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index c0df61d872fe..bf3533fac29f 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,3 +1,6 @@
 DIST quodlibet-4.3.0.tar.gz 5061542 BLAKE2B 31ec24f43a1750d065e14fe69d90a1646382ead13362633c08c9c44b17cb1dca02da37612bd30e1737212098fd26947cf637501ed79b34f03167b85cc11cbdc8 SHA512 6e3cd8bebb8abeb6acde6effb08a439479e293fed18633240a1508a015c083c814fb98722c36d3970917970259095499efeb27e323ab788252940714cae2fddc
-EBUILD quodlibet-4.3.0.ebuild 1498 BLAKE2B 22b0efb3b23a6de06295411da982355d08f94302b0e3915bdffeb39d35fa46542fb677c977ffd3f0bff15f9d74b98f5b8274f79e32160aa9ded903651ccb6a35 SHA512 698d1f2cbb80c5c05cf63959263ad841bdbd992387a7bcdd663586339f53d5fea77a145249f345d07570c4011041a8c811f85517bfe7b817ef80b6e582945360
+DIST quodlibet-4.4.0.tar.gz 5126584 BLAKE2B b0d69ccacd009709148580619bdbafafb0c76acef791ab0025eda687cab4886b90f2d44fb6c37de80481e976ef4af466d209f7a7c6c53fc6794c26baa25d7bc0 SHA512 3a3c88c9283c3e14ee8b3504a9be9616a7773ce6819e832a76e1f926f9a1f86bbc68ae2dd98a2cf292ebc48216aca6e8a29e32f10d26b176effb62377183d13e
+EBUILD quodlibet-4.3.0-r1.ebuild 1512 BLAKE2B b4d5fb4b224f32deb88d4f26f133001db18d74d80b47840aefd4e92602a94fc4804972a45a6aea2fee9bf810c7846eae943789bad921d10431e742e3756ea3d5 SHA512 6d20200807bf0ec8302286857c0089bef6090733429bbe3837de134cb546e1ed49ee6024c161e4b44b1619982b6d505e64581a132dd12603bd9bb9ed6e011cf5
+EBUILD quodlibet-4.3.0.ebuild 1498 BLAKE2B eb239e5a594006f861f69634eabb47b2dd9193aa2baa64d851fd505ec94b09d41d38822844161367974eea821136bf1e3531ce0756254ff18b1a611e1b7b2404 SHA512 e4032482dc7f5191fada586e799e2f162e5d17acf2cb2038670fd3f16447c82dd96c07bdff0dd4f82c933cd0b535be8cbd98bb1eb6e47ee0c3ad047506b1db23
+EBUILD quodlibet-4.4.0.ebuild 1530 BLAKE2B 50aec9348cfdab672b738813ce49adb9df704e10c912fd7f6220d63cf543ce92672399e1c242567799f9f4be8f977f6096be0874664d78030f7be884ec757c38 SHA512 6ca094393337c8d3449d35d5761bf6285473dfe584878f2449188fffd7a4841d81f318f79f7d9cafed7806919e969fdc18e7e7052cfc5835c86b98b246d47f69
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild b/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..d95533f3a8d3
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-4.3.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="https://quodlibet.readthedocs.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	udev? ( virtual/udev )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/quodlibet/quodlibet-4.3.0.ebuild b/media-sound/quodlibet/quodlibet-4.3.0.ebuild
index 868d15250e42..9445a4feb412 100644
--- a/media-sound/quodlibet/quodlibet-4.3.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/quodlibet/quodlibet-4.4.0.ebuild b/media-sound/quodlibet/quodlibet-4.4.0.ebuild
new file mode 100644
index 000000000000..0e19b6bf95dd
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-4.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="https://quodlibet.readthedocs.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	udev? ( virtual/udev )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	local qlconfig=quodlibet/config.py
+pwd
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/scream/Manifest b/media-sound/scream/Manifest
index e8ae7d7db29b..f7f1bba28f35 100644
--- a/media-sound/scream/Manifest
+++ b/media-sound/scream/Manifest
@@ -1,4 +1,4 @@
 DIST scream-3.6.tar.gz 999237 BLAKE2B d199d9658958ac53d973c25421ee3a7f2c1ec9666c34596639942bcbfa5efb60e4aad033adc2fdbd810f676f412357283dc5fda6224752587498f7636ade1662 SHA512 4fd07a808d8f0ead3551061e96fe2f9b54ef6f34d1d615fb6454185fc6ffc67f71afb08a876550363cb3f8c15bbff461936808031e5aba5885626c92880e92ec
 EBUILD scream-3.6.ebuild 819 BLAKE2B b271d4899703c78b902ad4fa88527d77f06a8acda937b686c74b59c6e75b1b937bb33e0c94318790532a443466cf45b3223f8df3c2ed88f8c8ae2277b19503f9 SHA512 f65cbf7f7cdf8410b4167727c650e1572ead641d597722d80bb0940cb090a2b9fa54bbea28b17dfe393f79823ca17e7c1306dac83e58db81d5c924654f242002
 EBUILD scream-9999.ebuild 819 BLAKE2B b271d4899703c78b902ad4fa88527d77f06a8acda937b686c74b59c6e75b1b937bb33e0c94318790532a443466cf45b3223f8df3c2ed88f8c8ae2277b19503f9 SHA512 f65cbf7f7cdf8410b4167727c650e1572ead641d597722d80bb0940cb090a2b9fa54bbea28b17dfe393f79823ca17e7c1306dac83e58db81d5c924654f242002
-MISC metadata.xml 456 BLAKE2B 63ddcdfcfea9d64648af069d1c32261d379ae9eef975414f4444880a1ed4324d00c61dd7c4090fe5bdce306d15a665543ac702a75aacbab2442faeeeaed580b1 SHA512 f2251d5d65b0b3454295a9af238b7cb664facbbc46fd7b2bfd70510a0e1af6899787e4a39bb51a6196b788ce0a911cfdfe1d74cf1f3aee327ed527fff3b1cfb5
+MISC metadata.xml 486 BLAKE2B 05dcb41a1c3bf666a47b6b432dfab1642a783629ed84c2fe0d8e474a59f8da40cf97fc8bfe09956b2d5e9e2599b132c02d3c1257dcdc4cea690224a6df34c87a SHA512 f257299e615da5d3e0d0597914142458609dacb8a3d620a7f1a425295b94324d16f52f477c80d0dbdc44817af3ae4e6dc87db6f9a2ffa226c98327ae9e638149
diff --git a/media-sound/scream/metadata.xml b/media-sound/scream/metadata.xml
index ed60e1c354ac..e7bb11276a72 100644
--- a/media-sound/scream/metadata.xml
+++ b/media-sound/scream/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 0f7ebe0a1e3b..b233f20283d3 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -5,4 +5,4 @@ AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d6617
 DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
 EBUILD snapcast-0.20.0.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
 EBUILD snapcast-9999.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
-MISC metadata.xml 1160 BLAKE2B e83d0f2140876511608032fc416c0b12861005cb4db45aaea56602e6e86f4bfa3d48df7c97d7cf56b4ba78ef635cea275ccd1c164991eecd99a6f19bd8998e44 SHA512 f1de473f51108a4f25e503404071830284ba0dfbaa458530fa93b737385e7cd651fb28bf27b841dba259f215b5603ea6f425120f74f559c8fdaf47a9e01fbe76
+MISC metadata.xml 1190 BLAKE2B b5cc3702af67dc6de92adefc2ed47067079df1c4a34190fbe7ffdf1b233c8b5d01ce5823c841614da40abe05a0caabd4de2a31a8448715fc166cfe828d0c3ace SHA512 0195d09d431cffe95365aeb9cfbc3ae5384dbc1c62b1cd8abf26841162df824e7c8cf6bc0087cf0cb7696cc66ed4b71446bcb44783c4b2f13b6aac1e435f3cd5
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index a11864f7a852..7300f7cbd092 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index df812f83eed3..effa22fe463b 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,4 +1,4 @@
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
 EBUILD sndio-1.7.0-r1.ebuild 904 BLAKE2B 4dd22571d5ac249b4217c02db8d5651630b473dea1401416f36533d8412ced895dfc023462a3a48e1837cf82cbdb7bdc8ffb830f30832bda16441909b00d12e9 SHA512 642123ceb5d9c2688bf8aa3dd0c839fd168c03106400d33e63a4d53aa98e02644e753da9d8a2ec8d8888a3c723183af10aa42460ae74ff3218ae952395df4d45
-MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
+MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/media-sound/sndio/metadata.xml b/media-sound/sndio/metadata.xml
index 9df017effeb6..fc3c6c671309 100644
--- a/media-sound/sndio/metadata.xml
+++ b/media-sound/sndio/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 12cb1843f417..8d85d64b595e 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,8 +1,4 @@
-AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
-AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
-DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
-EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
-EBUILD sonic-visualiser-4.3.ebuild 1638 BLAKE2B 2df62c42fb0eff4e29d347442b55cbeb75b510383e97732f002acea69123f0f33db43a2e729a9faec3ccc0d91503cf106fc4840b72a589f20d870b62c23a3c9f SHA512 62c7f47e6fdce8db515d519ca91b86f7547870b09d9d1408259f0644bf797e2b30df8a20a51ad3ecb5a3397252f3ea2e4171e191d1b3bbcca2a427f2510d6816
+EBUILD sonic-visualiser-4.3.ebuild 1636 BLAKE2B cc13d00d1562777d328eba6166a73fd8ff13390985140f16ae2e2f1555338198cb76740767fcab2fe9b1065ecf83ae39553bb2219c2135311a13762f33a1a82b SHA512 47067ede6d807f1de837b0312575feed6063d9d2a4077b0f6a5bac7a42ed2777ee5444905dc39e61bdc1389ef840865fb003abcda2b2816fd148306dd187d1a4
 MISC metadata.xml 456 BLAKE2B ea6749af7e2c0905dfa753fdc2c5e9342727599b4550c282db4dd01c564019ba7e02c5116cd256abb99476087b78b085742ff649df7844f82b3efe88c74ea8ad SHA512 95e15aaade8230e877d46a7f7625d7ffaadf1273129e36255f43ca578ee3b878ab78fe39837ba7090f248830cd7bfa47de144ec13ed31f9677f7b65d270a66b0
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
deleted file mode 100644
index ec70849915ec..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/test-svcore-base.pro b/test-svcore-base.pro
-index 275cb58..636129c 100644
---- a/test-svcore-base.pro
-+++ b/test-svcore-base.pro
-@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
-index 7b53ca1..a2aa3ce 100644
---- a/test-svcore-data-fileio.pro
-+++ b/test-svcore-data-fileio.pro
-@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
-index 3b45ac0..d08b14e 100644
---- a/test-svcore-data-model.pro
-+++ b/test-svcore-data-model.pro
-@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-system.pro b/test-svcore-system.pro
-index 6ef7db7..685c1ba 100644
---- a/test-svcore-system.pro
-+++ b/test-svcore-system.pro
-@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
- 
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
--
--!win32* {
--    POST_TARGETDEPS += $$PWD/libbase.a
--    QMAKE_POST_LINK = ./$${TARGET}
--}
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
deleted file mode 100644
index 6daac7430022..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-
-  <mime-type type="application/x-sonicvisualiser">
-    <comment>Sonic Visualiser session file</comment>
-    <generic-icon name="sv-icon"/>
-    <glob pattern="*.sv"/>
-  </mime-type>
-
-  <mime-type type="application/x-sonicvisualiser-layer">
-    <comment>Sonic Visualiser layer file</comment>
-    <generic-icon name="sv-icon"/>
-    <glob pattern="*.svl"/>
-  </mime-type>
-
-</mime-info>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
deleted file mode 100644
index f76d06d4e8a5..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	dev-libs/serd
-	dev-libs/sord
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/rubberband
-	media-libs/speex
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libfishsound
-		media-libs/liboggz
-	)
-	opus? ( media-libs/opusfile )
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	mv icons/sv-icon.svg icons/${PN}.svg
-	doicon -s scalable icons/${PN}.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
index 743413b051ab..e1d71cfe2f6c 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index f9d0cbea8d1e..3ecc07df1911 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,8 @@
 DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
-DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
 DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
+DIST strawberry-0.9.1.tar.xz 9937164 BLAKE2B 64d988f3d5030a3145bc8310b4c44c12d075c584fbc4705af833953fe9dfe29ac2fe9a374ffd8a0494b58d3379e89cf8a9abf3a35de315b0dcce732c96071508 SHA512 6b8ef30e9e1d2349c02f254e775de4f0eed0f365c315e9471c7274e74ddb4e29b92e3da2a04d40df57450971f5656430ef94339cf246d0c1ed336963a9f9afe3
 EBUILD strawberry-0.8.3.ebuild 2879 BLAKE2B 2aafb75ee7415b165024983c825759f0355c2c0b86e0d3a8e308633ada9a9b9eae2209bb9bb0c554ea6e7469cc5b84d7c48012354b5c72bc13cac3c64f433267 SHA512 36fc1bf4ee4a8aa2d221cb7f402bf1fe4277544d792980d85489b5242540d48f843d10af0eb66b2acf61d3c6ebff43b3a5cbc4444ba05ea40e9d49a573e6994a
-EBUILD strawberry-0.8.4.ebuild 2881 BLAKE2B 2e02483874fb74f25f69cecf46982485edf74df2b8c8a95d88ab50471ddf47f0c2a2ed36c77bd80360c5da0798210325c3f1398333fcee0a293d7e6f90ba5269 SHA512 c1c9df0afc346e7da6c7c9b14290969449b9bb1de94ad7c83f9e66aace65f9d5cb23c46341b09126184710f462234482017fcca2e683aa087b16af0e45ffeab3
 EBUILD strawberry-0.8.5.ebuild 3045 BLAKE2B 0414e05ead58a2a571e074c79bf118d5377d205aa2eda08fe472360a51d4b61f601429a66891e4cfb24d069ca0a3ef8f6addaa836fada2de364881d7cb99d025 SHA512 07f79ac5c27140b1aa7c533d8d2ccebee62cb716dd77d9669dcc77afff718eb5d6ff84624de86e9ac12f4693a1e1621c0eab60ce056ed3d3d6f2074c9853d57c
-EBUILD strawberry-9999.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
+EBUILD strawberry-0.9.1.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
+EBUILD strawberry-9999.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.4.ebuild b/media-sound/strawberry/strawberry-0.8.4.ebuild
deleted file mode 100644
index 2e4b045125e9..000000000000
--- a/media-sound/strawberry/strawberry-0.8.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic l10n virtualx xdg
-
-PLOCALES="cs de es fr hu id it ko nb pl ru"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	media-video/vlc
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	rm -r 3rdparty/taglib || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/strawberry/strawberry-0.9.1.ebuild b/media-sound/strawberry/strawberry-0.9.1.ebuild
new file mode 100644
index 000000000000..3f39eabea722
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.9.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 0d5281b6b697..3f39eabea722 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -87,7 +87,6 @@ REQUIRED_USE="
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	rm -r 3rdparty/taglib || die
 	cmake_src_prepare
 }
 
@@ -107,7 +106,6 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DUSE_SYSTEM_TAGLIB=ON
 		-DWITH_QT6=OFF
 	)
 
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 855b78e15e3b..97e043843e63 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -4,4 +4,4 @@ AUX supercollider-3.11.2-fewer-qt-deps.patch 4450 BLAKE2B 4f5c4515f674925724cf07
 AUX supercollider-3.11.2-fix-libscsynth-linker-issue.patch 10461 BLAKE2B 1037589e0210d4ca86986a44c657539d2ffb6ca1684777b5bd38dfe3fdadfcd3d14df4d16a4af29643ca15647e96915e99866bb04626e8947ab38ae4d303225f SHA512 9cf9f96c91f267a9f1a4ab423731d87c808acee84c06a81f58821caffab433d099d198df85f1e3829e772d59028907eb65fec155c6e31fee010e2573084b5c7c
 DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
 EBUILD supercollider-3.11.2.ebuild 3301 BLAKE2B 43877f8cd9f24c2ca329ba98184d28f1669f2510bfcfb49b3793235892ca9400740ea6315c57337e88708e98c5ef305b3a855634b33088929d0e11afdf785b52 SHA512 0f65d31ac50f47065eecb63023cdf86f6444773748abb978c2ae3705745b0e5ed02e4ac49166d0c62f1057981c320d12615d86a49ce034e6ff1efddc5322ae94
-MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f
+MISC metadata.xml 1148 BLAKE2B 114ecf5056f717ccf4d9bf66c61db3e4bd22b725f9602686c2346cab2a7ab3ac34ab35eedcbb29da37a2914a4240066ca7d6a0e3ef79fad0204f145ff77fb436 SHA512 bafb63f94670f8712b62b1cf2ebbd76b9610a70e0a0556b00654f00764b6b5ed42560c5130089b54b588760d41aab6808168767d384d9c19dcb6d57d5b14b5c8
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 4fbc15376707..8f7751116ab4 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcan@marcan.st</email>
 		<name>Hector Martin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 45c1f013b9f8..60b20016198a 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta43.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
+DIST teamspeak-client-5.0.0_beta45_p2.tar.gz 117858975 BLAKE2B b9401b9953eed61aa310c805160c2680cfba96708dcdb9c46f1cb9c6cde1852a6542d4629318a9f3d1d98bde41aa8cff04369bee4e6ccc469d1e34fcafdcd3a6 SHA512 0e757e91c9baf5b4199603c3ed7e6e6d1ffd813eae4d149b42f952763778ffe3d15179db49a706458cbcf3bf90022af7338aeeed03154352e9e80dbc8799e120
 EBUILD teamspeak-client-3.5.6-r4.ebuild 3105 BLAKE2B 5be9bb40652e30ebf3975216fad766fc303200edad749fa087113d1aa16cf8b36812b7bb256b509c34528f8b1984d7ed2e4de99f4c25cae290bde5265cdc9e76 SHA512 8597838502d4792e2e2b6fa8281586aec7c763af9374f5ce928c8728d53a99dad3888229dc540e1df43678f81d6b78124c37176586b76e9f64202297210125da
-EBUILD teamspeak-client-5.0.0_beta43.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
+EBUILD teamspeak-client-5.0.0_beta45_p2.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta45_p2.ebuild
index c10184fe8264..c10184fe8264 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta45_p2.ebuild
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index 0ab04254396f..80721ca60a61 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -3,5 +3,5 @@ AUX tk707-0.8-glibc-2.27.patch 466 BLAKE2B 1fd4c37d9ef1992da969d69a225cac875494e
 AUX tk707-0.8-nostrip.patch 501 BLAKE2B d70bf604b68185c7397429058a77c9b8b2f9a24e0e6446ad40f05b59ca9f072f624b9a31777b476bde94dc16fdf27611379968ffbb85e88e06886e4d243c605c SHA512 bb652d71029a74c3b487e40aeb1dcac66333033235ad4cf60a4ce1e0c515728792528364c35fae0ae6b071e028173c0f42bf794fa36855be1e1531deb02e5915
 DIST tk707-0.8-updated_tcl2c.patch.gz 7368 BLAKE2B 733fc4d30462d347d1583378d9f32786f6f8aa974d4741cdf3b7f903eecbe43b9eb07815dd3bd6a1fdb4a3cfab893dbec10e386b3fee32f5ec9f22eebea62e94 SHA512 b64a0303ad338863591993696bec1e8ad89473d20be5c08b8935ff8f577684af03f9bed46f0873c4a6d7839cfab583b918d0113ab12341e3b662560385720736
 DIST tk707-0.8.tar.gz 404862 BLAKE2B e99879bf504c3be6c450e7352b8977c572333dae378cc1c4ef96854e263e454350986399c8be72aa03cf8f19cdb0a3c204394a60d1ee10dfcacc62322ebe82f2 SHA512 af5a6958d3ae3fe5e53be5251ba2b3038447b898a3ec40e866a7a0c4d025e450effee7adfc528f01a581b3f7186a269480a4cc6104378f5fdff46ebe277c44c6
-EBUILD tk707-0.8-r2.ebuild 861 BLAKE2B f17cb4bf5e185a597c57db2bd01ca3e21937fcba71147c2ec4001ba8e472797635235526837e4bb1d6f97fe2423ffb78a27b81d449b268ca1309c769de3deea8 SHA512 dd8deb44c237b30392e5696e8b74d12cf6db93f99f67e882b79ce661e9a7b08475092e3a94a00810fa23bae05e6db03b335259437b8da7833029b6d568081b9c
+EBUILD tk707-0.8-r2.ebuild 854 BLAKE2B 6bc59baae430d74f1d605a0e656f7bdf74827c18e698ff69e6d24684374e78546de8a3a70b93cf05910dd5a3ceb37e45c0af3b0bb26994c57f6e605312e864b9 SHA512 df12f461665d14b395b7a74088bd34b122aa9a206824437f91ed6cddd2e7215dbea3cbf3effe7954f925dce01a2c024c24d91a46ac8f8fe78618ed8204e05b3a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/tk707/tk707-0.8-r2.ebuild b/media-sound/tk707/tk707-0.8-r2.ebuild
index 03b31573728b..a8319e27411d 100644
--- a/media-sound/tk707/tk707-0.8-r2.ebuild
+++ b/media-sound/tk707/tk707-0.8-r2.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools desktop
 
-DESCRIPTION=" An 7x7 type midi drum sequencer for Linux"
-HOMEPAGE="http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
+DESCRIPTION="An 7x7 type midi drum sequencer for Linux"
+HOMEPAGE="https://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE=""
-
 RDEPEND="
 	>=media-libs/alsa-lib-0.9.0
 	>=dev-lang/tcl-8.4:0=
diff --git a/media-sound/wav2json/Manifest b/media-sound/wav2json/Manifest
index b74f4d9598b1..7f16e437f642 100644
--- a/media-sound/wav2json/Manifest
+++ b/media-sound/wav2json/Manifest
@@ -1,3 +1,3 @@
 DIST wav2json-0.4.tar.gz 742606 BLAKE2B 9a4bb2520bb0a69bfcca8437a77753dae43a4328af93ca48134e0371e69aeb683f6c6cd144d250346e07a9b3f3a445a01ab2de7da16b32a5a12f1959bb5a9d0e SHA512 0bfac4dbd5c2535616fcf09e00914eb06fbf042dab6e69133c9ad6494328ff0bcb849d694499946cc6e8e6ac6dc0f1c68ef462c0a264c93da2c2a7aaea4281a0
 EBUILD wav2json-0.4.ebuild 600 BLAKE2B e42bdcd05f1a04373af4d8534ac95b9ca70aa4abc4e7609af8aa73ddc9d13a9b6b5ee0ad37aa820fcf51fa980b95647aedfc0cc51dbe94b6d44353ea0a0e8de0 SHA512 b3e87fb2ee9a1d7156d0da56659cc150b890e27d42cba0cfbc589ef4f460cedfae644b601433bcac451a204c3a565ebc5702dcd1cfb361342092e2d28836f6a4
-MISC metadata.xml 469 BLAKE2B c21846987cda06400016faba553fc76894662900e77dc10119f0e693e3a47287a1f5513d9731e8c3215b2d945ebe479cc48ce8afd68143be74253754f9936060 SHA512 34afcff42365a507a3ff7079ddfa3d0d8935294313d3a9b12d61fe1813b3ad95fadbf35c3b0c63494ff64350bccf56a8f302036e4611c447c1aa0c92bcee3796
+MISC metadata.xml 499 BLAKE2B 5a52c6d2e030e79c6b92966121b9285ece9bd7c894d107191b6b1a808859b098e0465d80ce77e8c1162dd8088f04d18f056ce8f813c7ee939daf4c4c67cda816 SHA512 df0767c63522bc860d9c68f0fae792193976bed4f015c0611af5ae9c8618d42f1843f83f8f04c7c96bd3df9ef42391bfe7dce88f9ebd68b85f1cfda15ab1f08d
diff --git a/media-sound/wav2json/metadata.xml b/media-sound/wav2json/metadata.xml
index a78826423e1b..cf6bdace2b27 100644
--- a/media-sound/wav2json/metadata.xml
+++ b/media-sound/wav2json/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>pavel.a.denisov@gmail.com</email>
     <name>Pavel Denisov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 6c9be1f30292..8df865f2cecb 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,4 +1,4 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
 EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 62353cb598a64554b4df46fa462511a79935f4f52b788a1573169e92b97f5befdf36a50a62b2e3da3613685e17d33dfb997454477a0fcb6e281441ca206a379e SHA512 d8269d4dca43cbbaa5389b0bc3cebe90bca4520525bf7ee274dbccc2f0481dd0901e7880c81c44232511aa2e04783b12c43394d46bef65e0ed550421d3b7ed44
-MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
+MISC metadata.xml 574 BLAKE2B 6af7eae8e89d5522a54e3fd3de786b42e63b5c656b938edee4022f104c00bc2f8579145fbb71ad4d0bf285d09315145efffa372a92908fc656f4a5a0cf3afef3 SHA512 a42d696b9a6156aa69d94f3f60a520326c4dc250806e7670c33def7f80e7d233b97bdcc45ed947ba358cbae767d0d17c12b83966dfe96dcb703c07a0d90c072b
diff --git a/media-sound/whipper/metadata.xml b/media-sound/whipper/metadata.xml
index 46be9b4141ca..fa1e56e42fc8 100644
--- a/media-sound/whipper/metadata.xml
+++ b/media-sound/whipper/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@wizzup.org</email>
 		<name>Merlijn Wajer</name>
 		<description>Whipper project developer</description>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 92bef2684543..5f5a63e17924 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,3 +1,3 @@
 DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
 EBUILD wildmidi-0.4.3.ebuild 1322 BLAKE2B e5e32633203e7bf0ee7f2bbc5d618e05132e91415a07a48cd01b4b5c0719172d313808abb318c68cd625124c4a79e5578e27abe9c887e9b054dee581b0f600cb SHA512 99a54c4d0124caef134e9c8fff60d563e974db43bba0ae74476e9bc5cd0a37ea5e8276e8c91b54c2ecaa89b2e7f17e41bf46c192dd0d8cf98ecb4572cb5c1f2c
-MISC metadata.xml 584 BLAKE2B d15f9bff872c58f447fd538e2726b8a9219ee24567cde6c4abb7d986d19bb046d43db9a743820102ff4a2c8092def068462ca9601d012aff5aac5d9a6a06443a SHA512 f7a7380f326968b403a57071a7acfcfcf35a5e5744ca79585145e4e81beae2d4ec8bd2bc5cbd0d8a1c49d10cdf52dac272319c18e6e5b6c7a02dd46aaddf6da8
+MISC metadata.xml 614 BLAKE2B ff532f36af5f957e1acc46d35a7931984ad70f82d3557b5f516ee8a16ed8d5a7fb2f202243c437aed84cb951275c76d32a75107ba838969a96213f2be584ac26 SHA512 bc3725016c1386bfc5c1c1c8d3df9e17f92a16cde8603e88c0166dd6d802b82004a3545645f874092f5f1e045f8519c780d76e733af0c4484d93a118a25b5db7
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 17ff7e7576a6..58b37e0033e9 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
index d38b0a38dc55..46e826b0511a 100644
--- a/media-sound/xmms2-scrobbler/Manifest
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -4,5 +4,5 @@ AUX xmms2-scrobbler-0.4.0-ldflags.patch 685 BLAKE2B f3cf24b772c857cfbcd9c19e9836
 AUX xmms2-scrobbler-0.4.0-libs.patch 621 BLAKE2B 78ecc5b4bcf8e16607dfed56345ed8c47d29610a81fc47b3377b7c32dac2b3b76224921398efdf879444468ee723ac202259c3a7879496a857f9a29d340f9888 SHA512 7156685a51aa4283dbc584b04c0c68925a5720cb92c3dd1b7d4356336e946d2e162d17a5408e45eebaf9ec2878f77c162f3a540c225a0d27f5662c58edb2e407
 AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 BLAKE2B 33a3e91cce78e7f9c6c2cff237643b8aae57be6efda47a114c1059211ac66dbfa9d426c90b6b9bab45f27410df5501b32ad148b99344ad59ce6f87389cbbe3af SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09
 DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
-EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1296 BLAKE2B 5a8dc323dff6b45e5ede47cf3937efb19098a3bba0c40e4b9c9349825ba9020fbe438749dfdb6e6119004e446c3c732d9510f375c6f43d2056e2de2e277c86a5 SHA512 f8951d35f0366ac5f66226ea3b80ce77e2850e551c21b586860bfc7bed144c5f6fc75e781db8b436f9afa7b9b0fcbb097ec81bf66f85332d0304d62204649f74
+EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1298 BLAKE2B 60e15173cc17e6790455206cd5edde0f8cae04ba172ff4c8f58ab3fc124671351b8703b1eec973a69bff4573037be79582a9a403457220f849edcb07e202cfd2 SHA512 64078c2b5f2c0825aa6111c95bd9f1eebe7981bb7fc7a17f68f18704786c7f3f6211a7f89d663106376f7f82f724ad1641cb2865d5ab0871b21e337a033d0712
 MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
index 52966af24d73..365cdbe757ab 100644
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
+++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${EROOT}/usr" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
 	dodoc README AUTHORS
 }
 
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 6dc8af319c8e..a90c7606ad06 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/metadata.xml b/media-tv/metadata.xml
index 395509311a63..91a74b739c84 100644
--- a/media-tv/metadata.xml
+++ b/media-tv/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria media-tv zawiera programy związane z telewizją.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index ecb595fa1caf..065e79bf0466 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,4 +13,4 @@ DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56
 DIST mythtv-31.0_p20210225.tar.gz 102623768 BLAKE2B 560d3e08abb7bacbb58499a541f0d96a7b7813deb74d7e7692625dfdb09c5ec126e3f5fd014f7bd6c0640e52dd62b5bab87db40426deb9768d6de1d84b9c0d59 SHA512 832fab6d0094e43f0601485d5ca1249d95a8e293cd5bfe53208c482a43ff19396a435fa7c63c21f728fdc47fc55cb135eb766140f67ec60114965c83500e99e8
 EBUILD mythtv-31.0-r5.ebuild 12338 BLAKE2B 51da4268224542e713b2b8d5c7581c792a6809595461c12c9156fea5b06a70cca5b64a7fe721a049542e88c27b7036edcf635a0513cdcab65e31f0bc37cc2532 SHA512 22c9121e4c6a19f922ca5dc596c7172a5481ecb7ddd12fc910ba860b85a5fecf74dfddf925744a82b39e0b16181f700605296baf0c4a1e5277e2fb4a2b386418
 EBUILD mythtv-31.0_p20210225.ebuild 12445 BLAKE2B 0aace4c5922d58204ec859386608b0768c02716478078df7302aa57baa3a49da72f5cfee74697cf2b0b00a4a54c3b3ceb9cf1f4798bf5e74ff92397c68362fec SHA512 d1fb6ade3cd1e8cf12ada4d0bed0a6baff0acc6ff17e8056ce389f057a4114217893eaccdcaecf850a736732cd79e03afc35154718341072d7cb227a110c54c8
-MISC metadata.xml 2208 BLAKE2B ce791c95b02ccd293b326fa9463f35f3f6d48c53e7d44d2defbd8974e3d17795d2358b9258c5e7ddd2472dceb11b6ce3a991162694918086b3dea6f0d33be629 SHA512 86ae2e427699c268fd885ff16fec16912da42fe28556dcb8dd131af40e332f37b7b0d21bd3e6ec960aa4aaaf7660b8ca95ea132ea6c8a36c925d842283468846
+MISC metadata.xml 2238 BLAKE2B 24444a3132c3eec819a11a2994669f8fb758bb3f62c2605d9fc5ccd9fedf679f8a841322c1250eeed32d86acd0b79d1f186c754dca89f9d93e07ba2f9c7f1e86 SHA512 220828ae331a2d6bcc1b92e88d9bfa82ab714b8ba737099a0b6807c05ec8102878491d372b31cbdbb7fc5ded871dd7deb162a636e1fbe540e2dcab7d80000a36
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 0de2e5e50fa6..4c02c1840d54 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thebitpit@austincustomerrands.com</email>
 		<name>Wilson Michaels</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-tv/tvbrowser-bin/Manifest b/media-tv/tvbrowser-bin/Manifest
index 7b8c8420bb77..1343d0344daa 100644
--- a/media-tv/tvbrowser-bin/Manifest
+++ b/media-tv/tvbrowser-bin/Manifest
@@ -1,4 +1,4 @@
 AUX tvbrowser 937 BLAKE2B 1e004b137e2da73fca04881dc7650cd7f2cea9e6270da77c63b040393d6d9b3e5b077950e9c4adb2aabf5951a888c3921f76f076788c5ce33f70a9f7d3f33940 SHA512 1d92bf79356f65535f83c8d5ae5ebe6e75534cfe9a463b7ed7cd3ede24f1948d01cae53f5bbbf88ec7b627da46bd9ed630ccada5acab3f59ffbf400fbebeea64
 DIST tvbrowser-bin-4.2.2.tar.gz 5538847 BLAKE2B fff4bb1db00f4fca8688dbc83a63f2332d7b90f247916c68cfdd9f55c2e21cbabe16dabfb4782650f2c7abc1d0da7940cd29d2ded4a2225134ebbf06fdfdd5b3 SHA512 609558983f3bfa1410e3c6a83f2d0bcc4bdbdc297024c963234d19eef02bab20ae12f2ecf330a2f7f3bbf25450c62373d4d5ce14938e56c9a1d350604a08d048
 EBUILD tvbrowser-bin-4.2.2.ebuild 1011 BLAKE2B 027d87e4afe4f9a7d4f280d3335e295085afac6861d69389086c86fbe091c653f776ea27672b9064b0b60e3df8bbb2b04bf6bfe474a7f73ed9f601870909bb0b SHA512 5297b47ac48ee6b00c3f79e4e33343ab2c8dc72892f20b0c29cbc8a5f4ebfe32182c4d583c8b2205babffa1b527432cc84df651045851616a0c3892d18986e66
-MISC metadata.xml 456 BLAKE2B e07b1cdc49d2ba3db95d9e1a16ded9579e1bd78d39fe63569904b809c9d60dc6d3c50ec9944ed5137f085aa8db3be587732b54ba03e6b9195091ce834d650358 SHA512 d988ce2155df28e05b80f8900efa134a8d3434b82869d016e9649ea8dbbeb5efaf098b2f7009f7a52b4f1839b7a3b9745d7bd18fff8e645fbe4290a76becb4b1
+MISC metadata.xml 486 BLAKE2B bed66d57b19dcebb8b1bad066e9cfce1f0b242a35c7d9bb920627589082603ec07b6eedcedcb2986bf70b2a1132799bd40fa0565904dd466645627a940e6669b SHA512 31f8e31bd68a642c52864b2215d3816a0fd29c5ccc8b2941fcf2bd49662f6773bd7bd18403ebcf9fc0454235d8d34a3192e2864b007cf1fa2d84432598becd0d
diff --git a/media-tv/tvbrowser-bin/metadata.xml b/media-tv/tvbrowser-bin/metadata.xml
index e65cdcf0aee5..b21e89345667 100644
--- a/media-tv/tvbrowser-bin/metadata.xml
+++ b/media-tv/tvbrowser-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>h.judt@gmx.at</email>
     <name>Harald Judt</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
       <email>proxy-maint@gentoo.org</email>
       <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 1c1059654748..b81e7be4429c 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -5,4 +5,4 @@ AUX v4l-dvb-saa716x-up-to-4.4.patch 3627 BLAKE2B a33f468400d820911782428375fe634
 AUX v4l-dvb-saa716x-up-to-4.9.patch 7704 BLAKE2B 3798312ef3938f2f162164c9891c251745570bca69704316b366bfecab9b6cc6c6c1c853091636e348d4a9646d874528f67f25c755dc219492347006c6c3f443 SHA512 efac2cf501f4cf0f3831f88cba184ae3bab367c3426adedeec8ee0f0efd3f2921c8c1bd840a2e6a45058b8c5228459bf6c95be0efceeaa4c6f7705e752b0e898
 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2 4070134 BLAKE2B 2c03d11ecd1f527ad066b2b14fcd2539e50fd07cefe2060be1bce96fd932d9ae83529f65b658ac550886f0c1f2b69a64d910011c80746353ffaed062865f1d6f SHA512 2ffb2acf00818b61af37a557e3b95a96b129b34ef80d24084483adfa35c0bb853b0abb626dbbf68bd9aa443c7436034542666274246fd47a603642a8e75ec83e
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild 1765 BLAKE2B ae903e7aeb0cffb4007a30f5017b8d06c8f075cda96cf7a7997f255b6efa291bb4848ce296e28c5d405858ad80933d602e1a5664be42c5c1fa2f8fdbae42d272 SHA512 ce4a5dc9d7fb08f9fd042ca5154ee5dbcf0278d5ba507609b6c69ced0ef6b6ba56a78c4139f27df1f4b432fdf6666121d3e677f1ab8ed3ab01b5e0002981734e
-MISC metadata.xml 459 BLAKE2B 1d8433bb12454d60cb5a4bb5bf2edc5bdb2b4bd519d28138dc750bc8f021b742bc42dfa19b86305b3f7ab553cc95ef377a30c3400d33223e2189bd679a38bf85 SHA512 251f29b11dd2ec9ce4fd72cbf16986839dd8321902b1005ba922aad499dba61251dc41c2ae428442499a616d5844d3bd7b2af6d985966ae3a152dbce569b50ed
+MISC metadata.xml 489 BLAKE2B fed2919ea3e1a030829adeed981c384b813821c08369e7ae2a6a9d6447215a224e7332a303cd78231e6659e920794811b4cee97a39e560d607e9b2979f976ae2 SHA512 b0b054afbff660076621e9f6bcdb772384d4a522fd47d1b352edd21667803c6db1771110a451c006fca9625b84e1443edb091d4a8e4422d45e87ba04cd19fac0
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
index bbd5b755d9bd..e2b861c4d783 100644
--- a/media-tv/v4l-dvb-saa716x/metadata.xml
+++ b/media-tv/v4l-dvb-saa716x/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 316fc0b93ff8..00f3245171d5 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -2,4 +2,4 @@ DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5265 BLAKE2B d348aea253e6d6a9f9f23d462e5bfba6f0ab9bd0f71b41832583f87d6e81e3a3d655ebb3853a0dee48ab52d11967911870e22e81a9fdeede15cdfc37f82c91d9 SHA512 d3504aaa69166138922e3a955cf1e549739a4667fb680c34bc523f3e0958a37ec76e3d6bd28cea0be93eb253d16fed904af148680e189c55850d3c033f7b99bc
 EBUILD xmltv-0.6.1.ebuild 5931 BLAKE2B a1db08d09698f7f735f9041676101b7910b5861205be317fe0271218bf791e1195625456e9cfd920f5c86873bc886f58cf827cd2abd4d2817af917e56ee8f67e SHA512 3f7c0700591f99fbbbf338354d8657ea1ce71e27ced12848c2c6a5edc2b310bc3e7c1d7ba89d7e40042e396df65c4f7f85ffaa3bca32a8cafe07e35077e4e9df
-MISC metadata.xml 2686 BLAKE2B 20ece7bd3a0654f3d4010a700a3416fc7fd1a9eaf03adf8bfbe61c317a230a558071690906889bb6f9a6be1e7492dca011bb5a091da90fbfc115826628bcbd5f SHA512 52c7b95cd06948c5220f9edf9a48678ddd5ee0c3e819c01ea8cae1fd9f67e2654b264585c969c60f0bcad9891ded36968a86839a9ffe01ccb87833b998a2a1f1
+MISC metadata.xml 2715 BLAKE2B 217df2efea127bf288238afaffc6ce3ba08db1afeafbc84f01625b373bd09cb002f96c47d44d1f6c434ee60a200e262b913b561e0a81376dbd1a777bbe32f090 SHA512 6ae132d5075564c7d32d2230e0b6a029723266507ec9db2b7c756986421753f8ee8519fd0cf0b754250842563a91dc28d284a82ffc930c04c64d141b8e0fedf5
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 0a5d27cb0548..56cd4daa47de 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thebitpit@austincustomerrands.com</email>
 		<name>Wilson Michaels</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -49,4 +49,3 @@
 		<remote-id type="github">XMLTV/xmltv</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 27d7ef5c2a9d..ef8592de8c46 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index b4753125278f..89b368018875 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -5,4 +5,4 @@ DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab775
 EBUILD baka-mplayer-2.0.4-r1.ebuild 1393 BLAKE2B ba613bc4a7a2739f6ab9dba43865f8dc8f002809eb9058339f2659c32a1f6f37ed4fc10174dfec7662d50577aef27ff1779037cda3e6abeca787cc20c07e1e5b SHA512 0b06a8ccfb022400166c77fde48f8114f4d7a53adeb9916e4508b8dd90e7e3eb927e3e3303fd18dc0de6ef369fe1cac7814b3d72c1ffc2a0debf042a1d3d323d
 EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
 EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
-MISC metadata.xml 710 BLAKE2B 14de96f0e5bc84ecbd15d2d0518e6332fdf022a850464a1e56eb1338384ebe7eafb1d1ac016779eb95717b03331c6c9eb2592b7db5efe9ab9202c33a07db3e42 SHA512 17f1484753f6610e64013d76077e0963a6475861aec91af9f3b16638d49886038c8d40852eabc6eacf6a9f0429d5290700d9a19e1e69ff63049fe8fe50131a30
+MISC metadata.xml 740 BLAKE2B 28d3dac3e8ff89a4076a5810830c53814b32c265c05e4ed1f17b5e01d5667c78d612e56e08258ab362a965a1e467ea3668f9f85d0bbeaa8ae07c34a0e7ddc9d4 SHA512 8d8e0382163d0ceb048292651b7a53f805138564f1650363bd56b564507fbb3c47319d1f16115f2d2fd6661fe3df90ff667848c8b26bf137943c915f60c09c61
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index 0e74b241272f..f393f0b7ba3b 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>cstew764@gmail.com</email>
     <name>Christopher Steward</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>media-video@gentoo.org</email>
     <name>Gentoo Video project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index a5911fa7ea76..a60bd7050950 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,8 @@
 AUX cheese-3.34.0-buildfix.patch 736 BLAKE2B b99354dd49acb32201ddcdd104b0581e2a61248053017859ea2f0b20b2a66a4f5bfb5d5a26e458464b9a18ae0e8a8e7bfe801d2cc9758331a5a2ba28aad4a78c SHA512 0a6373485cd07398ac5dca0ed1431ee2ed7b174bb55ee45a839775cb229bfbb223897be2590e238487eb3971fde0d9bbc5c85194239e8ff03d84742f0071acff
 AUX cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch 6545 BLAKE2B 6bd549dc4a26dc4cd1f14b812d4910fb93b19e899a58c6c1e4cd713bc126c059d2f1d148f9e5d3581cf64a8c4f3ea938e684e85535d774fd8861bd87cd93df3c SHA512 6f8f66897252172b68508ded5996213e4660ec00b5172874e0b360ee1c60baf2e579f88998dd78c850d4eb6796a097f74646c28f923f7f11de9302f2dd8023b7
+AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
 DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
+DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
 EBUILD cheese-3.34.0-r1.ebuild 2152 BLAKE2B 2104d16b5408457dc4e2c9ea3f48cbccb5e753383ebf20e89c662162a4028ac75c798ee3988816cef6467e71f01042a3778d40cf6a803cca75e574396702ee56 SHA512 d579bb91cedcc2e11c143b0fffeb1ed11b597c8644e08d25d19342ae3b1a5842710e672c76a5ec53cbed992ea51f4853de33d04f45fb305eb1d5f4e0dd331c46
+EBUILD cheese-3.38.0.ebuild 2095 BLAKE2B 8caa33b4191ab34ce9a7c7b0e5c9a54ec70c130fce2ace9c59e4b0e9c8b83ee800d111bb816b97eeae8d004d003846bcedf4e3ae23f7e09b4e2437e34e96cc10 SHA512 81a56fcfd18e2a39afb94dae8a6dffec3b88386d6dc1b54a712843be744012373a672a190cf60e11c137ffa9405a34b89a74d15474515aa666d71696226b14e6
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
new file mode 100644
index 000000000000..c12f4984c2fb
--- /dev/null
+++ b/media-video/cheese/cheese-3.38.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	media-libs/clutter-gst:3.0
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	>=dev-libs/glib-2.39.90:2
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=x11-libs/gtk+-3.13.4:3
+	>=media-libs/libcanberra-0.26[gtk3]
+	x11-libs/libX11
+	sys-apps/dbus
+	media-video/gnome-video-effects
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+
+	media-libs/cogl:1.0=[introspection?]
+
+"
+RDEPEND="${DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.3
+	dev-util/itstool
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( x11-libs/libXtst )
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-buildfix.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use test tests)
+		-Dman=true
+	)
+
+	meson_src_configure
+
+	# Hack: version.xml is not generated if gtk-doc is not enabled
+	echo ${PV} > docs/reference/version.xml
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-video/cheese/files/cheese-3.38.0-buildfix.patch b/media-video/cheese/files/cheese-3.38.0-buildfix.patch
new file mode 100644
index 000000000000..a7d685e68628
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-buildfix.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 7ef4075f..36638472 100644
+--- a/meson.build
++++ b/meson.build
+@@ -149,11 +149,7 @@ gnome_video_effects_dep = dependency(
+ # Recommend some runtime GStreamer plugins.
+ gst_inspect = find_program('gst-inspect-1.0', required: false)
+ if gst_inspect.found()
+-  foreach plugin: ['camerabin', 'vp8enc', 'webmmux']
+-    if run_command(gst_inspect, plugin).returncode() != 0
+-      warning(plugin + ' was not found. It needs to be installed before Cheese is run')
+-    endif
+-  endforeach
++  warning('unable to check for runtime GStreamer plugin dependencies due to Gentoo\'s sandbox: camerabin, vp8enc, webmmux')
+ else
+   warning('unable to check for runtime GStreamer plugin dependencies')
+ endif
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 4af028c88885..9427b1081341 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -5,4 +5,4 @@ DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedf
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
 EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2009 BLAKE2B d9ce1ed905ce9dc958c0ffd2842d2b446458775845500a7e52c6b9da8c41048b5507cf8f29dbed00c1339f0d3bf1e21bea17ec7eaf3792d89768faeaa215d852 SHA512 1b4a552c18c4d64a794e3376457bb529265cb7344b4f82b400fce80cb3f4c7b20bbcfa92207ae0a76d3e59f8d0fa0769c626a88042c6af2222918e46a50591a3
-MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
+MISC metadata.xml 2286 BLAKE2B d731cd148e5f11d3128b94f0b1c7b08575bba8904d41a4a1ce92948f52a68bc5c6274cd707dc70bc071897e320bbf0c75bb5fabcdfd66575a8bd518309b43236 SHA512 97829259b665317f51cee00190c341765d0fc4fad72af7ce3e652a661bb6e79cc09d4eb85402d43e2ea51b29bdc2c9e60b650e249a1603d9af8d0cf41a68cc28
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 84064cda7423..8f113844a555 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/gnome-video-effects/Manifest b/media-video/gnome-video-effects/Manifest
index dcd0972a755c..6af2f73288f4 100644
--- a/media-video/gnome-video-effects/Manifest
+++ b/media-video/gnome-video-effects/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-video-effects-0.4.3.tar.xz 142100 BLAKE2B 5541c38dffd17cd8cc1ae1a87b7dba13051fe18466a422aaef7918b0f8a0145f39d15c68bd40338a157c51111c4bdfa06897da8c80ce1a318aa6a66b719ff278 SHA512 5cf708f7deea4edd5d80cd838a78a7b539cb87504f55bfda1686bbe0136ee0eba20885ab8cd2a880ad0c825bf5ca972b0f612a579016eace736b790d7bdd10d3
+DIST gnome-video-effects-0.5.0.tar.xz 85424 BLAKE2B 6c3aad12bd3f7c00a0f800d62df0144a4ca1318dbcb771f038f83fd82e252ba79aba379f57dd259c41dac3ba197dd98f52b944b018e39a419bb48b77e3a1d475 SHA512 48d68984913e6732a097b4f235671ecb3442945ec843accfae4b4526ecd27641831a847ea193ac1e13a452700c4a76fa15fa84c2293cbaf7b1b2f4d1b85487ce
 EBUILD gnome-video-effects-0.4.3.ebuild 522 BLAKE2B 28bf55ed9f3ee1ca320febdb5c11510ba87b4727fef61f299df4eeb9de8f73e95e73718d2b4e705cc097d8298dabbf477efa1255825734de4004d731fac18337 SHA512 802caf5e48866f3c105f932fd3e1b2c2ed8c9142df251f17c2046da684052fa5e2087ac957fd95be83ed45632c8526f97d0b23dcab74b6d138354d2fa8b76069
+EBUILD gnome-video-effects-0.5.0.ebuild 527 BLAKE2B 9f7a8ca66ee85d9f9a43eee744bbf022466911992910f302fafaf906007ae9a32cc8a989ec34e6d19be29232310246fcd8bf5ace08a7c623b80ee17be8d1377f SHA512 b78a3272342b88d436e992479625b8c097b21ab0c4993977a1e2b85bc2c12f64847110c66a99f771d18ca6e84bf89b2c04e9cb5ba310a48ee0ab3b062de6a57f
 MISC metadata.xml 488 BLAKE2B 202c977557ebfa4dd1d9da6c558c1094758a403396d255c8aaafc62f746aa42b650ec597a7f5ef1cf3507cedd6bf4dce2f109e4da02a4906e451fbc73b4a3462 SHA512 db1e3250d928428f492fca5e87c5824d7cf8e19746e433292faa19544ba89c043f046305c650c5c18e6d94fb429ff5f4e634dd5c0609d8c6aead26e3ec9d50ec
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
new file mode 100644
index 000000000000..e033177c23fd
--- /dev/null
+++ b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson
+
+DESCRIPTION="Effects for Cheese, the webcam video and picture application"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c7dfd1fcb9b2..c5bac7e92058 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -12,4 +12,4 @@ EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4f
 EBUILD libva-utils-2.9.1-r1.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
 EBUILD libva-utils-9999.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
-MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
+MISC metadata.xml 414 BLAKE2B 172a3ddb5fec4b701f6f0fdf1c99ec916312151513e3505a6b37087204283040cffaced290a092f6ce71e8e499a134c882754b011a2dce2e9195f74d8b3eab4c SHA512 180a80f82f063806dac28be27bedc9d968ac74134e4c63a45a11b94db8cbd531971530844d1988f1fa1d4e389fa40bfdc8ce0c65109ae8f64accf9e5a607970a
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
index 6a47b632dfe2..8d6b2fa413db 100644
--- a/media-video/libva-utils/metadata.xml
+++ b/media-video/libva-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-video/metadata.xml b/media-video/metadata.xml
index 21e3aff12af5..c4c6f8c06838 100644
--- a/media-video/metadata.xml
+++ b/media-video/metadata.xml
@@ -33,4 +33,3 @@
 		przetwarzaniem filmów.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index d84202b46d9f..1f1275018f1e 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,5 +2,7 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
+DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
 EBUILD mjpegtools-2.1.0-r4.ebuild 2850 BLAKE2B 5ed1abde176b50de2e0484a0f89e88fd70703a8861b072cf8b487505faff0aba9ff7e33320e81df8ecc7387d6e1114d81ebf54e2e64cf559a3d825c5ed682c91 SHA512 6f626cc2e4d1f060ec1d64699a98ee52766a18f29a78c8859e96162518e4c1ab76e347b6ffb81153faff8b4063c16e48377ef260c5838bc5fd99943a5db887e8
+EBUILD mjpegtools-2.2.0.ebuild 2607 BLAKE2B cd21aa87e5057ee795e5e3ff7c80f42de5971a2bdc24129488777726e9c691bbe8edf1f7f7cb19885ce037169efd906ef1a0345109d14acf9d106bf29b4414a9 SHA512 b4842643215afc3cfccd8c565be62bc23f5464631a70e2fc7ec13603d8a380daf708474f93b0d32d8b08febd5fe644417280ca09fce52638b24ce169f3858cc1
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
new file mode 100644
index 000000000000..9dd316d8a9c1
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+	sdl? (
+		>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/awk
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--enable-compile-warnings
+		$(use_enable cpu_flags_x86_mmx simd-accel)
+		$(use_enable static-libs static)
+		--enable-largefile
+
+		$(use_with quicktime libquicktime)
+		$(use_with dv libdv)
+		$(use_with sdl libsdl)
+		--without-v4l
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index c91b9b492eef..3684c5d840c1 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -4,4 +4,4 @@ AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb
 AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8
 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332
 EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1895 BLAKE2B f78c80d7b4b94b4d91082f7a332d11dde3f6b994f30d0c1f1d704a80d725f3231a4fe492f5e69a40baa71ee1b1de638d65d4fb73dd9d77b2ccfcd98db5d220ea SHA512 6ada19dc511b45b5a565cdbcc9651269e559b70007663062531e6892e8b3b08bd306b13e4b3b72506a609a985dfe10814d01f52a887feae833ebd996e55033cf
-MISC metadata.xml 1709 BLAKE2B e68108cfd6fba5555d3834c00c6a43493fb278b499102da1432c78af65baea7c81084258d0ad7b562b563edc9018c862fd099c397ee7d97377eccb4e14f0b293 SHA512 df182d8bf1ea185956bd63b6e0bca6edddd279d515beb9745013c4f9be4130a49feeae3ff5f5a0fbfa5ef834f1d0869ddeb852efb22487c68167d720f662e0d5
+MISC metadata.xml 1739 BLAKE2B eb540aa61dc989023ab95953685d26a490919bc1faf9a4a3a144d47a9ff7b2947613114008365aec1f78163dd556be8251fc7532bb7d8ea17691ba1ba166531b SHA512 6efd0e69791aa856af7c404f380887a1936709bec939b2dd5b6082dd3f02519797070fee34a10e22072d630dfd4293bcb6a8d8b1b8c677b40009ef309cc7e6f1
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index 65cd83e8d96f..2e4cb6515fd8 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrzej.pauli@gmail.com</email>
 		<name>Andrzej Pauli</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 32e3f5a45dae..8f5c995d563f 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -7,4 +7,4 @@ DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
 EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
 EBUILD motion-4.3.2.ebuild 2234 BLAKE2B 7adc8b1b4b3b552fd80a5580bd2baa2969f28cd0d5df6712ca93836a362c085b12e6d6baa1af478adba2039f35ba21200a365ae27b6e41a0444f463791e39678 SHA512 c94be53b5ea1f5511b6dbd57f3bf815ed8e5a3e46c04f4b21d76683fcc95e34c14e2e296fb0e8310c9c90608681512330a77d5d7ad632a0d250c9ce2c4fb8026
-MISC metadata.xml 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
+MISC metadata.xml 880 BLAKE2B eb7167f5b1c6cea244e553aad747ad114c46e1f8dad0d26c271afb7630ef88bea28e824c454913dc5a1f56e80ecba1ff7b518384eff503e06c18fa02ea80b13f SHA512 b44ede0bcef1053fb097cdb8f243ad8d9e17ee2ba627ceb1ca31a360b8d22f58d5fe43a81d0c81494916698f8c448d1254299c5358cef977405396846cda7320
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index 301a7616abbe..45dcbfba21ef 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
index f86b6c689da6..e119c08dd2aa 100644
--- a/media-video/nvidia-video-codec/Manifest
+++ b/media-video/nvidia-video-codec/Manifest
@@ -6,4 +6,4 @@ EBUILD nvidia-video-codec-7.0.1.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193
 EBUILD nvidia-video-codec-7.1.9.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-8.0.14.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-8.2.16.ebuild 540 BLAKE2B 06180170f102cf9c52d0774a25d06fe61401671184128990f5f6613c0e907042761c04c7d63980025e97c25a492c345a1bdf37a6ae6805c92120ef29bb03f87d SHA512 30bd0dddfc3f1bf76c863fdc5140179e44d6c2f0bc5faa2ebfe0e5c3d8705813a8f819cbb8af4b063533e68c80a1b0dc674e32f7fed32084510ac9213530985f
-MISC metadata.xml 322 BLAKE2B 631129a38bbe26c8289d032210c2df0d0dd8160aefd5f05fb8da83c9a9fe8bd0e1916dbeaae883389869eae1b3420902c355c0ab473624f0756f29daa72009d2 SHA512 605ce8c99fd9be9627fd9b3afd491df585b9e5aff955af1964fb51482c4fa0b18e8047cc3715be2977bad4ace03cfe0330eed44fdaa5267feb9c2840cd233870
+MISC metadata.xml 322 BLAKE2B eb47d9c5747b6e4880382844ff80388be6cd2f49c88406597b28d8020e49664ed4f51f4d46b24679cc4f528add21527dbcd84c06a3b1a0f0e050b9e92cb04ebe SHA512 eb6171b463e5e804f6f9f6049dac0fc7c2cb9514e20ff8fe4ac9153630858dd81bb4690062cc2b086d2ac1982817e71f6d08d8e1fb085c69bc728ace38f3dc32
diff --git a/media-video/nvidia-video-codec/metadata.xml b/media-video/nvidia-video-codec/metadata.xml
index 004fbed2edda..bc50d99929fa 100644
--- a/media-video/nvidia-video-codec/metadata.xml
+++ b/media-video/nvidia-video-codec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 6a26d7fb6d37..37abc9e28669 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,7 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20210130.tar.gz 64770353 BLAKE2B 4d7e25a6b8e174051fb0f1ef4bef8a118ac75084ff4a24fce1fdb86975ae87b23f92dc29202fe180c862ea1df3a1b47ef799757f6fb87f7d985a78a64f0a66cb SHA512 9881a099448fc94d413c0d8dab8b31952c6cea09723e56e55ce9b45453e6783cc9aab8c157704c48974a1cb502ff7d6d93b2b3cb08a60fcf05a85ab8ddfc3871
+DIST openshot-2.5.1_p20210228.tar.gz 64780534 BLAKE2B c31bd2531df28ce9bed688fbc34dc383018024ffe9364699e45c08135f5c0692d97f601bc578ba07fd44e2f8f58f0b27c5bc10bb3af48c8cf0be17a45b966116 SHA512 b5ce39d31bc1b997d272b3817ccdcef4749126755e329a278700f6735a1484b0c2b917e04a5f1b9826ee0e5ea983a624be59af16bf79f038be44a29763cc68b5
 EBUILD openshot-2.4.4-r1.ebuild 1261 BLAKE2B b8fa7aba6fd7e2ee2dd23be0f08e4faa9fa6aa9d531069a7393fae570efd32d506da8ccf6a6743271356ce3e5b3af8dc274d2303b1c3eb8137d89eeb97993d95 SHA512 6653f3d0348a53acf3cedda9e53e0676d8e847ee3f63ae99082b174dad86779061e93778ae76b28071d1a6d0af0a5ff4bc70d89e9dcb8d09fff637f20c5447fa
 EBUILD openshot-2.5.1.ebuild 1240 BLAKE2B 733ca99178900d80d546c1c31674c61360e1726bdbd853bf2c4c26001a2880d318c14b1926a429773a9a6d438bea9a29c74c264e8e87c1057fd1e72549cbfd39 SHA512 6205921cd13f18a42124d413517bfa61708896404710012a6aa4d2f88eb710651eed0fb71ac7bae93310c9b2cbb999c77588f9064fb6b9ddf8e797dbce9019ea
-EBUILD openshot-2.5.1_p20210130.ebuild 1335 BLAKE2B 5840043488e70ecd343dbce4d1bfd3b6a498d7e55b50983d40d7dfc01bd474d0d911e0199411a679f7630cb36f4c0929e0f8d8c5e05c96bf3f845467e5b7f8a9 SHA512 e744ae23ff87e3a86b2f2d8b116f444273f0f52cc8c5a4f1105656ca48e98a6725c901586394a5f5005df5d02bcaac5a65ca2353b0fb56bd03bbff8b99626e57
+EBUILD openshot-2.5.1_p20210228.ebuild 1335 BLAKE2B fa1de51206b4c92add5075a218df9b5efba55bfd392c1c1f3593b2eca0103f60d2a0aee659452a26db6da305202e584a11c7240d5a606758f4c2fbce08443c9f SHA512 9de80c57c34ab236d24cfef7b1afb24f4f7aee5b5d9c9ed14c751b9e97e116dd283bca0c0d675781cb5efbc7b01c0873ab0685320d16f16072a11c07b051290f
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1_p20210130.ebuild b/media-video/openshot/openshot-2.5.1_p20210130.ebuild
deleted file mode 100644
index b3e91e5b060e..000000000000
--- a/media-video/openshot/openshot-2.5.1_p20210130.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-COMMIT=14ecc519d8390d6fa76cdc03e0d79a0fb5ca12a7
-MY_PN="${PN}-qt"
-inherit distutils-r1 xdg
-
-DESCRIPTION="Award-winning free and open-source video editor"
-HOMEPAGE="https://openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="1"
-# KEYWORDS="~amd64 ~x86"
-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}]
-	')
-	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-2.5.1_p20210228.ebuild b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
new file mode 100644
index 000000000000..7eb405299fe5
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+COMMIT=146189dc050a9462f71a8b37e783aa52b73e4d9b
+MY_PN="${PN}-qt"
+inherit distutils-r1 xdg
+
+DESCRIPTION="Award-winning free and open-source video editor"
+HOMEPAGE="https://openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="1"
+# KEYWORDS="~amd64 ~x86"
+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}]
+	')
+	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index 10b9ae23fcb3..4abeb28522ed 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,3 +1,3 @@
 DIST orion-1.6.7.tar.gz 644899 BLAKE2B 7aa188bc5eaf1f1781735416152a9324a2945f10b2c1ccd55fa5a2b557c31e4bdad55d282c4efc0552dbf998db7193bc19ec0679034ec53cbd97f688b572f74c SHA512 dc4c4d364423cae52f95c4ad2d241e311d6947066c2a7b02b5754df2b69a7bb7aeed54d4515afe31b4437b8e47057e939e9444e7812ca0125ba3a8c65678d3d0
 EBUILD orion-1.6.7.ebuild 1048 BLAKE2B 3e3078f2d55514ac96928d982697e9b7e342709e242f6cd1d0ed3e4659878fa31d7169141468189c039e030dc26d3880986d6b43917bb5578151a2f01a8a69fd SHA512 11c13933d6598b859c6945285eba8e8adf4f1248bd6ca1d7e5e3b2fcbc6517e949b17e747f554993e2450b0b23232633c85be9a408d09f2cb0f6c4dba2590803
-MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
+MISC metadata.xml 574 BLAKE2B 494aba77b88c66e35f0fc59e2a188f15f50d678dcb155bdedd2590d44a2732ebd4554fdd483797ba316fdda3d4e25c1eceef4b0f2a2ad597c36e6d8d899d5dc4 SHA512 260fa2ae47d8d2bce4e6355d42ccf077ed10855c500eb8048fa6fc9b484260a53652d8432a3a9d5b3c1342c21915249e8807fb9594db85ad81d68bf4d259ab05
diff --git a/media-video/orion/metadata.xml b/media-video/orion/metadata.xml
index 9c91e6887c8b..6c00b2de8dd7 100644
--- a/media-video/orion/metadata.xml
+++ b/media-video/orion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 461d4183b54a..3ebfeb79463f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,5 @@
 DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
-DIST pipewire-0.3.20.tar.gz 1228482 BLAKE2B d5c51a7da984b075d4fd2504ecc2082527807a6319a42c44b09a687112c2ba10746a2554997e8f6fa36a06cdf5b94b4099adb1f8ee986673855db6e8e0356468 SHA512 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c
-DIST pipewire-0.3.21.tar.gz 1243935 BLAKE2B b736a0253e8c0af96f7bdc47684d52bc8e70d4b2310b80a1b036ae3ef30fd042e1ad641aae342f9727b3191a38cfd36794879bf54954124b99984e2841aa7373 SHA512 cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
 EBUILD pipewire-0.3.18.ebuild 3423 BLAKE2B a17234221cb84d36eab89a48f3dfe13a910bc02c67de3ab9462ad081d115922c53928cb0896393b7ff78a99447f588fbc9a31033e6048bbfb09a204ffb8d514b SHA512 1931d14b75e0e99ef4b7ff0d661a942dab3d8d9cb90e8dc6f5d723ece66824906c474aa40af6f03ab751db0356d9a36e336ad3b1aeece6bdd38276355f0b1d1d
-EBUILD pipewire-0.3.20.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.21.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.22.ebuild 3181 BLAKE2B 8e6cc3c81e908aebf9636f292dbd839c4ebe24c21b078ec28bdcd24aa5eead5e75e44e777af5716177c5dd685d4bc509ff230ce0070cd8904932a09426a164d2 SHA512 089d797a420d92a796cd9be7edc28854c43f8ddfde5466ba241bad7ffb19ecad0042e700d4264ced9b82566078b9b4d0a4136405570821b2e5c6af31f161cd67
+EBUILD pipewire-0.3.22.ebuild 3180 BLAKE2B a2c337f799010c37734af0fedd47eed02717e268c5cb2915516dc291f3d07dc70a9b97c868d1e124182fb8a27b20be7652461538e729ceda04da991e7c559ccb SHA512 732ff816b1ddaa2553c7b3d87938b38d17c10e66e0fff8674736d8e5175a4db8bf1002a12b962210bbfe8d71bd54064c17e1a4bc9e53c8b1ceb611d054855248
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.20.ebuild b/media-video/pipewire/pipewire-0.3.20.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.20.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.21.ebuild b/media-video/pipewire/pipewire-0.3.21.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.21.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.22.ebuild b/media-video/pipewire/pipewire-0.3.22.ebuild
index fdf60d2768fe..ca830f18aed3 100644
--- a/media-video/pipewire/pipewire-0.3.22.ebuild
+++ b/media-video/pipewire/pipewire-0.3.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index dea3ec38f00c..d3d402db390f 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,8 +1,4 @@
-DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6
 DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314
-DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
-EBUILD qmplay2-19.12.19-r2.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-EBUILD qmplay2-20.05.02.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 EBUILD qmplay2-20.07.04.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 EBUILD qmplay2-9999.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
-MISC metadata.xml 1822 BLAKE2B d6c18ae3653d2a809609ed350c20796a690ecb69e5f3b9b06d134524596379f8ebfb565b22c584a3fccff153b0771ede17d67c91d029f6e26668ba91e0ee5d79 SHA512 5ed1acf242b8e02dd3f31564000b13dc91c9c25f750ba6f93a296e5fa9c83b48a0a6c92f868a5b088187870af8b3c345ab0c79935e8afcea7f86125ceed80afc
+MISC metadata.xml 1547 BLAKE2B bec5bcc60b7dc19bc1f0c9fbfdf86d7a62fcd5312fa8a5505727b38dce7be1d8fb909995555625373d4fb3ba3ea2019eed841113efdf904e8af46dfdbe5ff709 SHA512 c00d0c95211535d067c5f8ffe59b72e8c652f2194baf7178addfb5de76a051619a7b9983a0c175b393afb3a56e7c30f722abd29767ea7c587cfd0ad7733871bc
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
index 0a9ff717a2af..dd91b14c1c27 100644
--- a/media-video/qmplay2/metadata.xml
+++ b/media-video/qmplay2/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -19,17 +19,12 @@
 	<use>
 		<flag name="audiofilters">Build with AudioFilters module</flag>
 		<flag name="avdevice">Build FFmpeg module with libavdevice suport</flag>
-		<flag name="avresample">Use libavresample instead of libswresample</flag>
 		<flag name="cdio">Build with AudioCD module</flag>
 		<flag name="cuvid">Build with CUVID module</flag>
 		<flag name="extensions">Build with Extensions module and enable other plugins</flag>
 		<flag name="gme">Build Chiptune with GME support</flag>
 		<flag name="inputs">Build with Inputs module</flag>
-		<flag name="lastfm">Build with LastFM support</flag>
 		<flag name="libass">Build with SSA/ASS subtitles rendering support</flag>
-		<flag name="lyrics">Build with lyrics support</flag>
-		<flag name="mediabrowser">Build with MediaBrowser support</flag>
-		<flag name="mpris2">Build Extensions with MPRIS2 support</flag>
 		<flag name="notifications">Build additional notifications module</flag>
 		<flag name="sid">Build Chiptune with SIDPLAY support</flag>
 		<flag name="shaders">Compile Vulkan shaders using <pkg>media-libs/shaderc</pkg></flag>
diff --git a/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild b/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild
deleted file mode 100644
index 62cc3038bdd2..000000000000
--- a/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/QMPlay2-${PV}"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions
-	+ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2
-	notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau
-	+videofilters visualizations xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa portaudio pulseaudio ) )
-	avdevice? ( ffmpeg )
-	avresample? ( ffmpeg )
-	lastfm? ( extensions )
-	lyrics? ( extensions )
-	mediabrowser? ( extensions )
-	mpris2? ( extensions dbus )
-	vaapi? ( ffmpeg opengl )
-	vdpau? ( ffmpeg )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dbus? ( dev-qt/qtdbus:5 )
-	ffmpeg? ( media-video/ffmpeg )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	mediabrowser? ( dev-qt/qtdeclarative:5 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplayfp )
-	svg? ( dev-qt/qtsvg:5 )
-	taglib? ( media-libs/taglib )
-	vaapi? (
-		>=media-video/ffmpeg-4.1.0[vaapi]
-		x11-libs/libva[drm,opengl] )
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	xv? ( x11-libs/libXv )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_AVRESAMPLE=$(usex avresample)
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL2=$(usex opengl)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_EXTENSIONS=$(usex extensions)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# gui
-		-DUSE_TAGLIB=$(usex taglib)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# extensions
-		-DUSE_LASTFM=$(usex lastfm)
-		-DUSE_LYRICS=$(usex lyrics)
-		-DUSE_MEDIABROWSER=$(usex mediabrowser)
-		-DUSE_MPRIS2=$(usex mpris2)
-	)
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( USE_GIT_VERSION=ON )
-	else
-		mycmakeargs+=( USE_GIT_VERSION=OFF )
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/qmplay2/qmplay2-20.05.02.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild
deleted file mode 100644
index 264d28c79f26..000000000000
--- a/media-video/qmplay2/qmplay2-20.05.02.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
-	gme inputs libass modplug notifications opengl portaudio
-	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa portaudio pulseaudio ) )
-	extensions? ( dbus )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	dbus? ( dev-qt/qtdbus:5 )
-	extensions? (
-		dev-qt/qtdeclarative:5
-		media-libs/taglib
-	)
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		x11-libs/libva[drm,opengl]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-		-DUSE_TAGLIB=$(usex extensions)
-		-DUSE_LASTFM=$(usex extensions)
-		-DUSE_LYRICS=$(usex extensions)
-		-DUSE_MEDIABROWSER=$(usex extensions)
-		-DUSE_MPRIS2=$(usex extensions)
-	)
-
-	# find and link vulkan libs permanently
-	if use vulkan; then
-		mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( USE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( USE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index d9369ffa6e7a..0854864f9205 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -3,4 +3,4 @@ DIST shotcut-21.02.27.tar.gz 4101402 BLAKE2B ef5320fd9b353fed0b429763cf1fa57bfef
 EBUILD shotcut-21.01.29.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 EBUILD shotcut-21.02.27.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 EBUILD shotcut-9999.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
-MISC metadata.xml 450 BLAKE2B 979a125701ee0da3a2ead50518500e32a7d4bbd78f42069b268aedd5d1c933f2a10022d63b98e2f135a2e3156a6019d4b82da62394ebd8724d55001b7d470e8a SHA512 c742013bd49807786261384f73d9350962affba6d914a6dcb1542376b760fc7cfbb847ce38b281fde1b67ea3db3d299db235c7f9716b20426329c971a485e7c3
+MISC metadata.xml 480 BLAKE2B 73a38f8b538f121032bea4148cf2721020e4fd53c5e41479dc7163bd9f637edfdac5c5f67cca191d96af4159dc51567b1009122f9f6aa47368d66386d7410d3c SHA512 38373130a0ed4bf237232b7ad6fa0fa499874206ca0d50d1e44cb0b0ae115ef0b56104464732e7305a54d99485880d7e5a4d6466ddc54d516bc279632e2bd34e
diff --git a/media-video/shotcut/metadata.xml b/media-video/shotcut/metadata.xml
index f6e4473d5c5f..83c7ace698ce 100644
--- a/media-video/shotcut/metadata.xml
+++ b/media-video/shotcut/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>xdch47@posteo.de</email>
 		<name>Felix Neumärker</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index dab8ecc039d5..8bb9284a4aee 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,4 +3,4 @@ AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
-MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/unifi-video/metadata.xml b/media-video/unifi-video/metadata.xml
index ee9a82ac4170..c67d4dcaca5b 100644
--- a/media-video/unifi-video/metadata.xml
+++ b/media-video/unifi-video/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index f7124b81fd3d..614820261255 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -31,4 +31,4 @@ EBUILD vdr-2.2.0-r6.ebuild 8161 BLAKE2B ec2b998268125743b19d22d94262d2082b66e20d
 EBUILD vdr-2.4.1-r2.ebuild 5767 BLAKE2B 2340c0841188d28d825271b8a291d0c97171facc8fdad3566b230e6eff94e70dd41d0f8156445131ec9e0be59a53e9b70cf4a7e74212616e1046c445139bb7f3 SHA512 b6e44cfe1de02f2aa02001bcb78c478b98bf675b8164569615ddd9ddba1afda0f2c40cbb4008b6b59555151a9e89d10052dcb9abb92e9b1a8dcd1a4c2b2b5647
 EBUILD vdr-2.4.1-r3.ebuild 6092 BLAKE2B 222efc8feee22c150c1c8a2eb395bb0f33cb59c7dedaf7f2a12734f05dbc39bd97764174d1352afc661e48d90bbb372b1d608caad9034814d59dfd960460dffb SHA512 509e606bff521f2f33f93a98e69d8dc1a40b834cdadc1b8b70f22898446ab38b046258221b1e5e0a77c972f555c7cb14b06f266074ba2b36cf4411a59ca112aa
 EBUILD vdr-2.4.6-r1.ebuild 5994 BLAKE2B 32fed77708c0df98811c1bc5552abe90d824c013ea5e94225444c434110e38d0f01d2fcc2d161072caf76d60b6e8978c93cbb6c0163d11c6e7a9808f4c405995 SHA512 0f37bad860a11e80439e9f13424e4b26ba1846305bd9e48b5d93b74488ca656b9a39dc221cd1c0571944b9e0753bd630255ae94a2ea544f799a227675a7bf7de
-MISC metadata.xml 1862 BLAKE2B 7dc6b96c3e05f9e4b34e6c2eb755e7326b5398e16ebee51768676003127becae8cd744de9a749b529452ca262caf4ccda9889d169297a0cf2134bdc2e22ca439 SHA512 3272e780bac7ae35449902621e7ff7ed7da099b9633d7cb47e6a2f6708cf069c220b5d67f6be3092459cbb254931f52b2e4d9b08f983c6b8841b74ae7239b1b2
+MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index eea6df4fdb23..9343c3d544bb 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -5,11 +5,11 @@
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 584b37f22bf5..a9aea95c0a26 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,3 +1,3 @@
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
 EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
-MISC metadata.xml 585 BLAKE2B b32bf34b5d97dea85aa3092844f169264dadc564fdf32aa509a530188e4a83ac71646d7e8f5e1da191a6cceb1bc13e04ca972b421ac59bf3e0479c6da4e594be SHA512 e5ec23053db9318e5cda75085882ddecd4ee53753c1d0e0cd39dc7edcc0b2eeed7cd3b71c2afb580943de1b476af3dde4ae1b607f66fa481dd8b65910ff3b0fd
+MISC metadata.xml 585 BLAKE2B b14cedca2e5ef031571c1e3345b42b43ffaaf0ec4a5433235eac523d885fe9a3199a02d37890955d06e00f5e9f2fd007a325c47425e83404aa4fdd97af3ce683 SHA512 6af635fb163a73a42538bb2c9c893f04f98c0ef3bd746b54d3efac4640bd14ed999c11bab2734d0cb86c96de3b66046952dc6594cedad70352b6f35b95ea1242
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
index 6c1928478f40..867cc541597e 100644
--- a/media-video/webcamoid/metadata.xml
+++ b/media-video/webcamoid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index b8f0f5b55308..c41133dcc41f 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20201022.tar.gz 63423 BLAKE2B af79aa27528b9cfafcf297497fe5711d7c9260c5fd245bb556ff340bad3938bf48dac74e1875ae2013346c546d3dc745b2c552b1c32c15cc47106183a6d8cb82 SHA512 14d1bb7e814355dad48a02c240103baec39d831de9a08fb8f1eecdeb13522fd55d891bc519d8303dc156f2b0e300a7c8c4a42feba29b3d7c80c906edc9aadc89
 DIST yle-dl-20210212.tar.gz 64609 BLAKE2B 1cffaadd6c5628e0d2b2a02cda2c6a98939c0c92e9efda7a6fd0dc02c65f7e0b3a5de6d705143d4dbd1507bc8733d13dd9b0547592c86f6168de63d0fb73463a SHA512 cdef7ff929d3dacd8b599644b46d784412b232f64e3ba2f1d6d2338c8350d38e0ae089e2a79bf12a1d39311daff60a062432b945292c1728b310af3b3a68a98b
-EBUILD yle-dl-20201022.ebuild 1464 BLAKE2B 5dbe2ad03f3fe508e8d27c24e00364e66e23df2a066a414496ee0b730c204ffec972020f7ae81d74449b475c19465947209066e5e8c523151da0bc4809e20d14 SHA512 f67237c916ad8b5ec03578475314fb6e7710382fe7b5ac65840c50889dc1a1a0dff8f751bfcd2bb8a383aedd0b10c30452cd75398697f5d45b05c40bfe1d0444
-EBUILD yle-dl-20210212.ebuild 1503 BLAKE2B 21d0a060a45b8bf59608ac148165ea6e6e257cb046abe9c0c03d61fc595a39f629aa2d76f9985c07164e353d014c8c9c8cc492217f71b25618eed40f3513dc33 SHA512 63cd6b7a43e33d79138abc10aca82990304c749676280fb8411dfbcb30ed191d11c86c2d35d7617b0d54d3b7e870b0bc80042c57d1443be1d77156cf601a1920
+EBUILD yle-dl-20210212.ebuild 1501 BLAKE2B 360b6015c19b751e08d2e38f47274c10267e92014f4d8811874f6cea3ef693093a5245a9c756582725056539dd70a5a5989f40813e3b1a386b7e1bfac6e9a5de SHA512 e3937167bf0c32b7997da501d68fdf9fad52a1c74fd8d4cfc4255dae6f5933ad1b39bbc9a2fc040ada322b3ac55dc478f3f59d9f7ada8cc1cc35f8c6f02df782
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20201022.ebuild b/media-video/yle-dl/yle-dl-20201022.ebuild
deleted file mode 100644
index b1b101098ab6..000000000000
--- a/media-video/yle-dl/yle-dl-20201022.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-	elog ""
-	elog "Optional download engines: "
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20210212.ebuild b/media-video/yle-dl/yle-dl-20210212.ebuild
index fe8df8d34f55..5aa66d814d1f 100644
--- a/media-video/yle-dl/yle-dl-20210212.ebuild
+++ b/media-video/yle-dl/yle-dl-20210212.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9584fec5a8ea..f3dfeb2d0aee 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/Manifest.gz b/metadata/dtd/Manifest.gz
index 6d04aed40e13..98f32e482957 100644
--- a/metadata/dtd/Manifest.gz
+++ b/metadata/dtd/Manifest.gz
diff --git a/metadata/dtd/metadata.dtd b/metadata/dtd/metadata.dtd
index 7c0708952b58..3b8d7be58414 100644
--- a/metadata/dtd/metadata.dtd
+++ b/metadata/dtd/metadata.dtd
@@ -12,6 +12,10 @@
     Unknown is added to handle <maintainer/>s in <upstream/>s. Using it (or no
     explicit type) for Gentoo maintainers is prohibited. -->
   <!ATTLIST maintainer type (person|project|unknown) "unknown">
+  <!-- proxied attribute determines whether the maintainer is a proxied
+    maintainer (yes), regular dev (no) or a proxy for somebody (proxy). It is
+    valid only for Gentoo maintainers. -->
+  <!ATTLIST maintainer proxied (yes|no|proxy) "no">
 
   <!-- A long description of the package in freetext-->
   <!ELEMENT longdescription (#PCDATA|pkg|cat)* >
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3e7957be79e8..bc5efed9f6c8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Mar 2021 21:08:35 +0000
+Sat, 20 Mar 2021 13:38:25 +0000
diff --git a/metadata/dtd/timestamp.commit b/metadata/dtd/timestamp.commit
index 59c82c58b238..041e8e2411d5 100644
--- a/metadata/dtd/timestamp.commit
+++ b/metadata/dtd/timestamp.commit
@@ -1 +1 @@
-b4185459f715d9b9ca4ee98b9254ae222bf4059e 1602785579 2020-10-15T18:12:59+00:00
+aaba251def20e211f7d12c83a7f5280097e1aa85 1615752273 2021-03-14T20:04:33+00:00
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4b4d33999be3..e8d7dfb9c5f5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 500540 BLAKE2B 7a48959b9c07be5fc6e9e98ffbda2d71400bbd137c089df45f7701ae5dd1ba444366d51af5a4656f0a37ca0bbed5e1b74627c57cf425e57c4516bb7194b7dc59 SHA512 e923ed887d7140a57ff660001f6646dac898bdcaefc8ab2effe01101b80e6b709f7e4d00bf72e6d181aa41f6d99fe7b4285de0597a1b60734104a3eee41ee946
-TIMESTAMP 2021-03-12T21:08:38Z
+TIMESTAMP 2021-03-20T13:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBL2FZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBV+tRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBn2Q//VfOZVwVB+j86+fSD4PnUz5UMP80EgU8abllYROYEevpAEukuCOwbMqi2
-QSLd8/HoMBganLYao39Z4eeVuCY1X5VhZCXteE7HBF/7b3PPfcZVDFYHr1P0JYCL
-eeL3rjHx1PJt2B1x3ghHZT4qrstQT8a9wpp/v13h17yPoea3ibHCyeT2bwBuLytA
-NYyJ4HMafCk8+LxxfR1vYUC6otv64X/EHSSTLelSx3Ckd+jKaX5N22kXEVJGMXXC
-/ZdBLTVd72UONJ6Bai++T4QDU9WCrBvhHe+1X2YrLM8kgL9YAllHoApUbZAm+bfP
-/SOfv2iO8fOOl5lvBQ8doicXcDq89xvp7tT/b2vZElpI0Lecmh98rutWuwCt9idA
-3fWvyKOSYB9ywQgWNnQ6xjxDaCl0sSSG1jn9s99Sl4S2x6kjCeqE4BbHN5fDD9Cc
-9F6JiXARYx4EjpjGoICMKdBMyTz6puGgXAQM61LLRjIUbSrvPMn2TSMbFmCVLeZw
-R4mYG3icwVXC08AY8E+0wAGz2IznDiBC7Uru7qEQUzys5LNctPY/yCYzQGGH79Sd
-dFdX1h0+b8LtoMgAdyiMMwSu90CRdE+vJNquekkQvSJVxYg6fWdTuulWjCWZWBrG
-kQkJrL9ljP6jFua1C4q95H55vnGOJDAob23evJJgVhJpjs1dBPQ=
-=gaP/
+klCxqw//Vlsw4oQpjwyxtoNpp1miU9ahlfFYRSpaUN58fb3+Gf0Hf65qVM15XHOM
+JLmqJX0bXR2aHP/xpa3ozA7mk5Xi9tUqBsIp/g8PqHlXad+qfoIgntYoNR5iUL6r
+WwIna5DVQRrnqeTujdklatCwnmRDFSNN8NPzUMyFl0F7Q+1KDKXVaNHyrTS4b9VV
+HPT5NfyspeWJSpoh0y4MyS4PeMFPSC57qdNSd6zx6PVKio5ZhEgOudzH0lk+2cx9
+iWqEn4Bw4qYBs86T2sTh4dGmFxHr94tQyTtu3NpAoBTZMM4/LGB4ItVf0IyQPW7o
+E+009uYUoVrqoc8xkHgt7uGzR94pygCoMB1N+5XoJ2F3xDZ4Tm22p39TKXek5WQi
+WmdOlpnrXRrYCAwLbnf3l/smjT99fA8dmgol1eBCBkQ7cBu4IgQ3zCSCdX0Zhhw2
+aDFm/33+Q7SYAMHYqWKKmENcmUWfZXHAcknr/0/HMtE0RxGah1VLVNmigrzIYOax
+KV4v8Y8p1YMYkfRn0vTKAX6yR96eLL+bnsjYu68AGCzE9lwkSDvJf/PWxS/Uf6DW
+o243SK/v0b5vLugtKXnlXqLecQESXukBk1H90Vk5kSfBRkJxOQon5aOm/CStMakK
+g6d2bRzO2vJoBIYRjZphKKf72x7ORIJ4Ai+AYjP4GjAAbqL5azI=
+=Ilgn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3e7957be79e8..bc5efed9f6c8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Mar 2021 21:08:35 +0000
+Sat, 20 Mar 2021 13:38:25 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bda9ff635eeb..82ae9dd4010e 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 96ed506070c0..bc2cc55d7bfe 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/crontab-0 b/metadata/md5-cache/acct-group/crontab-0
new file mode 100644
index 000000000000..1ae2a90c9ed4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/crontab-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: crontab
+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	207adc497ea35d11dcf8959e7546a459	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1ef5b4bc73f94bf6a0164e8d5de6a482
diff --git a/metadata/md5-cache/acct-group/serf-0 b/metadata/md5-cache/acct-group/serf-0
new file mode 100644
index 000000000000..9277e9dcfe2e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/serf-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/serf
+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	207adc497ea35d11dcf8959e7546a459	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=22d08b34909fac7aef088db1012834bd
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 76fe08a1dc51..c6384a043b2f 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/serf-0 b/metadata/md5-cache/acct-user/serf-0
new file mode 100644
index 000000000000..8c748845c09c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/serf-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/serf
+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/serf
+SLOT=0
+_eclasses_=acct-user	d32fbb1f9b68d1a1c2adf200d92350af	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=427927b4f8286e6611d4051064af78c4
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 6b80fb22b3d9..6d8768a45ebd 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/accerciser-3.38.0 b/metadata/md5-cache/app-accessibility/accerciser-3.38.0
new file mode 100644
index 000000000000..2f0e17d621d5
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.38.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=x11-libs/gtk+-3.1.13:3[introspection] python_single_target_python3_7? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_7(-)] >=dev-python/ipython-0.11[python_targets_python3_7(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/python-xlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] >=dev-python/ipython-0.11[python_targets_python3_8(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] >=dev-python/ipython-0.11[python_targets_python3_9(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] ) dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] gnome-base/librsvg[introspection] python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Interactive Python accessibility explorer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Accerciser
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD CC-BY-SA-3.0
+RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=x11-libs/gtk+-3.1.13:3[introspection] python_single_target_python3_7? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_7(-)] >=dev-python/ipython-0.11[python_targets_python3_7(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/python-xlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] >=dev-python/ipython-0.11[python_targets_python3_8(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] >=dev-python/ipython-0.11[python_targets_python3_9(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] ) dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] gnome-base/librsvg[introspection] python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/accerciser/3.38/accerciser-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d2c3ed72497f3830987bc78231bb377
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
index 60546ae850ca..c0abcb25c0aa 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 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 test
-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 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.36.0[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-accessibility/at-spi2-core-2.33.2[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=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a8c61919d9602ed846b4491a575576f
+_md5_=24772110b080ae5b0c6e776cec8a02b1
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
index 867c8ee78bb5..5ff4c65ec73b 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.38/at-spi2-core-2.38.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8194b8d7245425f8254f2f9ba62c7f14
+_md5_=73b035b8879b5a1dc1e57ac807fa29ae
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
index 7028562c8428..d3fcae9680de 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/brailcom/speechd/releases/download/0.9.1/speech-dispatcher-0.9.1.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fbf95d556a43b149ab2586684131d9e9
+_md5_=8b4bc760667101059f538a83d2362b88
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 617234cc1520..075faf91671b 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.5 b/metadata/md5-cache/app-admin/ansible-2.10.5
deleted file mode 100644
index 19a180e54bd7..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.10.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-admin/ansible-base test? ( dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible/ansible-2.10.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f06faddd5302826ee7d149036e342d26
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.6 b/metadata/md5-cache/app-admin/ansible-2.10.6
index 43d2461e0c2f..87c846d5ca4d 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.6
+++ b/metadata/md5-cache/app-admin/ansible-2.10.6
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.6.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=474a0a83914b6dc6991c92b7ac1f36a3
+_md5_=f06faddd5302826ee7d149036e342d26
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.7 b/metadata/md5-cache/app-admin/ansible-2.10.7
new file mode 100644
index 000000000000..4958deecdc0a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.10.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-admin/ansible-base test? ( dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-2.10.7.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=474a0a83914b6dc6991c92b7ac1f36a3
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.7 b/metadata/md5-cache/app-admin/ansible-base-2.10.7
new file mode 100644
index 000000000000..fcb5e453ae43
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.7.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=57a5a2fcf28c94f8186062199a9ee3bd
diff --git a/metadata/md5-cache/app-admin/checksec-1.11.1 b/metadata/md5-cache/app-admin/checksec-1.11.1
deleted file mode 100644
index ccb524abff7d..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.11.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.11.1.tar.gz -> checksec-1.11.1.tar.gz
-_md5_=a559402bc218e04c9c74f8bf546df595
diff --git a/metadata/md5-cache/app-admin/checksec-1.9.0 b/metadata/md5-cache/app-admin/checksec-1.9.0
deleted file mode 100644
index 8777ac22a93b..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.9.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.9.0.tar.gz -> checksec-1.9.0.tar.gz
-_md5_=4423db08480f9340e80b29752d5af3cc
diff --git a/metadata/md5-cache/app-admin/checksec-2.0.1 b/metadata/md5-cache/app-admin/checksec-2.0.1
deleted file mode 100644
index 620acd0d7086..000000000000
--- a/metadata/md5-cache/app-admin/checksec-2.0.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.0.1.tar.gz -> checksec-2.0.1.tar.gz
-_md5_=edcd2c45f091d845304ed184cbd79c78
diff --git a/metadata/md5-cache/app-admin/checksec-2.1.0 b/metadata/md5-cache/app-admin/checksec-2.1.0
deleted file mode 100644
index 5a24a9d27617..000000000000
--- a/metadata/md5-cache/app-admin/checksec-2.1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.1.0.tar.gz -> checksec-2.1.0.tar.gz
-_md5_=50044d315e4dd5c89ebc9bdaaef05f21
diff --git a/metadata/md5-cache/app-admin/checksec-2.2.0 b/metadata/md5-cache/app-admin/checksec-2.2.0
deleted file mode 100644
index f642bc078d21..000000000000
--- a/metadata/md5-cache/app-admin/checksec-2.2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.2.0.tar.gz -> checksec-2.2.0.tar.gz
-_md5_=9e8f34953d066ac9a3ac97fbe21f2973
diff --git a/metadata/md5-cache/app-admin/checksec-2.2.1 b/metadata/md5-cache/app-admin/checksec-2.2.1
deleted file mode 100644
index 9b04722357b0..000000000000
--- a/metadata/md5-cache/app-admin/checksec-2.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.2.1.tar.gz -> checksec-2.2.1.tar.gz
-_md5_=9e8f34953d066ac9a3ac97fbe21f2973
diff --git a/metadata/md5-cache/app-admin/checksec-2.2.2 b/metadata/md5-cache/app-admin/checksec-2.2.2
deleted file mode 100644
index d0f8613f846a..000000000000
--- a/metadata/md5-cache/app-admin/checksec-2.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=7
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.2.2.tar.gz -> checksec-2.2.2.tar.gz
-_md5_=9e8f34953d066ac9a3ac97fbe21f2973
diff --git a/metadata/md5-cache/app-admin/checksec-2.4.0 b/metadata/md5-cache/app-admin/checksec-2.4.0
index 7e9010c97e2e..e5e5d6be1b0a 100644
--- a/metadata/md5-cache/app-admin/checksec-2.4.0
+++ b/metadata/md5-cache/app-admin/checksec-2.4.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
 EAPI=7
 HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.4.0.tar.gz -> checksec-2.4.0.tar.gz
-_md5_=62a76ca7e622148bd98b558cf08235d6
+_md5_=bed317540a19a5eef5bd341dfeea06f9
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r10 b/metadata/md5-cache/app-admin/conky-1.10.8-r10
deleted file mode 100644
index 4f2cf782f9fa..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) app-text/docbook2X
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=7
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fcf2e069449d6eb613f3abe0320e734
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r9 b/metadata/md5-cache/app-admin/conky-1.10.8-r9
deleted file mode 100644
index 83f2adf77cba..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) app-text/docbook2X
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=7
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47525780410b9aacaa368bedc903c3d7
diff --git a/metadata/md5-cache/app-admin/conky-1.12.1 b/metadata/md5-cache/app-admin/conky-1.12.1
new file mode 100644
index 000000000000..9d7368ecd439
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.12.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) doc? ( app-text/docbook2X dev-libs/libxslt ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=7
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama xmms2 kernel_linux +lua_single_target_lua5-3
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.1.tar.gz -> conky-1.12.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa44567353349d6ecf1b40cfa32bd9d0
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.4-r1 b/metadata/md5-cache/app-admin/conserver-8.2.4-r1
deleted file mode 100644
index 1fe72f8774db..000000000000
--- a/metadata/md5-cache/app-admin/conserver-8.2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) >=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-libs/libressl:0 ) )
-DESCRIPTION=Serial Console Manager
-EAPI=6
-HOMEPAGE=https://www.conserver.com
-IUSE=debug ipv6 freeipmi kerberos libressl pam ssl test tcpd ssl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD BSD-with-attribution
-RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.4/conserver-8.2.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	8bf95e2477512d096a10bf218de41d5e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6029b2bf382d58211106c2d2d0e2d45e
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.5-r1 b/metadata/md5-cache/app-admin/conserver-8.2.5-r1
deleted file mode 100644
index 58880b3df062..000000000000
--- a/metadata/md5-cache/app-admin/conserver-8.2.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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-libs/libressl:0 ) )
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Serial Console Manager
-EAPI=7
-HOMEPAGE=https://www.conserver.com
-IUSE=debug ipv6 freeipmi kerberos libressl pam ssl test tcpd ssl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD BSD-with-attribution
-RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.5/conserver-8.2.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	8bf95e2477512d096a10bf218de41d5e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09bc19a77660ee7cbfd3b691982425c6
diff --git a/metadata/md5-cache/app-admin/doas-6.0 b/metadata/md5-cache/app-admin/doas-6.0
deleted file mode 100644
index f94d61231ea7..000000000000
--- a/metadata/md5-cache/app-admin/doas-6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=pam? ( sys-libs/pam ) virtual/yacc
-DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
-EAPI=6
-HOMEPAGE=https://github.com/Duncaen/OpenDoas
-IUSE=pam
-KEYWORDS=amd64 arm
-LICENSE=ISC
-RDEPEND=pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.0.tar.gz -> OpenDoas-6.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4eb0b7af0320645b8853808d3c790aad
diff --git a/metadata/md5-cache/app-admin/doas-6.6.1 b/metadata/md5-cache/app-admin/doas-6.6.1
deleted file mode 100644
index 1b28e344a1f9..000000000000
--- a/metadata/md5-cache/app-admin/doas-6.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=pam? ( sys-libs/pam ) virtual/yacc
-DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
-EAPI=7
-HOMEPAGE=https://github.com/Duncaen/OpenDoas
-IUSE=pam persist
-KEYWORDS=amd64 arm arm64 ~ppc
-LICENSE=ISC
-RDEPEND=pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.6.1.tar.gz -> OpenDoas-6.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=69652f4f412ae40a2d79cb5f7ac4ece3
diff --git a/metadata/md5-cache/app-admin/doas-6.8 b/metadata/md5-cache/app-admin/doas-6.8
deleted file mode 100644
index 176ed936e6ca..000000000000
--- a/metadata/md5-cache/app-admin/doas-6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/yacc
-DEFINED_PHASES=configure postinst prepare
-DEPEND=pam? ( sys-libs/pam )
-DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
-EAPI=7
-HOMEPAGE=https://github.com/Duncaen/OpenDoas
-IUSE=pam persist
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc
-LICENSE=ISC
-RDEPEND=pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.8.tar.gz -> OpenDoas-6.8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5988f00d13aaa6324d410359aecf5bb2
diff --git a/metadata/md5-cache/app-admin/doctl-1.55.0 b/metadata/md5-cache/app-admin/doctl-1.55.0
deleted file mode 100644
index 7abadab99dbe..000000000000
--- a/metadata/md5-cache/app-admin/doctl-1.55.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst test unpack
-DESCRIPTION=A command line tool for DigitalOcean services
-EAPI=7
-HOMEPAGE=https://github.com/digitalocean/doctl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/digitalocean/doctl/archive/v1.55.0.tar.gz -> doctl-1.55.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c0ec03ce0941f102ad0c09db91fd4d6
diff --git a/metadata/md5-cache/app-admin/doctl-1.56.0 b/metadata/md5-cache/app-admin/doctl-1.56.0
deleted file mode 100644
index 20be6d78c9e8..000000000000
--- a/metadata/md5-cache/app-admin/doctl-1.56.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst test unpack
-DESCRIPTION=A command line tool for DigitalOcean services
-EAPI=7
-HOMEPAGE=https://github.com/digitalocean/doctl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/digitalocean/doctl/archive/v1.56.0.tar.gz -> doctl-1.56.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5d03da8077917a8fcd3414f1fcd6fe2d
diff --git a/metadata/md5-cache/app-admin/entr-4.6 b/metadata/md5-cache/app-admin/entr-4.6
index 36086e56223e..f1066b5f6341 100644
--- a/metadata/md5-cache/app-admin/entr-4.6
+++ b/metadata/md5-cache/app-admin/entr-4.6
@@ -3,10 +3,10 @@ DESCRIPTION=Run arbitrary commands when files change
 EAPI=7
 HOMEPAGE=http://entrproject.org
 IUSE=test
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://entrproject.org/code/entr-4.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d1ff55b5154487ab5884aec016dcff9a
+_md5_=e5187020d919e0467d8d467a9aa0fbe7
diff --git a/metadata/md5-cache/app-admin/filebeat-6.8.13 b/metadata/md5-cache/app-admin/filebeat-6.8.13
deleted file mode 100644
index f74556a6d243..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-6.8.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=dev-lang/go-1.12.9
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD-2 MIT
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v6.8.13.tar.gz -> filebeat-6.8.13.tar.gz
-_md5_=6b9e36a7191f95c3a3048ec9993cd029
diff --git a/metadata/md5-cache/app-admin/filebeat-7.8.1 b/metadata/md5-cache/app-admin/filebeat-7.8.1
deleted file mode 100644
index bc137a7c242c..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-7.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0 BSD-2 MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.8.1.tar.gz -> filebeat-7.8.1.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip 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/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.mod -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.zip -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.mod -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.mod -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/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.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 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/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.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/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.0.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.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/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.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/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/pelletier/go-buffruneio/@v/v0.2.0.mod -> github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/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/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/src-d/gcfg/@v/v1.4.0.mod -> github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200125202105-ffdc32ff5518.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/diag-ecs/@v/v0.0.0-20200210114345-ab085841dcb9.zip -> github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.zip mirror://goproxy//github.com/urso/diag-ecs/@v/v0.0.0-20200210114345-ab085841dcb9.mod -> github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.mod mirror://goproxy//github.com/urso/ecslog/@v/v0.0.1.zip -> github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/urso/ecslog/@v/v0.0.1.mod -> github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200125210132-c2e338f92f3a.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200125210132-c2e338f92f3a.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 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/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190729092621-ff9f1409240a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200216192241-b320d3a0f5a2.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200216192241-b320d3a0f5a2.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200216192241-b320d3a0f5a2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200216192241-b320d3a0f5a2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip 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/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/src-d/go-billy.v4/@v/v4.3.2.mod -> gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod mirror://goproxy//gopkg.in/src-d/go-git-fixtures.v3/@v/v3.5.0.mod -> gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod mirror://goproxy//gopkg.in/src-d/go-git.v4/@v/v4.13.1.mod -> gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.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//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190709113604-33be087ad058.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190709113604-33be087ad058.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d1ad6bab0aa8b2600c149160d4529ccc
diff --git a/metadata/md5-cache/app-admin/filebeat-7.9.2 b/metadata/md5-cache/app-admin/filebeat-7.9.2
deleted file mode 100644
index e1fb83ef7245..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-7.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD-2 MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.9.2.tar.gz -> filebeat-7.9.2.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip 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/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!sirupsen/logrus/@v/v1.0.1-0.20170608221441-85b1699d5056.mod -> github.com%2F!sirupsen%2Flogrus%2F@v%2Fv1.0.1-0.20170608221441-85b1699d5056.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.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.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 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/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/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-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.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/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170608164803-0b25a408a500.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170608164803-0b25a408a500.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 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/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip 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/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.18.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/api/@v/v0.18.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=b9cf89a337e97de5a8218bf18295301e
diff --git a/metadata/md5-cache/app-admin/gopass-1.12.1 b/metadata/md5-cache/app-admin/gopass-1.12.1
deleted file mode 100644
index afe6432e62fb..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=install postinst unpack
-DEPEND=>=dev-lang/go-1.16
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=7
-HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/gopasspw/gopass/archive/v1.12.1.tar.gz -> gopass-1.12.1.tar.gz mirror://goproxy//filippo.io/age/@v/v1.0.0-beta7.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta7.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-beta7.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta7.mod mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-alpha.2.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-alpha.2.mod mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.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/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.zip -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.mod -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.10.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.10.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.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/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.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/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/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/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.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/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.1.4.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.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.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/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.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-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-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/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-20210119194325-5f4716e94777.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 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/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210217090653-ed5674b6da4a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217090653-ed5674b6da4a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210217090653-ed5674b6da4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217090653-ed5674b6da4a.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.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//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b	optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=75bd1b33455220370de14e7e11ac4937
diff --git a/metadata/md5-cache/app-admin/gopass-1.12.2 b/metadata/md5-cache/app-admin/gopass-1.12.2
new file mode 100644
index 000000000000..bab293f5a5f6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gopass-1.12.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=install postinst unpack
+DEPEND=>=dev-lang/go-1.16
+DESCRIPTION=a simple but powerful password manager for the terminal
+EAPI=7
+HOMEPAGE=https://www.gopass.pw/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
+RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/gopasspw/gopass/archive/v1.12.2.tar.gz -> gopass-1.12.2.tar.gz mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.1.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.1.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.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/atotto/clipboard/@v/v0.1.4.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.4.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.zip -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.mod -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.10.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.10.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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.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/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.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/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.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/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/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/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.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/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.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/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.1.4.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.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/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.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-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/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-20210119194325-5f4716e94777.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 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/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.zip 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/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.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//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-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	optfeature	6a2add34e06e5a05d88471a33ccdd73e
+_md5_=5bfcdbe422301073ade034d16c37e6ad
diff --git a/metadata/md5-cache/app-admin/hcloud-1.21.0 b/metadata/md5-cache/app-admin/hcloud-1.21.0
new file mode 100644
index 000000000000..83508eb6edf5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hcloud-1.21.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=A command-line interface for Hetzner Cloud
+EAPI=7
+HOMEPAGE=https://github.com/hetznercloud/cli
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.21.0.tar.xz
+_md5_=56012406d96b2c878b2bc62b17fa0dac
diff --git a/metadata/md5-cache/app-admin/integrit-4.2_rc1 b/metadata/md5-cache/app-admin/integrit-4.2_rc1
new file mode 100644
index 000000000000..73d57de39264
--- /dev/null
+++ b/metadata/md5-cache/app-admin/integrit-4.2_rc1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=file integrity verification program
+EAPI=7
+HOMEPAGE=http://integrit.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/integrit/integrit/archive/v4.2-rc1.tar.gz -> integrit-4.2_rc1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a5dd7149a1d49878e0ed8db2b4bdce33
diff --git a/metadata/md5-cache/app-admin/lastpass-binary-component-4.19.0-r1 b/metadata/md5-cache/app-admin/lastpass-binary-component-4.19.0-r1
deleted file mode 100644
index d3e0ed20bf95..000000000000
--- a/metadata/md5-cache/app-admin/lastpass-binary-component-4.19.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Binary component required by the LastPass Password Manager browser extension
-EAPI=7
-HOMEPAGE=https://helpdesk.lastpass.com/downloading-and-installing/#h5
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LastPass
-RESTRICT=bindist strip mirror
-SLOT=0
-SRC_URI=https://download.cloud.lastpass.com/linux/lplinux.tar.bz2 -> lastpass-binary-component-4.19.0.tar.bz2
-_md5_=02e577d1d2493a296b1e21841d9a51e6
diff --git a/metadata/md5-cache/app-admin/lastpass-binary-component-4.67.1 b/metadata/md5-cache/app-admin/lastpass-binary-component-4.67.1
new file mode 100644
index 000000000000..23d605a11560
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lastpass-binary-component-4.67.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Binary component required by the LastPass Password Manager browser extension
+EAPI=7
+HOMEPAGE=https://helpdesk.lastpass.com/downloading-and-installing/#h5
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LastPass
+RESTRICT=bindist strip mirror
+SLOT=0
+SRC_URI=https://download.cloud.lastpass.com/linux/lplinux.tar.bz2 -> lastpass-binary-component-4.67.1.tar.bz2
+_md5_=8b3279caf60638c56d48cd951d4a8f69
diff --git a/metadata/md5-cache/app-admin/needrestart-3.5 b/metadata/md5-cache/app-admin/needrestart-3.5
index 2f639d357388..f201a04d5f5b 100644
--- a/metadata/md5-cache/app-admin/needrestart-3.5
+++ b/metadata/md5-cache/app-admin/needrestart-3.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool sys-devel/gettext
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
 DESCRIPTION=Restart daemons after library updates
 EAPI=7
 HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
 SLOT=0
 SRC_URI=https://github.com/liske/needrestart/archive/v3.5.tar.gz -> needrestart-3.5.tar.gz
-_md5_=cf5a26243a96eff74a6f20c6d7d157e8
+_md5_=ad555d71f7fe2ecacb8b45ff8cb9e807
diff --git a/metadata/md5-cache/app-admin/needrestart-9999 b/metadata/md5-cache/app-admin/needrestart-9999
index 7b5b50e4b482..9d5a6e987099 100644
--- a/metadata/md5-cache/app-admin/needrestart-9999
+++ b/metadata/md5-cache/app-admin/needrestart-9999
@@ -1,12 +1,12 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install unpack
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool sys-devel/gettext
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
 DESCRIPTION=Restart daemons after library updates
 EAPI=7
 HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=c61e296655eda0604c945d251227c84d
+_md5_=a3a910503e7f32446f8494976eb8013b
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3
index 1f2dea511e84..69006ea136ec 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ b/metadata/md5-cache/app-admin/pass-1.7.3
@@ -3,10 +3,10 @@ DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=6
 HOMEPAGE=https://www.passwordstore.org/
 IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5cdc1c8d3cae5a4147766c210c548d45
+_md5_=c212f1491880a9837abab79581527ec3
diff --git a/metadata/md5-cache/app-admin/puppet-7.5.0 b/metadata/md5-cache/app-admin/puppet-7.5.0
new file mode 100644
index 000000000000..d2878c571a42
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.5.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_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 )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.5.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d8eb39ba544a2bdfeee9c5cc75266ce0
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.5.0 b/metadata/md5-cache/app-admin/puppet-agent-7.5.0
new file mode 100644
index 000000000000..5c083859be38
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install unpack
+DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=7
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.5.0-1focal_amd64.deb
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8056d8a0af1d6f43039bd33964d0fc4d
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.2.0 b/metadata/md5-cache/app-admin/puppetdb-7.2.0
new file mode 100644
index 000000000000..dca429e52079
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-7.2.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppetdb acct-group/puppetdb
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.2.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c84df5452a2667121514ddf963f76049
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.1.0 b/metadata/md5-cache/app-admin/puppetserver-7.1.0
new file mode 100644
index 000000000000..c16505854c46
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.1.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bb709592cb4d4a3065475163c897bdd5
diff --git a/metadata/md5-cache/app-admin/sagan-2.0.1-r2 b/metadata/md5-cache/app-admin/sagan-2.0.1-r2
deleted file mode 100644
index 4b05914ea57f..000000000000
--- a/metadata/md5-cache/app-admin/sagan-2.0.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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/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] )
-REQUIRED_USE=mysql? ( libdnet )
-SLOT=0
-SRC_URI=https://sagan.quadrantsec.com/download/sagan-2.0.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dda7d6b772113b7f30cf69dfe5bd68b2
diff --git a/metadata/md5-cache/app-admin/sagan-2.0.1-r4 b/metadata/md5-cache/app-admin/sagan-2.0.1-r4
new file mode 100644
index 000000000000..6b7c66dffb8b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sagan-2.0.1-r4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c0b4ce82d2f37785b2cd0e6adc3ef394
diff --git a/metadata/md5-cache/app-admin/serf-0.8.2 b/metadata/md5-cache/app-admin/serf-0.8.2
new file mode 100644
index 000000000000..d389ae514818
--- /dev/null
+++ b/metadata/md5-cache/app-admin/serf-0.8.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Service orchestration and management tool
+EAPI=7
+HOMEPAGE=https://www.serfdom.io/
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD MIT
+RDEPEND=acct-user/serf acct-group/serf
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.2.tar.gz -> serf-0.8.2.tar.gz mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5793d54b5dea547096c843517c50bfc7
diff --git a/metadata/md5-cache/app-admin/serf-0.9.5 b/metadata/md5-cache/app-admin/serf-0.9.5
new file mode 100644
index 000000000000..e17718bac9f3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/serf-0.9.5
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Service orchestration and management tool
+EAPI=7
+HOMEPAGE=https://www.serfdom.io/
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD MIT
+RDEPEND=acct-user/serf acct-group/serf
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/serf/archive/v0.9.5.tar.gz -> serf-0.9.5.tar.gz mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/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/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.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//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/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-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-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 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-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=16ada461c8a848eb8920664c95492037
diff --git a/metadata/md5-cache/app-admin/stow-2.3.1 b/metadata/md5-cache/app-admin/stow-2.3.1
index e79c22938e02..90492fb8c666 100644
--- a/metadata/md5-cache/app-admin/stow-2.3.1
+++ b/metadata/md5-cache/app-admin/stow-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Stow is a symlink farm manager
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/stow/ http://git.savannah.gnu.org/cgit/stow.git
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.3.1.tar.gz
 _eclasses_=perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
-_md5_=8389ce88620a10ca6fcfbf9335ec69a0
+_md5_=84ed1e20d8ae5bb49031f7e41385cb07
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.6_p1 b/metadata/md5-cache/app-admin/sudo-1.9.6_p1
new file mode 100644
index 000000000000..75f26f082dce
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.6_p1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl 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
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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.6p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.6p1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c354f833c88783285ade37a119d03ca6
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.6_rc1 b/metadata/md5-cache/app-admin/sudo-1.9.6_rc1
deleted file mode 100644
index 47104ddb4ec3..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.6_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=7
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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/beta/sudo-1.9.6rc1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.9.6rc1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c354f833c88783285ade37a119d03ca6
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 70520736fb92..f8f1910fbb08 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/clamtk-6.09 b/metadata/md5-cache/app-antivirus/clamtk-6.09
deleted file mode 100644
index 2388a6b93ef1..000000000000
--- a/metadata/md5-cache/app-antivirus/clamtk-6.09
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=install postinst postrm setup unpack
-DESCRIPTION=A graphical front-end for ClamAV
-EAPI=7
-HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
-IUSE=kde nautilus nemo +nls thunar python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/nautilus-python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://bitbucket.org/davem_/clamtk/downloads/clamtk-6.09.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.05.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcdd9643997c6aff11cd5e2fe7c86b99
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.10 b/metadata/md5-cache/app-antivirus/clamtk-6.10
new file mode 100644
index 000000000000..e85fc7e7ddad
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.10
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=A graphical front-end for ClamAV
+EAPI=7
+HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
+IUSE=kde nautilus nemo +nls thunar python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/nautilus-python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/dave-theunsub/clamtk/releases/download/v6.10/clamtk-6.10.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.05.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc12d7bce0daa4e66f2c596f02b42957
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 087bf9551dc0..dc0aaac3250f 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/atool-0.39.0-r1 b/metadata/md5-cache/app-arch/atool-0.39.0-r1
index 9b8425df3197..402fa8e8f4fd 100644
--- a/metadata/md5-cache/app-arch/atool-0.39.0-r1
+++ b/metadata/md5-cache/app-arch/atool-0.39.0-r1
@@ -1,4 +1,5 @@
-DEFINED_PHASES=-
+BDEPEND=>=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=dev-lang/perl
 DESCRIPTION=Script for managing file archives of various types
 EAPI=7
@@ -8,4 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl !app-text/adiff
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
-_md5_=a0047ecdb59a7180f8e751494d64daed
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f1b4865c2dbc2d4f8c7e58598fcce914
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
index 3d94fde42687..8cf55106ad2a 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=7
 HOMEPAGE=https://sourceware.org/bzip2/
 IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BZIP2
 SLOT=0/1
 SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=a932f9c6d9c71075bedd99576314840b
+_md5_=01202ca9a26aa5dbe95adf2aa4374c56
diff --git a/metadata/md5-cache/app-arch/gzip-1.10 b/metadata/md5-cache/app-arch/gzip-1.10
index 852b32e1fab8..bce14a9817cd 100644
--- a/metadata/md5-cache/app-arch/gzip-1.10
+++ b/metadata/md5-cache/app-arch/gzip-1.10
@@ -6,6 +6,6 @@ IUSE=pic static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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
 SLOT=0
-SRC_URI=mirror://gnu/gzip/gzip-1.10.tar.xz mirror://gnu-alpha/gzip/gzip-1.10.tar.xz mirror://gentoo/gzip-1.10.tar.xz
+SRC_URI=mirror://gnu/gzip/gzip-1.10.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.10.tar.xz mirror://gentoo/gzip-1.10.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8090eeb380e92eec24d1b97c414275f0
+_md5_=c7da563baaee20e583817223c70be5b8
diff --git a/metadata/md5-cache/app-arch/gzip-1.9 b/metadata/md5-cache/app-arch/gzip-1.9
index 5a6ebdfc2724..880f07eaa1dd 100644
--- a/metadata/md5-cache/app-arch/gzip-1.9
+++ b/metadata/md5-cache/app-arch/gzip-1.9
@@ -6,6 +6,6 @@ IUSE=pic static
 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
 LICENSE=GPL-3
 SLOT=0
-SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
+SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e76454e0e05fbee2acc1d8ba67059a9
+_md5_=93c7d1ee5c693dd9ced2e412abf486ec
diff --git a/metadata/md5-cache/app-arch/lzma-19.00 b/metadata/md5-cache/app-arch/lzma-19.00
index 1c442075e29b..8f71d4b11f47 100644
--- a/metadata/md5-cache/app-arch/lzma-19.00
+++ b/metadata/md5-cache/app-arch/lzma-19.00
@@ -4,9 +4,9 @@ DESCRIPTION=LZMA Stream Compressor from the SDK
 EAPI=7
 HOMEPAGE=https://www.7-zip.org/sdk.html
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma1900.7z -> lzma-19.00.7z
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91f810c0e4ada4fba641919a4fa5b929
+_md5_=15b949d549aa4423423a1c612379bb9a
diff --git a/metadata/md5-cache/app-arch/rpm2targz-2021.03.16 b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
new file mode 100644
index 000000000000..6b745953e851
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Convert a .rpm file to a .tar.gz archive
+EAPI=7
+HOMEPAGE=http://www.slackware.com/config/packages.php
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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-1
+RDEPEND=app-arch/cpio
+SLOT=0
+SRC_URI=mirror://gentoo/rpm2targz-2021.03.16.tar.xz https://dev.gentoo.org/~vapier/dist/rpm2targz-2021.03.16.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f95b6b2c0cd4f5c5fe3b2a51ae381509
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.8 b/metadata/md5-cache/app-arch/snappy-1.1.8
index 073707029629..1bfad2a3bba2 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.8
+++ b/metadata/md5-cache/app-arch/snappy-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=7
 HOMEPAGE=https://github.com/google/snappy
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.8.tar.gz -> snappy-1.1.8.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4db6e17c49cc140bed52d79fac8c5f9
+_md5_=cfa070b5397a7def2b669aa18542471a
diff --git a/metadata/md5-cache/app-arch/tar-1.32-r1 b/metadata/md5-cache/app-arch/tar-1.32-r1
index fb94c3001ca0..542dc0e2d8d2 100644
--- a/metadata/md5-cache/app-arch/tar-1.32-r1
+++ b/metadata/md5-cache/app-arch/tar-1.32-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 spa
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 mirror://gnu-alpha/tar/tar-1.32.tar.bz2
+SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 https://alpha.gnu.org/gnu/tar/tar-1.32.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aa902a1370efb08ee89d35d698c5ec5d
+_md5_=2585e4c2bbadaf71cbd7da583de6d8c0
diff --git a/metadata/md5-cache/app-arch/tar-1.33 b/metadata/md5-cache/app-arch/tar-1.33
index a7ed81810ab2..98f2f67d5729 100644
--- a/metadata/md5-cache/app-arch/tar-1.33
+++ b/metadata/md5-cache/app-arch/tar-1.33
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.33.tar.xz mirror://gnu-alpha/tar/tar-1.33.tar.xz
+SRC_URI=mirror://gnu/tar/tar-1.33.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.33.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=57367c05eccf1c1c83c076853d01e340
+_md5_=d1bced5884ff64f19001313ab1a0e362
diff --git a/metadata/md5-cache/app-arch/tar-1.34 b/metadata/md5-cache/app-arch/tar-1.34
index 3b9a6934cb6e..601342952f38 100644
--- a/metadata/md5-cache/app-arch/tar-1.34
+++ b/metadata/md5-cache/app-arch/tar-1.34
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz mirror://gnu-alpha/tar/tar-1.34.tar.xz
+SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=57367c05eccf1c1c83c076853d01e340
+_md5_=d1bced5884ff64f19001313ab1a0e362
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.0 b/metadata/md5-cache/app-arch/wimlib-1.13.0
deleted file mode 100644
index 85c70e526fc4..000000000000
--- a/metadata/md5-cache/app-arch/wimlib-1.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=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/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools )
-DESCRIPTION=The open source Windows Imaging (WIM) library
-EAPI=7
-HOMEPAGE=https://wimlib.net/
-IUSE=cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
-RDEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools )
-REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wimlib.net/downloads/wimlib-1.13.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a366431b0d99508fc3d36c83586f80c4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 20be00553d23..88eb3d6f5e94 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/dar-2.5.11 b/metadata/md5-cache/app-backup/dar-2.5.11
deleted file mode 100644
index 59209bff9970..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.5.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=6
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.5.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73cf9f7f08e8e057cfd1f21fd4419caa
diff --git a/metadata/md5-cache/app-backup/dar-2.6.10 b/metadata/md5-cache/app-backup/dar-2.6.10
deleted file mode 100644
index 078b21bf8f19..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.6.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=7
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.6.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=42854bb7ce1f5d7b1be9e7778a5df89a
diff --git a/metadata/md5-cache/app-backup/dar-2.6.13 b/metadata/md5-cache/app-backup/dar-2.6.13
index be20ece9aadc..26461faed5b7 100644
--- a/metadata/md5-cache/app-backup/dar-2.6.13
+++ b/metadata/md5-cache/app-backup/dar-2.6.13
@@ -5,7 +5,7 @@ DESCRIPTION=A full featured backup tool, aimed for disks
 EAPI=7
 HOMEPAGE=http://dar.linux.free.fr/
 IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.6.13.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d4fb1a48d9d8f4672e7220bd24bf1ec8
+_md5_=80afb883dcc0f7e65f1ebbf51556642c
diff --git a/metadata/md5-cache/app-backup/duply-1.11.3 b/metadata/md5-cache/app-backup/duply-1.11.3
deleted file mode 100644
index 4452e2a0a778..000000000000
--- a/metadata/md5-cache/app-backup/duply-1.11.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.3.tgz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=e371e26c38dd0f92c837e8c85932f5e5
diff --git a/metadata/md5-cache/app-backup/duply-2.0.1 b/metadata/md5-cache/app-backup/duply-2.0.1
deleted file mode 100644
index aa351c257113..000000000000
--- a/metadata/md5-cache/app-backup/duply-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.1.tgz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=02da013bd077ed748082aec9afca3ec2
diff --git a/metadata/md5-cache/app-backup/duply-2.0.2 b/metadata/md5-cache/app-backup/duply-2.0.2
deleted file mode 100644
index 9963b3ee8a4b..000000000000
--- a/metadata/md5-cache/app-backup/duply-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.2.tgz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/metadata/md5-cache/app-backup/duply-2.0.3 b/metadata/md5-cache/app-backup/duply-2.0.3
deleted file mode 100644
index 5f061806d21c..000000000000
--- a/metadata/md5-cache/app-backup/duply-2.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.3.tgz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/metadata/md5-cache/app-backup/duply-2.3.1 b/metadata/md5-cache/app-backup/duply-2.3.1
new file mode 100644
index 000000000000..0ba0805d20b9
--- /dev/null
+++ b/metadata/md5-cache/app-backup/duply-2.3.1
@@ -0,0 +1,11 @@
+BDEPEND=app-text/txt2man
+DEFINED_PHASES=install
+DESCRIPTION=A shell frontend for duplicity
+EAPI=7
+HOMEPAGE=https://duply.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-backup/duplicity
+SLOT=0
+SRC_URI=https://jztkft.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_2.3.1.tgz
+_md5_=8202593ddd63e5dfa2ad79299735ac3c
diff --git a/metadata/md5-cache/app-backup/mkstage4-0.1 b/metadata/md5-cache/app-backup/mkstage4-0.1
deleted file mode 100644
index 286de78e1d7b..000000000000
--- a/metadata/md5-cache/app-backup/mkstage4-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
-EAPI=6
-HOMEPAGE=https://github.com/TheChymera/mkstage4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=app-shells/bash app-arch/tar
-SLOT=0
-SRC_URI=https://github.com/TheChymera/mkstage4/archive/0.1.tar.gz -> mkstage4-0.1.tar.gz
-_md5_=be4eb44ded36f0719452e33632f5bdab
diff --git a/metadata/md5-cache/app-backup/mkstage4-0.2 b/metadata/md5-cache/app-backup/mkstage4-0.2
deleted file mode 100644
index a74ac91d88b5..000000000000
--- a/metadata/md5-cache/app-backup/mkstage4-0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
-EAPI=7
-HOMEPAGE=https://github.com/TheChymera/mkstage4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=app-arch/tar app-shells/bash
-SLOT=0
-SRC_URI=https://github.com/TheChymera/mkstage4/archive/0.2.tar.gz -> mkstage4-0.2.tar.gz
-_md5_=2092c5f8e9e9668ed7dd554de199b641
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 5e7296e6a148..13cae3ceb1cb 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.4.0 b/metadata/md5-cache/app-benchmarks/geekbench-5.4.0
new file mode 100644
index 000000000000..ce7f0c9cc3ca
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=7
+HOMEPAGE=https://www.geekbench.com/
+KEYWORDS=-* ~amd64
+LICENSE=geekbench
+RESTRICT=bindist mirror
+SLOT=5
+SRC_URI=https://cdn.geekbench.com/Geekbench-5.4.0-Linux.tar.gz
+_md5_=9a599767788fbc4c401ddd93c9b677f0
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.4 b/metadata/md5-cache/app-benchmarks/siege-4.0.4
deleted file mode 100644
index ef007a2cff94..000000000000
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool >=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 HTTP regression testing and benchmarking utility
-EAPI=6
-HOMEPAGE=https://www.joedog.org/siege-home/
-IUSE=libressl ssl
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://download.joedog.org/siege/siege-4.0.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6d7db60d1f583c8f7cb1c33f1c72dfab
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.5 b/metadata/md5-cache/app-benchmarks/siege-4.0.5
deleted file mode 100644
index 978ed1a77577..000000000000
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=A HTTP regression testing and benchmarking utility
-EAPI=7
-HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
-IUSE=libressl ssl
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://download.joedog.org/siege/siege-4.0.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bf71ae254bfaf6173b43164ee0922492
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.8 b/metadata/md5-cache/app-benchmarks/siege-4.0.8
new file mode 100644
index 000000000000..9c4eac79dad9
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/siege-4.0.8
@@ -0,0 +1,14 @@
+BDEPEND=>=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=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=A HTTP regression testing and benchmarking utility
+EAPI=7
+HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
+IUSE=libressl ssl
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=http://download.joedog.org/siege/siege-4.0.8.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e7df52837a1693ca190c3fb1d28babe9
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.04 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.04
deleted file mode 100644
index 5dd125633eed..000000000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=7
-HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.04.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ab63240e7f51849c1be8e5ef3b845776
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.05 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.05
new file mode 100644
index 000000000000..e2f9b4f8f492
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.05
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.05.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ab63240e7f51849c1be8e5ef3b845776
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 524039f888fe..254311b9ac19 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/dvd+rw-tools-7.1-r4 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4
new file mode 100644
index 000000000000..9b57b48baed8
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-cdr/cdrtools sys-devel/m4
+DESCRIPTION=A set of tools for DVD+RW/-RW drives
+EAPI=7
+HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-cdr/cdrtools
+SLOT=0
+SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=aa8d5145bc8d0df6a5454af8994b40c1
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c133db573b1d..c370d1519c61 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/aescrypt-3.0.6b b/metadata/md5-cache/app-crypt/aescrypt-3.0.6b
deleted file mode 100644
index 02e062db5c30..000000000000
--- a/metadata/md5-cache/app-crypt/aescrypt-3.0.6b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile
-DESCRIPTION=Advanced file encryption using AES
-EAPI=7
-HOMEPAGE=https://www.aescrypt.com/
-IUSE=static
-KEYWORDS=~amd64
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=https://www.aescrypt.com/download/v3/aescrypt-3.0.6b.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ce0c8426888fddf9d32b9d961ad0b29
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1 b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
index a5ea5d775fb9..bb5697174252 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=edde6b4f0d05dd8bb32951cee80c7089
+_md5_=0c943b94f116e4deac6078ed90ca5131
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-3.6 b/metadata/md5-cache/app-crypt/libnitrokey-3.6
index 58283c4074cf..5b0c7bda6bd9 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-3.6
+++ b/metadata/md5-cache/app-crypt/libnitrokey-3.6
@@ -5,11 +5,11 @@ DESCRIPTION=Support library for the Nitrokey
 EAPI=7
 HOMEPAGE=https://github.com/Nitrokey/libnitrokey
 IUSE=test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/libnitrokey/archive/v3.6.tar.gz -> libnitrokey-3.6.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90c142219d34086c21aea9d77d51e3d5
+_md5_=4d1958ff03a1479784fa36cc6b624a9d
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
deleted file mode 100644
index 36001508b87f..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30bd9348cde168901cc5599226992248
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.41 b/metadata/md5-cache/app-crypt/monkeysphere-0.41
deleted file mode 100644
index 0a1c0347e27d..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f89b34157cd55d6e07eeea2ee2ab409
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.44 b/metadata/md5-cache/app-crypt/monkeysphere-0.44
index 91ec06853499..4069eba4bf26 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.44
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.44
@@ -3,10 +3,10 @@ DEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0
 DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
 EAPI=7
 HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0= net-misc/openssh
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz
-_md5_=79ca1cc9286f8f3bfa851280c725ad86
+_md5_=8e4a1204861fbe475350f2e08d2f559a
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.1 b/metadata/md5-cache/app-crypt/nitrocli-0.3.1
deleted file mode 100644
index 866acd96a8f2..000000000000
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/hidapi
-DESCRIPTION=A command line tool for interacting with Nitrokey devices.
-EAPI=7
-HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master
-IUSE=debug
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-2.0 GPL-3+ LGPL-3 MIT
-RDEPEND=dev-libs/hidapi app-crypt/gnupg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.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/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.1/download -> nitrocli-0.3.1.crate https://crates.io/api/v1/crates/nitrokey/0.4.0/download -> nitrokey-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/syn/1.0.13/download -> syn-1.0.13.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	ee3fdb62142c867f137d4fab6f1ad34d	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8e37ec93a6c368e2f59d9be5db0ebffa
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.2 b/metadata/md5-cache/app-crypt/nitrocli-0.3.2
deleted file mode 100644
index 531d95546262..000000000000
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/hidapi
-DESCRIPTION=A command line tool for interacting with Nitrokey devices
-EAPI=7
-HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-3+ LGPL-3 MIT
-RDEPEND=dev-libs/hidapi app-crypt/gnupg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.2/download -> nitrocli-0.3.2.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.12/download -> proc-macro-error-0.4.12.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.12/download -> proc-macro-error-attr-0.4.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	ee3fdb62142c867f137d4fab6f1ad34d	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd64a9cc9ffbba95be9f2f5dffa5d1a3
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.3 b/metadata/md5-cache/app-crypt/nitrocli-0.3.3
deleted file mode 100644
index 62d79376c1a1..000000000000
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/hidapi
-DESCRIPTION=A command line tool for interacting with Nitrokey devices.
-EAPI=7
-HOMEPAGE=https://github.com/d-e-s-o/nitrocli.git
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-3+ LGPL-3 MIT
-RDEPEND=dev-libs/hidapi app-crypt/gnupg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nitrocli/0.3.3/download -> nitrocli-0.3.3.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/structopt/0.3.13/download -> structopt-0.3.13.crate https://crates.io/api/v1/crates/structopt-derive/0.4.6/download -> structopt-derive-0.4.6.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cargo	ee3fdb62142c867f137d4fab6f1ad34d	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bde98e784a296cef74fb90824c297494
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.38.1 b/metadata/md5-cache/app-crypt/seahorse-3.38.1
new file mode 100644
index 000000000000..ee9705faa3f0
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/seahorse-3.38.1
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.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.58:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 gui-libs/libhandy:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-libs/libxml2:2 app-crypt/gcr[vala] app-crypt/libsecret[vala] gui-libs/libhandy:1[vala] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your passwords and encryption keys
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
+IUSE=ldap zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.58:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 gui-libs/libhandy:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/seahorse/3.38/seahorse-3.38.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c0334da7335895b9d5f1ff2cae6dbe5c
diff --git a/metadata/md5-cache/app-crypt/tpm2-totp-0.3.0 b/metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
index 136b88b898c2..5b954d0755e8 100644
--- a/metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
+++ b/metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-totp/releases/download/v0.3.0/tpm2-totp-0.3.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e00714d40cab80dffc69ca343a24da50
+_md5_=da29761f81de10249e8f09d86600fec3
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p7 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p7
deleted file mode 100644
index 49b177a92894..000000000000
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
-DESCRIPTION=Disk encryption with strong security based on TrueCrypt
-EAPI=6
-HOMEPAGE=https://www.veracrypt.fr/en/Home.html
-IUSE=+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X kernel_linux
-KEYWORDS=amd64
-LICENSE=Apache-2.0 BSD truecrypt-3.0
-RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update7.tar.gz -> veracrypt-1.24_p7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=096b8ab8255bf12b1bb4db7f571ff8f9
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
deleted file mode 100644
index de959b7a73e6..000000000000
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/click[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fido2-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/fido2-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyusb[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-auth/ykpers-1.19.0 )
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=7
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=dev-python/click[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fido2-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/fido2-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyusb[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-auth/ykpers-1.19.0 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75c826f743c50da4a20eb044d119c3c1
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2
new file mode 100644
index 000000000000..1df50129507c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/click[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fido2-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/fido2-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyusb[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-auth/ykpers-1.19.0 )
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=7
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=BSD-2
+RDEPEND=dev-python/click[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fido2-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/fido2-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyusb[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-auth/ykpers-1.19.0 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fb3c38456b99b0d591d5cff39a615dbd
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0
new file mode 100644
index 000000000000..395e3376f569
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=7
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/click[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fido2:0/0.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dc45a43fbadf9b3a6116fa36a5d71022
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 9731ad8240a3..b83bcefda74c 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/aspell-af-0.50.0 b/metadata/md5-cache/app-dicts/aspell-af-0.50.0
index 73f4f02f47e1..cccd7f17c713 100644
--- a/metadata/md5-cache/app-dicts/aspell-af-0.50.0
+++ b/metadata/md5-cache/app-dicts/aspell-af-0.50.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Afrikaans language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Afrikaans) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/af/aspell-af-0.50-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=a180e67d06ea6481c5924f65e73b45de
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=3da2103a8113b94595a64a039e55c3cc
diff --git a/metadata/md5-cache/app-dicts/aspell-am-0.03.1 b/metadata/md5-cache/app-dicts/aspell-am-0.03.1
new file mode 100644
index 000000000000..c5a89e8f95a1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-am-0.03.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Amharic) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/am/aspell6-am-0.03-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=d79e69c50c1dc3cc3cee85c9bb7ffba6
diff --git a/metadata/md5-cache/app-dicts/aspell-ar-1.2.0 b/metadata/md5-cache/app-dicts/aspell-ar-1.2.0
new file mode 100644
index 000000000000..5c8c59124802
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ar-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Arabic) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ar/aspell6-ar-1.2-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=d7c2299766af330bcd5d7a92bf865498
diff --git a/metadata/md5-cache/app-dicts/aspell-ast-0.01 b/metadata/md5-cache/app-dicts/aspell-ast-0.01
new file mode 100644
index 000000000000..d700f7ae6630
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ast-0.01
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Asturian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-0.01.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=6b8088cb7f2629e91d8ffab4f27eaf34
diff --git a/metadata/md5-cache/app-dicts/aspell-az-0.02.0 b/metadata/md5-cache/app-dicts/aspell-az-0.02.0
new file mode 100644
index 000000000000..20d1565e83c5
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-az-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Azerbaijani) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/az/aspell6-az-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=dfae478862df53ec60576eb488248130
diff --git a/metadata/md5-cache/app-dicts/aspell-be-0.01-r1 b/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
index f856fb75ddab..e3e7bf05d3ad 100644
--- a/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
+++ b/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Belarusian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Belarusian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 IUSE=classic
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/be/aspell5-be-0.01.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=e9eb595cb79f120af58971439b08dc78
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=8f5ba4f0b2b27ab89c8dd62a659d1502
diff --git a/metadata/md5-cache/app-dicts/aspell-bg-4.1.0 b/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
index 5b8c472b12c7..0750ceda0fb7 100644
--- a/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
+++ b/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Bulgarian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Bulgarian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/bg/aspell6-bg-4.1-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=c222b76ded49582feb28e96b58a7d047
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=093075834dc75f8c24cd868638061415
diff --git a/metadata/md5-cache/app-dicts/aspell-bn-0.01.1.1 b/metadata/md5-cache/app-dicts/aspell-bn-0.01.1.1
new file mode 100644
index 000000000000..affcd8d17c51
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-bn-0.01.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Bengali) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/bn/aspell6-bn-0.01.1-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=ddd00a327197a956a778f5e835b68123
diff --git a/metadata/md5-cache/app-dicts/aspell-br-0.50.2 b/metadata/md5-cache/app-dicts/aspell-br-0.50.2
index 9618476c4405..bc36f01b740b 100644
--- a/metadata/md5-cache/app-dicts/aspell-br-0.50.2
+++ b/metadata/md5-cache/app-dicts/aspell-br-0.50.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Breton language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Breton) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/br/aspell-br-0.50-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=9e3ab4b844790301c96d89504b009f73
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=299443cf8e41e464a3bf35a328912d26
diff --git a/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1 b/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
index ebf1ec510ee4..59dff8c0a4a8 100644
--- a/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
+++ b/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Catalan language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Catalan) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=50184193b1a12e65566c9f137d1d3d2e
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=28e0767f84f8fae67edfa9527a7c8152
diff --git a/metadata/md5-cache/app-dicts/aspell-ca-2.5.0 b/metadata/md5-cache/app-dicts/aspell-ca-2.5.0
new file mode 100644
index 000000000000..28ca6548883e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ca-2.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Catalan) language dictionary
+EAPI=7
+HOMEPAGE=https://www.softcatala.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://www.softcatala.org/pub/softcatala/aspell/2.5.0/aspell6-ca-2.5.0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=854a7bb701ac63f7b31a6eece5441376
diff --git a/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614 b/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614
deleted file mode 100644
index 6ff64e43091c..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Czech language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=bf6bdd6f19d24c0e7144dcfebcaad32a
diff --git a/metadata/md5-cache/app-dicts/aspell-cs-20040614.1 b/metadata/md5-cache/app-dicts/aspell-cs-20040614.1
new file mode 100644
index 000000000000..ac5f55aa8f1d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-cs-20040614.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Czech) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=1318d4593c894f6db193c526c17db354
diff --git a/metadata/md5-cache/app-dicts/aspell-csb-0.02.0 b/metadata/md5-cache/app-dicts/aspell-csb-0.02.0
new file mode 100644
index 000000000000..266d4b9933ce
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-csb-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Kashubian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/csb/aspell6-csb-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=b9b3f7b95a8a718814fee6ad84347c35
diff --git a/metadata/md5-cache/app-dicts/aspell-cy-0.50.3 b/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
index 205c9b5acd2e..434789dbaadd 100644
--- a/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
+++ b/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Welsh language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Welsh) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/cy/aspell-cy-0.50-3.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=fc4109ea7511d31b34c99b06bec56578
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=a5987742e2d946ebbdb12a973da8c447
diff --git a/metadata/md5-cache/app-dicts/aspell-da-1.7.42 b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
index 5d41d8903d37..7eb721529f25 100644
--- a/metadata/md5-cache/app-dicts/aspell-da-1.7.42
+++ b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Danish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Danish) language dictionary
 EAPI=7
 HOMEPAGE=https://da.speling.org
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://da.speling.org/filer/new_aspell-da-1.7.42.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=70d2291a6ab800659d1bfcca32bf74c1
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=1f8bd0382364d684429645c22933b7b9
diff --git a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222 b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
index fc61f020ce7c..521470d02e7e 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
+++ b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=German and Swiss-German language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (German and Swiss-German) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=c3255bcdd8fe77f78eb98d316435731f
diff --git a/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0 b/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0
new file mode 100644
index 000000000000..6b6212c512f6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (German, Austria-German and Swiss-German) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20161207-7-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=850ce4080fbc25fa00b10edefd0c5115
diff --git a/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1 b/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
index 154f94e38499..5ad8ef8455a3 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=German (traditional orthography) language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (German (traditional orthography)) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/de-alt/aspell6-de-alt-2.1-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=894495fd5e92be0e59f999b8b0f79578
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=083b5ee0c10182349c9cc1fd0cbec269
diff --git a/metadata/md5-cache/app-dicts/aspell-el-0.08.0 b/metadata/md5-cache/app-dicts/aspell-el-0.08.0
new file mode 100644
index 000000000000..c496029c7a49
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-el-0.08.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Greek) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/el/aspell6-el-0.08-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=90e049e412ed4d3275099d1b5652fd88
diff --git a/metadata/md5-cache/app-dicts/aspell-el-0.50.3 b/metadata/md5-cache/app-dicts/aspell-el-0.50.3
index a7e841747a98..b4eec7dc32d7 100644
--- a/metadata/md5-cache/app-dicts/aspell-el-0.50.3
+++ b/metadata/md5-cache/app-dicts/aspell-el-0.50.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Greek language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Greek) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/el/aspell-el-0.50-3.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=548649b1fb5f880f9982016ac14b77d0
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0 b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
index de27057c3c9a..2ea50a577d33 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (English (US, British, Canadian)) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 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=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2018.04.16-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=70df124e789a65c00af56b1f1f4b5d1b
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2020.12.07.0 b/metadata/md5-cache/app-dicts/aspell-en-2020.12.07.0
new file mode 100644
index 000000000000..c74e816a696c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-en-2020.12.07.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (English (British, Canadian, US)) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Ispell myspell-en_CA-KevinAtkinson Princeton public-domain
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2020.12.07-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f135483f47ccb2ea10c6b126058dc961
diff --git a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2 b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
index 6fe5b0ee92ed..a2c31da4c177 100644
--- a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
+++ b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Esperanto language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Esperanto) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=4063ce63acb09fd1dd506023f9f1e700
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=1029af59742f4cf86babfb31395c1b97
diff --git a/metadata/md5-cache/app-dicts/aspell-es-1.11.2 b/metadata/md5-cache/app-dicts/aspell-es-1.11.2
new file mode 100644
index 000000000000..045c3f5b378f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-es-1.11.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Spanish) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=683889238187838a98a608c997fcacc4
diff --git a/metadata/md5-cache/app-dicts/aspell-es-1.11_p2 b/metadata/md5-cache/app-dicts/aspell-es-1.11_p2
deleted file mode 100644
index bee440d1073e..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-es-1.11_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Spanish language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=f21ff966dbef0dddd9d6401abf7049f4
diff --git a/metadata/md5-cache/app-dicts/aspell-es-1.9a b/metadata/md5-cache/app-dicts/aspell-es-1.9a
index 318c2b054d77..eaf03d8e7065 100644
--- a/metadata/md5-cache/app-dicts/aspell-es-1.9a
+++ b/metadata/md5-cache/app-dicts/aspell-es-1.9a
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Spanish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Spanish) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/es/aspell6-es-1.9a-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=469cd7b87d374c9d92a92837eb04d2e9
diff --git a/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1 b/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
index ce1c9ee55db5..09895530f324 100644
--- a/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
+++ b/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Estonian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Estonian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/et/aspell6-et-0.1.21-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=0d206c790a24f277eb1ee734fbf7d7be
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=ee6d206e55a420e43ad832e347f3b770
diff --git a/metadata/md5-cache/app-dicts/aspell-fa-0.11.0 b/metadata/md5-cache/app-dicts/aspell-fa-0.11.0
new file mode 100644
index 000000000000..3f1150f37d04
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-fa-0.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Persian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fa/aspell6-fa-0.11-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=a3d7df7574e080eab8de2af8078a02cc
diff --git a/metadata/md5-cache/app-dicts/aspell-fi-0.7.0 b/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
index d909ff209272..33f0bfcd133e 100644
--- a/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
+++ b/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Finnish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Finnish) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/fi/aspell6-fi-0.7-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=8743259c3398e3657a15a973c8e7815e
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=4986fb21bb7f0035cc30161e7b88253e
diff --git a/metadata/md5-cache/app-dicts/aspell-fo-0.2.16.1 b/metadata/md5-cache/app-dicts/aspell-fo-0.2.16.1
new file mode 100644
index 000000000000..71a76b10125c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-fo-0.2.16.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Faroese) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fo/aspell5-fo-0.2.16-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=581c5285874ab5173d0b7913616608c7
diff --git a/metadata/md5-cache/app-dicts/aspell-fo-0.51.0 b/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
index 9302ca4cc5fb..ee30aba6412d 100644
--- a/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Faroese language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Faroese) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/fo/aspell-fo-0.51-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=bff1ec12cb0d5cb47e1c686137b8d57d
diff --git a/metadata/md5-cache/app-dicts/aspell-fr-0.50.3 b/metadata/md5-cache/app-dicts/aspell-fr-0.50.3
new file mode 100644
index 000000000000..0f4ee40b19b7
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-fr-0.50.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (French) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=5660bb18d909f45558cd13eb03992266
diff --git a/metadata/md5-cache/app-dicts/aspell-fr-0.60 b/metadata/md5-cache/app-dicts/aspell-fr-0.60
deleted file mode 100644
index e282808d9207..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-fr-0.60
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=French language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=4cf4e46e56d2c0654787704f7980aa3d
diff --git a/metadata/md5-cache/app-dicts/aspell-fy-0.12.0 b/metadata/md5-cache/app-dicts/aspell-fy-0.12.0
new file mode 100644
index 000000000000..778614d1896f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-fy-0.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Frisian Frysk) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fy/aspell6-fy-0.12-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=5b676ac70458a69e7f3c3cd1f27f94e2
diff --git a/metadata/md5-cache/app-dicts/aspell-ga-0.50.4 b/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
index bfe61f505cf0..fa8e5e1cd1f6 100644
--- a/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
+++ b/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Irish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Irish) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ga/aspell-ga-0.50-4.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=b110bf84cc29cab6150cbd98028c18ae
diff --git a/metadata/md5-cache/app-dicts/aspell-ga-5.1.0 b/metadata/md5-cache/app-dicts/aspell-ga-5.1.0
new file mode 100644
index 000000000000..0cbe5c69144d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ga-5.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Irish) language dictionary
+EAPI=7
+HOMEPAGE=https://cadhan.com/gaelspell/ https://github.com/kscanne/gaelspell
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://github.com/kscanne/gaelspell/releases/download/v5.1/aspell5-ga-5.1-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=8f3d6ccd6062e8e077485f00533ee69e
diff --git a/metadata/md5-cache/app-dicts/aspell-gd-0.1.1.1 b/metadata/md5-cache/app-dicts/aspell-gd-0.1.1.1
new file mode 100644
index 000000000000..1965a3347cf8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-gd-0.1.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Scottish Gaelic) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/gd/aspell5-gd-0.1.1-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=bab13de3883942674aac6bdd4cfec50e
diff --git a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2 b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
index 94e59d60592c..3b0787967bdf 100644
--- a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
+++ b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Galician language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Galician) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/gl/aspell6-gl-0.5a-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=9701cf7cea93e2c339c268029b7aad6a
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=308a3fa9c0e3b9e6a8a201f1b0d48481
diff --git a/metadata/md5-cache/app-dicts/aspell-grc-0.02.0 b/metadata/md5-cache/app-dicts/aspell-grc-0.02.0
new file mode 100644
index 000000000000..7ba5d834aee5
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-grc-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Ancient Greek) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/grc/aspell6-grc-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f24efd5d1d472a97ff389877ba888f1b
diff --git a/metadata/md5-cache/app-dicts/aspell-gu-0.03.0 b/metadata/md5-cache/app-dicts/aspell-gu-0.03.0
new file mode 100644
index 000000000000..bb570eca26a1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-gu-0.03.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Gujarati) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/gu/aspell6-gu-0.03-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=4c3d6aefbb202dcd141c3cc1022b4405
diff --git a/metadata/md5-cache/app-dicts/aspell-gv-0.50.0 b/metadata/md5-cache/app-dicts/aspell-gv-0.50.0
new file mode 100644
index 000000000000..c774bf4a9ed9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-gv-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Manx Gaelic) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/gv/aspell-gv-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=3dfc350c9afa9a6653fed7bd5d3e8898
diff --git a/metadata/md5-cache/app-dicts/aspell-he-1.0.0 b/metadata/md5-cache/app-dicts/aspell-he-1.0.0
index 52d2de906bbd..87c01cc88265 100644
--- a/metadata/md5-cache/app-dicts/aspell-he-1.0.0
+++ b/metadata/md5-cache/app-dicts/aspell-he-1.0.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Hebrew language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Hebrew) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/he/aspell6-he-1.0-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=bc4bfb858088bb8104518074650157b2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=71ef79f7fe81de0088c74a225a748c0a
diff --git a/metadata/md5-cache/app-dicts/aspell-hi-0.02.0 b/metadata/md5-cache/app-dicts/aspell-hi-0.02.0
new file mode 100644
index 000000000000..e30f434d4e96
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hi-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Hindi) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hi/aspell6-hi-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=a14ffe1e984895f40c03724f543a72c8
diff --git a/metadata/md5-cache/app-dicts/aspell-hil-0.11.0 b/metadata/md5-cache/app-dicts/aspell-hil-0.11.0
new file mode 100644
index 000000000000..a3c8807673e3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hil-0.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Hiligaynon) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hil/aspell5-hil-0.11-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=5eff10ffb32e024938b5a4fcbbcf6536
diff --git a/metadata/md5-cache/app-dicts/aspell-hr-0.51.0 b/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
index ae407f652928..e0a8a27af029 100644
--- a/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Croatian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Croatian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hr/aspell-hr-0.51-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=608c12c43da708b32c74fb02dd03c2bd
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=949853aab965438c719b08fa74d8b289
diff --git a/metadata/md5-cache/app-dicts/aspell-hsb-0.02.0 b/metadata/md5-cache/app-dicts/aspell-hsb-0.02.0
new file mode 100644
index 000000000000..f471e91f893a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hsb-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Upper Sorbian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hsb/aspell6-hsb-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=838eb81108c74d367d46cd4a94baf586
diff --git a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2 b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
deleted file mode 100644
index 585b3eab440e..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Hungarian language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=8349ca34133ca7b0f6d615cb521a2491
diff --git a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2.0 b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2.0
new file mode 100644
index 000000000000..b3a0628c0967
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Hungarian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=b94bd165a9b705f0cf895a80a307699a
diff --git a/metadata/md5-cache/app-dicts/aspell-hus-0.03.1 b/metadata/md5-cache/app-dicts/aspell-hus-0.03.1
new file mode 100644
index 000000000000..1c532dedf828
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hus-0.03.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Huastec Tenek) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hus/aspell6-hus-0.03-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=4046ee6950ce59785abe453160b1efcf
diff --git a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0 b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
deleted file mode 100644
index ca866ed2dcb7..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Armenian language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=b8a17bf51d54c926e236b5c19d49c367
diff --git a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0.0 b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0.0
new file mode 100644
index 000000000000..e6b01471836e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Armenian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=5c89e5417e2430a9fffe52c16dd11a81
diff --git a/metadata/md5-cache/app-dicts/aspell-ia-0.50.1 b/metadata/md5-cache/app-dicts/aspell-ia-0.50.1
new file mode 100644
index 000000000000..7bf584b28977
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ia-0.50.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Interlingua) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ia/aspell-ia-0.50-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=358bc6c1450a266cbc6dd70005d3af01
diff --git a/metadata/md5-cache/app-dicts/aspell-id-1.2.0 b/metadata/md5-cache/app-dicts/aspell-id-1.2.0
new file mode 100644
index 000000000000..1222d6c865df
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-id-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Indonesian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/id/aspell5-id-1.2-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=ff0d8ce59a35c283f1dafe61dfd7122e
diff --git a/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0 b/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0
deleted file mode 100644
index 9dd7e3297e3a..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Icelandic language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/is/aspell-is-0.51.1-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=1e0f9baddecaa37c19814c0cd5fab04d
diff --git a/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0-r1 b/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0-r1
new file mode 100644
index 000000000000..555275aa6457
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Icelandic) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/is/aspell-is-0.51.1-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f0179c3a04404c1e236a3f06006b7a90
diff --git a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901 b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901
deleted file mode 100644
index fb51149ae539..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Italian language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://sourceforge/linguistico/aspell6-it-2.4-20070901-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=3a889f2705f5dac262585ba7ce12a348
diff --git a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0 b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0
new file mode 100644
index 000000000000..3244dd383fd3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Italian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://sourceforge/linguistico/aspell6-it-2.4-20070901-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=a23a3299fa2ccbd316152b19708ffae7
diff --git a/metadata/md5-cache/app-dicts/aspell-kn-0.01.1 b/metadata/md5-cache/app-dicts/aspell-kn-0.01.1
new file mode 100644
index 000000000000..0968d101438c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-kn-0.01.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Kannada) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/kn/aspell6-kn-0.01-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=521782b92113869da54264cdf2f610ee
diff --git a/metadata/md5-cache/app-dicts/aspell-ku-0.20.1 b/metadata/md5-cache/app-dicts/aspell-ku-0.20.1
new file mode 100644
index 000000000000..abd14abe2e9f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ku-0.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Kurdi) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ku/aspell5-ku-0.20-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=c16d26fe4a11cd2cd9d85bcfec8775b3
diff --git a/metadata/md5-cache/app-dicts/aspell-ky-0.01.0 b/metadata/md5-cache/app-dicts/aspell-ky-0.01.0
new file mode 100644
index 000000000000..83b3d44278b1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ky-0.01.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Kirghiz) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ky/aspell6-ky-0.01-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=1b92cc606f2f406a9e39a66fe0819acd
diff --git a/metadata/md5-cache/app-dicts/aspell-la-20020503.0 b/metadata/md5-cache/app-dicts/aspell-la-20020503.0
new file mode 100644
index 000000000000..99836dce327a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-la-20020503.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Latin) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=7e189279795bfc9a9588299a972b008c
diff --git a/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0 b/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0
deleted file mode 100644
index ace1e95f5c61..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Latin language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=ad03c89a8d3b3590c3ea3ca00e21ed0d
diff --git a/metadata/md5-cache/app-dicts/aspell-lt-1.0.1 b/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
index 29a93424cd80..4d8a8a37f8ba 100644
--- a/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
+++ b/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Lithuanian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Lithuanian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/lt/aspell6-lt-1.0-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=3591733898a332b09dfce4221dee0af6
diff --git a/metadata/md5-cache/app-dicts/aspell-lt-1.3.2 b/metadata/md5-cache/app-dicts/aspell-lt-1.3.2
new file mode 100644
index 000000000000..d97d1dd1b497
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-lt-1.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Lithuanian) language dictionary
+EAPI=7
+HOMEPAGE=https://github.com/ispell-lt/ispell-lt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://github.com/ispell-lt/ispell-lt/releases/download/rel-1.3.2/aspell6-lt-1.3.2.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=2ad90b995dd6cef0805e5986cbef9db4
diff --git a/metadata/md5-cache/app-dicts/aspell-lv-0.5.5.1 b/metadata/md5-cache/app-dicts/aspell-lv-0.5.5.1
new file mode 100644
index 000000000000..b9c5fe52bac9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-lv-0.5.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Latvian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/lv/aspell6-lv-0.5.5-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f61fb61c17a1f1021c1ad11efdd75791
diff --git a/metadata/md5-cache/app-dicts/aspell-mg-0.03.0 b/metadata/md5-cache/app-dicts/aspell-mg-0.03.0
new file mode 100644
index 000000000000..fb053e1437ed
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mg-0.03.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Malagasy) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mg/aspell5-mg-0.03-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=346b7eba727986638cc8903e4a5749cc
diff --git a/metadata/md5-cache/app-dicts/aspell-mi-0.50.0 b/metadata/md5-cache/app-dicts/aspell-mi-0.50.0
new file mode 100644
index 000000000000..ef7fb52bf269
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mi-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Maori) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mi/aspell-mi-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=09d9722ef580e25e0a0068e30a51f868
diff --git a/metadata/md5-cache/app-dicts/aspell-mk-0.50.0 b/metadata/md5-cache/app-dicts/aspell-mk-0.50.0
new file mode 100644
index 000000000000..f6df148d0100
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mk-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Macedonian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mk/aspell-mk-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=daa0ae3668eb25275948c178664a2086
diff --git a/metadata/md5-cache/app-dicts/aspell-ml-0.04.1 b/metadata/md5-cache/app-dicts/aspell-ml-0.04.1
new file mode 100644
index 000000000000..43ae33f84e79
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ml-0.04.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Malayalam) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://download-mirror.savannah.gnu.org/releases/smc/Spellchecker/aspell6-ml-0.04-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=155f0097b6846890fbc84fb0a3de8f47
diff --git a/metadata/md5-cache/app-dicts/aspell-mn-0.06.2 b/metadata/md5-cache/app-dicts/aspell-mn-0.06.2
new file mode 100644
index 000000000000..3c773c7710d5
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mn-0.06.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Mongolian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mn/aspell6-mn-0.06-2.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=0163a689ac63afcc35ae520033ec7fa1
diff --git a/metadata/md5-cache/app-dicts/aspell-mr-0.10.0 b/metadata/md5-cache/app-dicts/aspell-mr-0.10.0
new file mode 100644
index 000000000000..7197e019a070
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mr-0.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Marathi) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=eb1ae37cb1cb07be10e277b784670389
diff --git a/metadata/md5-cache/app-dicts/aspell-ms-0.50.0 b/metadata/md5-cache/app-dicts/aspell-ms-0.50.0
new file mode 100644
index 000000000000..478923464e18
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ms-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Malay) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ms/aspell-ms-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=e0ccc876c544ff278e83435272646a77
diff --git a/metadata/md5-cache/app-dicts/aspell-mt-0.50.0 b/metadata/md5-cache/app-dicts/aspell-mt-0.50.0
new file mode 100644
index 000000000000..af2eb6cb0da2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-mt-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Maltese) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/mt/aspell-mt-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=10e016e8f7ec35e58dd038965ca0eec7
diff --git a/metadata/md5-cache/app-dicts/aspell-nb-0.50.1.0-r1 b/metadata/md5-cache/app-dicts/aspell-nb-0.50.1.0-r1
new file mode 100644
index 000000000000..ff5047319cd7
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-nb-0.50.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Norwegian Bokmal) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!app-dicts/aspell-no app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/nb/aspell-nb-0.50.1-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f4168bd126992ef635cf579289d3cff3
diff --git a/metadata/md5-cache/app-dicts/aspell-nds-0.01.0 b/metadata/md5-cache/app-dicts/aspell-nds-0.01.0
new file mode 100644
index 000000000000..9370d74eaaea
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-nds-0.01.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Lower Saxony Plattdüütsch) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/nds/aspell6-nds-0.01-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f62822aa43f3b509cb58553e1785aa9f
diff --git a/metadata/md5-cache/app-dicts/aspell-nl-0.50.2 b/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
index 33d9185f0c3d..361a7fad2716 100644
--- a/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
+++ b/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Dutch language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Dutch) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=freedist
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=f3d6211f786e183e915ef451e9960077
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=0a4281f6d1f17f49c65f689dbfdbfc3f
diff --git a/metadata/md5-cache/app-dicts/aspell-nn-0.50.1.1 b/metadata/md5-cache/app-dicts/aspell-nn-0.50.1.1
new file mode 100644
index 000000000000..fcca80efc194
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-nn-0.50.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Norwegian Nynorsk) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/nn/aspell-nn-0.50.1-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=e5daeee36e77f206588b72e8ee2ec760
diff --git a/metadata/md5-cache/app-dicts/aspell-no-0.50.2 b/metadata/md5-cache/app-dicts/aspell-no-0.50.2
deleted file mode 100644
index 3c6cb6c04866..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-no-0.50.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Norwegian language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/no/aspell-no-0.50-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=3d726eaf3252707676ebeed4aec3ac02
diff --git a/metadata/md5-cache/app-dicts/aspell-no-0.50.2-r1 b/metadata/md5-cache/app-dicts/aspell-no-0.50.2-r1
new file mode 100644
index 000000000000..073a4e529334
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-no-0.50.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Norwegian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=!app-dicts/aspell-nb app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/no/aspell-no-0.50-2.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=fef63ede9dc680ccbe508197d2a4c02c
diff --git a/metadata/md5-cache/app-dicts/aspell-ny-0.01.0 b/metadata/md5-cache/app-dicts/aspell-ny-0.01.0
new file mode 100644
index 000000000000..d4c4d59d242d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ny-0.01.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Chichewa) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ny/aspell5-ny-0.01-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=3eeec3b5d7ed420e98d0fdf23deed035
diff --git a/metadata/md5-cache/app-dicts/aspell-or-0.03.1 b/metadata/md5-cache/app-dicts/aspell-or-0.03.1
new file mode 100644
index 000000000000..c09973153b53
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-or-0.03.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Oriya) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/or/aspell6-or-0.03-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=8a7291541b0d3abf1cad9e4cb10bf2aa
diff --git a/metadata/md5-cache/app-dicts/aspell-pa-0.01.1 b/metadata/md5-cache/app-dicts/aspell-pa-0.01.1
new file mode 100644
index 000000000000..138402216319
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-pa-0.01.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Punjabi) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pa/aspell6-pa-0.01-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=44e480b164cfb81e7299a7bb327faa12
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
index 9d43fb2eee02..1a5be9891081 100644
--- a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
+++ b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Polish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Polish) language dictionary
 EAPI=7
 HOMEPAGE=https://sjp.pl/slownik/en/
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20120418-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=77899b2697151bf853506bf44ccc6480
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210216.0 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210216.0
index 23e83de9e6c4..b87f48b349f9 100644
--- a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210216.0
+++ b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210216.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Polish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Polish) language dictionary
 EAPI=7
 HOMEPAGE=https://sjp.pl/slownik/en/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20210216-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=ea5b209ad7f3578728155bc880b5672d
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=2e6e01790d310d5e2117d24b20d2af3e
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1 b/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
index 2e11f4e1b547..29fb46296a28 100644
--- a/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
+++ b/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Portuguese language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Portuguese) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/pt/aspell-pt-0.50-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
 _md5_=01870341813ce664c649167c4ecd2ba6
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-20190329.1.0 b/metadata/md5-cache/app-dicts/aspell-pt-20190329.1.0
new file mode 100644
index 000000000000..ad4dcbc97248
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-pt-20190329.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Portuguese) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20190329-1-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=54cdc1aaabed5b0fd2e7c18488dbedcb
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-br-20090702.0 b/metadata/md5-cache/app-dicts/aspell-pt-br-20090702.0
new file mode 100644
index 000000000000..bb7f80dc6401
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-pt-br-20090702.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Brazilian Portuguese) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=LGPL-2
+RDEPEND=!<app-dicts/aspell-pt-0.50.2-r1 app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=015a2f030cc987288a67f50eb6ee1668
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-br-20131030.12.0 b/metadata/md5-cache/app-dicts/aspell-pt-br-20131030.12.0
new file mode 100644
index 000000000000..ea51baa53fd1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-pt-br-20131030.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Brazilian Portuguese) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20131030-12-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=3afae4b96d74051e6b5b9f0ec3665169
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702 b/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702
deleted file mode 100644
index 5e43b53623bc..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Brazilian Portuguese language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=LGPL-2
-RDEPEND=!<app-dicts/aspell-pt-0.50.2-r1 >=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=015a2f030cc987288a67f50eb6ee1668
diff --git a/metadata/md5-cache/app-dicts/aspell-qu-0.02.0 b/metadata/md5-cache/app-dicts/aspell-qu-0.02.0
new file mode 100644
index 000000000000..d469d4dae6d3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-qu-0.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Quechua Runasimi) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/qu/aspell6-qu-0.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=82cffcd0ed2635cf6c7e48cb9be3abba
diff --git a/metadata/md5-cache/app-dicts/aspell-ro-3.3.10 b/metadata/md5-cache/app-dicts/aspell-ro-3.3.10
new file mode 100644
index 000000000000..48eee17848d7
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ro-3.3.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Romanian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net https://rospell.wordpress.com/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://sourceforge/rospell/aspell5-ro-3.3.10.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=b4e32c507e7a4e5aa8c67604c639b609
diff --git a/metadata/md5-cache/app-dicts/aspell-ro-3.3.2 b/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
index 6e6043971c8f..a3e89c003a4a 100644
--- a/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
+++ b/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Romanian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Romanian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net https://rospell.wordpress.com/
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=a3d6acf3ef9abde61bf3b322d2d54097
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=2e9e250e0650f4ca2a8d1897e3288f33
diff --git a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1 b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
index 3b9e8305759a..428b1db934e9 100644
--- a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Russian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Russian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=26c00d600176d35b7bfe1b6ab4421a46
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=036a840617c9f45452f46a411e849882
diff --git a/metadata/md5-cache/app-dicts/aspell-rw-0.50.0 b/metadata/md5-cache/app-dicts/aspell-rw-0.50.0
new file mode 100644
index 000000000000..8834a606bd96
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-rw-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Kinyarwanda) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/rw/aspell-rw-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=744913aa3551b5d2bccfe6cd56d89331
diff --git a/metadata/md5-cache/app-dicts/aspell-sc-1.0 b/metadata/md5-cache/app-dicts/aspell-sc-1.0
new file mode 100644
index 000000000000..711ccbba5d5f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-sc-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Sardinian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-1.0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=df838722d150fa43b556870fd5ac8a8a
diff --git a/metadata/md5-cache/app-dicts/aspell-sk-2.01.2 b/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
index d743548f562a..065b12138bca 100644
--- a/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
+++ b/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Slovak language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Slovak) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=35fcd26789c58d3ba76365ddfe71c582
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=b70d92a2d15226be748cf8fffae0d501
diff --git a/metadata/md5-cache/app-dicts/aspell-sk-2.02.0 b/metadata/md5-cache/app-dicts/aspell-sk-2.02.0
new file mode 100644
index 000000000000..b2306503d1ce
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-sk-2.02.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Slovak) language dictionary
+EAPI=7
+HOMEPAGE=https://www.sk-spell.sk.cx/aspell-sk
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://spell.linux.sk/file_download/103/aspell6-sk-2.02-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=3b4657f8b403e73849bdb2b907ccb696
diff --git a/metadata/md5-cache/app-dicts/aspell-sl-0.50.0 b/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
index 7696a661f0f1..d2a9b363d126 100644
--- a/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
+++ b/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Slovenian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Slovenian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sl/aspell-sl-0.50-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=3db7443c678cb6e034bf9ef24dd64520
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=ecdc7780a283436c8fd7721921c66a18
diff --git a/metadata/md5-cache/app-dicts/aspell-sr-0.02 b/metadata/md5-cache/app-dicts/aspell-sr-0.02
new file mode 100644
index 000000000000..48f683c046e1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-sr-0.02
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Serbian) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/sr/aspell6-sr-0.02.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=fc78f020ecf3644c3d76b75fab4988d7
diff --git a/metadata/md5-cache/app-dicts/aspell-sr-0.60 b/metadata/md5-cache/app-dicts/aspell-sr-0.60
deleted file mode 100644
index f85b2feb22db..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-sr-0.60
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Serbian language dictionary for aspell
-EAPI=7
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=http://srpski.org/aspell/aspell6-sr-0.02.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=aa408cc7698c0f91547dd4c03d3985ff
diff --git a/metadata/md5-cache/app-dicts/aspell-sv-0.51.0 b/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
index c25555cf049f..c0d39ddc5826 100644
--- a/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.50
-DESCRIPTION=Swedish language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Swedish) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 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-2
-RDEPEND=>=app-text/aspell-0.50
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=1c6665bc19a469d38a20aed2e07519c2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=f5d8081602922f47b4dca43a5821730d
diff --git a/metadata/md5-cache/app-dicts/aspell-sw-0.50.0 b/metadata/md5-cache/app-dicts/aspell-sw-0.50.0
new file mode 100644
index 000000000000..86960f46030c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-sw-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Swahili Kiswahili) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/sw/aspell-sw-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=cd86c8c56d2401700e6fbf5d639afb40
diff --git a/metadata/md5-cache/app-dicts/aspell-ta-20040424.1 b/metadata/md5-cache/app-dicts/aspell-ta-20040424.1
new file mode 100644
index 000000000000..c34bbdd9a37a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-ta-20040424.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Tamil) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ta/aspell6-ta-20040424-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=ce0ae1031a329104e30dff68a65ac52f
diff --git a/metadata/md5-cache/app-dicts/aspell-te-0.01.2 b/metadata/md5-cache/app-dicts/aspell-te-0.01.2
new file mode 100644
index 000000000000..c8d7326f1c89
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-te-0.01.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Telugu) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/te/aspell6-te-0.01-2.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=b2bbe234294b09c177a15238787f1ec0
diff --git a/metadata/md5-cache/app-dicts/aspell-tet-0.1.1 b/metadata/md5-cache/app-dicts/aspell-tet-0.1.1
new file mode 100644
index 000000000000..35a5ef49cbdb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-tet-0.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Tetum) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-0.1.1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=e5a7a77a6c24ab4a7a4ca59214851f70
diff --git a/metadata/md5-cache/app-dicts/aspell-tk-0.01.0 b/metadata/md5-cache/app-dicts/aspell-tk-0.01.0
new file mode 100644
index 000000000000..ef68394b98d9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-tk-0.01.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Turkmen) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/tk/aspell5-tk-0.01-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=d8fe366cba8ea3a73afad801282166e2
diff --git a/metadata/md5-cache/app-dicts/aspell-tl-0.4.0 b/metadata/md5-cache/app-dicts/aspell-tl-0.4.0
new file mode 100644
index 000000000000..d581b7fba7f1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-tl-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Tagalog) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/aspell6-tl-0.4-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=42ba28ef2e26fd709a2ad37ceed24370
diff --git a/metadata/md5-cache/app-dicts/aspell-tn-1.0.1.0 b/metadata/md5-cache/app-dicts/aspell-tn-1.0.1.0
new file mode 100644
index 000000000000..35ef30eb9ff2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-tn-1.0.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Setswana) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/tn/aspell5-tn-1.0.1-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=2a69701c74e110968e320f60a45a41f4
diff --git a/metadata/md5-cache/app-dicts/aspell-tr-0.50.0 b/metadata/md5-cache/app-dicts/aspell-tr-0.50.0
new file mode 100644
index 000000000000..ab25608fd066
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-tr-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Turkish) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=1c8f87867522a83b9e0cf117de1dc8d1
diff --git a/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0 b/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
index bf69ab3d59bd..a828f6dd68a1 100644
--- a/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
+++ b/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Ukrainian language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Ukrainian) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=f6f67f68c1b26b37b8e0fdecda7d0d43
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=9f635b6e2bfe26dcf9ad17d43b2cf270
diff --git a/metadata/md5-cache/app-dicts/aspell-uz-0.6.0 b/metadata/md5-cache/app-dicts/aspell-uz-0.6.0
new file mode 100644
index 000000000000..b453826aa151
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-uz-0.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Uzbek) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/uz/aspell6-uz-0.6-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=fb7d0b98c68e4882c40138b01b54c096
diff --git a/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1 b/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
index ff01af7ed0e0..04ba5139a94f 100644
--- a/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
+++ b/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=Vietnamese language dictionary for aspell
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Vietnamese) language dictionary
 EAPI=7
 HOMEPAGE=http://aspell.net
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/aspell-0.60
+RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/vi/aspell6-vi-0.01.1-1.tar.bz2
-_eclasses_=aspell-dict-r1	49b150b856cb7c3e5ec380d817731860
-_md5_=a37c0552378aed1557e58839f9132802
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=dc563ed8e3ad153234d1d668024b90fd
diff --git a/metadata/md5-cache/app-dicts/aspell-wa-0.50.0 b/metadata/md5-cache/app-dicts/aspell-wa-0.50.0
new file mode 100644
index 000000000000..78571c920007
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-wa-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Walloon) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/wa/aspell-wa-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=883e5459034162f3a0ec34c7ee3e0dfb
diff --git a/metadata/md5-cache/app-dicts/aspell-yi-0.01.1.1 b/metadata/md5-cache/app-dicts/aspell-yi-0.01.1.1
new file mode 100644
index 000000000000..91dfa9200324
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-yi-0.01.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Yiddish) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/yi/aspell6-yi-0.01.1-1.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=72167081c8c24fade029d50f12fa200f
diff --git a/metadata/md5-cache/app-dicts/aspell-zu-0.50.0 b/metadata/md5-cache/app-dicts/aspell-zu-0.50.0
new file mode 100644
index 000000000000..ae8ee1758887
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-zu-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Zulu) language dictionary
+EAPI=7
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/zu/aspell-zu-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1	dcedc31b2596e3c50d4f7f4b35ded54f
+_md5_=10e17307a7713438e1012cae94587f11
diff --git a/metadata/md5-cache/app-dicts/myspell-af-20080701 b/metadata/md5-cache/app-dicts/myspell-af-20080701
index 5589266a4386..2d76d73f0b99 100644
--- a/metadata/md5-cache/app-dicts/myspell-af-20080701
+++ b/metadata/md5-cache/app-dicts/myspell-af-20080701
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/1109/0/dict-af.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=177c65cf2c3d3582c70d211238fb1024
diff --git a/metadata/md5-cache/app-dicts/myspell-bg-4.3 b/metadata/md5-cache/app-dicts/myspell-bg-4.3
index 9ecfdb331a94..130d9352b3c3 100644
--- a/metadata/md5-cache/app-dicts/myspell-bg-4.3
+++ b/metadata/md5-cache/app-dicts/myspell-bg-4.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/bgoffice/OOo-full-pack-bg-4.3.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=73a7c254630e397452caa172b4f4bb1c
diff --git a/metadata/md5-cache/app-dicts/myspell-ca-2.3.0 b/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
index cbed78ad1708..b59bdb5fbe4d 100644
--- a/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
+++ b/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -> myspell-ca-2.3.0.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=fcbdb3ff6311c18f238eb8e068d33d13
diff --git a/metadata/md5-cache/app-dicts/myspell-cs-20110224 b/metadata/md5-cache/app-dicts/myspell-cs-20110224
index 5e3d03a6069b..8de5b56e2203 100644
--- a/metadata/md5-cache/app-dicts/myspell-cs-20110224
+++ b/metadata/md5-cache/app-dicts/myspell-cs-20110224
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2 MIT
 SLOT=0
 SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> myspell-cs-20110224.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=9b3ab26a0506497f5218043100cc1b95
diff --git a/metadata/md5-cache/app-dicts/myspell-cs-20181003 b/metadata/md5-cache/app-dicts/myspell-cs-20181003
index ed48b7d86c07..682c96a607c6 100644
--- a/metadata/md5-cache/app-dicts/myspell-cs-20181003
+++ b/metadata/md5-cache/app-dicts/myspell-cs-20181003
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Czech dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/czech-dictionaries
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=GPL-2 MIT
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/czech-dictionaries/2018.10/@@download/file/czech-dictionaries.oxt -> myspell-cs-20181003.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=dba5db4211848387ac99c916257502d9
diff --git a/metadata/md5-cache/app-dicts/myspell-cy-20130708 b/metadata/md5-cache/app-dicts/myspell-cy-20130708
index b6e106ac74dd..2f32ed410129 100644
--- a/metadata/md5-cache/app-dicts/myspell-cy-20130708
+++ b/metadata/md5-cache/app-dicts/myspell-cy-20130708
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~am
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> myspell-cy-20130708.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=c9023e3f7addf38b1a0895ac1bad4f3f
diff --git a/metadata/md5-cache/app-dicts/myspell-da-2.3 b/metadata/md5-cache/app-dicts/myspell-da-2.3
index 5f1271283e19..2c6be396ebcd 100644
--- a/metadata/md5-cache/app-dicts/myspell-da-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-da-2.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/2.3/@@download/file/dict-da-2-3.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=19453ea8a305544c0b6c82a2234cee3b
diff --git a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12 b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
index 570009b36fc4..7fc55dfca9ee 100644
--- a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
+++ b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=German (AT,CH,DE) dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 GPL-2 LGPL-3+
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/2017-01.12/@@download/file/dict-de_AT-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/2017-01.12/@@download/file/dict-de_CH-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/2017-01-12/@@download/file/dict-de_DE-frami_2017-01-12.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=f82d52b5dbe20b82502260ca8e6056e2
diff --git a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403 b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
index c578b2526c6c..546f15609789 100644
--- a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
+++ b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_oldspell_2016-04-03.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=4bdf99c9b508ce1320426b8991862d26
diff --git a/metadata/md5-cache/app-dicts/myspell-el-0.9 b/metadata/md5-cache/app-dicts/myspell-el-0.9
index 7ec34b315518..05d1f82848d5 100644
--- a/metadata/md5-cache/app-dicts/myspell-el-0.9
+++ b/metadata/md5-cache/app-dicts/myspell-el-0.9
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=http://elspell.math.upatras.gr/files/ooffice/el_GR-0.9.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=fc25852074021765fa19de66e99507a0
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20170101 b/metadata/md5-cache/app-dicts/myspell-en-20170101
index c702ce4282dd..1992489f1b1e 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20170101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20170101
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-li
 LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2017-01.01/@@download/file/dict-en-20170101.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=a78dfab04f39ca1e3347479769e6db02
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20181101 b/metadata/md5-cache/app-dicts/myspell-en-20181101
index e1533658bfb7..04f41455f8d1 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20181101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20181101
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=English dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
@@ -9,5 +9,5 @@ LICENSE=BSD MIT LGPL-3+
 REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2018-11.01/@@download/file/dict-en-20181101.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=dab907499c5bc180c53fe3fc5dd6ba5a
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20190101 b/metadata/md5-cache/app-dicts/myspell-en-20190101
index bac13d6d2f55..f99599351119 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20190101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20190101
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=English dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
@@ -9,5 +9,5 @@ LICENSE=BSD MIT LGPL-3+
 REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2019-01.01/@@download/file/dict-en-20190101.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=19e08860e97f6b5fbe82081839b34370
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20190101-r1 b/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
index 81bd53a7a194..d6c87e42ebd5 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
+++ b/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=English dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
@@ -10,5 +10,5 @@ RDEPEND=!<dev-libs/hyphen-2.8.8-r1
 REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2019-01.01/@@download/file/dict-en-20190101.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=9f1177fa7d9f84dbe3c309ea92f5ab71
diff --git a/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1 b/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
index 4d6ee2c9f9bc..6ab53ceae6b1 100644
--- a/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
+++ b/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/3377/1/1.0-dev.oxt -> myspell-eo-1.0.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=ccf24b015ae86632ef10101b212d37ce
diff --git a/metadata/md5-cache/app-dicts/myspell-es-0.7 b/metadata/md5-cache/app-dicts/myspell-es-0.7
index 475d46057328..bbe32718ff7c 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-0.7
+++ b/metadata/md5-cache/app-dicts/myspell-es-0.7
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt -> es_ANY-0.7.oxt http://forja.rediris.es/frs/download.php/2934/es_VE.oxt -> es_VE-0.7.oxt http://forja.rediris.es/frs/download.php/2935/es_UY.oxt -> es_UY-0.7.oxt http://forja.rediris.es/frs/download.php/2936/es_SV.oxt -> es_SV-0.7.oxt http://forja.rediris.es/frs/download.php/2937/es_PY.oxt -> es_PY-0.7.oxt http://forja.rediris.es/frs/download.php/2938/es_PR.oxt -> es_PR-0.7.oxt http://forja.rediris.es/frs/download.php/2939/es_PE.oxt -> es_PE-0.7.oxt http://forja.rediris.es/frs/download.php/2940/es_PA.oxt -> es_PA-0.7.oxt http://forja.rediris.es/frs/download.php/2941/es_NI.oxt -> es_NI-0.7.oxt http://forja.rediris.es/frs/download.php/2942/es_MX.oxt -> es_MX-0.7.oxt http://forja.rediris.es/frs/download.php/2943/es_HN.oxt -> es_HN-0.7.oxt http://forja.rediris.es/frs/download.php/2944/es_GT.oxt -> es_GT-0.7.oxt http://forja.rediris.es/frs/download.php/2945/es_ES.oxt -> es_ES-0.7.oxt http://forja.rediris.es/frs/download.php/2946/es_EC.oxt -> es_EC-0.7.oxt http://forja.rediris.es/frs/download.php/2947/es_DO.oxt -> es_DO-0.7.oxt http://forja.rediris.es/frs/download.php/2948/es_CU.oxt -> es_CU-0.7.oxt http://forja.rediris.es/frs/download.php/2949/es_CR.oxt -> es_CR-0.7.oxt http://forja.rediris.es/frs/download.php/2950/es_CO.oxt -> es_CO-0.7.oxt http://forja.rediris.es/frs/download.php/2951/es_CL.oxt -> es_CL-0.7.oxt http://forja.rediris.es/frs/download.php/2952/es_BO.oxt -> es_BO-0.7.oxt http://forja.rediris.es/frs/download.php/2953/es_AR.oxt -> es_AR-0.7.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=93b0affd1f748d9b50d10b6d7adec80b
diff --git a/metadata/md5-cache/app-dicts/myspell-es-2.3 b/metadata/md5-cache/app-dicts/myspell-es-2.3
index f458e43dbe60..9e8084dde5cd 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=https://github.com/sbosio/rla-es/releases/download/v2.3/es_ANY.oxt -> es_ANY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_AR.oxt -> es_AR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_BO.oxt -> es_BO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CL.oxt -> es_CL-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CO.oxt -> es_CO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CR.oxt -> es_CR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CU.oxt -> es_CU-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_DO.oxt -> es_DO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_EC.oxt -> es_EC-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_ES.oxt -> es_ES-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_GT.oxt -> es_GT-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_HN.oxt -> es_HN-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_MX.oxt -> es_MX-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_NI.oxt -> es_NI-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PA.oxt -> es_PA-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PE.oxt -> es_PE-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PH.oxt -> es_PH-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PR.oxt -> es_PR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PY.oxt -> es_PY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_SV.oxt -> es_SV-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_US.oxt -> es_US-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_UY.oxt -> es_UY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_VE.oxt -> es_VE-2.3.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=bdc6ff4bb5d3e340e7dbca9ff2f6001f
diff --git a/metadata/md5-cache/app-dicts/myspell-es-2.6 b/metadata/md5-cache/app-dicts/myspell-es-2.6
index 1a8a1a53c03c..04aaef4c514a 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-2.6
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=GPL-3 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=https://github.com/sbosio/rla-es/releases/download/v2.6/es.oxt -> es-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_AR.oxt -> es_AR-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_BO.oxt -> es_BO-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_CL.oxt -> es_CL-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_CO.oxt -> es_CO-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_CR.oxt -> es_CR-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_CU.oxt -> es_CU-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_DO.oxt -> es_DO-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_EC.oxt -> es_EC-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_ES.oxt -> es_ES-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_GT.oxt -> es_GT-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_HN.oxt -> es_HN-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_MX.oxt -> es_MX-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_NI.oxt -> es_NI-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_PA.oxt -> es_PA-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_PE.oxt -> es_PE-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_PH.oxt -> es_PH-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_PR.oxt -> es_PR-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_PY.oxt -> es_PY-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_SV.oxt -> es_SV-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_US.oxt -> es_US-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_UY.oxt -> es_UY-2.6.oxt https://github.com/sbosio/rla-es/releases/download/v2.6/es_VE.oxt -> es_VE-2.6.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=a9f233a8445bdcbe900dc3153af0e732
diff --git a/metadata/md5-cache/app-dicts/myspell-et-20030606 b/metadata/md5-cache/app-dicts/myspell-et-20030606
index dceeea5cd6f2..a557369d81c8 100644
--- a/metadata/md5-cache/app-dicts/myspell-et-20030606
+++ b/metadata/md5-cache/app-dicts/myspell-et-20030606
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://www.meso.ee/~jjpp/speller/ispell-et_20030606.tar.gz
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=903fbf036edd45d0c0c1afea58cbd790
diff --git a/metadata/md5-cache/app-dicts/myspell-fo-0.4.2 b/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
index 55c72b32c5d2..19c422ba7182 100644
--- a/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
+++ b/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://fo.speling.org/filer/myspell-fo-0.4.2.tar.bz2 https://fo.speling.org/filer/hyph_fo_FO-20040420a.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=5efa640196a25ae0b5fd3a14fc0c3c75
diff --git a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1 b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
index 6154e881eaff..c3baeee55f74 100644
--- a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
+++ b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x8
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-moderne-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-reforme1990-v4.5.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=2374b338ae4728fd30ccb05d12b6620a
diff --git a/metadata/md5-cache/app-dicts/myspell-ga-20160213 b/metadata/md5-cache/app-dicts/myspell-ga-20160213
index 666bb5c3ee33..f3f842fdb863 100644
--- a/metadata/md5-cache/app-dicts/myspell-ga-20160213
+++ b/metadata/md5-cache/app-dicts/myspell-ga-20160213
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> myspell-ga-20160213.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=de4c8a84710186676ea25b791ebdc15d
diff --git a/metadata/md5-cache/app-dicts/myspell-gl-20131013 b/metadata/md5-cache/app-dicts/myspell-gl-20131013
index b601d23be1e0..0fe674f4c171 100644
--- a/metadata/md5-cache/app-dicts/myspell-gl-20131013
+++ b/metadata/md5-cache/app-dicts/myspell-gl-20131013
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> myspell-gl-20131013.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=19f75ec2792fa4beded44e3d19027ecd
diff --git a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15 b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
index 04a94f4dfb98..e50238ba0ea3 100644
--- a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
+++ b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary/2012-08-15/@@download/file/dict-he-2012-08-15.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=50b6b63ca6ef4761b000b265efe67d64
diff --git a/metadata/md5-cache/app-dicts/myspell-hr-20080813 b/metadata/md5-cache/app-dicts/myspell-hr-20080813
index ae518f07c81c..248956c8b3ee 100644
--- a/metadata/md5-cache/app-dicts/myspell-hr-20080813
+++ b/metadata/md5-cache/app-dicts/myspell-hr-20080813
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-hr.oxt -> myspell-hr-20080813.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=3e8f9335c20ed4d3ffc5c32c75fa7bda
diff --git a/metadata/md5-cache/app-dicts/myspell-hu-1.6.1 b/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
index 78c84851a0cf..fac4f5d1bb3e 100644
--- a/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
+++ b/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/magyarispell/hu_HU-1.6.1.tar.gz mirror://sourceforge/magyarispell/huhyphn_v20110815_LibO.tar.gz http://downloadarchive.documentfoundation.org/libreoffice/old/3.6.0.4/rpm/x86/LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	myspell-r2	36682fc8e58634a89e0a56c54eac945c	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3090719460c9e8a591dff74e0e61e071
diff --git a/metadata/md5-cache/app-dicts/myspell-ia-20140518 b/metadata/md5-cache/app-dicts/myspell-ia-20140518
index 22cf37fbfc64..2066bbf8e975 100644
--- a/metadata/md5-cache/app-dicts/myspell-ia-20140518
+++ b/metadata/md5-cache/app-dicts/myspell-ia-20140518
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-ia-2014-05-18.oxt -> myspell-ia-20140518.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=17a9715c2f75127c873ee1ef91d36da3
diff --git a/metadata/md5-cache/app-dicts/myspell-id-2.0 b/metadata/md5-cache/app-dicts/myspell-id-2.0
index 13b6a4fd366e..8ba75d2ca5a0 100644
--- a/metadata/md5-cache/app-dicts/myspell-id-2.0
+++ b/metadata/md5-cache/app-dicts/myspell-id-2.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/2.0/id_id.oxt -> myspell-id-2.0.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=4001aa3ad57c8d579bd5a44985648272
diff --git a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01 b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
index ddb4fa96e543..26e2bdf8d3e0 100644
--- a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
+++ b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/2012.09.01/hunspell-is-2012.09.01.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=7cfda7c8793091ffa185e84eedd7039f
diff --git a/metadata/md5-cache/app-dicts/myspell-it-20081129-r1 b/metadata/md5-cache/app-dicts/myspell-it-20081129-r1
index c1cb4b8625cc..da4a127c19d1 100644
--- a/metadata/md5-cache/app-dicts/myspell-it-20081129-r1
+++ b/metadata/md5-cache/app-dicts/myspell-it-20081129-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=AGPL-3 GPL-3 LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/linguistico/Dizionari.IT_20081129.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=6919e6e99af9dafc8df800e4a912c0fa
diff --git a/metadata/md5-cache/app-dicts/myspell-it-20081129-r2 b/metadata/md5-cache/app-dicts/myspell-it-20081129-r2
index 84fc65844444..bba149efc61a 100644
--- a/metadata/md5-cache/app-dicts/myspell-it-20081129-r2
+++ b/metadata/md5-cache/app-dicts/myspell-it-20081129-r2
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Italian dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/linguistico/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=AGPL-3 GPL-3 LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/linguistico/Dizionari.IT_20081129.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=8938077e69e0b031c6810b58bddf8d74
diff --git a/metadata/md5-cache/app-dicts/myspell-kk-1.1.2 b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
index 74fecd994b2b..5faabc28c3fb 100644
--- a/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
+++ b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+ LGPL-2+
 SLOT=0
 SRC_URI=https://github.com/kergalym/myspell-kk/archive/1.1.2.tar.gz -> myspell-kk-1.1.2.tar.gz
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=86af43adcc579393248e180b5896d503
diff --git a/metadata/md5-cache/app-dicts/myspell-km-1.6 b/metadata/md5-cache/app-dicts/myspell-km-1.6
index 98e31ef5f91b..057ddea280eb 100644
--- a/metadata/md5-cache/app-dicts/myspell-km-1.6
+++ b/metadata/md5-cache/app-dicts/myspell-km-1.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/1.6/sbbic-khmer-spelling-checker-1.6.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=b84552c6cb19be8602a5c2add6bbb29d
diff --git a/metadata/md5-cache/app-dicts/myspell-ku-0.21 b/metadata/md5-cache/app-dicts/myspell-ku-0.21
index 09f9d6a9fb46..1f912d535f5c 100644
--- a/metadata/md5-cache/app-dicts/myspell-ku-0.21
+++ b/metadata/md5-cache/app-dicts/myspell-ku-0.21
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/myspellkurdish/ku_TR-021.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=f4bbf956a42e5287d252761c8fc11c61
diff --git a/metadata/md5-cache/app-dicts/myspell-lt-1.3 b/metadata/md5-cache/app-dicts/myspell-lt-1.3
index b7a4d44527fa..47d61f7908f9 100644
--- a/metadata/md5-cache/app-dicts/myspell-lt-1.3
+++ b/metadata/md5-cache/app-dicts/myspell-lt-1.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD LPPL-1.3b
 SLOT=0
 SRC_URI=https://launchpad.net/ispell-lt/main/1.3/+download/myspell-lt-1.3.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=d2222786de0e21a34f76bbe2f2ced5c0
diff --git a/metadata/md5-cache/app-dicts/myspell-lv-1.3.0 b/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
index 03e3a742d434..77f58edf66d6 100644
--- a/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
+++ b/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dict.dv.lv/download/lv_LV-1.3.0.zip -> myspell-lv-1.3.0.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=d0fbe85503c2634d866c2503a783f300
diff --git a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1 b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
index e1abebd2ab4e..3cc3fde573e5 100644
--- a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
+++ b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-20060316.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=20a326c2c7c9e57093a8471ff0c58e3f
diff --git a/metadata/md5-cache/app-dicts/myspell-mk-20091211 b/metadata/md5-cache/app-dicts/myspell-mk-20091211
index b4c2fa2395f4..4bb3c3f0e895 100644
--- a/metadata/md5-cache/app-dicts/myspell-mk-20091211
+++ b/metadata/md5-cache/app-dicts/myspell-mk-20091211
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-mk.oxt -> myspell-mk-20091211.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=0925a4dc44d5071e00565791f0a075e1
diff --git a/metadata/md5-cache/app-dicts/myspell-ms-20100407 b/metadata/md5-cache/app-dicts/myspell-ms-20100407
index 0d0215002d7b..3981042a710e 100644
--- a/metadata/md5-cache/app-dicts/myspell-ms-20100407
+++ b/metadata/md5-cache/app-dicts/myspell-ms-20100407
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=FDL-1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/ms_my.oxt -> myspell-ms-20100407.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=985814265009234d35d0c5f62ada9c05
diff --git a/metadata/md5-cache/app-dicts/myspell-nb-2.0.10 b/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
index 7510eb3c4087..ebf866ad8c30 100644
--- a/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
+++ b/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-2.0.10.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=f7777e1a06d0ef31e1994b7e880c527a
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
index 4de6ae16a3ab..ca3a0ca4eb70 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Dutch dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://www.opentaal.org
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD-2 CC-BY-3.0
 SLOT=0
 SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=f92e2a91291e8720b584bf18bf84a463
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
index 46d700af12ea..f525012a362c 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Dutch dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://www.opentaal.org
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD-2 CC-BY-3.0
 SLOT=0
 SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=a79f4bcf78c1a1ec01f21d5ca573aab7
diff --git a/metadata/md5-cache/app-dicts/myspell-nn-2.0.10 b/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
index 7538c5613e06..84d2fdd745b9 100644
--- a/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
+++ b/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-2.0.10.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=c0dda1bcea0abb541582737e40cda3f8
diff --git a/metadata/md5-cache/app-dicts/myspell-pl-20130306 b/metadata/md5-cache/app-dicts/myspell-pl-20130306
index 6bf97852a9aa..3b4fa81cc990 100644
--- a/metadata/md5-cache/app-dicts/myspell-pl-20130306
+++ b/metadata/md5-cache/app-dicts/myspell-pl-20130306
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1
 SLOT=0
 SRC_URI=http://sjp.pl/slownik/ort/sjp-myspell-pl-20130306.zip http://www.openoffice.org/pl/pliki/hyph_pl_PL.zip -> myspell-pl-20130306-hyph.zip mirror://sourceforge/synonimy/OOo2-Thesaurus-1.5.zip -> myspell-pl-20130306-thes.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=57445b810b27d47b1ec9b21298a03cdc
diff --git a/metadata/md5-cache/app-dicts/myspell-pt-20120420 b/metadata/md5-cache/app-dicts/myspell-pt-20120420
index 8ad9683e7bad..eae6b4bc45fc 100644
--- a/metadata/md5-cache/app-dicts/myspell-pt-20120420
+++ b/metadata/md5-cache/app-dicts/myspell-pt-20120420
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 MIT
 SLOT=0
 SRC_URI=http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT.oxt preao? ( http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT-preao.oxt )
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=6079150cb44f2e4a71a1a929e05e17a2
diff --git a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0 b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
index 03a12661d8e3..5e630850f312 100644
--- a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
+++ b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=http://pt-br.libreoffice.org/assets/VeroptBRV300AOG.oxt http://wiki.documentfoundation.org/images/f/ff/DicSin-BR.oxt -> myspell-pt-br-3.0.0-thes.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=31ea1454db7827a810968dd540dee891
diff --git a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10 b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
index e9b516395c67..6cf004d68723 100644
--- a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
+++ b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/rospell/ro_RO.3.3.10.zip mirror://sourceforge/rospell/hyph_ro_RO.3.3.10.zip mirror://sourceforge/rospell/th_ro_RO.3.3.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=987ae7ee36a9484a7e9fa3026d5d4a8e
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2 b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
index 4a6fc0be667b..b9c239cd13e0 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0.4.0/@@download/file/dict_pack_ru-aot-0-4-0.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=0ba0981369feb857292fbb8dcd6466df
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20180627 b/metadata/md5-cache/app-dicts/myspell-ru-20180627
index 029f4b97f375..654ecbd88c76 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20180627
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20180627
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/russian-dictionary-pack
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0-4.3/@@download/file/dict_pack_ru-aot-0-4-3.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=046d798ce1ef7cc94d64ef80faeb7327
diff --git a/metadata/md5-cache/app-dicts/myspell-sk-20110224 b/metadata/md5-cache/app-dicts/myspell-sk-20110224
index 10abd539829e..49a684fcb877 100644
--- a/metadata/md5-cache/app-dicts/myspell-sk-20110224
+++ b/metadata/md5-cache/app-dicts/myspell-sk-20110224
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> myspell-sk-20110224.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=9390de3bc8a0da9f35dd665f46b3b094
diff --git a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04 b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
index e57781a3d055..ec5ea963c6e9 100644
--- a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
+++ b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/2012.01.04/pack-sl.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=8c2b0fe806d1b6a4cbf667b3aaf978cf
diff --git a/metadata/md5-cache/app-dicts/myspell-sq-1.6.4 b/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
index ef6412e15cdc..c4f3a1914c95 100644
--- a/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
+++ b/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.shkenca.org/shkarkime/myspell-sq_AL-1.6.4.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=1ad72f9d735e30cd635486a0b79cb39e
diff --git a/metadata/md5-cache/app-dicts/myspell-sv-2.14 b/metadata/md5-cache/app-dicts/myspell-sv-2.14
index 401aafbd2a31..97f5ff188cf7 100644
--- a/metadata/md5-cache/app-dicts/myspell-sv-2.14
+++ b/metadata/md5-cache/app-dicts/myspell-sv-2.14
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=CC-BY-SA-3.0 GPL-2 LGPL-3
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/2.14/ooo_swedish_dict_2.14.oxt https://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> myspell-sv-2.14-hyph.oxt https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> myspell-sv-2.14-thes.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=e6ebc45479d592af2a789e7f17fcc76a
diff --git a/metadata/md5-cache/app-dicts/myspell-sw-20110106 b/metadata/md5-cache/app-dicts/myspell-sw-20110106
index 7f96379529f3..24c53db97ab4 100644
--- a/metadata/md5-cache/app-dicts/myspell-sw-20110106
+++ b/metadata/md5-cache/app-dicts/myspell-sw-20110106
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> myspell-sw-20110106.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=3e74f8bf7005a57b0f4985adcd64e35c
diff --git a/metadata/md5-cache/app-dicts/myspell-tn-20060316 b/metadata/md5-cache/app-dicts/myspell-tn-20060316
index d59e72d1b34b..c7a97eb71d05 100644
--- a/metadata/md5-cache/app-dicts/myspell-tn-20060316
+++ b/metadata/md5-cache/app-dicts/myspell-tn-20060316
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/myspell-tn_ZA-20060316.zip
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=946f82692670c32f8279485460c143ab
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5 b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
index b5934eb54fbd..9409d1632125 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
+++ b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/1.6.5/dict-uk_ua-1.6.5.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=bbc9f75fed6036d11dab1302a2afac68
diff --git a/metadata/md5-cache/app-dicts/myspell-zu-20100126 b/metadata/md5-cache/app-dicts/myspell-zu-20100126
index ac7f21f88a10..1635265b587e 100644
--- a/metadata/md5-cache/app-dicts/myspell-zu-20100126
+++ b/metadata/md5-cache/app-dicts/myspell-zu-20100126
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-zu_za-2010.01.26.oxt -> myspell-zu-20100126.oxt
-_eclasses_=myspell-r2	36682fc8e58634a89e0a56c54eac945c
+_eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
 _md5_=9568a250f067ac6337d1bf93510813df
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index d62fd2f14b5d..eb37d0740b29 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/doxygen-1.9.1 b/metadata/md5-cache/app-doc/doxygen-1.9.1
index 244ced4ed2ba..9859037424b5 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=7
 HOMEPAGE=http://www.doxygen.org
 IUSE=clang debug doc dot doxysearch qt5 sqlite userland_GNU
-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=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!doc? ( test )
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.9.1.src.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f4633f77eccd73ea859c6c6ec6184e1
+_md5_=8d98324fd703c9a4d4452f4fad20ee45
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.6 b/metadata/md5-cache/app-doc/kicad-doc-5.1.6
deleted file mode 100644
index d71c4b4c40a1..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=7
-HOMEPAGE=https://docs.kicad-pcb.org/
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
-REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.6/kicad-doc-5.1.6.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f68e7bc3a96c1796fe49e1ff820c5ae1
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.7 b/metadata/md5-cache/app-doc/kicad-doc-5.1.7
deleted file mode 100644
index ae8ea9bfb29b..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=7
-HOMEPAGE=https://docs.kicad-pcb.org/
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
-REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.7/kicad-doc-5.1.7.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f68e7bc3a96c1796fe49e1ff820c5ae1
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.8 b/metadata/md5-cache/app-doc/kicad-doc-5.1.8
deleted file mode 100644
index f07c204c530b..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=7
-HOMEPAGE=https://docs.kicad.org/
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
-REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.8/kicad-doc-5.1.8.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3698dadab8b8fc2a6a25a9d742d564f9
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3d8ed6d074fc..6b71eb48986b 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/dhex-0.69 b/metadata/md5-cache/app-editors/dhex-0.69
new file mode 100644
index 000000000000..aad99d1e31e5
--- /dev/null
+++ b/metadata/md5-cache/app-editors/dhex-0.69
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=ncurses-based hex-editor with diff mode
+EAPI=7
+HOMEPAGE=https://www.dettus.net/dhex/
+KEYWORDS=~amd64 ~arm ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=https://www.dettus.net/dhex/dhex_0.69.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2b9bab30fd4f46a03bb42331b7634859
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r4 b/metadata/md5-cache/app-editors/emacs-27.1-r4
index 04bfc6dc3ca9..54f8759d9ad5 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1-r4
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8929d9a0111c8b878e2078f690357c0f
+_md5_=7a56a33a895bb35387f31ae88af6d50c
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.91-r1 b/metadata/md5-cache/app-editors/emacs-27.1.91-r1
index 0a591abbb469..e18ff6460483 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.91-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.91-r1
@@ -10,6 +10,6 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
-SRC_URI=mirror://gnu-alpha/emacs/pretest/emacs-27.1.91.tar.xz
+SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-27.1.91.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30bbf2d0c7be523a6a4a03d94a7ed38d
+_md5_=e51e8e6d17b3c40f87e7704e7a0255fe
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
index a456053796b3..92071fc512c3 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
@@ -11,4 +11,4 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 RESTRICT=test
 SLOT=27-vcs
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a5e32132d8bc858f41ca7297237cf14
+_md5_=db681c35d52096677e4778a3a3d62c67
diff --git a/metadata/md5-cache/app-editors/emacs-27.2_rc1 b/metadata/md5-cache/app-editors/emacs-27.2_rc1
new file mode 100644
index 000000000000..44b13290fffb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.2_rc1
@@ -0,0 +1,15 @@
+BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.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-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( 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-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( 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=https://alpha.gnu.org/gnu/emacs/pretest/emacs-27.2-rc1.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e51e8e6d17b3c40f87e7704e7a0255fe
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 913e8dee18ce..c4fde90786f8 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -11,4 +11,4 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7edbac975e94bfd4fc5cc33bd92d5863
+_md5_=3b49a2926571f6d795ab99400793548b
diff --git a/metadata/md5-cache/app-editors/gnome-latex-3.38.0 b/metadata/md5-cache/app-editors/gnome-latex-3.38.0
new file mode 100644
index 000000000000..7f0018c8ebbc
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.38.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/gspell-1.8:0= >=dev-libs/glib-2.56:2 >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0:4 >=gui-libs/amtk-5.2:5 >=gui-libs/tepl-5.0:5 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnome-base/dconf dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated LaTeX environment for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX
+IUSE=+introspection +latexmk rubber
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-text/gspell-1.8:0= >=dev-libs/glib-2.56:2 >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0:4 >=gui-libs/amtk-5.2:5 >=gui-libs/tepl-5.0:5 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnome-base/dconf virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-latex/3.38/gnome-latex-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fe0e62be663a2248ecbc397d433fea8
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1 b/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
deleted file mode 100644
index 71567bc3e9a1..000000000000
--- a/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install 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/v2020.01.16.tar.gz -> kakoune-2020.01.16.tar.gz
-_md5_=facbe827a2cf50f8c32d4e1316d35557
diff --git a/metadata/md5-cache/app-editors/le-1.16.1 b/metadata/md5-cache/app-editors/le-1.16.1
deleted file mode 100644
index 9caeadbe403d..000000000000
--- a/metadata/md5-cache/app-editors/le-1.16.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/ncurses:0= app-arch/xz-utils
-DESCRIPTION=Terminal text editor
-EAPI=6
-HOMEPAGE=http://lav.yar.ru/programs.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://lav.yar.ru/download/le/le-1.16.1.tar.gz
-_md5_=60a32e8e757df9a5db4e1c2fcfd8b14c
diff --git a/metadata/md5-cache/app-editors/le-1.16.3 b/metadata/md5-cache/app-editors/le-1.16.3
deleted file mode 100644
index 3b9af1479307..000000000000
--- a/metadata/md5-cache/app-editors/le-1.16.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=Terminal text editor
-EAPI=6
-HOMEPAGE=http://lav.yar.ru/programs.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://lav.yar.ru/download/le/le-1.16.3.tar.gz
-_md5_=82f2f5c6796525ad3dc13525181932b0
diff --git a/metadata/md5-cache/app-editors/ne-3.1.1 b/metadata/md5-cache/app-editors/ne-3.1.1
deleted file mode 100644
index 593ef5c946ed..000000000000
--- a/metadata/md5-cache/app-editors/ne-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0=[tinfo?]
-DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
-EAPI=6
-HOMEPAGE=http://ne.di.unimi.it/
-IUSE=tinfo
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
-SLOT=0
-SRC_URI=http://ne.di.unimi.it/ne-3.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77e5d4f6ab980d0ddd1460567d185d50
diff --git a/metadata/md5-cache/app-editors/ne-3.3.0 b/metadata/md5-cache/app-editors/ne-3.3.0
index 61b3e1abb27e..e8273b4f313a 100644
--- a/metadata/md5-cache/app-editors/ne-3.3.0
+++ b/metadata/md5-cache/app-editors/ne-3.3.0
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[tinfo]
-DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
-EAPI=6
-HOMEPAGE=http://ne.di.unimi.it/
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=The nice editor, easy to use for the beginner and powerful for the wizard
+EAPI=7
+HOMEPAGE=https://ne.di.unimi.it/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=[tinfo] dev-lang/perl
+RDEPEND=sys-libs/ncurses:= dev-lang/perl
 SLOT=0
-SRC_URI=http://ne.di.unimi.it/ne-3.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f17799316c9892642e42787729b90a5d
+SRC_URI=https://ne.di.unimi.it/ne-3.3.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ce45116e13664833b4df4a41280a936c
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.4-r100 b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
index 1700d44db5a6..03bd0b4c5898 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.4-r100
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
@@ -1,15 +1,15 @@
 BDEPEND=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 ) dev-util/gperf virtual/libiconv virtual/libintl virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= net-libs/libnsl tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= !kernel_Darwin? ( net-libs/libnsl ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Vim-fork focused on extensibility and agility.
 EAPI=7
 HOMEPAGE=https://neovim.io
 IUSE=+lto +nvimpager +tui lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=Apache-2.0 vim
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= net-libs/libnsl tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= !kernel_Darwin? ( net-libs/libnsl ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5ed8bdaa59dae5d5bde3379879986a8
+_md5_=664dd33cc93500cd78fdb3785f864d2c
diff --git a/metadata/md5-cache/app-editors/scite-4.2.1 b/metadata/md5-cache/app-editors/scite-4.2.1
deleted file mode 100644
index d57978bbd187..000000000000
--- a/metadata/md5-cache/app-editors/scite-4.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare pretend
-DEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3= x11-libs/pango lua? ( >=dev-lang/lua-5:0= ) virtual/pkgconfig
-DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring
-EAPI=7
-HOMEPAGE=https://www.scintilla.org/SciTE.html
-IUSE=lua
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=HPND lua? ( MIT )
-RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3= x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
-SLOT=0
-SRC_URI=https://www.scintilla.org/scite421.tgz -> scite-4.2.1.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96de9edfb377b0d04c3ab4d9a420267d
diff --git a/metadata/md5-cache/app-editors/scite-4.3.3 b/metadata/md5-cache/app-editors/scite-4.3.3
deleted file mode 100644
index fe2b25c9c534..000000000000
--- a/metadata/md5-cache/app-editors/scite-4.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm prepare pretend
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
-DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring
-EAPI=7
-HOMEPAGE=https://www.scintilla.org/SciTE.html
-IUSE=lua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=HPND lua? ( MIT )
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
-SLOT=0
-SRC_URI=https://www.scintilla.org/scite433.tgz -> scite-4.3.3.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b57a9cb44e4ad89054c4a430b1ba6308
diff --git a/metadata/md5-cache/app-editors/scite-4.4.4 b/metadata/md5-cache/app-editors/scite-4.4.4
deleted file mode 100644
index d28db693ea54..000000000000
--- a/metadata/md5-cache/app-editors/scite-4.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm prepare pretend
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
-DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring
-EAPI=7
-HOMEPAGE=https://www.scintilla.org/SciTE.html
-IUSE=lua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=HPND lua? ( MIT )
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
-SLOT=0
-SRC_URI=https://www.scintilla.org/scite444.tgz -> scite-4.4.4.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b57a9cb44e4ad89054c4a430b1ba6308
diff --git a/metadata/md5-cache/app-editors/wxhexeditor-0.24 b/metadata/md5-cache/app-editors/wxhexeditor-0.24
deleted file mode 100644
index a72425648ff8..000000000000
--- a/metadata/md5-cache/app-editors/wxhexeditor-0.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare pretend setup
-DEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
-DESCRIPTION=A cross-platform hex editor designed specially for large files
-EAPI=6
-HOMEPAGE=http://www.wxhexeditor.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/wxhexeditor/wxHexEditor-v0.24-src.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=3d1fef9e2df4e80637eef72398a9a0da
diff --git a/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1 b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
new file mode 100644
index 000000000000..e3bd4247d6af
--- /dev/null
+++ b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare pretend setup
+DEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+DESCRIPTION=A cross-platform hex editor designed specially for large files
+EAPI=7
+HOMEPAGE=https://github.com/EUA/wxHexEditor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/wxhexeditor/wxHexEditor-v0.24-src.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=edcecd06d5f4faf926f70d195c5d39b0
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 3bd7364c179e..cbfe014a5d99 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/auctex-12.3 b/metadata/md5-cache/app-emacs/auctex-12.3
index 61ee9306449b..476d8134acbc 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.3
+++ b/metadata/md5-cache/app-emacs/auctex-12.3
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/auctex/
 IUSE=preview-latex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.3.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
-_md5_=6b0dce74332211351065340cf9f9bb2d
+_md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.50 b/metadata/md5-cache/app-emacs/ebuild-mode-1.50
index 05e28368f80e..cdb02f22554e 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.50
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.50
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.50.tar.xz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=c81c5c0ced4a021883a5f4363ede5d44
+_md5_=65c17c1409c9a920d513bc27a78bcfa0
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3 b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
index a7eb984a6d0b..72580ef2af2f 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.51.tar.xz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=86f0a17ba0a7840975202e0b35ccc4d5
+_md5_=fd6c5048bc3e0150e4440b356959034f
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203
deleted file mode 100644
index febfbe118c3d..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND MIT GPL-2+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210203.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
-_md5_=c0f31e6d39f5fa5d1e4f039d9631ba7c
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
new file mode 100644
index 000000000000..1e8bc0e89b55
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
+EAPI=7
+HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=HPND MIT GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210314.tar.xz
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=7ccf14db5981339fbd4cd3214521d145
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4.4 b/metadata/md5-cache/app-emacs/org-mode-9.4.4
index 179fa7d2525e..82f03c203812 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=7
 HOMEPAGE=https://www.orgmode.org/
 IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
 RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.4.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=f8a7b43e5ebeb138bfe3ad90d7b01c9f
+_md5_=fede4d363250c1deddd688d1df5614f2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ee9f941959de..630dc073c02b 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/conmon-2.0.27 b/metadata/md5-cache/app-emulation/conmon-2.0.27
new file mode 100644
index 000000000000..7b245ad15206
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v2.0.27.tar.gz -> conmon-2.0.27.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=12ec421bd3d312a56936162cc34290e8
diff --git a/metadata/md5-cache/app-emulation/fuse-1.6.0 b/metadata/md5-cache/app-emulation/fuse-1.6.0
new file mode 100644
index 000000000000..0339bb91caa8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fuse-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare test
+DEPEND=>=app-emulation/libspectrum-1.5.0[zlib?] dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) backend-gtk3? ( x11-libs/gtk+:3 ) backend-sdl? ( media-libs/libsdl[joystick,sound] ) backend-svga? ( media-libs/svgalib ) gpm? ( backend-fbcon? ( sys-libs/gpm ) ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib ) backend-fbcon? ( virtual/linux-sources ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free Unix Spectrum Emulator by Philip Kendall
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net
+IUSE=alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-emulation/libspectrum-1.5.0[zlib?] dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) backend-gtk3? ( x11-libs/gtk+:3 ) backend-sdl? ( media-libs/libsdl[joystick,sound] ) backend-svga? ( media-libs/svgalib ) gpm? ( backend-fbcon? ( sys-libs/gpm ) ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=?? ( alsa ao backend-sdl pulseaudio ) ?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.6.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b56831d1f04ddd2043573f4ef820c6a6
diff --git a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3 b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3
deleted file mode 100644
index ed0061124374..000000000000
--- a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=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=Utils for the Free Unix Spectrum Emulator by Philip Kendall
-EAPI=6
-HOMEPAGE=http://fuse-emulator.sourceforge.net
-IUSE=audiofile gcrypt jpeg png zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/fuse-emulator/fuse-utils-1.4.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4b11cb51404637486875b4f56e6d67bf
diff --git a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1 b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1
new file mode 100644
index 000000000000..3d6768dd3d81
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=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-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Utils for the Free Unix Spectrum Emulator by Philip Kendall
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net
+IUSE=audiofile gcrypt jpeg png zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-utils-1.4.3.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b5ce7c07b95a80cdd3fafbac058a5b62
diff --git a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1 b/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
deleted file mode 100644
index f8baacccc0aa..000000000000
--- a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
-EAPI=7
-HOMEPAGE=http://gxemul.sourceforge.net/
-IUSE=debug X
-KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/gxemul/GXemul/0.6.0/gxemul-0.6.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a0222beb53ef22fd259c0d04d4beab93
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13-r2 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13-r2
deleted file mode 100644
index 216c76fc9f74..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=6
-HOMEPAGE=https://libguestfs.org/
-IUSE=bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl ruby selinux static-libs systemtap test kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= app-emulation/libguestfs-appliance
-RESTRICT=!test? ( test )
-SLOT=0/1.36
-SRC_URI=https://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7688ef9a704814205715f8288da2a4a0
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15-r2 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15-r2
deleted file mode 100644
index dcdac388f400..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=6
-HOMEPAGE=https://libguestfs.org/
-IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= app-emulation/libguestfs-appliance
-RESTRICT=!test? ( test )
-SLOT=0/1.36
-SRC_URI=https://libguestfs.org/download/1.36-stable/libguestfs-1.36.15.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6711179b0c9591cda3164ccbf3c359db
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r1 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r1
deleted file mode 100644
index 319c2e859643..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub ) >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=6
-HOMEPAGE=https://libguestfs.org/
-IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= app-emulation/libguestfs-appliance
-RESTRICT=!test? ( test )
-SLOT=0/1.38
-SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3098febdd5f5f67ebbec1e3d9dbb2a51
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r102 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r102
deleted file mode 100644
index a18113f5b8a8..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r102
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=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=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= dev-util/gperf >=dev-lang/ocaml-4.03:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) >=dev-ml/ounit-2[ocamlopt] doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
-DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=7
-HOMEPAGE=https://libguestfs.org/
-IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test kernel_linux +lua_single_target_lua5-1
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= app-emulation/libguestfs-appliance
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0/1.38
-SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6bd702a0a8a67160a1f8bfdb80d3d09
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
new file mode 100644
index 000000000000..bf4449d7f310
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
@@ -0,0 +1,16 @@
+BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=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=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= dev-util/gperf >=dev-lang/ocaml-4.03:=[ocamlopt] dev-ml/findlib[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) dev-ml/ounit2[ocamlopt] doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
+DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
+EAPI=7
+HOMEPAGE=https://libguestfs.org/
+IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2= >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig:= sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc:= sys-libs/libxcrypt:= app-emulation/libguestfs-appliance
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0/1.38
+SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0a5d9f4c5c64f7cba573f79c7227fea7
diff --git a/metadata/md5-cache/app-emulation/libspectrum-1.5.0 b/metadata/md5-cache/app-emulation/libspectrum-1.5.0
new file mode 100644
index 000000000000..d5fd04dc6b91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libspectrum-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig >=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-libs/glib:2 audiofile? ( >=media-libs/audiofile-0.3.6 ) bzip2? ( >=app-arch/bzip2-1.0 ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Spectrum emulation library
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net/libspectrum.php
+IUSE=audiofile bzip2 gcrypt zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 audiofile? ( >=media-libs/audiofile-0.3.6 ) bzip2? ( >=app-arch/bzip2-1.0 ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/libspectrum-1.5.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6e4ce4a16f345a3ebc76cdf52f818e07
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index d0e1bfd78b8c..d7cd0791c62e 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9befea8818ffbcc9096326ae8b3e183
+_md5_=c3d331bc17ef208b6c97abaa421b0235
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.4.1 b/metadata/md5-cache/app-emulation/protontricks-1.4.1
deleted file mode 100644
index f3b682767a3b..000000000000
--- a/metadata/md5-cache/app-emulation/protontricks-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/setuptools_scm[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools_scm[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-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 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-emulation/winetricks python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/protontricks/protontricks-1.4.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=23ba080a4e607f4626fc494a1d84919a
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.4.4 b/metadata/md5-cache/app-emulation/protontricks-1.4.4
new file mode 100644
index 000000000000..38a2ce53ec8a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/protontricks-1.4.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-emulation/winetricks python_single_target_pypy3? ( dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/vdf[python_targets_python3_9(-)] ) 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_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) 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_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_pypy3? ( >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install 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_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-emulation/winetricks python_single_target_pypy3? ( dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/vdf[python_targets_python3_9(-)] ) 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_pypy3? ( >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Matoking/protontricks/archive/1.4.4.tar.gz -> protontricks-1.4.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d8cbca4d27cd71dbad627fcdafa14798
diff --git a/metadata/md5-cache/app-emulation/qemu-5.1.0-r3 b/metadata/md5-cache/app-emulation/qemu-5.1.0-r3
deleted file mode 100644
index c559de6758dc..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-5.1.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) dev-lang/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_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=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 ) 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 ) 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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[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_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] xkb? ( x11-libs/libxkbcommon[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(+)] ) 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(+)] ) 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_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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 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 usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb 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_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +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_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=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 ) 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 ) 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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) 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 ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-5.1.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7b9ecc295d456182562a2a795494120
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.173.9 b/metadata/md5-cache/app-emulation/virtio-win-0.1.173.9
deleted file mode 100644
index 841746f718a8..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.173.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=7
-HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.173-9/virtio-win-0.1.173.iso
-_md5_=96a62bea16448183ee170ca1967a9475
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1 b/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1
deleted file mode 100644
index 448b1773f122..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=7
-HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-1/virtio-win-0.1.185.iso
-_md5_=736d931c9d8422a80eb6eb60239a7100
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.187.1 b/metadata/md5-cache/app-emulation/virtio-win-0.1.187.1
deleted file mode 100644
index 6d904df6b480..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.187.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=7
-HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.187-1/virtio-win-0.1.187.iso
-_md5_=736d931c9d8422a80eb6eb60239a7100
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.0 b/metadata/md5-cache/app-emulation/wine-staging-6.0
deleted file mode 100644
index 1e7530486b5a..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-6.0
+++ /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 ) >=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:5.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.0
-SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.0.tar.gz -> wine-staging-6.0.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6809e90f08ca4f10a43f4e5ef8c38d0a
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.4 b/metadata/md5-cache/app-emulation/wine-staging-6.4
new file mode 100644
index 000000000000..e8f17c1e9d01
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.4
@@ -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 ) >=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.0.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.4
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.4.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.4.tar.gz -> wine-staging-6.4.tar.gz )
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=da0f76eacd40a84b09e70c54bdb92992
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
deleted file mode 100644
index d05122b59b92..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
+++ /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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) 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(-)?] ) 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[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 ) >=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 +mono mp3 ncurses 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 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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) 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(-)?] ) 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[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.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.4 ) 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=5.0.2
-SRC_URI=https://dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93b231c5ad561999341eef37aa3f3743
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.3-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.3-r1
deleted file mode 100644
index fb15d2314663..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.3-r1
+++ /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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) 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(-)?] ) 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[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 ) >=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 +mono mp3 ncurses 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 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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) 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(-)?] ) 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[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.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.4 ) 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=5.0.3
-SRC_URI=https://dl.winehq.org/wine/source/5.0/wine-5.0.3.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18aa9e0ee12c5b9b7f2886afa0bff754
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.4 b/metadata/md5-cache/app-emulation/wine-vanilla-6.4
new file mode 100644
index 000000000000..b621c362e7be
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.4
@@ -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 ) >=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.0.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.4
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.4.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75cf20f69a0ace4c399c5579f8852d51
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r4 b/metadata/md5-cache/app-emulation/xen-4.13.2-r4
deleted file mode 100644
index 11b95be9a0c0..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.13.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.13.2
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-3.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1081eb89717d0234f61e4fa26f196ac
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r6 b/metadata/md5-cache/app-emulation/xen-4.13.2-r6
new file mode 100644
index 000000000000..806a39ea95db
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.13.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-5.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-5.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2ddd51d35eca1a878db6b45707d8e02e
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.1-r1 b/metadata/md5-cache/app-emulation/xen-4.14.1-r1
deleted file mode 100644
index 973be5487dc6..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.14.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.14.1
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.1-upstream-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e43850dfdee1f1ba34a4cd93b500c692
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.1-r2 b/metadata/md5-cache/app-emulation/xen-4.14.1-r2
new file mode 100644
index 000000000000..5773abb708b5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.14.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.14.1
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.1-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.1-upstream-patches-2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=77ea1253970cb59b08445540f71a944b
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
index d08073dd33af..57427af043be 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
@@ -10,6 +10,6 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml,threads(+)] >=
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1fdacac9a56b7e04659aacec994f21e1
+_md5_=1c07a5b042399f8f63a28f5da8c9bbf6
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
index 3536d329b12a..acd227cc15a5 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
@@ -10,6 +10,6 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml,threads(+)] >=
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe864bca395f135fbff047f5a3f41b28
+_md5_=f6845628651d78965de27d4716ff2963
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 2962d007c320..eb2e544c8688 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/lynis-3.0.3-r2 b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
new file mode 100644
index 000000000000..5d3f24a5ef2a
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DESCRIPTION=Security and system auditing tool
+EAPI=7
+HOMEPAGE=https://cisofy.com/lynis/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-shells/bash
+SLOT=0
+SRC_URI=https://cisofy.com/files/lynis-3.0.3.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=87e0057eee888bbf1da4102a40683a3a
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 80de5d3244cf..87090e89f356 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
new file mode 100644
index 000000000000..bcc6c4c1722c
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Module for Tuxedo Keyboard
+EAPI=7
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-keyboard
+IUSE=kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.3.tar.gz -> tuxedo-keyboard-3.0.3.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=10db22c86bdb1afadccc50ffc6429212
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index da66a3d5eb03..5278204ff752 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/prometheus-2.21.0 b/metadata/md5-cache/app-metrics/prometheus-2.21.0
deleted file mode 100644
index 4f195b5aa846..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-2.21.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=!app-metrics/prometheus-bin acct-group/prometheus acct-user/prometheus
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=7
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v2.21.0.tar.gz -> prometheus-2.21.0.tar.gz https://dev.gentoo.org/~williamh/dist/prometheus-2.21.0-assets.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=0bee7040d7343f8ea82d66c644e4a392
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.21.0-r1 b/metadata/md5-cache/app-metrics/prometheus-2.21.0-r1
new file mode 100644
index 000000000000..fedc990f1ff0
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.21.0-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=!app-metrics/prometheus-bin acct-group/prometheus acct-user/prometheus
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64 ~arm
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct-group/prometheus acct-user/prometheus
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.21.0.tar.gz -> prometheus-2.21.0.tar.gz https://dev.gentoo.org/~williamh/dist/prometheus-2.21.0-assets.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e1e5ed4c27c51206ee827922d9cbc4bd
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.25.0 b/metadata/md5-cache/app-metrics/prometheus-2.25.0
new file mode 100644
index 000000000000..820074cea790
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.25.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=!app-metrics/prometheus-bin acct-group/prometheus acct-user/prometheus
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64 ~arm
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct-group/prometheus acct-user/prometheus
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.25.0.tar.gz -> prometheus-2.25.0.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-metrics/prometheus/prometheus-2.25.0-asset.tar.xz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.43.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.43.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.zip 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/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/bigtable/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//collectd.org/@v/v0.3.0.mod -> collectd.org%2F@v%2Fv0.3.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!hdr!histogram/hdrhistogram-go/@v/v1.0.1.zip -> github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!hdr!histogram/hdrhistogram-go/@v/v1.0.1.mod -> github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20210208195552-ff826a37aa15.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20210208195552-ff826a37aa15.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20191024131854-af6fa24be0db.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod mirror://goproxy//github.com/apache/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.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200428143746-21a406dcc535.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200907205600-7a23bdc65eef.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200907205600-7a23bdc65eef.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.8.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.8.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.8.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.8.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/bmizerany/pat/@v/v0.0.0-20170815010413-6226ea591a40.mod -> github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.2.mod -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/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/cenkalti/backoff/v4/@v/v4.0.2.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/dave/jennifer/@v/v1.2.0.mod -> github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/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-bitstream/@v/v0.0.0-20180413035011-3522498ce2c8.mod -> github.com%2Fdgryski%2Fgo-bitstream%2F@v%2Fv0.0.0-20180413035011-3522498ce2c8.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20200911182023-62edffca9245.zip -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.zip mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20200911182023-62edffca9245.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.57.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.57.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.57.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.57.0.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.3+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.3+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.zip -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/glycerine/go-unsnap-stream/@v/v0.0.0-20180323001048-9f0cb55181dd.mod -> github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod mirror://goproxy//github.com/glycerine/goconvey/@v/v0.0.0-20190410193231-58a59202ab31.mod -> github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20190410193231-58a59202ab31.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.10.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.10.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.16.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.16.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.20.0.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.8.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.9.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.9.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.2.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.15.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.16.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.16.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.24.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.24.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.8.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.1.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.11.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.11.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.20.0.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.9.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.9.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.12.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.12.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.13.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.13.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.10.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.10.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.12.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.12.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.1.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.2.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/geo/@v/v0.0.0-20190916061304-5b978397cfec.mod -> github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210208152844-1612e9be7af6.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210208152844-1612e9be7af6.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210208152844-1612e9be7af6.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210208152844-1612e9be7af6.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.15.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.15.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.8.1.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.8.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hetznercloud/hcloud-go/@v/v1.23.1.zip -> github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.23.1.zip mirror://goproxy//github.com/hetznercloud/hcloud-go/@v/v1.23.1.mod -> github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.23.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.zip -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.zip mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/flux/@v/v0.65.1.mod -> github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.1.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.8.4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v1.8.4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/influxdata/influxql/@v/v1.1.1-0.20200828144457-65d3ef77d385.mod -> github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20200828144457-65d3ef77d385.mod mirror://goproxy//github.com/influxdata/line-protocol/@v/v0.0.0-20180522152040-32c6aa80de5e.mod -> github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod mirror://goproxy//github.com/influxdata/promql/v2/@v/v2.12.0.mod -> github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod mirror://goproxy//github.com/influxdata/roaring/@v/v0.4.13-0.20180809181101-fc520f41fab6.mod -> github.com%2Finfluxdata%2Froaring%2F@v%2Fv0.4.13-0.20180809181101-fc520f41fab6.mod mirror://goproxy//github.com/influxdata/tdigest/@v/v0.0.0-20181121200506-bf2b5ad3c0a9.mod -> github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod mirror://goproxy//github.com/influxdata/usage-client/@v/v0.0.0-20160829180054-6d3895376368.mod -> github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.0.0.mod -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/jwilder/encoding/@v/v0.0.0-20170811194829-b4e1701a28ef.mod -> github.com%2Fjwilder%2Fencoding%2F@v%2Fv0.0.0-20170811194829-b4e1701a28ef.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20170728055534-ae7887de9fa5.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20170728055534-ae7887de9fa5.mod mirror://goproxy//github.com/klauspost/crc32/@v/v0.0.0-20161016154125-cb6bfca970f6.mod -> github.com%2Fklauspost%2Fcrc32%2F@v%2Fv0.0.0-20161016154125-cb6bfca970f6.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.0.2-0.20170402124221-0bf5dcad4ada.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.0.2-0.20170402124221-0bf5dcad4ada.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.11.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.0-20180907095812-13ff1204f104.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.38.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.38.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.0.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mschoch/smat/@v/v0.0.0-20160514031455-90eadee771ae.mod -> github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/run/@v/v1.1.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.1.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v1.0.0.zip -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v1.0.0.mod -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.3-0.20180606204148-bd9c31933947.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.3-0.20180606204148-bd9c31933947.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/paulbellamy/ratecounter/@v/v0.2.0.mod -> github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.4.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/peterh/liner/@v/v1.0.1-0.20180619022028-8c1271fcf47f.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20180730021639-bffc007b7fd5.mod -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20180730021639-bffc007b7fd5.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/alertmanager/@v/v0.21.0.zip -> github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.zip mirror://goproxy//github.com/prometheus/alertmanager/@v/v0.21.0.mod -> github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/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.6.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.6.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.9.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip 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/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.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/retailnext/hllpp/@v/v1.0.1-0.20180308014038-101a6d2f8b52.mod -> github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20201211165307-7117e9ea2414.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20201211165307-7117e9ea2414.zip mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20201211165307-7117e9ea2414.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20201211165307-7117e9ea2414.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.1.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.2.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.zip -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.zip mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20181202132449-6a9ea43bcacd.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20181202132449-6a9ea43bcacd.mod mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.zip -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod mirror://goproxy//github.com/simonpasquier/klog-gokit/@v/v0.3.0.zip -> github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/simonpasquier/klog-gokit/@v/v0.3.0.mod -> github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/simonpasquier/klog-gokit/v2/@v/v2.0.1.zip -> github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/simonpasquier/klog-gokit/v2/@v/v2.0.1.mod -> github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.0.2.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/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/uber/jaeger-client-go/@v/v2.25.0+incompatible.zip -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.zip mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.25.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v2.4.0+incompatible.zip -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.zip mirror://goproxy//github.com/uber/jaeger-lib/@v/v2.4.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.3.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20180616005107-d6fb6747feb6.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod mirror://goproxy//github.com/xlab/treeprint/@v/v1.0.0.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.0.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.0.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.4.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.4.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.3.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.4.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.4.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.zip -> go.opencensus.io%2F@v%2Fv0.22.5.zip mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//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-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191202143827-86a70503ff7e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201208171446-5f87f3452ae9.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-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.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.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210210192628-66670185b0cd.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210210192628-66670185b0cd.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210210192628-66670185b0cd.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210210192628-66670185b0cd.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200107162124-548cf772de50.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201214210602-f9fddec55a1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20201208040808-7e3f01d25324.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20201208040808-7e3f01d25324.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20201208040808-7e3f01d25324.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20201208040808-7e3f01d25324.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200108203644-89082a384178.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200108203644-89082a384178.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513201620-d5fe73897c97.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513201620-d5fe73897c97.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200828161849-5deb26317202.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20181121035319-3f7ecaa7e8ca.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.0.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20181029234149-ec6d1f5cefe6.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.31.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.31.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.39.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.39.0.zip mirror://goproxy//google.golang.org/api/@v/v0.39.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.39.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190716160619-c506a9f90610.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200108215221-bd8f9a0ef82f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200108215221-bd8f9a0ef82f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200831141814-d751682dd103.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.zip 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/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.zip 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/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/fsnotify/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200605160147-a5ece683394c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200605160147-a5ece683394c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/api/@v/v0.20.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.20.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.20.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9d3436f20af8f8f4b3f6bf502488306a
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2 b/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2
deleted file mode 100644
index d652f8feb68a..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-DESCRIPTION=prometheus monitoring system and time series database
-EAPI=7
-HOMEPAGE=https://prometheus.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.15.2/prometheus-2.15.2.linux-amd64.tar.gz
-_md5_=4659bc7ec0f5804c1263513be982f7c0
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.25.0 b/metadata/md5-cache/app-metrics/prometheus-bin-2.25.0
new file mode 100644
index 000000000000..75b493bf4d58
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-bin-2.25.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
+DESCRIPTION=prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://prometheus.io
+KEYWORDS=-* ~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.25.0/prometheus-2.25.0.linux-amd64.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9272c20d6b1ecdeb8dee6bd7447bb5fe
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fa7a99c18d6f..415ae279b9c3 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/banner-1.3.3 b/metadata/md5-cache/app-misc/banner-1.3.3
deleted file mode 100644
index f5223d31de53..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!games-misc/bsd-games
-DESCRIPTION=The well known banner program for Linux
-EAPI=5
-HOMEPAGE=http://cedar-solutions.com
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cc1e6b121784dbabb02973c0b732ffd
diff --git a/metadata/md5-cache/app-misc/banner-1.3.4 b/metadata/md5-cache/app-misc/banner-1.3.4
deleted file mode 100644
index bd44988c3d4d..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The well known banner program for Linux
-EAPI=7
-HOMEPAGE=http://cedar-solutions.com/
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!games-misc/bsd-games
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.4.tar.gz
-_md5_=2d94fdc785b021533296ce272927893b
diff --git a/metadata/md5-cache/app-misc/banner-1.3.5 b/metadata/md5-cache/app-misc/banner-1.3.5
index 26a1fbf9b0c4..8acb796aca02 100644
--- a/metadata/md5-cache/app-misc/banner-1.3.5
+++ b/metadata/md5-cache/app-misc/banner-1.3.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=The well known banner program for Linux
 EAPI=7
 HOMEPAGE=https://github.com/pronovic/banner
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!games-misc/bsd-games
 SLOT=0
 SRC_URI=https://github.com/pronovic/banner/archive/BANNER_V1.3.5.tar.gz
-_md5_=bfa71d36e499632da08b719ac3420129
+_md5_=7120d8c037259470d98701f7f87c59f1
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62 b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
index 2a2f96ae6fc8..79928935212a 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
+++ b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
 IUSE=cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_62_RTM/src/nss-3.62.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b50b9ff882d6009e48bd71ccde9e0f63
+_md5_=56d80241b466e1befa89c018e016aaac
diff --git a/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1 b/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1
deleted file mode 100644
index 39cd96714023..000000000000
--- a/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=dev-libs/libconfig:= sys-libs/ncurses:0=
-DESCRIPTION=DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT
-EAPI=7
-HOMEPAGE=https://github.com/roberthawdon/dfshow
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libconfig:= sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/roberthawdon/dfshow/archive/v0.8.2-beta.tar.gz -> dfshow-0.8.2_beta.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a2e608a7422f4609cb3859b4f3411fde
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
deleted file mode 100644
index f3f2c8387b23..000000000000
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Allows you to pair any remote control with your computer or media center
-EAPI=7
-HOMEPAGE=https://flirc.tv/
-IUSE=+qt5
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=afb9a76ecd44a8d387d55d390d214b15
diff --git a/metadata/md5-cache/app-misc/flirc-3.24.0 b/metadata/md5-cache/app-misc/flirc-3.24.0
deleted file mode 100644
index 12e95f025d7a..000000000000
--- a/metadata/md5-cache/app-misc/flirc-3.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Allows you to pair any remote control with your computer or media center
-EAPI=7
-HOMEPAGE=https://flirc.tv/
-IUSE=+qt5
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.24.0-amd64 -> flirc-3.24.0_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.24.0-armhf -> flirc-3.24.0_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.24.0-i386 -> flirc-3.24.0_x86.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2 b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
index 077e5a852f11..b2dea2977da3 100644
--- a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
+++ b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/geneweb acct-group/geneweb dev-ml/jingoo:= dev-ml/uunf:= >=dev-ml/markup-1.0.0:= dev-ml/unidecode:= dev-ml/calendars:= dev-ml/cppo test? ( dev-ml/ounit )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/geneweb acct-group/geneweb dev-ml/jingoo:= dev-ml/uunf:= >=dev-ml/markup-1.0.0:= dev-ml/unidecode:= dev-ml/calendars:= dev-ml/cppo test? ( dev-ml/ounit2 )
 DESCRIPTION=Genealogy software program with a Web interface
 EAPI=7
 HOMEPAGE=https://github.com/geneweb/geneweb
@@ -11,4 +11,4 @@ RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geneweb/geneweb/archive/v7.0.0.tar.gz -> geneweb-7.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d85b198efc33359659b5a75c08b023d
+_md5_=bbc248c457b288c788cf6b2540670fa9
diff --git a/metadata/md5-cache/app-misc/mc-4.8.25-r1 b/metadata/md5-cache/app-misc/mc-4.8.25-r1
deleted file mode 100644
index e2a9307dd219..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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.25.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=666d03297db4b3280542e54a923b2b36
diff --git a/metadata/md5-cache/app-misc/nnn-3.6 b/metadata/md5-cache/app-misc/nnn-3.6
new file mode 100644
index 000000000000..c4491756db5d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/nnn-3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DESCRIPTION=The missing terminal file browser for X
+EAPI=7
+HOMEPAGE=https://github.com/jarun/nnn
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+SLOT=0
+SRC_URI=https://github.com/jarun/nnn/archive/v3.6.tar.gz -> nnn-3.6.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=06d04e9f87d5617396f4cce2cfa7cafe
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r2 b/metadata/md5-cache/app-misc/note-1.3.3-r2
deleted file mode 100644
index 54bfa1bfd8c0..000000000000
--- a/metadata/md5-cache/app-misc/note-1.3.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl virtual/perl-Storable dev-perl/Config-General crypt? ( dev-perl/Crypt-CBC dev-perl/Crypt-Blowfish dev-perl/Crypt-DES ) mysql? ( dev-perl/DBD-mysql ) dev-lang/perl
-DESCRIPTION=A note taking perl program
-EAPI=6
-HOMEPAGE=https://www.daemon.de/NOTE
-IUSE=crypt dbm general mysql text
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl virtual/perl-Storable dev-perl/Config-General crypt? ( dev-perl/Crypt-CBC dev-perl/Crypt-Blowfish dev-perl/Crypt-DES ) mysql? ( dev-perl/DBD-mysql ) dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.daemon.de/idisk/Apps/note/note-1.3.3.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edeff7cc2f947438ce487f474d3c606f
diff --git a/metadata/md5-cache/app-misc/oneko-1.2-r2 b/metadata/md5-cache/app-misc/oneko-1.2-r2
deleted file mode 100644
index daca76ac91b3..000000000000
--- a/metadata/md5-cache/app-misc/oneko-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=5
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7debdebf97b916a2357e3b2fb34e04c8
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p5 b/metadata/md5-cache/app-misc/oneko-1.2_p5
deleted file mode 100644
index 390a29a7b051..000000000000
--- a/metadata/md5-cache/app-misc/oneko-1.2_p5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=7
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=582e5c2559ba186d31e2a8093fa03ccd
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
index 9a589ced71f4..06035ee74345 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
 EAPI=7
 HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=public-domain
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1102f4357bb60429bdb6793bd361415b
+_md5_=359801083db587c29a1da6d05a4ba2fc
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.8 b/metadata/md5-cache/app-misc/pax-utils-1.2.8
deleted file mode 100644
index 149a042d9f9d..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.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_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.8.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.8.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81dce67866b9a21b3dc9a8ebbc4ff18f
diff --git a/metadata/md5-cache/app-misc/physlock-11-r1 b/metadata/md5-cache/app-misc/physlock-11-r1
deleted file mode 100644
index 07c7173afe2a..000000000000
--- a/metadata/md5-cache/app-misc/physlock-11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/pam
-DESCRIPTION=lightweight Linux console locking tool
-EAPI=6
-HOMEPAGE=https://github.com/muennich/physlock
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/pam
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v11.tar.gz -> physlock-11.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96bb0a55cc83e4493861ecec3d5209a8
diff --git a/metadata/md5-cache/app-misc/physlock-13 b/metadata/md5-cache/app-misc/physlock-13
deleted file mode 100644
index 3a7c6eb75cc0..000000000000
--- a/metadata/md5-cache/app-misc/physlock-13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-libs/pam elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Lightweight Linux console locking tool
-EAPI=7
-HOMEPAGE=https://github.com/muennich/physlock
-IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/pam
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v13.tar.gz -> physlock-13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c0b6bff5e9136a6ed013f48c999d3ce
diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2
new file mode 100644
index 000000000000..8fd05d8c6412
--- /dev/null
+++ b/metadata/md5-cache/app-misc/recoll-1.29.2
@@ -0,0 +1,15 @@
+BDEPEND=qt5? ( dev-qt/linguist-tools:5 )
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DESCRIPTION=Personal full text search package
+EAPI=7
+HOMEPAGE=https://www.lesbonscomptes.com/recoll/
+IUSE=camelcase chm doc +inotify qt5 session +spell webengine kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip
+REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a0d9cf123b1b1b607b06a3c0044a5a36
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0 b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
index 18b3113077c5..8d79d1c5193a 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Resolve GCC flag -march=native
 EAPI=7
 HOMEPAGE=https://github.com/hartwork/resolve-march-native
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-devel/gcc-4.2 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/1.0.0.tar.gz -> resolve-march-native-1.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c390e78a0c30861ead8bb4f9fce0b318
+_md5_=def171c73495667836bd551bc921432c
diff --git a/metadata/md5-cache/app-misc/rlwrap-0.43 b/metadata/md5-cache/app-misc/rlwrap-0.43
index 5e5e46baa77d..fcbbc10d06eb 100644
--- a/metadata/md5-cache/app-misc/rlwrap-0.43
+++ b/metadata/md5-cache/app-misc/rlwrap-0.43
@@ -4,9 +4,9 @@ DESCRIPTION=GNU readline wrapper
 EAPI=6
 HOMEPAGE=https://github.com/hanslub42/rlwrap
 IUSE=debug
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz
-_md5_=2b71363c1d9025b4255d058126584d4e
+_md5_=98c0d6b8c226ba274355cb4ba722c7bf
diff --git a/metadata/md5-cache/app-misc/scrub-2.5.2 b/metadata/md5-cache/app-misc/scrub-2.5.2
deleted file mode 100644
index b737333dda19..000000000000
--- a/metadata/md5-cache/app-misc/scrub-2.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=write patterns on disk/file
-EAPI=6
-HOMEPAGE=https://github.com/chaos/scrub
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/chaos/scrub/archive/2.5.2.tar.gz -> scrub-2.5.2.tar.gz
-_md5_=f28dc03e2342690fe7dba9a34a52df59
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.8 b/metadata/md5-cache/app-misc/spacenavd-0.8
index 43c255f654d6..4c033457c7e4 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.8
+++ b/metadata/md5-cache/app-misc/spacenavd-0.8
@@ -5,10 +5,10 @@ DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
 IUSE=X kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.8/spacenavd-0.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=174a6b9b3e009dfb8d23f3e5fdfb8d6d
+_md5_=2dde2581b6d44cf7f355446355cdb02b
diff --git a/metadata/md5-cache/app-misc/wipe-2.3.1 b/metadata/md5-cache/app-misc/wipe-2.3.1
index b3961d1f7f5d..ccdf7bc8fecd 100644
--- a/metadata/md5-cache/app-misc/wipe-2.3.1
+++ b/metadata/md5-cache/app-misc/wipe-2.3.1
@@ -1,11 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=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=Secure file wiping utility based on Peter Gutman's patterns
-EAPI=6
+EAPI=7
 HOMEPAGE=http://wipe.sourceforge.net/
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34c0801827d2f7a48aa15dc4eec83b9d
+_md5_=499770f2ee07c2afb7f44869643e5260
diff --git a/metadata/md5-cache/app-misc/worker-3.8.3-r100 b/metadata/md5-cache/app-misc/worker-3.8.3-r100
deleted file mode 100644
index 296aa4ac1486..000000000000
--- a/metadata/md5-cache/app-misc/worker-3.8.3-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup
-DEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
-EAPI=7
-HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
-IUSE=avfs debug dbus examples libnotify lua +magic xinerama xft lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
-SLOT=0
-SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63bfd37860f4f45b8d1e1f01a69b45a1
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 5c8432d67103..1ad78ca8b47c 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/gnokii-0.6.31-r1 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
deleted file mode 100644
index 5f127cea5130..000000000000
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 ) dev-util/intltool irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) >=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=User space driver and tools for use with mobile phones
-EAPI=6
-HOMEPAGE=https://www.gnokii.org/
-IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_linux
-KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f6ff000834c43be618a3d7d6cc710c0
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2
deleted file mode 100644
index ee9497d0cb58..000000000000
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 ) dev-util/intltool irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) >=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=User space driver and tools for use with mobile phones
-EAPI=6
-HOMEPAGE=https://www.gnokii.org/
-IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_linux
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e76bf1f2ed25e0d6e4c6691a30bbd99
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
index 2e4b8f6b85f7..0ed29a34077c 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
@@ -4,10 +4,10 @@ DESCRIPTION=User space driver and tools for use with mobile phones
 EAPI=6
 HOMEPAGE=https://www.gnokii.org/
 IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_linux
-KEYWORDS=amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools dev-libs/glib:2 bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d702cee207e39c669883da4e0053a626
+_md5_=7f8255b3bf5631f1494ae617f6d70ea4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3dc0d09ce97e..63be42f5996b 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.4.0-r1 b/metadata/md5-cache/app-office/calcurse-4.4.0-r1
deleted file mode 100644
index 721f24d284b6..000000000000
--- a/metadata/md5-cache/app-office/calcurse-4.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile prepare setup
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses:0= >=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 text-based calendar and scheduling application
-EAPI=6
-HOMEPAGE=https://calcurse.org/
-IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses:0=
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://calcurse.org/files/calcurse-4.4.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3140f425bc708c56d2532a917e4302c3
diff --git a/metadata/md5-cache/app-office/libreoffice-7.0.4.2 b/metadata/md5-cache/app-office/libreoffice-7.0.4.2
deleted file mode 100644
index 9972afee04a8..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-7.0.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=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_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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.15 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-7.0*
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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.15 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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 !app-office/openoffice 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_7 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.0.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.0.4//libreoffice-7.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.0.4//libreoffice-help-7.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.0.4.2/src/libreoffice-7.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.0.4.2/src/libreoffice-help-7.0.4.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f525079a21792a1ac56e0aff28b5ffa9
diff --git a/metadata/md5-cache/app-office/libreoffice-7.0.9999 b/metadata/md5-cache/app-office/libreoffice-7.0.9999
deleted file mode 100644
index c7bdce51838e..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-7.0.9999
+++ /dev/null
@@ -1,17 +0,0 @@
-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] >=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_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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.15 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7 python_single_target_python3_8 python_single_target_python3_9
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND=!app-office/libreoffice-l10n
-PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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.15 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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 !app-office/openoffice 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_7 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3332c138d7584d26b2aa46401ff6a98
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.9999 b/metadata/md5-cache/app-office/libreoffice-7.1.9999
new file mode 100644
index 000000000000..93d6396edbc7
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.9999
@@ -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 ) >=dev-vcs/git-1.8.2.1[curl] >=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_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND=!app-office/libreoffice-l10n
+PROPERTIES=live
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7 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 )
+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	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8f77ed9f11a18d35254459adf43dbef
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index ed5520bb4776..837418db91ef 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,6 +1,6 @@
 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] >=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_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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
@@ -8,10 +8,10 @@ IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +db
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 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 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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 !app-office/openoffice 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 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/lxml[python_targets_python3_7(-)] ) 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 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_7 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 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+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	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7142854bbf7a12293fb4d11049ac79e3
+_md5_=df2f7d746f8736cf75c085c0cbbf9d99
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.0.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.0.4.2
deleted file mode 100644
index 489f4461a83d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-7.0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
-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 ~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.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.0.4/rpm/x86_64/LibreOffice_7.0.4_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.0.4/rpm/x86_64/LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.0.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5133735771870ce23bc377e3baa87866
diff --git a/metadata/md5-cache/app-office/texstudio-3.0.4-r1 b/metadata/md5-cache/app-office/texstudio-3.0.4-r1
deleted file mode 100644
index a18e25354175..000000000000
--- a/metadata/md5-cache/app-office/texstudio-3.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2:0[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
-EAPI=7
-HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
-IUSE=video
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2:0[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
-SLOT=0
-SRC_URI=https://github.com/texstudio-org/texstudio/archive/3.0.4.tar.gz -> texstudio-3.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b22e0b09755f993d9d018270c10e79b
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index d4c67a84c71f..d1fc3248a2ef 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/portpeek-3.1.5 b/metadata/md5-cache/app-portage/portpeek-3.1.5
deleted file mode 100644
index cd3e3a31df26..000000000000
--- a/metadata/md5-cache/app-portage/portpeek-3.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
-EAPI=7
-HOMEPAGE=https://www.mpagano.com/blog/?page_id=3
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-portage/gentoolkit-0.5.0 || ( >=sys-apps/portage-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.mpagano.com/downloads/portpeek-3.1.5.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dd576d3739aad1246e9bd6129f8d2343
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 1bef2da04e72..ba0c7684efdf 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/fish-3.2.1 b/metadata/md5-cache/app-shells/fish-3.2.1
new file mode 100644
index 000000000000..45ec7f9104d2
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fish-3.2.1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pexpect[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66646f4718ad53a67185bf5bfe188f6a
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20200914 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20200914
index 9fed2ff6326a..16d4d078c9e8 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20200914
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20200914
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-zsh-completions/archive/20200914.tar.gz -> gentoo-zsh-completions-20200914.tar.gz
-_md5_=26bf9b7e7cce585a9c9c882d68650f3d
+_md5_=4f260f88d9772be6ed9b93a10f8f3d03
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
index 0a0ca44762f3..2586015a8192 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=4cdacd6caf52523afbd752fb334c2f02
+_md5_=6e4e238e603bcd42ed2962c5ce90f367
diff --git a/metadata/md5-cache/app-shells/pdsh-2.34 b/metadata/md5-cache/app-shells/pdsh-2.34
new file mode 100644
index 000000000000..98f2996ec2d0
--- /dev/null
+++ b/metadata/md5-cache/app-shells/pdsh-2.34
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/dejagnu ) >=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=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=A high-performance, parallel remote shell utility
+EAPI=7
+HOMEPAGE=https://github.com/chaos/pdsh
+IUSE=crypt readline rsh test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/chaos/pdsh/archive/pdsh-2.34.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=61ce41dc5bf6a38bbe63ad32dced5267
diff --git a/metadata/md5-cache/app-shells/zsh-completions-0.31.0 b/metadata/md5-cache/app-shells/zsh-completions-0.31.0
index 29dd55dcdf84..954bb7d9f35d 100644
--- a/metadata/md5-cache/app-shells/zsh-completions-0.31.0
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.31.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Additional completion definitions for Zsh
 EAPI=6
 HOMEPAGE=https://github.com/zsh-users/zsh-completions
-KEYWORDS=amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=app-shells/zsh
 SLOT=0
 SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.31.0.tar.gz -> zsh-completions-0.31.0.tar.gz
-_md5_=a4d74eb0d39ea2506dc4766b43f2cc1a
+_md5_=0f395e1e39f58c9d2987ab396388343b
diff --git a/metadata/md5-cache/app-shells/zsh-completions-0.32.0 b/metadata/md5-cache/app-shells/zsh-completions-0.32.0
index 315b2d16abc5..875aa24cf032 100644
--- a/metadata/md5-cache/app-shells/zsh-completions-0.32.0
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.32.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Additional completion definitions for Zsh
 EAPI=7
 HOMEPAGE=https://github.com/zsh-users/zsh-completions
-KEYWORDS=amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=app-shells/zsh
 SLOT=0
 SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.32.0.tar.gz -> zsh-completions-0.32.0.tar.gz
-_md5_=6b58099fc169c74a863dce245073264a
+_md5_=1dba6f31561cb68ec56f217163c50121
diff --git a/metadata/md5-cache/app-shells/zsh-completions-9999 b/metadata/md5-cache/app-shells/zsh-completions-9999
index dd71fadb0c43..3ec27e430a3a 100644
--- a/metadata/md5-cache/app-shells/zsh-completions-9999
+++ b/metadata/md5-cache/app-shells/zsh-completions-9999
@@ -1,11 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Additional completion definitions for Zsh
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/zsh-users/zsh-completions
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=app-shells/zsh
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=4025dcdf6deded724423f2d9ad7f563a
+_md5_=19e1a5977600c59685defd49f70ca3de
diff --git a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1 b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1
deleted file mode 100644
index cf68497f85f6..000000000000
--- a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Fish shell like syntax highlighting for zsh
-EAPI=7
-HOMEPAGE=https://github.com/zsh-users/zsh-syntax-highlighting
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-shells/zsh
-SLOT=0
-SRC_URI=https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.7.0-beta1.tar.gz -> zsh-syntax-highlighting-0.7.0_beta1.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=0bfb22fb6e7c0a53b73a0533c0cc7980
diff --git a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1 b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
index fc3ffc5c0b57..5e8724fb1a89 100644
--- a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
+++ b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Fish shell like syntax highlighting for zsh
 EAPI=7
 HOMEPAGE=https://github.com/zsh-users/zsh-syntax-highlighting
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=app-shells/zsh
 SLOT=0
 SRC_URI=https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.7.1.tar.gz -> zsh-syntax-highlighting-0.7.1.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=d5a1a04ea6027a5412c53b058baf27d3
+_md5_=407e316d2a548146b45b1bc0bbff2924
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a792669b09e8..1eabee1ecab8 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/aspell-0.60.8 b/metadata/md5-cache/app-text/aspell-0.60.8
index cb116e5df304..9263c02aa7a6 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.8
+++ b/metadata/md5-cache/app-text/aspell-0.60.8
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspel
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.8.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e97fce65faab41d7aadb563a0d157d6
+_md5_=678491cd1ad9f1b5cd30df17f0916898
diff --git a/metadata/md5-cache/app-text/aspell-0.60.8-r1 b/metadata/md5-cache/app-text/aspell-0.60.8-r1
new file mode 100644
index 000000000000..7ff8e3a40a2c
--- /dev/null
+++ b/metadata/md5-cache/app-text/aspell-0.60.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=887919d1a0b65684f3dfea76948dc954
diff --git a/metadata/md5-cache/app-text/diction-1.13 b/metadata/md5-cache/app-text/diction-1.13
deleted file mode 100644
index 74de87f29e51..000000000000
--- a/metadata/md5-cache/app-text/diction-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gettext virtual/libintl
-DESCRIPTION=Diction and style checkers for english and german texts
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.moria.de/~michael/diction/diction-1.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eea393696455d4ae9f067638a9a5b742
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.3 b/metadata/md5-cache/app-text/diff-pdf-0.3
deleted file mode 100644
index 79cf0ef32c67..000000000000
--- a/metadata/md5-cache/app-text/diff-pdf-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[X]
-DESCRIPTION=A simple tool for visually comparing two PDF files
-EAPI=6
-HOMEPAGE=http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/
-KEYWORDS=amd64
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.3/diff-pdf-0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=d5911f7c82a5340ff68d708b0ec57708
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2 b/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
index d5a451424967..bfcbc6bea4b5 100644
--- a/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
+++ b/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
@@ -4,10 +4,10 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-g
 DESCRIPTION=A simple tool for visually comparing two PDF files
 EAPI=7
 HOMEPAGE=http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.4.1/diff-pdf-0.4.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=eb52ad42a9ce14eab96fc4f1edec91bb
+_md5_=5ab48ed220131e7dd66b038c82855f27
diff --git a/metadata/md5-cache/app-text/enchant-2.2.15-r1 b/metadata/md5-cache/app-text/enchant-2.2.15-r1
index 4566173e155d..7bda66273f4f 100644
--- a/metadata/md5-cache/app-text/enchant-2.2.15-r1
+++ b/metadata/md5-cache/app-text/enchant-2.2.15-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=7
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell test voikko
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) voikko? ( dev-libs/libvoikko )
 REQUIRED_USE=|| ( hunspell aspell )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
-_md5_=d99a79966f08333f333bc6ab0dd30a7b
+_md5_=06b83bad68a2d06ce9b7ad55e3d6b353
diff --git a/metadata/md5-cache/app-text/gv-3.7.3.90 b/metadata/md5-cache/app-text/gv-3.7.3.90
index 5b3a293acc28..91fb197021e3 100644
--- a/metadata/md5-cache/app-text/gv-3.7.3.90
+++ b/metadata/md5-cache/app-text/gv-3.7.3.90
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-lin
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 SLOT=0
-SRC_URI=mirror://gnu-alpha/gv/gv-3.7.3.90.tar.gz
+SRC_URI=https://alpha.gnu.org/gnu/gv/gv-3.7.3.90.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=f85da99e88bad898841e12af5f017e6c
+_md5_=ddd340e48801f7093d43b059728e8e73
diff --git a/metadata/md5-cache/app-text/iso-codes-4.5.0 b/metadata/md5-cache/app-text/iso-codes-4.5.0
index 8a677add424a..6f39a1bf7cd1 100644
--- a/metadata/md5-cache/app-text/iso-codes-4.5.0
+++ b/metadata/md5-cache/app-text/iso-codes-4.5.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare setup
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/iso-codes-4.5.0/iso-codes-iso-codes-4.5.0.tar.gz -> iso-codes-4.5.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0208b6c7fd6b5d6f1c6113096fb00485
+_md5_=26358bf2329f323eaef2b31c5fd1ad88
diff --git a/metadata/md5-cache/app-text/iso-codes-4.6.0 b/metadata/md5-cache/app-text/iso-codes-4.6.0
new file mode 100644
index 000000000000..45ffb621c9c7
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-4.6.0
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/gettext
+DEFINED_PHASES=prepare setup
+DESCRIPTION=ISO language, territory, currency, script codes and their translations
+EAPI=7
+HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/iso-codes-4.6.0/iso-codes-iso-codes-4.6.0.tar.gz -> iso-codes-4.6.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=67cf6b8ef1f92ced91ecec5c3a4f3c82
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.2 b/metadata/md5-cache/app-text/libgxps-0.3.2
new file mode 100644
index 000000000000..72b89fc67290
--- /dev/null
+++ b/metadata/md5-cache/app-text/libgxps-0.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt gtk-doc? ( dev-util/gtk-doc ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
+DESCRIPTION=Library for handling and rendering XPS documents
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
+IUSE=gtk-doc +introspection jpeg lcms tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.2.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57592102074e379b6b0a590c34b277f6
diff --git a/metadata/md5-cache/app-text/llpp-30 b/metadata/md5-cache/app-text/llpp-30
deleted file mode 100644
index 9044fb0d940a..000000000000
--- a/metadata/md5-cache/app-text/llpp-30
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=>=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec:= sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-misc/xsel app-arch/bzip2 app-text/asciidoc dev-ml/lablgl:=[glut,ocamlopt?] media-libs/libXcm x11-libs/libXau x11-libs/libXdmcp x11-libs/libXmu dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=7
-HOMEPAGE=https://github.com/moosotc/llpp
-IUSE=+ocamlopt
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3
-RDEPEND=>=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec:= sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-misc/xsel
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=https://github.com/moosotc/llpp/archive/v30.tar.gz -> llpp-30.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7205b23770fa58ed2c6b545090e4c97
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.3.22 b/metadata/md5-cache/app-text/master-pdf-editor-5.3.22
deleted file mode 100644
index f5e47b694be9..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.3.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A complete solution for viewing and editing PDF files
-EAPI=7
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=>=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5 >=dev-qt/qtsvg-5.4.1:5 >=media-gfx/sane-backends-1.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://code-industry.net/public/master-pdf-editor-5.3.22_qt5.amd64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c10cba7be227055572b43cce9667073e
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.4.38-r1 b/metadata/md5-cache/app-text/master-pdf-editor-5.4.38-r1
deleted file mode 100644
index a84f7555b9ac..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.4.38-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=A complete solution for viewing and editing PDF files
-EAPI=7
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=>=media-gfx/sane-backends-1.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://code-industry.net/public/master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efd691f4e94865c4ed0bd5d0ab6e82d9
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.6.80 b/metadata/md5-cache/app-text/master-pdf-editor-5.6.80
deleted file mode 100644
index 9a95fad5d536..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.6.80
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A complete solution for viewing and editing PDF files
-EAPI=7
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=dev-libs/nss >=dev-qt/qtcore-5.9.8:5 >=dev-qt/qtgui-5.9.8:5 >=dev-qt/qtnetwork-5.9.8:5 >=dev-qt/qtprintsupport-5.9.8:5 >=dev-qt/qtsvg-5.9.8:5 >=media-gfx/sane-backends-1.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://code-industry.net/public/master-pdf-editor-5.6.80-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d77d9b3788679cdc4fba6b858907cae4
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.7.08 b/metadata/md5-cache/app-text/master-pdf-editor-5.7.08
deleted file mode 100644
index 1103a5f51fa4..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.7.08
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A complete solution for viewing and editing PDF files
-EAPI=7
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=dev-libs/nss >=dev-qt/qtcore-5.12.9:5 >=dev-qt/qtgui-5.12.9:5 >=dev-qt/qtnetwork-5.12.9:5 >=dev-qt/qtprintsupport-5.12.9:5 >=dev-qt/qtsvg-5.12.9:5 >=media-gfx/sane-backends-1.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://code-industry.net/public/master-pdf-editor-5.7.08-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d3ce1fd5ac00e4cfb6173e86061bf6b
diff --git a/metadata/md5-cache/app-text/par-1.52-r1 b/metadata/md5-cache/app-text/par-1.52-r1
deleted file mode 100644
index 89df0bd0c4ae..000000000000
--- a/metadata/md5-cache/app-text/par-1.52-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!dev-util/par !app-arch/par
-DESCRIPTION=a paragraph reformatter, vaguely similar to fmt, but better
-EAPI=6
-HOMEPAGE=http://www.nicemice.net/par/
-KEYWORDS=~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=par
-SLOT=0
-SRC_URI=http://www.nicemice.net/par/Par152.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f24101ba3af8840e49ad3f0a4834bd6
diff --git a/metadata/md5-cache/app-text/qpdf-10.2.0 b/metadata/md5-cache/app-text/qpdf-10.2.0
deleted file mode 100644
index 388718b2eb32..000000000000
--- a/metadata/md5-cache/app-text/qpdf-10.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=7
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0/28
-SRC_URI=mirror://sourceforge/qpdf/qpdf-10.2.0.tar.gz
-_md5_=217f79c0121d31d28195dd7a166c08df
diff --git a/metadata/md5-cache/app-text/qpdf-10.3.0 b/metadata/md5-cache/app-text/qpdf-10.3.0
deleted file mode 100644
index ebae5464db27..000000000000
--- a/metadata/md5-cache/app-text/qpdf-10.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=7
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0/28
-SRC_URI=mirror://sourceforge/qpdf/qpdf-10.3.0.tar.gz
-_md5_=217f79c0121d31d28195dd7a166c08df
diff --git a/metadata/md5-cache/app-text/qpdf-10.3.1 b/metadata/md5-cache/app-text/qpdf-10.3.1
new file mode 100644
index 000000000000..e5dc6bf92acf
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-10.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=7
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples libressl ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
+SLOT=0/28
+SRC_URI=mirror://sourceforge/qpdf/qpdf-10.3.1.tar.gz
+_md5_=217f79c0121d31d28195dd7a166c08df
diff --git a/metadata/md5-cache/app-text/reed-5.4 b/metadata/md5-cache/app-text/reed-5.4
index 02599f047680..65a1c6ff9187 100644
--- a/metadata/md5-cache/app-text/reed-5.4
+++ b/metadata/md5-cache/app-text/reed-5.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure prepare
 DEPEND=sys-libs/ncurses
 DESCRIPTION=This is a text pager (text file viewer), used to display etexts
-EAPI=5
+EAPI=7
 HOMEPAGE=http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.sacredchao.net/software/reed/reed-5.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6913eaa429c5e991d4b7ae6c01b719bc
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4ffaa7726192f672768bd7fb3bf24680
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r1 b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
deleted file mode 100644
index 6e0e1ff61ceb..000000000000
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 >=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 XSLT Parser in C++
-EAPI=6
-HOMEPAGE=http://www.gingerall.org/sablotron.html
-IUSE=perl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/expat-1.95.6-r1
-SLOT=0
-SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8266008f83a05063b439cf38322f2010
diff --git a/metadata/md5-cache/app-text/scdoc-9999 b/metadata/md5-cache/app-text/scdoc-9999
index a8867e59d85b..2282b95e2011 100644
--- a/metadata/md5-cache/app-text/scdoc-9999
+++ b/metadata/md5-cache/app-text/scdoc-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c00dfaffd0bc0acd5e32a7248ea62ab
+_md5_=80df616ed00d31cf8f7cdcd9531a132f
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.38.0 b/metadata/md5-cache/app-text/yelp-tools-3.38.0
new file mode 100644
index 000000000000..97200192f853
--- /dev/null
+++ b/metadata/md5-cache/app-text/yelp-tools-3.38.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of tools for building and converting documentation
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ freedist ) GPL-2+
+RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-tools/3.38/yelp-tools-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f10b494da11769be32c347e16fcc7111
diff --git a/metadata/md5-cache/app-text/yodl-4.02.01 b/metadata/md5-cache/app-text/yodl-4.02.01
deleted file mode 100644
index 15ecd8275f63..000000000000
--- a/metadata/md5-cache/app-text/yodl-4.02.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-util/icmake-8.00.00
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=6
-HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.01/yodl-4.02.01.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2faee8c3960fed9b68c474172dede51c
diff --git a/metadata/md5-cache/app-text/yodl-4.02.02-r1 b/metadata/md5-cache/app-text/yodl-4.02.02-r1
deleted file mode 100644
index f323d6b3d9ce..000000000000
--- a/metadata/md5-cache/app-text/yodl-4.02.02-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/icmake-8.00.00 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric )
-DEFINED_PHASES=compile install prepare pretend
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=7
-HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.02/yodl-4.02.02.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c75933a88b2850d7673008073ad54f3
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
index a0ef5fd4dfff..6f1236723e89 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.9.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cf3826bb7fb820981e92dd81a7d5372
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4c39b7939ef04c559fbce5e5a1c4b6c
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
deleted file mode 100644
index 4728366c9821..000000000000
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-text/mupdf:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
-DESCRIPTION=PDF plug-in for zathura
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/mupdf:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
-SLOT=0
-SRC_URI=https://github.com/pwmt/zathura-pdf-mupdf/archive/0.3.5.tar.gz -> zathura-pdf-mupdf-0.3.5.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cac714d198a752f730f7f28106b16ef
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index a2b87b59d319..7dd556c82f18 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/atkmm-2.28.1 b/metadata/md5-cache/dev-cpp/atkmm-2.28.1
index 9ae87e267b0a..00f76d6ab272 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.28.1
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.28.1
@@ -5,10 +5,10 @@ DESCRIPTION=C++ interface for the ATK library
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org
 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.46.2:2[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(-)?] >=dev-libs/atk-2.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/libsigc++-2.3.2:2[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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.28/atkmm-2.28.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=99c61e24964a34e4ed46bee043e65c09
+_md5_=b62510f681603ab6a24246f7f2e1a993
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.14.2 b/metadata/md5-cache/dev-cpp/cairomm-1.14.2
index bd694825aa38..eb3897db3fcf 100644
--- a/metadata/md5-cache/dev-cpp/cairomm-1.14.2
+++ b/metadata/md5-cache/dev-cpp/cairomm-1.14.2
@@ -5,11 +5,11 @@ DESCRIPTION=C++ bindings for the Cairo vector graphics library
 EAPI=7
 HOMEPAGE=https://cairographics.org/cairomm/
 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=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.6.0:2[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(-)?] >=x11-libs/cairo-1.12.0[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://www.cairographics.org/releases/cairomm-1.14.2.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=540ec811d953f026bdf21064e9db93a4
+_md5_=b345d59c5a76b911b58b330c7959c997
diff --git a/metadata/md5-cache/dev-cpp/catch-2.13.4 b/metadata/md5-cache/dev-cpp/catch-2.13.4
index 1ce36570c352..c926b40f528c 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.13.4
+++ b/metadata/md5-cache/dev-cpp/catch-2.13.4
@@ -4,10 +4,10 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -> Catch2-2.13.4.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c4f9732c521a3e0a2e571fe14eb15a1
+_md5_=0c275917ff80ee301d6775618df8092e
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.2 b/metadata/md5-cache/dev-cpp/mm-common-1.0.2
index 6398823102ed..1cab485f3d04 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.2
+++ b/metadata/md5-cache/dev-cpp/mm-common-1.0.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2cba40cc83e4369d4a09e3065880a39c
+_md5_=2397f24e9ef8c32a1624a24c65b03e6c
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
index 0d000a3078b0..dc0b96e560a8 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=JSON for Modern C++
 EAPI=7
 HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
 IUSE=doc test
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.9.1.tar.gz -> nlohmann_json-3.9.1.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> nlohmann_json-3.9.1-testdata.tar.gz )
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a6ed4ef17dab1840260b484e2a2ab59
+_md5_=1a8cbb3c9dc5f06c2af8d45857653c36
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.42.2 b/metadata/md5-cache/dev-cpp/pangomm-2.42.2
index 1293cae2ff06..503aaedf6740 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.42.2
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.42.2
@@ -5,10 +5,10 @@ DESCRIPTION=C++ interface for pango
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org
 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/cairomm-1.2.2:0[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(-)?] >=dev-cpp/glibmm-2.48.0:2[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(-)?] dev-libs/libsigc++:2[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(-)?] >=x11-libs/pango-1.41.0[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.4
 SRC_URI=mirror://gnome/sources/pangomm/2.42/pangomm-2.42.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c9488b68a544e125dc830b4799e86caa
+_md5_=105eb8dfc2d3394211f77bb61c056711
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0
deleted file mode 100644
index b427a595b019..000000000000
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
-DESCRIPTION=Prometheus Client Library for Modern C++
-EAPI=7
-HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.10.0.tar.gz -> prometheus-cpp-0.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f94cb98af0024e3c531be714dfb972a
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.11.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.11.0
deleted file mode 100644
index 1a120b56cf7f..000000000000
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
-DESCRIPTION=Prometheus Client Library for Modern C++
-EAPI=7
-HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.11.0.tar.gz -> prometheus-cpp-0.11.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d6f38e46e13e5e375e5cea3a6af03e3
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.12.1 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.12.1
deleted file mode 100644
index 10e7ee9e7cf1..000000000000
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
-DESCRIPTION=Prometheus Client Library for Modern C++
-EAPI=7
-HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.12.1.tar.gz -> prometheus-cpp-0.12.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1afe9e98e4d503ecc3b0d4567d30fab6
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0
deleted file mode 100644
index 7d365d5951cc..000000000000
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
-DESCRIPTION=Prometheus Client Library for Modern C++
-EAPI=7
-HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.9.0.tar.gz -> prometheus-cpp-0.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a87abee248d1ea2d414af2fa12fc5db1
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1 b/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1
deleted file mode 100644
index 2f6d479d7e0d..000000000000
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-util/patchelf
-DESCRIPTION=A cross-platform source explorer for C/C++ and Java
-EAPI=6
-HOMEPAGE=https://www.sourcetrail.com/
-IUSE=examples selinux
-KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
-RDEPEND=|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) media-libs/fontconfig media-libs/freetype media-libs/libpng-compat:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.sourcetrail.com/downloads/2018.3.55/linux/64bit -> sourcetrail-2018.3.55.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f02521f10249699dc0e22d5158796b33
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11 b/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11
deleted file mode 100644
index 9263dff86a86..000000000000
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-util/patchelf
-DESCRIPTION=A cross-platform source explorer for C/C++ and Java
-EAPI=6
-HOMEPAGE=https://www.sourcetrail.com/
-IUSE=examples selinux
-KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
-RDEPEND=|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) media-libs/fontconfig media-libs/freetype media-libs/libpng-compat:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.sourcetrail.com/downloads/2019.1.11/linux/64bit -> sourcetrail-2019.1.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f02521f10249699dc0e22d5158796b33
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2019.2.39 b/metadata/md5-cache/dev-cpp/sourcetrail-2019.2.39
deleted file mode 100644
index 2b2146e73966..000000000000
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2019.2.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-util/patchelf
-DESCRIPTION=A cross-platform source explorer for C/C++ and Java
-EAPI=7
-HOMEPAGE=https://www.sourcetrail.com/
-IUSE=examples selinux
-KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
-RDEPEND=|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) media-libs/fontconfig media-libs/freetype media-libs/libpng-compat:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.sourcetrail.com/downloads/2019.2.39/linux/64bit -> sourcetrail-2019.2.39.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3906a84f91dec20a6dda528b99759932
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46 b/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46
deleted file mode 100644
index 0f0e49aa9d44..000000000000
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-util/patchelf
-DESCRIPTION=A cross-platform source explorer for C/C++ and Java
-EAPI=7
-HOMEPAGE=https://www.sourcetrail.com/
-IUSE=examples selinux
-KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
-RDEPEND=|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) media-libs/fontconfig media-libs/freetype media-libs/libpng-compat:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.sourcetrail.com/downloads/2019.3.46/linux/64bit -> sourcetrail-2019.3.46.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3906a84f91dec20a6dda528b99759932
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 719f212575ff..e78d82cf40cc 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/libdbi-drivers-0.9.0-r1 b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
index 99036d638c26..0d26bdc21205 100644
--- a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
@@ -13,4 +13,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cf7cd9f9f3408965309c773b8ee9b904
+_md5_=406ceacafc271432f89b85cb27200df7
diff --git a/metadata/md5-cache/dev-db/libzdb-3.1-r1 b/metadata/md5-cache/dev-db/libzdb-3.1-r1
index 305d52cecdc7..ff74971c4a6e 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.1-r1
+++ b/metadata/md5-cache/dev-db/libzdb-3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=6
 HOMEPAGE=https://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=|| ( postgres mysql sqlite )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98015e717c176942b1ef3ddcc1051428
+_md5_=96c56461433574fa63eb1ef8978aeb8c
diff --git a/metadata/md5-cache/dev-db/libzdb-3.2.2 b/metadata/md5-cache/dev-db/libzdb-3.2.2
index ec689a25ac18..434064a3fbdd 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.2.2
+++ b/metadata/md5-cache/dev-db/libzdb-3.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=6
 HOMEPAGE=https://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=|| ( postgres mysql sqlite )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.tildeslash.com/libzdb/dist/libzdb-3.2.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3c8391e120ace8381e6a2aeecb523b5b
+_md5_=d31dc393c071fd99108ad0d40d37a6f5
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.28 b/metadata/md5-cache/dev-db/lmdb-0.9.28
index f3bf45d821b0..22230c93d1b2 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.28
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.28
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=7
 HOMEPAGE=https://symas.com/lmdb/technical/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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=OPENLDAP
 SLOT=0/0.9.28
 SRC_URI=https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.28/openldap-LMDB_0.9.28.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=29b1d82a1d6c0529be67cd458e95bd6a
+_md5_=798841ccb2862a75ccd6c3c32371dd8a
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
index 6e1d6dc73466..278681ed696f 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
@@ -5,10 +5,10 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 IUSE=ldap libressl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.23.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=499c94fcbae54ea3907c65b41ead1f5f
+_md5_=be55ba1b90d0f9d5d2ea0e8a3f744da7
diff --git a/metadata/md5-cache/dev-db/pg_activity-2.1.3 b/metadata/md5-cache/dev-db/pg_activity-2.1.3
new file mode 100644
index 000000000000..b9b37917e5a8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pg_activity-2.1.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psycopg:2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blessed[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/humanize[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Realtime PostgreSQL database server monitoring tool
+EAPI=7
+HOMEPAGE=https://github.com/dalibo/pg_activity
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL
+RDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blessed[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/humanize[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dalibo/pg_activity/archive/v2.1.3.tar.gz -> pg_activity-2.1.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1141ce16ad30573391252c1756487248
diff --git a/metadata/md5-cache/dev-db/redis-5.0.12 b/metadata/md5-cache/dev-db/redis-5.0.12
index b23792ac8102..601f947d28de 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.12
+++ b/metadata/md5-cache/dev-db/redis-5.0.12
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( tcmalloc jemalloc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.12.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=337a235fa00bf14081161408ae73ae69
+_md5_=3eb93aba36c1ece5fd5fc4530e63f291
diff --git a/metadata/md5-cache/dev-db/redis-6.0.12 b/metadata/md5-cache/dev-db/redis-6.0.12
index 4db7705fb6f2..0196a88149b4 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.12
+++ b/metadata/md5-cache/dev-db/redis-6.0.12
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc ssl tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.12.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5f89ad901d60702673885933bc2ff3c
+_md5_=a533fc8540dcb7be336a979e5e2187cc
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.7 b/metadata/md5-cache/dev-db/unixODBC-2.3.7
deleted file mode 100644
index c55384719ccd..000000000000
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install test
-DEPEND=|| ( 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-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/readline-6.2_p5-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex
-DESCRIPTION=A complete ODBC driver manager
-EAPI=7
-HOMEPAGE=http://www.unixodbc.org/
-IUSE=+minimal odbcmanual 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
-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 LGPL-2.1
-RDEPEND=|| ( 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-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/readline-6.2_p5-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=172d111286c0eb1f624b4cdb40a4b382
diff --git a/metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1 b/metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
index 81b2c97d3165..5286df724f71 100644
--- a/metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
+++ b/metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.33.1 >=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=VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++
-EAPI=5
+BDEPEND=>=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/boost
+DESCRIPTION=VSQLite++ - A well designed and portable SQLite3 Wrapper for C++
+EAPI=7
 HOMEPAGE=http://evilissimo.fedorapeople.org/releases/vsqlite--/
-IUSE=static-libs
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.33.1 dev-db/sqlite:3
+RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=https://github.com/vinzenz/vsqlite--/archive/0.3.13.tar.gz -> vsqlite++-0.3.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f0908cbada8c30288f3e9b722f73e14
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7c8820230ce07c01462b2e1998ddf6c1
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 5b289b0d497a..95ea2c85712a 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/flatzebra-0.1.7 b/metadata/md5-cache/dev-games/flatzebra-0.1.7
index 81d96b512bba..ecbeeed8ec10 100644
--- a/metadata/md5-cache/dev-games/flatzebra-0.1.7
+++ b/metadata/md5-cache/dev-games/flatzebra-0.1.7
@@ -5,9 +5,9 @@ DESCRIPTION=Generic game engine for 2D double-buffering animation
 EAPI=7
 HOMEPAGE=http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.7.tar.gz
-_md5_=618d280abd69ce1c2f7570f192c4c161
+_md5_=9468236520350b6ed9c7d0cf291bbf7d
diff --git a/metadata/md5-cache/dev-games/goatee-0.4.0 b/metadata/md5-cache/dev-games/goatee-0.4.0
new file mode 100644
index 000000000000..a3cc9bbcd1d3
--- /dev/null
+++ b/metadata/md5-cache/dev-games/goatee-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monadic take on a 2,500-year-old board game - library
+EAPI=7
+HOMEPAGE=http://khumba.net/projects/goatee
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-8.6.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.0
+SRC_URI=https://hackage.haskell.org/package/goatee-0.4.0/goatee-0.4.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bdd85c63ba0cfc71fb8508469bab9fbd
diff --git a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98 b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
deleted file mode 100644
index 6d0a2e366d88..000000000000
--- a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig
-DESCRIPTION=backend library for the maitretarot games
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmaitretarot.pkg/0.1.98/libmaitretarot-0.1.98.tar.bz2
-_md5_=9c4bf4a9d647119fae1b2ae18060e277
diff --git a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2 b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
new file mode 100644
index 000000000000..a69414ce4820
--- /dev/null
+++ b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 dev-libs/libxml2
+DESCRIPTION=backend library for the maitretarot games
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmaitretarot.pkg/0.1.98/libmaitretarot-0.1.98.tar.bz2
+_md5_=6645c3296a5418e76bfce85c37f66a20
diff --git a/metadata/md5-cache/dev-games/libmt_client-0.1.98 b/metadata/md5-cache/dev-games/libmt_client-0.1.98
deleted file mode 100644
index e71764e88838..000000000000
--- a/metadata/md5-cache/dev-games/libmt_client-0.1.98
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-DESCRIPTION=backend library for the maitretarot clients
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmt_client.pkg/0.1.98/libmt_client-0.1.98.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f33e627242e9152305df26e272e9b3a7
diff --git a/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1 b/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1
new file mode 100644
index 000000000000..558f40af69b0
--- /dev/null
+++ b/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+DESCRIPTION=backend library for the maitretarot clients
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmt_client.pkg/0.1.98/libmt_client-0.1.98.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b406dca8fb5a1f1f108edbf2e24b76ac
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index cf4dda86db32..257afac1f43b 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/act-1.6.0 b/metadata/md5-cache/dev-go/act-1.6.0
new file mode 100644
index 000000000000..a484abb574e8
--- /dev/null
+++ b/metadata/md5-cache/dev-go/act-1.6.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install
+DESCRIPTION=Automated Component Toolkit code generator
+EAPI=7
+HOMEPAGE=https://github.com/Autodesk/AutomaticComponentToolkit
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/Autodesk/AutomaticComponentToolkit/archive/v1.6.0.tar.gz -> act-1.6.0.tar.gz
+_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=07ad733cd1567db14510adec8e155272
diff --git a/metadata/md5-cache/dev-go/delve-1.3.0 b/metadata/md5-cache/dev-go/delve-1.3.0
deleted file mode 100644
index da4dd2b90530..000000000000
--- a/metadata/md5-cache/dev-go/delve-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=7
-HOMEPAGE=https://github.com/go-delve/delve
-KEYWORDS=~amd64
-LICENSE=MIT BSD BSD-2 Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/go-delve/delve/archive/v1.3.0.tar.gz -> delve-1.3.0.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d059124e2989b29cef961148f002702d
diff --git a/metadata/md5-cache/dev-go/qt-0_pre20200904 b/metadata/md5-cache/dev-go/qt-0_pre20200904
deleted file mode 100644
index 00a791d74769..000000000000
--- a/metadata/md5-cache/dev-go/qt-0_pre20200904
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/designer:5= dev-qt/qt-docs:5=[html] dev-qt/qtbluetooth:5= dev-qt/qtcharts:5= dev-qt/qtcore:5= dev-qt/qtdatavis3d:5= dev-qt/qtdbus:5= dev-qt/qtgamepad:5= dev-qt/qthelp:5= dev-qt/qtlocation:5= dev-qt/qtmultimedia:5=[widgets] dev-qt/qtpositioning:5= dev-qt/qtquickcontrols2:5= dev-qt/qtscxml:5= dev-qt/qtsensors:5= dev-qt/qtserialbus:5= dev-qt/qtserialport:5= dev-qt/qtspeech:5= dev-qt/qtsql:5= dev-qt/qtsvg:5= dev-qt/qtvirtualkeyboard:5= dev-qt/qtwebchannel:5= dev-qt/qtwebengine:5= dev-qt/qtwebsockets:5= dev-qt/qtwebview:5=
-DESCRIPTION=Qt5 Go bindings
-EAPI=7
-HOMEPAGE=https://github.com/therecipe/qt/
-KEYWORDS=~amd64
-LICENSE=LGPL-3+
-RDEPEND=dev-qt/designer:5= dev-qt/qt-docs:5=[html] dev-qt/qtbluetooth:5= dev-qt/qtcharts:5= dev-qt/qtcore:5= dev-qt/qtdatavis3d:5= dev-qt/qtdbus:5= dev-qt/qtgamepad:5= dev-qt/qthelp:5= dev-qt/qtlocation:5= dev-qt/qtmultimedia:5=[widgets] dev-qt/qtpositioning:5= dev-qt/qtquickcontrols2:5= dev-qt/qtscxml:5= dev-qt/qtsensors:5= dev-qt/qtserialbus:5= dev-qt/qtserialport:5= dev-qt/qtspeech:5= dev-qt/qtsql:5= dev-qt/qtsvg:5= dev-qt/qtvirtualkeyboard:5= dev-qt/qtwebchannel:5= dev-qt/qtwebengine:5= dev-qt/qtwebsockets:5= dev-qt/qtwebview:5=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/therecipe/qt/archive/c0c124a5770d357908f16fa57e0aa0ec6ccd3f91.tar.gz -> qt-0_pre20200904.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.0.tar.gz -> github.com-davecgh-go-spew-v1.1.0.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/gopherjs/gopherjs/archive/bd77b112433e.tar.gz -> github.com-gopherjs-gopherjs-bd77b112433e.tar.gz https://github.com/konsorten/go-windows-terminal-sequences/archive/v1.0.1.tar.gz -> github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz https://github.com/konsorten/go-windows-terminal-sequences/archive/v1.0.2.tar.gz -> github.com-konsorten-go-windows-terminal-sequences-v1.0.2.tar.gz https://github.com/pmezard/go-difflib/archive/v1.0.0.tar.gz -> github.com-pmezard-go-difflib-v1.0.0.tar.gz https://github.com/sirupsen/logrus/archive/v1.4.1.tar.gz -> github.com-sirupsen-logrus-v1.4.1.tar.gz https://github.com/stretchr/objx/archive/v0.1.0.tar.gz -> github.com-stretchr-objx-v0.1.0.tar.gz https://github.com/stretchr/objx/archive/v0.1.1.tar.gz -> github.com-stretchr-objx-v0.1.1.tar.gz https://github.com/stretchr/objx/archive/v0.2.0.tar.gz -> github.com-stretchr-objx-v0.2.0.tar.gz https://github.com/stretchr/testify/archive/v1.2.2.tar.gz -> github.com-stretchr-testify-v1.2.2.tar.gz https://github.com/stretchr/testify/archive/v1.3.0.tar.gz -> github.com-stretchr-testify-v1.3.0.tar.gz https://github.com/golang/crypto/archive/df01cb2cc480.tar.gz -> github.com-golang-crypto-df01cb2cc480.tar.gz https://github.com/golang/net/archive/afa5a82059c6.tar.gz -> github.com-golang-net-afa5a82059c6.tar.gz https://github.com/golang/sys/archive/e8e3143a4f4a.tar.gz -> github.com-golang-sys-e8e3143a4f4a.tar.gz https://github.com/golang/sys/archive/e8e3143a4f4a.tar.gz -> github.com-golang-sys-e8e3143a4f4a.tar.gz https://github.com/golang/text/archive/f4905fbd45b6.tar.gz -> github.com-golang-text-f4905fbd45b6.tar.gz https://github.com/golang/tools/archive/aa740d480789.tar.gz -> github.com-golang-tools-aa740d480789.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5249867efdaf35567e646ffb71946aeb
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 5e1f797a0782..3c0727ac50cc 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/alex-tools-0.4 b/metadata/md5-cache/dev-haskell/alex-tools-0.4
index 2813e3c7986e..f3cc1e4f47be 100644
--- a/metadata/md5-cache/dev-haskell/alex-tools-0.4
+++ b/metadata/md5-cache/dev-haskell/alex-tools-0.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 SLOT=0/0.4
 SRC_URI=https://hackage.haskell.org/package/alex-tools-0.4/alex-tools-0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a7761ed4a1fd56021b8e0493fcecaff
+_md5_=39bd0631930b5b2d4c6d068e0219b043
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
deleted file mode 100644
index edbf2a3e42c3..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=5
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.12.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.18.1.2
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.2/Cabal-1.18.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a51d6e8d9fefa1fedb32477977f8a53d
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
deleted file mode 100644
index c94bd137c0ae..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.12.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.18.1.3
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.3/Cabal-1.18.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81a4d863f6d4f1cfb0ebe288a155f66f
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
deleted file mode 100644
index 7f40bb0b83e5..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.12.1:=
-RESTRICT=test
-SLOT=0/1.18.1.5
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.5/Cabal-1.18.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0efe1a86c115fb496919da69c0c2cdd3
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2 b/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
deleted file mode 100644
index 9148e2f05c55..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.20.0.2
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.20.0.2/Cabal-1.20.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=432c39eceeea638e31a4d5188a567b02
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0 b/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
deleted file mode 100644
index 4e0d6dbc3e4f..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.8.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.1:=
-RESTRICT=test
-SLOT=0/1.22.8.0
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.22.8.0/Cabal-1.22.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da220684e7a334ef40b8cd2c2f0a8f21
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.24.2.0 b/metadata/md5-cache/dev-haskell/cabal-1.24.2.0
deleted file mode 100644
index 050421e2290a..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-1.24.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.8.1:=
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=6
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.1:=
-RESTRICT=test
-SLOT=0/1.24.2.0
-SRC_URI=https://hackage.haskell.org/package/Cabal-1.24.2.0/Cabal-1.24.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8341a506ea288a448e3413a576e5ec4
diff --git a/metadata/md5-cache/dev-haskell/cabal-2.0.0.2 b/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
deleted file mode 100644
index 81de62c10593..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.8.1:=
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=6
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile test
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.1:=
-RESTRICT=test
-SLOT=0/2.0.0.2
-SRC_URI=https://hackage.haskell.org/package/Cabal-2.0.0.2/Cabal-2.0.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6982a5448b28e235b28e5471d787aa83
diff --git a/metadata/md5-cache/dev-haskell/cabal-2.4.0.1 b/metadata/md5-cache/dev-haskell/cabal-2.4.0.1
deleted file mode 100644
index a961667348e6..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-2.4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-DESCRIPTION=A framework for packaging Haskell software
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=profile
-LICENSE=BSD
-RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/2.4.0.1
-SRC_URI=https://hackage.haskell.org/package/Cabal-2.4.0.1/Cabal-2.4.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5c056ed748460b134ff5631ce79c6b9
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
new file mode 100644
index 000000000000..572e869d995f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0:= hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A framework for packaging Haskell software
+EAPI=7
+HOMEPAGE=https://www.haskell.org/cabal/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0:=
+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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=af9ae8217872bc2d730592a0c8f2d5f2
diff --git a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1 b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
new file mode 100644
index 000000000000..41550515f7b4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Setup.hs helper for doctests running
+EAPI=7
+HOMEPAGE=https://github.com/phadej/cabal-doctest
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.8
+SRC_URI=https://hackage.haskell.org/package/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b0dd2f8ba9fd0b841572596a1d66bf90
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
new file mode 100644
index 000000000000..bfaa2049e0d4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
@@ -0,0 +1,13 @@
+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/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= ) >=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/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/cabal-install-3.2.0.0/cabal-install-3.2.0.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5f68e1e4a548cccc481cfc70e8232461
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1 b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
new file mode 100644
index 000000000000..54481f86300b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Cairo library
+EAPI=7
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+pdf +postscript +svg doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo
+SLOT=0/0.13.8.1
+SRC_URI=https://hackage.haskell.org/package/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=12c5eb7278018838f5b7f3af334160ab
diff --git a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7 b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7
new file mode 100644
index 000000000000..4e20e7bdf13c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.18 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tracking of system metrics
+EAPI=7
+HOMEPAGE=https://github.com/tibbe/ekg-core
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.2:=
+SLOT=0/0.1.1.7
+SRC_URI=https://hackage.haskell.org/package/ekg-core-0.1.1.7/ekg-core-0.1.1.7.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=18464830e3fa1aacc02f2163c38b1cb7
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.10.4 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
index f2106464d864..9be935b44f73 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4540333eea25a5a1a8dd1ff4c83c9452
+_md5_=a3e986a091589924f0e31246177e1ff9
diff --git a/metadata/md5-cache/dev-haskell/fclabels-2.0.5 b/metadata/md5-cache/dev-haskell/fclabels-2.0.5
new file mode 100644
index 000000000000..4a207570c217
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fclabels-2.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.8.2:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=First class accessor labels implemented as lenses
+EAPI=7
+HOMEPAGE=https://github.com/sebastiaanvisser/fclabels
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.8.2:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.5
+SRC_URI=https://hackage.haskell.org/package/fclabels-2.0.5/fclabels-2.0.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d11a2bbc162e00529cf9c1e4fb18f731
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1
new file mode 100644
index 000000000000..6ca0f7d02d24
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries
+EAPI=7
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closuresignals doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.13.8.0
+SRC_URI=https://hackage.haskell.org/package/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3d3fe9e7c54da142da1e044256740e87
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1 b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1
new file mode 100644
index 000000000000..a49618bff0e9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.6:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6 >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15 >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.4 >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4 >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3 >=dev-haskell/vector-0.12 <dev-haskell/vector-0.13 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hackage security library
+EAPI=7
+HOMEPAGE=https://github.com/haskell/hackage-security
+IUSE=+lukko doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.6:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.6.0.1
+SRC_URI=https://hackage.haskell.org/package/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz https://hackage.haskell.org/package/hackage-security-0.6.0.1/revision/4.cabal -> hackage-security-0.6.0.1-r1.cabal
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1e3fcb2cf4eea62d7b246ea94701a6f0
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3 b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
deleted file mode 100644
index 956684b360e4..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:= hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
-RESTRICT=test
-SLOT=0/2.14.3.0.7.8.3
-SRC_URI=http://code.haskell.org/~slyfox/snapshots/haddock-2.14.3.0.7.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d08d02e248d65c0494e2e100239ee020
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-2.16.1
deleted file mode 100644
index 7714376d67ad..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-2.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cabal-1.10 >=dev-lang/ghc-7.4.1 ~dev-haskell/haddock-api-2.16.1
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haddock-2.16.1/haddock-2.16.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db1122903934bf548791203507170021
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.17.2 b/metadata/md5-cache/dev-haskell/haddock-2.17.2
deleted file mode 100644
index f25db8106bc6..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-2.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=6
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:= >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haddock-2.17.2/haddock-2.17.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=349c69459c2283a7a0da614fc1881fa1
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-2.24.0
new file mode 100644
index 000000000000..b161c4b936af
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-2.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=7
+HOMEPAGE=https://www.haskell.org/haddock/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/haddock-2.24.0/haddock-2.24.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=af18caebd4f411c8ed746469dc6d7476
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.16.1
deleted file mode 100644
index fe3e073f0098..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
-SLOT=0/2.16.1
-SRC_URI=https://hackage.haskell.org/package/haddock-api-2.16.1/haddock-api-2.16.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a32af6123ee21332ae56ccfeb684c47
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.17.3 b/metadata/md5-cache/dev-haskell/haddock-api-2.17.3
deleted file mode 100644
index 3b33e6bdfc6e..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.17.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=6
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/2.17.3
-SRC_URI=https://hackage.haskell.org/package/haddock-api-2.17.3/haddock-api-2.17.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe336645bb8f6907c0e518acc62515a6
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
new file mode 100644
index 000000000000..495d7a99b547
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2 >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.11 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=7
+HOMEPAGE=https://www.haskell.org/haddock/
+IUSE=hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.24.0
+SRC_URI=https://hackage.haskell.org/package/haddock-api-2.24.0/haddock-api-2.24.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ae0e73c3d5843468481953cd1c9da092
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.1.1 b/metadata/md5-cache/dev-haskell/haddock-library-1.1.1
deleted file mode 100644
index 3d0a0cb0c765..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Library exposing some functionality of Haddock
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.1
-SRC_URI=https://hackage.haskell.org/package/haddock-library-1.1.1/haddock-library-1.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e30b5664ef21ad5d7a0fb6207676be45
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.2.1 b/metadata/md5-cache/dev-haskell/haddock-library-1.2.1
deleted file mode 100644
index 79d7119a81fe..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Library exposing some functionality of Haddock
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.2.1
-SRC_URI=https://hackage.haskell.org/package/haddock-library-1.2.1/haddock-library-1.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=60f83dc73f546fce79d27cac9ad76512
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.4.2 b/metadata/md5-cache/dev-haskell/haddock-library-1.4.2
deleted file mode 100644
index ee9990d15e3a..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Library exposing some functionality of Haddock
-EAPI=6
-HOMEPAGE=https://www.haskell.org/haddock/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.4.2
-SRC_URI=https://hackage.haskell.org/package/haddock-library-1.4.2/haddock-library-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ec69c35203600fb115866797d5b8341b
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
new file mode 100644
index 000000000000..bb7adba6c115
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hspec-2.4.4 >=dev-haskell/optparse-applicative-0.15 >=dev-haskell/tree-diff-0.1 >=dev-haskell/base-compat-0.9.3 >=dev-haskell/quickcheck-2.11 )
+DESCRIPTION=Library exposing some functionality of Haddock
+EAPI=7
+HOMEPAGE=https://www.haskell.org/haddock/
+IUSE=profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.9.0
+SRC_URI=https://hackage.haskell.org/package/haddock-library-1.9.0/haddock-library-1.9.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=94150257c4ceec76a03f81269d72404e
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.6.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1
new file mode 100644
index 000000000000..647fbe5f05c4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=7
+HOMEPAGE=http://happstack.com
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/7.6.1
+SRC_URI=https://hackage.haskell.org/package/happstack-server-7.6.1/happstack-server-7.6.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c640c4ce95e7009bdf7c163c2bd6076
diff --git a/metadata/md5-cache/dev-haskell/hoauth2-1.16.0 b/metadata/md5-cache/dev-haskell/hoauth2-1.16.0
new file mode 100644
index 000000000000..6ea60fe0c190
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hoauth2-1.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/binary-0.8.3:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.4 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell OAuth2 authentication client
+EAPI=7
+HOMEPAGE=https://github.com/freizl/hoauth2
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/binary-0.8.3:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
+SLOT=0/1.16.0
+SRC_URI=https://hackage.haskell.org/package/hoauth2-1.16.0/hoauth2-1.16.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f7bd7e89d446e30a55561954b3bfaac9
diff --git a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
index f3f0be1488e3..5feaba8e7366 100644
--- a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
+++ b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
@@ -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/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lua parser and pretty-printer
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.11.0.1
 SRC_URI=https://hackage.haskell.org/package/language-lua-0.11.0.1/language-lua-0.11.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73911692f34b7b47fd36d393e6bb0dc6
+_md5_=65f00d5bb20d41715aabcb71457b46d1
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
index b85428e2c26c..4557a4b15c08 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c9a420bfbdc0fcc07f31d2e53bb1ab3
+_md5_=649e9a4fa6e52b5aa54aef737658e1cd
diff --git a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
index ec0c103496c2..7509a4fbf8a9 100644
--- a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/newtype-0.2.2.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-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A typeclass and set of functions for working with newtypes
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.2.0
 SRC_URI=https://hackage.haskell.org/package/newtype-0.2.2.0/newtype-0.2.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fbd7b253873237f29d66d6ba1f7078f8
+_md5_=c29b06277e9bce5753f7fb87982aff14
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1 b/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
deleted file mode 100644
index 1870135035ab..000000000000
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Monadic parser combinators
-EAPI=7
-HOMEPAGE=https://github.com/hvr/parsec
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/3.1.13.0
-SRC_URI=https://hackage.haskell.org/package/parsec-3.1.13.0/parsec-3.1.13.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=15707c6155b49ffe9bc41ce6992388e1
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 93d65c5b1ed0..5b12a9f3e8e4 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83d90198917e46f76da119878eee18c1
+_md5_=bdc8ea44225bb7199b82e900379a8ff6
diff --git a/metadata/md5-cache/dev-haskell/punycode-2.0 b/metadata/md5-cache/dev-haskell/punycode-2.0
index 10f2fa105568..fe1e9eccc5e7 100644
--- a/metadata/md5-cache/dev-haskell/punycode-2.0
+++ b/metadata/md5-cache/dev-haskell/punycode-2.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/encoding dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Encode unicode strings to ascii forms according to RFC 3492
 EAPI=7
 HOMEPAGE=https://github.com/litherum/punycode
-IUSE=doc hscolour profile test
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/2.0
 SRC_URI=https://hackage.haskell.org/package/punycode-2.0/punycode-2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9f6ed120b49920248cfee91bcf19513
+_md5_=e2e0a26478b155f68a37a67f0debb5fc
diff --git a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9 b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
index 1a10d12e03f8..aab7a0a4a4df 100644
--- a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
+++ b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
@@ -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-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell bindings to setlocale
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.0.0.9
 SRC_URI=https://hackage.haskell.org/package/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7752c7da449f65b4915f8fda991436bb
+_md5_=f62a9d3a1a5a3b1b36505edc4a31c642
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.25 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
new file mode 100644
index 000000000000..f54a8ca25c17
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=7
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=test-coffee test-export test-roy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.25
+SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.25/shakespeare-2.0.25.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3013209c043b7805f2e36504bfc670c7
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 f5ebbae1bb0a..d40cd12897c0 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba307e1b617e3fb2c89f3547fbf170a3
+_md5_=5b34097b793752963c41916a2ba14dfe
diff --git a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13 b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13
new file mode 100644
index 000000000000..014bab051987
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scrap Your Boilerplate With Class
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/syb-with-class
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.6.1.13
+SRC_URI=https://hackage.haskell.org/package/syb-with-class-0.6.1.13/syb-with-class-0.6.1.13.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=158359255d7bd157f2ea91beaee3d63e
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
index b9ad0140baad..f4f4663c1eac 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.1.1
 SRC_URI=https://hackage.haskell.org/package/tar-0.5.1.1/tar-0.5.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f746732ebc9501c8ef4b54c20bc9cc81
+_md5_=b4c5a6c94ff2e569e4fd6deb58fcc621
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 e0f3294737d6..9054782b3b1a 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88ee62a1fe604e8890302e816508ae50
+_md5_=4a67408a19b2bd20ebb4a1c1bfe64133
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10 b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10
new file mode 100644
index 000000000000..1645dcc46fb0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Template Haskell for test framework
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/test-framework-th-prime
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.10
+SRC_URI=https://hackage.haskell.org/package/test-framework-th-prime-0.0.10/test-framework-th-prime-0.0.10.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dc9d69dc07645b5b9cda61132b7aec60
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1 b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1
new file mode 100644
index 000000000000..3992247de7e1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.10.3:= 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.10.3:=
+RESTRICT=test
+SLOT=0/1.2.4.1_rc1
+SRC_URI=https://github.com/haskell/text/archive/v1.2.4.1-rc1.tar.gz -> text-1.2.4.1_rc1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=010ee59db4d7deec2f014f4da0fe3cdf
diff --git a/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0 b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0
new file mode 100644
index 000000000000..a564a474b216
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Expands type synonyms in Template Haskell ASTs
+EAPI=7
+HOMEPAGE=https://github.com/DanielSchuessler/th-expand-syns
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.6.0
+SRC_URI=https://hackage.haskell.org/package/th-expand-syns-0.4.6.0/th-expand-syns-0.4.6.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0785bcf5eceb5c98e40412e6900b8c80
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.10 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
new file mode 100644
index 000000000000..0652e4a7e114
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/th-orphans
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.13.10
+SRC_URI=https://hackage.haskell.org/package/th-orphans-0.13.10/th-orphans-0.13.10.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6209eb0d92ff1b17ea3803ff611bf147
diff --git a/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1 b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1
new file mode 100644
index 000000000000..5f192ac9224b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Collection of useful functions for use with Template Haskell
+EAPI=7
+HOMEPAGE=https://github.com/fpco/th-utilities#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.4.1
+SRC_URI=https://hackage.haskell.org/package/th-utilities-0.2.4.1/th-utilities-0.2.4.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc3df5ec6952d1d30c0215e43184644a
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 759e816203f4..7694b1ab2944 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca27d43c44843a4d18a672cf93da2d27
+_md5_=9cb0aa445eed9c60e75062a22737c8d3
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.1.4 b/metadata/md5-cache/dev-haskell/vault-0.3.1.4
new file mode 100644
index 000000000000..c68fdde2571a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=a persistent store for values of arbitrary types
+EAPI=7
+HOMEPAGE=https://github.com/HeinrichApfelmus/vault
+IUSE=doc profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1.4
+SRC_URI=https://hackage.haskell.org/package/vault-0.3.1.4/vault-0.3.1.4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=75becc646b0ca2924dd7836d73053389
diff --git a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7 b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
index bfe3cf38b373..1e4750bda3eb 100644
--- a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
+++ b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
@@ -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/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Deriver for Data.Vector.Unboxed using Template Haskell
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.2.1.7
 SRC_URI=https://hackage.haskell.org/package/vector-th-unbox-0.2.1.7/vector-th-unbox-0.2.1.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e66a371ca3391e55b5afe49cfb26d2a4
+_md5_=e1dea7106db8d1dca74c037dc92ad6b7
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 fff2ccfae841..ba5831c04058 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	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ccdda8d83cc4549a34afe947ffd3882
+_md5_=638f2a25460fc40096a9c3d111da677d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 82f3111c934c..d95b6d907314 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/asm-3.3.1-r2 b/metadata/md5-cache/dev-java/asm-3.3.1-r2
new file mode 100644
index 000000000000..baf72ea1165c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/asm-3.3.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=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/ant-owanttask >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Bytecode manipulation framework for Java
+EAPI=7
+HOMEPAGE=https://asm.ow2.io
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=3
+SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_3_3_1/asm-ASM_3_3_1.tar.gz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f3254734db31244c10d7ff29ba6dcf15
diff --git a/metadata/md5-cache/dev-java/asm-5.1 b/metadata/md5-cache/dev-java/asm-5.1
index 33b7990c0c8f..14bc4676d3b9 100644
--- a/metadata/md5-cache/dev-java/asm-5.1
+++ b/metadata/md5-cache/dev-java/asm-5.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.1.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7793f091b20df06e0142ff9773744c07
+_md5_=f6dd8c2cbd38b7f3b82c869456f7919d
diff --git a/metadata/md5-cache/dev-java/asm-5.1-r1 b/metadata/md5-cache/dev-java/asm-5.1-r1
new file mode 100644
index 000000000000..20b4c7657110
--- /dev/null
+++ b/metadata/md5-cache/dev-java/asm-5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=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=Bytecode manipulation framework for Java
+EAPI=7
+HOMEPAGE=https://asm.ow2.io
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_5_1/asm-ASM_5_1.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=093e2824b98d05275702e9adf6e99d73
diff --git a/metadata/md5-cache/dev-java/asm-6.2.1 b/metadata/md5-cache/dev-java/asm-6.2.1
index db5799206abb..cb5d3667b192 100644
--- a/metadata/md5-cache/dev-java/asm-6.2.1
+++ b/metadata/md5-cache/dev-java/asm-6.2.1
@@ -2,7 +2,7 @@ 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=Bytecode manipulation framework for Java
 EAPI=7
-HOMEPAGE=http://asm.ow2.org
+HOMEPAGE=https://asm.ow2.io
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=6
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_6_2_1/asm-ASM_6_2_1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=fadbe6e3e1c652b8cb1da3b53edc8c91
+_md5_=34840594be98cc015a639afd1c88f033
diff --git a/metadata/md5-cache/dev-java/asm-7.3.1 b/metadata/md5-cache/dev-java/asm-7.3.1
index 1765680845a2..6f72b00c7431 100644
--- a/metadata/md5-cache/dev-java/asm-7.3.1
+++ b/metadata/md5-cache/dev-java/asm-7.3.1
@@ -2,7 +2,7 @@ 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=Bytecode manipulation framework for Java
 EAPI=7
-HOMEPAGE=http://asm.ow2.org
+HOMEPAGE=https://asm.ow2.io
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=7
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_7_3_1/asm-ASM_7_3_1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=adfe95d51be4041632d03ff1ebb86e52
+_md5_=9011e23475818098467625303a42e7f4
diff --git a/metadata/md5-cache/dev-java/asm-8.0.1 b/metadata/md5-cache/dev-java/asm-8.0.1
index d4275f33ec65..d80b6d3db18f 100644
--- a/metadata/md5-cache/dev-java/asm-8.0.1
+++ b/metadata/md5-cache/dev-java/asm-8.0.1
@@ -2,7 +2,7 @@ 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=Bytecode manipulation framework for Java
 EAPI=7
-HOMEPAGE=http://asm.ow2.org
+HOMEPAGE=https://asm.ow2.io
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=8
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_8_0_1/asm-ASM_8_0_1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=594c99a6faa495ff947ec76aa2d7d364
+_md5_=7c287b05207a7455e3ec25c5a73a05a4
diff --git a/metadata/md5-cache/dev-java/asm-9.1 b/metadata/md5-cache/dev-java/asm-9.1
index cad9d6306729..f43909e07dfd 100644
--- a/metadata/md5-cache/dev-java/asm-9.1
+++ b/metadata/md5-cache/dev-java/asm-9.1
@@ -2,7 +2,7 @@ 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=Bytecode manipulation framework for Java
 EAPI=7
-HOMEPAGE=http://asm.ow2.org
+HOMEPAGE=https://asm.ow2.io
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_1/asm-ASM_9_1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=5761335428704253080648b992230698
+_md5_=11ae0999b6cb04864f29d865aa92d71d
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.20 b/metadata/md5-cache/dev-java/commons-compress-1.20
new file mode 100644
index 000000000000..760339492d11
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-compress-1.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java API for working with archive files
+EAPI=7
+HOMEPAGE=https://commons.apache.org/proper/commons-compress/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz -> commons-compress-1.20-sources.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=a5f0a1f30ec282536edd5d651b279e46
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
new file mode 100644
index 000000000000..869fdea4603e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Library of matchers for building test expressions
+EAPI=7
+HOMEPAGE=https://github.com/hamcrest
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=394d5868fc6ac45a9e48380644c2c270
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
new file mode 100644
index 000000000000..9bc4628c80c0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=~dev-java/hamcrest-generator-1.3:1.3 >=virtual/jdk-1.8:* userland_GNU? ( sys-apps/findutils ) >=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=Core library of matchers for building test expressions
+EAPI=7
+HOMEPAGE=https://github.com/hamcrest
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.3
+SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b02136c1b16bb76330ccbf0e24746d1f
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
new file mode 100644
index 000000000000..ade6c1077eae
--- /dev/null
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* userland_GNU? ( sys-apps/findutils ) dev-java/qdox:1.12 >=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=Code generator for Hamcrest's library of matchers for building test expressions
+EAPI=7
+HOMEPAGE=https://github.com/hamcrest
+IUSE=elibc_FreeBSD source test elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1.3
+SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=81ee41a33370a19e4e02dce6953aceba
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0 b/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0
new file mode 100644
index 000000000000..854c20141876
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.5.0:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9.
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.5.0:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz -> jakartaee-migration-0.2.0-sources.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=497ca1227dc5352361a2732dba9e5cfc
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.4-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.4-r1
new file mode 100644
index 000000000000..532e6b51fd23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java Dependency checker
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=fa1e1b674a1de8f90262a831fa904507
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5 b/metadata/md5-cache/dev-java/java-dep-check-0.5
new file mode 100644
index 000000000000..532e6b51fd23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java Dependency checker
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=fa1e1b674a1de8f90262a831fa904507
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
new file mode 100644
index 000000000000..d8d8b40cbc7d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 dev-java/jflex: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=CUP Parser Generator for Java
+EAPI=7
+HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=654eab80a87c41c015447f1f339b4669
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
new file mode 100644
index 000000000000..9b6388c7f743
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JFlex is a lexical analyzer generator for Java
+EAPI=7
+HOMEPAGE=https://www.jflex.de/
+IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=BSD
+PDEPEND=dev-java/javacup:0
+RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=47eab6c7641c63c18fcb34ccbf080a20
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r1 b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
index c29a344ac617..24fc6151afb2 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.6 dev-java/junit:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Library for testing Java code using mock objects
 EAPI=5
-HOMEPAGE=http://www.jmock.org/
+HOMEPAGE=http://jmock.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
-SRC_URI=http://www.jmock.org/downloads/jmock-1.2.0-jars.zip
+SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac6d3f3f8f2ba7b3396cd1e887ef97ff
+_md5_=f78dbb81725b3c5ad0d10cb4b0eb94c7
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
new file mode 100644
index 000000000000..21178d6d778d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=app-arch/unzip >=virtual/jdk-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Library for testing Java code using mock objects
+EAPI=7
+HOMEPAGE=http://jmock.org/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.0
+SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=d8a85b44761e354a9b9a17dc00404454
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1 b/metadata/md5-cache/dev-java/jmock-2.6.1
index 9c9dc35847b1..1389d63f8216 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Library for testing Java code using mock objects
 EAPI=5
-HOMEPAGE=http://www.jmock.org
+HOMEPAGE=http://jmock.org
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
-SRC_URI=http://www.jmock.org/downloads/jmock-2.6.1-jars.zip
+SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=340ebc17828f807f9e6b987c9f0fc0ce
+_md5_=0e91f7ab6fbf5e07e74a97ce91e34250
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1-r1 b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
new file mode 100644
index 000000000000..426ac4afedd9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=app-arch/unzip >=virtual/jdk-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Library for testing Java code using mock objects
+EAPI=7
+HOMEPAGE=http://jmock.org
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=4496f28d9ab0d8231ac1c9b6c32c706e
diff --git a/metadata/md5-cache/dev-java/junit-4.13.1 b/metadata/md5-cache/dev-java/junit-4.13.1
index ae0df9de11cb..607e5b5f4baa 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.1
+++ b/metadata/md5-cache/dev-java/junit-4.13.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Simple framework to write repeatable tests
 EAPI=7
-HOMEPAGE=http://junit.org/
+HOMEPAGE=https://junit.org/junit5/
 IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/r4.13.1.tar.gz -> junit4-r4.13.1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=e7f70e0dbff9cfe95cc833c2e0504358
+_md5_=44d06c74cf6e8b656d51bb238c988f5c
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.10_p9 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.10_p9
index ae051f3eadf0..efb64a8d5ce0 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.10_p9
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.10_p9
@@ -1,14 +1,14 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup
+DEFINED_PHASES=install postinst postrm prerm pretend setup unpack
 DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
 EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs splitdebug
 SLOT=11
-SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz )
+SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10+9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz )
 _eclasses_=java-vm-2	3a5fd6d2dc28e64872910bdd6c6b8d7b	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72b529be86fc38638871e267629e498a
+_md5_=c53625059dcfb0ace1cc78aaf6f7af5e
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08 b/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08
index 423a39a1cc8f..8ecd8a7ebc65 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
 EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs strip
 SLOT=8
-SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz )
+SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	3a5fd6d2dc28e64872910bdd6c6b8d7b	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23ba8243e5981116f4eca6649c56ecd4
+_md5_=645f09071864b4340ef5a977ffb2c873
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
index 2602e7feddc3..d19ad1e99766 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OSGi Service Platform Core API (Companion Code)
 EAPI=5
 HOMEPAGE=http://www.osgi.org/Specifications/HomePage
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51514e1791e256a1c51e1c498e64f054
+_md5_=13efa260e895cf89b6133dfe89147014
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 0abc8391486d..94e7a76eca1a 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Snappy compressor/decompressor for Java
 EAPI=5
 HOMEPAGE=https://github.com/xerial/snappy-java/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=682a7afb07c4d74950986862764f2924
+_md5_=746baa6eeb0fbaf5f14d2581cfd4667a
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.2 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.2
index a3a452dc770a..4180b70eb8bc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.2
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.2
@@ -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 elibc_FreeBSD
-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.2/src/apache-tomcat-10.0.2-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3601ccb599042976f18484e699f209f9
+_md5_=4c78f25811632aaba23c0ea2d2d0ed12
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4
new file mode 100644
index 000000000000..563a8c14ea10
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+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.4/src/apache-tomcat-10.0.4-src.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5ba8743dd6e74f996cd53d2971fc1b43
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
index 834ec4cc040f..c048fc62fc3d 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.108/src/apache-tomcat-7.0.108-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e93f0acdcc090b1f60bf29d1ad8091e
+_md5_=ea796e3ce74b39878c143c2700da3003
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
index 034f869bcefd..96a82eec1c35 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.63/src/apache-tomcat-8.5.63-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1eda22f51882d56462271be395aaf816
+_md5_=f8346116eaa61ade74e029f80323e9f7
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.43 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.43
index 0af6606b7542..7a5141c6d965 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.43
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.43
@@ -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 elibc_FreeBSD
-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=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.43/src/apache-tomcat-9.0.43-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afa4d3001364fa0f8950830ef73f4c02
+_md5_=d5e4195f04869615276c265ab6e2eb59
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
new file mode 100644
index 000000000000..31341f00426c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces
+EAPI=7
+HOMEPAGE=https://xalan.apache.org/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~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=0
+SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=b9f5e75e3889f27498cc28c215d8425f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 068207927513..67e194ca3325 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 a6dc86a16247..c6be98414983 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.4
+++ b/metadata/md5-cache/dev-lang/R-4.0.4
@@ -5,7 +5,7 @@ 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.5 ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) ) test? ( profile )
@@ -13,4 +13,4 @@ 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	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be8487732ea005dd13624a382833bf2e
+_md5_=6a5d5c071b7f43366e3acb2328e6c9d2
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.4 b/metadata/md5-cache/dev-lang/elixir-1.11.4
new file mode 100644
index 000000000000..218c87d3a7db
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.11.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/erlang-21:0=[ssl] test? ( dev-vcs/git )
+DESCRIPTION=Elixir programming language
+EAPI=7
+HOMEPAGE=https://elixir-lang.org
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-21:0=[ssl] !!sci-biology/phylip
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.4.tar.gz -> elixir-1.11.4.tar.gz
+_md5_=07002b1b115d7f91a39b94cc5ba903a8
diff --git a/metadata/md5-cache/dev-lang/ghc-7.10.3 b/metadata/md5-cache/dev-lang/ghc-7.10.3
deleted file mode 100644
index 4eedaddeb9fa..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-7.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=5
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp binary elibc_glibc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )
-RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/7.10.3
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-x86.tbz2 ) ) https://hackage.haskell.org/package/binary-0.7.6.1/binary-0.7.6.1.tar.gz https://hackage.haskell.org/package/hoopl-3.10.2.0/hoopl-3.10.2.0.tar.gz https://hackage.haskell.org/package/transformers-0.4.3.0/transformers-0.4.3.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ee8aa78ee26eaa3226ed3bdc31fc034
diff --git a/metadata/md5-cache/dev-lang/ghc-7.8.4 b/metadata/md5-cache/dev-lang/ghc-7.8.4
deleted file mode 100644
index 99c578394074..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-7.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) >=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=The Glasgow Haskell Compiler
-EAPI=5
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp binary elibc_glibc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )
-RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/7.8.4
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/7.8.4/ghc-7.8.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-x86.tbz2 ) ) https://dev.gentoo.org/~slyfox/distfiles/ghc-7.8.4-ia64-CLOSUREs-regenerated.patch.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad4be128edaebed7197b4641b3b1913f
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
deleted file mode 100644
index f55e2c904f0d..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=5
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp +profile binary
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.0.2
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6fb0935d7c92bc784967c68ad131c8d
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.1 b/metadata/md5-cache/dev-lang/ghc-8.10.1
deleted file mode 100644
index adc3a06641b1..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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.1
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.1/ghc-8.10.1-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.1/ghc-8.10.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1537a7df40b574f19496a77c86f3cea
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.2 b/metadata/md5-cache/dev-lang/ghc-8.10.2
deleted file mode 100644
index 49499cbbbc3d..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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.2
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.2/ghc-8.10.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.2/ghc-8.10.2-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e1f48e67ae76836318df6a5cdc07644
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.3 b/metadata/md5-cache/dev-lang/ghc-8.10.3
deleted file mode 100644
index 5b4c6018b60c..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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.3
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.3/ghc-8.10.3-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.3/ghc-8.10.3-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09b8be6ba3394edc052f16627a26b772
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4
index f6f560dd1c10..7805bca6c449 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4
@@ -5,6 +5,7 @@ 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 )
@@ -13,4 +14,4 @@ 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	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7329f57faeffdcde082f7ddcf6e8a0e1
+_md5_=31622e2537eb93910f24ea30869b83b1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.1 b/metadata/md5-cache/dev-lang/ghc-8.2.1
deleted file mode 100644
index f7dcb08bd8cb..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=5
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp profile 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.2.1
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.2.1/ghc-8.2.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07f8018b47a95dd916d2a38ea6368e36
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.2 b/metadata/md5-cache/dev-lang/ghc-8.2.2
deleted file mode 100644
index 07f959b27e1a..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp profile 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.2.2
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d9be1a9fe1203807ae9da6389dcd5c5a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.1 b/metadata/md5-cache/dev-lang/ghc-8.4.1
deleted file mode 100644
index ff110d03aba8..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp profile 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.4.1
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=895a21ba19d31a5ed028644ea040ed40
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
deleted file mode 100644
index 861ce675f403..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp profile 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.4.2
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c70ee4d77b2f3263f1fde920dbee381a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.3 b/metadata/md5-cache/dev-lang/ghc-8.4.3
deleted file mode 100644
index 7756f6c66852..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp profile 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-SLOT=0/8.4.3
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f91e777af31e4e80c0abb5d82a1d7c1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.4 b/metadata/md5-cache/dev-lang/ghc-8.6.4
deleted file mode 100644
index 1bcd033712be..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=doc ghcbootstrap ghcmakebinary +gmp 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] !ghcmakebinary? ( dev-libs/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-REQUIRED_USE=?? ( ghcbootstrap binary )
-RESTRICT=!test? ( test )
-SLOT=0/8.6.4
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb6f8a2dba6e4aeef5a2ef5a8e11db55
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.5 b/metadata/md5-cache/dev-lang/ghc-8.6.5
deleted file mode 100644
index f41905bcfdfa..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) 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 ) ) ) >=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=The Glasgow Haskell Compiler
-EAPI=6
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/8.6.5
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 ) ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-powerpc64le-unknown-linux-gnu.tbz2 ) ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3969869d51a0310c5f51fa33c4ed068
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.1 b/metadata/md5-cache/dev-lang/ghc-8.8.1
deleted file mode 100644
index 124f721042b3..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/8.8.1
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-x86_64-pc-linux-gnu.tbz2 ) ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-powerpc64le-unknown-linux-gnu.tbz2 ) ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8d51b94d80b6f58f1ec2f28ccd874e7
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.2 b/metadata/md5-cache/dev-lang/ghc-8.8.2
deleted file mode 100644
index 440808569a0f..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/8.8.2
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6010760923b8d610a200d213b5a43b8
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.3 b/metadata/md5-cache/dev-lang/ghc-8.8.3
deleted file mode 100644
index f66297b1acaf..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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 ) 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 ) ) )
-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.8.3
-SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=280576be1216da16a639f391432c73dc
diff --git a/metadata/md5-cache/dev-lang/go-1.14.14 b/metadata/md5-cache/dev-lang/go-1.14.14
deleted file mode 100644
index 09ba52d1a469..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.14.14
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.14.14
-SRC_URI=https://storage.googleapis.com/golang/go1.14.14.src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=32708bc6ad54f2615d7c84049dd672dd
diff --git a/metadata/md5-cache/dev-lang/go-1.14.15 b/metadata/md5-cache/dev-lang/go-1.14.15
deleted file mode 100644
index c253db835844..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.14.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.14.15
-SRC_URI=https://storage.googleapis.com/golang/go1.14.15.src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b17a7097a537f4b6611e330a88601ff5
diff --git a/metadata/md5-cache/dev-lang/go-1.15.10 b/metadata/md5-cache/dev-lang/go-1.15.10
index e72bf4142e39..74ec1bf5804e 100644
--- a/metadata/md5-cache/dev-lang/go-1.15.10
+++ b/metadata/md5-cache/dev-lang/go-1.15.10
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.15.10
 SRC_URI=https://storage.googleapis.com/golang/go1.15.10.src.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=296a4bc1f38d89667ba6b27cbbfd4ef2
+_md5_=32708bc6ad54f2615d7c84049dd672dd
diff --git a/metadata/md5-cache/dev-lang/go-1.15.7 b/metadata/md5-cache/dev-lang/go-1.15.7
deleted file mode 100644
index ee6d6a8a2aba..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.15.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.15.7
-SRC_URI=https://storage.googleapis.com/golang/go1.15.7.src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=32708bc6ad54f2615d7c84049dd672dd
diff --git a/metadata/md5-cache/dev-lang/go-1.15.8 b/metadata/md5-cache/dev-lang/go-1.15.8
deleted file mode 100644
index 005d273791c2..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.15.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.15.8
-SRC_URI=https://storage.googleapis.com/golang/go1.15.8.src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b17a7097a537f4b6611e330a88601ff5
diff --git a/metadata/md5-cache/dev-lang/go-1.16 b/metadata/md5-cache/dev-lang/go-1.16
deleted file mode 100644
index 9135867ba443..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.16
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.16
-SRC_URI=https://storage.googleapis.com/golang/go1.16.src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b17a7097a537f4b6611e330a88601ff5
diff --git a/metadata/md5-cache/dev-lang/go-1.16.2 b/metadata/md5-cache/dev-lang/go-1.16.2
index c62fb7d94df6..bc3f6f886deb 100644
--- a/metadata/md5-cache/dev-lang/go-1.16.2
+++ b/metadata/md5-cache/dev-lang/go-1.16.2
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.16.2
 SRC_URI=https://storage.googleapis.com/golang/go1.16.2.src.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=296a4bc1f38d89667ba6b27cbbfd4ef2
+_md5_=32708bc6ad54f2615d7c84049dd672dd
diff --git a/metadata/md5-cache/dev-lang/icon-9.5.20i b/metadata/md5-cache/dev-lang/icon-9.5.20i
new file mode 100644
index 000000000000..cea38e60e664
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/icon-9.5.20i
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=X? ( x11-libs/libX11:= ) X? ( x11-libs/libXpm x11-libs/libXt )
+DESCRIPTION=Very high level language
+EAPI=7
+HOMEPAGE=http://www.cs.arizona.edu/icon/
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=public-domain HPND
+RDEPEND=X? ( x11-libs/libX11:= )
+SLOT=0
+SRC_URI=https://github.com/gtownsend/icon/archive/v9.5.20i.tar.gz -> icon-9.5.20i.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3e26417946ee019e663882d002d726d6
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.76 b/metadata/md5-cache/dev-lang/jimtcl-0.76
deleted file mode 100644
index 6110f18b0045..000000000000
--- a/metadata/md5-cache/dev-lang/jimtcl-0.76
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip
-DESCRIPTION=Small footprint implementation of Tcl programming language
-EAPI=5
-HOMEPAGE=http://jim.tcl.tk/
-IUSE=doc static-libs
-KEYWORDS=amd64 arm ~arm64 ~m68k ~mips ~s390 x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.76 -> jimtcl-0.76.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=637187c314cc876f782feb35f671b38a
diff --git a/metadata/md5-cache/dev-lang/mlton-20130715 b/metadata/md5-cache/dev-lang/mlton-20130715
deleted file mode 100644
index f675fbeae82a..000000000000
--- a/metadata/md5-cache/dev-lang/mlton-20130715
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup unpack
-DEPEND=dev-libs/gmp:* doc? ( virtual/latex-base )
-DESCRIPTION=Standard ML optimizing compiler and libraries
-EAPI=5
-HOMEPAGE=http://www.mlton.org
-IUSE=binary doc
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=HPND MIT
-RDEPEND=dev-libs/gmp:*
-SLOT=0/20130715
-SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20130715.src.tgz ) binary? ( amd64? ( mirror://sourceforge/mlton/mlton-20130715-1.amd64-linux.tgz ) x86? ( mirror://sourceforge/mlton/mlton-20130715-1.x86-linux.tgz ) )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdb9d9e2461c79215ec388dd1b3da4ff
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 3e684975acfd..0e281e7f495e 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst prepare pretend setup test unpack
 DEPEND=dev-libs/gmp:* bootstrap-smlnj? ( dev-lang/smlnj ) !bootstrap-smlnj? ( !amd64? ( dev-lang/smlnj ) ) pax_kernel? ( sys-apps/elfix ) doc? ( virtual/latex-base )
 DESCRIPTION=Standard ML optimizing compiler and libraries
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.mlton.org
 IUSE=binary bootstrap-smlnj stage3 doc pax_kernel
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2545507face1a7609f5d6d1590d09bf8
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=95f3c66df46c11efd9ff7c45962157a9
diff --git a/metadata/md5-cache/dev-lang/moarvm-2021.02 b/metadata/md5-cache/dev-lang/moarvm-2021.02
index f98a91308c4a..6b3c90713c10 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2021.02
+++ b/metadata/md5-cache/dev-lang/moarvm-2021.02
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2021.02.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef0e95a947fb792236912372b1c09025
+_md5_=f7eb15f6e186a02e02518ef61a7840b6
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.9 b/metadata/md5-cache/dev-lang/mujs-1.0.9
index e64aaaad6d66..c61b00d7caea 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.9
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
+DESCRIPTION=An embeddable JavaScript interpreter in C
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
 IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0/1.0.9
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.9.tar.gz -> mujs-1.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e1257380fd428388a3ceb91bd712bd0
+_md5_=bc923b85ad89b62c434477c4384b1a08
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.0 b/metadata/md5-cache/dev-lang/mujs-1.1.0
index 4caa81c78bf1..935a4d998114 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.0
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
+DESCRIPTION=An embeddable JavaScript interpreter in C
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
 IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.1.0.tar.gz -> mujs-1.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8c58d3d465797510926b37100c83cf9
+_md5_=9370071f1cd2b3aef9f2891910e31183
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.10.0 b/metadata/md5-cache/dev-lang/ocaml-4.10.0
deleted file mode 100644
index 507cc7d0a168..000000000000
--- a/metadata/md5-cache/dev-lang/ocaml-4.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
-EAPI=7
-HOMEPAGE=https://ocaml.org/
-IUSE=emacs flambda latex +ocamlopt spacetime xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
-RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
-SLOT=0/4.10.0
-SRC_URI=https://github.com/ocaml/ocaml/archive/4.10.0.tar.gz -> ocaml-4.10.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11ac721606369e72d04ae608a30e8eda
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.11.1 b/metadata/md5-cache/dev-lang/ocaml-4.11.1
deleted file mode 100644
index d05c1a2c6082..000000000000
--- a/metadata/md5-cache/dev-lang/ocaml-4.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
-EAPI=7
-HOMEPAGE=https://ocaml.org/
-IUSE=emacs flambda latex +ocamlopt spacetime xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=QPL-1.0 LGPL-2
-PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
-RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
-SLOT=0/4.11.1
-SRC_URI=https://github.com/ocaml/ocaml/archive/4.11.1.tar.gz -> ocaml-4.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82ae2e9a3118fc07e3824a13e4430d6f
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
deleted file mode 100644
index 47818ad6b0a4..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure prepare test
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) dev-libs/libffi:= >=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=Poly/ML is a full implementation of Standard ML
-EAPI=6
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) dev-libs/libffi:=
-RESTRICT=!test? ( test )
-SLOT=0/5.6
-SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e216c6201cf09684e817b483f537483c
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p7 b/metadata/md5-cache/dev-lang/python-2.7.18_p7
index f59054d5c4f1..424fbe2e3302 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p7
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p7
@@ -4,12 +4,12 @@ DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcry
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86
+IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p7.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05b03ca80e439cf28374cf66228a3695
+_md5_=109a6da2328d8fd26633e78f0ab45945
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2 b/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
index a53ffea3dcf6..9c7fa884aa15 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0a6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0a6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0a6.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d76a926c3dc1aa2d38f780f777897390
+_md5_=904a4a6ca34cfc6cdd6707aa3afab066
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13 b/metadata/md5-cache/dev-lang/python-3.6.13
index 428606b9f0b6..9ba5a047036c 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13
+++ b/metadata/md5-cache/dev-lang/python-3.6.13
@@ -4,8 +4,8 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad955c8e6713f7eecd8eaa8ee2ac51ed
+_md5_=d762493458cf003b65e9c381a2cbcda3
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10 b/metadata/md5-cache/dev-lang/python-3.7.10
index 969f0585e663..d17b0b442857 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10
+++ b/metadata/md5-cache/dev-lang/python-3.7.10
@@ -4,8 +4,8 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9fd7405a51979ae23e346c603c4478dd
+_md5_=33f4cc8e4d0d9bd1bb09dc7909581784
diff --git a/metadata/md5-cache/dev-lang/python-3.8.8 b/metadata/md5-cache/dev-lang/python-3.8.8
index f8ca26444114..2e0e4f91ed57 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.8
+++ b/metadata/md5-cache/dev-lang/python-3.8.8
@@ -4,8 +4,8 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.8.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=42b0cd3e709b9a6041934926ee0fc3fd
+_md5_=bdac2abe26762b7e9f6f5eb856a418d3
diff --git a/metadata/md5-cache/dev-lang/python-3.9.2 b/metadata/md5-cache/dev-lang/python-3.9.2
index dda00137ff96..cec8963d76c5 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.2
+++ b/metadata/md5-cache/dev-lang/python-3.9.2
@@ -4,8 +4,8 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=711aa5ae682837f75e9c0580d9650558
+_md5_=2a606eed7f3225308b9a97107defadef
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.6-r3 b/metadata/md5-cache/dev-lang/ruby-2.6.6-r3
new file mode 100644
index 000000000000..8be32f8650d7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.6-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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 libressl +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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7bf6492e896267292225883b8261af16
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.2-r1 b/metadata/md5-cache/dev-lang/ruby-2.7.2-r1
new file mode 100644
index 000000000000..fcb500f7baf5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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 libressl +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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=511e206610bdb98d3eb02ec10a7755dc
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.0-r2 b/metadata/md5-cache/dev-lang/ruby-3.0.0-r2
new file mode 100644
index 000000000000..c7c3d431d17b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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 libressl +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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 >=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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cf6099e431a86d36f5486fa8cd0ad53e
diff --git a/metadata/md5-cache/dev-lang/sassc-3.6.0 b/metadata/md5-cache/dev-lang/sassc-3.6.0
deleted file mode 100644
index b5fe6b92f435..000000000000
--- a/metadata/md5-cache/dev-lang/sassc-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=dev-libs/libsass:=
-DESCRIPTION=A libsass command line driver
-EAPI=7
-HOMEPAGE=https://github.com/sass/sassc
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libsass:=
-SLOT=0
-SRC_URI=https://github.com/sass/sassc/archive/3.6.0.tar.gz -> sassc-3.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b244b9e979fc50eb396e909cff5ddc7
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.24 b/metadata/md5-cache/dev-lang/vala-0.40.24
index 1b55889f72b9..3f716f554dc3 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.24
+++ b/metadata/md5-cache/dev-lang/vala-0.40.24
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.24 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.24.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38da7d75290ddddf92b44ebbafc5826c
+_md5_=7711a388ed6b27d28f5944ca7edaf0ba
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.12 b/metadata/md5-cache/dev-lang/vala-0.48.12
index 65bb13e54787..0b4b1c59c56c 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.12
+++ b/metadata/md5-cache/dev-lang/vala-0.48.12
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.12 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.48
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.12.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7da784d981523df8b2cac7b6d49bc3d6
+_md5_=67fb66511cb374a31a05e76a69184617
diff --git a/metadata/md5-cache/dev-lang/xsb-3.8.0 b/metadata/md5-cache/dev-lang/xsb-3.8.0
index adf4523e76f0..3b574a9f954b 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.8.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.8.0
@@ -9,6 +9,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB38.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-3.8.0-gentoo-patchset-3.tar.gz
+SRC_URI=http://xsb.sourceforge.net/downloads/XSB38.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-3.8.0-gentoo-patchset-4.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=716146e3918a11e5514dde0363452b62
+_md5_=541428bcb472df5025e582a9ae2059db
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7a53bc3b9ca0..1cd207739545 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/antlr-c-3.5.2 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2
deleted file mode 100644
index 2792f8e433c1..000000000000
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] ) >=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=The ANTLR3 C Runtime
-EAPI=5
-HOMEPAGE=https://www.antlr3.org/
-IUSE=debug debugger doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=506207a5b12fc75befe50912b6399d18
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
index da4edb9be918..f305e37d66fb 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
@@ -5,10 +5,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=7
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.18.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bca7f867f4b7c7596ccbee9339dca8b4
+_md5_=f8cd8ae57e2418edf8cfa47de3ada7aa
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110 b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
index f890e1a345d6..1eca7a04a592 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
+++ b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
@@ -5,10 +5,10 @@ DESCRIPTION=Convenient & cross-platform sandboxing C library
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/BoxFort
 IUSE=test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz -> boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5b71c0b19de4a2a7e060f54e95f0a10d
+_md5_=67e237b8acb4e336f763c1fa68781070
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110 b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
index 9befe5d3cc2b..8e695458bf32 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
+++ b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
@@ -5,11 +5,11 @@ DESCRIPTION=Cross platform unit testing framework for C and C++
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/Criterion
 IUSE=test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=BSD-2 MIT ZLIB
 RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz -> criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz -> nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d9b55c46974c58c798c811b13a5441e6
+_md5_=3a3278b4711e222e0b9e9bb56cf37929
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index 727d8ba2316e..1b48644e772a 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=ldapdb? ( openldap )
 SLOT=2
 SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ba8e8f8fd7a60acb79e3b246c9cfd3e
+_md5_=c02fa6168bdc7fc63af07e1561f4f743
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.183 b/metadata/md5-cache/dev-libs/elfutils-0.183
index 443220041463..562f1d7818cf 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.183
+++ b/metadata/md5-cache/dev-libs/elfutils-0.183
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=7
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.183/elfutils-0.183.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56d439a74e3523ade550983f75db4187
+_md5_=4e4149e8d71695d3a79c84382aa485fe
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index 171c424d9add..ac7591e08760 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-r1
@@ -1,11 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Free Decision Diagram Library
-EAPI=6
+EAPI=7
 HOMEPAGE=http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2eabfc350779e711a9f3a82fb40155e
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad19b744031dbd9f34e9557d4d8b6485
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1 b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
index bdf97f72ec95..020eee4a25ca 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
@@ -10,4 +10,4 @@ LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=657aec0a67c560f443bd18456e4d6738
+_md5_=9dba6f783d32ae9185669b8cfa10fd06
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.2 b/metadata/md5-cache/dev-libs/ivykis-0.42.2
deleted file mode 100644
index 479c1ea54da0..000000000000
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Library for asynchronous I/O readiness notification
-EAPI=6
-HOMEPAGE=https://github.com/buytenh/ivykis
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.2.tar.gz -> ivykis-0.42.2.tar.gz
-_md5_=fa307dafaaf9ce8be670b5cf9ac73029
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1 b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
deleted file mode 100644
index 17406e455064..000000000000
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=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 for asynchronous I/O readiness notification
-EAPI=6
-HOMEPAGE=https://github.com/buytenh/ivykis
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.3.tar.gz -> ivykis-0.42.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=376abefe753fd85ae00137695c65e6f3
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.0 b/metadata/md5-cache/dev-libs/json-glib-1.6.0
index c4313474b722..37e0a8517e09 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.0
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library providing GLib serialization and deserialization for the JSO
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.54.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6d0c714b7fac1a546ef9e475ac2e28b
+_md5_=a6d59b804e12bf7574c5bee4b827a8de
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.2 b/metadata/md5-cache/dev-libs/json-glib-1.6.2
new file mode 100644
index 000000000000..b71b6acd159b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.2
@@ -0,0 +1,14 @@
+BDEPEND=~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.54.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
+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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.54.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.2.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e826353e4c030c2666bf338e25c1416
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0
new file mode 100644
index 000000000000..f9219afa8ea5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.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 dev-libs/json-glib[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JSON-RPC library for GLib
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/jsonrpc-glib
+IUSE=gtk-doc +introspection test vala
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.38/jsonrpc-glib-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47176b57898e5ef94d7a999dfa1b0a78
diff --git a/metadata/md5-cache/dev-libs/libcss-0.8.0-r2 b/metadata/md5-cache/dev-libs/libcss-0.8.0-r2
deleted file mode 100644
index 469f9a9a99e8..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.8.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.4.0 >=dev-util/netsurf-buildsystem-1.7-r1 virtual/pkgconfig test? ( dev-lang/perl )
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.4.0
-RESTRICT=!test? ( test )
-SLOT=0/0.8.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.8.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=970d03de55377019a02bebc3bccf9a4d
diff --git a/metadata/md5-cache/dev-libs/libcss-0.9.0-r1 b/metadata/md5-cache/dev-libs/libcss-0.9.0-r1
deleted file mode 100644
index 9d756d2bf71d..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libparserutils dev-libs/libwapcaplet test? ( dev-lang/perl )
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet
-RESTRICT=!test? ( test )
-SLOT=0/0.9.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.9.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=52d153749a4790034db5363c530be4b8
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.3.3 b/metadata/md5-cache/dev-libs/libdispatch-5.3.3
deleted file mode 100644
index 478a563f2083..000000000000
--- a/metadata/md5-cache/dev-libs/libdispatch-5.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/clang sys-devel/llvm dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for concurrent code execution on multicore hardware
-EAPI=7
-HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3.3-RELEASE.tar.gz -> libdispatch-5.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa650e9af77bb8a9f9dec3b6e9a385c0
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1 b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
new file mode 100644
index 000000000000..25b7b6daf2ac
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/clang sys-devel/llvm dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!gnustep-base/libobjc2
+DESCRIPTION=A library for concurrent code execution on multicore hardware
+EAPI=7
+HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!gnustep-base/libobjc2
+SLOT=0
+SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3.3-RELEASE.tar.gz -> libdispatch-5.3.3.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc8d1a4bac80bd1187163c5152f43db2
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
deleted file mode 100644
index eab2fb18ce2c..000000000000
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=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=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=simplified, portable interface to several low-level networking routines
-EAPI=7
-HOMEPAGE=https://github.com/ofalk/libdnet
-IUSE=python static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0360dcae47d4cdee050bda580dc3a0dd
diff --git a/metadata/md5-cache/dev-libs/libedit-20210216.3.1 b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
new file mode 100644
index 000000000000..6cdae4afaa6d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
@@ -0,0 +1,14 @@
+BDEPEND=>=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 test
+DEPEND=>=sys-libs/ncurses-5.9-r3[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=BSD replacement for libreadline
+EAPI=7
+HOMEPAGE=https://thrysoee.dk/editline/
+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 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD-2
+RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
+SLOT=0
+SRC_URI=https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=b785e2f3383092c4604b02b47d1b9c6d
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0
deleted file mode 100644
index 84e5fa7a667c..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bc64b7298286633806d09ffa099d067
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1
new file mode 100644
index 000000000000..186e133d90cc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=7
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
+RESTRICT=!test? ( test )
+SLOT=0/12
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=439e066587c05225d636fe90a4f41c69
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
new file mode 100644
index 000000000000..8929601f1665
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=7
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
+RESTRICT=!test? ( test )
+SLOT=0/12
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=439e066587c05225d636fe90a4f41c69
diff --git a/metadata/md5-cache/dev-libs/libgudev-234 b/metadata/md5-cache/dev-libs/libgudev-234
index 310a05cd4966..d2fac56e6592 100644
--- a/metadata/md5-cache/dev-libs/libgudev-234
+++ b/metadata/md5-cache/dev-libs/libgudev-234
@@ -5,10 +5,10 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=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(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/234/libgudev-234.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5fb10b31579dbb7ee0684d99a98913fa
+_md5_=9fca30162f3e98af453667599cdead1c
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.6 b/metadata/md5-cache/dev-libs/libgusb-0.3.6
new file mode 100644
index 000000000000..5469e4a8dad7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.6
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( dev-lang/python:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,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:= ) sys-apps/hwids
+DESCRIPTION=GObject wrapper for libusb
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libgusb
+IUSE=gtk-doc +introspection static-libs test +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 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,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:= ) sys-apps/hwids
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.6.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f1c88b72e377d9105cc907f55d982397
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 126cc74e6852..0eaf0e41b240 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=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=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.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(-)?] >=x11-libs/gtk+-2.18:2[abi_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/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=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/glib-2.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(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm x86
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b82039679f8f7bcf4cb89569e61cd056
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c39c1a7b357f576912474893b82e4731
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index a1385c1a5687..de6bbe62be52 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=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=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.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(-)?] >=x11-libs/gtk+-3.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(-)?] dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=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/glib-2.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(-)?] >=x11-libs/gtk+-3.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(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6adfa4f32e91e145041f5756a1df91a8
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b618b88f5248d5d93c3c766f91ff35e
diff --git a/metadata/md5-cache/dev-libs/libite-2.1.0 b/metadata/md5-cache/dev-libs/libite-2.1.0
deleted file mode 100644
index cffa8d4f2e61..000000000000
--- a/metadata/md5-cache/dev-libs/libite-2.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A collection of useful BSD APIs
-EAPI=7
-HOMEPAGE=https://github.com/troglobit/libite
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/troglobit/libite/releases/download/v2.1.0/libite-2.1.0.tar.xz
-_md5_=76f0680d4df895b8e433a4abadda7716
diff --git a/metadata/md5-cache/dev-libs/libite-2.1.2 b/metadata/md5-cache/dev-libs/libite-2.1.2
deleted file mode 100644
index 3eb2e05ca546..000000000000
--- a/metadata/md5-cache/dev-libs/libite-2.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A collection of useful BSD APIs
-EAPI=7
-HOMEPAGE=https://github.com/troglobit/libite
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/troglobit/libite/releases/download/v2.1.2/libite-2.1.2.tar.xz
-_md5_=76f0680d4df895b8e433a4abadda7716
diff --git a/metadata/md5-cache/dev-libs/libixion-0.16.1 b/metadata/md5-cache/dev-libs/libixion-0.16.1
new file mode 100644
index 000000000000..54976ff2108e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libixion-0.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+DESCRIPTION=General purpose formula parser & interpreter
+EAPI=7
+HOMEPAGE=https://gitlab.com/ixion/ixion
+IUSE=debug python +threads python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=MIT
+RDEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/0.16
+SRC_URI=https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c5bd2524606e1ad13dd881d3f66439e9
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 3fec330a4a42..fc5dbcda6078 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-libs/spdlog
+DEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=7
 HOMEPAGE=https://gitlab.com/ixion/ixion
-IUSE=debug python +threads python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug python +threads python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fc77b8ab5e82170948ec5f29e45d7a1a
+_md5_=14f849e32fac7eddb5de89e76a998c20
diff --git a/metadata/md5-cache/dev-libs/liblinear-243 b/metadata/md5-cache/dev-libs/liblinear-243
new file mode 100644
index 000000000000..1573f9c6456e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblinear-243
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A Library for Large Linear Classification
+EAPI=7
+HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+SLOT=0/4
+SRC_URI=https://github.com/cjlin1/liblinear/archive/v243.tar.gz -> liblinear-243.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=666b7426ad4c1456fc5ecb54b208c7d7
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3 b/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3
deleted file mode 100644
index 919fe8014a58..000000000000
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library for the MaxMind DB file format
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/libmaxminddb
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-SLOT=0/0.0.7
-SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.4.3/libmaxminddb-1.4.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=338d87a512f48cd3de89ad856665e121
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1 b/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1
deleted file mode 100644
index 11c811c5ae96..000000000000
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=test? ( dev-perl/IPC-Run3 )
-DESCRIPTION=C library for the MaxMind DB file format
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/libmaxminddb
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0/0.0.7
-SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.5.0/libmaxminddb-1.5.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b18605c5c8a95cf0aae7f4b25baa9c16
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-9999 b/metadata/md5-cache/dev-libs/libmaxminddb-9999
index a7b446acb441..099f7244e461 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-9999
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0.0.7
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4a0ceb13cd70a796fbb8fc511c73b877
+_md5_=30c16f871a77994cd3eea12bdc95c512
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
index 1df595b29d48..49f5b4b95267 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
@@ -8,4 +8,4 @@ LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c08a19da1d30eab3c0df569abb1925d
+_md5_=4b778d718a088752647673db6f5f79af
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1 b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
index 7368fb6b2623..1112d3771cf2 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=6
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
+HOMEPAGE=https://www.infradead.org/~tgr/libnl/
 IUSE=doc static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=1.1
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-1.1.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aa15de28510214ee224fb06fe25349bb
+_md5_=ca725d4c0a62f6019c62d86fbd4bd7b2
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.9999 b/metadata/md5-cache/dev-libs/libnl-1.1.9999
index 82306aa06dd5..bf60581cccf3 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.9999
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
+HOMEPAGE=https://www.infradead.org/~tgr/libnl/
 IUSE=doc static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=1.1
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=77e565640194b2440f18cd985bee7b76
+_md5_=751899fc69824481be2f264c58acab49
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index e5214f05d137..c497ea99da21 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
 IUSE=+debug static-libs python +threads utils python_targets_python3_7 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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca9529867b884c3ba7dc41f4a7f8f92b
+_md5_=b7a0ca18ea74c5cd721ffa5ec17577e9
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index dc47b18478b8..a79f71399fcd 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
 IUSE=+debug static-libs python +threads utils python_targets_python3_7 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=LGPL-2.1 utils? ( GPL-2 )
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=3
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e80a0d0e1ce53b824213a7c6c9ea64eb
+_md5_=51869d5387d6462b6ba8ee299b519c23
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2 b/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2
deleted file mode 100644
index a4b3a80c3a71..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 ) dev-util/netsurf-buildsystem
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
-RESTRICT=!test? ( test )
-SLOT=0/0.2.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44a3490303705019575b0cb2acb496bc
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1 b/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1
deleted file mode 100644
index c0a3c4d142cb..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem
-DEFINED_PHASES=compile install
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
-RESTRICT=!test? ( test )
-SLOT=0/0.2.1
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96c6112a343136650b940784f96777eb
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2 b/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2
deleted file mode 100644
index 8a3c29d97312..000000000000
--- a/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-util/netsurf-buildsystem
-DESCRIPTION=base64 and time library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.0.5
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsutils-0.0.5-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95c9113b7402c342a3a9ea68424eb2c5
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.16.1 b/metadata/md5-cache/dev-libs/liborcus-0.16.1
new file mode 100644
index 000000000000..18b4f3de2533
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liborcus-0.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 ) dev-util/mdds:1/1.5
+DESCRIPTION=Standalone file import filter library for spreadsheet documents
+EAPI=7
+HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
+IUSE=python +spreadsheet-model tools python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/0.16
+SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.16.1.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b15c5517f3e2e8b3186048e157fa7d51
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 3cfefa1164b8..056768b74da2 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 ) dev-util/mdds:1/9999
+DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 ) dev-util/mdds:1/9999
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=python +spreadsheet-model tools python_single_target_python3_7 python_single_target_python3_8
+IUSE=python +spreadsheet-model tools python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cbc6b6ef8742c5cc72f54c18beff9ee1
+_md5_=4b26dc18ffe7f71b48fe2b7849e7c8d8
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
index 4014c4b600bf..6341964a5fd5 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=C library for building efficient parsers
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cdd953494a28607821197d0267c6e385
+_md5_=145d0747968f8bf72cb7c64eae389fe2
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.1.1 b/metadata/md5-cache/dev-libs/libprelude-5.1.1
deleted file mode 100644
index 520886e727e1..000000000000
--- a/metadata/md5-cache/dev-libs/libprelude-5.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems ) virtual/pkgconfig virtual/yacc >=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/gnutls:= lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems )
-DESCRIPTION=Prelude-SIEM Framework Library
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=lua perl python ruby python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libprelude-5.1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a0206193b8ae5e77c95bc41dd47942e3
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0 b/metadata/md5-cache/dev-libs/libprelude-5.2.0
deleted file mode 100644
index e499ef4309c2..000000000000
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems ) virtual/pkgconfig virtual/yacc >=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/gnutls:= lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems )
-DESCRIPTION=Prelude-SIEM Framework Library
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=lua perl python ruby python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=127e00a02d5d26c6c8f12f3e97fc54b6
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
index 0b6186669f84..26904cb7d2ed 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Library for password quality checking and generating random password
 EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 IUSE=pam python static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=330aef21b9adf76d12fdd9a68ddda28d
+_md5_=25501ab949ce0fac7b449bd554cc0717
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.6 b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
index 7571f112274f..8ecbaca4105b 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.6
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
@@ -5,10 +5,10 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=7
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a77b751f66c1fdc9e603af835ff41ed8
+_md5_=b07c8eb6672f8e74e79fab8c46afaaf2
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.13 b/metadata/md5-cache/dev-libs/libsigsegv-2.13
index 08c199e6324e..460dab5e0f0c 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.13
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.13
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.13.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6708c3dbf7d024cd193c8f7c909792f9
+_md5_=eaec576c8767ef228f232ab8dbb2bd5f
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1 b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
index 489bb8b1848c..45753212dcbc 100644
--- a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=libspnav is a replacement for the magellan library with a cleaner AP
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
 IUSE=static-libs X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb38172f032565feb92aa3857af956e5
+_md5_=dc27acd0df280820d3b29c7890957396
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
index 63c50995f5e8..2b6236e1267e 100644
--- a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
@@ -8,7 +8,8 @@ IUSE=+gmp +libtommath tomsfastmath
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( WTFPL-2 public-domain )
 RDEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
+REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
 SLOT=0/1
 SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b34e287a6712c9ea154e26c9749d2488
+_md5_=26831e014d24f2aea4fbfdb5381c839f
diff --git a/metadata/md5-cache/dev-libs/libtsm-3 b/metadata/md5-cache/dev-libs/libtsm-3
deleted file mode 100644
index c0d642be63a6..000000000000
--- a/metadata/md5-cache/dev-libs/libtsm-3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Terminal Emulator State Machine
-EAPI=6
-HOMEPAGE=https://cgit.freedesktop.org/~dvdhrm/libtsm
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/kmscon/releases/libtsm-3.tar.xz
-_md5_=7638a144916c4a410f7bd6c817f08fe9
diff --git a/metadata/md5-cache/dev-libs/libuev-2.2.0 b/metadata/md5-cache/dev-libs/libuev-2.2.0
deleted file mode 100644
index 3e6d30e75198..000000000000
--- a/metadata/md5-cache/dev-libs/libuev-2.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Lightweight event loop library for Linux
-EAPI=6
-HOMEPAGE=https://github.com/troglobit/libuev
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.2.0/libuev-2.2.0.tar.xz
-_md5_=df1c070f71766266c9a15f00de6b575f
diff --git a/metadata/md5-cache/dev-libs/libuev-2.3.0 b/metadata/md5-cache/dev-libs/libuev-2.3.0
deleted file mode 100644
index 401a927af4b8..000000000000
--- a/metadata/md5-cache/dev-libs/libuev-2.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A collection of useful BSD APIs
-EAPI=7
-HOMEPAGE=https://github.com/troglobit/libuev
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.0/libuev-2.3.0.tar.xz
-_md5_=d0cf1e2004f58eb779c87209a140456d
diff --git a/metadata/md5-cache/dev-libs/libuev-2.3.1 b/metadata/md5-cache/dev-libs/libuev-2.3.1
deleted file mode 100644
index 63a0aeb02c09..000000000000
--- a/metadata/md5-cache/dev-libs/libuev-2.3.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A collection of useful BSD APIs
-EAPI=7
-HOMEPAGE=https://github.com/troglobit/libuev
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.1/libuev-2.3.1.tar.xz
-_md5_=d0cf1e2004f58eb779c87209a140456d
diff --git a/metadata/md5-cache/dev-libs/libuev-2.3.2 b/metadata/md5-cache/dev-libs/libuev-2.3.2
new file mode 100644
index 000000000000..f7f584c6dfcf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuev-2.3.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A collection of useful BSD APIs
+EAPI=7
+HOMEPAGE=https://github.com/troglobit/libuev
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz
+_md5_=4e3cf86b964b5ff9b301cf3de8efe34a
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10 b/metadata/md5-cache/dev-libs/libunistring-0.9.10
deleted file mode 100644
index 917510cf8009..000000000000
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libunistring/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-3 GPL-3
-SLOT=0/2
-SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d89c8eb56554d9063fb88df57b2e046
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1 b/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1
new file mode 100644
index 000000000000..926ab57a498d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libunistring/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )
+SLOT=0/2
+SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=755032182e8788dbedfdd67ec72872fa
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.3.0 b/metadata/md5-cache/dev-libs/libxmlb-0.3.0
new file mode 100644
index 000000000000..92f25632b6ae
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) >=dev-util/meson-0.47.0 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.9 dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer ) doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection )
+DESCRIPTION=Library to help create and query binary XML blobs
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libxmlb
+IUSE=doc introspection stemmer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/hughsie/libxmlb/archive/0.3.0.tar.gz -> libxmlb-0.3.0.tar.gz
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bcd656ab8c3a351dadebcb3185f50dce
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index ac2a51be51fb..60d3d3baf1bf 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.10
+++ b/metadata/md5-cache/dev-libs/lzo-2.10
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install test
 DESCRIPTION=An extremely fast compression and decompression library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.oberhumer.com/opensource/lzo/
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 SLOT=2
 SRC_URI=https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=a58ed18761ba17556a5fc38bde66938f
+_md5_=f98e919085bdab6b5fb73ca5d50da804
diff --git a/metadata/md5-cache/dev-libs/nspr-4.30 b/metadata/md5-cache/dev-libs/nspr-4.30
new file mode 100644
index 000000000000..364509a71047
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nspr-4.30
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Netscape Portable Runtime
+EAPI=7
+HOMEPAGE=https://www.mozilla.org/projects/nspr/
+IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.30/src/nspr-4.30.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e31a0647481cf26e9ea25f880db15693
diff --git a/metadata/md5-cache/dev-libs/nss-3.60.1 b/metadata/md5-cache/dev-libs/nss-3.60.1
deleted file mode 100644
index dd0c7c77f38d..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.60.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_60_1_RTM/src/nss-3.60.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee25e08d5726fd95f043b171aa652bf3
diff --git a/metadata/md5-cache/dev-libs/nss-3.61 b/metadata/md5-cache/dev-libs/nss-3.61
deleted file mode 100644
index 59c6b2037010..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.61
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_61_RTM/src/nss-3.61.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee25e08d5726fd95f043b171aa652bf3
diff --git a/metadata/md5-cache/dev-libs/nss-3.63 b/metadata/md5-cache/dev-libs/nss-3.63
new file mode 100644
index 000000000000..6b45312036c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.63
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_63_RTM/src/nss-3.63.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bb467ed23ecd9607b011653107b81c68
diff --git a/metadata/md5-cache/dev-libs/ntl-11.4.4 b/metadata/md5-cache/dev-libs/ntl-11.4.4
index 9e9eec3b5d3b..7fcc24ee5755 100644
--- a/metadata/md5-cache/dev-libs/ntl-11.4.4
+++ b/metadata/md5-cache/dev-libs/ntl-11.4.4
@@ -12,4 +12,4 @@ REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
 SLOT=0/43
 SRC_URI=https://www.shoup.net/ntl/ntl-11.4.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fa45d6785f37abcfe7774749103b5084
+_md5_=24be3c5fcffb3aac0a75c525be9397cf
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.14 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14
new file mode 100644
index 000000000000..e5ddb3a68c4e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems >=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-util/opencl-headers-2020.12.18
+DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
+EAPI=7
+HOMEPAGE=https://github.com/OCL-dev/ocl-icd
+IUSE=+khronos-headers 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=BSD-2
+RDEPEND=>=dev-util/opencl-headers-2020.12.18 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
+SLOT=0
+SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.14.tar.gz -> ocl-icd-2.2.14.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5f739e9e4d0475659aa348b58bbfe272
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
deleted file mode 100644
index 220c1819a47a..000000000000
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=tpm? ( app-crypt/trousers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=PKCS#11 provider cryptographic hardware
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/opencryptoki
-IUSE=debug libressl +tpm
-KEYWORDS=~amd64 ~arm ~s390 ~x86
-LICENSE=CPL-0.5
-RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/opencryptoki/3.4.1/opencryptoki-v3.4.1.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0539319b3015f685047bcd4b5df580bd
diff --git a/metadata/md5-cache/dev-libs/opensc-0.20.0 b/metadata/md5-cache/dev-libs/opensc-0.20.0
deleted file mode 100644
index 2bec1213b214..000000000000
--- a/metadata/md5-cache/dev-libs/opensc-0.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( dev-util/cmocka )
-DESCRIPTION=Libraries and applications to access smartcards
-EAPI=7
-HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
-IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 )
-REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.20.0/opensc-0.20.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=735511caa6fb8f721b08e4e44b7734f2
diff --git a/metadata/md5-cache/dev-libs/opensc-0.21.0-r1 b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
new file mode 100644
index 000000000000..e65c174d833f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( dev-util/cmocka )
+DESCRIPTION=Libraries and applications to access smartcards
+EAPI=7
+HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
+IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 )
+REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=490c8d1b176a82122a18a384fe7b8b65
diff --git a/metadata/md5-cache/dev-libs/papi-5.5.1 b/metadata/md5-cache/dev-libs/papi-5.5.1
deleted file mode 100644
index bb767dde9630..000000000000
--- a/metadata/md5-cache/dev-libs/papi-5.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libpfm virtual/mpi virtual/fortran
-DESCRIPTION=Performance Application Programming Interface
-EAPI=7
-HOMEPAGE=http://icl.cs.utk.edu/papi/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libpfm virtual/mpi virtual/fortran
-SLOT=0
-SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-5.5.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a763847dc57ba3e433253fd600f869b
diff --git a/metadata/md5-cache/dev-libs/pigpio-76 b/metadata/md5-cache/dev-libs/pigpio-76
deleted file mode 100644
index 4d5c6cbce36c..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-76
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio
-IUSE=python python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/v76.tar.gz -> pigpio-76.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3193221e7f3e6a3b16c21755f495366
diff --git a/metadata/md5-cache/dev-libs/pigpio-77 b/metadata/md5-cache/dev-libs/pigpio-77
deleted file mode 100644
index 6ce23f4c95a6..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-77
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio
-IUSE=python python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/v77.tar.gz -> pigpio-77.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3193221e7f3e6a3b16c21755f495366
diff --git a/metadata/md5-cache/dev-libs/pigpio-78 b/metadata/md5-cache/dev-libs/pigpio-78
deleted file mode 100644
index 26e6c76b2260..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-78
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio
-IUSE=python python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/v78.tar.gz -> pigpio-78.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3193221e7f3e6a3b16c21755f495366
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.1 b/metadata/md5-cache/dev-libs/processor-trace-1.6.1
deleted file mode 100644
index 158a528b585a..000000000000
--- a/metadata/md5-cache/dev-libs/processor-trace-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-text/pandoc ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Intel(R) Processor Trace decoder library
-EAPI=6
-HOMEPAGE=https://github.com/01org/processor-trace
-IUSE=doc test
-KEYWORDS=-* ~amd64
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.1.tar.gz -> processor-trace-1.6.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=436888a73d7895d7f6ec2821e6804eff
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.2 b/metadata/md5-cache/dev-libs/processor-trace-1.6.2
deleted file mode 100644
index f46def1da209..000000000000
--- a/metadata/md5-cache/dev-libs/processor-trace-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-text/pandoc ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Intel(R) Processor Trace decoder library
-EAPI=6
-HOMEPAGE=https://github.com/01org/processor-trace
-IUSE=doc test
-KEYWORDS=-* ~amd64
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.2.tar.gz -> processor-trace-1.6.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=436888a73d7895d7f6ec2821e6804eff
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
deleted file mode 100644
index 29b8f3557c6e..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/protobuf-3:0 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Protocol Buffers implementation in C
-EAPI=7
-HOMEPAGE=https://github.com/protobuf-c/protobuf-c
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/protobuf-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(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0
-SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=55d1c0ddca76a8fc9e985ee8b4340fb2
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.10.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.10.0
deleted file mode 100644
index 094752c36c16..000000000000
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-process/numactl
-DESCRIPTION=Radeon Open Compute Thunk Interface
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-process/numactl
-SLOT=0/3.10
-SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.10.0.tar.gz -> roct-thunk-interface-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0
deleted file mode 100644
index 55e278862643..000000000000
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-process/numactl
-DESCRIPTION=Radeon Open Compute Thunk Interface
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-process/numactl
-SLOT=0/3.7
-SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.7.0.tar.gz -> roct-thunk-interface-3.7.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0
deleted file mode 100644
index 33dd28ebb6ff..000000000000
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-process/numactl
-DESCRIPTION=Radeon Open Compute Thunk Interface
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-process/numactl
-SLOT=0/3.8
-SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.8.0.tar.gz -> roct-thunk-interface-3.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.9.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.9.0
deleted file mode 100644
index cae3f5f448cd..000000000000
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-process/numactl
-DESCRIPTION=Radeon Open Compute Thunk Interface
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-process/numactl
-SLOT=0/3.9
-SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.9.0.tar.gz -> roct-thunk-interface-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.0 b/metadata/md5-cache/dev-libs/simdjson-0.9.0
new file mode 100644
index 000000000000..69b113581f14
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/file sys-apps/findutils sys-apps/grep dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=tools? ( dev-libs/cxxopts:= )
+DESCRIPTION=SIMD accelerated C++ JSON library
+EAPI=7
+HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+IUSE=test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 Boost-1.0
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.0.tar.gz -> simdjson-0.9.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b9095615d090e75bdd10f40c864f199
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.5.0 b/metadata/md5-cache/dev-libs/softhsm-2.5.0
deleted file mode 100644
index 1361cf7ad767..000000000000
--- a/metadata/md5-cache/dev-libs/softhsm-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gcc:=[cxx] virtual/pkgconfig test? ( dev-util/cppunit )
-DEFINED_PHASES=configure install
-DEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
-DESCRIPTION=A software PKCS#11 implementation
-EAPI=7
-HOMEPAGE=https://www.opendnssec.org/
-IUSE=bindist gost libressl migration-tool test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.5.0.tar.gz
-_md5_=6a939b5aaa201237be69c099cb5609fd
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1 b/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
deleted file mode 100644
index ce515fa3c5ba..000000000000
--- a/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-5.3.0:=
-DESCRIPTION=Very fast, header only, C++ logging library
-EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-5.3.0:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.5.0.tar.gz -> spdlog-1.5.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=384edabd53265cc59ba6da5ab696630a
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.7.0 b/metadata/md5-cache/dev-libs/spdlog-1.7.0
deleted file mode 100644
index de0f9319858f..000000000000
--- a/metadata/md5-cache/dev-libs/spdlog-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-6.1.2:=
-DESCRIPTION=Very fast, header only, C++ logging library
-EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
-IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-6.1.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.7.0.tar.gz -> spdlog-1.7.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92d143983527afc9a43376e5b983462d
diff --git a/metadata/md5-cache/dev-libs/tntnet-3.0 b/metadata/md5-cache/dev-libs/tntnet-3.0
index 68e08ade4ced..922ad59f191d 100644
--- a/metadata/md5-cache/dev-libs/tntnet-3.0
+++ b/metadata/md5-cache/dev-libs/tntnet-3.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/cxxtools-3.0 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-li
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-3.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dfda53a2f48307e8466d5b51e4c51309
+_md5_=3c18126e369870ee786030858996bee5
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.0
deleted file mode 100644
index b381e539bbbe..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.0.tar.gz -> tree-sitter-0.19.0.tar.gz
-_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.2 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.2
deleted file mode 100644
index 62fd49c72767..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.2.tar.gz -> tree-sitter-0.19.2.tar.gz
-_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
new file mode 100644
index 000000000000..585e74cf3325
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
+EAPI=7
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.4.tar.gz -> tree-sitter-0.19.4.tar.gz
+_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0 b/metadata/md5-cache/dev-libs/unittest++-2.0.0
deleted file mode 100644
index 218088208e8c..000000000000
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A lightweight unit testing framework for C++
-EAPI=6
-HOMEPAGE=https://unittest-cpp.github.io/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=edc49acc5f5dca1fc7fa7b30acb731aa
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1 b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
deleted file mode 100644
index 2fa43519e482..000000000000
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A lightweight unit testing framework for C++
-EAPI=7
-HOMEPAGE=https://unittest-cpp.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fac75017a2a28c4f880d65dbd0192c1
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
new file mode 100644
index 000000000000..e2a6ed637a90
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 media-gfx/graphviz qt5? ( dev-qt/qthelp:5 ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.8.1 )
+DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
+EAPI=7
+HOMEPAGE=https://uriparser.github.io/
+IUSE=+doc qt5 test unicode
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=BSD
+REQUIRED_USE=qt5? ( doc ) test? ( unicode )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05e82b27bdec4fe9c528d48f3d30874e
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.12 b/metadata/md5-cache/dev-libs/vala-common-0.48.12
index 0877e36d24de..8a430aa71fa0 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.12
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.12
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.12.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=86e13269af7d28b5548e01ac955fcf17
+_md5_=8409b9b9fd5358118e5ea36acc248780
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 8b2aea03fc6d..d02e71251d82 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/roswell-20.01.14.104 b/metadata/md5-cache/dev-lisp/roswell-20.01.14.104
deleted file mode 100644
index b95e0a33225a..000000000000
--- a/metadata/md5-cache/dev-lisp/roswell-20.01.14.104
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=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
-DESCRIPTION=A lisp installer and launcher for major environment
-EAPI=7
-HOMEPAGE=https://github.com/roswell/roswell
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!net-libs/librouteros
-SLOT=0
-SRC_URI=https://github.com/roswell/roswell/archive/v20.01.14.104.tar.gz -> roswell-20.01.14.104.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d65052d82ec438d7dd8d9c34fc7f8d63
diff --git a/metadata/md5-cache/dev-lisp/roswell-20.04.14.105 b/metadata/md5-cache/dev-lisp/roswell-20.04.14.105
deleted file mode 100644
index 4dbea3cc743c..000000000000
--- a/metadata/md5-cache/dev-lisp/roswell-20.04.14.105
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=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
-DESCRIPTION=A lisp installer and launcher for major environment
-EAPI=7
-HOMEPAGE=https://github.com/roswell/roswell
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!net-libs/librouteros
-SLOT=0
-SRC_URI=https://github.com/roswell/roswell/archive/v20.04.14.105.tar.gz -> roswell-20.04.14.105.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e2be6a75429182072309e8034387f00d
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index f3eca4b01257..dccbd9af85b6 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/busted-2.0.0-r101 b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
index 036273175bf4..3701bff6b827 100644
--- a/metadata/md5-cache/dev-lua/busted-2.0.0-r101
+++ b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=install test
-DEPEND=dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEPEND=dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Elegant Lua unit testing
 EAPI=7
 HOMEPAGE=http://olivinelabs.com/busted/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=dev-lua/lua_cliargs[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luasystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/dkjson[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luassert[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-term[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/penlight[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/mediator_lua[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz -> busted-2.0.0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=12f8e8af464d6f7b797727bb3fed18ad
+_md5_=7e16820445468f880456ee309cf5a1ed
diff --git a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100 b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
index 3ca3950abf2b..11358d5dbe7b 100644
--- a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
+++ b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
@@ -3,11 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Pretty output handler for Busted
 EAPI=7
 HOMEPAGE=https://github.com/hishamhm/busted-htest
-IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RDEPEND=dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 SLOT=0
 SRC_URI=https://github.com/hishamhm/busted-htest/archive/1.0.0.tar.gz -> busted-htest-1.0.0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=877b2bc0465ba5fa81d9fd7cbb10c736
+_md5_=ed712d69aa26dce2bb1fac742aea77da
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100 b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
index 33560301dc0a..59c8944f5dcc 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
@@ -1,16 +1,16 @@
-BDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+BDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0= test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0= test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] x11-base/xorg-server[xvfb] x11-apps/xhost )
 DESCRIPTION=Lua bindings using gobject-introspection
 EAPI=7
 HOMEPAGE=https://github.com/pavouk/lgi
-IUSE=examples test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=examples test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0=
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0=
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fc08a56730a6148eaf38b44b5183513
+_md5_=88ed069c9e0d1c55012e76f012214f67
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index 1b745ce83d81..d7d4a5c7e648 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Parsing Expression Grammars for Lua
 EAPI=7
 HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
-IUSE=test debug doc lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test debug doc lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51555999133b60f48a9feb67ab5749b9
+_md5_=278220309207a347872b3db511fb26fa
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.7.1 b/metadata/md5-cache/dev-lua/lua-argparse-0.7.1
new file mode 100644
index 000000000000..14be47e8cbd0
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.7.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=Feature-rich command line parser for Lua
+EAPI=7
+HOMEPAGE=https://github.com/luarocks/argparse
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+SLOT=0
+SRC_URI=https://github.com/luarocks/argparse/archive/0.7.1.tar.gz -> lua-argparse-0.7.1.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8d65d0169b567b74e44b067e178beaf8
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
index 4d84a4b77f91..4d84a4b77f91 100644
--- a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101
+++ b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.24.0 b/metadata/md5-cache/dev-lua/luacheck-0.24.0
new file mode 100644
index 000000000000..4757382f23d2
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luacheck-0.24.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] )
+DEFINED_PHASES=compile install test
+DEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?]
+DESCRIPTION=A tool for linting and static analysis of Lua code
+EAPI=7
+HOMEPAGE=https://github.com/luarocks/luacheck
+IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/luarocks/luacheck/archive/0.24.0.tar.gz -> luacheck-0.24.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a0ec84f4f72ec1ba1ab4a071a6299a72
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102 b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
index 8954ea593b9e..a1975caa2ae6 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luarocks )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luarocks )
 DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
 DESCRIPTION=A database interface library for Lua
 EAPI=7
 HOMEPAGE=https://github.com/mwild1/luadbi
-IUSE=mysql postgres +sqlite test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=mysql postgres +sqlite test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 ) || ( mysql postgres sqlite )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) || ( mysql postgres sqlite )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=43500375dcb7f5800c01b9e04c3aaf7d
+_md5_=202a18bd892f609cda1b4425dd07becb
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.5 b/metadata/md5-cache/dev-lua/lualdap-1.2.5
new file mode 100644
index 000000000000..9d41c3f5f0d9
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lualdap-1.2.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
+DEFINED_PHASES=compile install prepare
+DEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=A lua binding for the OpenLDAP client libraries
+EAPI=7
+HOMEPAGE=https://github.com/lualdap/lualdap
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.5.tar.gz -> lualdap-1.2.5.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fa6fb73b96457713490ec1eb4649e766
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100 b/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
deleted file mode 100644
index aa4b3894552e..000000000000
--- a/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
-DEFINED_PHASES=compile install prepare
-DEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=A lua binding for the OpenLDAP client libraries
-EAPI=7
-HOMEPAGE=https://github.com/lualdap/lualdap
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.5.tar.gz -> lualdap-1.2.5.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d74feb551ef30f49a691ee2b49096340
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.5.0 b/metadata/md5-cache/dev-lua/luarocks-3.5.0
index acd85f9bf2b0..a6866170ffec 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.5.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.5.0
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/busted-htest[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted-htest[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted-htest[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted-htest[lua_targets_lua5-3(-)] ) 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 ) )
+BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/busted-htest[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted-htest[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted-htest[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted-htest[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted-htest[lua_targets_lua5-4(-)] ) 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 ) )
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=net-misc/curl libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) 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 )
+DEPEND=net-misc/curl libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) 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 )
 DESCRIPTION=A package manager for the Lua programming language
 EAPI=7
 HOMEPAGE=https://luarocks.org
-IUSE=libressl test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+IUSE=libressl test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.5.0.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e46ea2fc4ca21cb7e3fb8e761231b55a
+_md5_=07169823a6a9f420ce3d78e62dabef31
diff --git a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101 b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
index 8fc812e2ef41..e651ddc32d48 100644
--- a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
+++ b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=install test
-DEPEND=dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEPEND=dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Assertion library for Lua
 EAPI=7
 HOMEPAGE=http://olivinelabs.com/busted/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=dev-lua/say[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz -> luassert-1.8.0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c82e44ca48813636cbf0d8560fea8a2
+_md5_=6e56d7d05570e0a3c370add647d44331
diff --git a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102 b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
index e6eade6389eb..52f8e142cdaf 100644
--- a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
+++ b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Platform independent system calls for Lua
 EAPI=7
 HOMEPAGE=https://github.com/o-lim/luasystem/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/o-lim/luasystem/archive/v0.2.1-0.tar.gz -> luasystem-0.2.1_p0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0625fa7e3b1d8277839a544eccdc1a17
+_md5_=25eb5b4c4f3c7f4cab536ff6de3f2ce8
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102 b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102
deleted file mode 100644
index 78f513918985..000000000000
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.32.0:=
-DESCRIPTION=Bare libuv bindings for lua
-EAPI=7
-HOMEPAGE=https://github.com/luvit/luv
-IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0 MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.32.0:=
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=494311ed550fd876ee331821b437b23b
diff --git a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101 b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
index c42f527e8988..40f490a88088 100644
--- a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
+++ b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=install test
 DESCRIPTION=Mediator pattern implementation for pub-sub management
 EAPI=7
 HOMEPAGE=http://olivinelabs.com/mediator_lua/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0e7d8021c2291a9ed36b3d2c60617a16
+_md5_=55952ad11fe06666ac238cc53c9e1db0
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100 b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
index 05dc0afde501..9c8d0eb8e70d 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Lua bindings for libmpack
 EAPI=7
 HOMEPAGE=https://github.com/libmpack/libmpack/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.8.tar.gz -> mpack-1.0.8.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca56e2b9f2979a100ee32f82246cd975
+_md5_=f0bc9b9fe47e700c49a3eb9ac6a01329
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r101 b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
index 527f7ccd2402..654b0ab2c5ce 100644
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r101
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] ) lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] ) lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 DEFINED_PHASES=install test
 DESCRIPTION=Lua String Hashing/Indexing Library
 EAPI=7
 HOMEPAGE=http://olivinelabs.com/busted/
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da72ec1b2360e174fb0b25b82c255a93
+_md5_=6a2da14e4e1527a9c0a3f780c8fcfe7d
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 131fa5f669fa..d26619a24132 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/astring-0.8.3 b/metadata/md5-cache/dev-ml/astring-0.8.3
deleted file mode 100644
index 81e5e44f5a64..000000000000
--- a/metadata/md5-cache/dev-ml/astring-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Alternative String module for OCaml
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/astring https://github.com/dbuenzli/astring
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
-SLOT=0/0.8.3
-SRC_URI=https://erratique.ch/software/astring/releases/astring-0.8.3.tbz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=394c66729d8398c752a2d767955615fb
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
index db68dba4433e..dc6566b25f87 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.0
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Standard library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.0.tar.gz -> base-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=febe07fd1823a87264e96d28a17a1f53
+_md5_=6128f07880b62ac1e51d68afcb723ca8
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index 613cc2d318bc..fb4d16b0b37a 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=String type based on Bigarray, for use in I/O and C-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.14.0.tar.gz -> base_bigstring-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=9088394404339e376fe3ab878ccc8021
+_md5_=385c066e9d3d4fa035de72d884e7f258
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
index f427bd750690..a324c4d2b523 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Randomized testing framework, designed for compatibility with Base
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_quickcheck
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=f252f5705100baf5ebb61d3dd8efb0b9
+_md5_=df0860c33500878e5837fe71b6c26d81
diff --git a/metadata/md5-cache/dev-ml/bin-prot-0.9.0 b/metadata/md5-cache/dev-ml/bin-prot-0.9.0
deleted file mode 100644
index cfce96961b67..000000000000
--- a/metadata/md5-cache/dev-ml/bin-prot-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.0.tar.gz -> bin-prot-0.9.0.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/metadata/md5-cache/dev-ml/bin-prot-0.9.1 b/metadata/md5-cache/dev-ml/bin-prot-0.9.1
deleted file mode 100644
index bba9590d5efb..000000000000
--- a/metadata/md5-cache/dev-ml/bin-prot-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.1.tar.gz -> bin-prot-0.9.1.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
index fd5950a46159..7d2d733bff2b 100644
--- a/metadata/md5-cache/dev-ml/bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Binary protocol generator
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/bin_prot
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.14.0.tar.gz -> bin_prot-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=dd459d960469c90bb5ece6c2eb6deb59
+_md5_=fe61884d68e235e2c2b7c18b30093623
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1 b/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1
deleted file mode 100644
index 308b667f2f8d..000000000000
--- a/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
-EAPI=7
-HOMEPAGE=http://camlbz2.forge.ocamlcore.org/
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.6.0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/72/camlbz2-0.6.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=77d8981ef8618173c2fb7726df02d012
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.7.0 b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
index 041a1a61215c..5f8af8c27b7e 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -5,10 +5,10 @@ DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
 EAPI=7
 HOMEPAGE=https://gitlab.com/irill/camlbz2
 IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.7.0
 SRC_URI=https://gitlab.com/irill/camlbz2/-/archive/0.7.0/camlbz2-0.7.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	findlib	3d3de4bef686774baeeabfa2b916631c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=68c220acb08832c02f0ee949ac41e79e
+_md5_=61ee3e5a6e052b646a3e2f46321e9a37
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.08_p1 b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
index aa4d4b86c555..79d11a02cdc5 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.08_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
@@ -4,9 +4,9 @@ DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=~dev-lang/ocaml-4.09.0:=[ocamlopt?]
 SLOT=0/4.08_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.08+1.tar.gz -> camlp4-4.08_p1.tar.gz
-_md5_=e369a3103d4c17f4184da45ffd574738
+_md5_=7dee07f78458cde1915b3347a8121e03
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.06 b/metadata/md5-cache/dev-ml/camlzip-1.06
deleted file mode 100644
index e3981d931b1c..000000000000
--- a/metadata/md5-cache/dev-ml/camlzip-1.06
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
-EAPI=7
-HOMEPAGE=http://forge.ocamlcore.org/projects/camlzip/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3
-SLOT=1/1.06
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1616/camlzip-1.06.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=5cc9772d483125b0eeb82334bc358bbf
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.07 b/metadata/md5-cache/dev-ml/camlzip-1.07
deleted file mode 100644
index 11d1e7f649f8..000000000000
--- a/metadata/md5-cache/dev-ml/camlzip-1.07
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
-EAPI=7
-HOMEPAGE=https://github.com/xavierleroy/camlzip
-IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3
-SLOT=1/1.07
-SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz -> camlzip-1.07.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=bdad819faab23d7db378f2401e6ae287
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.10 b/metadata/md5-cache/dev-ml/camlzip-1.10
index 1a623908397d..7bbbd2fa4814 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.10
+++ b/metadata/md5-cache/dev-ml/camlzip-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3
 SLOT=1/1.10
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz -> camlzip-1.10.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=be0dd83b99f3725346019b274102b18e
+_md5_=74127cf99b770d401c6cd3ef33eded35
diff --git a/metadata/md5-cache/dev-ml/camomile-0.8.5-r2 b/metadata/md5-cache/dev-ml/camomile-0.8.5-r2
deleted file mode 100644
index 0fc025e04e7b..000000000000
--- a/metadata/md5-cache/dev-ml/camomile-0.8.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Camomile is a comprehensive Unicode library for ocaml
-EAPI=7
-HOMEPAGE=https://github.com/yoriyuki/Camomile/wiki
-IUSE=debug +ocamlopt
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:=
-SLOT=0/0.8.5
-SRC_URI=https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad0af90b9c47d7435435d73560359d3e
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.14.0 b/metadata/md5-cache/dev-ml/cinaps-0.14.0
index 86165bf32f06..9589217a05a6 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.14.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Trivial metaprogramming tool
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-ppx/cinaps
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/findlib:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.14.0.tar.gz -> cinaps-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=3669523ffece44989562274c6660fcfe
+_md5_=45ae8a8f9215e5b5dcd7080485779650
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
index 1554e4367481..c379b4b06116 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.4
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/cmdliner
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=0d7f4341e02a768e5468922de6148b61
+_md5_=5218301cadbc2c95ef53fe4c49bb784e
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r3 b/metadata/md5-cache/dev-ml/core-0.14.0-r3
index c6fb51d3760f..955ae04ce87b 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -4,12 +4,12 @@ DEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:=
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core
-IUSE=ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=a87efeb24f55849f7ddd920169c01749
+_md5_=2e0ab8acde9a464b624508e79902d39a
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.14.0 b/metadata/md5-cache/dev-ml/core_bench-0.14.0
index 7d302490009d..30c44bec129b 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Micro-benchmarking library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core_bench
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/core-0.14.0:= >=dev-ml/core_kernel-0.14.0:= >=dev-ml/ppx_jane-0.14.0:= dev-ml/textutils:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.14.0.tar.gz -> core_bench-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=7db8727936041937b42e280b7e1eb2d5
+_md5_=9b6a44dc871f8a8690a1709df31b4bc0
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3 b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
index d7c275dc52d4..a93abe035d59 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
@@ -5,11 +5,11 @@ DESCRIPTION=System-independent part of Core
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core_kernel
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/splittable_random:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.1.tar.gz -> core_kernel-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d9b6d6485ba37c47e015205837479566
+_md5_=4638604d54f6190e569e1f7d2bf3bc23
diff --git a/metadata/md5-cache/dev-ml/cppo-1.4.1 b/metadata/md5-cache/dev-ml/cppo-1.4.1
deleted file mode 100644
index cfcfcc76d161..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.12:= dev-ml/ocamlbuild:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=http://mjambon.com/cppo.html
-IUSE=examples
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:= dev-ml/ocamlbuild:=
-SLOT=0/1.4.1
-SRC_URI=https://github.com/mjambon/cppo/archive/v1.4.1.tar.gz -> cppo-1.4.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=3cc428e32e0bf6b643bc639aea811d51
diff --git a/metadata/md5-cache/dev-ml/cppo-1.5.0 b/metadata/md5-cache/dev-ml/cppo-1.5.0
deleted file mode 100644
index 6f5fac53d5f0..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=http://mjambon.com/cppo.html https://github.com/mjambon/cppo/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild:=[ocamlopt?]
-SLOT=0/1.5.0
-SRC_URI=https://github.com/mjambon/cppo/archive/v1.5.0.tar.gz -> cppo-1.5.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=9a5d3024338884e3b8883d55aa10d8a1
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.6 b/metadata/md5-cache/dev-ml/cppo-1.6.6
deleted file mode 100644
index 81aa816d7c39..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-community/cppo/
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/1.6.6
-SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.6.tar.gz -> cppo-1.6.6.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=482d02119677edcd7356386ca11b38ec
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.7 b/metadata/md5-cache/dev-ml/cppo-1.6.7
index ef3fff20c451..373e339c5712 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.7
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.7
@@ -5,10 +5,10 @@ DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-community/cppo/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.6.7
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.7.tar.gz -> cppo-1.6.7.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=e0655a1d60f81343b9b49339aac4ec51
+_md5_=93a2cfbe959b403abe4197b5a2a09e79
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.10 b/metadata/md5-cache/dev-ml/cryptokit-1.10
deleted file mode 100644
index ce42b82e757c..000000000000
--- a/metadata/md5-cache/dev-ml/cryptokit-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
-IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.10
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	38fa5d4c4928a854488fd58f7f7f7e8d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=26918f617760751c66ea0fe5135b623f
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.11 b/metadata/md5-cache/dev-ml/cryptokit-1.11
deleted file mode 100644
index 8a430e4f2c7b..000000000000
--- a/metadata/md5-cache/dev-ml/cryptokit-1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
-IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-REQUIRED_USE=test? ( ocamlopt )
-RESTRICT=!test? ( test )
-SLOT=0/1.11
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	38fa5d4c4928a854488fd58f7f7f7e8d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=40aa7348136576f679ff51d07b8378c1
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1 b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
index 17f5cba63e60..f557560bc3da 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Cryptographic primitives library for Objective Caml
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/cryptokit
 IUSE=cpu_flags_x86_aes +ocamlopt test zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=dev-ml/dune-configurator dev-ml/zarith:=[-mpir] zlib? ( >=sys-libs/zlib-1.1 ) >=dev-lang/ocaml-4:=[ocamlopt?]
 REQUIRED_USE=test? ( ocamlopt )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.16.1
 SRC_URI=https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz -> cryptokit-1.16.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=012452f759f39cf54889251e93710bf9
+_md5_=8b5830c5643d57d645ced2b9b2943da7
diff --git a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1 b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
index 19565f5fc278..9777a2eaabc1 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Parsing and printing of S-expressions in Canonical form
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-dune/csexp
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4c339f7edd4ee3840054008a335bff9d
+_md5_=fe4a73684fcb9e69f5e29aaa1a68daf3
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9 b/metadata/md5-cache/dev-ml/cudf-0.9
index e73dc99385cf..b1f1423732ad 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.9
+++ b/metadata/md5-cache/dev-ml/cudf-0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
 EAPI=7
 HOMEPAGE=http://www.mancoosi.org/cudf/
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=43eea58b3891ac67a0003072d14ea949
+_md5_=c23509134e7697d85af99bd1b1c829bf
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1-r2 b/metadata/md5-cache/dev-ml/dose3-5.0.1-r2
deleted file mode 100644
index 1d8e0807a0d0..000000000000
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=<dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/re:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) dev-ml/findlib dev-ml/ocamlbuild dev-ml/cppo test? ( dev-python/pyyaml[libyaml] )
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=7
-HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
-IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=<dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/re:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
-RESTRICT=test
-SLOT=0/5.0.1
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
-_md5_=c10f018c3a97a7367b4f952680d7fd11
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2 b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
index 8aee8e041655..3a6eb4f8e15e 100644
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library to perform analysis on package repositories
 EAPI=7
 HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
 IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <=dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/cudf:=[ocamlopt=] >=dev-ml/extlib-1.7.0:=[ocamlopt=] >=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=] <dev-ml/ocamlgraph-1.8.9:=[ocamlopt=] >=dev-ml/re-1.9.0:=[ocamlopt=] parmap? ( dev-ml/parmap:=[ocamlopt=] ) zip? ( dev-ml/camlzip:=[ocamlopt=] ) bzip2? ( dev-ml/camlbz2:= ) xml? ( dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
 RESTRICT=test
 SLOT=0/5.0.1_p16
 SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1-16.debian.tar.xz
-_md5_=507ee7c5cdb6b2ae561a56dcf55fb07a
+_md5_=d1802ec478cfa50243b440529704410e
diff --git a/metadata/md5-cache/dev-ml/dune-2.8.2 b/metadata/md5-cache/dev-ml/dune-2.8.2
index 0f929c8f0643..744bda0139c7 100644
--- a/metadata/md5-cache/dev-ml/dune-2.8.2
+++ b/metadata/md5-cache/dev-ml/dune-2.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=35c2d836517260f83c8dae3f06459618
+_md5_=d81d485d61df561b25e81f590116d812
diff --git a/metadata/md5-cache/dev-ml/dune-2.8.4 b/metadata/md5-cache/dev-ml/dune-2.8.4
new file mode 100644
index 000000000000..28da72026f46
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-2.8.4
@@ -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.8.4
+SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=7ed7dc9998232bd32bcc67f01a3cd2a3
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.7.1 b/metadata/md5-cache/dev-ml/dune-configurator-2.7.1
deleted file mode 100644
index 778010ca1e4a..000000000000
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile configure install test
-DEPEND=~dev-ml/dune-private-libs-2.7.1:= dev-ml/csexp:= test? ( 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=Apache-2.0
-RDEPEND=~dev-ml/dune-private-libs-2.7.1:= dev-ml/csexp:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/2.7.1
-SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=9310ee9ee96c6e72fa7ae9661422488a
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
index 549e42ce5ab7..1ee89393c37f 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
@@ -5,11 +5,11 @@ 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
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=~dev-ml/dune-private-libs-2.8.2:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] dev-ml/result:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=e5316578a15c2735c90896b731a47c94
+_md5_=2a5a39ef87781b07fbc9468c4d4dd89a
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
new file mode 100644
index 000000000000..ccfc2f145ad4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
@@ -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.8.4:=[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.8.4:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] dev-ml/result:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.8.4
+SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=f6945ecc3f0c437e485db49779afb240
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1
deleted file mode 100644
index 9f32331f294f..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-ml/dune-2.7.1 test? ( dev-ml/ppx_expect ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ml/csexp:= dev-ml/findlib:= >=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:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/2.7.1
-SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=97f5da91da6d21d59f52cd093ca1a2d4
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
index a628ca0735c4..2c167a3f517a 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
@@ -5,11 +5,11 @@ 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
+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.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=fd001019e28a15e9c426b16c9234a84c
+_md5_=ab53b8f2ee2fff859aa237b91f027217
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
new file mode 100644
index 000000000000..a0a0a27231b6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
@@ -0,0 +1,15 @@
+BDEPEND=~dev-ml/dune-2.8.4 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.8.4
+SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=a51ab7500c6555e75f1b14bdf32755f2
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.14.0 b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
index 8873b4441861..4c0dff27494a 100644
--- a/metadata/md5-cache/dev-ml/fieldslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Folding over record fields
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/fieldslib
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.14.0.tar.gz -> fieldslib-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d2ba827d888a473522aa52d4202aac03
+_md5_=5336cea5bac127480dceea5d70e5aec0
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
deleted file mode 100644
index 582826606dee..000000000000
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.4
-SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=0943fd6eb645f0ad044ac64e6ad1fbc9
diff --git a/metadata/md5-cache/dev-ml/integers-0.2.2 b/metadata/md5-cache/dev-ml/integers-0.2.2
deleted file mode 100644
index 0e68b1c8abfd..000000000000
--- a/metadata/md5-cache/dev-ml/integers-0.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:= dev-ml/ocamlbuild dev-ml/opam dev-ml/topkg dev-ml/findlib
-DESCRIPTION=Various signed and unsigned integer types for OCaml
-EAPI=6
-HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/0.2.2
-SRC_URI=https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz
-_md5_=248014a6fbf873cfe7f96fb16208c3c6
diff --git a/metadata/md5-cache/dev-ml/integers-0.4.0 b/metadata/md5-cache/dev-ml/integers-0.4.0
index d0f72f743a11..6d6ec20fa767 100644
--- a/metadata/md5-cache/dev-ml/integers-0.4.0
+++ b/metadata/md5-cache/dev-ml/integers-0.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Various signed and unsigned integer types for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.4.0
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.4.0.tar.gz -> integers-0.4.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=2404c076fbbc3fbf6f0cf114dbde3772
+_md5_=c7ef4b14d1d2c27a1a57b2d1d5cbef3f
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0 b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
index d1a93e608a43..07a2c2f0057e 100644
--- a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Jane Street header files
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/jane-street-headers
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.14.0.tar.gz -> jane-street-headers-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=6c2f4365f8b62e2bc01b02e2dcea584a
+_md5_=73f96c757fa5b2c17a3ee35631cfe8a1
diff --git a/metadata/md5-cache/dev-ml/jingoo-1.4.2 b/metadata/md5-cache/dev-ml/jingoo-1.4.2
index 0f5cb54563f3..db58d8947174 100644
--- a/metadata/md5-cache/dev-ml/jingoo-1.4.2
+++ b/metadata/md5-cache/dev-ml/jingoo-1.4.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/menhir:= test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/menhir:= test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=OCaml template engine almost compatible with Jinja2.
 EAPI=7
 HOMEPAGE=https://github.com/tategakibunko/jingoo
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tategakibunko/jingoo/archive/v1.4.2.tar.gz -> jingoo-1.4.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=fe5fd4299cfa683861ec1f87a2dc4d85
+_md5_=f7c993ba6d9ff6c4dabb0f58b7925bd6
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.0 b/metadata/md5-cache/dev-ml/jst-config-0.14.0
index a6db7249806b..9339d9752c20 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.14.0
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compile-time configuration for Jane Street libraries
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/jst-config
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.0.tar.gz -> jst-config-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=ebaf723f1120f4137a95900db2588800
+_md5_=07610653412a8ccc56fcdd31c4085d12
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.10 b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
index f88fd545eb41..46704707937f 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.10
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
@@ -5,9 +5,9 @@ DESCRIPTION=Objective CAML interface for Gtk+2
 EAPI=7
 HOMEPAGE=http://lablgtk.forge.ocamlcore.org
 IUSE=debug examples glade gnomecanvas +ocamlopt sourceview spell svg
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
 SLOT=2/2.18.10
 SRC_URI=https://github.com/garrigue/lablgtk/archive/2.18.10.tar.gz -> lablgtk-2.18.10.tar.gz
-_md5_=73fa2b4719469c2a0219f445ae6f2625
+_md5_=466aaa1d91335786c6cb3e3952bf9ca6
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.5 b/metadata/md5-cache/dev-ml/lablgtk-2.18.5
deleted file mode 100644
index e5c2ffaf5084..000000000000
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=>=x11-libs/gtk+-2.10:2 <dev-lang/ocaml-4.09:=[ocamlopt?] svg? ( >=gnome-base/librsvg-2.2:2 ) glade? ( >=gnome-base/libglade-2.0.1 ) gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) spell? ( app-text/gtkspell:2 ) sourceview? ( x11-libs/gtksourceview:2.0 ) dev-ml/camlp4:= virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Objective CAML interface for Gtk+2
-EAPI=5
-HOMEPAGE=http://lablgtk.forge.ocamlcore.org/
-IUSE=debug examples glade gnomecanvas sourceview +ocamlopt spell svg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
-RDEPEND=>=x11-libs/gtk+-2.10:2 <dev-lang/ocaml-4.09:=[ocamlopt?] svg? ( >=gnome-base/librsvg-2.2:2 ) glade? ( >=gnome-base/libglade-2.0.1 ) gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) spell? ( app-text/gtkspell:2 ) sourceview? ( x11-libs/gtksourceview:2.0 ) dev-ml/camlp4:=
-SLOT=2/2.18.5
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f129d7b0fa38aa49dea3091142c908d3
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1 b/metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1
deleted file mode 100644
index 73ce7f352038..000000000000
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-ml/findlib virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
-DESCRIPTION=Objective CAML interface for Gtk+2
-EAPI=7
-HOMEPAGE=http://lablgtk.forge.ocamlcore.org
-IUSE=debug examples glade gnomecanvas +ocamlopt sourceview spell svg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
-SLOT=2/2.18.8
-SRC_URI=https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz
-_md5_=e79d012c2f569125577a238258a891de
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.2 b/metadata/md5-cache/dev-ml/labltk-8.06.2
deleted file mode 100644
index aaaccc26cdf2..000000000000
--- a/metadata/md5-cache/dev-ml/labltk-8.06.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?] >=dev-ml/findlib-1.5.5-r1 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/labltk/
-IUSE=+ocamlopt X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=QPL-1.0 LGPL-2
-RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]
-SLOT=0/8.06.2
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1628/labltk-8.06.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c16857c60af8b9b5e4d474b13d59838
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 fb19ad76abc8..1197b5e4d38c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-10.0.1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-10.0.1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-10.0.1[llvm_targets_ARM] ) llvm_targets_BPF? ( ~sys-devel/llvm-10.0.1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-10.0.1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-10.0.1[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-10.0.1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-10.0.1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-10.0.1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-10.0.1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-10.0.1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-10.0.1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-10.0.1[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-10.0.1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-10.0.1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-10.0.1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-10.0.1[llvm_targets_ARC] ) llvm_targets_AVR? ( ~sys-devel/llvm-10.0.1[llvm_targets_AVR] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,4 +13,4 @@ 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd09aa2d4e9d06ccc65eef6510ad0f2b
+_md5_=5717c4e4571dc61b81766312579e4263
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0
index f9075fb7d905..e05be807db68 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.0[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.0[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/11.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fac30dd32a05a25c53f44ee0018ff7ce
+_md5_=dcdcc53a01b08544507d2f0d39a6d1cf
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1
index f1abdbfb8291..77103bcc71a3 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.1[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.1[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.1[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.1[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/11.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5afc0ce082210b6b7e590c6821e495fd
+_md5_=e250b95094bd8fb74dd75eead9e2d48d
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 a89df2e2194a..9abcecfa1c23 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.1.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-11.1.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.1.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.1.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.1.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.1.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.1.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.1.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.1.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.1.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.1.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.1.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.1.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.1.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.1.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.1.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.1.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.1.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.1.0[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.1.0[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,4 +13,4 @@ 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5afc0ce082210b6b7e590c6821e495fd
+_md5_=e250b95094bd8fb74dd75eead9e2d48d
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
index 8c31077f5ee6..fbe87e4e5574 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.0.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.0.9999[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.0.9999
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbdccbef8edd3f34ed3572ff255eeb6a
+_md5_=9f32d7a60ba66a1bdf97fe0df7a7b68e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc2
index bfed5a421f88..d572bb2e8435 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc2
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc2
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.0_rc2[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12.0.0_rc2
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0-rc2.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6302ca7a56e198f1c938e5837c6ceaf1
+_md5_=9f32d7a60ba66a1bdf97fe0df7a7b68e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc3
index 1cde7b7d83ac..5418e4776de7 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0_rc3
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.0_rc3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.0_rc3[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12.0.0_rc3
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0-rc3.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6302ca7a56e198f1c938e5837c6ceaf1
+_md5_=9f32d7a60ba66a1bdf97fe0df7a7b68e
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 fac78d02c287..dc6b7c4f98d9 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
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0.9999[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/13.0.0.9999
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6302ca7a56e198f1c938e5837c6ceaf1
+_md5_=9f32d7a60ba66a1bdf97fe0df7a7b68e
diff --git a/metadata/md5-cache/dev-ml/logs-0.6.3 b/metadata/md5-cache/dev-ml/logs-0.6.3
deleted file mode 100644
index 3f20ff8c289d..000000000000
--- a/metadata/md5-cache/dev-ml/logs-0.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib test? ( dev-ml/mtime ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Logging infrastructure for OCaml
-EAPI=7
-HOMEPAGE=https://erratique.ch/software/logs https://github.com/dbuenzli/logs
-IUSE=+fmt cli +lwt test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= )
-RESTRICT=!test? ( test )
-SLOT=0/0.6.3
-SRC_URI=https://erratique.ch/software/logs/releases/logs-0.6.3.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=8934f81d364bdd53afc023649a6c3884
diff --git a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1 b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
index 0eafb86d111a..83baeaf1e14a 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Cooperative light-weight thread library for OCaml
 EAPI=7
 HOMEPAGE=http://ocsigen.org/lwt
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-ml/ppxlib-0.18.0:= dev-ml/react:= dev-ml/dune-configurator:= dev-libs/libev !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/5.3.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.3.0.tar.gz -> lwt-5.3.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=b26bb2254627e4bd2c0417e64b8e8a3f
+_md5_=ffd2eb61f120553d5b477a671eca0f5d
diff --git a/metadata/md5-cache/dev-ml/markup-0.7.5 b/metadata/md5-cache/dev-ml/markup-0.7.5
deleted file mode 100644
index 7a55157a8ea8..000000000000
--- a/metadata/md5-cache/dev-ml/markup-0.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt] test? ( dev-ml/ounit ) dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Error-recovering streaming HTML5 and XML parsers
-EAPI=5
-HOMEPAGE=https://github.com/aantron/markup.ml
-IUSE=doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt]
-RESTRICT=!test? ( test )
-SLOT=0/0.7.5p1
-SRC_URI=https://github.com/aantron/markup.ml/archive/0.7.5.tar.gz -> markup-0.7.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8e41c31ccca9e6ef86c6fc63b14b009
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.11 b/metadata/md5-cache/dev-ml/mccs-1.1.11
index 21deaf6c9e9c..dfe533ac8d94 100644
--- a/metadata/md5-cache/dev-ml/mccs-1.1.11
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.11
@@ -5,11 +5,11 @@ DESCRIPTION=Multi Criteria CUDF Solver
 EAPI=7
 HOMEPAGE=http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-ml/cudf:= sci-mathematics/glpk:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.11
 SRC_URI=https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz -> mccs-1.1.11.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=3e4a322aa533fafe969b2a3fd8c63481
+_md5_=1e0afbbb3bfe46af104a4070faf72297
diff --git a/metadata/md5-cache/dev-ml/menhir-20181006 b/metadata/md5-cache/dev-ml/menhir-20181006
deleted file mode 100644
index 75cff414e46f..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20181006
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=7
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20181006
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20181006.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=12c53d41328fb34a71231502078b10af
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index e7b79c1c8b1c..8aa546e46e7c 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -4,10 +4,10 @@ DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 IUSE=examples +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20190924
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ce66ec005bf1bd2cf7365cd26c263d7
+_md5_=0f66fff880fb0dee0d8f488473ca4158
diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1 b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
new file mode 100644
index 000000000000..820a1b89798b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/3.4.2
+SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=8a5a0751184bc93d507186e699808717
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r1 b/metadata/md5-cache/dev-ml/merlin-4.1-r1
new file mode 100644
index 000000000000..e568ad07a3a6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/4.1
+SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=7f716c102d084462d26dda1ba0a5c044
diff --git a/metadata/md5-cache/dev-ml/mmap-1.0.2 b/metadata/md5-cache/dev-ml/mmap-1.0.2
deleted file mode 100644
index ccd363f8b1e1..000000000000
--- a/metadata/md5-cache/dev-ml/mmap-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=File mapping
-EAPI=7
-HOMEPAGE=https://github.com/mirage/mmap
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/1.0.2
-SRC_URI=https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=f720ab153ffbf7c4587678f37844acb7
diff --git a/metadata/md5-cache/dev-ml/mmap-1.1.0 b/metadata/md5-cache/dev-ml/mmap-1.1.0
index 56d501d26195..feaf3b5c2415 100644
--- a/metadata/md5-cache/dev-ml/mmap-1.1.0
+++ b/metadata/md5-cache/dev-ml/mmap-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=File mapping
 EAPI=7
 HOMEPAGE=https://github.com/mirage/mmap
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.1.0
 SRC_URI=https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=b86b0fb3249152a1fe62559c66e18375
+_md5_=a1fb963ae6aed01631f0db94895fac0c
diff --git a/metadata/md5-cache/dev-ml/num-1.3 b/metadata/md5-cache/dev-ml/num-1.3
deleted file mode 100644
index 5eb19758f954..000000000000
--- a/metadata/md5-cache/dev-ml/num-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/ocaml-4.09.0[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.09.0[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
-EAPI=7
-HOMEPAGE=https://github.com/ocaml/num
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.09.0[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
-SLOT=0
-SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=756d47b47b19d570b2f6523b5137fc5e
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index 1ce84eb178b3..9aec0000c4a3 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=de
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6fe2ba867222055a849265661b01e452
+_md5_=fcf99ccb31e6a5eb44d2374354312464
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
index 8c1b946ff12c..838f37697627 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
@@ -5,10 +5,10 @@ DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything a
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.12.3
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.3.tar.gz -> ocaml-compiler-libs-0.12.3.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=01e14959ae100f490097a03f6d4941e2
+_md5_=5c297729ffcac7d2109d8097b7bf9f3d
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
deleted file mode 100644
index 54e255fbd851..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi
-RESTRICT=!test? ( test )
-SLOT=0/0.11.2
-SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.2.tar.gz -> ocaml-ctypes-0.11.2.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=7895a9002b0f62da8551067039349aa9
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
index 2845708038f2..3f571ef483dc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/integers:=
 RESTRICT=!test? ( test )
 SLOT=0/0.17.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz -> ocaml-ctypes-0.17.1.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=a92d23b86fcafac29b35e585d5d6d35b
+_md5_=68ffd978d8b2627a94a4bb380291dea0
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
index 3f1b14c7e33d..2a3d2db0e2fa 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml bindings for expat
 EAPI=7
 HOMEPAGE=https://github.com/whitequark/ocaml-expat
 IUSE=doc +ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=911a8b65acd8793cee7dbcbbc2d32bb5
+_md5_=5eb4340f24b2a108c4d7f5537c4fb451
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
index cf88d4c4c6fc..6cd752cfb588 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/stdlib-shims-0.2.0 >=dev-lang/ocaml-4:=[ocamlopt?]
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-ml/ounit2-2.0.0 >=dev-ml/stdlib-shims-0.2.0 >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-fileutils
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.2/fileutils-v0.6.2.tbz -> ocaml-fileutils-0.6.2.tar.bz2
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=2e4c663a2e3f92c4d18d6a1774dd65f5
+_md5_=2e6643b3d4c0889c519dd77d71250455
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
deleted file mode 100644
index adf257e0300e..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Provides support for internationalization of OCaml program
-EAPI=7
-HOMEPAGE=https://github.com/gildor478/ocaml-gettext
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub
-RESTRICT=!test? ( test )
-SLOT=0/0.3.7
-SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9354f7acec669b5f33195d7b5d982ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
index 5c7fd8495735..ffb9fb5e53c8 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext test? ( dev-ml/ounit[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext test? ( dev-ml/ounit2[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Provides support for internationalization of OCaml program
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d068c2b5d902201264c79bc0ffd1ecc4
+_md5_=a9ab2d138b11c5a045d448357ccb9a9b
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
index 5c69f76bd277..19b9fe8467dc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= test? ( dev-ml/ounit[ocamlopt=] dev-ml/ocaml-fileutils ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= test? ( dev-ml/ounit2[ocamlopt=] dev-ml/ocaml-fileutils ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Support for internationalization of OCaml programs using the Camomile library
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=5b451b6619aa38be17b5fc0a1043224a
+_md5_=6d73558928d6b7890fec1ecc758df2bf
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
index d618138860cc..faa126f1a0a6 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 test? ( dev-ml/ocaml-fileutils dev-ml/ounit[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 test? ( dev-ml/ocaml-fileutils dev-ml/ounit2[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Support for internationalization of OCaml programs using native gettext library
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=3444b53b269923292727dc86d9949436
+_md5_=ff20e57118cd6bedab3e3fe84c31a546
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0
deleted file mode 100644
index 126579ca9385..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=7
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/2.0.0
-SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.0.0.tar.gz -> ocaml-migrate-parsetree-2.0.0.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=93b017e51532143487458afdc4fb8731
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
index 50c7e1774dae..3b5ea921c494 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=7
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.1.0.tar.gz -> ocaml-migrate-parsetree-2.1.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=eb084d2f83e9fae1447205a579e249a2
+_md5_=811ee1c37b37786d3250b5aeced79748
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3-r1 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3-r1
deleted file mode 100644
index a1a0ecb07b1f..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl:0= <dev-lang/ocaml-4.09.0:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for OpenSSL
-EAPI=5
-HOMEPAGE=https://github.com/savonet/ocaml-ssl
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:0= <dev-lang/ocaml-4.09.0:=
-SLOT=0/0.5.3
-SRC_URI=https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-0.5.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=243ade0a7fd73c22ca18eccda0e9fc5d
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7-r1 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7-r1
deleted file mode 100644
index 1bb4f18acdde..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=<=dev-lang/ocaml-4.06:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) doc? ( dev-tex/hevea dev-ml/ocamlweb ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=O'Caml Graph library
-EAPI=5
-HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=doc examples gtk +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=<=dev-lang/ocaml-4.06:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
-SLOT=0/1.8.7
-SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=608a06249c5c85b7ac297d212dca7991
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r1 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r1
deleted file mode 100644
index d29955a0e969..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) doc? ( dev-tex/hevea dev-ml/ocamlweb ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=O'Caml Graph library
-EAPI=5
-HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=doc examples gtk +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
-SLOT=0/1.8.8
-SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=7a99e992a0fb395d192eaddefcf6c8d7
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
new file mode 100644
index 000000000000..bf95136b8a37
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-tex/hevea dev-ml/ocamlweb )
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=O'Caml Graph library
+EAPI=7
+HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
+IUSE=doc examples gtk +ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
+SLOT=0/1.8.8
+SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
+_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_md5_=fec682d1031c5f5ae701652c09ef1972
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0 b/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0
deleted file mode 100644
index 328b78ab35e1..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=O'Caml Graph library
-EAPI=7
-HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=gtk +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/2.0.0
-SRC_URI=https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=bd27d4a991904ce6c3747bfaefbe8ee6
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.2 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.2
deleted file mode 100644
index ab60a981f4be..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=amd64 ppc x86
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources strip
-SLOT=0/4.1.2
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b9a0a019fbd225b6d2086baa1ce51ec
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8
deleted file mode 100644
index c808d37128da..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/cppo virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( dev-ml/lablgtk:2= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=7
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=amd64 ppc x86
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( dev-ml/lablgtk:2= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources strip
-SLOT=0/4.1.8
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=6e9c85d20ca0e9e4493d73dc7e37a541
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
index f83a79a22368..79ce49798b8d 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
 IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=ZLIB GPL-2+
 RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
 RESTRICT=installsources strip
 SLOT=0/4.1.8
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=933316bc7f0b62c4cf18d59291a2f0fe
+_md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.39 b/metadata/md5-cache/dev-ml/ocamlweb-1.39
deleted file mode 100644
index 5616fb88be8d..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.39
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=O'Caml literate programming tool
-EAPI=7
-HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.39.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=734edb117055e1f176736706ac187987
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41 b/metadata/md5-cache/dev-ml/ocamlweb-1.41
index 03b02c123f4e..31f54a43219f 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.41
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.41
@@ -5,11 +5,11 @@ DESCRIPTION=O'Caml literate programming tool
 EAPI=7
 HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=virtual/latex-base
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.41.tar.gz
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=bed487480bb5471ede2dda27f8489efe
+_md5_=873217ed5e460dc7c0308d29e76e7256
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.0 b/metadata/md5-cache/dev-ml/ocplib-endian-1.0
deleted file mode 100644
index 6badace7723b..000000000000
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.01 >=dev-ml/cppo-1.1.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Functions to read and write int16/32/64 from strings, bytes, and bigarrays
-EAPI=5
-HOMEPAGE=https://github.com/OCamlPro/ocplib-endian
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0
-SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz -> ocplib-endian-1.0.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	38fa5d4c4928a854488fd58f7f7f7e8d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=29ab8897b09cc1fc485c69d218585462
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1 b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
index 47031ab8fae9..e1fa3e248df3 100644
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Functions to read and write int16/32/64 from strings, bytes, and big
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro/ocplib-endian
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/1.1
 SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz -> ocplib-endian-1.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=c8a29391fd7226ab4189d41d18b0d171
+_md5_=d03cfc46e3130ce275c5e2a47fef1784
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.3 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.3
deleted file mode 100644
index 2ba6ef493b68..000000000000
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=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-ml/findlib-1.0.4-r1
-DESCRIPTION=A library implementing a simplex algorithm
-EAPI=6
-HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
-KEYWORDS=amd64
-LICENSE=LGPL-2.1-with-linking-exception
-SLOT=0
-SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/0.3.tar.gz -> ocplib-simplex-0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	findlib	3d3de4bef686774baeeabfa2b916631c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c61a9499cbd22e136246509813b2b3f9
diff --git a/metadata/md5-cache/dev-ml/octavius-1.2.2 b/metadata/md5-cache/dev-ml/octavius-1.2.2
index b5024e13343c..4c7bdbe3d99b 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.2.2
+++ b/metadata/md5-cache/dev-ml/octavius-1.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=ocamldoc comment syntax parser
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-doc/octavius
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.2
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz -> octavius-1.2.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=13435627a5aabd57ecb547f9e2d03a94
+_md5_=547f5548f48de931341300a1a888ecef
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.7.10 b/metadata/md5-cache/dev-ml/ocurl-0.7.10
deleted file mode 100644
index 2b83a1a5c387..000000000000
--- a/metadata/md5-cache/dev-ml/ocurl-0.7.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt] virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the libcurl library
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
-IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.7.10
-SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.10.tar.gz -> ocurl-0.7.10.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=0f784370de25524671b548c589b3ec9f
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.1 b/metadata/md5-cache/dev-ml/ocurl-0.9.1
index 8c0c86f6e5da..43e22b3cac71 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.1
@@ -5,10 +5,10 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
 IUSE=examples +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.1.tar.gz -> ocurl-0.9.1.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=7a2002f133ae33b9e7bcf95b831c60e1
+_md5_=fd07450fc47d4a7c8d6fcbef4bfe2200
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-2.0.7-r1
deleted file mode 100644
index f7c57116c12c..000000000000
--- a/metadata/md5-cache/dev-ml/opam-2.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=A source-based package manager for OCaml
-EAPI=7
-HOMEPAGE=http://opam.ocaml.org/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=5406e2e1e4076c24a208e9b61faa9d6c
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
index ff67ae2f0acd..ad4796496721 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A source-based package manager for OCaml
 EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d5a7da8c6000af733856b1fe954a01d4
+_md5_=3d373d211d383c5f9695dea15ff2b781
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1
deleted file mode 100644
index e83e88da1d4a..000000000000
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.7:= ~dev-ml/opam-state-2.0.7:= ~dev-ml/opam-solver-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=opam client libraries
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.7:= ~dev-ml/opam-state-2.0.7:= ~dev-ml/opam-solver-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=17458fd707733a4a8d791797aba78695
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8 b/metadata/md5-cache/dev-ml/opam-client-2.0.8
index 23a53d701661..ad6febbf1880 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=opam client libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=bfe06d639a15a98226097868a11cff1a
+_md5_=16e7ecdcc4693a76d1bb075ecaa5f29d
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.7 b/metadata/md5-cache/dev-ml/opam-core-2.0.7
deleted file mode 100644
index 13a902f53d57..000000000000
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/ocaml
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= dev-ml/dune dev-ml/cppo >=dev-lang/ocaml-4:=
-DESCRIPTION=Core libraries for opam
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=b21467b908753da03a0f8420ed301b51
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
index 2f749cc4ab0d..504cf16ed5f6 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
@@ -4,10 +4,10 @@ DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=d01fb717b29da66c209ebaa64e75d2a7
+_md5_=57ae99f6f4a1ca77d192e95698c80e0c
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
index 0fc284030b56..1e523d2cef89 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parser and printer for the opam file syntax
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/opam-file-format
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.0.tar.gz -> opam-file-format-2.1.0.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=63483bdfaaa0b77220e328065e1fb8c4
+_md5_=82a2e1da0399dcbe2d56d32065b8f09e
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.7-r2 b/metadata/md5-cache/dev-ml/opam-format-2.0.7-r2
deleted file mode 100644
index df4d47a69e99..000000000000
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/ocaml
-DEFINED_PHASES=compile install prepare
-DEPEND=~dev-ml/opam-core-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= dev-ml/cppo >=dev-lang/ocaml-4:=
-DESCRIPTION=Core libraries for opam
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-core-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=d7e0ab737ed08e07182948b5df76c255
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
index 0196f7b923c3..058bd4e7a438 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=92234b031fc1ee195e23100b0dae2380
+_md5_=e5014d9e9429ede0929734664e1addea
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
deleted file mode 100644
index 4ab6aa086b7c..000000000000
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/ocaml
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.7 dev-ml/findlib >=dev-lang/ocaml-4:=
-DESCRIPTION=Core installer for opam packages
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.7 >=dev-lang/ocaml-4:=
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.7/opam-full-2.0.7.tar.gz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=8b9fc978a335f6b70ac5e4b2dccdc515
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
index 19c746e934d0..d2c0b6a9bfe9 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 dev-m
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
 _eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=e24a3dadb2b85232db5a560c3fa8537b
+_md5_=268abf3d4ba1a551a214287819ec96b3
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
deleted file mode 100644
index 6f3e9b4be1c4..000000000000
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=opam repository libraries
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=test
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=26cd2530a10988cb4b9c17558cefddf4
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
index ac538ce76b89..02bd32e81772 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=0ae9ed580635f8bc0f6f3bf0812d2e18
+_md5_=b88efcf4100ed5d8d94152d1b13b87b5
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
deleted file mode 100644
index ca0c6d021998..000000000000
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=opam solver
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=c56579a3284b4657094d8e3ee8d9ab2b
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
index 209e82251d7a..a65c86b0e17c 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=opam solver
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=837225798860c2df980d49d7d9411be3
+_md5_=a49810dbfa95aafebb7afebbcc8ff73a
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
deleted file mode 100644
index f12b7da527ce..000000000000
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-repository-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=opam state libraries
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-repository-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=test
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=2ad2a0a5bf7600006cf7b8ec39260a8e
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8 b/metadata/md5-cache/dev-ml/opam-state-2.0.8
index ec8562355d6f..f63184f31160 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4609c95b4fcedc7ebf7f4043d0c2bb3b
+_md5_=6d360d2c249e0367bca6f14d4ebebee7
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.3 b/metadata/md5-cache/dev-ml/ounit2-2.2.3
index 9664d7e04184..ea354418ec71 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.3
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=Unit testing framework for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ounit
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.2.3
 SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.3/ounit-v2.2.3.tbz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=a7cde4c4a61cf6941921c4bac1d2efcf
+_md5_=10732129e273a38695736725f2761096
diff --git a/metadata/md5-cache/dev-ml/parmap-1.0_rc8 b/metadata/md5-cache/dev-ml/parmap-1.0_rc8
deleted file mode 100644
index 45f591134925..000000000000
--- a/metadata/md5-cache/dev-ml/parmap-1.0_rc8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] dev-ml/findlib dev-ml/ocamlbuild dev-ml/ocaml-autoconf
-DESCRIPTION=Library to exploit multicore architectures for OCaml programs
-EAPI=5
-HOMEPAGE=https://www.dicosmo.org/code/parmap/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?]
-SLOT=0/1.0_rc8
-SRC_URI=https://github.com/rdicosmo/parmap/archive/1.0-rc8.tar.gz -> parmap-1.0_rc8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4b01933f519287445a142bdb166ed3dd
diff --git a/metadata/md5-cache/dev-ml/parmap-1.1.1 b/metadata/md5-cache/dev-ml/parmap-1.1.1
deleted file mode 100644
index 7d3536b330ac..000000000000
--- a/metadata/md5-cache/dev-ml/parmap-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=Library to exploit multicore architectures for OCaml programs
-EAPI=7
-HOMEPAGE=https://www.dicosmo.org/code/parmap/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/1.1.1
-SRC_URI=https://github.com/rdicosmo/parmap/archive/1.1.1.tar.gz -> parmap-1.1.1.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=fc93680a0cc1fe2d70bbe92e43d44a16
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2 b/metadata/md5-cache/dev-ml/parmap-1.2
index 5e876b66ef0a..d499268e67e0 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2
+++ b/metadata/md5-cache/dev-ml/parmap-1.2
@@ -5,10 +5,10 @@ DESCRIPTION=Library to exploit multicore architectures for OCaml programs
 EAPI=7
 HOMEPAGE=https://www.dicosmo.org/code/parmap/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.tar.gz -> parmap-1.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=1aaf35152bea0ef18470d36facdfdaba
+_md5_=1a295064f872d5b84c9c35178184b423
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
index 4298c7ba75ad..a046e3a98ad2 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=S-expression parsing library
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/parsexp
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.0.tar.gz -> parsexp-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=34dd0a07bb91839d8fc0e0639bc4c6f5
+_md5_=f855186d69223b0b207bcce7fdd8e4d0
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
deleted file mode 100644
index e5f8edb7d69f..000000000000
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/7.2.3
-SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	38fa5d4c4928a854488fd58f7f7f7e8d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e3b3e0776648a9883a9ad75f4a8e8e1d
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
index f2eb84f68630..c5de87ffe0c2 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_assert
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=7e313390b98bb1c629afb40fc384a710
+_md5_=65accfdb7b16140f146ebe74444f0986
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.14.0 b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
index 8b16101968d8..f3385cebc855 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Base set of ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_base
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_enumerate-0.14.0:= >=dev-ml/ppx_hash-0.14.0:= >=dev-ml/ppx_js_style-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.14.0.tar.gz -> ppx_base-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=e9e785c30ee5adf75bf8631fa6c01913
+_md5_=247a247a14aa362a1afc06b1c54653d5
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
index e0e255cda854..ae5b4e9a8e3b 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_bench
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz -> ppx_bench-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4246e1caa74cd9b217878c600dda0f35
+_md5_=a0e553b69907ab178983bc8d245adbda
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
index ac93405979e1..ccccbfa4f9a5 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Generation of bin_prot readers and writers from types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=50bd3987c44018f203e3f4d85bf709a0
+_md5_=05312be2fe0b6fd4684064fdbf0bc663
diff --git a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0 b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
index 7f6f89dddc46..78599732b00f 100644
--- a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Expands [@cold] into [@inline never][@specialise never][@local never
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_cold
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_cold/archive/v0.14.0.tar.gz -> ppx_cold-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4605cf8eefdf7ecfebdb2537e8ee5dea
+_md5_=d32847e5aa14c4ca77662ba096ca0e62
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
index fe5871de078a..fadd4f265e8a 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Generation of comparison functions from types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_compare
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.14.0.tar.gz -> ppx_compare-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=442c070de2827b26268f396419efae46
+_md5_=b1a80c8cc404da297c71d584aba27f18
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
index 4df18b4e762f..520c65935135 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Printf-style format-strings for user-defined string conversion
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.14.0.tar.gz -> ppx_custom_printf-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=75f256b4155449d9a2395a4bcebcb355
+_md5_=69c5018ebca05c4453ce378480cf3015
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1 b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
index 05c90e222250..9d5359456d80 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=Shared [@@deriving] plugin registry
 EAPI=7
 HOMEPAGE=https://github.com/diml/ppx_derivers
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.1
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.2.1.tar.gz -> ppx_derivers-1.2.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=ede5604b45e282a6f378b7c7b1d2ed4f
+_md5_=645376917126544e6d99045ee19e4c0c
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.5 b/metadata/md5-cache/dev-ml/ppx_deriving-4.5
deleted file mode 100644
index 569d67c8410f..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppx_tools:= <dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo dev-ml/ppxfind test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=Type-driven code generation for OCaml
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-ml/ppx_tools:= <dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/4.5
-SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz -> ppx_deriving-4.5.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=2071276e5de63b1e09df2cfff7f043a5
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
deleted file mode 100644
index 578b9a2c8e88..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Feature-full driver for OCaml AST transformers
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_driver
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.1.tar.gz -> ppx_driver-0.9.1.tar.gz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=5eebc7208b78283faaf55e931f0c6ec1
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
index f5cc0fa46068..be935db7b36a 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Generate a list containing all values of a finite type
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_enumerate
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.14.0.tar.gz -> ppx_enumerate-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=912925c9d8683ef31bcc42e6409fe2b1
+_md5_=a1600a795d1134c23b9ca4215fca21a0
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
index 96587d5ef9a8..4f8b12709e2b 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Cram like framework for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_expect
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.0.tar.gz -> ppx_expect-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=587db2e03885241e3d5d27a0a2826a98
+_md5_=a3fd584763acc183bf1e311fbd65365b
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
index bc0f91b8c039..68ba3ce29b27 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Add location to calls to failwiths
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_fail
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.14.0.tar.gz -> ppx_fail-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=71d4d7f90594df6f25d398e2072cbbfe
+_md5_=cbd7de4e980f015920cb3245d30c2573
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
index 59ee85c0d747..57741bd3c2b1 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of accessor and iteration functions for ocaml records
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/fieldslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.14.1.tar.gz -> ppx_fields_conv-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=f9b28e4fe1dd7b794a01269a288244a9
+_md5_=70de61263be005fc34eaa3431f240eab
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
index 6f9f9aaaf1f7..5d70cd495b0a 100644
--- a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Simpler notation for fixed point literals
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_fixed_literal
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.14.0.tar.gz -> ppx_fixed_literal-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=abe77fffb077524e0f370c02d83817a4
+_md5_=a0f974d696978e59d4a9d9b2806a9845
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
index a2da99bc1525..20ec46ddda29 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=PPX rewriter that generates hash functions from type expressions and
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_hash
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.14.0.tar.gz -> ppx_hash-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=5062cf58d8ef043827fafd0b694098be
+_md5_=ebf039c18654bac98d2ca7cf7df161d9
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.14.0 b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
index 6ec1dc664eec..836cd7c4c591 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Expands [%here] into its location
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_here
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.14.0.tar.gz -> ppx_here-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=818a926461701d38a831537df534fcf0
+_md5_=1a4fe6084e2d1be4e74756ffd9eb534d
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
index f0c155d19eaf..4ab0a6884da7 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
@@ -5,11 +5,11 @@ DESCRIPTION=Syntax extension for writing in-line tests in ocaml code
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_inline_test
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/time_now-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.14.1.tar.gz -> ppx_inline_test-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=7694132d3adca6c7475f5ece6ec1f933
+_md5_=6f424a7c8b7c8e59482d824ce28c95d3
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
index 1a296ed57127..2da770b851e4 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Standard Jane Street ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_jane
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base_quickcheck-0.14.0:= >=dev-ml/ppx_assert-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_bench-0.14.1:= >=dev-ml/ppx_bin_prot-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_expect-0.14.0:= >=dev-ml/ppx_fail-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_fixed_literal-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_module_timer-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_optional-0.14.0:= >=dev-ml/ppx_pipebang-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= >=dev-ml/ppx_stable-0.14.1:= >=dev-ml/ppx_string-0.14.1:= >=dev-ml/ppx_typerep_conv-0.14.1:= >=dev-ml/ppx_variants_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=5e5633962389e47cbddb112e5bf2c5bd
+_md5_=e9cfb9bde23db1cdaae2eafe50a61164
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
index 5a4fbd3b8817..af4e06393d2b 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Code style checker for Jane Street Packages
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_js_style
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= dev-ml/octavius:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.14.0.tar.gz -> ppx_js_style-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=0d5b6954e5a4e357f0075dd7182e9b71
+_md5_=a88963ce14258637cab5837b749eaa7e
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.14.0 b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
index 85eb18fbd4d3..43c72eefd6f1 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Monadic let-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_let
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.14.0.tar.gz -> ppx_let-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=b5162cdf4264fe506902638303408487
+_md5_=0419f2e14e70e0516b58be2a7804412b
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
index bcb2f42112f9..12faf2dba1ce 100644
--- a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Ppx rewriter that records top-level module startup times
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_module_timer
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.14.0.tar.gz -> ppx_module_timer-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d0b9b2e2926e4c838a72f7146163c256
+_md5_=4eaa724d75147b4c0506681cebe08ce5
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
index 5e9ddeeefaf6..3d4b321e5688 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Optional compilation for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.0.tar.gz -> ppx_optcomp-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=184682cc7a0fe108115649e83d9fa234
+_md5_=e52b529b2569ef93e105e4519651b994
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
index f32d2310d632..fc118d372a68 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Pattern matching on flat options
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_optional
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.14.0.tar.gz -> ppx_optional-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=bc8566261f0f6460d7ba62b2019d58dc
+_md5_=38c47246367d87262117d9408fe5b245
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
index c004f12ef66f..abe062673d6a 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=A ppx rewriter that inlines reverse application operators |> and |!
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_pipebang
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.14.0.tar.gz -> ppx_pipebang-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=033df8fbbae7f98d93e2eb19d6debde9
+_md5_=d9c22e66d9e7b8bdcc167b487349b2e6
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
index a7587a56ae13..cc7b75b51c84 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz -> ppx_sexp_conv-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d82a66484d83cd7ffc35f70c05b921c8
+_md5_=87764ab47113c3c3f300648c75b9ec09
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
index 976fce609030..219c5e6329c2 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=A ppx rewriter for easy construction of s-expressions
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.0.tar.gz -> ppx_sexp_message-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=e1cbb8be0250c5fd662b8963d7361718
+_md5_=4e3e87b594dee9b58aaae60d5d741d2c
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
index d102cd592939..f04fc8470fd8 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Standard library for ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.14.0.tar.gz -> ppx_sexp_value-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=5c9ccd17ced1ce6742623d73e71ebb7c
+_md5_=c00879a84cd06ba00c44271c93dae1e0
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1 b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
index d9cf703b2b29..e434cb11ffbb 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Stable types conversions generator
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_stable
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz -> ppx_stable-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=8b0c631c595a7a1f4afc16a24c72dcc4
+_md5_=275c44d0c8bc1589520ab3b82cf9c632
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.14.1 b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
index ca59a12c51ea..ade5d96ae44f 100644
--- a/metadata/md5-cache/dev-ml/ppx_string-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Ppx extension for string interpolation
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_string
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz -> ppx_string-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=a8e7bff0f6a1e2fd9d7f0724b053e206
+_md5_=5e5f1cfaaa67f35cdeacc05bb01b3ee7
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
deleted file mode 100644
index bcb98046ac71..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/5.0.1
-SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0.1.tar.gz -> ppx_tools_versioned-5.0.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=7218f7b16c3a7e057efef3f7066a165b
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.2.2 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.2.2
deleted file mode 100644
index f35c40490342..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= <dev-ml/ocaml-migrate-parsetree-2.0.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:= <dev-ml/ocaml-migrate-parsetree-2.0.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/5.2.2
-SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.2.2.tar.gz -> ppx_tools_versioned-5.2.2.tar.gz
-_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=54378cad38618f67866e4a1b1bdc45dc
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
index f9741aeb1d3f..b651f59e7f5c 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
@@ -11,4 +11,4 @@ RDEPEND=<dev-ml/ocaml-migrate-parsetree-2.0.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/5.4.0
 SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.4.0.tar.gz -> ppx_tools_versioned-5.4.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=75eb0ed593abf6f283eb3b66143ba579
+_md5_=9ffa83466e4c30131e889a92961c7041
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
index 277261816ae0..f09a30e738d8 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4c44a4764be4cb0308852b8d9127a1db
+_md5_=f92b4a597061fabc24b7769f5171c4f9
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
index 644acfcd7c99..4a7cbec845c7 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of accessor and iteration functions for ocaml variant typ
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=16f6376aa8fc796be6098dcf288fdfea
+_md5_=431c04d1d586abf2b136e41694b87bc0
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.20.0 b/metadata/md5-cache/dev-ml/ppxlib-0.20.0
index ea48124bceed..91bcbef90ca4 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.20.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base library and tools for ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.20.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.20.0.tar.gz -> ppxlib-0.20.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=478cd0c1578e1555f7c9e8103e175983
+_md5_=a06b624961f69fb528aac4ec80362ec5
diff --git a/metadata/md5-cache/dev-ml/re-1.7.1 b/metadata/md5-cache/dev-ml/re-1.7.1
deleted file mode 100644
index 70c98cf4336a..000000000000
--- a/metadata/md5-cache/dev-ml/re-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!dev-ml/ocaml-re test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Regular expression library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/ocaml-re
-IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=!dev-ml/ocaml-re >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.7.1
-SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> re-1.7.1.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	38fa5d4c4928a854488fd58f7f7f7e8d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5cb9d1fd744770d0c5573b9d2377e8d5
diff --git a/metadata/md5-cache/dev-ml/re-1.9.0 b/metadata/md5-cache/dev-ml/re-1.9.0
index 33e8cd79d7b0..9dbcdf7f9ae2 100644
--- a/metadata/md5-cache/dev-ml/re-1.9.0
+++ b/metadata/md5-cache/dev-ml/re-1.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Regular expression library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/ocaml-re
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=!dev-ml/ocaml-re dev-ml/seq:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.9.0.tar.gz -> ocaml-re-1.9.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=fed04bb7b0c52f8c121b58d60a6459ae
+_md5_=3e9bd73e8212ee5454440ed50c8b4821
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.0 b/metadata/md5-cache/dev-ml/re2-0.9.0
deleted file mode 100644
index bf3cf308b09e..000000000000
--- a/metadata/md5-cache/dev-ml/re2-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=OCaml bindings for RE2
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/re2
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/re2/archive/v0.9.0.tar.gz -> re2-0.9.0.tar.gz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1 b/metadata/md5-cache/dev-ml/react-1.2.1
deleted file mode 100644
index 6b867d4d37e0..000000000000
--- a/metadata/md5-cache/dev-ml/react-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=OCaml module for functional reactive programming
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/react https://github.com/dbuenzli/react
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/1.2.1
-SRC_URI=https://erratique.ch/software/react/releases/react-1.2.1.tbz
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=5a249c84cb721faa3d4060208762d13e
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1-r1 b/metadata/md5-cache/dev-ml/react-1.2.1-r1
index a7f56eae3527..78796b0ce39b 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1-r1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml module for functional reactive programming
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/react https://github.com/dbuenzli/react
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1
 SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
 _eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=3007a5fac3a875f151c803759ab02f9b
+_md5_=dbe1029e2b35b44298ec37b5261f8f29
diff --git a/metadata/md5-cache/dev-ml/result-1.2 b/metadata/md5-cache/dev-ml/result-1.2
deleted file mode 100644
index cb3d11a7c49a..000000000000
--- a/metadata/md5-cache/dev-ml/result-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Compat result type
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/result
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/1.2
-SRC_URI=https://github.com/janestreet/result/archive/1.2.tar.gz -> result-1.2.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=54cf951097586345c5588ef190632c0c
diff --git a/metadata/md5-cache/dev-ml/result-1.5 b/metadata/md5-cache/dev-ml/result-1.5
index fea0c9c593a2..91f82f0b5aa6 100644
--- a/metadata/md5-cache/dev-ml/result-1.5
+++ b/metadata/md5-cache/dev-ml/result-1.5
@@ -5,10 +5,10 @@ DESCRIPTION=Compat result type
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/result
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.5
 SRC_URI=https://github.com/janestreet/result/archive/1.5.tar.gz -> result-1.5.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=12ce4a6be3132cebc2b61309ab9718fc
+_md5_=1ca06e8fecb78cf4dc99b4440b38cf7e
diff --git a/metadata/md5-cache/dev-ml/seq-0.1 b/metadata/md5-cache/dev-ml/seq-0.1
deleted file mode 100644
index 8d9113fdae94..000000000000
--- a/metadata/md5-cache/dev-ml/seq-0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-lang/ocaml[ocamlopt]
-DESCRIPTION=Compatibility package for the standard OCaml iterator type
-EAPI=7
-HOMEPAGE=https://github.com/c-cube/seq
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-lang/ocaml[ocamlopt]
-SLOT=0
-SRC_URI=https://github.com/c-cube/seq/archive/0.1.tar.gz -> seq-0.1.tar.gz
-_md5_=100eb3bdeb0da9dba8aafc48cc6d1c51
diff --git a/metadata/md5-cache/dev-ml/seq-0.2 b/metadata/md5-cache/dev-ml/seq-0.2
index 12b4e4bd3acb..06e32c43974a 100644
--- a/metadata/md5-cache/dev-ml/seq-0.2
+++ b/metadata/md5-cache/dev-ml/seq-0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Compatibility package for the standard OCaml iterator type
 EAPI=7
 HOMEPAGE=https://github.com/c-cube/seq
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.2.tar.gz -> seq-0.2.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=8038a92085ff9e4b9cf7afb2dbe19d46
+_md5_=ac63e83e51514cb2b0c9ff37a61ba861
diff --git a/metadata/md5-cache/dev-ml/seq-1 b/metadata/md5-cache/dev-ml/seq-1
deleted file mode 100644
index e8186dfdb2dc..000000000000
--- a/metadata/md5-cache/dev-ml/seq-1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-ml/opam-installer dev-lang/ocaml
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/ocaml-4:=
-DESCRIPTION=Compatibility package for OCaml's standard iterator type starting from 4.07.
-EAPI=7
-HOMEPAGE=https://github.com/ocaml/opam-repository/blob/master/packages/seq/seq.base/opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=public-domain
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1
-_eclasses_=opam	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=5db1f7de277fea194de09ee2946f3178
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
index c912ae32432d..fa70d22c3a1a 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expre
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/sexplib
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.14.0.tar.gz -> sexplib-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=ee678e063d13a6131bf1d311f302c0ee
+_md5_=f39d6232fb3dba5ce9fd8d3261bdc6a9
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.14.0 b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
index fe0fcce63f8a..396aeffcf3a2 100644
--- a/metadata/md5-cache/dev-ml/sexplib0-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expre
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/sexplib0
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.14.0.tar.gz -> sexplib0-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=b9bef3e7a1265e04aed2e1fe8eeca611
+_md5_=3d2d8426bb3ab49bfe94ea200aacd4d3
diff --git a/metadata/md5-cache/dev-ml/spawn-0.13.0 b/metadata/md5-cache/dev-ml/spawn-0.13.0
index ed52e4453dc5..15c2eb2dfc7d 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.13.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.13.0
@@ -4,12 +4,12 @@ DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Spawning sub-processes
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/spawn
-IUSE=ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+IUSE=+ocamlopt test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.13.0.tar.gz -> spawn-0.13.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=3459558e0f5763f6306ee82f220f7a82
+_md5_=3c27b9b3c7836560a6ff542c0daaa41c
diff --git a/metadata/md5-cache/dev-ml/splittable_random-0.14.0 b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
index bda30c6de8a4..9db5d2d4d68c 100644
--- a/metadata/md5-cache/dev-ml/splittable_random-0.14.0
+++ b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=PRNG that can be split into independent streams
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/splittable_random
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_message:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/splittable_random/archive/v0.14.0.tar.gz -> splittable_random-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=ea199a9f3d30e47ee83121e306c5c9d7
+_md5_=b2a3629266290777bc8f7c5bd39cd6f5
diff --git a/metadata/md5-cache/dev-ml/stdio-0.14.0 b/metadata/md5-cache/dev-ml/stdio-0.14.0
index 209a6e0ab0e6..c4ecf4d4b8dd 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.14.0
+++ b/metadata/md5-cache/dev-ml/stdio-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Standard IO Library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/stdio
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.14.0.tar.gz -> stdio-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=c64975c6fae71aefc67181ca4a323825
+_md5_=fc87acd942b4d1b7023c6fd4f3c2e8b1
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
index e4570270727f..2227489d7344 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Pure OCaml library that allows replacing Pervasives with Stdlib befo
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/stdlib-shims
 IUSE=ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.2.0/stdlib-shims-0.2.0.tbz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=ea48d76da887e15f4d9032b5b2b2bd82
+_md5_=f47f8e58c5246327b29ef593436891f5
diff --git a/metadata/md5-cache/dev-ml/textutils-0.14.0 b/metadata/md5-cache/dev-ml/textutils-0.14.0
index 3070799d3390..ff304a8e8b6c 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.14.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.14.0
@@ -4,11 +4,11 @@ DEPEND=dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/uutf:= >=dev-
 DESCRIPTION=Text output utilities
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/textutils
-IUSE=ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.14.0.tar.gz -> textutils-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d80705bd6949cd98ddf50aaadfb408b4
+_md5_=d18121a704e280b59b196893341209d2
diff --git a/metadata/md5-cache/dev-ml/time_now-0.14.0 b/metadata/md5-cache/dev-ml/time_now-0.14.0
index 4ae588f79122..94cefa2c6b41 100644
--- a/metadata/md5-cache/dev-ml/time_now-0.14.0
+++ b/metadata/md5-cache/dev-ml/time_now-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Reports the current time
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/time_now
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_base:= dev-ml/ppx_optcomp:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/time_now/archive/v0.14.0.tar.gz -> time_now-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=b115403e62cc898cfa40a190b9c7b3af
+_md5_=6780d7d8a0d3e403af5af3c845f0872e
diff --git a/metadata/md5-cache/dev-ml/timezone-0.14.0 b/metadata/md5-cache/dev-ml/timezone-0.14.0
index 41c14a44240f..1e9a2c663324 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.14.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.14.0
@@ -4,11 +4,11 @@ DEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Time-zone handling for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/timezone
-IUSE=ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/timezone/archive/v0.14.0.tar.gz -> timezone-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=26f5d540284120a949e3cc330609dd9a
+_md5_=57fdee2208259bf8f4c66f316bc12aa1
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.0 b/metadata/md5-cache/dev-ml/topkg-0.9.0
deleted file mode 100644
index 2baa487c6d90..000000000000
--- a/metadata/md5-cache/dev-ml/topkg-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=The transitory OCaml software packager
-EAPI=6
-HOMEPAGE=https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.0.tar.gz -> topkg-0.9.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=567e25133eaa6640eb94e02a8f350dd0
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.1 b/metadata/md5-cache/dev-ml/topkg-0.9.1
deleted file mode 100644
index d138845708d9..000000000000
--- a/metadata/md5-cache/dev-ml/topkg-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=The transitory OCaml software packager
-EAPI=6
-HOMEPAGE=https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.1.tar.gz -> topkg-0.9.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=567e25133eaa6640eb94e02a8f350dd0
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.3 b/metadata/md5-cache/dev-ml/topkg-1.0.3
index 7b8ab42b0608..b7443e992b3b 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.3
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -3,10 +3,10 @@ DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=d
 DESCRIPTION=The transitory OCaml software packager
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/1.0.3
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.3.tar.gz -> topkg-1.0.3.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=9529cde54a2ed432d1ef187389f5a2fc
+_md5_=f264091b8557cfb0f823b38435c08b30
diff --git a/metadata/md5-cache/dev-ml/typerep-0.14.0 b/metadata/md5-cache/dev-ml/typerep-0.14.0
index 5af2cc7efa74..1d5b960392d7 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.14.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for creating runtime representation of OCaml types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/typerep
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.14.0.tar.gz -> typerep-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=e3019cd241f62a068eb3e32267c00c42
+_md5_=374bd75dfe307083945d4fa24aff443c
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 95285ee5ae9a..0a3ecda41080 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=
 RESTRICT=test
 SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=7e81bdd830750043efe950aef3bd5a74
+_md5_=6b1a445737154f460460acfec1dad23d
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index d0bae782a179..d2a10df5945f 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/uutf
 IUSE=doc utftrip +ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
 REQUIRED_USE=utftrip? ( ocamlopt )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=cbd7a7d949e4aa2c76bc3c11e6a27397
+_md5_=db92ee2473e729a944507f6306f3a339
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.14.0 b/metadata/md5-cache/dev-ml/variantslib-0.14.0
index 4fa7a9799eaa..93424a35dfb6 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=OCaml variants as first class values
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/variantslib
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.14.0.tar.gz -> variantslib-0.14.0.tar.gz
 _eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=a69c528c22c72bb1b193fb158abda763
+_md5_=8cc69d261be9892a13c4c4c9f3066ac3
diff --git a/metadata/md5-cache/dev-ml/xml-light-2.2-r3 b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
index 7f54691b7928..40cb2f12f0af 100644
--- a/metadata/md5-cache/dev-ml/xml-light-2.2-r3
+++ b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal Xml parser and printer for OCaml
 EAPI=5
 HOMEPAGE=http://tech.motion-twin.com/xmllight.html
 IUSE=doc +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=http://tech.motion-twin.com/zip/xml-light-2.2.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0bac3534b73a29352e31fad1a062a15c
+_md5_=c7dc79ddc30f3b527e090a1f7bf7b064
diff --git a/metadata/md5-cache/dev-ml/zarith-1.10 b/metadata/md5-cache/dev-ml/zarith-1.10
deleted file mode 100644
index dda73f788694..000000000000
--- a/metadata/md5-cache/dev-ml/zarith-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=7
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
-SLOT=0/1.10
-SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz -> zarith-1.10.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1a17282d2e2c40218bae253d9e765d45
diff --git a/metadata/md5-cache/dev-ml/zarith-1.7 b/metadata/md5-cache/dev-ml/zarith-1.7
deleted file mode 100644
index c4ae4dd4adad..000000000000
--- a/metadata/md5-cache/dev-ml/zarith-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
-SLOT=0/1.7
-SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz -> zarith-1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=87b9557436dcb93565c863d9f65b066c
diff --git a/metadata/md5-cache/dev-ml/zarith-1.9.1 b/metadata/md5-cache/dev-ml/zarith-1.9.1
deleted file mode 100644
index 9296b2c286cd..000000000000
--- a/metadata/md5-cache/dev-ml/zarith-1.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
-EAPI=7
-HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
-SLOT=0/1.9.1
-SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz -> zarith-1.9.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fdec2d0f9007e17a04eb75f085b7259e
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 4c932fda0610..202512ea0c8e 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/Nmap-Parser-1.360.0 b/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
deleted file mode 100644
index 396912692c85..000000000000
--- a/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Storable-2.0.0 >=dev-perl/XML-Twig-3.160.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Parse nmap scan data with perl
-EAPI=6
-HOMEPAGE=https://nmapparser.wordpress.com/ https://metacpan.org/release/Nmap-Parser
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/perl-Storable-2.0.0 >=dev-perl/XML-Twig-3.160.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AP/APERSAUD/Nmap-Parser-1.36.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b407545cc30feccd23c429f8cda42881
diff --git a/metadata/md5-cache/dev-perl/Test-Output-1.31.0 b/metadata/md5-cache/dev-perl/Test-Output-1.31.0
index 553476ace691..38491c871c47 100644
--- a/metadata/md5-cache/dev-perl/Test-Output-1.31.0
+++ b/metadata/md5-cache/dev-perl/Test-Output-1.31.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities to test STDOUT and STDERR messages
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-Output
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.170.0 >=virtual/perl-File-Temp-0.170.0 virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ba468fe2eaeb1fbed2a14a4975d51d12
+_md5_=025f86860ed1045ddf00c8610059857c
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index d20985c5b211..61ca1b66cc4e 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/composer-2.0.9 b/metadata/md5-cache/dev-php/composer-2.0.9
deleted file mode 100644
index 2d9c6c726c55..000000000000
--- a/metadata/md5-cache/dev-php/composer-2.0.9
+++ /dev/null
@@ -1,10 +0,0 @@
-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.10 >=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-1.1
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/2.0.9.tar.gz -> composer-2.0.9.tar.gz
-_md5_=a9f7d142a7110aeda4158bf11197803e
diff --git a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1 b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
deleted file mode 100644
index 8bb20d11dd68..000000000000
--- a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
-EAPI=6
-HOMEPAGE=https://github.com/php-fedora/autoloader
-IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/php-fedora/autoloader/archive/0.2.1.tar.gz -> fedora-autoloader-0.2.1.tar.gz
-_md5_=b74d6ba084139f380d89a9d9d01a284d
diff --git a/metadata/md5-cache/dev-php/fedora-autoloader-1.0.0 b/metadata/md5-cache/dev-php/fedora-autoloader-1.0.0
deleted file mode 100644
index fc3d060848c7..000000000000
--- a/metadata/md5-cache/dev-php/fedora-autoloader-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
-EAPI=6
-HOMEPAGE=https://github.com/php-fedora/autoloader
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/php-fedora/autoloader/archive/1.0.0.tar.gz -> fedora-autoloader-1.0.0.tar.gz
-_md5_=39a660a947990fbca679d9e0b4bac0b0
diff --git a/metadata/md5-cache/dev-php/json-schema-5.2.8 b/metadata/md5-cache/dev-php/json-schema-5.2.8
deleted file mode 100644
index d5c8634bf3af..000000000000
--- a/metadata/md5-cache/dev-php/json-schema-5.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-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.8.tar.gz -> json-schema-5.2.8.tar.gz
-_md5_=509aaf819271276b59d212444dca1704
diff --git a/metadata/md5-cache/dev-php/json-schema-5.2.9 b/metadata/md5-cache/dev-php/json-schema-5.2.9
deleted file mode 100644
index 9f0484654a16..000000000000
--- a/metadata/md5-cache/dev-php/json-schema-5.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-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.9.tar.gz -> json-schema-5.2.9.tar.gz
-_md5_=509aaf819271276b59d212444dca1704
diff --git a/metadata/md5-cache/dev-php/phar-utils-1.0.0 b/metadata/md5-cache/dev-php/phar-utils-1.0.0
deleted file mode 100644
index 9c23fe25e2ee..000000000000
--- a/metadata/md5-cache/dev-php/phar-utils-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHAR file format utilities, for when PHP phars you up
-EAPI=6
-HOMEPAGE=https://github.com/Seldaek/phar-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[phar] dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/Seldaek/phar-utils/archive/1.0.0.tar.gz -> phar-utils-1.0.0.tar.gz
-_md5_=5a4df9476fdeb500f71ead810d60d97b
diff --git a/metadata/md5-cache/dev-php/phar-utils-1.0.1 b/metadata/md5-cache/dev-php/phar-utils-1.0.1
deleted file mode 100644
index ce9c882124dc..000000000000
--- a/metadata/md5-cache/dev-php/phar-utils-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHAR file format utilities, for when PHP phars you up
-EAPI=7
-HOMEPAGE=https://github.com/Seldaek/phar-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[phar] dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/Seldaek/phar-utils/archive/1.0.1.tar.gz -> phar-utils-1.0.1.tar.gz
-_md5_=ad6c7e3033ee2f8736ccf06f1e0b089d
diff --git a/metadata/md5-cache/dev-php/phar-utils-1.1.0 b/metadata/md5-cache/dev-php/phar-utils-1.1.0
deleted file mode 100644
index aea5bb6a452a..000000000000
--- a/metadata/md5-cache/dev-php/phar-utils-1.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHAR file format utilities, for when PHP phars you up
-EAPI=7
-HOMEPAGE=https://github.com/Seldaek/phar-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[phar] dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/Seldaek/phar-utils/archive/1.1.0.tar.gz -> phar-utils-1.1.0.tar.gz
-_md5_=4771e5af0a4c954f305ce18f4c66d4af
diff --git a/metadata/md5-cache/dev-php/psr-log-1.0.2 b/metadata/md5-cache/dev-php/psr-log-1.0.2
deleted file mode 100644
index 2dea9b452866..000000000000
--- a/metadata/md5-cache/dev-php/psr-log-1.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common interface for logging libraries
-EAPI=6
-HOMEPAGE=https://github.com/php-fig/log
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/php-fig/log/archive/1.0.2.tar.gz -> psr-log-1.0.2.tar.gz
-_md5_=770b8a9cfe159e6082ec6c96082764d2
diff --git a/metadata/md5-cache/dev-php/psr-log-1.1.0 b/metadata/md5-cache/dev-php/psr-log-1.1.0
deleted file mode 100644
index 7caa98c08dcd..000000000000
--- a/metadata/md5-cache/dev-php/psr-log-1.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common interface for logging libraries
-EAPI=7
-HOMEPAGE=https://github.com/php-fig/log
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/php-fig/log/archive/1.1.0.tar.gz -> psr-log-1.1.0.tar.gz
-_md5_=e282b831cd01d5e6a5d5ad283a3b7681
diff --git a/metadata/md5-cache/dev-php/psr-log-1.1.2 b/metadata/md5-cache/dev-php/psr-log-1.1.2
deleted file mode 100644
index bd07a1e40756..000000000000
--- a/metadata/md5-cache/dev-php/psr-log-1.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common interface for logging libraries
-EAPI=7
-HOMEPAGE=https://github.com/php-fig/log
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/php-fig/log/archive/1.1.2.tar.gz -> psr-log-1.1.2.tar.gz
-_md5_=f403a87f2257d3066a08f5d9c81e02cf
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.2.0 b/metadata/md5-cache/dev-php/spdx-licenses-1.2.0
deleted file mode 100644
index aaf725e15c7d..000000000000
--- a/metadata/md5-cache/dev-php/spdx-licenses-1.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=6
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.2.0.tar.gz -> spdx-licenses-1.2.0.tar.gz
-_md5_=0a5ffcecb6fcdad3cbdf7d71f1501751
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.4.0-r1 b/metadata/md5-cache/dev-php/spdx-licenses-1.4.0-r1
deleted file mode 100644
index abc80f600484..000000000000
--- a/metadata/md5-cache/dev-php/spdx-licenses-1.4.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=7
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.4.0.tar.gz -> spdx-licenses-1.4.0.tar.gz
-_md5_=45bd0e2ca6195cdc5fc23193a2f4a34c
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.5.0 b/metadata/md5-cache/dev-php/spdx-licenses-1.5.0
deleted file mode 100644
index 042c65bbef5e..000000000000
--- a/metadata/md5-cache/dev-php/spdx-licenses-1.5.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=7
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.5.0.tar.gz -> spdx-licenses-1.5.0.tar.gz
-_md5_=f5a61b619a873f637244e628bec869bf
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.5.3 b/metadata/md5-cache/dev-php/spdx-licenses-1.5.3
deleted file mode 100644
index b5ddb42d22cd..000000000000
--- a/metadata/md5-cache/dev-php/spdx-licenses-1.5.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=7
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.5.3.tar.gz -> spdx-licenses-1.5.3.tar.gz
-_md5_=9e32c8ae0fc574e090173c8e087794c9
diff --git a/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1 b/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1
deleted file mode 100644
index 17e8a81b7ac8..000000000000
--- a/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Subtree split of the Symfony Console Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/symfony/console/archive/v2.7.9.tar.gz -> symfony-console-2.7.9.tar.gz
-_md5_=1089176547e8f3f14380b0fde46f9cf5
diff --git a/metadata/md5-cache/dev-php/symfony-console-2.8.43 b/metadata/md5-cache/dev-php/symfony-console-2.8.43
deleted file mode 100644
index 682e20abe6b7..000000000000
--- a/metadata/md5-cache/dev-php/symfony-console-2.8.43
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Subtree split of the Symfony Console Component
-EAPI=7
-HOMEPAGE=https://github.com/symfony/console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/symfony/console/archive/v2.8.43.tar.gz -> symfony-console-2.8.43.tar.gz
-_md5_=8eae348456fcdec81520d7108998ff9c
diff --git a/metadata/md5-cache/dev-php/symfony-console-2.8.48 b/metadata/md5-cache/dev-php/symfony-console-2.8.48
deleted file mode 100644
index 966da08bb89d..000000000000
--- a/metadata/md5-cache/dev-php/symfony-console-2.8.48
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Subtree split of the Symfony Console Component
-EAPI=7
-HOMEPAGE=https://github.com/symfony/console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/symfony/console/archive/v2.8.48.tar.gz -> symfony-console-2.8.48.tar.gz
-_md5_=1cbecd906fd1ac811522c02102086255
diff --git a/metadata/md5-cache/dev-php/symfony-console-2.8.50 b/metadata/md5-cache/dev-php/symfony-console-2.8.50
deleted file mode 100644
index 24ff1a6c7dee..000000000000
--- a/metadata/md5-cache/dev-php/symfony-console-2.8.50
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Subtree split of the Symfony Console Component
-EAPI=7
-HOMEPAGE=https://github.com/symfony/console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/symfony/console/archive/v2.8.50.tar.gz -> symfony-console-2.8.50.tar.gz
-_md5_=24297570e4eca96e943db3f772eec250
diff --git a/metadata/md5-cache/dev-php/symfony-finder-3.2.8 b/metadata/md5-cache/dev-php/symfony-finder-3.2.8
deleted file mode 100644
index 3b610791e300..000000000000
--- a/metadata/md5-cache/dev-php/symfony-finder-3.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony Finder Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/finder
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/symfony/finder/archive/v3.2.8.tar.gz -> symfony-finder-3.2.8.tar.gz
-_md5_=1a029126a37e377b7ca316ee04a7bcc8
diff --git a/metadata/md5-cache/dev-php/symfony-finder-3.4.28 b/metadata/md5-cache/dev-php/symfony-finder-3.4.28
deleted file mode 100644
index 5a8e482c4cc5..000000000000
--- a/metadata/md5-cache/dev-php/symfony-finder-3.4.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony Finder Component
-EAPI=7
-HOMEPAGE=https://github.com/symfony/finder
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/symfony/finder/archive/v3.4.28.tar.gz -> symfony-finder-3.4.28.tar.gz
-_md5_=9ff1549054dd5ea66c74b929904b0caa
diff --git a/metadata/md5-cache/dev-php/xdebug-handler-1.3.0 b/metadata/md5-cache/dev-php/xdebug-handler-1.3.0
deleted file mode 100644
index 328c984215fc..000000000000
--- a/metadata/md5-cache/dev-php/xdebug-handler-1.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Restart a CLI process without loading the xdebug extension
-EAPI=7
-HOMEPAGE=https://github.com/composer/xdebug-handler
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2
-SLOT=0
-SRC_URI=https://github.com/composer/xdebug-handler/archive/1.3.0.tar.gz -> xdebug-handler-1.3.0.tar.gz
-_md5_=71b0485e1e3e0c693c7f70d82098108e
diff --git a/metadata/md5-cache/dev-php/xdebug-handler-1.3.1 b/metadata/md5-cache/dev-php/xdebug-handler-1.3.1
deleted file mode 100644
index 8208dc350250..000000000000
--- a/metadata/md5-cache/dev-php/xdebug-handler-1.3.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Restart a CLI process without loading the xdebug extension
-EAPI=7
-HOMEPAGE=https://github.com/composer/xdebug-handler
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2
-SLOT=0
-SRC_URI=https://github.com/composer/xdebug-handler/archive/1.3.1.tar.gz -> xdebug-handler-1.3.1.tar.gz
-_md5_=71b0485e1e3e0c693c7f70d82098108e
diff --git a/metadata/md5-cache/dev-php/xdebug-handler-1.4.1 b/metadata/md5-cache/dev-php/xdebug-handler-1.4.1
deleted file mode 100644
index c24f810cc0c6..000000000000
--- a/metadata/md5-cache/dev-php/xdebug-handler-1.4.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Restart a CLI process without loading the xdebug extension
-EAPI=7
-HOMEPAGE=https://github.com/composer/xdebug-handler
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2
-SLOT=0
-SRC_URI=https://github.com/composer/xdebug-handler/archive/1.4.1.tar.gz -> xdebug-handler-1.4.1.tar.gz
-_md5_=71b0485e1e3e0c693c7f70d82098108e
diff --git a/metadata/md5-cache/dev-python/Faker-6.6.1 b/metadata/md5-cache/dev-python/Faker-6.6.1
new file mode 100644
index 000000000000..a2e18d2646d5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-6.6.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/random2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/validators[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=7
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-6.6.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8a924b44f974c84613e3216a45187207
diff --git a/metadata/md5-cache/dev-python/Faker-6.6.2 b/metadata/md5-cache/dev-python/Faker-6.6.2
new file mode 100644
index 000000000000..d074af6df645
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-6.6.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/random2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/validators[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=7
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-6.6.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8a924b44f974c84613e3216a45187207
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.12 b/metadata/md5-cache/dev-python/GitPython-3.1.12
deleted file mode 100644
index 75ade79063ce..000000000000
--- a/metadata/md5-cache/dev-python/GitPython-3.1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library used to interact with Git repositories
-EAPI=7
-HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.12.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.12.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.5.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-3.0.4.gitbundle )
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c4db092c5fc7bdc3995d49d5b3e147c1
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.13 b/metadata/md5-cache/dev-python/GitPython-3.1.13
index 2609a93985f9..7b56b1e14664 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.13
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.13
@@ -4,7 +4,7 @@ DESCRIPTION=Library used to interact with Git repositories
 EAPI=7
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.13.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.13.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.5-r1.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-3.0.4.gitbundle )
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=06e531a433ae6a66bb8de0885cabc914
+_md5_=1fcc051c70ae612771d67d1eed80ee57
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0b621cca3804..4fb4000418b0 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/aiofiles-0.6.0 b/metadata/md5-cache/dev-python/aiofiles-0.6.0
new file mode 100644
index 000000000000..71496bf5886a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiofiles-0.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File support for asyncio
+EAPI=7
+HOMEPAGE=https://github.com/Tinche/aiofiles
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.6.0.tar.gz -> aiofiles-0.6.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=142a139004eb582722c40f30f3fa0e4d
diff --git a/metadata/md5-cache/dev-python/astroid-2.5 b/metadata/md5-cache/dev-python/astroid-2.5
index 0f243cbd22aa..686124aa7a57 100644
--- a/metadata/md5-cache/dev-python/astroid-2.5
+++ b/metadata/md5-cache/dev-python/astroid-2.5
@@ -5,7 +5,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
 IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-2.5.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=656e97adeb3cde9909e4e8efa3d7a264
+_md5_=e01cfe12e44c75dbb3d1cc0cd4f39d2c
diff --git a/metadata/md5-cache/dev-python/autobahn-21.1.1 b/metadata/md5-cache/dev-python/autobahn-21.1.1
index 10140997adb9..78721207c181 100644
--- a/metadata/md5-cache/dev-python/autobahn-21.1.1
+++ b/metadata/md5-cache/dev-python/autobahn-21.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/autobahn/ https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python
 IUSE=crypt scram test xbr python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cbor-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cbor2-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.9.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flatbuffers-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.11.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lz4-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/msgpack-0.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snappy-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/twisted-20.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/txaio-20.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ujson-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wsaccel-0.6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zope-interface-3.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pynacl-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytrie-0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/service_identity-18.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) scram? ( dev-python/cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-21.1.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b22f03fcecb2d9515c844c03e3701217
+_md5_=5d8305e556ea6fef02595bc5f9951bc2
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.6 b/metadata/md5-cache/dev-python/autopep8-1.5.6
new file mode 100644
index 000000000000..83082c5de439
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.5.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=7
+HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.6.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b0a3a9b107b3ceca42bc13617e998f76
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0
new file mode 100644
index 000000000000..7c93eb93b7a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/boto3-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=7
+HOMEPAGE=https://github.com/aws/serverless-application-model https://pypi.org/project/aws-sam-translator/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.35.0.tar.gz -> aws-sam-translator-1.35.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=94d8022da5f4539588d84d446392d91e
diff --git a/metadata/md5-cache/dev-python/backrefs-4.5.0 b/metadata/md5-cache/dev-python/backrefs-4.5.0
deleted file mode 100644
index 69ae8773c144..000000000000
--- a/metadata/md5-cache/dev-python/backrefs-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper around re or regex that adds additional back references
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/backrefs https://pypi.org/project/backrefs
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/backrefs/archive/4.5.0.tar.gz -> backrefs-4.5.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=74856a5331c526c228f0a74b12900f6c
diff --git a/metadata/md5-cache/dev-python/backrefs-4.6 b/metadata/md5-cache/dev-python/backrefs-4.6
deleted file mode 100644
index 45e222fc0495..000000000000
--- a/metadata/md5-cache/dev-python/backrefs-4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper around re or regex that adds additional back references
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/backrefs/ https://pypi.org/project/backrefs/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/backrefs/archive/4.6.tar.gz -> backrefs-4.6.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0d8361a6337dcbe11227b6abdb0a2ed2
diff --git a/metadata/md5-cache/dev-python/backrefs-5.0 b/metadata/md5-cache/dev-python/backrefs-5.0
deleted file mode 100644
index 9fb70770d953..000000000000
--- a/metadata/md5-cache/dev-python/backrefs-5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper around re or regex that adds additional back references
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/backrefs/ https://pypi.org/project/backrefs/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/backrefs/archive/5.0.tar.gz -> backrefs-5.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0d8361a6337dcbe11227b6abdb0a2ed2
diff --git a/metadata/md5-cache/dev-python/bitarray-1.7.1 b/metadata/md5-cache/dev-python/bitarray-1.7.1
new file mode 100644
index 000000000000..23864701f2a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-1.7.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=efficient arrays of booleans -- C extension
+EAPI=7
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-1.7.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fc9d2a23ed8475729bbed279553d8fec
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.27 b/metadata/md5-cache/dev-python/boto3-1.17.27
new file mode 100644
index 000000000000..f4ca863360ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.27
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.27[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.27[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.27.tar.gz -> boto3-1.17.27.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.28 b/metadata/md5-cache/dev-python/boto3-1.17.28
new file mode 100644
index 000000000000..383ebc69b273
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.28[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.28[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.28.tar.gz -> boto3-1.17.28.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.29 b/metadata/md5-cache/dev-python/boto3-1.17.29
new file mode 100644
index 000000000000..ab3586fb0339
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.29
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.29[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.29[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.29.tar.gz -> boto3-1.17.29.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.30 b/metadata/md5-cache/dev-python/boto3-1.17.30
new file mode 100644
index 000000000000..956f29ba9e3c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.30
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.30[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.30[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.30.tar.gz -> boto3-1.17.30.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.31 b/metadata/md5-cache/dev-python/boto3-1.17.31
new file mode 100644
index 000000000000..9132c510cbab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.31
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.31[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.31[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.31.tar.gz -> boto3-1.17.31.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.32 b/metadata/md5-cache/dev-python/boto3-1.17.32
new file mode 100644
index 000000000000..dd9e38b83912
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.32
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.32[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.32[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.32.tar.gz -> boto3-1.17.32.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.33 b/metadata/md5-cache/dev-python/boto3-1.17.33
new file mode 100644
index 000000000000..68a00aae6ce2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.33
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.33[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.33[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.33.tar.gz -> boto3-1.17.33.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.27 b/metadata/md5-cache/dev-python/botocore-1.20.27
new file mode 100644
index 000000000000..5f9140ff197d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.27
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.27.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.28 b/metadata/md5-cache/dev-python/botocore-1.20.28
new file mode 100644
index 000000000000..4c10ada3e5a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.28.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.29 b/metadata/md5-cache/dev-python/botocore-1.20.29
new file mode 100644
index 000000000000..f90bced47fcc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.29
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.29.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.30 b/metadata/md5-cache/dev-python/botocore-1.20.30
new file mode 100644
index 000000000000..acebf45e880d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.30
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.30.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.31 b/metadata/md5-cache/dev-python/botocore-1.20.31
new file mode 100644
index 000000000000..41df328be7dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.31
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.31.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.32 b/metadata/md5-cache/dev-python/botocore-1.20.32
new file mode 100644
index 000000000000..6f73a54dac9b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.32
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.32.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.33 b/metadata/md5-cache/dev-python/botocore-1.20.33
new file mode 100644
index 000000000000..573457623b15
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.33
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.33.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/bracex-2.0.1 b/metadata/md5-cache/dev-python/bracex-2.0.1
deleted file mode 100644
index 10ff4933e52e..000000000000
--- a/metadata/md5-cache/dev-python/bracex-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bash style brace expansion for Python
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/bracex https://pypi.org/project/bracex
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/bracex/archive/2.0.1.tar.gz -> bracex-2.0.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c856e486aba392509d8ccd0c22a1bd79
diff --git a/metadata/md5-cache/dev-python/bracex-2.1.0 b/metadata/md5-cache/dev-python/bracex-2.1.0
deleted file mode 100644
index ea6c56b63ae2..000000000000
--- a/metadata/md5-cache/dev-python/bracex-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bash style brace expansion for Python
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/bracex https://pypi.org/project/bracex
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/bracex/archive/2.1.0.tar.gz -> bracex-2.1.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=666ecf1801e15cf13a2d08e66ee26ec0
diff --git a/metadata/md5-cache/dev-python/breathe-4.25.1-r1 b/metadata/md5-cache/dev-python/breathe-4.25.1-r1
deleted file mode 100644
index d6627af81527..000000000000
--- a/metadata/md5-cache/dev-python/breathe-4.25.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx Doxygen renderer
-EAPI=7
-HOMEPAGE=https://breathe.readthedocs.io/en/latest/
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/b/breathe/breathe-4.25.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ae8932710870a021a82d1ae3c51fdf9
diff --git a/metadata/md5-cache/dev-python/breathe-4.26.1 b/metadata/md5-cache/dev-python/breathe-4.26.1
deleted file mode 100644
index c7a9ade3ab81..000000000000
--- a/metadata/md5-cache/dev-python/breathe-4.26.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx Doxygen renderer
-EAPI=7
-HOMEPAGE=https://breathe.readthedocs.io/en/latest/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/michaeljones/breathe/archive/v4.26.1.tar.gz -> breathe-4.26.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fd2fdc06bbed5103ddbe0d5688398c1
diff --git a/metadata/md5-cache/dev-python/breathe-4.27.0 b/metadata/md5-cache/dev-python/breathe-4.27.0
index 6b7489506e70..67d93c936257 100644
--- a/metadata/md5-cache/dev-python/breathe-4.27.0
+++ b/metadata/md5-cache/dev-python/breathe-4.27.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx Doxygen renderer
 EAPI=7
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/michaeljones/breathe/archive/v4.27.0.tar.gz -> breathe-4.27.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fd2fdc06bbed5103ddbe0d5688398c1
+_md5_=3e91377cd03d6bd022a5b02151887955
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.1 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.1
index 911479fd152e..59edb031c46c 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.1
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v1.0.9.1.tar.gz -> brotlicffi-1.0.9.1.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e88a8cc86ec8daf4d48567840fab6b29
+_md5_=b2c4713dbb23a399a0ffdd7c73933e13
diff --git a/metadata/md5-cache/dev-python/cbor2-5.2.0 b/metadata/md5-cache/dev-python/cbor2-5.2.0
index 4e7f664de4f0..bff100fb33b0 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.2.0
+++ b/metadata/md5-cache/dev-python/cbor2-5.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
-IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ead7f357cd5daee77a8ed4d742605a70
+_md5_=8d288018de6752de77553b899575404d
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.5 b/metadata/md5-cache/dev-python/cffi-1.14.5
index 7ec82d8956f3..a8f7fdccdb8b 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.5
+++ b/metadata/md5-cache/dev-python/cffi-1.14.5
@@ -5,7 +5,7 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=7
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.14.5
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.5.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=acf43341463f0e2ef223654567f56c3f
+_md5_=be81c12056030bfd7845274dfc391bb0
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.44.5 b/metadata/md5-cache/dev-python/cfn-python-lint-0.44.5
deleted file mode 100644
index ac3e55592d0d..000000000000
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.44.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.44.5.tar.gz -> cfn-python-lint-0.44.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7eb4a42ef5d9daa7efbde04cbc8912db
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.44.7 b/metadata/md5-cache/dev-python/cfn-python-lint-0.44.7
index 86e67f0173bf..042d93002c0b 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.44.7
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.44.7
@@ -4,7 +4,7 @@ DESCRIPTION=CloudFormation Linter
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.44.7.tar.gz -> cfn-python-lint-0.44.7.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44fac6b2e5eff3c640180a129cf1d801
+_md5_=7eb4a42ef5d9daa7efbde04cbc8912db
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.47.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.47.0
deleted file mode 100644
index 667c708e97c1..000000000000
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.47.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.47.0.tar.gz -> cfn-python-lint-0.47.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd9dc56d610ac884ac91d1ea5fb6353f
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.47.1 b/metadata/md5-cache/dev-python/cfn-python-lint-0.47.1
deleted file mode 100644
index 2cea065efe48..000000000000
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.47.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.47.1.tar.gz -> cfn-python-lint-0.47.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd9dc56d610ac884ac91d1ea5fb6353f
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.47.2 b/metadata/md5-cache/dev-python/cfn-python-lint-0.47.2
new file mode 100644
index 000000000000..f6fee5195067
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.47.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.47.2.tar.gz -> cfn-python-lint-0.47.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bd9dc56d610ac884ac91d1ea5fb6353f
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 5b09336fdaee..f32f6a1802bf 100644
--- a/metadata/md5-cache/dev-python/clang-python-11.1.0
+++ b/metadata/md5-cache/dev-python/clang-python-11.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=>=sys-devel/clang-11.1.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c2ddba904e94c7a7b985d8f0bfd33267
+_md5_=5d092846dbbdd6f78f39652c7b8fe17d
diff --git a/metadata/md5-cache/dev-python/cliff-3.6.0 b/metadata/md5-cache/dev-python/cliff-3.6.0
deleted file mode 100644
index 6cd073005eb0..000000000000
--- a/metadata/md5-cache/dev-python/cliff-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0 dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testtools-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cmd2-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command Line Interface Formulation Framework
-EAPI=7
-HOMEPAGE=https://github.com/openstack/cliff
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cmd2-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cliff/cliff-3.6.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=be615e92018307d5f40f443879db2ffa
diff --git a/metadata/md5-cache/dev-python/cliff-3.7.0 b/metadata/md5-cache/dev-python/cliff-3.7.0
index cacd3de1bead..06fd70eb5abb 100644
--- a/metadata/md5-cache/dev-python/cliff-3.7.0
+++ b/metadata/md5-cache/dev-python/cliff-3.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=7
 HOMEPAGE=https://github.com/openstack/cliff
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cmd2-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.7.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9dc335c61f12036e31c34f8fb429242
+_md5_=9fdf61a838d5e4b803e11b81717af8b0
diff --git a/metadata/md5-cache/dev-python/configargparse-1.4 b/metadata/md5-cache/dev-python/configargparse-1.4
new file mode 100644
index 000000000000..2d7765800dcb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/configargparse-1.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Drop-in replacement for argparse supporting config files and env variables
+EAPI=7
+HOMEPAGE=https://github.com/bw2/ConfigArgParse/ https://pypi.org/project/ConfigArgParse/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bw2/ConfigArgParse/archive/v1.4.tar.gz -> ConfigArgParse-1.4.gh.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=de2c0bf4305bf0198d39e6001517646b
diff --git a/metadata/md5-cache/dev-python/construct-2.10.58 b/metadata/md5-cache/dev-python/construct-2.10.58
deleted file mode 100644
index 748e8ac020c8..000000000000
--- a/metadata/md5-cache/dev-python/construct-2.10.58
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/arrow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A powerful declarative parser for binary data
-EAPI=7
-HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/construct/construct/archive/v2.10.58.tar.gz -> construct-2.10.58.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=745c2433343cf9c79ae18ef083042bcf
diff --git a/metadata/md5-cache/dev-python/construct-2.10.59 b/metadata/md5-cache/dev-python/construct-2.10.59
index 4af12e74a8df..7ff4e2882c52 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.59
+++ b/metadata/md5-cache/dev-python/construct-2.10.59
@@ -4,7 +4,7 @@ DESCRIPTION=A powerful declarative parser for binary data
 EAPI=7
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.59.tar.gz -> construct-2.10.59.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5b4d650f52b4b7042c8459f388f05cdc
+_md5_=fca00a991322e308b550bc8b90c949d9
diff --git a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0 b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
index 0d91c517a8f2..e88cf973efaa 100644
--- a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
+++ b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A trivial extension that just raises an exception (for testing)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cython-test-exception-raiser/ https://github.com/twisted/cython-test-exception-raiser/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/twisted/cython-test-exception-raiser/archive/v1.0.0.tar.gz -> cython-test-exception-raiser-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d6a13f5626c9a162fe028c4bddf04bda
+_md5_=f226530d2dd75a341be549f139bdaee2
diff --git a/metadata/md5-cache/dev-python/ddt-1.4.2 b/metadata/md5-cache/dev-python/ddt-1.4.2
new file mode 100644
index 000000000000..6d9e6d59906b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ddt-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library to multiply test cases
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
+IUSE=test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/datadriventests/ddt/archive/1.4.2.tar.gz -> ddt-1.4.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8dde053ebebcda9ed7e00db478e7d14b
diff --git a/metadata/md5-cache/dev-python/defcon-0.8.1 b/metadata/md5-cache/dev-python/defcon-0.8.1
new file mode 100644
index 000000000000..ce0dbc9758b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/defcon-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/fs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/fonttools-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A set of UFO based objects for use in font editing applications
+EAPI=7
+HOMEPAGE=https://github.com/robotools/defcon
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/fonttools-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/robotools/defcon/archive/0.8.1.tar.gz -> defcon-0.8.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a441aa9c53357bfca89df411d3c47f46
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.12 b/metadata/md5-cache/dev-python/deprecated-1.2.12
new file mode 100644
index 000000000000..f3d23b46b82f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python @deprecated decorator to deprecate old API
+EAPI=7
+HOMEPAGE=https://github.com/tantale/deprecated
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.12.tar.gz -> deprecated-1.2.12.gh.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=44b9e31a8b3dcc4f22b77e1d3d82c117
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.19 b/metadata/md5-cache/dev-python/dulwich-0.20.19
index be5c70f7db60..0faafd545789 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.19
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.19
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
 EAPI=7
 HOMEPAGE=https://github.com/dulwich/dulwich/ https://pypi.org/project/dulwich/
 IUSE=doc examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.19.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=526c4d16e5ad1b37212cbd2a44543fed
+_md5_=6de42bf5ac80743d67ea752b1d3d53fb
diff --git a/metadata/md5-cache/dev-python/elementpath-2.1.2 b/metadata/md5-cache/dev-python/elementpath-2.1.2
deleted file mode 100644
index 36fae8c437d5..000000000000
--- a/metadata/md5-cache/dev-python/elementpath-2.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
-EAPI=7
-HOMEPAGE=https://github.com/sissaschool/elementpath https://pypi.org/project/elementpath/
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/elementpath/elementpath-2.1.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3534dfe86494a4b679024dffa83ff1a
diff --git a/metadata/md5-cache/dev-python/elementpath-2.1.4 b/metadata/md5-cache/dev-python/elementpath-2.1.4
index 124632d4ad74..f31ee8140cfa 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.1.4
+++ b/metadata/md5-cache/dev-python/elementpath-2.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/elementpath https://pypi.org/project/elementpath/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-2.1.4.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8e73ee15c41d3e99a07de32dd2e22b4d
+_md5_=e3534dfe86494a4b679024dffa83ff1a
diff --git a/metadata/md5-cache/dev-python/eventlet-0.30.2 b/metadata/md5-cache/dev-python/eventlet-0.30.2
index 917f07966b34..368ece1e5a65 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.30.2
+++ b/metadata/md5-cache/dev-python/eventlet-0.30.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/greenlet-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Highly concurrent networking library
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet
 IUSE=doc examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/greenlet-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.30.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2908aa7e9b7cddafc7e44dc764d8a536
+_md5_=6b51a0886312f8973f8e029f82d21179
diff --git a/metadata/md5-cache/dev-python/exdown-0.7.1 b/metadata/md5-cache/dev-python/exdown-0.7.1
deleted file mode 100644
index 29fdef8ed2c8..000000000000
--- a/metadata/md5-cache/dev-python/exdown-0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/exdown
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/exdown/archive/v0.7.1.tar.gz -> exdown-0.7.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=96260646355b6808ed40a5527a887f4a
diff --git a/metadata/md5-cache/dev-python/exdown-0.8.0 b/metadata/md5-cache/dev-python/exdown-0.8.0
deleted file mode 100644
index fd5d942d6b5f..000000000000
--- a/metadata/md5-cache/dev-python/exdown-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/exdown
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/exdown/archive/v0.8.0.tar.gz -> exdown-0.8.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=20357e04803d7201ff8030f376c12428
diff --git a/metadata/md5-cache/dev-python/exdown-0.8.2 b/metadata/md5-cache/dev-python/exdown-0.8.2
deleted file mode 100644
index 969b544130dc..000000000000
--- a/metadata/md5-cache/dev-python/exdown-0.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/exdown
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/exdown/archive/v0.8.2.tar.gz -> exdown-0.8.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=20357e04803d7201ff8030f376c12428
diff --git a/metadata/md5-cache/dev-python/exdown-0.8.5 b/metadata/md5-cache/dev-python/exdown-0.8.5
deleted file mode 100644
index 44124e42c319..000000000000
--- a/metadata/md5-cache/dev-python/exdown-0.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/exdown
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/exdown/archive/v0.8.5.tar.gz -> exdown-0.8.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=20357e04803d7201ff8030f376c12428
diff --git a/metadata/md5-cache/dev-python/fido2-0.7.3 b/metadata/md5-cache/dev-python/fido2-0.7.3
deleted file mode 100644
index 9cd4e08aaaa7..000000000000
--- a/metadata/md5-cache/dev-python/fido2-0.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] examples? ( dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyfakefs-3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Python based FIDO 2.0 library
-EAPI=7
-HOMEPAGE=https://github.com/Yubico/python-fido2
-IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
-RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] examples? ( dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.7.3/fido2-0.7.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d6e2274874dd4ea1c9655d92c70b03c3
diff --git a/metadata/md5-cache/dev-python/fido2-0.9.1 b/metadata/md5-cache/dev-python/fido2-0.9.1
new file mode 100644
index 000000000000..634912527d17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fido2-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python based FIDO 2.0 library
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/python-fido2
+IUSE=examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyscard[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] examples? ( dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0/0.9
+SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.9.1/fido2-0.9.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1b211c993e9f1ca5276340349e39f6ff
diff --git a/metadata/md5-cache/dev-python/flake8-3.9.0 b/metadata/md5-cache/dev-python/flake8-3.9.0
new file mode 100644
index 000000000000..7c8fdd7bc84c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-3.9.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pyflakes-2.3.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( >=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-prompt[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-prompt[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-prompt[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx-prompt[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pyflakes-2.3.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
+EAPI=7
+HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/pyflakes-2.3.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flake8/flake8-3.9.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2bfa4b2e8a8e769e8408a36c3f4c4dce
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2 b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
deleted file mode 100644
index ee5f1f5a6926..000000000000
--- a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/htmlmin[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minimize your flask rendered html
-EAPI=7
-HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-text/htmlmin[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.0.2.tar.gz -> Flask-HTMLmin-2.0.2.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3aee38316ef664c9fc3bfd12236cc903
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0 b/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
index decbdb700600..19078ef85a83 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Minimize your flask rendered html
 EAPI=7
 HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=app-text/htmlmin[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.1.0.tar.gz -> Flask-HTMLmin-2.1.0.gh.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=14c0fd89d8608d40ffedf26ef72b3401
+_md5_=ed5aaf09d1a64b3d1afe8d7a9a609183
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.7.0 b/metadata/md5-cache/dev-python/flask-paginate-0.7.0
deleted file mode 100644
index afaca767946e..000000000000
--- a/metadata/md5-cache/dev-python/flask-paginate-0.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pagination support for flask
-EAPI=7
-HOMEPAGE=https://flask-paginate.readthedocs.io
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lixxu/flask-paginate/archive/0.7.0.tar.gz -> flask-paginate-0.7.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=712f7df8d247612d4b030f200e374a3c
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.8.0 b/metadata/md5-cache/dev-python/flask-paginate-0.8.0
deleted file mode 100644
index 96472943d620..000000000000
--- a/metadata/md5-cache/dev-python/flask-paginate-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pagination support for flask
-EAPI=7
-HOMEPAGE=https://flask-paginate.readthedocs.io
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lixxu/flask-paginate/archive/0.8.0.tar.gz -> flask-paginate-0.8.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e172b8a519a6d51872484a0cf2adb095
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
deleted file mode 100644
index 8d0b3e3b8646..000000000000
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-issues[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SQLAlchemy support for Flask applications
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
-IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a4b31ae3f64638e4e3c4feced903a38
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1
new file mode 100644
index 000000000000..d8faf9657c56
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-issues[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SQLAlchemy support for Flask applications
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a1b87d54dd8b4fa4e7013506d683a0ff
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
new file mode 100644
index 000000000000..06f35a083fc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-issues[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SQLAlchemy support for Flask applications
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.5.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=116f830c266e18947bdc90c29aa2f15d
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.3-r1 b/metadata/md5-cache/dev-python/genshi-0.7.3-r1
deleted file mode 100644
index 7cfad931f7d6..000000000000
--- a/metadata/md5-cache/dev-python/genshi-0.7.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python toolkit for stream-based generation of output for the web
-EAPI=7
-HOMEPAGE=http://genshi.edgewall.org/ https://pypi.org/project/Genshi/
-IUSE=doc examples python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9cdc14a71a6770326946ccb8bc120625
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.5 b/metadata/md5-cache/dev-python/genshi-0.7.5
index b5458aba9f13..8f6b6ba37665 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.5
+++ b/metadata/md5-cache/dev-python/genshi-0.7.5
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python toolkit for stream-based generation of output for the web
 EAPI=7
-HOMEPAGE=http://genshi.edgewall.org/ https://pypi.org/project/Genshi/
-IUSE=doc examples python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+HOMEPAGE=https://genshi.edgewall.org/ https://pypi.org/project/Genshi/
+IUSE=doc examples test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.5.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a2c5fba24943f33df474eefce0e3d3fb
+_md5_=eaa3798e519c5ed6653ede95f2284cbf
diff --git a/metadata/md5-cache/dev-python/gevent-21.1.2 b/metadata/md5-cache/dev-python/gevent-21.1.2
index 22a29b8c2569..4c804f5ced79 100644
--- a/metadata/md5-cache/dev-python/gevent-21.1.2
+++ b/metadata/md5-cache/dev-python/gevent-21.1.2
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0[ssl(+),threads(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.17 dev-python/zope-event[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
 HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
-IUSE=doc examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.17 dev-python/zope-event[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-21.1.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62fc71dd74803241c9b0f149328940d6
+_md5_=b1f2e18ac5523dfe4d70915365f1358b
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.25.1 b/metadata/md5-cache/dev-python/google-api-core-1.25.1
deleted file mode 100644
index c239f4b1352a..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-1.25.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/grpcio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rsa[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/googleapis-common-protos[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core Library for Google Client Libraries
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
-IUSE=test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/googleapis-common-protos[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.25.1.tar.gz -> google-api-core-1.25.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5dde0bffea1ecedc2c17b4d723c98430
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.26.0 b/metadata/md5-cache/dev-python/google-api-core-1.26.0
index 9e0b670b4dbb..98bab166eb9b 100644
--- a/metadata/md5-cache/dev-python/google-api-core-1.26.0
+++ b/metadata/md5-cache/dev-python/google-api-core-1.26.0
@@ -4,7 +4,7 @@ DESCRIPTION=Core Library for Google Client Libraries
 EAPI=7
 HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/googleapis-common-protos[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.26.0.tar.gz -> google-api-core-1.26.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f500f5a1c527de45917049ca2416c0ea
+_md5_=5dde0bffea1ecedc2c17b4d723c98430
diff --git a/metadata/md5-cache/dev-python/google-auth-1.25.0 b/metadata/md5-cache/dev-python/google-auth-1.25.0
deleted file mode 100644
index 1f4bdcb86b70..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.25.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/grpcio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-1.25.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=151c229b30277b4d623e24403bd59c9e
diff --git a/metadata/md5-cache/dev-python/google-auth-1.26.1 b/metadata/md5-cache/dev-python/google-auth-1.26.1
index 4154e0890b90..ce85bff87f96 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.26.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.26.1
@@ -5,7 +5,7 @@ DESCRIPTION=Google Authentication Library
 EAPI=7
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.26.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2c2e321933d36f1b07ea7bc9f183299
+_md5_=151c229b30277b4d623e24403bd59c9e
diff --git a/metadata/md5-cache/dev-python/google-auth-1.28.0 b/metadata/md5-cache/dev-python/google-auth-1.28.0
new file mode 100644
index 000000000000..2f1fc3cc0cd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.28.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/grpcio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=7
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+IUSE=test python_targets_python3_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.28.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=91455c758c31c52bc7e56571fe8a3a89
diff --git a/metadata/md5-cache/dev-python/guessit-3.3.0 b/metadata/md5-cache/dev-python/guessit-3.3.0
deleted file mode 100644
index a4578cc8d33c..000000000000
--- a/metadata/md5-cache/dev-python/guessit-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for guessing information from video filenames
-EAPI=7
-HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/guessit/guessit-3.3.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1a8f2332edfb94dbc655b648c9dbc413
diff --git a/metadata/md5-cache/dev-python/guessit-3.3.1 b/metadata/md5-cache/dev-python/guessit-3.3.1
index c708eacab251..388ee5a27965 100644
--- a/metadata/md5-cache/dev-python/guessit-3.3.1
+++ b/metadata/md5-cache/dev-python/guessit-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for guessing information from video filenames
 EAPI=7
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-3.3.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6b1a38590982601f994979a8e0e1368f
+_md5_=1a8f2332edfb94dbc655b648c9dbc413
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.5 b/metadata/md5-cache/dev-python/httmock-1.2.5
deleted file mode 100644
index 2892f45a0090..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A mocking library for requests
-EAPI=7
-HOMEPAGE=https://github.com/patrys/httmock
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.2.5.tar.gz -> httmock-1.2.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cab2018826ce5eddeedeb3c1b46a75a
diff --git a/metadata/md5-cache/dev-python/httpx-0.17.1 b/metadata/md5-cache/dev-python/httpx-0.17.1
new file mode 100644
index 000000000000..4a8aa7c0dea4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/httpx-0.17.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/brotlipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/hyper-h2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/trustme[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/uvicorn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sniffio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httpcore-0.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httpcore-0.12.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/rfc3986-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
+EAPI=7
+HOMEPAGE=https://www.python-httpx.org/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sniffio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httpcore-0.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httpcore-0.12.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/rfc3986-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/encode/httpx/archive/0.17.1.tar.gz -> httpx-0.17.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0c8a757735c4bdb9b2541f7d19c7cb09
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.1.1 b/metadata/md5-cache/dev-python/hypothesis-6.1.1
deleted file mode 100644
index 9cf75f237aa2..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_7 python_targets_python3_8 python_targets_python3_9
-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.1.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b77f8a1a2d4ebbd2c8f2af33818d6a66
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.2.0 b/metadata/md5-cache/dev-python/hypothesis-6.2.0
index 245f34298bdc..d5dbc4014075 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.2.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fcd2e272efa28b25fa1883d642bc7da9
+_md5_=b77f8a1a2d4ebbd2c8f2af33818d6a66
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.4.0 b/metadata/md5-cache/dev-python/hypothesis-6.4.0
deleted file mode 100644
index 309c4e0ca56a..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_7 python_targets_python3_8 python_targets_python3_9
-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.4.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b3256f4914e98b6e47428b2b1e8641b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.4.2 b/metadata/md5-cache/dev-python/hypothesis-6.4.2
deleted file mode 100644
index 76681449b130..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_7 python_targets_python3_8 python_targets_python3_9
-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.4.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b3256f4914e98b6e47428b2b1e8641b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.7.0 b/metadata/md5-cache/dev-python/hypothesis-6.7.0
deleted file mode 100644
index 3a1814e3cb69..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!dev-python/pydantic !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_7 python_targets_python3_8 python_targets_python3_9
-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.7.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd7b7e38e00aac659cca90f9b84b2ea3
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.0 b/metadata/md5-cache/dev-python/hypothesis-6.8.0
deleted file mode 100644
index cca205f61f6b..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_7 python_targets_python3_8 python_targets_python3_9
-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.1 b/metadata/md5-cache/dev-python/hypothesis-6.8.1
new file mode 100644
index 000000000000..45e62dd06dcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.8.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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_7 python_targets_python3_8 python_targets_python3_9
+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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/iminuit-1.3.8 b/metadata/md5-cache/dev-python/iminuit-1.3.8
deleted file mode 100644
index 43471169dc00..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-1.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=7
-HOMEPAGE=https://github.com/iminuit/iminuit
-IUSE=python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-1.3.8.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=22c86a988c7507606ff90d2364d7c356
diff --git a/metadata/md5-cache/dev-python/iminuit-2.2.1 b/metadata/md5-cache/dev-python/iminuit-2.2.1
deleted file mode 100644
index f8ebe624709c..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=7
-HOMEPAGE=https://github.com/iminuit/iminuit
-IUSE=test python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2
-RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-2.2.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=6997487fa88670ba18c6afe7b22b8a72
diff --git a/metadata/md5-cache/dev-python/iminuit-2.4.0 b/metadata/md5-cache/dev-python/iminuit-2.4.0
new file mode 100644
index 000000000000..dd5d4340fa09
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iminuit-2.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minuit numerical function minimization in Python
+EAPI=7
+HOMEPAGE=https://github.com/scikit-hep/iminuit/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT LGPL-2
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/iminuit/iminuit-2.4.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=8176a83a781dca9212ebe2c15ab61c64
diff --git a/metadata/md5-cache/dev-python/immutables-0.15 b/metadata/md5-cache/dev-python/immutables-0.15
index ac5d605dc029..4730f511826e 100644
--- a/metadata/md5-cache/dev-python/immutables-0.15
+++ b/metadata/md5-cache/dev-python/immutables-0.15
@@ -4,7 +4,7 @@ DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack/immutables
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5cf0ef2a5f0673c23c1bc3179ce3c613
+_md5_=970c6b190df0a4fc58c8b208dbfb3bfa
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-3.7.3 b/metadata/md5-cache/dev-python/importlib_metadata-3.7.3
new file mode 100644
index 000000000000..d4f86b63bce8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-3.7.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_metadata
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.7.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=219c6b4f30f44691e4c9979a2a0d6216
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.1.1 b/metadata/md5-cache/dev-python/iniconfig-1.1.1
index cfc4748f6085..a3c82f3852af 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.1.1
+++ b/metadata/md5-cache/dev-python/iniconfig-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Brain-dead simple config-ini parsing
 EAPI=7
 HOMEPAGE=https://github.com/RonnyPfannschmidt/iniconfig
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.1.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0775036022d96ccb6702ee623d74ddb5
+_md5_=e1b7cf0aea39d2b44a7132d8c2a7f3fa
diff --git a/metadata/md5-cache/dev-python/ipdb-0.13.7 b/metadata/md5-cache/dev-python/ipdb-0.13.7
new file mode 100644
index 000000000000..9af568dc9d4f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipdb-0.13.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipython-7.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ipython-7.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/unzip
+DESCRIPTION=IPython-enabled pdb
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ipdb/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/ipython-7.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipdb/ipdb-0.13.7.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=522af1818b9673864cf8ce66d02b2b59
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
deleted file mode 100644
index 4e9a0f39ea89..000000000000
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vestigial utilities from IPython
-EAPI=7
-HOMEPAGE=https://github.com/ipython/ipython_genutils
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3db7aa340fba8fe932739ba374a8b924
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
new file mode 100644
index 000000000000..e4fab5110ae4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Vestigial utilities from IPython
+EAPI=7
+HOMEPAGE=https://github.com/ipython/ipython_genutils
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
+LICENSE=BSD
+RDEPEND=dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6bcefea1dae75e69ebc738bb2927a9d2
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.1.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.1.0
deleted file mode 100644
index 4b3b78425e7b..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Models and classes to supplement the stdlib collections module
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/jaraco.collections
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.1.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=461e26b142e5c79a640c41f6f1a87add
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.2.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.2.0
index 8ec6d5381164..5900b3d558c2 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Models and classes to supplement the stdlib collections module
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.collections
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1209cf3df0ac4e3be889826cad9ef039
+_md5_=c6f68ee99152211edfa6d07a29e6ae72
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.1.1 b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
new file mode 100644
index 000000000000..88c7ae04edd5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Classes for orchestrating Python (virtual) environments.
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.envs
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/contextlib2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.1.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3e69f39e14317511340feb8ef3b021e7
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1-r1 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1-r1
deleted file mode 100644
index 9b8064a2cbca..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Additional functions used by other projects by developer jaraco
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/jaraco.functools
-IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=22e957aa76e85740ae2d3d74427f5764
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.2.0 b/metadata/md5-cache/dev-python/jaraco-functools-3.2.0
index caaf01c6c919..8b23527b80f6 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Additional functions used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.functools
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96dd3911cc3753ecf661c842adbe7291
+_md5_=c6820a8ad8aef3d5d7b99f1126e0437a
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1 b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1
new file mode 100644
index 000000000000..94864bc18893
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools for working with iterables. Complements itertools and more_itertools
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.itertools
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-6.0.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=076da079ee0c085021cac29864b1529b
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1 b/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1
new file mode 100644
index 000000000000..19734fa8d875
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools to supplement packaging Python releases
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.packaging
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-8.2.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=214bef3030f68777b639f111b3028813
diff --git a/metadata/md5-cache/dev-python/jaraco-path-3.3.1 b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
index 24068371775f..4eacf7ab429f 100644
--- a/metadata/md5-cache/dev-python/jaraco-path-3.3.1
+++ b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Miscellaneous path functions
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.path/
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.path/jaraco.path-3.3.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b50c4eb7b64198cebea2cd134b6877e3
+_md5_=f51e57e606db4cd07723af20dccc00d4
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.2 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.2
new file mode 100644
index 000000000000..5326f37fe5bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Routines for handling streaming data
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.stream
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9cbeda8f94987433172199a1c3b34daa
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.4.0 b/metadata/md5-cache/dev-python/jaraco-text-3.4.0
deleted file mode 100644
index 34831b6fa756..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-text-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),-python_single_target_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Text utilities used by other projects by developer jaraco
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/jaraco.text
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.4.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6a3e0ba625bb1581f6de72da9169ef4
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.5.0 b/metadata/md5-cache/dev-python/jaraco-text-3.5.0
index 469d2de7a8c5..574687851791 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.5.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Text utilities used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.text
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.5.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8bc791e12769181ffb9549b1b571e583
+_md5_=f6b9bc6f84f04221ad56129fb832b2ee
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.0 b/metadata/md5-cache/dev-python/joblib-1.0.0
deleted file mode 100644
index 19856c2a2d0d..000000000000
--- a/metadata/md5-cache/dev-python/joblib-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/threadpoolctl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools to provide lightweight pipelining in Python
-EAPI=7
-HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/joblib/joblib/archive/1.0.0.tar.gz -> joblib-1.0.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af29d5fa147316f8cb42f587e2e5c0a9
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.1 b/metadata/md5-cache/dev-python/joblib-1.0.1
index f01553ddfbe1..323892e692b8 100644
--- a/metadata/md5-cache/dev-python/joblib-1.0.1
+++ b/metadata/md5-cache/dev-python/joblib-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=7
 HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/1.0.1.tar.gz -> joblib-1.0.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ea948c593d0bfa9464d45a133ef42859
+_md5_=af29d5fa147316f8cb42f587e2e5c0a9
diff --git a/metadata/md5-cache/dev-python/josepy-1.8.0 b/metadata/md5-cache/dev-python/josepy-1.8.0
new file mode 100644
index 000000000000..f9f5d326b3e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/josepy-1.8.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JOSE protocol implementation in Python
+EAPI=7
+HOMEPAGE=https://github.com/certbot/josepy
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/josepy/josepy-1.8.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=23125cc26c792997c530adcf458baddb
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.32 b/metadata/md5-cache/dev-python/jsonpatch-1.32
new file mode 100644
index 000000000000..3089319390f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.32
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/jsonpointer-1.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04
+EAPI=7
+HOMEPAGE=https://github.com/stefankoegl/python-json-patch
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.32.tar.gz -> jsonpatch-1.32.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=99040a7b4c9865a8574bc6cdb1c82f73
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.5.0 b/metadata/md5-cache/dev-python/jsonpickle-1.5.0
deleted file mode 100644
index f04606224599..000000000000
--- a/metadata/md5-cache/dev-python/jsonpickle-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
-EAPI=7
-HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
-IUSE=doc test doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.5.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=135e2a2f1f60207f3d03a65a247939d6
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.5.2 b/metadata/md5-cache/dev-python/jsonpickle-1.5.2
deleted file mode 100644
index 8d74112f725e..000000000000
--- a/metadata/md5-cache/dev-python/jsonpickle-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
-EAPI=7
-HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.5.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85d4b3cbd30cbae2dfd0059b7115bf41
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.0.0 b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
index d5521a316ebc..2f073007995a 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-2.0.0
+++ b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
 EAPI=7
 HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85d4b3cbd30cbae2dfd0059b7115bf41
+_md5_=de221a224245cd42cf06c3ff6b6bdd80
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.1 b/metadata/md5-cache/dev-python/jsonpointer-2.1
new file mode 100644
index 000000000000..b3faa1916d4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Identify specific nodes in a JSON document (according to draft 08)
+EAPI=7
+HOMEPAGE=https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e4679c1328dfb2410f5a11c1bca3ab77
diff --git a/metadata/md5-cache/dev-python/jupyter_client-6.1.12 b/metadata/md5-cache/dev-python/jupyter_client-6.1.12
new file mode 100644
index 000000000000..3920f22067a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-6.1.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jedi-0.17.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/async_generator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter protocol implementation and client libraries
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/async_generator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-6.1.12.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=95d2bfba6eb42823c54ea7aec1159767
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.3.0 b/metadata/md5-cache/dev-python/jupyter_console-6.3.0
new file mode 100644
index 000000000000..28e3cf62a290
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/util-linux ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A terminal-based console frontend for Jupyter kernels
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c4738fb2a7f21ceebcb0f38c27afbf3c
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.11.2 b/metadata/md5-cache/dev-python/lark-parser-0.11.2
new file mode 100644
index 000000000000..bc0b27f1107e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lark-parser-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module to propose a modern general-purpose parsing library for Python
+EAPI=7
+HOMEPAGE=https://github.com/lark-parser/lark
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=92bb02b3538eb01a1b36813c35b74684
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
index 46da13f00a25..42ac097ec78f 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A fast and thorough lazy object proxy
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.org/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.5.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1623e5b83f05dad57d3bfaae56a69465
+_md5_=7c8f6cd354fc6ac9972615c7fcb310f7
diff --git a/metadata/md5-cache/dev-python/lit-11.1.0 b/metadata/md5-cache/dev-python/lit-11.1.0
index ecc1e975c7b6..30f5dc2eb240 100644
--- a/metadata/md5-cache/dev-python/lit-11.1.0
+++ b/metadata/md5-cache/dev-python/lit-11.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0d8192ba1ae2e71cd0a0cf9e64baa5f8
+_md5_=8913d4eef51fd86f9cf4f416477bd9d1
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.36.0 b/metadata/md5-cache/dev-python/llvmlite-0.36.0
new file mode 100644
index 000000000000..8368ad49b65a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmlite-0.36.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:10 sys-libs/zlib:0= !!sys-devel/llvm:0
+DESCRIPTION=Python wrapper around the llvm C++ library
+EAPI=7
+HOMEPAGE=https://llvmlite.pydata.org/
+IUSE=examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sys-devel/llvm:10 sys-libs/zlib:0= python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/numba/llvmlite/archive/v0.36.0.tar.gz -> llvmlite-0.36.0.gh.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a273d0a7456fd12281c7190b9a2ef540
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index d9cd59501c5c..1e67f0b3e52b 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83d8ec960559b2a6b61fe88a37ed4753
+_md5_=a41266be8c7aee6f55a155eaec59b183
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.6.0 b/metadata/md5-cache/dev-python/more-itertools-8.6.0
deleted file mode 100644
index 78834b8f73b5..000000000000
--- a/metadata/md5-cache/dev-python/more-itertools-8.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=More routines for operating on iterables, beyond itertools
-EAPI=7
-HOMEPAGE=https://pypi.org/project/more-itertools/
-IUSE=doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.6.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e5c14257c80f0713dd82e093b00ca74
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.7.0 b/metadata/md5-cache/dev-python/more-itertools-8.7.0
index 40f48134911a..e4b94e3b8bbc 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.7.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=7
 HOMEPAGE=https://pypi.org/project/more-itertools/
 IUSE=doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.7.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b40f1b9d67ec32761c3fbbf68ab11696
+_md5_=b80579ab903d1120b7df62cd16a64412
diff --git a/metadata/md5-cache/dev-python/moto-2.0.2 b/metadata/md5-cache/dev-python/moto-2.0.2
new file mode 100644
index 000000000000..65493c320cdf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sure-1.4.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/backports-tempfile[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/boto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cfn-python-lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-3.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/dicttoxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-2.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsondiff-1.1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto3-1.9.201[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/botocore-1.12.201[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-cors[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-jose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-sshpubkeys[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/responses-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmltodict[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zipp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=7
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/backports-tempfile[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/boto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cfn-python-lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-3.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/dicttoxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-2.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsondiff-1.1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto3-1.9.201[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/botocore-1.12.201[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-cors[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-jose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-sshpubkeys[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/responses-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmltodict[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zipp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.0.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d38e87249a8893534194e240d87bbd50
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
deleted file mode 100644
index 3987db95b871..000000000000
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
-EAPI=7
-HOMEPAGE=http://mpmath.org/
-IUSE=gmp matplotlib test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f325a65cd6936e876cb104e0cf6b457d
diff --git a/metadata/md5-cache/dev-python/mpmath-1.2.1 b/metadata/md5-cache/dev-python/mpmath-1.2.1
index f65dd26abd40..6fd9748b3bce 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.2.1
+++ b/metadata/md5-cache/dev-python/mpmath-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=7
 HOMEPAGE=https://mpmath.org/
 IUSE=gmp matplotlib test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.2.1.tar.gz -> mpmath-1.2.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=f1d501e236cc109932afd43d96cd4b78
+_md5_=e063024a32d2aff7598dc2977095f0e0
diff --git a/metadata/md5-cache/dev-python/nbclient-0.5.1 b/metadata/md5-cache/dev-python/nbclient-0.5.1
deleted file mode 100644
index 1b246a08c8d0..000000000000
--- a/metadata/md5-cache/dev-python/nbclient-0.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipywidgets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmltodict[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/async_generator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-6.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbformat-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nest_asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A client library for executing Jupyter notebooks
-EAPI=7
-HOMEPAGE=https://nbclient.readthedocs.io/en/latest/ https://github.com/jupyter/nbclient/ https://pypi.org/project/nbclient/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/async_generator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-6.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbformat-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nest_asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupyter/nbclient/archive/0.5.1.tar.gz -> nbclient-0.5.1.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=26ecf72af3a9f4fc8cf35590457f9b65
diff --git a/metadata/md5-cache/dev-python/nbclient-0.5.2 b/metadata/md5-cache/dev-python/nbclient-0.5.2
index 3520dfd08011..e69a4452f271 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.5.2
+++ b/metadata/md5-cache/dev-python/nbclient-0.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=A client library for executing Jupyter notebooks
 EAPI=7
 HOMEPAGE=https://nbclient.readthedocs.io/en/latest/ https://github.com/jupyter/nbclient/ https://pypi.org/project/nbclient/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/async_generator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-6.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbformat-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nest_asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbclient/archive/0.5.2.tar.gz -> nbclient-0.5.2.gh.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bb2974fbd20a920e75843b7684b0ddd2
+_md5_=eac10c46604f269df1d9dea34b8b913f
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.6 b/metadata/md5-cache/dev-python/notebook-6.1.6
deleted file mode 100644
index 33b7d1beea57..000000000000
--- a/metadata/md5-cache/dev-python/notebook-6.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install preinst prepare test
-DESCRIPTION=Jupyter Interactive Notebook
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/notebook/notebook-6.1.6.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d7a03d56103cf97d39a32dae4196b952
diff --git a/metadata/md5-cache/dev-python/notebook-6.2.0 b/metadata/md5-cache/dev-python/notebook-6.2.0
index bb12c2643cdc..6fdcae7f1c30 100644
--- a/metadata/md5-cache/dev-python/notebook-6.2.0
+++ b/metadata/md5-cache/dev-python/notebook-6.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Jupyter Interactive Notebook
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-6.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d88c8578c3ff28bdbaed0d9fa6cb20de
+_md5_=0b80e482a21b864d1b000f873b3d8368
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.1-r1 b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
index 574424e5f2d2..4a7ce05724b2 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3c97bb927b4ac404fd123b3d4bb94ad0
+_md5_=1f832ec627d7ba732abef9e41fc273eb
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.2-r1 b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
index 5314b5a00f9f..6aef77a149c2 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=477a83a7e2475f23576322c839cbe507
+_md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.3-r1 b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
index e096dc6dabd2..b7e54811722b 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.3.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=477a83a7e2475f23576322c839cbe507
+_md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/peewee-3.14.0 b/metadata/md5-cache/dev-python/peewee-3.14.0
deleted file mode 100644
index 00c3320e5c73..000000000000
--- a/metadata/md5-cache/dev-python/peewee-3.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psycopg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small Python ORM
-EAPI=7
-HOMEPAGE=https://github.com/coleifer/peewee/
-IUSE=examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/coleifer/peewee/archive/3.14.0.tar.gz -> peewee-3.14.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f3008154f5cd102dcae6d8207d9791
diff --git a/metadata/md5-cache/dev-python/peewee-3.14.1 b/metadata/md5-cache/dev-python/peewee-3.14.1
index 6dd0961481d2..e204093a5187 100644
--- a/metadata/md5-cache/dev-python/peewee-3.14.1
+++ b/metadata/md5-cache/dev-python/peewee-3.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=Small Python ORM
 EAPI=7
 HOMEPAGE=https://github.com/coleifer/peewee/
 IUSE=examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/peewee/archive/3.14.1.tar.gz -> peewee-3.14.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4762f2f3c1deab7f4458e47806dd428e
+_md5_=58f3008154f5cd102dcae6d8207d9791
diff --git a/metadata/md5-cache/dev-python/peewee-3.14.4 b/metadata/md5-cache/dev-python/peewee-3.14.4
new file mode 100644
index 000000000000..c19fe98eeda4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.14.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psycopg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Small Python ORM
+EAPI=7
+HOMEPAGE=https://github.com/coleifer/peewee/
+IUSE=examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.14.4.tar.gz -> peewee-3.14.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f137c697c255ffbf46a2882543cd7ff9
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.17 b/metadata/md5-cache/dev-python/phonenumbers-8.12.17
deleted file mode 100644
index 0cc23f120f0d..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=7
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.17.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cc2283cfa8049d41d8eb037d9bf277e9
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.18 b/metadata/md5-cache/dev-python/phonenumbers-8.12.18
index 28e200c729b4..8c7c379ed079 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.18
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.18
@@ -4,11 +4,11 @@ DESCRIPTION=Python port of Google's libphonenumber
 EAPI=7
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.18.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0eb1febb81fa71bb06814a44c1e4136c
+_md5_=cc2283cfa8049d41d8eb037d9bf277e9
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.20 b/metadata/md5-cache/dev-python/phonenumbers-8.12.20
new file mode 100644
index 000000000000..aadca7ef83a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.20
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=7
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.20.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0eb1febb81fa71bb06814a44c1e4136c
diff --git a/metadata/md5-cache/dev-python/phply-1.2.5 b/metadata/md5-cache/dev-python/phply-1.2.5
index 89be0b348a50..7a4ec7212a8f 100644
--- a/metadata/md5-cache/dev-python/phply-1.2.5
+++ b/metadata/md5-cache/dev-python/phply-1.2.5
@@ -4,7 +4,7 @@ DESCRIPTION=Lexer and parser for PHP source implemented using PLY
 EAPI=7
 HOMEPAGE=https://github.com/viraptor/phply/ https://pypi.org/project/phply/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/ply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/viraptor/phply/archive/1.2.5.tar.gz -> phply-1.2.5.gh.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1efcc6c61ee9666dff6ff323b4572ace
+_md5_=525e0f55d0083b7a46b0e7631d0ec524
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.9.0 b/metadata/md5-cache/dev-python/pikepdf-2.9.0
new file mode 100644
index 000000000000..948d98c69963
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.9.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pillow-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/qpdf:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v2.9.0.tar.gz -> pikepdf-2.9.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=87655fb474ef10260f86f42ff90617ee
diff --git a/metadata/md5-cache/dev-python/plumbum-1.7.0-r1 b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
new file mode 100644
index 000000000000..baa28facf46a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for shell script-like programs in python
+EAPI=7
+HOMEPAGE=https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/ed/ba/431d7f420cd93c4b8ccb15ed8f1c6c76c81965634fd70345af0b19c2b7bc/plumbum-1.7.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7b63a9c3668452a8a479760367703d69
diff --git a/metadata/md5-cache/dev-python/portend-2.7.0 b/metadata/md5-cache/dev-python/portend-2.7.0
deleted file mode 100644
index b0fce54eec53..000000000000
--- a/metadata/md5-cache/dev-python/portend-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=TCP port monitoring utilities
-EAPI=7
-HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
-IUSE=test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/portend/portend-2.7.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=50a011aa467c5bf98fd1263059b56a87
diff --git a/metadata/md5-cache/dev-python/portend-2.7.1 b/metadata/md5-cache/dev-python/portend-2.7.1
index 0edd440e5824..20ffc0e296a2 100644
--- a/metadata/md5-cache/dev-python/portend-2.7.1
+++ b/metadata/md5-cache/dev-python/portend-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=TCP port monitoring utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.7.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=729534d8ecb402cb2b93aaa968a26afa
+_md5_=d1d1be2742e6753fe5cbbd51cbeacb76
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.10 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.10
deleted file mode 100644
index 654bb82dcc78..000000000000
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Building powerful interactive command lines in Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.10.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=711c5cd043bbdd465d02f81094e00ce5
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.14 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.14
deleted file mode 100644
index b9a69cf3ac47..000000000000
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Building powerful interactive command lines in Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.14.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57a592272ab12254c57b8898fcb5fed3
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.16 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.16
index 6baf6d2065e3..df076d0d02ab 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.16
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.16
@@ -4,7 +4,7 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.16.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=711c5cd043bbdd465d02f81094e00ce5
+_md5_=57a592272ab12254c57b8898fcb5fed3
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.7.0 b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
new file mode 100644
index 000000000000..9921f3226518
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python style guide checker (fka pep8)
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pycodestyle/
+IUSE=doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.7.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=87e0db95af85deb33be4a9eb51077bcb
diff --git a/metadata/md5-cache/dev-python/pycollada-0.7.1 b/metadata/md5-cache/dev-python/pycollada-0.7.1
index 194dd7e70054..f724dea1aa68 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.7.1
+++ b/metadata/md5-cache/dev-python/pycollada-0.7.1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-dateutil-2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for reading and writing COLLADA documents
 EAPI=7
 HOMEPAGE=https://pycollada.readthedocs.io/
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8
+IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-dateutil-2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.7.1.tar.gz -> pycollada-0.7.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aad965f8e462d06882b238b05a4221c1
+_md5_=3db5076a2bfe30185b8b1e3c5b39bd08
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.0.0 b/metadata/md5-cache/dev-python/pydocstyle-6.0.0
new file mode 100644
index 000000000000..9172ce548c40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python docstring style checker
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/pydocstyle/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/pydocstyle/archive/6.0.0.tar.gz -> pydocstyle-6.0.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e0a7dcb73c6f4667929db79ab78595d4
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.3.0 b/metadata/md5-cache/dev-python/pyflakes-2.3.0
new file mode 100644
index 000000000000..bfbb8c178cf7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyflakes-2.3.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Passive checker for Python programs
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2fb8a6979e137d36724eebe19396d9db
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.6-r1 b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
index caeca2949bca..9fe838acd257 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.6-r1
+++ b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl-1.2.5 ) test? ( media-libs/sdl-image[gif,png,jpeg] media-libs/sdl-mixer[mp3,vorbis,wav] )
+DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl-1.2.5 ) test? ( media-libs/sdl-image[gif,png,jpeg] media-libs/sdl-mixer[mp3,vorbis,wav] )
 DESCRIPTION=Python bindings for SDL multimedia library
 EAPI=7
 HOMEPAGE=https://www.pygame.org/
-IUSE=doc examples midi opengl test X python_targets_python3_7 python_targets_python3_8
+IUSE=doc examples midi opengl test X python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl-1.2.5 ) media-libs/fontconfig python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl-1.2.5 ) media-libs/fontconfig python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.6.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a406d38b1bce21c90eee87dfd302525a
+_md5_=e196f1ce8776c08b636c4efbd48d7ad0
diff --git a/metadata/md5-cache/dev-python/pygments-2.7.4 b/metadata/md5-cache/dev-python/pygments-2.7.4
deleted file mode 100644
index 15ab26269264..000000000000
--- a/metadata/md5-cache/dev-python/pygments-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( virtual/ttf-fonts ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pygments is a syntax highlighting package written in Python
-EAPI=7
-HOMEPAGE=https://pygments.org/ https://github.com/pygments/pygments/ https://pypi.org/project/Pygments/
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pygments/Pygments-2.7.4.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd747eff6fb295014bba0b94af3fa1f5
diff --git a/metadata/md5-cache/dev-python/pygments-2.8.0 b/metadata/md5-cache/dev-python/pygments-2.8.0
index a44a6246abe8..fe8695e18034 100644
--- a/metadata/md5-cache/dev-python/pygments-2.8.0
+++ b/metadata/md5-cache/dev-python/pygments-2.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=7
 HOMEPAGE=https://pygments.org/ https://github.com/pygments/pygments/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.8.0.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ce6b262e952959ed381cfd8329cf42c9
+_md5_=a9a8cf0006acb95c458a2e3e5d51200f
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r2 b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
deleted file mode 100644
index be5e494bdbb2..000000000000
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme
-DESCRIPTION=A Python wrapper for the GPGME library
-EAPI=7
-HOMEPAGE=https://launchpad.net/pygpgme
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-crypt/gpgme python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5287343f86e8786162ac9036894712b2
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r3 b/metadata/md5-cache/dev-python/pygpgme-0.3-r3
index b4a9608d35ff..c97ee5523c98 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r3
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r3
@@ -5,11 +5,11 @@ DESCRIPTION=A Python wrapper for the GPGME library
 EAPI=7
 HOMEPAGE=https://launchpad.net/pygpgme https://pypi.org/project/pygpgme/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gpgme python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2cdff50f0e3dab8e2a99a7c06c517c95
+_md5_=0142aecf4db56eb485ea399d6aed2ebe
diff --git a/metadata/md5-cache/dev-python/pylast-4.2.0 b/metadata/md5-cache/dev-python/pylast-4.2.0
new file mode 100644
index 000000000000..e6958daeaddf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylast-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python interface to last.fm and other api-compatible websites
+EAPI=7
+HOMEPAGE=https://github.com/pylast/pylast
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pylast/pylast/archive/4.2.0.tar.gz -> pylast-4.2.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4b4142c0e3cda3c147c72b22e5a71ee0
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.0 b/metadata/md5-cache/dev-python/pylint-2.6.0
deleted file mode 100644
index d667ee092d07..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/astroid-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=7
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/astroid-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pylint/pylint-2.6.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c7e66d7b535e8da92da6b298ebda9816
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.1 b/metadata/md5-cache/dev-python/pylint-2.6.1
deleted file mode 100644
index d229f9c1ed59..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/astroid-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/astroid-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=7
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/astroid-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/astroid-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pylint/pylint-2.6.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3723bd8d078af6cd5166a6e0193bb766
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.2 b/metadata/md5-cache/dev-python/pylint-2.6.2
index 3e1c0eeb3bcd..e707c073e619 100644
--- a/metadata/md5-cache/dev-python/pylint-2.6.2
+++ b/metadata/md5-cache/dev-python/pylint-2.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=7
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
 IUSE=examples doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/astroid-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/astroid-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.6.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3723bd8d078af6cd5166a6e0193bb766
+_md5_=b48e31b3ecc8e1b01ef2c07333446d1a
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.1.3 b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
new file mode 100644
index 000000000000..9fcc41019a61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=7
+HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
+IUSE=examples opengl python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/decorator-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytools-2017.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=virtual/opencl-2 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.1.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=859fb2663cdb297e8783db381e3dcbbe
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.3_p37_p1-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.3_p37_p1-r1
index 02120e12b74a..244ccf37e476 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.3_p37_p1-r1
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.3_p37_p1-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/pypy37-pp73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.3_p1.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6be472f200e8aada2535b432dce401e5
+_md5_=64cf6f6af3d3d7cea500d71f56feae26
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1 b/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
deleted file mode 100644
index 8259cea6d030..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.34.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f3b74299139f240f4abc5cad5e00390d
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1 b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
deleted file mode 100644
index cdb7e10b8903..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.2.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=eb5f5e0668cd2f34f9125bd6a05fc5e8
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.2.1 b/metadata/md5-cache/dev-python/pytest-xdist-2.2.1
index 55dde9adb985..4d8aa99af506 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.2.1
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.2.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b77c6690b77bbebf3f13c9163a47e8f2
+_md5_=218dbde053f2847c7d48f3abb5109c0a
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.37 b/metadata/md5-cache/dev-python/python-debian-0.1.37
deleted file mode 100644
index 39841e7a4a37..000000000000
--- a/metadata/md5-cache/dev-python/python-debian-0.1.37
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/chardet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-arch/dpkg ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python modules to work with Debian-related data formats
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=dev-python/chardet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.37.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=93bb479373219d0c15f4aff73830d5f7
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.39 b/metadata/md5-cache/dev-python/python-debian-0.1.39
index ab097b51053f..915e37a9f6bb 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.39
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.39
@@ -4,7 +4,7 @@ DESCRIPTION=Python modules to work with Debian-related data formats
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=dev-python/chardet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.39.tar.xz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=257d4b3b000a553dcc7ad06702ef4db5
+_md5_=15615a671961dfe1b9f0fa26657d9069
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1 b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
deleted file mode 100644
index 728b26ddd04b..000000000000
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python classes to extract information from the Linux kernel /proc files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
-IUSE=python_targets_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://cdn.kernel.org/pub/software/libs/python/python-linux-procfs/python-linux-procfs-0.6.1.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8d32071b818fde948b3ae5843eeb6eb3
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.14 b/metadata/md5-cache/dev-python/python-stdnum-1.14
deleted file mode 100644
index 3fe9ebe23b17..000000000000
--- a/metadata/md5-cache/dev-python/python-stdnum-1.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( vies? ( || ( dev-python/zeep dev-python/suds ) ) >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A module to handle standardized numbers and codes
-EAPI=7
-HOMEPAGE=https://arthurdejong.org/python-stdnum/
-IUSE=vies test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=vies? ( || ( dev-python/zeep dev-python/suds ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-stdnum/python-stdnum-1.14.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5de3d2e983ee8fe252df927ef0d8a10b
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.15 b/metadata/md5-cache/dev-python/python-stdnum-1.15
deleted file mode 100644
index a96c25f75d20..000000000000
--- a/metadata/md5-cache/dev-python/python-stdnum-1.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( vies? ( || ( dev-python/zeep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/suds[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ) >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A module to handle standardized numbers and codes
-EAPI=7
-HOMEPAGE=https://arthurdejong.org/python-stdnum/
-IUSE=vies test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=vies? ( || ( dev-python/zeep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/suds[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-stdnum/python-stdnum-1.15.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ef517b3817b5f64ede474db2398e118
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.16 b/metadata/md5-cache/dev-python/python-stdnum-1.16
index ce120a14f043..60c0a5a15a77 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.16
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.16
@@ -4,7 +4,7 @@ DESCRIPTION=A module to handle standardized numbers and codes
 EAPI=7
 HOMEPAGE=https://arthurdejong.org/python-stdnum/
 IUSE=vies test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=vies? ( || ( dev-python/zeep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/suds[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-stdnum/python-stdnum-1.16.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=398265814e39437e53faa0943124b6e9
+_md5_=8ef517b3817b5f64ede474db2398e118
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
deleted file mode 100644
index 7170840f803e..000000000000
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/exempi )
-DESCRIPTION=Library for working with XMP metadata
-EAPI=7
-HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2bcd16a11ba362fdf43c4b23633b26b2
diff --git a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.1 b/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.1
deleted file mode 100644
index 1618adad76d8..000000000000
--- a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython
-EAPI=7
-HOMEPAGE=https://github.com/gfairchild/pyxDamerauLevenshtein
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gfairchild/pyxDamerauLevenshtein/archive/v1.6.1.tar.gz -> pyxDamerauLevenshtein-1.6.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b501eef85424568f1031f8348c7ea9fe
diff --git a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.2 b/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.2
deleted file mode 100644
index b7f1ad53760f..000000000000
--- a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.19.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython
-EAPI=7
-HOMEPAGE=https://github.com/gfairchild/pyxDamerauLevenshtein
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.19.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gfairchild/pyxDamerauLevenshtein/archive/v1.6.2.tar.gz -> pyxDamerauLevenshtein-1.6.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0ca5a31e421c00cfad6865176d9fe519
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.0.3 b/metadata/md5-cache/dev-python/qtconsole-5.0.3
new file mode 100644
index 000000000000..5e74f986d033
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtconsole-5.0.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg,testlib] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Qt-based console for Jupyter with support for rich media output
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+PDEPEND=dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.0.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f79f50f38e9ea411c20942021a3835f1
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
new file mode 100644
index 000000000000..a97f4e9536c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code specific for Read the Docs and Sphinx
+EAPI=7
+HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20f05b68cc51bc6df9de2be959bf02e4
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.6.0-r1 b/metadata/md5-cache/dev-python/recommonmark-0.6.0-r1
deleted file mode 100644
index 2296962cf205..000000000000
--- a/metadata/md5-cache/dev-python/recommonmark-0.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/commonmark-0.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python docutils-compatibility bridge to CommonMark
-EAPI=7
-HOMEPAGE=https://recommonmark.readthedocs.io/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/commonmark-0.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rtfd/recommonmark/archive/0.6.0.tar.gz -> recommonmark-0.6.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a84c5db8c5b99852517a866e1b57a2e
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.7.1 b/metadata/md5-cache/dev-python/recommonmark-0.7.1
index ccf0e103498c..73471571f1aa 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.7.1
+++ b/metadata/md5-cache/dev-python/recommonmark-0.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python docutils-compatibility bridge to CommonMark
 EAPI=7
 HOMEPAGE=https://recommonmark.readthedocs.io/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/commonmark-0.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/0.7.1.tar.gz -> recommonmark-0.7.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=81d95a6d898caa4699329261b18a8c65
+_md5_=7a84c5db8c5b99852517a866e1b57a2e
diff --git a/metadata/md5-cache/dev-python/regex-2020.4.4-r1 b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
index b887d62da557..f4fb9eeb0b84 100644
--- a/metadata/md5-cache/dev-python/regex-2020.4.4-r1
+++ b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Alternative regular expression module to replace re
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2020.4.4.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=649232667da5f3fb5aeb81d131cd8868
+_md5_=5ce97ed787bcfc9b7e41b0ce0bcde75e
diff --git a/metadata/md5-cache/dev-python/regex-2021.3.17 b/metadata/md5-cache/dev-python/regex-2021.3.17
new file mode 100644
index 000000000000..176e7c551bec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.3.17
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=7
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.3.17.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d434b73512d8be5e86fc1427cb810178
diff --git a/metadata/md5-cache/dev-python/reno-3.3.0 b/metadata/md5-cache/dev-python/reno-3.3.0
new file mode 100644
index 000000000000..d33c24bb627b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reno-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/testtools-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-20.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
+EAPI=7
+HOMEPAGE=https://pypi.org/project/reno/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-20.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reno/reno-3.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a112c13172421cf53d61a9250d0635c
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.66 b/metadata/md5-cache/dev-python/reportlab-3.5.66
new file mode 100644
index 000000000000..595c3747167c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.66
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=7
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.66.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=577714af285c4d6f0c2488b2995971da
diff --git a/metadata/md5-cache/dev-python/responses-0.13.0 b/metadata/md5-cache/dev-python/responses-0.13.0
new file mode 100644
index 000000000000..bd5e4ce87360
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=7
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/responses/responses-0.13.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a94b0b8f0e5fa93cdf3676380abd75b
diff --git a/metadata/md5-cache/dev-python/responses-0.13.1 b/metadata/md5-cache/dev-python/responses-0.13.1
new file mode 100644
index 000000000000..05106b58f1b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.13.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=7
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/responses/responses-0.13.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a94b0b8f0e5fa93cdf3676380abd75b
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index dca336cc6ed9..9addb32c3c4f 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/rfc3987[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python RFC3986 validator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/rfc3987[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a4de92d208f3cc40a05d6635c7e270f9
+_md5_=1960d100780c697d7746375cd6b32e0e
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index 52340ff010be..bdecadfe2232 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=7
 HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/
-IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c65ba2daf32347cb7323cfa402044baf
+_md5_=c046573757d81ace4b34b15ac8060ba5
diff --git a/metadata/md5-cache/dev-python/rsa-4.7 b/metadata/md5-cache/dev-python/rsa-4.7
deleted file mode 100644
index 08649111a939..000000000000
--- a/metadata/md5-cache/dev-python/rsa-4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pyasn1-0.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python RSA implementation
-EAPI=7
-HOMEPAGE=https://stuvel.eu/rsa/ https://pypi.org/project/rsa/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.7.tar.gz -> python-rsa-version-4.7.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7935fb8f0fe0d9811c0ec64390dabf81
diff --git a/metadata/md5-cache/dev-python/rsa-4.7.1 b/metadata/md5-cache/dev-python/rsa-4.7.1
index 2475b6b0722d..b05f8ac6bf58 100644
--- a/metadata/md5-cache/dev-python/rsa-4.7.1
+++ b/metadata/md5-cache/dev-python/rsa-4.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python RSA implementation
 EAPI=7
 HOMEPAGE=https://stuvel.eu/rsa/ https://pypi.org/project/rsa/
 IUSE=test python_targets_python3_7 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=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.7.1.tar.gz -> python-rsa-version-4.7.1.gh.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aa49b1e82a28be32cf81b09b2607fd2b
+_md5_=7935fb8f0fe0d9811c0ec64390dabf81
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r2 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r2
index 988f34a5ab3a..c89b5416fbd0 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r2
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Ruamel enhancements to pathlib and pathlib2
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.std.pathlib-0.6.4.tar.xz -> ruamel-std-pathlib-0.6.4.tar.xz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b5ff0b6e91f18d2caa6ce6847652d138
+_md5_=b8554a814578fbc3351535da4247e84f
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0
new file mode 100644
index 000000000000..9aad8f2dbddb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ruamel enhancements to pathlib and pathlib2
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.std.pathlib-0.8.0.tar.xz -> ruamel-std-pathlib-0.8.0.tar.xz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b8554a814578fbc3351535da4247e84f
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.5 b/metadata/md5-cache/dev-python/s3transfer-0.3.5
new file mode 100644
index 000000000000..ebaf31464ea3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Amazon S3 Transfer Manager
+EAPI=7
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.5.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f31ee9b27071b43f26b71df58dc2768
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.6 b/metadata/md5-cache/dev-python/s3transfer-0.3.6
new file mode 100644
index 000000000000..4cac3c393af5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Amazon S3 Transfer Manager
+EAPI=7
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.6.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f31ee9b27071b43f26b71df58dc2768
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.0 b/metadata/md5-cache/dev-python/secretstorage-3.3.0
deleted file mode 100644
index d761c8a560f8..000000000000
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( !hppa? ( !sparc? ( gnome-base/gnome-keyring sys-apps/dbus ) ) ) test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jeepney-0.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/alabaster[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
-EAPI=7
-HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
-IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jeepney-0.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.3.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=42a1fa542523180d9f4b3ad4a0388e18
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.1 b/metadata/md5-cache/dev-python/secretstorage-3.3.1
index dbe71796b75c..cd128ce03acc 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=7
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
 IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jeepney-0.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.3.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b849d107f928ce31c5d5192654e1cd05
+_md5_=42a1fa542523180d9f4b3ad4a0388e18
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.19.5 b/metadata/md5-cache/dev-python/sentry-sdk-0.19.5
deleted file mode 100644
index 056b74a25089..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.19.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/executing[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/eventlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fakeredis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-login[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gevent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Sentry
-EAPI=7
-HOMEPAGE=https://getsentry.com https://pypi.org/project/sentry-sdk/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/0.19.5.tar.gz -> sentry-sdk-0.19.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=53bc890c3b49a4c227376fbec5ef3b83
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.20.1 b/metadata/md5-cache/dev-python/sentry-sdk-0.20.1
index 98788a357baf..e173d598af2d 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.20.1
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.20.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python client for Sentry
 EAPI=7
 HOMEPAGE=https://sentry.io/ https://pypi.org/project/sentry-sdk/
 IUSE=test python_targets_python3_7 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=PSF-2
 RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-python/archive/0.20.1.tar.gz -> sentry-sdk-0.20.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=527c2e06552b7a72ebdfbee92a8a6874
+_md5_=2b40a4e017c81536f3d2f2ef36e3be1e
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.20.2 b/metadata/md5-cache/dev-python/sentry-sdk-0.20.2
deleted file mode 100644
index 020ea0898e43..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.20.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/executing[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/eventlet[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fakeredis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-login[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gevent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Sentry
-EAPI=7
-HOMEPAGE=https://sentry.io/ https://pypi.org/project/sentry-sdk/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/0.20.2.tar.gz -> sentry-sdk-0.20.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=527c2e06552b7a72ebdfbee92a8a6874
diff --git a/metadata/md5-cache/dev-python/setuptools-54.1.2 b/metadata/md5-cache/dev-python/setuptools-54.1.2
new file mode 100644
index 000000000000..fbe06ff84d71
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-54.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-54.1.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bfece64fbf4073aa78ddcf588065971f
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.0.1 b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1
new file mode 100644
index 000000000000..b4fc8481039c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1
@@ -0,0 +1,15 @@
+BDEPEND=!!<dev-python/setuptools_scm-2 test? ( dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git !sparc? ( dev-vcs/mercurial ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage versions by scm tags via setuptools
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-6.0.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1404225fec1dce0f7f22c4cb927bd9a1
diff --git a/metadata/md5-cache/dev-python/sh-1.14.1 b/metadata/md5-cache/dev-python/sh-1.14.1
new file mode 100644
index 000000000000..1388f8ffd8ec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sh-1.14.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python subprocess interface
+EAPI=7
+HOMEPAGE=https://github.com/amoffat/sh
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sh/sh-1.14.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d98974f57f4f7789a08da3372623b6fc
diff --git a/metadata/md5-cache/dev-python/smmap-3.0.5 b/metadata/md5-cache/dev-python/smmap-3.0.5
deleted file mode 100644
index 9e6ed50a38e0..000000000000
--- a/metadata/md5-cache/dev-python/smmap-3.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure Python implementation of a sliding window memory map manager
-EAPI=7
-HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/smmap/smmap-3.0.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c5037b1bdcabfdf8bb5af9823b6fbd4
diff --git a/metadata/md5-cache/dev-python/smmap-4.0.0 b/metadata/md5-cache/dev-python/smmap-4.0.0
index 9e75bf0a8269..afb786e9f6d8 100644
--- a/metadata/md5-cache/dev-python/smmap-4.0.0
+++ b/metadata/md5-cache/dev-python/smmap-4.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python implementation of a sliding window memory map manager
 EAPI=7
 HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-4.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=30236a3d4b2a329ad716da951b8d5d16
+_md5_=0cb7fd0ad7382415397f865f14fda670
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.2-r1 b/metadata/md5-cache/dev-python/snakeoil-0.9.2-r1
index 29f0b945da04..98cdf92181b1 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.2-r1
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/s/snakeoil/snakeoil-0.9.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=06ab1b788e1b2256abb01a206fffc74e
+_md5_=6e6b90f2d94f6716b100f57623195204
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.3 b/metadata/md5-cache/dev-python/snakeoil-0.9.3
index a7749104a8a1..f0f48502e348 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.3
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/s/snakeoil/snakeoil-0.9.3.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e26eaba525438ed929828b0b40a2b70
+_md5_=23de41323e7fa6c2cea99c869d013556
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.4 b/metadata/md5-cache/dev-python/snakeoil-0.9.4
new file mode 100644
index 000000000000..de07dd82055f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2e26eaba525438ed929828b0b40a2b70
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.5 b/metadata/md5-cache/dev-python/snakeoil-0.9.5
new file mode 100644
index 000000000000..f64d14cff9ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.5.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2e26eaba525438ed929828b0b40a2b70
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.1.0 b/metadata/md5-cache/dev-python/soupsieve-2.1.0
deleted file mode 100644
index 7aec50ac941f..000000000000
--- a/metadata/md5-cache/dev-python/soupsieve-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/beautifulsoup[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
-IUSE=test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.1.0.tar.gz -> soupsieve-2.1.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bbd90990aeb7bc2db681ec65d3bae62c
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.2 b/metadata/md5-cache/dev-python/soupsieve-2.2
index a3f70f76c88d..c8e1ab246525 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.2
+++ b/metadata/md5-cache/dev-python/soupsieve-2.2
@@ -4,7 +4,7 @@ DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
 IUSE=test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.2.tar.gz -> soupsieve-2.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f1b37a91ec1cb5375068f56a52d90463
+_md5_=80534a5cb06b77ff55277501f2c3fd37
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.2.1 b/metadata/md5-cache/dev-python/soupsieve-2.2.1
new file mode 100644
index 000000000000..e4c3e65b13ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/soupsieve-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/beautifulsoup[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
+EAPI=7
+HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.2.1.tar.gz -> soupsieve-2.2.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=41f5fe31a95f0dd013ea722de19e651c
diff --git a/metadata/md5-cache/dev-python/sphinx-3.4.3 b/metadata/md5-cache/dev-python/sphinx-3.4.3
deleted file mode 100644
index 98f72c64d18b..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-3.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/typed-ast[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python documentation generator
-EAPI=7
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/typed-ast[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-3.4.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=35996d9c2fc3d508d6b31b8f96504c01
diff --git a/metadata/md5-cache/dev-python/sphinx-3.5.1 b/metadata/md5-cache/dev-python/sphinx-3.5.1
index 756ae579f580..875a35656771 100644
--- a/metadata/md5-cache/dev-python/sphinx-3.5.1
+++ b/metadata/md5-cache/dev-python/sphinx-3.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python documentation generator
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/typed-ast[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-3.5.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8265f67d20e7cb5c57800faaadad8a7
+_md5_=58f7f751b871f290e07bd2ccc2a1c645
diff --git a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0 b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0
index e696b25c3bbb..887c9a21156e 100644
--- a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0
+++ b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Minimal pure-CSS Sphinx theme using the LV2 plugin documentation sty
 EAPI=7
 HOMEPAGE=https://gitlab.com/lv2/sphinx_lv2_theme
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/lv2/sphinx_lv2_theme/-/archive/v1.0.0/{PN}-v1.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=86b958bb227e6845dbc521fd154fcbbb
+_md5_=96d92b25871cba67f8824dc7249d957d
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.1 b/metadata/md5-cache/dev-python/spyder-4.2.1
deleted file mode 100644
index 4ecb96bb7a9c..000000000000
--- a/metadata/md5-cache/dev-python/spyder-4.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flaky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/matplotlib[tk,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pytest-6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-lazy-fixture[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-ordering[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-qt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xvfb[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sympy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/chardet-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cookiecutter[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ipython-7.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/jedi-0.17.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keyring-17.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nbconvert-4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/parso-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pickleshare-0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-5.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygments-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pylint-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/autopep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flake8-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pylint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rope-0.10.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/yapf[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyls-spyder-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyxdg-0.26[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyzmq-17.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qdarkstyle-2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qtawesome-0.5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qtconsole-5.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/spyder-kernels-1.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/spyder-kernels-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-panels[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pydata-sphinx-theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-multiversion[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install 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_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/chardet-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cookiecutter[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ipython-7.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/jedi-0.17.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keyring-17.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nbconvert-4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/parso-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pickleshare-0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-5.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygments-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pylint-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/autopep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flake8-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pylint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rope-0.10.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/yapf[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyls-spyder-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyxdg-0.26[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyzmq-17.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qdarkstyle-2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qtawesome-0.5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qtconsole-5.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/spyder-kernels-1.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/spyder-kernels-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.1.tar.gz -> spyder-4.2.1.tar.gz https://github.com/spyder-ide/spyder-docs/archive/5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz -> spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79910dde488e87c6d48ca0b55556e9c1
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.10.1 b/metadata/md5-cache/dev-python/spyder-kernels-1.10.1
deleted file mode 100644
index 0613d59f316a..000000000000
--- a/metadata/md5-cache/dev-python/spyder-kernels-1.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xarray[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipykernel-5.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wurlitzer-1.0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Kernels used by spyder on its ipython console
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipykernel-5.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wurlitzer-1.0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v1.10.1.tar.gz -> spyder-kernels-1.10.1-gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9b69173ac94264b98f080a90b4b5980
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.0 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.0
new file mode 100644
index 000000000000..9c63c9ff4777
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e809b9b4b9bfd3ed3aef7fd0c76d800f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.1 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.1
new file mode 100644
index 000000000000..a457ca2a828e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5091883f0efde4f8d93b137e7dd578d2
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.2 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.2
new file mode 100644
index 000000000000..0a914b1aea61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5091883f0efde4f8d93b137e7dd578d2
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.11.1 b/metadata/md5-cache/dev-python/statsmodels-0.11.1
deleted file mode 100644
index d4dbcf8d7b57..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=doc examples test doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.11.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37f13c16105ba1b5c86ca5aff3844f75
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.0 b/metadata/md5-cache/dev-python/statsmodels-0.12.0
deleted file mode 100644
index 16820ec397b1..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-xdist[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e368dc5ebfbc6b5524c57f4d84c293b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.1 b/metadata/md5-cache/dev-python/statsmodels-0.12.1
deleted file mode 100644
index bf130929d664..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-xdist[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e368dc5ebfbc6b5524c57f4d84c293b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.2 b/metadata/md5-cache/dev-python/statsmodels-0.12.2
index a94b69a9889a..d85fcb925d83 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.2
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.2
@@ -4,7 +4,7 @@ DESCRIPTION=Statistical computations and models for use with SciPy
 EAPI=7
 HOMEPAGE=https://www.statsmodels.org/stable/index.html
 IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e4188480f5f6cb851c280874343f58a
+_md5_=0848b067a2e6cc47cfc4357d6251ffab
diff --git a/metadata/md5-cache/dev-python/stripe-2.55.2 b/metadata/md5-cache/dev-python/stripe-2.55.2
index 10c4b8255fce..496c5aaac546 100644
--- a/metadata/md5-cache/dev-python/stripe-2.55.2
+++ b/metadata/md5-cache/dev-python/stripe-2.55.2
@@ -5,7 +5,7 @@ DESCRIPTION=Stripe python bindings
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-python
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.55.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4905a3a8b35e91d7828ea47f5fb4fcaf
+_md5_=a658273ca3e6cb2994e826053c8c5be3
diff --git a/metadata/md5-cache/dev-python/symengine-0.7.0 b/metadata/md5-cache/dev-python/symengine-0.7.0
new file mode 100644
index 000000000000..0c135a46ca6f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/symengine-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/sympy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/symengine-0.6 >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python wrappers to the symengine C++ library
+EAPI=7
+HOMEPAGE=https://github.com/symengine/symengine.py/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/symengine-0.6 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/symengine/symengine.py/archive/v0.7.0.tar.gz -> symengine.py-0.7.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20248fa18b52185cf25b71ba2c3702c9
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.6 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.6
deleted file mode 100644
index c9dd00a03cd8..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/exdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.6.tar.gz -> tikzplotlib-0.9.6.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=49b5c9296a7d965df35c4103ad54dffa
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.7 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.7
deleted file mode 100644
index 0162012303cd..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/exdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.7.tar.gz -> tikzplotlib-0.9.7.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=d271d16569a07d5b6e0a03c0f5493b67
diff --git a/metadata/md5-cache/dev-python/tox-3.21.4 b/metadata/md5-cache/dev-python/tox-3.21.4
deleted file mode 100644
index 5812045a1cfe..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.21.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/3.21.4.tar.gz -> tox-3.21.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ebd72ee8d533c4e6fb1508575128f255
diff --git a/metadata/md5-cache/dev-python/tox-3.22.0 b/metadata/md5-cache/dev-python/tox-3.22.0
index cb0669d29022..58c7f27497dc 100644
--- a/metadata/md5-cache/dev-python/tox-3.22.0
+++ b/metadata/md5-cache/dev-python/tox-3.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=virtualenv-based automation of test activities
 EAPI=7
 HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.22.0.tar.gz -> tox-3.22.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3811ef9b32bcfb30a5411eb1ff183f74
+_md5_=ebd72ee8d533c4e6fb1508575128f255
diff --git a/metadata/md5-cache/dev-python/tqdm-4.55.2 b/metadata/md5-cache/dev-python/tqdm-4.55.2
deleted file mode 100644
index a4909cb79990..000000000000
--- a/metadata/md5-cache/dev-python/tqdm-4.55.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Add a progress meter to your loops in a second
-EAPI=7
-HOMEPAGE=https://github.com/tqdm/tqdm
-IUSE=examples test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tqdm/tqdm-4.55.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18a6b1b5bca009960901ef7c739439c5
diff --git a/metadata/md5-cache/dev-python/tqdm-4.56.2 b/metadata/md5-cache/dev-python/tqdm-4.56.2
index 8badae21bec6..f8b8367664f3 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.56.2
+++ b/metadata/md5-cache/dev-python/tqdm-4.56.2
@@ -4,7 +4,7 @@ DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=7
 HOMEPAGE=https://github.com/tqdm/tqdm
 IUSE=examples test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.56.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e84d4c565177d128170af4607defd444
+_md5_=18a6b1b5bca009960901ef7c739439c5
diff --git a/metadata/md5-cache/dev-python/transitions-0.8.6 b/metadata/md5-cache/dev-python/transitions-0.8.6
deleted file mode 100644
index 262c1b81e6bb..000000000000
--- a/metadata/md5-cache/dev-python/transitions-0.8.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/dill[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=A lightweight, object-oriented state machine implementation in Python
-EAPI=7
-HOMEPAGE=https://github.com/pytransitions/transitions
-IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pytransitions/transitions/archive/0.8.6.tar.gz -> transitions-0.8.6.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9ce3b727517c712f0cf26818dec1db1
diff --git a/metadata/md5-cache/dev-python/transitions-0.8.7 b/metadata/md5-cache/dev-python/transitions-0.8.7
index 78bd63614598..5baafd30f8f0 100644
--- a/metadata/md5-cache/dev-python/transitions-0.8.7
+++ b/metadata/md5-cache/dev-python/transitions-0.8.7
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight, object-oriented state machine implementation in Pytho
 EAPI=7
 HOMEPAGE=https://github.com/pytransitions/transitions
 IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytransitions/transitions/archive/0.8.7.tar.gz -> transitions-0.8.7.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=70e370b54f7d83c833259b8769b42874
+_md5_=a9ce3b727517c712f0cf26818dec1db1
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.1 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.1
deleted file mode 100644
index fae0984cf049..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=7
-HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/releases/download/3.3.1/translate-toolkit-3.3.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=09479ad968a226d3aae0c20d9629fc5d
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
index b5b46c6a4d52..ef4f4483ce2a 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=7
 HOMEPAGE=https://github.com/translate/translate
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/releases/download/3.3.2/translate-toolkit-3.3.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af12c0cd50b0a2055d3bfb1cd68667d7
+_md5_=8178c314352a6630e05c10b4ee35fa62
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
index e8818e699b53..74f33710808c 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings to the Tree-sitter parsing library
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.19.0.tar.gz -> py-tree-sitter-0.19.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c65f3cae3f2a1ce05cb20afaa2b2f248
+_md5_=2cf52138a0cea8f6233bf66c163c5fb4
diff --git a/metadata/md5-cache/dev-python/trustme-0.6.0-r1 b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
deleted file mode 100644
index c4d2d703dd35..000000000000
--- a/metadata/md5-cache/dev-python/trustme-0.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
-EAPI=7
-HOMEPAGE=https://github.com/python-trio/trustme
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/trustme/trustme-0.6.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f35b5593611b9408ef6cbf5d0cafc179
diff --git a/metadata/md5-cache/dev-python/trustme-0.7.0 b/metadata/md5-cache/dev-python/trustme-0.7.0
index 0f9517ff9de0..a5d3f50d428b 100644
--- a/metadata/md5-cache/dev-python/trustme-0.7.0
+++ b/metadata/md5-cache/dev-python/trustme-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trustme
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.7.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=17ba59e9bf6cb4130acbb00afe11fb20
+_md5_=132c7bcbca63dbf597a5f122087c795a
diff --git a/metadata/md5-cache/dev-python/twine-3.4.0 b/metadata/md5-cache/dev-python/twine-3.4.0
new file mode 100644
index 000000000000..c58bfeb787d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twine-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of utilities for publishing packages on PyPI
+EAPI=7
+HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/twine/archive/3.4.0.tar.gz -> twine-3.4.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3204d7f876a8b729bcc074222922bbd0
diff --git a/metadata/md5-cache/dev-python/twine-3.4.1 b/metadata/md5-cache/dev-python/twine-3.4.1
new file mode 100644
index 000000000000..4cb682f53fc3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twine-3.4.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of utilities for publishing packages on PyPI
+EAPI=7
+HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/twine/archive/3.4.1.tar.gz -> twine-3.4.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=af57da8eb0aaaaed3edf3f2039693cda
diff --git a/metadata/md5-cache/dev-python/twisted-21.2.0 b/metadata/md5-cache/dev-python/twisted-21.2.0
index b60c7ca7f6fd..010b5d264077 100644
--- a/metadata/md5-cache/dev-python/twisted-21.2.0
+++ b/metadata/md5-cache/dev-python/twisted-21.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
 IUSE=conch crypt http2 serial test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/automat-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/constantly-15.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hyperlink-17.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/incremental-16.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] conch? ( >=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-0.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/hyper-h2-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/priority-1.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/priority-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.2.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=ed526d6df0d1cddaca32a59be0a707ae
+_md5_=180f99eed73ba74f311a56784fcafab0
diff --git a/metadata/md5-cache/dev-python/unittest-or-fail-0 b/metadata/md5-cache/dev-python/unittest-or-fail-0
new file mode 100644
index 000000000000..da6b51a2c87e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unittest-or-fail-0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run unittests or fail if no tests were found
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/unittest-or-fail/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unittest-or-fail/archive/v0.tar.gz -> unittest-or-fail-0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d7d3995811e68b8cf6810aff4f53a47f
diff --git a/metadata/md5-cache/dev-python/unittest-or-fail-1 b/metadata/md5-cache/dev-python/unittest-or-fail-1
new file mode 100644
index 000000000000..a00e1ac3f3f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unittest-or-fail-1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run unittests or fail if no tests were found
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/unittest-or-fail/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unittest-or-fail/archive/v1.tar.gz -> unittest-or-fail-1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d7d3995811e68b8cf6810aff4f53a47f
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2 b/metadata/md5-cache/dev-python/urllib3-1.26.2
deleted file mode 100644
index 17441afaf0e3..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1d9a067a6afb4ec2edb380480bca4188
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r1 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
deleted file mode 100644
index 8648524297d0..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9caf734fd0e7edf9adf717c42e286f3e
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r2 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r2
deleted file mode 100644
index 38585e2c7fa9..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=62dbe0b8334d39586370524e46480f44
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r3 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r3
deleted file mode 100644
index c88422a89b53..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e97964d8d13c18ea482a53d0f83b60f3
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.3-r1 b/metadata/md5-cache/dev-python/urllib3-1.26.3-r1
index f26f717d87cd..4e5e58b5dffd 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.3-r1
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.3.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b3b7a397587905bc9a54d046efb4ddff
+_md5_=873c4a9333a2446597956c11b0d1b2c0
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.4 b/metadata/md5-cache/dev-python/urllib3-1.26.4
new file mode 100644
index 000000000000..4759a122e566
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=7
+HOMEPAGE=https://github.com/urllib3/urllib3
+IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b561bc059bd5ee7a4732c6f0d28b5c72
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.4.3 b/metadata/md5-cache/dev-python/virtualenv-20.4.3
new file mode 100644
index 000000000000..b3fad1a78c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.4.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_python3_7? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/towncrier[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/towncrier[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/towncrier[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/towncrier[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=7
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.4.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b121019ea24b191588c2ea6d0b27fe09
diff --git a/metadata/md5-cache/dev-python/watchdog-2.0.0 b/metadata/md5-cache/dev-python/watchdog-2.0.0
deleted file mode 100644
index b6776a384f35..000000000000
--- a/metadata/md5-cache/dev-python/watchdog-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argh[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-timeout-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Python API and shell utilities to monitor file system events
-EAPI=7
-HOMEPAGE=https://github.com/gorakhargosh/watchdog
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argh[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.0.0.tar.gz -> watchdog-2.0.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdf8d409d4eb96772c3029403dd4f787
diff --git a/metadata/md5-cache/dev-python/watchdog-2.0.1 b/metadata/md5-cache/dev-python/watchdog-2.0.1
index 9a936a65fa1a..c90ad2286f5e 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.0.1
+++ b/metadata/md5-cache/dev-python/watchdog-2.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=7
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argh[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.0.1.tar.gz -> watchdog-2.0.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdf8d409d4eb96772c3029403dd4f787
+_md5_=3c2efe14f6560d1d3be7f4e6f9be4917
diff --git a/metadata/md5-cache/dev-python/wcmatch-7.1 b/metadata/md5-cache/dev-python/wcmatch-7.1
deleted file mode 100644
index 98cd342402d7..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch https://pypi.org/project/wcmatch
-IUSE=test python_targets_python3_7 python_targets_python3_8 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/7.1.tar.gz -> wcmatch-7.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f813f2ad876347a085b5f28ffd9cf624
diff --git a/metadata/md5-cache/dev-python/wcmatch-7.2 b/metadata/md5-cache/dev-python/wcmatch-7.2
deleted file mode 100644
index c8ad40fd7e9b..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/7.2.tar.gz -> wcmatch-7.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.0 b/metadata/md5-cache/dev-python/wcmatch-8.0
deleted file mode 100644
index 1e3284d7646c..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.0.tar.gz -> wcmatch-8.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.0.1 b/metadata/md5-cache/dev-python/wcmatch-8.0.1
deleted file mode 100644
index 6aa1f4abe179..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.0.1.tar.gz -> wcmatch-8.0.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.1 b/metadata/md5-cache/dev-python/wcmatch-8.1
deleted file mode 100644
index 6025dc370423..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.1.tar.gz -> wcmatch-8.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.1.1 b/metadata/md5-cache/dev-python/wcmatch-8.1.1
deleted file mode 100644
index 0022ff4af247..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/bracex-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.1.1.tar.gz -> wcmatch-8.1.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	docs	5a0235b1127b58fd6bf54a12c8d21657	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/xlrd-2.0.1 b/metadata/md5-cache/dev-python/xlrd-2.0.1
new file mode 100644
index 000000000000..9b8a6f5a4436
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlrd-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library to extract data from Microsoft Excel spreadsheets
+EAPI=7
+HOMEPAGE=https://www.python-excel.org/ https://github.com/python-excel/xlrd/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-excel/xlrd/archive/2.0.1.tar.gz -> xlrd-2.0.1.gh.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e889aa31d1a6b79f0d05db4a53009aef
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.4.2 b/metadata/md5-cache/dev-python/xmlschema-1.4.2
deleted file mode 100644
index dbd64d4d273e..000000000000
--- a/metadata/md5-cache/dev-python/xmlschema-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/elementpath-2.1.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An XML Schema validator and decoder
-EAPI=7
-HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/elementpath-2.1.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.4.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a5881bd1b83fa053423eb44b6bf0dbe5
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.5.1 b/metadata/md5-cache/dev-python/xmlschema-1.5.1
index 369ce2b3b665..f3e591eb4077 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.5.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.1.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.5.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=09f1bc007bf5068ec6891375d4ad1df4
+_md5_=6605ac296f5ac17619d1795fb1028edc
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.5.3 b/metadata/md5-cache/dev-python/xmlschema-1.5.3
new file mode 100644
index 000000000000..20770c359654
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlschema-1.5.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/elementpath-2.1.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An XML Schema validator and decoder
+EAPI=7
+HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/elementpath-2.1.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.5.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=09f1bc007bf5068ec6891375d4ad1df4
diff --git a/metadata/md5-cache/dev-python/yapf-0.31.0 b/metadata/md5-cache/dev-python/yapf-0.31.0
new file mode 100644
index 000000000000..901e4126f686
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yapf-0.31.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A formatter for Python files
+EAPI=7
+HOMEPAGE=https://github.com/google/yapf
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/yapf/archive/v0.31.0.tar.gz -> yapf-0.31.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4c4648573015f9dc7a4bf8518f3d60ab
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.3.0 b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
new file mode 100644
index 000000000000..ec84e823cc27
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Zope testrunner script
+EAPI=7
+HOMEPAGE=https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b9f0448919f6de584e34cb0802210cb0
diff --git a/metadata/md5-cache/dev-python/zstandard-0.15.0 b/metadata/md5-cache/dev-python/zstandard-0.15.0
index 7407eab285a1..ea8165145587 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.15.0
+++ b/metadata/md5-cache/dev-python/zstandard-0.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=Zstandard Bindings for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-python/cffi-1.14.0-r2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.15.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=449b77ea65c220a668e3063acd2eed04
+_md5_=535918774da0df174a7ec451c1317f78
diff --git a/metadata/md5-cache/dev-python/zstandard-0.15.2-r1 b/metadata/md5-cache/dev-python/zstandard-0.15.2-r1
index b9a5ff350b6f..ee46e4fad1a6 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.15.2-r1
+++ b/metadata/md5-cache/dev-python/zstandard-0.15.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.15.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da1c4e39c906d2bb1897217aa7c8b795
+_md5_=28b311dada9e9d48dc6944e01f025b25
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 7898e8d32076..a19fe7369c19 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/aws-eventstream-1.1.1 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
new file mode 100644
index 000000000000..e26ad310d552
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_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? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Amazon Web Services event stream library
+EAPI=7
+HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+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=1
+SRC_URI=https://rubygems.org/gems/aws-eventstream-1.1.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6687f58965edb68cce41fa749d6da514
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
new file mode 100644
index 000000000000..e324b8cae57e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/aws-eventstream-1.0.2: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? ( 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? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Amazon Web Services Signature Version 4 signing library
+EAPI=7
+HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/aws-eventstream-1.0.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/aws-eventstream-1.0.2: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 )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6418bbff212124431dcf3f780f439b90
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
new file mode 100644
index 000000000000..6bd7aa36372e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Base class with almost all of the methods from Object and Kernel being removed
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/blankslate
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+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/blankslate-3.1.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dde9543459a96ff5293ce7d2df9a0455
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.15 b/metadata/md5-cache/dev-ruby/bundler-2.2.15
new file mode 100644
index 000000000000..21bbef3e6026
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.15
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) ) 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? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=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
+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.15.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20da7c0bf440cd7987dda03753c57a93
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 3f90a50ab611..ce320c40fb1a 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=Pure Ruby library that can read and write PNG images
 EAPI=7
 HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c6cfd242c4a76075f2da9433013ddea4
+_md5_=d1e0ca7ab7fcd96eb88ebed32cddd37a
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 c65c666c89af..972a89cc955f 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=455455091fb07c5ab38df5de7145afe1
+_md5_=9477d6776214fac88a91e2ea6bb32725
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.0 b/metadata/md5-cache/dev-ruby/ffi-1.15.0
index cbf7d9982532..f895856b9b79 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.0
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) 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(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libffi ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=dev-libs/libffi 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=Ruby extension for programmatically loading dynamic libraries
 EAPI=7
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=dev-libs/libffi:0= ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=dev-libs/libffi: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=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.0.tar.gz -> ffi-git-1.15.0.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2f35c5069eb4531fdd4c0afbb9cbae65
+_md5_=8b7c68682782f4cd0d763e26c41f0159
diff --git a/metadata/md5-cache/dev-ruby/gist-6.0.0 b/metadata/md5-cache/dev-ruby/gist-6.0.0
new file mode 100644
index 000000000000..7e48e9ceaf0d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/webmock[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Potentially the best command line gister.
+EAPI=7
+HOMEPAGE=https://github.com/defunkt/gist
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=!dev-python/txgithub 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/gist-6.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=17cd5729e0b6605d15b1aea522d0e655
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 e89121cd3c7b..393059ba8439 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Reference models by URI
 EAPI=7
 HOMEPAGE=https://github.com/rails/globalid
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fad0dd0be0637ad1792b977e4e18aab7
+_md5_=dab3745abc0af58a9b4275fb6b95f2b9
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.11.4 b/metadata/md5-cache/dev-ruby/google-protobuf-3.11.4
deleted file mode 100644
index 39411d83e1c9..000000000000
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.11.4
+++ /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_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=test? ( >=dev-libs/protobuf-3.7.0 ) 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=Protocol Buffers are Google's data interchange format
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz -> google-protobuf-3.11.4-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=38e21e37356cf0c58f98d0f44bf63da3
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
new file mode 100644
index 000000000000..02a01a3b9fb6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_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=test? ( >=dev-libs/protobuf-3.12.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(-)] )
+DESCRIPTION=Protocol Buffers are Google's data interchange format
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=BSD
+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/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> google-protobuf-3.14.0-ruby.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f495d8b4807204618d2a02873b95d8b8
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.12.1 b/metadata/md5-cache/dev-ruby/gruff-0.12.1
new file mode 100644
index 000000000000..0c5a1a815e7d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gruff-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/histogram[ruby_targets_ruby25(-)] dev-ruby/rmagick:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Beautiful graphs for one or multiple datasets
+EAPI=7
+HOMEPAGE=https://github.com/topfunky/gruff
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby25? ( dev-ruby/histogram[ruby_targets_ruby25(-)] dev-ruby/rmagick:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ruby_targets_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/topfunky/gruff/archive/v0.12.1.tar.gz -> gruff-0.12.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=033ef3e4b78af44d14faffb397e3e46f
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5
deleted file mode 100644
index a62eacf45711..000000000000
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Internal HashiCorp service to check version information
-EAPI=6
-HOMEPAGE=https://www.hashicorp.com
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-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=0
-SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=29694af878df2d01e5b10d9f0e8161ff
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
new file mode 100644
index 000000000000..9c314b42237f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Internal HashiCorp service to check version information
+EAPI=7
+HOMEPAGE=https://www.hashicorp.com
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+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
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8d7f13eb2465ba7a3b6ccbc0fbb2eff9
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.7.0 b/metadata/md5-cache/dev-ruby/hiera-3.7.0
new file mode 100644
index 000000000000..8276fdc1a5a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hiera-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/deep_merge[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A simple pluggable Hierarchical Database
+EAPI=7
+HOMEPAGE=https://docs.puppet.com/hiera/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/deep_merge[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hiera-3.7.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1065aeb9fc98c081759e2782b673ee7f
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
new file mode 100644
index 000000000000..042cdf8e8283
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/blankslate[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/blankslate[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/blankslate[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/blankslate[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/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_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=Dynamic inspection of the hierarchy of method definitions on a Ruby object
+EAPI=7
+HOMEPAGE=http://jamesmead.org/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/metaclass-0.0.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=0
+SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4e7b94d2b0cf1d68db8b4eb75a4bd018
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.0 b/metadata/md5-cache/dev-ruby/kramdown-2.3.0
deleted file mode 100644
index 8d63c52559df..000000000000
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( >=dev-ruby/minitest-5.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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/tidy-html5 ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
-EAPI=7
-HOMEPAGE=https://kramdown.gettalong.org/
-IUSE=latex test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2: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=2
-SRC_URI=https://rubygems.org/gems/kramdown-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2c445ca5394954edf805b10524e9a23b
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.1 b/metadata/md5-cache/dev-ruby/kramdown-2.3.1
new file mode 100644
index 000000000000..cad9055d0e6f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( >=dev-ruby/minitest-5.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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/tidy-html5 ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
+EAPI=7
+HOMEPAGE=https://kramdown.gettalong.org/
+IUSE=latex test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
+LICENSE=MIT
+RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2: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=2
+SRC_URI=https://rubygems.org/gems/kramdown-2.3.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_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 faf69f82dcdd..b49fd7761387 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
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/kramdown[ruby_targets_ruby25(-),latex] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/kramdown[ruby_targets_ruby26(-),latex] ) ) 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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/kramdown:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/kramdown[ruby_targets_ruby25(-),latex] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/kramdown[ruby_targets_ruby26(-),latex] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/kramdown[ruby_targets_ruby27(-),latex] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=A kramdown parser for the GFM dialect of Markdown
 EAPI=7
 HOMEPAGE=https://github.com/kramdown/parser-gfm
-IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown: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 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/kramdown:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=207677e50874b43eb9292cb0858a73a3
+_md5_=207e8284c07618b166a0b03f673b4461
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.0 b/metadata/md5-cache/dev-ruby/liquid-5.0.0
new file mode 100644
index 000000000000..ec6eae03763e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/liquid-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Template engine for Ruby
+EAPI=7
+HOMEPAGE=https://shopify.github.io/liquid/
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.0.tar.gz -> liquid-5.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bc41794c8b95f4be08385fa419e85cdd
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.13-r1 b/metadata/md5-cache/dev-ruby/logue-1.0.13-r1
deleted file mode 100644
index 589de8060a72..000000000000
--- a/metadata/md5-cache/dev-ruby/logue-1.0.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/paramesan[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) )
-DESCRIPTION=A module that adds logging/trace functionality
-EAPI=6
-HOMEPAGE=https://github.com/jpace/logue
-IUSE=test ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jpace/logue/archive/v1.0.13.tar.gz -> logue-git-1.0.13.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98660832e973fbb87bac94bd2b7e706d
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.16 b/metadata/md5-cache/dev-ruby/logue-1.0.16
deleted file mode 100644
index 807f388d0266..000000000000
--- a/metadata/md5-cache/dev-ruby/logue-1.0.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rainbow:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/paramesan[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/paramesan[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=A module that adds logging/trace functionality
-EAPI=6
-HOMEPAGE=https://github.com/jpace/logue
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rainbow: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=0
-SRC_URI=https://github.com/jpace/logue/archive/v1.0.16.tar.gz -> logue-git-1.0.16.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b841b76fecc5cfe4fe270d037a13381e
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
index 19985404f4a6..49278e5c49d2 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -4,7 +4,7 @@ DESCRIPTION=A module that adds logging/trace functionality
 EAPI=6
 HOMEPAGE=https://github.com/jpace/logue
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rainbow:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rainbow: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 )
@@ -12,4 +12,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=875a0ce10a6e2ca804b8054b2a3b1650
+_md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.12.0 b/metadata/md5-cache/dev-ruby/mocha-1.12.0
index 0524fa1fd990..8df7cb183bf4 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.12.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] dev-ruby/introspection[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] dev-ruby/introspection[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] dev-ruby/introspection[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] dev-ruby/introspection[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] dev-ruby/introspection[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] dev-ruby/introspection[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] dev-ruby/introspection[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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=7
 HOMEPAGE=https://mocha.jamesmead.org/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+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.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.12.0.tar.gz -> mocha-1.12.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4ebf55972f925849f429d02dbb283f26
+_md5_=b1e47a636101f5ba0636fe874ad03c8c
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5
new file mode 100644
index 000000000000..4e387eca458c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8.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? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A Nokogiri interface to the Gumbo HTML5 parser
+EAPI=7
+HOMEPAGE=https://github.com/rubys/nokogumbo
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8.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? ( 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/rubys/nokogumbo/archive/v2.0.5.tar.gz -> nokogumbo-2.0.5.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f11fb18eef67b8743c5214b51fc895e1
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
new file mode 100644
index 000000000000..2650ac4a9fcf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby25(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby25(-)] dev-ruby/jwt:2[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby25(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby25(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby25(-)] <dev-ruby/rack-3:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby26(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby26(-)] dev-ruby/jwt:2[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby26(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
+EAPI=7
+HOMEPAGE=https://github.com/intridea/oauth2
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby25(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby25(-)] dev-ruby/jwt:2[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby25(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby25(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby25(-)] <dev-ruby/rack-3:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby26(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby26(-)] dev-ruby/jwt:2[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby26(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=61e176c2ea92f54c8a1bf6a69e326aa6
diff --git a/metadata/md5-cache/dev-ruby/ox-2.13.4 b/metadata/md5-cache/dev-ruby/ox-2.13.4
deleted file mode 100644
index be7c7f9c4abe..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.13.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A fast XML parser and Object marshaller
-EAPI=7
-HOMEPAGE=https://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-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=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.13.4.tar.gz -> ox-2.13.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e761160a9572ad2e26cb4649ec0eed74
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.0 b/metadata/md5-cache/dev-ruby/ox-2.14.0
deleted file mode 100644
index 293533cb8efb..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A fast XML parser and Object marshaller
-EAPI=7
-HOMEPAGE=https://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-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=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.14.0.tar.gz -> ox-2.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b16d009983335dfe7b626a0a1b5d17dd
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.4 b/metadata/md5-cache/dev-ruby/ox-2.14.4
new file mode 100644
index 000000000000..1ca03d495ad5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.4
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A fast XML parser and Object marshaller
+EAPI=7
+HOMEPAGE=https://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+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/ohler55/ox/archive/v2.14.4.tar.gz -> ox-2.14.4.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=68660ad78d203662e5b6a5566cf63c02
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index bd20eab31cc3..2a6c1dfc3d2b 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Parameterized tests in Ruby
 EAPI=7
 HOMEPAGE=https://github.com/jpace/paramesan
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7f3c6e8007e8056776d0fad70fbf6057
+_md5_=eb1c3b74530dc318685479a20bfceba5
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 824f476b8b3e..0d6d027cca1b 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha: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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/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=Parse and decompose a domain name into top level domain, domain and subdomains
 EAPI=7
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.6.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9bd3e8cc247eed7b03e98a8a4b1a8a71
+_md5_=9fa0ff7ab77feba8952feede28c70a1e
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.2.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.2.0
new file mode 100644
index 000000000000..bfc5068330bc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Library needed to connect puppet to puppetdb
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_7.2.0-1stretch_all.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
+_md5_=ccb1c2b9f7f4eb8aa4cbf71b006b0ce2
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 9e649710f7fe..40f8bcd28351 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] ) ) 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(-)] !!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/rake[ruby_targets_ruby25(-)] ) 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(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] dev-ruby/rspec:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) 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=Provide a standard and simplified way to build and package Ruby extensions
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) 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/rake[ruby_targets_ruby25(-)] ) 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(-)] ) 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/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1abeac14d6cb42ba7887a0d394b58e23
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=30802dcc60af54d998e12dcba08fd8bf
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
new file mode 100644
index 000000000000..c05411953187
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/chunky_png:0[ruby_targets_ruby25(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/chunky_png:0[ruby_targets_ruby26(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/chunky_png:0[ruby_targets_ruby27(-)] >=dev-ruby/rqrcode_core-0.2: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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Library for encoding QR Codes
+EAPI=7
+HOMEPAGE=https://whomwah.github.com/rqrcode/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/chunky_png:0[ruby_targets_ruby25(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/chunky_png:0[ruby_targets_ruby26(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/chunky_png:0[ruby_targets_ruby27(-)] >=dev-ruby/rqrcode_core-0.2: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=0
+SRC_URI=https://github.com/whomwah/rqrcode/archive/v1.2.0.tar.gz -> rqrcode-1.2.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=91dfdeb973b5c476274fd7e1254759ca
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 fe083a794d2d..5afaffb6ef49 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby30(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-its
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby30(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.3.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=60e2cf2270f3376b79bb52de03152e03
+_md5_=bd5d29cf04ded072f8c8a483e2e8c79c
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
new file mode 100644
index 000000000000..b1c8ff46b875
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby25(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby25(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby25(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby25(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby25(-)] dev-ruby/railties:5.2[ruby_targets_ruby25(-)] ) >=dev-ruby/rspec-3.10:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby26(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby26(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby26(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/railties:5.2[ruby_targets_ruby26(-)] ) >=dev-ruby/rspec-3.10:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby25(-)] >=dev-ruby/ammeter-1.1.5[ruby_targets_ruby25(-)] ~dev-ruby/rspec-rails-4.1.2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby26(-)] >=dev-ruby/ammeter-1.1.5[ruby_targets_ruby26(-)] ~dev-ruby/rspec-rails-4.1.2[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:6.0[ruby_targets_ruby25(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby25(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby25(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby25(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby25(-)] dev-ruby/railties:5.2[ruby_targets_ruby25(-)] ) >=dev-ruby/rspec-3.10:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby26(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby26(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby26(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/railties:5.2[ruby_targets_ruby26(-)] ) >=dev-ruby/rspec-3.10: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.1.2.tar.gz -> rspec-rails-4.1.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=baff7d4b7ccd238bfed915c819cf6ff8
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-atk-3.3.2
deleted file mode 100644
index b715545a54df..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/atk test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Atk bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/atk ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=130d2effceb4f4d62f7e68e6be775c3c
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6
deleted file mode 100644
index 235fc5ac8966..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/atk test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Atk bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/atk ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e2d33ca12ffe7932ac9111c868b53e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-atk-3.3.7
deleted file mode 100644
index bf604cf0f759..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/atk test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Atk bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/atk ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e2d33ca12ffe7932ac9111c868b53e2
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 26f07c40d5ea..bb850846decf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Atk bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/atk[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0fcde08d15ac9bb0acf5e887f97a0fe1
+_md5_=0e45c1691b2fc39dd6d8e50c311304cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.2
deleted file mode 100644
index 3ca8b20ce42e..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby cairo-gobject bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/cairo ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdbf5ef1c3f0c7805eb60c3434bcacb9
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6
deleted file mode 100644
index 142d65b09337..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby cairo-gobject bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/cairo ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=518a3cddf812629b9910063447b2f6e5
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7
deleted file mode 100644
index 77a97de359c9..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby cairo-gobject bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/cairo ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.3.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=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c29f38d6537f1bc06f4e59c654d365a
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 ec9ab13f576c..02789a7ba8a6 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby cairo-gobject bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/cairo ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=64f3c7b5c4d2bacf51ef62e728a94b55
+_md5_=0b3a3bfde1b88e00c32462f3c2b5f013
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.2
deleted file mode 100644
index ec539ac3e247..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=e459cac84e7dcb9645b4b1daf8bc3328
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6
deleted file mode 100644
index b785a6dcf0c6..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=003bf8366491f448fe59e9526a052822
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7
deleted file mode 100644
index ed84b95f34a0..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=003bf8366491f448fe59e9526a052822
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 efc0f2d0003c..2c2e0b306ff6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Clutter bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/clutter[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-pango-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=430905a85e0ac827969f9efecf0577ee
+_md5_=9219ec1a7dc03fde5ada071732075907
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.2
deleted file mode 100644
index ac623936c3bc..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby binding of GDK specific API of Clutter
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a82532948af4ba2928ff9af95904ea4a
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6
deleted file mode 100644
index d2e0063a1490..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby binding of GDK specific API of Clutter
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c47be4fcd19d73e3d46fb4095ffbea6
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7
deleted file mode 100644
index 470fd3855e4b..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby binding of GDK specific API of Clutter
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c47be4fcd19d73e3d46fb4095ffbea6
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 a6b166497147..5146fec05ef6 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby binding of GDK specific API of Clutter
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/clutter[gtk,introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ea8924d8deba4b98b8ccec7513bc4364
+_md5_=6a3add72a981d0c7c27edd7711597709
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.2
deleted file mode 100644
index cd3e30428cfb..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=ede9ee09b0f1d64b3a3b8f0e43f40045
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6
deleted file mode 100644
index 9baf6c3c76e4..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=cf40bf7df2a51db7f566a49b70887307
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7
deleted file mode 100644
index 5b3697c3afbf..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=cf40bf7df2a51db7f566a49b70887307
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 f9cd9e656bb1..fabc9c085434 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Clutter bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/clutter-gst:*[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gstreamer-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=2fec224b642d6b62e6cc1d0964de31e9
+_md5_=d56a4875b3b2cf439dfeeee122300c76
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.2
deleted file mode 100644
index afcf49814dbd..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter-GTK bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=2c3caebf8e8c876297594e73926d317d
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6
deleted file mode 100644
index 1a93c1ae3aca..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter-GTK bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=a739bcc21280ce4d4a4723036a9742c1
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7
deleted file mode 100644
index d0218f9ea061..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Clutter-GTK bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=a739bcc21280ce4d4a4723036a9742c1
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 cf7118dce81f..e0169415a066 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Clutter-GTK bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/clutter-gtk[gtk,introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=6cd04c0e563ea609b1ded82b94d642c0
+_md5_=7e8e1e9562bccfe51d2c7be4abb02a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
deleted file mode 100644
index 696ecf316ed2..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/magic[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/magic[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? ( 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 library to parse ATOM/RSS feeds
-EAPI=5
-HOMEPAGE=https://github.com/feed2imap/ruby-feedparser
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/magic[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/feed2imap/ruby-feedparser/archive/v0.9.4.tar.gz -> ruby-feedparser-0.9.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=751a220a6221ae2d649b2554a7d69932
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.6 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.6
deleted file mode 100644
index e8bf3d900fc8..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/magic[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/magic[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/magic[ruby_targets_ruby26(-)] test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/magic[ruby_targets_ruby27(-)] test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Ruby library to parse ATOM/RSS feeds
-EAPI=7
-HOMEPAGE=https://github.com/feed2imap/ruby-feedparser
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/magic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/magic[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/magic[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/feed2imap/ruby-feedparser/archive/v0.9.6.tar.gz -> ruby-feedparser-0.9.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=264e018e9ec1a89eab56c848ea0b849c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.2
deleted file mode 100644
index 02491325cec7..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GDK-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=3c63ef61abc7d8a60ae293fe3edd3b10
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6
deleted file mode 100644
index 13e515a0e99a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GDK-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=73c9b2b83532cecbe1f82f7ecf8658b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.7
deleted file mode 100644
index dcf6fdd45e51..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GDK-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=73c9b2b83532cecbe1f82f7ecf8658b9
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 f0ed4d05a6a1..c59b38c504af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GDK-3.x bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:3[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-pango-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=8b0b2c1b6bdb2ec81b7396f894a7ac41
+_md5_=26fe993c21f8a7b71c848ce13fac91b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.2
deleted file mode 100644
index 5d65600dd382..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GdkPixbuf2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f51cc0dee10e1df3e6807c9665a53d06
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6
deleted file mode 100644
index 7a84974af787..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GdkPixbuf2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9913db81ac37b2033bd1286d60812b58
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.7
deleted file mode 100644
index 33bd70418fc2..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GdkPixbuf2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9913db81ac37b2033bd1286d60812b58
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 710868da30b3..b3c053fc75f7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gdk-pixbuf[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gio2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f43045e03710760c52b07caf4393f9ad
+_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 a71402edfb27..01f33c203f22 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GEGL bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/gegl:0.4[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gio2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1b60a3c7a192a092d4a8219d51f71c90
+_md5_=436b0c157ef691cb85f11ff891ac87c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.2
deleted file mode 100644
index fa7b272a5d8d..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby binding of gio-2
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ba37a147531e1098761cb351fe9dfe9d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6
deleted file mode 100644
index 70fcc6df8965..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby binding of gio-2
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8beea3539e004cd64e4e0df2b2d16b67
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7
deleted file mode 100644
index 988f7913a19a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby binding of gio-2
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=739ba12c85bc765456fde2d09a7125b4
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 3871106be336..4685682c6e5a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby binding of gio-2
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b7fe01573b18cc72852467b206a9ad92
+_md5_=8eb4e62efd2009bc97bc6a512db183a1
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.2
deleted file mode 100644
index b2f37591f247..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Glib2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0383bb15be3f72be124986b7b746b9cf
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6
deleted file mode 100644
index cf3a454918ed..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Glib2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2fd8b12a3a2daaa597ca6b5f4a7addf4
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7
deleted file mode 100644
index 0c9e0a9fbf8d..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby Glib2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) 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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c912662232d734a89613dfa3d22124d6
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 d857e3a1027b..4878ce41ff27 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Glib2 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3920354cc7e3262f2f05afacac2c0010
+_md5_=b9c101f1dd09980e0b59f835a76360cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.2
deleted file mode 100644
index 3ed075979345..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Ruby Gnome2 bindings
-EAPI=6
-HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b4fc01a7b305af61beef4bfd065f1f9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6
deleted file mode 100644
index a50289bb0a08..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Ruby Gnome2 bindings
-EAPI=6
-HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7ed9679285d99c67a742069ab50847b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7
deleted file mode 100644
index 3ba317223604..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Ruby Gnome2 bindings
-EAPI=6
-HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7ed9679285d99c67a742069ab50847b9
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 dc42a3555aec..2aa51cdab466 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
@@ -5,11 +5,11 @@ DESCRIPTION=Ruby Gnome2 bindings
 EAPI=7
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gdk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gstreamer-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-clutter-gtk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gegl-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gnumeric-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-goffice-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gstreamer-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview3-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtksourceview4-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-libsecret-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-poppler-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-rsvg-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-vte3-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-webkit2-gtk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-wnck3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gdk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gstreamer-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-clutter-gtk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gegl-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gnumeric-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-goffice-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gstreamer-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview3-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtksourceview4-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-libsecret-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-poppler-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-rsvg-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-vte3-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-webkit2-gtk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-wnck3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-clutter-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-clutter-gdk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-clutter-gstreamer-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-clutter-gtk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gegl-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gnumeric-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-goffice-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gstreamer-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtksourceview-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtksourceview3-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtksourceview4-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-libsecret-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-poppler-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-rsvg-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-vte-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-vte3-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-webkit2-gtk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-wnck3-3.4.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 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ab1c0ed49ead3797cc75b2ea0511ee4
+_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 9bd97d837f8c..1de0064af5d2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Gnumeric bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-office/gnumeric[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-goffice-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-goffice-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-goffice-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=562b6b1e0b1de027914cbeb7ea801db8
+_md5_=0f4b13635743dfd7029cf43e979fe374
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.2
deleted file mode 100644
index c053415a780a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GObjectIntrospection bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=677ae6124e4647be82dcfbdae844cda8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6
deleted file mode 100644
index a9e446d29ab7..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GObjectIntrospection bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=19bda9475408741c79d558e8c89e421a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7
deleted file mode 100644
index 6d7359be3eb2..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby GObjectIntrospection bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.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=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=39a2316cdf0ea834420d668d584407eb
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 477fae694580..9b26251722ea 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GObjectIntrospection bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib dev-libs/gobject-introspection ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b59147f4f57d1181cf4f17b129cffb7
+_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 8747dfe70506..3a9e16498e89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GOffice bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/goffice[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gsf-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=a83dd3ad5cae6831813f4f42b2b7b5fb
+_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 5bfeed6c3f30..ae5cdd4a972f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GSF bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=gnome-extra/libgsf[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gio2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2762333b0da7c49fc401b92173aff922
+_md5_=0d73b8eac709094cea24a7c1b26e5b7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.2
deleted file mode 100644
index 3602d3792517..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GStreamer bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=8098a76c21c528e3e439152355848d0f
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6
deleted file mode 100644
index e734dba78af4..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GStreamer bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=9180be6adf41a3c0393d0666f7354834
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7
deleted file mode 100644
index fc2429d34a74..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby GStreamer bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=9180be6adf41a3c0393d0666f7354834
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 0a393b6cc5e1..d06eb9e5fc4a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GStreamer bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=d4a6bf1d8b43fe476fac7b2a5d14735a
+_md5_=3fc516fb7af14974e87d625ddcf5d5d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.2
deleted file mode 100644
index 6d586cba08ad..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=710a27a07b40717cbc65ddf2bc6683f3
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6
deleted file mode 100644
index 1e320c216e32..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=6b0cae9458a6b1181c15ef193bfddcb2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7
deleted file mode 100644
index 4ed6de1e4b1c..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk2 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=6b0cae9458a6b1181c15ef193bfddcb2
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 c94a9e9e8018..e6376bfc061d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Gtk2 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:2[introspection] x11-libs/libX11 x11-libs/pango[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-pango-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=bbd4245bde7d22f33f9942fcf20719d4
+_md5_=9ba1132313b38ce5b122c503a091ee13
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.2
deleted file mode 100644
index 038fe4b5664b..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk3 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=c1a0b768307ec702f8bea89de6c8b6e3
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6
deleted file mode 100644
index 57ce2b3fa408..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk3 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=4c002f74c99be653e7a46a347a51ee82
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7
deleted file mode 100644
index 9894c6838316..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Gtk3 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=4c002f74c99be653e7a46a347a51ee82
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 ed6ac41a0564..9b8746effd1a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Gtk3 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib dev-libs/gobject-introspection x11-libs/gtk+:3[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-pango-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdk3-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-pango-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=19dd87d58ff9d242f09dc6fc939b4e18
+_md5_=646a0bee3ee7e9ca46d0cc690274a57c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.2
deleted file mode 100644
index b1e4197b137b..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for gtksourceview
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=1cd3c92c1dedca6c50e752c0d8631dda
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6
deleted file mode 100644
index c6d371d7ecaf..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for gtksourceview
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=edb1c25365af440f89b5504b3e414cee
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7
deleted file mode 100644
index 064f4e286cd1..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for gtksourceview
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=edb1c25365af440f89b5504b3e414cee
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 ecacb72d4a74..767fb3afd54e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby bindings for gtksourceview
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=9707ab4b120c26b4bb2aec987f17283c
+_md5_=e69f11f409daf1421dfbc8e1b29e799a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.2
deleted file mode 100644
index a02a9297efd3..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby gtksourceview-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=c2043355bf8326628ea14079d73e92ae
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6
deleted file mode 100644
index dfaa2a7513bb..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby gtksourceview-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=8c4797312b0d5bf4e7bf69ecc6c255e0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7
deleted file mode 100644
index 2b3ea6baf122..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby gtksourceview-3.x bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=8c4797312b0d5bf4e7bf69ecc6c255e0
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 dc2401693a48..68b93b47a362 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby gtksourceview-3.x bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtksourceview:3.0[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=5804d65fd1188295f0d31028e6c4b150
+_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 643d827ea672..1235d53873dc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby GtkSourceView4 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtksourceview:4[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=2f9e7322fc3b8b43286bca98b17b85b0
+_md5_=922d5dedca169523ffca11a6014372e2
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 346797428974..c039e0c226a6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby libsecret bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-crypt/libsecret[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gobject-introspection-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9daec206140e47cf2f0198c73c5758da
+_md5_=2ba249c61dc417b9b610b28b0b245856
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-pango-3.3.2
deleted file mode 100644
index 0d440e1def91..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Pango bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1e23f36df5babd31d43154131d565d62
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6
deleted file mode 100644
index 12094da1956f..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Pango bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=156aa4d65346a24c31e90e18c276ea0b
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-pango-3.3.7
deleted file mode 100644
index 4ce3c6febfe6..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby Pango bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=156aa4d65346a24c31e90e18c276ea0b
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 e1e999e0bb0c..e10d964991b6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby Pango bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib >=x11-libs/pango-1.2.1[introspection] ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c55de81cb84563f1d7a78fde5abe798
+_md5_=c72e6ff3667b730995d8ba7c53be19a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.2
deleted file mode 100644
index d2faa16b8533..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby poppler-glib bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=eef242423316592755c4bd8e3bf9eb7f
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6
deleted file mode 100644
index 452198613edb..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby poppler-glib bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3e938548fc8a14a75ed77d48b7a9e234
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7
deleted file mode 100644
index 59c33f65e1ba..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby poppler-glib bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.3.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=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7234067e9e40947fbce9e0f9cffefd55
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 a676463bdf5c..9d1625fffdb2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby poppler-glib bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-text/poppler[cairo,introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a7b1c3478333886a9c17b1aa539fc44
+_md5_=01fc4d39a36ac4cc47169761f78cfaef
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.2
deleted file mode 100644
index 4e0aec9c9102..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for librsvg
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=905c7ba8032f16089a0f4a05a0b967be
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6
deleted file mode 100644
index c593bfcd2477..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for librsvg
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dec912750f6e3daf43b1f2dd0f67f1c8
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.7
deleted file mode 100644
index b8a5b0464fb3..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby bindings for librsvg
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dec912750f6e3daf43b1f2dd0f67f1c8
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 a0d7220a1cc6..0fa1ed0fa61b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby bindings for librsvg
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/librsvg-2.16.1[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gdkpixbuf2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=03cf2bad3bb16400edb74833e54ae0cd
+_md5_=37379b365a9c4867be765ee58b9889bc
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.2
deleted file mode 100644
index a5db9ed7dd84..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.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(-)] !!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(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby vte bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f98dbb7d4818aab33a5a1e944dcec8dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6
deleted file mode 100644
index 717ef7cfa876..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby vte bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.6[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e809cadedadfa7973e351308cbf6c018
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7
deleted file mode 100644
index a587dde736d8..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby vte bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.3.7[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=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e809cadedadfa7973e351308cbf6c018
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 f173bbfcd153..31d601ad01f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby vte bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib x11-libs/gtk+:2 x11-libs/pango >=x11-libs/vte-0.12.1:0 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk2-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk2-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44e47a554dde0cc849604daa7a29a8a3
+_md5_=5bad87adc3ccb63ac7f3d1546a7da8b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.2
deleted file mode 100644
index a0f8cecbb69a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.2[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby VTE bindings for use with GTK3
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=f6fe69da2272ca6552415f5804ec84f0
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6
deleted file mode 100644
index c4da10babb25..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby VTE bindings for use with GTK3
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=de4fe157d1dc4e74e2f91a467c5e873b
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7
deleted file mode 100644
index 828d5d211e91..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby VTE bindings for use with GTK3
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=de4fe157d1dc4e74e2f91a467c5e873b
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 aad7a6e9ac6e..1d0f9afe9ed5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby VTE bindings for use with GTK3
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/vte:2.91[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=b2c8d70b5bf812facf5855c4d932cff4
+_md5_=443bb38ac0e26a7f91261e55fa094e8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.2 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.2
deleted file mode 100644
index c94c795ad581..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.2[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=247adfa9622a856b4f1f71358dfb12fe
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6
deleted file mode 100644
index f7023c61e326..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.6[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=b5221885ef2d038a6626bf0e2baa78dc
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7
deleted file mode 100644
index 317f16b44c58..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.3.7[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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=b5221885ef2d038a6626bf0e2baa78dc
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 ca6e67243fec..eaaa6a1a888d 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
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/webkit-gtk:4[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gobject-introspection-3.4.3[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=908dde19ea3512e8583d50e1bef7f494
+_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 a5e08d5e406b..d814324d50e2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby libwnck 3 bindings
 EAPI=7
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/libwnck:3[introspection] ruby_targets_ruby25? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gtk3-3.4.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-gtk3-3.4.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 )
@@ -13,4 +13,4 @@ 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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=54bad53b5fd00b3fda9364ccefef8fca
+_md5_=aaae1c7c85e4fefb9b4b610bb22961af
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
new file mode 100644
index 000000000000..2d970ea5472d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/activejob[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/activejob[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/activejob[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Drop-in replacement for the standard Logger, that logs to the syslog
+EAPI=7
+HOMEPAGE=https://github.com/crohr/syslogger
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e6aca22828496cf7f8c6c1c0e32a359f
diff --git a/metadata/md5-cache/dev-ruby/thor-1.1.0 b/metadata/md5-cache/dev-ruby/thor-1.1.0
new file mode 100644
index 000000000000..b38929b6707e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/thor-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/childlabor[ruby_targets_ruby25(-)] dev-ruby/webmock[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/childlabor[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/childlabor[ruby_targets_ruby27(-)] dev-ruby/webmock[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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A scripting framework that replaces rake and sake
+EAPI=7
+HOMEPAGE=http://whatisthor.com/
+IUSE=doc 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
+LICENSE=MIT
+RDEPEND=!<dev-ruby/thor-0.20.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=1
+SRC_URI=https://github.com/erikhuda/thor/archive/v1.1.0.tar.gz -> thor-git-1.1.0.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=54be2a462d8cde9e580961be93ced9d0
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.3 b/metadata/md5-cache/dev-ruby/timecop-0.9.3
index 463fb65c184c..0a7da498638c 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.3
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.3
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[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=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=7
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+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/timecop-0.9.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c45e15dbdc121cf01f8df558513eca90
+_md5_=f6a96c083f59b812f62079e921bc9f85
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.4 b/metadata/md5-cache/dev-ruby/timecop-0.9.4
new file mode 100644
index 000000000000..12a62b476837
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.4
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
+EAPI=7
+HOMEPAGE=https://github.com/travisjeffery/timecop
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+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/timecop-0.9.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f6a96c083f59b812f62079e921bc9f85
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.4 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.4
deleted file mode 100644
index a115c208c1c2..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Generic extension manager for WebSocket connections
-EAPI=6
-HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.4.tar.gz -> websocket-extensions-0.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=56785cd5c57ba1b57c028d8439ff9b0c
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
new file mode 100644
index 000000000000..dc47377a8c7f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Generic extension manager for WebSocket connections
+EAPI=7
+HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( dev-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/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5d8acc480fb76d2fdb569c0edfc87a4b
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index f6e9233643df..116aa24cf769 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/racket-8.0 b/metadata/md5-cache/dev-scheme/racket-8.0
new file mode 100644
index 000000000000..1f444beafb3f
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/racket-8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] dev-libs/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+:3[X?] ) !dev-tex/slatex
+DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
+EAPI=7
+HOMEPAGE=https://racket-lang.org/
+IUSE=doc +chez +futures +jit minimal +places +readline +threads +X
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) chez? ( Apache-2.0 ) !chez? ( LGPL-3 )
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] dev-libs/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+:3[X?] ) !dev-tex/slatex
+REQUIRED_USE=futures? ( jit )
+SLOT=0
+SRC_URI=minimal? ( https://download.racket-lang.org/installers/8.0/racket-minimal-8.0-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/8.0/racket-8.0-src-builtpkgs.tgz )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=ea84c4f812992a3415121c1f72c446ff
diff --git a/metadata/md5-cache/dev-scheme/xdgdirs-2.2 b/metadata/md5-cache/dev-scheme/xdgdirs-2.2
new file mode 100644
index 000000000000..f84f30195789
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/xdgdirs-2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=test
+DEPEND=test? ( >=dev-scheme/guile-1.8 )
+DESCRIPTION=Displays names/values of XDG Basedir variables
+EAPI=7
+HOMEPAGE=https://www.gnuvola.org/software/xdgdirs/
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ FDL-1.3
+RDEPEND=>=dev-scheme/guile-1.8
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.gnuvola.org/software/xdgdirs/xdgdirs-2.2.tar.xz
+_md5_=6bf75af851ffdbf53b04adf2e12a86f6
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 338017600a13..b68616cdad04 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tls-1.7.22 b/metadata/md5-cache/dev-tcltk/tls-1.7.22
index 8c762445c411..aeeb2af124ac 100644
--- a/metadata/md5-cache/dev-tcltk/tls-1.7.22
+++ b/metadata/md5-cache/dev-tcltk/tls-1.7.22
@@ -4,11 +4,11 @@ DESCRIPTION=TLS OpenSSL extension to Tcl
 EAPI=6
 HOMEPAGE=http://tls.sourceforge.net/
 IUSE=tk
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://core.tcl.tk/tcltls/uv/tcltls-1.7.22.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=909477bb3fbbb57c546f3f6dea1d6133
+_md5_=1330966bbdf819b3825b49b698681ded
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 4919e775ee64..25f95e965a3b 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/hevea-2.31 b/metadata/md5-cache/dev-tex/hevea-2.31
deleted file mode 100644
index eb92d2e416ec..000000000000
--- a/metadata/md5-cache/dev-tex/hevea-2.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
-EAPI=5
-HOMEPAGE=http://hevea.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-texlive/texlive-latexextra
-SLOT=0
-SRC_URI=http://hevea.inria.fr/distri/hevea-2.31.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81b19f7b341e70d39d3bd635111133d8
diff --git a/metadata/md5-cache/dev-tex/hevea-2.35 b/metadata/md5-cache/dev-tex/hevea-2.35
index e4e641355d73..abe7a74f74f1 100644
--- a/metadata/md5-cache/dev-tex/hevea-2.35
+++ b/metadata/md5-cache/dev-tex/hevea-2.35
@@ -5,9 +5,9 @@ DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
 EAPI=7
 HOMEPAGE=http://hevea.inria.fr/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=QPL
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=http://hevea.inria.fr/distri/hevea-2.35.tar.gz
-_md5_=fd283c56dfde285479b4605998904bcb
+_md5_=26d90b306ba8d0dea7841e7e49470cee
diff --git a/metadata/md5-cache/dev-tex/latexmk-470b b/metadata/md5-cache/dev-tex/latexmk-470b
index a7afa6b0fed7..4fa6f3df32f2 100644
--- a/metadata/md5-cache/dev-tex/latexmk-470b
+++ b/metadata/md5-cache/dev-tex/latexmk-470b
@@ -4,10 +4,10 @@ DEPEND=virtual/latex-base dev-lang/perl
 DESCRIPTION=Perl script for automatically building LaTeX documents
 EAPI=7
 HOMEPAGE=https://personal.psu.edu/~jcc8/software/latexmk/ https://ctan.org/pkg/latexmk/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=https://personal.psu.edu/~jcc8/software/latexmk/latexmk-470b.zip
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=defea54afc3bcc17ef29238805da0ed8
+_md5_=17cc5d298c649605d642c5945588da57
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f957ece2f539..82d948e36b13 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/bats-0.4.0 b/metadata/md5-cache/dev-util/bats-0.4.0
deleted file mode 100644
index d59dbad94af7..000000000000
--- a/metadata/md5-cache/dev-util/bats-0.4.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=An automated testing system for bash
-EAPI=6
-HOMEPAGE=https://github.com/sstephenson/bats/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz -> bats-0.4.0.tar.gz
-_md5_=3c7f7358b8809305ccd1b1461705b146
diff --git a/metadata/md5-cache/dev-util/bats-0.4.0_p20170219 b/metadata/md5-cache/dev-util/bats-0.4.0_p20170219
deleted file mode 100644
index ca7c6226a1b2..000000000000
--- a/metadata/md5-cache/dev-util/bats-0.4.0_p20170219
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=An automated testing system for bash
-EAPI=6
-HOMEPAGE=https://github.com/sstephenson/bats/
-KEYWORDS=amd64 ~arm ppc64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/sstephenson/bats/archive/03608115df2071fff4eaaff1605768c275e5f81f.tar.gz -> bats-0.4.0_p20170219.tar.gz
-_md5_=9cb4a757ab0487551fd08629ce5ac2c2
diff --git a/metadata/md5-cache/dev-util/bats-1.3.0 b/metadata/md5-cache/dev-util/bats-1.3.0
new file mode 100644
index 000000000000..fc8246bba851
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bats-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst test
+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
+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	6a2add34e06e5a05d88471a33ccdd73e
+_md5_=6ea0f198c7a59645783ca389be2c6f89
diff --git a/metadata/md5-cache/dev-util/bcc-0.19.0 b/metadata/md5-cache/dev-util/bcc-0.19.0
new file mode 100644
index 000000000000..0f3b28be4a15
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bcc-0.19.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/libbpf-0.3[static-libs(-)] >=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= <=sys-devel/clang-13:= <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=7
+HOMEPAGE=https://iovisor.github.io/bcc/
+IUSE=+lua test kernel_linux +lua_single_target_luajit python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/libbpf-0.3[static-libs(-)] >=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= <=sys-devel/clang-13:= <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^ ( lua_single_target_luajit ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bcc/archive/v0.19.0.tar.gz -> bcc-0.19.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	96482dd3973a93c32659252dfeba1433	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01c67810434116f6bed35def9331c0e6
diff --git a/metadata/md5-cache/dev-util/bcpp-20150811-r1 b/metadata/md5-cache/dev-util/bcpp-20150811-r1
deleted file mode 100644
index 55e00c007e62..000000000000
--- a/metadata/md5-cache/dev-util/bcpp-20150811-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Indents C/C++ source code
-EAPI=6
-HOMEPAGE=https://invisible-island.net/bcpp/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/bcpp/bcpp-20150811.tgz
-_md5_=5d3272f58a5737fea69b562bd2060ab8
diff --git a/metadata/md5-cache/dev-util/bitrise-1.16.1 b/metadata/md5-cache/dev-util/bitrise-1.16.1
deleted file mode 100644
index df5e57e19ac0..000000000000
--- a/metadata/md5-cache/dev-util/bitrise-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Run your Bitrise.io automations on any Mac or Linux machine
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.16.1.tar.gz -> bitrise-1.16.1.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=cfbd86d69101118f94c61d30da3f6db0
diff --git a/metadata/md5-cache/dev-util/bitrise-1.19.0 b/metadata/md5-cache/dev-util/bitrise-1.19.0
deleted file mode 100644
index 75c61aba1f49..000000000000
--- a/metadata/md5-cache/dev-util/bitrise-1.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Run your Bitrise.io automations on any Mac or Linux machine
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-util/envman-1.2.0 >=dev-util/stepman-0.10.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.19.0.tar.gz -> bitrise-1.19.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=7d006bec643a9cf1eb5e9b0b8996be24
diff --git a/metadata/md5-cache/dev-util/bitrise-1.20.0 b/metadata/md5-cache/dev-util/bitrise-1.20.0
deleted file mode 100644
index b6235c042202..000000000000
--- a/metadata/md5-cache/dev-util/bitrise-1.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Run your Bitrise.io automations on any Mac or Linux machine
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-util/envman-1.2.0 >=dev-util/stepman-0.10.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.20.0.tar.gz -> bitrise-1.20.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=caeae143bd0ae35a44790c60203fbe71
diff --git a/metadata/md5-cache/dev-util/bitrise-1.23.0 b/metadata/md5-cache/dev-util/bitrise-1.23.0
deleted file mode 100644
index bb7e1c0ce125..000000000000
--- a/metadata/md5-cache/dev-util/bitrise-1.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Run your Bitrise.io automations on any Mac or Linux machine
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-util/envman-2.1.0 >=dev-util/stepman-0.10.4
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.23.0.tar.gz -> bitrise-1.23.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=53374e0445ac08f9c60ea843784fd113
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.5 b/metadata/md5-cache/dev-util/cmake-3.19.5
deleted file mode 100644
index 1f48c7fb399c..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.19.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.5.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.7 b/metadata/md5-cache/dev-util/cmake-3.19.7
new file mode 100644
index 000000000000..aeaa4ddd9d14
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.19.7
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.7.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.0_rc4 b/metadata/md5-cache/dev-util/cmake-3.20.0_rc4
deleted file mode 100644
index 5dbefc420afa..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.20.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.0-rc4.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0159b51a0e032ef8c16bae7f2a3ec75a
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.0_rc5 b/metadata/md5-cache/dev-util/cmake-3.20.0_rc5
new file mode 100644
index 000000000000..da7f3cb71a61
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.20.0_rc5
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.0-rc5.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0159b51a0e032ef8c16bae7f2a3ec75a
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r2 b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
index 4eaca6059f75..f892f90e994f 100644
--- a/metadata/md5-cache/dev-util/codeblocks-20.03-r2
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The open source, cross platform, free C, C++ and Fortran IDE
 EAPI=7
 HOMEPAGE=https://codeblocks.org/
 IUSE=contrib debug fortran pch
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks-20.03.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.7.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03c978bc4fd18b88d452798f9c04a253
+_md5_=b8f846678c35444775d75088b3f185bf
diff --git a/metadata/md5-cache/dev-util/diffoscope-169 b/metadata/md5-cache/dev-util/diffoscope-169
new file mode 100644
index 000000000000..13d2c1eb2c5d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-169
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=7
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_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 ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_7? ( dev-lang/python:3.7[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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-169.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d01d0df333eb80c08ef06b6c4a711c29
diff --git a/metadata/md5-cache/dev-util/dwarves-1.17 b/metadata/md5-cache/dev-util/dwarves-1.17
deleted file mode 100644
index 24ae3898798c..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.17.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f89be6a6f5bb0216c97216219417a42
diff --git a/metadata/md5-cache/dev-util/dwarves-1.17-r1 b/metadata/md5-cache/dev-util/dwarves-1.17-r1
deleted file mode 100644
index bf5ee62830d7..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.17.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a9a54dcc1a8a946eaa976e260201036
diff --git a/metadata/md5-cache/dev-util/dwarves-1.18 b/metadata/md5-cache/dev-util/dwarves-1.18
deleted file mode 100644
index 6c539478fbbe..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.18.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a9a54dcc1a8a946eaa976e260201036
diff --git a/metadata/md5-cache/dev-util/dwarves-1.19 b/metadata/md5-cache/dev-util/dwarves-1.19
deleted file mode 100644
index b272ee7446b8..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.19.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5693f3dbfab5b3d85abb6e299095dadd
diff --git a/metadata/md5-cache/dev-util/dwarves-1.19-r1 b/metadata/md5-cache/dev-util/dwarves-1.19-r1
deleted file mode 100644
index 2f1e4b28e474..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.19-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.19.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3687cc05d5148d28163ce11145c19d05
diff --git a/metadata/md5-cache/dev-util/envman-1.2.0 b/metadata/md5-cache/dev-util/envman-1.2.0
deleted file mode 100644
index 1a9a8f336607..000000000000
--- a/metadata/md5-cache/dev-util/envman-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Environment variable manager for Bitrise CLI.
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/envman/archive/1.2.0.tar.gz -> envman-1.2.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=f625531e7763fdbe3dfde64b372712c6
diff --git a/metadata/md5-cache/dev-util/envman-1.2.1 b/metadata/md5-cache/dev-util/envman-1.2.1
deleted file mode 100644
index bf17ddbab6e0..000000000000
--- a/metadata/md5-cache/dev-util/envman-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Environment variable manager for Bitrise CLI
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/envman/archive/1.2.1.tar.gz -> envman-1.2.1.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=92531e856cf85236f580fbf0b4634d59
diff --git a/metadata/md5-cache/dev-util/envman-2.1.0 b/metadata/md5-cache/dev-util/envman-2.1.0
deleted file mode 100644
index d366431ca72e..000000000000
--- a/metadata/md5-cache/dev-util/envman-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Environment variable manager for Bitrise CLI
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/envman/archive/2.1.0.tar.gz -> envman-2.1.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=1e476723ff28f5b61e7a89578c8aa199
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.36-r2 b/metadata/md5-cache/dev-util/geany-plugins-1.36-r2
deleted file mode 100644
index 0aa10001607c..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.36-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=7
-HOMEPAGE=https://plugins.geany.org
-IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench
-KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
-REQUIRED_USE=!gtk3? ( !markdown )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.36.tar.gz
-_md5_=6ec913bb51fa765874fcee8dceb9682a
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37 b/metadata/md5-cache/dev-util/geany-plugins-1.37
deleted file mode 100644
index 8ac2c7f21c40..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[gtk2=] !gtk2? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( !gtk2? ( app-text/gtkspell:3= ) gtk2? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=7
-HOMEPAGE=https://plugins.geany.org
-IUSE=gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[gtk2=] !gtk2? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( !gtk2? ( app-text/gtkspell:3= ) gtk2? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk2? ( !markdown )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_md5_=8477a57836ed3d069d560656585d38e1
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r100 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r100
deleted file mode 100644
index ad6b26364c86..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[gtk2=] !gtk2? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( !gtk2? ( app-text/gtkspell:3= ) gtk2? ( app-text/gtkspell:2 ) ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=7
-HOMEPAGE=https://plugins.geany.org
-IUSE=gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[gtk2=] !gtk2? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( !gtk2? ( app-text/gtkspell:3= ) gtk2? ( app-text/gtkspell:2 ) ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( !gtk2? ( x11-libs/vte:2.91 ) gtk2? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk2? ( !markdown ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=24a5129e9b34e445bd60a0c20c7d46cf
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
index a901f4938216..f583100ccc5a 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of different plugins for Geany
 EAPI=7
 HOMEPAGE=https://plugins.geany.org
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bcd9ce8c74376072f24378a478b813d6
+_md5_=4c4ca24c9df264fccae2617ff7015858
diff --git a/metadata/md5-cache/dev-util/github-cli-1.6.2 b/metadata/md5-cache/dev-util/github-cli-1.6.2
deleted file mode 100644
index f8463887f2f7..000000000000
--- a/metadata/md5-cache/dev-util/github-cli-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=GitHub CLI
-EAPI=7
-HOMEPAGE=https://github.com/cli/cli
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
-RDEPEND=>=dev-vcs/git-1.7.3
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/cli/cli/archive/v1.6.2.tar.gz -> github-cli-1.6.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ece758b52660390fe3c41d733f3c09b4
diff --git a/metadata/md5-cache/dev-util/github-cli-1.7.0 b/metadata/md5-cache/dev-util/github-cli-1.7.0
new file mode 100644
index 000000000000..e17f49f29ef4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/github-cli-1.7.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=GitHub CLI
+EAPI=7
+HOMEPAGE=https://github.com/cli/cli
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
+RDEPEND=>=dev-vcs/git-1.7.3
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/cli/cli/archive/v1.7.0.tar.gz -> github-cli-1.7.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.zip -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.mod -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.mod -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.zip -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.mod -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.zip -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.mod -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c4e764a4e88f4ae721673066c29da400
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.10 b/metadata/md5-cache/dev-util/howdoi-2.0.10
deleted file mode 100644
index 32168050c90b..000000000000
--- a/metadata/md5-cache/dev-util/howdoi-2.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A code search tool
-EAPI=7
-HOMEPAGE=https://pypi.org/project/howdoi/
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.10.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b8aece26017a992a5d4c0e78e19e856b
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.14 b/metadata/md5-cache/dev-util/howdoi-2.0.14
new file mode 100644
index 000000000000..84832ae7f8b9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.14
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A code search tool
+EAPI=7
+HOMEPAGE=https://pypi.org/project/howdoi/
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.14.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b8aece26017a992a5d4c0e78e19e856b
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.8 b/metadata/md5-cache/dev-util/howdoi-2.0.8
deleted file mode 100644
index dab7dbcc21ab..000000000000
--- a/metadata/md5-cache/dev-util/howdoi-2.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A code search tool
-EAPI=7
-HOMEPAGE=https://pypi.org/project/howdoi/
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.8.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=670a5c058020fd716ba652a0bae14086
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1 b/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1
new file mode 100644
index 000000000000..5dc380c06b38
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=|| ( ~dev-java/openjdk-11.0.9_p11:11 ~dev-java/openjdk-bin-11.0.9_p11:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=|| ( ~dev-java/openjdk-11.0.9_p11:11 ~dev-java/openjdk-bin-11.0.9_p11:11 ) dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-10*
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.3.1-no-jbr.tar.gz -> ideaIC-3.1.203.6682.168.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-11_0_8-linux-x64-b1098.1.tar.gz -> jbr-11_0_8-linux-x64-b1098.1.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=000c9ec5587b64918efa265c45452727
diff --git a/metadata/md5-cache/dev-util/lcov-1.13-r2 b/metadata/md5-cache/dev-util/lcov-1.13-r2
deleted file mode 100644
index 5ed69e0e5969..000000000000
--- a/metadata/md5-cache/dev-util/lcov-1.13-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
-EAPI=7
-HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-IUSE=png
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-lang/perl png? ( dev-perl/GD[png] )
-SLOT=0
-SRC_URI=mirror://sourceforge/ltp/lcov-1.13.tar.gz
-_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=6cd7c2b837527c26c6dee103409c5a34
diff --git a/metadata/md5-cache/dev-util/lcov-1.14 b/metadata/md5-cache/dev-util/lcov-1.14
deleted file mode 100644
index d0b416f9199b..000000000000
--- a/metadata/md5-cache/dev-util/lcov-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
-EAPI=7
-HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-IUSE=png
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-lang/perl png? ( dev-perl/GD[png] )
-SLOT=0
-SRC_URI=mirror://sourceforge/ltp/lcov-1.14.tar.gz
-_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=813217255bd2dbb8a9d671de51282557
diff --git a/metadata/md5-cache/dev-util/lcov-1.14_p2 b/metadata/md5-cache/dev-util/lcov-1.14_p2
deleted file mode 100644
index ccff4c2b08fe..000000000000
--- a/metadata/md5-cache/dev-util/lcov-1.14_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
-EAPI=7
-HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-IUSE=png
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip png? ( dev-perl/GD[png] )
-SLOT=0
-SRC_URI=mirror://sourceforge/ltp/lcov-1.14.tar.gz mirror://debian/pool/main/l/lcov/lcov_1.14-2.debian.tar.xz
-_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=4dc36a1981a335b9da6e1576430d0f54
diff --git a/metadata/md5-cache/dev-util/libabigail-1.8.2 b/metadata/md5-cache/dev-util/libabigail-1.8.2
new file mode 100644
index 000000000000..d060bbf897e0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/libabigail-1.8.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen dev-python/sphinx sys-apps/texinfo ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=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 setup test
+DEPEND=dev-libs/elfutils:= dev-libs/libxml2:2=
+DESCRIPTION=Suite of tools for checking ABI differences between ELF objects
+EAPI=7
+HOMEPAGE=https://sourceware.org/libabigail/
+IUSE=doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/elfutils:= dev-libs/libxml2:2=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mirrors.kernel.org/sourceware/libabigail/libabigail-1.8.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d43ed02e364a4ff6cfa5a92f89769ae4
diff --git a/metadata/md5-cache/dev-util/lldb-11.1.0 b/metadata/md5-cache/dev-util/lldb-11.1.0
index c8b8da93be4f..d71dfa295774 100644
--- a/metadata/md5-cache/dev-util/lldb-11.1.0
+++ b/metadata/md5-cache/dev-util/lldb-11.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+libedit lzma ncurses +python test test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-11.1.0[xml] ~sys-devel/llvm-11.1.0 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=505eae8addb657df990f87b2429aa16d
+_md5_=b76a578055d3b85e862a130955b7d8f0
diff --git a/metadata/md5-cache/dev-util/memprof-0.6.2-r1 b/metadata/md5-cache/dev-util/memprof-0.6.2-r1
index 050af2ad510e..df74458004ad 100644
--- a/metadata/md5-cache/dev-util/memprof-0.6.2-r1
+++ b/metadata/md5-cache/dev-util/memprof-0.6.2-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl )
 DESCRIPTION=Profiling and leak detection tool
-EAPI=5
-HOMEPAGE=http://www.secretlabs.de/projects/memprof/
+EAPI=7
+HOMEPAGE=https://www.secretlabs.de/projects/memprof/
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=http://www.secretlabs.de/projects/memprof/releases/memprof-0.6.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afee8bc433fc7f8f76575acab0b096dc
+SRC_URI=https://www.secretlabs.de/projects/memprof/releases/memprof-0.6.2.tar.gz
+_md5_=95f02b53c704624ae31249849d8df1c4
diff --git a/metadata/md5-cache/dev-util/meson-0.56.2 b/metadata/md5-cache/dev-util/meson-0.56.2
index 25c64428047a..2abbd81b6b53 100644
--- a/metadata/md5-cache/dev-util/meson-0.56.2
+++ b/metadata/md5-cache/dev-util/meson-0.56.2
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.56.2.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=82c6adbb593304599e3750e68ad905ca
+_md5_=9adfcb71958c360bb2a05d76f6a760cc
diff --git a/metadata/md5-cache/dev-util/opencl-headers-2020.12.18 b/metadata/md5-cache/dev-util/opencl-headers-2020.12.18
new file mode 100644
index 000000000000..432588e697d1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/opencl-headers-2020.12.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!app-eselect/eselect-opencl
+DESCRIPTION=Unified C language headers for the OpenCL API
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/OpenCL-Headers
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-eselect/eselect-opencl
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/OpenCL-Headers/archive/v2020.12.18.tar.gz -> opencl-headers-2020.12.18.tar.gz
+_md5_=7a8ea133482b49cb5394b6b104ac1a24
diff --git a/metadata/md5-cache/dev-util/packer-1.4.0 b/metadata/md5-cache/dev-util/packer-1.4.0
deleted file mode 100644
index d2596a5b07dc..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.11.0
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=7
-HOMEPAGE=https://www.packer.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.4.0.tar.gz -> packer-1.4.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=045fb029f71ef11dbfc064de004aef78
diff --git a/metadata/md5-cache/dev-util/packer-1.4.5 b/metadata/md5-cache/dev-util/packer-1.4.5
deleted file mode 100644
index e7402fe7a6d9..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=7
-HOMEPAGE=https://www.packer.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.4.5.tar.gz -> packer-1.4.5.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=ceb653652e3a173d870101ba72d05dac
diff --git a/metadata/md5-cache/dev-util/packer-1.5.6 b/metadata/md5-cache/dev-util/packer-1.5.6
deleted file mode 100644
index 78859435d99c..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.5.6
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=7
-HOMEPAGE=https://www.packer.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.5.6.tar.gz -> packer-1.5.6.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=135303763a7e2ff2cef335e482609855
diff --git a/metadata/md5-cache/dev-util/packer-1.6.1 b/metadata/md5-cache/dev-util/packer-1.6.1
deleted file mode 100644
index eed88576b470..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=7
-HOMEPAGE=https://www.packer.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.6.1.tar.gz -> packer-1.6.1.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=135303763a7e2ff2cef335e482609855
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r1
deleted file mode 100644
index 36bceea84cbf..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2df73fff9ff97baf56c7eeb25ccd13a7
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r2
new file mode 100644
index 000000000000..44c81ecf7bf0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.8.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f2a9f22a46716b45f10ad5b2d0e07f4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r1
deleted file mode 100644
index 3ce3c3d1cc36..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=01ed75734aec44c53c77c8fca958a52c
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2
new file mode 100644
index 000000000000..ebb3e1cf5ecd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c102fd929d39eb6af5fdea8d59b03ae4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r1
deleted file mode 100644
index cba5b52acb49..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c63613a35004f7eda3a34982046f6579
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r2
new file mode 100644
index 000000000000..9577caf41927
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=96de998add9328f591b5c92653f3e90e
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r1
deleted file mode 100644
index 99dd635ba7f4..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2517f52a142760236fa7d1cf7f9ec2d1
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r2
new file mode 100644
index 000000000000..1382f115fc79
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=beec3ce5970b3ecdc24b88a79db1b5da
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.2
deleted file mode 100644
index c5ff036efdd6..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8a7b3f22c85a793b38b76d9b7430267
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r1
new file mode 100644
index 000000000000..b22b3ed2b49d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bc9283968e0f718c0c2ab3c8591a5721
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1
new file mode 100644
index 000000000000..ece89255a47b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=12b3001a3628a6ce119c9e8c5535449d
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.4 b/metadata/md5-cache/dev-util/pkgcheck-0.9.4
new file mode 100644
index 000000000000..178b906bf0f1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e3bb78a1ec7a45dba21c4f5782c441a3
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.7.2 b/metadata/md5-cache/dev-util/pkgconf-1.7.2
deleted file mode 100644
index 350ef8b1b1b4..000000000000
--- a/metadata/md5-cache/dev-util/pkgconf-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-libs/atf dev-util/kyua )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
-EAPI=7
-HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
-IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=ISC
-RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.2.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec0c67e96f5f60b390a6e77e61393bdf
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.7.4 b/metadata/md5-cache/dev-util/pkgconf-1.7.4
new file mode 100644
index 000000000000..702e50a725b8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgconf-1.7.4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-libs/atf dev-util/kyua )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=7
+HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos
+LICENSE=ISC
+RDEPEND=pkg-config? ( !dev-util/pkgconfig )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.4.tar.xz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=31fa4709cea4ae0efc700bd8b0d25b66
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1 b/metadata/md5-cache/dev-util/pkgdev-0.1
deleted file mode 100644
index cc58ad919b5c..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63b74ecf6b71c86ee92d4bab638e95a5
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.1 b/metadata/md5-cache/dev-util/pkgdev-0.1.1
new file mode 100644
index 000000000000..4d8837801e4d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d686adb155a8642cb842c90e3649ea5d
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.2 b/metadata/md5-cache/dev-util/pkgdev-0.1.2
new file mode 100644
index 000000000000..03e59c81900a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ec2e6765f39f07b224074c90c7b894f0
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 5b20e3c4c09a..f2d5314ff190 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9fb55f51332591b18aed1edf40f13ad0
+_md5_=da72cbb7c9e7bff26fcfa73f32c1a9cf
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.13.2 b/metadata/md5-cache/dev-util/rebar-bin-3.13.2
deleted file mode 100644
index 84b087c7cec9..000000000000
--- a/metadata/md5-cache/dev-util/rebar-bin-3.13.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=7
-HOMEPAGE=https://github.com/erlang/rebar3
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/erlang/rebar3/releases/download/3.13.2/rebar3 -> rebar-bin-3.13.2
-_md5_=561358178619e76b21b723b3e1633981
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.14.4 b/metadata/md5-cache/dev-util/rebar-bin-3.14.4
new file mode 100644
index 000000000000..71cadaaa3d6d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rebar-bin-3.14.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=7
+HOMEPAGE=https://github.com/erlang/rebar3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/erlang/rebar3/releases/download/3.14.4/rebar3 -> rebar-bin-3.14.4
+_md5_=4316102da60c3b89b6f1ce8066d05472
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.6.2 b/metadata/md5-cache/dev-util/rebar-bin-3.6.2
deleted file mode 100644
index 6424f503d3e5..000000000000
--- a/metadata/md5-cache/dev-util/rebar-bin-3.6.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=7
-HOMEPAGE=https://github.com/erlang/rebar3
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/erlang/rebar3/releases/download/3.6.2/rebar3 -> rebar-bin-3.6.2
-_md5_=561358178619e76b21b723b3e1633981
diff --git a/metadata/md5-cache/dev-util/shards-0.14.0 b/metadata/md5-cache/dev-util/shards-0.14.0
deleted file mode 100644
index 5e979e458e18..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=7
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.14.0.tar.gz -> shards-0.14.0.tar.gz https://github.com/crystal-lang/crystal-molinillo/archive/v0.1.0.tar.gz -> crystal-molinillo-0.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7cfc734149f7ab5a07e2676813ccf6c5
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.0 b/metadata/md5-cache/dev-util/stepman-0.10.0
deleted file mode 100644
index 02732da54dfb..000000000000
--- a/metadata/md5-cache/dev-util/stepman-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Step collection manager for Bitrise CLI.
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.0.tar.gz -> stepman-0.10.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=00c0673d56b0beb22f60c2d7c6267ba8
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.2 b/metadata/md5-cache/dev-util/stepman-0.10.2
deleted file mode 100644
index ab5bfa818b0a..000000000000
--- a/metadata/md5-cache/dev-util/stepman-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Step collection manager for Bitrise CLI.
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.2.tar.gz -> stepman-0.10.2.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=1353231c081483d762449c82fc8d2ed6
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.4 b/metadata/md5-cache/dev-util/stepman-0.10.4
deleted file mode 100644
index 2c7f5486f30a..000000000000
--- a/metadata/md5-cache/dev-util/stepman-0.10.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Step collection manager for Bitrise CLI
-EAPI=6
-HOMEPAGE=https://www.bitrise.io/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.4.tar.gz -> stepman-0.10.4.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=be564f1dce60c38075104fb775e16846
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.102.0 b/metadata/md5-cache/dev-util/stripe-mock-0.102.0
index cd69c112c881..8e91bfc249dc 100644
--- a/metadata/md5-cache/dev-util/stripe-mock-0.102.0
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.102.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=Mock HTTP server that responds like the real Stripe API
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT ISC BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.102.0.tar.gz -> stripe-mock-0.102.0.tar.gz
 _eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
+_md5_=bba505c189505f9d11a2eec9459011e1
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
index 8996e9d08f13..e922d6e129e2 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=27aa66b8bc0888b06e85402a6bbeb53c
+_md5_=f4ebcf899a8aa1c3b98e92b83c141acd
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r2 b/metadata/md5-cache/dev-util/systemtap-4.0-r2
index c7f51449d405..444409fbf9fb 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r2
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f48fdae64fe73ae9af583abb23607934
+_md5_=428e4b6ed7508482fcb7549b7488a82b
diff --git a/metadata/md5-cache/dev-util/systemtap-4.4 b/metadata/md5-cache/dev-util/systemtap-4.4
index bd9d6d1ad6b2..ac0c1dee00d2 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.4
+++ b/metadata/md5-cache/dev-util/systemtap-4.4
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.4.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2d9a01603d9f7979761a61f13d07c6a
+_md5_=d0a0b031708ecffc479febec33667d2b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 1a434c7ccf24..0673d3223414 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.3 b/metadata/md5-cache/dev-vcs/git-2.26.3
index cb2da838935d..470c0249522b 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.3
+++ b/metadata/md5-cache/dev-vcs/git-2.26.3
@@ -5,7 +5,7 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.3.tar.xz )
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2eb35883e5e726f90b971f00998b314c
+_md5_=c4aeca37a7fed45b898d2b9e7c3d2cc7
diff --git a/metadata/md5-cache/dev-vcs/git-2.28.0 b/metadata/md5-cache/dev-vcs/git-2.28.0
deleted file mode 100644
index 819620abee6e..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.28.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.28.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.28.0.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2eb35883e5e726f90b971f00998b314c
diff --git a/metadata/md5-cache/dev-vcs/git-2.29.2 b/metadata/md5-cache/dev-vcs/git-2.29.2
deleted file mode 100644
index b3d3841d78e7..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.29.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.29.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.29.2.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85d5d9f598e4022ca024d310dabaae29
diff --git a/metadata/md5-cache/dev-vcs/git-2.30.0 b/metadata/md5-cache/dev-vcs/git-2.30.0
deleted file mode 100644
index fb2b8d859f45..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.30.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.0.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85d5d9f598e4022ca024d310dabaae29
diff --git a/metadata/md5-cache/dev-vcs/git-2.30.1 b/metadata/md5-cache/dev-vcs/git-2.30.1
deleted file mode 100644
index bb3aa2ff41e8..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.30.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7dc9fcc1e8e90c29fe09619ed1056a75
diff --git a/metadata/md5-cache/dev-vcs/git-2.31.0-r1 b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
new file mode 100644
index 000000000000..018e02235f2a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=7
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.31.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.31.0.tar.xz )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=035dcac08069524b033cde97ae172b26
diff --git a/metadata/md5-cache/dev-vcs/git-2.31.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.31.0_rc2
deleted file mode 100644
index 07e2370e62d9..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.31.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.31.0.rc2.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.31.0.rc2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.31.0.rc2.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd06fd5fa2c5c9c50f6330a167094d65
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index cbe6599ebc36..ccdc32fd778e 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c2ffc4a19ed3e24730dd0bd65e015ae
+_md5_=0a7fa059aa64888f94f3e0b9b0b8cc28
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 83c379b18d5d..600a6a840c31 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c98886a2d6a91e5a9b2a88d8ff97f476
+_md5_=1a7fe1b5d853743840099eb5f1da8031
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 83c379b18d5d..600a6a840c31 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c98886a2d6a91e5a9b2a88d8ff97f476
+_md5_=1a7fe1b5d853743840099eb5f1da8031
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index c4105b47e3d4..9bb12b73e4ff 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd06fd5fa2c5c9c50f6330a167094d65
+_md5_=412e82774ea1ba11d18480889a35d601
diff --git a/metadata/md5-cache/dev-vcs/git-extras-6.1.0 b/metadata/md5-cache/dev-vcs/git-extras-6.1.0
new file mode 100644
index 000000000000..ac9ebd012629
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-extras-6.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Git utilities -- repo summary, repl, changelog population, author commit percentages and more
+EAPI=7
+HOMEPAGE=https://github.com/tj/git-extras
+KEYWORDS=~amd64 ~x64-macos
+LICENSE=MIT
+RDEPEND=app-shells/bash dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/tj/git-extras/archive/6.1.0.tar.gz -> git-extras-6.1.0.tar.gz
+_md5_=bbad8730a8ce1a41dc86483c2fdbc1cc
diff --git a/metadata/md5-cache/dev-vcs/git-publish-1.7.0 b/metadata/md5-cache/dev-vcs/git-publish-1.7.0
new file mode 100644
index 000000000000..bf1834ebde68
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-publish-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) man? ( dev-lang/perl )
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Tool for preparing and storing patch revisions as git tag
+EAPI=7
+HOMEPAGE=https://github.com/stefanha/git-publish
+IUSE=+man python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-vcs/git
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/stefanha/git-publish/archive/v1.7.0.tar.gz -> git-publish-1.7.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c837e3ce7ce0a4d4a705bc9e3950d61e
diff --git a/metadata/md5-cache/dev-vcs/git-pw-2.0.0 b/metadata/md5-cache/dev-vcs/git-pw-2.0.0
new file mode 100644
index 000000000000..614c330ce53a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-pw-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/mock-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-cov-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tabulate-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool for integrating Git with Patchwork
+EAPI=7
+HOMEPAGE=https://github.com/getpatchwork/git-pw
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tabulate-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getpatchwork/git-pw/archive/2.0.0.tar.gz -> git-pw-2.0.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=67509cecdba99092d0b30561df983162
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.2.0 b/metadata/md5-cache/dev-vcs/hg-evolve-10.2.0
deleted file mode 100644
index 6c5b0c3808e9..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx )
-DESCRIPTION=enables the changeset evolution feature of Mercurial
-EAPI=7
-HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
-IUSE=doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.2.0.post1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c75750a0bce0f67560731c2f1b5d656
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.3.0 b/metadata/md5-cache/dev-vcs/hg-evolve-10.3.0
new file mode 100644
index 000000000000..7a2a85b1e28f
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx )
+DESCRIPTION=enables the changeset evolution feature of Mercurial
+EAPI=7
+HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
+IUSE=doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6aeccb00124b46b82f059b952bd4e2f4
diff --git a/metadata/md5-cache/dev-vcs/repo-2.12-r1 b/metadata/md5-cache/dev-vcs/repo-2.12-r1
new file mode 100644
index 000000000000..bb11ca38139f
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/repo-2.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=7
+HOMEPAGE=https://gerrit.googlesource.com/git-repo
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.12 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0056145fabdf401547b6cf54b10fb6d5
diff --git a/metadata/md5-cache/dev-vcs/repo-2.8 b/metadata/md5-cache/dev-vcs/repo-2.8
deleted file mode 100644
index 252b290981c3..000000000000
--- a/metadata/md5-cache/dev-vcs/repo-2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Google tool for managing git, particularly multiple repos
-EAPI=7
-HOMEPAGE=https://gerrit.googlesource.com/git-repo
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.8
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3007803a7b2ff6a67bb1191a5337244e
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
deleted file mode 100644
index af59204eca30..000000000000
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=7
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e158402ad412eb7fbd546456094ab0f
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2 b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
deleted file mode 100644
index 4b54f2ca6592..000000000000
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=7
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=edefae36f11668419d426ea5e98cc880
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.6 b/metadata/md5-cache/dev-vcs/tortoisehg-5.6
deleted file mode 100644
index 9c2fb0024814..000000000000
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-vcs/mercurial-5.5 <dev-vcs/mercurial-5.7 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=7
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-5.5 <dev-vcs/mercurial-5.7 dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2822f3675df9db4d58b78d5d2e24f1c1
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.6.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.6.1
deleted file mode 100644
index 30537bb619fd..000000000000
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-vcs/mercurial-5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-vcs/mercurial-5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Set of graphical tools for Mercurial
-EAPI=7
-HOMEPAGE=https://tortoisehg.bitbucket.io/
-IUSE=doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-vcs/mercurial-5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/iniparse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.6.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6f50a46278aa1a1f02d0f7cf50153e8
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index b813da2bfe42..aa3d26be8553 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/goatee-gtk-0.4.0 b/metadata/md5-cache/games-board/goatee-gtk-0.4.0
new file mode 100644
index 000000000000..cc68c4b7df82
--- /dev/null
+++ b/metadata/md5-cache/games-board/goatee-gtk-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-games/goatee-0.4:=[profile?] <dev-games/goatee-0.5:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.16:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monadic take on a 2,500-year-old board game - GTK+ UI
+EAPI=7
+HOMEPAGE=http://khumba.net/projects/goatee
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-games/goatee-0.4:=[profile?] <dev-games/goatee-0.5:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.16:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.0
+SRC_URI=https://hackage.haskell.org/package/goatee-gtk-0.4.0/goatee-gtk-0.4.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7c76a6d468d98dc22e251301e43fb7da
diff --git a/metadata/md5-cache/games-board/maitretarot-0.1.98-r1 b/metadata/md5-cache/games-board/maitretarot-0.1.98-r1
deleted file mode 100644
index 4c0f92dfe7a9..000000000000
--- a/metadata/md5-cache/games-board/maitretarot-0.1.98-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-DESCRIPTION=server for the french tarot game maitretarot
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/maitretarot.pkg/0.1.98/maitretarot-0.1.98.tar.bz2
-_md5_=c48407f3a21de4864087e4b88e656f00
diff --git a/metadata/md5-cache/games-board/maitretarot-0.1.98-r2 b/metadata/md5-cache/games-board/maitretarot-0.1.98-r2
new file mode 100644
index 000000000000..b5889867213f
--- /dev/null
+++ b/metadata/md5-cache/games-board/maitretarot-0.1.98-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+DESCRIPTION=Server for the french tarot game maitretarot
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/maitretarot.pkg/0.1.98/maitretarot-0.1.98.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9c21397f37aedfe1bd6e816c082ad8c4
diff --git a/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1 b/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1
deleted file mode 100644
index a792520ce5fb..000000000000
--- a/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
-DESCRIPTION=client for the french tarot game maitretarot
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_dolphin_ia.pkg/0.1.98/mt_dolphin_ia-0.1.98.tar.bz2
-_md5_=12bc2a97f1d4a964add1e48fbcb8a1b0
diff --git a/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2 b/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2
new file mode 100644
index 000000000000..b0c39906ac24
--- /dev/null
+++ b/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=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=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
+DESCRIPTION=client for the french tarot game maitretarot
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_dolphin_ia.pkg/0.1.98/mt_dolphin_ia-0.1.98.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=79a860436e1a0d625d66921c8fde56a7
diff --git a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1 b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
index 8bbd747c1019..6402f2acc41f 100644
--- a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
+++ b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=configure
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
 DESCRIPTION=client for the french tarot game maitretarot
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.nongnu.org/maitretarot/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_ncurses_client.pkg/0.1.98/mt_ncurses_client-0.1.98.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d6651f28ed7c9b1757390e1cbfab0f49
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f9e1a53713392ad247fe17feb66b411b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index a53a2889e321..c3cc0390c0b1 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.10.3 b/metadata/md5-cache/games-emulation/ppsspp-1.10.3
deleted file mode 100644
index 0b96b3410d00..000000000000
--- a/metadata/md5-cache/games-emulation/ppsspp-1.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A PSP emulator written in C++
-EAPI=7
-HOMEPAGE=https://www.ppsspp.org/
-IUSE=discord qt5 sdl +system-ffmpeg
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] )
-REQUIRED_USE=!qt5? ( sdl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.10.3.tar.gz -> ppsspp-1.10.3.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.10.3-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.10.3-ext_rapidjson.tar.gz https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ppsspp-1.10.3-ext_glslang.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ppsspp-1.10.3-assets_lang.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ppsspp-1.10.3-ffmpeg.tar.gz ) discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ppsspp-1.10.3-ext_discord-rpc.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8e5bbadebcb627e8c93fe10967649ea
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.11 b/metadata/md5-cache/games-emulation/ppsspp-1.11
deleted file mode 100644
index 992e5207df6f..000000000000
--- a/metadata/md5-cache/games-emulation/ppsspp-1.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A PSP emulator written in C++
-EAPI=7
-HOMEPAGE=https://www.ppsspp.org/
-IUSE=discord qt5 sdl +system-ffmpeg
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] )
-REQUIRED_USE=!qt5? ( sdl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.11.tar.gz -> ppsspp-1.11.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ppsspp-1.11-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.11-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.11-ext_rapidjson.tar.gz https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ppsspp-1.11-ext_glslang.tar.gz https://github.com/hrydgard/miniupnp/archive/7e229ddd635933239583ab190d9b614bde018157.tar.gz -> ppsspp-1.11-ext_miniupnp.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.11-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/567b22525b115751ee3ae2ed2c8b046034c9dd8d.tar.gz -> ppsspp-1.11-assets_lang.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/0b28335acea4f429ae798c5e75232e54881bf164.tar.gz -> ppsspp-1.11-ffmpeg.tar.gz ) discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ppsspp-1.11-ext_discord-rpc.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27be4eea001a2d516d71ca6dfa0e760f
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 2e5cbc84e98d..52edc9ccad5d 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/box2d-2.1.2 b/metadata/md5-cache/games-engines/box2d-2.1.2
deleted file mode 100644
index 2ad74800c3d3..000000000000
--- a/metadata/md5-cache/games-engines/box2d-2.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A C++ engine for simulating rigid bodies in 2D games
-EAPI=7
-HOMEPAGE=https://box2d.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=2.1.0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/box2d/Box2D_v2.1.2.zip
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44832ed931f884f44c2072dfe12b01b0
diff --git a/metadata/md5-cache/games-engines/box2d-2.2.1 b/metadata/md5-cache/games-engines/box2d-2.2.1
deleted file mode 100644
index e0468c92d180..000000000000
--- a/metadata/md5-cache/games-engines/box2d-2.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A C++ engine for simulating rigid bodies in 2D games
-EAPI=7
-HOMEPAGE=https://box2d.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=2.2.0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/box2d/Box2D_v2.2.1.zip
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=03fc37bd6e0aa77c3a3906a20ee4b062
diff --git a/metadata/md5-cache/games-engines/box2d-2.3.1 b/metadata/md5-cache/games-engines/box2d-2.3.1
deleted file mode 100644
index 353933ee3b04..000000000000
--- a/metadata/md5-cache/games-engines/box2d-2.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A C++ engine for simulating rigid bodies in 2D games
-EAPI=7
-HOMEPAGE=https://box2d.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=2.3.0
-SRC_URI=https://github.com/erincatto/Box2D/archive/v2.3.1.tar.gz -> box2d-2.3.1.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ccf0f57c249bff68357126f30c2e92ce
diff --git a/metadata/md5-cache/games-engines/box2d-2.4.1 b/metadata/md5-cache/games-engines/box2d-2.4.1
new file mode 100644
index 000000000000..d7bcf3d35b65
--- /dev/null
+++ b/metadata/md5-cache/games-engines/box2d-2.4.1
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C++ engine for simulating rigid bodies in 2D games
+EAPI=7
+HOMEPAGE=https://box2d.org/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=https://github.com/erincatto/Box2D/archive/v2.4.1.tar.gz -> box2d-2.4.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e76e06e0c2f1f473358bd2c2c438639e
diff --git a/metadata/md5-cache/games-engines/gargoyle-2011.1-r1 b/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
deleted file mode 100644
index dfe0a8a07c84..000000000000
--- a/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2 app-arch/unzip dev-util/ftjam virtual/pkgconfig
-DESCRIPTION=An Interactive Fiction (IF) player supporting all major formats
-EAPI=6
-HOMEPAGE=http://ccxvii.net/gargoyle/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 MIT Hugo Glulxe
-RDEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=https://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fb8d1d3fb28ec3c71e12d0a0f95c1f4
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 39d2b1a561fa..0f6863aa09aa 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/opengfx-0.6.0 b/metadata/md5-cache/games-misc/opengfx-0.6.0
index 66e6a170f1d3..931702a893ff 100644
--- a/metadata/md5-cache/games-misc/opengfx-0.6.0
+++ b/metadata/md5-cache/games-misc/opengfx-0.6.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=games-util/grfcodec games-util/nml
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=games-util/grfcodec games-util/nml || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 )
 DESCRIPTION=OpenGFX data files for OpenTTD
 EAPI=7
 HOMEPAGE=http://bundles.openttdcoop.org/opengfx/
@@ -7,4 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-source.tar.xz
-_md5_=b39332239f0afb86eb0c96b0959e526a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a37c6548e0fd008cf9684e06d83b782c
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 4164ce2a0937..775bca9e5a37 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/nethack-3.6.6 b/metadata/md5-cache/games-roguelike/nethack-3.6.6
index d4f6ae4f56a5..1469bbe60396 100644
--- a/metadata/md5-cache/games-roguelike/nethack-3.6.6
+++ b/metadata/md5-cache/games-roguelike/nethack-3.6.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig X? ( x11-apps/bdftopcf x11-apps/mkfontscale )
+BDEPEND=virtual/pkgconfig virtual/yacc X? ( x11-apps/bdftopcf x11-apps/mkfontscale )
 DEFINED_PHASES=compile install postinst preinst prepare
 DEPEND=acct-group/gamestat sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt ) X? ( x11-base/xorg-proto )
 DESCRIPTION=The ultimate old-school single player dungeon exploration game
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/li
 SLOT=0
 SRC_URI=https://nethack.org/download/3.6.6/nethack-366-src.tgz -> nethack-3.6.6.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b44d75e1ff61a0ac26d8b2859b08646
+_md5_=e255945d50cd5cfb2fba83099c28a3e0
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 14a0a8c877cc..f04ae1618292 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.201.03 b/metadata/md5-cache/games-server/bedrock-server-1.16.201.03
deleted file mode 100644
index 25db180d8d78..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.16.201.03
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.201.03.zip
-_md5_=171dd53b663eab1cf9ee2e5835641b15
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.210.06 b/metadata/md5-cache/games-server/bedrock-server-1.16.210.06
new file mode 100644
index 000000000000..af4a228c531c
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.16.210.06
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.210.06.zip
+_md5_=171dd53b663eab1cf9ee2e5835641b15
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index d362406e2782..b6f162bd0eca 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/openrct2-0.3.3 b/metadata/md5-cache/games-simulation/openrct2-0.3.3
new file mode 100644
index 000000000000..81dd89e2a070
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.3
@@ -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 ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( 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 libressl +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 ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=46cb1072f3edfbc3db464710af6a47b7
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index c1a31dcc9002..40044fc5b3df 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 ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( 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.18/objects.zip -> openrct2-objects-1.0.18.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.19/replays.zip -> openrct2-replays-0.0.19.zip )
+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.31/replays.zip -> openrct2-replays-0.0.31.zip )
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77d9619a7de5a01870b25773640aafbb
+_md5_=38af123536673e869a8fe77fb55de625
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
deleted file mode 100644
index 7b9579ca0564..000000000000
--- a/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Data files for 0ad
-EAPI=6
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-data.tar.xz
-_md5_=24409256c806f1dba6c0baf4989b2e64
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.23b_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.23b_alpha
deleted file mode 100644
index 996629e71879..000000000000
--- a/metadata/md5-cache/games-strategy/0ad-data-0.0.23b_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Data files for 0ad
-EAPI=7
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-data.tar.xz
-_md5_=d57bb46625cafe6d36b54243cf3dab1b
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.24_alpha_pre20210116040036 b/metadata/md5-cache/games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
deleted file mode 100644
index bdf6f65da200..000000000000
--- a/metadata/md5-cache/games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=~games-strategy/0ad-0.0.24_alpha_pre20210116040036[nvtt]
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Data files for 0ad
-EAPI=7
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BitstreamVera CC-BY-SA-3.0 GPL-2 LPPL-1.3c
-SLOT=0
-SRC_URI=https://github.com/0ad/0ad/archive/c7d07d3979f969b969211a5e5748fa775f6768a7.tar.gz -> 0ad-0.0.24_alpha_pre20210116040036.tar.gz
-_md5_=581083722271955afcf50a847788f97b
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index bf7b8e4c87cb..af9d217a9a7f 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 53d1971cf67f..583476f38231 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/game-device-udev-rules-20201209 b/metadata/md5-cache/games-util/game-device-udev-rules-20201209
deleted file mode 100644
index 8ff696bfd0a2..000000000000
--- a/metadata/md5-cache/games-util/game-device-udev-rules-20201209
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=udev rules for various game hardware devices
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Games
-IUSE=+acl elogind systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=acl? ( elogind? ( sys-auth/elogind[acl] ) systemd? ( sys-apps/systemd[acl] ) ) !acl? ( acct-group/input ) virtual/udev
-REQUIRED_USE=acl? ( || ( elogind systemd ) )
-SLOT=0
-SRC_URI=https://github.com/ValveSoftware/steam-devices/archive/3f9f151f8bb3caed0bee9e68d421562166605fd9.tar.gz -> steam-devices-3f9f151f8bb3caed0bee9e68d421562166605fd9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=9168520b22086b7247f0c9c17ab05475
diff --git a/metadata/md5-cache/games-util/game-device-udev-rules-20201228 b/metadata/md5-cache/games-util/game-device-udev-rules-20201228
new file mode 100644
index 000000000000..d7c7b07c54d9
--- /dev/null
+++ b/metadata/md5-cache/games-util/game-device-udev-rules-20201228
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=udev rules for various game hardware devices
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Games
+IUSE=+acl elogind systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=acl? ( elogind? ( sys-auth/elogind[acl] ) systemd? ( sys-apps/systemd[acl] ) ) !acl? ( acct-group/input ) virtual/udev
+REQUIRED_USE=acl? ( || ( elogind systemd ) )
+SLOT=0
+SRC_URI=https://github.com/ValveSoftware/steam-devices/archive/ebc0f6a9e30bc0db2344df298c061c2c3b01776f.tar.gz -> steam-devices-ebc0f6a9e30bc0db2344df298c061c2c3b01776f.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=23d81d18918d06ca93e0ce5b03241fce
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9 b/metadata/md5-cache/games-util/xpadneo-0.9
new file mode 100644
index 000000000000..47b9538af38a
--- /dev/null
+++ b/metadata/md5-cache/games-util/xpadneo-0.9
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+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=Advanced Linux Driver for Xbox One Wireless Controller
+EAPI=7
+HOMEPAGE=https://atar-axis.github.io/xpadneo/
+IUSE=kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.tar.gz -> xpadneo-0.9.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2cc68bec827630676c56c817cef33361
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
new file mode 100644
index 000000000000..6d30c7943288
--- /dev/null
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst postrm preinst setup unpack
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Advanced Linux Driver for Xbox One Wireless Controller
+EAPI=7
+HOMEPAGE=https://atar-axis.github.io/xpadneo/
+IUSE=kernel_linux kernel_linux dist-kernel
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b335e7d499664d04f216e53aa8880c41
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index c0afb9029e04..f9268a7c211f 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.40.0 b/metadata/md5-cache/gnome-base/dconf-0.40.0
new file mode 100644
index 000000000000..5d6b185d4f79
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-0.40.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.15 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple low-level configuration system
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/dconf
+IUSE=gtk-doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf/0.40/dconf-0.40.0.tar.xz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e7b0f750e34956e77f7f3737d79db8
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.38.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.38.2
new file mode 100644
index 000000000000..7ad676156766
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.38.2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical tool for editing the dconf configuration database
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/dconf-editor
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf-editor/3.38/dconf-editor-3.38.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=024330d140a2c44760f00b0b8be8bb51
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.38.4 b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.4
new file mode 100644
index 000000000000..81e4f569385a
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 x11-base/xorg-proto dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.9 dev-python/dbusmock[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbusmock[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/dbusmock[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gui-libs/libhandy-1:1= gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 >=gnome-base/gnome-desktop-3.27.90:3= >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.37.0 dev-libs/libxml2:2 >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy flickr? ( >=media-libs/grilo-0.3.0:0.3= ) >=x11-libs/gtk+-3.22.0:3[X,wayland=] cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) v4l? ( >=media-video/cheese-3.28.0 ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 >=net-misc/networkmanager-1.20.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.1.24 net-libs/libsoup:2.4 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret media-libs/gsound >=dev-libs/libpwquality-1.2.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
+EAPI=7
+HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
+IUSE=+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
+RDEPEND=>=gui-libs/libhandy-1:1= gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 >=gnome-base/gnome-desktop-3.27.90:3= >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.37.0 dev-libs/libxml2:2 >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy flickr? ( >=media-libs/grilo-0.3.0:0.3= ) >=x11-libs/gtk+-3.22.0:3[X,wayland=] cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) v4l? ( >=media-video/cheese-3.28.0 ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 >=net-misc/networkmanager-1.20.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.1.24 net-libs/libsoup:2.4 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret media-libs/gsound >=dev-libs/libpwquality-1.2.2 systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+REQUIRED_USE=flickr? ( gnome-online-accounts ) ^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-control-center/3.38/gnome-control-center-3.38.4.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-3.38.3-patchset.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13dbc30c3ddc5530f430a24357f39f2a
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
index 79ecd09f3e0c..d9ce47ee4520 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
@@ -5,9 +5,9 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.38/gsettings-desktop-schemas-3.38.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91143f982145900b736a7890b2339cd8
+_md5_=6efeb1403c7ba352f08be31075735822
diff --git a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1 b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
index 5f1c2905b089..d1d90d6cb937 100644
--- a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
+++ b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Gnome 2 Canvas library
 EAPI=5
 HOMEPAGE=https://library.gnome.org/devel/libgnomecanvas/stable/
 IUSE=glade abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 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(-)?] >=x11-libs/gtk+-2.24.23:2[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/libart_lgpl-2.3.21-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.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(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.3.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1832d5d7915fed9b9c0a9fb2cdc40f8e
+_md5_=79d9215826dce0a8b63eb95dca34a4c7
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 14df093b6149..fa379f171a20 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/gnome-shell-extension-appindicator-34 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
index bdd748878361..e86a46a37e62 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome
 EAPI=7
 HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v34.tar.gz -> gnome-shell-extension-appindicator-34.tar.gz
-_md5_=1494c0662409e38cec8f863114528280
+_md5_=fec7235e50738cc5dedb7de4b67e3270
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
index 6adb3e78893f..ca9575983cdf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Show tooltip with full name and description
 EAPI=7
 HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
 SLOT=0
 SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v10.tar.gz -> gnome-shell-extension-applications-overview-tooltip-10.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0996f20a2fffabac22751c718659877f
+_md5_=e090dbbfae874b4404e4023a1dbaba7f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
index 8a9ba85bdd8b..3eb02c2cf91c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Changes your wallpaper daily to the bing.com background image
 EAPI=7
 HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.28
 SLOT=0
 SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v28.tar.gz -> gnome-shell-extension-bing-wallpaper-28.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cc83d42f4bc1ca49bb818f6e0949b5a
+_md5_=9e670e1b6b9c7550b6a5a15a3bd8e5ba
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16-r1
index 03226edfb836..a856d62512d4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
 EAPI=7
 HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
 SLOT=0
 SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v16.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-16.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bc2ed6011da74b4531cf8f424cbc947
+_md5_=16498780019e2874ae81f52d817c225f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
deleted file mode 100644
index c3ebcc36df97..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=dev-libs/glib:2
-DESCRIPTION=Control the blur effect on gnome-shell lock screen
-EAPI=7
-HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36.4
-SLOT=0
-SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/df16335b2b7f4bbbd22b9e95a16f074ae405b3a3.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd148095a0635e9b00ba7eaef80c2617
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
index ff472d788f48..1478eb9bb1e2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Control the blur effect on gnome-shell lock screen
 EAPI=7
 HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36.4
 SLOT=0
 SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/748b95e931b6b1548b90ceeee7a5883da3e0529f.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35019b983e3b34d6737ffb5861fc7076
+_md5_=99ce2fb0ea62c9d97d3447f2cf8635b3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2
deleted file mode 100644
index 9cc54a6b64b2..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=dev-libs/glib:2
-DESCRIPTION=A GNOME Shell extension for providing desktop icons
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/-/archive/219eaf7c76b06f9fadb47ee2470cf166f2a070c4/desktop-icons-20.04.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7257a7fbba36290c0a8fc1c6745a76dd
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.10.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.10.0
index 8e83b954f085..d681054d8ca6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.10.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.10.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=A GNOME Shell extension for providing desktop icons
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/5e2d0748cf79d255d7c23df6a6e6901b/desktop-icons-20.10.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76a3db07ce1d94a37c1e5378fc51190c
+_md5_=3bd47fd5fed4ae63a6975964df06a48f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-41 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-41
deleted file mode 100644
index f85e76f23785..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-41
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KDE Connect implementation for Gnome Shell
-EAPI=7
-HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
-IUSE=nautilus
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 =gnome-base/gnome-shell-3.36* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
-SLOT=0
-SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v41.tar.gz -> gnome-shell-extension-gsconnect-41.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fd9bb3d6084a386266226aca0d6d3f5
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
index 861d2dfaa9d4..8959c6ad0aab 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=7
 HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
 IUSE=nautilus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 =gnome-base/gnome-shell-3.38* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v44.tar.gz -> gnome-shell-extension-gsconnect-44.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09fa1e90f7776b52f25e2adbce327d69
+_md5_=5b54f06cbc8df18ee6362845eb74b1f2
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1
new file mode 100644
index 000000000000..19d5e6f6a8d1
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.54.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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Customize advanced GNOME 3 options
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+ CC0-1.0
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_9(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:0.0[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweaks/3.34/gnome-tweaks-3.34.1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dae38ea41f029be7d39c58a264d9789d
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.47 b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
index 4acfa0962968..d778c4e8c1ad 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.47
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.47.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05a1339e1f382fbd6d48bf67a6bd643d
+_md5_=27cf9ce90694f45401651e664eff9a30
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.38.1 b/metadata/md5-cache/gnome-extra/pch-session-3.38.1
deleted file mode 100644
index ac7442a8b12e..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-3.38.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=7
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-3.38 >=gnome-extra/gnome-shell-extensions-3.38 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-10 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901 >=gnome-extra/gnome-shell-extension-dash-to-panel-40 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2 >=gnome-extra/gnome-shell-extension-gsconnect-44 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.38.1/pch-session-3.38.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6a314280f7305b710a52ae106b52b75
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.38.2 b/metadata/md5-cache/gnome-extra/pch-session-3.38.2
index b0e4d1318289..06653df43d00 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-3.38.2
+++ b/metadata/md5-cache/gnome-extra/pch-session-3.38.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Unofficial gnome based session with different default settings and extensions
 EAPI=7
 HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/gnome-shell-3.38 >=gnome-extra/gnome-shell-extensions-3.38 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-10 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901 >=gnome-extra/gnome-shell-extension-dash-to-panel-40 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2 >=gnome-extra/gnome-shell-extension-gsconnect-44 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
 SLOT=0
 SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.38.2/pch-session-3.38.2.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=632205977aa9ac10eccbd11bdf8d313a
+_md5_=2884deb0b27ee68db25fd5fe2a35cd9e
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.38.0 b/metadata/md5-cache/gnome-extra/sushi-3.38.0
new file mode 100644
index 000000000000..c4f3b1f33ae4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/sushi-3.38.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=dev-libs/gjs-1.40 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
+EAPI=7
+HOMEPAGE=https://git.gnome.org/browse/sushi
+IUSE=office wayland +X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=dev-libs/gjs-1.40 >=gnome-base/nautilus-3.1.90 office? ( app-office/libreoffice )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=mirror://gnome/sources/sushi/3.38/sushi-3.38.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f206110c8edfb9ebab1500fcf327214c
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.38.3 b/metadata/md5-cache/gnome-extra/yelp-3.38.3
new file mode 100644
index 000000000000..dad039ef854c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-3.38.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 >=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/3.38/yelp-3.38.3.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4decb93817b0beae5df0fdb62ba2dd1f
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3
new file mode 100644
index 000000000000..4b0682396ab0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=XSL stylesheets for yelp
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-xsl/3.38/yelp-xsl-3.38.3.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0638266ebb248b83ff9d17fc8536d26
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 3166e2373f3a..c606963b7915 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.3-r1 b/metadata/md5-cache/gui-apps/waybar-0.9.3-r1
deleted file mode 100644
index 41a8c957a835..000000000000
--- a/metadata/md5-cache/gui-apps/waybar-0.9.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
-DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors
-EAPI=7
-HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=mpd network popups pulseaudio tray +udev
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
-SLOT=0
-SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.3.tar.gz -> waybar-0.9.3.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=66808c0bd536e136fcc5fb37b689e174
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.4 b/metadata/md5-cache/gui-apps/waybar-0.9.4
deleted file mode 100644
index abf7918137f2..000000000000
--- a/metadata/md5-cache/gui-apps/waybar-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
-DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors
-EAPI=7
-HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=mpd network popups pulseaudio tray +udev
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
-SLOT=0
-SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.4.tar.gz -> waybar-0.9.4.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=838cbc6221d612472f698af5046b71b4
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index e4cd54c35b0b..799b36401b2b 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/kdepim-apps-libs-20.08.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.3
deleted file mode 100644
index 92f779375716..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.3
+++ /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.74.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-apps/akonadi-20.08.3:5 >=kde-apps/akonadi-contacts-20.08.3:5 >=kde-apps/grantleetheme-20.08.3:5 >=kde-apps/libkleo-20.08.3:5 >=kde-apps/pimcommon-20.08.3:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcontacts-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/prison-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=7
-HOMEPAGE=https://apps.kde.org/en/kontact
-IUSE=test debug test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-apps/akonadi-20.08.3:5 >=kde-apps/akonadi-contacts-20.08.3:5 >=kde-apps/grantleetheme-20.08.3:5 >=kde-apps/libkleo-20.08.3:5 >=kde-apps/pimcommon-20.08.3:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcontacts-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/prison-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? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6c2ac151a7ae4f7f97cfed4bb06b756
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index fdfb1a23b14c..c64133906fab 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.79.0 b/metadata/md5-cache/kde-frameworks/attica-5.79.0
deleted file mode 100644
index 011dc88c30fc..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/attica-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8516649e62a853b3f28272e11f24d5a6
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.80.0 b/metadata/md5-cache/kde-frameworks/attica-5.80.0
new file mode 100644
index 000000000000..3409ce9b7231
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/attica-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8516649e62a853b3f28272e11f24d5a6
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.79.0 b/metadata/md5-cache/kde-frameworks/baloo-5.79.0
deleted file mode 100644
index 5b5f47b919e9..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kfilemetadata-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kidletime-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/solid-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kfilemetadata-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kidletime-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/solid-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/baloo-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c07d3b8894d94bb9b5cb78c220720199
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.80.0 b/metadata/md5-cache/kde-frameworks/baloo-5.80.0
new file mode 100644
index 000000000000..f13d6a438a9c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kfilemetadata-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kidletime-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/solid-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kfilemetadata-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kidletime-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/solid-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/baloo-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c07d3b8894d94bb9b5cb78c220720199
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.79.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.79.0
deleted file mode 100644
index fb177ffcbd5b..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=776828e8a6916a3e0708f2fe0171d51d
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.80.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.80.0
new file mode 100644
index 000000000000..31d0651bfa81
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/bluez-qt-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=776828e8a6916a3e0708f2fe0171d51d
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.79.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.79.0
deleted file mode 100644
index ec1bc0e3aff4..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.79:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e323bc4005012b7a55ea56189381884
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.80.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.80.0
new file mode 100644
index 000000000000..7010ab4f9221
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.80:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/breeze-icons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e323bc4005012b7a55ea56189381884
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.79.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.79.0
deleted file mode 100644
index bd1eee98352e..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.79:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b3f84bb40f3a80e4c9394aa9a76411b
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.80.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.80.0
new file mode 100644
index 000000000000..141197d3dc42
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.80:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/breeze-icons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b3f84bb40f3a80e4c9394aa9a76411b
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.79.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.79.0
deleted file mode 100644
index ef8bfc980cb2..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=dev-qt/qthelp-5.15.2:5 ) test? ( >=dev-qt/linguist-tools-5.15.2:5 >=dev-qt/qtcore-5.15.2:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae483ead2b316dab17172f3495d2f729
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.80.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.80.0
new file mode 100644
index 000000000000..a6cd1c8a158a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=dev-qt/qthelp-5.15.2:5 ) test? ( >=dev-qt/linguist-tools-5.15.2:5 >=dev-qt/qtcore-5.15.2:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/extra-cmake-modules-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae483ead2b316dab17172f3495d2f729
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.79.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.79.0
deleted file mode 100644
index 33967d77b9ea..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.79.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.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/knewstuff-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/knewstuff-5.79*:5 =kde-frameworks/knotifications-5.79*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44abdda9da5740ffccf171d957b5fb19
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.80.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.80.0
new file mode 100644
index 000000000000..73e792d43ce7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.80.0
@@ -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.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/knewstuff-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/knewstuff-5.80*:5 =kde-frameworks/knotifications-5.80*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/frameworkintegration-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44abdda9da5740ffccf171d957b5fb19
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.79.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.79.0
deleted file mode 100644
index 4ec88f3137ae..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kactivities-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bffe162fec757ca9dc958d42bcdac6a7
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.80.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.80.0
new file mode 100644
index 000000000000..ed00830ca827
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kactivities-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bffe162fec757ca9dc958d42bcdac6a7
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.79.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.79.0
deleted file mode 100644
index 3cb8c48cf766..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.79*:5 =kde-frameworks/kconfig-5.79*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.79*:5 =kde-frameworks/kconfig-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5aea89a80b6fa7cea3c7062c9526ee26
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.80.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.80.0
new file mode 100644
index 000000000000..c023f3dfeee9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.80*:5 =kde-frameworks/kconfig-5.80*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.80*:5 =kde-frameworks/kconfig-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kactivities-stats-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5aea89a80b6fa7cea3c7062c9526ee26
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.79.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.79.0
deleted file mode 100644
index 701620340d74..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kapidox-5.79.0.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	kde.org	1c383520a04b2d5564075764eaf0bde0	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2215bdc37dfeffb09f65de4e7f271b5
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.80.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.80.0
new file mode 100644
index 000000000000..313e9aa8a576
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kapidox-5.80.0.tar.xz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	kde.org	1c383520a04b2d5564075764eaf0bde0	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d2215bdc37dfeffb09f65de4e7f271b5
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.79.0 b/metadata/md5-cache/kde-frameworks/karchive-5.79.0
deleted file mode 100644
index 6bdea78594fa..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/karchive-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20ebdb44c042eaba3f9a48c13f78aab5
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.80.0 b/metadata/md5-cache/kde-frameworks/karchive-5.80.0
new file mode 100644
index 000000000000..a54bf592a179
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/karchive-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20ebdb44c042eaba3f9a48c13f78aab5
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.79.0 b/metadata/md5-cache/kde-frameworks/kauth-5.79.0
deleted file mode 100644
index db4154a8e96b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.79.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kauth-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=241e87d50aaf188757d1dfd8520c7213
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.80.0 b/metadata/md5-cache/kde-frameworks/kauth-5.80.0
new file mode 100644
index 000000000000..081ee85af57e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.80.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kauth-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=241e87d50aaf188757d1dfd8520c7213
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.79.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.79.0
deleted file mode 100644
index 29c7532a6b2d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kconfigwidgets-5.79:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da4f8caf8bb3aac0d7d836587de81c3
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.80.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.80.0
new file mode 100644
index 000000000000..3540ed6f78f4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kconfigwidgets-5.80:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kbookmarks-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5da4f8caf8bb3aac0d7d836587de81c3
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.79.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.79.0
deleted file mode 100644
index c5ef83666ff5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67cb406eb21e6b1561295e2a0e936466
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.80.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.80.0
new file mode 100644
index 000000000000..7490f7b18625
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcalendarcore-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67cb406eb21e6b1561295e2a0e936466
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.79.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.79.0
deleted file mode 100644
index 9e7f594609e1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9772842f582a8291c6c074d4ad88d19
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.80.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.80.0
new file mode 100644
index 000000000000..b4b1847ebfd3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcmutils-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b9772842f582a8291c6c074d4ad88d19
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.79.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.79.0
deleted file mode 100644
index f5e47d5079eb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f116733276df6ae11be55604633f372
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.80.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.80.0
new file mode 100644
index 000000000000..4c8b1d0e88a4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcodecs-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f116733276df6ae11be55604633f372
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.79.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.79.0
deleted file mode 100644
index b1841c6c863a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3513182ddf43be9a46ebb59fe9ec9af9
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.80.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.80.0
new file mode 100644
index 000000000000..bf243d9e285b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcompletion-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3513182ddf43be9a46ebb59fe9ec9af9
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.79.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.79.0
deleted file mode 100644
index d2778a45bceb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kconfig-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c44964139f2be3e817521ee3893b2a1
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.80.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.80.0
new file mode 100644
index 000000000000..36c7ffa899e4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kconfig-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c44964139f2be3e817521ee3893b2a1
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.79.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.79.0
deleted file mode 100644
index b534380c58ba..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a3c1fb521fe5972ee4b7eb04feb7b92
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.80.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.80.0
new file mode 100644
index 000000000000..34300c4ab356
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kconfigwidgets-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a3c1fb521fe5972ee4b7eb04feb7b92
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.79.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.79.0
deleted file mode 100644
index 22a569e5e56c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4216c1dc35bdcd152028f49c6d6bc4fd
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.80.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.80.0
new file mode 100644
index 000000000000..d533e37156a4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcontacts-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4216c1dc35bdcd152028f49c6d6bc4fd
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.79.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.79.0
deleted file mode 100644
index 32ae3c2ecf9b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27258e1be8e7e5fd4d0b1ce90b0be6e6
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.80.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.80.0
new file mode 100644
index 000000000000..0f98f507d0f9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcoreaddons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a618a2507a03494ec24f0408428d90d
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.79.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.79.0
deleted file mode 100644
index 5f35106e7cd4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kcrash-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32554cc1d32ac43cac337f0b743bfa41
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.80.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.80.0
new file mode 100644
index 000000000000..b467eac7a027
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kcrash-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32554cc1d32ac43cac337f0b743bfa41
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.79.0 b/metadata/md5-cache/kde-frameworks/kdav-5.79.0
deleted file mode 100644
index 0bc4655c5fce..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdav-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.79:5 >=kde-frameworks/ki18n-5.79:5 >=kde-frameworks/kio-5.79:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.79:5 >=kde-frameworks/ki18n-5.79:5 >=kde-frameworks/kio-5.79:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kdav-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d0bdf86374c78a76fbede4ada6fab6b
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.80.0 b/metadata/md5-cache/kde-frameworks/kdav-5.80.0
new file mode 100644
index 000000000000..6cb186c721ed
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80:5 >=kde-frameworks/ki18n-5.80:5 >=kde-frameworks/kio-5.80:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80:5 >=kde-frameworks/ki18n-5.80:5 >=kde-frameworks/kio-5.80:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdav-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d0bdf86374c78a76fbede4ada6fab6b
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.79.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.79.0
deleted file mode 100644
index c7de83d7c8aa..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1991ce1586e66d30fcb115d13680cd5
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.80.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.80.0
new file mode 100644
index 000000000000..6c94d9503dc4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdbusaddons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1991ce1586e66d30fcb115d13680cd5
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.79.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.79.0
deleted file mode 100644
index 64661569b378..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=549aabd7b38c0a799790dd1e2fb1d4ea
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.80.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.80.0
new file mode 100644
index 000000000000..2856d13175be
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdeclarative-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=549aabd7b38c0a799790dd1e2fb1d4ea
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.79.0 b/metadata/md5-cache/kde-frameworks/kded-5.79.0
deleted file mode 100644
index 5d6876f2a7be..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kinit-5.79*:5 =kde-frameworks/kservice-5.79*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kinit-5.79*:5 =kde-frameworks/kservice-5.79*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kded-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a8962f7bb454b35f78897a9f8700a26
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.80.0 b/metadata/md5-cache/kde-frameworks/kded-5.80.0
new file mode 100644
index 000000000000..30f74a319efc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kinit-5.80*:5 =kde-frameworks/kservice-5.80*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kinit-5.80*:5 =kde-frameworks/kservice-5.80*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kded-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a8962f7bb454b35f78897a9f8700a26
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.79.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.79.0
deleted file mode 100644
index 9ea8a6b69262..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.79:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 >=kde-frameworks/kded-5.79:5 =kde-frameworks/kdoctools-5.79*:5 =kde-frameworks/kemoticons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kunitconversion-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/solid-5.79*:5 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 >=kde-frameworks/kded-5.79:5 =kde-frameworks/kdoctools-5.79*:5 =kde-frameworks/kemoticons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kunitconversion-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/solid-5.79*:5 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.79*:5 =kde-frameworks/kitemmodels-5.79*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fcae23d9f204d5211b9e1942a7ae947
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.80.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.80.0
new file mode 100644
index 000000000000..4fc9358e74b8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 >=kde-frameworks/kded-5.80:5 =kde-frameworks/kdoctools-5.80*:5 =kde-frameworks/kemoticons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kunitconversion-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/solid-5.80*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 >=kde-frameworks/kded-5.80:5 =kde-frameworks/kdoctools-5.80*:5 =kde-frameworks/kemoticons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kunitconversion-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/solid-5.80*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.80*:5 =kde-frameworks/kitemmodels-5.80*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/portingAids/kdelibs4support-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7dabab885bf5eb9984d96094cb301636
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.79.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.79.0
deleted file mode 100644
index c2d8053339c9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kpty-5.79*:5 =kde-frameworks/kservice-5.79*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kpty-5.79*:5 =kde-frameworks/kservice-5.79*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kdesu-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0e2eb5357928579b3229e3e297b1ea0
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.80.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.80.0
new file mode 100644
index 000000000000..fbcb98bcf3f1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kpty-5.80*:5 =kde-frameworks/kservice-5.80*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kpty-5.80*:5 =kde-frameworks/kservice-5.80*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdesu-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0e2eb5357928579b3229e3e297b1ea0
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.80.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.80.0
new file mode 100644
index 000000000000..b6d0f6d0082e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdnssd-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e556ce795f2a4f785b1b437606efe1f2
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.79.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.79.0
deleted file mode 100644
index 71e508de49e8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.79:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.79*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.79*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b7a10c64fc3946d4d7890ae594d7fd9
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.80.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.80.0
new file mode 100644
index 000000000000..763ec41e0e83
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.80:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.80*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.80*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kdoctools-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b7a10c64fc3946d4d7890ae594d7fd9
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.79.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.79.0
deleted file mode 100644
index 2ea9cac0044b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kservice-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kservice-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc62f9bb2db06b38b028274bd94aa581
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.80.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.80.0
new file mode 100644
index 000000000000..1bcc4b25b74d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kservice-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kservice-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kemoticons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc62f9bb2db06b38b028274bd94aa581
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.79.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.79.0
deleted file mode 100644
index fb4fec26ac0a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.79*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.79*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ec4a4175f3013cb4830e1487edbe549
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
new file mode 100644
index 000000000000..27a5bef69812
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.80*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.80*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kfilemetadata-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ec4a4175f3013cb4830e1487edbe549
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.79.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.79.0
deleted file mode 100644
index 7d5740a81d92..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c230568a60f839cb023c09af818e67e3
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.80.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.80.0
new file mode 100644
index 000000000000..380c93c9b819
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kglobalaccel-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c230568a60f839cb023c09af818e67e3
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.79.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.79.0
deleted file mode 100644
index 1d7716be52c0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=977d8b5a3249798515a24cc9cae9e832
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.80.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.80.0
new file mode 100644
index 000000000000..79f27a6602e0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5[wayland?] >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=wayland test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5[wayland?] >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kguiaddons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fdefd21c0159d94cc4448fd825e1f387
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.79.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.79.0
deleted file mode 100644
index 2e07ebb63007..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kholidays-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80760306e20981b4fcad658c1800f3cc
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.80.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.80.0
new file mode 100644
index 000000000000..b7b26e997088
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kholidays-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=80760306e20981b4fcad658c1800f3cc
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.79.0 b/metadata/md5-cache/kde-frameworks/khtml-5.79.0
deleted file mode 100644
index d16845aef05d..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.79: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[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kjs-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwallet-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/sonnet-5.79*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kjs-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwallet-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/sonnet-5.79*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb7fb66553850af504104e4881b4bc18
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.80.0 b/metadata/md5-cache/kde-frameworks/khtml-5.80.0
new file mode 100644
index 000000000000..e46453a5af5c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kjs-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwallet-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/sonnet-5.80*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kjs-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwallet-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/sonnet-5.80*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/portingAids/khtml-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39b58049c89b9c1e0e6831bad4487539
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.79.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.79.0
deleted file mode 100644
index cb7cb6420cbd..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.79.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/ki18n-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92060066a68878c68b7780ce5e50d5e5
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.80.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.80.0
new file mode 100644
index 000000000000..940837b92f07
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.80.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/ki18n-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92060066a68878c68b7780ce5e50d5e5
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.79.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.79.0
deleted file mode 100644
index 187c198f11e6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24a1619710ad97dc64d0dfc8a86ce606
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.80.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.80.0
new file mode 100644
index 000000000000..97c13b83fbe3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kiconthemes-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24a1619710ad97dc64d0dfc8a86ce606
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.79.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.79.0
deleted file mode 100644
index 1e8a88d721dd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kidletime-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7c121177d51394fc786e8e1f2ca8997
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.80.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.80.0
new file mode 100644
index 000000000000..1ebea594a704
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kidletime-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7c121177d51394fc786e8e1f2ca8997
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.79.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.79.0
deleted file mode 100644
index 2ac01d2d1908..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.79.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.79: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.79*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) 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 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.79*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ce9064208478c36dbb3b7b8c62b2ff8
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.80.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.80.0
new file mode 100644
index 000000000000..945215aa00a7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.80.0
@@ -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.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.80*: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.80*: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.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kimageformats-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dac815c470e3b9ee0330ad1a88f1e75
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.79.0 b/metadata/md5-cache/kde-frameworks/kinit-5.79.0
deleted file mode 100644
index adc2ee3345be..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kinit-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a5c9e13d5890ab99385d3536e9ccbee
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.80.0 b/metadata/md5-cache/kde-frameworks/kinit-5.80.0
new file mode 100644
index 000000000000..fc8731f3a947
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kinit-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a5c9e13d5890ab99385d3536e9ccbee
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.79.0 b/metadata/md5-cache/kde-frameworks/kio-5.79.0
deleted file mode 100644
index b15f6be72bf9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.79.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kbookmarks-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/solid-5.79*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.79*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.79*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.79:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kbookmarks-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/solid-5.79*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.79*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.79*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kio-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91a04d43fee7d66d5f3dd3edfc63bc21
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.80.1 b/metadata/md5-cache/kde-frameworks/kio-5.80.1
new file mode 100644
index 000000000000..d611357a0a81
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.80.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kbookmarks-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/solid-5.80*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.80*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.80*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.80:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kbookmarks-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/solid-5.80*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.80*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.80*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kio-5.80.1.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91a04d43fee7d66d5f3dd3edfc63bc21
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.77.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.77.0
deleted file mode 100644
index 13a03632c246..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.77.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.1:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.77:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-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/qtquickcontrols2-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.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/qtquickcontrols2-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.77
-SRC_URI=mirror://kde/stable/frameworks/5.77/kirigami2-5.77.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf56406a4971c82dc91ddfe4c0562481
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.79.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.79.0
deleted file mode 100644
index 4bf85e1696f0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc3721e3d570c26ae271a7b15ac5c39
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.80.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.80.0
new file mode 100644
index 000000000000..2da4deb1a2eb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kirigami2-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dc3721e3d570c26ae271a7b15ac5c39
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.79.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.79.0
deleted file mode 100644
index f7a462bc98f9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b81fdf395fb8ef8c9bbabee7b2892604
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.80.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.80.0
new file mode 100644
index 000000000000..0d78caf64461
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kitemmodels-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b81fdf395fb8ef8c9bbabee7b2892604
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.79.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.79.0
deleted file mode 100644
index 814d24ec56f7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b700afc793d208f4634b327f3a6e0e95
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.80.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.80.0
new file mode 100644
index 000000000000..896e56fb94a4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kitemviews-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b700afc793d208f4634b327f3a6e0e95
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.79.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.79.0
deleted file mode 100644
index cb8c0801df0e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c62372e2f3982e3c70936141e2ccabdb
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.80.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.80.0
new file mode 100644
index 000000000000..18a42beb74d9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kjobwidgets-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c62372e2f3982e3c70936141e2ccabdb
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.79.0 b/metadata/md5-cache/kde-frameworks/kjs-5.79.0
deleted file mode 100644
index 6e87d0c7b4d1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.79:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=042f9f07f1bbacc8de846bfb8ab0f9d0
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.80.0 b/metadata/md5-cache/kde-frameworks/kjs-5.80.0
new file mode 100644
index 000000000000..e6bbe897d9d2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/portingAids/kjs-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=042f9f07f1bbacc8de846bfb8ab0f9d0
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.79.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.79.0
deleted file mode 100644
index 0f17f33de8a1..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kirigami-5.79:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1338fee755c60b4d3440d6fbf301cfb5
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.80.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.80.0
new file mode 100644
index 000000000000..744ab56479be
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kirigami-5.80:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/knewstuff-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1338fee755c60b4d3440d6fbf301cfb5
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.79.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.79.0
deleted file mode 100644
index af09719d2623..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/knotifications-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8364561cf7ca9fea7ffb4074fc8d3a02
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.80.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.80.0
new file mode 100644
index 000000000000..c2fa03172545
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/knotifications-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8364561cf7ca9fea7ffb4074fc8d3a02
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.79.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.79.0
deleted file mode 100644
index a6d0b9beaa3a..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28d536fa7eada0b9b2cf65f19323f5b9
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.80.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.80.0
new file mode 100644
index 000000000000..eacf8f331978
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/knotifyconfig-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28d536fa7eada0b9b2cf65f19323f5b9
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.79.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.79.0
deleted file mode 100644
index 36cbae49c58d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kpackage-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8b80b445ff9683f9aafe29925d26bd6
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.80.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.80.0
new file mode 100644
index 000000000000..ed322a4c4574
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kpackage-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8b80b445ff9683f9aafe29925d26bd6
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.79.0 b/metadata/md5-cache/kde-frameworks/kparts-5.79.0
deleted file mode 100644
index 26bfb2331d30..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/ktextwidgets-5.79:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kparts-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=001c184f6288e2a74330eaf5f13c25a0
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.80.0 b/metadata/md5-cache/kde-frameworks/kparts-5.80.0
new file mode 100644
index 000000000000..532b92feb156
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/ktextwidgets-5.80:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kparts-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=001c184f6288e2a74330eaf5f13c25a0
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.79.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.79.0
deleted file mode 100644
index 3b82752b16b7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kpeople
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kpeople-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af99ba7b77ac14e29f817b6614103352
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.80.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.80.0
new file mode 100644
index 000000000000..67484a8bd661
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kpeople
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kpeople-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af99ba7b77ac14e29f817b6614103352
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.79.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.79.0
deleted file mode 100644
index 367ec1f86fb8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kplotting-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb2b9aa05659165788533e02301918d0
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.80.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.80.0
new file mode 100644
index 000000000000..4cb073756b6d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kplotting-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb2b9aa05659165788533e02301918d0
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.79.0 b/metadata/md5-cache/kde-frameworks/kpty-5.79.0
deleted file mode 100644
index 3622c82e7600..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kpty-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b93394e11566963da161f916d4f382d
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.80.0 b/metadata/md5-cache/kde-frameworks/kpty-5.80.0
new file mode 100644
index 000000000000..8d12f8453f62
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kpty-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b93394e11566963da161f916d4f382d
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.79.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.79.0
deleted file mode 100644
index 2892660dc611..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.79.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.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kirigami-5.79*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
-IUSE=test debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kirigami-5.79*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2655231b9d56aae120c4e88f86277b81
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.80.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.80.0
new file mode 100644
index 000000000000..cfc28ebb5008
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.80.0
@@ -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.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kirigami-5.80*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kirigami-5.80*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kquickcharts-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2655231b9d56aae120c4e88f86277b81
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.79.0 b/metadata/md5-cache/kde-frameworks/kross-5.79.0
deleted file mode 100644
index ddc2c5bf05d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.79:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=dev-qt/designer-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b063fc1156e2c0ddc194810ce2af02c9
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.80.0 b/metadata/md5-cache/kde-frameworks/kross-5.80.0
new file mode 100644
index 000000000000..d28836afe55a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=dev-qt/designer-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/portingAids/kross-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b063fc1156e2c0ddc194810ce2af02c9
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.79.0 b/metadata/md5-cache/kde-frameworks/krunner-5.79.0
deleted file mode 100644
index c803fb4b5784..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/plasma-5.79*:5 =kde-frameworks/solid-5.79*:5 =kde-frameworks/threadweaver-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/plasma-5.79*:5 =kde-frameworks/solid-5.79*:5 =kde-frameworks/threadweaver-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/krunner-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3dc1c0bfef5d8c0fbf5c3dee530a7df7
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.80.0 b/metadata/md5-cache/kde-frameworks/krunner-5.80.0
new file mode 100644
index 000000000000..f944a34c0afb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/plasma-5.80*:5 =kde-frameworks/solid-5.80*:5 =kde-frameworks/threadweaver-5.80*:5 activities? ( =kde-frameworks/kactivities-5.80*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=activities test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/plasma-5.80*:5 =kde-frameworks/solid-5.80*:5 =kde-frameworks/threadweaver-5.80*:5 activities? ( =kde-frameworks/kactivities-5.80*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/krunner-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9c8c0f45df131f4bbb982afd1e5bc4a
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.79.0 b/metadata/md5-cache/kde-frameworks/kservice-5.79.0
deleted file mode 100644
index d315bb613f0c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kcrash-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kservice-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac16f21350bc3b4441e8b4b16da61998
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.80.0 b/metadata/md5-cache/kde-frameworks/kservice-5.80.0
new file mode 100644
index 000000000000..5628f3bc7d07
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kcrash-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kservice-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac16f21350bc3b4441e8b4b16da61998
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.79.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.79.0
deleted file mode 100644
index 3c148b2b9519..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.79:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/sonnet-5.79*:5 =kde-frameworks/syntax-highlighting-5.79*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kauth-5.79*:5 =kde-frameworks/kcodecs-5.79*:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kjobwidgets-5.79*:5 =kde-frameworks/kparts-5.79*:5 =kde-frameworks/ktextwidgets-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 =kde-frameworks/sonnet-5.79*:5 =kde-frameworks/syntax-highlighting-5.79*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f46ea40d4c7f637a6d018382e2ad949
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.80.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.80.0
new file mode 100644
index 000000000000..200915590c10
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.80:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/sonnet-5.80*:5 =kde-frameworks/syntax-highlighting-5.80*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kauth-5.80*:5 =kde-frameworks/kcodecs-5.80*:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kjobwidgets-5.80*:5 =kde-frameworks/kparts-5.80*:5 =kde-frameworks/ktextwidgets-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 =kde-frameworks/sonnet-5.80*:5 =kde-frameworks/syntax-highlighting-5.80*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/ktexteditor-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f46ea40d4c7f637a6d018382e2ad949
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.79.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.79.0
deleted file mode 100644
index ecf62e003eec..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/sonnet-5.79*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/sonnet-5.79*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5fb6e01ffa2693643fc93f795aea2e4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.80.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.80.0
new file mode 100644
index 000000000000..339d8d10ea05
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/sonnet-5.80*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/sonnet-5.80*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/ktextwidgets-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5fb6e01ffa2693643fc93f795aea2e4
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.79.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.79.0
deleted file mode 100644
index f77b4a766f65..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb5af1d24568cdd9b3be2ea53a6cd946
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.80.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.80.0
new file mode 100644
index 000000000000..649f113615e7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kunitconversion-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb5af1d24568cdd9b3be2ea53a6cd946
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.79.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.79.0
deleted file mode 100644
index a898875d82b1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.79:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdbusaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kwallet-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84c453b8458b00360cb5a100bd945e7f
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.80.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.80.0
new file mode 100644
index 000000000000..701cbbfd4cf6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.80:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdbusaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kwallet-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84c453b8458b00360cb5a100bd945e7f
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.79.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.79.0
deleted file mode 100644
index fd3757808fbb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kwayland
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kwayland-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b0629169e5754dd7decf8284185a4e3
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.80.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.80.0
new file mode 100644
index 000000000000..23e8c51106a4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kwayland
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kwayland-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b0629169e5754dd7decf8284185a4e3
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.79.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.79.0
deleted file mode 100644
index 344b80da937f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd0699d8c693e2a3091f1e084c31b182
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.80.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.80.0
new file mode 100644
index 000000000000..9450b9804739
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kwidgetsaddons-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd0699d8c693e2a3091f1e084c31b182
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.79.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.79.0
deleted file mode 100644
index 11f39dde255e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06e663ed9795950f8c32518827d221e1
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.80.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.80.0
new file mode 100644
index 000000000000..0a30505a1dac
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kwindowsystem-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06e663ed9795950f8c32518827d221e1
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.79.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.79.0
deleted file mode 100644
index acb38b81eccc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kitemviews-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0345312ad90ff553a3aad16f728be72f
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.80.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.80.0
new file mode 100644
index 000000000000..152a3ff458b7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kitemviews-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/kxmlgui-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0345312ad90ff553a3aad16f728be72f
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.79.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.79.0
deleted file mode 100644
index cf358f994e8c..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=837a5b997b01de7326714f12109fc566
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.80.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.80.0
new file mode 100644
index 000000000000..250191fd532e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/modemmanager-qt-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=837a5b997b01de7326714f12109fc566
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.79.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.79.0
deleted file mode 100644
index 11a7c66c91da..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d280d82f03532c384f4ace21a0366ed
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.80.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.80.0
new file mode 100644
index 000000000000..3ff45aacb1d3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/networkmanager-qt-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d280d82f03532c384f4ace21a0366ed
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.79.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.79.0
deleted file mode 100644
index 9a1cab616ccb..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.79:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.15.2:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53b95611290300d5075fb53373dadf83
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.80.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.80.0
new file mode 100644
index 000000000000..a555969c7ce2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.80.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/qtcore-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.80:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.15.2:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/oxygen-icons5-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=53b95611290300d5075fb53373dadf83
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.79.0 b/metadata/md5-cache/kde-frameworks/plasma-5.79.0
deleted file mode 100644
index 77e5e7e3a983..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.79:5 dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kirigami-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.79*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2-only wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.79*:5 =kde-frameworks/karchive-5.79*:5 =kde-frameworks/kconfig-5.79*:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/kdeclarative-5.79*:5 =kde-frameworks/kglobalaccel-5.79*:5 =kde-frameworks/kguiaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kirigami-5.79*:5 =kde-frameworks/knotifications-5.79*:5 =kde-frameworks/kpackage-5.79*:5 =kde-frameworks/kservice-5.79*:5 =kde-frameworks/kwidgetsaddons-5.79*:5 =kde-frameworks/kwindowsystem-5.79*:5 =kde-frameworks/kxmlgui-5.79*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.79*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0be533dab6945525cce817a860572822
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.80.0 b/metadata/md5-cache/kde-frameworks/plasma-5.80.0
new file mode 100644
index 000000000000..418094874fd9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.80:5 dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kirigami-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.80*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.80*:5 =kde-frameworks/karchive-5.80*:5 =kde-frameworks/kconfig-5.80*:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/kdeclarative-5.80*:5 =kde-frameworks/kglobalaccel-5.80*:5 =kde-frameworks/kguiaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kirigami-5.80*:5 =kde-frameworks/knotifications-5.80*:5 =kde-frameworks/kpackage-5.80*:5 =kde-frameworks/kservice-5.80*:5 =kde-frameworks/kwidgetsaddons-5.80*:5 =kde-frameworks/kwindowsystem-5.80*:5 =kde-frameworks/kxmlgui-5.80*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.80*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/plasma-framework-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0be533dab6945525cce817a860572822
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.79.0 b/metadata/md5-cache/kde-frameworks/prison-5.79.0
deleted file mode 100644
index 082f7445fbe6..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/prison
-IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/prison-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=356c18ee170584c45d4c25ff5cc89cad
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.80.0 b/metadata/md5-cache/kde-frameworks/prison-5.80.0
new file mode 100644
index 000000000000..f1f175d35c00
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/prison
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/prison-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=356c18ee170584c45d4c25ff5cc89cad
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.79.0 b/metadata/md5-cache/kde-frameworks/purpose-5.79.0
deleted file mode 100644
index 89fc7f9aa0cb..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kirigami-5.79*:5 =kde-frameworks/knotifications-5.79*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=bluetooth +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.79*:5 =kde-frameworks/ki18n-5.79*:5 =kde-frameworks/kio-5.79*:5 =kde-frameworks/kirigami-5.79*:5 =kde-frameworks/knotifications-5.79*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.79:5 bluetooth? ( =kde-frameworks/bluez-qt-5.79*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/purpose-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7f7f55a216e4f78539abe1d8c329ad1
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.80.0 b/metadata/md5-cache/kde-frameworks/purpose-5.80.0
new file mode 100644
index 000000000000..21732f647756
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kirigami-5.80*:5 =kde-frameworks/knotifications-5.80*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=bluetooth +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-frameworks/ki18n-5.80*:5 =kde-frameworks/kio-5.80*:5 =kde-frameworks/kirigami-5.80*:5 =kde-frameworks/knotifications-5.80*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.80:5 bluetooth? ( =kde-frameworks/bluez-qt-5.80*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/purpose-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e7f7f55a216e4f78539abe1d8c329ad1
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.79.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.79.0
deleted file mode 100644
index 9f678daae36a..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kirigami-5.79*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.79*:5 =kde-frameworks/kiconthemes-5.79*:5 =kde-frameworks/kirigami-5.79*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78b7626feb4e0ab77fc3b97fa9a63a63
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.80.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.80.0
new file mode 100644
index 000000000000..ae302bd14769
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kirigami-5.80*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.80*:5 =kde-frameworks/kiconthemes-5.80*:5 =kde-frameworks/kirigami-5.80*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/qqc2-desktop-style-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78b7626feb4e0ab77fc3b97fa9a63a63
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.79.0 b/metadata/md5-cache/kde-frameworks/solid-5.79.0
deleted file mode 100644
index 85a4b3939c0d..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/solid-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e57db6f18172f14a2f90de02166aada
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.80.0 b/metadata/md5-cache/kde-frameworks/solid-5.80.0
new file mode 100644
index 000000000000..06090eb7ac85
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=ios nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/solid-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2e57db6f18172f14a2f90de02166aada
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.79.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.79.0
deleted file mode 100644
index 165f1f71e830..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/sonnet-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=000703ed412ab4c707442dc350c547c9
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.80.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.80.0
new file mode 100644
index 000000000000..42ca50617216
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=aspell +hunspell nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/sonnet-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=000703ed412ab4c707442dc350c547c9
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.79.0 b/metadata/md5-cache/kde-frameworks/syndication-5.79.0
deleted file mode 100644
index 44a2e63154f1..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.79*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/syndication-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c6cb1fcab20d7689adb7f0f0b09dc53
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.80.0 b/metadata/md5-cache/kde-frameworks/syndication-5.80.0
new file mode 100644
index 000000000000..a3b08833dba5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.80*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/syndication-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c6cb1fcab20d7689adb7f0f0b09dc53
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.77.0-r1 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.77.0-r1
deleted file mode 100644
index 44fac7de1129..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.77.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.77:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.77
-SRC_URI=mirror://kde/stable/frameworks/5.77/syntax-highlighting-5.77.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9731c6b782a1f5ad7d1397f4064be6dd
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.79.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.79.0
deleted file mode 100644
index 43724698344a..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/syntax-highlighting-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f6a8f0b62eba3e86c1d9d647d04d2d0
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.80.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.80.0
new file mode 100644
index 000000000000..4b9906248bc4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/syntax-highlighting-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f6a8f0b62eba3e86c1d9d647d04d2d0
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.79.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.79.0
deleted file mode 100644
index ac675c0e786d..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.79.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.79:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.79
-SRC_URI=mirror://kde/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da61434d5ddd6ecccb7446e633bfdd71
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.80.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.80.0
new file mode 100644
index 000000000000..1b35eaac6811
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.80:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.80
+SRC_URI=mirror://kde/stable/frameworks/5.80/threadweaver-5.80.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=da61434d5ddd6ecccb7446e633bfdd71
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c082266704bf..a83ab072f822 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.21.2 b/metadata/md5-cache/kde-plasma/bluedevil-5.21.2
deleted file mode 100644
index 8bc63903844c..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/bluedevil-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75f5560423fd67a3052e20dab72198a7
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.21.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.21.3
new file mode 100644
index 000000000000..60726c4c74ec
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/bluedevil-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75f5560423fd67a3052e20dab72198a7
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.21.2 b/metadata/md5-cache/kde-plasma/breeze-5.21.2
deleted file mode 100644
index 9316ae4ce9a5..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/breeze-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76ca55c2b5760347357f2cf1f24338ef
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.21.3 b/metadata/md5-cache/kde-plasma/breeze-5.21.3
new file mode 100644
index 000000000000..130cc2930012
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/breeze-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76ca55c2b5760347357f2cf1f24338ef
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.21.2 b/metadata/md5-cache/kde-plasma/breeze-grub-5.21.2
deleted file mode 100644
index 0276a3e6a40c..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.21.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/breeze-grub-5.21.2.tar.xz
-_eclasses_=kde.org	1c383520a04b2d5564075764eaf0bde0
-_md5_=0e3a4688990878e76dae032eb33e94ef
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.21.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.21.3
new file mode 100644
index 000000000000..e0ada6370fc2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.21.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/breeze-grub-5.21.3.tar.xz
+_eclasses_=kde.org	1c383520a04b2d5564075764eaf0bde0
+_md5_=0e3a4688990878e76dae032eb33e94ef
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.2 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.2
deleted file mode 100644
index 89a4d4af634b..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=kde-plasma/breeze-5.21.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/breeze-gtk-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df6890f3aa1ce96d5d86f674684a0ae1
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.3
new file mode 100644
index 000000000000..409c356bbfae
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=kde-plasma/breeze-5.21.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/breeze-gtk-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df6890f3aa1ce96d5d86f674684a0ae1
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.2 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.2
deleted file mode 100644
index bd8b01f9ae07..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.78.0:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/breeze-plymouth-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7f1444071fc06ade38cf4ece8a09ea1
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.3
new file mode 100644
index 000000000000..bdc9f71cfec3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.3
@@ -0,0 +1,13 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.78.0:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/breeze-plymouth-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e7f1444071fc06ade38cf4ece8a09ea1
diff --git a/metadata/md5-cache/kde-plasma/discover-5.21.2 b/metadata/md5-cache/kde-plasma/discover-5.21.2
deleted file mode 100644
index 98a876fd260f..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/discover-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03bfb45ec28d7f782d51a165390eccce
diff --git a/metadata/md5-cache/kde-plasma/discover-5.21.3 b/metadata/md5-cache/kde-plasma/discover-5.21.3
new file mode 100644
index 000000000000..93b936095be1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.21.3
@@ -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.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware flatpak telemetry test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/discover-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03bfb45ec28d7f782d51a165390eccce
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.21.2 b/metadata/md5-cache/kde-plasma/drkonqi-5.21.2
deleted file mode 100644
index 8df9b52e8c5d..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/syntax-highlighting-5.78.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=X debug
-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/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/syntax-highlighting-5.78.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/drkonqi-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=626a4c6ef4fbbf25a62bebe5e2cc98d2
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.21.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.21.3
new file mode 100644
index 000000000000..17692d52b56c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/syntax-highlighting-5.78.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=X debug
+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/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/syntax-highlighting-5.78.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/drkonqi-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=626a4c6ef4fbbf25a62bebe5e2cc98d2
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.2 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.2
deleted file mode 100644
index 667a82176e84..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kactivitymanagerd-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=932cdc0c42cb65a18b80d6736c8600e5
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.3
new file mode 100644
index 000000000000..42ca13d40cfb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kactivitymanagerd-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=932cdc0c42cb65a18b80d6736c8600e5
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.2 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.2
deleted file mode 100644
index e513f1b75051..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 kdesu? ( >=kde-frameworks/kdesu-5.78.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IUSE=kdesu 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/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 kdesu? ( >=kde-frameworks/kdesu-5.78.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kde-cli-tools-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33bb5e4a9c200a64e23852853fd53eef
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.3
new file mode 100644
index 000000000000..e4605273efb9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 kdesu? ( >=kde-frameworks/kdesu-5.78.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IUSE=kdesu 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/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 kdesu? ( >=kde-frameworks/kdesu-5.78.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kde-cli-tools-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=33bb5e4a9c200a64e23852853fd53eef
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.2 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.2
deleted file mode 100644
index b6ea476a32f0..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/sassc dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.21.2:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kde-gtk-config-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da92d552e723036364b19e49c5881e9
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.3
new file mode 100644
index 000000000000..7a3510321a7a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/sassc dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.21.3:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kde-gtk-config-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5da92d552e723036364b19e49c5881e9
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.21.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.21.2
deleted file mode 100644
index b254acfacb79..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kdecoration-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e44a819121dc42eac9e6969f48dba01
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.21.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.21.3
new file mode 100644
index 000000000000..e96a7c270341
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.21.3
@@ -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.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kdecoration-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e44a819121dc42eac9e6969f48dba01
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.2 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.2
deleted file mode 100644
index 1e448120b8ac..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kholidays-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kunitconversion-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 comic? ( >=kde-frameworks/kross-5.78.0:5 ) share? ( >=kde-frameworks/purpose-5.78.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=comic share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kholidays-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kunitconversion-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 comic? ( >=kde-frameworks/kross-5.78.0:5 ) share? ( >=kde-frameworks/purpose-5.78.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kdeplasma-addons-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3d74f2497c27268f579fc0e9347512b
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.3
new file mode 100644
index 000000000000..5aa981bef6c8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kholidays-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kunitconversion-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 comic? ( >=kde-frameworks/kross-5.78.0:5 ) share? ( >=kde-frameworks/purpose-5.78.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=comic share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kholidays-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kunitconversion-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 comic? ( >=kde-frameworks/kross-5.78.0:5 ) share? ( >=kde-frameworks/purpose-5.78.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kdeplasma-addons-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3d74f2497c27268f579fc0e9347512b
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.21.2 b/metadata/md5-cache/kde-plasma/kgamma-5.21.2
deleted file mode 100644
index 2b2c74a05f2a..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kgamma5-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38015905e35cad01435e1d887fae0d39
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.21.3 b/metadata/md5-cache/kde-plasma/kgamma-5.21.3
new file mode 100644
index 000000000000..6b7ae06b5389
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kgamma5-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38015905e35cad01435e1d887fae0d39
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.21.2 b/metadata/md5-cache/kde-plasma/khotkeys-5.21.2
deleted file mode 100644
index f7bb22ac7395..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5[X] >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-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/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5[X] >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/khotkeys-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffa801ae0975eeccd2d9b06a7480337b
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.21.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.21.3
new file mode 100644
index 000000000000..46f866c6af4a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5[X] >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+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/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5[X] >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/khotkeys-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffa801ae0975eeccd2d9b06a7480337b
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.2 b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.2
deleted file mode 100644
index ad491d4a8b19..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5 >=kde-plasma/systemsettings-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kinfocenter-5.21.2.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6aa5837d1671ca8bfe40a07c5d458a36
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.3
new file mode 100644
index 000000000000..8e98f45fe1ec
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5 >=kde-plasma/systemsettings-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kinfocenter-5.21.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6aa5837d1671ca8bfe40a07c5d458a36
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.21.2 b/metadata/md5-cache/kde-plasma/kmenuedit-5.21.2
deleted file mode 100644
index ea8dfba48bbd..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IUSE=debug +handbook
-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/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kmenuedit-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1895f22badb4f3e37fa01997f0395d36
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.21.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.21.3
new file mode 100644
index 000000000000..1116544c00a7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IUSE=debug +handbook
+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/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kmenuedit-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1895f22badb4f3e37fa01997f0395d36
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.21.2 b/metadata/md5-cache/kde-plasma/kscreen-5.21.2
deleted file mode 100644
index 6fd6afb424d4..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/libkscreen-5.21.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/libkscreen-5.21.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kscreen-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eda1dede5cbf3bebc9373e7ca666b57a
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.21.3 b/metadata/md5-cache/kde-plasma/kscreen-5.21.3
new file mode 100644
index 000000000000..0381f6a28f33
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/libkscreen-5.21.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/libkscreen-5.21.3:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kscreen-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eda1dede5cbf3bebc9373e7ca666b57a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.2 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.2
deleted file mode 100644
index 8b11f7c069ec..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+pam test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.21.2:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kscreenlocker-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9b6708f477e0e8cb96b7815ae838164
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.3
new file mode 100644
index 000000000000..6d4dc57485d0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=+pam test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.21.3:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kscreenlocker-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9b6708f477e0e8cb96b7815ae838164
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.2 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.2
deleted file mode 100644
index df0ca0702e19..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/ksshaskpass-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bdcbf785e5c1f348324d2d6482ede657
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.3
new file mode 100644
index 000000000000..7fdd6528a93c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/ksshaskpass-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bdcbf785e5c1f348324d2d6482ede657
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.21.2 b/metadata/md5-cache/kde-plasma/ksysguard-5.21.2
deleted file mode 100644
index 115206fa1f3c..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=lm-sensors networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/ksysguard-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41d12b271464c93334b6e4dda857851d
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.21.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.21.3
new file mode 100644
index 000000000000..259b9e679c5f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=lm-sensors networkmanager test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/ksysguard-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d12b271464c93334b6e4dda857851d
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.2 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.2
deleted file mode 100644
index 938870cd57f7..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.78.0:5 sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.78.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kwallet-pam-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4f0c012ebb14d5ec963b8e7f3efe0d0
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.3
new file mode 100644
index 000000000000..c72ec7f1228e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.78.0:5 sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.78.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kwallet-pam-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4f0c012ebb14d5ec963b8e7f3efe0d0
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.2 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.2
deleted file mode 100644
index d4ca9d5d719e..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.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/plasma/5.21.2/kwayland-integration-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d30b2ed04a72045867cf7eb0fe307868
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.3
new file mode 100644
index 000000000000..563a62d015f1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.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/plasma/5.21.3/kwayland-integration-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d30b2ed04a72045867cf7eb0fe307868
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.21.2 b/metadata/md5-cache/kde-plasma/kwayland-server-5.21.2
deleted file mode 100644
index 428d3df27387..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wayland Server Components built on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kwayland-server-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b76dcce3505699179a4d5d2b46c77074
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.21.3 b/metadata/md5-cache/kde-plasma/kwayland-server-5.21.3
new file mode 100644
index 000000000000..06d02b106a27
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wayland Server Components built on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kwayland-server-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b76dcce3505699179a4d5d2b46c77074
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.2 b/metadata/md5-cache/kde-plasma/kwin-5.21.2
deleted file mode 100644
index cfee8498a4d3..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=] >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5= >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5= >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 >=kde-plasma/kdecoration-5.21.2:5 >=kde-plasma/kscreenlocker-5.21.2:5 >=kde-plasma/kwayland-server-5.21.2:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.78.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.21.2:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=] >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5= >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5= >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 >=kde-plasma/kdecoration-5.21.2:5 >=kde-plasma/kscreenlocker-5.21.2:5 >=kde-plasma/kwayland-server-5.21.2:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.78.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kwin-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dd4b1bfa10a8d8c14a674ca564e3c66
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.3 b/metadata/md5-cache/kde-plasma/kwin-5.21.3
new file mode 100644
index 000000000000..9bcb300f8e42
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.21.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=] >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5= >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5= >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 >=kde-plasma/kdecoration-5.21.3:5 >=kde-plasma/kscreenlocker-5.21.3:5 >=kde-plasma/kwayland-server-5.21.3:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.78.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.21.3:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=] >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5= >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5= >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 >=kde-plasma/kdecoration-5.21.3:5 >=kde-plasma/kscreenlocker-5.21.3:5 >=kde-plasma/kwayland-server-5.21.3:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.78.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kwin-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dd4b1bfa10a8d8c14a674ca564e3c66
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.21.2 b/metadata/md5-cache/kde-plasma/kwrited-5.21.2
deleted file mode 100644
index eebbe3f8d705..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpty-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpty-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/kwrited-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2c0b262982fad48eb4044839995e4e7
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.21.3 b/metadata/md5-cache/kde-plasma/kwrited-5.21.3
new file mode 100644
index 000000000000..0926581e6b35
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpty-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kpty-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/kwrited-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2c0b262982fad48eb4044839995e4e7
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.21.2 b/metadata/md5-cache/kde-plasma/libkscreen-5.21.2
deleted file mode 100644
index 8ce7ba100c2f..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug doc 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/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.21.2/libkscreen-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e98a45e9a83f8f2afbc7e3d5605274b4
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.21.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.21.3
new file mode 100644
index 000000000000..d3cab909341c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug doc 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/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.21.3/libkscreen-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e98a45e9a83f8f2afbc7e3d5605274b4
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.21.2 b/metadata/md5-cache/kde-plasma/libksysguard-5.21.2
deleted file mode 100644
index 880f6e74e8f5..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-5.78.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=webengine X test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.21.2/libksysguard-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd77a019ea3fb98a556e7b0c2ffbef85
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.21.3.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.21.3.1
new file mode 100644
index 000000000000..ab6822d56790
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.21.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-5.78.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.21.3/libksysguard-5.21.3.1.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd77a019ea3fb98a556e7b0c2ffbef85
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.21.2 b/metadata/md5-cache/kde-plasma/libkworkspace-5.21.2
deleted file mode 100644
index 4d65ce76e3be..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/kscreenlocker-5.21.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.21.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/kscreenlocker-5.21.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-workspace-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49fa750df44b285ca34b47b8886bbc9f
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.21.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.21.3
new file mode 100644
index 000000000000..74f3e3a3ee66
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/kscreenlocker-5.21.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.21.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kinit-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-plasma/kscreenlocker-5.21.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-workspace-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49fa750df44b285ca34b47b8886bbc9f
diff --git a/metadata/md5-cache/kde-plasma/milou-5.21.2 b/metadata/md5-cache/kde-plasma/milou-5.21.2
deleted file mode 100644
index f0705096781a..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/milou-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8557769aa1837021add4169c4ee18946
diff --git a/metadata/md5-cache/kde-plasma/milou-5.21.3 b/metadata/md5-cache/kde-plasma/milou-5.21.3
new file mode 100644
index 000000000000..f2f2811e4bc1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/milou-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8557769aa1837021add4169c4ee18946
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.21.2 b/metadata/md5-cache/kde-plasma/oxygen-5.21.2
deleted file mode 100644
index 996b60fbccb3..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.78.0:5 ) >=kde-frameworks/kservice-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.21.2:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.78.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/oxygen-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75d6f6f1983ffa47f69619bdcb986f55
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.21.3 b/metadata/md5-cache/kde-plasma/oxygen-5.21.3
new file mode 100644
index 000000000000..08b235e52557
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.78.0:5 ) >=kde-frameworks/kservice-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.21.3:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-plasma/kdecoration-5.21.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.78.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/oxygen-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75d6f6f1983ffa47f69619bdcb986f55
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.2
deleted file mode 100644
index 9505e1ba3235..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kfilemetadata-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/purpose-5.78.0:5 >=kde-plasma/plasma-workspace-5.21.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kfilemetadata-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/purpose-5.78.0:5 >=kde-plasma/plasma-workspace-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-browser-integration-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=831a3081cb34e2729e6edca2e59d8abb
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.3
new file mode 100644
index 000000000000..2d009f9a9eab
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kfilemetadata-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/purpose-5.78.0:5 >=kde-plasma/plasma-workspace-5.21.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kfilemetadata-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/purpose-5.78.0:5 >=kde-plasma/plasma-workspace-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-browser-integration-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=831a3081cb34e2729e6edca2e59d8abb
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.2
deleted file mode 100644
index 4996b0d0431b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kparts-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-plasma/kwin-5.21.2:5 >=kde-plasma/libksysguard-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 >=kde-plasma/plasma-workspace-5.21.2:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.78.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kparts-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-plasma/kwin-5.21.2:5 >=kde-plasma/libksysguard-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 >=kde-plasma/plasma-workspace-5.21.2:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.78.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) !<kde-plasma/kdeplasma-addons-5.15.80 !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/qqc2-desktop-style-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5 >=kde-plasma/oxygen-5.21.2:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-desktop-5.21.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f90cd410072f108f60a1ba88bbe6a4fd
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.3
new file mode 100644
index 000000000000..8ea7f7dec4da
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kparts-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-plasma/kwin-5.21.3:5 >=kde-plasma/libksysguard-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 >=kde-plasma/plasma-workspace-5.21.3:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.78.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.78.0:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kparts-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-frameworks/sonnet-5.78.0:5 >=kde-plasma/kwin-5.21.3:5 >=kde-plasma/libksysguard-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 >=kde-plasma/plasma-workspace-5.21.3:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.78.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) !<kde-plasma/kdeplasma-addons-5.15.80 !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/qqc2-desktop-style-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5 >=kde-plasma/oxygen-5.21.3:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-desktop-5.21.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f90cd410072f108f60a1ba88bbe6a4fd
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-disks-5.21.2
deleted file mode 100644
index ae011384fd7a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 sys-apps/smartmontools dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-disks-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3da1b0cc582d9bdbe99ea7c4875c540c
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-disks-5.21.3
new file mode 100644
index 000000000000..e431ca90aaf0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 sys-apps/smartmontools dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-disks-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3da1b0cc582d9bdbe99ea7c4875c540c
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.2
deleted file mode 100644
index 75131bb513ab..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma frontend for Firewalld or UFW
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/plasma-firewall
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) || ( net-firewall/firewalld net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-firewall-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d84fab4df381e86549c55f4d4ba5ae28
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.3
new file mode 100644
index 000000000000..cb93deb14707
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma frontend for Firewalld or UFW
+EAPI=7
+HOMEPAGE=https://invent.kde.org/network/plasma-firewall
+IUSE=debug python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) || ( net-firewall/firewalld net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-firewall-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d84fab4df381e86549c55f4d4ba5ae28
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-integration-5.21.2
deleted file mode 100644
index f3e98f498b7a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-integration-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37c51b72022ad1cfd6a8d5f43ed4e680
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.21.3
new file mode 100644
index 000000000000..f604943c5986
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.21.3
@@ -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.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-integration-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37c51b72022ad1cfd6a8d5f43ed4e680
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-meta-5.21.2
deleted file mode 100644
index d0e8646dc800..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.21.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop/
-IUSE=bluetooth +browser-integration colord crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.21.2:5 >=kde-plasma/drkonqi-5.21.2:5 >=kde-plasma/kactivitymanagerd-5.21.2:5 >=kde-plasma/kde-cli-tools-5.21.2:5 >=kde-plasma/kdecoration-5.21.2:5 >=kde-plasma/kdeplasma-addons-5.21.2:5 >=kde-plasma/kgamma-5.21.2:5 >=kde-plasma/khotkeys-5.21.2:5 >=kde-plasma/kinfocenter-5.21.2:5 >=kde-plasma/kmenuedit-5.21.2:5 >=kde-plasma/kscreen-5.21.2:5 >=kde-plasma/kscreenlocker-5.21.2:5 >=kde-plasma/ksshaskpass-5.21.2:5 >=kde-plasma/ksysguard-5.21.2:5 >=kde-plasma/kwayland-integration-5.21.2:5 >=kde-plasma/kwayland-server-5.21.2:5 >=kde-plasma/kwin-5.21.2:5 >=kde-plasma/kwrited-5.21.2:5 >=kde-plasma/libkscreen-5.21.2:5 >=kde-plasma/libksysguard-5.21.2:5 >=kde-plasma/milou-5.21.2:5 >=kde-plasma/oxygen-5.21.2:5 >=kde-plasma/plasma-desktop-5.21.2:5 >=kde-plasma/plasma-integration-5.21.2:5 >=kde-plasma/plasma-systemmonitor-5.21.2:5 >=kde-plasma/plasma-workspace-5.21.2:5 >=kde-plasma/polkit-kde-agent-5.21.2:5 >=kde-plasma/powerdevil-5.21.2:5 >=kde-plasma/systemsettings-5.21.2:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.21.2:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.21.2:5 ) colord? ( x11-misc/colord ) crypt? ( >=kde-plasma/plasma-vault-5.21.2:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.21.2:5 ) discover? ( >=kde-plasma/discover-5.21.2:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.21.2:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) firewall? ( >=kde-plasma/plasma-firewall-5.21.2:5 ) grub? ( >=kde-plasma/breeze-grub-5.21.2:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.21.2:5 >=kde-plasma/kde-gtk-config-5.21.2:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.21.2:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.21.2:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.21.2:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.21.2:5 >=kde-plasma/plymouth-kcm-5.21.2:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.21.2:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.21.2:5 ) smart? ( >=kde-plasma/plasma-disks-5.21.2:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.21.2:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.21.2:5 )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=814694345fc6e87a21b68904b671eea6
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.21.3
new file mode 100644
index 000000000000..113e042a22fb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.21.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop/
+IUSE=bluetooth +browser-integration colord crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.21.3:5 >=kde-plasma/drkonqi-5.21.3:5 >=kde-plasma/kactivitymanagerd-5.21.3:5 >=kde-plasma/kde-cli-tools-5.21.3:5 >=kde-plasma/kdecoration-5.21.3:5 >=kde-plasma/kdeplasma-addons-5.21.3:5 >=kde-plasma/kgamma-5.21.3:5 >=kde-plasma/khotkeys-5.21.3:5 >=kde-plasma/kinfocenter-5.21.3:5 >=kde-plasma/kmenuedit-5.21.3:5 >=kde-plasma/kscreen-5.21.3:5 >=kde-plasma/kscreenlocker-5.21.3:5 >=kde-plasma/ksshaskpass-5.21.3:5 >=kde-plasma/ksysguard-5.21.3:5 >=kde-plasma/kwayland-integration-5.21.3:5 >=kde-plasma/kwayland-server-5.21.3:5 >=kde-plasma/kwin-5.21.3:5 >=kde-plasma/kwrited-5.21.3:5 >=kde-plasma/libkscreen-5.21.3:5 >=kde-plasma/libksysguard-5.21.3:5 >=kde-plasma/milou-5.21.3:5 >=kde-plasma/oxygen-5.21.3:5 >=kde-plasma/plasma-desktop-5.21.3:5 >=kde-plasma/plasma-integration-5.21.3:5 >=kde-plasma/plasma-systemmonitor-5.21.3:5 >=kde-plasma/plasma-workspace-5.21.3:5 >=kde-plasma/polkit-kde-agent-5.21.3:5 >=kde-plasma/powerdevil-5.21.3:5 >=kde-plasma/systemsettings-5.21.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.21.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.21.3:5 ) colord? ( x11-misc/colord ) crypt? ( >=kde-plasma/plasma-vault-5.21.3:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.21.3:5 ) discover? ( >=kde-plasma/discover-5.21.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.21.3:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) firewall? ( >=kde-plasma/plasma-firewall-5.21.3:5 ) grub? ( >=kde-plasma/breeze-grub-5.21.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.21.3:5 >=kde-plasma/kde-gtk-config-5.21.3:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.21.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.21.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.21.3:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.21.3:5 >=kde-plasma/plymouth-kcm-5.21.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.21.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.21.3:5 ) smart? ( >=kde-plasma/plasma-disks-5.21.3:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.21.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.21.3:5 )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=814694345fc6e87a21b68904b671eea6
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-nm-5.21.2
deleted file mode 100644
index 960896a5dcf6..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5[teamd=] >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.78.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5[teamd=] >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.78.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-nm-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07a6462b2266bb1508985dfd6f87653c
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.21.3
new file mode 100644
index 000000000000..72378ed37d8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5[teamd=] >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.78.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5[teamd=] >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.78.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-plasma/kde-cli-tools-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-nm-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07a6462b2266bb1508985dfd6f87653c
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.21.2
deleted file mode 100644
index b49fc334d6d4..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-pa-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe4f86d9801f15e6da4e3f09250c3835
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.21.3
new file mode 100644
index 000000000000..a4c9595ea6eb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-pa-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe4f86d9801f15e6da4e3f09250c3835
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.2
deleted file mode 100644
index cc93ca4c5cce..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-sdk-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6053348403045ace07a684d3db021e66
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.3
new file mode 100644
index 000000000000..a141ebb101ea
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.3
@@ -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.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-sdk-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6053348403045ace07a684d3db021e66
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.2
deleted file mode 100644
index 97803f847a0d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=New version of KSysGuard built on top of the new KStats daemon and using QML
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-systemmonitor
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] >=kde-frameworks/kquickcharts-5.78.0:5 >=kde-plasma/ksysguard-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-systemmonitor-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35ae19c7666618214f0afc10969516d5
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.3
new file mode 100644
index 000000000000..6e07a0ba6c43
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=New version of KSysGuard built on top of the new KStats daemon and using QML
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-systemmonitor
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] >=kde-frameworks/kquickcharts-5.78.0:5 >=kde-plasma/ksysguard-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-systemmonitor-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35ae19c7666618214f0afc10969516d5
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.2
deleted file mode 100644
index c12f7e1861bd..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-thunderbolt-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0950f1b852770431747e5796304f6c99
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.3
new file mode 100644
index 000000000000..4f4ab7b6178d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-thunderbolt-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0950f1b852770431747e5796304f6c99
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-vault-5.21.2
deleted file mode 100644
index 4331ed40e82d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-plasma/libksysguard-5.21.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-vault-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09b00d03effb9c334d4464d7acbe15b9
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.21.3
new file mode 100644
index 000000000000..2e12fd2ce6e1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kcodecs-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-plasma/libksysguard-5.21.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-vault-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09b00d03effb9c334d4464d7acbe15b9
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.2
deleted file mode 100644
index 48493735a45f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kpeople-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/prison-5.78.0:5[qml] >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 >=kde-plasma/kscreenlocker-5.21.2:5 >=kde-plasma/kwin-5.21.2:5 >=kde-plasma/libkscreen-5.21.2:5 >=kde-plasma/libksysguard-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.78.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.21.2:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kpeople-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/prison-5.78.0:5[qml] >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/breeze-5.21.2:5 >=kde-plasma/kscreenlocker-5.21.2:5 >=kde-plasma/kwin-5.21.2:5 >=kde-plasma/libkscreen-5.21.2:5 >=kde-plasma/libksysguard-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.78.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kquickcharts-5.78.0:5 >=kde-plasma/ksysguard-5.21.2:5 >=kde-plasma/milou-5.21.2:5 >=kde-plasma/plasma-integration-5.21.2:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-workspace-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a3714778f484baf730c3dc04f9aca4f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.3
new file mode 100644
index 000000000000..8f1efd84fa6b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kpeople-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/prison-5.78.0:5[qml] >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 >=kde-plasma/kscreenlocker-5.21.3:5 >=kde-plasma/kwin-5.21.3:5 >=kde-plasma/libkscreen-5.21.3:5 >=kde-plasma/libksysguard-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.78.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.21.3:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kbookmarks-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kded-5.78.0:5 >=kde-frameworks/kdelibs4support-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kjobwidgets-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kpeople-5.78.0:5 >=kde-frameworks/krunner-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/ktexteditor-5.78.0:5 >=kde-frameworks/ktextwidgets-5.78.0:5 >=kde-frameworks/kwallet-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=kde-frameworks/prison-5.78.0:5[qml] >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/breeze-5.21.3:5 >=kde-plasma/kscreenlocker-5.21.3:5 >=kde-plasma/kwin-5.21.3:5 >=kde-plasma/libkscreen-5.21.3:5 >=kde-plasma/libksysguard-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.78.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.78.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.78.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kquickcharts-5.78.0:5 >=kde-plasma/ksysguard-5.21.3:5 >=kde-plasma/milou-5.21.3:5 >=kde-plasma/plasma-integration-5.21.3:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-workspace-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a3714778f484baf730c3dc04f9aca4f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.2
deleted file mode 100644
index d76f3d03e3bf..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-workspace-wallpapers-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=563ca45e0047e986ceb4116bf7f9be47
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.3
new file mode 100644
index 000000000000..4e471fef631d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.3
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-workspace-wallpapers-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=563ca45e0047e986ceb4116bf7f9be47
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.2 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.2
deleted file mode 100644
index 33ccc3410ac3..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.21.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plymouth-kcm-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27cf82d67406ff5c3f50f19c9ef32681
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.3
new file mode 100644
index 000000000000..ff457113a901
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.21.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plymouth-kcm-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27cf82d67406ff5c3f50f19c9ef32681
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.2 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.2
deleted file mode 100644
index 2d1babe8def8..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=sys-auth/polkit-qt-0.113.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-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/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/polkit-kde-agent-1-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24726c964bfc8ed3b3b2b26d66f18849
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.3
new file mode 100644
index 000000000000..2aaf94bb8ac3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=sys-auth/polkit-qt-0.113.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+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/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/polkit-kde-agent-1-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24726c964bfc8ed3b3b2b26d66f18849
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.21.2 b/metadata/md5-cache/kde-plasma/powerdevil-5.21.2
deleted file mode 100644
index eda82bef91fd..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5[policykit] >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libkscreen-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control caps +wireless debug +handbook
-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/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5[policykit] >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libkscreen-5.21.2:5 >=kde-plasma/libkworkspace-5.21.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5 ) >=kde-plasma/kde-cli-tools-5.21.2:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/powerdevil-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecfcc748a3fd507b1e42ea21941e8e48
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.21.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.21.3
new file mode 100644
index 000000000000..3fbb34774d1b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5[policykit] >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libkscreen-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control caps +wireless debug +handbook
+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/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5[policykit] >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kglobalaccel-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kidletime-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/knotifyconfig-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwayland-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-frameworks/solid-5.78.0:5 >=kde-plasma/libkscreen-5.21.3:5 >=kde-plasma/libkworkspace-5.21.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.78.0:5 >=kde-frameworks/networkmanager-qt-5.78.0:5 ) >=kde-plasma/kde-cli-tools-5.21.3:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/powerdevil-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ecfcc748a3fd507b1e42ea21941e8e48
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.2 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.2
deleted file mode 100644
index 0001a9a42d8d..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] >=kde-plasma/kde-cli-tools-5.21.2:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/sddm-kcm-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=140ffb2913ea03bf44f9ce33f19b2c75
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.3
new file mode 100644
index 000000000000..08e36890a944
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/knewstuff-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5[qml] >=kde-plasma/kde-cli-tools-5.21.3:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/sddm-kcm-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=140ffb2913ea03bf44f9ce33f19b2c75
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.21.2 b/metadata/md5-cache/kde-plasma/systemsettings-5.21.2
deleted file mode 100644
index c34c21ad1c82..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/systemsettings-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb08b53534bac347e0bcd236110bae03
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.21.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.21.3
new file mode 100644
index 000000000000..34c32acd498a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.78.0:5 ) >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.3:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/systemsettings-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb08b53534bac347e0bcd236110bae03
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.2 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.2
deleted file mode 100644
index c2270b3a3d5b..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/xdg-desktop-portal-kde-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0734fd26cb1b3da3c0cb854ba67233ab
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.3 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.3
new file mode 100644
index 000000000000..db972014df58
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.78.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.78.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kirigami-5.78.0:5 >=kde-frameworks/knotifications-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/plasma-5.78.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/xdg-desktop-portal-kde-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0734fd26cb1b3da3c0cb854ba67233ab
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.2 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.2
deleted file mode 100644
index 79d3e17f1518..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.21.2/plasma-workspace-5.21.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bdc3940a5e1a3393c40b963f3a0dbfc
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.3
new file mode 100644
index 000000000000..9b09675cd042
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.3/plasma-workspace-5.21.3.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bdc3940a5e1a3393c40b963f3a0dbfc
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index b5ae5eac85a1..f7eed0fc21bb 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 b/metadata/md5-cache/lxde-base/lxappearance-0.6.3
deleted file mode 100644
index 125f56bf8de4..000000000000
--- a/metadata/md5-cache/lxde-base/lxappearance-0.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=x11-libs/gtk+:2 dbus? ( dev-libs/dbus-glib ) virtual/pkgconfig dev-util/intltool sys-devel/gettext
-DESCRIPTION=LXDE GTK+ theme switcher
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXAppearance
-IUSE=dbus
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 dbus? ( dev-libs/dbus-glib )
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxappearance-0.6.3.tar.xz
-_md5_=7a87fb7ac2e7631b9c43beb93f68db12
diff --git a/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2 b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
new file mode 100644
index 000000000000..a8bc5415099f
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 dbus? ( dev-libs/dbus-glib )
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1 b/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
deleted file mode 100644
index 4464396e6729..000000000000
--- a/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=lxde-base/lxappearance x11-wm/openbox virtual/pkgconfig dev-util/intltool
-DESCRIPTION=LXAppearance plugin for configuring OpenBox
-EAPI=5
-HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=lxde-base/lxappearance x11-wm/openbox
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxappearance-obconf-0.2.1.tar.gz
-_md5_=c4a67b7c386ceafd4f23029c51f0ccdf
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
new file mode 100644
index 000000000000..39c53aa873b6
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=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
+DESCRIPTION=LXAppearance plugin for configuring OpenBox
+EAPI=7
+HOMEPAGE=https://lxde.org/
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~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
diff --git a/metadata/md5-cache/lxde-base/lxde-common-0.99.2 b/metadata/md5-cache/lxde-base/lxde-common-0.99.2
deleted file mode 100644
index a12cc9a55fd9..000000000000
--- a/metadata/md5-cache/lxde-base/lxde-common-0.99.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=LXDE Session default configuration files and nuoveXT2 iconset
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXDE_Common
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
-LICENSE=GPL-2
-PDEPEND=lxde-base/lxde-icon-theme
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxde-common-0.99.2.tar.xz
-_md5_=f760b729d389ab29f249bae5610cb47c
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
new file mode 100644
index 000000000000..8afcfd697895
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
@@ -0,0 +1,11 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1 b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
deleted file mode 100644
index a9f6a3d14aea..000000000000
--- a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext !<lxde-base/lxde-common-0.5.0
-DESCRIPTION=nuoveXT2 iconset
-EAPI=5
-HOMEPAGE=https://lxde.sf.net/
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-0.5.0/lxde-icon-theme-0.5.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b84435a558b84f51d88afd32ff8695b
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
new file mode 100644
index 000000000000..74d67fc95b34
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare
+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
+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	ff2ff954e6b17929574eee4efc5152ba
+_md5_=777405fd0b421807d693ad11c993e297
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
new file mode 100644
index 000000000000..05f74e433b6b
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -0,0 +1,9 @@
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxinput-0.3.5 b/metadata/md5-cache/lxde-base/lxinput-0.3.5
deleted file mode 100644
index a89c407114ed..000000000000
--- a/metadata/md5-cache/lxde-base/lxinput-0.3.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40.0
-DESCRIPTION=LXDE keyboard and mouse configuration tool
-EAPI=6
-HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxinput-0.3.5.tar.xz
-_md5_=39781c691af896a62fda002a05a41cf3
diff --git a/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2 b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
new file mode 100644
index 000000000000..18ada13c0f74
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1 b/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1
new file mode 100644
index 000000000000..93ed84b08b9d
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=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
+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
+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
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 490b0a2f7d56..db61ef79fc6f 100644
--- a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
+++ b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
@@ -1,10 +1,10 @@
+BDEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=install
-DEPEND=sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig
 DESCRIPTION=Provides files needed for LXDE application menus
-EAPI=6
+EAPI=7
 HOMEPAGE=https://lxde.org/
 KEYWORDS=~alpha amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxmenu-data-0.1.5.tar.xz
-_md5_=fd949174e8869e6e0807f96d76dbbd8c
+_md5_=2301a59e53a0d212b72a7f7d4931baa7
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.10.1 b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
new file mode 100644
index 000000000000..d168fe9ecb0f
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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	22ae82e140bdd95d17a34fd5fd733190	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=feeceb401395bed2bd5843a67718b731
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.1
deleted file mode 100644
index 10312b762a5c..000000000000
--- a/metadata/md5-cache/lxde-base/lxrandr-0.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=LXDE GUI interface to RandR extention
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXRandR
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxrandr-0.3.1.tar.xz
-_md5_=dd149ece5cc76e8e417a3b5740ebf860
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1
deleted file mode 100644
index 2b4fe4d460bb..000000000000
--- a/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=LXDE GUI interface to RandR extention
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXRandR
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxrandr-0.3.1.tar.xz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e
-_md5_=a240dca0c429449221656fe5b76d3552
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1
new file mode 100644
index 000000000000..03903cae633d
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 x11-apps/xrandr x11-libs/gtk+:3 x11-libs/libXrandr x11-base/xorg-proto
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.5.5 b/metadata/md5-cache/lxde-base/lxsession-0.5.5
new file mode 100644
index 000000000000..0b556677f849
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxsession-0.5.5
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/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 x11-base/xorg-proto
+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
+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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b1eac4403cce16915c04d5e597d50206
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.10 b/metadata/md5-cache/lxde-base/lxtask-0.1.10
new file mode 100644
index 000000000000..c89bbd5305f7
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.10
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure
+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
+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
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.8 b/metadata/md5-cache/lxde-base/lxtask-0.1.8
deleted file mode 100644
index a82815a674fd..000000000000
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0
-DESCRIPTION=LXDE Task manager
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXTask
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.8.tar.xz
-_md5_=adf35e53a6dc03b97b5edd61ab20ef07
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1 b/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
deleted file mode 100644
index 20922a734b83..000000000000
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0
-DESCRIPTION=LXDE Task manager
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXTask
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.8.tar.xz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e
-_md5_=d282ef0a7a7f283cba4e3b533e6147a3
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.3.1 b/metadata/md5-cache/lxde-base/lxterminal-0.3.1
deleted file mode 100644
index b20598e490b2..000000000000
--- a/metadata/md5-cache/lxde-base/lxterminal-0.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 ) virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 >=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=Lightweight vte-based tabbed terminal emulator for LXDE
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/LXTerminal
-IUSE=gtk3
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 )
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxterminal-0.3.1.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2d21286c5447f307cf54c97b32607e18
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1 b/metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1
deleted file mode 100644
index 568fc83b7e7a..000000000000
--- a/metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
-EAPI=7
-HOMEPAGE=https://wiki.lxde.org/en/LXTerminal
-IUSE=gtk3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 )
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxterminal-0.3.2.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36a7770cb71a3a32c654133f5b4449d3
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.4.0 b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
new file mode 100644
index 000000000000..051ba615a16e
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango x11-libs/vte:2.91 dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef95361f3818af0cf57c52649a359d5a
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
new file mode 100644
index 000000000000..a7d8cead1f8e
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.1.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install
+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
+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_=15a6953b8483f6e00203550768f2a61c
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index a1eb06e8399c..3f26a8c15ad9 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/thunderbird-78.8.0 b/metadata/md5-cache/mail-client/thunderbird-78.8.0
deleted file mode 100644
index a6c195e7dd59..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-78.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[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: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] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[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 ) ) >=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.8.0/source/thunderbird-78.8.0.source.tar.xz -> thunderbird-78.8.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-10.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-10.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-10.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.8.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.8.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.8.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.8.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.8.0-zh-TW.xpi )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=594b6c3f347903b9fcac8aaeec362e13
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.8.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.8.0
deleted file mode 100644
index addfc0450b9a..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.8.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.8.0/linux-x86_64/en-US/thunderbird-78.8.0.tar.bz2 -> thunderbird-bin_x86_64-78.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-US/thunderbird-78.8.0.tar.bz2 -> thunderbird-bin_i686-78.8.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.8.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.8.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.8.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.8.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.8.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f99471bb6728676b111bc3ac979c4665
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 58edf8f8cdfc..f7d9a9557b64 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/postfwd-1.35-r3 b/metadata/md5-cache/mail-filter/postfwd-1.35-r3
deleted file mode 100644
index f131c9f7ade5..000000000000
--- a/metadata/md5-cache/mail-filter/postfwd-1.35-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Versatile Postfix policy server with a flexible ruleset based configuration
-EAPI=5
-HOMEPAGE=http://www.postfwd.org/
-IUSE=+tools
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/perl-5.16.3 virtual/perl-Sys-Syslog dev-perl/Net-DNS dev-perl/Net-Server
-SLOT=0
-SRC_URI=http://www.postfwd.org/postfwd-1.35.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0662748ff7f921a6e6226ceb1090ab58
diff --git a/metadata/md5-cache/mail-filter/postfwd-2.00-r1 b/metadata/md5-cache/mail-filter/postfwd-2.00-r1
deleted file mode 100644
index a365d87a388e..000000000000
--- a/metadata/md5-cache/mail-filter/postfwd-2.00-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=Versatile Postfix policy server with a flexible ruleset based configuration
-EAPI=7
-HOMEPAGE=https://www.postfwd.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/perl-5.16.3 dev-perl/Net-CIDR-Lite dev-perl/Net-DNS dev-perl/Net-Server dev-perl/NetAddr-IP virtual/perl-Digest-MD5 virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Time-HiRes
-SLOT=0
-SRC_URI=https://www.postfwd.org/postfwd-2.00.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=0034452284c972a10f35cadbeb813cf0
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index c8b35b4c4420..55ea4dc139d2 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.13 b/metadata/md5-cache/mail-mta/msmtp-1.8.13
deleted file mode 100644
index 6ff1549365e2..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.13.tar.xz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1fed5a9460ef1cd9cb9273b28a4c6471
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.15 b/metadata/md5-cache/mail-mta/msmtp-1.8.15
new file mode 100644
index 000000000000..f8ddb2f8161d
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.15
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=7
+HOMEPAGE=https://marlam.de/msmtp/
+IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=daemon? ( filecaps )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.15.tar.xz
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1fed5a9460ef1cd9cb9273b28a4c6471
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.7-r1 b/metadata/md5-cache/mail-mta/msmtp-1.8.7-r1
deleted file mode 100644
index 4c4c355a3fa7..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.7.tar.xz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2bffa8cb4b9f084fa2c33eef61fc892d
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
deleted file mode 100644
index 343de14be0b7..000000000000
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
-HOMEPAGE=http://smtpd.develooper.com
-IUSE=postfix ipv6 syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3477be92730bd08ae9cea64f3c6f8fb0
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index fd6756d6e68c..0c193a072414 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -1,13 +1,14 @@
+BDEPEND=dev-lang/perl
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
+DEPEND=dev-lang/perl
 DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
+EAPI=7
 HOMEPAGE=https://smtpd.github.io/qpsmtpd/
 IUSE=postfix ipv6 syslog
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24a680801f8e220f6256e29ba8717c9e
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5e209fe64a3337a2549f1e87c2a852ab
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 670fb1754fe1..bbdba51378b3 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-lang/perl
 DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
+EAPI=7
 HOMEPAGE=https://smtpd.github.io/qpsmtpd/
 IUSE=postfix ipv6 syslog
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eeabca5b63ade4cfffa14292f4c6fc2a
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5e209fe64a3337a2549f1e87c2a852ab
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index f6ae629db4a9..9d11066c57c0 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/cantarell-0.301 b/metadata/md5-cache/media-fonts/cantarell-0.301
index c57175689b94..65b79fb4c8eb 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.301
+++ b/metadata/md5-cache/media-fonts/cantarell-0.301
@@ -5,10 +5,10 @@ DESCRIPTION=Default fontset for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 IUSE=X
-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=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.301/cantarell-fonts-0.301.tar.xz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca02bdba9f442bf420bf6b5d28fb0b93
+_md5_=cd51ec00ee909f237bfc7ed2f78331b2
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2009.22 b/metadata/md5-cache/media-fonts/cascadia-code-2009.22
deleted file mode 100644
index 5473a1ddec87..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-2009.22
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospaced font developed for Windows Terminal
-EAPI=7
-HOMEPAGE=https://github.com/microsoft/cascadia-code
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2009.22/CascadiaCode-2009.22.zip -> cascadia-code-2009.22.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=30e38b6b3aa72b84fada6b1baf6f1f51
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2102.03 b/metadata/md5-cache/media-fonts/cascadia-code-2102.03
deleted file mode 100644
index 5ecd435c9871..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-2102.03
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospaced font developed for Windows Terminal
-EAPI=7
-HOMEPAGE=https://github.com/microsoft/cascadia-code
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2102.03/CascadiaCode-2102.03.zip -> cascadia-code-2102.03.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2102.25 b/metadata/md5-cache/media-fonts/cascadia-code-2102.25
new file mode 100644
index 000000000000..19b8755b3806
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/cascadia-code-2102.25
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=A monospaced font developed for Windows Terminal
+EAPI=7
+HOMEPAGE=https://github.com/microsoft/cascadia-code
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2102.25/CascadiaCode-2102.25.zip -> cascadia-code-2102.25.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.3 b/metadata/md5-cache/media-fonts/comic-neue-2.3
index a60403aab487..d9157730f0fe 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.3
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.3
@@ -4,9 +4,9 @@ DESCRIPTION=Typographically savvy casual script typeface
 EAPI=6
 HOMEPAGE=http://comicneue.com
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.3.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df8e0e6f946310d7e6017be1fa546cfa
+_md5_=93671429966c653688e96c587975ab38
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.23.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.23.0
deleted file mode 100644
index 79845e55bfd3..000000000000
--- a/metadata/md5-cache/media-fonts/croscorefonts-1.23.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
-EAPI=5
-HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
-IUSE=X
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=Apache-2.0
-RESTRICT=binchecks strip test
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.23.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=585d2ab9a9a79a351e7ccf032b1d73f8
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.35 b/metadata/md5-cache/media-fonts/dejavu-2.35
deleted file mode 100644
index bfd87a69b514..000000000000
--- a/metadata/md5-cache/media-fonts/dejavu-2.35
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=fontforge? ( >=x11-apps/mkfontscale-1.2.0 >=media-gfx/fontforge-20080429 dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0 ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
-EAPI=5
-HOMEPAGE=https://dejavu-fonts.github.io/
-IUSE=fontforge X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BitstreamVera
-SLOT=0
-SRC_URI=!fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-ttf-2.35.tar.bz2 ) fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-2.35.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=942d455f3c6a455bc2f4801abe6a8384
diff --git a/metadata/md5-cache/media-fonts/fira-mono-3.205 b/metadata/md5-cache/media-fonts/fira-mono-3.205
deleted file mode 100644
index 0cefb687d6f0..000000000000
--- a/metadata/md5-cache/media-fonts/fira-mono-3.205
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
-EAPI=5
-HOMEPAGE=http://www.carrois.com/fira-4-1/
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8b08d8c70d840c188dd22aa2aa37c1b2
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.202 b/metadata/md5-cache/media-fonts/fira-sans-4.202
index 2aa640de0df5..9f0299735a5e 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.202
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.202
@@ -4,10 +4,10 @@ DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
 EAPI=7
 HOMEPAGE=https://mozilla.github.io/Fira
 IUSE=+otf ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=e0cd00a8bb24d70efdd7193b6cad1744
+_md5_=152c4bd1f4bd0cf29facb4d155b09bdb
diff --git a/metadata/md5-cache/media-fonts/hermit-1.1 b/metadata/md5-cache/media-fonts/hermit-1.1
deleted file mode 100644
index 4e044183ecee..000000000000
--- a/metadata/md5-cache/media-fonts/hermit-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospace font designed to be clear, pragmatic and very readable
-EAPI=5
-HOMEPAGE=https://pcaro.es/p/hermit/
-IUSE=X
-KEYWORDS=~amd64
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://pcaro.es/d/otf-hermit-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b02480fea5f0cd15b27fd9b5acd1bdb
diff --git a/metadata/md5-cache/media-fonts/hermit-1.21 b/metadata/md5-cache/media-fonts/hermit-1.21
index fe5d75664eaf..7d738c00f12c 100644
--- a/metadata/md5-cache/media-fonts/hermit-1.21
+++ b/metadata/md5-cache/media-fonts/hermit-1.21
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospace font designed to be clear, pragmatic and very readable
-EAPI=5
+DESCRIPTION=Monospace font designed to be clear, pragmatic and very readable
+EAPI=7
 HOMEPAGE=https://pcaro.es/p/hermit/
 IUSE=X
 KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://pcaro.es/d/otf-hermit-1.21.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b02480fea5f0cd15b27fd9b5acd1bdb
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=0a21e7c00511860e1f18e506e84c473a
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.4.1 b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
index 7d74bfd093d2..5f280d5cb577 100644
--- a/metadata/md5-cache/media-fonts/intlfonts-1.4.1
+++ b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
@@ -5,9 +5,9 @@ DESCRIPTION=International X11 fixed fonts
 EAPI=7
 HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
 IUSE=bdf X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain HPND GPL-3+-with-font-exception
 SLOT=0
 SRC_URI=mirror://gnu/intlfonts/intlfonts-1.4.1.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=39a8a80b98b604bbdb8682f4e089a8fd
+_md5_=7ae777e8ebff450cd02db2b5888e13fc
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
index bacf2e67d539..0f91ad023fe4 100644
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
+++ b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=TrueType fonts developed by Japanese Information-technology Promotion Agency
-EAPI=5
+EAPI=7
 HOMEPAGE=http://ipafont.ipa.go.jp/
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -9,5 +10,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00303.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e65cf1b67d93ff650a68b39de8339196
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=5deae3517236acf3e0c7fe12a2297762
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.0 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.0
deleted file mode 100644
index 11d45e085158..000000000000
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=fontforge? ( || ( dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
-EAPI=7
-HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
-IUSE=fontforge X X
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178407/liberation-fonts-ttf-2.1.0.tar.gz ) fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178448/liberation-fonts-2.1.0.tar.gz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4071d92f9755e5b1fb504e53f51a8a1d
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
new file mode 100644
index 000000000000..4f5aa2f38a25
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
@@ -0,0 +1,13 @@
+BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
+EAPI=7
+HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
+IUSE=fontforge X X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/liberation-fonts-2.1.3.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/liberation-fonts-ttf-2.1.3.tar.gz )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e6bbbbd8c5f79b3f32f0fa06b9b5e163
diff --git a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2 b/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2
deleted file mode 100644
index aaf1015e64c4..000000000000
--- a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Fonts from the Linux Libertine Open Fonts Project
-EAPI=5
-HOMEPAGE=http://linuxlibertine.org/
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( GPL-2-with-font-exception OFL-1.1 )
-RDEPEND=!<x11-libs/pango-1.20.4
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxlibertine/LinLibertineOTF_5.3.0_2012_07_02.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2d18614081b5694a0b955475741e47a
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index 5db3205a2f7b..ae130d5c0731 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across
 EAPI=6
 HOMEPAGE=https://www.opensans.com/
 IUSE=X
-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=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e3b52c907199e01572890a80c8ab2dc
+_md5_=445640f6fb2a0e66830b4ff681770d00
diff --git a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1 b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
index c9e341d14d2e..bfb756b328ae 100644
--- a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
+++ b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Fonts
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86
 LICENSE=Arphic
 SLOT=0
 SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0b11a674bb284f05dbb1f1a270b2c86
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=969e7d82c26c32de6d9d433b6ee6d5e4
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20150224 b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
deleted file mode 100644
index bbd6a2cf2a9a..000000000000
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20150224
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
-EAPI=5
-HOMEPAGE=https://github.com/powerline/powerline
-IUSE=X
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT-with-advertising
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/powerline-symbols-20150224.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6db824a7730f22443c7f639794c66d1d
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20170508 b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
index e75101640f41..1ca97f66cee9 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20170508
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
@@ -4,9 +4,9 @@ DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
 EAPI=6
 HOMEPAGE=https://github.com/powerline/powerline
 IUSE=X
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/powerline-symbols-20170508.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbdce3809b5958dfb74cdb47ccecb578
+_md5_=7ab0db8c59db3f5840febb62b7347f48
diff --git a/metadata/md5-cache/media-fonts/quivira-4.0 b/metadata/md5-cache/media-fonts/quivira-4.0
deleted file mode 100644
index e871ebe5d2e5..000000000000
--- a/metadata/md5-cache/media-fonts/quivira-4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
-EAPI=5
-HOMEPAGE=http://www.quivira-font.com/
-IUSE=doc X
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.quivira-font.com/files/Quivira.otf -> quivira-4.0.otf doc? ( http://www.quivira-font.com/files/Quivira.pdf -> quivira-4.0.pdf http://www.quivira-font.com/files/QuiviraTestpage.pdf -> quivira-4.0-Testpage.pdf http://www.quivira-font.com/files/QuiviraCombining.pdf -> quivira-4.0-Combining.pdf http://www.quivira-font.com/files/QuiviraPUA.pdf -> quivira-4.0-PUA.pdf )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=86592c21fb507aa6223be2c2d8ec02c3
diff --git a/metadata/md5-cache/media-fonts/quivira-4.1 b/metadata/md5-cache/media-fonts/quivira-4.1
index d2601addd06c..f9a77fd20157 100644
--- a/metadata/md5-cache/media-fonts/quivira-4.1
+++ b/metadata/md5-cache/media-fonts/quivira-4.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.quivira-font.com/
 IUSE=doc X
 KEYWORDS=amd64 arm ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.quivira-font.com/files/Quivira.otf -> quivira-4.1.otf doc? ( http://www.quivira-font.com/files/Quivira.pdf -> quivira-4.1.pdf http://www.quivira-font.com/files/QuiviraTestpage.pdf -> quivira-4.1-Testpage.pdf http://www.quivira-font.com/files/QuiviraCombining.pdf -> quivira-4.1-Combining.pdf http://www.quivira-font.com/files/QuiviraPUA.pdf -> quivira-4.1-PUA.pdf )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d50be4ba9bf058589b0aabf6c8f44ab
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=5ad1e86bdc8d9dd17b6c6f0b3e9a966d
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.004 b/metadata/md5-cache/media-fonts/source-han-sans-1.004
index 28a1c871289f..a4e8c60e28b8 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -4,11 +4,11 @@ DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=6
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
 IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=l10n_ja? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansJP.zip -> source-han-sans-ja-1.004.zip ) l10n_ko? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansKR.zip -> source-han-sans-ko-1.004.zip ) l10n_zh-CN? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansCN.zip -> source-han-sans-zh_CN-1.004.zip ) l10n_zh-TW? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansTW.zip -> source-han-sans-zh_TW-1.004.zip )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eda47bbf799703d8e6d12c5f6d5a0e75
+_md5_=a4a4136460c3187d9d69fcda8df6e6d1
diff --git a/metadata/md5-cache/media-fonts/source-pro-20141211 b/metadata/md5-cache/media-fonts/source-pro-20141211
deleted file mode 100644
index 3281dfa2eeab..000000000000
--- a/metadata/md5-cache/media-fonts/source-pro-20141211
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Adobe's open source typeface family designed for UI environments
-EAPI=5
-HOMEPAGE=https://adobe-fonts.github.io/source-sans-pro/ https://adobe-fonts.github.io/source-serif-pro/ https://adobe-fonts.github.io/source-code-pro/
-IUSE=cjk X
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=OFL-1.1
-RDEPEND=media-libs/fontconfig cjk? ( media-fonts/source-han-sans )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz -> source-sans-pro-20141211.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/1.017R.tar.gz -> source-serif-pro-20141211.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/1.017R.tar.gz -> source-code-pro-20141211.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d98fcd7bc989c74325ba5d40fca564f
diff --git a/metadata/md5-cache/media-fonts/source-pro-20160608 b/metadata/md5-cache/media-fonts/source-pro-20160608
deleted file mode 100644
index 261c9d1191be..000000000000
--- a/metadata/md5-cache/media-fonts/source-pro-20160608
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Adobe's open source typeface family designed for UI environments
-EAPI=6
-HOMEPAGE=https://adobe-fonts.github.io/source-sans-pro/ https://adobe-fonts.github.io/source-serif-pro/ https://adobe-fonts.github.io/source-code-pro/
-IUSE=cjk X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
-LICENSE=OFL-1.1
-RDEPEND=media-libs/fontconfig cjk? ( media-fonts/source-han-sans )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.tar.gz -> source-sans-pro-20160608.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/1.017R.tar.gz -> source-serif-pro-20160608.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz -> source-code-pro-20160608.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=296641e164e2a69ff79299eeaa408be7
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.48-r2 b/metadata/md5-cache/media-fonts/terminus-font-4.48-r2
deleted file mode 100644
index 0aed653bd7ef..000000000000
--- a/metadata/md5-cache/media-fonts/terminus-font-4.48-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/gzip || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/awk otf? ( media-gfx/fontforge ) pcf? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-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
-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? ( pcf )
-SLOT=0
-SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.48/terminus-font-4.48.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ea629f137290d19fdd33b06e0a0a17a3
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.005 b/metadata/md5-cache/media-fonts/tex-gyre-2.005
deleted file mode 100644
index ee507fe87827..000000000000
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.005
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Extensive remake of freely available URW fonts
-EAPI=5
-HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
-IUSE=X
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
-LICENSE=|| ( GFL LPPL-1.3c )
-SLOT=0
-SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=95de3c152f553ca097177671f9160015
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.501 b/metadata/md5-cache/media-fonts/tex-gyre-2.501
index 80b1f88fd835..144d37c9dac7 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.501
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.501
@@ -5,9 +5,9 @@ DESCRIPTION=Extensive remake of freely available URW fonts
 EAPI=7
 HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
 LICENSE=|| ( GFL LPPL-1.3c )
 SLOT=0
 SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg2_501otf.zip
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=8ff49c0ac051b88eac2017d237ae47cc
+_md5_=9f9e629fe543e88b4ed4864937bb16b3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4bbb5f5dbf77..0cbe33fe5a39 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/chafa-1.6.0 b/metadata/md5-cache/media-gfx/chafa-1.6.0
index e04b73907c49..14c064153032 100644
--- a/metadata/md5-cache/media-gfx/chafa-1.6.0
+++ b/metadata/md5-cache/media-gfx/chafa-1.6.0
@@ -5,9 +5,9 @@ DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
 EAPI=7
 HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
 IUSE=+tools
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
 SLOT=0
 SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.0.tar.xz
-_md5_=8523f8d920bd962b01ecc528324b3f95
+_md5_=6c3828484f595999fb263dfe7ee58fd9
diff --git a/metadata/md5-cache/media-gfx/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6
index ca013bd2ca6e..4e3abda24470 100644
--- a/metadata/md5-cache/media-gfx/engauge-10.6
+++ b/metadata/md5-cache/media-gfx/engauge-10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Convert an image file showing a graph or map into numbers
 EAPI=7
 HOMEPAGE=https://markummitchell.github.io/engauge-digitizer/
 IUSE=doc examples jpeg2k pdf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/log4cpp sci-libs/fftw:3.0 jpeg2k? ( media-libs/openjpeg:2 ) pdf? ( app-text/poppler[qt5] )
 SLOT=0
 SRC_URI=https://github.com/markummitchell/engauge-digitizer/archive/v10.6.tar.gz -> engauge-digitizer-10.6.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0ef94f1bb3669f31b2afcca096bc18b
+_md5_=71c400b1de54b0cf8611a8620de2d9de
diff --git a/metadata/md5-cache/media-gfx/eog-3.38.2 b/metadata/md5-cache/media-gfx/eog-3.38.2
new file mode 100644
index 000000000000..dbac0b715aa3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-3.38.2
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.16 app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.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.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Eye of GNOME image viewer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
+IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+REQUIRED_USE=exif? ( jpeg )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/3.38/eog-3.38.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8cbe31ffd657e5712cf95f0b500ca8f2
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.1 b/metadata/md5-cache/media-gfx/freecad-0.19.1
new file mode 100644
index 000000000000..f799a931ee0a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=QT based Computer Aided Design application
+EAPI=7
+HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
+IUSE=debug headless pcl test +addonmgr +arch +drawing +fem +idf +image +inspection +material +mesh +openscad +part-design +path +points +raytracing +robot +show +spreadsheet +surface +techdraw +tux -cloud -plot -ship python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=LGPL-2 CC-BY-SA-4.0
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) fem? ( mesh ) inspection? ( mesh points ) openscad? ( mesh ) path? ( mesh robot ) ship? ( image plot ) techdraw? ( spreadsheet drawing )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/0.19.1.tar.gz -> freecad-0.19.1.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3debc4a5574bdf04749629b91196d329
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19_pre20201231 b/metadata/md5-cache/media-gfx/freecad-0.19_pre20201231
deleted file mode 100644
index e51691516de5..000000000000
--- a/metadata/md5-cache/media-gfx/freecad-0.19_pre20201231
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig ccache? ( dev-util/ccache ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=QT based Computer Aided Design application
-EAPI=7
-HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
-IUSE=ccache debug headless pcl test +addonmgr +arch +drawing +fem +idf +image +inspection +material +mesh +openscad +part-design +path +points +raytracing +robot +show +spreadsheet +surface +techdraw +tux -cloud -plot -ship python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
-LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) fem? ( mesh ) inspection? ( mesh points ) openscad? ( mesh ) path? ( mesh robot ) ship? ( image plot ) techdraw? ( spreadsheet drawing )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/82ec99dbc1f0f054748059ae8bb138eb44b43073.tar.gz -> freecad-0.19_pre20201231.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14399bfbbec8417297c2ba3bf4269ed0
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index e7ff252edd97..93e760084890 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/swig ccache? ( dev-util/ccache ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/swig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=7
 HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
-IUSE=ccache debug headless pcl test +addonmgr +arch +drawing +fem +idf +image +inspection +material +mesh +openscad +part-design +path +points +raytracing +robot +show +spreadsheet +surface +techdraw +tux -cloud -plot -ship python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug headless pcl test +addonmgr +arch +drawing +fem +idf +image +inspection +material +mesh +openscad +part-design +path +points +raytracing +robot +show +spreadsheet +surface +techdraw +tux -cloud -plot -ship python_single_target_python3_7 python_single_target_python3_8
 LICENSE=LGPL-2 CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mesh? ( sci-libs/hdf5:=[fortran,zlib] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,threads,python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pivy-0.6.5[python_targets_python3_7(-)] dev-python/pyside2[gui,svg,python_targets_python3_7(-)] dev-python/shiboken2[python_targets_python3_7(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_7(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) mesh? ( dev-python/pybind11[python_targets_python3_8(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) fem? ( mesh ) inspection? ( mesh points ) openscad? ( mesh ) path? ( mesh robot ) ship? ( image plot ) techdraw? ( spreadsheet drawing )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4a1d9ee7a60aa2fee74188ae8b7dc94
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c06afad2fa067c94c6229f438d919397
diff --git a/metadata/md5-cache/media-gfx/frogr-1.5 b/metadata/md5-cache/media-gfx/frogr-1.5
index cdcf2c2968f2..3e561f006c06 100644
--- a/metadata/md5-cache/media-gfx/frogr-1.5
+++ b/metadata/md5-cache/media-gfx/frogr-1.5
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 >=x11-libs/gtk+-3.16:3[i
 SLOT=0
 SRC_URI=mirror://gnome/sources/frogr/1.5/frogr-1.5.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0869a70de2179570154ac2a5b5388a7
+_md5_=6d6f71e0f821970092d015820c81a73a
diff --git a/metadata/md5-cache/media-gfx/gif2png-2.5.12 b/metadata/md5-cache/media-gfx/gif2png-2.5.12
deleted file mode 100644
index b7e49df92043..000000000000
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
-DESCRIPTION=Converts images from gif format to png format
-EAPI=7
-HOMEPAGE=http://catb.org/~esr/gif2png/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
-SLOT=0
-SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.12.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=69de5fea0ac4f27dfc58f600c5bd0f96
diff --git a/metadata/md5-cache/media-gfx/gif2png-2.5.9 b/metadata/md5-cache/media-gfx/gif2png-2.5.9
deleted file mode 100644
index 8ade87363f4d..000000000000
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib
-DESCRIPTION=Converts images from gif format to png format
-EAPI=5
-HOMEPAGE=http://catb.org/~esr/gif2png/
-KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib
-SLOT=0
-SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.9.tar.gz
-_md5_=aaa5a9c947a2e07abe0fa274a5c99e64
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.5 b/metadata/md5-cache/media-gfx/gmic-2.9.5
index d198e2bce6c3..5796df10c39c 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.5
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.5
@@ -5,11 +5,11 @@ DESCRIPTION=GREYC's Magic Image Converter
 EAPI=7
 HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
 IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=CeCILL-2 GPL-3
 RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
 REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.5.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=589ad04cbee1b8a138d2515a6ebf3195
+_md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.6 b/metadata/md5-cache/media-gfx/gmic-2.9.6
new file mode 100644
index 000000000000..d137b0f4cc2d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.9.6.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c3260cc9a0b364c5b0a4e348a3f34b3
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
deleted file mode 100644
index 9175313b57c0..000000000000
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libpng:0= virtual/jpeg:0 doc? ( app-text/docbook-xsl-stylesheets python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) dev-libs/libxslt x11-libs/gtk+:3[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
-EAPI=7
-HOMEPAGE=https://github.com/fract4d/gnofract4d
-IUSE=+doc test python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fract4d/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6490310a37136952b807efdcd01c4db3
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
new file mode 100644
index 000000000000..97d5e0b1da3b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=virtual/jpeg:0 x11-libs/gtk+:3 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A Simple and Fast Image Viewer for X
+EAPI=7
+HOMEPAGE=http://lxde.sourceforge.net/gpicview
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~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	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73daad87d5fb06ad163c0962feb11f91
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.11 b/metadata/md5-cache/media-gfx/gscan2pdf-1.8.11
deleted file mode 100644
index 969b0d5016a1..000000000000
--- a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
-EAPI=6
-HOMEPAGE=http://gscan2pdf.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/Config-General dev-perl/Date-Calc dev-perl/Data-UUID dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/Goo-Canvas dev-perl/Gtk2-Ex-PodViewer dev-perl/Gtk2-Ex-Simple-List dev-perl/Gtk2-ImageView dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/Locale-gettext dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/gtkimageview media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-1.8.11.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0db32ec3af86b196a99dd1011b7885c
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.10.2 b/metadata/md5-cache/media-gfx/gscan2pdf-2.10.2
deleted file mode 100644
index 68ff040e88c4..000000000000
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-ImageView dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-Builder dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/IPC-System-Simple dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[jpeg,tiff] app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
-EAPI=7
-HOMEPAGE=http://gscan2pdf.sourceforge.net/
-IUSE=test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-ImageView dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-Builder dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.10.2.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a3fd779e1dc5498835cb9f4d043d8f0
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
new file mode 100644
index 000000000000..a3fa30f715e0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-ImageView dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-Builder dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/IPC-System-Simple dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[jpeg,tiff] app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
+EAPI=7
+HOMEPAGE=http://gscan2pdf.sourceforge.net/
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-ImageView dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-Builder dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.11.1.tar.xz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a3fd779e1dc5498835cb9f4d043d8f0
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.2 b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
deleted file mode 100644
index 18cb04066177..000000000000
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install pretend
-DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
-EAPI=7
-HOMEPAGE=https://pngquant.org/lib/
-IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0/0
-SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.2.tar.gz -> libimagequant-2.12.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=db118cde9ea818e3e83677c8940fbfcd
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
deleted file mode 100644
index 5b934b3aaefc..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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=Library for the efficient manipulation of volumetric data
-EAPI=7
-HOMEPAGE=https://www.openvdb.org
-IUSE=abi3-compat +abi4-compat doc python test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( abi3-compat abi4-compat )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://dev.gentoo.org/~dracwyrm/patches/openvdb-4.0.2-patchset-02.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a50caf31ee2f52c49c4bbaffd96c3f7
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2 b/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2
deleted file mode 100644
index 9329dfcb6a62..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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=Library for the efficient manipulation of volumetric data
-EAPI=7
-HOMEPAGE=https://www.openvdb.org
-IUSE=abi3-compat abi4-compat +abi5-compat doc python test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( abi3-compat abi4-compat abi5-compat )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.2.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=375467e08f319c80abf655d6886b52ff
diff --git a/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1 b/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1
deleted file mode 100644
index 7e3ed365331f..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16.2-r1 virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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=Library for the efficient manipulation of volumetric data
-EAPI=7
-HOMEPAGE=https://www.openvdb.org
-IUSE=abi4-compat abi5-compat +abi6-compat doc python test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-cpp/tbb dev-libs/boost:= dev-libs/c-blosc:= dev-libs/jemalloc:= dev-libs/log4cplus:= media-libs/glfw media-libs/glu media-libs/ilmbase:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/boost:=[python?,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) 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? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( abi4-compat abi5-compat abi6-compat )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v6.2.1.tar.gz -> openvdb-6.2.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=668178237048ecb497db7eb3cc687265
diff --git a/metadata/md5-cache/media-gfx/optipng-0.7.7 b/metadata/md5-cache/media-gfx/optipng-0.7.7
deleted file mode 100644
index 1965a344a290..000000000000
--- a/metadata/md5-cache/media-gfx/optipng-0.7.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib media-libs/libpng:0= sys-apps/findutils
-DESCRIPTION=Compress PNG files without affecting image quality
-EAPI=6
-HOMEPAGE=http://optipng.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib media-libs/libpng:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/optipng/optipng-0.7.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8f69ee1e356816650c0fef1ff2d374f
diff --git a/metadata/md5-cache/media-gfx/optipng-0.7.7-r1 b/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
index f7b228693004..e3a1455099d9 100644
--- a/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
+++ b/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib media-libs/libpng:0= sys-apps/findutils
 DESCRIPTION=Compress PNG files without affecting image quality
 EAPI=7
 HOMEPAGE=http://optipng.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=sys-libs/zlib media-libs/libpng:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/optipng/optipng-0.7.7.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdc1412ebf56cf9552312f2a262a13f3
+_md5_=da87339a1e9c145026593b6d6abf89c6
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.1.1 b/metadata/md5-cache/media-gfx/qrencode-4.1.1
index c658657555b2..cc5d921a6eb8 100644
--- a/metadata/md5-cache/media-gfx/qrencode-4.1.1
+++ b/metadata/md5-cache/media-gfx/qrencode-4.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=7
 HOMEPAGE=https://fukuchi.org/works/qrencode/
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng:0=
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2
-_md5_=a9a79cf1327c8afecf6f33bf3bcc8bad
+_md5_=5b781faecaf4f2ead3a1ec2aaaeb23f6
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.6 b/metadata/md5-cache/media-gfx/rawtherapee-5.6
deleted file mode 100644
index 8c8519b7f08c..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
-DEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3 dev-cpp/gtkmm:3.0 gnome-base/librsvg
-DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=7
-HOMEPAGE=https://www.rawtherapee.com/
-IUSE=openmp
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.6.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96b04c436ee7e073af209984d7ab3d7b
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.7 b/metadata/md5-cache/media-gfx/rawtherapee-5.7
deleted file mode 100644
index 9a16241850a0..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
-DEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3 dev-cpp/gtkmm:3.0 gnome-base/librsvg
-DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=7
-HOMEPAGE=https://www.rawtherapee.com/
-IUSE=openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.7.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25e53d9beb69117b0fb65d00ad5501a4
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.31 b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
index 8c81d7f70617..7247c20e0d7d 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.31
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
@@ -5,11 +5,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=7
 HOMEPAGE=http://www.sane-project.org/
 IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_lide70 sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pieusb +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] net-dns/avahi[gtk2] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd0ee1918ab792a791db67f744bd94b1
+_md5_=215895ee552072ae6efa396e118c5f5f
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
deleted file mode 100644
index 46211a761d12..000000000000
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
-DESCRIPTION=Drawing program designed for young children
-EAPI=7
-HOMEPAGE=http://www.tuxpaint.org/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
-SLOT=0
-SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.21.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bab7c015fe8f7b640eabd2f25f24e2d
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.6 b/metadata/md5-cache/media-gfx/viewnior-1.6
deleted file mode 100644
index bc6e3ed4b3b1..000000000000
--- a/metadata/md5-cache/media-gfx/viewnior-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 media-gfx/exiv2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info >=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=Fast and simple image viewer
-EAPI=6
-HOMEPAGE=https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 media-gfx/exiv2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info dev-util/glib-utils
-SLOT=0
-SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4850436353981f189d8539a489a5680c
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.7-r1 b/metadata/md5-cache/media-gfx/viewnior-1.7-r1
deleted file mode 100644
index 2e7eaa20090f..000000000000
--- a/metadata/md5-cache/media-gfx/viewnior-1.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2 dev-util/glib-utils virtual/pkgconfig x11-misc/shared-mime-info >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=Fast and simple image viewer
-EAPI=6
-HOMEPAGE=https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2
-SLOT=0
-SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94de2a0a392977d8c984b8400965438b
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.5 b/metadata/md5-cache/media-gfx/wings-2.1.5
deleted file mode 100644
index 800a2e072150..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.5.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c30cee58ba2be6930e7b7e21acb85d30
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.6 b/metadata/md5-cache/media-gfx/wings-2.1.6
deleted file mode 100644
index 6691151ca9eb..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.6.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.7 b/metadata/md5-cache/media-gfx/wings-2.1.7
deleted file mode 100644
index cc2650eaaac3..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.7.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.2.5 b/metadata/md5-cache/media-gfx/wings-2.2.5
deleted file mode 100644
index bb97efd0aa0c..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=7
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.2.5.tar.bz2
-_md5_=31fd38c19e96774fbfe5f8453808118c
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.5.1 b/metadata/md5-cache/media-gfx/yafaray-3.5.1
index 6fa0d2a17a74..e896cb0814ae 100644
--- a/metadata/md5-cache/media-gfx/yafaray-3.5.1
+++ b/metadata/md5-cache/media-gfx/yafaray-3.5.1
@@ -13,4 +13,4 @@ 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0be3175e18e77817a84ab4a68a8c1cb
+_md5_=337b54e7a16d51386fd4534b52fe5e12
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23.1 b/metadata/md5-cache/media-gfx/zbar-0.23.1
index f7e914e24dcf..e7bf04540e9e 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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea861ef842ab42bda07cb29f738d2e01
+_md5_=caccff4351a623d81d44ebfaa94357d1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index bba9d619592e..dcb6bf5c06fd 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/aribb24-1.0.3 b/metadata/md5-cache/media-libs/aribb24-1.0.3
deleted file mode 100644
index 2e05e5eedb03..000000000000
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libpng:0= virtual/pkgconfig >=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 for decoding ARIB STD-B24 subtitles
-EAPI=6
-HOMEPAGE=https://github.com/nkoriyama/aribb24
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=media-libs/libpng:0=
-SLOT=0
-SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=726682cd09ee8875d000e798d71a5b45
diff --git a/metadata/md5-cache/media-libs/aribb24-1.0.3-r1 b/metadata/md5-cache/media-libs/aribb24-1.0.3-r1
deleted file mode 100644
index d478f7e4cda4..000000000000
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/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(-)?]
-DESCRIPTION=Library for decoding ARIB STD-B24 subtitles
-EAPI=7
-HOMEPAGE=https://github.com/nkoriyama/aribb24
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=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(-)?]
-SLOT=0
-SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a947dc9efd5491e5fee31dbc4e8439b
diff --git a/metadata/md5-cache/media-libs/bcg729-1.1.1 b/metadata/md5-cache/media-libs/bcg729-1.1.1
index 272137a2ec97..e9e9ed1d43a7 100644
--- a/metadata/md5-cache/media-libs/bcg729-1.1.1
+++ b/metadata/md5-cache/media-libs/bcg729-1.1.1
@@ -1,6 +1,6 @@
 BDEPEND=test? ( app-arch/unzip ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=encoder and decoder of the ITU G729 Annex A/B speech codec
+DESCRIPTION=Encoder and decoder of the ITU G729 Annex A/B speech codec
 EAPI=7
 HOMEPAGE=https://github.com/BelledonneCommunications/bcg729
 IUSE=test
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/BelledonneCommunications/bcg729/archive/1.1.1.tar.gz -> bcg729-1.1.1.tar.gz test? ( http://www.belledonne-communications.com/bc-downloads/bcg729-patterns.zip -> bcg729-tests-20210101.zip )
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9972ce8cfbc357bf73a86934c1131a9
+_md5_=61591454680bca2bf4bc83032f015b00
diff --git a/metadata/md5-cache/media-libs/glew-2.1.0-r1 b/metadata/md5-cache/media-libs/glew-2.1.0-r1
deleted file mode 100644
index a69a732621f9..000000000000
--- a/metadata/md5-cache/media-libs/glew-2.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL Extension Wrangler Library
-EAPI=7
-HOMEPAGE=http://glew.sourceforge.net/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/2.1
-SRC_URI=mirror://sourceforge/glew/glew-2.1.0.tgz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c20bd90771599bda20430304ed9c657
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.7.2 b/metadata/md5-cache/media-libs/harfbuzz-2.7.2
deleted file mode 100644
index 83f9daf429c4..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-2.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34 test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DESCRIPTION=An OpenType text shaping engine
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-RESTRICT=!test? ( test )
-SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.7.2.tar.gz -> harfbuzz-2.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47aeff17c669aefff29b78d01c55e67c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.7.3 b/metadata/md5-cache/media-libs/harfbuzz-2.7.3
deleted file mode 100644
index 11d61980c240..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-2.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34 test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DESCRIPTION=An OpenType text shaping engine
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-RESTRICT=!test? ( test )
-SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.7.3.tar.gz -> harfbuzz-2.7.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=238756bbeb423d935ccb2a251fe9624a
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.7.4 b/metadata/md5-cache/media-libs/harfbuzz-2.7.4
index 10c87a691d08..6714b2590530 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.7.4
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.7.4
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz -> harfbuzz-2.7.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5efaacd5b35ed1e0ae9cee3d4c3f8512
+_md5_=07a3adba5e0d3526dc0bab7ca3dfede7
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.8.0 b/metadata/md5-cache/media-libs/harfbuzz-2.8.0
new file mode 100644
index 000000000000..420a8bb8e250
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/0.9.18
+SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.0.tar.gz -> harfbuzz-2.8.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7bafdf157bd8dbe9eb7a2ae9497b4e69
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-18.3.0 b/metadata/md5-cache/media-libs/intel-mediasdk-18.3.0
deleted file mode 100644
index 0e019789c0de..000000000000
--- a/metadata/md5-cache/media-libs/intel-mediasdk-18.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-intel-media-driver-18.3.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Intel Media SDK
-EAPI=6
-HOMEPAGE=http://mediasdk.intel.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-intel-media-driver-18.3.0
-SLOT=0
-SRC_URI=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-18.3.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f123473463279eac42879bf1681c03a
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-18.4.1 b/metadata/md5-cache/media-libs/intel-mediasdk-18.4.1
deleted file mode 100644
index 16fcfffc15b5..000000000000
--- a/metadata/md5-cache/media-libs/intel-mediasdk-18.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-intel-media-driver-18.4.1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Intel Media SDK
-EAPI=6
-HOMEPAGE=http://mediasdk.intel.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-intel-media-driver-18.4.1
-SLOT=0
-SRC_URI=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-18.4.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f8e3ab1ef7a022e72c304840383ad0a
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0 b/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0
new file mode 100644
index 000000000000..1c39cf74d6a2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libva-intel-media-driver-20.3.0
+DESCRIPTION=Intel Media SDK
+EAPI=7
+HOMEPAGE=http://mediasdk.intel.com
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=x11-libs/libva-intel-media-driver-20.3.0
+SLOT=0
+SRC_URI=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-20.3.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7822f6cc7716df0bc9d845b781816420
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-9999 b/metadata/md5-cache/media-libs/intel-mediasdk-9999
index 5da38f80ecd0..41fe5a7dc644 100644
--- a/metadata/md5-cache/media-libs/intel-mediasdk-9999
+++ b/metadata/md5-cache/media-libs/intel-mediasdk-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/libva-intel-media-driver-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=x11-libs/libva-intel-media-driver-9999
 DESCRIPTION=Intel Media SDK
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mediasdk.intel.com
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libva-intel-media-driver-9999
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f123473463279eac42879bf1681c03a
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7822f6cc7716df0bc9d845b781816420
diff --git a/metadata/md5-cache/media-libs/lib3mf-2.1.0 b/metadata/md5-cache/media-libs/lib3mf-2.1.0
deleted file mode 100644
index b0836a7891d6..000000000000
--- a/metadata/md5-cache/media-libs/lib3mf-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest dev-libs/openssl dev-util/valgrind ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
-DESCRIPTION=Implementation of the 3D Manufacturing Format file standard
-EAPI=7
-HOMEPAGE=https://3mf.io/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/3MFConsortium/lib3mf/archive/v2.1.0.tar.gz -> lib3mf-2.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56e038c6ab5ab5a17ba50c7184fa5fb3
diff --git a/metadata/md5-cache/media-libs/lib3mf-2.1.1 b/metadata/md5-cache/media-libs/lib3mf-2.1.1
new file mode 100644
index 000000000000..c28bd0bedab3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lib3mf-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest dev-libs/openssl dev-util/valgrind ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
+DESCRIPTION=Implementation of the 3D Manufacturing Format file standard
+EAPI=7
+HOMEPAGE=https://3mf.io/ https://github.com/3MFConsortium/lib3mf
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/3MFConsortium/lib3mf/archive/v2.1.1.tar.gz -> lib3mf-2.1.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=850de6cebeb892a26910ba262a6f8bd8
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.7 b/metadata/md5-cache/media-libs/libdca-0.0.7
index 790b761cbba5..42888075637f 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.7
+++ b/metadata/md5-cache/media-libs/libdca-0.0.7
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.videolan.org/pub/videolan/libdca/0.0.7/libdca-0.0.7.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53452bf36a50faa3a268c893f1720162
+_md5_=7eaae72c40fe69b5178ed4dcf538ab40
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.5 b/metadata/md5-cache/media-libs/libepoxy-1.5.5
index e4f2727fa4b6..dabc2eed8765 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.5
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.5
@@ -5,11 +5,11 @@ DESCRIPTION=Library for handling OpenGL function pointer management
 EAPI=7
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=+egl test +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 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=egl? ( media-libs/mesa[egl,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/anholt/libepoxy/archive/1.5.5.tar.gz -> libepoxy-1.5.5.tar.gz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=4ca268de73543b2b5a978aea9f49b22a
+_md5_=f4a2f56e45e62db6b1b6d5d2123beb35
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.26 b/metadata/md5-cache/media-libs/libgphoto2-2.5.26
index 9bc18119a62b..f7d803be6443 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.26
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.26
@@ -5,10 +5,10 @@ DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=7
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 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 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev >=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(-)?] 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(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.26.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=f181a68ac09cbe3bbbb9096c82856bac
+_md5_=915923e96ec8cdbb52b5378aeb682940
diff --git a/metadata/md5-cache/media-libs/libmng-2.0.3-r1 b/metadata/md5-cache/media-libs/libmng-2.0.3-r1
new file mode 100644
index 000000000000..ee417aa27dd7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmng-2.0.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/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(-)?] )
+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
+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	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=27a58c3d33eb3fe24512813a445c4726
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2 b/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2
deleted file mode 100644
index 8ce1b35d7cb2..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.1.3
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnspsl-0.1.3-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ac3d62ff8eb44a2eba00fa8fcf33fcf9
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1 b/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1
deleted file mode 100644
index cb69678d45d3..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DEFINED_PHASES=compile install
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.1.5
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnspsl-0.1.5-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=155fb2ad06b9cd8c5710b1dfae2dd1c2
diff --git a/metadata/md5-cache/media-libs/libopenaptx-0.2.0 b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
new file mode 100644
index 000000000000..384a03127b9e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Reverse-engineered aptX and aptX HD library
+EAPI=7
+HOMEPAGE=https://github.com/pali/libopenaptx
+IUSE=cpu_flags_x86_avx2
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://github.com/pali/libopenaptx/archive/0.2.0.tar.gz -> libopenaptx-0.2.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ee53332191fadf36108aef394ed3764f
diff --git a/metadata/md5-cache/media-libs/libopenaptx-9999 b/metadata/md5-cache/media-libs/libopenaptx-9999
new file mode 100644
index 000000000000..4c8f0817d1e7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenaptx-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Reverse-engineered aptX and aptX HD library
+EAPI=7
+HOMEPAGE=https://github.com/pali/libopenaptx
+IUSE=cpu_flags_x86_avx2
+LICENSE=LGPL-2.1+
+PROPERTIES=live
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ee53332191fadf36108aef394ed3764f
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.12 b/metadata/md5-cache/media-libs/lilv-0.24.12
index cb09878485df..087488c71ab3 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.12
+++ b/metadata/md5-cache/media-libs/lilv-0.24.12
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( python_single_target_python3_7? ( dev-python/unittest2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/unittest2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/unittest2[python_targets_python3_9(-)] ) )
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme ) test? ( python_single_target_python3_7? ( dev-python/unittest2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/unittest2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/unittest2[python_targets_python3_9(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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/serd[abi_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/sord[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/sratom[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.12.tar.bz2
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=aa2c63b32a46e63f3eab3a6b3f7034db
+_md5_=3c6cfc611126cf7ff2d5110ca4ad5a18
diff --git a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829 b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
deleted file mode 100644
index ecf0813cb595..000000000000
--- a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/swig doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/freeglut sys-libs/zlib:= virtual/opengl
-DESCRIPTION=A library for particle IO and manipulation
-EAPI=7
-HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
-IUSE=doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/freeglut sys-libs/zlib:= virtual/opengl
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/wdas/partio/archive/2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5.tar.gz -> partio-1.1.0_p20170829.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6bc1c256827a4668c2e4182317aa60db
diff --git a/metadata/md5-cache/media-libs/partio-1.5.4 b/metadata/md5-cache/media-libs/partio-1.5.4
deleted file mode 100644
index 7a4b46a3a08b..000000000000
--- a/metadata/md5-cache/media-libs/partio-1.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/swig doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/freeglut sys-libs/zlib:= virtual/opengl
-DESCRIPTION=Library for particle IO and manipulation
-EAPI=7
-HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
-IUSE=doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/freeglut sys-libs/zlib:= virtual/opengl
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/wdas/partio/archive/v1.5.4.tar.gz -> partio-1.5.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e605606a2ad20cfbdf11d510191f53e
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
index 194a3b278898..8fa7af3faef1 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
+++ b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
@@ -11,4 +11,4 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> portaudio-19.06.00-audacity-portmixer.patch
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a852bd0acb11f54df51c235635eb28da
+_md5_=97579cee7604e0aeddae405eca790920
diff --git a/metadata/md5-cache/media-libs/rubberband-1.9.1-r1 b/metadata/md5-cache/media-libs/rubberband-1.9.1-r1
new file mode 100644
index 000000000000..f9c21af4736b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/rubberband-1.9.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( virtual/jdk:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
+EAPI=7
+HOMEPAGE=https://www.breakfastquay.com/rubberband/
+IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( virtual/jdk:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.9.1.tar.bz2
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3481a88fd6404f66412011d33f5e2f06
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.8 b/metadata/md5-cache/media-libs/sratom-0.6.8
index 2f9f6082c9ec..c6df6a040d10 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.8
+++ b/metadata/md5-cache/media-libs/sratom-0.6.8
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/serd dev-libs/sord media-libs/lv2 || ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] )
 DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.8.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=8f2f8f368253a7b803471796e8cfe97a
+_md5_=07ae160992e98f795c2d37d139961a35
diff --git a/metadata/md5-cache/media-libs/suil-0.10.10 b/metadata/md5-cache/media-libs/suil-0.10.10
index e33853a7ad39..538c6e32aee5 100644
--- a/metadata/md5-cache/media-libs/suil-0.10.10
+++ b/metadata/md5-cache/media-libs/suil-0.10.10
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/suil/
 IUSE=doc gtk qt5
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~x86
 LICENSE=ISC
 RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
 SLOT=0
 SRC_URI=http://download.drobilla.net/suil-0.10.10.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f33084cdacb4b6f5bb2efa16c8819285
+_md5_=91f8e657cf53bed2c601fbbeda673d57
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index fa2f3e23d219..57ee7cdc5894 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/ir_lv2-1.2.4 b/metadata/md5-cache/media-plugins/ir_lv2-1.2.4
deleted file mode 100644
index 6b35d40a32da..000000000000
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-libs/zita-convolver-3:= >=x11-libs/gtk+-2.16:2
-DESCRIPTION=LV2 convolver plugin especially for creating reverb effects
-EAPI=7
-HOMEPAGE=https://tomszilagyi.github.io/plugins/ir.lv2/
-IUSE=tools
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-libs/zita-convolver-3:= >=x11-libs/gtk+-2.16:2
-SLOT=0
-SRC_URI=https://github.com/tomszilagyi/ir.lv2/archive/1.2.4.tar.gz -> ir_lv2-1.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5cfc10cfa2e840f68d72bf50dcdfcea0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.3 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.3
deleted file mode 100644
index a6e94778f30a..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-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.2.3-Matrix.tar.gz -> kodi-pvr-hts-8.2.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.4 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.4
new file mode 100644
index 000000000000..888b7f7a1603
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.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.2.4-Matrix.tar.gz -> kodi-pvr-hts-8.2.4.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3
deleted file mode 100644
index 6f4138285c3f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-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.3.3-Matrix.tar.gz -> kodi-pvr-vuplus-7.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0
deleted file mode 100644
index 53b98d384049..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.0-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
new file mode 100644
index 000000000000..cd433992d5b1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
@@ -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.1-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0-r1
deleted file mode 100644
index 8bce0180ccf8..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/groff dev-lang/perl
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
-EAPI=7
-HOMEPAGE=http://winni.vdr-developer.org/epgsearch/index_eng.html
-IUSE=conflictcheckonly epgsearchonly pcre quicksearch tre
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-REQUIRED_USE=?? ( pcre tre )
-SLOT=0
-SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.2.0.tar.gz -> vdr-epgsearch-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1002920195baa63a61fe4130aff55743
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402
deleted file mode 100644
index b0799d21f84f..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/groff dev-lang/perl
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
-EAPI=7
-HOMEPAGE=http://winni.vdr-developer.org/epgsearch/index_eng.html
-IUSE=conflictcheckonly epgsearchonly pcre quicksearch tre
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-REQUIRED_USE=?? ( pcre tre )
-SLOT=0
-SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3.tar.gz -> vdr-epgsearch-2.4.0_p20200402.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b39ba5737ba5287dfdcac5bba9a9641a
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 0a4abd3351a0..d5fe2df4b8c6 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/cqrlog-2.1.0-r2 b/metadata/md5-cache/media-radio/cqrlog-2.1.0-r2
deleted file mode 100644
index 3ab4a647432d..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.6.4 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.6.4 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.1.0.tar.gz -> cqrlog-2.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7dca9cfde3eed7062ea95cd295634921
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.3.0 b/metadata/md5-cache/media-radio/cqrlog-2.3.0
deleted file mode 100644
index a6690f10ebbb..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.3.0.tar.gz -> cqrlog-2.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a30e08538f3ec26371531153032d52ad
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1 b/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1
deleted file mode 100644
index e5262e2f385e..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.3.0.tar.gz -> cqrlog-2.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c56dfffbb55e8d82ef81a9cba3f31046
diff --git a/metadata/md5-cache/media-radio/direwolf-1.5-r1 b/metadata/md5-cache/media-radio/direwolf-1.5-r1
new file mode 100644
index 000000000000..43adadc75c53
--- /dev/null
+++ b/metadata/md5-cache/media-radio/direwolf-1.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=hamlib? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/hamlib:= ) udev? ( virtual/libudev )
+DESCRIPTION=Decoded Information from Radio Emissions for Windows Or Linux Fans
+EAPI=7
+HOMEPAGE=https://github.com/wb2osz/direwolf/blob/master/README.md
+IUSE=gps hamlib udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/hamlib:= ) udev? ( virtual/libudev )
+SLOT=0
+SRC_URI=https://github.com/wb2osz/direwolf/archive/1.5.tar.gz -> direwolf-1.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=890fce88e82b6ee8338ce926197fad43
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 134e1843d4b0..aea604c2cc6b 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/aqualung-1.0-r5 b/metadata/md5-cache/media-sound/aqualung-1.0-r5
deleted file mode 100644
index fb0d9c9a7a8d..000000000000
--- a/metadata/md5-cache/media-sound/aqualung-1.0-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music player for a wide range of formats designed for gapless playback
-EAPI=7
-HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
-IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=mirror://sourceforge/aqualung/aqualung-1.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8f23437e3f0323a9f98459c7f0bb93c
diff --git a/metadata/md5-cache/media-sound/aqualung-1.1-r1 b/metadata/md5-cache/media-sound/aqualung-1.1-r1
deleted file mode 100644
index 5eedd09c42d7..000000000000
--- a/metadata/md5-cache/media-sound/aqualung-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music player for a wide range of formats designed for gapless playback
-EAPI=7
-HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
-IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=523b162983eacc0cddd59814f2b0c744
diff --git a/metadata/md5-cache/media-sound/awesfx-0.5.1e b/metadata/md5-cache/media-sound/awesfx-0.5.1e
index 0f041f3bde17..36f3e48bb1ca 100644
--- a/metadata/md5-cache/media-sound/awesfx-0.5.1e
+++ b/metadata/md5-cache/media-sound/awesfx-0.5.1e
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst
 DEPEND=media-libs/alsa-lib
 DESCRIPTION=AWE32 Sound Driver Utility Programs
 EAPI=7
-HOMEPAGE=http://ftp.suse.com/pub/people/tiwai/awesfx
+HOMEPAGE=https://ftp.suse.com/pub/people/tiwai/awesfx
 KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=media-libs/alsa-lib
 SLOT=0
-SRC_URI=http://ftp.suse.com/pub/people/tiwai/awesfx/awesfx-0.5.1e.tar.bz2
-_md5_=6cb5c9fa86e201a21d58cba92a1a96dc
+SRC_URI=https://ftp.suse.com/pub/people/tiwai/awesfx/awesfx-0.5.1e.tar.bz2
+_md5_=f863d0c87dba5f924c506e45c919590b
diff --git a/metadata/md5-cache/media-sound/cmus-2.9.1 b/metadata/md5-cache/media-sound/cmus-2.9.1
new file mode 100644
index 000000000000..f83e562dcbd2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cmus-2.9.1
@@ -0,0 +1,15 @@
+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	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1823ada89bbcb2550c17ff773d7ca6bf
diff --git a/metadata/md5-cache/media-sound/darksnow-0.7.1 b/metadata/md5-cache/media-sound/darksnow-0.7.1
index 73db5f39ec00..300ef5e0983e 100644
--- a/metadata/md5-cache/media-sound/darksnow-0.7.1
+++ b/metadata/md5-cache/media-sound/darksnow-0.7.1
@@ -3,12 +3,12 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DEPEND=>=x11-libs/gtk+-2.14.0:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Streaming GTK+ Front-End based on Darkice Ice Streamer
 EAPI=7
-HOMEPAGE=http://darksnow.radiolivre.org
+HOMEPAGE=https://darksnow.radiolivre.org
 KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 PDEPEND=>=media-sound/darkice-1.2
 RDEPEND=>=x11-libs/gtk+-2.14.0:2
 SLOT=0
-SRC_URI=http://darksnow.radiolivre.org/pacotes/darksnow-0.7.1.tar.gz
+SRC_URI=https://darksnow.radiolivre.org/pacotes/darksnow-0.7.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61544b87ca0bc489da5a83ff9f020520
+_md5_=9aa8c5b2b24d62b4a23d395dc68db39e
diff --git a/metadata/md5-cache/media-sound/din-50 b/metadata/md5-cache/media-sound/din-50
new file mode 100644
index 000000000000..cd71149166c0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/din-50
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=a software musical instrument and audio synthesizer
+EAPI=7
+HOMEPAGE=https://dinisnoise.org/
+IUSE=+alsa jack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+REQUIRED_USE=|| ( alsa jack )
+SLOT=0
+SRC_URI=https://archive.org/download/dinisnoise_source_code/din-50.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08db31ff3d0423a2fb4af9e2afef8710
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.1.0 b/metadata/md5-cache/media-sound/fluidsynth-2.1.0
index f2561332c478..d10205f4b944 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.1.0
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
 EAPI=7
-HOMEPAGE=http://www.fluidsynth.org/
+HOMEPAGE=https://www.fluidsynth.org
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1+
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 SLOT=0/2
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.1.0.tar.gz -> fluidsynth-2.1.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=698bb3ccdda753cea438f3de59afbd98
+_md5_=abd610c4adbb0ecf46b7bf6a7cc3c6b8
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.1.4 b/metadata/md5-cache/media-sound/fluidsynth-2.1.4
index 5e9783e9ea84..5b20cf1ee97f 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.1.4
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.1.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
 EAPI=7
-HOMEPAGE=http://www.fluidsynth.org/
+HOMEPAGE=https://www.fluidsynth.org
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 SLOT=0/2
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.1.4.tar.gz -> fluidsynth-2.1.4.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02f6eaa53f1ec6e66c53b8ade68d0d66
+_md5_=603392718981686a197e3bcf0b90cd3f
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.1.5 b/metadata/md5-cache/media-sound/fluidsynth-2.1.5
index ad9dcccf1ace..4b406fbcf42f 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.1.5
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.1.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
 EAPI=7
-HOMEPAGE=http://www.fluidsynth.org/
+HOMEPAGE=https://www.fluidsynth.org
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1+
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 SLOT=0/2
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.1.5.tar.gz -> fluidsynth-2.1.5.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f148a1f7874ecfa46e7087c3a3f38348
+_md5_=abd610c4adbb0ecf46b7bf6a7cc3c6b8
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16
new file mode 100644
index 000000000000..efac947c32eb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An open-source jukebox for large collections of mp3/ogg/flac files
+EAPI=7
+HOMEPAGE=https://gmusicbrowser.org/
+IUSE=dbus doc extras gstreamer libnotify mplayer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
+SLOT=0
+SRC_URI=https://gmusicbrowser.org/download/gmusicbrowser-1.1.16.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3d047a4b8dcfeac101e5c49a195d9586
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-9999 b/metadata/md5-cache/media-sound/gmusicbrowser-9999
index 4f5e2bc13618..7b427fa738fc 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-9999
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gettext doc? ( dev-perl/Text-Markdown ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
-DEPEND=sys-devel/gettext doc? ( dev-perl/Text-Markdown ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-lang/perl dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An open-source jukebox for large collections of mp3/ogg/flac files
 EAPI=7
 HOMEPAGE=https://gmusicbrowser.org/
 IUSE=dbus doc extras gstreamer libnotify mplayer
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
+RDEPEND=dev-lang/perl dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbc0b7d01191bdb6ad7cb9db1db1b827
+_md5_=1fd382f2f5eb8fef056785e054879416
diff --git a/metadata/md5-cache/media-sound/gst123-0.3.5 b/metadata/md5-cache/media-sound/gst123-0.3.5
index e259ad6be69e..163d7ab09dfa 100644
--- a/metadata/md5-cache/media-sound/gst123-0.3.5
+++ b/metadata/md5-cache/media-sound/gst123-0.3.5
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-libs/ncurses:0= x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=A GStreamer based command line media player
-EAPI=6
-HOMEPAGE=http://space.twc.de/~stefan/gst123.php
+DEPEND=dev-libs/glib:2 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-libs/ncurses:0= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=GStreamer based command line media player
+EAPI=7
+HOMEPAGE=https://space.twc.de/~stefan/gst123.php
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-libs/ncurses:0= x11-libs/gtk+:2 x11-libs/libX11 media-plugins/gst-plugins-meta:1.0
 SLOT=0
-SRC_URI=http://space.twc.de/~stefan/gst123/gst123-0.3.5.tar.bz2
-_md5_=e09d3099c66ec194090ec9bb4a03ce9f
+SRC_URI=https://space.twc.de/~stefan/gst123/gst123-0.3.5.tar.bz2
+_md5_=c8072c3958ffc93633391e016bfe534f
diff --git a/metadata/md5-cache/media-sound/pasystray-0.6.0-r2 b/metadata/md5-cache/media-sound/pasystray-0.6.0-r2
deleted file mode 100644
index be3a5f6c3b25..000000000000
--- a/metadata/md5-cache/media-sound/pasystray-0.6.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] zeroconf? ( >=net-dns/avahi-0.6 ) x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PulseAudio system tray
-EAPI=6
-HOMEPAGE=https://github.com/christophgysin/pasystray
-IUSE=libnotify zeroconf
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] zeroconf? ( >=net-dns/avahi-0.6 ) x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=https://github.com/christophgysin/pasystray/archive/pasystray-0.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=faa09b0eebd4fc767a16867c49d42eec
diff --git a/metadata/md5-cache/media-sound/pasystray-0.7.0 b/metadata/md5-cache/media-sound/pasystray-0.7.0
deleted file mode 100644
index 84004a8793cf..000000000000
--- a/metadata/md5-cache/media-sound/pasystray-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( >=net-dns/avahi-0.6 ) libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PulseAudio system tray
-EAPI=6
-HOMEPAGE=https://github.com/christophgysin/pasystray
-IUSE=libnotify zeroconf
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( >=net-dns/avahi-0.6 ) libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=https://github.com/christophgysin/pasystray/archive/pasystray-0.7.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4373a9680d50e972d6594b07a199dae1
diff --git a/metadata/md5-cache/media-sound/playerctl-2.0.2 b/metadata/md5-cache/media-sound/playerctl-2.0.2
deleted file mode 100644
index 0c5ae45007b9..000000000000
--- a/metadata/md5-cache/media-sound/playerctl-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= ) dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=A CLI utility to control media players over MPRIS
-EAPI=6
-HOMEPAGE=https://github.com/acrisci/playerctl
-IUSE=doc introspection
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
-SLOT=0
-SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.2.tar.gz -> playerctl-2.0.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=796f84dcb095f2a0be49a2e72b5cc969
diff --git a/metadata/md5-cache/media-sound/playerctl-2.2.1 b/metadata/md5-cache/media-sound/playerctl-2.2.1
deleted file mode 100644
index c3f1f0e86220..000000000000
--- a/metadata/md5-cache/media-sound/playerctl-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-util/gtk-doc ) dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=A CLI utility to control media players over MPRIS
-EAPI=7
-HOMEPAGE=https://github.com/acrisci/playerctl
-IUSE=doc introspection
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/acrisci/playerctl/archive/v2.2.1.tar.gz -> playerctl-2.2.1.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20efaf92ca98853bb2cd2cfb97cc9aea
diff --git a/metadata/md5-cache/media-sound/podget-0.7.14 b/metadata/md5-cache/media-sound/podget-0.7.14
deleted file mode 100644
index c0999238a4bb..000000000000
--- a/metadata/md5-cache/media-sound/podget-0.7.14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A simple podcast aggregator optimized for running as a scheduled job
-EAPI=6
-HOMEPAGE=http://podget.sourceforge.net/ https://github.com/dvehrs/podget
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=net-misc/wget virtual/libiconv
-SLOT=0
-SRC_URI=https://github.com/dvehrs/podget/archive/v0.7.14.tar.gz -> podget-0.7.14.tar.gz
-_md5_=984b7d66065d5645b4c9c5b82b58152c
diff --git a/metadata/md5-cache/media-sound/podget-0.8.1 b/metadata/md5-cache/media-sound/podget-0.8.1
deleted file mode 100644
index d857b7689b3c..000000000000
--- a/metadata/md5-cache/media-sound/podget-0.8.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A simple podcast aggregator optimized for running as a scheduled job
-EAPI=6
-HOMEPAGE=http://podget.sourceforge.net/ https://github.com/dvehrs/podget
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=net-misc/wget virtual/libiconv
-SLOT=0
-SRC_URI=https://github.com/dvehrs/podget/archive/v0.8.1.tar.gz -> podget-0.8.1.tar.gz
-_md5_=984b7d66065d5645b4c9c5b82b58152c
diff --git a/metadata/md5-cache/media-sound/puddletag-2.0.1 b/metadata/md5-cache/media-sound/puddletag-2.0.1
new file mode 100644
index 000000000000..3cfeb65b186d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/puddletag-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Audio tag editor
+EAPI=7
+HOMEPAGE=http://docs.puddletag.net/
+IUSE=acoustid quodlibet python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=>=dev-python/configobj-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.4.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.15.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),svg] >=media-libs/mutagen-1.45.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acoustid? ( >=media-libs/chromaprint-1.4.3 ) quodlibet? ( >=media-sound/quodlibet-4.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/sip-4.19.22:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/puddletag/puddletag/releases/download/2.0.1/puddletag-2.0.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d146ead5574c75d70956c5b1f5dbede5
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1 b/metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1
deleted file mode 100644
index dad5dd6a3e7c..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1
+++ /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.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.0.tar.gz -> pulseeffects-5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43ce058728f07c1bc1d7029b13a43154
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.1 b/metadata/md5-cache/media-sound/pulseeffects-5.0.1
deleted file mode 100644
index 3d0b6ec56506..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.1
+++ /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.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.1.tar.gz -> pulseeffects-5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15152a1ccf174f39b7ba8a6ae904551f
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.2 b/metadata/md5-cache/media-sound/pulseeffects-5.0.2
new file mode 100644
index 000000000000..e68b54da417c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-5.0.2
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf rubberband
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.2.tar.gz -> pulseeffects-5.0.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15152a1ccf174f39b7ba8a6ae904551f
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.2 b/metadata/md5-cache/media-sound/qjackctl-0.9.2
new file mode 100644
index 000000000000..59e564b4337e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qjackctl-0.9.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections
+EAPI=7
+HOMEPAGE=https://qjackctl.sourceforge.io/
+IUSE=alsa dbus debug portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-qt/qtsvg:5
+SLOT=0
+SRC_URI=mirror://sourceforge/qjackctl/qjackctl-0.9.2.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60191d27e3e51dd5d847b4ec584b9a95
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.19 b/metadata/md5-cache/media-sound/qtractor-0.9.19
deleted file mode 100644
index 540f0e84e77a..000000000000
--- a/metadata/md5-cache/media-sound/qtractor-0.9.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
-EAPI=7
-HOMEPAGE=https://qtractor.sourceforge.io
-IUSE=aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.19.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55f5a73675e7ac9c745ed207f7e00c97
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.20 b/metadata/md5-cache/media-sound/qtractor-0.9.20
index c6836c8c08b2..ee3fe861c3d2 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.20
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.20
@@ -5,10 +5,10 @@ DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framewor
 EAPI=7
 HOMEPAGE=https://qtractor.sourceforge.io
 IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.20.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7606eb2066f5a579528f93dc36e70088
+_md5_=e73a30f06204cbef554dee69c1f9da13
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.21 b/metadata/md5-cache/media-sound/qtractor-0.9.21
new file mode 100644
index 000000000000..d032166e1af0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.21
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
+EAPI=7
+HOMEPAGE=https://qtractor.sourceforge.io
+IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.21.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1385212f88a03838e08907c3c5f2e12e
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.3.0 b/metadata/md5-cache/media-sound/quodlibet-4.3.0
index af3b6c38a1ee..acfc545d9b99 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.3.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.3.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.3.0.tar.gz -> quodlibet-4.3.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19fbf0708adca160a2f132ec1b7de72c
+_md5_=e2060f21e050a6202a75a0569f500852
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.3.0-r1 b/metadata/md5-cache/media-sound/quodlibet-4.3.0-r1
new file mode 100644
index 000000000000..3c8e825a0b30
--- /dev/null
+++ b/metadata/md5-cache/media-sound/quodlibet-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-util/intltool
+DESCRIPTION=audio library tagger, manager, and player for GTK+
+EAPI=7
+HOMEPAGE=https://quodlibet.readthedocs.io/
+IUSE=+dbus gstreamer +udev python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/mutagen-1.32[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-libs/libsoup[introspection] x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) udev? ( virtual/udev ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.3.0.tar.gz -> quodlibet-4.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2cf01395954017aca20cac8e4b126cac
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.4.0 b/metadata/md5-cache/media-sound/quodlibet-4.4.0
new file mode 100644
index 000000000000..6da97faa9f30
--- /dev/null
+++ b/metadata/md5-cache/media-sound/quodlibet-4.4.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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-util/intltool
+DESCRIPTION=audio library tagger, manager, and player for GTK+
+EAPI=7
+HOMEPAGE=https://quodlibet.readthedocs.io/
+IUSE=+dbus gstreamer +udev python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/mutagen-1.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-libs/libsoup[introspection] x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) udev? ( virtual/udev ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.4.0.tar.gz -> quodlibet-4.4.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c4045aae21eb148d6dd48d1149cce23
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-4.2 b/metadata/md5-cache/media-sound/sonic-visualiser-4.2
deleted file mode 100644
index 7dffd18c3c62..000000000000
--- a/metadata/md5-cache/media-sound/sonic-visualiser-4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/qttest:5 sys-devel/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 >=dev-libs/capnproto-0.6:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19 ) pulseaudio? ( media-sound/pulseaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music audio files viewer and analiser
-EAPI=7
-HOMEPAGE=https://www.sonicvisualiser.org/
-IUSE=id3tag jack mad ogg opus osc +portaudio pulseaudio test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 >=dev-libs/capnproto-0.6:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19 ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( jack pulseaudio portaudio ) test? ( id3tag mad )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2755/sonic-visualiser-4.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b11ac6ecda4f6c3763c91530d77e929d
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-4.3 b/metadata/md5-cache/media-sound/sonic-visualiser-4.3
index d1b7b86a0c52..234bbd77f790 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-4.3
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Music audio files viewer and analiser
 EAPI=7
 HOMEPAGE=https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser
 IUSE=id3tag jack mad ogg opus osc +portaudio pulseaudio test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/capnproto:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( jack pulseaudio portaudio ) test? ( id3tag mad )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/sonic-visualiser-4.3.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4435e5b9efd9b56d0d07028b8c7b2007
+_md5_=8604ffdb134c633a03a8268b8c03ea60
diff --git a/metadata/md5-cache/media-sound/strawberry-0.8.4 b/metadata/md5-cache/media-sound/strawberry-0.8.4
deleted file mode 100644
index 95fbc2970d34..000000000000
--- a/metadata/md5-cache/media-sound/strawberry-0.8.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext 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=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
-EAPI=7
-HOMEPAGE=https://www.strawbs.org/
-IUSE=cdda +dbus debug ipod mms mtp pulseaudio +udisks test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=udisks? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.4/strawberry-0.8.4.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f77d290cf89cfdbab85726d7c21bfa83
diff --git a/metadata/md5-cache/media-sound/strawberry-0.9.1 b/metadata/md5-cache/media-sound/strawberry-0.9.1
new file mode 100644
index 000000000000..caf83db0e697
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext 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=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=7
+HOMEPAGE=https://www.strawbs.org/
+IUSE=cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( gstreamer vlc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.9.1/strawberry-0.9.1.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a62a201f8fb340e204fb9993cf24ee53
diff --git a/metadata/md5-cache/media-sound/strawberry-9999 b/metadata/md5-cache/media-sound/strawberry-9999
index 23fcdcd6d8b1..93e399a0c4d2 100644
--- a/metadata/md5-cache/media-sound/strawberry-9999
+++ b/metadata/md5-cache/media-sound/strawberry-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( gstreamer vlc )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c19f8c6c9fd19d4bb1b914e6c32dee75
+_md5_=a62a201f8fb340e204fb9993cf24ee53
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta43 b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta43
deleted file mode 100644
index 42825e9d6397..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta43
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A client software for quality voice communication via the internet
-EAPI=7
-HOMEPAGE=https://www.teamspeak.com/
-LICENSE=teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )
-RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-sound/pulseaudio net-print/cups sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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 x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=5
-SRC_URI=https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta43.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26c5df51e76ee9ae77fe40f930f608d3
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta45_p2 b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta45_p2
new file mode 100644
index 000000000000..21fce5194279
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta45_p2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=A client software for quality voice communication via the internet
+EAPI=7
+HOMEPAGE=https://www.teamspeak.com/
+LICENSE=teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )
+RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-sound/pulseaudio net-print/cups sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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 x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=5
+SRC_URI=https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta45_p2.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26c5df51e76ee9ae77fe40f930f608d3
diff --git a/metadata/md5-cache/media-sound/tk707-0.8-r2 b/metadata/md5-cache/media-sound/tk707-0.8-r2
index dbd059b4fae4..a035f0c2f0f0 100644
--- a/metadata/md5-cache/media-sound/tk707-0.8-r2
+++ b/metadata/md5-cache/media-sound/tk707-0.8-r2
@@ -3,11 +3,11 @@ DEFINED_PHASES=install prepare
 DEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0=
 DESCRIPTION=An 7x7 type midi drum sequencer for Linux
 EAPI=7
-HOMEPAGE=http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/
+HOMEPAGE=https://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0=
 SLOT=0
 SRC_URI=mirror://gentoo/tk707-0.8.tar.gz mirror://gentoo/tk707-0.8-updated_tcl2c.patch.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45439ad8cec49f951b73cada94b8a5ad
+_md5_=159f6c523b06dfda3112c3694e34bdef
diff --git a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1 b/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
index eaa4937ab185..38104c38a69e 100644
--- a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
+++ b/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
@@ -9,4 +9,4 @@ RDEPEND=media-sound/xmms2 net-misc/curl
 SLOT=0
 SRC_URI=ftp://ftp.code-monkey.de/pub/xmms2-scrobbler/xmms2-scrobbler-0.4.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ffba72a990fcb92212d8d2af6fbbadcf
+_md5_=aad8974a8cf46486c93f4a9558cb6423
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 546a3dca5bb4..8264604afb2f 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/cheese-3.38.0 b/metadata/md5-cache/media-video/cheese-3.38.0
new file mode 100644
index 000000000000..eda775aad2cd
--- /dev/null
+++ b/metadata/md5-cache/media-video/cheese-3.38.0
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( dev-util/gtk-doc ) dev-libs/libxslt app-text/docbook-xml-dtd:4.3 dev-util/itstool dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto test? ( x11-libs/libXtst ) || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/clutter-1.13.2:1.0[introspection?] media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-0.91.8:1.0 x11-libs/gdk-pixbuf:2[jpeg,introspection?] >=dev-libs/glib-2.39.90:2 >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] >=media-libs/gst-plugins-bad-1.4:1.0 >=x11-libs/gtk+-3.13.4:3 >=media-libs/libcanberra-0.26[gtk3] x11-libs/libX11 sys-apps/dbus media-video/gnome-video-effects introspection? ( >=dev-libs/gobject-introspection-1.56:= ) media-libs/cogl:1.0=[introspection?] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A cheesy program to take pictures and videos from your webcam
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
+IUSE=gtk-doc +introspection test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/clutter-1.13.2:1.0[introspection?] media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-0.91.8:1.0 x11-libs/gdk-pixbuf:2[jpeg,introspection?] >=dev-libs/glib-2.39.90:2 >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] >=media-libs/gst-plugins-bad-1.4:1.0 >=x11-libs/gtk+-3.13.4:3 >=media-libs/libcanberra-0.26[gtk3] x11-libs/libX11 sys-apps/dbus media-video/gnome-video-effects introspection? ( >=dev-libs/gobject-introspection-1.56:= ) media-libs/cogl:1.0=[introspection?] >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=mirror://gnome/sources/cheese/3.38/cheese-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71d2a6f8b2e0f6af8b8546658b6a08c1
diff --git a/metadata/md5-cache/media-video/gnome-video-effects-0.5.0 b/metadata/md5-cache/media-video/gnome-video-effects-0.5.0
new file mode 100644
index 000000000000..87ec34cbdaa7
--- /dev/null
+++ b/metadata/md5-cache/media-video/gnome-video-effects-0.5.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Effects for Cheese, the webcam video and picture application
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeVideoEffects
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-video-effects/0.5/gnome-video-effects-0.5.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3f30322941481570525a3c90f9485fe4
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.2.0 b/metadata/md5-cache/media-video/mjpegtools-2.2.0
new file mode 100644
index 000000000000..153e59746b85
--- /dev/null
+++ b/metadata/md5-cache/media-video/mjpegtools-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=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 test
+DEPEND=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(-)?] dv? ( >=media-libs/libdv-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-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(-)?] >=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(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 virtual/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
+DESCRIPTION=Tools for MJPEG video
+EAPI=7
+HOMEPAGE=http://mjpeg.sourceforge.net/
+IUSE=cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx 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
+LICENSE=GPL-2
+RDEPEND=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(-)?] dv? ( >=media-libs/libdv-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-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(-)?] >=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(-)?] sdlgfx? ( media-libs/sdl-gfx ) )
+REQUIRED_USE=sdlgfx? ( sdl )
+SLOT=1
+SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.2.0.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=335903e5cffd0f464c6d300f5b0d9b57
diff --git a/metadata/md5-cache/media-video/openshot-2.5.1_p20210130 b/metadata/md5-cache/media-video/openshot-2.5.1_p20210130
deleted file mode 100644
index 82669a4144fc..000000000000
--- a/metadata/md5-cache/media-video/openshot-2.5.1_p20210130
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( doc? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Award-winning free and open-source video editor
-EAPI=7
-HOMEPAGE=https://openshot.org/
-IUSE=doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)] dev-python/pyzmq[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] dev-python/pyzmq[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] dev-python/pyzmq[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=media-libs/libopenshot-0.2.5:0=[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=1
-SRC_URI=https://github.com/OpenShot/openshot-qt/archive/14ecc519d8390d6fa76cdc03e0d79a0fb5ca12a7.tar.gz -> openshot-2.5.1_p20210130.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad0a513f8b90462db98c66f0d7285bee
diff --git a/metadata/md5-cache/media-video/openshot-2.5.1_p20210228 b/metadata/md5-cache/media-video/openshot-2.5.1_p20210228
new file mode 100644
index 000000000000..db3e3ca8ed2e
--- /dev/null
+++ b/metadata/md5-cache/media-video/openshot-2.5.1_p20210228
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( doc? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Award-winning free and open-source video editor
+EAPI=7
+HOMEPAGE=https://openshot.org/
+IUSE=doc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)] dev-python/pyzmq[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] dev-python/pyzmq[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),gui,svg,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] dev-python/pyzmq[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=media-libs/libopenshot-0.2.5:0=[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 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	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=550465a6185a0774d81b14e2dd01fc78
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.20 b/metadata/md5-cache/media-video/pipewire-0.3.20
deleted file mode 100644
index 7613b1ba9cca..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.20.tar.gz -> pipewire-0.3.20.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5062bd8db3bdc89ca651d78370b8ea08
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.21 b/metadata/md5-cache/media-video/pipewire-0.3.21
deleted file mode 100644
index 53c4ae36bb40..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.21.tar.gz -> pipewire-0.3.21.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5062bd8db3bdc89ca651d78370b8ea08
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.22 b/metadata/md5-cache/media-video/pipewire-0.3.22
index d68475b04551..370a8b343e3b 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.22
+++ b/metadata/md5-cache/media-video/pipewire-0.3.22
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth debug doc ffmpeg gstreamer jack sdl sndfile systemd test vulkan X
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/alsa-lib-1.1.7 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) sdl? ( media-libs/libsdl2 ) sndfile? ( >=media-libs/libsndfile-1.0.20 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.22.tar.gz -> pipewire-0.3.22.tar.gz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a4ed156acfbefbcdbb007a58e0c1dfa
+_md5_=fed524e4f84b11f61fbbf829e7ab15e0
diff --git a/metadata/md5-cache/media-video/qmplay2-19.12.19-r2 b/metadata/md5-cache/media-video/qmplay2-19.12.19-r2
deleted file mode 100644
index bab0cd9c7a54..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-19.12.19-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dev-qt/qtcore:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dbus? ( dev-qt/qtdbus:5 ) ffmpeg? ( media-video/ffmpeg ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) mediabrowser? ( dev-qt/qtdeclarative:5 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) svg? ( dev-qt/qtsvg:5 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.0[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=7
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IUSE=avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions +ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2 notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau +videofilters visualizations xv
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dev-qt/qtcore:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dbus? ( dev-qt/qtdbus:5 ) ffmpeg? ( media-video/ffmpeg ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) mediabrowser? ( dev-qt/qtdeclarative:5 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) svg? ( dev-qt/qtsvg:5 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.0[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) avdevice? ( ffmpeg ) avresample? ( ffmpeg ) lastfm? ( extensions ) lyrics? ( extensions ) mediabrowser? ( extensions ) mpris2? ( extensions dbus ) vaapi? ( ffmpeg opengl ) vdpau? ( ffmpeg )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/archive/19.12.19.tar.gz -> qmplay2-19.12.19.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b312ff6c307de361959e0c22d913b485
diff --git a/metadata/md5-cache/media-video/qmplay2-20.05.02 b/metadata/md5-cache/media-video/qmplay2-20.05.02
deleted file mode 100644
index 37500c755943..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-20.05.02
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=7
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IUSE=avdevice +audiofilters +alsa cdio cuvid dbus extensions gme inputs libass modplug notifications opengl portaudio pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/20.05.02/QMPlay2-src-20.05.02.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/yle-dl-20201022 b/metadata/md5-cache/media-video/yle-dl-20201022
deleted file mode 100644
index 2d57e5f8851b..000000000000
--- a/metadata/md5-cache/media-video/yle-dl-20201022
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/progress[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-video/ffmpeg[gnutls] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/progress[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Download media files from Yle Areena
-EAPI=7
-HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
-IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/progress[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aajanki/yle-dl/archive/20201022.tar.gz -> yle-dl-20201022.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=998ae49382d899bea9c00483a64ec502
diff --git a/metadata/md5-cache/media-video/yle-dl-20210212 b/metadata/md5-cache/media-video/yle-dl-20210212
index b3f057e9c520..5af19c55db18 100644
--- a/metadata/md5-cache/media-video/yle-dl-20210212
+++ b/metadata/md5-cache/media-video/yle-dl-20210212
@@ -4,7 +4,7 @@ DESCRIPTION=Download media files from Yle Areena
 EAPI=7
 HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
 IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/progress[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20210212.tar.gz -> yle-dl-20210212.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d080717081a9e220bb5bdc52f402f6ca
+_md5_=d2f97b1d5e03564d23a0a9c64b80ab7c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1bd5e47dd6f9..db89647e95db 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/alive-2.0.3 b/metadata/md5-cache/net-analyzer/alive-2.0.3
new file mode 100644
index 000000000000..630de0924116
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/alive-2.0.3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils >=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=dev-scheme/guile
+DESCRIPTION=A periodic ping program
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/alive/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-scheme/guile dev-scheme/xdgdirs net-misc/iputils
+SLOT=0
+SRC_URI=mirror://gnu/alive/alive-2.0.3.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4e90166949418e32992f29759f1cffdf
diff --git a/metadata/md5-cache/net-analyzer/amap-5.4 b/metadata/md5-cache/net-analyzer/amap-5.4
deleted file mode 100644
index 0254abc5825e..000000000000
--- a/metadata/md5-cache/net-analyzer/amap-5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libpcre ssl? ( >=dev-libs/openssl-0.9.6j )
-DESCRIPTION=A network scanning tool for pentesters
-EAPI=5
-HOMEPAGE=https://www.thc.org/thc-amap/
-IUSE=ssl
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre ssl? ( >=dev-libs/openssl-0.9.6j ) !sci-biology/amap
-SLOT=0
-SRC_URI=https://www.thc.org/releases/amap-5.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea1c8358dd849a4d630c530bc1266634
diff --git a/metadata/md5-cache/net-analyzer/amap-5.4-r1 b/metadata/md5-cache/net-analyzer/amap-5.4-r1
index 94777c6bbd2b..8e3f321aed98 100644
--- a/metadata/md5-cache/net-analyzer/amap-5.4-r1
+++ b/metadata/md5-cache/net-analyzer/amap-5.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=A network scanning tool for pentesters
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.thc.org/thc-amap/
 IUSE=libressl ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !sci-biology/amap
 SLOT=0
 SRC_URI=https://www.thc.org/releases/amap-5.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59821b0128c41503d2b1ddddd93a81d5
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d174741e1775cc29ebb107b3ac16019e
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3
deleted file mode 100644
index c7cedc3522d3..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=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=network Audit Record Generation and Utilization System
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug +libtirpc sasl tcpd
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-SLOT=0
-SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9856d7ea6f17c1a49f89cceaa8b77b0f
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4
deleted file mode 100644
index 47eae4c23a25..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=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
-DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=network Audit Record Generation and Utilization System
-EAPI=7
-HOMEPAGE=https://openargus.org/
-IUSE=debug +libtirpc sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-SLOT=0
-SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0146d8b8cd1fd1f6edeca546291d92a3
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
index 78bf0b43fbef..69466d945fc5 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=7
 HOMEPAGE=https://openargus.org/
 IUSE=debug sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap net-libs/libtirpc sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c1d14bd7c0e1e1d35945eee509ad56d
+_md5_=9eb47322446c6d7cef073c20103a6c53
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
deleted file mode 100644
index 47b37be8eea1..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=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=Clients for net-analyzer/argus
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ccbd05be2c3319934f643312278554ec
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
deleted file mode 100644
index c7be15bfe6dc..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=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=Clients for net-analyzer/argus
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=287c5c2f6cdf810dcdd5ea6a5b8bac13
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
deleted file mode 100644
index 823e4f650be9..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=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=Clients for net-analyzer/argus
-EAPI=6
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fc1c5699722632a34790abdaf61a4651
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
deleted file mode 100644
index 283e8bf65c30..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig
-DESCRIPTION=Clients for net-analyzer/argus
-EAPI=7
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44430f6a55aaa79025639bafb8920e5b
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
index a912ce22c49f..4e499a874d35 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=Clients for net-analyzer/argus
 EAPI=7
 HOMEPAGE=https://openargus.org/
 IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=420ac97e4e09023951bb7443a2447f0d
+_md5_=aa6649abf3c3d219852a6c6e97424811
diff --git a/metadata/md5-cache/net-analyzer/arp-scan-1.9.6 b/metadata/md5-cache/net-analyzer/arp-scan-1.9.6
deleted file mode 100644
index 80b3dfd1706c..000000000000
--- a/metadata/md5-cache/net-analyzer/arp-scan-1.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=net-libs/libpcap
-DESCRIPTION=ARP scanning and fingerprinting tool
-EAPI=7
-HOMEPAGE=https://github.com/royhills/arp-scan
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/royhills/arp-scan/archive/1.9.6.tar.gz -> arp-scan-1.9.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b2bc764ea283dfdafd67d236084b1bb
diff --git a/metadata/md5-cache/net-analyzer/arping-2.21 b/metadata/md5-cache/net-analyzer/arping-2.21
index eb3132893e0b..280d6bc4e6a5 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.21
+++ b/metadata/md5-cache/net-analyzer/arping-2.21
@@ -1,6 +1,6 @@
 BDEPEND=>=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=postinst prepare
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 test? ( dev-libs/check dev-python/subunit )
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] test? ( dev-libs/check dev-python/subunit )
 DESCRIPTION=A utility to see if a specific IP is taken and what MAC owns it
 EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ThomasHabets/arping/archive/arping-2.21.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91362a16da07eec6e87a5bf877f898b5
+_md5_=cebd509a7e8c3652a335b58bb7d9959f
diff --git a/metadata/md5-cache/net-analyzer/arping-9999 b/metadata/md5-cache/net-analyzer/arping-9999
index c5853ce80ed5..bd256733a107 100644
--- a/metadata/md5-cache/net-analyzer/arping-9999
+++ b/metadata/md5-cache/net-analyzer/arping-9999
@@ -1,13 +1,14 @@
-BDEPEND=>=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 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=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] filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=postinst prepare unpack
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 dev-libs/check
-DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] test? ( dev-libs/check dev-python/subunit )
+DESCRIPTION=A utility to see if a specific IP is taken and what MAC owns it
 EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
-IUSE=+filecaps
+IUSE=test +filecaps
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] filecaps? ( sys-libs/libcap )
+RESTRICT=!test? ( test )
 SLOT=2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37fab5a20dedc482391ce8042b311052
+_md5_=22d113367c65fe91da038fbda253bde0
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7.2 b/metadata/md5-cache/net-analyzer/arpon-2.7.2
deleted file mode 100644
index 13d7bbcb6945..000000000000
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
-EAPI=6
-HOMEPAGE=http://arpon.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e83a7b3611eaee74cf5c4865ca4ff2c9
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1 b/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
deleted file mode 100644
index d623599c27a0..000000000000
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
-EAPI=7
-HOMEPAGE=http://arpon.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5532eabc9cc376832c6e55be5ad576bf
diff --git a/metadata/md5-cache/net-analyzer/arpon-3.0 b/metadata/md5-cache/net-analyzer/arpon-3.0
index d5904d827080..d5241e8f8f10 100644
--- a/metadata/md5-cache/net-analyzer/arpon-3.0
+++ b/metadata/md5-cache/net-analyzer/arpon-3.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-3.0-ng.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82d22624765a895d42e1a9cb46364df2
+_md5_=9e22adda6b8f0d88528b8728bdcbda4e
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1 b/metadata/md5-cache/net-analyzer/arpwatch-3.1
deleted file mode 100644
index 9d947f9fcd4e..000000000000
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=net-libs/libpcap sys-libs/ncurses:*
-DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
-EAPI=7
-HOMEPAGE=https://ee.lbl.gov/
-IUSE=selinux
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
-SLOT=0
-SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
-_eclasses_=user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=86823fdf557beb9e2fb40fa5caa0a85c
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
new file mode 100644
index 000000000000..d21ff9a6a398
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst setup
+DEPEND=net-libs/libpcap sys-libs/ncurses:*
+DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
+EAPI=7
+HOMEPAGE=https://ee.lbl.gov/
+IUSE=selinux
+KEYWORDS=amd64 ~hppa ~ppc sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
+SLOT=0
+SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=3ea4df0ae8e593a68c877b3d07ba6b4f
diff --git a/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2 b/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2
deleted file mode 100644
index f2a93061d6ea..000000000000
--- a/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:*[server] )
-DESCRIPTION=Parser for Snort unified/unified2 files
-EAPI=7
-HOMEPAGE=https://github.com/firnsy/barnyard2 https://firnsy.com/projects
-IUSE=debug gre mpls mysql odbc postgres static
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:*[server] )
-SLOT=0
-SRC_URI=https://github.com/firnsy/barnyard2/archive/v2-1.9.tar.gz -> barnyard2-1.9-github.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=72db4d6fc1f48d82a362a75d6d4ed873
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1
deleted file mode 100644
index 91f428fd1a17..000000000000
--- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0= >=sys-apps/net-tools-1.60-r1 >=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=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor
-EAPI=6
-HOMEPAGE=http://www.gropp.org/
-IUSE=csv html
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=sys-apps/net-tools-1.60-r1
-SLOT=0
-SRC_URI=http://www.gropp.org/bwm-ng/bwm-ng-0.6.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ed92e7557feeb187f075379457d1d6c3
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
index cb7208a385e2..baeb9c6c99ba 100644
--- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth m
 EAPI=7
 HOMEPAGE=http://www.gropp.org/
 IUSE=+csv +html
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.2.tar.gz -> bwm-ng-0.6.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e04340d0e5fd33cb3f13ad2eed35ee4
+_md5_=42edc87bcec219e10a6e2ed9be2667be
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3
new file mode 100644
index 000000000000..18d5ed95489f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3
@@ -0,0 +1,14 @@
+BDEPEND=>=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-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
+DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor
+EAPI=7
+HOMEPAGE=http://www.gropp.org/
+IUSE=+csv +html
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.3.tar.gz -> bwm-ng-0.6.3.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=564490235625e2dcda82b990cb972017
diff --git a/metadata/md5-cache/net-analyzer/bwping-2.1 b/metadata/md5-cache/net-analyzer/bwping-2.1
deleted file mode 100644
index 5b44cfc4a71b..000000000000
--- a/metadata/md5-cache/net-analyzer/bwping-2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=test
-DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
-EAPI=7
-HOMEPAGE=https://bwping.sourceforge.io/
-KEYWORDS=amd64 ~sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/bwping/2.1/bwping-2.1.tar.gz
-_md5_=79c3a531c10e6fa894849be94fb1d214
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
deleted file mode 100644
index 4b300dac1a12..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-IUSE=libressl
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b89968b324f79d20d3b1906adc82e83
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
deleted file mode 100644
index bcf533542c7f..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.14.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ef6efeb26d2d116cc32b2c1c4ce71190
diff --git a/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27 b/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27
deleted file mode 100644
index 0122bd4cf86d..000000000000
--- a/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!net-analyzer/check_mk app-shells/bash:* xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) ) virtual/pkgconfig
-DESCRIPTION=Agent to report data to Check_MK for monitoring
-EAPI=6
-HOMEPAGE=http://mathias-kettner.de/check_mk.html
-IUSE=apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!!net-analyzer/check_mk app-shells/bash:* xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-SLOT=0
-SRC_URI=http://mathias-kettner.de/support/1.2.8p27/check-mk-raw-1.2.8p27.cre.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=218393481f1a414bf5117dc6416c52f0
diff --git a/metadata/md5-cache/net-analyzer/cutter-1.03-r1 b/metadata/md5-cache/net-analyzer/cutter-1.03-r1
deleted file mode 100644
index 94ad3110d2cb..000000000000
--- a/metadata/md5-cache/net-analyzer/cutter-1.03-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=TCP/IP Connection cutting on Linux Firewalls and Routers
-EAPI=5
-HOMEPAGE=http://www.digitage.co.uk/digitage/software/linux-security/cutter
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.digitage.co.uk/digitage/files/cutter/cutter-1.03.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e064b594c521ac16ad27af04c9760a75
diff --git a/metadata/md5-cache/net-analyzer/cutter-1.04 b/metadata/md5-cache/net-analyzer/cutter-1.04
index 2e061281ab37..e5ab37b5b8ee 100644
--- a/metadata/md5-cache/net-analyzer/cutter-1.04
+++ b/metadata/md5-cache/net-analyzer/cutter-1.04
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=TCP/IP Connection cutting on Linux Firewalls and Routers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.digitage.co.uk/digitage/software/linux-security/cutter
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.digitage.co.uk/digitage/files/cutter/cutter-1.04.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c85464935874febc81984bf2a003182a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dce0f7ee171a26428a8e6abc9147e121
diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2
deleted file mode 100644
index 81150dde9894..000000000000
--- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib >=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=Network traffic analyzer with cute web interface
-EAPI=6
-HOMEPAGE=https://unix4lyfe.org/darkstat/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib
-SLOT=0
-SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1db48ad9841f64ba573964aba45b0da3
diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
index aaec0b661fb6..5fcdce036a6f 100644
--- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
+++ b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
@@ -4,10 +4,10 @@ DEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib
 DESCRIPTION=Network traffic analyzer with cute web interface
 EAPI=7
 HOMEPAGE=https://unix4lyfe.org/darkstat/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib
 SLOT=0
 SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a9896f8828ae3caa1d815fceb9424f5
+_md5_=df05e5b0b844a1c947842d9909643fb8
diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.10 b/metadata/md5-cache/net-analyzer/dnstracer-1.10
index d65ce8d2c01e..0ac528124233 100644
--- a/metadata/md5-cache/net-analyzer/dnstracer-1.10
+++ b/metadata/md5-cache/net-analyzer/dnstracer-1.10
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Determines where a given nameserver gets its information from
 EAPI=7
 HOMEPAGE=https://www.mavetju.org/unix/general.php
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://www.mavetju.org/download/dnstracer-1.10.tar.bz2 -> dnstracer-1.10.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2766dca52f8df9ea0e7701acf087f298
+_md5_=942b870e07a1b321ef30e1550e5c3640
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
index 72630b9fa4e6..64920b2ce95b 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DESCRIPTION=scans log files and bans IPs that show malicious signs
+DESCRIPTION=Scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
 IUSE=selinux systemd python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3bbb81c3ce1ddab0b5fa977dc47cde1b
+_md5_=f0ca5f73664bf10222f8d203cb36caf1
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index c20717e8b6fe..974ccf8cc8a3 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DESCRIPTION=scans log files and bans IPs that show malicious signs
+DESCRIPTION=Scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
 IUSE=selinux systemd python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9169f6915a308243d48306c81a6bdf13
+_md5_=eec151b8c7dd0239a9bf2eb6a2b97393
diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11
deleted file mode 100644
index fdbcbcb25b27..000000000000
--- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/bison
-DEFINED_PHASES=configure install
-DEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=library and programs to process reports from NetFlow data
-EAPI=7
-HOMEPAGE=https://code.google.com/p/flow-tools/
-IUSE=debug libressl mysql postgres ssl static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD GPL-2
-RDEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://flow-tools.googlecode.com/files/flow-tools-0.68.5.1.tar.bz2
-_md5_=a407d324d01f0e0207b713d5a2ddc5a2
diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
index 3120486d700b..fd84f392932d 100644
--- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
+++ b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=library and programs to process reports from NetFlow data
 EAPI=7
 HOMEPAGE=https://github.com/5u623l20/flow-tools/
 IUSE=debug libressl mysql postgres ssl static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=BSD GPL-3
 RDEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/5u623l20/flow-tools/archive/v0.68.6.tar.gz -> flow-tools-0.68.6.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c0f417208f78ab6cb36832f3a41169ec
+_md5_=65e7718dc1a0da0b2371b64653025620
diff --git a/metadata/md5-cache/net-analyzer/fping-4.4 b/metadata/md5-cache/net-analyzer/fping-4.4
deleted file mode 100644
index 73cd2f3b6553..000000000000
--- a/metadata/md5-cache/net-analyzer/fping-4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=configure install postinst
-DESCRIPTION=A utility to ping multiple hosts at once
-EAPI=7
-HOMEPAGE=https://fping.org/ https://github.com/schweikert/fping/
-IUSE=ipv6 suid +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=fping
-RDEPEND=filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://fping.org/dist/fping-4.4.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b
-_md5_=1af517d48530dccff093703b75979c8a
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.4 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.4
deleted file mode 100644
index 842c055fe02a..000000000000
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=A packet filter and firewall log analyzer
-EAPI=5
-HOMEPAGE=http://fwlogwatch.inside-security.de/
-IUSE=nls zlib
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-1
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5378db8b3e1aac06aa6ea02f06d6a16a
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
index 5e0226588c87..bb44406d7693 100644
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
+++ b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/flex nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) sys-devel/flex nls? ( sys-devel/gettext )
+DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A packet filter and firewall log analyzer
-EAPI=5
+EAPI=7
 HOMEPAGE=http://fwlogwatch.inside-security.de/
 IUSE=geoip nls zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-1
 RDEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.5.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf29cb67d38a7419ae8ac32c3551700a
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f937e0c4381b55d49d52b7f597dbe808
diff --git a/metadata/md5-cache/net-analyzer/hexinject-1.5 b/metadata/md5-cache/net-analyzer/hexinject-1.5
deleted file mode 100644
index b722326f569a..000000000000
--- a/metadata/md5-cache/net-analyzer/hexinject-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Network packet sniffer and injector
-EAPI=6
-HOMEPAGE=http://hexinject.sourceforge.net/
-IUSE=+tools experimental
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/hexinject/hexinject-1.5/hexinject-1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51c37cde559f4436ac27121f5e0bbae2
diff --git a/metadata/md5-cache/net-analyzer/hexinject-1.6 b/metadata/md5-cache/net-analyzer/hexinject-1.6
deleted file mode 100644
index acb76b372eda..000000000000
--- a/metadata/md5-cache/net-analyzer/hexinject-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Network packet sniffer and injector
-EAPI=6
-HOMEPAGE=http://hexinject.sourceforge.net/
-IUSE=+tools experimental
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/hexinject/hexinject-1.6/hexinject-1.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7580ba65f90beb5b64bda5ee93598387
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.0 b/metadata/md5-cache/net-analyzer/hydra-9.0
index 78f262cb78ef..b145fa6bfb61 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9.0
+++ b/metadata/md5-cache/net-analyzer/hydra-9.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=Parallelized network login hacker
 EAPI=7
 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
-IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib
+IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
-RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.0.tar.gz -> hydra-9.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c78990fac271c15a2add731181e47f91
+_md5_=696799f79ea092adbb020c45d1b8d3e0
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.0-r1 b/metadata/md5-cache/net-analyzer/hydra-9.0-r1
index 0d4a5a972402..f49ed62cff6c 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9.0-r1
+++ b/metadata/md5-cache/net-analyzer/hydra-9.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=Parallelized network login hacker
 EAPI=7
 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
-IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib
+IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.0.tar.gz -> hydra-9.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4447a34c9103ec8181efee00300bc578
+_md5_=5fe1c307448069d2826551adb8107e26
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.1 b/metadata/md5-cache/net-analyzer/hydra-9.1
index f5b0b6ea332d..add81d2e38ee 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9.1
+++ b/metadata/md5-cache/net-analyzer/hydra-9.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=Parallelized network login hacker
 EAPI=7
 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
-IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib
-KEYWORDS=~amd64 ~ppc ~x86
+IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-3
-RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.1.tar.gz -> hydra-9.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0608b76a1f1d1c3e9be222f1d68e9d1f
+_md5_=c2b048618f5b2b35cc55d12eaa1fcc53
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.2 b/metadata/md5-cache/net-analyzer/hydra-9.2
new file mode 100644
index 000000000000..9401aef13246
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/hydra-9.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Parallelized network login hacker
+EAPI=7
+HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
+IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.2.tar.gz -> hydra-9.2.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=644ffe1bdbe477b23542fa2db9d7a510
diff --git a/metadata/md5-cache/net-analyzer/hydra-9999999 b/metadata/md5-cache/net-analyzer/hydra-9999999
index f8801e2baeb4..c4ec91f6701e 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9999999
+++ b/metadata/md5-cache/net-analyzer/hydra-9999999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 DESCRIPTION=Parallelized network login hacker
 EAPI=7
 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra
-IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib
+IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
+RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a0c4caea2d6d5bd0dce366ce0ebdb38d
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b00cb8d403dec2554eccf6913ce3dbe9
diff --git a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
index 110aefb61fcf..9cdb98bc0d1d 100644
--- a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
+++ b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-4.2:0= virtual/pkgconfig
 DESCRIPTION=A simple CLI program for displaying network statistics in real time
 EAPI=7
 HOMEPAGE=http://ifstatus.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-4.2:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ifstatus/ifstatus-v2.0.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9efd4f0708896c124269fa85e05cb6eb
+_md5_=d031f3ab4b7e51b29ad867ba922c6fc3
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.85 b/metadata/md5-cache/net-analyzer/ipsumdump-1.85
deleted file mode 100644
index f367b179569c..000000000000
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.85
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo
-DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
-EAPI=6
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
-IUSE=+ipv6 +nanotimestamp
-KEYWORDS=~amd64 ~x86
-LICENSE=the-Click-license
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.85.tar.gz
-_md5_=b7bae135feec2f319c094efa5b3920fc
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86
deleted file mode 100644
index 7ca22b972f99..000000000000
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.86
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
-DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
-EAPI=6
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
-IUSE=+ipv6 +nanotimestamp
-KEYWORDS=~amd64 ~x86
-LICENSE=the-Click-license
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
-_md5_=37dbefaab0a17999e02afd2c9edbee94
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
index f6fb59e411c8..5bc6ec86bc99 100644
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
+++ b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl sys-apps/texinfo
 DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
+DEPEND=net-libs/libpcap dev-libs/expat virtual/os-headers
 DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
 EAPI=7
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
+HOMEPAGE=https://read.seas.harvard.edu/~kohler/ipsumdump/
 IUSE=+ipv6 +nanotimestamp
 KEYWORDS=~amd64 ~x86
 LICENSE=the-Click-license
 RDEPEND=net-libs/libpcap
 SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
-_md5_=42dd5a129cb225604511fca82d0a7fd4
+SRC_URI=https://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
+_md5_=75b344a4b245dd9caf90dcc3237bdc24
diff --git a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919 b/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919
deleted file mode 100644
index 9a0b1813527a..000000000000
--- a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap[ipv6(+)]
-DESCRIPTION=Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets
-EAPI=7
-HOMEPAGE=https://www.si6networks.com/tools/ipv6toolkit/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap[ipv6(+)] sys-apps/hwids
-SLOT=0
-SRC_URI=https://github.com/fgont/ipv6toolkit/archive/20de5f297f73b6a8115d1eac52adfe0b6df5b3ed.tar.gz -> ipv6toolkit-2.1_p20190919.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6aef120894043e4911a07037bbea0fcd
diff --git a/metadata/md5-cache/net-analyzer/knocker-0.8.0 b/metadata/md5-cache/net-analyzer/knocker-0.8.0
new file mode 100644
index 000000000000..2579234e30f0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/knocker-0.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Knocker is an easy to use security port scanner written in C
+EAPI=7
+HOMEPAGE=https://knocker.sourceforge.net
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/knocker/knocker-0.8.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f35c3aae236cc0db5bfdcd5cf2f5734f
diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5_p1 b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
index 6d4ec805a2f1..b2c38bf96ed8 100644
--- a/metadata/md5-cache/net-analyzer/labrea-2.5_p1
+++ b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
 SLOT=0
 SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=919fe7763401a749c07212ad801bf5be
+_md5_=0b7e4f76e892d0724f66878f50e89074
diff --git a/metadata/md5-cache/net-analyzer/lft-3.77 b/metadata/md5-cache/net-analyzer/lft-3.77
deleted file mode 100644
index 78639fb92022..000000000000
--- a/metadata/md5-cache/net-analyzer/lft-3.77
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
-EAPI=6
-HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=VOSTROM
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://pwhois.org/get/lft-3.77.tar.gz
-_md5_=85142ed1d6f8eda9d248d8eceba11652
diff --git a/metadata/md5-cache/net-analyzer/lft-3.79 b/metadata/md5-cache/net-analyzer/lft-3.79
deleted file mode 100644
index 76a32f4251c9..000000000000
--- a/metadata/md5-cache/net-analyzer/lft-3.79
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
-EAPI=6
-HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=VOSTROM
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://pwhois.org/get/lft-3.79.tar.gz
-_md5_=08903f8e6029f11fa2d80073f6fd18a6
diff --git a/metadata/md5-cache/net-analyzer/lft-3.80 b/metadata/md5-cache/net-analyzer/lft-3.80
deleted file mode 100644
index 03bd64467cc2..000000000000
--- a/metadata/md5-cache/net-analyzer/lft-3.80
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
-EAPI=6
-HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=VOSTROM
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://pwhois.org/get/lft-3.8.tar.gz
-_md5_=fb1a26defe042348edc17d4af3bcb410
diff --git a/metadata/md5-cache/net-analyzer/lft-3.90 b/metadata/md5-cache/net-analyzer/lft-3.90
deleted file mode 100644
index 1312746af729..000000000000
--- a/metadata/md5-cache/net-analyzer/lft-3.90
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
-EAPI=7
-HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=VOSTROM
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://pwhois.org/get/lft-3.9.tar.gz
-_md5_=7f29e66e0eaa27a77825497e90adfe32
diff --git a/metadata/md5-cache/net-analyzer/lft-3.91-r1 b/metadata/md5-cache/net-analyzer/lft-3.91-r1
index 8d0ac7e44d53..823b9a1e3a2f 100644
--- a/metadata/md5-cache/net-analyzer/lft-3.91-r1
+++ b/metadata/md5-cache/net-analyzer/lft-3.91-r1
@@ -3,9 +3,9 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
 EAPI=7
 HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=VOSTROM
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://pwhois.org/get/lft-3.91.tar.gz
-_md5_=bec576cec5e8d59c4f9a1236bbe9be19
+_md5_=4db5a41ed21b7ac315e0d010ca47d75f
diff --git a/metadata/md5-cache/net-analyzer/masscan-1.0.5 b/metadata/md5-cache/net-analyzer/masscan-1.0.5
deleted file mode 100644
index 6e533e3ddfa2..000000000000
--- a/metadata/md5-cache/net-analyzer/masscan-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Mass IP port scanner
-EAPI=6
-HOMEPAGE=https://github.com/robertdavidgraham/masscan
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=https://github.com/robertdavidgraham/masscan/archive/1.0.5.tar.gz -> masscan-1.0.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0b56e5f9756a5b9074214d09eb979ddc
diff --git a/metadata/md5-cache/net-analyzer/nbwmon-0.5.2 b/metadata/md5-cache/net-analyzer/nbwmon-0.5.2
index dc7535c23eb6..9c52d468c2f5 100644
--- a/metadata/md5-cache/net-analyzer/nbwmon-0.5.2
+++ b/metadata/md5-cache/net-analyzer/nbwmon-0.5.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
+DEPEND=sys-libs/ncurses
 DESCRIPTION=ncurses bandwidth monitor
-EAPI=5
-HOMEPAGE=http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon
+EAPI=7
+HOMEPAGE=https://github.com/causes-/nbwmon
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=https://github.com/causes-/nbwmon/archive/0.5.2.tar.gz -> nbwmon-0.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0c18a052aa3381487896e19b659423b3
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f9985a49198ce31293bdd42e598133c5
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r9 b/metadata/md5-cache/net-analyzer/netcat-110-r9
index 2306e5f6b2bd..1ff20dcb8a59 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110-r9
+++ b/metadata/md5-cache/net-analyzer/netcat-110-r9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=!static? ( crypt? ( dev-libs/libmix ) ) static? ( crypt? ( dev-libs/libmix[static-libs(+)] ) )
-DESCRIPTION=the network swiss army knife
-EAPI=5
-HOMEPAGE=http://nc110.sourceforge.net/
+DESCRIPTION=The network swiss army knife
+EAPI=7
+HOMEPAGE=https://nc110.sourceforge.io
 IUSE=crypt ipv6 static
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
 LICENSE=netcat
 RDEPEND=!static? ( crypt? ( dev-libs/libmix ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b41dbd59b7b5278688ab6c011f8c581
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=05cb4624fba751f4447ebee4820c94d1
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111 b/metadata/md5-cache/net-analyzer/netcat-110.20180111
deleted file mode 100644
index d77d307fa420..000000000000
--- a/metadata/md5-cache/net-analyzer/netcat-110.20180111
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=the network swiss army knife
-EAPI=5
-HOMEPAGE=http://nc110.sourceforge.net/
-IUSE=ipv6 static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
-LICENSE=netcat
-SLOT=0
-SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=504466d7c3af3f1babd72979dc965d45
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1 b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
new file mode 100644
index 000000000000..dccc73d5cdd2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=The network swiss army knife
+EAPI=7
+HOMEPAGE=https://nc110.sourceforge.io
+IUSE=ipv6 static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
+LICENSE=netcat
+SLOT=0
+SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d8c0f8cd509b04f5f62ef95353bb0cb2
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1
deleted file mode 100644
index 2ca76b06663b..000000000000
--- a/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
-EAPI=6
-HOMEPAGE=https://github.com/raboof/nethogs
-KEYWORDS=amd64 ~arm ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.5.tar.gz -> nethogs-0.8.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c9ae81d3d1daa574e7318615e8b1c0ce
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.6 b/metadata/md5-cache/net-analyzer/nethogs-0.8.6
deleted file mode 100644
index a7d7a29a5f6c..000000000000
--- a/metadata/md5-cache/net-analyzer/nethogs-0.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
-EAPI=6
-HOMEPAGE=https://github.com/raboof/nethogs
-KEYWORDS=amd64 ~arm ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.6.tar.gz -> nethogs-0.8.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c91db48faf626dca895434e368740ca
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1
new file mode 100644
index 000000000000..71d105a63e41
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile install postinst
+DEPEND=net-libs/libpcap sys-libs/ncurses:0=
+DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
+EAPI=7
+HOMEPAGE=https://github.com/raboof/nethogs
+IUSE=+filecaps
+KEYWORDS=amd64 ~arm ~ia64 x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap sys-libs/ncurses:0= filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.6.tar.gz -> nethogs-0.8.6.tar.gz
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=18653837cb056849c452092aa9fb5576
diff --git a/metadata/md5-cache/net-analyzer/netio-1.32-r1 b/metadata/md5-cache/net-analyzer/netio-1.32-r1
deleted file mode 100644
index edc9a57c99f0..000000000000
--- a/metadata/md5-cache/net-analyzer/netio-1.32-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=measures net throughput with NetBIOS and TCP/IP protocols
-EAPI=6
-HOMEPAGE=https://web.ars.de/netio/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=free-noncomm
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://web.ars.de/wp-content/uploads/2017/04/netio132.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e50f39ae8e4ee640ba51975d0fdff4ea
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r2 b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
new file mode 100644
index 000000000000..ae26f6ea7a14
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
@@ -0,0 +1,13 @@
+BDEPEND=filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Ultrafast implementation of ping
+EAPI=7
+HOMEPAGE=http://apenwarr.ca/netselect/
+IUSE=ipv6 +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a73f380b2ae89d1598ecb388a1ba8a75
diff --git a/metadata/md5-cache/net-analyzer/netselect-9999 b/metadata/md5-cache/net-analyzer/netselect-9999
index 98316c63e0a1..fa1930bf447a 100644
--- a/metadata/md5-cache/net-analyzer/netselect-9999
+++ b/metadata/md5-cache/net-analyzer/netselect-9999
@@ -1,12 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Ultrafast implementation of ping
 EAPI=7
 HOMEPAGE=http://apenwarr.ca/netselect/
-IUSE=ipv6
+IUSE=ipv6 +filecaps
 LICENSE=BSD
 PROPERTIES=live
+RDEPEND=filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=39ad243ce779bbf376136c7815511dd2
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c64a99c33267aed77e5b8e7cff7d5c42
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.20 b/metadata/md5-cache/net-analyzer/nfdump-1.6.20
deleted file mode 100644
index 5a244f28ec3a..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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 ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) app-doc/doxygen sys-devel/flex virtual/yacc
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=7
-HOMEPAGE=https://github.com/phaag/nfdump
-IUSE=debug ftconv nfprofile nftrack readpcap sflow static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) dev-lang/perl
-SLOT=0/1.6.15
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.20.tar.gz -> nfdump-1.6.20.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57b01e6d924d7f70d3530d88990e7414
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.21 b/metadata/md5-cache/net-analyzer/nfdump-1.6.21
deleted file mode 100644
index 5dacfac11251..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen ) >=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 ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=7
-HOMEPAGE=https://github.com/phaag/nfdump
-IUSE=debug doc ftconv nfprofile nftrack readpcap sflow static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-SLOT=0/1.6.15
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.21.tar.gz -> nfdump-1.6.21.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec61c709e09081edf5a2312fbca63488
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1
new file mode 100644
index 000000000000..2d640e2b7d3f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen ) >=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 ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+DESCRIPTION=A set of tools to collect and process netflow data
+EAPI=7
+HOMEPAGE=https://github.com/phaag/nfdump
+IUSE=debug doc ftconv nfprofile nftrack readpcap sflow static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+SLOT=0/1.6.15
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.21.tar.gz -> nfdump-1.6.21.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=16ba665049aca8713a99816dbde71728
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
new file mode 100644
index 000000000000..ff8396bf4b24
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+DESCRIPTION=A set of tools to collect and process netflow data
+EAPI=7
+HOMEPAGE=https://github.com/phaag/nfdump
+IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+REQUIRED_USE=?? ( jnat nsel )
+SLOT=0/1.6.22
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.22.tar.gz -> nfdump-1.6.22.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=205cc176146c042f62de7c9025538d8d
diff --git a/metadata/md5-cache/net-analyzer/packit-1.6.1 b/metadata/md5-cache/net-analyzer/packit-1.6.1
deleted file mode 100644
index 0214a597152e..000000000000
--- a/metadata/md5-cache/net-analyzer/packit-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=net-libs/libnet:1.1 net-libs/libpcap
-DESCRIPTION=network packet generator and capture tool
-EAPI=7
-HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.6.1.tar.gz -> packit-1.6.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6bf18000a94c71be10cef9961f6711be
diff --git a/metadata/md5-cache/net-analyzer/packit-1.7 b/metadata/md5-cache/net-analyzer/packit-1.7
index 39a0d740aec6..b764cceadf52 100644
--- a/metadata/md5-cache/net-analyzer/packit-1.7
+++ b/metadata/md5-cache/net-analyzer/packit-1.7
@@ -4,10 +4,10 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=network packet generator and capture tool
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.7.tar.gz -> packit-1.7.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f75e49dfb999ae52e42ae52c70be951b
+_md5_=4f1ec69618fae6b35d00eb1ef9f88295
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.8 b/metadata/md5-cache/net-analyzer/pypacker-4.8
deleted file mode 100644
index 3f0a2aecb133..000000000000
--- a/metadata/md5-cache/net-analyzer/pypacker-4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DESCRIPTION=Fast and simple packet creation and parsing library for Python
-EAPI=7
-HOMEPAGE=https://gitlab.com/mike01/pypacker
-IUSE=examples python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.8/pypacker-v4.8.tar.gz -> pypacker-4.8.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=99e613ee5cc6d017ca943dc6a5a4e9cb
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
deleted file mode 100644
index 7ffe3c8d0fc3..000000000000
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc ) >=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 system to store and display time-series data
-EAPI=6
-HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
-RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0/8.0.0
-SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56abd2a99518d774ab61fd573459aa30
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
deleted file mode 100644
index 2170959423e1..000000000000
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc ) >=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 system to store and display time-series data
-EAPI=6
-HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
-RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0/8.0.0
-SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17ca7c4a653e64f9e78f8216fd650147
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
index cf2975ee25e1..c05199f7cab7 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
@@ -1,6 +1,6 @@
-BDEPEND=test? ( lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) ) >=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-apps/groff virtual/pkgconfig virtual/awk python? ( python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) test? ( sys-devel/bc lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) ) >=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 setup test
-DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc )
+DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=A system to store and display time-series data
 EAPI=7
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d1ccda56ab0b5ab7d38db4bd76fbf359
+_md5_=2bca8fa56622c31a667f8d715ff2fc4a
diff --git a/metadata/md5-cache/net-analyzer/sbd-1.37-r1 b/metadata/md5-cache/net-analyzer/sbd-1.37-r1
index f724eb7afc09..569c621e05a2 100644
--- a/metadata/md5-cache/net-analyzer/sbd-1.37-r1
+++ b/metadata/md5-cache/net-analyzer/sbd-1.37-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Netcat-clone, designed to be portable and offer strong encryption
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tigerteam.se/dl/sbd/
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=GPL-2
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://tigerteam.se/dl/sbd/sbd-1.37.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59c9ec2d54ff2b339d8931d9eb114284
+_md5_=6a822ec81b3c49974400aab0e69ec0cc
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
deleted file mode 100644
index 613232fb5375..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Sensor part of sguil Network Security Monitoring
-EAPI=7
-HOMEPAGE=https://github.com/bammv/sguil
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
-_eclasses_=user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f9385c31a7dd33722bb5a4824a89d212
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1
new file mode 100644
index 000000000000..d04f37f70b26
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Sensor part of sguil Network Security Monitoring
+EAPI=7
+HOMEPAGE=https://github.com/bammv/sguil
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 QPL
+RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
+SLOT=0
+SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
+_eclasses_=user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=cc96d57190774f3c79aaf35abbba4e07
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3 b/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3
deleted file mode 100644
index 441c4c3752dd..000000000000
--- a/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) >=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=Ncurses SIP Messages flow viewer
-EAPI=6
-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 )
-REQUIRED_USE=gnutls? ( !openssl )
-SLOT=0
-SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6e96835589abd8eb3aa14f97158f553
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.15.1 b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
index 838ac845823c..2d5521bd1c48 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.15.1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.15.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=89ef2b06add892f1def8349103f06186
+_md5_=9c970c5f82397581502e5b4713e6993f
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16 b/metadata/md5-cache/net-analyzer/snort-2.9.16
index 29e806c87683..d0259f502f6f 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=e7d3fb851960bff8cbafca27285fad38
+_md5_=c1a7e087d2c7066b4de72971827e6c05
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100 b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
index a920c2be85d8..07fa75d55f4d 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=2ae0667770150d21c182b27b3a649c9a
+_md5_=c583de071b276f009aec9789e822e270
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.1 b/metadata/md5-cache/net-analyzer/ssldump-1.1
index 4dd3b4563588..c6b11db652ad 100644
--- a/metadata/md5-cache/net-analyzer/ssldump-1.1
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.1
@@ -4,10 +4,10 @@ DESCRIPTION=An SSLv3/TLS network protocol analyzer
 EAPI=7
 HOMEPAGE=https://github.com/adulau/ssldump/
 IUSE=ssl
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=openssl
 RDEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= )
 SLOT=0
 SRC_URI=https://github.com/adulau/ssldump/archive/v1.1.tar.gz -> ssldump-1.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b5109c741ea6d65d4cf6282850714c7e
+_md5_=5fe5b9c41225b77f04ad602b5cd3d7a2
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.3-r1 b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
new file mode 100644
index 000000000000..24812489840e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl-1:0=
+DESCRIPTION=An SSLv3/TLS network protocol analyzer
+EAPI=7
+HOMEPAGE=https://github.com/adulau/ssldump/
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=openssl
+RDEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl-1:0=
+SLOT=0
+SRC_URI=https://github.com/adulau/ssldump/archive/v1.3.tar.gz -> ssldump-1.3.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1ab3d8b4d67a547f7b8bd5fddd143538
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
index eec166c97155..6c33b5c4cf8d 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
@@ -1,7 +1,7 @@
 BDEPEND=>=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 test
 DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl smi ssl samba suid test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=acff6f46c26e7cddce71e9a53648ccd5
+_md5_=ec54a090dd1204b793f5443547b9c42f
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
index d1a79051a85f..408fcf9a12c5 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
@@ -1,7 +1,7 @@
 BDEPEND=drop-root? ( virtual/pkgconfig ) >=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 test
 DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl +smi +ssl +samba suid test
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/the-tcpdump-group/tcpdump/archive/tcpdump-4.99.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4806c72987e1df9b8b1426d41859b18f
+_md5_=f51d8d6c16c250bce38d8dffd4192fb3
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index f1545467e433..d949fc233424 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -1,7 +1,7 @@
 BDEPEND=drop-root? ( virtual/pkgconfig ) >=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 test unpack
 DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl +smi +ssl +samba suid test
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( samba )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e7992ad53c9e58966e8d663ff668e31c
+_md5_=f939fd2226b91ca57dd5c09338be59e6
diff --git a/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1 b/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1
deleted file mode 100644
index cac3b1aea4a7..000000000000
--- a/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Ping implementation that uses the TCP protocol
-EAPI=7
-HOMEPAGE=https://github.com/mkirchner/tcping
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=62f4802ca21d3059cbc67cec416e5953
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
deleted file mode 100644
index 39db62e64382..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Reports network interface statistics
-EAPI=7
-HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
-IUSE=ipv6
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=BSD-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18593b7632bf5c4d4a2cdd8a4e7d34f8
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
index 4125c9ccd311..b0870c2c8d46 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
@@ -5,10 +5,10 @@ DESCRIPTION=Reports network interface statistics
 EAPI=7
 HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
 IUSE=ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libpcap sys-libs/db:*
 SLOT=0
 SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz mirror://debian/pool/main/t/tcpstat/tcpstat_1.5-8.debian.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10ff4908f181b54d46ef30dce69e783a
+_md5_=447aa6d91b35b6cba7ba376f1b51f476
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
deleted file mode 100644
index 1a962e5f7626..000000000000
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=net-libs/libpcap >=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 Tool for analyzing network packet dumps
-EAPI=6
-HOMEPAGE=http://www.tcptrace.org/
-KEYWORDS=amd64 ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-4.1.diff.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fae0095bbd03f0115a0377a4d48420a8
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5
deleted file mode 100644
index 64e4636275b3..000000000000
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=A Tool for analyzing network packet dumps
-EAPI=7
-HOMEPAGE=http://www.tcptrace.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-5.debian.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6a36952e3febe525ccf149e6de24085
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
index a53d8347695d..e51ace4f9f36 100644
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
@@ -4,10 +4,10 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=A Tool for analyzing network packet dumps
 EAPI=7
 HOMEPAGE=http://www.tcptrace.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5dd7f0f50843e2b95b919b7af6efb13a
+_md5_=bf91567a47415208e0f88c132ed88941
diff --git a/metadata/md5-cache/net-analyzer/tracebox-0.4.4 b/metadata/md5-cache/net-analyzer/tracebox-0.4.4
deleted file mode 100644
index 931f13f96148..000000000000
--- a/metadata/md5-cache/net-analyzer/tracebox-0.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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/libcrafter-0.3_p20171019 dev-lang/lua:0= dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) sniffer? ( net-libs/libnetfilter_queue )
-DESCRIPTION=A Middlebox Detection Tool
-EAPI=7
-HOMEPAGE=http://www.tracebox.org/
-IUSE=curl sniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libcrafter-0.3_p20171019 dev-lang/lua:0= dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) sniffer? ( net-libs/libnetfilter_queue )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/tracebox/tracebox/archive/v0.4.4.tar.gz -> tracebox-0.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5fd03631e6da84d1537a4947231a17b0
diff --git a/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1 b/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
index 536b5142456c..3bdd15d0ba3e 100644
--- a/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
+++ b/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
-DESCRIPTION=displays a count and a graph of the traffic over a specified network connection
-EAPI=5
-HOMEPAGE=http://www.xs4all.nl/~rsmith/software/
+DESCRIPTION=Displays a count and a graph of the traffic over a specified network connection
+EAPI=7
+HOMEPAGE=https://www.xs4all.nl/~rsmith/software/
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
-SRC_URI=http://www.xs4all.nl/~rsmith/software/xnetload-1.11.3.tar.gz
+SRC_URI=https://www.xs4all.nl/~rsmith/software/xnetload-1.11.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8368154252831890ff6c5b8e6e983179
+_md5_=dad4fab5efef07375879629f3186fdee
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 366a2996e056..1fab8596e45e 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
deleted file mode 100644
index 9f104eb34748..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
-IUSE=dnsretry
-KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.10.tar.gz -> xl2tpd-1.3.10.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5f21336d5e01f3b5c026d408e0b0abef
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.11 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.11
deleted file mode 100644
index 1334135f84f4..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
-IUSE=dnsretry
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.11.tar.gz -> xl2tpd-1.3.11.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3d3797e64ddfc4325e4a78e32473fbca
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.12 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.12
deleted file mode 100644
index a31e50a1563e..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=https://github.com/xelerance/xl2tpd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.12.tar.gz -> xl2tpd-1.3.12.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=74f4ec5c295f9f7e2a224f67eba40553
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.13 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.13
deleted file mode 100644
index 8ed182083479..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=https://github.com/xelerance/xl2tpd
-IUSE=+kernel
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.13.tar.gz -> xl2tpd-1.3.13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=527fc8508135d2800c5db5fd1e58d4f9
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.16 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
new file mode 100644
index 000000000000..4e53a69e33f8
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6
+DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
+EAPI=7
+HOMEPAGE=https://github.com/xelerance/xl2tpd
+IUSE=+kernel
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.16.tar.gz -> xl2tpd-1.3.16.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2dafc00f9318065cc37cfa615365d6b0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 9638ce92d61e..b6c3f0b5568d 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.13 b/metadata/md5-cache/net-dns/bind-9.16.13
new file mode 100644
index 000000000000..a2491aeb2333
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.13
@@ -0,0 +1,15 @@
+BDEPEND=>=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:= ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) 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_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-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 libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+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:= ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) 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_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-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_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.13/bind-9.16.13.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f49db99157143b92fea4d1a738355ebe
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.13 b/metadata/md5-cache/net-dns/bind-tools-9.16.13
new file mode 100644
index 000000000000..d2be321ea221
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.13
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) virtual/pkgconfig >=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 ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) 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 libressl 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 ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) 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.13/bind-9.16.13.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fa54e5658bad8118c200016fed1bab08
diff --git a/metadata/md5-cache/net-dns/dnscap-1.10.2 b/metadata/md5-cache/net-dns/dnscap-1.10.2
deleted file mode 100644
index 93022b809bc4..000000000000
--- a/metadata/md5-cache/net-dns/dnscap-1.10.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=net-libs/libpcap net-libs/ldns sys-libs/zlib dev-libs/openssl:= dev-perl/YAML
-DESCRIPTION=Network capture utility designed specifically for DNS traffic
-EAPI=7
-HOMEPAGE=https://dnscap.dns-oarc.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=net-libs/libpcap net-libs/ldns sys-libs/zlib dev-libs/openssl:= dev-perl/YAML
-SLOT=0
-SRC_URI=https://www.dns-oarc.net/files/dnscap/dnscap-1.10.2.tar.gz
-_md5_=716e83c9a2c25e2ba79d95229ad094f5
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1
deleted file mode 100644
index 67fe8aa6c0f6..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl:= dev-perl/CGI dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
-EAPI=7
-HOMEPAGE=https://dnssec-tools.org/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/CGI dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-SLOT=0
-SRC_URI=https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-2.2.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2eb86fb1dcde8c1e0e91bfb2f9c1042e
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2 b/metadata/md5-cache/net-dns/dnsviz-0.8.2
deleted file mode 100644
index 72644d573248..000000000000
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/dnspython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libnacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/m2crypto-0.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
-EAPI=7
-HOMEPAGE=https://dnsviz.net/
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/dnspython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libnacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/m2crypto-0.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=40b8f9020239706ad985463254b2e117
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.1 b/metadata/md5-cache/net-dns/dnsviz-0.9.1
deleted file mode 100644
index 2f27660ad48b..000000000000
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( net-dns/bind ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
-EAPI=7
-HOMEPAGE=https://dnsviz.net/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.1.tar.gz -> dnsviz-0.9.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3b328bdff4c763b4e144e09616f129e9
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.3 b/metadata/md5-cache/net-dns/dnsviz-0.9.3
new file mode 100644
index 000000000000..1d3eb14728e2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( net-dns/bind ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
+EAPI=7
+HOMEPAGE=https://dnsviz.net/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.3.tar.gz -> dnsviz-0.9.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3b328bdff4c763b4e144e09616f129e9
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
new file mode 100644
index 000000000000..1288008e4aaa
--- /dev/null
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
@@ -0,0 +1,13 @@
+BDEPEND=test? ( dev-util/cmocka net-libs/socket_wrapper ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Wrapper for DNS name resolving or DNS faking
+EAPI=7
+HOMEPAGE=https://cwrap.org/resolv_wrapper.html
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.7.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=953fbba094ed9c4d286b09329d79e163
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0f8c9b735e16..e8b5110c500d 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/arno-iptables-firewall-2.0.3 b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
deleted file mode 100644
index fef5945e9524..000000000000
--- a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Arno's iptables firewall script
-EAPI=6
-HOMEPAGE=https://rocky.eld.leidenuniv.nl
-IUSE=+plugins
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/ipset net-firewall/iptables >=sys-apps/coreutils-8.21 sys-apps/iproute2 plugins? ( net-dns/bind-tools )
-SLOT=0
-SRC_URI=https://github.com/arno-iptables-firewall/aif/archive/2.0.3.tar.gz -> arno-iptables-firewall-2.0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=68d93f3880b97d3bb0c8e8a55b08b353
diff --git a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.0 b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.0
deleted file mode 100644
index 3c71a64a5f28..000000000000
--- a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Arno's iptables firewall script
-EAPI=7
-HOMEPAGE=https://rocky.eld.leidenuniv.nl
-IUSE=+plugins rsyslog
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/ipset net-firewall/iptables sys-apps/coreutils sys-apps/iproute2 plugins? ( net-dns/bind-tools )
-SLOT=0
-SRC_URI=https://github.com/arno-iptables-firewall/aif/archive/2.1.0.tar.gz -> arno-iptables-firewall-2.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c78f0ae312d2a4fc7ccb305adf32ab2
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
index 1d7a306f9b3e..89b03eb76c4f 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Connection tracking userspace tools
 EAPI=7
 HOMEPAGE=http://conntrack-tools.netfilter.org
 IUSE=doc +cthelper +cttimeout systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.8 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=23192baf3d4d2e1d3c42ebfa6245e7fc
+_md5_=81e2b8010483a9cbc1b89dd545cefa62
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.18 b/metadata/md5-cache/net-firewall/xtables-addons-3.18
new file mode 100644
index 000000000000..59fb3775cb4c
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=iptables extensions not yet accepted in the main kernel
+EAPI=7
+HOMEPAGE=https://inai.de/projects/xtables-addons/
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_proto xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux dist-kernel +modules
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0
+SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=60c056c4bad4e1334be34ef0c74b9bdf
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index b726c3d976e8..9ca16b19dc12 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/s3fs-1.83 b/metadata/md5-cache/net-fs/s3fs-1.83
deleted file mode 100644
index 46091f3d836e..000000000000
--- a/metadata/md5-cache/net-fs/s3fs-1.83
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/libxml2-2.6:2 openssl? ( dev-libs/openssl:0= ) nss? ( dev-libs/nss ) gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) >=net-misc/curl-7.0 >=sys-fs/fuse-2.8.4:0 virtual/pkgconfig >=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=Amazon S3 mounting via fuse
-EAPI=6
-HOMEPAGE=https://github.com/s3fs-fuse/s3fs-fuse/
-IUSE=openssl nss gnutls nettle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libxml2-2.6:2 openssl? ( dev-libs/openssl:0= ) nss? ( dev-libs/nss ) gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) >=net-misc/curl-7.0 >=sys-fs/fuse-2.8.4:0 app-misc/mime-types
-REQUIRED_USE=^^ ( openssl nss gnutls ) nettle? ( gnutls )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.83.tar.gz -> s3fs-1.83.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0bc2be0d7f303664c50532c6d3bba5fc
diff --git a/metadata/md5-cache/net-fs/s3fs-1.85 b/metadata/md5-cache/net-fs/s3fs-1.85
deleted file mode 100644
index f7e799ce2179..000000000000
--- a/metadata/md5-cache/net-fs/s3fs-1.85
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2:2 net-misc/curl sys-fs/fuse:0 gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Amazon S3 mounting via fuse
-EAPI=7
-HOMEPAGE=https://github.com/s3fs-fuse/s3fs-fuse/
-IUSE=gnutls nettle nss +openssl test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2:2 net-misc/curl sys-fs/fuse:0 gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0= ) app-misc/mime-types
-REQUIRED_USE=^^ ( gnutls nss openssl ) nettle? ( gnutls )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.85.tar.gz -> s3fs-1.85.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=326f728cb0c49d2b83457686d06dc79c
diff --git a/metadata/md5-cache/net-fs/samba-4.14.0 b/metadata/md5-cache/net-fs/samba-4.14.0
index d54f05cf1da0..9c20c6950926 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.0
+++ b/metadata/md5-cache/net-fs/samba-4.14.0
@@ -1,16 +1,16 @@
 BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.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.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_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/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_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(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) 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_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.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.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_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/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_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(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) 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_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
 DESCRIPTION=Samba Suite Version 4
 EAPI=7
 HOMEPAGE=https://samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.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.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_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/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_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(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) 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_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,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_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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.2.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.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_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/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_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(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) 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_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,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_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7 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.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3338e540a9bf22f66a1d9c8130a84b7
+_md5_=2b7fe2a346a2936b896a5e155b8acf9b
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index fc92966c9b08..2ec4a8a7e192 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.53.0 b/metadata/md5-cache/net-ftp/filezilla-3.53.0
new file mode 100644
index 000000000000..176d2bdfd432
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.53.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.26.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.26.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.53.0_src.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fab135a66da7e1f8406ff705e42f0783
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index db746f0829e3..418481fb5741 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/mattermost-desktop-bin-4.5.1 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.1
deleted file mode 100644
index ff630b6b57c4..000000000000
--- a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Mattermost Desktop application
-EAPI=7
-HOMEPAGE=https://about.mattermost.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
-RDEPEND=gnome-base/gconf:2 dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-print/cups:0 sys-apps/dbus:0 sys-devel/gcc sys-libs/glibc:2.2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libxcb:0/1.12 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
-SLOT=0
-SRC_URI=https://github.com/mattermost/desktop/archive/v4.5.1.tar.gz -> mattermost-desktop-bin-4.5.1.tar.gz amd64? ( https://releases.mattermost.com/desktop/4.5.1/mattermost-desktop-4.5.1-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.5.1/mattermost-desktop-4.5.1-linux-ia32.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a54761a804a26cc6c3ba5e565fb7a1f0
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.2 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.2
deleted file mode 100644
index 20e6d2eeddd2..000000000000
--- a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Mattermost Desktop application
-EAPI=7
-HOMEPAGE=https://about.mattermost.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
-RDEPEND=gnome-base/gconf:2 dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-print/cups:0 sys-apps/dbus:0 sys-devel/gcc sys-libs/glibc:2.2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libxcb:0/1.12 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
-SLOT=0
-SRC_URI=https://github.com/mattermost/desktop/archive/v4.5.2.tar.gz -> mattermost-desktop-bin-4.5.2.tar.gz amd64? ( https://releases.mattermost.com/desktop/4.5.2/mattermost-desktop-4.5.2-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.5.2/mattermost-desktop-4.5.2-linux-ia32.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a54761a804a26cc6c3ba5e565fb7a1f0
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1
deleted file mode 100644
index 8b52afd8613e..000000000000
--- a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Mattermost Desktop application
-EAPI=7
-HOMEPAGE=https://about.mattermost.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
-RDEPEND=gnome-base/gconf:2 dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-print/cups:0 sys-apps/dbus:0 sys-devel/gcc sys-libs/glibc:2.2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libxcb:0/1.12 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
-SLOT=0
-SRC_URI=https://github.com/mattermost/desktop/archive/v4.6.1.tar.gz -> mattermost-desktop-bin-4.6.1.tar.gz amd64? ( https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-ia32.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a54761a804a26cc6c3ba5e565fb7a1f0
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2
new file mode 100644
index 000000000000..02df3b349d27
--- /dev/null
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Mattermost Desktop application
+EAPI=7
+HOMEPAGE=https://about.mattermost.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2[X] dev-libs/expat dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus x11-libs/gtk+:3[X] x11-libs/libXScrnSaver
+SLOT=0
+SRC_URI=amd64? ( https://releases.mattermost.com/desktop/4.6.2/mattermost-desktop-4.6.2-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.6.2/mattermost-desktop-4.6.2-linux-ia32.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=c84563fb02b7b856bd6c26945cb57c7d
diff --git a/metadata/md5-cache/net-im/slack-4.11.3 b/metadata/md5-cache/net-im/slack-4.11.3
deleted file mode 100644
index 833ea5f8253c..000000000000
--- a/metadata/md5-cache/net-im/slack-4.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Team collaboration tool
-EAPI=7
-HOMEPAGE=https://www.slack.com
-IUSE=appindicator suid abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] app-accessibility/at-spi2-core:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libdrm:0[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libxkbcommon:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] appindicator? ( dev-libs/libappindicator:3[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.11.3-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f7ee9c34528bad703b8bb23c5ad55e0
diff --git a/metadata/md5-cache/net-im/slack-4.12.2 b/metadata/md5-cache/net-im/slack-4.12.2
deleted file mode 100644
index 61c94ac51b24..000000000000
--- a/metadata/md5-cache/net-im/slack-4.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Team collaboration tool
-EAPI=7
-HOMEPAGE=https://www.slack.com
-IUSE=appindicator suid abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] app-accessibility/at-spi2-core:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libdrm:0[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libxkbcommon:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] appindicator? ( dev-libs/libappindicator:3[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.12.2-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6d5971000938948d234e829dac103dc
diff --git a/metadata/md5-cache/net-im/teams-1.3.00.25560 b/metadata/md5-cache/net-im/teams-1.3.00.25560
deleted file mode 100644
index 3da9caf453d2..000000000000
--- a/metadata/md5-cache/net-im/teams-1.3.00.25560
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DESCRIPTION=Microsoft Teams, an Office 365 multimedia collaboration client, pre-release
-EAPI=7
-HOMEPAGE=https://products.office.com/en-us/microsoft-teams/group-chat-software/
-IUSE=system-ffmpeg system-mesa
-KEYWORDS=-* ~amd64
-LICENSE=ms-teams-pre
-RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbfile x11-libs/pango system-mesa? ( media-libs/mesa ) system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-RESTRICT=bindist mirror splitdebug test
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.25560_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2b04a36dc7df7c8af34278ae9c8903f
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.4855-r1 b/metadata/md5-cache/net-im/teams-1.4.00.4855-r1
new file mode 100644
index 000000000000..dfd1a97f28ee
--- /dev/null
+++ b/metadata/md5-cache/net-im/teams-1.4.00.4855-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm pretend setup unpack
+DESCRIPTION=Microsoft Teams, an Office 365 multimedia collaboration client, pre-release
+EAPI=7
+HOMEPAGE=https://products.office.com/en-us/microsoft-teams/group-chat-software/
+IUSE=system-ffmpeg system-mesa kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=ms-teams-pre
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbfile x11-libs/pango system-mesa? ( media-libs/mesa ) system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+RESTRICT=bindist mirror splitdebug test
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.4855_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=451318fa7f489fdc2f4c9d0aeeb10115
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.5.9 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.5.9
deleted file mode 100644
index 9f608a1e1538..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.5.9
+++ /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.5.9.tar.gz -> tdesktop-2.5.9.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.5.9.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.0
deleted file mode 100644
index 77029efb80dd..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.0
+++ /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.0.tar.gz -> tdesktop-2.6.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.6.0.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
new file mode 100644
index 000000000000..cbdf750ea286
--- /dev/null
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An account manager and channel dispatcher for the Telepathy framework
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/telepathy/telepathy-mission-control
+IUSE=debug networkmanager
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= )
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.6.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a9cca7953b215b428e541e384187916
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index e2e0607f570d..9975698ff4aa 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/ircii-20210314 b/metadata/md5-cache/net-irc/ircii-20210314
new file mode 100644
index 000000000000..bbc6ccd5435e
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ircii-20210314
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:0= virtual/libiconv
+DESCRIPTION=An IRC and ICB client that runs under most UNIX platforms
+EAPI=7
+HOMEPAGE=http://eterna.com.au/ircii/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:0= virtual/libiconv
+SLOT=0
+SRC_URI=https://ircii.warped.com/ircii-20210314.tar.bz2 https://ircii.warped.com/old/ircii-20210314.tar.bz2
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cc06d72844b0e4614fbe03255b719b83
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.2.2 b/metadata/md5-cache/net-irc/telepathy-idle-0.2.2
new file mode 100644
index 000000000000..0cc6c83e09c4
--- /dev/null
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.2.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=setup
+DEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21 sys-apps/dbus python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DESCRIPTION=Full-featured IRC connection manager for Telepathy
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/telepathy/telepathy-idle
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21 sys-apps/dbus python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.2.2.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e80b6d6dad986b2b4bacb3a614b0aae4
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0f375164d35f..d7bc969892bc 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/cvm-0.96-r1 b/metadata/md5-cache/net-libs/cvm-0.96-r1
deleted file mode 100644
index 0ea9375b3561..000000000000
--- a/metadata/md5-cache/net-libs/cvm-0.96-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/cdb:= >=dev-libs/bglibs-1.041:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail ) test? ( app-editors/vim dev-db/sqlite )
-DESCRIPTION=Credential Validation Modules by Bruce Guenter
-EAPI=7
-HOMEPAGE=http://untroubled.org/cvm/
-IUSE=mysql postgres test vpopmail
-KEYWORDS=~amd64 ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/cdb:= >=dev-libs/bglibs-1.041:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://untroubled.org/cvm/archive/cvm-0.96.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e08939b23c1581ea459062daaa0ce8f
diff --git a/metadata/md5-cache/net-libs/daq-2.0.6-r1 b/metadata/md5-cache/net-libs/daq-2.0.6-r1
deleted file mode 100644
index d6dfe834339b..000000000000
--- a/metadata/md5-cache/net-libs/daq-2.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 )
-DESCRIPTION=Data Acquisition library, for packet I/O
-EAPI=7
-HOMEPAGE=https://www.snort.org/
-IUSE=ipv6 +afpacket +dump +pcap nfq ipq static-libs
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 )
-SLOT=0
-SRC_URI=https://www.snort.org/downloads/snort/daq-2.0.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e061364592ea01a3dceae14bdfc2d4d2
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.9 b/metadata/md5-cache/net-libs/farstream-0.2.9
new file mode 100644
index 000000000000..81fcf3e92a02
--- /dev/null
+++ b/metadata/md5-cache/net-libs/farstream-0.2.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig >=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=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Audio/video conferencing framework specifically designed for instant messengers
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/Farstream
+IUSE=+introspection test upnp valgrind
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
+RESTRICT=test
+SLOT=0.2/5
+SRC_URI=https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.9.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d347a72e3b9a5426fb7f9f0019616de
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.22 b/metadata/md5-cache/net-libs/gloox-1.0.22
deleted file mode 100644
index 30404ca75a50..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=7
-HOMEPAGE=https://camaya.net/gloox/
-IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0/17
-SRC_URI=https://camaya.net/download/gloox-1.0.22.tar.bz2
-_md5_=587b5c2996a46b526912a144a6a8ed53
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.3-r2 b/metadata/md5-cache/net-libs/libdom-0.3.3-r2
deleted file mode 100644
index dc541c60b697..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.3.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.3.0 >=net-libs/libhubbub-0.3.1-r1 xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) ) dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch )
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.3.0 >=net-libs/libhubbub-0.3.1-r1 xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) )
-REQUIRED_USE=test? ( xml )
-RESTRICT=!test? ( test )
-SLOT=0/0.3.3
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.3.3-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c412f0b104e53f4aae6cc260d8219e94
diff --git a/metadata/md5-cache/net-libs/libdom-0.4.0-r1 b/metadata/md5-cache/net-libs/libdom-0.4.0-r1
deleted file mode 100644
index 408aaf9d6dbc..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.4.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/libparserutils dev-libs/libwapcaplet net-libs/libhubbub xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) ) test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch )
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet net-libs/libhubbub xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) )
-REQUIRED_USE=test? ( xml )
-RESTRICT=!test? ( test )
-SLOT=0/0.4.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.4.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f8ea31beb2259b8946e187369ba34321
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1 b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
deleted file mode 100644
index dfeb00d48836..000000000000
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9754d30f1b0f79360f559f2580d56b5
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.1 b/metadata/md5-cache/net-libs/libgsasl-1.8.1
deleted file mode 100644
index 2657fe25dddf..000000000000
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6458fd6bc3d385e9012446c314241b4b
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.6 b/metadata/md5-cache/net-libs/libhubbub-0.3.6
deleted file mode 100644
index 502371fdd6d9..000000000000
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-lang/perl )
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libparserutils:= test? ( dev-libs/json-c )
-DESCRIPTION=HTML5 compliant parsing library, written in C
-EAPI=7
-HOMEPAGE=https://www.netsurf-browser.org/projects/hubbub/
-IUSE=doc test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.6
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.6-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e544ca5e223bd8c07815fcd7b6fed94
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.6-r2 b/metadata/md5-cache/net-libs/libhubbub-0.3.6-r2
deleted file mode 100644
index 35aacdde6d79..000000000000
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-lang/perl )
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libparserutils:= test? ( dev-libs/json-c )
-DESCRIPTION=HTML5 compliant parsing library, written in C
-EAPI=7
-HOMEPAGE=https://www.netsurf-browser.org/projects/hubbub/
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.6
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.6-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3791c72952624fdfb561b3d89f0045fc
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1 b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
deleted file mode 100644
index d0c288613015..000000000000
--- a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Minimalistic netlink library
-EAPI=7
-HOMEPAGE=https://netfilter.org/projects/libmnl/
-IUSE=examples static-libs split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.3.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=428962b103a9f9b20f17e23d562a485a
diff --git a/metadata/md5-cache/net-libs/libnet-1.2 b/metadata/md5-cache/net-libs/libnet-1.2
index d7ccabda8111..90577602628a 100644
--- a/metadata/md5-cache/net-libs/libnet-1.2
+++ b/metadata/md5-cache/net-libs/libnet-1.2
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x
 LICENSE=BSD BSD-2 HPND
 SLOT=1.1
 SRC_URI=https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz
-_md5_=9c68cccc2b060519eb97d4b042463d6f
+_md5_=f48f85e595287e089c904d855ec3e924
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
index da785fe618e2..12610c583008 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=programming interface (API) to the in-kernel connection tracking sta
 EAPI=6
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_conntrack/
 IUSE=static-libs kernel_linux
-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-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=55ff4359bd96cc5e3aaf4ef6baf68048
+_md5_=2bb1d3c99ca23965c558b41eceb9e2a3
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index 83693c82dde8..f6aad935e34a 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Userspace library for interface to user-space helper for conntrack
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cthelper/
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a8df158eb17d6d342e794c0762dda388
+_md5_=cdc4314f59cbaea4d8993bd00c882817
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index 6da024e12175..888c79ada973 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=netlink interface for conntrack timeout infrastructure in kernel's p
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cttimeout/
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7cca144389ab87c5f9f39c683a90654b
+_md5_=7e72f6096c14ac72793fc4b7b8ac21f4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
index 97e6171fe8f5..7d71b100f9dc 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
 EAPI=6
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
 IUSE=static-libs 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=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7e2492fe49b25fde189c2aafd4992b27
+_md5_=7a48e2da763b6730c4fc560e279ef2ad
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 697fb3956b18..122fd514befe 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
 IUSE=doc static-libs 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=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a5a60161ebcb416c9a39405dd735822a
+_md5_=16c1c5689892066b5978eda49bdacff6
diff --git a/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1 b/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
index fd34298bb5f1..9c519e3c9921 100644
--- a/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
+++ b/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v1.6.0.tar.gz -> libsrtp-1.6.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f1b3ec88f64868221547b4c611861459
+_md5_=1f00d8b886a382e06f5d0bcc5429be4e
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.8 b/metadata/md5-cache/net-libs/libtorrent-0.13.8
deleted file mode 100644
index 295491be0fb7..000000000000
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/pkgconfig dev-util/cppunit >=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=BitTorrent library written in C++ for *nix
-EAPI=6
-HOMEPAGE=https://rakshasa.github.io/rtorrent/
-IUSE=debug libressl ssl test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.8.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=43e4ed6100679fb5464687a51e8b99e4
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1 b/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1
new file mode 100644
index 000000000000..6c3ecf01c26e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-util/cppunit:= sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/pkgconfig >=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=BitTorrent library written in C++ for *nix
+EAPI=6
+HOMEPAGE=https://rakshasa.github.io/rtorrent/
+IUSE=debug libressl ssl test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=dev-util/cppunit:= sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.8.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1592e32855e4b27580c374fe8086128b
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.14_p1 b/metadata/md5-cache/net-libs/libtrace-4.0.14_p1
deleted file mode 100644
index afb9b66fea1b..000000000000
--- a/metadata/md5-cache/net-libs/libtrace-4.0.14_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl ) app-doc/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig virtual/yacc
-DESCRIPTION=A library and tools for trace processing
-EAPI=7
-HOMEPAGE=https://research.wand.net.nz/software/libtrace.php
-IUSE=doc ncurses numa static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl )
-SLOT=0
-SRC_URI=https://github.com/LibtraceTeam/libtrace/archive//4.0.14-1.tar.gz -> libtrace-4.0.14_p1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d219858a5a8764e14d6c6bb496be2562
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.10 b/metadata/md5-cache/net-libs/mbedtls-2.16.10
new file mode 100644
index 000000000000..4d8c49dba664
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=7
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3.12.0
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.10.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a1ffefd0283fb5a5c0e5aa3ca0bac54
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.26.0 b/metadata/md5-cache/net-libs/mbedtls-2.26.0
new file mode 100644
index 000000000000..7d85f08a7085
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.26.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=7
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/6.13.1
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.26.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=306b917cbc6b2e2e1fbe744746799412
diff --git a/metadata/md5-cache/net-libs/pjproject-2.10 b/metadata/md5-cache/net-libs/pjproject-2.10
deleted file mode 100644
index 1529ce1389af..000000000000
--- a/metadata/md5-cache/net-libs/pjproject-2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
-EAPI=7
-HOMEPAGE=https://www.pjsip.org/
-IUSE=amr debug epoll examples ipv6 libressl 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://github.com/pjsip/pjproject/archive/2.10.tar.gz -> pjproject-2.10.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a53d75ac1737467296cd9ca3603cd0d
diff --git a/metadata/md5-cache/net-libs/pjproject-2.10-r1 b/metadata/md5-cache/net-libs/pjproject-2.10-r1
index fdd5f4806bbb..f51c276fc928 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.10-r1
+++ b/metadata/md5-cache/net-libs/pjproject-2.10-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=7
 HOMEPAGE=https://www.pjsip.org/
 IUSE=amr debug epoll examples ipv6 libressl 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
+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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0/2.10
 SRC_URI=https://github.com/pjsip/pjproject/archive/2.10.tar.gz -> pjproject-2.10.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9bc8be6022783d657037878661650c2e
+_md5_=f15c5b36824e70734370859d583d8f6c
diff --git a/metadata/md5-cache/net-libs/pjproject-2.7.2-r2 b/metadata/md5-cache/net-libs/pjproject-2.7.2-r2
deleted file mode 100644
index d0e5eb67cc95..000000000000
--- a/metadata/md5-cache/net-libs/pjproject-2.7.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( media-video/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-libs/libsrtp:0 virtual/pkgconfig !!media-plugins/mediastreamer-bcg729 >=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=Open source SIP, Media, and NAT Traversal Library
-EAPI=6
-HOMEPAGE=https://www.pjsip.org/
-IUSE=amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( media-video/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-libs/libsrtp:0
-REQUIRED_USE=?? ( alsa oss portaudio )
-SLOT=0
-SRC_URI=https://www.pjsip.org/release/2.7.2/pjproject-2.7.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a7dd15df509eb12573d1de3cac6d4a1
diff --git a/metadata/md5-cache/net-libs/pjproject-2.9-r2 b/metadata/md5-cache/net-libs/pjproject-2.9-r2
deleted file mode 100644
index 86ca4218a0c1..000000000000
--- a/metadata/md5-cache/net-libs/pjproject-2.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
-EAPI=7
-HOMEPAGE=https://www.pjsip.org/
-IUSE=amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://www.pjsip.org/release/2.9/pjproject-2.9.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d22511bb41b349af73efbdf42e76567
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.2 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.2
new file mode 100644
index 000000000000..7b39bc93e7ee
--- /dev/null
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am 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 setup test
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol
+EAPI=7
+HOMEPAGE=https://telepathy.freedesktop.org/
+IUSE=debug +introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+PDEPEND=net-im/telepathy-mission-control
+RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=297ee6a2068aa4f3f01f7568157ada16
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.3 b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
new file mode 100644
index 000000000000..f882de0a750f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/gtk-doc-am-1.14 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.38.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=HTTP web service mocking library
+EAPI=7
+HOMEPAGE=https://gitlab.com/uhttpmock/uhttpmock
+IUSE=debug +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.38.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2bfa8a250e89515721843309acee3c1
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index ac32973c5c40..9d8e209b5ea4 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/courier-imap-5.0.11 b/metadata/md5-cache/net-mail/courier-imap-5.0.11
index 0fb2019144bb..9256b3264c0c 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.11
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.11
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.11.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca498fe03fc15e02a900cddce209cbd7
+_md5_=c9f9ee9d1d199f462d1742ebb63755e4
diff --git a/metadata/md5-cache/net-mail/imapsync-1.882 b/metadata/md5-cache/net-mail/imapsync-1.882
deleted file mode 100644
index 6ebc1d707f32..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.882
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-perl/App-cpanminus dev-perl/Authen-NTLM dev-perl/CGI dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/Digest-HMAC dev-perl/Dist-CheckConflicts dev-perl/File-Copy-Recursive dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/JSON dev-perl/libwww-perl dev-perl/Mail-IMAPClient dev-perl/Module-Implementation dev-perl/Module-Runtime dev-perl/Module-ScanDeps dev-perl/Net-SSLeay dev-perl/Package-Stash dev-perl/Package-Stash-XS dev-perl/PAR dev-perl/Parse-RecDescent dev-perl/Readonly dev-perl/Readonly-XS dev-perl/Regexp-Common dev-perl/Sys-MemInfo dev-perl/TermReadKey dev-perl/Try-Tiny dev-perl/Unicode-String dev-perl/URI virtual/perl-Compress-Raw-Zlib virtual/perl-Data-Dumper virtual/perl-Digest virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 test? ( virtual/perl-Test dev-perl/Test-Deep dev-perl/Test-Fatal dev-perl/Test-MockObject dev-perl/Test-Pod dev-perl/Test-Requires dev-perl/Test-Warn dev-perl/Test-NoWarnings )
-DESCRIPTION=Tool for incremental and recursive IMAP transfers between mailboxes
-EAPI=6
-HOMEPAGE=http://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync
-IUSE=test
-KEYWORDS=amd64 ppc x86
-LICENSE=WTFPL-2
-RDEPEND=dev-perl/App-cpanminus dev-perl/Authen-NTLM dev-perl/CGI dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/Digest-HMAC dev-perl/Dist-CheckConflicts dev-perl/File-Copy-Recursive dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/JSON dev-perl/libwww-perl dev-perl/Mail-IMAPClient dev-perl/Module-Implementation dev-perl/Module-Runtime dev-perl/Module-ScanDeps dev-perl/Net-SSLeay dev-perl/Package-Stash dev-perl/Package-Stash-XS dev-perl/PAR dev-perl/Parse-RecDescent dev-perl/Readonly dev-perl/Readonly-XS dev-perl/Regexp-Common dev-perl/Sys-MemInfo dev-perl/TermReadKey dev-perl/Try-Tiny dev-perl/Unicode-String dev-perl/URI virtual/perl-Compress-Raw-Zlib virtual/perl-Data-Dumper virtual/perl-Digest virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/imapsync/imapsync/archive/imapsync-1.882.tar.gz
-_md5_=bde52b495f1761e3a5233f30154b3a73
diff --git a/metadata/md5-cache/net-mail/isync-1.4.1 b/metadata/md5-cache/net-mail/isync-1.4.1
new file mode 100644
index 000000000000..7adfa77d8a8c
--- /dev/null
+++ b/metadata/md5-cache/net-mail/isync-1.4.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib:0= )
+DESCRIPTION=MailDir mailbox synchronizer
+EAPI=7
+HOMEPAGE=http://isync.sourceforge.net/
+IUSE=libressl sasl ssl zlib
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/isync/isync/1.4.1/isync-1.4.1.tar.gz
+_md5_=0605e0e4ec2d0de3a3d8efd7c60525aa
diff --git a/metadata/md5-cache/net-mail/mpop-1.4.4 b/metadata/md5-cache/net-mail/mpop-1.4.4
deleted file mode 100644
index 216da201bf28..000000000000
--- a/metadata/md5-cache/net-mail/mpop-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A small, fast, and portable POP3 client
-EAPI=7
-HOMEPAGE=https://marlam.de/mpop/
-IUSE=gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://marlam.de/mpop/releases/mpop-1.4.4.tar.xz
-_md5_=9ff30c47118b12ab329d41d4024d3bdc
diff --git a/metadata/md5-cache/net-mail/mu-1.4.13 b/metadata/md5-cache/net-mail/mu-1.4.13
deleted file mode 100644
index d2345ae49244..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=7
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-IUSE=emacs guile mug
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/archive/1.4.13.tar.gz -> mu-1.4.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4b26c1a6efd2fdc39e23897b28e4ba2
diff --git a/metadata/md5-cache/net-mail/mu-1.4.15-r1 b/metadata/md5-cache/net-mail/mu-1.4.15-r1
new file mode 100644
index 000000000000..b18f118cc736
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.4.15-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=7
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile mug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/1.4.15/mu-1.4.15.tar.xz
+_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=f63172b9ebf03ba8943a28eab16d38fc
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.3 b/metadata/md5-cache/net-mail/rss2email-3.12.3
new file mode 100644
index 000000000000..1328a97940a6
--- /dev/null
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=<dev-python/feedparser-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
+EAPI=7
+HOMEPAGE=https://github.com/rss2email/rss2email
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=<dev-python/feedparser-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.3.tar.gz -> rss2email-3.12.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f6fc3c074abd888138e554cf8a55502d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5bb94405b34c..863e0175919a 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/apt-cacher-ng-3.6.2_p1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.2_p1
deleted file mode 100644
index f427683a345b..000000000000
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.2_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
-EAPI=7
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse systemd tcpd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.6.2.orig.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=717a9bc5fb7663af6d88ade6a74194ed
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1
new file mode 100644
index 000000000000..1052d8e25041
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6.3_p1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
+EAPI=7
+HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse systemd tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.6.3.orig.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=717a9bc5fb7663af6d88ade6a74194ed
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6_p1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.6_p1
deleted file mode 100644
index e4011dfaf840..000000000000
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.6_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
-EAPI=7
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse systemd tcpd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.6.orig.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=717a9bc5fb7663af6d88ade6a74194ed
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2 b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
index 62de66d8646f..a6f8142996e0 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=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
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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 sys-libs/ncurses:0= 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/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog 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 sys-libs/ncurses:0= 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/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b84ba5a61920e5a7e289c68bdb7d7431
+_md5_=8e8593c676c217aad2e80bf558b33265
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2 b/metadata/md5-cache/net-misc/asterisk-13.38.2
index f0f8de652cc2..2d165f2b7a9c 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=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
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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 sys-libs/ncurses:0= 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/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog 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 sys-libs/ncurses:0= 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/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f2718016a9819299cdab9a72201a7e1e
+_md5_=6328b70429a13f2eceea81c10f4d65bb
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
new file mode 100644
index 000000000000..90503d1000ae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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 libressl 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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1f599577d1d07c53ae87ffcd3a39cdc4
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2 b/metadata/md5-cache/net-misc/asterisk-16.16.2
index bfaac70d2c31..1910447d78b3 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.16.2
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=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
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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/ncurses:0= 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 ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog 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
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog 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/ncurses:0= 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 ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.16.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16f74c2018514c0c659e3679230880bd
+_md5_=164d62bb7731371b24a2730c6205a67c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2-r1 b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
new file mode 100644
index 000000000000..5b6acb48cb39
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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 libressl 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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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.16.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bec42aa387b626b825dcf369f95f405f
diff --git a/metadata/md5-cache/net-misc/asterisk-18.2.2 b/metadata/md5-cache/net-misc/asterisk-18.2.2
new file mode 100644
index 000000000000..70f6f8c189e3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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 libressl 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 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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.2.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7d72d946c6be88410841b78e9f48746f
diff --git a/metadata/md5-cache/net-misc/connect-1.105 b/metadata/md5-cache/net-misc/connect-1.105
new file mode 100644
index 000000000000..d31ba14f47a7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connect-1.105
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=SSH Proxy Command
+EAPI=7
+HOMEPAGE=https://github.com/gotoh/ssh-connect
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/gotoh/ssh-connect/archive/1.105.tar.gz -> connect-1.105.tar.gz
+_md5_=b144433f881827cc1972392b186c8924
diff --git a/metadata/md5-cache/net-misc/croc-8.6.10 b/metadata/md5-cache/net-misc/croc-8.6.10
new file mode 100644
index 000000000000..e5213a3ea01c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/croc-8.6.10
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Easily and securely send things from one computer to another
+EAPI=7
+HOMEPAGE=https://github.com/schollz/croc
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/croc acct-user/croc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/schollz/croc/releases/download/v8.6.10/croc_8.6.10_src.tar.gz -> croc-8.6.10.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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.10.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//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-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/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-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.zip 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/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=692f14a79526ea302c85dbd6b2f2d291
diff --git a/metadata/md5-cache/net-misc/croc-8.6.11 b/metadata/md5-cache/net-misc/croc-8.6.11
new file mode 100644
index 000000000000..b2157c9d52ea
--- /dev/null
+++ b/metadata/md5-cache/net-misc/croc-8.6.11
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Easily and securely send things from one computer to another
+EAPI=7
+HOMEPAGE=https://github.com/schollz/croc
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/croc acct-user/croc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/schollz/croc/releases/download/v8.6.11/croc_8.6.11_src.tar.gz -> croc-8.6.11.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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.10.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.7.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.7.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.6.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.6.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//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-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210314154223-e6e6c4f2bb5b.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210314154223-e6e6c4f2bb5b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.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-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-20210315170653-34ac3e1c2000.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210315170653-34ac3e1c2000.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210223095934-7937bea0104d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.zip 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/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d86f04112ea48dc7c2cc1c4e52177e43
diff --git a/metadata/md5-cache/net-misc/croc-8.6.8 b/metadata/md5-cache/net-misc/croc-8.6.8
deleted file mode 100644
index 00d82aec9504..000000000000
--- a/metadata/md5-cache/net-misc/croc-8.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Easily and securely send things from one computer to another
-EAPI=7
-HOMEPAGE=https://github.com/schollz/croc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/croc acct-user/croc
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/schollz/croc/releases/download/v8.6.8/croc_8.6.8_src.tar.gz -> croc-8.6.8.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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.10.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//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-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/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-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-20210222171744-9060382bd457.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210222171744-9060382bd457.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210223095934-7937bea0104d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210223095934-7937bea0104d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=26c1f9a1a6f9cbd59bb1f8113e308b94
diff --git a/metadata/md5-cache/net-misc/croc-8.6.9 b/metadata/md5-cache/net-misc/croc-8.6.9
deleted file mode 100644
index c13a3fcc5409..000000000000
--- a/metadata/md5-cache/net-misc/croc-8.6.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Easily and securely send things from one computer to another
-EAPI=7
-HOMEPAGE=https://github.com/schollz/croc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/croc acct-user/croc
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/schollz/croc/releases/download/v8.6.9/croc_8.6.9_src.tar.gz -> croc-8.6.9.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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.10.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.6.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.3.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.7.4.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//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-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/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-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/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-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305034016-7844c3c200c3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305034016-7844c3c200c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e7b8128c30599d6b11d15a7af567c731
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.3.4 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
index 45340299234d..41147018bceb 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -5,10 +5,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1efe9dd9f2dca5dd52bc2340ee23b3c1
+_md5_=1d57d8e0188768972349adaff02843dc
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1 b/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
new file mode 100644
index 000000000000..2e11d6a66963
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev )
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=7
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
+IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
+SLOT=0
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.4.0.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a622b980e13016a820c4bf67a39117c5
diff --git a/metadata/md5-cache/net-misc/dropbox-118.4.460 b/metadata/md5-cache/net-misc/dropbox-118.4.460
new file mode 100644
index 000000000000..44b6d46a6848
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-118.4.460
@@ -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
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-118.4.460.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-118.4.460.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02fa288e29ee0a9a2f7aa62d6a0f7805
diff --git a/metadata/md5-cache/net-misc/geoipupdate-3.1.0 b/metadata/md5-cache/net-misc/geoipupdate-3.1.0
deleted file mode 100644
index 14d132d25c23..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-3.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=net-misc/curl sys-libs/zlib
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=6
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl sys-libs/zlib !<dev-libs/geoip-1.6.0
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/releases/download/v3.1.0/geoipupdate-3.1.0.tar.gz
-_md5_=8a2c02a1f4f3d36bd7f87ee913e3d474
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1 b/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
deleted file mode 100644
index ad7bd41543c0..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.3.tar.gz -> geoipupdate-4.0.3.tar.gz https://files.adjust.com/geoipupdate-vendor-4.0.3.tar
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=7883f2da6f9d0ae9f5c190cbc814d432
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.4 b/metadata/md5-cache/net-misc/geoipupdate-4.0.4
deleted file mode 100644
index c17c79495f42..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-4.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.4.tar.gz -> geoipupdate-4.0.4.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=01b6f953994d7b67747ddd057dd8f859
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1 b/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
deleted file mode 100644
index e9879c54a9d2..000000000000
--- a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL client, server, and library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/gsasl-1.8.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=05f2c94f4f1a67f786e5513f9d9ca0a9
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.1 b/metadata/md5-cache/net-misc/gsasl-1.8.1
deleted file mode 100644
index a54aad27d400..000000000000
--- a/metadata/md5-cache/net-misc/gsasl-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL client, server, and library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/gsasl-1.8.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e0829f3e5c9100aeedd413d4b24086a5
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
deleted file mode 100644
index a4a36603c5f0..000000000000
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sys-kernel/linux-headers-2.6 >=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=Tools for Linux Kernel Stream Control Transmission Protocol implementation
-EAPI=5
-HOMEPAGE=http://lksctp.sourceforge.net/
-IUSE=kernel_linux static-libs kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 )
-REQUIRED_USE=kernel_linux
-SLOT=0
-SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b76810f3cb75a1283e1ab19c4f804b1
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
index 89040543c477..7c953b1fe725 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
@@ -4,10 +4,10 @@ DESCRIPTION=Database of mobile broadband service providers
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=CC-PD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20201225/mobile-broadband-provider-info-20201225.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=ebf3ccbcdd8a6b57d1fcaffdefb2e2fb
+_md5_=5a94ee478dc4eddf47f6bba920f5336d
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1 b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
new file mode 100644
index 000000000000..e928ed399c8d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
+IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
+REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
+SLOT=0/1
+SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.14.8.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a35d87a2ede6e3bfdb3bfba10bd9435
diff --git a/metadata/md5-cache/net-misc/mrouted-3.9.8 b/metadata/md5-cache/net-misc/mrouted-3.9.8
deleted file mode 100644
index 2df6e4319cae..000000000000
--- a/metadata/md5-cache/net-misc/mrouted-3.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( dev-util/yacc sys-devel/bison )
-DESCRIPTION=IP multicast routing daemon
-EAPI=7
-HOMEPAGE=https://troglobit.com/projects/mrouted/
-IUSE=rsrr
-KEYWORDS=amd64 ppc x86
-LICENSE=Stanford GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/troglobit/mrouted/releases/download/3.9.8/mrouted-3.9.8.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e390e7abfd758e4d7066bb307fc99174
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.30.2 b/metadata/md5-cache/net-misc/networkmanager-1.30.2
new file mode 100644
index 000000000000..9b7ddaf85305
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.30.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[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/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[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/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.30/NetworkManager-1.30.2.tar.xz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=58e94a49a3555b0bad1d04e6bb24c43e
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1 b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
new file mode 100644
index 000000000000..3aa509c97f18
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf >=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 pretend test
+DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=7
+HOMEPAGE=https://www.openssh.com/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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 GPL-2
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( !prefix? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp !security-key ssl !xmss ) xmss? ( || ( ssl libressl ) ) test? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0.1/openssh-8.5p1+x509-13.0.1.diff.gz )
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d1d8912a1f8986d78f496ce409b2257d
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14
new file mode 100644
index 000000000000..efe9ee4eec1b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=>=dev-lang/erlang-22[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0 dev-libs/libxslt || ( ( dev-lang/python:3.8 dev-python/simplejson[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/simplejson[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) )
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=7
+HOMEPAGE=https://www.rabbitmq.com/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 MPL-2.0
+RDEPEND=>=dev-lang/erlang-22[ssl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.14/rabbitmq-server-3.8.14.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8761b4ee03c78d0ef1a04be83d8b5b9a
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.10 b/metadata/md5-cache/net-misc/seafile-7.0.10
deleted file mode 100644
index 4185a81dd30f..000000000000
--- a/metadata/md5-cache/net-misc/seafile-7.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-libs/libsearpc[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) sys-libs/zlib net-misc/curl !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) dev-db/sqlite:3 || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
-DESCRIPTION=File syncing and sharing software with file encryption and group sharing
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
-IUSE=libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-libs/libsearpc[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) sys-libs/zlib net-misc/curl !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) dev-db/sqlite:3
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.10.tar.gz -> seafile-7.0.10.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2327d4b75d709d09df2a340f8b904050
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.9 b/metadata/md5-cache/net-misc/seafile-7.0.9
deleted file mode 100644
index ab5a57c63258..000000000000
--- a/metadata/md5-cache/net-misc/seafile-7.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-libs/libsearpc[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson sys-libs/zlib net-misc/curl !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) dev-db/sqlite:3 || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
-DESCRIPTION=File syncing and sharing software with file encryption and group sharing
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
-IUSE=libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-libs/libsearpc[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson sys-libs/zlib net-misc/curl !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) dev-db/sqlite:3
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.9.tar.gz -> seafile-7.0.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3572f9ad6f68321f6006eac14710ff6
diff --git a/metadata/md5-cache/net-misc/seafile-client-7.0.10 b/metadata/md5-cache/net-misc/seafile-client-7.0.10
deleted file mode 100644
index 000fd3822804..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-7.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/libevent dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-libs/libsearpc ~net-misc/seafile-7.0.10 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Seafile desktop client
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
-IUSE=libressl shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/libevent dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-libs/libsearpc ~net-misc/seafile-7.0.10 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/v7.0.10.tar.gz -> seafile-client-7.0.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c9ed71256f21db2d0fb7da245737e44
diff --git a/metadata/md5-cache/net-misc/seafile-client-7.0.9-r1 b/metadata/md5-cache/net-misc/seafile-client-7.0.9-r1
deleted file mode 100644
index e3ab8725e7f1..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-7.0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/libevent dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-libs/libsearpc ~net-misc/seafile-7.0.9 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Seafile desktop client
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
-IUSE=libressl shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/libevent dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-libs/libsearpc ~net-misc/seafile-7.0.9 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/v7.0.9.tar.gz -> seafile-client-7.0.9.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c34d82674264721797c98c41b2f0774
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r2 b/metadata/md5-cache/net-misc/sks-1.1.6-r2
deleted file mode 100644
index d207e926d4dc..000000000000
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=>=dev-lang/ocaml-4.0:= dev-ml/findlib dev-ml/camlp4 dev-ml/cryptokit:0/1.10 sys-libs/db:5.3 virtual/pkgconfig
-DESCRIPTION=An OpenPGP keyserver which is decentralized with highly reliable synchronization
-EAPI=6
-HOMEPAGE=https://bitbucket.org/skskeyserver/sks-keyserver
-IUSE=optimize test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/findlib dev-ml/camlp4 dev-ml/cryptokit:0/1.10 sys-libs/db:5.3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=d1cbed31a62fe92ca849f68356aa9477
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6_p20200624 b/metadata/md5-cache/net-misc/sks-1.1.6_p20200624
index a76a097a9e85..8c108ec804a5 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6_p20200624
+++ b/metadata/md5-cache/net-misc/sks-1.1.6_p20200624
@@ -5,11 +5,11 @@ DESCRIPTION=An OpenPGP keyserver which is decentralized with highly reliable syn
 EAPI=7
 HOMEPAGE=https://github.com/SKS-Keyserver/sks-keyserver
 IUSE=optimize test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/sks acct-group/sks >=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= dev-ml/num:= sys-libs/db:5.3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SKS-Keyserver/sks-keyserver/archive/591a7834dc9f1dff3d336d769a6561138a5befe7.tar.gz -> sks-1.1.6_p20200624.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=89c71fcc7a63df1e6eb1841d92aa28cc
+_md5_=a57286e0e7277a932949dca98b2d4498
diff --git a/metadata/md5-cache/net-misc/stunnel-5.58 b/metadata/md5-cache/net-misc/stunnel-5.58
new file mode 100644
index 000000000000..81c26f046f1c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stunnel-5.58
@@ -0,0 +1,15 @@
+BDEPEND=ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=TLS/SSL - Port Wrapper
+EAPI=7
+HOMEPAGE=https://www.stunnel.org/index.html
+IUSE=ipv6 selinux stunnel3 tcpd ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.58.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.58.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.58.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=78ff5498a7071669530efe3cecb072a9
diff --git a/metadata/md5-cache/net-misc/unison-2.51.4_rc1 b/metadata/md5-cache/net-misc/unison-2.51.4_rc1
deleted file mode 100644
index 2e84ccde2b17..000000000000
--- a/metadata/md5-cache/net-misc/unison-2.51.4_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml:=[ocamlopt?] doc? ( app-text/dvipsk app-text/ghostscript-gpl dev-texlive/texlive-latex )
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=gtk? ( dev-ml/lablgtk:2= )
-DESCRIPTION=Two-way cross-platform file synchronizer
-EAPI=7
-HOMEPAGE=https://www.seas.upenn.edu/~bcpierce/unison/
-IUSE=debug doc gtk +ocamlopt threads
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=gtk? ( dev-ml/lablgtk:2= || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) >=app-eselect/eselect-unison-0.4
-RESTRICT=!ocamlopt? ( strip )
-SLOT=2.51
-SRC_URI=https://github.com/bcpierce00/unison/archive/v2.51.4_rc1.tar.gz -> unison-2.51.4_rc1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca11da7817b1f4537925baad8efdf29
diff --git a/metadata/md5-cache/net-misc/unison-2.51.4_rc2 b/metadata/md5-cache/net-misc/unison-2.51.4_rc2
new file mode 100644
index 000000000000..6d2d85b44ee7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/unison-2.51.4_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml:=[ocamlopt?] doc? ( app-text/dvipsk app-text/ghostscript-gpl dev-texlive/texlive-latex )
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=gtk? ( dev-ml/lablgtk:2= )
+DESCRIPTION=Two-way cross-platform file synchronizer
+EAPI=7
+HOMEPAGE=https://www.seas.upenn.edu/~bcpierce/unison/
+IUSE=debug doc gtk +ocamlopt threads
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=gtk? ( dev-ml/lablgtk:2= || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) >=app-eselect/eselect-unison-0.4
+RESTRICT=!ocamlopt? ( strip )
+SLOT=2.51
+SRC_URI=https://github.com/bcpierce00/unison/archive/v2.51.4_rc2.tar.gz -> unison-2.51.4_rc2.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=116956d1dbee1a65242bade0ec33265e
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
new file mode 100644
index 000000000000..6955806ac029
--- /dev/null
+++ b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=pcap? ( net-libs/libpcap ) >=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=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
+EAPI=6
+HOMEPAGE=https://virtualsquare.org
+IUSE=pcap selinux static-libs
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
+SLOT=0
+SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9c9142d7cd5f62bd475599a3bc7dc6dc
diff --git a/metadata/md5-cache/net-misc/wput-0.6.1-r1 b/metadata/md5-cache/net-misc/wput-0.6.1-r1
deleted file mode 100644
index 53a5a1e35db0..000000000000
--- a/metadata/md5-cache/net-misc/wput-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure
-DEPEND=ssl? ( net-libs/gnutls )
-DESCRIPTION=Tiny program like wget to upload files/whole directories via FTP
-EAPI=7
-HOMEPAGE=http://wput.sourceforge.net/
-IUSE=debug nls ssl
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( net-libs/gnutls )
-SLOT=0
-SRC_URI=mirror://sourceforge/wput/wput-0.6.1.tgz
-_md5_=5ae9b39852aa3dca358d80b00eee08ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.02.22 b/metadata/md5-cache/net-misc/youtube-dl-2021.02.22
deleted file mode 100644
index 8104c7ee7335..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.02.22
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2021.02.22/youtube-dl-2021.02.22.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=234f63bd8cbe77b397427e8b419b526d
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.03.02 b/metadata/md5-cache/net-misc/youtube-dl-2021.03.02
deleted file mode 100644
index fe273fe51819..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.03.02
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2021.03.02/youtube-dl-2021.03.02.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cc95c71e844e48d535656efa37e27495
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.03.03 b/metadata/md5-cache/net-misc/youtube-dl-2021.03.03
index 664ec52b8ede..b301f2f8b07c 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.03.03
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.03.03
@@ -4,7 +4,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2021.03.03/youtube-dl-2021.03.03.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cc95c71e844e48d535656efa37e27495
+_md5_=234f63bd8cbe77b397427e8b419b526d
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.03.14 b/metadata/md5-cache/net-misc/youtube-dl-2021.03.14
new file mode 100644
index 000000000000..46a9e632e47c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.03.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2021.03.14/youtube-dl-2021.03.14.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cc95c71e844e48d535656efa37e27495
diff --git a/metadata/md5-cache/net-misc/zerotier-1.4.6 b/metadata/md5-cache/net-misc/zerotier-1.4.6
deleted file mode 100644
index aa3ce390dd01..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* ) !!sys-devel/llvm:0
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=7
-HOMEPAGE=https://www.zerotier.com/
-IUSE=clang neon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSL-1.1
-RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.4.6.tar.gz -> zerotier-1.4.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=310dcc98c6e74c99250f232bfd6e0d22
diff --git a/metadata/md5-cache/net-misc/zerotier-1.6.2 b/metadata/md5-cache/net-misc/zerotier-1.6.2
deleted file mode 100644
index cd46c3bb3293..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* ) !!sys-devel/llvm:0
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=7
-HOMEPAGE=https://www.zerotier.com/
-IUSE=clang neon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSL-1.1
-RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.6.2.tar.gz -> zerotier-1.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=40b01ba557fe4a9f8f01b73b1d9310d0
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index dced1dbfe43d..040c8712b265 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.58 b/metadata/md5-cache/net-nds/openldap-2.4.58
new file mode 100644
index 000000000000..9eef1276d0d2
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.58
@@ -0,0 +1,16 @@
+BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) >=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-libs/libressl:0 ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=7
+HOMEPAGE=https://www.OpenLDAP.org/
+IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP GPL-2
+RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
+REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.58.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.58.tgz mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b8d76dc857153b5ca4d0fc076a83d315
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 536df2cad91c..549a02f1d1f9 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/rssguard-3.5.9-r1 b/metadata/md5-cache/net-news/rssguard-3.5.9-r1
deleted file mode 100644
index 6259001b9b42..000000000000
--- a/metadata/md5-cache/net-news/rssguard-3.5.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] )
-DESCRIPTION=Tiny RSS and Atom feed reader
-EAPI=7
-HOMEPAGE=https://github.com/martinrotter/rssguard
-IUSE=debug webengine
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] )
-SLOT=0
-SRC_URI=https://github.com/martinrotter/rssguard/archive/3.5.9.tar.gz -> rssguard-3.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e71053f862a5fd2cc27ac79451dba2fe
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index ec0f842a2883..c5ec2cd83171 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/deluge-2.0.3-r4 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
deleted file mode 100644
index 5f71c1658816..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface +python_single_target_python3_7
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_7 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=129efc7756d883d6cdb3bbd29279e721
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r5 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
deleted file mode 100644
index d6b303649bec..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bc3b4042b4ff1ecd2d0f49c8cc7940fd
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r6 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r6
deleted file mode 100644
index e84276d03a21..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a78e17abb451c351431d5f916cf7290
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r7 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
deleted file mode 100644
index 2d24439a2cc8..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1e8b440bbb7f054aee6a30705717367c
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
index cc831c87e4f2..5b12c7d31f06 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
@@ -12,4 +12,4 @@ REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? (
 SLOT=0
 SRC_URI=mirror://sourceforge/project/eiskaltdcpp/Sources/eiskaltdcpp-2.4.2.tar.xz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a90ebd385880123d640407b2f99d8d10
+_md5_=455cc9ba2e1016d4245bf943bb59ea4f
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index de051aed3709..c29e85b6770a 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/l
 REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8f3bb49606325024147c4fe14ae2d23
+_md5_=a3d586f3ec984d6a9d3d00af7955a52e
diff --git a/metadata/md5-cache/net-p2p/go-ethereum-1.10.0 b/metadata/md5-cache/net-p2p/go-ethereum-1.10.0
deleted file mode 100644
index 109938693280..000000000000
--- a/metadata/md5-cache/net-p2p/go-ethereum-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Official golang implementation of the Ethereum protocol
-EAPI=7
-HOMEPAGE=https://github.com/ethereum/go-ethereum
-IUSE=devtools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ LGPL-3+
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/ethereum/go-ethereum/archive/v1.10.0.tar.gz -> go-ethereum-1.10.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.43.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.43.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/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/bigtable/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.2.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/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/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//collectd.org/@v/v0.3.0.mod -> collectd.org%2F@v%2Fv0.3.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-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-storage-blob-go/@v/v0.7.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.7.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.zip 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/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!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/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!victoria!metrics/fastcache/@v/v1.5.7.zip -> github.com%2F!victoria!metrics%2Ffastcache%2F@v%2Fv1.5.7.zip mirror://goproxy//github.com/!victoria!metrics/fastcache/@v/v1.5.7.mod -> github.com%2F!victoria!metrics%2Ffastcache%2F@v%2Fv1.5.7.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/allegro/bigcache/@v/v1.2.1-0.20190218064605-e24eb225f156.zip -> github.com%2Fallegro%2Fbigcache%2F@v%2Fv1.2.1-0.20190218064605-e24eb225f156.zip mirror://goproxy//github.com/allegro/bigcache/@v/v1.2.1-0.20190218064605-e24eb225f156.mod -> github.com%2Fallegro%2Fbigcache%2F@v%2Fv1.2.1-0.20190218064605-e24eb225f156.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20191024131854-af6fa24be0db.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod mirror://goproxy//github.com/aristanetworks/goarista/@v/v0.0.0-20170210015632-ea17b1a17847.mod -> github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20170210015632-ea17b1a17847.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/aws/aws-sdk-go/@v/v1.25.48.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.48.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.48.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.48.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/bmizerany/pat/@v/v0.0.0-20170815010413-6226ea591a40.mod -> github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20171128150713-2e60448ffcc6.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20171128150713-2e60448ffcc6.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.2.mod -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/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/cp/@v/v0.1.0.zip -> github.com%2Fcespare%2Fcp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/cespare/cp/@v/v0.1.0.mod -> github.com%2Fcespare%2Fcp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2-0.20190916151808-a80f83b9add9.zip -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2-0.20190916151808-a80f83b9add9.zip mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2-0.20190916151808-a80f83b9add9.mod -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2-0.20190916151808-a80f83b9add9.mod mirror://goproxy//github.com/consensys/bavard/@v/v0.1.8-0.20210105233146-c16790d2aa8b.mod -> github.com%2Fconsensys%2Fbavard%2F@v%2Fv0.1.8-0.20210105233146-c16790d2aa8b.mod mirror://goproxy//github.com/consensys/goff/@v/v0.3.10.mod -> github.com%2Fconsensys%2Fgoff%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/consensys/gurvy/@v/v0.3.8.zip -> github.com%2Fconsensys%2Fgurvy%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/consensys/gurvy/@v/v0.3.8.mod -> github.com%2Fconsensys%2Fgurvy%2F@v%2Fv0.3.8.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-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/dave/jennifer/@v/v1.2.0.mod -> github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/deckarep/golang-set/@v/v0.0.0-20180603214616-504e848d77ea.zip -> github.com%2Fdeckarep%2Fgolang-set%2F@v%2Fv0.0.0-20180603214616-504e848d77ea.zip mirror://goproxy//github.com/deckarep/golang-set/@v/v0.0.0-20180603214616-504e848d77ea.mod -> github.com%2Fdeckarep%2Fgolang-set%2F@v%2Fv0.0.0-20180603214616-504e848d77ea.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-bitstream/@v/v0.0.0-20180413035011-3522498ce2c8.mod -> github.com%2Fdgryski%2Fgo-bitstream%2F@v%2Fv0.0.0-20180413035011-3522498ce2c8.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20180625184442-8e610b2b55bf.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20180625184442-8e610b2b55bf.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.mod mirror://goproxy//github.com/dop251/goja/@v/v0.0.0-20200721192441-a695b0cdd498.zip -> github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200721192441-a695b0cdd498.zip mirror://goproxy//github.com/dop251/goja/@v/v0.0.0-20200721192441-a695b0cdd498.mod -> github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200721192441-a695b0cdd498.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20200318091601-be3528f3a813.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20200318091601-be3528f3a813.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v0.0.0-20160512033002-935e0e8a636c.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv0.0.0-20160512033002-935e0e8a636c.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.zip -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/ethereum/go-ethereum/@v/v1.9.25.mod -> github.com%2Fethereum%2Fgo-ethereum%2F@v%2Fv1.9.25.mod mirror://goproxy//github.com/fatih/color/@v/v1.3.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fjl/memsize/@v/v0.0.0-20180418122429-ca190fb6ffbc.mod -> github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20180418122429-ca190fb6ffbc.mod mirror://goproxy//github.com/fjl/memsize/@v/v0.0.0-20190710130421-bcb5799ab5e5.zip -> github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20190710130421-bcb5799ab5e5.zip mirror://goproxy//github.com/fjl/memsize/@v/v0.0.0-20190710130421-bcb5799ab5e5.mod -> github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20190710130421-bcb5799ab5e5.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/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/gballet/go-libpcsclite/@v/v0.0.0-20190607065134-2772fd86a8ff.zip -> github.com%2Fgballet%2Fgo-libpcsclite%2F@v%2Fv0.0.0-20190607065134-2772fd86a8ff.zip mirror://goproxy//github.com/gballet/go-libpcsclite/@v/v0.0.0-20190607065134-2772fd86a8ff.mod -> github.com%2Fgballet%2Fgo-libpcsclite%2F@v%2Fv0.0.0-20190607065134-2772fd86a8ff.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/glycerine/go-unsnap-stream/@v/v0.0.0-20180323001048-9f0cb55181dd.mod -> github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod mirror://goproxy//github.com/glycerine/goconvey/@v/v0.0.0-20190410193231-58a59202ab31.mod -> github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20190410193231-58a59202ab31.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/geo/@v/v0.0.0-20190916061304-5b978397cfec.mod -> github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3-0.20201103224600-674baa8c7fc3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3-0.20201103224600-674baa8c7fc3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3-0.20201103224600-674baa8c7fc3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3-0.20201103224600-674baa8c7fc3.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/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.1-0.20200604201612-c04b05f3adfa.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.1-0.20200604201612-c04b05f3adfa.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.1-0.20200604201612-c04b05f3adfa.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.1-0.20200604201612-c04b05f3adfa.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.5.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.5.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1-0.20190629185528-ae1634f6a989.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1-0.20190629185528-ae1634f6a989.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20191115155744-f33e81362277.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20191115155744-f33e81362277.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20201113091052-beb923fada29.zip -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20201113091052-beb923fada29.zip mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20201113091052-beb923fada29.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20201113091052-beb923fada29.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.5-0.20210104140557-80c98217689d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.5-0.20210104140557-80c98217689d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.5-0.20210104140557-80c98217689d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.5-0.20210104140557-80c98217689d.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/holiman/bloomfilter/v2/@v/v2.0.3.zip -> github.com%2Fholiman%2Fbloomfilter%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/holiman/bloomfilter/v2/@v/v2.0.3.mod -> github.com%2Fholiman%2Fbloomfilter%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/holiman/uint256/@v/v1.1.1.zip -> github.com%2Fholiman%2Fuint256%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/holiman/uint256/@v/v1.1.1.mod -> github.com%2Fholiman%2Fuint256%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.1-0.20200620063722-49508fba0031.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.1-0.20200620063722-49508fba0031.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.1-0.20200620063722-49508fba0031.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.1-0.20200620063722-49508fba0031.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/flux/@v/v0.65.1.mod -> github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.1.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.2.3-0.20180221223340-01288bdb0883.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.2.3-0.20180221223340-01288bdb0883.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.8.3.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.3.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v1.8.3.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/influxdata/influxql/@v/v1.1.1-0.20200828144457-65d3ef77d385.mod -> github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20200828144457-65d3ef77d385.mod mirror://goproxy//github.com/influxdata/line-protocol/@v/v0.0.0-20180522152040-32c6aa80de5e.mod -> github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod mirror://goproxy//github.com/influxdata/promql/v2/@v/v2.12.0.mod -> github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod mirror://goproxy//github.com/influxdata/roaring/@v/v0.4.13-0.20180809181101-fc520f41fab6.mod -> github.com%2Finfluxdata%2Froaring%2F@v%2Fv0.4.13-0.20180809181101-fc520f41fab6.mod mirror://goproxy//github.com/influxdata/tdigest/@v/v0.0.0-20181121200506-bf2b5ad3c0a9.mod -> github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod mirror://goproxy//github.com/influxdata/usage-client/@v/v0.0.0-20160829180054-6d3895376368.mod -> github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2-0.20160603034137-1fa385a6f458.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2-0.20160603034137-1fa385a6f458.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2-0.20160603034137-1fa385a6f458.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2-0.20160603034137-1fa385a6f458.mod mirror://goproxy//github.com/jedisct1/go-minisign/@v/v0.0.0-20190909160543-45766022959e.zip -> github.com%2Fjedisct1%2Fgo-minisign%2F@v%2Fv0.0.0-20190909160543-45766022959e.zip mirror://goproxy//github.com/jedisct1/go-minisign/@v/v0.0.0-20190909160543-45766022959e.mod -> github.com%2Fjedisct1%2Fgo-minisign%2F@v%2Fv0.0.0-20190909160543-45766022959e.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.0.0.mod -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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.1.1-0.20170430222011-975b5c4c7c21.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.1-0.20170430222011-975b5c4c7c21.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/jwilder/encoding/@v/v0.0.0-20170811194829-b4e1701a28ef.mod -> github.com%2Fjwilder%2Fencoding%2F@v%2Fv0.0.0-20170811194829-b4e1701a28ef.mod mirror://goproxy//github.com/karalabe/usb/@v/v0.0.0-20190919080040-51dc0efba356.zip -> github.com%2Fkaralabe%2Fusb%2F@v%2Fv0.0.0-20190919080040-51dc0efba356.zip mirror://goproxy//github.com/karalabe/usb/@v/v0.0.0-20190919080040-51dc0efba356.mod -> github.com%2Fkaralabe%2Fusb%2F@v%2Fv0.0.0-20190919080040-51dc0efba356.mod mirror://goproxy//github.com/kilic/bls12-381/@v/v0.0.0-20201226121925-69dacb279461.mod -> github.com%2Fkilic%2Fbls12-381%2F@v%2Fv0.0.0-20201226121925-69dacb279461.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20170728055534-ae7887de9fa5.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20170728055534-ae7887de9fa5.mod mirror://goproxy//github.com/klauspost/crc32/@v/v0.0.0-20161016154125-cb6bfca970f6.mod -> github.com%2Fklauspost%2Fcrc32%2F@v%2Fv0.0.0-20161016154125-cb6bfca970f6.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.0.2-0.20170402124221-0bf5dcad4ada.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.0.2-0.20170402124221-0bf5dcad4ada.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/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/leanovate/gopter/@v/v0.2.8.mod -> github.com%2Fleanovate%2Fgopter%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/leanovate/gopter/@v/v0.2.9.zip -> github.com%2Fleanovate%2Fgopter%2F@v%2Fv0.2.9.zip mirror://goproxy//github.com/leanovate/gopter/@v/v0.2.9.mod -> github.com%2Fleanovate%2Fgopter%2F@v%2Fv0.2.9.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/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.0.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.0.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.0.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.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5-0.20180830101745-3fb116b82035.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5-0.20180830101745-3fb116b82035.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5-0.20180830101745-3fb116b82035.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5-0.20180830101745-3fb116b82035.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.11.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.0-20180907095812-13ff1204f104.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mschoch/smat/@v/v0.0.0-20160514031455-90eadee771ae.mod -> github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.zip -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.2-0.20170918210437-9fafd6967416.zip -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.2-0.20170918210437-9fafd6967416.zip mirror://goproxy//github.com/naoina/toml/@v/v0.1.2-0.20170918210437-9fafd6967416.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.2-0.20170918210437-9fafd6967416.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.1.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2-0.20190409134802-7e037d187b0c.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2-0.20190409134802-7e037d187b0c.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2-0.20190409134802-7e037d187b0c.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2-0.20190409134802-7e037d187b0c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.3-0.20180606204148-bd9c31933947.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.3-0.20180606204148-bd9c31933947.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/paulbellamy/ratecounter/@v/v0.2.0.mod -> github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v0.0.0-20170112150404-1b00554d8222.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20170112150404-1b00554d8222.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterh/liner/@v/v1.0.1-0.20180619022028-8c1271fcf47f.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod mirror://goproxy//github.com/peterh/liner/@v/v1.1.1-0.20190123174540-a2c9a5303de7.zip -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.1.1-0.20190123174540-a2c9a5303de7.zip mirror://goproxy//github.com/peterh/liner/@v/v1.1.1-0.20190123174540-a2c9a5303de7.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.1.1-0.20190123174540-a2c9a5303de7.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20180730021639-bffc007b7fd5.mod -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20180730021639-bffc007b7fd5.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_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/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.6.2-0.20190402121629-4f204dcbc150.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.6.2-0.20190402121629-4f204dcbc150.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.zip -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/retailnext/hllpp/@v/v1.0.1-0.20180308014038-101a6d2f8b52.mod -> github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.1.zip -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.1.mod -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.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/rs/cors/@v/v0.0.0-20160617231935-a62a804a8a00.mod -> github.com%2Frs%2Fcors%2F@v%2Fv0.0.0-20160617231935-a62a804a8a00.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/rs/xhandler/@v/v0.0.0-20160618193221-ed27b6fd6521.mod -> github.com%2Frs%2Fxhandler%2F@v%2Fv0.0.0-20160618193221-ed27b6fd6521.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/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.1.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.2.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/status-im/keycard-go/@v/v0.0.0-20190316090335-8537d3370df4.zip -> github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.zip mirror://goproxy//github.com/status-im/keycard-go/@v/v0.0.0-20190316090335-8537d3370df4.mod -> github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.mod mirror://goproxy//github.com/steakknife/bloomfilter/@v/v0.0.0-20180922174646-6819c0d2a570.mod -> github.com%2Fsteakknife%2Fbloomfilter%2F@v%2Fv0.0.0-20180922174646-6819c0d2a570.mod mirror://goproxy//github.com/steakknife/hamming/@v/v0.0.0-20180906055917-c99c65617cd3.mod -> github.com%2Fsteakknife%2Fhamming%2F@v%2Fv0.0.0-20180906055917-c99c65617cd3.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.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815110645-5c35d600f0ca.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815110645-5c35d600f0ca.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815110645-5c35d600f0ca.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815110645-5c35d600f0ca.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.0.2.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tyler-smith/go-bip39/@v/v1.0.1-0.20181017060643-dbb3b84ba2ef.zip -> github.com%2Ftyler-smith%2Fgo-bip39%2F@v%2Fv1.0.1-0.20181017060643-dbb3b84ba2ef.zip mirror://goproxy//github.com/tyler-smith/go-bip39/@v/v1.0.1-0.20181017060643-dbb3b84ba2ef.mod -> github.com%2Ftyler-smith%2Fgo-bip39%2F@v%2Fv1.0.1-0.20181017060643-dbb3b84ba2ef.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/willf/bitset/@v/v1.1.3.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/wsddn/go-ecdh/@v/v0.0.0-20161211032359-48726bab9208.mod -> github.com%2Fwsddn%2Fgo-ecdh%2F@v%2Fv0.0.0-20161211032359-48726bab9208.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20180616005107-d6fb6747feb6.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.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-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190909091759-094676da4a83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190909091759-094676da4a83.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.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-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20200801112145-973feb4309de.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20200801112145-973feb4309de.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.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-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-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-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-20200107162124-548cf772de50.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200824131525-c12d262b63d8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200824131525-c12d262b63d8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210105210732-16f7687f5001.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-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-20200108203644-89082a384178.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200108203644-89082a384178.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20181121035319-3f7ecaa7e8ca.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.0.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20181029234149-ec6d1f5cefe6.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/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/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-20190716160619-c506a9f90610.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200108215221-bd8f9a0ef82f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200108215221-bd8f9a0ef82f.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/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.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/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/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.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/olebedev/go-duktape.v3/@v/v3.0.0-20200619000410-60c24ae608a6.zip -> gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200619000410-60c24ae608a6.zip mirror://goproxy//gopkg.in/olebedev/go-duktape.v3/@v/v3.0.0-20200619000410-60c24ae608a6.mod -> gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200619000410-60c24ae608a6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/urfave/cli.v1/@v/v1.20.0.zip -> gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.zip mirror://goproxy//gopkg.in/urfave/cli.v1/@v/v1.20.0.mod -> gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.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.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//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//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=e8cd340c73efa1f27bff5837fe3df6ef
diff --git a/metadata/md5-cache/net-p2p/go-ethereum-1.9.15 b/metadata/md5-cache/net-p2p/go-ethereum-1.9.15
deleted file mode 100644
index 4199a482c6f8..000000000000
--- a/metadata/md5-cache/net-p2p/go-ethereum-1.9.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Official golang implementation of the Ethereum protocol
-EAPI=7
-HOMEPAGE=https://github.com/ethereum/go-ethereum
-IUSE=devtools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ LGPL-3+
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/ethereum/go-ethereum/archive/v1.9.15.tar.gz -> go-ethereum-1.9.15.tar.gz 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-storage-blob-go/@v/v0.7.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.7.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.zip 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/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!victoria!metrics/fastcache/@v/v1.5.7.zip -> github.com%2F!victoria!metrics%2Ffastcache%2F@v%2Fv1.5.7.zip mirror://goproxy//github.com/!victoria!metrics/fastcache/@v/v1.5.7.mod -> github.com%2F!victoria!metrics%2Ffastcache%2F@v%2Fv1.5.7.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/allegro/bigcache/@v/v1.2.1-0.20190218064605-e24eb225f156.zip -> github.com%2Fallegro%2Fbigcache%2F@v%2Fv1.2.1-0.20190218064605-e24eb225f156.zip mirror://goproxy//github.com/allegro/bigcache/@v/v1.2.1-0.20190218064605-e24eb225f156.mod -> github.com%2Fallegro%2Fbigcache%2F@v%2Fv1.2.1-0.20190218064605-e24eb225f156.mod mirror://goproxy//github.com/aristanetworks/goarista/@v/v0.0.0-20170210015632-ea17b1a17847.zip -> github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20170210015632-ea17b1a17847.zip mirror://goproxy//github.com/aristanetworks/goarista/@v/v0.0.0-20170210015632-ea17b1a17847.mod -> github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20170210015632-ea17b1a17847.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.48.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.48.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.48.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.48.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/btcsuite/btcd/@v/v0.0.0-20171128150713-2e60448ffcc6.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20171128150713-2e60448ffcc6.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20171128150713-2e60448ffcc6.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20171128150713-2e60448ffcc6.mod mirror://goproxy//github.com/cespare/cp/@v/v0.1.0.zip -> github.com%2Fcespare%2Fcp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/cespare/cp/@v/v0.1.0.mod -> github.com%2Fcespare%2Fcp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2-0.20190916151808-a80f83b9add9.zip -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2-0.20190916151808-a80f83b9add9.zip mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2-0.20190916151808-a80f83b9add9.mod -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2-0.20190916151808-a80f83b9add9.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/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/deckarep/golang-set/@v/v0.0.0-20180603214616-504e848d77ea.zip -> github.com%2Fdeckarep%2Fgolang-set%2F@v%2Fv0.0.0-20180603214616-504e848d77ea.zip mirror://goproxy//github.com/deckarep/golang-set/@v/v0.0.0-20180603214616-504e848d77ea.mod -> github.com%2Fdeckarep%2Fgolang-set%2F@v%2Fv0.0.0-20180603214616-504e848d77ea.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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20180625184442-8e610b2b55bf.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20180625184442-8e610b2b55bf.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.mod mirror://goproxy//github.com/dop251/goja/@v/v0.0.0-20200219165308-d1232e640a87.zip -> github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200219165308-d1232e640a87.zip mirror://goproxy//github.com/dop251/goja/@v/v0.0.0-20200219165308-d1232e640a87.mod -> github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200219165308-d1232e640a87.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v0.0.0-20160512033002-935e0e8a636c.zip -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv0.0.0-20160512033002-935e0e8a636c.zip mirror://goproxy//github.com/edsrzf/mmap-go/@v/v0.0.0-20160512033002-935e0e8a636c.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv0.0.0-20160512033002-935e0e8a636c.mod mirror://goproxy//github.com/fatih/color/@v/v1.3.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.3.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/fjl/memsize/@v/v0.0.0-20180418122429-ca190fb6ffbc.zip -> github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20180418122429-ca190fb6ffbc.zip mirror://goproxy//github.com/fjl/memsize/@v/v0.0.0-20180418122429-ca190fb6ffbc.mod -> github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20180418122429-ca190fb6ffbc.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gballet/go-libpcsclite/@v/v0.0.0-20190607065134-2772fd86a8ff.zip -> github.com%2Fgballet%2Fgo-libpcsclite%2F@v%2Fv0.0.0-20190607065134-2772fd86a8ff.zip mirror://goproxy//github.com/gballet/go-libpcsclite/@v/v0.0.0-20190607065134-2772fd86a8ff.mod -> github.com%2Fgballet%2Fgo-libpcsclite%2F@v%2Fv0.0.0-20190607065134-2772fd86a8ff.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.zip 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-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2-0.20190517061210-b285ee9cfc6c.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2-0.20190517061210-b285ee9cfc6c.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2-0.20190517061210-b285ee9cfc6c.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2-0.20190517061210-b285ee9cfc6c.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1-0.20190629185528-ae1634f6a989.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1-0.20190629185528-ae1634f6a989.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1-0.20190629185528-ae1634f6a989.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1-0.20190629185528-ae1634f6a989.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20191115155744-f33e81362277.zip -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20191115155744-f33e81362277.zip mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20191115155744-f33e81362277.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20191115155744-f33e81362277.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.2.3-0.20180221223340-01288bdb0883.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.2.3-0.20180221223340-01288bdb0883.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v1.2.3-0.20180221223340-01288bdb0883.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.2.3-0.20180221223340-01288bdb0883.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2-0.20160603034137-1fa385a6f458.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2-0.20160603034137-1fa385a6f458.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2-0.20160603034137-1fa385a6f458.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2-0.20160603034137-1fa385a6f458.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.1.1-0.20170430222011-975b5c4c7c21.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.1-0.20170430222011-975b5c4c7c21.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.1.1-0.20170430222011-975b5c4c7c21.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.1-0.20170430222011-975b5c4c7c21.mod mirror://goproxy//github.com/karalabe/usb/@v/v0.0.0-20190919080040-51dc0efba356.zip -> github.com%2Fkaralabe%2Fusb%2F@v%2Fv0.0.0-20190919080040-51dc0efba356.zip mirror://goproxy//github.com/karalabe/usb/@v/v0.0.0-20190919080040-51dc0efba356.mod -> github.com%2Fkaralabe%2Fusb%2F@v%2Fv0.0.0-20190919080040-51dc0efba356.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/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/mattn/go-colorable/@v/v0.1.0.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.0.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.0.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.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5-0.20180830101745-3fb116b82035.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5-0.20180830101745-3fb116b82035.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5-0.20180830101745-3fb116b82035.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5-0.20180830101745-3fb116b82035.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/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/naoina/go-stringutil/@v/v0.1.0.zip -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.2-0.20170918210437-9fafd6967416.zip -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.2-0.20170918210437-9fafd6967416.zip mirror://goproxy//github.com/naoina/toml/@v/v0.1.2-0.20170918210437-9fafd6967416.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.2-0.20170918210437-9fafd6967416.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.1.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2-0.20190409134802-7e037d187b0c.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2-0.20190409134802-7e037d187b0c.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2-0.20190409134802-7e037d187b0c.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2-0.20190409134802-7e037d187b0c.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.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip 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.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v0.0.0-20170112150404-1b00554d8222.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20170112150404-1b00554d8222.zip mirror://goproxy//github.com/pborman/uuid/@v/v0.0.0-20170112150404-1b00554d8222.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20170112150404-1b00554d8222.mod mirror://goproxy//github.com/peterh/liner/@v/v1.1.1-0.20190123174540-a2c9a5303de7.zip -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.1.1-0.20190123174540-a2c9a5303de7.zip mirror://goproxy//github.com/peterh/liner/@v/v1.1.1-0.20190123174540-a2c9a5303de7.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.1.1-0.20190123174540-a2c9a5303de7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.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/tsdb/@v/v0.6.2-0.20190402121629-4f204dcbc150.zip -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.6.2-0.20190402121629-4f204dcbc150.zip mirror://goproxy//github.com/prometheus/tsdb/@v/v0.6.2-0.20190402121629-4f204dcbc150.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.6.2-0.20190402121629-4f204dcbc150.mod mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.1.zip -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.1.mod -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/rs/cors/@v/v0.0.0-20160617231935-a62a804a8a00.zip -> github.com%2Frs%2Fcors%2F@v%2Fv0.0.0-20160617231935-a62a804a8a00.zip mirror://goproxy//github.com/rs/cors/@v/v0.0.0-20160617231935-a62a804a8a00.mod -> github.com%2Frs%2Fcors%2F@v%2Fv0.0.0-20160617231935-a62a804a8a00.mod mirror://goproxy//github.com/rs/xhandler/@v/v0.0.0-20160618193221-ed27b6fd6521.zip -> github.com%2Frs%2Fxhandler%2F@v%2Fv0.0.0-20160618193221-ed27b6fd6521.zip mirror://goproxy//github.com/rs/xhandler/@v/v0.0.0-20160618193221-ed27b6fd6521.mod -> github.com%2Frs%2Fxhandler%2F@v%2Fv0.0.0-20160618193221-ed27b6fd6521.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/shirou/gopsutil/@v/v2.20.5-0.20200531151128-663af789c085+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5-0.20200531151128-663af789c085+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.5-0.20200531151128-663af789c085+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5-0.20200531151128-663af789c085+incompatible.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/status-im/keycard-go/@v/v0.0.0-20190316090335-8537d3370df4.zip -> github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.zip mirror://goproxy//github.com/status-im/keycard-go/@v/v0.0.0-20190316090335-8537d3370df4.mod -> github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.mod mirror://goproxy//github.com/steakknife/bloomfilter/@v/v0.0.0-20180922174646-6819c0d2a570.zip -> github.com%2Fsteakknife%2Fbloomfilter%2F@v%2Fv0.0.0-20180922174646-6819c0d2a570.zip mirror://goproxy//github.com/steakknife/bloomfilter/@v/v0.0.0-20180922174646-6819c0d2a570.mod -> github.com%2Fsteakknife%2Fbloomfilter%2F@v%2Fv0.0.0-20180922174646-6819c0d2a570.mod mirror://goproxy//github.com/steakknife/hamming/@v/v0.0.0-20180906055917-c99c65617cd3.zip -> github.com%2Fsteakknife%2Fhamming%2F@v%2Fv0.0.0-20180906055917-c99c65617cd3.zip mirror://goproxy//github.com/steakknife/hamming/@v/v0.0.0-20180906055917-c99c65617cd3.mod -> github.com%2Fsteakknife%2Fhamming%2F@v%2Fv0.0.0-20180906055917-c99c65617cd3.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.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/syndtr/goleveldb/@v/v1.0.1-0.20190923125748-758128399b1d.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20190923125748-758128399b1d.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.mod mirror://goproxy//github.com/tyler-smith/go-bip39/@v/v1.0.1-0.20181017060643-dbb3b84ba2ef.zip -> github.com%2Ftyler-smith%2Fgo-bip39%2F@v%2Fv1.0.1-0.20181017060643-dbb3b84ba2ef.zip mirror://goproxy//github.com/tyler-smith/go-bip39/@v/v1.0.1-0.20181017060643-dbb3b84ba2ef.mod -> github.com%2Ftyler-smith%2Fgo-bip39%2F@v%2Fv1.0.1-0.20181017060643-dbb3b84ba2ef.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/wsddn/go-ecdh/@v/v0.0.0-20161211032359-48726bab9208.zip -> github.com%2Fwsddn%2Fgo-ecdh%2F@v%2Fv0.0.0-20161211032359-48726bab9208.zip mirror://goproxy//github.com/wsddn/go-ecdh/@v/v0.0.0-20161211032359-48726bab9208.mod -> github.com%2Fwsddn%2Fgo-ecdh%2F@v%2Fv0.0.0-20161211032359-48726bab9208.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-20200311171314-f7b00557c8c4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200311171314-f7b00557c8c4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200311171314-f7b00557c8c4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200311171314-f7b00557c8c4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200425230154-ff2c4b7c35a0.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200425230154-ff2c4b7c35a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/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-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/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/olebedev/go-duktape.v3/@v/v3.0.0-20200603215123-a4a8cb9d2cbc.zip -> gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200603215123-a4a8cb9d2cbc.zip mirror://goproxy//gopkg.in/olebedev/go-duktape.v3/@v/v3.0.0-20200603215123-a4a8cb9d2cbc.mod -> gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200603215123-a4a8cb9d2cbc.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/urfave/cli.v1/@v/v1.20.0.zip -> gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.zip mirror://goproxy//gopkg.in/urfave/cli.v1/@v/v1.20.0.mod -> gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=c7a5946ee8191c5459d366f46997cf22
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.13.1 b/metadata/md5-cache/net-p2p/syncthing-1.13.1
index b9fc3e382d79..b21d69324516 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.13.1
+++ b/metadata/md5-cache/net-p2p/syncthing-1.13.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=7
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense
 RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( acct-group/stdiscosrv acct-group/strelaysrv acct-user/stdiscosrv acct-user/strelaysrv ) selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.13.1.tar.gz -> syncthing-1.13.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.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!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/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/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/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.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/ccding/go-stun/@v/v0.1.2.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.2.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.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/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.zip -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.mod -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.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/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/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/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.zip -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.mod -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.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/dchest/siphash/@v/v1.2.2.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.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.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-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.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.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.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/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/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/greatroar/blobloom/@v/v0.5.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.5.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.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.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.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/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/jackpal/gateway/@v/v1.0.6.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/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.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/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/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/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/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/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.zip -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.zip mirror://goproxy//github.com/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.mod -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-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.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/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/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/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/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.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/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.8.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.14.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.14.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/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/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/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/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.11.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.11.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.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/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.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.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20201210100135-17de26665ddc.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20201210100135-17de26665ddc.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.0.zip -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.0.mod -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.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.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.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//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-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-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.zip 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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/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-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201015000850-e3ed0017c211.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201015000850-e3ed0017c211.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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.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.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.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.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-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//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef0a957b92b6727fa639d4b27436a73
+_md5_=94749106ca3cd7889595f494ee19b1db
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 12f44300fb53..161b5ffae929 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/cndrvcups-common-lb-3.60-r1 b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
deleted file mode 100644
index 59df6a78dc73..000000000000
--- a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=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 setup unpack
-DESCRIPTION=Common files for Canon drivers
-EAPI=7
-HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
-KEYWORDS=-* amd64 x86
-LICENSE=Canon-UFR-II GPL-2 MIT
-RDEPEND=>=dev-libs/libxml2-2.6:2 >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=13a3f9e63b47f7de73bcf3cb4acf96a8
diff --git a/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2 b/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
deleted file mode 100644
index 2aeac3a36ecb..000000000000
--- a/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup unpack
-DESCRIPTION=Canon UFR II / LIPSLX Printer Driver for Linux
-EAPI=7
-HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
-KEYWORDS=-* amd64 x86
-LICENSE=Canon-UFR-II
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 ~net-print/cndrvcups-common-lb-3.60 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cd211793ed2822c5361a0f197cb5652
diff --git a/metadata/md5-cache/net-print/cnrdrvcups-lb-5.30 b/metadata/md5-cache/net-print/cnrdrvcups-lb-5.30
new file mode 100644
index 000000000000..22a8294c2f6c
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnrdrvcups-lb-5.30
@@ -0,0 +1,13 @@
+BDEPEND=>=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 setup unpack
+DEPEND=dev-libs/libxml2:2 gnome-base/libglade:2.0 media-libs/jbigkit media-libs/libjpeg-turbo net-print/cups x11-libs/gtk+:2
+DESCRIPTION=Canon UFR II / LIPSLX Printer Driver for Linux
+EAPI=7
+HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Canon-UFR-II GPL-2 MIT
+RDEPEND=dev-libs/libxml2:2 gnome-base/libglade:2.0 media-libs/jbigkit media-libs/libjpeg-turbo net-print/cups x11-libs/gtk+:2 !net-print/cndrvcups-common-lb !net-print/cndrvcups-lb
+SLOT=0
+SRC_URI=https://gdlp01.c-wss.com/gds/8/0100007658/20/linux-UFRII-drv-v530-uken-12.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0b9ed9c3135a62815562d400d89b4852
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11 b/metadata/md5-cache/net-print/hplip-3.20.11
deleted file mode 100644
index a05fff030b10..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-1.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=fdd92e733ee11201ad515490b87feb6b
diff --git a/metadata/md5-cache/net-print/hplip-3.20.9-r3 b/metadata/md5-cache/net-print/hplip-3.20.9-r3
deleted file mode 100644
index db9c40d31a9a..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.9.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.9-patches-2.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=c27c41405e5af35aef3e4ff199da5424
diff --git a/metadata/md5-cache/net-print/hplip-3.21.2 b/metadata/md5-cache/net-print/hplip-3.21.2
index 01227da8de93..2089cf67ff4c 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.2
+++ b/metadata/md5-cache/net-print/hplip-3.21.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 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	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=1dad798d771cab201b07ce0f1e000de5
+_md5_=0d4b98ad5199bd2cec289ce9316bd0ce
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.9 b/metadata/md5-cache/net-print/hplip-plugin-3.20.9
deleted file mode 100644
index 7bc14fa8a7c9..000000000000
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Proprietary plugins and firmware for HPLIP
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
-IUSE=orblite
-KEYWORDS=amd64 arm x86
-LICENSE=hplip-plugin
-RDEPEND=~net-print/hplip-3.20.9 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.9-plugin.run
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=41fd29dd363e98f7ada70cce96ab4d40
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index dd5f146fb05d..2fd335675a5a 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.29 b/metadata/md5-cache/net-proxy/haproxy-1.8.29
new file mode 100644
index 000000000000..a783518e765e
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.29
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/1.8
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.29.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1aaedb1e137eb52dfcacab5a579fe21b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.21 b/metadata/md5-cache/net-proxy/haproxy-2.0.21
new file mode 100644
index 000000000000..70938a61341d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.21
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.0
+SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.21.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.12 b/metadata/md5-cache/net-proxy/haproxy-2.1.12
new file mode 100644
index 000000000000..f64f07ec6053
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.1
+SRC_URI=http://haproxy.1wt.eu/download/2.1/src/haproxy-2.1.12.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.11 b/metadata/md5-cache/net-proxy/haproxy-2.2.11
new file mode 100644
index 000000000000..147561edb5ba
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.11
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.2
+SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.11.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.8 b/metadata/md5-cache/net-proxy/haproxy-2.2.8
deleted file mode 100644
index 65fc25ab3ce6..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.2
-SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9 b/metadata/md5-cache/net-proxy/haproxy-2.2.9
deleted file mode 100644
index 735614237c91..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.2
-SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.4 b/metadata/md5-cache/net-proxy/haproxy-2.3.4
deleted file mode 100644
index f7363d249f7c..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.3
-SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a80f8ed18c39e498f257410da1db7a5
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.5 b/metadata/md5-cache/net-proxy/haproxy-2.3.5
deleted file mode 100644
index 5886bdccfa5c..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.3
-SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a80f8ed18c39e498f257410da1db7a5
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.7 b/metadata/md5-cache/net-proxy/haproxy-2.3.7
new file mode 100644
index 000000000000..3775f26e0af2
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.3
+SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.7.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6a80f8ed18c39e498f257410da1db7a5
diff --git a/metadata/md5-cache/net-proxy/squid-4.13-r1 b/metadata/md5-cache/net-proxy/squid-4.13-r1
index 0c05d4c86a33..52f1e8488692 100644
--- a/metadata/md5-cache/net-proxy/squid-4.13-r1
+++ b/metadata/md5-cache/net-proxy/squid-4.13-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=app-portage/elt-patches-20170815 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-lang/perl >=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 pretend setup
 DEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )
 DESCRIPTION=A full-featured web proxy cache
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.13.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b5a46c30bb70b6e9240acc1ad92b35d0
+_md5_=8012f9558e043ad4e380e8bbe14e7b47
diff --git a/metadata/md5-cache/net-proxy/squid-4.14 b/metadata/md5-cache/net-proxy/squid-4.14
index 24c81fd6ca5f..a55de7ebb89a 100644
--- a/metadata/md5-cache/net-proxy/squid-4.14
+++ b/metadata/md5-cache/net-proxy/squid-4.14
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=app-portage/elt-patches-20170815 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-lang/perl >=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 pretend setup
 DEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )
 DESCRIPTION=A full-featured web proxy cache
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.14.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e1dfa89adbd370e515fbde86e54c3cf
+_md5_=4ff8faba2f11931d4f931cdc553dff60
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 9e75478090d3..8d855d9d588d 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/fp-multiuser-0.0.2 b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
index c2ff6f1aa394..3fc02ee523a6 100644
--- a/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
+++ b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/gofrp/fp-multiuser/archive/v0.0.2.tar.gz -> fp-multiuser-0.0.2.tar.gz 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/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/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/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.zip -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.zip mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.mod -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.zip -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.zip -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.zip -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.mod -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.zip -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.mod -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.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/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.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/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/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.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/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/leodido/go-urn/@v/v1.1.0.zip -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/leodido/go-urn/@v/v1.1.0.mod -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/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/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/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/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/vaughan0/go-ini/@v/v0.0.0-20130923145212-a98ad7ee00ec.mod -> github.com%2Fvaughan0%2Fgo-ini%2F@v%2Fv0.0.0-20130923145212-a98ad7ee00ec.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.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-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.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-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-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-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.zip 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-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-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip 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/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.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.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.zip -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.zip 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.v9/@v/v9.29.1.zip -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.zip mirror://goproxy//gopkg.in/go-playground/validator.v9/@v/v9.29.1.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7dfd6bfa33a86111e94dc0f252330e02
+_md5_=e9ab573613125fd125f16a80d0b0a924
diff --git a/metadata/md5-cache/net-vpn/frp-0.36.0 b/metadata/md5-cache/net-vpn/frp-0.36.0
new file mode 100644
index 000000000000..8494926570a9
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/frp-0.36.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
+EAPI=7
+HOMEPAGE=https://github.com/fatedier/frp
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fatedier/frp/archive/v0.36.0.tar.gz -> frp-0.36.0.tar.gz 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/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/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/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/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/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/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/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.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.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/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/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.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.zip -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/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/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.zip -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.zip mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.zip -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.zip -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/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/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/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/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.zip -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.zip mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.zip -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.zip mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.zip -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.zip mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.zip -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.zip mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.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-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.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-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-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-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-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip 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/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.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-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/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.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d8d476aae80f5468c66321de267ca1ab
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.34.0 b/metadata/md5-cache/net-vpn/i2pd-2.34.0
deleted file mode 100644
index 4236008fee15..000000000000
--- a/metadata/md5-cache/net-vpn/i2pd-2.34.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc:= ) ) static? ( dev-libs/boost:=[static-libs,threads] sys-libs/zlib[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) upnp? ( net-libs/miniupnpc:=[static-libs] ) )
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=7
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc:= ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.34.0.tar.gz -> i2pd-2.34.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b32fbd0eff5b30690300ae3200f11299
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.35.0 b/metadata/md5-cache/net-vpn/i2pd-2.35.0
deleted file mode 100644
index 5e81b07a1b99..000000000000
--- a/metadata/md5-cache/net-vpn/i2pd-2.35.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc:= ) ) static? ( dev-libs/boost:=[static-libs,threads] sys-libs/zlib[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) upnp? ( net-libs/miniupnpc:=[static-libs] ) )
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=7
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc:= ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.35.0.tar.gz -> i2pd-2.35.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5de92eda0645865d74ec734a94ee3058
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
deleted file mode 100644
index eaa4d743705d..000000000000
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pythondialog:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-vpn/openvpn
-DESCRIPTION=A VPN command-line tool from protonvpn - python rewrite
-EAPI=7
-HOMEPAGE=https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-python/docopt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pythondialog:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-vpn/openvpn python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ProtonVPN/protonvpn-cli-ng/archive/v2.2.2.tar.gz -> protonvpn-cli-2.2.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=eb975be8c474c6a4c65e9a3760b21f32
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.4 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.4
deleted file mode 100644
index cd5d05ea10d3..000000000000
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pythondialog:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-vpn/openvpn
-DESCRIPTION=A VPN command-line tool from protonvpn - python rewrite
-EAPI=7
-HOMEPAGE=https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-python/docopt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pythondialog:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-vpn/openvpn python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ProtonVPN/linux-cli/archive/v2.2.4.tar.gz -> protonvpn-cli-2.2.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=46bf4e13f76b7357e396ba994720d755
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210315 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210315
new file mode 100644
index 000000000000..2c393daa541d
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210315
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
+EAPI=7
+HOMEPAGE=https://www.wireguard.com/
+IUSE=+wg-quick kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1adeb48ef3ff3d1a94e27147939737ff
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 15ca1346f7ba..36bec7e643a3 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/unifi-6.1.70 b/metadata/md5-cache/net-wireless/unifi-6.1.70
new file mode 100644
index 000000000000..d405854a01b5
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.1.70
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.1
+SRC_URI=https://dl.ui.com/unifi/6.1.70-fbf03b3a76/UniFi.unix.zip -> unifi-6.1.70.zip
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8ea41a844d389c968a28454acbef5aa5
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.8.0 b/metadata/md5-cache/net-wireless/wavemon-0.8.0
deleted file mode 100644
index 452ddb78c40d..000000000000
--- a/metadata/md5-cache/net-wireless/wavemon-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap ) virtual/pkgconfig >=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=Ncurses based monitor for IEEE 802.11 wireless LAN cards
-EAPI=6
-HOMEPAGE=https://github.com/uoaerg/wavemon/
-IUSE=caps
-KEYWORDS=amd64 arm ~hppa ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/uoaerg/wavemon/archive/v0.8.0.tar.gz -> wavemon-0.8.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18da3305dcace92ca169d1eba255569a
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.9.2 b/metadata/md5-cache/net-wireless/wavemon-0.9.2
deleted file mode 100644
index 8f17da2a61d1..000000000000
--- a/metadata/md5-cache/net-wireless/wavemon-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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 pretend setup
-DEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap )
-DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
-EAPI=7
-HOMEPAGE=https://github.com/uoaerg/wavemon/
-IUSE=caps kernel_linux
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/uoaerg/wavemon/archive/v0.9.2.tar.gz -> wavemon-0.9.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2881bd74ffcb75d20ebe998f8c429f5a
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 6579b729d3f6..98f704e53e65 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/bfast-0.7.0a b/metadata/md5-cache/sci-biology/bfast-0.7.0a
index cad457c7cbf6..8675ae17a047 100644
--- a/metadata/md5-cache/sci-biology/bfast-0.7.0a
+++ b/metadata/md5-cache/sci-biology/bfast-0.7.0a
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-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
 DESCRIPTION=Blat-like Fast Accurate Search Tool
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bfast/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/XML-Simple
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/bfast/bfast-0.7.0a.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f752137cf374be5cbb2754f3aa98ad0d
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e64abecddb86e9860edc80410f299d83
diff --git a/metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.660 b/metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.660
index 7254b9d9ce30..c746a37806ec 100644
--- a/metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.660
+++ b/metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Applications from the CBS group
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/CBSTOOLS-1.0.0.660.tar.gz -> embassy-cbstools-1.0.0.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4166ba28131fdf70907b31300aa4c08b
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=77305643fe2a87a5fac7d915688baa6a
diff --git a/metadata/md5-cache/sci-biology/embassy-clustalomega-1.1.0.660 b/metadata/md5-cache/sci-biology/embassy-clustalomega-1.1.0.660
index 6ef2680c8bae..62ce31f20e12 100644
--- a/metadata/md5-cache/sci-biology/embassy-clustalomega-1.1.0.660
+++ b/metadata/md5-cache/sci-biology/embassy-clustalomega-1.1.0.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Clustal Omega - Multiple Sequence Alignment
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=sci-biology/clustal-omega dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=sci-biology/clustal-omega dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/CLUSTALOMEGA-1.1.0.660.tar.gz -> embassy-clustalomega-1.1.0.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef491b452e56be12961f62b16961f4f1
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=58b5684a48770c482660c463cca0df76
diff --git a/metadata/md5-cache/sci-biology/embassy-domainatrix-0.1.660 b/metadata/md5-cache/sci-biology/embassy-domainatrix-0.1.660
index e1a4f9fc35ed..9520a262d9e1 100644
--- a/metadata/md5-cache/sci-biology/embassy-domainatrix-0.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-domainatrix-0.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Protein domain analysis add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/DOMAINATRIX-0.1.660.tar.gz -> embassy-domainatrix-0.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bfee4f5b2b2adadb41de2eb02d4dcbc0
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=20f6c7abf908473570516ff49847a320
diff --git a/metadata/md5-cache/sci-biology/embassy-domalign-0.1.660 b/metadata/md5-cache/sci-biology/embassy-domalign-0.1.660
index b741d1b8293d..383289491476 100644
--- a/metadata/md5-cache/sci-biology/embassy-domalign-0.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-domalign-0.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Protein domain alignment add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/DOMALIGN-0.1.660.tar.gz -> embassy-domalign-0.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f8b2caa273f4ae3b0463e6de6782660
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc6983ff5591fa7825d4cd99d376c861
diff --git a/metadata/md5-cache/sci-biology/embassy-domsearch-0.1.660 b/metadata/md5-cache/sci-biology/embassy-domsearch-0.1.660
index 8e5c80c8f0aa..602d26636e9e 100644
--- a/metadata/md5-cache/sci-biology/embassy-domsearch-0.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-domsearch-0.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Protein domain search add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/DOMSEARCH-0.1.660.tar.gz -> embassy-domsearch-0.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=920906439fbc5278460201b23a615736
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=00bdcd88d6e9743af4531e223888195b
diff --git a/metadata/md5-cache/sci-biology/embassy-emnu-1.05.660 b/metadata/md5-cache/sci-biology/embassy-emnu-1.05.660
index 3a93ec14b1bc..a1121a0ac9b7 100644
--- a/metadata/md5-cache/sci-biology/embassy-emnu-1.05.660
+++ b/metadata/md5-cache/sci-biology/embassy-emnu-1.05.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=sys-libs/ncurses:0= dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Simple menu of EMBOSS applications
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=ncurses mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=sys-libs/ncurses:0= dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/EMNU-1.05.660.tar.gz -> embassy-emnu-1.05.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d82c7c44ec76fa5d6165769a73e5df9a
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=54738204e5b5aeb9aa0216f7c53c77df
diff --git a/metadata/md5-cache/sci-biology/embassy-esim4-1.0.0.660 b/metadata/md5-cache/sci-biology/embassy-esim4-1.0.0.660
index d9159cc25543..05a0b5bc40a0 100644
--- a/metadata/md5-cache/sci-biology/embassy-esim4-1.0.0.660
+++ b/metadata/md5-cache/sci-biology/embassy-esim4-1.0.0.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of sim4 - Alignment of cDNA and genomic DNA
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/ESIM4-1.0.0.660.tar.gz -> embassy-esim4-1.0.0.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b156bed7ea031aeb5464836dd987f18
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=63d13362b3c8b045b78ed452697b59f3
diff --git a/metadata/md5-cache/sci-biology/embassy-hmmer-2.3.2.660 b/metadata/md5-cache/sci-biology/embassy-hmmer-2.3.2.660
index 0975b989a480..13d2fb8d83dc 100644
--- a/metadata/md5-cache/sci-biology/embassy-hmmer-2.3.2.660
+++ b/metadata/md5-cache/sci-biology/embassy-hmmer-2.3.2.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of HMMER wrapper - sequence analysis with profile HMMs
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=sci-biology/hmmer:2 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=sci-biology/hmmer:2 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/HMMER-2.3.2.660.tar.gz -> embassy-hmmer-2.3.2.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83d02ae22d4e1864669639d9289cd112
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c5399e3d4e7e59aaa70e6477a41a7345
diff --git a/metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1.660 b/metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1.660
index aadf7fdd1df2..818871e97253 100644
--- a/metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of InterProScan motif detection add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/IPRSCAN-4.3.1.660.tar.gz -> embassy-iprscan-4.3.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73b0c29964ea3506d18ef6b6c8df70e1
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=88c3ac6be6849f4230f25bf463931561
diff --git a/metadata/md5-cache/sci-biology/embassy-mse-3.0.0.660 b/metadata/md5-cache/sci-biology/embassy-mse-3.0.0.660
index 1ccd54a465ef..c402f09f9737 100644
--- a/metadata/md5-cache/sci-biology/embassy-mse-3.0.0.660
+++ b/metadata/md5-cache/sci-biology/embassy-mse-3.0.0.660
@@ -1,14 +1,14 @@
 BDEPEND=>=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/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of MSE - Multiple Sequence Screen Editor
 EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=ncurses mysql pdf png postgres static-libs X
+IUSE=ncurses mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/MSE-3.0.0.660.tar.gz -> embassy-mse-3.0.0.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d12c79c0d0054aecac7a987e9b5f5655
diff --git a/metadata/md5-cache/sci-biology/embassy-phylipnew-3.69.660 b/metadata/md5-cache/sci-biology/embassy-phylipnew-3.69.660
index 17a99c6d94f7..a7cd230ca5c4 100644
--- a/metadata/md5-cache/sci-biology/embassy-phylipnew-3.69.660
+++ b/metadata/md5-cache/sci-biology/embassy-phylipnew-3.69.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of The Phylogeny Inference Package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2 free-noncomm
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/PHYLIPNEW-3.69.660.tar.gz -> embassy-phylipnew-3.69.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f78f83387f741c46031c218b1965467
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9ecb2590e9a1ae2353dafa387e89d48c
diff --git a/metadata/md5-cache/sci-biology/embassy-signature-0.1.660 b/metadata/md5-cache/sci-biology/embassy-signature-0.1.660
index 26787c488c47..7909d6f2d20b 100644
--- a/metadata/md5-cache/sci-biology/embassy-signature-0.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-signature-0.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Protein signature add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/SIGNATURE-0.1.660.tar.gz -> embassy-signature-0.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4cb685046b5a39b624eb3467b815c2c4
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0be4d65f424916bbe6d7f507fed3014f
diff --git a/metadata/md5-cache/sci-biology/embassy-structure-0.1.660 b/metadata/md5-cache/sci-biology/embassy-structure-0.1.660
index c80a8f98ee52..ef0cefb87a20 100644
--- a/metadata/md5-cache/sci-biology/embassy-structure-0.1.660
+++ b/metadata/md5-cache/sci-biology/embassy-structure-0.1.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Protein structure add-on package
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/STRUCTURE-0.1.660.tar.gz -> embassy-structure-0.1.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=634d624be78f958ed7fca02e7dc43bd4
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a0f67c8d9181b193f43eb5e99fdbe92f
diff --git a/metadata/md5-cache/sci-biology/embassy-topo-2.0.660 b/metadata/md5-cache/sci-biology/embassy-topo-2.0.660
index 7961d6be4811..ef5a2566416b 100644
--- a/metadata/md5-cache/sci-biology/embassy-topo-2.0.660
+++ b/metadata/md5-cache/sci-biology/embassy-topo-2.0.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Transmembrane protein display
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/TOPO-2.0.660.tar.gz -> embassy-topo-2.0.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e50220ee11093554b589c1f9f53e7c09
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9ecbee609930ce8d1c14b72746c0ff64
diff --git a/metadata/md5-cache/sci-biology/embassy-vienna-1.7.2.660 b/metadata/md5-cache/sci-biology/embassy-vienna-1.7.2.660
index 95a18e38f163..a8f74f78705b 100644
--- a/metadata/md5-cache/sci-biology/embassy-vienna-1.7.2.660
+++ b/metadata/md5-cache/sci-biology/embassy-vienna-1.7.2.660
@@ -1,13 +1,14 @@
+BDEPEND=>=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-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 DESCRIPTION=EMBOSS integrated version of Vienna RNA package - RNA folding
-EAPI=6
+EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
+IUSE=mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
+RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/VIENNA-1.7.2.660.tar.gz -> embassy-vienna-1.7.2.660.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d257de40bcdb33c0735daac8a5f15fda
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bbce91d6a8900865a446cb3dea302ccf
diff --git a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1 b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
index 51bc94575d44..6941ad585e21 100644
--- a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
+++ b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
@@ -4,12 +4,12 @@ DEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql?
 DESCRIPTION=The European Molecular Biology Open Software Suite - A sequence analysis package
 EAPI=7
 HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=minimal mysql pdf png postgres static-libs X
+IUSE=minimal mysql pdf png postgres X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-2 Apache-2.0 GPL-3+ CC-BY-3.0
 PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/primer3 sci-biology/prints sci-biology/prosite sci-biology/rebase )
 RDEPEND=!games-action/xbomber !sys-devel/cons dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt )
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	79fb8dbd6c9c5dc48900a9319e493b02	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	4e3025abdbbab90f9ddb2bfd8d339e0b	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72c86b427ea83b8feb792884f23feaf3
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 4ab17201f139..706cdec996ae 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.3.0 b/metadata/md5-cache/sci-calculators/bc-gh-3.3.0
deleted file mode 100644
index cb1ea7ec1141..000000000000
--- a/metadata/md5-cache/sci-calculators/bc-gh-3.3.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
-HOMEPAGE=https://github.com/gavinhoward/bc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.0/bc-3.3.0.tar.xz
-_md5_=cf208556d773e569f21008e1746475e7
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.3.2 b/metadata/md5-cache/sci-calculators/bc-gh-3.3.2
deleted file mode 100644
index 9b11c610f266..000000000000
--- a/metadata/md5-cache/sci-calculators/bc-gh-3.3.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
-HOMEPAGE=https://github.com/gavinhoward/bc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.2/bc-3.3.2.tar.xz
-_md5_=cf208556d773e569f21008e1746475e7
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.3.4 b/metadata/md5-cache/sci-calculators/bc-gh-3.3.4
new file mode 100644
index 000000000000..e944196d8d66
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/bc-gh-3.3.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Implementation of POSIX bc with GNU extensions
+EAPI=7
+HOMEPAGE=https://github.com/gavinhoward/bc
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.4/bc-3.3.4.tar.xz
+_md5_=cf208556d773e569f21008e1746475e7
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 4e30abf4a9dc..99601cd00fb7 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/votca-csg-2021 b/metadata/md5-cache/sci-chemistry/votca-csg-2021
new file mode 100644
index 000000000000..50e9cb1a7c1e
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-2021
@@ -0,0 +1,14 @@
+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 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
+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 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+SLOT=0
+SRC_URI=https://github.com/votca/csg/archive/v2021.tar.gz -> votca-csg-2021.tar.gz examples? ( https://github.com/votca/csg-tutorials/archive/v2021.tar.gz -> votca-csg-tutorials-2021.tar.gz )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b60b47ec9878e1ef21c5293f2838dec
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-9999 b/metadata/md5-cache/sci-chemistry/votca-csg-9999
index 6c352b253c1c..cc71a0945b93 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-9999
@@ -1,13 +1,14 @@
-BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+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=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-9999 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
 DESCRIPTION=Votca coarse-graining engine
 EAPI=7
 HOMEPAGE=https://www.votca.org/
-IUSE=doc examples extras +gromacs hdf5
+IUSE=examples extras +gromacs hdf5 test
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-9999 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eec009eeeee61311e547786902fc1b13
+_md5_=9cda1d192741b1fa850610bb3c343de0
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-2021 b/metadata/md5-cache/sci-chemistry/votca-xtp-2021
new file mode 100644
index 000000000000..5f17b18ca7f6
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-2021
@@ -0,0 +1,13 @@
+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 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021
+DESCRIPTION=Votca excitation and charge properties module
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021
+SLOT=0
+SRC_URI=https://github.com/votca/xtp/archive/v2021.tar.gz -> votca-xtp-2021.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85c7281c1f408e1689f29c458eae5f46
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-9999 b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
index c23a1b3e9d15..cb2dceb37031 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
@@ -1,12 +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/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/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/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/votca-tools-9999
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52fecd03e652f0470aafe9abd26446d3
+_md5_=38744417d995f9e3eeeaab8156f21668
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 160b899d5af4..f62e1b54a3a5 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/klayout-0.26.11 b/metadata/md5-cache/sci-electronics/klayout-0.26.11
new file mode 100644
index 000000000000..2a39ff123a5c
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/klayout-0.26.11
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
+EAPI=7
+HOMEPAGE=https://www.klayout.de/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby26
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=^^ ( python_single_target_python3_7 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_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c2762c9e36702dfacfb738f0f884a08c
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index 9925903564d4..96dfe42a7e9f 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -1,14 +1,14 @@
 BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEPEND=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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=7
 HOMEPAGE=https://www.klayout.de/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 ruby_targets_ruby26
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby26
 LICENSE=GPL-2
 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) || ( ruby_targets_ruby26 )
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3108830122e52d98d0a3a9decd437844
+_md5_=c2762c9e36702dfacfb738f0f884a08c
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d8688924df21..c4e9dab4d1e7 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/gpx-viewer-0.4.0-r1 b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
index fa6c9a8aa008..8129ca247e30 100644
--- a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
+++ b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libchamplain-0.12.3:0.12[gtk] x11-libs/gtk+:3 || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-util/intltool-0.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-util/intltool-0.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libchamplain-0.12.3:0.12[gtk] x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Simple program to visualize a gpx file
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/DaveDavenport/gpx-viewer
-IUSE=nls debug
+IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libchamplain-0.12.3:0.12[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://edge.launchpad.net/gpx-viewer/trunk/0.4.0/+download/gpx-viewer-0.4.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac38c7d30b08a6d72043eeec00f7354c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8cb400c6308ec05045b4e3cb675d2baf
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.16.3 b/metadata/md5-cache/sci-geosciences/qgis-3.16.3
deleted file mode 100644
index 1a1ef4440026..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.16.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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-qt/linguist-tools:5 sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= sys-libs/zlib >=x11-libs/qscintilla-2.10.3:= >=x11-libs/qwt-6.1.3-r2:6=[svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] dev-python/markupsafe[python_targets_python3_9(-)] dev-python/owslib[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User friendly Geographic Information System
-EAPI=7
-HOMEPAGE=https://www.qgis.org/en/site/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= sys-libs/zlib >=x11-libs/qscintilla-2.10.3:= >=x11-libs/qwt-6.1.3-r2:6=[svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] dev-python/markupsafe[python_targets_python3_9(-)] dev-python/owslib[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) mapserver? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.16.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe6782eea860e49b9e715153c3281708
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.8-r1 b/metadata/md5-cache/sci-geosciences/viking-1.8-r1
index 2e2d936871f8..6034cff84625 100644
--- a/metadata/md5-cache/sci-geosciences/viking-1.8-r1
+++ b/metadata/md5-cache/sci-geosciences/viking-1.8-r1
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 >=dev-tcltk/expect-5.45.4 dev-db/sqlite:3 dev-libs/expat
 SLOT=0
 SRC_URI=https://github.com/viking-gps/viking/archive/viking-1.8.tar.gz doc? ( https://github.com/viking-gps/viking/releases/download/viking-1.8/viking.pdf )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b8b3c3729a37d1ae55ad27151bf6c11
+_md5_=a6205dcf414a15021067d08f54552249
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index d4cd8882d37f..9df27d892bd5 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.3.0 b/metadata/md5-cache/sci-libs/armadillo-10.3.0
new file mode 100644
index 000000000000..228b59f912cb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/armadillo-10.3.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl )
+DESCRIPTION=Streamlined C++ linear algebra library
+EAPI=7
+HOMEPAGE=http://arma.sourceforge.net/
+IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl )
+RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
+REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=mirror://sourceforge/arma/armadillo-10.3.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0fae2c62057a08ba6873bf1a9cc2542f
diff --git a/metadata/md5-cache/sci-libs/gamer-1.5-r2 b/metadata/md5-cache/sci-libs/gamer-1.5-r2
index 3e8676899996..40be3cd86579 100644
--- a/metadata/md5-cache/sci-libs/gamer-1.5-r2
+++ b/metadata/md5-cache/sci-libs/gamer-1.5-r2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) >=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 ) >=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/maloc-1.4
 DESCRIPTION=Geometry-preserving Adaptive MeshER
-EAPI=5
+EAPI=7
 HOMEPAGE=http://fetk.org/codes/gamer/index.html
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/maloc-1.4
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/gamer-1.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73e4f86a2081290fdef778a0eabb9d0c
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=81cfab1b6f3fd36bf024d202e2e3c243
diff --git a/metadata/md5-cache/sci-libs/gts-20121130 b/metadata/md5-cache/sci-libs/gts-20121130
index ada7b057c4f4..5259a8a2368b 100644
--- a/metadata/md5-cache/sci-libs/gts-20121130
+++ b/metadata/md5-cache/sci-libs/gts-20121130
@@ -1,14 +1,15 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 virtual/pkgconfig doc? ( dev-util/gtk-doc ) test? ( media-libs/netpbm ) >=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? ( dev-util/gtk-doc ) test? ( media-libs/netpbm ) >=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/glib:2
 DESCRIPTION=GNU Triangulated Surface Library
-EAPI=5
+EAPI=7
 HOMEPAGE=http://gts.sourceforge.net/
-IUSE=doc examples static-libs test
+IUSE=doc test
 KEYWORDS=amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gts.sourceforge.net/tarballs/gts-snapshot-121130.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e0f6295c93d483453c3d3c0c8ff91a5
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fb9931432f904682eaa2ecab07eb0d8e
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 714b9774a7d1..d092c6ea8b31 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -12,4 +12,4 @@ 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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dbc57f5919f2a66e5d2c527798975764
+_md5_=ec4a66bf2295a2678d9227d2d9de4417
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r2 b/metadata/md5-cache/sci-libs/libint-2.6.0-r2
index 1797cd189a5a..b953068000fe 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r2
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r2
@@ -11,4 +11,4 @@ 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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a515d976855a5975e6ca23513505ff54
+_md5_=de27c8b8f17f7b11f65e3b7d9cb5450e
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r4 b/metadata/md5-cache/sci-libs/libint-2.6.0-r4
new file mode 100644
index 000000000000..6ddf80051ffc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=>=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 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
+EAPI=7
+HOMEPAGE=https://github.com/evaleev/libint
+IUSE=static-libs doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6fc10dc3ecd023ecf78057299bd88982
diff --git a/metadata/md5-cache/sci-libs/m4rie-20200115 b/metadata/md5-cache/sci-libs/m4rie-20200115
deleted file mode 100644
index 05e2193b3cf4..000000000000
--- a/metadata/md5-cache/sci-libs/m4rie-20200115
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sci-libs/m4ri-20140914
-DESCRIPTION=Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16
-EAPI=7
-HOMEPAGE=https://bitbucket.org/malb/m4rie/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=>=sci-libs/m4ri-20140914
-SLOT=0
-SRC_URI=https://bitbucket.org/malb/m4rie/downloads/m4rie-20200115.tar.gz
-_md5_=2d057f87c6b6fe0bd14d2f5f08fd2164
diff --git a/metadata/md5-cache/sci-libs/m4rie-20200115-r1 b/metadata/md5-cache/sci-libs/m4rie-20200115-r1
new file mode 100644
index 000000000000..084f5ba0344b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/m4rie-20200115-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=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=sci-libs/m4ri
+DESCRIPTION=Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16
+EAPI=7
+HOMEPAGE=https://bitbucket.org/malb/m4rie/
+IUSE=debug static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=sci-libs/m4ri
+SLOT=0
+SRC_URI=https://bitbucket.org/malb/m4rie/downloads/m4rie-20200115.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dfd3defa2378b5b48fced8595274c055
diff --git a/metadata/md5-cache/sci-libs/mc-1.5 b/metadata/md5-cache/sci-libs/mc-1.5
index 7b1081b6c177..6f1c00f8af60 100644
--- a/metadata/md5-cache/sci-libs/mc-1.5
+++ b/metadata/md5-cache/sci-libs/mc-1.5
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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 doc? ( media-gfx/graphviz app-doc/doxygen ) >=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
+BDEPEND=doc? ( media-gfx/graphviz app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/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
-EAPI=5
+EAPI=7
 HOMEPAGE=http://fetk.org/codes/mc/index.html
-IUSE=debug doc static-libs
+IUSE=debug doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=852b13a278dc72fdc15e7e792f09a1bc
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=05deb03c9f153ffbacd0611c4c66f6c1
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.14 b/metadata/md5-cache/sci-libs/openblas-0.3.14
new file mode 100644
index 000000000000..a0d55451aefc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.14
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
+DEPEND=virtual/fortran
+DESCRIPTION=Optimized BLAS library based on GotoBLAS2
+EAPI=7
+HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
+REQUIRED_USE=?? ( openmp pthread )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.14.tar.gz -> openblas-0.3.14.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-libs/punc-1.5 b/metadata/md5-cache/sci-libs/punc-1.5
index 4872d2bcc94f..3ba92464e5d1 100644
--- a/metadata/md5-cache/sci-libs/punc-1.5
+++ b/metadata/md5-cache/sci-libs/punc-1.5
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) >=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
+BDEPEND=virtual/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/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
-EAPI=5
+EAPI=7
 HOMEPAGE=http://fetk.org/codes/punc/index.html
-IUSE=debug doc mpi static-libs
+IUSE=debug doc mpi
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6813d405a77a6bb0b3759286a1faa6b6
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3d47ec3cf38024643b37e1b336c4cdd5
diff --git a/metadata/md5-cache/sci-libs/symengine-0.7.0 b/metadata/md5-cache/sci-libs/symengine-0.7.0
new file mode 100644
index 000000000000..006481aee1da
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/symengine-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools ) doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=Fast symbolic manipulation library, written in C++
+EAPI=7
+HOMEPAGE=https://github.com/sympy/symengine
+IUSE=arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://github.com/sympy/symengine/archive/v0.7.0.tar.gz -> symengine-0.7.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d52a474644dada4b385f51cd9634a8b
diff --git a/metadata/md5-cache/sci-libs/votca-tools-2021 b/metadata/md5-cache/sci-libs/votca-tools-2021
new file mode 100644
index 000000000000..11d431715014
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/votca-tools-2021
@@ -0,0 +1,13 @@
+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/
+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=
+SLOT=0
+SRC_URI=https://github.com/votca/tools/archive/v2021.tar.gz -> votca-tools-2021.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c8fcff804e87eeae09cdd597397c003
diff --git a/metadata/md5-cache/sci-libs/votca-tools-9999 b/metadata/md5-cache/sci-libs/votca-tools-9999
index d7948d7fd031..ee3b6aa6ee7d 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-9999
+++ b/metadata/md5-cache/sci-libs/votca-tools-9999
@@ -1,12 +1,14 @@
-BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+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=>=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
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6360e99c7d6ae36105b7ed166235419e
+_md5_=2a1e41afcfe371591ddb5ead5074e6d6
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 5ab58997ebb3..9a173da703b2 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
index 11dad89ed743..e0e138de0407 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile
 SLOT=0/2.6.1.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.6.1.2/Agda-2.6.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ed5bf7fe612f7661587a3ffc003aec9f
+_md5_=1f3460c80b1eeef5a25db800e151e56d
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.6.1-r1 b/metadata/md5-cache/sci-mathematics/coq-8.6.1-r1
deleted file mode 100644
index bfbc056df1aa..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-8.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-texlive/texlive-latexrecommended dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
-DESCRIPTION=Proof assistant written in O'Caml
-EAPI=5
-HOMEPAGE=http://coq.inria.fr/
-IUSE=gtk debug +ocamlopt doc camlp5
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )
-SLOT=0
-SRC_URI=http://coq.inria.fr/distrib/V8.6.1/files/coq-8.6.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9183a70393ade8e696a2d6c6199f4498
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.9.1-r1 b/metadata/md5-cache/sci-mathematics/coq-8.9.1-r1
deleted file mode 100644
index 394a287bbe6f..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-8.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.0.5:=[ocamlopt?] dev-ml/camlp5:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-texlive/texlive-latexrecommended dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
-DESCRIPTION=Proof assistant written in O'Caml
-EAPI=7
-HOMEPAGE=http://coq.inria.fr/
-IUSE=gtk debug +ocamlopt doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.0.5:=[ocamlopt?] dev-ml/camlp5:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coq/coq/archive/V8.9.1.tar.gz -> coq-8.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c0579ddbd9d1b541cb34bce29c57656
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.6.3 b/metadata/md5-cache/sci-mathematics/flint-2.6.3
deleted file mode 100644
index 0fe3965aa7b5..000000000000
--- a/metadata/md5-cache/sci-mathematics/flint-2.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
-DESCRIPTION=Fast Library for Number Theory
-EAPI=7
-HOMEPAGE=http://www.flintlib.org/
-IUSE=doc ntl test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
-RESTRICT=!test? ( test )
-SLOT=0/14
-SRC_URI=http://www.flintlib.org/flint-2.6.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e990268c13e1a914f43d8fa4466792d
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.6.3-r1 b/metadata/md5-cache/sci-mathematics/flint-2.6.3-r1
new file mode 100644
index 000000000000..f3c1b2ccfe58
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/flint-2.6.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-tex/latexmk ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
+DESCRIPTION=Fast Library for Number Theory
+EAPI=7
+HOMEPAGE=http://www.flintlib.org/
+IUSE=doc ntl test
+KEYWORDS=amd64 ~arm ~arm64 ppc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
+RESTRICT=!test? ( test )
+SLOT=0/14
+SRC_URI=http://www.flintlib.org/flint-2.6.3.tar.gz
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=88b1a52c0029484277cef3944fe24a0e
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.4.9 b/metadata/md5-cache/sci-mathematics/gimps-30.4.9
deleted file mode 100644
index f14816a02a0b..000000000000
--- a/metadata/md5-cache/sci-mathematics/gimps-30.4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=The Great Internet Mersenne Prime Search
-EAPI=7
-HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* ~amd64
-LICENSE=GIMPS
-RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v304b9.linux64.tar.gz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d67724538dd67c1c102eff0f9f4bf331
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.5.1 b/metadata/md5-cache/sci-mathematics/gimps-30.5.1
new file mode 100644
index 000000000000..fe83d0eadaab
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.5.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=7
+HOMEPAGE=https://www.mersenne.org/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v305b1.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v305b1.linux32.tar.gz )
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fc196d74cce6b501e862f34761df2725
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1 b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
index 5ec580f1585c..5f087b1870b4 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
@@ -4,11 +4,11 @@ DEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
 DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
 EAPI=7
 HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
-IUSE=doc examples
+IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
 SLOT=0
-SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.8.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
+SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.8.tar.gz http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee3be5b3034a8a18ac2294baf7eb1c3e
+_md5_=db2c81f675467b39bb364775158ceb76
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 6452d369c7eb..4d388297469e 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/h5utils-1.12.1-r2 b/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
deleted file mode 100644
index a0bb3b92ff54..000000000000
--- a/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0= sci-libs/hdf5:0= sys-libs/zlib:0= hdf? ( sci-libs/hdf:0= virtual/jpeg:0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utilities for visualization and conversion of HDF5 files
-EAPI=5
-HOMEPAGE=http://ab-initio.mit.edu/h5utils/
-IUSE=hdf octave
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0= sci-libs/hdf5:0= sys-libs/zlib:0= hdf? ( sci-libs/hdf:0= virtual/jpeg:0 )
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/h5utils/h5utils-1.12.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b2d01d6cbaf4bb35600e913b71b91a1
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 804603ef50e2..0cec842c0b17 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/fastjet-3.0.6-r1 b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1
index ff88392afd76..29cf2e6aff87 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cgal? ( sci-mathematics/cgal ) doc? ( app-doc/doxygen[dot] ) plugins? ( sci-physics/siscone:0= ) >=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 )
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=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 setup
+DEPEND=cgal? ( sci-mathematics/cgal:= ) plugins? ( sci-physics/siscone:= ) plugins? ( virtual/fortran )
 DESCRIPTION=Fast implementation of several recombination jet algorithms
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.fastjet.fr/
-IUSE=cgal doc examples +plugins static-libs
+IUSE=cgal doc examples +plugins
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 QPL
-RDEPEND=cgal? ( sci-mathematics/cgal ) plugins? ( virtual/fortran )
+RDEPEND=cgal? ( sci-mathematics/cgal:= ) plugins? ( sci-physics/siscone:= ) plugins? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.fastjet.fr/repo/fastjet-3.0.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44947721331eb87625a9454a9c6c3e30
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=821af05dcf6c94683029216bd92e84d7
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index d1f97e73f1c6..37a3b73a717e 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/g3data-1.5.4 b/metadata/md5-cache/sci-visualization/g3data-1.5.4
index b7dcccff9496..c0afd9397c3a 100644
--- a/metadata/md5-cache/sci-visualization/g3data-1.5.4
+++ b/metadata/md5-cache/sci-visualization/g3data-1.5.4
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=x11-libs/gtk+:2
 DESCRIPTION=Tool for extracting data from graphs
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/pn2200/g3data
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/downloads/pn2200/g3data/g3data-1.5.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58f1840620ef25a9cd0c46213c025a7e
+_md5_=252b9af1c683730de5c582773791038b
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.9.0 b/metadata/md5-cache/sci-visualization/paraview-5.9.0
new file mode 100644
index 000000000000..8b585c7c4198
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/paraview-5.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ffmpeg? ( media-video/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/constantly[python_targets_python3_7(-)] dev-python/incremental[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] dev-python/twisted[python_targets_python3_7(-)] dev-python/zope-interface[python_targets_python3_7(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/constantly[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxmlpatterns:5 ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) webengine? ( dev-qt/qtwebengine:5[widgets] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) boost? ( python_single_target_python3_7? ( dev-libs/boost[mpi?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost[mpi?,python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen )
+DESCRIPTION=Powerful scientific data visualization application
+EAPI=7
+HOMEPAGE=https://www.paraview.org
+IUSE=boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=paraview GPL-2
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ffmpeg? ( media-video/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/constantly[python_targets_python3_7(-)] dev-python/incremental[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] dev-python/twisted[python_targets_python3_7(-)] dev-python/zope-interface[python_targets_python3_7(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/constantly[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxmlpatterns:5 ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+REQUIRED_USE=python? ( mpi ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) mysql? ( sqlite ) webengine? ( qt5 ) qt5? ( sqlite ) ?? ( offscreen qt5 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://www.paraview.org/files/v5.9/ParaView-v5.9.0.tar.xz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4da4fa6d899ad582335db763611926c8
diff --git a/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc b/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
index c7cc175b9488..d331a550ea83 100644
--- a/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
+++ b/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
@@ -1,13 +1,13 @@
+BDEPEND=media-gfx/imagemagick[png] virtual/pkgconfig www-client/lynx >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3 media-gfx/imagemagick virtual/pkgconfig www-client/lynx >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsndfile:= >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3
 DESCRIPTION=A fast interactive 2D plotter
-EAPI=6
+EAPI=7
 HOMEPAGE=http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot
-IUSE=static-libs
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3
+RDEPEND=media-libs/libsndfile:= >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/lanceman2/quickplot/archive/quickplot-1.0.1rc.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb251a933f12e5213cef91862767fbbf
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1a8cf3548a0e548fc748de3d3a772dc2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6c303fc0e292..a48022129f3d 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/acl-2.3.1 b/metadata/md5-cache/sys-apps/acl-2.3.1
new file mode 100644
index 000000000000..ea3dc2eb7ff4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/acl-2.3.1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-apps/attr-2.4.47-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=access control list utilities, libraries and headers
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/acl
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=mirror://nongnu/acl/acl-2.3.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6719fb8dfb612f92ff03b24a1e8110b2
diff --git a/metadata/md5-cache/sys-apps/attr-2.5.1 b/metadata/md5-cache/sys-apps/attr-2.5.1
new file mode 100644
index 000000000000..ebb900147a7a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/attr-2.5.1
@@ -0,0 +1,12 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extended attributes tools
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/attr
+IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://nongnu/attr/attr-2.5.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e915a68cf8d1329cb8e0892a2647c0cf
diff --git a/metadata/md5-cache/sys-apps/bat-0.15.4 b/metadata/md5-cache/sys-apps/bat-0.15.4
deleted file mode 100644
index b540b113b8be..000000000000
--- a/metadata/md5-cache/sys-apps/bat-0.15.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= sys-libs/zlib:=
-DESCRIPTION=cat(1) clone with syntax highlighting and Git integration
-EAPI=7
-HOMEPAGE=https://github.com/sharkdp/bat
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB
-RDEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= sys-libs/zlib:= !>app-backup/bacula-9.2[qt5]
-SLOT=0
-SRC_URI=https://github.com/sharkdp/bat/archive/v0.15.4.tar.gz -> bat-0.15.4.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.1/download -> base64-0.12.1.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/console/0.11.2/download -> console-0.11.2.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/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fancy-regex/0.3.3/download -> fancy-regex-0.3.3.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.13.5/download -> git2-0.13.5.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.11/download -> hermit-abi-0.1.11.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.2/download -> indexmap-1.3.2.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.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kstring/0.1.0/download -> kstring-0.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.5+1.0.0/download -> libgit2-sys-0.12.5+1.0.0.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/liquid/0.20.0/download -> liquid-0.20.0.crate https://crates.io/api/v1/crates/liquid-core/0.20.0/download -> liquid-core-0.20.0.crate https://crates.io/api/v1/crates/liquid-derive/0.20.0/download -> liquid-derive-0.20.0.crate https://crates.io/api/v1/crates/liquid-lib/0.20.0/download -> liquid-lib-0.20.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/once_cell/1.3.1/download -> once_cell-1.3.1.crate https://crates.io/api/v1/crates/onig/6.0.0/download -> onig-6.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.5.0/download -> onig_sys-69.5.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/path_abs/0.5.0/download -> path_abs-0.5.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plist/1.0.0/download -> plist-1.0.0.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/proc-quote/0.3.2/download -> proc-quote-0.3.2.crate https://crates.io/api/v1/crates/proc-quote-impl/0.3.2/download -> proc-quote-impl-0.3.2.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.51/download -> serde_json-1.0.51.crate https://crates.io/api/v1/crates/serde_yaml/0.8.12/download -> serde_yaml-0.8.12.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/smallvec/1.3.0/download -> smallvec-1.3.0.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syntect/4.2.0/download -> syntect-4.2.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.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.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.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.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.3/download -> wild-2.0.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.2/download -> xml-rs-0.8.2.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	ee3fdb62142c867f137d4fab6f1ad34d	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2413bfd455616592bb1cdd81e0973ade
diff --git a/metadata/md5-cache/sys-apps/bat-0.17.1 b/metadata/md5-cache/sys-apps/bat-0.17.1
deleted file mode 100644
index ece5cceccced..000000000000
--- a/metadata/md5-cache/sys-apps/bat-0.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= sys-libs/zlib:=
-DESCRIPTION=cat(1) clone with syntax highlighting and Git integration
-EAPI=7
-HOMEPAGE=https://github.com/sharkdp/bat
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB
-RDEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= sys-libs/zlib:= !>app-backup/bacula-9.2[qt5]
-SLOT=0
-SRC_URI=https://github.com/sharkdp/bat/archive/v0.17.1.tar.gz -> bat-0.17.1.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/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/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/cc/1.0.60/download -> cc-1.0.60.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clircle/0.1.3/download -> clircle-0.1.3.crate https://crates.io/api/v1/crates/console/0.13.0/download -> console-0.13.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fancy-regex/0.3.5/download -> fancy-regex-0.3.5.crate https://crates.io/api/v1/crates/flate2/1.0.18/download -> flate2-1.0.18.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/git2/0.13.12/download -> git2-0.13.12.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.6/download -> globset-0.4.6.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.6.0/download -> indexmap-1.6.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.78/download -> libc-0.2.78.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.14+1.1.0/download -> libgit2-sys-0.12.14+1.1.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.2/download -> miniz_oxide-0.4.2.crate https://crates.io/api/v1/crates/nix/0.19.0/download -> nix-0.19.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.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/onig/6.1.0/download -> onig-6.1.0.crate https://crates.io/api/v1/crates/onig_sys/69.5.1/download -> onig_sys-69.5.1.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/path_abs/0.5.0/download -> path_abs-0.5.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.18/download -> pkg-config-0.3.18.crate https://crates.io/api/v1/crates/plist/1.0.0/download -> plist-1.0.0.crate https://crates.io/api/v1/crates/predicates/1.0.5/download -> predicates-1.0.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.2/download -> rust-argon2-0.8.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.0/download -> semver-parser-0.10.0.crate https://crates.io/api/v1/crates/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_derive/1.0.117/download -> serde_derive-1.0.117.crate https://crates.io/api/v1/crates/serde_json/1.0.58/download -> serde_json-1.0.58.crate https://crates.io/api/v1/crates/serde_yaml/0.8.14/download -> serde_yaml-0.8.14.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.42/download -> syn-1.0.42.crate https://crates.io/api/v1/crates/syntect/4.4.0/download -> syntect-4.4.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/tinyvec/0.3.4/download -> tinyvec-0.3.4.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.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate
-_eclasses_=cargo	ee3fdb62142c867f137d4fab6f1ad34d	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2f865c61aa408140083099c68b7c2f2d
diff --git a/metadata/md5-cache/sys-apps/dcfldd-1.3.4.1-r1 b/metadata/md5-cache/sys-apps/dcfldd-1.3.4.1-r1
deleted file mode 100644
index 6325c46caad1..000000000000
--- a/metadata/md5-cache/sys-apps/dcfldd-1.3.4.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=enhanced dd with features for forensics and security
-EAPI=7
-HOMEPAGE=http://dcfldd.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/dcfldd/dcfldd-1.3.4-1.tar.gz
-_md5_=647dd0731388098fcc743b3beca9be00
diff --git a/metadata/md5-cache/sys-apps/dcfldd-1.5 b/metadata/md5-cache/sys-apps/dcfldd-1.5
deleted file mode 100644
index 7304fed9d996..000000000000
--- a/metadata/md5-cache/sys-apps/dcfldd-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=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
-DESCRIPTION=enhanced dd with features for forensics and security
-EAPI=7
-HOMEPAGE=http://dcfldd.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/dcfldd/archive/v1.5.tar.gz -> dcfldd-1.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=070ea4e07d588ece7e1705d5e620071b
diff --git a/metadata/md5-cache/sys-apps/dcfldd-1.6 b/metadata/md5-cache/sys-apps/dcfldd-1.6
deleted file mode 100644
index d3bc48d1b9d2..000000000000
--- a/metadata/md5-cache/sys-apps/dcfldd-1.6
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=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
-DESCRIPTION=enhanced dd with features for forensics and security
-EAPI=7
-HOMEPAGE=http://dcfldd.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/dcfldd/archive/v1.6.tar.gz -> dcfldd-1.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=070ea4e07d588ece7e1705d5e620071b
diff --git a/metadata/md5-cache/sys-apps/dcfldd-1.7 b/metadata/md5-cache/sys-apps/dcfldd-1.7
index 656b6a76393c..66983fb3982f 100644
--- a/metadata/md5-cache/sys-apps/dcfldd-1.7
+++ b/metadata/md5-cache/sys-apps/dcfldd-1.7
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=enhanced dd with features for forensics and security
 EAPI=7
 HOMEPAGE=http://dcfldd.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/dcfldd/archive/v1.7.tar.gz -> dcfldd-1.7.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=070ea4e07d588ece7e1705d5e620071b
+_md5_=fd7092c19b45eccaccf42f822a353355
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.7-r1 b/metadata/md5-cache/sys-apps/diffutils-3.7-r1
index 4bbd2e56a9f7..6d16adf6a820 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.7-r1
+++ b/metadata/md5-cache/sys-apps/diffutils-3.7-r1
@@ -7,6 +7,6 @@ IUSE=nls static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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://gnu/diffutils/diffutils-3.7.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.7.tar.xz
+SRC_URI=mirror://gnu/diffutils/diffutils-3.7.tar.xz https://alpha.gnu.org/gnu/diffutils/diffutils-3.7.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97fc4f33580cdb6d6325e2a0f85f9aba
+_md5_=3f4628c782fe4ead9f34b4203ffac2c7
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.19 b/metadata/md5-cache/sys-apps/fakechroot-2.19
deleted file mode 100644
index d091a0519284..000000000000
--- a/metadata/md5-cache/sys-apps/fakechroot-2.19
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Provide a faked chroot environment without requiring root privileges
-EAPI=7
-HOMEPAGE=https://github.com/dex4er/fakechroot
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dex4er/fakechroot/releases/download/2.19/fakechroot-2.19.tar.gz
-_md5_=bbc7e5973905a0e26e246b0f6484e62e
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r4 b/metadata/md5-cache/sys-apps/file-5.39-r4
index fed08333be20..a9b7c31deb5d 100644
--- a/metadata/md5-cache/sys-apps/file-5.39-r4
+++ b/metadata/md5-cache/sys-apps/file-5.39-r4
@@ -5,11 +5,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=7
 HOMEPAGE=https://www.darwinsys.com/file/
 IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_7 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87abc51b804740270e3a2e98157a316f
+_md5_=421f9f4eed54d0286192942f86e37686
diff --git a/metadata/md5-cache/sys-apps/fwts-20.05.00 b/metadata/md5-cache/sys-apps/fwts-20.05.00
deleted file mode 100644
index 85dd0ac99441..000000000000
--- a/metadata/md5-cache/sys-apps/fwts-20.05.00
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-devel/libtool
-DESCRIPTION=Firmware Test Suite
-EAPI=7
-HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_20.05.00.orig.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a8d03842ea79209cbb0d243baaaf0e2c
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2
new file mode 100644
index 000000000000..a800e9b1e112
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Disk Utility for GNOME using udisks
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Disks
+IUSE=fat elogind gnome systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.38/gnome-disk-utility-3.38.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ab3d31444d4d2a78cf2d1b88c7c348e
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.4 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.4
deleted file mode 100644
index 3050ef3b0ebc..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.4
+++ /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.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5ebb1d2f3e54b8111c4c7928ab47ca71
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.5 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.5
deleted file mode 100644
index 3e56e15edb02..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.5
+++ /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.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f89b8683ff79935ad2ca85ab015206d1
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6
deleted file mode 100644
index 1fb2fc4fbeca..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6
+++ /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.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a3b3113745d56fb7d32b50128a3fc45
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7
new file mode 100644
index 000000000000..366caa3edb9f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7
@@ -0,0 +1,13 @@
+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.7.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3a3b3113745d56fb7d32b50128a3fc45
diff --git a/metadata/md5-cache/sys-apps/grep-3.4 b/metadata/md5-cache/sys-apps/grep-3.4
index 5eefd2a61208..2b946dc705a7 100644
--- a/metadata/md5-cache/sys-apps/grep-3.4
+++ b/metadata/md5-cache/sys-apps/grep-3.4
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.4.tar.xz mirror://gentoo/grep-3.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d66060e46132f9711814e4936ba34ea6
+_md5_=8e4cc16267fa67a2ec067d16e3ef2871
diff --git a/metadata/md5-cache/sys-apps/grep-3.5 b/metadata/md5-cache/sys-apps/grep-3.5
index e4e8840bce88..0d14f9164fb3 100644
--- a/metadata/md5-cache/sys-apps/grep-3.5
+++ b/metadata/md5-cache/sys-apps/grep-3.5
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.5.tar.xz mirror://gentoo/grep-3.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c399a25616a87e93cea3df06976b1380
+_md5_=c79f7d44add061d7cf88d72959a204d2
diff --git a/metadata/md5-cache/sys-apps/grep-3.6 b/metadata/md5-cache/sys-apps/grep-3.6
index 2e8ddac03def..499084e3175b 100644
--- a/metadata/md5-cache/sys-apps/grep-3.6
+++ b/metadata/md5-cache/sys-apps/grep-3.6
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1a21025765f719078c4f69bfa99dd85
+_md5_=16793370e574297afaadff2707258325
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.4 b/metadata/md5-cache/sys-apps/groff-1.22.4
index 432f404f04f7..f961db182262 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.4
+++ b/metadata/md5-cache/sys-apps/groff-1.22.4
@@ -1,13 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/texinfo
 DEFINED_PHASES=compile configure install prepare
-DEPEND=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE ) dev-lang/perl sys-apps/texinfo
+DEPEND=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt )
 DESCRIPTION=Text formatter used for man pages
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/groff/groff.html
 IUSE=examples uchardet X
 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=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE )
+RDEPEND=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt )
 SLOT=0
-SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz mirror://gnu-alpha/groff/groff-1.22.4.tar.gz
+SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz https://alpha.gnu.org/gnu/groff/groff-1.22.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6952447b51194ad431a74c2ca76bb6e8
+_md5_=e4fa06285b7fd09e3fccfc97c6a2c15b
diff --git a/metadata/md5-cache/sys-apps/miller-5.3.0 b/metadata/md5-cache/sys-apps/miller-5.3.0
deleted file mode 100644
index 5a1ffc30b9c1..000000000000
--- a/metadata/md5-cache/sys-apps/miller-5.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=sys-devel/flex >=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 tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)
-EAPI=6
-HOMEPAGE=https://johnkerl.org/miller/doc/index.html
-IUSE=doc test
-KEYWORDS=amd64 arm x86
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/johnkerl/miller/archive/v5.3.0.tar.gz -> miller-5.3.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4dc1581e19af79a70f6485eb070e91c8
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.2 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.2
deleted file mode 100644
index c27d5be3f3db..000000000000
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=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=GTK+ based UDisks2 frontend
-EAPI=5
-HOMEPAGE=http://mount-gtk.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
-SLOT=0
-SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a7ef75e621f72c3dd232ed8a86a929e
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.4 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.4
deleted file mode 100644
index 9e642fe36001..000000000000
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=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=GTK+ based UDisks2 frontend
-EAPI=6
-HOMEPAGE=http://mount-gtk.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
-SLOT=0
-SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d9269f87e8a9106ac29bc5a112ba6d3
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
index 27336150179e..28c4aa67ef81 100644
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
+++ b/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
 DESCRIPTION=GTK+ based UDisks2 frontend
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mount-gtk.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
 SLOT=0
 SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.5.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d9269f87e8a9106ac29bc5a112ba6d3
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=db3cd3ea91d0d2ae002ef0e3ad9c15a1
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20210312 b/metadata/md5-cache/sys-apps/osinfo-db-20210312
new file mode 100644
index 000000000000..26b5ba2fe766
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20210312
@@ -0,0 +1,10 @@
+BDEPEND=sys-apps/osinfo-db-tools
+DEFINED_PHASES=install unpack
+DESCRIPTION=osinfo database files
+EAPI=7
+HOMEPAGE=https://libosinfo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20210312.tar.xz
+_md5_=00d7f9104a552daefa925d15a1f2d912
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0
new file mode 100644
index 000000000000..06fdf7218623
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=sys-devel/gettext-0.19.8 dev-lang/perl test? ( || ( ( dev-lang/python:3.9 dev-python/pytest[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pytest[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pytest[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=app-arch/libarchive-3.0.0:= net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0
+DESCRIPTION=Tools for managing the osinfo database
+EAPI=7
+HOMEPAGE=https://libosinfo.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=app-arch/libarchive-3.0.0:= net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a2f1f3cce918f177aa91ee5015a9b8b
diff --git a/metadata/md5-cache/sys-apps/pick-3.0.1 b/metadata/md5-cache/sys-apps/pick-3.0.1
deleted file mode 100644
index 183a7484e712..000000000000
--- a/metadata/md5-cache/sys-apps/pick-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=a fuzzy search tool for the command-line
-EAPI=7
-HOMEPAGE=https://github.com/mptre/pick
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/mptre/pick/releases/download/v3.0.1/pick-3.0.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c52a439f335977ebb821f05e3c75058f
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
deleted file mode 100644
index 43091053788f..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=a framework for package management
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa315fbba11b613696d3639375f38485
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r3 b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r3
new file mode 100644
index 000000000000..01c51f5261d1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=a framework for package management
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.13.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e7a0e047607846ea14b5be3300bc04c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.14 b/metadata/md5-cache/sys-apps/pkgcore-0.10.14
deleted file mode 100644
index a68bb0c3b3a2..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=a framework for package management
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1738646b6ba35a653b9d4d3c6a88140f
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r1
deleted file mode 100644
index c9734dde7dc8..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=a framework for package management
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a76e03a90907576db1a82e438446dcc
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r3 b/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r3
new file mode 100644
index 000000000000..c6f7771b845e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.14-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=a framework for package management
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.14.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b18047549a16ed0b8c14c4705db2c258
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.0 b/metadata/md5-cache/sys-apps/pkgcore-0.11.0
deleted file mode 100644
index 867ee8528a30..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fccae7f06172d9a57c765371f6979553
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.1 b/metadata/md5-cache/sys-apps/pkgcore-0.11.1
deleted file mode 100644
index 69d2326e7715..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fccae7f06172d9a57c765371f6979553
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.2
deleted file mode 100644
index 1227300ddac3..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85ded27b4d40982233daf77bd0b08052
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.2-r2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.2-r2
new file mode 100644
index 000000000000..dad8262ef479
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=48afdab65ebd7783272e0902aea9485c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.3 b/metadata/md5-cache/sys-apps/pkgcore-0.11.3
deleted file mode 100644
index 8edabcc16baf..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=518e42561e2f865f7658313d44b85b8e
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.3-r2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.3-r2
new file mode 100644
index 000000000000..f106a2dee4ee
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7ab1dc1980ea522fcc89326e59b64a6c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.4 b/metadata/md5-cache/sys-apps/pkgcore-0.11.4
deleted file mode 100644
index e347c2801485..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cbfc32383e28842c7ee82f51c7bdb24f
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2
new file mode 100644
index 000000000000..c3858530499d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dc8fa06dc631521facf8e63f59ac8115
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.5-r2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.5-r2
new file mode 100644
index 000000000000..673d687daf6d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.5-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.5.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3d48911c0aa131a35140d0b5f16c8fd6
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.6 b/metadata/md5-cache/sys-apps/pkgcore-0.11.6
new file mode 100644
index 000000000000..340c8e67908c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.6.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cbfc32383e28842c7ee82f51c7bdb24f
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.5 b/metadata/md5-cache/sys-apps/plocate-1.1.5
new file mode 100644
index 000000000000..5aca425b5706
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.54.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/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+DESCRIPTION=Posting locate is a much faster locate
+EAPI=7
+HOMEPAGE=https://plocate.sesse.net/
+IUSE=+io-uring kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2 GPL-2+
+RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+SLOT=0
+SRC_URI=https://plocate.sesse.net/download/plocate-1.1.5.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a588d5ec400cf5243b08177edf85c97f
diff --git a/metadata/md5-cache/sys-apps/systemd-247.2-r4 b/metadata/md5-cache/sys-apps/systemd-247.2-r4
index 364bac1bedff..fa6b39075acc 100644
--- a/metadata/md5-cache/sys-apps/systemd-247.2-r4
+++ b/metadata/md5-cache/sys-apps/systemd-247.2-r4
@@ -5,7 +5,7 @@ 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 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
+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(-)?] 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= ) 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/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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6e332d9b8fb5d7661bea1689d2a5e9e
+_md5_=0d805a7491fd0209706e0aa690bdf2eb
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
deleted file mode 100644
index e62ad8aaacbc..000000000000
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=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=mount and unmount removable devices without a password
-EAPI=6
-HOMEPAGE=https://ignorantguru.github.com/udevil/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
-SLOT=0
-SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e55d119d1a36f400a0a59daedbcbaa2f
diff --git a/metadata/md5-cache/sys-apps/which-2.21 b/metadata/md5-cache/sys-apps/which-2.21
index 464eb125f8b5..516d0459c08d 100644
--- a/metadata/md5-cache/sys-apps/which-2.21
+++ b/metadata/md5-cache/sys-apps/which-2.21
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure
 DESCRIPTION=Prints out location of specified executables that are in your path
-EAPI=6
+EAPI=7
 HOMEPAGE=https://carlowood.github.io/which/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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
 SLOT=0
 SRC_URI=https://carlowood.github.io/which/which-2.21.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=42728150df062f4e6e4baf1f34f0f746
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=68e7f8f29c180b24b4ae3111fb6e8010
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.1 b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.1
new file mode 100644
index 000000000000..f202b9da859e
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+DESCRIPTION=Official authentication app for German ID cards and residence permits
+EAPI=7
+HOMEPAGE=https://www.ausweisapp.bund.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=EUPL-1.2
+RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+SLOT=0
+SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.22.1.tar.gz -> AusweisApp2-1.22.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5350c05a00480efdac493e0de08e554c
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 521e30177ba2..53190250f063 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/fprintd-0.8.1-r3 b/metadata/md5-cache/sys-auth/fprintd-0.8.1-r3
index 29125d33a534..f8cf45e0affc 100644
--- a/metadata/md5-cache/sys-auth/fprintd-0.8.1-r3
+++ b/metadata/md5-cache/sys-auth/fprintd-0.8.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=D-Bus service to access fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/fprintd/
 IUSE=doc pam
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint:0 sys-auth/polkit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_8_1.tar.bz2 -> fprintd-0.8.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db22a99d53d02c4cbbd4bad39f60ffed
+_md5_=0118054c8912a379beafadd9114aa71d
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.0 b/metadata/md5-cache/sys-auth/libfprint-1.0
index c79471d8944c..14732fd6ca32 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.0
+++ b/metadata/md5-cache/sys-auth/libfprint-1.0
@@ -5,10 +5,10 @@ DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_1_0.tar.gz -> libfprint-1.0.tar.gz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=b64165d7c215a9dcfdbe257f3d7d7237
+_md5_=68f129cf83f3a79be41d4892c640fdac
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.97-r8 b/metadata/md5-cache/sys-auth/otpcalc-0.97-r8
deleted file mode 100644
index df6b5e338694..000000000000
--- a/metadata/md5-cache/sys-auth/otpcalc-0.97-r8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/openssl:0= virtual/pkgconfig
-DESCRIPTION=A One Time Password and S/Key calculator for X
-EAPI=6
-HOMEPAGE=http://www.killa.net/infosec/otpCalc/
-KEYWORDS=~alpha amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://www.killa.net/infosec/otpCalc/otpCalc-0.97.tar.gz https://dev.gentoo.org/~ulm/distfiles/otpcalc-0.97-patches-1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=21661fa8dad010e6572112f54b58ca2a
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.97.9 b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
index f76e08b2c848..fc06d68ef7df 100644
--- a/metadata/md5-cache/sys-auth/otpcalc-0.97.9
+++ b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:0= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/
 DESCRIPTION=A One Time Password and S/Key calculator for GTK+
 EAPI=7
 HOMEPAGE=http://www.killa.net/infosec/otpCalc/ https://gitlab.com/ulm/otpcalc
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/openssl:0= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://gitlab.com/ulm/otpcalc/-/archive/0.97.9/otpcalc-0.97.9.tar.bz2
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4604e36d565780a0d31f0b3148d0665
+_md5_=a560ab01242412baa4024952f94fe11c
diff --git a/metadata/md5-cache/sys-auth/passwdqc-2.0.1 b/metadata/md5-cache/sys-auth/passwdqc-2.0.1
new file mode 100644
index 000000000000..f5ba92721117
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/passwdqc-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=sys-libs/pam
+DESCRIPTION=Password strength checking library (and PAM module)
+EAPI=7
+HOMEPAGE=http://www.openwall.com/passwdqc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Openwall BSD public-domain
+RDEPEND=sys-libs/pam
+SLOT=0
+SRC_URI=http://www.openwall.com/passwdqc/passwdqc-2.0.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=247febe910371000a2976f39671cdd4e
diff --git a/metadata/md5-cache/sys-auth/seatd-0.5.0 b/metadata/md5-cache/sys-auth/seatd-0.5.0
new file mode 100644
index 000000000000..a4ef1ae2a810
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/seatd-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Minimal seat management daemon and universal library
+EAPI=7
+HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~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_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9fb398337cd9ad49d2b4b7846815571f
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 107e99710cb0..f403fbbae37b 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/di-4.47.3 b/metadata/md5-cache/sys-block/di-4.47.3
deleted file mode 100644
index aa6a5db338f4..000000000000
--- a/metadata/md5-cache/sys-block/di-4.47.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Disk Information Utility
-EAPI=7
-HOMEPAGE=https://gentoo.com/di/
-IUSE=nls
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=ZLIB
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gentoo.com/di/di-4.47.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ba88cb3180ac6253000c01ccbcd87b2
diff --git a/metadata/md5-cache/sys-block/di-4.48.0.1 b/metadata/md5-cache/sys-block/di-4.48.0.1
index 6a7717b48571..05b57058d58c 100644
--- a/metadata/md5-cache/sys-block/di-4.48.0.1
+++ b/metadata/md5-cache/sys-block/di-4.48.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Disk Information Utility
 EAPI=7
 HOMEPAGE=https://diskinfo-di.sourceforge.io/
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ~ppc64 ~x86
 LICENSE=ZLIB
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/diskinfo-di/di-4.48.0.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96289b65103c14b9be0a186450576831
+_md5_=edb7e60f9ad8b241b8c75ada1e1f4da8
diff --git a/metadata/md5-cache/sys-block/di-4.49 b/metadata/md5-cache/sys-block/di-4.49
new file mode 100644
index 000000000000..5ea44f42b73f
--- /dev/null
+++ b/metadata/md5-cache/sys-block/di-4.49
@@ -0,0 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Disk Information Utility
+EAPI=7
+HOMEPAGE=https://diskinfo-di.sourceforge.io/
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=ZLIB
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/diskinfo-di/di-4.49.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=96289b65103c14b9be0a186450576831
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.1 b/metadata/md5-cache/sys-block/open-iscsi-2.1.1
deleted file mode 100644
index 5aa22ad6b138..000000000000
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
-EAPI=7
-HOMEPAGE=http://www.open-iscsi.com/
-IUSE=debug infiniband libressl +tcp rdma systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd ) sys-fs/lsscsi sys-apps/util-linux
-REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
-SLOT=0/0.2
-SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.1.tar.gz -> open-iscsi-2.1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6517e3f343199853abb9ed288cea4e4b
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.2 b/metadata/md5-cache/sys-block/open-iscsi-2.1.2
deleted file mode 100644
index 72e6da2d5008..000000000000
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
-EAPI=7
-HOMEPAGE=http://www.open-iscsi.com/
-IUSE=debug infiniband libressl +tcp rdma systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd ) sys-fs/lsscsi sys-apps/util-linux
-REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
-SLOT=0/0.2
-SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.2.tar.gz -> open-iscsi-2.1.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6517e3f343199853abb9ed288cea4e4b
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1
new file mode 100644
index 000000000000..c6136239d085
--- /dev/null
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
+EAPI=7
+HOMEPAGE=http://www.open-iscsi.com/
+IUSE=debug infiniband libressl +tcp rdma systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd ) sys-fs/lsscsi sys-apps/util-linux
+REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
+SLOT=0/0.2
+SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.4.tar.gz -> open-iscsi-2.1.4.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0a68ac4bec225b0b8cd16d37a5b3a5a6
diff --git a/metadata/md5-cache/sys-block/open-isns-0.101 b/metadata/md5-cache/sys-block/open-isns-0.101
index 81d223a7433a..b905fe568fa2 100644
--- a/metadata/md5-cache/sys-block/open-isns-0.101
+++ b/metadata/md5-cache/sys-block/open-isns-0.101
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-isns/archive/v0.101.tar.gz -> open-isns-0.101.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b8a570aa03560bc37b6b1ca684cc854
+_md5_=cfa934e75a653074d65c6d780b34022b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index dde2c818d890..9ac096b8ed12 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/grub-2.04-r2 b/metadata/md5-cache/sys-boot/grub-2.04-r2
index 4ecf3183d38d..33f7f9f97d5d 100644
--- a/metadata/md5-cache/sys-boot/grub-2.04-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.04-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2/2.04-r2
 SRC_URI=mirror://gnu/grub/grub-2.04.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=920f588317eed12ad7350f5192a40a79
+_md5_=0a6ed2b475f228e63974e23bf88cd419
diff --git a/metadata/md5-cache/sys-boot/grub-2.06_rc1 b/metadata/md5-cache/sys-boot/grub-2.06_rc1
new file mode 100644
index 000000000000..3a507e5d85c8
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/grub-2.06_rc1
@@ -0,0 +1,16 @@
+BDEPEND=app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+DESCRIPTION=GNU GRUB boot loader
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/grub/
+IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
+REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
+RESTRICT=!test? ( test )
+SLOT=2/2.06_rc1
+SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.06~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e798b1e2ba1bdec2a6706aa4cabb054c
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index b9194c137a03..1221399a9802 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 DESCRIPTION=GNU GRUB boot loader
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/grub/
 IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
 LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
 RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d8f67a65f0ee72e5ace5534a5eec485
+_md5_=e798b1e2ba1bdec2a6706aa4cabb054c
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 70094cd48334..4b7cb80d1eaf 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-14.2.17 b/metadata/md5-cache/sys-cluster/ceph-14.2.17
deleted file mode 100644
index 3ee9289c9068..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= <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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs 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_7 python_targets_python3_8
-KEYWORDS=~amd64 ~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=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= <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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyjwt-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.17.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cea868eb4c1124302a6fade97eb7b85
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.18 b/metadata/md5-cache/sys-cluster/ceph-14.2.18
new file mode 100644
index 000000000000..591f58ac643b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.18
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= <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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs 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_7 python_targets_python3_8
+KEYWORDS=~amd64 ~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=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= <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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyjwt-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.18.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7cea868eb4c1124302a6fade97eb7b85
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.10 b/metadata/md5-cache/sys-cluster/ceph-15.2.10
new file mode 100644
index 000000000000..1c37c1d26e36
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.10
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= 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/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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) 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/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs 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_7 python_targets_python3_8 python_targets_python3_9
+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=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= 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/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:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) 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/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyjwt-2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.10.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=149f46ad9555eded7fad489d8597ce80
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1 b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1
deleted file mode 100644
index 00600530caa3..000000000000
--- a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
-DESCRIPTION=mirror/replicate block-devices across a network-connection
-EAPI=7
-HOMEPAGE=https://www.linbit.com/drbd
-IUSE=pacemaker +udev xen
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
-SLOT=0
-SRC_URI=https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=2309a09d9a65c3cf36688f08999b24b3
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1 b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
new file mode 100644
index 000000000000..f32ce39899d8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
+DESCRIPTION=mirror/replicate block-devices across a network-connection
+EAPI=7
+HOMEPAGE=https://www.linbit.com/drbd
+IUSE=pacemaker +udev xen
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=1f007aedcc925d341ec2d350f9e44d2d
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.7 b/metadata/md5-cache/sys-cluster/glusterfs-7.7
deleted file mode 100644
index d2bb1576acfe..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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 postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.7/glusterfs-7.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=315f3db5dd2c73d9bb73b83219356e81
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.8-r1 b/metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
deleted file mode 100644
index 8606fd3aad09..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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 postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.8/glusterfs-7.8.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9fa67ea4aaf9b6ec157424e3b8d0e4eb
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.9 b/metadata/md5-cache/sys-cluster/glusterfs-7.9
index 0c82939ecc34..6d164b855b8b 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.9
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.9
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/7
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.9/glusterfs-7.9.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=28982f36d4afd455b2a7639e1e8dbff7
+_md5_=14464ebf364e18d8bb592452c8885d44
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.3 b/metadata/md5-cache/sys-cluster/glusterfs-8.3
index 81ff93dd0da2..96693f6472ab 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.3
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.3/glusterfs-8.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e7c6ecd9898f7fff90b2b235975892df
+_md5_=461c879e654bbd8a7f8ea9eead490b5a
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.4 b/metadata/md5-cache/sys-cluster/glusterfs-8.4
new file mode 100644
index 000000000000..1e5286abe2bb
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=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 postrm prepare setup test
+DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
+IUSE=debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) xml ) ipv6? ( libtirpc )
+RESTRICT=test
+SLOT=0/8
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.4/glusterfs-8.4.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=245c4411f285dcfedca7a6b15a0fa783
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9.0 b/metadata/md5-cache/sys-cluster/glusterfs-9.0
index a3c1e8453fe1..9d32e553f577 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9.0
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/9
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/9/9.0/glusterfs-9.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=48b37db8d728fd5b1bf8874529fc9514
+_md5_=245c4411f285dcfedca7a6b15a0fa783
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9999 b/metadata/md5-cache/sys-cluster/glusterfs-9999
deleted file mode 100644
index dd500c1cd182..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-LICENSE=|| ( GPL-2 LGPL-3+ )
-PROPERTIES=live
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a3de08270c26d1987fb720208b721d7
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.15 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.15
deleted file mode 100644
index 4f6ecfc4cb1a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=31999d154f0e60f1fe02f7717920305e
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16
index 732a9be7ee87..2d558e454fbc 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 DESCRIPTION=Kubernetes API server
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=31999d154f0e60f1fe02f7717920305e
+_md5_=15f346faed426145480f49fbbd3dc3e0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17
new file mode 100644
index 000000000000..c34e3967f1a3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c6ed8618e743b4f1fcbfca93b1012ba3
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.7
deleted file mode 100644
index 9e1cd4f69642..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d20e7c72886afc0fbc34d3261d0981eb
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.9
new file mode 100644
index 000000000000..1a0f46aabd0e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.9
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e16a9a5ddf1116c30f809d05134d7148
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.5
new file mode 100644
index 000000000000..9683bec15e75
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e16a9a5ddf1116c30f809d05134d7148
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.15 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.15
deleted file mode 100644
index 4c61b331bb67..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=8fa6510dcd0623fd2d995fb498a7e319
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16
index 120c569e7fce..df87e7f83d7d 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 DESCRIPTION=Kubernetes Controller Manager
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=8fa6510dcd0623fd2d995fb498a7e319
+_md5_=51758dc16e8c05844f5abd104cd67570
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17
new file mode 100644
index 000000000000..708cf2626025
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e2646b9e6e507003ebd802815ba8b4cb
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.7
deleted file mode 100644
index e1af4b0ed2fa..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=8b6c0d4d904f5f14c3d433f98c7cd7d6
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.9
new file mode 100644
index 000000000000..30fcd291da36
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.9
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e139ccc1e65e258bd411b84b4f9dc75f
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.5
new file mode 100644
index 000000000000..86cd22dd8ac2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e139ccc1e65e258bd411b84b4f9dc75f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.15 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.15
deleted file mode 100644
index 0322823f5417..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=3d53f61a1e26b18f452584760fbc296f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16
index 5f7d2979cd2d..ef613f6311c5 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Kubernetes Proxy service
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=3d53f61a1e26b18f452584760fbc296f
+_md5_=1bca40e401c9bef0205ad3732e993a17
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17
new file mode 100644
index 000000000000..6026b9fb525a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=8b450065039ae7f97a0515ef036c3948
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.7
deleted file mode 100644
index c5551b1b3717..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1295262c21a756305484af75a8f0c840
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.9 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.9
new file mode 100644
index 000000000000..929458181ed4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.9
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=0fe281a765d94ad243504314573ecafe
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.20.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.5
new file mode 100644
index 000000000000..3fbf81247c52
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=0fe281a765d94ad243504314573ecafe
diff --git a/metadata/md5-cache/sys-cluster/kube-router-0.4.0 b/metadata/md5-cache/sys-cluster/kube-router-0.4.0
deleted file mode 100644
index 0f13552578a8..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-router-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=A turnkey solution for Kubernetes networking
-EAPI=7
-HOMEPAGE=https://kube-router.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
-RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudnativelabs/kube-router/archive/v0.4.0.tar.gz -> kube-router-0.4.0.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=fadbefcc3996f0aeeb3f2e7c89b2c301
diff --git a/metadata/md5-cache/sys-cluster/kube-router-1.0.1 b/metadata/md5-cache/sys-cluster/kube-router-1.0.1
deleted file mode 100644
index 7a2659a90d51..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-router-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=A turnkey solution for Kubernetes networking
-EAPI=7
-HOMEPAGE=https://kube-router.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
-RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/cloudnativelabs/kube-router/archive/v1.0.1.tar.gz -> kube-router-1.0.1.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=ece2a11d35b97074181e6dca2c5d9fb8
diff --git a/metadata/md5-cache/sys-cluster/kube-router-1.1.0 b/metadata/md5-cache/sys-cluster/kube-router-1.1.0
deleted file mode 100644
index 6259cfc2c0e2..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-router-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst test unpack
-DESCRIPTION=A turnkey solution for Kubernetes networking
-EAPI=7
-HOMEPAGE=https://kube-router.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
-RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/cloudnativelabs/kube-router/archive/v1.1.0.tar.gz -> kube-router-1.1.0.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=fc1e8bf1c883993a970d95919de25268
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.15 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.15
deleted file mode 100644
index 3f11feeeea79..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=a4b200a1100acc05e9da4a904b223ba9
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16
index 542ff6267b0d..0284b28662b5 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 DESCRIPTION=Kubernetes Scheduler
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=a4b200a1100acc05e9da4a904b223ba9
+_md5_=727ff481a4696acff0328f6db49f63ca
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17
new file mode 100644
index 000000000000..bea943943c47
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=eb80620979c08e10a7eeb6a36451ad24
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.7
deleted file mode 100644
index f884f894e312..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1a2ec21fc573554b1facd2a40a9826be
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.9
new file mode 100644
index 000000000000..77379c7ed9ae
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.9
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=7a24b85a26f70a47d21e46c2836b12c7
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.5
new file mode 100644
index 000000000000..63fe50582e73
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=7a24b85a26f70a47d21e46c2836b12c7
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.15 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.15
deleted file mode 100644
index 3bf765d4cdb5..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b5d59ff3e88aba1c1b0daf7872d96930
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.16 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.16
index e213ba8f207e..7128a9b20c25 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b5d59ff3e88aba1c1b0daf7872d96930
+_md5_=335a19a564072401804740ad9cea6aad
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.17 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.17
new file mode 100644
index 000000000000..652c47f35b1f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.17
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=29e4c4d50021ed3acd0583c09ff5c99c
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.7
deleted file mode 100644
index cae0a884caa3..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.19.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ad2e7fd861a99cdf6069afee5aa882df
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.9 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.9
new file mode 100644
index 000000000000..7886c0266c50
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.9
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=afb44926372eb98e7d0694239613278d
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.20.5 b/metadata/md5-cache/sys-cluster/kubeadm-1.20.5
new file mode 100644
index 000000000000..cbc9d83273f5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.20.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=afb44926372eb98e7d0694239613278d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.15 b/metadata/md5-cache/sys-cluster/kubectl-1.18.15
deleted file mode 100644
index 2cf2c798f3ae..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=132422d6ddcd5ea70aa1684d6adad311
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.16 b/metadata/md5-cache/sys-cluster/kubectl-1.18.16
index 68ed0b45fde1..c4b1181e5e95 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=132422d6ddcd5ea70aa1684d6adad311
+_md5_=9b5bcb08283a8294d9b7c8d2480b32ab
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.17 b/metadata/md5-cache/sys-cluster/kubectl-1.18.17
new file mode 100644
index 000000000000..aff71a1c8c2d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.17
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=71c653d56758dab32c8b2efdc05325f3
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.7 b/metadata/md5-cache/sys-cluster/kubectl-1.19.7
deleted file mode 100644
index d92fc393b97b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.19.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=!sys-cluster/kubernetes
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8d88b13f3403939ad60382363793ff22
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.9 b/metadata/md5-cache/sys-cluster/kubectl-1.19.9
new file mode 100644
index 000000000000..41a5ebd1c17c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.9
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1d975c88b26246d225ac030a58cb6c2d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.20.5 b/metadata/md5-cache/sys-cluster/kubectl-1.20.5
new file mode 100644
index 000000000000..f2cd59185846
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.20.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1d975c88b26246d225ac030a58cb6c2d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.15 b/metadata/md5-cache/sys-cluster/kubelet-1.18.15
deleted file mode 100644
index 8065c6183103..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.18.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.15.tar.gz -> kubernetes-1.18.15.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16cc2136286582be3b8d9fa348f7a62f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.16 b/metadata/md5-cache/sys-cluster/kubelet-1.18.16
index 46a2e9940d32..ae650f9a9f23 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.18.16
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.18.16
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Kubernetes Node Agent
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16cc2136286582be3b8d9fa348f7a62f
+_md5_=e7554604a6dd9bb3f7bd7f74206c9b38
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.17 b/metadata/md5-cache/sys-cluster/kubelet-1.18.17
new file mode 100644
index 000000000000..4c0235185da4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.18.17
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a7c3a77a0002c4489cc2036848ba063c
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.7 b/metadata/md5-cache/sys-cluster/kubelet-1.19.7
deleted file mode 100644
index 4014851a2a53..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.19.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.7.tar.gz -> kubernetes-1.19.7.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f759e8214a664601ddbcf321044bfe23
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.9 b/metadata/md5-cache/sys-cluster/kubelet-1.19.9
new file mode 100644
index 000000000000..86230cc191da
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.19.9
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.9.tar.gz -> kubernetes-1.19.9.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=155188854e512cd660297f5916e7ee83
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.20.5 b/metadata/md5-cache/sys-cluster/kubelet-1.20.5
new file mode 100644
index 000000000000..441e3fa69961
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.20.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.5.tar.gz -> kubernetes-1.20.5.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=155188854e512cd660297f5916e7ee83
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
deleted file mode 100644
index 8d7cf25623ac..000000000000
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/mpi doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170815
-DESCRIPTION=API for distributing embarrassingly parallel workloads using self-stabilization
-EAPI=5
-HOMEPAGE=https://github.com/hpc/libcircle
-IUSE=doc test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=virtual/mpi
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hpc/libcircle/archive/0.2.0-rc.1.tar.gz -> libcircle-0.2.0_rc1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4c06dbcc2bc854256ad3b750e897030
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
deleted file mode 100644
index a6669b1c8270..000000000000
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/mpi doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170815
-DESCRIPTION=API for distributing embarrassingly parallel workloads using self-stabilization
-EAPI=5
-HOMEPAGE=https://github.com/hpc/libcircle
-IUSE=doc test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=virtual/mpi
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hpc/libcircle/archive/0.2.1-rc.1.tar.gz -> libcircle-0.2.1_rc1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4c06dbcc2bc854256ad3b750e897030
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.3.0 b/metadata/md5-cache/sys-cluster/libcircle-0.3.0
index c960ec74215f..b04636fcbea9 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.3.0
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.3.0
@@ -1,13 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=configure install
-DEPEND=virtual/mpi doc? ( app-doc/doxygen ) test? ( dev-libs/check )
+DEPEND=virtual/mpi test? ( dev-libs/check )
 DESCRIPTION=API for distributing embarrassingly parallel workloads using self-stabilization
 EAPI=7
 HOMEPAGE=https://github.com/hpc/libcircle
-IUSE=doc static-libs test
+IUSE=doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=virtual/mpi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/releases/download/v0.3/libcircle-0.3.0.tar.gz
-_md5_=4857bc0596af9546455ec861e88a6fcc
+_md5_=8054331052dc0430a782a20727da0b35
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.17.2 b/metadata/md5-cache/sys-cluster/libqb-0.17.2
deleted file mode 100644
index 4ec45f5802af..000000000000
--- a/metadata/md5-cache/sys-cluster/libqb-0.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) >=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 providing high performance logging, tracing, ipc, and poll
-EAPI=5
-HOMEPAGE=https://github.com/ClusterLabs/libqb
-IUSE=debug doc examples static-libs test
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v0.17.2/libqb-0.17.2.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f66c2d58ffd23f3c781ca3886fdf4119
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.0.5 b/metadata/md5-cache/sys-cluster/libqb-1.0.5
deleted file mode 100644
index 2b005691de74..000000000000
--- a/metadata/md5-cache/sys-cluster/libqb-1.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
-EAPI=7
-HOMEPAGE=https://github.com/ClusterLabs/libqb
-IUSE=debug doc examples test
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v1.0.5/libqb-1.0.5.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=28af5ec2efa3c026ecf1466e58120a38
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.9.0 b/metadata/md5-cache/sys-cluster/libqb-1.9.0
deleted file mode 100644
index 4dbc2f68789d..000000000000
--- a/metadata/md5-cache/sys-cluster/libqb-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
-EAPI=7
-HOMEPAGE=https://github.com/ClusterLabs/libqb
-IUSE=debug doc examples systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-RESTRICT=!test? ( test )
-SLOT=0/20
-SRC_URI=https://github.com/ClusterLabs/libqb/archive/v1.9.0.tar.gz -> libqb-1.9.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=affc0b35dc2d0bb4c512761be3d252e1
diff --git a/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1 b/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
index 4349bdb0455a..657bc8575c72 100644
--- a/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
+++ b/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/100
 SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v2.0.1/libqb-2.0.1.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45154f1022b7cc4e270b7645e60dde37
+_md5_=a4e318d21e501a4f2d61a51fbf346f2a
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.3.1 b/metadata/md5-cache/sys-cluster/neutron-16.3.1
new file mode 100644
index 000000000000..0b759fd76763
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-16.3.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
+DESCRIPTION=A virtual network service for Openstack
+EAPI=7
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.3.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.3.1.tar.gz https://tarballs.openstack.org/neutron/neutron-16.3.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6dc5fe2d42b2553d9fc9c9cfb016ad4e
diff --git a/metadata/md5-cache/sys-cluster/neutron-17.1.1 b/metadata/md5-cache/sys-cluster/neutron-17.1.1
new file mode 100644
index 000000000000..161b8541ee91
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-17.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo
+DESCRIPTION=A virtual network service for Openstack
+EAPI=7
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 python_targets_python3_8 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/neutron-lib-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tenacity-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-4.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ovsdbapp-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyroute2-0.5.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyudev[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-17.1.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-17.1.1.tar.gz https://tarballs.openstack.org/neutron/neutron-17.1.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=62dbf8cace71fde4fba09887443a1ba8
diff --git a/metadata/md5-cache/sys-cluster/nova-21.2.0 b/metadata/md5-cache/sys-cluster/nova-21.2.0
new file mode 100644
index 000000000000..a374658e2c7d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-21.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
+DESCRIPTION=Cloud computing fabric controller
+EAPI=7
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-2.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/greenlet-0.4.14[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-6.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-4.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-traits-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.2.0 https://tarballs.openstack.org/nova/nova-21.2.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d6625cd78cfe587fb6e85c7da87e3e5e
diff --git a/metadata/md5-cache/sys-cluster/nova-22.2.0 b/metadata/md5-cache/sys-cluster/nova-22.2.0
new file mode 100644
index 000000000000..ac39518bb4ee
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-22.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo
+DESCRIPTION=Cloud computing fabric controller
+EAPI=7
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/decorator-4.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.4.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paramiko-2.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-6.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-brick-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-traits-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-xenapi-0.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.2.0 https://tarballs.openstack.org/nova/nova-22.2.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=429c7817517c9c772d7b3c9c173683b7
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1
deleted file mode 100644
index e746d3af4a44..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=7
-HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
-IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
-REQUIRED_USE=torque? ( perl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a185f369ce93695123fe8f39d635d515
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r1 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r1
new file mode 100644
index 000000000000..a7f998764e00
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=7
+HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
+REQUIRED_USE=torque? ( perl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6977a21b1ccc18b0435a80a135af2911
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
deleted file mode 100644
index b3695d5f78df..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=7
-HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
-IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) torque? ( perl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0141719665f8e71cdc10db94dbc62d83
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
new file mode 100644
index 000000000000..648e87e347f9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=7
+HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) torque? ( perl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cd185fc539fe4a2f37767f35a3f0091b
diff --git a/metadata/md5-cache/sys-cluster/teleport-4.0.10 b/metadata/md5-cache/sys-cluster/teleport-4.0.10
deleted file mode 100644
index 5dd0ecd861bc..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-4.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/zip >=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=7
-HOMEPAGE=https://gravitational.com/teleport
-IUSE=pam
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0 MIT BSD ISC
-RDEPEND=pam? ( sys-libs/pam )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v4.0.10.tar.gz -> teleport-4.0.10.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e0c5a5ce394c31a2a078f83508cf1903
diff --git a/metadata/md5-cache/sys-cluster/teleport-4.0.9 b/metadata/md5-cache/sys-cluster/teleport-4.0.9
deleted file mode 100644
index d22846543982..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-4.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/zip >=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=7
-HOMEPAGE=https://gravitational.com/teleport
-IUSE=pam
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0 MIT BSD ISC
-RDEPEND=pam? ( sys-libs/pam )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v4.0.9.tar.gz -> teleport-4.0.9.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e0c5a5ce394c31a2a078f83508cf1903
diff --git a/metadata/md5-cache/sys-cluster/teleport-4.1.1 b/metadata/md5-cache/sys-cluster/teleport-4.1.1
deleted file mode 100644
index 0a8a968e251d..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/zip >=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=7
-HOMEPAGE=https://gravitational.com/teleport
-IUSE=pam
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0 MIT BSD ISC
-RDEPEND=pam? ( sys-libs/pam )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v4.1.1.tar.gz -> teleport-4.1.1.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e0c5a5ce394c31a2a078f83508cf1903
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 011750bebc0f..04b7aab0fb37 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71 b/metadata/md5-cache/sys-devel/autoconf-2.71
index 736182ea4550..fec1342bd126 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.71
+++ b/metadata/md5-cache/sys-devel/autoconf-2.71
@@ -11,4 +11,4 @@ RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-1
 SLOT=2.71
 SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz
 _eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=f65fa65cde3c5c7b436f42f54d043ddf
+_md5_=c5fde1bd42a8c697465a56f40b902710
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 7a8f0e3b1cc8..d3551c0807aa 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
 SLOT=0
-SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
+SRC_URI=https://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79c6b5b9af69ea9d150534e5e96a79da
+_md5_=d7abff1f75a131da91e0d612d1d8b7df
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.3.2 b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
index 043e9726647e..b5235af4b434 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.3.2
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.3.2.tar.xz
 _eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=cbb7003b9cabc1a36a4e8c875dc58b04
+_md5_=9dd5cdb7c14f53d61917d58626bdd625
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.4 b/metadata/md5-cache/sys-devel/binutils-config-5.4
index eb5cc2a92920..9f161ae25a0a 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.4
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.4
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.4.tar.xz
 _eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=3d32c9cc5f81fc7f59deae2ec2a0731e
+_md5_=08cac5af91fc5987df6d52ef82185c00
diff --git a/metadata/md5-cache/sys-devel/binutils-config-9999 b/metadata/md5-cache/sys-devel/binutils-config-9999
index 8c7d393a93cb..ff677ac35363 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-9999
+++ b/metadata/md5-cache/sys-devel/binutils-config-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=cdbeb644b00c5960463b63ea4b601fe3
+_md5_=08cac5af91fc5987df6d52ef82185c00
diff --git a/metadata/md5-cache/sys-devel/clang-11.1.0 b/metadata/md5-cache/sys-devel/clang-11.1.0
index 4ccfe90b278c..3742910936fc 100644
--- a/metadata/md5-cache/sys-devel/clang-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-11.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.1.0 default-compiler-rt? ( =sys-libs/compiler-rt-11.1.0* ) default-libcxx? ( >=sys-libs/libcxx-11.1.0 ) default-lld? ( sys-devel/lld )
 RDEPEND=~sys-devel/llvm-11.1.0:11=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.1.0:11[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -14,4 +14,4 @@ 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 )
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9a3075a567ab65bbaf25e05e8bbdef7
+_md5_=cfd660b79945be4ab3eb6d0b329df1da
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 d46f17dc9837..8b3be12c8e9a 100644
--- a/metadata/md5-cache/sys-devel/clang-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-common-11.1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5ece089978e574aac85b4d9d19a562ff
+_md5_=b42c9b411615c15a259b4219149d6ea3
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-11.1.0 b/metadata/md5-cache/sys-devel/clang-runtime-11.1.0
index 192a949c10c2..6d1374aedefe 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-11.1.0
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=7
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-11.1.0:11.1.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-11.1.0:11.1.0 ) ) libcxx? ( >=sys-libs/libcxx-11.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(-)?] ) openmp? ( >=sys-libs/libomp-11.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=11.1.0
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=293fcb6b0f39f3d2970771495b9674f4
+_md5_=e1e30cffd8643cb37a727a3c91877dd1
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21 b/metadata/md5-cache/sys-devel/gettext-0.21
index 97786ae6e669..99eaa0be1d0a 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21
+++ b/metadata/md5-cache/sys-devel/gettext-0.21
@@ -12,4 +12,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.tar.gz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e927164099879e5f021789cd87a61622
+_md5_=2ab23ee5bcd02a76c919b3019faae16a
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0 b/metadata/md5-cache/sys-devel/lld-11.1.0
index 6ad77cf437dc..04e8a2cc6f27 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 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	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=252535faae0aeed7fe99bb337468e651
+_md5_=bf32ce733bc2d1fd4e30d1cd28a9b85e
diff --git a/metadata/md5-cache/sys-devel/llvm-11.1.0 b/metadata/md5-cache/sys-devel/llvm-11.1.0
index 785250e91175..be6bc672cd3c 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-11.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE 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=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-11 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -14,4 +14,4 @@ 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 )
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d4373af06e93a7f297d3aeda4c687a6
+_md5_=c1b9b52ea8ff5e9211a6fc59f2bf5b29
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 096e821c93cc..11ed01c749da 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=fef0cdff58d1aefe9bfbf1e040c71260
+_md5_=89621f6eb386316daeae6753d5118392
diff --git a/metadata/md5-cache/sys-devel/make-4.3 b/metadata/md5-cache/sys-devel/make-4.3
index 552606c8d1a4..6a8df4a4c119 100644
--- a/metadata/md5-cache/sys-devel/make-4.3
+++ b/metadata/md5-cache/sys-devel/make-4.3
@@ -11,4 +11,4 @@ RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df9538f95e11a033fa41e53c6551bc72
+_md5_=44cb69b8cc3fa11d7d48f7bca240116d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c80c2e4b849b..b608747be7a1 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/compsize-1.5 b/metadata/md5-cache/sys-fs/compsize-1.5
index 3561156cb604..588955ce002a 100644
--- a/metadata/md5-cache/sys-fs/compsize-1.5
+++ b/metadata/md5-cache/sys-fs/compsize-1.5
@@ -4,9 +4,9 @@ DESCRIPTION=Utility to find btrfs compression type/ratio on a file or set of fil
 EAPI=7
 HOMEPAGE=https://github.com/kilobyte/compsize
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+ GPL-2
 SLOT=0
 SRC_URI=https://github.com/kilobyte/compsize/archive/v1.5.tar.gz -> compsize-1.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=87081543f3daaf9139f1f6fc2d0b92ee
+_md5_=9195b8539615d9f0e90360421c392c6d
diff --git a/metadata/md5-cache/sys-fs/fatresize-1.0.4 b/metadata/md5-cache/sys-fs/fatresize-1.0.4
deleted file mode 100644
index 0cd8ec9aac25..000000000000
--- a/metadata/md5-cache/sys-fs/fatresize-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-block/parted >=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=Resize FAT partitions using libparted
-EAPI=6
-HOMEPAGE=https://github.com/ya-mouse/fatresize
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-block/parted
-SLOT=0
-SRC_URI=https://github.com/ya-mouse/fatresize/archive/v1.0.4.tar.gz -> fatresize-1.0.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=937625d4707d12e21aeebe9b2cb2a0ab
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7n-r1 b/metadata/md5-cache/sys-fs/loop-aes-3.7n-r1
deleted file mode 100644
index aa67ecf9f4f7..000000000000
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7n-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-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=Linux kernel module to encrypt disk partitions with AES cipher
-EAPI=7
-HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
-IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/loop-aes/loop-AES-v3.7n.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d18fc5692a45cac46cfbceaecbbb84c
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7q-r1 b/metadata/md5-cache/sys-fs/loop-aes-3.7q-r1
deleted file mode 100644
index b3794bd0d4ec..000000000000
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7q-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
-EAPI=7
-HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
-IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7q.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a06e04b520e3eb79bd9c9b708a76648
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7t b/metadata/md5-cache/sys-fs/loop-aes-3.7t
new file mode 100644
index 000000000000..28283c8a9d01
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7t
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
+EAPI=7
+HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
+IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7t.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=44498b1c65f6316c7bae423452563c72
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.32.3 b/metadata/md5-cache/sys-fs/mergerfs-2.32.3
index c86a4add6c11..a8c8c6ca45e2 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.32.3
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.32.3
@@ -5,10 +5,10 @@ DESCRIPTION=A featureful union filesystem
 EAPI=7
 HOMEPAGE=https://github.com/trapexit/mergerfs
 IUSE=+xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC LGPL-2.1
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=https://github.com/trapexit/mergerfs/archive/2.32.3.tar.gz -> mergerfs-2.32.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb78fb241262775f57a9a51fa97391cf
+_md5_=6b1fdf98d9d2020daa1463dff0cae8f1
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0-r1 b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0-r1
index 5507b8d7b74b..ddebea1942f5 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0-r1
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3
+DEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
 DESCRIPTION=xfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 IUSE=icu libedit nls split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3
+RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=38043effe5567e7f3f2ff9be44fbc68f
+_md5_=a92da17b81595862582d09d76de075f3
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.11.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.11.0
new file mode 100644
index 000000000000..478d495c699c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.11.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+DESCRIPTION=xfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://xfs.wiki.kernel.org/
+IUSE=icu libedit nls split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.11.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dacd7b58b812ba03c6f531259f13e856
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.4.0-r1 b/metadata/md5-cache/sys-fs/xfsprogs-5.4.0-r1
deleted file mode 100644
index 206eedf33407..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
-DESCRIPTION=xfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://xfs.wiki.kernel.org/
-IUSE=icu libedit nls readline split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.4.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ec549fb8a711b13878b2a3705eb2c46e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index c903a1565c55..7ee6c4be909b 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/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index a23d3872a27d..0a01c71e9923 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
 SLOT=0
-SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.10.1.tar.xz https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.0/e2fsprogs-1.46.0.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20201207.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-28.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.2.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.41.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.10/strace-5.10.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.9.tar.gz -> zstd-1.4.9.tar.gz
+SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.11.tar.xz https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.5.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20201207.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-28.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.2.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.41.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.11/strace-5.11.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.11.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.9.tar.gz -> zstd-1.4.9.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7641be4658d28190d1a4fcc278aa03ed
+_md5_=0e150b99a54dc373e507948f644a8fca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
new file mode 100644
index 000000000000..7dee2714e6fa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.24
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.24 || ( 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.24
+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-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.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	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fba18d6ed88831c3bfb3be6f23df76b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
new file mode 100644
index 000000000000..9f50f20cdab1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.7
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.7 || ( 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.7
+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-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=33ea2a60c826727250887bdda6baddf9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
new file mode 100644
index 000000000000..d07120285eba
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) 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.106
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.106 || ( 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.106
+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-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.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	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4f80f63e54afe6ee78426218f659326e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.23-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.23-r1
new file mode 100644
index 000000000000..6aa3d1e00f03
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.23-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.23
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.23 !sys-kernel/vanilla-kernel:5.10.23 !sys-kernel/vanilla-kernel-bin:5.10.23 || ( 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.23
+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-26.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-26.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.23-1.xpak -> gentoo-kernel-5.10.23-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f8f4c4b9978dfee4974e9b77837eb997
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
new file mode 100644
index 000000000000..73ad29e7d180
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
@@ -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.24
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.24 || ( 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.24
+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-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1
new file mode 100644
index 000000000000..48a6b601cba2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.6
+RDEPEND=!sys-kernel/gentoo-kernel:5.11.6 !sys-kernel/vanilla-kernel:5.11.6 !sys-kernel/vanilla-kernel-bin:5.11.6 || ( 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.11.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-7.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6-1.xpak -> gentoo-kernel-5.11.6-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=18d9461f2af26c35945d89162d3d5f89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
new file mode 100644
index 000000000000..7a272d8596cc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
@@ -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.11.7
+RDEPEND=!sys-kernel/gentoo-kernel:5.11.7 || ( 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.11.7
+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-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r1
new file mode 100644
index 000000000000..9a730192e53a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.105
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.105 !sys-kernel/vanilla-kernel:5.4.105 !sys-kernel/vanilla-kernel-bin:5.4.105 || ( 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.105
+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-108.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-108.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105-1.xpak -> gentoo-kernel-5.4.105-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f8f4c4b9978dfee4974e9b77837eb997
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
new file mode 100644
index 000000000000..a3bc9abe74b0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
@@ -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.106
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.106 || ( 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.106
+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-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226
new file mode 100644
index 000000000000..8a29627ffd76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.226
+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-236.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-236.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-236.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1af704a6441d2f43910cc92fd44743ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181
new file mode 100644
index 000000000000..3f3458e51f5a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.181
+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-180.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-180.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-180.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4c90148c6785e72c091807174267f53d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262
new file mode 100644
index 000000000000..830e646bf816
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.262
+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-264.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-264.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-264.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5ccdd0c586afc7b3d521b68b5f186b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262
new file mode 100644
index 000000000000..af29d6614b5d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.262
+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-266.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-266.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-266.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=886cce1642cb4907ac66cb9c7adb28c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24
new file mode 100644
index 000000000000..6e797272fe8e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.24
+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-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=60251a553ed169bb2696ca59642e5f30
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7
new file mode 100644
index 000000000000..e380c34a29c6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.11 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.11.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=17044596e01bdbfb5ec162f71671df16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1
new file mode 100644
index 000000000000..72ab3748fa7a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.11 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.11.7-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d99baec764d60955def25db52f848f04
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106
new file mode 100644
index 000000000000..99289165590c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.106
+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-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-109.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bc6c1f754d3c438a37a324b6d7b68017
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.12_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.12_rc3
new file mode 100644
index 000000000000..651a022c5097
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.12_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+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.12_rc3
+SRC_URI=https://git.kernel.org/torvalds/p/v5.12-rc3/v5.11 -> patch-5.12-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9ffdfa034c239a97419a5811aafe5433
diff --git a/metadata/md5-cache/sys-kernel/installkernel-gentoo-3 b/metadata/md5-cache/sys-kernel/installkernel-gentoo-3
new file mode 100644
index 000000000000..9fd63c5d0983
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/installkernel-gentoo-3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Gentoo fork of installkernel script from debianutils
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/installkernel-gentoo
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/debianutils-4.9-r1 !<sys-apps/debianutils-4.9-r1[installkernel(+)] !sys-kernel/installkernel-systemd-boot
+SLOT=0
+SRC_URI=https://github.com/mgorny/installkernel-gentoo/archive/v3.tar.gz -> installkernel-gentoo-3.tar.gz
+_md5_=0710f4992975f3075896f70d15041fff
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210315 b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
new file mode 100644
index 000000000000..37759b92102b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
@@ -0,0 +1,15 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
+RESTRICT=strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20210315.tar.xz
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=84f43187d6add4dd48ff4cc215f036b8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
new file mode 100644
index 000000000000..97575b82f847
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.11_p4
+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-pf4.diff -> pf-sources-5.11_p4.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
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a842db0f7b35847a080bea51186ad87
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
new file mode 100644
index 000000000000..a97f99f6bffa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) 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.24
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.24 || ( 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.24
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.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	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=55d25c768d2ca6f514b0cfddb0277c73
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
new file mode 100644
index 000000000000..94a0f10e0354
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) 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.11.7
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.7 || ( 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.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=c7e39dc11f18c90fdb560df828929d00
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
new file mode 100644
index 000000000000..4d593c6b48dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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.9 dev-lang/python:3.8 dev-lang/python:3.7 ) 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.106
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.106 || ( 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.106
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.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	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225
deleted file mode 100644
index fecd81d70eed..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.225
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.225.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226
new file mode 100644
index 000000000000..11737cea08bf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.226
+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
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180
deleted file mode 100644
index 1e69aadd04cb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.180
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.180.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.182 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.182
new file mode 100644
index 000000000000..2986964a2dca
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.182
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.182
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.182.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261
deleted file mode 100644
index bed0b269163f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.261
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.261.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262
new file mode 100644
index 000000000000..ef935685738b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.262.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261
deleted file mode 100644
index 1df3daeb6c6b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.261
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.261.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262
new file mode 100644
index 000000000000..74c65883cebc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.262.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23
deleted file mode 100644
index 809f282503f9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.23
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.23.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.25 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.25
new file mode 100644
index 000000000000..286ec7b2fbe9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.25
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.25.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6
deleted file mode 100644
index 186289e764f1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.11.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.8
new file mode 100644
index 000000000000..0645a021eeff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.11.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.8.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105
deleted file mode 100644
index 042b803a82f4..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-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.105
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.105.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.107 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.107
new file mode 100644
index 000000000000..c341cb28f891
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.107
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+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.107
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.107.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 7c99d092e496..429449f39cec 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/compiler-rt-11.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
index b5efd3f5e251..4b4ff01f5a5a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 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
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3a67517be0b26739ede1ed0eda2a674
+_md5_=b13c724c9b80f9de7e5cc4aae096156c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0
index 23ee02fd8aeb..dbdeb7470add 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test elibc_glibc +libfuzzer +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 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
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb519bccab609a2aa273fe333076643b
+_md5_=adbdca7279fbd55b3f4214e4831d7aa5
diff --git a/metadata/md5-cache/sys-libs/libcap-2.47 b/metadata/md5-cache/sys-libs/libcap-2.47
deleted file mode 100644
index fbdbc45478c0..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.47
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/attr-2.4.47-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[abi_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
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/fullycapable/
-IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 BSD )
-PDEPEND=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(-)?] )
-RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.47.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=26d3b9c683ce2ab22d33d12446524803
diff --git a/metadata/md5-cache/sys-libs/libcap-2.49 b/metadata/md5-cache/sys-libs/libcap-2.49
new file mode 100644
index 000000000000..b710c7db5b85
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.49
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-apps/attr-2.4.47-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[abi_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
+DESCRIPTION=POSIX 1003.1e capabilities
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/fullycapable/
+IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD )
+PDEPEND=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(-)?] )
+RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.49.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7248b043b5192c13279217c4959b29ba
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.1.0 b/metadata/md5-cache/sys-libs/libcxx-11.1.0
index a12cfcb81591..fd88a2d55c35 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxx-11.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=7
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.1.0[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=libunwind? ( libcxxabi )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25437829b572c6976e8bc558d1aa3f6a
+_md5_=292c6eb849f118f531978896cbc6ec9b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0 b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
index 28584f63354a..4ba3fdeec319 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=7
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind static-libs test elibc_musl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46a4314373996049ec26700e9fd99eab
+_md5_=eb442b2dee5e583da4a4eb49b4aa58ed
diff --git a/metadata/md5-cache/sys-libs/libomp-11.1.0 b/metadata/md5-cache/sys-libs/libomp-11.1.0
index 69079d2921eb..125b888451c0 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.1.0
+++ b/metadata/md5-cache/sys-libs/libomp-11.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=7
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b099554c50580849a4f3ba8868f16dd
+_md5_=de56ecc6f1e01e9b7e7345ab2a8d57d4
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.9.0 b/metadata/md5-cache/sys-libs/libosinfo-1.9.0
new file mode 100644
index 000000000000..3b2b6e5d7094
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-1.56:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject library for managing information about real and virtual OSes
+EAPI=7
+HOMEPAGE=https://libosinfo.org/
+IUSE=gtk-doc +introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.9.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=963c01917cd4c5520943975b99ba01f4
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 17c6d86ccada..bcbd27026b42 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=7
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 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	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	llvm.org	ac34ccc0ab197b128f6d3d2a4fe1cc5e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdc04ddf64058f360246188a70758e8c
+_md5_=0ba51713156fda8cc852af1483715135
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.0.1 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.1
new file mode 100644
index 000000000000..e4f4fd8f205c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=zlib data compression library
+EAPI=7
+HOMEPAGE=https://github.com/zlib-ng/zlib-ng
+IUSE=compat test
+LICENSE=ZLIB
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.1.tar.gz -> zlib-ng-2.0.1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0aaa790d874501f04af78238bd3c4647
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 6feb2914b5a6..e8f23667f3df 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/cronie-1.5.6 b/metadata/md5-cache/sys-process/cronie-1.5.6
new file mode 100644
index 000000000000..6ffc1801ba24
--- /dev/null
+++ b/metadata/md5-cache/sys-process/cronie-1.5.6
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) >=sys-apps/sed-4.0.5
+DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
+EAPI=7
+HOMEPAGE=https://github.com/cronie-crond/cronie
+IUSE=+anacron +inotify pam selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC BSD BSD-2 GPL-2
+RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
+SLOT=0
+SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.6.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cron	7804080fdc06c5016bdac0cc054e4b19	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=44a01cc638265549f00254d8b3cb0868
diff --git a/metadata/md5-cache/sys-process/dumb-init-1.2.0 b/metadata/md5-cache/sys-process/dumb-init-1.2.0
deleted file mode 100644
index 06004e7e5eeb..000000000000
--- a/metadata/md5-cache/sys-process/dumb-init-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A minimal init system for Linux containers
-EAPI=6
-HOMEPAGE=https://github.com/Yelp/dumb-init
-IUSE=static
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Yelp/dumb-init/archive/v1.2.0.tar.gz -> dumb-init-1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92443ade684fdbc6fe4226a744b73a6f
diff --git a/metadata/md5-cache/sys-process/dumb-init-1.2.5 b/metadata/md5-cache/sys-process/dumb-init-1.2.5
new file mode 100644
index 000000000000..584935d81689
--- /dev/null
+++ b/metadata/md5-cache/sys-process/dumb-init-1.2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A minimal init system for Linux containers
+EAPI=7
+HOMEPAGE=https://github.com/Yelp/dumb-init
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Yelp/dumb-init/archive/v1.2.5.tar.gz -> dumb-init-1.2.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=727e3504facd9d59e4d8f006c9cdfda0
diff --git a/metadata/md5-cache/sys-process/evisum-0.5.11 b/metadata/md5-cache/sys-process/evisum-0.5.11
index 415e1a0761b5..88e6664a4f4e 100644
--- a/metadata/md5-cache/sys-process/evisum-0.5.11
+++ b/metadata/md5-cache/sys-process/evisum-0.5.11
@@ -4,10 +4,10 @@ DEPEND=dev-libs/efl dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=System and process monitor written with EFL
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 ISC
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.5.11.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7812c6068d858c94a344b48b3293da40
+_md5_=a15d20212a886c81fd1284e1dc76c3cd
diff --git a/metadata/md5-cache/sys-process/evisum-0.5.9 b/metadata/md5-cache/sys-process/evisum-0.5.9
deleted file mode 100644
index e41f15360a7f..000000000000
--- a/metadata/md5-cache/sys-process/evisum-0.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.54.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/efl dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=System and process monitor written with EFL
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 ISC
-RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.5.9.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a15d20212a886c81fd1284e1dc76c3cd
diff --git a/metadata/md5-cache/sys-process/psmisc-23.4-r1 b/metadata/md5-cache/sys-process/psmisc-23.4-r1
new file mode 100644
index 000000000000..a40841d46ee6
--- /dev/null
+++ b/metadata/md5-cache/sys-process/psmisc-23.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=sys-devel/libtool-2.2.6b nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=!=app-i18n/man-pages-l10n-4.0.0-r0 >=sys-libs/ncurses-5.7-r7:0= nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=A set of tools that use the proc filesystem
+EAPI=7
+HOMEPAGE=http://psmisc.sourceforge.net/
+IUSE=ipv6 nls selinux X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!=app-i18n/man-pages-l10n-4.0.0-r0 >=sys-libs/ncurses-5.7-r7:0= nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://sourceforge/psmisc/psmisc-23.4.tar.xz
+_md5_=44c560feef678a484b5c18cb72075817
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index d721c90383fb..f099e1956d50 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index d0f728be52e2..9a7094513873 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
-EAPI=5
+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=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
+RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox )
 SLOT=0
-_md5_=85650a193f3f6ad12f3d46b0604845fd
+_md5_=49e7199f1b9ac363aa46a4e2ea63234e
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.24 b/metadata/md5-cache/virtual/dist-kernel-5.10.24
new file mode 100644
index 000000000000..b76d38429e1f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.24
@@ -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.24 ~sys-kernel/gentoo-kernel-bin-5.10.24 ~sys-kernel/vanilla-kernel-5.10.24 )
+SLOT=0/5.10.24
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.7 b/metadata/md5-cache/virtual/dist-kernel-5.11.7
new file mode 100644
index 000000000000..8d689e1aec47
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.11.7
@@ -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.11.7 ~sys-kernel/gentoo-kernel-bin-5.11.7 ~sys-kernel/vanilla-kernel-5.11.7 )
+SLOT=0/5.11.7
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.106 b/metadata/md5-cache/virtual/dist-kernel-5.4.106
new file mode 100644
index 000000000000..d392d4365af7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.106
@@ -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.106 ~sys-kernel/gentoo-kernel-bin-5.4.106 ~sys-kernel/vanilla-kernel-5.4.106 )
+SLOT=0/5.4.106
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/imap-c-client-1 b/metadata/md5-cache/virtual/imap-c-client-1
deleted file mode 100644
index 7e7e71ac4ed3..000000000000
--- a/metadata/md5-cache/virtual/imap-c-client-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IMAP c-client
-EAPI=5
-IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-RDEPEND=|| ( net-libs/c-client[ssl=] net-mail/uw-imap[ssl=] )
-SLOT=0
-_md5_=c20b6b10beaaf74ad40059689c9570e0
diff --git a/metadata/md5-cache/virtual/mailx-1 b/metadata/md5-cache/virtual/mailx-1
deleted file mode 100644
index 2652f0d8406a..000000000000
--- a/metadata/md5-cache/virtual/mailx-1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for mail implementations
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/nail )
-SLOT=0
-_md5_=331070869f72f2d0a3ce29eb56073e99
diff --git a/metadata/md5-cache/virtual/mailx-2 b/metadata/md5-cache/virtual/mailx-2
deleted file mode 100644
index d950d0cdf6ce..000000000000
--- a/metadata/md5-cache/virtual/mailx-2
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/s-nail mail-client/nail )
-SLOT=0
-_md5_=16c11552a4845ae7a60d7716962471b9
diff --git a/metadata/md5-cache/virtual/mailx-3 b/metadata/md5-cache/virtual/mailx-3
index a239d6d117e5..d1fea06ef7ac 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 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_=c752b904fb1cbd6c6bc206eeb447f6c2
+_md5_=1cf0fec13b50014aabd687883d436a3d
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d0a8ef4782dd..fd7495f87b88 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/radicale-2.1.11-r1 b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
deleted file mode 100644
index ac423769d198..000000000000
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=A simple CalDAV calendar server
-EAPI=6
-HOMEPAGE=https://radicale.org/
-IUSE=+bcrypt python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] bcrypt? ( dev-python/passlib[bcrypt,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=207388a90f1475c0038398b9ed67e31f
diff --git a/metadata/md5-cache/www-apps/roundup-2.0.0 b/metadata/md5-cache/www-apps/roundup-2.0.0
index 05d920f8a225..4433bda31110 100644
--- a/metadata/md5-cache/www-apps/roundup-2.0.0
+++ b/metadata/md5-cache/www-apps/roundup-2.0.0
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( tz? ( dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) sqlite? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) ) mysql? ( dev-python/mysqlclient[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) postgres? ( >=dev-python/psycopg-2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) whoosh? ( >=dev-python/whoosh-2.5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ssl? ( dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) jinja? ( dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pyjwt? ( dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) markdown? ( dev-python/markdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markdown2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mistune[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Issue-tracking system with command-line, web, and e-mail interfaces
 EAPI=7
 HOMEPAGE=http://roundup.sourceforge.net https://pypi.org/project/roundup/
-IUSE=+tz sqlite mysql postgres xapian whoosh ssl jinja pyjwt markdown python_targets_python3_7 python_targets_python3_8
+IUSE=+tz sqlite mysql postgres xapian whoosh ssl jinja pyjwt markdown test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=MIT ZPL
-RDEPEND=tz? ( dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) ) mysql? ( dev-python/mysqlclient[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) whoosh? ( >=dev-python/whoosh-2.5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) jinja? ( dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pyjwt? ( dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) markdown? ( dev-python/markdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markdown2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mistune[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=tz? ( dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) sqlite? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) ) mysql? ( dev-python/mysqlclient[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) postgres? ( >=dev-python/psycopg-2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) whoosh? ( >=dev-python/whoosh-2.5.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ssl? ( dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) jinja? ( dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pyjwt? ( dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) markdown? ( dev-python/markdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markdown2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mistune[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-2.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bb86839a06191f7bf3035250bbbf5f70
+_md5_=d61d9fa746f1d1bd04495ac0efb95cec
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 94082ddb5fb7..08c174cf0709 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-89.0.4389.82 b/metadata/md5-cache/www-client/chromium-89.0.4389.82
deleted file mode 100644
index 0b797bd4b906..000000000000
--- a/metadata/md5-cache/www-client/chromium-89.0.4389.82
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/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/libXScrnSaver:= x11-libs/libxcb:= 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:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=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/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/libXScrnSaver:= x11-libs/libxcb:= 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:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.82.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=123de2d8e7ac8420f4d911df5cdf2dd3
diff --git a/metadata/md5-cache/www-client/chromium-89.0.4389.90 b/metadata/md5-cache/www-client/chromium-89.0.4389.90
new file mode 100644
index 000000000000..0dc4173c812e
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-89.0.4389.90
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/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/libXScrnSaver:= x11-libs/libxcb:= 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:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=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/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/libXScrnSaver:= x11-libs/libxcb:= 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:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.90.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d047202a0b5065e5e22b6a2812e9d655
diff --git a/metadata/md5-cache/www-client/elinks-0.13.4-r1 b/metadata/md5-cache/www-client/elinks-0.13.4-r1
deleted file mode 100644
index c384ce79acd1..000000000000
--- a/metadata/md5-cache/www-client/elinks-0.13.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 )
-DESCRIPTION=Advanced and well-established text-mode web browser
-EAPI=7
-HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib
-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
-LICENSE=GPL-2
-RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=https://github.com/rkd77/felinks/archive/v0.13.4.tar.gz -> elinks-0.13.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=caae14c321440b30d27e1606b4c1f94c
diff --git a/metadata/md5-cache/www-client/elinks-0.13.5 b/metadata/md5-cache/www-client/elinks-0.13.5
deleted file mode 100644
index 9f089cdb0516..000000000000
--- a/metadata/md5-cache/www-client/elinks-0.13.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 )
-DESCRIPTION=Advanced and well-established text-mode web browser
-EAPI=7
-HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6 libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd
-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
-LICENSE=GPL-2
-RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
-SLOT=0
-SRC_URI=https://github.com/rkd77/felinks/archive/v0.13.5.tar.gz -> elinks-0.13.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b2fc595f7194c939af94370c9a8472c3
diff --git a/metadata/md5-cache/www-client/google-chrome-89.0.4389.82 b/metadata/md5-cache/www-client/google-chrome-89.0.4389.82
deleted file mode 100644
index 3b8dbe497b1e..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-89.0.4389.82
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_89.0.4389.82-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a4bb629c51e6ac1513b6b282e0efd02
diff --git a/metadata/md5-cache/www-client/google-chrome-89.0.4389.90 b/metadata/md5-cache/www-client/google-chrome-89.0.4389.90
new file mode 100644
index 000000000000..10a5836ec307
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-89.0.4389.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_89.0.4389.90-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd7073b62e6d66951372e2e855abbd02
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-89.0.4389.72 b/metadata/md5-cache/www-client/google-chrome-beta-89.0.4389.72
deleted file mode 100644
index c201b984b988..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-89.0.4389.72
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_89.0.4389.72-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a4bb629c51e6ac1513b6b282e0efd02
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.30 b/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.30
new file mode 100644
index 000000000000..4deb0bf0b31c
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.30
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_90.0.4430.30-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d7b4e051a73177bac0249a314a1b4e9
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-90.0.4430.11 b/metadata/md5-cache/www-client/google-chrome-unstable-90.0.4430.11
deleted file mode 100644
index 2bee40c94781..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-90.0.4430.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_90.0.4430.11-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a4bb629c51e6ac1513b6b282e0efd02
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-91.0.4449.6 b/metadata/md5-cache/www-client/google-chrome-unstable-91.0.4449.6
new file mode 100644
index 000000000000..22accf91a348
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-91.0.4449.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+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-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_91.0.4449.6-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d7b4e051a73177bac0249a314a1b4e9
diff --git a/metadata/md5-cache/www-client/links-2.22 b/metadata/md5-cache/www-client/links-2.22
new file mode 100644
index 000000000000..a110e987f5de
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) X? ( dev-util/desktop-file-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=6
+HOMEPAGE=http://links.twibright.com/
+IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.22.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64b182f0f72d7b35b2d8eab5ac3c89f9
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.796.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.796.0
deleted file mode 100644
index e5428f08f49e..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.796.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-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/wget 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/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_90.0.796.0-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7867c4893dbc685870f627b2b956182
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.803.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.803.0
deleted file mode 100644
index b8677d579792..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.803.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-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/wget 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/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_90.0.803.0-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7867c4893dbc685870f627b2b956182
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.810.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.810.1
deleted file mode 100644
index 26b06e577016..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.810.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
-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/wget 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/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_90.0.810.1-1_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7867c4893dbc685870f627b2b956182
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.0
new file mode 100644
index 000000000000..d3f2aec7474d
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+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/wget 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/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_90.0.818.0-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3db332a8883261698d4577cb6f32a60
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.6 b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.6
new file mode 100644
index 000000000000..24492f05e94e
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-90.0.818.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+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/wget 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/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_90.0.818.6-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3db332a8883261698d4577cb6f32a60
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-91.0.825.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-91.0.825.0
new file mode 100644
index 000000000000..9f0a18bc3f6a
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-91.0.825.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+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/wget 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/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_91.0.825.0-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3db332a8883261698d4577cb6f32a60
diff --git a/metadata/md5-cache/www-client/opera-74.0.3911.203 b/metadata/md5-cache/www-client/opera-74.0.3911.203
deleted file mode 100644
index 120c413719c3..000000000000
--- a/metadata/md5-cache/www-client/opera-74.0.3911.203
+++ /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 widevine 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 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 widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/74.0.3911.203/linux/opera-stable_74.0.3911.203_amd64.deb https://download2.operacdn.com/pub/opera/desktop/74.0.3911.203/linux/opera-stable_74.0.3911.203_amd64.deb https://download3.operacdn.com/pub/opera/desktop/74.0.3911.203/linux/opera-stable_74.0.3911.203_amd64.deb https://download4.operacdn.com/pub/opera/desktop/74.0.3911.203/linux/opera-stable_74.0.3911.203_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-88.0.4324.27.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=150fe59a13a32f2a12aa828c1e89c7ff
diff --git a/metadata/md5-cache/www-client/opera-74.0.3911.232 b/metadata/md5-cache/www-client/opera-74.0.3911.232
new file mode 100644
index 000000000000..354896403584
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-74.0.3911.232
@@ -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 widevine 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 widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/74.0.3911.232/linux/opera-stable_74.0.3911.232_amd64.deb https://download2.operacdn.com/pub/opera/desktop/74.0.3911.232/linux/opera-stable_74.0.3911.232_amd64.deb https://download3.operacdn.com/pub/opera/desktop/74.0.3911.232/linux/opera-stable_74.0.3911.232_amd64.deb https://download4.operacdn.com/pub/opera/desktop/74.0.3911.232/linux/opera-stable_74.0.3911.232_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-88.0.4324.27.tar.xz )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6bb66ff1da40ef07c1768dc6b4e28a08
diff --git a/metadata/md5-cache/www-client/opera-beta-75.0.3969.14 b/metadata/md5-cache/www-client/opera-beta-75.0.3969.14
deleted file mode 100644
index ad680183f27c..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-75.0.3969.14
+++ /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 widevine 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 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 widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/75.0.3969.14/linux/opera-beta_75.0.3969.14_amd64.deb https://download2.operacdn.com/pub/opera-beta/75.0.3969.14/linux/opera-beta_75.0.3969.14_amd64.deb https://download3.operacdn.com/pub/opera-beta/75.0.3969.14/linux/opera-beta_75.0.3969.14_amd64.deb https://download4.operacdn.com/pub/opera-beta/75.0.3969.14/linux/opera-beta_75.0.3969.14_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74b7584560589858ad0c75c7fc55b9a1
diff --git a/metadata/md5-cache/www-client/opera-beta-75.0.3969.35 b/metadata/md5-cache/www-client/opera-beta-75.0.3969.35
deleted file mode 100644
index a16f9911a1e8..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-75.0.3969.35
+++ /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 widevine 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 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 widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/75.0.3969.35/linux/opera-beta_75.0.3969.35_amd64.deb https://download2.operacdn.com/pub/opera-beta/75.0.3969.35/linux/opera-beta_75.0.3969.35_amd64.deb https://download3.operacdn.com/pub/opera-beta/75.0.3969.35/linux/opera-beta_75.0.3969.35_amd64.deb https://download4.operacdn.com/pub/opera-beta/75.0.3969.35/linux/opera-beta_75.0.3969.35_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74b7584560589858ad0c75c7fc55b9a1
diff --git a/metadata/md5-cache/www-client/opera-beta-75.0.3969.60 b/metadata/md5-cache/www-client/opera-beta-75.0.3969.60
new file mode 100644
index 000000000000..b62acaf1c4a7
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-75.0.3969.60
@@ -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 widevine 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 widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/75.0.3969.60/linux/opera-beta_75.0.3969.60_amd64.deb https://download2.operacdn.com/pub/opera-beta/75.0.3969.60/linux/opera-beta_75.0.3969.60_amd64.deb https://download3.operacdn.com/pub/opera-beta/75.0.3969.60/linux/opera-beta_75.0.3969.60_amd64.deb https://download4.operacdn.com/pub/opera-beta/75.0.3969.60/linux/opera-beta_75.0.3969.60_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cbd8fcfd5c946d2ef794fba4a0eb4cd8
diff --git a/metadata/md5-cache/www-client/opera-developer-75.0.3967.0 b/metadata/md5-cache/www-client/opera-developer-75.0.3967.0
deleted file mode 100644
index 08d8c8de4569..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-75.0.3967.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 widevine 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 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 widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/75.0.3967.0/linux/opera-developer_75.0.3967.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/75.0.3967.0/linux/opera-developer_75.0.3967.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/75.0.3967.0/linux/opera-developer_75.0.3967.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/75.0.3967.0/linux/opera-developer_75.0.3967.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74b7584560589858ad0c75c7fc55b9a1
diff --git a/metadata/md5-cache/www-client/opera-developer-76.0.3974.0 b/metadata/md5-cache/www-client/opera-developer-76.0.3974.0
deleted file mode 100644
index dbfe09cb14be..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-76.0.3974.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 widevine 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 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 widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/76.0.3974.0/linux/opera-developer_76.0.3974.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/76.0.3974.0/linux/opera-developer_76.0.3974.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/76.0.3974.0/linux/opera-developer_76.0.3974.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/76.0.3974.0/linux/opera-developer_76.0.3974.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74b7584560589858ad0c75c7fc55b9a1
diff --git a/metadata/md5-cache/www-client/opera-developer-76.0.3981.0 b/metadata/md5-cache/www-client/opera-developer-76.0.3981.0
deleted file mode 100644
index 527245c57e84..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-76.0.3981.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 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-developer/76.0.3981.0/linux/opera-developer_76.0.3981.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/76.0.3981.0/linux/opera-developer_76.0.3981.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/76.0.3981.0/linux/opera-developer_76.0.3981.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/76.0.3981.0/linux/opera-developer_76.0.3981.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=adc32f7fdc1ae9855fe33564dcfd2c63
diff --git a/metadata/md5-cache/www-client/opera-developer-76.0.3989.0 b/metadata/md5-cache/www-client/opera-developer-76.0.3989.0
new file mode 100644
index 000000000000..165a2e0af587
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-76.0.3989.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/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/76.0.3989.0/linux/opera-developer_76.0.3989.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/76.0.3989.0/linux/opera-developer_76.0.3989.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/76.0.3989.0/linux/opera-developer_76.0.3989.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/76.0.3989.0/linux/opera-developer_76.0.3989.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-90.0.4412.3.tar.xz )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a11bc34390ff66eeb40ffddf29d9781
diff --git a/metadata/md5-cache/www-client/opera-developer-76.0.3995.0 b/metadata/md5-cache/www-client/opera-developer-76.0.3995.0
new file mode 100644
index 000000000000..565ad5f3b941
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-76.0.3995.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/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/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-90.0.4412.3.tar.xz )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a11bc34390ff66eeb40ffddf29d9781
diff --git a/metadata/md5-cache/www-client/otter-1.0.01-r1 b/metadata/md5-cache/www-client/otter-1.0.01-r1
deleted file mode 100644
index c1240bb494a9..000000000000
--- a/metadata/md5-cache/www-client/otter-1.0.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=7
-HOMEPAGE=https://otter-browser.org/
-IUSE=spell
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
-SLOT=0
-SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v1.0.01.tar.gz -> otter-1.0.01.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d097e77fdfeefffad7c001cf00c9f92
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.14.0 b/metadata/md5-cache/www-client/qutebrowser-1.14.0
deleted file mode 100644
index b8ae4caa1116..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cssutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygments-2.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pypeg2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),libyaml] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=scripts test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cssutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygments-2.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pypeg2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),libyaml] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.14.0/qutebrowser-1.14.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cd9660a218b1e5d861ceeeb7e6d8166
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.14.1 b/metadata/md5-cache/www-client/qutebrowser-1.14.1
deleted file mode 100644
index cd8dd540ae55..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cssutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.7.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypeg2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),libyaml] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=scripts test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cssutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.7.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypeg2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),libyaml] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.14.1/qutebrowser-1.14.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e80890c359df1a8a345afa69e6dd1981
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.0.2 b/metadata/md5-cache/www-client/qutebrowser-2.0.2
deleted file mode 100644
index 4fdeb497c4ab..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_resources[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),libyaml] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=scripts test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_resources[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),libyaml] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.0.2/qutebrowser-2.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d9577ecca185fe629a6f719dc8111fb
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index 2298d2d0dcd4..f6644d63215d 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -4,10 +4,10 @@ DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3
 DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
-IUSE=savedconfig
+IUSE=tabbed savedconfig
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st )
+RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8fbd29b5948200b85afc3c1d2991a069
+_md5_=91591362b317b7031f936a39402c81db
diff --git a/metadata/md5-cache/www-client/vivaldi-3.6.2165.36 b/metadata/md5-cache/www-client/vivaldi-3.6.2165.36
deleted file mode 100644
index 54c5c1f770e4..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-3.6.2165.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.36-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.36-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.36-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.36-1_i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc26cc90679260e47df55b58c845d3d
diff --git a/metadata/md5-cache/www-client/vivaldi-3.6.2165.40 b/metadata/md5-cache/www-client/vivaldi-3.6.2165.40
index bfdc120a0e16..77fb8d0b3f21 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.6.2165.40
+++ b/metadata/md5-cache/www-client/vivaldi-3.6.2165.40
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 ~x86
+KEYWORDS=-* amd64 ~arm ~arm64 x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.40-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.40-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.40-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.6.2165.40-1_i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8ce279bba18f7d42b0024951263e29b
+_md5_=2dc26cc90679260e47df55b58c845d3d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.25 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.25
deleted file mode 100644
index 322f38839fb8..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.25
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.25-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.25-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.25-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.25-1_i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63c28039b896497199536476ba434fde
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.29 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.29
new file mode 100644
index 000000000000..54c3c81d27d2
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.29-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.29-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.29-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.29-1_i386.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63c28039b896497199536476ba434fde
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.3
deleted file mode 100644
index fc8fbc329ef5..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.3-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.3-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.3-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.3-1_i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8ce279bba18f7d42b0024951263e29b
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.32 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.32
new file mode 100644
index 000000000000..c7d11282b60d
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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 ~arm ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.32-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.32-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.32-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.7.2218.32-1_i386.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63c28039b896497199536476ba434fde
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 4db0ea523e7b..3051424829d1 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-89.0.4389.72_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.72_beta
deleted file mode 100644
index 8458d282cf62..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.72_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-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_89.0.4389.72-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=49ee137f339e65293ae5e90c205c2cb5
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.82 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.82
deleted file mode 100644
index 7e1d654c1ced..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.82
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-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_89.0.4389.82-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=49ee137f339e65293ae5e90c205c2cb5
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.90 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.90
new file mode 100644
index 000000000000..32fb03664743
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.90
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+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_89.0.4389.90-1_amd64.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
+_md5_=4b60b642450f7c5220665e9b61fe1e40
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.11_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.11_alpha
deleted file mode 100644
index 07e5163b31ca..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.11_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-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_90.0.4430.11-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=49ee137f339e65293ae5e90c205c2cb5
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.30_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.30_beta
new file mode 100644
index 000000000000..8f227f229e0d
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.30_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+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_90.0.4430.30-1_amd64.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
+_md5_=f0779117aef199db597df3f54af84b29
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4449.6_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4449.6_alpha
new file mode 100644
index 000000000000..14a60a120b08
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4449.6_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+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_91.0.4449.6-1_amd64.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
+_md5_=f0779117aef199db597df3f54af84b29
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index fa5065841eeb..b032f0fa40a0 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/gunicorn-20.1.0 b/metadata/md5-cache/www-servers/gunicorn-20.1.0
new file mode 100644
index 000000000000..a0be83bc694c
--- /dev/null
+++ b/metadata/md5-cache/www-servers/gunicorn-20.1.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A WSGI HTTP Server for UNIX
+EAPI=7
+HOMEPAGE=https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT PSF-2 doc? ( BSD )
+RDEPEND=dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/benoitc/gunicorn/archive/20.1.0.tar.gz -> gunicorn-20.1.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6f7420bf1d3469d97dfa3c500ab04dae
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.4 b/metadata/md5-cache/www-servers/tomcat-10.0.4
new file mode 100644
index 000000000000..5bcf11ae357a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.4:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.4:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=10
+SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.4/src/apache-tomcat-10.0.4-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b55a13a4352359e573f5bd84cb76ef01
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index a96e962f2dc2..9875be8e4b8e 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/appres-1.0.5-r1 b/metadata/md5-cache/x11-apps/appres-1.0.5-r1
new file mode 100644
index 000000000000..8b1d275d96bc
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/appres-1.0.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=list X application resource database
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/appres
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.5.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=7a9cd543742b68acc7659bd2ff5bd9c5
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
new file mode 100644
index 000000000000..1a9f7b608d94
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto
+DESCRIPTION=X.Org bdftopcf application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bdftopcf
+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=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.1.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=b98351380cc90ed754d646fb7fdbe327
diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.5 b/metadata/md5-cache/x11-apps/beforelight-1.0.5
index 79b7e83e09a5..dcee53294f7a 100644
--- a/metadata/md5-cache/x11-apps/beforelight-1.0.5
+++ b/metadata/md5-cache/x11-apps/beforelight-1.0.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 DESCRIPTION=Sample implementation of screen saver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/beforelight
 KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/beforelight-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=c3e96e70bf36f741df6fde0b1c441187
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=b32ac0fd0dd3925b4910c273b48fc2c0
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1 b/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1
new file mode 100644
index 000000000000..9a3fb2601ad5
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps x11-base/xorg-proto
+DESCRIPTION=X.Org bitmap application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bitmap
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/bitmap-1.0.9.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=4d620155f7572dc2877ffe6a9758ecc7
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.7 b/metadata/md5-cache/x11-apps/editres-1.0.7
index e01c1b05b40c..3fd399c01d10 100644
--- a/metadata/md5-cache/x11-apps/editres-1.0.7
+++ b/metadata/md5-cache/x11-apps/editres-1.0.7
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 DESCRIPTION=a dynamic resource editor for X Toolkit applications
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/editres
 KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.7.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=be5484c4b9c9b7262da5ef10fa1f5d89
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=5eb4e4513beb3180742932a01dce2e09
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.1 b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.1
index 4177d2ed2655..f34f09999da9 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.1
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.1
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc x11-base/xorg-p
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fonttosfnt
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fonttosfnt-1.2.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=133684315d223695d0f45cfa369e78fa
+_md5_=5f3f6e0cc3183e58d9cd2a071004c274
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
index 7e9ddae72e00..9c058e99a28b 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libFS x11-base/xorg-proto
 DESCRIPTION=list fonts served by X font server
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fslsfonts
 KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fslsfonts-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=31dd7a183a01c9340d7d13ab2bc63397
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=e646858ffc7df237bcdf9a0c2fb471ee
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.6 b/metadata/md5-cache/x11-apps/fstobdf-1.0.6
index c1d6c608ba55..6c353ef7583c 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.6
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.6
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libFS >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libFS
 DESCRIPTION=generate BDF font from X font server
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fstobdf
 KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fstobdf-1.0.6.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=c6607c9b4150299c6f078be53ed6e3c3
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=e6a433ee41163bd65d0ed5afa091ff2f
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.5 b/metadata/md5-cache/x11-apps/ico-1.0.5
index 8a4176cdf34b..6be5027914dc 100644
--- a/metadata/md5-cache/x11-apps/ico-1.0.5
+++ b/metadata/md5-cache/x11-apps/ico-1.0.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11
 DESCRIPTION=animate an icosahedron or other polyhedron
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/ico
 KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=da2533a2a915cbc5cac3065f4b73bffa
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=d799731fc7af191c5d31791757c4c680
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.4 b/metadata/md5-cache/x11-apps/oclock-1.0.4
index afdc37178c1c..08f327162c41 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.4
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.4
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
 DESCRIPTION=round X clock
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/oclock
 KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/oclock-1.0.4.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=d952d49910e07b8155f844c58a30ebcb
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=faf215c0255ef322c7eaa943cb16cbab
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 b/metadata/md5-cache/x11-apps/rstart-1.0.5-r1
index 97ba50c9f0fc..598d497ed56c 100644
--- a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1
+++ b/metadata/md5-cache/x11-apps/rstart-1.0.5-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto
 DESCRIPTION=X.Org rstart application
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rstart
 KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/rstart-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=2a71529fc6c7c75c09c225ceffdc9172
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=8d27f6d826138f00378c0000b7cc1a19
diff --git a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
index b186a2fbfa89..d31cc8642b3b 100644
--- a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
+++ b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11
 DESCRIPTION=start an X program on a remote machine
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/scripts
 KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/scripts-1.0.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=218e78c3698008007069d9d832fbb0bc
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=caaf366e9fd057695cb8b776e75aa4c0
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.5 b/metadata/md5-cache/x11-apps/showfont-1.0.5
index 1861a113acd6..891041b3ffdf 100644
--- a/metadata/md5-cache/x11-apps/showfont-1.0.5
+++ b/metadata/md5-cache/x11-apps/showfont-1.0.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libFS
 DESCRIPTION=font dumper for X font server
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/showfont
 KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=f2a8c8d5e0755dadba04c667d27484e4
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=a5ad28d9185b951156cf5e554e7b27db
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1 b/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1
new file mode 100644
index 000000000000..024abcb962bf
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=Session Manager Proxy
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/smproxy
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXt x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/smproxy-1.0.6.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=3436b9dc2f1da8bad005bd1bbb9bc46f
diff --git a/metadata/md5-cache/x11-apps/transset-1.0.2 b/metadata/md5-cache/x11-apps/transset-1.0.2
index bd0072974fae..bebaa11aaae1 100644
--- a/metadata/md5-cache/x11-apps/transset-1.0.2
+++ b/metadata/md5-cache/x11-apps/transset-1.0.2
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=An utility for setting opacity property
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/transset
 KEYWORDS=amd64 x86
 LICENSE=SGI-B-2.0
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/transset-1.0.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=78c469bf2cd7257e6c6aba366ef2ac11
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=0b6469de6ee1cb1af28bb3f48c63643c
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.3 b/metadata/md5-cache/x11-apps/xclipboard-1.1.3
index 86c020c3483f..1a88cdf6165e 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.3
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
 DESCRIPTION=interchange between cut buffer and selection
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclipboard
 KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xclipboard-1.1.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=52cf286b63fdd1e3b27a3fe6bad2c00b
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=3b50c3e6b303efec28c4939eaf974f0b
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1
new file mode 100644
index 000000000000..2db66adbf4cf
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=Device Color Characterization utility for X Color Management System
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcmsdb
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xcmsdb-1.0.5.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=9f6d16d03a20a7a79105d9b410383939
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.7-r1 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7-r1
new file mode 100644
index 000000000000..657e63956215
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0= x11-base/xorg-proto
+DESCRIPTION=create an X cursor file from a collection of PNG images
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcursorgen
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0=
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xcursorgen-1.0.7.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=2015de81fb1071d47d3fee0ed32b7a8b
diff --git a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
index c27eb4e9fb08..ff3acafe8bbe 100644
--- a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
+++ b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=X.Org xdbedizzy application
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdbedizzy
 KEYWORDS=amd64 arm ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdbedizzy-1.1.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=e1d1b1b2db95d681d10c772e6e5a4a00
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=01b486ae99007db7ff905077c67f9a9d
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1
new file mode 100644
index 000000000000..632943ce167b
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Display information utility for X
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
+IUSE=dga dmx xinerama
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.2.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=53ff826ff6fc52956a1f49a98f67e5b6
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.6-r1 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.6-r1
new file mode 100644
index 000000000000..f0b985673200
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=x11-libs/libX11 virtual/opengl x11-base/xorg-proto
+DESCRIPTION=query configuration information of DRI drivers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdriinfo
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 virtual/opengl
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.6.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=96d6f35a14127acedf030add5ad62b5a
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.2 b/metadata/md5-cache/x11-apps/xedit-1.2.2
index 627a69574e52..a43ead013e9a 100644
--- a/metadata/md5-cache/x11-apps/xedit-1.2.2
+++ b/metadata/md5-cache/x11-apps/xedit-1.2.2
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 DESCRIPTION=simple text editor for X
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xedit
 KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=76c4db35faa9ef84579630579329b27a
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=90d6d92036fdcdc3b784fbe2ea9e1c5c
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.2 b/metadata/md5-cache/x11-apps/xeyes-1.1.2
index 8fb7a458d843..5e507cac03bf 100644
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.2
+++ b/metadata/md5-cache/x11-apps/xeyes-1.1.2
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
 DESCRIPTION=X.Org xeyes application
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xeyes
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=765a057ba1c4036fae43bdbb3e3741b1
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=b4e6cba2627b8777053c044736aefc6e
diff --git a/metadata/md5-cache/x11-apps/xf86dga-1.0.3-r1 b/metadata/md5-cache/x11-apps/xf86dga-1.0.3-r1
new file mode 100644
index 000000000000..b8570f42f938
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xf86dga-1.0.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1 x11-base/xorg-proto
+DESCRIPTION=Test program for the XFree86-DGA extension
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xf86dga
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xf86dga-1.0.3.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=d58a02a9e46014b52275ee1fac34ea16
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.6 b/metadata/md5-cache/x11-apps/xfontsel-1.0.6
index 22e14910ae90..c12ffae1ee10 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.6
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.6
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 DESCRIPTION=point and click selection of X11 font names
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.6.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=c0bb278d52630b070229bcac80731beb
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=503a4298fe64a4db090f744343eed7a1
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.6-r1 b/metadata/md5-cache/x11-apps/xgamma-1.0.6-r1
new file mode 100644
index 000000000000..d16a0a2a2843
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=Alter a monitor's gamma correction through the X server
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgamma
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xgamma-1.0.6.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=5abeeff73d563d289431d5437fe22fe4
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.5 b/metadata/md5-cache/x11-apps/xgc-1.0.5
index f05b4fa6aca1..40026154e11b 100644
--- a/metadata/md5-cache/x11-apps/xgc-1.0.5
+++ b/metadata/md5-cache/x11-apps/xgc-1.0.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt
 DESCRIPTION=X graphics demo
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgc
 KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=9c6c2cdced70c90bdba51e35e9592666
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=1ab24faad6880e0138bd8d1a2a4508a9
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.4-r1 b/metadata/md5-cache/x11-apps/xkbevd-1.1.4-r1
new file mode 100644
index 000000000000..d716e22f688d
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/bison >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile x11-base/xorg-proto
+DESCRIPTION=XKB event daemon
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbevd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xkbevd-1.1.4.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=74d9c63c65224bdba1ef6831c1d8d68a
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1 b/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1
new file mode 100644
index 000000000000..760f445e793e
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-base/xorg-proto
+DESCRIPTION=X.Org xkbutils application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xkbutils-1.0.4.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=443a1a8c6e13c649caaf196e7035292e
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.5-r1 b/metadata/md5-cache/x11-apps/xkill-1.0.5-r1
new file mode 100644
index 000000000000..8e854827ac54
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xkill-1.0.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=kill a client by its X resource
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkill
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xkill-1.0.5.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=02c3c96a82d235311a0cfa8e0db52373
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.3 b/metadata/md5-cache/x11-apps/xload-1.1.3
index 5a9f936ca581..cfad52927960 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.3
+++ b/metadata/md5-cache/x11-apps/xload-1.1.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 DESCRIPTION=system load average display for X
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xload
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=89af738666452a74855018031cc18cde
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=d121c5ff8deb70c0e6a71850f1fedc10
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.4-r1 b/metadata/md5-cache/x11-apps/xlsclients-1.1.4-r1
new file mode 100644
index 000000000000..10b19bf9300a
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 x11-base/xorg-proto
+DESCRIPTION=X.Org xlsclients application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xlsclients
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xlsclients-1.1.4.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=1e2c1fe9eb571227242380444136f70b
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.6
index ffca6ecd5687..8abade0d05c9 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.6
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11
 DESCRIPTION=X.Org xlsfonts application
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xlsfonts
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.6.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=122fb3e820b3d1e0264ce24c3be11099
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=237d1c3d980baefe94fb820d30dd9ad5
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.6 b/metadata/md5-cache/x11-apps/xmag-1.0.6
index 0b721fcbe299..be380c3fc777 100644
--- a/metadata/md5-cache/x11-apps/xmag-1.0.6
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.6
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 DESCRIPTION=X.Org xmag application
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmag
 KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmag-1.0.6.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=ac46e79715d32d5c7a676720f5b81789
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=34da7d042a2a3825f17452fb1db080fd
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.5-r1 b/metadata/md5-cache/x11-apps/xpr-1.0.5-r1
new file mode 100644
index 000000000000..fa1193ec06d1
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=X.Org xpr application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xpr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xpr-1.0.5.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=e0dfda83470589714752312ca395e9c4
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1 b/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1
new file mode 100644
index 000000000000..739bde354752
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=refresh all or part of an X screen
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.6.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=bb6206694c234776a84cf5451c1ea7d3
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.4-r1 b/metadata/md5-cache/x11-apps/xset-1.2.4-r1
new file mode 100644
index 000000000000..ef2dd2a0e6bf
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xset-1.2.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+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
+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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=0084bbf6f438b66a02c290e7dec82ab2
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
new file mode 100644
index 000000000000..11318463c611
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps x11-base/xorg-proto
+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
+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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=c8e33caabbd23050d294296ed41bb336
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.3 b/metadata/md5-cache/x11-apps/xvidtune-1.0.3
index c1fcc60395ce..7b624dbc8c0d 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.3
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto
 DESCRIPTION=video mode tuner for Xorg
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xvidtune
 KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xvidtune-1.0.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=0f98ad2bb3e394afb475f62c24ccd712
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=faa092e2327429f73f9694b0c98bc6cf
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.7-r1 b/metadata/md5-cache/x11-apps/xwd-1.0.7-r1
new file mode 100644
index 000000000000..243baa75a814
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.7-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-libs/libXt x11-libs/libxkbfile
+DESCRIPTION=dump an image of an X window
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xwd-1.0.7.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=1703afcbe884a42b18f87161ae7ae630
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.5-r1 b/metadata/md5-cache/x11-apps/xwud-1.0.5-r1
new file mode 100644
index 000000000000..bb49793d70a4
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=image displayer for X
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwud
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xwud-1.0.5.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=d50acafd89b7537da37c6c86b362fb4f
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 52be85bf88d3..3defc7306b72 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index 995d0efadf37..46a478c4371a 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
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= >=sys-kernel/linux-headers-2.6 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= >=sys-kernel/linux-headers-2.6 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=Generic Linux input driver
-EAPI=5
+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
 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[xorg]
+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	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=60fb5872a13a3d4f63054268d0357a11
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=65c1ce9ca6cc409c0cdba2599c463538
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
index eb09acea6464..13bd30d0daa0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=X.Org driver for joystick input devices
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=34a76d00c3f91c51ec989b08dc2704f3
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=579c52caacb35b0e8bdada0a4e541d48
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
deleted file mode 100644
index 1d0ddf56f97b..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=Driver for Synaptics touchpads
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
-IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=fd95671d594b8bd061439d024d459c70
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
index fcf2ae3a0be5..7a90fcfae94d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=>=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=sys-kernel/linux-headers-2.6.37 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
 IUSE=kernel_linux kernel_linux
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=>=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=23c2dbbc5fc4968e36b6222624289996
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=4956441a358aee8663a86791c0233fe5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
index f6df74dbe23e..da676398f00f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=VMWare mouse input driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=f17f0dac620b17df4a56c7823c18f659
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=21e4ef49f41295851d19bb36e91be4b2
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
index f1c18a599ef8..e47185999228 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-base/xorg-proto virtual/pkgconfig >=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 x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=virtual/pkgconfig >=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
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=VMWare mouse input driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=d0a967e29368ceef906ba75327b06c58
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=99c486cdc0c814abc08e08dfa6f268f7
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
index 153512634cb0..b7b10b914933 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.9.99.1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=null input driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=3c48ceea99fb029ec9ee93039dce5e77
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=669e309d68ee8ff241033e1a56d196f0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5 b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
index 9f0730fdd8b7..b84f9bfb38d9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=X.Org driver for ASpeedTech cards
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=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-ast-1.1.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=b7651f8d2c66d415db0c2ac80af835e1
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=668e4a0eb11a7a72edfbafd63f606673
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
index 07d677a9e8b5..a648a1d49c54 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server dga? ( x11-base/xorg-proto ) x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=X.Org driver for dummy cards
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
 IUSE=dga
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=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-dummy-0.3.8.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=156cf11ae278c37714af1bc5189ceea1
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=cba28aafffb82d79e91629da7faa9d96
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
index 2ec0520300f8..8f39fa692db6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=GLINT/Permedia video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=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-glint-1.2.9.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=ecae6279746a41b3b87b4656bdae7579
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=6ac6df80d4af9f060536ac96d6d35e8d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5
deleted file mode 100644
index 69b083aafc53..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Matrox video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
-IUSE=dri
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-1.6.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=2cc894cdc9aad05a389263ad648afd61
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
index 27ea59b13254..613bdbed5beb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=Matrox video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
 IUSE=dri
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-2.0.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=2cc894cdc9aad05a389263ad648afd61
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=7c6aa0fefed37de0b983be68e45d247a
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 aba5907ad40b..e366773c9068 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
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
-EAPI=5
+EAPI=7
 HOMEPAGE=https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 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[xorg] x11-libs/libpciaccess
+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	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=5dd368d563d72b238c00ca897f494231
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=61118d1ff58e3f839820e8794d7d52f8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
index 91f20c5fb2ce..8957cc1e0051 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=Nvidia 2D only video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 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-nv-2.1.21.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=e69079c0e20f05d9afd5466d2ca7567e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=dcce61b4fd78ad289f7c9eb6d2382d8c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5 b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
index 5aae4bf876fc..0e0f83fbb63d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=OMAP video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-omap
 KEYWORDS=arm
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] 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-omap-0.4.5.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=437f5a75870b84146440f398ddc6c24b
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=998060f2e432a7730017bc0d8dcc5f9a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
index 67e6b4da71fe..677494ff98a1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXvMC x11-libs/libdrm >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXvMC x11-libs/libdrm x11-libs/libXv x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=X.Org driver for VIA/S3G cards
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Openchrome/
 IUSE=debug viaregtool
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXvMC x11-libs/libdrm 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-openchrome-0.6.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=c9ed66b641edb6e1029f13876b63df99
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=d54690a89bfcf0a934f8580c469d61df
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
index a258d6f7033e..62e3d4261765 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=xspice? ( app-emulation/spice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=QEMU QXL paravirt video driver
@@ -8,8 +8,8 @@ IUSE=xspice python_single_target_python3_7 python_single_target_python3_8 python
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+REQUIRED_USE=xspice? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=19691b909bf25df9deb2aace1b5d985f
+_md5_=f549cdcc550c8b4294fc6fba2900240a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0
index 04d646ba853f..51dc085b5856 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-base/xorg-server-1.2 x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=ATI Rage128 video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128
 IUSE=dri dri
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.2 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=>=x11-base/xorg-server-1.2 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-r128-6.12.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=263a69f36cc8f5641d9e46ea4f4a9d86
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=8e311dc7a3956423f471d47b5f6edf78
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
index 25087b197518..528e2af455b8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-server x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=Silicon Motion video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion
 KEYWORDS=amd64 ~mips x86
 LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=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-siliconmotion-1.7.9.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=9af0b8c2fb10e353a0ad4afad062cced
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=cc4b264bbee53d1168d6e152f3612a0c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
index c386ef789712..955b67c7195f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!x11-drivers/xf86-video-virtualbox >=x11-base/xorg-server-1.8:=[-minimal] x11-libs/libXcomposite x11-libs/libpciaccess x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=!x11-drivers/xf86-video-virtualbox >=x11-base/xorg-server-1.8:=[-minimal] x11-libs/libXcomposite x11-libs/libpciaccess x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=VirtualBox guest video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-vbox
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=!x11-drivers/xf86-video-virtualbox >=x11-base/xorg-server-1.8:=[-minimal] x11-libs/libXcomposite x11-libs/libpciaccess x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=!x11-drivers/xf86-video-virtualbox >=x11-base/xorg-server-1.8:=[-minimal] x11-libs/libXcomposite x11-libs/libpciaccess 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-vboxvideo-1.0.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=8f0bd6c452a6d92529cf8311b8d4447f
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=eda55db5bddfa1792bbb404a38b078e3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
index 4ac9ee83e58e..94fe5730f153 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=kernel_linux? ( x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=kernel_linux? ( x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] ) x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=VMware SVGA video driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware
 IUSE=kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=kernel_linux? ( x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=kernel_linux? ( x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] ) 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-vmware-13.3.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=b8adc823ca9924c6d1005bf4ce78a87e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=642dd3ddba3ec2134abd3b76cff5e13e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 53b26ec52b2d..6f0bee3f7f23 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/c++-gtk-utils-2.2.20 b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20
new file mode 100644
index 000000000000..9e7c9e383951
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install test
+DEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:3 )
+DESCRIPTION=A number of classes and functions for programming GTK+ programs using C++
+EAPI=7
+HOMEPAGE=http://cxx-gtk-utils.sourceforge.net/
+IUSE=+gtk nls test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/cxx-gtk-utils/c++-gtk-utils-2.2.20.tar.gz
+_eclasses_=virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=d9a8729f351f239d1fec909532994a2c
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0 b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
index 327519125ccd..66c7839a170b 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/libxslt >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-libs/libxslt >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) app-text/docbook-xsl-ns-stylesheets introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.28:2 x11-libs/gtk+:3[introspection?] >=x11-misc/colord-0.1.27:=[introspection?,vala?]
 DESCRIPTION=GTK support library for colord
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-gtk-0.2.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6241b66840e0c14adb5920ba29db62b9
+_md5_=a0719544709e7706677535216abd9c98
diff --git a/metadata/md5-cache/x11-libs/fox-wrapper-2 b/metadata/md5-cache/x11-libs/fox-wrapper-2
deleted file mode 100644
index ab09ce671cc5..000000000000
--- a/metadata/md5-cache/x11-libs/fox-wrapper-2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=wrapper for fox-config to manage multiple versions
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-_md5_=2eda810652d894f5b9f68a5dc131ea8f
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3 b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
index c7a72c70c129..055cebe62f6d 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
+++ b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/libxml2-2.5:2 >=dev-libs/glib-2.14:2
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cb1e7f32d601bb585b80b768fe41a75
+_md5_=791f9542f3952437ee5beedbd764407a
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.3
index 2f5ee2fe4f8d..8c34ad8d4bf2 100644
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3
+++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.3
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) sys-devel/flex virtual/yacc x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=X.Org Xaw3d library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw3d
 IUSE=unicode xpm
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
@@ -9,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=a76f02f0b1046800ca00b9626531078e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=6bd552a7ec80eb21c1792746034bf49f
diff --git a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d
index 72fa9823b0ae..2de3e6fd99db 100644
--- a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d
+++ b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) sys-devel/flex virtual/yacc x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=Xaw3dXft library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sf-xpaint
 IUSE=unicode xpm
 KEYWORDS=amd64 x86
@@ -9,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/sf-xpaint/libXaw3dXft-1.6.2d.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=1d1221e39e4d3b0d718775219c65c163
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=875c671a900edc46eec96eff551b951d
diff --git a/metadata/md5-cache/x11-libs/libXt-1.2.1 b/metadata/md5-cache/x11-libs/libXt-1.2.1
index 2bb8a11c6706..d42f138c71cc 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXt-1.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org X Toolkit Intrinsics library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXt
 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 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=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/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(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXt-1.2.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=ec5b6c7cee3b8bd91a4731732da9c468
+_md5_=42a7c6de0ce3726ec22b06a8aaf1d5e8
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.4 b/metadata/md5-cache/x11-libs/libdmx-1.1.4
index 6ab1f710e633..2d4fef0b91f9 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.4
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.4
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=X.Org dmx library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libdmx
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libdmx-1.1.4.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=04c1a5ed45e805a9fad1b239fc81ff75
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=b8a2b8359d5203f4ddf458aead40bc4b
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.104 b/metadata/md5-cache/x11-libs/libdrm-2.4.104
index 92b796dddfbf..87fd534f103b 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.104
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.104
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.104.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75809e8556960721701f33661ba75a2f
+_md5_=92eacfd7720b8774b2191c0f88562312
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.5 b/metadata/md5-cache/x11-libs/libfm-1.2.5
deleted file mode 100644
index e387cee37635..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.5 udisks? ( dev-libs/dbus-glib ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext >=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 library for file management
-EAPI=5
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=+automount debug doc examples exif gtk udisks vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.5 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/4.5.0
-SRC_URI=https://github.com/lxde/libfm/archive/1.2.5.tar.gz -> libfm-1.2.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85f8610a88acbbede30fb97b9021d666
diff --git a/metadata/md5-cache/x11-libs/libfm-1.3.2 b/metadata/md5-cache/x11-libs/libfm-1.3.2
new file mode 100644
index 000000000000..a345498df801
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libfm-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils dev-util/glib-utils >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=685ed6b59353cbf45e5c563cec4c15dc
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
deleted file mode 100644
index 98b494d4c7d1..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= x11-libs/libfm-extra vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/glib-utils >=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=A library for file management
-EAPI=5
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=+automount debug doc examples exif gtk udisks vala
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= x11-libs/libfm-extra !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/4.4.0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e44a1cdaf23f23e15e681e9df3644e33
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
deleted file mode 100644
index 7663ce081b2e..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am !!<=x11-libs/libfm-1.2.3 >=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 library for file management
-EAPI=5
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2
-SLOT=0/4.5.0
-SRC_URI=https://github.com/lxde/libfm/archive/1.2.5.tar.gz -> libfm-1.2.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=889c290946289d00b271fdef382e060a
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.3.2 b/metadata/md5-cache/x11-libs/libfm-extra-1.3.2
new file mode 100644
index 000000000000..ee42a4373a76
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.3.2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.18:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07a79d87114fb8c0aa745609cbff0b17
diff --git a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3-r1 b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3-r1
index 5587030b707b..8621ae35b739 100644
--- a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3-r1
+++ b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
-SRC_URI=mirror://gnu-alpha/ssw/spread-sheet-widget-0.3.tar.gz
-_md5_=1ec230180b94eb55e0139b830d213e61
+SRC_URI=https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-0.3.tar.gz
+_md5_=8b67535dc47a640acad82b6cc01d8f1e
diff --git a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.6 b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.6
index e90b804df22a..73f2886b9903 100644
--- a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.6
+++ b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
-SRC_URI=mirror://gnu-alpha/ssw/spread-sheet-widget-0.6.tar.gz
-_md5_=87dce1f5f80e272459e77d9b89309295
+SRC_URI=https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-0.6.tar.gz
+_md5_=7e58422fac64c95bf85b7bc5584dc7b7
diff --git a/metadata/md5-cache/x11-libs/vte-0.62.3 b/metadata/md5-cache/x11-libs/vte-0.62.3
index a404e81db481..e2b9555d268c 100644
--- a/metadata/md5-cache/x11-libs/vte-0.62.3
+++ b/metadata/md5-cache/x11-libs/vte-0.62.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-3+
 RDEPEND=>=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.62/vte-0.62.3.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.62.1-command-notify.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71bd67b2a84e092249fa396fb2ccb2f2
+_md5_=1592dad6ef6e420c85af181268d6185b
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.18 b/metadata/md5-cache/x11-libs/xpa-2.1.18
index 691bf2bdd9c9..52a3707ab81f 100644
--- a/metadata/md5-cache/x11-libs/xpa-2.1.18
+++ b/metadata/md5-cache/x11-libs/xpa-2.1.18
@@ -1,13 +1,14 @@
+BDEPEND=>=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-lang/tcl:0= x11-libs/libXt:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-lang/tcl:0= x11-libs/libXt:0
 DESCRIPTION=Messaging system providing communication between programs
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/ericmandel/xpa
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/tcl:0= x11-libs/libXt:0
 SLOT=0/1
 SRC_URI=https://github.com/ericmandel/xpa/archive/v2.1.18.tar.gz -> xpa-2.1.18.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c8b50ed327e46aeb04f7e701df95a05
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1e3cf9c48f11e0b0b12fff005f22c38b
diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
deleted file mode 100644
index 793313dea630..000000000000
--- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto >=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=OpenGL virtual desktop switching
-EAPI=5
-HOMEPAGE=http://desk3d.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e6bb019725b360202dacc2d130337c1
diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
index 19d1a423c063..2c9ff9ad221a 100644
--- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
+++ b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs
 DESCRIPTION=OpenGL virtual desktop switching
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/desk3d/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0fb9d82ec614fdd3b444c244910bf6b0
+_md5_=1747249f259ae3d15de0c6412f8812f0
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 9c5f5fde3a56..37c7500a177f 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/cairo-clock-0.3.4-r1 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1
deleted file mode 100644
index 082975b6e00c..000000000000
--- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10 dev-util/intltool virtual/pkgconfig sys-devel/gettext >=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 analog clock displaying the system-time
-EAPI=6
-HOMEPAGE=https://launchpad.net/cairo-clock
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10
-SLOT=0
-SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dd80ae326a31bc23dda6947052988815
diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
index d52a8dd186c2..d611eb4abb80 100644
--- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
+++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >
 DESCRIPTION=An analog clock displaying the system-time
 EAPI=7
 HOMEPAGE=https://launchpad.net/cairo-clock
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10
 SLOT=0
 SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9bf33e7a5eb6c3a3fedd752327b9b7e1
+_md5_=243c0171669a9496e0e00a94e604d03a
diff --git a/metadata/md5-cache/x11-misc/clipmenu-6.0.1 b/metadata/md5-cache/x11-misc/clipmenu-6.0.1
deleted file mode 100644
index 795c497b0dd6..000000000000
--- a/metadata/md5-cache/x11-misc/clipmenu-6.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DESCRIPTION=Clipboard management using dmenu
-EAPI=7
-HOMEPAGE=https://github.com/cdown/clipmenu
-KEYWORDS=~amd64 ~x86
-LICENSE=Unlicense
-RDEPEND=x11-misc/clipnotify x11-misc/dmenu x11-misc/xsel
-SLOT=0
-SRC_URI=https://github.com/cdown/clipmenu/archive/6.0.1.tar.gz -> clipmenu-6.0.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=90359e567cba9cb046b8bf68ea5b0fb4
diff --git a/metadata/md5-cache/x11-misc/clipmenu-6.1.0 b/metadata/md5-cache/x11-misc/clipmenu-6.1.0
deleted file mode 100644
index 114e7a8c9dab..000000000000
--- a/metadata/md5-cache/x11-misc/clipmenu-6.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DESCRIPTION=Clipboard management using dmenu
-EAPI=7
-HOMEPAGE=https://github.com/cdown/clipmenu
-KEYWORDS=~amd64 ~x86
-LICENSE=Unlicense
-RDEPEND=x11-misc/clipnotify x11-misc/dmenu x11-misc/xsel
-SLOT=0
-SRC_URI=https://github.com/cdown/clipmenu/archive/6.1.0.tar.gz -> clipmenu-6.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f1ecf15aa68fcca0d8dce9c3ef12b569
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
index e0bf65f1e219..42e8f0df8984 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
@@ -5,10 +5,10 @@ DESCRIPTION=Digital clock for the X window system
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/d/dclock.html
 IUSE=xft
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-12.debian.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77f9cb7f895b7834644e161fe454c3e2
+_md5_=32faad548c8b14fe2385b097fe37d1d2
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p9
deleted file mode 100644
index a0980f58bef5..000000000000
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=xft? ( media-libs/freetype x11-libs/libXft ) x11-libs/libX11 x11-libs/libXext x11-libs/libXt app-text/rman x11-misc/imake xft? ( virtual/pkgconfig )
-DESCRIPTION=Digital clock for the X window system
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/dclock.html
-IUSE=xft
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=xft? ( media-libs/freetype x11-libs/libXft ) x11-libs/libX11 x11-libs/libXext x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-9.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2709bc81e3914a3a219a6d823559998
diff --git a/metadata/md5-cache/x11-misc/efax-gtk-3.2.14 b/metadata/md5-cache/x11-misc/efax-gtk-3.2.14
deleted file mode 100644
index d0293e2bd7c0..000000000000
--- a/metadata/md5-cache/x11-misc/efax-gtk-3.2.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3 virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A graphical frontend for the 'efax' application
-EAPI=7
-HOMEPAGE=http://efax-gtk.sourceforge.net/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3
-SLOT=0
-SRC_URI=mirror://sourceforge/efax-gtk/efax-gtk-3.2.14.src.tgz
-_md5_=1dc78a3d494bf310cfd1a16cb7e9014f
diff --git a/metadata/md5-cache/x11-misc/efax-gtk-3.2.15 b/metadata/md5-cache/x11-misc/efax-gtk-3.2.15
index de03e0967ff1..472a9a4dc522 100644
--- a/metadata/md5-cache/x11-misc/efax-gtk-3.2.15
+++ b/metadata/md5-cache/x11-misc/efax-gtk-3.2.15
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-
 DESCRIPTION=A graphical frontend for the 'efax' application
 EAPI=7
 HOMEPAGE=http://efax-gtk.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/efax-gtk/efax-gtk-3.2.15.src.tgz
-_md5_=eb609bfe40e39769d0709ba01df3b8e8
+_md5_=698ae1ac047ffe2afcd18368034dea6c
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.20.3 b/metadata/md5-cache/x11-misc/gpaste-3.20.3
deleted file mode 100644
index 6e1a78ecad5f..000000000000
--- a/metadata/md5-cache/x11-misc/gpaste-3.20.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( 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-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=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=Clipboard management system
-EAPI=5
-HOMEPAGE=https://github.com/Keruspe/GPaste
-IUSE=+applet gnome vala
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) gnome? ( gnome-base/gnome-shell )
-SLOT=0
-SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.20.3.tar.gz -> gpaste-3.20.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58d3c7699e8cde385057986a3e394472
diff --git a/metadata/md5-cache/x11-misc/gxmessage-2.20.4 b/metadata/md5-cache/x11-misc/gxmessage-2.20.4
deleted file mode 100644
index 6ab3f1eca9b4..000000000000
--- a/metadata/md5-cache/x11-misc/gxmessage-2.20.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-libs/gtk+-2.20:2 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A GTK+ based xmessage clone
-EAPI=7
-HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3 public-domain
-RDEPEND=>=x11-libs/gtk+-2.20:2
-SLOT=0
-SRC_URI=mirror://gnu/gxmessage/gxmessage-2.20.4.tar.gz
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07587fd6a6eb8b34ef1d55660abd5500
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.3 b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
index b90b163ad003..993c400d333c 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-3.4.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango virtual/pkgconfig >=dev-util/intltool-0.40.1 sys-devel/gettext
+BDEPEND=>=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GTK+ based xmessage clone
-EAPI=5
+EAPI=7
 HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3 public-domain
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81405f233f0b9f55b96b080db6b4dcda
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c86eedd2da39db39169c84b33e0e59b
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.9 b/metadata/md5-cache/x11-misc/kapow-1.5.9
deleted file mode 100644
index 4f78305f4cba..000000000000
--- a/metadata/md5-cache/x11-misc/kapow-1.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
-DESCRIPTION=A punch clock program designed to easily keep track of your hours
-EAPI=7
-HOMEPAGE=https://gottcode.org/kapow/
-IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/kapow/kapow-1.5.9-src.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aca18796ebebfeb5e8b8189b8454e78f
diff --git a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1 b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1
deleted file mode 100644
index 4b2b9807e159..000000000000
--- a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==x11-misc/lineakd-0.9.0* x11-base/xorg-proto
-DESCRIPTION=Mute/unmute and other macros for LINEAK
-EAPI=5
-HOMEPAGE=http://lineak.sourceforge.net
-IUSE=debug
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND==x11-misc/lineakd-0.9.0*
-SLOT=0
-SRC_URI=mirror://sourceforge/lineak/lineak-defaultplugin-0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc716c04e481f89bac864dc947bb6688
diff --git a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
index 162f75ef7ace..c8b811aeeeb2 100644
--- a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
@@ -4,10 +4,9 @@ DESCRIPTION=Mute/unmute and other macros for LINEAK
 EAPI=7
 HOMEPAGE=http://lineak.sourceforge.net
 IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND==x11-misc/lineakd-0.9.0*
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineak-defaultplugin-0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca6f8f4c52749c98eebadc77aa9bd695
+_md5_=2b8842d4b0019076c42ca24dcfcb91bf
diff --git a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
index 9a82de00757b..20789c00bd56 100644
--- a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineak-xosdplugin-0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c868853ba95000a74defa163f9b71d15
+_md5_=6b75b638e48cebb8210ce570ee36ec82
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
deleted file mode 100644
index bdf7fe92825d..000000000000
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-libs/libxkbfile x11-libs/libXt x11-libs/libXtst
-DESCRIPTION=Linux support for Easy Access and Internet Keyboards
-EAPI=6
-HOMEPAGE=http://lineak.sourceforge.net
-IUSE=debug
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd1bfaed5c42b0e21ea636a549696a35
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
index be418339ea6c..ff36fd78402c 100644
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
+++ b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Linux support for Easy Access and Internet Keyboards
 EAPI=7
 HOMEPAGE=http://lineak.sourceforge.net
 IUSE=debug
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9ee58c392bad29ca55888a7736a77030
+_md5_=bccadb06840ef86636469ccc006aca6e
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.11 b/metadata/md5-cache/x11-misc/menumaker-0.99.11
deleted file mode 100644
index 0e97177a26ec..000000000000
--- a/metadata/md5-cache/x11-misc/menumaker-0.99.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( sys-apps/texinfo )
-DESCRIPTION=Utility that scans through the system and generates a menu of installed programs
-EAPI=7
-HOMEPAGE=http://menumaker.sourceforge.net/
-IUSE=doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://sourceforge/menumaker/menumaker-0.99.11.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b7c702d169db03ee5e277baa6c637080
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
deleted file mode 100644
index e496d433e0e8..000000000000
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=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 background browser and setter for X
-EAPI=6
-HOMEPAGE=http://projects.l3ib.org/nitrogen/
-IUSE=nls xinerama
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.6.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b8bd72e3ebf5d87006790d253e81942
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
index 03f763d85655..a8e63c3fa1c8 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=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 background browser and setter for X
 EAPI=6
 HOMEPAGE=https://github.com/l3ib/nitrogen
 IUSE=nls xinerama
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/l3ib/nitrogen/releases/download/1.6.1/nitrogen-1.6.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74930e8875d386e969c60c5b971e143d
+_md5_=4df88aac13ea038db4d37bed48ef8df9
diff --git a/metadata/md5-cache/x11-misc/nitrogen-99999 b/metadata/md5-cache/x11-misc/nitrogen-99999
index 9a209ed69f8f..2d4949f1b005 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-99999
+++ b/metadata/md5-cache/x11-misc/nitrogen-99999
@@ -1,5 +1,6 @@
-BDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=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 >=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 postinst postrm prepare unpack
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=A background browser and setter for X
 EAPI=7
 HOMEPAGE=https://github.com/l3ib/nitrogen
@@ -9,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a60b6db694344071c743f85d331ac0
+_md5_=3c9e88fbec12613d8a735c8f0c813e10
diff --git a/metadata/md5-cache/x11-misc/openbox-menu-0.8.1 b/metadata/md5-cache/x11-misc/openbox-menu-0.8.1
new file mode 100644
index 000000000000..0fee3476383c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/openbox-menu-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile
+DEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:3
+DESCRIPTION=Another dynamic menu generator for Openbox
+EAPI=7
+HOMEPAGE=http://fabrice.thiroux.free.fr/openbox-menu_en.html
+IUSE=+icons svg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:3 icons? ( x11-wm/openbox[imlib,svg?] ) !icons? ( x11-wm/openbox )
+REQUIRED_USE=svg? ( icons )
+SLOT=0
+SRC_URI=https://github.com/fabriceT/openbox-menu/archive/v0.8.1.tar.gz -> openbox-menu-0.8.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0a9e905b2fbfb0a0ac150358977a203e
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.1 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.1
deleted file mode 100644
index 00e738cfab1a..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.3.1:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Fast lightweight tabbed filemanager
-EAPI=7
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=debug
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.3.1:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5be26e3796e51a94fb4fa23b02945733
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1
new file mode 100644
index 000000000000..09cf8e5b8e76
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info ~x11-libs/libfm-1.3.1:=[gtk] virtual/eject virtual/freedesktop-icon-theme app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=Fast lightweight tabbed filemanager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/PCManFM
+IUSE=debug
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info ~x11-libs/libfm-1.3.1:=[gtk] virtual/eject virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.1.tar.xz
+_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ecc138f74d7d8de5b12b0fef758dbcf
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2
new file mode 100644
index 000000000000..6b2e7125f9a4
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 virtual/eject 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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Fast lightweight tabbed filemanager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/PCManFM
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 virtual/eject 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	22ae82e140bdd95d17a34fd5fd733190	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5148c64c57db27dc1f3a262da44b6f64
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-9999 b/metadata/md5-cache/x11-misc/pcmanfm-9999
deleted file mode 100644
index d814cd32a4e6..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-9999:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext >=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=Fast lightweight tabbed filemanager
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=debug
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-9999:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
-SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4530cc18e9c1c0b7df391a64ffca37bc
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.6-r1 b/metadata/md5-cache/x11-misc/piedock-1.6.6-r1
deleted file mode 100644
index c5fdbf77d559..000000000000
--- a/metadata/md5-cache/x11-misc/piedock-1.6.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
-EAPI=6
-HOMEPAGE=http://markusfisch.de/PieDock
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=http://markusfisch.de/downloads/piedock-1.6.6.tar.bz2 https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> piedock-1.6.6-gcc6.patch
-_md5_=ede2ba6779d108ad6117706f38aa777f
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.9 b/metadata/md5-cache/x11-misc/piedock-1.6.9
index ef4f864d3a6c..24975872714c 100644
--- a/metadata/md5-cache/x11-misc/piedock-1.6.9
+++ b/metadata/md5-cache/x11-misc/piedock-1.6.9
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig >=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=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
-EAPI=6
+EAPI=7
 HOMEPAGE=http://markusfisch.de/PieDock https://github.com/markusfisch/PieDock
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
@@ -10,4 +11,4 @@ RDEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11
 SLOT=0
 SRC_URI=https://github.com/markusfisch/PieDock/archive/1.6.9.tar.gz -> piedock-1.6.9.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8bef90d8930a3ec6276cadcffc1a06c2
+_md5_=b7fa809bbeb0d6298ecc393d75864734
diff --git a/metadata/md5-cache/x11-misc/polybar-3.4.3 b/metadata/md5-cache/x11-misc/polybar-3.4.3
index 96ce98a84522..a3f8a97b803c 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.4.3
+++ b/metadata/md5-cache/x11-misc/polybar-3.4.3
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) python_single_target_python3_9? ( x11-base/xcb-proto[python_targets_python3_9(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=7
 HOMEPAGE=https://github.com/polybar/polybar
-IUSE=alsa curl i3wm ipc mpd network pulseaudio python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa curl i3wm ipc mpd network pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) python_single_target_python3_9? ( x11-base/xcb-proto[python_targets_python3_9(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.4.3.tar.gz -> polybar-3.4.3.tar.gz https://github.com/polybar/xpp/archive/8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz -> xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz https://github.com/polybar/i3ipcpp/archive/21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz -> i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9002ecca1c79e239796343f384b86d8
+_md5_=1f471f772a81e2a28aca1594353f44e4
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1 b/metadata/md5-cache/x11-misc/rofi-1.5.4-r1
deleted file mode 100644
index 79e99fc94aa4..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
-DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
-HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=test windowmode
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.4/rofi-1.5.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7ff99619acac0f179f63a61abe5b347f
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.0 b/metadata/md5-cache/x11-misc/rofi-1.6.0
deleted file mode 100644
index ac40c88eb2b3..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
-DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
-HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=+drun test +windowmode
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.0/rofi-1.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cf9aa28c2234e7677597f7417df24dc8
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1 b/metadata/md5-cache/x11-misc/rofi-1.6.1
index ac06af34e19a..38079c200d04 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.6.1
+++ b/metadata/md5-cache/x11-misc/rofi-1.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=7
 HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=+drun test +windowmode
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b7aba5fa3939887a5e841e3e6cac227e
+_md5_=355b6cdfd5bfe49aefdc5b1703be2acf
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-1.5 b/metadata/md5-cache/x11-misc/rofi-calc-1.5
deleted file mode 100644
index bbfe396a723b..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-calc-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-DESCRIPTION=Do live calculations in rofi!
-EAPI=7
-HOMEPAGE=https://github.com/svenstaro/rofi-calc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-SLOT=0
-SRC_URI=https://github.com/svenstaro/rofi-calc/archive/v1.5.tar.gz -> rofi-calc-1.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4b2c4a4388b24914beae50e3b15167a3
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-1.6 b/metadata/md5-cache/x11-misc/rofi-calc-1.6
deleted file mode 100644
index e11d2078701a..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-calc-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-DESCRIPTION=Do live calculations in rofi!
-EAPI=7
-HOMEPAGE=https://github.com/svenstaro/rofi-calc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-SLOT=0
-SRC_URI=https://github.com/svenstaro/rofi-calc/archive/v1.6.tar.gz -> rofi-calc-1.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4b2c4a4388b24914beae50e3b15167a3
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-20140219 b/metadata/md5-cache/x11-misc/simpleswitcher-20140219
deleted file mode 100644
index a335c78c95af..000000000000
--- a/metadata/md5-cache/x11-misc/simpleswitcher-20140219
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
-DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
-EAPI=7
-HOMEPAGE=https://github.com/seanpringle/simpleswitcher
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
-SLOT=0
-SRC_URI=https://github.com/seanpringle/simpleswitcher/archive/cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz -> simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ac54368e4c1c90d2809720f73d22a90
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-20191008 b/metadata/md5-cache/x11-misc/simpleswitcher-20191008
index b7448cc63569..9ea5f5d4f202 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-20191008
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-20191008
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/simpleswitcher
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 SLOT=0
 SRC_URI=https://github.com/seanpringle/simpleswitcher/archive/7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz -> simpleswitcher-20191008-7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=400d74ea230837ec1a3e9f78c411757f
+_md5_=3effe5898d4b89010ee26b189b821b69
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-99999999 b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
index 335770adef6a..928df97fdd65 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-99999999
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/simpleswitcher
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a4e5a439edbde2ee8af780019003cc3
+_md5_=871795db87928d021b9c8afc25ab9d28
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
deleted file mode 100644
index 8bcb3ecfc5b3..000000000000
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=tool that allows you to tune SiS drivers from X
-EAPI=5
-HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a29ea01a6d40025423779fb9b3b32e40
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
index d24d7845ba01..fc3f1ca35122 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-base/xorg-proto
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-base/xorg-proto
 DESCRIPTION=tool that allows you to tune SiS drivers from X
 EAPI=7
 HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=23da58f4eea0cd282c1f4ac8c2fdda75
+_md5_=22e196c17d2c8f7bd787a34e11bf38f2
diff --git a/metadata/md5-cache/x11-misc/spnavcfg-0.3 b/metadata/md5-cache/x11-misc/spnavcfg-0.3
deleted file mode 100644
index d2e1524c03ce..000000000000
--- a/metadata/md5-cache/x11-misc/spnavcfg-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=GTK-based GUI to configure a space navigator device
-EAPI=6
-HOMEPAGE=http://spacenav.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 app-misc/spacenavd[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/spnavcfg%200.3/spnavcfg-0.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f12ff9011fc014bcce8c9739fd0d9a20
diff --git a/metadata/md5-cache/x11-misc/spnavcfg-0.3.1 b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
index e119b734d0d3..ea8c134a4785 100644
--- a/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
+++ b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=GTK-based GUI to configure a space navigator device
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 app-misc/spacenavd[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/spnavcfg%200.3.1/spnavcfg-0.3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a268f74c2b44473c4726d169d58a8d6d
+_md5_=459f57f3b4c08b749272f6c345a3bf79
diff --git a/metadata/md5-cache/x11-misc/sux-1.0.1 b/metadata/md5-cache/x11-misc/sux-1.0.1
index e08df5a410ba..4dfac8c9b54d 100644
--- a/metadata/md5-cache/x11-misc/sux-1.0.1
+++ b/metadata/md5-cache/x11-misc/sux-1.0.1
@@ -3,9 +3,9 @@ DEPEND=x11-apps/xauth
 DESCRIPTION="su" wrapper which transfers X credentials
 EAPI=7
 HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc sparc x86
 LICENSE=MIT
 RDEPEND=x11-apps/xauth
 SLOT=0
 SRC_URI=mirror://sourceforge/sux/1.0.1/sux-1.0.1.tar.gz
-_md5_=90dd7f6d02bf7005830285951446744f
+_md5_=39dc7cecc498d3e2fea6bc48155f74df
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2 b/metadata/md5-cache/x11-misc/svkbd-0.2
deleted file mode 100644
index 76bfa83d8480..000000000000
--- a/metadata/md5-cache/x11-misc/svkbd-0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=Simple Virtual Keyboard
-EAPI=7
-HOMEPAGE=https://tools.suckless.org/x/svkbd/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c854108534fc4dad6b53dd09e6f4a95b
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1
deleted file mode 100644
index c9a3c212ef2e..000000000000
--- a/metadata/md5-cache/x11-misc/svkbd-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=Simple Virtual Keyboard
-EAPI=7
-HOMEPAGE=https://tools.suckless.org/x/svkbd/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a54d4213e45b920c8efa1c4fc668176b
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
new file mode 100644
index 000000000000..5f99b2682151
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst x11-base/xorg-proto
+DESCRIPTION=Simple Virtual Keyboard
+EAPI=7
+HOMEPAGE=https://tools.suckless.org/x/svkbd/
+IUSE=savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1c4f9cea487648e96336ef379dc695bf
diff --git a/metadata/md5-cache/x11-misc/trayer-1.0-r3 b/metadata/md5-cache/x11-misc/trayer-1.0-r3
deleted file mode 100644
index 795c083b0406..000000000000
--- a/metadata/md5-cache/x11-misc/trayer-1.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=Lightweight GTK+ based systray for UNIX desktop
-EAPI=6
-HOMEPAGE=http://home.gna.org/fvwm-crystal/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=http://download.gna.org/fvwm-crystal/trayer/trayer-1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d145601224c6b7491d6f4c059c702c91
diff --git a/metadata/md5-cache/x11-misc/trayer-1.0-r4 b/metadata/md5-cache/x11-misc/trayer-1.0-r4
index 2ba86d154281..bc8a9e05380d 100644
--- a/metadata/md5-cache/x11-misc/trayer-1.0-r4
+++ b/metadata/md5-cache/x11-misc/trayer-1.0-r4
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 vir
 DESCRIPTION=Lightweight GTK+ based systray for UNIX desktop
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/fvwm-crystal/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/fvwm-crystal/files/trayer/1.0/trayer-1.0.tar.gz/download -> trayer-1.0-sourceforge.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bbb1ad01f528f8921021f4f8c54e1b61
+_md5_=f9bf14097662a6b94a117d85c9f8837d
diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.7 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.7
deleted file mode 100644
index a1335a813c01..000000000000
--- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase
-EAPI=6
-HOMEPAGE=https://github.com/sargon/trayer-srg
-KEYWORDS=amd64 x86
-LICENSE=MIT GPL-2+
-RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.7.tar.gz -> trayer-srg-1.1.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1b30e5bc9c3bb69512f1d68a92c3049a
diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
index b0a658fd40e4..cb8a1839fd18 100644
--- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
+++ b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase
 EAPI=6
 HOMEPAGE=https://github.com/sargon/trayer-srg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT GPL-2+
 RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.8.tar.gz -> trayer-srg-1.1.8.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=caf8906e185661e1f4a2baa7168ba1e1
+_md5_=732d85de6272d15fadd7608ce9306621
diff --git a/metadata/md5-cache/x11-misc/xaos-3.6 b/metadata/md5-cache/x11-misc/xaos-3.6
index 5b47fd30c867..a3cdd5f5ff4a 100644
--- a/metadata/md5-cache/x11-misc/xaos-3.6
+++ b/metadata/md5-cache/x11-misc/xaos-3.6
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/gsl:0= sys-libs/zlib:0= aalib? ( media-libs/aalib:0= ) gtk? ( x11-libs/gtk+:2= ) nls? ( sys-devel/gettext ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXxf86vm:0= ) virtual/pkgconfig doc? ( virtual/texi2dvi ) X? ( x11-base/xorg-proto ) >=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/texi2dvi ) nls? ( sys-devel/gettext ) >=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=sci-libs/gsl:= sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Very fast real-time fractal zoomer
-EAPI=5
+EAPI=7
 HOMEPAGE=http://matek.hu/xaos/doku.php
 IUSE=aalib doc -gtk nls png svga threads X
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sci-libs/gsl:0= sys-libs/zlib:0= aalib? ( media-libs/aalib:0= ) gtk? ( x11-libs/gtk+:2= ) nls? ( sys-devel/gettext ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXxf86vm:0= )
+RDEPEND=sci-libs/gsl:= sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm )
 SLOT=0
 SRC_URI=mirror://sourceforge/xaos/xaos-3.6.tar.gz https://dev.gentoo.org/~jlec/distfiles/xaos.png.tar
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d750c4bf291fd875eb256b399ab303be
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2bf0aae2306ace650a0817b6e338e614
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
deleted file mode 100644
index 3cc2ab8d7e70..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slim x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slim x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.1.debian.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=2e1f73d98297693219e259d48c552858
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1
deleted file mode 100644
index 9f031422def3..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.1.debian.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=8a4af5c486c5ff49dd189b3d85c7a1ca
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2
deleted file mode 100644
index 16910f831471..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=7
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.2.debian.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1407fa264f4ef089258e602da13bd4da
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p6 b/metadata/md5-cache/x11-misc/xautolock-2.2_p6
deleted file mode 100644
index 366521d5ab95..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=7
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-6.debian.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f890c530049ceae1af7a209fbe6779de
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
index f64184a1c506..5b79581892fd 100644
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
 DESCRIPTION=An automatic X screen-locker/screen-saver
 EAPI=7
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f890c530049ceae1af7a209fbe6779de
+_md5_=08267d5a08d5162df4d5e8723e87580b
diff --git a/metadata/md5-cache/x11-misc/xcave-2.4.0 b/metadata/md5-cache/x11-misc/xcave-2.4.0
deleted file mode 100644
index c10662390c59..000000000000
--- a/metadata/md5-cache/x11-misc/xcave-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2
-DESCRIPTION=View and manage contents of your wine cellar
-EAPI=7
-HOMEPAGE=http://xcave.free.fr/index-en.php
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://xcave.free.fr/backbone.php?what=download/xcave-2.4.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d5fe82f6c7ff255d7812dd7ba201f03
diff --git a/metadata/md5-cache/x11-misc/xcave-2.5.1 b/metadata/md5-cache/x11-misc/xcave-2.5.1
index 3cbd1cb02c92..8f2b86eddc8e 100644
--- a/metadata/md5-cache/x11-misc/xcave-2.5.1
+++ b/metadata/md5-cache/x11-misc/xcave-2.5.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcave/xcave-2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7155aded3ed330e4b4032a121522770c
+_md5_=fedcd3b709bf35580abe1e5dcd1e49e0
diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2
deleted file mode 100644
index ad7c7d754c3d..000000000000
--- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst
-DEPEND=x11-libs/libXext x11-base/xorg-proto
-DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water
-EAPI=6
-HOMEPAGE=http://xdesktopwaves.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1041e6d2fed91712666035fe33224f1b
diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
index 04b06c8a6072..cd619a8e75c1 100644
--- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
+++ b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water
 EAPI=7
 HOMEPAGE=http://xdesktopwaves.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a23fa6e750e57846e7fa9711e53ed71a
+_md5_=d8c37b5e79c5bc64290f0d2753a5e8fa
diff --git a/metadata/md5-cache/x11-misc/xdialog-2.3.1 b/metadata/md5-cache/x11-misc/xdialog-2.3.1
index 0198779ca285..a0c0f682951f 100644
--- a/metadata/md5-cache/x11-misc/xdialog-2.3.1
+++ b/metadata/md5-cache/x11-misc/xdialog-2.3.1
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.2:2 virtual/pkgconfig nls? ( sys-devel/gettext ) >=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=drop-in replacement for cdialog using GTK
-EAPI=5
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.2:2
+DESCRIPTION=Drop-in replacement for cdialog using GTK
+EAPI=7
 HOMEPAGE=http://xdialog.free.fr/
 IUSE=doc examples nls
 KEYWORDS=~alpha amd64 ~hppa ppc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.2:2
 SLOT=0
 SRC_URI=http://xdialog.free.fr/Xdialog-2.3.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b576f2ab97f0094d9c450d0f97eccc8a
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f77f67c15ed31ca6a76930916c44037e
diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.51 b/metadata/md5-cache/x11-misc/xdiskusage-1.51
deleted file mode 100644
index ba0024ba29b1..000000000000
--- a/metadata/md5-cache/x11-misc/xdiskusage-1.51
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=x11-libs/fltk-1.3:1
-DESCRIPTION=user-friendly program to show you what is using up all your disk space
-EAPI=6
-HOMEPAGE=http://xdiskusage.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/fltk-1.3:1
-SLOT=0
-SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.51.tgz
-_md5_=1369113f0e7f6b91eb39b5737ab3018c
diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.52 b/metadata/md5-cache/x11-misc/xdiskusage-1.52
index a709ef524395..358bee321c55 100644
--- a/metadata/md5-cache/x11-misc/xdiskusage-1.52
+++ b/metadata/md5-cache/x11-misc/xdiskusage-1.52
@@ -4,9 +4,9 @@ DEPEND=>=x11-libs/fltk-1.3:1
 DESCRIPTION=user-friendly program to show you what is using up all your disk space
 EAPI=7
 HOMEPAGE=http://xdiskusage.sourceforge.net/
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/fltk-1.3:1
 SLOT=0
 SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.52.tgz
-_md5_=6d30c8881985cf461342c89033b4cb65
+_md5_=0a0790a6b36adf8efea95364fd67a4ed
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.1-r2 b/metadata/md5-cache/x11-misc/xfishtank-2.1-r2
deleted file mode 100644
index 1e6ba1833e2e..000000000000
--- a/metadata/md5-cache/x11-misc/xfishtank-2.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=Turns your root window into an aquarium
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/demos/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/demos/xfishtank-2.1tp.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2c75d1f8086760d29c1a2c10747fa691
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5
index 3347a52987e6..787d7240b8ee 100644
--- a/metadata/md5-cache/x11-misc/xfishtank-2.5
+++ b/metadata/md5-cache/x11-misc/xfishtank-2.5
@@ -4,10 +4,10 @@ DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-
 DESCRIPTION=Turns your root window into an aquarium
 EAPI=7
 HOMEPAGE=https://jim.rees.org/computers/xfishtank.html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux
 LICENSE=public-domain
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/xfishtank-2.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cff9baa0902f14b70b9b4030f334810c
+_md5_=98ceb0f4a4b2e65e00e9d35cf5f6993c
diff --git a/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1 b/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1
deleted file mode 100644
index f4fd88256034..000000000000
--- a/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=x11-libs/libXrender x11-libs/libX11 x11-libs/libXft x11-libs/libXtst x11-libs/libXpm media-libs/freetype dev-libs/expat sys-libs/zlib x11-base/xorg-proto
-DESCRIPTION=onscreen soft keyboard for X11
-EAPI=6
-HOMEPAGE=http://trac.hackable1.org/trac/wiki/Xkbd
-IUSE=debug
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXrender x11-libs/libX11 x11-libs/libXft x11-libs/libXtst x11-libs/libXpm media-libs/freetype dev-libs/expat sys-libs/zlib
-SLOT=0
-SRC_URI=http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/xkbd-0.8.16.tar.gz
-_md5_=3129d663e5e5851ea08c8bbe1f71a48c
diff --git a/metadata/md5-cache/x11-misc/xkbd-0.8.18 b/metadata/md5-cache/x11-misc/xkbd-0.8.18
index d8bfeaf326f4..21735a4d4b6c 100644
--- a/metadata/md5-cache/x11-misc/xkbd-0.8.18
+++ b/metadata/md5-cache/x11-misc/xkbd-0.8.18
@@ -5,10 +5,10 @@ DESCRIPTION=onscreen soft keyboard for X11
 EAPI=7
 HOMEPAGE=https://github.com/mahatma-kaganovich/xkbd
 IUSE=debug +xft +xpm
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/mahatma-kaganovich/xkbd/archive/xkbd-0.8.18.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3da6573773f56c67df4503ae94ae594
+_md5_=12f7f803bd677adcbdb23181f206bf36
diff --git a/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1 b/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
deleted file mode 100644
index 4f4eedc5871b..000000000000
--- a/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=User preference utility for XKB extensions for X
-EAPI=6
-HOMEPAGE=https://faculty.missouri.edu/~stephen/software/#xkbset
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 tk? ( dev-perl/Tk )
-SLOT=0
-SRC_URI=https://faculty.missouri.edu/~stephen/software/xkbset/xkbset-0.5.tar.gz mirror://debian/pool/main/x/xkbset/xkbset_0.5-5.1.diff.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ac830e5da2e82f6db234acd1fe61e67
diff --git a/metadata/md5-cache/x11-misc/xkbset-0.5_p6 b/metadata/md5-cache/x11-misc/xkbset-0.5_p6
deleted file mode 100644
index 3aca508d42aa..000000000000
--- a/metadata/md5-cache/x11-misc/xkbset-0.5_p6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=User preference utility for XKB extensions for X
-EAPI=6
-HOMEPAGE=https://faculty.missouri.edu/~stephen/software/#xkbset
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 tk? ( dev-perl/Tk )
-SLOT=0
-SRC_URI=https://faculty.missouri.edu/~stephen/software/xkbset/xkbset-0.5.tar.gz mirror://debian/pool/main/x/xkbset/xkbset_0.5-6.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10b9dc93200e91a2a916dd626485e66e
diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2 b/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2
deleted file mode 100644
index 5f1faff95ac8..000000000000
--- a/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-misc/xbitmaps x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto x11-misc/imake >=sys-apps/sed-4
-DESCRIPTION=GUI frontend to xmodmap
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=HPND
-RDEPEND=x11-misc/xbitmaps x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ab1f9e1eab11b9f5c6096f6f6313a7f9
diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
index 51a926f5e2e8..cefdf89b8083 100644
--- a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
+++ b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs
 DESCRIPTION=GUI frontend to xmodmap
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=HPND
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5e102c199cd4fd59dab721f20efb3d7d
+_md5_=ec1a490d0cc8d3c0224d7b802f183d0d
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
index 2d3a2c27d355..7cca9c0b7965 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Just another screensaver application for X
 EAPI=7
 HOMEPAGE=https://www.sillycycle.com/xlockmore.html
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.65.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.65.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd816252d336f71139539cc8335b9d53
+_md5_=c0277fe06863bc86357192882a84af9f
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66 b/metadata/md5-cache/x11-misc/xlockmore-5.66
new file mode 100644
index 000000000000..f9a1bce158e0
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Just another screensaver application for X
+EAPI=7
+HOMEPAGE=https://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9c6575191df2776d8af423689d8f22ff
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha10-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha10-r1
deleted file mode 100644
index 55cbef91928d..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA10.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA10.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db39133f4c72d8244e0a6aa20accbd38
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11-r1
deleted file mode 100644
index a57265917b61..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA11.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA11.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db39133f4c72d8244e0a6aa20accbd38
diff --git a/metadata/md5-cache/x11-misc/xpad-4.2 b/metadata/md5-cache/x11-misc/xpad-4.2
deleted file mode 100644
index dfd847d41b42..000000000000
--- a/metadata/md5-cache/x11-misc/xpad-4.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=a sticky note application for jotting down things to remember
-EAPI=5
-HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/libSM x11-libs/pango
-SLOT=0
-SRC_URI=https://launchpad.net/xpad/trunk/4.2/+download/xpad-4.2.tar.bz2
-_md5_=6e240b90a0fd71000849db7c3f89e535
diff --git a/metadata/md5-cache/x11-misc/xpad-5.3.0 b/metadata/md5-cache/x11-misc/xpad-5.3.0
deleted file mode 100644
index 904f3cdf075d..000000000000
--- a/metadata/md5-cache/x11-misc/xpad-5.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=a sticky note application for jotting down things to remember
-EAPI=7
-HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango
-SLOT=0
-SRC_URI=https://launchpad.net/xpad/trunk/5.3.0/+download/xpad-5.3.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=64b1d45b09fb70e22bbb064b69a6dc06
diff --git a/metadata/md5-cache/x11-misc/xpad-5.4.0 b/metadata/md5-cache/x11-misc/xpad-5.4.0
index 96a4f8b65519..30e5a485cfba 100644
--- a/metadata/md5-cache/x11-misc/xpad-5.4.0
+++ b/metadata/md5-cache/x11-misc/xpad-5.4.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-dev
 DESCRIPTION=a sticky note application for jotting down things to remember
 EAPI=7
 HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango
 SLOT=0
 SRC_URI=https://launchpad.net/xpad/trunk/5.4.0/+download/xpad-5.4.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f883c84a26f29d527dbbc2977f5375ff
+_md5_=ab8196ddae09d93f4814a9546cc13c31
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45 b/metadata/md5-cache/x11-misc/xscreensaver-5.45
index 262868f6d02d..54a7cbf3701f 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45
@@ -12,4 +12,4 @@ REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eba4725b04eea57bf1bdded31ecec6af
+_md5_=e274315b6ccc15918e82cf2790b217c5
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3
deleted file mode 100644
index 906d6004b986..000000000000
--- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libdockapp x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto >=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=XScreenSaver dockapp for the Window Maker window manager
-EAPI=5
-HOMEPAGE=http://xscreensaverapp.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver
-SLOT=0
-SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=07e529126b1733d2c736bb55c2a0968b
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
index 4748531faf26..477f42016dc5 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
+++ b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libdockapp x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager
 EAPI=7
 HOMEPAGE=http://xscreensaverapp.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b38298e34ea11d5280b714d9784bd3f7
+_md5_=ffca0ec3fdceb3e3cd666e29ad33240c
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
deleted file mode 100644
index 964f8be1dc4a..000000000000
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=small tool to report and change the keyboard LED states of an X display
-EAPI=5
-HOMEPAGE=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=45b47f7f70523d07e9f89e21551e671b
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
index 67b3196a6f0a..270ce9f6938a 100644
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
+++ b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=small tool to report and change the keyboard LED states of an X display
 EAPI=6
 HOMEPAGE=https://github.com/bmeurer/xsetleds
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz https://dev.gentoo.org/~jer/xsetleds-0.1.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9ad607f3eb9fd970ec6f7ed9744e4fb2
+_md5_=148c90e9a3e6be5fa36dca2921ebdd1f
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1
deleted file mode 100644
index 8cb8cc6d4011..000000000000
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm app-text/rman dev-lang/perl x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
-EAPI=6
-HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
-KEYWORDS=amd64 ppc x86 ~amd64-linux
-LICENSE=GPL-3+
-RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc
-SLOT=0
-SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=56f937c54246969b6db9a7dc9b333755
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
index 97ca2606589b..6bffff7fcb98 100644
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
+++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-li
 DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
 EAPI=7
 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=GPL-3+
 RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3340d0f7e13d2a10171e1cb0c03bade9
+_md5_=ebd680a652358a3f5fba5821ae300004
diff --git a/metadata/md5-cache/x11-misc/xteddy-2.2 b/metadata/md5-cache/x11-misc/xteddy-2.2
index 4e40e22a0762..4c45bdff01b3 100644
--- a/metadata/md5-cache/x11-misc/xteddy-2.2
+++ b/metadata/md5-cache/x11-misc/xteddy-2.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=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=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=A cuddly teddy bear (or other image) for your X desktop
-EAPI=5
+EAPI=7
 HOMEPAGE=http://webstaff.itn.liu.se/~stegu/xteddy/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://webstaff.itn.liu.se/~stegu/xteddy/xteddy-2.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=651e049fac9e8e0338e996a9736c5794
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=95787bc48f9225409606bf77eb15d6d1
diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.12 b/metadata/md5-cache/x11-misc/xtrlock-2.12
deleted file mode 100644
index ea0e3ff764e0..000000000000
--- a/metadata/md5-cache/x11-misc/xtrlock-2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=A simplistic screen locking program for X
-EAPI=7
-HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.12.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b088ebe432bb1f1aedf62d52e61b9879
diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.13 b/metadata/md5-cache/x11-misc/xtrlock-2.13
index d91e1490b961..cee1a632702d 100644
--- a/metadata/md5-cache/x11-misc/xtrlock-2.13
+++ b/metadata/md5-cache/x11-misc/xtrlock-2.13
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake
 DESCRIPTION=A simplistic screen locking program for X
 EAPI=7
 HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=896a59078e0828be410f108628a8baa2
+_md5_=211b253b9e272563eaea710fc0a618f8
diff --git a/metadata/md5-cache/x11-misc/xwit-3.4_p15 b/metadata/md5-cache/x11-misc/xwit-3.4_p15
deleted file mode 100644
index e3cae0ca0402..000000000000
--- a/metadata/md5-cache/x11-misc/xwit-3.4_p15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=A collection of simple routines to call some of those X11 functions
-EAPI=6
-HOMEPAGE=https://tracker.debian.org/pkg/xwit
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=public-domain HPND
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xwit/xwit_3.4.orig.tar.gz mirror://debian/pool/main/x/xwit/xwit_3.4-15.debian.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b1c64af7165fc086ddef0bea10c98501
diff --git a/metadata/md5-cache/x11-misc/xwit-3.4_p16 b/metadata/md5-cache/x11-misc/xwit-3.4_p16
index 827563df4a76..93ce0991062c 100644
--- a/metadata/md5-cache/x11-misc/xwit-3.4_p16
+++ b/metadata/md5-cache/x11-misc/xwit-3.4_p16
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A collection of simple routines to call some of those X11 functions
 EAPI=7
 HOMEPAGE=https://tracker.debian.org/pkg/xwit
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=public-domain HPND
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xwit/xwit_3.4.orig.tar.gz mirror://debian/pool/main/x/xwit/xwit_3.4-16.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1b35b104bc7fe3a20fe1e14d655b890d
+_md5_=f4aa22085560e92bc283075fbc1c79ff
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1
deleted file mode 100644
index def5bd2fa8a7..000000000000
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 ) app-text/rman svg? ( virtual/pkgconfig ) x11-misc/imake
-DESCRIPTION=eXtended XKB - assign different keymaps to different windows
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/xxkb/
-IUSE=svg
-KEYWORDS=amd64 ppc x86
-LICENSE=Artistic-2
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46a325fc0c743258b1c4c98185d8915e
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
index e663b45b6f50..c254c3ea6d7d 100644
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
+++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
@@ -1,13 +1,14 @@
+BDEPEND=app-text/rman x11-misc/imake svg? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 ) app-text/rman svg? ( virtual/pkgconfig ) x11-misc/imake
+DEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
 DESCRIPTION=eXtended XKB - assign different keymaps to different windows
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xxkb/
 IUSE=svg
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Artistic-2
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
+RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=581e75ebf37d8e43a09b9123e461fea4
+_md5_=59b4e73d21b4f6679a5cf1a21fe3d5d6
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 0433389ace88..c15c21589da6 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/kitty-0.19.1 b/metadata/md5-cache/x11-terms/kitty-0.19.1
deleted file mode 100644
index 0865d36407b8..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.1/kitty-0.19.1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c020a5961a0193d8febc5cecb88faa09
diff --git a/metadata/md5-cache/x11-terms/kitty-0.19.2 b/metadata/md5-cache/x11-terms/kitty-0.19.2
deleted file mode 100644
index b421c66b4740..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.19.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.2/kitty-0.19.2.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2239503f9a856fccb436d7f5cbb9aa2
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.1
deleted file mode 100644
index 4046747a8d99..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.1/kitty-0.19.1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4397b640a2218503f172ad4e457b299c
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.2 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.2
deleted file mode 100644
index 914ab1f9b1bb..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.2/kitty-0.19.2.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4397b640a2218503f172ad4e457b299c
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 05b2a08d6ceb..ad88aa59d088 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/e-flat-theme-0_pre20210315 b/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20210315
new file mode 100644
index 000000000000..c319328c80ab
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20210315
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DESCRIPTION=A modern, flat theme for Enlightenment WM
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/ https://phab.enlightenment.org/T6726
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-wm/enlightenment
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~juippis/distfiles/e-flat-theme-0_pre20210315.edj
+_md5_=6624b300ab35993f67a1aec821c30eaf
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.18.0 b/metadata/md5-cache/x11-themes/kvantum-0.18.0
deleted file mode 100644
index b3cb90529c11..000000000000
--- a/metadata/md5-cache/x11-themes/kvantum-0.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-DESCRIPTION=SVG-based theme engine for Qt5, KDE Plasma and LXQt
-EAPI=7
-HOMEPAGE=https://github.com/tsujan/Kvantum
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.18.0.tar.gz -> kvantum-0.18.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3ba097a6d668af218529ad9d0a541fa
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.19.0 b/metadata/md5-cache/x11-themes/kvantum-0.19.0
new file mode 100644
index 000000000000..f36f04f3034e
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/kvantum-0.19.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
+DESCRIPTION=SVG-based theme engine for Qt5, KDE Plasma and LXQt
+EAPI=7
+HOMEPAGE=https://github.com/tsujan/Kvantum
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.19.0.tar.gz -> kvantum-0.19.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e3ba097a6d668af218529ad9d0a541fa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17 b/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
deleted file mode 100644
index 80c90951b9db..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An official icon theme from the Numix Project
-EAPI=7
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/18.07.17.tar.gz -> numix-icon-theme-18.07.17.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21c888c340d670573413991d3f43b5a4
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20
deleted file mode 100644
index 1dc8e7fc5b9b..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An official icon theme from the Numix Project
-EAPI=7
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/20.03.20.tar.gz -> numix-icon-theme-20.03.20.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bedf0cbdbc3483b9966f50bf587719dc
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
deleted file mode 100644
index be51684a42eb..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
+++ /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=Icon theme from the Numix project
-EAPI=7
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.12.27.tar.gz -> numix-icon-theme-circle-19.12.27.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
deleted file mode 100644
index 42dcf7c704dc..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
+++ /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=Icon theme from the Numix project
-EAPI=7
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.06.07.tar.gz -> numix-icon-theme-circle-20.06.07.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11
deleted file mode 100644
index c562bab4a1bb..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11
+++ /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=Icon theme from the Numix project
-EAPI=7
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.07.11.tar.gz -> numix-icon-theme-circle-20.07.11.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191009 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20191009
deleted file mode 100644
index 74f4af211331..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191009
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20191009.tar.gz -> papirus-icon-theme-20191009.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c41f147376348db7662129ddacae498
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191101 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20191101
deleted file mode 100644
index ee5f20698f4b..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191101
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20191101.tar.gz -> papirus-icon-theme-20191101.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d9962fe0d6513b68691e08db7a81f7
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191201 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20191201
deleted file mode 100644
index 336181ea7ee7..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20191201
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20191201.tar.gz -> papirus-icon-theme-20191201.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d9962fe0d6513b68691e08db7a81f7
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200102 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200102
deleted file mode 100644
index ff13d074a4d6..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200102
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200102.tar.gz -> papirus-icon-theme-20200102.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d9962fe0d6513b68691e08db7a81f7
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201
deleted file mode 100644
index a5333a6d8c6f..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200201.tar.gz -> papirus-icon-theme-20200201.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d9962fe0d6513b68691e08db7a81f7
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200301 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200301
deleted file mode 100644
index 790b20870b40..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200301
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200301.tar.gz -> papirus-icon-theme-20200301.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d9962fe0d6513b68691e08db7a81f7
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200430 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200430
deleted file mode 100644
index 27de01bd9968..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200430
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200430.tar.gz -> papirus-icon-theme-20200430.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=763f6c5277b87852b438d9d268dff26e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200602 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200602
deleted file mode 100644
index a6d36d77b6bd..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200602
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200602.tar.gz -> papirus-icon-theme-20200602.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=763f6c5277b87852b438d9d268dff26e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200702 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200702
deleted file mode 100644
index 6e9fa4f60c6b..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200702
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200702.tar.gz -> papirus-icon-theme-20200702.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=763f6c5277b87852b438d9d268dff26e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200801 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200801
deleted file mode 100644
index 9bd4eae90cb5..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200801
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=icon theme for Linux
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200801.tar.gz -> papirus-icon-theme-20200801.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=763f6c5277b87852b438d9d268dff26e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
index 2cb7953fd9aa..ed2240c7d311 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm preinst
 DESCRIPTION=icon theme for Linux
 EAPI=7
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200901.tar.gz -> papirus-icon-theme-20200901.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=763f6c5277b87852b438d9d268dff26e
+_md5_=13af74fec53925a4432760951309eb2e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210302 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210302
new file mode 100644
index 000000000000..2236ed867a51
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210302
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free and open source SVG icon theme
+EAPI=7
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210302.tar.gz -> papirus-icon-theme-20210302.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=845f8831ddbfd25d8ca5a49eefba4b6c
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
deleted file mode 100644
index 627ffb1ad703..000000000000
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
-EAPI=6
-HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=91282af395cc330b6bb31877b771fd41
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
index e88c74c0f239..1cb35bd4b4b6 100644
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
 EAPI=6
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_md5_=7acaed38d624a8169386643ff9882afd
+_md5_=c8780c025190f76bd35b5347211373ab
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 39ce22893ce9..fa0dfb736dfd 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/fvwm-2.6.8-r2 b/metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
deleted file mode 100644
index 1e97f11266c8..000000000000
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=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/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto doc? ( dev-libs/libxslt )
-DESCRIPTION=An extremely powerful ICCCM-compliant multiple virtual desktop window manager
-EAPI=7
-HOMEPAGE=https://www.fvwm.org/
-IUSE=bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ FVWM
-RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) dev-lang/perl perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-SLOT=0
-SRC_URI=https://github.com/fvwmorg/fvwm/releases/download/2.6.8/fvwm-2.6.8.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e89dda5eac90fbdbe8df3bbbd04f5352
diff --git a/metadata/md5-cache/x11-wm/muffin-4.8.1 b/metadata/md5-cache/x11-wm/muffin-4.8.1
index c27a154e3142..d3031512808b 100644
--- a/metadata/md5-cache/x11-wm/muffin-4.8.1
+++ b/metadata/md5-cache/x11-wm/muffin-4.8.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/4.8.1.tar.gz -> muffin-4.8.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aef11711802a8786ad93b4c3959ef854
+_md5_=563fdb3c3438dd4ef267acf3430b4c17
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 3e6471c1531d..57ad6f72094e 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) x11-base/xorg-proto
-DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) x11-base/xorg-proto
+DESCRIPTION=Standards compliant, fast, light-weight, extensible window manager
 EAPI=7
 HOMEPAGE=http://openbox.org/wiki/Main_Page
-IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_single_target_python3_7 python_single_target_python3_8
+IUSE=branding debug imlib nls session startup-notification svg xdg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) )
-REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) )
+REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 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	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c8f4b7503c56d03d38451d80ecc20f5
+_md5_=18b28f1115e5998c53fb2ed17dde34fc
diff --git a/metadata/md5-cache/x11-wm/openbox-9999 b/metadata/md5-cache/x11-wm/openbox-9999
index 556065c30d37..610e525e24ab 100644
--- a/metadata/md5-cache/x11-wm/openbox-9999
+++ b/metadata/md5-cache/x11-wm/openbox-9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) x11-base/xorg-proto
-DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) x11-base/xorg-proto
+DESCRIPTION=Standards compliant, fast, light-weight, extensible window manager
 EAPI=7
 HOMEPAGE=http://openbox.org/wiki/Main_Page
-IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_single_target_python3_7 python_single_target_python3_8
+IUSE=branding debug imlib nls session startup-notification svg xdg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) )
-REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) )
+REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=3
 SRC_URI=branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ae1735cf116882235b2c77a4f4c0fc2
+_md5_=910bd94a1747efd4e29b6b5e4728e067
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b8450ba25c65..0abcd87a122b 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-hdaps-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.0
deleted file mode 100644
index 44264b73ecf4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14 >=xfce-base/libxfce4util-4.14 >=xfce-base/xfce4-panel-4.14:=
-DESCRIPTION=Show the status of the IBM Hard Drive Active Protection System
-EAPI=7
-HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.xhtml
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3+
-RDEPEND=>=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14 >=xfce-base/libxfce4util-4.14 >=xfce-base/xfce4-panel-4.14:= app-laptop/hdapsd app-laptop/tp_smapi
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-1.0.0.tar.xz
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64bbcf1637710c602f1ce008f7f359a9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
index 1be92c5e36e9..da15d6388d70 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14 >=xfce
 DESCRIPTION=Show the status of the IBM Hard Drive Active Protection System
 EAPI=7
 HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.xhtml
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 RDEPEND=>=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14 >=xfce-base/libxfce4util-4.14 >=xfce-base/xfce4-panel-4.14:= app-laptop/hdapsd app-laptop/tp_smapi
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-1.0.3.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bfe681fde238e4c8e65d8af035eb470
+_md5_=a83f0ddcc18a0a1cc20a0c3f36b5e681
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1 b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1
new file mode 100644
index 000000000000..68a22bbfcbdb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.9/xfdashboard-0.9.1.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03b616548c5fa41a751fc73b3db2016c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index da43353ebf11..0dafe7e304ff 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 10791 BLAKE2B 09f2380110aa789ac78721e30475f1299e4ad1c319c0ed4063528b8b340c6df850f9e35e6e70a46a047e16ce75eaa9e985e1d001f821e5e7f37d7e1fe907233d SHA512 ff6a62b432bda8c24c2bc9e3bee6d4c86e622637ab7796f81e9646b073e66fac67f4adcb5692f71f31fac9c31987ce0c3a4ee8ddd5532a3407abaeca2c2a8def
-TIMESTAMP 2021-03-12T21:08:38Z
+TIMESTAMP 2021-03-20T13:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBL2FZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBV+tRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAyuw/9GMICQsOvsG0nyozddl4yUBsRJgqNzqZEHyJ+UiFrBFpTxcb8YljVjerL
-FT0kbSrIwevFwdkvI/x+y70vAIskJLSE9z8it8oT/8QSYxcw15dlFXW3LPDN3qnx
-0SQVcJdSSQmy108zwSguvzNetrZFdhmzLNJD+xTncdBKzRg6Wt+6QnOADAQjwXPu
-Jv5LlCxCTngpJyRnnLyc2XehAf+e1aqJ98DA8FNq4fw6P2nUQ5vFY7EZOlaLYtOd
-tCt3hvzRrCuqMgj9A3FWz3rPzwfmpIFE50hLFWgItJI9pK/OcoqyVKlLz0eTdHqz
-iJZBiAk5XteDVvK/2zXnb2qiufRcaEjjsYpW1kAL35gOjnIADNfY+ZqD+pd8SpOu
-IIwyfKir5mhWmVWofbRTf/+Cfv43kv8OejhDYQn3qnPQekPjQ4cvYrerYAaauWEQ
-yr0w63BFlwHjgxnUy7ttTCL+CCjOpHNC9sGFUjttj/qoRwV2hPryC8k3QdJinutE
-W3AvI7kfCjOUefuzkVkVwEnoGzH8G9+LXlY5f8LOCns4mfVg9yAXLh1yOtVFFD8c
-cnUGq9CgW/UGC0PfqKs4tD3ARohLB0zBOQfQ8NK4ttqAl5Y0E8ZDf8rYd4rK/FPd
-Jv7LTHkQF4dAfICacIcXUJcPxQC1FyRVcym6YOHEA3nR1HSzYUw=
-=N4fA
+klBuvBAApFQqxJG4QOF6v3G1ZY+0v8oAfRaFbTivQnmnc+oS27yh3aMPuOLKCBG6
+MfwIt9LUUS8wgDB4BOTFKIQw8OXuifUxfEExH+tIbcSK6BAIuOtGeTYFhrz9Gg9e
+/DI9UFZf6Mj2EwntRMfiKwUwqPXNgsIXzcSjg5W5gziH/BEYJRi3Vb5ZQXOvod3Z
+eatEiIB1GiF8EA+h2rAzNQALfiE06QrnJ1BAxZUSfYcdxnUCpbDJTR7fwXtkFSKA
+wp8YKzO2wbbFeOtF7Ho+KkIUxw2kma3kSI88hMw2+2ouYSzmMTz+IQSa+UuLiBoi
+kuGLU1N8/OYnudBQajK4eGh+BEHxsUr1AfEgI63+urgpMyoFbS8XjxBfASoxo2nF
+ZndHu+UUgmeeHOkmQTt55SATuhRdlYHw6EOgYVIRacX2VihzObUeaF3jSbRJMXr0
+CRtGnwu26Pb+2G11aDWPt53xN5s4WryIpTWvNt4YL/JHBWVdATuD7czqf4jwpnYP
+RtujW8IDohng2Udun2fS5T7+VAT74Njf4EVH1Spuhvz0ImcCa/Zi+XCfAZJKsp/v
+XPc1UYavScVepMadnvOmi6smvFHG+fNmSP2hntK9c7ysdJ1Jvlgoatm4A78Lho80
+c5PpezvNw8A1U87PDFP0sCp5xRIzbFog7QyeCHX0untgYU2ZU1w=
+=BQBZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3e7957be79e8..bc5efed9f6c8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Mar 2021 21:08:35 +0000
+Sat, 20 Mar 2021 13:38:25 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 6e6c6d119b9e..92fe3c5a7f4c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3201,10 +3201,6 @@
       <name>Andreas K. Hüttel</name>
     </member>
     <member>
-      <email>jstein@gentoo.org</email>
-      <name>Jonas Stein</name>
-    </member>
-    <member>
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 7db2209518e3..e8a158e2657b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Mar 12 09:08:35 PM UTC 2021
+Sat Mar 20 01:38:25 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e25aecb50e64..20a39f0145e5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Mar 2021 21:15:01 +0000
+Sat, 20 Mar 2021 13:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 06b58e80ca56..5d11e352d172 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0f315f56a64f545518e87c1febedb2f85d46b779 1615582678 2021-03-12T20:57:58+00:00
+43eccd35184411fc0044fd4293ed34ae6b82e3d9 1616247047 2021-03-20T13:30:47+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d6954f7e3660..5d726426470f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1615583101 Fri 12 Mar 2021 09:05:01 PM UTC
+1616247301 Sat 20 Mar 2021 01:35:01 PM UTC
diff --git a/metadata/xml-schema/Manifest.gz b/metadata/xml-schema/Manifest.gz
index c7de72560e49..0e231cd374a5 100644
--- a/metadata/xml-schema/Manifest.gz
+++ b/metadata/xml-schema/Manifest.gz
diff --git a/metadata/xml-schema/metadata.xsd b/metadata/xml-schema/metadata.xsd
index db243abbf7e8..d2e3d4ff1c11 100644
--- a/metadata/xml-schema/metadata.xsd
+++ b/metadata/xml-schema/metadata.xsd
@@ -127,6 +127,8 @@
 		</xs:choice>
 		<xs:attribute name='type' type='maintainerTypeAttrType'
 			use='required'/>
+		<xs:attribute name='proxied' type='maintainerProxiedAttrType'
+			default='no'/>
 		<xs:attribute name='restrict' type='restrictAttrType'
 			default=''/>
 	</xs:complexType>
@@ -138,6 +140,14 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name='maintainerProxiedAttrType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='yes'/>
+			<xs:enumeration value='no'/>
+			<xs:enumeration value='proxy'/>
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:complexType name='upstreamMaintainerType'>
 		<xs:all>
 			<xs:element name='email' type='emailType'
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3e7957be79e8..bc5efed9f6c8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Mar 2021 21:08:35 +0000
+Sat, 20 Mar 2021 13:38:25 +0000
diff --git a/metadata/xml-schema/timestamp.commit b/metadata/xml-schema/timestamp.commit
index d99743ca0799..648347a115de 100644
--- a/metadata/xml-schema/timestamp.commit
+++ b/metadata/xml-schema/timestamp.commit
@@ -1 +1 @@
-cd3e62ffb7761008bba5eed179805adc10f1e627 1602785636 2020-10-15T18:13:56+00:00
+1f044715a9459c7d0f724d4a7c5e18b274254ae2 1615752661 2021-03-14T20:11:01+00:00
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ffec2de4159e..e7bc59641382 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index 8c2a0d8dfc87..c12b05a8ea13 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,4 +1,6 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
 DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e
+DIST alive-2.0.3.tar.xz 187396 BLAKE2B 0614ae8d0707abf59dd1500d986ce21221092d118a40ae92e838bd11b81a2b5fd261a531843f99992746a86a31bbb494a9f35f9fa0ad5c0ea896d68edec17205 SHA512 3b2f14d84682466e02fc6678ba26eb4c0b9378f1c938a7463cc5736501cbf144baaeb7dea2c8343a916891ce4e2d580bac946c913c01d7c25e12bfa611c89422
 EBUILD alive-2.0.2-r1.ebuild 534 BLAKE2B 373d867ca88524aafd8e90352eb11975543b5a39abd4d7092b6ba3565bf17d42772fa52875563d123ef65df69318e8d26335597d91557eaa6d6fa75504fdd603 SHA512 3a74d3aa466c820b9e6646dcd10ede837177eea419ec0be6bbdde3546f7f7391a6808c532b2bea4e8109c1484fc71e1bc7ec1491691514d181200f541ff63264
+EBUILD alive-2.0.3.ebuild 518 BLAKE2B 0c7e1a4f1816b54cbc699cd79ab83832af6f5dc6ce3718bd2eee0a24e64791c6004d274e330364df57529e8fb8ece2db56a3f73525d0a7902595851d61a956d0 SHA512 42e5124b1527247bb12ee74ab2549b90f9c0de6d212d0931b22d299ef95b0f74a5a683bddef81cf94e2d1dba61044e38d91780534b379098a937e93a37ebfcf7
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/alive/alive-2.0.3.ebuild b/net-analyzer/alive/alive-2.0.3.ebuild
new file mode 100644
index 000000000000..89a15d6ada23
--- /dev/null
+++ b/net-analyzer/alive/alive-2.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A periodic ping program"
+HOMEPAGE="https://www.gnu.org/software/alive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/xz-utils"
+DEPEND="
+	dev-scheme/guile
+"
+RDEPEND="
+	${DEPEND}
+	dev-scheme/xdgdirs
+	net-misc/iputils
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.2-ping-test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 1bc805f57c4b..ae51e75f62db 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,4 @@
 AUX 4.8-system-pcre.patch 1232 BLAKE2B b659a49c80f5902718160f41f70a595607e70b80ad5c332952365bca9d09e5fd63bd7b6f4f737c5803cd49189e0030aef835cfc5cc7c2615a2705ca286443cff SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934
 DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
-EBUILD amap-5.4-r1.ebuild 1630 BLAKE2B 5449df4394abc60542a06ad5d7b010befb0599eeba37565f9886c50111cb3b66e58c1412423e7984310c04acb2cf6bf6f011d98aef18665cebf8202f79185dab SHA512 e60ffc4d76af9219c5efd2b1da76d0487b48c45a0504d13be3a5fbf543325b0e1be9f92025fe5f3ead83f4d02f81c1ee21971a9508ff7c25a8b0f986bef46dff
-EBUILD amap-5.4.ebuild 1568 BLAKE2B 8f2e5d3fbc3dd8cf87539984198212a56ff8a68549bee6ce9f659b85b026f9d4c8803dd026d001d46513c07e239c68313cec366b17606051cb5fa7c1314d8ebf SHA512 d4a516be2e3826a6b8aba3ee0a13cd5ee3ae61b16fb4b33c1d2457fb1c5b4417802b24fd26463c9ee6020b3a8681145bdb6aa1c45cad021bbdb3af185ab1d54d
+EBUILD amap-5.4-r1.ebuild 1637 BLAKE2B acf1f1646c7c5425252787e6dfc6a6dcb17534ac8ee3c10f2b6bd39e231a428a5902a0ba41f6c343fbf7795d57cf8478a6ea24e52621f38c9f4e594be0a1a867 SHA512 198b03eb65648f3d2e0b43161768c9dc02bad82a4252264e81b956c41cc16331b4a0b46c293167208f1c04d505ba5da98a5fba9193c0edcba5d06a77221177cd
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 9848a4c18f2d..2703bd6e4bd7 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A network scanning tool for pentesters"
 HOMEPAGE="https://www.thc.org/thc-amap/"
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="
@@ -26,23 +26,31 @@ RDEPEND="
 	!sci-biology/amap
 "
 
+PATCHES=(
+	"${FILESDIR}"/4.8-system-pcre.patch
+)
+
 src_prepare() {
 	rm -r pcre-3.9 || die
+
 	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+
 	# Above change requires below change. See sources...
 	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
 	sed -i 's:/usr/local:/usr:' amap.h || die
+
 	# Files to be updated are at different location, bug 207839.
 	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
 
 	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
 
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
+	default
 }
 
 src_configure() {
 	# non-autotools configure script
 	./configure || die
+
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -50,12 +58,14 @@ src_configure() {
 		-e '/^XIPATHS=/s:=.*:=:' \
 		-e "/^CC=/d" \
 		Makefile || die
+
 	if use ssl ; then
 		sed -i \
 			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die
 	fi
+
 	sed -i Makefile \
 		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
 		|| die
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
deleted file mode 100644
index ef97cd2aec15..000000000000
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )
-"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/amap
-"
-
-src_prepare() {
-	rm -r pcre-3.9 || die
-	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-	# Above change requires below change. See sources...
-	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-	sed -i 's:/usr/local:/usr:' amap.h || die
-	# Files to be updated are at different location, bug 207839.
-	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
-}
-
-src_configure() {
-	# non-autotools configure script
-	./configure || die
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		-e "/^CC=/d" \
-		Makefile || die
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die
-	fi
-	sed -i Makefile \
-		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin amap amapcrap
-	insinto /usr/share/amap
-	doins appdefs.*
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 841a34fa9e29..ba856bf18a61 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -3,13 +3,6 @@ AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b
 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
 AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
-AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
-DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
 DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
-DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
-EBUILD argus-clients-3.0.8.2-r2.ebuild 1519 BLAKE2B fbd75810aa28eeaa2f9e71cdc3eb9576f0f4819cecfed3c39595e374c800870f877ec5cf82d6ba9e792fc0cba2a88cf6e1725ee74d7312a4b43939212972f4d6 SHA512 a5109d04f041dddd80e7b0de7d1fc1539eb3c5fcd10ca2e68592c54d11a7be2132996265aeb38a21fccdfaa8572c876353262c722a75f27f3d840bb4024ddc98
-EBUILD argus-clients-3.0.8.2-r3.ebuild 1562 BLAKE2B cb0d32880096b5c421b690567bdad37ffda750e08f18ace6818a98c5d8608fe3cb6fc69def073dafacd68f0158e10894ff0c9fd92b30d3fde04af59ff62eba24 SHA512 bcf1a4da98180e1b841f14e4ff992a8b9003e38bd2ad5b584a4d46262c7edb68d384fd00bca5e09cde7929dc36dd40ec33c284c42c821fba6f1e9b10738c0afb
-EBUILD argus-clients-3.0.8.2.ebuild 1452 BLAKE2B 52eb69a7b9cd55066c118503866915b361b30f0fa0d6732e4bf31d20e9029b9a5350bdce7413fc768b9a552782b30731de6c20f6a7cec6740177a7e80007c033 SHA512 15f49d72ad76e88745bb3e0fe2966348edc220ea6af06eb65b0e3274f626fbf73931d53f47ac3681874e2d51ad2f5f53958d9bd77f717ed821b0157003bf6ffc
-EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 20dd3ce043f786f5ed0d86b46d677a5fcc4de995f928ca664c373f16dbc77ae4dd04751f6259a4153bce107a13b9e32bb87690274c350ab552069658838a4eb9 SHA512 972c666d58895e0677098d38977f9f31ba9eb1fb1aeeaab45972a2ea7ee85df33987952bb61e5ddb6c94a402fee902af2536231c2702c2f72997061b92985225
-EBUILD argus-clients-3.0.8.ebuild 1445 BLAKE2B 572a61f3c2b3b86886e984c1ca6ca25945289d7be5f6b8efc240bebb1c070c7399f7c1579317c77f3b92278c9bdfc72f66d6b3e5159b97e370e224149590ea34 SHA512 fb741600733cfe208ea70861b17f34bd238d26d95cd09f233e6febf49793e2e2df816f26fef5f69f44af69d0fdd17ce269666c4bf319c8efceea3e9f55f776a0
+EBUILD argus-clients-3.0.8.3.ebuild 1512 BLAKE2B d527d817e7a131b920dfa731c67038a7c6fb18e3c6041c04507b586003766a60f5ba7c12f2e9b56c24467155eaf4abb4c82bde6fa953578dffb791f84d779138 SHA512 7a1c7b40b918dafb1a126766cc20ef2d20525227caf2200a9d29f8035037b9ab27d775adc41c8f10ba82af32bdbe559a8c6a1a3359937b42bc710a56d2ebdc80
 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
deleted file mode 100644
index d87060d87bec..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-ARGUS_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	net-libs/libtirpc:=
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="
-	${ARGUS_CDEPEND}
-"
-DEPEND="
-	${ARGUS_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR RANLIB
-
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql mysql /usr)
-}
-
-src_compile() {
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
deleted file mode 100644
index 637ef50ad05a..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-ARGUS_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	net-libs/libtirpc:=
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="
-	${ARGUS_CDEPEND}
-"
-DEPEND="
-	${ARGUS_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR RANLIB
-
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql mysql /usr)
-}
-
-src_compile() {
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
deleted file mode 100644
index d16c7f6422a6..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	# racurses uses both libncurses and libtinfo, if present
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
index da05b0364a68..382122ab0c5d 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
 ARGUS_CDEPEND="
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
deleted file mode 100644
index 742c6cbebee7..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	# racurses uses both libncurses and libtinfo, if present
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
deleted file mode 100644
index e140fa96b2a3..000000000000
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,7 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_PROG_YACC
-+PKG_PROG_PKG_CONFIG
- 
- AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
- AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
-@@ -82,6 +83,12 @@
- AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h])
- AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h])
- 
-+PKG_CHECK_MODULES(libtirpc, libtirpc,
-+	[LIBS="${LIBS} ${libtirpc_LIBS}"],
-+[AC_CHECK_HEADER([rpc/types.h],,
-+		[AC_MSG_ERROR([Cannot find <rpc/types.h>])])]
-+)
-+
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -48,7 +48,7 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@
-+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@
- DEFS = @DEFS@ -DARGUS_SYSLOG
- 
- # Standard CFLAGS
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index aa5e638208b9..676e7404c921 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,14 +1,9 @@
 AUX argus-3.0.5-Makefile.patch 437 BLAKE2B 95d853328925c46dcf9ff3edc98be0ce581cf9349f75f94cfb3eb122b9e78c353187ec5a26d646468df55bbd1d63106f33908f0c8395d4b8f08addaa5e5e3916 SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7
 AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f3ea76ae5449c682b7727237ad8a2ee6d55d6da8f45d34581f393464ae9c3a4a5f74aad7dcecee0f3c5378581d3fd92 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037
-AUX argus-3.0.8.2-fno-common.patch 929 BLAKE2B 9fee5b11eb3d0436547e6d26fef654e6c9bfc2929cac2cfb411710ff28fd4110e5a90ebf02f46f6b71f11ba1d46d0164c8e41ac32e4953e5267bc7361e46a357 SHA512 1f5501095f712dc3107753849e91736a15768060b71f18dbe2ef9c0c4015ecc78481fc97d05fe821a4191bb9b04346f91734b75625ef967685f65a94f5859475
-AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
 AUX argus-3.0.8.3-ar.patch 240 BLAKE2B 28cfc93b87a7dbad663f10b1686b51344c1bcec23e2ad83863798b22f56dce1f76e496f864b1d8b815f12ab016e3c161ce234d01cea296437e000761a63f5cf4 SHA512 4aadb3a5c4f65d0a11e7eeecb66bae7dfbbbe9ddf933319788a2b4f109df3971c24b85a6932a9e29f5c8a39c26b854dbe015de84206df36bd91a3c076638eec7
 AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c1d99b1bc2bdf2e7c94d45f323ef98835ad4a1fd303dbe84006ce0099584c081f2c3f482996e31f5ef4d51ac29860bf SHA512 c8ce35d80e784ca09b46dfcb804cf103b5263e48a0009aa3e7a2a1c6bdf4158c8276136a0086a7b8d3ca5414cf40aa67e86923bf59a7b9398368ba08fbc4d4bd
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
-DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
-EBUILD argus-3.0.8.2-r3.ebuild 2007 BLAKE2B 03b484f6869b6064be1ffaf660a8a402f51d7c5454b9395fe427284ef4fbb3ed0af2cee5cb4e5f7350e15e0d1e0a775c5834b948bcaa689adf391631b63e5898 SHA512 4d8ec76f190e380ad59c01e15e6eeff645edeea8d57143afbbc2b99228f80f35ba06c0adb8f752599d5b09165063f2fcd62433c0035ce225cbf12ab8d2751144
-EBUILD argus-3.0.8.2-r4.ebuild 2037 BLAKE2B f6a3ea728f7c802b79551a91a776f349128d06d46965cacafebc5dc7032b7cca8c33c29f3b5c8d78dfc492f2dde817cc86a722dd097dadbff62540fc778fdcb7 SHA512 1e72858634af6236619d4fa33c047f3dabddc50325611d0dbd537942785ecc8d845c178888974726220012143fea8c066d2bf269f55ada729b8ea311d6d5770e
-EBUILD argus-3.0.8.3-r1.ebuild 2030 BLAKE2B 0f3d466fde3694ed0238b803f6002b32fca67e8ee23169dde2c66a65a12fd40a8005240ea7597e3d536c8a3877757e0af7ff6795413c5903ae485140c95b3b65 SHA512 2d30dd9e69fce9eae94d7c671f41a52d7e73d7b900dbfd974d8078363ad8ccbabf60571349d07b4135e90987f6fa8a6b4e641282586dbec19ec53c8611e84e00
-MISC metadata.xml 378 BLAKE2B f5479fe68336ff3ee37d9e325b9b2c1a70eb399746512fec7e08e603c82c1183b8229e0b9ee1fae073f027ca7a7eabbf9e4607c9ab1b2fa6bb6fc8b6c9bdac6a SHA512 cbd4b2e58b229b6fa82e1b3628153113b611d7370e2f4fd3e662541f07d79c01aa5974cb797bcc67017034dc7f52373648b2cdb5a7f64a89391c7028303f591b
+EBUILD argus-3.0.8.3-r1.ebuild 2027 BLAKE2B c42a9d8f32014719a0e14ca3d1bbcde1ea1502d017b2e6fc65976f8347babc8d730563873ceb697c2d2a8eff2178c84c533078d8d47e06f874ca41702ca902d5 SHA512 ed897208fddef0e11e7436851eb8bd3c95d8d5195928a9a8c6994c6acfc2622d4b3a639de0abd09a5e32bb1f51e905d532f1f0ff8b1c34cafbc56263e105aac2
+MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
deleted file mode 100644
index 47656c47be5d..000000000000
--- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-	acct-group/argus
-	acct-user/argus
-	net-libs/libnsl:=
-	net-libs/libpcap
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	sasl? ( dev-libs/cyrus-sasl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-
-S=${WORKDIR}/${P/_rc/.rc.}
-
-src_prepare() {
-	find . -type f -execdir chmod +w {} \; #561360
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \
-		"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /var/lib/argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that the init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
deleted file mode 100644
index dd6e555ef544..000000000000
--- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://openargus.org/"
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-	acct-group/argus
-	acct-user/argus
-	net-libs/libnsl:=
-	net-libs/libpcap
-	sys-libs/zlib
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-	sasl? ( dev-libs/cyrus-sasl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
-	"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-	"${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch
-)
-S=${WORKDIR}/${P/_rc/.rc.}
-
-src_prepare() {
-	find . -type f -execdir chmod +w {} \; #561360
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /var/lib/argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that the init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index 9dc4905b07a7..a4176cf571c4 100644
--- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
deleted file mode 100644
index 66f950d0c04d..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/argus/bootp.h
-+++ b/include/argus/bootp.h
-@@ -45,6 +45,8 @@
- 	unsigned char	bp_vend[64];	/* vendor-specific area */
- };
- 
-+extern struct bootp *bp;
-+
- /*
-  * UDP port numbers, server and client.
-  */
---- a/argus/ArgusUdp.c
-+++ b/argus/ArgusUdp.c
-@@ -40,9 +40,6 @@
- #include <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--struct bootp *bp;
--
- void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *);
- 
- void
---- a/argus/ArgusUdt.c
-+++ b/argus/ArgusUdt.c
-@@ -40,9 +40,6 @@
- #include <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--struct bootp *bp;
--
- struct ArgusSystemFlow *
- ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt)
- {
---- a/argus/ArgusModeler.c
-+++ b/argus/ArgusModeler.c
-@@ -43,7 +43,6 @@
- 
- #include <argus.h>
- 
--#include <argus/bootp.h>
- #include <signal.h>
- 
- #include <sched.h>
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
deleted file mode 100644
index 96af0caf140e..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -35,12 +35,12 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
-+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
- DEFS = @DEFS@
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @RPC_LIBS@
- 
- INSTALL = @INSTALL@
- RANLIB = @V_RANLIB@
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,6 +120,25 @@
- AC_CHECK_FUNCS(floorf remainderf)
- AC_CHECK_FUNCS(timegm)
- 
-+AC_ARG_WITH([libtirpc],
-+           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+           [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno], 
-+      [PKG_CHECK_MODULES([TIRPC], 
-+                         [libtirpc], 
-+                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+                       )], 
-+      [AC_CHECK_HEADER(rpc/rpc.h, 
-+                      [RPC_CFLAGS=""; RPC_LIBS="";],
-+                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+                     )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- AC_CHECK_FUNCS(xdrmem_create)
- if test "$ac_cv_func_xdrmem_create" = yes ; then
-    AC_DEFINE([HAVE_XDR], [], [Using system XDR library])
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index 025cfc82ece2..74c2baebb4ec 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/metadata.xml
@@ -5,7 +5,4 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
-<use>
-	<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
-</use>
 </pkgmetadata>
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index a4107c97b33c..27c3013b575d 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,6 +1,4 @@
-DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
-EBUILD arp-scan-1.9.6.ebuild 466 BLAKE2B df0472c3ab4b460912fdf6c2cdee09db76a33c10c550d701f3a598abd5508508a26b2204bf099a1a820fa7c32068576b00525d4c65957279a51d54ac7b22fd90 SHA512 69c822f1d85edca29c4c4943978ad85f55940f8545c69027b24bc8d19ed65199bbcd0849aedb66b20aa7136d71f5faab1f96380dcd8219849a9559d77f70a1e5
 EBUILD arp-scan-1.9.7.ebuild 472 BLAKE2B 9e1d1d684de88508e55728e88bbe1983baca6b270553657766df91e6a33ee3d833fb3f3c371d9f706105f207e4412eb7ab9a9c87a1db78cf8d480198ea861625 SHA512 71dff6ec3626642fc15632a2f1e76f50eeb4d0e3ef2503ceb541dcfe4455001040fd601ba3d87240894aac982037a9e27a1e8a4c2de6045e521504ef92faa194
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
-MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
+MISC metadata.xml 362 BLAKE2B 3f812777c8a9dff2088b34b8aee211726af3c08ae94980169a99596cff8cce2f5c3b876a4f059a8b29868d4d7879d8b33237d4544a157611d24b5d428eda02ec SHA512 abdb943e2a29ad44cad2b8bfb4c5479c0d7ba2bf4c7142dac9c156eeafa6e0f779a72a7db253539299f697c3c1c939420ddf1798e696c364ff58c1854d0d463b
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
deleted file mode 100644
index 96432c7a989f..000000000000
--- a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="ARP scanning and fingerprinting tool"
-HOMEPAGE="https://github.com/royhills/arp-scan"
-SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 2c12d90c2aae..390911250168 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 3165e717a51e..34e3ad166de9 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -4,6 +4,6 @@ DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ff
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 EBUILD arping-2.17.ebuild 708 BLAKE2B 3f42edd2ff6cbcba37db121428174f06a7a88c0d7217918509b962b2f5da6f9db020102989bbdd4fb28c9a5077dd77e58bc5d4995712b7c71d37add6064ef122 SHA512 dbc00430158b3633e3b35fd2d72e17f27a1ec42c8e306a8d40e149cca5b909db5792d3f21fad1b7463803c4831b405a27a871c6db45f4df76157ea5408d1bcc3
 EBUILD arping-2.20.ebuild 796 BLAKE2B d4637d26d201b66e4dd1a2c60efb22e5b60f239d6c538df33959d04d9ef69b3b6bc3c877ea731bc92544485b99abab067e20504af60820256740c41f9a00ba64 SHA512 dcbc382a2b8e77aeea9e945b3d1f3ec31c19c6b045d1c537f2e725ab9a89bbf73d9fd1194aecefc354956cafbd852b37b27968a427b381af5680e22f3d29e967
-EBUILD arping-2.21.ebuild 875 BLAKE2B 40e671d37c22221b5667818445217f9448e44de8e38beabf5d71e825613ec25b991d7e92a8ec505d5fb238e0eae9988ca9367b228525128065c07c45e3eae812 SHA512 ddc1e289e55669ae807d5804e5787566d07cea094fb0bd14fab3c8d1b1b67f3c106226676f26fe0b3f5aa5ab21c578eca2bcb839340e16ded3724452e79f7417
-EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+EBUILD arping-2.21.ebuild 855 BLAKE2B 6b9fa215468571ae71aff90ce9623e1357eb28c984ade20ae14bd09feab974ffa42ccd4f9a0cf2a9259203fe49a94aa492c25b40c396c48d914270042a44c826 SHA512 0e0712484992fb5e332230cf0b3053f25914019f7fd04ac81a6838fce8512f021990ef093c4f55b80cf0068d2f1036b49f6a2982ab8937891ac5feb6c8574321
+EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
+MISC metadata.xml 364 BLAKE2B 8043df9ad04acc43039d3ce6527d8f45e5698b00b81e177fd7bb9333fbd302ff5ad1a6da0e00d2cde5c7ab73093c335ff1cc97255957310ea4bd1857edbdbfed SHA512 41c5624a14ec28f709ae59a37f1fa0c67fd0cb02b731017224fc780a22e5e244d5a43bfce05676b29d06a835d736bdfa01f2679b6364febd87967a707a2593b0
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index 23dba4eacaee..f36e89f11369 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -8,6 +8,7 @@ inherit autotools fcaps
 DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -15,21 +16,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+RDEPEND="
 	net-libs/libpcap
-	net-libs/libnet:1.1"
+	net-libs/libnet:1.1
+	!net-misc/iputils[arping(+)]
+"
 DEPEND="
-	${CDEPEND}
+	${RDEPEND}
 	test? (
 		dev-libs/check
-		dev-python/subunit )"
-RDEPEND="
-	${CDEPEND}
-	!net-misc/iputils[arping(+)]"
-
-FILECAPS=( cap_net_raw /usr/sbin/arping )
+		dev-python/subunit
+	)
+"
 
-S=${WORKDIR}/${PN}-${P}
+FILECAPS=( cap_net_raw usr/sbin/arping )
 
 # patch is in upstream master
 PATCHES=( "${FILESDIR}/arping-tests.patch" )
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index 20b7fc882067..13d8502fc949 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fcaps git-r3
 
-DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+inherit autotools git-r3 fcaps
+
+DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="
+RDEPEND="
 	net-libs/libpcap
 	net-libs/libnet:1.1
+	!net-misc/iputils[arping(+)]
 "
 DEPEND="
-	${CDEPEND}
-	dev-libs/check
-"
-RDEPEND="
-	${CDEPEND}
-	!net-misc/iputils[arping(+)]
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		dev-python/subunit
+	)
 "
 
-FILECAPS=( cap_net_raw /usr/sbin/arping )
+FILECAPS=( cap_net_raw usr/sbin/arping )
 
 src_prepare() {
 	default
diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
index 74c2baebb4ec..0b479293e236 100644
--- a/net-analyzer/arping/metadata.xml
+++ b/net-analyzer/arping/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ThomasHabets/arping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index 7d81613d26e6..0b59610ae4d6 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -1,14 +1,7 @@
-AUX arpon-2.7.2-CFLAGS.patch 407 BLAKE2B 5cb747ba4f8153a1f1e13da49fc9cb8f55b75b8f80b17ea3c336d4feb863f23dfe08d93209a646b85301d8d0ba7d76a958e5d5468b47b08dcb6ec8be307d7b92 SHA512 9029ddc9b024e62f21a49faab5c39008bec22b88cd6fac5f31ebb7327357159d6ec36f0f750bb4d5e985115d553b95b8c1daf2794e9edb7c40dae06fd8872a07
-AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f50d3b62c611fa797abf3f866fca7f4f2e8d880544effa5411c1fec408ef4e43d96af2859bcb16215ae4121 SHA512 2bafa030d87d9b216902246053d2521ed4395c89d12b2bddef4e38671442a5d1e54afc8bde3a77944e93f93b703f1f60b0f6f84535fefc8331ec59aecb69e492
 AUX arpon-3.0-CFLAGS.patch 1787 BLAKE2B 234bc1d6d991e17458c4abbdba64afcc4edde4cdd70f734fade44e50059545b453f2ce93b9f46b180db8e671287045aeafda9158f78541b699a888d81effe8c4 SHA512 032959619ac5a33aa52ef589661659d4ad3842a7778bb40dd1c8d45fa6f1edac02dc8b4078fbdb41b8af52d2f7423c1d54ac2246582aec563fab42ae8859295e
 AUX arpon-3.0-gentoo.patch 4736 BLAKE2B 854efd88ff29b13defdae4d57ca97f00066a9a21528d23df2014f031dfe6467fe60de06bf9f99f72eed8745a9c1df86bb6f9d362ce0e637a0d221c3ea59ce304 SHA512 63f9122d1cfb5e05bb32f7dbf9a9fde9e7f155b16d0f42fc890cbccaf8409773bbcd2907e08f69fdc3739d0683c7495d132a663f8f9f6ce83405b6380f02f807
-AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
 AUX arpon.confd-3 75 BLAKE2B 3a054d7d5392a9a877aafc25687f15ddf6a483122fc29ba34a4399e31be2ce009b42a5a8b69fd4a1486f1b37d917221a7c7121449006210b8a38213709c1a2e9 SHA512 c13b5fd267ac0e96a30d235917ba644035d05e13c4cd8121081fa7a0d97fc921a1f828727e462245e701ae84b75738fb39dbc95c133f11d53641412669d3c584
-AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 AUX arpon.initd-3 472 BLAKE2B 159774908987a99ce884248d1a972d0c74395b29637f7adc638429925daa98bcd52b6393a73d7e81177c0b9c108ebbc251087587e866d484cd10d60a18af68b0 SHA512 22216841bd716052a25195e2ae693c13b9f1da503195b2a22a1fc0dcab3377c94a02c4e9c1115359b4e40eb63a56fe207767815edb11c42d01bdd75411b5a057
-DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
 DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af
-EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B e401df619a1da645dad882e67b69451a01d2837475d39a755b453575698f90cf021bb7165016aff0805f4fa7d6fd2852ac6ecfeddb43deb7cd86b68d0aa94965 SHA512 a81ed2f8a530ffb3a9781ca5785c58d0adc01867f650eedda0511fc94376b3f077ef8fb99e221ce1e82b04c796a466c0c2c579203820f5ee8a400867f236b8b6
-EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-EBUILD arpon-3.0.ebuild 834 BLAKE2B 7ceebb9368abdd8a5fdcb1acd0bb6db73c0eba5ff88e83f2d2cc787ea3462b27f45a3473d3c92aa7b3ab12dc745093c2f7b36a28fa81274dbc28203b92dc5bf9 SHA512 1d259119942237615a5a51286a73d4b90d37fe2c0ba4c8f11294e6f215b922f74a48bbae86b3a3e5909078a816ffbcb511cce7d4146a286ef35913a1cd291859
-MISC metadata.xml 285 BLAKE2B d232c837f5b78009aedc859ac2aa78da0775cb937b3742bec976767463c738db4054feb51e08725449432ef4c74add9697e2781938819d6e35cdccdfaaa2b590 SHA512 16762a0e8ae17a8f288d969f0f8d9dc15ce522c2c0e007007830dd3efe1ae96dc53f0d034f591fb6b6f7eb039fbde52f37f596bf9a34805900952391540bee4a
+EBUILD arpon-3.0.ebuild 835 BLAKE2B 458d57ce6eec80b95227aba083b12db3139a4fc20036ad887dcc9991dba269c68da9c1ece15a570a108c43a52a273284e1ac74efa6db1f45954dd8c5557c2a7d SHA512 714e729fc1a5daadcb20a10de3b1b526989ade6a6c0b279379a6c594027f5171a7f53bdab3362294c406d0f02a3192b2f48b8fd72fc232c5fe3ab589adb3aeba
+MISC metadata.xml 285 BLAKE2B bc100e6f3ecf9093f8f4c0011044820375e4f90c2758bd85831ae68f9f5c670326b48605532bc397973be9d725e65390f85b2fa51662ec031b75105fd62f02c2 SHA512 30275bd57675bbf1d25ac46ac6112fe553a25927a41254a8453448f3e578d6c00533c464ba3b680f922d90eb65b1360f7fbee39ccd8b4123f44df9d719159fbf
diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
deleted file mode 100644
index f2bc485b6fd2..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch
-	"${FILESDIR}"/${PN}-2.7.2-etc.patch
-)
-DOCS=( AUTHOR CHANGELOG )
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild
deleted file mode 100644
index a79e9de5e0fa..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die
-
-	DOC_CONTENTS="${PN} now installs an init script. Please edit
-		the /etc/conf.d/arpon file to match your needs"
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	readme.gentoo_create_doc
-}
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild
index f84ce3dfbc6d..c800c3568c29 100644
--- a/net-analyzer/arpon/arpon-3.0.ebuild
+++ b/net-analyzer/arpon/arpon-3.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
 DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
@@ -10,6 +11,7 @@ MY_PN="ArpON"
 MY_P="${MY_PN}-${PV}"
 HOMEPAGE="http://arpon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz"
+S="${WORKDIR}"/${MY_P}-ng
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,18 +22,18 @@ DEPEND="
 	net-libs/libnet:1.1
 	net-libs/libpcap
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.0-gentoo.patch
 )
+
 DOCS=( AUTHOR CHANGELOG README THANKS )
-S="${WORKDIR}"/${MY_P}-ng
 
 src_install() {
 	cmake_src_install
+
 	newinitd "${FILESDIR}"/${PN}.initd-3 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-3 ${PN}
 
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
deleted file mode 100644
index 525f03740dd9..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,11 +51,9 @@
- if(cmake_build_type_tolower STREQUAL "debug")
-   message(STATUS "Build Type: Debug")
-   set(CMAKE_BUILD_TYPE "Debug")
--  set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g")
- else()
-   message(STATUS "Build Type: Release")
-   set(CMAKE_BUILD_TYPE "Release")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
- endif()
- 
- include_directories(
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
deleted file mode 100644
index 03e80f9d5955..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/CMakeLists.txt
-+++ b/etc/CMakeLists.txt
-@@ -14,7 +14,7 @@
-     COMPONENT Etcfile)
- else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
-   install(FILES ${arpon_etc_src}
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
-+    DESTINATION /etc
-     PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-     COMPONENT Etcfile)
- endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd
deleted file mode 100644
index d1ce050fa4cb..000000000000
--- a/net-analyzer/arpon/files/arpon.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-METHOD="--darpi"
-IFACE="eth0"
-LOGFILE="/var/log/arpon.log"
-
-ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log"
diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd
deleted file mode 100644
index dc69135c26e3..000000000000
--- a/net-analyzer/arpon/files/arpon.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting arpon"
-	start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
-		--exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping arpon"
-	start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
-	eend $?
-}
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index 68ff631bb172..6d6d1a8b6656 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/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>netmon@gentoo.org</email>
 </maintainer>
 <upstream>
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index da11b063c5ca..35da1fd37921 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,11 +1,13 @@
+AUX arpwatch.conf 416 BLAKE2B fd74ff5df7a18dab34246d2a643b88353651aaa21825a0824d9adf54b252bc328da54efe5f4acc0054c27c66bd2e966719c22be4fceebac3da9584f3967a00d1 SHA512 c209a8184ac1b447035eaad083e74fe278093dcd7ac28ec2aabe806c6ee1d1ed6072153f27537a7755639ad3e7d95b4b02a9e0c31dae8f940f3128b4532dc371
 AUX arpwatch.confd-r1 559 BLAKE2B 291acbd1ebf7ab4f9f6ca19dfe1b445fc610c1b0961c895f5ccee3fe25e0536ef81e2530ff2151dceb52d113d1e13ab9185a0d83577d9258d57613112bb616d7 SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c
 AUX arpwatch.confd-r2 577 BLAKE2B 5876819ee028fe4a77ffca0e359d73492bc6ff82ad89f7ad24e38b9167c6d7858ae186115ac3fe0d594a93e0197fd2eea0daea5c0d49674b0770836d7cb2fb68 SHA512 9d6086f9e1bd27976117b408e1a604b9544a5acf80cf69cbac00516fe36f93dd600a2876039dbfa023b12a35d01439fe25845304474add1bfa059c97383aae7c
 AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9345b0d9b983aeb299e51849eb04b0df0627252ab65db1adf706f181aee61f471a1af87a3c1b3653e80 SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04
 AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bba1a5a8aea227c30b2fbb4425cf4d6fbaff1fe23493b58b211d4f6a6328bfe9a20e1020709db1cacb57 SHA512 b3518e24c839bda3292ff9f8dfb7c9bf12f4483637590875f281116cc1a453266ffb22507383fb71cf28b889141b355f077df8e7937ac571ab72924f5f2014f7
+AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
 EBUILD arpwatch-2.1.15-r11.ebuild 2230 BLAKE2B 889e3e63758098ba0f118865f8eb79d9ef90918bad7bd4489c51ecb542c755b2e39b97ab53aa82a221b4c49ec4448382e4f879ed1af1eb0357880db9d7d57f93 SHA512 c5e42b41147f62ae73a5dd659a69c1605c3298bd5d2f36153b706e940284a074532fa4ebb0349ed665aca208c85e7819444ab57888dfd1bc79cdf7d385e4f0ac
-EBUILD arpwatch-3.1.ebuild 2060 BLAKE2B 74e15d6a6b4b7e994d557756a0662dbad1d8c8a44fa09b431eab77c33c8b831e93ccfc287c96c9e5a341618e2f52d54c414465afccd69dac92608dee98c479bd SHA512 de10526bf59ce55f7ec8fb67d4de5eeb002237b151bbc1be11a62f3d0cae757a5fbfeda3f64d99dbcf95fc4eac197e7b759c114bc3dff93ec6605494b73a7c16
+EBUILD arpwatch-3.1-r2.ebuild 2105 BLAKE2B fd08a9f1e0e520c2585772e3c73cad82a183083369cbaff0b7bd54f773318330568203157081763ee58308be6733b5fb71cca66229d4c65e16459b0d4019fa6c SHA512 55136ed09a11254c51813dfa10ba65484d99ad14a5c9a36dec6f0078cd3b759a8de57fbad9c23a72bbbef095ccc09c9db306e7ae98c37ce911127c035b6e3464
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
new file mode 100644
index 000000000000..74a75dcce777
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="https://ee.lbl.gov/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+ETHERCODES_DATE=20200628
+SRC_URI="
+	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
+"
+
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
+IUSE="selinux"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-arpwatch )
+	virtual/mta
+"
+
+pkg_setup() {
+	# We need to create /var/lib/arpwatch with this group, so it must
+	# exist during src_install.
+	enewgroup arpwatch
+}
+
+pkg_postinst() {
+	# The user, however, is not needed until runtime.
+	enewuser arpwatch -1 -1 -1 arpwatch
+}
+
+src_install() {
+	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
+	doman arpsnmp.8 arpwatch.8
+
+	insinto /usr/share/arpwatch
+	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	diropts --group=arpwatch --mode=770
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
+
+	systemd_dounit "${FILESDIR}/arpwatch.service"
+	systemd_install_serviced "${FILESDIR}/arpwatch.conf"
+}
+
+pkg_postinst() {
+	# Previous revisions installed /var/lib/arpwatch with the wrong
+	# ownership. Instead of the intended arpwatch:root, it was left as
+	# root:root. If we find any such mis-owned directories, we fix them,
+	# and then set the permission bits how we want them in *this*
+	# revision.
+	#
+	# The "--from" flag ensures that we only fix directories that need
+	# fixing, and the "&& chmod" ensures that we only adjust the
+	# permissions if the owner also needed fixing.
+	chown \
+		--from=root:root \
+		--no-dereference \
+		:arpwatch \
+		"${ROOT}"/var/lib/arpwatch && \
+		chmod 770 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/arpwatch/arpwatch-3.1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1.ebuild
deleted file mode 100644
index 64ae0f6ef45b..000000000000
--- a/net-analyzer/arpwatch/arpwatch-3.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user
-
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
-HOMEPAGE="https://ee.lbl.gov/"
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-ETHERCODES_DATE=20200628
-SRC_URI="
-	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
-"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:*
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-arpwatch )
-	virtual/mta
-"
-
-pkg_setup() {
-	# We need to create /var/lib/arpwatch with this group, so it must
-	# exist during src_install.
-	enewgroup arpwatch
-}
-
-pkg_postinst() {
-	# The user, however, is not needed until runtime.
-	enewuser arpwatch -1 -1 -1 arpwatch
-}
-
-src_configure() {
-	econf \
-		ac_cv_path_V_SENDMAIL=sendmail
-}
-
-src_install() {
-	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
-	doman arpsnmp.8 arpwatch.8
-
-	insinto /usr/share/arpwatch
-	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
-
-	diropts --group=arpwatch --mode=770
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
-	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
-}
-
-pkg_postinst() {
-	# Previous revisions installed /var/lib/arpwatch with the wrong
-	# ownership. Instead of the intended arpwatch:root, it was left as
-	# root:root. If we find any such mis-owned directories, we fix them,
-	# and then set the permission bits how we want them in *this*
-	# revision.
-	#
-	# The "--from" flag ensures that we only fix directories that need
-	# fixing, and the "&& chmod" ensures that we only adjust the
-	# permissions if the owner also needed fixing.
-	chown \
-		--from=root:root \
-		--no-dereference \
-		:arpwatch \
-		"${ROOT}"/var/lib/arpwatch && \
-		chmod 770 "${ROOT}"/var/lib/arpwatch
-}
diff --git a/net-analyzer/arpwatch/files/arpwatch.conf b/net-analyzer/arpwatch/files/arpwatch.conf
new file mode 100644
index 000000000000..070f0edad80b
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.conf
@@ -0,0 +1,16 @@
+# Config file for /etc/systemd/system/arpwatch
+# see arpwatch.8 for more information
+
+IFACES=-i eno1
+
+# Location of the PID file
+PIDFILE=-P /run/arpwatch.pid
+
+# Additional options to pass to arpwatch.
+OPTIONS=-N -p -Q -D
+
+# Where to store the data (default is /usr/share/arpwatch)
+DATA=-f /var/log/arpwatch/eno1.dat
+
+# Comment this line if you wish arpwatch to run as root user (not recommended)
+RUNUSER=-u arpwatch
diff --git a/net-analyzer/arpwatch/files/arpwatch.service b/net-analyzer/arpwatch/files/arpwatch.service
new file mode 100644
index 000000000000..943e3146f8df
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Ethernet monitoring program that tracks net/IP pairings
+Documentation=man:arpwatch(8)
+Conflicts=
+After=systemd-networkd.service
+
+PIDFILE=/run/arpwatch.pid
+
+[Service]
+Type=forking
+ExecStartPre=/bin/rm -f /run/arpwatch.pid
+ExecStart=/usr/sbin/arpwatch $IFACES $PIDFILE $RUNUSER $OPTIONS $DATA
+Restart=on-abort
+
+[Install]
+Alias=arpwatchd.service
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 414a82a393c3..554e5e04972d 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -6,4 +6,4 @@ AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b8
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r2.ebuild 872 BLAKE2B 71560cdde0fa460b22953a85ea0f6a2b3d8c8d149acd4c31224c02c2fde9b8df903d01ed74dd1ec7aaeaa9cbf9ead9e7a8dfba688ad74e71a813332a97e6c2a4 SHA512 64920923498c8532fc64f8147a42383c0d60a1abbeb8cb3305fa36b14086fcd94103dfcadf3b63c1dde23e05c467e55163f3fae902dadff5f4372047b800a7e1
 EBUILD authforce-0.9.9-r3.ebuild 1045 BLAKE2B 724aa9e3200fab9ef3061465690647f8ee81e9ab87c759381e844e5805e11dfa3fdf70927afe1b3518e097157681ed40e1085a3ace6b20a2bbf5fda6040cc59b SHA512 cd191392127fbf0f32fc1d58ac4172e4c0987469146f5638701996cd43ad77bfa473a04998504f17a678d3c1dc9f5c0eb113c8baa655c666e0e31938c5b30ec8
-MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
+MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
index 78e1c2f9528e..84aeb359eebd 100644
--- a/net-analyzer/authforce/metadata.xml
+++ b/net-analyzer/authforce/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 9f804876c501..6cff56250d9b 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -7,7 +7,5 @@ AUX barnyard2-1.13-pcap-1.9.0.patch 944 BLAKE2B 143d2cc61e447d5c493a3d503e7e2020
 AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
 DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246
-DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
 EBUILD barnyard2-1.13.ebuild 1957 BLAKE2B 92d9eda2ed0dd725467be041c80940563c7d29a8562971a8eddfe0fb3cab2b3b706780800c28815c34838513f02471485c598e7351929b9e7b71e2efba9f6fab SHA512 d5ca8ff12221717f2cbd211ab7c5df748ae7fd257731e5e13f8bbd0b85d4dd93112fabbd1a998ad3cbd4c858a0462dce382c2b639d11a6b3e02b7ea393d50ac9
-EBUILD barnyard2-1.9-r2.ebuild 1719 BLAKE2B 7e4bd72ca6fe1b7d08a90aa727808a4afbd426fdd17a54ceaa02fee737ce6529504eabb1d0a8b5db8d0960af64bd2952fc3187d48e38d2eb75e29a04c6b37f22 SHA512 cfcb840afcf1ba4f31d22ad391cd222556974deea51bf81f9654180948270fb5c0e5539d1a18be04741e7fd754a29e6964c17ec24cdd55d677ad6b96f9d73eda
 MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce
diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
deleted file mode 100644
index 7a9d865754c7..000000000000
--- a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Parser for Snort unified/unified2 files"
-HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects"
-SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gre mpls mysql odbc postgres static"
-
-DEPEND="net-libs/libpcap
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:*[server] )"
-RDEPEND="${DEPEND}"
-
-DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*"
-
-S="${WORKDIR}/${PN}-2-${PV}"
-
-src_prepare() {
-	default
-	sed -i -e "s:^#config interface:config interface:" \
-		"etc/barnyard2.conf" || die
-	sed -i -e "s:^output alert_fast:#output alert_fast:" \
-		"etc/barnyard2.conf" || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable debug) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-ipv6 \
-		--disable-prelude \
-		--disable-mysql-ssl-support \
-		--disable-aruba \
-		--without-tcl \
-		--without-oracle
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}/barnyard2.confd" barnyard2
-	newinitd "${FILESDIR}/barnyard2.initd" barnyard2
-
-	dodir /etc/barnyard2
-	keepdir /var/log/barnyard2
-	keepdir /var/log/snort/archive
-
-	rm "${D}"/etc/barnyard2.conf || die
-}
-
-pkg_postinst() {
-	elog "Configuration options can be set in /etc/conf.d/barnyard2."
-	elog
-	elog "An example configuration file can be found in /usr/share/doc/${PF}."
-}
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index 5516b113052d..8b85b52bd958 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,8 +1,6 @@
-AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 BLAKE2B 6484e256f77efdfcf7e52bb4137601d214a099c0ace750f326a2b3c21acce57e107354cc9fb4fb175b4b10c0ede098c88db7d1ab91aba1f0a15dcb764dc3e554 SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e
-AUX bwm-ng-0.6.1-static-inline.patch 9852 BLAKE2B df28ff66f2ccdac422803b119ddbd3385cabb615a8e50233162e82277e7a0ad6a99313e49689237ec82bd54c12edbbde2db6a72c90bcf0590397c8f21dd173bc SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba
 AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec6520058c42e517f80dffae1bb15d063e32adbf1688929a21da5af78374e1966b4f0c29e0ad0b7b0b50c9844182d SHA512 47f601284da95f3148322157292a86f425cc4846d17547025fd5677e6ffc8b2f6f01cdf4403cf6ca5d701b0ab322ce9c345e26e3382afc6dea189afaa57b77aa
-DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
 DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
-EBUILD bwm-ng-0.6.1-r1.ebuild 741 BLAKE2B fd85473caf7dd8e2e969ef87c0add7359ee90c32ccc92e5f69b77453976b5fa823756af1b45fce884ced51ad4f94d6d435a209c251869ab1a39952b5c8b8ba0b SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f
-EBUILD bwm-ng-0.6.2.ebuild 702 BLAKE2B f254640c5d92d6c0117cc5cf466b3b4710c6ea4d9fbe2eea5d919f14b295c719fbd797decd1c72d75c71b1d6df1904d254906bfb18faf053b89d103abe67c159 SHA512 552032878a9f18660318a343b8fed3b0004b873cfe8d36b2dad7914b64f8c04b1ef55497f216ab01652cd2c4e8a118c4f9a436cd1cc33a6a3c2d31b229202b9b
-MISC metadata.xml 373 BLAKE2B 81fc968d44df8cb58d98e139757ec6290640c64702c7b184123cf6e9edcc330d7789099453bb6865d728779fcb674080be65b86c68f1f1cdeda2e05068d7ccd9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0
+DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8
+EBUILD bwm-ng-0.6.2.ebuild 699 BLAKE2B 6b4d4ba5ccc497d0193500eac4812a8927737f24c017a3e9e8de2ffa20e9bef87f10c06305d1712c4031653db870b04616f5c333244382dba8bb00d6184ae45d SHA512 3600129dc614250c3617f2c526605e9f8acabbd50d9bf03b8933f5325babdcaecaaeb8ed96b02838b082cbcbc13d5cbce638f45be50240bec8f664efcd8c6bd1
+EBUILD bwm-ng-0.6.3.ebuild 701 BLAKE2B 85e6fdb19c20230b7865e57399e8f247a9bf997ea9c80bb264b4155a9b22d04a8ce80d47e9d573d713f2820b5cce756e0a9f6a2801cc7fdf4edf9da7bb4064d0 SHA512 b1910b155acc1dc077e33aa395b10c0da314fd63dabe607596a7926073479568e147c75947760fbd0376c7aa4cffa7c5c9d20391a984d05132c5edc120ae1421
+MISC metadata.xml 463 BLAKE2B 1bbaff010b068efc83f690257a28b0a57b564c353f525f9b62764d2f241f8ebf43a10afab26eb2d787af2f4e0fde956df4c02ffea1529e7ec0fc1ccb5faf0a77 SHA512 af0924dc4db40f48722b0ff91c605f978d59166d51c0e7550ea460bcc9f498e9d0ec432d0e546ebdec39c8204c8c30caf6e5dd85d868eedaf7e1bac253312d74
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
deleted file mode 100644
index 51311ad80550..000000000000
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
-SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
-HOMEPAGE="http://www.gropp.org/"
-
-KEYWORDS="amd64 ~arm ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="csv html"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=sys-apps/net-tools-1.60-r1"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-buildsystem.patch
-	"${FILESDIR}"/${P}-static-inline.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable csv) \
-		$(use_enable html) \
-		--enable-ncurses \
-		--with-procnetdev
-}
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
index 23c71582d272..2b7bf683dc9e 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth
 HOMEPAGE="http://www.gropp.org/"
 SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+csv +html"
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
new file mode 100644
index 000000000000..d7770f571f23
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+HOMEPAGE="http://www.gropp.org/"
+SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+csv +html"
+
+RDEPEND="
+	>=sys-apps/net-tools-1.60-r1
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.2-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable csv) \
+		$(use_enable html) \
+		--with-ncurses \
+		--with-procnetdev
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index 04c14392d66a..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-* Fix broken buildsystem
-* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
-https://bugs.gentoo.org/show_bug.cgi?id=561718
-
---- a/configure.in
-+++ b/configure.in
-@@ -3,7 +3,7 @@
- 
- AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
- AC_CONFIG_SRCDIR(src/bwm-ng.c)
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([gnu subdir-objects])
- AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR(./)
- AC_LANG([C])
-@@ -28,44 +28,12 @@
- AC_CHECK_TYPES(unsigned long long)
- 
- # Checks for libraries.
--CURSES_CHECKED="0"
-+AC_ARG_ENABLE([ncurses],
-+	AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
- 
--AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi  
--])
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi
-+AS_IF([test "x$enable_ncurses" != "xno"], [
-+	PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
- ])
--fi
--
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_CHECK_LIB([curses],[initscr,timeout],,[
--	AC_CHECK_LIB([ncurses],[newterm,timeout])
--])
--fi
- 
- AC_CHECK_FUNCS([wattron])
- AC_CHECK_FUNCS([curs_set])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,12 +2,10 @@
- 
- bin_PROGRAMS = bwm-ng
- 
--bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
-+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
- 
--EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
--
--bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
--bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
-+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
-+bwm_ng_LDADD = @NCURSES_LIBS@
- 
- noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
- 
---- a/src/defines.h
-+++ b/src/defines.h
-@@ -48,7 +48,7 @@
- #define LIBSTATGRAB
- #endif
- 
--#if HAVE_LIBCURSES || HAVE_LIBNCURSES
-+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
- #define HAVE_CURSES
- #endif
- 
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
deleted file mode 100644
index 88e15ecefe3f..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Make all 'inline' functions 'static inline' such that
-the compiler can emit definitions when needed.
-http://www.greenend.org.uk/rjk/tech/inline.html
-
---- a/src/bwm-ng.c
-+++ b/src/bwm-ng.c
-@@ -26,7 +26,7 @@
- 
- /* handle interrupt signal */
- void sigint(int sig) FUNCATTR_NORETURN;
--inline void init(void);
-+static inline void init(void);
- 
- /* clear stuff and exit */
- #ifdef __STDC__
-@@ -98,7 +98,7 @@
- 	deinit(0, NULL);
- }
- 
--inline void init(void) {
-+static inline void init(void) {
- 	if_count=0;
- 	delay=500;
- #if EXTENDED_STATS	
---- a/src/help.c
-+++ b/src/help.c
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
-     printf("  %-23s",long_c);
- #else
---- a/src/options.c
-+++ b/src/options.c
-@@ -30,12 +30,12 @@
- char *trim_whitespace(char *str);
- int read_config(const char *config_file);
- #endif
--inline int str2output_unit(char *optarg);
-+static inline int str2output_unit(char *optarg);
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg);
-+static inline int str2output_type(char *optarg);
- #endif
--inline int str2out_method(char *optarg);
--inline int str2in_method(char *optarg);
-+static inline int str2out_method(char *optarg);
-+static inline int str2in_method(char *optarg);
- 
- #ifdef CONFIG_FILE
-  /******************************************************************************
-@@ -65,7 +65,7 @@
- /******************************************************************************/
- #endif
- 
--inline int str2output_unit(char *optarg) {
-+static inline int str2output_unit(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
-         if (!strcasecmp(optarg,"bits")) return BITS_OUT;
-@@ -76,7 +76,7 @@
- }
- 
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg) {
-+static inline int str2output_type(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"rate")) return RATE_OUT;
-         if (!strcasecmp(optarg,"max")) return MAX_OUT;
-@@ -87,7 +87,7 @@
- }
- #endif  
- 
--inline int str2out_method(char *optarg) {
-+static inline int str2out_method(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
- #ifdef HAVE_CURSES
-@@ -109,7 +109,7 @@
- }
- 
- 
--inline int str2in_method(char *optarg) {
-+static inline int str2in_method(char *optarg) {
-     if (optarg) {
- #ifdef PROC_NET_DEV
-         if (!strcasecmp(optarg,"proc")) return PROC_IN;
---- a/src/output.c
-+++ b/src/output.c
-@@ -25,13 +25,13 @@
- #include "output.h"
- 
- inline static const char *output_type2str(void);
--inline const char *input2str(void);
--inline const char *show_all_if2str(void);
--inline ullong direction2value(char mode,struct inout_long stats);
-+static inline const char *input2str(void);
-+static inline const char *show_all_if2str(void);
-+static inline ullong direction2value(char mode,struct inout_long stats);
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
- #endif
--inline char *dyn_byte_value2str(double value,char *str,int buf_size);
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
- char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
- 
- inline static const char *output_type2str(void) {
-@@ -59,7 +59,7 @@
- }
- 
- 
--inline const char *input2str(void) {
-+static inline const char *input2str(void) {
-     switch (input_method) {
- #ifdef SYSCTL
-         case SYSCTL_IN:
-@@ -121,7 +121,7 @@
-     return "";
- }
- 
--inline const char *show_all_if2str(void) {
-+static inline const char *show_all_if2str(void) {
-     switch (show_all_if) {
-         case 1:
- 				return " (all)";
-@@ -262,7 +262,7 @@
- }
- 
- 
--inline ullong direction2value(char mode,struct inout_long stats) {
-+static inline ullong direction2value(char mode,struct inout_long stats) {
-     switch (mode) {
-         case 0:
-             return stats.in;
-@@ -275,7 +275,7 @@
- }
- 
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-     switch (mode) {
-         case 0:
-             return (double)(stats.in/items);
-@@ -288,7 +288,7 @@
- }
- #endif
- 
--inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1024)
-             snprintf(str,buf_size,"%15.2f  ",value);
-@@ -306,7 +306,7 @@
-     return str;
- }
- 
--inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1000)
-             snprintf(str,buf_size,"%15.2f  ",value);
---- a/src/process.c
-+++ b/src/process.c
-@@ -26,19 +26,19 @@
- 
- short show_iface(char *instr, char *searchstr,char iface_is_up);
- #if HAVE_GETTIMEOFDAY
--inline long tvdiff(struct timeval newer, struct timeval older);
-+static inline long tvdiff(struct timeval newer, struct timeval older);
- float get_time_delay(int iface_num);
- #endif
--inline ullong calc_new_values(ullong new, ullong old);
-+static inline ullong calc_new_values(ullong new, ullong old);
- t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
- t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
- #if EXTENDED_STATS
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
- void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
- #endif
- 
- /* returns the whether to show the iface or not
-@@ -74,7 +74,7 @@
- 
- #if HAVE_GETTIMEOFDAY
- /* Returns: the time difference in milliseconds. */
--inline long tvdiff(struct timeval newer, struct timeval older) {
-+static inline long tvdiff(struct timeval newer, struct timeval older) {
-   return labs((newer.tv_sec-older.tv_sec)*1000+
-     (newer.tv_usec-older.tv_usec)/1000);
- }
-@@ -92,7 +92,7 @@
- #endif
- 
- /* basically new-old, but handles "overflow" of source aswell */
--inline ullong calc_new_values(ullong new, ullong old) {
-+static inline ullong calc_new_values(ullong new, ullong old) {
-     /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
-     return (new>=old) ? (ullong)(new-old) : (ullong)((
- #ifdef HAVE_LIBKSTAT
-@@ -133,13 +133,13 @@
- 
- #if EXTENDED_STATS
- /* sub old values from cached for avg stats */
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in-=data.in;
-     values->out-=data.out;
-     values->total-=data.total;
- }
- 
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in+=data.in;
-     values->out+=data.out;
-     values->total+=data.total;
-@@ -148,7 +148,7 @@
- 
- /* put new-old bytes in inout_long struct into a inouttotal_double struct 
-  * and add values to cached .value struct */
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-     data->in=calced_stats.in*multiplier;
-     data->out=calced_stats.out*multiplier;
-     data->total=(calced_stats.in+calced_stats.out)*multiplier;
-@@ -198,13 +198,13 @@
- }
- 
- /* add current in and out bytes to totals struct */
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-     stats->in+=new_stats_values.in;
-     stats->out+=new_stats_values.out;
- }
- 
- /* lookup old max values and save new if higher */
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-     if (multiplier*calced_stats.in > stats->in)
-         stats->in=multiplier*calced_stats.in;
-     if (multiplier*calced_stats.out>stats->out)
diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
index 7d30b17df0f1..95c98a2c1a89 100644
--- a/net-analyzer/bwm-ng/metadata.xml
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="csv">Enable csv output</flag>
-<flag name="html">Enable html output</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="csv">Enable csv output</flag>
+		<flag name="html">Enable html output</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">vgropp/bwm-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 74acd6cd3450..8d218eefaf62 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,5 +1,3 @@
-DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
 DIST bwping-2.2.tar.gz 119688 BLAKE2B e30afc404f73aeff28e2775349eed9e6a113a7c0ef33798de9dc983f2ecb08ea1dc0838067aa83bd83e513fa9640bf38fd04a924c382bf770779892dcc39f8ab SHA512 4c0338359fce039357d763a0bdb8ea133a8c63f0e7eb2cbdc294454cad97b6e9010bf8898948aa2572418e4ae667d25dd54475a162f029c052b9611795ff4230
-EBUILD bwping-2.1.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 EBUILD bwping-2.2.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
 MISC metadata.xml 713 BLAKE2B e9792f974ce687d37a8faeddf987f0eda5086097fdf8db3d9ad5cf240bd65059232cee613fd1eec064916361fdced304f08134c3bfade7953f94ce2cfae90352 SHA512 199486090bd90174304b130e5c84e2092c535fcb360ab911ad44308f6a4ba1ad822d824cf370942a5ffceb30f86d4ee43eba25ee56d344acf572592b142bf156
diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild
deleted file mode 100644
index 4743efcd1e43..000000000000
--- a/net-analyzer/bwping/bwping-2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="https://bwping.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-src_test() {
-	[[ ${UID} = 0 ]] && default
-}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 948256b649ff..927a0da47cfe 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,9 +1,5 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
-DIST cacti-spine-1.2.13.tar.gz 107543 BLAKE2B e0de75688334d27604a76c00a09ac53587a1e57f45df925e30a1a88a5e0449df803dfad901328c65b55484bc9022bf81d53880f17d4bd4efd9214315f01f7e92 SHA512 86d44195847c7b3acb1f6aed2bd6a57f562645b20724560d6b4bf7962707be4eb2f5326731453937b64420b5d51b714aecbd8dbea58d95f29ef4341515df8b00
-DIST cacti-spine-1.2.14.tar.gz 107577 BLAKE2B 5865d93ffefeeafac1d2245000467deac79f8008e81b66de310bf08e7aa31f17299a82fc107ad49c3741bc2f183bdbc9554f814bf9e3e4b1dc85e267e4f16112 SHA512 44dec1077b419dfc987a1d423f2df597bf2026ca7f39aaafabfc7de9e6fdc616f505b86ace43bb2ad628f220cf8d8cf136a04f00c4fd23ab73da75068f804999
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
-EBUILD cacti-spine-1.2.13.ebuild 894 BLAKE2B d87521d5b3d0604e61f08853356c86578647cfec8b59ef347eed64920a9d0aba57bbda986b24afd4ec8a0442a81827b143f9d3dbd2387cbd2fcf31e0fbacce8e SHA512 a7d0cd71b0a3cfa669c240df7bdffa91069e2d84b5185c20aef4b41da7640f4d82e38633fb4c26035eb8343878008e95c3f3231e060b02d8de4313a0d0a5e329
-EBUILD cacti-spine-1.2.14.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
 EBUILD cacti-spine-1.2.16.ebuild 879 BLAKE2B c40f69d0353777ceb2e43a1196e9b7263e88187ce80fd0828f1b91119383f1ee9352cc5a8ea99e140572c206dbe2961a61669bdd44f2887d628289f749b5d1d7 SHA512 78c3c7510157708223e1b24b8d2209883fa457ac49d626930c9daeeaf28dc45957b0e95dded4fd55b64a9b7f27b66b0daa898466b490fd85351e15267243a87b
 EBUILD cacti-spine-99999.ebuild 830 BLAKE2B df76efd7eaf22a36b96c6b834089f5e6916b4ac95d34b07e3db6a93d84bac90124c94d67586078283f6a3e6fc817501e34083b426982f0694fa7a7179cb269a6 SHA512 903233605ded071a0eebb0e17b25bd0cd61b20b54c0d85a2fc230058e64e908e4b8eac3ac7f566f7d1f4d0c68cb2be0c6f38de7bdf344c9e6e3df81b2af10ee4
 MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
deleted file mode 100644
index c78a19983352..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="libressl"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
deleted file mode 100644
index a5c1da23c064..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libressl"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest
index 7818064e4b83..0433382c8e11 100644
--- a/net-analyzer/check_mk_agent/Manifest
+++ b/net-analyzer/check_mk_agent/Manifest
@@ -1,5 +1,3 @@
-DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f
 DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b
-EBUILD check_mk_agent-1.2.8_p27.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
 EBUILD check_mk_agent-1.4.0_p31.ebuild 2034 BLAKE2B fd61fb106c900c9b74615d53b4440d33bfa5a8d1107ba978ca8168537dda76f2182b3c3750d4f4bd8d7fc356f32cc52f38d184f41cea06509bee9b4843ad82fc SHA512 ceb3fa02f5cff39d5f3c239d9594cb5a10ca5a050faa3595103aaa4b8b5a8f82a938371c00717b2fbb1f303b6761559192fa81f31f67c1feae057b938d3e7adf
 MISC metadata.xml 1097 BLAKE2B e84f46161fbb1e01bebf32135b8f794d5f82d68657be9064c088f61a8b3699d838282553a0443db3a27190796e2cd1eefe3f39fdaa28c0a951284e6cba48ef3e SHA512 844aabdeb511686e82ee2ea51791c1536a35e64061900dae5cad45cb076f3d713ea88ef9aab365dac0d30c60bff247da94327c8b5dda22054bdf9c0ea4dd05f9
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
deleted file mode 100644
index c41c9b1f3484..000000000000
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Agent to report data to Check_MK for monitoring"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_PV="${PV/_p/p}"
-MY_P="check-mk-raw-${MY_PV}.cre"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper"
-
-RDEPEND="!!net-analyzer/check_mk
-	app-shells/bash:*
-	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-	"
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz"
-
-src_unpack() {
-	# check_mk is a tarball containing tarballs
-	unpack ${A}
-	unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz
-	mkdir -p "${S}"/doc || die
-	cd "${S}"/doc || die
-	unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz
-}
-
-src_install() {
-	# Install agent related files
-	newbin check_mk_agent.linux check_mk_agent
-
-	keepdir /usr/lib/check_mk_agent/local
-	dodir /usr/lib/check_mk_agent/plugins
-	dodir /etc/check_mk
-
-	dodoc doc/{AUTHORS,COPYING,ChangeLog}
-	docompress
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins cfg_examples/xinetd.conf check_mk
-		systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service}
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins cfg_examples/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe plugins/mk_logwatch
-	fi
-
-	# Install any other useflag-enabled agent plugins
-	exeinto /usr/lib/check_mk_agent/plugins
-	use inventory && newexe plugins/mk_inventory.linux mk_inventory
-	use smart && doexe plugins/smart
-	use mysql && doexe plugins/mk_mysql
-	use postgres && doexe plugins/mk_postgres
-	use apache_status && doexe plugins/apache_status
-	use zypper && doexe plugins/mk_zypper
-	use oracle && doexe plugins/mk_oracle
-	use nfsexports && doexe plugins/nfsexports
-}
diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest
index cbd4f92c8d0b..e727ba47ae41 100644
--- a/net-analyzer/cloudshark/Manifest
+++ b/net-analyzer/cloudshark/Manifest
@@ -1,4 +1,4 @@
 AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74aa87460abbe4348b09e666fb6ec413f77fa9123ef22b00363d61610777824272758745f90c588dfd6e SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9
 DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86
 EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e43313f5c67e64091bbb681f1ff13e4e10def9b80ed55df1ec0d462239efe67a27fb22a314118d22878b0cad13f8ca8891d2e7ac56d28a64bb2434860777e54a SHA512 7fa81e8be152c47922e249a247e959e3518c85ff4ef47192a337a2b7dae5c7db8cbc994e302286782f65c7897b2369f095786be19d89ab5fe65575a822510dc7
-MISC metadata.xml 339 BLAKE2B 449159f04e85fc4eebd7f95580b2e0f006d4927a5b7891c65fec216f329f2cd6d4ff7af02bf23a82b5925a80d17ed0295c712c3c1d945732e1ab0a77e91ce7ab SHA512 6f455d12f82e69560c68af083929907b4ba2d5389bdd7acc08725609bde578d8081245185a2c4f1571cf89c7693cbd49ce713ed4f4cb529f58758bdfa8b08272
+MISC metadata.xml 339 BLAKE2B 9cb074760517267c2a84e4c538b7cc645727acfd7b0d738b905d51e38be2bebdef41dbe689e6272af890ea898c8260da2ec96c5c72e175bbebc916f101f83d08 SHA512 9b0f0f90882087febab5d144d1bdbf93db3533369f54bd7213ac781cd2eed2d81dae345e965f5c31d4f9e8c4fdd2c66d0587c9bc53bab8d207a4e6dd16e0d9d3
diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
index bbafcdbcbb95..ef98c82dc6dc 100644
--- a/net-analyzer/cloudshark/metadata.xml
+++ b/net-analyzer/cloudshark/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index 5d6eaf469fef..056528b40f93 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,6 +1,4 @@
 AUX cutter-1.03-debian.patch 5160 BLAKE2B 1e3b007515aea319b66843b232d731a8f0264908e50e6e3521760cb2925302d106ed2fe56aa17121cc34cde43df9021b6dc14f9247708b72afe80849ac5fbc57 SHA512 05eb0c5819687bbc6de4f4467013bae16b5faf470da062a847fe74cb0abf27fadf62dcf76760f43096db446a11f1b40107dd94c6003e24b50d5a3150a87327b6
-DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea
 DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a
-EBUILD cutter-1.03-r1.ebuild 640 BLAKE2B b6cc80c6ea0f78894b3b22c8dfcf4f46245ffbe209251883db23f48324684b69c37229f1dc3cab3872d57e5773bbcef80a9874affd4c6b6d2a35db02fba34afe SHA512 852a2a7eaf494ab58a29226aaf592626b0cca232583dff4995699a8ea3ad8aab074a5908da58ab0277f7647a70cf749d7712dd6bf2f5e0e65178a9833428ceca
-EBUILD cutter-1.04.ebuild 648 BLAKE2B 7fc4314ea247ceb100b14fbc2bda8eff9c85870b2f79c8af8f1854f476d92aa8d610f4d41279c2d2f73bce2e97a11c157d20d11f8be850cf0f8facca6fb0229b SHA512 bcde52fb15a880c4f80fd2b2d8e6c5ae4a077681733d44fb98d026cecce257e665cc53810ff3d23c5591f985ae6713e5bde77cd7a5d09f053ab137557c8ae985
+EBUILD cutter-1.04.ebuild 661 BLAKE2B d38e59539f25d53c7e583f524bd14bd180e712b985e96e349bd6d005f506310ce0ad6d0b5cc2502e1a70afde343357dc545ce2c454b83c051c5ac7056df1e31a SHA512 36c08faa41b64a7ff139bc7399b91ac753c065e5ebaae55a61e16f2e8209423ead051d625641f22b6166b8bf534a07daeb0c662f95f9b9e6922af89a79bca43e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild
deleted file mode 100644
index 7e3806ff08d3..000000000000
--- a/net-analyzer/cutter/cutter-1.03-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
-HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
-SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch
-	rm -f Makefile # implicit rules are better ;x
-}
-
-src_compile() {
-	emake cutter CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin cutter
-	dodoc README
-	doman debian/cutter.8
-}
diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index f11002ca418e..46cc52cc6f2c 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
 HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
@@ -10,11 +11,17 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.03-debian.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.03-debian.patch
-	rm -f Makefile # implicit rules are better ;x
+	default
+
+	# implicit rules are better ;x
+	rm -f Makefile || die
 }
 
 src_compile() {
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 627ba27cfd7c..8cb460294ac9 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -2,7 +2,6 @@ AUX darkstat-3.0.719-strncpy-off-by-one.patch 471 BLAKE2B 45e738a9a777173924df26
 AUX darkstat-confd 911 BLAKE2B 35cb512c3727176218a16508d3b61ddf003081997d8f52918c5b9b7e762c882f878bd3317c737931d29cbf3aba1a7c375ebf067a394da41d15b95b3d97768437 SHA512 cf5b222a45a406d4e6b03860a9053a9c25c88d793e86525ebe38dbf292a69f00dc073b12179818e7e7b669f4a706d70eebe9bfeda363c7c5003c035639f41bbc
 AUX darkstat-initd 1461 BLAKE2B 4f0aca1bb12661de4ea1c2d5ea7dd9733833aafbe012ea0019d536ee1d45fa0cffc5a7a210783e9bbd3c5c5b236dc6f505ee0807b8ad2bd6ef78e48fa676a386 SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226
 DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
-EBUILD darkstat-3.0.719-r2.ebuild 1693 BLAKE2B 8d739222a60aacd47dfafd7b913db182fe533afa20bc470ae29f2d09af8e965cc0aba4158be19f81cedf6ae59aeb138b9095151da040378355fc6464589a8eec SHA512 64bc9d1e189d7d16de8fda9083aa30ad6aaf3dce43ab3855a7ac0af9ce00ad6f67085e2ca62794db61bb9581e585d105fb094a7bbee03bfc8ec08792ae2b6686
-EBUILD darkstat-3.0.719-r3.ebuild 1780 BLAKE2B de855346a7375bd48572d2cd0f49923649b36572674af6fd0a70e7c3291b2f4b9458bd6b3ba2cc73518ede1c6ac6a89db2cef08a8b029113dd1548311cbe2943 SHA512 5de532416453b855f829fc28048b88d15b0aba65348b3d4f3972be2f7d651f7b87174f8f0dc9b41691fe46b683eb111dcae083d03dcd174140f630e3a4090ced
+EBUILD darkstat-3.0.719-r3.ebuild 1777 BLAKE2B 0d6445bd2e0dbd6400e45448998d1f1c667bcbcb4875330a59f20fe89eb02085b0f7d1108e06bdc95396d39a3b01a915857e8527bd79ae401ff8e74b4707cfc1 SHA512 e26b44fbb230eacbd38ad1e9acd381b43c61f488493a81c4e8389f1b4d08d056a20e36b3de50b95819b67eb5c0e08e04ce03192f8b49570c69b45ef095a7986d
 EBUILD darkstat-9999999.ebuild 1809 BLAKE2B c4464879938ea296aa2f67b5d617587317bc199e947547dd5e2588603633536821f06608d2dca04ae2497b25d7905d7afb9d5f0affd08e025ea7c604c7c8d071 SHA512 061052f55525bb9f6247459e7f585224d05036fc6e444ac0635c57847fbeca9c9179e619169c1f401e1b01211e73922ee45c5e0f6f3f5e755ef920a84c2ae00e
 MISC metadata.xml 536 BLAKE2B 7ff89764c1281848b7345be779d1694d4a439fc0a211fc10feb37302a184ce78d984c941e374192bbefb1a22e1ce13ae63a1ab96c37fb4ff539aef0edeb7a58f SHA512 5950789030e76ea0a95fbf8cd53e702ee8d55af96ed12aef4d6e6ae658ba01e949f875283a2f5c0c12f15fe7beec18704bf14bea1d89c5321df505cd2ae3d5bb
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
deleted file mode 100644
index 041df6e159de..000000000000
--- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="https://unix4lyfe.org/darkstat/"
-SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	acct-user/darkstat
-	dev-libs/libbsd
-	net-libs/libpcap
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-flto||g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-debug --with-privdrop-user=darkstat
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/darkstat-initd darkstat
-	newconfd "${FILESDIR}"/darkstat-confd darkstat
-
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
-	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
-
-	keepdir "${DARKSTAT_CHROOT_DIR}"
-	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_postinst() {
-	# Workaround bug #141619
-	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
-	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
-	elog "To start different darkstat instances which will listen on a different"
-	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
-	elog "darkstat script where 'if' is the name of the interface."
-	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
-	elog "and edit it to change default values."
-	elog
-	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
-}
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index d67ebb1e93f5..f14539d204ea 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	acct-user/darkstat
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index 9156b52bca6b..ae50650b8354 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,6 +1,6 @@
 AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
 DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05
 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
-EBUILD dnstracer-1.10.ebuild 678 BLAKE2B 82841c2e0abef131577d632693f65be2e6102b64e599d28d8cae1e648293c2ac2e96b16eb4f4e72b172dff8fe1e5d49643d525ae9f9f95e1cd4dc3c30516ebcf SHA512 5378dba0eba308532f288cd457b83b8dd292589bf4d66f8bcfa5b5bfe7a1416f375b6782a0f8eb4d3f7bef716b512b01adba8033e5772d5ec449c7dbdbbfdb12
+EBUILD dnstracer-1.10.ebuild 676 BLAKE2B cc96e42210ed468bc289a9d9571dd4a0fbe8b9253c5d23e0196dc5e8144ff07afe65c25a1808a5143e2d06afc411a8ca75f47b313c5860397c90e1c03af75f6c SHA512 326e24d8cdb98acd4a2eb878b29b4c417f9eed2664c8465c135b05325e6ad63aba76f62567d22a4f2865be8988b47b34de4f85fb6f81791d7ad64e79da23088a
 EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B c4008d5c48dbfe6bd0a7a6ecc23913fe4a21e6d0287ddd55c7d5f8fdd8b018e0d376457ee2d9349e2fa3d477d3d8b106fe3535b6b92a95904ec12d6678441f19 SHA512 b361a72cf4e5d04031799a0d7e7be1e2f138b71229800a93fdbf17ca205bf2f241f85f588ae439fc7a50bde2c3beaa02bf930b0f6aa96e0e1272a7d0c3e71301
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index 733c4c9cc2d7..c989ddeffa15 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Determines where a given nameserver gets its information from"
 HOMEPAGE="https://www.mavetju.org/unix/general.php"
 SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz"
-LICENSE="BSD-2"
+S="${WORKDIR}/${PN}"
 
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
+
+BDEPEND="dev-lang/perl"
 
-BDEPEND="
-	dev-lang/perl
-"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-argv0.patch
 )
-S=${WORKDIR}/${PN}
 
 src_compile() {
 	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 62d086b96d8b..053d64cdad65 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3348 BLAKE2B 3318126f249274798dbd5537336495be4baba112c013ca4550f21337a57788459562f6b33bebd8d212cae2fe58795a3d69e546ad8d10a02927d29cfaf6e8e6cd SHA512 0ef6bfc5cdd19deb6ff57761034b32ccc6142570ec3b244d9ece99996958350f797b744d02cc586af2d7270c28f0240faf947958c46bbbd25347746e31c6c248
-EBUILD fail2ban-9999.ebuild 3277 BLAKE2B 07de0de93e7d87a49d82b8590da903bbd9904fbaf12245e45149e7542c57cb9bbda6fcdde2c91a7b7e4f09252dc132795464b34c08de9daeb26251c5444ca31f SHA512 749cda31a0439f22079ed3a35720b23f1a1fcf3a952a6e36f16f1cc908111bdd60bdbbfac8ae760fd680cf8c291ffc388d0fd513f6d2f098e43150b23a51affb
+EBUILD fail2ban-0.11.2.ebuild 3348 BLAKE2B 884a823df13614a5f6b30d57dbbfbcd9174dc4063422fa9f0c7bf24834b385292f93f03beb9d4cb025c99262ac64492679f46eb4d9e7bb3c5f0894ce79082ac7 SHA512 93b38332ada7aafec33efc191655bda76f85237911a641e4465bc71dd90c763aefff51337fcd9cf5a91b6111c3882fa208e7bbc6519e3040624b50e2ea050412
+EBUILD fail2ban-9999.ebuild 3265 BLAKE2B ae5c6e8584db8e7f0bab76f26f58984991d568ff9e9bb2446a1359eb8dd6ead7ab769c2e9422452678beb89414908d303cd439b360ca23a937486549e8717325 SHA512 b065b962ed7a760229c9da5c9ab8676374041fe504bea5bb8cd4e8e2da1dce28550b2fa053cd15ba84989cd58305c62b7ddb820d834a4c97f94637d634255c73
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 5ed0a845c74d..5e9fd5b53171 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd tmpfiles
 
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 5e5fb78a51f6..4a13926cd46f 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -8,13 +8,12 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd tmpfiles
 
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
 EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="selinux systemd"
 # Needs some work to enable them right now
 RESTRICT="test"
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index 82a2dd064ecd..c56e7e660db3 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6
 EBUILD flent-1.3.2.ebuild 615 BLAKE2B 1d07580727d43e3722f568ef185ac20a60999869c1d472517310bb0b649e615c8e249918846b8dc1585f3b9f4823c1f8b37998a247a3498c92571b9abdcfa130 SHA512 d7e3449faf6b1167cbb319719400ff74ae8b4ed51276232def55c0f073ce79545cba6eaf4fac398135a4026ccaf24f91beb159829fd7231d4192fcb7b2c61ab4
-MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
+MISC metadata.xml 391 BLAKE2B 3698ab2afa9a0dae991c683d763d40ffc2f14f4a77f86161e6db8184ace0b277e7af0571201b317fb0ceea3de783ffb18f6ddb0fe846986b419b628992c2121d SHA512 b80f126bf735fbe0abf283fbec21cd66522a4bcce702d1418a90b46d063bde317d72520ddcb9e230786363ffe1484d8c0c16faea12252f22e4b081c2b0f19c03
diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml
index d33bba3bd96b..a5a955fe23c7 100644
--- a/net-analyzer/flent/metadata.xml
+++ b/net-analyzer/flent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index db2a7db25ea7..ceaeb20fea1f 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,13 +1,10 @@
 AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B f15d1d6fc60b9ba916ccefa44f30b683d93931770a3113b533b51a52146f63e56fe0db864a03a5df0fc1ecd5a58e464944c5df28cd929556d6615617f3b975d2 SHA512 ec26e4ea284e0b2aff3a73b6b76e0a87c336dbe81d0492db3b7809de17103c47d220d2d20bc9fce853bb10e7b11c35dd6943b6cb1ef305bd8ffe147bc7bec18c
 AUX flow-tools-0.68.5.1-openssl11.patch 1039 BLAKE2B 2787119195c98ad92260b282b60fbb2bfb56d09a0ae7c999238d61d3b1e25dfb7e02590f8f78910e5b85111899db72f7d3bb3ce96c6c357f7ab4e6b01a67f109 SHA512 03a48e6e297d701b04259bf354b5a032ed660d99fb6941054f8d02f215681561a152ed10411bc0fa93b27be223b874316f989dff779aac458db87b0118947590
 AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d
-AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537
 AUX flow-tools-0.68.6-mysql.patch 479 BLAKE2B 9c22f8aae5bc57c2d86e88d69bfcac438e8d1fc2f5d6bb4fe61612e3042709d46edc0e1a4159b54bf98e153ae1e0acf08b06b317b4029a9605933dfef41d40f7 SHA512 fbdbcf7a716375a70a6677d35aa81f0f07fbf67d3de7ace72cc4b0b548d5b7fed32d0f0f4420672a88ec60ea2f72e109f9c3a3903cd66be7dbec85fa445dd9ec
 AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d1d18403fbd0bb95ec3a58faf04e164d97e6eefe4c1b2f526ed96ce44b7a410cd6e3efb0c3b98e15b3b0 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05
 AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
-DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740
-EBUILD flow-tools-0.68.5.1-r11.ebuild 1570 BLAKE2B 9777743a331cda77929b901175b8c9fce0f0619d28bbc6263bbbca6a22931de0bd7077176cbf27a0a5004f491d3dcb4878f7802a17a162016b8a7e9aa70621b1 SHA512 e95fb5cc31790bda2a7f3384ff76d2c140b359d9f321c09c8127ad77a995d07333bf18941ae54a29be1940fd411383c9cae8ad0a6c629b3d052ebb1429beaaaf
-EBUILD flow-tools-0.68.6-r1.ebuild 1821 BLAKE2B 4c62192f40635eb9afcdc3eca578deebde35e5a28c5ee25e1eba927ef9d34131a42cf662a81debcd783394a407d79c7a0f17f2b566d066d092c40aed83a22efd SHA512 5aecaa30e76eda57314d959e90d78a4a87983f95fb9a3ca6c8d951a95d9948c2d6a3a6ef814965e08e997c3a06fa4adb21f26f3014d124b737583192f986a65d
+EBUILD flow-tools-0.68.6-r1.ebuild 1818 BLAKE2B e7b5806a2eef33155305e65fddb654b985cb0c7c1d81c29a5e517c8a03cbb0bcd181ba444a83f8cae586ee2e071a465cc13afaf7d5e7d9f1bdec7b4032c7c0fa SHA512 23ebdeb9de9ab64fa3865100561373ce9a48f7ebc4a736bc1ac579b0d98ea61b2958cde5b63b1eb766746764b8f7bf9392d0e57aaec979e7a8d1526ce7b9b7ab
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
deleted file mode 100644
index cb17471072bc..000000000000
--- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/lib/fterr.c
-+++ b/lib/fterr.c
-@@ -112,7 +112,7 @@
-     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_info */
- 
-@@ -134,7 +134,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
-     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--    syslog(LOG_INFO, buf2);
-+    syslog(LOG_INFO, "%s", buf2);
-   }
- 
-   if (fterr_exit)
-@@ -159,7 +159,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
-   if (fterr_exit)
-     fterr_exit(code);
-@@ -183,7 +183,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_warnx */
- 
-@@ -205,7 +205,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
-     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--    syslog(LOG_INFO, buf2);
-+    syslog(LOG_INFO, "%s", buf2);
-   }
- 
- } /* fterr_warn */
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
deleted file mode 100644
index d1f4fc95e62a..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="
-	acct-group/flows
-	acct-user/flows
-	sys-apps/tcp-wrappers
-	sys-libs/zlib
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-run.patch
-	"${FILESDIR}"/${P}-syslog.patch
-	"${FILESDIR}"/${P}-openssl11.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(usex mysql --with-mysql '') \
-		$(usex postgres --with-postgresql=yes --with-postgresql=no) \
-		$(usex ssl --with-openssl '') \
-		--sysconfdir=/etc/flow-tools
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	exeinto /var/lib/flows/bin
-	doexe "${FILESDIR}"/linkme
-
-	keepdir /var/lib/flows/ft
-
-	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
-	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
-	fowners flows:flows /var/lib/flows
-	fowners flows:flows /var/lib/flows/bin
-	fowners flows:flows /var/lib/flows/ft
-
-	fperms 0755 /var/lib/flows
-	fperms 0755 /var/lib/flows/bin
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index d8ee002d2ccf..0f7a1e00b1eb 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-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="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 6395aadd19cb..c66f67668283 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,6 +1,4 @@
 AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78
-DIST fping-4.4.tar.gz 182921 BLAKE2B ddf84d5576170f0279e1d801fbb4afe491c698e5fba3ef4ac6fe25b2dc9b72605c23b6d33559d04170a885ed9ab423cbc1b853110dba93d5d250b6008b0c2a3e SHA512 8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0
 DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
-EBUILD fping-4.4.ebuild 713 BLAKE2B 599dbd8e5e187697cd75e359266e8b743e15a7920d7ca4899331630171b02ce64b5801bbc9055f65b953be04866520f7093be33068e27298a1abb7c0d5310937 SHA512 7329a0cdc3539348d133ef7332267203afa777a92c731c7ff3f636aa2f8e68a9ce5bc217bd93bb74e7944eff2a4e0a153b7d2b8a6c8113eb52bef438432a3624
 EBUILD fping-5.0.ebuild 708 BLAKE2B 575ee108895981cc84fe0c816dcb45e9a9f0772368ea3bfd8fbd22e0f321224b6608fb369974ce0879e403eac13c1a5ec173a2c8fcd75a34d172ab90931c896a SHA512 46353758ba632252ef3ed62e38a5a546209355856c77c8fc5ba59e56cafb1b8967859684f43be86505098a61866f77161e05956a41032b978c695f99de31020a
 MISC metadata.xml 355 BLAKE2B 6e4fd15cdfa76be00db905cfbff100e3ba30fbc04f0e5fe42cecdd7f66e3c2478ef626b11d5f0be2f43e5526dc6022b1334a5c51253396f3b582cf56b28b4a8f SHA512 036f801bf73918249011ac68a06d0b1e29e5f8685209cd70a0df02b9f43271d57222f4250f973b2b65b7b0c0811598ff0179e0ea09ec70683abf99a14dbe48d6
diff --git a/net-analyzer/fping/fping-4.4.ebuild b/net-analyzer/fping/fping-4.4.ebuild
deleted file mode 100644
index 7ea26ec93e2e..000000000000
--- a/net-analyzer/fping/fping-4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/"
-SRC_URI="https://fping.org/dist/${P}.tar.gz"
-
-LICENSE="fping"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 suid"
-
-FILECAPS=( cap_net_raw+ep usr/sbin/fping )
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-fping6-6.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	if use suid; then
-		fperms u+s /usr/sbin/fping
-	fi
-
-	if use ipv6; then
-		dosym fping /usr/sbin/fping6
-	fi
-}
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index b698f758af42..6cf778d1bac6 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,5 +1,3 @@
-DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6
 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
-EBUILD fwlogwatch-1.4.ebuild 1620 BLAKE2B 2ecc86069f004a55ebdb5977e69c238eb6d7530dc24a481286e77abde84aaf231be0e1d14a6c153ab896aeaa7bc103cbbabee8f9fbdd4b686c3e09154a0ca9b2 SHA512 e9d3dcf9c862b7088111ef5b72c405d8650b577245766eeae2a725458c3cf7ba6c38d3efcb9babf69e70bf95ed0edfdd6d8fac6b8c2f25ba52ad75fe733e5970
-EBUILD fwlogwatch-1.5.ebuild 1766 BLAKE2B d931f1a22b0f4b5fd63ffc4c82de623726d1b7d04297ec230238430418ed2e09c425f22c1841716aa060aaa036eca4aff4895f2b4cead8078799691598652310 SHA512 8914d7daa87bb4e1d41e946d7637bb2aeb4bd6cac974fcb67ea48fdaf71b8b6061df436e93102906d6767b81f854c2147a76132f4505a6f612814cedc075078f
+EBUILD fwlogwatch-1.5.ebuild 1778 BLAKE2B db89bf6716b60763d6fe07cf7ef3bf37766b00fda87e3adb9c198810bb99c8b13b0eb2c0925007fc712f0d8f976db4b875b43b8fc65fc91bd1a90e0374e0d3de SHA512 e1551363a1f65fdaf559c0d4805fbc6da9b6912344c4eb818f9e5144e30384ea35dabb423d4f74fc4e8e0545d30d1a4933d911c88c18f4987e8ee1d77f78fc28
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
deleted file mode 100644
index 54a2095f9c3d..000000000000
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A packet filter and firewall log analyzer"
-HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-1"
-SLOT="0"
-IUSE="nls zlib"
-
-RDEPEND="
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i po/
-		local lingua pofile
-		for pofile in po/*.po; do
-			lingua=${pofile/po\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				sed -i \
-					-e "/${lingua}.[mp]o/d" \
-					Makefile po/Makefile || die
-			fi
-		done
-	fi
-
-	sed -i \
-		-e '/^INSTALL_/s|$| -D|g' \
-		-e 's|make|$(MAKE)|g ' \
-		Makefile || die
-}
-
-src_configure() {
-	if ! use zlib; then
-		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
-	else
-		append-cflags -DHAVE_ZLIB
-	fi
-
-	use nls && append-cflags -DHAVE_GETTEXT
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	use nls && emake -C po
-}
-
-src_install() {
-	emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install
-	use nls && emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install-i18n
-
-	dosbin contrib/fwlw_notify
-	dosbin contrib/fwlw_respond
-
-	dodoc AUTHORS ChangeLog CREDITS README
-
-	insinto /usr/share/fwlogwatch/contrib
-
-	doins contrib/fwlogsummary.cgi
-	doins contrib/fwlogsummary_small.cgi
-	doins contrib/fwlogwatch.php
-
-	insinto /etc
-	doins fwlogwatch.config
-}
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 93b1e6a2a352..1f4f953ecd59 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE="geoip nls zlib"
@@ -18,13 +18,15 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
+	default
+
 	if use nls; then
 		strip-linguas -i po/
 		local lingua pofile
@@ -62,7 +64,7 @@ src_configure() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 	use nls && emake -C po
@@ -72,6 +74,7 @@ src_install() {
 	emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install
+
 	use nls && emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install-i18n
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index d70f4306445a..2474c6e510f1 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 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
 EBUILD goaccess-9999.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
-MISC metadata.xml 937 BLAKE2B 29b9031c3c7172d88404d602952a6cb297f7762759461f4052f6ae1cc4de81d97ec9b410c10d47ce7813f99859117bae62fdc6b4090d08af85f074ef86c4e76d SHA512 6e09c8752f8f98ee352f6477d17c9ca8b86ffa1795b02faacf4fddb38141ceaca4cf3250089346c27595eb0e49e444be608f28f3e2a909cb69fe73e33178fe96
+MISC metadata.xml 967 BLAKE2B 7f8a5a613fad521ba3379e0b034173cbe1b3847c737d0b6f17f9b7ed5f4c95af11c1702049c7c6fa23cf1fbed0f0a615c4ac8c130f8c8399d923a43d41d3853c SHA512 2ccfb0fefddfd0e116983e1129b02638879b313c4c494a6c3e99dfb5443728b3929b36d6dcdacc72898dff17186850c7adf87d660ddbf4d894a9c1633e8fe290
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 43a4da78f81f..3a1e5396510a 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index a82ed8429483..1c8062583f62 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -9,4 +9,4 @@ AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6
 DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028
 DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
 EBUILD greenbone-security-assistant-9.0.1.ebuild 3168 BLAKE2B ff7eccf999d89c8894579050728f999ab60d6e94e1f976d597652dba151b7f2129143349952386f8fb323e744afea4cd931755561e2722d44194e643d6545d36 SHA512 b78193863dc3e290b6a29cc0a429ec6bec13f3224a3b53e81e2b8deedf923b92fe075c19ad36bc51950123984ef489df99e54249435c6e0c77b5653c3ed9a9bd
-MISC metadata.xml 953 BLAKE2B e7c1cc4d11ed04f7d034d6d8b6db37a27ad130ce2fbbff8036ea331df68ca7be2fd368bc45e09901d776b91e4bb83e457607182d60225a8c3d4daaa5f2199f7d SHA512 3d5fda98924d8f45711fc3b6283fdf968fb70f44d7a5dee06640c3386ab404905c25e033f5754810d8ea9bdf4f6426348014a30f6bace937654739cc695a350f
+MISC metadata.xml 983 BLAKE2B 64406a37c0938a62b929cbedf6c16425dd999633cbf8a068afac38fa48de7e6cc05a5dcd03371c57c6f5c5a46c7de266c1e815fd97494bd8bf25ac3820904956 SHA512 c10b98354c2e9015086df0abd3961b006709104dee4f6f6eff682bc1ef4fdaabd35e8e8cb9454e966111c867bbc88a08dca0993545bd18cac02e4113b5225307
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index f6df02262b86..0983784769da 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index ef37ec938af9..9780f2266c98 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -3,4 +3,4 @@ DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4d
 DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46
 EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428
 EBUILD gvm-libs-11.0.1.ebuild 2025 BLAKE2B 5dd6df6ecd1ae6bc3440c79af86a9adcd44c24bee7b1fccb560ae1ef0bde0f0c2bb432b3d6d370b02105e292df901681bc29f740444969fee3f27f9152b97622 SHA512 04d2a392e9f7e684838c7ae0a5159a62378c444559d64ad210b6c124891f991b8fb6af2d4f3f95f79450a807d76f8754c98942a2f8f1577b6ede08f051f487cd
-MISC metadata.xml 782 BLAKE2B 002fcba6357c321932dc1506bdc826eb848ae9959e1bbbeabb9f3c4348eabd3aedf34df68af834221ed4f7c7f8b5a5ecf69c3ee657706342f9161b810ed68f60 SHA512 33d2c86b3e5bd9261a78ed7bd726d01d677f715c675caee8868adbfe80b408d3f155779faecdf1124a00b3b72167966111bb5ae1c9849725a7de76fa46e5f7b4
+MISC metadata.xml 812 BLAKE2B 2af4a17e02930d1cf034a60b0300366e8a5ad2948a5c9627b644f543560254a99b52b9153f0a7cb2ae2a93e8f1d0462579778ff822b414ebea787e24683a0498 SHA512 d5a3accce742736336dd7af6722cb093ab58218bedb0cc8d244269234eef330a5f87bd42759298e57139b5796a648227d7c21ae517282d508d00832d2365269c
diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml
index 3fc9918d9918..ebe1515c15cc 100644
--- a/net-analyzer/gvm-libs/metadata.xml
+++ b/net-analyzer/gvm-libs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index dd7f8ee667dd..b0e8889eeaae 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -2,4 +2,4 @@ DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504b
 DIST gvm-tools-2.1.0.tar.gz 128144 BLAKE2B d9dd1857446912bd26a0b5efa38cc34c77bfe9959aaa9ab42ea8518ef9231e5877317319ac8e924b14a5382c80cb00c70d0413635506355eb111b84b5715bf4e SHA512 80933ab8303c1ff77451a9fafd9331b6a0b4c3ae40c4ea318171b6b9e969fb6f20c6970d021a14db1bf8ff816c7f779e2eb750bf84f9093055273f58ad04cda2
 EBUILD gvm-tools-2.0.0-r1.ebuild 1203 BLAKE2B 40af74b0c324424888dde0804dcd5a0682d9d1526d1bfbac089a43d7986d33b14e89b86d4f3dc569a46f55028477d8429f8a6a7971c0b78e9ee2fbc96be19eb4 SHA512 4d38d1bb3893cedcec1bca8d4bc170646383fd50627ba546dc87394882f6eea54fce71e89b1d561f26216b32887b512a27d4e65864cfbdb793ef793429c854bf
 EBUILD gvm-tools-2.1.0.ebuild 1003 BLAKE2B 52cfc80890f0ec9ad9a47ebca378dcc0ea7171cb3a1fc02847b3b0c5f12a3a5c9063b2f5f7d2357897ad4a65b31fcf85f0ef2f4eaab233a8e79e2f32dcf23012 SHA512 ec6ca139544605318dd9f7d6a518967e329f5b8c40a7293520bf0c1a7067320178369fda6df40a71692639de64dfa9c7623a832e63030f1bf4616d22085ddd79
-MISC metadata.xml 871 BLAKE2B 65fdc24c170ca52b75a45f89d0f56447f83ce23f8860af2c87d3bf02178fe637e49fc94005f4383a576728514d78f59f6a62fc9a893b18dfe3bf9ef696738ade SHA512 66e5e2b493223a23276ed57c7685f8a151b4fdd4dfb4854d283c0f82a5b923bcbc2688bb1b9701e7934658a6ecdd0d9e036993f4f18aa5d160b330aec2bb72a5
+MISC metadata.xml 901 BLAKE2B cff38bf64d7b6a7ecd7f5100ec845c5c704fe33734e7e396b11a1fc8814c87121f61b733eca0c467b512be81e70ee20fa1acac75f664b3c1056c3ff94a89c2a0 SHA512 ddfda9b82910c11a826e40d864870ac9cc4de279dc06f7f8e6d7b92af9d9374b11d3d78e2a2e2af35ad3f7712c57e2adaea6f53e88ff3daa3a0d5fb2cb2574f1
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index eb6dcb63c5d3..18c296090054 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 70a36aa1db9c..066b8134bb33 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,3 +1,3 @@
 EBUILD gvm-10.0.1.ebuild 1295 BLAKE2B 9240153601838b17b327635c08a7fa64e40f90a8aaccdb5ffa23c113f18bd5a8cabf3db228f7490d6dfce0d0f8c7baf49ea47ccbdeb4010429afd9e451718f4f SHA512 f83060baf1d636711e1268376c05d04e07e673c2d5728166b8f01c1a610250c81fc2141cbe324ad082f4e878d253c5adda19e60dd244a7748afb488bca359ea1
 EBUILD gvm-11.0.0.ebuild 1222 BLAKE2B da5b755c260012f0001a1fca72b83bfb394f7fef5189efed3e46ea1fcd414f32ebadc33f2773781aab4fc5c7c18a7c7448ceb03f4ca15b641a93db922d24362c SHA512 bb53a87e9b1b6f8fe3e28113a2ae24070cceab6a86356a55a89c5bec47e4513dfaccda094ff4d157b9030b82b6a4a20604fc9c934fddb519c6401adbef8f3bc9
-MISC metadata.xml 1170 BLAKE2B 2c1758e283daf2d72e61cc1eacf6312c4131b7f89a8a10ec924573f1dfab865c7e66992ffa4591036f183d20e9b73594d61dd213e5adfbd1e428836920df6d6c SHA512 c7f720bce7ee7e6ed5efee259423e5750528c4e7ec9bf3bec443abc67f2412ca05f98a6bee67352ccd053f1ce26b9f7279e78ed5646aacb1bcff2918a61a0279
+MISC metadata.xml 1200 BLAKE2B 4773a833f5e00f25615c7cd169a79368299f1583a3d363c37d2b4255382945016fb7927c29e63e5c92049a342841a6d3be4524542dab8a391b566d26387c9da3 SHA512 965cb0f141434702e7f3cfd385bf3270437fa36d13de473c8229094dd7ee049f2d75186e9ff41811932f9ba4ffb3883a603f18abf584b9055813a43983054b8c
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index eeb4ec70aac9..45968d46e787 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 78813c663cd0..1dcb5350c083 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -9,4 +9,4 @@ AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f2312
 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
 EBUILD gvmd-9.0.1.ebuild 2836 BLAKE2B c4273957354ac5cc8b51a6e0b47a00439d866b0fae51ed5f866db2fff0003aaa891fdfe768005ef35f25f554eb750af742308ff37f7f8b0da0a8985119aa25e4 SHA512 28ac31a09bd31c2bebe92baf3f671d9431040cc7037081ac9993f5383085eef074a43ddeebc15920aadf903ef4ccf223fd26df3e116d46a83396d1f44c375d5e
-MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed
+MISC metadata.xml 1073 BLAKE2B 7f2ab5c71762e48fa92cdd15a009961d5302d44a3b39f5e936b1b2eb190141d3136b617c451c2ccaf028813a85db0aa21470546de44e37709f0e21b6cbd28361 SHA512 3b980f843d6e8ea1472b951334a6bf528eb077e718d9a75ed7a07d6857754686611f088f001a77d6b7e5bed3e28fd670dc50f47d3b6c62baa477a80ba6777b67
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index 072f33914919..6fe00407f06c 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index e4dc0bcb89d3..71116522c182 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,8 +1,5 @@
 AUX hexinject-1.5-fix-build-system.patch 433 BLAKE2B 203e2f72950d9caad552f1bd79facdb334a3fd9430aea2499b125686f18dd361d40b92ab183b0acc5c8e3dc7759393feb70bf1b36521a66f89937f1d0fc9c293 SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1
 AUX hexinject-1.6-fix-build-system.patch 462 BLAKE2B abbd87f2ba9c8005649ab50cb16c0fbe78d0be06beae297a5f68d876059e4f86b42fe985f97f0d8ad1ff5c4224f3cb213f3635d6b30cb932e4d09af59e04aa54 SHA512 5cf816c71789d6c487acd757e62d44c4ca0ada32393d2de138311e61eb22c0ca5c49a9e539a7fe333b4fc8ea48ec29b49c4e14db97bc267c45aaa39f8fab04d1
-DIST hexinject-1.5.tar.gz 14449 BLAKE2B e7c3fc34cce5b004622d6fe30584d90d8739fcc218d485317ddab178807caa4bf82e86b66f45df3311e05ca96c58aa9590108ffaa53c703feaafa64af8804e2e SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a
 DIST hexinject-1.6.tar.gz 16876 BLAKE2B ac2951a5b4705ec84ed72fa5513e84b8bf031bd7e43b05c76fe83fc601cf3a245352afb0f226cc128bb028124ba898bc67394f2d839554ee01e25ee25c8f0c4d SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad
-EBUILD hexinject-1.5.ebuild 756 BLAKE2B 873cd8b5d9aa09e024f4b34f65d138bb3619bc5b7ed8aba8abf6af311d373017366b02bfd836094ff83451493861773a4f4a08f8361fe8a5a9990c399b707c30 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92
 EBUILD hexinject-1.6-r1.ebuild 697 BLAKE2B fab22b1a5b3d00881da6fe0ddbc91c5678d1ad9dc910fa7689708c4dcf31982c94194279a09475777333e17d17ff8202032d3b8ed59c5693549a5298cf0919fa SHA512 89ca26ae193bca85ca9fe8ca0e5075f96254887666f24d84ae2e194d941d3e50bc7f46a40bbde3c319b3cdf977080e29b5924a1d2e11dfadb601f23c9914f2a8
-EBUILD hexinject-1.6.ebuild 696 BLAKE2B f3e096a3145c844f7e41926072df85a7eaf9351f4da02b9d0c39517c129dc688c2c8c8273c875b8487bfef920f1ba6092572c6c1fa87f5c14b4097f9abb59afa SHA512 0a41dbb13e7551603261a7c40ce956779a62a1bb6e35fa35530d957f3872fb223cd961cf6e1734fcd7bc6ce9c91b81e799b18699e1ac5c8d82eb42c55beb91f5
-MISC metadata.xml 1004 BLAKE2B de0d6ef7dfa696f6260482932246ee5c10391d243890af3b992e4f39cbce7e6452e3b1b7bb146d7a53546f397f5b45ea29e5cf5044e09e0e80fd014b1409e2c2 SHA512 e9e01a46cc45ab6625e4d444d857a31340b93879c24cb7e2a1d420e644b376f484ad4076bc36302ab536bf88a9ffd7c1850115d3c2433181b82c948e84077ccd
+MISC metadata.xml 1034 BLAKE2B 95f51302f1b6880e3d4af3056591c094d97ea5327ff176c95c89623ccab77da581c9a262ef9686340386b38921e4c7eb97bafaf99394e6a251edaa421d7e2d64 SHA512 2e512a634789c5d9becbfaa448eab8fcbceb6a3e926987b340462c201b1047b5a861d701a722d1576c3be2fcfb499daff5f10264a8028d17a3ef262415507b0c
diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild
deleted file mode 100644
index b33f5f0bda0c..000000000000
--- a/net-analyzer/hexinject/hexinject-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network packet sniffer and injector"
-HOMEPAGE="http://hexinject.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools experimental"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	experimental? ( dev-lang/tcl )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5-fix-build-system.patch )
-
-src_prepare() {
-	default
-	append-cflags -std=gnu89
-	tc-export CC
-}
-
-src_install() {
-	dobin hexinject
-	use tools && dobin hex2raw prettypacket
-	use experimental && dobin packets.tcl
-	einstalldocs
-}
diff --git a/net-analyzer/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild
deleted file mode 100644
index 5d8011ced352..000000000000
--- a/net-analyzer/hexinject/hexinject-1.6.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="Network packet sniffer and injector"
-HOMEPAGE="http://hexinject.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools experimental"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	experimental? ( dev-lang/tcl )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	append-cflags -std=gnu89
-	tc-export CC
-}
-
-src_install() {
-	dobin hexinject
-	use tools && dobin hex2raw prettypacket
-	use experimental && dobin packets.tcl
-	einstalldocs
-}
diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml
index e3ef4f8b00b1..c5a81e6e30d8 100644
--- a/net-analyzer/hexinject/metadata.xml
+++ b/net-analyzer/hexinject/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 0f7a5aa14b50..fda5771e865b 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,9 +1,12 @@
 AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01
 AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf
+AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
-EBUILD hydra-9.0-r1.ebuild 3780 BLAKE2B 98de0efd400e19c14e9575d3fb36e082ff3ae10d6f7f67ed941bf1520cc25e29ded776e7b9d174d58ad63f0246c1bb5f4d58d62d6fe6c91803d942e7484db799 SHA512 7ba1f10e2da24b8f0c3ceb86a0f0de42a50105e4cba7d21edc12bb10c6133e3152bfcc655eebcd5ad2473bcac9c6ddb9213f552c42284488b9dbaf0c0f548399
-EBUILD hydra-9.0.ebuild 3684 BLAKE2B 17861c610ba56b6133b245439d04b01b10db505a498c4b0ee0e2f4f0ea7ca2816a53563b7d4a9269684f71d0b90fdc988b3ce2b84dcef351a69d04c433d49b11 SHA512 87217c0d0de474557768d062fcbd03d59da88ff132029090a4088c397528a0ecfa1f65e3c6f49d7ab26b0e85587aa1dad2ae06e25666d6e94e47c88936bcf9ba
-EBUILD hydra-9.1.ebuild 3691 BLAKE2B 402fce711e3e7d311da07aa88f955ff925780cadb5a5afd7f646eb64cb78946acf3a928febd9add769c463ad1ef49a9df4f62689531025e701c4a8b48217d7d8 SHA512 b97a807535b50108c9af8405d166f82b3ec3dbb557edf66e7c91087ef0585358cdba9130b158796a0d9b843d4280c4424a2b8060fb3e76cf2819da88e27f4bcd
-EBUILD hydra-9999999.ebuild 3629 BLAKE2B a4067027c780bc3bf3d2bd3b662b79e7ff90c0c909134a7d739fd34ffe373e7447048b7fdf5b60cec6614e5dbe29843a4b6534c61709e3db8a5f4170e1ed84cf SHA512 74ee710cb68a48abba67f2edcd4f89229cdfbbeafe6c6815d5eabe9bc482f0e409d42be5b7b05051872ccf02011dcb0342b7fd12a2deae4397048d41ce7d1520
-MISC metadata.xml 552 BLAKE2B 01b49284c869dbbe415552bca3bb8dbc807eb9a362b6378954e0cf5de1265f9f107f13e0ee27cb035c1e5652c7a712c210dc2db0f8f470011eedb52ce6fa043d SHA512 0f438e21490b870ab4b247f55fc7c3c413bf8598225492306e32b27d4aa3a4a5ff2621118bbafd49d570f95f91011e88ce78d1cbe575d5aa05ace68ac3ab7a9c
+DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
+EBUILD hydra-9.0-r1.ebuild 3716 BLAKE2B 2d9d455c9f620808543630a784c382f4769521e81141cca5821ca25d90536023376a874077ed1c91e775e8a89f9044329b9897f9d0519949c2755988061e6e28 SHA512 d8e95cb07cc08d6ef37fa1c4a975de86c777cdc5b48fd3ea585dd9cd4b0f6f553b3f09a91d4e9d0ff13f39e71bbb241cd389af1109424fe0dc3d5dc3e8be0730
+EBUILD hydra-9.0.ebuild 3620 BLAKE2B 79f6117e6de4892d9597bd431020151abfd11c9948235051e5abdb45cb21329e37ebe998ae318568c3a29cafc371464d7f37700fe43e726367fab8b255e40fa8 SHA512 12fc637a1e756c26eaf396c353cabf0295d15f078cb9b48441f99532e31d62d8f7ef086894ddb493f23bfaab845304cd0f5a76c8a6985de1d13f42b433b44968
+EBUILD hydra-9.1.ebuild 3626 BLAKE2B d89f6e3dd2a8040183551e96f51012dcb8ddd2277873f83294f789523848ac893e5e4471476edac35a299611d7e9b116715510d55d7ca6cbbe9a04538f2ed124 SHA512 5a835262af5aee665550955909549fcb5838a8d9ba0a5226d659576c56ddf7d984cf6a8bc97839c8f15340edb67609c8e2ef3279d1fa2df33e8bce7d9d946387
+EBUILD hydra-9.2.ebuild 3662 BLAKE2B e49f162de992b218bd65ae480f52887188caa337ec0202b6ff19f52dc967e7ad93a7112203754541b2e065ce00fe245550b519bb7f47fa8c42fdc3d957379cea SHA512 f4db9ae074d853275a1a4fddbcaf7b81af05fdb91c3594327aa6dd39b51ad5f5513d0d7f6c65b4862ca184903be75851db361e317f7c8efd3cb58af25a87ade7
+EBUILD hydra-9999999.ebuild 3586 BLAKE2B d510ae7b3a31e0064563f7858c87b5830849ffb68fd4277e0716bf927fb2a879786844aa840c54c7da4beddd56b7518a9ade811ad26b3b63f55e44eae717fdf2 SHA512 73bd694d30bc004c10ff5ab4a61ff610e5830db180205991a4ba5e066904b663afba91554fe728496bf5f67d2bcc6383d1bc668931965cb996185369c3e3ad78
+MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
new file mode 100644
index 000000000000..8d158640803f
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
@@ -0,0 +1,26 @@
+Don't inject hardening CFLAGS. We already have these by default in Gentoo.
+--- a/configure
++++ b/configure
+@@ -1376,22 +1376,6 @@ if [ -n "$CRYPTO_PATH" ]; then
+   echo "                                  ... RSA_generate_key()$RSA found"
+ fi
+ 
+-echo "Checking for secure compile option support in $CC ..."
+-GCCSEC="no"
+-LDSEC="no"
+-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+-echo '#include <stdio.h>' > $TMPC.c
+-echo 'int main() { printf(""); return 0; }' >> $TMPC.c
+-$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && GCCSEC="yes"
+-grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT"
+-rm -f "$TMPC"
+-$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; }
+-rm -f $TMPC $TMPC.c $TMPC.c.err
+-echo "                                                  Compiling... $GCCSEC"
+-echo "                                                  Linking... $LDSEC"
+-
+ echo
+ XDEFINES=""
+ XLIBS=""
diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild
index 402929ea2301..f1397694c8ad 100644
--- a/net-analyzer/hydra/hydra-9.0-r1.ebuild
+++ b/net-analyzer/hydra/hydra-9.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
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -93,7 +92,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index 3a812ec881b5..190b5ed145c3 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -89,7 +88,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}"  --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}"  --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}"  --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}"  --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}"  --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild
index 0b2eb5c879d1..edfc864a713f 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.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
@@ -10,9 +10,9 @@ SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -89,7 +88,6 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild
new file mode 100644
index 000000000000..ff6615335797
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallelized network login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/thc-${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
+	oracle pcre postgres rdp libssh subversion zlib
+"
+
+RDEPEND="
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	firebird? ( dev-db/firebird )
+	gcrypt? ( dev-libs/libgcrypt )
+	idn? ( net-dns/libidn:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	memcached? ( dev-libs/libmemcached[sasl] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ncurses? ( sys-libs/ncurses:= )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	rdp? ( net-misc/freerdp )
+	libssh? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	mv Makefile.unix{,.gentoo_unused} || die
+	touch Makefile.unix || die
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	# Note: the top level configure script is not autoconf-based
+	tc-export CC PKG_CONFIG
+
+	export OPTS="${CFLAGS}"
+
+	hydra_sed() {
+		if use ${1}; then
+			einfo "Enabling ${1}"
+			if [[ -n "${3}" ]]; then
+				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+			fi
+		else
+			einfo "Disabling ${1}"
+			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+		fi
+	}
+
+	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH'
+	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
+	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
+	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
+	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
+	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
+	# TODO: https://bugs.gentoo.org/686148
+	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
+	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
+
+	sh configure \
+		$(use gtk || echo --disable-xhydra) \
+		$(usex debug '--debug' '') \
+		--nostrip \
+		--prefix=/usr \
+		|| die
+
+	if use gtk ; then
+		pushd hydra-gtk || die
+		econf
+	fi
+}
+
+src_compile() {
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README.md
+}
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 3ff5496cc9b3..fd067f1b4ca5 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
+
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
@@ -10,9 +11,8 @@ EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -31,7 +31,6 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
 	ncurses? ( sys-libs/ncurses:= )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	pcre? ( dev-libs/libpcre )
@@ -41,10 +40,12 @@ RDEPEND="
 	subversion? ( dev-vcs/subversion )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
 
 src_prepare() {
 	default
@@ -64,7 +65,6 @@ src_prepare() {
 src_configure() {
 	# Note: the top level configure script is not autoconf-based
 	tc-export CC PKG_CONFIG
-	append-cflags -fcommon
 
 	export OPTS="${CFLAGS}"
 
@@ -87,12 +87,11 @@ src_configure() {
 	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
 	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
 	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncp '-lncp' '' '-DLIBNCP'
 	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
 	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
 	# TODO: https://bugs.gentoo.org/686148
 	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
 	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 0c88bc63e93a..edfd01784ed1 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
-<use>
-<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
-<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
-<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
-<flag name="ncp">NCP protocol (NetWare) support through ncpfs</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
+		<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">vanhauser-thc/thc-hydra</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index e00bc2bb340a..111b114f7cc3 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -5,5 +5,5 @@ AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b
 DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
 EBUILD ifstatus-1.1.0-r2.ebuild 928 BLAKE2B 9646aaa3eeb56fa383563286a786142efeb0381552423eb4916671c6cc00d87fde4ea45427c70a484951ab2cce17b07d229d5ed4e6eedff375b325ecc1a5dabc SHA512 20882c2ebe3e23bedb9ba8ebcc83d5c37be9d9940fe3c51d71fe5f9041f3b6b56e44764134bbb76c696d682bf156a9e923c8dd3854ba4a5b4b1e45a5a1921a7b
-EBUILD ifstatus-2.0.0.ebuild 893 BLAKE2B 8c49738d994275e79823280afbcb24b150e1c82de6ec83dbb172690e1397134fbb83aad052c46ef92aee9f38d84e29736e461c4e2ceaa894d7257c28ce746fa3 SHA512 bf8da74e62af253c57a35b3b15067abbd9cd9cd03e862739e5cf080e4e92a6d89ba5017d518ec9812ed292939aa779377f7f208f6ebe4e5c31a1126287fe8cea
+EBUILD ifstatus-2.0.0.ebuild 891 BLAKE2B c4e496921cbc02785583c4925b480216239fc3009dca26f921da2fd0ce2fa8ae9a0c5220594fd6cf3aa66bafa28cb04cb138bbc0ad6907eb2437e43754d51ff5 SHA512 66dca0c1d8fc07ba210d0be1e648ca550cef24d89b1b56186ba2ddcc4c335902e2c94848c966acf1f122357d3d6857f6a0fa338d6b8cdeeb5af8d2815105614b
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 7b2612d29fee..0b58e01792d6 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index 32e7c2ab050f..0a9cfbf8826e 100644
--- a/net-analyzer/ipsumdump/Manifest
+++ b/net-analyzer/ipsumdump/Manifest
@@ -1,7 +1,4 @@
 AUX ipsumdump-1.86-SIOCGSTAMP.patch 228 BLAKE2B 05abaaba5619f0eac3d0dda66ad948afc7aa3cca3660fa9a89a35252e92408a2ffe9f3add385a851651439dd2bfbfec0164619c1cc22faad8269de4d00b61336 SHA512 bbf0737f8825e309f9fe548b0ea385d5c6926e59aabc90545d72ec301147a14607a648b0be90adf7f81874b9efd8bf6db59ad0103e7f8a54aa62bd61450e8cf2
-DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596
 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65
-EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d
-EBUILD ipsumdump-1.86-r1.ebuild 677 BLAKE2B 485a8ba4d09f00e6a45da680542ce03022b5b37ef00911cbcb5252959f8efa48f47d9cae2131905bc6a267eae8e7c51e34985fcd2827f75bdbaff63a277175e7 SHA512 330fe0ae13c5c83367ba3b00cf7ec3f3355cf006a9d0065e272621aad4e853c5f0bfe6dd1d80f154a5b68b3e9509059f7a48b5f89baf96f71913be64c8586081
-EBUILD ipsumdump-1.86.ebuild 622 BLAKE2B 9de5b2f1a470ab65abd3865eb25930e771c5f25de630f92dd8d286d31bc73cd244f2dd5548506ffd7d14877791686eefbc769b5d42d009243322673ffb6d3b62 SHA512 4a169c2e2b380bd29a040a12f77661b7068daaa75ecfb46f4f5077cbfb0f547c7626b6fb3736fd738f42b637058b625070ac8e5489e6b45f331bbf2258ceccfc
-MISC metadata.xml 563 BLAKE2B 1c76f973fe5a6165461b1822b83462cc49c658ce95d020e38a3f5eb4fd8ae3e5e5a455491ca4e9da2089f439757cd21ec9788c5ce1f845421a3a030255f7bdb4 SHA512 1867ca535fabb5e70808491cea9339e91e21009f30526dccbbf29594bba57261d98a10b43d096f24b84d476a4dedfd9be1ca7fbbc3445ddde928580789914432
+EBUILD ipsumdump-1.86-r1.ebuild 691 BLAKE2B 6ff2d53651b856564c15cd6048b0b95d88780ae77a4fb8cebf97084fe055c30c71e229a6d660a9a5c5694b810eb713490b193e4f5296826a3c83bd10ce530929 SHA512 900fed8ade6f7f8e9bc3c6c6f362b5c07ec9b21acdb72bdfddda3fe2dcc29d44d6c701525d185521afbb0463721aa4b274db9eb66f6d18da3cb2e09c7885b853
+MISC metadata.xml 563 BLAKE2B fc218b2eaa1c6aa346fcd47c1aab6d96191166813117a283c600522ab1e1b6bcdb83fe8bc5bb96dedf93d90c2eb2d645470519bbc6fb63fde5b44ba1ce61761c SHA512 14a43bbe1267045faf215d5446f60efff39e8fc19595c7c0825ef9711270d06ef23a4355c517755cca2d303862c76265830ebd2d135491f9c09c01ffd275f54b
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
deleted file mode 100644
index 371b03c67b61..000000000000
--- a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
-
-LICENSE="the-Click-license"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ipv6 +nanotimestamp"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/expat
-	sys-apps/texinfo"
-
-src_configure() {
-	econf $(use_enable ipv6 ip6) \
-		$(use_enable nanotimestamp)
-}
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
index 8b367ee4b4b7..983cf1d190ae 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
+HOMEPAGE="https://read.seas.harvard.edu/~kohler/ipsumdump/"
+SRC_URI="https://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
 
 LICENSE="the-Click-license"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ipv6 +nanotimestamp"
 
+BDEPEND="
+	dev-lang/perl
+	sys-apps/texinfo
+"
 RDEPEND="
 	net-libs/libpcap
 "
 DEPEND="
 	${RDEPEND}
-	dev-lang/perl
 	dev-libs/expat
-	sys-apps/texinfo
 	virtual/os-headers
 "
-DOCS=(
-	NEWS.md
-	README.md
-)
+
+DOCS=( NEWS.md README.md )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch
 )
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
deleted file mode 100644
index 51f75d48e429..000000000000
--- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
-HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
-
-LICENSE="the-Click-license"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ipv6 +nanotimestamp"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	dev-libs/expat
-	sys-apps/texinfo
-	virtual/os-headers
-"
-DOCS=(
-	NEWS.md
-	README.md
-)
-
-src_configure() {
-	econf \
-		$(use_enable ipv6 ip6) \
-		$(use_enable nanotimestamp)
-}
diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml
index 670b2921b9ff..705f4de824d6 100644
--- a/net-analyzer/ipsumdump/metadata.xml
+++ b/net-analyzer/ipsumdump/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>netmon@gentoo.org</email>
 </maintainer>
 <use>
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 9ce56c5c36d4..15fb8803ffc9 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,4 +1,4 @@
 AUX iptstate-2.2.5-gentoo.patch 675 BLAKE2B e24ec3afa9c75a097d0a1d27c4e63e125b909590db52e49a8789ac66e00ea308f5e63b2f7d55a09fbc6de728db5812563ea3e31b9908386cd5ad76330b4e862b SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c
 DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
 EBUILD iptstate-2.2.6.ebuild 778 BLAKE2B 253e3316bf2dba271b93c401b40588a70049a4aa4e758557e86fe22d4528cebbb9f06717e6fc6143ebd99fef296f9dd0ab111870aff7e38112cab583a7e1606b SHA512 9b13e2253bc7cfd1adf7e95c19064c73f933b683245f32e0cba10148ee827d5fefbb96ee5c898cecb7a5d4c51da36f724938a1087823f13c13f979674b81b5c6
-MISC metadata.xml 413 BLAKE2B 4290cd85dc47c36f7f77914c9efb8031d0ebe9324112318fa4529daeff17c4df442aac7b97978fa399c6dc17ad65307f19ca7de70f9c3c21d07a9c96de69bac0 SHA512 d2bc802f6220c831ecf4c13c95d24e71032aea4b81e54a359eba2c6212df5cbb0c2ae00d2687bbc94d917b863917905b862bedd3f27a3eb7dc9239c06315bf7e
+MISC metadata.xml 413 BLAKE2B 4d9da6354fe023f7810981af95446eae8fc46f3e56373d91da0a854b80ab87de47ecbfdf09fe3cdeab92b2a559403b8430e8a64d4d9a88d92b0e449ac57a8545 SHA512 dcc74a03d722ecf2ca276f9159e10c28e79de542ea45c388dc617c5cbec5b4333c872c5b0db9968a0d774eca985f63803d338903d183d116f916a57a085046e0
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index bcd164dad76c..7dfb0c5295f7 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index ae456e03bb66..419b825e03e2 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,7 +1,4 @@
-AUX ipv6toolkit-2.1_p20190919-fno-common.patch 5414 BLAKE2B cf9f97ed1155044211e31f7c0d081d283681de63b5f9f00a910f29f91055675f8af8045db7ec77277a9f5bc518063677c9cd0d1cf7df44606a9b253f48089ed1 SHA512 939b9a113867d8a308c4a3802ca55d6c8e5bc050e5dc50ecf8558b2008bca6e734996ee091db33a16a6efbf14a12a00bc213616f0229fb143259d7b069dfe7dc
-DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9
 DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f
-EBUILD ipv6toolkit-2.1_p20190919.ebuild 1222 BLAKE2B 6f5666e4a94bdcfac16aa92f591c14199fd4b2d007adaded56bbe06b6d0648b2d9cb36e228efdf89283247f88267159735648181436c39dd76ee578e109c7613 SHA512 c31766b0b48b0fd62b459bef37a905722612c6f2ec86ab329f6f0cc56643a01b1cecc48aaf9efec6acba257cda496a87f300478991fbe511b67b86659d1bf8c9
 EBUILD ipv6toolkit-2.1_p20200412.ebuild 1158 BLAKE2B 69d0efa873b40f8a7fc99712e0016430c66e4645cdcba74f59279045f692e5e8e4c06545a364b32e11326949d300dc349bf596ff5e7d22a5e6da4951673da226 SHA512 bd1b16447f98146e93ec9735c01fd6b63232b82fb8eade13ab472d5ecd75a4a9b3a72ce91af0a24b33e5d47fc09539bcdd6ac0ac398bcb515c45b3f99ff4345a
 EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
 MISC metadata.xml 362 BLAKE2B 0e39082835dd919eeef2ac3b1c8d1463758985141abccda815524c78320def3362e1ce4916a6db86bd71e7a81ff93cc35ed10c13d3e914dc00470ce7350ea0ef SHA512 7eb6e79213b0ebaf0071d98c2bc60ad0965fd80269c60e4fbfc776ebb77b50bc9704679ffedbb61f76220c6fe9dcc35e5a047b3d4b951c238dee65834185965b
diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
deleted file mode 100644
index 9d4a3dcffe9e..000000000000
--- a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- a/tools/flow6.c
-+++ b/tools/flow6.c
-@@ -85,8 +85,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/frag6.c
-+++ b/tools/frag6.c
-@@ -94,8 +94,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/icmp6.c
-+++ b/tools/icmp6.c
-@@ -114,8 +114,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/ipv6toolkit.h
-+++ b/tools/ipv6toolkit.h
-@@ -2,3 +2,10 @@
- #define	MAX_CMDLINE_OPT_LEN	40
- #define DATE_STR_LEN		40
- 
-+#include <pcap.h>
-+#include <setjmp.h>
-+
-+extern char errbuf[PCAP_ERRBUF_SIZE];
-+extern struct bpf_program pcap_filter;
-+extern sigjmp_buf env;
-+extern unsigned int canjump;
---- a/tools/jumbo6.c
-+++ b/tools/jumbo6.c
-@@ -80,8 +80,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/na6.c
-+++ b/tools/na6.c
-@@ -61,8 +61,7 @@
- struct in6_addr		*pkt_ipv6addr;    
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- char 				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- unsigned char		buffer[65556];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
---- a/tools/ni6.c
-+++ b/tools/ni6.c
-@@ -90,8 +90,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- char				domain[MAX_DOMAIN_LEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
---- a/tools/ns6.c
-+++ b/tools/ns6.c
-@@ -59,8 +59,7 @@
- const u_char		*pktdata;
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- 
- unsigned char		buffer[65556];
- unsigned char 		*v6buffer, *ptr, *startofprefixes;
---- a/tools/path6.c
-+++ b/tools/path6.c
-@@ -88,8 +88,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/ra6.c
-+++ b/tools/ra6.c
-@@ -64,8 +64,7 @@
- struct in6_addr		*pkt_ipv6addr;    
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char				dev[64];
- char				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- 
- unsigned char		buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD];
---- a/tools/rd6.c
-+++ b/tools/rd6.c
-@@ -106,8 +106,7 @@
- 
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 					dev[64];
- unsigned char			buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char			*v6buffer, *ptr, *startofprefixes;
- char					*pref;
---- a/tools/rs6.c
-+++ b/tools/rs6.c
-@@ -60,8 +60,7 @@
- struct in6_addr			*pkt_ipv6addr;    
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char					dev[64];
- char					all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
- 
- unsigned char			buffer[65556];
---- a/tools/scan6.c
-+++ b/tools/scan6.c
-@@ -153,8 +153,7 @@
- 
- bpf_u_int32				my_netmask;
- bpf_u_int32				my_ip;
--struct bpf_program		pcap_filter;
--char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 					dev[64];
- unsigned char			buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- char					line[LINE_BUFFER_SIZE];
- unsigned char			*v6buffer, *ptr, *startofprefixes;
-@@ -269,10 +268,6 @@
- 						                 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080};
- 
- 
--/* IPv6 Address Resolution */
--sigjmp_buf				env;
--unsigned int			canjump;
--
- int main(int argc, char **argv){
- 	extern char				*optarg;
- 	int						r;
---- a/tools/tcp6.c
-+++ b/tools/tcp6.c
-@@ -116,8 +116,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
---- a/tools/udp6.c
-+++ b/tools/udp6.c
-@@ -99,8 +99,7 @@
- 
- bpf_u_int32			my_netmask;
- bpf_u_int32			my_ip;
--struct bpf_program	pcap_filter;
--char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
-+char 				dev[64];
- unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN];
- unsigned char		*v6buffer, *ptr, *startofprefixes;
- char				*pref;
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
deleted file mode 100644
index bff5e134fff8..000000000000
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
-HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
-SNAPSHOT="20de5f297f73b6a8115d1eac52adfe0b6df5b3ed"
-SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap[ipv6(+)]
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwids
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch
-)
-
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt
-
-src_prepare() {
-	default
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		manuals/ipv6toolkit.conf.5
-}
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
-}
-
-src_install() {
-	dodir /etc
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	#remove the included oui file
-	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
-	#fix the conf file to use the one from sys-apps/hwids
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		"${ED}"/etc/ipv6toolkit.conf
-	dodoc CHANGES.TXT README.TXT
-}
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
index ed8814983e17..64200f3d734e 100644
--- a/net-analyzer/knocker/Manifest
+++ b/net-analyzer/knocker/Manifest
@@ -2,6 +2,9 @@ AUX knocker-0.7.1-fency.patch 5350 BLAKE2B 936b898918d794e3065eec8d867e467246c5b
 AUX knocker-0.7.1-fno-common.patch 6208 BLAKE2B b8a77d7763f8725240aff2c49499fc9a16b52435cd859905540653dc08583b9f37b2172895b73735b35a15924b49d25ecab69dfc538015c38c45576073c3aa9d SHA512 f9f0292e8ee2d1dc91f17899fd911072325fbca80ae3bb0cd5aec7c6d3120f9ebbd35dc40acec34927927822f5685fd90a208c873dae82b65b42d3ff4ad26d38
 AUX knocker-0.7.1-free.patch 607 BLAKE2B c19a36088b6cdce6b9e79555c349871e0aa47a9bcd9285cfa8944a267548e20fdc7df6f27c6dc3d8d123a8350b108325bbe754984b4cc9a05764a31daffc894c SHA512 f1f237747394a2ca6b14105be5461c98e441ecd3c4da0c1475ac6dfa717d2a0b004d3fb702b026b45f5f873c88d3f60b4fd5234dd445fd27346c95bc4c5c5671
 AUX knocker-0.7.1-knocker_user_is_root.patch 221 BLAKE2B 45143bc54b31b1cce735499836682cc006dc2288bd927bf2269713582c3189ebd6ebf468bd019b00b8a31aa47f6f423b0a2c5fbc70719bb663c49ff525f6b6ce SHA512 42b4d4de839e0a606d091909f7bbba0031a6e337fa7b766bb737fd60006afdc87c368cdb642e9bf14ee1d7d0c5bd7b6193006ab0240230f819b67df155f1822d
+AUX knocker-0.8.0-fency.patch 5847 BLAKE2B 29e630a560255f28fc0130639e50b30c5016c721a9fac75e43a863cadf76b4ceb534d212ab2de58c68860320bb80288d042ba7ef5e86e9173d98598d019c500e SHA512 327fa4982d579a4c2dce59605106112868cedb3bb29b2afc1f0fc1e05f1a6a85386b543bd6fdc7c078dbbd521500f685971ae771eecf5e02d9f8b414f63ae1b3
 DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2
+DIST knocker-0.8.0.tar.gz 117380 BLAKE2B bb6b344efc0c7b22266b59430eff3b7982d328b54277085cef9709f9f41b7e6e40b1cc22944b36f927db00cd7f15afc1774be20df504e1f3f4eb2b2b1c293973 SHA512 127fde05f2f331e7a4489c4612852fe841f0981b737be1d871de33355a0b55f2ab50d2c083ef857420b4af81909d5cc8fbe6c89174e141f77e6bf25719b6bf47
 EBUILD knocker-0.7.1-r3.ebuild 608 BLAKE2B 3175166968725797d46f00947f67485e616436527926cd9dc1bbee4a04795c9af92f6cc1389a11d2bc1cdc7cdc39d64dfe62328e4956824510750b48ec2278b5 SHA512 72e82125db8319e9bcf183502a77c36f4f0bee383154e92e256f10d96b1f2d4ad46d8b4dc41e8bc8ec382db97d85eab192c27f6c6eeacd191346916f6d9ca0d8
-MISC metadata.xml 357 BLAKE2B 14daef425c693f2b57dd70d7aea0b0e854305052d7751386339e4a34c47b6ff574cc9cfbce4986bab92e639e51760addf85a3517594621f991ba4c148d416ed2 SHA512 e74b8f089a05b739cd6e7864802a5e6759b416d41f122e45ea529feadd69ecd04aff2ed695687710eba64dc24087f4fd364dbda33b59f9983aa453c3d699ba69
+EBUILD knocker-0.8.0.ebuild 560 BLAKE2B 7b5a04f022e206d50a1e6ee83c66e9386d54b91fa822ff03d87928373059a5d17f7141e7be0f0488d54dafb92a237495776da65596d175d96cf2ca29441af66f SHA512 62cc1204e0bfe4298d73a17060803afab0c87b568f1b812b394d559378a3f8549017da7220b3a4c9a2bfb3f5e3c3316528549b54585b093e9723d57d8da821f3
+MISC metadata.xml 411 BLAKE2B 29b26c42040690bf3cc36a84cc37bdaa8de46d819bd0e020ce6ebb73434773286a0033c7e30a8c9d1a8d92bd22fb04cc34ca521dc91b6894304faed4b268a324 SHA512 0cde314018cea789b41958eae169290fa3c50662df7c1c72593c4fe6f40f78d1cb27d6e539d4c58dd74ff13b6b51874a5ad767aff8f69f73e23af3f36dd7f2d5
diff --git a/net-analyzer/knocker/files/knocker-0.8.0-fency.patch b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch
new file mode 100644
index 000000000000..a5ff93fb07bb
--- /dev/null
+++ b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch
@@ -0,0 +1,151 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -23,7 +23,7 @@
+    .conf in the user ~/.knocker subdirectory.
+  
+ 13 May 2002
+-  - --no-fency (-nf for short) option added. This switch tells knocker to show
++  - --no-fancy (-nf for short) option added. This switch tells knocker to show
+     the output in a "polite" way. All the lines and stuffs shown in the default
+ 	mode, will not be displayed using this option.
+   
+--- a/src/knocker_args.c
++++ b/src/knocker_args.c
+@@ -82,7 +82,7 @@
+   fprintf (stdout, "Extra options:\n");
+   fprintf (stdout, "      %s,  %s             quiet mode (no console output, logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT);
+   fprintf (stdout, "      %s, %s <logfile> log scan results to the specified file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT);
+-  fprintf (stdout, "      %s, %s          disable fency output\n", NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT);
++  fprintf (stdout, "      %s, %s          disable fancy output\n", NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT);
+   fprintf (stdout, "      %s, %s         disable colored output\n", NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT);
+   fprintf (stdout, "\n");
+   fprintf (stdout, "      %s              let you configure %s\n", CONFIGURE_LONG_OPT, PACKAGE);
+@@ -111,7 +111,7 @@
+   args->logfile = logfile;
+   args->quiet = quiet;
+   args->colors = colors;
+-  args->fency = TRUE;           /* true by default */
++  args->fancy = TRUE;           /* true by default */
+ 
+   return 0;
+ }
+@@ -189,10 +189,10 @@
+             }
+           return (0);           /* we should have all arguments here */
+         }
+-      else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FENCY_LONG_OPT)))
++      else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FANCY_LONG_OPT)))
+         {
+-          /* Disable fency output */
+-          args->fency = FALSE;
++          /* Disable fancy output */
++          args->fancy = FALSE;
+         }
+       else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT)))
+         {
+--- a/src/knocker_main.c
++++ b/src/knocker_main.c
+@@ -75,7 +75,7 @@
+ 
+   knocker_core_init_portscan_data (&pscan_data);
+ 
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     knocker_term_clear ();
+ 
+   knocker_output_open ();
+--- a/src/knocker_args.h
++++ b/src/knocker_args.h
+@@ -53,9 +53,9 @@
+ #define QUIET_MODE_SHORT_OPT "-q"
+ #define QUIET_MODE_LONG_OPT "--quiet"
+ 
+-  /* option to disable fency cool out put */
+-#define NO_FENCY_SHORT_OPT "-nf"
+-#define NO_FENCY_LONG_OPT  "--no-fency"
++  /* option to disable fancy cool out put */
++#define NO_FANCY_SHORT_OPT "-nf"
++#define NO_FANCY_LONG_OPT  "--no-fancy"
+ 
+   /* option to disable colored out put */
+ #define NO_COLORS_SHORT_OPT "-nc"
+@@ -88,7 +88,7 @@
+   int logfile;     /* log to file TRUE,FALSE */
+   int quiet;       /* quiet mode TRUE,FALSE  */
+   int colors;      /* no colors, TRUE,FALSE  */
+-  int fency;       /* fency output, TRUE, FALSE */
++  int fancy;       /* fancy output, TRUE, FALSE */
+   int win32_frontend;
+ } knocker_args_t;
+ 
+--- a/doc/knocker.1
++++ b/dos/knocker.1
+@@ -38,8 +38,8 @@
+ \fB\-lf\fr, \fB\-\-logfile <logfile>\fR
+ log the results to a specified file.
+ .TP
+-\fB\-nf\fr, \fB\-\-no-fency\fR
+-disable fency output
++\fB\-nf\fr, \fB\-\-no-fancy\fR
++disable fancy output
+ .TP
+ \fB\-nc\fr, \fB\-\-no-colors\fR
+ disable colored output
+diff --git a/src/knocker_output.c b/src/knocker_output.c
+index 4714c24..613b608 100755
+--- a/src/knocker_output.c
++++ b/src/knocker_output.c
+@@ -46,7 +46,7 @@ int knocker_output_open (void)
+   time (&timenow);
+   knocker_time = ctime (&timenow);
+ 
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+   {
+     knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+ 
+@@ -98,7 +98,7 @@ int knocker_output_open (void)
+ 
+ void knocker_output_host_info (const char *hostname_str, const char *hostip_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+@@ -124,7 +124,7 @@ void knocker_output_host_info (const char *hostname_str, const char *hostip_str)
+ 
+ void knocker_output_resolve_error (char *hostname_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+@@ -144,7 +144,7 @@ void knocker_output_resolve_error (char *hostname_str)
+ 
+ void knocker_output_ports_info (int sp, int ep)
+ {
+-  if (!knocker_args.fency)
++  if (!knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+       return;
+@@ -166,7 +166,7 @@ void knocker_output_ports_info (int sp, int ep)
+ 
+ void knocker_output_open_port (int port, char *service_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+@@ -192,7 +192,7 @@ void knocker_output_open_port (int port, char *service_str)
+ 
+ void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps,  int open_ps, char *secs)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ",
diff --git a/net-analyzer/knocker/knocker-0.8.0.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild
new file mode 100644
index 000000000000..5d60ddc49dcd
--- /dev/null
+++ b/net-analyzer/knocker/knocker-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Knocker is an easy to use security port scanner written in C"
+HOMEPAGE="https://knocker.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-fency.patch
+	"${FILESDIR}"/${PN}-0.7.1-knocker_user_is_root.patch
+)
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
index 490337f25c7d..3fb6f84c7c25 100644
--- a/net-analyzer/knocker/metadata.xml
+++ b/net-analyzer/knocker/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">gabgio/knocker</remote-id>
 		<remote-id type="sourceforge">knocker</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index 41988854dc4b..ce03a8cd927a 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,5 +1,6 @@
+AUX labrea-2.5-libdir.patch 885 BLAKE2B 4f8b255706f053b510b5ef5ae773e2bf6d54558a6cb85d23a89ee4e433f1c38e0a22bd384c2642f3f518be4771fb0d05f00961250cb1c7c2fa0d07e40c0e81b9 SHA512 b0795d81d42e816c41c8f048e0a810d06d9b5ce13739fca55c62b75e03b7047cdf0bfa38e36fce18a622014337ccffc295ffbc7b9cda2339d304776b340e235b
 AUX labrea-2.5-pcap_open.patch 1115 BLAKE2B ba279ea65a905df62a9886ba5db86fb7696d88bfee1309f01ab8b0515809ec88706325e7486bcc3d8b7b6c32d29a1b0270420eaacfe6c825a1e96f65f8780c78 SHA512 336d06bc3db06d19b48a1c5c6b5bc9da31aef6d0103de3c711563e6cb74c650480bf2bfb4606686bc0030140ced2ffd54ad36f24a9bce06bad43d94c33906335
 AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce12551fd8009a51b32af01dfca64202f7ecd22f13935ae84de3ee7ac3949ffafd060cba69503d19726aea51524cccc4984e SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
-EBUILD labrea-2.5_p1.ebuild 901 BLAKE2B 70891ed7bf83635f59a2f9aa715ea1509e6cdd21e698245d7c454c55d8ad8c99dcdb93a99ed27b2bd1df9f1863e1cef3c833a716b9073ebcfa2a1bc9ecb8f4a3 SHA512 f679291c0d3bbe7ebe3c4e1d1fd0c64fca5be0c1c709fa9a48babdc3c2a9fe496ea5051cd7fbff58c9b6a320d13b62b988014da51c7e77005177ea57dd25fae1
+EBUILD labrea-2.5_p1.ebuild 971 BLAKE2B 71afac5d3e31922c557a55fbf3eff929c22e6648d3a7acd4f36f23cccc4766c03695443680c5360a4d834747aaa41ee1b9c454fa21f9b4ce2d65bdfcaa5793b3 SHA512 d3256843a0e506e63fafd6ac7a89982a2c57174e9d057664d336cd6f2fb13d8a8c8fb2f52e6b2ae3fcadeb3b9fc76e780a3f7c8c944113fe9155365c677c358f
 MISC metadata.xml 356 BLAKE2B c78b737ba6e150b7abd18c22da130c805177c64bcb197c2d7909b5a74a35484d87a5a45b4b968cbb0aea0bdc3af6499d9f8376f39dab4df33bdcf3cf82f28e2c SHA512 1b4738687beee35bb3fd628d1d5c1fa9e16b7d938f21644343b23a6c7aaa5b6e760c5342cf88485265ae11f6d00c073e8564b37fe1dde4543323de069f8115a3
diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
new file mode 100644
index 000000000000..039745205c3c
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap,
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval/include"
+ 	if test -f $withval/lib/libwpcap.a; then
+-	   PCAPLIB="-L$withval/lib -lwpcap"
++	   PCAPLIB="-L$withval/${libdir} -lwpcap"
+ 	else
+-	   PCAPLIB="-L$withval/lib -lpcap"
++	   PCAPLIB="-L$withval/${libdir} -lpcap"
+         fi
+      else
+         AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap,
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAPINC="-I${prefix}/include"
+      if test -f ${prefix}/lib/libwpcap.a; then
+-	PCAPLIB="-L${prefix}/lib -lwpcap"
++	PCAPLIB="-L${libdir} -lwpcap"
+      else
+-        PCAPLIB="-L${prefix}/lib -lpcap"
++        PCAPLIB="-L${libdir} -lpcap"
+      fi
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAPINC="-I/usr/include/pcap"
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index 5fc9881601f9..a47abfc9e1a0 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="'Sticky' Honeypot and IDS"
 HOMEPAGE="http://labrea.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
+S="${WORKDIR}/${P/_p/-stable-}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,15 +18,15 @@ DEPEND="
 	net-libs/libpcap
 	>=dev-libs/libdnet-1.7
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS )
+
 PATCHES=(
 	"${FILESDIR}"/${P/_p/-stable-}-incdir.patch
 	"${FILESDIR}"/${P/_p*}-pcap_open.patch
+	"${FILESDIR}"/${PN}-2.5-libdir.patch
 )
-S=${WORKDIR}/${P/_p/-stable-}
 
 src_prepare() {
 	default
@@ -32,6 +34,8 @@ src_prepare() {
 	# autotools will overwrite this with the generic version
 	mv INSTALL README.first || die
 
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index b152e05a945d..eae368452f5e 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -1,12 +1,4 @@
 AUX lft-3.91-strip.patch 330 BLAKE2B 971a6ab45e125bd9b8848ab52426d0747d8f0d0938ea70b23c6be5322986837754b82dfaa877c5d305107927b217490042430dd30116eb62c97cb10d8abad680 SHA512 9c4e8a3d1c9f943568d9732651b7154fce8b3acb1d451bd0e4b61a28a7766ed2e03a0d55d679e2a40d64905c7a4d435b37c072cc1aaa9946b126a68910e2952e
-DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1
-DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d
-DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483
-DIST lft-3.9.tar.gz 377008 BLAKE2B ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8 SHA512 9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806
 DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7
-EBUILD lft-3.77.ebuild 493 BLAKE2B 49e6ddad7656e1c01304a464eb4c092f1f2e7e423732397645cbc3ed1ce2ada675f59d7668368d6f0e067e39ee875823f4f2f979c34000ddacdfae57449b5e36 SHA512 7d921ace43680f2ead6e1e9a1cd45d8e3a3a505b2b9293ad2940dbe117a3339e1a80ff04b15831459b80a214beaf27efaac57c9696642d4a58933516756c7164
-EBUILD lft-3.79.ebuild 496 BLAKE2B a473d61c76ee7692a243e5fc8bfe20300879aec259336d161ea64c0f62c7ad6b266a3e00e6aa1b84d74e838f3f060265f753c720edbd1f38c6401971f50b68b8 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89
-EBUILD lft-3.80.ebuild 518 BLAKE2B aa43152e115169c697369770cc9ab04deecafc9e8e35bd7ba59b322fd1fe02349c539acfe7a2ad45ce237de954b65739598cfb9455b2ff5fe60c2b900c150f19 SHA512 1ac97a059e628e16ed8f1bdf2b87a66b8d7d377298ea2cdf502486599c8f332b813629d6fc5eabf90a34f0c47672dd9f36d590c28199fe7b25146b20f4e528e6
-EBUILD lft-3.90.ebuild 606 BLAKE2B d55eb2ca5b273475c41bb145a9a3e097fb81cc542345114f4a73f82d9e3a4a4beec902b045a104ea412a5707c6326e68b2e9a4d9b177eea68d529c4adcfe9153 SHA512 d3e98b311159c5ac59548bc142aeb560dc245a55f7de06e2875d44529c1a4b2d8997313bab3cd9a9c4b927cf0e3530fdaf62a3cb191afd2614bca91f473b5f15
-EBUILD lft-3.91-r1.ebuild 586 BLAKE2B a8fc1b01209dd4c61683fb761f4f7825dedba73850cde99cc68852ff08c1c6ee1fa5626a56b9d9fe254f15d62b34e413e9716cbb144fdc51e0bcdf2c9d46b2ac SHA512 8910fecf283e3e6761d58825962d5d634644eada556052874bc43d28533cb0fc283c076931b772bc2efe279b5cb777fe9919c665a1a0dc3813d33160e6c98185
+EBUILD lft-3.91-r1.ebuild 583 BLAKE2B 68be385da2c567bece751cbbd80d300bfad295527c3c0f3e833f0fb37035e370d5d27b4a049b716e9cccbda2cb83049d9c75f66ad66302437cbe66b3cdc756c7 SHA512 7e788a718c2a76195a130293096bdddafee336c6895272d500c6d99b9233eba26d5f5dc7c4e7ff8b39a0f51898b6d2e51540aa99bebe7bec51390a5021a19190
 MISC metadata.xml 2868 BLAKE2B 8ae5df11623eb04065537a289d1565a1ad766d93ebaff9b4fc8e326991331edfd7efa712387633a0edc5436445a1f3748425b7d93191ffb61a36c944cfd32b99 SHA512 13fa9fcdcc8c7e75a9a195d9463fc0456a81cc124302ab06f4caba6f20af0a1551ca76c7a6dc77a2551f0a02fbf29fd1087e9b14d674c1f9e661e52fc298b64a
diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild
deleted file mode 100644
index b79c445424c0..000000000000
--- a/net-analyzer/lft/lft-3.77.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild
deleted file mode 100644
index 58a145bd7256..000000000000
--- a/net-analyzer/lft/lft-3.79.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild
deleted file mode 100644
index bc7acaa2b658..000000000000
--- a/net-analyzer/lft/lft-3.80.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P/0}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/0}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	default
-	sed -i Makefile.in -e 's:strip:true:g' || die
-}
diff --git a/net-analyzer/lft/lft-3.90.ebuild b/net-analyzer/lft/lft-3.90.ebuild
deleted file mode 100644
index d874cf1a0c8c..000000000000
--- a/net-analyzer/lft/lft-3.90.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
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P/0}.tar.gz"
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/0}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	sed -i -e 's:strip:true:g' Makefile.in || die
-	sed -i \
-		-e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \
-		configure config/acconfig.h.in || die
-	default
-}
diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild
index 576eb0a3cc0b..3e57965afb2b 100644
--- a/net-analyzer/lft/lft-3.91-r1.ebuild
+++ b/net-analyzer/lft/lft-3.91-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
@@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz"
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 2d738e04ad98..2489cd23e58f 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -4,4 +4,4 @@ DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8
 EBUILD linkchecker-10.0.0_pre20200729.ebuild 1502 BLAKE2B a885276d7d27d59dc63038c70b3c68feff07af40a662deaf267794acabced3a00fed6d43e946046a5afadb92d955ac168f26564baef3a56312d6a6e88c891600 SHA512 335f87d67ae273f14fe27e21d6191b144cc0ac6e6c547fdb0857bb1d56a970d091b648448d5d8b694f427b6cbc73878b323d933bac98ff8a545fb4c0a7e9e76f
 EBUILD linkchecker-10.0.1.ebuild 1346 BLAKE2B 5b23ef87375ae6ca26d8c33ceb508cf4bb9174fff1c4cef48502f0d35a89e4e31458f077dbfca8e1e14a95165d59f35d9dd147af15537a85f863fdd4581dc7dd SHA512 639676c3b14cb96118088b5dd76df7e9a153afd0c7677b7388e53a6a507eb581a3ab78ad6b3d962c94dd3dddf1b1ed67d17880303fe846c05cbd54b69e748b84
 EBUILD linkchecker-9999.ebuild 1327 BLAKE2B a6b772c6a50d6f526b26619f989fbfad4112af32f8016a071001bf41f6b9972f1c3738e51a36b7cfd96653b203cd7f686d8085c490fb44daf286282077477c66 SHA512 12fb7252b32e5c883815021add488864ee8670f74b773a60eb9f8869373899fba754be7bd3d60929f65603219f9543e4a446b3d228c0e549c99340718a4b1c98
-MISC metadata.xml 544 BLAKE2B 4ab01a5626c5397e7b550b717902525a6e3b5b8e3a7b1c916a48abc7181a1c1486a53ecb9e68e06ece5bcf5bcdf67167b0ab60186291033e84d2ed9237bfa35c SHA512 c0f91900f87cc48adc5628264a1948400da60d444c4c5ca251d4edc23a9042616fd90d60e4493e5e458c47991aeace55725bd181c82d6188be398cda2347a64c
+MISC metadata.xml 574 BLAKE2B cff79651f71473f10e72b42dffd79e68b5b121f584993e05e4d7af0c0f2339121b8179b697e937df26d70f93b2774452546284eb8640454cb182e1006e3c6447 SHA512 5e29131b0c8bc634a107658fa7bd36201af4877a0ac8ee9288820eefb17b746b4b32a55c3bb08b11efc93f9e3fdfd37e4b22d242f96068c29388ea0ed0f7254a
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 34057dbac2ab..3a5339d1f55f 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 70c4d5f896ab..3ec734e9efc2 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,6 +1,4 @@
 AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77
-DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
 DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27
-EBUILD masscan-1.0.5.ebuild 821 BLAKE2B b2db0fe2bcfd8eef6423bd961f451d798e4d5d7420d554b099118a81fbd00ef56cca94ca9f212acae65d58b1292064ce5bd4ffb86ff3371af48c091a368c932b SHA512 4b131f6e8838c2f0b2a541ac98b3b5e6e5eaa5638fae8b0b4e56d75707973add348bf81bc60365f1bf0d5fd05f7f5d1121442c9978f8eb9743245e217d252a4a
 EBUILD masscan-1.3.2.ebuild 822 BLAKE2B a31741d1aecbf883126c3a6b748c69f93aad65b24935e065fcb71a6752c63d50a1f5d0022bf7a60fa383d772dd354494e280146d1d2de6ebc8f928f8ae6b1847 SHA512 9e6bbed3d1cf2dfb57cb482d182e75f0936d942fb949a5e2eecb5f960b46480efead013433ac8d824969ea40271b1f06a49e0f4ec114998cb33b35322c72e8d6
 MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild
deleted file mode 100644
index 96cf9afa0476..000000000000
--- a/net-analyzer/masscan/masscan-1.0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-		-e '/^GITVER :=/s!= .(.*!=!g' \
-		-e '/^SYS/s|gcc|$(CC)|g' \
-		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
-		-e '/^CC =/d' \
-		Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/masscan
-
-	insinto /etc/masscan
-	doins data/exclude.conf
-	doins "${FILESDIR}"/masscan.conf
-
-	dodoc doc/bot.html *.md
-
-	doman doc/masscan.8
-}
diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml
index 58f5863c9fea..9d3f16ec1616 100644
--- a/net-analyzer/metadata.xml
+++ b/net-analyzer/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria net-analyzer zawiera programy do analizowania sieci.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 8221747d0aa1..8a9e84ff1eae 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -3,4 +3,4 @@ DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab
 DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
 EBUILD monitoring-plugins-2.2-r4.ebuild 3026 BLAKE2B 5dcedf383de5985195d90e1d01194dd3414bc05f54b98a058d45bee42dfbcb3238b66d079d968e3912ef203a636182b11ff21c5328fd80359d56ccac965908ce SHA512 664b07c16bc3aae7b76202b4e446633c0df1832306bc315fffcad2f830a7b001a6829d9457b9d9cccf3230e9f49921229f4167b6ae3a407e23052468d4b2445f
 EBUILD monitoring-plugins-2.3.ebuild 3114 BLAKE2B 5d883fe08214a0bc3b41287b9c78f362d2e82c0938c9aff4c468e7eb78b237ee99b0bacd9ff99433c823bc7e964015984a0520267bc43c175715aa5d7583a26f SHA512 be04871537b6ded83dec3deae1dbd21381debdcdc35f9112ca25d9d58201a1443b8cbbce3851fd134d4c01e8347cd0f33a0fc76692724e0e546cf57c7981cb89
-MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
+MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 654cb6c8c64d..a19ea004dcc3 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
       <email>hydrapolic@gmail.com</email>
       <name>Tomas Mozes</name>
   </maintainer>
@@ -9,7 +9,7 @@
       <email>mjo@gentoo.org</email>
       <name>Michael Orlitzky</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
       <email>proxy-maint@gentoo.org</email>
       <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 8aada94d5f24..18227785eb19 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -2,4 +2,4 @@ AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f3842583
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
 EBUILD mtr-0.94.ebuild 1426 BLAKE2B 5e54c4c3017cdc6570c8a5e0b8959b8cf2d34d4599b45df2d26f3d47af432f0f5ad4b00dede2d54bc743a8750a4cd190dc14d2635d2c1599f1e809a69156a7e9 SHA512 79481d57db2fc582d3f730e58dd7101618d7f0f095d98ab1d486a0cee344347688b062a4e8eebea7b2d2128772a525e62971f8a0448aa162a75969e0fc80ce0d
 EBUILD mtr-9999.ebuild 1282 BLAKE2B a9451a299afe9c557b3400d19f39b33dd6cb4cdcdf60fa58edb551e3736d8af261a76516caa9b39561d57c36c74d1eb26fa63c3ca96908c97310adf118a2b173 SHA512 e07ee53e8e2aacdf43cc8fd0d5e1adb773fd4d3c5d47cea982f8104c81d29b7040335d10e201ddda106b8a330381d38d76ea0190d2c56d617d1709b6e3d83319
-MISC metadata.xml 636 BLAKE2B 6ac1437dc7b42ef712ad3a851f6dc8df59f7a354e99db5bf564c91f90786a9eb3e90d2d131592047e5499eea5e5238150525e61ddad1a5ca72c594edc7c8f9f8 SHA512 85a0425e6ac71a544d6a8a0cbf270e77afd6dd41ed226650b122977b6288dee8d894c30d6c31425dc15d2b58d19d87050bf28320553a1993dc4f28184fe61aa9
+MISC metadata.xml 636 BLAKE2B b553bae226e80a85b8cb7c50d3017944e1b86a0085bef3b670db4628b8a03505e3e61a85ef3bb31c25e5585444266147b07a2598bd37bb31573909c17579d61c SHA512 6e5bf3f6f49a341d51de9e3988b9750fa2db80ad4236e845b97f51e10eb962fec6e08a4fee267f14b6783a3e6570ccd083e1bcce058876929bfac9173e69c007
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 88e5dd2b473f..bd0a7b37e402 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name='ipinfo'>Disable support for IP address lookups</flag>
-		<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
+		<flag name="ipinfo">Disable support for IP address lookups</flag>
+		<flag name="jansson">Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">traviscross/mtr</remote-id>
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 1d1e29e95efe..9585f4174cfe 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,3 +1,3 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
 EBUILD nagios-check_rbl-1.4.1.ebuild 1483 BLAKE2B 225aa6cbc698bdc7e6346195e896277dcd2f71730d28fdc4274b30573c41bbb7ec644d8f5804765fd93b71cd2f8e1b38643314498a761249b655648ad1587c26 SHA512 da8f812cec89631714719ad52fa7b065915b3e02568001e2bca277ee9a4556d74f8c6c1a6888a2ec13bc3d55cad9cce98af850e8cfddec1bd508da92047e2380
-MISC metadata.xml 468 BLAKE2B 31fa2c6ba1b1c2860f89c7f1442fb0388e7285183f28e9656576e8c13bbb05298a9bd13dc78ca9bcc1ce47401eb1c83d56786c1f37481e351d1d0e9b32713986 SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05
+MISC metadata.xml 468 BLAKE2B cd550f92e844ac739ba33635a2ca25b41f6b6dcf474b61d5eeea01316efab940df7658eb341b55353a0ffef3c98d8a309b5bf0d3cf0f38d19f83dfa472b76b85 SHA512 1d768e48e62cdf788db6c7444b491bf315344350d5a66a22a73387972cad68d11a233d273512610b7c514da9189e8827ce10dbe9322c7beb5aa8a393638987d6
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index 366e3f343c3c..3892f9c9031f 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 326d06dc1e0d..7929e7d29310 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -4,4 +4,4 @@ DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B b808540623055f3830a38ed79ffbe30fc8a24851624bd6bbd902df293683e6fac78291b6f59529eaab533ff041fe8d89ddd60c3be08d36210aebd823b2173098 SHA512 4733058532beef20606e4f8bf833ce6c4e0932ca69fdef01f25e45f1533004e720b5282045b32582543d52c020d043f59989a954afbea0697a1868951c766936
 EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d
-MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
+MISC metadata.xml 1466 BLAKE2B 07156e2e5f1c26f21a73f932a67896466982941457ee6606519debd1f8f46f3d19982a4a4673fd8aece52eeecc2d00925616097ae08b93eee1220aa00c12499e SHA512 eda3e037295b70633605411dd4400a1b0cf98c528394a79f2f4b999dd3c911a3a8b04be5f3aac85e59242ef29685d1f57b73d60dd65751efb23a489e56a4f5d6
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index 2837e2b7ed5c..f5fe80cb5437 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index a3931f1dd257..8c225a01e149 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -2,4 +2,4 @@ DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d37636
 DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
 EBUILD nagios-plugin-check_raid-4.0.10.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
 EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4
-MISC metadata.xml 1134 BLAKE2B 10f73b789386776485af1240eaaa83aec0555ecb04ea91ab5d7ff26ae19be485935ed7460187f4e9b7e9eac64b848f555b92cdf00267696b8a224b2b71dbf0f3 SHA512 9cad7c98ce113e9cb7802e3d55514e8f9548378aa9cbd78e8c8513313eba1f0f1b3f3e25a596798295425edac638fedcae68459ac89767ac2254f5bdffe4ceba
+MISC metadata.xml 1134 BLAKE2B aca2fafdfea4d29d99185b09c4e701d6aacd8871d65ef50ea9b9eb4cc9c1c76c9bd70703307bfe1926816bb77319dcc28cf899333fe75a892e32e24467dded20 SHA512 d0bacddb2750f5da8a274d7d44669cfa83152419499fbf89f7abf1505d1f54249531967ec5cb2f95233fea3bf13dd61e276e9dfc4457ce290e86c6f9f6e07681
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
index 512cb3611534..eb65a158e80b 100644
--- a/net-analyzer/nagios-plugin-check_raid/metadata.xml
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -14,14 +14,14 @@
 		<remote-id type="github">glensc/nagios-plugin-check_raid</remote-id>
 	</upstream>
 	<use>
-		<flag name='3ware'>Support 3ware RAID controllers</flag>
-		<flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag>
-		<flag name='dmraid'>Support Device-Mapper RAID</flag>
-		<flag name='hpa'>Support HP Array controllers</flag>
-		<flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag>
-		<flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag>
-		<flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag>
-		<flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag>
-		<flag name='mpt'>Support LSI MPT Fusion controllers</flag>
+		<flag name="3ware">Support 3ware RAID controllers</flag>
+		<flag name="aacraid">Support Adaptec AAC-RAID controllers</flag>
+		<flag name="dmraid">Support Device-Mapper RAID</flag>
+		<flag name="hpa">Support HP Array controllers</flag>
+		<flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag>
+		<flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag>
+		<flag name="megaraid-scsi">Support LSI MegaRAID SCSI controllers</flag>
+		<flag name="mpt-sas2">Support LSI SAS-2 controllers</flag>
+		<flag name="mpt">Support LSI MPT Fusion controllers</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/nbwmon/Manifest b/net-analyzer/nbwmon/Manifest
index 715a07dafa1a..cbcbc44affdc 100644
--- a/net-analyzer/nbwmon/Manifest
+++ b/net-analyzer/nbwmon/Manifest
@@ -1,4 +1,4 @@
 AUX nbwmon-0.5.2-tinfo.patch 255 BLAKE2B a3a40d76839dd251e40c675dec838956fd6138b2aab3628be50b6d02bd73f8df368c8935f6a646487053732c162eb32da0d32b9cd88ca546f5bd76a063ff2505 SHA512 61db99488e577f202f88a724891f194998c416aa924f8d8a0874925bbda0ca360f606b1adfe4da2c3b0af955791ff3a83a4e21ddf3accdc452c5caf4e666c9a4
 DIST nbwmon-0.5.2.tar.gz 5807 BLAKE2B 09d4a195de209595dac04a53c2ca06874634515f816f8fc6c2e954b9e6bd55bd06745152e537b997fcc2bfdece987f1a0ec04785fe2205bf4102115a060c6ecd SHA512 11502015b8a04d8a65c2f06d9e921c193c2e4968dbbd781791c30f35a2cf1135bbf784280b9070670be2b58c4355bf7bdf631d5932ec3a01637db803a4c88bf4
-EBUILD nbwmon-0.5.2.ebuild 619 BLAKE2B 0412c0ceafe41a15e9ddeec14c4b781f040f41648ad34dfd2dbe5f8efe55ebb40a638af6ba336426ffb820dafa81a22aa824cf587c932db0bace51e05a49bc86 SHA512 34c42aa051ab388941c3840be87f599c55d4dafa98826cbdd1367f0a6142434d73aa93768a1cbd1df25170d05a5f0532f7d1f1011c4c338a224a6053828d4a2f
+EBUILD nbwmon-0.5.2.ebuild 587 BLAKE2B 4de04eba1c9e4aa27da5bf442e57eae51b4a50524462d9968b2d12691fe3fd541a72ef49f61c1ebf67a73737c496fb84617d6af858b87e53cda2f7bbac83907f SHA512 fb2beb7347962aab45b5fc6319793f6ff12c3d6c1bd544cb57f966987b2422758bc38b6127c633521b7b3062cbf13d0734c84d1be5b68fbc48396af015e6a9ed
 MISC metadata.xml 359 BLAKE2B 572d49dc74dab409831a8fa9d5a93e2bb8de61aafc8bf07380dd0fe5861567ce686db4297868102f4d243a92c2cebc7bdb2d4e19a0d6c39e973c4844be8a19ac SHA512 9f6270f390dd2649e7aae19239e590eb9e50ac34db36537de76cb2d01adbcc2afc0ad2983f8dcd0ca5d21d289c1b9e29e85f4d34f80fa625c57ee67833d82bed
diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
index f2c7742f396c..613256373c42 100644
--- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
+++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses bandwidth monitor"
-HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon"
+HOMEPAGE="https://github.com/causes-/nbwmon"
 SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="
-	sys-libs/ncurses
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch
+	default
 	tc-export CC PKG_CONFIG
 }
 
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index d2ddbbecadcf..3e7d33c4b90e 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee
 DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
-EBUILD netcat-110-r9.ebuild 1612 BLAKE2B 8cdcf8bd576edd3587c959ddb1278be99b6925abc4fa23e3de527dd8ffd6b46aa4b709e89fcea9957704557e13824d6414054ac1bf50a150f55c86a373948f4d SHA512 777acc5d9a681eccf49e2d6c109df9b5d63d03436abf834dfc0d6072a2a51b716bc5db0dacebde1976b6da9900f5452cbf0b11941495df10f03cd07be125606e
-EBUILD netcat-110.20180111.ebuild 1261 BLAKE2B 71eb1b57311795dec1a37e7d3804587534860f7da5408507cd88296cc2b3488dd9543a7693421734d6f5aafc0e18722d245528fcc1ace0d5e6176ae7f3c57912 SHA512 92f7ade32cc5111109acd0374a80dea4ddee1aa65112c7ed6fe340f97e3dba23b91e8f241db62c546683ac4afdb9c8a63dea9b798ad0217551c03014537b22cd
+EBUILD netcat-110-r9.ebuild 1660 BLAKE2B c586d3452b9198abf0b9bac20c57043c24f8d4f047413a299d05a78a64774ec547b602fe361913c523bfbf4ad1c774adb8e53d6a5aeb4691649b15873e0c3b60 SHA512 30d2b453a73abcca44b89af888be7ce20f3e9de604d8a397863fdc86944b19506dba652100c6d8d70918b0f5bdca2afdf1a7ddf7a4eb882c96454293cb51df6a
+EBUILD netcat-110.20180111-r1.ebuild 1305 BLAKE2B f5ec48c7a74e96aa8bfa573c36ef8005f24e372bee6d99a4ffbca1bee1cb5015537de4f0684aee3da455c27213e94221926d0b5bf6e27b29dea71faacda6205c SHA512 c4cc71297385a9ce34fac4f4529570a49fa16cd30150e282c26ce3920de9a3a4e85b63afcd78124f44566ed7af4386124febd47344a6283a4a7ec7150f58b441
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 78f65ab4a9e0..2653de68f200 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 PATCH_VER="1.0"
 MY_P=nc${PV}
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
+DESCRIPTION="The network swiss army knife"
+HOMEPAGE="https://nc110.sourceforge.io"
 SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
 	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+"
+S="${WORKDIR}"
 
 LICENSE="netcat"
 SLOT="0"
@@ -20,26 +22,46 @@ IUSE="crypt ipv6 static"
 
 LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
 
 src_prepare() {
-	epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
+	default
+
+	eapply "${WORKDIR}"/nc-v6-20000918.patch
+
 	sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
-	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c
+	# bug 34250
+	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die
+	fi
 }
 
 src_compile() {
 	export XLIBS=""
 	export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE"
-	use ipv6 && XFLAGS="${XFLAGS} -DINET6"
-	use static && export STATIC="-static"
-	use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
-	[[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
+
+	if use ipv6 ; then
+		XFLAGS+=" -DINET6"
+	fi
+
+	if use static ; then
+		export STATIC="-static"
+	fi
+
+	if use crypt ; then
+		XFLAGS+=" -DAESCRYPT"
+		XLIBS+=" -lmix"
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		XLIBS+=" -lnsl -lsocket"
+	fi
+
 	emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
 }
 
diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
new file mode 100644
index 000000000000..5127d1c620fd
--- /dev/null
+++ b/net-analyzer/netcat/netcat-110.20180111-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 flag-o-matic
+
+MY_P="nc${PV}"
+DESCRIPTION="The network swiss army knife"
+HOMEPAGE="https://nc110.sourceforge.io"
+SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
+
+LICENSE="netcat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ipv6 static"
+
+S="${WORKDIR}/nc110"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/#define HAVE_BIND/s:#define:#undef:' \
+		-e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
+		netcat.c || die
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die
+	fi
+}
+
+src_configure() {
+	if ! use ipv6; then
+		sed -i '/#define INET6/d' generic.h || die
+	fi
+	append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
+}
+
+src_compile() {
+	local xlibs
+	[[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket"
+	emake \
+		LD="$(tc-getCC) ${LDFLAGS}" \
+		DFLAGS="${CPPFLAGS}" \
+		XFLAGS="${CFLAGS}" \
+		STATIC=$(usex static '-static' '') \
+		XLIBS="${xlibs}" \
+		nc
+}
+
+src_install() {
+	dobin nc
+	dodoc README* netcat.blurb
+	doman nc.1
+	docinto scripts
+	dodoc scripts/*
+}
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
deleted file mode 100644
index fe1f70df7679..000000000000
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_P="nc${PV}"
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
-
-LICENSE="netcat"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
-IUSE="ipv6 static"
-
-S=${WORKDIR}/nc110
-
-src_prepare() {
-	sed -i \
-		-e '/#define HAVE_BIND/s:#define:#undef:' \
-		-e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
-		netcat.c || die
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c
-}
-
-src_configure() {
-	use ipv6 || sed -i '/#define INET6/d' generic.h
-	append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
-}
-
-src_compile() {
-	local xlibs
-	[[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket"
-	emake \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		DFLAGS="${CPPFLAGS}" \
-		XFLAGS="${CFLAGS}" \
-		STATIC=$(usex static '-static' '') \
-		XLIBS="${xlibs}" \
-		nc
-}
-
-src_install() {
-	dobin nc
-	dodoc README* netcat.blurb
-	doman nc.1
-	docinto scripts
-	dodoc scripts/*
-}
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index f3775c6781a7..9e80f3936569 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,5 +1,3 @@
-DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908
 DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f
-EBUILD nethogs-0.8.5-r1.ebuild 706 BLAKE2B 4d5958912d3128b15899ab0f72ea4363acffed6bf16316cf61a4331b97f0eb6b9741d912897d375026650d78a9c390e332f2ad12b78a8506fff27cf2ef30ab5b SHA512 aa90d744970ff58ddda6ae28807b3295d644790d580aac44ae137f838e712608b3697ff2cb0a39a34b81c269a653ffa0b98b20ea7bdad31ebef9834925ee950e
-EBUILD nethogs-0.8.6.ebuild 696 BLAKE2B 9855a6a15c52845be2fa5394801f1a51fafc576ac8261b21fdedc6bb7408d636c6a65d2913c7acdf24466fa0230af39a1eae313895fc8d1e8b857640c9059373 SHA512 46adcf47a6d972158092f47dddfe70065b1577adeb40ee1ebd6ecd9877e02b274fa30445bfa7812a72f67045ace0b35905686ec9004fba0cad908d6bf4a1db83
+EBUILD nethogs-0.8.6-r1.ebuild 788 BLAKE2B 2652b7396e85249512babfeefaef816588ad0b50f4eb51091202c17f3f54ed6a0885b545d45517c427c942757d6d4953880b92870145ca3c53c88930a9456df5 SHA512 fa07e0fcd9e8e3252a431611970b52c8831234b2915992e3eb7401d29875cebf820aea290f5768c79317e01af588739c6ba6e7fcf46ea271b2b93d0eb4e04b0b
 MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
deleted file mode 100644
index ac684149d33f..000000000000
--- a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-HOMEPAGE="https://github.com/raboof/nethogs"
-SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC CXX
-	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	dodoc Changelog DESIGN README.decpcap.txt README.md
-}
diff --git a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..e0f115871a58
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.6-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 fcaps toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 x86"
+
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+FILECAPS=(
+	cap_net_admin,cap_net_raw usr/sbin/nethogs
+)
+
+src_compile() {
+	tc-export CC CXX
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" "${PN}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	einstalldocs
+}
diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild b/net-analyzer/nethogs/nethogs-0.8.6.ebuild
deleted file mode 100644
index bef9dec145fd..000000000000
--- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-HOMEPAGE="https://github.com/raboof/nethogs"
-SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC CXX
-	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	dodoc DESIGN README.decpcap.txt README.md
-}
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index edf1f633667d..e3af11fcc873 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,6 +1,3 @@
-AUX netio-1.26-linux-include.patch 195 BLAKE2B 4f6837a9194692658f82f50e3d3a59b4f815af2a0d32ec5d24f09c14e06cbf93a2f09e8d149dd9e65c58b41cc2bb55ff0beeb9c701304c37f6d1f95639678aca SHA512 719f65026c4d14b2f2252a9ca917fe7b46a1788d0ee84c763313f0e40fed7027c7e6d73de298735c05160f2ce0f08c8f5a49503369d3cd80d8ea26ce6c82263d
-DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232
 DIST netio133.zip 235931 BLAKE2B e664700b5991e38ad056333b13ba6ec40efd2a9a496dd9235ad40482b281f21ca54f49e037a0155d3ca0b1d77bd54330462d08abe5f809c6ee337b672c979995 SHA512 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232
-EBUILD netio-1.32-r1.ebuild 908 BLAKE2B 6848f05e30ee341f3ac22754679a43a25312de4baa95560ead9cd0772524d4c176d68fdad39d163f2ae24947eabc30a261738d0b1710eea41306e2fa341a2d66 SHA512 5b07d36442551b989469ec86d6c51678d780363ebf6ee9803e5ce1a09e06d1e731548c2c78f32c411c662bee15c0dfe35d11bdaeff9909efd762384eece0ff3c
 EBUILD netio-1.33.ebuild 811 BLAKE2B 35ea68531bbb37a529f736c481beb889759a529134bf59fe71ce3dc2db899c47d2658aaeeb8c4dc2f3583db0c1557a8308e6103ca10a046c3846223e622c52ee SHA512 1929b0356d9e9c67877f95e812b5773322ef6609a017199aee3317c59ec30f834af82ee2294ca2d7d60f370eb832f68b0fe274a9a2cb7cdb23d5ae5a02f866fc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch
deleted file mode 100644
index 591cae323842..000000000000
--- a/net-analyzer/netio/files/netio-1.26-linux-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/netio.c
-+++ b/netio.c
-@@ -199,6 +199,7 @@
- #include <sys/time.h>
- #include <time.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <netdb.h>
- 
- #define psock_errno(x) perror(x)
diff --git a/net-analyzer/netio/netio-1.32-r1.ebuild b/net-analyzer/netio/netio-1.32-r1.ebuild
deleted file mode 100644
index a2016af62465..000000000000
--- a/net-analyzer/netio/netio-1.32-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="measures net throughput with NetBIOS and TCP/IP protocols"
-HOMEPAGE="https://web.ars.de/netio/"
-SRC_URI="http://web.ars.de/wp-content/uploads/2017/04/${PN}${PV/./}.zip"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-RESTRICT="mirror" # bug #391789 comment #1
-
-DEPEND="
-	app-arch/unzip
-	>=sys-apps/sed-4
-"
-
-S="${WORKDIR}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26-linux-include.patch
-)
-
-src_prepare() {
-	edos2unix *.c *.h *.doc
-
-	default
-
-	sed -i \
-		-e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \
-		-e 's|\(CC\)=|\1?=|g' \
-		-e 's|\(CFLAGS\)=|\1+=|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		linux
-}
-
-src_install() {
-	dobin netio
-	dodoc netio.doc
-}
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index e8ddf803d59f..52aec3b3d6f0 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -3,5 +3,6 @@ AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
 EBUILD netselect-0.4-r1.ebuild 958 BLAKE2B de3233fbf07f2fb59d4361deb7fe16bb6355817f509b765a68a3e2c626b2ba66ee7a798e6fd4d31d044f04854888af9ca17e46dad1b6f2d0eeadf1375accf2a0 SHA512 54d574ba626ef2f7c23348d58ba8863cd504854e06a0bd230dee0de2983a0b93f07f7738e2428859cf2332a787645f09e87241861be68dc07191b2c0231165cd
-EBUILD netselect-9999.ebuild 899 BLAKE2B 3ba6abea554f5c72ebab839ae1649c326a6bb76483dad1ca9f4731637a77fb75ff71746e0560cbb0140921f90e1aeecc85b9f1b3ba18aba85e68fb7a5cf7342c SHA512 3eb340cc66a031be74b83bb77d78fd80f77eadb8c8dd3394987e8651a70f78d008d497a78ed3e7725b88deb08b301df705e06e5fea3a90d3ca8d38bfd403e66f
+EBUILD netselect-0.4-r2.ebuild 1204 BLAKE2B 996310fb895d32a007b1008c84953a68a281f424685865d5996fbae678a0950b87ef957c191d139e80b59c9cd78d5bacca15fbd93404287b07f060f298f3fe40 SHA512 06bedc8708ced787284f8f092d982b2c7c9d1683069307df73867d2ba868f27222f1fd1bbe7d55d965145a813a530eb8beb6c32eea00ba957232a558e57c9ca6
+EBUILD netselect-9999.ebuild 1144 BLAKE2B 56afffb99197144cfa811f79b15bcff52992ea6bb539e4eb51a7fc45330f5662476c9ddb14db54e2ebe868ea32ddf0c319eb8b6514dce089b0ef23f6586f32f3 SHA512 5478562b06da2080c5aebecaa267318afa19abd5b2dae30db2ccff0d329e8e0ecf55d548d1b4eb878cd35592f715154f6d958cf080bbfa91f9fb31d9c44e0bb9
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
new file mode 100644
index 000000000000..c0eb61494801
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="
+	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
+	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-bsd.patch
+	"${FILESDIR}"/${PN}-0.4-flags.patch
+)
+
+DOCS=( HISTORY README )
+
+FILECAPS=( -g wheel cap_net_raw usr/bin/netselect )
+
+src_prepare() {
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
+
+	default
+
+	# Don't warn about "root privileges required" when running as
+	# an unprivileged user with filecaps
+	if ! use prefix && use filecaps; then
+		sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin netselect
+
+	einstalldocs
+
+	doman netselect.1
+}
+
+pkg_postinst() {
+	! use prefix && fcaps_pkg_postinst
+}
diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild
index c41a3b0d656e..7fee270c477b 100644
--- a/net-analyzer/netselect/netselect-9999.ebuild
+++ b/net-analyzer/netselect/netselect-9999.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+
+inherit fcaps git-r3 toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
-EGIT_REPO_URI="
-	https://github.com/apenwarr/${PN}
-"
-SRC_URI="
-	ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )
-"
+EGIT_REPO_URI="https://github.com/apenwarr/${PN}"
+SRC_URI="ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="ipv6"
 
 PATCHES=(
@@ -23,15 +20,25 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4-flags.patch
 )
 
+DOCS=( HISTORY README )
+
+FILECAPS=( -g wheel cap_net_raw usr/bin/netselect )
+
 src_unpack() {
 	use ipv6 && unpack ${A}
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	use ipv6 && PATCHES+=( "${WORKDIR}"/${PN}-0.4-ipv6.patch )
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
 
 	default
+
+	# Don't warn about "root privileges required" when running as
+	# an unprivileged user with filecaps
+	if ! use prefix && use filecaps; then
+		sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die
+	fi
 }
 
 src_compile() {
@@ -41,12 +48,11 @@ src_compile() {
 src_install() {
 	dobin netselect
 
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-
-	dodoc HISTORY README
+	einstalldocs
 
 	doman netselect.1
 }
+
+pkg_postinst() {
+	! use prefix && fcaps_pkg_postinst
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index e1f87d0cbe04..6cf66145f33c 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,9 +1,12 @@
+AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
+AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
+AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425
 DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e
-DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137
 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34
+DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
 EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035
-EBUILD nfdump-1.6.20.ebuild 1392 BLAKE2B f9d43b2f41c5c901255e06c391eff327bf2b56bf9af02add91e22ad8a935c682e6e332b252be90dfa9564971f59d908c37ea532b36a08ac7df09106b9ea41218 SHA512 5da3069596339dd040c1573a65b538e1cedc75d30420e84cf0864474a391e5a19a6914a2dafa8f7f4024b491c84799a926bd9b4f4d31cd7fff57788e822b2f9f
-EBUILD nfdump-1.6.21.ebuild 1469 BLAKE2B 932f15a9e9c9b136868fb6365c6fb0933ca081c25787712c50d08c4b49f3d3e90990c3879f7f3883d27b8b37de4e1d1f127b44597cf458ee71c6b6c809e7efa1 SHA512 7a2e14a66f05d516fe6cbdaf2e337ca1b57afb24ea33f583ad1a744b3a6dd3136914a7b41a6dc00b2321aa791989e0024fab6c0fbc25268db5ab1f0ad1eedc47
-MISC metadata.xml 802 BLAKE2B 97d927528f0f645840ea163060c8b3a2f43cd27f6687e5dd1fa9b9fe5b5bb1e3115463b744df4ac4151bcd82e8b6ee3849c5e130e09ed66b14bc16c9aea48f26 SHA512 7549ba2155e5bcb972147b1daf0cb2c44619b4ca13455893bba269c560149c40d17d04bc66ce2c5dc94165ff65e9f97980c4eed7a7d7bb47723a03db6c144bb1
+EBUILD nfdump-1.6.21-r1.ebuild 1536 BLAKE2B 6174400853f6e976b9092b99610ef4b7795e1edad71b43b1a302390fdf94767d8616342ecd055278d329cc5f9a81ca1dca908a1720b34842bb159feff986b75c SHA512 f75118237418884d494e4c3ad3e6accef30a004c4688c2b2b303776fc0ec59459e4ca8e7918682dea7787706758481e9b1bb997a8cfdf5f2ed9c2574de874c80
+EBUILD nfdump-1.6.22-r1.ebuild 1682 BLAKE2B f55767f172e9d8dc112079f2a3aef7df3ed9f824c19438ee2c33634fd7882f3b3ca154c9de7aad3b04a922f87efcf0034c55b45a6a76c293778b50ea90591219 SHA512 fb4438500d299741164ca77004db9bb8bfed3a4a16225b8e835870b5fa8f8a76523f4b091dda393742c8e905899aad3a3e73dc27c569cb97faa98b591450b605
+MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089
diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd
new file mode 100644
index 000000000000..28ea35fd0741
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfcapd.confd
@@ -0,0 +1,11 @@
+#shellcheck shell=sh
+#shellcheck disable=SC2034
+
+#port number to listen on
+#PORT="2055"
+
+#maximum size of collected files
+#MAX_SIZE="1G"
+
+#enable sending of all received packets to specified address
+#REPEAT_TO="192.168.1.1/60062"
diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd
new file mode 100644
index 000000000000..98d388cb710f
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfcapd.initd
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+#shellcheck shell=sh
+
+IDENT="${RC_SVCNAME#*.}"
+PIDFILE="/run/nfcapd/${IDENT}.pid"
+USER="nfcapd"
+GROUP="nfcapd"
+
+ssd_start(){
+	if [ -n "${MAX_SIZE}" ]; then
+		set -- "$@" -e
+	fi
+	if [ -n "${PORT}" ]; then
+		set -- "$@" -p "${PORT}"
+	fi
+	if [ -n "${REPEAT_TO}" ]; then
+		set -- "$@" -R "${REPEAT_TO}"
+	fi
+	start-stop-daemon "$@"
+}
+
+checkconfig() {
+	if [ "${IDENT}" = "${RC_SVCNAME}" ]; then
+		eerror "You have to create an init script for each ident:"
+		eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident"
+		return 1
+	fi
+}
+
+depend() {
+	need net
+}
+
+start() {
+	checkconfig || return 1
+
+	checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd
+	checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}"
+
+	if [ -n "${MAX_SIZE}" ]; then
+		nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \
+			> /dev/null 2>&1
+		chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}"
+	fi
+
+	ebegin "Starting ${RC_SVCNAME}"
+	ssd_start --start --quiet --exec /usr/bin/nfcapd \
+		--pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \
+		-g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/nfcapd \
+		--pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
new file mode 100644
index 000000000000..a36af2242d42
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
@@ -0,0 +1,49 @@
+From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Sat, 8 Aug 2020 16:46:04 +0200
+Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011
+
+---
+ ChangeLog   | 3 +++
+ bin/ipfix.c | 3 ---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a0b2b67..8b92e58 100755
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++2020-08-02
++- Re-address issue #231 - remove strict rule rfc 7011
++
+ 2020-08-02
+ - Release 1.6.21
+ - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification
+diff --git a/bin/ipfix.c b/bin/ipfix.c
+index a730a8b..19c9d63 100644
+--- a/bin/ipfix.c
++++ b/bin/ipfix.c
+@@ -158,7 +158,6 @@ typedef struct exporterDomain_s {
+ 
+ 	// exporter information
+ 	exporter_info_record_t info;
+-	in_port_t	port;				// follow rfc 7011 - matching src port
+ 
+ 	uint64_t	packets;			// number of packets sent by this exporter
+ 	uint64_t	flows;				// number of flow records sent by this exporter
+@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
+ 
+ 	while ( *e ) {
+ 		if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && 
+-			 (*e)->port == fs->port &&
+ 			 (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) 
+ 			return *e;
+ 		e = &((*e)->next);
+@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
+ 	(*e)->info.header.size  = sizeof(exporter_info_record_t);
+ 	(*e)->info.id 			= ObservationDomain;
+ 	(*e)->info.ip			= fs->ip;
+-	(*e)->port				= fs->port;
+ 	(*e)->info.sa_family	= fs->sa_family;
+ 	(*e)->info.version 		= 10;
+ 	(*e)->info.sysid	 	= 0;
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index f785b8973856..f9f3c305c35a 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -6,12 +6,18 @@
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
   <use>
-    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
     <flag name="ftconv">Build the flow-tools to nfdump converter</flag>
+    <flag name="jnat">Build nfudmp to support JunOS NAT event logging</flag>
+    <flag name="nfpcapd">Build nfpcapd collector to create netflow data from precollected pcap traffic</flag>
     <flag name="nfprofile">Build nfprofile used by NfSen</flag>
     <flag name="nftrack">Build nfprofile used by PortTracker</flag>
+    <flag name="nsel">Build nfudmp to support NSEL/NEL event data</flag>
+    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
     <flag name="sflow">Build sflow collector sfcpad</flag>
   </use>
+  <longdescription>nfdump is a toolset to collect and process netflow and sflow
+    data, sent from netflow/sflow compatible devices. The toolset supports
+    netflow v1, v5/v7,v9,IPFIX and SFLOW.</longdescription>
   <upstream>
     <remote-id type="sourceforge">nfdump</remote-id>
     <remote-id type="github">phaag/nfdump</remote-id>
diff --git a/net-analyzer/nfdump/nfdump-1.6.20.ebuild b/net-analyzer/nfdump/nfdump-1.6.20.ebuild
deleted file mode 100644
index d866f89da5b1..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.20.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
-inherit autotools
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1.6.15"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-doc/doxygen
-	sys-devel/flex
-	virtual/yacc
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-)
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	doxygen -u doc/Doxyfile.in || die
-}
-
-src_configure() {
-	# --without-ftconf is not handled well #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
new file mode 100644
index 000000000000..f6000c763cbd
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1.6.15"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+	"${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21.ebuild
deleted file mode 100644
index 4c59fb92baec..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.21.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
-inherit autotools
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1.6.15"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-)
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use doc; then
-		doxygen -u doc/Doxyfile.in || die
-	fi
-}
-
-src_configure() {
-	# --without-ftconf is not handled well #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
new file mode 100644
index 000000000000..67db70201342
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1.6.22"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
+	static-libs"
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfpcapd && echo --enable-nfpcapd) \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable debug devel) \
+		$(use_enable jnat) \
+		$(use_enable nsel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 4d8abde1e0d8..6500597b17c3 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,4 +1,4 @@
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
-MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
+MISC metadata.xml 699 BLAKE2B a0c81b2cce47cc8c15bc81f24b3f85bac0bb6e33c1bad000946fe66f1508e32e5f314410255d0b0f43c7ec662d339f3b3c0c5e56e4bedc3ea5c311071ca01ee4 SHA512 4967443bea3dc14cbf9bf4fd7d10842adb49b9ed61c1a09e622983beb078e14acff01f7d2f4aaa8933a89dffac6b679976e09b6399dafe05dde9678404dd0ccc
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index a8fcd8f42981..58a7ef6e625d 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jpr5+gentoo@darkridge.com</email>
 		<name>Jordan Ritter</name>
 		<description>Program author who would like to be notified of bugs</description>
@@ -10,7 +10,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 995a5f17a770..dc34ea3c4328 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -2,4 +2,4 @@ DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005
 DIST nikto-2.1.6_p20210304.tar.gz 521719 BLAKE2B 66715e109dfb47bb5ed6b64cfff4dbdd0667883e5ce28c26a7325645fe42ccfdcb6f9bcf956adce6f626c51ff363122724955eda86c715d4f8ec4894ebf1ae4a SHA512 d78cedad0b2f96d02964097699d5765fdb895b7ec1a9e196cbf9181888dd19cfca7d912f172a870e4b8bd2b53e4fc41407a60ed129ef24592909ef6111d04a0e
 EBUILD nikto-2.1.6_p20200901.ebuild 1101 BLAKE2B e1a67234ccdb86ba5f58bf6a7e639d7d7a838066f422333c75c91ff724805f5bf5c364ad70f51aa411e7927435644feb68fb45b8909a06e993ef38503a3b8cd0 SHA512 69a4b4ac1a8a07d13975999b46cc43ca768fe44d8c2c6af27187aa1f3e0ac7c8f457c52ff6d6956238096369422cb476e7e4cac51b9d49061314f25293d2e8a9
 EBUILD nikto-2.1.6_p20210304.ebuild 1101 BLAKE2B 0a6e63c0bff031c54951ada0f3569a8deaa8237cfaac8409ea53bc487ec96c91841e0bc4d4b4758425adbbe86e3ac9ee727ea4629dd6dc2abaf18d6733aec4ef SHA512 bcfa7414aac47ba18bbbdfa196067740a6d998bda53f7547c5e9d8360b17f2beff7462520282382c12ad410b787b4a1400de60b6a64242cd5290e8b2df09a5f9
-MISC metadata.xml 368 BLAKE2B 1b830b9fc3837ed7b4706a646f08e1edb316c264b82232740467c341b54c14d49d4dd936d8c24c32256f3235dde2ee5ebbdfadb0fb117136d5e49af353590fab SHA512 2f1a7954d7f6360a4b83f22933cb45e800ab2fc7a7725569736fcc4e64d3d3603dcc64a0ebe888ebb824a51fef81d7220599f525a8e316df762e874ccbd51efd
+MISC metadata.xml 398 BLAKE2B 0872759a8246728c23897d1d12b8d45e7b4a2cdaffade7a7fe83ec0cc85932362b9f1b8460250c2f8024d383d609ec2c8ef117c6e8d53018390b76309d5f84ac SHA512 6b4316347f0cf34571660a66bc2a7773000a5edde9b1f8d9c900d56c88b129b5b78b5385bc3a7833a0ae10e6df7f1b8ef87b6daaa06087bb3382b3ed5c3992a7
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
index 91f5940d4d0a..9bdfae85502c 100644
--- a/net-analyzer/nikto/metadata.xml
+++ b/net-analyzer/nikto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index a0fa7c60e2c0..a68c5c282a23 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -3,4 +3,4 @@ AUX nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch 2166 BLAKE2B f2c5ba5
 AUX nload-0.7.4-tinfo.patch 264 BLAKE2B aa77538dd412c4956d61449e9c6494de70d42208d806e103a18d12e12751d7619483bb13dab1934b076e5aaf7ea7d3368c9a5b9403340dab7f03c5a0430b3bb0 SHA512 1191ef64ab895402a54d05e4b119627ddc6db884f8385493bf00c030d1c82b88fa77973e3d6ea0bf2e5e7211dc07ddec7d95e426a60d99f216b23b683fd8a83e
 DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af
 EBUILD nload-0.7.4-r1.ebuild 793 BLAKE2B 5d8ea1b075e9dc4a8a9a6cd96b73aab3d39fa357a18c50176bef28e4ed3faeeb446532baeaaa82653bf4ce91c9bb4c089e4841ea4a5b016c7eeed3448a21080d SHA512 769c1c492c1986127ab5201d7686e3144361d69de3c7eb36affb8c2338819fcb1e9bb25e470f7f9577c9010a106c17de20e957cbb0def5aea562b91ea34aa0c9
-MISC metadata.xml 519 BLAKE2B 702f635b7c32996b4ce0dec2ab92b1fac1c8ccf196f8d0b70c877acc6c655bab342ccd633db3a8482832f18551c6c168ae46c8b7325520e9e49fed0580b2de69 SHA512 c80b5274a23376f9b3b78d2141c25310f06a5ba4764ddbe81cc539c0ebab04d536722205df8df04bd335958b25a5aa961ece41eaa89d8bab9a9a1880fb3302c6
+MISC metadata.xml 549 BLAKE2B 19e36d13fd29e0c9f88bc8af72ab2b587f43e6b47833fff74be43d99b70720ba1759c6553faa6f70a3292fb6d18e17ea314c9a8375a169cfdd77f4fba76b3156 SHA512 2704a1e16bfda3b3e05ddbc6768ecd5ed06452971239babc2f3a43ee4e0ca0fa8cbff8c445c2a5a6681f1535c610c5dfe71e20c88d76adc3978fc96a61fe75f7
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index 8e9e21d02085..faf73c253e54 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ahippo@yandex.ru</email>
     <name>Andrey Mazo</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>netmon@gentoo.org</email>
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index fe7e12d281d4..5095364f0639 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -10,4 +10,4 @@ DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da
 DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9
 EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3
 EBUILD ntopng-4.0.ebuild 1916 BLAKE2B d288cc2f2b096a377a00a8814541e79a5328589f43963e118ccfd42c938fca1a7c684b769a81b2753ee2ab9c6431ee425d4d190444767a4b9059ceb6ebb64278 SHA512 37d3c01d11f761d2baec2047e52186a96ba7157cd11857eb7c1198bd6952994e6f1c37d12a20718d4319ac4b294a65dbb2bb96b3c7da0bc351d929769fc1e118
-MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73
+MISC metadata.xml 294 BLAKE2B 81c505fe10f4b55e7a2bf6a01959efd75f9a8bea62afa2ff31f036ef3d999ad6f88d8c4fa7ccbc1852c51c63354cf02cb023a562997f06b8b58699d76bb6761b SHA512 e98be1164a275f023b7f96d6ca2c37fa44733b776c39a2e45839e60881b3ce5bd2f81dd50af97340afcaaa0da0bcc32e144f72e968b1a7e6c06755ea9eb471ac
diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index f31113c67cca..c7555fbc28ad 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/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>netmon@gentoo.org</email>
 </maintainer>
   <upstream>
diff --git a/net-analyzer/nuttcp/Manifest b/net-analyzer/nuttcp/Manifest
index 3935f8707154..8973a680bb00 100644
--- a/net-analyzer/nuttcp/Manifest
+++ b/net-analyzer/nuttcp/Manifest
@@ -3,4 +3,4 @@ AUX nuttcp.confd 174 BLAKE2B 8ca9f6f9abc473e232f650bacb989e4d3a0a3d9e40f239a70e5
 AUX nuttcp.initd 328 BLAKE2B 823ea8ad721e66ad26a5a1d2f43f098721fc36146524ecd3e02185b3da3bb83bad11f20eaed285da8a00289afd27d3bbc01f461e348086c8903c6f3b14d9b598 SHA512 29bf5e158955238a4579e60ae81b47e34ca620c2c69ab41667c35f626993f8c6adfb88c9f7a484551b95f1fe1c7aadb4903c951a30114ba38dc963b614b19ecd
 DIST nuttcp-8.1.4.tar.bz2 13063356 BLAKE2B 374b76bed06615bf5966df5864c8987d5e8336eedd7450ccfef164e575f58ce2a22dbc1e0327e7740799560c30a03f9423d3fd50579fa01cd638059485c7f61b SHA512 ba6ff33bc1790c92f47d760d4588b128f60f0ca09ed43d95fd10b0edfb636a493b0d26b195e688a13b5b79fafc1cc52a0c73455263f921ff8ad0cf087f1d937b
 EBUILD nuttcp-8.1.4.ebuild 1456 BLAKE2B fe278b37f5b923b27365f2f979eaae2f00324ea7b40dfa5f7f9c617546bd8f6ff0293099ff6852dcdad489ce46b8c1bce07c36c3878bec18307bc2474b9f1d1b SHA512 4726a56012dae0e6c46e012b3842bd199c31e29f7eee49c839ae2b475e44e71dab417ea3ea4b44716fe24e2409226dd12341d645f0fad45819bbc145d7e6841f
-MISC metadata.xml 915 BLAKE2B 2011a0921d4de0ce5f7d30cc149751aed2120364b7c74763970b86d67f49eebb4b1ace092fbb6a1f6583ce2b6af75db36c02355a4d74f8724c693b0d5535d825 SHA512 6e3db2f2b940e1ebff18f0bafdab669a9e67c29f4845b171c4cedd50923e5ff5e22839a4c328bf7b8f55d7ee6c5da827f48035816d7e58dda384fec9bee1c59d
+MISC metadata.xml 945 BLAKE2B 44ca8e77405ed9611f2dae93e0d9e33c3d80bc7e703b41141cccd002dad4633aa5e9f0debb9f25c814331841cf00e9132dc8834e9e15e1d0a0d15a8bf0f46041 SHA512 fdc6139fa15c466fed9309ee7e97a00915f9d7c23c34a7a3adade30e87c7288a8f89ae505ad5e4365e14d9afc4998e19492b33337733171ea8b7fadf302497fc
diff --git a/net-analyzer/nuttcp/metadata.xml b/net-analyzer/nuttcp/metadata.xml
index 66e11db82cfd..9466b4e49fb1 100644
--- a/net-analyzer/nuttcp/metadata.xml
+++ b/net-analyzer/nuttcp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 06591685c679..3a3a9bf45c15 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -12,4 +12,4 @@ DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36
 DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571
 EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86
 EBUILD openvas-scanner-7.0.1.ebuild 2640 BLAKE2B f57aed40f1d1dbff974bb10678efd83217e80fe0f8338ff03f1d734db902756ceba435a31b89179b6cb991e0375359c6deccf306aa6f186ced2c7a78ba782918 SHA512 9e129a64e6da6772ac32dfd431fff961252474162fb07cd8d3c9974c0437c9558c83e6cc122b3938b2b31b154b9aa54e225292d659e7fb2bc1605afaf2208357
-MISC metadata.xml 943 BLAKE2B 30afdfefaa60083a3444265990b72e282b8b87167a73f746b3a2f7d5aabe868d9e19864c1bb20f6c9c357f629c3d2829aadcf0096387634868717572dc5fc588 SHA512 f43cf9fdd9062758de6f9ac173d287946226780b57857ee0679687464bf38fb3964765a6a56b1e634a536cf4203ed55933bff8a2088ff4e1e65ab09b2cb8cb65
+MISC metadata.xml 973 BLAKE2B 390941ba04f59d58c28c94dbe8ba603019aa521050188c0bcdfbca46d6fd37d30930ad19393012dfd3c7d4cd4d06417e6d0e031b4c09d73fb9e785967edbf3e4 SHA512 2e5084edcb10d541a916c971d4182cd2c6609fc56ecf26197b1a5c1ec5523dc8f60c6f3c686f42f91ae90344d11ecc55b2bea7f01f28b46add830361ef60c894
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 932077da95e5..7e35c8db9689 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 507d919cb60f..8ae435a16fbc 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -5,4 +5,4 @@ AUX ospd.conf 189 BLAKE2B 7b4e2941b25cbbd4b7d5f913526977c5663640d4b5c208cd48b95b
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
 DIST ospd-openvas-1.0.1.tar.gz 50455 BLAKE2B 06a4cdcc2f51351215fffa5517cb2cae620b9b7ffded738d3c63bda11fa8572fe93e0b5fc1c8c9a1bd27cbea65641b0586c329d1d05a022e1fba79c8782d091c SHA512 bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87
 EBUILD ospd-openvas-1.0.1.ebuild 1109 BLAKE2B 0a734229297237cd501c2656150904e5078116f21ab107d591deb505ed54a7163f916bf3b6a8e958e433390a221570043fcc7b237285f5ea88537692b7186fa6 SHA512 740c37c6ec7f0380e18fc506c170f2edb56247f55bfa975be6e14995ebefd25d0ddcd1e281e7ec4a2d777107fc6cbd50db706afd6d90c850f504690c8a3ac90e
-MISC metadata.xml 695 BLAKE2B 6f7c40458fe05cfe7a4ec7adfc34666c88d225097429f942c3a89842e3b6259a10c5b630a7d993a996b636c674d35237fd7fd1e9d4ea5a5dcf8afe31a27faa34 SHA512 03cd8af210753e2cb74e9e50cb94f6fb66a46e71eb58948bdd575be453e5c239dd26d4c1b42582a9d7f838f3e64c9ad980f9489260aa15de25eb919df697546f
+MISC metadata.xml 725 BLAKE2B 13051c0bdbf286d450777e2e5d4eac7a37617e06bfc856703d111aa29da211332a8601ca1d516f6efc88992df91c33a6c90ac037580d2f1046e4954c5bd35624 SHA512 0693f8d596cc116807b49c0238dc8568d2a1327df0e259bc6085aac23455eda9a299f53840c38708bef673c62c5df2e5be21d17d6d2e4935184c37e5bf432c5d
diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml
index d46922d749f9..3aa1c5136cb4 100644
--- a/net-analyzer/ospd-openvas/metadata.xml
+++ b/net-analyzer/ospd-openvas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index ec030e2a3548..9e97cd9d290e 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,3 +1,3 @@
 DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a
 EBUILD ospd-2.0.1.ebuild 753 BLAKE2B 15b7d6b44a51e4b60f61e198bbe35a4b144a05118ae7ab8dad6eef86af30c86931cd0c4f12015fb1ec0de8494a68ac59970ee0b8122875f91ab8073847ee6de1 SHA512 df7cc56f0c2c32efa25c87c9a6f2914a5a100eda406f145276af2a95a9aadf3aaf280bb6d63e12f921dc2433f84d85776b4706958fd188f9f443aabc8210b98d
-MISC metadata.xml 871 BLAKE2B 6f143ae78bda1d5880f975d8c722fd00da73bf048647e87ff28a7d131f98bf728fbc0d7f15a4bf58e0910ff33c5e14eccc94df930e8813ff7c1c6bb47aaaada2 SHA512 288d246b941a2ad7056548be377ac972ad9a62da9ac7f0557b6d4d8ecad0fe5c3d9f7163a6d8c68ded91cb1896eb92c6054703df8ebccb09f489e468af56e159
+MISC metadata.xml 900 BLAKE2B 1e11a5fe50a57eec411e7b01480d484244266c5fab3814e1b860edb878810cabc49e3359888775e3d30778a0713d0e8a2cb2c3a04639eed316d89adac22bdd61 SHA512 1a7e244a466fef29dee6d46f6dc1eff5e7dce401980c704b4f6ca2a81c3da644b7705f2b0085c960c76ae0930dfb09bb84ca28d078ae7e73af7be2c083238f96
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
index 2a4516f1d3b0..a88173db7775 100644
--- a/net-analyzer/ospd/metadata.xml
+++ b/net-analyzer/ospd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -22,4 +22,3 @@
 		<remote-id type="github">greenbone/ospd</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index be04304c7e92..aebb89fe00d0 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,8 +1,5 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
-AUX packit-1.6.1-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
-DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.6.1.ebuild 698 BLAKE2B 8faf26054fc9ed7274bb041c5670b8d032b11bdedbafc461e5bbb99b4a516bfd4df53b4c458422570ef0f2c9d135ea8870f45f798f335c0b60095a3ec72a04b5 SHA512 ac398634d37e1f9da624496574afe33d0fd0dc59a4a094106d91687355519aa929e694bade1d4681f57b52f98fb8f394b69db1a86d4011d62cf31cfdd769e754
-EBUILD packit-1.7.ebuild 656 BLAKE2B cfefd879b7e17b8d1b063c10681cece5f41a70504419db2cfddd6ddc87b4ee54388c98146862fa494bf6b4c6fdec1fd39f11165f6bd727bf08deee3ed3620665 SHA512 51d3649ad59e0f814c1d688966c8a09ca0647bafcc0a33c8dc015eb6277bb0071f506dcb7794fec45d6bee72e83b5ef2ecde94e75f16659ef57adf29e08742a6
+EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
deleted file mode 100644
index f4813d868ab1..000000000000
--- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- a/src/capture_defs.h
-+++ b/src/capture_defs.h
-@@ -30,12 +30,12 @@
- #define READ_TIMEOUT                    500
- #define SNAPLEN_DEFAULT                 68
- 
--u_int16_t g_display;
--u_int16_t g_link_layer;
--u_int16_t g_dump_pkt;
--u_int16_t g_time_gmt;
--u_int16_t g_t_rst;
--u_int16_t g_snap_len;
--u_int32_t g_pkt_rst;
-+extern u_int16_t g_display;
-+extern u_int16_t g_link_layer;
-+extern u_int16_t g_dump_pkt;
-+extern u_int16_t g_time_gmt;
-+extern u_int16_t g_t_rst;
-+extern u_int16_t g_snap_len;
-+extern u_int32_t g_pkt_rst;
- 
- #endif /* __CAPTURE_DEFS_H */
---- a/src/error.c
-+++ b/src/error.c
-@@ -26,6 +26,8 @@
- 
- #include "error.h"
- 
-+char error_buf[ERRBUF_MAXLEN];
-+
- void
- fatal_error(char *err,...)
- {
---- a/src/error.h
-+++ b/src/error.h
-@@ -33,7 +33,7 @@
- #define SUCCESS           		1
- #define FAILURE           		-1
- 
--char error_buf[ERRBUF_MAXLEN];
-+extern char error_buf[ERRBUF_MAXLEN];
- 
- void fatal_error(char *,...);
- 
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -138,20 +138,20 @@
- #define P_INT64                         0x7FFFFFFFFFFFFFFF
- #define P_UINT64                        0xFFFFFFFFFFFFFFFF
- 
--char g_w_file[OPT_MAXLEN];
--char g_r_file[OPT_MAXLEN];
-+extern char g_w_file[OPT_MAXLEN];
-+extern char g_r_file[OPT_MAXLEN];
- 
--pcap_t *g_pkt;
--u_int8_t g_tr_fin;
--char *g_filter;
--char *g_device;
--u_int16_t g_hdr_len;
--u_int16_t g_pkt_len;
--u_int16_t g_verbose;
--u_int16_t g_resolve;
--u_int16_t g_p_mode;
--u_int64_t g_cnt;
--u_int64_t g_inj_cnt;
--u_int64_t g_cap_cnt;
-+extern pcap_t *g_pkt;
-+extern u_int8_t g_tr_fin;
-+extern char *g_filter;
-+extern char *g_device;
-+extern u_int16_t g_hdr_len;
-+extern u_int16_t g_pkt_len;
-+extern u_int16_t g_verbose;
-+extern u_int16_t g_resolve;
-+extern u_int16_t g_p_mode;
-+extern u_int64_t g_cnt;
-+extern u_int64_t g_inj_cnt;
-+extern u_int64_t g_cap_cnt;
- 
- #endif /* __GLOBALS_H */
---- a/src/inject_defs.h
-+++ b/src/inject_defs.h
-@@ -30,7 +30,7 @@
- #ifndef __INJECTION_STRUCTS_H
- #define __INJECTION_STRUCTS_H
- 
--struct ip4hdr_opts
-+extern struct ip4hdr_opts
- {
-     u_int16_t p;                   /* protocol type */
-     u_int16_t rand_p;
-@@ -59,7 +59,7 @@
-     u_int16_t rand_d_addr;
- } g_ip4hdr_o;
- 
--struct tcphdr_opts
-+extern struct tcphdr_opts
- {
-     u_int16_t s_port;              /* tcp source port */
-     u_int16_t d_port;              /* tcp destination port */
-@@ -82,7 +82,7 @@
- 
- } g_thdr_o;
- 
--struct udphdr_opts
-+extern struct udphdr_opts
- {
-     u_int16_t s_port;              /* udp source port */
-     u_int16_t d_port;              /* udp destination port */
-@@ -90,7 +90,7 @@
-     u_int16_t sum;                      /* udp checksum */
- } g_uhdr_o;
- 
--struct icmp4hdr_opts
-+extern struct icmp4hdr_opts
- {
-     u_int16_t type;                /* icmp4 type */
-     u_int16_t code;                /* icmp4 code */
-@@ -132,7 +132,7 @@
-     u_int32_t ttime;                    /* transmit timestamp */
- } g_i4hdr_o;
- 
--struct enethdr_opts
-+extern struct enethdr_opts
- {
-     u_int16_t rand_s_addr;
-     u_int16_t rand_d_addr;
-@@ -143,7 +143,7 @@
-     u_int8_t dhw_addr[18];
- } g_ehdr_o;
- 
--struct arphdr_opts
-+extern struct arphdr_opts
- {
-     u_int16_t op_type;                  /* arp operation */
- 
-@@ -163,28 +163,28 @@
-     u_int8_t rhw_addr[18];
- } g_ahdr_o;
- 
--libnet_t *g_pkt_d;
-+extern libnet_t *g_pkt_d;
- 
--u_int16_t g_init_type;
--u_int16_t g_rand_d_port;
--u_int16_t g_rand_s_port;
--u_int16_t g_s_port;
--u_int16_t g_d_port;
--u_int16_t g_port_range;
--u_int16_t g_interval_sec;
--u_int16_t g_interval_usec;
--u_int16_t g_injection_type;
--u_int16_t g_r_timeout;
--u_int16_t g_burst_rate;
--u_int16_t g_payload_len;
--u_int8_t *g_payload;
--u_int8_t g_hex_payload;
--u_int8_t *g_s_d_port;
--u_int8_t g_hwaddr_p[18];
--u_int8_t g_rawip;
-+extern u_int16_t g_init_type;
-+extern u_int16_t g_rand_d_port;
-+extern u_int16_t g_rand_s_port;
-+extern u_int16_t g_s_port;
-+extern u_int16_t g_d_port;
-+extern u_int16_t g_port_range;
-+extern u_int16_t g_interval_sec;
-+extern u_int16_t g_interval_usec;
-+extern u_int16_t g_injection_type;
-+extern u_int16_t g_r_timeout;
-+extern u_int16_t g_burst_rate;
-+extern u_int16_t g_payload_len;
-+extern u_int8_t *g_payload;
-+extern u_int8_t g_hex_payload;
-+extern u_int8_t *g_s_d_port;
-+extern u_int8_t g_hwaddr_p[18];
-+extern u_int8_t g_rawip;
- 
--struct timeval g_bf_pcap;
--struct timeval g_af_pcap;
-+extern struct timeval g_bf_pcap;
-+extern struct timeval g_af_pcap;
- 
- 
- #endif /* __INJECTION_STRUCTS_H */
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,6 +30,62 @@
- 
- #include "main.h"
- 
-+char g_w_file[OPT_MAXLEN];
-+char g_r_file[OPT_MAXLEN];
-+
-+pcap_t *g_pkt;
-+u_int8_t g_tr_fin;
-+char *g_filter;
-+char *g_device;
-+u_int16_t g_hdr_len;
-+u_int16_t g_pkt_len;
-+u_int16_t g_verbose;
-+u_int16_t g_resolve;
-+u_int16_t g_p_mode;
-+u_int64_t g_cnt;
-+u_int64_t g_inj_cnt;
-+u_int64_t g_cap_cnt;
-+
-+/* capture_defs.h */
-+u_int16_t g_display;
-+u_int16_t g_link_layer;
-+u_int16_t g_dump_pkt;
-+u_int16_t g_time_gmt;
-+u_int16_t g_t_rst;
-+u_int16_t g_snap_len;
-+u_int32_t g_pkt_rst;
-+
-+/* inject_defs.h */
-+u_int16_t g_init_type;
-+u_int16_t g_rand_d_port;
-+u_int16_t g_rand_s_port;
-+u_int16_t g_s_port;
-+u_int16_t g_d_port;
-+u_int16_t g_port_range;
-+u_int16_t g_interval_sec;
-+u_int16_t g_interval_usec;
-+u_int16_t g_injection_type;
-+u_int16_t g_r_timeout;
-+u_int16_t g_burst_rate;
-+u_int16_t g_payload_len;
-+u_int8_t *g_payload;
-+u_int8_t g_hex_payload;
-+u_int8_t *g_s_d_port;
-+u_int8_t g_hwaddr_p[18];
-+u_int8_t g_rawip;
-+
-+struct timeval g_bf_pcap;
-+struct timeval g_af_pcap;
-+
-+struct arphdr_opts g_ahdr_o;
-+struct enethdr_opts g_ehdr_o;
-+struct icmp4hdr_opts g_i4hdr_o;
-+struct ip4hdr_opts g_ip4hdr_o;
-+struct tcphdr_opts g_thdr_o;
-+struct udphdr_opts g_uhdr_o;
-+
-+libnet_t *g_pkt_d;
-+
- void
- parse_capture_options(int argc, char *argv[])
- {
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
deleted file mode 100644
index 48ba4aeab1c9..000000000000
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="network packet generator and capture tool"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
-SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-noopt.patch
-	"${FILESDIR}"/${PN}-1.6.1-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc docs/*
-}
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 5059d8e159a0..6f454fbc9ba2 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index d64e42ed98f1..94edb13cb32a 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -6,4 +6,4 @@ DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
 EBUILD prelude-correlator-5.1.0.ebuild 745 BLAKE2B e969e6c78e9419821a4d76173ae24e8f9e15c5456b93462af64fc481adf493c375dfa69b37f11792082dfd0a92bf5afd182832f52317f775d8c6ceec1874e3e8 SHA512 3b2374b7fb01f017007e7a3270e49cf70c8470055880859dc67a43fad5113ea4af0813efe40c0d25fd0d36809503b28317b0e3fdd093e62d0632c11d6d9e2f7f
 EBUILD prelude-correlator-5.2.0.ebuild 911 BLAKE2B 89780f9562a124f3fd90ba39a8e7d82c8008acb819c4c064ab579acd397f4ae00b9d4da86a048d81f2d3f381dee17a9b004a02b4f76dee8dd7156b935bdcc358 SHA512 312739c7fd601f936d14f8ee920154e9d9814fd27c91cac4f64015501ecff05371859ba23322d996b591e1185eb3223cbd26883094ae553a791a73b198e00f12
-MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
+MISC metadata.xml 854 BLAKE2B e16af36fd906bd519bd60d82628e1d75c5f27e1da3a5d59c71c4385fcfbfdc5b288f3d56473ba009e151b718516ab195976a845645a840c8c9bbfc613f49b348 SHA512 d336ad2f22f859c19cdaf0cab481115cacd818b85b8c5fad469b388477bdd772d506f56b2214b0a4ac0bf2868c57d26fd9fadd7f32fd04279c04196fe2ab5d96
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
index fa977ec21f47..0c9756704b30 100644
--- a/net-analyzer/prelude-correlator/metadata.xml
+++ b/net-analyzer/prelude-correlator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 00915eda130b..b53f93109030 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -2,4 +2,4 @@ DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc
 DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
 EBUILD prelude-lml-rules-5.1.0.ebuild 454 BLAKE2B 67c1020d0d4180704a80cd78e93ce0b313bae0df77b66e152a0cef1f8de9a6c93fe0505c278dbe583548da257a00d525fbc416f4ab8438cc6ea4e165c7b98bad SHA512 785dd110759a98e7b1679922ff6cc14fac51e3ddd7deda145efe5d591648d6db10aa86ce1e3a0722e9b3ba111fdfc2f9c9129a002bf3fec86e187e338e2f2580
 EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
-MISC metadata.xml 373 BLAKE2B 6fa00bbd4f812187c5808bda963bd017a49083630f19f9eb0966064914eeb3a21389430fa7aac54ce03faad80347a66be473227e933ab8e41c1598160ca7dd45 SHA512 1da0210300b25be42d84914b12750fbea2e7471ad5ce0cb7740e69c1e3c87b44ae76a3bfa57e60498dfd1e0a9ca9fd6eaf9a7a8a664e036bbfe45a2c00c94ad1
+MISC metadata.xml 403 BLAKE2B d8c0e238fd36cbdabe2a8adbcce1ffa7b7564cc1e8f2b3b5e6b669c7bac6e625aa2469a6f4002a88923c32676abe252a136b46ef1e399cdaf7d94b14ed8a1cfe SHA512 64900e8b946f9894e8796e2bc2758d818d922d0cf22d693879d9cb56bd08f6a175acacd595b9da28a9ce955339333613c2edc6fa3da2d2aee4357a75553bfa35
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
index f9f94e2cbf43..4e084bded132 100644
--- a/net-analyzer/prelude-lml-rules/metadata.xml
+++ b/net-analyzer/prelude-lml-rules/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 2c36e172a4a1..7b2671ff6e64 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -7,4 +7,4 @@ DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc6502199
 DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
 EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B 784e15f5493576d8a1c7b432159be81aa0cda97e9be3e5a8f919cd6f7333e9ffdb1eb3d4ace32d6be587982df243aa5d7bc11dcc67cf209654af9c5cf70e6e1f SHA512 1de5bc8adea9fab6044c957433a73c5ba5315c800afa8cb4a06d6336d3a5c8cf6a84cdcf2a9d81a063e6f061fbd99d1a8de76a68aac99f96338d744a91d6869b
 EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
-MISC metadata.xml 735 BLAKE2B 0bd39e9c3979edaf5a13331a34520bb9b25470b0731fd5a1f664e0841909a9c1a00358dbd624a596b53c8b052fa89719af4f4d3363c41914f6bf6aad89b67300 SHA512 6d2a5377d2a77e277c6d3fce58c36173f07681456c6688c4cdfb23933853da5ffa72eeac7a5a9c2b3183df00d13d75485cbb4d9f2253371ebd45fdc5087d0c57
+MISC metadata.xml 765 BLAKE2B 9f85da7f3df6def91ca41f8bf45437bb8ea8d773c1a45140719d7112271294d87234752a8319be0e79b909c0d20b18cc91cc9aa67d2c5abe101e54a1a2574c7d SHA512 36bec921d2b2e315343c8597b1ee3408efbfac0ff660838f5aa4feec6f20b22dca9d07d679d4df9bf887552026ce3516732e28d1cc9efd50d07bce745d69b671
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
index 515391274149..13f5f40e96bf 100644
--- a/net-analyzer/prelude-lml/metadata.xml
+++ b/net-analyzer/prelude-lml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
index c606463071f1..7d766c7f6ccf 100644
--- a/net-analyzer/prettyping/Manifest
+++ b/net-analyzer/prettyping/Manifest
@@ -1,3 +1,3 @@
 DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
 EBUILD prettyping-1.0.1.ebuild 478 BLAKE2B 862811bca0cdb0a40d55b8719379ab0b533f598615890c698a7d9e280d255caa0c95eb2c7283e11acb79d42435d5674fb389fb0ead8a53e00dc51b866fc7e0b7 SHA512 4be1f0f7b70bd5f6f68d15367f3e114aae0cfda3203df97b99353a4e94ff77bc203c826a23c136c94c211b5b6e3ed460b17c2540507f544b4925f36e68a7c68c
-MISC metadata.xml 629 BLAKE2B 97885a7298da53e0f1424b7042090df868ebb865f9a4fcb6d9d041bfebdac0d5aea65bd271601dddfa33922e05c8bb021a89a58eb74092636b8b0f82bbf4d050 SHA512 037fbab4a14ae70bf7bf7acae8fb6b6db7d0a74cf9079db3ab591ad49d518850a491d1305bbf5a0b433961eec346faef5ce739b3df82ecdc98cac09d3b6f6861
+MISC metadata.xml 659 BLAKE2B 3a717a849df8dd2a7a2efad7a0c29c0c8381788dcaa75938e59504f959b94c1a14a41edefdaaf2faf9a3239c6973b838396f47929677db2e72877f623383ec57 SHA512 52397ffbc330456d834bbe38afdb3558e74ba3a9fd1f4012f8a3aaafb7cf483ab312b37086415b7d06e706b7e0edbd7b348db413873d59926c8a41c1ff6b71e5
diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml
index 3799608c0a37..b3fcfa01442c 100644
--- a/net-analyzer/prettyping/metadata.xml
+++ b/net-analyzer/prettyping/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
 		<name>Theo Anderson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 61498a97df9b..0b625d5aaf1d 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,3 @@
-DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
-EBUILD pypacker-4.8.ebuild 713 BLAKE2B fa5a0c6c944c3fc24d9d251e429dbd626034032df7a9fd64bcbc957a8ba45d379139fdf91d22102d6e2c8b3521e088a9e5f673d9b9afdc11481cbbe0ab90dbe9 SHA512 575dcd25e1383e31c67c537fba08c6c22ead405571770e446ee4688504c40ed1a0f199f24e72c3b3e0878923d777e1dc496215601ec6eaf3cab87dc2bcaa59c6
 EBUILD pypacker-4.9.ebuild 720 BLAKE2B 83180695914ced5a1bc9709abc795eaf803b6dc16c854b9182a4ce23c633798ab22d1cb0be3b32d6ca94e9ccba643d8674210f1586dc2689136805a39930eb8d SHA512 01b9f7acb6b054027a4aa0ce25c642e257a758f345ae9130d8e3356db1399aaffd1013ef3e59ba6b5e4a35a4973913551248a03e391a3f0388bfcdec0af0e15c
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
deleted file mode 100644
index 6d7d0041fda5..000000000000
--- a/net-analyzer/pypacker/pypacker-4.8.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 )
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Fast and simple packet creation and parsing library for Python"
-HOMEPAGE="https://gitlab.com/mike01/pypacker"
-SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DOCS=( AUTHORS CHANGES HACKING README.md )
-
-python_test() {
-	"${EPYTHON}" tests/test_pypacker.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest
index aa205d8f016a..18cc393a1020 100644
--- a/net-analyzer/python-gvm/Manifest
+++ b/net-analyzer/python-gvm/Manifest
@@ -6,4 +6,4 @@ EBUILD python-gvm-1.1.0.ebuild 821 BLAKE2B eec8d2684f24c0b11c66ad8d3afc65f3c9f9f
 EBUILD python-gvm-1.2.0.ebuild 825 BLAKE2B 79c71f462dcf069f628694a7fa57e6627d1fda48dafbfaff7f2d0aba855580ec4a3ca0e9e039bb0a001d80739e43ae5ea5c70c4f833482d783c0c132cd7867fe SHA512 ff33e31f548afc8aaeea46bee13c728a0bf7ae12ab04fcd0588dd0249cb9098a9557d71af1f5eae9b744d3afaf293cf555eeaf341b07812239cacf8994a22039
 EBUILD python-gvm-1.5.0.ebuild 866 BLAKE2B 4d6612fad898cf44901b57a77abef0d066112748138c11dc8d170527baf00755373b3d87832a11157a1ab07680b5bb251829253d1f679ff207f95f729b5a3d9e SHA512 4738c70b7316e824249610f52039f8c216d1a3fbfaebe81e3209d39a548b9e5f09bb9f4ea12c2b05d18ef7d34662a49d7399b98bc3670bb8dceaacac1cb3b014
 EBUILD python-gvm-1.6.0.ebuild 642 BLAKE2B 0f04c9a050cbc0e1f767565ebaa58027b44ccab3d89c09b97993c5669451cca4682397d8c2fe00d9f3a5af821871d3cedcd6e02d30dcdcb266571410f48948ff SHA512 9e487c89bde3ac104e28ab61cd469938dd3ebf8b883eb01726fdb9d1479811a3fedb6ed3302438ebcbc5e4255af189c9a8ef39a701670073bb846117994a8247
-MISC metadata.xml 879 BLAKE2B c2b7de38e8cbd8057c326eb81bb0071e864634f46c64c0474e8b13ef5645bc69426c2eb179a92c90200442c40f792da1a563afd1394c88bbb835989bcfa5d856 SHA512 baba7e3527bc2317480bb742a2e3edd092f6da4a19af04598e8a6a2d5b9c45d7a5f10d2afcba27843c2d3e2eb7493950c3659a2ba815166f700147f732d9e524
+MISC metadata.xml 909 BLAKE2B b77ff599081198f1d21399f9909fe8005cfa26c4755943caef76136b6570ca510df9354efa4feccb3eb47b0bbaaf97880851ce2cc0184cd81a47ea30e0c4b5dd SHA512 f949284469a19629a0d9f542c40d2d366de6dbddc946ac3a69ef0366d9a2dcc1e419402da37e56ee51977816b47a7826c90fb4e31d871c0e6f23fb2e1d8ac45e
diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml
index fd0b9228bd46..968b09aa1544 100644
--- a/net-analyzer/python-gvm/metadata.xml
+++ b/net-analyzer/python-gvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 67d7f77af1af..e5078056c521 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,7 +5,5 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r1.ebuild 4285 BLAKE2B fa7988df0a282ca8744f67c594eca3e6946d33009aa51b9230a59bce11c73e3b50434a09f831f7ed0445b4b48062934237492276a7a3f217045a321f20ae9384 SHA512 331b0993d3f352187b3e65fe841502fc4cb00f3353b6535d5fdf4c13aed808196c7f3ec6e5b86949c356f2911d4f26e9a2a75761586e585234f20531b4b70b28
-EBUILD rrdtool-1.7.2-r100.ebuild 5670 BLAKE2B fd95afabbd2bb214eac8e8030deace0b142fefdc3b8c021e9e573cc3245637b163e037a482c07dd30f4c4e5a6cebe32e1858d8c06fbb0fa404b442836845290b SHA512 bb07a06155cf801c3dfce92587f736522805efeac21a1f9775f85840f169857537209ecbca97cea7dfb067145988cdd0546f913a4dd8cbf3cba01c5098ed52a5
-EBUILD rrdtool-1.7.2.ebuild 4290 BLAKE2B eb6142d4ab03c640e557639252d8db5818a30944cfc06b19fc7e7b0132cb25b5f22564684fa836750bc0a6695f8cdcd9aa97dcda3a15cd5edbe8b8ab1c34fe7b SHA512 52b56a2512525888b7eb6d40c3ad7f890d5e16a8e19840d099707965915281201f8e9a6db3d501eaa4e850de5963295ae49043a63803393ac98f23ecfd5aeb76
-MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
+EBUILD rrdtool-1.7.2-r100.ebuild 5760 BLAKE2B 3a5cd702f9f5407c4b57d434a875a7afa3fe8a63cfe07eb8375f95897934519593dfeab7c7f3fbd541c35a90aabaee687be9b27f14467ce30cb3f8a39b3ba98e SHA512 028d78b9ffe6cd5698cb5f136f8be19b3b5e293ecdc3294ca4c58a5a6810e2a3c590de106811f7c278dc73c667d4073e44a0083103403e673e450fe1eebafe2a
+MISC metadata.xml 584 BLAKE2B fc6bd75c58c7803f1ab26c41cc2b58dc4e8555dcac7a48428967854a1b8063eb0e745bc7c07672b805ea8adc55df0b7c8acd51576bd7b89ab37b45d9d04b4d11 SHA512 69ba81252477dfd6efc01cfe886d3ca28eec3214348d5bc6bc7f73eb3ff50080977b5c74058a00cf62e504026aa5fa096b0ed1389da121c403bb27bd6d4c2068
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index a6a291c9723d..d2dbe95efd3c 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="graph">Enable support for graphing functions</flag>
-<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
-<flag name="rrdcgi">Build rrdcgi support</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="graph">Enable support for graphing functions</flag>
+		<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rrdcgi">Build rrdcgi support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">oetiker/rrdtool-1.x</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
deleted file mode 100644
index ba8b9c45ce93..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 8e87060d737d..6dbe3765730f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+inherit autotools lua perl-module distutils-r1 flag-o-matic
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
 SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
 	lua? (
 		${LUA_REQUIRED_USE}
 		test? ( graph )
-	)"
+	)
+"
 
-CDEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
 	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -44,39 +48,25 @@ CDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-
-DEPEND="
-	${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-BDEPEND="test? (
-	lua? ( ${LUA_DEPS} )
-)"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+	test? (
+		sys-devel/bc
+		lua? ( ${LUA_DEPS} )
+	)
 "
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
 	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
 	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
 )
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -86,7 +76,7 @@ src_prepare() {
 	default
 	# At the next version bump, please see if you actually still need this
 	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
+	if ! [[ -f doc/rrdrados.pod ]] ; then
 		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
 	else
 		die "File already exists: doc/rrdrados.pod. Remove this code!"
@@ -105,7 +95,7 @@ src_prepare() {
 		-e '/^all-local:/s| @COMP_PYTHON@||' \
 		bindings/Makefile.am || die
 
-	if ! use graph; then
+	if ! use graph ; then
 		sed -i \
 			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
 			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
@@ -122,20 +112,20 @@ src_configure() {
 
 	filter-flags -ffast-math
 
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+	export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 
 	# to solve bug #260380
 	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
 
 	# Stub configure.ac
 	local myconf=()
-	if ! use tcpd; then
+	if ! use tcpd ; then
 		myconf+=( "--disable-libwrap" )
 	fi
-	if ! use dbi; then
+	if ! use dbi ; then
 		myconf+=( "--disable-libdbi" )
 	fi
-	if ! use rados; then
+	if ! use rados ; then
 		myconf+=( "--disable-librados" )
 	fi
 
@@ -158,6 +148,11 @@ src_configure() {
 		${myconf[@]}
 }
 
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
 lua_src_compile() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -189,17 +184,23 @@ lua_src_test() {
 
 	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
 
-	popd
+	popd || die
 }
 
 src_test() {
 	export LC_ALL=C
+
 	default
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_test
 	fi
 }
 
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
 lua_src_install() {
 	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
 
@@ -209,24 +210,24 @@ lua_src_install() {
 		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
 		install
 
-	popd
+	popd || die
 }
 
 src_install() {
 	default
 
 	if ! use doc ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt}
+		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
 	fi
 
-	if use lua; then
+	if use lua ; then
 		lua_foreach_impl lua_src_install
 	fi
 
-	if use !rrdcgi ; then
+	if ! use rrdcgi ; then
 		# uses rrdcgi, causes invalid shebang error in Prefix, useless
 		# without rrdcgi installed
-		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi
+		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
 	fi
 
 	if use perl ; then
@@ -236,7 +237,7 @@ src_install() {
 
 	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
 
-	find "${ED}"/usr -name '*.la' -exec rm -f {} +
+	find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
 
 	keepdir /var/lib/rrdcached/journal/
 	keepdir /var/lib/rrdcached/db/
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
deleted file mode 100644
index fb33d065e265..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:0=[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	test? ( sys-devel/bc )
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/sbd/Manifest b/net-analyzer/sbd/Manifest
index 202dd5d5fddc..1f6029ce4464 100644
--- a/net-analyzer/sbd/Manifest
+++ b/net-analyzer/sbd/Manifest
@@ -1,3 +1,3 @@
 DIST sbd-1.37.tar.gz 83991 BLAKE2B 7dd0f1e3c428e9eed24ca513c99a242ec5bf2a147416b2a979335ff9c55b6d68ca8769ccd00e11637e0411c9537895fd2523a3f237be704d4540db5b4d12bbc9 SHA512 845f3eb20d3a6006f7afc9b60eecaa3049172b3fb2796058f18a13ddbfb7f2c9914bef45bd4f3557db814783717eae24fe13d46d22c65359ba3f816c6d52ea7c
-EBUILD sbd-1.37-r1.ebuild 649 BLAKE2B 008bd41b3377d4b34359c611d140287a3ccb1801ad6a25919be4152be29576f86740783f4609d5e6d5ab0a1aad604d3acd490943accfe3ab49e7da69f943f7a9 SHA512 39e51120c26bbe6eff07b449039009811e3e747d06c06a93c6da8fd480b6170840d9c3980ea713d2697b0ce8b1365d71ca359f954634650c13e4e89f7d958248
+EBUILD sbd-1.37-r1.ebuild 658 BLAKE2B eb895fb5a703a238947704ea57b20179870120c443c898d822182bfc77b31378ae17e0c529727d99b63fc97c1cc7a17ccdd1c66a7060ca643b2c275a129b284d SHA512 2394908299bd7c044f0ad2c0704e87df8a8cbc281efccaeab1e3dbe5a0295f4338287a5eaf9828e2df66d592987b7f161fe772880cb89bdead2a273a168c1759
 MISC metadata.xml 625 BLAKE2B 4e509c997323eb5429fce6bc9a7873fbf8d3b362093efa1bfce58c591f95fdd73a73395e71c0375c96eebbcc85d809a63ce1dffe77ea0bb3c1741c34a7c4f36d SHA512 80da056e231f3f68263ca3d4f44b79990efce1679878923ae39bd31875d19319851e58d5d99a1d21eacfb03c95374ab765d24a3b92aa213c1c23387ad33263e0
diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild
index 514310c7e942..6b87335cd5a6 100644
--- a/net-analyzer/sbd/sbd-1.37-r1.ebuild
+++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption"
 HOMEPAGE="http://tigerteam.se/dl/sbd/"
 SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \
 		Makefile || die
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 081ad7953afe..fba157765015 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,4 +2,4 @@ AUX scapy-2.4.4-libc.patch 406 BLAKE2B deec0a79cc1edf60fb5cae49945e0b3384d3671fb
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
 EBUILD scapy-2.4.4-r1.ebuild 1132 BLAKE2B 9e443884839312921260be7323baae52abf5a85799f6cab9d499cc02ac982b75746f097e48050bbd6ede928d35b5f4c37fb2eebf8baed4b2b6fd4c81af7c7e1d SHA512 9f8d9da8c924689ae39adfa19f5dd30b53e3808aea70e11df8b4a8927eac3d3a4c7401dc194b2df875e67825b25851ce304be4213ac31b1fa48e878a2190ab32
 EBUILD scapy-9999.ebuild 1018 BLAKE2B c892db076650ed6ebdc294a1d3c8edad12b981a910ce0b961d7c5b5bc84b9a2cc7523c2aed1cafdf739b1bc1ab97064d8a2683bb97c18667541fe15cf5946773 SHA512 912e7e95e42842c5c7cda3ac93d7ab7147c9924017d91906e333f896174c08036b97e1ab1500cbe2de54171b13fd0f3d1116902109c929e08675b323c82e4b86
-MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
+MISC metadata.xml 584 BLAKE2B ea0689ea7a708e36148f15307cbabb2a32e018a4442cc58f5da1fc95ebfdb1a9e2a8468a68f3e5f441bd401b59b3d877d27fe651a94b25294c2881e7b5286f35 SHA512 1ce387a001b5bb8ce6acda68d43a9d02f50eda40da9d434ff1e544032a07c6e50f4b5e2d821383cdfd333ed15423f04889fce84f9bba2a19c03567860a7a9622
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index b3243d196ed5..044a35fdb0d8 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 8ecfca16429c..77399ae7ee53 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -2,4 +2,4 @@ AUX sec.conf.d 352 BLAKE2B 7324f809c3fcadaa3755994ae43fda4ff7b9df2282fd68e831de3
 AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca86f272206f0d93b3f9984813382a2e4063b0cf0bcee0f3c2ccef1c7cf48c7bb6e535f65738f6 SHA512 9f079d629e21d20e16b4455d6b6b3279a56c0979abdcc90a8b488cae5225cdef4f7d95374b7e5b623196f06d91f2bd3c50691e787b40c90cbe34b478d8b37952
 DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269
 EBUILD sec-2.8.3.ebuild 608 BLAKE2B aa1129118698bbf65eada5ebcae0924dac5cb41bef4168fee0f9b433784bc3a6ca641c85dcdeee33086c4336f88ac4617a9553547b2daf22e05fde2fd8c0bb7b SHA512 7b0c594b6e64302bca68c197ebc6b54cfff49b461bf468f601076e5b391ba00f142b2c54d59aab62651dae0724a091b150a4dcd0dbc7920e19fb88ff4ffada9b
-MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
+MISC metadata.xml 420 BLAKE2B f5097ddff26bab65d503f2ef9ac66150d9f81d4fe083806f9ef3856f6089f9784ef00202ae2aca5541e3a4c9c1b09a444f1c8db0ccc0bca02ee612b4f4ceac2f SHA512 4eca0374a0ef57e44f8f62123f640da20a3f42122a0a4d250a2dca657605091c860ab7708de0cdfb838b981126d329331770857f09428f2305ae5ab23b26fa9d
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index 2d02138ee2cb..b8e6f69749bc 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 6f7e00584179..8009bb3bba4d 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,3 +1,3 @@
 DIST sflowtool-5.06.tar.gz 78044 BLAKE2B db4a14d3e94660c803399f99b486bc04579b8dacf4e01f484ebeb31cbeec0ad279efdbd85b5a242a4dd9016e36428992344af50275dfd15c89b3337351d5fdb0 SHA512 365922e09544928bbf5893c04e05bc5b3d632290804711cc248d6bbd52c8ed30646bb9bdfd7b231a357f88bd5592473b95edff6ab3b50121809f909b4b65c7a2
 EBUILD sflowtool-5.06.ebuild 659 BLAKE2B 68e1b409c6be500bc53514a61083f4be6db8bb3aac16b9f8898bc56c3baea0fd3b8a0c199f8f3c471cc0a96ecb4d973f17251a12505b2183574eca71314d7391 SHA512 052e03668d35a256fec5bd60956b3e4a6d4adeb3e22f1cf37e03f9dc7ded55aef82c4211822d6177caa88957e172edaf1659e512d33d75fad319bb7377335b2b
-MISC metadata.xml 370 BLAKE2B 54ac4c209077f5fa6d73a231013370ac06ce05d5f1ce8704291c0b7631fe8eafe6212065876287850e5ffcf56b532bf2fc7c678fb30dda1c8f6dd969bbb63c99 SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d
+MISC metadata.xml 370 BLAKE2B 88fd419c519c4f4c8319aa7620ce0570ea2f9b8dd3a5061bae91dec301da3c3331da81870bb0eb353ee0d674c0edb0604437b83bb0997a58114efb509c45bff9 SHA512 c98355310c3887c53d3df65090b3ac387f1c5e0f173c30eb44fa344aebf095e7faba6d5734d2a69c3ee9acbbaafe539a9ea62e376529fd220b2fcdbde009d14a
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index 66b83a2d79ef..5d7fbec6b22b 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index 47a2002f1de2..b283e138f041 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,5 +2,5 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0.ebuild 2167 BLAKE2B af862aedec86528a7dd4b7a1557b09db7f1e3c13a57d310fd931b51a3c8137d89e83983b42739380c4a9ec41d50a1774eb324d595033ba5b47c1adcb2853eff6 SHA512 49f7331ae80c291cd9b7a37c89dbf977f9ce0ea90d13a909752a4d0942e179eda1faa2712165a1b33d7e320cb1ff35497a7b6a655d02bda924201fedb6435cdf
+EBUILD sguil-sensor-1.0.0-r1.ebuild 2177 BLAKE2B 948191fe3834dd5267c701e38a6c03124f3df2b2c24d5010bfc05242473033a638d1f1a441af398985b032d1012138530380f232c552437bebc6599257bd5c50 SHA512 feb73b40ac4e2dcafbd0d6a50d6c6ca6904dc84d86e787fbd78c57512a57528c40fe474df011e7dbac1088fc600b2aeeb9c09543ae76a32ea8316474b4e475ed
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d07d5ee62911
--- /dev/null
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.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
+
+inherit user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Sensor part of sguil Network Security Monitoring"
+HOMEPAGE="https://github.com/bammv/sguil"
+SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tls
+	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
+	net-analyzer/sancp
+"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		sensor/sensor_agent.conf || die
+
+	sed -i \
+		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
+		sensor/sensor_agent.tcl || die
+}
+
+src_install() {
+	dodoc doc/*
+
+	dobin sensor/sensor_agent.tcl
+
+	newinitd "${FILESDIR}/log_packets.initd" log_packets
+	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
+	newconfd "${FILESDIR}/log_packets.confd" log_packets
+	insinto /etc/sguil
+	doins sensor/sensor_agent.conf
+
+	# Create the directory structure
+	diropts -g sguil -o sguil
+	keepdir /var/lib/sguil /var/lib/sguil/archive \
+		"/var/lib/sguil/${HOSTNAME}" \
+		"/var/lib/sguil/${HOSTNAME}/portscans" \
+		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
+		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
+		"/var/lib/sguil/${HOSTNAME}/sancp"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "You should check /etc/sguil/sensor_agent.conf and"
+	elog "/etc/init.d/logpackets and ensure that they are accurate"
+	elog "for your environment. They should work providing that you"
+	elog "are running the sensor on the same machine as the server."
+	elog "This ebuild assumes that you are running a single sensor"
+	elog "environment, if this is not the case then you must make sure"
+	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
+	elog "You should crontab the /etc/init.d/log_packets script to restart"
+	elog "each hour."
+	elog
+}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
deleted file mode 100644
index 7df0389de138..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	>=net-analyzer/barnyard-0.2.0-r1
-	>=net-analyzer/snort-2.4.1-r1
-	dev-ml/pcre-ocaml
-	net-analyzer/sancp
-"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' \
-		-e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' \
-		sensor/sensor_agent.conf || die
-	sed -i \
-		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
-		sensor/sensor_agent.tcl || die
-}
-
-src_install() {
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/lib/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 2f96be642ca1..179d9bc03f7c 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -4,4 +4,4 @@ AUX slurm-0.4.3-tinfo.patch 267 BLAKE2B 2cd7d9cb11504b1eaf9b940e82a8baca65bd067b
 AUX slurm-0.4.3-version.patch 170 BLAKE2B 21d810de2df77546c584d66c85d180054b3f569933771d2e265809308d51eb247a1fb74fad7bb6a3c6c8dc8c7386527b27f796bca31d22cdde5f4a8d277f64ae SHA512 40f2e3bc6c2136f7bc91a719a5e8ffcaef4112ff9cacc5a61ebecbf9d3272b1b3aac425b9e22cafb4fc0b630aec2338e1c2ada27d9d2828fbbc90af215cb936b
 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
 EBUILD slurm-0.4.3.ebuild 703 BLAKE2B d8816f08f1be187c170a1f805d3cbe2e5a341cac4b19857f2a37d0a21ce3cc2e9de660f5bc1ce0b2f11dbdd0e462e101d8d4c31a6e003bfc859dc14d5c9f8004 SHA512 c66c994f8d152177499684255e3be582c096f61bda0cf5203bb4952e9bd64a3fe77c11d35f1c17160b72a3cfb1eddfb0f3b1dfeb620b2ae1752497e54797d0d7
-MISC metadata.xml 360 BLAKE2B a7b740796c57e64abb029e278f22e04a9af73827f35a2b1576b4f955d74c23cd1c16c9215b831f46030f55bfa0727bd50ccfa31ca7ad999bc574dd6cc4b575bf SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12
+MISC metadata.xml 360 BLAKE2B 53033de487621be982fd0a6074f5466f96a38c5222c8b4379cc719ad283973dde556b95500a5d4b5ff2b1da93a01b93222fc353a91f5ee4305f2d08d8fa19c90 SHA512 2095f099496ca856597b11fe278894ee0758df59bf46dc1819c5b2399230c4fc63878ccab57cc273f1eb22272a49d68ac0aa95d065af786f343766ee98526f34
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 7312d8a52540..63ee64f6f158 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 907dba68fd8f..24599ee79880 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,8 +1,5 @@
-AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c
 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.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
-EBUILD sngrep-1.4.6-r3.ebuild 878 BLAKE2B 0fce80e75ed5959ffa4ef3a930028b59b5f09b60aafafbbcf14160485d3d5f542216b5f88490fad2d40b18c5c12821ca98ced7fd7a657ddff6d2cc5348bdc58e SHA512 4db6ee2085e7cd5dadfb24a6ef044c4b2a709b9a3788fd0e33aa352274785576eb489a11dfbf122f6d74e521f00d3e3da4cd03a05988ed63f5461f62c6813967
 EBUILD sngrep-1.4.7.ebuild 880 BLAKE2B 985c02fe8faeb7d69614571dc5ee17b5be9837135243e09d06a370d6ca9c7fa37664ae7a4ba83de58189ff2f35ecf0f3772f37f86beff834706241e3fe52be6b SHA512 553168f488dfbe3f0fd1062d58d5c86c6b67c53d390f3fcb979ae2cba74a52b6bf717a8d12173833ef191c725fa90be7d58b2bcda3b2fdb07292941f642a6df6
-MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
+MISC metadata.xml 468 BLAKE2B a6188410ca42f6552dd8c1bba6ebe2fe427e345f94308d23b98ee8566937256e765e4de9cf4ababdc02cd7d57215673ff0e160c2c56ea17fdcf962bee3fc28c6 SHA512 9adcfea9b56a062815ebb0aeea72302edd9029fb827b28c73414d9bf9c1f2f0643478ba5e32e1398d19d9d68dfc553eeb71902dd31ead7176dd758b259dc8adb
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
deleted file mode 100644
index b61025d25b6e..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/capture.c
-+++ b/src/capture.c
-@@ -191,7 +191,7 @@
- 
-     // Reopen tty for ncurses after pcap have used stdin
-     if (!strncmp(infile, "/dev/stdin", 10)) {
--        if (!(stdin = freopen("/dev/tty", "r", stdin))) {
-+        if (!(fstdin = freopen("/dev/tty", "r", stdin))) {
-             fprintf(stderr, "Failed to reopen tty while using stdin for capture.");
-             return 1;
-         }
diff --git a/net-analyzer/sngrep/metadata.xml b/net-analyzer/sngrep/metadata.xml
index eeb043ad62b3..62fedd1ad64a 100644
--- a/net-analyzer/sngrep/metadata.xml
+++ b/net-analyzer/sngrep/metadata.xml
@@ -5,8 +5,8 @@
 <email>netmon@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='eep'>Enable EEP packet send/receive support</flag>
-<flag name='gnutls'>Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
-<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
+<flag name="eep">Enable EEP packet send/receive support</flag>
+<flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
+<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
deleted file mode 100644
index b9f731a5e648..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.6-stdin.patch
-	"${FILESDIR}"/${PN}-1.4.7-tinfo.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/snort/Manifest b/net-analyzer/snort/Manifest
index 58c0f009b600..cb703d3093a4 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -8,7 +8,7 @@ AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
 DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590
 DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75
-EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
-EBUILD snort-2.9.16-r100.ebuild 8403 BLAKE2B a0e34374c8d1fcebf79e67cbde006350fbb063b6fd0f1312033b9246e0c4aba78ed33496471a997e304506249d74fd1d3499024aa6af9c398111769090c600ac SHA512 373901f5995fd2393758c041314bf2d8bc052dfa75b7c5e13f1fb06c912e0fc99df2372fa522497b732e19bbcb65411033225a339d32038d2d71d78b2b2bd804
-EBUILD snort-2.9.16.ebuild 8290 BLAKE2B c79c137cb7bff4c3c0b55f3d73b52e25a10ef61b268e178948f36da4ec70be3d8834cdbe679a6e6c86cdf0f5244e912d25493d0ec1121dd29875a25a82cfa983 SHA512 9211178da2253e549c096f1c553a7a63fb8bea6071079d34c3db709abe1524f39d8f4936703e32802a073bd7407fb3945ea4f0216616ea33cfc312319a7a0a47
+EBUILD snort-2.9.15.1.ebuild 8296 BLAKE2B a85504c132e629fd023de19a6fb95ded3194fe23ce2af9e1fc1284b50cc7a736735a79961bce06ec86ea82072ba2148970ebe28d171218eb1bb40ff7fef37f54 SHA512 caa6697e0725bdfb7d5dc51f3f0cce02fc0dd83af67793a8e7930cd84e7b14535bcb12b09dd8d4e67da178e8e48b7590377d484f1c2bd54e25cbb2346062584b
+EBUILD snort-2.9.16-r100.ebuild 8409 BLAKE2B 8235121f2f81c53aa7b2d58ecb15647062a7cb391ef6aced8351572348b5ef2e9036c9190a29a1ca3e3d2dfc08ed7624de6b15ac03d254b8b748f778c87426ea SHA512 e7ae4bf8fa7b1898c2686664f2993be906ec9e3ccecac34251cc9a8b7099e1633ba20e662d18ab5b4902b595ac491bda5e8c3efc5f546322d3f126d730a2d58d
+EBUILD snort-2.9.16.ebuild 8296 BLAKE2B 11cd245301793f6a4da6d98cb194cac7c2927817eeea81343b86b7f42562cba24950cf9327bb945321c0c21e535f286fe33d09296b6bb3e1c0a00cea7f98e075 SHA512 a75bae48d4aab6f9b3970be191383f575c431459b8b6933ec65ffe01040d75c628f0da191f4593b9140f45f7454e7683a03b3d0a6da0b12c8fc11afc5538c2e4
 MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21bdbd512480..440d87d8359a 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.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
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index c3363729e9af..66b2b845e872 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.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
@@ -159,8 +159,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild
index 6e7835a53107..4a3f0392b5c1 100644
--- a/net-analyzer/snort/snort-2.9.16.ebuild
+++ b/net-analyzer/snort/snort-2.9.16.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
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index d2225bdde6ed..103f9286316a 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -7,6 +7,8 @@ AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 BLAKE2B 35a7860d59c63d9749e1
 AUX ssldump-0.9-prefix-fix.patch 554 BLAKE2B 797544d1bd63e476379f2c6a9df8e6377cb839a179e3eaee47b00d35c967249e050a5a235efcf4c8606f5c7ec3e354b6a869c372bb0ddd215f1b21ecedaf2383 SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8
 DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
+DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
 EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 4451fa21e460c7554d7cfaa05f1ad7b0cff8af134a619e8262a7f1cb8159218974f5e3034da807818228ce7b93554b616a607a56f924becb12bfe14c60a1e5d4 SHA512 ce3c6eb328a86b04693bdb308ff3debd9486ed3304e0cff38f48d7a076ce4b8ef5394e066887ac69d658fbd29cfa54881a57f5a2b72aed9fe68f19cd80de9480
-EBUILD ssldump-1.1.ebuild 932 BLAKE2B b0941b455b7fff8d0af2a9002dce7139fdfa7ec4bd29905d9d114daf8f33f8e8d4413d74352429f44e66d9b153bc8c3d6b66d9ff7797e667c6c89c3bba92ae38 SHA512 4c8a236aa5f84a61490278627f0e40258e3929e55e0812a29f80ee1ea7c47b2df0c8f954a9cae5142453c6e0965b40d0066e0178e73cb021a121cc4b82c23423
-MISC metadata.xml 359 BLAKE2B f35ef1086c0c3c4aa4f9131d63ce2f014ed376a841502dc0de02f6261b8358f6aa1e01ff55c87f39fb5ad71478c70e98497f1bc3b25034d374ba58064393b495 SHA512 c80158a4a7334b16b28fe0462cc82e70c03674bde862f6858ab6f67645cb3d856fb41bfe5480690fa25c85b0a5205bc2f6cf2febb45fd355a949da92024fc1ee
+EBUILD ssldump-1.1.ebuild 938 BLAKE2B 06f060fa831fad3f474a9ec17143b75f0a775b6e54436213f232f867e18063b876f92037256be91f4f65a10dc79dd0754426ec314691d6112a3825badccd24fd SHA512 d07b96f75e830924757e1b7f3473dc05d907aa1a92fe228495ad10225ae5533d5a31d90da45769e30144ce430830b4c961a3eeab2150adaeceaa88fc88ce9b92
+EBUILD ssldump-1.3-r1.ebuild 671 BLAKE2B a671056fbf79208e795c53ccc693ddc97530cb27af6439739cc80f69c85436e8f7ffd3bf539426f5c252241f600cc8b90413150692403bfaa12afef4b7047761 SHA512 adbb68839511cc2f66dc46fbe4077c46db8a2386f08fdb69edf2f66a83d0494c246c41e5618d218815086d6872ac45f9c8c87e3246ab64cb6226bd8f367aaf22
+MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 12203e1a761b..8d1a6814136b 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild
index 6263f65aa674..84bf5b42e215 100644
--- a/net-analyzer/ssldump/ssldump-1.1.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="An SSLv3/TLS network protocol analyzer"
 HOMEPAGE="https://github.com/adulau/ssldump/"
@@ -12,16 +13,14 @@ SRC_URI="
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="
 	net-libs/libpcap
 	ssl? ( >=dev-libs/openssl-1:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	tc-export CC
@@ -29,7 +28,7 @@ src_configure() {
 	econf \
 		$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '') \
 		$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '') \
-		$(usex ssl --with-openssl="${EPREFIX}/usr") \
+		$(usex ssl --with-openssl="${EPREFIX}/usr" '--without-openssl') \
 		--with-pcap-inc="${EPREFIX}/usr/include" \
 		--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
new file mode 100644
index 000000000000..ddd41125cefe
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/json-c:=
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	>=dev-libs/openssl-1:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README
+}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 9e5ee33a8040..9e6e1b8b601a 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -4,4 +4,4 @@ DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe51
 EBUILD sslsplit-0.5.4.ebuild 1124 BLAKE2B 9ebb355d542cb612248af4a2c4c6d4bda11be3f4c7c19a4aa0907f49568433dff1ece47be11544923078ffb1725be5036468a6b76b207c9d156097ff96011377 SHA512 ed21a23c0c7913e1a3e4507d0c5968cd26b850269dbce03f71213a40c0e02709750934b285cd656d1fd09d933a7206fb0fb9f4b942ad55da9e483dac6566b40c
 EBUILD sslsplit-0.5.5.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
 EBUILD sslsplit-9999.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
-MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
+MISC metadata.xml 903 BLAKE2B 2084a096ce253652dbe19f7390b878a1763361ead1489c08cc20f1d7c18b656f82bddf7ba009197e50e747548fd9a79098e3033a0e5c8652d07df1f651611dfd SHA512 f069b1ecd872409c3f056b096b67d43af37ab321145a1b387e3e085c0c5ae9c40efb6cdb7a67c39521c4f21758769f89df04eef8610c478c9d40dde28db80075
diff --git a/net-analyzer/sslsplit/metadata.xml b/net-analyzer/sslsplit/metadata.xml
index 614c7c40e2e1..196e3388620f 100644
--- a/net-analyzer/sslsplit/metadata.xml
+++ b/net-analyzer/sslsplit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 4ef5a246e9b0..9a3b306fc7da 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -2,7 +2,7 @@ AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
-EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 90dad95e765825652c9e7da84b69f863fc545d522aa14fb9c2994d3b5f1276c0b3d03d817daf57b54140a1d1058ea0c36203e7918851fe4af3f10e964c82ca2d SHA512 cc654bde41b19b3f52616c8c9fb3693307bc21aa4ed1568df7d7b68e28a453272344358a4c13f5258de96a045009875696d734fbde7b2ac73fcf2c89e84886f5
-EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B e03e459e57ab3736c6ece4e9a99c7c320573712909f925a604e4c7ff1b7729faccc2aed2eaec61765abb1851aaca46ad1278563cfc40165f4502c6ae549f24b2 SHA512 2d57452333b322115e4cee5d319cf9eb5e351e9825f9906ed9ca82ce44962b9bb5d93a7ed54c1ca2467bdad93bc3280fd9e2f01e72b3f36db0bb43b455d9c35b
-EBUILD tcpdump-9999.ebuild 1721 BLAKE2B c78759b703923b0b79a81cb79499dd8b1f3a90592eb926f14fa63caa68df2ea93b5a593fb1e4649aa5a492380a93bef800d30aeb5e1f4f90c6f16b1aad3a83b4 SHA512 35ddcf9bd232ed197e33e328cdffc41c2f8cedd5508c4f78abc55b05de3eff0dca43750fa76d7fb52a5455f6e41a5398928c1fba7b573dbac63dcab2f8b68350
-MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
+EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 9de2877989906aa1d870f6d450040da8e6586ee5ecd77c66ff11dfb7848f9538b3739c5c458e4d1bbf8fb811f646909b4b9bc2956c1656c11fc64010355510d8 SHA512 b131e963b567a24763c85b5696e3b633aef1be2ea22d03c3a76c4867bd72aab9bf42d2eba9c2ec2c0d1c151aff016199fcd4085d78f14db0b7b25240793ea684
+EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B 88937ff7ca63caea3a9c84a2ca5e97bd11623de064cf385b28ee33a4200fef8fcfdb8283a33ed4978155d79f3df3c0d6ba0d074289650ea7cf226f9684c36fd0 SHA512 82989ef5c40bb17a4d1efc4df929921044dfc3abfd0fad74934a26fc7608765f0559f055f1d51f1e86ed3a2c8218087c822ed39eac7241117adbec90dc7d5b50
+EBUILD tcpdump-9999.ebuild 1710 BLAKE2B cce77f9bcef21eeb2f6360b2b7d0cca85e4f3f5568c39cb8b3ac2c69fcc8aff2942715d70958d847e7425be2da49a353260287488273a1ebf51c5b0d8238ceb2 SHA512 73a88872fcc171ba0aa074e96742aa937a5b988b3f0c7196b2dec02d566e60201c6b050548175fdc2f30cd0e829dc28e82e21f8ea07c58fda7815814c651708b
+MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 1f6e1c98b574..d9e2e02c82d0 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 6c0d493d0ed5..217b3f570c80 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
 SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 9ddf16dd2aa5..2edd75502e32 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
 SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz"
 S="${WORKDIR}/${PN}-${P/_}"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 4765315651b1..17c0eed4bfee 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 inherit autotools git-r3
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="
 	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/tcpdump
 "
-LICENSE="BSD"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
+
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( samba )"
 
diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest
index 97e92f57c459..ffd085d234d7 100644
--- a/net-analyzer/tcping/Manifest
+++ b/net-analyzer/tcping/Manifest
@@ -1,5 +1,3 @@
-DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d
 DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992
-EBUILD tcping-1.3.5-r1.ebuild 629 BLAKE2B 05cd6050a41c66d83680bef698b122c743c40625f82d9b52c5c1c3ccee1ad56f86ce370fe6e5ed304234e6398bf48d7b5f264b5134eb4fac4ee07605cc7e67d4 SHA512 2114c7fbafe9714a4e37050b04959af00cb78e5cdb26ce8dcc5474d35ddda4ba9c3c442f05e0b304857e6a8231d6b8a565db58e1f7c19c3206ea8780f2a948d5
 EBUILD tcping-1.3.6.ebuild 624 BLAKE2B b1dab34c816c4a4605eb7ea24aa87a48d44b5dbe044ed2a37921b576fe04e929795018f9706e67f5cd9bef6f43de530f4be6ab84c8194ead11bb63734ae5447f SHA512 64161c96305f32c264b4635e48934f13293820b4d5e8f52ef6f235a7e72afb531890b96a529f078de5e33e88517fbf0a730e788e4780e6ea259bbfb6ad298d3e
-MISC metadata.xml 214 BLAKE2B 4dab37301a1db60dcb52e9f891190c6a47df7685658ea2accf8e152430b2ec3162a78bc9ad4cf7836954b10be3897228d998c0436a1179df673c25a87b166a86 SHA512 81de8d9677e88447cac7cfa2b6155040211f235c3186591a08a145b9e711f1e7cfbb133762fc9f54db8ba975e5cdba1f7654775a523150556fea26af6ba116f9
+MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
index 12edb2ee98a0..825589988b40 100644
--- a/net-analyzer/tcping/metadata.xml
+++ b/net-analyzer/tcping/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>netmon@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild b/net-analyzer/tcping/tcping-1.3.5-r1.ebuild
deleted file mode 100644
index 956a3556561e..000000000000
--- a/net-analyzer/tcping/tcping-1.3.5-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=7
-inherit toolchain-funcs
-
-DESCRIPTION="Ping implementation that uses the TCP protocol"
-HOMEPAGE="https://github.com/mkirchner/tcping"
-SRC_URI="https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	default
-	sed -e '/^CC=/s:=:?=:' \
-		-e '/^CCFLAGS/s:=:+=:' \
-		-e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \
-		-i Makefile || die
-	tc-export CC
-	export CCFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcping
-	dodoc README
-}
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index b4dfdd439519..c55bfa620cf1 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,5 +1,3 @@
-AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9
-AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d
 AUX tcpstat-1.5_p8-_DEFAULT_SOURCE.patch 510 BLAKE2B 37197b4cbd2c957ad06f8f9813675678b1105e5e63664885dc8346ab96a07e3ca55485a472ea7b6c027518be031669ead178c438bb315ae813e47e7d982f4c46 SHA512 36f92f585e044695eaec96c557bcdd42be170d8d2827c31ff1d310931a7f7aaabe8cf0495ce70b110534872d155af9b9934106ac001bac16662cea8c74e257f4
 AUX tcpstat-1.5_p8-ipv6.patch 1031 BLAKE2B 140174a7dc761c1a9c3183919fd3594e61f866282ccbef95840adeba9dab062d73652335761c13183f9df291b854cae2801001ed32be7571c9f744176bbe90a4 SHA512 65bd5be8498317c7a778d56582d716433ae1eeabbccb0ae6b5deab7de067927db23e4cce0115bf7ece5e410851cd9d74c9523a1ec802bcea4cd7933bc9121095
 AUX tcpstat-1.5_p8-libpcap.patch 191 BLAKE2B 2bc5d3cb2abf84459e4eb0869ff41b295415c9075b69faa97c27eb604658dd9ff8a7a8f8b0f8515cb26f3554672bd3222a8cce0a4538dbd3e1931df6506d07a8 SHA512 e94799b018178c92541e33afaf297fe60039344392fe2629bc82af691df5c14f3e629e2728d87f323ccb191a1dd7d0d501967d73f0d2142e20b4d13bc93467df
@@ -7,6 +5,5 @@ AUX tcpstat-1.5_p8-off-by-one.patch 1299 BLAKE2B 651fddce0312ecf6c7c6d55f1bf7d65
 AUX tcpstat-1.5_p8-unused.patch 2731 BLAKE2B d1d120953a68cd5fa1dddaf3b6521c953fcf3772fd5d52cafca2fbbceffa0c1245a4e882b6cad17464ecc003642efd54fe00413eade52cf16adc1985c0c0431a SHA512 5c9a058dc299b04e8cd7b875643200efbcdfa99cfbd33b5527bf4b0960cdeb44767bd3da3df91c4ba8b4ec9dcbd1d5a313c880c7d32ed5ded9201432ff871c09
 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab
 DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41
-EBUILD tcpstat-1.5-r3.ebuild 901 BLAKE2B ba69175b94aff336df71902cf519a6b6bdb9f5a7da838755f954f43de30c51cf9d27e1ea3089994b61eadde7ef9fe9ce65c91309a06ce217646c5a47a30586f6 SHA512 6a124f03a3f57e31a9459b53c5df803270d459e665284bd20726db326e91dea000adbd5c1f95678ea44d6a4ec0042dd1e5ff4670a7240c0c6359d59159c02ee0
-EBUILD tcpstat-1.5_p8.ebuild 1287 BLAKE2B 521a7edc1f13c27f712a39d8dc744c2884812fcd8fb1d70875ab846cc07141544bc9ff6c27202b6998866c37456f6aab5376798c39733dcde02d48d54c52eaca SHA512 24fc76424d3a625a85c8048a37ed0b88aa4be31fb2c5eea900c6204b2bd45f8bbcc34983aa7b0c9bd1d666c87aecce747ec62e6e89a4e152703a0519c6ab382d
+EBUILD tcpstat-1.5_p8.ebuild 1283 BLAKE2B 7b5798d2771f6b0f34c60c7d9191dbe055e7c130e3e11617cd8a06540bde1840a343daca1d1d9572d6845ca58b1e8ff773928e14dbcff9709b4a72f09b385466 SHA512 b9e52660890f99819507afbc82df71265e8dead3737c69f964bab96297169f91cb9398be1553e88cd8ae26715e0ffd6d86a73e83440dee803c1db364acdea2c0
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
deleted file mode 100644
index e3e0df933d5c..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -68,7 +68,7 @@
- case $my_build_os in
- 	aix*)		AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;;
- 	osf1*)		AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;;
--	linux*)		AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;;
-+	linux*)		AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;;
- 	bsd/os*)	;;
- 	freebsd*)	;;
- 	sunos*)		;;
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
deleted file mode 100644
index 88e668e1a4a5..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -84,15 +84,26 @@
- dnl #######################
- dnl Checks for header files
- dnl #######################
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h)
-+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h)
- 
- dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it
- AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h)
- 
-+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval )
-+if test "$ip6" = "yes"
-+then
-+	AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] )
-+elif test "$ip6" != "no"
-+then
-+	AC_CHECK_HEADER(netinet/ip6.h)
-+
-+fi
-+
-+
- dnl #############################################################
- dnl Checks for typedefs, structures, and compiler characteristics
- dnl #############################################################
- AC_C_CONST
- AC_TYPE_SIZE_T
-@@ -147,34 +158,11 @@
-   If you already have... then please rerun configure with the option
-     --with-pcap-lib=DIR
-   with "DIR" being where libpcap is found.])
- ])
- 
--dnl look for dbopen for tcpprof
--TCPPROF=""
--LD_TCPPROF=""
--AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [
-- AC_CHECK_LIB(db1, dbopen, [
--  TCPPROF=tcpprof
--  LD_TCPPROF="-ldb1"
--  AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ])
--  ], [
--  AC_MSG_WARN([
--
--  *** WARNING ***
--  I couldn't locate the Berkeley DB library.  The extra utility
--  "tcpprof" will not be built.  THIS IS OK!!!  "tcpstat" will
--  continue to be built as if this never happened.
--
--  If you wish to use the extra "tcpprof" program, please install
--  the Berkeley DB library from:
--      ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz
--    ])
--  ])
--])
- AC_SUBST(TCPPROF)
--AC_SUBST(LD_TCPPROF)
- AC_SUBST(MATHLIB)
- 
- AC_CONFIG_FILES([
- Makefile
- doc/Makefile
---- a/lib/process.c
-+++ b/lib/process.c
-@@ -230,12 +230,12 @@
-  *   calls a user function pointing to the data
-  *
-  * XXX: filter is not used.  capture_seconds also isn't, but snoop is
-  *	always read from a file.
-  */
--int get_snoop_data(char *fname, char *filter, int flags,
--	Double capture_seconds, void (*hook)(packet_data *, void **),
-+int get_snoop_data(char *fname,  char *filter __attribute__((unused)), int flags,
-+	Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **),
- 	void **args) {
- 
- 	u_char *packet;
- 	int fd, len, blen, ret = 0;
- 	struct snoop_file_header	fh;
---- a/lib/tcpseq.c
-+++ b/lib/tcpseq.c
-@@ -54,11 +54,10 @@
- 	u_char	flags;
- 	struct tcpseq_ha test_ha;
- 	struct tcphdr *tp = NULL;
- 	struct ip *ip;
- #ifdef INET6
--	int is_ip6 = 0;
- 	struct ip6_hdr *ip6;
- 
- 	ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
- 	if (is_ip6_packet(pd))
- 		tp= &(pd->data.ip6.body.tcphdr);
---- a/src/catpcap.c
-+++ b/src/catpcap.c
-@@ -50,11 +50,11 @@
- 	if (c == ' ') return c;
- 	if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c;
- 	return '.';
- }
- 
--void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) {
-+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) {
- 	u_int length = h->caplen, i, j, k, step;
- 	u_char *r, *s;
- 	char c;
- 
- 	r = (u_char *)p;
-@@ -90,11 +90,11 @@
- }
- /*
-  * process_file() takes the output of tcpdump, saves packets, and displays
-  * statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- 	int run = 1, i;
- 	pcap_t	*pd;
- 	char	ebuf[PCAP_ERRBUF_SIZE];
- 	struct bpf_program	bpf_prog;
- 
---- a/src/dump.c
-+++ b/src/dump.c
-@@ -37,21 +37,21 @@
- char filterexpr[BUF_SIZ]	= "";
- int	get_tcp_flags		= 0;
- int	what_to_show		= 0;
- int	packet_number		= 0;
- 
--void my_hook(packet_data *pd, void **args) {
-+void my_hook(packet_data *pd) {
- 	printf("PACKET NUMBER: %d\n", ++packet_number);
- 	print_packet(pd, what_to_show);
- 	printf("-------------------\n");
- }
- 
- /*
-  * process_file() takes the output of tcpdump, saves packets, and displays
-  * statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
-         get_dump_data(fname, filterexpr, get_tcp_flags,
- 		-1.0, my_hook, NULL);
- }
- 
- int parse_show_types(char *in) {
---- a/src/tcpstat.c
-+++ b/src/tcpstat.c
-@@ -421,11 +421,11 @@
- }
- 
- /*
-  * process_file() gets the data, and then displays the statistics
-  */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- 	void		*argv[2];
- 	statistics	stats;
- 	Double		x;
- 
- 	signal(SIGUSR1, catch_signal);
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
deleted file mode 100644
index ce12a85db51b..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reports network interface statistics"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-db.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -Wall -Wextra
-	econf \
-		$(use_enable ipv6) \
-		--with-pcap-include='' \
-		--with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)"
-}
-
-src_install() {
-	default
-	dobin src/{catpcap,packetdump}
-	newdoc src/README README.src
-}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
index a7ffbe9723e3..859524d5c260 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.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="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index b9a4d5011fa0..a7c1be72e301 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,10 +1,6 @@
 AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c54d3926f2443fb4c62bb37756ad9dbf0010e145421f684eb4ce04cde621f32aa3a6da22e37b5336868647d0bdf4755002c805 SHA512 d20a36a0ca57991f333d783db2442f14fcf06b1e88936b527edcf2973d82dbc88514eae5e051197d7dc4ce25f16bc10799bb91f5baf4a98076c22f60fecb2065
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
-DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
-DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
-EBUILD tcptrace-6.6.7_p5.ebuild 1250 BLAKE2B 786c6ff2d34b2155830acb942d3a37731335ccc81642ab9c43118ea39e3ac01df8cfdb7824c67ce1994cd93572f9cf6b34d75ffe0bce12fa14c9ac3ab05b4a37 SHA512 3ec354b314768b594e3b31eef8df45d41af4faa84db0b0100c30bebfca2e5078eadacad0481da923dac53956f3b385b69ed0d285ae0726382ae4e410756c71ac
-EBUILD tcptrace-6.6.7_p6.ebuild 1250 BLAKE2B f61f5bbfebe1a66782042c56cab408f77b2798e8b78850a31a968751f42507ae9c9fe4b0a70fea5c74fee9df111c8cf63a117f900d588211894eb538f4e3d728 SHA512 bf523deb713bc0abb6df55bbc02dee5cc41c2b77dccf464b0c3881fcf1f025fd3c0ca6c8e9a504e32bd54ba3be8e9141dc4b3c9db0718eddd5c8347a53d2fe8e
+EBUILD tcptrace-6.6.7_p6.ebuild 1247 BLAKE2B 56e12c7951701d56ddbd5302bab3cf6c483d962cf79c144ad1488c998cdb27e0026a8602f1100c80f8b921bf5454c5877df345ece9f5b652a6f9f28880ce740c SHA512 b78443aae2c40aa7d9276ecae12496af52c0939f346562062968619c05ed97d6b680fe64ad79d0bce3688403d031594975d8f28868b19e951527256e5bcb0490
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
deleted file mode 100644
index 9e42190df0b0..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic versionator
-
-TT_DEB_MAJOR=$(get_version_component_range 4)
-TT_DEB_MAJOR=${TT_DEB_MAJOR/p}
-TT_DEB_MINOR=$(get_version_component_range 5)
-TT_DEB_MINOR=${TT_DEB_MINOR/p}
-TT_VER=$(get_version_component_range 1-3)
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-${TT_VER}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch
-	eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff
-
-	eapply_user
-
-	append-cppflags -D_DEFAULT_SOURCE
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
deleted file mode 100644
index acb7c415420a..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${P/_p*}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-cross-compile.patch
-	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	default
-
-	eapply \
-		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index f08f5f8fd7de..a96afb76f58e 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 348feb79b2aa..647acd59bdde 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,5 +1,4 @@
 AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
 EBUILD tracebox-0.4.4-r100.ebuild 1250 BLAKE2B bebc05ecba31e0b71f2e3548e490227a0552d9235c491ef5d2568aa83b2ef5eee88a0c969104d8202098c047f1e9db5f0386fe768c75edf8dd67b51f51cb6a84 SHA512 ec6c1125325177e9e1f15afaadfbf557072d54ddff5b9f01f0f8a0a658a24d46d76f120aa28b86fead73c54e66f1311f3d6139685a734a4e07f86e40faff677c
-EBUILD tracebox-0.4.4.ebuild 1173 BLAKE2B 9e9791dc276fe0f4cbd3361e9a7de4b38340a8baeeb552bb86b1870b255043da11e6df12f01164217cecdb7067a6f90da83ca284ff4ffb7901193682c4c5e89a SHA512 3664196077455fa168ff3c8e0d5ec215ccd6e7b03c58bc73a333e2811fcac031718ba9766e516c243044e1cd84c4ec12e66ba10af42034fb0f39eb11054aff9e
-MISC metadata.xml 575 BLAKE2B 0de780b436640051b1fbcf49505d8975d39b3a4fa0d45a408718b9ca284e7f7f2609cffcda406c84fdc5b6fe2116d579e5624d8557751e3888c5a45ebdf95d54 SHA512 9cfa13bf788534c7bfd4edf945efa310e24229e9d777eecb1ad371ed99c13f39c63af14bf41e441ef94bd75ba53f318f23d48fd4fccd2d49e8d64b9d8fa2d83a
+MISC metadata.xml 575 BLAKE2B 513c1e0904b220151dc961251b8b93223017d423d67c194d4af8ac03c73d4d4d023b377b2b95b7a5a730c8bb6a722669ed4defb2cc822c5ffa69a39d7c380775 SHA512 3b56de905ff16d563e9d69b1306950dcfb5097ed04a1aab5bc69db6242804ad9e5172c4d19f610daaa109bae97871342ef29b037b8e8f8b96bc42b3f5f543856
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
index 1de26c104467..7d75a0a8a878 100644
--- a/net-analyzer/tracebox/metadata.xml
+++ b/net-analyzer/tracebox/metadata.xml
@@ -6,8 +6,8 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <use>
-<flag name='curl'>Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag>
-<flag name='sniffer'>Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag>
+<flag name="curl">Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag>
+<flag name="sniffer">Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag>
 </use>
 <upstream>
 <remote-id type="github">tracebox/tracebox</remote-id>
diff --git a/net-analyzer/tracebox/tracebox-0.4.4.ebuild b/net-analyzer/tracebox/tracebox-0.4.4.ebuild
deleted file mode 100644
index a463e775906c..000000000000
--- a/net-analyzer/tracebox/tracebox-0.4.4.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
-inherit autotools
-
-DESCRIPTION="A Middlebox Detection Tool"
-HOMEPAGE="http://www.tracebox.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl sniffer"
-
-RDEPEND="
-	>=net-libs/libcrafter-0.3_p20171019
-	dev-lang/lua:0=
-	dev-libs/json-c
-	net-libs/libpcap
-	curl? ( net-misc/curl )
-	sniffer? ( net-libs/libnetfilter_queue )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RESTRICT="test"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-deps.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
-	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
-
-	sed -i \
-		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
-		-e '/dist_bin_SCRIPTS/d' \
-		src/${PN}/Makefile.am \
-		|| die
-
-	sed -i \
-		-e 's|"crafter.h"|<crafter.h>|g' \
-		src/${PN}/PacketModification.h \
-		src/${PN}/PartialHeader.h \
-		src/${PN}/script.h \
-		src/${PN}/${PN}.h \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable curl) \
-		$(use_enable sniffer)
-}
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index 1bc81e279d50..d7caf3ae8805 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -1,3 +1,4 @@
+AUX xnetload-1.11.3-libdir.patch 318 BLAKE2B e36abfc59a4d7266ac2f76b9d5d6d703b55f696e7044b34b3978767cb86355227645f5a245a5df1dea59021434185d9b9b5cab3a0f6feb851d4b1df8b41bd27f SHA512 78f96d5df50d443190516fbea3af6b31496407f38a9a7a45beeda6077e0ba6df8c5484acae5a88dd9bcf59ab8ff0b2efce56c145895f25c67e92cb3da540620f
 DIST xnetload-1.11.3.tar.gz 24551 BLAKE2B f23ebc6609a2824f2b60aa045f505422df87ed21e622e4267f850f2d5954b312019d68a9738512e92f30e7f1745886743a82d3f08fcae1e1adff3acf4294ec6b SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7
-EBUILD xnetload-1.11.3-r1.ebuild 869 BLAKE2B 722f47fcd35ee4f641356e2d4453c979d7b403ee3f18f192f38d5a3034646c419ef7e866b327e4a47467ffd7c159844c00ece122bcf345a587f796c31aacf060 SHA512 1eaa8dcc4591ffb7662045b6056e16489383c740eef4d7d71a703fa1e333fcd208abff9ee6949d965a76e1eec26082fd4ac9eabfc50554027571b9a8071742db
+EBUILD xnetload-1.11.3-r1.ebuild 936 BLAKE2B 2b2c54db22f56a17b84c43c6387ab0374d2989d43b39d68ee286075a31acc8bbe5ccf5869e6dc44dca4ecaad834addf66953c7af8bb691b820cf82c1ce18ab10 SHA512 b85224ee9f90ef7b90da30172e42d02e9d37549aef8980ce8bfcc1934f0f126746a3b27c7bf1eb255d717b4e97fec921feddc1e33a99e75b445c26e5a0f9d06d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
new file mode 100644
index 000000000000..3bfbd619c112
--- /dev/null
+++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ CC = gcc
+
+ # The next two lines are for building an optimized and stripped program.
+ CFLAGS += -Wall -DNDEBUG -I/usr/include
+-LFLAGS = $(LDFLAGS) -L/usr/lib
++LFLAGS = $(LDFLAGS)
+
+ # These three lines are for building Athlon optimized programs on my system.
+ #CC=gcc-3.1
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index d1caa9933a52..1b3e67000f2a 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
-SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
+DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection"
+HOMEPAGE="https://www.xs4all.nl/~rsmith/software/"
+SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
@@ -19,13 +20,19 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.3-libdir.patch"
+)
+
 src_prepare() {
 	sed -i \
-		-e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
-		-e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+		-e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \
+		-e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \
 		-e 's:gcc -MM:$(CC) -MM:' \
 		-e 's:/usr/X11R6:/usr:g' \
 		Makefile || die
+
+	default
 }
 
 src_compile() {
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index b0a598fed4ef..83509983ea57 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -263,4 +263,4 @@ EBUILD zabbix-5.0.9.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f
 EBUILD zabbix-5.2.4.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
 EBUILD zabbix-5.2.5-r1.ebuild 32917 BLAKE2B 08ddb3e3e2963b2ebd6193866fbb7e85abb6a958c3631c00295c3cd0641e5dcccc9a6532851a7ef10666173a509b423a7ae7147635cf9564c62b07d1cf1bdfaa SHA512 3252082c8917155a02bc76f409c228f276bd04ca877b7c9fe9cbc94554fcac201a8b6ed451face4c61068cbcb216ed721a020679d63044de60546b3026d39a18
 EBUILD zabbix-5.2.5.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773
-MISC metadata.xml 1497 BLAKE2B 9f9090695be732ee5176057c2c896aca48516b60491b7a462272bf150851e210ca28da974e4da2da84107e77365d5517f17e19422e4c131ab899122cdcb0bdb8 SHA512 40fc0dd322f4f9e562b4cbe2a50bd102be7d30353b9cf79399c92fed3818c077bf78567a1c4a864450be93b5c27e766284c71b5318fba6561077960620e02854
+MISC metadata.xml 1497 BLAKE2B a8288bd5ec772d1f54db12727cc9b6659ca7563ce054f8cb63d8f8d2373ef4081e391656eb1178ff06bdc64a5ca420d2c56376e5b1207e9baed17a9766406f43 SHA512 042f4daf2f70de1cbbf7ece57a3d5704878b33257002c8a1d9987e8a9249e8af475e24577069ad315d406ae5c29994881c76638c5bccb2e57d3f8ce3b0b1c381
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index da24309a77b0..fb8c6cf6f2d6 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index be09dd4d71ae..03a9b845ae70 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
 EBUILD zmap-2.1.1-r2.ebuild 943 BLAKE2B 32d8e39e880cf29f411d527b5830963939b95a2e6a019e1290b7bfdfbe83da6d0431e3cb8bf06d289234cbaf6910138c547228a44465eb3ee3b4de1265e05e15 SHA512 e050474a7764ba68f916cd3492fcfc75176bae9cf398d707f4000da43efe2468d5a72634c3ecc210d3c407ed9dd3408236a1728da520771817b149a70ae12ad9
 EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
-MISC metadata.xml 1229 BLAKE2B a7adf10c6b6ee12c6bdca30375582ccba8541bd70321fc055682d12343149d7ac4162cdcde4abab160b760eb04a644045fac14c878fc2219db497055234ec3d2 SHA512 b457bdfbba7318412aac2d759bf616f2417c0946bd534cc0b5066ffc226e586f277ffa6c317e13504766c35d881ad77797321b377e4350a7a4f5dd22624cfc1b
+MISC metadata.xml 1259 BLAKE2B a1e59cc2cd2e58cf939166e0acebef19a6853289b286b633f54b53461356bb0a4034515ea5d3f10e6a39879d9242a3140e29b51a7a2c1578d5a6fbf18b56e982 SHA512 1e6d826ffd69aee962afcf562c09ba74277ac7fdbd48f2f0f5edca487035f08666a1de467fd1194b9f89af7cf8f8cbd266d773bb9ff76efafa816560e3df76f7
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 2204ae3c97cf..80e7bcd54427 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index ff5c98a31fce..bd345985e350 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index cd5ef1f378da..71b21358be8a 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1,4 +1,4 @@
 AUX cutecom-0.51.0-fix-for-qt-5.15.0.patch 615 BLAKE2B a39889b204d87c0812673098985b2d3bad919b10a7d923d589c0b88fa818bce77f5b08d8cf7c221a23f5f61ade8dac36f436c5be99c9b96322a1e4c2ebc4873f SHA512 5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05
 DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731
 EBUILD cutecom-0.51.0-r1.ebuild 872 BLAKE2B 159a3406cab8fc0d9a64aa0212a17ffddda142867810c33cc21f186eeedc4363fef62ba0555551d0952c1833404c1bfdfde1df996c0deb97705b1d0db01e7ec5 SHA512 3d423abf0842d5f92689bca836a64972ddf00f20cb4cec5176f1dcda1c587f1b60a5ec89551bd0ff761affdae00b6c226d770fd8162955fd7da4851c69d93775
-MISC metadata.xml 518 BLAKE2B e409cc5cd2b57e810e408991786f22b93464167b4efe51374e6f4a5be8d5bf80f351ea37b3cd26080f731c53428d3046053ddb1e7192c8129d291a77c718fe76 SHA512 3641e21c8f46af695d3e11a27d3f67a6ef8670fc1d1621d253f2f0555ffc8a30762bf91513e5539177e640253c8f7ec2b574b8c2332a933150664bf2d3ad8880
+MISC metadata.xml 518 BLAKE2B 41d8dded660c8fc5503025d379940c23c95d7e5277901c5d1965169b461fd018c4658bed5bd71e336d2306572a986b51026a3ae3db310c7252052a34c66f9ddf SHA512 789aad77ee2c618e2d46b28d2e8523635b438cf1ebfba070ca785bea70b188eec2ff9b258b671be7d567223d1b02399c78928919bb260be60e2e36e0702074e8
diff --git a/net-dialup/cutecom/metadata.xml b/net-dialup/cutecom/metadata.xml
index 107ba45773b3..131c2451a225 100644
--- a/net-dialup/cutecom/metadata.xml
+++ b/net-dialup/cutecom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index 99dea714b7c5..47e23f6e4558 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1,4 +1,4 @@
 AUX freeradius-client-1.1.7-ar-configure.in.patch 241 BLAKE2B fc58d9477275ddbe7724adba4cbd7d1f4a5a134ca355aa41375376e056c321e22fe4f355602c0cffa70cb532cfee32f2c0728cea93c9e0d579cceea6425c8147 SHA512 654f142be0ff695ab4b9c8c9fa52e3a448c3d0027b5e7d8e776323e49be0cf268cb7cab82a5dd2ccf067a7089a8ff618296755973af1155ab40034cd93a6bea8
 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce
 EBUILD freeradius-client-1.1.7-r1.ebuild 1031 BLAKE2B 4fb53a60f558ea7b60043e254d65f47ab9f7f2b753e339df3576a9e7f51be61c4ac2ebd70f1c0388f793e997c0bf3b012b46aa0fb7270defb9b2fa01ae2e3c96 SHA512 0eedcdffe1d5c74c2dbc4568ebb84c687e6a45eb3346fb728524342c018ec186ef2df81550cb23ee908d0c5c6d77bae488b0ad69a045c0f8fca2fd838d5e73bd
-MISC metadata.xml 937 BLAKE2B dd3e76a7a6a71b1d0ad75eb4190154124c8c15c8026ee35947067fc403369a348117dbb72f3986b81234777896aeef6ebc32f6ad32e6d41ae24dc772e9f57a28 SHA512 49a0f971e1bac986e6f6dfb02370011afeda182eb733b1c11cc1307d43881fadf924af84c42d8ed44937a01faa9b5793a8ec112e87d6648ba0d1737ee4c5495d
+MISC metadata.xml 967 BLAKE2B 58843c33e950349e9d1ff3ba2b7978c0856c2b177c7ae65fd7c917c4a43cdfadbc93a6273b22b8308e33f3cac3dd2ca8819e1ea919fed014b2c99fac2ad91006 SHA512 83296b63df8cf2102c8e8df49277cbc3edbcc411255f845816c698dc721de9c9b84f8578646dd580ad58469961ba936d98d1a6c37a6efc255a072ffea905651b
diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml
index 597f77ab7b7f..4412f59fbc14 100644
--- a/net-dialup/freeradius-client/metadata.xml
+++ b/net-dialup/freeradius-client/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 82ca8c6a757c..4a3f280edc2f 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -9,4 +9,4 @@ DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
 EBUILD freeradius-3.0.20-r1.ebuild 7626 BLAKE2B 4e2a9cb5d8039b9f5e541b8fc4d5de56b154c95506fdb29fb7c01ef8439426ebfc19f517e098026c9571bf7ebe055f7c667150cfe4f9d489708c0591218e45e5 SHA512 f0ab313d62eec7facacdef399a73c3ace318a4207dbd8fe75323ab51664b31f0e77e0fc7adce637d24252165edb0ea886d3bebb8f288f7850c92caa572356938
 EBUILD freeradius-3.0.21-r1.ebuild 7478 BLAKE2B fc6116ecb6644e0e47ab86fa372db61d331e6d5ef27ba5f01d8f64e3bb220ff7bd755ac3b15ae7a4b75767ba384f170ffc623354489acabfe07a6fc4a14b61f5 SHA512 2ada19e2d51b44f6d784a78d1a6414695b6b63d4a99139c90e0b7e2a584000932f0c8b3094d42f7e597c8f78239d1b8d1ea511cbb089597e9e3ee1a94d72efe8
-MISC metadata.xml 864 BLAKE2B 5df7dfc698cebaaf850dfffedd8bfc9b7f30a947fdc7072b86b6e557bcf0f2548564260fb2ae073ea5adb5d1a37a5363e122691f748588561e26f5e452176934 SHA512 e36f1c6447cc565efb1523b931f670e944a5cd5eac9176bf42be13db907c7afea6d8ab860f77e739beec25f1b74012fe53987da5c48e6a7b928e335614e679cc
+MISC metadata.xml 894 BLAKE2B 462f2bc696550e919723d5a6435c11a8b217b183aef0f623737bbf446f43153da33840478bc10c45277d253d82e4186a4a85661565edcc37d03b924f60220fc9 SHA512 0cadbf858cab18860ad4934c0d1163bc149f3616395420568357c1cd959b635d5c5835216fde2cd799718010e16e13fc3acc746108a49b9c5d19cc5b64581347
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 6d8b1cc66234..cdf1b4d83a2d 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>geaaru@gmail.com</email>
     <name>Daniele Rondina</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-dialup/metadata.xml b/net-dialup/metadata.xml
index 313bfd552fa4..93a6517c03e4 100644
--- a/net-dialup/metadata.xml
+++ b/net-dialup/metadata.xml
@@ -32,4 +32,3 @@
 		telefonicznymi (dialup).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index 98f020a25678..96279dfe1f3a 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -22,4 +22,4 @@ AUX openl2tpd.confd 717 BLAKE2B 7c92d47880c57c39deee6eebe458f0a1367fff616af33771
 AUX openl2tpd.initd 1788 BLAKE2B cccc7e9f907ccf5abe5dc84d0e3228b8e5a542e6f864325cf5eb7fd2d84e50e0d5cf86ec276a59bef7bf576d52b4b9c00bb34c1ec706dd6ee719030f64ba55e0 SHA512 8f84e847eb9b3f7d6c07bef1d6e8a051a0ded8ec6c4d21be26c55eacdb3d12fce60dce7b4c94d4e9358c4d724c868bf84c2a6262772f8fdfb3e54931cee0ce10
 DIST openl2tp-1.8.tar.gz 491160 BLAKE2B 70c78cd4d7daba600f9a9115025acb38b82adc0a04bbf6e9d46daebf2c7c37cc8fe9df6fa7157a05525e998063f5200a85893bb5b33dbe3e66ca7b6a4d2c7972 SHA512 360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda
 EBUILD openl2tp-1.8-r2.ebuild 3486 BLAKE2B becd16fc76b639d6fb62b3103951c1bd21d366e03f8074a552ed00c820d5843f9a5750265c773cce018b80a68f7601ca9d5a129f3ddccd76a5c2a78e74d06c0c SHA512 9bc441671c71a407b55551680018f48b7b8d4b5aeb5e94b1657df591ebc2a84d31e653638ceccc17b4f40b3577fe4610b2c61664504e0ed41998f6f7ffde7eaf
-MISC metadata.xml 669 BLAKE2B 98bd7762042c36ccfc4219807014ec3c6a9c65827820d174ae87eeb16a5ae64212a68fea18ebd46c2ff7ea3b4996aa63b383ab14dbd4009e491b76437b234e67 SHA512 1d4880fea1badcdbbdf6e7259e968907c4d74ece0c309e8bbd556763e377b6bda56d1d2e1de67177c9867de1fcb36e294723d02b2c6ee22c7cdcb99973b6b8e4
+MISC metadata.xml 669 BLAKE2B 8029c024d08ffe24a703fb6ad442de62159d7d817408cef5773dc6fe620a5fe07b4143f3c4229f614e7e31e6a39fa717de2596b3e9511fe4a6c165c2c9107f21 SHA512 6e831edd0e82b02a126c774f522a58d779a366cf9760808986b662c9b3aaea42be09cd0ba91e61a0d229f3cffaf6ec2a1273b964e99b48304ac31cc08157ef8d
diff --git a/net-dialup/openl2tp/metadata.xml b/net-dialup/openl2tp/metadata.xml
index 5f1b920a55a8..9e294f8afdd3 100644
--- a/net-dialup/openl2tp/metadata.xml
+++ b/net-dialup/openl2tp/metadata.xml
@@ -6,12 +6,12 @@
 	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name='client'>Enable l2tp client.</flag>
-	<flag name='dmalloc'>Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag>
-	<flag name='rpc'>Enable RPC control management. This flag is required for
+	<flag name="client">Enable l2tp client.</flag>
+	<flag name="dmalloc">Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag>
+	<flag name="rpc">Enable RPC control management. This flag is required for
 		l2tpconfig to be built and used.</flag>
-	<flag name='server'>Enable l2tp server.</flag>
-	<flag name='stats'>Enable status files. Note: when they are used, this
+	<flag name="server">Enable l2tp server.</flag>
+	<flag name="stats">Enable status files. Note: when they are used, this
 		hampers performance of the daemon.</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 55ff61620f2a..1501d1b23972 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,15 +1,8 @@
-AUX xl2tpd-dnsretry.patch 1509 BLAKE2B 54e0a77a765670b47742eb525a99a239de06d1ae2d4c638dbc57224c4fe5a729312ba14fc0f6f4eeb070303ca4771758b94b178c0c2790f79bea668d074fcfc0 SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd
 AUX xl2tpd-init-r1 272 BLAKE2B 0a0f350d5ce3ce297b120750bed742eece7ee6f6b5c5ea24c09b2015a3b5dd2621eff76aa05cee56e5ed795df3204b2d81f8394de492ea655011a8efed3b8982 SHA512 80235d4084963f9285fc11f30ca648ebe4a23e3f74e41fddb81d6fdc08808b1772163192f61f56c677c3003f10809f7d014ddeaa427eabfad490106ac7e14f67
 AUX xl2tpd.conf 18 BLAKE2B 1486c7555965c14429cbbc7ab5dcebac02aa0639204d3eb203b58f6f46a042de4daa9a278d4e6f32ba6dca563c2de9757cf0e5af59563c5e0250b048a4f1f30f SHA512 0b3c6d4784b997d12734fe1e5165dc066269db24608638566c0fc317c1927331ed806fdb7a4f816bd16d1f22046b52badd99c2f0977c157b2b3f3ed42071ae42
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
-DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
-DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
-DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
 DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
-EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B e01f0741bd4033d9d458a5cc88cc3ea9558649315c843a9624c25deaabb285f4cfae2f65fe5349db107629f496c767c820dc9fa3780e660cdca605554f52c6d7 SHA512 ef78b9b7389be4c19084be285bf66258fa3a545a9f22ce112b8b8205dba59033f3f78d533fb034d9dbb81392922ea9194c430d696f3989377b0396b46cf52fe8
-EBUILD xl2tpd-1.3.11.ebuild 1425 BLAKE2B 4d8761c143e9957591121c6b0d1f4ea4957e8fb250071f50544219919799cba8438f27696807cff8930a00797635ced0bd9c26a1a0f78adbd37e974569ab8d91 SHA512 c498dbb8ae9edead2149bc7a80e1aa355d7499e07b02abbc85bd2a61f3257c34ee9b906c6d57810642d5b5499138d4be45cb682d180f46b470aa98c259e06a44
-EBUILD xl2tpd-1.3.12.ebuild 1001 BLAKE2B b3e107a62fd46852ca2a78c421d707953be37c961e0df13dd7847a862c9c1ea897d3e87970a65404e625c4387cd0875a006a03489d592794b68ad40d188465c9 SHA512 4b3076c293249a76259713a1ed2be673f21ffa5d4ed0900638d68973b177eb906c93ecb439c2aca368d79b83b2c814ad4462eb04578371978f73a65f3db5eaed
-EBUILD xl2tpd-1.3.13.ebuild 1082 BLAKE2B 2052ff441fbc288b7e95c3e6492aabe74d7e9f1bbf01783e135a8962a86f207599a9bde2f46bd91733ce607148a23cc584a5e50639521bc3ca0ae7899ba1aef1 SHA512 360440ac755e0425618b8b509933eddafd745ae3e101138117e3bb9bfd550db293f7f18020f8ca24e1c717cb279c7037b95460c7de641fb3f536bd399200b203
+DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
 EBUILD xl2tpd-1.3.15.ebuild 1074 BLAKE2B 1f6fad5624a8c3376a9d40dfcdd89510473dfef6634b27233cd6cee363be7a366aadfdccc12d7e74db4efaf290577feba9eb4235e1623d151b223047a563917c SHA512 0b13197b0842a9dbd1c126e7b14cb08f1c249a2d0b89d2c65ab0e84bbcdc76c0da3b4e4fe51309ccf52812b9b68ff5704b33879c24acc5d879d9540b51b8ea30
-MISC metadata.xml 748 BLAKE2B 54984b3f195d776bab05dea5407a0efbc1e98075ef43260013359f78268cfbc3500ffc1ad816d0790c0bef77a44ad2326c28f43ce52254cdd301ee6e0709e1dc SHA512 a7a28c1454d6cafff7d70abed1b57fbddf3929f85e947f7f87654aecdfaf7bad89daf11f40002b9115dd284449b30d172d5762bca0c8c053dd538139c7e8431f
+EBUILD xl2tpd-1.3.16.ebuild 1078 BLAKE2B 2fde8bf80db10114656e361546c0b92588002ac207b7be819bdda2ec28171a1efcabb499789f41bc1b00d9a6962e20d10d3aedfc39048959a7c936597463b17a SHA512 147419d02f47afc597a128e86890a30102ec601af107d6864cb5b78e37a54e0b5dd4427fbc3926a4b7fa9129fab7385b88d7cd72b94a1383bbe59741fb87be26
+MISC metadata.xml 658 BLAKE2B 0234424bd64d54ff71bce404044a874c90c32f7af4857941f9fb1014619da53e97ae925f9f91f4b0d53576a2af2d84d624c4462b104882a6ca3b716a1915e9ff SHA512 38c8247a784afe819a63194373dd04600ac73d38d5a53e6a40ae1cabfb3070f0b8c72669f9aaef2702cbe98b6ecb47aa88a5f63772302e55a2177f17e191e296
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
deleted file mode 100644
index b27703fe435e..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=307489
-http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345&#entry1063626345
-
---- xl2tpd.c	2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd.c	2010-08-15 22:02:14.000000000 +0200
-@@ -587,9 +587,33 @@
-     hp = gethostbyname (host);
-     if (!hp)
-     {
--        l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
--             host);
--        return NULL;
-+        if ( lac->redial ) 
-+        {
-+            int imax=lac->rmax;
-+            if ( lac->rmax == 0 )
-+                imax = 1;
-+            while ( imax > 0 ) 
-+            {
-+                hp = gethostbyname ( host );
-+                if ( hp )
-+                    break;
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout );
-+                if ( lac->rtimeout > 0 )
-+                    sleep ( lac->rtimeout );
-+                if ( lac->rmax > 0 )
-+                    imax--;
-+            }
-+            if ( ( imax == 0 ) && ( lac->rmax > 0 ) ) 
-+            {
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax );
-+                return NULL;
-+            }
-+        }
-+        else 
-+        {
-+            l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host);
-+            return NULL;
-+        }
-     }
-     bcopy (hp->h_addr, &addr, hp->h_length);
-     /* Force creation of a new tunnel
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 42549f5d851d..bab6c0296178 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -4,7 +4,6 @@
 	<!-- maintainer-needed -->
 	<longdescription>xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).</longdescription>
 	<use>
-		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
 		<flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
 	</use>
 	<upstream>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
deleted file mode 100644
index 4f97f86be8e9..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
-IUSE="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
deleted file mode 100644
index ff66464ce648..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
deleted file mode 100644
index 3e7e2ce70f46..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.12.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 systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="https://github.com/xelerance/xl2tpd"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	>=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	insopts -m 0600
-	newins doc/l2tp-secrets.sample l2tp-secrets
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
deleted file mode 100644
index a383fd15cbf8..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="https://github.com/xelerance/xl2tpd"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="+kernel"
-
-DEPEND="
-	net-libs/libpcap
-	>=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_compile() {
-	tc-export CC
-	local OSFLAGS="-DLINUX"
-	use kernel && OSFLAGS+=" -DUSE_KERNEL"
-	emake OSFLAGS="$OSFLAGS"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	insopts -m 0600
-	newins doc/l2tp-secrets.sample l2tp-secrets
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
new file mode 100644
index 000000000000..e20c5ce6dfa5
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="https://github.com/xelerance/xl2tpd"
+SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+kernel"
+
+DEPEND="
+	net-libs/libpcap
+	>=sys-kernel/linux-headers-2.6"
+
+RDEPEND="
+	${DEPEND}
+	net-dialup/ppp"
+
+DOCS=(CREDITS README.md BUGS CHANGES TODO doc/README.patents)
+
+src_compile() {
+	tc-export CC
+	local OSFLAGS="-DLINUX"
+	use kernel && OSFLAGS+=" -DUSE_KERNEL"
+	emake OSFLAGS="$OSFLAGS"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+
+	systemd_dounit "${FILESDIR}"/xl2tpd.service
+	dotmpfiles "${FILESDIR}"/xl2tpd.conf
+
+	einstalldocs
+
+	insinto /etc/xl2tpd
+	newins doc/l2tpd.conf.sample xl2tpd.conf
+	insopts -m 0600
+	newins doc/l2tp-secrets.sample l2tp-secrets
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 786b8e6b4107..a19896e6c4ad 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 3a3469baec17..0829d0774a64 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,5 @@
 DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074
+DIST bind-9.16.13.tar.xz 5028340 BLAKE2B 7208d6361f84472a5549fd8d521878b1481c0930b1181fa79c99b9f7e7d3f736c120f0ca416e9aecca77015568428551937ee77449f441e9cd881779123e51b7 SHA512 1f3c8f54dd2c9e18cd9b67cfebb645d0a8e8f566add07fc4690cb8820bf81640c33b2b0685cb8be095e0f9ac84b2cf78176aea841a30c27d547b569b8353b07b
 EBUILD bind-tools-9.16.12.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10
+EBUILD bind-tools-9.16.13.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473
 MISC metadata.xml 533 BLAKE2B d04998d5522ccca610384cf5d46f955831d4fdd9da02266680aed6ed680bdd1bd92262fb0c31f6b0c27b15f1b987058c13260d43bb4313b23e5bd288e5f812e9 SHA512 ba16d092633db22a6f419ef4dfdacf3a1c3037dcbe764bbf525f5708f74a1d6857de5cb8fd740dc7309f085360dc3222f949476fd3e2ebb6a8dbce4fb6c08ab4
diff --git a/net-dns/bind-tools/bind-tools-9.16.13.ebuild b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
new file mode 100644
index 000000000000..f983773f1fac
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
@@ -0,0 +1,149 @@
+# 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 libressl 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 )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	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 0439a7b87893..2cab48dbb5f2 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,6 +9,8 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074
+DIST bind-9.16.13.tar.xz 5028340 BLAKE2B 7208d6361f84472a5549fd8d521878b1481c0930b1181fa79c99b9f7e7d3f736c120f0ca416e9aecca77015568428551937ee77449f441e9cd881779123e51b7 SHA512 1f3c8f54dd2c9e18cd9b67cfebb645d0a8e8f566add07fc4690cb8820bf81640c33b2b0685cb8be095e0f9ac84b2cf78176aea841a30c27d547b569b8353b07b
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.12.ebuild 11361 BLAKE2B 28ceffbe13e3e8b1ae72b45b3202f5d4e9a63edb7334fd9d577d49c3642f1e521b7bc8dabdf229c87313063c6b0f4e7578f903d748df2fad1e247507ca237dc7 SHA512 9b5dd53fa798e14e2ddeef10cfc8bfcda32acfb93466addafbe28aed651624dfa9fdae0f41864d728f021f055e9efc6d48741cc48f149142f5aef39afc949d22
+EBUILD bind-9.16.13.ebuild 11368 BLAKE2B 6c6884fc514183aaf130425486ef28209209a40b5efa6b0c50f0168abd469fb3e98b8a78f3cfb4a70069185228a7ba77ce1058b4bb33740a1ecd95bec134c510 SHA512 ae037062d678a58f7bed84b2619d47de4bf1c4dded37a2a6e0da0e708c232d72dc71bd8ca3a754f9ac53a9fee422345847f5e44fde0baa0c1ae9e5fd707431c9
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.13.ebuild b/net-dns/bind/bind-9.16.13.ebuild
new file mode 100644
index 000000000000..c324a5a4b3c8
--- /dev/null
+++ b/net-dns/bind/bind-9.16.13.ebuild
@@ -0,0 +1,390 @@
+# 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 libressl lmdb mysql odbc postgres python selinux static-libs
+urandom 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:= )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	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
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		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 use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9 || die
+		chmod 0666 ${CHROOT}/dev/urandom || die
+	else
+		mknod ${CHROOT}/dev/random c 1 8 || die
+		chmod 0666 ${CHROOT}/dev/random || die
+	fi
+
+	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/coredns/Manifest b/net-dns/coredns/Manifest
index fcdc432597d9..bbc1375d0f5c 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -880,4 +880,4 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 EBUILD coredns-1.6.9.ebuild 37542 BLAKE2B b262e6e35a99cd7b5240502cb60f62e6f7c3ebbbe10e6948eb54bddacfed6e9d00275aced5d8b4233c81360d17b95e90d7ba111689855cbb1c833eeb7239e3bb SHA512 8a0570c92695815ab87e916a48a9aa313a7e7b5c17e7db3e31a6cf394750b358db36c1ee3f5d2b44fa17abc2f13883945fa88a8ca6c777fda90b8d018d6196f1
 EBUILD coredns-1.7.0.ebuild 47043 BLAKE2B 089351fe9ff169b7ded21f8920b21039bc6dbb3bd146cabc750b548a9fd0606217b75fd927cf4e34831006bb94f11344c3b7b18eac62ac38ad43c29b77b72a5a SHA512 cdd36249107896408d378076779f03f715203074f9cc91b2611ea9c2d6cf43e265ccfab2579398a50b1665f8443573b3076e94bcd193bda396335eda6b043e83
-MISC metadata.xml 916 BLAKE2B 587ce18cf3b5d11b48e52466d5ea8f98e7c7080ca7f3edf4a540202c53edacb948b999b5d13a30dbd255e0d963874a5fb44c493f48271df2497ce97e99c49e48 SHA512 e3f31bc5d7c3899863e3526d81e99e5f4c2643fb6d292c36af4136f1215082268122fba0e37c2bac5a6b36436ad14bf3cc79d8ba0b833cd8dffc52fdc5c9a6bf
+MISC metadata.xml 946 BLAKE2B 0b2492615a8697f72259e508891e35408cd362f0dbfc67c5d90cd0381aea48351163f6213ed59785e3a489e865228439d88243ede9f0ca1d37d1f783feb713bb SHA512 f9a467ea6a484f2b8dc4563e49f9e2ed487ddc2ef63e00346828ba794cd6000001bb7c8485c335620794129d6c8473bdb0542f8fa99608dce7c373a3048978bd
diff --git a/net-dns/coredns/metadata.xml b/net-dns/coredns/metadata.xml
index 3c4a2efb2b11..31af05436b2f 100644
--- a/net-dns/coredns/metadata.xml
+++ b/net-dns/coredns/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kpp+gentoo@qrator.net</email>
     <name>Konstantin Ignatov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index af47f2f67ece..1a9a02e436cc 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,5 +1,3 @@
-DIST dnscap-1.10.2.tar.gz 655932 BLAKE2B 317547e9d7b8f87d08e954639b62e1894e4d8e37eb9612a984dc10deb674c35973f03f94843df0e9eeb74c94904de00b2718e7121f3dddb9e343b3519d13e02e SHA512 22df8068a17b202b1dfed2dc4ce1c4178abf32af16a3b15a76ae8f46510b3979d44c62eac673afd8452abda69a49e3da133f740217b7ab64631d2c18657a9a8b
 DIST dnscap-1.10.3.tar.gz 655965 BLAKE2B 8ee267839424b4876833ed5f466ee5972facf0fa866025a2172aa3cdd8900b182b9c8f4f7bf1ecc2f41d017237b9f2d9085722c114a4a0cabf9c953c02a9be02 SHA512 7bc97881c2cbd985010f3bd515aec454440767a0e9926d1fd7060c0d815679544384efbc74786ad6922436b2d6626ce1a9f3e9fd2d4b753ad7409fe018ecb5f5
-EBUILD dnscap-1.10.2.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
 EBUILD dnscap-1.10.3.ebuild 590 BLAKE2B 1e4c9962c9b238c5fa31f2849789e4fe58a4345d883875a8709fe3962783666925e1f41d1e23afa2ecbb74c626632ae095651aabf5fa6598e073ee24e5b0f565 SHA512 7a8bfc43167c4e85225962e8446d5bf48302fe44207ea6eb886636dcaae67947b0e577ee66659eee4a0af0a75c34d57bc3037ab05026e8e80942592a992d792e
-MISC metadata.xml 253 BLAKE2B 5bb80744dcf743f25ff5e1d3a9f7b2b5d01c88b97f037db85174d34ba5a1085dd74a91512f5c24adc0566bdf05e9879bfe43c4baeb31f7e95954da8ae927b386 SHA512 6dfa2faffbc0abe4db46b75ab602d9b564ac560ece923772c9336d4c1047b0c8a51d4135186b62cac30751ca95f0d4086b8191917bcff5f5a39caa1ac81806e0
+MISC metadata.xml 252 BLAKE2B c3e3cdec20fb5318e09108786568f309c613253a90af0b143f371effcc16f2124f5c2eb585ea6ae1f8d453f88464254d60d2ebcc6fb40ccdb26dc6f8c8cf4cf9 SHA512 8f072c5d29be00450a6ff93a90a503181f8cf7af1c611f99620dc6765822f3e4bb8ba98eea2d596ea04c2800b46070ef3bef287644bbb0664c5cca0bc6798dfc
diff --git a/net-dns/dnscap/dnscap-1.10.2.ebuild b/net-dns/dnscap/dnscap-1.10.2.ebuild
deleted file mode 100644
index 38e157300abc..000000000000
--- a/net-dns/dnscap/dnscap-1.10.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network capture utility designed specifically for DNS traffic"
-HOMEPAGE="https://dnscap.dns-oarc.net/"
-SRC_URI="https://www.dns-oarc.net/files/dnscap/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="ISC"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	net-libs/ldns
-	sys-libs/zlib
-	dev-libs/openssl:=
-	dev-perl/YAML"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	elog "If you plan to use dnscap's -x/-X features, it is necessary to install"
-	elog "net-dns/bind as well."
-}
diff --git a/net-dns/dnscap/metadata.xml b/net-dns/dnscap/metadata.xml
index 7b236670d1f5..2507a1887d5d 100644
--- a/net-dns/dnscap/metadata.xml
+++ b/net-dns/dnscap/metadata.xml
@@ -6,4 +6,3 @@
     <remote-id type="github">verisign/dnscap</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 6f6314524ea8..991dcd60dcf6 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -6,6 +6,5 @@ AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-EBUILD dnssec-tools-2.2.3-r1.ebuild 1849 BLAKE2B 9f5ff552891eef394cb6c70e671ed2dce7062939c55d0b5619d814a6d64d58e2abd25ee9946a5fc3cbcb844aa2f9d8c755f67ca914b2cb04df2dbb19b17b1cfe SHA512 0607e3f34786d6d8178326a1b8127f9be4992a3666495d2e62d6447448e7da76667a1ee0a3b9fc31beef67cc32216aa6607d0f5a5900809a9f008ac2e3702967
 EBUILD dnssec-tools-2.2.3-r2.ebuild 2022 BLAKE2B 2568ef64c5c0527b50d4bb147f74f88261a21be8de616db3158083f3fa95043c730545c5edfc1e832656ed34d3c58d9c8566c712ca678ee64d43e30b0e46fea4 SHA512 17dc129b25547160251b6c8fa20bf0ecc2335648bbdf1b8bf75ed10eea9118207420655c593ad6169d4085c3fb3742d5d85118bda97e0fcba0765aa932594814
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
deleted file mode 100644
index 7328cfb57af5..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="https://dnssec-tools.org/"
-SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-lang/perl:=
-	dev-perl/CGI
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/DNSSEC-Tools-${P}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
-
-src_prepare() {
-	default
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-bind-checks
-		--without-validator
-		--with-perl-build-args=INSTALLDIRS=vendor
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	find "${ED}" -name "*.la" -delete || die
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index f5c55a8b0e1c..24b8a69e0fe7 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,9 +1,8 @@
 AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b24899c56061a9d99d03de681bfa117869a7af4148faa30004a200cd6bb968ce53b67d1d3b72a0374e441ebc9ae96e22c3a88b9c95 SHA512 d2e60d7270267dac1237b8d32ae2a5b603972a9e9901eee03cf7d51e004f3d2aba911b3032f710f4b293b308b3507dfa74eede0e2a653b6c86b90123c9b847ad
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
-DIST dnsviz-0.9.1.tar.gz 477806 BLAKE2B 24fc4c34a763cf4ea6018f42bb4ab12c376ff1a5ff29e4bc4502600c997195d5c83fd0b4d18c72fddc0d669380d3a39930d7bd6d3970671becd64a5c3083d269 SHA512 006377676173c225eb3a18d09d0808ab35412d09e988b984fd67598c8a6917a4fefd9381c32ea4dda404d7dde8d51e7b36dc49d85a8b4c2a8928fbde89075adf
 DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6
+DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5
 EBUILD dnsviz-0.8.2-r1.ebuild 1716 BLAKE2B 43691ab360ea1eb74b9fd366ccfcd80e48ae10f336124ae176fa4b92a45965f80ed31dffda23f76fb29e2e42620c9d53b95a49f9d19b7a1722a7b0fee1626a2f SHA512 3a311bca10f923e84d19a88e4bb95da1ed79e22bd429b338537959b146c4122dec317494a3781279205a1435571619e4971c2e11386e6f39cf4c4b36c52ffb66
-EBUILD dnsviz-0.8.2.ebuild 1393 BLAKE2B 5222ca7525399e152fa3b2e56525bf1dc431dba6287be43469f1b9491e196cd1d22817108701f662430e640743b57d5d86342d6f4d61e08c8833f645deb13c99 SHA512 d9f10a330f0f56327148802a6a2f97b24dc93ab73e458a2be6459d74595554e579ca7e12d907387f918b6799e24dcdb41cff61345b3f6380e0c3ea1c32ea0bf6
-EBUILD dnsviz-0.9.1.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
 EBUILD dnsviz-0.9.2.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
-MISC metadata.xml 799 BLAKE2B dc78a89bd168c950054144b3e3569fb9db9a9d423612d1bdb5eb56c6422e92de7d8bfb148c4d43784bddb811e3a2ab46a98875bef76c8c7198ed40aac9c02263 SHA512 87c3f080a01cc3b3524bde90e153c4cc0eae9c0c98c482ceffde452520e70bc2f84500aa8c8425086090ad81ea3cae5b489286256d3875875358836ca5b87a35
+EBUILD dnsviz-0.9.3.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
+MISC metadata.xml 829 BLAKE2B 2c2ba75f7e751553e235c661645e887a87c573dfab97cd7b3383bc9eee53dc74254971aedc2fdf255b548d36ab1319046f29c35a3ac7c9e1f8aff3fe4dd898ca SHA512 bab42a3edb09f79961ab58a9c2d38151e5fd924091def378aafdf8987ba02e0ddd9a06d7fa4a2fe0d58a55477fd5dda665dd6d65b7055f3946ef46b72a23944a
diff --git a/net-dns/dnsviz/dnsviz-0.8.2.ebuild b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
deleted file mode 100644
index ccc19a07899a..000000000000
--- a/net-dns/dnsviz/dnsviz-0.8.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
-HOMEPAGE="https://dnsviz.net/"
-SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/m2crypto-0.31.0[${PYTHON_USEDEP}]
-	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}"
-
-python_prepare_all() {
-	# Fix the ebuild to use correct FHS/Gentoo policy paths for 0.8.2
-	sed -i "s*share/doc/dnsviz*share/doc/dnsviz-${PV}*g" "${S}"/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "Support for extra feature can be get from:"
-	optfeature "Support for pre-deployment testing" net-dns/bind
-
-	# Warn about extra requirements for >=OpenSSL 1.1.0
-	if has_version '=dev-libs/openssl-1.1*'; then
-		ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
-		ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
-		ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
-		ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
-	fi
-}
diff --git a/net-dns/dnsviz/dnsviz-0.9.1.ebuild b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
index 7c7e9021cc6b..7c7e9021cc6b 100644
--- a/net-dns/dnsviz/dnsviz-0.9.1.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
diff --git a/net-dns/dnsviz/metadata.xml b/net-dns/dnsviz/metadata.xml
index 910b4bc2b997..bbcdd81f77ef 100644
--- a/net-dns/dnsviz/metadata.xml
+++ b/net-dns/dnsviz/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hasan.calisir@psauxit.com</email>
 		<name>Hasan ÇALIŞIR</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-dns/dog/Manifest b/net-dns/dog/Manifest
index 736fa4502057..e578f91d1fab 100644
--- a/net-dns/dog/Manifest
+++ b/net-dns/dog/Manifest
@@ -60,4 +60,4 @@ 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 winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
 EBUILD dog-0.1.0.ebuild 2022 BLAKE2B 31bbb81bcaf52c958d8a4ba476222c8e89f3df6a7c48757bcaeebb1f97df7831aa84dcefe35da47312885842051de2c51abff5f5bf7e03432bf6041716d74aaa SHA512 f1924ad8d0aa50fe9ab455152d5d84cbe79ea7d0fb2398c9a62a47a1b7abcfbcd82f2bbcb65bd40a375b591f9d82c09c8d5a0d468d1dd2e778d7a750f39d4fa3
-MISC metadata.xml 318 BLAKE2B 1bb909512b6bb0a156e223229822c8ee778d3025ddfbdb5022d6674b6fdd723e8742d8e4a34fa177478d45d22bd7bb7e779360e342817b548127eb96108498c5 SHA512 01b3fc97a840fb4307d4dc6641fe0e5535af689c98820905c1a20174df970fa930a344912a98f56f38259760102d3e99f5daf6b320d2e022c36d51907731598d
+MISC metadata.xml 318 BLAKE2B 177dcf3dc76e81dad724c86355ddee8297d37a588bc559c1f1156c32a139159b70cad3a71880e298153ef14f4468d9a2da2dba7dca2e21d17b180a4f25619fae SHA512 e7ff96115a9b6dec62a59f89968c777f521884164db20f1d179cd44a2876d6f44014cc7382924ebc5ec9c87ce1c0d877f9949227a9842860a74405e5095469c8
diff --git a/net-dns/dog/metadata.xml b/net-dns/dog/metadata.xml
index 94e8d906186f..a6cbd32c5c50 100644
--- a/net-dns/dog/metadata.xml
+++ b/net-dns/dog/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-dns/https_dns_proxy/Manifest b/net-dns/https_dns_proxy/Manifest
index 515cd6f8a254..6938bded5cc4 100644
--- a/net-dns/https_dns_proxy/Manifest
+++ b/net-dns/https_dns_proxy/Manifest
@@ -1,4 +1,4 @@
 DIST https_dns_proxy-0_pre20200925.tar.gz 16270 BLAKE2B 2677f63662d030fa1b6955f819eb6cbab6916356aa06ede13c4942824ea5c9c88f93d5c53fe725989ec668b3152c8242755279752abb1ed9941b57b83d137191 SHA512 8d0bc083447eaf5973a3ed3efbd7946c62fcabca7286266d2ac445aa522a11bff41201f54e1acb49483957a7f488578cfbb7053cd0cc83ca42c4146eab4e44ca
 EBUILD https_dns_proxy-0_pre20200925.ebuild 883 BLAKE2B 4e41bece350bb5a17cc83555eed6f80b2eef1ce76883174d64bddbb1fd71435b37fbfd4a6627e87d78fa7d4233303d02a0e1711ce461b43e22a4d1dcf46b78dd SHA512 8b342caa96a6d95f4189a2bf7deb6898d7909362c13ea8a34aa697e527b71801cf797879eb27121299f8e5af687d35b5da09fe05696b6dfd3f4b8e0f9d21d679
 EBUILD https_dns_proxy-9999.ebuild 883 BLAKE2B 4e41bece350bb5a17cc83555eed6f80b2eef1ce76883174d64bddbb1fd71435b37fbfd4a6627e87d78fa7d4233303d02a0e1711ce461b43e22a4d1dcf46b78dd SHA512 8b342caa96a6d95f4189a2bf7deb6898d7909362c13ea8a34aa697e527b71801cf797879eb27121299f8e5af687d35b5da09fe05696b6dfd3f4b8e0f9d21d679
-MISC metadata.xml 462 BLAKE2B 2efd0b2282163808360a0f12ba1cef797e4f3403ffa6a202d0b5c1cd10dab9b91b8bca44e1604d64aeeb4bd84f727f354a555f76c3e4853fd8ebfe42b77041cd SHA512 6b2a5c39baabc2c0f25f85a21882771f228ef37e857ec0d4138cb466a050791706a06569f64929272bf19607b4f44dc2ed8f40e49dc59f948ee239d0add11456
+MISC metadata.xml 492 BLAKE2B 0c72987b5e4b0470a0e84d3009521ac3337d2b888964e61b14b41c39619ee246feedddc8579de6045b7d06e0d9abd706a5232b74df7fff27f638f05e97787983 SHA512 680dbe8cfeb562082bdb274646e648a1b3dd2e59d43f0253ceb483821b6a5a560b8145763e3dc3497978094485f25dc175d4502fb192b1698b24624c895c0dfe
diff --git a/net-dns/https_dns_proxy/metadata.xml b/net-dns/https_dns_proxy/metadata.xml
index b314b6132a18..ae5c44f112d5 100644
--- a/net-dns/https_dns_proxy/metadata.xml
+++ b/net-dns/https_dns_proxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 9e3b1bf0d9ac..4a534b3394ae 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -5,4 +5,4 @@ DIST knot-2.9.8.tar.xz 1194284 BLAKE2B c4329e5b2fc499851112d008af10c1a73bbe50cd0
 DIST knot-3.0.4.tar.xz 1347928 BLAKE2B c97df0c04dbd6b96d2f2805a2bbb07bc3fd0ac64160619a55fdf93ac02e6d3f797dfae43ac8bc79450c59c88e0a521911517577ea19d67bb41186cfcd07dd743 SHA512 d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac
 EBUILD knot-2.9.8.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 EBUILD knot-3.0.4.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
-MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
+MISC metadata.xml 1707 BLAKE2B 6eeedcb9dea44ad97afe8ed57bc529ea23bfa93c72163c566cc527a0284addbaea3f2fed4804853c8fb0431f38691356eae305c32f7e4a1256ef634894ce2a44 SHA512 e555e86949c2671b21e7e62a7aa346417f36ca9953fa45c5a4d1a0a4d46aec8bb4dde6c07121e1f5ebe12116756f3f7daf27455305b9158577f060c6237d047a
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index d14d98d83184..3af7437d5aef 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 269daf8988c4..dcd59138bea3 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -4,4 +4,4 @@ AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e
 AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7
 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
 EBUILD maradns-3.5.0005.ebuild 2356 BLAKE2B 76a5b86f780babd85b5afce1a46b60f302aa912edf4e081dc9b43e49a878dc53c57f22609404c0ba4fa3b919b50affbd6c7920033952cbdd12dba68b1deb30b5 SHA512 d18b707014c2e6725496cbb7831490d124751f5e733ab051ce71cf897564a91112062c80badda0639b62e60cdb9991e0e6c14efa94d81ebe48f5f0c74ce8624f
-MISC metadata.xml 620 BLAKE2B fabe3ba11ebb5211d8ed8b51912a22515e9a299195abf2c6a7a14f552837ffa4a080e681c01a058afac19187cc3ae41f677d13598fe9b01738457c360dd1e0bb SHA512 0394942fe14d585a9ecbbff325cc34dafa16a4d438334620a25ed009454724e9ed6e8b5f8f5f89f359a2141eb1031b0180eeba7ed99d6995f21e549f753f3fa2
+MISC metadata.xml 650 BLAKE2B de0597fe89738d9455f42c28ccb868f222170d4c554d46d8f266923f832ebc8e2eeb10b14481c361a0c03ec31e448684d61fbf4bf8f960935d6f7abe550b21b1 SHA512 119586844787fd28975f10a6546f3f28e9d99ef09f08293b24502fd5d5898724f35c6f2f31c68862eb5ec8fe6a3bee2f4f4d61581369430231f720777f20b153
diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index aa20f8fb6d0d..c8ec8947dc49 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -5,11 +5,11 @@
         <email>slashbeast@gentoo.org</email>
         <name>Piotr Karbowski</name>
     </maintainer>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/net-dns/mdns-repeater/Manifest b/net-dns/mdns-repeater/Manifest
index 37a32840596d..2124be499098 100644
--- a/net-dns/mdns-repeater/Manifest
+++ b/net-dns/mdns-repeater/Manifest
@@ -1,4 +1,4 @@
 AUX mdns-repeater-1.11-system-compiler-options.patch 687 BLAKE2B e806dcb148b5db8c4559fbbb51843efaac5e73565551ffb98d008e380a3192533851bf20da2cc92bf9945238d87939b6af511a3ebcc39aa64f90529207e2a3e7 SHA512 fc78f8c2b40846811d04e731404d7ed3ebdc3863870c5ddb457b4f2443d2c31c2b3a580e7dc0dae5b6f11f765fd09d33b0d471bc4d486fe64ddbae0e0cf669ca
 DIST mdns-repeater-1.11.tar.gz 11220 BLAKE2B 88e6b68635be152c2fcd7eb0e5be038d694bae590edde283dec83b896c2380d83cc84d5e4cfb02b6ae957d75dd7525975e31c418d05f5732b5f41382fb130c31 SHA512 3f2fc83448db7ed84512ddc42d1769d1d7fa52aa92a4205d9956685fd5fd8b5c050b8a2c44d4b834e242568671fa278ac912f0b35f3c7cf41aa0ae8f1cf2a310
 EBUILD mdns-repeater-1.11.ebuild 550 BLAKE2B ff3bf7c106d4b143f3fd700e00213a3135dc50db2d75f8c4627a4e3b3101eeaebb097280188f71ff5afe4a3649f2e6228b501d6e0caee187044656cf09adaa2e SHA512 c43c1fc07d980881b27f46e6f63143b40a429ddf33ef569cfcf1d4d9a2d6bdd9b50b850c3a273c362ac59e99fe8906bbd5d0357da8f5ae0c2acfe7de8ae78c29
-MISC metadata.xml 475 BLAKE2B aaa3ba749586ffab285b5b3bea63d8b2d0433399a2a95080e1b1387ca48830d458156bb0f89a4c955202ddd651d548441db0adad2630b27f6877093f838139b1 SHA512 c2e5468b6a3606eafaa2caee43921a914e4758d6b66e417791247eaa97c688967e7e3617af1d0dceffc3924f9a87423a66652499880564e5ff7a7b2661177958
+MISC metadata.xml 505 BLAKE2B 4d212f0cbc1b39d4d9b82639e4cb8970e767a1ed4487fcbcd3ebb0cf6048968e2314cdac0b63e1381c4d98e47f8d5a07b1e742df0439f4fa4932cbce90440364 SHA512 edb820f4296115437545de1b317a12abc98c152fd7d5279b5238f441c91ebfadf99949c29f7900c00690caac7b04b0ebd602139d2bd6ab1c0fbc03759e3caa49
diff --git a/net-dns/mdns-repeater/metadata.xml b/net-dns/mdns-repeater/metadata.xml
index 4a16a9ff3c07..f08896e61859 100644
--- a/net-dns/mdns-repeater/metadata.xml
+++ b/net-dns/mdns-repeater/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>cernekee@chromium.org</email>
 		<name>Kevin Cernekee</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/net-dns/metadata.xml b/net-dns/metadata.xml
index 18ee426a8540..03d9ff9bc991 100644
--- a/net-dns/metadata.xml
+++ b/net-dns/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria net-dns zawiera pakiety związane z DNS (Domain Name Service).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 97021c7967bc..cdc1c25558d8 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -4,4 +4,4 @@ DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51a
 EBUILD openresolv-3.10.0.ebuild 1046 BLAKE2B 0d2d2c8b93a27d02d1dc3ce6321c550dd99e98c50cacc55b6357f7b12e4aed44468e17c8c6c41bebce7f183616f506adcfc76867a51f7208a65dd94f2cfe2e73 SHA512 03a64836140098e17b58eb63ffa87a60175eaa5f3e0d21faf7bacf6ae38a20a7282180852eb53d32fb7d65c85cc7ed84d8f4efde9aa15fa5dd02da66e90cc6d7
 EBUILD openresolv-3.11.0.ebuild 1054 BLAKE2B 6d8afb6396bbcc82eb4957afce12914c29c66c765cbaca39a91bc256cab5551c11c88ca57faa5dd394df677a4a21cacedab984a0d714c6ac3bfd97a27dc540f7 SHA512 8c8a50bd91f96cd3c8ff688e46fc9ea1e39995d26cb2c5f65a1b79e20de48de44f569a50426a1246a2e9683a1431b6318bf0a83492ece338a8f66b3a25d04498
 EBUILD openresolv-3.9.0.ebuild 988 BLAKE2B 9eeaa5bb03ff5da326a9c421364216eb0c89f4e2d3ca9f5df64c3a036cd1006393c705ce1761a6f963849d4b896b1101ebc60b7bbee3fa6aaa8d17c19680a570 SHA512 b490a9558d670c224bc714d5b6b8b4b2f00025c6629e6750d2a460188f375c7571ef39ab67aeff369cb7d7a129b34e4f339522ed8db80dee102d6503f0f3b11c
-MISC metadata.xml 396 BLAKE2B 225458f3e84955b1864d1d3fb1e33d1621d59ca00860da438d2e4d1e5cb07db50a8910bc25c7372491ef637b03f264073c881ae157691a25665f10c176d02ca8 SHA512 125584791b7eedd8077834628835c5f03c891cc7d0cb498a8a8a356b72dd57edf680b019e416bc4f38ae6647dc6075a59b61d6fdbb98c392ec1f63fa66eee370
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index 232308b66fd0..3c58a0219fbe 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/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">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index b7dee6c5c74f..be1c17ac20d9 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,5 +1,7 @@
 DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
 DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107c53275430b3f5e1e46204265af3501394f72b6119e98ad3382e48f9a8f2511e679b3f4093446beaa11095bfaed340ce SHA512 cc379124c6104ba1330dfc038f04f9b473b71ac81b18889e481fb7812b38e71040ca6bed7bffd6eeaf77abeb8452a4d3308514ec6380811327dc832aa0381be8
+DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
 EBUILD resolv_wrapper-1.1.5.ebuild 658 BLAKE2B d08b85542d7f12ac823968a30608f70a8d288f6967e5180e3e47345bde26caf5f9e97436793752dc82eadeb1566c78852a6a78cd5284f4b9ad962312ebab0969 SHA512 836c969b74b0f5aa9d37500f655d00fa1307c7a21d88b0a2ba90eebe2dd7c89a5b3927ef41d1aa5dba0b9031f7264dee1e488f44919350bef11129a59ed48656
 EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
+EBUILD resolv_wrapper-1.1.7.ebuild 802 BLAKE2B 01b26bed8b488e6a2e4a90789c4107c96aca4f1329d6414779c4400da66a11e00f04f2870aa1a0f67ccc0092da87ada4ac995ac6b964bf7b10cab70e9f1ce734 SHA512 59ef159340ca914b8191b59b37bceb3786bf6db50cdbfb281b7a558ba1b126906021adc582f47b8cb187afbfdcfde5f58efaf50c43967f9c0fe9cd50cbb0c7a2
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
new file mode 100644
index 000000000000..50e162a27887
--- /dev/null
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
+HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? (
+		dev-util/cmocka
+		net-libs/socket_wrapper
+	)"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		-DUNIT_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c0f2dbfc8385..e1e0d0a012b9 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index e1ff6d21f741..de313d8b9f7a 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,8 +1,4 @@
 AUX arno-iptables-firewall 404 BLAKE2B 20ae4750d99c8edd3edf4f0e96354aa6a3f0df151bbbfe46f27fa3b1e0c8aaa5bdd7e3292b2e1fc1b5c735ae2b3d512117a5457b42593848829cc2808e7b6ec7 SHA512 3491c556150ac4c39447f17cb48caa2542c42c632d960f604ccdd475cbec239b8fec8523606c146427e644a929b2c5522f3c21a47712fd67880ac3815d3ab983
-DIST arno-iptables-firewall-2.0.3.tar.gz 139445 BLAKE2B 57dade49a4aaacb1354129efeb5ca013060d51baa8c23dea1fc326e52a693c7137047883ea7bbca6cc3221f70a83f7283123a345e22ceac4bb99d3b43410b65d SHA512 c88a560d4c0a2644dd1ec35e0a6e2b1883e52dc6c71075207c3b98a59964a4be3787620e9414ad5e926bddb9dbc7c2674fd8687828526c35f0fb4a53a05aa929
-DIST arno-iptables-firewall-2.1.0.tar.gz 140015 BLAKE2B 46ff89db6928bd4f86a5b26a06fa1ab2a88ecc5043f6f92543151c3ca6b74d9704c4b7046e1c5e1371e0b5de552e414cbe0524305947b026ec7953f9d779055d SHA512 b59644e78f281dacdd32045254be15dbd31ecb5f2b26d88a3c9bab60aaf19ea879d87127040db5f72292668e22026d982c17d3ad34c83da16720cdbccebdd07f
 DIST arno-iptables-firewall-2.1.1.tar.gz 141076 BLAKE2B d3f78767a3ac447841aa01becfd73434cfddc9f56142d5c6ac86072527c17a30449434b8cddba74bb45f8234268ba589ab2ea932db462317a2dfb714f31f2450 SHA512 55494c8a214c0b2dacfef23170ea596bf9ecdfc73d1a6b2bd703183278569f68103eb63580d1b18cae97a9460b95373f0091bbf5decf275c80803a1331555d79
-EBUILD arno-iptables-firewall-2.0.3.ebuild 2409 BLAKE2B 6dd74fa4f999915ad4d47731070e0a2d0490fbbdeaa1134d23c55b7b12c95f80cdd3ab9897ed294e0cfb97e033a464cb8948220e30877798df0fca22dadbde8c SHA512 45c09dd36c15dad8b20e28ff20f41504eab837fd72248dd8486382d42d7cafab4ed22a1d4fec4e2eaae6bbf5bbced8ab5c2c5322910c6a9216b8c948de46f467
-EBUILD arno-iptables-firewall-2.1.0.ebuild 2418 BLAKE2B 77ce5882577d617dc2187f2144d105301ca11fc0d42ea5f317d08ec9100fe536d450c99b0a9c3fa8dd858b313dab5af64f2c59a928103c603b6ed6c80792e5d5 SHA512 cbe407a4acef1220fcd76117cc4f456f9a30dd729c875803f503baa014fde5f8663f6afe51a7ae2e5be6b39f1b7ab943380a62b86d84814529874ef70bd53ce1
 EBUILD arno-iptables-firewall-2.1.1.ebuild 2665 BLAKE2B 41e15cc68ba3ba5b70a883e0f75060f578ebe3a47b28493efe8e71b99d621b4095d47ca63ed3041e4da02c2ed8e29fe140556edca41550f09d26bef90b8b3524 SHA512 14655be7f1370924e8441e5a5858ddc162009b64890da86036c722a212a0bafd7b4becb6a1ba38cd139c631cc78ce51f757a26e0bf2e643b7d6cf63e5a131437
-MISC metadata.xml 515 BLAKE2B c904370936eddef69630141ec61bdfe911a29bdc2425238b2a973ffcb89702183e0e36c42799cfc6cfaae403bdfb5a8fcefa1a576dd6a547a6b161ca9a967464 SHA512 c0d63d340e8fa318e276d3bd2e526dfa2dd5e8d810a75d75301cef8983d5bc851aae90e7f29685f8c2c21c21fadfa1c3d033156d44fb289eb9890465ea49e3bf
+MISC metadata.xml 545 BLAKE2B 1d020ccda65b439c09a33ae0b827cf32c2ec84147e92a1ceed9496cf394635abc1f04b4204457dd2d7593e1582d7365bd16a7406c3885a6235bf9d234800cfc3 SHA512 e2e74782c107b1eb0ded47e255336eee7735636dc6f800214946ee87a9b5f7454bb7ca5514ae530087f441c6452b41558f2152c3b738a1352099100f4a79ba73
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild
deleted file mode 100644
index 5bcbe33d8515..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 systemd eapi7-ver
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="https://rocky.eld.leidenuniv.nl"
-
-MY_PV=$(ver_rs 3 -)
-MY_PV=${MY_PV/rc/RC}
-SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins"
-
-# sys-apps/coreutils dependency wrt
-# https://bugs.gentoo.org/show_bug.cgi?id=448716
-
-DEPEND=""
-RDEPEND="net-firewall/ipset
-	net-firewall/iptables
-	>=sys-apps/coreutils-8.21
-	sys-apps/iproute2
-	plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/aif-${MY_PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
-before using this package. To start the script, run:
-
-/etc/init.d/${PN} start (for OpenRC)
-systemctl start ${PN} (for systemd)
-
-If you want to start this script at boot, run:
-
-rc-update add ${PN} default (for OpenRC)
-systemctl enable ${PN} (for systemd)"
-
-src_prepare() {
-	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
-		etc/"${PN}"/firewall.conf || die "Sed failed!"
-	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
-		lib/systemd/system/"${PN}.service" || die "Sed failed!"
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/"${PN}"
-	doins etc/"${PN}"/firewall.conf
-	doins etc/"${PN}"/custom-rules
-
-	doinitd "${FILESDIR}/${PN}"
-	systemd_dounit lib/systemd/system/"${PN}.service"
-
-	dobin bin/arno-fwfilter
-	dosbin bin/"${PN}"
-
-	insinto /usr/libexec/"${PN}"
-	doins share/"${PN}"/environment
-
-	dodoc CHANGELOG README
-	readme.gentoo_create_doc
-
-	if use plugins
-	then
-		insinto /etc/"${PN}"/plugins
-		doins etc/"${PN}"/plugins/*
-
-		insinto /usr/libexec/"${PN}"/plugins
-		doins share/"${PN}"/plugins/*.plugin
-
-		exeinto /usr/libexec/"${PN}"/plugins
-		doexe share/"${PN}"/plugins/dyndns-host-open-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
-		doexe share/"${PN}"/plugins/traffic-accounting-show
-
-		docinto plugins
-		dodoc share/"${PN}"/plugins/*.CHANGELOG
-	fi
-
-	doman share/man/man1/arno-fwfilter.1 \
-		share/man/man8/"${PN}".8
-}
-
-pkg_postinst() {
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	ewarn "Make sure to not use multiple firewall scripts simultaneously"
-	ewarn "unless you know what you are doing!"
-	readme.gentoo_print_elog
-}
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
deleted file mode 100644
index e9eecc7f7363..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="https://rocky.eld.leidenuniv.nl"
-
-MY_PV=$(ver_rs 3 -)
-MY_PV=${MY_PV/rc/RC}
-SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins rsyslog"
-
-DEPEND=""
-RDEPEND="net-firewall/ipset
-	net-firewall/iptables
-	sys-apps/coreutils
-	sys-apps/iproute2
-	plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/aif-${MY_PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
-before using this package. To start the script, run:
-
-/etc/init.d/${PN} start (for OpenRC)
-systemctl start ${PN} (for systemd)
-
-If you want to start this script at boot, run:
-
-rc-update add ${PN} default (for OpenRC)
-systemctl enable ${PN} (for systemd)"
-
-src_prepare() {
-	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
-		etc/"${PN}"/firewall.conf || die "Sed failed!"
-	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
-		lib/systemd/system/"${PN}.service" || die "Sed failed!"
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/"${PN}"
-	doins etc/"${PN}"/firewall.conf
-	doins etc/"${PN}"/custom-rules
-
-	doinitd "${FILESDIR}/${PN}"
-	systemd_dounit lib/systemd/system/"${PN}.service"
-
-	dobin bin/arno-fwfilter
-	dosbin bin/"${PN}"
-
-	insinto /usr/libexec/"${PN}"
-	doins share/"${PN}"/environment
-
-	dodoc CHANGELOG README
-	readme.gentoo_create_doc
-
-	if use plugins
-	then
-		insinto /etc/"${PN}"/plugins
-		doins etc/"${PN}"/plugins/*
-
-		insinto /usr/libexec/"${PN}"/plugins
-		doins share/"${PN}"/plugins/*.plugin
-
-		exeinto /usr/libexec/"${PN}"/plugins
-		doexe share/"${PN}"/plugins/dyndns-host-open-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
-		doexe share/"${PN}"/plugins/traffic-accounting-show
-
-		docinto plugins
-		dodoc share/"${PN}"/plugins/*.CHANGELOG
-	fi
-
-	if use rsyslog
-	then
-		insinto /etc/rsyslog.d
-		newins etc/rsyslog.d/"${PN}".conf 60-"${PN}".conf
-	fi
-
-	doman share/man/man1/arno-fwfilter.1 \
-		share/man/man8/"${PN}".8
-}
-
-pkg_postinst() {
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	ewarn "Make sure to not use multiple firewall scripts simultaneously"
-	ewarn "unless you know what you are doing!"
-	readme.gentoo_print_elog
-}
diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 5f877c6af9c9..c0f3142e0650 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>erkiferenc@gmail.com</email>
 	<name>Ferenc Erki</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index fc2becf71bc6..98cf156644c8 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -5,5 +5,5 @@ AUX conntrackd.service 273 BLAKE2B 24df8adeaf71d208d3314c3eec6d4d05ba9e211c3ae7f
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 DIST conntrack-tools-1.4.6.tar.bz2 499806 BLAKE2B 7c1ee1c5fc2b6f9d33c6cf850eca80978b8763317b1a76892cefb776130564f15fbd4e4554fdb08dbba93d9f16b7e4624a1b4dd5a631f747f5fcc0a5b01b8d5e SHA512 a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a
 EBUILD conntrack-tools-1.4.5.ebuild 2190 BLAKE2B 49e4d6cf2f37939da6d577c6de370d6a68e391a5c57c7f84a5d002befb231560d6e443d5070d0ccde1f888bcae67d9185d93aac4acfcc0dc4ae6359f49509f09 SHA512 7cdf3820923462eab080ab8c2b5ede6d3f4dd08247343aa7e0bcfdb0ed4f1e95538c1ea10a1d427470ce27df652f44bdcc9d1dfee1436adc3b51a5bf123c6e97
-EBUILD conntrack-tools-1.4.6-r1.ebuild 2185 BLAKE2B 75d4ec9588d9de46c0bc0077645e671c0a9007bc6cb7ba298ff3a419e1559bdcf21a1ec056858b3190d4c112e4fbcc4004ec08f99f99e35e20e12f0d7ff1911a SHA512 92775efc55a58a828a6fd1c19a11059d9f375dac9f90973581b1395c88680ddaa488732259753699093a51df992a7763bcb05e1996c03d826802337a97d4df3c
+EBUILD conntrack-tools-1.4.6-r1.ebuild 2182 BLAKE2B 1c304e125a9de54bb99050e17a65ff1c33514c5788be69397a919f492877ba67c6bb03f309f9f22dab4546078bdac6d418d5a03aafc90146768dda546c083f64 SHA512 d850a05ddf4b075ce1707be45b3550891bf3c12d7d69add23324549f74867fe5c7075eadd2a54d37dc5f23ca2090a4b82bd5c1176d793fccb2beffb3f01f0625
 MISC metadata.xml 1048 BLAKE2B beb5773ccddbbf517dd5a1e81672a502e3f728085d3c1128207bcd91c544dd8abc3fc3dead68c4bc44b86c3bda2c2f101620ecc86a03fae5c7231716c882f5bb SHA512 4fd1da860481f73d5a47422c93fb5051995884dd488b64d8cd80bc720f81fd37e15a9bb9b86192c37bdfdb024201f600900cd6bcf38b20979c40019b0b290338
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
index 5c420d948769..5d3d95a6b3fa 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc +cthelper +cttimeout systemd"
 
 RDEPEND="
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index fe1e968411f7..53e1521946a8 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -2,4 +2,4 @@ DIST ferm-2.5.1.tar.xz 74860 BLAKE2B 8ad76918f45516dcbee18922600690f9d1c418ee62b
 DIST ferm-2.6.tar.xz 76748 BLAKE2B 17c15e9d95c4562d1635715c599ab07fc98d8e9ebfcc332a42953fe279298799f26f7b3679f97e5dc9a82b745f70f54756fe2a9ed5763e91db15f7c0255c179e SHA512 af2bb852630304a86629c2ce3af8f557d17f59c704589ea130d8578f300a606e4fedbd39c88f89646df974947fc27982e3ea21de1187257afc74a6056fdf666c
 EBUILD ferm-2.5.1.ebuild 824 BLAKE2B c359651a2878de6460de812693e7f067f2f25f91a71fb72fd24691ba1351e9103cd17f0563c09e55a43e83d2f8a4c326d4f948a47693aacfc421aba9cd2fffd8 SHA512 c3bd5dd916ed47c90ba58b1a98a234ae4f484c8efc97db6bfae0af584f7df3dd6da3ae0ed17475f390d977e8b6f4c4967d114a0af55bbcdf2fd2621f68d7883f
 EBUILD ferm-2.6.ebuild 802 BLAKE2B 9f5b8cb6f6813dce596c1b8d614bd1db89cede70682fc82167a792801d6ef734f674a135f21e53a12fcbb0398a482952278dbc3ce84bc851e5ebebc0067e876d SHA512 235fa23743ae50c2d8403058a75b62ffeb8b8f1edb63bad3addb10fea2d4a6f8f1cf9716a7d8411f42eb4133b6c5340b2b75dac882b69ce1278b68bd53834b7d
-MISC metadata.xml 450 BLAKE2B a42e7896b2269a0fbb904ced374899d3a3b87d38cb08c0c6f55f570ff476d42ede3b9316b69a86a5d46b64c5d7050348efdb72c2e9b68440c4a991078ae56e42 SHA512 23ffc755aba9f3ce1acb92f3de86ec1f788bd868227b7ace77b3b7accfe891036da7e3e87254fc0bd693d7777e4c932b663e0b1118a8804b0ac2d63624a4ecac
+MISC metadata.xml 480 BLAKE2B 49a496bb42daa2d09d9aba2f7a7c410df7ed3cb9601fd945caedce24ed1b6d0eb8041f12ef46d7ab3a07ca52d1664f9c3f3f1c97f254ce0aaacb1a768c61edf5 SHA512 4ecec0087b19b9ce73b8c1b66e9cb9b2fc1d98c2e18f2d4397e53d106e7e7347500b1622c8f6eb547998291d407686b3e93891b3b316e53a52690d35ec75ed64
diff --git a/net-firewall/ferm/metadata.xml b/net-firewall/ferm/metadata.xml
index 7d002d1d6794..0aa096a5e4be 100644
--- a/net-firewall/ferm/metadata.xml
+++ b/net-firewall/ferm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 66b3ed4d6814..83c479bf2e93 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -5,4 +5,4 @@ AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 EBUILD fwknop-2.6.10-r2.ebuild 3353 BLAKE2B 6245fbe2c3e661d16dca817e8a5035652ece42cc0ea106fc471fe1029a4531eb3199a2f689f6d398b81f65e28c1f87f97cfd590c6650fdaea5e75aaf661420d5 SHA512 c8f71073b1058502c482a38b368d625913993e3481e486f9357eafbcfbc44983c7d6107cdf7841b735e6df62e5dc039ca662137416001d9aa744552ae70ae308
-MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
+MISC metadata.xml 1247 BLAKE2B f551b38248b14f9e08af3710c35c3fec1d198ff0c100132a495fe4e040b1ae94005c46aef50e7fe931133b41d2b738fca97d458a777caf7e4892e169938acb9e SHA512 5a1f01811b27e88a339578d410ae41212c4c1c4a3ced4a47f63c09db3226023e4ac822164f5448a1912fc8829743c6a60c04852d836bec5ebbfa0726bfc47568
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index abed2bc853d1..a54c3d03f8d9 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-firewall/lutelwall/Manifest b/net-firewall/lutelwall/Manifest
index a1f1b881365d..83be99117a80 100644
--- a/net-firewall/lutelwall/Manifest
+++ b/net-firewall/lutelwall/Manifest
@@ -1,4 +1,4 @@
 AUX lutelwall 354 BLAKE2B 27d2a5092f7c3bc9dcf505762378571e1a2c557790a05648a8c630f275381c764ce68e2e2bdf8594697e7058e8d9b41352f0cfd7df9af3b87298a9f9b55a9526 SHA512 43b9c9ba93d65767bfc1d6a36ee4acb98a3d671784d021a0cf501390b79d9d38c0913b63c693098941868fc65c17a1625f087e679a0fcbb9a3adf5f6009be4e1
 DIST lutelwall-0.99.tar.gz 29209 BLAKE2B 1f9e0c1516105e271ea3fc0ab51cdb4957a86ce725e305ef681951960f84029ecb8b911a1b49827dec67b00289385e8a62a5c90529463057859aa3d130897d39 SHA512 8812048c9e4ec3beff2214ed3ceb2d980d769ada686a934af22baec76a3670e51ddb171097adbfb78c63ce9bc25554b1da93ec8c86f59457277fd4651cf1068c
 EBUILD lutelwall-0.99-r1.ebuild 674 BLAKE2B 3ce9c2d267f07efb32dbfd8747e058ffee449a2d6b79dfe0979ca48f99c69703e53e7d6ac274bd4fbcae0996ad2702e6dd6e6f4816bf9fa09923dd4f217293e2 SHA512 6584741ddfea398c7becd906da5cab145d588c6c39af046f50ef5317f4061239a48d66def9598ddaa0671ca37779a777fd60aaa0626441234fcabcade1599e86
-MISC metadata.xml 869 BLAKE2B 8fae2c62b1e34e2f35ca01da9746a78b36c9fb2a0318717d7c5ae9e6d698ebbfe969b8f9945c10ff50db399c45539bb4f63bff1adc66a2efd4ed5a4efd724035 SHA512 a4326ec5c7720e296a1e74ae39eafe359a3d0d919112ac6f6f6522dfbfd89ffbb98764a952d110c93df6f84dcccbc942c7902e3ad06dfdc18788d45741862755
+MISC metadata.xml 899 BLAKE2B 1f1676f2a1d866097fca5b4682cfb9fd35884d1dd42b8d5c7d8eb866cc1e0e6b04639c8a016924ae061211724f0763444df9c6c9bdbe39b88be0ff52e064b35b SHA512 6c92ceb6da7a2ea45a07619b726e214cd1f8aaf3ec8fbd2fbc3df7d3c583fff280ff94b1e40f0e66edac351d6edcb231232970849d0e5d29c541c5b6a384dd11
diff --git a/net-firewall/lutelwall/metadata.xml b/net-firewall/lutelwall/metadata.xml
index 84f26425b4f2..8a410a01a281 100644
--- a/net-firewall/lutelwall/metadata.xml
+++ b/net-firewall/lutelwall/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
     <email>tomek@lutel.pl</email>
     <name>Tomek Lutelmowski</name>
 </maintainer>
@@ -9,7 +9,7 @@
     <email>netmon@gentoo.org</email>
     <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-firewall/metadata.xml b/net-firewall/metadata.xml
index 7ba30053341a..d475f6d53c0e 100644
--- a/net-firewall/metadata.xml
+++ b/net-firewall/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria net-firewall zawiera ściany ogniowe (firewalle).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 7c5d9f489d91..47d4743144a8 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -17,4 +17,4 @@ EBUILD nftables-0.9.6.ebuild 4223 BLAKE2B 8f3fd4eb224eca32929c633083a03e7f6eaac9
 EBUILD nftables-0.9.7-r1.ebuild 4230 BLAKE2B 63189df1f6f57039d577928a6c9ab0ca2874a88b01c0d0560d8e9bba7c6ecd4e55435179989bc2091b22b5932d839802d0e975811105c77bd78b382b2d25c0fe SHA512 47c666e520b0046d91cf9ef8bc13eb68b307e2a36f5e0e59ee5bd91e835da7dab93adc0c2fa105dc81eeb274809b3f7c1b35ce5457f37088f355cf5922fd2882
 EBUILD nftables-0.9.8.ebuild 4290 BLAKE2B fbd2f931d824395bc4495f1472ff56ca1c1d825071a17eb5d7a323911093a23da57439ff873a5e9aabddc59d07e075ebfb1dadd5ae1c0a79fecb1512a8191826 SHA512 af1ddc9cc0d5b6411d3bc554c39e7b1ef2e9722e73a7f7996d7610769f068eb2e8a24a56a0795064b9d28d62be985999187fa524b98fcde51db2805ce1adc2e8
 EBUILD nftables-9999.ebuild 4492 BLAKE2B 05cc4045e8fae502ed295d4a3adbf64011804f7e4644164f2154cc2cf60d3449c4dbc4bd2cf24ed31d728a70ffc1ae68f85ae2b1e1e833af72597709cb2a65df SHA512 49925a64a3c4e0c4585e78a368884439e86281e2350129f66cd5b7dc952d515c4b4e007e6d2cd1bdb436cc888949e5139863e1eb99cd352844b5727693aed88f
-MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
+MISC metadata.xml 932 BLAKE2B 1d75a3e5a7d7416bc86d9f85bb2ca62d33a78017d773d2984b7f9666a0f615ac41cdbdab58f63f612a2b95e498fe8a785a1dce0e4be188446c197a3d96bbecd5 SHA512 8845820c9c3be773a1b8dbbf24eeb1db7327722f4710c473112b4450265bdedbd8b0284cb6ba87e915596cdc1d608e573920f19116f06fe6a1fa167e8d0e23d5
diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index 0380331d5106..cdf267b12f51 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/metadata.xml
@@ -9,7 +9,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>klondike@gentoo.org</email>
 		<name>Francisco Blas Izquierdo Riera</name>
 	</maintainer>
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index be391f9d757f..2c111c454ce8 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -10,4 +10,4 @@ AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0
 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7
 DIST ufw-0.36.tar.gz 580338 BLAKE2B a7e07ac11539061a69bb83d45c0affc54793503b31c9e9f9f8b34fa890a3fe97682f9133102e74e5f6e1eb372a929cfc8619baa2cc9efc1dc289d9f4a1766efd SHA512 b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3
 EBUILD ufw-0.36.ebuild 5754 BLAKE2B a29ee27e3caa2259694bcb50734d7640915fd771a8a418359002092572076ed8353eb630a58bada822eb31dc4df5c0a9c94483a3b0235d23ef62c74ae1472dc5 SHA512 162232023628dba7069e3220f978f73d80643b2e79a2aa3ec38620e0226b9c16f130ef2ba20059202b33bd8493468e29dfc093795d1408840b28f0cbbec90696
-MISC metadata.xml 867 BLAKE2B 803f1809161a81c013989270661d5e17bc74c9f02dd7c2cf9e7847b86072ea56fc5ad980a6f2d285ee1d806902621ff1100ac20bbc27465e828aec4537e846c6 SHA512 e11ddde14aa8fb8aa187537f3cfeb01b26b4421489d69223fc77ab4400b002105d2b8161ebf489748eb42b615899f87c1abc65d10d7ef40b2f107f0d85c17c77
+MISC metadata.xml 897 BLAKE2B 8c44a779069d78a84e4b71049b1bd3164c2e54420bf26a658e65aee9ccca21cffb97af77be43ab1a95ce531c60a273a34df3e558bd3060618d48f3c957d6bccf SHA512 83653f1c6e09a82e2812e86c56f077fb330ae1bfc1fee93c7fb27a1d10ef2452a1a73fc05eda002e3bfdc7df0157a941af6dfb8a38b737d3d096bc4c92f3dd26
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index a35eb64d103a..daef610907ec 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hasan.calisir@psauxit.com</email>
 		<name>Hasan ÇALIŞIR</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index e198224d696d..173095a6a6bd 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,12 +1,14 @@
 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
 DIST xtables-addons-3.13.tar.xz 327104 BLAKE2B 110719a7425060a79df0643ea35cf28ac62af811dde0f6744cf75b632809ff02518366e12ecdf8b017648b85843e689735629fc099b23b21b1999afa3a2e5c69 SHA512 0a9874269dafefe2fc364b41d3f5fb2108ba83dc49457f3aa436b814c8c65fb00f48f664576c8ccf183939edffa854fcf9f9c82a801ac90c0e2b9dc1426e1d85
 DIST xtables-addons-3.17.tar.xz 331272 BLAKE2B 94ec8c8eb318628543b89685482713fe11b80f72416cf10bdf6a5ae27905f130c7a3212481c8c5c0b1f3b1962f7a3707486563d5a0683f3754655f058226b32f SHA512 7d9f80b0f898236e4479f4c618e6f0ad697165c4b4d71fd35d8dc874bccf6376b33ac0fdbf846a8999776854ff175fb8d624b01c12b91142618619c4e6a85706
+DIST xtables-addons-3.18.tar.xz 328624 BLAKE2B 9662773c4bd5464ca789975762233299ca194977d5605a3c5f9a8a5a15f51afa4c33c8c17fd622af301a0f377542b6497eac5ce7e23719d238de5df51a9554b1 SHA512 b334642ce9b6ec3fc775ddbe6b66d70467fdcbfe30dcb165dac203f9d7fcd222dfd8c91e10befa3666bf572115dc75ed32d8ece05ed2947a4ed21d1d09032b8f
 DIST xtables-addons-3.7.tar.xz 325124 BLAKE2B e7f0bff03f0b77b55cd578c5a77ab4a306fa5a5cfd3b7e5b801b60d4ccc2c5a476fee2b04f4cb8db4b3ab34c7dab353ec13cba1fe98a714cfbb2e89e3110841d SHA512 336f19596251507a88d7c399f9a3e6f517e4b72787ff7e7108e20e42e68932bca0eed79c54ddfa92112daae73a94a7349a874bcf993bd4abea1d875d7f2b8565
 DIST xtables-addons-3.8.tar.xz 324468 BLAKE2B e460e0dc7fcd7037610b44132628b3c39c81477c2e1ef345d939f1c4d5981517789f240d1d2233c6a8e962e326ff9a25c5e66dcf829fb23db66dc8cd78b076d6 SHA512 2e0594ee0e654a19e6bae4f7acb7efd142957418ed44ce92ecd7474bb2f0bfd8dad684be937e8f6ed28395f9d7a6dbea61e7c3259d7b89c05ab10bcad3c04264
 DIST xtables-addons-3.9.tar.xz 324380 BLAKE2B d78afec65647c9b83b16e591b3cf6827748d70c02b381c30ee1751aadca6397fcbbe4e7f8e1e9199ae93b07e37ae333358e677b89d2b2c62adeb01e345ce2a33 SHA512 ec7d2ec97c433eb94b893aedfd346393986ef140d7ff95cd8be070cfa397efd87df7d73d36359b81c80618eb8575282a1ea8624c3bf182ddd60d8975f58579b5
 EBUILD xtables-addons-2.13-r1.ebuild 5515 BLAKE2B 1ae1dd1a2f6608a42a1f832adc7d66ae0912122d688d96e11bfb9c3e9c09b3844dfcace85d59576415290355a99bb07cc25011110a33daa2b581a4b04a49cd07 SHA512 21409ed9b16bc18140841b30924b56b2e38752f43d93c9ef07aab80069b9899000d98d794d2bde9aae666e99cd8c8f85d9c604640c603eaa17911ef86cf726ad
 EBUILD xtables-addons-3.13.ebuild 5488 BLAKE2B 7dcde7bb73efb21136838c9b288f2f64deaa29812e2137ab0ac9503e1fc079b4775edff0ccd268ea2a2a3d32d725e0c16fe0d042ce58b5e5143bb6f01968ccb3 SHA512 d5f315764835c67930f206caf74e7bdaad87522ccf93f08f040f76408bf8e6f78c27b2e008168ae9a7259934000ef828ee6eafad0f9e38e18878cd61d71b39ad
 EBUILD xtables-addons-3.17.ebuild 5496 BLAKE2B 38bfb58430e7a8c9306bd2bdbe5358f635cbab7aaf25c65fc373fe4fb3e7f4615e31b780a884b8a0041ec0bbe58b87d819a01801794086fc68cf0f2c7c789fbb SHA512 e379c55a8e380fe0906e3d57a17b22f2e3af94da1858b15103e7c50eb35825932426963caeae5e5403019319a93655c444b629efbd7fdd03af25eea7ec0f5072
+EBUILD xtables-addons-3.18.ebuild 5496 BLAKE2B 38bfb58430e7a8c9306bd2bdbe5358f635cbab7aaf25c65fc373fe4fb3e7f4615e31b780a884b8a0041ec0bbe58b87d819a01801794086fc68cf0f2c7c789fbb SHA512 e379c55a8e380fe0906e3d57a17b22f2e3af94da1858b15103e7c50eb35825932426963caeae5e5403019319a93655c444b629efbd7fdd03af25eea7ec0f5072
 EBUILD xtables-addons-3.7-r1.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
 EBUILD xtables-addons-3.8-r1.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
 EBUILD xtables-addons-3.9.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
diff --git a/net-firewall/xtables-addons/xtables-addons-3.18.ebuild b/net-firewall/xtables-addons/xtables-addons-3.18.ebuild
new file mode 100644
index 000000000000..b83321c6b4e3
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-3.18.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
+inherit eutils linux-info linux-mod multilib toolchain-funcs
+
+DESCRIPTION="iptables extensions not yet accepted in the main kernel"
+HOMEPAGE="https://inai.de/projects/xtables-addons/"
+SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq proto logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.6.0"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Net-CIDR-Lite
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${3}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+# Die on modules known to fail on certain kernel version.
+XA_known_failure() {
+	local module_name=$1
+	local KV_max=$2
+
+	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
+		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	# This appears to be fixed, at least as of linux-4.2
+	# XA_known_failure "echo" 4
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+
+	eapply_user
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index bac99f5360f7..f35b09e34e64 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/metadata.xml b/net-fs/metadata.xml
index e419bebd83ba..9d926e6b22a0 100644
--- a/net-fs/metadata.xml
+++ b/net-fs/metadata.xml
@@ -31,4 +31,3 @@
 		plików.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 594814f7a0b6..f8ff1d7b2ce2 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,9 +1,5 @@
 DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141
-DIST s3fs-1.83.tar.gz 150816 BLAKE2B 1b567708ea6264a619b664c5be3186374dcd3f50f01ac7d9aa093a82520f4685b7adc49a2d9c5a30e64334439c4c2676ae6cc74079251b4e47fe4ff7ad1f5945 SHA512 a925fb09c5786f2ff7fcb458e3cc37cce0eb2bd431b24e582cf02e7656716bfd9b7ffa3647f6f3c56ccfa313d2238cd263f28c2321850c1de082c48ebd9af5cb
-DIST s3fs-1.85.tar.gz 170209 BLAKE2B 1f879948d243d36c99186a4b6a52cd1200472c7f792583e56cd82e4f00e79374e82ee033152dac2642e626acbf9e0523a45fa41aed0bcd9b1743df418387d610 SHA512 c99920bf1f1dc04a0ff89a71ad027a5b65d22d75a77f5c6dd4559eaa299af36c71d29b4bcf9fe7e473478e7da1d328c7cfcb1fb77d414b65a289f38456ce5d7a
 DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
 EBUILD s3fs-1.80.ebuild 974 BLAKE2B 942fd8691a0e75841bc860a52a9555dcedbd177176f516205fca4e9936a2d31a961f51d0fc04e35d45057a327b8171d7ca757f38e3fd86f39eb7b2546db9a992 SHA512 c8a2454148d00aba788098ac41792c3f157d30dfbece90c20d815153bccebbe5387543900e055053c8f38c5f1627b5577fd333af393ff677f6347ad70253ac55
-EBUILD s3fs-1.83.ebuild 984 BLAKE2B a8d7b72e5ddc921813fed8dcde49fe24a9653ab58e785735bd0e00cbe10531dbdd5348300b0d44e760cb8c1ecdaba7c5d61553994cd47eafd1f36e2aa690cd8c SHA512 ea0b563bc9437d4ccdf44c58d4ba46ed740e234d0dcdc1de0b9caa603efd174bb893a3537f33fcccda5f2eafb54f017eede28492db5d13d20671788beef82821
-EBUILD s3fs-1.85.ebuild 1026 BLAKE2B 74e6710c0cee83a61b5038a8532183abfc76a5df879026f4a69a6474fc0eaf5dca6f6c053f022d61d481ecd27b213fa5d813f93323c0d7d57afb148be153e7fd SHA512 7028aa303c49074e12b8a7705bdf9e6c10a1f8f30e1ab10ebefff8a33433079a3070161475c1bf89d235d366ae05edee9c8169a15b05500f541c126d3273c589
 EBUILD s3fs-1.86.ebuild 1026 BLAKE2B cfcd85d74dfdd1aa138a090c3c4f6aa41bf5beadf1a6a5ad85ebed2ebccab7a92906bb549c3f7c26719ae618b6a260f883478ae5cf2270680ea2a0c75d3c47da SHA512 8a195d893fb8ec335bbb9a7bb25b3e6b5f052ec54e10c5c2bb23c1422ad00603782e3e1e3c36757e2279235267c1eb7a197a1b53655b65be1a1ae8a57a119b10
-MISC metadata.xml 781 BLAKE2B 97bacc52164bcc8f16df993523ae64d3d848b27649e99479b4910c4927a9bcf866dec9373ebc6293d55078b7d704c8182cdcc5d0c25dfbd9912adc8ec82daaad SHA512 c85a9298324825ece93ccb670708647d53234430aba6722af4e5eb8485d30a1c007a7d652c8cd455587204bff439cd455ad90a106eb46cf0645d16020a883e5d
+MISC metadata.xml 811 BLAKE2B 8549eecc95f92bc830e57f269b24aee60dff8c37f5ac84d79f01240a797ccae4c4edc8afb558ed15f491066bb8742e9f3efa7cfb7644a684a00c7e09d1a907f1 SHA512 399fe84e728980f233f9f6080e4092ea4319c5a9386a34edd09f0530f6f9dbcb06baa5043ec79714d7a1493b22259dc0f41ced76440cddacbf72f73ee0ca99fa
diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index ea9d9e2e2caf..07d6f4894ded 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rini17@gmail.com</email>
 		<name>Juraj Variny</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-fs/s3fs/s3fs-1.83.ebuild b/net-fs/s3fs/s3fs-1.83.ebuild
deleted file mode 100644
index 434d6f6bf7a7..000000000000
--- a/net-fs/s3fs/s3fs-1.83.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PN=${PN}-fuse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Amazon S3 mounting via fuse"
-HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openssl nss gnutls nettle"
-REQUIRED_USE="
-	^^ ( openssl nss gnutls )
-	nettle? ( gnutls )"
-
-CDEPEND="
-	>=dev-libs/libxml2-2.6:2
-	openssl? ( dev-libs/openssl:0= )
-	nss? ( dev-libs/nss )
-	gnutls? ( net-libs/gnutls:= )
-	nettle? ( dev-libs/nettle:= )
-	>=net-misc/curl-7.0
-	>=sys-fs/fuse-2.8.4:0"
-
-RDEPEND="
-	${CDEPEND}
-	app-misc/mime-types"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nss) \
-		$(use_with nettle) \
-		$(use_with gnutls) \
-		$(use_with openssl)
-}
diff --git a/net-fs/s3fs/s3fs-1.85.ebuild b/net-fs/s3fs/s3fs-1.85.ebuild
deleted file mode 100644
index f372318bb91b..000000000000
--- a/net-fs/s3fs/s3fs-1.85.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PN=${PN}-fuse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Amazon S3 mounting via fuse"
-HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls nettle nss +openssl test"
-REQUIRED_USE="
-	^^ ( gnutls nss openssl )
-	nettle? ( gnutls )"
-
-# Requires active internet connection
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libxml2:2
-	net-misc/curl
-	sys-fs/fuse:0
-	gnutls? ( net-libs/gnutls:= )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	openssl? ( dev-libs/openssl:0= )
-"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with gnutls)
-		$(use_with nettle)
-		$(use_with nss)
-		$(use_with openssl)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9f48c50355a2..2263a5bec794 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -17,5 +17,5 @@ EBUILD samba-4.12.12.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb
 EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 7f5c318b381a854525bc7f92b781d4832b701c04334b0890fcde2230cf0a639e1b7e5956c247fb27856c3d65b3ec94a884bdd1b6621f83a550344b231ed265d4 SHA512 ad740fd5e49ebc3ee7ec48d70c559e3c82d54fecc944566322ce45bdf257450b76bc8d691748ad3d2e2a80820a4f3e4da2abcc35ca78279769d2ebb35ea58cc9
 EBUILD samba-4.13.4.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
 EBUILD samba-4.13.5.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
-EBUILD samba-4.14.0.ebuild 9819 BLAKE2B 924b52ca1f1b1c0f04f08e32e547eb52df3d8442399dcf8189ce66b6905067946bc9e74bedf2af0df23e60dbaca41cee88bb86919d8695365e5baa026aee13a4 SHA512 a266f58e19c1df342b90a3f9889fa21621fae4a5fc05078608e98347695cf09edcad09134cbcbeb1df474eb43c0b47465d90841371208e7c48df507a68800454
+EBUILD samba-4.14.0.ebuild 9932 BLAKE2B 535396c759eeed6e3ad994d9dbc738ce14cc64ebd3ea3d73f2de12c81358b6f12ade18cafbc9c4203c77f9875ddb3e3d415bc11899da98f34e58a3b1168fe1dd SHA512 3288b583cbf0227f70c214091a86e9e52c861834fce398d39c499884b5a3db3d3e65df4d67c6b846cb576c9a0130944e7c588a7d1776a006b2d0f91d207d0047
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.14.0.ebuild b/net-fs/samba/samba-4.14.0.ebuild
index 0fa1731cdd3b..7744a90df298 100644
--- a/net-fs/samba/samba-4.14.0.ebuild
+++ b/net-fs/samba/samba-4.14.0.ebuild
@@ -82,6 +82,10 @@ COMMON_DEPEND="
 	acl? ( virtual/acl )
 	$(python_gen_cond_dep "
 		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
 		addns? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			net-dns/bind-tools[gssapi]
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 7060774e2a9a..ceff70279d24 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 6b064f9ec1e3..9b0bde18ea61 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -10,4 +10,4 @@ DIST atftp-0.7.4.tar.gz 249699 BLAKE2B 8aa30df1cc92982b0e718cd9bcc68cf397e29f6ab
 EBUILD atftp-0.7.2-r2.ebuild 1494 BLAKE2B 1b360f602465ee0dea30a42151ec36cb3d0b918d80dad948b25ee2851f994586cbaecdc893e75d4d782a785ae1769188944581aa84b2e4087f2550b4186caee8 SHA512 4f11fd15e3b4504a973b07c70383f1e9edfd16e5a42b824eda20e63fc6bf87c96439a91c1cf68fbfcc8a914dfbb0a9bc52992b3b30e1fd1a0ccf620d89297553
 EBUILD atftp-0.7.2-r3.ebuild 1532 BLAKE2B 2fde64746a10e04536b39f70f745ca4e8d8a8c4be0ba38365be588c3ec7e247c7e08df5caf0875a3b02a93915bfc32b91943590de8d39e494972e90c760eede5 SHA512 1f65881c2b27ab97f05cdd4dab33ae41f4869b54ec661269568beea6df376076145cfecbdede0e0103f6534aa9f1c829812e84b9c13bf5f8e1f7d4d5f03d25b7
 EBUILD atftp-0.7.4.ebuild 1452 BLAKE2B 38eb6f305fbdf1b4c668c33852fe81a25e57bb9149c03edd953569b5ba064ebb85805c08b8b025de3d5ad8795ddcb53fc82e7457bf4f4818aecd0ea79f044f3b SHA512 a2dfb54ad97a0c36954d207372e01c973aa62246e39a39e0da9020e29663f618bb6ea46ce7a3786699cf150ea42c29f116d3b5a7ae69ff0b261dac0ea89bd1d7
-MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb
+MISC metadata.xml 448 BLAKE2B 402322d0c162daf12b319730a1a48c5000d823851140ee31a577927cf2b5e6ea3a2d25c71a7cf9b71f7bcb569685154658c544b3f35a12a148dcc8a57e348609 SHA512 2d70e060eb79a7b0c0b6683472d158fd1f87397345707ac961d87dc202ab4029de9067454e62d29654bc0df207bd542c894fc62f0f296daf6db7963be32d2165
diff --git a/net-ftp/atftp/metadata.xml b/net-ftp/atftp/metadata.xml
index 13613cc65e2b..89ed85744829 100644
--- a/net-ftp/atftp/metadata.xml
+++ b/net-ftp/atftp/metadata.xml
@@ -4,10 +4,10 @@
 	<maintainer type="person">
 		<email>klausman@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 69677b556adf..a3feda2757ee 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -5,7 +5,9 @@ AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710
 DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
 DIST FileZilla_3.52.0.5_src.tar.bz2 4811653 BLAKE2B a80d0784e5c85b74cadb944af232bb42fd0170ca31034e51804b56dc06ca2bbc4580a5ed1564bf82436be50be62d86f2017ebf3496ecc00af24837c0da99bbcc SHA512 c0a3f20ad9351ae0bb15e7e488801cdaefc83d5eb1355fcb664150ea588b9fb8c4b446e4b1df5d8b35fb88111a37527037e4dc70ba783d5161b1d91c8dc3bee0
 DIST FileZilla_3.52.2_src.tar.bz2 4813167 BLAKE2B af651f4db74e805c866d040aa932c39e1a488bf37b0c215a2cdeae3fd4ab608f84b1b12dfbe8bf197e778760ca26183a3532a370e7a0095c1a250eefdc14717c SHA512 74abb78eaece5ffed044a88bdbbff7be0470e47868b806925ea5666d741370dff910d55849f6ad91fb57f8c1a33c461dc10c9f093d75e7a96ff0d909f3a8f131
+DIST FileZilla_3.53.0_src.tar.bz2 4842563 BLAKE2B e9704e5b0c7afee28c3d3efb9b0f72111e9fc4f2d8d69a935d195a09b685f39b80019de77216b5da4353c65837b5b0d8102b3e9e88cad840f3716372232f8bd3 SHA512 b658a0e67d0f92051e5f5503da64f8bc0b1dd6d9af4b54b34d32c9a6c83abe0709b310d940a8f6676f20a49537baca48df805a88c1fa29d7e7b262f59544deff
 EBUILD filezilla-3.51.0.ebuild 1957 BLAKE2B 2e3089f2a70a43ef4dafc954204a2c770fbf0969f1510d1f10d11c1d133314699431a439d83bf8a124fd0df001dcbfe9da1cb794219545269e855599420a0e97 SHA512 c0892524296e0449e20148bd3723a603fe78b7dd2c96cf4dc0bc040c661cfe36483ca94a251af9ac761d31534d994be0a88a9c45785f87665e62a0c887a348ca
 EBUILD filezilla-3.52.0.5.ebuild 1961 BLAKE2B fac20a3303d173d9590befc1d8ad7984a9f64600655efaa84ccdb722309d6db055b332e378721709082da21e8ce95cd7fb7b70737b781c0dc758e366833ab9a3 SHA512 fbe14ca5bae08360767874bd4ef5355add7252d1f5141ed88fdcd174cff880bc7466377d459350efeb28259073aaec54d328a7dfae2f02067b8e1ab7d9e308d3
 EBUILD filezilla-3.52.2.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
+EBUILD filezilla-3.53.0.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.53.0.ebuild b/net-ftp/filezilla/filezilla-3.53.0.ebuild
new file mode 100644
index 000000000000..c8f67f39ebeb
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.53.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.26.0:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index acce18eaad94..ee6a1973e219 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -5,4 +5,4 @@ AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
 EBUILD frox-0.7.18-r6.ebuild 2013 BLAKE2B 9c2fe42c27b654496c210c602f92f60aac7365d52cc3315dd77c81fda5774266765db2c4c1f8fcdb3b9d24cfd7e5082a7e9c35a6966d6ff1fd8d84c916ccfe17 SHA512 b169215a9a56ce571ecea073d9d35e7c47c46975ba11a2e490e0206d67f3e8c178616d74477f30446b9de746885474673333b6afa7895f141b9d9b5ec1dc3071
-MISC metadata.xml 593 BLAKE2B 65aeb3bac2df8a84512c91c24632a9d4b744344c95afe91c1631d442bcef11d19f922eb61ad85052ec14e9908bbbbe43f57a20a89a4fa39e3b8591734fc09bd6 SHA512 eb6aa83ad2cafe20d5348ff946f4f8d9c8b24dea6c0cd43de4ca9cfb27cd134e595874f09576a156b0936add5dab9b3924bbee40605095da899f28ced299943f
+MISC metadata.xml 623 BLAKE2B fe1b6aaccdc85accf5b392e79b85e18233eee2e86c6f2c60284ca95805f107408ac9adc1e56900390b75583c86bccd322deb6cdd0bab773e35c896b4d3e04511 SHA512 62a239cfde0893981edef12942251ea54fd4260254e32b726ff9b424f57b37795cd3b188005f1bc1b4fa42c99c89c5eaa63b0239d34b32dd7270ea336f34e8b1
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 748515899f6e..b005939a27a5 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>kabel@blackhole.sk</email>
         <name>Marek Behun</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/net-ftp/metadata.xml b/net-ftp/metadata.xml
index 48d42818c2c6..a8af3fe530df 100644
--- a/net-ftp/metadata.xml
+++ b/net-ftp/metadata.xml
@@ -35,4 +35,3 @@
 		Kategoria net-ftp zawiera pakiety związane z FTP (File Transfer Protocol).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index a465396fb869..4d19800c49eb 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,3 @@
 DIST uftpd-2.13.tar.xz 101128 BLAKE2B 2a948b993ed827b0bb53433c6dd9b49a7ddeb4d0b0a8e1e0061d417c9082094ab17e6116244af625de5ee2cbec4570eaa15ab0a68db95a959b471caade2b7aa2 SHA512 91152129ce1deb4db8e929aa75ffa88d69fe2d0ee1fd90242d1ecf02ee31a64bd3389d7d6699f9dab957d86389db87ecd9bc16dd37d0f8d0684007b43aa8a05c
 EBUILD uftpd-2.13.ebuild 682 BLAKE2B 258f20398d63700df6c5dc1d25bd41df4de752f0252414a79707ae59c5dcb4ea48b7d51e437b5de62649e8212964a9717677e182cfd1a27a5fbfde22bd8f4da5 SHA512 1ab3852309f42125a7187982ea90398582db2ef6f9381f8e82cd313b2c4f65657ce6648ba21f54608742ade2dc4f92e645c4d8dd375256d0ac03781099ea217f
-MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
+MISC metadata.xml 949 BLAKE2B 464f94835a57abcfcfb5c0d496bff388fd2f2ff609aa5263f65aeaf7a4816158f37a579bf9a56b88d777a29108df885f5af356a5897b42c4845a3ef40fb93902 SHA512 7715ad19c5e4dc371f24dba1845a11bbcc5a3c36b911f731238490346145de9304bda09b907380ee7d0b8fe2d36e55ad17319aca8a327efacc4f4351b3eacd9a
diff --git a/net-ftp/uftpd/metadata.xml b/net-ftp/uftpd/metadata.xml
index 80ff0c53f055..3bc03a8f5ad0 100644
--- a/net-ftp/uftpd/metadata.xml
+++ b/net-ftp/uftpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 <name>Oz Tiram</name>
 <email>oz.tiram@gmail.com</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
  <email>proxy-maint@gentoo.org</email>
  <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 605d31e113e4..b7572b9a95ff 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 6e301d82c07d..ca4598eae9e7 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -3,4 +3,4 @@ DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f
 EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
 EBUILD bitlbee-facebook-1.2.2.ebuild 753 BLAKE2B e667e05da0c55343ad13a1148121038154d30e549f9f58bf1b3207649ec83293fda89d7661c3a9e21c9adcfd6c601a193fe09b3c7239b409bff28f40b31d244b SHA512 781e7cadaee1b83b8b1da3812d512fcc4ee074d8757e023741ec458e8759c772e60523fdf1c0c3c67e19307a3263cb35168b1a2dc7c76577aff802c550530b28
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
-MISC metadata.xml 635 BLAKE2B 81b252965440d5101d24114b1e971510c7f0322ef53d8a6ce65f79864eedcf8211e378eb224dbc5a83903c7ce263faf96787cc7e9340cd8d1bb8fa788564b72b SHA512 45a602ed7b8cc33f7e1165f2d22baed143cf38de06fc3f1064b847e47aff991a1102eda241f8350b4d95f355d41227d1335083f0433ec7c68c47337fe273c354
+MISC metadata.xml 665 BLAKE2B 611317a544ce455d13575f66f00c8aefb8b90ca520d24cb3e817ac70b538b5a8ce8463bc9ca1776385bf210adc911c62fc9b06fde33b13c8605f51824367152c SHA512 bd6161cf34216635c2a5e54bae4f5c300bb3144fc3ffa6acd7cf526143cb80d1ec5750ca8507da02433766c69d87c1096bc5ae8e0bdb0337bfe1d0d757436f55
diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml
index 539082abbbed..e6d3bd37d2d6 100644
--- a/net-im/bitlbee-facebook/metadata.xml
+++ b/net-im/bitlbee-facebook/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index e4b6def47ff1..d301436b6777 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -6,4 +6,4 @@ AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
 EBUILD bitlbee-3.6-r1.ebuild 3334 BLAKE2B f29988858ec20193af2e655bc146994b77463c25037a02333a630783172294ad89205e3da1ce63656df68b6d23088a5c9c093e63cbf7f09508f845918a48ce28 SHA512 f97890d678ce0faeb4de6cd0792623d19dd71622a192a494118f1fc8c1c32fca0309b00b04b3975eb9279303dc8d24db544874c98f900baa9c5ec09c800ea28b
 EBUILD bitlbee-9999.ebuild 3257 BLAKE2B eff77e4d952fdbcd7eba35c3aa9c8806923fa4a411a58359631a1e4fbc712b29c710e82a5dcf514946b3a828522754aa07c4f7b9f5a5ac780deacff55f5b73b9 SHA512 2568acd9220d6612198ed404e063348b37d370e4e1dceff23ae19daf03550b83f6d33fe664caa5093b2ec1e1b8aa668f5f83c97931484c6f2ae83e5600f86d25
-MISC metadata.xml 1138 BLAKE2B ec881562587832981f817dc9601f094e987ee3e1a5d92f310f4bac1fbdac70b434e8c5d06b59be149e5c955e4027865c6bf72de1903b584d638440f51c7cca0c SHA512 01da5fed1649b6d59837e8dd89ee65c1f9bc3763303a66c0959f0b5d14941f38fc1dcfb3bf22d5041d7a4d99f2e9b8a38983154f3f5d7e0c7a7308ad8a3a3f95
+MISC metadata.xml 1168 BLAKE2B ad0a883cef4404c3a6ddec5951a009330b02396072691968834d3de0d2fdb1aa05ccaa3e819c2c9d3b89cbd0266782902f5fbc8c2fa97a49049b49d8e6f8913e SHA512 0093ff572bae101bcb8cf375f5b95609d0550f77150ec98cbc4a5d62f0006c6439647c528c45309351083b886d4bd95a556957c6ddaf4b2a0a34fa7f87cfa9ea
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index 6ecb78d56885..f217f56395fb 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
index b75878b11a6f..0e88ff7052fe 100644
--- a/net-im/gitter-bin/Manifest
+++ b/net-im/gitter-bin/Manifest
@@ -4,4 +4,4 @@ DIST gitter_5.0.1_amd64.deb 136453344 BLAKE2B 6e057fb04872f89961a8970d079b14fbaf
 DIST gitter_5.0.1_i386.deb 141585750 BLAKE2B 464e3416085717702df605fefade3a5aabafbdbfa9274eb9da03832b9a5e442d0a92eacd5c4d757e64709b3ba39bfdc5a87d689bb24db1ede3aca43b187550ce SHA512 b340b161728530e6c397ad6d5fbd591393a893c73b29056094514514d3e0f3a30ebdab94bb19f6c78cf1c73a30c6cd145476e34db5eaea06ba061f8a410579f7
 EBUILD gitter-bin-4.1.0-r1.ebuild 2981 BLAKE2B 23fe433dfe977f02e6c8045242fb222e3506a6ad88616370bf6ec04de7488c5ee0ad8ab6f200d0ef2fa983656787fce2743313b0e50808b457a30f4c4e936120 SHA512 5689cf43a4486f5cc174e31116790b8249fe46629646bc1cebbcd41035b7ed45cbbb7356c6747dcb529fe328d408011abce63e831161c6bc21c9fb112162d663
 EBUILD gitter-bin-5.0.1.ebuild 3149 BLAKE2B 8627a0810af923aa7247461ccec0487104dbff37a83d872a42d7c28953d8c1320fb2a9fc9fe7ced56bac856bd5241ea17b6c85451de16884c042a3e5148e7b39 SHA512 938cf82609ef0bac5b9d54f42073ecda56b530efbb2cd28334872421d704f66ab90c15f55f7c520b8541b0325c9b89c28e85277af39a62be14a0aa4d6b6bdccf
-MISC metadata.xml 626 BLAKE2B b50b6161a9e83a6ada4548c23a898b069ffc09c8818e9abb4040e6df0cb436e586074a9225b1160df55b8358dd9b28422e2c774ab3ddc3dc7fae2ce930a3a4e8 SHA512 5cf4563c5dc36d509ae10a1824bebbd1f559bb57ff642e0f11f55676c894e2fae49060f7e4c1fb5fec9c1bed4814eacb1ecab2bca31eca5de72cb670840e08eb
+MISC metadata.xml 656 BLAKE2B 0282fa85ea95957e36c26db9446e0faf00263521f4b15e5762e395ccbe540a386a8faf5d7ec48d315e7a944273ff92a9cb2c7907007fde01390b9b93ce8c1347 SHA512 643c193c41276d5076c01f4c88706b6461e81f00a42361f3f7d68e0971c7e4444b6325a9f82069c4158e16b5f3e67b1977fafd3716bcebde9d33049460ce3aad
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
index 2aa6d30c64dc..f70ca4806d5e 100644
--- a/net-im/gitter-bin/metadata.xml
+++ b/net-im/gitter-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 2e73ea0792ab..ab3f9c3000e5 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,13 +1,4 @@
-DIST mattermost-desktop-4.5.1-linux-ia32.tar.gz 104826424 BLAKE2B c2d29b5ba463d7e6c586c725dc3628ff6a2f04edf033632d35a753d00416ff2d4337e6847e7280b2e74e600697d59a0b177e62b215a359757f7ddf256d41bcae SHA512 9358d8979b022207e5679b3b65a853a5c1d3a1f822c9dbb856253e19bcef29efacc75ab00a713b987e5d91265fab15cc5721413f828c98e4ef2e035c48f655bf
-DIST mattermost-desktop-4.5.1-linux-x64.tar.gz 103238742 BLAKE2B dc7e9e2358cb9d82a080fca3082abff38a7850b5cb66cd47d8c111963e2980445f6767ee1f1cdcfedb8b8ff399bf20467de898ff7cc1e7b415e9d999d835e362 SHA512 7b1504c957ee30b2f3faa091556c30ac2e5a8cfd7595282e51bc616a74b2da76a6b363ebc56809c6bfdb931d08ae75360ef85bf6a6abe00c40ccccc14754e0bd
-DIST mattermost-desktop-4.5.2-linux-ia32.tar.gz 104826222 BLAKE2B f0552069099e548b4eff29a8dee8b830ebdba7aeab708748a242776a5d758be2253e8e2bbfe8f0b4eda5d0c25cad46fa7e7728233007f76102ef7b271a0280a5 SHA512 21943587b00585ab103213726de16bd010a013be2d780a9b1bad1ffb2bbcc23bff0cab76699bebb324e950b7d321df1d657cdbb8f889d670bfb7d8ca961ee652
-DIST mattermost-desktop-4.5.2-linux-x64.tar.gz 103238897 BLAKE2B 46e56c55409db645ba0962a816f584610decea4696c182e66544d2085d5b420019aed7d2680c5a90b7bdd293f9549be81508d24f79d409446918f862bfeca474 SHA512 f22938b629840dd6e8fbdec5e6ae6fdadaa0eae0fb727a063ef1539a3a0a625d61dd8468ea8cf45732a8f3b2c6da002dceed2b287aa75b14d09a03268f967eb4
-DIST mattermost-desktop-4.6.1-linux-ia32.tar.gz 116278144 BLAKE2B 737089a5454c8d8bc87cfefc68d4fbe5036287f2b8c4e92d8cdc000b481996641cc22c7aec1915bac0bd21f0fc2c2019e0e6d011070879cda25f566716f0c193 SHA512 8a2b7369fedf4cfb28bb5e54b2fa61bdc22ceda4ae01753a4259581856ba71459d4c2bea238d2e9aba8fe1c11bddfe6e45f1e470e99e7ca642058605c5589453
-DIST mattermost-desktop-4.6.1-linux-x64.tar.gz 114688536 BLAKE2B 68be76641eeb0e073388ce6cbd6987903ff0a4a0e266ac1e27fa977dff7e1354ac226d1f19b43b4f07d0d731ea92ded2585b2744f68263ff57751f059703a0c2 SHA512 ed24ad4e33c88ae55440e8aa5f57e4e83f022b22ccb488146507707a79cf403895066be6b43dcaeb34217ddf0df4e1d02c3a8128bf8568d7b4be94a4e51bdd06
-DIST mattermost-desktop-bin-4.5.1.tar.gz 1653861 BLAKE2B 2ad02df830cd2b62a730e8c6b385a739cfa7be30765ee4245f92e7a3db194ea03863490b337d03d47357f0d18ec31dd34fcde4576b93c80702e716ae9fd772a7 SHA512 6e2269de681ec416be2354ff8ee37d219ede4b10361e6a3669cc4e93e9ab06cd6a198dece05411756fdea271e55cafb94ad29161801cc55b5dae02b99b24ccab
-DIST mattermost-desktop-bin-4.5.2.tar.gz 1653801 BLAKE2B fac573ce27cd693489a173d3b90480476e569a7d0c435a53e44b075fc96a56720558e1e555c5a587f0fb7bed06b7f5e53c11728280804e812ee2090adc6d96d3 SHA512 69148aa9de18f6dac78450dc0b79630e9ea1552027ed46f6d03aca02ae57342b251a236f4c3ed6b9145e050be38d7748820bc4dd9f36f300c59940b7c2db7827
-DIST mattermost-desktop-bin-4.6.1.tar.gz 1702070 BLAKE2B 1c8f0c21add6563f6cca51bea37c25f41ba2e00daed7101b3d937941b12cef2e34cfb958a2c83c9641e08b99dd99d4784196e71cdc98227a66d6f2a31ee35219 SHA512 ee16e27cd836a49c8329397ee70d0d61e72c1295dcc2329e235cd813ac2583394d24e7d0d40c8c6d47dc85c5c900a22d3b96bd3b4f0262224443e5232d2b2102
-EBUILD mattermost-desktop-bin-4.5.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
-EBUILD mattermost-desktop-bin-4.5.2.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
-EBUILD mattermost-desktop-bin-4.6.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
-MISC metadata.xml 250 BLAKE2B 8611f4d73e35bd0d1118f324a7f3e5a50277fe6e0eafa82c39438dc4ae44bc64dc85a28e85286987c724d4cfa528063109cb78984eaf10f08bcc60962750a9ba SHA512 b24a6971fcb3eb7c99a0229fcf084abb689b21b48f29d3634aac103977460011b0a58fc298d1432671520e94a94ef19570f7831fd181b5ea51a0155d47222d0b
+DIST mattermost-desktop-4.6.2-linux-ia32.tar.gz 116280086 BLAKE2B f0770b12abf23c43ae1a71b068045abcbbc44d7cd40de3ef84e4cde7e22210c911cd8401a8ad330bd5ea19f664087d423fadd43834a351e48b479693686e9ba8 SHA512 409966b02256f5250da976ca825d75ea5690f667bfafb30cfae7e16cf96aa39f8a2fc797768bc1b8b9bfc0e511dfabd85a9033161830077d0a424deac22bb362
+DIST mattermost-desktop-4.6.2-linux-x64.tar.gz 114689112 BLAKE2B 9efc54fc424dc1be2544b6f1901387ef4ee2ad976dfa1a2c0fa18c4410f16393a471e9549dc0c36219eedefde2d246d9c6a054f8a7c38bde68f700bd5574116b SHA512 19e1f3a273ae5ab202bbd380f68f3acbc3b42748ad978897bac05be8ba264026fe3466ddfa73b711bc3b1bd331661a49fcd6f800ca23e11a463e5b97ee9f35eb
+EBUILD mattermost-desktop-bin-4.6.2.ebuild 1546 BLAKE2B b6ea0855a44175147beb7c4f1b37b52301cd086df1644b4883e91fbf2a2b4738d1b48e02aa15ae1de52a92533bb90a47086cd7b3512f28b96ee6b665d364a41c SHA512 71c8fd446631197bafc34f38e7dc49f99d6d75118a96e4e6c989941b1c491cb7f0238336cb1ecebfd3401e0fb445bbca75b785e7bd15baf76bc163d7f185a6d7
+MISC metadata.xml 485 BLAKE2B 35760e18fc4421046f98f05a9a959a76fdf880ae88bc27617c0a969bd9c10352f803ea17b9e81851e4886801662273bdd70b8bbe61981bdbcd84c964107a3781 SHA512 ccc78798b891f43ff9e0b9cd050706417f9f6771b20847b4d08ac36ddf8441fc30f1200780d5a62d978c25b181373d0e7d26e29ec158f2d58cb4b1218981eba0
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.ebuild
deleted file mode 100644
index 0f1c0d6f81df..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.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
-
-MY_PN="${PN%-*}"
-
-inherit desktop eutils
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	gnome-base/gconf:2
-	dev-libs/atk:0
-	dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-print/cups:0
-	sys-apps/dbus:0
-	sys-devel/gcc
-	sys-libs/glibc:2.2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	x11-libs/libxcb:0/1.12
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-DOCS=(
-	NOTICE.txt
-	LICENSES.chromium.html
-	LICENSE.txt
-	LICENSE.electron.txt
-	README.md
-)
-
-src_unpack() {
-	unpack ${A}
-	use amd64 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" "${S}"
-	use x86 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" "${S}"
-}
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-	exeinto "/opt/${MY_PN}"
-	doexe *.so "${MY_PN}"
-
-	dosym "../..//opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.svg" "${MY_PN}.svg"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-
-	einstalldocs
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.ebuild
deleted file mode 100644
index 0f1c0d6f81df..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.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
-
-MY_PN="${PN%-*}"
-
-inherit desktop eutils
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	gnome-base/gconf:2
-	dev-libs/atk:0
-	dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-print/cups:0
-	sys-apps/dbus:0
-	sys-devel/gcc
-	sys-libs/glibc:2.2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	x11-libs/libxcb:0/1.12
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-DOCS=(
-	NOTICE.txt
-	LICENSES.chromium.html
-	LICENSE.txt
-	LICENSE.electron.txt
-	README.md
-)
-
-src_unpack() {
-	unpack ${A}
-	use amd64 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" "${S}"
-	use x86 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" "${S}"
-}
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-	exeinto "/opt/${MY_PN}"
-	doexe *.so "${MY_PN}"
-
-	dosym "../..//opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.svg" "${MY_PN}.svg"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-
-	einstalldocs
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
deleted file mode 100644
index 0f1c0d6f81df..000000000000
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.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
-
-MY_PN="${PN%-*}"
-
-inherit desktop eutils
-
-DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
-
-SRC_URI="
-	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
-	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
-"
-
-LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	gnome-base/gconf:2
-	dev-libs/atk:0
-	dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-print/cups:0
-	sys-apps/dbus:0
-	sys-devel/gcc
-	sys-libs/glibc:2.2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	x11-libs/libxcb:0/1.12
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="
-	opt/mattermost-desktop/mattermost-desktop
-	opt/mattermost-desktop/libnode.so
-	opt/mattermost-desktop/libffmpeg.so
-"
-
-DOCS=(
-	NOTICE.txt
-	LICENSES.chromium.html
-	LICENSE.txt
-	LICENSE.electron.txt
-	README.md
-)
-
-src_unpack() {
-	unpack ${A}
-	use amd64 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" "${S}"
-	use x86 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" "${S}"
-}
-
-src_install() {
-	insinto "/opt/${MY_PN}/locales"
-	doins locales/*.pak
-
-	insinto "/opt/${MY_PN}/resources"
-	doins resources/*.asar
-
-	insinto "/opt/${MY_PN}"
-	doins *.pak *.bin *.dat
-	exeinto "/opt/${MY_PN}"
-	doexe *.so "${MY_PN}"
-
-	dosym "../..//opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-
-	newicon "${S}/icon.svg" "${MY_PN}.svg"
-	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
-
-	einstalldocs
-}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild
new file mode 100644
index 000000000000..c56080aefd20
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2[X]
+	dev-libs/expat
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/gtk+:3[X]
+	x11-libs/libXScrnSaver
+"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+	opt/mattermost-desktop/libGLESv2.so
+	opt/mattermost-desktop/libEGL.so
+"
+
+DOCS=(
+	NOTICE.txt
+	README.md
+)
+
+S="${WORKDIR}"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+	elif use x86; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+	fi
+
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "./icon.svg" "${MY_PN}.svg"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/metadata.xml b/net-im/mattermost-desktop-bin/metadata.xml
index f8151855e277..413869a3fa99 100644
--- a/net-im/mattermost-desktop-bin/metadata.xml
+++ b/net-im/mattermost-desktop-bin/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mattermost/desktop</remote-id>
 	</upstream>
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 360da091cb60..a4c1415031c6 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c39
 DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106
 EBUILD mcabber-1.1.2.ebuild 2328 BLAKE2B ac140a7e0aeec7782fd551fb879b06c56ac74d18aa6e29904b4bfcc61f7fe6592bb564a61170ec900d57e051b7e3189296f866186e6e3e80bff864b28ef49b27 SHA512 0f312dfa7996e7f59c5bb2e8e8fdccf2c60217de74237c82192bba58cc333b87b92cdfff421efd8c71d286d0793db32ea427ea25fe0991fe6c9d975babb9d6ae
 EBUILD mcabber-9999.ebuild 2330 BLAKE2B cc46066f8e037e5b34591ab09892db38b5857c2788d58c95be2f39fecf0816f002e0d16fc8900243ede12cb8fa05ccc3a285c1fd1203016ef27c903ae48a029f SHA512 091256c469fc17d782713a96177b7cb4480e5b7b1591c27161afe7ed931a3f5a6446f3bda6033202b907637e22dd4619af0a776c7b278b005ad23454cc94855c
-MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
+MISC metadata.xml 688 BLAKE2B 2aa557cd550a026a4ac963e1bb9210144d2492084b09226f3ae9c56940f8076f5f759faf0cb68157cff32a5c1e7b6a9269f20798ccefc1654e845952e06145d8 SHA512 fee111366c954853bc6bd37212ee04808cced6e32348486f9599a25f4dfc7026613ead283114fc36624cf820c98f9aea428b699a36baf1a151473bf6fd9ff518
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index 30df6e581bc7..d217e5f63a4e 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/metadata.xml
@@ -18,4 +18,3 @@
 		</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/net-im/metadata.xml b/net-im/metadata.xml
index ccdebcb75afb..150e1b5637dc 100644
--- a/net-im/metadata.xml
+++ b/net-im/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria net-im zawiera komunikatory internetowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 099479e7b310..a5b981771419 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -2,4 +2,4 @@ DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f476522
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
 EBUILD psi-1.5.ebuild 2946 BLAKE2B eaba933f26ff8216eed3c04245ed446b3c277e211ecd35e4fd4bc8726ac0c1eabeded074ad51a786fdb594ced70b39d48f969351e3674989cb66c2151b4775d1 SHA512 7d27fb44e3332f4ea1a6a92f3ae2202b12aadc83f25b7dfe1892c4deaccfa79112b472f53b7ab857e328ec4a295aa18e524f6259f6db2e6214ac09597fa2ed8b
 EBUILD psi-9999.ebuild 4039 BLAKE2B f8d7f76e5459644ec3992f6b9bb26d6fbec8b00b4535393eac87ec3a07f0ec58e2bce342340dd3864ffa1f93bfcd8c9520f7fbcf98ea3bf0b74b5856bb195773 SHA512 27d3611f303698947bab443f1f413954e98a5d14643f2710e0153c4b689875e04b80ecf6da54ba607ac962427a3a52e963179504b4d8707828102dbc69ab8762
-MISC metadata.xml 1493 BLAKE2B 2b7be89dd49725208783dbfdbea4311212d1c9c2cc336fd204b2e3573b7bfb3aefc7dc8a459ed39b2adf09fafef12cfa36e637efa66587d2642190add9c1627a SHA512 467e544a68b3044636db1f45ff159167252ac6a3d4ceb83c520caa09d61ef430141f2719773e9c7021a36e57c8871412d6585b9c1d0834a57f576c774819f597
+MISC metadata.xml 1523 BLAKE2B f5945116748a727637a069f648f227708ac93107e44e1c831feab727efa6d39bdacc990b23146a00c33863cfa2ebd9712d1c7aee48dd449e9360cd1f645c908c SHA512 643b8bcb161111f8617b49ed49ec23be76374861f06ad87ec57e5a51c20556fb2a112ed7ce1a66d5b6640193eaccf4fe2a36e9ff09cd4dea66aa739b65d461ba
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 41be813c050b..8dc1aaf84a2b 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
index f1c6d8efb3c6..9502d4ac07ca 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,2 +1,2 @@
 EBUILD psimedia-9999.ebuild 795 BLAKE2B ebcf7bfcdfd2a96c10aa5d7f47885902a5a5e239050c8db05049d11d96c84712e1662d571c921b695e285de97dd5f8966d986c2a7e8bbfc04068cc11e076ae2a SHA512 ceb439f43d8754eee42d04060353d34fab846ea97d42fe586a474339c99fe56765e16a20659a4370f06a78ec18edbcd4740a2eb53980894e7ec0b235882a3095
-MISC metadata.xml 536 BLAKE2B 8cb63086e33799f89c336aa6ec57e8967f18dbaa23151d363baf6a632506bf03aa9aa2c926c83404bb0e1c7e197e687f446da63fa9f26d8ad58b7906dcdedb25 SHA512 5132d0d082aa3576591320423f79beddd7a97e95a3cb29fd3c0bedcfe91294327ee3210c5ec20f21c7213190ec31aca76c32b4bb27d7cf088b775427292eda84
+MISC metadata.xml 566 BLAKE2B 66be1f92c5883ba439c593a58838aa91faf1e458c572261af668cf53eb60f3328aedadc45eafdc2d06df056ec99ec6bb87975aa2325d8e2552f296b6395a0879 SHA512 b85a2764bc81a34d1b1cfe0ab4bd894867988c4998feeb30efa1c478d3cab92b36f6111eb2c0d0c9b4a644f0cd1e7b5e26e9b9cfef47ed6a74f5d3f3db2ebdac
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index 1cbe5d29cb70..79aac7809427 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
index 51a2abac8983..0cefa0115574 100644
--- a/net-im/ricochet/Manifest
+++ b/net-im/ricochet/Manifest
@@ -1,4 +1,4 @@
 DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
 EBUILD ricochet-1.1.4.ebuild 1189 BLAKE2B 3fb8f5b0ebc1f430685ddcbebc45fb147aebe5a6d700c7235081c1751ce3d7c1bee9ed470b12ea841b816e9ebf880003db4d6c7a6ede2e045996bf49e445ba69 SHA512 3f29132f06e5bf9585edf41b8223530fb924719c4329c1ac7978cfe69c759e65ebda4e98d3d198e5d0f8a0bf490aad650ad7708bf9133fa59d9dec53be80443f
 EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553
-MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
+MISC metadata.xml 394 BLAKE2B 6f163c48ab23759d5b574e628a3ee88ff40d9a6a0e460799cda903edf6be1e5fd60646452713eeb20f062cdd57971767af7e3344a55b0a60d798bc47f3b2d12c SHA512 ad270cdc7063ae6c541d29e1224ce6608ebada07b212d836030ee3377c0596ea37789fa6cdb8e96bcfa84b295611a95d450c37726e88876d66c5a8ece4f327da
diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
index 6bf484adc0d0..4d62759742c9 100644
--- a/net-im/ricochet/metadata.xml
+++ b/net-im/ricochet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 3241f829c78f..bc35744da460 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -8,4 +8,4 @@ DIST signal-cli-bin-0.8.0.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2
 DIST signal-cli-bin-0.8.0.tar.gz 16852501 BLAKE2B 2792935fa20bf6d31638157febfd771a254c2e962342236891cc0e8bc60a872af0f400852bd4b2cfc449a81e81dbdd34c19437a78df86d07a3648b748086fa85 SHA512 60029ff8b0013667743eb14340cb1367b527ebf2ba74a54fc2d1f70a21721fdb826c9af63a80d26f0dc951670172df7346a9bbea61a9e865e5625df10187c965
 EBUILD signal-cli-bin-0.7.4.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
 EBUILD signal-cli-bin-0.8.0.ebuild 1675 BLAKE2B 2b199c6094f562de3e26b4f719bd2b5ca53f757eb61a9bb9153e201b6ff582602872a19ad2f04b8315d86a8c89e5beefdc504246ec97acdf9f245b64835363fb SHA512 72d08d761b0b95b3e354386c1eb15af43e43a7e21404085e7d11990b5d7d59d96ab696d58e19502c9cc6a97686af559ec39100c77941f7e3af884e268d569eda
-MISC metadata.xml 367 BLAKE2B 054ee8cf6ee573867495108fafe6931527427200833256fa96e7d8a7b9aacc9286d49bf12b6ac605862ec49b3b9760a98af1e24bd8441bf87ba549de27016974 SHA512 4d04a934e70460c817900d05ac9809c794cf44b13662eaf0f3b23999d7ba88561fe8ffcf60d5adf3f6c2d8ec06a50e34f92f642b9916fc411182a4f6323e2e4c
+MISC metadata.xml 397 BLAKE2B 085e3a2bbb0db2ab42db784c18f8c1871f32a3e135226163d8a1ca3f612baf1efe6977a3dd8407fe850de154cb64de26520e3ba4ed5b3dd143cd422eefe5c750 SHA512 7b013dd022005f5b76a6e6dad9422565f4018736f013da5f4870bf2b51c0fd9f1f6c1127e0c31282125507e05011469e43f2efe48714ec0b2481f1e0da164657
diff --git a/net-im/signal-cli-bin/metadata.xml b/net-im/signal-cli-bin/metadata.xml
index 1b610f626eb7..807eeb2b38c2 100644
--- a/net-im/signal-cli-bin/metadata.xml
+++ b/net-im/signal-cli-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 9816bb3d8a41..1c5b28869bdd 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
 DIST signal-desktop_1.40.1_amd64.deb 109871658 BLAKE2B f2ac08327943112e8bc00f191e9e75392837ad6cf1f3460b9d02f76b589eb23fc9d0448b92d56292982c4b6a4a50e81d7b7f22ec09acde3c5daec57fbc935deb SHA512 dfe2c0e3244e37bdf02df2340d2cadd98f907c027d671fb0eafb8953d676ea28e1b3344e3f84e93e30844cd1d0ce3766b5620059029b313c1b2cfbe6267506d1
 EBUILD signal-desktop-bin-1.40.1.ebuild 3541 BLAKE2B 2ca67dfee2ae825375ce3a0ba6b31c965545c66b38c16b782f8a420a320be5e9df1e861e746663dd552324686cf7faed308f382b9b826ea73bdfb57248f77d08 SHA512 4c7d53251ff79f942da2bd3405f183f8a40b3209dbe0e1bcecfa58e1d1b9ba371abec732c3672fb425efca70ea5307371a42d0bbcecd1cfeb5728dc842aaf62f
-MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
+MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/metadata.xml b/net-im/signal-desktop-bin/metadata.xml
index 8201d8fc6346..4b0c2c48464b 100644
--- a/net-im/signal-desktop-bin/metadata.xml
+++ b/net-im/signal-desktop-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 93bdf288594e..b1a01acefe3d 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,7 +1,3 @@
-DIST slack-desktop-4.11.3-amd64.deb 57956414 BLAKE2B 3b1c2d5574fe52e27e2d489c9e4b28e28e36fb6afc2b9b18cb23352a311748be09998893dc02a78f296363fe86c6b4c36375429537c2e1d03c49457d25d4de32 SHA512 67a52a83503f273a5e3eedf8fecc83c21f249076e553537a3bacdc1d410bb435c31189c678aff9011271723918d46ba6caf82f0c2fb0c6f1cf571b11b49e8af1
-DIST slack-desktop-4.12.2-amd64.deb 57734610 BLAKE2B 249565bcb3f5fd9467d2b48e683978f406be6e3fd77f56c8e6ee328a3745800e53504f9bd618ea1764ffe429256ca5610b53996f82442e399d47f46ee5991b78 SHA512 7c0ef6e007f67c9a95c43e6544536af35d9bb55008524dade5b707aa4473db8e0837547bb91f8398728fcdc9e4ec732655cd390b49f1b5f820dc3f0b73ef9f71
 DIST slack-desktop-4.13.0-amd64.deb 57716072 BLAKE2B b8f1a793239b1e101bb6eb738a8a75883bf67468886f954226552074b769355b5444bbe9273eed48575b5f245fb47bdc78e264e7329ef052305afbec88f496f4 SHA512 d324637cb96a73f6d93fb36cfee52625d9c3571115ca6a8f0e7891417dd5fa88172dcc001e1a4fc9396392fe4885c5b14d9618d82c6a97b7c688ae14f5cbe8d9
-EBUILD slack-4.11.3.ebuild 3010 BLAKE2B 2924c4d78bee81ee983dd6f712736d2e8221c95c59e76e40afeed0cac46d324dc6bd5247fb489cf578f60b6883937431a862e25ff32746fdd3b8428b3663c526 SHA512 fc49079951bddca82537a47f31253974c6c4f1b5b5269404838bf65327cfbf2dc91228412baf3aec8783e931c6ff1a575b77537d12b9a450852ce1837d975970
-EBUILD slack-4.12.2.ebuild 3010 BLAKE2B 9e164820f8f25e9eb7640608f3652130f9de7f993a71e7154d98f290113c90d0af2d835e5630886c542a68d61cefb6870ced56343285d4da2ec2326273d1bf4c SHA512 24160734c4aea7e319408faf479590df67ca45efe4d1c6c989df5cd5449c6e3698321ca29c5b05da5daf7e2b7dd62964ec58e8cd494164e7fd710397da28be21
 EBUILD slack-4.13.0.ebuild 3170 BLAKE2B 13feb15ddce19b03df8d91327a761c1853f37cc5cd22676adda57b6fd9a62364a78f1c381e37480fd942282e594e29a8a3946cf956886601810c0ea0dd044151 SHA512 daae0fe1ffd7faee3cab0a940987a47a3c7438195df4c34f483b0eb2b1bf33404493134839a12e2912ba5a367f5de030f9cbc6a8e086d41990b3750de492b736
-MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
+MISC metadata.xml 716 BLAKE2B 24a080d70ea32d691bbf1d3406d9c4098594da54ddb69484487f17a90022c38149351c885eb39f86cc6317ab05d28b9b5b01dc34f676e0d11530635124f12bd7 SHA512 013e7e4118739c39afac7b0ebe62b6686b8124bb98161c74f104371e45797db7d2ed40d169fc4c6afaca11576c8b55d50e27d53b02d613d442165a591a65c8c7
diff --git a/net-im/slack/metadata.xml b/net-im/slack/metadata.xml
index 15eca405ed06..1911198d26a0 100644
--- a/net-im/slack/metadata.xml
+++ b/net-im/slack/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/slack/slack-4.11.3.ebuild b/net-im/slack/slack-4.11.3.ebuild
deleted file mode 100644
index f0b971bb4e03..000000000000
--- a/net-im/slack/slack-4.11.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="appindicator suid"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	/opt/slack/libEGL.so
-	/opt/slack/libffmpeg.so
-	/opt/slack/libGLESv2.so
-	/opt/slack/libvk_swiftshader.so
-	/opt/slack/libvulkan.so
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
-	/opt/slack/slack
-	/opt/slack/swiftshader/libEGL.so
-	/opt/slack/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path, logging noise (wrt 694058, 711494)
-	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		-e '/Exec/s|slack|slack -s|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use appindicator ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-
-	rm usr/lib/slack/LICENSE{,S-linux.json} \
-		|| die "rm licenses failed"
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt # wrt 720134
-	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
-
-	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
-
-	xdg_pkg_postinst
-}
diff --git a/net-im/slack/slack-4.12.2.ebuild b/net-im/slack/slack-4.12.2.ebuild
deleted file mode 100644
index 2a34f4ae27fa..000000000000
--- a/net-im/slack/slack-4.12.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="appindicator suid"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	/opt/slack/libEGL.so
-	/opt/slack/libffmpeg.so
-	/opt/slack/libGLESv2.so
-	/opt/slack/libvk_swiftshader.so
-	/opt/slack/libvulkan.so
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
-	/opt/slack/slack
-	/opt/slack/swiftshader/libEGL.so
-	/opt/slack/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path, logging noise (wrt 694058, 711494)
-	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		-e '/Exec/s|slack|slack -s|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use appindicator ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-
-	rm usr/lib/slack/LICENSE{,S-linux.json} \
-		|| die "rm licenses failed"
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt # wrt 720134
-	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
-
-	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
-
-	xdg_pkg_postinst
-}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 8b7c9ec318fa..b084a227dcd5 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,7 +1,7 @@
-DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
+AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
 DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
-EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
 EBUILD teams-1.3.00.30857-r1.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
+EBUILD teams-1.4.00.4855-r1.ebuild 3274 BLAKE2B f2b4ffcb749f47df42549691f5f734a29f01424ed717a3ee51c37d3187a694df60aea52a594f5b9fabe06b4daeed3767f528af5be7559e473d486b914b16bc8e SHA512 ecffc012b0898e711b1b5846f3838f9773e7826fbf0951fd5bff24e4ae4a9df483449bcae6632c7e03bfa7765e5f0709a132deff1793c4cda453cbcfb9e09c6d
 EBUILD teams-1.4.00.4855.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/files/fix-url-opening-1.4.00.4855.patch b/net-im/teams/files/fix-url-opening-1.4.00.4855.patch
new file mode 100644
index 000000000000..9ff555305119
--- /dev/null
+++ b/net-im/teams/files/fix-url-opening-1.4.00.4855.patch
@@ -0,0 +1,9 @@
+--- a/usr/bin/teams	2021-03-12 09:58:20.095552303 +0100
++++ b/usr/bin/teams	2021-03-12 09:58:41.938137585 +0100
+@@ -8,5 +8,5 @@ TEAMS_LOGS="$HOME/.config/Microsoft/Micr
+ 
+ mkdir -p "$TEAMS_LOGS"
+ 
+-nohup "$TEAMS_PATH" --disable-namespace-sandbox --disable-setuid-sandbox "$@" > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
++nohup "$TEAMS_PATH" "$@" --disable-namespace-sandbox --disable-setuid-sandbox > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
+ 
diff --git a/net-im/teams/teams-1.3.00.25560.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild
deleted file mode 100644
index 6f18946cc3f1..000000000000
--- a/net-im/teams/teams-1.3.00.25560.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils
-
-DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
-HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
-SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
-
-LICENSE="ms-teams-pre"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror splitdebug test"
-IUSE="system-ffmpeg system-mesa"
-
-QA_PREBUILT="*"
-
-# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
-# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
-# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
-# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
-# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	x11-libs/pango
-	system-mesa? ( media-libs/mesa )
-	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	rm _gpgorigin || die
-	doins -r .
-
-	fperms +x /usr/bin/teams
-	fperms +x /usr/share/teams/teams
-
-	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
-
-		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
-		EOF
-		doenvd 99teams
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	fi
-
-	if use system-mesa ; then
-		rm -f "${D}"/usr/share/teams/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
-		elog "Using system mesa. This is experimental and may lead to crashes."
-	fi
-
-	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
-
-	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
-	domenu usr/share/applications/teams.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/teams/teams-1.4.00.4855-r1.ebuild b/net-im/teams/teams-1.4.00.4855-r1.ebuild
new file mode 100644
index 000000000000..574fa6e8d2b1
--- /dev/null
+++ b/net-im/teams/teams-1.4.00.4855-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils chromium-2
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="system-ffmpeg system-mesa"
+
+QA_PREBUILT="*"
+
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
+# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
+# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
+# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
+# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-mesa? ( media-libs/mesa )
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/fix-url-opening-1.4.00.4855.patch"
+)
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	if use system-ffmpeg ; then
+		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+		cat > 99teams <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		EOF
+		doenvd 99teams
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if use system-mesa ; then
+		rm -f "${D}"/usr/share/teams/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		elog "Using system mesa. This is experimental and may lead to crashes."
+	fi
+
+	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
+
+	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
+	domenu usr/share/applications/teams.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 9d80b515580b..ecff0a43ec6e 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,11 +1,5 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.5.9.tar.gz 15030323 BLAKE2B e31695f4015e6194c08153da074a90ef5110511cfc616134dd8581db876ca5e31ed47d08e0be4a0cd5840e49405b36f60122e101fd50e4da35dc31cf3d2a1b2f SHA512 0f4d691dbf7806634c232d636292ae035fe5a7585279baae04aa504fb9921c8b077033d2401c310314c79aba08e26e0fa5f8c80f35b52249f41eaa9cfe90ce37
-DIST tdesktop-2.6.0.tar.gz 15071641 BLAKE2B 48257e4c9f8a74970a04d928bac43e4a12e21a45ab2c83545d8a8697d684c9b9a2b25e5e9b48da5ed02ea320d28a45b87a06d95362605587b0be35746af34cfb SHA512 641495eda1858021b2bb22e6dd8b7bf30d016b644143f2629324a89988b544f4ebe7a03100c9a228eaa0dd333e73dc145bdf16a5cc6563ebe1f9ad6ccba54073
 DIST tdesktop-2.6.1.tar.gz 15071996 BLAKE2B 927c571e8a35c30cdf0c974895e3a7d2a3257077959e9a6a0b7b5c819833a83cf6d5e7136f0e8909490310cac01863de88bf3ebd2c82fe60c8ed85f988ed3887 SHA512 abd0630c4bd979cdc36b61c7c9b3223f7cdc090805d88f6a3173466b092934a3400313c7af3a170c5b116ec2aefa7577d008cd41085a94aca5e20759a3957995
-DIST tsetup.2.5.9.tar.xz 35175576 BLAKE2B d618739aa05c15ec75632593103588149c819906ecad86c0c984d4fbb6ad994e3d2f2fc9d3552dcf15673f980f707636698c5a706694c6ea6fbd694d2df845ca SHA512 be6a619c5d0818e56e6d23c0a20c90616333fcdd83caadc302339e9edcacb39618d67c5c578eacc5eec251c04412546303c3e7156f29b841fa759ab6b2ebbd2c
-DIST tsetup.2.6.0.tar.xz 35297664 BLAKE2B b8069f1723d62bd6af20d909cd97d8b6bf4519f6755bb00ae0ba92b00539129e16ccf94185c02e686136f6764c865a16f60b3caf206b087e9751696942a1694b SHA512 7731098eaa588b6fddcf90ddf09882d47949a4130aee2a90268878fba25dc0e151c04c19316b1cd249ccb7c78b6a3537a5731c064b7c48cfeab8c99165b82d12
 DIST tsetup.2.6.1.tar.xz 35300412 BLAKE2B cf4e616c4957b8a6ee91b621a79556a588c5d736583457d4fa35c3f0b4266b929f41b488764330c5f5d06314ac57a853613f9fcf70e5d129dceb9ac9e8059c8d SHA512 f8b9f78b4d7f6cf886a9368731733f598749babf6ed50541b5332dfef20ccc24616f399448d17cc523409b6e1dcdd2c137bbe0e5eb13e4e9ade902a6e26cf1ea
-EBUILD telegram-desktop-bin-2.5.9.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-EBUILD telegram-desktop-bin-2.6.0.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 EBUILD telegram-desktop-bin-2.6.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
+MISC metadata.xml 614 BLAKE2B b520cf15619254180e49004a57809f8d4c86d6310dc610af062fe24eaedbcf009fe59343def9a3fb918409da70847342a11465c9f9dfdf427e5a0fd05cc396d3 SHA512 acdec8783bef5202172c2f67635350ed0f18c268b13ad0d08a80d3c81dc4386691f4e8b2cded8d0baeabd56f04de06c4d39e4ac75b2cbcbed91635cd3762e8db
diff --git a/net-im/telegram-desktop-bin/metadata.xml b/net-im/telegram-desktop-bin/metadata.xml
index 80595dda442e..a1e08f993f19 100644
--- a/net-im/telegram-desktop-bin/metadata.xml
+++ b/net-im/telegram-desktop-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>henning@hennsch.de</email>
     <name>Henning Schild</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>NP-Hardass@gentoo.org</email>
     <name>NP-Hardass</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
@@ -17,4 +17,3 @@
     <remote-id type="github">telegramdesktop/tdesktop</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.9.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.9.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.6.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.0.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 7675b5dfa2d3..de4339d15e71 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,4 +1,6 @@
 AUX 5.16.5-account-fix-property-name.patch 1053 BLAKE2B 283fde75d8eba3f8c4240e49298233930d270c48ead6b3a4651de7553c35e74fb3b72108f570bf6133acac38f1751e2355b260b28af0d6ef9c8cf5c5102ada80 SHA512 a0161ddf307f9a690b1c741c20aee8fa05f3378da880d1a850f80cde0fc83fe2a95c541d4cb641d1e70995cc6cc75d27b6c5a8c110ec7330ad2a9a75df297012
 DIST telepathy-mission-control-5.16.5.tar.gz 1125142 BLAKE2B 1f39336d8221ec9f297ba9eeaed39ffc30d5b2ecde3b02148343cfb9bf4ec15d949a36feb6b92cef17d70f786840b8df9cf159eb8eb00462c64bfb8b41437b57 SHA512 6adeb3033853bef5b732e7b85da49b75bffbdc57d968b1e4313fd1452eaf8db96c3f7f50d41ebb7bfcb084a7f093a9eaccdb28c23d2777e149a90dec6d4ef4e4
+DIST telepathy-mission-control-5.16.6.tar.gz 1127785 BLAKE2B 82055a86d102292dec44ddeadd99458b1cf083f5d74be09326cfae41d627f1792468a180b5cb9f5bb5712989198cc46116f39e41343ca35b3bac101e3db6003a SHA512 56d62bc7270d2d62a490361f3ef3bc39384fde05ee5d69cb7e20db4f41665bd99d05b4cd2b5992b84dbfee5400684503e44c5b8c63cfa101e0cfe6a85b005e5e
 EBUILD telepathy-mission-control-5.16.5.ebuild 1302 BLAKE2B c4b7b4c989e0224148f387a72cd769085716ef8d48dd808f4cdca28d80f662427c3e0ebad8662978a6f3e23e5d3364f78c98e061c60b9fae8ae07f4507d308e3 SHA512 b1a1e7ef97053c9982357c58b647861a56d971410f5379b6827d43cf1bab1c96f344668f2f263a7ec2332c50b784b3af87a5a0457e0412f2c7bd6503e7479c47
+EBUILD telepathy-mission-control-5.16.6.ebuild 1022 BLAKE2B e21830c8db5967a69fc70950430e39981afe119803b5b8c181de5a793b30361e8569d9a40b375ceb888226d26dfc89ec5dbff52913bf105956c4c34ab2744552 SHA512 9c6f35f7216bbeede47dc75ab846d732293247d38b36d6077851b8893f51ca4ec6833b29fffc71c3df13fc19208e30789ba3611424355dcbc25926dca6a96286
 MISC metadata.xml 599 BLAKE2B f96e565e553f14b0ab55f8b53ed520e9253611da9cf26b5f43ba35cceeb808a9be1dfc4968929ab62faf3af116d3c98c4e89b63260fb6779f397cfce4f06dee1 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
new file mode 100644
index 000000000000..a6b12cd81002
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="https://gitlab.freedesktop.org/telepathy/telepathy-mission-control"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug networkmanager"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.82
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.20
+	networkmanager? ( >=net-misc/networkmanager-1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# creds is not available
+	gnome2_src_configure \
+		--disable-static \
+		--disable-upower \
+		$(use_enable debug) \
+		$(use_with networkmanager connectivity nm)
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 26c2c6507d7a..8ad2d534e9e2 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -2,4 +2,4 @@ DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f5
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 EBUILD toxic-0.10.0-r1.ebuild 2714 BLAKE2B 5473d9c4b78e94abe0827f9b8191cfd1f44b42ee5c07ef22c38be41474c812d542380a4af0f4b655e6590d4abaeff4fbdf67e3f802ccf48f98732b0a55c6c19f SHA512 bdf5e716b072843570bfbafa234b636871e71e20dbcf2a20a5b4e455e26ef104c78634a8bf854a3dd214cdd114768d6efb4111f061755ba3db266d0824d39ee7
 EBUILD toxic-0.8.3-r2.ebuild 1817 BLAKE2B 73f8276337997cc2ea695cf691a47241ba981d414d6055b6f466503db0e79a14985cd1e08736570196c3196119f1db60edc668b5f271dfeca8dc2352b06682de SHA512 d94d058e687405ab6361babd1f3a8e7b8d98d456c4b7a8f06d55a7831cf88eedf041e778b605731d130baef1839b993280bfcf92ec7d54b46b703a56e8f69d29
-MISC metadata.xml 1124 BLAKE2B 5cc7843b51d7cb901334bf831ccff7dd43bc383b54dffc5977c8dc70c39c4064f03f12c6b03a4b2936cfedfe3079e90615dc27c74ad22bce4089c49e07d0b303 SHA512 ab9281381e6364cf9a9c38bed9d78d9b6c0dc6c45c83275dba6f727a9c60d7cec35f9944ce12d4202fa75909c80da32ab0c105cf98776d0d557925f3787ef3c0
+MISC metadata.xml 1154 BLAKE2B 5f94676351ad071b3278cc986d715ac5980fafa89a2be08253ac05787027b7a4cdbd3a9de8c88fece1ad35c8442956cbd089568d3c340f3ad6832186ed1d341b SHA512 2a65c022688774e5f892e7be3e69283e17164a47484f311544bc1bacbf3c5374c80736568adaa00db9b18f2ae1ff8946cc6a7c0912aaeb0a2c3b33f42ab7609b
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index f101e28e63b5..799dd08bb740 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>JoMull01@protonmail.com</email>
 		<name>Josiah Mullins</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index a35f8286e39a..0e37399cfc12 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,4 +1,4 @@
 DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687
 EBUILD vacuum-1.3.0_pre20180105.ebuild 3147 BLAKE2B 0f8dc6e7229f4813be597deed3bd8719d87014f47ee74c67ff45e38d118656d04a2ae1bfa777323faa4bf40495f46188c1bc824e2388bc9f0cf03ab7deffd25b SHA512 b1fdf8727804458c995a655b5eb82ef3225ddd130a3252be876d640ac711d9b4cb10caa6eb930d018e161fb8a45a218f49447f33222f7495b4310637284ee475
 EBUILD vacuum-9999.ebuild 2984 BLAKE2B 7db70d4d5392fc4320d28d79d69c0f4e4f68b6d5ebebf260c7d9aeb203eafe640b926ad6ed12e6218d0d723b2255df8151e1cbda24b8fc6b7f6399d7bf52132d SHA512 6287d3fbd8f4bf5660b31c0b4446e3e4ef3855511945b8054cc82b815389963efc8a92c62ef898a998103b33a3c912bfc3cb42d1bfb1382b22634cce92bcd45c
-MISC metadata.xml 4283 BLAKE2B 3ab2a4524675500997ec10109812af42b23bcc4a85cd60b07ea108069a042fe2c390bdb961b8cfdbfc9bb53ffee04e5916d16a604658f00ee095cf4a729c5359 SHA512 9fc0d5e31204edb514edae47aa289961868855951648ef297c7a368ff56028d0a9ba258e703215b97fad6348a6f6a53181dd48b99106df2f9dc530bbee5c6620
+MISC metadata.xml 4313 BLAKE2B c19e3293c00299ed5fbdd57294de28896d980ab520ea7f80e4089f420e800ce688fff0760f892f9a9a17eaa4df7da0edb94b29b8c95f60bd2295cb560c25f835 SHA512 991a18cb35f863b01f655e660457ef7e54c4133321d704b9e64d34437c04c757a93489733bd6ae10dbe278562129360a7dcb7a61a0c345c42dee03fc2dca74ba
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 7561fe921524..7dc45761cae5 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d11fb9282e08..b85a234b3d33 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 2e3df49fdb36..6a84fc24d350 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -2,4 +2,4 @@ AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547d
 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1
 DIST atheme-services-7.2.11.tar.xz 1051436 BLAKE2B 99624c21adf820c8ef8e33aa9ae9036c701c4a9218e225e7871717c86010fbed56d00da43cd2ffb79a46074a5602260fabbbaf769407a00175b5127c18913c1c SHA512 adcc189b61efe295997a7456022a7595df5b14b55c2139794d380e57fe77efd42221316558391b5440f077fd951143905454b0e9893deec89108fa671b44ef2f
 EBUILD atheme-services-7.2.11.ebuild 2192 BLAKE2B ca910460545073820d4d6d8a2e425a11a328b9aeb231d5c9efefa65ba135ea46a5ba6cb2eba8bdd235aa05174ae3c8799e742022cef5c0a13ed36e9a25b067c8 SHA512 7ef63bcfbd30237ccfebb55f2dacb0c00b16c39c2c1b52b51624e1734403259f4110d4eb3dca17c6681df2cf7f1654afce129e04b30f269042faa4d57654be8a
-MISC metadata.xml 721 BLAKE2B cab35add2ea8e919feee82480bd106479b29de57733ae46b18ebac83bbefde0f9e9d1479db8f59c4be4d60383805f969378a4a33b36976ac9bcae99ea8e7dd96 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15
+MISC metadata.xml 751 BLAKE2B 8259810e42bad77feab76dde2384181dbb70d96f997fe470382aca47708a8a202eaed7d818d444b2314d7129f52b23945be88cd14a527944eeca8636e76edb87 SHA512 f6b53df954381a28968140eff320896bfaa1321fab360e3b9871f06f0f26b33e7447c34099ade0cca57190aa3a3ec60a38b5945740edcad41161a93e01d2bc35
diff --git a/net-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml
index 1056f0f4fb25..3080ce8e3d7b 100644
--- a/net-irc/atheme-services/metadata.xml
+++ b/net-irc/atheme-services/metadata.xml
@@ -7,11 +7,11 @@
 		<flag name="ldap">Enable ldap-backed authentication module</flag>
 		<flag name="perl">Install a perl module which wraps around the services' XML-RPC interface</flag>
 	</use>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 9da2b4987370..f19d5ebc14ed 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -6,4 +6,4 @@ DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa
 DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70
 EBUILD inspircd-3.8.1.ebuild 3617 BLAKE2B 05ecb591fe2351b28b0a3b23cd5bcf36c83ca04579f417eb183e8e12ebfa2385d2e31f870748229bf5b31b29759aebe605eb5978140da4e6db7989015ac285cb SHA512 acd5e6aa35dc2d9dcaeb2cab798db031ff7d25eac05318ce53e29fc76f746a1bfd1b2951ad2a3ffd552a7604558a24ab921548bc2e77cf05e2218c451bc31de9
 EBUILD inspircd-3.9.0.ebuild 3612 BLAKE2B 4cdef520df508d23db93e25aed8a732b58944ae680e6f926ba96eb32b39b925ce43a10a85e72eb30a827c6257bca57ac13758002406434592d71448f48882c2e SHA512 11e8cc3a56a200904317eca4e597a232d3e006a7f88764e65eb5d292fef74d9f52d45f77558f54453f99f8659b30f508a1e6bc9adc2c530eb82ef5f6bdf70e34
-MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
+MISC metadata.xml 1877 BLAKE2B f9c983be016749a13bddfe989a9abc9397ff39b6a9d8ddcc9c50b91ede18e1443cc2e8e9049dc8bd6732348c4dc1e1127260218c053b72af46460f137e44a910 SHA512 01f8d325244ca9c0a6a908d1d1257c425fc2a7991ee35a9f3ce45688776eaf547e4847619ad7275b5144abcbc0048743160ae80a0722e575823522782b7da5fa
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index f1f04d7eca62..5ecdab857d3e 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -29,11 +29,11 @@
 	<upstream>
 		<remote-id type="github">inspircd/inspircd</remote-id>
 	</upstream>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>wadecline@hotmail.com</email>
 		<name>Wade Cline</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index 893351dfff3f..f927f0981d55 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -1,4 +1,6 @@
 AUX ircii-manpage-path.patch 514 BLAKE2B 09723e9e2d80654c9ca05535b8e14e833af7ed423bad9a32cc8b8200b3263129d85cc614db4a2f77d5778464fc28d2663675a909b7e2b16e570128cb7264cbdf SHA512 ef19be0ac1b5794da5d761131100b85d5d928f6a204fbce1c32b2deedf638cdaf8fe3a92cd06ac9ca0ddcb0b4f918b56ab298731201d54b94550287cddb4d693
 DIST ircii-20190117.tar.bz2 606327 BLAKE2B f7ee5c98f6106f07fec8feb0840aba87a052e5927c5e591f34ea28a9a017fb64c711983e472ae001465cbe29b6b9d88ab65d67c4bb303b9e01dde853aba66bf4 SHA512 08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4
+DIST ircii-20210314.tar.bz2 590626 BLAKE2B d9b785fd043f277ab7824b2161e9f8635f106802c502a905755fd7cfa1d34f8d7533e9bed7158f3ce0639787894c5f8f4ba4c96d628d3a50a34339f5a3d8466e SHA512 3dc3a4ddb000133907edb9b867ae7cb0b36488c875f5d4f56e70d7263cf042da6c429f60a8ed6cced89bca077aec42c9d992ea6b56b2ed8b4e91f125eeced310
 EBUILD ircii-20190117.ebuild 865 BLAKE2B ff4b1777b256435bd6124edf92ebf067fe59bc6f2cb08bda526a2575d5f0306e55a6f11fc7e1733d961e15afd4212c26bab3b2035ed67c3c786d9fe06e70d722 SHA512 42f910c9d2d8e201b528d73cf7b4d53e2cefdf7eaa0da0a46fb674df99a526cd6537dfeb7b5c06d235b7bd549f628b38e2c628563418f32e097ca293b58f98b1
-MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
+EBUILD ircii-20210314.ebuild 849 BLAKE2B b9cffa3ddc9c3d5dbf1de25cf6100858355d096d20ecd0a7cb42b6abdeec6066c5e7408e1682b4b921ffec743353e640fde4fc8ed60f4b9a6ad9321a85b53738 SHA512 64a8d416dfbf8c552f5f204250d8a69866a3f01584a37ce5e8f5995bf4e0e4e311d77eb64080ed3b06356a0f6037317b9577e589c49eedc9b604a350566a914b
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/net-irc/ircii/ircii-20210314.ebuild b/net-irc/ircii/ircii-20210314.ebuild
new file mode 100644
index 000000000000..53d9f0f1fea1
--- /dev/null
+++ b/net-irc/ircii/ircii-20210314.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms"
+SRC_URI="https://ircii.warped.com/${P}.tar.bz2
+	https://ircii.warped.com/old/${P}.tar.bz2"
+HOMEPAGE="http://eterna.com.au/ircii/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0=
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" )
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	#Still needed as of 20210314, otherwise man dirs don't exist at the right time
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc ChangeLog INSTALL NEWS README \
+		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp
+}
diff --git a/net-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml
index ee9a82ac4170..c67d4dcaca5b 100644
--- a/net-irc/ircii/metadata.xml
+++ b/net-irc/ircii/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index f9aae4c47153..126d4820fd97 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,4 +1,4 @@
 DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
 EBUILD irssi-xmpp-0.54.ebuild 891 BLAKE2B b3d49990bce3c6f74547e25465faf5e962dca086b787fbc3909d2498794c1aca4e6434306290a98e3dfaac615718c390ee70616b55a8f6460931e44aaf389425 SHA512 250dfaacb0f0ca219d8b3862e7008acbde97732af27f536f22e00ef3e577e4c31a4a4369857cbd71a9d37eb4a8c362c1bb2ed110e8cb036d04e1dde8bd9136d5
-MISC metadata.xml 250 BLAKE2B c268b1356ec4037e979bc2cf251f27473ab234bc7f5925b1725445675e59ce59fbd8900ffe5c09acdba75194848c7f001c8b1e6187a11744601dee6e3bd3c273 SHA512 ef7d2ea71e78c9684960143c24b05c0be118fe34e7ff731d4aa37d15b7435d5483440d235a59c2e223674b74cf7a9103c9e70fa1513225cc71b31ec01ea057cb
+MISC metadata.xml 250 BLAKE2B 10e63c52f7f8c9b6b17271ab4fa181e2cfacab1c335385be283dee0bdb09996bd3359922e1f59ac22d5a8b669137ee3115162422915d0a39c4b82281bfa1ab32 SHA512 ff0952729c427971d642f23814b1819fc58ee1f274da0bd83ef30f62bcea0aaca687977c86fe20bb072d96d1c83b619422f77ee24da629de8aca76c55bb241d3
diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml
index d726f7c84157..6160ff122d8d 100644
--- a/net-irc/irssi-xmpp/metadata.xml
+++ b/net-irc/irssi-xmpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 3c4ce802fe28..4920d4719152 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -2,4 +2,4 @@ AUX irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch 1498 BLAKE2B 79878990c10616a4bc5
 DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
 EBUILD irssi-1.2.2-r1.ebuild 1596 BLAKE2B d251105311d238163eba7402149df75cbb8437f72a9c1318be5039d9f7fa6e83ae7d2de34e6b45cca584ce3edc9b1a5af81ec517f7c41171000194f64d221987 SHA512 b053f09ad42fa9c75b98e93c5afeb54da87196f1f3d8f03b7e3928aab142190905086908ffe6835ed68e20dcfa0f36e9d0ae668a5dcaea15007e5df89598a9ac
 EBUILD irssi-9999.ebuild 1452 BLAKE2B 36bdbe74877e969849b92cc653c21eb7d41d03b0b03ae3656b3d25b5bd63e37a7c65c47cb3ea7fad0f110a51f99384b66b9a4215a8940c2105e126054ed51dd6 SHA512 c9e57d39473c2f3a9fda1b331f8f8232c758e0fdb803b4472c68491e78b74432eea75577be9cfddfbd500643eb85a051cf986c00b472181f37bd1986c5cbcf64
-MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
+MISC metadata.xml 700 BLAKE2B 6dd761c206e402091a7847899f6d117a1110cbd12cc3263860470fdc3d2286f902d7949c1b36054508915eaf81622050a8ba734621781fa2bd1c167ff561a971 SHA512 bb8ce4cfafc1bb65ccc5fdfcd95d5aca47a958820eb55f3130967083256a495c4d8bf33e1bddf03394c4bd7b6afba70a838add6815e1e9ac86711ed405451601
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index 4944f1133301..d23922a1d2c1 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 4f78854f52ee..e741b66bfa93 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,4 @@
 DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
 EBUILD kvirc-5.2_pre20200605155236.ebuild 4451 BLAKE2B 6fa7d8cb1ad91525c819aa5b9fb8c495a124f7b598c134d8dc3ecd26df42dbb8019ff4988cad1a0e532a8763bf639fd60d69f035f3bc2d0e6dc0c28bb097d90b SHA512 3ed8a83b9e7075122ac8e39203d44ffa7a3c021c407ab3bc644300c11d584f40c57aba0bb7551de9ce0214c9b4f5fb16d6db56ee0701aba90433acd9ba65541e
 EBUILD kvirc-9999.ebuild 4390 BLAKE2B fbb7f3850e6af42c3beab17543f5d0b63826e1e6650544ef8e5d154341423eac034ae8cda6f942b0c3a9b073ec7bf2d83109a45d5a0776a48f2c1aa230810ceb SHA512 b73b39e628c44121ae749605088463fe9bf114fcac54d13be3a44ff6c489f8ffd6f4416a50bc5c69e7c0b3df63b4e534cec8666caecdea0c80be415c3577ab71
-MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
+MISC metadata.xml 638 BLAKE2B 66f7c48cfa5e35db6763821efcf483ca829d50e9b534076fbefb209e6c3c46880b2c110d2305a4bc1e6580781e4ef5fb646e83a23a3fbf609801a84c0ddbc108 SHA512 68853129b4bf5b62be097022091d3402eaa33da641483f666c05e6eaae195f1b6672bf18313b0f98155aa16a4429d543d2885a04e7ea008065cb7d9e2bdda9e8
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 2d32a6643ad3..c447f818e684 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
diff --git a/net-irc/metadata.xml b/net-irc/metadata.xml
index 29c5171b1496..34d3ebbaefad 100644
--- a/net-irc/metadata.xml
+++ b/net-irc/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria net-irc zawiera klienty i serwery sieci IRC (Internet Relay Chat).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 0ef08430f8cc..6464f57985a0 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,3 +1,3 @@
 DIST quasselgrep-0_p20200830.tar.gz 29944 BLAKE2B 011633afee9d9519b0c343c5d0b1a9ba775c870802532515a42a7c22d39af5138a051707a82f2b6a19dda3523fe9f04d2b56b62a36c554ff873275c095e7dd94 SHA512 88f568852cc9e85e0019335d3362f192766a2ce3e94ff1947485ad6eaf43d49873d94396791165f74e95edb25601c078a947a7740b4ae2e40424b5bdfecc2a48
 EBUILD quasselgrep-0_p20200830.ebuild 799 BLAKE2B ec0f201b29f2106efe59b2e7ad9ef270dba8a3bc6465100d7ba72cd113bf925bad082ff111bf0c89a61ca30ed69d581c54ff34ffabd4f80a36b20168f84b2859 SHA512 8109dbdf4ae00cd822772d630d354063aedefacbe799a53942285e2836893fb95d204ea7697bd3dd4cda3469dd7be46d8a3bb9407f245fbf6567bb11ceaea02f
-MISC metadata.xml 538 BLAKE2B 8cbdcf099828e3b700badf7c8e7bbeb0ae54275025f7aae9688fd6eeb080c1a13b8335b710c70b218f589f3ccaf2381f126d2fcab052a5bebc8178717e197487 SHA512 7f2a8b3e829135593b687fd69b0d1d7ba4142c2b2b832e90ca56e64967ebbf67f8451711030bd59fe092ab3dc7d585e5868f74d15af4bb3e0954d69ccfb0a087
+MISC metadata.xml 568 BLAKE2B d1f434b87aaf93d48849aa3fcf833d0fc3213be9879e674ce455b241d3cc43cc1fe75aafdbb86eacc5d7c2cd7885cebab3bd1ab64cf0cd8804813e367e74cd29 SHA512 4b4ddb025cdfb2f9dad58a59187fa579b2d7e0cb1de54eb4a9d087520796270edfa620f146903bfc0999716de57920ecea62c1df5bb3ccf7d2163ab21cd15e5f
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index 8cdbffdc53bd..11fb66f07328 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 2546fa892fec..27a8a3a6a6bd 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -5,4 +5,4 @@ AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53
 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 5218 BLAKE2B e6cf5c29ef591bf25665364673b11793b36df4b73f68965fcbc56d0e484886406242ccb4deb39b68586864591c555029e6ab878d95db3e653ce4db4292f346e9 SHA512 fea97215f7a921cf9cbd55c5223c5ecfdacd79d2abc508341bbb4ab69a65d6430f0af4d3608d0528077267426539ccdda784aefa06c83cc548f5f2e748e616a6
-MISC metadata.xml 2429 BLAKE2B 194f36624f9ae791b43994d7b1779b3e74b29aab2e9cedd57f6d2e33c6acc3b06e364cd2071f085d35fa8836c26940a9f8ab6be42a9f2a3bf9081f7279c606d2 SHA512 ddaf26be4e591045bf3ecb8151111cc140a9fded5ce2b3e425f445ffdddfa42d267e3cf38236fe2d43ecf6261492f51b9f2249785b0f7ec371c3f314e8124591
+MISC metadata.xml 2429 BLAKE2B 74471471dec1be09b55dfa02344e81acddef59e9ec6e8aef5b777297ccef5a858dff6e6f955a1c22e970e93d2cd8864ef35002bfa5e0bbe8aeac799bc3d3dfa2 SHA512 3e91bac4f83db11e76233e1d60dbabe171a6235a57a95a130234cdc07de688ace7869ebe4358600d2b0e2f1c0beb450ab429279ca871bf8b6a2bbf3e437f343b
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index c24f8a726305..87b130a4f7d1 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 3beecf1b56e1..566e17415b15 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -2,5 +2,7 @@ AUX telepathy-idle-0.2.0-fixes.patch 9363 BLAKE2B 6980114c9b030c1589f618fe67e880
 DIST telepathy-idle-0.2.0-py3-1.patch 3849 BLAKE2B 48617c65e8c3af4aa40332eed66c1839b4a9db9c99a4e350fae89879dcbd67c133e0a05fd9a778a5e0ac737ddbf8f999f23095b9a2a3cdef233485b1c9422908 SHA512 41c90befc3bb2df84f35a2f53bbe29885f67a2ceb5dfbf906436655b9400368e74a1a4a6b408f669fa951ae9d50d89bc7e0e2285f50a6fecf1a1d719c307cb24
 DIST telepathy-idle-0.2.0-py3-2.patch 1441 BLAKE2B ea32a2c94216ff320f43c3bf8b537b197c0398507f812eecfab86359e43c53fc2724b2c0d0a0e0a7b342243b07cce38a86f802d9fbc777bba942df939f52a56b SHA512 c9f868f50c5300f4ed06953de935f44e2e87729a36a61d4c1e998d322c1dcdac2759200b66a04c965e9ef591475dfbd5997c83816c6fc2bfb178bfd4bcd260e8
 DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
+DIST telepathy-idle-0.2.2.tar.gz 606406 BLAKE2B e5d4a19df08bbb59c18d0601357134a6edab085b2b04463b085651f35ee135f0d3f3f27fc35417dcf023913f7ead939161cb1a72cb51824a988aad6c0cb2a136 SHA512 c66cf7b70c84a9b7b1ada01712b8d3b683f15a4021bb2d0f6d868b4ab30e2fb12fd26dd8d5ba25b5050e055bf425295049e84a53198d6586f7cfd7c6bc02f826
 EBUILD telepathy-idle-0.2.0-r3.ebuild 1449 BLAKE2B 696cccb34138d2d7475b5be5e8e187cf9e8267f3ac078bf5a86e40e2f7495929f612a2965a255463f934545ee662479786c08f59b883a324009e5668dc847a83 SHA512 b5679d91d9fbbd893374f5d3e11025321a47a4c4f38c9c52bfa4fffc7a38c981cd37c8120609039695c97e2b39b36efac408953d39e8743db67be113a08983c8
+EBUILD telepathy-idle-0.2.2.ebuild 699 BLAKE2B ba3cd42b847399e940815e978860fdd6597c685fa235c5914ab6d5740977ef324a013b97ca034e55ebecb608f50db7c0e3f9a19418b3f045df1ad792cb630b74 SHA512 ff434016cc542aa7444bda61438d89d5544880a421250632cde3c4998c4646474d13e2b2b362451b301890e9a0e9354b191f39488ee4c0a6af94a0f69f632078
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
new file mode 100644
index 000000000000..93299731defc
--- /dev/null
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.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 python-single-r1
+
+DESCRIPTION="Full-featured IRC connection manager for Telepathy"
+HOMEPAGE="https://gitlab.freedesktop.org/telepathy/telepathy-idle"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/glib-2.32:2
+	>=net-libs/telepathy-glib-0.21
+	sys-apps/dbus
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 31be6a60338e..e98ac0895c31 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
index 96718069f0a3..9ac9699afd91 100644
--- a/net-libs/biblesync/Manifest
+++ b/net-libs/biblesync/Manifest
@@ -1,3 +1,3 @@
 DIST biblesync-2.1.0.tar.gz 87868 BLAKE2B 2a136e4840f6f3cb3f03aa127adc978f9f5f189d48be198e4cb5b0ec654ae4a28f3fac30a10640d6fd2b1c3555c6bd88527e51e34287424f953cd599c5915521 SHA512 c6637954c0d9cbe9ba03048d92288d52c3675eaa9770749690222bd76d45ec7f138d67a4e416c33dbf9864f623f919f117aea58b1bb35feed8bcf59daad94e8e
 EBUILD biblesync-2.1.0.ebuild 597 BLAKE2B cddd837727299f2b460e7de1fdec91db1593f952c2573fba3cf7355394f12c91002ebdd395157e24008d2a7a5926176ab20d5877e9bb5a106a0a8efa4fdbda41 SHA512 3e80e735138b8a892e11ed4da1a3380cd1878c9002868a3154991f1e755ff5ca2b2e6c9e92484f0b4f31fdc54e5bc78c01d195517d8f942c84ec951c336a179f
-MISC metadata.xml 446 BLAKE2B 3518b88c0fd0f6318378d06fec9b17effe4345e097663847dec7aeabcb5bbe3c50e61c2120c20751eaae84b0fd0f45ea166be5143091f9c6e757504bf9ed6e69 SHA512 1290c95a6b91a71efcf56c8d70b4d5ea5948930e5e5ed6a8adf146f314c6b5e01f202485509d9bf7120431d9550844219e37be39b45d4bec853a78baa4ec8db6
+MISC metadata.xml 460 BLAKE2B a3e063e208d415048fb759d77e3859f2e8163fa0dd4513b156b29bcb84f02814a40cce240ea0cb96556e0c4eb82b882fa501ddddb85d6e1bd8c05bc9ab868c50 SHA512 84cd5debf4a2b71021261f31c450feb77f4d834456d5017685cc451c70abaf22d65a2c64a3808dfe6d516286d528d342fb1c35f86562ee5948b46df0134606b2
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
index d7dc3044bc9b..bb8573337939 100644
--- a/net-libs/biblesync/metadata.xml
+++ b/net-libs/biblesync/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 9a990fc30e1c..e35b71d283ef 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,6 +1,4 @@
 AUX cvm-0.96-fix-test-padding.patch 971 BLAKE2B a0a6dbd617427347a4b93b436f326d2cda5bd123adb6410a29f4b5955f014d078935cbf7178a1857941fa09ace013a5800f615cc0a5067dbfca10b228ec0e758 SHA512 18fa658e70030709fb83b81311a13358b09cc872ea8bb9db91ab78ea56dea13459f0bdf8e02bf8c6045c8838d7ea1941f73d0c405fe3b38f2edcb29a9cc200fb
-DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
 DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
-EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
 EBUILD cvm-0.97.ebuild 3237 BLAKE2B e4c0d2bf498717fbd4aba72e42367822310f5f4e34d498b7f55381e259f2ceb28d60b0cc7237cda14f52e3a55e0bbaba86a1e6063f8e3d207dc3386b54ec51a6 SHA512 e736a653e6f85dbf1efa5b6af80852bd3e7263006792c4232ef5c41edb950f722576d0e4f00042206cf2665d49525cff688900ceb02637b804e605dc014b7a49
 MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.96-r1.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild
deleted file mode 100644
index 4f150585b773..000000000000
--- a/net-libs/cvm/cvm-0.96-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Credential Validation Modules by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
-IUSE="mysql postgres test vpopmail"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/cdb:=
-	>=dev-libs/bglibs-1.041:="
-DEPEND="${RDEPEND}
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql[server] )
-	vpopmail? ( net-mail/vpopmail )
-	test? (
-		app-editors/vim
-		dev-db/sqlite
-	)"
-# some of the testcases use
-# - ex/vi/xxd
-# - cdbmake
-# - sqlite
-
-PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch )
-
-src_prepare() {
-	default
-	# disable this test, as it breaks under Portage
-	# and there is no easy fix
-	sed -i.orig \
-		-e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
-		"${S}"/tests.sh || die "sed failed"
-	# Fix the vpopmail build
-	sed -i.orig \
-		-e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
-		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
-		-e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
-		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
-		-e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
-		"${S}"/Makefile \
-		|| die "Failed to fix vpopmail linking parts of Makefile"
-	sed -i.orig \
-		-e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
-		"${S}"/Makefile \
-		|| die "Failed to fix vpopmail compiling parts of Makefile"
-}
-
-src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs || die
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
-	echo "/usr/include" > conf-include || die
-	echo "/usr/$(get_libdir)" > conf-lib || die
-	echo "/usr/bin" > conf-bin || die
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld || die
-}
-
-src_compile() {
-	emake -j1
-
-	if use mysql; then
-		einfo "Building MySQL support"
-		emake -j1 mysql
-	fi
-
-	if use postgres; then
-		einfo "Building Postgresql support"
-		emake -j1 pgsql
-	fi
-
-	if use vpopmail; then
-		einfo "Building vpopmail support"
-		emake -j1 cvm-vchkpw
-	fi
-}
-
-src_test() {
-	# bug 624384
-	# the test suite tests stuff that isn't potentially enabled
-	emake -j1 sqlite
-	sh tests.sh || die "Testing Failed"
-}
-
-src_install() {
-	# Upstreams installer is incredibly broken
-	dolib.a .libs/*.a
-	dolib.so .libs/*.so.*
-
-	local i
-	for i in a so; do
-		dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
-	done
-
-	for i in {bench,test}client chain checkpassword pwfile qmail unix \
-			vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
-		; do
-			dobin .libs/cvm-${i}
-	done
-	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
-	use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
-	use vpopmail && dobin .libs/cvm-vchkpw
-
-	insinto /usr/include/cvm
-	doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
-	dosym v1client.h /usr/include/cvm/client.h
-	dosym cvm/sasl.h /usr/include/cvm-sasl.h
-
-	dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
-	dodoc README{,.vchkpw,.vmailmgr}
-	dodoc TODO VERSION ChangeLog*
-	docinto html
-	dodoc *.html
-}
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 4c52d57c164e..d38fb489c42c 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,7 +1,5 @@
 AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
-DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
 DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
-EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
 EBUILD daq-2.0.7.ebuild 2060 BLAKE2B 50bf278b780dff6a4e56cce21ea4c235ba6c2ace8052c827fdb8c29824afac947a3a308444ab1881b88af47fa28a6a8ab34fb4edfe49b7b046e8161d8b63af28 SHA512 ca9ed467651297a25a213f98c511d6243b7253757e80fb2956707ea93286c85a4736d7ba43082ce9a5574e39956e31bfb8bf9375f4a598aaa68cac4461ef493a
 MISC metadata.xml 1314 BLAKE2B 167ce20e3e0130835e68309dedcbaac8313455fe7bdf680b00975ebec436d554c4c9d44c71e5b42b4af4b0aa7f7ea5eb7a0d1993c0ee37a0cd1d5267107cc9e1 SHA512 8eddd30b83bd5f03280d208ce11df9e388adb7df2fdb9420bc7fadf6956b85012e0ed6a5fdbace36c5c5f65ff8e711a749da2eb17bf585c6223cfef95218831b
diff --git a/net-libs/daq/daq-2.0.6-r1.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild
deleted file mode 100644
index e695b8358c31..000000000000
--- a/net-libs/daq/daq-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit autotools multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="https://www.snort.org/"
-SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
-IPT_DEPEND="
-	>=net-firewall/iptables-1.4.10
-	dev-libs/libdnet
-	net-libs/libnetfilter_queue
-
-"
-DEPEND="
-	dump? ( ${PCAP_DEPEND} )
-	ipq? ( ${IPT_DEPEND} )
-	nfq? ( ${IPT_DEPEND} )
-	pcap? ( ${PCAP_DEPEND} )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
-	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# We forced libpcap to 1.x, so we can set this cache var so
-	# cross-compiling doesn't break on us.
-	daq_cv_libpcap_version_1x=yes \
-	econf \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable ipv6) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable static-libs static) \
-		--disable-bundled-modules \
-		--disable-ipfw-module \
-		--enable-shared
-}
-
-DOCS=( ChangeLog README )
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"/usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index c44ddc28e741..a3f930322c87 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,7 @@
 AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
+AUX farstream-0.2.9-make43.patch 1423 BLAKE2B d17a589cd2c91eab66cfb86c3050e0c9fa6cdf7a92ffb9e483f7cce2cbb9106ddc3755f56e70a33446b59aee68fb5e8bf9a4b6cde3d480f0ed411b42bb273ec3 SHA512 55c95b76e897b64b350f1740cf65311bf3ce1e2ed24515c713dbe8f0a4f1e4d4232e630e5c8abd8fce580f4ff7265f77bdefaf78ac3eb135342b2a70305bd104
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
+DIST farstream-0.2.9.tar.gz 1334833 BLAKE2B 3c23f9534cb8578acd82bb0f7308891e0448cbf5a5b986f27d14e4d727a1e52f4268532c44dcc84e2a1db19504840ddac128c9bd0a731f06e2972d233d8781b9 SHA512 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd
 EBUILD farstream-0.2.8-r2.ebuild 1885 BLAKE2B 2da12350f5bd058d35ab5f06f9b5b52ec79cd51a65deb3f1f2fe71c8d5705101c4602344b4b279d06d09af9bf21c700034a63d0245ce8597edb0b2b72076361b SHA512 6256c320d320b4a47b622d6daa04c8c9adba0df5452d6d8facedb529708a1b804ab876b20471e535d1a777f22559a30f152b2fdd13f20eba647cd60a3dce5d89
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD farstream-0.2.9.ebuild 1910 BLAKE2B 58752747ef7c7549b4925e9eb8850059f8bb6fc838a996448c4e5460ab3f4e31a0e9685f2a4e76eadb6bfdc195dfe85307d842d0324c1a31483919ba8faf1d00 SHA512 dbbbb7dd2fe1254a7c4dbe5c95debc0ea41a803a658fcade307bdfec3f6e8546ab392b710fad24203496b1d2e2adaa81dd1a96dca58f18ff825dd467ab2255f0
+MISC metadata.xml 324 BLAKE2B 5d42923f0341e578e9a43d0a7c22a9f3c4110252bc5acd869d4a92a7e9ed08e7262d9ebc559cad8c3f7de63ff411daa6ff25178b37be3493eb464a7d48a88a2d SHA512 c97ce61625bf6ae20953c5164123c8494be83d4870787b247f460103c9965e9ad8d599ded1a67f7fcf91e4f0156674fdd4fa6d4177577f766d60a65eda7af93c
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9.ebuild
new file mode 100644
index 000000000000..4c76af4f7c7f
--- /dev/null
+++ b/net-libs/farstream/farstream-0.2.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME2_EAUTORECONF=yes
+inherit gnome2
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection test upnp valgrind"
+SLOT="0.2/5" # .so version
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+# FIXME: do an out-of-tree build for tests if USE=-msn
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/gstreamer-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0
+	>=dev-libs/glib-2.40:2
+	>=net-libs/libnice-0.1.8
+	introspection? ( >=dev-libs/gobject-introspection-0.10.11:= )
+	upnp? ( >=net-libs/gupnp-igd-0.2:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+	media-plugins/gst-plugins-srtp:1.0
+	media-plugins/gst-plugins-libnice:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	test? (
+		media-libs/gst-plugins-base:1.0[vorbis]
+		media-libs/gst-plugins-good:1.0
+	)
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.18
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.9-make43.patch
+)
+
+src_configure() {
+	plugins="fsrawconference,fsrtpconference,fsmsnconference,fsrtpxdata,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable upnp gupnp) \
+		$(use_enable valgrind) \
+		--with-plugins=${plugins}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #539224
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/net-libs/farstream/files/farstream-0.2.9-make43.patch b/net-libs/farstream/files/farstream-0.2.9-make43.patch
new file mode 100644
index 000000000000..20a84f6e59d6
--- /dev/null
+++ b/net-libs/farstream/files/farstream-0.2.9-make43.patch
@@ -0,0 +1,38 @@
+From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@freedesktop.org>
+Date: Thu, 12 Mar 2020 14:07:23 +0100
+Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
+
+GNU Make 4.3 has a backwards incompatible change affecting the use of
+number signs or hashes (ie., #) inside function invocations. See:
+https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
+
+In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
+argument to the foreach call to '\#', not '#'. This would lead to
+spurious backslashes in front of the '#include' directives in the
+generated fs-enumtypes.c file.
+
+Spotted by Ernestas Kulik.
+
+https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
+---
+ common-modified/gst-glib-gen.mak | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
+index 14f1ba37..2247a41c 100644
+--- a/common-modified/gst-glib-gen.mak
++++ b/common-modified/gst-glib-gen.mak
+@@ -6,7 +6,8 @@
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++hash:=\#
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
+-- 
+GitLab
+
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
index 39980802b1da..5c42c302ab3f 100644
--- a/net-libs/farstream/metadata.xml
+++ b/net-libs/farstream/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+<flag name="valgrind">Compile in valgrind memory hints</flag>
+</use>
 </pkgmetadata>
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 5f358d72ea48..6c4f2464b76a 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,8 +1,6 @@
 AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
 AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 AUX gloox-1.0.24-slibtool.patch 503 BLAKE2B c760faea8d4aaa9adb3d70494b55a0a327456f8976f8c017dd3326cde93147f126d9e53390e9b47c0555ae9a8a7bd0259cff8b0e86b4f845aef99222bf3c001e SHA512 bede6b41aa5695de8d7caff391eda0c75a2fbeffd0d3bc2a8e0cb943123283fca7519d4406c3d5f5db1585976dd84d2023554c7f5a42c74683fb38336d1f3904
-DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
-EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
 EBUILD gloox-1.0.24.ebuild 1370 BLAKE2B 861af564b4f1d40152546127c9a6f372d1225bd594ed3a63520895df93d98648d56d7b7f929660620c6ae4cbf5ccaf30374f69097545da660c872f26009ca80c SHA512 34ef2097bdd013384cf57b391dfdb0d2895a25e212cfc5226e8c80b4f29ca862507fadd046ef98a23c10868f45c7729a83f23e63f98a94ac1977313f8c385d72
 MISC metadata.xml 253 BLAKE2B d71cef1027d455987adc9c6421216c7c2c1db2615b0e7beeb8e8ea22fb64f1d6da1067363164f9d4d970af759d9a71be31eb55890a6bba420efb09efbe917c66 SHA512 4a632f8fe7d7808076ecc07be60de72762423ecea35ef546a6e2b0a15eb90c018e1ab06c5169b1b5613451049965bd8d3a4ad6cf898845f6a871b46135f8d186
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.22.ebuild
deleted file mode 100644
index 683420569f62..000000000000
--- a/net-libs/gloox/gloox-1.0.22.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
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="https://camaya.net/gloox/"
-SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn:= )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-# GnuTLS checks hang forever
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 7c38083fa165..1ed7647511db 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -2,4 +2,4 @@ DIST ignition-msgs5_5.2.0.tar.gz 390042 BLAKE2B 733f57aaa91d6a34201e247c34ace746
 DIST ignition-msgs5_5.3.0.tar.gz 390136 BLAKE2B 947336e79f54f384d8cdeefdc6be5cfe360c4ae9fc4e894cc08252e801343c4a9d507957df1ffb05a80e55ac24bddcd57f4e4e90d8e0b2f346bc55aa8f64c3c1 SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e
 EBUILD ignition-msgs-5.2.0.ebuild 727 BLAKE2B 2e4d124127e3d7af8a935788a2c5310c42aca5cb7fce7c2a3c0c0e9427cff2a7ea8ab3128245a4ddb2f2bcda934a619691ec8ddbf7f9fd6a79189b1d72a2a886 SHA512 8877dc70ac3f0650c521e2fe098625c9c5ef9fe3bdcf7960a840f913d21e630392e22df59590164f5675d036f9f729ad05fbfccad799fc70a26ccc0969f0064e
 EBUILD ignition-msgs-5.3.0.ebuild 721 BLAKE2B 22be3ba2cb7f504bc0428942a0f8df051b9b8ab158ac317a81ab5ebda45a441fd97e7846fb912bb8fcba493ed927f34a04b024643711db4e4eb2d5bb19af9ed8 SHA512 c63d570831eddf989495e8029599598025b6957d262b23f9081971bdaa1839f1201c0b6a94aff736dd1fd5ff624fd7330f743924f6791a9e6132f70d67673805
-MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
+MISC metadata.xml 342 BLAKE2B d175314e7d6f244988fdd056bc53c344b2323e23e9f0c05cc21ac9c68b1c4cb39e8dda8cd3c68a079d310e3cb4ca237bb1efecf8948cdc011214bc002b7163a4 SHA512 7f5b76e9bc064ccbba965b33adc11db5552957803791b0e427a9b0a177b146f2b3cc1eca92f6f4bd8b8554ff3ed7de4150a94cd9abb0500247670f3edfb1563a
diff --git a/net-libs/ignition-msgs/metadata.xml b/net-libs/ignition-msgs/metadata.xml
index 9b5bce8e868c..3bccbd9f2521 100644
--- a/net-libs/ignition-msgs/metadata.xml
+++ b/net-libs/ignition-msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index cb4e9c601f9a..4fcf26dc6280 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -1,4 +1,4 @@
 AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b84a5cedc4a807992191766d51a5f5b672123a07e876972feba4753cd102851b9dbcbd15957bf11b5f794473f5a3bbdbe SHA512 b9567f60b37a4c2cc658a7215bdd864409f2b3626c28648547a9fe6bdaeebbc5f414cb5ca6e5a78dfd9d24b7b81a38bd358bd83887a56adb9ceed5049df6c187
 DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
 EBUILD libaxc-0.3.4-r2.ebuild 1255 BLAKE2B bd856104834c30ecd9ddfcc8d73cd6823cd0722efd8604b5a3bce2ca26296f2b0e12ae2178a5071fe34341652f95a6c395479ff4ee21098256fe7fde0c331a8e SHA512 95fad7584a2269517195bfa720080b7ffa101196444b5e3894b11c2a0bce8beab93be275999dcb2ec388d4930ed3901ab01046e4b79e3d7a6c4398314d6f7119
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libaxc/metadata.xml b/net-libs/libaxc/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/net-libs/libaxc/metadata.xml
+++ b/net-libs/libaxc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 7c758f660745..4a830a538f2d 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -4,4 +4,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
 EBUILD libbitcoinconsensus-0.21.0.ebuild 2348 BLAKE2B bb2b10dcdfc10b75fa5c296dc2a48beda24eeba534c1aa2770e01a7ae5ff0bcca9081e829927e38a09c654384cffe4c5d22c47ebd46f779b8efb3fb7f49a561c SHA512 b5784e4697bd3a26c5d9de4149f7fd98d508656bcba5145bdc25105c40e4d83fe679c5025124999881c18eb4382c4052b693cf061df6044014baa096226653cc
-MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
+MISC metadata.xml 709 BLAKE2B fb4b1d8a5dbfb4f5094769593ef4cc97724093edd64d961129cb324b8e8ff6b548eef622058d791d26bfbfcb520e5db0227702ca04c78f381bdaedffaf17d3cc SHA512 f7ec32085ec0cb4c59fe3bf4766705fc97699b27cc85d3ba84e5b4617c686e89ecc333cf2333857bf4b7e31f7463ab8fc4d553fe721522274e249bcdb3cacb24
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 946f87b1e8e0..31265a43a3d9 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index ffe5b8979eee..c4c1910da25f 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,3 +1,3 @@
 DIST libblkmaker-0.6.0-github.tgz 28907 BLAKE2B 31b64604040a514ae844564d19e884932fbaa0640d0491cda5ec9e922b0714c89e8810f1da3d0057625633555ea486c15e20f2a32d8528a6795be52e692d4e4f SHA512 3e9028c7c4664491274c241020d507ba6d736b9e9048562434d27d92f6cdd58ec167fae060bc355ee6a7f010a6a8a6ccff1660ecfc616c705c5deb3ed95c5e69
 EBUILD libblkmaker-0.6.0.ebuild 689 BLAKE2B 3f5e0fcb1a85738a7bd13af19c0ae11fe56f549c41aab5806fed8995e24c1609916dcb58f4224b818fb347d7ee71eb52cd6b4e7455d5119ca6f4bfd4668bbc73 SHA512 c3acceed12b5d8bfc9d845829c7d1a306a6d6f1075db4d275900e9d559629f2425c4ebbd2ff3787ec3a331980bd5239aed7c80d7960591c5ba5a90ad98e4d571
-MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab
+MISC metadata.xml 488 BLAKE2B f37874f55d00c39009e1c66f8a2c4437e4d8a0d7e809df0cb724edd2a39edfc17bd80a6922a3add3bade528603f5177ec96817cbfd3b24d7dc455a91ec418e49 SHA512 239bbd2c25623f517f1cdbbaa4efa176ad6f2731426dfebf54b50e7528259087137a4ef956d63a4502a8e8d1c8d7cc458585a3d5bbcc17bf507a6c3827cef31f
diff --git a/net-libs/libblkmaker/metadata.xml b/net-libs/libblkmaker/metadata.xml
index 50b1253d5629..69330e2247ce 100644
--- a/net-libs/libblkmaker/metadata.xml
+++ b/net-libs/libblkmaker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index c6438c3c9a98..19ace1639c7c 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,7 +1,3 @@
-DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
-DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.3.3-r2.ebuild 1142 BLAKE2B 9159d3b56556d47b31ca06bc99af41478023eb1ac4d7da3f06889b1f90ff2261d798229ec87b7e1c8f92137b7a149319e6e72dbe84de4dac9de17b2448619ffc SHA512 eb2a10b58642fd745549b4c8ddc3bad46fcd578b97cfcb91bd800d59884be60b97396b90c0146e3261140ebfaf9eb57b0a904b9b28584bc3dc75985228641925
-EBUILD libdom-0.4.0-r1.ebuild 1124 BLAKE2B c3901e4d0444db08ee515a1270558f4153ae0479691a374c71a9a873127e8ea23ce43c16af6449dc43aa3e9a79dbd2859c30b26ec1149015d8c1af9f43334bf8 SHA512 c61e6c25c8afa07412148372dc8d36cf7942c3bd0f413abc1c6aed226bdfc9e8ea61694dd99c8031fa85c69d9750d70878954d9ab2ce4f6774c7ac625ac8bafb
 EBUILD libdom-0.4.1-r1.ebuild 1124 BLAKE2B c3901e4d0444db08ee515a1270558f4153ae0479691a374c71a9a873127e8ea23ce43c16af6449dc43aa3e9a79dbd2859c30b26ec1149015d8c1af9f43334bf8 SHA512 c61e6c25c8afa07412148372dc8d36cf7942c3bd0f413abc1c6aed226bdfc9e8ea61694dd99c8031fa85c69d9750d70878954d9ab2ce4f6774c7ac625ac8bafb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.3.3-r2.ebuild b/net-libs/libdom/libdom-0.3.3-r2.ebuild
deleted file mode 100644
index 7198d7ecdb69..000000000000
--- a/net-libs/libdom/libdom-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="expat test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libparserutils-0.2.1-r1
-	>=dev-libs/libwapcaplet-0.3.0
-	>=net-libs/libhubbub-0.3.1-r1
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3 )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4 )
-	)"
-DEPEND="${RDEPEND}
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig
-	test? (
-		dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch
-	)"
-
-REQUIRED_USE="test? ( xml )"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
-		$@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/net-libs/libdom/libdom-0.4.0-r1.ebuild b/net-libs/libdom/libdom-0.4.0-r1.ebuild
deleted file mode 100644
index 19c4937b1fd3..000000000000
--- a/net-libs/libdom/libdom-0.4.0-r1.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 netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="expat test xml"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libparserutils
-	dev-libs/libwapcaplet
-	net-libs/libhubbub
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3 )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4 )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch
-	)"
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig"
-
-REQUIRED_USE="test? ( xml )"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
-		$@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 2ba1c03ccc2a..bc16fab2607a 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,10 +1,3 @@
-AUX libgsasl-1.8.0-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
-AUX libgsasl-1.8.1-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
-AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c880bc37f6ead9047472215f8388833efea85db9ab4282bfcb700d0bda366623935bb487652dd334c4bb87dcb188b30d8f SHA512 97922b23fb967ee0110076913ac1ad89b3720be5d9883bce3762b4e41d95375ae1602470eeaf1551cb7ef7d46952d3dfffda64ef6ecc51149cd93dea681ad988
 DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
-DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
 EBUILD libgsasl-1.10.0.ebuild 1417 BLAKE2B 6002a2a56bc7943c02eeca31560a8545effa9855ae45524461fbec2b05c9396fd12e93c73b1493392e8087cda3ce143225545eb621913c1ec01e9e31c7c6467b SHA512 4d8310d89779c24b61f85a5ae1f92fd7c6f8ebabfef3a528983a513ecd58aef15d391809e84036699ca2b3424444d132e6b371ea29f5f2fac9bfe7f9da74a96e
-EBUILD libgsasl-1.8.0-r1.ebuild 1416 BLAKE2B 0c97b8c07c138f1a6f7194690ecfe830ac16bc838e1f402dba3cbbdb5f2efb3d9c5149537c6a678f60f944296dd349c81a6ad1179601b44fa2eb128879460b32 SHA512 a0d47502bf8d1c58895dbe8b2206c20b8608d23bab450ebcc8cc37a27c61c9c8289299331fb87112803177516437bae03295e363ac4628aa84480665122788c5
-EBUILD libgsasl-1.8.1.ebuild 1456 BLAKE2B 3c863f75eb71064fdebce7470393a1c752826fbedb49eeb60474ab8cde042f239f2d07ec9f829e84142824f6ce4cc2f91965a62f9ec8248ad14c5bbf1cd54f74 SHA512 4726cb82604704fa78df86f9df442de94cd5399bfbd91a0c0e4153298b073f76c1c315be3176ce15b28a77af9529d9e9d62a3bd296f49f7f5996cba34f6dee00
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
deleted file mode 100644
index e9ec10d183c4..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gentoo bug #359005
---- a/gl/m4/gss-extra.m4
-+++ b/gl/m4/gss-extra.m4
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
deleted file mode 100644
index a2a558db5a64..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/m4/std-gnu11.m4
-+++ b/m4/std-gnu11.m4
-@@ -6,6 +6,8 @@
- # This implementation will be obsolete once we can assume Autoconf 2.70
- # or later is installed everywhere a Gnulib program might be developed.
- 
-+m4_version_prereq([2.70], [], [
-+
- 
- # Copyright (C) 2001-2020 Free Software Foundation, Inc.
- 
-@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion -version; do
--  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
- 
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion; do
--  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
- 
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
- dnl with extended modes being tried first.
- [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
- ])# _AC_PROG_CXX_CXX11
-+
-+
-+])# m4_version_prereq
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
deleted file mode 100644
index 15350a87d51d..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gentoo bug #359005
---- a/m4/gss-extra.m4
-+++ b/m4/gss-extra.m4
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
deleted file mode 100644
index 3c6634c1ebe5..000000000000
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.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
-
-inherit autotools
-
-# NOTE: Please bump with net-misc/gsasl
-DESCRIPTION="The GNU SASL library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="idn gcrypt kerberos nls ntlm static-libs"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}
-	!net-misc/gsasl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-gss-extra.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/ -Werror//' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	local myeconfargs=(
-		$(use_with gcrypt libgcrypt)
-		$(use_with idn stringprep)
-		$(use_enable kerberos gssapi)
-		${krb5_impl}
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-}
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
deleted file mode 100644
index f83373ad3e87..000000000000
--- a/net-libs/libgsasl/libgsasl-1.8.1.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 autotools
-
-# NOTE: Please bump with net-misc/gsasl
-DESCRIPTION="The GNU SASL library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="idn gcrypt kerberos nls ntlm static-libs"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}
-	!net-misc/gsasl"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-gss-extra.patch
-	"${FILESDIR}"/${PN}-1.8.1-ac-270.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/ -Werror//' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	local myeconfargs=(
-		$(use_with gcrypt libgcrypt)
-		$(use_with idn stringprep)
-		$(use_enable kerberos gssapi)
-		${krb5_impl}
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 2fbad79323c4..f8d58796b08a 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,4 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
-DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
-EBUILD libhubbub-0.3.6-r2.ebuild 1211 BLAKE2B b91a089735f061c872faf590e871073a2f6f8f2f25d9e1f12a33b61028137f32a6061b57258de0aa1927f644fa30e248edc1dcadaafc2aac52e51c18bca9be37 SHA512 3c810114105825733ae3f7a7bcc653ab42ec47d76988c431fd2710e838514ccdf96c061d5c7d976fc049fe223e229b244542bee70ce6b0708613397332fccf7b
-EBUILD libhubbub-0.3.6.ebuild 1171 BLAKE2B 4a56c42796cd81760dfe6e8086ba2a1f565af9902a52eca1be7456fde5e720da53c70c4e454e724bba285deedc25d58237c3824b78c1bc44ca6e93fef433cab1 SHA512 07d33b4f90767e16a5342a9921d1f14cc23f903f36d72891a6ee2c6f8ceb5932f7f5e9ef2da02ddf78dc6d56c5a2857509bb8e95b108a76542928d87ba57e047
 EBUILD libhubbub-0.3.7.ebuild 1206 BLAKE2B 011dd18bc170c5ca6a0cefc55143873edb274460a2744ae87b486e73bad11e2703ad963bf50e895bcbbfc5abbe43103261a0dd9dbeae4faa8bb758bd1ff46977 SHA512 b638f25b1057d6d645e8f54b7d3d57e122039aaca2cc271245b659cfb97b6625acc44d81816229f3ab7858129266911fa2d74b9cddf23638a4e1ad4e04348604
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
deleted file mode 100644
index 7beafd98de26..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf flag-o-matic
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )
-"
-RDEPEND="dev-libs/libparserutils:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/json-c )"
-RESTRICT="!test? ( test )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	append-cflags -Wno-error
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-	use doc && _emake docs
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	use doc && HTML_DOCS=( docs/html/. )
-	einstalldocs
-}
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
deleted file mode 100644
index d11754cb384d..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.6.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
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig
-
-	test? ( dev-lang/perl )
-"
-RDEPEND="dev-libs/libparserutils:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/json-c )"
-RESTRICT="!test? ( test )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	append-cflags -Wno-error
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 10085e7b33cc..8f09476831bb 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,4 +1,4 @@
 DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
 EBUILD libisds-0.11.1.ebuild 1125 BLAKE2B 3403b3684ca0fca0f956bccea15fa998d1eb997f3974b45f576cee64e797fee6c858ac1f1452a4239d3e4521c2fee6330aff11309c688192ce00fc4788fe1fd7 SHA512 da3ca32f39d13ebf5b73b7dd07092e345325a97900dbe2c01557dae1f323f73852c96330eaf1a4c6c18b00918315c026bd2c6280f05feb5bda49df683f6d93cd
 EBUILD libisds-9999.ebuild 1154 BLAKE2B 0b944facaec152943b9cac24ffb6f9e6f46b2be459e16d38b327d3a76f566420ff759fb318406546a46af5a3f0e53e25f14314945d37bd33fbcffff188b70918 SHA512 33d0fd8dd98c0dca1e33a748ba9a8780913360cb49decc9b872ae143d6078f9fb6d4166221f9bc3478821ffd703070c40d71e3ffe3e8cba60b374215e10fc9ee
-MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
+MISC metadata.xml 758 BLAKE2B dff02c575192d137786d1843fb3ee399c64b8706ff61701b6681de0e6c569c4c8c35ca75fdefdd3035f729b1ca849f6cd105addf75b5c18e10f76376d12abc56 SHA512 66dc24c7a62da75c88f380ad6ceb7d032b847a9c5f16af2640f7da4f12404d7a1f6e22b3a237b099d3220341bdcaebe250cb5e107e105d634ad131c0755a5e2c
diff --git a/net-libs/libisds/metadata.xml b/net-libs/libisds/metadata.xml
index 4e1c72a7829f..71e0546c0180 100644
--- a/net-libs/libisds/metadata.xml
+++ b/net-libs/libisds/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>petr.pisar@atlas.cz</email>
 		<name>Petr Pisar</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
 	<longdescription>
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 5c20732ee400..aa546906753b 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -10,4 +10,4 @@ EBUILD libmicrohttpd-0.9.69.ebuild 1287 BLAKE2B a9607356e4ba7c1c6e348b038968aae6
 EBUILD libmicrohttpd-0.9.70-r1.ebuild 1251 BLAKE2B 9479488e6702f6ca4cbf57ec4791b33b136b91f8a92a1f5ab54e38262038e138399bef68f1daaf9ef68b566488ab586e464310420df886717dc790ce9c67d1eb SHA512 0cda74bdede70b9e9118f0ab6d52b8f404f348fbdf48dd1b2a6d4cb99f795f0dc46c589e9a21f8a7ce315b03c86c2ed268633a76bb269be6a617e949229589a3
 EBUILD libmicrohttpd-0.9.71.ebuild 1294 BLAKE2B 25be4be610b51c671f74d1c8261350a1b316536b8abecad71a5fd980a8fc7c02006ec6f751409aafb6f7262f6b8f613419c6634dd4f74e0028441c70d08e7049 SHA512 c520a4c3231fb4aeb8550b1de44a92007e0e040c6e272625fe45497d85a04756eeff0a587ee0ba149330504dd661eff8bbb6a72b22297471239a4e4f27411720
 EBUILD libmicrohttpd-0.9.72.ebuild 1243 BLAKE2B 97562fd5237bf9a3937aabd8c000be131f65c309de84f945bcf998127dede3a9f5881c5ce95545239c9a4ba2e7f4f98dd82ec376df4ac86168ebbe9a35840b21 SHA512 bb8e51b5934a6cce6df69c19e9419efd568b87c2580e4db8241c34e35944550e89b04ba3febc07c11e3dcba679dd23e1823071304eb00dd73dac1f5e9aec3245
-MISC metadata.xml 633 BLAKE2B 86539f6b9e7a5cc59a1490371d665e5fa5d49f1f2fda9448d83a7ce63ce8cb5ca374362073c36c7b81943c781f371e3f5f128acc546010f9522dff917181c38e SHA512 9d4b499711a91d707cb64610779afe3dc99baf90ac1444faf43b6151e8ebe454e774c9fe473769d592de3ac54995008f33e50eeca1afde2b1eabd6983b6fb329
+MISC metadata.xml 647 BLAKE2B 210e02de356ea49f45e8919b506d8ce7bf3ecbac06209b383debd0541ce2e58277f4da8da096095a449c42b30fa031b5a03ecb6a7e5585b3d2f999c8743e7e8f SHA512 3e9713c2fd86e78c91065a463648c68ad96f367e13d02b58c9cb7f9ec9ce190290182216ea807f55fce44cefbb4eded3cd511c799d34744eb9b5895aa121fc8e
diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
index eb2da6137a91..0abf39ec25ed 100644
--- a/net-libs/libmicrohttpd/metadata.xml
+++ b/net-libs/libmicrohttpd/metadata.xml
@@ -5,7 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>k2k@narod.ru</email>
 		<name>Evgeny Grin</name>
 	</maintainer>
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index cf6b07add2b8..2704426a2878 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,5 +1,3 @@
-DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea88422326d2faa5959b47e4652cd9d2d8d6ea94e2f9addeb87f8c018392de0eca08343ed201895dc8c2d6974435779 SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.3-r1.ebuild 769 BLAKE2B 31624c9884c062aaafc44aea2cb7aec57fc5b3d546a527cfe1ef17566d13044642f847f8b99f14962e9cb7da4ae690e873f2e6c7c9aaaba584f57ac1bb7a06dc SHA512 d1cdd40e61d6cccb1386ea5232f8a5567d57c2d082b6f38649cdae3ee206ae8a83a002691b5f8622c2f4d7644500e2b999ea44f5ac30d0144ffd707f2e411cbe
 EBUILD libmnl-1.0.4.ebuild 782 BLAKE2B 68b0ea681670a21e5d342f7f65b519d1f0932493d854774c6f5d9da8bb3deef5d3e7d2dc461af641662667c4b267aee35e60e557c7eaf8eff9b85e9224309588 SHA512 4d544f20e5d37d4fb8ac55c91d01c32403c29aba5bfb03b6f32e72c8864217be2006bdf97e3e467630b5660eea6652996331adfbcd0a9e8dbf33f46f6d5e20cd
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
deleted file mode 100644
index 4bf6ffdf05b4..000000000000
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs usr-ldscript
-
-DESCRIPTION="Minimalistic netlink library"
-HOMEPAGE="https://netfilter.org/projects/libmnl/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
-IUSE="examples static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a mnl
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die
-		dodoc -r examples/
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 55758a5c754b..6e24d6461eca 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -4,9 +4,10 @@ AUX libnet-1.0.2a-funroll.patch 232 BLAKE2B dc4eea13f830b03e02cab52d594dbd0322c3
 AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf545d0fd103e9d088db147bcd5042c11827b918e8560792665982548033e439cd0a5af1938415c2852bd335e0f6f283f6 SHA512 ca4913145ffaf42ef1d267558ac00c096d1561a6dddf05b11f229aef969cc1601492168ae238d5d46b7015722822f9600018bc8a7cc344a4176e4d6c6e0c363f
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
 AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
+AUX libnet-1.2-int64_t.patch 569 BLAKE2B 8b07c6dee008102d4d1ab8863606c78219f8811a0153f341709f96347dc62c8cb207ef61f37aca5a3e440fac5def11b11a032f8e09944a86da9aff1a2e9f19cf SHA512 c3e42efd4b2621a4a068764ba9072e2dfb6506940c0dd48d6e66ec7392a60c0a53178d6e75e28d4e800b69e2342abc82b8102cc3add1edd339a5581a233be35d
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r7.ebuild 1409 BLAKE2B f1906501d9d776e35207b85e259bcc66058b64dc7b025fdb0aa1f7b580ed8066e65c17a8686173c264dc0fe51086b73259ca1d7c6583bb9c0de53ce63cb7b6b9 SHA512 7b44ebfe6aee06809dd721aeed50dbf443a27a531a99ee24abd31f535acf3454374bafbd2d79af0c0b95f8b51400ed1e10dd93207e98b0cff215553419098e3b
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
-EBUILD libnet-1.2.ebuild 724 BLAKE2B 83dabb20459e754247117c804c8f3f5ab4d41bba68e40e67e86fe43703b0f263a2238e5d39b9e86b1bfbf05e7be1eda401017a16eb980066d40b6619c83c97b8 SHA512 4caa06ce3eecc1d798adfe2510566ef12f8516efd56b924580c1f56ed36fc32a7bfd049964adba1af8ad3b51d022110025aa172611ab1ca1c6cfdcaab8c9229a
+EBUILD libnet-1.2.ebuild 891 BLAKE2B 5eb9a20102428815d27ec6d88f319e2eae6e2307cca7a31196890a62ae3edbed799c5e80a48d7e11e56c5facc98ec8c1b5afd7e2b962c0c55181b6be6ed346af SHA512 af8a30d34802f8c8b1cc08529733f1da96896917a3a64d351d9753ba1d4882be4e5fc66d9ebbe6cbf605c047ac1fc52312064600046d33f7333b90116e80a545
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/files/libnet-1.2-int64_t.patch b/net-libs/libnet/files/libnet-1.2-int64_t.patch
new file mode 100644
index 000000000000..b0b968fc3325
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-int64_t.patch
@@ -0,0 +1,15 @@
+--- a/include/libnet/libnet-structures.h
++++ b/include/libnet/libnet-structures.h
+@@ -49,9 +49,9 @@ struct libnet_port_list_chain
+ /* libnet statistics structure */
+ struct libnet_stats
+ {
+-    __int64_t packets_sent;               /* packets sent */
+-    __int64_t packet_errors;              /* packets errors */
+-    __int64_t bytes_written;              /* bytes written */
++    int64_t packets_sent;               /* packets sent */
++    int64_t packet_errors;              /* packets errors */
++    int64_t bytes_written;              /* bytes written */
+ };
+ 
+ 
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 7e47a083806d..7c9c1dba2b03 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -16,6 +16,10 @@ DOCS=(
 	ChangeLog.md README.md doc/MIGRATION.md
 )
 
+# This patch is taken from master branch in mainstream commit a1659e2.  It is
+# necessary in order to support musl libc.
+PATCHES=( "${FILESDIR}/${P}-int64_t.patch" )
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index b9569ca37deb..e902d8dfb368 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b0
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B d569562f6203d2ec131f7082063305e07a0c92807e81ae3641f1a8f61a9bdd0051803cd1b30eaa5a9bfd5f31ff06bc5b68831913c2526469c2393fbc4971f929 SHA512 77a66921f7aba5b1badc9739ff8de3356654be97f2ad1cd9af8313945d55e3de4df4b08830cad5d8110591713414eea340ee2b53567da11933dbccf26bb4605d
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 974 BLAKE2B 9611f3e60d003c259632df0b0ca2ed3f650d4e6b4dce86496463d14ca0ca27e72e6dd91e0e3e9517c2b12af9ee9ec16154868692feab38f28269295f749d2b12 SHA512 bebf993b3b9198f3bb30572e00fb65237ea7a45c0ab2f8e77f8ac1f4c003c61f502346017a377be90ea8eca8a3202ab05fc5311375ba6c8576e0ed71b8fd796f
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 981 BLAKE2B 998db28a854065c2084713fbb5263a249f878f77c6da7396ab4cd199fff1afc8e21ee68d5e2d7a4ca2bdc1ecdbe19919e8fa3eefb3b8f944e153e893be0226eb SHA512 2cc5d3cf9a016cc269e824b543c56e707253b2389b2e634d23a19003efb5f16ea1917d5d1e44205e5c459d2f9337723b130153d052701086d29a19477a21874d
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 978 BLAKE2B aa6a640ee2dcf969a7ad76551acfd5636926f82db581667101eb089cfa1c70a751599e61671d2e9068975da142a281d367fe327ee3a9b10844bd05abc4e9dfd4 SHA512 e6bf6aef77e4efe72ff289ab2d59d10b82f1c0f55164bd0f86c1fae07a788505f4e8482c8e84434c0f9e8013e742573d41e35c7cdb5efe4ab2a7ec3831a5d756
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index fefe91d6422c..4cca37b449ef 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 3529631b36b5..4139607e4855 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
-EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 723 BLAKE2B 0c7b78883a009a68a1eaea96c991fb18b371e9f80d80d7fdd55bfd96649c621430621d3f49da6e6b1863d0c2f7070fe7cf5e9d67d0ea2f601fbca69b3767f98b SHA512 f881d11fae80929d77e36b0f7c010b69f337b27851940e16b38bed71fef65b55bf37cad66e7934c03038fdf25ee56a397d050e48ce96d6da2f2bc82f36dc16be
+EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 721 BLAKE2B caa40b0eb37deea64593fb27d9accdac6ae55487acbae95b70a4f11d8b57a4075a02fb544f3bc4506ffb08b02ee73c585f23b3c9efd717900d1172d04137eda3 SHA512 d0e97116e83bc2b29f34bd8a8c37bf0d81894319af52c44dbbfbf15433c7af357e9df331d30f0fb7254b115e4bc3da2dc885df22d68be9924335b36f9dabe228
 MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index 0944f98dc881..c5facfb44a4a 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 15b616e44945..ad2af25cfc16 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
-EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 739 BLAKE2B 494af453d9c1dc4b06b043e69b799a4c97d48f788fc773fa3306d43939f169f3159a96b0f41136c4b6569b718896096052a6624c1baaf3198886f39bbc75770a SHA512 1be436abe7291d175a92536172a08688451123d19a6ab58838124dbe157d05c2f802b0a6e96b1eb52264feb8a78e965c4ef39a8653eaf0914a11aa16fa3cb478
+EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 737 BLAKE2B 21ae9c689c59ecce4d576a2de1f2f4e2f8e815ea088796112f19c6e034ba294a5916c8bac6deeec7e2cc4ac02f665a13abd8043e26ca379fcd657f20a0cffed4 SHA512 f13841a5678e63785457a343144a13bc10cfcc98be50bdcf7b978dc9d8aa1cdcd515543008ea6cd37cae03fcc5e873296ac7feec76fca527b48dfa8e8a44606c
 MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index 3d368f94b73a..c668e13398bb 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index c3e70f69cd74..f825570818dc 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,7 +1,7 @@
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
-EBUILD libnetfilter_queue-1.0.3.ebuild 725 BLAKE2B 87fb0edadd41b0e81c38a0802032cb20548c4f6ae985f80b5126b4cb8a4352ffbf6c46d6ac515d153a42add00e06da24f3a7a8e4aea660b64210294ad947ca30 SHA512 c905e45093e9fd4218d497fb2a4e02cf7bf4c53559ed1e169d2825cd6d187a430d7b3b3c2996722f681074cdd988d5dafe93f975a1262b7d5b5cd575c1235f05
+EBUILD libnetfilter_queue-1.0.3.ebuild 723 BLAKE2B 5904b5c2c5289c1eb44a1970b08e020698c46fa7eecfb600deb3dd8fc1657cca027eddecc73b0d8abdc6de2cc0c337952a7b9c4cb3fc2dbf16add36abbd91425 SHA512 c4cd950c48d2d1d842bec72000e66ce776d39becff0e89373a68f08663c19f7aa084ebc215c99d5676842c867eea9959aa9dc174181de28b1a4631069b7ca9b5
 EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
-EBUILD libnetfilter_queue-1.0.5.ebuild 892 BLAKE2B 131ebfb7c570074c333edf31c8f6cb708bf543ed393eb8a8011722a3fadf33079758c5cd90c2f5ef5b3859de7ed534bf5f7c97f106db11aafde6791b19a35140 SHA512 e2ed77b7d7a0fec547b74f1119c00b3f073ac02454a1d06eb9aed142d1411ef89ab2b9ab60f31dd35391dba7cd18187146a8e884db5cadc7a70e1e6e40f3bac4
+EBUILD libnetfilter_queue-1.0.5.ebuild 889 BLAKE2B 7637579b2913256936a41aab2f0299cbdfcdc495ad4851e302504780490664198540347924d823fcd694906d8bde0513b7c860ccadf56df18b5dace2aad40764 SHA512 ffb3dde74a1dca128bdd020e256e54a6a104c4fe4cef68b41cc432051b453fdcfa336f23c02a9a25b771221b8a510988d23e792329a3f1582573e4b3c59746c5
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
index 0d40ed627b8d..5e97c76a1ada 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.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=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 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/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
index 4a7992f51bb4..37342c1a97ec 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 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="doc static-libs"
 
 RDEPEND="
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
index f16699730037..4a91b89f7261 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,4 +1,4 @@
 AUX libomemo-0.7.1-so-symlinks.patch 1055 BLAKE2B 9dac207e32fb339f52e25571eb3381f2486f5427857dd238f619a841b01db34c9b79708119724af7d2aad2fe5f285925e3be174350f934b166dd3a4794585052 SHA512 d7bf4c51fde4de7e478e44cbc63b8f90f2d6fc357d66ac5d8e8999f03e411257a392284944164d5dfa5388a191c1aba11b8d551c611403a026f1ed0dacdfbca6
 DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
 EBUILD libomemo-0.7.1-r2.ebuild 1086 BLAKE2B e043afbd7347e7feaeb3c868a1f6543b8666df8923a7cedbf186b50ee6099ceebc2f8952ac8b98620fd6b80e5894496129f2b6b8158b1c1bc8ff483b7c2c83d5 SHA512 ee743c91e7d90005c04804b6daada3d37ba8cec19d498eefd3feda0d721277e26dd4123a8ed4a0a4fbde8b884cf50533bffdd07d4c357bb4831c690285008ad4
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libomemo/metadata.xml b/net-libs/libomemo/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/net-libs/libomemo/metadata.xml
+++ b/net-libs/libomemo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 6bda10cf8427..a461f8e8245a 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,4 +4,4 @@ AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684
 DIST libpcap-1.10.0.tar.gz 920263 BLAKE2B 40b9f3562161dbdd30065757ae045bc3b6447a954dd3019e932cdc9c794e0f47e8eb0480144bfd7765122a3efa750caa0c77abbb98ce29ad79a84ceaedcb9e3f SHA512 d77f05aff76aefbd280e5e24eb4a23b6f3b31c9aacff77d556259325273083f185c451b7ad40b57ac63c9114510e8f768fb99907b1ee54fa95b80f21d7d6500f
 EBUILD libpcap-1.10.0.ebuild 1941 BLAKE2B 80cfa66cd7b10758d36518de9f0ebd262c3a5a610e20a591b7e133dbb7f2461e100d5510223194b95252e777b46d3c108c216768cf27d9c1e63fd9591b87018e SHA512 c844e8cfd6d14cf9e8a8e0bc9ec23e232d1bbdd51ea26e3723acd259fe0a57cc9f518de09061a44e4f049118a231c8a44a9f346a3cc190b4146c0789d5f3988e
 EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
-MISC metadata.xml 918 BLAKE2B de742c2edb2a5fd038af02915ca47d8ff7596072eae68a9945a0d68acfe95fb01eb4c36659d5be1412323db841c7aa64f61eefa8e246e9b7376c72b374dbe025 SHA512 6e8e268de4c7c6280052cb4841e4d496a8ccd9b7c29f992d5afd5492cf84f3bf5a259d3036557015a1c6fe5445bb8f92a7b63d72412d52850aec02c59d8e62b7
+MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 029fd0d8d91a..94f6a1aa9f04 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 0692fc2dd120..d288aa4ddf0a 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -3,4 +3,4 @@ AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e70
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
 EBUILD libpri-1.6.0.ebuild 746 BLAKE2B 028f857458573225c5eddb50f1db4c42b3a1b922087de1fcd1fc91fb1fb3c4555cc3998db1ae4cb8152421a211c62f0d6d873f533c5f544a08520c0d55d3514f SHA512 12792947d821171592025f5d252c1ee76a04c7c8895bb243372a11142cd60d266c6b856d70b2de42ff7f8ffcb4482c247ffef4ee9d79c3ed003d528042502b64
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/net-libs/libpri/metadata.xml
+++ b/net-libs/libpri/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 81c4f2ff977e..b887b92a5a60 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,3 +1,3 @@
 DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
 EBUILD librsync-2.3.1.ebuild 593 BLAKE2B 1a232ba68df36f9b079768694f54199b20ad7299aa1b2c94f5a24fee39659bf4dc431cac6d3237bcd1bc3c185fb404dcde5e1048537b9451cfb68d8b483f9b2b SHA512 19af315973863969b89207fbd0914815f149e8fbfa8f5154c161c19e7fcd8dd138d08ff4e885b6d0e369e410454bdecf95712a7404a53a457204372fe1167547
-MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
+MISC metadata.xml 387 BLAKE2B ddd9f98cc4a0e9974d3a3dfc0ea802f6821e4dd2d86705a8541ca2a85d0185396d2a70b44588bde7761244ab3654036c22d06c21f4e3b3cb76a29a3898d22dc6 SHA512 0c4185c4f98435361d1ee075718f7a8a5b9945087b56294add0813c9b5e3a69d88ffe98bb52ac23529aa4ffc44068eafa26d6ef59759ae50d52962dc129b992c
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
index 1e2beb3263f6..b008328a13f1 100644
--- a/net-libs/librsync/metadata.xml
+++ b/net-libs/librsync/metadata.xml
@@ -10,4 +10,3 @@
 		<remote-id type="github">librsync/librsync</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 709886fc1bac..153802f76cec 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
-MISC metadata.xml 449 BLAKE2B 20e3552f9422b0bea67bed6a15bc66dd739931501097697257c75504c1e00084e87786abfa2a2887a6d311c9c9be4c82a6f3c47e989576b072153659e4a4a2ad SHA512 8497980e6954b1a59c8e5e5f3372d3138cc8d842f875b1f6ceab1665708a884beba57f68459c561140c15e056aefbfc80c4aaab19161ed857e144a4973dedc9f
+MISC metadata.xml 479 BLAKE2B 52ef362ca8291b0f9cb820c002588448a8db2b68b41a495e9ef4ad6303fb523bc599a94fa8e786d9270cb6920b64011c2a965208d2eaf8e18ca56c5912d2409c SHA512 eeff06104b2ed7fd648c0943149296448ac37123be3bdbfb93f6f63703b18637680220b5d284b7d9679e46e3fd742bbeed93ad55f60ce28f03ae6cb25ffd4aa8
diff --git a/net-libs/libsearpc/metadata.xml b/net-libs/libsearpc/metadata.xml
index 836248a20a72..cd69d4c1961c 100644
--- a/net-libs/libsearpc/metadata.xml
+++ b/net-libs/libsearpc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 34ba6fa0ac83..b0d1872650c6 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -3,4 +3,4 @@ DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf
 EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
 EBUILD libsignal-protocol-c-2.3.3.ebuild 346 BLAKE2B cfa3bb04e96f7fb558250e8c97da2dfcc5d066370aefd966e734303531e9527a8772365cfd593f904547f5d16ca98268f537fb14f45032fcf677f5fb4817dd3b SHA512 e1153a01732b51c103d8efc23ca49c2bc2292ed64d7d9fe04e8c65819a211a6f35f42e7b4ea971a503a5cc85c6803d45c2a828e266052ff6bbdc2df6d186c57a
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
-MISC metadata.xml 740 BLAKE2B f0179790b4d118bc0a9369431074708efb99d161d97d3e98ed2f252139953bfb834a2dae63143c9a9e62c83f95f3fe8892459376ccef707bde55268b4d62922d SHA512 6f0f82197130b9146ee4df23f88ee94881770f068b7e254612742eaee6c8bf175e1f154c5d1479ea52f962bbf1e79fa0ae1a29163b40e07462eb73294d1b5f9b
+MISC metadata.xml 770 BLAKE2B 65db07a551ff26d3614ebae5a0e4b8e97604c6c13ab0cb8960ca7f8581d82f6f2499fd46c9d960818e97ea643623110b9d240aef6a63ff47a1b0c93ffcb5867a SHA512 dbb689d655beae2083807d13536267beefb76d0746c5f885446c3786eeb08f027e65c3a3d91b96d7b01e253c45ee81c26fbc32c9c318a1619dddd8e733923104
diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml
index 3dab7e8a5702..8da4070ee4b2 100644
--- a/net-libs/libsignal-protocol-c/metadata.xml
+++ b/net-libs/libsignal-protocol-c/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>william@wstrm.dev</email>
 		<name>William Wennerström</name>
 	</maintainer>
diff --git a/net-libs/libsrsirc/Manifest b/net-libs/libsrsirc/Manifest
index dcf41077d2b0..2f6b3f7ce309 100644
--- a/net-libs/libsrsirc/Manifest
+++ b/net-libs/libsrsirc/Manifest
@@ -1,3 +1,3 @@
 DIST libsrsirc-0.0.14.tar.gz 431916 BLAKE2B c588c14906e9cd76c95d6f5cf2fb63444836c3e1d6599a8976b1922f1eff2f2d9fb45334e658460f657eece04b441e9980879ca153ff06c54a9355d16f2a6c35 SHA512 cc529f3ab6817cf8c87a24ed5f33b7ffdddd4a9c38f66dcb6be0ba9b0b2090861d1ca9232c7b217d20560dfc1361ada92b6a68e5157689ed37f1baeadb2ab767
 EBUILD libsrsirc-0.0.14-r1.ebuild 589 BLAKE2B 194254b10612d513c812fa4f25c77381a93033d9747490ef719c22665d9ca1ebf4c8ce95279ff2cdeefd6e8d03e22402bec44c8200290140858b58c420041253 SHA512 46ed35810b7c678a348b9f56968fb996ced6301b27d01d6f0a374fd103839977aa8fd64141cf99b570f01a01f5dc5c73c42abffe3ef9a95d8f873c3255058374
-MISC metadata.xml 443 BLAKE2B 4d4ab6dae6aafe49c509b6e42c45310e32511dbc54a2e02deb101e5050272ba3a8cdf2e725eaa64c767ab56e8d4cfbeda710f029b03b5e6fd2d8f7ebd83d7928 SHA512 7f307306b6a495e6eada4a9beebeda909823a724e274311a6d05dc19a1986495f80bb0c2846e3eb239b97fe88086b8e0552d68ed5ee54c5b3cbdbe4bb37ac0b0
+MISC metadata.xml 473 BLAKE2B df5e340c8d44b8a0e4f1c380bfee3f29afed8948a233e6afbbb2f5df5f23112198a161102c3ce41c9ebdd732eb7e305ec8843d02021f0e194ccbfa66e97ef3c0 SHA512 ec080bfde2cca64c4f0b604be018a565cb7e7ad07c5e9f704ae6dbb3a1ee1c02a1f166ce72767686f98abc547b3c962e62b497902f990ef85d6874a9de1620b3
diff --git a/net-libs/libsrsirc/metadata.xml b/net-libs/libsrsirc/metadata.xml
index 5c6e5895bd2b..e25b1cb58748 100644
--- a/net-libs/libsrsirc/metadata.xml
+++ b/net-libs/libsrsirc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>learath2@gmail.com</email>
 		<name>Emir Marincic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 25e845d98620..a3cad98ea1a5 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -11,7 +11,7 @@ AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aec
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
-EBUILD libsrtp-1.6.0-r1.ebuild 2389 BLAKE2B d51d6d4d616597b53740aca43f4d91b796de4c65ca44a4b56821b5b53d826fe4eb1c4b583124f1cbdd7b6563dff4cd38ab44bb2f62ca1899817c837aa4de3568 SHA512 91c84e2323ad56c00df5ed6ad65038103aaf28e48a8e6becd9be0e7b588f6bee8d4469c2339d77695a9ffc02675c03d81aea0bf2db00e1c14cbebc2da7d4935d
+EBUILD libsrtp-1.6.0-r1.ebuild 2418 BLAKE2B 4f10d51c2ce35e3acfc6ecbbb0306fb8de3d884d0d0bcd9f6f4b17773c3da230d5ad7e5f3f1497239af68c821d56d06abac9eff218579577a464040d625db472 SHA512 2fa5a440335eb77b6d710a915206a9d08057f6ce30954e72e08dfa9f1960417c15d2dbe207a094192ea14ee7bd99b904726487e3075dd1483a2669bbbaea1a40
 EBUILD libsrtp-2.2.0.ebuild 1889 BLAKE2B e5b613f586a049a0f5ca1e16de374ed9fdb128ff7daeed843f00372b71bed1c04e56b62a9a986bddc514035eba9f2bda9138be0b3e5b0723fd6e8906b3fff369 SHA512 76ebeaa5821be19493463e4394c6dfdef875bd402015aabc2c3cab3d30456a95073022f6bf115a4b7dc0fb8730d3822b7b487069cbd26316f22b1649ebeb24ba
 EBUILD libsrtp-2.3.0-r1.ebuild 2038 BLAKE2B d64080511829e0db6ddbb5412f2aa286ea3e288614e697863d230455d2463a096493525f358284c1cddf12cbdf7ad93bbc8c1130734cf9ab4354f7099da05d5f SHA512 275f2d9b621ac649d45d944388b382fc60b62abd57ec1e5302914e6ae0e74301d99fdb3ad3e9b397b604cd873b188c052808a7d07dd5a7504ff8141fbc845aba
 MISC metadata.xml 837 BLAKE2B f256f76392707dd326a4640809e9333d5ac89d2d7da768b3d630d6c78ed3f873ff8d9060463c07561d9da810088b7f6cc766038192ec995486de08c421e1dded SHA512 ba6fd1852b9b226f2a418670df78c75e0a8bb509b23a0a4cc9b806daa82f4f6f0af4624a13f2788931ec758635549df31a0b2c2d6588388695523a7d511fd055
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 7f54938f6081..2ae2c38e274f 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -45,6 +45,7 @@ src_prepare() {
 
 	mv configure.in configure.ac || die
 	eautoreconf
+	touch ar-lib || die #775680
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index e64ed80e8507..ec53878846e4 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -7,5 +7,5 @@ DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a400
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 EBUILD libtorrent-0.13.7-r1.ebuild 2009 BLAKE2B fceeb5be7ca37af96e8966e70d334caa1196b593729fad4cb71cbf62365852ae1b8a02f3cc94c861e7755770da87e295a9aad9f11d86bf885087503585da7b53 SHA512 63a67a220bcdff9cb6e00868b9d690015f31d1fbe7c180065932a23ec9b62ebfc187260d836ca7b2ee941f09ba41f5217ed12819b37fe25bf4e97b2998b81562
 EBUILD libtorrent-0.13.7.ebuild 1873 BLAKE2B 37d41ca5ab236f80046e85c9e03a7d8d0ed44646068e053c1d72469aa9494b42861d37e597c7b5742810a5d57d7c77cb850ccafa23f917aed48636cd1e9b31b3 SHA512 7df4060143925e046ca628713ca901f32d8f32b9d144d5f3ce52a1a067fa3a367f817ede800407e80957c426b6f918ea8fdf414755f48158fc0b8a5da05058be
-EBUILD libtorrent-0.13.8.ebuild 1723 BLAKE2B 6874b713bd8b9071a2621f2fce528ee1bb9d5b324fd77cee33f3b091c56a5c1768f6e3e95bcfb888661ecf70c11061f886029fc5a7bde166a45ffe039e3a2d4a SHA512 cfec5aad4df8c79527070f4d91b600d1fc0df6fb05f71cac1bd225e83ef8ca392c6c3157c286fa525624b693b349aa2c8f221a16dd59860c32dae24ebc5d2fd7
-MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
+EBUILD libtorrent-0.13.8-r1.ebuild 1725 BLAKE2B b3fe8b8b7c4dc858b94ea4ce48463d504b88ba25f8b9574ed1b55f9a3540cf626320b640897f285fe86bcefcb884914caa21e6ce3064cbe825382093d1d51aa9 SHA512 8f9549c28a47b2e732add5ab15902a68bb4b6ff004fa1c6be87a0eff16a9d89a364d77bb01cb3d82ddb9ecabe693f0da562a87383b01c17098d455c7e9afe4fc
+MISC metadata.xml 457 BLAKE2B b08e4d271938f1d1ea299326655b2721d4e3f8f0e922dffcc49b1722dd0d939831fcec2bb419ddfd272c3b3c870ecde292a5873e242320424f2d1eb2ea1812b1 SHA512 ab108e50c770537a5c09a265efdd322ad2a0ba479ae3166af3df1e379961154e7b60e78c87326471f1bc5724ccaff0cf09ec9afb69958ff59b8027bec72e7552
diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
new file mode 100644
index 000000000000..44be3294c262
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.8-r1.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 toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The README says that the library ABI is not yet stable and dependencies on
+# the library should be an explicit, syncronized version until the library
+# has had more time to mature. Until it matures we should not include a soname
+# subslot.
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug libressl ssl test"
+RESTRICT="!test? ( test )"
+
+# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
+RDEPEND="
+	dev-util/cppunit:=
+	sys-libs/zlib
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	# bug 518582
+	local disable_instrumentation
+	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
+	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
+	if [[ $? -ne 0 ]]; then
+		disable_instrumentation="--disable-instrumentation"
+	fi
+
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--enable-aligned \
+		$(use_enable debug) \
+		$(use_enable ssl openssl) \
+		${disable_instrumentation} \
+		--with-posix-fallocate \
+		--with-zlib="${EROOT%/}/usr/"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}
diff --git a/net-libs/libtorrent/libtorrent-0.13.8.ebuild b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
deleted file mode 100644
index 1e5ec4094bab..000000000000
--- a/net-libs/libtorrent/libtorrent-0.13.8.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 toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-# The README says that the library ABI is not yet stable and dependencies on
-# the library should be an explicit, syncronized version until the library
-# has had more time to mature. Until it matures we should not include a soname
-# subslot.
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug libressl ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cppunit"
-# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
-
-src_configure() {
-	# bug 518582
-	local disable_instrumentation
-	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
-	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
-	if [[ $? -ne 0 ]]; then
-		disable_instrumentation="--disable-instrumentation"
-	fi
-
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--enable-aligned \
-		$(use_enable debug) \
-		$(use_enable ssl openssl) \
-		${disable_instrumentation} \
-		--with-posix-fallocate \
-		--with-zlib="${EROOT%/}/usr/"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index ab558e8f71ab..a06d9a2599aa 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ss23@ss23.geek.nz</email>
 		<name>Stephen Shkardoon</name>
 	</maintainer>
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index a5328c850cd9..6a9ba5f74c0e 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,9 +2,7 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
-DIST libtrace-4.0.14_p1.tar.gz 1891628 BLAKE2B 5c30d48b34ab98fc53419a1ec7a205ec9dd97f7d162c1ea6ffcb30246ed1dde16332936d9ea3dafa32dc7a0eb991c3b384690e5f95f3646a85456d8ff28db70a SHA512 ac9031d168656c22a6113938c91b297d78a67a03d0809443345e1501f63c68812298af2760b34ce5bfa69e8d0968185bd3b6eabb838a94130ebad22bd2ecc488
 DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
-EBUILD libtrace-4.0.14_p1.ebuild 1455 BLAKE2B d1c7326ad7d64233a467a9cc67b9b8574f129516ffd49351fcb1599ee1d157f684f39a9f31bf083180d6235747197e813509c8b88bc9f1b3e83e5bd2332d6196 SHA512 359083f3763ad856abcd374f444d79e674cb1e8ca9195e24fcba6a57fdc27a7521045ef4fa27b5d4f3bca147abbc7a4950a7ba0d88710b6b9db5c889e6ef4555
 EBUILD libtrace-4.0.15_p1.ebuild 1496 BLAKE2B 88e72d28f4b35dda288f0149ca2c889fc3c3608f2d35b033e1594ca0a46911ab1397a4634548f3e8ed2cdc89ead8e592f648a6e33c3876a19e45e3cbaf67e441 SHA512 7458355a9c04d27d4f048a20be606e7c480de502aa71c006b15ceb2790a618b642212ea488471d710b30e4daea530322256921afc573f2eb4b7ee028742dff75
 EBUILD libtrace-9999.ebuild 1421 BLAKE2B 5b1c43c2134531f0da96b1c3c190d5fb5bf9edf89d7b93ad3899b6d50d40623e785198a084c211752aa8252231b3ee5440b1cfd0a3fd54be754ba9eb3a3666f0 SHA512 6a72d1a716c1df9c62581a587bd1881f2c90e221439b195687dc6f0e103f632be365e74582db50e3aef2ac044b23f6e05d895e3c0e6fe46c6d01542f97766148
 MISC metadata.xml 524 BLAKE2B c858b58b91d8a9eaf6a9f421fc5f0cae0b449dc1a6faf817fc497348338ac2f1987660d754fbdb7d16d527ae292a3b42860e6b23f0b08f239f37d2e12ba13968 SHA512 b96b4e9453825d981235e571827231a80e3d969cd8497ef054bc0f9170f1c5b8554ca3340b454c2fe61cdafde325769870cfc7b2211149fee76ddc57e6e5e285
diff --git a/net-libs/libtrace/libtrace-4.0.14_p1.ebuild b/net-libs/libtrace/libtrace-4.0.14_p1.ebuild
deleted file mode 100644
index 9cd5b1a63f43..000000000000
--- a/net-libs/libtrace/libtrace-4.0.14_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man \
-		--without-dpdk
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r docs/doxygen/html
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 4e3ed4a85080..ec83683344b9 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,4 +2,4 @@ AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
 DIST libupnp-1.14.0.tar.gz 788668 BLAKE2B 8e77f49c6eacbaff2d4194f281f73e882d282b1af400b2d8e08111b7cb0b89305f3f06b8e0ebdf8eab35de39bcd2cd30be3ecb575d560c652e96bd7831eade40 SHA512 d7cf50e168aff2ef3ad08b4c383108d5044e4c9d2923088bb93423ee5fc555c32f0254f307cb86ea7c18197612cf2d2c6c681f82d99a6f01a68f86a21c6eecb7
 EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
-MISC metadata.xml 703 BLAKE2B d58f26b13f9fbb325262d2e1321fd1fb9ad2d5a9197d513d6be56cbca8dbf4f0d62f035fa08122c581949bfc99efe6b40f309b7ab640c3be6e254958ce161077 SHA512 138228cb53146848897306aa3a398655dd0cf8a3d52b16379de4c5a9c7e302602533e1abe4fa111bb6c870a9e5758a2f3cbb5f45e4a9b5820c6e475a08dfb6cf
+MISC metadata.xml 703 BLAKE2B 3c45d613ca370a5dffac938932461d7686e839670743ca7514ffb30c8f632baac6fbbe1fede4e9a1f0caf83808c1d0af4cf184a59763a21a0e2cab9b7e7ca20f SHA512 aabd69bc4b6182452c45172a09007369ce428307dc94dcfe397886045ceb5b302381f0ff0e7fe575fea3fb5d8979ecf5173c7fb0ed402c4045e79a7e494a963e
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index e588f8be883d..ea735c61b2f6 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index dd4559b65cb6..def655f425c3 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -2,4 +2,4 @@ AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0
 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 2143 BLAKE2B 00fa036ac6f7970c746584fabefcc6b3b2c99b30efcb8c9f559a6da2969422a4cb0b60fcef05727985d3d6824b199bb70b6030965630435b01ef92aee8d166f9 SHA512 feb1fa1c6400be6c0b3d90e456af396c18b0849d19c16002cbdfae7fb375b33c2022cf53de969f6c38e0dd0a87b0450d5144f13c6033efc5230603be7cde1388
-MISC metadata.xml 1047 BLAKE2B 28c16623c5e871d4099bc17de390cfce4b791c88884e0acdb22d31e6b05e164427d133dd22159778a50117cb41cf0008916c8dd899afa1aef03656b8adaf809e SHA512 3284ae298ac2262fd92d24aee84bee384d149ee7b6929738c0c5fab5ff41f9a1d72605bc26178339c2aec3b91b2aada2654f2daa5d495a158ea2d495d21d4927
+MISC metadata.xml 1077 BLAKE2B 8870ce3ed354e5afd05b3133c4ac69b797a93a773724252a57d7f1fbcce62e66d2f98878a9ec80a629246f9d890151b601a4064ed7473af266b1b2df4a466ea4 SHA512 3aef9425b2bd79ce7c5c8e3708c2f3d670c8bd5a3965c0e2385b1f86468f9f77ca80e213ccb7ed610556866aef87cbc47d933bf07eb4fa87762d6aa66af36b00
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index c968122e3601..126ecb93ef17 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 7748a187ad0b..154b0dbb094e 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,3 @@
 DIST libwebsockets-4.1.6.tar.gz 12912895 BLAKE2B d6b8c96b8da4c177e7c730acb13bbba63996b1817bc0e0df36923c7ad3aabb6823f852c84bef865e85ed7eac1855273527ff6e92e413bbed8576388ce2ec7e3f SHA512 b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54
 EBUILD libwebsockets-4.1.6.ebuild 2363 BLAKE2B a01a70dc472b95a632a81fbe781d560ecedcb413d65bedeb052de880f27ae02077ef7c813ff3151b8d00e8b3feea158aea05053e233c93b900dbf5d91381fa50 SHA512 698908e32c2fefc7d637420e53b228942cc8a4b46405cc27a0f31f65263d1296402f84735d23dc5b3eb8bc9b1c53def2a7248f68d97f62c623256e84b27de928
-MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
+MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 429f0474f146..6f7b1d027276 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -1,19 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luka.perkov@sartura.hr</email>
 		<name>Luka Perkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 676f00a0632b..51fae37fc640 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,3 @@
 DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
 EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
-MISC metadata.xml 326 BLAKE2B 45b056740b8b584e8b4e559a006238f1ffab67c325b7a23916bd642d3e9fee1503e165dc3477aa7b51ad1555e8e2c4e1c74b7d1b868b22c6ea96e286f4787a11 SHA512 00e03ea5ff75266886efc60fb13079cd2c0983ab0707f2002c44e7e3cbb984778f5d6341838ad7fb7ae1679fcacabfc949b9d733a4a88bc2ecb503352afe2eed
+MISC metadata.xml 326 BLAKE2B e52c1d56ed6f14dee505e8db5bfede4cb326e8a98a50df576244e8f2ce44d964449acbf00ad9bcd27f22546e1a029cfdec22919edd887a2db9e10f471f322af5 SHA512 bb91dc41fa93fae47c0ad7fa99868284e61a3d24b261cb5feb44cdcd91255744de1d860b1b98374e8d4a8ed4e931c2298c28527709f3e8c5b4bb223484edc076
diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml
index 06418dac289b..7e90f003c441 100644
--- a/net-libs/libyang/metadata.xml
+++ b/net-libs/libyang/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 79a92a76134c..3fa3223ded46 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -5,4 +5,4 @@ DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8a
 EBUILD loudmouth-1.5.3-r1.ebuild 1170 BLAKE2B 796ee7350f10ddf6f962dffc0b0514da80650e8b515208230f960353a3e8346c599f498f012e4dadac5e849ebad52a5d1addb736ffc51ec825a48ee5e8f956d2 SHA512 ebce5d4cb91189e8451f371720579ae803d21c387f5d94e0a3ca8d7406e5a7a13072ea8331eb2b42e73122a20c50e1563bc86732cb22fa5091d419162576ccc4
 EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
 EBUILD loudmouth-1.5.3-r3.ebuild 1081 BLAKE2B 432f2a710d14400adbbaa55b2c973d9e8022dedf57f8a9af4513c77647b2f281cf9d9fc7ed21f1d2c3b915e8b96beb18e109a680596e706d86beddb946a8e3ff SHA512 b18bcf635a5c63d1c91ec0a0d8c4b7bf7991ea81ac38b6afdcea969275b899b21221d496a7b0826160c05803973d246d06506132c9a7cc6c7ad20ed62b8625a5
-MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
+MISC metadata.xml 562 BLAKE2B 214d5ddad779247f92bef80b603b180982e986a752c108fc53d9483b424561477e998fa10596ea6815b004ae46732b1307ed6860cab924f9177fd32b8c95df69 SHA512 0ffaeeeec629cccdd67d9bde3191a3d5cd4ee4938efb17a7cccec37c585d1eda12c585f6c117a2161dd60c8192003424397aa6157e26e2a3869952576749abe5
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
index 6b630e38e30d..ee0d30d98bb7 100644
--- a/net-libs/loudmouth/metadata.xml
+++ b/net-libs/loudmouth/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">mcabber/loudmouth</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index af36ff3bda0e..1cde10f53c4b 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,13 @@
+DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
 DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168
 DIST mbedtls-2.16.9.tar.gz 2668396 BLAKE2B c637509e8960916bea714b0558b729bf43544d64a560b2e76beba78f8d1355e982f0112bd9e5dd5a14698fa8292d23ed0f41670b220d48d26d6b5a17884481d4 SHA512 f72538851c7a24ac14b5c153220260a49a083bfff44a52e9c1e77c51109bac779b5b4caac21f995176fe8f9d27843f3495692d6c7e9dc733cbcec896823ff0e0
 DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8
 DIST mbedtls-2.25.0.tar.gz 3994272 BLAKE2B 27a326ba08c341ed47ce280401a4b73606138aa8946fd8d8df5d084496eecc6eadf4eedd65270725a360d4b171c86cefeccb6b1515847587f0f11ed15b7dda9b SHA512 78e68dd9a2939fb9e40d796dcc2de36671c900921eac800688bfc3b5f47fda88be2eb4c7dcb34a01628983cd66323b15606ef2a29e7cbfda0d86aa3f6c948647
+DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
+EBUILD mbedtls-2.16.10.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
 EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
 EBUILD mbedtls-2.16.9.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
 EBUILD mbedtls-2.24.0.ebuild 2558 BLAKE2B 3c800e117bdf590f4b2b36ed8cfe1100bdd3e5a7f30f1c0b75d8a87df0564b9d48ac54a4004a9aa106ddac89e1d0d38889d1a12f15cdfe8dd73044431bfbeb80 SHA512 efd6824356a5fc621fcf8b6f7c0937721fe8c044a5c49bbf965ee09f339aa0cbe8b38efa2cf65e87ba7d6f8f89188a45a6df95a8a08abfe024a55ce879b87ad7
 EBUILD mbedtls-2.25.0.ebuild 2558 BLAKE2B 036a5b0e4b5e8d6058d8ce94ec66ece78eab2795e0cf6a0d9404dec7cae625fb33caa92e28084511f36b16715faa0a31454f9a26a7a634cd5b3a63c97180f491 SHA512 181843ea26633f5b89764d58954218766f93acd521659f941e5a473ed68a01cd6a1d69b6a28706cadbecb57030ff675bfd6a8fb284fe4aa133b4eb48348fe23f
+EBUILD mbedtls-2.26.0.ebuild 2564 BLAKE2B ceba3ed755c845206d9c167207b6f18206450c40f90a385ee9e0f61feba88418d6ac244b4d19bde43449ce8389b8c5cbb825013bc9baf3af8ce6a76aab7326f1 SHA512 f44df9b8e6ff0599a6701b60005d245cb3b37e50f267e6a78036b558dcff2a57f7d6a489b5e688dc2db46736e7993fb4eb1f6666a4c4abe56bdd2d3e38018462
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
new file mode 100644
index 000000000000..324eaa4202fa
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.26.0.ebuild b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
new file mode 100644
index 000000000000..c1bb84ede013
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/metadata.xml b/net-libs/metadata.xml
index 80be98ec6ff5..c90f2662abdb 100644
--- a/net-libs/metadata.xml
+++ b/net-libs/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria net-libs zawiera związane z siecią biblioteki.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index a77a6e24acd3..cd8187a33747 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -15,4 +15,4 @@ EBUILD nDPI-3.2-r1.ebuild 1750 BLAKE2B efc6ab0d48a8d5db4237d1f8b59705c9e489cfc2f
 EBUILD nDPI-3.2-r2.ebuild 1816 BLAKE2B 1ff85ae67f95fc476ee4ec7c72d68b22f5bc559ac4e791297b3daff664f7fc2c85a8e432f69e6d7e107accc5dea99183600233f65bd2f641decd40d69697208a SHA512 a014ffa4d3507fa55fadf149b832a1f02adbb3ce8b148b24c46cec186a680f2c04c7a79b78c4e5cdddbf13d3e9be68acbadd428c15a07c185e389375e6792028
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
-MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
+MISC metadata.xml 292 BLAKE2B b19942da80630c9c576f1ee8c3a6d150dcdc2fa587b10cf175d0eb440c7a2d07224d795e84dbc54647822524598399c4e483e72cd359df926fb76d2909729383 SHA512 16a16e996a75b5a2833aa6cb54df6d8ee9c643987df0addde6c21e01fdf9a6c68c804048e6fa3ea8ad583c654d786b59246b0d7c176a3e234e6de32b066dc5cd
diff --git a/net-libs/nDPI/metadata.xml b/net-libs/nDPI/metadata.xml
index fe49f07f7714..90c33da4fea6 100644
--- a/net-libs/nDPI/metadata.xml
+++ b/net-libs/nDPI/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>netmon@gentoo.org</email>
 </maintainer>
   <upstream>
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index d34d0d4d1e3d..32c7f6fe9bac 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -2,4 +2,4 @@ DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
 EBUILD nativebiginteger-0.9.47.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
 EBUILD nativebiginteger-0.9.48.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
-MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
+MISC metadata.xml 397 BLAKE2B efe84f4793a6cf028961509b2bf0d26648884712cfa1cf18a42f78eb65e4073ad03463aa2d60f9146d5b50da58f5fada3c4da78c67236d41c410627a58c03b7d SHA512 5514f5621b1267b52e458073b4dde8baa377ffb243d01649eecc7ebd5465e70d745403a904d40d6e2be08862aefdb52707fb7bd01be16b7aff77390a22cebf6c
diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
index 01c39ff1e755..acc7bfa41387 100644
--- a/net-libs/nativebiginteger/metadata.xml
+++ b/net-libs/nativebiginteger/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>tharvik@gmail.com</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index bf7d8ad8697a..54a755a6b9dd 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -6,4 +6,4 @@ EBUILD neon-0.30.2.ebuild 3354 BLAKE2B cc9d94b47c23ff1612104fde3d051a0abb132fa64
 EBUILD neon-0.31.0.ebuild 3362 BLAKE2B c1d88e0046239bdec90bccb959c5240107eb61fd1d2c04875e1e4e23cd6926eb4c41bf8312af8a89595e93419a8c3e408743541b2e5eab3d311e0c529e1460de SHA512 3aa4ba6cb571497b5a88b1d624a93debcd422a6c3c4c8767e176d624c013889123f94981af6b54461177af986798eaf4a15daf20eb2c5ed0b4ae1514888ac581
 EBUILD neon-0.31.1.ebuild 3369 BLAKE2B f1dcee1fed98319650d35b30a2e4cfe7c72cfaaffebcf2b6a277603f46b9575e72d125535f04fcb17becdb3e88e0ef7c9649ba1080094cdd3d6e2f0cc89f4ece SHA512 a62d04500dc88899125b4320613e9608614fb8afb75fe95f98f1a06a4a7b869a0965daa1c959a2779f8b7a5acc0ddacfc551d5e7093462eca9b5b8474bcd9d4e
 EBUILD neon-0.31.2.ebuild 3362 BLAKE2B 25b14a7dc2fab86fc0b0ceddb80e5495c42433b114206eed3c061e26d928736c75fbf86ff504cffc33aa71e6fc92855f86725f6c18a2430daa38713510a9e8c7 SHA512 7a797c9def0282b1bb59355a6d8104f596ed000e18e6e5f4be60c227fb958a953eb889cfb958862f1dfa1e3ad2a5f36ca71b812151d5d70dfaa6f1fb2213e8c6
-MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
+MISC metadata.xml 1412 BLAKE2B a30898edb3164bf735882010712688e13986eb5594917f5ef0218e4d47c4fd3763fe669b4cff4d271bb7344954e0265c7fc9046acaddee007e2d31eeb8ba067c SHA512 9cda985cd2262519f01691dd4a4f9b05f9d892b6a3fe204adee8c56430093dc0c96f2d3e29d4a0285dc9d24dc47b5250850d8bc342cd708b838861b6beeb8d6c
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index 4059f5b77bc9..5a4ed2c29bd3 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<longdescription>
 		Neon is an HTTP and WebDAV client library for Unix systems, with a C
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 0b39c015b73a..e03a59a43b95 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -6,10 +6,5 @@ AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082
 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
-DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
-DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
-EBUILD pjproject-2.10-r1.ebuild 3401 BLAKE2B 8b5cfd130ae21d8fd48c0365c8e4848255dd36f748552911047c53e38ca0f691bcbe13f810fd56f6310d59fb1c095aa2fb6e5dcb8c4d2ec22a24fb2c212cf69a SHA512 0ff637daf4776ba9520b8c6c7f585791336377ce2126ec757f660733ade933a8f189b405010c92909fc9c1e8c664ea6fdf5e4b438e8b56abc4ac82b27100dfe1
-EBUILD pjproject-2.10.ebuild 3159 BLAKE2B 5ece2e1494f3c116db79c04c687cee76c629d91784f8056c7056edc9989fded215464b59e4f4a93ed57433708715820ea4c475c1bcf6922134cb04b81e88ee4c SHA512 81d0eae10cff044d40fbdc2d7caa41d121ded8c7a1b29e8ab4698a724b9a73366442eb3652c7a234dd5cea65e43a8c2636ad862d8f1dc1493786489ee994570a
-EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
-EBUILD pjproject-2.9-r2.ebuild 3139 BLAKE2B a99817e6681eb3afdef894148d8f864839c92042219d7c4c7ecee832b77de2f59c0f2c2412f1508e2572ed1b0d665d304386bd9e99ee7de9e4cd34c7a085ec88 SHA512 ca61e9530f5a5ce630aa31b1d077236a9fb565bb9c70ab0171f3663a2ad7a2813e967c1581e07b0f18945587c34da061aae6504e390b2b472c9e58775b913621
-MISC metadata.xml 1348 BLAKE2B ddf0fa47ffb1701bf95f3d51d04acecfdc16980a810f5af577d9cc8a31ebed5516a95e7fa6257a0c35af7fddd391da51aefa461561e48c13af4e143e7e4d2b84 SHA512 0fd1c947edacc7a5cbf615d2afb8830d7e223a493a26b18814f9bdabf7216bf2737350f7b6ba69589852df5ee409256b60dd0e8c93f81eb696d5e2d94504d535
+EBUILD pjproject-2.10-r1.ebuild 3400 BLAKE2B 154dce797a2c385d03bcfe2523fadf2f56090d58030fe1491a61ac59a2303c2a734672e33d38aa762cf3dc4e8a8283f128f7e7f78a59f78d10f2e2467f315afc SHA512 0622ae407be23b903aec10a388e1a9b3007443427c464c15144145c06593d82d29635c17b4925514fd6cb19e1fc6d6ad6fdfc2e37643129cfdbc074678842c44
+MISC metadata.xml 1378 BLAKE2B f5445d873e1167362e054d6010d68e515a237481f64ef50bbc18d7bdaf338fea6f5620297ce165c6ad79022ae0a60665d120dad5fffce44f71f7861acf2af878 SHA512 c76ce7cc7885daa1462cb707cc15d8f6ce385db25bd0358ec4ffc7c02134ebebe27c69d20eaa2923cf834863359453593bf52b89315ae5a8386c9fcdafcbb7d6
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index ebb6d87617b4..12a42585bb4a 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index ec03d01c4a60..8552abb9dafe 100644
--- a/net-libs/pjproject/pjproject-2.10-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10.ebuild
deleted file mode 100644
index f2e015618ea8..000000000000
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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"
-
-# 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 libressl opus resample silk ssl static-libs webrtc
-	${CODEC_FLAGS} g729
-	${VIDEO_FLAGS}
-	${SOUND_FLAGS}"
-
-PATCHES=(
-	"${FILESDIR}/pjproject-2.9-ssl-enable.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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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/pjproject/pjproject-2.7.2-r2.ebuild b/net-libs/pjproject/pjproject-2.7.2-r2.ebuild
deleted file mode 100644
index ec4e011b9c83..000000000000
--- a/net-libs/pjproject/pjproject-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://www.pjsip.org/"
-SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
-SOUND_FLAGS="alsa oss portaudio"
-IUSE="amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ssl-flipflop.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	oss? ( media-libs/portaudio[oss] )
-	portaudio? ( media-libs/portaudio )
-
-	amr? ( media-libs/opencore-amr )
-	gsm? ( media-sound/gsm )
-	ilbc? ( media-libs/libilbc )
-	opus? ( media-libs/opus )
-	speex? ( media-libs/speexdsp )
-
-	ffmpeg? ( media-video/ffmpeg:= )
-	sdl? ( media-libs/libsdl )
-	openh264? ( media-libs/openh264 )
-	resample? ( media-libs/libsamplerate )
-
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-
-	net-libs/libsrtp:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!!media-plugins/mediastreamer-bcg729"
-
-REQUIRED_USE="?? ( ${SOUND_FLAGS} )"
-
-src_prepare() {
-	default
-	rm configure || die "Unable to remove unwanted wrapper"
-	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	local videnable="--disable-video"
-	local t
-
-	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
-	use debug || append-cflags -DNDEBUG=1
-
-	for t in ${CODEC_FLAGS}; do
-		myconf+=( $(use_enable ${t} ${t}-codec) )
-	done
-
-	for t in ${VIDEO_FLAGS}; do
-		myconf+=( $(use_enable ${t}) )
-		use "${t}" && videnable="--enable-video"
-	done
-
-	econf \
-		--enable-shared \
-		--with-external-srtp \
-		${videnable} \
-		$(use_enable epoll) \
-		$(use_with gsm external-gsm) \
-		$(use_with speex external-speex) \
-		$(use_enable speex speex-aec) \
-		$(use_enable resample) \
-		$(use_enable resample libsamplerate) \
-		$(use_enable resample resample-dll) \
-		$(use_enable alsa sound) \
-		$(use_enable oss) \
-		$(use_with portaudio external-pa) \
-		$(use_enable portaudio ext-sound) \
-		$(use_enable amr opencore-amr) \
-		$(use_enable silk) \
-		$(use_enable opus) \
-		$(use_enable ssl) \
-		$(use_enable webrtc libwebrtc) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake dep
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		dodoc README.txt README-RTEMS
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r pjsip-apps/src/samples
-	fi
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/*.a"
-}
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild
deleted file mode 100644
index 74665390b360..000000000000
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://www.pjsip.org/"
-SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# g729 not included due to special bcg729 handling.
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
-SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc
-	${CODEC_FLAGS} g729
-	${VIDEO_FLAGS}
-	${SOUND_FLAGS}"
-
-PATCHES=(
-	"${FILESDIR}/pjproject-2.9-ssl-enable.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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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/quiche/Manifest b/net-libs/quiche/Manifest
index 6332dffb1b18..afc6f4220fb3 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -166,4 +166,4 @@ EBUILD quiche-0.5.1.ebuild 3902 BLAKE2B ddf0e620c3cee6e8d1e952881cf400168558634c
 EBUILD quiche-0.6.0.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
 EBUILD quiche-0.7.0.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
 EBUILD quiche-9999.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
-MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
+MISC metadata.xml 330 BLAKE2B e12c1bf76513869cc73d66a8961ad15bf1776b21d83c772d7478f0c383fa7b4fa7e64558514c922f8c358c78d165899fb5a051281e78d90a330769bf52d32673 SHA512 b41d3bd1bccdce6aaf16d55cef25b2b5232068bfc9c633edf8cf23f95a06dd99de59e2353c700d3ad46085d4e5ec220960bec91fcac674b92200f342d7eb6d29
diff --git a/net-libs/quiche/metadata.xml b/net-libs/quiche/metadata.xml
index 0ba1641c2815..2aea375b0be2 100644
--- a/net-libs/quiche/metadata.xml
+++ b/net-libs/quiche/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 4e50439c6267..4e846277a223 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,4 @@
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
 EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
-MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
+MISC metadata.xml 740 BLAKE2B 1e3768ea74d58751d412023ca0b03a30b56f3e8e9182ab2529235f14fc6c78ce8883734f1b8453ae8c747f97a6a9437d3ebe49a815f3f18faded699592639323 SHA512 deaf8ea5ecb7bbe774b73838bf3a2aed915c0a1b7ba0bc128e1cab50e6bcc51afda3a6b056ea70dc51fd25ac0bddd3ad98939df5e0ab6b35be5f19969e51960b
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 6fdcab97b78b..5e5478ca126b 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>0xd34df00d@gmail.com</email>
 		<name>Georg Rudoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 6284e7f06e42..dd9301df0542 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -6,4 +6,4 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.9-r2.ebuild 2124 BLAKE2B e0b90c21469379382894f4d3f5177f8e5d27a0e10b81d9a1d533d83738be26a89bbe7af4891fef99becf0e8baae294620793751716be58abcb59bf9d6ed28b17 SHA512 4bc62a8529a688ce3ec2f54d0f5153a437ab91e566883fd22ba7b872f279f031627f866cb23a6f9901287700218b4236d45f8f50cf5e55c00d6932eab9e1893d
-MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
+MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index ca82cfff518d..f51c2847f1a6 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index b50e14fe4231..0ebaac5c9276 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,5 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
+DIST telepathy-glib-0.24.2.tar.gz 3855853 BLAKE2B b98701e4897da5f1e1791af1d36f0f8e98fc0a043406a2e1e6c56437acfc7ed83701163a8c30d1ec2506cea4ca9a64827fca96ea0c3ea1566d38519b63a3a201 SHA512 736590c299b6522c41153e01e80d9bfdac1d4cbec646b28c9fba67a07429426ff2c8e38818f2cddd7ccdc38a061d210906f6e551f7a6059c34c4dd08b789b501
 EBUILD telepathy-glib-0.24.1-r1.ebuild 1485 BLAKE2B e4b0f770650990f395a054dc38f12577c0596bbd961b28a7c8497a0289b0bd4189628871b7023f2f4e4cee183043f38adad02adb0b9a287803e7ecec1b53eac6 SHA512 7580ea748edd3acf6694d2512f6460b49ea555be6979ff9838d0dd1c567d0207f9b963cb37275145c39c349096767f32812d066d8161881d2a3decfca59ff090
+EBUILD telepathy-glib-0.24.2.ebuild 1505 BLAKE2B add3cb97fa6552330707d03756e4ef466e0eecd9fb58cb956ad29098a3fe53d8ef9c07083140bd226c5e5886160414c95c2ffe831deaa711dccb097fba29ceba SHA512 bcb6a5d6dc526368f4bd20bd4492295613cdc5f13b90006490badac767cb418c611bcbe10b228b7cf11aa0df4673de81dd5d9b0b77288ae247e94109fac2df96
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
new file mode 100644
index 000000000000..3d51fb532d10
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2.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=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Broken for a long time and upstream doesn't care
+# https://bugs.freedesktop.org/show_bug.cgi?id=63212
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/dbus-glib-0.90
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# See bug 504744 for reference
+PDEPEND="
+	net-im/telepathy-mission-control
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-installed-tests \
+		$(use_enable debug backtrace) \
+		$(use_enable debug debug-cache) \
+		$(use_enable introspection) \
+		$(use_enable vala vala-bindings)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Needs dbus for tests (auto-launched)
+	virtx emake -j1 check
+}
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 637f136e61a8..1cd7bfebebed 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
 EBUILD telepathy-qt-0.9.8.ebuild 1499 BLAKE2B 252bf6b5605ef94bcaa73fb4332dbac0ba0df7c53dcfa00c0405f31dd81e5eda0782980e39087b24f94a0dba428f8cfa62afcd7a8ce1ea97725a18a39c1ceae3 SHA512 8c087768748fbf850aaf329d1e5cd9f01853b51192af3f8a277d63338cb61e2433d65fa00612472d8c7bf9bcba4fa9cd0007be79443d36c99c2de78207ae1237
 EBUILD telepathy-qt-9999.ebuild 1627 BLAKE2B 21e0e67988be4f7b0153bf2e962fc0dcb9ff69076251378dafada132c644cb9872daba6e444e9a6e58e54cd7558ba6ba43f6e655e8aa29f93068b7982bc376e3 SHA512 110672733565f9ca45f1f728cbb9686b7ec616b2d2b922ecfd6c9aabda52604adaf8f8ab2b569a9970d60f41c21ccb562acd94d463247848f9a5dedb37aa3138
-MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
+MISC metadata.xml 721 BLAKE2B 38acf6a26b1b60a789143ebd8c40a062af02a8d16714117996e1d0bae950e34174bb089c6f376b25bd88e42d9d2337cbb91e83c8f216c1b4f20a86c7fa0523ac SHA512 5a0c2e871dd0a4a42f6fef41a3b437fd6c35d399bc1b8cd3ac6d0cd527b01fc86dbb691927611a846365176e8f6285a7772f875fd4550f33498b4bbb31b738fc
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 8fa742dcd546..e01884f83a26 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>akulichalexander@gmail.com</email>
 		<name>Alexandr Akulich</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 0617074d468f..db14a6b90f5a 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -7,4 +7,4 @@ DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1
 EBUILD tox-0.2.11-r1.ebuild 3223 BLAKE2B fddaa170b391fb67b8eac614c602487cf71a000e0437d3b87826499f268e5d410ee7239ab12f7b0b2acb7bc5c88a60e3daf7c694572fb2ba47167b4cc73cc005 SHA512 f0e18ffec3d23b9bc6c9a143aa0f3c666dd4cb791cc9303bc92e6a6160dabbdf8972af4cf517f3fce5e24344f5c4e0b057a2edc06b0d0b234fee6858a907d1be
 EBUILD tox-0.2.12-r1.ebuild 2907 BLAKE2B 917c21eb2e5db46f661cbacac527f034480818394f6f21ce03c3c4d7e94c8b6b830c461a15230fef4ef16dab91e9ea0e27ee62d1d141b39a5a76c6ee03a1bc05 SHA512 4d8e8680868a0190ba5ea0e926d8cd3ce192a2cf55293586df39e37b7d066ee8fa1fb76c008a72ad9610c6091b93ceab5caedf76d642245b431c59ac80c4444b
 EBUILD tox-9999.ebuild 2719 BLAKE2B cee3819c949279bc5003f53772161c4606a339918050c5f11ede33e75a38fff8c045d07aba94a20ed8514c9a438a64966c9944aefbafd51b7407d3eadef86b3d SHA512 bb32c733c7daed2f65061d46935d53b5683cf81a771d538ee642902665402fa3a1a24dd547e7203b492982f407e672ebc3f036f7fb9deeea0d6ebdd877e09166
-MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
+MISC metadata.xml 900 BLAKE2B d0c1969039265915fd04e0638218706c4f1fe2eef0e7a7cb0c16dcb5090dcae18719d9cd56bf4d67afcfe2b4c49449afe53b32107ac609fc561f1140462f49e4 SHA512 d0ed83f52ed7ac841852645eaaaca4a8bf9a84ce56d5e2bf12c6f71a938881a94234b6716a4f1e9ceb2ce1e154912f28e2d6cad23913335dc1a89f7cb8057bef
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index bfbb95186f12..1f2f21475795 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>JoMull01@protonmail.com</email>
 		<name>Josiah Mullins</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 272d79a79013..7ae234a65caa 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,5 @@
 DIST uhttpmock-0.5.1.tar.xz 310976 BLAKE2B a7aa609d853a8593461aaaed0074532bc7df1d43638c720694a558cd4eefac14b140f79025cbf7ca9a93ad41cfecfa7728eb049e52d514edda7267389f4d8097 SHA512 99135c0983be78eaaf962e5b182eaaf921e1d6ed30f98691d8766e9d4a9e07188965ce3f546a13a8c32b148bad305083cc3cfdf48d9a8b91efffaec5a46d8006
+DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
 EBUILD uhttpmock-0.5.1.ebuild 915 BLAKE2B 48c1eb00fb734997868d194ac3ec75ee612c86b3ba8ed7f5bb7bbb888b1957c6a54086d24b9b9830d2fc778b30ad527127f58ad51526ce557fe9513af45a302b SHA512 a2bbc10217be73974cba2bb220dbc5c28384a21b06454cc7893b7cc444ceff57cf41542c3a83b9ba57e3952419bb739e1aed9cd52fc0fb9fd44b4aeefadac327
+EBUILD uhttpmock-0.5.3.ebuild 943 BLAKE2B e7a45e05c169c33798f527e029cb758a1c06b71b5f80ba4119e7d1fcbac589b4271cb848cfcd8bbcf920610c86bce269f843ea1a16b276797fc641b1c02a4d13 SHA512 463a0c7d39e392b8a8317933524d25dfb57de1cdc1baeea5f4904d000e64f1e31011c8b8902ab2d3bd9cdda8496e4fc0d0172db0df0776af1f3a033473218d38
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
new file mode 100644
index 000000000000..d8184154dea5
--- /dev/null
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.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 gnome2 vala
+
+DESCRIPTION="HTTP web service mocking library"
+HOMEPAGE="https://gitlab.com/uhttpmock/uhttpmock"
+SRC_URI="http://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="debug +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2
+	>=net-libs/libsoup-2.37.91:2.4
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest
index 93a8a872f039..3f8f535a94d6 100644
--- a/net-libs/usrsctp/Manifest
+++ b/net-libs/usrsctp/Manifest
@@ -1,3 +1,3 @@
 DIST usrsctp-0.9.3.0_p20201102.tar.gz 770742 BLAKE2B 94c7b0417a076d627065c625726eb214ec58be90d0965748610f63c076f1c172cb114dc8162af5604751cfe5e86ebf5444f002d07e43c94e461e21f6a3a4819a SHA512 a4bb4dd0ec81b2314e8590cfe5386179697e64d82915a0ef7e8f7a0baf67f88e3da89329ea73b38e8c417668f971f6580e120ed5be8588761b4b334a65ab4120
 EBUILD usrsctp-0.9.3.0_p20201102.ebuild 640 BLAKE2B 7d2ea129e798ba74f2ea6d7c42cfca30c547f98cd3e67882589c679c7267f748719370c423582dbe950da131a51fa4d32bc525d4c97d509b84b23ce28005132e SHA512 9279d6e369cce5d3dc980aa96c92f96fde8357a20ead93c3e3d8a5f3f9ce2d9553e1368b43bef497a74bf5bf32340b4982d97bcf66743b127816ac4f2447f3a3
-MISC metadata.xml 444 BLAKE2B 94ebd1b5ae52b5af59e7b1ff5596001b1103a3d4d34cac46da1269604e3de2898cdd19680757b862657526800845bbf15cd8e7b98659cf8d48e4cd0ebe723217 SHA512 e18d2cafa5ce0e2860f3097e79ac84d66289cbb55a6b9e8649747921a6004e7d6306dd32df9b633edf847ee49476708b27f77b38f6708715cb3848b3ee2774f3
+MISC metadata.xml 474 BLAKE2B 1e3008d0e7511e7650e5193bf0c43e97ac056ba325d45a7938f4c9616514c82a62047870658a36c06a24b53d17a51908b8ea7d958f8514691867b4bc6467910f SHA512 a4677b4ae4fd2d28b38037605100fad92be2d7927319bb3caafa54cc0ee15ef76f9d4376b098d56bb1bb4582b14860f28a2efff9c38a72c7b7822f58e2a8ddd2
diff --git a/net-libs/usrsctp/metadata.xml b/net-libs/usrsctp/metadata.xml
index fb02cc43963d..a379bb00a1b2 100644
--- a/net-libs/usrsctp/metadata.xml
+++ b/net-libs/usrsctp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 7964cacad6ae..0606bf8e1117 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 0c2dcd1822ac..23dfd3558517 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -5,4 +5,4 @@ DIST automx2-2021.0.tar.bz2 50912 BLAKE2B de6fe1ea6dd5223518683220ff1210baa68c30
 DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
 EBUILD automx2-2021.0.ebuild 1082 BLAKE2B 42f2ba0ea10140ce614c0143e25d23f6ad3887aaa69c088c83cc37d2f5018b722992bb4ed58ec8c321f848401c56011c0abf9f72e57bf149322b9d762bf30616 SHA512 bf48dede575b1d0c1514006e3d708e9e25233c086608735e38fbb33d1745825d854df44cdba3dd96aaa71563fb78d27642e0d393381eefef51ea8f06041f7c74
 EBUILD automx2-2021.2.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
-MISC metadata.xml 916 BLAKE2B 089615c8e6217368ffd85839d31792122f7b65e53ba286b704998258d82cbd43861291fd4b9b94b482173080f1b6d964b9c833935c5340445493404cea25a4aa SHA512 f0d1df0d663056e9389138c3481cfac3c25d924018f171d078f93791fc1fe349c46948224a37fa6b861eaa011abf222f09091dd58763b578d88a45d967eedc23
+MISC metadata.xml 911 BLAKE2B 165f90e9c2fba4a6c9aa505366f9c5bf0289f56a650d75b87ee4a5a3db10fb27e674bc26d15ab8de2990739f982e4ad2894f0bff24962f8c72c19c89457b6a5c SHA512 aed354750fee8837991bef5b71921081f59ddd32c6f5ace53a4249b5782b4e6023efa6343cf1ccc886b4a0936c89a43c376d209323320e98e7aec76172a3bd97
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index bc7375ae95bc..a99ece449f99 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
-		<description>Proxy</description>
 	</maintainer>
 	<stabilize-allarches/>
 	<longdescription>
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 383520fc48ff..43fd5a9f67fe 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -27,7 +27,7 @@ DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822
 DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
 EBUILD courier-imap-4.18.2.ebuild 6867 BLAKE2B a89f1c91bf57eb8d1c3d1daf5d8f7e614b5d2cbcfb16fcf2b9a0d659b36d069d430106569ff5a114bcdcde01e5c48647eff80a54ed3ed765963048acd60daef1 SHA512 c9f3dbe5ea757a7a834b90cbdc05acd9811d1fccc0762e4653f9c70afb11024c20c7caa0c1cd7afc7c9c7b7ff69598eec33a7b2a07f7dcc2ab486b85d6bef389
 EBUILD courier-imap-5.0.10.ebuild 7241 BLAKE2B 6ce8c2e5da5c49ac653e62174937688b17663d19632920fc04c6d27675dc2878699f9f37075c2ca530a1fd4a5d5d48f74d78df8d7a4ce1a1c93d784d72aa0a4d SHA512 de16c3a52f8821f2ec9496209be0946df8149e605a3f9894ace4634253f2a2a18525e62eb5f4ad8fe5c1b62e99ffb623b28129a0331c6fe5237d45b7d658fff1
-EBUILD courier-imap-5.0.11.ebuild 7241 BLAKE2B 04492f43161ff74e7e235e5029aecb304f6c2d7d7ee6eb7d62b9ca9fba8e84d272b98f27a747b5e04e802d089053c0faea5f9d7e7889a1c064d248350b68ea4f SHA512 4feda04f2da3073e36c4d46ab8f29b3cf5b366bb7cef6b7950a294c7cf299c3141e455763f7f671a256cb32de35bb1e2f05aea91111c6182fa912923f8713121
+EBUILD courier-imap-5.0.11.ebuild 7273 BLAKE2B b53b05eb7a25be57c31bba7cf3c52e6689354d17270ac6d33f46d26a36638a04ed687693a1b84bd4d879b5516adc1bc834ff05600b04ae445a19f774d6041bcb SHA512 4cbd94e66b07cc82cd190b05fa3522d95cccd3ceaf5eae59e06d3428dda9620963a52bd62400b646e4b176c5f5072065fbd47ea762f35eec400c056927618d47
 EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
 EBUILD courier-imap-5.0.8.ebuild 7234 BLAKE2B 85d1b623155d06c51cb34c07d39b056688b591b7c496c0793112c477bc1051585386ba6783a761e76cb6fe2f71383ab3e2251b43823e2d8cc98b827646eaa3b3 SHA512 79d89096d502a8491cc5add10a108000a19a282fb746e12314d11ed5a29bd3623bdf208b0cbf4ccf741db2db47d170ff19cae069ec4b224011095f7580b28e7d
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.11.ebuild b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
index efa94a72c726..03ee783a1b39 100644
--- a/net-mail/courier-imap/courier-imap-5.0.11.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
@@ -81,6 +81,7 @@ src_prepare() {
 		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
 	fi
 
+	cd libs/rootcerts & autoupdate
 	eautoreconf
 }
 
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index ef4982884184..e5595980f6ab 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -8,4 +8,4 @@ DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fc
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
 EBUILD dbmail-3.2.3-r3.ebuild 4000 BLAKE2B c6a5d79374b0a017220f605affd06d37cc09818da99ac763d22cabdb61d4a4f0d8eee014f95fdc8b5680a3de1d7fc22b5f9439dedc7c3b1b446792d4a520c91a SHA512 38bb353cc721ae1a14d0fd9cbc48eb9d2b20798e9ffd52e8eb435e91910eb7cd741ae1497d60f936a11682e6f9c30f9b77f5a8c73b1d184e72e24a22f7db9cf6
 EBUILD dbmail-3.2.5.ebuild 2432 BLAKE2B 83ad0622765dfd6ee844ac02e55056d4c2822e6dde8b0e19b3c6f71f9c9700f9eb3bc734b485b6315b93e060943aebb07a70a09754e36719bdcc119a34cc00ba SHA512 e934e201f9fb3b8614ce75584aa77689256208d319636bbae3084976392a65e2048b3ab01435ecaebb192806cb2b73f0dedc26b18c2489a694f5d58804acad36
-MISC metadata.xml 480 BLAKE2B 09dc565c0e3a53c0072229b6305cbcd4cf9d4927d6b7fba45cf27c772b2d78d96202d685a34d01eb6553c4a228975d8e3c4998c8ad8f7136e34229671b048248 SHA512 0acb11c787a286e0d8020f97d483102b57a323c80f6ed4c95d44a18d162856b3547db96fc92d1649061220cd8b009be44adfed2f7790cbe306662dd525f7a4ef
+MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index 018653334e67..5cda74b26256 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
   <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
   <use>
     <flag name="sieve">Enable sieve filter support</flag>
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 6d558e49705f..7f2d0ce61413 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,3 @@
 DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
 EBUILD getmail-6.14.ebuild 779 BLAKE2B 1edbef38260d9e112287511cc35db1ea18ab43c453b9a5307d39a950f9d24d00233d3cbc08af972d64ce65dfd2f250c5e15e3946db71d08b73a8985920cbc8a0 SHA512 21969af79422b0f53ff9a1dfffcd571fb56f17561e5f08e6500d43bfb046c5f1fa32136544cdbc5b92dd2e0b28af12c08c5e34d83630316f0b86bb5254f78016
-MISC metadata.xml 685 BLAKE2B 3b1be682242d3b6d0dd8823170d7fde1076b4b222de4b60988715343b3f0452602d5f20ceb33859e4ac3d7ff9d7c5503838cac35653bed16c524f06786a46922 SHA512 0cd71885a754d1b6b52bfd77ae8e4d0eaf26dbc8122135774aa694c5a758c2051c1f2f6e1578944f133800eebdccaf801230231355eb4eb1270949e680a1636a
+MISC metadata.xml 715 BLAKE2B f138c2b9649a25c871f623437b1c02b0a2289fc15e6af45cdfd8c450d5ac556f9010cb65f0566815576c4e3fe5765fb0596de84c9052c741298a25f00df3f3be SHA512 81f5ff8230d793156376440c6e1f2e3832254b1501f638a1671cd0041e43a7e76275107b817aefe8ebcc6434c9bc167e09a88f3df6128ebeaade8d308a0de155
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index a69c1da4d9c1..82367af1c9f1 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>r+gentoo@r78.nl</email>
     <name>Remco Rijnders</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index da6ae41eb76e..3411e6e13cca 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,5 +1,3 @@
-DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
 DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
-EBUILD imapsync-1.882.ebuild 1942 BLAKE2B 9fb12473d1bf460d5b1a80924b3abf7c4c0480fc33b08cc5eea9258bb87db7cd0040bb29551670991806e92f028bff28f606eaa7da590bb924978a5d2f6174ee SHA512 39831b911f0a92d5d3000e7d69cecb068a8fca0dc66f033a2bc6c03ad5dc48390081bcaf3452d2aeb9396c1b5d6291af292d9f4c863f3b352f9333cf37289eae
 EBUILD imapsync-1.977.ebuild 1889 BLAKE2B 03229ec748f0dbe2ab20f11a33cb76e8d92e24ddd233f28fa413b6370dd251fda434f1b6b4a38f2c62c8c5c310565ad6421a9068dcd65ba718303e4eae37d283 SHA512 e3e6be608cd773f9e017653517102cc9242fb16e23271963571c2d8f2e1806cfca156319581192fce975ef42fd27a638c92a144841aa7adc81b61403d98d8294
 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
deleted file mode 100644
index 1341851d6e31..000000000000
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool for incremental and recursive IMAP transfers between mailboxes"
-HOMEPAGE="http://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-# ppc dropped pending keywording of:
-# dev-perl/App-cpanminus
-# dev-perl/Data-Uniqid
-# dev-perl/PAR
-IUSE="test" # not fully supported yet
-
-RDEPEND="
-	dev-perl/App-cpanminus
-	dev-perl/Authen-NTLM
-	dev-perl/CGI
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/Data-Uniqid
-	dev-perl/Digest-HMAC
-	dev-perl/Dist-CheckConflicts
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-INET6
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	dev-perl/Mail-IMAPClient
-	dev-perl/Module-Implementation
-	dev-perl/Module-Runtime
-	dev-perl/Module-ScanDeps
-	dev-perl/Net-SSLeay
-	dev-perl/Package-Stash
-	dev-perl/Package-Stash-XS
-	dev-perl/PAR
-	dev-perl/Parse-RecDescent
-	dev-perl/Readonly
-	dev-perl/Readonly-XS
-	dev-perl/Regexp-Common
-	dev-perl/Sys-MemInfo
-	dev-perl/TermReadKey
-	dev-perl/Try-Tiny
-	dev-perl/Unicode-String
-	dev-perl/URI
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	"
-	# Not yet in tree:
-	# HTML::Entities
-	# JSON::WebToken
-	# JSON::WebToken::Crypt::RSA
-DEPEND="
-	${RDEPEND}
-	test? (
-		virtual/perl-Test
-		dev-perl/Test-Deep
-		dev-perl/Test-Fatal
-		dev-perl/Test-MockObject
-		dev-perl/Test-Pod
-		dev-perl/Test-Requires
-		dev-perl/Test-Warn
-		dev-perl/Test-NoWarnings
-	)"
-	# Not yet in tree:
-	# test? ( Test::Mock::Guard )
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-
-	default
-}
-
-src_compile() { :; }
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 35a01b0adea8..0923204ed588 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,8 +1,10 @@
 DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
 DIST isync-1.3.3.tar.gz 315912 BLAKE2B 64a6130fd2e0b6bcb4c57e7e353c1227f65ec84b557419aaff617f9cde186e1e8f906a9448e4642bd1f6db245a769923cb8ec779ac077225c47a16160d3a8b10 SHA512 915824272606f75da8c05fb75872bc5cf528fa555024245094d14a25b190f1b813dd5723e9b87f27f3fbb14b100311ee487bc409d074a68d67e9ab675b12c7a1
 DIST isync-1.3.5.tar.gz 316671 BLAKE2B 3018236aef71e7eb9dcb3c0ce4dee208a6b53060cf5354fe142095f227c29aecba34d9a41db24e53b6bcf9e8bb5c9be163178bed30c41117fd459284f18292af SHA512 d3e12ca461a0cddcb7a59665d0b08c5bc690cc187bca68d0bebab2d406382a3c28d015ed6a37bdb13f3dc6295b8381c3e5a6e1a3ac0e7336d1885eadbb0ec451
+DIST isync-1.4.1.tar.gz 336281 BLAKE2B cb15a8c0dcadbc3db072fcb10a6f0d83ccef0de1c49a9d30a7c189f616c965d8e759a72c4e35927e20e2d7995f9430bffa22e535684a7b7290516d8bc78bf071 SHA512 87d1101d3e39680c1d101653a6f48859d539f0d37d65db8d90566fae22f2163c76907d561b2a487d3ed2ab459c5703fa8e077cc3e1f156a895d7ef9078af91e8
 EBUILD isync-1.3.1.ebuild 859 BLAKE2B bb36f26b449eacdf714b047e8ab0facbf6487fa1abbe1e2e054ef2775486e9a0fc2af67f701281ecd44c15096daff32760e2360ceefe29cab363ee4924a06f20 SHA512 673c7da19bbab310ba3bb451d274ced14b40f68527828d2fa0fbe551edbd87cb3384f9d6441bb8c81723d7caf779d93f4f34caf7cf6bf4f973147ec992bc3701
 EBUILD isync-1.3.3.ebuild 868 BLAKE2B 950ddf7a95e06e272bad96255922e667176856d73d1a9e01ae99add5a1716f78d60db9b3f3b575fe406b58a48db99f626118a2af5bfda5508a4dee8473bd3c9f SHA512 39af3a19cfaaebd9835fe35c23f8e557ed54762e53ee54bc5af456125875bc51577de4a2c68c6a19b277405d25e7f3bb35b6093cd9538e11abde7e32d826ddd1
 EBUILD isync-1.3.5.ebuild 870 BLAKE2B 622511f268094f7bd37473eb581a1766345b1f14d3033d6ee4217b403cfa4c2290a1d0139fa02a8f0dd00dbf248f54268bac72a71fc0481ee0432cc632274a67 SHA512 5ee25308a100fd6135cb4335fe72678f1442de7a656b3c019d0dd3019ceae70a883591269db0c3f19f48b60c632849620eac17939f9c6955998daf20fbe289f6
+EBUILD isync-1.4.1.ebuild 870 BLAKE2B 622511f268094f7bd37473eb581a1766345b1f14d3033d6ee4217b403cfa4c2290a1d0139fa02a8f0dd00dbf248f54268bac72a71fc0481ee0432cc632274a67 SHA512 5ee25308a100fd6135cb4335fe72678f1442de7a656b3c019d0dd3019ceae70a883591269db0c3f19f48b60c632849620eac17939f9c6955998daf20fbe289f6
 EBUILD isync-9999.ebuild 870 BLAKE2B f53cd1e1bd39fd318159f35dbc507a444a4a07e0d323969971496ba6995af6237dcf50670c8fa1998d9322cbe3069f480c4cc6735ac25bda80ecceda5807a3d5 SHA512 6aabbed6126f463ab6e865f5c8e74fab789648aa9cc81a0bf8bddf9477bbf9e237066b443c2e8aedf9aec56727ff904f9317cb1489c69491cab7b45465b0da38
 MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.4.1.ebuild b/net-mail/isync/isync-1.4.1.ebuild
new file mode 100644
index 000000000000..652bed336e03
--- /dev/null
+++ b/net-mail/isync/isync-1.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="libressl sasl ssl zlib"
+
+RDEPEND="
+	>=sys-libs/db-4.2:=
+	sasl?	( dev-libs/cyrus-sasl )
+	ssl?	(
+			!libressl?	( >=dev-libs/openssl-0.9.6:0= )
+			libressl?	( dev-libs/libressl:0= )
+		)
+	zlib?	( sys-libs/zlib:0= )
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_with zlib)
+}
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index bbe161822836..dad55b0cf274 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -3,4 +3,4 @@ AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a3
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
 EBUILD mboxgrep-0.7.9-r2.ebuild 768 BLAKE2B 1091cdfd5dd49267c64c267a6bb82e56084251bd598c4b5a56a1e4788c9dc3837dfcd0dd0ef1f083fb05d3068aff61e60c09f396d4b35aa51dc5fbeb87d6b55d SHA512 bdd19dadf470d1173dc7f08db13f57b82b5a30c6a68595d04cfe3b0e0aa626ebb26fb891aa9fbf97eca56cbb9875f416601250eef23ff181f7343728f7ca02f9
-MISC metadata.xml 337 BLAKE2B 278e5cc4a7081de0b6f8cbbba8f25d762014c869676683b41dcd74a1fb9ec8bdf73d412652dc867117204ce9d509a6a79f496aa22e69a65f234e4323f8059a14 SHA512 ab0f3ce2bfd3a959ef8132b4ad3b578cc71e3714002ec7433ff68084926176792eca1b319062878fbe984487514324d228b3d75065ae13747e1b22f1aa898d72
+MISC metadata.xml 337 BLAKE2B a35d02ce3dae677445c501db4a3975f1b8a586973aa1b217a94b2a9a24c65ddefc8e6251e4603243cb97ef5e2d91043b1ea060f3b5432996e04567ca8c178c47 SHA512 0477155c421a26504aa6eae9ada7db4dcdb9da3aed13d7ddd9a73f55a1f7f6134000c54694f7d3e48eaa62de9733a082bdefe6c2de1a09017ca2f3917505d16b
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index 63436f59f911..7e978d60de16 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
-<flag name='dmalloc'>Enable debugging using <pkg>dev-libs/dmalloc</pkg></flag>
+<flag name="dmalloc">Enable debugging using <pkg>dev-libs/dmalloc</pkg></flag>
 </use>
 	<upstream>
 		<remote-id type="sourceforge">mboxgrep</remote-id>
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index c1927948fad9..7190693742de 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,5 +1,3 @@
-DIST mpop-1.4.4.tar.xz 319372 BLAKE2B acf5bdb62479126ae212bb008878872d16efba1eb9a077bf4697ba22ff512977fcd5affad090bc952fb01cf07a607a4dce91b873128c43f087c34dca6d6bae81 SHA512 1ed89108d35d7bbd6bcbd6de956f51cfcfaefd808f6aa7135b168d789f8cbe7070be9db676d1222dce5b6fe8b6692616d6b7adec9c23df11ac3de112897924da
 DIST mpop-1.4.7.tar.xz 322488 BLAKE2B ea73e84b5ed3b5aad7ef91ceb510187c3f2d42976329a6a53511329a84713edc056ca6db35b1de2c9bff8b417e2710e598c472e78acbdc499dd73b24c46dfb47 SHA512 ce0ac899fd2af1d50ef221c88282c12263c5862b9ff1f6341a8551c3fe6b69272772599a2040a0f553a776245514c55b8102ca8cf291b411e5127a3f39897832
-EBUILD mpop-1.4.4.ebuild 1131 BLAKE2B 98b3558b2b7fc70436fc0ab589a29d6bd4af7e0236b96cace86fce866d58bbc8c7c54ae4640a3c057c0c21855815f28ec6719580912f74bae3f1b4a5ce0edbff SHA512 18cd6d8cff3e4564f112b5053b32de2f6e3f6744e22e9009395efaa4e0067330a8a3ec0bcee0a965516e859f833665f2f6ee9277af058683494993636f5b7ca5
 EBUILD mpop-1.4.7.ebuild 1131 BLAKE2B 47380c5f65e45c2b66ca6d7f4fb6988f7e3a396568825d17dd766a0a824284b7cee96459bd549d5c6a5ff355c9440cbdf6d6c0f75cb821d8b9d44e11bdcb1ce9 SHA512 9a19f1cc5e6525dd87ada4167c115079de8f4cf12f9e16fa4ff5c2e89f3c400216774483e03bc11d4cf26c556cfa331c10e8a22174af693fedccce52b180fa9c
 MISC metadata.xml 241 BLAKE2B e97922b2760a2f8d0ae16406e640eb60631fc3de36ab2a76953fb0b78b14e9652f317120839b5b4f0decd3dfb4f2931d828eca1f8a60f6eb1e01f3d2e8a59236 SHA512 f43a36b5ac2474c93bd47933995c16936ddd5748811e13716dc1eb2eff2a9e8e2f0fce706fa82386bbda93e7cae791066118b960191e93ca2eab02175f9e020a
diff --git a/net-mail/mpop/mpop-1.4.4.ebuild b/net-mail/mpop/mpop-1.4.4.ebuild
deleted file mode 100644
index df58c65aef22..000000000000
--- a/net-mail/mpop/mpop-1.4.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="https://marlam.de/mpop/"
-SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax"
-
-RDEPEND="
-	idn? ( net-dns/libidn2 )
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[idn?] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl tls $(usex gnutls "gnutls" "openssl")) \
-		$(use_with sasl libgsasl) \
-		$(use_with idn libidn) \
-		$(use_with gnome-keyring libsecret)
-}
-
-src_install() {
-	default
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/mpop.vim
-	fi
-}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 6d478eac2c3b..535870f2ced7 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
-EBUILD mu-1.4.13.ebuild 1774 BLAKE2B d4f32fe1efff5bec341b413caadc6841f85a1892fae4d428ece9cac413ddca7c4b3d05bb68dec532f328b4c0a16fc12ca6f6c0cf430b8a351be64dcef16ed361 SHA512 2c6a3d5ae29ff7d46954b32b30d0d7f0760e6f648e80b5ca1c1f8eaa16be54e92105ceeb8ccaac1169b54b8e9e2225b67dded9a7e39829257277d95f2696b24a
+DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e
+EBUILD mu-1.4.15-r1.ebuild 1374 BLAKE2B 6b14c1413eff8c536636d0a4e4a9ddc7db6a725f30ea34e48fe74154a5ba233aad28d268202adf1859cf7955dc78d083a72f97133951afc6c1d4ceea4fbdfdf9 SHA512 ad2787b57a340441aa760c7ff19dd906cfe7abf796136d5d72c6e2dade58dcd61f4204e192beff1d5f1f14636ecf6e451903073fea6f80dc0e8c676282bb7618
 EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441
-MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
+MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 9d458cfbe1a6..dd851289df76 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>
 		<name>Matt Smith</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-mail/mu/mu-1.4.13.ebuild b/net-mail/mu/mu-1.4.13.ebuild
deleted file mode 100644
index 6f3c1afeebe6..000000000000
--- a/net-mail/mu/mu-1.4.13.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
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="emacs guile mug"
-
-DEPEND="
-	dev-libs/glib:2=
-	dev-libs/gmime:3.0=
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	mug? (
-		net-libs/webkit-gtk:4=
-		x11-libs/gtk+:3=
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
-		$(use_enable guile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dobin mu/mu
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-
-	doman man/mu-*.*
-
-	if use guile; then
-		  doinfo guile/mu-guile.info
-	fi
-
-	if use mug; then
-		  dobin toys/mug/mug
-	fi
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.4.15-r1.ebuild b/net-mail/mu/mu-1.4.15-r1.ebuild
new file mode 100644
index 000000000000..b8cc4a02fef0
--- /dev/null
+++ b/net-mail/mu/mu-1.4.15-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 elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	mug? (
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index a58ce35d839b..e65d26da5c0e 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -2,4 +2,4 @@ DIST muchsync-5.tar.gz 134107 BLAKE2B cc706aa650b7a2884df0b40c206e9c58f2d633d51e
 DIST muchsync-6.tar.gz 137023 BLAKE2B b2a60a26bd3a2918b52ea50a98223f828a60c1ba172f349cc350ab8cf224e114623bfb5775a9c05347311f21dbeed14744becd11022fbf8310608faf2a0146f9 SHA512 620e398f7e3973d915c32b1c244e2b1d5ed7c65dfc2a51958e62c229f14f8cf7fe794868930aaddc2d95145795a5affc0f50fc012d2d0b4bf2884930da3eec89
 EBUILD muchsync-5.ebuild 453 BLAKE2B 11ccea149f151df718b14193d4ccb04d7fec50961b8f5b56cd83df4461c5e74135cbceec7737bfd00a382494dd0ffcbec6ee30285cc3cd051b404a01765f45ff SHA512 c90aab62a4f57fafd404612fab4e1fbbea37faec76b1a0a1b6454813cfb01b7e3f64a9c4f5026aeb55b991ecc103bc85385902cd7fc9ad22fde5a905a3e5b790
 EBUILD muchsync-6.ebuild 471 BLAKE2B 22f53fb490558dcad14818b0438bbdccc79bc4258d6d18b812800beec07ce2da92ba067c8d105f383b098c2f1343d45b3617d8095de9c22732dbacd1a4ac75a8 SHA512 c3da2db1a91dba5ab7c5f2dd54041a6428e9c4d711d0c64e751192bd6d41f23c00f58437838805e71b27fe733fcb799eb9888ea6ff2ba9327e15fdff18f95d74
-MISC metadata.xml 719 BLAKE2B a7666967c221dbb5cd6e9ed36c8762b7ee234778215b131135b4055c371d51f618b82d221ff2e15c8a3a811fec3999a7e40a3db517b6bc2a7057e67e76c133c7 SHA512 e6628b58c52919894747a4490a76d8e9e1a772b0be0d62effbfedd0d27afa0be0629d5555f6796eee663c511ee23b3a1a42aa66425c502f5ff0cc46e4e1d355c
+MISC metadata.xml 749 BLAKE2B 4a7b8a414c555d1ef8837ad06bd33e24b68ddfe419817095ab911ad4db7ee5c59d83ce10d0483ce663a2aa14c7e1d795f28ab2001a2563b143a3b3bd8e87f47a SHA512 64f5a2b2f9392690a118a2f3fe50a7af0cde94e57389f051b5918233f01e0c7c54790779f6c95c19fa9f13d030d7c2887d42a25b53e5569517e9f2e362115647
diff --git a/net-mail/muchsync/metadata.xml b/net-mail/muchsync/metadata.xml
index 597bb2caf671..90765004e479 100644
--- a/net-mail/muchsync/metadata.xml
+++ b/net-mail/muchsync/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 452d3a52d03f..e93ed95da3a9 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -12,4 +12,4 @@ EBUILD notmuch-0.31-r2.ebuild 6373 BLAKE2B 16366fa91f7a3b3bc6b87c990fdf1a7be0daa
 EBUILD notmuch-0.31.2.ebuild 6347 BLAKE2B fc2af8aff2fa4e9a7cb624c031e86c3de253aea975f2daf7bd3b65f6cfe1c66048f8afa12dc0537544f0179ed88934e94362c915516bed8744581cbd7806a621 SHA512 87cc07eac3fcbea143e9fc6d519664d89b0f84ade32dfdf788f619de274a31b6b1f58a07d214f725812292c537ebfcbc2bcec73bc3b26e00e279fcc2917af6ac
 EBUILD notmuch-0.31.3.ebuild 6387 BLAKE2B 93f11704207ffb0f6f098dcfcb9b81f6b0eafc2e96859690585903b6de885bc3001cd3e648ceb247561f961be37d2b4e2305111894e4b3df31f8ffe8607677aa SHA512 2542aece62ff1d19b910fff45450e7bfa1584622ef277e60ccce79218700f6eeaa6e0a2f7200740f14bdfd7e1eed1e2211a9f51f108a0d35b73e264c9654cb40
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 4fcb5ea47f923a98238ef7216627196931f7b89c113f46478139b2cc80856c3800a245a2d25de0b27a4e1676bc106f5b0478fcd029e514abe21d359a64d5e5d8 SHA512 6018522ad82cba4b14cd6b0e407ae475b07ab67648829e29e01d17080cfd6faa87ecef27df458e2699ed5ea5d4e400b4491224bfe5eb7e9d5232d3433adda683
-MISC metadata.xml 1288 BLAKE2B cc1d703a011971c9d6c89237847c84caeb83d1a6b62d95ee9cb1b0138919ea24cce578d7f55cdb749b448d6f2c9c77895285127d9c509532b5b58c66db2528a1 SHA512 68066c76c92534adb837ade1aa93a6e58f2d1b288e9cb75753af2c9dc1feac145be1976163b535f4bd5671f73f0dc93f204fe74ede74c10f081bba1d3be3d1dd
+MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 457dfaca90fb..e13edf898c21 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -5,7 +5,7 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index 2d6d5d793c56..ccee4c4bd5ef 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -2,4 +2,4 @@ AUX pflogsumm-bdat.patch 691 BLAKE2B d7d9fef9d668a4f58387ada96505c9174cd1ee01378
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
 EBUILD pflogsumm-1.1.5-r1.ebuild 511 BLAKE2B 19ee84aa53d8b9f2d2d596a1741293b84bb9d60fe5b0c650c3b1387f84f2e274fcaeb0cf1e076072a1577dc19fb996e1c34acc32f42b245f310ef5e98c5a15bc SHA512 f6444670556e7594bec12f495d368cb05611c28cac7ebf04e719581e4b99126e647be8e012115c5a2460238ddc14bb424f1b966dc178b1adec57edb52a10a2c8
 EBUILD pflogsumm-1.1.5-r2.ebuild 567 BLAKE2B e539f6d099d30ec81af21f7cab0241dd05b3c45a581d5f0953c82a36e2572230e175fc83b94b756d9e5dfd4dee06f75a5a57653a7882c96d49efecd22432d9c4 SHA512 df0a51b45062c05b067d0215e46002e17483e5c719c7996c9223a637d80cf0044b113ea4443a178e8f587acdb26ea6e07e1a97ee383cafc0d7e2de029bd5ae24
-MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
+MISC metadata.xml 409 BLAKE2B afb1dccf077ef8a65f22ca59276ec5f33bd6dc4e2916b80615b508cfd6cc9c55f7a9720ec9dda5fcdaf805600af4d05d2b997a454865e2e22f115f42fcccc5e2 SHA512 fb0dbbe2d864a9a8afc0598ac495d26f8ea2dd29dc0939e6ec4fbcee4ddf1b2bda231a8661f8f2788d3832c51d6415de62957d8d33c8d876f81a35a2b139c4b7
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 1b662aaef98c..051239844a94 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 208ee9f17036..c0ea84db7b3f 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -3,4 +3,4 @@ DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8dd
 DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
 EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
 EBUILD poppassd_ceti-1.8.9.ebuild 1869 BLAKE2B 9e3ef48fac5cd0bac294714476f3b6d404e6a38bad26adf5662a0415eada52e0d2c8674077683697045021a81c4d7128133e559cb815111e8d1d11cbcd733e65 SHA512 ca02d9289a12cdeab650147fdbafdaccaa814489bc488a909230b67a5ea44a60b02fd5389e072d29ea0b95230a2038746271c02bb318e87a7c7b1368dbf88f59
-MISC metadata.xml 914 BLAKE2B b6b5348eee4b5a213c13a382ae0294a25497fda65f48e8e4cacd327631357101b1509484936dc0fe0935279245b7fcc4cf15e062b333a73e281a7f793d5e016e SHA512 d1e4a0a72c157bb94ac240987b0b568b9212981f7727383eb28995f2f80e2d5f9ac0eaabbf36fd076f4237ebd84ec8e804238f92f583a63e963f1c4a20e4acf7
+MISC metadata.xml 944 BLAKE2B e9490a1a30ee8de8efaedd6f92cda9f367ba2c80203293f3bcf34771cf30feda958adcc46af438f67cc53743a51561b3ebdc563a3525f736342fbfd749269451 SHA512 d3f2b2922e7aefbc3f94ee3e90a7bd44ef475bdb1aced93f51c15c331eb0ee3357605a9aa5b65827e92d90d2a14e9ef12961a8c023095b7a8b765e177d72d924
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index 362411c161c7..0659c26f1767 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mmogilvi+gnto@zoho.com</email>
     <name>Matthew Ogilvie</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index 61ed865ad7a7..1cb32b4a29f3 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,4 +1,4 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
 EBUILD qmail-notify-0.93-r2.ebuild 1018 BLAKE2B 9a1d219cc5667211bd82116c359152d9048c125311dbb5ffdb723ab99904f0f6a98519143d43bb9f56a80d3d53786924ea0e1e13844a6045739ee170c5512bac SHA512 9be2604be01da08790ff36b63da07df39b74d088517dab0f76ed34c952fb08781c87d616e091e9df95442060d4586f4d762ee758e786501a9dce4e8dce39dd35
-MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
+MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index 7c3db330c141..dbebda04b192 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index c860de9c7d8d..6bbc4d7f9885 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,3 +1,5 @@
 DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
+DIST rss2email-3.12.3.tar.gz 74151 BLAKE2B 5bbd796d204e6fbb7720de3c23df19c28374faea757907f69d6cd38cc560503bdc7229e7dc71aaaa89b8303942369a800d3bf9c5ac2d1d0def2b27d795352bc8 SHA512 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026
 EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
+EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
 MISC metadata.xml 459 BLAKE2B d361bd0e82327a97b801bb7c064f0609a67d2fc0cd58b69216e6acb0f304ce0897da7843255f1ce1bbeed76c5fc1e199201b2eb35910fc7b1c5e09d4995bb838 SHA512 4a05845c1148372f0c22bb68bba353aca4fc03e1c418b72f67e85f3cc0a9ee4b029c8bd0271c1d5cbbffe1e5b0105a13dcac544f36b4e3e91fc6c9c0e93d8983
diff --git a/net-mail/rss2email/rss2email-3.12.3.ebuild b/net-mail/rss2email/rss2email-3.12.3.ebuild
new file mode 100644
index 000000000000..d77199fe53f2
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.12.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Support for Python >=3.9 currently broken by feedparser <6
+# (see bug https://bugs.gentoo.org/768120)
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index b25a126a1caa..9a0fa9164513 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,3 +1,3 @@
 DIST swaks-20201014.0.tar.gz 110953 BLAKE2B 8dd2c681c6c1e66b76bda71f0bc8b88e658565b28c29ae9f02e5c27500619598e5817a442aa82c48fd90be80cd2dc54eda8390ad3d1cb2e00163cc07a526f463 SHA512 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc
 EBUILD swaks-20201014.0.ebuild 1093 BLAKE2B 6cab8f15bd25d724724dc17995402054fc339828506904ddfb530ffb28d133c40fddc8cc0cbc03f01fab81267338a299da4ee1e76685246f505a5d2c5455a749 SHA512 4b3f55db68d265f035ade639e91714ffc43a11f9a9a7c120fb7cba6088fe5730f3c7a9fd024d536e023234c791c741b611a7d4aa8380c13a2d77e83977d6409a
-MISC metadata.xml 540 BLAKE2B a3271dc0ad82899ef2945c3d42eb2030f08f47d7ae8633d89fe03edfe6b26f36eee4c7da193730360a7e54fae8d1c853cd24012024f33a96debe34330877737e SHA512 a0275812c2941b91adb18befe36ffe5e87a2d4dad904b3c7988e88f0b9252105d4bd35a18259c0c777a5f533632e1d2bbeb28298b0c97e69ddcc902e4919167c
+MISC metadata.xml 570 BLAKE2B b81498ddaba6e8866eabc756743a8df55075c767d0317e732160f48e74bb4b2232e41b55c1fe72803c98d5da67f9eb2622287367f726b5c7271bfe6bf24a5818 SHA512 9c15d5f649e30b4d07ddc5bfecb529b396ef0a5eb1052ec48872846df077b1e395c8a7de74d8440a536ff999c941fed02ded0d689e204c8ac5090f628bade37b
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index e78c3a3b67ca..ca014d65147b 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 923c18b2d68e..c0dfe411bd05 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -17,4 +17,4 @@ AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde2408311
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
 EBUILD vpopmail-5.4.33-r6.ebuild 7516 BLAKE2B 568a2f25393c132211dc351c7704c4767b272dbcf4ed7e90823b46e2bf5899d1fad283e3dabb352c85d648b9289da0c09c317eb48dba137df490f13db6b22c7e SHA512 6c31b1653290c10d3892c984c4b7bc287d771664914c11b0b07a024c92dfc93fe5454b4d4f3e8f27ba40ff1ddfb58fc9561a4cf9609ba6916b11badbceb9c523
 EBUILD vpopmail-5.4.33-r7.ebuild 7587 BLAKE2B e7ed4efe7efc7c12dfed3b16dd6dc93c6cb77aa4f771fb4ca8e2526c689240f5740a4eb689665ecd8ce5cf85b81fbd6c3be070bdfb933dfa0fff260697e17849 SHA512 dc8019fd250e05985762b26d87d1af4b333a331929a6706f9648d4a347cde48c3d4c274c621c8bc8125b7924a2515c50d01928e6cc04fa3294140ed213301c83
-MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
+MISC metadata.xml 828 BLAKE2B 4c54578d11e0a74817c10edd0ea3314aad1f53703367a4baa89f0c5b53a1b9df6753452db9e2da7f2fa2771b91713c40b02cf93535890671eaff8fcd12b11718 SHA512 43330581de8b5c94a5240f70a6f78117808c4b6deef386daf68d531cfaf3e29888ed1c3c70f0560d22a7569f0c29dce4eb9f63676528783a9cf6f7b275f2eb4a
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 802fb575c68c..77ece56bd3d9 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 17dca0abcb00..3501868e7690 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 5a991ae178bd..0127300e3e10 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,9 +5,7 @@ AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.6.2.orig.tar.xz 334412 BLAKE2B 4a104337efc8a901d137bafefb6e4bdd90972c8584cef6cce470386c0f26638c5d80a99c12789e47eeae572d95483620435c4adbedefc64af98f906681e255a7 SHA512 8ad40e22ef5b2d952f1968431e8e2a64bf83223424866426ce04d67647b6a7e44e63dfcbe8269606b9ef135097e6d88a16e2b825c1be5c074dba706d47df5f61
-DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e
-EBUILD apt-cacher-ng-3.6.2_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
-EBUILD apt-cacher-ng-3.6_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
+DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792
+EBUILD apt-cacher-ng-3.6.3_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
 EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4
 MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1.ebuild
index ce6af89f9fa7..ce6af89f9fa7 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1.ebuild
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
deleted file mode 100644
index ce6af89f9fa7..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz"
-
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-DEPEND="acct-user/apt-cacher-ng
-	acct-group/apt-cacher-ng
-	app-arch/bzip2
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:0 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.1-flags.patch"
-	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
-	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
-)
-
-S="${WORKDIR}/${P/_*}"
-
-src_prepare() {
-	# Fixup systemd/CMakeLists.txt cmake version requirement
-	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
-
-	# Make sure we install everything the same way it used to be after
-	# switching from mostly custom src_install to relying on build system
-	# installation
-	sed -e "/install/s/LIBDIR/CFGDIR/" \
-		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
-		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
-	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DHAVE_FUSE_25=$(usex fuse)"
-		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		"-DSDINSTALL=$(usex systemd)"
-	)
-
-	cmake_src_configure
-
-	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	# README is a symlink to doc/README and README automatically gets
-	# installed, leading to a broken symlink installed. Fix this by removing
-	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
-	rm README || die
-	dodoc doc/README
-
-	newinitd "${FILESDIR}/initd-r3" "${PN}"
-	newconfd "${FILESDIR}/confd-r2" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" "${PN}"
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}/cron.daily" "${PN}"
-
-	# USE=fuse installs acngfs, don't install manpage without the bin
-	if use !fuse; then
-		rm doc/man/acngfs.8 || die
-	fi
-
-	if use !doc; then
-		rm -r doc/html || die
-	fi
-
-	dosbin scripts/expire-caller.pl
-
-	keepdir "/var/log/${PN}"
-	fowners -R ${PN}:${PN} "/var/log/${PN}"
-
-	cmake_src_install
-}
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index 5111f32a7b99..705dd682cda4 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -80,4 +80,4 @@ DIST asterisk-core-sounds-sv-sln16-1.6.1.tar.gz 30557672 BLAKE2B a656655ac958edb
 DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43ade6019830aa71c71855e773c5998c951fa7c8df7946392a66b02c50e6d4bcf79bf25b7104788b5f1b289cf95785cdcb9f241e12df280e1b SHA512 0b172986f4d07572ee098370c2354ecc60d3473d62f0b6667e48df005b234991a906fb84ba7c67aec8fe6bbeb459ff58a1b3d3d9dcc6bfc08087fe62e799f0aa
 DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60
 EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1750 BLAKE2B 506f63453a482619e5366078b4f971ccf7b85a5914a711f69ef1bae95e0c1bb67a75ff982ffbae0f70f24f4d4111fb3fbce8a48a367a316bc90327286a540266 SHA512 ffc5ec8861ff0b308ee91169c5fdfd51c9e1c212be61478d2256d5abaad3c936cc537da1236d466b0f09b19b00b9686fd7688a8029cdad9bb9377f6befb402d1
-MISC metadata.xml 982 BLAKE2B 7533ddfd8e1b53e146396e17afd9820007c39d11c502332690bfd722fab809c4294dc1b027308eecd315e850f58285aee0bdaee75430179b072a70644efc6a22 SHA512 8930691058fca9da7e8ea2dab459344904767b7369703b6e382601a9995567d850febcb20c1e527e5a5d4c624f00ff128f55d034d878e621c6e488fec20762ab
+MISC metadata.xml 1012 BLAKE2B 632a84f05bd99531c0dbdc0b14de350c506fa8a12e1bbd7d33508c0eac22d73f987aacb3f278fb5687da9f6f57f7f9acd4a689dd8d219887cde0122719a0d43c SHA512 16f5e898cfd797f0cb7c59ff4988d04ace632660cd76bb5049fc0881a230bf42732b35d66a2ff0d046bf24affc76ef43b0b108746fd3a7bf6f51e5824bee7d6e
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index f280e1412562..ba923061405d 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 261e647f6214..0f4f40c31b27 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -26,4 +26,4 @@ DIST asterisk-extra-sounds-fr-sln16-1.5.2.tar.gz 46455599 BLAKE2B 9393a1cf69796e
 DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0b31c886184a666cc7e9d6af82cfb319937c597f5a54beead748ed64a774d0e291c680ebf998d773b9b23a4edbcf534fb74daee58a67190833 SHA512 ae3f2084be7ca5be9106afdff9c6c5f059ac4628e7a866e166a6ce70a74fbc388ddb27daa03394fb9c7009236d615d7e8c7c00fce45b64995e0901a05aed15ec
 DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8
 EBUILD asterisk-extra-sounds-1.5.2.ebuild 1798 BLAKE2B 8a3a744bf8e08f1d2db9e709f21c7842f40683bbeddbd5464bfbd823eb28a9edaf88ee4c6c867e296554d5f1e167c90d02eb846c1a3a231c18f643fea4294a41 SHA512 7335626ccb5408a2e547028771b0c6f8d42974ab4ca80e4f8578c7c94827249b6b20383b5316338fe4016852a23ac565e1e9c6ac967675e6ed2aa4b1f06dc2b0
-MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
+MISC metadata.xml 1082 BLAKE2B f623bcf0110a1c0564d74d95cefb690ba733ae61b67701b2c0ae4d44eea3ca923a4642fe839cf8d80c6f5f2cb4d12b46b699f237048dab1022191932ff7020a5 SHA512 ffba91f8f20a3c366123fc55f83fed8a53fac35231b3e2beca5311646548c4390b2932ff5f37f4465b6af435059ca82909f17cc0018d3fd018db35745cd1723d
diff --git a/net-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
index f15e5130f0ad..52fe6e9ecf26 100644
--- a/net-misc/asterisk-extra-sounds/metadata.xml
+++ b/net-misc/asterisk-extra-sounds/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 0c8b4386a01b..3a0b4279b26a 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -8,4 +8,4 @@ DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fde
 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d
 EBUILD asterisk-g729-13.0.3.1.9.ebuild 1895 BLAKE2B 775ed24bbf5d00c880f29a545d835f8d796d0a2b5869648875545cfc8004aa388e5c71192eacfb88ddc79349ef774325871c8eb4f51308cb8878e4162d427f91 SHA512 facfeea9503997a4700f79a2eccd323a1b891d1eb4db642946170ed7811e2275758c3b91c756ff7a59fb67eec4a7efada14d1e299ed8c54efbdc5d3993e20291
 EBUILD asterisk-g729-16.0.3.1.9.ebuild 1822 BLAKE2B 2b4b37e2bb698709c0584b4473e3b47426c6e84e92e5f76c33aadde4fd1545a7f37c167e9e393f9e9732d30608c7e6a6f711c31d3ec77b1f94057e943833a8c6 SHA512 47de616999a25657435abb2ac96fb438344903fba37f98c99ecbcb191c78675060574c56c5c0318e92ae1b8e0ca4ddec829c0cf65cb2b553a46354029cab7b69
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-misc/asterisk-g729/metadata.xml b/net-misc/asterisk-g729/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/net-misc/asterisk-g729/metadata.xml
+++ b/net-misc/asterisk-g729/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 215ef3ef6e8b..4be3480ad686 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -8,4 +8,4 @@ DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1f
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
 EBUILD asterisk-moh-opsound-2.03-r1.ebuild 867 BLAKE2B 5b6254344cd7f637e53e49659501a94e263194f62e5e0e79107c3436a2c87c936991f324e02ccd75b885a182198db613ef269cc9147a8be56b6316ce472efb5e SHA512 6290a0a123b060b053e72a31c4337535c355999d05ead92b260f4c6fac96e36156c55a9ec0023071019530f34f655ae1f8104874e9026df68adeaffaa7d5cdf4
-MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
+MISC metadata.xml 1082 BLAKE2B f623bcf0110a1c0564d74d95cefb690ba733ae61b67701b2c0ae4d44eea3ca923a4642fe839cf8d80c6f5f2cb4d12b46b699f237048dab1022191932ff7020a5 SHA512 ffba91f8f20a3c366123fc55f83fed8a53fac35231b3e2beca5311646548c4390b2932ff5f37f4465b6af435059ca82909f17cc0018d3fd018db35745cd1723d
diff --git a/net-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
index f15e5130f0ad..52fe6e9ecf26 100644
--- a/net-misc/asterisk-moh-opsound/metadata.xml
+++ b/net-misc/asterisk-moh-opsound/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest
index a4531467bbaf..4347cca53eac 100644
--- a/net-misc/asterisk-opus/Manifest
+++ b/net-misc/asterisk-opus/Manifest
@@ -4,4 +4,4 @@ DIST codec_opus-16.0_1.3.0-x86_32.tar.gz 394187 BLAKE2B 0b187360ae65fe4cfd56f90c
 DIST codec_opus-16.0_1.3.0-x86_64.tar.gz 388551 BLAKE2B d36f4ce8e9414e0887232afe6fd15098e48eb5ccaf690f340d4a62eaac432342a61e43801260f0198bd68af58217ef2a9aacd6d46af99b192444fa59994ff590 SHA512 601d04de2bd4e67cd3d111c8a6c383ea3885180f8ab82c8943e0d09f8203cff3e6d45b6048843946d53b4002d01d31d92592107053e512b5347568050aba5ac7
 EBUILD asterisk-opus-13.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
 EBUILD asterisk-opus-16.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
-MISC metadata.xml 556 BLAKE2B b0fba8ff28021dde0d0181dec8700607f635af7c1a6efb8c23ff7a91d34b90f4be1b7491967d860c86a7fb956ce499f0570cd0a3268860bf0f4a172ede104ce0 SHA512 c68893a7bbf6e9e717b2fb0cbb57a73e3d254e6071dddf9a632a5befb2103245502351e7a3f725335b191caf34c35882b0fa87697de4c5557ad880628ddf8386
+MISC metadata.xml 586 BLAKE2B 1a57ae9569c9e563efd47abb9b82f64636640dd5e0afd216a72d2be568112badd74ed0b578cf5b9a934979252fe156e0115eece065357b369aceabb5ab476c5c SHA512 e42c760a72a8b3ac002cf43d0ec32bd86bac7583ff1f74ce20d73fdaf2c5748a8e22646a2fe93a17ea275e8939ce727cc598b6ac3fc3a6b0af0b42d2c636ca80
diff --git a/net-misc/asterisk-opus/metadata.xml b/net-misc/asterisk-opus/metadata.xml
index e6da82c6ab92..f6dfb2d611ed 100644
--- a/net-misc/asterisk-opus/metadata.xml
+++ b/net-misc/asterisk-opus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a4d0c5c43255..a791fbadfa28 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,18 +2,26 @@ AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b746575
 AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde6e81be1cac961a2ec2eec049cddbbb39b58d350f37a4feb49e86157d6dd5e80abaf251cf6b122ec094e0109c1f20f3e9b0f65c29 SHA512 77d1bb1be97fe5b8df78a8b21173c0d12a91f9a543404d73e4f4af2080a0b4edb87b3ccd36b1935f4fbd2a0bb44e971d303eba774e648c48c2a453c8e42838a7
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
 AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
+AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
 AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
-AUX asterisk-16.16.2-no-var-run-install.patch 745 BLAKE2B fccfadf92aed04072d84e982cf2016ac648dbc6afa35bdc7446c2a032731bb93b227414dc75035a6c93329db3f1c2b81dc815690174f5c7d7c3a7078e5acffb4 SHA512 99b96357aa39a288a3381c8662cdb4a528fb998365d5456ba28863302cb528f568f3f7aecdb6ca830f2cda310f2a940d001e9096124a2df1ad064a62025e0e06
+AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b
+AUX asterisk.tmpfiles3.conf 88 BLAKE2B 826beba7712e4d096c5506fed353a1a21c89b4acbc6b6ae99f60fbc7e338a331056ec145bd885dd23b7058f4bdf3109d68fddff715ae32e9ec0fc88ce68bef56 SHA512 992902fd01dfd03a2d77bf8a6c7b3adbdcd769478cf0bfa019632515107222aa59b12be10f5dfd26b4e18651e51b81939f1321ae29531dda0f3a623306e6a983
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
+AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287
 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.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928
-EBUILD asterisk-13.38.1-r2.ebuild 9702 BLAKE2B e35e6757ff6429b49580eb0af9b203d9071334964ae0f588994028f14bb26b9aa1901991a6b7d00ce04c1c898276290f1b19862b15102ed5a7b1c925193ec7d7 SHA512 381907b16af92653d10df9679c770185f7fb639c63971cbf98732e856c19b08d56b6f7626753f20e4a9bd152e3290dac0742bc81e33a3abe5fefcb61dee5203e
-EBUILD asterisk-13.38.2.ebuild 9704 BLAKE2B fd0412c01c13bb1ae61afc25f7361722ffa06f0070e5dacf8ffa4752a6da27903f256cda72d1e423129f71510ef14ab59b7e48c1549ac25c883c247094e481bd SHA512 59a4471cb839682a312597ee17336a4f61c8d9fa7f3fd52b50060f4135171493cf46bf75f77e5dc2d45d8c797cbfbc0c462634be2dfdb247b4456812debac9fd
-EBUILD asterisk-16.16.2.ebuild 9893 BLAKE2B c84f1403a0405224650395cc577f3e8af06a52856af956229499f1025fb933b1dedde19c638487e4f2b84b34dbea3c4e8441ba5647ba2c9ce86721a6c02c48bd SHA512 547c80803791260513d16f73b2fbe744ca31f46d20c28aa17f13f3708533d9c66e2740a21c1af86840b75865e9368ae5477f7a22b7c5d4deadaaeae91d931ced
-MISC metadata.xml 1377 BLAKE2B 4b7f76e4834ff58ed593b7e1141b4781b6dfbfb1fb32ee7a1e4f6a982f1267f2e690409f4d6d7f7ea45d4dc8f93bda274a72d1e39d9034f39ed6386a25382413 SHA512 192b14fc1c15b7a7117ee1653adada3fdc480082d2533662c7e7c8ccd13dce08d4eb0c02413c269f544b93870a1deb60092dee8ea92abfd6ce0a39630a9807d8
+DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
+EBUILD asterisk-13.38.1-r2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6
+EBUILD asterisk-13.38.2-r1.ebuild 10793 BLAKE2B 9e0ba0d5db3f56b8726a557e8f80ac5833aceb1a023f5d107f5736a275eb3866f98eec6cc9234af73c8ecbdc44302207a0b595e89e7f2a4c578b8553037e8ea5 SHA512 d324345df46ae82b113b06746a9ee4020700de68619f1f82f7c2d41da46f8056c9479b4f9e2cea96bc964c89b72e7fc300d9d5f91162eb0e0a922170916f9b61
+EBUILD asterisk-13.38.2.ebuild 9727 BLAKE2B 23045501df1313e8eaffff84854c636b451c62d866e08faad95c5e9437c3a4663bb8da102fe41e9ca353b1f281572aafead82a6cb949db173aebf6b5f9909654 SHA512 ff7df049d824e33618e7759930df761bdb0ab5e6dca852409daff2bd94bdb84fb99ae3139e877d14655b2cd7a12ec423a87fb2a9fe8aa13c7e9cb2a29867044b
+EBUILD asterisk-16.16.2-r1.ebuild 11358 BLAKE2B 11dfe65926cad46998ccc2942e00d2a43343dee69c6a0ce2b32c070d1927a58cefba753463467d55e0c3133bb3b01941c5879ebd8881c227cbc94089947b2722 SHA512 ab299440f47d5dc2aa16af46f6859ab4317ec1d83aef853fadcc403a44d3cbc4043a9b6cfe7ce146e6b3bc5958123072e04705e80a3b964009177266a12570a5
+EBUILD asterisk-16.16.2.ebuild 9916 BLAKE2B a02bc1d09394459ca9737f43dea546b16fe3230319585bf7a86a8bbccc123342054f63578382b17bf1c02cee94749c1516860aaea383aaec173990267ba41f35 SHA512 c06ebbc5202ddbda233747120b17b2cda0cb8db4465ea5f445f0d064c8efdb49ef7cf957c5da759bc392dcb5e5805e30b47268062c94b241d2cb27e0ec33c152
+EBUILD asterisk-18.2.2.ebuild 11331 BLAKE2B 89f1eb498c7e25872918ec01a865bb00c393f4b86e6199622f49259b9ceff341c71992d99adce75d8ef808edbf4d139106c3bd41f2ee46e69e013da1b0af03bb SHA512 f4568a1caf38249e2e62ee6a0033aeb023bb0c731820b42429f02afd3f7faffa64fa66f95d708f7f19a0032bdd0ab7c830dfe5a4f985f7ff40b0f7108ccdfb58
+MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
index 00fb2c78dce3..4afefac8480b 100644
--- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
new file mode 100644
index 000000000000..93a5d9eec9aa
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
@@ -0,0 +1,348 @@
+# 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 libressl 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.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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
+	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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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.freenode.net"
+	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.freenode.net"
+	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-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2.ebuild
index 84f0aec402f7..7a8d1d57cf86 100644
--- a/net-misc/asterisk/asterisk-13.38.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	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 libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-16.16.2-r1.ebuild b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
new file mode 100644
index 000000000000..4dc58a42a482
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl 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"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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
+	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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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}
+	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 < <(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.freenode.net"
+	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.freenode.net"
+	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-16.16.2.ebuild b/net-misc/asterisk/asterisk-16.16.2.ebuild
index 6a7ee37f0807..2ca6f4a6d01d 100644
--- a/net-misc/asterisk/asterisk-16.16.2.ebuild
+++ b/net-misc/asterisk/asterisk-16.16.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -101,7 +101,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -292,7 +293,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-18.2.2.ebuild b/net-misc/asterisk/asterisk-18.2.2.ebuild
new file mode 100644
index 000000000000..c253eb63cf92
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.2.2.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl 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"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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
+	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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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}
+	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 < <(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.freenode.net"
+	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.freenode.net"
+	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/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
new file mode 100644
index 000000000000..90c97e9df5e3
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
@@ -0,0 +1,67 @@
+From 840eaa67e1ee0d10aa6bfb1e34659efa3095b772 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Sat, 13 Mar 2021 13:01:50 +0200
+Subject: [PATCH] menuselect: exit non-zero in case of failure on
+ --enable|disable options.
+
+Change-Id: I77e3466435f5a51a57538b29addb68d811af238d
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ menuselect/menuselect.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
+index 2eea3f09eb..adb6fa1777 100644
+--- a/menuselect/menuselect.c
++++ b/menuselect/menuselect.c
+@@ -2090,6 +2090,7 @@ int main(int argc, char *argv[])
+ 		/* Reset options processing */
+ 		option_index = 0;
+ 		optind = 1;
++		res = 0;
+ 
+ 		while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+ 			print_debug("Got option %c\n", c);
+@@ -2100,6 +2101,7 @@ int main(int argc, char *argv[])
+ 						set_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2109,6 +2111,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 1);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2123,6 +2126,7 @@ int main(int argc, char *argv[])
+ 						clear_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2132,6 +2136,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 0);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2146,7 +2151,6 @@ int main(int argc, char *argv[])
+ 				break;
+ 			}
+ 		}
+-		res = 0;
+ 	}
+ 
+ 	if (!res) {
+-- 
+2.26.2
+
diff --git a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
index 63b2896bb097..cde9ea0e15ae 100644
--- a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
+++ b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
@@ -5,7 +5,7 @@
  NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
  OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 -INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
-+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" \
++INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" \
  	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
  	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
  	"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles3.conf b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
new file mode 100644
index 000000000000..7af4ed720d43
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
@@ -0,0 +1,2 @@
+d /var/run/asterisk 0750 asterisk asterisk
+d /var/cache/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/confd-16.16.2-r1 b/net-misc/asterisk/files/confd-16.16.2-r1
new file mode 100644
index 000000000000..a2da978af924
--- /dev/null
+++ b/net-misc/asterisk/files/confd-16.16.2-r1
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+# No default.
+#
+#ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+# ":asterisk" to run as user "root" and group "asterisk"
+#
+# Default: asterisk
+#
+#ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+# No default (leave scheduling to be system default).
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+# No default.
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+# No default.
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes/no
+#
+# Default: no
+#
+#ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files.
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+#
+# Default:  do not generate core dumps
+#
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant).
+#
+# Default: /tmp
+#
+#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
+
+#
+# Max number of filedescriptors.  asterisk can trivially run out of
+# descriptors.  In most (SIP) cases it uses at least four descriptors per call,
+# and this is a conservative value.
+#
+# Value: Number of descriptors
+#
+# Default: leave system default in place.
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+# Default: 5
+#
+#ASTERISK_RESTART_DELAY=5
+
+#
+# The stop mechanism to use.  Asterisk can do gracefully, when convenient or now.
+# By default we expect you to want to stop as soon as possible, so we default
+#
+# Default: gracefully
+#
+#ASTERISK_STOP_METHOD="when convenient"
+
+#
+# By default the init script waits two minutes for asterisk to stop.  This allows
+# you to change that, or even completely disable and go into wait for ever mode (-1).
+# The value here is in seconds.
+#
+# Default: 120
+#
+#ASTERISK_STOP_TIMEOUT=-1
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+# Default is to not do stupid things like killing random processes.
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
+
+#
+# ASTERISK_CONFDIR
+#
+# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
+# (typically /etc/asterisk) to be used for configuration.
+#
+# Default: /etc/${RC_SVCNAME}
+#
+#ASTERISK_CONFDIR="/etc/foo/bar"
+
+# ASTERISK_CACHEDIR
+#
+# Value: Directory to which astcachedir in asterisk.conf is set.
+#
+# Default: /var/cache/asterisk
+#
+#ASTERISK_CACHEDIR="/var/cache/asterisk"
+
+
+#
+# Normally the init script will not wait for asterisk to fully boot.  With this
+# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
+# after starting asterisk, and wait for asterisk to start up completely.  This
+# is useful in certain conditions where other software requires asterisk to be
+# properly started before they themselves can be started.
+#
+# Default:  no
+#
+#ASTERISK_WAITBOOTED=yes
+
+#
+# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
+# In certain highly unusual configurations it's helpful to also get the
+# hostname into this filename.  By enabling this option the wrapper loop will
+# adjust the core file to be named core-$(hostname)-$(date ...).
+#
+# Default: no
+#
+#ASTERISK_CORE_USEHOSTNAME=yes
diff --git a/net-misc/asterisk/files/initd-16.16.2-r1 b/net-misc/asterisk/files/initd-16.16.2-r1
new file mode 100644
index 000000000000..bdd979a56978
--- /dev/null
+++ b/net-misc/asterisk/files/initd-16.16.2-r1
@@ -0,0 +1,363 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+	ast_cachedir=/var/cache/asterisk
+	ast_stop_timeout=120
+	ast_stop_method="gracefully"
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
+	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
+	case "${ASTERISK_STOP_METHOD}" in
+		gracefully|when\ convenient|now)
+			ast_stop_method="${ASTERISK_STOP_METHOD}"
+		;;
+	esac
+	ast_group=
+	if [ -n "${ASTERISK_USER}" ]; then
+		ast_user="${ASTERISK_USER%%:*}"
+		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
+			ast_group="${ASTERISK_USER#*:}"
+			ast_group="${ast_group%%:*}"
+		fi
+	fi
+
+	[ -z "${ast_user}" ] && ast_user=asterisk
+
+	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
+			result=$?
+		fi
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-"
+				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
+				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS PID
+	local tmp x
+
+	local OPTS ARGS
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# ensure that ASTERISK_RESTART_DELAY is integer.
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in "${ASTERISK_TTY}" \
+			 "/dev/tty${ASTERISK_TTY}" \
+			 "/dev/vc/${ASTERISK_TTY}"
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : Yes"
+		OPTS="${OPTS} -c"
+	fi
+
+	if ! getent passwd "${ast_user}" &>/dev/null; then
+		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -U ${ast_user}"
+
+	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
+		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
+		return 1
+	fi
+	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
+
+	if [ "${ast_user}" = root ]; then
+		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	elif [ "${ast_group}" = root ]; then
+		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	fi
+
+	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
+
+	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
+		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
+			# asterisk can crash during startup ...
+			ebegin "Waiting for ctl file to appear"
+			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
+				sleep 1
+			done
+			is_running
+			result=$?
+			eend $result
+		fi
+		if [ $result -eq 0 ]; then
+			ebegin "Waiting for ${ast_instancename} to fully boot"
+			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+			eend $?
+		fi
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing ${ast_instancename} wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping ${ast_instancename} PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "${ast_instancename} is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for ${ast_instancename} to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 2)"
+			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
+				echo
+				eend 1 "Failed waiting for ${ast_instancename} to stop."
+				return 1
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing ${ast_instancename} to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "${ast_instancename} is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 9951bd05d61a..730a8e858f29 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,7 +13,8 @@
 		<flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag>
 		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
 		<flag name="codec2">Enable Codec2 support in asterisk</flag>
-		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel)</flag>
+		<flag name="deprecated">Enable deprecated features (eg, app_macro)</flag>
 		<flag name="gtalk">Enable support for Google Talk services</flag>
 		<flag name="http">Enable embedded web server</flag>
 		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index 1ee496f37621..ce091ec44a88 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
 DIST batctl-2020.4.tar.gz 112430 BLAKE2B 3fde106d7c422ed8bf8b259fc4cf95e0732a893eb06eb99da961c2d5664079a3611eac42491855288b42b94de75b642ea515024c309ec2d3d885ebeba828ec3e SHA512 ecb7c83883b7ae2a4cebbb4319ad7f6c2138d68b91cd24b9753b54e8b0c83080e1358dc61a6bd45d03cc64132bc4f2516b3fab422f71a1e63f53a0e2187fd7e8
 EBUILD batctl-2020.4.ebuild 768 BLAKE2B ca5d2c954323ad5bae7fd25e28d424b7aa4199c74fe0fcb830c4a1b29efb7eec557820c5002e1712398944cc6d01ad3059ade5364c2e94a20fd49111b621ab56 SHA512 4e41451bd50f8ff05af910972c7eed68f045aaf41c8e9e2a387ccf35b9f8d36d5cc09433d57ce664d242a0dbe26d6b04f92d65efe7ef49cbe73acd3d32658e45
-MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0
+MISC metadata.xml 405 BLAKE2B 719af4f8dfc3545f1a93dfc42ef385658bf2de2aad67deb3abc16f2f898dca06af6b85047cb98d83eab2dfb988f65141742f3d19119a743d5540413e3a2b2168 SHA512 6e428a8de5643d3d151ce8375e8077a7519fd9c9bb11a82a6c83d6365c4e40f7632cc06e19d0b1ce1d39da8bf79b4b4dbd8a3921af0ca19cf6e556341467f6b6
diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index fb16ff9c1889..c87c597f5728 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>info@harrysmallbones.co.uk</email>
 		<name>Harry Smallbones</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 84953a92b388..2d58ae642aef 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 5168 BLAKE2B ab41b6d6c181cce98314d227ca389d3e3d05e65b93dee4704b8cd975aec4b8ab79990c418be2bda61912de22cc612833ce0d811e16817890e59144e292782b1e SHA512 420efee89dbc369305a111c28562180008096868c3e46a30618c27978f39d247dce3e253ef14c3a4c61259380df8f19f06e426926b473badef70bef0302b7915
-MISC metadata.xml 3948 BLAKE2B 90fec0d1ed8355c7e762057e82097b2446e4ffec901cfeac88bfc556e6c4fff6eea5fbaf3bb74ad381017b0a7b68324e388e3dae8af77b630ea02c9df7d12ff8 SHA512 25ef458905a4350d93c4bd29e5b60116c25765701fd4d3e7bc46593f1b33c51aba8336e346a026ca60d1e6c71eb8c9d4780a805e1dfc87688d00dc54152b5455
+MISC metadata.xml 3962 BLAKE2B 70c28b8c2c68996fb2d3bd7f134feb618776adf3a3e8b2e080dc00c813f072c80519909149bcd5bba17904d044fd49773dffca06880f07446d39240c87bf2574 SHA512 e4fa5e82269099a6d1681c22d3b9d31e8e73bef8b0555dee227c69008b40efc191819e61f4e61a3c7d516563627c910d5c473dd7413e94451d61c21aa64eba20
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 738a929a1b2a..26e828f63199 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -5,7 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 455ba440af12..06069428d601 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -7,4 +7,4 @@ AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
 EBUILD bopm-3.1.3-r4.ebuild 1383 BLAKE2B b1c515d5b44b1c0e2199551f40a0cc53ddd6281bb6cf89beb144813b8f7c7993743c76cc2e8ced03cf1d80dfa6a6088524c091b6dc256038c63537184a12d969 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489
-MISC metadata.xml 246 BLAKE2B a423f65b437e5f5da96a548b39655705d8a48e8404fe1c9b4922a97fc8e9fd89ac3107611b95657d2c496337cbe3a6ca5d3ce4b5b79d8ba35c356e8dee07d1d3 SHA512 0eb12cecf92914383c7ea1a3498961761c9d28b9c214ddbef36050790ff1288602302b2dbf5d5fffe24efde5268bcea8bfd2d49e4f261e6126d2b275f7bf3b80
+MISC metadata.xml 320 BLAKE2B 0df7bccca17096486031e49410ea661aa6e82e5b9da83c14e193805a2635438487c8d95107b8594a6917983f7976f89fc7a89af6f3cb6cf403e4318d40b09812 SHA512 7df57a22ef6611ea0872ba4b2fd29f6f48d88c18719f032a1f664a4e97945b89d707cec3bd95a1bb9714a4916cc70863a0f1d35e43f977dd829bcdd7ffa329b6
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 389984f4aa0b..1ce1de9cfec3 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">blitzed-org/bopm</remote-id>
 	</upstream>
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
index b309da4bfca4..65515c7b0283 100644
--- a/net-misc/buka/Manifest
+++ b/net-misc/buka/Manifest
@@ -1,3 +1,3 @@
 DIST buka-3.0.1.tar.gz 14697 BLAKE2B 2aabbe6bc78105bb0a1a44378c36ec82fef23df70d7600eaaa055d524bd4d38283644c49043f8c9d77cc52d7b1762f5ea4f2ddf896c0cda85ee677018679c1b6 SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22
 EBUILD buka-3.0.1.ebuild 740 BLAKE2B b85a0c4d3f1f056cf4dffdbfc3babcc10f2afaa88ce4387e44ba9551ca38fe63894bc3cf4a0d2a66fb89862d4217125090e32f104be925926ed964d473ddbd21 SHA512 59caf324a5aee21382a32bd64a01b19b5eb1a84ed3c5b18c7d3f4426360e18729cd8db8dd08d7f97fff3a35461b5f21c49ac997cde16594ef4781f570ebab030
-MISC metadata.xml 379 BLAKE2B 328396a1e5e28ba7d2bdbd2e1f995ce5567ec8a7b6545eb7825d94b199ab3bb6d56374a9f55db936eb1e90c788a900df0fabd573e5c3f641ffe2db18a6682f55 SHA512 1cf75a0399ab55e809a151750a1c93bb3382a7df902bb5386910186b38ce70e1bee163585feac297ba823c9b5066cdac8a7ae1bdbe5db5d1d8d23eadba62eb28
+MISC metadata.xml 409 BLAKE2B 1553f1ccbf71640efd93fcd94292db388ea4ba8be42c08fb24b25b06d7843c2b558047f6fad8ec120f8d89e7a23539a74f369b4a57d2b2002f03723f7ed8fc1f SHA512 0898ca2a3e1321b43fca3f8ae9252088dadfadc40d1b077f55a28157e0a904adfd7f4f2c18901805be2e3bb1f3b82fc8d2f2099993ab31dccca34a482731f0ca
diff --git a/net-misc/buka/metadata.xml b/net-misc/buka/metadata.xml
index 833b969f29bf..fa84ebe158fe 100644
--- a/net-misc/buka/metadata.xml
+++ b/net-misc/buka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mo@dragona.ca</email>
     <name>Mohamad Issawi</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Gentoo Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 33d958be7f8c..ed1ab1132b5a 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
 EBUILD cadaver-0.23.3.ebuild 1078 BLAKE2B ce8ac416a39a65d3c543503c7b079b56220c143430cba5263202aa9883f6992a6f0dcc7fc2a998f387bb96e8af6d5460656e99694c0ff8ee11d716679084c162 SHA512 8b664a3c3a11a2a1ad5edeb217ce46c14ea691a3499613e0de6b825b76e1f8c2b78dc185515024ad0eb016eab1b1a0def7d6a575e4b7c891f019c305f3eeed29
-MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
+MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index ca82cfff518d..f51c2847f1a6 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index ecb0a969c26d..4776f524db14 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -84,4 +84,4 @@ DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
-MISC metadata.xml 255 BLAKE2B 327b939e3f064ebf891076936ec8505f1c4c0aa4651c7afb71b78803ab7088b8212357e1c97295dbd51c7da2ea9bd5cbe1b6082b626d1b6b58c46368c05842a9 SHA512 b2eca26fa24e481e0129a8a44bea385892fa08b2c0997ac719bbfbe4119cb3c2b8a8ea36e4d714cf0143b18e3b1646f9408d4d668d1b7444519b8aed7541ee25
+MISC metadata.xml 255 BLAKE2B 4b227e2dd7eeae67a74370cfd3ecd4d2d7da0e8ab31821cbfd1ca48a20c7086bb9753ce4b9b05fd8619333b06015760ad44e0e9c07836d325495f4081ef0f839 SHA512 954cdfd8db553e392d820e5d319458867dafc36607a8ca9fcf81b6e35d6491d1baccf72ec2e0673bdcbc05d0154db603a45adc0b198302ab9bce371c6636ab8c
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
index 29a7bc2a437e..885149be1d40 100644
--- a/net-misc/calicoctl/metadata.xml
+++ b/net-misc/calicoctl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/casync/Manifest b/net-misc/casync/Manifest
index 05512607903c..52d142a5b876 100644
--- a/net-misc/casync/Manifest
+++ b/net-misc/casync/Manifest
@@ -1,3 +1,3 @@
 DIST casync-2_p20190407.tar.gz 1315643 BLAKE2B 2cb52682d14a06844bb6d08d9c20d3e356fc40f464463151adee7c0446b64ba106ed29873d71d757452b3dd81095efb1b5d1014b294d58724e4c70bf404b47c2 SHA512 973b4cec8289e1223eced5794d5f6e7af25c60bd52d3c8932005ad0b55aebbebba78d5514ef7be4b3b92a76915d6e3f56bd53d797c2d72ffde2bba98f926bd3a
 EBUILD casync-2_p20190407.ebuild 995 BLAKE2B ca87f5cb5977c4501534e62ee14caa606ebe55c0c5e962d9704479c3802c70add18676b024351fd1126e77550e50e119819f9924cc8dae6a85229f2696478df2 SHA512 3339d37c9b73a11250fd0201f62e95433360244c426c49088bf4480b6e5744dcca2d5339d499d0fa06ba6c7d2d87347e5707412d29a4a9f7d1b8834a2750bc21
-MISC metadata.xml 619 BLAKE2B 581feb2dd203fbd6b9c01018f7471c257d45a5a1a8bccacd3a29ed5781bb24b88d42d14948e6c8b4d9518b91b639f197601de9f63ae9b46261378952f607b6b4 SHA512 184753b356a27654f2b0515ff4e9079d053406e7be78269064151914a09540dc5a8e8ca06b3cad43a6ef35168475f8b11005cd4ab0bd2b0919fc6bd12f86a354
+MISC metadata.xml 663 BLAKE2B 371153138e7dad559bf266f9d99a7d0ec4a62ba42897be52ea3b219ad48b26a4f98dee162e0e9e1ab607662502fb4efba42bf753f5d28cc69587524ac02c0469 SHA512 160890daa50f894fd4898f3c55ace2d51eb916d8dcfcc9a24ada713d652a1647837a10410a82c25a24376023919dcdfdba19af3934689125b5b3aeba05c755ee
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index c18a20c803dd..3a01e2fa2b76 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 9eb80025fd94..a62f4e656ed4 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,3 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
 EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
-MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
+MISC metadata.xml 2136 BLAKE2B 0f5b8a40b03a19fd5e822bd4ca2d92fb99bbceff758ccc682fd4db4e0ea4dc5d12ac6ecc09ff9f9613e35ff515f9d4faba4469f4ed79d962500b3bb43fe0631a SHA512 f811a164e54a9c4cf5fcfedc9c03dc5c0d533a6f023e02a8711969362f02bbf72e24d3846eb36e5496a311fcfa4cda0d7809679e6fee29bd43b9355e5ceb9386
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 14800d5d5ab6..877f7b644c09 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -36,4 +36,3 @@
 		<remote-id type="github">ckolivas/cgminer</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
index fb37b06217aa..78eca85ae99c 100644
--- a/net-misc/connect/Manifest
+++ b/net-misc/connect/Manifest
@@ -1,3 +1,5 @@
 DIST connect-1.103.tar.bz2 37980 BLAKE2B 5f7639c06bf1486e541003ced967c486debfacacde9701ae079fba4c41fd9c77e25c3140e6b0d52782f22912cfdbcfe59e882959b30910de55d0752ed5abb365 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9
+DIST connect-1.105.tar.gz 40778 BLAKE2B a54fdb5bc808311fb6b4c61e05fdc135db55b714c11ce64565e7e315988bc70b1b6b1c4f6857dc621b05f0434b9bed6e5507d5966e516d2ab444d5435eec05a1 SHA512 f49001043a8ffbda3823d0ea3640cc85536ce3d23302fd4d704d8a520f99271a2ed66fda11a5402382edc1dcf874988339ebcaf1d6335249a8dd2a8b4ae965a3
 EBUILD connect-1.103.ebuild 871 BLAKE2B ceeb5875db5cb34ca4c22e6cf3855f74bda7e4befd5af0e5215375d1e565ef83f86abec9e7dc2585bee7b34adfce5723c419e35bc07ee83096bfb7a0dd7eb830 SHA512 ced575df5881d3bf018fe8d46dfebd44cc7c26fc7292befe2f3d4946bf53cf1b1bcadf9ee86d1659eabf2c006bf5ef3edfc87349c4875da90a65dbfdb1b89ef0
-MISC metadata.xml 718 BLAKE2B 84b3935b798d13b3245a0beadfb4124f7bd73d88403f910210f6ea83d9c6bd67c155918496f18264879842577c52d4f60051f98edaa0c355924a33983ebcf63b SHA512 7fdb12c7a275afb669ee9ec20124811133ac4d6aada04b48c4e22a1eb98676b55b306a35138481cf8f72996635b66caed88f52d4e790015c5fb2874df06dfc5d
+EBUILD connect-1.105.ebuild 516 BLAKE2B e8be9ff6081e16d98aa1de140adef8cff02d30f016962be9a342b5c1a614614bb6affc4fe2cee1e177baf9862ca205224d3a0e4cf600123cdf96c814c6090daf SHA512 b6d9e52b58006c6ff412b353b4000c19adf385f703588a5e1aa40e9f8eb11f91df9c3a0080f91fdf1417330b5638cbe5df5450cecc33b28ef5eae16e7fb50507
+MISC metadata.xml 718 BLAKE2B b8061c57dcf69174394046128800dd1a6b90a92d759064efa069d41979b8ff546d722a7fd5a98b623d5c5377204fa8e2067720add25588b0ab4a2bccc4912364 SHA512 f547257db8b2f63faadd14c7c87db691340859ea54d11385cc685d662e10f69644d997921635044b24470aee0b3ee74dafbd6df409499e4470808ad39dcda7b2
diff --git a/net-misc/connect/connect-1.105.ebuild b/net-misc/connect/connect-1.105.ebuild
new file mode 100644
index 000000000000..b1c4c97f5b62
--- /dev/null
+++ b/net-misc/connect/connect-1.105.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="SSH Proxy Command"
+HOMEPAGE="https://github.com/gotoh/ssh-connect"
+SRC_URI="https://github.com/gotoh/ssh-connect/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/ssh-connect-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "s/CFLAGS=/CFLAGS+=/g" -e "s/CC=/CC?=/g" Makefile || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc doc/manual.txt
+}
diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml
index 423f2176b3c4..34ed245ed68c 100644
--- a/net-misc/connect/metadata.xml
+++ b/net-misc/connect/metadata.xml
@@ -13,7 +13,6 @@ Connect は SOCKS 経由のネットワーク接続と HTTP プロクシを実�
 とを想定してます。
 </longdescription>
 	<upstream>
-		<remote-id type="bitbucket">gotoh/connect</remote-id>
+		<remote-id type="github">gotoh/ssh-connect</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index f7cf79cfc9dc..d6ac785b8d32 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,6 @@
 AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46
-DIST croc-8.6.8.tar.gz 2659872 BLAKE2B a865529d44027167da83994bc682c9df789c7db8912bbf954f2a28b73990392894463da4a619ed341901939c4f6933486ccfed9aec27fbba19c993633044de1c SHA512 a94460beb120b2d15e3930f50ef0870ba82ece5cd69ce6f1af994ed9d5ed1855f7ab8bd4dcdbd76950d167e6cc66a1aff6e4b2d46a7a48ff76cceb615a568cde
-DIST croc-8.6.9.tar.gz 2755193 BLAKE2B 2cae20fa5e965bf9bb547216affcacafec25f6b24bc224d13854b876aefc35a9b442d1fdaac6af8b7ee62987a86881e6083ba3d0d19fc227f17c80902e6ccaef SHA512 474cf105e636e8c0221beca49372bf127f967b54ebc75c12642eb984f60678d17e352efe314ba16304486545c007997afc1fbd53e95c2e8b2a804a120227eece
+DIST croc-8.6.10.tar.gz 2756887 BLAKE2B 8c18ce57c470611d265ec3aa122380a24238c2f5cfe55837c4aec45577e882e888ee6595d4641acbde69c6bfb80d52f33f3d8471c262ef6dca143b3554ba879d SHA512 abcd71377c9f22376e901ceb08441c6b7ae1ae4aa444b1f52086ca06a78f3f33e8718a94829b12a49c34c17ee5fc4afa60370f02e423de37366eb7b713caded1
+DIST croc-8.6.11.tar.gz 2757822 BLAKE2B 3599c4a6bde17f7b7816c935a5de0d05269e64ecca27617b8f5b0d7510a53d0fbfec834f076f6cb68649e252abc91de1baa1c7127125937e7c2ffb59b0076cb3 SHA512 5ff0d84564f0979df850941dc6815841b18842e97b1ba448f8e2ada67ecb7e4a928a67a193b5d7b9b2cc0212cf7f9b48998a62d89df2635c526f2410257e3bef
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -44,10 +44,14 @@ DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb
 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
 DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod 256 BLAKE2B 70fa2325354dbce5bffc6b0b1a3f29e49177ce84dd79d6a3aca03178b0d79cf4630c856d127e43e66409a25db33b432a33bdc956e1da9de0d53b1c4e3d369b50 SHA512 ff7c7c934293393d8d60cdc02f35f015b5967483458417087771cff837798d44d0e1b7b79829dd97473169c042597cfda2d72865a8ed38a9181e2ae5f4fb5175
 DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip 7866 BLAKE2B f464e721e0e0d5858947c7fed35937490bc07107c7f4da81685450507cced82dc839c6c34a94da20ba1293c6c28c0d126d5383be30b73bf3fa05f767cfba29bc SHA512 ec238972ad1f967423a43e58b5758c0b064a73d7642fb2dec084540f9fb13d321e03144ab88ca0a0ed6f70ea35bf8a0448b0e838dd66bcb6d15e63e86f9c4b4b
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.mod 256 BLAKE2B 1073924c937ba65c2f09f8245fe8563c2a4d420c47c5e2e960cc73c4a9c4c8071075f057da4546423928b421f790d29ade8dccc461290a7a798fae5ffcd3f2e1 SHA512 49638a21af6b9b81810d117e6b2a35c411dfcd38cecb164cf8abba0ab22c19b2cf2bdd975c617625dc03892d12a13697462368345a2d3acd40427946e79d8168
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.zip 7821 BLAKE2B 689b5064287a3a4f1e91f53cc68c8dd02b7bff9c834bc60d93ccef9d4accd4e7c1a75550c9bf0f71c5d22888c6d8e85b2ff890c030ad8a051eaf8e160e94066c SHA512 4c82e3e8a8a88d879b8f4a30b7875ba6570b66c9bdd0804635b3ef151f3313fa9ae9bb98a52be07a1795b3295564b66330e1ee28ac64c6d8b8407fafae426675
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip 9036 BLAKE2B ee36c5c39df2e10c28c6caae3b40c876ab88fd314dfe65809f92914429156cf87eafb0f9709df8a6b9ca45427a69dc62d03591c4d3da00376c4065617f44799c SHA512 a1686577f23bdc2121197742103a4c35685e3aaf4251ee26e2352f830a1244eaaeceb859cba23410a1a12d6d59e9f62b03cd8aeaf287d10c59db6c784d51ac68
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod 595 BLAKE2B 4ceea6efaabfafc1a238f78594f360363d397d4beb9c80d449846c86955c1c40285c96fe25d6f0366fdc87ac7eb68b298271942f77c5c52ee89e192953c2f3f6 SHA512 8abe6f306b6c74794742ff4047bd70e18f3f14d5361ea91f1abbd398afda445703a5d35ea190893d7499646190bf1ce7345fab4c824b6c73a968d341b8a2af08
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip 606537 BLAKE2B c3f9914f228fc1aaefe3e3ec2a004b1284609a07b7a9099817d9bf3a2636a727c79f4acba55f2e2b33a649765b169af27940a6b821e34aea5a9f6339d2ace052 SHA512 e836b9b16a809843b69d5944088163a53520eef0edf6dc2156165e92ff5bb12bd46e7b30f54570d0e119a99fde22793c0a2d4b87bee59a566b7f07bfacca12e9
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip 606458 BLAKE2B e22a5c544a46b42aff8cdcd1fee43531d63ecd13a25b2b876004ac754c117ade1599ba14b180732361f045a13c31056db84451e98d68cacde7e285e3c86ffc99 SHA512 4548ec4cc5645c7ffbf0eba82a31512711b57368c408aebf884a314a6dfd49035f3e6391fbe526194357ce11c0ac717fd7f1d45a308832dad47e6862b1bcc8f7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -62,21 +66,24 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.zip 1864817 BLAKE2B f7eab8f9a16d94b5b316e1fa7ffe9c08bff170cebec2180e437100ebd0e8b3ea13c968a10c26ca8767f06c0a7025253d5883ca5394d6cb88888ca4e4eaae43b5 SHA512 34329ca71445a969301f1b1642db533ae0cad01d00c4071fb7a2dafda152c398e39faeb4f3e1f684d9e087024cc6155705990e38e6fb5a5c4dc87987e1bdd859
 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-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.zip 1586290 BLAKE2B 5e986f99a392d16fc359316ed193a1c0868589db0c2d7ef99347d297196e7648f3e45bf5c8f57277bd45d37cd72f8c2c6edbb597a483ea18d0841acf9845584b SHA512 9c428bbb2f92b5d082e0128dcd630f7a64c282ef92630d452f0bb5fa766af1ef7eeaf4be8aaf761999054c6796c2bf952f44e16259d7c4b6292a762175a65fdd
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.zip 1586988 BLAKE2B 0a73047c15bec39e2b1f2cd899f47507d28a26690e960089e77653409f31896536fd292e5c08e385351ec2425d4beb81b4beda3353432c49df4a66cfe8396c4b SHA512 0b8b1868ec897be3ce309249bf8b0c8152f2d8d8a3be6cc53fb25f8b432aaee85cf3b2cff984129fcfc73f61fb15a6eb67b3da3e1eb8696d17d17f02c9bd56ba
 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-20191026070338-33540a1f6037.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-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.zip 1561943 BLAKE2B 444b6ecf973f41ba36c3aaeefefe416cc2df06bea1fa9a097388f0b0e916efc90b6c3eaf98da3a3414e2eed364987a0ea27be323343ed5f49367a922941a90a4 SHA512 8fac1d3aa3a5f858a342215fa94efc8b699a8729f637cdc9aef61958bc34f2c5aa2ebab83cb0fac9cf8e3360d781e67aa963068c3f92e8fa396c77f4d51a4df9
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.zip 1672132 BLAKE2B 9bf08ec2e64ef42ea0247462512f5106aab03570d90c23c924f30cef721909d1985a138e62d21e11996fe16e8e9ad97b5fbe572093d644e56e57538b559d62f8 SHA512 1013fc72b01a96d232e611c1cf5c46ae884c30d294fafe53b0d8536f0de0204f55992d8af1d0ac3c68039a5c081ed09c3378b1250e8be7cd18290f2743638a25
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.zip 1672831 BLAKE2B 52abdc9448149a1def99bce77eaddb2481897636fe2181488ada584d15e4a6703f8f27447ae1cc2e8fa345f7f4e78d7d918032c3fbd40a83b2b66d65c9b95143 SHA512 6efa521056d306ce6ff9b135942b1b36515bd69d0481a729dfd78a1c0a7136ca65972d38a4d0df7962a6f1ec950186bb8ce58f5032567cf98c600803ff8ac5f9
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.zip 1673533 BLAKE2B 5dd8dd215ba0b2a410212363626a6e3c2d5a738cdd1c46563bdecb222487e412ff7faea05688f5b3670adafab867148bdb64ceef59ee4150b9be94f26836892e SHA512 e9880a3401a20f4e8e0304af6fb1f23aea07a06c32673a5ad8c41107bce3d5ef019614d3acf475484e27c5b60f07c6f951b6638adf7edd7adfc1c95b6337bf46
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -95,6 +102,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-8.6.8.ebuild 5551 BLAKE2B 478b8b8d16abb91b2d04aec605119c69a3373c20d15c4e5607529706ecb7a73dc9f31fa9b56d3d3c88bc46cb7cbc67bd03b8ac8665ab04054b7a826c6ec0d2ac SHA512 fe9def804f28c67423c468244f7f2ab9b22d7dc7535e97102ed5cfedbe4175457599300f3620c5d48c2a70968d971f0aeaf4969e30b539377a78f74ac3fe5179
-EBUILD croc-8.6.9.ebuild 5551 BLAKE2B 4a89a39dc5a53a3fae8889d1879a0a631a317b8425cb9f0e4e72b1b0717f5ef32421d76ea61bece4eb9739ce743cba4dac3648c115d82859dcd5a901fab3ba7d SHA512 963be9dcda3331922ee7f20a6f8491b970ba6012ed2f50dd8eba1381afa3cdb3051482f3c46ca856f1f2e5b456dcad72ade07b922a676ac5125acb37b7efa183
+EBUILD croc-8.6.10.ebuild 5551 BLAKE2B a0d53a25e9d01b975942147fb64f80415b348d0b776f9ac36769efce4cf27594f954a3fea262a8251b8130db932dc259a1ca960a23eb6153137401d1793a5122 SHA512 95036477bad3589ad50af5571d0ff0cd6cd9b6eb94d3bb982267b89f80f6e972c09f16ff86d51fe572bb254da70f55ce8c396170bf7a542c8d790d3c832d640f
+EBUILD croc-8.6.11.ebuild 5612 BLAKE2B 18ce07b68186649de78c5cf8b805d8aecbb63584b9ece77c49826779d581736234b6ebd2083f7d8df98fae1f3d2a597901b1b80ed53ca80f64b08f7c88852463 SHA512 2aa66e12e684fcdd81a5b3e3777a33191a0b9718a56a72dbdbcb8e7551ed29f62e789d6b2b2ca1b7338254152d8eec1b1e55e61484dfcc8033abc9e8cfa46318
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.6.10.ebuild b/net-misc/croc/croc-8.6.10.ebuild
new file mode 100644
index 000000000000..c2779660e2bc
--- /dev/null
+++ b/net-misc/croc/croc-8.6.10.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.5"
+	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisbrodbeck/machineid v1.0.1"
+	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
+	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
+	"github.com/kalafut/imohash v1.0.0"
+	"github.com/kalafut/imohash v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.10"
+	"github.com/mattn/go-runewidth v0.0.10/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/schollz/cli/v2 v2.2.1"
+	"github.com/schollz/cli/v2 v2.2.1/go.mod"
+	"github.com/schollz/logger v1.2.0"
+	"github.com/schollz/logger v1.2.0/go.mod"
+	"github.com/schollz/mnemonicode v1.0.1"
+	"github.com/schollz/mnemonicode v1.0.1/go.mod"
+	"github.com/schollz/pake/v2 v2.0.6"
+	"github.com/schollz/pake/v2 v2.0.6/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.3"
+	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
+	"github.com/schollz/progressbar/v3 v3.7.4"
+	"github.com/schollz/progressbar/v3 v3.7.4/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/tylerb/is.v1 v1.1.2"
+	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
+	einstalldocs
+}
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/croc/croc-8.6.11.ebuild b/net-misc/croc/croc-8.6.11.ebuild
new file mode 100644
index 000000000000..1a1cfe1b063c
--- /dev/null
+++ b/net-misc/croc/croc-8.6.11.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.5"
+	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisbrodbeck/machineid v1.0.1"
+	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
+	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
+	"github.com/kalafut/imohash v1.0.0"
+	"github.com/kalafut/imohash v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.10"
+	"github.com/mattn/go-runewidth v0.0.10/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/schollz/cli/v2 v2.2.1"
+	"github.com/schollz/cli/v2 v2.2.1/go.mod"
+	"github.com/schollz/logger v1.2.0"
+	"github.com/schollz/logger v1.2.0/go.mod"
+	"github.com/schollz/mnemonicode v1.0.1"
+	"github.com/schollz/mnemonicode v1.0.1/go.mod"
+	"github.com/schollz/pake/v2 v2.0.7"
+	"github.com/schollz/pake/v2 v2.0.7/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.3"
+	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
+	"github.com/schollz/progressbar/v3 v3.7.6"
+	"github.com/schollz/progressbar/v3 v3.7.6/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b"
+	"golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/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-20210315170653-34ac3e1c2000"
+	"golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/tylerb/is.v1 v1.1.2"
+	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
+	einstalldocs
+}
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/croc/croc-8.6.8.ebuild b/net-misc/croc/croc-8.6.8.ebuild
deleted file mode 100644
index 59a35fdce545..000000000000
--- a/net-misc/croc/croc-8.6.8.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Easily and securely send things from one computer to another"
-HOMEPAGE="https://github.com/schollz/croc"
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.5"
-	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/denisbrodbeck/machineid v1.0.1"
-	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
-	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
-	"github.com/kalafut/imohash v1.0.0"
-	"github.com/kalafut/imohash v1.0.0/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.10"
-	"github.com/mattn/go-runewidth v0.0.10/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rivo/uniseg v0.1.0/go.mod"
-	"github.com/rivo/uniseg v0.2.0"
-	"github.com/rivo/uniseg v0.2.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.1.0"
-	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-	"github.com/schollz/cli/v2 v2.2.1"
-	"github.com/schollz/cli/v2 v2.2.1/go.mod"
-	"github.com/schollz/logger v1.2.0"
-	"github.com/schollz/logger v1.2.0/go.mod"
-	"github.com/schollz/mnemonicode v1.0.1"
-	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v2 v2.0.6"
-	"github.com/schollz/pake/v2 v2.0.6/go.mod"
-	"github.com/schollz/peerdiscovery v1.6.3"
-	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
-	"github.com/schollz/progressbar/v3 v3.7.4"
-	"github.com/schollz/progressbar/v3 v3.7.4/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
-	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/net v0.0.0-20210222171744-9060382bd457"
-	"golang.org/x/net v0.0.0-20210222171744-9060382bd457/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d"
-	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.5"
-	"golang.org/x/text v0.3.5/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/tylerb/is.v1 v1.1.2"
-	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	)
-go-module_set_globals
-
-SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	acct-group/croc
-	acct-user/croc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-network-tests.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	# Replace User=nobody with User=croc
-	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
-	# Rename bash completion function
-	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
-		src/install/bash_autocomplete || die
-}
-
-src_compile() {
-	go build || die
-}
-
-src_install() {
-	dobin croc
-	systemd_dounit croc.service
-	newbashcomp src/install/bash_autocomplete croc
-	einstalldocs
-}
-
-src_test() {
-	go test -work ./... || die
-}
diff --git a/net-misc/croc/croc-8.6.9.ebuild b/net-misc/croc/croc-8.6.9.ebuild
deleted file mode 100644
index e3b197e5949e..000000000000
--- a/net-misc/croc/croc-8.6.9.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Easily and securely send things from one computer to another"
-HOMEPAGE="https://github.com/schollz/croc"
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.5"
-	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/denisbrodbeck/machineid v1.0.1"
-	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
-	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
-	"github.com/kalafut/imohash v1.0.0"
-	"github.com/kalafut/imohash v1.0.0/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.10"
-	"github.com/mattn/go-runewidth v0.0.10/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rivo/uniseg v0.1.0/go.mod"
-	"github.com/rivo/uniseg v0.2.0"
-	"github.com/rivo/uniseg v0.2.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.1.0"
-	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-	"github.com/schollz/cli/v2 v2.2.1"
-	"github.com/schollz/cli/v2 v2.2.1/go.mod"
-	"github.com/schollz/logger v1.2.0"
-	"github.com/schollz/logger v1.2.0/go.mod"
-	"github.com/schollz/mnemonicode v1.0.1"
-	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v2 v2.0.6"
-	"github.com/schollz/pake/v2 v2.0.6/go.mod"
-	"github.com/schollz/peerdiscovery v1.6.3"
-	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
-	"github.com/schollz/progressbar/v3 v3.7.4"
-	"github.com/schollz/progressbar/v3 v3.7.4/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
-	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3"
-	"golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.5"
-	"golang.org/x/text v0.3.5/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/tylerb/is.v1 v1.1.2"
-	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	)
-go-module_set_globals
-
-SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	acct-group/croc
-	acct-user/croc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-network-tests.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	# Replace User=nobody with User=croc
-	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
-	# Rename bash completion function
-	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
-		src/install/bash_autocomplete || die
-}
-
-src_compile() {
-	go build || die
-}
-
-src_install() {
-	dobin croc
-	systemd_dounit croc.service
-	newbashcomp src/install/bash_autocomplete croc
-	einstalldocs
-}
-
-src_test() {
-	go test -work ./... || die
-}
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 51aac87c03a6..8188530bd160 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -9,4 +9,4 @@ AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd4
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
 EBUILD dahdi-tools-3.1.0-r1.ebuild 2017 BLAKE2B af2c1c8dc9645139ad80ddf21d69b36d53b03c12ee80c6164906f3b5884922c1eac086e9de5340f3c073de72186277d1f6497ea6405280624a625473e5650bc4 SHA512 e2214f1d1d56ba9ca78446409e37ebd94c5fe1a83da2a25ab95f94574c568c56007b3b9dbdd43f8aaff0aaf5e1e5a081d4bec58b66cd12a5a7de6dd70ac4c83a
 EBUILD dahdi-tools-3.1.0.ebuild 1692 BLAKE2B 7ed3148872c5975ad46517a4e687509610ebe57755be7e6ffbf5b1d8617f6a4ae12b7610d30eac5192199190e160d7ea6ee791e62f66deada89c40a39c15005e SHA512 e20f7a9fb034725b1b96a23630a5bfc37d2b90bf702343577328a1c1a078094ed93085e64f5be8a627570168916ab56efdbbe697f4fded5a5f774195b7f4d5f0
-MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007
+MISC metadata.xml 473 BLAKE2B a1dc5e28f6ed28a92131b23462f4f5948643347786c3526c3496fb93f9f3d4d7b15afbcab367e9be32f8c99248e72abba5c9ce130ed1014a522be5aae3f1d241 SHA512 be7ceb43b06eedba076244b078ded1288e3509cfcc7df4513d2c4d9bb8b5feb356e2890e51ed7ff825a8b568e61273499e0d12f080c96f2014ba0a48af77289b
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
index ae2616ecadf6..d83f18262125 100644
--- a/net-misc/dahdi-tools/metadata.xml
+++ b/net-misc/dahdi-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jaco@uls.co.za</email>
     <name>Jaco Kroon</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 995304d61fc6..b2dabc3d2758 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -21,4 +21,4 @@ DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c2
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101
 EBUILD dahdi-3.1.0-r3.ebuild 4806 BLAKE2B ae62f4327aa2a8cb09a5892230e2088c5533fb5e33c8480c119c6e58ea2695485ebecbd2bf4c0cdc73202e83891f1a5ae49a06ddda44a28b652e2c5049300666 SHA512 d1851513061f7b66728415f7c041bdcc16de673d571ecf5010a5e443be4db95d7d640addbb511ec39e2b850fbe4c34b369f43207a66306cc110cb1558f963f6a
-MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
+MISC metadata.xml 569 BLAKE2B 29c44b59081d83f8d8fe32b9ae21809295dc07707d14947c1e1a4bbb3b5d183938053e521c743f0fdfa0131cb42a464bd688da35b7d600f30944af714901f8ca SHA512 a69687c4a087484a60a1dc10993706fe4ef9799d226884d93788d9f726196ae3ccdce2a0f458202b3974c55aa8e18e0debec10116c6b86386331c3ae955adbb6
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index b132a89f1bb6..c9622099c1ca 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jaco@uls.co.za</email>
     <name>Jaco Kroon</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/dhcdrop/Manifest b/net-misc/dhcdrop/Manifest
index 53c94dd1ccf5..e20f2d8c97a9 100644
--- a/net-misc/dhcdrop/Manifest
+++ b/net-misc/dhcdrop/Manifest
@@ -1,3 +1,3 @@
 DIST dhcdrop-0.5.tar.bz2 279218 BLAKE2B e09921633e00b17ca703400bbb50b5551266b80521985c57501e4d94eafca3da6d35c55a78bd98ec832f733e5a11321b2ba56c301aa14e21b0b1fc3e582851b7 SHA512 11ac0ca6dcb65f696936e47e43cfbdd59083b607b26b5d12274cc04577be257dda94e9c27eb0c4aebb40f5f572693478cceb04cc4b5b06bf8882c3001fc46142
 EBUILD dhcdrop-0.5-r1.ebuild 715 BLAKE2B fb01a2f4f786208f2d9b46565b467eca502988abad809f228678d81ee6754ae414b7b35129d1b6690470b580d29968c3ba494695d8cb57a418347102599f3cf8 SHA512 3f0d28f9765cb1545ad5abad5f6bdd98fea24082c7770f2ea6a594aa9cc82b2e5b4122ba381ef5d0d2ff294ebb22fcdda70ff49b9a7c59804be24c7a1ffd592a
-MISC metadata.xml 996 BLAKE2B dc9777bace1e52c34401d45b387e3583d25e6c93208d884f4fd61a895fe23c9d7143a4438ce195fbe822a7488ee4aac1eb9b6ece7c2801af79bed100c9eac63b SHA512 3096fdaf9def441097b4464fb69719ec46b633d3d3623079a55fb14ed264431c116e36361803d54e907673e27b30428687d60c60aa7ff490938d61b90fa35fc1
+MISC metadata.xml 1026 BLAKE2B 2bea43e6bd0d583990869f8567771181d4825ae641ab70b79950af20bb59ee236f80401c1aea57a92e2b67bae14629c1bb0dc4daa1f08290c4a07ba3354c41f5 SHA512 ebdf84aca965d7cb6fbc25c60296fd15fbeb95fd714b1ebc3f08320f2e83738e89e244f5332c76fda90d8542727183efa56107cfcca56fb6316005109bfa35c3
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
index 1c32710ea3cb..733598fc3e29 100644
--- a/net-misc/dhcdrop/metadata.xml
+++ b/net-misc/dhcdrop/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 7d1fcc2a5bd7..57e01f355dd3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,6 @@
+AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a
+AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0
+AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e
 AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
@@ -7,7 +10,8 @@ DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da6502
 DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
 EBUILD dhcpcd-8.1.9-r1.ebuild 4505 BLAKE2B a1646a494c20d4d7038ec42941e4afaeac4cf1b2246f89eca4614ef060ad31813575218a3fdd121566001a0c41cf316ca50d91dde3ecd11603cd48c6d4bb47d0 SHA512 3ee0e788ceb7534702147458c192c57aed9e091a94cf0958f28f2a108890f1e07079aa024e964e9f529c62d2c1ce89cf3c54023d9f90ba34f41c9e24e3132ea4
-EBUILD dhcpcd-9.3.4.ebuild 4610 BLAKE2B b7ffc110a6a21b6c62e7f28abbcffb782bf0de08663a79fb2dad8ba9f924890f17385ef3bba1b7c57853a13dba54c76f3d076e2e2cffa3424084d7fc8a9839a9 SHA512 c69ebf80755230e6e88cf2547351c9f7f4702215fccac87a032bed0b9c969efc31d6f0a3696041b5488aa3f3a2978db1f287882d49a7cec4b489f81fb45a4224
+EBUILD dhcpcd-9.3.4.ebuild 4676 BLAKE2B d7015dcb29660199edc472049b8dbd7eff7f7bf1d8d2ff91a28125056dab73cb5292ca8d5e106381a6e1a3c0baae5f537b0d64822a10da331d0404100babe245 SHA512 2260f54aaed43a4eeba216b1dd930bfa63692336c6ee93f5db2f1c46e23d8ab0d0bb1b3910f4feb240ca833ba8039b6b1d3cff9c1f3eb03e6957192c7bb9e181
+EBUILD dhcpcd-9.4.0-r1.ebuild 4752 BLAKE2B 5b8044625fd6cfcceced8c61ec58d821854e730e5563acade906f66039e1414f3414b8e454e39120d638eaab64840c6de20a135085e1b745f014d5edebceba4e SHA512 bc1ac38efdf606c7da4d12573741d9b6bbd626c056cfa4f4cb4e702448766540e5969cdcdaee354948667255694c015f13b4d0ed2abab456df69062506a4b02b
 EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
-MISC metadata.xml 646 BLAKE2B 80de0aeee2dbf33f6bebf9a64be5b13a8eb078e7693157ede4e31bc2ab86b9588b40949af7c9dc511e679202640a7c053689a5c562dadcedf9216d9dce25b1e6 SHA512 5917c153c5fa048bdca17cbcd0b5ce81a152635de166fa140ced7e46bffacc9e2335092d8c4454fd33515a8d28cb8b1f114dcef8465526837477a90dd20e980d
+MISC metadata.xml 702 BLAKE2B 8fb8f980d543f5dc016383e89bf69a952a3bcfd47ee750ba241e0e77878fc886105607cf3de196fd43a4bba259591d53bbaa902b9c9d216b285f8cfa3f179c6f SHA512 3f8b3d9d8a41addee641c06cc2bc717f00787dd04450e68807e92345b19d1b45a1b17145a4d3adf42dea4c4e525cda058ed3559818d3893de60da2a3d4e45df1
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index ab2855813cd2..90ee346ea29a 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -33,6 +33,10 @@ RDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.0-sparc_privsep.patch" #776178
+)
+
 src_configure() {
 	local myeconfargs=(
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
new file mode 100644
index 000000000000..51628651f42b
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-memleak_fix.patch"
+	"${FILESDIR}/${P}-unlink_socket.patch"
+	"${FILESDIR}/${P}-sparc_privsep.patch" #776178
+)
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
new file mode 100644
index 000000000000..61aed69656d3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
@@ -0,0 +1,36 @@
+From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 24 Jan 2021 22:53:20 +0000
+Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is
+ reopened
+
+---
+ src/logerr.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/logerr.c b/src/logerr.c
+index 21e933b8..35268870 100644
+--- a/src/logerr.c
++++ b/src/logerr.c
+@@ -484,13 +484,14 @@ logclose(void)
+ #endif
+ 
+ 	closelog();
++#if defined(__linux__)
++	free(_logprog);
++	_logprog = NULL;
++#endif
+ #ifndef SMALL
+ 	if (ctx->log_file == NULL)
+ 		return;
+ 	fclose(ctx->log_file);
+ 	ctx->log_file = NULL;
+ #endif
+-#if defined(__linux__)
+-	free(_logprog);
+-#endif
+ }
+-- 
+2.30.0
+
+
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
new file mode 100644
index 000000000000..a91db28d08c7
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
@@ -0,0 +1,40 @@
+From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 5 Feb 2021 09:25:12 +0100
+Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
+
+Fix the following build failure:
+
+privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
+  203 | #    define AUDIT_ARCH_SPARC64
+      |
+In file included from privsep-linux.c:35:
+/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
+  392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
+      |
+In file included from privsep-linux.c:36:
+privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
+  215 |  BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
+      |                                      ^~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/privsep-linux.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index d00894ab..5c80c1b3 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #  endif
+ #elif defined(__sparc__)
+ #  if defined(__arch64__)
+-#    define AUDIT_ARCH_SPARC64
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
+ #  else
+-#    define AUDIT_ARCH_SPARC
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
+ #  endif
+ #elif defined(__xtensa__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
new file mode 100644
index 000000000000..493e9c342f51
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
@@ -0,0 +1,55 @@
+From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Tue, 26 Jan 2021 17:37:29 +0000
+Subject: [PATCH] control: unlink privileged socket when shutting down
+ without privsep
+
+Otherwise we have a connection refused when dhcpcd starts again
+as it sees the stale socket file.
+---
+ src/control.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/control.c b/src/control.c
+index 71405ed1..a601ad0a 100644
+--- a/src/control.c
++++ b/src/control.c
+@@ -50,7 +50,7 @@
+ 
+ #ifndef SUN_LEN
+ #define SUN_LEN(su) \
+-            (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
++	    (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+ #endif
+ 
+ static void
+@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family,
+ 	}
+ #endif
+ 
+-	if ((fmode & S_PRIV) == S_PRIV)
+-		strlcpy(ctx->control_sock, sa.sun_path,
+-		    sizeof(ctx->control_sock));
+-	else
++	if ((fmode & S_UNPRIV) == S_UNPRIV)
+ 		strlcpy(ctx->control_sock_unpriv, sa.sun_path,
+ 		    sizeof(ctx->control_sock_unpriv));
++	else
++		strlcpy(ctx->control_sock, sa.sun_path,
++		    sizeof(ctx->control_sock));
+ 	return fd;
+ }
+ 
+@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family)
+ 	if (IN_PRIVSEP_SE(ctx)) {
+ 		make_path(ctx->control_sock, sizeof(ctx->control_sock),
+ 		    ifname, family, false);
+-		make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock),
++		make_path(ctx->control_sock_unpriv,
++		    sizeof(ctx->control_sock_unpriv),
+ 		    ifname, family, true);
+ 		return 0;
+ 	}
+-- 
+2.30.0
+
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 4b1d24a8fad0..45f27d424f62 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">rsmarples/dhcpcd</remote-id>
 		<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
 	</upstream>
 	<use>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index bf1c5d76ed68..c3675b9d1b04 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-117.4.378.tar.gz 98240407 BLAKE2B 2a4a1f2967cc3b4fb59461d3ab94a8cb120db5ec3283d4ef0b1b13ad69e903bb87e11dbc72b1d1e2969aded63f03390af0087026864699c679276d195ec6e54f SHA512 261aad190643e02a102b70ce5418cf61f8affcf3607e6b35d91ec5713fb7ee058d2e20390fd6e8c434ae69d6f888ff390b12d2f544aa2b08a7ac98a9c545811d
+DIST dropbox-lnx.x86-118.4.460.tar.gz 98620060 BLAKE2B 3b2aa51cd93d2ccfc78efe434ba2fd2a7bf270c54e64d009ce7d82927b85805d1616525aa8433afe3c59c8b7d15b3cfd129b8f85a504210e05fd2d95024e9589 SHA512 1858c1bafcb87cf5db44549ac3b12f56402ac2ef63e959d9d22a42952ca4a620115f92021736560e350730a5f5f0da52abf2d5b5c7765f82e39fb4f9b76098e4
 DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7
+DIST dropbox-lnx.x86_64-118.4.460.tar.gz 102012647 BLAKE2B 87ee9e246e5e4c7cd4b5fe7aacbbe028ebec3f02abf650b1d8d8f867aea0900d05ae697ec02916b59b19ad3049606bfa1c63a286f7d21a335650a4322978c345 SHA512 206bb2bc4932d0784438df8de4dfecbbc6deda4ca71f8cd5dced17066293f41f8a722d7e05516e24fcc163cdb9e475733d75d19b369a7f63b3a7f1a966f0d5f4
 EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
+EBUILD dropbox-118.4.460.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-118.4.460.ebuild b/net-misc/dropbox/dropbox-118.4.460.ebuild
new file mode 100644
index 000000000000..a77b20f7a3b2
--- /dev/null
+++ b/net-misc/dropbox/dropbox-118.4.460.ebuild
@@ -0,0 +1,102 @@
+# 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
+"
+
+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 695d7280e9df..04c2a970b8e9 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -3,4 +3,4 @@ AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa15
 DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887
 EBUILD electrum-4.0.9-r1.ebuild 2260 BLAKE2B e3e444bedf6174076d32d72e79328500045d0ae51a1d4b4beb939a4260e876eaec449d7a5ac4eda90ffb339530130e9ecf9932f166b0e7b91bc4de58ffae9f41 SHA512 eff401fec30e5ffa40659fef0e15665211bc09324ff4d3ff0677a3c019d19871b49a54fbe72f4c05d449660e27fcdf9bdc51ec745451d429b72cc644dad65216
 EBUILD electrum-4.0.9-r2.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
-MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
+MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index fdc8f0ebe23a..2d07da28fd0f 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -9,7 +9,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index dc127bb4efdb..c6d1341e5a7d 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -2,4 +2,4 @@ DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda
 DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770
 EBUILD ena-driver-2.0.3-r1.ebuild 893 BLAKE2B d888bafc4744911c91759f85013008dacf2aca3fe5f6fe5d504412a451dd32d65b8fc4ffdb8b44435826fcfbdb021e52b668ef2ac05741beda8da22d0a5deec0 SHA512 39658ba6890efdfde3ddfc43aa81072e20f52ec1da992434544fef65173fecf0a69f6e087aff77fa2b5a90fa2372c88a0077c7b6f708e976fdb13eae9b30e2d7
 EBUILD ena-driver-2.2.3-r1.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d
-MISC metadata.xml 346 BLAKE2B 52871ec0869c595fe75316469f0ad9174ebf75131f1d894ee9ce31c44ef34869c834c95ddd59efa150a80c086c9c1c5beac71089727359e9594c32687735c9ad SHA512 89d1251ed79b0ec69632b6f672cc4282ff6e10ba42bd6b8f2affe3e59bbd066cbee11d82fcdd136ca2eaba12965ab5f8ead246b69907a99c862a561171d83b1f
+MISC metadata.xml 346 BLAKE2B e9e6ee8a307a333bc5ba90542031ff5ace4d4f66aa9bd6340cb3c6fb246c3a0889be2f956db9f8647caa646eea89ad5fb8272179635f328731a826caea99f4b3 SHA512 29838725724233d10c1b07c4611957836315a439267257ab075b21b7ef459fe10f1b667abfa2ef64e6756de40c499aae06e87f64330df93a4f936e15757b4894
diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml
index 3a5763bb8cf6..82e6e4a156e6 100644
--- a/net-misc/ena-driver/metadata.xml
+++ b/net-misc/ena-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index cc87e7761f20..e496f2f14f60 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -82,4 +82,4 @@ DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
-MISC metadata.xml 328 BLAKE2B 8c882f303485c68cd1b46cf55f194d15b2e6e191de8ccbeec7756ef43485e868b950b6138e196b465cbfa07da1df0ff5d7dc9441b349485b6cc55334add26f4d SHA512 39c22655bf9f27a303631f7640be0d375bcd3c25b82df94da86d814614b16b94b7237bbc112e3deadb6489d090dcc59060c6d186a9790d29886744942b5b156f
+MISC metadata.xml 328 BLAKE2B 44deddf021861c9c3e343960d577a11a8c886cbbd6984f1cb9294e6931596e1a6e278b2b1e40d47dc68135f6b6aa6fcfdf2d2f64b7a989bfb4dbd112de440681 SHA512 6cdb460f0d3324ac551281855a539384307afe31c6e3e05060276245c9871c859c993c89b8eef1f9524a96a0c8d7e30a24ccef4b73a8849aa12c2903b8648035
diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml
index addb25dbd114..13b40a436c81 100644
--- a/net-misc/felix/metadata.xml
+++ b/net-misc/felix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index b23d2b731fce..2626559e7b4a 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -5,4 +5,4 @@ EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402
 EBUILD gallery-dl-1.16.3.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 EBUILD gallery-dl-1.16.5.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
-MISC metadata.xml 763 BLAKE2B a13defe6718f4fa859877881e2fa08963dc284fb2ccdb36b7145bfe2aaae551483551f2ebc3c1410df7ef1fca2ba161936280e8a745c29322bf4e70d0e45bcde SHA512 1467b9c9f727a5dbdd97ae1c0e66844721ec17443ba08cdc77731a1d3252277722cb719892409b079db1e6bfa9185cf3f87dadaff5c8eaf90955fc294dfd7d44
+MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
index 63a2a6768ea1..edf54695db5b 100644
--- a/net-misc/gallery-dl/metadata.xml
+++ b/net-misc/gallery-dl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 9a32a67fa484..621414c54f69 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,10 +1,6 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
-DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
-DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
-DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
 DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3
-DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
 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
@@ -40,9 +36,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321ea
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
-EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
-EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
-EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 EBUILD geoipupdate-4.3.0.ebuild 2787 BLAKE2B 748a78c6fad95c490c683203f7a2b8dbf193c5dfc6e2e46829f5a0fa17b6b38b6d889f73ceb428f84fd083d17a61a715e6e12031771dc80b7e6ede417be04dc4 SHA512 951ed051f904adc8ac3d6626135b25668540927f06ff6e4d09a15e5b1c5fac6152702e7556a5753801e98e496079202addb4ebf0aa095f5528fe914644627c52
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
deleted file mode 100644
index b80672ca8484..000000000000
--- a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/geoip-1.6.0
-"
-
-src_install() {
-	default
-	keepdir /usr/share/GeoIP
-}
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
deleted file mode 100644
index 6935a3f3a365..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/maxmind/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://files.adjust.com/${PN}-vendor-${PV}.tar"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( GeoIP.conf.md geoipupdate.md )
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	tar xf  "${DISTDIR}/${PN}-vendor-${PV}.tar" -C "${S}/src/github.com/maxmind/geoipupdate" || die
-}
-
-src_compile() {
-	cd src/${EGO_PN} || die
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export GO111MODULE=on
-	export GOFLAGS=-mod=vendor
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	mkdir "${D}/usr/bin" -p
-	cd "src/${EGO_PN}/build" || die
-	cp geoipupdate "${D}/usr/bin" || die
-	keepdir /usr/share/GeoIP
-	insinto /etc
-	doins GeoIP.conf
-}
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
deleted file mode 100644
index 37d94082af11..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/maxmind/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="
-	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( GeoIP.conf.md geoipupdate.md )
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_compile() {
-	cd src/${EGO_PN} || die
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export GO111MODULE=on
-	export GOFLAGS=-mod=vendor
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	mkdir "${D}/usr/bin" -p
-	cd "src/${EGO_PN}/build" || die
-	cp geoipupdate "${D}/usr/bin" || die
-	keepdir /usr/share/GeoIP
-	insinto /etc
-	doins GeoIP.conf
-}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index ea915d39b1db..1e9b54a6d4a7 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -2,4 +2,4 @@ DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36
 DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B 58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05 SHA512 a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
 EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
 EBUILD gns3-gui-2.2.19.ebuild 1099 BLAKE2B bb40c8d8b4fa70391019d3cdb7c09081db92ea33303185a6d4d5a9811ff48bb0fedf9239ae82da2f60f73907cc6e4bc35cd5bfd7cf230c6b8d632cb8df66323f SHA512 aef0c60f7051d94577c2affc687c924095970e810bdab540ed0fbd690722ab20bd61bc4f844d0b2ab795c91a45f4fede9e86ba87f0696af979c3ece6b9a806aa
-MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
+MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 99647f7dae74..f38ba8834651 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 4b279be35983..5ee23da0445b 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -2,4 +2,4 @@ DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324b
 DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
 EBUILD gns3-server-2.2.17.ebuild 2141 BLAKE2B bdf09970f3219a647417c16be639efc24db650957ecc8d1d33b0a782aa428f1499faa34e9e3147fd1ee0359937da6d0cd8714e849eb29246678e8dd4f306bc43 SHA512 9adc66b53022286421d46f591ef79eefb1b186376a5cee802c41b1a89e770e0ac7972c1b748e570da4dedb42473f6d89d032e698c080ff8f96e7fa3b29775507
 EBUILD gns3-server-2.2.19.ebuild 2113 BLAKE2B 7350a2d2acce98ebf3e5d468b51eb21a05982c42c4afc75398940632b3ddd27c720f9d917d2385a1556ac4e0e2ac75fe6f084e78a884225f32c614ab072313ac SHA512 235e8acfee7f30f7ba7e6de65b36bfa710a06cf2154630ad34b87d59846e5431837865557b3cfae7668a613f9151e34cca0f371f39bd1e24e988b17e90c7cc64
-MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
+MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 99647f7dae74..f38ba8834651 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 682086c422b9..573214c62b28 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,9 +1,3 @@
-AUX gsasl-1.8.0-sasl-gss-extra.patch 950 BLAKE2B 958805e574a26f13a199eb5f53df9830586d8d3e81c32bad9a4c711c57ee097139c2653426eed3045f16bd76e4ce1c2bb6ed70fbd378266fedc8247da2a815ab SHA512 0f8ad16b96265221bb045b19724b7a247350e9503b7e5abc92905cc07c11bdafb9a92e91d1959d33075ec96631e6f033b20192993c9ee732d71d86ba5ac3fa22
-AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a5f1bd34c40527edf65a2aaec81a85004106a229f18c0d9d623d81e6e98f1786b213b2e6481814b1ee0e11c44eac9ff33d SHA512 ea406d5de99ebbff454ea453cc3c857c79d0120405d772cd893a03840d720e97000bd1edac1ec52f44208146287531a268bd582a0e146b6097b48671b92b9c88
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
-DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
-DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
 EBUILD gsasl-1.10.0.ebuild 1779 BLAKE2B 416e387229cc0a178d948053793d7f6c010f32cae055900323a5152d1863e706bde9659dabf9ca96559e1c88711366dd7d840cf1b40fa45b74990cd39c21b2e3 SHA512 dba3b09d9e235753231b83ca2689018336c17d063b98ed485a490296df56d29f436a8f4f8f20bb97adcacef745f876522ee722ad69d38b51fea4980543bc6327
-EBUILD gsasl-1.8.0-r1.ebuild 1840 BLAKE2B ee6f2e8631f11e3feeaa08b3536d7398c3dcaac7757a47c26cabe85a677580d1dbf381c61d207600a9499b5b4c22130e38fbf277a6a8e7519bcc64b265994633 SHA512 bb91d61532d7743c7bd97707e24628cbcacbf02accaeeb74af9a0621f0caa014824de4bfd3681cf025d533858883adc1d9b157a024cf7c653cb5b6d25a6d8702
-EBUILD gsasl-1.8.1.ebuild 1840 BLAKE2B cd9a24685a71838e915ddaa90921c5e9f4cc94e487fbf9b86ba33dd0ffa91521a5700f2b0f378c9c7463372320393febc3896814677820343202cd672cdc1fa5 SHA512 dade3867fbf769c5b4dd2cac931f00c1b48c5a8aa9309bdb7f54a22eb78ce354476d42485787a0b35018010fb6eed6edeee5d7ced12fc275d7df7c6acd84fe64
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
deleted file mode 100644
index a3eec016e40c..000000000000
--- a/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Based on gentoo bug #359005
---- a/lib/gl/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
-+++ b/lib/gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
deleted file mode 100644
index 6aff3878a05a..000000000000
--- a/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Based on gentoo bug #359005
---- a/lib/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
-+++ b/lib/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
deleted file mode 100644
index 35ba6ca5ea1b..000000000000
--- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# NOTE: Please bump with net-libs/libgsasl
-DESCRIPTION="The GNU SASL client, server, and library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-sasl-gss-extra.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
-		-e 's/ -Werror//' configure.ac || die
-	sed -i -e 's/ -Werror//' lib/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	econf \
-		--enable-client \
-		--enable-server \
-		--disable-valgrind-tests \
-		--disable-rpath \
-		--without-libshishi \
-		--without-libgss \
-		--disable-kerberos_v5 \
-		$(use_enable kerberos gssapi) \
-		${krb5_impl} \
-		$(use_enable kerberos gs2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_enable nls) \
-		$(use_with idn stringprep) \
-		$(use_enable ntlm) \
-		$(use_with ntlm libntlm) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-
-	doman doc/gsasl.1 doc/man/*.3
-
-	if use doc; then
-		dodoc doc/*.{eps,ps,pdf}
-		docinto html
-		dodoc doc/*.html
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild
deleted file mode 100644
index 06d078bb87f4..000000000000
--- a/net-misc/gsasl/gsasl-1.8.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
-
-inherit autotools
-
-# NOTE: Please bump with net-libs/libgsasl
-DESCRIPTION="The GNU SASL client, server, and library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.1-sasl-gss-extra.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
-		-e 's/ -Werror//' configure.ac || die
-	sed -i -e 's/ -Werror//' lib/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	econf \
-		--enable-client \
-		--enable-server \
-		--disable-valgrind-tests \
-		--disable-rpath \
-		--without-libshishi \
-		--without-libgss \
-		--disable-kerberos_v5 \
-		$(use_enable kerberos gssapi) \
-		${krb5_impl} \
-		$(use_enable kerberos gs2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_enable nls) \
-		$(use_with idn stringprep) \
-		$(use_enable ntlm) \
-		$(use_with ntlm libntlm) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-
-	doman doc/gsasl.1 doc/man/*.3
-
-	if use doc; then
-		dodoc doc/*.{eps,ps,pdf}
-		docinto html
-		dodoc doc/*.html
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest
index 514e53638c71..fae15746673c 100644
--- a/net-misc/gvrpcd/Manifest
+++ b/net-misc/gvrpcd/Manifest
@@ -3,4 +3,4 @@ AUX gvrpcd-respect-ldflags.patch 465 BLAKE2B 1dc62e0caf54d120bdeaa3ad621f624ef00
 AUX init.gvrpcd 1055 BLAKE2B 6de4641a5c383769a8da604dc37a915a165a3164d4430a4ab70d8cd2a001e77dfb06ff60f22c830efec84a71e4155e7896c9de5c858e5279ebdb5a330d95212c SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7
 DIST gvrpcd-1.3.tar.gz 12066 BLAKE2B dbe28e45b9efdeca7f4d21fdd3e4cf0470b3cbe90866ee024ad0b681b6a6825ca9844cb06e58eaae95fe38561caece1607c0c0473dbc85affcc72b6be966eb86 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444
 EBUILD gvrpcd-1.3.ebuild 737 BLAKE2B 85699f26af1e8bc2d9956b3fb0e1ae1ebaea5e6508c0d847ed15b4760ab7321a7b51c7564ab79ff3428ae923b2d33c4ff4002ce28444bb7f981abf0a362fbe49 SHA512 ee9de9b7741ec07bedcabe3d800f33de9feadefcc208087020f4baa670805c2927c738e0b08dad0824c4f7afd5ea8768d8f0cbd64f0c0d51e9d201e3cfec02a6
-MISC metadata.xml 483 BLAKE2B eb82f8d2d463c50807774872581c5e76baecbf79f1ab244fa9839617945fd18c360dca961cfbc9b2df000d587877fe79ec53cdfa31f7a5ac56603edc88535bb1 SHA512 cab674a9dd6cd23a1be6b39c0d336053c4aedb85e46757b635c5842d28add4e526ccc3609065017384485cefae32f155e7e325728078f5b0f88abd2e0885185d
+MISC metadata.xml 513 BLAKE2B 969f21c45edd61752599bfb833e53a4e9e24658bd9e927a121dc15d1aebbaf7b60ef406de62d30770be779a8241ce288dbc765734d272f98dc21e491916b9fe0 SHA512 f5cd1e6f716565568ea62daf112681aa7a51c851a8288b66e798501dc52b974254739309612f82492ed379f59061f9fd1dca5b0ac141101751398e5d7c188935
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index b326bd295ec3..12b6b303c561 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 5a37582153cf..e6064ebd3f4e 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,4 +1,4 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 EBUILD gwhois-20120626-r1.ebuild 1356 BLAKE2B ba40647d5f2ba2c288fd35f4eeb32f01e37d5853a72e3a3fd2d3ffcb0668e949da45c9bad2420bc39cb1ba38baa46af11328b9ae3234e7cdf4acc202df5b2983 SHA512 ee2c6aca920fe76516f25bc09be95faccbb0cffd49ad4885d729bf11c637def0e2e111495a06ff373d4d9ff4980502ba413efe58967c9d514de0fead99451ded
-MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
+MISC metadata.xml 529 BLAKE2B d2a0de62ccc31e9909a4a9d51d4c4443371a569594ec6e9f9d0111ecafe74317a52adc963094e3557f61b9bae0700e4c728450cac6be03c51fdabda1f084f9f7 SHA512 8ea0f604c288509e3097dec79009524f489f1f86b5147962cc4bc1d9755696176c18f8e2a5b30782eff23b4c20923ea6648ee363accc6712f0b72fb5e8c64718
diff --git a/net-misc/gwhois/metadata.xml b/net-misc/gwhois/metadata.xml
index 878291580359..738c7375627a 100644
--- a/net-misc/gwhois/metadata.xml
+++ b/net-misc/gwhois/metadata.xml
@@ -11,4 +11,3 @@ gwhois は (x)inetd 経由のプロクシ・サービスとして利用できる
 ライン操作の一般的 whois クライアントです。
 </longdescription>
 </pkgmetadata>
-
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index 99cdeff97a6b..7ed89570aebb 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,3 +1,3 @@
 DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2
 EBUILD hashcash-1.22-r2.ebuild 650 BLAKE2B b5db1d10663185b0413120f94f394d7758796a2e2f7ef9101194f850bfadff2673de5f5ac21ca37aa6dd718f882c40e8b5fe038dc0447050dbb69d29d1505c60 SHA512 b977fb72b9d6bf9f4490079e6e51bb10a7ec6d193d51a0baf3836505038d11ab92157a348f002fca61de6111a6aef8be531d56a2d86c7c42f5e8e4b02db18072
-MISC metadata.xml 367 BLAKE2B c8709da086e6c51fe3535a4e70e63f671f47b9c5cf79e3d12becc98c037d858d4f9e2d34e05dfe534a774cfe1cf87b93e00eed956fc02342d06e64515ef1a7a0 SHA512 4f1cd259215742388e22ef660d3386bd9c887a96269989e18f8390a04c5ad1ed832cf4765b37453769808bc52eebbb72043c120aa5191601d1fb8754ce020fb0
+MISC metadata.xml 397 BLAKE2B 70447e3f6204826887af123c5aaad05168f08bec1416fa18d5fd9b1b512a5991687e8d1c04856b96b5c62a5e7edbfb09aef7b329ec952f9b05d5fb481e183d1e SHA512 0ae9d848f64816cb0b0474a4d25a97ba82165cb3754f2c4c22f5fbfa4e569f841a1818c851fe0b181724127b50ac9ceef0b593d0de1ee3d71a4e03db88a59254
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index d49539b4f661..d9944d7718a0 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ngg@ngg.hu</email>
     <name>Gergely Nagy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index e28001ea87cb..8f629b3caf36 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,3 +1,3 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
 EBUILD kafkacat-1.5.0.ebuild 669 BLAKE2B af42aa0a0718a66bcbca7a58e4aa41067f3c529c57a18015e602ddaf41f53e01809408cb7797ad1b352ffc43949cd389de21d415437a254a0421563929ff30c3 SHA512 e605348a3662f5e3f3cf54f87d8455769923835f2427659715c031628ad87199f2f67a8b69258fd2b56f7c7a3171e9b41f1737ce665899793951ea54a854dce6
-MISC metadata.xml 467 BLAKE2B 6633c43878cbf26bef2b10e3eb16b9e1328e1fe1c99412d802ab8c30f7f88b6075b0a21f0e69fb0bc33642077f72cadf62bfce78beeb1d35b370f4297b8db437 SHA512 1aae094bbb20905e11f146984c42140fb8338ab632786be3491b1c70a254465e507459137ba241bd8d4f9313f3567a89985f72ed4f3a2bd407981cfac9322901
+MISC metadata.xml 467 BLAKE2B 7814e6373127cd66464bdae235e7774e5fa6abd222d6365e73def5ca56eeeecbb5d6fc96fc1d0ae8a7266d24af94a4e0ccb1a9ba6268330cfdcece008391525e SHA512 95597e53b882d0b5676375b2435176b895b6a9e1325b00e04602f673868a866ea2ef7a575dcd62ebd7cb8a891fcd08edb23dae12be9cbf3f069aae89ddb39c1b
diff --git a/net-misc/kafkacat/metadata.xml b/net-misc/kafkacat/metadata.xml
index 38dfb6bd2c6b..b1ded8c54639 100644
--- a/net-misc/kafkacat/metadata.xml
+++ b/net-misc/kafkacat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 8e36792e7a63..49770c853442 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,3 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5.ebuild 636 BLAKE2B c9c96a4ac7a8488a60e8a8ca85a68d60165cf7335432fa8af5fca0820810f6765896b69bdd58dbc0c65843a0c32727861d7e55c013f63ed4d4c5debf91ced96c SHA512 e0ff068577b86ea54a64c300e785ec60eaf6bffe8797dc39696882c40e53302f5876dd14d44240a9ee6c24aaf7ef2c39c46269086f2a95740d43d5896541282b
-MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
+MISC metadata.xml 526 BLAKE2B 7be1e9ee4eec532a83c4d429a1318a5fa75cc9960fe9b81e77f6fb352707e4ec2ca8f72b8e19cfecb10fdc318b8801dcbd48f6f507a5ea4036504a38afe6c077 SHA512 377f1fd44b93bc7e4f7b044ff58d50d941d0f2062b9755569692911a16731453ee723bdc7d5c6f6111474e3267b2be7cefb8beac2d402603e27ee4bb97bd29a2
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 41ea37ccc337..4626a43f172d 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -5,7 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>drobbins@funtoo.org</email>
 		<name>Daniel Robbins</name>
 		<description>Upstream contact, please CC on bugs</description>
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index efa7e333ae37..b1e15b580970 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,8 +1,5 @@
 AUX lksctp-tools-1.0.18-autoconf-2.70.patch 2049 BLAKE2B 083525c312ec0ab05fb0bafc7c857ce4478e19aeb6ed2954ebdbf0bb28540fb5a71d20d651c7b3bed3135ec695f10e61070cd6449fb6a7eed777f5d5432587b9 SHA512 07342f740afaa09e61c8d756c318731e84402a3a92a6e5fc5011320a4f3b80bbcb4ff4ddeffe42bc2cf5f6b37ad741ede8fb7a6833c3f4de55ea2bc99f267673
 AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096
-AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5
-DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
-EBUILD lksctp-tools-1.0.17.ebuild 1255 BLAKE2B de959f74224dc3fff1d5f30529ab4d84152aada29f766ab989056e6a789a4d6b093e558eee57a267f4ef9362ae73c5ec023d24108aadfd776f3f9402447f6284 SHA512 36c7ad56089b6d7b8f350e99a642603c7d183396f8654e35eaf9057c153f5f7af71afa9d7b81cc65f42f184a9048592a14c2a2b8f6df65ba0872b6b896fb0233
 EBUILD lksctp-tools-1.0.18-r1.ebuild 1383 BLAKE2B d87142cfa3eb95433cbb9e8fe79911d7d9587a3ddc1df43fbbed3d3a29b9d8bee73d3449e6dbb618cc5c2dd6a57f4507f44d7991e539c930411bdfb44930a3a4 SHA512 7f1de6c8041c8bb12ad28efaa5cd885d079412365c3f87761bcf57d3a517da788f2ca98192d6b3b3546e6529f13f8792a4d18f833e79113577b2a12e4f883e8e
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
deleted file mode 100644
index 6e5808468d50..000000000000
--- a/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-default @bindir@ expands to ${exec_prefix}/bin and default @exec_prefix@
-expands to ${prefix}
-
---- src/withsctp/withsctp.in
-+++ src/withsctp/withsctp.in
-@@ -1,5 +1,7 @@
- #!/bin/sh
- # -*- sh -*-
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
- LIBDIR=@libdir@/@PACKAGE@
- BINDIR=@bindir@
- export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.6
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
deleted file mode 100644
index a6b2e1760bda..000000000000
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
-
-DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
-HOMEPAGE="http://lksctp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
-IUSE="kernel_linux static-libs"
-
-# This is only supposed to work with Linux to begin with.
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-REQUIRED_USE="kernel_linux"
-
-CONFIG_CHECK="~IP_SCTP"
-WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_configure
-}
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc doc/*txt
-	newdoc src/withsctp/README README.withsctp
-
-	# Don't install static library or libtool file, since this is used
-	# only as preloadable library.
-	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
-}
diff --git a/net-misc/metadata.xml b/net-misc/metadata.xml
index 0848d7ad90c9..d7883a71bfac 100644
--- a/net-misc/metadata.xml
+++ b/net-misc/metadata.xml
@@ -34,4 +34,3 @@
 		Kategoria net-misc zawiera różne dodatkowe narzędzia i programy sieciowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 9baf0e6ff9cc..625b0e6e9e28 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 EBUILD mobile-broadband-provider-info-20190618.ebuild 471 BLAKE2B 3dd2b83a80549cac5a0249633c04de1c397d6995dbf7621655fe10dd993db3420b4e7ed30a89efb2bc0cbcebe32d7d687b92c3635da6e18880729fbf006dbfa4 SHA512 bd040faa3a25d10b21d38e558a2a3c2fd2ed95eb0f3e886c2dfb24682f18bb260b9a282bb7d8bb2d8d3f3de37053418e30a2efa43479b620bb0c80a886801f55
-EBUILD mobile-broadband-provider-info-20201225.ebuild 478 BLAKE2B 95128a4b1f11c25446b95a448dc66b14317599610102775a92774770cba6fbd1bb356ea3de3738671b2a02d4f077e8d998a83d4a165ebf737918859568e05bbd SHA512 1bdfae3b170831d67042e0c57f6435c4b6c2e7f24c0d23132bada85b1a628515e6b12b16ecbc5f57a8230f74c6e3079193283ea0dd2060a43f7083c7ac514edb
+EBUILD mobile-broadband-provider-info-20201225.ebuild 477 BLAKE2B 381d683d7a1a0fc9e4ad858bdeafbc8c082c233811d4c4b08d0ba395a1b918a61362acdba2f6a79b26b4912404eec692dc91fa9e77d11eee13c9ac86644c09fb SHA512 9d8cccd2c9f22d545e61fba035f8bbf7b8dd044a36086d5861f975643b842fe67bb95d036751a819dddac24ffc962544d9cd3babc2744247cd743f6d13e2cd15
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
index b064a2911136..706d0a27443b 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 0490a8b9b73a..950d630de215 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,8 +1,10 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
+AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
 EBUILD modemmanager-1.10.0.ebuild 3702 BLAKE2B 7b1d1e5ec167f1cc45d72e85e7a65919ff502f3e54a0a74d0227af24970f52b0bb51ffc571b458ff6e1d51cef4e5f9f0d3996c1e2864b8ded06cca6692a018e3 SHA512 283613155d8d8c791c315564482d083c9b0f60c8461c558a3192baecca36cef67f6b2de3b444d4593664f452248026422d77cbc097dfa90b5b0bfce77e0b9f0d
+EBUILD modemmanager-1.14.8-r1.ebuild 3728 BLAKE2B 6fbeb336da165e87b497573d681ccbc4ae77576af94b5c3f1f47e3206d814246ce1c9f40112224fe7811653b42e269f9626c7efb7c35907a1cf2461862596467 SHA512 d749f2f2e568436a132e183adafd215bb4c74932d8618f82ea72ba041c110aef6e61fefb739cca1c94c17c49c4400a5cada03eae677766bac1d35899b88711f8
 EBUILD modemmanager-1.14.8.ebuild 3668 BLAKE2B 65dac0b989a5a1349222d59b7a42a94b545a58e158b6db4f53ba5056303e9918bf7316af02b8027d5367c2ecdb0fb9059826abe3a2b277141e9a2d9927743e05 SHA512 55b8e814d986b08b56fee65dea7afee38b9c6106240e3d72c52c8b6cb50d4335a4b58d3e3dacdf05495a1f29a99d91469f0dfbb9c636c19d96b4747fcca1a4b3
 EBUILD modemmanager-1.8.2-r1.ebuild 3702 BLAKE2B 6b166143bca2c72892dbc38147538f9cc9da01a5a677d18438597ed80115d46021c130c0d8c228cd007ace5fbbcca570fd76f26bc95e6600b9aa5096be4aadcf SHA512 f5ccf0d43cc548bfcc024b46f33b78d337910670c7eed1c5a882d47b43ca9341dce00d4f72dfdbc0bec5bd989b56d845e4269a0403ba0e9d21cbf286b7fb3c4b
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/files/modemmanager.initd b/net-misc/modemmanager/files/modemmanager.initd
new file mode 100644
index 000000000000..39c94591e5c1
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/ModemManager
+command_background=true
+pidfile=/run/modemmanager.pid
+
+depend() {
+	need dbus
+}
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
new file mode 100644
index 000000000000..98c1d10adb11
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.48.0:2
+	udev? ( >=dev-libs/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.24.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.26.0:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+RDEPEND="${DEPEND}
+	policykit? ( acct-group/plugdev )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
+		)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index aef31052c7ef..1a05f530cee7 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,6 +1,4 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
-DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
-EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca
 MISC metadata.xml 350 BLAKE2B c177ffe2f3f3c6192b293561683d2bfea170030dbe31004c6d3a253440ba17a82dcdfc4426a0e5fedddbcd56bbd95a6bee3b24431efba133c1b1c0c0db821917 SHA512 19085d3b736466a73795c3f1ecf39b039453702c220a58ffcdbdd6425c94b9a6c4aa8339a7447a7430c158e06f9030c138417362b3de43b01dedd95401a16099
diff --git a/net-misc/mrouted/mrouted-3.9.8.ebuild b/net-misc/mrouted/mrouted-3.9.8.ebuild
deleted file mode 100644
index 0e9bfcd0649a..000000000000
--- a/net-misc/mrouted/mrouted-3.9.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="https://troglobit.com/projects/mrouted/"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.bz2"
-LICENSE="Stanford GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rsrr"
-RESTRICT="test"
-
-DEPEND="|| ( dev-util/yacc sys-devel/bison )"
-
-src_prepare() {
-	# Respect user CFLAGS, remove upstream optimisation and -Werror, do not
-	# print command summaries, do print commands
-	sed -i \
-		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
-		-e '/@printf/d' \
-		-e 's|^\t-@|\t-|g' \
-		-e 's|^\t@|\t|g' \
-		Makefile || die
-	default
-}
-
-src_configure() {
-	sh configure $(usex rsrr --enable-rsrr '')
-	tc-export CC CXX
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	dobin mrouted
-	dosbin mtrace mrinfo map-mbone
-	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
-
-	insinto /etc
-	doins mrouted.conf
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-}
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
index 884eaad17630..cf123801c4f2 100644
--- a/net-misc/mstpd/Manifest
+++ b/net-misc/mstpd/Manifest
@@ -1,3 +1,3 @@
 DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e
 EBUILD mstpd-0.0.9.ebuild 729 BLAKE2B cca9badbe108e0d74a10fb149717062f0fb1b60ae50f8fab487fae0f5b6950226a370e826698c1cc5670f1a50fe0cfa5d81f14765011fb886d7a916b24ec1470 SHA512 a428af51cd76eb9a7a498839a6a006c23fc27f02edbb9e7e95d7c280be33394a115eef6b8493f4dad66c3420e7ab706ec980374b8d583fa282dba4bc1d94d5e9
-MISC metadata.xml 444 BLAKE2B 6bbeee7e910599d9bbd586074b2b38f9a84b08d4b6a29961e4d0a9349a4d2a58d672125210eb7e3604a930983a86befe4ba855a75147fc4f507b8a98777785af SHA512 32ca1da084fde5cbcc37b8c474320f7d73db0a33f191c3f3e5d99b8cfd84bc71c6168238d402c0fd2ab00cb9b79faaa62e1ec6a88da75a3a2b2c499b999189c4
+MISC metadata.xml 474 BLAKE2B c41a26753e9934342a3d6050c9496adbbc1064fda59f17dc4846af609ac3a65630902bfd96d6e33e24105732af17f14e5cf2fab15bc0bab1c37f26c9a7d7a15c SHA512 8fdeee7e56e7254541b3000c238ac2290c548ac568f3e5588c2a7c0690632c8e1ee03992c4ab0e94230985f669fcc323b9aa3f84b421b45e6c4aebd6b1f2e656
diff --git a/net-misc/mstpd/metadata.xml b/net-misc/mstpd/metadata.xml
index 359cbebb4676..e64fa059088e 100644
--- a/net-misc/mstpd/metadata.xml
+++ b/net-misc/mstpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index 43ce037ab669..96b20dc8579b 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,4 +1,4 @@
 AUX ncp-1.2.4-fix-makefile.patch 424 BLAKE2B d8687f2186a762872cac04df49e26013b844884b3d1537ac53cdbd4e1fd397d04fe7c6069c218ecd919c3c68b3e1998cc2cf699ec162ffbe0c9d5d356c77b72b SHA512 fd8fb4bffe36fb8fde955b963f4ba1d00e64e7480372e465fbb8c0750c0c02bd0a6dfb032af101a7599db3446f623a05f604cf3ab57469ef691f424db6520e41
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
 EBUILD ncp-1.2.4-r2.ebuild 767 BLAKE2B 94a45adf6aabcc5fda72de6804c341aece92ea22d2b3c1d9308e0a0b6a8cacbcd0b50098d74d337f41a5cf761c7863042135249cfc3b63377adc120b7ac4e29e SHA512 67e9c79f7c1b379936325503a2af35cc9a210f35ba9bbc49e576e2c21c4ac6faeebe1bc952c8a82d3e0284211f3db4586394c6050a6bfb84c57cab870ffc3f50
-MISC metadata.xml 614 BLAKE2B bb945ccb5995827fd325fb351f0426852a9750c8942452c195800006b8dc8c647b5423fe70fda692091dcb7b814bd6f984b14d4be340e4d7c4abb466712f0c0e SHA512 e0a56910b48f3105c8ec1a414bf65966e411657d1a2f95afde2460b8c203acac1db96df725a9352e9fb9c41f818c8464caaeb1523d5ce348dff628ec314e3c34
+MISC metadata.xml 644 BLAKE2B b74efc66ed0128adacb141a21a1c064a3df173843743d9db7a96beffe40e01e262d002b2632dbc08c6005bf6958b1de66f42782d3d6bb54725cbb3c419e64e75 SHA512 8dc2f56998e2dc3ae39714bc353560a1f5ac9f55f9872c1b2aa47a17f0fd36b7f2c6ca62257f6edd686bea52a9171b5752e4b9dcbffb55acdc4cf03798452080
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index 17fb58cb0b1f..c301e49db459 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index bc9184e8354e..2e70049d1ba2 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,4 +1,4 @@
 AUX nemesis-1.7-fno-common.patch 2057 BLAKE2B c40c2b9549237432168f22d8d4f1903f4b6772b02466616df6b0951a7c6451ccd2adeb103a1931bfb82c7b1df78ff320de137ae0d522806e203ae9a7f7587377 SHA512 0d62b46676c3ebbe2e2bc8636a4d14de52ab9f94f8b67e86b7bcf3546a62b59503f4e1f23a18f25358bf0315983474f5ae602d87281802c30de00645ee56e700
 DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
 EBUILD nemesis-1.7-r1.ebuild 621 BLAKE2B e8f84d0a6a5dd4efffeeb7ceea943a3d878df025f35ccd3ad502d684ffb3ebc53973cdda9b5b0ae3ed20acacf65ed348450a8e9a9251ecb658b80c53c2968ba9 SHA512 b7662484bcf4972674959f532e5468ecef8e025c5e7ab19fef91e323a4c20532689113087e00a4dda28722751eacb1e482397a092591c501b4514684a5f091fd
-MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
+MISC metadata.xml 291 BLAKE2B 01bbe5df94f7e8a2ac2f43fb03cc062cb9f692983b7eb89cd3e518cddc20c62116222bdbc05018c8ad5ee0d84f8eda2ee42351be8d96678d8224f2741d10e4b6 SHA512 372d8e837f76ac4edde66e68243f20746d3fbaf6ab79fcbb3357658b21e168736cf10b146c7de28e782ed316a30a9541a635a6bdb56db05d6657eeaa6fc2dabb
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index f4cbcdfdbb21..f7d95b506b26 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/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>netmon@gentoo.org</email>
 </maintainer>
 	<upstream>
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index a3d9f3761e4e..24b00d506906 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,4 +4,4 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e
-MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
+MISC metadata.xml 492 BLAKE2B 2e0f6ba42b61e932b9f7291bc2af7667e28bfc50ea7bff6581b8f01f5e0ff10112556e21c2e94840653052f91717566e3e52c0aff9119ea1032826da259a6edb SHA512 ca8b8f595efbbf0ccf7ffb627bd12a4ba62ee2147dde317793649f0b5e4786b4b4ea6aca22ba0bdd17d588f15098dedd3e2749999a298e7e28a3ba2a81ae55f3
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
index bd198f872437..63ea838ab31c 100644
--- a/net-misc/netkit-telnetd/metadata.xml
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 089550f99e31..1509168a5d9c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,12 +5,15 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273
 AUX networkmanager-1.26.4-iwd-fixes-pr640.patch 5730 BLAKE2B e22539fef2e4582ab156decbe26667724de181eb2349f7dcb29c41eaf9f918addb4a6e25a43e8b743e118cab56e3f69cc83e0e8ee777560c227165fad67664b9 SHA512 690d128ac153b2147f13f8596858be6e6120c0a744da1cb5e2dad5ce6ae9518565ab15a9a00612771d153ed5e13d60a42f93fae6b7ba177513c9d1bf0a4d701a
 AUX networkmanager-1.28.0-dhcpcd9.patch 10608 BLAKE2B fb5512d4b290ae668b41b2d1f387643e8d7c1c235ec255c292e419551c3a67a06463f43293ea75f8dd9700bde2d045e86eafe313384c22609cb8422117ac092f SHA512 7f9a2a3b7f861cc2c8e4b066449e6574ac74227b7a45ae8e9ca79c81a232d292a62216edff0620042f9556193e3841aa8cf5e8ecdbc2edfc9df0751e2d1f5303
+AUX networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch 2215 BLAKE2B c6165a5e6a1c892aed98bcb14369fc1282aa5179370b3194d879fe3866e184ce99687e88b5f1dbfdaa82313b7c1b59d0949442cc539d5355c114c539a2017598 SHA512 6844e58aa7d7be3030d046b8c330ad0615152a762c689e7dda07ee46466030a078ddf81f3ce8be8c1880191ec22aedde9325dde782ec0cfb95726935fe9086e3
 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
 DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64
 DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06
+DIST NetworkManager-1.30.2.tar.xz 5302032 BLAKE2B 2fd30a09b479a4202c905ef29905d0672c0f4e07af15b0b124a626f160d150348e3d4b256386db43b91c4ac27c897f82269ede6e0f35f4b82905920494d070f2 SHA512 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e
 EBUILD networkmanager-1.22.10-r12.ebuild 8548 BLAKE2B 5da579ca289ff404eb75807972ccb0e1f9cd04d219e766f4942ca6dd5e83da047bcd94c27e17aefb14b194d3e759a858e1590746ee61ae87bf176d322330f4bc SHA512 f6a6f6885e2c56428c60f6b717a5f5cafe15264280a66b946756da2332f64cffca24ce4d8defc583f07880829a54d098f5435a4b86b912c67bbb17560b910405
 EBUILD networkmanager-1.26.4.ebuild 11351 BLAKE2B 0319b3fe3b67c57f48c960a777f272f8ed89cf1f43f454a3303a69214f641e102168f653fb2af88c539df7fd3f591d4fdd87230d9334460fe270d4e741e9c601 SHA512 21cdaf6a2ba186939a201a3f4ccb59d52c4b1d636eb74517b5f57748582ab448844a7edc88242f591c60403d1721b8294a9001b0a9b0f8be89c38a72c0ea58bc
 EBUILD networkmanager-1.26.6.ebuild 11357 BLAKE2B 9f862a2953a1244c45165be72fc3eb842e30a555048ebbdd0487c5cc7c82c69ff0014a9f760be9c046c5bda37935b8afd9e9c977c0f920b8a15e598b15cd315a SHA512 b5fadbc8153556e16020ea3e4887571ae7c2392f4f243bd3110f8232022b87bb6f1a2c8852d7a9305e0d7d7fcfe5a1ff9573d93d80387a25296a20fb2b69c44f
 EBUILD networkmanager-1.28.0-r1.ebuild 11254 BLAKE2B 1bda0067cf5074cea89c0a7ab0f007aea189531407c5f72c7da930140cab4cb54c0528dcf7c0ec2157021db1a459d9b4de957e5140310a8c7582980ce7398a6b SHA512 e173def62fbb02e654649eeeedf7c573e40e9d9fa0a6d51c907df918e4a3ed2cb55c2ca66cdac07686367f7cec316ad91bd4e9366bec1d39881b19568607e302
+EBUILD networkmanager-1.30.2.ebuild 11277 BLAKE2B 4fe920d0219755d1a6f15ba31cff95f9edb9a839b7ed61ddd1c5553d4458daa5e5951731fa40edae2a54dc9f30b60c2b32dc767ef0874bebf90bc28071c5a365 SHA512 16bb51e39b73fe99e0406d500ced0d4ad844cc5f12d4991bb7aac243e2ff9ffde7706e7e611100829f9dd320f6e6e581049dd2fdf3102528abcc34ce52003f35
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
new file mode 100644
index 000000000000..0e60ccdcb894
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
@@ -0,0 +1,58 @@
+From 4409900f1d05bf60647492a75e478590647b997a Mon Sep 17 00:00:00 2001
+From: Andrew Zaborowski <andrew.zaborowski@intel.com>
+Date: Thu, 18 Mar 2021 00:21:31 +0100
+Subject: [PATCH] iwd: Don't call IWD methods when device unmanaged
+
+When using IWD-side autoconnect mode (current default), in .deactivate()
+and .deactivate_async() refrain from commanding IWD to actually
+disconnect until the device is managed.  Likely the device is already
+disconnected but in any case it's up to IWD to decide in this mode.
+
+Calling IWD device's .Disconnect() D-Bus method has the side effect of
+disabling autoconnect and doing this while NM is still in platform-init
+was unexpectedly leaving the device without autoconnect after
+platform-init was done, according to user reports.
+
+Fixes: dc0e31fb7014d8a97aca96bf97a8f86f8236300c
+---
+ src/core/devices/wifi/nm-device-iwd.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
+index 95ade44b58..01f2a30396 100644
+--- a/src/core/devices/wifi/nm-device-iwd.c
++++ b/src/core/devices/wifi/nm-device-iwd.c
+@@ -588,10 +588,16 @@ deactivate(NMDevice *device)
+             return;
+     }
+ 
+-    cleanup_association_attempt(self, TRUE);
++    cleanup_association_attempt(self, FALSE);
+     priv->act_mode_switch = FALSE;
+ 
+-    if (!priv->dbus_station_proxy)
++    /* Don't trigger any actions on the IWD side until the device is managed */
++    if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED)
++        return;
++
++    if (priv->dbus_station_proxy)
++        send_disconnect(self);
++    else
+         reset_mode(self, NULL, NULL, NULL);
+ }
+ 
+@@ -647,6 +653,11 @@ deactivate_async(NMDevice *                 device,
+     cleanup_association_attempt(self, FALSE);
+     priv->act_mode_switch = FALSE;
+ 
++    if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED) {
++        nm_utils_invoke_on_idle(cancellable, disconnect_cb_on_idle, user_data);
++        return;
++    }
++
+     if (priv->dbus_station_proxy) {
+         g_dbus_proxy_call(priv->dbus_station_proxy,
+                           "Disconnect",
+-- 
+GitLab
+
diff --git a/net-misc/networkmanager/networkmanager-1.30.2.ebuild b/net-misc/networkmanager/networkmanager-1.30.2.ebuild
new file mode 100644
index 000000000000..5dfe828e9e78
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.30.2.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-iwd-autoconnect-fix-pr785.patch
+)
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index a40aa12881db..5d557c905d2b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -8,4 +8,4 @@ EBUILD nextcloud-client-3.1.1-r1.ebuild 2040 BLAKE2B 2d84e53fda3603204bd8fd87dfd
 EBUILD nextcloud-client-3.1.1.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 EBUILD nextcloud-client-3.1.2.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
 EBUILD nextcloud-client-3.1.3.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
-MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
+MISC metadata.xml 513 BLAKE2B b63b5116dcf22fc8b7608cf7a13b5749668a139f8e670419733cbcbd44284bb45227d16b9a3d5d50d505440e2d50fff77b98cfe4321afc78b20fd22ab3a495c9 SHA512 491340b64cb8bbeb0efc5cba4de9878aca75231bbfc19b8fdd2de895ed0cacaf154add48cec8964412a68e496f348dc539262afa74b08e38d2d7a27ed220ff5f
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index dfcd23fb500c..ea54627aff84 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 741d29d8cfe4..ad4b036204a4 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -3,4 +3,4 @@ AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67
 AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8
-MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
+MISC metadata.xml 569 BLAKE2B ebb1379e780eeeca09af18ca713b55a27c5b3479e66f5571a61de890de3472605a808cdcf950ff7df72de67423d11fc5dc0963bfe8c852b457b606f90094f49c SHA512 154609210a6c893d55d0150e62122a803295d2bea19d61b2e77400083eaa2172b2a427566a7350e944c9a27cdf84f3babdde87f320f4fd05ebeae0712c313de7
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index ed7fbe111de7..818a2bd12b43 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 446e5b30e2c4..e00906b55e09 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -7,4 +7,4 @@ DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
 EBUILD openntpd-6.8_p1-r1.ebuild 1763 BLAKE2B 9225ea51bb5ebaf34d3456b474d61fc29ebcaff153d3ef8d0f1945391580b312cd260aed404cc23f0b17a5c5509d0068c335dcfb08e9a6ce6e315bec7b09db6a SHA512 8bc095b4a4ba25ed0c4cde951f4d8c47693e61a0fe982627d9db8b8d865bc1a0ec660ee0c1ea99ff2d6bbc217951538a1b06e2daf8624590163ad4ca1c8115ef
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
-MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
+MISC metadata.xml 858 BLAKE2B 230d4a788c80e5fb8b0708563dfaa867965667958eaa71e83f8ead831cab11869967fee05a81f9584b3b8f095fe8e22743e25f3ba6f6fb059a2ae654a29f19de SHA512 3257f9e2f2636ce09307052c8aca002d87b771ec4981fc111128e9a04a54e74e79b306a2dfdb52cdb9a6c3278fc820be16ae62478def533288df05600496c145
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 20734983a2d0..8cf4c9d357c8 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index c6b6f587e555..08b819515364 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -13,10 +13,14 @@ AUX openssh-8.4_p1-hpn-14.22-glue.patch 3335 BLAKE2B f5b179aaa82c17f820cdc057de4
 AUX openssh-8.4_p1-hpn-14.22-libressl.patch 794 BLAKE2B d204e6030a5cef333065d1c76a75a1e9d2a1a621b910fa6a2d85dc69d236abfa4448030cfb25c3965bf8851609af8f6d5217d04515c4d0ac699a6ce7be6395b6 SHA512 afeabef3df3d4a0f5dd0370477a9eff5e04abad3053e81bd88396956857669fac438474ebacb31dd41da4bb68aeff70dc9ca69f20cdb95c87ecb98d4e5fa2c37
 AUX openssh-8.4_p1-hpn-14.22-sctp-glue.patch 733 BLAKE2B 3262f5293611579202b31540eb4ff6bf24be5bd09a93d10f693b173b61eff371cce0be4ecea2ba873c7d5b250a73c032684345b53a41c369f2a5663ad15ecd41 SHA512 b39a5d76558af51db0e9b1daeaaab3d906a4c941886f8016fb7e5e89177fcd5c81904cb5b3c4d0d5935240bee43d4433ad42495f1aa21771e90013ab7726b6fe
 AUX openssh-8.5_p1-GSSAPI-dns.patch 11631 BLAKE2B 9ed39b04f320612f166b091979a21e7765d19afc3947a95dd3019da25eefcad32fcf2a3f17813441fce87cc03a28e0a52ac1aad3ac4b5b7ecdf3f4f8c391ba4a SHA512 d28f7df54af4cc998e1978a6c0fcb28f88affaad4a347084e429549bc0f74347dd8ad79c0ced0ca5a739e2c3cc19f6516aeb678f3a9709c40f1d0fa16d93b9e4
+AUX openssh-8.5_p1-X509-glue-13.0.1.patch 2714 BLAKE2B 03a00a1b9c62d75688706e3f4950510bafea6ae524a3bdbd08a7f059663eae3ff386ffa1ea1edfbf3349231a53b314625778043f39bb52395ffe9ef2a45a8400 SHA512 1ddf7c62ff3e73278a88f9afe5085c4101ef2cae4383cfa7bddc90403db5ea2c9c0fc630d31dc72072c4c008034f02b30cfea149aeb95e70c74292f3b978471b
 AUX openssh-8.5_p1-X509-glue-13.0.patch 2773 BLAKE2B f6bfe7a9986a0804eacb83bd61718b2fb5c52b26740441878cadadcd4773abb7a9f441f9263a704c13de5e25c614d989010b6806bde43b767ae892e68733087d SHA512 27894c3a76ce7483585975b41e7b3a64b8e896daaaf958738f8cd4081d4ff0884d945beb11f9e2ae12b87532d9a30bd642e4442db3ced2cf8747c60459752aec
 AUX openssh-8.5_p1-hpn-15.1-X509-glue.patch 11216 BLAKE2B 88060a94be8eba6b9b01296f1109f930df38d8596dc3500a8ab40f660a159884783a4ea0be362fb52a86eac1e88e903a7eae4cd6fd293922d73acc9a75eee150 SHA512 7e9799c7ab5cf97e791cb1c2aa0370199e91eeaa01e685c0d164f47fcddbf0fc7f55a9fd7ccba79ee861259d0ebd56d083b77cd0b65472fe9bcc83ceb4f2ad0e
 AUX openssh-8.5_p1-hpn-15.1-glue.patch 8744 BLAKE2B 90358656ee0e9ea1dfc7117dc585b296e125b5567fb8e9b12b7da2f00d02a1aa40da4a8fb64158f5ebb0abbd9ed54310f974d389a0ec3e9cface8dd9e1ae9d03 SHA512 8167b35e5daccc6f48af48c17bf01eae54dbff0aa651333e745fda044131746f313cec324275bf5e83592eea53726207763eaccbfb9bbb00fae3247a94eb8322
 AUX openssh-8.5_p1-hpn-15.1-sctp-glue.patch 728 BLAKE2B a9e6000b45fd228fa3623ca9abe6f99efc8e50020cd9584ea8b23e5491eb78253f65adf4ec990cae177874a89d785fa45fec05accae8a97921f804f7581a5ba4 SHA512 a6913dc0cffc5184b38d12f5146085ac6f592350f427bd994ddfa93c0eea041c674e47a80b84cffca9fe72ff5efa7b6797d1eb39addf6b842a6cfc21de4fc3ad
+AUX openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch 11238 BLAKE2B 3d16907f7330b3e30705610c10f5b5037837442df6840231073ae8d0202543b006bf9b9597df50a3173bbb823050e9c2cb5a391ed5f96c4ac2194fb1e97316a9 SHA512 d1fea164d8431282c150a513886c428f7225eb11980bd7c9cae88754d1165ec799e1ef30b17ffa38990b6c58d9626a412abd550909e34f623f311444e097baaa
+AUX openssh-8.5_p1-hpn-15.2-glue.patch 3856 BLAKE2B 1661bb20e523141aae3f988f5dac664ec6f3d6517512596183c9c26d051a75b8d013e0d6e7c21aabb597b5c1a7e768c429bdef70bbfe59071f6e4cbb0956960d SHA512 0439ad0f0ab6dc21dd4279c6d252884e3c2ddaba76a207b3b26c88d8a6b8d873cc08345a1a90b8046ec79d33f47395d87e52d5b44b155a186a8aa16d316b82a9
+AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
@@ -26,6 +30,7 @@ AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03
 DIST openssh-8.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3
 DIST openssh-8.4p1-sctp-1.2.patch.xz 7668 BLAKE2B 2e22d2a90723cea9ef958bd989b8c431fcb08b4dc5bfd3ebbf463ca9546dc37acdc185c35ddf3adbb90bde9b3902bf36524a456061a9bcbdef7a76ece79e2ff4 SHA512 90da34b7b86e52df9e0191c99c9d645a4d4671958adebeed46e1149102d4ba8c729eadb79d84fad9feac64aafa0541d2f1f4db8cdfe0af5ba893aac072ef2380
 DIST openssh-8.4p1.tar.gz 1742201 BLAKE2B 4b1e60d4962095df045c3a31bbf8af725b1c07324c4aa1f6b9a3ddb7e695c98e9aa01655b268f6fd6a400f511b23be91f6b89d07b14a6a2d92f873efb4d9c146 SHA512 d65275b082c46c5efe7cf3264fa6794d6e99a36d4a54b50554fc56979d6c0837381587fd5399195e1db680d2a5ad1ef0b99a180eac2b4de5637906cb7a89e9ce
+DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8b153a32019e8bc4c1778c2371d89cdc8d9b43e86523d0c03ebeeafa7004a16ad46dfbc18b338bf95f46101d8865709d45aa6b0 SHA512 b0247885d3a0718eb4df123c552f9e95ad9ffd55f96189aca35006c23d76ec76b28420cac4d7b2167c07f2e0a0652edfa20c2ce60aea3f7607a1e747f836ff91
 DIST openssh-8.5p1+x509-13.0.diff.gz 996872 BLAKE2B 136937e4e65e5e73d1d1b596ae6188f359daa8e95aafd57fab8cf947b59fde573ff4e6259781d1a0fd89718d14469ca4aed01bae6f37cc16df109c673fa2c73c SHA512 2276b0ac577162f7f6a56115637636a6eaaa8b3cc06e5ef053ec06e00a7c3459efe8de8dbc5f55c9f6a192534e2f7c8c7064fcdbf56d28b628bb301c5072802c
 DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b
 DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f
@@ -35,6 +40,10 @@ DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f4
 DIST openssh-8_4_P1-hpn-AES-CTR-15.1.diff 29966 BLAKE2B 79dea4e16ffdda329131eb48a3c3dd40e167e5c6fa4dd2beb6c67e7e4f17a45c6645e84dcdc97baae90215a802cd1d723dfd88c981b1db826f61fca0a4e92ae1 SHA512 cdb7aa5737a1527d83ffa747d17ae997a64b7bc16e198d0721b690e5932446d30ba4129c122be2a457f261be7a11d944ef49ba2450ce90f552daab508b0c980b
 DIST openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff 51327 BLAKE2B 6879df5bfb4c07c44b41620bd49433591711edb08ad6b5c09af8a5f754ca09f3ff6a066ffac3210fdad6dee47710221dca0a3dc47b919498ec6939b42a073418 SHA512 1e6471e88783acf764186577a767ea7c2071bcab1b803c18288f70166d87471703b332dae3bdcaf4318039089caebfba46e5b6da218912eff1103bd03d736a60
 DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b7093696680b6e157c78bb431af9bc9e75f223c2b13693f0ec2ad214fbf6b2ba0059cbf3690a93235559f07b46dabd056d65ae1fc9d7418f0 SHA512 99801a743da8f108dcf883bc216f2abd3fc3071617566b83eb07b6627ed657cccf0ea93ea2a70eff1050a34a0e635e732665c5583e8aa35968fdeb839f837b63
+DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
+DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
+DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
 EBUILD openssh-8.4_p1-r3.ebuild 17822 BLAKE2B 33429fc7138dafc13940b6956af610fc15e4d16efd2cc8b318e510365c86c96b73de3961d8506e072ca2972a0e97fa7155af457e310c307d339f451657affbec SHA512 0d37ad65c202611424972d3cb2d5cd43bc57ef2cbf96165fae3a053c45c512c59d060430155292148702df079a60f569e508fdfdccfafc2dbb8fc4c3f2aacb86
+EBUILD openssh-8.5_p1-r1.ebuild 17658 BLAKE2B f5f2bf7ecf36afcbc5a0bdcf61a85caefa03167ab15c5c7cd2096419a11a9fdb3c4c95301554ef9549af489b189d7d1dc4ea2eee131d5cd4f6bf3c751b0a0e8c SHA512 be6c52ae3057bc0961153d3d5bbe970dfa91006ca6e287f5715c0b63b6b879967d291e3386fd12f3a57e6b8e24a09d87ae5e5712a7f9aaa5421cb2b15e2ec6c7
 EBUILD openssh-8.5_p1.ebuild 17663 BLAKE2B 1657a68574452acc6e818ac81bc8590cf6575815b3bf66c5b7c0e0ef7b805300054f937b343dc7e070ebb9b7ac0f9710b9170877f307c993a6acf1fd88cde9a4 SHA512 b0cbd250227fef206edad297ba1ec103f74a65d41499798e69d3c8e38348fe072999f70f3763bf5a5f4c6c3444daea394198d78130206e8742e6e40ff8a0fcdb
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch b/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch
new file mode 100644
index 000000000000..c7812c622c26
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch
@@ -0,0 +1,72 @@
+--- a/openssh-8.5p1+x509-13.0.1.diff	2021-03-15 14:05:14.876485231 -0700
++++ b/openssh-8.5p1+x509-13.0.1.diff	2021-03-15 14:06:05.389154451 -0700
+@@ -46675,12 +46675,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -380,6 +364,8 @@
++@@ -380,6 +364,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -63967,7 +63966,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do
+  	verbose "$tid: cipher $c"
+@@ -63982,7 +63981,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do
+  	verbose "$tid: kex $k"
+@@ -63997,7 +63996,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  if [ "`${SSH} -Q compression`" = "none" ]; then
+  	comp="0"
+@@ -64129,9 +64128,9 @@
+  
+ +# cross-project configuration
+ +if test "$sshd_type" = "pkix" ; then
+-+  unset_arg=''
+++  unset_arg=
+ +else
+-+  unset_arg=none
+++  unset_arg=
+ +fi
+ +
+  cat > $OBJ/sshd_config.i << _EOF
+@@ -122247,16 +122246,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	     __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-8.5p1/version.h openssh-8.5p1+x509-13.0.1/version.h
+---- openssh-8.5p1/version.h	2021-03-02 12:31:47.000000000 +0200
+-+++ openssh-8.5p1+x509-13.0.1/version.h	2021-03-15 20:07:00.000000000 +0200
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.5p1/version.m4 openssh-8.5p1+x509-13.0.1/version.m4
+ --- openssh-8.5p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.5p1+x509-13.0.1/version.m4	2021-03-15 20:07:00.000000000 +0200
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch
new file mode 100644
index 000000000000..413cc8b9c3dc
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch
@@ -0,0 +1,328 @@
+diff -u a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff
+--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-03-15 17:45:28.550606801 -0700
++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-03-15 17:56:36.240309581 -0700
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
+- CFLAGS_NOPIE=@CFLAGS_NOPIE@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+- PICFLAG=@PICFLAG@
++ LD=@LD@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -803,8 +803,8 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
+-+	struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+++	struct sshcipher *none = cipher_none();
+  	int r;
+  
+  	if (none == NULL) {
+@@ -898,20 +898,20 @@
+  	options->fingerprint_hash = -1;
+  	options->update_hostkeys = -1;
+ +	options->disable_multithreaded = -1;
+- 	options->hostbased_accepted_algos = NULL;
+- 	options->pubkey_accepted_algos = NULL;
+- 	options->known_hosts_command = NULL;
++ }
++ 
++ /*
+ @@ -2467,6 +2474,10 @@ fill_default_options(Options * options)
++ 		options->update_hostkeys = 0;
+  	if (options->sk_provider == NULL)
+  		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
+- #endif
+ +	if (options->update_hostkeys == -1)
+ +		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+  
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
++ 	/* expand KEX and etc. name lists */
++ {	char *all;
+ diff --git a/readconf.h b/readconf.h
+ index 2fba866e..7f8f0227 100644
+ --- a/readconf.h
+@@ -950,9 +950,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -662,6 +666,7 @@ static struct {
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:29:42.953733894 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:47:54.198893025 -0700
+@@ -157,6 +157,36 @@
+ +	 Allan Jude provided the code for the NoneMac and buffer normalization.
+ +         This work was financed, in part, by Cisco System, Inc., the National
+ +         Library of Medicine, and the National Science Foundation.
++diff --git a/auth2.c b/auth2.c
++--- a/auth2.c	2021-03-15 19:30:45.404060786 -0700
+++++ b/auth2.c	2021-03-15 19:37:22.078476597 -0700
++@@ -229,16 +229,17 @@
++ 	double delay;
++ 
++ 	digest_alg = ssh_digest_maxbytes();
++-	len = ssh_digest_bytes(digest_alg);
++-	hash = xmalloc(len);
+++	if (len = ssh_digest_bytes(digest_alg) > 0) {
+++		hash = xmalloc(len);
++ 
++-	(void)snprintf(b, sizeof b, "%llu%s",
++-	     (unsigned long long)options.timing_secret, user);
++-	if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
++-		fatal_f("ssh_digest_memory");
++-	/* 0-4.2 ms of delay */
++-	delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
++-	freezero(hash, len);
+++		(void)snprintf(b, sizeof b, "%llu%s",
+++			 (unsigned long long)options.timing_secret, user);
+++		if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
+++			fatal_f("ssh_digest_memory");
+++		/* 0-4.2 ms of delay */
+++		delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
+++		freezero(hash, len);
+++	}
++ 	debug3_f("user specific delay %0.3lfms", delay/1000);
++ 	return MIN_FAIL_DELAY_SECONDS + delay;
++ }
+ diff --git a/channels.c b/channels.c
+ index b60d56c4..0e363c15 100644
+ --- a/channels.c
+@@ -209,14 +239,14 @@
+  static void
+  channel_pre_open(struct ssh *ssh, Channel *c,
+      fd_set *readset, fd_set *writeset)
+-@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c)
++@@ -2164,21 +2164,31 @@ channel_check_window(struct ssh *ssh, Channel *c)
+  
+  	if (c->type == SSH_CHANNEL_OPEN &&
+  	    !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) &&
+ -	    ((c->local_window_max - c->local_window >
+ -	    c->local_maxpacket*3) ||
+-+            ((ssh_packet_is_interactive(ssh) &&
+-+            c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+++	    ((ssh_packet_is_interactive(ssh) &&
+++	    c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+  	    c->local_window < c->local_window_max/2) &&
+  	    c->local_consumed > 0) {
+ +		u_int addition = 0;
+@@ -235,9 +265,8 @@
+  		    (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 ||
+ -		    (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 ||
+ +		    (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 ||
+- 		    (r = sshpkt_send(ssh)) != 0) {
+- 			fatal_fr(r, "channel %i", c->self);
+- 		}
++ 		    (r = sshpkt_send(ssh)) != 0)
++ 			fatal_fr(r, "channel %d", c->self);
+ -		debug2("channel %d: window %d sent adjust %d", c->self,
+ -		    c->local_window, c->local_consumed);
+ -		c->local_window += c->local_consumed;
+@@ -386,21 +415,45 @@
+ index 69befa96..90b5f338 100644
+ --- a/compat.c
+ +++ b/compat.c
+-@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version)
+- 			debug_f("match: %s pat %s compat 0x%08x",
++@@ -43,7 +43,7 @@ compat_datafellows(const char *version)
++ static u_int
++ compat_datafellows(const char *version)
++ {
++-	int i;
+++	int i, bugs = 0;
++ 	static struct {
++ 		char	*pat;
++ 		int	bugs;
++@@ -147,11 +147,26 @@
++ 		if (match_pattern_list(version, check[i].pat, 0) == 1) {
++ 			debug("match: %s pat %s compat 0x%08x",
+  			    version, check[i].pat, check[i].bugs);
+- 			ssh->compat = check[i].bugs;
+ +			/* Check to see if the remote side is OpenSSH and not HPN */
+-+			/* TODO: need to use new method to test for this */
+ +			if (strstr(version, "OpenSSH") != NULL) {
+ +				if (strstr(version, "hpn") == NULL) {
+-+					ssh->compat |= SSH_BUG_LARGEWINDOW;
+++					bugs |= SSH_BUG_LARGEWINDOW;
+ +					debug("Remote is NON-HPN aware");
+ +				}
+ +			}
+- 			return;
++-			return check[i].bugs;
+++			bugs |= check[i].bugs;
+  		}
+  	}
++-	debug("no match: %s", version);
++-	return 0;
+++	/* Check to see if the remote side is OpenSSH and not HPN */
+++	if (strstr(version, "OpenSSH") != NULL) {
+++		if (strstr(version, "hpn") == NULL) {
+++			bugs |= SSH_BUG_LARGEWINDOW;
+++			debug("Remote is NON-HPN aware");
+++		}
+++	}
+++	if (bugs == 0)
+++		debug("no match: %s", version);
+++	return bugs;
++ }
++ 
++ char *
+ diff --git a/compat.h b/compat.h
+ index c197fafc..ea2e17a7 100644
+ --- a/compat.h
+@@ -459,7 +512,7 @@
+ @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag = 0;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -1035,19 +1088,6 @@
+  
+  /* File to read commands from */
+  FILE* infile;
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..36a6e519 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device)
+- 			freezero(pin, strlen(pin));
+- 		error_r(r, "Unable to load resident keys");
+- 		return -1;
+--	}
+-+ 	}
+- 	if (nkeys == 0)
+- 		logit("No keys to download");
+- 	if (pin != NULL)
+ diff --git a/ssh.c b/ssh.c
+ index 53330da5..27b9770e 100644
+ --- a/ssh.c
+@@ -1093,7 +1133,7 @@
+ +	else
+ +		options.hpn_buffer_size = 2 * 1024 * 1024;
+ +
+-+	if (ssh->compat & SSH_BUG_LARGEWINDOW) {
+++	if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) {
+ +		debug("HPN to Non-HPN Connection");
+ +	} else {
+ +		int sock, socksize;
+@@ -1335,6 +1375,28 @@
+  		/* Bind the socket to the desired port. */
+  		if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
+  			error("Bind to port %s on %s failed: %.200s.",
++@@ -1625,13 +1625,14 @@
++ 		if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg),
++ 		    sshbuf_len(server_cfg)) != 0)
++ 			fatal_f("ssh_digest_update");
++-		len = ssh_digest_bytes(digest_alg);
++-		hash = xmalloc(len);
++-		if (ssh_digest_final(ctx, hash, len) != 0)
++-			fatal_f("ssh_digest_final");
++-		options.timing_secret = PEEK_U64(hash);
++-		freezero(hash, len);
++-		ssh_digest_free(ctx);
+++		if ((len = ssh_digest_bytes(digest_alg)) > 0) {
+++			hash = xmalloc(len);
+++			if (ssh_digest_final(ctx, hash, len) != 0)
+++				fatal_f("ssh_digest_final");
+++			options.timing_secret = PEEK_U64(hash);
+++			freezero(hash, len);
+++			ssh_digest_free(ctx);
+++		}
++ 		ctx = NULL;
++ 		return;
++ 	}
+ @@ -1727,6 +1734,19 @@ main(int ac, char **av)
+  	/* Fill in default values for those options not explicitly set. */
+  	fill_default_server_options(&options);
+@@ -1405,14 +1467,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b4fa372..332fb486 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn15v2"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+diff -u a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff
+--- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-03-15 17:45:28.550606801 -0700
++++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-03-15 18:39:10.262087944 -0700
+@@ -12,9 +12,9 @@
+  static long stalled;		/* how long we have been stalled */
+  static int bytes_per_second;	/* current speed in bytes per second */
+ @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
++ 	off_t bytes_left;
+  	int cur_speed;
+- 	int hours, minutes, seconds;
+- 	int file_len;
++ 	int len;
+ +	off_t delta_pos;
+  
+  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+@@ -30,15 +30,17 @@
+  	if (bytes_left > 0)
+  		elapsed = now - last_update;
+  	else {
+-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
+- 
++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
++ 	buf[1] = '\0';
++
+  	/* filename */
+- 	buf[0] = '\0';
+--	file_len = win_size - 36;
+-+	file_len = win_size - 45;
+- 	if (file_len > 0) {
+- 		buf[0] = '\r';
+- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
++-	if (win_size > 36) {
+++	if (win_size > 45) {
++-		int file_len = win_size - 36;
+++		int file_len = win_size - 45;
++ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
++ 		    file_len, file);
++ 	}
+ @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
+  	    (off_t)bytes_per_second);
+  	strlcat(buf, "/s ", win_size);
+@@ -63,15 +65,3 @@
+  }
+  
+  /*ARGSUSED*/
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..986ff59b 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device)
+- 
+- 	if (skprovider == NULL)
+- 		fatal("Cannot download keys without provider");
+--
+- 	pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
+- 	if (!quiet) {
+- 		printf("You may need to touch your authenticator "
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch
new file mode 100644
index 000000000000..8827fe88d7aa
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch
@@ -0,0 +1,104 @@
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-15 15:10:45.680967455 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:25:14.710431930 -0700
+@@ -536,18 +536,10 @@
+  	if (state->rekey_limit)
+  		*max_blocks = MINIMUM(*max_blocks,
+  		    state->rekey_limit / enc->block_size);
+-@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -561,20 +553,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
+  	struct session_state *state = ssh->state;
+  	int len, r, ms_remain;
+@@ -598,12 +576,11 @@
+  };
+  
+  typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *,
+-@@ -155,6 +158,10 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
++@@ -155,6 +158,9 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
+  int	 ssh_packet_set_maxsize(struct ssh *, u_int);
+  u_int	 ssh_packet_get_maxsize(struct ssh *);
+  
+ +/* for forced packet rekeying post auth */
+-+void	 packet_request_rekeying(void);
+ +int	 packet_authentication_state(const struct ssh *);
+ +
+  int	 ssh_packet_get_state(struct ssh *, struct sshbuf *);
+@@ -627,9 +604,9 @@
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
++ 	oDisableMTAES,
+  	oVisualHostKey,
+  	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
+- 	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
+ @@ -297,6 +300,9 @@ static struct {
+  	{ "kexalgorithms", oKexAlgorithms },
+  	{ "ipqos", oIPQoS },
+@@ -778,9 +755,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -120,7 +124,11 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none cipher to be used */
+ +  	int     nonemac_enabled;   /* Allow none MAC to be used */
+@@ -842,9 +819,9 @@
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+ @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options)
+- 	}
+- 	if (options->permit_tun == -1)
+  		options->permit_tun = SSH_TUNMODE_NO;
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->nonemac_enabled == -1)
+@@ -1330,9 +1307,9 @@
+ +		}
+ +	}
+ +
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+  
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index 6277e6d6..d66fa41a 100644
+ --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
new file mode 100644
index 000000000000..7199227589c6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
@@ -0,0 +1,18 @@
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:06:45.020527770 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:07:01.294423665 -0700
+@@ -1414,14 +1414,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b4fa372..332fb486 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn15v2"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
new file mode 100644
index 000000000000..6ed670ff5e99
--- /dev/null
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+HPN_PV="${PV^^}"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.0.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+"
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD 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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp !security-key ssl !xmss )
+	xmss? ( || ( ssl libressl ) )
+	test? ( ssl )
+"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( !prefix? ( sys-apps/shadow ) )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+
+	# workaround for https://bugs.gentoo.org/734984
+	use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
+		use X509 && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
+		use sctp && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch"
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	if use elibc_musl; then
+		# stackprotect is broken on musl x86 and ppc
+		if use x86 || use ppc; then
+			myconf+=( --without-stackprotect )
+		fi
+
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
+			SUDO="" SSH_SK_PROVIDER="" \
+			TEST_SSH_UNSAFE_PERMISSIONS=1 \
+			emake -k -j1 ${t} </dev/null \
+				&& passed+=( "${t}" ) \
+				|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	# https://bugs.gentoo.org/733802
+	if ! use scp; then
+		rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
+			|| die "failed to remove scp"
+	fi
+
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index 8892b530d409..ba58e58f1d1b 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -2,4 +2,4 @@ AUX packETH-1.8.1-libs-and-flags.patch 249 BLAKE2B 039c2c8329ad4ba7dde845c34c1de
 AUX packETH-2.1-fno-common.patch 1050 BLAKE2B 37b96926309c9ee1fa9654941f0f18b9edebea98397128e32550601f7e0a75068c5eca6ae7c5498c99601703519016967e5aeb6614b0237251097fad256ee9bd SHA512 1f51f5746e2fb9405b11e6b64e0e30ba426459d892f3f60e62c879f8ff0276167ab37f630e828b3648e04774aeca9e716962bc936ca5b6d497a6b87d0dad4fd9
 DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e
 EBUILD packETH-2.1.ebuild 1056 BLAKE2B 27137a90eae39926a4fe2692047b440e26032fda032ac0f16e1c76a718ca9bdf97c8db38849c4ffcd462846125114d08c8683fa5db8022cb476d01c8beae84a2 SHA512 976cad3aaf4c1bdfc15ac71bb4e6e3e57658c121e547687d40f1cd073eb1484bbdd52b3a64e0948acff9e0f67a0e26409f0fae83506587fdaf86c9585c8de4b2
-MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
+MISC metadata.xml 413 BLAKE2B b931cb781f54cb61dea3f872bdeabb60d23348d97d75f6f9395ae9c4880e507eb381a8c48f7d7737aae77ba6ee819375926f9f2282cad618df30c8a81326a0b2 SHA512 1ba9ad6f10e5218c973427f48238d573414aaca0c544f5a343e40c0b525b1035636218e6e3f08fae8cfff54c1fd66edb604e75c56e01d43dde05c46efcad6da5
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index 1dacf90ddd48..53b2071f5d32 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/metadata.xml
@@ -6,7 +6,7 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <use>
-<flag name='cli'>Build and install packETHcli</flag>
+<flag name="cli">Build and install packETHcli</flag>
 </use>
 <upstream>
 <remote-id type="sourceforge">packeth</remote-id>
diff --git a/net-misc/pingu/Manifest b/net-misc/pingu/Manifest
index c95db5cc216a..bd504c09c7fb 100644
--- a/net-misc/pingu/Manifest
+++ b/net-misc/pingu/Manifest
@@ -6,4 +6,4 @@ AUX pingu.tmpfile 28 BLAKE2B 210f520d7b30a5c33747f481674dfa588c690589ca5cc03d5a4
 DIST pingu-1.5.tar.gz 31565 BLAKE2B 13d1fa075f32d5a32cece55c5292cda08f72e711a8567cc8b25ce0e2bb0325395f1346e9feb96eb266c93d10d04609d87562192f7b7d0c22730fd4a8561c6c1a SHA512 71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9
 EBUILD pingu-1.5.ebuild 1298 BLAKE2B 00ddb5cffca604bfdcb620ebd450e633e7e2aff732eed954f3d1ed2b8adb47d0a85040a0fb8914d29b2e50a48f304530158882265ee93f15f2d06d779057105d SHA512 96387332ec8643e9b75d1931e1430ce3d0cb0efad3adfa0024ebfc09774f957f952533df2bb47a3e9d633c0e824be920057cc7de7da818b7f7d6af4deb114760
 EBUILD pingu-9999.ebuild 1139 BLAKE2B 4513781ea236033d279d7c5db84d896d37d88275d533b56ce18bab50db81dede0d173d930b86bdaafa86011c379ec0265bcfe9e9c516244bee224245ef65e8c9 SHA512 be1dd4c24a21f51578e92a28ae023e7c51ab26c713e11ab4a12e9db0d118352956c2cbb37806d22e3d7420d2c8315db9a3e38ea78ed03426eae425db8744e7da
-MISC metadata.xml 452 BLAKE2B 159622afeab9202ada42b0dbbe1181c2a26901eb82bf12f515c1a0f0d03e1a660b9cda460cd8f83900ed7e2d8329b9b0c1fdc6ef7993bcf0e7d2ed1f172ca16b SHA512 2a197340c32f4b2c42f183685b9478e007515eb7891a43113964f9f866e5f199d11eafa20dfea37b187e3caf29b2a9ef51df4912bdc684936aee9cf4b6b38673
+MISC metadata.xml 482 BLAKE2B 3cc5b00792effb55cc61b3ef32a966b712e031b18fef383ccf6404e7be7a12870be1f82f62d21e056d0b973cd60aa015999be63e18693cc8746ccfea492f708b SHA512 a5c9f6bcf4e525711381777afc18b2f22247574715323281a9d2bc23ee7cf28548fb9fa150195347b562aa24556cd72e0896e27a34c07a88255281cf53825ad4
diff --git a/net-misc/pingu/metadata.xml b/net-misc/pingu/metadata.xml
index 1e9ae98b8c53..e38d181b5a75 100644
--- a/net-misc/pingu/metadata.xml
+++ b/net-misc/pingu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 23fc802709fd..b7478b86c7d9 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -6,4 +6,4 @@ AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f6
 DIST ptpd-2.3.1.tar.gz 884161 BLAKE2B 029eeff4ff427aec7a24365bd7f62a4f5d6bfe4bc0a003b0fa8ca1f7581b2395cb96c27bfa59c6333b0354ac0fb12fb11fd24319506c2168e0ff4ddfb3df9117 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4
 EBUILD ptpd-2.3.1-r1.ebuild 1358 BLAKE2B bbd67fb82dabd88f2f0885df34dea7e4a26406a86c5329aa72fa66f93327a842eeb7b0c20aa6f5874157e4acc461ffe1fd1befa37825ed96f7ee331c6985854e SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97
 EBUILD ptpd-2.3.1-r2.ebuild 1418 BLAKE2B 03563a0e1e386d9d2a25f54497262adbf12b7abcd9554c23893d0b38a4865ce7a92e209d43d49dfb948fdf4aec284f5afaaa09eb6a5f54d476e8db94c65eb946 SHA512 24f1927b4fd1b526ad503fd92d5c0d87f8dfdbc1838b47f02a341a6b549afbedd025fa936b31e45aa3cc7815a1ef8a07a18afd9feed65380c684da6beb600d4e
-MISC metadata.xml 988 BLAKE2B 25f10292189622b3e50d058fc2faadd46959bab489a65a77f4bf4b4d5b8c98ec86e4b54e987b87dab497d4fd39c2c786b743987166ada6d9c4a61e15a5960a1b SHA512 a96ee23e21b8230c4756022e5678df1f72c61576b0aae1de04c10328417f64535129ed4a10beb7545c7316e36b9fe658e8c5ced5f28177ff84b106caf525ec06
+MISC metadata.xml 1018 BLAKE2B a971e719b88f016a1e56acfc39be13e4ceea521c4deea485c876b9c54c19d507a3ade176e32af4371ac781725197fa5c3d8f8d974f73fd0799cc366af960f589 SHA512 e9dd483692a5de06400c69ca52911b4dc1f8b6a3310b571398b939b7ae3b014a57553c85282f09d10082475bce03448ddfce37962a5bf1e9adb932e7e7bfd0f8
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index 6633371ca920..e17af8c6fcf5 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>honza.breuer@gmail.com</email>
 		<name>Jan Breuer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 31087a9c8ff1..7904ce1fa4b3 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,3 +1,3 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 EBUILD pulseaudio-dlna-9999.ebuild 2019 BLAKE2B 266ac29d3776ff6aa5e9d933eb7d099812899ebb82874453499816195b5ae51ebe4d14842ec0e2a45fdfaec14bc42e205a419af5851b5cea134104461708a7c8 SHA512 db84789f4eab84be3a43a1cf0047f5d09cd4ff57db495c38c57acc94b7f363415925c1e8239c9bb7b9f2410e6e2ee93c1d00627d77a45caf2691ae5787853e90
-MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
+MISC metadata.xml 340 BLAKE2B 0b1e32783a144b886d4728cc395d18cfa3667994f63169c41d7faafa3d9f8fd403601fbfdaa533652c049ea9c3cec19e97a44207c9a83eee6e8d54d859416fd7 SHA512 511176b0db620e0d257b758cc329a143e4e948dcdaf2fef42dcb8bef4a9e72d5d05c2c50cdb2ed834b343caa682a5722a2cb5063a5ff98e13c939dcda8e3d396
diff --git a/net-misc/pulseaudio-dlna/metadata.xml b/net-misc/pulseaudio-dlna/metadata.xml
index 23b50d1eb70d..e5d2d58c2263 100644
--- a/net-misc/pulseaudio-dlna/metadata.xml
+++ b/net-misc/pulseaudio-dlna/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 5e6eb6033533..1f9416e7ff9d 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,6 +1,8 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
+DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91
 DIST rabbitmq-server-3.8.7.tar.xz 3074228 BLAKE2B 131e79cc97c64fb5ba8d0c4906501da34e8569cb498ec61fe16be05923e2e2787a3d4ae5291f27efa619a0988b3c98ab8109ec2c0bc2c74da48c4ddc2f5e2cd7 SHA512 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac
+EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 7905cb8e051f91b74a6e7a0dd632df0827e1f618f57e90f6bd247edb4f6699235d1bfdd619fead56cd486a08d35b7e28fb612d60a0801f862292bd8ce635048f SHA512 1c7cb9378d87a474547514728c65f4466d12be4514ad3a1fad0ae5b1bfa1256959ca1f94bb67651b9528fe320fc361d62581a47fa172b7892da8d46f99e830ee
 EBUILD rabbitmq-server-3.8.7.ebuild 2151 BLAKE2B 3c0f2aa446e78d693618127dad27b09cb26712bf555deb3b7e46c59ac199c504276ac9a9532e728dd2db449a611cadf1d0ba89b5a6d059d9f8e79a979eb62fdd SHA512 47ccea4708d114f79838f8e8e702a819a88bfd22671a0b731b9c121801becf5f65ba9fec68d21eacad8528cac26fbc6ffcaf6ebc22dd3da19766d7fd31be4e65
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
new file mode 100644
index 000000000000..a8a9e9eb1e3d
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-22[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest
index 522326c1d606..cc99a71b0ec1 100644
--- a/net-misc/realtek-r8152/Manifest
+++ b/net-misc/realtek-r8152/Manifest
@@ -1,3 +1,3 @@
 DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd
 EBUILD realtek-r8152-2.14.0.ebuild 1608 BLAKE2B d3e3d51c689e73b230936b46dd01ec582fffec9855b377e51e656ea385b171a088d35a004cf76fb2b99af5b10df6479707310db5205e9a91eb6eb95dede29780 SHA512 7fb49e147edd47989c3680bee50c51d76e17bb8c29bcd1d7abae1ef8b16f1ee38e2206b5e43a4d4508587fd2b9a12ae3b331b5c3bf831ec2db02987ca3539a7d
-MISC metadata.xml 252 BLAKE2B a7c6d432616d7b90dd77f1595a17154db8559729a787d0b94cbf6c44b3fc08005bd9ad6cd1eecc5fb8bf9f25789f7eac2efd074e6042125a207567f9af292716 SHA512 67a93db722bbbb0e7ed243cb68e60fbe315114013b2326bdaca5d2dd10ae6629bf207152c1cd95a98f6e638346fde3fdefbd35b3e47005a93eda61fd1aee0cae
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/net-misc/realtek-r8152/metadata.xml b/net-misc/realtek-r8152/metadata.xml
index 6c5d3e79d48d..8072ef2372e4 100644
--- a/net-misc/realtek-r8152/metadata.xml
+++ b/net-misc/realtek-r8152/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 1460078f2ef5..a06fc0819411 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,3 +1,3 @@
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
 EBUILD s3cmd-2.1.0.ebuild 546 BLAKE2B 83fa55b319aab69d5677b656236fd689c343c034e3fff88a1df8ad7432a82e50e20e3ab8d767608dac4a0c55c2acecb236ea526d59f177a9f4e70b3023060f04 SHA512 577cb0a0b92a78c10dabad767c8574cf41b8fdf1d7d0551e41e736e0ce626ac4a8f35bcd6e0ab7d06df7470f6744a370313aea9824f28c26e8c23e73048582f4
-MISC metadata.xml 684 BLAKE2B a51a67e94176e0c83d810b847abce27229e0769007d984fe4947a474f7d5dbc7a27169efa6caad265405e7e489351f5cc506fc852be88381f282bc7068bd70f4 SHA512 aa2ed58e516488adeb24cca0aac779dcb49c4ed6977a6b411df34f45a0e1b58a42aa34b0ff5faf1206bfb88f85bddf034dad43577512cff67e1aed2292f373e8
+MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 8d26ba9964fb..6115812190c8 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>igor@itesten.com</email>
     <name>Igor Testen</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>rich0@gentoo.org</email>
     <name>Rich Freeman</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index a46dbf06a77b..701986f9ec78 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -5,4 +5,4 @@ DIST samplicator-1.3.6.tar.gz 87901 BLAKE2B 0ee1a7900c941e5c92c722cbc1c7308be802
 DIST samplicator-1.3.8rc1.tar.gz 109870 BLAKE2B 2ff442733216d6489028117936460ba8436af2f92982ac819a1d824ec5e07cf7f43c01e6de9abd9d50005e3bb8d5d91a64570bb805eefafee4bda14fac11d6d0 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306
 EBUILD samplicator-1.3.6.ebuild 1539 BLAKE2B 58293b65d0eb48d8b0238f194f93b5a1d6b3e5e1b47206fdbfd05cd1ad80283b6c3e69a8707f57b901086aa6cd231231190ec2e71c58409e2b6ff53aad252835 SHA512 a81f6ca6783aaf2b77edde24c8fdbdb459371f3894cbdfee720a83aaf46741f9d646847cc9d7bcf759cec5bfc46cd5b80594e09b71c5e541acf21371485215af
 EBUILD samplicator-1.3.8_rc1.ebuild 1604 BLAKE2B 208ef2cc6f5b73989dbb526a2e8d35e00656628fc914add727f12367d054e593fff811529c4312b1696d1624babe22058a5aee0db2e6306ff9126277f3a9b073 SHA512 7177a502bcc332632250a6d4be65d7cbdd1a243cc5410a091bf61764c20b615ed280be62f5e8cb6a5edb5ed1ffabc3fd4e5442e3656e2c7f4f3727cfb8f219ae
-MISC metadata.xml 816 BLAKE2B a9153d3127cd86761dd1163f2ca8df8bc7ef2191bbba211a37999004d74f2e7ff32460b9eff3bda68dd6e1b5e96b638ac5a32ae5ffd4f4ecf2cf61342a6c8e88 SHA512 95e2021fe0539b320556156c01810e133a2abf75858cd5f57261704c1b98765cbea51635b6e9cd9b485d60c9d7360456ec03ae9429ed1ae1b91c46e010c50e02
+MISC metadata.xml 846 BLAKE2B 8d9f63a96c88c7cfd61cb710d633a53fd45dcc08e6c2399f45b11293a68ad23cbf729727c65bbb84de789a40b35f79f2d50319679f5909f06b3f95891e7a768c SHA512 52278a43277f8d5b9e42e472ee8db73da0ee8f102356297efd22aac97484e687ca0c3b016fad3c7fe0a80c44b48ee7b3bc44f6d21f55762cba2ec587e83fd26d
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index 20ebca25013f..b94b9566c80a 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 7c8b41a341de..d9f28efeb0a6 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -4,4 +4,4 @@ AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
 EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1
 EBUILD scponly-4.8-r7.ebuild 6938 BLAKE2B 44e7e4de6259a6692b9d5dc22453eea34917eecffdfc2e78da9474b5102c75bba59939496b6c80121c009966f51b99668a70853a1cf0a25c55aa425885994b88 SHA512 9ba63e00d60988b9250dbc1521d8a08323f9ccdead86025b6a85082472f2e6ec9fcf860591734c3ef47fdc58d2b5b171c35a60a0866636be8a59785560c7061f
-MISC metadata.xml 1730 BLAKE2B b6663a37fe260a5e1552d5bf173d96021cf5588a917a54e3e892eddf7be9618e8b2244328ca6bf87fe8dda4777349fb703f09075975b754026403742a590238a SHA512 86aedd96e8b14fa8b86a2f69a253191777e9292e4547dd8e4e07e11b22068bf1a7b6404a7a0ee4108b7ecc4d99a952c81999482aa9488d45b92ae9c4ba451938
+MISC metadata.xml 1760 BLAKE2B 0e8926cd16ce210ce1545243103305d7c2943fbb0dd41b09d819225aa67995c7c0a3e5d7cc892422480e237d8f9b89b4b95f137abf9a8ed3287c953517e296be SHA512 0a25c9484e1f10839f62d09f2eabd6cee41c70045a6d6e0e321bf6f19b414923369bc4d4aead8828835f81094459ed7230c2ddcec496677a94c276be255381e9
diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
index 38864027ac19..66feb21e49e3 100644
--- a/net-misc/scponly/metadata.xml
+++ b/net-misc/scponly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index efea8ec30701..b0c21931e1a0 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,10 +1,6 @@
 AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f390fe5287140520867940b2bfa0615f65294cfc0328fd0a285c6e66941e040dc09b8164fb58ab092f5645628811227a30993fc SHA512 67cbcddb7d8610d29fcb308ebd0bc648ad0526101a2540e743232500880f276b0c07f50f20bcdf31d49f422057f99e310a84384ef47f52abe90be8ef0b8b6e6f
 AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-7.0.10.tar.gz 2368056 BLAKE2B 8b446a818cc3a238bd92831843f1991632e9417ba92d043065aaf43e2a4d74aa00d331e32136a195558dc780ae124c8b1e7b2b2969f3cff8169635df7470f876 SHA512 cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340
-DIST seafile-client-7.0.9.tar.gz 2367747 BLAKE2B 60a488a22e094d4783c7da50e8852d7204e16791613d113f729bacc21a40883edc25469f8ce1a8dab52b4ed0ea73b691a831fb0c01a885aeeae7bd276e2781ff SHA512 665a252a321744cd84b96230f5318528aad23a0a089e5049913c34a6c254356c7cc996e45e2a50d432d114f13b089b8d12062b3a1a4d1a0b6f1cbf9688ad32b6
 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
-EBUILD seafile-client-7.0.10.ebuild 1209 BLAKE2B 2543c25fe156d1b337ba19bbbe5250a46a42e84a58384a1e0e02c23253da75fa98adab3d155089ef9b8edbee01e3a878e3646a2538c38758267d0a81df6608a2 SHA512 67ed286ace247497a574cac503617d20e18b01d3eb848f02dd78fecbaa7112456d0d2b2c2ab475a4ed26586d2f9b77a96c122262e8ef67d70a78c3e9d4fa76be
-EBUILD seafile-client-7.0.9-r1.ebuild 1195 BLAKE2B 4e5370331f2bfdc0007b62203fa167f7cfb3f35369d491fe0eac51375fe01b2714814e7b8a154f0110ea980da0bc487c8efbde77c45b75240a75002c5393bd33 SHA512 457f1bd1be04819ae66a0b097c3df4532497d84bf1ea7a3b903d830ba4e754f8a26959607a0717c0cc98cfed106b58a3905a21b03b91f32e9d7d6b7f94c1c840
 EBUILD seafile-client-8.0.1.ebuild 1209 BLAKE2B 8a6849cec8c10a120dc563c2ed582b287775c4ae0974574881d16cace8a94fd222cdb66d0c85fe69c50d21a75bbc37a5337685187123609f85c2a69fe9dfd161 SHA512 1495645504888704558c130ad0de57f6d2223fd3182b6829552f829c374b5e0ed0d8a5c0dcadce828775a388ffab6941f5c37d00b0725dfdf98ee2d6c8a2d995
-MISC metadata.xml 546 BLAKE2B 26e43bd101f64bdfae0d36dad1035e71f5a0ef31ea3bf5c5bc4b82a9208c892cb7241f50133fa969291e390bbdbd3b9473dc346c65f53d13d4483224e07484c8 SHA512 818714efd9851b566058ae6aba37a7860f0971f54e944f3386e14e9cd2053bca1d18d70ad653051a2c705af6807e5eea656d99eab52263055622c073384e9f83
+MISC metadata.xml 576 BLAKE2B 2174b676e97ee6712305427fc4ffa5d11007872d943b3fada1d05d67d3c83a218c385559e4c24cf12b318e4b1eb4192cae79a33c86329c5442caf72af86c932b SHA512 1e0f7a2c1f0ea6011b55ab213d1783677307468ceb44d594ecade76c36ccdfb97ee94feb3ad8d90b451a7349b48f8372a92ff8bd669d257ddbbab77d1a75e4dc
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index 1c36e673cace..c37a654f03a0 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile-client/seafile-client-7.0.10.ebuild b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
deleted file mode 100644
index e869695c7c6f..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-libressl.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
deleted file mode 100644
index 649db5f1322d..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index dd32cba8caca..ca97eaa60202 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,3 @@
-DIST seafile-7.0.10.tar.gz 707294 BLAKE2B 7f31d09480a7be09c957a79442bc0c952a4b3802fe17d660cb4ae7d157fcb656280751ed5033e399a705fc24c8b0a232e55e5f289792bdb69abec304c85d3473 SHA512 6c5870e75d52f4409fc6f7e3884d3e9208693997b25a6347980a8d164ec6a3348f4b3f5a532f11b9221822aa0ec9125b9d9af8ba7abc4d392cd5b5f602df9289
-DIST seafile-7.0.9.tar.gz 706859 BLAKE2B 2cbd12bfdda9c2cc13d38233a56d0d2f52ad04e03bd14c90c6ff086756fb7ab4f63319906030f9a5f4ec2625dbe23b2892c069f2b5d50c6997b23deaf2cb61d7 SHA512 4c87e7a4a6a4cef631cbfbeb1bde3c8c9e0915d5fe4597d5b3a4b8aa15e9650e97b51ee6a3b0bae4d235ec53149dca01aed7acd704da593c97da0a17e352a75d
 DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
-EBUILD seafile-7.0.10.ebuild 1220 BLAKE2B bea54ae5efd2458d6e6bc3b14af8124f5f0eb4f4b572304e3370f173dd24eb887c11575b13de169ac11b6964fc80ffa6835ae4520672494a340e1edb69fa1dea SHA512 0b12111ee564f3184aae10dc320c4b29e51bea1dd0f8d271349c4aa8dcd30574beb6e8ed0a0ee957d4965eb852ef6d2a2ab1b74cbbd1d25bb5a0dcf15d0d2219
-EBUILD seafile-7.0.9.ebuild 1147 BLAKE2B 05afbc0c7b12038dfb7a4368210e6ea5e9744ca1ad3317e89d7925163e78f121d2802b22f16c6f922e3656189d27dd31147746eea63b691c2da3f72be6f03781 SHA512 8d2a026d4797df58eae5c825ab16378b4880e099bc8b9584ce299f1af46828c364e3008df32a62a105bbb1b40ddc91843f15aee58e748feed4871f5900fb4f3d
 EBUILD seafile-8.0.1.ebuild 1224 BLAKE2B be07871307b1a3f89c0fc0e239bb8239ae3d3e8f5d41fd314879e080d4252715c834d707284be94b2a6c2222f26a8895e7e2b20c80f8b7463f44268302fa72fe SHA512 7c1944095c297ffb35cfacd55b83c1b3e2d2930233112e3237e4517ef52b20c743e857ed64f769913e3893e308a804270dc1b6b6382f026fd051df99c4c77646
-MISC metadata.xml 447 BLAKE2B c90112a457648a9be79fa0a4858ba7451d86158070a1a4798ac88e3724eb3f39ddef039f904801d460ca607e9143ae7af58bf58a0024d8a6f513055f64fdee43 SHA512 d2af0ed21d876d212283140c20a3192c1d09c88e496c21c455a79962ad20547a9d32688ded73c6951388720e4abb9496afca405aee6ed5ac126f107bea3ee7eb
+MISC metadata.xml 477 BLAKE2B 6491e1ec0cb07251b6bbbeeff7e9b04ece552e19d922f7db44866e323f17b14839a165e5c6ac77ab0327daef328aa701e338f2c9620188bfab8833b9497bd187 SHA512 012355a4c6b2c9fff5f4d1d2202dfc377c718f6b8d96e5474b5650894ef6e5dd0a97a927174b0bd492bfb72af0323a4a8bdca3b9c928f01d664c1f196fb861df
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index 306e8e51c578..98078dddb3e1 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile/seafile-7.0.10.ebuild b/net-misc/seafile/seafile-7.0.10.ebuild
deleted file mode 100644
index efe304b3e70d..000000000000
--- a/net-misc/seafile/seafile-7.0.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8,9})
-
-WANT_AUTOMAKE=1.16
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent
-	dev-libs/jansson
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-libs/zlib
-	net-misc/curl
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-7.0.9.ebuild b/net-misc/seafile/seafile-7.0.9.ebuild
deleted file mode 100644
index a2901735717d..000000000000
--- a/net-misc/seafile/seafile-7.0.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8,9})
-
-WANT_AUTOMAKE=1.16
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent
-	dev-libs/jansson
-	sys-libs/zlib
-	net-misc/curl
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 7e7b8c7ddcb9..f4faaf2cece8 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,4 +1,4 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
 EBUILD sipcalc-1.1.6-r1.ebuild 430 BLAKE2B 25591bf6debb2e1789f220aee280e3acd5b7c29bf588a230b1da657a3403cd2eb989095da8d2d8b4ce4ebba306eefa41c3a02f68d569838e018c7557c1ce2997 SHA512 071827ab68fffb2b7077db0446112928e5fd786104cff39b848a0cfc8952d54a023687288d05b8bee6b8ee13a7664e78c0093ed03baf37d78c7a02e904a73602
 EBUILD sipcalc-1.1.6.ebuild 402 BLAKE2B 272048d2c85f633f5dbc0fb312ccd0f9f7ef0849e481037645b442a1fb2abb65197291bc369c9e49f23d95de5731dea30c647216741db71804072ff15b7c36c4 SHA512 3e414711f989835aad58ab3b50ff2be2fdeeba926e6ea7821d9b31efbede7dc64bc26e6936f7581a2fe6ef01cdfe1d48ef9db982123e415f6effbae751cadcec
-MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
+MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
index 78e1c2f9528e..84aeb359eebd 100644
--- a/net-misc/sipcalc/metadata.xml
+++ b/net-misc/sipcalc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index eb44e0eebcd0..36bcb3641e65 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -3,4 +3,4 @@ DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e
 DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
 EBUILD sipp-3.6.0.ebuild 960 BLAKE2B aff654d4ba7a2a4bf00b5151242e9fe57f711ac6fe67e2d7e6746955f4d55f2226b6181fc423f61ca115ac95228be64b232326d8d4c4a8950e5c601171cac430 SHA512 1a4585f9b910b5e67f2abf71409c09515af2713b0199456a34be6a23bee89a24fec66f6840790593bd29c980ca02f5fd613c5292c23604e7ae6e921d2fc57728
 EBUILD sipp-3.6.1.ebuild 1103 BLAKE2B f6ab8fea4e1b96626b5e80fcf8f8b8fce2a927d7585e2d12dfdbda47c9910301d9c994c02377e21ec7a489ac5a1802f0189ffc531adacb8460c5f5f045467d16 SHA512 7a6525943a713873a3602a818099255f682bd56193c186ffe2c62d275f406f59c726e07bd199260c5026faa5b68b5582647a9188b831b6ab17ed0c2a23484b6c
-MISC metadata.xml 456 BLAKE2B f7dff8c7cdc43d043f5a84c590e084a0ad39f973738a58a991f9971794c4ea904df0e95d47b7669ab0f76c193586aa8feea6b1414111d374af301dcd44ee055b SHA512 0268164af9c3e0e1558549021c47b9374f5f565996a730335d5ff7c8132f7e8bd2685c36db74dd9ab7be2029ddbb56250519b7b0bf85d54997d247a4bb26365a
+MISC metadata.xml 486 BLAKE2B a588a77cd42abd3dafdc5c55cfb528b7db56287ebc80d92a7d1644692c7eddfdae7ae1ca1e02dfdd053651784aa647c44d61db92f6e86ab41c195ac810565acf SHA512 db368e32b263b8f27a6a0f9c548ab05ee726ebc84b34df493ed58ddeba76985daea4d3fdb3efe8f3af0586aaa618cdd7fdf69e939cfde59a822f407cf99da2d1
diff --git a/net-misc/sipp/metadata.xml b/net-misc/sipp/metadata.xml
index 2308b2753fdf..7b404e91b292 100644
--- a/net-misc/sipp/metadata.xml
+++ b/net-misc/sipp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index a0d37e1eb96d..77019f46ebe0 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -8,4 +8,4 @@ AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r1.ebuild 1978 BLAKE2B c7a74b61d04be2b0fab0607ff18ae3a3293c5114b0bef3cf6d1fa0500e88eb592b866087f29de2225829fb0ad8f8cb26828265fe9f0e47e647bb4c22b33d1d40 SHA512 6ad9aac3cf9a7352acf8109fbd2309e896e8f0e52adb1e50bcf235f61886e9db1ba770fe8c62c4894b494632b8989fa2a08be482b07743e6d846027bb9682e79
-MISC metadata.xml 612 BLAKE2B a17fd5ea60dc914fe857b32afdfe0782476d638106827e0c2ea22a5b7a365a6edc32eaca49d81089cfb19f5a7a239e63fb51653a7328bf94f2d8299ee8a14722 SHA512 04589e21fc83e206866825876bec4a4717708fff8b1e7192188f31ae08c278892ca286a362040cc21c0feb6041f413657ba9118b854f67cbe1ef3a9f8fd8696e
+MISC metadata.xml 611 BLAKE2B 21cb0b4d0687709cb87a56501499b24f9abebe14aa50699decd294f1e6bc37bc3cd93dec7fad8bc1e6803302a21083bb52c72f3f45fe04cacc800e9063230012 SHA512 107db295be58b2fd2d1a174d70d16f0d84beb1cbc675c32c5511df442764c56ed1c162fa0a86a5d2f37449b3efcfc06ad7d069d445823b2ff078feae7b1015b7
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index 4c6d13fbd699..4a8292d696af 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -7,4 +7,3 @@
 		<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 6ca3ede511cd..9f011d0eddf3 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,4 +1,3 @@
-AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7b18fdc05dd5f596a26c0fd2a09a9c3db846db0785c31141948e048853a947b300983757be92a5970b14ae6d3a41a41d084a2 SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4
 AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974
 AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088
 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6
@@ -6,8 +5,6 @@ AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cb
 AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c
 AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
-DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
 DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
-EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59
-EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec
+EBUILD sks-1.1.6_p20200624.ebuild 3760 BLAKE2B 3c4d4c7643a2a946319d5cf0010157d9b8f891813fa0bee0e76d9449fe36f1e2350a103bdb935934022d2e42cdf76eab2eb28d0bebe54dc26f04d65697149e52 SHA512 83a815ef86e5922dd9527709977b0a6eed5641a7ad871c9c098052018de6cf4c09c8ddf51a907ec272f1f1cd01f5ae2b8905d09d6b1f35637a6bd9e37e9f339a
 MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff
diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
deleted file mode 100644
index bf3d19010337..000000000000
--- a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Christoph Martin <christoph.martin@uni-mainz.de>
-Date: Fri, 6 May 2016 14:55:01 -0400
-Subject: use system cryptokit
-
-Use the system cryptokit instead of the one shipped in upstream source
----
- Makefile | 31 ++-----------------------------
- 1 file changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 15ab3ea..eb56758 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ WARNERR=-warn-error A
- endif
- 
- CAMLP4=-pp $(CAMLP4O)
--CAMLINCLUDE= -I lib -I bdb
-+CAMLINCLUDE= -I lib -I bdb -I +cryptokit
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
- OCAMLDEP=ocamldep $(CAMLP4)
- CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
-@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx)
- 
- EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
- 
--LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
-+LIBS.bc= bdb/bdb.cma
- LIBS=$(LIBS.bc:.cma=.cmxa)
- 
- VERSION := $(shell cat VERSION)
-@@ -280,32 +280,6 @@ prepared:
- 	touch prepared
- 
- 
--CKVER=cryptokit-1.7
--CKDIR=$(CKVER)/src
--
--$(CKVER)/README.txt:
--	tar xmvfz $(CKVER).tar.gz
--	patch -p 0 < $(CKVER)-sks.patch
--	patch -p 0 < $(CKVER)-sks-custom_compare.patch
--
--$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
--	cd $(CKDIR) && $(MAKE) all
--
--$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt
--	cd $(CKDIR) && $(MAKE) allopt
--
--lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared
--	cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \
--	   $(CKDIR)/cryptokit.mli lib
--	cp $(CKDIR)/libcryptokit.a lib
--	if test -f $(CKDIR)/dllcryptokit.so; then \
--	   cp $(CKDIR)/dllcryptokit.so lib; fi
--	if test -f $(CKDIR)/cryptokit.cmxa; then \
--	   cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \
--	   $(CKDIR)/cryptokit.a lib; fi
--
--lib/cryptokit.cmxa: lib/cryptokit.cma
--
- ################################
- # old stuff
- ################################
-@@ -404,7 +378,6 @@ clean: mlclean
- 
- cleanall: clean bdbclean
- 	rm -f lib/*
--	rm -rf $(CKVER)
- 
- distclean: cleanall
- 	rm -rf Makefile.local
diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild
deleted file mode 100644
index 0f55ebd8306c..000000000000
--- a/net-misc/sks/sks-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib user readme.gentoo-r1 systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="optimize test"
-RESTRICT="!test? ( test )"
-DOC_CONTENTS="To get sks running, first build the database,
-start the database, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-DEPEND=">=dev-lang/ocaml-4.0:=
-	dev-ml/findlib
-	dev-ml/camlp4
-	dev-ml/cryptokit:0/1.10
-	sys-libs/db:5.3"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch"
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		Makefile bdb/Makefile || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-	eapply_user
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild
index 7c9d13994f7d..bb6bc66f7636 100644
--- a/net-misc/sks/sks-1.1.6_p20200624.ebuild
+++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-keyserver-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="optimize test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest
index 86afc95e9567..105cbcbd0128 100644
--- a/net-misc/sshrc/Manifest
+++ b/net-misc/sshrc/Manifest
@@ -2,4 +2,4 @@ DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131
 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4
 EBUILD sshrc-0.6.1.ebuild 508 BLAKE2B 382be296afff6d8c5e4c50d39fc24363afa4d77de0c40e0860d7771b5897a761332f9d6c7e0e1bc0371e3acc5b7c558d3a2212d182d3e80255beac209a82b046 SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5
 EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 678fe7cbac5f64e689bc21c83a79b757d38adf98eccbb8289d8c460012b99156d97eda76f4762d24248b37225b7dfd06c1e1f63fa79197a222d49d2aa87e2eef SHA512 aeed92acfc893a0e3fbd86fc616bb52f427c46d912cb58835bdbaa8b9f2e3ccac3b2ae133ea4fa9759ac6879e3d63e06b878a67c3a1a054df0a2c1e1588fa709
-MISC metadata.xml 686 BLAKE2B 1eb7107316b71bdec72f42a5eaa58aa7fbd9b568c1a887adbe7b031ed9b7b5a42bdfb43374a656118d49dc873d1437d49849faee59646d98593bb0efd87487e2 SHA512 00b1ff2c8d66e8beebb34f409782c43350c9fd6709df2e9300f010632324cba282fdf054d6ba32bd822aac0b2cba7364cb33069ba550a89ad09b9a7ad50f2658
+MISC metadata.xml 716 BLAKE2B f0f7b3faca4f541bc30e93a0e9833d719fc12cd7c1e670c7406007606db6f733aa64f39817f0d130216933f9f00c1a71784fcaf0ba1db44838bfbc0f69d5038b SHA512 7681bd1c60566700b72a64092e9059eba124b142b5b6b35bf06e921309364b63041284cd497ee186ad82e308e7b9ce6036ce343b41a6b16c7c2ac506e768de02
diff --git a/net-misc/sshrc/metadata.xml b/net-misc/sshrc/metadata.xml
index f8cee01d76fa..87e36bceb6ba 100644
--- a/net-misc/sshrc/metadata.xml
+++ b/net-misc/sshrc/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- bogus commit to force manifest regeneration #596462 -->
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
@@ -10,7 +10,7 @@
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index dc7b75e1d8a5..9c034f33d017 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -23,4 +23,4 @@ AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf8
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
 EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 57d5aecbe3289c9da5b214664d5cfb1547f04566bb3897cfb9efd08da9db60b0b1da093eaad2705309fad6e5c028ca806d250590c4a5ab047b4bc4735f0486df SHA512 7f68d15263b281b1e1e308d0a49d378532c5446c6f864fd994890913d13157f5cbd0da055a9a0ef24c37cffa96e8ae0e1bff44ad8bfd6ff23e0ab8d8133b6f12
-MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
+MISC metadata.xml 4193 BLAKE2B db9820d399533519edf9c90f5c8acd3b6627b83ffbdecff58c3691779d940e481cebeff475edd045a924423c0947b00ee68c4725f26154604340c5004d30b0bc SHA512 51e64b32cc492a699a4acad7bf0044b1404be3df14d31ac8f6f239060ce312a908c392df47b86c899baf4e052345c55ac5a940e04f49dbf8dc0ed626bd00058c
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 5d46368a3e84..1f91c8885843 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f9171d826210..751678514066 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,12 +1,15 @@
 AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6
 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
 AUX stunnel-r1 1462 BLAKE2B 3acccb347c008ce5e8eb1cbd72d9125edd452ce5f607a819cffe72618a77c4a1d9b3702851e6e13cc236532b536144acf564cec3f1811563452dc02be0b8f992 SHA512 b5d33a9beb056bf6c9571296cb2a30e2aaa48b9841adb7ac3e40881f261f7ba999acf95ded81f2185d6a51ff8a21f79bdcbb0f3ab2e635c93279f33fc74f249f
+AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929eab43384a153f088c5703818aa99fe6f0cca40f177328ea916d64d410ec37bf68638e443aac90 SHA512 cd4bc2bd38df267cac979587e36cee878d60ce4a7b1c11ba72323b6955d30ce927bacd125b2a9ef329ca1c69d882af68abaae1412cd5c12f727178a8f466e6fc
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
+DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 87996eed3f6e6fb325a600bc8e7cd34b9ba2cf0f979b9e6d0c91f771965358714ec8d0ba4f8b2cb143f3147f14253b706a16c9c05ece2a4ab0dd01806bad51e7 SHA512 3cb233f32648e69a92db145594597e774435851e71f5f3927351736ff0fc123b9bf0418a21501734e12a2999f518e8ec24bd0176d9bddb884bf5707539b036c5
 EBUILD stunnel-5.55.ebuild 2765 BLAKE2B f8a63ca21c9fff727e3721fd1ea3fc44e23a419aed884a663e2a2b7d3a14581a849d901a262add9db245de5908afe24a5494a018da3b084c63daa898cf9fd120 SHA512 a19a57aa6b5d025b75e01822400ab3db74799dbc1c39d326a2893505212045142ac309314fb98ce735796c021aea67d7676537fa917953dffe231bf396c0d4ea
 EBUILD stunnel-5.56-r1.ebuild 2893 BLAKE2B f4aee0f03135570820eaba95ee982e020448b46cbb4b0e43116c3db8511ebd67d7437f7e007323378ca4f9a785bbb6d46de2af289269cac117fed20020367efb SHA512 d6fadc2ec6e948e84a690587b198a7f66c1987d480261c4dce0cd074d7eeaec353969564ef1001e6ca179171121719b8635eeefb9e0d875db3b14ff00ecdb8c0
+EBUILD stunnel-5.58.ebuild 2934 BLAKE2B 21f16685547deb293812396babf174f67b473f52febb75b2e028d340ca2a49a858ebe357004ffde28b6bd7733a9a0f646ee79ba9866f577de4bccaf373f0ed5c SHA512 f27d3de9167d5aafbd4d57f57b81dace624adec109beebb4c010544ef2a95946edeab6bc463751e5ecd2943a91fb22ca954a2e5734b8a1e31b7eee1e17596d85
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-r2 b/net-misc/stunnel/files/stunnel-r2
new file mode 100644
index 000000000000..abd42987d2b4
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-r2
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+SERVICENAME=${SVCNAME#*.}
+SERVICENAME=${SERVICENAME:-stunnel}
+STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
+
+depend() {
+    need net
+    before logger
+}
+
+get_config() {
+	if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
+		eerror "You need to create ${STUNNEL_CONFIGFILE} first."
+		return 1
+	fi
+	CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	[ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
+	PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
+	SETUID=$(grep "^setuid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	SETUID=${SETUID:-stunnel}
+	SETGID=$(grep "^setgid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	SETGID=${SETGID:-stunnel}
+}
+
+start() {
+	get_config || return 1
+	checkpath -d -m 0775 -o root:stunnel /run/stunnel
+	if [ "$(dirname ${PIDFILE})" != "/run" ]; then
+		checkpath -d -m 0755 -o ${SETUID}:${SETGID} -q $(dirname ${PIDFILE})
+	fi
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
+	                  --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	get_config || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \
+		--pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+reload() {
+	get_config || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel
+	eend $?
+}
diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild
new file mode 100644
index 000000000000..2fcb74bea807
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${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"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 0ea4a6882155..4404e80596d5 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,3 +1,3 @@
 DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7
 EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef
-MISC metadata.xml 753 BLAKE2B 5b335db811d3f4ab42d3da0f98529351319dfa60e6f63058bccd11c8e2d498ef79f2edbb818eedebe51f0164eb937406310fd7fe6eb6084a66e1b237a9aa2598 SHA512 fe815b3a4289a2ddb0122b0a1191fffaaf38a22a6894b2a841a8a6fc7f9f19999fd912b4ed62591d0866921f36603687e36c2a7e43dc74ce538eb7562211eb37
+MISC metadata.xml 783 BLAKE2B 42852d9a5b9ff3d7b706c12c6bcfe9973566f9871b4a244a22c20985059dd66b2d2213a96709d149e521cc83fcefda35048a99f0bc6cab3565c4d054169e6176 SHA512 5da79e990ee61125ef3bbeebbbc514015c2458585ef2839748bd3d99e54f270f1b65f46bfc15e6213c6f68b5e4b56b1403e29894cb42d417b6e71cdf37da7eca
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index f4404f5503c4..45d3a8df7ed1 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ceamac.paragon@gmail.com</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 4a450c130208..f791b7de4474 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,4 @@
 AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
 DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
 EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3
-MISC metadata.xml 736 BLAKE2B d85c09cd99c67395cbfe18605835f109a5b2db0b29982eed9ed78895f6a754d17737aa947c1d07edf804395dd8e6776963424c07797ee77633782a8d78891f60 SHA512 c744f3033a7af7a876bf4b7d2800638d383c4b42ad07477fa52359f4230b7c99d097c8351ce6816010634fdb57a79314305b2133f25662662fdb7cdcc41ff553
+MISC metadata.xml 780 BLAKE2B f560ba09534996d5ac1f457bcb46678e84f27b921a051a02dac4f12c260b0927c55193921a25f75dbbca0f90f33bcbf24844d9edf4af7e5c12a07e5a5890cce4 SHA512 4f6fe0248a09377a40271416b2ff86c5e2f9cc41c45d3f5f270736fec7d7a5feb82a8f50b91a0fc7b6ea1930d1fe2e62b088dea852f302d3a1c21f2329e56735
diff --git a/net-misc/ubridge/metadata.xml b/net-misc/ubridge/metadata.xml
index 8a7b8ca468d1..a83d08fb0653 100644
--- a/net-misc/ubridge/metadata.xml
+++ b/net-misc/ubridge/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>g.djavadyan@gmail.com</email>
 		<name>Garri Djavadyan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 052b2e6805f1..f7b7243670fb 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -9,4 +9,4 @@ DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822
 DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a
 EBUILD uftp-4.10.1.ebuild 1434 BLAKE2B 9f722def7df49faac8b15fd3cca37ff19764fc6c53bb66dfb913cb1711c0a8c5553d0b4436606fcc7d38a0f499fa247f37cd5bc56de604969915b7e276b4e81e SHA512 3e4d228f59647135a0c56654f5d54af7da10a48d69e356c6bb805397434b2bdd51ec62a68596003f6672cfb62aa75ea981cea2c642bb6b9f6aa7f7b862962e81
 EBUILD uftp-5.0.ebuild 1184 BLAKE2B 441fccf9dca907eb63e8fe657b70cb3acc07ebde59700b0858614750ae4ad3636a27bcea88fb73b626a728fcd79af271080e93389fecd2e8864a4c5909b9b72c SHA512 be6161ecb9df30d234ea7a707a61a142a0670cf2cb583b91ba340ee56507b1011e2f516281016eaecb1520ee38c20ea27a020e271dc2cab579e78f0a6a2a9ee0
-MISC metadata.xml 514 BLAKE2B 39860d6c126268a50b05481df28aa9119ac42b6e29e7c985229e4ba7cfb416eafe43e6991e230f716120296ff620e218308bf1412721b5d1c106953422b1e5d6 SHA512 ecdf0ed1d4f620a20a62ad70fd0f6d3ed1bf3313bdc09f1233d589b7e93bac532aef5e84846f4ec5021536f6da6b29b8419dede49acec4ff3b20ea28f6106f9b
+MISC metadata.xml 544 BLAKE2B 0c213c865c1e453b28b6cd7e24fc36948efa124168133a3e4025685a893c23a9b65a5cc7ac5c421075056d313e0f65f7cc90a9af1b4eb87ea6bea6374dc3525b SHA512 de01eb17a92961e95743dadd2a6325d35c02472471f34c2e7f5c4d00888431546e90686572ad069a926fa22c923dcfa94aab7f78eae658c7647e72915a1c3b8a
diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
index 95eaf34a95da..320168de1db6 100644
--- a/net-misc/uftp/metadata.xml
+++ b/net-misc/uftp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>azamat.hackimov@gmail.com</email>
 	<name>Azamat Hackimov</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cbcc8b4307b0..fa2450f284ce 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,9 +5,9 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2 SHA512 7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb
+DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
 EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7
 EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d
 EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61
-EBUILD unison-2.51.4_rc1.ebuild 2662 BLAKE2B 604940ff64c3da3eba3116f6ce593b50ed249280ad3a85ce6fa469e752277cd976b0e9ce584a7000cd6583f9c6425a666e9b37c627f581ffc2b7e94f483ee19a SHA512 22f11f7a31acef79d3dbe0e663f3178988faabcd23f83e0924a92d65f95ef60efe4a725283cbb819c9ffe0f674f53aff3bad1815148f140553197404d96e13e9
+EBUILD unison-2.51.4_rc2.ebuild 2651 BLAKE2B 15f2abf27b02e733927caa6730f7ab1d5bb5181bd5b43c6bda4adc883b6524b030b64be790578783d057c4c0e2840a5fc6683ee95c53fdb17efe6d217ffe0d58 SHA512 588a30ea2cb26ffcc14c4bc00aadafde4b3df7729518e98bb215c969519d5abb76ed1e0142fd9c9090f485b393cf162d46e7312b080b15d8840d357bdcf33345
 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild b/net-misc/unison/unison-2.51.4_rc1.ebuild
deleted file mode 100644
index 7ce1abe5eaba..000000000000
--- a/net-misc/unison/unison-2.51.4_rc1.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 desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-	doc? ( app-text/dvipsk
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-	>=app-eselect/eselect-unison-0.4"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_prepare() {
-	# https://github.com/bcpierce00/unison/issues/416
-	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-	# https://github.com/bcpierce00/unison/pull/415
-	sed -e "/myName/d" -i doc/docs.ml || die
-	default
-}
-
-src_compile() {
-	local myconf
-
-	if use threads; then
-		myconf="$myconf THREADS=true"
-	fi
-
-	if use debug; then
-		myconf="$myconf DEBUGGING=true"
-	fi
-
-	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
-	else
-		myconf="$myconf UISTYLE=text"
-	fi
-
-	use ocamlopt || myconf="$myconf NATIVE=false"
-
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false docs
-	fi
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" src
-}
-
-src_test() {
-	emake test CFLAGS=""
-}
-
-src_install() {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	local binname
-	cd src || die
-	for binname in unison unison-fsmonitor; do
-		newbin ${binname} ${binname}-${SLOT}
-	done
-
-	if use gtk; then
-		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
-	fi
-
-	# Waiting for https://github.com/bcpierce00/unison/issues/411
-	if use doc; then
-		DOCS+=( ../doc/unison-manual.pdf )
-	#	HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
-	elog "in your profile files to access exactly this version over ssh."
-	elog "Or you can use 'eselect unison' to set the version."
-	eselect unison update || die
-
-	if use gtk; then
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		xdg_icon_cache_update
-	fi
-}
diff --git a/net-misc/unison/unison-2.51.4_rc2.ebuild b/net-misc/unison/unison-2.51.4_rc2.ebuild
new file mode 100644
index 000000000000..db9797ada80a
--- /dev/null
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	doc? ( app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+	default
+	# https://github.com/bcpierce00/unison/issues/416
+	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+	# https://github.com/bcpierce00/unison/pull/415
+	sed -e "/myName/d" -i doc/docs.ml || die
+}
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf+=( THREADS=true )
+	fi
+
+	if use debug; then
+		myconf+=( DEBUGGING=true )
+	fi
+
+	if use gtk; then
+		myconf+=( UISTYLE=gtk2 )
+	else
+		myconf+=( UISTYLE=text )
+	fi
+
+	use ocamlopt || myconf+=( NATIVE=false )
+
+	if use doc; then
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
+	fi
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake "${myconf[@]}" CFLAGS="" src
+}
+
+src_test() {
+	emake test CFLAGS=""
+}
+
+src_install() {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	cd src || die
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	# Waiting for https://github.com/bcpierce00/unison/issues/411
+	if use doc; then
+		DOCS+=( ../doc/unison-manual.pdf )
+	#	HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 60da5331c998..a860a8551313 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,11 +1,13 @@
 AUX vde-2.3.2-fix-inline-funcs-r1.patch 698 BLAKE2B 131ede6fed47cc8e9835604df3d34cd3c679ba717c81d67d292c9da17e1ce6a652412244f8e113a295bc17f08a525de22782dcb3b95aa8df05d768ec6765dc49 SHA512 2e7b16a7fd7cccbc79ac8f1c64e5e22399bbf219b37626b8c700d22e7f1d3b3250cb32cbfbd592743065bc68443b1b0443dedeb731f917de59a0e2568db6cbf4
 AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4
 AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f
+AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e813405620b387e1ab3f12b8592411e64524a610a7422caa89c37d92565d4946ae6d629c632bc09324e4a3ee79dcd5bee25905eddc3 SHA512 c734000ee5481fb6297d8df39c573624486aafd91491d2fe9aa6f7e714a4dd76dab503f2218d9b67d90bbb89a6b0b6b0df57c685f01b43a2c7c59272d10dc15b
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a21ee073bac1fcfcd504889c82cb15dcc17c4ecad53016733231d7a47cc501e3b5a57985d4bcda6798d9ee603f SHA512 66e5797b6da812bcf167f528fe2cb3a5291a86973f1571c5e1a0274327f29eadc0baa4b3086081e071555f9213c15a127043964c20c2bec07e5e72f835157a19
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2253 BLAKE2B 70e765767c62982412cca9661897c475357d46effadafa6a27c98be8c6c00caa69bdb02639828cce31a6d5f95b05a814c43d5dcba8863d5d83522d5f9df36584 SHA512 1c4156310670d3a19c5b1835857bb226735a8f8d24a55a37d9e9d71f46a3cb5aa28ee1ccb90bdc77b197ff928768151cdd77355bf083b5ce5554f317b49dc56f
 EBUILD vde-2.3.2_p20191011.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 EBUILD vde-9999.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
-MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
+MISC metadata.xml 985 BLAKE2B 93cbf3b5a644fc2c4ea5e40c8a367ba9763968fc6f769df2f1b7114d07734786570cae38d42195deb628007e3d49b1d5a5b4a943cf7575da10ae10eea59e4e28 SHA512 cdbc3fffa569b4a7f5daf04b3fbdb7dbb57df6dfa100398b61e6373efe61924daa523ba2b75cd21556414e592a91c2813aa396290abad91eb2afa01f7e178a01
diff --git a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
new file mode 100644
index 000000000000..5eeb3a5c9026
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
@@ -0,0 +1,49 @@
+From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 17 Mar 2021 15:14:45 -0700
+Subject: [PATCH] build: Only use -module for libraries.
+
+---
+ src/vde_l3/Makefile.am     | 9 +++++++--
+ src/vde_router/Makefile.am | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am
+index 748cb78..855081c 100644
+--- a/src/vde_l3/Makefile.am
++++ b/src/vde_l3/Makefile.am
+@@ -1,7 +1,6 @@
+-
+ moddir = $(pkglibdir)/vde_l3
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c  vde_buff.h
+ tbf_la_SOURCES = tbf.c  vde_buff.h
+ bfifo_la_SOURCES = bfifo.c  vde_buff.h
+ 
++vde_l3_lib_LDFLAGS = -module
++
++pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++
+ pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am
+index d872388..d055259 100644
+--- a/src/vde_router/Makefile.am
++++ b/src/vde_router/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ moddir = $(pkglibdir)/vde_router
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index f74a15637a8b..34884a027ada 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -5,7 +5,7 @@
     <email>NP-Hardass@gentoo.org</email>
     <name>NP-Hardass</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mlspamcb@noci.work</email>
     <name>Nico Baggus</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
new file mode 100644
index 000000000000..142f3837ed9b
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
+	KEYWORDS=""
+elif [[ ${PV} = *_p* ]]; then
+	inherit autotools
+	MY_PN="vde-2"
+	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
+	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+	MY_P="${PN}2-${PV}"
+	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+HOMEPAGE="https://virtualsquare.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+#IUSE="pcap selinux ssl libressl static-libs"
+# upstream switched to wolfssl
+IUSE="pcap selinux static-libs"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )"
+# upstream switched to wolfssl
+#	ssl? (
+#		!libressl? ( dev-libs/openssl:0= )
+#		libressl? ( dev-libs/libressl:0= )
+#	)"
+DEPEND="${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}
+	acct-group/qemu
+	selinux? ( sec-policy/selinux-vde )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-slibtool-support.patch"
+)
+
+# upstream switched to wolfssl
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
+		eautoreconf
+	fi
+# upstream switched to wolfssl
+#	has_version ">=dev-libs/openssl-1.1.0" && \
+#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
+}
+
+src_configure() {
+	filter-flags -O0 -Os
+# upstream switched to wolfssl
+#		$(use_enable ssl cryptcab) \
+	econf \
+		--disable-python \
+		--disable-cryptcab \
+		$(use_enable pcap) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# https://github.com/virtualsquare/vde-2/issues/6
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	newinitd "${FILESDIR}"/vde.init-r1 vde
+	newconfd "${FILESDIR}"/vde.conf-r1 vde
+}
+
+pkg_postinst() {
+	einfo "To start vde automatically add it to the default runlevel:"
+	einfo "# rc-update add vde default"
+	einfo "You need to setup tap0 in /etc/conf.d/net"
+	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+}
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 157fb024ad35..42d695c18f40 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,10 +1,7 @@
-AUX wput-0.6-gentoo.diff 519 BLAKE2B 0a157c48c2f9764dc91c64783ec0c00e4a73bafccda6dc52be7f0784cd08386991452429202088521527d56a7fd808eca11936f1caae2d5a2ea88f237f2d28f8 SHA512 74a6902283f405649eb358781b8f9373b02ad2825fe5a425233b3e7a3a270bdaa4ac8f8ac76c4ace03c760505aa9eaa089b98706bc669bb9a536dedd5f0c94d7
 AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
 AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
 AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
 AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
-DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
 DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
-EBUILD wput-0.6.1-r1.ebuild 789 BLAKE2B 2406e995700e541b7485b5f020a56bdbb58cedd9b928b1fb19405ac61efd63f5f3b5b190c91f405c90868d933f6d1b17c5c16c6eb39e3655785e2859fed51ef7 SHA512 91d85265dfac282b2c580e02b4a885312aca22eeb5059a204c7add9b658a061a53868937648dc4394bbbb4b9c403cdbb8f0c30568986ae5b2e42560d1aacfe03
 EBUILD wput-0.6.2.ebuild 839 BLAKE2B 117175f94dbde239cfaa0917a02194437e147f5b623204b124bd5e58b51b8dd02539aeb23e4b54bd38e9e3abf6157077bec49b8f477ec13ed7aa943966effcd2 SHA512 b230a872dd44ffc0da8af27fbbfacfe5a946bba1ae60c9acbeaec2f5d6a31233c08d6cf807114da3fe6cd12359615baa703b04f60e5eb389c5385193a02a9514
 MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
deleted file mode 100644
index 7ddf0ba3ba19..000000000000
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15,8 +15,12 @@
- 
- install: all
- 	cd po && $(MAKE) $(MAKEDEFS) $@
--	install -m0755 wput $(bindir)
--	install -m0644 doc/wput.1.gz $(mandir)
-+
-+	install -d $(DESTDIR)/$(bindir)
-+	install -m0755 wput $(DESTDIR)/$(bindir)
-+	install -d $(DESTDIR)/$(mandir)
-+	install -m0644 doc/wput.1.gz $(DESTDIR)/$(mandir)
-+	
- 	@echo "----------------"
- 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
- 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
deleted file mode 100644
index f45089a463ee..000000000000
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP"
-HOMEPAGE="http://wput.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6-gentoo.diff"
-	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
-	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
-)
-
-DOCS=( ChangeLog INSTALL TODO )
-
-src_configure() {
-	local myconf="--enable-g-switch=no"
-	use debug && myconf="--enable-memdbg=yes"
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		"${myconf}"
-}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index 54e69a64a636..2eb70bf3e28b 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.gh.tar.gz 29740 BLAKE2B bf0aadcd4c85351c9deb4908eaeef80536d4ee123b194deef6959ff85f05005666de71c71112cc9c0083a0c5f996cb173a957c52bacade3b23ef0908d341882d SHA512 293c0bc623400d3359a920eca491930daa110685936cfcaf9eea07e439fc29de64413f4df4a18523cd8fdfce44794c55d7e3abafb904e8e90891b22d38f01a2f
 EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 955 BLAKE2B 80889dcc1f3b093adbf72be1943842d9fddfdffeb4c123004b164bd836c78ff6c2f86841bffd76c024b710cf76b90f734fb3f0b7eac9411d10b4989223af94d7 SHA512 126380abdb294d624ae126f8b94efff33a34f462f09adf6c5d53aed53679441e791ff689e2d3f0d51bdfc1c43fe2cbce29ef792c90c63c8116ef38f4fee63f2a
-MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
+MISC metadata.xml 703 BLAKE2B 4e1fd1ec352aa0f3c5c401e01ae97f47c80addb070c30d6f2ae2dceec58dfcce84469c790ea502e8e8ea852e8c63ae4718149f21ce06705583ab88756c5de5be SHA512 051cb93e901f18fde594f768b7f81af5402dd28966c1efe4e6a4ed3e60504815e1a2c9c3cfc88332fdc841068d3944ce4d785e5415714e9760fa7e6cead79f5d
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 344661c689f9..b589f7248c5c 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 9f48fde64006..1c75b19f239d 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -2,4 +2,4 @@ DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e
 DIST you-get-0.4.1500.tar.gz 157365 BLAKE2B 4b55a6950c3134792807eedc6e7ba47cae68e909fd29b34d59c289761828814df07bebb8bfe12f7ff0a42e32d0e6cecd770c152ca79ad199ce19f464bdf66ed9 SHA512 133977bfc24b4bd1abd50fcc252d9d75fe166ebe1c02897d0b6720f479a6f9f6368c84d8e9beba2d0c1dedff7a632c67062ee61098f07e5f5ed27c827fbea73a
 EBUILD you-get-0.4.1432.ebuild 522 BLAKE2B bc0ebe9d6f4ee322866b53646416a619df32b821cd41ae079ebd1c2908d15e32b09b5d0fa53366aad84b3572805ef81371c773a4633969bb483bbc10a5b72080 SHA512 00e8bd8d8af3c4dc371e271d92c3260d1dbb7f6c4a5fd6e6767459f10b668b8a0b2a8914f15379bc0a98ebf656dceeaf0e0babd79afc488e11911d58a924aaec
 EBUILD you-get-0.4.1500.ebuild 513 BLAKE2B c6d455aacb337efc0856dc54aaf5ffb85889d7f2e50ce02ce7860566559eafcab2a4c57433822d006a957e6c075f9ca08918f1e1649abf1f79f4fba2ecfb800b SHA512 7aeab9d0eb92bd90ab3b6096d294fe27c43e43924edf350e6704eeea58b1590af236638df2c35a7ed4c24b264ff72602dfee069da822aff5c52335b24f4d5346
-MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
+MISC metadata.xml 330 BLAKE2B 8eb53ce51d204266891fc05de500db3eab2f9db0078f99ad42ea44c76922239ed93a211ebf489ad7b01c6ac8ce11e1b535d8bec14a8489caf0355d294dc49e4a SHA512 f00ef67900d38db89f07d57a78d697c61368e8c475025eec4a647b32ce5b9cab54ccce7bcb8fc7b6500c9a3d4cb8cb183b423021aa4332250ea16e9a6777652c
diff --git a/net-misc/you-get/metadata.xml b/net-misc/you-get/metadata.xml
index e537d4c521df..822511e9f314 100644
--- a/net-misc/you-get/metadata.xml
+++ b/net-misc/you-get/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5802417f87b9..01b62a0842d8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2021.02.22.tar.gz 3293733 BLAKE2B 83c3d53624a5e2dd1e901fbdbf90e95dc43c632c8bb263e25121c7a68beffe495e481c52d35b822a82a885eb4c4836c1567fd174ac57cedbc18bbb9768f43dc0 SHA512 eaecddf40759777c00abc1b456d8f55dd2ef242a8445970dd655a21dd148459c2c538a4b04fafddbdd295911a96e432a926c5f26e5a29c993fb3bc10f0ca1b9b
-DIST youtube-dl-2021.03.02.tar.gz 3302162 BLAKE2B c1ccc5822061f0d815ada19827cada576817acd1ec7d18410a021fc599b7ebd456a4d913475b7649eae8c75d757860d5bb1a76a51be740ba880746ff585700e4 SHA512 1318434c009a9eb41231bb7897b16fd72fde5d3165f6a24ff97031ed89b4d6408520242c71270f12b4f55dfa97ca48d42c6f167ad036eca74241e61cb950c298
 DIST youtube-dl-2021.03.03.tar.gz 3303114 BLAKE2B f63f2aedb6494b22156df08b5aaa2c4438614fd99a7e2d45baaa754c71a278a2c22051086f578f54b4cfa6384aaf5e08e61d42b8023a754805a65e6b6a79ea58 SHA512 0a554ee6805ceaa1c68eab83be3bd6046bc56a26658c705e231f907c2970cdeb441e0ae57d5013385810b5bbee7e4de3ac7f6df36c3eef76a6fa9c5424b921a2
-EBUILD youtube-dl-2021.02.22.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.03.02.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.03.03.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.03.14.tar.gz 3306486 BLAKE2B 6c5705319e405e4bb098c72b696d41ba655f6e38884012b00da0a5f66a68ac49e34b1906cf22c5444ba62aed4f74d93517b81471b9ddebdc1ee72b3ae190a3a9 SHA512 12f08eaa8a4ba3598ab9caa1c313982e62168a4e4afa3f613f7dee0efef3bcfee701ffd525f1dd1ba1da66aa71bcfd8bed91fa64a8c7473aca6b9e6a09282a70
+EBUILD youtube-dl-2021.03.03.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
+EBUILD youtube-dl-2021.03.14.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
deleted file mode 100644
index d787a3f3be53..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
index 9b024e43dbba..d787a3f3be53 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
index 9b024e43dbba..9b024e43dbba 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index ee7f584878df..4bfb4fa01fcb 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,13 +1,8 @@
 AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
-AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
-DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189
-DIST zerotier-1.6.2.tar.gz 16020599 BLAKE2B 91da6c85f8d3dfd993a9aea9cd2a8b33e560d5475413fde8bef0a69df7d89503a66b1967ac336bd2213f6ffc35e452f665d37ceb8d9ae53cf5e5d4d352775e74 SHA512 8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643
 DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0
-EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1
-EBUILD zerotier-1.6.2.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
 EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
-MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc
+MISC metadata.xml 482 BLAKE2B 20cfeda377f02fe4f2f86119bf088ad0b7e4d5384b482988ec440991b91e6cfd4192a7404c38d53740b545f1d084c9c248a9ada603cace307815bb6fd6de5469 SHA512 f3ab7f82955ef27184446a8e657e9b6f52d473ccc7f3dc74f7945d4840c77c75d1b1f12162ae9fc74bbec067baeccc75f79fab98638682bb107911afdfe069d9
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
deleted file mode 100644
index a6ca7f7ca382..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/make-linux.mk	2019-09-27 21:35:39.000000000 -0700
-+++ b/make-linux.mk	2019-09-27 21:36:01.000000000 -0700
-@@ -118,6 +118,7 @@
- # Determine system build architecture from compiler target
- CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
- ZT_ARCHITECTURE=999
-+ZT_DISABLE_NEON?=
- ifeq ($(CC_MACH),x86_64)
- 	ZT_ARCHITECTURE=2
- 	ZT_USE_X64_ASM_SALSA=1
-@@ -158,57 +159,57 @@
- ifeq ($(CC_MACH),arm)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armel)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armhf)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv6)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6zk)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6kz)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv7)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7a)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7hl)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),arm64)
- 	ZT_ARCHITECTURE=4
-@@ -268,10 +269,13 @@
- 		override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
--	else
--		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
--		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
-+	endif
-+	ifeq ($(ZT_DISABLE_NEON),1)
-+		override CFLAGS+=-mno-unaligned-access -marm -fexceptions
-+		override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-+	else
-+		ZT_USE_ARM32_NEON_ASM_CRYPTO=1
- 	endif
- endif
- 
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index e422a4abe39a..f7fa88e2deea 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/zerotier/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild
deleted file mode 100644
index 49c7f7ed5ff9..000000000000
--- a/net-misc/zerotier/zerotier-1.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch"
-	"${FILESDIR}/${P}-add-armv7a-support.patch"
-	"${FILESDIR}/${P}-fixup-neon-support.patch" )
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=9
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.6.2.ebuild b/net-misc/zerotier/zerotier-1.6.2.ebuild
deleted file mode 100644
index fdfc4d61007e..000000000000
--- a/net-misc/zerotier/zerotier-1.6.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch"
-)
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=11
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init-r1 "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 6d440b5bc9bf..53865949590c 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -86,4 +86,4 @@ 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 389-ds-base-1.4.4.13.ebuild 6699 BLAKE2B 07a1095db2b78dd22147adae56b3e8f2299a285f49185c2145d52ddde3f4bf447e05774d1be59bc1c752eede7e6d18a19ecc49292323036a6118e8c966de3861 SHA512 1c8dce486c1da723f92c291f6ca17b658ad3a1d697abc8e9991632acb34c7d41a9811b6154bbd8e8bb8dca1682233cfff288bc91f3f0fd5c21d3ccd1f7a53dd9
-MISC metadata.xml 1415 BLAKE2B c94715d5b9efe7b28ac56dfd00899e1ea7ffad317bd67eae5d4ed981beb2410aaacbdbe4f1a68d6356af88261b4341a273462db92538cc3673901e7ab401b898 SHA512 fe123de1c1936c3c8eeb1a32c4c4da3282e74905300858fe5a12d0a96068ee88fcb23b3d14f7ef737f9e7292dd43e31e0fd074974a7023b339c58904ad0c3ba8
+MISC metadata.xml 1459 BLAKE2B 6da8c449be55f7c70e560a5d5ec6fb1fbcf3823586ef3beaa4bd5c5b4d3cdd71f2383ffd08744b051419bbc8492faac5ef1b94e5a88d546bd36b3cc7e94d9292 SHA512 b9c6773813d4c4b221622457bc9cfc284232c7d572445c2cd9531476528863e354f3c4483f61d2d81564aabea60d1594f5b5cae6c279f0c51af1370f5c623b2d
diff --git a/net-nds/389-ds-base/metadata.xml b/net-nds/389-ds-base/metadata.xml
index 35a2c72e7077..2963a9951817 100644
--- a/net-nds/389-ds-base/metadata.xml
+++ b/net-nds/389-ds-base/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chris@christopherpritchard.co.uk</email>
 		<name>Chris Pritchard</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 65b080c6d9e4..65c3a6e56fde 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/metadata.xml b/net-nds/metadata.xml
index e5113d1ba1ac..4b2da444b63a 100644
--- a/net-nds/metadata.xml
+++ b/net-nds/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria net-nds zawiera oprogramowanie NDS (NetWare Directory Services).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 5475cd0db22c..7bd06d226b5e 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -22,6 +22,8 @@ AUX slapd.service 284 BLAKE2B 27e3863a8b0e854e5b6b1efce50da624acbfe0d2416af1eedf
 AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220a91e4d9bf99fab4af9c590834f9aaed57d80eadd2fdf75e49f55739ef6027d11f012f8da3a711707c27 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
 DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671ae2a94a0b700a84f9f715acd162e7b8dadfdd3ffd5b0a785f9306b5f5033ab956cf0ffd26b66119a7110d0aa57 SHA512 b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5
+DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133769321dd242433bed5ec4b1f66cf7353f08a49d5f3465880f6bcfc9afc9c7d2a28e075b66f5fd926b02213541 SHA512 2fa2aa36117692eca44e55559f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.57.ebuild 29298 BLAKE2B 99af40a491e5253a14ff1d35c11d570bdc6428120e634f0124d4010655c0347d34aa406e62a446daab966d9cd29817a527184004db0867582111100df3d72093 SHA512 a3b5f76634d9ff2e2514dc7cb6d4dbdd797dbfeaf67a9f4e791e38d50688e2b0fb8c9ed8524c2fd6ed2b3af3c874d7d82433275328b1be1302fe809926343b2a
+EBUILD openldap-2.4.58.ebuild 29306 BLAKE2B eea99d3cf4be97a981a40a07ef6fcdaaf7213e14eef742bbb637951372b4b00819fafc6e469f20dad58f8de7e317ab5712c2e88cf6aa2573527f8167629b3600 SHA512 00db5b4d37fad1d7b3085bcbff9e3ec64769d056fa1a2246999c0c1617fbc8b61ad5cd2a8ab173a85dd89c556207b7f6317f95e13c46b3e5002b897f7aef2cdd
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild
new file mode 100644
index 000000000000..f2095a16dd2a
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.58.ebuild
@@ -0,0 +1,912 @@
+# 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 multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.OpenLDAP.org/"
+
+# upstream mirrors are mostly not working, using canonical URI
+SRC_URI="
+	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
+	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
+	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
+	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt samba tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
+IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( berkdb )
+	?? ( test minimal )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_PKGS=''
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
+
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-libs/e2fsprogs-libs
+		>=dev-db/lmdb-0.9.18:=
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+		berkdb? (
+			<sys-libs/db-6.0:=
+			|| ( ${BDB_PKGS} )
+			)
+		smbkrb5passwd? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+			)
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+# for tracking versions
+
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
+	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# unbundle lmdb
+	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
+
+	# bug #622464
+	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
+
+	# fix some compiler warnings
+	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# find which one would be used
+			for bdb_slot in ${BDB_SLOTS} ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "${NEWVER}" ]] && break
+			done
+		fi
+		local fail=0
+		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		-i include/ldap_defaults.h || die
+
+	default
+	rm -r libraries/liblmdb || die
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+	popd &>/dev/null || die
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed \
+		-e 's|/bin/sh|/bin/bash|g' \
+		-i tests/scripts/* || die "sed failed"
+
+	# Required for autoconf-2.70 #765043
+	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	# Bug 408001
+	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU exists only in the configure, nowhere in the codebase, bug #510858
+	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
+			einfo "Using ${DBINCLUDE} for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			--disable-slp
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	# Some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	CONFIG_SHELL="/bin/sh" \
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+	popd &>/dev/null || die
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake CC="${CC}" CXX="${CXX}"
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+			popd &>/dev/null || die
+		fi
+
+		if use pbkdf2; then
+			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
+			einfo "Compiling contrib-module: pw-pbkdf2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o pbkdf2.lo \
+				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
+			einfo "Linking contrib-module: pw-pbkdf2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-pbkdf2.la \
+				pbkdf2.lo || die "linking pw-pbkdf2 failed"
+			popd &>/dev/null || die
+		fi
+
+		if use sha2 ; then
+			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
+			einfo "Compiling contrib-module: pw-sha2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o sha2.lo \
+				-c sha2.c || die "compiling pw-sha2 failed"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o slapd-sha2.lo \
+				-c slapd-sha2.c || die "compiling pw-sha2 failed"
+			einfo "Linking contrib-module: pw-sha2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-sha2.la \
+				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
+			popd &>/dev/null || die
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		popd &>/dev/null || die
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+		eend
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
+		einfo "Install systemd service"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+		systemd_dounit "${T}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		# If built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README  allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/net-nds/shelldap/Manifest b/net-nds/shelldap/Manifest
index 46da91a5a2fb..8392bb4952de 100644
--- a/net-nds/shelldap/Manifest
+++ b/net-nds/shelldap/Manifest
@@ -1,3 +1,3 @@
 DIST shelldap-1.5.1.tar.gz 22817 BLAKE2B 8ec41edf8c7d024f5eaed286284445cc9d41fbdf93ae34229d32392dd6f4862b8b3e66b5735679a9019d505753994f3d1d8f0d6cefec9b55708ef982d757b009 SHA512 64e5f58aa2d930ff869abb0c88ba36a5aac1272f118af8d17a0db847d6ce4bdd9fe3b8fb6b2e9d08f89bec57a102adf170f2c9f6b98b5f3fe5c30ac3636a060a
 EBUILD shelldap-1.5.1.ebuild 1001 BLAKE2B bff4f6a0801141c33c6e706e864c20935bf39dfffbd39e0469335f92a46e6dba8f721ce6e4621c0165d4b44d89769c753be4dc52ada4677a077f5ae63d6ecffd SHA512 568811d84261abbf026eeb3270d3e3161ff32ef0c0f269e333ff6dfcbda80959e38c27a1667ce0af149d8dd839f33ba701d31ef095ec1bcb5783d8abf36cf7c2
-MISC metadata.xml 828 BLAKE2B 1a19ce633cdc13f4493957ba9c8c1d529d006705fb5262be0cb6ccdc10a4d4153bf9308a134ab295692ae1c69232299ce9d5c699e3720b7aea2f6f0a13922605 SHA512 915173a8a80fefe89a381ada08a7710a92c8a82296c18d0251ef9181a7147a79fdf5e749ae4197f07acf1af5951e946ac1230dd2190f415cf41992d69d2532f6
+MISC metadata.xml 858 BLAKE2B 84805f4e0648b39f02f836241ba4292aa0b20763e1cbf835c3109f11aa562cf2beb9922cf04bb03ac03e4e08f10ffe121334b1844f4683c5629e89eaca82a041 SHA512 9c2067a5e37081c1b54ed9c921c7bdbdc6ae12006deca6009bd9d40c5f556509ad82bae28794bf188bcd65e85160ac09bff8042625a481ae0e6f3a14d4bdaeaa
diff --git a/net-nds/shelldap/metadata.xml b/net-nds/shelldap/metadata.xml
index 2fd10bdaad30..09297f5a9c6f 100644
--- a/net-nds/shelldap/metadata.xml
+++ b/net-nds/shelldap/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat Hackimov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 419d9f2484fd..69b50300b421 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 183b2a2a13da..c42c913994a7 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -2,4 +2,4 @@ DIST liferea-1.12.7.tar.bz2 1495627 BLAKE2B 36e95d270e3c3f68499073c7f2b1b6c987b6
 DIST liferea-1.12.9.tar.bz2 1496593 BLAKE2B a0887a7b04c47a69166396f06305342232b16eefba04df1a0cda7c9d84880e025d73786a55aaa528a143fccef213fa2de9474fb6fab3f301e54a12dba4a705f1 SHA512 09156e0e5e4342741b6290be17ee94a3204d431c687c17688e23067d151d36a178193f5cf01da222974810a48626c877b0cf917fbdd9ecb6e81254e85750be9b
 EBUILD liferea-1.12.7-r1.ebuild 1469 BLAKE2B d8e4aa48c557493f512e78670d741c09d75b5ab40b98e8f663261a523557f03c5cf990bf4753972a894741c958039577bafc4ba84c5f33b469985f613fe017c8 SHA512 563fc67195bf2c82629c2d9584f5fc66b700ba58f379f108ae2f7ca86f5576f939eaacbc1325dc1e4d1fd95bb26c19318b2ae53021777d9f524615141ffb4012
 EBUILD liferea-1.12.9.ebuild 1750 BLAKE2B e63d7c130dba4d0bb26158b12bfc6cda351bfadd9cb3d76dd23fd7cae630e43fff7beb2459524e6680eb9ad77db90d2edd9ebe237c6be978119042884505f99f SHA512 04ba03d4c2507e3ca07cc7854d0bafee010b04d35521ee1c252e4a45ef8e0bd34c1d11f32b0d1fd07ae57cff1f078d7bdb28c4d01101b730e6927f8596a3dfdc
-MISC metadata.xml 598 BLAKE2B e6c962c4f6324f1e260256a64970926a9de2e0e24ba6fb53673c40d2aea969a6a779a77a00752a948d41e2923ab844c894b82880921f95a46bce94ba2d84e02c SHA512 d8d877c107353ca9a7a28fdc00a5df495dcd49ac80f111190362ee1e5f7e8bfe1eb2b5f0db298cb71c91d2a567dda5e83cb06178dc44f92704b30be0044a6512
+MISC metadata.xml 628 BLAKE2B 8f5d0ddd188dac08e9aaa3e0abd1048e34bb61b69790d4c208d24e3c0a42a0bd95d8cb7df262a2c46f0ef8163cc80454a0272130121041415f100e0ceddd0957 SHA512 fba5da15cb6ae5be3b0fb6b8b806a0a4c425849033eda7fc67627fafb6940d98253c918eb70a6632f1db1ba3c8bcd56ed394ca399d1f948a6890d072fbf15fa9
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index 1e49cdec763d..81252b0ebb49 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ykonotopov@gnome.org</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-news/metadata.xml b/net-news/metadata.xml
index 5dc94aab1152..04a5ac6b8790 100644
--- a/net-news/metadata.xml
+++ b/net-news/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria net-news zawiera programy do czytania wiadomości.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index a321c1b7e5ad..a40ee8cd74cb 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -163,4 +163,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 EBUILD newsboat-2.20.1.ebuild 3150 BLAKE2B 7b8cf2e13e5506b6ce6e6705c18eb1d2762fb3737184099d723ed1a851331f1538d72f3923831626c5dfa5ef1af3b14889c4b86081c79bc911dff3dc5c304a20 SHA512 9ba409d3019bc581cf4f841468a56a2a42346e691939725773d6ae52fa62e2404851e0d08ef9b461059a683772376145afa670e9d20b42ea4b6e2a22a026c66a
 EBUILD newsboat-2.21.ebuild 2771 BLAKE2B 1a806c6808aa8656c6682e67aedb6ab0b433e90b0ecdbfc2cdf7af146b6ebd97696f05e32026f0ef9c7476b78745680dc1cc973d99a93e8f795cfdc41034e70b SHA512 d039f33e9c915a08a3224dd38856499cd034ee25f428d7d16a6a30a6f9fb230a53730b15b1a5599af410c8f5f6804ae4bcddd6e820b15331d6be0d129f6ec2e8
-MISC metadata.xml 216 BLAKE2B 6a9d054ae44666e41d1fa4f4876a8ef7bb95e7023a56b7a7f108cc2cc5b131e94d2080a5777dbbeef466a38db321c530af83dcec5eff25aa5bd8137dc949b6b7 SHA512 237dec64aa7d798b0b71f56a1c93a701fd424b0374d549a1f51272fd22905341157bdd7bcde6f77a7afeb83afede7e6eb2bbd0a2e3a70a9670933bd1d8732196
+MISC metadata.xml 215 BLAKE2B 936d37ef66986b32cf36792a6e24253e879e02aacddfc3c3fbba0ff7951e761a2db63a0c344c512315b3845f6e9a9116effa985de44cfcaf22f7bf432533a5fb SHA512 13b907fe919da35e8fe030dcfcfcb4feb35b802e9c4a8721aa36454648f8f8c15e80ffaecd795c9ca8b4a6bd4a0650b6c548fed935b601569c1ac243eb0724f1
diff --git a/net-news/newsboat/metadata.xml b/net-news/newsboat/metadata.xml
index e6c6d10feb76..29739de2c871 100644
--- a/net-news/newsboat/metadata.xml
+++ b/net-news/newsboat/metadata.xml
@@ -5,4 +5,3 @@
 		<email>cedk@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index edbcc9d473b7..f01b8c0a3872 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,6 +1,3 @@
-AUX rssguard-3.5.9-qt-5.14.patch 328 BLAKE2B 9a4672518bf6f686573fcfab9c242427a32aaae21faf6de4502eebd88672c1f57bba176f06518ffbd6bcc2138782d30d8f43df23e059ce8bcbd7054d5e0825a6 SHA512 2bbba197e115b302f1f92f805e6494797ef9a2ade4c4a91ca1ec573a3db9b4f412a8caa29ce716f65241f86544bdb70d4708fd2abe33f2621b368fae5792d183
-DIST rssguard-3.5.9.tar.gz 5775322 BLAKE2B f7d91e87b2a55d780bc1eae4f7e55b8059c049d21998f4c2554a84ca1d7b283e3145a556eef77e784d88ae2ad9f016d7b486a12141dceeada69dd1240205de23 SHA512 3a7223767185bf37bef316291b88d60bb2906fdbd0b045aa07c2ca4be19aadaeaa0b8c923f22aaa3483c7db783386744ad1411ad1ab214a8a71ef260948707b9
 DIST rssguard-3.8.3.tar.gz 9865909 BLAKE2B 7afc9dd0cec9ff58164c341f8cb3c6f31608da958a9c64f8099d9ba645cf7bbdaaa76accb3877943eefeb71b9172a13fa43c0ced7d58c6f368cc164e40a5ab39 SHA512 d7c1d18981177880d93bfaf4a87769638804058609f68b8c42db376c4a0e56230b57a29f70054deb30e02634cfa64355ecfe658b5f961a516b990af91c6f3ba8
-EBUILD rssguard-3.5.9-r1.ebuild 1132 BLAKE2B 2b4f9fa38242a61e37d67e60a6978cf5b3f7bc87787d3bcc496311bc04665f2b86fc15dc27cf46f0cd19fd68d42b93ee38046fd2292f430b8f513d1c21e0f0de SHA512 bdc038b4cde3604d4182642240a0196ae56a224fdf28185ee222e74b1ccfa69346096211ab70155fa02ec187c45116640831e75beb6ebca3129a33d2f8d941cd
 EBUILD rssguard-3.8.3.ebuild 1454 BLAKE2B f4ff9629f5f571646a8751006fa5ad23f185ebb176ab4a994e9192e4522afde4c43fa68b8ff0e93000686a46491e02d47d3e2171d70eb4843837878be6f50022 SHA512 b1c608f196735913a5913064fa4a7789c1afa2dbf14deb6e7bfa54817ce0aac655c4f3d21c1c22b363723f98b2dda0506ebc64f9be40a2973180097ac51272c6
 MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch b/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch
deleted file mode 100644
index c1d9a8ccb5fe..000000000000
--- a/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gui/messagepreviewer.cpp	2019-06-04 13:16:48.000000000 +0200
-+++ b/src/gui/messagepreviewer.cpp	2020-01-05 17:26:13.405430006 +0100
-@@ -9,6 +9,7 @@
- #include "network-web/webfactory.h"
- #include "services/abstract/serviceroot.h"
- 
-+#include <QKeyEvent>
- #include <QScrollBar>
- #include <QToolBar>
- #include <QToolTip>
diff --git a/net-news/rssguard/rssguard-3.5.9-r1.ebuild b/net-news/rssguard/rssguard-3.5.9-r1.ebuild
deleted file mode 100644
index b78de6b3565d..000000000000
--- a/net-news/rssguard/rssguard-3.5.9-r1.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 flag-o-matic xdg-utils qmake-utils
-
-DESCRIPTION="Tiny RSS and Atom feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug webengine"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
-
-src_configure() {
-	# CONFIG+=ltcg is needed because of https://github.com/martinrotter/rssguard/issues/156
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		$(is-flagq -flto* && echo "CONFIG+=ltcg") \
-		USE_WEBENGINE=$(usex webengine true false) \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index f4e8ebd8f64f..605f964d42be 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 1075 BLAKE2B 20e1b36c01f003646a23da4da1466e24752a49f1e1870163a5f3dfc4fe5cc9d2e743a099a4d059f61921a2d3489fe534ca856e12987b3b01d1dc269f72f7bd2c SHA512 d72d52287a245862240cc4bdafbb96b4cdd57c9364bec739921e19af0ab64b959a32b421b1dabbc8dff1f5c3f2ecd323974aa722aaf5a2f3cc61f0d3d70af6f3
-MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
+MISC metadata.xml 393 BLAKE2B 4e6384d199282453f5abaeb4b3fc89a44a3eae88d7084e6619c2ca3abb7162b476adfb9dfa938c20a24c84f879962455922082a9ee4765791531afd4b8366781 SHA512 610ff6d76acaee2a052ebe59b637f1baa26293b675683f4322d5364b0bb0a41294e654fa848eac866cf0e25788c72cb5d32fc1aba3bcfc5eb2275b4892a504fa
diff --git a/net-news/snownews/metadata.xml b/net-news/snownews/metadata.xml
index e8523f5eab18..efcefa58be0f 100644
--- a/net-news/snownews/metadata.xml
+++ b/net-news/snownews/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@culot.org</email>
 		<name>Frederic Culot</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 048e09331d07..3804f970cca8 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/metadata.xml b/net-nntp/metadata.xml
index fb6c7192915b..a1a15d7626c5 100644
--- a/net-nntp/metadata.xml
+++ b/net-nntp/metadata.xml
@@ -36,4 +36,3 @@
 		Transfer Protocol).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index ba8a2cd7e50e..e930cf3471e3 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -6,4 +6,4 @@ DIST SABnzbd-3.1.1-src.tar.gz 2735624 BLAKE2B 411963a49468cb0654be2f586790baaf1f
 DIST SABnzbd-3.2.0-src.tar.gz 2774559 BLAKE2B 82e662355f79a9be54b482ac29d1fb7fe7232355df6784ce3c908d6ee3bfe3cf22db1144034319542df5274ddbb1ef563cf67c5a848062a3f6880a45b308d522 SHA512 98797695950ca35098b8b4103216fd9fcb3fa33112cf2e3918033c26ef094a1affd2a2f389aadcc3ef1666cff1b6de91a99a45032b51711870254568ff9f723a
 EBUILD sabnzbd-3.1.1.ebuild 3128 BLAKE2B a4730858c14abc8c364e6260d586e50c08db5cdf4b0f7ee1a7acad788cf7912299eaf45677375664500e7eff5e810aa13fe234a27a0d29e44998dfbb02b27ff5 SHA512 68487e6b61cf13e639ae424604582ac3c621046634247f7cacec99f7151c5d1f5e38dad0954c29f05c0cf678247094c2abcb60f16b519412a0a55cc96255a9fa
 EBUILD sabnzbd-3.2.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
-MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
+MISC metadata.xml 537 BLAKE2B 7e120368e0f02298c0b0760d0574156d970807b43e78b7faa85d84a69fa5c9d97f12929865c9446f8de5a2f50b3a034e57925f9420b48ee85cf48a949ec78328 SHA512 9006b64233c7bc73f34f3aaa70d9de7c7eda5375017ac892169d100d2b0f931695f723644235203b04fe4cd6da5dc74ca247c62f217307a4224b81bc005cb753
diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml
index 677378fa8b4c..74ca63463bb9 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-nntp/slrn/Manifest b/net-nntp/slrn/Manifest
index 6e239ea7a02d..46580d0b4296 100644
--- a/net-nntp/slrn/Manifest
+++ b/net-nntp/slrn/Manifest
@@ -1,4 +1,4 @@
 AUX slrn-1.0.2-make.patch 1044 BLAKE2B 4c2100b402e57383ccca4dd26a25bdea05ae065f978c1a96ea53881b859e5fd7a28a1d6c54ef59fcc21238c456a19ad953f8c1e78d2d7c573779e4d78291f3a6 SHA512 14859999f7739121027a7ddd6b0f157534a3e64a5c63b2354c4962c0391b9fbc5b4f80bc4260909561b534d79abcb3bdcca6f737eb52029f9c48cb0aae5f6473
 DIST slrn-1.0.3a.tar.bz2 997138 BLAKE2B a349783edae24e0269ab1b8ddc328e578340e40e72285bbf070237b3724f475450f08bbc655d3b212684b8fffc495129008bde71a481fb3d2f4326bf396e5981 SHA512 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
 EBUILD slrn-1.0.3.ebuild 888 BLAKE2B c5ec19c114aa6067a8891c8985882edfd5e607f12d49ee407e9f9dde26509c57755165d5f7bb69c4a3a0208265eda81a3fa7be153dc510375d96f032fb008e82 SHA512 4ef798fa757df7bf5567a5d44a14d796d16de912044d4671f8579c80fff418e25b3774a180e20845d9e6282ba8e2cea8d3b1dac0db7f9f569f4838ae7042da48
-MISC metadata.xml 659 BLAKE2B cec81f9a34085c1394887cd2456aead6d9791d515f8ba56264ec37dee3c382a869ee59cd5d191820917999135cb9eb2b571531ef8e992c49bed37ce2ff64eb59 SHA512 96c12fba55179bf63aa81e54517cca962f7724c95d89ebc4048c0fab89a14acf3c3c541fa489593570b9a3afb1f88f85302278650c2224b9aea1f2e749c0cafa
+MISC metadata.xml 689 BLAKE2B c4d3973c8f45237e1c85138fd3ba20b3e55dbc69d93ed6347c345a80fea281072fc221e179227f820806a1ee66037a5289e9d4abba02449721d018d3056ceeab SHA512 1888873d11646ac7c7359e0a4d569565007cfe3d91429d15d1d91c7af74e9a266f2f025342f9d199ce18de93546cb97da37958efec20791fc530c2b4124b9ff1
diff --git a/net-nntp/slrn/metadata.xml b/net-nntp/slrn/metadata.xml
index ab82f5bb5086..d0a498c9ed86 100644
--- a/net-nntp/slrn/metadata.xml
+++ b/net-nntp/slrn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-nntp/suck/Manifest b/net-nntp/suck/Manifest
index b459b9adf37a..fb31c9047f85 100644
--- a/net-nntp/suck/Manifest
+++ b/net-nntp/suck/Manifest
@@ -3,4 +3,4 @@ DIST suck-4.3.3.tar.gz 153624 BLAKE2B 434bdb21ba37deefcba4c0fa9ec3cdf14bc49e1295
 DIST suck-4.3.4.tar.gz 153774 BLAKE2B dc7943af43a305386872995a27b6e2faf34949813960314cbf85c4f2ad1658107480cdf77241394aa031270afc3faab5fbd30ec19559fb3d4d261fd8fa5e3416 SHA512 79892cfce1b569bbd5fb6468a919d77bce82a533c1b70369ab88a2066dc3d4396480b9a56b25e960d6e49cd0f9abad605d841693f086c9d07913798d7ac99730
 EBUILD suck-4.3.3-r1.ebuild 1329 BLAKE2B 6f34ff3cf4f838877b981b6afa99a87e9b393ddc1cde51ac5dd17fabd1e68b316fe64b5346b67a8aacf4c14eb2a3b17372cbde77b163e3afb0f379b4c5ab51f1 SHA512 afe4b0bf7cc4102623565af5a1a02d448a0c59519d48e4333ff6a702dfdffb5a837ca4d8f313c56576896f2d5ac1887d0cdece05a8d014e8e461a735fdf9c6a7
 EBUILD suck-4.3.4.ebuild 1373 BLAKE2B 4bd4c45f5f4cd02528340c5aefb577572b74c29afa28233ded03f000e47981629989bf870a2d6c755f8f48ce095722107b69f0c91f901a58787677e1363ccf48 SHA512 9bc88b21a3d160a8d725c232afa16939fd2e728f13b8162a1722c178c7a6f974184913f7e2eda503b4af5f2a432408eba957536293fb5cadb09f27fe36836f15
-MISC metadata.xml 461 BLAKE2B d25f8104151dc1bcf2e9d87f3ff7a47882445c45023a74e4bb8e6efa7f80213dc6c83d34d2e3f55f48a7e2b1987cf30f279ab1e0cc1a65c8d87fcae09913fc35 SHA512 37e8ba488bada3160d9d18fe5cab73ffa2158027a9d31189449875c2c730121a2d3f81e2a513f441d6318d5da3107e49a13f5394e9f0aa4ab1cfbfdaba882e75
+MISC metadata.xml 491 BLAKE2B 61dc9f0743623abbac6a3378a4e502465fbe36083dcbeec1167b15e440bba019cbe32997126ebfb1005a74a1dfa5673aad69d736637803311f1933b84a8cf86c SHA512 c4219f9a5b6fac774c6fe64f95d5ee0cf7b8730d06d7c1ad79a1cc38dc8f053cd92d1e98d879a8b6cd458c4c99e18fe98d8f5a85c09975d15584e206c7d1ff11
diff --git a/net-nntp/suck/metadata.xml b/net-nntp/suck/metadata.xml
index b5647d42ed7b..9e10afbaf3cb 100644
--- a/net-nntp/suck/metadata.xml
+++ b/net-nntp/suck/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ae37bb9f4baf..7f47af841436 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index ddc215bb957e..44089ebe7745 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -18,4 +18,4 @@ DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7
 EBUILD amule-2.3.2-r5.ebuild 3606 BLAKE2B 5c66c13335cbb8602e11a72530be83a3efb32f12e10b79000d33161056b66ea82048966d5bfe278e73bc37dbef9622ac808a168e41655539e2b70cfc04298fd3 SHA512 acb3cc37cf8a2a537ce1ba999dec37c884af700c0005c0055e6d2fe1f5152318d1f6c02b44c31e91c8451ae616040271eedd2767ca34d3d6ba67cdc1cf7ac99c
 EBUILD amule-2.3.3.ebuild 3048 BLAKE2B 5d752b1e0d71be4b52725789a879b70c4bef199c68cbb8a47b46e6e92a7db061c674510efffc9a972c1df8c38c0b4b579b875feab70ee9616f74e6caafc99c30 SHA512 151e16a1eaa49c29feef0923ad1265ecc1b0446099836eba8b9626b82623ab5d54a213c1f7724de6ce2125a5501335f1af4a21055625f7523159214cd659ebe9
 EBUILD amule-9999.ebuild 2993 BLAKE2B 092bff5f6c925f5a4b76d5d1152cec75e450737200393a4103c6f6c618acf9369f7c8421eb80fb97a505261f17083a86edb6a0fb0b736728b9fadc4723f6a822 SHA512 f54c20bdfe58fab7e2f231f1ebbc4b1a6a55bbe3264b3d3409e9d6881a3bf94ad48b016458d5c7367ed7bc1c4d0fbc2f385b4a23f94c921adc78e90893d69b22
-MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
+MISC metadata.xml 666 BLAKE2B 78cd275a4696b47315f134366e3b3c323293ab3e6dea14f08f2915e49219c5e3f56baff9d7154ae7a63667cab3c8a8c3176aa04d48d8df0d3672bb7620b8f739 SHA512 a10de471269ee6610f1a111f0d22ba1f10741c2ca0d63ae8f340bcd3472f52d8b101db85b2907e422aa5ef4574fb2c545dd438285e700cf47c8fff16803ef80b
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index 836b2cdc312b..e0b3de4d0988 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/automatic/Manifest b/net-p2p/automatic/Manifest
index dcf006b0f3a5..db39dcace054 100644
--- a/net-p2p/automatic/Manifest
+++ b/net-p2p/automatic/Manifest
@@ -5,4 +5,4 @@ AUX automatic.service 303 BLAKE2B 90b2d3ed19c6347b31b90bca68f482d580f56b62212eea
 DIST automatic-0.8.3.tar.gz 102181 BLAKE2B cdba7706f16eb552d2da960ae03206acce45149d6e8d8f32654c05b6dc3293368afe3c44a7c0d254fd895c7f5fe30fe541139375793a143c4a3d605d27486824 SHA512 34061065d53ab362c9bfab9b66aebf7090b7079e5988b1984398410ab07ca2bdfdf3c65dd90bb076b6189120877784294484803d4ce5fa813d3bc13207aeebdd
 EBUILD automatic-0.8.3-r1.ebuild 1712 BLAKE2B b0468fb8ab99eec1a00d3b8f5605cc21350d5dfa18a5560bae79668b2fbc5ab6059fc2f408bd4a1c86c7e0b98b88db1445d8167dd99c2054dc13497d47587d60 SHA512 23b3bc1f2d035f8b16593f4ab730ac88a900c00985fa28fc8909c0aaae9d3ea2f6456239ad245abd9588070b9015e5407a16b02d40a0d664338881104e329caf
 EBUILD automatic-0.8.3.ebuild 1625 BLAKE2B 7b6d3dd41a9de064b13f17aca11dfa4c0e611547ab24cbc2aada82faa54cadc6b1df0845c8fb983282d39894f426a496322a7fcc7b87764c330735b1bf0aa44c SHA512 3b5f8123160274ec07c4e12d57ba6a182e4340ab4a2ce2bd39d05d7e93a5acad8aa3dbc5bad6a866a206eeb7724393845a28f9c02ea1635c7bfbaef33f343a94
-MISC metadata.xml 694 BLAKE2B a2c08510e302ad62a86e3be5d9b734ebb04f38b56f834dbe0b5091f290aae33f220351f9ecaa5f52767fc360c2b2e071cc4a2944cf3544dc2140d5c4cad6b3a1 SHA512 8496ccd57e988c774937451236eb8a492c4a4f359fe0ec01d758fddec231de06ac59586dc3605209d7ff7aa3c81c5c0924fbf83e3df9226fed06c9c5eb45f1e7
+MISC metadata.xml 724 BLAKE2B e0857678dafe9aee71474b61bfa686da4819ef7acdfc156387e4b75438b2fadd70039cafb30b395ef201ee2308987bd0762fa2a81c7cf5668c7f66f2510d8664 SHA512 e1a244c20a21e91d017b5c391eb8e065b496529bafd77daee94fdf3d4af3099b2f02186a7204453675dd81f66b0fe711fabdcbd20456d89a011a124fa4757004
diff --git a/net-p2p/automatic/metadata.xml b/net-p2p/automatic/metadata.xml
index 26484715c449..455f44dde75f 100644
--- a/net-p2p/automatic/metadata.xml
+++ b/net-p2p/automatic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 46c523f01cf0..310f2daff55c 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -4,4 +4,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-cli-0.20.1.ebuild 2403 BLAKE2B 414b07e98b2852ead13310e929b7f844c1b2bf499a36acc34a02dc406f5dfb2b4bcd80a0932463873ca6666fc8d6715147c1446ad94dc8e2748be899bd44bf27 SHA512 93c2e949cc565e7f273a3e4a9e607eea4ec46d0ad1cd2be442ac7e4009bf7bd80f047a15df5fc78e7a69d904523a218ffe32cc7b21429ae15e879aa70389c676
 EBUILD bitcoin-cli-0.21.0.ebuild 2405 BLAKE2B a3c2083abd385e13307e3bf1c2d0996aa925e4ec22e9999769074ba4de111fddc82a991a1bced5664a0292cfef9ec7a4a7824e338f8b97c2b75ca5e967431ea1 SHA512 5932bbb9c7023d2410e1a45df3aa623578923ab8acdab6b000d7f22d01a362d5019f1da89ad5a2135c4429bed9750c03a4630fb05ed5acb052977ee0224cf0ab
-MISC metadata.xml 763 BLAKE2B 3c5d0ae0cd584fab16d75fe32bc92173b70ce7721f8c3eb8346b79d4b8682a5ebee40e9fa37b182b5dd50d2dac4de7c4c3205bf9cf3a00128c621fb7fee34c25 SHA512 0bf4b0c264587054acab434ea97ccb7a80387b6d21deb836f2a87a5fbdeb7f0cda9f7423fc579401f2a89a6f4cb26be43b875e9d0e94a7b4289c5dbde63758a2
+MISC metadata.xml 793 BLAKE2B aa0cb0c3cdf32a055b50fb272a0167605654b5fb5890ed2828fcdbd12a2f72dd0f7f4ecc13cf3489ea41b22487d411f3bc859e62b7c55602ae5261071affff14 SHA512 3d67472ec46ca7c02b66f04cfb8ecb1dff5c53d4495f570c558fa955b9532f7e93fd582f34dda62dd4c02c9085ab060d2b187d7b0230624516f44e71958bca69
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index e851cfafdc4c..0e973dd9e3a2 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 6061821e3804..770ecd2ba03e 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -6,4 +6,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-qt-0.20.1.ebuild 4788 BLAKE2B f7f315f8031fad1e04bb23450469591c2116e0e62a6f90f375787c8b3161f51364984a38f2da70c67980c8dc2bc08ca134480f26b3b5b0694451ed433ffc7a96 SHA512 66327a318dcd8aa88c8f7cf3aa09c855ec6e05e220a99227b46f437488f6bd9bd7a10ef4083b8bad867b3abd4b2de9aeada2f36d7bf372d0eba0be1ea3864ca9
 EBUILD bitcoin-qt-0.21.0.ebuild 4887 BLAKE2B 043ba4fd18a465b7c45edb7b436748837253fdf5343694cdd826def43994015c6272f2d20b215edd775b27527e9a2b192d6659c8392c5a607a6665f266994002 SHA512 94cfc1bf98f4466241c777b0b64bcf77ab9a5de6f9823d486cf5de480eb691a24711704e9b12e90cbf4d0f36de683ba06b0f5a4a96c00d4d004b0f1cb66d6e6b
-MISC metadata.xml 1177 BLAKE2B fcdb57625457f08a99cd1b545f03de6f9b6e3170176beb2bf5be239adfee1f89a4bc64ba93cf960c15b279ebf2fb532580e259f4d17ea2bab54397e2d7df1697 SHA512 1c065072b453dfbd348971fccf51a17b51aa41a23fc3957a23eceee4157837d3ae5264eff155e1b47c298f77bef2bde74e1ba714b6a25a190537f3eb512346b8
+MISC metadata.xml 1207 BLAKE2B 4b09967571d0978b78be079750889dc5a3e027306c2e5ca2b4fbd25c590354a5b1071204812d20eeb62cfc04dedcd03bcc4cd7f46c1e645ae38278a8d78727ed SHA512 2e3979a06659bc59de68edfa73a1bb5423739416064636f7fc4fbba729b6becdbd49d64e8eb5786c57595460e907f1453a75588e193c2a5f1d3bb280d599ea94
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 02b0ae3f93c1..e7342e47192f 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index c25b21840e70..b573bd72f8f0 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -7,4 +7,4 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoind-0.20.1.ebuild 4699 BLAKE2B 6870bbf0e132af9518eb6a998f34fe27bc7c8f8dc1673ac0ea6dcc9d26694dd067cb498101c1b527ee93af0c7da433630b3b576acc8b29565f51d92844c47294 SHA512 c7649c163c182886ede9e889cda42df76263679bed1808eb99907454f5273f8eba1d4ef00336ee02e68512c5ecb4ae911ab7824213b1508c4e3015ef03346736
 EBUILD bitcoind-0.21.0.ebuild 4799 BLAKE2B d85488d74cd9489a83318c3e86c2a3a73cc2ae3f4ae02d5d577c2cc2f1d1ffaa1b4e4c29f8a10b240d3646496e18d507d4649393a77ce03ddcbaf5ec76c2baa7 SHA512 17ee8d563e1858033c50aa704877fdb95d7498fbe13c9a8765fe7926348a297a4efb930436a8b7b859ac1746651262a5347a1d4169d8ebef03be0c4f4d8e181e
-MISC metadata.xml 1095 BLAKE2B f24b951044919821766cf823ca52308e33ee444a8d2d6a37c4ccc70c71d98be12b1d0087778f68c26ead7ab568931063b1b79b41b82cda599070907fae6abcd1 SHA512 09013e6844bb827298d8cdaa17fb0f7366ebf74c4252d1c7402846852288ce248f98719e227e4977dd1227cbf929710b31b226a73b25e539c6089d33c419e8d1
+MISC metadata.xml 1125 BLAKE2B a185255eb193bacda5d63011733351656d73483b4ff35034c34bd5f4b24429c5f61e043c600210ca02eff8c88807dd146f98647d6d00f3dbd7ba1774c6558d1e SHA512 c02f0439d099d79990f6ee7097457895af512e2d8433b0d170bb87f6fbed8e0f1105f14936b5295d8a3c939f7697c340926a6953050b708e5d012c5d1ddf2072
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index c240dcafbdaa..a92bd5bbb3a8 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 80354cb56fd9..cd137e5414e1 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,4 @@
 DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a
 DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 EBUILD classified-ads-0.13.ebuild 1741 BLAKE2B 73de73f0830144c00b5efe1920462fb2d5df595fc5577082f7662cd51a2d5048d3a31ff28a3427c9f4debb0768d2d0a5af4dd3983f8c9bc1422693fdb923b2de SHA512 929176f3f4869382cdd0719d27be4f73c5d465a7795980346bfe6e30ca179a4f877fe0246b2d0e0fb5755b93ea5c90e74bbbc2b7a457afe52f0f9ce05be6c8ed
-MISC metadata.xml 1779 BLAKE2B 3d4309e69e73ff9b36329f1d9b486f9dc7b0c1077c953e4e08294760fc5b03c28709b373b94e68d742ed3f3e0b9da40cb2d6aa0295165f33c6f492d7ed0cee5d SHA512 1211585a2baa83604cbfb4e4c4fbd2d30d95359bd9d7246a831c238254c2b57433c974307ac8188f73175c5110e80ac89eaa137a67c0613e5550338d70864b78
+MISC metadata.xml 1809 BLAKE2B b16dc75993e2af93067ef25fc63e090e7224aee742f3bfeea3b73e5477de353abe11e3bf99ab36add37f7572f4888a41c1f4913a5bc06bf055247bd006aa01d1 SHA512 426030930420118dbbc3d12137d3a8415ffa83d9dcd44ef0ebac29cfa8167f6a415800ce358fb664fc3e22f4bc8c3afae33a60340a503c145e0eb189fb8aebb0
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml
index 845d74b8dd0d..44a8dba26f1c 100644
--- a/net-p2p/classified-ads/metadata.xml
+++ b/net-p2p/classified-ads/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>antti.jarvinen@katiska.org</email>
         <name>Antti Järvinen</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index b8b5977c3cfe..0d63e42fcd2b 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -12,10 +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-r4.ebuild 4547 BLAKE2B fe40c04c267d0724ce69718adaf5483a7e2c8dc84f3c6a8db10a405c8214e30a21ad46e7c4619a2b5b96d763439b70ef26345534408f26e0b10933448a7c5524 SHA512 76a332b933559faaca0bb6ecd567b799dd50d5c2ac3fb226530100966bc8089cec2db0d9b809115b18ebfe60fd3f364368e6f9d705ba27666d2c5ade6a9064ef
-EBUILD deluge-2.0.3-r5.ebuild 4496 BLAKE2B c0ea88af64b00d81cabf73f211a4555c2353498da3c824576752915390292a8202b8c1657f6b5c011821c2a0ea780dc845d1f661af903f2f7087cd50f0f45dd6 SHA512 9c569df4e8f0aa76110b1f1fa69ef4fea802109d9bb762e698f577fd51f432ade98ac416200fbe742c52728f9387a5b5b8e2f4a03b5dadd8ba6c9c617a125564
-EBUILD deluge-2.0.3-r6.ebuild 4534 BLAKE2B af79d7cf3f5603ef22da16d268a4d622590e8865a8bc7532a824b0cf22c64677db41d95121eabe29923a62dbc22a47699f0a1dc8fa7cc9780fd6390c328db745 SHA512 41cada3430be96344e97311eb0b11dbffbea558832c4a1af56fd6a89df259d2e14d9aeab8730d97aa55b1008dd42fdf40b28f162b520a48f0796fcbe096fb18b
-EBUILD deluge-2.0.3-r7.ebuild 4542 BLAKE2B 2c42f66245cad2837833887661af9d38d779293e26005e7192d8ae8e093dadaa5dd921f60eb20942f63ab9af236c98ae77e1615232a062f4572a46c3341b6380 SHA512 eba4a13b1c42488113c02f2f444be01cd9f63b274413b1f97608fe57670314e74ccfc8610d9237ca3f9aa29cb6874c4cdf2de5aae508616c03819dd052068274
 EBUILD deluge-2.0.3-r8.ebuild 4582 BLAKE2B fd4d1f84ac1ad0e0be4c5b50ca3ad36b866ee97d9393bcf9025fb08204823edca3c4c4f7be0ba66f178e56f943ee42a5916eca621dd12539fc5aba93d041f09f SHA512 7d3931d1cc3372148f6757635efb668f6a1aea4cfa4e10b848bc86deda7c88a6d39d31bebcb97bf1b9c36d118e49c95c2370325227ce5f28de9d9f31ea905722
 EBUILD deluge-9999.ebuild 4542 BLAKE2B 2c42f66245cad2837833887661af9d38d779293e26005e7192d8ae8e093dadaa5dd921f60eb20942f63ab9af236c98ae77e1615232a062f4572a46c3341b6380 SHA512 eba4a13b1c42488113c02f2f444be01cd9f63b274413b1f97608fe57670314e74ccfc8610d9237ca3f9aa29cb6874c4cdf2de5aae508616c03819dd052068274
-MISC metadata.xml 644 BLAKE2B 35e29b833c3334f3d21896e9ef4f03a7ed48cd11b67f4b947297f6e79a2190861de32b423a0c619dd6cf6b397155680dd979c1727e3f5145fb414ed27fc92b63 SHA512 b849d5cc61d63c5355156b736bb2687e45bc621e586c7aa62e5c0eca7bd72799ab3884a6441193642c9473cc43614ad19c375bbada9e62584c2317228f91e688
+MISC metadata.xml 674 BLAKE2B 95f9759f521dd343d3b89dc944b39ed0b9bb34aabe1f046e27609a9a458ae0b6215dc032dc791ca47a84e0d1d8a6850fa0a97cdb2e567a91b0d467843e2425a5 SHA512 2035e01ea705109af45be1c62e8afeb374b4c2ca91f7a6050b0ed3b08d048a8f38f8ead075fb4a46790710b025b721efa4c41ea11522456dd9fa7bfe4354ca02
diff --git a/net-p2p/deluge/deluge-2.0.3-r4.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
deleted file mode 100644
index 406971d68760..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_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}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
deleted file mode 100644
index 8e7046e42032..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r5.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"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_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}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.0.3-r6.ebuild b/net-p2p/deluge/deluge-2.0.3-r6.ebuild
deleted file mode 100644
index 7136c7628147..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_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}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.0.3-r7.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
deleted file mode 100644
index 66ea7d7b94fb..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r7.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_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}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${ED}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 66949e557f60..def7641279a6 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>candrews@gentoo.org</email>
 		<name>Craig Andrews</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 99ae2aed5dde..951bb7eab15c 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,4 +1,4 @@
 DIST eiskaltdcpp-2.4.2.tar.xz 4320140 BLAKE2B 8b58a297934398f106bd200d451b5caab7664bee9dbeb34761571fbc4db065aea0cb7e47cbbd95f11eaceef94a0393b1b92bc832607d3b3b68b8acc84a28441c SHA512 f9309188b209636f205295d1686b6aea5a5b59c160e724a10bf642f051f18f64113978144725371ee67db762f6f573cbc95ae934d232918344a9f250c8c044ea
-EBUILD eiskaltdcpp-2.4.2.ebuild 3738 BLAKE2B ea6511736a979fa0f680fe50fa3a0ea58aea9989305a60ea6ce831cd8365e5edee395c35ff1ccc0699243d1dac15a3b465f9854064a9ef88039b43a6f045ac47 SHA512 6cb3c12837c5ed7e8629e9facce415c109d1de8472900811b90408bb12afb6696de39beef2ae9c1ffb2f13510b4c1c8fe96544f7ff00a482cf33ca88415a872c
-EBUILD eiskaltdcpp-9999.ebuild 3689 BLAKE2B 9837ae9ae10dd54af0e59b7a636c22c60a49ee506427f0e57764c99fa5717a5eba693238e4291e9ebf45c5e37a5cd38ed18c92e490ae4352f3d5555e02923222 SHA512 8225fc6b86a417e7a2cf27c2cd0fa9934b487c6286d56697198b4b12d3e44e5aa96d33545d6b6060941dd5c96007f4cad689515ec7ad501d8b419c3c0dd7c0b0
-MISC metadata.xml 1208 BLAKE2B ec058a3fa5cf64a50eaa1903aa3abee2c1b47c485c17d8893182b80ff017b7c288183703c6ed49173947bfd2c40b3009ca64524d3994208405ec725fabe8078c SHA512 8bb5d7d2718fdc8c73092aa34c224a13413c8ce97f3fa6da56e8d2d307949833e3dee66c2d21fe2b14141bac8baffe0602be9330f6e96c27675ee33824ad00af
+EBUILD eiskaltdcpp-2.4.2.ebuild 3725 BLAKE2B 212ad5cdbd414eeeaeda0f8620e968476fe20ef4a3f5d84ba5ad586c56018223b02e3f5d24d92d161be57866c26dbf374c30f430e0e5a985d7820793b9aa837e SHA512 1cf9f6346225365f3b224f01ec3df7bcc26086b56a82ed0d36cea90f380ea182ba43cfd48d79dd0c77cd6060b6603014dd4f6df1f7fe18c929fd9b559fc8649a
+EBUILD eiskaltdcpp-9999.ebuild 3676 BLAKE2B 5da6cc475341fe433275d4dfa05717f29299fa24d2ccc9bedc07d08737e7d2673c63366a0920daedd573b1c391c6e30ab8a63f285e8b038ec1437d36bf58031e SHA512 35bacb0fa48bba92023ef04e8164b583a8b3193b27442f7fc8329310c64b633df76f4d96ed4ec84a37c02498c18702421667d9b83c1faa6e3eb074c2cf724009
+MISC metadata.xml 1238 BLAKE2B 6386c6dd1b0e559584966e27c31871d0aaaecbca31bc1ffde5c309f6d17a0855d106e7455e868716b5d01d0a76fbb9e856dc31cd8fa237aaade5b084596de043 SHA512 ce2a02bbaec3f47f91d812dfb25108220c678322e0f129764b0b7d158e51edf27562ab8598e9e93d4ad79eacb46669e9351d8dec95f50e63913d44fe72c756d9
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 9fc3dc202fe1..6a9de498c3ae 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index c160df0f27be..2c795225234b 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index e7dbc6c81e7c..352dd3300204 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>klondike@gentoo.org</email>
 		<name>Francisco Blas (klondike) Izquierdo Riera</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 6d90524a02d9..68f09cf06468 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -2,4 +2,4 @@ AUX fms 861 BLAKE2B f4ee5f508327c55bf2b5446d85ab51fe3f968c6592be0045a26f4a1a8f4d
 AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
 DIST fms-src-0.3.82.zip 4786920 BLAKE2B c18630b8b1b8871290f1d66c4638b99c110e0f49bef11517aa83760274707fd5d0b53c053ea3b38a0c35018de4a4b6f3dd426499228997bac377bb1f04f784fb SHA512 2a72cbc7e23eb16cc12bd373944d1da090030602a09d0c1cf2fd8688a7b1a98ff649f1d0aa8b525b65987394d81acbb9b7558fcb21cea90a7646067a16600673
 EBUILD fms-0.3.82.ebuild 2213 BLAKE2B 102668ead6c6bbe58a948a68833302bf733ce582e54ddf157bd8ab8878bb16d13e69575252ef32a5668113a32bb18ad9f0428cc1898982d4e5cad7a779661d21 SHA512 e496098afc689297dba7504f0d78f18cd6ef188b7c3a9b3bad998b676c60195e0e23201f8307649220754239b0dd1ae8988c915cf0bcb1b0e5a1ffa04ec1e619
-MISC metadata.xml 394 BLAKE2B a6924fe829c9abc8b3a04106d30b34af326d4596eb5bc9a96165db2ba1993a4157fdecfbeedc0f0a27b75c6327b501a67de3e46864ec4d7fe6211731fd2e121c SHA512 f4943a8b16ff6b031cf95eb5aaabe12fc18abc349f566fc7d4a4eab155ad917e9d49ebb5fcaafa0e36239d772d24391f1489ad71649ff33554f3a8fb6bdd69b7
+MISC metadata.xml 394 BLAKE2B 0d5eaf902ec54a167ff7fe8c977bfa85faa3549c7ebb885883dc2d5891f1cd54e178bbdb90e5e9dba215e50933e495b71945c11923d7762bf3addfcb9ffc51ca SHA512 6e4e6974d4526ac0bb4ad81f873b829e0d7b15ffceaf6d43752f56576c839f507261af75c7430c61710c8df6a4d659bdb152d01b9cc33caee580e823343dd639
diff --git a/net-p2p/fms/metadata.xml b/net-p2p/fms/metadata.xml
index 225e63002744..cb2bb00d3ac8 100644
--- a/net-p2p/fms/metadata.xml
+++ b/net-p2p/fms/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 	<use>
-		<flag name='frost'>Add support for frost boards</flag>
+		<flag name="frost">Add support for frost boards</flag>
 		<flag name="ssl">Add support for FCP connection over SSL</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-p2p/go-ethereum/Manifest b/net-p2p/go-ethereum/Manifest
index b8d26e24caa3..cd827dd029e3 100644
--- a/net-p2p/go-ethereum/Manifest
+++ b/net-p2p/go-ethereum/Manifest
@@ -57,7 +57,6 @@ DIST github.com%2Fallegro%2Fbigcache%2F@v%2Fv1.2.1-0.20190218064605-e24eb225f156
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
 DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod 1060 BLAKE2B 50eb8aa20b011a8dedf13e3a00defda30ee36bb4ed9405e648ea2cdd2a00cc379c8a1c41d3d5794300fb7624e59b2b5aee65d8b93555c736908ec1e7c2ac46c9 SHA512 8bcab95c89a92d8840a37ecedb7a000290e6db5a4354bf1339066d1fc02c16532be5eafd4ae3213df10eac236d08dfcf50a0a6b848f63c0557453a26dc36d3ea
 DIST github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20170210015632-ea17b1a17847.mod 42 BLAKE2B 573840dc40bae4a50b2891e9c6876a0f09ccaf6e676f8c7b0d820708b01b59eb6940ba2516db2e507f535246f35d98bf0e902b3f440d0a00ce701171f7c60a66 SHA512 301530d5fdd867d20f6696927dbeb04e567ae9086a1f94c09b11685d60abf167e3b907925f1cd8a8bd7141dec6f81aafe0446634b5ffb06258ba466befc35cb9
-DIST github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20170210015632-ea17b1a17847.zip 111677 BLAKE2B 7c59f092fcd22bcf8be830d5faa6d78d776600201d7c881d4dd9b92c0ee0757671f7934c5a1b9a330f720d68d5810ccd80509b3a7e5cd2800f6b4be7685f1c14 SHA512 a591cd59993d5efedaf4bca81c3b6617f66aba0874e89991580784c1162de72ce0d8c366deed9b21365acd8a8ee56587b8e331df02c20c2d142a3467c4868dd0
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
@@ -70,7 +69,6 @@ DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.
 DIST github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod 32 BLAKE2B 25b2fb5f8529b2f05f214278d44b7bb0470cf5c1b5ab7ab72461fef66ac68f911c4c092b073bf0b0f1688d596847eea2782b4d303d71ab3c2801c1a7b024dfe5 SHA512 f26adb57197a4c172e0e34fc6a4a897e54e2855a5bf67dc43667ddfb57d31e243d4a971044c456dc0d1c54351426d7582688705791c3844938dc76e0d1afc5aa
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20171128150713-2e60448ffcc6.mod 32 BLAKE2B 33790903925e5cb52910cc8fede885a7aa600b69cd07113b1716c3a4f81c341d5f98d11bdb90008b1242cf9d02f3394bc8ca385564cd3cdd78aed78dec39ec88 SHA512 f0c2b601a29f21e426b432dd0dd3d0f954fb14f80abd4efac9e558bd59dd9fb6703beee2eeb81755aeab2032571b6e35f210e499a28a5bc1d564d2a8174eb9d9
-DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20171128150713-2e60448ffcc6.zip 3043481 BLAKE2B 35a09aaef91a96dc2e77fa64bbb35e484cddf60a54f702920c96f65c7646d0c94960dc1cc84d07fa317083bf1bcfd9656a208d235f9e03c4a530116ef990f958 SHA512 8f70be62ae2041bd14b7f18bfacd587e7a09e1405c82113021bdbfe7f02d6d98eaa7d1468ef8650726d6196df8e93156bfbba8e90d488a07d66b7ce7b052906b
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod 913 BLAKE2B 34c74ca4a6b36d48d11cd24559e58f5f2d389db9c8946811bf60b4e36ca7ed0e1ec32da129b16b6d2e904200212761c0e0cc997886a96c195778c9f3305acad0 SHA512 eeca58cd15d73e4074d3139430632556301392118e1c1f468cd6c86331993ffeaed407503d0b687a455a4052dfd46a2049bd839437276133e009c4477b778b3c
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip 3090472 BLAKE2B fa8bdba203e01448825880f0a4fe00e0cf5271b4e831c9f1631d04b88813689d2d154dd773efcec0b1f76381b114855a55df57338b0ddb29d68e81ac98074292 SHA512 c669c1e28867c8039eec5c99ce0ae99f18f0951cab0f140b00ec39354313de3e8a5148111334eee6d5e58ed4a207fa9663841c13454b89abbb7546506076c223
 DIST github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod 34 BLAKE2B c775b370ca97e395887e54ab02aefe9e14a50db63424bb16ef5879042a1cefe65147ce346999678bcebfe7148db5ed9f9eb136b4e13ce3420c475059118dbecc SHA512 9a9bfcfd623331e8b3e4b49de79bc3ab07d9c84aa5fb96a226a16acb479b9aaab06ef9f7a5a0b1af5da407d17dbe3c99760f76e22e113aa73f9fb4bcec3806e2
@@ -120,30 +118,24 @@ DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod 34 BLAKE2B 900b7c39f85b3c3
 DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip 691188 BLAKE2B a59e078427dcfedf06e31b212306e6c1bf0ba16248a86b5b3bfabe913acab2ef35b6d3f9f6b165cd773cffc9f030f1aa930e1a3dea7e066820949703962614bb SHA512 009731d05f05cfa69b710df82c894a2f31a53bd90aa3554b34bffc9f304548e5ed5c1142338e8917fd526e0fc54d1b5cb010eba8508a689efa0d852bdfe484c4
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180625184442-8e610b2b55bf.zip 3539891 BLAKE2B 67aeedd3f3783fa84eba3af08c410cdf525ac47c3f1a8447777f75da6e19dd251c0f459c976254c80d725e84fca6d683995c3fc4c227af991b42522d1b62316b SHA512 d15f9fad74f2193cc1690ae348796aa8caeb66640725458e156a282ea2bde06cbd7700144db38f99a0c90e048afadd1f66c6cc6d1169c4d6048cc0b8e0637bba
-DIST github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200219165308-d1232e640a87.mod 30 BLAKE2B 3545f21836d1468bfb6ecb927991050d1540f06347b50ef3aa280fd36a6fa0f50d1842de58d1a14ca1f3f7d48edd98ba9874ff781a55bbf26290f48d9934f55b SHA512 ebf292512698c75b51236c83c72f2db19055dbe24184745f1329cd31fcd97db50b652833a9521d92a944a058c2677da0ed89a8be59a4c47930b7d5197bb5ecf5
-DIST github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200219165308-d1232e640a87.zip 214075 BLAKE2B dbc4f3a742094149a890f5f1a8b4ff24a36428865ee6842727783bbcf32b97dbe53a7a387f69a64c197828e65015d728863b1c855cda95e5c17b8082ceea8086 SHA512 3cea8a951f96fdcf37cf5681bec36f1b3ea74405699047d5f7813690ff2f9be23f0ed0eaf259c9e901411d274f8a264892ef3632e42b04259544b67f6fa6c16a
 DIST github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200721192441-a695b0cdd498.mod 30 BLAKE2B 3545f21836d1468bfb6ecb927991050d1540f06347b50ef3aa280fd36a6fa0f50d1842de58d1a14ca1f3f7d48edd98ba9874ff781a55bbf26290f48d9934f55b SHA512 ebf292512698c75b51236c83c72f2db19055dbe24184745f1329cd31fcd97db50b652833a9521d92a944a058c2677da0ed89a8be59a4c47930b7d5197bb5ecf5
 DIST github.com%2Fdop251%2Fgoja%2F@v%2Fv0.0.0-20200721192441-a695b0cdd498.zip 217468 BLAKE2B 2d5dbb53a4ee4546d394601ad7e616336bbdb720aff4a6cc0e3d8d13f389722de933c541086d877e62d8c1cec96a998aa73ea0f8e3932cd04b6ceffeb1b44936 SHA512 f0953ee509f2c89a759275411aee605bbc016f9a2df8a9a3d673888ab347078015514febc81e1dcc051160b60c1e6d6438428970e1d8cd5953e5e58d4236f88a
 DIST github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20200318091601-be3528f3a813.mod 34 BLAKE2B 84889de93bcfcbd7499bee164942f2a39a61677c802c0833b087cc6435f5258fe26cf564ecaf1d721ba7e43fc67f4ae036d08e26fe78cba9a1ddb997b9620447 SHA512 1fc2cd1f03e9eaec2b8bbf42bc9fdab4326754838f813d62df5f43f1bd94f8ea2bbb6176f80bba8494a65d917b75e1274c7cf0bdd543ad2dfdd4b65374eb3e0a
 DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv0.0.0-20160512033002-935e0e8a636c.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
-DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv0.0.0-20160512033002-935e0e8a636c.zip 8392 BLAKE2B dc030eea8c3dd3fbd279f8bbedc0f953ef5c1e7ef546dcd3968411bd3696b694f19afc767f81014dbb811119a2a2f19035c1dd8dd803ae9541de6264e543e3b1 SHA512 900e2bf2883d294810120b31abdd3e1b5e1e3d6147bcf220cd02752c41c94bc33f82c8d7f431c2181ac4b9207aac5ab5cc5d716d9657a3ddb275161d6d939c07
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip 7269 BLAKE2B 470c1c97f98491797c00b10598113e1a86948ea9490eca41925c3c814083ead15e97e98affa53838523487b1c91857074d2f3df4bb3b0405a2e2680096c6080f SHA512 be798def35cc584c8510a0acbeb6e243e911d3429d8042804e8ebaccdc6c6a46043087e8abe4d894cf8f03347e666d877455d138941c300d4d4b4e20473b78fa
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fethereum%2Fgo-ethereum%2F@v%2Fv1.9.25.mod 3826 BLAKE2B 4315153a285c4b7c89524355b8228013fdc76dfc3b408a77ba776fe2f068c1d2df5559066ebe5c5a0709eeda9f05cdc21b885ee0819f75eb3c20577a7b72ab2a SHA512 453c96a76fd02caf60540cc28e92880fbd4ad97cb7aaaef3667e3eedf3406ecedae05bd6b5c8c4ac41561cca1f4b69c6d83cd21b1f9c52373aa5485d1666463f
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.3.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.3.0.zip 10235 BLAKE2B 9c74fb680bc3c0fcf7eed31b1d2b66173da74c38550fc37d1a346b8248c1cd60b3016b03d66cbe7fc2fb617faa019a9c0821007818bf269d82c161be6f3bec62 SHA512 46d310c42bc31333f4479d304abfde840180fbf4793165c7497bdaac97c13847444e4a5d4ee66be026f35fe21c408b8d00551875a583107857e120c59a00df24
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
 DIST github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20180418122429-ca190fb6ffbc.mod 30 BLAKE2B a3d8dc953f7846239efc93b745ebd9a22ab15ea35e660a3efd1c46173befda497f094c53a5d15c89c1a817d60e1930d9dcba9448157896ff3de1cb489a671f00 SHA512 32a52fca443138681e4419f1784b59bbfe54c43cc6f40134912d4e0c289d6e9209c064ea6893aee1895ad240a2dab03e0b778b0c334577386e97fb178def5c52
-DIST github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20180418122429-ca190fb6ffbc.zip 14904 BLAKE2B 9539d753acf5845bd1d7059e16ee42bbc93715dd8fc3df82d22170c9f9c08774507743d3ef6ee20230e72bb3d0765bc426d196bff6181b2e423d690446f30071 SHA512 f430ab4ea906df9a5287c548184c126f92563ce7aaa22a07fbeaff188fd29a5a99d1d6d812f14c5be1686e7db90c3a65c756fa82c9c602bb35011a3338a2a7a4
 DIST github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20190710130421-bcb5799ab5e5.mod 30 BLAKE2B a3d8dc953f7846239efc93b745ebd9a22ab15ea35e660a3efd1c46173befda497f094c53a5d15c89c1a817d60e1930d9dcba9448157896ff3de1cb489a671f00 SHA512 32a52fca443138681e4419f1784b59bbfe54c43cc6f40134912d4e0c289d6e9209c064ea6893aee1895ad240a2dab03e0b778b0c334577386e97fb178def5c52
 DIST github.com%2Ffjl%2Fmemsize%2F@v%2Fv0.0.0-20190710130421-bcb5799ab5e5.zip 16071 BLAKE2B 8748b8092ef5ab7b87aa271b12ecac5b36c108adb5531a9f687c364def13c2e0e8320495368b7e80fab3b59ec22929da5e3138cbdcebf535878b213bccb18fe9 SHA512 6038ed7e1fcabeeb82afe93232a58e7dcdad6f747cbe93819e2d29832335b6b4f6a2692bc2bdd509b25ac6d94e8148b2b90cadd836848c99d159de1cad3c8b68
 DIST github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod 30 BLAKE2B 725b27caadd05c18fc518e46ce4f1a213cd6ed7b4da3edb02cd74b7c7d3dc37891692f195144bbfc455bdc9bc77e683b41122bb3d646796555e92f565cc0133c SHA512 d64a7c87d6a40c48684a61ed0f6a7e75590df7d72d55242863f1bf18af9bb9ef51c40ecf0c41fbc039e06f1651898a238375afb12f41af5978195887a9a16c9c
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
-DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
 DIST github.com%2Fgballet%2Fgo-libpcsclite%2F@v%2Fv0.0.0-20190607065134-2772fd86a8ff.mod 41 BLAKE2B c042db1fdfe4fc9def8758ba98d821e1250f395526925cf2bbaaccdded3b63f6b30e579820757f3ac934250fc616ef3a02be2b5af589295eee7128d3b22fd770 SHA512 6ca43652ec5c80ba7dbf005e54d7778a71041ce5481d0ab46cb367e1dcbafdf45859b830abb7aba8037ddf13d320f5de49ff8e71d9bdb259e1ef04e3e831d849
@@ -156,7 +148,6 @@ DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip 423237 BLAKE2B 5214c96dcd8d592de4a7a10a497bf8c39c668c96de8a81b4d6ac1a51d43b05953526a4d2e83568da3761a8bff76b53cea5644e7b1d0d33fece5abaf93f11eae9 SHA512 4353387fced40671cde472058e1aa3dd8559208e035690d1f763de2d6c68437fc8d8637a49ce2e2cb292bb30de639046238a0fe4877d8712875aa505f11ebc1b
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
-DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.zip 15655 BLAKE2B 8f767ee28eb9863ba77de0398cf2643caac11fd9d786e9dd1cf98e0d43ac7b05445ee9fb144571c9c266148b158614d189e10089cf981ec1c3f4023ca0546609 SHA512 952f43dba909b2737888e92ec76430c78f051ded441c61b034ecb7226bc8f4cea2e0091441a47e9026f1df10eab1909a8941edc8edc5a097facf89af7a803ce1
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip 17559 BLAKE2B a527ab39ba8646129de4c22303bc8c1c58e9834b8ee898a55cfd6940c665134305290fe531e9c8f5c9a1d8d7171db671e479af5679c8abfc4b60c1200761d894 SHA512 a47e8dfb165764ae38985658525e16d7e0942248aae078d2bed543c355ab177e49743556503b59a27cdb33935954ba5d8f08d890b29e5d7fe5d606f2c5b57bdd
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
@@ -181,8 +172,6 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2-0.20190517061210-b285ee9cfc6c.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2-0.20190517061210-b285ee9cfc6c.zip 473848 BLAKE2B 4e5cfd50bb23ba488310ba9a9bd0273731adb5c802d755da9eb5aeb23500cdce5ff495214a81e6070d3675769604e070d502336747813a101819a0634631a90d SHA512 35fd37e05eff495098bbf52752b460e96e5f359394b85bbf04861e353c446f4ad190b2c8c4c799734b71924499dab33ab846a9c00152a1fe42129eee3176c932
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 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
@@ -194,7 +183,6 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
-DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3-0.20201103224600-674baa8c7fc3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3-0.20201103224600-674baa8c7fc3.zip 80646 BLAKE2B d37a72feeb16537161e5db55696508c68ce68d20432d18ce8ef6dc27b31d29bcf2c90a9948c40e6c43e2ed9b06a25677ddad0d40f6f891bbd4adb3974a935746 SHA512 6aaaa1756898a8e646f33620cab53aab4a571b3bd872201849c907d7e12641005fc698c71aeb3b44580246a044aa2eb300ad7ffe12d84fc27ab8b2a8869e94f4
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -203,7 +191,6 @@ DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod 37 BLAKE2B 9355e4909ed
 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.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.1-0.20200604201612-c04b05f3adfa.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
@@ -219,11 +206,9 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa2
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1-0.20190629185528-ae1634f6a989.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1-0.20190629185528-ae1634f6a989.zip 81362 BLAKE2B 803365b78fea61f504909bf0136846acac47e164e1aab6e65b96f8a6f59f5b234a07b6b2a2cacb5bac73a58d4a4fd1c22bef6149afd700a72e83ac2ba03cfabb SHA512 d7fede90246cbea3642cef1df16a21d83bcdb8f2cfe8018c2d43c91d4849223301e56da013113fc5087aa3a6e4606b083e899440d89f6f07ca2aeaf827223261
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20191115155744-f33e81362277.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
-DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20191115155744-f33e81362277.zip 195173 BLAKE2B a6369fa6eb772f29d46fc1c441e38c6df721bf9b6268c3ab19113bee6b3d1c084a892dd1a15bcb97de1a4ba83b80ab1d8917d0e08a5333561ca4667eb894bd1c SHA512 3a7c41da87304cbce073940c19890011998063228e2fea1fa0e9eb5e6694274caee6ff574aee2317b1bbf6efb9f8083314df416367024b8966df0c5639a7001e
 DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20201113091052-beb923fada29.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
 DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20201113091052-beb923fada29.zip 198028 BLAKE2B 462b4a1d23a31df13a79b43888691285ae80e82ede48c6230103047d1aaa152a2b797c95eaf6d537052197067b85e8d6d1644b80c0f53dfa149722dbe7dd4769 SHA512 acab79a4c44c285141759f9431427836d14d18751e7543abdb2355322ac2cdb5d7a0add9f7f207da696c5d7ac746223d9b9042d0b143550c1fdb3bc8b9547452
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
@@ -245,7 +230,6 @@ DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.5-0.20210104140557-80c98217689d.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.5-0.20210104140557-80c98217689d.zip 22535 BLAKE2B 9e619696952fd275d10468c58a76bce6f11ae36d882ed5becec78cda832062d341e504b87117f783cbcceb9b730c7a69e7d9c4e5e763013e14dbf9e99a700cdd SHA512 a90fe596ea133f0cad42035f82cc055dce567f44d6c46527efd62c2750f9ce2efcb077cd7c8dfc6bae86f2c15bb3d09e7f1d913868bf6390f05742ba4748c57e
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
@@ -258,9 +242,7 @@ DIST github.com%2Fholiman%2Fbloomfilter%2Fv2%2F@v%2Fv2.0.3.zip 14345 BLAKE2B 600
 DIST github.com%2Fholiman%2Fuint256%2F@v%2Fv1.1.1.mod 43 BLAKE2B 3a27e274e256a10e2e1dfc5a67560ae3d2d888357fd07bc1a6b39ba0bc66ff57804b88e4a2a65795de931280ac8ebddb8353679ff68386a12dc72f749a6a6867 SHA512 2808b5e6b0cb3cfc52c6e199919d89b239adc2eecfc517689e5f6968ce30d87a39ffa9cdec91c9b373ceac97da7770e91172026ed8715982aef86eb3f4a60da4
 DIST github.com%2Fholiman%2Fuint256%2F@v%2Fv1.1.1.zip 34468 BLAKE2B f95afcf673e9459185c07a4d9e5465648cf7fb6e117d056588fb78b897e6786206b800cc707bc60389fe3b7a14bda7b4a6b213e671e38c9b52a235bb294e3586 SHA512 591265473ae4c7aba3acefd37e325d1c248b1b2b71c1b550f5b78c098196063d2401c2149394c4d1ec35157093a9f86ae2e71089acb039a1d8927354051f22be
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
-DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod 193 BLAKE2B f2487263b38f57fd7665951860e05a081f1456b3c3c2a8234b8056f972896551c254a90fe5a427f3f3582f5ffe1b607c82c879113b21201322ab23ca0eb36dab SHA512 fb2883f42f2e1213b77af90b96dd97cc7b8aa303c08c2326fd126cb5c5bc40d000cface357006440b152a1bc40c751d14c2f49208294e80ab870689ea02ae7a9
-DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip 72318 BLAKE2B 74b3d91b06d4b220896199646f0bc9cc90990ae913ecf4f0a63e6cd3af53f76fb88c294ab84328f08e83c023cca672337aeb0bda5467ebfb40b4aabf93f1b232 SHA512 5833e9edcc647ee035f733230a388dcdfaa7e2d9d64be882ad2783fba3f1a4a08187675de5d2b4c097ad822054a412f0651fcb867dc126b1c41333e0c6877656
 DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.1-0.20200620063722-49508fba0031.mod 256 BLAKE2B 101d4302ae2bce202302c23fbafdbf4643eb9204cf4ca4ab3161761c5262de5254f56d0b15561308aee8a432fe8906cc0af32f11d99f94968e233ee0e80b9ae9 SHA512 9bf821c1580dff82ab4ab89b3ce94076d04680c95fd0ca82c184f057f43d4ffa53d2b2078308d36ea2fa483c0ad120a1783f62e632de3508c57be537a58546f7
 DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.1-0.20200620063722-49508fba0031.zip 77307 BLAKE2B 78d6f24818748aac4935b81a0f568cbb95ce47118e422d4c8d936dc195ce662f4f5e3b9b3bde23fa7371d3002b2a48b5b06d0b2c5514771d59dc39b67d2b9feb SHA512 7c86d18326c7596e527cb0a61727cbb2e489c00d8381d5356f4d1c849e1290358ef885c84b7cbb683b5b2ced40d9ed234d25906f0ecaa04d5735441edf91b89b
 DIST github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod 30 BLAKE2B a65905095d4e228a2e51c6626234e058d8dd1477fb99917c8eeac3b1eee371e8dba4231c30bc70463794afd5419ff5762361c8ddb59b3d69cb7a197d1424976e SHA512 2ca1e0cb3cbfb97598f12cca770d13fd161c4c78714c0cb5fe4fd329f3ae41788373420776608682fee1ce883c403769ff1dbb9478e9978a7a09c4483008684b
@@ -268,7 +250,6 @@ DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.1.mod 2172 BLAKE2B d6e003af4680c7a44e6ab883051a17d17adf0a6a47e734203c4e577c8a3b0164d138e5267c99a73ea5825ea36b413a129681dee3a6957c0c304eaa0edf5b9051 SHA512 c64e72f8cf7b727c805c155b9a2725a3eda7d1533a9beb1c95223f1806a41d175c27673cac46005dd6484f9f76737e6b78e0c9b919271cb17330ada932d81a76
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.2.3-0.20180221223340-01288bdb0883.mod 38 BLAKE2B 30b16c532180970779ac956aaa49124862f9c55e1493a6ecab8d03c5a719ac0ee4e747ffa56570c761ba660beb63ecf0a1a8eda0c4ce246ca2ac6949060038b9 SHA512 9840bb7405945d53cf1ad5fd29828c0546a57fca81fd0fb37fea26a92e977d1fc5f07987897476c5baecc7c030528f698bafb5b168c30dc59f3145b4c50c8479
-DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.2.3-0.20180221223340-01288bdb0883.zip 1544161 BLAKE2B acfee3915c7856014b9942fe785b376fc663c07890761ad9c1a35f0e59ba0acb6303b8b913cab1110177b7bcf029c9ee3248204cc107acc3dc2fe9719216cc2f SHA512 08a237f7afa308c02ded15c48e0f714de51e3e4d4fda7c8d077803991aa440dd2ec81bc5918d771b326e0b50ad3296843ee08ee1cb25203be10839a9e611d574
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.3.mod 2501 BLAKE2B fe5d21bacafd322b0cb8b2e4fbde2c82f4b5bc632080ef52c6bc88813844cf4193eb4be52f2a31061cd5180b3902baa24d6506f0108cb8fd9de9a689dbd6b422 SHA512 1d8f08e9678522dff4f47189b76010cac23f2906b021e7394b5b4ca771f5adbe040b14cb33b794e0229ab80d5070c06c5ac1b1356b0995e566572f058ce5971a
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.3.zip 12506459 BLAKE2B 8245178077cee0e2bb9d01b350a3bbb3ab231e175751de5e6a7c1b983d6c4767979afc283ee992e02d312224b085518c97d4fa7240526cad45fb2039ec2a04b5 SHA512 dd150cd9e1bc62afed351bf3126cd13b4a903dced3ade489f3ff9850be1ea5fbf95af2c7a3027956624f63a39fdd00dc044e9090a4c1376c44ead221b8796658
 DIST github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20200828144457-65d3ef77d385.mod 88 BLAKE2B 33663dfe72c785654946bb76bb663eb3335275d778be681c7c9a653321ba5ca446fb3580b073dc9519578c45eff3728784e2077dd7697ff8923efde17512594c SHA512 e38a910673c951623a2b5d0a2855843fee0b78ccbc547bf8943493f036ae8a1ffc76b42474de9a25755de688d060a8d1be648f0fe81d7a69c831a01b5956ab10
@@ -292,7 +273,6 @@ DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f8
 DIST github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod 40 BLAKE2B b72c62e0cbfca034aaa00d7c23e4ae2e2d1cec4c259f9d1ab96c65b7e3336e050087815a7c8d47c87f5c04983d77f7e10d8dcfa22c74aacde1bbaa8830880f90 SHA512 bab26ae4f895940fbb77346904916a7b8098f580ada97021dae11d9d6a4ab14168f57c3ebb25364bd35baf64955f115b9e431c4f68ddfaa96bb478fe9b59a5d8
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.1-0.20170430222011-975b5c4c7c21.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
-DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.1-0.20170430222011-975b5c4c7c21.zip 27064 BLAKE2B b609b2c2dc2332277e1e21f3e7750446d66cd4da1bf80a58cdda474a62fada04c24567abb24a38ddf6aeada73c8c9677cf1dfa9893dd09b1ae39ae4c200ba919 SHA512 a2e0374fbadfc103fe1d27d60c921e583310ca9dc25c6f3b48f29837928548dec5340eb33b8fd526b9632174600d94cbfb7ccf787e5ee6e7c902c495bb79ccba
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip 27708 BLAKE2B 9eb8dcb372c62b421c7fc99730e388309bd1cfa623becfa8fc674ba212ffa3a177ef7191c4933141c3d2a191c9c683647d38ff01a3075c01ac89ac1019de6030 SHA512 61701d7f06488873031e92a31095560fa32f80948ecf169391a64b32c1162fd59d2efc2cd6a62ba0d60a392eaa8676156d088e15da4dcc441a07e65320c1cb0c
 DIST github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod 35 BLAKE2B c1b6f3da9b37c5e0888f6ae304f7885901fb5f90bd94de7c980b7089d2477ea25f0fecf30b502f55fdb6a8dd7ba49683f33b89d761de0acd0e9ccbeff53a183b SHA512 824e0e8c8fe3985feb5f25c43725d4ff70f577373406b08767795e691f0bb10594dcbba4149e000bcebaf231bca5f72649c0d078b86cd4df38d0805e1939d63c
@@ -367,11 +347,9 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod 254 BLAKE2B 30062eca1c156d706
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip 258725 BLAKE2B f40083a2965a442ea70d613f2fad5b4541cec4816b2ba6a28b92e6ac679d8e68a7f17a7c990b2db50583017668f355b1b242fd7019e26afc5160cd64dee96458 SHA512 42884272a9d723ca5d78c4fb5adfcba500eb4c6fc8fa22d11a2104fa36bbd4ce3c751b4a99f850c01efcacf3462fb855607bd26ece1f6182e1ddd68b29a734c4
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip 240603 BLAKE2B 7e8d8e71006ac015e66ccd29200ddd7a280029ef27516777a678bdd7f6b17e46d993e2f6e3e4e5b0d57e3ffa7e90622e199c3e60fbc49bf7338c64f009c0e57e SHA512 a7a5115d9cafa45cf44279dafc5e4e9a5922fea05e6e5cc3ca673130cc79fa711cb806d7c3994e81c37fe6c38c051c21939a5bfd83d7c9e6c7c5a6e25ee517c8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip 167538 BLAKE2B b6ab81d8dafa47bf212bd61697aadb4f969fe78b5c0022aafa855f864db4989e4a06ac2966e4cc27a6b595eca7f09c4a171a30f8c31787f9366e278e596fd3bb SHA512 028f09b7234ad1a7a2788c4d9741e140fd4ecfeb6a9650b941577c5605512336848c86a17b011ca2bb48ebd5d34e6164ef568da4e3ca92227d39cd489025d430
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 150535 BLAKE2B b9a2b9e5653d4e67b05242ea629d586206224c916e1a2a0e575d42645216e0b7d00da1288d75fadbd50cf49a65f5fcdb2ec98132710c1bb3b925356ac92a0ad0 SHA512 389a8ead0603ab417d1c471d773ab0ddb1668a7b952f990e7fcf26f9bdadf7937b8408a2976f74da10568a2726ab2ea15cd14ee4319f99c5c45b9ec4a1e5ee6e
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.3-0.20180606204148-bd9c31933947.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
@@ -380,7 +358,6 @@ DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip 44929 BLAKE2B c
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod 42 BLAKE2B f21a13c6a193574ad2c00817bd5ca777ed141f6128748e7536c9b209bfb88c3df66ad37948902bc905c1d75fecd43afd21877c379498dd52c95a83c63f7c17ee SHA512 33c99b140d2377785d09c2d510766936deb7d67fea5919d4d5d350d7021db27cb776b3587582e65d5c44d97b96280c4e24b13deb2210628953e6c08daaf07b2a
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20170112150404-1b00554d8222.mod 31 BLAKE2B 0a64e2a7ce87c9805064a3f5f88293c35baa03f682945fe626a9b2fcae2905152f80766d7686e7cec0e2186fe57f850875e1f893b58df1cd440faffd9c0b1b7e SHA512 25d317e15b065eb389c517d977a770fc0c8965f24992ab4e1b665679e8de30625cc53b382863c93f9448cb365c64e2a9adea4202c3b6c224e840e78d1403dbeb
-DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20170112150404-1b00554d8222.zip 20685 BLAKE2B 518e0c47d4f6471ea4845287d1a159d46af50696b0618c82dc2b6c2bfdb0c44dcb92d0f154b5804bfbfbf3d30d7733c56b56c9f877e7410dedf15f5bf9351dc9 SHA512 0e1d45abe3db092a7d8c8a0a8a5f243dbf61261f67acada6cfff6d0463324795861d366790bd23137e2de7d9d57469c7fd298bedcb2cbddc23ee5206ef8fb4ca
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod 31 BLAKE2B 7d0579fb1469d76d519c6c5257b978dc5d34f568b26a4a0e21112affe84cc42cc894a48123f4c6da1d2132d34e9088849e38403b260e772d4f690163e196d186 SHA512 157d394ce35054f717ec2f03c677592d0a56586171489111c3904c734ff0170d34559015a16f9172b84b389f1d2a7d40b2647a94657edd350dedbafae8bbac98
 DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv1.1.1-0.20190123174540-a2c9a5303de7.mod 77 BLAKE2B 3ba4da4242216a268c6dc85f152bdb515e393d97444e1cc7136f4486a9bd98a5f8b73d0231dd9068bc633722e1aacd5ba8da67c703b54b9c793db593d849e612 SHA512 7dc3f1d9364a5f45a17f8be0cef4bf98d0f6a36710f52cc0b94b50b8d1ed934ec27d4930cb5af96620bc592e33bfb3ef489f09c3589800ccae53a3bc095d2724
@@ -408,7 +385,6 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.6.2-0.20190402121629-4f204dcbc150.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
-DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.6.2-0.20190402121629-4f204dcbc150.zip 2441395 BLAKE2B 2f784e753bb8001ea0940b6a7cf1cca2e828e98d0a7005acddde88c29d229e5fed4428cf4d7eae11854da9264504c9023a8c5f6321238cc83812acc10bb2ef10 SHA512 d4931bf1341b1febd6747cf6c7b8b5f9349cd83ea9872c57ce6ee9257599f4d94bee8439a486ec1eee76e0c9d36ee28d8a7043a46f042cbc8dfc31145151f820
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip 2440454 BLAKE2B e230d0def98fede5217a4b305b203eea723f27562cc27cf39f3226063bb7db0d3ad5d8105757bad66502ab7d83958c77b82945c3c532c3ca883ed5199e5d713d SHA512 fc26a92f68dbc1c4e8cfd7bc5948a9a6b6e3fafc002d3c94c18e58cb70f12415054c7d0c94d5c0eef549f72e83e561e3535a9c86398c18e5e27a11b14c8bdf5a
 DIST github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod 35 BLAKE2B 236e030308da9f6665046299fb6076bc3bce65b5ffbc2820c463ff3af2c95f78581b8b0260930e85eec3e1f9b40c65d206a2fd947b4a5aa8b032ae608a5e8daf SHA512 ef6bdf93c07e5d0d7fb93b733a0a902adde1e2aa719673b9d3bcc1142cc4dfe001ec4455964a13000709e0c727f5f1655e36cf1eb114591ca30a32f9af707652
@@ -417,11 +393,9 @@ DIST github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.1.zip 88505 BLAKE2B 6e47d29e835
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frs%2Fcors%2F@v%2Fv0.0.0-20160617231935-a62a804a8a00.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
-DIST github.com%2Frs%2Fcors%2F@v%2Fv0.0.0-20160617231935-a62a804a8a00.zip 16019 BLAKE2B 278f088b8cbc74fe9200bd23695ac16e1891e95adb854ea8f1bf189434f286376cd8873488a009d0d64c43f74a6928563dfd9a3acd737b102421689d45e38754 SHA512 3d1f3390c3ae508b0d365c716d31f157fd66dad9b459fc9ce7ba64ecf92910ab568433c56d25851eee9d1cc63ef477e74559418e503affcfd5c05fa3e5e9085f
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip 19727 BLAKE2B 013a8f40bcdf2d1ca9cef088fd6cc2ffbdd9bd452d3514fbfe80f4cd5f7ef2e27f08ac9ccc575ac567649060137ee1d97af33fa5962cb79d53094439948f931e SHA512 533e6e55dbd95f9f79d794ac847b1db90c0b4515e9fd1d8d3d003a991ce8315012c3f8eb8a943f8772434b1e20b34562ef02630e472d31d8485e7c8125a47fb4
 DIST github.com%2Frs%2Fxhandler%2F@v%2Fv0.0.0-20160618193221-ed27b6fd6521.mod 30 BLAKE2B 8bdb90a965775bcb2ae1cd8b88ba04399ca8392ebd8b2d2327a6b2f56a7c1f0c345bb8c0d6360e8bc25e6c5ceed7f448bc48e5a74546f22527fdc0ebbcaf2b4f SHA512 9e8b2454cd4272bce3924e281d429a57c3eb5759d3735d8264b51b6da7fe294fc70fb7ef9f03a25d33600c3c24f04276678dbed342777c724048a7a2ed618e79
-DIST github.com%2Frs%2Fxhandler%2F@v%2Fv0.0.0-20160618193221-ed27b6fd6521.zip 11331 BLAKE2B 91cfdab4fdcc25cd886c6af8bc299f2dfc8dfcb3ef4595df6b51425569837baa6cc84d64301a2ce0ba0f078d55702456c4ce7a6dea139f04856960f8451e2d40 SHA512 130598b86a67813c326a8714ed2bad71289c904c6b4de27ec634a7a60dbb010f0ab1ec0a12764274ba94576e7dfd44351df5df152dbd950e729143c808e356f5
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
@@ -430,8 +404,6 @@ DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.2.0.mod 37 BLAKE2B faf1c2419c01
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.zip 228947 BLAKE2B 2d2ceb62706f94858798a7c73063618457d0ca3b042bf1703ca30e521f24b6b13d8eea70207927a61f30804ac14b6037fc8c63d4a23a365aed8f2759f9740ade SHA512 2decdf2ef4e21e028a07a98324aaae8f2ae8b87d8d82ed43dafc2f15127896b3e8ab1101ac6b59ad11bcd88e67b7ef7ef53086b295cbcc0a4af51d3e9e09e527
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5-0.20200531151128-663af789c085+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5-0.20200531151128-663af789c085+incompatible.zip 239507 BLAKE2B fc1d9a8edd08a31580213587da63c0527035906dc5f1e041d10030ae750e93f1bb931b5aa32ddbc04c36c43a03c43c5817315ee72070ebec5323cd6eef0e24ab SHA512 86836a99a7a61407ffe3ee4e1941e4e7c34695eacce50608e27ecf82a8c28cec3a418ff7ae6426a2b103b0ec83fdbdd347fccb6e0ce1873321730593e816da19
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
@@ -449,21 +421,16 @@ DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b5195
 DIST github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.mod 39 BLAKE2B f8e78259b8c2506fe2a2701856184baf4576d3e2a6bc54d3dcc67e12bd3622868227f8de3e5cf6a4e8764ffc1d184a890f845f149f8db51aec9b9a1f057dcb69 SHA512 67300e14da5341f3adc8e00c811bcafb0b76d1da711bba89938af32d7a713c7ec779c442826db90c22a171489ba3158540cd2e6677e431a1d825ace714f49241
 DIST github.com%2Fstatus-im%2Fkeycard-go%2F@v%2Fv0.0.0-20190316090335-8537d3370df4.zip 54925 BLAKE2B 84fbeef0c316e4dcf6238a3e6f7a0c0f3671fb9857081c95f3467e0e4ad52c66ed848e36e8ff7b34794e90dd2d1c965389579eccaf00429b07d147cb47ca3315 SHA512 5a02502c95cb14e682149197c8c85c1701511847b7bd2b40ba221441f8c2f3ed2a688081c0b323ecfafded4fdd63915c3554fdfb74bf5a71075b9739b7c3b093
 DIST github.com%2Fsteakknife%2Fbloomfilter%2F@v%2Fv0.0.0-20180922174646-6819c0d2a570.mod 41 BLAKE2B af8c71ca5980e6e7e3930f506b11f48a10be856a99de0326531c559937a09377d2ec8c1cc4e1d62fe4764219bef8999744e7ca4ffb8e74cb6d1ad074ae3fc9e4 SHA512 10c02104db97aec771af9dcbda6cea57a8919059bdbc4d27a7420d67141dff26bf065fc0b13399837b8fc8020c6b64ccbb903078a701bdca987d3df85e682c27
-DIST github.com%2Fsteakknife%2Fbloomfilter%2F@v%2Fv0.0.0-20180922174646-6819c0d2a570.zip 18492 BLAKE2B d2b5a8d13da4bc3245a89541088155328d57a690ca5fed4351eb7f6a3bb2388f8269515d25acf676a00219ee9913c61c61344bf0b9a29903edb548196172f68e SHA512 14903c7d36166510f339c82f1f1178e0dd00eed8edac8f695a9fe4e54e47b035509db7cc7906923d61f5d17c4b02e84ebe6423ee2d37dccc45946c2ae0d41ecf
 DIST github.com%2Fsteakknife%2Fhamming%2F@v%2Fv0.0.0-20180906055917-c99c65617cd3.mod 37 BLAKE2B dd4bb0b243926bae6f5ceb072d1f39f48b2c25aed38e66fe5150c5d61c3c1eb0fedba5aba64fcd25d245d4cf5f5c881e09454dd1b2fc5e4218582f4a03bcf48b SHA512 c24591fb85bfb43d419aa90dfa5c557c34455eeb887276fac301709b60748a88dfc78bd8c727b2602b66a0353d29b69044d4fec6cdc87a877bf57edf925f28c2
-DIST github.com%2Fsteakknife%2Fhamming%2F@v%2Fv0.0.0-20180906055917-c99c65617cd3.zip 18082 BLAKE2B 6a3ee59abeb91f1a1bb4574f8a04a41fa88993b6fc1a0bbf95536776c26dea5b7f28bbb832ea652b3cf317f94a72ab15ad75f581d6b636579b599cf45e8d3449 SHA512 58cd3190dbb01162d00e2b7f47fe3e8edfb9b4b62c261a98a50755ee0b0febc2146161570ac9a735c8c6117cbe35094b604e703173b93563fdd12507e2b8a0e1
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
 DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
-DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.mod 143 BLAKE2B 06a468627e04ed323137e36c3dd079e49bf032963e787204e0b68e6c63a5383e3ab78396bddbc0d6b0df4eb800197834eb451345f780acc07778a52b3fb6f3bb SHA512 33c4afb52922ae58349f580468b9eabaf0131442948d42377a60ee78150ab75610d1cca76c2d57b98b65edf2e4521c8d74c8d00d18fcb361b00579986325f873
-DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.zip 207390 BLAKE2B 823b7fc76663066d99b5064ba0a0f2afc14c442e9a45522adb532affcd156433d6cb832c0978f3c92d842baf5eca3a20d30afb335b3c18e089698d8e323f49fd SHA512 41a84fa0c7f6b5ffca3996c28712d5464e5ec74c937b812b3748a4b705cca95195d0e7c18f69d305282d35a3f043440560ad03d0c66b2e23a4b431d6fd500c33
 DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815110645-5c35d600f0ca.mod 391 BLAKE2B 94aca1aee200696b6ce6e6f5822ab7a4782caf4fb7667960bb310f2287ad01be0852f35b3d6181560422aff5368096eeac09e3101b7bee674458e91c97ee22d4 SHA512 d583e9eee3c61d44140f5a4f72d49292ca0f5ea059ffbf57a669133d0115d0c512918b1daea3213775bd7493aee674a4a81fa1092cf11b296a515b21e90bfa65
 DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815110645-5c35d600f0ca.zip 210486 BLAKE2B 5f962f05cf491b6c106779c5c251469d5594305fa41a24ccbb31f760ae5faeff978f679eac8708b1d5a9215a25e937fd0dd970a8a42ff67851b012fb8a807db7 SHA512 ad67010eb32c264e2d91ed02e50f54593e85772e2521bc69f8003e99b7dcb895937f0922ef02eb72288b22501650afb732d78f1ff271d114db97ec7618f63354
 DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced
@@ -473,12 +440,9 @@ DIST github.com%2Ftyler-smith%2Fgo-bip39%2F@v%2Fv1.0.1-0.20181017060643-dbb3b84b
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
 DIST github.com%2Fwsddn%2Fgo-ecdh%2F@v%2Fv0.0.0-20161211032359-48726bab9208.mod 32 BLAKE2B 8399d4dd62f8576d9fe4e56a68a695587628fcd01a6f211cc35df92ecdc0416b930f09065c2334cce03d72977d1d9c5c1e25ca0143250f2187f6acbd658835cb SHA512 3a9ff4ec365d8d82771244f08c36ce91bf8a1d653855f6a756cbb84e668d1dcb2fa14e36d97933886e142583caa87afdd7059a97c81ee4edbaeed5c8b2eb02d6
-DIST github.com%2Fwsddn%2Fgo-ecdh%2F@v%2Fv0.0.0-20161211032359-48726bab9208.zip 5491 BLAKE2B 7584999ff0a8c447731f6fbfd87f15f848787468ca020c69be2cb68c10826a03043c6d9626adac61550bfc3c70774cd5ad1525366673c78093192fd69f95164f SHA512 31652a9178419b8a8c52aadd6dd790e46c3f9061b55f1e1aea0c26aa5948305355b619b619f9c5e2919b63abd2e5455f79dc4842d34bb1b16de21ba784a759c7
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod 33 BLAKE2B 1fb8495d86422bc87ae3a29d7040d3deb46560e8986404fe66da26fa2f7eea5f38b1ab84a67b8e79c544841627025e882fee2aea3fadd75f69f1761238eac23b SHA512 3f30afa5211772645ee93a8b11eeec246fda17559bb23b1bbc93b614815998fcae1f45827f12922fd8d51bf84425e2154f690728a63b510d278d60a48549fb77
-DIST go-ethereum-1.10.0.tar.gz 13140403 BLAKE2B 3f392a036871d309d5502b92fd1065b3496c406a57ce87e90598d213fb2df9efe20dee4e07c250e0d5886e8cd85a8bdfc99a5ee5f2d59fb89075adda4f56e2a1 SHA512 d4330c213fa4f610a791b42c2e23a6fdac509183803483519970ae9976902132d2be1113be5171fd4cf0da006b8ca719fd2a5a220a6d621a8e1b3c354113b3ab
 DIST go-ethereum-1.10.1.tar.gz 13138413 BLAKE2B cff6d208a04fd332fa612aed57c0e3b444a126c3395bdcc23e40bdb420dea0005888fcdef744be7b103e07d28754feab58559eb93e08263cafdba336645cb40c SHA512 94626dbddb4da44e8c6695734cff940f4bbb7baafa23cf34d7fd2a48270d0f6e3df0a171b38df077eba6b4dcdaf526ec12c755a159ef27a5dab8656fe3c013e4
-DIST go-ethereum-1.9.15.tar.gz 10244242 BLAKE2B 2390e8f3cc8694c5f31423859fae45135caad113ec9c78c960d5bc8c1f3dd3d45f007d883b0059b6c90b8120d84a7e9b752569a55ef76b1137eae5cee19543ae SHA512 117d2964fed0efc7e4c42c2ea00c40ffa87317e4f4ed124ffdbc72b64964b92829c7ddfa29da3faf4cfdb70a8eeb01fc0d25b94583050eb1f9b9b32ebb6e4612
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
@@ -496,8 +460,6 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190909091759-094676da4a83.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-20200311171314-f7b00557c8c4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200311171314-f7b00557c8c4.zip 1871519 BLAKE2B 64e39405401ab8bf93b55a5855a8fb4a383bebe58f0d420ac8d20995e95ef060f972170640f13d362253c135909656fb2811d68fffef071ce25a5dde3101e262 SHA512 9663bc3a34901fe56902c1a22027a3ad42ebb63df89e0c7d70c4868aaf935144f5826aa7bee31fad71adf2f556ae796832c68d92a017faefc338db5c53462abc
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -548,8 +510,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip 1500495 BLAKE2B 29da4ab15ccf128967369fd5c3c881d94af2d8820d52de95b7ac99b221ed1e912b49a1318d9665fe9aa2431c3c267ad88bfecc87e4fd4ae50852de3de8bb6006 SHA512 c376001cee1c89fdc414adeeb9a277e81b8b69e243ba597efe07e3cf70c62c38196dc78e6eb1e2da01fd84b6d154e7636fd6043fedee14e65400757c67f77848
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
@@ -561,7 +521,6 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 24743 BLAKE2B 916fbb71a738b80833a6e9ab44ac53568d4bf6e9400b8a63197cfcc96488c60b43d602664366fd82fb686bc9b5ebf80d2d6fda3cb791a83042c03d965ab7efb4 SHA512 cbc53e045f3837deea920bc08867a45c5ef3e0afb99f7f5179653790d36a541f4e96e5f9e3e36560aff2b38ebde5a5004992c09a8e2722d44cfaf81d654de5b4
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -590,7 +549,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200824131525-c12d262b63d8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -601,7 +559,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -691,12 +648,9 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
-DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod 35 BLAKE2B 03f24b13567c0faf0d888017255d86ba73bb88559116639b057137070cad56a13b28a3a0ac4526eee5a8347df068c3e4641a7c159ad39c212d49a592b9255933 SHA512 b790b8b07af1e7c32311e4ccf30977e1822995b501ad14be4930c812704e0272335313b77d0c1128791efb60ab8a9e74417ce9bd5f602bdb71f2376c34a148f6
 DIST gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip 17217 BLAKE2B 628e6d5215a7d6433b488a45e0bf7779af2e1550550343e5d92f2cb3a66848c54d086fce54acfa8c70b1be5902a1b46c04359e55ae467cdadb2819f38dad4a36 SHA512 390b3d93bc1d0e9d186e97e9fe2dcc6bedd7b81dd49177a69b5c004359fbc3491fe48df82b85e42df1f3b4c674071c175f19f34cc9e3090db66d63b05d1c1172
-DIST gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200603215123-a4a8cb9d2cbc.mod 39 BLAKE2B 289f820445616bb33b3af919e39870e5a4f0f9a44ac37d4f6690c12738752255ec6c8adf5e8d5dccf3421dde2427c3682bb8cda763ad92ff99fb500ed5084530 SHA512 cb44497b4cbf6f1a84009e8223322619027689b0b55a7730ae9bd3fce664e3d401d328a3d4877436a8065ffec6761ff8b9f36587cf7d7d11b264f9e2590a9e44
-DIST gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200603215123-a4a8cb9d2cbc.zip 976159 BLAKE2B 0908b6b861c383db6971abd5793de7e046241ae6e2904622978e4a7fad923215cb7a8d2d4c7201a01e52b9cf500eb912d3574da2ed366c361ac520597c4d8060 SHA512 46995a6c312ada72bf8132bbb562cc37b9ee7d650364f1d38de50c32a757f8278fab01e153be4686eabb26e88a70a4c1342a6645dd582e2a498f544504b95008
 DIST gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200619000410-60c24ae608a6.mod 39 BLAKE2B 289f820445616bb33b3af919e39870e5a4f0f9a44ac37d4f6690c12738752255ec6c8adf5e8d5dccf3421dde2427c3682bb8cda763ad92ff99fb500ed5084530 SHA512 cb44497b4cbf6f1a84009e8223322619027689b0b55a7730ae9bd3fce664e3d401d328a3d4877436a8065ffec6761ff8b9f36587cf7d7d11b264f9e2590a9e44
 DIST gopkg.in%2Folebedev%2Fgo-duktape.v3%2F@v%2Fv3.0.0-20200619000410-60c24ae608a6.zip 976176 BLAKE2B 6e13012f0a29739fff0952870b11639064ea2eca27ecbef3e0adbe0b8911b3c803183fa1a54ecc0cd2f1c66cef400a980e109a0857f5e7772bca6fd8fd20c472 SHA512 10546d2789ad3436a4cf59467ae611a834762038c4295f13b6fc1990b07dabc18f7b839638370c37277d3c86bb5a691f72f9a39ca6f1b3e31602d4ae62a68ded
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
@@ -707,7 +661,6 @@ DIST gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.zip 72849 BLAKE2B 3317aff1a3c21e1
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -723,7 +676,5 @@ 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 rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
-EBUILD go-ethereum-1.10.0.ebuild 38935 BLAKE2B a3bd8d6c3dfc2408a5cbc8ae5b3acea65dbddcd7918e0a8bcd87e36bc098413cdb54d58339068fefedf477c44afdb57d7e46db83e20bd1a9c6b0a7eb9d8f0059 SHA512 95bc02b93c0784988cad86fba5d6cc9e694689d593703e4d97a40d0c6bdbee3e902a17fbfaa6dc2cbd822d219666d2ea3fcbb9b28123cc2fb026bc46020f7ec7
 EBUILD go-ethereum-1.10.1.ebuild 38935 BLAKE2B a3bd8d6c3dfc2408a5cbc8ae5b3acea65dbddcd7918e0a8bcd87e36bc098413cdb54d58339068fefedf477c44afdb57d7e46db83e20bd1a9c6b0a7eb9d8f0059 SHA512 95bc02b93c0784988cad86fba5d6cc9e694689d593703e4d97a40d0c6bdbee3e902a17fbfaa6dc2cbd822d219666d2ea3fcbb9b28123cc2fb026bc46020f7ec7
-EBUILD go-ethereum-1.9.15.ebuild 13845 BLAKE2B 4e3492606854102776cd3b16f789e3a4ee81cb9cfb4744c51936f629301ff96a7a68d1e99d9b7edbd5b2174c16198afdb8b670725dc41b13f5375f6b8d773950 SHA512 284abd4cce6d35e0a6648be86e4d91813600c69f23b021af2782f04fa5e7477f72de5291b7ffd34a18f3a37a52fedba4d3b65351144932355a55f0487396f520
-MISC metadata.xml 560 BLAKE2B a3e67d0dcfdfbbf6c7bb0dade1b820606b760026e2dba89c22d998cfa519b7a9d238b9745c2b8246e1d8fb52aa2b32d83db2dcfbc99f180d24ce840984230774 SHA512 21cc0f1002ef7f40e88103d556d0e15c4447653a6c1af0d2b1f28893aa8c554c383e86db81b241969549a717710c0693b393219574f715da0e86f145944b0df6
+MISC metadata.xml 590 BLAKE2B 76331a0c42031d61c23f3dc839e1e22e8f58543510cb2f1165de1acaeb7d023eef78febecb60ad0978697621b30648267ae245c5c5516bd6a3903e07b70431e5 SHA512 6da33eb2e0c690a6dcf76a79dc073d00ab8312d9f4cecaa3e068f9fd4544e29e40a48d1ee0729d116a0f8d5db8c4709f6b2e7ec580d442081302742e051c50d8
diff --git a/net-p2p/go-ethereum/go-ethereum-1.10.0.ebuild b/net-p2p/go-ethereum/go-ethereum-1.10.0.ebuild
deleted file mode 100644
index 71c2a91fa695..000000000000
--- a/net-p2p/go-ethereum/go-ethereum-1.10.0.ebuild
+++ /dev/null
@@ -1,726 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="Official golang implementation of the Ethereum protocol"
-HOMEPAGE="https://github.com/ethereum/go-ethereum"
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.43.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.50.0/go.mod"
-	"cloud.google.com/go v0.51.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/bigquery v1.3.0/go.mod"
-	"cloud.google.com/go/bigtable v1.2.0/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/firestore v1.1.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/pubsub v1.1.0/go.mod"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"cloud.google.com/go/storage v1.5.0/go.mod"
-	"collectd.org v0.3.0/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-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-storage-blob-go v0.7.0"
-	"github.com/Azure/azure-storage-blob-go v0.7.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-	"github.com/VictoriaMetrics/fastcache v1.5.7"
-	"github.com/VictoriaMetrics/fastcache v1.5.7/go.mod"
-	"github.com/aead/siphash v1.0.1/go.mod"
-	"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156"
-	"github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod"
-	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
-	"github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod"
-	"github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/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/aws/aws-sdk-go v1.25.48"
-	"github.com/aws/aws-sdk-go v1.25.48/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-	"github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod"
-	"github.com/btcsuite/btcd v0.20.1-beta"
-	"github.com/btcsuite/btcd v0.20.1-beta/go.mod"
-	"github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod"
-	"github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod"
-	"github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod"
-	"github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod"
-	"github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod"
-	"github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod"
-	"github.com/btcsuite/winsvc v1.0.0/go.mod"
-	"github.com/c-bata/go-prompt v0.2.2/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/cp v0.1.0"
-	"github.com/cespare/cp v0.1.0/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9"
-	"github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod"
-	"github.com/consensys/bavard v0.1.8-0.20210105233146-c16790d2aa8b/go.mod"
-	"github.com/consensys/goff v0.3.10/go.mod"
-	"github.com/consensys/gurvy v0.3.8"
-	"github.com/consensys/gurvy v0.3.8/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-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/dave/jennifer v1.2.0/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/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/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea"
-	"github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/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-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf"
-	"github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod"
-	"github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498"
-	"github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod"
-	"github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod"
-	"github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod"
-	"github.com/edsrzf/mmap-go v1.0.0"
-	"github.com/edsrzf/mmap-go v1.0.0/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/ethereum/go-ethereum v1.9.25/go.mod"
-	"github.com/fatih/color v1.3.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod"
-	"github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5"
-	"github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod"
-	"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/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/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff"
-	"github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod"
-	"github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod"
-	"github.com/go-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-kit/kit v0.8.0"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.1"
-	"github.com/go-ole/go-ole v1.2.1/go.mod"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
-	"github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/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/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/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"
-	"github.com/golang/protobuf v1.4.3/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3"
-	"github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/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/flatbuffers v1.11.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa"
-	"github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.1.5"
-	"github.com/google/uuid v1.1.5/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod"
-	"github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29"
-	"github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/consul/api v1.1.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d"
-	"github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/holiman/bloomfilter/v2 v2.0.3"
-	"github.com/holiman/bloomfilter/v2 v2.0.3/go.mod"
-	"github.com/holiman/uint256 v1.1.1"
-	"github.com/holiman/uint256 v1.1.1/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/huin/goupnp v1.0.0/go.mod"
-	"github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031"
-	"github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031/go.mod"
-	"github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/influxdata/flux v0.65.1/go.mod"
-	"github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod"
-	"github.com/influxdata/influxdb v1.8.3"
-	"github.com/influxdata/influxdb v1.8.3/go.mod"
-	"github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod"
-	"github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod"
-	"github.com/influxdata/promql/v2 v2.12.0/go.mod"
-	"github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod"
-	"github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod"
-	"github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458"
-	"github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod"
-	"github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e"
-	"github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod"
-	"github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/jrick/logrotate v1.0.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/go.mod"
-	"github.com/jsternberg/zap-logfmt v1.0.0/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
-	"github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod"
-	"github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356"
-	"github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod"
-	"github.com/kilic/bls12-381 v0.0.0-20201226121925-69dacb279461/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod"
-	"github.com/klauspost/compress v1.4.0/go.mod"
-	"github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod"
-	"github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod"
-	"github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/leanovate/gopter v0.2.8/go.mod"
-	"github.com/leanovate/gopter v0.2.9"
-	"github.com/leanovate/gopter v0.2.9/go.mod"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/magiconair/properties v1.8.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.0"
-	"github.com/mattn/go-colorable v0.1.0/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035"
-	"github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod"
-	"github.com/mattn/go-runewidth v0.0.3/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-sqlite3 v1.11.0/go.mod"
-	"github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/naoina/go-stringutil v0.1.0"
-	"github.com/naoina/go-stringutil v0.1.0/go.mod"
-	"github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416"
-	"github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod"
-	"github.com/nxadm/tail v1.4.4"
-	"github.com/nxadm/tail v1.4.4/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c"
-	"github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/ginkgo v1.12.1/go.mod"
-	"github.com/onsi/ginkgo v1.14.0"
-	"github.com/onsi/ginkgo v1.14.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.7.1/go.mod"
-	"github.com/onsi/gomega v1.10.1"
-	"github.com/onsi/gomega v1.10.1/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/paulbellamy/ratecounter v0.2.0/go.mod"
-	"github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod"
-	"github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7"
-	"github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod"
-	"github.com/philhofer/fwd v1.0.0/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"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_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/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.6.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod"
-	"github.com/prometheus/tsdb v0.7.1"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod"
-	"github.com/rjeczalik/notify v0.9.1"
-	"github.com/rjeczalik/notify v0.9.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/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod"
-	"github.com/rs/cors v1.7.0"
-	"github.com/rs/cors v1.7.0/go.mod"
-	"github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/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/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/segmentio/kafka-go v0.1.0/go.mod"
-	"github.com/segmentio/kafka-go v0.2.0/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil v2.20.5+incompatible"
-	"github.com/shirou/gopsutil v2.20.5+incompatible/go.mod"
-	"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/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/cobra v1.1.1/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.7.0/go.mod"
-	"github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4"
-	"github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod"
-	"github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod"
-	"github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/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.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.7.0"
-	"github.com/stretchr/testify v1.7.0/go.mod"
-	"github.com/subosito/gotenv v1.2.0/go.mod"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod"
-	"github.com/tinylib/msgp v1.0.2/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef"
-	"github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/willf/bitset v1.1.3/go.mod"
-	"github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/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-20190909091759-094676da4a83/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
-	"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-	"golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/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.20191209134235-331c550502dd/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
-	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod"
-	"golang.org/x/net v0.0.0-20200822124328-c89045814202"
-	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-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-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-20191204072324-ce4227a45e2e/go.mod"
-	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200107162124-548cf772de50/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-20200814200057-3d37ad5750ed/go.mod"
-	"golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod"
-	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
-	"golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-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-20191216173652-a0e659d51361/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-	"golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod"
-	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
-	"gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod"
-	"gonum.org/v1/gonum v0.6.0/go.mod"
-	"gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod"
-	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
-	"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.13.0/go.mod"
-	"google.golang.org/api v0.14.0/go.mod"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/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/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-20190716160619-c506a9f90610/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.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"
-	"google.golang.org/protobuf v1.23.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"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/ini.v1 v1.51.0/go.mod"
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce"
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod"
-	"gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6"
-	"gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/urfave/cli.v1 v1.20.0"
-	"gopkg.in/urfave/cli.v1 v1.20.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"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/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"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"rsc.io/pdf v0.1.1/go.mod"
-)
-
-go-module_set_globals
-SRC_URI="https://github.com/ethereum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="devtools"
-
-# Does all kinds of wonky stuff like connecting to Docker daemon, network activity, ...
-RESTRICT+=" test"
-
-src_compile() {
-	emake $(usex devtools all geth)
-}
-
-src_install() {
-	einstalldocs
-
-	dobin build/bin/geth
-
-	if use devtools; then
-		dobin build/bin/abidump
-		dobin build/bin/abigen
-		dobin build/bin/bootnode
-		dobin build/bin/checkpoint-admin
-		dobin build/bin/clef
-		dobin build/bin/devp2p
-		dobin build/bin/ethkey
-		dobin build/bin/evm
-		dobin build/bin/faucet
-		dobin build/bin/p2psim
-		dobin build/bin/puppeth
-		dobin build/bin/rlpdump
-	fi
-}
diff --git a/net-p2p/go-ethereum/go-ethereum-1.9.15.ebuild b/net-p2p/go-ethereum/go-ethereum-1.9.15.ebuild
deleted file mode 100644
index ffa24404eff9..000000000000
--- a/net-p2p/go-ethereum/go-ethereum-1.9.15.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Official golang implementation of the Ethereum protocol"
-HOMEPAGE="https://github.com/ethereum/go-ethereum"
-
-EGO_SUM=(
-	"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-storage-blob-go v0.7.0"
-	"github.com/Azure/azure-storage-blob-go v0.7.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-	"github.com/VictoriaMetrics/fastcache v1.5.7"
-	"github.com/VictoriaMetrics/fastcache v1.5.7/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/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156"
-	"github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod"
-	"github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847"
-	"github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod"
-	"github.com/aws/aws-sdk-go v1.25.48"
-	"github.com/aws/aws-sdk-go v1.25.48/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6"
-	"github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod"
-	"github.com/cespare/cp v0.1.0"
-	"github.com/cespare/cp v0.1.0/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9"
-	"github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/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/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea"
-	"github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/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/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf"
-	"github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod"
-	"github.com/dop251/goja v0.0.0-20200219165308-d1232e640a87"
-	"github.com/dop251/goja v0.0.0-20200219165308-d1232e640a87/go.mod"
-	"github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c"
-	"github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod"
-	"github.com/fatih/color v1.3.0"
-	"github.com/fatih/color v1.3.0/go.mod"
-	"github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc"
-	"github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff"
-	"github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod"
-	"github.com/go-kit/kit v0.8.0"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.1"
-	"github.com/go-ole/go-ole v1.2.1/go.mod"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c"
-	"github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989"
-	"github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod"
-	"github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277"
-	"github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/huin/goupnp v1.0.0"
-	"github.com/huin/goupnp v1.0.0/go.mod"
-	"github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod"
-	"github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883"
-	"github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458"
-	"github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21"
-	"github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod"
-	"github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356"
-	"github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/mattn/go-colorable v0.1.0"
-	"github.com/mattn/go-colorable v0.1.0/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035"
-	"github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod"
-	"github.com/mattn/go-runewidth v0.0.3/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/naoina/go-stringutil v0.1.0"
-	"github.com/naoina/go-stringutil v0.1.0/go.mod"
-	"github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416"
-	"github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c"
-	"github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/gomega v1.4.3"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222"
-	"github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod"
-	"github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7"
-	"github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150"
-	"github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod"
-	"github.com/rjeczalik/notify v0.9.1"
-	"github.com/rjeczalik/notify v0.9.1/go.mod"
-	"github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00"
-	"github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod"
-	"github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521"
-	"github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/shirou/gopsutil v2.20.5-0.20200531151128-663af789c085+incompatible"
-	"github.com/shirou/gopsutil v2.20.5-0.20200531151128-663af789c085+incompatible/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4"
-	"github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod"
-	"github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570"
-	"github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod"
-	"github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3"
-	"github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/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"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d"
-	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod"
-	"github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef"
-	"github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208"
-	"github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4"
-	"golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0"
-	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce"
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod"
-	"gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200603215123-a4a8cb9d2cbc"
-	"gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200603215123-a4a8cb9d2cbc/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/urfave/cli.v1 v1.20.0"
-	"gopkg.in/urfave/cli.v1 v1.20.0/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/ethereum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="devtools"
-
-# Does all kinds of wonky stuff like connecting to Docker daemon, network activity, ...
-RESTRICT+=" test"
-
-src_compile() {
-	emake $(usex devtools all geth)
-}
-
-src_install() {
-	einstalldocs
-	dobin build/bin/geth
-	if use devtools; then
-		dobin build/bin/abigen
-		dobin build/bin/bootnode
-		dobin build/bin/evm
-		dobin build/bin/p2psim
-		dobin build/bin/puppeth
-		dobin build/bin/rlpdump
-		dobin build/bin/swarm
-		dobin build/bin/wnode
-	fi
-}
diff --git a/net-p2p/go-ethereum/metadata.xml b/net-p2p/go-ethereum/metadata.xml
index 166ac9b6e4ae..9019b6085aa5 100644
--- a/net-p2p/go-ethereum/metadata.xml
+++ b/net-p2p/go-ethereum/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index 2227f80d988a..d7dd2301c708 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -12,4 +12,4 @@ DIST go-ipfs_v0.7.0_linux-amd64.tar.gz 25954590 BLAKE2B 0bd139f77272ac9d5e4e1f3c
 DIST go-ipfs_v0.7.0_linux-arm.tar.gz 21087228 BLAKE2B ec3122077a487726fe227816f97462bf9caf40d30c44ff6bf67e6266eda7cfff456855cdf8f91c1bc01dcca58b0e76cc931c05179326414e39adb6bf4d7fae18 SHA512 a1a9b6e2833da94d9059f1d03e30e7349ab4f00fc0e8580909f35dbb28f0fdf6cea712a96928f72aa2fadf3efc1328187f4fc863e5ce74e4be699542e262a904
 EBUILD go-ipfs-bin-0.4.22.ebuild 1325 BLAKE2B 347eff8b98a137099b9b4d36ba64ce773da594dda87073099c36c3a337912f61ab67da7c8a179ee229fefb5d600bed892f24dd470b872c5982d94675ab3da4d9 SHA512 bf0eb3b77f96471fb63a13caf1e87dc19dbd2748882a0b3c9c72ac67fd3f6c350f07ffb22d0f80146f88b30bb3b5d152cff442e499c0bff41fb0cca2fbd64c94
 EBUILD go-ipfs-bin-0.7.0.ebuild 1300 BLAKE2B 189949433e69e43b7f8164824b31a4138e2e78fac07d9d82b4618fc0cec1ba3378082ed16af2d6f00169d6def2c3938ae877bf1cade90f6881a2087201fb1938 SHA512 08e4c322aa2fbfe49a2221077d8954029dc6459f5a91d8b723b4c773176fdccce6a83f18fd30311d5be242760c13804344f5d3d0c3f5de1bf1a00bd84bf72e21
-MISC metadata.xml 477 BLAKE2B 16a170ae9f93261fef63c634d97680c504258e0d418ae4fb041c44c305478d1762f7a8eddec42bbd4603f37c9789093a8ba802b0e9f4089800136350e8605341 SHA512 d947a52ccaee61cb739f95e1e2eab3eb71af66d55272e40ce62388bb00550747105861328b458bfb4172b0b5737c54c5d572f9bc6c868503b494f0bc5a5d6f5b
+MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs-bin/metadata.xml b/net-p2p/go-ipfs-bin/metadata.xml
index 016a51cc0710..744411f3075f 100644
--- a/net-p2p/go-ipfs-bin/metadata.xml
+++ b/net-p2p/go-ipfs-bin/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest
index 5f5216ba00c8..8feb2e3b70cb 100644
--- a/net-p2p/go-ipfs/Manifest
+++ b/net-p2p/go-ipfs/Manifest
@@ -1745,4 +1745,4 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 EBUILD go-ipfs-0.7.0.ebuild 82738 BLAKE2B eefa46f1053c9716dd43a8ae120736781adfed53be40f9f9602aae273aa9f1d28f28c05c50721e4be446b9ba6bc36a046aa1f103d6031ff643aeac597fc22bc2 SHA512 38a823e3878a19fbef7be5fe8356606b34a1156642a5940de9b38b28ef7da656dad9f34b1ca3a40e92e6250219ffe8a575e2bb0178a2c6bb63c69503e8a09dcf
 EBUILD go-ipfs-0.8.0.ebuild 75130 BLAKE2B 4831e021e5501bf17e2e6b0629dbcd02c4b8d66cb05b9d988c1886bc2ebcf22170c7337feb5ebe150bb7dfccbb12bbd8fe0fc7ac223e172cc1c2b3845d7e45ed SHA512 3dd920602303f27eb6bdfabd6535aad97d7cbb4417aebbb4be5d2c8ab82163037b43ae3d699113b432d7aa200e446f069048945a40329fc9c65e9e3d57940928
-MISC metadata.xml 366 BLAKE2B 5241e8eccd804117b97d239ac7ac9688090d6f417465976c31edb72780288ef9ce725126e2c8d5483c220de9ffb4bc863102e9342a0b1d48cb780d401a32eb3d SHA512 5b748222be57a2754237bd77677cde457e5b43a87b6ddc0cf05903e1e7121f0c6e0ef260ce4c9f46ceeacbcd69b1150a29e48c562d1bb09ecfb5a6029d3e99cc
+MISC metadata.xml 396 BLAKE2B 264f50317693f9929b7995e1188ffe4ab7616fbdb9be8a5a445cf03dfb9fed58742a11ab6df154c20395441195c64fb3ee68278612478527579f3beec202c0e0 SHA512 0632b981dc48dbd6432ef940c5a8e8c3836773e14a67bb81bde469410b6bdace1c4eeb7d27ff6ac72291213d201435f9f884535378bedfe7957d72240cf707c2
diff --git a/net-p2p/go-ipfs/metadata.xml b/net-p2p/go-ipfs/metadata.xml
index b69fe2e3c4ab..72bff73de1e0 100644
--- a/net-p2p/go-ipfs/metadata.xml
+++ b/net-p2p/go-ipfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/metadata.xml b/net-p2p/metadata.xml
index b04d29b9628e..3efbfaa1f17f 100644
--- a/net-p2p/metadata.xml
+++ b/net-p2p/metadata.xml
@@ -31,4 +31,3 @@
 		peer-to-peer.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index c909547b046a..a215ca28fbc7 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,3 +1,3 @@
 DIST mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz 24574 BLAKE2B e7dcc17aca52c8d1f9d816ce3e89bea5c2b1d7759dba6a00578960b253652506b7e61855d769440056aaa6b0719e6856108ca5b80977152746a648862c71e97b SHA512 49ba2697373a1b40829d50d66faaaeb57fa3893e97283ec2844b447b8e4cf2713d7c0e76e49d3893475f5ce298c3215249751defe0f952d2c52df1bf68f7706c
 EBUILD mktorrent-1.1_p20180912.ebuild 1020 BLAKE2B f048a0eba3eaa397d3012c11691a82247e7f1f4163faa573e1c43e0780ce9dc8fb44592c79eeb8ff45f99ae12f016815ca78553341247c3fec476d9d878c0a3a SHA512 e65d8072575db0bab10bbc34903877f5d4d5906dcb3bb035c045a6762390cc6baa6f8af585d9eccb7c8dacd3908fe3da8688ab0facd11d31db20c747a2762382
-MISC metadata.xml 446 BLAKE2B f5298ced2a3c59bc990eebd8d183815e8449191b11e48e31aea3948944cf67e79ab649922c104a0a644d8f4de6bab044175a2bb64fe3124f4a317fb98be7deb9 SHA512 6dc7c65acabf5e556235a4c5e95d77301d8aa92acf2d82d6c50afe761095637c8f08616d40b6a34270894ba9baf9bfef33f060e3c8fe67e3ee92a9bfad1f68b7
+MISC metadata.xml 476 BLAKE2B 129e62a3ebd8ad740781ed0e6d81930eca9beeb935f270b068e0c09bf450fb7a537e614ae96abf6fdffddf23b8b3103556f641ed96e295d2a6b5d37af453529c SHA512 289ff56364bac0e6df70b9b20827dc2641b57ed8130674a87e41490d79f6615687d77ac2927605960d55d8cc7e5f34036094d19ebfb1a4efb0731acf6cec5842
diff --git a/net-p2p/mktorrent/metadata.xml b/net-p2p/mktorrent/metadata.xml
index 7b6a20b87b7d..18280326baae 100644
--- a/net-p2p/mktorrent/metadata.xml
+++ b/net-p2p/mktorrent/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 91f97a60a0f5..0bd469204d7e 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -2,4 +2,4 @@ AUX mldonkey.confd 949 BLAKE2B 05e1ceaa111249a979931c14eb599201e525f50af2370318c
 AUX mldonkey.initd 3509 BLAKE2B d3098a027f044f3bfc7559fa1869f7080844de1cec93fe26424322aafd482c7f010fef96854115e42e4b2a37f31b1d0f6caf94abf0c97c52d794db4767f5c0c1 SHA512 0c423feb9abbe7b08d77a3221a3638a0a93526bbf68c5e60e944413f4fd13ac44813609179b981c31d19e1e8fe11333f16dc8388a144208694cb84c008dbbed3
 DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
 EBUILD mldonkey-3.1.7-r1.ebuild 4531 BLAKE2B a996af51c615fbce2d18810f4930c60daaa7833ac5c9528bcc1ba8433eb1649f3b5661977aa34ee7a6d78534adb3a4345dd19f68bcc363f0cb8dc4b6bbb530a4 SHA512 1d9c33ff5bfb0b17eb4cb8b56b9096171dc9c7468b01d85bfaf784ef83b538c369aa9d942f3189b8a4dc83916524092758d89fd75f4f3db93d755029b5e437c6
-MISC metadata.xml 779 BLAKE2B d57b3c5b63c33bbb2fa699498dd7d05038fba219c8778a50b1acdfa9c4be4e5b3161af20ec29cc44f63c3a4d33fa7c93faa7835a5f269646b3a8873349702ae6 SHA512 97d2135549869254658d258e3833bf0c700edddf94fa7b40244b14b4bece855b7683191d33db5ad9ccef2884a63ee2ea6e8f9dc5ef28bd1a870266930c610c0c
+MISC metadata.xml 809 BLAKE2B 1e1d3eb87ffee2ab5b4fe9860de53679b7b29095d14811687d53cc9f4dc150bfe728375ab8acb48348d8f1a85d8f93e0d008f14cfd8e15129377fb26fe719dab SHA512 1d58b72d25faafecbe527956dd19820a78566e27dd10c996fc36a81807a48245efbb6d5a037304770b823e0c9930dc333db22749a8ebc3d056a4118f8d970286
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index 9471439b9f3e..08849a0c1fc7 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@chuso.net</email>
     <name>Jesus Perez Rey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index ab394a28b701..284080eff7ab 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -8,4 +8,4 @@ EBUILD nicotine+-2.1.2.ebuild 912 BLAKE2B 26b89d4276aa9f49c6593fc40392f0d3f6d00d
 EBUILD nicotine+-2.2.0.ebuild 914 BLAKE2B bd3345e06b253455f66acd463e380fe61569c7051ef66b6d393e22e05276a5c0ced9296adb11c23201970bb61e4bd7c9f13e249ac2b54c3ffe9669592731116b SHA512 8d7b54cfce555201fe0694ebdfe70477b830cb1766f918bb72ce998ebb8387ad64978216842cb23568350dfa8a6026042b8672edb2b07b7643a3b5f82c5dbfb3
 EBUILD nicotine+-2.2.2.ebuild 837 BLAKE2B 275ed5b79caeb4a8a6090c25ea3a6ad43e03608700364dd3e17acbea2dbde07b3dd2c60a2913369da0a90b5107623445a0068caeb725778896edefe9af507e11 SHA512 41777ba58191572c64092300f2833e4868145fb12bf3e534eaaa41563a5e92586729b5e0690a03b92ec827c8971b2c15d7519e6f6c682b4059cf203f40d7e197
 EBUILD nicotine+-3.0.2.ebuild 840 BLAKE2B 4c1a16f620db8656b3c74a57425368efc111b18f3171ad98a5b891216737b96ca328b590aacd24afb60bbc356b6e7fa3fea164c07f8474f6da8ae9506279b2c2 SHA512 0e7b479f78b315ad7ab215ddd6482bfb198d4ec249b8b67253110db11a62ada6e49c3160b4724b8cf2039e3f69429f6f7266c758a862cd3ee8b0804d9ea5054d
-MISC metadata.xml 344 BLAKE2B 3e990579dbb468a2dc76bf5ea791367f8009fd3a21508de4ec40e7cc5d4ddca825488a139a63f7424a05e92246ed7e8d193eb6d2aa58a68244169ae77f588472 SHA512 a62b54ffb9368e5a5aa8a119146ae5330797ac7034b1d403bed87550b976daa25bcc7d68b2089122f287c8ecb1ca3f3679609eee3bfac518abbd251545adc3f2
+MISC metadata.xml 344 BLAKE2B 3f2aa00d502a79e54a846e1830d2a3d93887166bc3c3adc431e07a8234fa9c398635f56d62c46bf323f1733d8a92bbfc8543ce90a8e7a5ea7d22ad0f27b18147 SHA512 2cac96436b53c15bf3dfb4a275d3746886e4e6bbe30a31dbe16f6118f3011de227bf7870452578100e55b56125bd242b51950cc00b4be9257722533f2bfe392a
diff --git a/net-p2p/nicotine+/metadata.xml b/net-p2p/nicotine+/metadata.xml
index ecc5a052b27f..3a27fff7dbcd 100644
--- a/net-p2p/nicotine+/metadata.xml
+++ b/net-p2p/nicotine+/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 65cf2ef83f3a..fd0870e73cb3 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -11,4 +11,4 @@ DIST resilio-sync_2.6.3-1_amd64.deb 12111264 BLAKE2B e4b4d3d0bda910db5f10131d907
 DIST resilio-sync_2.6.3-1_i386.deb 12062034 BLAKE2B 9c92e118ee8977a7e26948a21c61e1ff7c0692a2a76ff11e1b6ea8ef0edb08032d33453963b8c400c8945ed67cc561ce8334391fc4d8edc2e4bf37ff3c8acaff SHA512 4254de420b2b2263779befbfd93bddb8fa5352fbcce80e2a21efb463f0f3008a282fd07eb6602d4785ca6f0e770980b6da66c8d33911ae68938aee5e09e08e44
 EBUILD resilio-sync-2.6.1.ebuild 2229 BLAKE2B d23975c7f37c48b79e94e0a30fbabd14fa715beadce66b9afe2f2c83d35a698afa2e4d20c4552197099b9575e68f55a4f3043d5e0936093d67aee8cfa6c56a4e SHA512 dc85455bd1943f99a664dfea988d8899a18db51c4fc5e349eea8211773487afa5d0326f918177a8a14dbccc171c442ca325fb19a6455f0c24664ae79e9c4745d
 EBUILD resilio-sync-2.6.3.ebuild 2176 BLAKE2B 524b14c925436148b242fedaa6418662604111bf645940ac7c9d2ae437e66f638ac1e901d71a9ac723541c76f3147ec04687b25a2858138538b8656e6f1f88ed SHA512 cf548d4ce32aacd87da8fa89b93bc022f8412cfbfd0950f4124b36775516e962307e80645e7de8e2c28462d8dc1522a6ed98450adae95b400d49c1790250d708
-MISC metadata.xml 889 BLAKE2B e6e81874032bbb5ae212b3894f04cb1dbcefae1bf87dd94f86e16a5e6547cfa4e17c1db9214bfe9d2da35c86011501776ee1ed0e0327a8aa607db39ddac2595a SHA512 0943a2d2215dbe2534622e3f90edf51b340613294d9b0b2ed2594b4223c7a26a8c1d054e7d90d957874e204f7fe32cf5d6f00d43e16164d618e193ac86a96b4c
+MISC metadata.xml 919 BLAKE2B 0bf1ec7687435310eaed48528fbacc58960484f1bfb66af56316811287db281bb2464202ae2e6289e0d200d96347db2c8a6eea8a77147b9e910dd013d826f90a SHA512 0dea5cf2851a6e923cc5cbd19a94d2bee91964d1ca73ea945ba77a8c1f16f2ff4fe5d2778a0759df706d60e41a3e6b88388435e6cb3d4cac87c70f509ce42c32
diff --git a/net-p2p/resilio-sync/metadata.xml b/net-p2p/resilio-sync/metadata.xml
index 1e9a6697329a..000ca04fb373 100644
--- a/net-p2p/resilio-sync/metadata.xml
+++ b/net-p2p/resilio-sync/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 56d21c8e0c42..4a48d68c0e74 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,4 +1,4 @@
 AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
 EBUILD retroshare-0.6.5-r2.ebuild 4111 BLAKE2B 46bc75e3ef9e5630c1c1a1f9cf8d4cc7e7fdfb9bbbf9f4aedfb4fdfb20e6a629c7232a8702a5d85f33e9402d338c6506acd1678a2344d3985c3c3ec4d0e92203 SHA512 900299068206db39cd8988a54c86fec54ef744df13875214ac6ad16b6d516ed5f2f87eac5935a41b53e0270b9cf008803cdff70e17b034e57e87e2274026e256
-MISC metadata.xml 1584 BLAKE2B 35f66764610422f5ae44273f336d84668035cea9458da32e4af81edf162ce1c83b4e6d4d4d7d17a27a2b9ed4bcef7caff9efbd05b8bcee2bb00d33860fa4b63e SHA512 353333842e9c3335e57795447850dfe56ac29865c27232080b97f293d2c1fda89c9d1a47942861428f3b2a69f8fca5b7389f9a15b3fcfa8bd89b7ea8314f3114
+MISC metadata.xml 1614 BLAKE2B dffe5895cc85e6c661b8ca6d2bddc3582caaf8e3c943098d2a64d5164850796d5ab7c33399fba8ae418b8665bf201d20821c3fd7c334d1033cab6ce1f16c237f SHA512 c1300b57b3a11349a434a5d32775e52390da7039aa319d45fa89f811fb3ffe74d3a5bbcbf397cdaa69c346398ff37eb62e3d949c3d66bf34984c2526d66e486d
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 836fec2f91a1..a2e56631bdb1 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gio@eigenlab.org</email>
 		<name>Gioacchino Mazzurco</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index c95cfc0c0ad2..c986ae24c5c5 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -9,4 +9,4 @@ DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0
 EBUILD rtorrent-0.9.7-r1.ebuild 1893 BLAKE2B cf0a16d4c9547ada31a1297fad23f65f7865e08842281a32d178c4beada790bdfe717dc193a0d7d09ec7d95cb0bc5478381a069a5c29df8e269b88f8d224dd36 SHA512 89063b232670f661643c7534dc4b122217d5bb5bf39a4516eb3be0f1357617a0f15bc847a4df41e7fccd433c4237c260a66778d02fa6c042adce21310fd25a31
 EBUILD rtorrent-0.9.7.ebuild 1843 BLAKE2B bcb4bbfd122212f1f8a17d0a3d1b514dc71da3e72a855272555c871cb0e955ee8151e8a044ab92ac109c402cc4856d032ced0c7e25ca4b07ae5ea1c28b670b79 SHA512 5f6576c0a3731864e81bef9fb884647c3def4941c6308c1193ecea7094d2a6cd8e8a620a037c1b01f2b359e9ee6c3a55b60c23b9927a46c4bef030d4d1f23816
 EBUILD rtorrent-0.9.8.ebuild 1768 BLAKE2B 6de3f9ccc3a219b9d14bceb61de9680a8b3f273c5d53a82f3be10f33e32cb2d98ea68e6722a51d178e6cb6e2e7f5edf79203d36c77025529f8627c4d4967d8bd SHA512 0bf0bf78b3ba41dd8763cca840a705543df82f7e62534cbe8981def654b8e529afe61aa4d543d29b4fe3881edca8fd82b4ff2e807e2007222d63b20e3dff89e3
-MISC metadata.xml 548 BLAKE2B 70665091f8888c495c4c2ddabd96b3e3157400dfa304ac15b219b8f87aeb230f335a89520d77588f66a40614c2a6de9b95aeb06d972b6b5d0538848d1047dafa SHA512 cd7f07fabdffee2de7dc3a2a1833a66d0bf6315763c0daf3995831f482b96a1b919f98cd077af0bce1361bc4fd1e316f679ad02f06e26882bce8869750d5e367
+MISC metadata.xml 562 BLAKE2B d57a2b6b1e0df2e334ca94548fd85d48e6d75a0586f7eb656181cfda41dff1d8f79f86b2b736c3ea50782f3b94da6f201af41c1244199f07616226fcd025558d SHA512 2d84ec000f604116026af1f1b75cc6fc8c38fc76ae33fc4d38426d14159892296c57e1198f8e2579501d1cf1c94a61ac2cc0b8f3bdf410ce7ceffbeb294d1240
diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index 5ae0c5173f93..0e65c2c51e4f 100644
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ss23@ss23.geek.nz</email>
 		<name>Stephen Shkardoon</name>
 	</maintainer>
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index eb2ac2b83630..b341b4b2ea96 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -826,6 +826,6 @@ DIST syncthing-1.10.0.tar.gz 4909540 BLAKE2B 380d0e10085ac5960566fb5d72261f6a239
 DIST syncthing-1.13.1.tar.gz 5044029 BLAKE2B 5a3fd774d7026eb530b09b8492d76ee8b33ad3e71da9df88f9d5fd74b1b53b41ac933bcd6d2d704f8859e407779e9818ba23ef12cdcc6fff572aa49ef0dfa637 SHA512 e0f59cd3e551b6d9d7889a63740114ac0381df93cd0d3ef997b7f474c26cee799b69cde1d32d924eb12a095f15e5102b786cd81a80af7674c41fe30e48bf129d
 DIST syncthing-1.14.0.tar.gz 5072536 BLAKE2B 73fcec4ac708b387d1cd92f93d6a94cc06db2a308670594de3a68b72d6f6c87bc052cb45561a5eb7ca4053fde429dbac7fdf718224df1f6e7014a894f802b825 SHA512 a4fc9e4db551ae8671cca1957e2ab382b7acb66314764e31003f17cae75caa7a59407c28af64e782b02c2bf0cae50e2373bebaf4a483e80480e10ee134d5d8eb
 EBUILD syncthing-1.10.0.ebuild 30998 BLAKE2B 301bb4b4a2f1e32d1811991282326bf73b40173c5647f0ba32871b9041725829d7ad447e634e20941c27d2d72f4330647e4dc7b75390cef7300ab866c9398620 SHA512 dc55e02a9d4fdb5a6c269d045fe37a2bd19abd17925283e664a924a883aeeb555081bb1903fce4bf2f9c8c8c9ba2a188f5ae0e25b79b7f09718fc5f8ca3ae325
-EBUILD syncthing-1.13.1.ebuild 40622 BLAKE2B b9e3ceacf6d3716f6eef4f0d70ae3a93287c6d53daa0c575f7dae1914fe8386305eb23ea9004d89a3c63916219d5577c2f8305b2187a8e834063adb8b999b6b8 SHA512 3bd3fe20ad69b82ff54a7aa51963f2795c3e05e317c2e941417ab698225fb9cde56d8d6bc344f299807a28814b3458c209a7befe6640888cc259f91d41b3f507
+EBUILD syncthing-1.13.1.ebuild 40620 BLAKE2B 6720e69271ca8d7c03fff1ac8cbd15e6ce09058c6851669dc92e6cf2c6a5a7e078dbbe33d02345bc7d656d3a3d65824e98f95f3b57d86cde7d6b1b815b760378 SHA512 5350522856ec6a952954b324af8d52902f3780e6e3049d72b2323b2e790fc82239d4f97e2fd814faf25caac7f4e9a0ddbd880b164a83b2412699e72182a7c53c
 EBUILD syncthing-1.14.0.ebuild 40667 BLAKE2B 508474d08cd847143de07c00b0cfd8fda79fcfa61dacdad4c9a55e535a7e75cfb4da56ed4770b3d46d428023f0d7c40a9ec46f61cfe686949bd2316e0e5d3302 SHA512 b36b952d936878a75de2a26f719bf917f788f9990160fb259b48b7bfc3d8a75fd201ab763e423bd1e91723df919139774c90dfb76e9576fa2a5f0efbf9fc1e27
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.13.1.ebuild b/net-p2p/syncthing/syncthing-1.13.1.ebuild
index 47f1c7db31d8..d21f1a3300cb 100644
--- a/net-p2p/syncthing/syncthing-1.13.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.13.1.ebuild
@@ -707,7 +707,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index 4b786982fc60..e7bd7fccc280 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1,4 +1,4 @@
 AUX transmission-remote-gtk-1.4.1-gcc10-fno-common.patch 748 BLAKE2B f22473d0f56a3cfbf207a1fa946d1095873a63582b65593d4758a583d7817b1b8d046af718f079543e2bf82453d7f21da128dba14608416e18f51ca78f65c28d SHA512 d2f762c10fa72b25dfaf0623a880f7694d405f933e3285b845c6f7ea416c745b1ee7bcbd686caf0381f61a547edddd82bdf50ccb415ec0c394059125983aaa45
 DIST transmission-remote-gtk-1.4.1.tar.xz 543620 BLAKE2B dea556138a7f554a6cbe5c3e0d5bdd9057cb61d2d80e2d89beb96b2926218e19ce85759fd079375ba8896e185bbdec74979372a9413dc5c513204f47b93e4304 SHA512 c1a2c26d01bc2557bafae9baa370f713e0412ac8445e12b19e9b3027c1a269745dbb865195d683af397d43a2956f51aad8bdfcaff93e4f07015e33715770de48
 EBUILD transmission-remote-gtk-1.4.1.ebuild 1334 BLAKE2B 536071d1ae9ba0c7bf7e1418a9cc784c43577caf0edc6a3a8ac6346cfd466fca0ee9a97ccc98ef88ddd08ade36aa8b04d959fcc4b21b5d53a052bf76766891ed SHA512 9068003a0475c25b6391a30d58891ca2734fce87b8309f8bcb1cc0aa063a61f91db6406711ea2b83267ca4ca926abb34627489e02d6d4117015af9a2e8835e17
-MISC metadata.xml 493 BLAKE2B 91125c81c02f7249d6d99436f02900f5bb559ebdec3634d8c2ad3e341f9a98849dc051be6fc8c4ff4b77146a1f66977d04ce88588f4f0691322ece06e7bb8aa3 SHA512 722a8a74d8afcf72ddfbe0d092bef518da4ed2e146c6215736f07deac15bf159b5793548de2409a8dea6dda5b1ca033b4bce92b63e11ad7b290b4b8bc99fc45e
+MISC metadata.xml 493 BLAKE2B 41ab207cf9665d459c46955074deb0cca505f67cee0d2a4b4d0760be5a9692a96a1da2c2189f673957bb9e9962de331769cdf14f25c4709c7ebef3df38b7d251 SHA512 560691a37d64f2a399f5af3de67f285c9c4554056f4afb972e9969675d92b48b2245e611b43bc16b9da0dac397c925a8c20534ed234eb86bfae5456435c02c23
diff --git a/net-p2p/transmission-remote-gtk/metadata.xml b/net-p2p/transmission-remote-gtk/metadata.xml
index 9b2b53c104f2..a4a72705d07c 100644
--- a/net-p2p/transmission-remote-gtk/metadata.xml
+++ b/net-p2p/transmission-remote-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3ab42ae96054..c2c643f0e22e 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest
index 712f806a6645..7d11500c0f87 100644
--- a/net-print/brlaser/Manifest
+++ b/net-print/brlaser/Manifest
@@ -1,3 +1,3 @@
 DIST brlaser-6.tar.gz 22807 BLAKE2B be8041c1b6ddb8c4e5055fa35edc2c764562b2b4e52cad17aa968a51886621264d6bf289bd7bb5af0148098bb72aa96adea603091b38c3a245068d60737e80fc SHA512 d7e0e63b64be9ae7633381622c13ba0589e5fe58d277212bce4f5bb712a291ed0b0f2ac3d450dce61c7f9052c1ce7323fec66b5005c5cb3da1314b284d20f06f
 EBUILD brlaser-6.ebuild 419 BLAKE2B 23e98fd74ce7454ac21a20d4015ebdc248c6927b1b93f13c1738689e83e6c35dc5cf6d83ad29e2db6a4fe3a815405425d4addb7f680b4437b2ee1b10adc7f16c SHA512 3ed6856e6b1acb2e86c3ed86dce634e005ed290feba8f6011a8eadc505e76ea2119a3cff0aa90dc71acc03b420c8b63995b41d47ab86291ddbf87543ec7c73c2
-MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418
+MISC metadata.xml 523 BLAKE2B 70c4527d4b90646e3aa8763294ec326d51d599cbf24a4bf2db6a09ccca2611f7b29b42b06d0f6b88cb2eaa18ef15e26ae47ff1a856516267a8dda85c6cf4533c SHA512 f8bdcc6fe0488ea130194812839541f948caa70414f507182fde508292d3bf57d2df1bdcbd740fad692effb1c55e90c6288b8d345ccc52403d41c9b712ed87cf
diff --git a/net-print/brlaser/metadata.xml b/net-print/brlaser/metadata.xml
index 0a61a5ac6871..cd2e4bede63a 100644
--- a/net-print/brlaser/metadata.xml
+++ b/net-print/brlaser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>cyrevolt@googlemail.com</email>
 		<name>Daniel Maslowski</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer> 
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 362f437e7a40..19ae4bdbdca1 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,6 +1,4 @@
 AUX cndrvcups-common-lb-3.70-fno-common.patch 2543 BLAKE2B 01af53fa5f40f9abe9aba3703ea9f84639aedc15dd7f0319c0beecb6ecf67bbe799baf089fba3a52a9cfc2700c6a09dc2581d699de9d92edb3eb14b17f039fe9 SHA512 256bfcade97eec388b8264fdc154a52c6623e902b469fb8ad55a76bbc52bfe85b1106a9055dfa3d79e70319dc2726841af4c6fb38e7c258fc6b989f8761952d4
-DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
-EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2922 BLAKE2B f002fb0784954843a02d04f216bcaa2901c728d337831e96c9dd6a4ba1b1060dca91407704d943bdd510313cb00d31afab83ce295850912e5241581721ca2719 SHA512 8765fba45ca858827f7b0cb7ca655a31376ef22a7694d1ffb0416b7807e80b2383523d850dcd825e6b6b1aac48de14a6957b5422f3089ad190a1ff573feac35f
 EBUILD cndrvcups-common-lb-3.70.ebuild 3234 BLAKE2B 06e5bcd884bb3de171e2cc4ba3328ae794249417bea107d517d1aa3de0cbc15c02e681c76e51f65c9ec4402de05876ee62743699ee744a26b23f54403327d4bf SHA512 e9b3a5b5d4b769db45a3c0361ed75e9af5bccb8fa3819f37e445c055259578ffd9eb5b733e575db1c1bff46db57c4dbae809a2bbc0d92fc6cd5ac8ee24705519
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
deleted file mode 100644
index cbdab7f9b8cb..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_PV="$(ver_rs 1- '')"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
-SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz"
-
-# GPL-2 License inside LICENSE-EN.txt files
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6:2
-	>=gnome-base/libglade-2.4:2.0
-	>=net-print/cups-1.1.17
-	>=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
-
-pkg_setup() {
-	# Don't raise a fuss over pre-built binaries
-	QA_PREBUILT="
-		/usr/libexec/cups/filter/c3pldrv
-		/usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-		/usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-		/usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-	"
-	QA_SONAME="
-		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-	"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-	unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
-}
-
-change_dir() {
-	for i in cngplp buftool backend; do
-		cd "${i}" || die
-		"${@}"
-		cd "${S}" || die
-	done
-}
-
-src_prepare() {
-	default
-	sed -i -e \
-		"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
-		backend/Makefile.am || die
-
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-	change_dir eautoreconf
-}
-
-src_configure() {
-	change_dir econf
-}
-
-src_compile() {
-	change_dir emake
-
-	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-	cd "${S}/c3plmod_ipc" || die
-	emake
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default
-
-	einstalldocs
-
-	cd "${S}/c3plmod_ipc" || die
-	dolib.so libcanonc3pl.so.1.0.0
-	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-	cd "${S}/data" || die
-	insinto /usr/share/caepcm
-	doins *
-
-	ABI=x86
-	cd "${S}/libs" || die
-	exeinto $(cups-config --serverbin)/filter
-	doexe c3pldrv
-	dolib.so libcaepcm.so.1.0
-	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
-	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
-	for lib in *.so.?.?.?; do
-		dolib.so "${lib}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-	done
-
-	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(, bug #????
-	# Only needed with SYMLINK_LIB=yes #642138
-	if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
-		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
-	fi
-}
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 449628292d14..1e09e44aa92a 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,5 +1,3 @@
-DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
-EBUILD cndrvcups-lb-3.60-r2.ebuild 2645 BLAKE2B d691db4a3275fde32c17916fa4d7df7c9986d77968c60330a4cba3b0e1b36617665ff22d722c45814ef88db11d67942f1e9797277abceca6b554cba4ae2481a9 SHA512 ff473b4b6f4bd5ad685184ddddd269bf8b2ab5d4071ee064eae50e9c091fa110e324c255b05f44a944a1a96f4b818fa59536d30ca5bab75972aee94b13b1ab3d
 EBUILD cndrvcups-lb-3.70.ebuild 2789 BLAKE2B f0f9f2a308e2c6be0ecaa8aee25fc3fb3bcbb64cfbc24936f7eae36130b4931581b1eb4806fb9c139a4b03458e781bf895679cc8664eee87363e01b87ae229b5 SHA512 7e8a3dc0abd17ea86c5680d9900513cf57ed470e13977b1a313a16cde1212ec1a96c45e82c076c0ade7b733eefe3a549f15e5e0ef8d19a2b3fc4675c4b2784c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
deleted file mode 100644
index ec74c2e7a0ee..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_PV="$(ver_rs 1- '')"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
-SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz"
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-	>=gnome-base/libglade-2.4:2.0
-	>=net-print/cups-1.1.17
-	~net-print/cndrvcups-common-lb-${PV}
-	>=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	# Don't raise a fuss over pre-built binaries
-	QA_PREBUILT="
-		/usr/bin/cnpkbidi
-		/usr/bin/cnpkmoduleufr2
-		/usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-		/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-	"
-	QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-	for i in pstoufr2cpca cngplp cngplp/files cpca ; do
-		cd "${i}" || die
-		"${@}"
-		cd "${S}" || die
-	done
-}
-
-src_prepare() {
-	default
-	sed -i -e \
-		"s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \
-		pstoufr2cpca/filter/Makefile.am || die
-
-	export "LIBS=-lgmodule-2.0"
-	change_dir eautoreconf
-}
-
-src_configure() {
-	change_dir econf
-}
-
-src_install() {
-	default
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /usr/share/cups/model
-	doins ppd/*.ppd
-
-	cd "${S}/data" || die
-	insinto /usr/share/caepcm
-	doins *
-
-	cd "${S}/libs" || die
-	insinto /usr/share/cnpkbidi
-	doins cnpkbidi_info*
-
-	insinto /usr/share/ufr2filter
-	doins ThLB*
-
-	ABI=x86
-	dobin cnpkbidi cnpkmoduleufr2
-	dolib.so libcnlbcm.so.1.0
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
-	for lib in *.so.?.?.?; do
-		dolib.so "${lib}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-	done
-
-	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(, bug #????
-	# Only needed with SYMLINK_LIB=yes #642138
-	if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
-		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
-	fi
-}
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 429925d9c930..8d60453b1192 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,3 +1,5 @@
 DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
+DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe
 EBUILD cnrdrvcups-lb-5.20.ebuild 6035 BLAKE2B d4c5b830c8bae5c7fd7aa30282d9471b1d3780ba7a1cd7f4b664f857948765fa4ecbd2470d2facbfbb9d99df42bef1ae91aed8ebf31f2819cb9bf5cf0dc724b0 SHA512 47ce97b8735ebbdce29abd248930e9c878ed33bf29998a1fb1a8e7e81a4d703c1e069744b3990300cc742ed4486143cecd5ee9c0277a87c5825e769f1374c1b4
+EBUILD cnrdrvcups-lb-5.30.ebuild 6097 BLAKE2B ea33b9b6a56e0d82d650a5e3b050e2c85ca19da2720fd6134e7ca8ad00b40156af6182ccdb32dc7dfc9142ef5afbeac2bb0f91e97206d5036115e55fd7242021 SHA512 25364fb6fede9f5229edae1eda27981f1fedac5fe63735d6dbef3382bef1cfad0e863b30673ac5b68750d34d5ad4446bb072acf762c132992e3b1ec847aa0f1b
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
new file mode 100644
index 000000000000..d0658f1dbbaf
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="12"
+DL_ID="8/0100007658/20"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	media-libs/libjpeg-turbo
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.3xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 318426afac99..c2e901261932 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,4 +8,4 @@ AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078d
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
 EBUILD cups-2.3.3-r2.ebuild 9670 BLAKE2B b9c176cbbd4f2a608a818112dc84be693941e84b454d1620fc430b6afc20799354a5b10df321c1bbb0c018378b5257db7f36fcb2003f2ef947416cd0710bc9c4 SHA512 46901ac1b2d5cb561ed99f2383d70dcfe8faadf674d08dfb54e0195e8f964210ae3533985407fb56153f9fa279b86273f141eb55468bff956de10d47e0380df8
 EBUILD cups-9999.ebuild 9594 BLAKE2B e7f43aeed561ba4eae3938b3739845286d3ff80ddd19140361d39a80992697eaaad2c5d845970a6d9c53124064ad986f3e5fe4d9a7e2f88ca949ebb46dc8719d SHA512 4f9a3bd84f529de97f25c3c400148ad28a17517cbed402aa1f1a1107c9321f9071eef04dd9c6e173d88f64b44e0c9a840b54667a43e214505ee9557de2c0762a
-MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d
+MISC metadata.xml 527 BLAKE2B ec1e13892e9264410a238328b21d77c2aa686674e3427d4bf04afedcf3e9d14927060eca98e8cfa1e1557c707a50efec3c3d5532e83470cba59acd912116717d SHA512 8db4eeb1ce4597679bf88c5657b7bfde4f8f8a40814c81624103172c22b65e1fb3354c183e7de1b37ba72621e29397d3510458048f78f4a4c99e7ddb669e7adb
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 487c6ec99fc7..aa7c978659f2 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 2cd104253f9b..ffa32a33563c 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,5 @@
 DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
-DIST hplip-3.20.9-plugin.run 11515336 BLAKE2B 27686828374675412ae82a0a5be121c87dbd9ed3adb8d5f30e2f946e315140a5641fdbc60d7f952323060de7fb7bce77b21f19e0d07aa0c5c36e898732030b8b SHA512 bbb5c5768c0f1e88f960f9decff65d70942bc40d8f0443fa2e1c0507895e2e6ba7bc8e0fbec5a74b335787ac45bd3c34cf6bc4d5e544ce7c2ef0965e074a440a
 DIST hplip-3.21.2-plugin.run 11514233 BLAKE2B 262f23c34632f7ba4a9c6e1c4533d0fd44b025e476c0f28f0fc68bc401430c503233583ae381d6c74a89a996b750603910000c6fdc6b0b606e32d56c82ed07f4 SHA512 62f3b6e369bdd1b2145f814901314c78ae5d7426734c92b0511f8ea4a925e24880875a1cfd1623ef800dcfdf3cf5b1c5d83032a19ca200547a4555b0d944f8e6
 EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
-EBUILD hplip-plugin-3.20.9.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
 EBUILD hplip-plugin-3.21.2.ebuild 1450 BLAKE2B cf7324d47c0f4a35330ce330cd5fb8baa53115bb31e5a8c2c0c7f13c36fb94dafe3c2bcd28683d41f9bf2aa422e458199c7ef60e43ef0329d7aed6fcc4137a9e SHA512 1df3857bca658e7b0d85f08f05c90aba6bbf5fe934c485338d6eb2d99578409f2c643a4421b7b6af8789e209c19305f45c23408b840c69204308f519edceedae
 MISC metadata.xml 522 BLAKE2B 47eae04f2b9633c1707c451a53dbdd8d72491903525e04f82e6017cd4e1ce9a4ce71a488dd0afcc84401fa061d51bad545a8b8a3f50d378d5f19c33f2b43ec2d SHA512 8f1a5e7c4b50aa472433dc6e49cb4715731f146f29774ad4304d9e24f1ffbe2a4756bef024d01982d8c978208e5c47e5987a48fc2ad6dd3962fa3cfb68d01a31
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.9.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.9.ebuild
deleted file mode 100644
index 0524ab3f3cae..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.20.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
-LICENSE="hplip-plugin"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="orblite"
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/udev
-	orblite? (
-		media-gfx/sane-backends
-		>=sys-libs/glibc-2.26
-		virtual/libusb:0
-	)
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-HPLIP_HOME=/usr/share/hplip
-
-# Binary prebuilt package
-QA_PREBUILT="${HPLIP_HOME}/*.so"
-
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
-src_install() {
-	local hplip_arch
-	case "${ARCH}" in
-		amd64) hplip_arch="x86_64" ;;
-		arm)   hplip_arch="arm32"  ;;
-		x86)   hplip_arch="x86_32" ;;
-		*)     die "Unsupported architecture." ;;
-	esac
-
-	insinto "${HPLIP_HOME}"/data/firmware
-	doins *.fw.gz
-
-	for plugin in *-${hplip_arch}.so; do
-		local plugin_type=prnt
-		case "${plugin}" in
-			bb_orblite-*)
-				use orblite || continue
-				plugin_type=scan ;;
-			bb_*)
-				plugin_type=scan ;;
-			fax_*)
-				plugin_type=fax ;;
-		esac
-
-		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
-		newexe ${plugin} ${plugin/-${hplip_arch}}
-	done
-
-	insinto /var/lib/hp
-	newins - hplip.state <<-_EOF_
-		[plugin]
-		installed = 1
-		eula = 1
-		version = ${PV}
-	_EOF_
-}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 4ea29685906c..7710b1bd4895 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,12 +1,7 @@
-DIST hplip-3.20.11-patches-1.tar.xz 17876 BLAKE2B 39514399b4b43c668c38f7fe570fc53f50547598fc86ddf383b237a6992e9c24e3aab524bee0c7055003e766f8fea67cbe7c86ab4c23911d31ade0ad4766b181 SHA512 eabc26feca22e2d6dbafb9f40df5d61fde1fd08ac0cfb17751b0e179ecd6cc3ce6c4434746293aa372d9cca0bdc9b5d6bc96af9e199aeab5b3621e2c584fedc1
 DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc121e4eef0368b7eff04677ccbd8b897897352fe44a111693d0d45ee1b40bc3c783984f23a35faedfa2fa0da52018aade3c SHA512 8d00d48e295572df19b6edf0efce005f6bae6e051cce5d618575f5e226e2c32896111ddc1a193d4aacfadbe9d7f525761b0ea2564277f4c263b3df5bc86c1f40
 DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
-DIST hplip-3.20.9-patches-2.tar.xz 18040 BLAKE2B f218703f5e6f319306b6cd178eb9f91981eed0d0c06b14c6846ad8a79b1d92b66176856f7b8bb272d0fa20194d4150fecf066c11fff5996f32b6fd71e1d6237d SHA512 5aa16f9c4e829774ea9266f30f6cd9d78556ea4ed36abc57cb11975c097c8bfdc44f139f5b1236af79859355ef715ec27d47f187d330541b29361e779d972fff
-DIST hplip-3.20.9.tar.gz 26141198 BLAKE2B 3aa353343ee79ae04dbe94cb9e135469586a50c2052a21ffcff6907be40522a1605f1174b0b8891dea25abb83a3b836350e1e6c9d12ab2798aa826f1d3ce4069 SHA512 d2981cf51f6d893a576c51808710ac9815aa6ac5fdc617d95cc372518731a48b0aca09af721c1792e1531df6cf8fc0ebf5ebd7e9c96950602a830ceed3d441ae
 DIST hplip-3.21.2-patches-1.tar.xz 19212 BLAKE2B c733651a7831b54bec13b5f037b0f00ab53dbec193f73964d7bb3f8ee4e1dcd02a02dd793d7fc322fe34085bbe5ec281076757d8882b4eb7f85fd0e45b1c3200 SHA512 23c696b111fe098358eb609e64cedc2ee85f4a1dac8bce895e3c6bbcb96e62dd5d2d3f1bcc9d12d20ccd6717b23f92b3016c926df7c73f50ba9425542d08ed29
 DIST hplip-3.21.2.tar.gz 27014784 BLAKE2B b6a13f0d48f3052ad09b419dbe9b68605c85ed8f1bfb6f1ec9720b9aace4a1c6d17a933b0d55ba20dbbc3d389ba1d2751dbd9a71d364ad2e2e1617cd7613dc2d SHA512 73ba37275cfe34a58b81c9656514e15da67c1a69af5471ad132a1538d324efe640879cb7e60c359915607e41b63e653e7ae757661e553235f6e83e378ab46474
 EBUILD hplip-3.20.11-r1.ebuild 8358 BLAKE2B 0a34b0f2edcc359e8d6be786be926a0f45b4c53fd4abf2a57c412926317d56e8b71d2fe00046803f076ae478383aa2bbdd942d15aee3453c652d6446e0fee2d4 SHA512 ae3b53219779a699af2c554afae2fd61e2dc63f3dfb29fdb1d0f64b991a053a67ba4a5b8edcea9a0328f7c25bc19742de1cd25ac80923d474b7a5eda38034f9b
-EBUILD hplip-3.20.11.ebuild 8358 BLAKE2B 13ec36547d2632aa944d31eefa93e7a0062c4cf0b8888ffd9f3d194dc018bc50b9b689fe0e71c5488edb8d5c75cb0040bac7ea161d166c70a0d29ebd273b285e SHA512 8b70de2e1f7325a0294db3b180a48b9d1dea156780f4afd5699117e874c1ebaa31da6284cc0842861de5dafd640bc9e0ec36789eb36c768cc25dd7d34dd4ab90
-EBUILD hplip-3.20.9-r3.ebuild 7926 BLAKE2B 92ead4bcb3c5a07f3f0af42801b67139d364f19fd99556a7d1a940cbdd928f95aae0aa12cc78f08f5f0aebdbc7a51e373281f29e47f9d5fa40fda3011c73d486 SHA512 78bb08deaf4b9f78c206eea78433d92f521a5deda2b3cccf4cd72a0c61208a6e58677b886b5106fe393d5dd32fe462f103969dbb06af40cfe3b5640011c77018
-EBUILD hplip-3.21.2.ebuild 8365 BLAKE2B 5aeb6844475391e3c8c4c3d9b970df053170b425026cb54fc126aa01db85fa23b02882659368d8b3ed01bbddb8db2ceb921a963f4edb7f775cfb64eaa8cbc331 SHA512 7a32f8dd048b4ce380163970efb9955fec51f9715e7dcc35360149cd248cad0a109dfff3fa981daf8c668981831aa17a996d6fad1b3bdf313d403a3a62494e5b
+EBUILD hplip-3.21.2.ebuild 8363 BLAKE2B 89093b45766b819d8d23f22c88ab662f490cdf16ff2e8111622b2d43d0aae74b38be8cdbb1fa019426972d0b9b74ab1f39b0f0714b64b70955d227dbaec676e4 SHA512 6937f9ebefc528de29106b975fcccb28f7b710e099b0bb9c70340c2f8185d99c1d7d8c7dd7718f024a54a673e121ebc91737dfecb8bcb6e771f9c78c8d1f4f32
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.11.ebuild b/net-print/hplip/hplip-3.20.11.ebuild
deleted file mode 100644
index 2ef0cb3bb835..000000000000
--- a/net-print/hplip/hplip-3.20.11.ebuild
+++ /dev/null
@@ -1,288 +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="threads(+),xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.11-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	sys-apps/dbus
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!libusb0? ( virtual/libusb:1 )
-	libusb0? ( virtual/libusb:0 )
-	${PYTHON_DEPS}
-	!minimal? (
-		scanner? (
-			media-gfx/sane-backends
-		)
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp:=
-			$(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_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}] )
-			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	use parport && linux-info_pkg_setup
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-		ewarn "This also disables fax, network, scanner and gui support!"
-	fi
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-}
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local drv_build minimal_build
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-		minimal_build="${minimal_build} --disable-fax-build"
-		minimal_build="${minimal_build} --disable-network-build"
-		minimal_build="${minimal_build} --disable-scan-build"
-		minimal_build="${minimal_build} --disable-gui-build"
-	else
-		if use fax ; then
-			minimal_build="${minimal_build} --enable-fax-build"
-		else
-			minimal_build="${minimal_build} --disable-fax-build"
-		fi
-		if use snmp ; then
-			minimal_build="${minimal_build} --enable-network-build"
-		else
-			minimal_build="${minimal_build} --disable-network-build"
-		fi
-		if use scanner ; then
-			minimal_build="${minimal_build} --enable-scan-build"
-		else
-			minimal_build="${minimal_build} --disable-scan-build"
-		fi
-		if use qt5 ; then
-			minimal_build="${minimal_build} --enable-qt5"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt5"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-class-driver \
-		--disable-foomatic-rip-hplip-install \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--enable-hpps-install \
-		--enable-dbus-build \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable libusb0 libusb01_build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	python_optimize "${ED}"/usr/share/hplip
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.20.9-r3.ebuild b/net-print/hplip/hplip-3.20.9-r3.ebuild
deleted file mode 100644
index 50ee35f43251..000000000000
--- a/net-print/hplip/hplip-3.20.9-r3.ebuild
+++ /dev/null
@@ -1,281 +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="threads(+),xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.9-patches-2.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!minimal? (
-		${PYTHON_DEPS}
-		sys-apps/dbus
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? (
-			media-gfx/sane-backends
-		)
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp:=
-			$(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_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}] )
-			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-"
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use !minimal ; then
-		python_fix_shebang .
-	fi
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-		minimal_build="${minimal_build} --disable-fax-build"
-	else
-		if use fax ; then
-			minimal_build="${minimal_build} --enable-fax-build"
-		else
-			minimal_build="${minimal_build} --disable-fax-build"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		--enable-hpps-install \
-		--disable-class-driver \
-		$(use_enable doc doc-build) \
-		$(use_enable !minimal gui-build) \
-		$(use_enable !minimal dbus-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit) \
-		$(use_enable qt5) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use !minimal ; then
-		python_optimize "${ED}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.21.2.ebuild b/net-print/hplip/hplip-3.21.2.ebuild
index 729484bb5f61..c99dccee98bc 100644
--- a/net-print/hplip/hplip-3.21.2.ebuild
+++ b/net-print/hplip/hplip-3.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
diff --git a/net-print/kyocera-1x2x-mfp-driver/Manifest b/net-print/kyocera-1x2x-mfp-driver/Manifest
index 0d5ce0a4bdfb..3c88400a001e 100644
--- a/net-print/kyocera-1x2x-mfp-driver/Manifest
+++ b/net-print/kyocera-1x2x-mfp-driver/Manifest
@@ -1,4 +1,4 @@
 AUX rastertokpsl-fix.sh 399 BLAKE2B 14376b73ad961b4dba3064403c079be18492a2e0091f113ed127c3f18668a6abcd0cfdc587dc2991269ce3549049d5b367ed96da623ec851353c9a5b7a4dbdb5 SHA512 7d757297b737a4fcebfd91bde4457674b738bf227480d5bcbf5049eb332c215395bca7798cd1931592ada217b5d85806fe567bd1741d8fadc23b572642901d09
 DIST LinuxDrv_1.1203_FS-1x2xMFP.zip 5392941 BLAKE2B d39140d6bbf5d08d248739f2689ccd45d066b5568c3ba27bdcea34f2ed348e91d0b95d64c7e789dd08094ebda43a5fb6911efb9cdfcc43cf1fefd4af32fb18bb SHA512 afbe237d25d784a6202be01669ccb5e1f0f9a6349b6b74227723905529f23da6d7880b25420b289277020450286d02f579722add5c0d48c839ac44152a60d1ab
 EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3431 BLAKE2B f764815ab3b6f3a5e873016d183ae4b081e7de93fc9972f556caaf8342e4194d5bc740eb63701e690b86a0650b937dafe28c3ee9116a5f7fd4e83137acc19955 SHA512 4d1103d77579f41bded3ee5bd2c38c6aec04ed88e59cf3be31d80e30bb9510c3940a52ed8cb6dbf2e9b2fc183b9f4af6c5a550be6bf9ac8244567a5d96c836ea
-MISC metadata.xml 529 BLAKE2B ba4ec378b877456893586f9ebed9bf81643f650da1b1f13410514cc15ee4734ba07ee04ae1de56c9891b7a3d0278d7e34312de9dcc7f671909d66711e93fdfe9 SHA512 b0b99720ff90cee4eeaffe3639191500deacaef20283e5ef2bacbb4d1d10227d945beb12767bd46a39b98b9634debccebdede469d371315a1656c18fe4eb5400
+MISC metadata.xml 558 BLAKE2B 03efe37015e238930c1f6ae8d1e3aca25209a22c54f1bed66d2d11a7cf43d3bfb53c2c93145b1cb0235bb201fd80c3aa5d092bcff571451ed4019f8eb3298fd4 SHA512 16c0a918b96d98026df3fda4977e0c67e86945586af5b629e9a748a461581a5b410ee7af0e35fde1083e787bea58e8efd787811192ec1a93cdfd8d0cf74b92d7
diff --git a/net-print/kyocera-1x2x-mfp-driver/metadata.xml b/net-print/kyocera-1x2x-mfp-driver/metadata.xml
index ebe2cdf388d4..c6edde204c36 100644
--- a/net-print/kyocera-1x2x-mfp-driver/metadata.xml
+++ b/net-print/kyocera-1x2x-mfp-driver/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>firegurafiku@gmail.com</email>
 		<name>Pavel Kretov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-print/metadata.xml b/net-print/metadata.xml
index e4bb8b2933c1..40a932a55fb0 100644
--- a/net-print/metadata.xml
+++ b/net-print/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria net-print zawiera programy do drukowania w sieci.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 38e554d3cbfd..aa13dcff4370 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -2,4 +2,4 @@ AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf246358
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
 EBUILD splix-2.0.0_p20130826-r1.ebuild 2185 BLAKE2B 397a6da1a164cffa6e57b5db4938e80cad4ae2eb5e43c195c9a847dc9831e3859996135fcae4efaaaa689a7a0780273aaae8e55edf21ca3d6e438d5cb19277af SHA512 ff981508fd1641eca3344318846dbe55caca28f7a640c91a11c3b5da4c236ba3262ebfa40fa4782654bac026341bee2492f18d8e979e8da00b0059d5d0858127
-MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
+MISC metadata.xml 447 BLAKE2B d4cc8e6c1baa4deff65208c385e0a3291198efa62523401f841d217edbffb4f65d66bc74cfa543e923173439db264d6d8fd1f7e73dd2b972e1402093a7cce12c SHA512 fc6ef6dbcd39d721cdd8a2c690b18c3739a08b245cbbe8a65cd5d4ca452be708705e121f5a59b61e08d93f425697cfd4d57acf5e817ea5c6b91a5f4c16e9f17e
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index b1ff1594956c..a45c436ce155 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="sourceforge">splix</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index ed4136735777..dd76cd3b13c9 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,4 +1,4 @@
 AUX 3proxy-0.9.0-gentoo.patch 1426 BLAKE2B 221bc5e87ae399ef621e687f03fbbd57a1f8ecce74e7ec0ed57f9536a4d8195563b00f4249769fe8ba3a736fc0cc5ca0441d5b879da575c3aa888d912ded2c4d SHA512 183d45fab08cf86d542f49844c8cc3e0930cc262bd928722ef021ab4bda21542f30587d3c1850d89caffc29059f7e3b5b2f22f1b5bdab15d916556e7af1951ee
 DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83
 EBUILD 3proxy-0.9.0.ebuild 919 BLAKE2B cdafe11efccb3df2faf230c4c9442f7a8603cdabd86cd3f7f52f81029c75fd6913de09d04486e31bbbca0a98c34a6801a89bf72fc4c913ad3077a99e6557d553 SHA512 a5717bedc448ba3a8719a8538ed6921ca6d9f8906aa2ca6066b3de3fa9bb7891d677b1f790ee15a01f42986f1e2ed1bb4d0183193f0038ef8f53eac605d43c24
-MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
+MISC metadata.xml 1132 BLAKE2B 1111b34c8dc16b40a6dc6a794f1d11bc91c42a94a95874b598764b76b1690967d9b9f816f4529b4c0fd9803c2f30e4ef2a3f19d643645495c277c45c61544720 SHA512 916802478d4c216f27706feb20c186f703ec349b4d47d45f5384a766630167807a176c1cbae053457551564e5428df627c354d7a0456314c51f437d029a84d2e
diff --git a/net-proxy/3proxy/metadata.xml b/net-proxy/3proxy/metadata.xml
index f9ccb9ec7eab..f86063109ab7 100644
--- a/net-proxy/3proxy/metadata.xml
+++ b/net-proxy/3proxy/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>powerman-asdf@yandex.ru</email>
 		<name>Alex Efros</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 77ac59461f65..1a0a3218cdaf 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index fdea9d63c929..2de73b34c4b7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,31 +2,33 @@ AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3c
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109 SHA512 67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794
+DIST haproxy-1.8.29.tar.gz 2213262 BLAKE2B e63a437fce005f08615bc87937a7a38f404845f1d73fe1b06881c26ee7ab2577af2a409cbbd4df89b54274589780c13e1b750f37deaa31d27dd866d36464e767 SHA512 dbdb0c47d94cc332cb7a20558ee50b6e96781295af36f4e342799db8f9254f8a4b4f11d91004405aca4ece6d3d43b66d93f8a979238507e3db7a7c37af1573d3
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.20.tar.gz 2693943 BLAKE2B ff09ca70ed0644c190af73b691aeaced1b491289cf7f4d05dace9cd469bb47f6e8507fc210936b0489867f7e799220278a2b8076b2ee0b87b58e2bd62f1af9ea SHA512 804c0e46f2aa0495b796710335c9080c17b98ea0fa2d60a65eb3cdc51e960a76a13b4c34945ebed75766088836e80f8e5c8e40abaa8caf2c5a5cc4a449d1eb2b
+DIST haproxy-2.0.21.tar.gz 2696549 BLAKE2B 97f211a768006370d85c0b2bda539440ac26051d445d3430a8fbaa135692165fb3ce32e998fcf54e669d9a2e08a23526a769b841fdd36b69d484ec86812d0a6c SHA512 a2273928568ca27d164a9bfae579a4635afa57f8d52f576073758d26a60973bb713a49fbafa6173e3130ca5712efdbf4e214bf85b7530b23eb523b667848f588
 DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B eef039eaf2808aa7a9b824ddd8e5e25623fc2467d541d5c24f71e7308c167c8eaa8fa6f7356250388c40802aa0581ae02f370b973e8f1169048dea7a7eaea3dc SHA512 59c72cd5154a387849e3dbca87ef5a635508342e7690c5bfa2d325bd6c5a00786f3dc834903a8b81a35ea90d05694eaac17a87b17235ba02cd6657acfec9c69f
+DIST haproxy-2.1.12.tar.gz 2731180 BLAKE2B fe1d586c5f6a7844606d4b8cd8cb810464f0d7d5615d53e7d53e8d45eb383021952e419e2f00a9277dd9b92d2c62dad60db9dd7ea9a87e21a04c960287c05cba SHA512 e33735311b0c7f349d5f6aa88fd69e1e9838c08fdf793f6e0d27779cd0c165d9a85022c778be880a8284f62c3c511c2b2d16374bf466268c902045631a4fbff1
 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
 DIST haproxy-2.2.10.tar.gz 2904903 BLAKE2B cd9f3cce6797349190b1502377a25d72a75ea8bae53993ed43cba6b434efcffaf77336be383c131fed88d864eff4d9eda788b7ebc74bdeb2182a1890ebf93527 SHA512 b32d1f06dae6df1f266a6ea329dc1769db7153d373e778b7fc7406242b7b70b8e6dd0b9b2b9e38c9484d5f2528e35cdbf10502fab447deace12a5f9d655cff19
+DIST haproxy-2.2.11.tar.gz 2907128 BLAKE2B 76ce4d75e6be1b3e169fe1f2a3ca4dc104f7b0a7af308e1713ce7c235e45525d094bcff71853de9d78e9b6d32115b96616d3d86fb72397d8fdf7d70f375f2547 SHA512 bf05666a712710a1b99e6014a97aceb0a3e9a3184afdaaf2ae4454e8f444f6b85fd855c41c211882e8158d5939f81f1da2dc8468a6a778914e6caa4a9246a5d3
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
-DIST haproxy-2.2.8.tar.gz 2895932 BLAKE2B ee918f3f9e05a99266bc27507daf5b42073ff4b51708db052e3cadc10bbd5de0f9e458925ef47ce4ddd30e1d7c292d82092d9a4cb971c18eb0577b94c1c144b3 SHA512 acbdd0b9d186b7d54a161247ae3e35017a8646ac2724ae8cfaa662b4dfbe495e0b321142d7b5a7af5c71a817cfe8156aa8ec5980a64f3d88bc5c5590b9e88886
-DIST haproxy-2.2.9.tar.gz 2900486 BLAKE2B b468d71c3caaf660b5cd3aff0d6113adf169dfb26254d7d759eb6f979a41e0ebfc754956d914391f0463ba6989609b0cc0c33bf46e34e8472fe471f8020821be SHA512 579af88b53c626ff05facbe452e28e3dc8195579be7c02c0b64d2a241332311b41ff3f0b38557fe342d663d4b94be1e0812db6804042139cef943cfa79b8a246
-DIST haproxy-2.3.4.tar.gz 2909672 BLAKE2B 4d1b3e6aaa13c30385056c4cefe86c5bcdc98cd34a94ea388a115e2fe547242fb68a9e4b2e22cc4990db16c76eb220d52999209958409bfda7a777eee587b947 SHA512 b6db7f6c573f700ce5e2f533c6b60c5e5cb15fbc31057f3e98c03144c52b87612420e962e5e8ba63176eb1b7459a956c80a0403e9189cb3fde1dcef5bfa64ac5
-DIST haproxy-2.3.5.tar.gz 2915064 BLAKE2B ce52ab3226bb03a39aad7c94f674b646eceaaf78be1e20fd48b9173fef6cfb9e8ea1db9cec9944b7c916d317efab8339f08a20b376b4331e0744bd9d4d26a03a SHA512 1d7d191b72157b9b504fd5b58a50225c737491b03b1ed52de4eb61e0cc7898abae298a1fee1c3a576a7de88dd6df5f0630906001046d26c0dfa3c4bf0cd0de50
 DIST haproxy-2.3.6.tar.gz 2918082 BLAKE2B 52998996c48b1ba9aaa1437ea2c5bdadda00dce58a7c1cbbafe686997a3b6fe03622986c3f5cd4dd7e3a982047e1a7c295ce6e6de2a65d36546b5e6dfff07800 SHA512 46000e08698db7a25d37b0a7e49b8c69e41eaef3cf17ea21bfda5075737110f682b8454196a72f09932a8c0bde0321e8cd075169cda840e2283aeb38bbbdf719
+DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab SHA512 ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec
 EBUILD haproxy-1.8.28.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
+EBUILD haproxy-1.8.29.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
 EBUILD haproxy-2.0.14-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.0.20.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.0.21.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.0.9999.ebuild 5239 BLAKE2B 3e890c8af0d46e57e321b2942152ef13ff35a20f2b4250d1c1e7f7689d35c51c49d84b9fd3a95256ca0b1870577e40a500bee1b5d0a8f4676185b33a3a0f371e SHA512 5831d7d419c71d4ccf32a37be69d4409b35764c45684e4d795edc538c3c8fc029d63773f7ef64c93ac7f7b233d15b443186e656c12bc2daca8971c18d06693bd
 EBUILD haproxy-2.1.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.1.12.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.1.4-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.1.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 EBUILD haproxy-2.2.10.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.2.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.2.5-r1.ebuild 5417 BLAKE2B 21ad458ae0384f80859a1aea97d03671ddd001c60876fd9c0d596ad25da28e8c12a9e330ea7afcf3bbf68941fceb2995853f9a2833b3c6acd8bf5237454599b8 SHA512 1ef5ed092ce62f2b21bcd04e7a49ad3dd02573d6ddb9f87b54fe54c8b27b4b82fa19a267aa75f3ab09a8cb839cde6df8677a1959492f99a2ca83b316467392bc
-EBUILD haproxy-2.2.8.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
-EBUILD haproxy-2.2.9.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.2.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
-EBUILD haproxy-2.3.4.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
-EBUILD haproxy-2.3.5.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
 EBUILD haproxy-2.3.6.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
+EBUILD haproxy-2.3.7.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
 EBUILD haproxy-2.3.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29.ebuild
new file mode 100644
index 000000000000..038c860b3686
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic 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 libressl 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 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+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() {
+	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.2.8.ebuild b/net-proxy/haproxy/haproxy-2.0.21.ebuild
index 09bca46c32f8..09bca46c32f8 100644
--- a/net-proxy/haproxy/haproxy-2.2.8.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
diff --git a/net-proxy/haproxy/haproxy-2.2.9.ebuild b/net-proxy/haproxy/haproxy-2.1.12.ebuild
index 09bca46c32f8..09bca46c32f8 100644
--- a/net-proxy/haproxy/haproxy-2.2.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.12.ebuild
diff --git a/net-proxy/haproxy/haproxy-2.2.11.ebuild b/net-proxy/haproxy/haproxy-2.2.11.ebuild
new file mode 100644
index 000000000000..09bca46c32f8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.11.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic 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 libressl 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 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+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() {
+	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.3.5.ebuild b/net-proxy/haproxy/haproxy-2.3.5.ebuild
deleted file mode 100644
index b7ea2373967e..000000000000
--- a/net-proxy/haproxy/haproxy-2.3.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-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() {
-	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.4.ebuild b/net-proxy/haproxy/haproxy-2.3.7.ebuild
index b7ea2373967e..b7ea2373967e 100644
--- a/net-proxy/haproxy/haproxy-2.3.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.7.ebuild
diff --git a/net-proxy/metadata.xml b/net-proxy/metadata.xml
index 32488608746e..073272b1ee8e 100644
--- a/net-proxy/metadata.xml
+++ b/net-proxy/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria net-proxy zawiera oprogramowanie związane z serwerami proxy.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 13957db52b84..d268968f6575 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
 EBUILD mitmproxy-6.0.2.ebuild 3113 BLAKE2B 1512ec1be8f45885f334b91363fa2cc61b46cf56bcd3a713bb6a760712d4862e745304c190e63b8babb7c2990c38176dfc014e7111349e3086452e94670addab SHA512 d2ae20195230d170131edce5fae35a01e9a54ab41eb8928f8a832d4cfad0297066fa320ba47ef0bd84914324462389399a031801529491abe570cb1442798c15
-MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
+MISC metadata.xml 1065 BLAKE2B 55b5f921dc3e44fe0b1b1a0957fe579d2c358996e4a0f6fcd352303e93749859474e56d639a4cd9f6ef152588c445a7bc88b58841209f6c64761a77f61865e31 SHA512 f5042a78818a1e00fb2157919aa9c6918a953fa55d775b8fd52f6549cbeefc138fd525c9c885186b4b047efb2c5b4d46e74cbc93edd3280a4220fc49b3a7f4e5
diff --git a/net-proxy/mitmproxy/metadata.xml b/net-proxy/mitmproxy/metadata.xml
index 1d76cc4073ae..c07ea5906c9b 100644
--- a/net-proxy/mitmproxy/metadata.xml
+++ b/net-proxy/mitmproxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>
 		<name>Matt Smith</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-proxy/sqtop/Manifest b/net-proxy/sqtop/Manifest
index ed00dc99671a..75928dd510ea 100644
--- a/net-proxy/sqtop/Manifest
+++ b/net-proxy/sqtop/Manifest
@@ -1,4 +1,4 @@
 AUX sqtop-2015.02.08-ncurses.patch 994 BLAKE2B b60260392ddfcc501c3412c8788ed069303ecc58a7846943cf52f6d82edab021fb8a3fd8f3429c69dfe3334f147f441ca176932d48a46c54201aa0d62ef59fca SHA512 a6f2a8516ca58fb37184495ddd1e500f42e08c72b03ae55aefc1d1ce587801e2ef62a507e3edf5822544cafc189bd624efde01b07d4e100e536b04975cf82679
 DIST sqtop-2015.02.08.tar.gz 154535 BLAKE2B 4825a254670e5336acbddc8ffb50c7a423614c06fcf9b69b354e3ccf88496bde17ba586bf45cf062a4da40e2332b84a611b50582e425278a259cc27a23f53f7f SHA512 35911b2d4aaa6364ec52bb55264372378b4a458268cfc2e03884660576014739a55e255eb751a9be54b70d4504f16d095b6cf9db08ff5889d52fd2a46ab2033a
 EBUILD sqtop-2015.02.08.ebuild 549 BLAKE2B d9725e8fdea80cda5f964c8be21d36ff0f4186ba3c5560b3a74f6644c1e86d1b6c25e979dc7df5c3c09dfe44d90a761b4823b58f9fd9c3b7b537d86136eab1e7 SHA512 dca409a3d9af43a430439ed529957544d17a51baf60959d7a8dc7968801ee0ffcecd4cce8143a29c56d58f63c57b73d397d01f158d70109d647d9ae02a7ce7d6
-MISC metadata.xml 545 BLAKE2B c2cad7b255d8a4d69293b31c1d4049bebc4dab2a5a8035196a87ac5cfc346f3abd625b1113e92f410bfb195ea16cc0bbd28e809fe148bc8a0060b241539a0e9e SHA512 37585b61eab296899a5b85ee9ee881dc12e38359d8dc0bbe8fd246a317e0c7d05ba0ff658d3dd7461a59c0e9fc9d4b7278b732e6b92e5ceeea50ae079aaced95
+MISC metadata.xml 540 BLAKE2B 18d3d6cfa9c79be051b8bcfe05bd150f2979f310014491fd74eaf2def9cfc245e8842276ddf5dbfdf3c3b6d4f7cb43b353d798ec364ee04e0efc841d85f9fd6d SHA512 2d393ff9dddc0f4e4729476990a0c2b4c3d32d6ef551cd62eaf660366f2f938bd28e093cf3e313630861c0d6290c4705c42e6a50c0e8dc250ca24d962bb6b2a2
diff --git a/net-proxy/sqtop/metadata.xml b/net-proxy/sqtop/metadata.xml
index 3188f79afec6..58d27b2f453a 100644
--- a/net-proxy/sqtop/metadata.xml
+++ b/net-proxy/sqtop/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
-		<description>Proxy</description>
 	</maintainer>
 	<longdescription lang="en">
 		SquidTop is a program that connects with Squid and shows a live, top-like display as to what Squid is busy processing.
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f9ca2058af85..5131549408e0 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -6,6 +6,6 @@ AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f48
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.13.tar.xz 2452752 BLAKE2B e2efdfda736f2324c6723e76272c4989a41fa6d0f52b48cc33957ae8e57e75350487d9683fc72c43926e5d91b698eef728282895018b78acefe23de2e67cfd74 SHA512 06807f82ed01e12afe2dd843aa0a94f69c351765b1889c4c5c3da1cf2ecb06ac3a4be6a24a62f04397299c8fc0df5397f76f64df5422ff78b37a9382d5fdf7fc
 DIST squid-4.14.tar.xz 2452892 BLAKE2B be8d8fc17b6b762faac0e6fbb5e428fc48b3f958b27f9da9eb941315c22185d34edb9fec73518626b6d5a7206b43f209638dc6bb874d52d6e183e5646874a668 SHA512 3509caea9e10ea54547eeb769a21f0ca4d37e39a063953821fc51d588b22facfa183d0a48be9ab15831ee646e031079b515c75162515b8a4e7c708df2d41958b
-EBUILD squid-4.13-r1.ebuild 8363 BLAKE2B 191c4ae5b5711aad2485173760f535dd4b36e02b49f23f5b394831510669533ac6ed1c8467d56651c90bd7faab07141efb34c5fb2347f1337a4209092700ad6e SHA512 c1e272f8ed510e9199ece9e952c18fc96d5c0a2e7bd7d301efaf99f0c89a4ac0c81f865eabc750fabc467b9719713cebd1410c72075568c699ba301ad6e3c358
-EBUILD squid-4.14.ebuild 8368 BLAKE2B 7cecd979db250eb02b6d7ad09ae544013a9c5adbb56e8f182b7a1c432b1d37c4df2367a87b594b2b02edb5764886996e9748cbb33d522176ace3961fbd611782 SHA512 ed8a2854af15518dae29cf210b134affa14b56fd46468e9c7e6c6de5c8bf8c6979a1662703db0d2e6954e724420687096ed68e0e2b7a8c9e16a3806f21f2e363
+EBUILD squid-4.13-r1.ebuild 8341 BLAKE2B d447060aeed4f41e59433f76c539033df3844b78035d1ef8d55e8ff626930e1d55b1334f105ed8abb6d3afd7d5b107d994aac01ebaf6e0c8cec4b8efdc154bba SHA512 e2bd55da9c76e8dca34d86097a6cba04c859885632aa30ce977ec331a62be9be00cf0178e8b3779b66005b91006e7f13f1444fe5cab99d4c588a76fabd7f9f6d
+EBUILD squid-4.14.ebuild 8346 BLAKE2B 42885b35dc8d188515d6cc143ff0dfd2ede4b4ac95d4036c652761b2b5910d8933e189fc411126f4045d216c51da935c28c92370c4b0aa8bbcb2a1aecaf13290 SHA512 517b4187ad5827c4dc8a03b70f189cc9fcce598c6c2693ca7ba662d2de1c3223970d3b1f10d99c3cfdc8b2073ac0dabed5a9c913b2eab36230a66ef0c9a009b0
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.13-r1.ebuild b/net-proxy/squid/squid-4.13-r1.ebuild
index 3b6b5c6f58f4..ce0034568696 100644
--- a/net-proxy/squid/squid-4.13-r1.ebuild
+++ b/net-proxy/squid/squid-4.13-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-WANT_AUTOMAKE="1.15"
-
 inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
diff --git a/net-proxy/squid/squid-4.14.ebuild b/net-proxy/squid/squid-4.14.ebuild
index 9f2974e7de31..68b0c1d35014 100644
--- a/net-proxy/squid/squid-4.14.ebuild
+++ b/net-proxy/squid/squid-4.14.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-WANT_AUTOMAKE="1.15"
-
 inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index dacd427624e2..2a816e293860 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,3 @@
 DIST sshuttle-1.0.5.tar.gz 88823 BLAKE2B 6a68be71a92c8245e2e60df1f425c6959547f8c2b972bdafcd774449c3779698c2549f2c7a3575c102158962ef9dd2edaaecec564f36f7f5cc84ed3f53b3daa3 SHA512 a9ebc8f8cf5ccc351796c2eb5b224b5d76908d23a367b768fa4e7b9cd8517ee7ff9c232c92ed4332f46d02d890ad8114f8beaa66876a8c0d7d4850c18ff4c2b3
 EBUILD sshuttle-1.0.5.ebuild 1251 BLAKE2B 5dbaf04536eab669f1525d69c5c58948c8d8abf9bd8b5c51a62949683cbe2dd4df2a6692f8e28de95cbde3de95c57bb83984ae0986da80ad86cd5b0db0e3f012 SHA512 9f6116c3e7483e8101b99a2e99fc91b3280199a808c5060588b162f9bca0dc41814eb1e8e55fcd1484e9fa9da0cdf7f466365d818d561b11c25697de8d79bdc2
-MISC metadata.xml 302 BLAKE2B aaef94f4b028c3f346523d5bbd42876e24fa82ab119c03a3db5c1ca40237efdbec97377b27584d3c307491a1c542d1194ac066a8c532cfbdf1ff9a9c1d06a6d3 SHA512 7e81df3d00fdf3c231e968d844a693c3d90e6e64c73f90b93d437331a2dafbc5d4f48bcb46596f9efb36ecb2c1d16ef2e37f50bdf8fa8e41e3a0ae3e3eff3985
+MISC metadata.xml 367 BLAKE2B e6db2a33d62c995db709010a0ebe2a50dc0307a1e9d7f5554d4a7e95f571b9323277bb7842394ddfda09f69b7d6f7cad44d31f6e3f233dbd488a951a225ea242 SHA512 cd75ae162e2d7142e3af61e9df65d5bb9f1b857ac299d5f05d7f1b2bf7adcf1b05fd55496ffbb4ed9579a3fab31f16295793a50c0475c75d6c7348d4c7794e9a
diff --git a/net-proxy/sshuttle/metadata.xml b/net-proxy/sshuttle/metadata.xml
index 7597a9dccda3..b08f0112cd6f 100644
--- a/net-proxy/sshuttle/metadata.xml
+++ b/net-proxy/sshuttle/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">sshuttle</remote-id>
-    <remote-id type="github">sshuttle/sshuttle</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sshuttle</remote-id>
+		<remote-id type="github">sshuttle/sshuttle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 860228e347ad..5c3b3342f375 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26c
 AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
 EBUILD trojan-1.16.0-r2.ebuild 1401 BLAKE2B 21d9c6dd44b740e96589dcad0b66d5cb5bbd0d92d9b8d19eefcc8e4860e1181ed3ceaa34126a11eca86d8093c41a77de01c3e819bc254ec5bc9ab051eab185fa SHA512 720b67a3c3a3b1eb1f599d94399e1f6d88267b949c002dd925f881b754fc180234d6fa30c47b239998b39058f1074c01ce0a2fea84180c4880d283ba54e62234
-MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30
+MISC metadata.xml 1154 BLAKE2B 1c11e1bfa8e0e6145f64eab2da457caccaf5eb610d2d58afe122bcf108b672264e01d1d69683ecf43a42d0c4dacf59ce82dc128b8f6bab954b6f154bdfc880e4 SHA512 ed2cb5b0305317aae0b1f32a59d0b283b1e2353bec1f5b2b444e1cef6a535f093d23d585c63512fa4f77ae8b734f5d8ddba833aa9b71f6361219bc0b194e8744
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index 097dc1718605..b8f40b3acec9 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>yangmame@icloud.com</email>
 		<name>Xin Yang</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 8db751a33878..50159459d341 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/metadata.xml b/net-voip/metadata.xml
index 10c52fd5b6a1..e0eb38af99e6 100644
--- a/net-voip/metadata.xml
+++ b/net-voip/metadata.xml
@@ -9,4 +9,3 @@
 		IP.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-voip/sipvicious/Manifest b/net-voip/sipvicious/Manifest
index 851d5da0807b..38459fe54707 100644
--- a/net-voip/sipvicious/Manifest
+++ b/net-voip/sipvicious/Manifest
@@ -1,3 +1,3 @@
 DIST sipvicious-0.3.0.tar.gz 43097 BLAKE2B 5ddcdf775db0ade6e61e77009c7991d8523db02dbdd6e8588c23f5cd6f4d2868dd1d78e7f17322cde67414b4eb2b8c89f2d4ee0079487e5f5f7ee75f4759adf5 SHA512 35aa3ea7d3cfd6f84716cd95a263357881196eaa180375d1f0a392a1478292ba9a8bf6cd53888448523f7faa447c82cc43fb1ef6c105a0e93e6c7854a51da172
 EBUILD sipvicious-0.3.0.ebuild 635 BLAKE2B c7501afb2f54c5730beec1b113fe81b4094cb5a5d07b2ead4a12365624d3a4c96188d23133f93f578494dd3aaf2bb3a1d60a485b9abd51d03aec736045a0047c SHA512 99a1feff751bbdc233efc448c25931dc58f981dbe622b7da604eb37c7a2b8b862fc66b06ea5942af300306534181185505066afb1fc8252a1b0bba50efa166b6
-MISC metadata.xml 399 BLAKE2B 384d646e1a6c4958ae0359e9efc9f48b11df594d9f6edc34f7017b52ed4023dcfb9838389357250ca7b2245927663335a40715b86adb9e121d2d72b69b765c70 SHA512 a98d9057299a04e6d653df23883f62ccac324b3e5c24727a18bf622d740b592a3a3ab701175af57703e602a40ee66e87326c5c186d8fe818b57ad0b9a6ba887b
+MISC metadata.xml 394 BLAKE2B 6093088cbd8cc924b25c352f1f9c4fd16c9fb324044921a050a8cf0ca1ce8c6d880efd9c5a546706b8e337009f844b06adcbdd8a3d471a8f0ac414ccd5e7ec33 SHA512 cc3241bb345e745497ad0ecadf948f8dd4d4250e7ac4d166ba34c039ab83639b24884d9feda43cdcb53d5b1d3b7e3f19631a67a1fd06e95abfc259c858c43ebc
diff --git a/net-voip/sipvicious/metadata.xml b/net-voip/sipvicious/metadata.xml
index 0bdf62d9254a..247a5130944c 100644
--- a/net-voip/sipvicious/metadata.xml
+++ b/net-voip/sipvicious/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
-		<description>Proxy</description>
 	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-vpn/6tunnel/Manifest b/net-vpn/6tunnel/Manifest
index 5e6543d90a50..16c096738295 100644
--- a/net-vpn/6tunnel/Manifest
+++ b/net-vpn/6tunnel/Manifest
@@ -1,4 +1,4 @@
 AUX 6tunnel-0.13-test.patch 3041 BLAKE2B c942ef9d53874a4e5048e8e3bc3366d08a164afd9da0bacbdc9aa7e5fb70a4e9f074f68c968c889fc126d4952237409740924ad4c010db42a948a480f93e6919 SHA512 564de163518cd67a46c04c6dbbd0400e82f6d1fc4035b16fefb430d3c99613c5d840ddb06543a3eeb26b096f2a4f2f9dc10924376b963d44e35bfe8466d9a028
 DIST 6tunnel-0.13.tar.gz 103054 BLAKE2B 4aa10cd798ff3e3ab1e78bf3497c007e63a3e0cef094f507976fa495e6b544601cd9a231b828fc21db35a45e67a9dc4f13b1339e82d4f198c842c9b1177b95ad SHA512 e495b561e2fe4483417cf44291d729377fe02123f21b7d58b9aed294c676392d860de7474b6bcb4e3e4ffdcd87752ee1af070dfbab028b5de5adb778b0241f72
 EBUILD 6tunnel-0.13.ebuild 402 BLAKE2B d0a3bc2570d4977864db9cd66bf24153e54deea2700bb3cbae1dc121bdf10d23e051b6a1288fb57974a73cf18b545310495fa6bd047f1d5b1f372c4f1d75f1e9 SHA512 13d0a4f8d4e71f687a76af41300a5c966920eef289dd67dc8855372a3ab74a5ba385581ce954461133e0d701889b289e299d721533c5e5a860fe83b8b48e9954
-MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/net-vpn/6tunnel/metadata.xml b/net-vpn/6tunnel/metadata.xml
index 9654d1c22bc0..6d821181d635 100644
--- a/net-vpn/6tunnel/metadata.xml
+++ b/net-vpn/6tunnel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index a3273b5df423..7a2510069d40 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/fp-multiuser/Manifest b/net-vpn/fp-multiuser/Manifest
index 359b19e28cb3..d9a63bc920a5 100644
--- a/net-vpn/fp-multiuser/Manifest
+++ b/net-vpn/fp-multiuser/Manifest
@@ -251,5 +251,5 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
-EBUILD fp-multiuser-0.0.2.ebuild 13740 BLAKE2B 6a6dc36bd472507317a2cbed413fcdc189989b11cb2939d9557628f6957d9517e87f7bb7f91ec31070d0fb8cb7e924a06012926085f377090c7c7bcf687ec5aa SHA512 861d13edc8861c898d41c733bb267f05fd2d65c67dff2afb77e8d599eadbfeccf5d92293f411cef94c7e020cb253b758c27e97e0f73d006c1557b5348d98da6b
-MISC metadata.xml 327 BLAKE2B d8a181b2bf6d159239d1163d26be2356d16bbe353083c259ea689b178fd5259ce492133317ac9c0e18e3f7559e5686df45f63d6b75d8030debfc4f33d66f6449 SHA512 f01c72a02201ce6278e3d8778a820079e39f9f9c8835b1d240b26d4d84ffa2f6945e68031511da0b38aeb26ec86ddf9233cc7fcd0f61dbb8901aeef49094be85
+EBUILD fp-multiuser-0.0.2.ebuild 13807 BLAKE2B b0b832f2a0821d828a67971551771b950a97aba57e5904819706c3146bf32cfe8465a5b16116ebca3d6aa82a1f7c0864fdd8e78736f640fabc3d4e19c7def7fe SHA512 e942a790122277c0f7cee8c438d6e9c1941f72efe88fb938eeead2a76b5ecf94d30f02dd44bf9210ac0414c12e79458a6cca060fde40941f4833ec211cc59a85
+MISC metadata.xml 327 BLAKE2B e2d7e49bd930bd5b780e82bd0edad42040351adf2c7e8d2e4eb7c4bdc377f6f5d80be8a8fa13c39d38313bc32db6ae7be587253490c683e79f455b4ad1d0174e SHA512 37dfef72461d2237d21a8f8b05521099a2113cadf3b423aaf026ca63de11e4a6788faaf93a0bf3279509f941653b3b2d57e0943e11345b3119409dfb60ac013e
diff --git a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
index 1e1769fedceb..ccee847057a1 100644
--- a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
+++ b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
@@ -280,5 +280,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}/fp-multiuser.service"
 	newinitd "${FILESDIR}/initd" "${PN}"
 	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
 	dodoc README*.md
 }
diff --git a/net-vpn/fp-multiuser/metadata.xml b/net-vpn/fp-multiuser/metadata.xml
index 375a00cfbe7f..472b44a68448 100644
--- a/net-vpn/fp-multiuser/metadata.xml
+++ b/net-vpn/fp-multiuser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 5a976df63faa..5e6e60632d1b 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,6 +1,7 @@
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST frp-0.34.3.tar.gz 1654276 BLAKE2B f0f4e0ed680e81e4f3cd6d40450f32df128dd052f3bd5029613b80649846c8ecfd2ada64d421628b6126787d4d1c72cd7165d8861afcb6ea3c48065274fed15d SHA512 12cf567bdd059b80a30572f4ad3b8809a1856cdc703209494ce55506d2abd763ba9ac097629d45cd08018371a7e9ecd464762f26f1b7ad7766aec834540088ea
 DIST frp-0.35.1.tar.gz 1891738 BLAKE2B 94c5f105caf4de1628adb37ec9073da1a24556dd693322e78a01b9dece06db4309e71eb5e72e1ee1770bc517b9885859323753f6400e57454e0635a0e5fa6a92 SHA512 164cfb7f82dbaeb31acecd9fe5bc5941f7b7dd7023c784ae7957040aa1ca9534065074f934ed4722fa97ec020dca366b5c6f522ec0fcf54bd494f4616814bc4f
+DIST frp-0.36.0.tar.gz 1898615 BLAKE2B 6e5168f336337fc2c4b947e9517d8c700aea7b993e0276928f778749581b81177bf3b0ff51f8c7c7f09c623952a5dfff659b0a04b1e8a072c7dee708626ee7a5 SHA512 bf2ff0ed280a650f100c2eddac1ff5edcb023c849f8d842fa8bc219c2b8c79749e73748be5d5a1f7dff11176fd5ee6b210ddccce758b062fcee38724f676d9f4
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip 13778 BLAKE2B cb389977b9c081b3531f0d62708b8f0202deb17ac651100343b6e59c668c7135e1eb0ea0c0dc4ebb953b6d8c8df40498e09362e8415f6daa8725e4c768813082 SHA512 0b87ddabac154fad7ea06ed88d28fc4586dd41afac9a2eedb2b0b3a695ef52354d3bb6f087c2422b88cc58778afa0e6a4da19fd2fb0fae5a125aaad79fc92d53
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
@@ -74,6 +75,8 @@ DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
@@ -87,6 +90,8 @@ DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
@@ -156,6 +161,10 @@ DIST github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod 32 BLAKE2B 264d6cbb20fc42667
 DIST github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.zip 6778 BLAKE2B e35fa2b2c6d1f533ad6a85d11cb45f84066140fb04dd2bf5f0c2a2e99519e10412db2aaf6b04c8fc72ab846a3740d01b9810e7a0c8bd596ae27552dcc423b3b2 SHA512 46b12c3e8c582b6ad001b8ce6a17bec7e932be86d048144e4fbac19ff563f038e29d06acb32c8977ad9a281268a9f7e77d8c07fa0c3f139ae3faed5e5c456896
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -187,6 +196,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.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-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
@@ -223,6 +233,7 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 B
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
@@ -241,6 +252,8 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip 66745 BLAKE2B acf0c83323e5e7a7444b615ca7bbdfd4c43bc9a5985532fec2cf80679fc49bf23cfa8579468fff501a1ada101b3ce84fd24223408e05a85408235990fffa20ff SHA512 b812663ce5f6668da2265890b0ec9fd0531bb128a69fc6cf3546ca9acda71b4db2d8be782f18d81665b060d0418ce6f92bfb69f6dcb89b18b0d5492df4505cb3
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip 348295 BLAKE2B 00276bc79832e003d0a5880fe6d24d1252d45d55170cdd29e1c380ed07e070a2320549c179fd905292b3c148e33d9222ba9f37ff6d09c187d1fa3ead8feebbb2 SHA512 267dfa1a02e23d3fe266a03936a11afb962ce091d6fc1f0416ba5f0af91ed32e013f540000e1b62fe9c41d70b10b65e91e7e783ed7dce6daded9dd6474bd462a
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
@@ -265,4 +278,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 EBUILD frp-0.34.3.ebuild 14655 BLAKE2B d802982165f60bb30ba76aeacc87d69eb077ad3b75ef9df269c3e61d024f6a93a93f06dc9cfe05bb95b231cfe2a7ab7ad7e1052bf00ce37dd7e9245577b73aef SHA512 b8b1470fca301d5fcb4a827314ab1e504fdccac8402f6a95020993b93ba9221b9f8b9caf7ec104cd2acdd3b4fd0ed2770da58c025383938b9326254de107d619
 EBUILD frp-0.35.1.ebuild 14474 BLAKE2B 741ec9499160cc22ee412dd0c15ec44e9e9b454a645d49224b50d346e426311947e7c0585f0bc782d09e7f87734854a57ea97d7277f032f17818e9b270414bb7 SHA512 34679d5909e4b091537c9ad6d0c93b835a4d3b495b0e65ed20d3572f6306c78fda60c6d74263240ecc68d24ba001173e40ee45c93e30c355cecbcee838d457eb
-MISC metadata.xml 321 BLAKE2B da589970f01ad628998bfc859fc74fb812d283e9fb9552bd28c5777873b22604c4f413cb0871b0f02c4b73c29b325e497e86a97d82ac855e050560bf04bebb0e SHA512 a634ee2b659ca8c3566d75aaf92b3ca76dc278aa444593695ace4173829df86e75a430da798ca62d6060082a5e3c5bc8ce37311324f1484dc68b6bf5c84eb296
+EBUILD frp-0.36.0.ebuild 14834 BLAKE2B 3ecab4c564f43c8d7c998f9f0a04eff0530b55da0ec18eeae0bc305aab87ee8a3aac20e69af9df73750ee64b94fecab9cf9e4741aac4c511118e2f27e8fc1058 SHA512 56c1592da3f8ab3fc646a25e0c4f36cb56a72d3760bddd4eb0232d1502034f5402a9b06db2162687ccb0f279a9e3c93af6c28f3e0341e23aaa4f036ece189f81
+MISC metadata.xml 321 BLAKE2B c85b62691116f50ab28135b4dd19bc6f1723edceceeec7c3c63365b9890afb0752fbaf68a0c6aa03d05f1141925e892772e48e074c184f8f2d12aad0808fe2bb SHA512 e5e3df080034dd2f3266b2f021b75e89a304847db9f04f26f163ae8febd9b1c5b4ecb4ad1c3936132a4fc39955ac8dd476b9b3375649c4fb350c42e6e693fe5a
diff --git a/net-vpn/frp/frp-0.36.0.ebuild b/net-vpn/frp/frp-0.36.0.ebuild
new file mode 100644
index 000000000000..4e92383f9f3a
--- /dev/null
+++ b/net-vpn/frp/frp-0.36.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+
+EGO_SUM=(
+"cloud.google.com/go v0.34.0/go.mod"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/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/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/coreos/go-oidc v2.2.1+incompatible"
+"github.com/coreos/go-oidc v2.2.1+incompatible/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/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatedier/beego v0.0.0-20171024143340-6c6a4f5bd5eb"
+"github.com/fatedier/beego v0.0.0-20171024143340-6c6a4f5bd5eb/go.mod"
+"github.com/fatedier/golib v0.1.1-0.20200901083111-1f870741e185"
+"github.com/fatedier/golib v0.1.1-0.20200901083111-1f870741e185/go.mod"
+"github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible"
+"github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.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"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/uuid v1.1.1"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/mux v1.7.3"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/websocket v1.4.0"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.9/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.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/cpuid v1.2.0"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/klauspost/reedsolomon v1.9.1"
+"github.com/klauspost/reedsolomon v1.9.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"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/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-runewidth v0.0.4"
+"github.com/mattn/go-runewidth v0.0.4/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/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/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nxadm/tail v1.4.4"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.12.3"
+"github.com/onsi/ginkgo v1.12.3/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.10.1"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc"
+"github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.1"
+"github.com/prometheus/client_golang v1.4.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/rakyll/statik v0.1.1"
+"github.com/rakyll/statik v0.1.1/go.mod"
+"github.com/rodaine/table v1.0.0"
+"github.com/rodaine/table v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/spf13/cobra v0.0.3"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/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/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047"
+"github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047/go.mod"
+"github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554"
+"github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554/go.mod"
+"github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8"
+"github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8/go.mod"
+"github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae"
+"github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7"
+"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/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-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/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-20191022100944-742c48ecaeb7/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/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-20200602225109-6fdc65e7d980"
+"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.2"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/appengine v1.4.0"
+"google.golang.org/appengine v1.4.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"
+"google.golang.org/protobuf v1.23.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/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.62.0"
+"gopkg.in/ini.v1 v1.62.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.4.1"
+"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"k8s.io/apimachinery v0.18.3"
+"k8s.io/apimachinery v0.18.3/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/fatedier/frp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	emake all || die
+}
+
+src_install() {
+	local x
+	dobin bin/{frpc,frps}
+	dodoc README*.md
+	systemd_dounit conf/systemd/*
+	insinto /etc/frp
+	for x in conf/*.ini; do mv "${x}"{,.example}; done
+	doins conf/*.example
+}
diff --git a/net-vpn/frp/metadata.xml b/net-vpn/frp/metadata.xml
index 916e25b64c1b..ce5d7f900ac0 100644
--- a/net-vpn/frp/metadata.xml
+++ b/net-vpn/frp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index b51517882201..13fe8ffb2ff0 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -5,4 +5,4 @@ DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
 EBUILD i2p-0.9.47.ebuild 6219 BLAKE2B f8f9dec30525d43bad24a7972fa9df12746fc70b4bce1931eacb07eab7dfe771d50ccb7d651452e37ab88aeda25e7d40254fc55b1723b8496e6e90279f16dd22 SHA512 e5a3ff6e87e53baf70f9e1f77302b500572345d42bea2a6706a39d422c2529162d7678237e7decd6a4f873f8e38141d98763fbbfefe6c7d5eddc0ad9d91b05b1
 EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
-MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
+MISC metadata.xml 739 BLAKE2B 68bcb6a0d90cad753651e15a66cf169d6a7649eecb25917bd03ca1489d7cfc7e49bf54f84ec05149689802f9ddedd4d6421a0c0281a4684a55b854e04e6c0734 SHA512 e161bd04600c577d14beef7e95a58da20661555a481a9993a56daaa0f219b15d1e2f5502464a407645973d84ed0092cefb172d8565ac4fca3b592dd412bf96b5
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 47d301c7bc15..643604a21186 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>tharvik@gmail.com</email>
 	<name>Valérian Rousset</name>
 </maintainer>
@@ -9,7 +9,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 0158fec9fbef..282ade8c9901 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -5,10 +5,6 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.34.0.tar.gz 1103199 BLAKE2B 16e16a0e396b22f5de797455a97322e51bc2289e770617106d4daa9a7cd6d1d94d4d84955e182493f3c11dbacd527fbb3f127bd4e2e555a7b04f7eb697213dcb SHA512 74c8234b850159c6e680fa61b20e2c22a0f04ca8397b4aa68f92fa20520fb74a63e442ac75c2fbb17dc1e5a193011b9b38085cee08746de4496620778aa7f027
-DIST i2pd-2.35.0.tar.gz 1105837 BLAKE2B 4480b3b4922d2a51d158366674ad7880b7710d3c2bc45d3e403330d3a8ea04a7803a1a7826b0d60c4f9837e84c2900b9635024846d0fce7d585e30ad658fbd27 SHA512 cffc41484a63eba7c7091957cd4d8b8584bb02580d70c69132f1447018be5b3cde7893ae4a0bcb914d53e95c089d4253ece6e20442c9da7810e7800a2b99b117
 DIST i2pd-2.36.0.tar.gz 550451 BLAKE2B 28ed24121a241b63d929c225223ebfea994ce993d715393db89199da123050f51a7b056205ed5ef6dd570c3ea51e0c56aead156ec5ebaeea8aef6a23daca9937 SHA512 7a1dc13ea4adddc5777532d5d50a4e7d1a8f8466983d4fc8874a38779723e213da0e09c831998688227317602c7e23b4fee0035367150c5fe3f338c595e872ad
-EBUILD i2pd-2.34.0.ebuild 2387 BLAKE2B e196864e0e52c694af51a72573dff6b670ca8babd00fd1bb47ad9ad39be97f7e4f0df16b41b69f3657437bc3074b40f5df76372a8c8aac6cd8b633de32437e4a SHA512 e47b0bb709174825dd6ca3d28e48589a00fc2eeb9a681f9c46aef379996965e2812bca136ffe7ea0e763dd0d6b88e53afa19d7fb2e22890b8e2e0cd35d048f0f
-EBUILD i2pd-2.35.0.ebuild 2389 BLAKE2B 8086ee44474a9b860277a1dce84e427e52f78f6145254ea2bca27c91b105b4f6655c791ac5dbe9d3041d05b291a6c6837fc85ddcb1c34ec2671373a265069667 SHA512 571b5f8966512c01eec2db167b4da80d45f4dfaae8b4b8f6827933a39a5b2b3a1c9fe2fb81f2d16fa42401953af070e5c062792d896a7f851f53f3f2ceabba17
 EBUILD i2pd-2.36.0.ebuild 2342 BLAKE2B 0bf8d05ce0a35a4586e6ba4b81f10c2d292eb5690166996eacdb4877266566da865bba7690561ee386076a645915d67109d68965d52f727778c583f6f9da2e41 SHA512 0cc7d8749eeabc5e59980978ac4d94f01765956aee09b2fee1a1bfc436e812674296fefa0a9e7a827cb01dc777600c85f44f5f0445d7918412c1fdfb89089825
-MISC metadata.xml 683 BLAKE2B 85b4a13c13c88a69ecbfbb10e60881bc583b6539a42cf4ac8d061537bb6c0ed55dd2d15ced732f69ce46afe4b0381d7d7233fef9ad8dad4a9eb51e49aa904706 SHA512 5c6c84f95f4264eb3a33cc6c0de0f0890063ba2ca3cb56852303f919e1c4a152d7a3b1c593c0ba066e5485ee9e843ffc2836ea89ed8ee42aa56c1b602d5a2a62
+MISC metadata.xml 727 BLAKE2B 2956a473062444342fb7436a09686b9774210105445288152df0e024fdf81b93b86782a1e3e5348ce8d4a2d71383db3ed63dd51dde00abadcfdce5f84819b37f SHA512 0362e22d09aa7735d12b66da01cc717704429750a57dc2cc625c2907525c935764ede0a83ef4908417542bc0afe24cb21ada71ee3100dffdb3d3b2ab3999da38
diff --git a/net-vpn/i2pd/i2pd-2.34.0.ebuild b/net-vpn/i2pd/i2pd-2.34.0.ebuild
deleted file mode 100644
index acc70c57b412..000000000000
--- a/net-vpn/i2pd/i2pd-2.34.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
-
-inherit cmake toolchain-funcs systemd
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
-
-RDEPEND="
-	acct-user/i2pd
-	acct-group/i2pd
-	!static? (
-		dev-libs/boost:=[threads]
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}
-	static? (
-		dev-libs/boost:=[static-libs,threads]
-		sys-libs/zlib[static-libs]
-		!libressl? ( dev-libs/openssl:0=[static-libs] )
-		libressl? ( dev-libs/libressl:0=[static-libs] )
-		upnp? ( net-libs/miniupnpc:=[static-libs] )
-	)"
-
-CMAKE_USE_DIR="${S}/build"
-
-DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
-
-PATCHES=( "${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
-
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=OFF
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# config
-	insinto /etc/i2pd
-	doins contrib/i2pd.conf
-	doins contrib/tunnels.conf
-
-	# working directory
-	insinto /var/lib/i2pd
-	doins -r contrib/certificates
-
-	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
-	doenvd "${FILESDIR}/99i2pd"
-
-	# openrc and systemd daemon routines
-	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
-	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
-	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
-}
-
-pkg_postinst() {
-	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
-		ewarn
-		ewarn "Configuration of the subscriptions has been moved from"
-		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
-		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
-	fi
-}
diff --git a/net-vpn/i2pd/i2pd-2.35.0.ebuild b/net-vpn/i2pd/i2pd-2.35.0.ebuild
deleted file mode 100644
index b33e89eb849a..000000000000
--- a/net-vpn/i2pd/i2pd-2.35.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs systemd
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
-
-RDEPEND="
-	acct-user/i2pd
-	acct-group/i2pd
-	!static? (
-		dev-libs/boost:=[threads]
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}
-	static? (
-		dev-libs/boost:=[static-libs,threads]
-		sys-libs/zlib[static-libs]
-		!libressl? ( dev-libs/openssl:0=[static-libs] )
-		libressl? ( dev-libs/libressl:0=[static-libs] )
-		upnp? ( net-libs/miniupnpc:=[static-libs] )
-	)"
-
-CMAKE_USE_DIR="${S}/build"
-
-DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
-
-PATCHES=(
-	"${FILESDIR}/i2pd-2.25.0-lib-path.patch"
-	"${FILESDIR}/i2pd-2.35.0-avx-detection.patch"
-)
-
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=OFF
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# config
-	insinto /etc/i2pd
-	doins contrib/i2pd.conf
-	doins contrib/tunnels.conf
-
-	# working directory
-	insinto /var/lib/i2pd
-	doins -r contrib/certificates
-
-	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
-	doenvd "${FILESDIR}/99i2pd"
-
-	# openrc and systemd daemon routines
-	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
-	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
-	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
-}
-
-pkg_postinst() {
-	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
-		ewarn
-		ewarn "Configuration of the subscriptions has been moved from"
-		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
-		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
-	fi
-}
diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index 412f0dd2b43a..aa232658c614 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kaikaikai@yandex.ru</email>
 		<name>Alexey Korepanov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>klondike@gentoo.org</email>
 		<name>Francisco Blas Izquierdo Riera</name>
 	</maintainer>
diff --git a/net-vpn/logmein-hamachi/Manifest b/net-vpn/logmein-hamachi/Manifest
index c9e08149ee4d..c280f774fbc4 100644
--- a/net-vpn/logmein-hamachi/Manifest
+++ b/net-vpn/logmein-hamachi/Manifest
@@ -7,4 +7,4 @@ DIST logmein-hamachi-2.1.0.203-x64.tgz 1622719 BLAKE2B 7be3e4a496adaf5a42c1d16fd
 DIST logmein-hamachi-2.1.0.203-x86.tgz 1368703 BLAKE2B 686149ccf57683d1a6ecae5d8f8dd16d793156fd5c3e95556ca4e12e9138f4bbc0eee1f4785ff684138a99e38a95156afa9e48e7587ed02d9fccbae7e8c9043a SHA512 b153dba334cf04abb9662c4c1fc576388bebdf0af303549e25c65536b3601f9c90e2a4c986898979d2abfc9fca2d31943e787d4ff3b59fc7147c2a1a1a1fdad9
 EBUILD logmein-hamachi-2.1.0.198.ebuild 1664 BLAKE2B cb03a1abd93e042fd0d2e21a4cf47660a3b7e4ce14eeaf3fca072a8ddd6c36b6ace2e553e0a206b89c59811a6deb8b956bc4b788a8b28f6bc7137cd66c109a19 SHA512 1e927d49e4ab0011d72dcdaf991ea47c654214d551a9b6f3e2d183c7476e5b9a217ccc692164eee17edc113053965df57215cda687ac60e5cb2027267e54e6d9
 EBUILD logmein-hamachi-2.1.0.203.ebuild 1657 BLAKE2B e847ff57a7b19bcbed8e820734a97684b67895d93546b17e5e430e2103368677dfe5d3f509101b03c28528328bda40a0818337b067de7178f3b74e735843fa23 SHA512 ffb6235dc8a0fe623beea21e413c005134e8f8d4e378f915cae675ef7c6de123d4e8b4b409b7a05fdd6fc8ccae0b9d88beb41dcc76b7f62800cf4f9fd18f6bd1
-MISC metadata.xml 369 BLAKE2B fe6662dd57c22af1cc6f1457203b94700d4aaa9823a69190a0d5e48ddc9f373d3ea4b82db3aa74d9f988aa9bd7e72b440b5098260c251623ceded717c5be3f19 SHA512 4fb68bdec268ebddb8fe16a71631f9e42c1ff45ee77e658840e5a336284f72b8dc4c0cc9ea3fc7157dcf9f78a5d5ddc885caaf5f549a699629aef42796a529f3
+MISC metadata.xml 399 BLAKE2B 2916fb8b2f01664e79f6a94d3b0273487c34a2e458c56641de7d695024c09572437928f4a18b79c484a05bd86823a5415458a10ae2e07b6111380c9c3727b079 SHA512 40587f52892fcbd93dffa78205b7967af21716d0c29f5bf9e6662cf2d3234bd0a888c0b7aef70c251a250b84ae349183d54fa0e3aac937e1c081cc79debf8dea
diff --git a/net-vpn/logmein-hamachi/metadata.xml b/net-vpn/logmein-hamachi/metadata.xml
index 14dde2333ec1..5a2380c0f5fd 100644
--- a/net-vpn/logmein-hamachi/metadata.xml
+++ b/net-vpn/logmein-hamachi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nonno.cicala@libero.it</email>
 		<name>Simone Scanzoni</name>
 	</maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-vpn/metadata.xml b/net-vpn/metadata.xml
index b5449d0bcb22..6c070c224d9b 100644
--- a/net-vpn/metadata.xml
+++ b/net-vpn/metadata.xml
@@ -6,4 +6,3 @@
 		networks and tunneling utilities.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index 7473bbe68245..caa5dfba5929 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -2,4 +2,4 @@ DIST NetworkManager-fortisslvpn-1.2.10.tar.xz 366700 BLAKE2B 5160d5947fe391b53a0
 DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
 EBUILD networkmanager-fortisslvpn-1.2.10.ebuild 865 BLAKE2B ac01c51df4c7cd3f0026c7a303c6c81e84190a30549f40075eef2fb0870ba6fc36b8c3bc629f1b4029d40ac9e2002116357f392ce90adb75f793ba9f20455cd3 SHA512 f7330641874fee8b36f1cf95b08bb9ef5de95c4058d0debeae2ceafdf6b899885e76919f9075e1e6c7e1ffb7adf9f820f77abd1d34ef15b0a8dae840a16961af
 EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
-MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
+MISC metadata.xml 410 BLAKE2B 611977709cb718457aa2b636d5bf2f1936a2c9035abb58ae7ff7397c72481ba4bd8e6ca156d4d5cde7797c508d39d6b62f2c2bc84be8eb7f27edd7dd978f5728 SHA512 5ce3ae870f955435b4ad18f62fde4af72c640bce9605f1d979ae6bf5c8c1a402e8e3ff265fe859554490e10a6a50d09a4e271d075a6ab4364a2882000eba9507
diff --git a/net-vpn/networkmanager-fortisslvpn/metadata.xml b/net-vpn/networkmanager-fortisslvpn/metadata.xml
index b7fa921dff8f..968b624509cf 100644
--- a/net-vpn/networkmanager-fortisslvpn/metadata.xml
+++ b/net-vpn/networkmanager-fortisslvpn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mathy@vanvoorden.be</email>
     <name>Mathy Vanvoorden</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index fd9ee52824fe..a99233c34c52 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -6,4 +6,4 @@ EBUILD openfortivpn-1.13.2.ebuild 761 BLAKE2B 8282264a7cba753bb9682a94c04e847817
 EBUILD openfortivpn-1.13.3.ebuild 762 BLAKE2B ce26d3b3dc03a3e5ba10d5bd61ab2a360e48d8476f8b232c30b38c2b0977696cb8be99a4773bb3b113dc63c34641d9f710ad60d888937c7f93bea190f47a43ee SHA512 6086c741a67ddd90474724986be6b5687b1f84c7f6c6c62217038af6a1e769e8f26f6927097317a00f7cb8ca35c72874c6541fbdc348d9d7597e0f14157018c5
 EBUILD openfortivpn-1.15.0.ebuild 762 BLAKE2B ce26d3b3dc03a3e5ba10d5bd61ab2a360e48d8476f8b232c30b38c2b0977696cb8be99a4773bb3b113dc63c34641d9f710ad60d888937c7f93bea190f47a43ee SHA512 6086c741a67ddd90474724986be6b5687b1f84c7f6c6c62217038af6a1e769e8f26f6927097317a00f7cb8ca35c72874c6541fbdc348d9d7597e0f14157018c5
 EBUILD openfortivpn-1.16.0.ebuild 762 BLAKE2B 789d77ca6458ba7fb418c0b06e25b4f53170c46aeece09288b8b9e345acc8fd3982ec634cd5f9babca2f6dd96ac8799851059ec21ef6714e0d93aeeff3f7c492 SHA512 6569e002ad836c4931e903d15abcc269f296ff09aedb2bc0892d11a62e2dca4d2933760497024229d2e6bd8af5d7bf5e519bf2e9ac0a75dcd9cf00725c871b35
-MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
+MISC metadata.xml 334 BLAKE2B 0ac69848f58fdaab21f61faa5787f4697af583d6d32d32892f0a7a4f1ff36de17e5d1a84c5bcd8e62840f056ba1d98f5b79663df5f70b29e229106c5876ad8ce SHA512 fd469e94226e0d5f087ab984ef89ba1a2c1e4939f174ae1a31dc7c53693b4bb8bbd3256273ee5ac04a6575e7177b4c802938c059f16c2228af5be7cac241f8a5
diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index 5ddf53689139..a4d3dd87a61c 100644
--- a/net-vpn/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
index a93a2546bd42..6c1dd5f6fadf 100644
--- a/net-vpn/protonvpn-cli/Manifest
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -1,7 +1,3 @@
-DIST protonvpn-cli-2.2.2.tar.gz 42989 BLAKE2B 4d96d193405a30e53b9a1204facfb797c946039ca093b7e5af69443e75d3e0e98d541956c9a54ddc5a6917c0d62f512ee0740c3d893b0779290ccef4b6276206 SHA512 892aad9e509eef978bb3d4c044f00f04d87ce35cb3d5c3a69129b7a99d50a46af84c9931d6d7249690ef60d7ea63ff01e09c4dd24c0a57eb8497bfc1371bd2d7
-DIST protonvpn-cli-2.2.4.tar.gz 640297 BLAKE2B a45642448e541d4c19a052480cdd0de2d9163a092cff36d3971f5b1c13d49fc0f23445e17ca71435b7aac5bb83efc17ec1f2dff19f481d552e81baec69228163 SHA512 8bdf7b0d13ea7c2c6172dde43d8008905e36792247a6c281dd1accf2b394f8117b50d18cba8652962984cf9c7e422cc4378b2c8fc57c24d0da353ca0a93a4f5b
 DIST protonvpn-cli-2.2.6.tar.gz 640528 BLAKE2B 546fbea204b9809035dae7c8e29094ad09ab70aea7eeb3e80c5c554c642a48d2823ff9aef04a5253ded9d131e560e5216d4f3985abd8f55d0a1a453760aaa296 SHA512 553cc6fa1ddadb50318b4430de6fb743d44078ca0b64b8c3ef86ed43d5b274fc527d0dd94eee882157dc7823611d305047df62ba8ea1c415affc5a0abf581ed3
-EBUILD protonvpn-cli-2.2.2.ebuild 721 BLAKE2B c80defd0642df86b32b2bd6b9173d5d875542faf44070637c1e55c0466fa067c6aa0f799f11db8e381fa523838780b0c39871f463de275dac678f7b9946547a3 SHA512 066577b0fb8e0f5dc014567a57d86ea8498d3ca0e80abfc4f5a02ae4c241b7bd41eacdad3c53d5ed622fcbef4ada3de9ab56e758250b494f43f05320f7fcf257
-EBUILD protonvpn-cli-2.2.4.ebuild 723 BLAKE2B daadf729bddb3dc0d5ab755d39040a828a93531a3677d1357a6fec4c61815e8f4823f11502d0699ea0ec89237c9cc0c52505cd898aac24b053acbcf79805cd59 SHA512 38275a7a0331aea7d20135d722aaa512f6a1f425f0c7ad4b4c033760cfeab459e5c5d2cc699b2fbe864ae3bd8a530bb15348e81a5f59bb433deb2f78b556bc0d
 EBUILD protonvpn-cli-2.2.6.ebuild 725 BLAKE2B 1f8954c156b802ab37bc6abb0222688cf5f225dbfc2e87d3e965a2b236951f8ca7321995712dd80252a01665446357cf4566767552e22fa15621c0398d6a5a24 SHA512 97b62a78bef8ad5ffbfae05a8bf10d6eecbc1b174d9bf4710e7d7917aef6a1bc94b818a59483affc4e0aacd6e04b5efb0576f9a151dae1961df310752d1ddaa8
-MISC metadata.xml 336 BLAKE2B bc23b58762a67e72e5a2080f20154f6e6b12903b856cfcc3cdc105246b66c41fc39dcec3d97267724f494cef84b7ae7ec446f2a4b8ee9ee0283abf5d7ceaf826 SHA512 ada3c3038cb84a38a4e2a0ae9371a19242f8d250297855769bbe1eeea05b5000415b946b963fd0fa8a12524caee5fe334ede05dd88ee024708755b5401dd5a16
+MISC metadata.xml 366 BLAKE2B 88c300f237cc523096d30319599c801201e9f56869376ea86d9e215c7f15fa44bb9700ee6c91d21774f1acf6476351ee048136da9bc0b1a239465d571d5df01c SHA512 fee70d4d1c3c4bbb1ef097667166916f52464b0ab9b2097714edcc9b476125a1eaf84321270b9428fc9d04de0d83624dad812918993f3f3f134303aba55bcd14
diff --git a/net-vpn/protonvpn-cli/metadata.xml b/net-vpn/protonvpn-cli/metadata.xml
index 6ad1720cb5cd..afc05336cb51 100644
--- a/net-vpn/protonvpn-cli/metadata.xml
+++ b/net-vpn/protonvpn-cli/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ilmostro7@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.2.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.2.ebuild
deleted file mode 100644
index 0283143cad6c..000000000000
--- a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
-HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
-SRC_URI="https://github.com/ProtonVPN/${PN}-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	net-vpn/openvpn"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.4.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.4.ebuild
deleted file mode 100644
index 5728dcf9acac..000000000000
--- a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.4.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,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
-HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
-SRC_URI="https://github.com/ProtonVPN/linux-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	net-vpn/openvpn"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/linux-cli-${PV}"
-
-DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 163adf24cecf..9958367554ad 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -2,7 +2,9 @@ AUX wg-quick.init 885 BLAKE2B 440224b688b1a1b4762bac7ac3bd6cb6fbee546543f1da70fc
 DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
 DIST wireguard-tools-1.0.20200827.tar.xz 94788 BLAKE2B d7d881a56819c028b37c11b9a44e3304a0f49250aa6ce3da894802dc2546b755f790ddd3fbc14ec1e0f653ead744434ee540c20226373122d131d7deeae94544 SHA512 843b70050d24f142262b672daee44cdccab508b52f42b19a32c275a17d40fd8fb66136a22ef2a4602217e821703bb36a261e474b465807308f52e6a0ee49e267
 DIST wireguard-tools-1.0.20210223.tar.xz 95444 BLAKE2B 59606684c08893c40ac14f9d021013c741f1ea80dc5a07946ec2597d8c91f6c8e1ebbc5714d04ea6d7d9356362a9d5598a578019ead38a2e327a2162d1d1a9af SHA512 98855853a3ecfce23a0a6bf4a885c85efaf2b08c9a92e0d3800fe40ae9adf05fdf4443150a71319bd9b53e314c8032694ea978db850a238813232a0c04edf692
+DIST wireguard-tools-1.0.20210315.tar.xz 96988 BLAKE2B d7b088a63fb386dc811f10681f6312572b360b211188630f7a76bb848ef01aac84205d62bd72edef2bac8a3e97eedccabdc2e092b8d70df8d7169d064d469831 SHA512 2ebc5e5a248f6b8c19cbb8bcc3c375ad339a16bf27e32346fb7cde21b9cfb1efdf877e0e5ea4a511f7cb69ff184a6731e76492e03cf490f7d49368e7f145b72e
 EBUILD wireguard-tools-1.0.20200513.ebuild 4007 BLAKE2B 0efa36293ed60bb34de6f09e42b8bdb83025a2682b782abfcfe130661bbcaa2ddd6564f7250fcc4bde7526b46f44b1b53d6bb0538bf2bddd74ee9f47f0af35a6 SHA512 ae2935a24cf5cb0289ccf52f51fd74dd8352a62105e921c627c04456dd3d0049bd137e4855707f8b5df43845d3ed79b1ffa1fe8e045a86ba0aa4b89b0aa7a7af
 EBUILD wireguard-tools-1.0.20200827.ebuild 4014 BLAKE2B 7cbfad529059e2e54e3e2d9c8aae986c8e15cc58a17679c8f315e4fa68d98f961a433f35c67c88e563978989be12f1a438b8a34861d09a6fe6a94645a5e535ae SHA512 5232fd852509d26b6014f9222c4d0c7e9b57bd87ba23bd44fc3d926d4e7818fae5b51eed9dbeb6633b7a2cd9e81c37b85b55c6e4ad6d427c78dabe7a186575fa
 EBUILD wireguard-tools-1.0.20210223.ebuild 4014 BLAKE2B 9e2d0b6594458cd698667ba230121761d5ac1f54e7525cc30d9b44b5b5dd093e0c142c020cf39cc1d1be6b3a6905e51d291b8a4bcbc4a641019bb759b24fc02c SHA512 8197b6fd9b9d9e9dc5e13e9842bdc42ea5390960570247df3721397fbc01ad7827eed04a5463039da0247182d6406fe3ed9926d8f06de184ba0df9c4382f26ec
+EBUILD wireguard-tools-1.0.20210315.ebuild 4014 BLAKE2B 9e2d0b6594458cd698667ba230121761d5ac1f54e7525cc30d9b44b5b5dd093e0c142c020cf39cc1d1be6b3a6905e51d291b8a4bcbc4a641019bb759b24fc02c SHA512 8197b6fd9b9d9e9dc5e13e9842bdc42ea5390960570247df3721397fbc01ad7827eed04a5463039da0247182d6406fe3ed9926d8f06de184ba0df9c4382f26ec
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20210315.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210315.ebuild
new file mode 100644
index 000000000000..b0ff48c21a8f
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210315.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd toolchain-funcs
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+else
+	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=""
+RDEPEND="${DEPEND}
+	wg-quick? (
+		|| ( net-firewall/nftables net-firewall/iptables )
+		virtual/resolvconf
+	)
+"
+
+wg_quick_optional_config_nob() {
+	CONFIG_CHECK="$CONFIG_CHECK ~$1"
+	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+	if use wg-quick; then
+		wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+		wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+		wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+		if has_version net-firewall/nftables; then
+			wg_quick_optional_config_nob NF_TABLES
+			wg_quick_optional_config_nob NF_TABLES_IPV4
+			wg_quick_optional_config_nob NF_TABLES_IPV6
+			wg_quick_optional_config_nob NFT_CT
+			wg_quick_optional_config_nob NFT_FIB
+			wg_quick_optional_config_nob NFT_FIB_IPV4
+			wg_quick_optional_config_nob NFT_FIB_IPV6
+			wg_quick_optional_config_nob NF_CONNTRACK_MARK
+		elif has_version net-firewall/iptables; then
+			wg_quick_optional_config_nob NETFILTER_XTABLES
+			wg_quick_optional_config_nob NETFILTER_XT_MARK
+			wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_ADDRTYPE
+			wg_quick_optional_config_nob IP6_NF_RAW
+			wg_quick_optional_config_nob IP_NF_RAW
+			wg_quick_optional_config_nob IP6_NF_FILTER
+			wg_quick_optional_config_nob IP_NF_FILTER
+		fi
+	fi
+	get_version
+	if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then
+		CONFIG_CHECK="~WIREGUARD $CONFIG_CHECK"
+		declare -g ERROR_WIREGUARD="CONFIG_WIREGUARD: This option is required for using WireGuard."
+	elif kernel_is -ge 3 10 0 && kernel_is -lt 5 6 0 && ! has_version net-vpn/wireguard-modules; then
+		ewarn
+		ewarn "Your kernel does not appear to have upstream support for WireGuard"
+		ewarn "via CONFIG_WIREGUARD. However, the net-vpn/wireguard-modules ebuild"
+		ewarn "contains a compatibility module that should work for your kernel."
+		ewarn "It is highly recommended to install it:"
+		ewarn
+		ewarn "    emerge -av net-vpn/wireguard-modules"
+		ewarn
+	fi
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dodoc README.md
+	dodoc -r contrib
+	emake \
+		WITH_BASHCOMPLETION=yes \
+		WITH_SYSTEMDUNITS=yes \
+		WITH_WGQUICK=$(usex wg-quick) \
+		DESTDIR="${D}" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+		PREFIX="${EPREFIX}/usr" \
+		-C src install
+	use wg-quick && newinitd "${FILESDIR}/wg-quick.init" wg-quick
+}
+
+pkg_postinst() {
+	einfo
+	einfo "After installing WireGuard, if you'd like to try sending some packets through"
+	einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+	einfo "test example script:"
+	einfo
+	einfo "  \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
+	einfo
+	einfo "This will automatically setup interface wg0, through a very insecure transport"
+	einfo "that is only suitable for demonstration purposes. You can then try loading the"
+	einfo "hidden website or sending pings:"
+	einfo
+	einfo "  \$ chromium http://192.168.4.1"
+	einfo "  \$ ping 192.168.4.1"
+	einfo
+	einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+	einfo
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7783f98e5e99..a5cf188b106b 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index ff5385e432ec..5a8d7ff09fd6 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
 DIST blueberry-1.3.9.tar.gz 1411969 BLAKE2B 2a11b12428166dce5dbeb00cc3813e9dea96b61891456622833400f7a9bb69a61317e9d6bdc862edce2c39f64fd04950dc793724338cb266ae365b1d10abee49 SHA512 7ee5e33daf0ce3b41bc3827042aa14ed4de1b58f862e76a50934d6beae79bf7e68b657461370da2e309d15c7ff858c8fb18aa7e891e7bc70e70c171884c5bb57
 EBUILD blueberry-1.3.9.ebuild 1294 BLAKE2B 01e308d3f27ada338dd083533ac90388687ae491da69728823af6dd0fdfd306e1d8c017085c806b9f1bb0434c50e20f581f5a1dd6bda4fb7c32bf576c1c55163 SHA512 6950743f6f657d0cf61602225c9594a4226e8912aab21709e6908566ec417ae9a0dd25d23d8b1baf3b563aa15b78b16b81f711f974930873ed7b18ed9c79c806
-MISC metadata.xml 463 BLAKE2B 43efdc9d7413050862806d176ede86cac0bb7656be890775b72447f59cd3406b995058eeec30bfa5b992817f04b62dc00e696257b08ebe02d7b8d360f45fd14b SHA512 a12f04991328d0092a6d3127a1b028ae620f20709d4c1c45587618c50d8d19216055b8dc6d5d3085758f39a21ea8a2fa91d36ae7138fed43bc2d24ca3c486b57
+MISC metadata.xml 493 BLAKE2B dc1b8b9993a0f35f5c76f345a5025545c68c561a906bc8cb6627e65ba94cde16960484c4477afb9769e2e26f35f25c6d49df3e678aef0578ffbd9f7b145b0ccc SHA512 49551111e454436f2bfd52b88befff6bcb06a9aff3130b1c4fcb1ff27974685ababf3e3100a7ffe087f7ed5c958081b9faeed56bbfa160b4d277a1061f4bcd16
diff --git a/net-wireless/blueberry/metadata.xml b/net-wireless/blueberry/metadata.xml
index 49b903bd866e..2de08046ca14 100644
--- a/net-wireless/blueberry/metadata.xml
+++ b/net-wireless/blueberry/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest
index 944da56f2de7..407ad3a8af21 100644
--- a/net-wireless/bluez-tools/Manifest
+++ b/net-wireless/bluez-tools/Manifest
@@ -1,4 +1,4 @@
 AUX bluez-tools-0_p20161212-gcc-10.patch 2377 BLAKE2B 80aeefa71c6096f6c6e61e326f67b5f727c4d262ab9daa9c501069bbb2caf89c651850fcf3ab226a026a9b079135ac99dac3e5b9f3056556dba9fc549abe07a4 SHA512 2b91be22769660c57d50a1269e03c05e5489550f5dcdce5b29bada4074f6ffeeb9ee3074ce4935b6684ab37ec132f2dbf6ecba056d1e860eebc586f65573c208
 DIST bluez-tools-0_p20161212.tar.gz 126613 BLAKE2B 474393862049a893280eeb0b7f466a1b1165a14d0ab33cbd9d3ca805a15eef237761aa3038423de85280bcaaf1385c3c7ab313d4cc3199f284aba86d8e5ed16e SHA512 ab5dd4a223348aab29fae22f552afae989b74d56c3fa46fd5587c100d63309649a10a87591bc040082545f45b7bb95360fcf6a48812012edbdb93570b0e166f7
 EBUILD bluez-tools-0_p20161212.ebuild 707 BLAKE2B 22ab18908817f92803bb305857bab3a629a8250e022afb219571807d63aefdce8a788f576671e4b226b9d7ac14920e02abe401a22545f41e5413d103aa5af9fd SHA512 adfd3b1a3137020fc9f2f59e8164073ed68891472d9f881d0d4da736828c0ff57ccff44482ac7fe3a85c28374e4edb10383d339e88d43c6f1baeb8c3017abac5
-MISC metadata.xml 462 BLAKE2B bdac336e57ba0fa55ce218a808b7466f0ad5bd5e0c2ef72d6245c0031724c685064b4629a6ef4efb17b4a9a68ed3f4561d84ed6536d3771fb46be8d9de64ff7d SHA512 030136f0e665679205ecc34f7bf1db089544369654fece04d02ffd0a058e86b5e3ec070f0622178d2405a4b08281d37ad9f22b082a900e783233984de9a1a185
+MISC metadata.xml 492 BLAKE2B 2786610579344c5bd0bb7193780e86f7e752cdb52e1b32396e4aa5ac51fc9524cb377dc84d25beb1a92943ffecbb6f01974cbcaa1230092a8ca426802a7357b1 SHA512 84e2814c956d33733445cdacc4488dfc6c9673fca4b94f286db592358aaef29dfd0bfe02e1226b9f63b4c367d9ea89b50ab641880ed72efc812120d1f8008003
diff --git a/net-wireless/bluez-tools/metadata.xml b/net-wireless/bluez-tools/metadata.xml
index 520bd08fd9d6..be4689873233 100644
--- a/net-wireless/bluez-tools/metadata.xml
+++ b/net-wireless/bluez-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest
index 79e72418e3b8..4028c8dad697 100644
--- a/net-wireless/horst/Manifest
+++ b/net-wireless/horst/Manifest
@@ -5,4 +5,4 @@ AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfd
 DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4
 EBUILD horst-5.1.ebuild 917 BLAKE2B f113b14134e3b483d0bf0bd0ab78ccfe9384f4e0c72384c0327fd20a462a17fbba011de4d655dbc097f3e48ae993d429cfabe07fef2220fa9eaad10feeec12b5 SHA512 9b0c50431ec08caa00866e6460107b1234c9e6e590539c562a5dbfd97b09cc597a30d470d00328b11bcfb8a4b828cf88776bc5b597894e51f279ce6743db64f4
 EBUILD horst-9999.ebuild 825 BLAKE2B f9319d9bfed03826fd4674ee90c2717937d5a3ed0a8d3407add274e10370395b6c9dadc76897e32422a90422223bbddde502bc3e741acfa778e80a43e848dd39 SHA512 6c8ab21a9518968fa94460396f80c13903b93ffb96165542f201ace57784d0ab8d7e6a1492c769d21ea1de5ace5d774de549d3277609faf6351e437764f13308
-MISC metadata.xml 384 BLAKE2B c5ef8d5aa073047775c3e6947ef3f7660ec56d3930058be1e922cba34834bab5bf163ff9173114f1047a9f9047c480e76de41911461f2c4efd6087fe3931ead9 SHA512 f44d4f5e884f4fdacd1f5d14d95362add156603fbacea7261c72fdcd9bc08671720093b4f7ccb8ee947481f74a558ed5f82da857835a219f77c5e4136ec339c9
+MISC metadata.xml 384 BLAKE2B 4b58a0f230d6fab4b7897fe317b8c8e7eef870d571e6372a2c6323802cb088e07a204a67efd4f8651cfddd72a94069eeab92e40731bc71e16d9f7f4fff9cb950 SHA512 b5d1bebecb7eee56ac5322acbb40f460b5c39020a3be287e2cad26d1c21ba428e07b8eadd7ad6984ad16371af10af6b5312ebd857fc83312d256cea2828d7363
diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml
index e5dffb5e0bcf..b195dd159912 100644
--- a/net-wireless/horst/metadata.xml
+++ b/net-wireless/horst/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>netmon@gentoo.org</email>
 </maintainer>
 <use>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index bf400b8950ef..cc937bd8ec65 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -6,4 +6,4 @@ DIST iwd-1.12.tar.xz 923476 BLAKE2B 08bc5906573da11df5e63b812f2d374eaec7c6051406
 EBUILD iwd-1.11.ebuild 4869 BLAKE2B c4e5b3c0a0601b8a561f7e78c202f667710110812829a9d21c7afff21ffde976132d0f7c5f3a1b5124c7e733437f4777bd982e7a2934d29ea7c57561e7da9043 SHA512 ea760d457c97ea0b66f9890bfa6e79c076e6b00c8a08e7b4f726de631303bf2391b1479bdca5e16ed41dfbbd59d4e8b2fab83bed2e5ba9a38eb79e5326a3aa35
 EBUILD iwd-1.12.ebuild 4875 BLAKE2B 0be71ea3c9df68883ec1404232922285863dd2ef8440f7155aab977e3ae0b76e2a06506d1f0640e7f5ad7b962ab761c9029368b6e0fdc23ce6d22c47127d0adf SHA512 e252cc9c24aa369b1ab9d44af316a82995b26dd7fb6f2e368411ae0a050c2093c2be2d08bedde10429304b1294fd1c13c6cd290baa0b5249524001d632f8abed
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
-MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
+MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index 2b83f954fd84..b1f0f475e086 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 	<use>
-		<flag name='client'>Enable iwctl client tool</flag>
-		<flag name='crda'>Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support</flag>
-		<flag name='monitor'>Enable iwmon monitor tool</flag>
-		<flag name='ofono'>Enable support for oFono SIM authentication</flag>
-		<flag name='standalone'>Enable standalone mode with built-in DHCP client and DNS handling"</flag>
-		<flag name='systemd'>Use systemd-resolve rather than resolvconf for DNS handling in standalone mode</flag>
-		<flag name='wired'>Enable ethernet authentication daemon</flag>
+		<flag name="client">Enable iwctl client tool</flag>
+		<flag name="crda">Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support</flag>
+		<flag name="monitor">Enable iwmon monitor tool</flag>
+		<flag name="ofono">Enable support for oFono SIM authentication</flag>
+		<flag name="standalone">Enable standalone mode with built-in DHCP client and DNS handling"</flag>
+		<flag name="systemd">Use systemd-resolve rather than resolvconf for DNS handling in standalone mode</flag>
+		<flag name="wired">Enable ethernet authentication daemon</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/metadata.xml b/net-wireless/metadata.xml
index e951a751b7e5..ba5e302a146c 100644
--- a/net-wireless/metadata.xml
+++ b/net-wireless/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria net-wireless zawiera narzędzia do pracy w sieciach bezprzewodowych.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index 33179fc99215..7c0f38c7c317 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,4 +1,4 @@
 AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
 DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
 EBUILD reaver-1.6.5.ebuild 735 BLAKE2B 94f116317650c8aaf24eace60400e4d1ec097499658652f4ea081070e749c31ee477570d34e5cf398b33029112f2439533b57930f5370930ea266c2bfd5be2e7 SHA512 2f893f1a8708c891746ed1b0ce56645ef4ad123d98ea6598dc0949502ff999476c4bae9c7f50088a6c71ca50d09e6ab86c7f6a882cac0121dfd12317d5424cc4
-MISC metadata.xml 355 BLAKE2B 0441e923879a9f8a7954b64e0199304de6092bef5ea75efe4e5d2ca7eca30ff42a2edf31619a7fc85fbd0df4e0962d6c05ddca9036845a2207629fc3634c923a SHA512 1f86b5d78aec2789666c397e0db47914e481b32a6ba0d9e7ffdadf336ede75b14c0f041f4017dea1947ea7b645e3710d5326365cbbba63455438558e59e17b0e
+MISC metadata.xml 385 BLAKE2B ca64729bdd808263dd218e797784dce4d9bd54f18b4c98c84ce6f4da6d5f208d7e2a0c3f41a35d393f5a9fcab46844254f8b28061bf12ff37c072cf3b2b35305 SHA512 d52ab1cec0be6e45af5246f5237facd7a7c4fac022c9e5884595e36cdc8b7213c316655e2ed0a8787d58d04d8016bb41ba10ef6c537ea86b256c0f28ed9503c3
diff --git a/net-wireless/reaver/metadata.xml b/net-wireless/reaver/metadata.xml
index 8bf85482f71a..9416562e11f1 100644
--- a/net-wireless/reaver/metadata.xml
+++ b/net-wireless/reaver/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index f98dd275ca49..9139f20b2ccb 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,8 +5,10 @@ DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f22
 DIST unifi-6.1.61.zip 152081465 BLAKE2B 821af3772db56eb4ae850302c86b91015a64cf61b00f3086b2b438579d229c0d5167beb9bda90bf6e26819dd1b334ec80c17b81c2bced16ea0730ffbcc711824 SHA512 a7d9beb789796cebc7a553fcb654c659880c76dc58803044388d6d789b8b4bc193e7a6a3da1bda981e0ea049a8015a70e04ebb2e69371c70f7abb457bebaa54f
 DIST unifi-6.1.67.zip 152163973 BLAKE2B 15f25b525f0b1bec4041d69817fcb7ab346e0b90e2c7ffebf390c45fcd7763be8f95b89f4884ce97fe1ffa024c6e8a34b5b731b4cc79f137d3bcfaed8af3fc1a SHA512 339efa414e2c2189b51fe8e8e868533117a6acb513758babb98f9b90b163a6df7034147ac56bee1e872dbff74fe2813183e02e0a13796f43e621b2c1cdef1a1a
 DIST unifi-6.1.69.zip 152157626 BLAKE2B 5c94680cbe82e48c09e9b131c2faa5a1dec71553796f38dc33c8ed3e055c9652b6311dd5675affb46b3159392653dde1fe08cf15366f52fdf6a216788f16042a SHA512 a887c18abe07f2ad6b1e472b30935acbf171f52295390c1860bc9ee5eb9e6882a2a1364a30e1e019404c0242a1f63aa1d4031ff60a4a8cf2a4c921ac4565defc
+DIST unifi-6.1.70.zip 152163565 BLAKE2B 093cfbd01a0212ac69a826f156a3a5e3b8254848726a30bad042b192ff0860ea608f100a373af9e91084fb46b4a306433533955edf32baa29edd2c6309973a21 SHA512 5a7e0672e164fc709659dc7d6d3bfe410bb3ec54c216ae2a51eda8f14907dcf69099d41f5d0a67fa1fc8fe53f2f64a1f144bc3c1d65eeae051bb8ca4e6b15d86
 EBUILD unifi-6.0.45.ebuild 1565 BLAKE2B 2750bd1a561a8e7bd0287ef38ec7b6fa8a799dcec219493388c009da1d4c2def69d765a86514ff13f647d8148ff060106382030b039755a43dcc69dab38d3f2c SHA512 6c0526d1b855a49aa2a81f6d91d0a514e54c7332012cc114302c5b73956ac7855ce006b08fbcf2c650c9a05910b145e6068bd4562685408e6032ffa71ed6f624
 EBUILD unifi-6.1.61.ebuild 1565 BLAKE2B cb11c323af66312060ab88dbcdf29e93b641e9776f4664d84639af6466ed6cfcfc25d863ab1596d174acaa5f2d711d9ce79f6b5304968b50d7ab9b4e801ec552 SHA512 2323ea28c61fe5a9aaa160a5c2016bd6cda9cd2b22ebd5513aee6f943b9e5b459388c067245b44655a9a46c8e8d495cfc9f9491b45112c1254ebd37c47fb9198
 EBUILD unifi-6.1.67.ebuild 1566 BLAKE2B a39869c0c6736619f5b2c1a041cff46bed4c6cf07371337f601b2f2fa509d7ec0f85b6ac906cdd50eedc430102eb688612844068a94c9b3dc6b9c7e12201162f SHA512 76702bd4146637385d0a0da32671ecd3f45ca31bcaf77382f351d282b60b997eb6ac74e93db5f4a2cae58d3418c5660e8f7c899b51f6f4a41798edd35188cc9e
 EBUILD unifi-6.1.69.ebuild 1566 BLAKE2B 16148233b935bc1c34599b71009dc8c2f0cd168f8775efcc58b9f464d650b98abfb06574fa748020167f78cfeaf57d0b87b8a898e4a5e1870735a738486c1203 SHA512 7517e618f1bb537f58536bdf19baa340983f4957aed0c0c9c6d124922767e636194725f7c6522ece00473aab0dced22f3c6fea4ec87e1efc980c396c8672a082
+EBUILD unifi-6.1.70.ebuild 1566 BLAKE2B a78edb42d2ab712e71bfd1f2bcd5222d738a076b92a9627abfb7d6bd34a51a597b9bae191017ef7b8b7c42dd7a29bb6c271832b4d66177e85f64bfe718e4f045 SHA512 a74c3fedbd2fcc1329a58b052992935e68b35dfc0f7cf6ee4426a1ba87aa7ece2baf2b0f051e926eed07467ab7b76da0322f32e770349f53fbc2f845446094e8
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.1.70.ebuild b/net-wireless/unifi/unifi-6.1.70.ebuild
new file mode 100644
index 000000000000..c2d18fa67324
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.70.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-fbf03b3a76"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.1"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index 4a4e8ae1e06b..edfffcfb6c67 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -2,10 +2,6 @@ AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f
 AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
 AUX wavemon-0.9.1-build.patch 1407 BLAKE2B 55ab2df35083d2ce08c8a0b0a1a48605b0c7d62254cc0622a298cdd6bcbd61b3845f8175bdbb9505ec31032b3649fd4fb49cb2739c4456496f8366ff2df85422 SHA512 5364a9a35d7c4fc7dbf4822d177dfd39bb36405453aae5d5844a1b23291a3e83a7ffc4da9dcd7d7d5ae62ffd906626e47331148e4d1b5770626464b6865465e6
 AUX wavemon-0.9.3-build.patch 1383 BLAKE2B 3c578fa5a08c8659706728b5612e22c991f2e6901e905f17c83743aad806023308c8ac8f73ef1af58a7f14b0382e3cab3a962aee616cf9883eb756d7bc9b6048 SHA512 61fb96ab56921dea52e4b834a29cb0a512a92db5b3c495c127a7d5e0a5a6a5d9d825bb2e474fc0bdf40c515ecb52cc163c0667283dd54d5417a16f52753045ec
-DIST wavemon-0.8.0.tar.gz 196353 BLAKE2B 90d358d325b62ba9379ea525c4399e38c38043e67460b20188c4d81261d290e8e3f154a33240882f8b2611e4db1862d7bd33c87e168569be9d751d431602da81 SHA512 2df48eb300e9b30e0cb7a0ab41ba5e10b2a6e8170dbd11a4c978462c8cd6dc1171f79ceadfdb7344c495420a4e87b7dd723efea4f1af59a6d0312d93049ee798
-DIST wavemon-0.9.2.tar.gz 202575 BLAKE2B 0a1afe1081bbbeb2ba0fec4741df7da846b65bbf182e886b2185c5e406258a1ecf912509b1a8f4862f37ba92832240dc6db4305a8d5cfb6f4876f3e93b04ccc7 SHA512 f1ee2e4602e93f0639c10067d23df021101bfc0496e53b221cd1553ebc90876cdd963cd64d5ef503da6d4dc4fbcf640e78873df1bdf64272e70dfa3c53ec1706
 DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
-EBUILD wavemon-0.8.0.ebuild 1117 BLAKE2B d5579023a508f8439a2b39447214191a580ef50c8213d3d71ebd90d21f7264e5c94f8ce0c1aba9afa66f12d8ea205adf7189fb20d1343d85f026431d5e92527f SHA512 6780e4604e73619ff09aaa2902d84b51d137c476a70dee744bd14ccf2063e4e235b166065e4dda5fc178db949d2fbe8693bb5c326f4824c3c43a56f19d7a9d4b
-EBUILD wavemon-0.9.2.ebuild 1161 BLAKE2B aac1911ab095eeb2d41a95cd6db61376563dc88dcfbab5ad5cf80114233661ca81105746fae0cd9a7d9ff130a51c0a8a38efbdb44f7429ed2d9438145046b9cb SHA512 14001971ea214960261774f36fd52db37d42cddebbf23587c5eb2a8447cddd4367e37ee79338cf0b06747df250dbf8b043c83d8949eb4a5dbf745b5ce7a6d992
 EBUILD wavemon-0.9.3.ebuild 1132 BLAKE2B 0a44b0b9cf12a5930cadbf908f65d3c4a14e9a5e27aa4b430b404736c33f85ca971f3ed134a1633fb63152a04321e092c5eca8deaa718c103f29e04dfbc2f156 SHA512 20f1a13c34e2f62ff76ecc28f820ceb11dffbb6cc98bd4d83cd01c9ed1966cc1390d908f4465867454ef4d85ba1f032ee28dbc0deecb17c8dedcd77fe1d67ba5
-MISC metadata.xml 445 BLAKE2B a794776afac9b415fbddd75844766c3ab9c93019e549b31c593f7389c1be40a5b47a558aba8f2b7193daa6946e96788be52a744de118a1d513552d20b345960e SHA512 8162bf5d00d03cca9b009ecab83aa0f28f770d8a1774b69767ea2747e095a0c650ea54595d4e6cc2fd1e03c3bef72dbfdd5a6fef067e4264b235d070c9954f2a
+MISC metadata.xml 475 BLAKE2B fd9357bdeff8d0f970ed373cec1708ea354e2549f5b1d746de9caad75c07b6191e3d575e6991d4f779101241c005f449be70bc2c4587975c0d3ade282de56153 SHA512 b10e521fff91543cc53bee7c4f10d874a5301c4615afe337d8c1ff04e19d710908ebca632cce65d9a680d8892e0a4ef0f069ebdd8e84bef65643b48be024dcbe
diff --git a/net-wireless/wavemon/metadata.xml b/net-wireless/wavemon/metadata.xml
index 01ca45ef80d8..453dad7a0523 100644
--- a/net-wireless/wavemon/metadata.xml
+++ b/net-wireless/wavemon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-wireless/wavemon/wavemon-0.8.0.ebuild b/net-wireless/wavemon/wavemon-0.8.0.ebuild
deleted file mode 100644
index 4bdefdd7cf5c..000000000000
--- a/net-wireless/wavemon/wavemon-0.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
-HOMEPAGE="https://github.com/uoaerg/wavemon/"
-SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc sparc x86"
-
-IUSE="caps"
-RDEPEND="dev-libs/libnl:3
-	sys-libs/ncurses:0=
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.6-ncurses-tinfo.patch"
-	"${FILESDIR}/${PN}-0.8.0-build.patch"
-)
-
-src_prepare() {
-	# Do not install docs to /usr/share
-	sed -i -e '/^install:/s/install-docs//' Makefile.in || die 'sed on Makefile.in failed'
-
-	# automagic on libcap, discovered in bug #448406
-	use caps || export ac_cv_lib_cap_cap_get_flag=false
-
-	# Respect CC
-	tc-export CC
-
-	default_src_prepare
-	eautoreconf
-}
-
-src_install() {
-	default_src_install
-	# Install man files manually(bug #397807)
-	doman wavemon.1
-	doman wavemonrc.5
-}
diff --git a/net-wireless/wavemon/wavemon-0.9.2.ebuild b/net-wireless/wavemon/wavemon-0.9.2.ebuild
deleted file mode 100644
index 63fb2ad9d14b..000000000000
--- a/net-wireless/wavemon/wavemon-0.9.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
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
-HOMEPAGE="https://github.com/uoaerg/wavemon/"
-SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-
-IUSE="caps"
-RDEPEND="dev-libs/libnl:3
-	sys-libs/ncurses:0=
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( COPYING README.md THANKS )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-build.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~CFG80211_WEXT"
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Do not install docs to /usr/share
-	sed -i -e '/^install:/s/install-docs//' Makefile.in || die \
-		'sed on Makefile.in failed'
-
-	# automagic on libcap, discovered in bug #448406
-	use caps || export ac_cv_lib_cap_cap_get_flag=false
-
-	# Respect CC
-	tc-export CC
-
-	default_src_prepare
-	eautoreconf
-}
-
-src_install() {
-	default_src_install
-	# Install man files manually(bug #397807)
-	doman wavemon.1
-	doman wavemonrc.5
-}
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 8662b6743ccd..d84d6486e113 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/perl-core/metadata.xml b/perl-core/metadata.xml
index e56fed0b7564..33a6ad8ca37c 100644
--- a/perl-core/metadata.xml
+++ b/perl-core/metadata.xml
@@ -15,7 +15,7 @@
 	</longdescription>
 	<longdescription lang="ja">
 		perl-coreカテゴリーにはPerl プログラミング言語に関連にするライブラリと
-		ユーティリティが含まれて>います。
+		ユーティリティが含まれて&gt;います。
 	</longdescription>
 	<longdescription lang="nl">
 		De perl-core categorie bevat bibliotheken en hulpmiddelen voor het gebruik
@@ -38,4 +38,3 @@
 		programowania Perl.
 	</longdescription>
 </catmetadata>
-
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5a18d85f9d6e..aeb189ecca93 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 8da07dbfd836..155629c2d659 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# dev-python/sphinx_lv2_theme isn't keyworded here (bug #769413)
+>=media-libs/lilv-0.24.12 doc
+>=media-libs/sratom-0.6.8 doc
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
@@ -237,7 +246,8 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
@@ -356,10 +366,6 @@ app-accessibility/orca braille
 # media-libs/x265 doesn't work on alpha (bug 519046)
 media-video/ffmpeg x265
 
-# Tobias Klausmann <klausman@gentoo.org (2014-07-16)
-# neither dietlibc nor klibc will likely ever build/work on alpha, bug #487672
->=sys-fs/dmraid-1.0.0_rc16-r3 dietlibc klibc
-
 # Pacho Ramos <pacho@gentoo.org> (2014-02-22)
 # Missing keywords, bug #495250
 >=gnome-base/gnome-extra-apps-3.10 tracker
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 09f9c070aae8..30a9c31b7f1d 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-02-17)
 # Unmask dev-libs/libpcre2[jit] support on PHP
 # where available
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index b945eac92266..4f4d0363ae58 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -118,10 +118,6 @@ dev-db/mariadb galera
 # Not going to be stable for now
 dev-util/geany-plugins gtkspell
 
-# Pacho Ramos <pacho@gentoo.org> (2016-12-31)
-# No stable for arm
-sys-fs/dmraid dietlibc klibc
-
 # Christoph Junghans <junghans@gentoo.org> (2016-11-27)
 # no stable mpi on arm yet, but maybe in the future
 <=sci-libs/fftw-3.3.4 mpi
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 5dee8c8714bd..b70b37363f1c 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,10 +4,13 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
+# Rolf Eike Beer <eike@sf-mail.de> (2021-03-14)
+# dependencies not yet keyworded
+dev-ruby/globalid test
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
@@ -189,7 +192,8 @@ net-libs/gnutls test-full
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d1e17a416ce4..6bfcdedccd32 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
@@ -203,7 +202,8 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-07-20)
 # pulls in unkeyworded java
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 16422cf53632..cb0529744641 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Patrick McLean <chutzpah@gentoo.org> (2021-02-25)
 # Requires unkeyworded dev-libs/pmdk, mask until keyworded
 sys-cluster/ceph pmdk rbd-rwl
@@ -341,10 +345,6 @@ net-misc/connman ofono
 # Mask some use flags for openmpi due to unkeyworded deps
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 
-# Kacper Kowalik <xarthisius@gentoo.org> (2011-11-20)
-# Dropped dietlibc wrt #364103
-sys-fs/dmraid dietlibc
-
 # Patrick McLean <chutzpah@gentoo.org> (2011-09-07)
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index be4de0c9bee6..7e39be4b306c 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -5,11 +5,6 @@
 # new package dev-libs/libthreadar has no keywords
 app-backup/dar threads
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index fbee7f294634..9707c7f5f922 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-02-25)
 # depends on ring crate, which is not so portable
 # https://github.com/briansmith/ring/issues/389
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 26ae8393fc24..fa4819770c32 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
@@ -50,9 +50,6 @@ gnuefi
 appindicator
 ayatana
 
-#Klibc does not work
-klibc
-
 # These flags should only be used for ppc
 -ppcsha1
 # Unmask the Altivec instruction set
@@ -135,4 +132,3 @@ nvtt
 # Pacho Ramos <pacho@gentoo.org> (2014-01-08)
 # Unmask systemd since it is keyworded here.
 -systemd
-
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 480003b3c1d5..2401394ba464 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -66,7 +66,7 @@ sys-fs/e2fsprogs cron
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Not yet tested / unkeyworded dependencies
 # This includes also packages which do not support python-3 or
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index 1783fe2a335d..343cd157d4d4 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,10 +1,15 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-03-20)
+# jit isn't supported on sparc64 and causes a bus error
+# in for grep -P. Debian completely disable it too.
+dev-libs/libpcre jit
+
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # jit not supported on sparc64
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 187886b8fa08..fa0a7cfb7c69 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,15 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Viorel Munteanu <ceamac.paragon@gmail.com> (2020-03-11)
 # new package dev-libs/libthreadar has no keywords
 app-backup/dar threads
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-03-13)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d12134be1b65..762bcb6d86a8 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -61,10 +61,6 @@ net-libs/libssh2 mbedtls
 net-vpn/openvpn mbedtls
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
-# Needs stable dev-libs/klibc, bug #653384
-sys-fs/dmraid klibc
-
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
 # Needs stable x11-terms/xterm, bug #706118
 app-editors/joe xterm
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2bddf5cf51bc..dedd70e37ca4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -11,10 +11,6 @@
 dev-lang/julia system-llvm
 dev-util/perf clang
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-03-06)
-# Needs last-rited dev-libs/klibc
-sys-fs/dmraid klibc
-
 # Sam James <sam@gentoo.org> (2021-02-27)
 # Needs last-rited sci-mathematics/ggnfs
 sci-mathematics/yafu sieve
@@ -135,10 +131,6 @@ media-gfx/exact-image lua
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-26)
-# The respective dependencies are masked for removal.
-sci-geosciences/viking mapnik
-
 # Joonas Niilola <juippis@gentoo.org> (2020-09-23)
 # Highly experimental, may cause breakages when updating. Use with
 # caution!
diff --git a/profiles/package.mask b/profiles/package.mask
index a678858912a7..62aa9c4686e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,109 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2021-03-19)
+# Depends on bundled out-of-date Qt5 libraries, and even with those
+# installed recent upstream versions fail to run. Moreover, we have now
+# got a source variant in the tree which, while still CLI-only for now,
+# is up to date and actually works.
+# Removal in 30 days. Bug #768228.
+mail-mta/protonmail-bridge-bin
+
+# Joonas Niilola <juippis@gentoo.org> (2021-03-16)
+# A library without consumers, unbuildable for years, ebuilds not 
+# touched in years either. Bugs #664776, #747592. Removal in ~30 days.
+dev-libs/zookeeper-c
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15)
+# Needs a port to network-3. No revdeps. Mask for removal
+# in a month.
+dev-haskell/network-protocol-xmpp
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15)
+# Needs a port to ghc-8.10. No revdeps. Mask for removal
+# in a month.
+dev-haskell/test-framework-th-prime
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15)
+# Needs a port to ghc-8.10. No revdeps. Mask for removal
+# in a month.
+dev-haskell/encoding
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-03-15)
+# Unmaintained for >1 year, blocking cleanup of deprecated libraries.
+# Succeeded by LXQt many years ago (see also: lxqt-base/lxqt-meta).
+# Removal on 2021-04-14 or replacement by GTK3-based versions available
+# in ~arch. No more stabilisation is going to happen without the packages
+# getting a new maintainer. Bugs #708188, #751076, #769524
+<lxde-base/lxappearance-0.6.3-r2
+<lxde-base/lxappearance-obconf-0.2.3-r1
+<lxde-base/lxde-icon-theme-0.5.1-r1
+<lxde-base/lxde-common-0.99.2-r1
+<lxde-base/lxde-meta-0.5.5-r7
+<lxde-base/lxmenu-data-0.1.5
+<lxde-base/lxinput-0.3.5-r2
+<lxde-base/lxlauncher-0.2.5-r1
+<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
+<x11-misc/pcmanfm-1.3.2
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15)
+# Needs a port to ghc-8.10. No release for past 6 years.
+# No revdeps. Mask for removal.
+dev-haskell/geniplate
+
+# Göktürk Yüksek <gokturk@gentoo.org> (2021-03-14)
+# Dead upstream. No revdeps.
+# Removal in 60 days to allow people extra time
+# for transitioning out. Bug #776262.
+app-admin/lastpass-cli
+
+# Göktürk Yüksek <gokturk@gentoo.org> (2021-03-14)
+# Upstream's lack of versioning keeps breaking the Manifest.
+# They are also not responsive to license clarification questions.
+# No revdeps. Removal in 14 days. Bug #581102, #7513730
+app-admin/lastpass-binary-component
+
+# David Seifert <soap@gentoo.org> (2021-03-13)
+# Integrated into >=sys-apps/hwloc-2, completely broken, unmaintained,
+# no revdeps. Removal in 14 days. Bug #721938, #722916, #732046.
+sys-apps/netloc
+
+# Sam James <sam@gentoo.org> (2021-03-13)
+# Stuck on oasis.eclass, out of date
+# No reverse dependencies
+# bug #775785
+# Removal in 14 days. Nothing should really
+# be able to use any of these right now anyway.
+dev-ml/qcheck
+dev-ml/macaque
+dev-ml/pgocaml
+dev-ml/csv
+dev-ml/gen
+dev-ml/tyxml
+dev-ml/stringext
+dev-ml/deriving
+dev-ml/type-conv
+dev-ml/optcomp
+dev-ml/lwt_react
+dev-ml/batteries
+dev-ml/ocaml-magic-mime
+dev-ml/iTeML
+# Stuck on old oasis.eclass
+# bug #749696, #711414
+dev-ml/ocaml-re
+# Dependencies of Oasis itself
+dev-ml/ocamlify
+dev-ml/ocamlmod
+dev-ml/ocaml-expect
+dev-ml/oasis
+# Please port your applications to dev-ml/ounit2
+# Should be a case of just a sed in most cases
+dev-ml/ounit
+
 # Hans de Graaff <graaff@gentoo.org> (2021-03-12)
 # Requires a (proxy) maintainer with access to Oracle development
 # libraries. Please express your interest on bug 772128 if you can
@@ -205,16 +308,6 @@ dev-ml/core_extended
 # bug #729098
 ~sci-libs/proj-8.0.0
 
-# Sam James <sam@gentoo.org> (2021-02-28)
-# games-strategy/0ad-data has been merged
-# into games-strategy/0ad for simplicity.
-# Note that in most cases, the latter uses
-# upstream pre-built assets anyway.
-# Nothing should really be using this.
-# bug #735352, bug #768930
-# Removal in 14 days.
-games-strategy/0ad-data
-
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-27)
 # Mask until removal of media-gfx/openexr_viewers.
 # Version has several vulnerabilities. See #717474
@@ -260,11 +353,6 @@ sys-auth/authenticator
 # Removal on 2021-03-27.  Bug #731038, #772812.
 media-gfx/videorbits
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-02-24)
-# Completely dissolved and moved into other PIM libraries upstream.
-# Masked for removal on 2021-03-10.
-kde-apps/kdepim-apps-libs
-
 # Matthew Thode <prometheanfire@gentoo.org> (2021-02-22)
 # Removing unneeded packages from tree Bug #772200
 # Removal on 2021-03-22
@@ -294,13 +382,6 @@ xfce-extra/xfce4-statusnotifier-plugin
 # Mask development versions now that they were bumped...
 =net-misc/kea-1.9*
 
-# Sam James <sam@gentoo.org> (2021-02-10)
-# Causes circular dep with opam
-# seq -> opam-installer -> opam-format -> re -> seq
-# See ff101b42980416c2fdee330c105cabb745bc9a42
-# bug #769725
-=dev-ml/seq-1
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2021-02-08)
 # Abandoned upstream. Was never ported from gtk-2.
 # A possible alternative is media-gfx/geeqie (gqview fork).
@@ -464,7 +545,9 @@ net-misc/gnome-remote-desktop
 =app-arch/cpio-2.13
 
 # Lars Wendler <polynomial-c@gentoo.org> (2019-10-16)
+# Joonas Niilola <juippis@gentoo.org> (2021-03-18)
 # Depends on apache-2.2
+# Removal on 2021-04-01. Bug #655502
 dev-libs/OpenSRF
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index e256f5fbba1a..c32826396c14 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2021-03-13)
+# nss-pem, bug #769578
+net-misc/curl curl_ssl_nss
+
 # Sam James <sam@gentoo.org> (2020-12-10)
 # Disable systemtap for now to be consistent
 # with ::prefix pre-merge.
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index a685386e588a..abfa91e4c9c3 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,6 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-03-18)
+# FUSE cannot be built with multiple audio drivers, and desktop/gnome
+# profiles set both USE=pulseaudio (directly) and USE=alsa (inherited
+# from desktop). Default to the latter for now because PulseAudio support
+# in FUSE is currently considered experimental.
+app-emulation/fuse -pulseaudio
+
 # Mart Raudsepp <leio@gentoo.org> (2020-05-08)
 # evolution-data-server requires libical[vala] by default
 dev-libs/libical vala
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 814e03db1218..8b2d8345ac1a 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -7,7 +7,6 @@ gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ https://artfiles
 gmt		http://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
 gnu		https://ftp.gnu.org/gnu/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
-gnu-alpha	https://www.mirrorservice.org/sites/alpha.gnu.org/gnu/ https://gnualpha.uib.no/ https://mirrors.fe.up.pt/pub/gnu-alpha/ https://alpha.gnu.org/gnu/ https://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ ftp://alpha.gnu.org/gnu/
 gnupg		https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
 goproxy https://proxy.golang.org/ https://goproxy.io/ https://gocenter.io/
 idsoftware	ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c32144a926e5..6107336a8677 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -35,7 +35,6 @@ app-admin/clsync:socket-library - Build the control and monitoring socket librar
 app-admin/conky:apcupsd - Enable support for sys-power/apcupsd
 app-admin/conky:bundled-toluapp - Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags
 app-admin/conky:cmus - Enable monitoring of music played by media-sound/cmus
-app-admin/conky:eve - Enable support for the eve-online skill monitor
 app-admin/conky:ical - Enable support for events from iCalendar (RFC 5545) files using dev-libs/libical
 app-admin/conky:iostats - Enable support for per-task I/O statistics
 app-admin/conky:irc - Enable support for displaying everything from an irc channel using net-libs/libircclient
@@ -416,7 +415,6 @@ app-editors/nano:justify - Enable justify/unjustify functions for text formattin
 app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
 app-editors/nano:split-usr - Enable this if /bin and /usr/bin are separate directories
-app-editors/ne:tinfo - Link against libtinfo from sys-libs/ncurses
 app-editors/neovim:lto - Build with Link Time Optimization (LTO)
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:tui - Build the neovim unix tui
@@ -500,6 +498,7 @@ app-emulation/fs-uae:glew - Enable support for The OpenGL Extension Wrangler Lib
 app-emulation/fs-uae-launcher:lha - Enable LHA archive support
 app-emulation/fuse:backend-X - Use X11 rendering backend
 app-emulation/fuse:backend-fbcon - Use framebuffer rendering backend
+app-emulation/fuse:backend-gtk3 - Use Gtk+ rendering backend
 app-emulation/fuse:backend-sdl - Use SDL rendering backend
 app-emulation/fuse:backend-svga - Use svgalib rendering backend
 app-emulation/fuse:memlimit - Add compile-time memory usage limiting
@@ -603,7 +602,6 @@ app-emulation/qemu:vte - Enable terminal support (x11-libs/vte) in the GTK+ inte
 app-emulation/qemu:xattr - Add support for getting and setting POSIX extended attributes, through sys-apps/attr. Requisite for the virtfs backend.
 app-emulation/qemu:xen - Enables support for Xen backends
 app-emulation/qemu:xfs - Support xfsctl() notification and syncing for XFS backed virtual disks.
-app-emulation/qemu:xkb - Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps
 app-emulation/runc:ambient - Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later).
 app-emulation/runc:apparmor - Enable AppArmor support.
 app-emulation/runc:kmem - Enable Kernel Memory Accounting.
@@ -1469,6 +1467,7 @@ dev-haskell/gtk:gio - Depend on GIO package, thereby enabling certain features.
 dev-haskell/gtk2hs-buildtools:closuresignals - Use the the GClosure-based signals implementation.
 dev-haskell/gtk3:fmode-binary - Set the default file translation mode for file I/O operations to _O_BINARY.
 dev-haskell/gtk3:gio - Depend on GIO package, thereby enabling certain features.
+dev-haskell/hackage-security:lukko - Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@
 dev-haskell/hackage-security:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hakyll:buildwebsite - Build the hakyll website
 dev-haskell/hakyll:checkexternal - Include external link checking
@@ -2726,6 +2725,7 @@ dev-scheme/kawa:sax - Assume SAX2 is available with dev-java/sax
 dev-scheme/kawa:servlets - Build support for generating servlets with Java servletapi
 dev-scheme/kawa:swing - Assume Swing is available
 dev-scheme/kawa:xqtests - Support XQuery Test Suite
+dev-scheme/racket:chez - Build Racket on Chez (Racket CS)
 dev-scheme/racket:futures - Enable racket/future library for fine-grained hardware parallelism
 dev-scheme/racket:places - Enable racket/place library for share-nothing parallelism and message-passing communication. Compared to futures, places are heavyweight, but they have a simpler performance model.
 dev-scheme/racket:threads - Enable support for green threads
@@ -2815,8 +2815,6 @@ dev-util/geany-plugins:ctags - Enable ctags plugin
 dev-util/geany-plugins:debugger - Enable the debugger plugin which interfaces with sys-devel/gdb
 dev-util/geany-plugins:enchant - Enable spell checking using enchant
 dev-util/geany-plugins:gpg - Enable geanypg plugin which integrates GPG using app-crypt/gpgme
-dev-util/geany-plugins:gtk2 - Use GTK+2 instead of GTK+3
-dev-util/geany-plugins:gtk3 - Use GTK+3 instead of GTK+2
 dev-util/geany-plugins:gtkspell - Use gtkspell for dictionary support in GeanyVC
 dev-util/geany-plugins:markdown - Enable the markdown plugin
 dev-util/geany-plugins:pretty-printer - Enable pretty-printer plugin
@@ -3550,6 +3548,7 @@ kde-frameworks/kfilemetadata:office - Enable support for reading ODF and OOXML m
 kde-frameworks/kiconthemes:designer - Build plugins for dev-qt/designer
 kde-frameworks/kimageformats:avif - Support the AVIF image file format
 kde-frameworks/kimageformats:eps - Support the EPS graphics file format
+kde-frameworks/kimageformats:heif - Support for HEIF/HEIC images
 kde-frameworks/kinit:caps - Capabilities support for improved security and better OOM handling
 kde-frameworks/kio:designer - Build plugins for dev-qt/designer
 kde-frameworks/kio:kwallet - Enable permanent storage of passwords for kpasswdserver with kde-frameworks/kwallet
@@ -3559,6 +3558,7 @@ kde-frameworks/knotifications:phonon - Play notification sounds via media-libs/p
 kde-frameworks/knotifications:speech - Enable text-to-speech notification support
 kde-frameworks/knotifyconfig:phonon - Add sound support via media-libs/phonon
 kde-frameworks/kplotting:designer - Build plugins for dev-qt/designer
+kde-frameworks/krunner:activities - Enable search runner for KDE Activities history
 kde-frameworks/ktexteditor:editorconfig - Enable support for EditorConfig configuration files
 kde-frameworks/ktextwidgets:designer - Build plugins for dev-qt/designer
 kde-frameworks/ktextwidgets:speech - Enable text-to-speech support
@@ -3769,7 +3769,6 @@ mail-filter/opendkim:stats - Add support for statistics (requires 'opendbx' flag
 mail-filter/opendkim:unbound - Use the unbound dnssec library to perform DKIM DNS queries.
 mail-filter/opendmarc:reports - Install the reports binaries: expire, import, reports, params
 mail-filter/opendmarc:spf - Use the mail-filter/libspf2 for Sender Policy Framework checking
-mail-filter/postfwd:tools - Install additional tools for testing postfwd
 mail-filter/pyzor:gdbm - Enables the Gdbm back-end database engine for pyzord
 mail-filter/pyzor:gevent - Use dev-python/gevent to enable asynchronous operation
 mail-filter/pyzor:mysql - Enables the MySQL back-end database engine for pyzord through dev-python/mysqlclient.
@@ -3962,7 +3961,6 @@ media-gfx/fontforge:woff2 - Enable support for WOFF2 format
 media-gfx/fotowall:webcam - Enable webcam support
 media-gfx/freecad:addonmgr - Build the addon manager module for automatic handling of 3rd party addons
 media-gfx/freecad:arch - Build the architecture workbench for working with architectural elements
-media-gfx/freecad:ccache - Use dev-util/ccache to build the package.
 media-gfx/freecad:cloud - Build the Cloud workbench, to access cloud providers (mostly Amazon S3).
 media-gfx/freecad:drawing - Build the drawing module and workbench to display 3D work on a 2D sheet
 media-gfx/freecad:fem - Build the FEM module and workbench which provides Finite Element Analysis (FEA) workflows
@@ -4001,7 +3999,6 @@ media-gfx/gmic:cli - Build CLI interface
 media-gfx/gmic:digikam - Build media-gfx/digikam plugin
 media-gfx/gmic:krita - Build media-gfx/krita plugin
 media-gfx/gmic:opencv - Enable support for webcams using the OpenCV library
-media-gfx/gnofract4d:doc - Install user manual
 media-gfx/gnome-photos:flickr - Ensure runtime Flickr support
 media-gfx/graphicsmagick:dynamic-loading - Compile graphicsmagick with dynamically loadable modules
 media-gfx/graphicsmagick:fpx - Enable FlashPix support with media-libs/libfpx
@@ -4056,8 +4053,6 @@ media-gfx/openscad:ccache - Use dev-util/ccache to speed up rebuilds
 media-gfx/openscad:gamepad - Add support for gamepads through dev-qt/qtgamepad
 media-gfx/openscad:headless - Build a binary without GUI
 media-gfx/openscad:spacenav - Add support for space navigator devices through dev-libs/libspnav
-media-gfx/openvdb:abi3-compat - Disables newer features to maintain compatibility with ABI3.
-media-gfx/openvdb:abi4-compat - Disables newer features to maintain compatibility with ABI4.
 media-gfx/openvdb:abi5-compat - Disables newer features to maintain compatibility with ABI5.
 media-gfx/openvdb:abi6-compat - Disables newer features to maintain compatibility with ABI6.
 media-gfx/openvdb:abi7-compat - Disables newer features to maintain compatibility with ABI7.
@@ -4335,6 +4330,7 @@ media-libs/quarter:qthelp - Build API documentation in QtHelp format
 media-libs/quvi:json - Enable support for JSON output
 media-libs/raptor:json - Enable support for JSON parsing
 media-libs/raspberrypi-userland-bin:hardfp - Use armv6 hardfp ABI
+media-libs/rubberband:jni - Enables building of Java Native Interface library
 media-libs/rubberband:programs - Builds also executable applications
 media-libs/rubberband:vamp - Enables vamp plugins support (Audio analysing plugins)
 media-libs/sdl-mixer:fluidsynth - Use media-sound/fluidsynth for MIDI support
@@ -4679,6 +4675,8 @@ media-sound/pragha:peas - Enable various plugins that will pull in dev-libs/libp
 media-sound/pragha:playlist - Enable enhanced playlist support using dev-libs/totem-pl-parser
 media-sound/pragha:rygel - Share music on DLNA using net-misc/rygel
 media-sound/pragha:soup - Search metadata on AcoustID and radios on TuneIn using net-libs/libsoup
+media-sound/puddletag:acoustid - Use media-libs/chromaprint for acoustic fingerprinting
+media-sound/puddletag:quodlibet - Enables support for editing media-sound/quodlibet databases
 media-sound/pulseaudio:X - Build the X11 publish module to export PulseAudio information through X11 protocol for clients to make use. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
 media-sound/pulseaudio:alsa-plugin - Request installing media-plugins/alsa-plugins with PulseAudio plugin enabled. This ensures that clients supporting ALSA only will use PulseAudio.
 media-sound/pulseaudio:asyncns - Use libasyncns for asynchronous name resolution.
@@ -5063,17 +5061,12 @@ media-video/pipewire:pulseaudio - Enable emulation to be able to run PulseAudio
 media-video/pipewire:vulkan - Enable vulkan spa plugin integration
 media-video/qmplay2:audiofilters - Build with AudioFilters module
 media-video/qmplay2:avdevice - Build FFmpeg module with libavdevice suport
-media-video/qmplay2:avresample - Use libavresample instead of libswresample
 media-video/qmplay2:cdio - Build with AudioCD module
 media-video/qmplay2:cuvid - Build with CUVID module
 media-video/qmplay2:extensions - Build with Extensions module and enable other plugins
 media-video/qmplay2:gme - Build Chiptune with GME support
 media-video/qmplay2:inputs - Build with Inputs module
-media-video/qmplay2:lastfm - Build with LastFM support
 media-video/qmplay2:libass - Build with SSA/ASS subtitles rendering support
-media-video/qmplay2:lyrics - Build with lyrics support
-media-video/qmplay2:mediabrowser - Build with MediaBrowser support
-media-video/qmplay2:mpris2 - Build Extensions with MPRIS2 support
 media-video/qmplay2:notifications - Build additional notifications module
 media-video/qmplay2:shaders - Compile Vulkan shaders using media-libs/shaderc
 media-video/qmplay2:sid - Build Chiptune with SIDPLAY support
@@ -5169,7 +5162,6 @@ media-video/x264-encoder:ffmpegsource - Enable ffmpegsource aka ffms support, di
 media-video/x264-encoder:interlaced - Enable interlaced encoding support, this can decrease encoding speed by up to 2%
 media-video/xine-ui:vdr - Enables Video Disk Recorder support
 net-analyzer/2ping:server - Install the server init scripts.
-net-analyzer/argus:libtirpc - Build against net-libs/libtirpc for RPC support
 net-analyzer/argus-clients:ft - Enable support for flow packets through net-analyzer/flow-tools
 net-analyzer/barnyard:sguil - Enable sguil (The Analyst Console for Network Security Monitoring) support
 net-analyzer/barnyard2:gre - Enable GRE support
@@ -5214,7 +5206,6 @@ net-analyzer/httping:tfo - Enable support for TCP Fast Open
 net-analyzer/hydra:gcrypt - Enable radmin2 support through dev-libs/libgcrypt
 net-analyzer/hydra:libssh - Enable SSH support through net-libs/libssh
 net-analyzer/hydra:mongodb - MongoDB support through dev-libs/mongo-c-driver
-net-analyzer/hydra:ncp - NCP protocol (NetWare) support through ncpfs
 net-analyzer/icinga2:console - Adds support for line-editing in the console
 net-analyzer/icinga2:jumbo-build - Combine source files to speed up build process, requires more memory
 net-analyzer/icinga2:lto - Adds support for link time optimization
@@ -5287,8 +5278,11 @@ net-analyzer/netdata:tor - Enable monitoring of tor
 net-analyzer/netdata:xen - Enable monitoring of xen
 net-analyzer/netperf:demo - Emit interim results during the run. May affect results
 net-analyzer/nfdump:ftconv - Build the flow-tools to nfdump converter
+net-analyzer/nfdump:jnat - Build nfudmp to support JunOS NAT event logging
+net-analyzer/nfdump:nfpcapd - Build nfpcapd collector to create netflow data from precollected pcap traffic
 net-analyzer/nfdump:nfprofile - Build nfprofile used by NfSen
 net-analyzer/nfdump:nftrack - Build nfprofile used by PortTracker
+net-analyzer/nfdump:nsel - Build nfudmp to support NSEL/NEL event data
 net-analyzer/nfdump:readpcap - Build nfcapd collector to read from pcap file instead ofnetwork data
 net-analyzer/nfdump:sflow - Build sflow collector sfcpad
 net-analyzer/nmap:libssh2 - Enable SSH support through net-libs/libssh2
@@ -5454,7 +5448,6 @@ net-dialup/ppp:eap-tls - Enables support for Extensible Authentication Protocol
 net-dialup/ppp:gtk - Installs GTK+ password prompting program that can be used by passprompt.so PPP plugin for reading the password from a X11 input terminal
 net-dialup/ppp:ipv6 - Enables support for IP version 6
 net-dialup/ppp:radius - Enables RADIUS support
-net-dialup/xl2tpd:dnsretry - Patch for host lookup retries, activated by redial feature
 net-dialup/xl2tpd:kernel - Enable kernel interface for PPPoL2TP
 net-dns/avahi:autoipd - Build and install the IPv4LL (RFC3927) network address configuration daemon
 net-dns/avahi:bookmarks - Install the avahi-bookmarks application (requires dev-python/twisted)
@@ -5957,6 +5950,7 @@ net-libs/daq:ipq - Build the IPQ data acquisition module. IPQ is the old way to
 net-libs/daq:nfq - Build the NFQ data acquisition module. NFQ is the new way to process iptables packets for inline deployments. Snort can not run unprivileged when using this module.
 net-libs/daq:pcap - Build the PCAP data acquisition module.
 net-libs/davix:tools - Install additional tools
+net-libs/farstream:valgrind - Compile in valgrind memory hints
 net-libs/freaklabs-chibiarduino:promisc - Enable promisc in the config file for packet sniffing
 net-libs/glib-networking:gnome - Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings
 net-libs/glib-networking:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration
@@ -6180,7 +6174,8 @@ net-misc/aria2:ssh - Enable SFTP support.
 net-misc/asterisk:blocks - Utlize -fblocks (only supported by, and required when using, clang/LLVM)
 net-misc/asterisk:cluster - Enable high-availability support through the Corosync Cluster Engine
 net-misc/asterisk:codec2 - Enable Codec2 support in asterisk
-net-misc/asterisk:dahdi - Support Digium compatible hardware (formerly known as Zaptel).
+net-misc/asterisk:dahdi - Support Digium compatible hardware (formerly known as Zaptel)
+net-misc/asterisk:deprecated - Enable deprecated features (eg, app_macro)
 net-misc/asterisk:gtalk - Enable support for Google Talk services
 net-misc/asterisk:http - Enable embedded web server
 net-misc/asterisk:ilbc - Enable the Internet Low Bitrate Codec (iLBC)
@@ -7429,7 +7424,6 @@ sci-mathematics/agda:stdlib - Install the standard library.
 sci-mathematics/bertini:optimization - Accept upstream's choices for -O option.
 sci-mathematics/cgal:mpfi - Enable support for multiple recision interval arithmetic via sci-libs/mpfi
 sci-mathematics/cgal:ntl - Enable support for dev-libs/ntl
-sci-mathematics/coq:camlp5 - Build using camlp5. This is required for some plugins like Ssreflect.
 sci-mathematics/cvc4:cln - Use sci-libs/cln
 sci-mathematics/cvc4:proofs - Support for proof generation
 sci-mathematics/cvc4:replay - Turn on the replay feature
@@ -7780,6 +7774,7 @@ sys-apps/pcsc-lite:libusb - Use dev-libs/libusb detection to hotplug new smartca
 sys-apps/pcsc-lite:policykit - Uses sys-auth/polkit to restrict access to smartcard readers or smartcars to given users.
 sys-apps/pcsc-lite:udev - Use virtual/libudev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.
 sys-apps/pcsc-tools:network-cron - Monthly cronjob the update-smartcard_list script
+sys-apps/plocate:io-uring - Enable efficient I/O via sys-libs/liburing.
 sys-apps/policycoreutils:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
 sys-apps/portage:apidoc - Build html API documentation with sphinx-apidoc.
 sys-apps/portage:gentoo-dev - Enable features required for Gentoo ebuild development.
@@ -8394,6 +8389,7 @@ sys-libs/timezone-data:leaps-timezone - Install the set of "right" timezones; th
 sys-libs/timezone-data:zic-slim - Default to 'slim' file format for /usr/share/zoneinfo. Otherwise 'fat' format is used. Not all programs can handle 'slim' format'.
 sys-libs/uclibc-ng:symlink-compat - Explicitly add sym links for libdl.so.0, libm.so.0, and friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier
 sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
+sys-libs/zlib-ng:compat - Enable compatibility to sys-libs/zlib
 sys-power/apcupsd:modbus - Enable MODBUS support over USB
 sys-power/intel-undervolt:elogind - Use elogind hook to apply voltage after system sleep
 sys-power/nut:ipmi - Support IPMI-based UPSes.
@@ -8454,7 +8450,6 @@ sys-power/suspend:crypt - Allows suspend and resume from encrypted disk
 sys-process/audit:gssapi - Enable GSSAPI support
 sys-process/criu:setproctitle - Make process titles of service workers to be more verbose
 sys-process/cronie:anacron - Install the periodic anacron command scheduler.
-sys-process/cronie:inotify - Enable inotify filesystem monitoring support.
 sys-process/fcron:debug - Enable debug code and output. Since version 3.0.5 this will no longer force foreground execution, and fcron will be able to run as a service properly.
 sys-process/fcron:mta - Enable mta support for sending emails from fcron
 sys-process/fcron:pam - Enable PAM support for fcron. This means that fcron will pass through the "fcron" stack before executing the jobs, and fcrontab will use the "fcrontab" stack to authenticate the user before editing its crontab file.
@@ -8598,7 +8593,6 @@ www-client/opera:widevine - Unsupported closed-source DRM capability (required b
 www-client/opera-beta:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/opera-beta:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/opera-developer:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
-www-client/opera-developer:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/qutebrowser:scripts - Installs userscripts from the misc/userscripts directory to /usr/share/qutebrowser/userscripts.
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -8614,6 +8608,7 @@ www-client/seamonkey:system-libevent - Use the system-wide dev-libs/libevent ins
 www-client/seamonkey:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled
 www-client/seamonkey:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 www-client/surf:savedconfig - Without a saved config.h, this package depends on net-misc/curl and x11-terms/st for a default download mechanism
+www-client/surf:tabbed - Install surf-open.sh script for running surf in x11-misc/tabbed
 www-client/uget:aria2 - Enable support for net-misc/aria2 through xmlrpc. You'll find the plugin in the app's settings.
 www-client/uget:control-socket - Enable JSON-RPC over unix domain socket
 www-client/uget:openssl - Use dev-libs/openssl instead of net-libs/gnutls
@@ -8784,7 +8779,6 @@ x11-misc/compton:opengl - Enable VSync with SGI_swap_control OpenGL extension
 x11-misc/dunst:dunstify - Experimental replacement for notify-send.
 x11-misc/e16-keyedit:gtk2 - Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
 x11-misc/fbpager:xrender - Enable transparency support via x11-libs/libXrender
-x11-misc/gpaste:applet - Enable gpaste-applet
 x11-misc/gpaste:gnome - Enable proper gnome support and enable gnome shell extension.
 x11-misc/grsync:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 x11-misc/gtkdialog:gtk2 - Build with GTK+2 instead of GTK+3
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 6fa2e8d095b4..436898f32077 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/metadata.xml b/ros-meta/metadata.xml
index ad524bd10969..5cbd9d52ef24 100644
--- a/ros-meta/metadata.xml
+++ b/ros-meta/metadata.xml
@@ -5,4 +5,3 @@
 		The ros-meta category contains ROS meta-packages.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index e87dd05c4f47..e792dec28e17 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/metadata.xml b/sci-astronomy/metadata.xml
index 49245f7d22e6..656142f0b47e 100644
--- a/sci-astronomy/metadata.xml
+++ b/sci-astronomy/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria sci-astronomy zawiera programy naukowe związane z astronomią.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 741369a17513..122d3f7c532b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -18,4 +18,4 @@ DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
 EBUILD stellarium-0.20.3.ebuild 3941 BLAKE2B 9341847ecff93659da7f03b15c1ca35f2f4c12b52863d5e66fdce9d19c23c9f7502d958ad78d6aeb327dfb628315cde23ef1e644b1047ac72cf699409affcb95 SHA512 6b7ba8a5e7330135722399438fb8c5f6100fc9d8d3630c247b9f03db456d3a4bd03c7240fe040a5d020c84c15e1d482b015867d02dc4a8decbb21b3253bda50f
 EBUILD stellarium-0.20.4.ebuild 3984 BLAKE2B ed4cb472ad2cadc3fb2e0827d80637f4b62f7bd5b43e58cb3a1ce32cee253f7678fea4abb5c35a229071fc04682bc86f0418e154b6c9a0447552b3ed9e31f619 SHA512 4a70bb2d0653bd9f57a3db840ce8128d6382994acd79f6050707f5ca991c4f11fb516887b9199ffe5b1ea25c51940ec7316d7ea0e37a5ad77d556156f1a9fe3b
-MISC metadata.xml 1166 BLAKE2B ae9afc6a617426c07b8746859f4e1ed0e7ab61256cb82f754f8fb0f7d9e24709b2f9edf9a4f4fef1f8d0d6b46eaee2ef8af3641b81abacd8391cf41fa0624e79 SHA512 dc95989f85aaaf8c08a86b0dbaa2a57d69226dfae7e4317f8c7cc5a3dd8d4a0303a9e3111d29b6a18242f3a96e17d4e4f01fd85c7e4d7a0587495d775d537781
+MISC metadata.xml 1196 BLAKE2B 85a24121661eb11ff4ce9d7aee0113d18f92b968ee91cb6b4fdca237ef9f05d6616c879de3c341dc23ebac42c473aafa1eadfce0b184e5b569f1caf497d62429 SHA512 df106274882a1db20200940254725c74da0632a9232de9b432849aad0aa6d5d0a533556f45f8cc767d3d4a8d26ae6d838ac0628b6c625a5cfab38f19432a1b36
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 5edf86197e9f..add336cdce9c 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 45c9d984d9c4..b13d96c59d28 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -2,4 +2,4 @@ DIST wcslib-7.3.1.tar.bz2 2434274 BLAKE2B 9789a8eb34fe37c96b52e20efe3c1436849905
 DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
 EBUILD wcslib-7.3.1.ebuild 1693 BLAKE2B e00e09b8e5223ef63eb2c65d626bb5f1e60d5cfa1a490ad9ceca268bec913c23f13d916520ef7b1b5c4e032f5fdc59dff3680e3448f48d0f66ccdfa7a53ed15a SHA512 e69ba5bed4b3acd3fdf871453a0a3f22faadbbaf6858f0806e260b7cb0f45fefd1a922a8f710ee1485bd33114801c03aaa1bc7baebceef0d34febb18729f2ca3
 EBUILD wcslib-7.3.ebuild 1691 BLAKE2B 98f7e1ed446fb03c86419ff096131ddc318a9b11d5d97b8fc484dcdb22e277e2908112839080aa6c9633e1101b2d56ab2d97caf2cc950e18a982ec094efa26a0 SHA512 f16ee1129c6a4c54dbdf1da67e14af94d0eeba5945c164adaa5f187f3e287a721ccb6f9a7a9c989b77f7e5d2545e0d5c2ca2cd01c93e6742e6386cf844716bb4
-MISC metadata.xml 1092 BLAKE2B 117c7758257296d911cadb26e55fc50ad6439c4ac69e82e31b4f41e36a3f862270bb88f87533e25dd5f33c9c07a3ce8164715ba460f91c025c12c7cb31a6b509 SHA512 1c6a19945464451f87c365743d4c2a7271feab32bbafe4147abeafc5948bbf207716f3c46a2dd59c9e9fa5fce5d2b4ab8bebc8a1181915f8f81a2b3a353022e3
+MISC metadata.xml 1106 BLAKE2B d299732297987be3b524a4f9a966162d7bfbe951ad51829078e97bb0abdf5b31217fdb5034bd651257dbded31746429868f333f4d7aef5fa5ff92d8db206018d SHA512 da829d7fb9f909a28ec1ceb5654633e2dcf5ae8305dd56ccc84d4b1af73cf8b89455b0b1f3266babd7373e2d516e35b61c3ab40c6d67b16e0b1f5fa24eabcc79
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 809842b35b0f..7320a0f4ef4c 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -5,7 +5,7 @@
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>davidroman96@gmail.com</email>
     <name>David Roman</name>
   </maintainer>
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 75d14acf6d14..38ad9f401679 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/abyss/Manifest b/sci-biology/abyss/Manifest
index bc1d45a744ea..51ab00b29cc3 100644
--- a/sci-biology/abyss/Manifest
+++ b/sci-biology/abyss/Manifest
@@ -1,4 +1,4 @@
 AUX abyss-2.0.3-prog-AR.patch 350 BLAKE2B 20e1a428ea02c3c67c5df9b92f623ddea58f2054912d0ca788f0a9890057277cd98babe48d089852541db262ab0a69e95ead2a4b31456a62597ae1d4856e8c5e SHA512 747e9d258767c698a95615ae83db18662ec1851c0a6dfcdcec6aea68dc76415e89b3f85f1f8ff6c04fff22052c787a43948f8f3588220e2dc66cc7262788c52a
 DIST abyss-2.0.3.tar.gz 1049144 BLAKE2B 1a320cac735747225723f0d636af435ffcac9efb3273323150f258c0f4c27ed81bb104cb06a726aa664118cc9d2224b745d9deebfcac055face01dae3fc9de15 SHA512 15bc833e89839be89dfa35a23ae22ad0f9a19e8efd36211010c9f59e974de7c569576db36e26d6ab302543ff427604b5efb1b7badf62489a5e82a193ef155570
 EBUILD abyss-2.0.3-r2.ebuild 1556 BLAKE2B a25f93323564ce83b2a15ed31881a873ddafe688f9277439aef25dbb3a76c6d796984105498c2f547bf00229ce4c465d9e5c22c949c543b29fd61c22a8d52568 SHA512 9c5649115d97c8b6aee3909d092f8429c59c31b9200b71023bb05e3bc2501c3f55a1d4b07c9bacbfd94fc6a10a4a5124a6135b743e29d126856796bab5ea1f3f
-MISC metadata.xml 572 BLAKE2B 987284bc0e435174f2592854cf67e44d155b64975a65d69fc988352f9bf0c06bfa412bcbba0e3a5a4819a846d5fd1c5695627b8b75ab7c955abff1b0bb4ad76e SHA512 b7461a55a1f34d22b8faceb40c15f66d7564a5fd3ccd626533972f25fcca36f8ce47e7edc5e96e7eab6c9bfc27ac4e094b419c241b7cc4de051025e1a9522198
+MISC metadata.xml 572 BLAKE2B 02843f7935e2e1d022754d71f73211099c953b7e44ae1bffdea971bf2ecbf46c4679243706b1f2f3b372c48b2dc963f2a99d9e8026c1e6ff33c824a455b6eb32 SHA512 d6f1b5a798fff4a3e5bebebcb660d470223e97911e06438fa7a8d2aa28a5a3f16891fd4ddce75cec45626b641dba4fa319dd8359dd8520132a993da4463794c3
diff --git a/sci-biology/abyss/metadata.xml b/sci-biology/abyss/metadata.xml
index 47116e507d89..2a6a2c73d6a0 100644
--- a/sci-biology/abyss/metadata.xml
+++ b/sci-biology/abyss/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-biology/bfast/Manifest b/sci-biology/bfast/Manifest
index d9ec14eacea8..9c749a7da2e0 100644
--- a/sci-biology/bfast/Manifest
+++ b/sci-biology/bfast/Manifest
@@ -1,3 +1,6 @@
+AUX bfast-0.7.0a-C99-inline.patch 2316 BLAKE2B 744908af002c5d5af57358baffbaff75a6299b7d0467573e5416c78ab2d4c9fc35dddbdcf308ada17583ca0e732412d1293152240748e84ac5eea243a944e8a1 SHA512 13144864d6a758d6dc0cba59e2a4458242ce33ab77108aafc33967a5343d1f0e2d59f872822e13df8a2f77f1eba2f58c5cc14060a48900509726e48fe6061177
+AUX bfast-0.7.0a-autotools.patch 1268 BLAKE2B b5da950d0230322f0a95b7c1417aec5fc4774a7d40ce4576b10bbc66d21f8d4907e17f3020679f3074cfdbe10f7e69bc3d8b62371ad381a2fb7b17854f146e46 SHA512 d1b00230ef35e82fb633a063c32e48a50866d8c40889cb0e13fddb0866a5b5447ed0f41cc948811f7e50918544ed3d0758ace3e1060a97a33ff5a0c3ee12b29c
+AUX bfast-0.7.0a-test-sourcing.patch 1399 BLAKE2B 2cc246d437da36a28d6fd86fe8c4acb78ba06120672158c16305c108298f46f4cabf37193f793e9b32ecb8fddc022f076bc845d06564f23ed9f412f5d7c22378 SHA512 3257038564997ae1b2bdd814e893825951c9cc72934cc204d6a3cd1dd31c796d26b76b6801dca4722be3e10ac309e0d177ddf725a6b6a2c5fe01106bd35d5a5f
 DIST bfast-0.7.0a.tar.gz 2456617 BLAKE2B a841e7651e731dbb3faf22eb03dce5d2008c84f9a6198204d3c41aea26626058e3a23375bc0e7e8fc142d4898e09ddbb168016c71a7b79527e602e06ec329151 SHA512 16e7ec5101c478f0dfc171016cbacb2b9240773e43b2d40eeb42d0e47afcee50a6dd5838e043a0326fc1ca9a87d3e55b42326a7f17b7c5654ef9825913860836
-EBUILD bfast-0.7.0a.ebuild 902 BLAKE2B c5e520867849c07323fd6002cc881160272259f4b002320453b1e529daeb9b89125da9b51f640bd708cad2f9fbc092dc5e5cb957803e5926a0eee2de18f87e7b SHA512 0807ad435ef822c9697b812b8bfec37fe2aaf701a6e60fac1dd15de821686d94101240cc70b829d46627dfbb0fe3e158ea0daeb873c54ff1f8b594a61be3ffbc
+EBUILD bfast-0.7.0a.ebuild 595 BLAKE2B 257ddca11ba647f033b22f98afa4d718f1260687a17cf8386dec115f9e0dfc764a30f94af2cdb4f3f63057e1286e104bb9e3a666dfd44a4f004aa9c84b8f5e92 SHA512 5ce28ea79f9dc037eb432a23f742e7c9efb18be1317324c2200fa0a66f7e938526daa386c146922ae45a1b0f8c96460bdd2700db77c172b18935cd06dc1353eb
 MISC metadata.xml 346 BLAKE2B cf096d053302cd40548e541557cbe72f41e81328a93b41a6e19ae88122e9939d5e6414eb6f60ee6e96411f43a073151f7d98ab780858afa16c50c1a5e37f2c48 SHA512 b402eeeb37be04022693af8692b128bb257a69b8eeb75170506352fe05fa6e7154c908267bbab7af7d38d1eee26ad6d98e6be5f9c8647181aa491b3fb1680b62
diff --git a/sci-biology/bfast/bfast-0.7.0a.ebuild b/sci-biology/bfast/bfast-0.7.0a.ebuild
index 97282d2244a4..6a48785022f4 100644
--- a/sci-biology/bfast/bfast-0.7.0a.ebuild
+++ b/sci-biology/bfast/bfast-0.7.0a.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic
+inherit autotools
 
 DESCRIPTION="Blat-like Fast Accurate Search Tool"
 HOMEPAGE="https://sourceforge.net/projects/bfast/"
@@ -13,30 +11,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # tests broken, upstream unresponsive
 
-DEPEND=""
 RDEPEND="dev-perl/XML-Simple"
 
-src_prepare() {
-	sed \
-		-e 's/-m64//' \
-		-e 's/CFLAGS="${default_CFLAGS} ${extended_CFLAGS}"/CFLAGS="${CFLAGS} ${default_CFLAGS} ${extended_CFLAGS}"/' \
-		-e 's:-g -O2::g' \
-		-i configure.ac || die
-	sed \
-		-e 's:. test.definitions.sh:. ./test.definitions.sh:g' \
-		-i tests/*sh || die
-
-	sed \
-		-e '/docdir/d' \
-		-i Makefile.am || die
-
-	use test && AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-test-sourcing.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+)
 
-	append-flags -fgnu89-inline
-
-	autotools-utils_src_prepare
+src_prepare() {
+	default
+	eautoreconf
 }
diff --git a/sci-biology/bfast/files/bfast-0.7.0a-C99-inline.patch b/sci-biology/bfast/files/bfast-0.7.0a-C99-inline.patch
new file mode 100644
index 000000000000..86450c96048a
--- /dev/null
+++ b/sci-biology/bfast/files/bfast-0.7.0a-C99-inline.patch
@@ -0,0 +1,74 @@
+--- a/bfast/AlignNTSpace.c
++++ b/bfast/AlignNTSpace.c
+@@ -478,7 +478,7 @@
+ 	}
+ }
+ 
+-inline void AlignNTSpaceFillInCell(char *read,
++void AlignNTSpaceFillInCell(char *read,
+ 		int32_t readLength,
+ 		char *reference,
+ 		int32_t referenceLength,
+--- a/bfast/AlignNTSpace.h
++++ b/bfast/AlignNTSpace.h
+@@ -10,5 +10,5 @@
+ void AlignNTSpaceRecoverAlignmentFromMatrix(AlignedEntry*, AlignMatrix*, char*, int, char*, int, int32_t, int32_t, int, int32_t, char, int);
+ void AlignNTSpaceInitializeAtStart(AlignMatrix*, ScoringMatrix*, int32_t, int32_t);
+ void AlignNTSpaceInitializeToExtend(AlignMatrix*, ScoringMatrix*, int32_t, int32_t, int32_t, int32_t);
+-inline void AlignNTSpaceFillInCell(char*, int32_t, char*, int32_t, ScoringMatrix*, AlignMatrix*, int32_t, int32_t, int32_t, int32_t);
++void AlignNTSpaceFillInCell(char*, int32_t, char*, int32_t, ScoringMatrix*, AlignMatrix*, int32_t, int32_t, int32_t, int32_t);
+ #endif
+--- a/bfast/BLib.c
++++ b/bfast/BLib.c
+@@ -90,7 +90,7 @@
+ }
+ 
+ /* TODO */
+-inline char ToUpper(char a)
++char ToUpper(char a)
+ {
+   if(97 <= a && a < 122) return (char)(a - 32);
+   return a;
+--- a/bfast/BLib.h
++++ b/bfast/BLib.h
+@@ -16,7 +16,7 @@
+ int ParseFastaHeaderLine(char*);
+ char ToLower(char);
+ void ToLowerRead(char*, int);
+-inline char ToUpper(char);
++char ToUpper(char);
+ void ToUpperRead(char*, int);
+ void ReverseRead(char*, char*, int);
+ void ReverseReadFourBit(int8_t*, int8_t*, int);
+--- a/bfast/ScoringMatrix.c
++++ b/bfast/ScoringMatrix.c
+@@ -98,14 +98,14 @@
+ 	return 1;
+ }
+ 
+-inline int32_t ScoringMatrixGetNTScore(char a,
++int32_t ScoringMatrixGetNTScore(char a,
+ 		char b,
+ 		ScoringMatrix *sm)
+ {
+ 	return (ToUpper(a) == ToUpper(b)) ? sm->ntMatch : sm->ntMismatch;
+ }
+ 
+-inline int32_t ScoringMatrixGetColorScore(char a, 
++int32_t ScoringMatrixGetColorScore(char a, 
+ 		char b, 
+ 		ScoringMatrix *sm) 
+ {
+--- a/bfast/ScoringMatrix.h
++++ b/bfast/ScoringMatrix.h
+@@ -3,8 +3,8 @@
+ 
+ #include "BLibDefinitions.h"
+ 
+-inline int32_t ScoringMatrixGetNTScore(char, char, ScoringMatrix*);
+-inline int32_t ScoringMatrixGetColorScore(char, char, ScoringMatrix*);
++int32_t ScoringMatrixGetNTScore(char, char, ScoringMatrix*);
++int32_t ScoringMatrixGetColorScore(char, char, ScoringMatrix*);
+ 
+ int ScoringMatrixRead(char*, ScoringMatrix*, int);
+ void ScoringMatrixInitialize(ScoringMatrix*);
diff --git a/sci-biology/bfast/files/bfast-0.7.0a-autotools.patch b/sci-biology/bfast/files/bfast-0.7.0a-autotools.patch
new file mode 100644
index 000000000000..993f6a554662
--- /dev/null
+++ b/sci-biology/bfast/files/bfast-0.7.0a-autotools.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@
+ AC_INIT([bfast],[0.7.0a],[bfast-help@lists.sourceforge.net],[bfast])
+ AC_COPYRIGHT([See LICENSE for copyright information.])
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
++AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects serial-tests])
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -21,10 +21,10 @@
+ 
+ AC_PROG_INSTALL
+ AC_GNU_SOURCE
++AC_SYS_LARGEFILE
+ 
+ # set CFLAGS and CXXFLAGS
+-default_CFLAGS="-Wall -g -O2 -pthread";
+-extended_CFLAGS="";# "-m64 -D_FILE_OFFSET_BITS=64";
++default_CFLAGS="-Wall -pthread"
+ 
+ # Define some variables
+ GITREV="Revision: undefined$";
+@@ -42,7 +42,7 @@
+ 					AC_DEFINE(HAVE_LIBBZ2, 1, [Define to 1 if you have the <bzlib.h> header file.])], 
+ 					AC_MSG_ERROR("could not find the bzlib library.  Please use --disable-bzlib if you wish to disable bzlib support."))])
+ 
+-CFLAGS="${default_CFLAGS} ${extended_CFLAGS}";
++CFLAGS="${CFLAGS} ${default_CFLAGS} ${extended_CFLAGS}";
+ 
+ # Enable large file support; disable with --disable-largefile
+ AC_SYS_LARGEFILE
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,5 +16,4 @@
+ 
+ SUBDIRS = bfast butil scripts tests
+ 
+-docdir = ${datadir}/doc/${PACKAGE}
+ dist_doc_DATA = LICENSE manual/bfast-book.pdf
diff --git a/sci-biology/bfast/files/bfast-0.7.0a-test-sourcing.patch b/sci-biology/bfast/files/bfast-0.7.0a-test-sourcing.patch
new file mode 100644
index 000000000000..f4dd64e75cac
--- /dev/null
+++ b/sci-biology/bfast/files/bfast-0.7.0a-test-sourcing.patch
@@ -0,0 +1,79 @@
+--- a/tests/test.cleanup.sh
++++ b/tests/test.cleanup.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Cleaning up files.";
+ 
+--- a/tests/test.diff.sh
++++ b/tests/test.diff.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ #error()
+ #{
+--- a/tests/test.fasta2brg.sh
++++ b/tests/test.fasta2brg.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ TMP_DIR="tmp/";
+ 
+ echo "      Building a reference genome.";
+--- a/tests/test.index.sh
++++ b/tests/test.index.sh
+@@ -1,5 +1,5 @@
+ #!/bin/sh 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Building an index.";
+ 
+--- a/tests/test.initialize.sh
++++ b/tests/test.initialize.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Initializing data for tests.";
+ 
+--- a/tests/test.localalign.sh
++++ b/tests/test.localalign.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Running local alignment.";
+ 
+--- a/tests/test.match.sh
++++ b/tests/test.match.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Finding matches.";
+ 
+--- a/tests/test.postprocess.sh
++++ b/tests/test.postprocess.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-. test.definitions.sh
++. ./test.definitions.sh
+ 
+ echo "      Running postprocessing.";
+ 
diff --git a/sci-biology/cd-hit/Manifest b/sci-biology/cd-hit/Manifest
index 5e5e0cabec3e..d244031790d6 100644
--- a/sci-biology/cd-hit/Manifest
+++ b/sci-biology/cd-hit/Manifest
@@ -2,4 +2,4 @@ AUX cd-hit-4.6.6-fix-build-system.patch 4006 BLAKE2B 28e19d8dbcf2072c1e348c0f4d1
 AUX cd-hit-4.6.6-fix-perl-shebangs.patch 4909 BLAKE2B 2bf82ee2713206d4782143fc04f2a924b742cb50ee9b1c99aab3a3f6d1265dee78009106970329146f068544caa4edf5878bd9ee3aaaf69ea8e418702ef1e069 SHA512 3ded78d991ee922761a3a7395b4d422ff29c6fe1c0657b61ad74bc6f9253c7dc82414f8d71cfffae37cac192e96ab03f711257d3091cdd0c9444202bdf5967f5
 DIST cd-hit-4.6.6.tar.gz 1152570 BLAKE2B 6a7cf99be947376af19172739626b571e06936b7b0bc8c5cb52069c63e98f0949a44edf7560fa50810d2d96e310df87dcf2e3ebf5a3856ada46dcdcd3595b6c0 SHA512 8241d6674fb041559792dbbb58c12b41302d2275d3bacb1362946094b48a0b8e1236e71b5dc77d13405220b60f8253e6f996753a8b051995a72c8353d4333c51
 EBUILD cd-hit-4.6.6.ebuild 997 BLAKE2B 1305388e83140df2e024bc64546b96e849a9f70095dabc29c79ab0a078dff9fd33a091d05df3f07323391e627f28877ad77f52fdf890d20cef5832df0e3053a9 SHA512 fe17e01fc04944df9b86b98dc73a4be2f14300938e3e926f56c952eddad62caf846f0051a7c3a66dbca3132f3a79a8bc21d7a43206bd6d9d784b24c94c3204b8
-MISC metadata.xml 1351 BLAKE2B 255adcb4a5ead5f03add4537d26ccab28869e3d9c883d25be9737f145b417dce343e3ded6732eab937022b949406eded039694b6b67e13c1939e05ccbce96148 SHA512 691c92d76f2bdb3ed31a802fb1003905942abfb7cef3c1d08848e69cc819082e82540217f7fc79ad39d11a2d43c45b845617bd8ad1282a7bde505ed8616b5364
+MISC metadata.xml 1351 BLAKE2B e06e3ea1665bc79924542dd596c3bcbdbd4cfba8be622a8b1f9f4689fc615ca5ded5b40305f296137743ff92f44db5b0ad5aa51218ed2d93902bf12909b5e0c7 SHA512 e43009446e7dc81bd0362ceac2a7c709e24be974344ae009bead94ea8533099ebfacb10a5b3f3d5b93c241c03bbf835b0fb11d1af172eb5a18ca30436adc3cfb
diff --git a/sci-biology/cd-hit/metadata.xml b/sci-biology/cd-hit/metadata.xml
index 1f3b075216dd..e4906ff94e3e 100644
--- a/sci-biology/cd-hit/metadata.xml
+++ b/sci-biology/cd-hit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-biology/embassy-cbstools/Manifest b/sci-biology/embassy-cbstools/Manifest
index 667d2a881591..a15852d6da70 100644
--- a/sci-biology/embassy-cbstools/Manifest
+++ b/sci-biology/embassy-cbstools/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-cbstools-1.0.0.650_fix-build-system.patch 3167 BLAKE2B f34ccb14802128cf315cb767d519a8440b9fc9bb8fe3bbcb02a310f25304cdf5109dc4625ad62aed2323c1b3d438a99549e625b8440b42bce0477689d6d3fc24 SHA512 0ec7317d719da5466f02813105184d44c18f5ec668e0cdc1e120324216070009da4e38ce34dffb320b438665926f4506437e60757c3103fb03a526c46ca042d8
+AUX embassy-cbstools-1.0.0.650_fix-build-system.patch 2944 BLAKE2B f33ea2bc9579a7a233064e562ae76ede11fa81d9c6c972338e944028192390e797deb13514b1d02a32b1b6b55925a8eeef15f8ed11598ab487e9deb3e7a6a14d SHA512 913542383cf0dcacdf7c18ee258b6bf37fcde77b41a548089e239c9e20e2087cbec0e5244eb946b511bb76ec5930a6a44142ea172d894061bfca5e1228e29047
 DIST embassy-cbstools-1.0.0.660.tar.gz 452594 BLAKE2B 68d13e14b4805af7ba1742537e6ebd621553ba6c895cd4bb13a5c1e93e72e03916ba62833f31ec35e69fa9a4ab15d9348dbfe19eb55a82f3ecd86141726e6c01 SHA512 8f16f726220a36f998d8a0f1d8aec9ec6b2db8160b15bed7bafc5a65d57a937bd91ee831ecabe2e9aaa8cecaa18d050f16439a276a882730fde3fa4937bec384
-EBUILD embassy-cbstools-1.0.0.660.ebuild 352 BLAKE2B e384b07b74042cefb1d5e2e3c646a4006850b6846997daa136a652b569efa8db98092cbf8a2b965a1add167306fcf4b10fe50b1772b75d50d893a95ba900056e SHA512 f85c1ecdd7c16e13c8e1a08441b73a76f66ff770a3ca75eeb745f31b46aa5e2b74172f20de4b520e64e0ed167cf50b55d01ab78b760c9fbfde8ecee689f2703a
+EBUILD embassy-cbstools-1.0.0.660.ebuild 349 BLAKE2B 3930b547938c8e72d8e058684c8808385c7dff42b3d6796e854da4f2401be95d652eba027c7c17e715e3a670eb4d8b31837a65d0d0dd285374ef169a8b87852f SHA512 c3354cf9907079e2870e1acf7c8ccfed1225da5c1eff6f97f144373b80ebdfdbb6d4b0fd95632e341e51edd42b15bce88bf7a10ed78a328a4907f86ba24a843d
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild
index 6104a470f3f7..873b9cb64520 100644
--- a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild
+++ b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Applications from the CBS group"
 
diff --git a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch
index d29310efcb47..bdaaaf98f23c 100644
--- a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac           | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++----
- 3 files changed, 10 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a70d4d2..b8f5e79 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index a70d4d2..b8f5e79 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -63,7 +56,7 @@ index a70d4d2..b8f5e79 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -77,8 +70,6 @@ index a70d4d2..b8f5e79 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
 --- a/emboss_acd/Makefile.am
 +++ b/emboss_acd/Makefile.am
 @@ -1,3 +1,3 @@
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644
 -pkgdata_DATA = *.acd
 +pkgdata_DATA = $(srcdir)/*.acd
  pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 824a03c..9db171d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -19,9 +19,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -19,9 +19,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 824a03c..9db171d 100644
  endif
  
  if ISSHARED
-@@ -65,5 +63,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -36,7 +34,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -64,6 +62,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-clustalomega/Manifest b/sci-biology/embassy-clustalomega/Manifest
index 8e2a97e9203f..1ef5f7347551 100644
--- a/sci-biology/embassy-clustalomega/Manifest
+++ b/sci-biology/embassy-clustalomega/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-clustalomega-1.1.0_fix-build-system.patch 2860 BLAKE2B 0a88c8315e40df48d18ef2ca6b5d8e0c266720c852cbe8dac681ceb8802b4b7e6ba18cb1064be5a979b82c37f1a7b83ef445e84ac3dda143e7e2bd2b5f627d10 SHA512 6b1c8a2915c9c48ec203bc131461b9acecc3948da79f36941e2fd97a22bf044a35ee717e0be0b13f46d8a6f81148c29faa1e048ed4066cf768dbc705141a772d
+AUX embassy-clustalomega-1.1.0_fix-build-system.patch 2775 BLAKE2B 03c93a180b5bd19d74196a17e093df54a82ad70378222c04041274477f16a94bff901ff4d31b36df3597d6bb6a2e96750688a5e279d2f83b2e745cb82cd18549 SHA512 bbdf887e87e00c5f82f964ffda547ce0437795d13ecb73255901028c1e45def1a5a02decf5cd7be045985cf125669cafb00617def6cc2b5ec543aadae1dfb547
 DIST embassy-clustalomega-1.1.0.660.tar.gz 618177 BLAKE2B 5d3f300a0dd825c92c3f953219b2ae8be271a7d89a1237980571b3f9a9027d6a0191ad9e61be87d1ad3334ddd56f9ff11c05d3e277683dc8cdfe511ef3739877 SHA512 fc16f9505e0300ae184e292fb1d96ce6b90eaf80298f847769466a84726d10ea58e3f4c14ed21a9e2c36d7fa533c7ad248b4995bf41c8abbd0fed1faf1fd4801
-EBUILD embassy-clustalomega-1.1.0.660.ebuild 384 BLAKE2B 5896e2a2c95a3c3c126437af70f13cd16ab286dbf600784600859a32fb8ae26c3f791712d114945dbdc8f6984f47c734b560c62df150e4a1a0b0da30f1820eab SHA512 8504bb9294da8a76c23114476fc16a011c45380b5f0f243bcf5a3bc68db6fd71fb7156f450ee14f78ec7825f8ecd46f4b0a7d0764c3dfd7ba1a2939026b123a4
+EBUILD embassy-clustalomega-1.1.0.660.ebuild 381 BLAKE2B 35ffd764e71b73b85110065818095193d822955fa9890e5e9076e09cade350980d1bcf41ee38b56b363c6dea6ca081dbf0f55ae75c474e08c7ef5555d5a330a0 SHA512 58e8112f9d645a058bc40523b6690673dfc0c0870b8b5495dd8121acd5209896a5ee3ac8c89799188635366df4a50631baeffc2d29ab5278c2e52c46e5736bfa
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660.ebuild b/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660.ebuild
index 2d2a2c62632c..93092e9f884e 100644
--- a/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660.ebuild
+++ b/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Clustal Omega - Multiple Sequence Alignment"
 
diff --git a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
index 5525d79b525f..7f92130fb501 100644
--- a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
+++ b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f12ed19..b143922 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index f12ed19..b143922 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index f12ed19..b143922 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index f12ed19..b143922 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9135679..c201149 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index 9135679..c201149 100644
  endif
  
  if ISSHARED
-@@ -62,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -61,6 +59,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-domainatrix/Manifest b/sci-biology/embassy-domainatrix/Manifest
index 22ea27894d13..ebe05ee85f34 100644
--- a/sci-biology/embassy-domainatrix/Manifest
+++ b/sci-biology/embassy-domainatrix/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-domainatrix-0.1.650_fix-build-system.patch 2860 BLAKE2B 6115c049eb2864641e73968e5b094cddf999f0c74fc44ccd64515ea945039903f0c556e1c3d990cbbc14f502078b61f04966a57a728d3aa38f9b9e4acaa363ec SHA512 9c8dfdd2e6c7f8542a989118dad6c70159c55a7f56593800b9d1896fb717b0c28ea100f5884f3284823ad1e92da6e5fe307e798028475e29d353edfe52b62865
+AUX embassy-domainatrix-0.1.650_fix-build-system.patch 2775 BLAKE2B cfe8ec8c3bd62ebaa789d1f3ee63b961f0ab7c41ef44c78faa7b4913945d84da1fa082dc31ebeb92b105762a25992e2d68b56988177aed9ff444743942687d43 SHA512 505a92947e8f50a2a22ea8888a326723fe47584cab4f2414d703753201daecd0e8030cfe41ff53274a0ca08a6cf9c110557e902d7a038ef7f2baffe046093e2a
 DIST embassy-domainatrix-0.1.660.tar.gz 474066 BLAKE2B ac5e081ac1a18d8abfbcdf687a43d4a09436c83fd54bed8c75487f8ed74852979adc96fa592df9f86c161fc8b398f1225ec44e565b470c59a5c2268898943270 SHA512 151e026445abb171a9141ae5576442307121646c66dc811320a6f73be1103203bf04d37b813e5c95ef0873be261cd474835f4dffd042f33f99d7dd4fda19be7b
-EBUILD embassy-domainatrix-0.1.660.ebuild 345 BLAKE2B b56c17ed3121410664d7f7bbd55b9ff09229962c300922dd6c3b72bc21017b23c2477d8dce4fe87e63ed393a43a16fd35cdb42adc708504c8db7a2ce9607e7f9 SHA512 0438a817780278fb85fbd6ba9135725e5b6a850318f8b8e95a504b388e649f7a19fc8472145ced331193d64addbaa1603c3c89e0272872f8795a13cf44d0288f
+EBUILD embassy-domainatrix-0.1.660.ebuild 342 BLAKE2B f4c97aaa3fa9fb33a060b7973d64308bd90caa10e57497d31d3401e5d87d737a353ee5665ae0ee563f994d972e402090ef2bdbf333b4696886aadaa69136cf88 SHA512 178adf2159cc20c5e23a13b4420bf7ecd77a7b82b1047f4f499abbc9e93b1c6cce1acc6e6e27719bf767077c407de314f0d0c9e8ea93ad985944e7c3eedb452e
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660.ebuild b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660.ebuild
index 4607d87fdc17..03e728926cb6 100644
--- a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660.ebuild
+++ b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Protein domain analysis add-on package"
 
diff --git a/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch b/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch
index a932e1ebe21e..1cd2a1b29b09 100644
--- a/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domainatrix/files/embassy-domainatrix-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d16cc02..d327a0d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index d16cc02..d327a0d 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index d16cc02..d327a0d 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index d16cc02..d327a0d 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d405d00..54be7ca 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index d405d00..54be7ca 100644
  endif
  
  if ISSHARED
-@@ -64,5 +62,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -63,6 +61,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-domalign/Manifest b/sci-biology/embassy-domalign/Manifest
index 5afe28fedab4..deb0216a9f19 100644
--- a/sci-biology/embassy-domalign/Manifest
+++ b/sci-biology/embassy-domalign/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-domalign-0.1.650_fix-build-system.patch 2908 BLAKE2B eb0b7288b25a96d6b60ee75e8d022efbd5a3a72ac69c93e32a823316799215d8ea2db923620a0e32924e6961df20cfc939e4fa332d255208175d70977cdc0d14 SHA512 5cd02b39812adc44d9b877cca8902b6a66e79c90975b50233a4f8f84392026ffad25d57665e68e5db533f28935f444b4dc75b7120bafd910e415b75737686ad2
+AUX embassy-domalign-0.1.650_fix-build-system.patch 2809 BLAKE2B 01ae7488b764f3d3853d8f6e4fc2f2115d381decbac3d20922d26c079d0242622f553359dab2401481be3cdf28f25495c567682c1b9d2140f3686f312cbc20f5 SHA512 09444e7ee2b263b56177275c4fe9452344720e641acb721e1630696941a3f077c9790357f9d8b775bff4f5df595973f59d1e9f4c3f66b54fa31f53db4e32ce58
 DIST embassy-domalign-0.1.660.tar.gz 498669 BLAKE2B d21352b28ca046c1bfe8600a7eba641d670e232571f95f9c75b47486a63f2a2b02516191706c0688e81bc33cda90ebf88a9ce800535dce9a955ccc15e25dd20a SHA512 14e86664e9038acc60fbec92fa218e218921fb1e51cc2e482fb1760ccd9ea16041dc8a2a9f5f320fca3340b7efdc48ea9d753b048a43966fc3431acdaddc7846
-EBUILD embassy-domalign-0.1.660.ebuild 343 BLAKE2B eb2e7187c98b12fc74b1efdaf70d14d64c867db49aba11f4f07617bc727dd5223b011ef7b78981b638010e541f8c534d8886b7d7c4fcb9e40ba3b148a0e17441 SHA512 bdc0f0bf6a006d2091f98c3a3258e402b522a743866db74324333c5ec9d14df181561b0beb75baa6aaec130636e1e866184e5c4ed414ceb4e8365e13801df84c
+EBUILD embassy-domalign-0.1.660.ebuild 340 BLAKE2B 8e42cd3a864fe7b85628901b37eba3e72b2d7efcf48ac3b7b48c65735b0983a68d47dd525ed7972e2be9c9b15723c6409de10017718e5945cd7c231153be022a SHA512 236b004af2c4a2e84eebc72f8363af05c757e0251417c8f2971ec4902a067669754980cc65f358a3295a05ea0e3c4a43a9e2b2a7e9e6010632c73ac06c281ed6
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild b/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild
index a897dba4b060..331bd7e05a71 100644
--- a/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild
+++ b/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Protein domain alignment add-on package"
 
diff --git a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
index 033ddf7b6535..079850c2bcc3 100644
--- a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  7 ++-----
- 2 files changed, 9 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 693eb4d..dc0fda9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index 693eb4d..dc0fda9 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index 693eb4d..dc0fda9 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index 693eb4d..dc0fda9 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8785446..fe85f11 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,10 +17,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,10 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -92,10 +84,21 @@ index 8785446..fe85f11 100644
  endif
  
  if ISSHARED
-@@ -63,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -35,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+ $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -62,6 +59,6 @@
+ 	../../../ajax/zlib/libezlib.la \
  	../../../plplot/libeplplot.la $(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -	-lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +	-lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-domsearch/Manifest b/sci-biology/embassy-domsearch/Manifest
index b75a5a676260..a2b6ac07a746 100644
--- a/sci-biology/embassy-domsearch/Manifest
+++ b/sci-biology/embassy-domsearch/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-domsearch-0.1.650_fix-build-system.patch 2890 BLAKE2B dfc956c10857a15a99ac57ca6d4986f43bd659903b71fb6e07b3a57fc0ed82f8303f33dcdc2584f4b5756a756a71b68d65cd4b24a984af3a76ec47789a95f673 SHA512 3f012a5646751b43ec66d006df04cbe8fa880d0acd62723962dbb0e1817c5f5db2bd4879c25cf932114aa43291bc70816afef6664088532222e11135f0ab5603
+AUX embassy-domsearch-0.1.650_fix-build-system.patch 2806 BLAKE2B 44cfc67f34b7d4112cf0247231eb82db7433a1aecfffaf1723b4fcd5e186c0d7dd683db52bbc006027b305c2551b760c98116e5fab3eb874bd1a843f38ef2e71 SHA512 73bc497c5e7974d50a1ecd1ea537b923e5670ac1abafe9877b8fb98e4e94688fe7c77d233e4df45952da6f39013f0fa87d80791cdc79d3ed005e3f8070484144
 DIST embassy-domsearch-0.1.660.tar.gz 504183 BLAKE2B 598ba359558519967d0e8d895bca453aaeffef3d8a62c3d77b6b2f321118e890ec70c3baa3dd3acc03fc9a19cc380909cf3f14e5569c4ae90d3d5e88817d6e6d SHA512 a242100dc7b4b1f4a838dbf65dffb0475b6b890c7d68efae6a74beb3d4784d031f92365a50a41c0d7ea7d1b4be5e65a298626a798970c74df0d5f85427a51589
-EBUILD embassy-domsearch-0.1.660.ebuild 341 BLAKE2B ad203f06d1de9154b8c9603d1ad5e83ebc95f56c07f9a079b0edf38637b8dbae935efaef91aabdf411121cc5956f44a0027d2b8d9fc7784f3f2781bac339a88d SHA512 b7719faa5c0b7fd20379351f41930926cdea99e5c1b26e23aec3f7aceae12e1db885997782b2c4ca89e0bc5d92e17261e990d644ba04da36d9c219c0e5732afa
+EBUILD embassy-domsearch-0.1.660.ebuild 338 BLAKE2B 90d616ea192ce84a7cd8806425ecddbb8cb1c475900616c0aeb7f629ceb9294a05620a23df512a694c606af4e90f4968ddf0643a9800c13adde6556d6382a268 SHA512 64cb26ac31b6dee716132a3ec575e8c19d703e8ba023db382e1ade34ecda2227d2663fc18aa7ef5b5de9bedbb6ff103d2f6ac1a33c1c50e60e18523d54132351
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
index a47adcfb8457..e4c37b996653 100644
--- a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Protein domain search add-on package"
 
diff --git a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
index d24857c8386d..ecc702edcb66 100644
--- a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f0f97fa..d419d7d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index f0f97fa..d419d7d 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index f0f97fa..d419d7d 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index f0f97fa..d419d7d 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9829ebd..433a5c5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index 9829ebd..433a5c5 100644
  endif
  
  if ISSHARED
-@@ -62,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -61,6 +59,6 @@
+ 	../../../ajax/pcre/libepcre.la \
  	../../../plplot/libeplplot.la $(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-emnu/Manifest b/sci-biology/embassy-emnu/Manifest
index abf651b02922..9b2791335e9d 100644
--- a/sci-biology/embassy-emnu/Manifest
+++ b/sci-biology/embassy-emnu/Manifest
@@ -1,4 +1,4 @@
 AUX embassy-emnu-1.05.650_fix-build-system.patch 3844 BLAKE2B b77be3d3917db4cdfcfce201089595a80b970575f77dffbc366c77ae27010b9a78582b035728008b20ae11b0c7c18b7b20a5fdfcd59b840f85f54a1db2fc5496 SHA512 1836ba79762f62f9e27a770a35b89ae5f2821c4d23dc93b1ab3505404105280256f1c43287471385a5be71659fbe614f5f7f97d78a4743b3b1b90b303a25f674
 DIST embassy-emnu-1.05.660.tar.gz 425595 BLAKE2B ed6ab4a0572ac4b57cf0f0b75a3894b1f950f7f373a7c6797ea0c34ba1b0d0e044f2c6951aec7c084340c6b207aa4c8b386055e92ceb9fc83c920fc70e83e665 SHA512 0cb0dafd53c4fd410409430dc12353989d2c226191acace26e81b457602b6b6c60f8eb1d0d9b36ea90b2420010c1a3e887a2458e8487008a36775961e378d0dd
-EBUILD embassy-emnu-1.05.660.ebuild 470 BLAKE2B 4a5fb352f30c729ded48ba438d978ff7ba85ee419eb1dbe94df07f34dd2b6fa50527615678c166cd627090bb2b15bd88d6d8ffd3d66e16006714d9a175444dec SHA512 ec9df242ed5a421fdbc45b59c1a9a9a3cfe540bde2ea010a29ac56e758d26fa0f1a1c850de644e82486a574850b0702d7d87adebfd851cd40076e17596c88f05
+EBUILD embassy-emnu-1.05.660.ebuild 530 BLAKE2B 063882fbbb297ea4bf5b70dd82cc7d4625f027fd87ecf3ff28e34a5d20834e20db39a8750bd3e6738e829f8c727211c1d3d47c47f2a77ffa436f925dcc8f08c0 SHA512 d4caec2280558dcbdbf7e2a5a2d3d658845781d8f05588fcedb7f7ab33fda937f1aac4e97627ae7a6744258d2384d9859a7dc0ea7af968f60f5f8739f070c296
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-emnu/embassy-emnu-1.05.660.ebuild b/sci-biology/embassy-emnu/embassy-emnu-1.05.660.ebuild
index fd6b02d8d235..dfff5eb5de26 100644
--- a/sci-biology/embassy-emnu/embassy-emnu-1.05.660.ebuild
+++ b/sci-biology/embassy-emnu/embassy-emnu-1.05.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Simple menu of EMBOSS applications"
 
@@ -10,13 +10,15 @@ EBO_EAUTORECONF=1
 inherit emboss-r2
 
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="ncurses"
 
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/EMNU-1.05.650"
 PATCHES=( "${FILESDIR}"/${PN}-1.05.650_fix-build-system.patch )
 
 src_configure() {
-	emboss-r2_src_configure $(use_enable ncurses curses)
+	# --disable-curses is not a thing,
+	# EMNU hard depends on ncurses really, #752216
+	emboss-r2_src_configure --enable-curses
 }
diff --git a/sci-biology/embassy-esim4/Manifest b/sci-biology/embassy-esim4/Manifest
index 861ecba8f320..0fae9cd83198 100644
--- a/sci-biology/embassy-esim4/Manifest
+++ b/sci-biology/embassy-esim4/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-esim4-1.0.0.650_fix-build-system.patch 3167 BLAKE2B 23dc6aeb76d8396bb03e07abb9e3d6e00d982d050ea02156e43bc4388fdeb3a26a7af77d59c3ec358fe369cf40befae0f79c460c903110a7d71e4bf89512aed3 SHA512 c8f4468998b1e91122e4ee5f355c5db451fa889892c05125edcc2f734051410251de85a9d7aaf5566dc802240d2925c709cfd448c8f96351aaa91c124eb1396f
+AUX embassy-esim4-1.0.0.650_fix-build-system.patch 2944 BLAKE2B 19712a0b6fb79a37e990bfbf91471c7a08e1e22c01ae97850ed6c09f7c81272ddf841bd834b88f798598297c4df526f4cb12cb29d6db28f0d0ae1db6d05ce116 SHA512 846197536cf1f308f51ae96bb8186198f1c720ad05fb16c94e36b1aadbc3dbf50b21ddecdb2a52acc0444e0c0db980653f3d90f01b43d334d1cd995868888da8
 DIST embassy-esim4-1.0.0.660.tar.gz 473261 BLAKE2B d15029b0723dd739fa9208f9b0ffd7814cbddc630ca2ff15955412f493f7983753acf82bcc8a3fc6ddfd49abe630982ead377e6941dcbff44ddc5d8ab4e7d6e5 SHA512 623b241915217ffb314e3fc4ca6aed5e1683b78b6c76f899b67c4e5d48ce83c9920d79b1c5a1508d61856c332e614020d0804b7252c535d9622f9623f29cd152
-EBUILD embassy-esim4-1.0.0.660.ebuild 345 BLAKE2B 9b4041be06278cdc5afee7b710ab21eaa048975f7e2a496547171da92a621e55e0d731c210b60d1a661857fe7de2719a58d1cad42134277adfbf0fdc16f37471 SHA512 baff9c211e98de225f8644a441b99b4693f16068c151b5ee5b59c481e6de564e5cce0f0617bdb52a3d96b642a3b22dd558eab3329098d3ac028527818dc16357
+EBUILD embassy-esim4-1.0.0.660.ebuild 342 BLAKE2B 2e9c56d305a5e31d2376695e89236d7f64751a9bb922dae565e457fc44230e199e767c12208da0bae8f40be23957fcc788139a1d2e25d499e3da1ad0820e7a78 SHA512 082006d670e565b734711759cedc3ea84229c7b13ccf48a1dd823fc8918ea4e2f1d1568b1599ea2587ae0c5a4eb6e6753311df68d8a82b5b55e77dbf5733fa4c
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660.ebuild b/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660.ebuild
index 16b6d29ebdaf..2538510c6bd3 100644
--- a/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660.ebuild
+++ b/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="sim4 - Alignment of cDNA and genomic DNA"
 
diff --git a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
index ead54c91b5f3..7a85b4f7bf81 100644
--- a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac           | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++----
- 3 files changed, 10 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 924220a..2c45f46 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index 924220a..2c45f46 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -63,7 +56,7 @@ index 924220a..2c45f46 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -77,8 +70,6 @@ index 924220a..2c45f46 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
 --- a/emboss_acd/Makefile.am
 +++ b/emboss_acd/Makefile.am
 @@ -1,3 +1,3 @@
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644
 -pkgdata_DATA = *.acd
 +pkgdata_DATA = $(srcdir)/*.acd
  pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0620938..0304bb8 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 0620938..0304bb8 100644
  endif
  
  if ISSHARED
-@@ -63,5 +61,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -62,6 +60,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-hmmer/Manifest b/sci-biology/embassy-hmmer/Manifest
index 9acbe42f919c..5d34609a139f 100644
--- a/sci-biology/embassy-hmmer/Manifest
+++ b/sci-biology/embassy-hmmer/Manifest
@@ -1,5 +1,5 @@
-AUX embassy-hmmer-2.3.2.650_fix-build-system.patch 2860 BLAKE2B cc3075caddedd8c50836b46943caaddecaedc517d93da7d9777f8c6dad97442f185f51e2c755173038c90dcb10097cc4b105ae812e54826552444d5b46374155 SHA512 f215e5c338aa1f0bf791de223f3ee9a13622f70e142c5ad4812dfe171f7d602aab750e1dfe4233324752adc645abf289e63d8981b8497787c785c07de64c7944
+AUX embassy-hmmer-2.3.2.650_fix-build-system.patch 2775 BLAKE2B 70ac87074b81a15a4f8641a9c98136b23ef8ad78c2ee17b3762a624366638023e147efaef478b1c79f5a5f1d09a882cb3fecb1eec4131307bc585b08855aae6b SHA512 b0ff185fecd52e5452d3257b2e5bd6f1268d84b491f529d66025534d9353f57ddecefa81a69ae3299ad687b1d3480964c4a1df609c2e77b0db1a511207ac49b6
 AUX embassy-hmmer-2.3.2.660-slotted-hmmer2.patch 3392 BLAKE2B 56da7becf8da8195016cb98518a19fc34394d98400dca6bb499d43c57172ed76ec81d5a9216b4a1b5e67b33520431ce87ed1327db99f3f924a36d80ff8c9e0c3 SHA512 18d1595b7cd6091917f9657310b286d2f0d1f6a61c045840b1c551b66162142997b837cc50b47a3a5fa7efec4ffa78e5b9b52804e3c4d41efeed9b4edb6e5507
 DIST embassy-hmmer-2.3.2.660.tar.gz 587775 BLAKE2B ae7f7c8722bb06d4e28333837b082045e48179a596026a76c2a42f7905c7ebc42f98dd4f36915e4603322bb6d976ac4fa4e8ce6246cdee025b39ecfcb250bd10 SHA512 eb2c037fec70f4113b9ab59cc4eca9a608e8d0971a7bcc4612d60b1e28556444dd3ecdea4ff7b8f8b34711ad9f655334857e7510e89060459c81994a3abcc02a
-EBUILD embassy-hmmer-2.3.2.660.ebuild 501 BLAKE2B 3890181b25b9f6ca7793f05765f47723d6c040478af2f197f0ef9ebedd594d293224cf4878fd1e8a0850781252abc54537804116fcf625f38d35439e2cf8020d SHA512 bee21c5e7950f2f11be84c0287010630754681d840fc7393f9fc8e0c05fd14169e03f37a6d99bc4dfb28dae5b9f78a9f509a163cee6722796a3300b0cdab0651
+EBUILD embassy-hmmer-2.3.2.660.ebuild 498 BLAKE2B 7f319b02c38423cd0bcb6fa7f5833ec4c781c04ce52cf18db847406d5934ffb8957cb1a39e712fd3314bb78e08823b8442809c45b4c8b5d5e0c6e638451fadf7 SHA512 cff995afdb31de78ec2feb8e8b0fcc3f4e51f5214b3fd443c5b24a2f4a7dd3ac9e0a712f400734128bce52d7cc80b2fd71882716d7d1ed9007ccaa6a31710ee2
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660.ebuild b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660.ebuild
index 4fa2defa1f7d..c22ff4141c2f 100644
--- a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660.ebuild
+++ b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="HMMER wrapper - sequence analysis with profile HMMs"
 
diff --git a/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch b/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
index 90c45632eada..303aacda46cd 100644
--- a/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 037ca00..f539ab6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index 037ca00..f539ab6 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index 037ca00..f539ab6 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index 037ca00..f539ab6 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index dc789bc..5a8c38e 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index dc789bc..5a8c38e 100644
  endif
  
  if ISSHARED
-@@ -67,5 +65,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -66,6 +64,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-iprscan/Manifest b/sci-biology/embassy-iprscan/Manifest
index 179b45815bc4..6e6ae833c3fb 100644
--- a/sci-biology/embassy-iprscan/Manifest
+++ b/sci-biology/embassy-iprscan/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-iprscan-4.3.1.650_fix-build-system.patch 3167 BLAKE2B ef1f3263072850667744e2064929b2cd38620046f1cd2c6ec5c4bed135554cdb7e36d8b58363031051fbb98f294dc9f6c77bc7ac81ff14110baca368e51b8407 SHA512 b2b28377e60790db744f32eb5cd4de5b7e15129b603e21013eeeebaea5c06e6867937b6441f3d8e788effdbb58c57b8841880aa7d4b4eae2b0b83dc72242f4d8
+AUX embassy-iprscan-4.3.1.650_fix-build-system.patch 2944 BLAKE2B 0342606ad758dc533186f455062b7019a04a0b7e8d49ca61214de09caf0518bec6b63f0dcc69652eb24bbb8704047cf0f8739cb9c8b8f2883e525176b389aa1a SHA512 98431bf56317a987083fe936f6b5d0d00c5f773bbdab5e3ee4dab6d1d6b6edb5448c4602c11f79aeed05a5642838cae7c3ab692661b18d1d15fdc9793604c856
 DIST embassy-iprscan-4.3.1.660.tar.gz 406720 BLAKE2B a7e5a20b8fd1eb1ba562b5db6643542d5062b270d69a2c53aa66f5cb58f48f1d3a480ae062e53341a884eb497fff22d546df42256cdc131afb183067166fa8b6 SHA512 eed75693557f141331dfb6bec6961a8f6eab93780cad3b629d547b8635be2df6ec85e5ae0e9646d174a562a0f6d31c3c487a4dacac9efdd393a7144cd5716878
-EBUILD embassy-iprscan-4.3.1.660.ebuild 363 BLAKE2B ca438f24229f607365742c8a1dd9d0fc72ad44a374b7ef6c4446684dfb3a7229bd3b9ca85bbe396fe247a7ea6f9d7b9ea32753f51bdd74919ad718a019e760a3 SHA512 3b140b4b5f4e25d6935b4f159cf636d76dd5437c97fa3c4d0293287db5e1e52cda7db29eb4a0cd4b34aa9596da791725a51a653af27be52cdfbfb76c6ba1c1f6
+EBUILD embassy-iprscan-4.3.1.660.ebuild 360 BLAKE2B c4cc140e02c9eced5cff9976734fcbccde4a61d259cf1787a0a744f0639ea12c27d173e8badfc649f7779dd18978523dc1acf86174e1eccf697351c839fa4c9e SHA512 5e4a54bd7fb3d0522bee736678a7e8e590b07635137089487412c23c2717c6fe9b6aa1075fcf2b8c94656388fe2594c78f5c0f7c9eef91807c355809d82ca527
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660.ebuild b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660.ebuild
index 3279ed3bc8e8..351ecd1df3f8 100644
--- a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660.ebuild
+++ b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="InterProScan motif detection add-on package"
 
diff --git a/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch b/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
index 8c8a1060e30f..ab627c323253 100644
--- a/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac           | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++----
- 3 files changed, 10 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9052ca5..c12c268 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index 9052ca5..c12c268 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -63,7 +56,7 @@ index 9052ca5..c12c268 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -77,8 +70,6 @@ index 9052ca5..c12c268 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
 --- a/emboss_acd/Makefile.am
 +++ b/emboss_acd/Makefile.am
 @@ -1,3 +1,3 @@
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644
 -pkgdata_DATA = *.acd
 +pkgdata_DATA = $(srcdir)/*.acd
  pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0afc96a..904b41a 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 0afc96a..904b41a 100644
  endif
  
  if ISSHARED
-@@ -58,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -57,6 +55,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-mse/Manifest b/sci-biology/embassy-mse/Manifest
index 2ed7653d9601..b41ff2714e8c 100644
--- a/sci-biology/embassy-mse/Manifest
+++ b/sci-biology/embassy-mse/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-mse-3.0.0.650_fix-build-system.patch 4274 BLAKE2B 20674fb79ff55fe7e73f0dc5c62bbe6acec81cb314260a6b879b0881b9f0848204d82301675c5829ef236050af3e4f5d2c31e6cd3a0c2f9554da1408951deb4c SHA512 bfb4663a4b38928f765813cc9b5e773ca712c2333c1650d9c78f457307aa450684f77a20c0a087d3795d5b51f059c6f8113e74da35aa78753c1cc666ba583f4b
+AUX embassy-mse-3.0.0.650_fix-build-system.patch 3968 BLAKE2B 97999702bc800bb02c0c77969e17f4ab36e6491d494ff09c3fbb20624f75db7392a5c1dbe91d977e3596855a89ccb70525c01cf7952364fb4bac4a8f403ea5d0 SHA512 8abaabce2566d42209e6863c30c6cbb392afc900d52f819e975662699651b7114257a372a50657419355d0af69f1dea80501fe2b3cf57ce1c8ca731d1b7557e4
 DIST embassy-mse-3.0.0.660.tar.gz 491747 BLAKE2B 7d072458577a90fc367c5b6ed72d1d36592e42b83b3a4e31126b925ddc76f1946fba14e22b7410f66eb837f686f848bdb1033f3b62084f1423543d7605c4f6b9 SHA512 4ae34de71566464e4352ff7b3bbd19b8bf0571013f34253495cf5cc57240bac9c75192c302eb0231763db1745a7e3e79ebcdcb006e36ea4621a886b213eb96d3
 EBUILD embassy-mse-3.0.0.660.ebuild 560 BLAKE2B 9eab17caab14b9c89b455239cbf5006ccb4454be3d54c9233cbda6bf107e44f0b8e88e514d60eae529892d80afd59e53e2d0dadaa113d4de50eecd6a693d7bd7 SHA512 a6b0a375dc3fe6035df488732848ac6dde8209a641c7f201ab2d6b6e463be87b505d486d207c64f2b690fe437772f78196ba223678788b879d2b21b2e3e1cedc
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
index c1095b266d60..23e656dc0a86 100644
--- a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
@@ -1,11 +1,3 @@
- ckit/Makefile.am       |  2 +-
- configure.ac           | 67 +++++++++++---------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++---
- 4 files changed, 18 insertions(+), 59 deletions(-)
-
-diff --git a/ckit/Makefile.am b/ckit/Makefile.am
-index f87b131..a670d2b 100644
 --- a/ckit/Makefile.am
 +++ b/ckit/Makefile.am
 @@ -2,7 +2,7 @@
@@ -17,11 +9,9 @@ index f87b131..a670d2b 100644
  
  CKITSRC = datafiles.c next.c seqentry.c strings.c gcg.c pir.c \
  seqspec.c ttyinterface.c nextseqentry.c \
-diff --git a/configure.ac b/configure.ac
-index a20d488..eb208bf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -55,7 +45,7 @@ index a20d488..eb208bf 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -77,7 +67,7 @@ index a20d488..eb208bf 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -91,7 +81,7 @@ index a20d488..eb208bf 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-@@ -1000,17 +965,13 @@ AS_IF([test "x${enable_savestats}" = "xyes"],
+@@ -1000,17 +965,13 @@
  
  
  
@@ -116,8 +106,6 @@ index a20d488..eb208bf 100644
  
  
  
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
 --- a/emboss_acd/Makefile.am
 +++ b/emboss_acd/Makefile.am
 @@ -1,3 +1,3 @@
@@ -125,11 +113,9 @@ index e1c1878..e253c95 100644
 -pkgdata_DATA = *.acd
 +pkgdata_DATA = $(srcdir)/*.acd
  pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b44632a..84e89b5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -18,9 +18,7 @@ AM_CPPFLAGS = -I../h \
+@@ -18,9 +18,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -140,10 +126,21 @@ index b44632a..84e89b5 100644
  endif
  
  if ISSHARED
-@@ -60,5 +58,5 @@ LDADD = ../ckit/libckit.la \
+@@ -35,7 +33,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -59,6 +57,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
+-LDADD = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
 -	-lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = ../ckit/libckit.la -lnucleus -lacd -lajaxdb \
 +	-lensembl -lajaxg -lajax $(NLADD) $(NCURSES_LIBS) $(XLIB)
  endif
diff --git a/sci-biology/embassy-phylipnew/Manifest b/sci-biology/embassy-phylipnew/Manifest
index cf5e861ca30d..df1af5230960 100644
--- a/sci-biology/embassy-phylipnew/Manifest
+++ b/sci-biology/embassy-phylipnew/Manifest
@@ -1,5 +1,5 @@
 AUX embassy-phylipnew-3.69.650-fno-common.patch 16289 BLAKE2B 346f5d704be918503a80ab224e1892953a2d1d6ef642e6ced95fcb1476954e09d983bd0eef1d6afe71d2c4e043a05a99dd92748151e337ac5d3646d91008c2e9 SHA512 0ea1f10865832a44647f0888eabef1df6e5baadace9fda782f171d52eef70fc7d8ef80317d46eaeb029896b8b0b4ca0d845561ae761daf406f7c26e18ebd1341
 AUX embassy-phylipnew-3.69.650_fix-build-system.patch 3019 BLAKE2B 39c2d7843ffac8c0a04c70d307d5651f2e53cc386c3a9b1f312d4fd53a9b9ba235a02931c4812a750da8711988e262b1c9a51a7152da20f61cd56c0d21607a89 SHA512 7d46280ffadcbc07e01d09a49a7896539a5c0c271979fcb3e1ffdf385051812adeaabec186c73e2105a710eee2fd340d89bbcbd4ecfa112879fb00cbc58c2dfe
 DIST embassy-phylipnew-3.69.660.tar.gz 1741298 BLAKE2B 58a2c66ffb9c447fa17462bf54d7b8e65702701d74c1f16ec6906a3acaf076ebcab30982befe6334101bc483901132069a71ffa0e2334aaee0da02a30276b7f2 SHA512 b41a31285e05a418e4fbfae7241c3658fe458e3d5d84bff472d98b7c145340a55bee1d744b5c056d0e88407074947b5f37b2182c9cb800c8a8d43dfa76d026d5
-EBUILD embassy-phylipnew-3.69.660.ebuild 409 BLAKE2B 35bac3a33793b140470ef4c627b578317f22efdd7d9c71eeae947f0a6399d94829c5ceeb85d537616811f593b3b54eeda9c1f9bbf0710a20d3eba12891c0f07e SHA512 d088e1121fed9e50066767b58a4d2ea61e5ad5167293cc3780e9bec71f4613d144b985f96d235ab9665a94bff8703a005cdc86916d63cf593941a3e6aeac1165
+EBUILD embassy-phylipnew-3.69.660.ebuild 409 BLAKE2B 52d2e35042acda08f96cab28de1d0dd2c31c6824df7541b195644f67a8325b35b4ce34d8eab9710f0239466feeaa4c0f5f20017891812e702671710797fd0315 SHA512 7511f44570ab985948b8daf6b9267235a930d0c70fc17cff754393e3c2d9028db5360dc60642398a5fd951ae412a70d6d5610a0008137ef646040ccd1904ba27
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild
index c5ba6a540bfc..129b42870a79 100644
--- a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild
+++ b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.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
 
 EBO_DESCRIPTION="The Phylogeny Inference Package"
 
diff --git a/sci-biology/embassy-signature/Manifest b/sci-biology/embassy-signature/Manifest
index faf049a6fa0d..e450e4a537da 100644
--- a/sci-biology/embassy-signature/Manifest
+++ b/sci-biology/embassy-signature/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-signature-0.1.650_fix-build-system.patch 2860 BLAKE2B 33e2c35f574283d979ceec4fd6c3f007a9e8a0bbf111e8873866de331b6474d5fd6f3dad3af980471ac3155f5e82637e60ea26ce5217a4e9a56fcc120b408e35 SHA512 54a6027b2fb1d17eff98b7c1e9adc61578a2845b30be3b7c40551b4291950ce11900798dbf7d54e1fc9421743a8d313fc42a14cfa39976735ac8cfae5a297954
+AUX embassy-signature-0.1.650_fix-build-system.patch 2775 BLAKE2B ca267498e98a294546429cac0c4276fe7c3dbdfc199d151bb7fc758e805a0f7b6de25094a2f9ec00e21b52a617176a8d45d20424cfbb37276bdc4a0000fb8ed8 SHA512 5e4f72d2960f17a2c758f6bee15f9ddd317e55ae338c46f2b915beba334729d837f573833b54310284db59fa1f1b397d8981ab4b91671cc95bcea7d441820911
 DIST embassy-signature-0.1.660.tar.gz 622294 BLAKE2B 8d495b164d7aa18b4bc2db14d12e3f3ef46f2d9c6d9f98e46bebd888781ee71e7ddf88dbdb37c7be52fdd1182337ea7c70cca1247489a14f652b86918e58c46a SHA512 4989693b17c29ece16f94934e1b2f5e62f31c345bc8cbac938450db0d8f5d56ae37be6090c46e96725e63621c5951f8a65461cd36d4aafb1b509f3f554b4e952
-EBUILD embassy-signature-0.1.660.ebuild 337 BLAKE2B f444c8dd91ae1f214be4687bced734b1abf883a5f4efbd844ce2ecd30b026e65f22b7aa73695a10a1913b8c8aff569327e88a5555d4635d7409a99c1e75287cd SHA512 ce592d367c64428911a735a5ecc3a24000a5b1e8c3b3fcaf466e5005a962deaf113416cd161039eb445a1a41f7296ca7376531396bed019047c0d97c86296585
+EBUILD embassy-signature-0.1.660.ebuild 334 BLAKE2B 3102c22d5f604cb3241730df137049d99fda38cd1f02a4120c58669c388c2881c6ecc9b9abbe47be05f58a8b6fe0c0fee9fc210eaaf73044aa7987de26cd609c SHA512 d1414951385d7301aa45881866f55433a37f9938e5be14de9d2056a8b87e16767c45421a0e0462c8609806afb379114578b0b3d4908008ca16a780638d8ab9e1
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-signature/embassy-signature-0.1.660.ebuild b/sci-biology/embassy-signature/embassy-signature-0.1.660.ebuild
index c0ea3e302504..4d873a69a69a 100644
--- a/sci-biology/embassy-signature/embassy-signature-0.1.660.ebuild
+++ b/sci-biology/embassy-signature/embassy-signature-0.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Protein signature add-on package"
 
diff --git a/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch b/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
index 32e4d684cbb3..10bee217bab1 100644
--- a/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f5ddd0..827543f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index 2f5ddd0..827543f 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index 2f5ddd0..827543f 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index 2f5ddd0..827543f 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d77e43c..849f17a 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index d77e43c..849f17a 100644
  endif
  
  if ISSHARED
-@@ -68,5 +66,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -67,6 +65,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-structure/Manifest b/sci-biology/embassy-structure/Manifest
index 3b1134f3b481..593fda83a0a3 100644
--- a/sci-biology/embassy-structure/Manifest
+++ b/sci-biology/embassy-structure/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-structure-0.1.650_fix-build-system.patch 2860 BLAKE2B ab45dd016f21520afcf8bf949f150441b7c7d451e35851ec05edbacd3145f559ccc18550e8c836c0663dffe3fd47bafa0d8501028a7f4bbc51161f02d6b24243 SHA512 8929ee9e2eff5636e4d40ec5d1860d866e90c17cc23f4e75f44fd829409591b869cd5feb13a6c02bb5d80a9a7ed55c06f7be45f61268a768ddfdafe84188237c
+AUX embassy-structure-0.1.650_fix-build-system.patch 2775 BLAKE2B 2ef40db164efb8fa5dc3bbe06f5edbd7b2dcc9249e5a58ad3ec21feca8fcabbc78e317a1ea9a7939a4947088abe315c1cc6714fda0c20449a4cd527c1c112cff SHA512 19f51e9f1bc69f0807ee7f3d6bf8d2d21563c0a21eb08bee38cc0d9e68fb0cc1b8035402933cb8e5c12626d5b6a0b7e470518c503eaa5b1d34cc7548bccd6b21
 DIST embassy-structure-0.1.660.tar.gz 588118 BLAKE2B 2723eebc309c81cc94fea687819de2c76d30ce87bb7c6dac12e9964c73fd18b497a31db07d12803d87799e42063b73d406520434482bcdb29f23a14756d11750 SHA512 56fb0ed975bfd95b1fbbccaf694e0617ec23971d53bdc230eeb6ca177907e784805697193e7630e4a513f1b4ee7a1a7974136520963557c452185be4ed22b641
-EBUILD embassy-structure-0.1.660.ebuild 337 BLAKE2B f20f50b58478ea73245f73816d3ea85d5d7bf19224aabed1ac14bc433017e9a37416a7f23b5915f00d80f9d9c82a19555504c9f47febc1a6979c6325ea64562d SHA512 13a68a4590058e36d0ee5e016bfdae8e2115aefdec8d50ff988b0841f6bc1cc210c090da97811c4aaf654e132f32b28bdca559dcf157d7a3a0a66a2dfc946c3d
+EBUILD embassy-structure-0.1.660.ebuild 334 BLAKE2B 53e652e9d8c396dc29f76a4142c64488918d01b73d94af8d06356440d1b1e99641941c7d6771b1d53f42448802f56592ad20f0ce8d50be32c1feafdbae1cb31f SHA512 9001c1dd9cc59c5d266b7945153b9cb0092a30654ca42d32e7ba0712231d44fa96c1d74f639f61c360a2576d224fc601ab4714c665d860f4c053b6a2dc36a978
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-structure/embassy-structure-0.1.660.ebuild b/sci-biology/embassy-structure/embassy-structure-0.1.660.ebuild
index eaf74b5ea841..1c5bb1e9a967 100644
--- a/sci-biology/embassy-structure/embassy-structure-0.1.660.ebuild
+++ b/sci-biology/embassy-structure/embassy-structure-0.1.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Protein structure add-on package"
 
diff --git a/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch b/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
index bdd9e37714e4..a67bc80f2a23 100644
--- a/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee482ef..e4af4b1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index ee482ef..e4af4b1 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -62,7 +56,7 @@ index ee482ef..e4af4b1 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,9 @@ index ee482ef..e4af4b1 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 81ade5d..2ed0d14 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,10 +83,21 @@ index 81ade5d..2ed0d14 100644
  endif
  
  if ISSHARED
-@@ -66,5 +64,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -65,6 +63,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-topo/Manifest b/sci-biology/embassy-topo/Manifest
index 97983069ff2e..e1c6e4c988fd 100644
--- a/sci-biology/embassy-topo/Manifest
+++ b/sci-biology/embassy-topo/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-topo-2.0.650_fix-build-system.patch 3167 BLAKE2B 84dc4a55e13387263400d03904c14069baf93746ce32878349cbaab3c1d39aad30c448b8bf01fb2cec0a057403a8c8d7befd3869c5c28299e6001f25738a16c6 SHA512 bacff621e9d80d39a4e415736e1524cf69dd86b0253f65fb52ad2dda200cafe8e14af296897c3f695bbe360f2a56862a40dec6b8b0d0e597310f065e191ae770
+AUX embassy-topo-2.0.650_fix-build-system.patch 2944 BLAKE2B c9535f630899346a43a993c3563e202792610c751940a2aed3d41fc633fcffb53c372c702c19104fd709dda6b6093c4897d19336028312757135ccacec3cd8af SHA512 981326c4b27a0db091494da5a2d6215dbdac31544b33601765329c7b4e817ccdcc39e795cdc14719211a8726cb7761d070e83e234e878ac7f82bd226851ad1be
 DIST embassy-topo-2.0.660.tar.gz 443510 BLAKE2B ba49debdfb9f13051bd32d0d14de3b446a8fde83923e6927df52fd989460c60b5d3023aeaa84d3ab920533c40607f7ba274f64827cefa611a1513f203e08316c SHA512 8ef157a61ac47680734bed3d07cfe2bcd86730998453daa704b74aad667944ad6b0cc6f7fce36be4566cb19a626f1648d5f6793ce227cf57939fcfd0d10690a8
-EBUILD embassy-topo-2.0.660.ebuild 342 BLAKE2B 268ee1b91524560d28c58cfacfae4f249fdb9efc3b34aae381e6779005fc7a7022b56c74f61e8cd541dbb9bd112cbb7a9c0a569272e0962252104eba435615be SHA512 c2a0822f7d20ae5c2bb78aa2f3705517fa7371b154a16395d7b13b5835980a11dce9364cb6d0a90f47a39cc729692b4567ceb5085022b3c0ed41535a3a8ab067
+EBUILD embassy-topo-2.0.660.ebuild 339 BLAKE2B 97a0643d61e7dd61025ee0ea1b2b0429bc843737dbed7e53ac955c60c2540a0372b1ad15f8a00d884943e7b791c4e98eb5c04a4fcb1992f031c9a40d1011860c SHA512 50f5b9a761e053206a6a3d1021e5cdbf9f1d557c300185e3d42353f593c2e653263f4a640c536fee938c74ac4924ef54eae9a9df233b32900f544f3512ce46e5
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild b/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild
index 009adfe73914..3c16f7bf4fa4 100644
--- a/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild
+++ b/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Transmembrane protein display"
 
diff --git a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch b/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
index 3c37879de8c8..600e38928aff 100644
--- a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
@@ -1,13 +1,6 @@
- configure.ac           | 49 +++++++------------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++----
- 3 files changed, 10 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8eeb8ca..4fd28ac 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index 8eeb8ca..4fd28ac 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
+@@ -737,21 +710,6 @@
  
  
  
@@ -63,7 +56,7 @@ index 8eeb8ca..4fd28ac 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -874,6 +832,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -77,8 +70,6 @@ index 8eeb8ca..4fd28ac 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
-index e1c1878..e253c95 100644
 --- a/emboss_acd/Makefile.am
 +++ b/emboss_acd/Makefile.am
 @@ -1,3 +1,3 @@
@@ -86,11 +77,9 @@ index e1c1878..e253c95 100644
 -pkgdata_DATA = *.acd
 +pkgdata_DATA = $(srcdir)/*.acd
  pkgdatadir=$(prefix)/share/EMBOSS/acd
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1cdb0b1..0e86a4b 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 1cdb0b1..0e86a4b 100644
  endif
  
  if ISSHARED
-@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -59,6 +57,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 +        -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/embassy-vienna/Manifest b/sci-biology/embassy-vienna/Manifest
index 6218b012ba4a..dcf9c44204c2 100644
--- a/sci-biology/embassy-vienna/Manifest
+++ b/sci-biology/embassy-vienna/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-vienna-1.7.2.650_fix-build-system.patch 3083 BLAKE2B 294e9896615c7d01a804097249673f86d8bf6bf6757763bdbd2cecf9e328a2b324b6918818f8e33917c2000d5a2dad5a66aa6c0e764619d35048d3c5ca032351 SHA512 b09ea9adcc9da002a83e431ff4f3f48075bd885bd35b5690a21ed7d120835a5fa9eaf566fecfd916897e18d539ccc7ea1c8640759996e4979865556eaf8dccb2
+AUX embassy-vienna-1.7.2.650_fix-build-system.patch 3349 BLAKE2B c6d12bee84b5bc5bb987929a1d606c28cab1d5bb318fdf294f01569d90ae4736c818ddf3d5d2fd506fe3d012c35d320c74c0b3185540e19a03b0e7dbcac9e0d6 SHA512 4da6e09711974bf10259558f78208d207f3e07b0156488acfce788d83f05a6872246d6acf3c318195285e1d84b3788aec65d82f989c682b56129c4dfb6df8eae
 DIST embassy-vienna-1.7.2.660.tar.gz 873165 BLAKE2B 46e976e52ad65490237563af09e483c212a6170c8c79fac8a2f2609040ee6a4cf60c04b00159c4c33d8c2a10f6e457e412287409fc0ea5724c5687dbd65ff06c SHA512 1484ca419ebcb7776d8f92dd633d4fda1a752a73ccb5189b58f7417a5611e015e9b42cbb37b51f4d5c7a27df0d5cab2cdf1e95ebd70a8359ffc8fa1633d28103
-EBUILD embassy-vienna-1.7.2.660.ebuild 436 BLAKE2B e61cd8a676a547d75b80035ffaf6e54d8d02e9ae81713f0baf010394231c2e963b2d61926923f7873d7edb726343088b288b9562df4d8957cf18257f20281ae0 SHA512 009ad16069bd0a8134a705a82a2d1ee5a3b5de28d434870e9b7298e64885a8c76f1c604432b2d0808d6f4653906e211b6c848496bbefd0c4324d698fb8285ec3
+EBUILD embassy-vienna-1.7.2.660.ebuild 433 BLAKE2B 2feaec37d75ccd9bb4798f56ed58a06944e06488d4ce8bb2ba924dda2cbce5abf54e6ef1e15cca61620db06b51132143cc001e0ef84f5eeeb4f3e7b95bc23bfc SHA512 0481fac0f109b153119e6e12907cea9083a52b3a85e1c26985b14e45cf9a68e36b188bc16c10f528eb19df73fad511afc13742eaa8cd653e5fdd6559497c7184
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild
index d82532a4f623..6d63add1eea0 100644
--- a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild
+++ b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 EBO_DESCRIPTION="Vienna RNA package - RNA folding"
 
diff --git a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
index 5ce365ed5497..8bd816b0e672 100644
--- a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  7 +++----
- 2 files changed, 10 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f5a4ecf..bbe0743 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -649,33 +649,6 @@ AS_CASE([${host_os}],
+@@ -649,33 +649,6 @@
  
  
  
@@ -40,7 +34,7 @@ index f5a4ecf..bbe0743 100644
  dnl FIXME: This does no longer seem required with Autoconf 2.67?
  dnl Intel MacOSX 10.6 puts X11 in a non-standard place
  dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -751,21 +724,6 @@ AX_LIB_POSTGRESQL
+@@ -751,21 +724,6 @@
  
  
  
@@ -62,7 +56,7 @@ index f5a4ecf..bbe0743 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -888,6 +846,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -888,6 +846,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,18 @@ index f5a4ecf..bbe0743 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1f5b756..e178914 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -32,9 +32,7 @@ AM_CPPFLAGS = -I../H -I../../../nucleus -I../../../ajax/pcre \
+@@ -10,7 +10,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -leplplot -leexpat \
+ -lezlib -lepcre
+ else
+-CYGWIN_LDVIENNA = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl \
++CYGWIN_LDVIENNA = -lnucleus -lacd -lajaxdb -lensembl \
+                 -lajaxg -lajax -leplplot -leexpat -lezlib -lepcre
+ endif
+ endif
+@@ -32,9 +32,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,7 +92,16 @@ index 1f5b756..e178914 100644
  endif
  
  if ISSHARED
-@@ -87,6 +85,7 @@ LINKFLAGS = $(VERS_INF)
+@@ -49,7 +47,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -leexpat -lepcre \
+  $(NLAIXLIBS) -leplplot
+ else
+-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
+ -lajaxdb -lensembl -lajaxg -lajax -leexpat -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -87,6 +85,7 @@
  endif
  
  liboviennarna_la_LDFLAGS = $(LINKFLAGS)
@@ -99,10 +109,12 @@ index 1f5b756..e178914 100644
  
  ovrnaalifold_SOURCES = vrnaalifold.c
  ovrnaalifoldpf_SOURCES = vrnaalifoldpf.c
-@@ -119,5 +118,5 @@ LDADD = liboviennarna.la \
+@@ -118,6 +117,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
+-LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
 -	-lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = liboviennarna.la -lnucleus -lacd -lajaxdb \
 +	-lensembl -lajaxg -lajax $(NLADD) $(XLIB)
  endif
diff --git a/sci-biology/libgtextutils/Manifest b/sci-biology/libgtextutils/Manifest
index 74b2ae8850e5..cf88825b18da 100644
--- a/sci-biology/libgtextutils/Manifest
+++ b/sci-biology/libgtextutils/Manifest
@@ -2,4 +2,4 @@ AUX libgtextutils-0.6.1-fix-build-system.patch 1719 BLAKE2B 993f1e68f960853a264d
 AUX libgtextutils-0.6.1-gcc6.patch 724 BLAKE2B 14ebd0ab5ec4685688caa922dacccdaad9101af0814a93b08f0c9ba5e50ac6a02291528b6ad3d61b48a2f29a25b63e421690f19109351f4472cc118886ca0e10 SHA512 74ec8fafc699cadc5d40f5284cd42cfb8c949744b7a16bbf8142c8db71ad6c921551da03f260e82bfe84b69dd5fbd2261031fe22aee6b3396515b1f66576a530
 DIST libgtextutils-0.6.1.tar.bz2 273459 BLAKE2B 81b1e9b467287ed9551fc53abddf5757efb2dd1c98f0388e2128535fbe70b706badd5702a5b5c3cb19a34c26ffa218c9c41caf9f17770a015b09fc13fabe4d53 SHA512 0bc392385f9e6c345dff82b3fb04f322e8aceca769e15a3a87da6c718b6e9a7e1de082940d4bb0339a4c3a86f706fde0de047df459682aa9ea216d6e5c17eab6
 EBUILD libgtextutils-0.6.1.ebuild 623 BLAKE2B 5bd2ff34a6898b662e6e624a77682a358b9340c6b94b9dfa40bec0637d4074ec648ca6146ee870f9cf5a8141028d23aedc55407aea04fbf2b69d62699d69d547 SHA512 e72eaddb48422afe71140394825964e6778a339ea182d614178061eb294dada1b81e7b5221a1a19d9d2ac720200f6eb4a7eab09f6ef1b7425ce7dda491add449
-MISC metadata.xml 370 BLAKE2B 01c5f6253c80b7fc48e8c7980c62366fd38643da25fdd999cef041558b7d559cb45a22a6125d222569104443c75045e6169f133bc46871ab9f567bdf3f3ae3dc SHA512 b9a044abc657680f9c8fdc80d318b5a9891c5c532eb0831f00bf2f774391c885cf568f6ec3376617da2a5d4d8f9b87283384d595086b3ae57defbc988e96f1c1
+MISC metadata.xml 384 BLAKE2B 5d5964f09ec6c5b7d0e7abba76515794489f29f72f1b0af6783662581a39a8d125f58d4a0138baeeeb503a828ccd4e847ee910b8f455a68ecb6914beb0800e73 SHA512 53a49cfa6f7909adb815de8c83b06caf5cae5b53adc3d7fbcb12b48e02970e00ab34255a5904f35f3f479a9dcc75505bfc7237d1076c3b52540c0802dc65a04a
diff --git a/sci-biology/libgtextutils/metadata.xml b/sci-biology/libgtextutils/metadata.xml
index 38108be67e14..c8c5adb77c88 100644
--- a/sci-biology/libgtextutils/metadata.xml
+++ b/sci-biology/libgtextutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmokrejs@gmail.com</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
diff --git a/sci-biology/metadata.xml b/sci-biology/metadata.xml
index 7a808874b6e6..fb82178e320b 100644
--- a/sci-biology/metadata.xml
+++ b/sci-biology/metadata.xml
@@ -43,4 +43,3 @@
 		Kategoria sci-biology zawiera programy naukowe związane z biologią.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-biology/mosaik/Manifest b/sci-biology/mosaik/Manifest
index e70550f4ed6a..105d1d7245df 100644
--- a/sci-biology/mosaik/Manifest
+++ b/sci-biology/mosaik/Manifest
@@ -4,4 +4,4 @@ AUX mosaik-2.2.30-gcc7.patch 1252 BLAKE2B 896d662807c223cc69eacfa2e1fcb457c696e0
 AUX mosaik-2.2.30-remove-platform-code.patch 399 BLAKE2B ec711a9b112efa87b2811e4545bfc58716393576915f71167ff700ccd809be4fad5e07bac7a5cb7df911615f4c996284cd711c1d1cb62c5a18695e719e6574c6 SHA512 4aec709660b41fb61bb9219a587255a5f416992a4478c2a7eb67374d1425f0a4e0b4d356827a9214e2f2718b635169c95d3288bf10388a74e50d498c39c2f259
 DIST mosaik-2.2.30.tar.gz 4387062 BLAKE2B 6f373aeae4f68be2455556e7f79a5850e25d804bd482d85a846b44f8adaabb2513ffc7ced774f5ead6dbc8fc9dca9d64f76f83bc5b55b1be4073a8cf309e121b SHA512 1acf534e6defc927fc22937a7bae6786e85ab7aa234b4209169f1267f1a9bd68415b441c6aed2e7cd667f694a562017ebc9457251958f77386259ffce9812b10
 EBUILD mosaik-2.2.30.ebuild 1105 BLAKE2B 842b161c8fc0cda9cab8101ca6ae0879cedb191983a61a25d21afe0ef5edb4a87e7e62edad27f2642444c2dc58387328c275f7830abd7917146d6febee812ba5 SHA512 55377965262d7942229a269bc1c0c56ff930d544b422305994f0995ca68d06ea3a1745fb759dc70225ff6b76d338b8761236079eb7107edb6225ae7c6d2f372e
-MISC metadata.xml 414 BLAKE2B 3c19ab9f4c6a0f4e73d67fe4f280fd252d68120a28e045a39c3ad78a4741921b2141c4433c6babcdc33b16083d4949fc28448f57fcb6c65be8719dd1d0bff8f3 SHA512 2e6887226a0ac7457d1bbce1d76ac0953f0c1d5ff1d4261b7e11e4fa38803f01f8a67a285c2071671d58fcb8912ca8bb66bdfca93e2481be043ec5f2f2353c5b
+MISC metadata.xml 414 BLAKE2B dadc852f08ed1944b4433e741d8f3c9f9296ecae8772df46193a89591fba8f3346b5b10d1a7227ba78071cc6e3639544a9f23ee61f79ee595bd10155bf6dfd0d SHA512 b38d4852ceabaa543c162eb26a54a76ba83b9d8f2e1520ec0ef16a07f49ddce9835caa5e16883f9755c99e3dba75e9ab689d254bafef92a859d251a53ff0d42f
diff --git a/sci-biology/mosaik/metadata.xml b/sci-biology/mosaik/metadata.xml
index a3eca9b62b1c..f513c94ff2f3 100644
--- a/sci-biology/mosaik/metadata.xml
+++ b/sci-biology/mosaik/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-biology/prodigal/Manifest b/sci-biology/prodigal/Manifest
index b321e00e6280..18d201537410 100644
--- a/sci-biology/prodigal/Manifest
+++ b/sci-biology/prodigal/Manifest
@@ -1,4 +1,4 @@
 AUX prodigal-2.6.3-fix-build-system.patch 1004 BLAKE2B 5a0323f6f4440e5f45805e8eabc32374f7d47760fa62c426a776a6f5bb573f356241618fbb231522c05ad950b3de71f38787bf848049f4c6fa174726c9134ee8 SHA512 c96e93cbe344bbab43b03b0046b1bca5030f4a731a0b43ea4d4ee87d303502d172fc93975a9d7b907d6ea6beeb865113122e0e2cbca7d660290994bb8214a17b
 DIST prodigal-2.6.3.tar.gz 610934 BLAKE2B 54a75a694aec216da411717c29c8e896f064b4893d74fa1c736fdea3cd7bff98cb8d597cdbb96dd4cb2f0e82972c99b43eee8f2ddd8678535dc68c831dfd4e08 SHA512 6d6ec310143c50c0d65dbdbd26d6d271839bb23b1da376ecef20059731a9e643d631613eccaac2eb548b295264b9fe58c21b083f1511a6554912cb7d5351d541
 EBUILD prodigal-2.6.3.ebuild 518 BLAKE2B 80e85e8507eed4b64fecf813c54f2fac707cb8aec21182f40ffebbe83ab867eab3243af5618eeb01fbcf1ac33ff06f3bc060ec78f245da1afa30475b2d4220d8 SHA512 44048cc1a61e2e7decd5b4dda026e4b89ba54decfb1f63ad3d378c3b8ebef707b3e3c2338108186be9a3f9400bca165f3331a1f1dd668345716b15c01189a0e1
-MISC metadata.xml 395 BLAKE2B 1586c9df280da87649ae6b23e4eff71be6db8d61a75a486009dc43ed51f5d3474760563d873f3acbe5fbf349744e6af333caf9575616f7c9af63b3f5b49d7132 SHA512 d824206729a7012b67bc0dff475f08d769484c601165a72c159383cc23247726cc38d9dae85492f39cdae99dc83c2a4adbb44cc8abded5ee8cad8067bec7873a
+MISC metadata.xml 395 BLAKE2B 86e625480833e553198146ea3e8a8d6e347c5a307798c5e8cf1918a85f3a6ce1761535287d586ef6d0f0de08f13897af30c7eafa62e5fc395075f43cc0412f48 SHA512 baa75d5c2b96f8bc653af2691f518533ae87bc13179e0d3751cc120e2933eb758ed08f68163d6fa0a312ebc9e017163ed7f95b2ad3135464d87ac58c410a2203
diff --git a/sci-biology/prodigal/metadata.xml b/sci-biology/prodigal/metadata.xml
index e086d08df6f7..ce618df82fe3 100644
--- a/sci-biology/prodigal/metadata.xml
+++ b/sci-biology/prodigal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index 0c9eb58c3dc7..d244f445e4e2 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -3,4 +3,4 @@ DIST samtools-0.1.20.tar.gz 566387 BLAKE2B a62d74c408877754af50f5e5fea0e2289ec1e
 DIST samtools-1.10.tar.bz2 4721173 BLAKE2B 103c71ec5740eac151a4fc40d67286ee00123c7befd5f654cf5c89812bda44f82b38ab662a4a3216ac84434cabab49500b903612137f97f89a7ea38063e8fc08 SHA512 828ec2638592b440e06b81eafc57634416ab54dac6caaecb06f22a90e9bf99da1fd8bb54509cb98591899c4e097ac9038ee5d57ea7bfe1a18967cde4018d840a
 EBUILD samtools-0.1.20-r4.ebuild 2040 BLAKE2B d90fc78a99b4134ba1a277ceb904c65592f1d29222822f5c97e31a46cbc4138af6adc763c7b05cf26bc0de06ac23ca0b8d8891841ecfd6c1b3fafd270e24216d SHA512 855e19ca8d0dcb9d472398895c666324d00355a7b04c075744e7ac58be1d183f7739f9a254c5bbdaf4171ab6324159860be40171693d0f2f5074884b9eba5e87
 EBUILD samtools-1.10.ebuild 991 BLAKE2B 206a77657bc9a82d6a7536d030b726a0450bbba406e4e7ec9cc670ee530b87d871111952c850d4008c436f81d3daeba802eb4a3442b59ff9ab0f5864bc4fcf21 SHA512 efb1f235e3e3996599df79317e9c7c2ca5434b666a93f91c495550ac4846905e99d96dd1a6876d22a489b684bf24a90c6f6afb4cec5677c5c45f28f0c4f35b35
-MISC metadata.xml 408 BLAKE2B 28b519bf32b116c92c1a695553637a44815ff1aaf18468a5d2d5ef448d8dd53728aadf7606c6ab53ae6bb21e88fa4a48c7b443e3d0a13a5658592dc0e768ed3c SHA512 8c8d240fd37400e43637e12f008f8f2b03fcca062883dd63ccc6956bbfc46d05709f032d146a95452db35b546ff828239b108b3a331f5295ec97872d6c9478fb
+MISC metadata.xml 408 BLAKE2B fcff66a327d0396cd0a1b0cb5c00aeb1bc728759d6d39933651f63e22d966af9c33d14f149d2ee008ca48266da1f24ff5919942d143d066898dc635673153df9 SHA512 71a9d6a299db7717ccd851a4519354c1fd7a373dd79af6fa216ebc9b6b0ccbbccc4394ca00c3f842afee492702f079268c5c83815eaaafa446bf0f37750c62ff
diff --git a/sci-biology/samtools/metadata.xml b/sci-biology/samtools/metadata.xml
index fe27db1184af..6f516e1d05ac 100644
--- a/sci-biology/samtools/metadata.xml
+++ b/sci-biology/samtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-biology/vcftools/Manifest b/sci-biology/vcftools/Manifest
index 3b3127ff44d4..14c868e8fd07 100644
--- a/sci-biology/vcftools/Manifest
+++ b/sci-biology/vcftools/Manifest
@@ -1,4 +1,4 @@
 AUX vcftools-0.1.14-buildsystem.patch 1159 BLAKE2B 9eaa626c82b4d23e75f2d31ce31c6161996eb743efbdcb81ad4c3ba306b76a710c4b22670d68178da1b7d2e048d02aea44132f3009d5792dcf248368b53c3482 SHA512 838cade29bbeeee090ea52f546c37b68eee868f3329ceccb710da0dbcf0f14e1b18dcc7b05ceefdbf72d400f450374389649f56fc6981bd86f6e176469b054ea
 DIST vcftools-0.1.14.tar.gz 342369 BLAKE2B 14be867c0be41767e2c97c8be212f3cff495c1cb6699294fb8a26ac491901599cd1e400cb80c6d609dce36584ee5defdb3b3652657bd127e0c67c5b29a842cc5 SHA512 863a16b3b20d392deba7f04310af95f1ab21be537273692aa104e22d737af2eb1bc54a768af954f06188e0500e4f7a032d1189886eb3a439b108cb8189b14eb7
 EBUILD vcftools-0.1.14.ebuild 867 BLAKE2B f25ccc182927cd888c548f4eeb120c526716fc759dc7b8081baf76b9f4cd3a404a2828168577000ff816b02aa8d3e6fec52d883fdc2e6f2ec40f1a9712d024d1 SHA512 260555d8964cf329fe3710547b6ddb5600674525703d0b802d18c2a41d02271ff77c56c4d49bf9fb67966bce76a3d6addc88c5a1e86859425bf0574beecc2c34
-MISC metadata.xml 408 BLAKE2B bc88536408660b74dbe9183850f853f19d123852d6e56845e9d6c5249f5fcff58e205751f70e8b22c9032eaea5d4ea9fac371376ce7725da151aacb8d6c7d5ea SHA512 637b53b7fc140cfde69bd0e39ee1e942a86a3fb77934946e942e12ca65cf01a8c3559d606ab3131ffc762aa3508fb3ab60148b4aaee28b60bc6d97cb8dd00f3e
+MISC metadata.xml 408 BLAKE2B 6761b0e43c90b406c9b1253e6f4757f2c1249a5a658eea3be97fbd24d6d1c591ab60abb5b0e3b58f17dbf68e1839b2a0ab12516f903e0d5966788ef6db570666 SHA512 c66cea65d0d2ae25a9861428387f3582dc490dabc6d5de2087f475e6fa0259c2167173c2d916a0293a35db64d46f9faa7f9f70d0a6c19efde2e98f5144e27007
diff --git a/sci-biology/vcftools/metadata.xml b/sci-biology/vcftools/metadata.xml
index 6c22d19200ae..95be401e9e2e 100644
--- a/sci-biology/vcftools/metadata.xml
+++ b/sci-biology/vcftools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 50e2d616d5cc..3e9a796b0628 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 42298de72bbf..90ba01b7a9ae 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,7 +1,5 @@
-DIST bc-3.3.0.tar.xz 229580 BLAKE2B 0528d50f566fce648561276434eed45a82fb1dc2d3c56a684758daa866802e7a3781a0e0d6a0993cdc356b416f5ff998de5c51a5e203d2ff415d6b098fb1743a SHA512 b8d0b6d6d9c5d4fc62df62d1b9b7e7006a8b430e063fe0d5f646cfaeb4c6fc9c7037b644e853b7ae7d5c5f42f079221e9cdc32564d70c9ddd6bb867ddc7056de
-DIST bc-3.3.2.tar.xz 228892 BLAKE2B 013e4708afbe93b3a17ecce002a6e393cd53b28659fb66aec1d857f2d5bef97341b90ca119ba7efdee88545af95d2223e3a4cb0f1c3b04739496053e1c81c00a SHA512 ae3e99c49137e1335c6c6c0f5a39a5488d174b98bdf85ce1c9311546ea093cd6ed2d8d0a3e6d401cdf093d509717ae01ec71e6e60d580e71101c673da5efc953
 DIST bc-3.3.3.tar.xz 229688 BLAKE2B 7d06565161b37216f60d1037b48a254eb467f41a66170e2a6b8f188b33aeeabaf8568ebb66e402d5010aa5991a4a197ea746959808f5c3d2e94c4eab80c90f20 SHA512 dfdd8023453406d9f681e04da7acaad4459e632fded0f2edb2b51607438a27074935af6db4b3580120daf56e6b52283275d0c2c809380caa164957f1901e9dde
-EBUILD bc-gh-3.3.0.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
-EBUILD bc-gh-3.3.2.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
+DIST bc-3.3.4.tar.xz 230264 BLAKE2B 38a6689a76c30127d5e27004c424cf4f9d1922129ab5235ab72f62f63f319e6b7d64c27a5f7a3ecd4a44001bb6eaa3990f5d0134548008233e7f28ae297f8fcd SHA512 212b36a3fafbda28c6416d29e2d9e49272c42d95dcdc3bbbb3691e4686ca3f0a9fec883a099d059c5bd21a9b08bf5b2eff01169de20df9777c2fce66a8cda783
 EBUILD bc-gh-3.3.3.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
-MISC metadata.xml 941 BLAKE2B 89c83ee3282f1344a8c0243597f178c6acf696ca4ed5f6eafaefbb451487e659b0bc49927a8bec8f07469b4b3ba66d3e0c2d919ee9d9e40792bc7731145bf76c SHA512 be367aa0eb1befcfddcda11253bf959f5467a9687e6522756708ee19672302ebd4bf4f9d6920e3acc43666ee97fa8d48abe62dd666a33fc70fc5675c1c22b79e
+EBUILD bc-gh-3.3.4.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
+MISC metadata.xml 971 BLAKE2B aab101798e58a61a84c4d1a65f6ba8350baee939bd9e97668c8c0dff88a1326ad99460406a9eea95794e820ad3ad23f297e38fc30f0a67d85d7c3381bcaa963c SHA512 4f6051b731b1517940519e52676bb5220a695eb9a3ee37b7e22df09a862247671b0fcc809e93d3af0b8fb474102cdbe2ab4393d8b26d1266c9de636241f825b9
diff --git a/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild b/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild
deleted file mode 100644
index 89c8c7658afa..000000000000
--- a/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of POSIX bc with GNU extensions"
-HOMEPAGE="https://github.com/gavinhoward/bc"
-SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild b/sci-calculators/bc-gh/bc-gh-3.3.4.ebuild
index 89c8c7658afa..89c8c7658afa 100644
--- a/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild
+++ b/sci-calculators/bc-gh/bc-gh-3.3.4.ebuild
diff --git a/sci-calculators/bc-gh/metadata.xml b/sci-calculators/bc-gh/metadata.xml
index bda1b039e3a4..696a84148f45 100644
--- a/sci-calculators/bc-gh/metadata.xml
+++ b/sci-calculators/bc-gh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Gavin D. Howard</name>
 		<email>gavin@yzena.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-calculators/metadata.xml b/sci-calculators/metadata.xml
index 00a8c125e6a9..eee64907b847 100644
--- a/sci-calculators/metadata.xml
+++ b/sci-calculators/metadata.xml
@@ -26,4 +26,3 @@
 		Kategoria sci-calculators zawiera kalkulatory naukowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index ca5e9f16b36a..7958590cbd3d 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST qalculate-gtk-3.16.0.tar.gz 2338500 BLAKE2B f252f6e19eeb7ae1e35e865111b72dd65837aba246719018e241aebd4f7b1358c342fc5d659b1d9ccf777130e2c443143e578156da5445dba5656c04ed8d18ef SHA512 42e6bd86df451e9a9dc92fd930f675195f7539feb7f2db2a8e04ebee96482d3bcda45530feafb71be00489d81d27027a9758a3e79a1ea912887bf082d034fe74
 EBUILD qalculate-gtk-3.16.0.ebuild 833 BLAKE2B b9b52935aee02c975bfd9291f329c4f687de4e8a687c0437a65b0878bef6d3427740ff51e730fa9a64fa904c0a8b7e743e57a418b201efc90384964d27d7406a SHA512 c27fe2db8f888c0f5d9bfba751a537434798c3f2edc1dbc85689913dc20426f8e0134457aa08055f71b48d0dec6544490f2ba8f215a03637801cfd112fa38051
-MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
+MISC metadata.xml 606 BLAKE2B 15fdc1a94dbacd325187cafc04040e85b12e9497c36483f5eaacf56b6418858555b459e7a25b6b3d2155c748150d646b8d0f9af7abdc6ea26a6e6dcc4ac6f483 SHA512 39b2ecbdf4152007252597d839f3369660c1430798a022a8165993d1b8cc18fb7a82948640aeddd010c9fbf75648cd79f4356b204ced1d9ae43d18005845c2fb
diff --git a/sci-calculators/qalculate-gtk/metadata.xml b/sci-calculators/qalculate-gtk/metadata.xml
index 0af924de69b8..0c65d57617e1 100644
--- a/sci-calculators/qalculate-gtk/metadata.xml
+++ b/sci-calculators/qalculate-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 8866474d3ad6..330435993006 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index ac432449d753..a0d491891151 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1,3 +1,3 @@
 DIST avogadro2-1.93.0.tar.gz 2905461 BLAKE2B db51e4574fdf2a31657b8bef7b06eb0d563484deaae1a6d75649187d6f5fd7b02a99506cfb850e09792555d7c27d9937d0df0f7172fafc3ddcbccaa7502c5bb6 SHA512 8e4e15b6c2d1935f8c585c83761b28a6397bc1dc22cd5f66464d59dd25327b1cffec809af492586be4b56793448f94f9375c16e8a4c4969f7b8f2591049cc5fc
 EBUILD avogadro2-1.93.0.ebuild 1224 BLAKE2B 13b6f9bb19f20fb638cae69b4dd556563b749935a79735a4ad55fdcafe0b590320c6040bf8d147cfa657b7c79560fcb40c13993343bf54ecd750da707c23f142 SHA512 c27577dce2314671c15c47d9dfd4b1c0288503d418cb43b22dfa6c240e70c17f21d99f91915a6d6bd1d529426f7f99843954b69d24f08c42e90ecf6fec9b1846
-MISC metadata.xml 513 BLAKE2B f721104691759eb8a87d9cb6dd56bef45ac151e180caa68376406274a57df6c04e3fec6ba6d7e2aabf4355356002d27dd92e5b850c55103b3b23340d9b64d891 SHA512 4209c0681f7055b240f1054a10d58d5c22dca467903096ab1f5eb1b8cf276990f694b2033b4e9b4e4838cce65dd7c7660633079764248f394e32ece0048f09a0
+MISC metadata.xml 513 BLAKE2B a8b5cff44b4c27be87ea699d76379063c1ccf26ce04ca2052a08a6a5042e915e24cce853300ecffe9594aa23e9c8370b658ce0bd9595e6b231bc3c6fd6e725a8 SHA512 96e91d4b1243015e2e225ef21d261b09d41d67edf52db85a3059ad7d543d4c592d2a7fdd3ed716c4d633446d13151f2e2fef84ea8bfe5a19fa9e9d8fb8132d9b
diff --git a/sci-chemistry/avogadro2/metadata.xml b/sci-chemistry/avogadro2/metadata.xml
index a43fe21628c8..8da47dd4e3c3 100644
--- a/sci-chemistry/avogadro2/metadata.xml
+++ b/sci-chemistry/avogadro2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-chemistry/metadata.xml b/sci-chemistry/metadata.xml
index c60d4c31553f..7c6e6107936e 100644
--- a/sci-chemistry/metadata.xml
+++ b/sci-chemistry/metadata.xml
@@ -35,4 +35,3 @@
 		Kategoria sci-chemistry zawiera programy naukowe związane z chemią.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index b1f031db5c08..d45414d9fe6a 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,14 +1,17 @@
 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-1.6.tar.gz 464175 BLAKE2B 1871c7edc4b4e848a06049a7c687e906f166312777bdbf5c65be8efe8d5032582fdca9dc7eca453b7013901f409326b0583c79731c68fa2b4e6366f021958b0b SHA512 76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe
+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-manual-1.6.pdf 1248178 BLAKE2B 5213d55787041db81fe8563febbf130db6aed9233e569039b66d69cfb173131353d45bef824640ee7b0a3fed7821ede4d5a6ce6ffc14d1548499317afdc0248a SHA512 e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca
 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-1.6.tar.gz 5946764 BLAKE2B 018bd00c86c0a85baf35afd2ea4206c96dee8f948dcbf331b53e6f685b69bf2c909731b15ba3261c86cee9e1960ec5cfa7b2ee0c6dcfabbbbc110789840184ad SHA512 36d3a66c19d230f2002170851345da7063aeef1f29841945b8a182f73922617823815dde5d7289fb0f80e771ac03780adacdf95af4814235edbf69a4772b3696
+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 2292 BLAKE2B 09218b100241e4025010215d975195b7d6f17343f4dce8d4a0e1c18b8c2c99d7fba8f0a8e8372ea8a543cd13b96514e2c2e3bec61ba23ce99031c107f30600fb SHA512 68d528d8b8496c65ec30ec8552baf9bd8b74d75ecafb3972c19e3b1d13214dc93215f5f50c96cd7ef0e86cdfce53d1a9da83514c5babc673dd6763a1657464b5
 EBUILD votca-csg-1.6.ebuild 2332 BLAKE2B 4241ebb2ab2c45fdd192eee0fc1ff111ddfa025ac5c1ff0fb98e551ff842ec91b3c299e8e662dedfbc5783707c107ac94df79d18747dba2f7a5e5853e7d4b38e SHA512 e821e4a31d4811abaa8fd05e225ab090c2d67d7bc2e3c399d544ae22fb14a4f6bb2e4f9ce94ecabd11b5c3fe0623523efc2d93fde3428bb6b5d492b366803216
-EBUILD votca-csg-9999.ebuild 2020 BLAKE2B 5c69ecca5b9a7dcb71c12282ab5e9bfd44afd2553afdf5dd455fa8333b0e5fc81f95edfa5b065054f0b3cafbc9b1abfeffea5e2f2b1c0b80483cedac6764f3b1 SHA512 9f98e49c8fc3767c5154122352ac2260c5acef45f971c7421720767089b7d5b4c611a828d2d220245f673d7e72f186740b4c6578249a479708cc9a6365afb063
+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.ebuild b/sci-chemistry/votca-csg/votca-csg-2021.ebuild
new file mode 100644
index 000000000000..0b8ffb4e34b8
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-2021.ebuild
@@ -0,0 +1,85 @@
+# 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"
+
+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)
+	)
+	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-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 358ce54951d8..ba2fbdfd7aa7 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -20,7 +20,8 @@ HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples extras +gromacs hdf5"
+IUSE="examples extras +gromacs hdf5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-shells/bash:*
@@ -32,7 +33,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=app-text/txt2tags-2.5
 	virtual/pkgconfig
 "
 
@@ -54,10 +54,10 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_GMX=$(usex gromacs)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GROMACS=$(usex !gromacs)
 		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DWITH_RC_FILES=OFF
-		-DBUILD_CSGAPPS=ON
+		-DBUILD_CSGAPPS=$(usex extras)
+		-DENABLE_TESTING=$(usex test)
 	)
 	cmake_src_configure
 }
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index 0566e30845e4..41b68fe052cd 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-1.6.tar.gz 1404955 BLAKE2B 1599281ea1cd6b5a93b1d91f69a793af7bb9cd2fbf70157e5d40a5bfc72f973f3d97338f92157c2c482ad041f8afda298282b1f83dda66d0bb189bdc07bb5a23 SHA512 cb99c31fe7f1af53b8ccf50cc9cc304ed5c5b5d1a165e1a72a456c0bbf5ac8bb9263c9eff829acc74be348192afbf80fd4d80a2c20d1dd5d7f909b1b50368670
+DIST votca-xtp-2021.tar.gz 2192166 BLAKE2B bcacdfe92b8c9fbbe2fe949d7096c09928ef7ece3cc4e40adbf58f2894036588762f9905bce1a1595bea99d1dfb8bcd99f395bed2ce7b94eeaf51b1c33719558 SHA512 1444fd0a64a684fd2b1327a9c3af067ea812190fa95cab5f3bfcc7aae932cc7469d07fc219871ca594496fbfe74e277d3b6ccfbd7d5c24c162623515ee2fef0b
 EBUILD votca-xtp-1.6.4.ebuild 918 BLAKE2B 5ed068af82c39ebe9a67e34157f4382a0b79048110305660eeac7d714d21376768ad63c6311f218d7c58c757201472190c69b6bbdc570fcd28d34291f9f20568 SHA512 370253c1fe351fe528502b221cd7c7f1cd05331313fbbfd974ef0ba2c85f8247fbe9d2fbe14ca180954b04e52c33458c636f4a1c41eda78ed689fc26723e117a
 EBUILD votca-xtp-1.6.ebuild 955 BLAKE2B 02248b9fd6aff495ba7362e836e78540c489696c8035b2dc36494d2574a4eabdb9e89e41f277ca59e1b6b0fc0929ed2e1ed5d4fb7a302b7f3ee4c02199006004 SHA512 c7094ef6df89b323ab69f7dc369bbf88758c35803dcfa8bf2acc9390b34fc556aef3917c1167b8303870c85b507940798a4286460483ecb8a7016baa762728c5
-EBUILD votca-xtp-9999.ebuild 918 BLAKE2B 5ed068af82c39ebe9a67e34157f4382a0b79048110305660eeac7d714d21376768ad63c6311f218d7c58c757201472190c69b6bbdc570fcd28d34291f9f20568 SHA512 370253c1fe351fe528502b221cd7c7f1cd05331313fbbfd974ef0ba2c85f8247fbe9d2fbe14ca180954b04e52c33458c636f4a1c41eda78ed689fc26723e117a
+EBUILD votca-xtp-2021.ebuild 943 BLAKE2B a0596dab1f69c3c8e9afb3699b44ab0e49cd4e8f5ef6a397eed39ed051e13f0b457ca0b0e225329dcf73bc58799d4e3fc217805784f936d9e1ee09c3586bd998 SHA512 9c4688a19b3a4ef75c79a0500f253aaa1a99d38ed4e56948e4743ea03e734e613be845b56d084c67d783a8e76cd4ebc2888b94bfe3c6e67a9799bc22af6ff19b
+EBUILD votca-xtp-9999.ebuild 1073 BLAKE2B a9c1b41b9c84fdc31a6203714b183bb5d119e14e4a7e7c439d854c8f484bfab1e7f7f547b47ca059a080d667db36acf1311f406c83bcae3cfadd99c2262b8c39 SHA512 158015f6f79d215ab8a443cec0b104992e3ccea07356ea7a1c24790d8f0ee67eacff1f238fac30a5f9f522b131a599d6ea9fc6ed943c9889203826c7a9ea8849
 MISC metadata.xml 453 BLAKE2B 51ee11d9c55f15fd0382a7c422d1c12364901a5ac257f57d04b91b8ca77acf9c1eb709879bfc6042b577961352cbc4e31b01ece3a8c650eaffa9b4ebc6d385fb SHA512 892c8f84df6bd19e969b372def9a485be9121d8f7ab410b532529980298e57d0705f73fac409d8f251449cf2119dd3f28133e08d21d0e73b27d5ec0e9a3f205e
diff --git a/sci-chemistry/votca-xtp/votca-xtp-2021.ebuild b/sci-chemistry/votca-xtp/votca-xtp-2021.ebuild
new file mode 100644
index 000000000000..a1148a82dcbb
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-2021.ebuild
@@ -0,0 +1,43 @@
+# 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=""
+
+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 )
+
+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 d9f436b0316c..e4c0b6c8a536 100644
--- a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
+++ b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
@@ -19,19 +19,28 @@ HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-cpp/eigen-3.3
 	~sci-chemistry/votca-csg-${PV}
 	sci-libs/hdf5[cxx]
+	sci-libs/libecpint
 	sci-libs/libxc
 	~sci-libs/votca-tools-${PV}
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-DOCS=( README.md NOTICE CHANGELOG.md )
+DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
 
 pkg_postinst() {
 	einfo
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 74a62f2b71cd..62152e4fbb92 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest
index 071ee8e6241c..71c03ae2babf 100644
--- a/sci-electronics/drahnr-oregano/Manifest
+++ b/sci-electronics/drahnr-oregano/Manifest
@@ -1,3 +1,3 @@
 DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e
 EBUILD drahnr-oregano-0.84.40.ebuild 1441 BLAKE2B 8a500110cd04d5b70a150f776aabe65869fff83ae836ea00bb24df3b2f69bc620447ba6bdd81ecb40df321dee9c0cc1eaf203e512e3ebc5b0c1f14202c5543e1 SHA512 672a4a332677459a0309e474c8d1f0f78955162c6858ce67bacde1705e5b3c41b20385bd4f5c3f513413d3931a2c67cab706e40bbf4e00529ae5ff796f9771f0
-MISC metadata.xml 697 BLAKE2B 33ffc4e10380de68a45856ab50a4b3dafdcbfa11c9695a039c6f0ce2cfa74b287f3c130f7273def9e02d27d011aad88e866be369b7e75cbc80281bdf40c64dd5 SHA512 d534f45e3427d45837bf59465e5aa4141a1c2a005c1815a50c081b14b2cb622e8eae8614d878e79489bd7d46b874dff235c53b0b4af507ef6c7722285b36267a
+MISC metadata.xml 727 BLAKE2B 4d0c34b7729a09b7a793030408d8c2e4446b7014c0138a7a9a6873fa9338ffa4f9a22274af481ffe26f2e3db702eb1143904f93999b4f7dab6cfae3d648b1ee9 SHA512 25648624af1d1b40e6059674ab58484e8a944b396539e6a5353fe171e67f404eeb770b7b9feba4bf73b875191dc500d6058ddefd4222b4c62fc7bc234e4314c9
diff --git a/sci-electronics/drahnr-oregano/metadata.xml b/sci-electronics/drahnr-oregano/metadata.xml
index 191ca94f95d3..c20265de85ac 100644
--- a/sci-electronics/drahnr-oregano/metadata.xml
+++ b/sci-electronics/drahnr-oregano/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ktrace@yandex.ru</email>
 		<name>Victor Kustov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/freehdl/Manifest b/sci-electronics/freehdl/Manifest
index 524b63509160..8dfa073a902c 100644
--- a/sci-electronics/freehdl/Manifest
+++ b/sci-electronics/freehdl/Manifest
@@ -2,4 +2,4 @@ AUX freehdl-0.0.8-fix-c++14.patch 11726 BLAKE2B ea8c514ccccb56db92c258d982092f17
 AUX freehdl-0.0.8-qa.patch 10587 BLAKE2B 3276c73ccbb09cf02ff120548a180283507781aabcc9033ff32a422cff749884504f764a39ba85239a8a4f39fa90ba284febe3d3e5f0e4c193ace19cd2c0719c SHA512 37d4c497fc843e1d57b044782e57a3d38c579301b3ac3b9f3ee1c83f44bc707608bed82339693e09144078b97a65885eeb7e884b74276bc9261206ea35dfaa5d
 DIST freehdl-0.0.8.tar.gz 1389888 BLAKE2B 2205f07435bf3cd79d51ccec4c976de5c1d0eb30279ebbaf3bd9ebda274508501421bd6c0b10c2f73989ee4a01f0cc09bfb0542e5e442ea509911fdb5e9ee172 SHA512 731fde1a940a762e570107819a89ac2884029e5c4f5d51e5df0032a4381fd04c7da948b5f2de6b1ce60801f6ce3a0a9123a4902e75e216a1182b25b2134f44ee
 EBUILD freehdl-0.0.8.ebuild 598 BLAKE2B 8b28eed7391600eb19ed367a36980dd33db7d6016bfd665776a4bd40770b4985766111a6ee4fc9e4213912cb110802293584561c833da8c2f33c356c6a6857ea SHA512 2ec28ecf39c6ebad74e27ee1d4ec56aba6c3a47f287a81f892c5c905516dd0ed0b641c00a4f4a6de995518519a258fefba190758b10a1942c9e966f3247c0dc9
-MISC metadata.xml 975 BLAKE2B 8955fe232534a1b136da57102431b0eac7bd25d6ce7ee04a5f8ef9f0ec3e6da67f749968ed73322368cb17e9c12f43a6f4e3d4d730fa4e86c7b749e4fc84481a SHA512 0fcdb77cb0ae593930860cc75f1913ae522328e82f87bdeef85602b5298ede5c3abb46e7386baf86e04f0f3d396c7d18951a7bbd4b1b0d37b07df08f0bd34867
+MISC metadata.xml 975 BLAKE2B 3d2d56494194f2b9d858e4b4236fd9ddb5e9b302146d44c315da955bead8bc84b6e334d9560ca937ae9973fc9d232254d9d7902e0d296c93f7c6399d02f1d4fa SHA512 b6ca4908a9150ba6b99fb4bedc6fb88a964894af14a25499a63d6fba862ac0fecd6d4fc44437e705cc9a9f12bc408ee30395bd2a4702d984f18b63a0ec6ac60d
diff --git a/sci-electronics/freehdl/metadata.xml b/sci-electronics/freehdl/metadata.xml
index cc98fb7a1eaa..218244be56bb 100644
--- a/sci-electronics/freehdl/metadata.xml
+++ b/sci-electronics/freehdl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 31fdd0001096..3848facf9638 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -6,4 +6,4 @@ DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721
 EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d
 EBUILD iverilog-11.0.ebuild 1542 BLAKE2B b8d33c4fbb5e68728005012fa1c3b4463fe8d27a5a0c4faa84093a8729d7e2d3a485d7bc768f468f90c8ae549caeae7ee958bbce142e90bd4b8a5ad9827c94bb SHA512 bfacbf85d2a5d75d8f21fd43a788c8915039d6189a0c56d2b1e5d3015d5f998784627b32bd422042421b0d052c767955dd64ca54d0db9aa1243fbf480896c019
 EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
-MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
+MISC metadata.xml 934 BLAKE2B 5ba205e36c1687b6bc55182386d4ffc9645fbf6636dce3bb9935ae31112db1f23c8cf922626ca8fb6bcc65d8e8c2595876397eef2d9b7d2b0f45a9793bcc56c3 SHA512 c55f3ac923d794f54601daf3f5a397dcd878065f16edceb3fd9903d3294cbc7a9cacfaf01cf541d4d960d1fe18a83e1c725b06ed5ac6656e1c480c5a7ea36d58
diff --git a/sci-electronics/iverilog/metadata.xml b/sci-electronics/iverilog/metadata.xml
index edc7fde50a36..a69157e8bedf 100644
--- a/sci-electronics/iverilog/metadata.xml
+++ b/sci-electronics/iverilog/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vowstar@gmail.com</email>
 		<name>Huang Rui</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 1e73aa1c1d40..827fc3073132 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,3 +1,3 @@
 DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
 EBUILD kicad-footprints-5.1.9.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff
-MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
+MISC metadata.xml 765 BLAKE2B 683e6562f3e3125a5bfacaf329be7d4a36e755816726507f0dabe26147c995536d37875833c0d943cd9c1a890fba2959ecdd9ccb667449009e988cf3cae0dbcb SHA512 7da9a552823e83b2a099fcfcb0ba1bb28b7faf60bbdd37fd70e7fafa40869999a0af8139053ed7a1b101b042b4d0bdfe5a1870ee18182899abfba10b620d482a
diff --git a/sci-electronics/kicad-footprints/metadata.xml b/sci-electronics/kicad-footprints/metadata.xml
index 2eba07df28d4..c86623ee6dd9 100644
--- a/sci-electronics/kicad-footprints/metadata.xml
+++ b/sci-electronics/kicad-footprints/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index cef99521a161..b8873ebacfc0 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
 EBUILD kicad-i18n-5.1.9.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb
-MISC metadata.xml 448 BLAKE2B ce544749e7aedb4f4643feeaea90298bce866d9750a4d1edaec7f8d9248520266a8534a936ee76da3fb1e4072b08cbcfb487b87defbfc921defe8ae193ca8e57 SHA512 0ea5cc77902187b805ca9894e31efbaaedae623bd4ebdc41944e0e57b399e5f7bc7209067fc126d8b9b65e75a9d6c718d41c8cdfed12775f3bd35c6d8cae6647
+MISC metadata.xml 478 BLAKE2B 517564607aa1f61c5a6df0051402838fcf6d5ea1e2dc4950f38d463e959dcba447e47d3478b729afaf2a73f2c121acfc9b3aa6eef3740db942d9edebdf215860 SHA512 9192c6b3852ad652b47e754f077b035b75c67119a6c3282bd5b17e0b4df32c017b2f02f83733f002d944435b8ad9481153569248913c2c030de42f9af70a9e26
diff --git a/sci-electronics/kicad-i18n/metadata.xml b/sci-electronics/kicad-i18n/metadata.xml
index 87fd3adad57e..e1701134d67d 100644
--- a/sci-electronics/kicad-i18n/metadata.xml
+++ b/sci-electronics/kicad-i18n/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 4b6b2955f3da..c7616ef2ffd1 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,2 +1,2 @@
 EBUILD kicad-meta-5.1.9.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7
-MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
+MISC metadata.xml 624 BLAKE2B 71c179dc2e1259e6bc60ec33b8d305377a36ab4394c2dca43e239b3e2693e3abd07a47f03ecf3377c49c7bbb2782c1465639c411cefb9aeee6411873cede0037 SHA512 d9a888716a957c146afcaf390976721851b47f0f3a87c9b728800e21df31ef9deeb3b26b36e9dcee3fdaef15ae48d88c708c3d43098cb51b5ead280d674ebd2f
diff --git a/sci-electronics/kicad-meta/metadata.xml b/sci-electronics/kicad-meta/metadata.xml
index a123f9d6dbb7..75f470498ad4 100644
--- a/sci-electronics/kicad-meta/metadata.xml
+++ b/sci-electronics/kicad-meta/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index e271d7cf18a7..af75c8daa6fb 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,3 @@
 DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
 EBUILD kicad-packages3d-5.1.9.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
-MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
+MISC metadata.xml 975 BLAKE2B e71ae29f52e1eef3f91fe1d2e20e3b7bc1d795787007766c756e94bdee05e070df7f47c339cc4bc77557e77c031de0328a57dc8de949c20b3bd8507c0ff0b7ea SHA512 218ca87f07b072d45ebd010bb85b63b505abedb66cdfc5401f40d6842fe3cf78a9e98eeef9ce196300cc0cee8d7f227e5fe09e763e8669957190641065a061b3
diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml
index 99147067b616..160d0167430c 100644
--- a/sci-electronics/kicad-packages3d/metadata.xml
+++ b/sci-electronics/kicad-packages3d/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 0566191da566..91f71d154956 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,3 +1,3 @@
 DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
 EBUILD kicad-symbols-5.1.9.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a
-MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
+MISC metadata.xml 723 BLAKE2B d31f05802f9ad89b8f2c040595fa75cb37ff9ea14cc6cd38acd7b24360b0d9ae72ebf69ca8022352b88bd3d2f5abf05df1042e2e92e74aa6cb186e2ca98a8e83 SHA512 426b9dc1492aaa8e0214c04b6cccc195e3e05290ec32f29339ad044b9dcfa651b40a55a1a0c8f9dd0c93c5c60a1ae0bfeb9a1d779f4f5429a55f8b381f9b3d65
diff --git a/sci-electronics/kicad-symbols/metadata.xml b/sci-electronics/kicad-symbols/metadata.xml
index c9a5e8513cd4..f10a14c834be 100644
--- a/sci-electronics/kicad-symbols/metadata.xml
+++ b/sci-electronics/kicad-symbols/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index cf04d392b9f6..637c1735fda6 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,3 +1,3 @@
 DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
 EBUILD kicad-templates-5.1.9.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a
-MISC metadata.xml 453 BLAKE2B 56db0c51d13c0cc2b65536b09e23714f53951c9f25ee716c6ceaaa65e12b2a6c85bed8dfca279364641e1b346bb70ac25c693ab9a0bd17b06d5dc732a0164a73 SHA512 f15055be34911712c68e6500d5f94a17bb21ec4c82eebdbbeb98053bc3daebd6d33c1626389cac8fab0834235f621d078dc89cf0f37f1126b03f6dbccefcae4b
+MISC metadata.xml 483 BLAKE2B 162a91061d886c47f37d3e208aa555d7203a35c6773b0c1c12444bc8ad32ef30baa590e25af030a2b54440760ef93b5768ea7c3a84f0a745572b2d78fa46549d SHA512 8bf8391eb2b66d03353ac50492cd8b504cc739597dd0a67b49bbbcdd895b8a5c99a03f3e4d982294f36c7afc705699a1c8319ea132506472da7b654d799d8bea
diff --git a/sci-electronics/kicad-templates/metadata.xml b/sci-electronics/kicad-templates/metadata.xml
index b196aa6bdc6d..7af3ed61a044 100644
--- a/sci-electronics/kicad-templates/metadata.xml
+++ b/sci-electronics/kicad-templates/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 547a1195860e..2c4cfaddced3 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,4 +4,4 @@ AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
 DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
 EBUILD kicad-5.1.9.ebuild 4465 BLAKE2B 16b0c54f9dd11c7d3804f15c99ce8ec67be4a63c96b2941dc0786eb67133944320103472f8c48697d32fea58290068a2c6a7cee620b76b1fd85a96b3113ee41d SHA512 8ee198bfa529c73f246c2a33566165757b0b1d9a2cd78385dfecc32fa2b741504cff34e46319d840bbee5348cfcb69a40f5ae5d25d11b3e9e89675fa3cbb46b2
-MISC metadata.xml 1013 BLAKE2B b6469c6095bc87dd09a15b8c29df6901c8c3a9137a85f11bca0198b87de4dba56a363763e577303c046ba0ae5734af20f87aff574470942b222489b2c8081067 SHA512 68b19d35279516a088271a06fa2edae7109f2f79c1bf46add405d11885e221f8166e21448cb1e70d961c185712496410a3f32e34265d18360e779f12dc907611
+MISC metadata.xml 1043 BLAKE2B 01782b6dbb1f44de2c100eff987f9f3715afc7e860c782b333cbc8a87e8d117f0111c09c563e79859a7247d7931a5d46623461459118e0e3a55b7e5883f6aa02 SHA512 463508b78ca804425e53877e79e394b9d4977c5c65955c5f47ff1e1ab8eb1a45c576a50c22d49c5855bfcdb07d17ec41d39b90ff5e36ab00a8515a5bc805ce02
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 0892cbd7d4b8..8912bbc2db6a 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 5c6ff1be5227..83980a4c4f9e 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,4 +1,6 @@
+DIST klayout-0.26.11.tar.gz 54455860 BLAKE2B f2e988ef1a68a0d8e612199d1a930a55c9175bebb8ca4cbbedef425d6367ddd3e56999502e0fb4c38043e2f7bf2c75c3acb18c498124c5850379bbfe283cb218 SHA512 c868830494a7181bbc68f543930aaf87a189b5063d212191305a3d2e119921175ff66aa2f87f9a89e8e9e5d8bf2c47ed32b5cd1fb43b85619ee35d8a3ddc063b
 DIST klayout-0.26.9.tar.gz 54223809 BLAKE2B 3800b0f49a77a73d4310485ba8539698b72c4a8f953723f4caee43a8c189aa044f7c8e617bc67640071e81d94e9edadbba11114b6d6edd4fcd67d02df33ec7d9 SHA512 1a163a055806fb9555aaf6253cb63d6ebe9648f6e165dfd1cbaa6d199652fa98363f6ddae32843cde5f768a8c2f42c8b06fb4691ed64e40979a22a96bd73874b
+EBUILD klayout-0.26.11.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
 EBUILD klayout-0.26.9.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479
-EBUILD klayout-9999.ebuild 1854 BLAKE2B 1fc9b5871daf08ae15e217b9b7125748d4eb4d1650ab6da8d1dccdc019399aca15d842bca70e28bbfc284e117b47db2cdfabb8e46e81b76ee41a269fc293d41e SHA512 ec8666f6dd29e5176212ccbb431c7c4b87666ddfdc871a1251878cd67a1351ca936d73fc3790ec95fafc05af7e47f604560716e28eda0d86f6b5a0fc6a2d661d
+EBUILD klayout-9999.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.11.ebuild b/sci-electronics/klayout/klayout-0.26.11.ebuild
new file mode 100644
index 000000000000..046760b5f1c2
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.26.11.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby26"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="https://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+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_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv pymod/* "${D}/$(python_get_sitedir)/" || die
+	rmdir pymod || die
+
+	dobin *
+
+	python_optimize
+}
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 81cab8e34b45..046760b5f1c2 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-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,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby26"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-electronics/metadata.xml b/sci-electronics/metadata.xml
index 3e91dd0524ca..079f55389deb 100644
--- a/sci-electronics/metadata.xml
+++ b/sci-electronics/metadata.xml
@@ -34,4 +34,3 @@
 		elektroniką.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-electronics/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
index 5654386ad3a3..978f53a5b14b 100644
--- a/sci-electronics/quartus-prime-lite/Manifest
+++ b/sci-electronics/quartus-prime-lite/Manifest
@@ -4,4 +4,4 @@ DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 BLAKE2B 622060e053a9d7a91fe9b4
 DIST libfreetype.so.6 785880 BLAKE2B a9c724a213d6211e954c20ea203feeacd384768bf34929719326d2a98e166c91114f4a60b223efd770ccf356662c8664c91d4bf4722325c01d310a10e3026f30 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1
 EBUILD quartus-prime-lite-15.1.0.185-r2.ebuild 1428 BLAKE2B b03e3868ee6b22afc62a841be72ac86824132b9d5e2c39f88dfe983a752397fac1e2eb305956e798f8120277f52e9c058cd9ee51977bf3918fcff20599e73dd2 SHA512 c32116836e73cf80dd51ea94b6f2c16114ef2acf73810b3d8f28ed56e82a055b44f929905fffa3ec2c6fb4befd8ad91ad07b28c0facb5ab3ba41911f4b3d831d
 EBUILD quartus-prime-lite-15.1.0.185-r3.ebuild 2711 BLAKE2B 857c6e118802c04d3104c176cf3928bcfb2aba1344b4f1ffc54e3687ffc14ed96603581779380a773b25b42afbbf461da348f8fb660db1f0914f15f7744f8e9b SHA512 ab4db820d68a38752e13c6541cdf80dd55f278f51bc1f16d8205ae589df93c5ccdf6506b99df67c74c728f53729864fe91c6a217ae020ab731d4d3f5c1ddf554
-MISC metadata.xml 258 BLAKE2B 871ee410113b1513289e4baf0b7fe033c57d4a8757e10727938692237e61b31d45cc143b82259d0409fce2ea7f8db14fe939711b32562606913a279b8160f59f SHA512 d2f23f2bca86165295c1522058d187ba89a2139fb1b7deb3715952825ce278d2a7b2e1d45ffa72876c4de90230b41bbe491ba7df3aa3f5555c63fad67fa59c9c
+MISC metadata.xml 258 BLAKE2B b28e7ef1fd552b04afcdeb7d241493d3928621e4fa4c846644f2600268fa6a164b16a2450256dc0617e51ba75796d2c1c74952b74f25f61c8bfa4a3460f84493 SHA512 08c0f258f8b3a320eeb377ed3d50b51742118a2b285d3efa8db4c3a5312767f1fa775b69a7882d89ced4bbd20e28df2ddad754858dc662a4ca65ba0cd537107b
diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
index c265179cb86f..ab1d230988d4 100644
--- a/sci-electronics/quartus-prime-lite/metadata.xml
+++ b/sci-electronics/quartus-prime-lite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 89b92f866d72..0357526a39ba 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,3 @@
 DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
 EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 395047e7162753a958966f03e1d88d2e29f7aa6748e2e090c4b728181405fb9fe799e53d427cbe106953a2453ca7a2a16e83d969dca49356ea443d9542a2db0c SHA512 e94076b3df3fabf18c270ea8d5a8af2d62c1e2d04f63a83e9b60e060b0dc01e1323b79602731e6661e746e420ad2e7572a9bf0ed751982ce13541a58ff2589b5
-MISC metadata.xml 1063 BLAKE2B ddb2f5ae50f1be2e884bf275dae129234bee070a9d6a7bd9dc4647fbb3e40be7f83ac26098001169b42c95582a8fca7a7d1a3e510cea829c9dbbfe669455eeb4 SHA512 04211a6b31f25e0a985e4d98af36522dfe75c8836a48d0bf8b0c64ff146bb4f13fc1118693b6a8c647c7b58eefa319046caa1580beb46ffabd0559bd83efd715
+MISC metadata.xml 1093 BLAKE2B 9520a5d02b5707ed8773ae34cf7583909858f0391d65f90396b286a1312548950e33dd2ee4d702b8463a2ee6b6b2e2d663ab1d9f1a1f3c699041079d78b504af SHA512 d8a3d29b79a723b87aeb9b771b855968bbec8bf7b503e895731b41e047744d73d6ee0f740a36745230e9cc925a829d9408e0b2faf59dd6447a7a381235ff0c24
diff --git a/sci-electronics/systemc/metadata.xml b/sci-electronics/systemc/metadata.xml
index dfe18456e677..1096681aca5e 100644
--- a/sci-electronics/systemc/metadata.xml
+++ b/sci-electronics/systemc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vowstar@gmail.com</email>
 		<name>Huang Rui</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 8db80913658e..4edabc596cd7 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 1bf5359ee5f7..ab1aa15445e8 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -2,4 +2,4 @@ AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079
 AUX gpscorrelate-1.6.1-makefile.patch 1609 BLAKE2B 717dce73444a68d09658b5c3c446e27ff1b7666584eadaeeb862d87dd8ad44983e30b1b24fa4387f50032bf2dee671ce84af3bf168d3743768d270c412b36be5 SHA512 274a3db1a2a752338966beae989e2075f81b6d51b1d7f51d9810d7b6e01ea581468e2add05e631f6f8626ee234a6c7e700cf90ce7dc08a7d5c5cad282a6f7f59
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
 EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
-MISC metadata.xml 356 BLAKE2B a17eee6261dcce3b6111da9da119544f46a0e0b6742f2a9280933f1d6f5a36cc96a422270698649c2dd77c228580b7f8df1fe8c66546c568fe1659893ae2aefb SHA512 e9c7c6dc654cb5276c1b211c8e4817fd09cb0ed3689b53d423733e651ec4a912b4f54dbbd08299bd80c6ae637ee41e91ca1ebb323ff2cc29e3b36dbe40566fb2
+MISC metadata.xml 356 BLAKE2B 5940b7180c605a14dde832a8a7aaf35a6251f8f169d6cfa5a7399dccbc2fb09c8b1c5c9b8b23eb00f7e5ee286ce805b63faa929fb5c7b2066c3d48615e79e5ed SHA512 61e0dacc7a9a3a6b8ae5e485e5174df1b0c8e061419dbc7abadb3c56b5613c2cf8655eab59244cffdff4d0e56b61ca087eaaf9922a45e99014063201f832a631
diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml
index 6f9cf14be5be..c432c978e362 100644
--- a/sci-geosciences/gpscorrelate/metadata.xml
+++ b/sci-geosciences/gpscorrelate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
index 112fc8780500..92d8ee2f93b8 100644
--- a/sci-geosciences/gpx-viewer/Manifest
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -1,4 +1,4 @@
-AUX gpx-viewer-0.4.0-crash-backport 1152 BLAKE2B dacd8a8f4cf1703257d37be6e230fe535faaad6d337b15fece132ee358b61b00329ef0e4c4e1cabfb233a37b46c22a212696d09cf2fa4cc806c80d83913b31bd SHA512 97152da46ed0699b95a8c1379b6b08997f8fb171b9e07755b5ce44da3ef09601b5a674b97d9fb449e985e8ffd329b49f961bfce0895822027124e1e67dfa6aab
+AUX gpx-viewer-0.4.0-crash-backport 953 BLAKE2B d2c4a3e63d856d8448c993cd99e334068de4f6c018e10e332f88ace0471acbfe88dddc9e21410e5325cdf192878a2fbdf5fcb4cfa2d649379ea59cf6fb03a0be SHA512 09ee63709e69ee13b3358c88f7c7e982b689cccd7501083825a0424d31fc00bf0bebf53bd83818581d388ff6fff8cd08f0f956a7a31cd20c3b0017d8f0dded7a
 DIST gpx-viewer-0.4.0.tar.gz 534735 BLAKE2B 3b6e14961dd79d07ad99d68b7f926b2152413e5512044febdb30306d4045f0074a0a1fdb8c40bd92523e06f1f22853934c63876793f8594af197a17fd0d0a0c9 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a
-EBUILD gpx-viewer-0.4.0-r1.ebuild 1136 BLAKE2B 1708f0b34ecd3ea753ad4fea400091098bba89686ef488d705517bd324e536757de0c20f5e30c3125d093d6672a862745d9cc6deb63c6210d3db65e4c463104c SHA512 c3fa95cc6c57f350ba5349257216c1993618e6abc637dbee7b62b9489356b6f81176efa1456a0efab588c91d44795b2691e815f33cfcbda7ac484fc65bb733bf
+EBUILD gpx-viewer-0.4.0-r1.ebuild 979 BLAKE2B 37ae6db352436daed793699a792fe2e56927cb1ef5dfe1beaf2525a37ee88692e49e950f54f49a01ec57c2dbc7a16ce79deca3f732bc8ab3a0c7d7c3f7862bb2 SHA512 08b12ea0b039459f18e750eac251dd6841191d49b140d56cd1da00e21b8e9b6191f0f159eb15f7cb1165fc63259bb6370d3a7b14a841993be2f53ed41aae26fd
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
index 2dff4915dffe..420d18ef5e5a 100644
--- a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
+++ b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
@@ -1,6 +1,5 @@
-=== modified file 'data/gpx-viewer-file-chooser.ui'
---- data/gpx-viewer-file-chooser.ui	2012-03-04 10:18:33 +0000
-+++ data/gpx-viewer-file-chooser.ui	2015-06-01 19:44:21 +0000
+--- a/data/gpx-viewer-file-chooser.ui
++++ b/data/gpx-viewer-file-chooser.ui
 @@ -7,7 +7,6 @@
      <property name="title" translatable="yes">Choose gpx file(s)</property>
      <property name="icon_name">gpx-viewer</property>
@@ -10,9 +9,8 @@
      <property name="filter">gpx_viewer_file_chooser_filter</property>
      <property name="local_only">False</property>
 
-=== modified file 'data/gpx-viewer-preferences.ui'
---- data/gpx-viewer-preferences.ui	2012-03-06 08:49:48 +0000
-+++ data/gpx-viewer-preferences.ui	2015-06-01 19:44:21 +0000
+--- a/data/gpx-viewer-preferences.ui
++++ b/data/gpx-viewer-preferences.ui
 @@ -5,7 +5,6 @@
    <object class="GtkDialog" id="preferences_dialog">
      <property name="border_width">5</property>
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
index 58e714a400e9..f46fb5bf69c7 100644
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils gnome2 vala
+inherit gnome2 vala
 
 DESCRIPTION="Simple program to visualize a gpx file"
 HOMEPAGE="https://github.com/DaveDavenport/gpx-viewer"
-SRC_URI="https://edge.launchpad.net/${PN}/trunk/0.4.0/+download/${P}.tar.gz"
+SRC_URI="https://edge.launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +21,8 @@ RDEPEND="
 	>=media-libs/clutter-gtk-1.4.0:1.0
 	>=media-libs/libchamplain-0.12.3:0.12[gtk]
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	>=dev-util/intltool-0.21
 	virtual/pkgconfig"
@@ -31,23 +30,22 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-crash-backport )
 
 src_prepare() {
+	default
 	vala_src_prepare
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-database-updates )
-	autotools-utils_src_configure
+	econf \
+		$(use_enable nls) \
+		--disable-database-updates
 }
 
 src_compile() {
-	autotools-utils_src_compile gpx_viewer_vala.stamp
-	autotools-utils_src_compile
+	emake gpx_viewer_vala.stamp
+	default
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
 }
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 5403cd4c1c64..cfc3c17f3a56 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,4 +2,4 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 EBUILD grass-7.8.5.ebuild 6941 BLAKE2B fb4f2f5cfa068cc90b45f94fd5ddc19415a66b7fce9f34b5b3c6d71002de226e192f4740e140e9444a616e8498bf4b616e3718448e21fd1d85df2d73cb42a9b7 SHA512 80397ff07c02942ddb2d7ffe2ade1ba88c6baa5563ceddf20d707cb522c2703c6615acd83e29581735f3d8e989436c2e1672be68d4e680032be38f9a9132b130
 EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
-MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
+MISC metadata.xml 1088 BLAKE2B 4a9d470738d4860ae6e841976ba21974a18c97759c61cc4677d9707c8fb2220f998999368247ed1b19bfc45d7c53624d0ffec9c4aefad951e270f07c43fdbe4f SHA512 0ba4c779c3c0f3ed226fbf7c53e291341513c78e4a5d9ef228cab5436dacfa686cf8fad28aa3143f5036603fcccaf538b5607f48a86138be42af4aead4d147bf
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 0f889711e12a..e62b0339f087 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mario.haustein@hrz.tu-chemnitz.de</email>
 		<name>Mario Haustein</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-geosciences/metadata.xml b/sci-geosciences/metadata.xml
index ca00dbc0225d..aaa3e74aea97 100644
--- a/sci-geosciences/metadata.xml
+++ b/sci-geosciences/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria sci-geosciences zawiera programy naukowe związane z geologią.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 29482902ba4a..2a15a1ebcd40 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -4,4 +4,4 @@ DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c991
 DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
 EBUILD osm-gps-map-1.1.0.ebuild 898 BLAKE2B f3e1d64725ee9f2cd4f55f2ae99f97a95af06daac009dd0d8e95aa63fa00c02ebf349649fa1267df74a8c3c01cf5ebb8ec37edc9a27b1bd5e42460c1e3b19eb5 SHA512 11128628973eb0bf7bf32e7ce3e40d7d8df67d27eef722b102bfb87d5359f3b256938c27c685e82ba9d3c6415403d0c7f89870b74fbd0b04188b7b14189dad57
 EBUILD osm-gps-map-1.2.0.ebuild 918 BLAKE2B 58c078a9fb9bbed6746317ced574f9a5695d844ae5a06b43bf5e5edb4be986e281b7253c43d0b63b9a28c7c4ef8d475a0be5c8ec42a418d6f4ed544ea95e0b31 SHA512 45193dc3ddfaf474747e6f409ab8bc8e32667e4ef3c0a537234f6037a4099844619a855f506c56dae2ef51c09e1ee76646068616aa595913f77c9d90b41bb662
-MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
+MISC metadata.xml 327 BLAKE2B 9928a0d7b2d9da58a548fc859f323ad6df0bf6f3e4c1ec2c9e2b32f3b08f314dbf03f5b7cd4ef9e68361a4ea0b1806cd09b9abf198e3b597ac14df2dad08f57d SHA512 cdd37b496981ed29f5f403a7d555beb4bafc78121f0ae8d5cb9c19ab12ef1201a519db43353fe99f679923f5179e3fe2d767f98aecc20229a95a6c2411744217
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
index fb62bce3d4d6..81788a1dd46a 100644
--- a/sci-geosciences/osm-gps-map/metadata.xml
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5bfc88eab3e4..c008e26c75d9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,11 +2,9 @@ AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ec
 AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c
 AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
-DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.16.2.ebuild 5365 BLAKE2B 58033663ec3786fb8f06f7f7b04a608b5ab34d0cba7303811038b70348f54aa7105afb2cdb77b03c63c15e226f2735d5659900bd14b81fea9f3bf50e5fd04280 SHA512 6569a8609016ad07dffe8234e47350cae82b39b032634a6e61a3f6cb7e1c26e9a846ca3e7cf3f8a1839a3afebf102772c250e89b3b0e157fbbb07f22847cddd7
-EBUILD qgis-3.16.3.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
 EBUILD qgis-3.16.4.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
 EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild b/sci-geosciences/qgis/qgis-3.16.3.ebuild
deleted file mode 100644
index fbfc6e31fbfb..000000000000
--- a/sci-geosciences/qgis/qgis-3.16.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_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:=[${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}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index ae59c85b4af9..fd254459cde6 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,6 +1,7 @@
 AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
+AUX viking-1.8-libexif.patch 868 BLAKE2B 247e44a710566e0c4c21272ed61a8037e053de4e8560f88fa5202c2babd60a59b0d62fd8ae4da0af8c8de81f529131ac4a646d21e722c6ea2202de92bec825f2 SHA512 0e6dddd86d12e8ea229b1e7430993fdadadc303860af762f3d2aaca62b0b509ce437a44701e9be9ca503df50e5aef5c8e041bd26339a9a0b0d364b2464c8f8c4
 DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.8-r1.ebuild 2005 BLAKE2B fa260af8911ce785a8784a44746fd364dfeeb34bd8e34eefd752d212e7f23baa76447df37fb197fc3b9de32cd47e3d97fd304ab1e740d27a0c05c6c73e1310ae SHA512 76716a6434498e46bf2733abc7380cc2a0f1177d058d9e2eee0c757026805e473d09a9ac135d507da95661506979faf2fd14161b4a9ee1704db951c8576050de
+EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B d29fa2382e0f7e2804dc5fa74b43461216f2ec6f53e286caf7e981e434ac8b4cccc9c2b35ac0aa3db36c4d59be25aeb9beb1771f860a31a1c86b6ff2207c3904 SHA512 5f0d19996ddf92cf472a26c811ff83a95b0dd8a63a5f86a9566f236301afefb2464fd66227762aeb7cb167c6bf9c1a1f81de4541600816bb1b6f76fc2cb137be
 EBUILD viking-1.8.ebuild 2037 BLAKE2B 5e9cf7ad142e3178da1ac92a50adee5f67d28655b02b594fd385c1c1a9582f27e6eaaddf7c0296d7d812ab31a8434608a2e056787d125c8842cd85238dfa491b SHA512 fa63ac4da0792172a596ce1a68de4d6c0213e0618bcac9958c0a6e36ffd0ee3eae162a83b04959a93e46e6cc0ef96456dceedd215ae48734aedafe9008d41bc4
 MISC metadata.xml 833 BLAKE2B b0c8b498cf7786b610e6528448bfab45e88967dca7cc59779ea9e3f51684f7ca85296de3b258971adf23618e1a60bed663be32ecf85a367157d0e7381010aa8d SHA512 8354f387678813b1c78e28a8b28475fca3a148297bcd13555f6e3fdf5fea600b242f82f68265c16cb760d927b6adf07b7dd328a06ff245e8eef70fa3833717df
diff --git a/sci-geosciences/viking/files/viking-1.8-libexif.patch b/sci-geosciences/viking/files/viking-1.8-libexif.patch
new file mode 100644
index 000000000000..0f8bd81fe1cd
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.8-libexif.patch
@@ -0,0 +1,22 @@
+From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001
+From: Rob Norris <rw_norris@hotmail.com>
+Date: Sun, 9 Feb 2020 11:28:30 +0000
+Subject: [PATCH] Github #80: Fix build with '--with-libexif'
+
+---
+ src/geotag_exif.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/geotag_exif.c b/src/geotag_exif.c
+index 0e879a39..6e9514a7 100644
+--- a/src/geotag_exif.c
++++ b/src/geotag_exif.c
+@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor
+ 	// Not worried if none of the other fields exist, as can default the values to something
+ 	//
+ 
+-	gdouble alt = VIK_DEFAULT_ALTITUDE;
++	gdouble alt = NAN;
+ 	ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE);
+ 	if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) {
+ 		alt = Rational2Double ( ee->data,
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
index fc94ad904522..5d0117c5794f 100644
--- a/sci-geosciences/viking/viking-1.8-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" "${FILESDIR}/${P}-libexif.patch" )
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ffe2f73c8e56..6609d052fe4a 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 26d03a9cf5e4..0bc9c1089725 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,3 +1,5 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
+DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
 EBUILD armadillo-10.2.0.ebuild 3511 BLAKE2B 348bdfbf3adefd3c633a5208e6ecd2ee14be9806a50b571d6805cb7288d517ae214571b17edc7fa991cd4612cda2f6d23815fdbfa9731f7a88875428f98efc14 SHA512 29cc6caa4fc7d65d3420013ae072c1b2a2d6b07407cb2223ab02741c3dd0cb863791d3df69f450379113c408e559e21f70870bbd8b3f0aa19790b059dffd5816
+EBUILD armadillo-10.3.0.ebuild 3514 BLAKE2B 8fcf3eeb1c06d0d4c9cdf64dcd0856a48c320c84b001d3813cb0c54a488eefba3ab2efb57173e3101a267c09d331faef0b9d34a25c1b0faee2706affd3e3fd01 SHA512 dccc8e0116de10becb4a5776b4d4227f72f80261b3ba4c1d24e9e0d84a8d8ec04a9cc561782f2fe6a60d8e84b2481f62e16e56af813d5f0b563ed50e53232ef5
 MISC metadata.xml 1455 BLAKE2B dd2a5e02b716e914005267eebf95de988339833b69e4fcd5f7f32d69beb9e04530aebbd4c338350c842f818ba10074debaa3f2a39300367ed65104f25a0bc924 SHA512 1ece1eaac64e507c4b7a706997a9dc70dc50b7930526b5c16336db5b3558c5066e6935064a2816c0f21455487bccf3a8d4a95d4b5f0e6fd9434a9cc1ae46fd50
diff --git a/sci-libs/armadillo/armadillo-10.3.0.ebuild b/sci-libs/armadillo/armadillo-10.3.0.ebuild
new file mode 100644
index 000000000000..baaa3579072c
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.3.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+"
+
+src_prepare() {
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DDETECT_HDF5=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+			-DHDF5_INCLUDE_DIRS=/usr/include
+		)
+	else
+		mycmakeargs+=(
+			-DDETECT_HDF5=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md
+	use doc && dodoc *pdf *html
+	if use examples; then
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 695feba7df30..e7489356cd7f 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -3,4 +3,4 @@ DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc81
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
 EBUILD arpack-3.8.0.ebuild 1371 BLAKE2B 1f08fa2ecd79c6cd3ab90d89a99e7fffcefef0f9e936e216fafc94329efa7731858bf85d2f81869f7a26581bb6d3573f34835fb94a4a078a690b61e8ae4b61d2 SHA512 cd5f4eceb41a956bef0339def569bf103a1cae9b7d5379e4e4996ab3e08219d197b7495f8d7639b91762128e2a62f1152463c4677c71c7ea8841b7cb41982fe9
 EBUILD arpack-9999.ebuild 1312 BLAKE2B a0d2b9895489d5072ff6127d4df0cefb9ea9ede42d826edda67c1bf46aafc443fa5fb640dafb213e10eab3acde4d13e5d1ba6f86434df2541263fdbf3303fc32 SHA512 3ea7dc8d88cd389fdea1096fbd34a4961f29460b7d5ab6a5b11bde3653652e3296af5ee6b0f4dabba9c21b80c9bccefd98c1fa3b37ca9a17154f95b63fbdc890
-MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
+MISC metadata.xml 974 BLAKE2B bacece5871d9ce2a71f9a3a41ed89813f1be8b2a6633a8a0fdee407b8f2dcc6761381baeeba013544311d4707d57031ec28cd21757e57c2446a1d534d0340bde SHA512 105367be7e8ae203d3dac02f20d87c3d142cf8e0fec249828530a43bd1b3ea4bdb0b651b4b54fffa09bf89ee6b5bb9566a897ca4bf90ddf47c93d99e3eb5fb5c
diff --git a/sci-libs/arpack/metadata.xml b/sci-libs/arpack/metadata.xml
index c38e598bbdac..f9395d1b28a4 100644
--- a/sci-libs/arpack/metadata.xml
+++ b/sci-libs/arpack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 83703783fd4f..d29047fba002 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -3,4 +3,4 @@ AUX avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch 695 BLAKE2B 40feb1bfe132fe5
 DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
 DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
 EBUILD avogadrolibs-1.93.0.ebuild 2422 BLAKE2B 911019bbe695b030064bd0c23159402d22ddfae058f3a7bcbc87427b76616b125ae283ab0ed35afe16d915957f7468974afc74b8dfb8c4ff3bbb976987ea918e SHA512 a360095e50bee771e34c4be736a1afd5ccf6ad4687a8f0294093a18a095cf2bea6ec4443b79bae2e75ae3edcbeb77439af54d3d0d1a32930554727b7d62acdfc
-MISC metadata.xml 579 BLAKE2B 59aa6538e67637b222e3147e245431ab0ea8efc1436ba0662f55630e917a0e2665a561653d50c72063c3797f378c6113596fd2b798ec24b2832e3b5acfe1fce5 SHA512 b05aaa97f0c7f7e205cdbafea4301f3dfcc587b7a7ce5907be5da472f67b757c9f254114c68766a4f0e0e58e274f3146221418f6cec7afa4bf5db62c2d1b1fa4
+MISC metadata.xml 579 BLAKE2B 827b30426a07383936e0c54866b17c91f3d94dcd89110730ebcf2bc1d601084288c2bbe93572721cad48884e053e53f2b9b86480e89e7c7d2d69cbac12880e84 SHA512 a2cb049b6e996753c7cb6cf35b5fb2812afb00da965390238a6f5d481de117e6aa73b8a6fd10baf3e1ea37c372dd80d9de15dd448041e8dbe8817cc9467d8f67
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index 8e2ba3ed6642..b1ec1f75eb7d 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 98c4e45f46a2..b20969046bf1 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -4,4 +4,4 @@ AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
 EBUILD blis-0.6.0.ebuild 2655 BLAKE2B 88cfec3304d3cd5c642f738b5cbb6a3417b9b210522e66a27491e383e956f054dc46f897a0d1d3de5762cc7c1f2c2015eae01d737570453170341157f67e0d5c SHA512 ad8782822a00d827aeb1cc0f730abc7373812999f1e24071f73638107906b8b60ff87f54579adea89c6c18d6fa8a3f73d15dd63febda2aa4d5f08fe5a47c9c2f
-MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
+MISC metadata.xml 1622 BLAKE2B bec7867ccc891317ceab450704fcb0f0cbe87c752420753c7d09110ea66c875bcf80ba128e85b3c26527f528eb210fb1e1cae998217b84e2802707b1b5136e07 SHA512 69cfd8ab8ee01b92ede95a9935d4a85cb18f7b55db952de35b25326d7e22e43b4ae0638ecd052a1074f40c80654206bb10454f35cf6f3d01d04e17b636c6e5fb
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
index 7fcaa00de866..3d3415f6ffa4 100644
--- a/sci-libs/blis/metadata.xml
+++ b/sci-libs/blis/metadata.xml
@@ -5,7 +5,7 @@
     <bugs-to>https://github.com/flame/blis/issues/</bugs-to>
     <doc>https://github.com/flame/blis</doc>
   </upstream>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <name>Mo Zhou</name>
     <email>lumin@debian.org</email>
   </maintainer>
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 5648d214bba2..e593d144211f 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,3 +1,3 @@
 DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
 EBUILD brial-1.2.10.ebuild 970 BLAKE2B ae79af15e21e3fdadad31ba2e52ba8b99cf65588bcc8620caee53e85cb8bb28d862b2abf48ada6a9569da64ff2a4f4c0839d78f287117c1bfa9027c2f5134bad SHA512 f732502fd186fe0f12faef1a1f3fc8fc2a2bdd3f166e36dd8ed8d6264708e00ff0519795f8b4b0bb72af03367cd48f9af6481236f927eb528bf1e13abf86ec85
-MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
+MISC metadata.xml 1076 BLAKE2B 475e333944585372d6ece664d99470d5a94d9f6fa43dde497e3aca70d16bdebfccb574e790f15f3175bc6f2b0d9cdfff6f0977af98a7198c2ddbd1df1e6440c6 SHA512 dac2bf9cf472ae000eb53878a6ad09924be52b7ed34a01a3b66b6359fde523d0f3cf72c53f7225c8b39f5b73c6c01b535d3742dce443b9cc37c9be116a77f72a
diff --git a/sci-libs/brial/metadata.xml b/sci-libs/brial/metadata.xml
index 7bb93bb41ee3..4e680968fce6 100644
--- a/sci-libs/brial/metadata.xml
+++ b/sci-libs/brial/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 61d987304361..0ccae71b74ae 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -6,4 +6,4 @@ DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e
 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
 EBUILD cantera-2.4.0-r5.ebuild 3069 BLAKE2B 39717e82093e45822879a61834b49b64bab571b850d3e2efccc09e8f2667d9729edea788afb15fc056030d1239ff25bff7e6868ebd62000acd7efc72c3c55e4f SHA512 df6942fc36890820efc815873423b63aea4448b180b201c6ce4e85c4ae9cd67e54f21935de4a9351581f8913ae732c7c85bdb6348ed8dfe0da43cc503e1c1537
 EBUILD cantera-2.5.1.ebuild 3309 BLAKE2B c2719033675b6e1162ad13ff7499562932933c1ed21839cb3998fa1946697f939357a32a5d5c097ec01c38dbcf3b6ad782ef62d76d0602efbadb935b13cb05f5 SHA512 315c10d38a537fd5fe1166bd7018cd889f187b6f587fda0c8e2be42d14cd9904b2cef6605fa061e6f9df8f8a08042147a09e3bd6e46428e543400beb4eefe99b
-MISC metadata.xml 811 BLAKE2B 52b5f914f5af7495269fb62525bf94bf8b6a7b6a09c9e3046940d37d0b85772ccbc2e09eda36872525ef926126494425934adf7c2156e50001b314d8f44539a7 SHA512 2e8609d78f13315c06339cae35c4036677fbc372f09ea43dff7e7be670218990a6871650f3407b55d8679f94f6f0cd19c48e76bc37bf4bd9172b91ccc6ae3c2d
+MISC metadata.xml 841 BLAKE2B 6e302ea58d1e915a7b8f868c9e9e5f151434a3c1f8bd4583d0a2c3d28bd7cbd2d381b4c04dc9f2a3e63b3123ea566727ee275c9d4a13ada36f5fab34502fbac1 SHA512 59ffb087b063eeeb0446f66de657b745bea260ae96953673696d2780cb0d4ed86de718e0a3eaab6503e3395044c8c7291cc11e193d0bd72e720640f5df3d962a
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index cc02172de85c..689eb1c44d0f 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index baec50d77adb..bb4af472b40a 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -2,4 +2,4 @@ DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b602
 DIST cddlib-0.94m.tar.gz 1351298 BLAKE2B 0e1931ba94771f0dcae0ee10b003940ca331839eb8ce001ab02c4f1b382dde74d7dfcf74f4c62e1ae7214a3139547c09f56ef0cba5df74fc03a63ab741b64690 SHA512 50997bda38c36990456345881dc1eac65b1880aa510ea3812ae46a122ba7696bf3577f2b6976ff16811ee00f0a920c8ed6f1e7de0a4060bfaa96def11bab816e
 EBUILD cddlib-094j.ebuild 1396 BLAKE2B 032b697c46fd170dea85951451389f30fafe5ec67cee387583514bc8cff83ee8e5bf570308078f14deb88d42821bfaae6f8f847aa4e8df83827a00f81f413f2b SHA512 3fe5afeedefabaae12a1becc1ec735020802cf4b4b8184591a4b51c34147b087fbcf1a4a46c246ddf84a7dd320c056f70d6739a13c76d662776755e9dc125c74
 EBUILD cddlib-094m-r1.ebuild 1409 BLAKE2B 5d2d806df3b05611cdfe8ce235f1aa97917b9989cfbb3f4e5293b88817c6874e799d23bb823d63e434a70a16457855686124cb9c6b2ac4179966f9f69aeb26c1 SHA512 b9c324bb0c382fae96518e7e1cba92b20a3ee240dad56d402c521cb92aabfbb6c2c5297913b7fcc49dc5465b9527a0e8611602da68f1d91b85a9d261572944ca
-MISC metadata.xml 1817 BLAKE2B 3a75a0a27708d31cf58ec067ad25ffce663b3d52f90dd2437ce529bb4babf49a6e0461eee6841ef836f37caa2f7e4f62a762ea61094213fe10f9cd1e16951d99 SHA512 a50ed995ba248cf59ae3b2c2d5a8f91df9b08bd03cb48a14de0eabc79b44091d425b41d980952ac3eea6182e12ca235985f347bb67ac109993a47a545d1c4289
+MISC metadata.xml 1847 BLAKE2B 2917e4e43137206b759b78f5fa5d94f68f7dbf767e648ace868c3052a7351fcf1184232817141987e730ab596e0bb7c48c3273a872e7e1e5ec3ca60685055462 SHA512 70d46548955ccce28224210acafbafe4bf12dc471950298f214a9db78107d13c011cfc472fa41d9d5b14001bdb29d1afed0653683186085d37b6d117980cc8b7
diff --git a/sci-libs/cddlib/metadata.xml b/sci-libs/cddlib/metadata.xml
index eebce0ab1969..25012d0da04e 100644
--- a/sci-libs/cddlib/metadata.xml
+++ b/sci-libs/cddlib/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index 1f5b48927d62..cb7e17a83e83 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -1,4 +1,4 @@
 AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
 EBUILD fflas-ffpack-2.4.3.ebuild 1809 BLAKE2B 29030bd16efb837635ede425c980af59ce460138b3460d3f6b2d538073dc6f2ddf1bdd820355fc9ea00d51cc2596db534076e11b8013c4b8558a1d10f3692f96 SHA512 b7e345ac11f6d4f5e40adc371972ea3495ce98579ad3a90af6c434a4a9ca041143793157b9013bf945ad9cb56a477ba175d1b922a90658377124dd6b4025ab05
-MISC metadata.xml 1461 BLAKE2B 0b4c7c31a7a82eeb2eaa33027ff25877a6f5be4155b0be0018b34ea848b270ceb8393ab9fb4c3a053abc870885da52e5f48589593f4ee8d37762443dbc51bb07 SHA512 f350c0d55e9de16789244d03371d7331e6f41d5c726b6964e3ad4d09d9b74ec83dac56adc5c645f8e90705f833faf31b301d8c39f74bfc976b1883775bd84379
+MISC metadata.xml 1491 BLAKE2B a26497a0f046e8103c7c5ac8ea835373d4c30d2ec2114fc75aff3cbf72155d492dd09b78ee0ef869ae9d717ff00cb84913f21f2b645e2108889fc873afaa1d88 SHA512 da5ec89287e1a22903fb283bc37caa99e90c56fc2163ef7cf7dafc657f72d69325f627c95371ceb8561a18fd95a1df40db4f8c762d5663f7cb2c2ad97e39563b
diff --git a/sci-libs/fflas-ffpack/metadata.xml b/sci-libs/fflas-ffpack/metadata.xml
index 9de9afc41f19..a12fc81f426a 100644
--- a/sci-libs/fflas-ffpack/metadata.xml
+++ b/sci-libs/fflas-ffpack/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 0a55d7d6c7ee..c5f9a4f2c906 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -5,4 +5,4 @@ AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
 EBUILD flann-1.9.1-r3.ebuild 2320 BLAKE2B e3a8d2a4014e5bad7c20712aec3aa52c1334525830a408811923e63a22934a936ce9408ae26101c61cdba54edbc76e8f83d49631398a96c090a945a9b72f157c SHA512 a9143b97f949c83ccffbacac4da2215058372197cca49149d562bf9a8709acbcfe658e24d2c0532f71727c68c75c51ce432ddebfcd0afe98d7f003c6a9cd0c94
 EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0
-MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
+MISC metadata.xml 971 BLAKE2B 1476229abaf85d390624f44f7ad265c5eb8b77e9549a5fe19b896abbe7ea5af3f7489f11dedeace9b615c37c0c6d945314d529d939ff3f360c67922fbca3a65a SHA512 e98693a4e0633fc940513d46b97e1b5c01fc1b352e117adc182f118c40f346f98027f65ae1604b0a8c2084a473e1f908ee76747eaf5a8f08afa35ef16c9117b3
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index 3238be55ea69..176a3633b941 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 40124fa571c8..04b7c04041e6 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -2,4 +2,4 @@ DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af
 DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
 EBUILD fplll-5.3.2.ebuild 684 BLAKE2B dbb2bf6a338bd9b4f357aafab6737001155249d0a28fc398f37c696f4e3a1a2497b221a5426c7f252a36b9f57c26e0bab65ca134fa405407f6697aa8f17949a1 SHA512 ebd3087376ccd1be88f351be6edb6e0eaa3beeefc3a4774208133173c67ae58490c967fbe5e19349026135a1292b4711a193cec70b5ecace1f1470010d72ae87
 EBUILD fplll-5.4.0.ebuild 658 BLAKE2B 3adfb8f5caca78eebcae8a1cfd4ee869e25cbe2b6dbb73836e96e2153a4a31b509a8642cb701b23f19a3ecf639a3e05028bb1e7179d767ca308fbdd58ac4be7a SHA512 2da04dd45844b9dee25a9a8ae9738ca7eecfff065ae190de532ed0087e16ec84d3a9337672d09657a32befa16883f9158e4f6af6efdc7b3a1f1068509f27c988
-MISC metadata.xml 827 BLAKE2B efa2adff8c660810748cc82bb6ad63b49e67e9d1e670669667ba158c0006c9aaf2c978c116202cd25a009329911d72287e3054c4f7bdb3fa99d5aa01ade40d15 SHA512 90d6bc79cd4f01c8e0196b461142c0b2af2bde8eb2d937391f07c3ec1aba3fdfbcbb0968b7e1db2d1c62d9a3f9768b20e160e382d00e1de17a939481b2b5f8fa
+MISC metadata.xml 857 BLAKE2B 7024265f84fb760308303fba741140e69eeffceafed09cba734b3d2c2f70c0afc6e7e5a606dc0fdfff870850a59a7513c59357762161d7716600e46b9c204549 SHA512 0495912a858e8c9c8fe3f9112bc74e6f2a5869ead87564d09b68c623f6a14291d54c5addf55fe10f4d0ae21a7119ed172e00a117646dcabb3856a734296c0ddf
diff --git a/sci-libs/fplll/metadata.xml b/sci-libs/fplll/metadata.xml
index c35857534278..c23c111ba1fd 100644
--- a/sci-libs/fplll/metadata.xml
+++ b/sci-libs/fplll/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/gamer/Manifest b/sci-libs/gamer/Manifest
index 960a13ea3b97..2ce306c4c803 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 535 BLAKE2B efbd055c70928d01a9ba68943231aeb490dbe4ff412b205d8ef80dbae7a64f1bc6536adce9421f15848adae0c4af020c8b3feef9aa2bc7b09738de299d91c0c2 SHA512 639f0e80eb116c77d723f707488cd66124f1eaefa2f74c2fff80152ce0cf7f17b9c334f33500eeb0f78f11b0574bb20945dcd9718b1ef5e9a149ccce07981228
 AUX 1.4-multilib.patch 872 BLAKE2B 49618dbcb651bc9e307decdb778a3ea5c9345d09c58b1a407a28e821eea419411cbbd79e2357d1f93f4f0b9d927747d31464f83286b96cd70f4e93f229482dd1 SHA512 44ac7731277c47b822bbcac11b62d62e397c539d7a9dd32c805ee656ecc2cc4cad2878082212abded212419bf609823c21f9d351ad828a07357c9b2900c112e9
 DIST gamer-1.5.tar.gz 4232061 BLAKE2B d2cc861a3529678cd2c17bc6e333c99d2e155697ea935d91e1d2be65fa392e0a27b491eb102f5fb623c90a611d927482d8064a134124c1ecb20d7aa41060d64c SHA512 4911b208ae5cd7be7ef165bac8fc9680ff03c0936881ae3d162205df9ef4f3fb176455e27b2f4ca202c3129352156cf5166b1d7d99fde7b281b404e383f72a44
-EBUILD gamer-1.5-r2.ebuild 1046 BLAKE2B a525052a35c5410754041dc3c9cf0bb6a794d9310313be346b4b653a0f0eb26b515bb12c271de7318b938fda7ae2d1d8d59768cfe3cdeb5e766f0b797cb5d2d4 SHA512 121137d107e05365205df6162b3908445c0cac4cb481ed15fde1522c96753dc1fe07f7b4f710063dc9b9146976752661b329f28176900debfd7779a4afdf2a50
+EBUILD gamer-1.5-r2.ebuild 1001 BLAKE2B c6b37f1c70c4f18247256b07d10430081b0ce0219b3c6735e52b470547fb88adbb761cca84908617ececce9eee092f84bc0292c963d3df3fbda0d124f08c1a61 SHA512 e9f153886cd4d5594b0c9406eb08569247ed2fc7f88979f5c71119e88ef8815123d9a27a882aa8933a7ece9e4e5c33b70bf95dba7c1fa1966b4b67b4653ac7e8
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild
index 23cbb8033662..e8fc10d94826 100644
--- a/sci-libs/gamer/gamer-1.5-r2.ebuild
+++ b/sci-libs/gamer/gamer-1.5-r2.ebuild
@@ -1,51 +1,52 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Geometry-preserving Adaptive MeshER"
 HOMEPAGE="http://fetk.org/codes/gamer/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/maloc-1.4"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}"/${PN}
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/1.4-multilib.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myeconfargs
-
-	use doc || myeconfargs+=( ${myconf} --with-doxygen= --with-dot= )
-
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
-
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-		)
-	autotools-utils_src_configure
+	export FETK_INCLUDE="${ESYSROOT}"/usr/include
+	export FETK_LIBRARY="${ESYSROOT}"/usr/$(get_libdir)
+
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '')
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 5f0d2bb93130..7548c2a4a9ff 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,3 +1,3 @@
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
 EBUILD givaro-4.1.1.ebuild 1794 BLAKE2B 243c21495b82ee4e6b17368f1469a31c0c9ab2b2b8300d0c3c3a706ff3f7e1857d98fce8830dd9003fe0c4a61680911ca8ba46e1c510c4fadccbe70b58afe81f SHA512 8454b0ee3d616a3875e7e93aa8c6a518e06dd0c44b725044b54f067177219e4d18eb7f58adbfce39298cfba62814292c822ea21d6c2b956f340997b9738a8463
-MISC metadata.xml 738 BLAKE2B 89916089365fd82a21b273b91b832888d542ec4c0d7533d725f2be0bf9c9310758f3d4ccd5e8c1d6abf8cb63f92e62c048be22f99a88f05eb6db5cd6bc5a8c17 SHA512 768957687398de4ece1f9d04f6f4c7836b0230d166553b5b2998d61875d78810c1470061eeaac5d39b4ee81f839cb4eddc4ba2316a7024374f8a8864a275af4f
+MISC metadata.xml 768 BLAKE2B fd86b985828a4ff9834fff86884bc89c2d346a8a60971000589668161ff88f493cd6cedce1e7c08db85f948de3c2ae2afde4f27565abbc6da4d652852c54277b SHA512 e79a2f5b28fbd0b8b1eaaa3791ee89441a45fc5d6c2e4c43cc1dd80456d847e3d85c14cfbef27eb2ea4c809513ece2c15f400fe3f3bf293d66461c2b46e99e27
diff --git a/sci-libs/givaro/metadata.xml b/sci-libs/givaro/metadata.xml
index e1c0c3cbd9cd..3172f8a01023 100644
--- a/sci-libs/givaro/metadata.xml
+++ b/sci-libs/givaro/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index 7b2968d7404d..ede4b66c499e 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,4 +1,4 @@
-AUX gts-20111025-autotools.patch 1475 BLAKE2B 62987f8bdf50e5cba84b1cd259038530170894c1ba4e4da71e94cd77d327ecc64f6f3f6b7f3c771c5ccb3e279016cfa9c15fffd5261a99fba0e844021d5ef42c SHA512 1be24faff8e81020b1f349360e4654307d3ac2306f2c8ad5d5534946f1c29db862b337732a41d941b5e67a1f0b0dae61d945b52295e7cddbed640d7653a01dd9
+AUX gts-20121130-autotools.patch 612 BLAKE2B 1dd5e897db2453d704554918c4473ec60f0371994e05964ac11c561cfda55980ce7fc12611fb3d5588ab346cc4a78f280371b5c0db633ba052dcc0cbf4d12d55 SHA512 dc80e024813c045f3379552f2ad3ed63b048462622149e33ab97c74ab0c75cfb09f928f6ba975b4e94ac201f3d04a4bec1016cce014c134e4baee4480ec38158
 DIST gts-snapshot-121130.tar.gz 880569 BLAKE2B ffd35083122ec40b9ab3c301965e2f40f35f81cbb51947fee01d851f545d5314cdce6c24eee2cbcdf08fe492a63eadb3720535d3f4ed913f3309561d0d382c80 SHA512 84c38dc345830eea75755d9d55235b6d76786a84c3b9c3b7e057437bf395a9f2687596bbf037afd601b9f31a485d425a371ca5e60680265f10cb414400db4142
-EBUILD gts-20121130.ebuild 1056 BLAKE2B 2ee092361d9a5770d7439e3bf9f0cb558032a59d9f74eb38894158f7b9417c03a627bab9602dbfe5c429732cf74b3b276bf0aeb9d800a6426f4e5ec5658c4589 SHA512 413b0a13d9ecde9ddb0f680db3bf7fe76a87ab2cbdb64c8dbd4c83aca17055cd5b65b6485a8342a042715cbc979b5c9862282deb5e14882db394fe45e722f5a4
+EBUILD gts-20121130.ebuild 1165 BLAKE2B a4e74239da63ea033073a8b5a2e5e48e2720e56814e52b7d7ab079c2642b05f1b2fbbce0011be2234ac6545227f5d3ffd183f55ff35daa355da2b329a1e6f821 SHA512 16ed6c9c84c4b9868182418887e46c31f88b091c930a08ce87cf96b90cd7d2151471b4dc36b1b6f967fc6fda7557c22d95bd78683659bbf1d42304dffc256f5f
 MISC metadata.xml 510 BLAKE2B ce7bd676f832dc3037ec4b4455169147f681dc81c70b346c898bbebc5906fd03af9f69269abfa0ee9760ca77eb54e1cc043ec2e0957230f9bb013cf168edd8c3 SHA512 12fd9a10b7f46ab73d79c79f4ae31f4f174acddd4a5603a20ae49b0c2d39385b23e70b58389281dbff24a567c2162ea513d505c90c28dbac066b873be60aeea3
diff --git a/sci-libs/gts/files/gts-20111025-autotools.patch b/sci-libs/gts/files/gts-20111025-autotools.patch
deleted file mode 100644
index 7ab3805e2477..000000000000
--- a/sci-libs/gts/files/gts-20111025-autotools.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -9,7 +9,7 @@ DOC_MODULE=gts
- DOC_MAIN_SGML_FILE=gts-docs.sgml
- 
- # The directory containing the source code (if it contains documentation).
--DOC_SOURCE_DIR=../src
-+DOC_SOURCE_DIR=$(top_srcdir)/src
- 
- TARGET_DIR=html/$(DOC_MODULE)
- 
-@@ -21,10 +21,10 @@ scan:
- templates: scan
- 	gtkdoc-mktmpl --module=$(DOC_MODULE)
- 
--sgml:
-+sgml: scan
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
- 
--html:
-+html: sgml
- 	if ! test -d html ; then mkdir html ; fi
- 	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- 
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -66,10 +66,10 @@ predicates.o: predicates.c predicates_init.h predicates.h
- 	$(COMPILE) -c $(srcdir)/predicates.c
- 
- predicates_init: predicates_init.c rounding.h
--	$(COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
-+	$(COMPILE) $(srcdir)/predicates_init.c -o $(top_builddir)/src/predicates_init
- 
- predicates_init.h: predicates_init
--	./predicates_init >  $(srcdir)/predicates_init.h
-+	$(top_builddir)/src/predicates_init >  $(srcdir)/predicates_init.h
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
---- examples/Makefile.am.orig	2012-01-20 19:44:46.000000000 +0000
-+++ examples/Makefile.am	2012-01-20 19:45:04.000000000 +0000
-@@ -13,12 +13,10 @@
- NETPBM_EXTRA = happrox
- endif
- 
--bin_PROGRAMS = \
-+check_PROGRAMS = \
- 	transform \
- 	delaunay \
--	$(NETPBM_EXTRA)
--
--noinst_PROGRAMS = \
-+	$(NETPBM_EXTRA) \
- 	set \
- 	volume \
- 	cleanup \
diff --git a/sci-libs/gts/files/gts-20121130-autotools.patch b/sci-libs/gts/files/gts-20121130-autotools.patch
new file mode 100644
index 000000000000..2c651e9ba959
--- /dev/null
+++ b/sci-libs/gts/files/gts-20121130-autotools.patch
@@ -0,0 +1,32 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -21,10 +21,10 @@ scan:
+ templates: scan
+ 	gtkdoc-mktmpl --module=$(DOC_MODULE)
+ 
+-sgml:
++sgml: scan
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+ 
+-html:
++html: sgml
+ 	if ! test -d html ; then mkdir html ; fi
+ 	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -13,12 +13,10 @@
+ NETPBM_EXTRA = happrox
+ endif
+ 
+-bin_PROGRAMS = \
++check_PROGRAMS = \
+ 	transform \
+ 	delaunay \
+-	$(NETPBM_EXTRA)
+-
+-noinst_PROGRAMS = \
++	$(NETPBM_EXTRA) \
+ 	set \
+ 	volume \
+ 	cleanup \
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 2a29d95b7edf..2ce0a8b48a5e 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -1,49 +1,62 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
+inherit autotools
 
-inherit autotools-utils
-
-MYP=${P/-20/-snapshot-}
+MY_P=${P/-20/-snapshot-}
 
 DESCRIPTION="GNU Triangulated Surface Library"
 HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="http://gts.sourceforge.net/tarballs/${MYP}.tar.gz"
+SRC_URI="http://gts.sourceforge.net/tarballs/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="doc test"
+RESTRICT="test" # bug #277165
 
 RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	test? ( media-libs/netpbm )"
 
-# buggy
-RESTRICT=test
+PATCHES=( "${FILESDIR}"/${PN}-20121130-autotools.patch )
+
+src_prepare() {
+	default
 
-S="${WORKDIR}/${MYP}"
+	# fix doc generation (bug #727536)
+	sed -i 's/\xe9/\xc3\xa9/;s/\xf6/\xc3\xb6/' src/*.{c,h} || die
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+	# allow to run tests (bug #277165)
+	chmod +x test/*/*.sh || die
+
+	eautoreconf
+}
 
-PATCHES=( "${FILESDIR}"/${PN}-20111025-autotools.patch )
+src_configure() {
+	econf --disable-static
+}
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile -C doc html
-	chmod +x test/*/*.sh || die
+	default
+
+	if use doc; then
+		emake DOC_MAIN_SGML_FILE=gts-docs.xml -C doc html
+		HTML_DOCS=( doc/html/. )
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}"/doc/html/)
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
+	default
+
+	docinto examples
+	dodoc examples/*.c
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 11eb3b918ea9..e0244ff4af4c 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 2807 BLAKE2B 23514104cb522f06a54ebb821895367a6514d47e18d42a8be1e633603da33aa795e5ec6c6a875cc4330ce228a47d28881e5aa077f78c66e0bb770fe844997be4 SHA512 dd59891edb4bab6ce5411a3070f7870fb87fe22f097aebd1fa08f749d36bf788d7b9cc57dec440adc67ad5ae046b891da3fe090efe64574c9bd60bba25b10bbe
+EBUILD hdf5-1.10.5-r1.ebuild 2877 BLAKE2B 093a9bb7446c78264077e99186fe58713ef3be4a4ecda2a514f64f9caba5c12c2cdea0d8aa04a7ec53ace4e8d98a7fcd781e4b24c2a813bf55da2bfbc8ea3435 SHA512 5cf1a3620ab03e505d3a2bb662d9b7f99467dc33b2f5ef880be92ad94e4fe0366d6db5ea345801c0167d9a230312b8b847c98d2a71521f11df5773ac1fe95910
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 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 c3fa2f27d0ca..5fb40889ca3c 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-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"
@@ -75,6 +75,9 @@ src_prepare() {
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
 	hprefixify m4/libtool.m4
 
+	# bug #775305
+	use fortran && tc-enables-pie && append-fflags -fPIC
+
 	default
 	eautomake
 }
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 3a422dcd4f45..22d71e4f40dd 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,3 +1,3 @@
 DIST hipCUB-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
 EBUILD hipCUB-4.0.0-r1.ebuild 1099 BLAKE2B 93fb8305ce51fa26eae6be6d26ef05fa5916c7c7f8975d1694209e25d9bb5d69b55ef45175b65a957b79b32f61de6a76b7661f1cca1e2248dce0ce3b7048e6e5 SHA512 59440f40bc7f8600665c30f6098afd18d9219ad9e18db2a43edf654ad4a3d86241f0e12680721d16d056573d690ceae96f0bcb08b6d251d7963c829c9807fa3b
-MISC metadata.xml 545 BLAKE2B 322181ffcfe654260a2e65d7b73d5950d99094eb11495fb28ec3c24107fc3aa4dbcdb4eae53db9ae7532fccd66fc58987eb54bc1832548e1d7be547d26da3ea2 SHA512 a84c2a3df04d541a792bf026ac80f18e2f905f180699e36368dfdb74b2649f3956694263f9cc184d01ecbf60803f6cb213b4a283f252ba3e6028297d205bd038
+MISC metadata.xml 559 BLAKE2B 062be9d1dac4e9ce6c64a53bd4ec3e10466b60f2f1e745c4e2d7b05b85dbe8fa1243c4e1e3eac5405c35dc217c27efe1909755a61daea14bdc714cbb55df5745 SHA512 d4d17211614f8e234e6e42c835e17a9fa44ff7b1e0b2ec6dce310933dcf57983f934a80768441dd7bcb9354ece300a4d06ca24d8274728ecb0040eac6c189a14
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
index bc384a7a870c..d9e9ab75810f 100644
--- a/sci-libs/hipCUB/metadata.xml
+++ b/sci-libs/hipCUB/metadata.xml
@@ -8,7 +8,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index 5b3735ff0e57..93650c938008 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,3 +1,3 @@
 DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614 SHA512 78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
 EBUILD hipSPARSE-4.0.0-r2.ebuild 1140 BLAKE2B 9344f8e3678a855fca42b5c14fae5d0973ed3f8922836182d9327d1724e92feca6072933df181228ef95cc4993fc8a7797ebf31fac8a5a95eabe8f3de9165ac5 SHA512 e682f1acb67c282c638fd7594b0268a3dc7a33b71fe667f8bd38fc90449660367f94d1964037c0fbe3dd162e5c8a5a4aa941ec72a7353c2f629ed9f07ca06d6b
-MISC metadata.xml 588 BLAKE2B 28ef304a020639fe4677a6fac7d4bd56a544406d05feab9c11567d98c00fc612d4f2bd89b95df4850d0a892bfadd01e38356c35df7ecd4e3ea156482e50eb0f8 SHA512 491b454e61d5aae073bcf5a591dcddc7267bb929bdc686c5d811310025dd94ab8b5ad65abbec1b2ab5e9d91eff204b5e97c163a0e6c5f9af9ad7a245fcad4b4b
+MISC metadata.xml 602 BLAKE2B f6cb6a9258ee7c48cd8292f7c1b761f8a518580a5a3558b8ff6af25f088674ec4b6bca10ab71c446ac2ae42e452691f6147ceaa06982dba7bfc066cc13836aaa SHA512 639494eaab1fccca3220285ea17d83e9797f3d3983e063cf52e5745feefd61cb5a33b2ccc4acf952ef79f1eb77189667395756140fb5d3d68af9c1bf0349caa0
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
index b745c3d73285..9759bea23f0b 100644
--- a/sci-libs/hipSPARSE/metadata.xml
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 3e689f54d2f1..275860d92be1 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -2,4 +2,4 @@ DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e5
 DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
 EBUILD indilib-1.8.9.ebuild 1192 BLAKE2B 25b550018dd7ac9374e69666e69995edb133802609904ef526ece7a8d0b60645c0bd57c282a2a3cd4e48e1ff3daf164db9c9eb35cae8ec9393cd2b4e2dfa3277 SHA512 da09509560050f9f8eadcd28ee79da820cb489f2eede8f2e0343671fe7db5cbf932debbad09ee335d54432a8140f1268ed8a8d989d41154b891e7ddb4c203de8
-MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
+MISC metadata.xml 460 BLAKE2B 4162b7e9639a47a1e701c92680c6eaaf1a112c4bda3a2e5313d50a788a7150cf8d6a9348cbed8fff941a75af9065959894dd0cce861a16946ed975a734e5386c SHA512 c626e10b7ce367dcdbe278ac7dcc32ece8e7de11fb3003da1c7fb6a58105d377f1ec2593ab8d1f7a06ce00dfb16e06a7fab66b9ebcc65250f1910ffc778ea6a6
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index 5d5d0f3c56e4..6ceac2d83b89 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index de49f3def8b7..562d6a38efa7 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -5,4 +5,4 @@ DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb
 EBUILD lapack-3.8.0-r1.ebuild 2892 BLAKE2B 8aa139fdb09e219c539ade5c873dcc2f3d8e919daa4cefef4984484b0288799dbfddea33b74f2d5c88dbc7bab95109e4ad421aa32dde82059571cafb600fbbb0 SHA512 e8c1721460ed64ea9e1366c47fc36782f717d7bf87b3ab2ece988fe79373ec956f9c76cfcc729ddf5c984c3150ba4183ab5220da19f0fd3818a501b3f72c4aa1
 EBUILD lapack-3.8.0.ebuild 2840 BLAKE2B de601370663d749b99a65b28611ac24c73704c6ffa4998a5b430eba3ce70140de0a4ef3350cc564841fefd4d6fd0015602c481bfedc9165ab7e0fd894d46d72c SHA512 899e9d9e8687228ae8bb3f33badb7f2c102a3d1ec618d6236b35ffeaa2fcd6173e0b69bc2b60405cc319b5cf854738aaa6b28258442e7e242ff3ee697d70b1e1
 EBUILD lapack-3.9.0-r1.ebuild 3120 BLAKE2B ecafcba61f6320601aa3891f49f9a9a65eb5a029228d8d46cc0c44e06906f49922f94507c8d44751b701877b19ab42fc48047c6f49b8f827aa6b27cf8749d806 SHA512 49b6125480abf08914ebb1f8df85a1641edfa1d43e6f62a6c8e77ef9a38c40810692c7e02db1066d80611c11c85b7326613f88c1352bc8849846b7ef1d5431ed
-MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
+MISC metadata.xml 1582 BLAKE2B 73d853013d0a3312d8f90b7e9674e343af92c46182386450bd67c28d837dd1956ac0a6fa84cc6d81019da6b8a08826ec9c085a14b4aa127a564d8b0d6930ea6b SHA512 6012ddb8c455f7555e2cd747c32f26904bca4ef3f6f534401643389caa0c3bdb175983a002e3ada45ccde2365b6ce3101d8f6ebcc9d80f684e7fb897513ba98a
diff --git a/sci-libs/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
index e4cd26e0166e..c5618c37be16 100644
--- a/sci-libs/lapack/metadata.xml
+++ b/sci-libs/lapack/metadata.xml
@@ -28,4 +28,7 @@ This package installs the reference FORTRAN 77 implementation from Netlib.
     <flag name="eselect-ldso">Enable runtime library switching by
     eselect and ld.so.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">Reference-LAPACK/lapack</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index 7516ec89c8d1..581ab5582d21 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -2,4 +2,4 @@ DIST libbraiding-1.0.tar.gz 377140 BLAKE2B 93520ca1af05dfe77028d3a8d94e94fb4b387
 DIST libbraiding-1.1.tar.gz 377161 BLAKE2B 48a80823f15920fce17c7d67cdc0a7e851855a4d6dfa5e9e461c8ce408c9c73d8aeeeacd27ac1c5f33c4436e8174c6ae9be275a71187d3a9887d37cf3bc8b8db SHA512 3032a290d0c7c0c13519136e111500a9e22f36ae7f9cc36df5a22670f18ebbce03a01e72c81e556ef4f6eea1ccf10e90ba6a9343be4a229e420e2f7da6289115
 EBUILD libbraiding-1.0.ebuild 787 BLAKE2B 70a7d79780f451145b298c1a2955cef6e7c6a105241c5833284cf4e65933b0dbf9e057c7af8b6cb677403ca5303ed2a261abc8347bdbc84732c16a86e4fad24b SHA512 07133513b88cd231bc8ae369b9b7d2913bc0837b73a5ff0793c04e6f5792296f0d0edf7a1329af95a36c96071997871b58b11109177a9e4821fb32fc17e4d6b2
 EBUILD libbraiding-1.1.ebuild 640 BLAKE2B e8fd24a60100f8bac017e9e014add0b1c8a3393194a0984ee372de4ea3a5f6b7d02726b4a0290a8c1a0a633b0362dcfe273117a2fd1b8f687c19adbd1a6d68a9 SHA512 e1ad717b61ed8609edb2561d59c13f43f021f9cd15af1d871b352afac1b12ee11e9004deaa8ad1d41646a01cfb955b95920ae759a410a78e65a87ef1ff571bfa
-MISC metadata.xml 1009 BLAKE2B 8dff16992db4a93811825eba4e52e60025c0981e8f1faf2077ae78800d730777e73239146e3356ab4cbc39c94c117715a2ebaccdf1e1a23e3a864bcc06b50a8b SHA512 f6fd4fbe425042627258bf02be878c40834858521daa8feba891ce04990910ba256dec5e550c69cf0791564c8eeef1219f6d0ffabc2dbcc879ee8a44c25a324d
+MISC metadata.xml 1039 BLAKE2B 39c53b84b2a27835292e4181c57462246d53a5f878ebf39501031698cd729b43b5a4c228d0483233451a016af900506481d29dc60b52530b8dd70f28c772172e SHA512 b2dff1375d20a445b19c3d30de6920a60687e33f440b6666f089bbd72294a12aabb120b98737dde90c8cdba28512de2f571d565b82857092651401a34692d3e8
diff --git a/sci-libs/libbraiding/metadata.xml b/sci-libs/libbraiding/metadata.xml
index 1b46fd9baaa6..71becf5d2df7 100644
--- a/sci-libs/libbraiding/metadata.xml
+++ b/sci-libs/libbraiding/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index fce978984a62..3527d0e22fa3 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -2,4 +2,4 @@ AUX libgeodecomp-0.5.0_pre20201009-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf
 AUX libgeodecomp-0.5.0_pre20201009-opencv.patch 8236 BLAKE2B 34225d96e409d5c6921042279cef75f1affd3ce0fc038cbd8f9dfd591bfbded0a38e9b88603730954c3b0babc81f89fbb850bacb200b3c1145277903cb01b314 SHA512 5345088f5b6ea4ccb8c40e77c1eb949695aa4a0a2d82b703caa2bcd4f54952c335e0e8fba433b8c4a6a4695637387a9d42d4e880022654bc8abb2c8640bb820a
 DIST libgeodecomp-0.5.0_pre20201009.tar.gz 1510212 BLAKE2B fdddf8ef8dd93d0a4860dbde27d1e59bda039b27ff7526a1ddfb6cfe8103f54edd2a847dad2ffa1cdc0c4454b2d48e0df7e5f941ad2a9df9c848868817413b03 SHA512 42a28fcce6408c610265f8cde9c9d46e83519a8ec4a3e6b1f0e6637597b4b9a702c43655f9c1cf5a159012533f2c2e937de21bda2aed54cdd6acd19ec5b4030a
 EBUILD libgeodecomp-0.5.0_pre20201009.ebuild 1707 BLAKE2B db611929f80ba61f318722b4748d8a6e7fb3960a4586a86068445929895984c58c9cc807d94ca9c3f7a220aca69cdccff3d39dc9194926b5a95e740a129fa5df SHA512 d8cd7e45686cf0d40cfd19c347fccf5bf13e435c49bb27b7411f602357c7fac9346af91ab5468b44415a912ff5d9e53a03da549f0f67738532160c00b0b6aad9
-MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9
+MISC metadata.xml 1375 BLAKE2B 259d213d8a73f11fc23dd6e40d3a7f2fca584c03aea33b56f7bccb0bd2dff38b92e9c3c8a4d5ec1712d714e1ca2ec56e35fdd43a8f59f5f3ee7e3caf228d7874 SHA512 e69bc9d355b6b5fe7ec49ade4d9ae7c2e65cd8faebcdf4f99b7b81177151e26a6832909153a13cc52b697d4f4dc472f74c1b34abf6d8d6f32ee21822e600aa6d
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 402ba5be0c94..7f28dfaeb64c 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kurt@kmk-computers.de</email>
     <name>Kurt Kanzenbach</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/libhomfly/Manifest b/sci-libs/libhomfly/Manifest
index 2c2beaf07d0a..f2828113e5a2 100644
--- a/sci-libs/libhomfly/Manifest
+++ b/sci-libs/libhomfly/Manifest
@@ -1,3 +1,3 @@
 DIST libhomfly-1.02r6.tar.gz 359354 BLAKE2B 7b60c54e56777dc4b81240cbdd63726591323dc6d841f8d56d641ea304d9a4c1c3ffb3078fc54861f22b5007b36bd32c5f397e2fe8d40f10362eca8d08ba4915 SHA512 44f81815a0ba4c0358d433eb9769944af2ee02790d78aaa08e791d03ba68ba3dcf0389b4287f687211e6a7ba84e1bea3d2ebe69fc8bb4f12d677b7f54872d618
 EBUILD libhomfly-1.02.6.ebuild 629 BLAKE2B 4e9a0560888226fd10610c23de888c3d4120647a4c6bd38f854a11462c0e21fb11aa41dad2ceb26f9849db93754af5f0c123d1ad103df6d71e5807b28844a8f6 SHA512 695335d4244ca0ec15d4c8668d88061bb579b016e3dae2fc33a9a7609db427f8f9aa135b8755cc998921024956f9691aff54763b053cf3fa7bf7e4e712c55873
-MISC metadata.xml 743 BLAKE2B 9e02f3f11fb1a8a7046d7f88eaaa81adf870c93b576701a5bcee6b444887583e24bffdc5ac308e95c9b8f257115b70e06b7352d0bc8b425c3ad72fcb2b82e953 SHA512 449fa0dbd599814a98166cdf770f23d57dfe8a398083936e7772fb374fc9f6819af1512d90c09d51534b8518dd2c8741e8c30875ecc349411e4f532756fff1af
+MISC metadata.xml 773 BLAKE2B 428d6a0f662a180941dbfed2de69f89bcef4d9f0494a77d7f4a3b96fa043d2a5093acbe505416eacf9abf3cbe126f8b508f7a9a91c6971bf510c13106aefae08 SHA512 42d77daa3ee32a3723d8f110c6aa39ae09248ae3e4e0e863ccbef186bf6540b82aa822ac70f308e065ac7623ccec9f6b01dcb809c0aa73fe149767f8e458221f
diff --git a/sci-libs/libhomfly/metadata.xml b/sci-libs/libhomfly/metadata.xml
index e02bf222cf6c..b9eb9d36fc7b 100644
--- a/sci-libs/libhomfly/metadata.xml
+++ b/sci-libs/libhomfly/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 9c30d0424b33..fc4289ad736a 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -2,5 +2,6 @@ AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 874 BLAKE2B 334ebcd9d4a9a076197af69a0ce563173ba550917c4edb5427010355873716d2210d46e978e97078926cf280914129ff61fdf8d399f743d182bad68145cdb542 SHA512 0a8a04f2416c199d9c346d02cd11011cf3558f04d9c141a67b073cd9ecf2b77cace9ff8eda1b3a6e611a018ad235e5febd6a62e2d1a809444952a191c2f20210
-EBUILD libint-2.6.0-r2.ebuild 1408 BLAKE2B 7cca957dcd7de7df144a8350885cfce49f908f2b5da4359cd6e8bb18400f619fd8d05fe50a00259a62f49c33a056405a889129c4300531753c920a149339f791 SHA512 d9751f547c86c9e55df05791a93f86acc08f3e6fd4854dd45e667bdab6dcf107d38f1a9e19c8680836d24bef357a2de92c25fb8088a08d995988bb6b51d3d546
+EBUILD libint-2.6.0-r2.ebuild 1426 BLAKE2B c26877836d578b3150173e448e037a992e8004a7b70af600a1a8e809e872f0d787f180b4db07f5c9a6f21f8469878c53d9736f3feede1b332dc2fe33c9e52f2c SHA512 9aeb3443d6c29ffa8f4c2e7444d7ed1910235a6fc98f5d7e388ff3d59420526eb95071326c0bbeb6d7607f543fcaf27779c21b2289351e729674c84aba877218
+EBUILD libint-2.6.0-r4.ebuild 1534 BLAKE2B 3553b5e79439d2af424f68d2a16d656c1049cf80eff638615f6fa0efd44964b65495a15d1366f47b3b6989e8635b74cb45e33bea461ed30a48a65cbf23827074 SHA512 a1a703f45c644ac79ad24283f30d311adb7edf3d702bc14059b3c1b18bb6679630304d45f144dbaf0ae0730430b877d13d2e2e3851c2494ebcf9bc971aa8c7b5
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0-r2.ebuild b/sci-libs/libint/libint-2.6.0-r2.ebuild
index a07d7360830c..6646dd1f96d1 100644
--- a/sci-libs/libint/libint-2.6.0-r2.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r2.ebuild
@@ -42,6 +42,7 @@ src_configure() {
 		--with-g12-max-am=5 --with-g12-opt-am=3 \
 		--with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \
 		--enable-contracted-ints \
+		--enable-shared
 		$(use_enable static-libs static)
 }
 
diff --git a/sci-libs/libint/libint-2.6.0-r4.ebuild b/sci-libs/libint/libint-2.6.0-r4.ebuild
new file mode 100644
index 000000000000..e248dec698c2
--- /dev/null
+++ b/sci-libs/libint/libint-2.6.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
+HOMEPAGE="https://github.com/evaleev/libint"
+SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs doc"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/gmp[cxx]
+	doc? (
+		dev-texlive/texlive-latex
+		dev-tex/latex2html
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-cxx=$(tc-getCXX) \
+		--with-cxx-optflags="${CXXFLAGS}" \
+		--with-cxxgen-optflags="${CXXFLAGS}" \
+		--with-cxxdepend=$(tc-getCXX) \
+		--with-ranlib=$(tc-getRANLIB) \
+		--with-ar=$(tc-getAR) \
+		--with-ld=$(tc-getLD) \
+		--enable-eri=2 --enable-eri3=2 --enable-eri2=2 \
+		--with-eri-max-am=7,5,4 --with-eri-opt-am=3 \
+		--with-eri3-max-am=7 --with-eri2-max-am=7 \
+		--with-g12-max-am=5 --with-g12-opt-am=3 \
+		--with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \
+		--enable-contracted-ints \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+
+	use doc && emake html pdf
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
+	fi
+
+	if use doc; then
+		DOCS=( doc/progman/progman.pdf )
+		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 1b30a824025e..65ef956fed63 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,3 +1,3 @@
 DIST libqalculate-3.16.1.tar.gz 1756176 BLAKE2B b09e06a4d89249bb3e38a47ed47acc7598bc62e966673a1eb175641b1018021199dbbcd38266301ec8b2d3c55747378adfde3db4e25e58771be162905cb493dc SHA512 3cc7ba66493252015b9d33835188c236b10afdce5f23021a5e686609609265aed81d592815ee6a172c269a0f144a3203c954435fea8ddb82637453d5c98cd05a
 EBUILD libqalculate-3.16.1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
-MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
+MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9
diff --git a/sci-libs/libqalculate/metadata.xml b/sci-libs/libqalculate/metadata.xml
index 92e29b80e703..5a79485a6ded 100644
--- a/sci-libs/libqalculate/metadata.xml
+++ b/sci-libs/libqalculate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 57da135a45c0..ff4c744d8e2d 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -3,4 +3,4 @@ AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f1
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 EBUILD libsc-2.2-r100.ebuild 2298 BLAKE2B 7fe4e4c2c9a414c0fb9b9767b51eeeb7eb037829f93a0a29e4f71b8398f31ac10683a2ad478b28409da714fa59ff4e5ad93421c7977053f893b375bea0b16802 SHA512 119f54c96a01ad9798093f7fdced4299acdd11f6b420971234522f4e5a85ed7beced81ff65681cf07451ea8ec888fd599ebc1cdcaa9067cd43cc528826e92d0e
 EBUILD libsc-9999.ebuild 2308 BLAKE2B 42c7dbf970bd4d5528e5861a91234559814559d0cc1f3b9a0fd744f40fb0862f02f30859fe60c70733777d46aca74499b12359df74e2f49aa8d35f9fcb7e2edc SHA512 78b49ae6dece4e83a8482229e05c27f56af54f3e369940691c3625ba5218e9dab63cda2ae4f30a57b0f7221669e849e2924493cfd1d892747b2f6b1903bd1403
-MISC metadata.xml 712 BLAKE2B c1586f49aaa6c7d9a7bb45d1bbfc823efbc80e1032db8d6e4fc53bde10fe6a4d43b6f8e448f33683c6f47897a9ea575272678a50e63308f74b8e60ceb8e9bea2 SHA512 b00a3c5abc40f77724fa766c7b4cc386eec78a81396f6014eab6fb66618c9d11f08687b6f8d73bc24cc3b2deed8e88f44d69b4f7afe31ebbbad9308a99c586c2
+MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74
diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml
index 18bfaa1e5479..20badba13add 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index ffbb5ebeb81a..8644f1cfd73d 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -2,4 +2,4 @@ DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d
 DIST libxc-5.1.1.tar.gz 43264474 BLAKE2B 887dc11a6385559edc5e2e62f3e00b16ff5695e1c384196bc3efe5aceff0a223d5f69fafaa08290bdf72f95390cb82d43e541ffaf6c4569e850eed3cb63aa5f6 SHA512 467ff09c39df30ccd50447dda5bbfe9e5f3e8f2876e069b6c16d49b3cfcc8b45316640f5b16c56ff7645355be9ec4dc571c794a17accb7731cd22bcce53f8b99
 EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13
 EBUILD libxc-5.1.1.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
-MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
+MISC metadata.xml 1353 BLAKE2B 67a7f1b8762d95341462bfccbe06e25bc9fbbab891e09f6dbd0a97a58860d743ba062ba6bd4f4158946f4b35e255b59d96e646d08d3166456df23784913440f3 SHA512 3491e9cd3c6c915fd555f0dcfe580abb8130526ffd128906e67b2fc996d845f629c9ac9343b1b55551c7c22fec5cdbba75a4cf6f704b9727b53d6dd915d015c2
diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml
index 064923854d28..55e82d2ab1c2 100644
--- a/sci-libs/libxc/metadata.xml
+++ b/sci-libs/libxc/metadata.xml
@@ -5,7 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Hloupy.Honza@centrum.cz</email>
 		<name>Honza Macháček</name>
 	</maintainer>
diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest
index f164e7e262dc..a8c3f3d7d88b 100644
--- a/sci-libs/linbox/Manifest
+++ b/sci-libs/linbox/Manifest
@@ -1,4 +1,4 @@
 AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b
 DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c
 EBUILD linbox-1.6.3.ebuild 3331 BLAKE2B 732ae002a00879e1b3a06a2e6f1d02b0ca437cf68695b515f9d1268e222e3c48f769477953fc8419f862bac38d9da5c9a97107edf774d0e7ad5674da237fe59c SHA512 f48ec6cacd6e58d351eaeb0c9d97b573ee7c452f6ad72b06d57e699d79beefe246417f00217ae9b1448a9a7054c1e65b9cfbc800eb331ab73987165be08ee0b1
-MISC metadata.xml 1242 BLAKE2B 456a3155a1206586e04e144f133659a107154d1064afc8cbb210eb5fb6930792e846e0ad58e55d20738f4a7fb078158c2d8398379f81d56b90c9aa7d09645426 SHA512 86b2f86c9f15b00fdd57c5041828f1b3a309d616b0580eee878a6ccbf917f2b500aae81c0cc96c4d10b5b40429b3bf997f0ea3468878d7b8e8b08c4624977b77
+MISC metadata.xml 1272 BLAKE2B f13916a1eb487869939d26360d0c9ba1b9a7baa89b5c52603b6deb2c31ae5dd5092588f52270c99c6cec9c30deeeed13c00f21f146f0be1c47355a6de12787b9 SHA512 4f032b2fd18ed9bd0a9bfb57b4b158c897c6a9158a7c98f4a92645c6bf4f2f9b101d8c85aa1fa288cf390908a75dff97b11dc329062db0fd1ab3640ac4719c8a
diff --git a/sci-libs/linbox/metadata.xml b/sci-libs/linbox/metadata.xml
index b8fdd1af15d4..f7ca231ff1a2 100644
--- a/sci-libs/linbox/metadata.xml
+++ b/sci-libs/linbox/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index 75f878d04667..84113115b019 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -1,3 +1,3 @@
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
 EBUILD m4ri-20200125.ebuild 1156 BLAKE2B 57c77e1d4b1314d2f3b1e2886a2a8173285d6bfc6eb92b2a162ab57d646b17185830e4f878c2c56d863a705265aa94c98f123051ce09efd492b193673f384f0f SHA512 5e9d34aaca2ad3f99edcd13a3525a9f9e0fb7692c8cdf3c08c3af4ef3ef5e8fa8998d87861c8739727b2f2fe6914658ef0dafcb8a2e9ef8c792a6ad008ac7f98
-MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
+MISC metadata.xml 1189 BLAKE2B b63a037ea99f8e77ebc91b801c37b2d14b6bd1bdc9548489bcf303a99e8ab9a566c04b6cccaff05b0482b8d7b13295ff0a279527b22b5ab4c2734adf57f05c94 SHA512 194e8f805411486df317f496d947003c32266887a31209dab54ff1c046a1224c4ed3125ee6c79102b40be02624e035593ac71f97b5f0e40517b8fb67f5d160ea
diff --git a/sci-libs/m4ri/metadata.xml b/sci-libs/m4ri/metadata.xml
index 9807bfb0055f..002827f25234 100644
--- a/sci-libs/m4ri/metadata.xml
+++ b/sci-libs/m4ri/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
index 3ce6c35a33fa..6788ae118972 100644
--- a/sci-libs/m4rie/Manifest
+++ b/sci-libs/m4rie/Manifest
@@ -1,3 +1,4 @@
+AUX m4rie-20200115-link-libm.patch 654 BLAKE2B af7ff7b56c14078817b6a12a8184c81e1547a0c75b682d7398a040645be7e392ce3f923be56110bbf282f0ed729aa5ea2fadb23d6815aa96370d99ba29f7b2b6 SHA512 6d85c998f0f2f85c9f3cb77861318eab31b38bcb88ff3133fc3bbef0492fcb412e832d92f5d76c63aa3c979cd21e55164a2a53bc08c67da6f22bd1d27d08e883
 DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
-EBUILD m4rie-20200115.ebuild 811 BLAKE2B bbab8fa2c8d29c1588974ad14d996887db63ef86d401889d7951450cd269a17d202961101b64e2b5872474e5739bbe11d0f90289750762479bf96eca04389446 SHA512 010eac87309db539996a29fbb421856c94376838de5653bd4e54734481f7bc9dedf2fc46ee32c32141e94f0bc938fe8dc89402f39abb8b11f9d7b5cda671ccac
-MISC metadata.xml 957 BLAKE2B 4f5e134533fe60df5f32154614dbd0ca69fbf2fdace991689c6a65ae03804593d4f45cdecdc12f73f366c765f314302fbcbeaf0de12f2fb7cdc7a3a26120dfbc SHA512 640ec04b19e1c3194d9abd0abb15cbba3294784bcde56d5bf6b0d661f551ab0d9f7f0b932ccec872cb74bc7536d027d27b5e95ca33f6220d0b8c74d5039f5c7c
+EBUILD m4rie-20200115-r1.ebuild 932 BLAKE2B 79b3a80e25e099b92e89ef08fc4406985e58cafff395d0d2dc5a5f72f8aa443de9bedfd12b4979ec60c575ea47d24b5211158dc01765dd7676c5e54017a19ceb SHA512 4cb268e946e00b54df1c06d7fc2f645c417d84b6cf0d1bb07d66eae4320af6f3918b765aa780cda7d7e42d32cccaab6ff3d0b99dd5a7abf64c12d2b0be6231e6
+MISC metadata.xml 987 BLAKE2B c77aa43b41816be2a6851c896ea7831fdab66dd4536122678a73ff9e6231f1c55b10e6858c594bf6ec09bf2748e80adab548ddf8e950a3bc66f97dacd412162e SHA512 16da47e2bc386108d2e74eb5942ebe4cfb80734e90f5cc9e48d4908f8374cb53d7fe26cecc31914d3d51048c0b7f77255620e48b50ade0c1f2df6cf6ef23d298
diff --git a/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
new file mode 100644
index 000000000000..d640b5085661
--- /dev/null
+++ b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
@@ -0,0 +1,27 @@
+From afab50ea468b0b44be6e8584793c8ee98045f8f8 Mon Sep 17 00:00:00 2001
+From: "Martin R. Albrecht" <martinralbrecht@googlemail.com>
+Date: Fri, 12 Mar 2021 09:49:45 +0000
+Subject: [PATCH] we use sqrt() so link libm
+
+fixes #22
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1f19d49..71ed81c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,9 @@ AC_PROG_CXX
+ 
+ AC_PROG_CC_C99()
+ 
++AC_SEARCH_LIBS([sqrt], [m], [], [
++  AC_MSG_ERROR([unable to find the sqrt() function])
++])
+ 
+ if test "$ac_cv_prog_cc_c99" = "no"; then
+    AC_MSG_ERROR([C99 support is required but not found.])
+-- 
+2.10.5
+
diff --git a/sci-libs/m4rie/m4rie-20200115-r1.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
new file mode 100644
index 000000000000..48f2dd3f0476
--- /dev/null
+++ b/sci-libs/m4rie/m4rie-20200115-r1.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="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
+HOMEPAGE="https://bitbucket.org/malb/m4rie/"
+SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug static-libs"
+
+DEPEND="sci-libs/m4ri"
+RDEPEND="${DEPEND}"
+
+# Requires eautoreconf.
+PATCHES=( "${FILESDIR}/${P}-link-libm.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# m4rie doesn't actually have any openmp code. The configure flag
+	# stems from a mistaken belief that it needs to be there to use the
+	# openmp code in m4ri.
+	econf \
+		--disable-openmp \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115.ebuild
deleted file mode 100644
index 7030c39b71d0..000000000000
--- a/sci-libs/m4rie/m4rie-20200115.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
-HOMEPAGE="https://bitbucket.org/malb/m4rie/"
-SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug static-libs"
-
-DEPEND=">=sci-libs/m4ri-20140914"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# m4rie doesn't actually have any openmp code. The configure flag
-	# stems from a mistaken belief that it needs to be there to use the
-	# openmp code in m4ri.
-	econf \
-		--disable-openmp \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install(){
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/m4rie/metadata.xml b/sci-libs/m4rie/metadata.xml
index 33cb9a18e32a..911668116031 100644
--- a/sci-libs/m4rie/metadata.xml
+++ b/sci-libs/m4rie/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest
index 0f61b777851f..5b6c22f377a8 100644
--- a/sci-libs/mc/Manifest
+++ b/sci-libs/mc/Manifest
@@ -4,5 +4,5 @@ AUX 1.4-overflow.patch 426 BLAKE2B 36d988eb5eab0160983cd9120ec390371b6905aca6b1a
 AUX 1.4-superlu.patch 695 BLAKE2B a3cacc3a95a690d79c69885e69157cf8cf43550082971c5f454ea9d0c614b091645eb0010ea0491647ac59475f6788cdfa65732520f51345a8a5d4f2b276a43b SHA512 9ada97571a91a8b4d832c61e373c2f64267ed4f0730a4e8543f388167daafe8800ed95e74e143d1644019f934b1e5b6b658b5ee639e97a01ad0a78bfe653296b
 AUX mc-1.5-unbundle.patch 1825 BLAKE2B f77f91126b87e2430d1ed12b8f5f08229327fa26de52eeadb67a9bb6f0a791e7f64c612bc31dbc7fd9d2c973163630a4944529a46818f43d02912ddc0c3b7a22 SHA512 45565bd8ffd7525798f21f878c9d4f34c46dd198d40fa475d00bdf1461a2ae6372e836bef59f2686a9af52d31a3b061e43868fdc6a7da17838316294ba689d92
 DIST mc-1.5.tar.gz 18140539 BLAKE2B a58277b6755a43c0f9a9d67789c2fe28858580babfd4251d5d9223fffec43ead47d3dab9cda3c739309b9f18bc7bf558d7974a5189194a4bc92f72e857d81f1a SHA512 6db79c677b1a326ea50c78a07b8cc088eb5e23e9d8821a3a3802017e9e8d4011307ba024d3354dc24cb31d822da2023a150787a137b7806f6344b0834e7f194b
-EBUILD mc-1.5.ebuild 1930 BLAKE2B 91ae9d0e432b72d555a66b39b94d3a83bfff189904e5d9b5e2936f8011a0cbb1451291113d0a0c1f66df1ee649bbee956f047d38d981f1b0ed97b4b21585b05b SHA512 cc1530fc862fc93fa7932cc6df5f11ca9d6a99a262cab50beaf0eba325666e079529424370b4b80ed7f8dc31826b92458eb17fbdbe53491e5d40a0b19bb662cb
+EBUILD mc-1.5.ebuild 1873 BLAKE2B e41832415319ba09da0d32c0f879467f56d38f16564bdda9eda9649ec05e1981bd5d919c33085f9feb786d4132812f2f836dfc136a6aa0ae48cbc29a554d5433 SHA512 3c843373fdea84085116d8d63e015ab8107a49ec83f00e37acf2ab7fa027ab57c61660616709dfd21ef1f0d9175cd3d84ae2c95b437556b2cd03b7c27334547f
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index 788d5bfc75d4..faecf71d6cfb 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,20 +1,19 @@
-# 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
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils fortran-2 multilib
+inherit autotools fortran-2
 
 DESCRIPTION="2D/3D AFEM code for nonlinear geometric PDE"
 HOMEPAGE="http://fetk.org/codes/mc/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="debug doc static-libs"
+IUSE="debug doc"
 
 RDEPEND="
 	dev-libs/maloc
@@ -26,14 +25,12 @@ RDEPEND="
 	sci-libs/umfpack
 	virtual/blas
 	virtual/lapack"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}"/${PN}
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/1.4-superlu.patch
@@ -41,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/1.4-multilib.patch
 	"${FILESDIR}"/1.4-doc.patch
 	"${FILESDIR}"/${P}-unbundle.patch
-	)
+)
 
 src_prepare() {
 	sed \
@@ -49,36 +46,37 @@ src_prepare() {
 		-e 's:UMFPACK_numeric:umfpack_di_numeric:g' \
 		-e 's:buildg_:matvec_:g' \
 		-i configure.ac || die
-	autotools-utils_src_prepare
+
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myeconfargs
-
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	export FETK_INCLUDE="${ESYSROOT}"/usr/include
+	export FETK_LIBRARY="${ESYSROOT}"/usr/$(get_libdir)
 
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
-	export FETK_MPI_LIBRARY="${fetk_lib}"
-	export FETK_VF2C_LIBRARY="${fetk_lib}"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
-	export FETK_LAPACK_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_SUPERLU_LIBRARY="${fetk_lib}"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_PMG_LIBRARY="${fetk_lib}"
+	export FETK_MPI_LIBRARY="${FETK_LIBRARY}"
+	export FETK_VF2C_LIBRARY="${FETK_LIBRARY}"
+	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
+	export FETK_LAPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_AMD_LIBRARY="${FETK_LIBRARY}"
+	export FETK_UMFPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_SUPERLU_LIBRARY="${FETK_LIBRARY}"
+	export FETK_ARPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_CGCODE_LIBRARY="${FETK_LIBRARY}"
+	export FETK_PMG_LIBRARY="${FETK_LIBRARY}"
 
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '') \
 		$(use_enable debug vdebug)
-		--disable-triplet
-		--enable-shared
-	)
-	autotools-utils_src_configure
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index f905e2972ca1..00d5b0182d75 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -2,4 +2,4 @@ AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412
 AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263
 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
 EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1
-MISC metadata.xml 605 BLAKE2B b031218dbdd74d6522287efb9f3c9981a8f190eb34a655248261150d9363f5b7211ab569eea104fabad1d5f0009bdfbda6c08072e983922b312684c3d201a930 SHA512 510002cdf8385c3c3c9b1075dcc171820518a28250ef83534252780e6a08502522f3b60a9f054dc72fd8744310a2fb313ce3f17b525d3b1914d932b18d80e72d
+MISC metadata.xml 635 BLAKE2B 679b3111d148b77df38d08e07223c25390b3e0dbff3661fc1ff88084556979db955b990c9998f84dbc9782773728e73d22c28e534d45a33857d72f36585a7c30 SHA512 f19b5ade75301ed6985a00bbd5e074523bce2601dc992e27a472be17e958f45db4549cb6f88946862204840c2c70bb06e64683716157051769a785763d571908
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 8d3418080817..3969f782cca0 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -5,7 +5,7 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
@@ -13,7 +13,7 @@
 		<email>sci@gentoo.org</email>
 		<description>Gentoo Science Project</description>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-libs/metadata.xml b/sci-libs/metadata.xml
index de2ee5e82dd2..b543f7c4216b 100644
--- a/sci-libs/metadata.xml
+++ b/sci-libs/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria sci-libs zawiera biblioteki związane z programami naukowymi.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index e89e5578fc8e..376cef3e6dec 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1,4 +1,4 @@
 DIST nanoflann-1.3.2.tar.gz 685060 BLAKE2B 2dd1ed9ae3f766099d86b00e1c84a11d9162930dba91053746177ff39b7c84f770120734a235b25196620f637b94986106d364db300f51c873171e7805849b7c SHA512 937d3787df389efe530060cd2723130251e2ca7937b10f8d770c7b0d21ffd972e6da21b2b9e655c5740d57b4af8f76f0cc6d9ae39527c440be8863be0deaa7ed
 EBUILD nanoflann-1.3.2.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
 EBUILD nanoflann-9999.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
-MISC metadata.xml 686 BLAKE2B 508f3d4325543a5ac416b88524623ce4f70f67fe5d5409e73dd29d13d5770e2300250d6c6199822978bf59afffecec0cf65fa489a3d90ff3e351966be18e7d15 SHA512 d1d1537c6ad899475df91a307393fada1c593e84448c56e7b843a0eb1534725c7b0660a0f5c5feced6a6cf1bf5f25c997dc1339b3a96e7b2ef87d4f70c0a8c34
+MISC metadata.xml 686 BLAKE2B def142c4707c18a0b26b85cb3facd85e9eb7a0ef3a26c3c8624a8a12a240b3a878c3c5599842e67aad73190334515c0d288994aae084349f7fb0172099b0138b SHA512 3a5d06db09954b94e6dc44758815630872a7dabea576a711f21de1111e94f1f4ebad8b3679fb9800138e7846831ecd22904a90a37dc79e0cd9771177b97b322e
diff --git a/sci-libs/nanoflann/metadata.xml b/sci-libs/nanoflann/metadata.xml
index 7fcd5763ce84..55ff474ea242 100644
--- a/sci-libs/nanoflann/metadata.xml
+++ b/sci-libs/nanoflann/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 1ee0cc041503..064502007ec9 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -2,4 +2,4 @@ AUX netcdf-4.7.4-big-endian-build.patch 1892 BLAKE2B 9209f042f86e4eb7d3c1359ff8c
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 EBUILD netcdf-4.7.4.ebuild 1539 BLAKE2B 0a4d13dcd179454a032f51a0abcfc21b77a7faa34dbbdeb9e26d815d4100c380c147ea1a39f929590aa896ee46c90eb7a706867db1b8b904b28aecb7e3cb2ad9 SHA512 5ad6b406b811bb58d167ec792965da5c2ed5f0ead5411e8dcc4ec6acf6880513c3b228867c7d5e2fd29050478e09422e9e4363690dce7dc0564b54624a4c2e94
-MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
+MISC metadata.xml 1064 BLAKE2B 8a9ba4e89005b0b5b383da9a680b3b072d49d77d72bcfc3f98e0eb4c958dac535ea9f4e8390aaa823ffe4dc879c18cc06163e6f6a109b689577bbf64ec645af1 SHA512 dced5b476f6561dbee9384deac52472cf3618b6c8e23e5e83c33e353714718aec2c84cf4ea069d3de2835f71e21f9aec786a2d317a8ebd9e1724506d56931efb
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index f2b51139d22c..b7e0ce8e79ef 100644
--- a/sci-libs/netcdf/metadata.xml
+++ b/sci-libs/netcdf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/o2scl/Manifest b/sci-libs/o2scl/Manifest
index e03e8e84671e..f306b3f33b12 100644
--- a/sci-libs/o2scl/Manifest
+++ b/sci-libs/o2scl/Manifest
@@ -1,3 +1,3 @@
 DIST o2scl-0.920.tar.gz 34498666 BLAKE2B de269d1d6d329786d34dcbf84b6cb89d5bfae709ff1e0116455dbf8cee9e66d45b2a66086ca467037c572a8495ad198a23836861914c681050471810dda00354 SHA512 a80c959b76d15473e206f1caac496607af254f0617f7a18d13bd9732861b6c51f5db8ca3ff6866bb8d0ea70865d4ac94cb972e0a0c158f19034667340341467c
 EBUILD o2scl-0.920.ebuild 1695 BLAKE2B 4bf249767cc4011b78b82f56f266b9038c70b478782c98347fa4e3600a627c2090fc717edbc0e86c4894a8198bfdb4f6e4f9da42c54d4f02cb6e9c9955c8ca7d SHA512 ed949a98fd4d12e523aae68ada79e2732bfbe59d2e6da798aabbe51117a8260843a359340cd4621905fe88d42c3726ead1e0cbd9b36f87d381d9f3827a5c8c8e
-MISC metadata.xml 916 BLAKE2B 7d8672bd1de620c2548de7735260da82ec3360e0dc2cde46d55db70bdbe250ba7bcffcd2b48a6788816c8ed85f29f85cc31b25436bb09b9846cebf51553c9478 SHA512 63f980730302a7c1ecdc6481da44613779115ea67339b8d29d2dd02bc91330994bf09aa6955fb836b7cdc2906ca5c7168ff34c74f94df7854397e87bec279cd3
+MISC metadata.xml 916 BLAKE2B 446190d6db707ff332ea9c475587e1be18182cc86119b0e10c85760cd9d7ede66cf1a169aaa6e7eb78b35aaca1907af3184f26929804fb51748c9a5e1c98e4a4 SHA512 f3dba036852bd676a220405744752ba03d1b276dc7e3e1781d093151dda4b21afb5dc2653f4e0809849be8f70918ed56c6798b8542039dd90640df9789c8897e
diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml
index 12a668d82eb1..e560f8975f9c 100644
--- a/sci-libs/o2scl/metadata.xml
+++ b/sci-libs/o2scl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index 32e4cc943630..2a2b7138588c 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
 EBUILD oce-0.18.3-r2.ebuild 1760 BLAKE2B 73690120aff4616da8871bd00b97dfb34d28b9930c96537676a993072e9890c274015764b14011ad2477143467b8f74a923101d215a4302728fbb80722cf3a66 SHA512 100e2136db0a32eb63b8038515624b59ba52f62eda067893f3603ba1effeaffa7b5d1a59cf84af6f455f4cc24321c31c075b58b27e4cb2d43226213177fe3129
-MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
+MISC metadata.xml 930 BLAKE2B b8b5156a6c08c5042317fd2f840a3a9c6049065501cae670fc9bbf39d38a67236f01c32f719675f28acf83dfd302ff141825256e4eca9b53946d4304d41eed40 SHA512 c419e6f8a455c626af8635c10c94f3429e03d0440b9e487b1f0a4cb388b23d2c755abdbdba03471fef531d7205cd6eea085ff74981cc28f2523915ca59cb9772
diff --git a/sci-libs/oce/metadata.xml b/sci-libs/oce/metadata.xml
index fe5bc3187c0e..8afc4aac1396 100644
--- a/sci-libs/oce/metadata.xml
+++ b/sci-libs/oce/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 66dc9496cb55..5758b2781091 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -4,6 +4,8 @@ AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b77
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99e83c8a4484453f120d8f8c9c69ea5b481a143db04342a1dcb1779ce548a49618cf4941d08d636e12ed481305e8fb5 SHA512 1ff5a065c41f7e460857f8428fc77900b189f051fa8129eea9ae93237f234d387cc1c6e627c2c95636164f512d4d721d4229729f04a04e8d5f655abbf5463d98
 DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
+DIST openblas-0.3.14.tar.gz 12460465 BLAKE2B 9505ff6e132581ecc86159fb84192c6bbce0f2974293eaf1b4aca6b96b5da85823bfc1bced65a96930674fd4781ea3e375aed09cbdc9930cef26694c9f8e1c80 SHA512 c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
 EBUILD openblas-0.3.12-r1.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
 EBUILD openblas-0.3.13.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
-MISC metadata.xml 1546 BLAKE2B 3e6379f0e8624978c09272d6440f8234379ebc886e1f72d05f89ffd9914da46cd66d94f5d408f11bb585ac28bde6d222b89e2b9608de550d94fdcbae25e2d910 SHA512 a4680cd8f28c4028acfb9621281ee0a08916f62c99cec883e953390ac9d55d47fa3c667c4fabb54121f7010f67d1e180c1c1faa5eceffe6a89d379ef4419cca7
+EBUILD openblas-0.3.14.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
+MISC metadata.xml 1560 BLAKE2B 1f49ef5d206bfe68783b2d7f235e5fc651ac750f84403eac6519a2c69c4eb35a31f784c67fd8e4c9f8e9ecdea46e5b325ed0725b45654528d56fe6d30460a829 SHA512 e3113c317b18c389e8055ec16e61426abf6f088f796e75939e78789884e2084d038bad754b2424a68e79fe1b83509d00b93bcfd72c2e3530185c780861b47f1d
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 0f6a98c1f26e..ae6d647a3f84 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -5,7 +5,7 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>lumin@debian.org</email>
     <name>Mo Zhou</name>
   </maintainer>
diff --git a/sci-libs/openblas/openblas-0.3.14.ebuild b/sci-libs/openblas/openblas-0.3.14.ebuild
new file mode 100644
index 000000000000..4566f928af81
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.14.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/OpenBLAS-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
+REQUIRED_USE="?? ( openmp pthread )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
+	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
+)
+
+pkg_pretend() {
+	elog "This software has a massive number of options that"
+	elog "are configurable and it is *impossible* for all of"
+	elog "those to fit inside any manageable ebuild."
+	elog "The Gentoo provided package has enough to build"
+	elog "a fully optimized library for your targeted CPU."
+	elog "You can set the CPU target using the environment"
+	elog "variable - OPENBLAS_TARGET or it will be detected"
+	elog "automatically from the target toolchain (supports"
+	elog "cross compilation toolchains)."
+	elog "You can control the maximum number of threads"
+	elog "using OPENBLAS_NTHREAD, default=64 and number of "
+	elog "parallel calls to allow before further calls wait"
+	elog "using OPENBLAS_NPARALLEL, default=8."
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+
+	# List of most configurable options - Makefile.rule
+
+	# https://github.com/xianyi/OpenBLAS/pull/2663
+	tc-export CC FC LD AR AS RANLIB
+
+	# HOSTCC is used for scripting
+	export HOSTCC=$(tc-getBUILD_CC)
+
+	# threading options
+	use openmp && tc-check-openmp
+	USE_THREAD=0
+	if use openmp; then
+		USE_THREAD=1; USE_OPENMP=1;
+	elif use pthread; then
+		USE_THREAD=1; USE_OPENMP=0;
+	fi
+	export USE_THREAD USE_OPENMP
+
+	# We need to filter these while building the library, and not just
+	# while building the test suite. Will hopefully get fixed upstream:
+	# https://github.com/xianyi/OpenBLAS/issues/2657
+	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
+
+	# disable submake with -j and default optimization flags
+	# in Makefile.system
+	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
+	export MAKE_NB_JOBS=-1 \
+	       COMMON_OPT=" " \
+	       FCOMMON_OPT=" "
+
+	# Target CPU ARCH options
+	# generally detected automatically from cross toolchain
+	use dynamic && \
+		export DYNAMIC_ARCH=1 \
+		       NO_AFFINITY=1 \
+		       TARGET=GENERIC
+
+	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
+	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
+
+	# setting OPENBLAS_TARGET to override auto detection
+	# in case the toolchain is not enough to detect
+	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
+	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
+		export TARGET="${OPENBLAS_TARGET}"
+	fi
+
+	export NO_STATIC=1
+
+	BUILD_RELAPACK=1
+	if ! use relapack; then
+		BUILD_RELAPACK=0
+	fi
+
+	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
+}
+
+src_prepare() {
+	default
+
+	# Disable tests by default
+	sed -e "/^all ::/s/tests //" -i Makefile || die
+
+	# if 64bit-index is needed, create second library
+	# with LIBPREFIX=libopenblas64
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile() {
+	default
+	cd interface || die
+	emake shared-blas-lapack
+
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" \
+		      INTERFACE64=1 \
+		      LIBPREFIX=libopenblas64
+	fi
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	emake install DESTDIR="${D}" \
+	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
+
+	if use index-64bit; then
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+
+	if use eselect-ldso; then
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+		doins interface/liblapacke.so.3
+		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
+	fi
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	if use eselect-ldso; then
+		eselect blas validate
+		eselect lapack validate
+	fi
+}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 70e4c0fa2c60..cb3b1d30f995 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -6,4 +6,4 @@ AUX opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch 1973 BLAKE2B cac
 AUX opencascade-7.4.0.env.in 4611 BLAKE2B 3593cd4e05d33e466a975cf4641c56cd8e686310a148cc684591d3e08f8c4efd86e4df13500f11845e425b056b9c2c42f0f27a2a4d8cea524dc8fbb1c7dad703 SHA512 25f65e2b1e91fa78313334dab7d19b115bb7ff97ccefe7d18c45ab1817e12e10fdbe36babcb22e2a0d52bf7a0fbbdd2937523b773ddbb37635c1dd0d14de6253
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 EBUILD opencascade-7.4.0-r4.ebuild 3947 BLAKE2B feacae0802130f77a0c39405b4c1b440723b49c5427b6405a35ceb27c2dbaaaf9fbbcc18155571b3b7e392df475c7f358c828817a3b8821e1b7a8db292fa3a9c SHA512 b7e7dc4577c07501988c24f969093e53608d8cbdaae94ea69072c9c54c13f5efaa15aa6eeda2bcd054567ad262f655fa43e92c38f90966bac128e98bb56f8025
-MISC metadata.xml 895 BLAKE2B 1bc5b6431a2030a95949553a9b132b051c77fefa9833e853c1fc7baeea33a469ec2dd3abbb4dd5f539a2176af76cc503e0c3ee03ad4c095b5bee9fbf24ff3cb8 SHA512 c226019e5bd05ff4792821202d62bb052846ae46b298495b68aebf63c4b573461ddeca90d6d8b01982ee2e8fbbc4a4a53a6aa756f056738ab8e8240fe1433469
+MISC metadata.xml 925 BLAKE2B dc225e0bdb01795642b13736c66382e40cfd2d72f5ecfe1a52920f6fbb5e1f31ce7ebb1daf9bd9c8d55c1c982bbbc2a47dd65c2e7cc64734aa954b227a8395bf SHA512 55238c390dcdf63e56c0c1461cda4f3a13b5d5066f8f06d2c7a50a38a837d00e30f8c91c9b0b70a26ac2e41c17a4c7fc442855bd71bfe60f4335b70a0f38750f
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 2402194e8360..aa017491b603 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 1cdf55bdf802..315878dda98b 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -2,4 +2,4 @@ DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
 EBUILD p4est-2.2-r100.ebuild 2915 BLAKE2B 6e0ee7cf6d138405fd861e1e79f826b8c99687b27ec57038453c5c94c1828a638c879c08cdf2640d881e76c3f261b3d4f8104d71bf63e537f196deb1fe463310 SHA512 2b1dcfbc8e9d44d129bc84ac10a4c7df977cb358e9f61a82a73c194ab72fe00c199a124da259776c70cacb19565653fd3f7be6c71c5cf96f66ada9024444a4fa
 EBUILD p4est-9999.ebuild 2915 BLAKE2B 2ac4c1cfb81d43042c356a94633109f3b3dd0429985b896e60c92dcc945b4a68469a604cdf94900209aff4e38f26f99b5121c369dcca8c075503890284b570e1 SHA512 e7e16243bcbc9eb850509a64ddf9b40782e5403ecf41506fa4353e48263eef5edcd6839038f44b9dd4781f1053f6776b7996cd90253b175a09a2cdb853de0924
-MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
+MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba
diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index a7e30547b056..35ac42b0102a 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 75089a90aa5f..f3d595df1ad2 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 534 BLAKE2B b4b41b83913efb5e92eeb6c92d4db04129e795a17c5749d8b031452a4808d72c66f90b7499e13a795e386c315e9f717f88540987b262c22efac52318261a83ec SHA512 388855f15bd17f5bc42ea3dc1d76d338a5586ed6cdb005442d46d158d36a1ffd32c2b08f10f992de30c44c1f160c005ef7499b6c2a629a0e7fab93f59d15bf65
 AUX 1.5-linking.patch 6247 BLAKE2B a50a4bc8a7c28f3e140ba8d241fcc9d9bf02becf13dd3ef50fbf6e06af3444c5135309d9f4026826b228a62fb531d4f62bb9b8ebddd4df43233b56f41bfd3a53 SHA512 d7b8f8f99a2d26cb3e0cace7f31c72eff997786fcdca4a80e81493f7e255df0975743870543881348814d777507a96f328bacb1115fdc118c848a3a0be4c833f
 DIST punc-1.5.tar.gz 7036275 BLAKE2B aa87b824c3426b5573cf1c40575901cea079e4c244565015b39b52adff74424e49086146cd518acb54594545650340a32a0c8438c9add28c5737253d49091093 SHA512 8b454f5de9cd01e87a30083f975ce8901c5d5a2cac7256cb535c8698221ce6d1ddb93a3663b2e903e5cae93ef76b48932ff7f13a816ba7da6bb07ea25490503b
-EBUILD punc-1.5.ebuild 2180 BLAKE2B 3482c1f766fd8f7c7d94a113505f7bc0c6ebdd62d63636d6c89d6e4600c990e24ad74ceb1cd97f907adb5f65d0568329018880ee0da953aefc230d8418bb4011 SHA512 5d292598e039484b5056ba8fd2b53c8b9d458b970c48f233983927b5d96444a254663e43f11d2302bf394a74106d8fbb43ee6c6fbbd14beed41fba617cde184c
+EBUILD punc-1.5.ebuild 2090 BLAKE2B c8e9ea8ec9f2e9d2c123bb8e2981028b567dbc409cdae50f5d7c142809ff1018777f016355e8e65509805f2475846c37e003e3ba20cd4f95767ff7d4fff5c966 SHA512 9bdbdc1d6530c7adb7537d11d14e4113d7b052e3b0af476df1e5b1ef91ef0862ab6b31f62d9cad04d5fedaffc5784426348d034bae730c4159a4769d3f37f50d
 MISC metadata.xml 1312 BLAKE2B 5c6e3b41ca6408bff95d2809770f26e49067bce57a7168041884f17d97de10f22a17ce1726207875a077f3a30192e36dd02b7409c0f23fdd1fc7e4bd682a5433 SHA512 60b0a248a1dfd45b1f0668292740776c750e510ff707bd1c4d35d27b84c20693006f93fa1bb755552012eeed69b7bd37587ea0fbe75d0668d21b14cbf8be61e1
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index ccf2b1cc1733..2bb21a1e7e5a 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils fortran-2 multilib toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Portable Understructure for Numerical Computing"
 HOMEPAGE="http://fetk.org/codes/punc/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc mpi static-libs"
+IUSE="debug doc mpi"
 
 RDEPEND="
 	dev-libs/maloc[mpi=]
@@ -27,64 +26,60 @@ RDEPEND="
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
-		app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
+		app-doc/doxygen
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-linking.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+)
 
 src_prepare() {
 	sed 's:punc/slu_ddefs.h:superlu/slu_ddefs.h:g' src/superlu/punc/vsuperlu.h > vsuperlu.h || die
 	sed 's:punc/umfpack.h:umfpack.h:g' src/umfpack/punc/vumfpack.h > vumfpack.h || die
-	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
+	rm -r src/{amd,blas,lapack,arpack,superlu,umfpack} || die
 
-	cp tools/tests/pmg/*.f src/pmg/ -f || die
-	cp tools/tests/pmg/*.c src/pmg/ -f || die
+	cp -f tools/tests/pmg/*.f src/pmg/ || die
+	cp -f tools/tests/pmg/*.c src/pmg/ || die
 	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myeconfargs
-
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	export FETK_INCLUDE="${ESYSROOT}"/usr/include
+	export FETK_LIBRARY="${ESYSROOT}"/usr/$(get_libdir)
 
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
 	export FETK_LAPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs lapack)"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
+	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
 	export FETK_SUPERLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-
-	myeconfargs+=(
+	export FETK_ARPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_UMFPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_CGCODE_LIBRARY="${FETK_LIBRARY}"
+	export FETK_AMD_LIBRARY="${FETK_LIBRARY}"
+
+	econf \
+		--enable-vf2cforce \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '') \
 		$(use_enable debug vdebug)
-		--enable-vf2cforce
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-		)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	HTML_DOCS=( doc/index.html )
+	default
 
 	insinto /usr/include/punc
 	doins v*.h
 
-	dohtml doc/index.html
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 60f4bb189fd2..cb8396a9fdf8 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,3 +1,3 @@
 DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176
 EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2
-MISC metadata.xml 585 BLAKE2B 2fbdf7e21c69e77f77246fee563ad7c809e6a8e4238a9289944278820d096143161ea5076e16dbe76aa911e0fa4f34f35ca55e8d03481dc28b27a6d37c9109b3 SHA512 473050a1aa0a75a00df4df9979af7b9f3634f5644b084a1d8bc1eec59ce040add37acc563f107220cd8563c8313af59532751558d6ad3ffe3dc7f36abf3094ca
+MISC metadata.xml 599 BLAKE2B f046d7eb427d3cba09c58a5c22655287e9cc64d4f408541bfa1b5683a937883934fe14572153282334601cfb254fe303c1bd7443a51ef2a568b4939580a97cc3 SHA512 681d96418baa0b92ee356e77f4c9e8efb3152738ffe0be97d5b9cf6d638292c66a67a1be053eb7680078dffcb43d290e111357799366836a20a6547ec213f219
diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 6a00ab0d27c4..fce971bebbe2 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index 8f9aefdbb778..a1eb9cc3e542 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,3 +1,3 @@
 DIST rocPRIM-4.0.0.tar.gz 285576 BLAKE2B 44f3542068dee48c0f2bb475f4d3fd74592fe27f4ca00a7b754014deaaa7187c4363d4b2e7fe13ff771b48d2885b848b9632ef71ce85e80e0946e4e5f13495d8 SHA512 c37fce4f16788d82379459af69b9f47f2bccb3b0e655e7314a23936cc99a474afb0092f240bd950341f1b02ce93d03abce0df7ce62ffcb5d577171ce870dd1d2
 EBUILD rocPRIM-4.0.0-r1.ebuild 1264 BLAKE2B eb3c16d117287c9a7c13b761b10af63e79b6f83d079f469319878c033bf690fed40ce0e73d29d06c2511fbc6e9a7cb87452d9019bb50e55a3a24b5b94dbe323f SHA512 69f4fb57bb026e85eebae3655a7f3f7f0ebc0155e6e503df93043cdceec8b1d5ec3a4bba4e217ea64def8be19314ddd7b4352ee6d4c8a003f9c447d25db3163a
-MISC metadata.xml 586 BLAKE2B 79a7455bbebce02029027a842a6c9add7bb4fb3305c8bff9cdfa143d0b3835ed421d960ba3dff89233717160349ad24da10b7a3a1820444fe94e0cffa5d1b079 SHA512 c73d6ee3a3bce1a9e66d0e57d31ad52f551949b3a8183af3109fe7f23796689cd6636e1280e5322c7e9721ca9fcba45bccb7a592de150e083b77e028c9fd688e
+MISC metadata.xml 600 BLAKE2B 58bfa38b94ad743ce533a8200ed17984d502d819a6db1006665727340a3b57d718f0659f16fcba34aedec7ef3bc94c639a024f9770ab2723acf534e2a9c2d537 SHA512 6da79fc8bed01f2236f79b3134435685c5732ea9362eb25b212501b0b77aeb3c72e260fe0156280f9d2e5d43a0a875dade787221ba1b718670202e762d32f626
diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml
index 3e0b6aad9ae7..3902658bd2f1 100644
--- a/sci-libs/rocPRIM/metadata.xml
+++ b/sci-libs/rocPRIM/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index cc5da9013360..e98eebc4e525 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,3 +1,3 @@
 DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
 EBUILD rocRAND-4.0.0-r1.ebuild 1063 BLAKE2B 69823e3904b62ed811a7ea68c28b95c09e1059134e17fd62f006352e5870d2e3e9e111fbf8a1647cba517135ac46dcb829cabd98c91344bbfc1e38d7b996420a SHA512 06b4732ae433bc0996bd07fda884c7a302a4f33f92bde4b0c73eb684c8d793c3c9a0252e9961874e0fb4ab456ef584da7c47a98651fb704adf72f02e202b8c63
-MISC metadata.xml 586 BLAKE2B 72eee2fee63235c0e464a1aae761f0e862e2d7f6496d0530ab114435003188ed67cb3f0499afe5d11f2cc64019b09e2b2d8605a5a7a0d87d2477e858e3f284c8 SHA512 6dcc2e40f716b763586801119126d8e141f57be9900987733c858e1045a02833db80d8d9a538e96a47114b8f1d8404a2af17cd731b9ec7537efac88f2fa4a5ff
+MISC metadata.xml 600 BLAKE2B f11f8c95d4601a860ef16e6dcfa000f8485c2d4a9b526be5cd364a424c620d9badd98560be7b9280ecc50b5156c4d1d3a05148e1db3b675528e89dd8404d8964 SHA512 fe97e48acb115014d0b1de6398654b214df009edcca18db95fcac2f30ef7808857b4a74c870109c3d87cc1ce5170486eec53ae13057a8d75b8259b396c7908d1
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
index 77cd8b248d11..4feb2cb201ae 100644
--- a/sci-libs/rocRAND/metadata.xml
+++ b/sci-libs/rocRAND/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index 0450ae034681..0038d6442c91 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,3 +1,3 @@
 DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b
 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
-MISC metadata.xml 588 BLAKE2B 31fa8e3f62668dcfceb07268b802f4fb7d4947e29922a13e21fc216e8e8d0a80c204e015bc892ff2ecaa974e4fb2a94e07229d43852b64979dc664a577ce5b41 SHA512 3685dc06581c36139790eb244f0fd6474cdba6e8949b41db4294dd4870d49a57fcea13d0ffb8fe89da47f81e4da161b236cf16e78de67a8ceba72a42f9da52a5
+MISC metadata.xml 602 BLAKE2B 20524bdc94d007be739f97e51d576ff04fe83e69b2d49751ae2b4fca6afa12cbdf5ea86f8be34c6743e76c070a18c4d5c40c2c2488614517d9ff346042a8ba3d SHA512 8a68af54bc151d635fc48dcac6253f427acdc3947a3f7eb9c0c271e6733de9f432df17be7ae584dbc29f3068dc23b08e165657b356d8f90a7f9cf77809825c62
diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml
index 73cc3d7be191..a6b4d47cdfe7 100644
--- a/sci-libs/rocSPARSE/metadata.xml
+++ b/sci-libs/rocSPARSE/metadata.xml
@@ -9,7 +9,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index b682dfc018b3..b61e121cc1c2 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,4 +1,4 @@
 AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b
 DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
 EBUILD rocThrust-4.0.0-r1.ebuild 1244 BLAKE2B 4f8019ccf296a915a305a405d3e80d2de348ac7717782671b76306882872a6e356bdbdb63316094ce8ccc8410fced42db56423b4d96f8d690ec6838d3721612e SHA512 40671932493ab5a2a2597a4181d03c666a9272ed881d053ecc8d8285aa8a5b68b9527b4fa0e29b6acff3f31fdfafd9cc060b9e098b16a12a7370eaa37542f5de
-MISC metadata.xml 548 BLAKE2B ae4848f909ba6a9e9695cdba7dd17fc2236b9234dff7c07d3f8356ced2f0c692788c2ec2bb922754180a1fd0af19cd38136685a00ce6e7de3247de96308b3327 SHA512 608b17dd7669411569fa066256463d8dafc15be2ce287b5229eb56d40da716d2abaeea55afec4a4759c6221f4a8042225a4abb30277d7670e9be6661a6c18aab
+MISC metadata.xml 562 BLAKE2B 68289117818083458a4812ff1eac0ae4254b5a29975aad3bafabd6331f882c8b67fcbf9e80344cf7d644eac995d47cdfc6b6b720d7b51e7b42981b778db64e63 SHA512 00e3867f4ade3025cc15daaa2a032df09cf7c0b48ef2e8694e4de4f2623b2cc690cc3d10c03454a036889060ee6ed4545a9e287199eeffa83ea3a34ce25d114c
diff --git a/sci-libs/rocThrust/metadata.xml b/sci-libs/rocThrust/metadata.xml
index b0a23ffc1e09..ae48919b5ea3 100644
--- a/sci-libs/rocThrust/metadata.xml
+++ b/sci-libs/rocThrust/metadata.xml
@@ -8,7 +8,7 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index ab3538e27c4c..3b9a9d0e7e35 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -2,4 +2,4 @@ DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e66
 DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
 EBUILD scikit-learn-0.22.2_p1-r1.ebuild 1636 BLAKE2B c0a9c93eff797279d36a47d6990b76dd290c6b170c982a7179557043d0a7f84b8eea598c925166ded61ab4acc8ea2d5ec2ddf61d0549b51170e7626521694d3c SHA512 08f222a4c3d0e250e6a2ddd73fb1073898812c29f3728618ca1a33b9c559a69bd84e2d949df8bd15b8066909677292e0ee2c13815efbd8fe33a06a8ebe8c0c02
 EBUILD scikit-learn-0.23.2.ebuild 1508 BLAKE2B 46a4295f6e5fb78b5687744d78ae790447879a655e090a76c395ad43f0f4eae44be9b036559b4e429b52f1d8a6e8f384a7662d25aff0690f8fbea19be5387b20 SHA512 7dc7e7a4237a899a1515e49ec065ce3295dd35aacf936842023fe6a4e00c2e7c14b3653cb601bd25fc7e783e31258e030ca70396912f7b9c580a55a725910885
-MISC metadata.xml 722 BLAKE2B 678b21d5cc514504a3dfef33f3066c55885285d85fc8a8582051b53a41675a8b9c589a0c226b838590e6bf1b740ce9d82840874f75049b92f7a681576bfeea78 SHA512 ac8ca303bd2df0f523496233edcec70ecf6cbe3fd863c4ac28ecd0250eed6b67135e39a74e93e6adcbbebac17766e4a8bcb9be2a73a2464400346f47afbfb440
+MISC metadata.xml 736 BLAKE2B eb5c07231e185d9f9bd985209815f8515abf6bcff68e38563524542c8f591c1625711238b0d1b028776c8d658c32df3de4052a9dc88627a009eef5b8a7e68b5a SHA512 ee09304bdd96093bac49584a10b71650a3c764c28f03b851e197c31f8bbb6529b40433ad70f8100f33901b5b7fac8d349aad83ea10ad4770e16574484223af56
diff --git a/sci-libs/scikit-learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
index 681e5c20b1f3..50092d263e8a 100644
--- a/sci-libs/scikit-learn/metadata.xml
+++ b/sci-libs/scikit-learn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
index 8403f7191480..2e297152da0b 100644
--- a/sci-libs/scikit-optimize/Manifest
+++ b/sci-libs/scikit-optimize/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250 SHA512 8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
 EBUILD scikit-optimize-0.8.1.ebuild 638 BLAKE2B 4739c17ab249c33839b5acfcdf3781fabf6b86347283f0495a7a67f7aa7c281df88b9b6b3868fc1dff66d020b1ab38ee94ec4e096baaa759d04fe7f1b3bf5a50 SHA512 cfb7921239703d6e1abe12e98111a3ee9b98b7a9ffa73cce4d1c25dd0056050c403c1cdc585a4c909260ed94147145e198367a5ba505967b066b920797c1f0d9
-MISC metadata.xml 525 BLAKE2B bd00fbf178b3d7faa54eedc8a0d39bbf2e38be82be836391a341674b418d4e9ccc3d99b5644fd6b1a2feb4637cf501523233d5bd86e05f9660545ec28756c180 SHA512 326647cfcdfebe6ef758ee7c5c51e27abbe1ed62c17c6466edd69952e6fad1990d03976453e6807a5e67acec25b5699af84052d4af9681d5454336bd8511ee11
+MISC metadata.xml 539 BLAKE2B 99dba9874685423c1e6fe9fe927535e232ca6f83577e9dee295f031cae18cbefcfacffed276dc831f093e5f76c5a59baaf3ea27035facc6df9a7ae8fd48741eb SHA512 e5586d4c76389c0ef410986b4dce5343143615e5315413b9802e8d90f2a340dbf8791d14357e5db7b624c474ddb502c2244333bcd043b499357bd3c7e8f41c7c
diff --git a/sci-libs/scikit-optimize/metadata.xml b/sci-libs/scikit-optimize/metadata.xml
index 11fe5dcb02d1..0a6b8b46e192 100644
--- a/sci-libs/scikit-optimize/metadata.xml
+++ b/sci-libs/scikit-optimize/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>  
diff --git a/sci-libs/sktime/Manifest b/sci-libs/sktime/Manifest
index 8db5049d6d75..6dcd7a2b3853 100644
--- a/sci-libs/sktime/Manifest
+++ b/sci-libs/sktime/Manifest
@@ -1,3 +1,3 @@
 DIST sktime-0.4.2.tar.gz 9662976 BLAKE2B 248c2a9868f9199caab5c4c724ddcad61301a75ce1425baaabb2185da37d80a68332bf5c2d2d64a10e0b844bea9226be5291005d9893705eb0ff8f2018c6493d SHA512 855b33f42f938c671e99b8fa58ff6adbf67144daf53dd883ac041fe9b8cd5400cfbb8e27169d491c6bea2d76a53c035bae08d9e4f8a1c6f5f444c08bcd65c4f4
 EBUILD sktime-0.4.2.ebuild 754 BLAKE2B 4d4b2679b32c3871350d8d721266818aa3941551091f73abb3e79a7bfeaf0da3b81dfcac6959873391c9f6829a3afac3fb6b819e73faa6daed74f910c52d953b SHA512 fe6d6647c4f73c4da02ccf986fb1faff56ef9ebb09337f19f3d5fb9ceeea688e9ae83717b3996b42e1eb3e8e5a6d116b434ceae3139eb55c183a417125bc5cb3
-MISC metadata.xml 513 BLAKE2B f62f3b568ddc39ea99a6335525b344a5ccca6d015c52aa0e4b6d440d446b8ef04f03902f58377be5ee138d4b1563a45bd94ba4cf5fa029ba336bb756cb4163c2 SHA512 be665b116579427beed389b5404f02cdd2d55e858a818e2ea2f9883bf4a9b6ad8aa819367db94540170afe04dd2f271911f756bd5e872484b13268be4185ff9a
+MISC metadata.xml 527 BLAKE2B a32578630788b5265c4bf937c5de0cf71b9a9a7a4f3be9572a4e192c75961348a2a67700a7fb865b543588d21aca6da52e85c8fc7dbedd14ce3b2cd5af3fc928 SHA512 73068f2761ecdcc91fc607070ce9a7e362b89644653b8ed4a35ffc3b6cae9f684e3c8773f107c2489adc726edec8c6af756f52e4893f197c5ef9fa3f2686f079
diff --git a/sci-libs/sktime/metadata.xml b/sci-libs/sktime/metadata.xml
index a88194c685df..c1db6c242c36 100644
--- a/sci-libs/sktime/metadata.xml
+++ b/sci-libs/sktime/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>  
diff --git a/sci-libs/spglib/Manifest b/sci-libs/spglib/Manifest
index c875597d60cb..c53bb4af1d87 100644
--- a/sci-libs/spglib/Manifest
+++ b/sci-libs/spglib/Manifest
@@ -1,3 +1,3 @@
 DIST spglib-1.14.1.tar.gz 1994323 BLAKE2B 69c16d4b1b7f23b652247df01f88d88917083bf4394e4a5e2e6636b49950ae3e06e395d117ba92ed4fc7c4295f61bab53cda25c2b7b3b7073bc888719ac2dee1 SHA512 77f65af957b1cc956bbd7ab555b5d62297b13228187c54cc4f6e48efba84b0fd60e57f79a4cf22a160a550ca0a19c5d71de0219fccd0b370d2ce413d41a5cfb0
 EBUILD spglib-1.14.1.ebuild 592 BLAKE2B 16533821ff23f6a96435da7a3bc6a55aa52392aa660f153859da34913b013f1675d52e37cd2a5407e8c74c1ab4791329d374aecd585639a06b4ad7d0cba32e2e SHA512 5e72af6ad26709197d41f6ddfd9f9b552169b8d6858f8930277250c34d2ff161c184b9a3611069dff91bcc4e3557fbfa88f12a6acb9003350d4044065fd73608
-MISC metadata.xml 265 BLAKE2B 74e5ec829fb82a7e0aadf704a58a8a241797e8ab9e403dff4d83f2eed30d05e3639a70e6c9ac402fd4fd1e91e69cd70cf493ba86b20a1e4673b1376115bf0a25 SHA512 fe668e47689c3e00051c472da520f1bf241f9382ab1a1bdbca4aaf03b8d8a1c8b49b5994e1bccc94d087b8551d2a321a3077c2fb069a1b83c0490f0eb126add6
+MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-libs/spglib/metadata.xml b/sci-libs/spglib/metadata.xml
index d0522ae93c48..da36ecbfcd6a 100644
--- a/sci-libs/spglib/metadata.xml
+++ b/sci-libs/spglib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 95c6511b6601..c77186b86b9a 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,3 +1,6 @@
+AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18682d8f36f6ec13a4fe368004d2c3f961945cb0d1ec94081cb2c99bb16656439214cfd127a21cad2844a4752cd5c2fa6f40f3a3dc SHA512 d5e09a9603fab4caa9d9b091a0636be5ab8eddea6cb5b37b184ff7a65ac9707536f1a71e1893e0b5f795efb33396ae653d2745487aa863f7a239c63e42d22032
 DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
+DIST symengine-0.7.0.tar.gz 802307 BLAKE2B de207f565f179deae37479eec82dfced3d83bfb7e643b4e6969135e10130dd05c888f34aa75c76c238ff1babfd0864f3329c3deee126b84ec33c4937c11dc20c SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348
 EBUILD symengine-0.6.0.ebuild 2205 BLAKE2B 4bbd97357a16e4bbad1fcfdf26034dc51f5bd6718369f709978d0f9a7b399b473ea776ac6562979d29e1accc2f84f897ef8f58d116d0331e4092da5ba0278abb SHA512 403bb10352daad01d3665f06858400dd03875802817e0e1a8a8bf936fbd6a3cdd191ea4523aa056d6f19874125ad9949cea3b950a75c6dca75688848ed107c76
-MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e
+EBUILD symengine-0.7.0.ebuild 2247 BLAKE2B 145b95b6ef29a24208147cb12aaefd595de1cd3af3a3ffe462e1e7bf1301d257f5ee30cef84857e0d8371e95968cb14a0fc6daa31c1f44ecb45dad0f53be97a2 SHA512 dcabb24fb7157bbdb92d3afdbfc6b47601f5a2d1629a690c407374604bda35315e03ed41df1233165f414aa8d6d453285bb7461b63d7523983d9d10fb8fd95af
+MISC metadata.xml 1265 BLAKE2B 17511088cb7ab73232d65437c7eb1e980e13689a46a73f11ccd0b6cdd9c8e1cb0cc986c49a814a927bcc1e4badada87e57632f1ba209913b19989cadeb202c2c SHA512 52e2f32d0385f7b91c987539e8cfaf89d2daa1c8383b25eb651db12c050f733cceab6608d900d3d2464a8fedcdd5414bdaca506ca7420e1223b74703adbd322c
diff --git a/sci-libs/symengine/files/symengine-0.7.0-cmake-build-type.patch b/sci-libs/symengine/files/symengine-0.7.0-cmake-build-type.patch
new file mode 100644
index 000000000000..f490521f5c92
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.7.0-cmake-build-type.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf1d213..3067481 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,11 +17,6 @@ if (NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE Release
+         CACHE STRING "Build type (Debug, Release)" FORCE)
+ endif ()
+-if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR
+-        CMAKE_BUILD_TYPE STREQUAL "Release"))
+-    message("${CMAKE_BUILD_TYPE}")
+-    message(FATAL_ERROR "CMAKE_BUILD_TYPE must be one of: Debug, Release (current value: '${CMAKE_BUILD_TYPE}')")
+-endif ()
+ 
+ set(BUILD_FOR_DISTRIBUTION no
+     CACHE BOOL "Building SymEngine for a distribution")
+@@ -138,7 +133,7 @@ endif()
+ try_compile(HAVE_SYMENGINE_STD_TO_STRING "${CMAKE_CURRENT_BINARY_DIR}/cxx" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/checkstdtostring.cpp"
+ 	CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_CXX_FLAGS}")
+ 
+-if ((CMAKE_CXX_COMPILER_ID MATCHES Clang) AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
++if ((CMAKE_CXX_COMPILER_ID MATCHES Clang) AND (NOT(CMAKE_BUILD_TYPE STREQUAL "Debug")))
+     try_compile(CHECK_CLANG "${CMAKE_CURRENT_BINARY_DIR}/cxx" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/checkclang.cpp")
+     if (NOT ${CHECK_CLANG})
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__extern_always_inline=inline" )
diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml
index 759e5c9c0a48..53c407a4e64b 100644
--- a/sci-libs/symengine/metadata.xml
+++ b/sci-libs/symengine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/symengine/symengine-0.7.0.ebuild b/sci-libs/symengine/symengine-0.7.0.ebuild
new file mode 100644
index 000000000000..5a026514ef68
--- /dev/null
+++ b/sci-libs/symengine/symengine-0.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine"
+SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:=
+	sys-libs/binutils-libs:=
+	arb? ( sci-mathematics/arb:= )
+	boost? ( dev-libs/boost:= )
+	ecm? ( sci-mathematics/gmp-ecm )
+	flint? ( sci-mathematics/flint:= )
+	mpc? ( dev-libs/mpc:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+)
+
+pkg_pretend() {
+	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|lib/|$(get_libdir)/|g" \
+		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
+		-i CMakeLists.txt symengine/CMakeLists.txt \
+		symengine/utilities/teuchos/CMakeLists.txt || die
+}
+
+src_configure() {
+	# not in portage yet: piranha
+	local int_class
+
+	if use arb || use flint; then
+		int_class=flint
+	elif use mpfr; then
+		int_class=gmpxx
+	elif use boost; then
+		int_class=boostmp
+	else
+		int_class=gmp
+	fi
+
+	local mycmakeargs=(
+		-DINTEGER_CLASS="${int_class}"
+		-DBUILD_BENCHMARKS="$(usex benchmarks)"
+		-DBUILD_DOXYGEN="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_ARB="$(usex arb)"
+		-DWITH_BFD="$(usex debug)"
+		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
+		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
+		-DWITH_FLINT="$(usex flint)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_MPFR="$(usex mpfr)"
+		-DWITH_MPC="$(usex mpc)"
+		-DWITH_LLVM="$(usex llvm)"
+		-DWITH_PTHREAD="$(usex threads)"
+		-DWITH_TCMALLOC="$(usex tcmalloc)"
+		-DWITH_ECM="$(usex ecm)"
+	)
+	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
+
+	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
+	cmake_src_configure
+}
diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest
index bdf66c43c9d5..cbf0a692db33 100644
--- a/sci-libs/symmetrica/Manifest
+++ b/sci-libs/symmetrica/Manifest
@@ -1,3 +1,3 @@
 DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271
 EBUILD symmetrica-3.0.1.ebuild 542 BLAKE2B deb6794659c185512d1a03601790665e81c0fd306be97e629bca9e500ed861b5e576a74e616397f646b24b04f325ce6e384c4a58b37991b705c3d7e4efb3321d SHA512 a851339856d5a65700d3abe03923d26eeb3792a6da2bd9198b9be2e112b0999d8a581ce914b7171941557c3d19d6a4c366bcf9d3a2b431aed0d74d91fb12fddc
-MISC metadata.xml 758 BLAKE2B cd3bc063da1f4ec9e18b045427b2ae77ff7c786c23ceb5e627589e644d384381a2b330c31713d5099bd12657c68dc4c4d91d0a80dfe6afb59568f60a948ead16 SHA512 69bc2b7f8dffeb94dba8af9bfefe537e5c9f946587a9e2b6e41e9f27927cd980fe1f1ab7f0a7d94f18f1c82ab577c79fb21ae7d05bf99fccdb2ddb40d7f62b38
+MISC metadata.xml 788 BLAKE2B e66494f9b10e4ef416925df39e7250eeb685ca735f46fd27be89de25f7431713d715f3f99861e687a2dc1d0284e5f6eee241b777219eee8390a8207f2b8bdde3 SHA512 2d77d02c8f7b262c770a3a744a981d12c8454f31901438fe7116c28192c20bce17d58fe5161185b2fa5eb9d850277a7334aac3f6c6dd57526992bad2463e2e88
diff --git a/sci-libs/symmetrica/metadata.xml b/sci-libs/symmetrica/metadata.xml
index 3704ab7e98b1..246f90de1e67 100644
--- a/sci-libs/symmetrica/metadata.xml
+++ b/sci-libs/symmetrica/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 89eb52f24c60..4844f0cee4b4 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -2,9 +2,11 @@ DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaacc
 DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
+DIST votca-tools-2021.tar.gz 114974 BLAKE2B 9f707a901b83f0d8a6c7e5c9b43b135c7539cf4f1fa44a4ed1a5c8f2f7066e1241515fc025ea436f2e52e6bf4aefb7c9a15575e8a588845dda7fbb6717f50b7e SHA512 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
 EBUILD votca-tools-1.5.1.ebuild 1094 BLAKE2B cc03fda70f27211323b8b0c2d33020dcd4aedb972316d2a1ee6a04a29b414fd44f935ac31fcfd014b4de77e6f0b29136caeaca061ebdbbd3144080b01f723680 SHA512 fee06ff16f050880612fa4aa981dd56b85c437eaf4204f39489a2c19bc8dbb555fed94f2a39732083ac487923db391fccbccb4d3954ee33c822b9cfb5efd1db8
 EBUILD votca-tools-1.6.2.ebuild 779 BLAKE2B 41bed9d7eec490310d705c56a0cbd4b6d05f782ccd7fd8d5c445bd0a0c31061e4adb5d306043878d33f5892ae5b9430cce07e56a0050a29cf3faf5b49e9c9a54 SHA512 57ec416136cf2e081d5f25563b95069c8a5f49230696570a3d7ef94c36b5230cc3fc2b2c63d2c34f76ead351b64de042bfd6bb92bb92729b3f294480eb9bd676
 EBUILD votca-tools-1.6.4.ebuild 751 BLAKE2B 93b51e936ac594d3cc8a0c8f5d4051ca6d5c573ea4250cfc0d74a5cf92d5177d0e498c2d4719ce5ef2dab324a2325a7eb710ae093387abab38acf7a28c22f78d SHA512 7f2cc20a627410d51c9e5a48b3690b87de4a64deb044c21fd8b9bf27498b4f2d695af57d810f8025feb09e6787a737087ec05d3f3cd46b846659538237d610ff
 EBUILD votca-tools-1.6.ebuild 791 BLAKE2B 230efde0d632b6eb4d92bcac6211903fe659fb5fc1bb7e36a44c708cfde6d0b06992b17574ab80ab8a32f46637550277e42856c565f9382ece2c479d0db7a238 SHA512 8df3be66989c8cee86badd3e3b67ef80b11748c92a46cef11b9eb8a34a569ac9a33b3cf643bb4cbcf67b4b39f1875caa7cc2858a27e7541dac6e179e96b55a53
-EBUILD votca-tools-9999.ebuild 751 BLAKE2B 93b51e936ac594d3cc8a0c8f5d4051ca6d5c573ea4250cfc0d74a5cf92d5177d0e498c2d4719ce5ef2dab324a2325a7eb710ae093387abab38acf7a28c22f78d SHA512 7f2cc20a627410d51c9e5a48b3690b87de4a64deb044c21fd8b9bf27498b4f2d695af57d810f8025feb09e6787a737087ec05d3f3cd46b846659538237d610ff
+EBUILD votca-tools-2021.ebuild 792 BLAKE2B f185fed01b8cac544c15627419534edb811e9a2d3f8d418d4487396db7c566f4f171f2fdfe41ee650a0ede653ac0b2bb43f7a17e79d404ec6d15d07314b433b0 SHA512 cdd7bd917b6d5dfe476d46e22d4d821b709513116b73c41a71f5f9c1a5e2b0dace7f381788f3f0baf22c3dd945904203ef433ea67d32a23eea98ce408355bb97
+EBUILD votca-tools-9999.ebuild 817 BLAKE2B 0a40f725c05500548af930c546def4b08594533c6bcb2500ec011c075544017898cad004705673a156d8b88e0e6feed0bc7903d00548c7eb2025d1312ed315ba SHA512 d327536f0b9c4a047d26e9ad63f44750c11459b34709d7bdd24aee6f3908ffb87a6f43a6410518427bf168134695bc6f11b11b2723eaa2d29cfa039970411e90
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-2021.ebuild b/sci-libs/votca-tools/votca-tools-2021.ebuild
new file mode 100644
index 000000000000..a53a01d0af5a
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-2021.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
+
+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=""
+
+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
+		-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 21ffc1d3bbaf..a0d08f7fa883 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -19,7 +19,8 @@ HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-cpp/eigen-3.3
@@ -29,15 +30,15 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=app-text/txt2tags-2.5
 	virtual/pkgconfig
 "
 
-DOCS=( NOTICE )
+DOCS=( NOTICE README.rst CHANGELOG.rst )
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_RC_FILES=OFF
+		-DINSTALL_RC_FILES=OFF
+		-DENABLE_TESTING=$(usex test)
 	)
 	cmake_src_configure
 }
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ea7e8af739d1..82667e972a1b 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 4cf5fa9d30f7..07238b5db7fa 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,4 +1,4 @@
 AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa3d1ddf4f4076d94115f0168d4ad0c96a876be57ead4db26219e594a9afed3aba2ce3cab30e8cf19060 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e
 DIST Agda-2.6.1.2.tar.gz 2722270 BLAKE2B cf8d4bff2c189d87696c3f03f1b32777e8bd060102f108e0b96aca87e6b3b1cc84077a1e0fe3f9ef42293f683aa855eb60ade8b0863b3f78c96b4ebb63e456a5 SHA512 5ab35d9b581ed918481dd25619739dfa43ea3d86b9522989fe8c83b3aa8749bee81fb12e7cd6b4270c4890a3719386c62b220163324407a1201273d1dfe9d615
-EBUILD agda-2.6.1.2.ebuild 5007 BLAKE2B 0a268e3fe699114f1b49cfab6762ccfe4e815d49584aec884a9c2eee597d5b4800ba0a4aa71d6b67d263add0491382ed29a3df29df212de21000882d871efcb3 SHA512 c28cc3514deedc21f439974b9d498a2a3e9d8992190a4e0703862855d10c164f46212dac41681915bcb8f220f192d41d189f1b8ac07129d4932e4536cca1c37b
-MISC metadata.xml 1743 BLAKE2B 6705852b3c4c52a22788ee01fa511bcb63410f39ae6da3168c6907e39674ace7c6c76c7b39c23d2dee9c2b98c45a264d76b7cf8ae7de8f5ccf1c99a4a843ee0d SHA512 c4b75de7cac6776cb24ef9ac3fac04be88c5d434acfb9e41d9c4b98deb59f02d07e04078907629dd956f72bfbe2d6e3f7cd24f801c1b2a1636c05555442a9851
+EBUILD agda-2.6.1.2.ebuild 5118 BLAKE2B 4c45bdc04bda4f1ee36fa691ad89458312e58c04b318b5485635eb442dbae702040bb959589693a518c808aa404d6e75a9d8d31c9c17d4b0c0d610f12c6f4f77 SHA512 10111072552ed9bb046815f1e70181ad05a755f6a496d351b7de93ff9c206caef25cbe3e7241415767c523baebaa99cff6bbf8a177ac109a366a121049c06c8a
+MISC metadata.xml 1739 BLAKE2B a11bf97211f5b3c9b6ea8de77d64d2ab1a032be7502eab0eef88fe171424ffec17b6488e2d31d8113bfc630d7d709f7b86ead8bedba492d9747e047914d10763 SHA512 6dd8a8e9b3c0191fe4fe6eee9c620a448e7ba78ea5fabadea2c31a57d140fecad1e049ec2dd73010241204ccbb8d29e5634ee2310eab5c9be0cb8e3ec6b70736
diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild b/sci-mathematics/agda/agda-2.6.1.2.ebuild
index 3468e60ca041..a2a59db413d6 100644
--- a/sci-mathematics/agda/agda-2.6.1.2.ebuild
+++ b/sci-mathematics/agda/agda-2.6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -81,6 +81,9 @@ src_prepare() {
 			-i "${S}/${MY_PN}.cabal" \
 			|| die "Could not remove agda-mode from ${MY_PN}.cabal"
 	fi
+
+	cabal_chdeps \
+		'if impl(ghc >= 8.6.4) && impl(ghc < 8.10.3)' 'if impl(ghc >= 8.6.4) && impl(ghc < 8.11.0)'
 }
 
 src_configure() {
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 5606f0f0585e..ea5eaca193ca 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -13,7 +13,7 @@
 	</use>
 	<longdescription>
 		Agda is a dependently typed functional programming language: It has
-		inductive families, which are similar to Haskell&#39;s GADTs, but they
+		inductive families, which are similar to Haskell's GADTs, but they
 		can be indexed by values and not just types. It also has
 		parameterised modules, mixfix operators, Unicode characters, and an
 		interactive Emacs interface (the type checker can assist in the
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 89e9f556338b..8cb19dc91767 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -4,4 +4,4 @@ DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1e
 DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 EBUILD arb-2.17.0.ebuild 2024 BLAKE2B 2f2f914247a7d094219271914125633fcb40df6aebd1d721de8cff1580b4bd7ba03eabb9f6ced6c36f50008e7f138b8064fb7aa4dca35ff312f7058a7d70ca68 SHA512 0a16600bf1f11d6976c244a03c2844137b06612e7a860447835d5056c68f04a91478db041dcf1fb82a75528e91b68160a8c43d3332cd40ed90bd002a706decb7
 EBUILD arb-2.18.1.ebuild 790 BLAKE2B 504d3e8095e7ece23fe9863218452c09f412f2eb5497e83ab609db21455f1f72b6b618ed290ad777fa7bd39d2f446e1064b0c019cf8e60b5139daa4dcacbaa94 SHA512 7f5bc91dc8d39e2d5f919f61d90ad29e41f609dbffe7a2513846b54ec7bb810ee030ed358e9edf0b3b4fab74b570bb058666ee95961f286f09bea37d2f940589
-MISC metadata.xml 1077 BLAKE2B d21ef7ffc1b41b7b52d7d8caf246b0109be10d06b7bb4d660c9ae0f750d748cac37cd289df3282cbca9f2658e8fb5f6674c170ea6bfd511edb71a3f0da88bc86 SHA512 cc6a2aed7acd718af2aa1612b1b454a2e699da97a33cb9ba9ca747e3782d9439bb0ff96c25e9023776777a5ee20d2c208c7f98dc73c787a16bfca58e9a10e1ee
+MISC metadata.xml 1107 BLAKE2B f9d008fa5d063c0c184aa8f4b6b8588b56d417936a19c350fb252adfc0e95e14e2ea81e3f9bd1d56d1c5b978e5964b4cc3d37603cedda9c55c0a111d0987485f SHA512 7bb01ca2427e92d6ed0c65c495922cb80d241b988bd73741f132c522cac3f3c45a796a042f7ace440eb8eecfc483a1f7c01928519b8999cff52e78b111ac1296
diff --git a/sci-mathematics/arb/metadata.xml b/sci-mathematics/arb/metadata.xml
index e6424327a6bc..362665766217 100644
--- a/sci-mathematics/arb/metadata.xml
+++ b/sci-mathematics/arb/metadata.xml
@@ -8,11 +8,11 @@
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index a0cb80c469e1..9b7be768fcd5 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -5,4 +5,4 @@ DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc2
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
 EBUILD cgal-5.1.ebuild 1668 BLAKE2B 50a42e49445d31b98fcf87a949ce9eeb2aded5c0a3ded30efb401c9b199518b1bdabc1d51da607c21f7cfaad859ec72b46c5d0c249f61af7e6746cecdaec9fa5 SHA512 e5d289e5d3e79a46a876b51b8c319f6e1c4c1076c7a3b8c1b51374144947d3ebdca42579c90058896f50890be603573b7fe2d303ae936ad3173a76d3fb58a9da
 EBUILD cgal-5.2.ebuild 1666 BLAKE2B 5cc82ca832411b175f72a72e68542ddacc21d9795c6067d9223b28b99da108eea63c7b3630c039e2679ad5649f270caea0b95a367c3309cbb69e4e8b48b2832b SHA512 80827eda045dcca0e2a8b145b21037979adae365caff09e88f7cbaa77bbaa43a5f59275e8deb237bca53783ad14da3bf29d201e4dad1786df39bf5a4c4b9a709
-MISC metadata.xml 1552 BLAKE2B f05f378f0343972d254851ddac6512761f36741106091b37d8e4fe216f4df6ebad12faea0d7e9323b999b5595d6d03a7b9848601fc83bf8bd8c35234c71e7301 SHA512 fc1bef0c6259b274716ad0c9bb50946268857fd8bd919d4fe2e4d6a89bbee518ef321f2fa4b43587ee61e40dcc96d12c5e152b39bdbbc39b440300c61039d4db
+MISC metadata.xml 1582 BLAKE2B 2bdefdfc9eb63f4ce6049710ea57e8988e91dd32bc67ba32707b86f814e6b75471eb6ee49785adbe2f90bbe4d3adfa22d95bc9e050d3caced232d6267e9e81a9 SHA512 cc4c6580fe29d50c8ffadab4e3c84cb327a755c4b335709b07a2521e7de150556cf272a8c58d7b05fa3380b78c297efccd170c03fc9c27827359702ad6c80bfe
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index d26f70426b39..05dff372fd2b 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/cliquer/Manifest b/sci-mathematics/cliquer/Manifest
index ace708d58b27..4e725ba8e5b3 100644
--- a/sci-mathematics/cliquer/Manifest
+++ b/sci-mathematics/cliquer/Manifest
@@ -2,4 +2,4 @@ DIST cliquer-1.21.tar.gz 412440 BLAKE2B 0a4f31f6b005822271c67ab2f2532809b112a5ce
 DIST cliquer-1.22.tar.gz 416433 BLAKE2B 3f43d443b1ecfef599213da99ffa15b5077392dd8d1bebdd0f5db73898d1fe997d6eabe6dbdb29852d40355228f082cfa7e3198be90dc9166965b90f062cae69 SHA512 3285cb0a3987ff730d9f9b25419a98201f399daf28444179ba8902211ddda87adcc7189f5b94f062d0648039a1b6217b80c8db482887d7dc8552b20459eff861
 EBUILD cliquer-1.21.ebuild 784 BLAKE2B 5d822c6f11114d9fd0254af5cd1552c0149d78b506eb75ca61f34506f7af24ef51ab593fdee61db0a8562170c638ba6b61bfdbb014d0708e99c64ebaa43390f5 SHA512 eaa0766c99060fdb7662eff8cab91a09b7a4a9f7a09c8ff8b609f184cd762a4feed18431fd817273feb2aa2704488d1c176b0b1314ac8d944531afaf333d9262
 EBUILD cliquer-1.22.ebuild 786 BLAKE2B b968cc114f0966bf3ccd8914fd5559c6c0074972a8b46bb26cdeecbddf33303c655fc9a640604484a0091a2d2ac478c0b75e10856cef71b02c8c8e232179f869 SHA512 81b896044c300c2f522905b794f8047fac638388799b97d358c29ce14ed9a3a4133fd8f4dcabbaf856a1cafc739879a37ab8dd1051e3a9f1d8e3ff0bb022f39a
-MISC metadata.xml 739 BLAKE2B c6fa693dfa35996f2bb14d5a466538770264b47830afb59b09b8e0a5b99818e5532ffd6b893b6ed906922fd24ff9abf2511cc849ed01dd5d39d0830b5f289b22 SHA512 a9414bab8c1b6c8858c0de265fd864deb31fef36294a5ebcda07fdaf54eabb1dd0694286215ac48f7f1d36a2682bfdf9fb2d0bcc7fecc5126c815c7281bc731f
+MISC metadata.xml 769 BLAKE2B f0cddc137df6bdaf895d663aaf19dadc96ec136989ebf7a330249bf7f35e70680f93417d00286a50ce79358affd02696d4883d009e4456d7476af35185ef5385 SHA512 84b42772c81a1f1b3b598bd71c5d86c28231941b8f37d8ad30287bfcce444c8d6d26676d265c88027eea5b94970f5aacf96b2ede2d60e3d9ef10abe16fca9fa2
diff --git a/sci-mathematics/cliquer/metadata.xml b/sci-mathematics/cliquer/metadata.xml
index 94aafb3a9ea9..a06de7ee84e1 100644
--- a/sci-mathematics/cliquer/metadata.xml
+++ b/sci-mathematics/cliquer/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 1bb483d5dc00..e8bc753d85c7 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,11 +1,7 @@
 DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e976fb46689e0eae182fa4ec571524ae9f4f1a5ebbd44966fbdc4ee10cffda59c287d51ab48df4ac0e5e6844c SHA512 f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
-DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
-DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
 EBUILD coq-8.11.2.ebuild 1828 BLAKE2B d07bc2a17b827c6e063e45b8f025b492405d30ce6e1a5e8e297bdc4395da7a3d2f7bf8f5ad25e6258aad3a386f5cbf22bae5a75c442539ba88845e52b151f3f1 SHA512 f1b63d03e3e0a22c6491171ea481f44bbb178783ad7d8dff90e96dca6aa3b28392e4d05366f6bbfd6fcc7417f4a01349f206a994c5eef3b07adb64b3deb43184
 EBUILD coq-8.12.0-r1.ebuild 1826 BLAKE2B a19aefc94ef90a5bbefad421a64ce70d67f4300f565b3a3bc26ecee6388a753f3e711ab738effdc9a9afa26b65fa608a2e938b8299d1ce10502fc9275caa84d9 SHA512 6f25da4262d515986f1f1c8535e8cd0b4b4d539bc4ce1d8afc4dd43710b15db8ce7db8b59a6699c0d816356f3a2ca87ac91eb57ae57bc709a545403fb6868158
 EBUILD coq-8.13.0.ebuild 1800 BLAKE2B 62589bd54d8387dd7b6edc0a04708c2288b35c470dbffdb97046eee76d5e1c870616c6695179b3c5aef83da39eb125886e3645a51ad9124afe5ccc527f6de577 SHA512 e02446464e6d91f599168329238e9f51e79c0b3400864e8e2a64fff90616c2df44f490a2b3a7a3d12d9b2394397614fdf36ce52158c1ed5a5e4e85eed894b9ae
-EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
-EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
-MISC metadata.xml 1052 BLAKE2B c753067972f26a5be88afddf96eea063047e03aff71acc4b69a20d8b9d2b4124ac5fc8f2a84f66ff60281de288baa4c9b473738f87225db16ca4c69430174f7d SHA512 8811ecdefbfda7d1f41ecf10578b77e7c821956b0ec9267c4bdf44bb8f6adedd6b1031ca9deea0b1a8595a3dcab530c8fa07d6046fcd82d142ce510cdfdaeabb
+MISC metadata.xml 938 BLAKE2B ddeb43293328ab548a13f28c10bf9c0980f88a8f3652002c85171b0e9671873f820eebf6802cc55561cfc032f067555a9d7bb249780015f1786030e6cb4e52d4 SHA512 940564ff79f4165412e85cb2eeb3bfeb86447de012c1d4d78d01c1a52bd4272a78253bd4fe2208ed2ba62cf2141758a9411c9d81a4122bb9457b7091ba3e4ae8
diff --git a/sci-mathematics/coq/coq-8.6.1-r1.ebuild b/sci-mathematics/coq/coq-8.6.1-r1.ebuild
deleted file mode 100644
index 955cc400bc20..000000000000
--- a/sci-mathematics/coq/coq-8.6.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
-	!camlp5? ( dev-ml/camlp4:= )
-	gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-emacslib /usr/share/emacs/site-lisp
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-		-lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	use debug && myconf+=( -debug )
-	use doc || myconf+=( -with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( -coqide opt )
-		else
-			myconf+=( -coqide byte )
-		fi
-	else
-		myconf+=( -coqide no )
-	fi
-
-	use ocamlopt || myconf+=( -byte-only )
-
-	if use camlp5; then
-		myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 )
-	else
-		myconf+=( -usecamlp4 )
-	fi
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 world VERBOSE=1
-}
-
-src_test() {
-	emake STRIP="true" check VERBOSE=1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
-	dodoc README.md CREDITS CHANGES
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.9.1-r1.ebuild b/sci-mathematics/coq/coq-8.9.1-r1.ebuild
deleted file mode 100644
index 5392c5dee7b0..000000000000
--- a/sci-mathematics/coq/coq-8.9.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RESTRICT=test
-
-# Note: RDEPEND will require dev-ml/num:= for >=dev-lang/ocaml-4.0.7
-RDEPEND="
-	>=dev-lang/ocaml-4.0.5:=[ocamlopt?]
-	dev-ml/camlp5:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-		-lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	use debug && myconf+=( -debug )
-	use doc || myconf+=( -with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( -coqide opt )
-		else
-			myconf+=( -coqide byte )
-		fi
-	else
-		myconf+=( -coqide no )
-	fi
-
-	use ocamlopt || myconf+=( -byte-only )
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 world VERBOSE=1
-}
-
-src_test() {
-	emake STRIP="true" check VERBOSE=1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
-	dodoc README.md CREDITS CHANGES.md
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index c08f4cb96842..739db8fc01fe 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -20,9 +20,6 @@
 	Constructions" extended by a modular development system for
 	theories.
 	</longdescription>
-	<use>
-		<flag name="camlp5">Build using camlp5. This is required for some plugins like Ssreflect.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">coq/coq</remote-id>
 	</upstream>
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index d01837e4c2ed..6f8d86ee4aea 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,3 +1,3 @@
 DIST eclib-20190909.tar.bz2 914900 BLAKE2B df57972792f96e65b25db5a2ab1063d5a8f1ad05edbed77d9ca2632ddfb4af2cb8586e572155beec09cc0c03472300d1e6fcbdda3527c36e9106006239f50600 SHA512 df829b10c353f528f2040b55d6198e3a48eba179b9a80e71794e4c6d46ee9bb13b3eccec15c7d286ec5d8252e6ba91157c2a08ac4e2da86969a4158450a41960
 EBUILD eclib-20190909.ebuild 1009 BLAKE2B 78281fa5043db50b79b5462af2098f09fc36d386da6f4c0d521eeae24b2faa4fb910881000c415ccde92016dfae358b84305829b9deaff742bba79906d4b4c77 SHA512 41eb82fb56e18fe7695eaaa1a523bf0eff903ab8e0fa852f431b7ce21ddfa3f11462999f15c48bc7e4e1218b59a7ec3022674d5363c33e7861dd3d9a1cc49b26
-MISC metadata.xml 1058 BLAKE2B f78114f517aa1b21ee6bc36104f1e929b319d77c2a9373c41cfcea4a90d89ff9e0a0d512f4056b6d1c611a3dfe2f64b65117f8e3ba09dd4c3e535eab0cb76f3b SHA512 692e570681c68cd0a2285b616a792e91e341993fceac875f3e35911f04d1933b2e696c9d54d9f90c3a2f459c8365291e03c0a52c1cbf0491a3c303f9e1ba6d41
+MISC metadata.xml 1088 BLAKE2B fec21e6f44389bcd376f3a6c9ba97c54cafb40a92c0c591f7d840b5a33d663e41a8481bd16567267be2fe664964da8b14e6ccdd5fccc3c53a25a2843548f82f5 SHA512 db99aa5762f72baeb9183aaf9c3b561fd53b9fc85368af3bdc13be34e81a5540a95e175874df2dae05243902ba687d6eb609f4dd7def059dee580affd3be74c8
diff --git a/sci-mathematics/eclib/metadata.xml b/sci-mathematics/eclib/metadata.xml
index 9561ac3f61e9..2c916a8d51e0 100644
--- a/sci-mathematics/eclib/metadata.xml
+++ b/sci-mathematics/eclib/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index a44b0640b9a2..c7089d589e86 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -7,6 +7,6 @@ DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40e
 DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
-EBUILD flint-2.6.3.ebuild 1153 BLAKE2B 2d89268008730477c5920f57a43c1ccf98988b9ba344b34238f07dd9a4f0411cbfe4082fc0156a0d29b6f37e61ef091f7c069b1c38682985b4ab17f5b13d8320 SHA512 b7eef769ffe2ff3d43870ac9cbb2fda880e278b1e5526136cfc1550a2ee76f67fb6271a2ac9df4c63db8fc044094446d0f2a357bf59cfcec36dceab675210aa4
+EBUILD flint-2.6.3-r1.ebuild 1170 BLAKE2B 48d562711cbc2dc0fb758b9f24679a9529e912ccf0008fbeb46d639f099798f69189266e2bda1a6b4c7337dd6dbd82f6fddd9db6a4b1cf7639c4e0d1b5ae3372 SHA512 891e482a3182179ffad15aeced9d8232c8b85b8ff399c3f396c7c36a053746a9e5cdbfb7633d60aa0f6935f41434f1001eb19445ea9dbd9740b8d5a1a901998e
 EBUILD flint-2.7.1.ebuild 1319 BLAKE2B 0e271b4fd9653f99dd6943f68cf8b994659aa48475f09030121b3effa0b049f9b2fd63151af61c0c683215e068beb202bb81cd6b12163744d3605c3692ab81b4 SHA512 91855546b21c7ab90ac22f1923524e964fc1ba6b1485274ad2219c8ce09ced3ef32618dab426874d62253e9652d6312968dbff2521d94286eb87199f50b7dd7f
-MISC metadata.xml 822 BLAKE2B b18146ba57c33f056943afee0473c917bea562fc970294aa7b09228f56aca29c8df1a59d4b706139397e61ace23de7cdad48856d71a433e15412a9e18e1276d3 SHA512 62c12622e265f00206c60a97c6ff53491c62c80acccb339f57e837741995c6452802395476dd19b8a73170dcf66ffce6795553471379a5113d8330786b123a14
+MISC metadata.xml 852 BLAKE2B 9d4e42cbf30d12f45eee522daebfa264095ecc7da2a031a0c7676066f2dadb18e71d7c53fd1f5c7220c78276029532999e44ccacad31903fb174ce2bf36ae3d0 SHA512 f05df1daaf10afa63535a1db4bf5a75185e9523aced9329d90df59e5ca5d1eeee23b30dfe3fab6a11bdcc95b1b5e9a8b1012a19457c66e3dccbdab5a6e303e4d
diff --git a/sci-mathematics/flint/flint-2.6.3-r1.ebuild b/sci-mathematics/flint/flint-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..dcf4d4d0e5ab
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.6.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/14"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-tex/latexmk
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+	)
+
+	cmake-utils_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_make html
+		cmake-utils_src_make pdf
+	fi
+}
diff --git a/sci-mathematics/flint/flint-2.6.3.ebuild b/sci-mathematics/flint/flint-2.6.3.ebuild
deleted file mode 100644
index 2f2cf0fd1522..000000000000
--- a/sci-mathematics/flint/flint-2.6.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/14"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
-	dev-python/sphinx
-	app-text/texlive-core
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	)
-	${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
-	dev-libs/mpfr:=
-	ntl? ( dev-libs/ntl:= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_NTL="$(usex ntl)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOCS="$(usex doc)"
-	)
-
-	cmake-utils_src_configure
-
-	if use doc ; then
-		HTML_DOCS="${BUILD_DIR}/html/*"
-		DOCS=(
-			"${S}"/README
-			"${S}"/AUTHORS
-			"${S}"/NEWS
-			"${BUILD_DIR}"/latex/Flint.pdf
-		)
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_make html
-		cmake-utils_src_make pdf
-	fi
-}
diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml
index d07a5a09b6d3..d7a6c834fe0c 100644
--- a/sci-mathematics/flint/metadata.xml
+++ b/sci-mathematics/flint/metadata.xml
@@ -10,11 +10,11 @@
     <email>mjo@gentoo.org</email>
   </maintainer>
 
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/flintqs/Manifest b/sci-mathematics/flintqs/Manifest
index bdc7999806fe..a851a7df8483 100644
--- a/sci-mathematics/flintqs/Manifest
+++ b/sci-mathematics/flintqs/Manifest
@@ -1,3 +1,3 @@
 DIST flintqs-1.0.tar.gz 151535 BLAKE2B c05761767af65ed5e5c42e75640c0736a26de76126907a91914083791ce0fa3659fb6f9fcdddb0b7aaaf2200010d826a18e7fcbdad0ffc6f861d4bcd941caabb SHA512 8391bb13bcc91f4ea68c972f0f6eaf9aa37bedc4c8694d039a21fd5153b203d561364ae545478d34013001354c4e8a013b2e5a5cb947b6e7f453c6f0f392f8be
 EBUILD flintqs-1.0.ebuild 1007 BLAKE2B 75c14059653e39e414e401bba190c21a2fc9753ac5df5a7607ec8d3b3128fde11b1cf7e8b6548fcf1415281c2061cd6e255a76dc09915f7988323639049fc38d SHA512 d52bad62cee3d11afdc12ede64a478bc94e7c6341b4912f5cfe86ae91f3d03055bc53c3ccc9662f846ac2a12be45630e75155104279b69f3b5e73113a1bfe7d7
-MISC metadata.xml 736 BLAKE2B 553a7c524f86f30ba868d5e0db2fe5d1b4c501a5be3041fd7cccdb50e5945ecf794dde68c058ff88a1ed918d9466636d723e117e1c073665c20d5330a3e2ad4c SHA512 5ca499866911f12338a1303be4d037b60a62e257e77856349accff7d002c5fef5f6b1f74e6558392e1ed265413440f237a6775a57ec9a57429ce480fea6f838d
+MISC metadata.xml 766 BLAKE2B cac3824f6b85428c678ff0780e3d6db428d11fdc3dcf26258c28c94bdb40ed895a93d465e2d472a059c7e2652a617a011b2afa19f63d2610cc4a4fb2c9725276 SHA512 9806b8567eecd6af1f139b6e0b74ffd0ad1eb1ffb790ba3f40f5f63c7b825da7221ce593ced4b3ddca5dd4a97b3ca06e41a00e8ee01f041305a96032b1becd75
diff --git a/sci-mathematics/flintqs/metadata.xml b/sci-mathematics/flintqs/metadata.xml
index 5fa38751016e..a02d10ed6a5c 100644
--- a/sci-mathematics/flintqs/metadata.xml
+++ b/sci-mathematics/flintqs/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index b6fb53bd9471..446abde1c298 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -5,7 +5,8 @@ AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
-DIST p95v304b9.linux64.tar.gz 7163658 BLAKE2B 3958437d31e39bc18248deeed29aa425ab7fd23c963b7eb9cc00524dbf272acbfb96b03d7ed83547501b7e8b7795b9e0e4d413e9a311b014c2202c328ea12a23 SHA512 f9517088af31ffb5f0ee931ba0027fbddfa5598f72de39aae78cbdb43368ca605444e31c9ef297d08ae85d7a8540dd25eb26015f288c3777e36fa9c04eb179e2
+DIST p95v305b1.linux32.tar.gz 5695975 BLAKE2B d2ab3724cf8743292533a7cb5c73b2fc6743c6e11507f92218b6b65f39e78c2f61147a6898d0a77fef590a0c989aa6f17d1984a6e4801594fbe4c3a7484d1750 SHA512 74e2592c1f3c4bb45cc076e35cd70d5c295d613ab142feb1c18138ea8816c21c56f5531c4938c49706bbb66f30ad84c5dd2f76f2184e1a1ea0de7423e941df52
+DIST p95v305b1.linux64.tar.gz 7166108 BLAKE2B 60880e36ed618ad94aacd0f89811b72137fd27e99dff33b02286ea0f4778bce320c9b8da7b470fa491ea2e333f03d9d2994c2ea1513289acfc2f5b63695509fd SHA512 c38416b83850104d8d78191a4591fbef1bd356f8804725ccfdd7ebe065bc05ed86c09a128ac7824f809242712d60a1eb7ecb200358c1cde37fc4b7c13b82006f
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
-EBUILD gimps-30.4.9.ebuild 1798 BLAKE2B b90eb57316e3cb619ecc84ea1e8a86e0f5ff1ca57f99a1a6bf7b603b3ce555335e5b13792b42347340bcc09c40e5f15ebd957e4c6b534f2dd2742c22330a61a4 SHA512 e9c7147cd7b9488273406c3f2085e34650e961cd29ac8f1f2314a6828edcaa9e2f70600b33aa3186f34f0d4acd21b62f440ebdfda79a4a6e713fd39b4104c88d
-MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
+EBUILD gimps-30.5.1.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
+MISC metadata.xml 559 BLAKE2B ab97b02069d576618a0055447960e4831ee40c80dea70657b50e7cd729cdefb00ea0fe1d66e402470e7a1b29e1cda6db37f6c52c923ca0f31bd1056a72bc6e88 SHA512 4e0a74efc9add574ccdb07bc011ccb6b111f1b2182ba2d83c9528d0b6c5ee9d663fd6f50ac8a789888c59be5a4579c5a27bbdbf0b84970a6b4178ba53da834b0
diff --git a/sci-mathematics/gimps/gimps-30.4.9.ebuild b/sci-mathematics/gimps/gimps-30.4.9.ebuild
deleted file mode 100644
index 59980c5dd0c3..000000000000
--- a/sci-mathematics/gimps/gimps-30.4.9.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 pax-utils readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="https://www.mersenne.org/"
-
-# The author has finally caved in to the pressure of putting the build
-# number in the package name. Some dark magic necessary to get to the
-# package name
-
-MY_PV=$(ver_rs 2 'b' )
-
-SRC_URI="
-	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
-	"
-
-SLOT="0"
-LICENSE="GIMPS"
-RESTRICT="mirror bindist"
-KEYWORDS="-* ~amd64"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
-
-DEPEND=""
-RDEPEND="net-misc/curl
-	>=dev-libs/gmp-6.1.2"
-
-S="${WORKDIR}"
-OPTINSTALLDIR="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
-
-src_install() {
-	dodir ${OPTINSTALLDIR}
-	keepdir /var/lib/gimps
-	pax-mark m mprime
-	cp mprime "${D}/${OPTINSTALLDIR}" || die
-	fperms a-w "${OPTINSTALLDIR}/mprime"
-	fowners root:0 "${OPTINSTALLDIR}"
-	fowners root:0 "${OPTINSTALLDIR}/mprime"
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
-	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-30.5.1.ebuild b/sci-mathematics/gimps/gimps-30.5.1.ebuild
new file mode 100644
index 000000000000..7a7160c336ab
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-30.5.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="https://www.mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(ver_rs 2 'b' )
+
+SRC_URI="
+	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )
+	"
+
+SLOT="0"
+LICENSE="GIMPS"
+RESTRICT="mirror bindist"
+KEYWORDS="-* ~amd64 ~x86"
+
+# Since there are no statically linked binaries for this version of mprime,
+# and no static binaries for amd64 in general, we use the dynamically linked
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+OPTINSTALLDIR="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${OPTINSTALLDIR}
+	keepdir /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${OPTINSTALLDIR}" || die
+	fperms a-w "${OPTINSTALLDIR}/mprime"
+	fowners root:0 "${OPTINSTALLDIR}"
+	fowners root:0 "${OPTINSTALLDIR}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-mathematics/gimps/metadata.xml b/sci-mathematics/gimps/metadata.xml
index 8b56e92728c6..c7c8eb306208 100644
--- a/sci-mathematics/gimps/metadata.xml
+++ b/sci-mathematics/gimps/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>paolo.pedroni@iol.it</email>
     <name>Paolo Pedroni</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Gentoo Proxy Maintainers Project</name>
   </maintainer>
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 8539aef7b142..60f3ff4beb61 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -5,4 +5,4 @@ DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee
 DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b00001 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
 EBUILD glpk-4.65.ebuild 1821 BLAKE2B 47fa4cb29950a15f1293571e82a5780b64d486b5cb3fef2ff7f1cf948122282bba52dc123287eb8e6e12e9d3bf48f4addd1063d92f9d0e3372141a5adba82f98 SHA512 159df1be098e9fee4297e150a7656ff1b129145fe7aa744fb6627863ce2628077cde4e5442dd7266f4abfc342303872e50d7c69d19d1c5758fa2cb922f2fab35
 EBUILD glpk-5.0.ebuild 1777 BLAKE2B fd7ba55232ce43c35629ceec7e94ec1d4341011645413ece49a2b14d3ba7a2b33bc1deaab856dc5f4a26c3a52d8c0aa5506616d97381aa5ae542e5d843b034b4 SHA512 1aa39abacb43a26277fd782078cdece8e95d56144432679adb66fb0ed09e26a9d0419043cd504d2b25b65876028523a304ca63239cee1cd9365aadd8c77977eb
-MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5
+MISC metadata.xml 1028 BLAKE2B 01e42a8b9c7ec521837e6a21d212ce7c747d47fcdaa47b58ac0bf411c158155caefc316f71f2f495244f559cb77de428954d293efde12cbd4418c9dfad3893a9 SHA512 1c7e827666da76204db3894e0d5bdc7ba253152935fe214445ada4f1d6876cff44b3092fc736c8da9fb915d80479a600175e579e71cfcd817e5e52065ae6446c
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index eef02da51bb6..68a619faa3d8 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -7,11 +7,11 @@
     <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/gp2c/Manifest b/sci-mathematics/gp2c/Manifest
index 59fedfe753d6..8db038dc58c4 100644
--- a/sci-mathematics/gp2c/Manifest
+++ b/sci-mathematics/gp2c/Manifest
@@ -2,4 +2,4 @@ DIST gp2c-0.0.11pl3.tar.gz 854003 BLAKE2B 478307b9fa56b8e58a66001bbeac3ce6193a44
 DIST gp2c-0.0.12.tar.gz 872289 BLAKE2B c72f092a0a8e335e68d14f00970bd4794d883194718dd89cae760e06b5b89bd1b1959389d422b086f7862870e212662fc736f1f6720a389b9484ff360d9b8293 SHA512 9dd13c37e7ba36d75614249b6a2ff62350b5c02ba519b2c5d2dc49c36e9b6672134902b5f2e6b23f42fd4ff2069bdd12bd4694f324ddf814296bf8cbe5f10cdd
 EBUILD gp2c-0.0.11.3.ebuild 742 BLAKE2B a2bb2f3dd06891f6de3820ad1be89cc20da360baca17a9d50799d53fa29b4d970dc71e1040b34d20dcdc400f7d713e48cd11572b208ea9957f059d035f862632 SHA512 687f09f327280375420ba5bbe3c97a6ded1beda67d7c81754a6b4d96b97ea460b4f770365da76a446f1a230f8ca9e13dc67909e954e6e4d874e01b3d963538e1
 EBUILD gp2c-0.0.12.ebuild 745 BLAKE2B 56aa38e97ee34eb01abd5c848e40452f0a5788633a451a9d77fc9556c6ea9cb7653187b14991c1371ec5ccab778fa3a45ec598ddeb9b478b14c0b53e69f84479 SHA512 2f3e38c74ef3aa409de6277155ee036ec5690d1c89b709285057c1d508fd573e26868bfcc4960f2bb5421f34320027fb8c480bea096a14fe395cd8dc7d077a1d
-MISC metadata.xml 886 BLAKE2B b4dfcb3e2de5064a3a537c6598814f7ec47a7db0a9bfefcc4cba78c373ed97d0ffa08fdd2ccbf049b28900c84afe8f594d7562fe35ad7c9a0ad59f2d63d9988d SHA512 71cf581ae9463fd7f4bb8eea880a940251571b076ec008d6ae2625c8158fb2562b8f4944e7092b05ba264b0bdb31ad31d4be2392ce8c1c82ff0452b513cf8ddc
+MISC metadata.xml 916 BLAKE2B f528cf5926f0e9f1dd9862333f2319b62eca89872d36c7a7ea3f1340514696892ec8ee4411ee22b1a731fb914a5c890de78c3861f98295acc997a08f85caa90e SHA512 228d5460e39809e0195176822a102fef3f5c4b2e393c9a4adae57178586fd0d77b275ff2dec3870347a43831d4860a57ea868eb4492442a5781c32e691968dcf
diff --git a/sci-mathematics/gp2c/metadata.xml b/sci-mathematics/gp2c/metadata.xml
index 41fcade95d92..7628863eaec6 100644
--- a/sci-mathematics/gp2c/metadata.xml
+++ b/sci-mathematics/gp2c/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
index e12cfc825d1b..73c90b504d87 100644
--- a/sci-mathematics/lrcalc/Manifest
+++ b/sci-mathematics/lrcalc/Manifest
@@ -3,4 +3,4 @@ DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02
 DIST lrcalc-2.0.tar.gz 420728 BLAKE2B 4d14276cf04cb1655d74bf9b85e12379034f43232db9b1a77db8ca4a508e5b490845fe44f4cfd533990bc567e51e817ca82aa917fce40517b8c8c9fc7dd2b4d3 SHA512 9224d1be971f53c0428f6f9a25850a892596175a6b5d6ca90b06abed00a72998b54fdfcd2be62318af142595f752b3a9ccc2efc1816ba7ce3ae59ecb43c49f81
 EBUILD lrcalc-1.2.ebuild 592 BLAKE2B faf95fcf9ad635380d47df7f691346cf7507fa858b4ed608071b9e50007bf271905e2fd7bbbf8dc73e203f0bcb8f0474ad8836268e7fb3f8bd80d7cbb02669dc SHA512 256609e7771b5fa1125d464de13631b6b0244ad1f6a55614f9a436dfe35dfd8344160202db02b4ebb99b299ad4773d8b7c5147097f981cf6728b431cd7d721e8
 EBUILD lrcalc-2.0.ebuild 542 BLAKE2B 6d0391e8749c80a7de030593ebc68241114b03258f3175ffcae437167b8ba009c7141d69595b73b1126ef94a8b9acc3a6589b9f582d98496ed971b6fe7837915 SHA512 a079da9b2c0ac7d184cb34f7370a32dd5bdc62e1ca6a9f20c955baf0d6a1b21185bf2afa9c5d1e2ff40f03fd8dd513f8f00923a25394c0b23c668f6982139c7a
-MISC metadata.xml 834 BLAKE2B d230c80d9552789e93a2f2cc9e1a8eac968d4762ceeba6103f92676cb709d45bf39b2b6820e889d11ad30c60493aec84076d8ee3f5f038640038655f3e2c5a07 SHA512 f54cc63235625646117f0d569fb69c3b3b66b5508fb65a65a3fb92811ff44f72df7546d44728f5882d2db9b70520036ccfda05cb58d9cf9dd3164132dbebbc57
+MISC metadata.xml 864 BLAKE2B 0049b519d970b5aa4123fec3e5b6af9da855b735cf593282426fb8ab758efef4ba2c05b7e85be3b0c085438a11ff1fa308d0b3ebad514e485239bb6190800970 SHA512 59bd0291a2cfcf89585c85a9bfa74e089ba814ed4ae2d23728a21af7aca8309adb6419717e6d8d323966a84ce6563dc60058271f9ef90456a1e40539da9c6cd2
diff --git a/sci-mathematics/lrcalc/metadata.xml b/sci-mathematics/lrcalc/metadata.xml
index c070753f1162..024b3426fe17 100644
--- a/sci-mathematics/lrcalc/metadata.xml
+++ b/sci-mathematics/lrcalc/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/metadata.xml b/sci-mathematics/metadata.xml
index 1eb658e8e1cc..2fa3d175eaae 100644
--- a/sci-mathematics/metadata.xml
+++ b/sci-mathematics/metadata.xml
@@ -34,4 +34,3 @@
 		matematyką.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 8347417e56d5..701ce1e222be 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -2,4 +2,4 @@ DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682
 DIST normaliz-3.3.0.tar.gz 4243027 BLAKE2B 4785c47a2d815518e98b012dcbfe3cb70aac0ea8e06ad8f15ad6ba73120589e24f82050c25368775299974a43fce42052ffdf49379cd2b14ef4e415f6bb2d8f9 SHA512 3e09be1a265746c2cedf24c6a38de2f3801a906a66a0fa73a98b05916a5e6f412d84f5e38276781b5d99ff779a2db3fc420acdadd036e9822cae41b2ed539be5
 EBUILD normaliz-3.1.3.ebuild 1659 BLAKE2B d50183eef102f41a0db131c387a4a03aa0cf85fc4b076bbafa07969a63d331e0ef71205f3683e174a3b78f4d4bb8b8cd529423a4fba4669670818f7a99b6b2a8 SHA512 01a49bb35e3aa5fec13193d67244396e31e295e3904f4c1e3dbd96ce78a4c6c3aef05d35d3e305b4b055accee30d8cfa67d1fcfbc3c564e64f9493a67ef01880
 EBUILD normaliz-3.3.0.ebuild 1179 BLAKE2B 6171fe91431d006f3db01d4abd2ec3a1957b737101626c1ad247f887c7640e27eff9fd2afb538ae5375d3fb69e9f39c9bf77cdfd79bd20be29fe8e4b37fb1e60 SHA512 cf4d08b810de4167e834aa8f0bf6b2cdd0c478b255f797041f3b82753f69d7aee7f1da4e0f7a7457de89dcb7993a4ab51f7163e6a2fdef70281607a3c42f870b
-MISC metadata.xml 694 BLAKE2B bd87919779ac6083ddaf3f566708eb47baba2a2634e1af1e7c1fbcffef40960cf81c246b979bd800235cbb45707f33fcbbdabba59a0fdde192cc90aaf6e61ff7 SHA512 16995494ba6c269d6a8a437623196d29be82a5edcb9f00218f032deb0198e78061c765e7ac49883a051039a9ffcbe7107a1fc641c380dea3bc8d4df1ce11cc30
+MISC metadata.xml 694 BLAKE2B d14ea00cecc15244599561d12a957d298904851ca82ebfd728696344e5252cd42c05b6f1c06fa6b85ec70a9b4f75b188164fc4a87dbf2bf3e4d4151dd232c5de SHA512 f6407f218dead7d90fa4dde54fd4c77f075c2ad544371c1556e052fd719e58aec5c380dd6c9fc542ad581ab46609011e11ff255f41c06a7189ad83670d44f9fe
diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
index 6850002611f6..f2da9c77a667 100644
--- a/sci-mathematics/normaliz/metadata.xml
+++ b/sci-mathematics/normaliz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 67c6766fb24c..645074acb29b 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -8,4 +8,4 @@ DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f
 DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4748899f417e317b2e2c0a951d152ffdab061a5f7da73db65345134a90d91e57069d9f0d0ac6eb2ad470a7a98 SHA512 671bed101be0ba0eef2c4aa4d9580477f2492f2cd354f04773df00c2fa1456d1d6d8e568d617675dc4adce3e6d1f8cbaafae45452891ceb10eba60cd669b529f
 EBUILD pari-2.11.4.ebuild 3294 BLAKE2B 8656b6ec3b21763250c075f024c27786756a693c4ba365aa216547134734f91103c5ad38a03cf1ee0ee34c6564823d3f8deb2f75b1c3dd35aed1bf33ced1ee2b SHA512 fcc513c16a48d2d8cdc4b47f7f5d8799fe59b03fe593379b8c4b5f4ab60d9d5d6f6bd75de09cfccbd5a04783b36ef7ad93ccbfd0c8a57d0cca29ceb69db4cb07
 EBUILD pari-2.13.0.ebuild 3391 BLAKE2B 98ea133d0afa58bf2a2327d139a73567900fc52d93b98f579e34df1a879157f9559fcf2f4885401b9b50cc7555910b7dcdff9801e62650a5097de3d805e2570e SHA512 74235c32b2eb4731d62f603427aa1c031f8205a765173ae4814973b204c2a17ce343eaae4df912880497def8af75096d8cfbf7f9f9e853969819f6248aa863d2
-MISC metadata.xml 1734 BLAKE2B ffb61a9e3818ed778cd30e0b41279413fec1e624aef0c490e71f501b9797703bbd24413b180b588896d6d74af988e6102f58a04fc1c645f2b876ac2731a399c1 SHA512 b5caa3c3b98405d89681fb25c97dabb3302e971c68fda94e337b10dfc14761963ea548b4689ccb4ac59661425a85a53ea0d424b6acb35a475f42ef145ce9060e
+MISC metadata.xml 1764 BLAKE2B 8c5ad974148c99e21c30630ef1866a3ca7d34c87c214973c4025977130393a055de729bba4fda75d5e2ee288f439b1fc71e44bd3b68d09255f2ed3c81909f6fe SHA512 752c757e7b38995d44af25595da8626e773cb6083a0f9aafe7f3b6af1203b7da743b04b51bbc3f023e5e09c0620fe64fec1d44da7d84c88c4ef4619cbe347565
diff --git a/sci-mathematics/pari/metadata.xml b/sci-mathematics/pari/metadata.xml
index d5bd7510bbd4..07a2565cf2d3 100644
--- a/sci-mathematics/pari/metadata.xml
+++ b/sci-mathematics/pari/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index 664e7a5cd236..b1f2a5a7ac7a 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,4 +1,4 @@
 AUX planarity-3.0.0.5-extern.patch 591 BLAKE2B e8c6c75fdb587f10d38023daec5806ae0930dd4c4be1a74fa11fdd2d837a5b5904948a01601702a5de160725dd60214e0de2aa014f20e41dc957e0c4b24f36f4 SHA512 6fb06c58f853ddaa2fe308a8104db4fee1d6021f4ece9f3f6438ba667e65167f248ac6b3b674e997380f2c874447deda1b7be6dbec2f2c66c188ae5cc8c09bc1
 DIST planarity-3.0.0.5.tar.gz 492644 BLAKE2B d183bc07cab7246b62cc7340956206e3f6c5999aa92b223e7665ebd8ae1bc0c354011c078ea4f42d2e45efa2ae5e83e082e4c8d80e3391a4f20be1020ebf8188 SHA512 dfeb7e024e1f5758e5abbd854c4ca963b4f5d45433b2c5eb00ce85c154b5407ebccd1ace0db167488dee757db2c23367101a2aa568941a3664bac9058ea24328
 EBUILD planarity-3.0.0.5.ebuild 965 BLAKE2B 22f69cf8ce923ef032264bfe35c95ef969b2e6efa0d59214d9e4c7b7a2305e9f4b02543ae6f76c3301d2efe591caf8755be99d6f2377e90b6a7b634b8667846b SHA512 0d61d50250dc39bef0013e9a1e9b838afd0c9edc166d6e419dc6932b50475ebaf2262cd8afaace8e0fe081aa621e4eff3b476bd3b4c14f8c2a9ca9aec1492cef
-MISC metadata.xml 778 BLAKE2B f20aefc29faa94ac4305f4e63a1732ea4f8a6de80bc5289909f215558e8a662bd91b9a7dac87f60c05d2468f1effb7cfa725dd3be27a8594a0cf4a9a2a2b5ff0 SHA512 f4ee0f9f009eb40865f7fb2f849442ad2201f67a494574c40e94c1cc82ef56cd744fdbe5e5b41dddfdf3914ae7f6835bdc008d1a970a65211fb2971905cc0405
+MISC metadata.xml 808 BLAKE2B a7d1440f9b42358a4550ed751fd52daeba5dd83a694051bbc283de4925e1eacb8a4908a721cb04df2ff29f8c53ee5ca7f6c45850e3d41fec670724b956024627 SHA512 5cb5e8abe1447ac578a1ae0353f3e10bea3d4a0393ce61a99c1fa35b2bcb3b03e6c807d8ecf0fb6f25245db645e5054bd2b273a6d36a5018fd980862f3d20611
diff --git a/sci-mathematics/planarity/metadata.xml b/sci-mathematics/planarity/metadata.xml
index d6f3a10ad530..45c9dbdd769e 100644
--- a/sci-mathematics/planarity/metadata.xml
+++ b/sci-mathematics/planarity/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 8e8caaf5ee3b..600584f00ad4 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 952 BLAKE2B 1c4bc81688025d843a5d4209b07d5392265818ecd365788c84b8f8fcff156a110f5a5851ae6e8ce330774d912f2bc53121d78f1ecac69b577eeaed645637ee54 SHA512 df3a23e535e6786b2c4b0c3b64190ce836cfc6d27ad5524df88572613b155ac39b50b50b348f56a296369242f64d4ef3643e59d81ff35b6c5c452e4a38e06d8e
-MISC metadata.xml 329 BLAKE2B 72059e28c196f127a1c314ad5c63025937a9daf16e8457885da10c94c32ccffec36d4c5049f2dcf2faf9ae67fe934d334a7235bc0f2bec0836614362cd41d122 SHA512 18759433ae0bb33800dc14a9bd518bbd383b8bbdbf876b02dad81afcabe3f0eea7828bd6820989e13253d73c70528d2a3bb4637e5e28d2fa5aab28b84aecdf32
+MISC metadata.xml 329 BLAKE2B af279e80c33a9c850fdf197cda6d3d649deccd92a4360f6524194ac549c3c02b46975067c8f5ee2dc45dc6f5e6ece260cdf8664ef9c916bdb3871b1020c685ec SHA512 27c79174fb317ea692be0a1f32fe608dc0947351875e0f0ec0acaaaa613dbac8929188522d41682f591da663a3ab934e5d362b71d9aad763248a6076f2057419
diff --git a/sci-mathematics/relational/metadata.xml b/sci-mathematics/relational/metadata.xml
index e3c73f6f84a6..bbb1da01e845 100644
--- a/sci-mathematics/relational/metadata.xml
+++ b/sci-mathematics/relational/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 32765389f26c..04d7a82852ff 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -2,4 +2,4 @@ DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da
 DIST rw-0.9.tar.gz 340385 BLAKE2B 2eba540146094eea7adb26874ed6f7982e46a863c786bf6f4a55af2d1d3167641e10c324f2b0e0e366bb8f83503b5da5fb02447abf46ae955da78ac8fe6149b6 SHA512 f4f1910506cbdb557ca50bac6f63cfca3271a5df8d13c67d2d9bba79b9cdb03196a679e6091554175decbee0871888de71bed5746662c9a75418f0f5dd9bd609
 EBUILD rw-0.8-r3.ebuild 1112 BLAKE2B 620c546ad9687c361b5092e7e27604332d7b9a119ac29b1ecab7fa2a295cb400ffebb174983e3466522cf2911e2998dbb76ef4619d165a66a643ab3274e76042 SHA512 b9f2e9d3a04ef177f00ec01c061ba8e2177483392ab81eada207f01efc11dec9aa8fcf2c1e599ebc768aa8638e32d1a1f4795f395188484089d875771ea87cfd
 EBUILD rw-0.9.ebuild 810 BLAKE2B 46a02e8c61f514e12f7199b4f9f6e39d66533ad416423edbd1c4b65fe9989f12230b5204865f27825015d700a975ca3394dd7b9795f13060bc5fbf6f4609cfab SHA512 c98ca1e619f5a79423647ed03f8deaeab64f49744a52136ecc1af666a33ab415a6c7a8162157066cc6c47ed9565ed8fb8b52005ec1660b6de3d77bf7a546ff56
-MISC metadata.xml 1128 BLAKE2B 30c263e8a47107c0c5d9a7ee5377a5deaa6260767734361b85eca07f5c1a88d8f2375f2c5d20a28cd1241fcf70a2dfcff16a7fc2886977dfd9f25b5388aa73bb SHA512 34ec83d5cf7d7ed12ef6c58291a6a1b8323d580121e8b489dadc569f09b184e6952cefd934da504542a7a4cbe5c59a781ff703dec21c7ee4010f31153144328c
+MISC metadata.xml 1158 BLAKE2B 91f1631afabd79f4d65e078925c616d9c8b5d71242e1f580dddd4b7d4e8ab0144601d20f844a20ae13e6901acedb58d080bcbe26e9256a8fc83fd62961f8c38d SHA512 899ba937d5b83082bec40e1b9d16afc2762c79066e1ed4e35019f276bdf4af7b3bea9d7a4007e86325d913b311af8a4a81877c5ece9ad1efec58f88782d3df74
diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
index 4a95d1f4b12d..23286160414c 100644
--- a/sci-mathematics/rw/metadata.xml
+++ b/sci-mathematics/rw/metadata.xml
@@ -6,12 +6,12 @@
     <name>Michael Orlitzky</name>
   </maintainer>
 
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
 
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/sympow/Manifest b/sci-mathematics/sympow/Manifest
index b7c06ee170f3..3a76897a1d46 100644
--- a/sci-mathematics/sympow/Manifest
+++ b/sci-mathematics/sympow/Manifest
@@ -2,4 +2,4 @@ AUX sympow-2.023.6-dont-force-O3.patch 2145 BLAKE2B 711d252e625690400ee7215f9f8d
 AUX sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch 2289 BLAKE2B 845125575e201767360ebe38ecbf321a254d01d5eadfeee4d36e7c350e939804d7726299d33de0c564f455b5a559c05542f0da5d54e6bcceb22c02907ec0599a SHA512 a5840039ff0bf6c99cd6ef5609bb46aeff48858a57a253e051a04b180839a0f8b36480fffee10e22ef76672073b08ca58a399cb078a477aa447bbbc0c05dd6cf
 DIST sympow-v2.023.6.tar.gz 68142 BLAKE2B accff25cb1da5b6935a91179fa399d76148709be54bbd434c0dc6143e88e9cd0f0a3cd96c683da3214366a29d6d0dbb7236d2623ef3f9322b6d4d54c6bad9882 SHA512 efe3b09fff0629e136b029ea615aa09ac1a4f225c06636d653ac921c7de01bf75e2b392a138c3c1af92f2b4f889f5949beeeba5b6e5e6b49e02c605bb9c16ceb
 EBUILD sympow-2.023.6.ebuild 1071 BLAKE2B f535e2beb531d6701be16eff04f20cf73d24ca4443f8b8ba3d886e9aed49770a2dc3a2bbbd04a819ac5059cbca1732d32a20d8e0cb027be5130db9cc817591fb SHA512 f3b674275e559814c785abbce90c64a68b558cf8738f8870bf850fd574c05f1c6c2b2e1ca6223d0d657f1c7c06d783b07e114330a450e5bcb8fa849eaba2b850
-MISC metadata.xml 740 BLAKE2B f7bf31eef4f6a42b64105e8ce1725e4792d5303d0adb524a23fb7286430449d15f4f2ecef1afa64bdb0b4e6941928aa75d081b8fdb0c3f7b679afdb7c71c2052 SHA512 45e110738e271c8b71325023e4e371dbaee1d9e7b7318d82dcc72b6e1d094799ab230e0a14d282a3a5badbe53c54f2ca44933c4acad5f1bd24798848ac663318
+MISC metadata.xml 770 BLAKE2B 60943c3b50c5cc10adab3104af25c1850153ec1ea226753b90cf5262efbdeb102b2ac5a475f14390d6f16f736928f2a41a21266a08089c716cafb971d92d5033 SHA512 6af3ea0a90f27b2a25f690a99ac6d5ba3e3eb0c83a6153b58ae91c9e253d5945fbe04ff9750461ac9dcbe8a8486338d85dd5dd87926f3372177b4053f242ee03
diff --git a/sci-mathematics/sympow/metadata.xml b/sci-mathematics/sympow/metadata.xml
index a321d1a8e2a3..48b84c230cb3 100644
--- a/sci-mathematics/sympow/metadata.xml
+++ b/sci-mathematics/sympow/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 74a0e5b53a46..cfa6df1c0c4c 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -4,5 +4,5 @@ DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab8
 DIST TOPCOM-0.17.8.tar.gz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
 DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
 EBUILD topcom-0.17.7.ebuild 1188 BLAKE2B 82bdec14402b06680db2ef7fd070a338a5347f2d814c5308eb4d38e4b4169d78dc04d6706eb41606ef6dcda9f1f25ddee770f1e62c355d9ccd2290b2a66e6fc5 SHA512 b4ee0b662c918abbb555e78ad75ef7187d02683cba5614c1dfc75366d4844bfde39c7018de9e8db718d87cbfd5fcb7ce2dc01aa05d20f03462ae20283d7aa1da
-EBUILD topcom-0.17.8-r1.ebuild 1338 BLAKE2B ceebbca3c12c3f4ca6bea32254b21c6ab828109edd8c333de5cbaa22f40de643d44b9abe1402f92dbf6fa54837313cbdea715c03091f4814ca2b8733edb56dac SHA512 b5596ec29e1cfa621fd704758132ad8064d4aa9a325a80504ec8d6adea729c9bf921e3bb991e000134ae7556cdbcfdc7df2915181e7f5c2fe06f63d44dfd9555
+EBUILD topcom-0.17.8-r1.ebuild 1301 BLAKE2B 459aa85f1cbf0a33ef96c597e9a7e00dfa4d15fc2fc5a5fbd0bc0825d6620fc8d36ff41bc4cfcdae7a477bc52797368efe76b01044396b6b9e51027f0205eba6 SHA512 9d77312e83cbe06a53dc5c8b573a118bc38b49b60515972fd08b88ffc5fbef5987d03bfe4b0c52ba92a66d981121e7f64882f26e4a9e1548d3de853283358938
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
index a3496c642f69..1bf043adc34f 100644
--- a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
+++ b/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matro
 HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
 SRC_URI="
 	http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
-	doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
+	http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
 "
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="doc examples"
+IUSE="examples"
 
 DEPEND="
 	dev-libs/gmp:0
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="app-shells/tcsh"
 
 PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
 HTML_DOCS=( "${DISTDIR}/TOPCOM-manual.html" )
 
 src_prepare () {
@@ -49,7 +50,6 @@ src_install () {
 		docompress -x "/usr/share/doc/${PF}/examples"
 		dodoc -r examples
 	fi
-	use doc && einstalldocs
 
 	mv "${ED}/usr/bin/cube" "${ED}/usr/bin/topcom_cube" || die
 
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 10aab8b5b09a..f3d2c0f3b3b2 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
 EBUILD z3-4.8.10.ebuild 2420 BLAKE2B 39acf50fa71c74efce6841e2a55a20402294882dd02b43496b545fe07a533f2d91253c3cc223db37f5f8b9cc9b681fe60fa07972b18f6742e08694290af6f890 SHA512 ca5881c4a2603a92ef122753fb972eda636f58363f83e7b02fd6a9822538fe1978c1b4a895a91ddc2f1c26fdadc5240b7cbb24e38c3d4dce9585dd0bad500e77
-MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
+MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/metadata.xml b/sci-mathematics/z3/metadata.xml
index 2d840f8f9a83..382a4061fed7 100644
--- a/sci-mathematics/z3/metadata.xml
+++ b/sci-mathematics/z3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 1b058f23ce99..c3a113a9349f 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 7f512994aa29..009d2af3aaf0 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -9,4 +9,4 @@ DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db
 EBUILD boinc-7.14.2.ebuild 5782 BLAKE2B 8ce02661efe8bf9abce4b42e913a954d1eeacddf34ba4460c58a901d9d44e4a33312abf4cf722ed515724b4642637e880d4feec3e407369b669500722c8c0df3 SHA512 d758601742d515275a972e0098bfc145ab86754230d5765e465f0bff83f1b28321c88f61964deeb0d6bf54183be5019f78b80aaf3bf0b63497e78bbd1afafb50
 EBUILD boinc-7.16.14.ebuild 6140 BLAKE2B 84df551574c10578c97d73de22e8a6f1b33b26404a6c80c1cc247c1445624e3b6bee96eeb67f50e1f4300bbfe4becf8418806e5d45e9f31b61be2acf5cb85c92 SHA512 48aa5f6d377562b5268724fd741befcb8971f5e4f675961a5d49830b9e0b7213c283d469cf2070c7104a3bfbc28b0203032c854e7f852586fc97ccae8385c00b
 EBUILD boinc-9999.ebuild 5775 BLAKE2B efcbe217af056adecd6eb57babcddf0d293dd1f4840f9e5ebd5d9a19be1be70062e018970eedcd80dbe1061f12470e7cccbd6a9fc9489a328d23655a428c4b14 SHA512 bad0b54ec38d8a93e5e6335697b432c0343118076036678c6d9fece70d0030030b20f50260b3059406292af69c35fea065f559d1aa221b095976376f74a08b8b
-MISC metadata.xml 982 BLAKE2B 802fec4f5f453f999c555df5fbda885038f196e55f4aa361f7d1882d0f82ff712f23eed02c1f73bbea9346ab17563b89b6f43c9f82ad0b681a2c1ad4df4012ea SHA512 5f54438d25a50feb86aa3e932c12a8d40f7c9470bfad04d7b3b8d13386bc66f95f0ad6d8417a27dd6ad7d19aa6a9f6c96bab8578a006f788388c6194ffea28f3
+MISC metadata.xml 1012 BLAKE2B 899de312089e32121174d89d58a06ce4b8ea8ef284bf77a6ba9fe2da125b84df7106ce40ada7f852fa6d6168cfff21409f298b4a491317c94da7d5ad118b3152 SHA512 0bdea5e3ce06d761ffbbb42698042d7e5789ddb6505724a89d170e915579afe71373a2784a3eba10c095a09fc33097b090e31b3a523f22c209713d471955e1ae
diff --git a/sci-misc/boinc/metadata.xml b/sci-misc/boinc/metadata.xml
index 3d9951823296..f025caaf693b 100644
--- a/sci-misc/boinc/metadata.xml
+++ b/sci-misc/boinc/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sven.eden@prydeworx.com</email>
 		<name>Sven Eden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index f8eaa09e020b..d3b10953e17b 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,8 +1,4 @@
-AUX h5utils-1.12.1-automagic.patch 2226 BLAKE2B 3c4aac896c971870274410f467943fb4068da96d0cee9a356b98a0c94234d7c101d6cf5951b1f1ca998c692a5efceff183f83fb4e19428331e126f37c60cdb7c SHA512 ae8513c6c214fdd17886b65e77c707c08c97b7c72943ea0608cd8f4d269a4f2ef7df579b5746b76b307a77d68b9993860b6cce8cb6793da21123ad9892769999
-AUX h5utils-1.12.1-png15.patch 1420 BLAKE2B 99144644c0ea10ed9be48a40cbe8651eac1620d5b8d42f1cd9c170649e40df38066f585b6f0a59470fe15894a1b0d293ac0f4e98f79510377410c819a2e4b251 SHA512 babc34ab9d585468dabae50d16b7cb59a9326f541c69be5f347189bc6386273a61b9ec3a8a09e00fb2da386ee1fd592f0c85d2c3290134c74d8aa5d1057bd563
 AUX h5utils-1.13.1-automagic.patch 2261 BLAKE2B c9aed879b096c95cf6c17c15d13d6a4a2f0f47afb96e00d382971676cfd34fc53ed802c8070f4d6a19f18165f828746a87efbe845ef89ddeaeee35bcff2eeb87 SHA512 c13621ada5c4f2e2e247bff5d4bd94d19ec888c6fd4b5dde1591ce06a96d346942392c1c3e33bcbd17d30e3d13d4799a7d54a456aa6b52a7123bcad05754d6d9
-DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547
 DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4
-EBUILD h5utils-1.12.1-r2.ebuild 782 BLAKE2B 0f758aad9e1c88aeec5a2c2513abe178d19a99686f76c286f5b1e7577de2d5e92f7b6c760e5f579e78bed508b2793801d575a08752de94c65a48a7e589c86ee2 SHA512 45c664a647f17326dc16cf28cfbfe75ad4685122ad9ccfd1ed952d6e4ed2fefd6a234875ebeccea5d063e1210eeaae5f4e3ddbe5430437ec59dff9f3c72ad29c
 EBUILD h5utils-1.13.1.ebuild 737 BLAKE2B 32ba75cd8d4979f1a00d82f12631e9a26dc851db27964353044152814dadf42eaab8995e9027262b4233a44a374093d9dcb9ab88d553a6473e446c98830ba391 SHA512 898174d2a2b5593d0887ddc16cae82aef6c7a51efcac2b61876c84e4f33aa8226d29e66ec1a4df78334cb3e507152fd0c9aacdc7fda201dd1135d1323825bff3
 MISC metadata.xml 776 BLAKE2B 4e2af756ae62083753d5204c1524d42b3ebc3a01026a6354b583902c2bd730f1c256bb4c1f63fae9e6ce0ee016bc2d6a0d9aede6117dbbca7ddc47577411653a SHA512 12bda28a2fd9022d8472f81afc827b1329ab84598e8a91a7170bfeffb4b55953b37a9504bffc58933c352ebbdd25beb781e570d5f8de9759a290c4476a40afd1
diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
deleted file mode 100644
index 8de8580cfe38..000000000000
--- a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -74,44 +74,23 @@
- 
- ###########################################################################
- 
--# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and
--# thus don't have the superior h4toh5 utility.  Similarly for h5toh4.
--AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5)
--AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4)
--
--AC_ARG_WITH(hdf4,
--	[AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh4 are present])],
--	ok=$withval, ok=maybe)
--if test "x$ok" = xyes; then
--	H4TOH5=""
--	H5TOH4=""
--elif test "x$ok" = xno; then
--	H4TOH5="h4toh5"
--	H5TOH4="h5toh4"
--fi
--
--HDF4=no
--if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then
--	AC_CHECK_LIB(jpeg, jpeg_start_compress,
--		[AC_CHECK_LIB(df, DFSDgetdata,
--			[H4_LIBS="-ldf -ljpeg"; HDF4=yes],
--			[AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
--		[AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
--
--	if test $HDF4 = yes; then
--		if test "x$H4TOH5" != xh4toh5; then
--		   MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
--		   MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
--		fi
--		if test "x$H5TOH4" != xh5toh4; then
--		   MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
--		   # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS"
--		fi
--	fi
--fi
--AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
-+AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
- 
--AC_SUBST(H4_LIBS)
-+AS_IF([test "x$with_hdf" = "xyes"], [
-+  AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
-+  AC_CHECK_LIB(jpeg, jpeg_start_compress,
-+      [AC_CHECK_LIB(df, DFSDgetdata,
-+         [H4_LIBS="-ldf -ljpeg"; HDF4=yes],
-+         [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
-+      [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
-+  if test $HDF4 = yes; then
-+      MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
-+      MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
-+      MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
-+  fi
-+
-+  AC_SUBST(H4_LIBS)
-+])
- 
- ###########################################################################
- 
diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch b/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch
deleted file mode 100644
index e611310145eb..000000000000
--- a/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix build with png-1.5.
-
-https://bugs.gentoo.org/show_bug.cgi?id=378919
-
-Patch stolen from NetBSD
---- writepng.c
-+++ writepng.c
-@@ -240,6 +240,8 @@ void writepng(char *filename,
-      double skewsin = sin(skew), skewcos = cos(skew);
-      REAL minoverlay = 0, maxoverlay = 0;
-      png_byte mask_byte;
-+     png_colorp palette = NULL;
-+
- 
-      /* we must use direct color for translucent overlays */
-      if (overlay)
-@@ -309,7 +311,7 @@ void writepng(char *filename,
-      }
-      /* Set error handling.  REQUIRED if you aren't supplying your own *
-       * error hadnling functions in the png_create_write_struct() call. */
--     if (setjmp(png_ptr->jmpbuf)) {
-+     if (setjmp(png_jmpbuf(png_ptr))) {
- 	  /* If we get here, we had a problem reading the file */
- 	  fclose(fp);
- 	  png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
-@@ -334,8 +336,6 @@ void writepng(char *filename,
- 		       PNG_INTERLACE_NONE,
- 		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-      else {
--	  png_colorp palette;
--
- 	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
- 		       PNG_COLOR_TYPE_PALETTE,
- 		       PNG_INTERLACE_NONE,
-@@ -434,7 +434,7 @@ void writepng(char *filename,
-      png_write_end(png_ptr, info_ptr);
- 
-      /* if you malloced the palette, free it here */
--     free(info_ptr->palette);
-+     free(palette);
- 
-      /* if you allocated any text comments, free them here */
- 
diff --git a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
deleted file mode 100644
index 21e5cd401489..000000000000
--- a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Utilities for visualization and conversion of HDF5 files"
-HOMEPAGE="http://ab-initio.mit.edu/h5utils/"
-SRC_URI="http://ab-initio.mit.edu/h5utils/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="hdf octave"
-
-DEPEND="
-	media-libs/libpng:0=
-	sci-libs/hdf5:0=
-	sys-libs/zlib:0=
-	hdf? (
-		sci-libs/hdf:0=
-		virtual/jpeg:0
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automagic.patch
-	"${FILESDIR}"/${P}-png15.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--without-v5d
-		$(use_with octave)
-		$(use_with hdf)
-		)
-	autotools-utils_src_configure
-}
diff --git a/sci-misc/metadata.xml b/sci-misc/metadata.xml
index 79b7decbf496..7f33ca7ddd01 100644
--- a/sci-misc/metadata.xml
+++ b/sci-misc/metadata.xml
@@ -39,4 +39,3 @@
 		do innych kategorii sci-*.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ab5cc23619be..899a222beaa9 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index a36222cad833..85527b3d1f0a 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -3,4 +3,4 @@ DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6
 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a
 EBUILD bullet-3.07.ebuild 1929 BLAKE2B c0a1c9c8c2f92c7e7493164eca8f4d27d83944eff2bd5dbffe6705b6c6bd69705b275eff2074de76ac6747702e792e6ff1110247d9fb18b4713efc8d07a7b2a4 SHA512 df6585dc25557f961177d89b340eed84c28a23e2bb8174540ad833e06bf1ec735e3135535348c79323eb2fafa504643eea9a8d386b56ede968344092321c7408
 EBUILD bullet-3.08.ebuild 1931 BLAKE2B 975648f912744474bf610c45ab06f786698b677a0633c7b71dfd514e7b0ec8f138048e13a04aa04c0aa0cfa1d21cccd020255aba23aa5b1dfcacb90be5f31b0b SHA512 3176b2563d9ee11de1d75ad0d51427d761df548699f98772c6337440ba3593a0e83fb19428acb9cf55a6160dd2de8491910bb9db04901698775bec24c93dcfa1
-MISC metadata.xml 1119 BLAKE2B 0242add0b8c197137e448ac9a34cf4a1b543decd8e120e6673ac70e32f493b14531fac469dbfc2f44e49659977789fcc5b917a743354fc5cbb2b1d0d3a5780ad SHA512 8831dc59734db66ca01cc2901f1efe360cc8ad9f96cf4712df92d2975797002fbb193fe0f55a79f4ef71affc53be7a084c38f506c65f663759df3d40073ff59e
+MISC metadata.xml 1149 BLAKE2B bb8b9b5036dcb4375898afd34e5d6f65fcb82ee89f658f0e9b33e651499d06841cb663134ff17bcdba95e407499f80fc90146b26aea925a0817e413e5d294df6 SHA512 fbe4aec8e02a532751bc5283c5c7efbb795cffbe5edd2b65e3d8b564c049181534ddf197833f27f92947e99f13889c18f95ed307d9e8aaf569a47f65aa47e7a7
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index f7e1c944a877..e05652c8f5a3 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>rossbridger.cc@gmail.com</email>
     <name>Ross Charles Campbell</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 75e2f4a7c5ab..c6a1a138b9d4 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 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
 EBUILD espresso-9999.ebuild 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
-MISC metadata.xml 476 BLAKE2B f76690b14e947d107cab9c5601cbdc62fc3160e03114ceeca6b45f6d29960691bbdf2d740694198d88cbb31311e5bf0ef0d2b225d276da71030e643188394cf8 SHA512 be0595e319ca81b2293857b6365e8ec9397548a8f30ff5b39f8b267c51dd0a1c08835b2880bdc0714ae7c6264066c88ee9f6ac053c54c4419cdabe5808678184
+MISC metadata.xml 476 BLAKE2B 6c074886e03a8645cb40176234cfff18ec75c0c3faa9c72f2cce228cdcbb113eb870eb0aebde8c0c378aee65e54606addb114361255df082a00e4289cd9f0db1 SHA512 d50a5262cccf20c2949d76fbd7a17166985b018d7686deade58a2d748a91754f5691df28800f7d19f3c3f2a78755d3e90cf93f6273be849deea47ee9d7de0258
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 37615e72f9b7..340dded15d41 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 765deb5cdd3a..e892880122d9 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,4 +1,4 @@
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
-EBUILD fastjet-3.0.6-r1.ebuild 1247 BLAKE2B 9df00a2006025aa82f6294ed5b7e0b921453c7e1c316d947ca40a3ea9e582d79beb9978ac1f82caf5f1514fa24354620de3b2550807491637293f694ff5d2428 SHA512 16ff337d0ef81f76028335f80d31b0eafdfde521dc11527f4e87624ebcda23caa3afc3d1ca49f2a264bbed588499e7cd439436956355bc063a833bc9430276ed
+EBUILD fastjet-3.0.6-r1.ebuild 1304 BLAKE2B 58f7f12b6ad33bd2976ba53623c3ec0575a920381d016173fe39385dcb9403d186d06ffa13f3babc9b7e60c39e99988da11a40e5705108cb32339e880f8f84aa SHA512 0a535d074e76d74759aa1de5fce5635d0ae12b3f88516011ce3a48bed42cb5908cbb639b7a4a69c14b36429ab79398d4d0bd6cbfdba7021518bcf1ee4c59cd82
 MISC metadata.xml 846 BLAKE2B 011aac1c331a66bf050ec977961ea2091f54dad9b15611c02c84210a460b791ff1862a9b210c4acc2ba7e8877e0fb8db735dbdb16d71b2e3aee0b918d6286e4a SHA512 7a785ebae9232cef55c62ada47e4ec87507b6e4c7115f928fa3260474e67f56db336f7698833fe995d4f046b7013c88f62faf71758a881a86c982fe60a92c40a
diff --git a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
index a7fec5728253..b5cfe12ace33 100644
--- a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FORTRAN_NEEDED=plugins
-AUTOTOOLS_AUTORECONF=1
 
-inherit autotools-utils fortran-2 flag-o-matic
+inherit autotools flag-o-matic fortran-2
 
 DESCRIPTION="Fast implementation of several recombination jet algorithms"
 HOMEPAGE="http://www.fastjet.fr/"
@@ -15,40 +14,53 @@ SRC_URI="http://www.fastjet.fr/repo/${P}.tar.gz"
 LICENSE="GPL-2 QPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cgal doc examples +plugins static-libs"
+IUSE="cgal doc examples +plugins"
 
-RDEPEND="cgal? ( sci-mathematics/cgal )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	plugins? ( sci-physics/siscone:0= )"
+RDEPEND="
+	cgal? ( sci-mathematics/cgal:= )
+	plugins? ( sci-physics/siscone:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=( "${FILESDIR}"/${P}-system-siscone.patch )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use cgal && \
-		has_version sci-mathematics/cgal[gmp] && append-ldflags -lgmp
-	local myeconfargs=(
-		$(use_enable cgal)
-		$(use_enable plugins allplugins)
+		has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp
+
+	econf \
+		--disable-static \
+		$(use_enable cgal) \
+		$(use_enable plugins allplugins) \
 		$(use_enable plugins allcxxplugins)
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
+
 	if use doc; then
 		doxygen Doxyfile || die
+		HTML_DOCS=( html/. )
 	fi
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml -r html/*
+	default
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		find example \
-			-name Makefile -or Makefile.in -or Makefile.am -delete
-		doins -r example/*
+		emake -C example maintainer-clean
+		find example -iname 'makefile*' -delete || die
+
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 502bfc8df380..75a0528882ce 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,4 +1,4 @@
 DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
 EBUILD geant-vmc-4.5.3.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
 EBUILD geant-vmc-9999.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
-MISC metadata.xml 1272 BLAKE2B 341ef37e4e2262b40fa6161af831f886a9ef2deb7691555323a8b464f731c526eaa2dc118e050b6fdbcd6f6663830ed238c6dc227ac2013617981d06c56731e5 SHA512 9e871ddf520845ea33f6db1f608a0ddfbf29e8c2c2a51a2cb39a419a8de7c0297747fe2c5a9da335923a7ad01795bd37e930da7b3fa6fd042c97acfb09a10a27
+MISC metadata.xml 1302 BLAKE2B 971638de725dc2b2a55064712dcaaf0419ddb7736f1c101c784090cb702adc4586705c815ced5c9fad5122daa1f1ad6dd7bcd0d534a9c5deca700a203d24c695 SHA512 fb2cd2258b07ff915079917f0fcbf7003bff332775b2371aa096d94732c3bb336a006693e04f5b09971e88f156056a3f6821109fb241e99a437be2817289642e
diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml
index 02aa869b861c..ed5c44ec6a37 100644
--- a/sci-physics/geant-vmc/metadata.xml
+++ b/sci-physics/geant-vmc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-physics/metadata.xml b/sci-physics/metadata.xml
index 2ad6cdefcdbf..0ec986d40678 100644
--- a/sci-physics/metadata.xml
+++ b/sci-physics/metadata.xml
@@ -13,4 +13,3 @@
 				la física.
 		</longdescription>
 </catmetadata>
-
diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest
index 94d675ac7b85..2b9e73a2f611 100644
--- a/sci-physics/qmeq/Manifest
+++ b/sci-physics/qmeq/Manifest
@@ -1,4 +1,4 @@
 DIST qmeq-1.0_p202004.tgz 98025 BLAKE2B fa0ad1bafca28a1c8a16db7b3f9c590bd12340bdd635616592cc75c2a448f719c16b266f960a17ab60de53b40489022ce4ee34548ff44aa997e4dfb6804885d8 SHA512 3001ebc7f8670269ac65bff3f3b96be900946a7991afcc76408e3bbfec5a39d603a67e27f88f48f30d2b576dbf91c0d1898fdbe43cfc194c408f2565abd12806
 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38
 EBUILD qmeq-1.0_p202004.ebuild 1052 BLAKE2B ab84ec9e96afdaf3ef9b94528380699d13367599886f703197ec0784d7fbf2a01e28d039e490db0e72e7502b8fc200fbb4dacbbdd4276f08addc3335e4b631a1 SHA512 adb11d68eab2fb6eb34dc6bb3c6db656a02ceff130aaeeaab9399a555f62a5a19c5802017b3636d5ef5f648185da302b12d6057033332b2cba395ca47c8de222
-MISC metadata.xml 342 BLAKE2B 8bfc619eb36e81fb749932d8478b86b7ebce4e36378b3caf00b7d76b3a0d876debf3b42b1182fc68f5e1122974430a48b6977e69d9699f4eb04efe34b8be1ed1 SHA512 678efb4d82074368f3d07aa488049a79ccaa214c729b8de358e5f4eaeb3f49728a1019bf0ed5fb5bb6859f667b6d5ae2632a60d9af8b6cbd82c63c68b7624660
+MISC metadata.xml 342 BLAKE2B 598599e64ba6198a9a7f1af6a5bfc629baec1b422f7e973bf43d732aff58b4900f3da46aea3a381752bc802591d91370053eafb80edcf383a085f9fec7089d9d SHA512 17b83a039c34360d08ff374fa1f4ddea28ec26f22b9ec912e8d8ca0ec27bc426c6a1475c36f12b9aa05159c68c601876eafc5d379e3c18fa081a59aad5836cc3
diff --git a/sci-physics/qmeq/metadata.xml b/sci-physics/qmeq/metadata.xml
index 02fe3b97774d..4617111b2399 100644
--- a/sci-physics/qmeq/metadata.xml
+++ b/sci-physics/qmeq/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 6f74cef04c88..3bef51fd36f2 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -4,4 +4,4 @@ DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9acc
 EBUILD vgm-4.8.ebuild 1739 BLAKE2B 8ba21d496ed4fbf22f6eb1e80a14b5296322368279183b990f2c646f7885e3193b48d85eaa2e6a7df89859091b6ec65bd0fec88729222040dbec50e75c945fff SHA512 fde3fc17b02aa7a69fd975f0a1791e47ee6e2d4e9ab4b319220714e245656a12615854b7878f67ea0a963896f1f13a22f8dad6cae1b41363687d02d273e1bd31
 EBUILD vgm-4.9.ebuild 2004 BLAKE2B fbc00bf7ae3cca7b8fcd867123ebc2b4d83a0e7b8426a26f4310130763d57c5ceedf4dc93d39834f80935975eb35c8c8021111b6090471ec4576e5b56fd8f2ee SHA512 8561eb343bb08b3d013c36de7295794af5dc3b84899e6a3719d23dc5ac08a20866546652ed4438b8e51474999e82d8daf4c364e991fff7d1638fb23fbe7711a9
 EBUILD vgm-9999.ebuild 1948 BLAKE2B 136002894861b03e058dcde44d56a41ddac671b760bab9f447afd8b79d1643a7691a79fcd5caf6136a7ecbb8e2f1304482ca93bbcbe017457c98ef3def792928 SHA512 3a9b3b52f07a2fd98dcd402a7b7a81190906407dd0ada486959c5e77b6849cfada0eaf01074a6d4aea741ac41063943054c9937a20821c342f5b3082723dcc9e
-MISC metadata.xml 971 BLAKE2B 76e1255814eea59a44c610d3fc9c2a304909610bfd77a847fa5fd05974b9d0d4db1081b5dd32db9e860213204c6272ea14c7dc6dc717472f5de7c5ab42211335 SHA512 30d69c4518b7a69bf458eaa2ba894b3690e2af8bb2b1a63ecb28b7e531c26843f688152f6f102faf2a033ab1424078047cbeb9bad4a0dba5e39c3d2456575259
+MISC metadata.xml 1001 BLAKE2B 1695750887fda44c6f700b6e4b67990b7f24829bcec118beec33f162cdcd9e0c0c5cd0bb2f0bbfd65e3850465f2a388237b9333ab72b3e6959f472c0d18f6196 SHA512 1bd38c24a1eeb401710504144677c85ccb34b68214d94734a666225c3cf9da00ce87753b8d72f8627315f92d7178c538fe7649cdffe7903bd8437e40de6f51c4
diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
index f6fd946df6bf..b5b1b3c1755c 100644
--- a/sci-physics/vgm/metadata.xml
+++ b/sci-physics/vgm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest
index 2eb44bb29054..e88f94c2e0bf 100644
--- a/sci-physics/vmc/Manifest
+++ b/sci-physics/vmc/Manifest
@@ -1,4 +1,4 @@
 DIST vmc-1.0_p3.tar.gz 91476 BLAKE2B 3005e0575a5835b832175e6a272d4e3c328990e28ac998aca60a42c4ddd03faba4d1b761867d8af597ca2468cf3072c49bb007852b5ec892c215df37297656dc SHA512 621c0cb3f2846f9401e3e4fff6fa47ab2afbff7c4dca5c19869abb1806ec19d4a221e5741aad9b3929a4e8b8207ee6008a9bf06ec8bf03ed73771cb29fda1b8d
 EBUILD vmc-1.0_p3.ebuild 1056 BLAKE2B 99f62fedfbe5591b64f68bc603bd6861f5ba1a98a0095e1a7cae576f68bac8979d96ad3f3995b1b697b8dffca3566a9b5d09c3443ccc41d0d7eb5e50372164fd SHA512 c211c30a52a7b301268694dce0c9522aaf8c4a38802f15381789590fd2d5d05ddc02e947ac1e0e196847673f84b82ca3649db31388bbf4cb9ba5cdd48b49f64d
 EBUILD vmc-9999.ebuild 1056 BLAKE2B 99f62fedfbe5591b64f68bc603bd6861f5ba1a98a0095e1a7cae576f68bac8979d96ad3f3995b1b697b8dffca3566a9b5d09c3443ccc41d0d7eb5e50372164fd SHA512 c211c30a52a7b301268694dce0c9522aaf8c4a38802f15381789590fd2d5d05ddc02e947ac1e0e196847673f84b82ca3649db31388bbf4cb9ba5cdd48b49f64d
-MISC metadata.xml 789 BLAKE2B e58e20f9b0e3254b2cc437d069f2d45d6cc02a8827a6015edcec1a47028b0089f5283dde64c62c5ea2e6d811ec12ecbcc9562e3c5605b47fc2d951009c732275 SHA512 850ccb5bb65bad8767756c4869f3b368d4a7664425287a23ae60aebb6d9b22d10586289a838a195bcbc74b15eef923eb10b005a30958d9d6541efc208a517516
+MISC metadata.xml 819 BLAKE2B 89f19dfaca6d6d107a3c54eaa9380a3946ce11eca6e7788836d8111fa124e4a93788a91ac171c8d90d6f0b140ca91bc636b252bd491af41eb2ac122dbfa7d259 SHA512 b8dc7fa7ceab96d26948ca034af239588238841ada26edda008bb97d9f141a669196af0f1b2386ea1cf8a2641e5185a9e1e84d54240b2f2527a4708ddb492dfd
diff --git a/sci-physics/vmc/metadata.xml b/sci-physics/vmc/metadata.xml
index 3cf146831ddf..67e17f46ca3c 100644
--- a/sci-physics/vmc/metadata.xml
+++ b/sci-physics/vmc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
@@ -9,7 +9,7 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 2893033fc2e7..20f98c1e12e5 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
index 5a079ec01ebe..110c4e31a433 100644
--- a/sci-visualization/g3data/Manifest
+++ b/sci-visualization/g3data/Manifest
@@ -1,3 +1,4 @@
+AUX g3data-1.5.4-desktop-QA.patch 234 BLAKE2B fea81baad83edaf330f23b9f4e5cbf1f3ee8e43ad02aa9fa87cb9f41171d658ccf8186ba882944e1849e9d2ef937c148a4d6c6a82639244a28ea00e4dcf7b26b SHA512 f938c8659de9ff868156823c8112ce849e9acfa3c1a253d77a94a366875d275d4632b1b810d3ae15dbb9d83f1dfdae18aa9aa6aae01456107596a6d8ae6e3c1b
 DIST g3data-1.5.4.tar.gz 127973 BLAKE2B 19e6e6aaa7b33a4c4aa061c76aa2465bdb305ac9023e861dc1db42821cdb83c9b8221f6a5552f37731c3fe21fedc4174d46a7d2c01732916534539d382e6fac2 SHA512 b4651eb6ba87ddb745c46520ccf2d7146d179e69a614d7c6c247b82eaf188b30e955d60e7df59419f63a304a5c5215829d3bea3cc233d2729ff599c523d852e2
-EBUILD g3data-1.5.4.ebuild 450 BLAKE2B dc5c3338f353638b120b3d8b347d0fe8bc34f0298df927811edfddd62cb57b5ed238ac9566ee6c4fcad0b69687b98be579a8e011a32dc0d64ccf5ffa27ec53cc SHA512 1762b15dcf6541f8435f213aa8407cd283e789a3f944adeec6d790d69e0343ab2bf9c89682e3a729cf0ad4252d787b4feff08bef3fd9e49036d39d5ee18db596
+EBUILD g3data-1.5.4.ebuild 468 BLAKE2B 1bffc954f10bc7532a09eb27174524aa671381e7c346e984786feaf6c28bb59585e6f9cfb296c89348ebdb89418772b9982a7455b5171f0cc19c695237954c4b SHA512 dfc505d0f0ad7bb553e99dbfee9c60c327820937da7ac4602a63b2c4b525247655496bf66af0e79c5cb07be3e31bb1055414c93f9d324a31a186a5ee329ead2d
 MISC metadata.xml 554 BLAKE2B 9cce0c1c7d04d08ab9aba11a02262e9f436388ec2e864802238c34f33563f8dd3f16a0e5ca89f05f7d0259a12913df3f7c0c81583532757b033da6bdae3c7872 SHA512 eb965b746fa8c3e8b516a11cd32ccadd20e92d3cbda0861b331da03d2172221d3d2f472a1598a1ad61005274d0863ddd0ad4ab90e42e5cececbe8c7148219285
diff --git a/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch
new file mode 100644
index 000000000000..3391659716da
--- /dev/null
+++ b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch
@@ -0,0 +1,11 @@
+--- a/data/g3data.desktop
++++ b/data/g3data.desktop
+@@ -3,7 +3,7 @@
+ Name=g3data
+ Comment=Data Extraction Tool
+ Exec=g3data
+-Icon=g3data-icon.xpm
++Icon=g3data-icon
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Science;Graphics;
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index 2a29bfeff753..aff34e279401 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils eutils
+EAPI=7
 
 DESCRIPTION="Tool for extracting data from graphs"
 HOMEPAGE="https://github.com/pn2200/g3data"
@@ -12,8 +10,9 @@ SRC_URI="https://github.com/downloads/pn2200/g3data/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
diff --git a/sci-visualization/metadata.xml b/sci-visualization/metadata.xml
index 5ac373c53d85..aa4afa65358e 100644
--- a/sci-visualization/metadata.xml
+++ b/sci-visualization/metadata.xml
@@ -22,4 +22,3 @@
 		de visualización.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 481124d38c4a..fd5a7639ebc6 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -4,5 +4,7 @@ AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9
 AUX paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch 1185 BLAKE2B 9573a94af926615a3e6e8e043ea5bbbbf7a7946e33bce30c9fe6475de074142043463c345cf6caed09a60a63c241cac19ca2a54383b41752441b72e0bf5d9f17 SHA512 3552ae966be577840187590c651abc98e41047cbac6b679a17779b83b37c8d1ddd1a36a6ddd6dffb01b66138d2fc8a1bd335afb3ee488d2faa60c7ec1e4323e0
 AUX paraview-5.8.1-find-xmlpatterns.patch 1343 BLAKE2B 6786f27d4a3d5539f0265d1b3426b16063e795fca57d51ac3d232e5258d4d3db1b765379607ba143a422fe8f49b12354edc51fd4f4700a709e2e4aa362e75b8c SHA512 08aa76bdb1251638d52a2871116f507cc492cf03895a1950e05a56048571edb932efebe0f7704d56cd61afadee8f1f9e7003bc02825df83550944f84265b1658
 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248
+DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5
 EBUILD paraview-5.8.1.ebuild 6363 BLAKE2B d1682ea682bfe732b3442cc2495dfb660fc8d5603c50b5c864b7629dd918bb77d9a8dcdd1dd14a7e8bc3047d345f6fe1b71365b735a6e7093c93493dd67c9aeb SHA512 4bef374b2f19f375d21f2d548c941cd14502311e395e9dd80d050068ea25cd3d1d2d41abf4e74bcbbe34ccc55d01b81197ab9b7dc325d185a54ac0e019501fb4
+EBUILD paraview-5.9.0.ebuild 5806 BLAKE2B 1b95eee4c57a64b68a872eea69b49423e854571909466e1f3e3e70b4ff5b8bcc723e08012f91abc31593583667fe1caccdbe52601265a051522ab33a26a3e555 SHA512 3e88a1dc77c0e5f9f7590db6a3a17e2510aa368b4a243e78851d9a44f3a696daab531912d2c70ef0ce25c5384a43929c29c20d3a3b0dae711da66f490163e72a
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild
new file mode 100644
index 000000000000..826f9ea31de5
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.9.0.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
+
+LICENSE="paraview GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
+
+RESTRICT="mirror test"
+
+# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+REQUIRED_USE="
+	python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )
+	webengine? ( qt5 )
+	qt5? ( sqlite )
+	?? ( offscreen qt5 )"
+
+# TODO: Verify that these two are not needed any more for the catalyst
+# module:
+#  - dev-python/PyQt5
+#  - dev-qt/qtgui:5[-gles2-only]
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf:=
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/cgnslib
+	sci-libs/hdf5:=[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	ffmpeg? ( media-video/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mysql-connector-c )
+	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+	!offscreen? ( virtual/opengl )
+	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}]
+			mpi? ( dev-python/mpi4py )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxmlpatterns:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tk? ( dev-lang/tk:0= )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	boost? (
+		$(python_gen_cond_dep '
+			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
+	use python && python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	# Bug #661812
+	mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+	cmake_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		Remoting/Application/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-UBUILD_SHARED_LIBS
+		-DPARAVIEW_BUILD_SHARED_LIBS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+
+		# boost
+		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
+
+		# doc
+		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		# ffmpeg
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+
+		# mpi
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
+
+		# mysql
+		-DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
+
+		# offscreen
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+
+		# plugins
+		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
+
+		# python
+		-DModule_pqPython="$(usex python)"
+		-DPARAVIEW_USE_PYTHON="$(usex python)"
+
+		# qt5
+		-DPARAVIEW_USE_QT="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		-DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
+
+		# sqlite
+		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
+
+		# test
+		-DBUILD_TESTING="$(usex test)"
+
+		# tk
+		-DVTK_USE_TK="$(usex tk)"
+		-DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
+
+		# webengine
+		-DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
+		-DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
+	)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove wrapper binaries and put the actual executable in place
+	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+		if [ -f "${ED}"/usr/lib/"$i" ]; then
+			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+		fi
+	done
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
+
+	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 271b84a5090b..cec84ad42200 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,5 +1,6 @@
+AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b663a7d824dd62608ba8de1678e8b1039a96365db56c329b50e82a73870bd584ae9d847bf1095eaa336438e9e2e923dc76a76 SHA512 bca9e0c2e2d7a3644ded230ef933fbc716a7ca87f62b20a47f930bf8f10a7bb7d8ba36869c4564c6370f566d6f57802b5b387e76b2d44aacd59ad544a8d73775
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6.ebuild 998 BLAKE2B 156205b729053992a6d80118c0bff6f90bbe8bdc2af9cb042fb692cf0ac8f088265331529c22566ffcb964f877c5ac062cf553d258a3ae09bbec8131860d573d SHA512 3ad72225a71f9c3e4c2c5e2f9e409ec0f30ffdc30817b46277590e314a089cfbea95cda0a874eb15baf0ff37942df0e4423c5bfebae2ec804ca455504a76f850
-EBUILD quickplot-1.0.1_rc.ebuild 1057 BLAKE2B 4b496544bf2632ba005ea519071bdc957339d3a8267905e14c025786b15fc5541c81a6d4beec3521c2c0c25890028260f1ac75e62a744b56e3a085a7e30e72cf SHA512 d02264953582e47bfa69dbe439b782bf9c8f70d9d34e8c1acaeb9f1c9ff1d5b7f659408dc4ce9dfb312eb3471c549cd5b3d25f1a299db9d4189e1d717750fba1
-MISC metadata.xml 853 BLAKE2B 96a2968fcecaddf9d143be2c33c4065b6809417d997aa1ca2fda48dbc755178d1c32d47d2e82aa507fbc614c41c9f3395de7310e61abe8bf3a9da70a915547e5 SHA512 8485d4cad78fd9161043a10a764dd494f2b9a5aded964366b3bbe519b423c793cdbabeb29c16e207a7f989339390f03beb57bd918d0df70321b7518f501bfece
+EBUILD quickplot-1.0.1_rc.ebuild 1032 BLAKE2B 825cc7a512a18099c844fd558997d2a1441b9023e1317027c06f02f8671466b09cd0d793c1ad5c6497c3f5ce043ed87f002a2ca854a73c320b80cb96699c0a91 SHA512 7ebd9fea51c58945cd0cc0c7cf06f103dbe1447a5f24412dfb3f96bb4c5f164ff2c9cb3590bc7eebce9eeb51f234ada59a55c20b6f87f5531acda8b001c5909b
+MISC metadata.xml 853 BLAKE2B 8e5a7f7a90c345657b2ae6b9460bad955899cecbdf38c9fa668f1da36a35928268368bb6339e43874733124b553ba6a2a8177a060e4dc5a9204ee3e88b5c74de SHA512 ec630df795d369d1ebbdb5cccf33b55134e6d4400d97caed721b0a02882c5cc321ac21c526b50d1556f9c4e21504a51dfbfdcb2b463ffa09d2f81d0890bf0cd9
diff --git a/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
new file mode 100644
index 000000000000..e88259f0bd24
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -193,7 +193,7 @@
+ endif
+ 
+ # We look at a sndfile symbol when libquickplot runs
+-libquickplot_la_LIBADD = $(sndfile_LIBS)
++libquickplot_la_LIBADD = $(sndfile_LIBS) -lm
+ 
+ if QP_DEBUG
+ libquickplot_la_SOURCES += debug_spew.c
+@@ -336,8 +336,8 @@
+ if HAVE_LOCAL_SCREENSHOTS
+ 
+ install-exec-hook:
+-	mkdir -p $(htmldir)
+-	cp ScreenShot_* _ScreenShot_* $(htmldir)
++	mkdir -p $(DESTDIR)$(htmldir)
++	cp ScreenShot_* _ScreenShot_* $(DESTDIR)$(htmldir)
+ 
+ thumbs.htm: mk_thumbs.htm.bash
+ 	./mk_thumbs.htm.bash > $@
diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml
index f2f18fe4b41c..dfb4c4b2cae6 100644
--- a/sci-visualization/quickplot/metadata.xml
+++ b/sci-visualization/quickplot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 3b95c16cf526..19ccf287fd22 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -1,49 +1,52 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 MY_P=${P/_rc/rc}
 
 DESCRIPTION="A fast interactive 2D plotter"
-HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot"
+HOMEPAGE="
+	http://quickplot.sourceforge.net/
+	https://github.com/lanceman2/quickplot"
 SRC_URI="https://github.com/lanceman2/${PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
 
 RDEPEND="
-	media-libs/libsndfile
+	media-libs/libsndfile:=
 	>=sys-libs/readline-0.6.2:0=
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
+DEPEND="${RDEPEND}"
+BDEPEND="
+	media-gfx/imagemagick[png]
 	virtual/pkgconfig
 	www-client/lynx"
 
-S="${WORKDIR}/${PN}-${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-automake.patch )
 
 src_prepare() {
-	sed -i \
-		-e '/libquickplot_la_LIBADD/s:$: -lm:g' \
-		-e 's/ $(htmldir)/ $(DESTDIR)$(htmldir)/g' \
-		Makefile.am || die
 	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--enable-developer \
-		$(use_enable static-libs static)
+		--disable-static \
+		--enable-developer
 }
 
 src_install() {
 	default
+
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die
+	mv "${ED}"/usr/share/applications/quickplot{*,}.desktop || die
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index 7ff1e7ca7ac8..0c97c6cd3e1e 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,4 +1,4 @@
 DIST spyview-2018.12.24.tgz 15461336 BLAKE2B d88cea7a91b51a695bdc6eb4146b010b196cf24c2f21f16ef47782ed99f6f3b79d2950c35267ea71ac7a14705cb8ed8a4d1e12c03be0d5d8f6ad2f816c197c77 SHA512 b73837491650ccb9cc8f70e5a80700d33c05bbbf6914c778508ba1848db67b28cca0013e142def1f47755fb1370abfd850a55e4b69cca442ba43323029fb6d05
 EBUILD spyview-2018.12.24.ebuild 1496 BLAKE2B 5c9c29fed08be17b03d07fbee9a7dda8557797c5c0f7aa766f0953cca9787fbe7d7cbc986dbcb1030c101c6607bd6574fabf5db43c2d8f5a3bfe81b010b00db6 SHA512 59b782dfaacbac334a38666ca53b2620c2892d9e819d36465943331d572cd9bc88c3bc413aeb1e81c21bc35ba3a81c079ed78dd3eb63a374b63b14979dcae9ff
 EBUILD spyview-9999.ebuild 1497 BLAKE2B 5b05fba80266c0b3f5d780ebe52726123c9906b705c28bf1432e111e9e5fd797cd0675100439115df00c6488896bd3d72441137523e8c102ae7df6e6d68f1148 SHA512 55f530164e34e493a9983aef846a1f44c11fcecb899044bfadd1f75403cb4f4c369ad10cdd395354a8dbf9fbc9b4a65a144e6dbd3d6975ace6afeb7dba34970b
-MISC metadata.xml 346 BLAKE2B 9e4069b3bc88206f33580deed7736d12cb6de27ef3a4fc88d7e4a82758eb4e683a3bb4c4f42954a426a7d9ee3707b4e4a04f1779616393cf53830d15c667bedb SHA512 51dd8374cf0d0a3e18fc12a8a549a553ea9bc0a66b18fdadf39e5f0102e4ac5ddfe403de35372d95d8e2ab06b9b530118b5977ff466952e905fe7facbf23b52f
+MISC metadata.xml 346 BLAKE2B d4d19a2baa2a88f53e3b69af4fa3e5e0b051501da45f59b623a313d071d1800063313bd338cebe0854b2b9df10511886a1b914f5f8141cbedc67a120f3a29ed8 SHA512 bc0174aaac95764c5b32e66310ae588ce5d7e3c7ae7df7702ee9a36b0ee20d1622881eefa265781042806646875bcc021da08014da2a2077ba524fa4aa4012c8
diff --git a/sci-visualization/spyview/metadata.xml b/sci-visualization/spyview/metadata.xml
index bf93f4da9f0e..f3b04df57527 100644
--- a/sci-visualization/spyview/metadata.xml
+++ b/sci-visualization/spyview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 46ce6d0f25cf..e381e594d1f5 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/metadata.xml b/sec-policy/metadata.xml
index 054eb1da3360..b6dab755273c 100644
--- a/sec-policy/metadata.xml
+++ b/sec-policy/metadata.xml
@@ -38,4 +38,3 @@
 		dostępu takie jak np. SELinux.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0b931f0728d7..e36eaff012c2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 011df9073d0f..51d0503e75aa 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,7 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
+DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
 EBUILD acl-2.2.53-r1.ebuild 1388 BLAKE2B bb54a8d13adcdbc8c349501a314f08dcbbcc88ba35c511ed9d000f34495652474fa021e4eecbae1dd77a5b7ac6a04fbdc008aa07207dc79a216ab1518fb240e5 SHA512 ef48ffdf0891f550ae6b86d5b81cc00436ca791fb5583d976e6bad502e6a410498f468526fddf69ff1ec58db3c8c32e1803fe9d2ab2333dc983e6eec70cc0e53
 EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
+EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild
new file mode 100644
index 000000000000..b802802db8a9
--- /dev/null
+++ b/sys-apps/acl/acl-2.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# filter out -flto flags as they break getfacl/setfacl binaries
+	# (bug #667372)
+	filter-flags -flto*
+}
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable static-libs static)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# Tests call native binaries with an LD_PRELOAD wrapper
+	# https://bugs.gentoo.org/772356
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	default
+
+	# move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index d7b03d001324..6c58b0840e1e 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -3,8 +3,10 @@ AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45b
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
 DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
+DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b
 EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa
 EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
 EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
+EBUILD attr-2.5.1.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
new file mode 100644
index 000000000000..7465baca96b8
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize #580792
+	fi
+}
+
+src_configure() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
+	tc-ld-disable-gold #644048
+	append-lfs-flags #760857
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$($(tc-getREADELF) -V "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 4f9d3822fd81..99a501e9fa9c 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,45 +1,30 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
-DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
-DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
-DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
-DIST bat-0.15.4.tar.gz 1021888 BLAKE2B 88ebac97807a81a2734325c4d1d86bd3d340572850ba9ff61fb23c8c6a1f902f95be04388e38c862b48b792df71fce2f97e97ca1041c3664868cd147b3b60a0e SHA512 f4338799047c1169c759a0ddf61481972d53103c5e29374ec2fb7bf814458ff6b724aacd551264ad7fc5e135c1e4484a38e391e046e76e113d404a92442db538
 DIST bat-0.17.1.tar.gz 1302347 BLAKE2B b46fdbf088d9033ae3e34155a774d3436ab0753ccfb5a8128aee2e6d5859a38cca27f5a01fa4146a0e8a17ecd66274a352ccdfb9111b4d169cb48edf5e62f732 SHA512 22222bb19cfa0804165d599e491fe2b1ad9220c5ea79c0cccd3292edca024963d6dc435c576bac19214849a1ffcc2b826488c6995758c4773af64ef945c2e460
-DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
 DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
-DIST bit-set-0.5.1.crate 14125 BLAKE2B 570b78834400bd6d69b2ad4a3a77766941503fceee069f9b616eab00fe7aff40fb25fc44b1f6506997bd655511c3e941afb0f9bf220b414e4e8cb8a6de4e93da SHA512 1b58b9a1e6dc33483f302415e0a77544dab288c819ed5d899f6ef3969750a17227c5aeb1b563aef41e77e06e665cfa995e358a566f5783a2d3af0087d5fc65c1
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
-DIST bit-vec-0.5.1.crate 18765 BLAKE2B 17d08d7813893a02a588197f84d9c5bbce574f77150d018889f690902691d83bd42eed4ca9b968789915d09c84e32147b1631ca6323a9fbfd328f6734196c5dc SHA512 c0d57ec2c07ea660919ab7e17881b544496de0d6ee51cc8008b7da0bb39a2dd1ca680cc07051e007d6efaa91b25335e13a799e11a7a9d9a8084cc47525742cc7
 DIST bit-vec-0.6.2.crate 19630 BLAKE2B 84580a6f99393e507f3fd76b543fd357fc018745e029ebb6b3e71ac3b91b6f760a0474b4d90506e36581ec432ad336be6dc67c07be206917ba2af2322e15b867 SHA512 27cafa198a55853585d76c89490878c43bccdb0fe7dd68b0b4809497be2d497056e7ca6fbef321d71dfbe18272a2571b33d79e2a1458891a420eb7a1910ff383
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
-DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90
 DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clircle-0.1.3.crate 8026 BLAKE2B 33c18a0f9ed204597fad1720b8e361ca4d1beb2dc2db82eb0fe6632ea7fd1213ca55d5fb88f84c099aacb8c14dd2468f07d9563512b8ef4e1c2fe38b6590bc86 SHA512 1a51fd8a35b4179748d654916e0713c31dde2a96627c08a82cadcc05dcf816f8266ccd4fe75af2532dcb92dcd0043942c2150c76264a39760cc2d4e8e5455836
-DIST console-0.11.2.crate 20816 BLAKE2B 4e2c92739fee932e31b28948fa982c1d5feb2c0f590495fcb22ea07d2f88422f475f54b47273bb33556b595e12410ec9592e861e86df9e27466518b15cd4ba26 SHA512 d3f51204654289c59f310730cd1968f6f628cfc7c557f1d645940e78f3831b24b1cc142ac904b5f98ee5dbbbdf51bc91e4914cb203054128e9aeacfb16a1d6e5
 DIST console-0.13.0.crate 22451 BLAKE2B a02b87a53b5f6e3adc88b0369e9e5b786fb60741263d5441752c51164562704d93c8954ecabc2ddf7a999139aa236cfbb0e9b8baa27901837f731591636044a8 SHA512 b687031ebfec1ee705c47e147239b602ffc147eec021ce7c9a4f400db7e3e0b1cf124b4c1664f9ffd1f3719f13a5d65c67bb15146bf42dccc5733373bd10b20c
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
@@ -47,14 +32,10 @@ DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fc
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
-DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
-DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0
 DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
-DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
 DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
@@ -63,181 +44,107 @@ DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170eda
 DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a
 DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
-DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fancy-regex-0.3.3.crate 63336 BLAKE2B 365bcc78e68aa5e5c61f76695c93178892137ebcea24e63c74baad2ed2b9bcf928ec82a1a058aba1eb837cb69805dcb44652ba62e4b0cfcad40bb5eac85e92da SHA512 6451ee6a994f29c1e10341de80e17b9c208b62bf1ebbe3cb90fd850cf03e4b43f3cbf9635357448d5eb29b98291b3aa6c564dedf28299e985a120f1ee7424d5c
 DIST fancy-regex-0.3.5.crate 64304 BLAKE2B b0da0024bd7dba0a574109859984919102d02044ed7c389a3ba1f10aceaf5fc908094e865eee829a1ad65de6f0d9a6d8c1bf59091d35bf8637ef7c55f21bb593 SHA512 0edf91221f7088719607492accb71158d7ff445a2893eec90fef402df30ded30fdf388fe05f0d334577b642d5c5b724bc4a1724359dc4738c9bc34823dbe33f2
-DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b
-DIST git2-0.13.5.crate 166321 BLAKE2B da23d425d90e117c226509ca3d5247db0ec395808e741cdca24506ea2daff95916ba28581055a1b628c12cb92bb72e1baf45f777e2e5c5f191309f90aa8e838a SHA512 a1833899e8391ae81a91786e7e57382efe86c77929ed334c51071c3710c3572912e62b14dd0c64c688b74f0366d074aee705702fac8437019312d663ea238c86
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST hermit-abi-0.1.11.crate 9203 BLAKE2B ff6f5325f9439979db9b592a4465f343399991e7ec6f0f38a5ab8e1621d83b1b8e9f46b3ac4b6a76f22364367546dd6fd8edb87556eca4c690f93ea9d09126e4 SHA512 b44fbe8d7674dc5a610da9d2c58baede69f7b942e08c214131a449483bd41afd0d221be2eed8ce8d71581be066b1717ee6d80876c7621a10391199fbb79ef1fd
 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
 DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
-DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST kstring-0.1.0.crate 12465 BLAKE2B 8c004826a246e982e5e62ac300a056897d07f543d6db710e276cc0a41e62ea3ea64cd6d02cb08693a7c649be8f9eee7bd0f0b7402b8a2cce6f039d7959f06fe8 SHA512 65529fe62435a77504d38e1bbb5be911ff350c445cc568947aa9e1da254655eb0e3b5d38ef351d4b331bb9c97917a6b4b2bdeed153a9cbbd1760c47fd7bd0206
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 DIST libc-0.2.78.crate 508428 BLAKE2B 0bb5545c24cc14f8831edd69785e43f169afdbe0343d480a76d4784b1784a68ab26e7d049418cb09643af61cac47a6d19f7658227e5e23c195389bb915e3651e SHA512 91cb2cd8541082822480e248c373f3320bca99483174aef295b373e6d051190bc5b100350cf680e1d48bda442b3e450741314dd9cf4f8536adbd2c6d7e869cd4
 DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854
-DIST libgit2-sys-0.12.5+1.0.0.crate 1549598 BLAKE2B 62c018ebe05a525cf138f7c412f34d38d273b6a9d38dc18af836fe8ec013a7dfcaa3b11c5b619df33028b784ec393ecd5f1867b585c8acd063771915de77fd64 SHA512 7c6b9aa2294bd9ab752ed44d4735af7741b9d16a2e84736c21543b842b25278909dbb434fe59c83d4e8b705f7d4e21c172fa5359805522a0950d95f5249bdf6e
-DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
-DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
-DIST liquid-0.20.0.crate 53764 BLAKE2B be3f7e48985cfce462cb809a31e24e92e4f7ce69aa1f023debfcf4eef276907a07a6b2d56ff8e95ace041efdd161cf1214d6ada495047bbc45dd517ba6d3d605 SHA512 38c51b04d5d5c25753bb26ada44dd667d3d9fc62bf8100e2ffb88370cbe3863fad8cf9d2543fd7e5fab079afb798bf32ed784e21dafa1c4c7faa5ef8b5b10136
-DIST liquid-core-0.20.0.crate 52462 BLAKE2B f2033aa5e573b764ecf3af3d74348723e4a017a6a3b1fea4261d2d51352f515cf2558db1e62493f7cef8fbb53e6a9ee2c5177b66a079da5d5c026d78295a8d83 SHA512 46bcc6742c871ed69337b6e4c38872ac745ea243195f9bfa9ca412974e03e704dd367bf89f935817d90b0bb2e945f88b4678d5ee6546aae39c56e94d7966c745
-DIST liquid-derive-0.20.0.crate 19587 BLAKE2B 12de1c4c3c599926d7972e60dc40dbb2c1f3dd233413198ab2281f07a9b0337d3ddf3c527aa90162eb33fc07a54ac22f6c25c903cc43764d0e2e457f2ae7f4b2 SHA512 7b9546251eb539aa47e29fdc206c3517c7e989190fe9e45f1b1b216b3a273476034712400cb836a77b355ebaec742184cf8fd425b96636aa3c97193dbed25234
-DIST liquid-lib-0.20.0.crate 37174 BLAKE2B 977faa3272a14260cd9a2f9503c4f0c08a929c2f0f030844927c75cbb9289948d0197459adb5bd73b1196c9ff604c08078b9d5e0a1d2f041304926e75cbf123b SHA512 ca99b787ca70f665d2982dae3425483235aab43c345300d25a3664bf130fd59b364d522488e6460d6e21b97d49a00c64e6ccb551ffcaf58d0aba295c992695e1
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
 DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c
 DIST nix-0.19.0.crate 212652 BLAKE2B a9d3f87fac9591111e1977b9d8cc38d57b560ddd3cf27ce06342c97e10113c8a8e548096d537577267152467883e9ae82618b24b02b2ee355a8689f7147335aa SHA512 db31253c4520448156be3b3e8eb234236a33012b2933710d772f19a14ee83c856f5426057e2f8b87e19fb52d18302d1f8345036ed5dcb7f10e6e961d8e6cf238
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
-DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
-DIST once_cell-1.3.1.crate 23800 BLAKE2B 0dbb0d62ef11454bf8e6e56ab213d3abbe112e1a00d3b82af77e381f01818e7ca293fd2bd95dc12f887d3e5a4425546c40f4c062a349ef99ac3b7c0dc94254c0 SHA512 2e326096216f2b02a922cd2b16e6cd444b9b34ce46d8f77197bcc5e0988f7d4db8f2bf56bdef8daf0a8c9af7e93100f9a46bb434975ea7d4732e3ef5ff561a92
-DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69
 DIST onig-6.1.0.crate 30287 BLAKE2B 1b8b4539432ddf128381212fe9fb705fc2e9ca366b09bc7e2d109486a95e3f51e29c81c879fd45f3986b05a73dee42d8e9cc86f732de0ce73371f123722b8f65 SHA512 8f08ddbb48ea0e75a8dd8d788dfcc6f88773c5cb44a93f42df8b32bcef8279e6d8280314a096950aa5cfeef17c881b509d5136de69fd805604a0ebce69921475
-DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac
 DIST onig_sys-69.5.1.crate 615126 BLAKE2B 964ddfffb677a8dd384a0ba5cf2096fb931eb73f48fd1f1ed6767402dd186343a83d68c06f834bd279e929121ead39a8860644dcffda08c52cf627e84c2682b6 SHA512 d85005612206a383af1a00ea508d076d27e31109659a9741e55deaa8423aa649a90af6cdaead67143943f3f9e1db212d5a88597b600a116067f7a5d855a9a379
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST path_abs-0.5.0.crate 31108 BLAKE2B 5c6d52f445ffa2f1e87e5ee078b79bcc9dc709fa97a4246759ae1ca476842d87943610ea441b504212bbd9d5f23dcf9482d747294722df7dbdcd93ee187fba75 SHA512 978a3a4d769ebf870ac619f10615cc2375f740b6d329f89bf9af26dcf3e361b4779e95483b4ae11d3ab4440dd6392f7cf9fd5a94dcfd434f9a77a8cb880bf2e1
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
-DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a
 DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
-DIST predicates-1.0.4.crate 26239 BLAKE2B 12ca05a2d98f9a4b6ad5442cdd8c5f5bd90a691d5f9c61389d710a7dcc88998b251252b9dcee4f4d8f742e1e4c00b25ceda57e39fc23b431fa7f04b2d7e64bfb SHA512 20f2ae6853e665b262651d4a2bf1fb70f4ee8e536f4fef2de79225fae44a4f32b4680f06f06523675e5af23e301ff58b0cde3e61c0e58c27e412d2eeec96fc35
 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
-DIST proc-macro-hack-0.5.15.crate 12806 BLAKE2B 7c6beaad31a2da23028e0a5517737fd9d8f8c81894c4aa09f15e7d323cfc6ee27ad69c5797843d05b360466e46d2e339b4c0b2a03f6a0d3e3bb2114db8c192b1 SHA512 a49115f1271c6a9df57fbfa647b725f84dcf87c6c3894c35d878a13fa5981c790de16f02823c2ea1b07da5fcde85e9b13398e7317aecb4119b80a4ced5dcf59b
-DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST proc-quote-0.3.2.crate 17160 BLAKE2B 30034393cff6aced46d11b6b651b3fe02e73262c8c52760513a344b5f928e9e5869865681232d87d7fbd37c65359fe4a52b602ae309c75a893f7e586a88bbd12 SHA512 96946b74e3a0ec0572ca178a5651ca7eacc9df55abbf0d7688af6e7d0be2b6738a19d53a2b9368d5d7e50522f5e9551728b82661815c872823b53a9868da70d8
-DIST proc-quote-impl-0.3.2.crate 8920 BLAKE2B 5a7932f3070f07514172c2ad9d5780c3c74d551cff7a8bbe5bba9557d1ee0a2d6d8d392ffdf3240248f3ed911fafcdea8dd2565d0f5f321f2c1b56f0154b458a SHA512 59c5205ee9bda70a5a449fb2deebae27805ccfa3300ad59053acd26f8f39a5615bebe3140aaeb625c1c84747e8cdca67178b8bbc9152a3347240e0b335779feb
-DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-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_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
-DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
-DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
-DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
-DIST serde_json-1.0.51.crate 72691 BLAKE2B 7f17bd47618009a3e6f7fcabe623c476bd40a0fc92be0c736f5b367914f14a923a5ff8cc6183081e6b0957ef3c61451fbc22c15bc6b6f9de63454c2f4aecfb45 SHA512 0e9e1be1e1c7ef6af2b2b374df6680ccdce149ee7c0641cb518c678b06d72a335321dd857bb1dc64561c3cb090cc1388c7a016fe4cda66da1f1a19e338c1a470
 DIST serde_json-1.0.58.crate 114933 BLAKE2B eda53fe830e539b760ad968191077aab05512f33d613796856cd3df7cd7ce21e9b704f30a6748e9622bd47e9c0c69310edc12bbb1dbe90547eb3b7b97b93a475 SHA512 377a067b1aad851fe7056c080b7a3d07cf6d2c75122766f25b2bf30d6023e70a6f7b5211200019983bfb1f0ac9cf09da4a8c74aef45c819a785818a6ce33ca0a
-DIST serde_yaml-0.8.12.crate 35916 BLAKE2B 6a2cee8a83219dd804d1b8bdeeb8c7b14b6989a849c6707a56fd14c65099a4f67b0a9c0e5f85a6cc97d90abada3d736a18a022a8522aab6c7e6987f5accb43ec SHA512 53cc9327e2baed3583497922dd20870c570de2be20074a537d703d17d7038e2826bf4b5ebf6daa8f451204d07453dff05e931a66670b19910b2d04385229fb1f
 DIST serde_yaml-0.8.14.crate 37928 BLAKE2B 58b5fe3678e022667696811fb0979081e50727f6efb288f97510eecacf86ad0ad1c6ae98a3916df574cfa73c9825414623f0a75e623e149048adf94369560c08 SHA512 de4b18f1e9bda434b93b32c8b3c8135ec3163ebf6f734920dc88c8736e40c05dd75f314d730c5c0c92eb259b85c5fa9263f5d0f3e78a7e214a9258e28c5ec06a
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
-DIST smallvec-1.3.0.crate 23930 BLAKE2B 3eac4d03ad4a6e111587bce612bcc540a619fc2f68a384a2e0aa0b52e8034a8738f6b56607c3457cb34593a701da2f3b3ff8afb523af050c38b732299fbea224 SHA512 3cb400f5f2e2a8619d6adb6b65e5b8515acddfb686c2545f66432ef279bca147cf4c55b09893a82bcb7f9f91c7c2b7099fa707da8939b1ac4a6b92326e7bb806
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST syn-1.0.42.crate 225244 BLAKE2B 814e7f8fcef54ffb87710fb271bf711b7d463d75e10cd0a686097d73d49767fbfdf3d84a09bc64b520d243db1b0be367ceb5900812a987fba48abec597ac629d SHA512 c758c4175fc9e48418224a02142f045eb0fcbb9ca6732a9ac36c55f075ec70268cc729f6b8002238d6c79a8ac4c3a9ef8c3ff69f78db9434fc9866152a2932eb
-DIST syntect-4.2.0.crate 750573 BLAKE2B a526ab895803a9779c08021cef315cf457aea88193cdfb5f5cf8eef45a02651e3847467e7e51d0b50d098098d8ee59e82079b8488589ef80a7f999b9d28498d7 SHA512 d2dcf5444b739b6f4466aa40c0f061573d89d639ab1c759a4bd0e1d5eaab706794e8f510e70dd146e4212617fa16c0cc1745e98323e65baa699b79ef37040df6
 DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST terminal_size-0.1.12.crate 8111 BLAKE2B a5b43c7fe8a3e13e49d7c9e787fc712f51313ea09648e474ac6eee4c0eceda346f5bd85ad69bac1eda67d6713d6d34230398a7b6b008cc3b58ee6d4d6b096bcd SHA512 6f0060529cda5a891a861566d22b0c3a17a702fccd8191387ec7e463bcd05cc88a80d889eb146ef704b6bc50c7b136d340b44897a300d6ef6269dd4b83837b5d
 DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
-DIST termios-0.3.2.crate 16545 BLAKE2B a42ef0fdfe6d55784f628d6f39813a5fa02578c09c699cbad104d34e494e8b58d10ef411ac53cd1cd00203437063a0e1871dfa4dbed1e02c8b07379affa8258d SHA512 d672f0bf950da913ac94f94b01d1dc15f29064fc9ae8a0ccf09d399bfabc61c6906f255f60dfbd6b83a8493ac23f9f7c82a5852f854c498eddab1a04a48a4907
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-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.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
-DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wild-2.0.3.crate 7059 BLAKE2B b4dfafc1a83bb6ae06f6f76a24cb7f2fd8b583ff6225b3ee05b6011ceb407bef48e62ec3b8562936cac884a1d7363751e75a5b754d6d7da1441877ce755f59d4 SHA512 e477b3701027ef6099c08f1b085b3e012debbf6688b249511108246792ba76b5462f581fdf2a6298a6fbcf4d34beccd14619031983ee0a83871d150ea434cd5c
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST xml-rs-0.8.2.crate 52353 BLAKE2B e5f041831d7e15459704e031b22b018c82aa214c0d3041639aceca53661536d71f33f2ae254a6376f683fafea351e34e274190a8abfa57cde778acd35ca305b9 SHA512 b98dcb7e9293b372ab61739ea5c82782f4b8dab87c9f3de24fb2c98b87399c6990d77cff87921c4c5b3e072b79a3c5ebd9088d0476d19956b4771e879f575dd3
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
-DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
-EBUILD bat-0.15.4.ebuild 3975 BLAKE2B 1f53e7236725360091e06e9568a0b00f4e5193c7842ad4fe1929feb0021cd1c3f24dada83504b97d149517687802b33feb8760159a8f9f7f93127ffed69452e7 SHA512 301acd3940aad422b93aaae0cc7f6695cc7e6fcf3d93b70a40141c7e4e4000ca0dc40ff8e23dde4424b2f08b79e841e66e728677bf62fadbd5962685b38b30a7
 EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
-EBUILD bat-0.17.1.ebuild 3817 BLAKE2B 2b07c6231ec1cf4380875f5b8384fc357fc24be96d3f2545d60f5ba189b2414e35a666d70173f10fb8e88b760b8482a0f9e5134a806a853dd2571fa571c2612f SHA512 444fe3586c0f429fb26c87cb495c1dcde535f52257363fcfc0081277d06fecbe3fb7ce998b20eca164758aa73f30f29f9081f34e621e5049c50d80ff23677477
-MISC metadata.xml 818 BLAKE2B a006c6a94fd0c73b87ec6395c42e29e0b6986224606ee98d1eb058b22bb7530048035fbad80f58696d651e4192bcd0c841610011390a7e043a425520b92a9df8 SHA512 0f74f00f4e135e8daaa1744b3d3c7b05d1d5b8c1bc1a6bdeb72d9a7375c5ec2a15be332489ba8d9f7bb24d3d2c695ed592407b672990e58a762bf754780a100e
+MISC metadata.xml 848 BLAKE2B 35d6b7cb58f7d60d0eabad8a89903ede1284020715b5cd4afe741ca1e1c380c66e206cfb585a83ece10cf50d654098808bcb192d8a83fac142c90ed24e91d8b7 SHA512 181456aed79f1ecaa7d68cebf7763509ab1aee0decd73d976316720dd75b8a416ffbd42375f7c63309bb84a21aac8fa1c4ea4d0d2257b3edac847e681df7afeb
diff --git a/sys-apps/bat/bat-0.15.4.ebuild b/sys-apps/bat/bat-0.15.4.ebuild
deleted file mode 100644
index 864ac40b0ab1..000000000000
--- a/sys-apps/bat/bat-0.15.4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler32-1.0.4
-aho-corasick-0.7.10
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-anymap-0.12.1
-arrayref-0.3.6
-arrayvec-0.5.1
-assert_cmd-1.0.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-base64-0.12.1
-bincode-1.2.1
-bit-set-0.5.1
-bit-vec-0.5.1
-bitflags-1.2.1
-blake2b_simd-0.5.10
-block-buffer-0.7.3
-block-padding-0.1.5
-bstr-0.2.12
-byte-tools-0.3.1
-byteorder-1.3.4
-cc-1.0.52
-cfg-if-0.1.10
-chrono-0.4.11
-clap-2.33.0
-console-0.11.2
-constant_time_eq-0.1.5
-content_inspector-0.2.4
-crc32fast-1.2.0
-crossbeam-utils-0.7.2
-difference-2.0.0
-digest-0.8.1
-dirs-2.0.2
-dirs-sys-0.3.4
-doc-comment-0.3.3
-dtoa-0.4.5
-either-1.5.3
-encode_unicode-0.3.6
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding-index-tradchinese-1.20141219.5
-encoding_index_tests-0.1.4
-error-chain-0.12.2
-fake-simd-0.1.2
-fancy-regex-0.3.3
-flate2-1.0.14
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-generic-array-0.12.3
-getrandom-0.1.14
-git2-0.13.5
-glob-0.3.0
-globset-0.4.5
-hermit-abi-0.1.11
-idna-0.1.5
-idna-0.2.0
-indexmap-1.3.2
-itertools-0.8.2
-itoa-0.4.5
-jobserver-0.1.21
-kernel32-sys-0.2.2
-kstring-0.1.0
-lazy_static-1.4.0
-lazycell-1.2.1
-libc-0.2.69
-libgit2-sys-0.12.5+1.0.0
-libz-sys-1.0.25
-line-wrap-0.1.1
-linked-hash-map-0.5.2
-liquid-0.20.0
-liquid-core-0.20.0
-liquid-derive-0.20.0
-liquid-lib-0.20.0
-log-0.4.8
-maplit-1.0.2
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.3.6
-num-integer-0.1.42
-num-traits-0.2.11
-once_cell-1.3.1
-onig-6.0.0
-onig_sys-69.5.0
-opaque-debug-0.2.3
-path_abs-0.5.0
-percent-encoding-1.0.1
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-pkg-config-0.3.17
-plist-1.0.0
-predicates-1.0.4
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro-hack-0.5.15
-proc-macro2-1.0.10
-proc-quote-0.3.2
-proc-quote-impl-0.3.2
-quote-1.0.3
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.4
-regex-1.3.7
-regex-syntax-0.6.17
-remove_dir_all-0.5.2
-rust-argon2-0.7.0
-ryu-1.0.3
-safemem-0.3.3
-same-file-1.0.6
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.110
-serde_derive-1.0.110
-serde_json-1.0.51
-serde_yaml-0.8.12
-sha-1-0.8.2
-shell-words-1.0.0
-smallvec-1.3.0
-std_prelude-0.2.12
-strsim-0.8.0
-syn-1.0.17
-syntect-4.2.0
-tempdir-0.3.7
-term_size-0.3.1
-terminal_size-0.1.12
-termios-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.43
-treeline-0.1.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.12
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-url-1.7.2
-url-2.1.1
-vcpkg-0.2.8
-vec_map-0.8.1
-version_check-0.9.1
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.3
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.2
-yaml-rust-0.4.3
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-libs/libgit2-0.99:=
-	dev-libs/oniguruma:=
-	sys-libs/zlib:=
-"
-
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-}
diff --git a/sys-apps/bat/bat-0.17.1.ebuild b/sys-apps/bat/bat-0.17.1.ebuild
deleted file mode 100644
index 0b9d7841bdae..000000000000
--- a/sys-apps/bat/bat-0.17.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler-0.2.3
-aho-corasick-0.7.13
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-arrayref-0.3.6
-arrayvec-0.5.1
-assert_cmd-1.0.1
-atty-0.2.14
-autocfg-1.0.1
-base64-0.12.3
-bincode-1.3.1
-bitflags-1.2.1
-bit-set-0.5.2
-bit-vec-0.6.2
-blake2b_simd-0.5.10
-block-buffer-0.7.3
-block-padding-0.1.5
-bstr-0.2.13
-byteorder-1.3.4
-byte-tools-0.3.1
-cc-1.0.60
-cfg-if-0.1.10
-chrono-0.4.19
-clap-2.33.3
-clircle-0.1.3
-console-0.13.0
-constant_time_eq-0.1.5
-content_inspector-0.2.4
-crc32fast-1.2.0
-crossbeam-utils-0.7.2
-difference-2.0.0
-digest-0.8.1
-dirs-3.0.1
-dirs-sys-0.3.5
-doc-comment-0.3.3
-dtoa-0.4.6
-encode_unicode-0.3.6
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding_index_tests-0.1.4
-encoding-index-tradchinese-1.20141219.5
-error-chain-0.12.4
-fake-simd-0.1.2
-fancy-regex-0.3.5
-flate2-1.0.18
-float-cmp-0.8.0
-fnv-1.0.7
-fuchsia-cprng-0.1.1
-generic-array-0.12.3
-getrandom-0.1.15
-git2-0.13.12
-glob-0.3.0
-globset-0.4.6
-hashbrown-0.9.1
-hermit-abi-0.1.16
-idna-0.2.0
-indexmap-1.6.0
-itoa-0.4.6
-jobserver-0.1.21
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.78
-libgit2-sys-0.12.14+1.1.0
-libz-sys-1.1.2
-line-wrap-0.1.1
-linked-hash-map-0.5.3
-log-0.4.11
-maplit-1.0.2
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.4.2
-nix-0.19.0
-normalize-line-endings-0.3.0
-num-integer-0.1.43
-num-traits-0.2.12
-onig-6.1.0
-onig_sys-69.5.1
-opaque-debug-0.2.3
-path_abs-0.5.0
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-pkg-config-0.3.18
-plist-1.0.0
-predicates-1.0.5
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-1.0.24
-quote-1.0.7
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.57
-redox_users-0.3.5
-regex-1.3.9
-regex-syntax-0.6.18
-remove_dir_all-0.5.3
-rust-argon2-0.8.2
-ryu-1.0.5
-safemem-0.3.3
-same-file-1.0.6
-semver-0.11.0
-semver-parser-0.10.0
-serde-1.0.117
-serde_derive-1.0.117
-serde_json-1.0.58
-serde_yaml-0.8.14
-sha-1-0.8.2
-shell-words-1.0.0
-std_prelude-0.2.12
-strsim-0.8.0
-syn-1.0.42
-syntect-4.4.0
-tempdir-0.3.7
-terminal_size-0.1.13
-term_size-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-0.3.4
-treeline-0.1.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.13
-unicode-width-0.1.8
-unicode-xid-0.2.1
-url-2.1.1
-vcpkg-0.2.10
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.4
-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
-xml-rs-0.8.3
-yaml-rust-0.4.4
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-0.99:=
-	dev-libs/oniguruma:=
-	sys-libs/zlib:=
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-
-	insinto /usr/share/zsh/site-functions/
-	newins target/release/build/bat-*/out/assets/completions/bat.zsh _${PN}
-}
diff --git a/sys-apps/bat/metadata.xml b/sys-apps/bat/metadata.xml
index 9bbc255a76f4..a14943551b91 100644
--- a/sys-apps/bat/metadata.xml
+++ b/sys-apps/bat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>toshokan@shojigate.net</email>
 		<name>J. Pz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index bace85276cba..37da7d898d79 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,3 @@
 DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
 EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
-MISC metadata.xml 245 BLAKE2B 9d48c927e5844df237d0d7c23fe22d6b1896b0369c41a9c7d62c6ff09ccd0937de415f743270a074b9d389a6ea0c10933b9701a264a2ce155899ec2535f6bf0c SHA512 77077cbe810752d5fb24ae88ff5d9a00a175d7d043e95268d69b1f461546d9bf9053273e5d5bc3ba9dc80641b0ef908f8d189d7f51602f0c6786d04c8c991bfa
+MISC metadata.xml 245 BLAKE2B cfb1c75ae97a85e469dede0ae542d146c40033c7220b383abaf7ffbb38325cb5132c98f4d920f7f33833b98ec5a1b51ca1b7574df675830a9e65468f01063e08 SHA512 d4a6599b57a5234bf178a387868bc06977b83bd56117edb8ff6dc4f0e3c8739cbb9acd9aa6ab7c053e6d84a2e14de474b0e9e76cf75938d492ccd7b87c314d9f
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index b9de019cb593..94d309808674 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 09b1f48230b8..f4a7ccb17927 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -2,4 +2,4 @@ DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91a
 DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
 EBUILD bleachbit-4.0.0.ebuild 1480 BLAKE2B ef7caa1f0f56776df47511c805009d53d8078c6567ea2aa2aa21fae2ead5766ba93208e0eda3cc4a5e4a868e1f1d0d76109d8a440df1a952fdca45e149bad795 SHA512 da9661c2ed01f32902cc2524959540d3abfdda8c82240f7436681c288992deabbc85cf5fb2e67a3c1568567accbd489a466b8e27adb35ff39f22790ff174e175
 EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
-MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
+MISC metadata.xml 556 BLAKE2B 3d2e34427ddd2e3ba55b12f247feac62e522fea8f952e69af43eeeed04a246d851b04fdfa16e169f5804eff20938bc545f0040b9133a1622cb4fe5b764b549f1 SHA512 1e58cf757be397a69a57e4ede9feaed4ba495a9c094fbe690062ea5623cb955434e9926d12ddf5f0f651a40a0a2775d168e3f8343b64bac4efb514e403a3fe77
diff --git a/sys-apps/bleachbit/metadata.xml b/sys-apps/bleachbit/metadata.xml
index b025f5f8290e..12a50970946c 100644
--- a/sys-apps/bleachbit/metadata.xml
+++ b/sys-apps/bleachbit/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>christian.tietz@mailbox.org</email>
 		<name>Christian Tietz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/crazydiskinfo/Manifest b/sys-apps/crazydiskinfo/Manifest
index a3c7ca0e0526..30f40516c2c8 100644
--- a/sys-apps/crazydiskinfo/Manifest
+++ b/sys-apps/crazydiskinfo/Manifest
@@ -1,3 +1,3 @@
 DIST crazydiskinfo-1.1.0.tar.gz 5372 BLAKE2B f00c989b33cff303066b76d8da0bdb8ca12d94598a26f6990706637c0f430d18c3ae9344fcd7ad3e5ff301dac9651c29002548190d06dd16ea99132dbd94c50c SHA512 57e9ea4f8abec18355806da35225132f06a5562b1717e6dca1515043b2a0f2a51b47a2bcda31f1e64d6b2e9c8c6de5445d835f59eed79fd0911e06fd32296803
 EBUILD crazydiskinfo-1.1.0.ebuild 686 BLAKE2B 421eb26810c0e9baa2d8cf0c0e94bafe39b96ff8cbb0b7cc103a527ccb118be9a8d92b9e9f66087b8b7cbac7bcf93acdc310a66ccd82e423ea3b1174ea561948 SHA512 e9dfe1ff7a0d69acf6c600eaa46a28950959954ce51983ffd7893a30cc22554899216ed6be06d42239921f45a6eb85109e2af617a498fcc6cea7afb2d54962ff
-MISC metadata.xml 337 BLAKE2B f419cc18fce7059f2d34451cda69ba7679511de53c756544a4180a66882503f7b2b7686e4ef14c533fcb5481bb774e0b7f4ac50849b11bf8bd5bfaa121caa3fd SHA512 ab01ee7de306762e116bc7ca43f4b229b0b1ab28e608a4cb7a1b866f167025aebb9455e90ebce01120bbd6254eb372d3e0df2a783c4378da488a769ed1a64650
+MISC metadata.xml 337 BLAKE2B 5fe18f1ee9170a67a9a9ca06bfe616e201cc206df3ff4db58427188ad6316364fa62552ff84a5002624847f674eb8ad171be0d4b0512593350425737af6774b8 SHA512 d2db95f5443566d3c216dced563587dddaa72d23befc9cc982539b9872c89d0e57a2a633b7a69e7ea0817941736c3c99b0ee61f9b69144043681dbe7a190d9cb
diff --git a/sys-apps/crazydiskinfo/metadata.xml b/sys-apps/crazydiskinfo/metadata.xml
index cb75991bdac4..7a56ad9d9b41 100644
--- a/sys-apps/crazydiskinfo/metadata.xml
+++ b/sys-apps/crazydiskinfo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 492e270805fe..76db4278e6d3 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,9 +1,3 @@
-DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
-DIST dcfldd-1.5.tar.gz 81661 BLAKE2B c1037c8948bfa78704279b438f4604c8b6383d3840947c0e8e0a3ea52ba2b96fe0958b38e700675be97ec2bcee4fb6290f94a847476e3536fdd2790891d02cc9 SHA512 4c91211bf10fec409abe930fe67ae73ebfa67b5a29263cc2b5de7bc42df51f4c7d0647261e31bdad96b591f947c2f0e951004befe296fc37957ce5b56756debd
-DIST dcfldd-1.6.tar.gz 81795 BLAKE2B e4e09fd2f3720bb4a1ecff3427bbdda832d2c82cbc1dd95ef884fa3b10a02707d6eaa6302c86518d124eaff5669ecd4d5bbe8b207bb1bb70f7fdb1c88ee8ecae SHA512 893bb4920d86749fd01e877239ddbb3e85e73f6b305c8cd6e9a38135fec1f8c14dc748f5761a3630e83299769284c55a80afc93f3c9981cd8b4e19d4506a8c08
 DIST dcfldd-1.7.tar.gz 81892 BLAKE2B bf34dcd3e0430421c36dbd9d6b3f5ea2d4a4cb41151db8f14deb48d4169d1008fee2776f2ae821ea40ca7743f2354db62520bc919206e02a6e525ed6a38a0fec SHA512 e1dc4773438914a8102a692c7b7cbf486a9b03111820facb0134b4b9d058751695d1a7c64481852026412aacbb0fa04a18f833ff77ca30f154d5067a07057f31
-EBUILD dcfldd-1.3.4.1-r1.ebuild 388 BLAKE2B 25a759b95addbfee2fa6417aac011fa5359a04b9ffb1b6ff71722f1aa9019d823d9b0a8036d3f7ea3e45863c9e4f43b0acec4ad6e9eef894be434104c5138cab SHA512 28a07c933cce37cdedabefcfc14acac0d07518de54821959b065d007a1b591f69cd58484eeabc9d760812b9a8592061945b50943f0602671551a8bc5a89e36d9
-EBUILD dcfldd-1.5.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
-EBUILD dcfldd-1.6.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
-EBUILD dcfldd-1.7.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
+EBUILD dcfldd-1.7.ebuild 502 BLAKE2B 3e16b7123b2fd9c9d7b5e9fb187aef04226cf8f13521864b38615b5a8ab0f4f2dc6098b21b669cfe93d9288ff8efa5442cd9dad7910d83e11e28e54ef86deb2e SHA512 65a14bc441a7c9b0841ab895ebad8773bda6ad67a11966b9031c173e664f0ff45fbb4e59e73b9f2e96df822afba40a34acbe5cdf3b30ea639c1c3a1111c9dc8f
 MISC metadata.xml 325 BLAKE2B eb9d69a33645c35442d8ffebb66aca8daf8615766a63b3cd9130dd4c9eac6442aa56a0ea8e6eb92962b1a28d852acf1b9c987bb048f1c2531b59071b79b4c45a SHA512 a79a7a8ba4a77b73460156c8a241535d95eff0865d6f1288af6ac85be23574cc8e9339e7b28b6c48eee8c323eae6d16a18a9e683a08afb41692f97fcf099fccb
diff --git a/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
deleted file mode 100644
index 22ae54876b88..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-My_PV=$(ver_rs 3 '-')
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dcfldd/${PN}-${My_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-S="${WORKDIR}/${PN}-${My_PV}"
diff --git a/sys-apps/dcfldd/dcfldd-1.5.ebuild b/sys-apps/dcfldd/dcfldd-1.5.ebuild
deleted file mode 100644
index 83b8567efac5..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.5.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
-inherit autotools
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	ChangeLog
-	NEWS
-	README.md
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/dcfldd/dcfldd-1.6.ebuild b/sys-apps/dcfldd/dcfldd-1.6.ebuild
deleted file mode 100644
index 83b8567efac5..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.6.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
-inherit autotools
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	ChangeLog
-	NEWS
-	README.md
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/dcfldd/dcfldd-1.7.ebuild b/sys-apps/dcfldd/dcfldd-1.7.ebuild
index 83b8567efac5..cec2cbeafba6 100644
--- a/sys-apps/dcfldd/dcfldd-1.7.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 DOCS=(
 	AUTHORS
 	CONTRIBUTING.md
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 959cabcc3cef..62622bb95b9d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,4 +3,4 @@ DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
 EBUILD debianutils-4.11.2.ebuild 934 BLAKE2B 48f99a9d5c1ad125ef6cb120f39f2a3ea97f0a4238b4e153ba906436786280cb6c9a3e0bc28d9a1ecbb5594b741897d4e49097ac84ab011f0c209a1450875eae SHA512 6c286ff2e91e212e2aae39a389608f27c18074f4a8edde2127e7aca181aeed85e858fa65501b362c6a7702804abe672fb0e0736b3f0c3d3358896286069a5b82
-MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
+MISC metadata.xml 445 BLAKE2B 82971a9985ae487b4333505a1279ed6a642f7eb18880a693c6b0470a270c90b0508d7fcab5039a219a11bcb8a2d05ee3855c7f5bd93ac1172ebe7ed8d7542973 SHA512 1382c27ab6b70c086132eee442ac149ab41fa73bc33958fc93bcf1598c34c43658138c5f476c1291428c71983dee148abdcd630aad128d9b7ccc7c2309870db6
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 1c1ee347ef1a..34dccd26a929 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-		<flag name='installkernel'>
+		<flag name="installkernel">
 			Install /sbin/installkernel script (for Linux).
 			installkernel is required whenever a kernel will be installed via make install
 		</flag>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 74521306c071..c938cdbcea2a 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,3 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.7-r1.ebuild 1171 BLAKE2B c42cca73af228b8d347c5ac5d0eec096624fd1a9b137faf87b3a28dfa3cb8b79b71f368441a2d7892c1f12bbec010bb2c068accfbe046e74eeacdcf00bf16471 SHA512 89e2bb0af464bf31d0f2288e86deaa6d68a359e78d381486873e81ce15bdbbb6e9b87c7406fce6e94ee9ffbcd82b34ebc2bec9e54c6e40cf60c6f366abc2472a
+EBUILD diffutils-3.7-r1.ebuild 1178 BLAKE2B 6c06908ec0f5b348ec7efe85cd83dfe5a009f75ed77828b51b7d14a78d43b3e0f78a1765cb8621e8fa6b2c310a89be5990cb0166ee28a781802b0effe6accfbe SHA512 f08a62f5df058a94f53380d99d81f71f3c4f9970ec656cd0c8cb729c3032c145eb63ffc6784ba792902bb83537cb598d11c8b5248f77355c80fc2f36f4a2ea7e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 79eb1d1d0f51..7a31a9305625 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/"
 SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
+	https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index d0fd1d969a3c..bee2bf154f03 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -3,4 +3,4 @@ AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de8
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.4-r2.ebuild 1302 BLAKE2B 780501a45604b7a4201662fa4e4ba0474ac9c4677c86ccca0bcc064e3c39697214d59f743c4aa01d145319e2149f852ef8ab69b26263f53f6f9d56ed060c7a43 SHA512 4ff2b59b7ac8d6d5f55ad0740ef964cfc8fba7b8ce13a044aabd8efd0cbd4ba41077f8ead34a2e2ea11b2e45957d461980509ea281cad66c6882e16a4a78b433
-MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
+MISC metadata.xml 896 BLAKE2B ab386faa21da0035defd393633c51a45b41b99fdabf5c948dd5a203152debda9f88665cec10585e8eed46d6d4815e8468816b3b63604806780790b5f022c6a48 SHA512 e6cdbf551d972f77475b8a1a6623891c5c85aff7f8a599cc51719a51fbe0944e17fbe56d5a12c3fe37df1c3f29ea26867e22f122b6692c8f95d768ec99bba7c7
diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml
index 4ae294d3be22..e6abab92628d 100644
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -22,4 +22,3 @@ same interval).
 		<remote-id type="github">dagwieers/dstat</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index b17677b3448d..ed97ca7fa64d 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -3,4 +3,4 @@ DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66
 EBUILD ethq-0.5.0.ebuild 1134 BLAKE2B 28624d6aa8f9a8d19fbbbb08bdbea6436846f078ed761226b5a6b2bb8da977f524454c2128f7bc43619c52edbe26b787eea0b9ff5e2ca6bd98bc4bdde8d2963f SHA512 680a0d4041432264376a487034a5623713c24fd16c173b0dd58c91d22faf9c9c2f2f4cd7d1bbebf6fac389e5b9c17980d8339e9196954894ecd0a3825d1b3bd2
 EBUILD ethq-0.6.1.ebuild 1108 BLAKE2B b5a7190f422bc8550c3f28ea2cd0670500d0cae8825bb87b6f605b6684cd6c569156f93339972b430dc709a98792dae1ffa9e4ab16a646553f3b701b815f60c9 SHA512 f994c61f5ca592f26f5fa68c3fbe117429b55e470109cc5807ed656f256c69b4561decd5bd1b10b68c3bf645fee1c954d35f4a2e913cf4c97b89f165940ce304
 EBUILD ethq-9999.ebuild 1048 BLAKE2B a3128ed96ad614d415fd69d8b24a56991571d1f4c814e4e05eed7f7e7af69b71777ec8a56e5bf66cd4e507d96bbfd7caece1c1a8cdb88b56b225da0c57bb4d42 SHA512 04f9165e4af08224f2b6d9c3e04b68cf41b474e3bd74556ebf84c22e8928d5c53f882c589d0750d0567539177665543501974d8d6c1425a8a9de3c835e5ee34c
-MISC metadata.xml 627 BLAKE2B b215c0a1e6902bcab4f169740279965bb2b3b26e3bbd79e73aca34449942c6f49a5142758e1b726415f5094f737b86bc4f3625c94a2c575e14f00fbb140e7958 SHA512 c7d1186a0f354e9fa9d44569f7ab22e596d3b5dd996677d080da838f0f0274396fecf208751d7ff3e03123202391a4f1deed6c893310a64575d3a570094bc655
+MISC metadata.xml 657 BLAKE2B 42d6c240e11da7194084ce27240208ed46bd4b2352dc63851a2c2e2c51c2bc90f596766e985bcc395a10477c19b641c9a298417cbf36511efa14a31342792e01 SHA512 be3db53a8ff0ac2bc3c54febec669d34b949363c1e5087cd414c521395629123df47ba832c397c5d7f79586f5f75a79b26b03917445d4ee82f72cb47bd07cc7b
diff --git a/sys-apps/ethq/metadata.xml b/sys-apps/ethq/metadata.xml
index 61adaf0931ba..74a04a1fad38 100644
--- a/sys-apps/ethq/metadata.xml
+++ b/sys-apps/ethq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index f8aecfabd020..bdb3d51ee924 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,3 @@
-DIST fakechroot-2.19.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
-EBUILD fakechroot-2.19.ebuild 560 BLAKE2B b7ca8b03cf134d813ccf36ab31e8b183a8f02c2393abdd66081a82ebbefa2f2f3abd48c2d16a56a0f76b311226790cc9b494b535d64c390bb3a41a3f66078493 SHA512 c6159d2ebd987f2b58b392786d8cf438689d1170160ec3062baae1b4adb5228c3b0426cfbdce938846c5b0025eb61130b21d91577208b5dc22bde31b1583396c
 EBUILD fakechroot-2.20.1.ebuild 566 BLAKE2B ca5f78363d136c7ba8b369d28e9b27a2a9c3736b6da6aabf902622873a065845c254fb9a31eeb4604a855386fc5b55f7e131d6b0ccf22b7123fc2bd58e8ff757 SHA512 ce35cd103fdc77360c694ec0ff710a0cc7f03dabf10ad7e0a947f35c2a5c45ec56fe705459147778e4dd7bae0d515d497e9752384ec03a955b51899ad65b4d90
 MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
deleted file mode 100644
index 93702f3f87d1..000000000000
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
-HOMEPAGE="https://github.com/dex4er/fakechroot"
-SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-
-RESTRICT="test"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1a14d81a25e8..fbef851dae0d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -12,6 +12,6 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
 EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
 EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
-EBUILD file-5.39-r4.ebuild 3458 BLAKE2B 42284b9cca829b4602bc383761feffe15f2eb1e6c3d6732edf6e71937702b9de0546baefe47e318a29b0c3e1535a3c8fc1b325ca73e9a2c80ef0d4f4bca1268d SHA512 cd689bf33cdcaef5f23b239103c6ba5ba46a0194007ef8f81c616fcd185c2c0d79ba70dfa250df6aba39373cc346e5fb77c8c6e17e264df4f2b379b311b9164d
+EBUILD file-5.39-r4.ebuild 3451 BLAKE2B 5671ec10d0d409f2843f39c7113c2f5c4022e55ea1bebd49f61084e0a8ffbd99bca9a8fdc6f37b34f3d6544ab724f9c94fdd992e0ca7d0fdf41dd92fb48c856b SHA512 56f4099f550aa4bacca098b29bc9adf8961ea771822446dbf63eaaf915e8be01aca662d00f09c44a36d8fe9882da661fc49c3267167e4771689efb4e323f0962
 EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
index 70dea08b9d9f..331509b85e3a 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 7b7fa9af63bd..423216fb56d2 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -2,4 +2,4 @@ AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a
 EBUILD firejail-lts-0.9.56.2-r2.ebuild 1417 BLAKE2B 9d14448692c72fa0482c8adc6edb428d2460b535117873940c323ba52b6b0eecf7942a2a98ea9a965a80491944cc0c7e82bfcf7226d3ac5e21b5f94b4cc46f9f SHA512 09efd926c9ee37d54a04f9c5d122e6d87ff7a3af0cae390ad5dd01e4c40b22dbe61f9741437f6f3ff610465215646ef58d361fc42efc528404b44fa9173e3dd9
-MISC metadata.xml 1515 BLAKE2B 39fc57111fed8406749144c4404040e22dae6fa9b0fdfb1f74840a38f7abd39d7a222cab48d9d2658361195b378290f917f9f500704520a304d6d44810e0ce61 SHA512 d3af3ada41c5a1ebeee7cd48e876c1c06b8bd4ba114cef0f681d8d3a91a280a38cb9edb4a88129df58fad69fb6c3f1de97f94fe9ab24efabcc18c78f41c89599
+MISC metadata.xml 1545 BLAKE2B 3cb87f899738e96a6cd8257eba2c477f67b6f24d9b2188777fb1ec3263a47740188e07875c5285a320bce9a8bc5f30e6d13ab3d575daa5f90918b2583fa88d87 SHA512 a3b184163d6c0b787f301bc0280b10ff755a701882b9fdf4a219816a384e1f87179ecf59fd79280f577bb15226d044648bea35db358af60435f02b9bf72a41c3
diff --git a/sys-apps/firejail-lts/metadata.xml b/sys-apps/firejail-lts/metadata.xml
index d0dfd5bb16ba..f0ba9df866cb 100644
--- a/sys-apps/firejail-lts/metadata.xml
+++ b/sys-apps/firejail-lts/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5d4012139f70..8ad17fba60b3 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,4 @@
 DIST firejail-0.9.64.4.tar.xz 431116 BLAKE2B 1e64af1459cdbd6e753299796b2521efdc1fe364a66b8f0f40df1adabec32d0673cb9805a2ab385b96b64aca16e038e615ab1e4dc4df1dbcaa0b5b24f54c89d0 SHA512 580a074cb40e7559f6d532418b5e05e042c30306e8507d32ac3c71a51dec6648035ad810d253da02caaa4adc41f773dfdab55528618f5ca30ff30d4e7bbd12c9
 EBUILD firejail-0.9.64.4.ebuild 2514 BLAKE2B 5169243203fa8e77926aaccce08a9ad82277f8e9d272c99a87e885ab4a6bc251ec30b2c2e9f754ba35744f2933d0845a636ca15132c529a97f304a1be1828963 SHA512 da06a3199f3714b07bb99831d59e796b940d600334b9d8df8d4f2c887cdbd9205a9933e028353b41ae58afa3ecedd3f39c65c11ed01d2b344b4adb9cbc321082
 EBUILD firejail-9999.ebuild 2304 BLAKE2B 88ce4ea8d871af749c4f19ede13aa7d35b9037451b3e782b1a9558bf2a00274470b99d8e3d315f4a91af7084aabd5133562827e347852364ef0e0bbf07932f9e SHA512 c3c3c7d8e953630bb9f0765506780512e324ca8cf467a7a23568e2de3544c223bbe5e027b6fac32bb3be2716e64beb5084ca8959bd235b7638114e9e15be8814
-MISC metadata.xml 1783 BLAKE2B 747901d18b87b2ad96fed6307a7eb63594b817378e25b84eb178055c1eae50e8c5213091d42d5a8917136276d43e4020c39ee7c892e8a00dff7e75e6b6b79928 SHA512 be513de56d8eaa38373c66eecf4d5bbf53bc7b0ab04c2a2fad73c58c271db6fb4a53c79568e82a39c99697d5f9c58b63222e7f3f0986ab74b43e66a9734d6e90
+MISC metadata.xml 1813 BLAKE2B 464550e81aed6c70688f7f146e0200fd351ae2a6163a41df836ece5e0dd54e0710ff3baefed509ac73ac81f37783acfe9baf3026f31ec4f668b2fb0f87e326d3 SHA512 23eee71dbf308db9f76cb42622442f9749b353577fb624bceb12c9e377fdcc0c45efe52c1c028d439835185502acf9822ffb53ee514ce5113710d036994ff6da
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index b007062e7a91..8a213d3a83ed 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/frandom/Manifest b/sys-apps/frandom/Manifest
index 6700bc20e8f8..7c33e2cdb86e 100644
--- a/sys-apps/frandom/Manifest
+++ b/sys-apps/frandom/Manifest
@@ -1,3 +1,3 @@
 DIST frandom-1.1.tar.gz 8146 BLAKE2B a18a97c4650376cb2e3c6abfa8b6043c69426f83c9607c36614007426b7734f89a537206e7656b3fd901d69111683592e4511d0c94c7b111c8e77e6fbe660323 SHA512 f64bd1bc1482d223f84f344554b04a4a413be32cf6c348e006b831e68eea0165f1231e194536bb6867450dfc901e80e765e71ba6369209ce579597ad1cdfdeaf
 EBUILD frandom-1.1-r1.ebuild 666 BLAKE2B a8cca754a2eb1443b5bbe1126543a15db028ddc7b83ecb1aeeaa8b948d2007c83ff56b4b119a87d26ab7a2666add988cd2184afce79706d5fc3693a2b4b328f2 SHA512 ce20ec724ccc68f9967abc0dd5072d743e8d8c355138a8333e4f23bdf975f0980bdd5ff234b441c2c953001d1f0e0c3c960eb11a72169e831006153ef9d2a51a
-MISC metadata.xml 334 BLAKE2B b93b75e593a2b4c531b5c9210b752fdb20cc7e0394d4a683d267937a96ad92c9fe07a11143cadb37613d5aacc1240d40761acdb849bb9163bf618b8b48435b4d SHA512 94b5fa15925b1a85b0fe1d52f35323acd3a900666283a346283a7745f88b35380e3424668f7651f78e4039de2f00a4affcb461b3a9a72ba671bff8b1634bd4f3
+MISC metadata.xml 334 BLAKE2B 4234148b21ab18cf7577cfde5d92691d0f6dc6e0257aaf8145e9c2b048decf7afadee4154bddc61fbfb081141a91aac830f213ae3075d6c2424bb742f6f9c85e SHA512 1c879766e65b498a70e9f71e11d52250a3c6fc2d008310764555f274f764cd1a43910f5678801941a5bf397d79167ef4d05bd71d20ae9043a0595605333b17ba
diff --git a/sys-apps/frandom/metadata.xml b/sys-apps/frandom/metadata.xml
index 423ed6917d9c..d1e0554a5471 100644
--- a/sys-apps/frandom/metadata.xml
+++ b/sys-apps/frandom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 53c1621087a4..5cbae73fae2e 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,5 +1,3 @@
-DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
 DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
-EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
 EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-20.05.00.ebuild b/sys-apps/fwts/fwts-20.05.00.ebuild
deleted file mode 100644
index 55aaf54db461..000000000000
--- a/sys-apps/fwts/fwts-20.05.00.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 autotools
-
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/json-c-0.10-r1
-	dev-libs/libpcre
-	sys-apps/dmidecode
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4cd23be54944..4af3b35c9b39 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-disk-utility-3.36.3.tar.xz 1373276 BLAKE2B 445aeaf68aa6b56dd6731e69e8fecdd1ca0385ba481bd0c8cd2ed411f7b117261f7acf47651f5354d0832141c479a6cd1b0727257d6f533159dd2d437edc59db SHA512 160283e1b0864e08ba6feb9368791e4cd3b287dc628553a69a1c276fa66252b37b1d906451b4342d953504a4669056aed0ebb3233ff61cbb761e612258ca078f
+DIST gnome-disk-utility-3.38.2.tar.xz 1375128 BLAKE2B e437eead1273bb2931462ac6c7a7dfea75c603c5325af003d403f4b5130b28e95496724c1939e5dd2e3c8b517eb0d3cdf51952299451546b41f9f5eaddcf9e63 SHA512 3afc0a40e82f0ab3608302af3d83acb15a758581122188125f9572e95a802359d1af0a1e99fb0cd8fb612413aac09e3d33404d08a2d5e189b79d4f284c92cb82
 EBUILD gnome-disk-utility-3.36.3.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e
+EBUILD gnome-disk-utility-3.38.2.ebuild 1386 BLAKE2B def2335d9c7ff5ed1b174e4322a6ec81873e207c72f675e90599c50fd586d23c13f8f4385b21c3cc7e421446667c6c1c6af035d136806b17ac57b346452ee639 SHA512 f003a4b2a35324a78046b3eb3ef83e032434c775a258d8f17c8bd99446c6742ad86d5e7e95c3501db27b4f3fad8c109bfc70d6268a3832d6477009d64e65918a
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
new file mode 100644
index 000000000000..fd8e8d3461c8
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
@@ -0,0 +1,62 @@
+# 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="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index dc7abe67c0e7..90565c371b40 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,9 +1,6 @@
 AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
-DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
-DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
-EBUILD gptfdisk-1.0.4.ebuild 1244 BLAKE2B 5e1ed279d0996ac37fb669a8025334a7d2168cb2956604eed0212fa6031ff97654b402d4c88434b90b9718b8993ac289c4889216a8b2dddf8097a372f6684b9d SHA512 74bbf5c72a625e7b8bc2cb6c219712bbde4e58679d3c1c0e56c2dde58a556ec25e7fe9c59c87042f419094db81b33fa85647a75246fcd398a91d3ae758ff2cba
-EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
+DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 EBUILD gptfdisk-1.0.6-r1.ebuild 1308 BLAKE2B 494064be22ec49402cd5a884ea03a4d130fa6a66d565efa4187dde06e5cbf511961dea8f3abbad31b741e94453956c3d5b2531a404ec0cefa51e8b30cc35d1d2 SHA512 ddfb19466f938f5f6a58f19dccfd80de3dbdbe2e488e63e6338df4272f585be567a7a74c9d8a32dd83ba34822ac558166ece8b8ff029a8bfa3d74a673e773581
-EBUILD gptfdisk-1.0.6.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
+EBUILD gptfdisk-1.0.7.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
deleted file mode 100644
index f8935b6212f9..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/gptfdisk/gptfdisk-1.0.5.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild
deleted file mode 100644
index 253b6a84a848..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.5.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 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/gptfdisk/gptfdisk-1.0.6.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
index 253377c376a9..253377c376a9 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 6cc8dda53963..916213ecbeca 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1483 BLAKE2B 10a274f820dc338f8058adf3c9ad76fa23faca41b695ce6749b16e0460e3bb97c071075662f5e4335030755c150f1420f96fb44383d475ac6ace57e5681ea75c SHA512 9c090efff4b3e1c81ab5867f04c20f66bf3b4d6a0bb1a7e2fc6be9623ba6fb5728e955218144ea18b06cd7ac3315bd3bd89b8a99b32b17fcd1eba0a59ba37b28
-EBUILD grep-3.5.ebuild 1485 BLAKE2B 00235fd67f3f37ad0def3d57378e2ef802c9eafa45ae442b088b7447f010f6832b7c0c4a433d88ea69d4bb04972bacce7cc116cdfef31c8c603be90d1b4a1b0d SHA512 93d066fd92d75de0829ac686424914a662e902b4ddd5a9c17b30be5209ff357edce19976df95086f571ab8f5e2eddccb235bda2588df24983005f3bcfe96b855
-EBUILD grep-3.6.ebuild 1463 BLAKE2B a6076ab22306df9fe8dbc3fe7410c6ebe4b058de8b2385c6dac4a80975c9dce16894f899bcf71d299188b083056a822660aa37a38c53dde80b5ec3e2fe876df8 SHA512 43c891dd21e1a1cd4f5e3786c0aace2591c84f2e34a86091034bc4ba4940bdc07ff0fdaef9ce310bf8e29897ad2208c38e3012c640e3f2470963645092ea92b9
+EBUILD grep-3.4.ebuild 1496 BLAKE2B 7abaf611e588c187df417df78d2b3e91d38455ee29ded09af8d7f7b5855748d9acf2b97a74a0c870e7716ed2d6ff7dc1745ea4f893cff21c75e646071e3cec73 SHA512 5dcf6ce5e50442ec490cab1f5e8ac5f68541e3b1609468c48680cffd8ba51f4bb245944763d40424e7e416b8e06f0ee0514c1c2d4510b79a2904023e464746c1
+EBUILD grep-3.5.ebuild 1498 BLAKE2B 7f7c000f1dea830b2fa231561af26bdd5e9d7f0e4ae76733620c1640f89ab72d91f47c7651350f4a78a85f7082ac0a3b19aaeb5b8255fc7652202f77587bb02c SHA512 717583a2987ee45708fe302502e1cee271ac17ad1e337c5b8928304af4392d4f673ed950aaccef19588088e85f45e2ed28922608f1c956d77a048bd0d2691dfd
+EBUILD grep-3.6.ebuild 1476 BLAKE2B f44b88f10ebb7ab4e5722fbf8e1b35d3951c450076d635cbfe9c6f028673a3553fbe0537208f79a69f152dc4cef2db7f5a1af75898b85df7786baea9c20a14a6 SHA512 841b71ddf3c9b8bffd504047082b10086b9dd6a2fff80983f2034daf36f7cabd80234106aa96cfff6fb03eb54a622fc6fa960fdb06e9e550d11f6bb025721c43
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 89e057e1a1c1..a33a051b2f6b 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index 1ddad9147b1f..c66425de5967 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 549cc796ef0d..576125c1c746 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.6.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 85b7bc9fc672..c19ee177d995 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.4.ebuild 2576 BLAKE2B 3016dae2d330453774d6c9ffa56b8824d5bd11b0f9766c85679d394f2a44d6278d9a565e9cfdeee5f2ea6626ae41be11fc6f07c545ee802fae9298b113da495b SHA512 e1d78778c61e1510335564ea673c455520679b6d1a1ebff21d1e1444d0631c14daaf20893d1efd269ce6ebc76829226ebba1275bfd6f72d1d44e6b05730f7b03
+EBUILD groff-1.22.4.ebuild 2561 BLAKE2B 6a525c7d600dcffa276b15a6755ad0072c68434ddb5cff628ab7f7f6c97469fa500792915f959cb96ae53ec87b90b4f3b235b4d7e7c036cdbb8ebe08a5f2c2cb SHA512 192fe962721594878bd767eb97edaf6ba05748ec0bba7bcfaedd9249ec76612a48ac217e12d609be60b5a2c3936546d86f295c281c281da8ec721006278832d0
 MISC metadata.xml 365 BLAKE2B 0cf4dd1abdfcb39494154dc55c2e86b43d23638caa9644b6002e2e7919b05503feda2e7ab85c0a620a8a29b7c2fef7d699795c7d3185fe24afb6c863af80336b SHA512 4fcb10e056f0c0933c7877635fe42b565f330e0b99946855f223fb6624bc3a756a94d9170bfef89ae6eddee4f751a6c0234f3a126f0a11e456c70fd931927544
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 375b70f0e78c..9b743edaf3b4 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ MY_P="${P/_/.}"
 DESCRIPTION="Text formatter used for man pages"
 HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
 SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
-	mirror://gnu-alpha/groff/${MY_P}.tar.gz"
+	https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,14 +21,15 @@ IUSE="examples uchardet X"
 RDEPEND="
 	uchardet? ( app-i18n/uchardet )
 	X? (
+		x11-libs/libICE
+		x11-libs/libSM
 		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
 		x11-libs/libXaw
-		x11-libs/libSM
-		x11-libs/libICE
+		x11-libs/libXmu
+		x11-libs/libXt
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
 	sys-apps/texinfo"
 
@@ -70,16 +71,13 @@ src_configure() {
 }
 
 src_compile() {
-	if tc-is-cross-compiler ; then
-		local CROSS_ARGS=(
-			GROFFBIN="$(type -P groff)"
-			TROFFBIN="$(type -P troff)"
-			GROFF_BIN_DIR=
-			GROFF_BIN_PATH=
-		)
-	else
-		unset CROSS_ARGS
-	fi
+	local -a CROSS_ARGS
+	tc-is-cross-compiler && CROSS_ARGS+=(
+		GROFFBIN="$(type -P groff)"
+		TROFFBIN="$(type -P troff)"
+		GROFF_BIN_DIR=
+		GROFF_BIN_PATH=
+	)
 
 	emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
 }
@@ -93,11 +91,11 @@ src_install() {
 
 	if ! use examples ; then
 		# The pdf files might not be generated if ghostscript is unavailable. #602020
-		local pdf="${ED%/}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
 		if [[ -e ${pdf} ]] ; then
 			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-			mv "${pdf}" "${ED%/}"/usr/share/doc/${PF}/pdf/ || die
+			mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
 		fi
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}/usr/share/doc/${PF}/examples"
 	fi
 }
diff --git a/sys-apps/hd-idle/Manifest b/sys-apps/hd-idle/Manifest
index 46f89cd74544..a8b760d20a48 100644
--- a/sys-apps/hd-idle/Manifest
+++ b/sys-apps/hd-idle/Manifest
@@ -3,4 +3,4 @@ AUX hd-idle-init 296 BLAKE2B e4d2b4a7f7ff816198c7e9b1b5289ec3abb1a928d4bfe50175a
 AUX hd-idle-service 349 BLAKE2B 1bf8fe9941f3ab861263047742f9275c7481a4198f9b20261b98b0e343ee95d725affb61b931e5a54a74e5494e5b47d0c7ac4221e1ebbc599b19f05fa0d4dfa3 SHA512 a819a6150b7a83928112f9088effc99c2ed1c91fd792ed5d79f4da3c85a2660a4a756f247ab286cb2fa30b34d4901ef395c73c73ea933cc24765050f9f26602c
 DIST hd-idle-1.05.tgz 17951 BLAKE2B f99dd25d41f2ac4391025ff652827a8687db19df2dafe0f07eeeea700eaf0d67a255ee67017123510a3b89f3aba2f50de7204923d9ab85e80138f657f5e120d3 SHA512 8636d8bf2bce40f380afdea859aef7d142258071c62f87884a9af55c7c84310d89de712f56dff2bd825f0c7d79b04356df92e3012d8f683d8c41ebb23cd3920b
 EBUILD hd-idle-1.05-r1.ebuild 616 BLAKE2B 4d613a67dd4a3addd5bda95bd914bff5b206c6faf0c2d94da67405fe1c8aea477ab09435a89c8ed14597fe703933ff2d0a49fdd3ddd294e1ef7e0aaa7883e0f7 SHA512 08a4da1b4409dd71707366db50d9e1daf84c5c58bc60472c596c9842197145b5d1ba27150b5287db0c73cc2771ab601949932d8211c803e4ec9707d70d606f56
-MISC metadata.xml 470 BLAKE2B 4f25dbde41f691405a8290671c9c39baf0cf2fb08cbc5b1fb35307fb37f8dbfeb80a8cdffb8ab3fd58857eae738ba8af3465f1db2789d9f7899fd13a6d467303 SHA512 0f6483a0a6f8a89d8de21ae2506854221b7e5077a69ec70238451efbb2c15690c46296d493f0da5e348b1f7eaa75711bbef669d6d913b7f15e231d159d081945
+MISC metadata.xml 500 BLAKE2B 104263d2511c92dc5ddc157c4fb564a1acceaed8130144282812b70c71b54e49e2e5616ca47cd1b5013e3cf4af8d28c6ca370271da4e1197573ba78c9772517a SHA512 827fa6e525b29f6466fd2dba2af16cf682fdd8dfed407d4fd540331b689a39ad95e5f97218c91b501060cac93f80a28d844138f314b9bf8f19ba8bfc7de7076a
diff --git a/sys-apps/hd-idle/metadata.xml b/sys-apps/hd-idle/metadata.xml
index 4687c9a5147b..8e980e4351e3 100644
--- a/sys-apps/hd-idle/metadata.xml
+++ b/sys-apps/hd-idle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-apps/highway/Manifest b/sys-apps/highway/Manifest
index f9d5b1aa7de0..ef4d2002edef 100644
--- a/sys-apps/highway/Manifest
+++ b/sys-apps/highway/Manifest
@@ -1,3 +1,3 @@
 DIST highway-1.1.0.tar.gz 319516 BLAKE2B 40df25eb139433f759ca98724d18bea8c324138fd26c24dce6899c899bd86d5cd86d1a16cd5631c0986d76f324d53e9b4e96ebf3582557f1e6699a9faa448a3a SHA512 c30c90f5b601a775e64a684037d668acc6c1a8b6e64f7aa1204c184978c49079a3cd07683ebeeab674a9b64932223da0c067fdb184b5918bf88eca7e113c05fd
 EBUILD highway-1.1.0.ebuild 412 BLAKE2B 00a9b6bf64c6ca449923234feb9d32d947f8a0066b27597dd40f182f068aa5f9f36007e189c9246135a80755c5a51b4f223bbdd9d4c0e94b5c9bbf5d4c3d47e1 SHA512 fc3e4372483dc908b77d8d11b61a3afdcb6cc93e75f3f4ffbc832ff734422bfa6a806a3b114ef8d41dbfacb5dedce8c973fd2fb6438f7bb6c016058bc2dd275b
-MISC metadata.xml 556 BLAKE2B c8fc33fabb8391adc3670b91150c1890a528f632ae90d9022098cae518c77321a0418059c21acd21f9616cc8c8ef2df7398aa404f3144e08aab64513363e26ed SHA512 5f2801d3119a4be7e8723f2e2fd2779a74980aceb716a26cf2e026fe82920353b985c2ace87696d931be244456789a19b4cd216cd583afcf3d6cbc3c3ba91080
+MISC metadata.xml 586 BLAKE2B e5c3da8b3d48193b7518945c95afe62b446f5aca864a2ad793231708726506b7a3122ab186480658f18c522fb5b276754c045eafea8fea9e734f06f971f234da SHA512 b303ef0f903a9aac18779d4dd87ad16362c168e37c725d36921b32a436465dfcc3f836528eca0dfed89ff5566ae27818c83447ed55cc850700d10e598bc0cb3f
diff --git a/sys-apps/highway/metadata.xml b/sys-apps/highway/metadata.xml
index fe4d17c2ec3b..d29708820b97 100644
--- a/sys-apps/highway/metadata.xml
+++ b/sys-apps/highway/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>alicef@gentoo.org</email>
 		<name>Ferrazzi Alice</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 249232a2a200..b720b3a1f917 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -5,4 +5,4 @@ DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf
 EBUILD kmscon-8-r1.ebuild 2978 BLAKE2B 778c7acd8c5d2fec8d9f3adea8e47f9f1d8b27688f18dcfcf92fca9e0bba15ab32aedff2000907ed88e12f9412ea54fa6d813c29e92fc181ff5222ec8c588fe8 SHA512 e762b0372dd21c6afd8b7a46572d5f005eeb8f18ccaa50f5dd05f9f0fd63bb12d448b12fa44c398ccd50f6a7e2ea4430cfc92322aaaf816643f5058e449fb173
 EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
 EBUILD kmscon-8_p20180906.ebuild 2856 BLAKE2B a794c5360d3214ec1b6928525b5333e721c313d73bcb5df7be4bbc2c48624a2dc52971bb5af43db18ccd50b38cbbc070340491681108d1f9fd63311874ad1fe5 SHA512 a07cce39e1db29f5efe8291a53141b7a3fc0e5d267d45e62bfc5f101966fb4fb6ec60c68e8b2727897d5b3b37093e6915ad3c6d2728ab406da5f93ad83c8ee6b
-MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230
+MISC metadata.xml 664 BLAKE2B 3e24275e972d23c41dbab76a90f4a47b589f652f580f5e019b44d5e926556ac2e5138a23f36beee31c53f3f5c344908832ca0d008826a720256d756425048063 SHA512 96f2c383dda46a41505e4aaf01376ed51cb2856516b800652d9ddb43c4794c1f57840368d31b822230ed3f16b6009699ee0ccec62f4967cbdaa8781a845d96b3
diff --git a/sys-apps/kmscon/metadata.xml b/sys-apps/kmscon/metadata.xml
index 796abf1fb7d2..ccf91db44504 100644
--- a/sys-apps/kmscon/metadata.xml
+++ b/sys-apps/kmscon/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 	<use>
-		<flag name='drm'>Enable Linux DRM for backend</flag>
-		<flag name='fbdev'>Enable Linux FBDev for backend</flag>
-		<flag name='gles2'>Enable GLES2 for backend</flag>
-		<flag name='pango'>Enable pango font rendering</flag>
-		<flag name='pixman'>Enable pixman font rendering</flag>
-		<flag name='systemd'>Enable multiseat support via systemd</flag>
-		<flag name='optimizations'>Enable optimizations</flag>
+		<flag name="drm">Enable Linux DRM for backend</flag>
+		<flag name="fbdev">Enable Linux FBDev for backend</flag>
+		<flag name="gles2">Enable GLES2 for backend</flag>
+		<flag name="pango">Enable pango font rendering</flag>
+		<flag name="pixman">Enable pixman font rendering</flag>
+		<flag name="systemd">Enable multiseat support via systemd</flag>
+		<flag name="optimizations">Enable optimizations</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index b48e4bd6f7aa..a52f0dd57a89 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -14,4 +14,4 @@ DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e0
 EBUILD lm-sensors-3.5.0.ebuild 6481 BLAKE2B a28ee881c1e8fe7de8b68e68023e580b2958cd155b36221cfc6095e7229bda353fa0bed2d42b65fe1b609abd492bac0b06d08569b7f9b9839e2851f0fcc8e806 SHA512 a462ecf888eaaafbedbd1c79b35a5c0b9c2c1038a22abf980e2998f813853ad76545ea5d3351daec64366eae801f619435b197fcd59ede44f44ec369f8c66ffb
 EBUILD lm-sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B eb3ab6b35813340445e4331395e385dd2fe0c69b42de7b43eea71d6df90ad38042a0b9256c352c11f25ed0d0c174291e6e5ab149164f55bef27855c60e761137 SHA512 fdc1508af3da4697989db7c00ea9abe21cc91e7ca79d8a3fa761c4602c026359d72e1f342a34332bb951b0ab8e331f555fc7bc05fb637a3df54de510b5367fdc
 EBUILD lm-sensors-3.6.0.ebuild 6437 BLAKE2B 881c07726a43b51e3d252b7d04fd8ad36ee649d351b9b174fe6a466ee990f1b44ff0840db4085b6d2768116299fe1313cad48611af32593afcd6e4973ee46481 SHA512 d605df45e8d36ea70e99fb84b67cb0b967c025b3e2cdf890f5563915090f534362d236f62c7d79b41fc6763b355fb5f647f3f790e8531c1b03b151da695a3930
-MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
+MISC metadata.xml 943 BLAKE2B e88d21fd3475dcd3de6168ae87904460826b379d41e803b29afae94a5376e230b4dc2376bfff5d60d5deec13a1671eb1371fff7666c02745c77bb5fae8778a10 SHA512 a27ac8c06494d6ab7c4c69fbee2e4de07dd1bdbc68be4625f1331aaae4d11902d41eee3b66c94cbc46ee6fab9ec8f6a021f4d6c2f52fcba789c56e9679dec35f
diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 897d37da3562..e1066143b49d 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/metadata.xml b/sys-apps/metadata.xml
index e780a8953053..61564a07385a 100644
--- a/sys-apps/metadata.xml
+++ b/sys-apps/metadata.xml
@@ -42,4 +42,3 @@
 		programy, których jeszcze nie przeniesiono do kategorii sys-.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 6bbdc69b4167..db36ec51cc2f 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +1,3 @@
 DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
-DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
 EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
-EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
-MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
+MISC metadata.xml 245 BLAKE2B 99e9ca57f1b154300ca2be7ca1206ed452a161018fbb46c1c8a46b3387e6267f3cb2832ba0d3dac88ef6b71ca3e931fe20f998ad6839d1fbe724bb42baabcb58 SHA512 2997363b86d62fd687ba842015c5fcfe4b3a0055f226291bd2a797d7dab1df44e4dbab56152e4adf288f27ebebf5978d3b5761452840da554fd025cc493d8210
diff --git a/sys-apps/miller/metadata.xml b/sys-apps/miller/metadata.xml
index 8181d42fee83..3e847b948a42 100644
--- a/sys-apps/miller/metadata.xml
+++ b/sys-apps/miller/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
diff --git a/sys-apps/miller/miller-5.3.0.ebuild b/sys-apps/miller/miller-5.3.0.ebuild
deleted file mode 100644
index 1412928d0805..000000000000
--- a/sys-apps/miller/miller-5.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index e48d218cd49d..2fe584c3b903 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -4,4 +4,4 @@ DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a272
 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717
 EBUILD minijail-12.ebuild 1797 BLAKE2B d28cef527341f960f5d58ea0578ac7a10fe000413bf5e12739ddb6c0b107c8dabb287c282e20798352471ca0e121d0cb7c42918ca70201e474997a229ce7980d SHA512 eb3f04b4b5a586306e6364887e4d728a1dc661db11b639d1c9134a0286f42322d2769c921bdaa04a3fbf11bb0d1ede780cce73ac6e48af571331bd01c31ae11a
 EBUILD minijail-9.ebuild 1691 BLAKE2B 09b11a3b5c8a898c8d4b76daaa79a70cd83fc64860349df50e03f4460170b772d94ac8c7f0e4cc5f9a4fbe1f4bb9f9be9e21e83a61e7ce94ca1a2626e87dc16d SHA512 c6a0292b154fe643628b82858ccd5e6e3ebb1d82fa3744d2463286d78b15fd249e678d941031c404d7158286dab3c141d6775c4018fb87835358e0c612a7eddb
-MISC metadata.xml 301 BLAKE2B d5f9282d8aabde609103f044f2d3716395795229a7651e0c0f34df9c3995593633cf13d515fddda390096403bd1f52ca286a9c6f8fe287fb5af575b333b2146d SHA512 e88cdf0fc48e93ef15d4048015fde4939955cc48a437c9cc4f8f5053e3af4524206ee4ee3b11067fce6f0defc511484b1ba2b4afde82c9684d9df4e4750b9599
+MISC metadata.xml 315 BLAKE2B c2a00fa1d9a8400721a08edfc86a0c416522345a305e810c5781d3edb1415840141ba46dffcc8056be65ddc0902d8afc5a7039c241ed3e8e0141d82b2bfb9f9a SHA512 fe148de8a20f5fd0cf076e83d5a870063ffa0e23ee94c05f27681a8915c9e4f444af1fb0f4d9753e5e68a003991335fb1cf10c538ed69ba8b08ea1c0b64155a0
diff --git a/sys-apps/minijail/metadata.xml b/sys-apps/minijail/metadata.xml
index aa105de6900b..0ff376aa210b 100644
--- a/sys-apps/minijail/metadata.xml
+++ b/sys-apps/minijail/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>coles.david@gmail.com</email>
 	</maintainer>
 	<maintainer type="person">
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index 37c046aed063..836d2b545eb0 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,8 +1,4 @@
 AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f022978e563e904595de506f897349659b72a4ce5614e8ecccc5edfa9a71c988da71b5b2bc8650493fcb53795c9faeb SHA512 8ecbbec87ab65d1b69b3a64301c10168589a30a0b1487f841388c269ea705b3b04662b35d196daa8f17e9c708670597a2fe6c10f6dceab3d3cce62fa24318501
-DIST mount-gtk-1.4.2.tar.gz 232132 BLAKE2B 7c6be675db2fd11ce36501e8b247ddbb5a786b28698c4195c329b310cabc710f6df65f7869ec2bbece2edfd54820b8de88a0a7b20d442fe3d6e27ab5e93689fc SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba
-DIST mount-gtk-1.4.4.tar.gz 240716 BLAKE2B 25244bfea0db577c3bfb61abb9acea4cdab41e9cad3173dc472c57ca39b7739e3cfef0501ecb874faf1bd8cd92e0cfd8b48ecc5aadcbe4294309aa692593c376 SHA512 85ed7e5bd92d6ea15a8fd907a0bca4bc7e64861b03e922bc28827108820f1fb4daa87b94a16f468c87d741a8d456f27f755e06b2049f2a95ce4ab00d395763d2
 DIST mount-gtk-1.4.5.1.tar.gz 239116 BLAKE2B 94ca6b0b4b9aec8989169c7a52e3e38f65c490e88e07531eb398c06be8c61b4d5ecbcaddabb2286ce7353294991a35e0f3b2d94a7b255817651e6570a6c7be1b SHA512 3cd69b872c278db80b6f91a8f66054c56be964d23f1a4e5a435343de5178c5a64440ba871e6e4b6b76b55bb01e156e8cacc8e4e3c7cfdb4bc55f95680d6dc511
-EBUILD mount-gtk-1.4.2.ebuild 858 BLAKE2B 80c7eea632ae9694cbe22fa1b01cf36f47f456fd6058010d557834e5738f67e5210af91a8cf3bf48014567eefd9c6e2aed5b54416cd054121868f97c9adc4904 SHA512 ccf32adf1b708c6330b706a9485a560e3ec5016f784e059ace30324b7c567a346fb8581d0efd9c79d707bef88475b8eadad1565ec42f23f2fabcedd22d4d574e
-EBUILD mount-gtk-1.4.4.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
-EBUILD mount-gtk-1.4.5.1.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
+EBUILD mount-gtk-1.4.5.1.ebuild 789 BLAKE2B ef94101f5aab2dacb2faf251fb0c2aecc77e796256caa22ada2cd86562da19c07e83eae0d451522dec931feca862fcde965445e069f0f873fd5d9423908a564e SHA512 0db26cd5bc2fea834ba6909105830d354d072d4fd322cc4f1fff1d6c2ac3979ac40326ca22d444025d7e4710ad78aa2389296b982546b49bf6cfb851afeb02ac
 MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
deleted file mode 100644
index 1746bf782587..000000000000
--- a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="GTK+ based UDisks2 frontend"
-HOMEPAGE="http://mount-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.28
-	sys-fs/udisks:2
-	x11-libs/c++-gtk-utils:0
-	x11-libs/libX11
-	x11-libs/libnotify:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS BUGS ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-c++11.patch
-	sed -i -e 's:AC_CONFIG_HEADER:&S:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# acinclude.m4 is broken and environment flags override these:
-	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf --docdir=/usr/share/doc/${PF}
-}
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
deleted file mode 100644
index c8cf9d128bbf..000000000000
--- a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="GTK+ based UDisks2 frontend"
-HOMEPAGE="http://mount-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.28
-	sys-fs/udisks:2
-	x11-libs/c++-gtk-utils:0
-	x11-libs/libX11
-	x11-libs/libnotify:=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUGS ChangeLog )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-c++11.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# acinclude.m4 is broken and environment flags override these:
-	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf
-}
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
index c8cf9d128bbf..de3f8eebfec8 100644
--- a/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="GTK+ based UDisks2 frontend"
 HOMEPAGE="http://mount-gtk.sourceforge.net/"
@@ -12,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/glib-2.28
 	sys-fs/udisks:2
@@ -19,12 +21,10 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libnotify:=
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-c++11.patch
 )
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index 52a8a014a837..a0e1703effa7 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -10,4 +10,4 @@ EBUILD opentmpfiles-0.1.3.ebuild 1114 BLAKE2B 50b2351d9239ae96ce9c9f563d95c48abe
 EBUILD opentmpfiles-0.2.ebuild 1382 BLAKE2B 8b5fdb30d45b4c1fc3fa10938ca3d2b1b9d2dbe007c7a3c95188dc71af7484b7ac7d2794517affc75e697b7bc6485890e58d8369cc88284e58636f9dbb61717b SHA512 98e815ecf98e4533afc258a0a4837bdad429d78759fd3f8d3884967ab6d443f9f22fca8a96929a2ddd1937963b88f6d6ef1ea398d055bf99d8e625f0471459ef
 EBUILD opentmpfiles-0.3.1.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
 EBUILD opentmpfiles-9999.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
-MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
+MISC metadata.xml 445 BLAKE2B 4aad5dcfe48ca38a0de24e7c5a1fa53ec639827f9caa2f03c71fb2c054d74de487cda2eb7c8efccd20d5012955163bd9cef7f73f892a14e8ffd63bb73878dd90 SHA512 9dd3d1e30ceff27dbe6b5250ca0915d31957f94f830236b385d2cfcf2e28806d8fac23220148d7a7cfd09f73136e0bc728e1c289da77f939faff2c2d5c55dd6b
diff --git a/sys-apps/opentmpfiles/metadata.xml b/sys-apps/opentmpfiles/metadata.xml
index 26fecb1eb64b..e38bd1fa78a5 100644
--- a/sys-apps/opentmpfiles/metadata.xml
+++ b/sys-apps/opentmpfiles/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 8189cefd5477..92063f6810c2 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-tools-1.8.0.tar.xz 57428 BLAKE2B daaacd6c2facb7cd8e090ff8aa028b4651d1036399810342f01369ad308fa240b76ca209dc6f8fd30527f27178a1d29d0b5fd44c0efc050a0dc20397afc33e11 SHA512 181531bcc8b644718411b09cd3f0971520a2df8f86c87deb34a8664e03c9b10ec73a0904cde004f045641ce8d087bbe7337c6a124e422c94b93de21088767a7f
+DIST osinfo-db-tools-1.9.0.tar.xz 57704 BLAKE2B 43b25f9d3a32a4d22fb50874b8da5ffa2611b439213c4d41292f954b23515756558e4d6a5a56b53dc0f15a9abebc4f4b5dc08bf8fe9f77fc8c66d8c56ae96acd SHA512 516c57d47649d9425a54863e0050cccd9757caa710b7ef81b339bc75454c7b55bafe6623a69305f0fc3e47e5bcccfd05222475f8487e4a1b0c1588764c87a4e6
 EBUILD osinfo-db-tools-1.8.0.ebuild 1146 BLAKE2B 687a03d25e942634299ad4c403236770171594a93e76563b43703cdd5685617c284b0c731ef7d6b6f8a8f2811f46fdca6401374a5975e922ccdcfecd87caf55f SHA512 21cba760e281abd7b8dc306d463d5d56deff0751814836a00443e9c8d7fc553e98c4dc4b82a2099f470b7e8d8cac1563a481b802ad56ce70823f827570bc43b2
+EBUILD osinfo-db-tools-1.9.0.ebuild 1051 BLAKE2B b7d055619c45dbacb8d15505ba899ef3f2d6a9a536d214b420cc8692b8ba3e8fc8846248960c6480855ba1c7ed5820d8dcef102112f3092a043bf2baf888d8ed SHA512 2062b4a008c30b181f74cb661692c0aa4756e1097084932def5cfc51c6062d10ea84bbac85890b36463b6f19701b925cea5d745ec4d370246577ee7465ad0684
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
new file mode 100644
index 000000000000..e3903da5e692
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=app-arch/libarchive-3.0.0:=
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+"
+# perl dep is for pod2man (manpages)
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test && \
+		has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index d0d8e89c9193..48e76999e960 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20200529.tar.xz 104668 BLAKE2B cb5b980cfc7753ad76aeb80d79108b125c3f1d3bec8a8878d2e562ce6b11b4369b8f9b0a03f5720ad58aa09abe8e140633652f19a4dc6f40e941e626d918e4aa SHA512 27efed4680d80432541c9e3dc692a381b479811ebce39e9b42382bd8b499d2782b59323a6c29517f38fa63061720d26c87e3c7ca806414adddfb9e4294ee106b
 DIST osinfo-db-20201015.tar.xz 108840 BLAKE2B cbda3fc868e2bd0f240d86dde70b04aa85ab869d6d8275426b60ca6ec63da3738da48b78540d5b4426e4aaea600d7ceb29d698618500fa1f45d6b2a1c3ddf5a4 SHA512 0c75ba6a3410af7e59e5696fff2883dd2285d9beb1eaaed90f12e78f05ad0e3f54352eb30ebfab2a4c4fa19c5c86c83b55931acdf04b25eeb015b19d64f824e6
+DIST osinfo-db-20210312.tar.xz 113832 BLAKE2B 41deacfc739b00d76a50fef95476eb5ef134b30b3fd9c7d0847daf3e49163087c014db49de2bd50e079baa8e2ad1d5727010c97f53220a87579e220b7f7fb3b6 SHA512 f5644e37c9e1aebea2dcf5a63adec1fd7c0f98b7455c4dea8d8b51cba396a388f9d847d5dd5e0ef8426df8da228a9766a297852ff27cb72dacecd01fd9fbf19b
 EBUILD osinfo-db-20200529.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
 EBUILD osinfo-db-20201015.ebuild 648 BLAKE2B 4cf67103c1a97853fd2eeb9e58f49b718abec82fb7f5aece511568412ebd97efa8b733f7f51dbebde7ea511e668919cf557f30caaf4da27434031eafcb60ce53 SHA512 f9d2541ab25a1a1ae08fdc7c4e74244cc6c1af22c5c17b15159e68542988f6595bcd6e81c00c7414fb96c598257258d6c969c63a69452bafa1ec3b6f16b0dd25
+EBUILD osinfo-db-20210312.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index c50a256b6857..463daece410d 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,6 +1,4 @@
 AUX pick-4.0.0-tinfo.patch 805 BLAKE2B ab40112024bec12d18f25a84f39cf09850c11f2878acbcdb91bf33fa74c1a35525da04917381c548437017714c70def44aa8ed4697f13639669c64b148c4a0f0 SHA512 d974ded22d5527522178eac47845c85de1fb0c50df626fdc9792798de3439bf6e6ced12f2434d89086a8fe7c5f11a775745d880cd0f58066108e48cae2912042
-DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
 DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
-EBUILD pick-3.0.1.ebuild 654 BLAKE2B daa505885757851edf558654770b275661a8a94771e5fcf019fa0146d0bffa7dbfb5c625b0abb36146d5fbebc477f714e93e4fbc77ac30a49cbd767acc6802e8 SHA512 d194db2a604de6eb826220d619c72d77372f5fa86d679b9bea4488bb65026a5006c470b27f37db2005cc6289eb0e8cefe291bb8313d7f11fd3f379db6c2a0630
 EBUILD pick-4.0.0.ebuild 706 BLAKE2B 4bd61519fda8c56a801352c14bf96618841cbbd5e150ea80d238f9ea007f872cd78edff76fb48026785d969af9704e7c6f375e2b0f5b1c2da55e090b9bbf2b98 SHA512 f3159eab84352e1fa3e131f178313da4ddf706d10ec717d5c70f32703e5ffc253abada95d43e22b4e049e47e6de9ed0e431dd47a7b20f6e8bdbcc17546a2d08d
 MISC metadata.xml 242 BLAKE2B 3917c4e887e59cb27fa14a1ea92192b5a924ce39a4dd39a2cd75d04d7a861f57f7c9e969581a243339ea432f132f6e0963efe9940ad1678b506588317da0ace0 SHA512 03639d79f8e79b78d86d64d217268bfbb6255cfb2d37188a764465686dcae9ffe5e41b01cc746f465a6ba92a3bc2c9d87d56889e00317c96fd759d37b840fae0
diff --git a/sys-apps/pick/pick-3.0.1.ebuild b/sys-apps/pick/pick-3.0.1.ebuild
deleted file mode 100644
index 7bdaff986327..000000000000
--- a/sys-apps/pick/pick-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/mptre/pick"
-SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	# not autoconf
-	./configure || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
-	dodoc CHANGELOG.md
-}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f805a70c377a..fce1ec264757 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,18 +1,18 @@
+AUX pkgcore-0.10.13-metadata-xsd-2.patch 1202 BLAKE2B 8844f6819579ab54c8ea88f551de2d2671324e494b7321f5d69f7207415f481075742416add7055618b6baaea91588bb82796b764000216f6b051c988837a3bd SHA512 48adb353f4522d682f99c2cafcdd98b51c450579a313a93d3dcb00bcd4e9fc59f7cf6f0ce54377c912c3a4b6af10340a1b6690d845c489e6b77af52b295ac1ae
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
 DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
-DIST pkgcore-0.11.0.tar.gz 641831 BLAKE2B 93b2d680b0daa6611ee4fe3782e90736950859135b1e22d05068abdcb64d3a94bcbd564af4940d8944cf8d49f867404f61697ba7b1d1b45d0ba31c93232bdd44 SHA512 d9a1f3cecd0a84b353a2515e6053d300aba0257b7034d852e469177f04e05f79c95cd9bd1278afcedd321b825f5f46241d2098317e1bc29bb77efef9f641ccef
-DIST pkgcore-0.11.1.tar.gz 642312 BLAKE2B 70aac2357af1d84f3d7372f09483b9b1ba46dec9cb20044c540e482a1161c1419d8dfd5383aa12731679f05c5fe2f98981317eecd32059301ca757982f8b1ea2 SHA512 572137175f9af3cc451f412ead5d67d5fe79826d56f773dc5b6cc791cdfe575d6cab82c2943afe705c759edd89cba1282092d772f46343c8452b52d344bd2ff0
 DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6
 DIST pkgcore-0.11.3.tar.gz 641848 BLAKE2B 7a1ff52e9f41b15ec3c211b99ac8666ac16ca1ca40168cce15aba42f3dea6c030623ef4e4ad837297dca860a70396743842467b0ff7305bbc5d3d640d1f2918b SHA512 2d7e4d3228c6ec3bf5aa5cbf8d4235d1b1c0b10c2f4f50c48c84948c68fe1f277eca8effc2bc1310cef2e5227143acb96775c4a0288ab94757de23437f57a084
 DIST pkgcore-0.11.4.tar.gz 643951 BLAKE2B 79567cdf5719b090ec358b51a7482f01a77658728efe267ca5bb217512004f920864f101cc59bdc2ce6f7260a3abc896b2cf4ef168f77500d541c92bfa848f4e SHA512 f290efacc13b72f6bf2319e240b2fba30a1307e6673db2f653dcc6a21420e94928deb63aa0483d9ac632791e60246758fe1de0481316b222c0b60197047dfb10
-EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 023679ec203e7e1454e6bb6d91c3408b8e819e002ceb42efa71832a77ab306c11b5efb54a0f76cd90b14873c55a55d9451e064d6ec1bcd124aaab351d63133c8 SHA512 66c437ae8d726cae98c63daf13e8ac92e9bd8add181ca1a737643e688c33bbe02fc3bfc0008eab1d6b2988eebc61dae98aaebf026dded376713257801b7dd5a2
-EBUILD pkgcore-0.10.14-r1.ebuild 1094 BLAKE2B 4f34fa4e80c1bb45f6a65e4cc49710ee286d5689df1dd1620d5db6ec70cde9afee34624d92ced2c1c1f1ea141fa86f4f138f43bc713ba8a4e00a1d87dcc7ee0e SHA512 028b1458b694f4808cbcac91db41a29613c7bbfea235f67e388b9a4e4c86f982e9c65d2d09107e99e9e2c2ada4b1c120dc5aeacb6032e8898ab69e0cfc4f0838
-EBUILD pkgcore-0.10.14.ebuild 1091 BLAKE2B 557b9c192ec28b39a0eb043fa653763900b9de64ca1bcdbb13772d39dbf14177640225c14c97041b7349bd8a39f5b5af9c52f2900d78ade100e6b3f6b3854c02 SHA512 fe7158312fbc934482838af4af6149d66a4d43d806e4504a203b0d1dcf59e3dbf5c86ac3ede2698a2e51d73873e8d7c75114bdf07962a365aa57db910b1e762f
-EBUILD pkgcore-0.11.0.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
-EBUILD pkgcore-0.11.1.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
-EBUILD pkgcore-0.11.2.ebuild 997 BLAKE2B 3a339f210ac956f187fa330e33b704846acea863a77d74a0276cff62d35aca232454d255c0a383e3abb7071b1d88cba7793d05fca45197648a6fae938394d61e SHA512 7250338d678ab5b23bd5da15a63fbbbaa0fdc5d1735dd3c44c3180a6f8ff1f8a554ebeb22d1e8f17f15d80ad7d345c52cf5c2b89ae259612fa368abf006abb7f
-EBUILD pkgcore-0.11.3.ebuild 1003 BLAKE2B 440fcc183d493bd314c048a1e926cde74cd772ed254646daf33a57a474544afda4eb4c38c74eaa94762364353b40c2b87ed677f0ba9c55bfb50b40d42f7c5dd3 SHA512 ae46dba3188594c895433b9e4547a2964841aca78498e7e916d75f86c81dfab1fb5e9055e7c567c72df6b07ce51122a3ab79d478e177ad3fd2bf080a004997ab
-EBUILD pkgcore-0.11.4.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
+DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8
+DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
+EBUILD pkgcore-0.10.13-r3.ebuild 1247 BLAKE2B d0a3f38b90222ecbff5e8df115e686c3c77ed3f472c08c03b89cc3742093a69677617b1f25cff58ba4bd07727c6668f4a2d0cccefbddaf7fe3ce97fabe3e4a91 SHA512 35476b502934a9f8aa8dc44f1339782db18505e00622631dcbdfb4dc74cef9b3920f12d79135d8672546662939fb901dc21763e5b0262705f88700508dab7f27
+EBUILD pkgcore-0.10.14-r3.ebuild 1205 BLAKE2B 8310cceda556f51b36c89a60e28e0c884b92fede00d27672ecc31e14d2fd348aa2813ec6f5caa5efb5591dbee85f8ab2513a3dedbf93c24aba2e7ddebb8938db SHA512 3d38afe69a523e11e2d930c31ca7cdfab38ca890c2ebe57284a9ce838312acfac9dfa48580057a478b7f43f391ecee4561d74e2878d8189d0e920bbb023e94ed
+EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4
+EBUILD pkgcore-0.11.3-r2.ebuild 1117 BLAKE2B fe299e2de72b1dd790325b75bd7d9f2c02dfeb6e87b4c63a22a46777db3b4ea9053318969f32a259b3514476d0a3c588e8310c84e2a80736036381e27a09ff4e SHA512 7209df6b7170cd2435e124c4c9ab4b3ef377d91fb11fbc3aff0f73bcd29f943fbf8019dff7b742f185e9c7888d2b5cb89c85b68a6cb532c1baec63700a08f508
+EBUILD pkgcore-0.11.4-r2.ebuild 1190 BLAKE2B 6da813bd67c9d823429a3f9bf22006ab2e701a65b1b65ac42122421dedf27932a37a3a44d55718191adcff850cfd6a1d74205d21cf0a3b3c67b4fd442348ab1a SHA512 866a579309511c7b9f299b51ec74652f8831af9b3810bce991bcfe976978b7a00c913697456e60e499590ccbd7c3bf2e9cde045d9de8916613e5cd782aebc043
+EBUILD pkgcore-0.11.5-r2.ebuild 1191 BLAKE2B f2230f3a09376a3429ec63ada66384ef67fb9479d0207258abb527b178a82c24876a732f58ff6853edf02796ba532682fc7b26231549d0cdc3259976388d5fcb SHA512 778ad43775ab53863850d42b8d868d55a0ad4403cd9007c5cc02645c856e32a7815fb400c942e1c03f2f13d6534e540a96b9fe28e896ef2ab8122a4efe0ef47b
+EBUILD pkgcore-0.11.6.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 EBUILD pkgcore-9999.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
new file mode 100644
index 000000000000..84aaf93f73db
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
@@ -0,0 +1,40 @@
+From cc7be6516d25cfa27b25b5c0ced6b8a8514d46e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Mar 2021 21:19:46 +0100
+Subject: [PATCH] data: Sync metadata.xsd for proxied="" attr
+
+---
+ data/xml-schema/metadata.xsd | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
+index db243abb..d2e3d4ff 100644
+--- a/data/xml-schema/metadata.xsd
++++ b/data/xml-schema/metadata.xsd
+@@ -127,6 +127,8 @@
+ 		</xs:choice>
+ 		<xs:attribute name='type' type='maintainerTypeAttrType'
+ 			use='required'/>
++		<xs:attribute name='proxied' type='maintainerProxiedAttrType'
++			default='no'/>
+ 		<xs:attribute name='restrict' type='restrictAttrType'
+ 			default=''/>
+ 	</xs:complexType>
+@@ -138,6 +140,14 @@
+ 		</xs:restriction>
+ 	</xs:simpleType>
+ 
++	<xs:simpleType name='maintainerProxiedAttrType'>
++		<xs:restriction base='xs:token'>
++			<xs:enumeration value='yes'/>
++			<xs:enumeration value='no'/>
++			<xs:enumeration value='proxy'/>
++		</xs:restriction>
++	</xs:simpleType>
++
+ 	<xs:complexType name='upstreamMaintainerType'>
+ 		<xs:all>
+ 			<xs:element name='email' type='emailType'
+-- 
+2.30.2
+
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
deleted file mode 100644
index 794dab08f1bf..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-metadata-xsd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild
new file mode 100644
index 000000000000..231497d64904
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata-xsd.patch"
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
deleted file mode 100644
index 259e6675cd17..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
new file mode 100644
index 000000000000..59c8183d8a79
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
deleted file mode 100644
index da21d28449c6..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.14.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
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild b/sys-apps/pkgcore/pkgcore-0.11.0.ebuild
deleted file mode 100644
index 2998f6377a3f..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.1.ebuild b/sys-apps/pkgcore/pkgcore-0.11.1.ebuild
deleted file mode 100644
index 2998f6377a3f..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild
new file mode 100644
index 000000000000..0de5a597644f
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
deleted file mode 100644
index 42c6a3cacd81..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild
new file mode 100644
index 000000000000..5094000142d6
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.3.ebuild
deleted file mode 100644
index 0bed083a982f..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
new file mode 100644
index 000000000000..ad98dca71057
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
new file mode 100644
index 000000000000..596e3598f7ed
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
index d98868c1bf84..d98868c1bf84 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
new file mode 100644
index 000000000000..820b84039893
--- /dev/null
+++ b/sys-apps/plocate/Manifest
@@ -0,0 +1,7 @@
+AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097e98178913766f88fdcea68b25f3285b14ff8791d668ca2a608ed6bcdf5f9b5b3c2cfedb2e76ad5c674bba03664ee19232e5bb SHA512 440b96a621c9f39f3b9a846342d5dc1d95ef7a8b5253e1c569582bddd6e1a544767996885c5f19a5bcc78cfc48f522f93631c382d2cd360a528141bc8a029aa2
+AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
+AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
+AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
+DIST plocate-1.1.5.tar.gz 69090 BLAKE2B 70b398eb1a5d7b36294188966ef5f46843d9db9f41021a294d88795944412b4ef3819771082955a74a9945296fa14c59461a4ab4af197691f7085a40eeb7f0ef SHA512 6169ea7b3587e12e555a42e0c70e149626810f5e6f9f1f03ca1b069d7892d45bc52cabf072324eaa6f14055943dd680a71642914c0218a770e2b00a22c75efbc
+EBUILD plocate-1.1.5.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
+MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
diff --git a/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch b/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
new file mode 100644
index 000000000000..2635a8007882
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
@@ -0,0 +1,21 @@
+Unconditionally install systemd unit
+--- a/meson.build
++++ b/meson.build
+@@ -76,17 +76,9 @@
+                configuration: conf_data)
+ install_man(updatedb_conf_man)
+
+-if get_option('install_systemd')
+-	systemd = dependency('systemd', required: false)
+-	if systemd.found()
+-		unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
+		       output: 'plocate-updatedb.service',
+		       configuration: conf_data)
+-		install_data(updatedb_service, install_dir: unitdir)
+-		install_data('plocate-updatedb.timer', install_dir: unitdir)
+-	endif
+-endif
+
+ # Requires having TurboPFor checked out, so not built by default.
+ # Unless you have a recent Meson, there's no apparently good way
diff --git a/sys-apps/plocate/files/plocate-cron.conf b/sys-apps/plocate/files/plocate-cron.conf
new file mode 100644
index 000000000000..f207344a9e6c
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-cron.conf
@@ -0,0 +1,9 @@
+# nice value to run at: see -n in nice(1)
+NICE="19"
+
+# ionice class to run at: see -c in ionice(1)
+# you have to install sys-apps/util-linux manually
+IONICE_CLASS="2"
+
+# ionice priority to run at: see -n in ionice(1)
+IONICE_PRIORITY="7"
diff --git a/sys-apps/plocate/files/plocate.cron b/sys-apps/plocate/files/plocate.cron
new file mode 100644
index 000000000000..ebcfcbffe7b0
--- /dev/null
+++ b/sys-apps/plocate/files/plocate.cron
@@ -0,0 +1,51 @@
+#! /bin/sh
+set -e
+
+# check if we run on battery and if so then don't run
+if which on_ac_power >/dev/null 2>&1; then
+	ON_BATTERY=0
+	on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
+	if [ "${ON_BATTERY}" -eq 1 ]; then
+			exit 0
+	fi
+fi
+
+# check if we are already running (lockfile)
+LOCKFILE="/var/lock/plocate.daily.lock"
+if [ -e "${LOCKFILE}" ]; then
+	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
+	exit 1
+fi
+touch "${LOCKFILE}"
+# trap the lockfile only if we really run the updatedb
+trap "rm -f ${LOCKFILE}" EXIT
+
+# source the user specified variables
+if [ -f /etc/plocate-cron.conf ]; then
+	. /etc/plocate-cron.conf
+fi
+
+# check the config file
+NODEVS=""
+if [ ! -f /etc/updatedb.conf ]; then
+	NODEVS=$(awk '$1 == "nodev" && $2 != "rootfs" { print $2 }' /proc/filesystems)
+fi
+
+# alter the priority of the updatedb process
+if [ -x /usr/bin/renice ]; then
+	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
+fi
+if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
+	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
+fi
+
+# Cleanup old temp files from previous unsuccessful runs
+rm -f /var/lib/plocate/plocate.db.*
+
+# run the updatedb if possible
+if [ -x /usr/sbin/updatedb ]; then
+	/usr/sbin/updatedb -f "${NODEVS}"
+else
+	echo >&2 "Warning: \"/usr/sbin/updatedb\" is not executable, unable to run updatedb."
+	exit 0
+fi
diff --git a/sys-apps/plocate/files/updatedb.conf b/sys-apps/plocate/files/updatedb.conf
new file mode 100644
index 000000000000..6a00d3aa2b94
--- /dev/null
+++ b/sys-apps/plocate/files/updatedb.conf
@@ -0,0 +1,16 @@
+# /etc/updatedb.conf: config file for slocate
+
+# This file sets variables that are used by updatedb.
+# For more info, see the updatedb.conf(5) manpage.
+
+# Filesystems that are pruned from updatedb database
+PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devfs devpts devtmpfs ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs"
+
+# Paths which are pruned from updatedb database
+PRUNEPATHS="/tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
+
+# Folder names that are pruned from updatedb database
+PRUNENAMES=".git .hg .svn CVS"
+
+# Skip bind mounts.
+PRUNE_BIND_MOUNTS="yes"
diff --git a/sys-apps/plocate/metadata.xml b/sys-apps/plocate/metadata.xml
new file mode 100644
index 000000000000..ffe1b7daa0ad
--- /dev/null
+++ b/sys-apps/plocate/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag>
+	</use>
+	<longdescription>
+	plocate works by creating an inverted index over trigrams (combinations of
+	three bytes) in the search strings, which allows it to rapidly narrow down the
+	set of candidates to a very small list, instead of linearly scanning through
+	every entry. It does nearly all I/O asynchronously using io_uring if available
+	(Linux 5.1+), which reduces the impact of seek latency on systems without SSDs.
+	Like mlocate and slocate, the returned file set is user-dependent, ie. a user
+	will only see a file if find(1) would list it (all directories from the root
+	have +rx permissions).
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/plocate/plocate-1.1.5.ebuild b/sys-apps/plocate/plocate-1.1.5.ebuild
new file mode 100644
index 000000000000..4aaa46baf9c4
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~IO_URING"
+ERROR_IO_URING="required for USE=io-uring"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.5-no-systemd-check.patch
+)
+
+src_prepare() {
+	# Pretend liburing dep doesn't exist when USE flag off
+	if ! use io-uring; then
+		sed -i "s/dependency('liburing/dependency('/" meson.build || die
+	fi
+
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/plocate.cron plocate
+	fperms 0755 /etc/cron.daily/plocate
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 21a0908e5122..4cd0e8ab98a7 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -2,4 +2,4 @@ AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d112802
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
 EBUILD razercfg-0.42.ebuild 2102 BLAKE2B be673b8f875378ff984e54500378d7d279779779f773f32883fcb584830dce3b92907e6dbc171604618c8b7a52f1b0bb26babc34c28ba3236a9a16811492a2f7 SHA512 5f605666f375fd55732c2c9be3df825d3e0cd1fb0a5420b751484c88b432c0d8d54eefcfb72840ea7f2210be4eb5efb17f09e653bd2aa73fc666c57e5998d8f2
-MISC metadata.xml 963 BLAKE2B 4de293a678fe24f692ce51f935bd9c112247d7a896725f35ed52a19560448ee085bfed868110b7a687e9fe7f85e1f41858fa368413c35dba05a0639ae5e8c431 SHA512 b94a639add6cb35bb62fa7a061e1b7acf18f26aa15088f519f1f076ba50b20c839afd38a70b0fbfa968b9167eb48d9c70985d18b38496a0da8a593ca734ebdc5
+MISC metadata.xml 993 BLAKE2B 31175b645ebae1a40a17a18be2ec443c612cafdc568ae8be03dd8101789987f3fc3157c53f8e0c117930bdddb7508e663690aa0b2ce31dae76ee2675a678b66d SHA512 3a4d211df0bff7e749003f6357edd902a2f434784381bdd923fa54055321fa257c9b4fb29cda2be94bd5bffed1b5ecad1d4a87e3b26a056ea7757c0acb25f9d7
diff --git a/sys-apps/razercfg/metadata.xml b/sys-apps/razercfg/metadata.xml
index c8db6971140a..c4a6d9a3aac1 100644
--- a/sys-apps/razercfg/metadata.xml
+++ b/sys-apps/razercfg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kaikaikai@yandex.ru</email>
     <name>Alexey Korepanov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 024cebf694ec..816d158d2ac3 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
 EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
 EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465
-MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83
+MISC metadata.xml 510 BLAKE2B 17c9ce817246dc8c4b2fe743f59db38b33c28249e911a2b918bfed6c318d823a16766bd490573db42c847d600afa9a813ea362a7a681d24174e711ea1a9a7bc0 SHA512 73d805f67c26de05f906807879da5a1c22781dae1f3b07aaec2c0d3b9c8d32daabd977b4218d119ed399dc04cd17fee76dfc787b2a70fbf2cbcee0dd10797843
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 4f506a138719..929e2f352a4e 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 2c5ec77b61d4..54694150ac33 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8e
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
 EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363
 EBUILD s6-linux-utils-2.5.1.3.ebuild 1006 BLAKE2B 775838d0b17dacddba4a208cd0d1c1d37e5f47f822fadd4fbca5ee3b83e1d040900782367969020593d32d1ac96cadb3dbcda84733273ec56d8d9eb5bec0b374 SHA512 919375509aaf59f8050622b6a90245fd319fca97b58045dfb1b7bcb689d49c707596b9253852f1d2424040d9e98b4d3c177529938e7b247391d3447240987ec9
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index e0f2a6d34855..db4df9c968cd 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
 EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9
 EBUILD s6-portable-utils-2.2.3.0.ebuild 1017 BLAKE2B 284b5576cf3ac0dff133e3fc70d6c8ec27aad7a820252564f7e8e0a903609e579ade7aa46d794b9710cc11273cbbbe021d9c8d72d453a53de5d17792eb26d7a3 SHA512 9a0a24a5a57eec4271a59bcccdb917ac30175e5191ee5fc2106d161f0446ba4c1dff553e516d3cd0a942658106f52b7bac329d1e9ec7ceb460b49441b009808d
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 476048deccc4..15856afe6159 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -12,4 +12,4 @@ EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c8
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
 EBUILD s6-rc-0.5.1.1.ebuild 1496 BLAKE2B 55776ae5839593d33b77504e5f78bceac60c007647dee1124532360173cbaf23220c8071012b5da755bca90752226f6ae2c32449104cf7c9c45ebfd8eafbcf41 SHA512 d1fcc1adcfb715d48cbb79db91d6b76114d7e150a4fc5e5e1d80ae64ef4c329f5b25da60590925daaf730393b791fc7081ae8e8037c525d71fae55ac7193caa8
 EBUILD s6-rc-0.5.2.0.ebuild 1505 BLAKE2B c58ece484908002d3d05fb1d7a6cbe28a4afb4dfc64be42978fc9c9fcd79b77c4c40a0ad1d4f0dafb75b446cc48cd53f38b31df39a84d0a5af6cde7434a3867c SHA512 c737b7a4dcb1cf5889143034d405a50d9e8718d6c0f4f687c50bf81ddb8d6464828868e193149501c9cee7d026352332809c5ca93635111ac6b53cfd0510a927
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 9970b910bc53..ed92ba81fb62 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -14,4 +14,4 @@ EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066
 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
 EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c
 EBUILD s6-2.9.2.0.ebuild 1254 BLAKE2B 4f83b4f35ccb8b9f469a987f3966af0599b9dec91d268f342588a3aa070e62b4c505bb72ad8fe9d6422f2d1308c8bdd88c88b8796cb2e2656925f5228a549712 SHA512 9637e4a55844f31e270b66860cbe3138904e8c6ea35a9997241dff026eb57075b66ea59a31ca8245bbc3b93288d061ac6f38f8a5ac1d768d8bc20b0cea488806
-MISC metadata.xml 617 BLAKE2B 54bf4abe6178471732a42ac78f017567932bcfa1579d0815f4b2a365486cbe9ff3a0bee00bd6aa5b1b4a6b27182885790f5d80c099c7f404a28c4fb604a2091e SHA512 644271e7fc3b6bdaf85470bbb908df5a82f3988378a7a001db46d957974e3518664580ba55844917a70fa3f2d1b0480a90e8b7b56e0769209b70240093a84e91
+MISC metadata.xml 631 BLAKE2B 9f6052892e8ca9905487393bb8a0cb24e172ce432afbb1881ddbaf4706f9e64125d1386d35e5565409f006379368bced8f60ff85520168ac3b4b61b8ccebf0a8 SHA512 1dfd042e66b518ce9a0ac0de2af077e1f29b578be548f9b67bd434732d8bf170b29c6fbb46d38a13bd898671018fb492654195c31328ca365dc6572f0b5265db
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 1718e243ff88..38e06983f1b3 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,7 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b118910936c0..3171caee9ef1 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,4 @@
+AUX 247-cgroup-test.patch 1859 BLAKE2B e97d638c96e0f9c783736227031ac8774dfa5c2040bfb828abbbc14faa1edde312187ff2314d9f762081bc93dd5ecec077229e30aeb46ade43410c961feed965 SHA512 1c08ce1e7a8e56b68966666d8af5764f903e2d851a288e3e1bc78ad58f7223d7a52486ed4b1c1a4afef0ba24e4b90eecea56df9f2139c771a935e050bf436aff
 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
@@ -9,6 +10,6 @@ DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592
-EBUILD systemd-247.2-r4.ebuild 15729 BLAKE2B f69ffe1d93cc5d2ee2e065aed95eead585ff385504b8eea8b124086b642c1f9a97e1526f90fa3b2e48736683906b3df477a3aafdf1cc008c6475d7591fab8684 SHA512 89eaa2a59907c996903ea1809a6688dd9160138eed7b29386f8884646b302f5ed1e33b20ecb88ef4bb3ef01e2accfb23d5096b92cc2a28b66daace5e544e6be1
+EBUILD systemd-247.2-r4.ebuild 15766 BLAKE2B 51833eca4fe5b60b72fd8b7a4f23726da3dc88946737426a6bb513ae18cb96c81fd373b0c21fd844a6a12184b800b5363acb2b2f8f6c35e77d0dfceac3724d7c SHA512 20064f79166a8faa1b6da1a4ec0849d1bfb7416b8a958e129df72aa76dfbbc63b1fce9ead8b67300377f98083a5be4ceef4d4d4afc149299194aeb0a0d6ec1ab
 EBUILD systemd-9999.ebuild 15731 BLAKE2B e1021ad90a8f0b60829f2da18947c0c21d9fe590bd4e0e591030964c57ef6774d7b1c39189d0e7291c3e590b68a32a932edba10dfe16810fd9154306e721bcaa SHA512 2d7f30712144e5071a6463c0117b8d476b5e771d6fa0213d89b8b5e3aaadd8ee09defef207cb0d7149c76a644c3d5ff60f95c7cf9529f9f4ac84d00a94ba26ee
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/247-cgroup-test.patch b/sys-apps/systemd/files/247-cgroup-test.patch
new file mode 100644
index 000000000000..bfa4422a6211
--- /dev/null
+++ b/sys-apps/systemd/files/247-cgroup-test.patch
@@ -0,0 +1,35 @@
+From ddfc6ad061ad47caeeff901d27cbc59af85e0db3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 9 Mar 2021 17:57:37 -0500
+Subject: [PATCH] cg_unified_cached: return ENOMEDIUM if we cannot find a known
+ hierarchy
+
+When the test suite is being run in a foreign environment,
+/sys/fs/cgroup might not be set up in a way that we recognize.
+Returning ENOMEDIUM causes the tests to be skipped in this case.
+
+Bug: https://bugs.gentoo.org/771819
+---
+ src/basic/cgroup-util.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
+index 527043a2b39..0b252eb28fb 100644
+--- a/src/basic/cgroup-util.c
++++ b/src/basic/cgroup-util.c
+@@ -2052,8 +2052,14 @@ int cg_unified_cached(bool flush) {
+                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
+                         unified_systemd_v232 = false;
+                 } else {
+-                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
++                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) {
++                                if (errno == ENOENT) {
++                                        /* Some other software may have set up /sys/fs/cgroup in a configuration we do not recognize. */
++                                        log_debug_errno(errno, "Unsupported cgroupsv1 setup detected: name=systemd hierarchy not found.");
++                                        return -ENOMEDIUM;
++                                }
+                                 return log_debug_errno(errno, "statfs(\"/sys/fs/cgroup/systemd\" failed: %m");
++                        }
+ 
+                         if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
+                                 log_debug("Found cgroup2 on /sys/fs/cgroup/systemd, unified hierarchy for systemd controller (v232 variant)");
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 2239dc02efc4..4853d82c9c9c 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7..9} )
@@ -212,6 +212,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}"/247-cgroup-test.patch
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index d2404f45f1c3..da084b8c7b89 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -2,4 +2,4 @@ AUX thunderbolt-software-user-space-0.9.3-cmake.patch 521 BLAKE2B ca7756afc0504e
 DIST thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz 1160 BLAKE2B 2710f2acea71a7301a121a564bc7625c73b7c983622f9d50f544836facbda7c8cbc29055c81706ec0d8fe5aaa8d254872f9c9740b2b9235642b1264380ad17c1 SHA512 3a5b5e5bfc6b7e2a0f2cd09428e315d6895a217bfda7faacd3817e85b3201192f6dd6b26d10071721164bb9c49731aead1d8249ad6652fdba9d38074fcb74907
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
 EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1031 BLAKE2B 6ae85474d7ca2eff7c2b522b40b57af6279ed10988199cbe35f50c26d276c21b422ee8f750d6d492aa66376fdb35f2c541fecc66cdc6665211d712d248f28f10 SHA512 3a92e3138aeb8ac1262af5324201bae6b48e820c8fb1109e66c26553a2534bd90a42f67155bf89abb29a182db679aee156ea2e8f262da02737531d13c98f4c9b
-MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
+MISC metadata.xml 584 BLAKE2B 47a098906ea69b9cb3625f0f5a77508e70ba8450f12b4b5cda93201c2ccf91f39d9927a2b552f56f80d56ffd38d3aa174f8ab6e7ec007267f967ac8ed0a24d8f SHA512 a6fc4258f7a0b98630779e170cd3bd8a44d369ac2972916e0ecc762847c61a4e58dee577a812eabe45d07081ace127f08f4815d8b094bc3e80b97ab910f6e4df
diff --git a/sys-apps/thunderbolt-software-user-space/metadata.xml b/sys-apps/thunderbolt-software-user-space/metadata.xml
index 8fb8d2b55b7d..953ef4b670cd 100644
--- a/sys-apps/thunderbolt-software-user-space/metadata.xml
+++ b/sys-apps/thunderbolt-software-user-space/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Jonas Licht</name>
 		<email>jonas.licht@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 47850b8967f1..951d85427f0d 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -3,6 +3,5 @@ AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc48
 AUX udevil-0.4.4-no-libtool.patch 223 BLAKE2B d31cc00b2aeb4143a2ce58f36dd13f3701ed8f8e30604e73757c3c04e21fd80fb69f50d80bfa30360b83c3a8a882e72009c99767cbb7a0c90c3403b00477c92d SHA512 bc77d93ac17f8345b973df6dd81890dc3e437e7926d53db5cbbbb17a5c3f2067ad0ff027b0d870c15276a5528bbc869bed6d7ec5b090927e671865783ffc37a2
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
 EBUILD udevil-0.4.4-r4.ebuild 2004 BLAKE2B 1e18b59577fdcac142dbdd87471e71d53ed271af55a359eaddb0db1d6716844230237daf2f46a685bb136e0dbf9a9353925cb4f5565389dc49010066c825770a SHA512 ba747431b7ff309b36c72a26e341df81b7973749b7c720d8357fe5e3819b4b1733d207959ea1101916f3525699ee87b6c08737f36fbca5759e3f997f509bb543
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
deleted file mode 100644
index fdae0cfa0d3d..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	>=app-shells/bash-4.0:*
-	dev-libs/glib:2
-	sys-apps/util-linux
-	virtual/acl
-	>=virtual/udev-143"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	# This works for 0.4.4 too, no sense copying the patch
-	"${FILESDIR}"/${PN}-0.4.3-flags.patch
-	"${FILESDIR}"/${PN}-0.4.4-stat.patch
-	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-setfacl-prog="$(type -P setfacl)" \
-		--enable-systemd
-}
-
-src_install() {
-	default
-	fowners root:plugdev /usr/bin/udevil
-	fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please add your user to the plugdev group"
-	elog "to be able to use ${PN} as a user"
-	elog
-	elog "Optional dependencies:"
-	elog "  gnome-extra/zenity (devmon popups)"
-	elog "  net-fs/davfs2      (mount WebDAV resources)"
-	elog "  net-fs/cifs-utils  (mounting samba shares)"
-	elog "  net-fs/curlftpfs   (mounting ftp shares)"
-	elog "  net-fs/nfs-utils   (mounting nfs shares)"
-	elog "  net-fs/sshfs       (mounting sftp shares)"
-	elog "  virtual/eject      (eject via devmon)"
-	if ! has_version 'sys-fs/udisks' ; then
-		elog
-		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See https://ignorantguru.github.com/${PN}/#polling"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index e00872b9b907..152527b1069e 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 635 BLAKE2B a313a8e20d0face63b3be433134f4118f97b2abc24a43e6b8dfa6c0f2d9a7d83a2ede0d4998d4b2363e37226e5f122b84369f4d9a4584979cd72244cc00641b3 SHA512 3cd0b4cfbf3ee71908137d5c8d7c68d212badb3269cee04c2fcc9652f8810aaca2bb89527661fdc561888cbdd356db6afddde9216ffab43dd49084bd31427403
+EBUILD which-2.21.ebuild 627 BLAKE2B c066b5e0a67d0a5d77fd68fd94152db51ce0715c79d6462482712d508b5fbf385f5b7ccf052ed9cca79a4d0161955ae37bb09d93e80f0e1bb933eb3948c125c5 SHA512 9b6a061004068cafb0e8d753e734b8838d22fd0a336b30259cc745765c2a20bf62e1708ed723ca0651d926b2ef85604b452d41f0ff17cc7681f848bb3164fad4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index a292cba08689..831688cf7c05 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 src_configure() {
 	append-lfs-flags
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index b581857af729..a79c2496f9d8 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -4,4 +4,4 @@ DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664
 EBUILD yarn-1.22.10.ebuild 1070 BLAKE2B 049c5a5cdbb20425ba71385b41725ae5bbb7965eec3db80394ffbfb57ec506be22cf712324ba638d486297fce65d004c0b51ea0fad387f012884d1da04ec82e8 SHA512 b092d1a53a5b6c6f1586a75bca7581a13c8c2a420bd84e33b46b82f8a7b9c6f65429401c2a6b093d4e44bdb59573752227c478d5a4dda7a707e226f061b9b4c1
 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
 EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-MISC metadata.xml 654 BLAKE2B 4554ddbe2ccaaf07ae2324740b9776f7473ee6a10638b8b91dd75a4451c4030a0bc0cc41dc3fe91e392cdfe07ce6bbd55e9b04f2cd31b9c4021456c70e219237 SHA512 42ea44ef45e4c756ec6b04a657ae184380fe34829b3d770e125762bfa22e4d950a537d82e90e08ff6786dc46927212d0b5ab44e788070d0d7e05072c28440a5b
+MISC metadata.xml 684 BLAKE2B 34b72baadc1750b01ce8d205c272950cab3e883fb646cef6bfd5cc3b62b5da2963f220ecbd3ca6b82f1560406c69606719434fd3c387e4aaedf80653d2f1c4ce SHA512 f72bcf2a5fbe055652c29df20a3f0796394bed5fd6ed9e5f0e49582b8d68263f2905daed2fa90cda6b71f5b4c648d7363f8d3fc641fa4e26dc2265c9b84821da
diff --git a/sys-apps/yarn/metadata.xml b/sys-apps/yarn/metadata.xml
index 52bf09ed0f47..3f3135f6050a 100644
--- a/sys-apps/yarn/metadata.xml
+++ b/sys-apps/yarn/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>saboya@gmail.com</email>
 		<name>Rodrigo Saboya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index 7855ae986c3b..7911b6ac55c2 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -6,4 +6,4 @@ DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f
 DIST zorroutils-0.05.tar.gz 15428 BLAKE2B e9baa6de4da3cbc6754c52d9e0c1fe34ce735b4d5377772c1765bdd30ae988f92125a5f254fcaab797eed33d65dad59e2a385fba3fc4610a9cfb6c34c6b45e7e SHA512 5260cfc7ccf77d0a0fe012c32ab492824903cb0f1397a82cf4c52aa12df5845b9e3d53aa1f619cc3a0637dfb42e9b75f80d715e4e912c5b8f42e0588f9053421
 EBUILD zorroutils-0.04.ebuild 689 BLAKE2B 8a7bd4d720e3ed693777d8fe6cf929d1cd9ce207dfd79f396bf552bc8070ddb50585e4766c59809310d9ed0abeca0459b16678b75e0956aa951c95303a0ab313 SHA512 118207c7b40c0014c555b8c7d9e2327040b28370424cc9c1cefde33216fd4f27b7ed6f17317b3d80062a7ffe2d5f1cce9823021826390ebe542530d5ca35382c
 EBUILD zorroutils-0.05.ebuild 690 BLAKE2B f93d54e87e5311751b73865df6475a70797074f66bdee36cb6124cc8ea288ef9ac687ec4013cf8cb38d6ba04de813df03b9fdab30aa82e97442e5fb0f45624c0 SHA512 271b061ba8b2015a7fc97dba703e8d2baa510d27d0da48ac8d5aa4ae0d9e537c95b077dd0295f72fe72a7be97047f4ffa2a20b9bd1100c593c1af2e99f047927
-MISC metadata.xml 430 BLAKE2B 6394dd99f4248b05a48e72b7f5b499f6e403f38ff6f43236bccaea69ccbfd352f094b9a5e9a09db8f5741d46104ba44243784570bd4fc654a77a4e96ca8d6bb6 SHA512 8e8419f4e429758c2d1d42405505da55f47fc3ea7e30c69c994d825aeb6e45d8639533f8cf276d44e1d272062d6d8058f27651c8b38eae7f7ac8c5844523318b
+MISC metadata.xml 460 BLAKE2B a96bd20cc3d8c469b21e4eb2ff121416e65c54d3bfcf596437bb4f0874f1d9ca50a388a1d24cf63770fe4667f584c75e73a669229b65ebcc5e5a088e3ff74b23 SHA512 91c6187ff9ff3202b1a63e60e0a62722a00b2c3899602998cb1d26b72baa5dcc6412f8b95b1a9f70b5e4c7532726be27f13a7d19664795026b144e2a842c73e4
diff --git a/sys-apps/zorroutils/metadata.xml b/sys-apps/zorroutils/metadata.xml
index 0a210accc7d8..dc215fe993d9 100644
--- a/sys-apps/zorroutils/metadata.xml
+++ b/sys-apps/zorroutils/metadata.xml
@@ -4,11 +4,11 @@
 <maintainer type="project">
 	<email>m68k@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>gentoo@kolla.no</email>
 	<name>Kolbjørn Barmen</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild
new file mode 100644
index 000000000000..1a14a298ba88
--- /dev/null
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Official authentication app for German ID cards and residence permits"
+HOMEPAGE="https://www.ausweisapp.bund.de/"
+SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5[qml]
+	dev-qt/qtwidgets:5
+	net-libs/http-parser:0=
+	sys-apps/pcsc-lite
+	virtual/udev"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index 4abb666f45ef..7a75ec6f81e8 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,4 +1,6 @@
 DIST AusweisApp2-1.22.0.tar.gz 10845370 BLAKE2B 2b35bece49c96f7aca391a918539115351737b9cc6bcb913121f7f44db7ff88fb615bd3a3822d7d5670e83c81ac7c409fffb1696d6dd9310fdbd595c3f7fa88f SHA512 c2340625f4792afccde2f09d54e050efed0e78a7d921f545ec73f4bf23746b7b0c422fffbc87822abe2dc8b69a8439615f3d43179a98a64fa4165503c2e74079
+DIST AusweisApp2-1.22.1.tar.gz 10884409 BLAKE2B 3205bb4acd4145e20f336301c5a3dcb1da6d5fa1254169d0578d675dabb7b12fa84778b62a96ea4cae126800b4ef455b4e7a76154570090b8a74be41a1ba49b2 SHA512 3c66b401d370ae7f4ebb37a25c25d9eb044ec5706b85e656cb4a8ac0d3d6c922fe78f07a832635536f1e38896aad4aaf38ab4fd9bcdf00c9dac90e370b0f2232
 EBUILD AusweisApp2-1.22.0.ebuild 930 BLAKE2B b78892ad8d3dd7cc0ddeff0b937b3d6e1d37b136d59105aa86e8382200ef1619ffe55e847eadcd45ae03c4912b73465ea3289f2068f3125a0d59b7f4e3e235cd SHA512 a31f9558facb799ea41b7c84bfe5c381f2ddda9fe0b670934aeee8e0b5bb62b1554f967ce036aa75d5128fa0c10f3297e4d8f0c325c75e5a7d3b73e4d27e3bbc
+EBUILD AusweisApp2-1.22.1.ebuild 932 BLAKE2B 2435436d607bfac5906776a0197280086ae48083adad73ad2ec3a7a1416501f438d69b71eff2254803c3ed66da3159c8a049bb9452f677172df48b817305abf1 SHA512 6c718752790fce8517b4254a2f41a4d40dfe380e350ad2d04da9b9e3c4521f59e40719e0467e76d0796e78e7d70d69b053c389120f9a6942e91475d33eda6681
 EBUILD AusweisApp2-9999.ebuild 891 BLAKE2B 924618ee8a22a0ef8ad2ef62a0e8fc7448033f142371c32f814965275cb376d46e15822a9899031cc03a8003cd7159c1a94e8652a0eaf8c4acfa34eeeffa4e40 SHA512 83506e86320528f4ac17c6ac9aa80060aa9ecdf875817d12f0a680dffaf242495546aa0076c1f8185dc7eccf3dd00e87490e7ccf18028b14a57330f9f75a9894
 MISC metadata.xml 337 BLAKE2B 12190891c6b221b7c56938d103ea1bfbafd6541dcb08d10021d34b3581f521e11fa6555a638555bf03c7b1d708aae6f6a1de96d9b0bf300a1cd0bdec9a7595e6 SHA512 710cc4c1f20d1ac1090f944588fad306f06789ffaa938eb2e0961029542ddb35f766807bea3e9561228cff53eeb6eea884833c4579bfa4afabf65672c3091829
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 43b62a342127..b62f5d19b62a 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index e666416762c1..61d4c03b6a1a 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -5,4 +5,4 @@ AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
 EBUILD elogind-246.9.2.ebuild 4136 BLAKE2B c02a85f4271d3fd3d0ef875d86e681cc0c1ed0e5d86b3c19399208d8e9826ae54e95a892d850c1ebda823b497cc3cba848eb689c67e637b548e27510c57124df SHA512 a7623ce84e631ee83c05373351f687bd7b962b56a73b9988c3c218b26a0fefea78948887c11ca5814001caaa15374aea7bea2b9a1cceacb539059ccc6593abdb
-MISC metadata.xml 492 BLAKE2B 5a8b55fb5fd3c98d72f0f003e69275d50a511c2cfa8b8c15c3e06c105b96ad19515e0144c9cffe5e6a86002656a2101ab811c6b9178ece9b050a32f65fd9ebd2 SHA512 220bde659ec75567f5d78eca23fa7e03f49a829cb1c08abe66be3d22ae2d7dd7ba2f177fdb33642a2b0ffc125abe7547d6a77153e88de9bb62d7009a898e8969
+MISC metadata.xml 492 BLAKE2B 825e86df619311ed9abf5f64f274f783fa9b3523d455c0608a16c3a39b58db0bc52099a3aceb3e2c7fddf28a292a75733cc7e5f8694f1d1b2006c702946a8d30 SHA512 d1af1f988c3211ac6520b02193e9e1b1c0d9dd204a567f8468516ebf4e4d8dc1fab56de0e0031bdd58a2f1336f1b1c8662ab9f56753948f1dd297a336ae40187
diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 5d3ca4b35f16..7950788b2762 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index c3c95f22195d..cc1de4b9e6ee 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -4,6 +4,6 @@ AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 EBUILD fprintd-0.8.1-r2.ebuild 1467 BLAKE2B 09c611813121532bb15a25e849d64d4e7eca38e8c2dcd5909877532b104151c0ce8301ff902636c206b03e4ce474d023208de46b899f1039acc990e793e98dfd SHA512 7e5ca0b4a0971497a47bc35cdc0e4f0db8c63d174398059832fc21d164ada79687f49ae11238ae7ed30d4d8f50f4e219891e3ab809657bd6320bfc63bae0aad5
-EBUILD fprintd-0.8.1-r3.ebuild 1639 BLAKE2B 5ce33ef0e82eab779b88950ca20c6febfa47a22a00c8ea5a183cd9bd05325254fa95c142fca61295b191ee620d77374b4694739e8fb551ee9395e4f03c5fd1f6 SHA512 c0295423529dc458c6f5f61d496ec4c7a12ff11f82720123f1b5e850356ea5c902c87a5ff8e44226ddcb36f5988f7637cb2515a2db4d9c0bbec5cec0c016085c
+EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
 EBUILD fprintd-1.90.8.ebuild 1610 BLAKE2B 15b77cb219868a97e5824b5da311d86306d104168c10fe579e5708b7d6888c2d04a806f29a9cdaa20742686e1ac35d269bb453d45b2d35b8c683d38259e4acf2 SHA512 b138146bc440308a95c700e56fba94419d00bc9ddaaff149d6de8207fe9fba94ce866f432a11e8d77cc6d70bb0d06dfcf3ea469c29d43fd3e9e71bab3278872d
 MISC metadata.xml 265 BLAKE2B 9c8a5ab87f06a4bb41749d77607017b51bd9a8a11167b44243fe3239fdd810b39d874abb0bc37d24977a59d6c1c0e9a447c3d18f5da2b4cd0feba10ccb14f048 SHA512 13396b6bc6de9ca04d98c0e94bd71b2f0b5b73238c21fac6f9fa3db9f5ab20efca035e84ae625b34a67bcc3c4f69acff1b57df96a28766ad59b6bbd65c8cb1b7
diff --git a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
index 1d12a78644d8..cd5fba5f403f 100644
--- a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc pam"
 
 RDEPEND="
diff --git a/sys-auth/google-authenticator-libpam-hardened/Manifest b/sys-auth/google-authenticator-libpam-hardened/Manifest
index 5317588fa0ef..6753d4dce9af 100644
--- a/sys-auth/google-authenticator-libpam-hardened/Manifest
+++ b/sys-auth/google-authenticator-libpam-hardened/Manifest
@@ -1,2 +1,2 @@
 EBUILD google-authenticator-libpam-hardened-9999.ebuild 836 BLAKE2B fc80123984f57226a35c6749a479fc85ccd24b4f315f3e0c4e4edd544efc199e8940a4c310b4e3334ef09c85606212953d8f6a4cf07bb0d618254b34b66e6884 SHA512 dcd4516c584d6b0ff68d1fbec215678970a5d952b31014d32a86d79a930ee003d2d41698915cb1fc643039faeb0084f1c3ca8e0b3ed9fe9a109c9cb75fdcbc1a
-MISC metadata.xml 479 BLAKE2B 39b28a2bf2db3539427278e8711a97c3b034621fbaf1517a9413ad414f535ddd19dd769970952103ea9562913b3103bdcd4fe7465fcf807d0fdaf7a9bf46953d SHA512 5e28d65550f0f28e4f603238dcfbe8ae28cddc89bb186528a983bafb7dddb9326a54eff72df685a58f99bec6b81719697d6a6f69d8f13e7ffadca514ef619536
+MISC metadata.xml 479 BLAKE2B 1d11776fa8a434feb6ceb885486d2ef6024ab5c290eaf0dc14d3b20d6c2a68e0d5d99a7e2b6efd5c8a8ccde16354f3fb1c2fce0bf2e9e200f117dbb950e9b4a7 SHA512 55e8b32b32df42c2f1342a7ba49e62d81df145e8a4b140ab3f139a7fd7f578c9310f553128ea62b5260543d009c52efc9dee84f3de836d78c334911649e7248a
diff --git a/sys-auth/google-authenticator-libpam-hardened/metadata.xml b/sys-auth/google-authenticator-libpam-hardened/metadata.xml
index 40610c9eb281..8ec52443cdd1 100644
--- a/sys-auth/google-authenticator-libpam-hardened/metadata.xml
+++ b/sys-auth/google-authenticator-libpam-hardened/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='qrcode'>Display QRcode after setup to accomodate
+		<flag name="qrcode">Display QRcode after setup to accomodate
 			automatic setup of OTP client apps.</flag>
 	</use>
 	<upstream>
diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest
index 9a5908990332..b295726f2a77 100644
--- a/sys-auth/google-authenticator/Manifest
+++ b/sys-auth/google-authenticator/Manifest
@@ -4,4 +4,4 @@ DIST google-authenticator-1.09.tar.gz 62944 BLAKE2B 85ddb0a9eec3d49eba1f9e84ca13
 EBUILD google-authenticator-1.08.ebuild 1298 BLAKE2B 3438c3ae4ca8dd60e5815054646fd739cdafe4cb28d3f2cfc25f29b7a87ff5b4c4272643c0217384344a065f102bba3c243c783322131a05c4d4a4d956d5a85a SHA512 13ef174d6e294b33c8652342db8cba05a26b40390795e124ae17fcc03573c8e7d307e07b12e94a2caa643e7826d0fb61042e27bd08def4b7b2d41eb65848a172
 EBUILD google-authenticator-1.09.ebuild 1298 BLAKE2B 3438c3ae4ca8dd60e5815054646fd739cdafe4cb28d3f2cfc25f29b7a87ff5b4c4272643c0217384344a065f102bba3c243c783322131a05c4d4a4d956d5a85a SHA512 13ef174d6e294b33c8652342db8cba05a26b40390795e124ae17fcc03573c8e7d307e07b12e94a2caa643e7826d0fb61042e27bd08def4b7b2d41eb65848a172
 EBUILD google-authenticator-9999.ebuild 1298 BLAKE2B 3438c3ae4ca8dd60e5815054646fd739cdafe4cb28d3f2cfc25f29b7a87ff5b4c4272643c0217384344a065f102bba3c243c783322131a05c4d4a4d956d5a85a SHA512 13ef174d6e294b33c8652342db8cba05a26b40390795e124ae17fcc03573c8e7d307e07b12e94a2caa643e7826d0fb61042e27bd08def4b7b2d41eb65848a172
-MISC metadata.xml 572 BLAKE2B 517e23755181f4a47aa6b6fdde473011b6337e570e48b9e381f6c8b3afcefeb751ecfee7b8ea3719af4ced771ef6870ffa5c8761d25fb30b5b52a2453079d35e SHA512 70f6c08533a9609a06d5e293ed7fc50860d50d2263bce19eef7194c9d2351554700eb36d2098c0cbd1c13b01270861423128dd81d536ada0526546258cd6e8d5
+MISC metadata.xml 602 BLAKE2B 51adb883e2f78c034e60fd4f04ef02961969479f3ef3f374e6859f06b1b51297ba3e61a1166096f21ddb9195af7af71d14311cb2a333c6872b90f5cf2e51e72e SHA512 93d9c8f40c08183a6f5feecfcc530bc81c718ae51db388f57b1a75e51fd026c6c105be3367b782836603d1d0bac1bf4fbab937dedfa0447e0d720c036424b727
diff --git a/sys-auth/google-authenticator/metadata.xml b/sys-auth/google-authenticator/metadata.xml
index 1ef79cce77e3..68196e56c645 100644
--- a/sys-auth/google-authenticator/metadata.xml
+++ b/sys-auth/google-authenticator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny Gutbrod</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 9ec1c04b6952..403f721997a8 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -5,7 +5,7 @@ DIST libfprint-1.90.1.tar.gz 2348486 BLAKE2B d9f43253d8be874f3d78e19dbd148788d8a
 DIST libfprint-1.90.2.tar.gz 4152489 BLAKE2B d8e8dde93acfc83dc253741517eb840b1a950b5626f2aabef4d4a44fcef2db95096e7d467ae3191c3478e93c0919acbf48010b0c4dd23a538466a25d8204ddf6 SHA512 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226
 DIST libfprint-1.90.6.tar.gz 6375191 BLAKE2B 0e6300da25eb910dc50c3752731f877ad26093bd901a8de222ec21965596fe88e643b0923edc4e100d96e3910595bb00c3935ef8b19840ac5c4ff1d9405f2d09 SHA512 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8
 EBUILD libfprint-0.99.0.ebuild 1063 BLAKE2B d163d33f8318eb430630db1dedc51407c74b2f77326d4c3f4a6ca0a6113e3a1fe81c79eecb6026a414cec5c9a484acb9d8dee573dd53264ba915e3d3aa597f60 SHA512 06d91045e2e584e6b641fa31582a74f3e01078c2999708f69d7173dad3a053e2831bc3ed927d29919228ddde96939cc06508f754ce9a0ca1d22136e1c449ff58
-EBUILD libfprint-1.0.ebuild 1070 BLAKE2B f4f6b88b3c239330242e1d0e2bdd8d26bc61ab5902fa36d193f99280c73dc30167ab9aea0b4367032b4c511ad254654e9b441472dabc972ea89ba26aa7118c08 SHA512 71bf45bb5f565f390b8ebfd82f5d1127bf1e221162793d9aeb973f50d8f611800e3e59fae31f2ecd3a77159fe8bd48cbd40e0acc6d9c74dfa5aef293421d3102
+EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
 EBUILD libfprint-1.90.1-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
 EBUILD libfprint-1.90.2-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
 EBUILD libfprint-1.90.6.ebuild 1239 BLAKE2B 7a04b2aa6a38570214cd5966dd61b3d89c2e3b7eb6e35ef4fad056454a060ec5b576a3b40d42336602cdf94a8f3392c5312e98e468e6a8eefe71dfaf2ed506a8 SHA512 ba57bf3087ece0e41f88187535e2fdc3bab88a963df7947b5a2371d4e985c64d6811e8e10680df86ff753d01acc6e490859ca29e525bf0733207e269c006560f
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
index c51abbccdffa..782d8fc4edcf 100644
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ b/sys-auth/libfprint/libfprint-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/otpcalc/Manifest b/sys-auth/otpcalc/Manifest
index fd7337dd1729..d075d3f550d2 100644
--- a/sys-auth/otpcalc/Manifest
+++ b/sys-auth/otpcalc/Manifest
@@ -1,7 +1,3 @@
-AUX otpcalc.desktop 179 BLAKE2B 56aa66e84a84ab742539ea3c8eb058e9fe2387c0c365a40a9ed11c09623287e3a595de9fb5520966df9dd4f688573da1fa7771d760366759779739cb6e9ac394 SHA512 dea60262e01c9e01a8f1abf45ddd0fb0cfa64ad1865a6693d923041e027f851fbc0f96be34392178e541c361a3c4f448091e744a87915ba04785f27f8c290d38
-DIST otpCalc-0.97.tar.gz 123704 BLAKE2B 197dd2dafa634a2049ec7355e89bfe3a7fb2792560c133509477d073b73d754f9a1dc5c634010db48118c486dedc4933114a5e93671fbb27f3fa4a4a3140fad1 SHA512 5d22bd01fe90b32801d6f1c5ac3105036c14ac8197dda3c8454974ec72830a5f8cd693bd0520a51defdb0a7c7703483770410ba560436168826f8b6133a2524f
-DIST otpcalc-0.97-patches-1.tar.xz 4384 BLAKE2B 3bdf043c6b0101f4c28bd90a2c7da997e64e9a794d517484e08809d47f46feacfb764ec76f58c205e71dfaef6c25868bcaa4e5fe54bd45c0d7d5958c83ab488e SHA512 950b2df68acf377750710b0b9578b431b4aa745414a494b87062fffa559485cc4117bb08e68f22a79781047cfd2682082e30b1db81cddc5a3448bc285c5553bf
 DIST otpcalc-0.97.9.tar.bz2 57967 BLAKE2B c4962944808a526f18554e8dd6c3fd3777097c6f96d7a9a998df664697eedd848a3bed8196abdef0edfde155958a498392412b3633c50af91feb3335e5a1bd20 SHA512 f06bb54f38c5b63a1f63055a83e1f3e6bd3a0578458b3c1b8903566441eaaa9ed29c88d929ffdccba1f5ff5e9e5f5f0fc64a73e699154e502ca1d608a7c6d4b8
-EBUILD otpcalc-0.97-r8.ebuild 1081 BLAKE2B 38967431ea21648a99d73eeb85a1e2f10fd242f85aad19b86ff58c31b7659991c5c21d0fdec545e92ac752eb259f0411bd7f6d7831fc2be3ab7b555e0ecef1ef SHA512 79c55730c9deb365c49183a5ffa9483999a6b1191a17bdb6359b2456c337a228a012288f75eac97089202262f6a8caf95d179fb10feffb07d193d687aec33dcc
-EBUILD otpcalc-0.97.9.ebuild 510 BLAKE2B 6811f8b8ac9c2086c5d6150e90e1ca05a24452e1141b07d8fbf87263d8d4ec89ce74bcd654c1801351aa0031377de460e166204bb9c323cafff2646919156ba4 SHA512 cd4ef1c304911d36e8c9e74ee041a3e514e313658d039e698a4e70f347218741b3d1dcc68def0272d89e8c919c2ea7583507a59f86096d4c65e0884b4f23f03b
+EBUILD otpcalc-0.97.9.ebuild 506 BLAKE2B 28468cbdce1d6dd7ed6a157fb4ef8b890dbbdc78bc28606930b7a397d5712d63e2bb985a3397bc487350142685d4cc972af12beaa3f8cd2932c91614f10dd83e SHA512 a4b06d4c3b1be773cc7c69190c9fd4147741455177654d49d84f8d3208a66e537168148166c44b6f4e816848e3ba448ed995e147727ccce0cd9b05901a9f386c
 MISC metadata.xml 385 BLAKE2B d99f8accbdb0d20100131537c3c6fab7316cb7454c46de086b031b6d65c11eab6ca250862611ce0dcae8d98c163636183617170fb7298c6741ccc3754a257ab8 SHA512 162a8cc6627c2a569d9f06b2073d23b5eb291da87c6117763d41e6b835409cdaed2f7b1035999581c0ab70814c8310feb3f7a11c736ffb6b9bc92c584f79d5ce
diff --git a/sys-auth/otpcalc/files/otpcalc.desktop b/sys-auth/otpcalc/files/otpcalc.desktop
deleted file mode 100644
index 25c84065238f..000000000000
--- a/sys-auth/otpcalc/files/otpcalc.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=otpCalc
-Comment=One Time Password and S/Key calculator
-Icon=dialog-password
-Exec=otpCalc
-Categories=Utility;GTK;System;Security;
diff --git a/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
deleted file mode 100644
index 53da607dd200..000000000000
--- a/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
+++ /dev/null
@@ -1,49 +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 One Time Password and S/Key calculator for X"
-HOMEPAGE="http://www.killa.net/infosec/otpCalc/"
-SRC_URI="http://www.killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-2+" # bundled crypto functions are not used
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/otpCalc-${PV}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# override hardcoded FLAGS
-	sed -i \
-		-e 's:$(CC) $(CFLAGS) $^:$(CC) $(LDFLAGS) $(CFLAGS) $^:' \
-		-e "s#-s -O3#${CFLAGS}#g" \
-		Makefile.in || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake otpCalc otpCalc.1
-}
-
-src_install() {
-	dobin otpCalc
-	dosym otpCalc /usr/bin/otpcalc
-	doman otpCalc.1
-	newman - otpcalc.1 <<< ".so man1/otpCalc.1"
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
-	dodoc BUGS ChangeLog TODO
-}
diff --git a/sys-auth/otpcalc/otpcalc-0.97.9.ebuild b/sys-auth/otpcalc/otpcalc-0.97.9.ebuild
index 7405bc0c0140..039cfb2ef3b8 100644
--- a/sys-auth/otpcalc/otpcalc-0.97.9.ebuild
+++ b/sys-auth/otpcalc/otpcalc-0.97.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/ulm/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 
 RDEPEND="dev-libs/openssl:0=
 	x11-libs/gtk+:3"
diff --git a/sys-auth/pam_require/Manifest b/sys-auth/pam_require/Manifest
index 07b72e995d92..07ac6fdaba29 100644
--- a/sys-auth/pam_require/Manifest
+++ b/sys-auth/pam_require/Manifest
@@ -1,3 +1,3 @@
 DIST pam_require-0.7.tgz 84299 BLAKE2B c258cbda6c7b803e1cfdac1bc5f20ebb932ed20983b7974c0e24c9509cc130e3e7868cfbd44fd8d35e0f045b3cb585b14cfb3618c179aa3038f8c59c85f9c094 SHA512 aba95c823bfcf35bca26881d79c904e9e77b86c2bf664ea63f16fa78304834a0e1e24a0392ce86cfd00309a35ad5d597f6d20a4d46139546b310daec86512198
 EBUILD pam_require-0.7-r1.ebuild 531 BLAKE2B ccfef1d60b4b3159828ddefc6ba30f5c668f4de4334ce172795edfba7889cf7dcdfe819df82f04d662d90c8fc7c5399377ad9f056c266613cd35b296b2e4294b SHA512 0924973ff3a3edcd4eba6b7dd10c9979110ec6fbd28a351b29a31f85ec920c917619b7ac7acb5c7dcac8b5795f7b36d06e2bd88715949387dd828f843ce0a487
-MISC metadata.xml 390 BLAKE2B 8e05cf42a1a646dec4fe49c7cd25793e494f5b5dfa132b6010f47fdf02313b438c9e55b14277d2930b13fd2e393130f531e77ef324b8198a5d1346dee3bee3c4 SHA512 b318d32a26aa502bbc012dabe55195bdc3cd154c46e089b8cfaf759daa9aa723dae4284425cb3617b7db2a1c851e03d7a6bf9fb9b3132b46cc5e035afbb1844c
+MISC metadata.xml 420 BLAKE2B c8a679552e1fb4281302ea4dd2330f10ba128686fbdf21ceafea515eacefda1b15b13fd17b944a63bbc8256810374967c170bbb721b7656b2f17804b0b333d80 SHA512 770f6b67fd475c065127328b65bece85971dbafe0d256cd3ec4bdfd678d7814cb561558b154720eb72fae581f8947ba52dcd9d8519e738ffd78c8fc1d300f80a
diff --git a/sys-auth/pam_require/metadata.xml b/sys-auth/pam_require/metadata.xml
index 2f8aa12d17e9..c6ea1a25ac0f 100644
--- a/sys-auth/pam_require/metadata.xml
+++ b/sys-auth/pam_require/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>joakim.tjernlund@infinera.com</email>
     <name>Joakim Tjernlund</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index d272a95ba72c..ae95af2fe6c5 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,5 +1,7 @@
 DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800
 DIST passwdqc-2.0.0.tar.gz 86235 BLAKE2B fa67007ca0477feafd8743eda0899b7e348bf75e00e7ff23b6acdf56a456d75bec89a4b7dead41d7889610669425ff0145d6e7c94db0ce93219de0c5c0b80909 SHA512 7e5c0a32361d604c47ad02f36beff3287f638f2911b398a21b89cea164bf9a161b3bc252e9c660eaa53c5e5fce458d1cb1fd6b2bb308bafdb729c9d7e67f5295
+DIST passwdqc-2.0.1.tar.gz 87804 BLAKE2B 0fbbe4dbb68104fb94dbb0a3a84759d2ad5ec3e8fb285a12534b0465e5c3ed4084e879f9322dbd26071338f4e39b01b3e42337e933bee921600e3a32f00069b8 SHA512 95d10099634dd15d2e93249b37e1d2727922fdeac9993ddb63b6c3f8ff39377c02fce0e0a77d120aed868d3a2cb51972eed4cf84f5ddcec8488f60e9769d4263
 EBUILD passwdqc-1.4.0-r1.ebuild 1273 BLAKE2B 129125327a956fd698b1493d463f50e1c9d8c6d9a85665654ab8778855f676b1ed9d2c3b382499f91bbf7a69c6a4e02d4d1ff64313adc322f9b5693d2fec3810 SHA512 1c4068d4550e463f437e30353b9fe0d20c18b6342560255db3d21b48eabd362c7385f8b4c4647d1064b62210032c484e197de56bc6337d7745ef43efd8308e63
 EBUILD passwdqc-2.0.0.ebuild 1282 BLAKE2B 834853e67e9c78cd2f84c9ac2f06f0acd196060f18d0ddca51c8f9f0c9cf89672e963c64aacb821561b66616b69d21f7eb5d6d04cf8091422f08659a2d38d48a SHA512 dd89b3d468c5d79ee89ea7289064f709b70cb731ed7810bab870c7d3388be76c12f291172e76f8dce8996965cf33e6facd4916f47f9c5a9d729c65e6bd5b08de
+EBUILD passwdqc-2.0.1.ebuild 1282 BLAKE2B 834853e67e9c78cd2f84c9ac2f06f0acd196060f18d0ddca51c8f9f0c9cf89672e963c64aacb821561b66616b69d21f7eb5d6d04cf8091422f08659a2d38d48a SHA512 dd89b3d468c5d79ee89ea7289064f709b70cb731ed7810bab870c7d3388be76c12f291172e76f8dce8996965cf33e6facd4916f47f9c5a9d729c65e6bd5b08de
 MISC metadata.xml 322 BLAKE2B 539430fc1d4d9cff3e27ab5769b9385dc822dc666accfba89a75c8228103132e0056ebbba0f16399bdf6cccb7bcf7f52de55e27a9da9cc12c38a38674bf67fb2 SHA512 8762169c70c490e144d0bc6239265e259ee1f5e2dccf75e87aa236cbc884c243432da7082ba078e20b4de7848d0c3760d8e7a3e8dac3650e3799a012a893e9be
diff --git a/sys-auth/passwdqc/passwdqc-2.0.1.ebuild b/sys-auth/passwdqc/passwdqc-2.0.1.ebuild
new file mode 100644
index 000000000000..53fea839ad89
--- /dev/null
+++ b/sys-auth/passwdqc/passwdqc-2.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Password strength checking library (and PAM module)"
+HOMEPAGE="http://www.openwall.com/passwdqc/"
+SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
+
+LICENSE="Openwall BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/$(get_libdir)/security/pam_passwdqc.so
+		 /usr/$(get_libdir)/libpasswdqc.so.1"
+}
+
+src_prepare() {
+	default
+	sed -i -e 's:`uname -s`:Linux:' Makefile || die
+
+	# ship our own default settings
+	cat <<- EOF > "${S}/passwdqc.conf"
+		min=8,8,8,8,8
+		max=40
+		passphrase=3
+		match=4
+		similar=deny
+		random=47
+		enforce=everyone
+		retry=3
+	EOF
+
+}
+
+_emake() {
+	emake -j1 \
+		SHARED_LIBDIR="/usr/$(get_libdir)" \
+		SECUREDIR="$(getpam_mod_dir)" \
+		CONFDIR="/etc/security" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake pam utils
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install_lib install_pam install_utils
+	dodoc README PLATFORMS INTERNALS
+}
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 3aaf7280ed96..87d1261e68ab 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,5 +1,7 @@
 AUX seatd.initd 87 BLAKE2B e88a8c353191ad9b69c0ee263aee7a050333d43e8dd26c8b3ee40cfbcb17f9b7a9391720ac34d19f375a880fae8178cd7dfc0b45cc9565b4b073bbe43cadf5ce SHA512 a19171b55e6650a9237f89258d92aba18508684412fe8a072387c505945b8e54557bd52261de76230553a572d627f40e00770087040111a7473fadfe3c33c931
 DIST seatd-0.4.0.tar.gz 34242 BLAKE2B 295ee18736b5f7e1b06013d00514321aad5fb09c285690cfbd78833a9efbfeb2cfaef69c075fb096fedaac42ff249ee1a43593dbd03132770c1be293ffe7ddc1 SHA512 498ab4040c19ff90842bf82f580ba24c2c98e0aded7ba636dcffc80f6bfd8869eec3e87e784455b66e2b69786b2fc6e7315b2867effa825440759d58e391378c
+DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a363960bac6c5aa7dac5355bdbd982232efd2f8078ad326ec0e6257f3ee7643384c88a3bbe15255d65f02540c SHA512 a6b1f11313411fe99e8bdd64aa493fc19bde7b0b927f21e2c3ec8a7fadc6cf2f04fcefa73fa033d971d1dc482665d3dc927ec168026289fe88b2593a45adbc0f
 EBUILD seatd-0.4.0-r1.ebuild 1037 BLAKE2B f687419f4f306e0876ce82de334821c59d3813c6e7548f01c1552faade6d5319ee04c39a979da189f691839ae099aa9fa64076f615aa0eb9cd27b42375b03ed8 SHA512 65d935d01a7ebf57cc66b485df74c26991377cbdd9791d2b58a06a64edca454e9508d91fcab94fc8da721a44b8b9e2667c8a46ee925e001e8acf7d15ad9c8c13
+EBUILD seatd-0.5.0.ebuild 1045 BLAKE2B edd13dc3aa7fad7ffc2b71b2cf098e324ae503e3c623039816648387a1ae20f8f184631dd3cd897201ecfffcb9c58af6ca230b45d602911ef9458d0a3a253176 SHA512 8ca4c16280363735a0e2ca584014d562e2a436a451994b7a2fdd70002cd16e377849cd0cb4432f76fa6a31580552c0d8270cdaafc3e865481a1f9da06dc1f465
 EBUILD seatd-9999.ebuild 1040 BLAKE2B 90669d39f22d7d125b293d23ad3187c9d019debb45d80ff79895243b91dafe0a8e994ab16b2932178a5bd6a6c1a582f1a7833c3c1425309f27c0b1b21134b50f SHA512 eaefd1ed17c983f46e462e3a3db3dc4991446dc48a799498767df562eea2199d62432e5b235c4406501791d4b87ddc1d407d2de9670026a3cd953cf851cdf859
-MISC metadata.xml 371 BLAKE2B 91b47ce16cdda23db5bd32abf120406a37fe6c17a0f412b7566ca82168ffbe30a5659a9f49326ecc752a147364bc0484b1342fbbb4409db1496ed86f148ad942 SHA512 2942272dd7bba259e32f6a6169d47e6d56707ecdaa0bf9d04a21be5bdc687734c59c0895361555ab6c34b113fd391f7177c26b2e08e0b298ba48eaeb70ec8e7d
+MISC metadata.xml 401 BLAKE2B 5d18c166454284e17627d57cef82c4be2baf41ce3de777a0388a83c5d93f23aebba8cbb4a309ee2d56bb40ce1081111e08c5a6573ba73778f1b8d7d93c890c9f SHA512 abcfb783a786d09ea6b52b6252cb4314273be58989c4e0938b2f99ad61b8d85914d86422964cefef574c68eda0698d725a811d73dea1c6ed18f7bec603df02d9
diff --git a/sys-auth/seatd/metadata.xml b/sys-auth/seatd/metadata.xml
index fa389813e2dd..260cfe0a1e16 100644
--- a/sys-auth/seatd/metadata.xml
+++ b/sys-auth/seatd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>contact@hacktivis.me</email>
 	<name>Haelwenn (lanodan) Monnier</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/sys-auth/seatd/seatd-0.5.0.ebuild b/sys-auth/seatd/seatd-0.5.0.ebuild
new file mode 100644
index 000000000000..8ba1984730a7
--- /dev/null
+++ b/sys-auth/seatd/seatd-0.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson systemd
+
+DESCRIPTION="Minimal seat management daemon and universal library"
+HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=app-text/scdoc-1.9.7"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=enabled
+		-Dwerror=false
+	)
+
+	if use elogind || use systemd; then
+		emesonargs+=( -Dlogind=enabled )
+	else
+		emesonargs+=( -Dlogind=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}/seatd.initd" seatd
+	systemd_dounit contrib/systemd/seatd.service
+}
diff --git a/sys-auth/ykneo-ccid-tools/Manifest b/sys-auth/ykneo-ccid-tools/Manifest
index 3f8e82e81aa8..02fad8fd9945 100644
--- a/sys-auth/ykneo-ccid-tools/Manifest
+++ b/sys-auth/ykneo-ccid-tools/Manifest
@@ -1,4 +1,4 @@
 AUX ykneo-ccid-tools-0.0.0-string.patch 370 BLAKE2B b1daa18c8bb9d4d3109bb9e4c279b146d447f6ce25d64260ae3c486b111543cd84340e4e3434d90b8943b14b3a54609403b0026c43e509fa8437a5500788bf19 SHA512 208f63e0acbbcf88d67aba6c79e2b17b266d1450b3518e6043b6c3a56811282c70d30c27dcd00cc7190d61591e6ca53bffe15d54bc4d9152ce1f7a2ade9d076b
 DIST ykneo-ccid-tools-0.0.0.tar.gz 298831 BLAKE2B abe3cf35eab7afae56e16665735f8ce5aa436e8d1a7b98c7ac5f88a129ad2cb4331e40839c017b5384f442b0e365f7c0f414abe8dbcbbea5af08f13d8b3f5a54 SHA512 735fbdee9e307b8fa1304b5ebc1fc490807e3b4cd67b62c4faa100fe9ac2915b8c1c979820078e0035ddb9d304460c7bae601ad89f358101faae2f13d066d864
 EBUILD ykneo-ccid-tools-0.0.0.ebuild 556 BLAKE2B 4c86cf819e48326ce1f21d73aac546bbb638e93376005e80ed18348663fa7e58567520a6a828cb3d93bb37268c538ec93f8da665d6af2ba42d2139ea61df45b1 SHA512 3ae38112048a75fa2c40a7aef85e6e1939ad6b3bebb8305e6eaa26add7812fd175ec4b161f23fb30a90eadf61e228fa4ee275fd8767ffd4d3cd7391b2a4a0102
-MISC metadata.xml 261 BLAKE2B e17f18f5bee691696ced9eae395dfeb4df4279123205f464382bc73ada3c1e8a975dcd1f987862be56142cdc617ba5282692a7e3bc13b83ff4200a0b6c3fcd67 SHA512 085b88b9b2838c231e51392cf40e7c98e7968c00028b57057b9df1b1285b45013f01cfa43fc1c22819cbf7d5e70d426d312b2c052838d5f72f0ba1a552a6487d
+MISC metadata.xml 260 BLAKE2B fda138c336c3bca9b5b515da8470686a8d5e919836cf541a0aba7cc814acaecdb6b2c6dc8a1f67f67559159ecb766c662ccb4465e6cc85149f5708a8b82c6e93 SHA512 b82ee7915d9a51a9c0847ed1d90c6cacd3a59109a43115b1640c946c50bfaeba6e0a55a208704ddccb1bc19415a5a0eff8a3c960e53f70d1aec5c3275b9d673f
diff --git a/sys-auth/ykneo-ccid-tools/metadata.xml b/sys-auth/ykneo-ccid-tools/metadata.xml
index abfd3aec741d..f0db2858832d 100644
--- a/sys-auth/ykneo-ccid-tools/metadata.xml
+++ b/sys-auth/ykneo-ccid-tools/metadata.xml
@@ -6,4 +6,3 @@
     <remote-id type="github">Yubico/ykneo-ccid-tools</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest
index d2df569e44e2..30847b69e00b 100644
--- a/sys-auth/yubikey-personalization-gui/Manifest
+++ b/sys-auth/yubikey-personalization-gui/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-personalization-gui-3.1.25.tar.gz 942121 BLAKE2B edc581824f917b50664dd758a0447fa9a61c85844cd220d82661c9e1f1bbabc1bda77545c1eda2e56a43b8176479c1b161f8e9ad5feb3d61cdc37d301ebde9fc SHA512 6d45c2a9e9c452a44fba5ff3830150ce65e968899215c59fd7b412317143015c466ac706dcfa49def2c4304a01866a3674ba7cc37e47dff4e8c6acb8166fcf45
 EBUILD yubikey-personalization-gui-3.1.25.ebuild 1329 BLAKE2B 0ebddfda4bcc20066a8a345a102189322b87cdc7ca2128b664a834114a3f356821a83e07ed6c84e9a9c8f5b7c910703c1cb627fefa8e4b292cb5c47fa5fd9aea SHA512 5ed97bac56cd321f07b9e36a594ca3ea6d7d43018bf042b69a63551e2db25d3009708429ba5f8102e87d52ac0d32bb9e417034195c933422f1e2ad03dce8ecd2
-MISC metadata.xml 341 BLAKE2B 6872ed69e7ed0aee0fa34a2ef50a42c0d22b931ddc079139f4cb2131a2471ab6b187114df68fd09d657c3ff38bcbdc21b3c5eb0e2d17d698626f4c0f22fbd7be SHA512 9a1fcb09ab07b4d2de50a771b29697fcce94b180547361de0dedbf13b38d4fa5bccdd9626a9fd9ca1ae82366211776e511ac40936b325154366191ffedfd1de0
+MISC metadata.xml 340 BLAKE2B c6934bbbe195cd50d59c353031eeee553b2f8bd22412a9cb520c83de313096768242cf574be56d382bdba56aff8a4c43be270b79e0b44b3f3d1f242bbb6a2313 SHA512 7efc9df75003c2582b4173da4e2eb06463fcbd70f242b7075e1c6ead87809b1a6239866baaf78077be835842c2ed10fac3380bc0ab7022be19b4a6b928d8d6f3
diff --git a/sys-auth/yubikey-personalization-gui/metadata.xml b/sys-auth/yubikey-personalization-gui/metadata.xml
index 818f07a0432a..35dd87f94392 100644
--- a/sys-auth/yubikey-personalization-gui/metadata.xml
+++ b/sys-auth/yubikey-personalization-gui/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">Yubico/yubikey-personalization</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0ad708c92506..507dda59af26 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 6af35cc03c92..a92243ec3970 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,8 +1,8 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
-DIST di-4.47.3.tar.gz 221113 BLAKE2B 9e5d07a5839f107186b6010c6429b4b30f94da3a365b04e916af0f919c0a46746e8e854f6445e6b3927b600235ffef92b216cdab48a80c37b40c6f05c6de899e SHA512 d97a99a720181bbd9f5de2c9a97b099e332df6ffbba8f59130dec19a85846339fef4a2db08f84561722262552e087619c8a181e7de1c3b5744b17312f84bab59
 DIST di-4.48.0.1.tar.gz 227599 BLAKE2B 128e72c1b3bd5b61de9a7df14d66c746b4e41e2b4a303853922f400e62bf200be82f320ca78b94d2d40bb661f2cf647d28657a807fc0bd4fc42cdc6a2e843182 SHA512 a5fbfd1c3790694b03a870ab56c61abe3f23bac12b41bdfe3d572d618a9f51194796d7fe020ff1fb196c422274ad8b2bce8d09cc01f8ba75b30696f5df11dc8c
 DIST di-4.48.tar.gz 222454 BLAKE2B 763e535e4e57c3805758dea8f7f05e75ff3d2acf9926619b8d45619bcef6157e9bd1b91a647efcee1728dbf2593ce91b934f77f24bb004d3ef546ad58e8434ee SHA512 942e71b7afbf2a4d3ef56cc2844bfbbe1a2001eee750b99951743f43b05c7bf692a59586f9efc228321ea3f91265211d71a4acc2e49e61efd15bcbaf41f98eb6
-EBUILD di-4.47.3.ebuild 696 BLAKE2B 0bcbdb88f4e1dd07a8fa7c33d559342a89fc61b30af5ae0747c151978d929152e45ca6bee199d3b13327bbef91ad585f1fa20cb9acddd5e325fb1a6731724471 SHA512 87a86586490e1dd8aad44bd987f0a5216f1758cf5669f4f387059e76d854249e3b5972ba796f0e0267de293d8b0e38870cd69c146b2f92ccc52aa67541cb51be
-EBUILD di-4.48.0.1.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+DIST di-4.49.tar.gz 228536 BLAKE2B 1f22cc59b97c9eb41a8af984811ff5817b49fdaf8315b76968bce269fd393cd3a26da947adbd830615316c454abab71a8547ef9448ad7f21be7d107b5d561cc8 SHA512 3997057f02c2862cf238070d1a520dc1fbbbc5dc103ad524189a97d6c114ef24a33e6fc9c64e32d8eb07c4c0241ed9772c37fb078d9708426da1f5864c4718d5
+EBUILD di-4.48.0.1.ebuild 727 BLAKE2B 0709f81eccac289d1ffc40d1fe64393759c143e419a74cad238b63669acc562431de94b3cf4861777e999667d47c57b2f500b1e971eb4612dd4294bf9e26f109 SHA512 fe8bb649157f74acf53f11c63437b4d74827cded92c46fc32d22760d3c3cc8a0194bb089f3700772546b82a4652b6fcd4e0eabcda8dd31d772eec404e28d6384
 EBUILD di-4.48.ebuild 700 BLAKE2B 933be4b8f39dd46623cc6240e9898352446b096f895fd3d946c4b1678c338874ff0897da9f54abeeb16faa5771b610de532e10caff09f8871d93510b644c2ebd SHA512 6db6ca87d319e035c9bcc6142335184ac7c75e9218ba11e7ba994252103c0c8018eaea9f0d91a5cb434cad9a97fe56ff7b91acd6a24aeb6c1d33f2c98471bdc3
+EBUILD di-4.49.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.47.3.ebuild b/sys-block/di/di-4.47.3.ebuild
deleted file mode 100644
index fdc9517385ce..000000000000
--- a/sys-block/di/di-4.47.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://gentoo.com/di/"
-SRC_URI="https://gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="nls"
-
-RESTRICT="test" #405205, #405471
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.33-build.patch
-)
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.48.0.1.ebuild b/sys-block/di/di-4.48.0.1.ebuild
index 0b91156a628d..340e3ad752d2 100644
--- a/sys-block/di/di-4.48.0.1.ebuild
+++ b/sys-block/di/di-4.48.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/di/di-4.49.ebuild b/sys-block/di/di-4.49.ebuild
new file mode 100644
index 000000000000..0b91156a628d
--- /dev/null
+++ b/sys-block/di/di-4.49.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Disk Information Utility"
+HOMEPAGE="https://diskinfo-di.sourceforge.io/"
+SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RESTRICT="test" #405205, #405471
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.33-build.patch
+)
+
+src_configure() {
+	emake checkbuild
+	emake -C C config.h
+}
+
+src_compile() {
+	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
+}
+
+src_install() {
+	emake install prefix="${D}/usr"
+	# default symlink is broken
+	dosym di /usr/bin/mi
+	dodoc README.txt
+}
diff --git a/sys-block/metadata.xml b/sys-block/metadata.xml
index d54bebd2d4aa..9f059ded816c 100644
--- a/sys-block/metadata.xml
+++ b/sys-block/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria sys-block zawiera programy do pracy na urządzeniach blokowych.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index c67b121803cf..c295ba322ce2 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -5,4 +5,4 @@ EBUILD nbd-3.19.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5a
 EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 EBUILD nbd-3.21.ebuild 1309 BLAKE2B 73495cbbfd1fc4c702e855f5a000a2e4727f5da7f52e44468146affaa30cbd7569b04cbeeb9b758c7b809c8b80871debdce7952c5b34c7e68c359785d71e4554 SHA512 2189fa47adaf7c300bd525eebc906512d3c4747571b3548930b1d2fc8a21b8900db247bc9c68ec16e3d1db48af6c773020b836b37757cb584cb86804fda34012
 EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
-MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
+MISC metadata.xml 489 BLAKE2B 13de137846e31045a97f7672b54d57e90dfaa1fc5af93ea634db818fa289a088d2a0aa8be2ca14c5f68c2fcace77373ae991425730fce7fee8fef1790fc54053 SHA512 b03527f176309631c352662713ce1dfd9ba1c1325dfe3180047edc01e440c92885a3f17cc7ca170ec9add3ada0022d34b455de25e7117b99b795a30afc3971a1
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index e233f07bc3f4..5b7f47daa471 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -10,5 +10,6 @@
 </use>
 <upstream>
 	<remote-id type="sourceforge">nbd</remote-id>
+	<remote-id type="github">NetworkBlockDevice/nbd</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 4e467b58ccf7..ed129f2badc1 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -12,12 +12,10 @@ AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31d
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
-DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a SHA512 a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
+DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
-EBUILD open-iscsi-2.1.1.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
-EBUILD open-iscsi-2.1.2.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
 EBUILD open-iscsi-2.1.3.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
-MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
+EBUILD open-iscsi-2.1.4-r1.ebuild 4055 BLAKE2B c2f93f6e5fd37d4a539f14f4f47f01ac1d36bb885388a7563d699a26aa82f7eeba1c3a601d19cb1f1fb920ca398bdf76a189c9d310fc07882c7f112bb9d23de3 SHA512 49fb0acc1ebe9ff0b8a56e39d18edcf41976011275a79ded8801285922358b932cfc13930237632a4ba99c501d3a2a0c96a3d6aa1767c01dde8b691078b4aa77
+MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index b84660b0b8e9..409bac132b63 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
deleted file mode 100644
index d7ff6b52509f..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.1.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 autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-fabric/ofed )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-		-i etc/iscsid.conf || die
-	sed -e 's@\(/sbin/\)@/usr\1@' \
-		-i etc/systemd/iscsi* || die
-	default
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		$(usex systemd '' NO_SYSTEMD=1) \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	local unit
-	local units=(
-		iscsi.service
-		iscsid.{service,socket}
-		iscsiuio.{service,socket}
-	)
-	for unit in ${units[@]} ; do
-		systemd_dounit etc/systemd/${unit}
-	done
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
deleted file mode 100644
index d7ff6b52509f..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.2.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 autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-fabric/ofed )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-		-i etc/iscsid.conf || die
-	sed -e 's@\(/sbin/\)@/usr\1@' \
-		-i etc/systemd/iscsi* || die
-	default
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		$(usex systemd '' NO_SYSTEMD=1) \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	local unit
-	local units=(
-		iscsi.service
-		iscsid.{service,socket}
-		iscsiuio.{service,socket}
-	)
-	for unit in ${units[@]} ; do
-		systemd_dounit etc/systemd/${unit}
-	done
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..48c3a385ff33
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+	sys-apps/kmod
+	sys-block/open-isns:=
+	sys-kernel/linux-headers
+	infiniband? ( sys-fabric/ofed )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtin options don't work. See this for
+	# more information:
+	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	RDMA_MODULES="INFINIBAND_ISER"
+	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
+	if linux_config_exists; then
+		if use tcp; then
+			for module in ${TCP_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use infiniband; then
+			for module in ${INFINIBAND_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use rdma; then
+			for module in ${RDMA_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
+			done
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
+		-i etc/iscsid.conf || die
+	sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
+		-i etc/systemd/iscsi* || die
+	default
+
+	pushd iscsiuio >/dev/null || die
+	eautoreconf
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+	append-lfs-flags
+}
+
+src_compile() {
+	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+	# is messed up already here, so it's not making it that much worse.
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		$(usex systemd '' NO_SYSTEMD=1) \
+		user
+}
+
+src_install() {
+	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+	# Upstream make is not deterministic, per bug #601514
+	rm -f "${ED}"/etc/initiatorname.iscsi
+
+	dodoc README THANKS
+
+	docinto test/
+	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
+
+	insinto /etc/iscsi
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+	newinitd "${FILESDIR}"/iscsid-init.d iscsid
+
+	local unit
+	local units=(
+		iscsi{,-init}.service
+		iscsid.{service,socket}
+		iscsiuio.{service,socket}
+	)
+	for unit in ${units[@]} ; do
+		systemd_dounit etc/systemd/${unit}
+	done
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi
+	fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
+		{
+		  cat "${EROOT}${in}.example"
+		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
+		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
+		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
+	fi
+}
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 3b92ee6675c2..caa6b8e6cd29 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -6,7 +6,7 @@ DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057
 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
 DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
 EBUILD open-isns-0.100.ebuild 1261 BLAKE2B e3506bb9111cbca5e33a53d03213361687f572181971bd9760b3f0416e39ae748fe0b4288b45e1c4ec7feb2338365b31c80a8e7ca950fbc2d666cb9d45624c33 SHA512 19ec911eebf9c99572334c8fb71a67f6db12e951d9cc6c10023dc1e96186d65df8882075ac6ad3302c9a69a93a543e34dcf8911ae8468506391b77110ccbe98f
-EBUILD open-isns-0.101.ebuild 1156 BLAKE2B 73e2fb83feca8d8dfc401a994554cc5e0df44547c9f9f1a48dbb7698a560b02e0bf2eb5f38843cd195511b19570ee6f966d3cfc5c63de2e5fdf32fa8a592a586 SHA512 684ed4a4d1ba3c9ba42a5b53c337fd70658a8a2adfd26c84ad6fcbc0b9aebf1eb86141e45f62bb906d514c37501c3b2b85b8a1846cf848c3c3d08b6e6c5041fb
+EBUILD open-isns-0.101.ebuild 1193 BLAKE2B 7ddcc9de1b8ad65734b9a34668ac6f2fa901b03c073a7f2e6a861ebbdf6a938e805c8d7ce2e325ef1083f1d053d6da8a82a82d347d23bff51e80e8bfac8d5152 SHA512 25465d2f691b14506b5f92c42cb2a5bdc23eb6a85824008b13c089e778f1382e3bf91a344c6f0daa1c2fe5c6e31c817cdde013dab1283addd6ceb463feb49770
 EBUILD open-isns-0.98.ebuild 929 BLAKE2B 962fd74c8666f42bb2d4879d17b212e18cd49c756ebeb68deb94cb7e9129d5973f2ead0a6b3ff21ee90578f05b7e5ef001c441e5f7bc6dba05cecd4acaac1b91 SHA512 ec3fc2fffc5f677787983e190e2a8f2b71632d48c0537ed2d84b0a4eed3af5a72bd989eaf04dd1b88cfa270fb6bb6cee64aa65127669a8a627bbbfa86d40fdae
 EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
-MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
+MISC metadata.xml 342 BLAKE2B 3ecae5f098564e59660a3e1de7a3b6ee2dcb7cd2d7ad2acc37e61680910e1fbd5edd2540e20783ca642440bc947cdb40feb6a84e434aba123346f48c6ee48265 SHA512 02d015cd6497b76f48eea880b745556f1a433db2893b91ef8254cf40a1bda2209feb42c01ff29dd6e4a3fdf588a8905076952e838b89a29ab99ccfc39927940a
diff --git a/sys-block/open-isns/metadata.xml b/sys-block/open-isns/metadata.xml
index c3470797ff9d..2d10cd2ea31e 100644
--- a/sys-block/open-isns/metadata.xml
+++ b/sys-block/open-isns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-block/open-isns/open-isns-0.101.ebuild b/sys-block/open-isns/open-isns-0.101.ebuild
index 96ec16b185b7..5f7c4bb83ec7 100644
--- a/sys-block/open-isns/open-isns-0.101.ebuild
+++ b/sys-block/open-isns/open-isns-0.101.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+	touch aclocal/ar-lib || die #775389
 }
 
 src_configure() {
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 2d2be36c86fd..229d7aef7c33 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,3 +1,3 @@
 DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
 EBUILD targetcli-fb-2.1.53.ebuild 721 BLAKE2B a43c18f7f0951e2c9aaa7971faeb2a0cefda3f81ae6e16ee1d804c6d78f7a2cf77be9fc4671d99f4e6d016fa8f840ff0fd6d410b2be8455287e87dcfec981670 SHA512 7b57be73dbf1c490628280728f018be2600514bbcb4f9cf837734da365c0a6f672fc3059a6f07f1daab5a4212143b577a1cce1b9d41a8156bffa463b9c248171
-MISC metadata.xml 735 BLAKE2B 6306128a74e5466aeb66571b1cfa2594415c8f824a9a0b45280693825cac5529e445b8dcf3f0a7983906bf9db33547438876cdc8a3e819d135ce8193d5f83070 SHA512 ccc02ad3448f3518ada4bd17c84a3bbe3b585fe5b54c83a2aa9d2ac98b3e5d6aaa32da81116ede44a53f6fee73fa8f1f7d0f0d37a2fd553d5cc87fdb18201307
+MISC metadata.xml 765 BLAKE2B 5a12363893c568f146f903613937866223e8669db98dc0d52d32171c825d6c99538f3f2f98aa96763d6dff408da70b3d3954cf60d2035fe3d9d31570b41ffa08 SHA512 66a601fbd1a83b46049db14f5e57270fb717f3e007ca2cb3c38f6e0b17c8432b0c1613d55af2dacccfb0779993d1266965f95f37ed56c16ca499851d198bd216
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index 2bcdb6d3131e..7e9f22942fd3 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index b36dd3eada9d..886050603261 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -4,4 +4,4 @@ EBUILD zram-init-10.5.ebuild 1812 BLAKE2B ab1bf793161192950c29473c2bf6e1479f6ec0
 EBUILD zram-init-8.1-r1.ebuild 1420 BLAKE2B cc89bf351776d5ecf21fbb4cf6f01fde82f66128740691973aba48242247009c7c291a3be9e42aa52b9902d29b667df91eec34cd8c20fa7d225d142269ab8add SHA512 f2458e9cf76bc3649f89fb6badcba7161b22a8a10acb35fc0eae2676e785cf4812c09364383dae3fe7cf621ed303fae26971eb18a1911d2125abf55cbd0de19f
 EBUILD zram-init-8.1.ebuild 1315 BLAKE2B c69bbf1dbeea335ea19d2ba94421d63383caa2c5f3f647574bb7eb7e74d51a015c37657def90747abc8d3d9523a7f2e4d7719e87e8908896ad48c91b85d3f709 SHA512 13a8fecf004cf3ff28e533fba8ff437e89d4feee47abf52019276ebf6eb59d23fb8fed8b550cd33c20b5dc6ec66fcfd79e1a66c0aaad4cf6d931a9d7f3599073
 EBUILD zram-init-9999.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632
-MISC metadata.xml 725 BLAKE2B 1bec9f0a9fdcaddc89365d689cd2b661520180a822e2044935c2ab131b01d500f1f1a68049b0e4f4c5a400669fce87c824a749ae0852e477c10f2ec5af5d998a SHA512 32cc2ffc65cd72a8813a30a592d8ac722ba3c0860d5ad31931628fc5e89bf13ee9b04532681e01d750895a035316b2f10a170ce8543b05f147df3a314f5fe329
+MISC metadata.xml 739 BLAKE2B a907095c7d155c98084d75046884123f2012c1bb5de20bc91546de31768c8a7ab78d5f9d8ed53ae308c8f71c6b69cb97adf214a331fd540d197798ee5b156ecc SHA512 9f2f591bce9762df432c7273565b4bdfd76f1beefa91b5fecb84978ab348901b47c233b888f12b29662b9d8f142b5b14808b9e57ccf0b2670349d053fa4163bb
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml
index 013ba527f064..f4d1636d972f 100644
--- a/sys-block/zram-init/metadata.xml
+++ b/sys-block/zram-init/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>beatussum@protonmail.com</email>
 		<name>Mattéo Rossillol‑‑Laruelle</name>
 	</maintainer>
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index cc363cce8ea8..fbf128db63ab 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 095ed5a11216..57305bb234f4 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,12 +1,15 @@
 AUX 2.04-sparc64-bios-boot.patch 1600 BLAKE2B be98526db413307f7f704c68c332ce8d76f41baa80e6372d293cbb74acb5fb07c2bf6d34315196ea03e62e18d847b068819a19a97b294e8e29453651df3bd49c SHA512 07a222dcb2c73cd5c2fc10eb154597e751e7b6d73e726ead280b1773ece6b2a3f1698dece876f7ed5cc764cf0bc12c664ea643638c203068fea25778cedffb92
 AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
 AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2121 BLAKE2B 398195f59537d40a4f61eadf5be974b8f9eb56a4eb07b798f0dc18e29588b3a9f8daa8d6e64980a835ec1960fab60b8c96d6552ef2920fe6604170abf7d5e7da SHA512 f85bc538ae647c46efbe07d7b87acf49daa7b07e9752af3aa3f77019f48ea24cd1b6a095a6f9c19d50128701753f453c531b9b068e11ee22a259f3fdf8ac205e
+AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce0dfe2a301342f1a3bb75d6fcb5d73da9997fb8a93f36dffb43a351f056a1a4db9eed3147b0f3e77c65034b805c64 SHA512 627422377bdad97d0197f178814d6616a0f7ec07357182b00166a455d38ba0c5a60185c5febf4dfb7a11b35f26c7af607508cb5f418acdb7290517240fbd99e4
 AUX grub.default-3 2528 BLAKE2B c32de43644eca5fae8d8d727ff443600917a93e015f8a83dde555e3bca7506a817b08a2fc926970eeb5b7f40028f4951c6cdcd281f9fc0b6504f26c8e76bf0c5 SHA512 505960e62b44c70af0a90c7ff486bd57101831d7c6e9d80084013e374070ff02b40f77b0790aebb926e1e0854e375867cba1d4977dbb00c2ba54ebaa9f6a1a0b
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
 DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
+DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B 2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d SHA512 093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.04-r2.ebuild 7494 BLAKE2B dd37527f6b35ef238b2505118e32d38c239aa4b89586e2d3a729fdefa7fb9032a81530dcd0934caf429ca000f7c07912f08691a28d77c8469ae00dbe6d5a60d8 SHA512 eb36c5ce0f4a5d468d246a866fe12fc52c5b8b6c072257751c0f31572eb47aa08d3cb2797ed431c3d864b25bb3848c313e4f8a4468f95ec18fbffa4591ca6411
+EBUILD grub-2.04-r2.ebuild 7501 BLAKE2B e64a738cd7f766b2fd7fa41ab870ce5e94d4f703229a2c4172121ce9a79bc99a5c3544a2fc700d67d673634d92f924d727cc2701251e4310241bbc3c81e1199c SHA512 bb3bea4f42165d8d086673adb568ad8a10ca5492aee0e64f5a84678ddb7190c8d8949ef63d15bc0218d1f58f685811cd895d0efb4b4bf048f1d902adc0bfc410
 EBUILD grub-2.05_alpha20200310-r1.ebuild 7210 BLAKE2B fdca373bc7d51a766370e82f0c8affcc19e9e7e2714891a35bae888c4863ef2069a0d456c24ec173278331e74c617f20f987dea2077bb8fe1485e60806cafeb8 SHA512 c2a4ec85fba69b159ed06c3144ae27f4c7a1cd67967aee8f32e64891a5d14eb5cd093e7bf67abd3ef8960f434afe4cb9d4db74dc05b1ccbd115be74fcc1d9b9e
-EBUILD grub-9999.ebuild 7462 BLAKE2B dfba1d4575990c02afcb37e812c43fec851d5f7ae5d85eabc237373e181260020f4d0e55257d8ef52b2b5219c83f7e3f30b60987e141fb852c8021cda881c03f SHA512 6e29715385e207ea75ef836e6f34cf70b36dbd9dce42025aae0e68a7f85869d36572238387ce4c2354b77481d44860ed92e193fa3e6e622da196612d9b3ad806
+EBUILD grub-2.06_rc1.ebuild 7234 BLAKE2B 2da7de304371e6aff77d7533a590ebab3bec38041ac07072f019162d3808592659bc8c183904f9f9c01d0db4492c225745922b67d293466980476eaa9b53308d SHA512 0e325d388c98fce761eae97445e82b33db182de3ecf8637e367d46fa0a3a2ff430e68d26653588f5e0a9383d82b5346d9222b5bf21a5a54323e92b75bd833d20
+EBUILD grub-9999.ebuild 7234 BLAKE2B 2da7de304371e6aff77d7533a590ebab3bec38041ac07072f019162d3808592659bc8c183904f9f9c01d0db4492c225745922b67d293466980476eaa9b53308d SHA512 0e325d388c98fce761eae97445e82b33db182de3ecf8637e367d46fa0a3a2ff430e68d26653588f5e0a9383d82b5346d9222b5bf21a5a54323e92b75bd833d20
 MISC metadata.xml 985 BLAKE2B 36f108b5d3441f8576609c77ab3547c60ac2c508b55472bd0ec0e3af8d0fa018d305d7267c0e2e84c8526affced9ed5ce51738b9fcf05b31ac36c1b4d5c2702a SHA512 bd28dd88d4eb76a32cfa757eb5bf7641d033f670280ab7230b72a66b1bd8fd65c777473b1d7f81257004a215fe5a858a79a6a912e0ceaecd586867e9a76f6b4e
diff --git a/sys-boot/grub/files/grub-2.06-test-words.patch b/sys-boot/grub/files/grub-2.06-test-words.patch
new file mode 100644
index 000000000000..a3fe0602d2b4
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-test-words.patch
@@ -0,0 +1,25 @@
+From 0f5080a2f3c952e2ee00bd271f42c56bb955dc19 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Mar 2021 12:44:52 -0400
+Subject: [PATCH] Use /usr/share/dict/words as a 'compressible' file
+
+---
+ tests/util/grub-fs-tester.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
+index bfc425e1f..efd2977b0 100644
+--- a/tests/util/grub-fs-tester.in
++++ b/tests/util/grub-fs-tester.in
+@@ -265,7 +265,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
+ 	    MASTER="${tempdir}/master"
+ 	    FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
+ 	    CFILESRC=
+-	    for cand in /usr/share/dict/american-english /usr/share/dict/linux.words /data/data/com.termux/files/usr/share/hunspell/en_US.dic; do
++	    for cand in /usr/share/dict/words; do
+ 		if test -f "$cand" ; then
+ 		    CFILESRC="$cand"
+ 		    break
+-- 
+2.31.0.rc1
+
diff --git a/sys-boot/grub/grub-2.04-r2.ebuild b/sys-boot/grub/grub-2.04-r2.ebuild
index e68f15c3a276..04098f7fd8ef 100644
--- a/sys-boot/grub/grub-2.04-r2.ebuild
+++ b/sys-boot/grub/grub-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
@@ -24,7 +24,7 @@ if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
 		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
 		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 	else
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild b/sys-boot/grub/grub-2.06_rc1.ebuild
new file mode 100644
index 000000000000..29c5c03332ac
--- /dev/null
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTORECONF=1
+	GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+	PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+	inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+	WANT_LIBTOOL=none
+	inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+		MY_P=${P/_/'~'}
+		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+	grub_platforms_coreboot? ( fonts )
+	grub_platforms_qemu? ( fonts )
+	grub_platforms_ieee1275? ( fonts )
+	grub_platforms_loongson? ( fonts )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-misc/pax-utils
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	fonts? (
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	test? (
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
+		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
+	)
+	themes? (
+		app-arch/unzip
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5:0=
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs:= )
+	mount? ( sys-fs/fuse:0 )
+	truetype? ( media-libs/freetype:2= )
+	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!sys-boot/grub:0
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		pushd "${P}" >/dev/null || die
+		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+		git-r3_checkout "${GNULIB_URI}" gnulib
+		popd >/dev/null || die
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i -e /autoreconf/d autogen.sh || die
+
+	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+		python_setup
+	else
+		export PYTHON=true
+	fi
+
+	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+		eautopoint --force
+		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+	elif [[ -n ${GRUB_AUTOGEN} ]]; then
+		./autogen.sh || die
+	fi
+
+	if [[ -n ${GRUB_AUTORECONF} ]]; then
+		eautoreconf
+	fi
+}
+
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=i386
+			fi ;;
+		*-64)
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+			fi ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		$(use_enable device-mapper)
+		$(use_enable mount grub-mount)
+		$(use_enable nls)
+		$(use_enable themes grub-themes)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use_enable sdl grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use fonts; then
+		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	fi
+
+	if use themes; then
+		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
+
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# Bug 508758.
+	replace-flags -O3 -O2
+
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	tc-ld-disable-gold #439082 #466536 #526348
+	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+	unset LDFLAGS
+
+	tc-export CC NM OBJCOPY RANLIB STRIP
+	tc-export BUILD_CC # Bug 485592
+
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+	# The qemu dependency is a bit complex.
+	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+	grub_do emake check
+}
+
+src_install() {
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-3 grub
+
+	# https://bugs.gentoo.org/231935
+	dostrip -x /usr/lib/grub
+}
+
+pkg_postinst() {
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may consider installing the following optional packages:"
+		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+		optfeature "Enable RAID device detection" sys-fs/mdadm
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4a29991e9720..29c5c03332ac 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-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
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+	PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
 	inherit python-any-r1
 fi
 
@@ -24,7 +24,7 @@ if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
 		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
 		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 	else
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
@@ -39,6 +39,7 @@ fi
 PATCHES=(
 	"${FILESDIR}"/gfxpayload.patch
 	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
@@ -110,7 +111,7 @@ RDEPEND="${DEPEND}
 		grub_platforms_efi-32? ( sys-boot/efibootmgr )
 		grub_platforms_efi-64? ( sys-boot/efibootmgr )
 	)
-	!sys-boot/grub:0 !sys-boot/grub-static
+	!sys-boot/grub:0
 	nls? ( sys-devel/gettext )
 "
 
@@ -121,6 +122,10 @@ QA_PRESTRIPPED="usr/lib/grub/.*"
 QA_MULTILIB_PATHS="usr/lib/grub/.*"
 QA_WX_LOAD="usr/lib/grub/*"
 
+pkg_setup() {
+	:
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -139,16 +144,10 @@ src_prepare() {
 
 	sed -i -e /autoreconf/d autogen.sh || die
 
-	# Nothing in Gentoo packages 'american-english' in the exact path
-	# wanted for the test, but all that is needed is a compressible text
-	# file, and we do have 'words' from miscfiles in the same path.
-	sed -i \
-		-e '/CFILESSRC.*=/s,american-english,words,' \
-		tests/util/grub-fs-tester.in \
-		|| die
-
 	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
 		python_setup
+	else
+		export PYTHON=true
 	fi
 
 	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
diff --git a/sys-boot/metadata.xml b/sys-boot/metadata.xml
index 2d91fb22ab0d..c1c38a7d7f54 100644
--- a/sys-boot/metadata.xml
+++ b/sys-boot/metadata.xml
@@ -33,4 +33,3 @@
 		nimi pakiety.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-boot/plymouth-openrc-plugin/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index 72056c6eaaac..18ebb2be7349 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST plymouth-openrc-plugin-0.1.3.tar.gz 9404 BLAKE2B 809cfab881ef47565badfc330b77ae07a8bbbddf822cbdb50f2d1d2a0c95f915ac5024e02400ab2ea9d8f98dc466a8a3cbad92805587f77a00e58c9f9d78d388 SHA512 b07a4d9d56c8f49d5b0a91799fe0100eac705cd2a266674539948fdc661876474a93d8ed5f329f097a1fc5dc571f3b3c00322191fb77d2a7e32b1ff192ca0a6b
 EBUILD plymouth-openrc-plugin-0.1.3.ebuild 747 BLAKE2B 8e572b805ec906c17ef5640b44ec7a518d447f5db15995206f59cf170bb6f61ef1f2517c2ebee6b7b223e63492b934394bbe4c10e2b04f053c51e1047a7d000d SHA512 57c074f4e83ad7866bbd6f971b9866d072fc1f948238cfd377dc2ee397e811aceea32c9145d34743888e3e59f4416746b0dd3b6dfd51c4556e4b382a8120e8af
-MISC metadata.xml 572 BLAKE2B 7862ed5b0127297bd18885d61ffedd913b4c1baa065db2360dd22051c99a3d788c3c645c01219898ff3ceb78f3af324211af538d4ae33c6e7b63a3c52534278b SHA512 4ad96493abcebf578888dce532d28dad483a0b0836cca97cc2c62aaf8c93656e38286ba93684cf4e792880f7dc9a94f94e40b937da8d37f6ab932ff9801d76d4
+MISC metadata.xml 602 BLAKE2B 6f978b61e4bfe3e6a753516c0e7219e534d0e04d4e6918d9e10efefdd41eede641bcc81fa545ddf259cdc8eb4e541a7466c963e2de63613bce5bfc6956a01b65 SHA512 5f431c9113eb893a12e941b61be564f70dd2e8b345382df8fdbed32b70a3de60a3cc11fe7d5a68a5f5b72ecab8257d31158d46d4d58ab884e2af1a77c7f703b9
diff --git a/sys-boot/plymouth-openrc-plugin/metadata.xml b/sys-boot/plymouth-openrc-plugin/metadata.xml
index abb6f67a40e5..d1afa4c7ed32 100644
--- a/sys-boot/plymouth-openrc-plugin/metadata.xml
+++ b/sys-boot/plymouth-openrc-plugin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Kangie@footclan.ninja</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 2f3994cc4b05..fb0f3db2b6a3 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -4,4 +4,4 @@ DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a1202
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 52a388dc1e57232d120b745e3089bad0d12265dd7718589cc7af9a8a1defa105bb74d01f76510bcaafbcb64f435b3e4a555c64d2c4538ae3cd56027b769a36db SHA512 b17c07d927462adae1b9644bdfd53d3ab58e193f02e54b45c50cbc9f100adca01d97631aeb85c014069733e11645af47b275fa2cef65b73ebd9c39a1ab40f96c
 EBUILD refind-0.12.0-r1.ebuild 3719 BLAKE2B ca10b2ea88821c597c58b1a801d96e811088ce36b01128b6a4e1719c71b3cdb228580f0399a963a7db09fc02d4ea01d613ab51d60547388e531d101cbead8500 SHA512 9a3a367c466c82d5e92cb0a6ec52d19660db06e88a1bcf73bd12ef43dc4fd5fa4a6381f5c03e2d3a28f1c558789fc85de8b5a0d622d11079dcbc22b707370422
-MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336
+MISC metadata.xml 3851 BLAKE2B 743b712aaf6f8407a408c8bd95a0342b047d6c9803622f5a90f6e39548d90086193187ff9ef77bebcae92bab28dda246b52fb7539d638b3d3455fae3988e37b0 SHA512 5d43d61af0ef36449c2d480215ed69ca22f00459fb1bec1f3fc0e3791a2421d031fdcdddf0bdf5cd3dae848998b09d93da2cc90e35757bc327aa44f43c362fde
diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 38e94c129835..e9dfb4c9305b 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sveyret@gmail.com</email>
 		<name>Stéphane Veyret</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index d79dbea8f8c2..cfd22172e6b5 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1,4 @@
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 EBUILD systemd-boot-245.ebuild 2512 BLAKE2B 4b2f10ed6e8dc496744248bcdac1ee81fcced374b12a6097f6ac4331aef87ddc9fdb175b3366904380d278465bd8f95d35963427be662d40c90d532a20cbd6fd SHA512 f89f93cac8d826b11838736b7886a24debd5890097323e3baeb82f3f72d14f9d5f634a7025126d6862b98dae5e3127846e167145fd090fa3099027999b3e505b
-MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
+MISC metadata.xml 326 BLAKE2B e83f99b56ed59bed68ba738195e4eb54340f462bf786cebba3c044b3d086ed8a75946598b61c208c325f7fa053716c5dbdc6d5bfa52d4ea5fe1dfc7fcef590bb SHA512 6aaccf80be1b01c3f928038202a6fbafc86ddedea14c58d0561cc316e3e1e974433a4000d5e52d5a84e3fe47ba94461c7646c69db6e0dfbebda2f5f70712e80c
diff --git a/sys-boot/systemd-boot/metadata.xml b/sys-boot/systemd-boot/metadata.xml
index 709bb609069e..03e94e356180 100644
--- a/sys-boot/systemd-boot/metadata.xml
+++ b/sys-boot/systemd-boot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index bb265a58aebf..3268dd16c7c7 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 023f72ee5ca7..cf77fd8cb86c 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -37,9 +37,11 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f SHA512 94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-14.2.17.tar.gz 129270233 BLAKE2B 1e20185f24b7bc806a37ee59fee24138556837722e27a7fb36da268e5c330bb4dac3601dac4373f404c528e55fa79420f965807d215a54f5db9205ebb877166f SHA512 56ae460474afb8f208900c9ec6f55b120dd7229cb3297cb6f4f522cde8e693ede16d6064410074ea3c2a56df67c13fbbd102bce2d489e9b310544e374315b9eb
+DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef SHA512 56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03
+DIST ceph-15.2.10.tar.gz 148500214 BLAKE2B c24679bc5e41da45b093dcd01fa103fd3dff45ddc7d244acebd182547851f426dd140e24ae5afafd71d797b185d6825fbdb9b84abd5c7ead41d5f29b06ed01fa SHA512 20202c07a068f99d5ce56b1969f703f996ad34c201ea3ab9bb05ea278afac71ccba43fb03e9de641dc3ab9692eecfcc6f52ff1ac03e13a1dc2f939bd8159fc2d
 DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00 SHA512 1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff
 EBUILD ceph-14.2.16-r3.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
-EBUILD ceph-14.2.17.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
+EBUILD ceph-14.2.18.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
+EBUILD ceph-15.2.10.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
 EBUILD ceph-15.2.9-r1.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
 MISC metadata.xml 1980 BLAKE2B 3250403d1ba99c5b26b6dba381d2a3b01649ab23a2e2eb1cbc94a49888851d4faf19fc85ca54ad4a4c64394d8c00cefb571e27979c3482f0a60f2fc891476305 SHA512 343a75b9b4fdf88d7ad91b9a0fff154041a2a56ed0d07204b3af61b8605da969a736b6ef9a4b334a5f7d5257b9bbcbb705fd20f6def7dab767f4c9d9b600f2c4
diff --git a/sys-cluster/ceph/ceph-14.2.17.ebuild b/sys-cluster/ceph/ceph-14.2.18.ebuild
index 9b819976edd8..9b819976edd8 100644
--- a/sys-cluster/ceph/ceph-14.2.17.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.18.ebuild
diff --git a/sys-cluster/ceph/ceph-15.2.10.ebuild b/sys-cluster/ceph/ceph-15.2.10.ebuild
new file mode 100644
index 000000000000..2772dbbadd51
--- /dev/null
+++ b/sys-cluster/ceph/ceph-15.2.10.ebuild
@@ -0,0 +1,405 @@
+# 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
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
+	system-boost systemd +tcmalloc test uring xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	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/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:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	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/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5400M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 23e6559e08b2..1fda97ce4769 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -3,4 +3,4 @@ DIST charliecloud-0.22.tar.gz 402106 BLAKE2B 4c2d4bf77424c5b46e5593bc28bbe10891c
 EBUILD charliecloud-0.21.ebuild 2196 BLAKE2B a5f30b994890e202010119cb881b5f3287dd5ca63e73086d9d5942a54a3cdc24692ee4f102f7af53bad24a7f2b152a0ab580ee1b66f2f2c81dcf26b94f1601ad SHA512 84c4d4a72b18d8bb960457ae13d5aa6abe231d1dfa36f6e75c7645f4b18a17799634ab3614aedc298a6658383ad0cc2e76316442bf0a38b50a4a07b4d76d4434
 EBUILD charliecloud-0.22.ebuild 2196 BLAKE2B 31b4db90331d96bcfda9dedc69ee10f18aeab7b8934bf02c27f35e26410022fc3e4f07ec32bfd754da1ab8f5d0db9761dbac7a5188add749661694d9aabc6d75 SHA512 686eb4005918610923ebb422dfa349190a7517eb31227572d8ec7bf6e1372856cbd3922824544881d98e0c4dc15ab3c4958d544cd15627d4c15a616ca6f7323e
 EBUILD charliecloud-9999.ebuild 2196 BLAKE2B a5f30b994890e202010119cb881b5f3287dd5ca63e73086d9d5942a54a3cdc24692ee4f102f7af53bad24a7f2b152a0ab580ee1b66f2f2c81dcf26b94f1601ad SHA512 84c4d4a72b18d8bb960457ae13d5aa6abe231d1dfa36f6e75c7645f4b18a17799634ab3614aedc298a6658383ad0cc2e76316442bf0a38b50a4a07b4d76d4434
-MISC metadata.xml 587 BLAKE2B 7a63f23fc8c34c9460040e44499d09617e5d283d60822f36d0c27ba54164398f3bcb9e2791fa56a18d1bf56a4c627b91ed5d27982a90a3e4ce29934878073d42 SHA512 d2af08f522601a216d688ec385bb2f724e1ec9133bfefbe1d7b2a1d97e3f44c80c46005be35ecd75f9c3e5133bee0a631485a5de7e2a0bff3e3cbbdce959bbdd
+MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index b580309d72a1..89ff741f2b40 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
@@ -13,6 +13,6 @@
     <remote-id type="github">hpc/charliecloud</remote-id>
   </upstream>
   <use>
-    <flag name='ch-image'>Build the internal builder ch-image (previously named ch-grow)</flag>
+    <flag name="ch-image">Build the internal builder ch-image (previously named ch-grow)</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 9504d22dd0cf..ec8071c92530 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -6,5 +6,5 @@ AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de9
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
-EBUILD drbd-utils-9.15.1.ebuild 2614 BLAKE2B 3ddcbdc367b19a44e8248c083929f54487adcfe70a3a685346e15df3f6128c24e2add56166fac8b0a1865e7cf2935f77a48b19d90b8a5094e85aab5ce19104e9 SHA512 9bdb178bdd5fd963d8d99f03cd901e7aa0c1b7b9e219cbd1fbc48bb8513ffcf2ff92ee43165b322f1464894eb3542577d71bc7755b4b520d8d5574cb7deb3083
+EBUILD drbd-utils-9.15.1-r1.ebuild 2692 BLAKE2B 5edf2a0685826f55b27eb6d7fba7f5451ee96c34a179cca644144202a44b2e2b824fb97ccdd135b6514822f2ac88d9063f7622fa89d8bc8edf1d033861ba5ae9 SHA512 c671b8ae9954e77f900269771aa830ca841b548dc69ac8017ce6f1d92c3d3585255ca82ec4fc9a7088d60e196a5f59fefdbd805ace3646187c18302c6eae2147
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
new file mode 100644
index 000000000000..f8a1b38d22fc
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1-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 bash-completion-r1 udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+HOMEPAGE="https://www.linbit.com/drbd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="pacemaker +udev xen"
+
+DEPEND="
+	pacemaker? ( sys-cluster/pacemaker )
+	udev? ( virtual/udev )"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-run-lock.patch
+	"${FILESDIR}"/${P}-sysmacros.patch
+)
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+	# respect LDFLAGS, #453442
+	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+		-i user/*/Makefile.in || die
+
+	# respect multilib
+	# bug #698304
+	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/*/Makefile.in || die
+
+	sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || die
+
+	# correct install paths (really correct this time)
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
+		scripts/Makefile.in || die
+
+	# don't participate in user survey bug 360483
+	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bashcompletion \
+		--with-distro=gentoo \
+		--with-prebuiltman \
+		--without-rgmanager \
+		$(use_with pacemaker) \
+		$(use_with udev) \
+		$(use_with xen)
+}
+
+src_compile() {
+	# only compile the tools
+	emake OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools install-doc
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+	dodoc scripts/drbd.conf.example
+
+	keepdir /var/lib/drbd
+	rm -r "${ED}"/var/run || die
+
+	# https://bugs.gentoo.org/698304
+	dodir lib/drbd
+	local i
+	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
+	done
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo "man 8 drbddisk"
+	einfo "man 8 drbdmeta"
+	einfo
+	elog "Remember to enable drbd support in kernel."
+}
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
deleted file mode 100644
index adb7a23c4af1..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.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 bash-completion-r1 udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
-HOMEPAGE="https://www.linbit.com/drbd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pacemaker +udev xen"
-
-DEPEND="
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-run-lock.patch
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bashcompletion \
-		--with-distro=gentoo \
-		--with-prebuiltman \
-		--without-rgmanager \
-		$(use_with pacemaker) \
-		$(use_with udev) \
-		$(use_with xen)
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools doc
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools install-doc
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	keepdir /var/lib/drbd
-	rm -r "${ED}"/var/run || die
-
-	# https://bugs.gentoo.org/698304
-	dodir lib/drbd
-	local i
-	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
-		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
-	done
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
index b9a2f21685f9..ba728b3bdc9d 100644
--- a/sys-cluster/ganglia-web/Manifest
+++ b/sys-cluster/ganglia-web/Manifest
@@ -1,3 +1,3 @@
 DIST ganglia-web-3.7.3.tar.gz 709356 BLAKE2B 8d5ac9eb8bd37ea040b08caa763797929acac3bd520c88af0e8fd3a9cfbc28d2a55e42d772ca1b6d5e87fe7dce6f4a6e7e15b836d06052c7e642885c727070cc SHA512 884b1ba168b8fe01aa865ae77df6995bb5a09a8b2d441189264283fc1c95b8a6fd0800488ad75e9c1cdd3694b9d6c1c33218ddad804ade2d6be948791b797a95
 EBUILD ganglia-web-3.7.3-r1.ebuild 1065 BLAKE2B a8087bf40205cd2b9fecbec4e8e97fb2a36ca15248d5d47754cb12ef0527d18b6563b4f0ee6bbfcf95f361644b3e2b1c26ebef8357d38252eb464ef7e4a300a4 SHA512 6ed8d9a4daeaf6cf0e11c9fd3fbb701561fd87a70ddaaa55ebce0d2f15338065971c4ec397e0a2953b59fde42a655dfeaa8fbb52ecbae5c5a072815a6e3fd2bc
-MISC metadata.xml 633 BLAKE2B 29ba6ca6f778c6ce5067e0063afed1eb2c4c918c1627f7e8767750bfad4d6576e710d869912eae816a0db523d110385ae77b1f60205f3968a900b624bcbc604a SHA512 0968fdd09ec185b3a88a6656d816da77c1e08950b3395b3377969da698c4288c2e127fe4a3e97ea20d936d1a6aab280d5b9bf1df52b3da4bcefdc289a05dcd89
+MISC metadata.xml 663 BLAKE2B 152cbfe1c070742e6618fcab10a75ded3d8c30e888e72c1d8d28a4745b3486d2041620cc64e31afdebaf9cb50adf2b8bec7e7ba0f719e1352a17e5444f4d061c SHA512 0f68c80efe81a8a6817d1417fa3c8f86cb3ba84ba490ceb0e9b50e33f10fb0612fc093a66487e5a9398021bb2dae4ebce3eabe3b73e3bdc05002900fc0106b8a
diff --git a/sys-cluster/ganglia-web/metadata.xml b/sys-cluster/ganglia-web/metadata.xml
index 9c08c34000c6..c9513d708ff4 100644
--- a/sys-cluster/ganglia-web/metadata.xml
+++ b/sys-cluster/ganglia-web/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dan@danweeks.net</email>
 		<name>Daniel M. Weeks</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 7a6071a4a2e4..f632ca564e3a 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -5,15 +5,12 @@ AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d6
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
-DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125
-DIST glusterfs-7.8.tar.gz 7703665 BLAKE2B 39a2b459fc021bf17c2ea12661d8c808a688c5934de087d23550409f6c68dff5ea94156dcba52f15d78db8b600ebf9418152a6d6bf10d1ac6291d43d14f3ceda SHA512 40f7df4bb80a372b370366e8f370f9efdf838122be84d5524b2353027b4eb6005a43b808911214c56411264764164d6480418329db94ed0fe284fdcbd9bccbea
 DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
+DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
-EBUILD glusterfs-7.7.ebuild 6021 BLAKE2B 8fa14aca6d875f249394d2e789f24d6117be84fb843571ffe0801de154f9895d498ecec94ca19853d663cc91da8739c7f76d10254c8cf87dff99a59c104f4e97 SHA512 ae62b59e2a86455bded295bc228375278c20a087e4a0d1aa87d30557e5650d66299a8aaa01c4c83c1b12cf75f1f2bb49ebb6cf39610aab8cb3b242866d14d5d9
-EBUILD glusterfs-7.8-r1.ebuild 6047 BLAKE2B d9774fd4008b3db282ec4552d617d8c5f6f4691ce5c5b6f8d10e2f49367ea8f9b231643993b64d1fdb8cdbeaa6b1eb5d5563ff09bc75611439986bf011641b1e SHA512 1f45d9004d11650333b5e8da161bd964cf63fa48423744f0a50b153bf5dd6523f0516ac107452c86cb048e5ebc7964fd7b577e63c8963dba9057935f0290093a
-EBUILD glusterfs-7.9.ebuild 6057 BLAKE2B 830f2663d250a0a5d8fd416f64987903f57320159d70a66fd20047b22c6a7f5fddf129cab2cc984ad150736577071a33091bf95b01312f26dbd273c8dbc538ad SHA512 f354ef6c4325bd650a8b4d799604fc0adb3f75435912f8c3b70ac015778220a068439706b8616e5eed9b525841a7697a73be11d7913b84a72bc96db4d5d88267
-EBUILD glusterfs-8.3.ebuild 5571 BLAKE2B bee24160ef958ea64135b9bef14b86a057a76d0ad2f4d784019c850155650506451065c2848d6e783019b893312341b7c143d521e55acca3d7374e2a34574086 SHA512 0686cd96ef8dc5224cc288af1ae83c9b56815655c7a1806bcd1fef0a9f2202c1184c857c64e1e005265052793db3609abe00413edccc53afb1c73f0695675224
-EBUILD glusterfs-9.0.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
-EBUILD glusterfs-9999.ebuild 5975 BLAKE2B fbdd9a5bc3f752562a77e6feeeb0fb675f285893923ce418f52158c3b9953348f6120f3537b8920d51a56f2b9748eacd17161e1cadbde879cdb3246e30084801 SHA512 8abe566a9400d78417a9d8cf1b1966bcf5afa2a2d1dd9e9a00a8b5325a57c6cdcfba6ef453d8a9db06c8fce4e0fa79af7e16c256a4812fb2f2dcda058317d58f
-MISC metadata.xml 1472 BLAKE2B d4aa7cc4c10e383af3c4cdb201894e8bdcf85822a98920c8ab7d262bf6c028b02ca0f4a06e6717c8bb4d11d803cba7daffa917be64392dd26dca677a00312af7 SHA512 0de0bb313c559ed3623e84960dee5e3c5628f8c793e7ed376fb7f88311f6879d15dfe112e27ce4dbcba69dbec00b73a03ed78e5d4eafcaec6383ea13908b6c31
+EBUILD glusterfs-7.9.ebuild 5938 BLAKE2B 7b31e021d5702e99ef8041f3cb7345ec13f88b721adbe8aaae10432592186bbadb8327fce4f2ba6416e40c4b1c75a05f0a1de53c3f4aeb55143ebe66b2bf42a1 SHA512 d1b260eea7412f9db4d0054fa8d9b4ee265232d31b68bbb7171ba28927c8fe1348032a80386da19c851735a0c3264dfb1b32e2bf0dfb520f172e755458178e65
+EBUILD glusterfs-8.3.ebuild 5452 BLAKE2B 1746dbcbe52adca356cb848d864daae65fbac286e9a5ead200db2efe1e007f0ab8029baa8e5d3de898cdbe5c2be62f00d8f7d33e7c2d5eca78cb09f69d9db18d SHA512 b35a4949640fc579acb4254536e5242592ddcfb78ae79280b115c8b6565160f7b5bb9aafa41f97cb4d66d800e7048bd50a266bca8b0e4ab9412f7865cce396d3
+EBUILD glusterfs-8.4.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955
+EBUILD glusterfs-9.0.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955
+MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
deleted file mode 100644
index 77bd676415e3..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.7.ebuild
+++ /dev/null
@@ -1,211 +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 elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.7-flock.patch"
-)
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
deleted file mode 100644
index 44c9755c9263..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.8-r1.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} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.7-flock.patch"
-)
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-
-	python_optimize "${ED}"
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
index 45b362b492e5..84f522b78c81 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
@@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools elisp-common python-single-r1 systemd
 
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-fi
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
diff --git a/sys-cluster/glusterfs/glusterfs-8.3.ebuild b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
index 8354a144baa5..7781fd95707c 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
@@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools elisp-common python-single-r1 systemd
 
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-fi
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
diff --git a/sys-cluster/glusterfs/glusterfs-8.4.ebuild b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
new file mode 100644
index 000000000000..447c689852df
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
@@ -0,0 +1,193 @@
+# 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 python-single-r1 systemd
+
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/glusterfs-9.0.ebuild b/sys-cluster/glusterfs/glusterfs-9.0.ebuild
index f8603e0e9ea4..447c689852df 100644
--- a/sys-cluster/glusterfs/glusterfs-9.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.0.ebuild
@@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools elisp-common python-single-r1 systemd
 
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
deleted file mode 100644
index 4d96e7c5291e..000000000000
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ /dev/null
@@ -1,207 +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 elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index 4b9042d82440..a56a24bcf1f6 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jpds@protonmail.com</email>
 		<name>Jonathan Davies</name>
 	</maintainer>
@@ -13,7 +13,7 @@
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>proxy maintainers</name>
 	</maintainer>
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 2a64a22daefc..414443615a84 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -5,4 +5,4 @@ AUX hpx-1.6.0-tests.patch 4965 BLAKE2B dfbc54a24095ce171657185a3f9ee3c1574bd0864
 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
-MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da
+MISC metadata.xml 1219 BLAKE2B de2e75ab303cc78d91a327e4887bcb312095757503a93ecd646abbc7e8e44c9d9872768bdc5bdd8200894d904e6306cd6540edf5579a64e686ceed9694701715 SHA512 d696bba0202c159da2a1b887cb66838f1a967a0053ebce6d131dd3dc670a69cf6313ca027a3e2fe9f7c302fbcd1cafb1b3ffe7b057b8d268056640c44b2e3776
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index f23d6af9310e..4d61b53a1533 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/metadata.xml
@@ -9,11 +9,11 @@
     conventional architectures and, currently, Linux based systems, such as SMP
     nodes and conventional clusters.
   </longdescription>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kurt@kmk-computers.de</email>
     <name>Kurt Kanzenbach</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 7293709d04cd..27dff46390ff 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,14 +1,16 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kube-apiserver-1.18.15.ebuild 1004 BLAKE2B 37352f285c75f1fd14d2acdd847caad33e422d47dcd768dd1e1bc2adf968eda55bb0e7fb90c1f0055909a6a3d6e3e714d08ab8bbaa5bd1c32a6dcb84ff6d8bf7 SHA512 194dbdb7bde76fcd1f3d623dfe92790968da796e8272dfa6920cd965daaad6cf4a92661fec81e2fe3fb009a0d9b49dd732db83132cc474d212e8b9963d2d5f8d
-EBUILD kube-apiserver-1.18.16.ebuild 1004 BLAKE2B 37352f285c75f1fd14d2acdd847caad33e422d47dcd768dd1e1bc2adf968eda55bb0e7fb90c1f0055909a6a3d6e3e714d08ab8bbaa5bd1c32a6dcb84ff6d8bf7 SHA512 194dbdb7bde76fcd1f3d623dfe92790968da796e8272dfa6920cd965daaad6cf4a92661fec81e2fe3fb009a0d9b49dd732db83132cc474d212e8b9963d2d5f8d
-EBUILD kube-apiserver-1.19.7.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kube-apiserver-1.18.16.ebuild 975 BLAKE2B bef47882dfc4d6ff525c792b23a7578715f8868c1f7d1417adbf10688130ef79dc7a3f352b811bdd5f05857d3c16be2eca17cc7bbae0edef222a18f01fd2d1ad SHA512 e1d3c64092bb131439115024ab9fa5f51289fc0f29d7f2fdde32e184371a57b6a8b1a57dfc407358200ff573cb2fc6097f1c3dd579cf57f47528f0f581323dbe
+EBUILD kube-apiserver-1.18.17.ebuild 976 BLAKE2B 14fdd8d8543d95b6c2f58ac687250b3949fa505038517315b4126810830640e4ef2602fea9abf4a3d92cd9c1bab4c25f0b6e2924b468cd570d1b4e4fe7fabfdc SHA512 b9468374ef0353582fe02c08089edd29bf72bc84ebeb50ef9a38d0cde4c9ad13486f62f290a60824c84e783c31b19abb5dc3900381f9dc274e19fec6fe74efc0
 EBUILD kube-apiserver-1.19.8.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+EBUILD kube-apiserver-1.19.9.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 EBUILD kube-apiserver-1.20.4.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+EBUILD kube-apiserver-1.20.5.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.15.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.15.ebuild
deleted file mode 100644
index dadfa3ce121d..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.16.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.16.ebuild
index dadfa3ce121d..b37dff4ea499 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.16.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.16.ebuild
@@ -19,7 +19,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.17.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.17.ebuild
new file mode 100644
index 000000000000..e114fb4f459b
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.7.ebuild
deleted file mode 100644
index c7e9121eb778..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.9.ebuild
new file mode 100644
index 000000000000..0c60e4a0143a
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.5.ebuild
new file mode 100644
index 000000000000..0c60e4a0143a
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 004dc87e033c..62edfc9d4a17 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,14 +1,16 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kube-controller-manager-1.18.15.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
-EBUILD kube-controller-manager-1.18.16.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
-EBUILD kube-controller-manager-1.19.7.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kube-controller-manager-1.18.16.ebuild 966 BLAKE2B 8c9c1778634b786e9eeef0e554e512fb28abcd615cd7e1c7de19e4a55a5d1abccaac1da3efd9552234da0479519a1573e62a5eaf529092e1188aa7e455b52404 SHA512 b5544a072376fdf94fb8dfd39e3c940d47b656f31bc2027621c5c2ee1b071521c8a368d26f64070228c1488b4d0c910540e8c3cedda49a8b70e8a7b29e0eee66
+EBUILD kube-controller-manager-1.18.17.ebuild 967 BLAKE2B dd2011e0672d7d96faf89a3048ab4ed77ef4bf289bbc4b4d455d6a66b2ba3fcc3d49f443a7927905c02989545097e73a0aeeca820d8636b05324f32a05fbf820 SHA512 445198f0c8880e338e08d6b60ca3a27b909e40827b016f6f5b601d511fe627548f82462354ca200bda21fbcfd9af91f15c5f822f9f3d5203364c2b01282448a5
 EBUILD kube-controller-manager-1.19.8.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.19.9.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 EBUILD kube-controller-manager-1.20.4.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.20.5.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.15.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.15.ebuild
deleted file mode 100644
index a8f8cabb4852..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.15.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.16.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.16.ebuild
index a8f8cabb4852..ff369dd8cd5f 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.16.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.16.ebuild
@@ -18,7 +18,6 @@ COMMON_DEPEND="acct-group/kube-controller-manager
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.17.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.17.ebuild
new file mode 100644
index 000000000000..5b94d0c42700
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.17.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.7.ebuild
deleted file mode 100644
index 1ebd04eb6335..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.7.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.9.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.5.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 1c69bd9f0391..8d2a12dbe154 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,14 +1,16 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kube-proxy-1.18.15.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
-EBUILD kube-proxy-1.18.16.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
-EBUILD kube-proxy-1.19.7.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kube-proxy-1.18.16.ebuild 892 BLAKE2B 6c1ee99fe5ec365d42060d191849745a6324e4dfc9d21dc3794dd2750e951e35c2202ed9bb70b136bcf7d4f7bcbf7eb12dba02af8264de29699b02fbad7dfb4e SHA512 a35e418cbdac12f0ab44f690f368ea302e50c182d08e86ffb6f6eb344e646ea2e2a95d075c3be479f8e7d7f9b876a2e1674a3a1c06d3b99719435cfc000791f7
+EBUILD kube-proxy-1.18.17.ebuild 893 BLAKE2B 71edab8458f5a9e0177493824d35d2b7a9bafaad10809f82d20d46ce432d041b3031526dc81af97efc959ec8e0402583fa6119a12d94bd910a0139b1918f5f2d SHA512 5dcca55eb7075f7258884892a0dd256b857a18c05dc1928805fda887dba6b83a2e0b1815c21542e72cb4f7fe37d679ff1439a2e804585fdc0052f952891d4142
 EBUILD kube-proxy-1.19.8.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+EBUILD kube-proxy-1.19.9.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
 EBUILD kube-proxy-1.20.4.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+EBUILD kube-proxy-1.20.5.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.15.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.15.ebuild
deleted file mode 100644
index 5ef88fafdada..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.16.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.16.ebuild
index 5ef88fafdada..1d1531e7c387 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.16.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.16.ebuild
@@ -15,7 +15,6 @@ IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
 	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.17.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.17.ebuild
new file mode 100644
index 000000000000..48a822b6fd3f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.17.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.7.ebuild
deleted file mode 100644
index ddc12b2f8a73..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.9.ebuild
new file mode 100644
index 000000000000..2bf8b1a469e1
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.5.ebuild
new file mode 100644
index 000000000000..2bf8b1a469e1
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-router/Manifest b/sys-cluster/kube-router/Manifest
index 04442bf4c3ef..873df5862ab7 100644
--- a/sys-cluster/kube-router/Manifest
+++ b/sys-cluster/kube-router/Manifest
@@ -1,12 +1,6 @@
 AUX kube-router.confd 320 BLAKE2B a3b4973007bab2d7b4bf4f21beb85c59adb0d66b2dd4bf1152d7818b1039e74624e0a2255123cbdace8e419aed1e0a9e87ba3c6b7fa7263cb4667fcabce6829b SHA512 cc150ad9dae389011449c31541a326625f781ead15cc12502bdb5704b13921e0a4a740abb27fafb7dc260c6d66f44e855ecf5ef1300077377a9aa0a08f50db1c
 AUX kube-router.initd 963 BLAKE2B 5226134d18790b246bcd516f72f54f992ebc61f69799a730e095e65bc4c805494d8760ec0ce9f564c8ee7856379993cf18b9e5ce3d10c25afbbc0937b1d075b8 SHA512 f6c41ae0ff20abd1e1f29ede282f49fad0112fa634104b6603d5a1d78ff6457e5739956b2e28353f2b21964b5ec11158626b1cbbb8cea510cdb5463a062e8d63
 AUX kube-router.logrotated 85 BLAKE2B 41c40f60ee686f7387e01c85345e6d8d3c562df2363ba3963a0f465d70a3439d2496931b94f05a1c607d04d4269fd087a4c0e1fd9c3a6f7db89d33bbc366bb30 SHA512 19e92adbc5ff8548784481cdc63d8010c386ea799350d7426c22f9b71c09c4ec9b1ec0a7e08069e1fb5cb51b0a37435ae42b12caf2d8679f2cb892fdc6bf96e1
-DIST kube-router-0.4.0.tar.gz 8403982 BLAKE2B e5e9e92064f00d696ca1cde310813541910d3e37b9c31336b1f2729e63a963fb454a2a9d07b2394134b9ea96e64d6caa26b6230bfd214883f5951bcfdd30c674 SHA512 00617e434b770c1b5eeb3f2c85ae9b6f49157224a5df223f5d1ec514ba087164bb03f0e28a38c75d3149c0c028ed54ceccf898a77c474bbf64921f45db7c3e3c
-DIST kube-router-1.0.1.tar.gz 8413249 BLAKE2B dd158fda5a25925d1f630764f7ad77a821c145def887093692333fcdb4e9a3d9736fe3243f7834abf60d71835fe37a81e4d0a9f20cb45e05d9bb817a50d81196 SHA512 a84176785367fb87562a9a410d87376d938fb32c8aec0cd71259ca3af2204b76ba083201b5f2ad38b395a83a321f0feec4b304a4f3add595b5eadf0837a6918b
-DIST kube-router-1.1.0.tar.gz 8095149 BLAKE2B 9487d329ef1dc09b0e0d58233a4440da53a239f78dfd4d1f4676c23c347f550431c2a898656e0670afc002bd5435ae172662408fa3526335af95303a1ac9d6d9 SHA512 14ff214257fb0dd1a2e98c5d2a5abb65d2b104402d8403066225274f85dfa861fef6c2b389c2c008a07b42367bb5be52785e375c13e2feffd915863f1da5c86a
 DIST kube-router-1.1.1.tar.gz 8155406 BLAKE2B c036f94eb8e938d37fcc62c58d64c718493d730e0b3fec9ecc2287a772f9890cf63b9728c3c8b0eae00098173e237b91a3dc8801029ed026800b5df3076e7d5a SHA512 172921e999cd9634663ec522623259ad9b64ce18506b8358d90547714f64a5c0b73598f8da402e1f4ecdabb3f4d5602e784f27a55747a7d4d2c47c42f51abfef
-EBUILD kube-router-0.4.0.ebuild 5257 BLAKE2B ddde07a17a1683a0c4adb1fa99e78ac15850a762c1eaeed2e4cac1957fd7225a5c402795d817cc8e9700d3aa170ae004d5d16e9664304a74931c123e9a5436f8 SHA512 00aeb5a34a105d0e5ce74ec835ae2e8df56ec7f9994577d7bebe6a4c1e254977e96029573a0b6c29fcbff3ea2a9f1f7eff14f0d3171604bd6d910c06c0fbedcf
-EBUILD kube-router-1.0.1.ebuild 6423 BLAKE2B 6fe7a2501be0970e96f99a390bd26af361c244a7b2b8fe3b3daef3a2b75a8657256276551a6e1d849b65ce36c43476c7f22e474d2c64aa844c43458f615202df SHA512 ad87bf32a8475821ce9af56313c7882c854b417dcc1f073efe8675952a384b6683c377735912815930c5d0f5cf45191edfad6ab88bad23bd37c9b31abbde6fd7
-EBUILD kube-router-1.1.0.ebuild 933 BLAKE2B 8ade85c07e6663f990166fc790fd1fdfa727a81a98b7a05e43b40be79e1b9d33380c5a1e2a50d177af1253c4c2deb63232d71182a15c820e648c365d899a407b SHA512 6cfa18ec1fb750bed13bf2e263c3a72483e97e658a04cee4347b1df80da6e1c9ad3ce963be223b5ca8eb839c191095f4bfd30558a33de773d70c8188bbc6d299
 EBUILD kube-router-1.1.1.ebuild 933 BLAKE2B 8ade85c07e6663f990166fc790fd1fdfa727a81a98b7a05e43b40be79e1b9d33380c5a1e2a50d177af1253c4c2deb63232d71182a15c820e648c365d899a407b SHA512 6cfa18ec1fb750bed13bf2e263c3a72483e97e658a04cee4347b1df80da6e1c9ad3ce963be223b5ca8eb839c191095f4bfd30558a33de773d70c8188bbc6d299
-MISC metadata.xml 848 BLAKE2B 3ba78ece1af8cf69ab50f10afdd24ff8765b1bace2ba02ec094dde976d216d7cb1afc9a2d69d6b674aa03bd842bfa453f0583380119bf8595fbc524fc9fd0e51 SHA512 5746d825adf43cbf15d4d9886194c1ab351497a0dc8110d9e19c879c306ac1e808c1986346de5f842b8b3910febebbe7b81f6c909f3ccd7067507b83396b166e
+MISC metadata.xml 878 BLAKE2B 4c61f7609bb57ce7d3f6b19264f1a93be684a1e414891a940c34d5512f786ed2d35e4effc8ade0fdda201dce89a33627579347afec2531af17494cf8f4f36fd4 SHA512 44e3d26421dadf0137f661d8821fa1d2f2970ec0b3eb8a92ca95066fa1432fa85507069de0c33a81cb36294be4300fcd1e128d6030f4e45bc8b281cb38982a60
diff --git a/sys-cluster/kube-router/kube-router-0.4.0.ebuild b/sys-cluster/kube-router/kube-router-0.4.0.ebuild
deleted file mode 100644
index 1200a1c74c0b..000000000000
--- a/sys-cluster/kube-router/kube-router-0.4.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/cloudnativelabs/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A turnkey solution for Kubernetes networking"
-HOMEPAGE="https://kube-router.io"
-SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
-
-# It will fail (timeout) at least with standard set of FEATURES attempting to serve bgp
-RESTRICT="test"
-
-SLOT="0"
-
-RDEPEND="
-	net-firewall/iptables[conntrack]
-	net-firewall/ipset
-	sys-cluster/ipvsadm
-"
-
-# Vendored dependencies (helps with LICENSE, see https://bugs.gentoo.org/694792):
-# github.com/aws/aws-sdk-go # Apache-2.0
-# github.com/containernetworking/cni # Apache-2.0
-# github.com/coreos/go-iptables # Apache-2.0
-# github.com/docker/docker # Apache-2.0
-# github.com/docker/distribution # Apache-2.0
-# github.com/docker/go-connections # Apache-2.0
-# github.com/docker/go-units # Apache-2.0
-# github.com/docker/libnetwork # Apache-2.0
-# github.com/osrg/gobgp # Apache-2.0
-# github.com/prometheus/client_model # Apache-2.0
-# github.com/prometheus/client_golang # Apache-2.0
-# github.com/prometheus/common # Apache-2.0
-# github.com/prometheus/procfs # Apache-2.0
-# github.com/satori/go.uuid # MIT
-# github.com/vishvananda/netlink # Apache-2.0
-# github.com/vishvananda/netns # Apache-2.0
-# github.com/beorn7/perks # MIT
-# github.com/davecgh/go-spew # ISC
-# github.com/dgryski/go-farm # MIT
-# github.com/eapache/channels # MIT
-# github.com/eapache/queue # MIT
-# github.com/emicklei/go-restful # MIT
-# github.com/emicklei/go-restful-swagger12 # MIT
-# github.com/ghodss/yaml # MIT BSD
-# github.com/go-ini/ini # Apache-2.0
-# github.com/armon/go-radix # MIT
-# github.com/go-openapi/spec # Apache-2.0
-# github.com/gogo/protobuf # BSD
-# github.com/gregjones/httpcache # MIT
-# github.com/hashicorp/golang-lru # MPL-2.0
-# github.com/go-openapi/jsonpointer # Apache-2.0
-# github.com/go-openapi/jsonreference # Apache-2.0
-# github.com/go-openapi/swag # Apache-2.0
-# github.com/howeyc/gopass # ISC
-# github.com/imdario/mergo # BSD
-# github.com/influxdata/influxdb # MIT
-# github.com/jmespath/go-jmespath # Apache-2.0
-# github.com/json-iterator/go # MIT
-# github.com/juju/ratelimit # LGPL-3-with-linking-exception
-# github.com/opencontainers/go-digest # Apache-2.0
-# github.com/opencontainers/image-spec # Apache-2.0
-# github.com/peterbourgon/diskv # MIT
-# github.com/PuerkitoBio/purell # BSD
-# github.com/PuerkitoBio/urlesc # BSD
-# github.com/mailru/easyjson # MIT
-# github.com/modern-go/concurrent # Apache-2.0
-# github.com/modern-go/reflect2 # Apache-2.0
-# github.com/spf13/afero # Apache-2.0
-# github.com/spf13/cast # MIT
-# github.com/spf13/pflag # BSD
-# github.com/spf13/viper # MIT
-# github.com/spf13/jwalterweatherman # MIT
-# github.com/fsnotify/fsnotify # BSD
-# github.com/hashicorp/hcl # MPL-2.0
-# github.com/magiconair/properties # BSD-2
-# github.com/mitchellh/mapstructure # MIT
-# github.com/pelletier/go-toml # MIT
-# github.com/sirupsen/logrus # MIT
-# github.com/matttproud/golang_protobuf_extensions # Apache-2.0
-# github.com/golang/protobuf # BSD
-# github.com/golang/glog # Apache-2.0
-# github.com/pkg/errors # BSD-2
-# github.com/google/gofuzz # Apache-2.0
-# github.com/google/btree # Apache-2.0
-# github.com/googleapis/gnostic # Apache-2.0
-# google.golang.org/grpc # Apache-2.0
-# google.golang.org/genproto # Apache-2.0
-# golang.org/x/crypto # BSD
-# golang.org/x/net # BSD
-# golang.org/x/sys # BSD
-# golang.org/x/text # BSD
-# k8s.io/api # Apache-2.0
-# k8s.io/apimachinery # Apache-2.0
-# k8s.io/client-go # Apache-2.0
-# k8s.io/kube-openapi # Apache-2.0
-# gopkg.in/inf.v0 # BSD
-# gopkg.in/tomb.v2 # BSD
-# gopkg.in/yaml.v2 # Apache-2.0 && MIT
-
-# Test dependencies:
-# github.com/onsi/ginkgo # MIT
-# github.com/onsi/gomega # MIT
-
-src_prepare() {
-	eapply_user
-	# we are going to remove some stuff that is not required for compoilation
-	# but may have some license issues
-	local unneeded_dir
-	local unneeded_dirs=(
-		github.com/howeyc/gopass/terminal_solaris.go
-		github.com/docker/libnetwork/client/mflag
-		github.com/prometheus/client_model/ruby
-		github.com/docker/docker/contrib
-
-		github.com/Microsoft/go-winio
-		github.com/inconshreveable/mousetrap
-
-		github.com/petar/GoLLRB
-		github.com/spf13/cobra
-	)
-	for unneeded_dir in ${unneeded_dirs[@]}; do
-		mv -v "${S}/src/${EGO_PN}/vendor/${unneeded_dir}" "${T}" || \
-			die "can't remove ${unneeded_dir}"
-	done
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${S}" go build -x -work -v \
-		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
-"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
-		-o kube-router cmd/kube-router/kube-router.go || die
-	popd || die
-}
-
-src_test() {
-	pushd "src/${EGO_PN}" || die
-	emake GOPATH="${S}" BUILD_IN_DOCKER= test || die "Tests failed"
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "${PN}"
-	einstalldocs
-	popd || die
-
-	newinitd "${FILESDIR}"/kube-router.initd kube-router
-	newconfd "${FILESDIR}"/kube-router.confd kube-router
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kube-router.logrotated kube-router
-}
diff --git a/sys-cluster/kube-router/kube-router-1.0.1.ebuild b/sys-cluster/kube-router/kube-router-1.0.1.ebuild
deleted file mode 100644
index f1c72e8048b8..000000000000
--- a/sys-cluster/kube-router/kube-router-1.0.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/cloudnativelabs/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A turnkey solution for Kubernetes networking"
-HOMEPAGE="https://kube-router.io"
-SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
-
-SLOT="0"
-
-RDEPEND="
-	net-firewall/iptables[conntrack]
-	net-firewall/ipset
-	sys-cluster/ipvsadm
-"
-
-# Vendored dependencies (helps with LICENSE, see https://bugs.gentoo.org/694792):
-# github.com/PuerkitoBio/purell # BSD
-# github.com/PuerkitoBio/urlesc # BSD
-# github.com/armon/go-radix # MIT
-# github.com/aws/aws-sdk-go # Apache-2.0
-# github.com/beorn7/perks # MIT
-# github.com/containernetworking/cni # Apache-2.0
-# github.com/coreos/go-iptables # Apache-2.0
-# github.com/docker/distribution # Apache-2.0
-# github.com/docker/docker # Apache-2.0
-# github.com/docker/go-connections # Apache-2.0
-# github.com/docker/go-units # Apache-2.0
-# github.com/docker/libnetwork # Apache-2.0
-# github.com/davecgh/go-spew # ISC
-# github.com/dgryski/go-farm # MIT
-# github.com/eapache/channels # MIT
-# github.com/eapache/queue # MIT
-# github.com/emicklei/go-restful # MIT
-# github.com/emicklei/go-restful-swagger12 # MIT
-# github.com/fsnotify/fsnotify # BSD
-# github.com/ghodss/yaml # MIT BSD
-# github.com/go-ini/ini # Apache-2.0
-# github.com/go-openapi/jsonpointer # Apache-2.0
-# github.com/go-openapi/jsonreference # Apache-2.0
-# github.com/go-openapi/spec # Apache-2.0
-# github.com/go-openapi/swag # Apache-2.0
-# github.com/gogo/protobuf # BSD
-# github.com/golang/glog # Apache-2.0
-# github.com/golang/protobuf # BSD
-# github.com/google/btree # Apache-2.0
-# github.com/google/gofuzz # Apache-2.0
-# github.com/googleapis/gnostic # Apache-2.0
-# github.com/gregjones/httpcache # MIT
-# github.com/hashicorp/golang-lru # MPL-2.0
-# github.com/hashicorp/hcl # MPL-2.0
-# github.com/howeyc/gopass # ISC
-# github.com/imdario/mergo # BSD
-# github.com/influxdata/influxdb # MIT
-# github.com/jmespath/go-jmespath # Apache-2.0
-# github.com/json-iterator/go # MIT
-# github.com/juju/ratelimit # LGPL-3-with-linking-exception
-# github.com/magiconair/properties # BSD-2
-# github.com/mailru/easyjson # MIT
-# github.com/matttproud/golang_protobuf_extensions # Apache-2.0
-# github.com/mitchellh/mapstructure # MIT
-# github.com/modern-go/concurrent # Apache-2.0
-# github.com/modern-go/reflect2 # Apache-2.0
-# github.com/opencontainers/go-digest # Apache-2.0
-# github.com/opencontainers/image-spec # Apache-2.0
-# github.com/osrg/gobgp # Apache-2.0
-# github.com/pelletier/go-toml # MIT
-# github.com/peterbourgon/diskv # MIT
-# github.com/pkg/errors # BSD-2
-# github.com/prometheus/client_golang # Apache-2.0
-# github.com/prometheus/client_model # Apache-2.0
-# github.com/prometheus/common # Apache-2.0
-# github.com/prometheus/procfs # Apache-2.0
-# github.com/satori/go.uuid # MIT
-# github.com/sirupsen/logrus # MIT
-# github.com/spf13/afero # Apache-2.0
-# github.com/spf13/cast # MIT
-# github.com/spf13/jwalterweatherman # MIT
-# github.com/spf13/pflag # BSD
-# github.com/spf13/viper # MIT
-# github.com/vishvananda/netlink # Apache-2.0
-# github.com/vishvananda/netns # Apache-2.0
-# google.golang.org/genproto # Apache-2.0
-# google.golang.org/grpc # Apache-2.0
-# golang.org/x/crypto # BSD
-# golang.org/x/net # BSD
-# golang.org/x/sys # BSD
-# golang.org/x/text # BSD
-# k8s.io/api # Apache-2.0
-# k8s.io/apimachinery # Apache-2.0
-# k8s.io/client-go # Apache-2.0
-# k8s.io/kube-openapi # Apache-2.0
-# gopkg.in/inf.v0 # BSD
-# gopkg.in/tomb.v2 # BSD
-# gopkg.in/yaml.v2 # Apache-2.0 && MIT
-
-# Test dependencies:
-# github.com/onsi/ginkgo # MIT
-# github.com/onsi/gomega # MIT
-
-src_prepare() {
-	eapply_user
-	# we are going to remove some stuff that is not required for compoilation
-	# but may have some license issues
-	local unneeded_dir
-	local unneeded_dirs=(
-		github.com/howeyc/gopass/terminal_solaris.go
-		github.com/docker/libnetwork/client/mflag
-		github.com/prometheus/client_model/ruby
-		github.com/docker/docker/contrib
-
-		github.com/Microsoft/go-winio
-		github.com/inconshreveable/mousetrap
-
-		github.com/petar/GoLLRB
-		github.com/spf13/cobra
-	)
-	for unneeded_dir in ${unneeded_dirs[@]}; do
-		mv -v "${S}/src/${EGO_PN}/vendor/${unneeded_dir}" "${T}" || \
-			die "can't remove ${unneeded_dir}"
-	done
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${S}" go build -x -work -v \
-		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
-"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
-		-o kube-router cmd/kube-router/kube-router.go || die
-	popd || die
-}
-
-src_test() {
-	local line
-	local testdirs="github.com/cloudnativelabs/kube-router/cmd/kube-router/
-		github.com/cloudnativelabs/kube-router/pkg/..."
-
-	local known_fail=(
-		Test_advertiseClusterIPs
-		Test_advertiseExternalIPs
-		Test_advertiseAnnotationOptOut
-		Test_advertiseAnnotationOptIn
-		Test_advertisePodRoute
-		Test_syncInternalPeers
-		Test_AddPolicies
-		Test_routeReflectorConfiguration
-	)
-
-	# concat as '|^Test1$|^Test2$|^Test3...$':
-	local known_fail_re="$(printf '|^%s$' "${known_fail[@]}" || die)"
-	# drop '|' in the begining:
-	known_fail_re="${known_fail_re:1}"
-
-	einfo "Looking for tests"
-	local working_tests_re="$(
-		# get list of all test:
-		{
-			GOFLLAGS="-mod=readonly" GOPATH="${S}" \
-				go test -list . ${testdirs} ||
-			die "Can't get list of tests";
-		} |
-		{ while read line; do echo "${line}"; echo "${line}" >&2; done; } |
-		# skip "no tests" messages as well as know failures:
-		{ grep -v -E " |${known_fail_re}" || die "Can't parse tests list"; } |
-		# format a regexp:
-		{ sed -z 's/\n/$|^/g' || die; }
-	)"
-	# drop '|^' in the end:
-	working_tests_re="^${working_tests_re::-2}"
-
-	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
-		go test -v -timeout 30s -run "${working_tests_re}" ${testdirs} || \
-			die "Tests failed"
-	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
-		go test -v -timeout 30s -run "${known_fail_re}" ${testdirs} || \
-			ewarn "Known test failure"
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "${PN}"
-	einstalldocs
-	popd || die
-
-	newinitd "${FILESDIR}"/kube-router.initd kube-router
-	newconfd "${FILESDIR}"/kube-router.confd kube-router
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kube-router.logrotated kube-router
-}
diff --git a/sys-cluster/kube-router/kube-router-1.1.0.ebuild b/sys-cluster/kube-router/kube-router-1.1.0.ebuild
deleted file mode 100644
index 7cb3180b581b..000000000000
--- a/sys-cluster/kube-router/kube-router-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="A turnkey solution for Kubernetes networking"
-HOMEPAGE="https://kube-router.io"
-SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	net-firewall/iptables[conntrack]
-	net-firewall/ipset
-	sys-cluster/ipvsadm
-"
-
-src_compile() {
-	emake BUILD_IN_DOCKER=false GIT_COMMIT=v${PV} kube-router
-}
-
-src_test() {
-	go test -mod=vendor -v -timeout=30s ./cmd/kube-router ./pkg/... ||
-		die "tests failed"
-}
-
-src_install() {
-	dobin "${PN}"
-	einstalldocs
-	newinitd "${FILESDIR}"/kube-router.initd kube-router
-	newconfd "${FILESDIR}"/kube-router.confd kube-router
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kube-router.logrotated kube-router
-}
diff --git a/sys-cluster/kube-router/metadata.xml b/sys-cluster/kube-router/metadata.xml
index 468a7ec1342e..904f1af8828e 100644
--- a/sys-cluster/kube-router/metadata.xml
+++ b/sys-cluster/kube-router/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>kpp+gentoo@qrator.net</email>
         <name>Konstantin Ignatov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 0080b89a130c..0d2d8c9f2be2 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,14 +1,16 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kube-scheduler-1.18.15.ebuild 979 BLAKE2B 3452a23ce4c0260f19ab673fa725d0dab18c06fcf194ad2703bc9d11fda99334d55c6eef701f92a82f049b8ad91d0d6ee2318df5b4c6e0cb4f50ebb82c4fa20d SHA512 f0256abcbb27d4eb0b5b1e7cf6b1b1ec37545bf6182a1a371a195317b729ca4e0d394d9bb89c1d6dd1cb770dc1fab5c66d3ccb422054d542904e8260944ade41
-EBUILD kube-scheduler-1.18.16.ebuild 979 BLAKE2B 3452a23ce4c0260f19ab673fa725d0dab18c06fcf194ad2703bc9d11fda99334d55c6eef701f92a82f049b8ad91d0d6ee2318df5b4c6e0cb4f50ebb82c4fa20d SHA512 f0256abcbb27d4eb0b5b1e7cf6b1b1ec37545bf6182a1a371a195317b729ca4e0d394d9bb89c1d6dd1cb770dc1fab5c66d3ccb422054d542904e8260944ade41
-EBUILD kube-scheduler-1.19.7.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kube-scheduler-1.18.16.ebuild 950 BLAKE2B 50d52255a541215f588090cb9029c8b9d395b8561bb04d5558edfea37f3bae0c9ec3ff99219c7eeb0dd7c98b6285d696ee756d36003923d804f59b929ac588a5 SHA512 44f9f88d549d5c9001efb7e8e94cc4b56a1f5716b49e5f5686efe46e94e4c9b5857b1f78b710e24b5addf980b2c94729ffc9a97b248189b6a8b41737ea08025a
+EBUILD kube-scheduler-1.18.17.ebuild 951 BLAKE2B 889e1160f46fdcf81ad6216f9c7b08f4f68f15fc1e600e4b798ec2d828ad770aab613b703f6bee094de0347800e72de0a6f5aad42895798f435fec262d874733 SHA512 41d94b4c66b1011872928178cd95c9af3c5875a4cb0a99a5456657494cc05e30c3031c0eefde0b9a99433001f2984c6fa1962570157636ed4bc9f94cee3ef1e8
 EBUILD kube-scheduler-1.19.8.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+EBUILD kube-scheduler-1.19.9.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 EBUILD kube-scheduler-1.20.4.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+EBUILD kube-scheduler-1.20.5.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.15.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.15.ebuild
deleted file mode 100644
index 050239c08999..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.15.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.16.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.16.ebuild
index 050239c08999..9e0b2abc985d 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.16.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.16.ebuild
@@ -18,7 +18,6 @@ COMMON_DEPEND="acct-group/kube-scheduler
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.17.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.17.ebuild
new file mode 100644
index 000000000000..c70e30706ea8
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.17.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.7.ebuild
deleted file mode 100644
index e25a81f904ce..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.7.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.9.ebuild
new file mode 100644
index 000000000000..177edc1feff5
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.5.ebuild
new file mode 100644
index 000000000000..177edc1feff5
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 4c475161c6c5..272e06ad2fd6 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,11 +1,13 @@
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kubeadm-1.18.15.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
-EBUILD kubeadm-1.18.16.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
-EBUILD kubeadm-1.19.7.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kubeadm-1.18.16.ebuild 872 BLAKE2B 55dda0d985be0c38976b72f818e77d6e3dc3e89da5f9d3adf4d87939f5153467f6d98cabb89c22713bb48774ea8a413f26ddf5de3938245b1e402bdc9ef61645 SHA512 e49be0b2e02a5cc27366f16d86e472ea3caaa700586ec879f84d76c8d7ce0e24ca2dfe6bc6dc4b36c9dd771d501ff93178fffc4388a922b2ba2ad7f0b0ba6199
+EBUILD kubeadm-1.18.17.ebuild 873 BLAKE2B 46ae1eff2de05962e5b285a5a57f238082295723a8a2a3068339c677b202277a5c0a1177b7e47730d1bf2e2bbe5617e3df288a175466ba06368333608b8ea9fc SHA512 4f2d0b99fc732ee9a32995b070c451f868e1aafc3bb57a4438410cd831e792f0feba36c4a9d070e81e2a3e759bfacf53483874561d151dabaa5e58c39ac77ed2
 EBUILD kubeadm-1.19.8.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
+EBUILD kubeadm-1.19.9.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
 EBUILD kubeadm-1.20.4.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
-MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
+EBUILD kubeadm-1.20.5.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
+MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.15.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.15.ebuild
deleted file mode 100644
index e301e2a424d4..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.18.15.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/kubeadm
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.16.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.16.ebuild
index e301e2a424d4..8afd617dd1f9 100644
--- a/sys-cluster/kubeadm/kubeadm-1.18.16.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.18.16.ebuild
@@ -14,7 +14,6 @@ KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.17.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.17.ebuild
new file mode 100644
index 000000000000..9e5a4644134c
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.18.17.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/kubeadm
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.7.ebuild
deleted file mode 100644
index 2d33afced967..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.19.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.9.ebuild
new file mode 100644
index 000000000000..192287ce82c9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.19.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.5.ebuild
new file mode 100644
index 000000000000..192287ce82c9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/metadata.xml b/sys-cluster/kubeadm/metadata.xml
index acebd7ff79e8..e27f14711448 100644
--- a/sys-cluster/kubeadm/metadata.xml
+++ b/sys-cluster/kubeadm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 63f165cae283..ccffa097ef8a 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,11 +1,13 @@
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kubectl-1.18.15.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
-EBUILD kubectl-1.18.16.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
-EBUILD kubectl-1.19.7.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kubectl-1.18.16.ebuild 871 BLAKE2B 989edf4c75a9e841fbad5223602146e128fa7d60fff7eee080b87f4263328359742d9c7368d6ffdd063a33ba4a5d907d3a2edbeddfa48ef4daa94bd06cbeb451 SHA512 f47a8cc3af8d9685608a232000c26b60d83c5669bc42a16077c9990014c0632deffe4af1970e086039a16aa98ea740cc6fb136139ae17418db1e9c490deaf6e6
+EBUILD kubectl-1.18.17.ebuild 872 BLAKE2B de2b17f79b9a93598e9471cec34d15d1c2dc7e7cc90329451b6c4815fedc88b0f770860a15bdcc71bb9586dcb6579bd8d356f75c4dcf9761f834d5cee44789f2 SHA512 3668ff6129475d71b7fd47e2c5eaa72f108434dfcef8705f9d7ba7ec301a1ac72bb03f784d8cb21f9d1d4b0454e98e7936d7e684d62924e98fb6768995b210c5
 EBUILD kubectl-1.19.8.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
+EBUILD kubectl-1.19.9.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
 EBUILD kubectl-1.20.4.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
-MISC metadata.xml 334 BLAKE2B e4daad1c0150025addcba294ef07c06e004c6d713e0d03a72b70a51bc44d6a4b0a86c9cd543af113c312f693d79c2985b679d6774a54370e9af9b0430de63f22 SHA512 f894ee487b6aff7d302bef231d72faba7ae9c0aa673974b306a4b74fe3b90dbc62c49b6bd829cc1b439a6d820ffe94db3a15ea2209250fc3b13c8b06297af27c
+EBUILD kubectl-1.20.5.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.15.ebuild b/sys-cluster/kubectl/kubectl-1.18.15.ebuild
deleted file mode 100644
index 9640e72af8ee..000000000000
--- a/sys-cluster/kubectl/kubectl-1.18.15.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.18.16.ebuild b/sys-cluster/kubectl/kubectl-1.18.16.ebuild
index 9640e72af8ee..019e60f6b742 100644
--- a/sys-cluster/kubectl/kubectl-1.18.16.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.18.16.ebuild
@@ -14,7 +14,6 @@ KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kubectl/kubectl-1.18.17.ebuild b/sys-cluster/kubectl/kubectl-1.18.17.ebuild
new file mode 100644
index 000000000000..405ebe938dd5
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.18.17.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.19.7.ebuild b/sys-cluster/kubectl/kubectl-1.19.7.ebuild
deleted file mode 100644
index 1f18731b5eb7..000000000000
--- a/sys-cluster/kubectl/kubectl-1.19.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.19.9.ebuild b/sys-cluster/kubectl/kubectl-1.19.9.ebuild
new file mode 100644
index 000000000000..716d7d53396c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.19.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.20.5.ebuild b/sys-cluster/kubectl/kubectl-1.20.5.ebuild
new file mode 100644
index 000000000000..716d7d53396c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/metadata.xml b/sys-cluster/kubectl/metadata.xml
index 056f63d5504a..601df5439e13 100644
--- a/sys-cluster/kubectl/metadata.xml
+++ b/sys-cluster/kubectl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 65e716bc826f..1b51c852295f 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,14 +3,16 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.18.16.tar.gz 32675639 BLAKE2B 825ccd4c275d52e1d7d24ffce19d5d9ea8314d2ea57746cce5cce165c314cff67f5fbc6678ab1fa9e0d81d6a086fad6a084d11d2b3757fe3a71f3298df960815 SHA512 f525577f0e55736c6702663c9de9a54e7ece5701f334948ec56b2d0d5041e54b5fdc440dfbfede5e886c2b30c2223eba4d2da7131e58c48043cfa75513f7f59f
-DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
+DIST kubernetes-1.18.17.tar.gz 32689483 BLAKE2B 2310419636078610ceb9f3233846f043c7af8f8ecf65e4129666e0835e5a328be57adb31603c98a2753444fd32cc0c0cc444bdbb6c4c1558743e7f45fbb68ef0 SHA512 5d8ae2fb8a962b8a09b58667d57114a4c75c2b7ae75c9ba0f8b68fccd0f58a3cdb44288a71fbd2f528fe93e280c6b95ea57fe0bbf1b2203aec9fd39fc7fd3f79
 DIST kubernetes-1.19.8.tar.gz 33500610 BLAKE2B 2d86519b056f6dcacbaf368af34e66754a25fb84fc981a5c9d6ddea0f95f87fa61b36afe9ee8d80381084cb5f0018c36671e7d08e8a27b7bf334858800172da4 SHA512 0cefbe0cd29ee3916867549f2aa2a4eb60f87c9fc0fa4bae3748cc4eadd76685f868a9e30a50af092f55c0942bbd5e30648021ec0781afdcdd5f8d4014724c64
+DIST kubernetes-1.19.9.tar.gz 33504366 BLAKE2B f339c64cea9c84e67bb72067512576cb2e89bf78d425c1e0ec15f1d87980312df221266d58d7a89aa1949b2aed513df05905b9ce959185209365f5a98703fc7e SHA512 0aa01de3cf3e7d1b000a422768cc665a0b58eac10045629c5eabae6688a47d19ef36b98f6d1719263b3c9877808f0f13f43cd764f691849bda385f4f96ea92d1
 DIST kubernetes-1.20.4.tar.gz 34447775 BLAKE2B b38d55023a750da0f04df69548523832ac6b41b1ca1bac2e04cfb4d2c84233fd6adfc55912b39986428f6af8bd64f8e0ec5f12a560ed66c29eca8befef595491 SHA512 e10784a9920af8480cdd2dbcca65c8502034365e224ef8fa822633f0d480fecaca25e5b6d97743c83527729a2e200509dda38c421cbd7b286fec7500226df631
-EBUILD kubelet-1.18.15.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
-EBUILD kubelet-1.18.16.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
-EBUILD kubelet-1.19.7.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+DIST kubernetes-1.20.5.tar.gz 34438218 BLAKE2B f95d5be4f00c7465e07f9b543fbb9fbf1da50bd1894b92fb0861884ea82b4b43d3bbffaad6f2dfa2349f229e6e900c0df8dd992e0a965b033aa415362c9bd1da SHA512 9375597576d074f36989a76d8abd054f5974ea8b1ee837e2707e0485b94f0b76bbdfb1532b632b8e83d6410e553bb4197e9fe045fbeb05fb33a2b8bfae738642
+EBUILD kubelet-1.18.16.ebuild 967 BLAKE2B 6bd0e20b204adbde178c2276a81d69b4d027f9b38ccf40f7641bf6d45fa1e746b59ef666dfc91ff1b14a332f6b8da266e431e39db020203c9f527222564847a8 SHA512 6654316a5b37260aec1f728619e485ab709938e8f2a006a5673085e97fabb4a259425cd903c7578c2d69d36287fa0db01f47f369030e30d1e55b926baf72b6c7
+EBUILD kubelet-1.18.17.ebuild 968 BLAKE2B 912c866ece2f2d653036d97b87a0c453a15ab35b1b44c104060ee0f5bb10d1f7f7eb70927afc2d99b27c01ca99ab908ca0e65d9064288d673022f3df1afa239c SHA512 10426f821e6a0940bb3a2f21608e5389019a04209736d116af8c3933aea09779ef2dd2353295d8cbdff73ee672beca4671d974842e04acb81276c37af1408f0d
 EBUILD kubelet-1.19.8.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+EBUILD kubelet-1.19.9.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 EBUILD kubelet-1.20.4.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+EBUILD kubelet-1.20.5.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.15.ebuild b/sys-cluster/kubelet/kubelet-1.18.15.ebuild
deleted file mode 100644
index 1476164f3233..000000000000
--- a/sys-cluster/kubelet/kubelet-1.18.15.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
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.18.16.ebuild b/sys-cluster/kubelet/kubelet-1.18.16.ebuild
index 1476164f3233..73b57ef2b5f0 100644
--- a/sys-cluster/kubelet/kubelet-1.18.16.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.18.16.ebuild
@@ -14,7 +14,6 @@ KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test "
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kubelet/kubelet-1.18.17.ebuild b/sys-cluster/kubelet/kubelet-1.18.17.ebuild
new file mode 100644
index 000000000000..2fff8bd0167b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.18.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.19.7.ebuild b/sys-cluster/kubelet/kubelet-1.19.7.ebuild
deleted file mode 100644
index e2dd171a1bba..000000000000
--- a/sys-cluster/kubelet/kubelet-1.19.7.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
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.19.9.ebuild b/sys-cluster/kubelet/kubelet-1.19.9.ebuild
new file mode 100644
index 000000000000..03f40ee62ef0
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.19.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.20.5.ebuild b/sys-cluster/kubelet/kubelet-1.20.5.ebuild
new file mode 100644
index 000000000000..03f40ee62ef0
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubeletctl/Manifest b/sys-cluster/kubeletctl/Manifest
index 00e284c52fc1..72fff171b1d6 100644
--- a/sys-cluster/kubeletctl/Manifest
+++ b/sys-cluster/kubeletctl/Manifest
@@ -378,4 +378,4 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 EBUILD kubeletctl-1.5.ebuild 20861 BLAKE2B 300d14cffc5ec1b0608ae23f8ab2ca2e051abc0e7dd53a617d1f3a269343d51026bd8800af5efed61f14e925b369b5128d054541d259d7d13a1e18e403316098 SHA512 102528214f5303ff2a02c60f0d3b6122b4d97cd7743f22139792bc414f2a03f74b97f829d2cbb4c59f0ece9e5b6b038f471e2ca033f3d9fa42d9be1f10aec93c
 EBUILD kubeletctl-1.6.ebuild 20861 BLAKE2B 1978636a21afb4ee249794b45dc5c9b0a2142a71a865c0af1535333bc8922a578bde813d73b576a0f3661327630984136fc71a12e0c0b57c178b07b3609e36cb SHA512 5a77c4beed483fc04dcc162d4a8e2faca368e86f9dcb9819a8e50283a9966c4e91096d22faba78f5bae97300c41cca54e5086816501bbf8a4ab8cab6b348ae84
-MISC metadata.xml 328 BLAKE2B add7a675235bd67e861cecc2be7f95cb770968659097ca62dfeb4c294b6ac0bd88e0fa9ffdbb714c7e07c3fac70f42cdd0c9ce4b8c14ec88c96aa17881fa981d SHA512 931d8a196d5df07479d40717f3c07e8c5807d4e1cfdd423a5e7f2f5ef7ba7538f7e03fc24055333036aa031630e70ae4ffe31bbdb765f8e43eb0702c21420015
+MISC metadata.xml 328 BLAKE2B a219b004603834dfdb87fb12617c60c6711452645c66e6307de1084c90fe53a9899e2451a51879217b77d50974d1e4026e5839fc6391bb375acd976d2faa36b1 SHA512 394f2986b6067da2a2231997454ef9a5bbc544cbfb0f267936603c0ba39f6509d93fd224289628a5f1ea4096bc8568645308bfbf548e4d4ae2eb6685f0f55bf3
diff --git a/sys-cluster/kubeletctl/metadata.xml b/sys-cluster/kubeletctl/metadata.xml
index 1c9d0b310558..98ffd9ac660d 100644
--- a/sys-cluster/kubeletctl/metadata.xml
+++ b/sys-cluster/kubeletctl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index 096f7949eef1..5c053586d5f8 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -21,4 +21,4 @@ EBUILD legion-18.05.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e7
 EBUILD legion-18.12.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
 EBUILD legion-19.06.0.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
 EBUILD legion-9999.ebuild 940 BLAKE2B 01d77d88967bd2cfc6a10521eccb300413b07e79aed971d937ee58603019250067feea8299e7b8e1df2097e24613613b12cf8e885bb8f2aec65569d85f53baf7 SHA512 4123de994c5ff2c7ba802019a509e7268b8957b222130e35b08406b09ca50db9d24d40ca01fe15b56f7b32eb15ad9bd5a76e2d6934076c5eb9db8e7d085f4277
-MISC metadata.xml 482 BLAKE2B 7e3a7dbb680ebe09062916b1c5205f3f29ecff8ffe003e9b8e6675838fed668e6468f06a6dc26f3a5c307c77105cfb911f01c23f795140f3c5d99c13811aeb1d SHA512 bc28b76e1b0479d70e2db624340097739337c8be35dd16e8ed2ef71444a0a18c579a296c65a0bbc679dd1c8a86f29eb423e9e8cca93da78f9fbea28f537da3d4
+MISC metadata.xml 482 BLAKE2B ee6f232f9a1270a586973f587364ea63a98854c6241d14e5c979c21d50b1ddcb560ff6582d4e9b40e37482260e4f3fc4627326ee8307d0b8419f9fe6097fbe9a SHA512 ffe576c5b0fc891a1390f50382f8b97fd448aecb42c6fb8e25e0e30647140ef15dcf3c7f2a91467af0e26441860c5edb080319613dd5366e84bcf489f1ae1757
diff --git a/sys-cluster/legion/metadata.xml b/sys-cluster/legion/metadata.xml
index 54d1cf1a5f0d..7d3fd8c8790b 100644
--- a/sys-cluster/legion/metadata.xml
+++ b/sys-cluster/legion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index a4ddf2fe908f..9dc1b99c80af 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1,7 +1,3 @@
-DIST libcircle-0.2.0_rc1.tar.gz 351901 BLAKE2B 1e3fd2dab46c4cdb462501f117cf41aa6f87d1ed90a0c806cdebd5f569c73b8c86f7c73f07d5a37ed6bbaa27c3649e4cb74949c08200768fb238f5153fdb8f18 SHA512 1ce07ae012c281fe3e6fbae29bf48e1079768ed5f92f9375c3be02880bed1b1feee6630b31560d7129f76640990e94da1753f55b11a0a8977adaaf9e51144044
-DIST libcircle-0.2.1_rc1.tar.gz 354251 BLAKE2B e28049da3883743d1e1a568abccc609663b8e0d89532968b8600b473d5cb6f73da481fd973bfada6a526feb4194edac09b9a9dde9fe8e7648cbdea591bda7481 SHA512 9a125bc9f95b1dfb1c777dece4310a709cec46f820651216cd3a34486260f80221e564b82dfaf1ba58b8091b18c6d6b87b0c64d24a940cae6593dc144426fb54
 DIST libcircle-0.3.0.tar.gz 385353 BLAKE2B 2843218e21f272409006980d7a94c580b1b72234e9aec7503418e498c202405a2c941f2030e1468450e9d259837bf0fc427bb60e2deeccbe4af6dde11ccfa8e9 SHA512 7561075a36e3401984d06bff6f7d0c5ba88569f59a0122dd73d52c3e4fb6602482fa0d0fcf19c0761496fb6f8ed27c1e736c411dd93186f8c029b3789e4ab318
-EBUILD libcircle-0.2.0_rc1.ebuild 948 BLAKE2B 8fc0af5a975832a7f4f39172040e22e0ad3959fc7e112f598487dec7581cdc68cb4f5687ebdde2126508687471a87bb16d55e6158fac68933d56f9ba811a4374 SHA512 5c8c18093293ea371709a6716e78896c461bb15ce085054d80806b01c01a95e0418e5e73f7d93fe582ac61bc8b0c15bb3c33ae688f6e1ce44b5de31c71a5a3b2
-EBUILD libcircle-0.2.1_rc1.ebuild 948 BLAKE2B 8fc0af5a975832a7f4f39172040e22e0ad3959fc7e112f598487dec7581cdc68cb4f5687ebdde2126508687471a87bb16d55e6158fac68933d56f9ba811a4374 SHA512 5c8c18093293ea371709a6716e78896c461bb15ce085054d80806b01c01a95e0418e5e73f7d93fe582ac61bc8b0c15bb3c33ae688f6e1ce44b5de31c71a5a3b2
-EBUILD libcircle-0.3.0.ebuild 838 BLAKE2B 8247d008236a7769ff45073c17a27380852eedcb8a38a8eaf7f453847e075dfcc6997f96e7b6aee76b1b371ae414d231ee8cfcdf2a2545bf8247a47d888eddbb SHA512 bd9fc20613de4a32335fc9588298ccaa7f5470c905fb3af1b3203bda7dd81d6cdf32bc5a10ae98bd07c231557121d6743eed6200ea30fab2b3a76445521e68aa
+EBUILD libcircle-0.3.0.ebuild 785 BLAKE2B c92267cbae0ae6c3f8037f5859d7ceb66327dc7795c1d123c6e9e80fc451558a617091d5dec398f95a4ddefa965386deb4ea4694d6f289bdcb3c7acb4a80775e SHA512 1c20e6e00c625d037dcaeefb560b507e94ceb95c4227f5e1d710bedfc04a8dd72f70404ae21a334b5098d441ae157bb574dea5c0a692732373645dd07e427c76
 MISC metadata.xml 449 BLAKE2B b43eb6e775467347922b26b774c604ad8e2288069aa47fdebb64a9d3ceb58587ffb29f6e66ac92094a2bbf972ffb6b3675b3ab86dd7849d6275a517a3281d16d SHA512 99123cb30ea2d364d8df6997ee9f6498665bc2747f98dcae29a22b477cb6ccaa51aeb27f0e2f405fcc4bce9c810c2230bfc540d04abb520793430a11686dbaff
diff --git a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
deleted file mode 100644
index 209b8ae5fe1c..000000000000
--- a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/hpc/${PN}/archive/${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="API for distributing embarrassingly parallel workloads using self-stabilization"
-HOMEPAGE="https://github.com/hpc/libcircle"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/mpi"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )"
-
-DOCS=( HACKING.md README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable test tests)
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
-	autotools-utils_src_install
-}
diff --git a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
deleted file mode 100644
index 209b8ae5fe1c..000000000000
--- a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/hpc/${PN}/archive/${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="API for distributing embarrassingly parallel workloads using self-stabilization"
-HOMEPAGE="https://github.com/hpc/libcircle"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/mpi"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )"
-
-DOCS=( HACKING.md README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable test tests)
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
-	autotools-utils_src_install
-}
diff --git a/sys-cluster/libcircle/libcircle-0.3.0.ebuild b/sys-cluster/libcircle/libcircle-0.3.0.ebuild
index 1193a7cab64f..afe8e3a3425a 100644
--- a/sys-cluster/libcircle/libcircle-0.3.0.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.3.0.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-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/hpc/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hpc/${PN}/releases/download/v0.3/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
 DESCRIPTION="API for distributing embarrassingly parallel workloads using self-stabilization"
 HOMEPAGE="https://github.com/hpc/libcircle"
+SRC_URI="https://github.com/hpc/libcircle/releases/download/v$(ver_cut 1-2)/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-IUSE="doc static-libs test"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	test? ( dev-libs/check )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable doc doxygen) \
-		$(use_enable static-libs static) \
 		$(use_enable test tests)
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}/doc/html/." )
+	use doc && HTML_DOCS=( doc/html/. )
 	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 7998e784dcfe..37e33c494234 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,9 +1,4 @@
-DIST libqb-0.17.2.tar.xz 373540 BLAKE2B b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4 SHA512 9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
-DIST libqb-1.0.5.tar.xz 488516 BLAKE2B 96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2 SHA512 a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
-DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d82afca38c421859e3e0287d1691fe9726a75d3726afc58a94765f6a201f8fb51bf1ed25c1cfeaeb326e6f6d0 SHA512 9bdf2087f610a7a02b976312d60391e1c53ebd3f36a897cdc3fcf818f666f772d63386b52bd11ed4e5ea52fa4775231ab7125359a270451f925b3821d9b8e3ee
+AUX libqb-2.0.1-slibtool.patch 620 BLAKE2B 5c5e3c699eb8b9d1d7e9e41a36e9be28e60cc1e0a978ec06cd018a3441f0bf3680991178466ea0ffea99d51c334404bae8f6b9397c49fa97ab5ade378b564e30 SHA512 9cb82b24a18282cf7364f1f413585f70e912ec46f94a2d37c45f643aa8046186cead8805f04b1e5d5daff393e35f99240a51d5a7873996d86b51480c5925b4f6
 DIST libqb-2.0.1.tar.xz 480516 BLAKE2B 402ca20f16a232497c9a363c557556bbdcfffff5d0f075898bf4008bb51b30771f284c29b64421be1dae8215e153b8978ac06c9bd10f3e5e23632b597549d2c7 SHA512 6d989d30b381253c7d7c4ff1e6400ad3445b92184906c859f10d6352dd604a309d7e2d9c8298d8b8d59a0e884e2d821608a39f043db7e96db2118a867ef57672
-EBUILD libqb-0.17.2.ebuild 1156 BLAKE2B ed266360fd089792e9b498bf0afd1f0cd57a82fefcf817f65cf019524d418380481f1281a8ee31bf7f857e9138f53380bbf76d9b9b097776e2ec6f872c7d3766 SHA512 6918bd4feeec474dcd88fb585f7a0a96e795297b6a44d622c56a8f9c883bcdc15f8a2dc457205138d91413690dc6327ff1438193ea68d70207ba49ee785c4353
-EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
-EBUILD libqb-1.9.0.ebuild 1391 BLAKE2B 968c70eed5573536df473711c0878a71fe678dabcf5d9e1f49a24b82f18d8651694a65312da285e3d108505301ef6bc3312db6a3031f9f0901d21373ddf990f6 SHA512 8a6f04badb2746224f2cca41a74b898ac517bf048d8b7f2004976f21268b9dc830d2ca91c95ba913dcadf925f65907e2077bf25d595f557394bde9fd8ae30d74
-EBUILD libqb-2.0.1-r1.ebuild 1319 BLAKE2B 34c48eaaccc73a812736d84a3cbeaf1de5aba6a799042b852c28c2a4424dddeef3f70f774f7a3d548a185ea4bbf8888827d10cdead76a2dcbe26f84064f889f3 SHA512 f051492bf59671c5a7ac9840d990f2b680df081b4990ad8a330713155b035ddd4d11c84d0a706db58e5727f62ae2433736467f45b1c78c52583b56bbebbfb7c6
+EBUILD libqb-2.0.1-r1.ebuild 1374 BLAKE2B 76e9b4348a1330437661c2d2020fb40774e2084a1dbb06f990c2242a8c00d427101989576d1dba6d1bca5faf530a9e2305cd6d12c385fe517f23c835ce2f95b0 SHA512 89829b4ec8fdc17947d18416bb6f71d1372d3dd04f81e19ff8b5671615422c86ccc276df354ca0210527312c4462a6c955bf7bc8ed22a175cbe666346e2fe0df
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
new file mode 100644
index 000000000000..f96652c30660
--- /dev/null
+++ b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
@@ -0,0 +1,19 @@
+https://github.com/ClusterLabs/libqb/pull/440
+https://bugs.gentoo.org/775605
+
+From 84c09815fee4d1c2571ed1ef772812cac470a8f3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 11:13:45 -0700
+Subject: [PATCH] build: Fix undefined pthread reference.
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,8 @@ bmc_SOURCES = bmc.c
+ bmc_LDADD = $(top_builddir)/lib/libqb.la
+ 
+ bmcpt_SOURCES = bmcpt.c
+-bmcpt_LDADD = $(top_builddir)/lib/libqb.la
++bmcpt_CFLAGS = $(PTHREAD_CFLAGS)
++bmcpt_LDADD = $(PTHREAD_LIBS) $(top_builddir)/lib/libqb.la
+ 
+ bms_SOURCES = bms.c
+ bms_CFLAGS = $(GLIB_CFLAGS)
diff --git a/sys-cluster/libqb/libqb-0.17.2.ebuild b/sys-cluster/libqb/libqb-0.17.2.ebuild
deleted file mode 100644
index 37428196e8bb..000000000000
--- a/sys-cluster/libqb/libqb-0.17.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="debug doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=(README.markdown ChangeLog)
-
-src_prepare() {
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxygen
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
-	autotools-utils_src_install
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/sys-cluster/libqb/libqb-1.0.5.ebuild b/sys-cluster/libqb/libqb-1.0.5.ebuild
deleted file mode 100644
index 1b65743a9677..000000000000
--- a/sys-cluster/libqb/libqb-1.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=(README.markdown ChangeLog)
-
-src_prepare() {
-	default
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug)
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	use doc && HTML_DOCS=("docs/html/.")
-	einstalldocs
-}
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
deleted file mode 100644
index 9166158e3bac..000000000000
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-
-# Avoiding release tarball due to https://github.com/ClusterLabs/libqb/issues/375
-# Please re-add ChangeLog to DOCS when switching back
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
-IUSE="debug doc examples systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=( README.markdown )
-
-src_prepare() {
-	default
-
-	# Skip installation of text documents without value
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-
-	# Do not append version suffix "-yank"
-	sed 's|1-yank|1|' -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable systemd systemd-journal) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	use doc && HTML_DOCS=("docs/html/.")
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
index 0d08cf0e61ad..acda01cfb901 100644
--- a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
+++ b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="app-arch/xz-utils
 
 DOCS=( ChangeLog README.markdown )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.1-slibtool.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index f33bc73f4b74..10a658966943 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -4,4 +4,4 @@ AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af
 DIST lmod-8.4.20.tar.gz 19889342 BLAKE2B aef498ec8dd2b87aca02d66f394418aba4a81d1fec4684750e59d48d06bad16db7a24290920e40290ecba8a4bc65c7dbe5c23be28654db79433f41164fa4aaf6 SHA512 9749e34e7ad75531c87770b73fd20dab16c89c24e1a2d01e58f09f8510ffc8f896dfa7eab9dab26fe4d6d14ba04d331f98e08e92e0943aede9fe5131af038970
 EBUILD lmod-8.4.20.ebuild 3333 BLAKE2B c21958369f2a0ae01a99698277f9a84b3d29476b2520633e8d26f76df7d78b7cc6a0fea1d0a2507345bf8bec3bc74d0c9ca7b01b7bbaa348be164baa9211adba SHA512 4077bab907a8b9a3ac64e048a63f8a5410ad317c035e0abc5a45328e239e3bbe8d20ec401e43af1b6d24b95e3b29d736ae83ef1ab8dee02f10882c4a9f781ea5
 EBUILD lmod-9999.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
-MISC metadata.xml 1067 BLAKE2B f520242500e560deee88ce53601d1dfaa929e8228344ea89f0d08242b58e44b280e9b6b3a396f787d231f5f6062336f770512ca2430d8ff8d64ae10a1198ee67 SHA512 6425f204b774beb6aaed3be55d279eaee61f12ea0ace2a9b083a533b92421704b64eea37fd00575147050636ef16fa07ebaf5df2d96a2101c8821d360c4d24ba
+MISC metadata.xml 1081 BLAKE2B 0ec2fa6b5885b729065b273c75fe70341b12acc11548b2a9c989853a48c60bd8fd60d377acae6ca42fade5b87f5378a5e5fb2d408cd8665085beac8872b252e8 SHA512 0872338780b16bd7eaa7912862ce34b0ab8e60c765023c3a359587b0e74515fe52b14bed61fdc4929a44ef714c13b21e0914f618197573ef18fb028d474e5b4a
diff --git a/sys-cluster/lmod/metadata.xml b/sys-cluster/lmod/metadata.xml
index cee363a19e2e..0c96807be6f1 100644
--- a/sys-cluster/lmod/metadata.xml
+++ b/sys-cluster/lmod/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
diff --git a/sys-cluster/metadata.xml b/sys-cluster/metadata.xml
index 6f48783fcc73..de16ad802127 100644
--- a/sys-cluster/metadata.xml
+++ b/sys-cluster/metadata.xml
@@ -26,4 +26,3 @@
 		Kategoria sys-cluster zawiera oprogramowanie dla klastrów.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index c694d43f3b1d..af4859f819b4 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1893,4 +1893,4 @@ EBUILD minikube-1.13.1.ebuild 94246 BLAKE2B 8b4618f6e747e67fbbb7be2ccb29b3f543b6
 EBUILD minikube-1.14.0.ebuild 95233 BLAKE2B d2b0fe23372302d0507df455dde5b3096cbcbd70e85e30e8258764e1d2c7bd33340de34740f6f1e355508bbe0ebee33dac3469757bd9cd7740ad44e6261fb4ed SHA512 b427c077b716082f34113422c2b5b14fca0ff0b7a73c83fee3cbfb8607618d0965c4c5183b8c2f9191a513ee6c8f67b87a01cbdc6b374234802b1187cac43bb3
 EBUILD minikube-1.14.1.ebuild 95534 BLAKE2B 8a0214fedc84804317e0ba0073cc0db00a0c1fa7cc951a6cf430d84e9b21113529b96c1804ac9c67542a20edb5ff475009c955615ff204b797ceb5b98e12f260 SHA512 1010a434b91f7271119a64994dcb825688fa6946efcfbb173d3c6ca3c55988f7b556b74592a4f3ed4aa8f6d03e85a07761884cc318f35e5c22de991140ccee24
 EBUILD minikube-1.17.1.ebuild 81012 BLAKE2B 797d95a01d5e7e731e3b04028407093460fe3d557dc2ccc169e1957af46166f52e1d8a6bab455ee6cde465dbb1670eac56011b46281e6926ab5ddc1a5594e4ab SHA512 67c2e1b605d40923c066f65bdc5a27a770742a4d3839572d39136229d7a0739057ebf4b8161e25e5a6792d47ca2d4edd16a7cb64baf67a1262e022ef01632fec
-MISC metadata.xml 393 BLAKE2B 6c1d7e4c6ebff826d2a8eb0bf7a81fdd0c67279084e95aea0188e9b7e0f8ff869fc983f50c318cf17c42fdb482388e0989c655c8e65f18b462da0343dd57bf24 SHA512 9af4b86772936bd3299be9ff2e62a72dcad3481b39d4644b3774bfbdec6617d47dd1697205e1b3fa0a3944c38464584f42b8b2d6c7f1086b340d6a917f4d280f
+MISC metadata.xml 393 BLAKE2B a47038da467a8b9f4cf8f5ed58a3cdf4e4e7eaadd6be312a9611269c02c0b7ca1eae3d4de8b843130afaa7c55a0b93c34d8ab219b47af5f9ec4560f04af45b2b SHA512 d4896b070094608f9f2c7a68385eebad3e8f1ea0b51a586a6e108c2cba7a0c9df68661b242aec70503223a1c60e3004c9220a1a863f1310835d3aa8fce63c36a
diff --git a/sys-cluster/minikube/metadata.xml b/sys-cluster/minikube/metadata.xml
index 005c2fc3724b..a932d94b9083 100644
--- a/sys-cluster/minikube/metadata.xml
+++ b/sys-cluster/minikube/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index e04d366142dd..815a83499934 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -7,17 +7,25 @@ AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106f
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
 DIST neutron-16.3.0.tar.gz 12866714 BLAKE2B 67436c96f52a6d1a60d8af13ce7d8d7b375def861ca83fddca0986649c7f2df6bae41763459feb2bba7e6cd16fab0c0c7ad970582be6d8798350efab11216a3d SHA512 f1901b672925248e08a239fdaf4c691cfcae90d53858ab0eed46919464a2dad8d27e89c46fb47563744e2a569995f5fbc540c8b69eef0273d6a605ea13ef5051
+DIST neutron-16.3.1.tar.gz 12880968 BLAKE2B 2915490523578f10f067682ad393c06bc7f793a736f94282e79e82e4f0108fa20a99d8a91f4344094de394316a71c4a5fdd2995db212ddd90fd7cdeddd00787b SHA512 8518f706d4bcb4bf44e2ef9b35b858f08f2e7ac20211944ca0d4df6e2be029817bc541f2fff497bd40b4a85621ee4aa8ac433fbdd19a5d8597df0725a377ae91
 DIST neutron-17.1.0.tar.gz 12910659 BLAKE2B 30634389e9caf77e7bc36b61f26c8ff24013171f1dc0cef52e2ebb55363b526bb6146a578e21c027ef6902f8881985c5a06d4d0b98992e13720a8118cd876b05 SHA512 62bd2691878c93f9c51adfecf7f7aa6fbb51485a259a419e9797738626fb2527c167ea568cd54f5fdc60a5210c53fafb2b754817123742b27150ed1cfbffca2b
+DIST neutron-17.1.1.tar.gz 12925243 BLAKE2B f95068d1a85a508e447fc5de28ef6555252fdfe3deb8b0dd94a2e20f28663dc610bbb5e32fb69e0d80fbe9917c387b0c095fb43370ddfe2bbb05327553cb8e58 SHA512 cd707d4adaa6a6b606940370606fcef61a35af0d1f1108f24891d2f88611f4f2812c061d3b7a9540d4b6df882615a9366d39273184a791a911775e7c9f4402b8
 DIST neutron-configs-16.3.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
+DIST neutron-configs-16.3.1.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-17.1.0.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
+DIST neutron-configs-17.1.1.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-ml2-plugins-16.3.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
+DIST neutron-ml2-plugins-16.3.1.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-17.1.0.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
+DIST neutron-ml2-plugins-17.1.1.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 EBUILD neutron-16.3.0.ebuild 8434 BLAKE2B 88f051d11d85ce9e908ad043e87b4e7e7a62335fa7526b198e010a32018e553cb375c7b9d8f44e9232d5d7e7533f44eedcb1e63f03e7fb0c6df9943ce803353b SHA512 4ba4ecf390628b5a72df8821677e525fb38552e0aaf3d47eb80703fb3f435436370d5031d1adca08874c3bea3cc149cec7f1b03f622f794111fc5fef79e00672
+EBUILD neutron-16.3.1.ebuild 8436 BLAKE2B 99f83376346c81b89cf30883395652d4e34c5c570f3517d072485a147cf9684c455ddea0db79bdd1581c4582bae6c7dca8b256b524dcd5f0960e8a83a50e667b SHA512 bd4c22ebb06a4a918cc8e79135b0868e1f793afcd42a1be8731f62e6ef53f112702df93349dda5dfe9861867403dc323b939f2a5d9926a766f5ba5dde57f2768
 EBUILD neutron-17.1.0.ebuild 8313 BLAKE2B c9d35e0376d141e9f7b183cac8585f922303f0d203173b96aeacb6cdc278441ad444d1a9b75fd093ba10d9d140691bd4c46b20091b2754051ccce4a79a938e7b SHA512 fe2f179c4505ee8794991f047521cde5cefb8058cf15ec1c45429ae16ad91ae712028e05a741225bbeeb053544b6abd4c304f2bd2d3f0a3e5546f8c9210d3320
+EBUILD neutron-17.1.1.ebuild 8315 BLAKE2B fa52a494ae8ac76d7fcb824243c8bad91afe71c109ef4c45c6126a0a08b81553c418d2531688b1dc2f5f2ca0d5a7318b21b8271c507fcac7088baaf4b79d6ef3 SHA512 c25ab2bb8f98080a2a7d29e509d09a9a2bf644ccf0ad9cd828ab5d4c4a887538da57eb884b0c3a5a3f1837998e8bdf050a1a7c1f0ebab0100f20d2539ebc3822
 EBUILD neutron-2020.1.9999.ebuild 8436 BLAKE2B 597fd963d5359060fb293eaebe0eb87b1549aabb5d33048c0d7590980ccf406793eaa541861e988424e93cd969a5d4b7d7210be1eab05765f78e8813c157d509 SHA512 34f3cd5c78d91d817e4c25a993cb56d70ab4005f15d9c7b4869e6aa1c349baa354d76eff6792ca3e5ebe2efd6f681e47b24e2e2130569648fe6501baa35b46f7
 EBUILD neutron-2020.2.9999.ebuild 8315 BLAKE2B f4f2ee602d5c871dde01f017b6b2b215ff62369a65d264412c6dff7fcea9ebf3791ab9502e63b284160145f629cef2a518f74e9771c18ad97b69a11dfbb43b9a SHA512 990e58211592aabe206ccebda35505cc85407cbbbd12f13bbb996f92a8aa35b28ca1084883825fdba0df821f8d92b87f7b0062f31c7f6515ef4776d8c4e92f4a
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-16.3.1.ebuild b/sys-cluster/neutron/neutron-16.3.1.ebuild
new file mode 100644
index 000000000000..1ec4c3997360
--- /dev/null
+++ b/sys-cluster/neutron/neutron-16.3.1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
+	acct-group/neutron
+	acct-user/neutron"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
+	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-17.1.1.ebuild b/sys-cluster/neutron/neutron-17.1.1.ebuild
new file mode 100644
index 000000000000..7ba8c9f50879
--- /dev/null
+++ b/sys-cluster/neutron/neutron-17.1.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+DEPEND="
+	>=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+"
+RDEPEND="
+	>=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
+	acct-group/neutron
+	acct-user/neutron"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
+	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 80f1beb0e9d4..47ef378fe63c 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,13 +4,19 @@ AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-21.1.2.tar.gz 9306569 BLAKE2B 7b4a0d1a0b7432b027ffe3674ffa3db7ba75724342e1c5de833ed35bc03998057c05cc2e02383433440cda2c19d7a079f65d0d26c60061cd78cbb4d97af93695 SHA512 66dde411c7661d63b9a2104faf0e9dd82979579b9662083f2eb0b597aff960731c27ef1966995fc7eefc48c7d47d746982e995be76e844daa0512a2f8e38cf9c
+DIST nova-21.2.0.tar.gz 9319254 BLAKE2B fb87dcffa40ae38f05ab82c7bd328a3b9e98101598b42ddce318315f431b0c26822ffdfc588ba9c5f60691ad2100201c08309bb0bf3b419b5a9fa4b13f232637 SHA512 c3ad8be452fe68b3552355c8be751823ef067107c4ad8a499fb222951ee429d65ea4e1d8bfa0dfe2a9135ae8140de3b191ee12c3a1df2260cdddd2be36cdbea2
 DIST nova-22.1.0.tar.gz 9267366 BLAKE2B 0e10b22f5a149eb59b600545f2d2ac91366e13b2d94ca4781358bc6008b569e9f0791eed8f62cf204339b48a970ef47808a94bc4605ac1d1868c4be2fc7db0e0 SHA512 fb5353abd0b2e90f0903ab45690526ed6e0294d3d0a09ffc4acfda022fb0c170be20da406e71a8b303efaef0174ca273ff44dcae79bfc33ffd51e910f0d20fee
+DIST nova-22.2.0.tar.gz 9271449 BLAKE2B c7b52f4d7e819152971c67f5f0a9f2b191e0235917efd04c799413ebfbf44500c64bae9ddd6082ef7b347c500d346f46fd07bad45a7fc4e5c397713867681dbe SHA512 acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857d67c6d8af3761f12db9bf6c5120d1af7bee3e73b3c0e0c44d6b41cafe7883
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 DIST nova.conf.sample-21.1.2 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
+DIST nova.conf.sample-21.2.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-22.1.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
+DIST nova.conf.sample-22.2.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 EBUILD nova-2020.1.9999.ebuild 7633 BLAKE2B 7a9a900405589b3356673cee3a0d465e075b53fab5fcf84ddeaed587d11438bbcc838e3edb6409cc0e9cf6585d195b106a803bba5d950103b24018a047bbba49 SHA512 425b6951ad85c0e3e8e4600d670ba8f090469cf5f017693a4639a2cb27fc66b21aa75dc110d48d4623bd4f2aa612f85f20308b83677331bb8c1b348bb9af036c
 EBUILD nova-2020.2.9999.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
 EBUILD nova-21.1.2.ebuild 7656 BLAKE2B fbb21b099a2915db0e1dedfdd8df335e76a385f16ce225c52142df8d9698c5a06379c431dee7cd7150e60995108f26209bf857dfcb3d26e5d15dbb8cfac689c0 SHA512 616cd46aa311db68013730afa9b33d671008bcf6b3c680fe73743db565434d5df3d32c231826347494a49251db555d358fd968b2a0426428d3e1b35b3c978d75
+EBUILD nova-21.2.0.ebuild 7658 BLAKE2B cf41045236d69ca97f2e1b7c46cc5f49148d2ccb379b2fa09acab28ff3ee8b4d19040f247596f0bcd16ae649335096de615581e2f35fcc9ffe6915bf677a3274 SHA512 7584dbfcbb9334d940d9de0db02e85579a6987b142b73dc9e68d7dbac9646be827d25de99d53c0f64fcfa9b1dcfcb48068e97f6807d1bb9e1a99a77fee92ce3e
 EBUILD nova-22.1.0.ebuild 7496 BLAKE2B 9490d2b6faba72c8526f18aade9833abc81c0650ceb203b73ea0dfcd8f216a79af31b8b6c4196183140380d9a014e27084c2f77d1ebdeda5e0bea2c6df3b5115 SHA512 2b7e5a1fe04830b860fd6e0aa95324501ece938c7059fefb93dc2d4c21b8f0fcd7b87a01346d5823ba5a092540a1b86a40fbdd483b7c3a8c8553fbf6af2d37b3
+EBUILD nova-22.2.0.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-21.2.0.ebuild b/sys-cluster/nova/nova-21.2.0.ebuild
new file mode 100644
index 000000000000..6e90915fb659
--- /dev/null
+++ b/sys-cluster/nova/nova-21.2.0.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1 eutils linux-info multilib udev
+
+DESCRIPTION="Cloud computing fabric controller"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	acct-user/nova
+	acct-group/nova"
+
+#PATCHES=(
+#	"${FILESDIR}/filename"
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/compute.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-22.2.0.ebuild b/sys-cluster/nova/nova-22.2.0.ebuild
new file mode 100644
index 000000000000..1469e1f90d46
--- /dev/null
+++ b/sys-cluster/nova/nova-22.2.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils linux-info multilib udev
+
+DESCRIPTION="Cloud computing fabric controller"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	acct-user/nova
+	acct-group/nova"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/compute.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 2a31c4accb35..27982253c555 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,6 +6,6 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r100.ebuild 7907 BLAKE2B 19d3c67a6f2eeb6038c728089c282138916a535f7672e5239de55a5bd281f9e2c78f7cf862c58ffa084c05aec36f6eff90cebc539f0f9bcbf73419e3398e1259 SHA512 59574c1f1709d4e578ab67c89a0bf284f428ca02e02132ba189beab2830611095277193df9b059e2d2f13792ee7f848d2612b53f07a95078322610e3b063764c
-EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B f267fa66d56aa9302be62388baa58997a8db7022251a3a72d55dc5d387a3f21682274501385c8c5139077278a1516c31799188033c367db885c80b094bf30089 SHA512 a0bcfcb35b9931b3b9baec0e8e25426e24db6da89b45af81636b3c0b04031846681b870aa7c9de4be60ac6f3b123c6c905002becfbbb7873f6c0d40e188c0c9f
+EBUILD slurm-20.11.0.1-r1.ebuild 7741 BLAKE2B a9c6d0945fc2a4a0214e175a2553110fe0be0125f4eff168469ea29096307c2160ccc02bcf16b3d82396a713e77472f293bb2d0036f4d4ae6c9f321a517a9afc SHA512 03f20df0c5b5cfc9c083210b9400962ae93d52d00512c848fe7e1532aa3a47d4d5c88c73b9b37f42765789e7e0c893064c186106baf28ce05527146f3942c270
+EBUILD slurm-20.11.0.1-r101.ebuild 7884 BLAKE2B b852a52fd4ecc9a9d258c0365a926ce751c61049c1b7203f03a3535c56bd6592cdb9c554ffc257a55c08fc9582ff886e8ead998106a99da5cdfa4a15e271f13a SHA512 f4463448765e32713273cd0027b924464616c7651145f680dc655a1e62184fe9861004c15154b3eaa99fbd614df0ccf42acddfe4dbf9717b605b56420ed50a66
 MISC metadata.xml 1091 BLAKE2B fcacf65a8cde25fa09e7ab996cf85987f39879808819f7e6ec56de3e6535ed66adcdba88e346afd947753fee93b6014353e5418cc61b0e2bff196fb8492841e6 SHA512 3f1364da6cb3d8af99c2c061ee9667a0432d2ed440562b0c1c69815e4bc191bd68bcdfc8a3ce2e358d8b4171d2c7262e2aebd63e7788a5164a2e28b627ffd988
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
new file mode 100644
index 000000000000..9601550773f2
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-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/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-4 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	lua? ( dev-lang/lua:0= )
+	!lua? ( !dev-lang/lua )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
+	hdf5? ( sci-libs/hdf5:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	sys-libs/readline:0="
+
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/prolog.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
deleted file mode 100644
index 860e614604ab..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1-r100.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
-
-LUA_COMPAT=( lua5-{1..3} )
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( ${LUA_DEPS} )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	dev-libs/glib:2=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable lua) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
new file mode 100644
index 000000000000..7f857b26e59b
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-4 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	lua? ( ${LUA_DEPS} )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
+	hdf5? ( sci-libs/hdf5:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	dev-libs/glib:2=
+	sys-libs/readline:0="
+
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable lua) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/prolog.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
deleted file mode 100644
index 78837b1cd3d2..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1.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
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( dev-lang/lua:0= )
-	!lua? ( !dev-lang/lua )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 18183dfe9614..a94fffa97073 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -6,4 +6,4 @@ DIST spark-bin-3.0.1-nohadoop.tgz 156390722 BLAKE2B 9ac4645759ca0ec6d1501dfa79d1
 EBUILD spark-bin-2.4.3.ebuild 1779 BLAKE2B 1be2f9bf46f2d41525473aeb980c0ed1543762a1fbbaf3f3a8c278273bd7171ea5737be2d4484011760fca853cec7aa12361b1cd27ab844835e77d9b25887de8 SHA512 91022933f4ee62904c8ec3346f0dedea160c7329a07edf9afa646b9934eaaddfda9903f38fa498e615d96008e7fa8e7bb800a58cb801b7de799f607c545f1584
 EBUILD spark-bin-2.4.7-r1.ebuild 1779 BLAKE2B 1be2f9bf46f2d41525473aeb980c0ed1543762a1fbbaf3f3a8c278273bd7171ea5737be2d4484011760fca853cec7aa12361b1cd27ab844835e77d9b25887de8 SHA512 91022933f4ee62904c8ec3346f0dedea160c7329a07edf9afa646b9934eaaddfda9903f38fa498e615d96008e7fa8e7bb800a58cb801b7de799f607c545f1584
 EBUILD spark-bin-3.0.1-r2.ebuild 1410 BLAKE2B 03148b1b46f5f3577230e85b4a312b27bd305d18060db84bea824d72903fbad5ee169db16ec82974e2fcd35961716842ae6ad9874ba83ac2c4ce9de6de2e9b74 SHA512 8d95f8129b55b3d6762c87e6da9a8991569c177af1c7207b800864ce34030cc44c14b3a04c538f8c741192c778868ea62b8efa91493c3e130fd5e32042169ad9
-MISC metadata.xml 674 BLAKE2B 8b9d5a6f5266d83bcb2f57738547d35347fb59f0e9d26c6368ef42a49ae92a911243430bfacdaf256012841f07f9a530ee28a59b0bd2a2e30a2511118644cc8b SHA512 a8b9fe7f3ab599508089cddcb3815d393b589c9d533ef51c13e0dc76aaf9a2889a7b2f1201ae03f7a1df38bfb9bf5feb5c1d029db885af6ba8707560b5e54abb
+MISC metadata.xml 704 BLAKE2B d151ce82888687bfd2e9399ef2b5c9f6f84a5dfc4152f5129753c6d1a1df60018e50771e445fe3063551904c13c86986472f6d96aff4c67d9ddf268198bacefe SHA512 8682640f5fa9addcbebcf029d247c2f5ef4a64edb4daff2faf298cb38c909676c0938d2ecd31ad83e0be6ebe66163e09501dbadd5586496a45933701511a7bd7
diff --git a/sys-cluster/spark-bin/metadata.xml b/sys-cluster/spark-bin/metadata.xml
index 5408c183b068..53ee64f4c5a6 100644
--- a/sys-cluster/spark-bin/metadata.xml
+++ b/sys-cluster/spark-bin/metadata.xml
@@ -5,11 +5,11 @@
     <email>java@gentoo.org</email>
     <name>Gentoo Java Team</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>alec@alectenharmsel.com</email>
     <name>Alec Ten Harmsel</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 547b70dd6689..de2a9ac05126 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -3,13 +3,7 @@ AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d4
 AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 10168 BLAKE2B c84b33deabb616f58eb7b42224040405eb524749a98647e94bde8d3044e39ef2cd79baff6e8135e61f4b5db86ebc20f7f24b819459b944427386140d716490b2 SHA512 9893764ff11d0c499b30b5dd41c2e56dcf5719baa2d172ee5d500b5c9f7f81af9901f8cd2de8799f5520793f5be6755efc757c518659eca5d1ef89f9fb7a9e24
-DIST teleport-4.0.10.tar.gz 34928382 BLAKE2B f6e418cd3be87e8a559cef20c7761b3da13f30ae176f5d7665a3c50debbb538048fdf32373adac49f061f9b62b75360dc3b65db39c22838ad661a69df578bafa SHA512 67ebf37737ab9e5cf475bd99d94450ee3dd1f94a2611110f838f4e8882f20e8cafe5d43aa12cff223641b3a9b98b9f07549a7c2ec248c7000eddedae2964f5e2
-DIST teleport-4.0.9.tar.gz 34927445 BLAKE2B 267ef0ab269efc405f0522a6442d9b626dea62c800717cf01a9f0bdf40a34015b218c58cbd0e5ccbdd17634e91516ece35f6bbfb17864411ef02ae60cf3391eb SHA512 6a9fb59780d4da7f62a2f204f7f2e4321a7b73d9fd60e2de7d7ac1cdcf05e24895115e754aacdbdb75f4c21d40f1e42808e7f4e6bbb54df461167b45ebb7de24
-DIST teleport-4.1.1.tar.gz 42243379 BLAKE2B e01a32546bf3ecf52162d004ad24661160193e1586a98d045d83df63f01fc519ae2a6d4ad945da25a6509c153aacc3e23429be343914c35720f1b62da28d3e72 SHA512 7ed950ac7089052ec54872d9cf2ee12351a944268169ff442f0b1c91b3ad58fdf49c3c17839c8f330ae3c6192e9f4244a41cc2ba88f58b8f5435e334007348a5
 DIST teleport-4.1.4.tar.gz 42353194 BLAKE2B 905babaa899b80816b826a920f75dde55619ef7b476da6b3277347128a7301853241abcda852617363bfeb6fa432ef8f49d4b9444cde79e8e38ba9a79e2ec6dc SHA512 5aa8e872802924e03839d4311b346cf1ef00c786e77a62e43a7b182c49f8cee7430e153c5d9ce8400beba332c715d21cdffef7c75be86992e0290d3795b38f12
-EBUILD teleport-4.0.10.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
-EBUILD teleport-4.0.9.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
-EBUILD teleport-4.1.1.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
 EBUILD teleport-4.1.4.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
 EBUILD teleport-9999.ebuild 1243 BLAKE2B 58785b5537bcf47366cafe481ba1855e1acf1e6f4f1b5939195b58d3b3fced5690d9c0933c856111b834df50e9ab857d42ba826eb9664c2f51ee740c5a6e9442 SHA512 54b817d0e5be7872af7c52982842f94dee9573922c5450cd89aa3c507fc81d06e56eedcc505fda16ab0b96866184f5a226a7de2a745d121b9205ddaeb912f32a
-MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
+MISC metadata.xml 660 BLAKE2B 5fc9df0d7097fca382e2bfd405bea9d8efaa71c699dfb11f80db660a3653ed7712e358e543275d1fb9f5c706db2805906033199a1c4aa7ca8fe9ab81d84fb88e SHA512 3a68ecb58055bdd41e8cbbd99391eca913762cf7a977ba93d8bcbb04f37d03ef4e551df347a357d3a5b528095a9fea00a7b32dc640012d287eebee3ff3302b04
diff --git a/sys-cluster/teleport/metadata.xml b/sys-cluster/teleport/metadata.xml
index 224f5639f024..2953811a2ba3 100644
--- a/sys-cluster/teleport/metadata.xml
+++ b/sys-cluster/teleport/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Graeme Lawes</name>
 		<email>graemelawes@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<name>Gentoo Proxy Maintainers Project</name>
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
diff --git a/sys-cluster/teleport/teleport-4.0.10.ebuild b/sys-cluster/teleport/teleport-4.0.10.ebuild
deleted file mode 100644
index 5421480e2d1b..000000000000
--- a/sys-cluster/teleport/teleport-4.0.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build systemd
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-IUSE="pam"
-LICENSE="Apache-2.0 MIT BSD ISC"
-RESTRICT="test strip"
-SLOT="0"
-
-BDEPEND="app-arch/zip"
-RDEPEND="pam? ( sys-libs/pam )"
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-4.0.9.ebuild b/sys-cluster/teleport/teleport-4.0.9.ebuild
deleted file mode 100644
index 5421480e2d1b..000000000000
--- a/sys-cluster/teleport/teleport-4.0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build systemd
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-IUSE="pam"
-LICENSE="Apache-2.0 MIT BSD ISC"
-RESTRICT="test strip"
-SLOT="0"
-
-BDEPEND="app-arch/zip"
-RDEPEND="pam? ( sys-libs/pam )"
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-4.1.1.ebuild b/sys-cluster/teleport/teleport-4.1.1.ebuild
deleted file mode 100644
index 5421480e2d1b..000000000000
--- a/sys-cluster/teleport/teleport-4.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build systemd
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-IUSE="pam"
-LICENSE="Apache-2.0 MIT BSD ISC"
-RESTRICT="test strip"
-SLOT="0"
-
-BDEPEND="app-arch/zip"
-RDEPEND="pam? ( sys-libs/pam )"
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0224c557649a..344ef3b7e21f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 6dcf2097ed46..87a5a744cfcd 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -7,6 +7,7 @@ AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71
 AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
+AUX autoconf-2.71-darwin.patch 525 BLAKE2B 641a98ccc5070ed46480c65c3966b7c047a48bc44930b0ca6039e492d383857140fa7da152eb60ad6bc51ad129cfbf66bd9863dea25672f985b38422a4ce3160 SHA512 92c528f416c6dbc413bd027c6684b8bf14b397164e13d5a2e754e23ac0803b09b20bf54ec89e495736b122eb6b519013c94b54d36fa7aff2715454a6321d0a05
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
@@ -15,6 +16,6 @@ DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee9104563799164
 EBUILD autoconf-2.13-r1.ebuild 1519 BLAKE2B 58fd708a0ad5b5fecb1c27035f6283a02d4b49fac552a6c59da077a52d79beed9d28fb8fd8594d7cb6b652e0270ae7068060d97b5d6c4d6c228f7acfdf7f5e36 SHA512 ce5bd09f8a242fe91e3d5633f88ed33569a82264b881ea74a68d29b6175cf2d532377a1c80f1e7b220c0582ff4241fc7946897bbe32ad9a521a470fdfdec616e
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
 EBUILD autoconf-2.69-r5.ebuild 1819 BLAKE2B 5cdb2367829da34d55780dc42b5773a10b92610a33268a1dbab205c4296e754f11daebfcd635a99b2dd39b0c466371b5020464faa94793805bdfea37d0a86bcf SHA512 b591922b1f2e8aede0ca2f4bc5a27d86dbe7d43c3121109ac9b1a499c9d01da8888aeb02cb9d252d5931c886e53a54b61878f8ab6c66f4e8063a0cbd5bdd2313
-EBUILD autoconf-2.71.ebuild 2065 BLAKE2B 11e0130c50228d97d2689e8c28c06ff100273a8c611df0081765490af481b796074475a2edff4f682009b3c1d9a2f9ca519ac0a9c0ec47509cd42d568d37a8b2 SHA512 30a3fdec8a2d3066997e6149727230b8a4afeba132efdd83d34db9c028012eeb83273f8cc9c1f47dc5b75680b4e8677e6da78bbd7386cda945ddbc4540c296ee
+EBUILD autoconf-2.71.ebuild 2065 BLAKE2B a575c43caa73b2745c6cc874f4492dc2202de31f5a51f4bdd848ecb70b0eefff89c204aa0669a37fa1382a2d3bf067a68b5f221fce6a7eb7ad49d480b75eb270 SHA512 b62bf55e60beed8910a712d7d85f0de00f27339e351c688dfc3df2a3bbb16e51b78b78354c4e15f0a60eebbac0bbd810b38a886a92381426bbe1e5653be024eb
 EBUILD autoconf-9999.ebuild 1386 BLAKE2B de6bb3a1c210e63b358e6db1fa72c77bd5067fe22e629ea76620d8c31657b8c29bd58cdb69b39f87c7445bcc0d0da77e93c5d35d33783cc31df9a4ddf14cad03 SHA512 5dc7271984bb48e29325dae31d193bdf838cef778d7d391145787c4b1e1a31a4720f8827bcef2acf8d4edbd8885ebf70392d3dfddb7a64e63d30dc7208565164
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.71.ebuild b/sys-devel/autoconf/autoconf-2.71.ebuild
index d6187f9fa303..86e89e450868 100644
--- a/sys-devel/autoconf/autoconf-2.71.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71.ebuild
@@ -40,7 +40,7 @@ PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
 	fi
 
 	# Save timestamp to avoid later makeinfo call
diff --git a/sys-devel/autoconf/files/autoconf-2.71-darwin.patch b/sys-devel/autoconf/files/autoconf-2.71-darwin.patch
new file mode 100644
index 000000000000..c122aee4b22d
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -122,7 +122,7 @@
+ my $autom4te    = $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@';
+ my $automake    = $ENV{'AUTOMAKE'}    || 'automake';
+ my $aclocal     = $ENV{'ACLOCAL'}     || 'aclocal';
+-my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'libtoolize';
++my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'glibtoolize';
+ my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize';
+ my $gtkdocize   = $ENV{'GTKDOCIZE'}   || 'gtkdocize';
+ my $autopoint   = $ENV{'AUTOPOINT'}   || 'autopoint';
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 8776ea85739d..3cb07d3f08ac 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -4,6 +4,6 @@ AUX bc-1.07.1-no-ed-its-sed.patch 452 BLAKE2B cb45680860706b3c240593bf8001be836a
 AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
-EBUILD bc-1.06.95-r2.ebuild 1557 BLAKE2B 2530171d4854f3e9540a464164112c5a0dff9af2ab540b82bcda3065f7551758b8b03e373add1e50ca3196c5f84f51c2f593b9e0f3937ed1bb78b81ec080801f SHA512 06eca6f6e6b47a3a92e5bc6122108a0e7ac3fbe7e8e9a6730e94ddd99179a15d673ab65bc646c5591be8d6286047bb96edc08282b198ebcb8a49f9312c11b562
+EBUILD bc-1.06.95-r2.ebuild 1564 BLAKE2B 47f85ab7cbc7b0f14679adb17aa567c696134ed8b2b4d3f8e4bf32e956ef8c01518c95b738d333a51d24be786f94f7d7596c73c31ad0a65de4092f8edb947d54 SHA512 4b21defda10cb1444c5e1eb753870dedae10be287e1dff3b3ade9ab49e180fc8afbdfe1f2120fedd67a781dd541c27b31b20946af2815d79dac7383ea4d34253
 EBUILD bc-1.07.1-r3.ebuild 1418 BLAKE2B 2a93cc801bf2d1327a7b1e5e8f924670431fcf661e4c13b44bd421b888c7f6d584b08d959a01ebb52d45a38fc94e4fcf639469bd4b769cf6579c549ceb58316d SHA512 c6119b862e507491ed9dca29f4571710a6ee21c3cae7ac9e9593ab587f96c830d6503f7f6c59cb69a7aa6c0d739cef75e8a7d96c11bafef44de043624c82d9cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index a956b9652a6b..d67b981e1fb6 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Handy console-based calculator utility"
 HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
-SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
+SRC_URI="https://alpha.gnu.org/gnu/bc/${P}.tar.bz2
 	mirror://gnu/bc/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index c08d57de5584..47274a9db7c0 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,6 @@
 DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
 DIST binutils-config-5.4.tar.xz 7332 BLAKE2B 1dd0fdebf028e9d95caa395948037d51ac1e627f370921b56fc99a6fe2e2100ddb202c8027ad1e67330306de8b4cbc6a03753105d401198e515b22fca94f760f SHA512 79411afcbec3a6cce960be1b06e4a6efdf55081992f6a92157737f7ef41fc61eaec0005078a4ce0cd78ad6af14583ab85f4f2b7b43808238088d521e1aa31af1
-EBUILD binutils-config-5.3.2.ebuild 1118 BLAKE2B 0d65e41631a4ddc28b2b6a446eba79f6e6e0b48706276d3dd057d300f0d097109ac637683343ea2e7a348b4c9768dbafa1343189a7a6c880b13afd296c7605c6 SHA512 2207b216e9c0a6ffd6bae19ad7f3c68d870882e4a69b0c1284a87ceb0368c086bc1dd4a682dc18d64da9a60824815d4c384f89f022bd3cd6d34e2182d986fceb
-EBUILD binutils-config-5.4.ebuild 1127 BLAKE2B 742f22009abcb1e7e0daf21f3213ffd6ecce6b5d085360d9b973412b238681b0efe528037a435cd9c1d48dc4516cf5edefa42ad8e25b6be4066be5605d1715de SHA512 1b37858e440f68cf49dd4735a297768164951afc56deb8d75a5c9d634f70786ff5598ab8600b25ba770f4e7cd9fbfa62ebd55e81efe94a61fd6830a319f4ed70
-EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
+EBUILD binutils-config-5.3.2.ebuild 1103 BLAKE2B f68b9dbe5e734906034dac8c7679ef42308961f76f61bbd8983487f5de9b42b61403eb0d3206d7d99964a28f44839c016260edcae6c424448553933f3d4a53dc SHA512 709e0af6d0064d95488f0ccae29adfa03b41a864e81012fefc175a437b40b091f1a68dad80d742c6c626393895848ee3872ae99a4a21118e80ff5ef2be6d2c26
+EBUILD binutils-config-5.4.ebuild 1112 BLAKE2B 9cfdc08cc6f249c0fed771bdcb490e6a62e41ccfba929a0cc5f29d9d7c3f31365570896652046e5ada30e70ea43b839db886d8fd508fcc5d77a1b47088fbfb25 SHA512 38f079f8df403624be980dd71f6f218411081a48f74f502f6392dd602eb151413d5db1650e070f744eacb59a0ea936b1688628f56d5af44ceca8f81b78a97c7e
+EBUILD binutils-config-9999.ebuild 1112 BLAKE2B 9cfdc08cc6f249c0fed771bdcb490e6a62e41ccfba929a0cc5f29d9d7c3f31365570896652046e5ada30e70ea43b839db886d8fd508fcc5d77a1b47088fbfb25 SHA512 38f079f8df403624be980dd71f6f218411081a48f74f502f6392dd602eb151413d5db1650e070f744eacb59a0ea936b1688628f56d5af44ceca8f81b78a97c7e
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
index 2a949b4fb174..bdf7169f6c44 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.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
@@ -24,7 +24,7 @@ IUSE="+native-symlinks"
 RDEPEND="sys-apps/gentoo-functions"
 
 src_compile() {
-	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+	emake PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
 }
 
 src_install() {
diff --git a/sys-devel/binutils-config/binutils-config-5.4.ebuild b/sys-devel/binutils-config/binutils-config-5.4.ebuild
index 4795b56cc7c3..5e39f373e5c4 100644
--- a/sys-devel/binutils-config/binutils-config-5.4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.4.ebuild
@@ -24,7 +24,7 @@ IUSE="+native-symlinks"
 RDEPEND="sys-apps/gentoo-functions"
 
 src_compile() {
-	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+	emake PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
 }
 
 src_install() {
diff --git a/sys-devel/binutils-config/binutils-config-9999.ebuild b/sys-devel/binutils-config/binutils-config-9999.ebuild
index 5f9cd23da4a1..5e39f373e5c4 100644
--- a/sys-devel/binutils-config/binutils-config-9999.ebuild
+++ b/sys-devel/binutils-config/binutils-config-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 @@ IUSE="+native-symlinks"
 RDEPEND="sys-apps/gentoo-functions"
 
 src_compile() {
-	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+	emake PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
 }
 
 src_install() {
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 3fbb4ec6c89a..172009662a3c 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD clang-common-10.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 EBUILD clang-common-11.0.0.ebuild 580 BLAKE2B 3affe14fc54fa11d15701312b51cce47b18aee3dba3ac84004be1d6bb7c70229c6e606ba3c051e038d058d94b9da00ec2710597f945d9bd4eb5cca7c1fb6ee57 SHA512 22d04fb19dd7dc0e7469f920c8ae477680eede237b1e69664c5e1f5f649e4b0d214b38f07e7e3794828c6fd54fe6da8b604d4e64aea6e4e95ed79c6943ea58b3
 EBUILD clang-common-11.0.1.ebuild 582 BLAKE2B ec56186abb6a66f4692a8ee6a3b951659b2a64e42d998593022195d641f12ea28ec49eb7fa8790a370fcda66949126fee456b3ae4b8a58d74b8a09dae2766fbd SHA512 e8520902f0c06a5801e41ebd2c4d8767f3fdacf885bb8c8439c8af829279fb0d60015721d360c109269985ffb1c5f8ddf514814d35a1e3aa8247b0adaffa761a
-EBUILD clang-common-11.1.0.ebuild 586 BLAKE2B 695ae16044b48bb9718d7d2afd9e77b2da305599cd8138b0100ded12496a7a1ff49c038ed020582340ec16d309e52688698150f8a97553eaeda0c115c578a30b SHA512 aef092bacfe504ec8a081c5ea25c2c96ba8efaf0074afe2089a83f4f3091644694d62bcf6c92ec61d9533f5706d949927f20bdd45ef7f3faca086bfbb5cb440b
+EBUILD clang-common-11.1.0.ebuild 585 BLAKE2B 2b2f7b2d26ce75f9d7962f3a01e0fc7a509ad88f146a6ac4790a1232a8824c5fe690d7060fe54cd7dca021bef561940a74a2fb1425152f0db585490dc07d558b SHA512 d726bcf6caee020b6e2133f14398d5ac1d064f89631cad3f84e87c0ff0693f8cc3701525f12abcc4e78c4bb29cd2580f277763ec2407417ff7d1d7ac40be3239
 EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-12.0.0_rc2.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-12.0.0_rc3.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
diff --git a/sys-devel/clang-common/clang-common-11.1.0.ebuild b/sys-devel/clang-common/clang-common-11.1.0.ebuild
index 6dfe0fb8ce8f..6bda3d5a5468 100644
--- a/sys-devel/clang-common/clang-common-11.1.0.ebuild
+++ b/sys-devel/clang-common/clang-common-11.1.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 321d148eee89..ca5fcd93766c 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,7 @@
 EBUILD clang-runtime-10.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
 EBUILD clang-runtime-11.0.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
 EBUILD clang-runtime-11.0.1.ebuild 693 BLAKE2B 704e6de1267c4ab0c44ff37390a484a5fcc6659fccdc6a94005108dfcbbcd6010c273e45bfd00f6b07fa1be91da219c95dffa44eea8a2c07d47a47259b8f7d60 SHA512 91049cef39d7bdcf5012ce6bb187ec8c3059d3ad953d76a58059ef6353432f55256467077c7c38021e60521408e59019384f75b39d952a16738168716e4097bf
-EBUILD clang-runtime-11.1.0.ebuild 697 BLAKE2B 63a0a06a94e6166e01da2fddcee1e0d627a6fa43fe4ec80cae9cafa96cdbae99522e74eefc781e9cf9441752352b13e9d7e8963e1e556847001f6f715c06e726 SHA512 dc8c30f3ce306c18005609017ab693a41081198ce8f2759276c1e49b4ea4538a719e52c921cdc5dd6298c0159fbc19e4a83247bc5a75263654d31f2ef3873ce4
+EBUILD clang-runtime-11.1.0.ebuild 696 BLAKE2B f99ebd336654e712b2877282a301090307ff3ee7619776863491f54503655715738dfb17db041d73e879b9dc0ec466b42055f9318564e43ba796c2189ef2cf4d SHA512 41035dd76066bea53a4add70e1985b3af99574edd3021a2fe0a155aaa12216f362b74bc243d8f0214e86242dc333c4d629509f67b0820abbdfda7944498a9367
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-12.0.0_rc2.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 EBUILD clang-runtime-12.0.0_rc3.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
diff --git a/sys-devel/clang-runtime/clang-runtime-11.1.0.ebuild b/sys-devel/clang-runtime/clang-runtime-11.1.0.ebuild
index 961a678da4d2..413f6e70b3e5 100644
--- a/sys-devel/clang-runtime/clang-runtime-11.1.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-11.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 7744f1c4b0cb..be2ca399cc9c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -14,7 +14,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD clang-10.0.1.ebuild 11828 BLAKE2B 3ff2f3db61fc380440be52b1f3b12a823c55f1583a4f7ce7ce8d02e1e168956c5d5d2fb7e2600230066762fba3cdf3021c51ff9b7d8c8c12cbd8095876e298d2 SHA512 4aeff4db14e3da3c69e8054fa028b51a5120981e896524c332ee869810ba2ec8fdefa25e044e9b536e6394b27658a98742756cf7a14f9fe997f7d777d9ca427c
 EBUILD clang-11.0.0.ebuild 11810 BLAKE2B 3e9edfd30b00b692e70ae86d105f3f955119f7796e528dffc2259670cc788de3cb03abe53c54d72b5fa994928fa4f54ad24ece55fb6bebaee54b57e0912ef731 SHA512 bb1dc178445da74bda709c315f0276e7f2d1f9d3e16e0d94ee75e16ffe61548b52bce9237d09896ca582ecbf5ad907f4b27255fcdd6a30c155048b659b127a5b
 EBUILD clang-11.0.1.ebuild 11812 BLAKE2B 2a742389ab05844489749a2778f6449590022e305079925e0bbf2d81ca0da063f525cda477c10a369aa0cf6998fb93b3b27ccbb3b6b32331ccd1f2c3cecc8019 SHA512 db7f99dc101106682ee313722b83bb91b6777f331a98e22179dede8b01f3366c92d55d38e0db563764da57b04135b97f4b246e94880705b42e86ce5b2fd13cf3
-EBUILD clang-11.1.0.ebuild 11885 BLAKE2B 588208af4107d841726a9bc5e089bf03321283251cd9bae16af7d1522253c42760687f9c70601465e9aa28e319778aa145665378b4e60ecdb4ce558a29950cf2 SHA512 edca5525b50316be4abe35be764b6a13e65d0ee7c0f9e2b783d195c8d48685689730a8afa7f7abee903811c9fb03ffecfb83be704c26361a8b998b401f338172
+EBUILD clang-11.1.0.ebuild 11884 BLAKE2B 3c69f29955f66b1dd16aef89667d2322fdb911c83b56c9a4a480e9d04de49c4922af042213643aa3cbd7ebbbe8755b9b21655f58d87a868d22fd09e28099f041 SHA512 0b4ec8304a45cdbe64ddacb7da42170d2959582485bc544f3abe5177118bcf659a31004e8a77c123e707291394f927886f0f4894993691ff5beb406c41f8ce8a
 EBUILD clang-12.0.0.9999.ebuild 11683 BLAKE2B 87afbf175dc095b7585e5f5b6211b9ec3c2c23c3d5d02ea147edd0d0ae424ae8b4bbdc4a4b0eed044abb2be628ac4a1cc7cf1d28ed0c3b8e9418ab0fa62bb392 SHA512 ba54b1b430ba957ef3179d38688eac2f90e5243142abac536d1e9e90ffeda14230c7fb407529a67ff46d8cd2418df58c867c0d79c92a4e7929b33457d52b6cc9
 EBUILD clang-12.0.0_rc2.ebuild 11683 BLAKE2B 87afbf175dc095b7585e5f5b6211b9ec3c2c23c3d5d02ea147edd0d0ae424ae8b4bbdc4a4b0eed044abb2be628ac4a1cc7cf1d28ed0c3b8e9418ab0fa62bb392 SHA512 ba54b1b430ba957ef3179d38688eac2f90e5243142abac536d1e9e90ffeda14230c7fb407529a67ff46d8cd2418df58c867c0d79c92a4e7929b33457d52b6cc9
 EBUILD clang-12.0.0_rc3.ebuild 11683 BLAKE2B 87afbf175dc095b7585e5f5b6211b9ec3c2c23c3d5d02ea147edd0d0ae424ae8b4bbdc4a4b0eed044abb2be628ac4a1cc7cf1d28ed0c3b8e9418ab0fa62bb392 SHA512 ba54b1b430ba957ef3179d38688eac2f90e5243142abac536d1e9e90ffeda14230c7fb407529a67ff46d8cd2418df58c867c0d79c92a4e7929b33457d52b6cc9
diff --git a/sys-devel/clang/clang-11.1.0.ebuild b/sys-devel/clang/clang-11.1.0.ebuild
index d27e969b8fdd..c9f1e660780f 100644
--- a/sys-devel/clang/clang-11.1.0.ebuild
+++ b/sys-devel/clang/clang-11.1.0.ebuild
@@ -22,7 +22,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
 	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/dwz/Manifest b/sys-devel/dwz/Manifest
index a348d0ef9a70..bfb6be4ae45d 100644
--- a/sys-devel/dwz/Manifest
+++ b/sys-devel/dwz/Manifest
@@ -1,3 +1,3 @@
 DIST dwz-0.13.tar.xz 114016 BLAKE2B 0e53bb99a7790dbdd724594ad00f76267483fe31bf99c9a6ea67f8ca031d2559d5cfc79f613c81b1a99f9086aa16570cb4d850f36ddbc60bdec443dc3122cae7 SHA512 8dc5e647a99ab652fbbed2d37c595a072a2e31198e66f84220d4caf04a9ee0b2900b116932f268b68015e4cc6b49b87313bf1a2d00748d2b3c4799c9ee58c2f4
 EBUILD dwz-0.13.ebuild 606 BLAKE2B 4c579e1d0d1b88be896e5f0b0ade3fe199f5b7a117b13732ed4ea45f97c71b675384091811bb447741220ac048b577b6d590bff09b5f588600eb280c0af8eb8b SHA512 5042c6ef4dee6c50399c433851c84844977ee3f9dc0289292d4bef298dc4bf4111ab337b0f68b6d6d67e1986de8de3f2df319cb06b23b776dd2e48160e9af38c
-MISC metadata.xml 918 BLAKE2B 7d94594246e411793f1dd68161be15e1032ac3e3d0a2cd1595532a13f5acaf0a03b9f0c5161befc57e30873dbb262d59cfd3c9e46ac8d3a124b553ca79df5734 SHA512 6ab2333960c27add9c83a6af83183841a75c5db023e12e14efd01a9a43f85e6241d0091d9aab133e248aa38302b8c2743dd467a2ac9469819055ec0df5af9145
+MISC metadata.xml 948 BLAKE2B 9bdaae7bc55ee4491556aedee2dd3618c4d3218094dcaf8483890dd09fead72ed3a8b891291b21e65f2d097b59c02187821926c2c024c3aeb942ebf37cb44c69 SHA512 1202914fb8cd14847a0d813c24d8a10212a1a826ce6fcce03057075a2f3fd5fdc8d6a738a007ad0d92ee18f69f44d8f048614e14d12484cbf632caa7dfddc72a
diff --git a/sys-devel/dwz/metadata.xml b/sys-devel/dwz/metadata.xml
index 72a6a1288bce..adcbc40ec9a0 100644
--- a/sys-devel/dwz/metadata.xml
+++ b/sys-devel/dwz/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>annulen@yandex.ru</email>
 		<name>Konstantin Tokarev</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index c8446be838a2..bc89e400d13c 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -9,4 +9,4 @@ EBUILD flex-2.6.3-r1.ebuild 2013 BLAKE2B 0825b6dbc2e8366b70cfd560f2d88ff6f127596
 EBUILD flex-2.6.3.ebuild 1939 BLAKE2B 3ffe8be5b5893de5c55873575728523e44f18187596cee9240b1288bc5d0865c2e552f66777956584333035f3ba05289a0502721f9a1b4001c89056a7d3df9fb SHA512 58c9d79c91bba6b3819ebead5754fcc712688ebe7313297e254ad630111a8512b273e37216adbae2616729f421468207d05a1ec8aa97518e68361b58d9e558b3
 EBUILD flex-2.6.4-r1.ebuild 2074 BLAKE2B 7ec754512179432cf6863fa67904f4e9e46e38a43eadf6750358541286409f961debd1c1dca04029897e4158643aa9f9ed6a4ac3350932492a8ded7a337470c6 SHA512 23a1b51fd6fd3e1c9e70d37f96c29c1a160a8d62bef9cee103a1a0898bb95cfc8cb8246f704a41c4bcb5e10270fdb85d80eda4d3140c312e2f9a17797688ecca
 EBUILD flex-2.6.4.ebuild 1978 BLAKE2B 409bcfa1d667e10150e3ca38a117884a09080e9e148d9349cdbae3e020962f27b4ff5cfbdad296adb0e3257c2339b244a44b77d23b61af7db3bd4d3b6e7f5c2e SHA512 d7b3ee7731f7f073c3bc4a9e9dcf9c225370d8e686b1c4a1c4dfa235e3513654318003a278e8affa062e0d5b93c0e257aa3fdb3a8622bf172abc679dcce73cf5
-MISC metadata.xml 443 BLAKE2B 0e02862e2117e571beaf3938e56d19a5134b0c5371bd96e9973eb930a9874bcb103813e4a04f537549282b2a713c5bf882922142041f484a728da83755405777 SHA512 e115e8bfbf3c372f0e7200dc75d523214df2ce59165c43e01db5aeef87bfd7578de9757acbd67efc77e1ee7ac16fc00b99b905d65b8c0528c47de613bed872d5
+MISC metadata.xml 443 BLAKE2B cc8a09bc87204eb0ff62cea3db2db77a6ec2f8128e123eb0c9983729d42d8f8f4525cf01ccaf28d1501ba56e62fcf428463ceb05d60b7a519c2ec4f6a47b583b SHA512 47d23e25c830b96e5ce176c02e90e6cae38638d15f1a9b8261258ab455e622d53f4f2349fe1701e2742176fc6bc4c1d1b71431e3769b8fb04842b4bafd7a86ab
diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index be9974e7395d..2bdb533c03f5 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 2281f2cabc41..fae1a5edd423 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -2,5 +2,5 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD gettext-0.21.ebuild 4302 BLAKE2B 1e449cdfc7a080864933ec3fbf338e30a6540cac14a2f232d3dfc9113bb633288a4cbcf96fcbbffbe887a0dc6eae4ffcc658fe1a867d22b4c2bca7651887dc35 SHA512 b63f7329247896547825d1a1a66b322fa38bf4da6fb70e37676cc12849b168d3c273032c6bcc6827d6de546cae38465d3f54042946a96a8ffe7424c3eaac62a4
+EBUILD gettext-0.21.ebuild 4309 BLAKE2B 555276173217bb41c3f97bea416c2bb5160576e431e971415dc1b5d8e55b0d0e8705600e8d6c1bdc4d38c48feabfc6075bfe8d102c57c826be59a5ea1578961f SHA512 a5c2fd566f1c948a023dfc8d10b5014505234ecb8ff1b0f44db4a60362cbe1679d8ffa7ee0531c0a961cbd7487ce284370d1defbdaf3281c68a5cd75a7e10a0f
 MISC metadata.xml 707 BLAKE2B e0f7534d0a90939db1d5b7d0b837d9c0c4ba7cc17ece9dc90e7832580fe62a53ed306a77f86c3205bb96aa46d40834b03143d81076c531eabfc92da82d41e880 SHA512 1951f0165d110a484ed68f774106d6f76f5cad612eb74e0386e8ecbb4e71627668daeda48a779ee6b5daab8b2617145e50ecdb0429c34879278ca14868d40d28
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
index 20d815cb7540..739a11c7d2ab 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -10,7 +10,7 @@ inherit mono-env libtool java-pkg-opt-2 multilib-minimal
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
 if [[ "${PV}" == *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.bz2"
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.bz2"
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 2c7981367c90..c25db1de879b 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -11,7 +11,7 @@ EBUILD lld-11.0.0.ebuild 1396 BLAKE2B 07a3d3579893dedf289ca83285ee2525eb8c9f540c
 EBUILD lld-11.0.1-r1.ebuild 1255 BLAKE2B 5f719720deb1488bb386ca5f17a330c981db3ce16ae2f529a9de594b55f8c08b25923a1349ba3edc816af3c09eef4de95fbd10a444d8348345ebc993527e5cbc SHA512 d731ef570a1e88f3b45a02f1dd88bd5ab0fccb057a91714c7d31837db5d93261b44bbf2174d2c46171b6b80e2451f7e7260675b6a013f60775d5cd9a69af770d
 EBUILD lld-11.0.1.ebuild 1400 BLAKE2B 3ff6e59f2cb59db760e54af910f564c1d2d2086fd94b04982c0e918cee159b9fdfb7d8b9b3a63a500f04e715f0b505462b3ec2110dea2cb5fb3c466f506791b3 SHA512 cba352b000bec766f499e6df1063b86b9f8d5d4c6c763e1a03ff31abfa179d89ea98248a84b3e3c4769d3a61150e1ed281e9c4c1b18235cf831e55e03f4163e2
 EBUILD lld-11.1.0-r1.ebuild 1255 BLAKE2B 5f719720deb1488bb386ca5f17a330c981db3ce16ae2f529a9de594b55f8c08b25923a1349ba3edc816af3c09eef4de95fbd10a444d8348345ebc993527e5cbc SHA512 d731ef570a1e88f3b45a02f1dd88bd5ab0fccb057a91714c7d31837db5d93261b44bbf2174d2c46171b6b80e2451f7e7260675b6a013f60775d5cd9a69af770d
-EBUILD lld-11.1.0.ebuild 1404 BLAKE2B 69cba34c8e3a96d934004751ad61ce60cd41a25835b4fb849a7d70a0e975ccb5352f64ce581edb3848a4a2c1a45ad5461c95adf40a41301637c54135f4533cc7 SHA512 2a2dcf6d88fb2567b210414bb8c9cd203db9b953dc845e426047dd424920f074abd9a0ed34ae048cf93a12b54dc2919c182fde46197b70fedce2983d28c41365
+EBUILD lld-11.1.0.ebuild 1403 BLAKE2B 66b6e15db17c488f1f4ca6ad389418d6316b1f1ea386eb5da6d7e95f2a8a2188ba2c04f482821ddc7caf65f5d6dddf9e2a049538ebe2437e1d7566c5432f1084 SHA512 ab8e6e5dd7b3dad28345e741a2d3e71bc18d94ec31b12ea520c647414b9785ebc7236bd437d1c1afe2f21931102a530c10756cc49fedf46014b5ba6eddbc2947
 EBUILD lld-12.0.0.9999.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
 EBUILD lld-12.0.0_rc2.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
 EBUILD lld-12.0.0_rc3.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
diff --git a/sys-devel/lld/lld-11.1.0.ebuild b/sys-devel/lld/lld-11.1.0.ebuild
index a2dd610cde0f..e50f246fee37 100644
--- a/sys-devel/lld/lld-11.1.0.ebuild
+++ b/sys-devel/lld/lld-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index e19aff912eef..342719dfc203 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD llvm-common-10.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 EBUILD llvm-common-11.0.0.ebuild 595 BLAKE2B 4c0f992968a6e624cbcd73b430b37fd0ff5c108e6af88b2edda0b94d1370b2857dec11140e14e6b949e6353412e9d50eac610f79ae80ac9a917e6db4754eb36f SHA512 56563e4388614da0e7b9efd0022a1da789db772dd593a3101d4d639677fa0217dc822aa602dce719b0ff547be8f102c1a42e1c05c2fee612f9cece2eec27d7a7
 EBUILD llvm-common-11.0.1.ebuild 597 BLAKE2B edb2da60746a2c9722a54d8e71ad2b72a0604f457ebd8575ad5f88a1a97f83137b9af7f01313aa1c7f39e63567257fc0e792caff03391a155f384b2dd2d92bd4 SHA512 96c9a43e9dd11f75d7c126813e5ecee0ea3f384b8dad8aaf339e2713ff97409d0b393444c15cfd332466c8da104b7049cdcd78ce5b13e1c60d9a80fefaf19020
-EBUILD llvm-common-11.1.0.ebuild 601 BLAKE2B 570f3217864c54be4846d406b88c16ea8f8f7f8b11fccdd6dd81760cf7fe216cdd991cc5d090a59336bbb4d4eac448b15a809b14c7a248faaebede90cd42145b SHA512 8f85ddbabc6319c75f7e57f3a41d302db2cbcd215919682340d8a421f3117af509fb3c605d0bf79c57a76d226bab34f4ef392550dbe6dd5dd819294db6a7a23f
+EBUILD llvm-common-11.1.0.ebuild 600 BLAKE2B 3d29dad6749308a0132016193a4da14314fffd1a26377f91d7e2621e22df26c7c12d6915d5e65a6b2015a560dcc2872b9738e8219722825958c9a249ce6bf114 SHA512 a3fba8b5c4a71175f2452571b55228801ef7477ea31128b9804021a861af924008f38d04ad98d2b245b740b1637ea499830a1018cd90b88f1795a1486863e57b
 EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-12.0.0_rc2.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-12.0.0_rc3.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
diff --git a/sys-devel/llvm-common/llvm-common-11.1.0.ebuild b/sys-devel/llvm-common/llvm-common-11.1.0.ebuild
index c332f7dbbd1d..a552f32a2837 100644
--- a/sys-devel/llvm-common/llvm-common-11.1.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.1.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 0fc55a5ad354..3fbd66b8d0f2 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -16,7 +16,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD llvm-10.0.1.ebuild 11889 BLAKE2B 680cfce8161a51c15033cb6c5db616f74d5d04fb165fb726df5e3f9ba88631add687954ca3ed823041c57099cb48eac5274a37ff9defcf40ab94d681e4383692 SHA512 3d690f86c806f4804bc16c365fc57a5525b160f2722773c79b19b89927fc514b259ea7393729d4df648a4f7e3e0ca90100ba621630cb8d25cd92dd7286259d70
 EBUILD llvm-11.0.0.ebuild 12872 BLAKE2B 684851dd05e8321c6dcc4d30f312fb13832a46b5e721bf39d70345fc3299a655d5a1db4b8f1bfb5219b210d7b6eda3c15bbd6a8e97d525ae081760cdcab01fd0 SHA512 a299f084bbfb8be92cf1bffbe628daa7d1ce6362ae65885a5cd04445661c4471b6cd7824a7edaf1dd6d63d6b65ced8712e25018cf23b90fe0a42a4a28f2fbcde
 EBUILD llvm-11.0.1.ebuild 12677 BLAKE2B fc6a4a314c58b2864f98219e45875ef18af1cf71b5ba29f16ee85ebb89ae79c7e5612b362527e26a60f0e5eb3c4bfd2bb6a40c2af03fe1a55b6de5b57252b34e SHA512 8df58d9a8d72f60f556d082d761d8da2c327162cf29493372783aec4439f0c6f435b323358459b591afc626ee42a51f7101fa428e8759d7be1dea229d43cc68d
-EBUILD llvm-11.1.0.ebuild 12681 BLAKE2B 9b3540ca6fd9a7bc1a86b0b025b64a6ed939dc4fd078bfad4e1414515253ff1ff5f4ec604aa40db671a7c5b6b8405051797c61418fc936510d649e50abc9ca54 SHA512 08bbb825ab193978acf6c8dd95e1d8a0fceffe4bdc3cc4a79ccbdcbb9b41283e15edf95aeaab6dcf224fcf83956783d7c2512fd3834444506eabdca03d9afecf
+EBUILD llvm-11.1.0.ebuild 12680 BLAKE2B 8513e13238434a9fe48477f7c08a98c1b4e50d6db1e4d17df3b518cd981af4854f08485ed1bd4ff397da6c0ee3afc2aaac806a28f347bf0ce12c3e4aa4602ef4 SHA512 2eaf4e9990c9d52533864e04e61162e2fd35f228606b3bb959e8ce1c38ce0d66610287c1194f368c4b9271ba3aabbc4ed4822c5a7e016e8cbd0242bb4f356822
 EBUILD llvm-12.0.0.9999.ebuild 12707 BLAKE2B 4b1a0bdd938a7b1929ac0733ab5858deb39d4baec80819dca21fc3420f2e0d23da43053037e944dbcbdab484b8a44075e66fa6c83c548242b094985fa41be0f7 SHA512 daa950c95437fb5ccb188db3595de7e3a61ec5df5ae4f4141bb553d7672e9423882a31f227ba7ed767982796fd515637b51a6032aca7ce01e736ee8c6c0c6c82
 EBUILD llvm-12.0.0_rc2.ebuild 12857 BLAKE2B 42ba7b8df5bc10ccc22ea9f3958336325eb661e4d93385d38e36220a20e4a967adb407da1e70fe3f53dcda0cc13abe6d49103e0efc88bd37e3f2bd2006a11b21 SHA512 a24593b3e1ea3353556cee37ff990d649a99628abb3c8deb692e9441e2281e2b70395bf14c4aeb9dca03a025b1c4f9bd9c7e8b151fa7aba09dc7e83dd0c8d135
 EBUILD llvm-12.0.0_rc3.ebuild 12857 BLAKE2B 42ba7b8df5bc10ccc22ea9f3958336325eb661e4d93385d38e36220a20e4a967adb407da1e70fe3f53dcda0cc13abe6d49103e0efc88bd37e3f2bd2006a11b21 SHA512 a24593b3e1ea3353556cee37ff990d649a99628abb3c8deb692e9441e2281e2b70395bf14c4aeb9dca03a025b1c4f9bd9c7e8b151fa7aba09dc7e83dd0c8d135
diff --git a/sys-devel/llvm/llvm-11.1.0.ebuild b/sys-devel/llvm/llvm-11.1.0.ebuild
index 3f27a9d16c46..9b74cd6a434a 100644
--- a/sys-devel/llvm/llvm-11.1.0.ebuild
+++ b/sys-devel/llvm/llvm-11.1.0.ebuild
@@ -26,7 +26,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index c9741752a24f..772006b6c78c 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -8,5 +8,5 @@ AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 EBUILD make-4.2.1-r4.ebuild 1658 BLAKE2B a331a9d7abee983366b3e9758d57ff50edcf4e230e453da19ce46875e06f58884985518edc2f29c0d73c2bc0c5f4da064a8ac91b2c883fddebce3fc6a64768e7 SHA512 8cea7411216ff0900cbce9b29c19990c9eb49a19701a084e6a0029b69ae31877e8e37ebfc1e5d06948fc15d5c292756e15fe9bd5aa74629e938863cde430a342
-EBUILD make-4.3.ebuild 1411 BLAKE2B b54ed4d329d8bcdc41c9ef9451fbe715c5756e70b37278eea850d0a0420cdb26b66fe1a5710bcdf5fd29b6880b18803b722890bc34896595d614a849623581af SHA512 e6ee844f0642bfb35040799798e2ca0076365bc7d65b729b64cef0d0a248e7aee325edfaa4b3a38ae2600468008d2cca73eed819db5d512b52d70f1f6e206951
+EBUILD make-4.3.ebuild 1418 BLAKE2B 9fc3799d1598f0762b06eee4e60270d73143350dc27dd40f0de918a6958e21ae5edb4780ec75252297fd68120050eef0b3df808cc0d4266a718e13e56f4d90c7 SHA512 ed3281b4006ab42b8a522e25b1d2bfc35f3364f3a7a232e7714d31ee5b32114f6dcc4cc66e2037de790bdcd6add16860ee5bdf15d2d07abdc7ccf5c7db59a566
 MISC metadata.xml 327 BLAKE2B c4ff5632d2d92cd0e1c073808261cc162799e186abc0cbf06bec9c3cb18757e325e63dc060e417196faec853dd740701f1bce0436754e8856399e4aee0ef950a SHA512 579ef7fc6e14f725bb29802f350035bc3619e6f06c72e3c496a92c056f15c6baa5f07d7b1aabbf13467629f30137bf2160b9d13aa6fdd65dbd04ee94472d00a1
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index 6f8771ce9ab1..b8d40a96bfeb 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="https://www.gnu.org/software/make/make.html"
 if [[ "$(ver_cut 3)" -ge 90 ]] ; then
-	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
+	SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${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"
diff --git a/sys-devel/metadata.xml b/sys-devel/metadata.xml
index dd5a911e46a2..f21134fef4e4 100644
--- a/sys-devel/metadata.xml
+++ b/sys-devel/metadata.xml
@@ -35,4 +35,3 @@
 		systemu.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 74da0aa1099e..8be5fb5a1b75 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,4 +1,4 @@
 DIST parity-2.0.1.tar.bz2 371662 BLAKE2B c0fca272665bbe346d5d5ca18e06c65209df61454310811b939239f8ba25ec7a08ad2f864fb43780329dc1f0120afdb6ea4ee2b4b42d2888860358aa1dc176f4 SHA512 3c96c87b87f40cb7affd6ee9a87c8e7cf628aedb44a2d3d89370a5b5e32a43cb15a897ae27425e9d6a00581ffd50a70c7a7481f1ca259eddd1e6f2310b554eb9
 EBUILD parity-2.0.1.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
 EBUILD parity-9999.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
-MISC metadata.xml 1029 BLAKE2B 82474429a3a04609f1f1c899a235a759a2f66982d5bb7310ac51b1eea803fbb102cada8c197b14a89b66619c80ac9d1f5beefe607257c3e2c0de390e84aa3fab SHA512 d40f330e336dc0166e3666bab44b6aadb723b0cbdb0a7b47a2d292320e02649c075f28436de622b65280cf024b3f57a8945d7123ff520c4d76e0c910bcafc77a
+MISC metadata.xml 1029 BLAKE2B 4ed05a00bf25d1595cf7053b2a781d0fa7370182a4fbf776df445729f9b8dd116de13da23454be6ae936ba9f723aea74826eb32b8d0152fa99f3a60606829b49 SHA512 e280f1111e17597abc560c7f8756dd31d3feb60caca3ff810ac789198b978fa4d0219a738c0bfac828e97986cf10e4a2f619b90ae7a59bfdeb5a7562bb70f65b
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index b66b8d4e0b7e..781b5c6cf53b 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index af79cccb5a61..1562d640fd5a 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,3 +1,3 @@
 DIST qconf-2.5.tar.gz 100704 BLAKE2B 01dcca053e020cfc76e8595927dd3cedb6c82ade24381c95935c87994037ca5129f5e9e0ec58dd0e0fc6815b1500249b767367fbf7a16549459f814bb1591368 SHA512 4ce032eb5b9ba2d584807b3283b0dd5cf973c2fdd6792dfec13c54bb7c639d23eeaab03eb52f1a395113d973d2b01d87bf713d717e691641203865b934c7da5e
 EBUILD qconf-2.5.ebuild 829 BLAKE2B fba833f1097a88c8d14d6d748a84d9184473626691f0644e3186c70b4ca0d6aef222e67f55044b67140846f6c2fdc197b3f562a4ac8d44eb51f501e47c0485ac SHA512 a70520107118082412ead38ae295e8e80535c91264ca992bef3f80dc2caea1e1eb543860e25f03ad85deef898337d0da30dd042731b38b270a100d89fa649682
-MISC metadata.xml 443 BLAKE2B c1f506fff4cadd99e671c0b35fe4f063805135018c4ea251928e86ea031561aa23c5c4cdeddf394a417c618231eb140ecb36af35493a235dfe3548ed8924829a SHA512 3158c41fb11973c029e758b1902c7fa09202246d6a8880d8a9e9352aa951730b22f71c1ef2319103b8005cdbab005b5874fdc79c8568704a79b36d13076782a3
+MISC metadata.xml 473 BLAKE2B 6c393c9e6b1abf7066546a4f7021f5cc79384487a3954ed614beb43b137984a41c7972e6c010e61767ce1eef4f1be4fa80ccefc1b8bf571dd128189d8a253f0d SHA512 f609da410435e018d6f4e157de7b87b11be1279d2eeae9ae4779c12403ee48bc4acb9babc5cf708978dc064108f19650da745ac38b9eb35a849b2676e4480eeb
diff --git a/sys-devel/qconf/metadata.xml b/sys-devel/qconf/metadata.xml
index 50979b8a949e..9c39d19d47cb 100644
--- a/sys-devel/qconf/metadata.xml
+++ b/sys-devel/qconf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index e7f3e4942fb9..b7171e62319f 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -3,4 +3,4 @@ DIST slibtool-0.5.31.tar.xz 70008 BLAKE2B aa46b2bfe02e22dabb3dc56b2de9521ef8fd3b
 EBUILD slibtool-0.5.28.ebuild 426 BLAKE2B c2dc699691870320b1f1368846b599277b101a7a6721ff9e0a2a3039b1ce9e6c25330ac2494a5e735be0b39bf6960d01339c0e6e2397c426bb5cb28501184116 SHA512 e81d7fe8ae95b6076000b45050a2490cef2f4c39e06b6374578cdbcd07b7259ce1cb9b7ac8fa1e21600f32219d9b4c665041f5984376f0fb54a7d599bee01616
 EBUILD slibtool-0.5.31.ebuild 481 BLAKE2B 8ada2b664076fc2570991c47357e05d6bb227151881cdee8a5593dc1e32a1ff9e42a86f2789087609070cc9afc346359c9daf9c86146fbf118787411c4ad0583 SHA512 d14e5365748e0b9da1ea2d643cd9e40afe2143fadd6cbdfa38654e2d591904d7190f6723e93806d5253a4bfb7b97840787bf2af221f971d3b03e8c46529f2cbc
 EBUILD slibtool-9999.ebuild 589 BLAKE2B 4bb8cd55849eac2d236bf10b7eb312f9dd4bb5a41125c1147cbee15c4bdc573b5837c7c9669f8ec133741e5d33a8ca1cb1cb8e22211652d66301aa389a4b4e26 SHA512 515fd7bde0127cf1cf86007b1f870adc878d0f4abb90d938ba985d83bfed5e9b224b79f4070b6f3c33ac91709eb127180ee74af6ec66c5676bdf12b3a0cdfd26
-MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
+MISC metadata.xml 395 BLAKE2B f7ac23e1fb55a5b516be9dffc7a8f724788f5c1458ecf5a4c49620d28bf333c01e481d1f5e2fef8835d93d572866093824228fd1aec245d21407f231497e5121 SHA512 2bbcaf964c80d261df34eba6d0680d2c73c4e97f0acdda2aeb563fa54a72b9d3b8e14d5172e85225937797b4c8e17219e6bdfe153526c7c9be6ef6d6e4adbe50
diff --git a/sys-devel/slibtool/metadata.xml b/sys-devel/slibtool/metadata.xml
index f954e7f9956d..c4ec2df2b130 100644
--- a/sys-devel/slibtool/metadata.xml
+++ b/sys-devel/slibtool/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>felix.janda@posteo.de</email>
 		<name>Felix Janda</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index d4fb9c0ffd1f..1794c9c26570 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/metadata.xml b/sys-fabric/metadata.xml
index c226ec5fd1c2..2a247d7b2ac0 100644
--- a/sys-fabric/metadata.xml
+++ b/sys-fabric/metadata.xml
@@ -9,4 +9,3 @@
 		otro software relacionado con infiniband.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 12f0afe23e90..55a8d9eabb43 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/midisport-firmware/Manifest b/sys-firmware/midisport-firmware/Manifest
index 41897caf5ad4..b4a4e363c4c4 100644
--- a/sys-firmware/midisport-firmware/Manifest
+++ b/sys-firmware/midisport-firmware/Manifest
@@ -2,4 +2,4 @@ AUX midisport-firmware-1.2-configure.patch 1196 BLAKE2B 899b70768502e50b2206691d
 AUX midisport-firmware-1.2-rules.patch 2410 BLAKE2B 5bd064790b54a5cc4f8306d199d200674ab3a7b2ef59476e549fff7a0397a672f17d31ae1f536a0efe0319606a85663d741906c6b32aa97c32afd6d871e07dbb SHA512 f178a005e5f2baaa3e4dff02fe9f4a8b73465ab69ee21080abdcc9f4cff85b18eb46052431a11c39088749e80f00827d936b584c9ad27e83b9bd12545d80434a
 DIST midisport-firmware-1.2.tar.gz 62948 BLAKE2B e451816d14d6ff6c6627bbf7ba71de4737aace53b0e22d75802f34d2f1aca557dfa4a29f9eccf131a16f1490e02fb38708c3d64e55d0ea7fecd8c828a34df089 SHA512 ac46b1e16dbee628d41e0c5b39730a4ee51e1f62187e5e56ed393f136937fdffa86ca84882d2627397f074ca2eb12be3a8701a5027999a0d00b84b706e227a0b
 EBUILD midisport-firmware-1.2-r1.ebuild 666 BLAKE2B f837c191045c3b1ee01d7b2fae179a4e647f0871dc812bcf0a694994dbd51c3453f7cd85ae37539b075e8335bbff4ed3bcf883dea787972c6d5258036fc9fd1e SHA512 f4e253bd97d05de3ba09454e870f8ab2c0404edb46d3ad135fb5e01a88ab6acd2a3f53dba8cb962cce5d5beb3983b1e47ec358f800d3e4b8153802307fa98d14
-MISC metadata.xml 261 BLAKE2B b0e0b9683d55e42eaa5865c994cc11fe2b19cb34042e92e4dfd6b03006c4978be59c2e49147b71a606bf5597a37f90e3b0ad383b32d009287c23baecb2fc26bb SHA512 f7d693d0c24f7e0c8fb1474b31ac49405e418cc3f1ebf5fc8312daa8471f870f440834459d972ac3a5c141eb959a61d24e26e0a7a4b482134415f83784f71f70
+MISC metadata.xml 261 BLAKE2B 72b7745e8cdbb7a7a0684b07711c002a542994c48e124d014aaee913fa3e0244a6f906addeaf0cd8aae22c0afb0c6c92d1c8b707b53f0491358a09326b882b62 SHA512 8c451b18dba808ffa8c92f47c8ef90258f56122b99714eda3a5df60512a4da6a5fc8adf92336f603f2e369c7d08e0b480c8525e6979dc8109a2719adb6d13ebb
diff --git a/sys-firmware/midisport-firmware/metadata.xml b/sys-firmware/midisport-firmware/metadata.xml
index b0b118549493..baca5729373b 100644
--- a/sys-firmware/midisport-firmware/metadata.xml
+++ b/sys-firmware/midisport-firmware/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <!-- maintainer-needed -->
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 4fbe82cb112a..cc1095ce1549 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -2,4 +2,4 @@ DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc26
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
 EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
-MISC metadata.xml 570 BLAKE2B c16f4a80f7e456a30b352759cb1868ea1d85ec0060d0ed8d89cbc6c090c69390970153bb739b9a8f96e2747d43e26693902bbe6fde2dc5fb8840d1b0a61bca3e SHA512 5a67d2e10cca7b455cbaccb5b76fd165e764472260589c3d52668ad9a1731ade9dc1daf6b8516280cd65145cdea4b9c1437dbbd6dc2aa4d5aff2c2f64ea4f057
+MISC metadata.xml 600 BLAKE2B 6edfa59a0f432fd7465ae74f08ce7b9441c2fafce1c59e31f012a9a1728c052378c56430d2ab67886ea84a9ffb9c98cc6addfd58e90a1ee0f77b44018ad94f37 SHA512 9bee61c8dda246b541b27a61fc97555e06cb0190a30d4d911054fbceb3d7c8f4821eeb4fb7c1f26c445df518df6e3b907b0881c89cadf57007140b80811e73f5
diff --git a/sys-firmware/raspberrypi-wifi-ucode/metadata.xml b/sys-firmware/raspberrypi-wifi-ucode/metadata.xml
index bbecf8cc3a3e..3b6ccaa9802a 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/metadata.xml
+++ b/sys-firmware/raspberrypi-wifi-ucode/metadata.xml
@@ -5,11 +5,11 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>crabbedhaloablution@icloud.com</email>
 		<name>Peter Alfredsen</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1318f644a34b..76352c258941 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest
index db6a643c3f21..698514b66f41 100644
--- a/sys-fs/bashmount/Manifest
+++ b/sys-fs/bashmount/Manifest
@@ -1,3 +1,3 @@
 DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062
 EBUILD bashmount-4.3.2.ebuild 620 BLAKE2B 8b4527930b036a75b236e1b7621f49426b739e6cf0bbf0461be8f52bad74f4b7f148415455680aa35cb2b77f9f3176af69c935931372d2661636434311942688 SHA512 1c828df7d9f03330daf4621b535061c73796c82d7e98fadc1fbbcfd601c28cbea2144c29fd2d7c0e4de500d8424c71f8aa9c089e4f04c86fdc87011c7fe054c4
-MISC metadata.xml 447 BLAKE2B 8495fe20d357824d2c5ba05f50ffe45d209b016f56c13b61959341ecd592bfd4236cac2dafe6211b3755cd71e28f0a99b8bd597a2aed3375b448f5c535a839ff SHA512 03d0381cd11be4856fb54a60353684b9466e3b3effa47cc02415198f821077bad31663bb033b8d2cf8ae82578aa4fb2c462e253b862018d08f9bb19eca3b9ca4
+MISC metadata.xml 477 BLAKE2B d2d7cda24398df24ad4e4cab9d9df216dc41412b742e6c8466af032b051ef22589e096a52e3a788dee9a068367329ab765bd41897566c25aed21c0300e021198 SHA512 69db8f36ee337f6b3e23921fd6327bb1deb340f728b3aabd17f1834421a7a36ee8b13d8ce0600c2c4b42816b8f6123a4882786866c73bcfa3e43ac990dbe7cce
diff --git a/sys-fs/bashmount/metadata.xml b/sys-fs/bashmount/metadata.xml
index 5f308339baae..1c4ef5967dc4 100644
--- a/sys-fs/bashmount/metadata.xml
+++ b/sys-fs/bashmount/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 6a3a2daca408..9c95431c6de7 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -3,4 +3,4 @@ AUX v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch 1481 BLAKE2B 9
 DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
 EBUILD bees-0.6.4.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da
 EBUILD bees-9999.ebuild 3103 BLAKE2B 8aac86dc3e6e5ec9fa947ad70d718438fc7befc991c89db9f696c25d4df85a0c664e75a8e97396d48b1d68318f52d864baae428eb4c47c2ec25dff74d9a91e68 SHA512 4267d9824b1f15535c35dae20c442355ec2c05cd16707579df21f19d6478dbcb034af6103b76c4829b6aa5b21e30bcf0bfc83989f709a0dcb2d21c7bcef933ba
-MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
+MISC metadata.xml 621 BLAKE2B ad7950528a5e6cedcfd19fa0f1ce9e56a865a27cdd385140109378554d420a4aaece5ffedc7be785a5a3968a85415955618442986de458adb2ce268d7afaead9 SHA512 82f309ea8403bddff65a4e7843647f99084543aa008b5d183b22d9b165f0590043f25a79f504f02b1a6e578d50f87008b88d9c453fa7afa287d1cab1d92fa669
diff --git a/sys-fs/bees/metadata.xml b/sys-fs/bees/metadata.xml
index 1231725fe211..a6152475f528 100644
--- a/sys-fs/bees/metadata.xml
+++ b/sys-fs/bees/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index b5387e4823f4..14120859aa67 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -2,4 +2,4 @@ DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991
 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
 EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 21e7ca9e7ef23f8baaceb2058fb5308b8059e6f7e8a2280967280651558806a9fca93274a125a5e25b1257e43b57e12d4b577a48c1364ce6e1e96436fa994126 SHA512 17de5b583a6626c6f5fac7118354cd130f740daadd18a71272c9ce7e5b97b644e4be1312845ef2884baf607e9ff69cfdcf1cbce3762f1a33402b3bab4ee042ca
 EBUILD btrfsmaintenance-0.5.ebuild 2152 BLAKE2B 4aea7ed2ca290fa9122e8d2d838422bedab08ceb0cf62a6f9d40a6d38dd7c7bd245bc30ca3674321d4c5be5d0cd474e8699ff67bbb6a40289c33b2c55b41ab79 SHA512 7c097a8976a73e397e2a9bf98d65cfd74e663195a33c3828137caa1e290a649582114cd850ff9d4d8c75d27ce11fb14caf02d835aeee7849200c8e6090e69ae2
-MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
+MISC metadata.xml 594 BLAKE2B a4b32799e6944d61077a6513e0e7d8e8f723dca7604536013c39baf0ff01bd83ac2a4ee7f365b012db0d0b0d1516bcc4cbacc9006b46601dd661b009cb7af95d SHA512 577ea97aa1f8a4f1c88d9f5734b5b6c25a4e86fb6152d6cd2ab44b7b7b600ee212af7e7291ce9c4c0db212201569ac8066013335c6df4c6734cfdb4cf37c38cf
diff --git a/sys-fs/btrfsmaintenance/metadata.xml b/sys-fs/btrfsmaintenance/metadata.xml
index 46342cb51b38..3d8ae93d4886 100644
--- a/sys-fs/btrfsmaintenance/metadata.xml
+++ b/sys-fs/btrfsmaintenance/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 5b984722226f..93efce14ed8a 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -2,4 +2,4 @@ AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391
 AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6
 DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626
 EBUILD clamfs-1.2.0.ebuild 884 BLAKE2B 6980e4d40b869b5de9b7f4d1a4442a02e416d5303a0a32843cbcba960698f959a791137da39d4014d13596ec281f1d5d6a103d2941e85ba469380b7b6f7a988a SHA512 c075fdda1cfef3b76d37a3f6a139a0677a3d0af6c75ae46d376061b0f5b5906ef69157f9c7764dd14c0e7979a6ac6ec90b574403f64a94db6c4eaf1683053afb
-MISC metadata.xml 687 BLAKE2B 37829356f4f52cd8839f2ef33ae462c2a5e8a062bd3293bb177c4ebd31a933912e7ea30f26cbaf149de613ef8e4913e9adce1a223c1a9715d81af3b70657663c SHA512 f18160b3711dd7e8f064abd9b4e929d50ff9c7996807402916e4532902aed5c52f3ca0460c44c280e89d79ee4c4ffd0c682fc8cc56001eb93064304157d8659d
+MISC metadata.xml 717 BLAKE2B a383dce5d1fb694f67f18212e9e8d566903a736a5dd6ad2e724148a832fbb1d571e8aa61a75fc58d552805fa900037fb5d48f79f8e95107e06332ea18dc09e46 SHA512 54eea087dbce8150acfc41e22f02da2eba0fe271d7e63af56268aafea67d13558b57f77687f23854e4b51f1307b89fb3ad887e5fbce881a6986490a0cc5df68e
diff --git a/sys-fs/clamfs/metadata.xml b/sys-fs/clamfs/metadata.xml
index 57d224d33e73..7cf03aa8bf4a 100644
--- a/sys-fs/clamfs/metadata.xml
+++ b/sys-fs/clamfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index 69dbe62d4ca5..28f4739d70e2 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -3,6 +3,6 @@ DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a
 DIST compsize-1.5.tar.gz 15015 BLAKE2B 1a7fc676ffaeb69fd410a834eab54ef63c5fa11e428bd0567ab5dec5dc27fe1b4901fdd47760c07a7fb26375b81ba997528c0aa83409eb364a3b9f2cb1942cc8 SHA512 25d6f1973e8a0a86bd857dc1e1ba99760451cf388f3bd3ede6a6ef35351ff63f100646d313010aff3de9e70b2c68866a31c4ea31d9c6df9254648cd1bd0272fa
 EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7
 EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
-EBUILD compsize-1.5.ebuild 909 BLAKE2B ed676805a2e426bb25874aefc1f8335949f5d2576d9963b748479f66a47f23dd52e1857bf22cb74e3b5af42ec9474834dc3917142978f196f7b6284693861350 SHA512 62ec27b02a1c338e1dcd4528fb5042805761a7a7e45bce0a99feeacbc888065d5e5f4528f56ab5b110699fe41e790fbcdbb0cb040c0895c09f953f87c5d04628
+EBUILD compsize-1.5.ebuild 914 BLAKE2B 37d963bcc28850836f514113a3daaea0fd3343d9421becb533ace7679daa8abfbe1d845d186328283e40b41c6098a9ec8a7c31d5867a739007bf87988356349c SHA512 ab8973892250b1c432d28cdc060a49bcf17a721770dac7301ebc36f00e7a8fb0c38eb643f51bed398e1781b26d80c30db9ba10b96852462c8e8b8546dfdf6be7
 EBUILD compsize-9999.ebuild 909 BLAKE2B ed676805a2e426bb25874aefc1f8335949f5d2576d9963b748479f66a47f23dd52e1857bf22cb74e3b5af42ec9474834dc3917142978f196f7b6284693861350 SHA512 62ec27b02a1c338e1dcd4528fb5042805761a7a7e45bce0a99feeacbc888065d5e5f4528f56ab5b110699fe41e790fbcdbb0cb040c0895c09f953f87c5d04628
-MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
+MISC metadata.xml 474 BLAKE2B 93fb6451e4aea9bace615da2fc15b996aa88e286201f6b95d7e3029f55dc97d189291a64033b87fde42d61db60524244777fc280d2bc0e4225ac8a3dc3a80e55 SHA512 6faacdb272a6c0aa8c19c4970c6eb00d15ffab23a0c6c20178503f3fe0de77747d0b43d63f558e5063b03fc2456456dbb4471976fa4ef5c5ab942b649ac7c4b0
diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild
index 471c60d719d1..21474d2e998b 100644
--- a/sys-fs/compsize/compsize-1.5.ebuild
+++ b/sys-fs/compsize/compsize-1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
 else
 	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-2"
diff --git a/sys-fs/compsize/metadata.xml b/sys-fs/compsize/metadata.xml
index 289d3a1d5b6a..792e09786b52 100644
--- a/sys-fs/compsize/metadata.xml
+++ b/sys-fs/compsize/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
 		<name>Theo Anderson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<name>Proxy Maintainers</name>
 		<email>proxy-maint@gentoo.org</email>
 	</maintainer>
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index b4f62721bbdc..f2051210f290 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,4 +2,4 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3d
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 EBUILD cryfs-0.10.2.ebuild 2294 BLAKE2B bf1b71916e0fd6d0d5f8e59355cba1c20e814addaa34fb174ebfc994388e341d6346ccfd33bde41a6e2eb66d88066a9aae499a29968489d5363642ae055be9a2 SHA512 955fdf3d60b08b225bd232d7e2a56dc0316c28b480f11d65971020928d291febe55745a8d5c78835d73e182cd8b10b32987abdd06f326091e5fd3adf0e67beb6
-MISC metadata.xml 491 BLAKE2B 481c7242ceac6e8d51121976478817f2acbd7c845992b1d4ead21dab39710a2b465acf3bcbb6a8207e90065875b3563517758df4845ae1e4fc3bf1c8c7f25103 SHA512 11d71adee10ca97cc8a8bba077a9459af2f51d328d53eb63748cafcfe43992d51bf129ea1043f823b299874f6bdf8ab390a714570a5516fbb60d094c9aac6e14
+MISC metadata.xml 521 BLAKE2B 970f5ce1a602a65ecc2d123edc08386312fcafce936b679d4de8963e3336f9fdbf314ac3d166635270efe9b226ec801fca202dadb887d155edaf9daa64da60d9 SHA512 0aeb067ca8dd47ec21a9e9f786443e4e75c384b0a648b94ed9d7b29b1ae8850af78933198e1f20dafc700416e8a9c954fb9c4544db7399823bb38376805d6775
diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml
index a4e7e74cd609..1bdfc250ad18 100644
--- a/sys-fs/cryfs/metadata.xml
+++ b/sys-fs/cryfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>nickaristocrates@gmail.com</email>
     <name>Nicholas Meyer</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ea50185e7863..b1854255c9a7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,4 +12,4 @@ EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
 EBUILD e2fsprogs-1.46.2.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-MISC metadata.xml 634 BLAKE2B 57204ec7bc4afb2ec4eac7c7b3ed2b417863bf36be9e7c32c50464d3406de8e0af92af03d9a6947e688bd6c7477029ae68358bdbf8f4a49c54ffe1a9905bfb81 SHA512 bd65352e175b8e2e5f11d175b91f369b509e8dfc83f84d3d80e23c2d5cbbb474b057821e7835cb1f3cefafc9af926c3fa5960bcdff1286ff3842b914615771df
+MISC metadata.xml 634 BLAKE2B c11dd95ebf99bba614e96cec545a7b37ec9503105d37ce33bde91601efcae5b535fbb5e73fb908e70e87156ba3c2808037926f52f88205a09f22d1a0f6e6b83c SHA512 7c06b2fdfb370ace38d2c765a37ae1351e8d5316ba5ddc640f625f0f24671a70bdade38cdd58678c2cdaacf05833b735517561426f6658d970874abfd8fb9391
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 05a9b85ad268..88556acfb193 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <use>
 	<flag name="cron">Install e2scrub_all cron script</flag>
-	<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
+	<flag name="fuse">Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
 	<flag name="lto">Build with link time optimization (LTO)</flag>
 </use>
 <upstream>
diff --git a/sys-fs/fatresize/Manifest b/sys-fs/fatresize/Manifest
index a0f5f2bdd6ad..4a45f3b3abee 100644
--- a/sys-fs/fatresize/Manifest
+++ b/sys-fs/fatresize/Manifest
@@ -1,6 +1,3 @@
-AUX fatresize-1.0.4-version.patch 203 BLAKE2B 1d9b66cadb04b4deb8798997db50b03abcebbe110c103817805eccd1a2c29331644b90b80aa7ae7091a75f2b7359437151ecfba26638c5f40386014f2a61b7ca SHA512 e1ee0ac7fc08be32c7b34cc8ea27da9baa9e6d5d38b10f2cd9be3614820cab4a8d787fd503ffd85cd65d8de065fa920f0dd5937b861eda48487e0759155957f6
-DIST fatresize-1.0.4.tar.gz 115159 BLAKE2B 16bdfc28bb58f9694adccc7d04dc7c26dc72ce0e859787f66c2aa9c560ce987f20374e9f5166b79ac9501878e06f072c9102ce2f4e3bc2afa694e2a13ecb8e07 SHA512 36b67f7d5e4ccb03b98fb8a788c40f430464a40765a9092deab3292ff736fcb07288c4b5b30143a18125f4b3de1225ce32b5643b344ec207ca332a87981fe18f
 DIST fatresize-1.1.0.tar.gz 137090 BLAKE2B bdfd8e257fa0b40a1bf8dad4c6b8c91958d605a3c25596153808bf14e1e1b703c1fc7c458ddd444cdd15795c7721496d1e649d9ebc16d4693ad420285511784c SHA512 e4de417fffcceab071571c878f93bb68c7a7fa4f3ab89e272f533940669ffeaa0cb36967dc8fd7cdeda935ef352bce735dd4dac579a2291d9c01447648e8d40f
-EBUILD fatresize-1.0.4.ebuild 506 BLAKE2B 8c490c0683d312c2a6d853917d5a8af344b87f290e1a5294083c8198ddddfff4f551d6bd9f9ad0e573470286b08c15168d345ae82a782e0b17b02ca03a937875 SHA512 75379d9284cbceb844e0a86158093d6075f91ae49aa7aebc780af660bd8bef7e9f725808090f2755c60f4910fa2f4c0a70b31aff2ce850b5a8bc36cfd6c744b8
 EBUILD fatresize-1.1.0.ebuild 407 BLAKE2B 6b13170460321cf69d0b5a7bb297854dfd4609f1abb00c9e0d4c8f7ef3342262263c63a8357bef9731c4f92f154316f818ed2d9e1526422b7d87fd160220f3e4 SHA512 cf23f8e4a91ac9ffa79a3ff86bf6c63dc7222767b863543306d6ef29ecb081936cc39dce5775600b5a934ef7a8da887ecd235f0bd8dcecd914885cee4b4a9220
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/fatresize/fatresize-1.0.4.ebuild b/sys-fs/fatresize/fatresize-1.0.4.ebuild
deleted file mode 100644
index 645b7e4e53a9..000000000000
--- a/sys-fs/fatresize/fatresize-1.0.4.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
-inherit autotools
-
-DESCRIPTION="Resize FAT partitions using libparted"
-HOMEPAGE="https://github.com/ya-mouse/fatresize"
-SRC_URI="https://github.com/ya-mouse/fatresize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	sys-block/parted
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-version.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/fatresize/files/fatresize-1.0.4-version.patch b/sys-fs/fatresize/files/fatresize-1.0.4-version.patch
deleted file mode 100644
index 88a42a9c1089..000000000000
--- a/sys-fs/fatresize/files/fatresize-1.0.4-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ(2.50)
--AC_INIT(fatresize, 1.0.3, [mouse@ya.ru])
-+AC_INIT(fatresize, 1.0.4, [mouse@ya.ru])
- 
- AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
diff --git a/sys-fs/fragview/Manifest b/sys-fs/fragview/Manifest
index 93c801fb2ba8..0a7bf42f90de 100644
--- a/sys-fs/fragview/Manifest
+++ b/sys-fs/fragview/Manifest
@@ -2,4 +2,4 @@ AUX fragview-0.1.1-fix-linking.patch 992 BLAKE2B 591efe5b13b37325f64092679df3450
 DIST fragview-0.1.1.tar.gz 20439 BLAKE2B 827275562fadcce5fc1dc210816ab5a2108863538dfb1892f677fb94e26ea348712f5c9534405d4d056435f1d5c38427eafce7de0af35839bc69da98dcedb9b5 SHA512 aa28f57e2ba5fbba48fd9d8d471ac8e90c056309b6f44cc1e320dbbaea2105c622a6803a04be23893b8e284cd53112f2d1fe73a97e7333937892b35742e5495f
 EBUILD fragview-0.1.1.ebuild 657 BLAKE2B 8c6c9ba2df76cf381611d76ce0cb1b385ac9cbd8ae8d9e08b5569969a625ab0ae422ac3f512eee6200ea16770a71f5f0d0f3bed5ddd775f7c96d4b66a596fe34 SHA512 6126408a46d0e83fa1b679f60047251b246312fc50066abd1985aef8a6e2aa06d0ebbaed4cbac2f9aa778f4be31b22373138429d808b172f6381443157a99ecc
 EBUILD fragview-9999.ebuild 607 BLAKE2B 5c1abfe036247b0d058ffade05b3eaa1b7e7f2eef316f4443e1cec9f4a70569ab06aeadea7d475e5ecd627a9b12957f888b4636c4677b0702ad1201ca9fa174e SHA512 986120f8792658b3fd8e8fd4b3f2d6beac46a4a100ea5e2f1922f6280a0c911caa12f55836c20d65faab7e0ca5baa30315b3d8cbe9746fe4148185655d803441
-MISC metadata.xml 445 BLAKE2B 38e3b55e4c9ab6b82fe84401a6ae5d4ad8b2e50c2584d7f2d5a2514fe2293d90fced3cebadc4d653ce09fa4aef9d9a0b05e47cec7c21ac8b4e65b10ac8f263c1 SHA512 e024732a873c95eb990eb27e512d631d424a4365b8220a26c44f00904710a31cddb9be3d53dc88628663bdb8b225a8f018fda6b526f91e5a37dbda30f56a1598
+MISC metadata.xml 475 BLAKE2B d12c3b12d1281a5e6eda2829e9c58115cac9bcde3f9318bacbe1ae83b8e73a2048a37705cc0b8f4c07f98ddcd1ff8d76e833119f6ee64f41bfdc99986c8fdea1 SHA512 4262361ef09e04f3a7a16775ebe0fe67c1e1c9bc24c76eee2b76e81df5f1a40f44e554244f667462d199a50cd368eee5ebf2fa8c5c1d340eee759fc3b9c48204
diff --git a/sys-fs/fragview/metadata.xml b/sys-fs/fragview/metadata.xml
index 500b2e4440b8..7e1c8cb08328 100644
--- a/sys-fs/fragview/metadata.xml
+++ b/sys-fs/fragview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 0d31bf099d5f..af8fc04c1dd5 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,7 +1,5 @@
-DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
-DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
 DIST loop-AES-v3.7s.tar.bz2 376972 BLAKE2B 0a4dcc6aeadfad5c33b01b48c53d6df55925be2cc0f85c2e96b61b15a60d42d7868fa9c32ad5ef3a13caa5e1ab4407792aad32cd60a57b094348b355cd688b22 SHA512 25f7d9218ae83c4c1fb5294bc405267c3a4e20954fbd7a45effb70ebef4014625b8cc93c7d69be220da4a04f4cd4b429763273cdb6cda497a6a31888d47ca1d1
-EBUILD loop-aes-3.7n-r1.ebuild 2033 BLAKE2B b57cf91c8c11a96ac0259e904950aa6c20f9f7244cf1114b598fa90fc7deda16c87348bb223147aa003372bfe03d9627b60bccc9a3e398b196a4666b5a398e6b SHA512 907140e56ed3fb76630e8389764b3e776cbe9429ebd81899e8d33452415c6c0183b84060716d9ee1f85658334d8ae1647c9c3912c7cf92c8b8902f1db9db7e0a
-EBUILD loop-aes-3.7q-r1.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+DIST loop-AES-v3.7t.tar.bz2 377808 BLAKE2B 77a6baa31be9efc84504e6eaccca87193180b26ec6f6dc824480453e78905f8763c08fd72a63c18950796ad0b70ad8be2ed26e107cded6dcaddd96433dfa7f56 SHA512 cb0dcbfa7639f8d2c1990465a44cbcd6d4bf065b1df9178f4dd524a8b8ddd05ebb860e6a9d9425b4a22b9c74342bf3ff232ff777be9b5458bdabe54f4097ecef
 EBUILD loop-aes-3.7s.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
-MISC metadata.xml 617 BLAKE2B 58d3b691b322ec4ae5772e391ff255fb0bfdba6202d24dec70baa5543657dc07c473992ceccc61beb35ad710e6014ab692eb8856463e8d001446bd45e8a2d60c SHA512 dba8f0278839b705911377ab463c7662f85f6f7be1528c1d96f5bb5bcb96566fdb73756d035879ddd746550fe048c5a0552b14436bbb9a69789cf5f1d4f8414d
+EBUILD loop-aes-3.7t.ebuild 1751 BLAKE2B 318ecaf349eb7ef78e506352c9a20c3ac5d77b7d8e95dbd14c5ea8e8d6000018fdc16ba10ad7806d51539167a5a42978465ca4693c8b9b0796139bee05aae57a SHA512 f0dbca7131097f5c9e58623991085a60bfaea2d6f70072da714485ede0f1b89b27dad78f322a8bd4e77d8b081ca95f347d7d8098a3c3735814f47aadf4aca94b
+MISC metadata.xml 647 BLAKE2B 094ed9e871db8ff411377c316bf61050829aa13866571ce0ef4c5d8def1b047512129f4552402de334a32c46cbf0c3f9fa90ab0b23738d2f164933bfd4b0f76e SHA512 ad0ae6623646daf47d849aba61971fd592f8620db001ec7f3668e0fbfb5b59d5e70c344af5045969aa1f8615cc0a2b10089e9e1b06f0ecd247ccc801a7a39929
diff --git a/sys-fs/loop-aes/loop-aes-3.7n-r1.ebuild b/sys-fs/loop-aes/loop-aes-3.7n-r1.ebuild
deleted file mode 100644
index 18a5ba1f82aa..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7n-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-RDEPEND="app-crypt/loop-aes-losetup"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-
-	ewarn
-	ewarn "Please consider using loop-aes-losetup package instead of"
-	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
-	ewarn "without patching util-linux package"
-	ewarn
-	ewarn "In future only loop-aes-losetup will be available in portage"
-	ewarn
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.7q-r1.ebuild b/sys-fs/loop-aes/loop-aes-3.7q-r1.ebuild
deleted file mode 100644
index 6879462d4158..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7q-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
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
-	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-
-	into /
-	dosbin build-initrd.sh
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.7t.ebuild b/sys-fs/loop-aes/loop-aes-3.7t.ebuild
new file mode 100644
index 000000000000..116820a36e69
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7t.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
+}
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 909b1d03e448..052624037d7e 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index d8417ae87f4a..5586cca76369 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -31,4 +31,4 @@ DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22
 DIST LVM2.2.03.11.tgz 2528527 BLAKE2B 4c02e630e033f9bfed44468b5b8dff4af52c943cb9d6385bfe568ba50463dfc97cd968d79c34eb2528d66930d6c2895de17fe546a34d80fd17a5892560bcb670 SHA512 50f21337e397fc5b4692bb08e5d48409b907b96b39168343bab2d40bb74fd84ff466e15f3d664305bc044f3f6be4369fa7378399d5a838793632e74706f17653
 EBUILD lvm2-2.02.187-r2.ebuild 10033 BLAKE2B e7a5fb4f7ba05f65f3136e9417e5a5dee962840c946977468fbd85dc40cb983086cb8be0acd7bb04ce13afa745252805c26603c4b33147776bd97bd4186cca49 SHA512 3b818a61f92ec92aa17e89d1cd78dfde543cc02dea717743c11c85f63da1e3e76fa1696a312014988c509cb99eb1686065e10cd78f36e4d8fa73f2474b7891b4
 EBUILD lvm2-2.03.11.ebuild 9487 BLAKE2B bf73d0d3a535485c35172217fefb2d0a3649bc53cec8d45e8efe170227c615993bca04f0b11d49d7f23243b9ab15a8309b92f245b2c3265313a04cbc15af75bd SHA512 42e8bd43676ccf4962f201f09fdbcf4edab82a1324c00326b07ed10aec95e872288dacc0b68346e01629bf936b3481aeeb1f7b257a9e5f96cb96fc11aeb15a1b
-MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9
+MISC metadata.xml 1034 BLAKE2B f0f14e228cefe806333830eec09a076c06985750b08669036f951e7aefb45b2482091f4da404ccce7e5180e7294adc2940311d360773a7ec72e16f96d9d82961 SHA512 ccdb84869eaa98af048d561791879796ea8a82cb2603241496ce050133402f66e0e5b7d6eab161bc9739451712e73370616698ff492377e54d8dd5582abfbc69
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 8fb1374ed335..4b91f87848b9 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -9,7 +9,7 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agk@redhat.com</email>
 		<name>Alasdair Kergon</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 6bfb5c258a79..3169600913e5 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -4,6 +4,6 @@ DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f15
 DIST mergerfs-2.32.4.tar.gz 314302 BLAKE2B 9435e1e9a7539c5fd732313e269551b12d5e23303e4ac77d783817f42c8004f2873f9e82bd69586c69ebce1e628da707534b04094ea0d7a1f626af6f3b8a444a SHA512 248b5e16c49f0775a5173b10940e45fa401ff81a44e2f081135f118a4deb9f79104d77e1c7424926da703123753a75e8f0590396e44c9ecd3bfdd1f27d7ced17
 EBUILD mergerfs-2.32.1.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.32.2.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
-EBUILD mergerfs-2.32.3.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
+EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.32.4.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
index 5d1e3ec0e4cf..1a8305d70486 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.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
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
 
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/metadata.xml b/sys-fs/metadata.xml
index 0760ba105602..78ffb8166dc9 100644
--- a/sys-fs/metadata.xml
+++ b/sys-fs/metadata.xml
@@ -29,4 +29,3 @@
 		systemami plików.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index ced00a42bd55..0a2b6698d20b 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,3 +1,3 @@
 DIST rar2fs-1.29.4.tar.gz 268299 BLAKE2B 771e3dfd4fcf69e34adcca3203069d3820e1ed79b1554967fdde51d4a894303646b027dd54b923f319b2a926535db8cf6f68f5edc0b09759df7dacd7aa988bc0 SHA512 7963e420170ec06caab9321443ae75320e1eb6c034cde53d862cb3203ad36fe20b762e389145a80f1b010825d3a51bdc1d7bdaa7fc52edec11ddd8cec8a0c902
 EBUILD rar2fs-1.29.4.ebuild 869 BLAKE2B e6e70a39b962f002b111f63449a8fc44910cd71468f12a742f7149a1d635b5d0eb3db124f3eacedb11f896749d31793f4dc3aa37a8cf25cf3362a950f48f6f44 SHA512 31c3521e8a06b1132d54ce84fde7f068609d1b9d2192d890b3cdfbc4eba5ab021416d651e2392a3100c161e0b6583444423732d5ea03ab6b3d61c876780c0317
-MISC metadata.xml 450 BLAKE2B 376df33314a93fca46449a3f491c4f6e31111a31fcbdd7be9cb6cd4207a45854ba70d7aeceaddc12c60b5b60d63080df5c4355aeeedff45c88605341f894d48f SHA512 c41759771363256abd1bfa7b1bab8dad7b2bdb721c74c7c2e279d94fda8fb68b98abf3f7a486ede01cf6ed6b7a4f9f048053438f414be5222ffad1542e5cf539
+MISC metadata.xml 480 BLAKE2B 0a4fd714e0565ebb0b2cc370ec0984dbfc3aa5e41dbc04b315addeed7b3711f5089f1caa7155d28a8c861da20fb6621510cb34f91af8699a2c7b7f5b2d3167a9 SHA512 048a399f7a4151a80621efe4ef3b1a76039d371db5be9127a7d1275a08a3abf9f103eb3e941cfc34a7b52476b0db6d161fbfbfa48fe45ed917432bf44261a5f4
diff --git a/sys-fs/rar2fs/metadata.xml b/sys-fs/rar2fs/metadata.xml
index f9faf2cdd051..e3b24930f3eb 100644
--- a/sys-fs/rar2fs/metadata.xml
+++ b/sys-fs/rar2fs/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">
+	<maintainer type="person" proxied="yes">
 		<email>fdegros@chromium.org</email>
 		<name>François Degros</name>
 	</maintainer>
 
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/shake/Manifest b/sys-fs/shake/Manifest
index 9e380662ed7d..afb7166322f6 100644
--- a/sys-fs/shake/Manifest
+++ b/sys-fs/shake/Manifest
@@ -1,4 +1,4 @@
 AUX shake-0.999-uclibc.patch 1180 BLAKE2B 158d92a4320e3db600f85b7fdcaef1b2c6a72693ee2c7925aa743773cbaeff9dfe5252aa03a481c7bba1e144368bdb122a99cf6937358d344e788480e5221439 SHA512 f37a4fbcc1ae932c0c8c9af090cb93481f3c6eb3de1994cc1585903e3ddaccf4c1c8a4e121b720119378fdd0f1d74235f197ba1a5c984aa416107bec6eb39a1e
 DIST shake-1.0.tar.gz 42885 BLAKE2B 999a4846a47a124c9f66f674e54ee1c89039b9598b7a3d0c5b5690abe5b90bcec5248e8f516f10681543bdba666ef4129172e4d05759b997016ca1071e33e4b0 SHA512 f73601ebf37ac934b2cfb5bcedd530e38bd6873615e80eae01c690bf935ed3924abb1d06fb31c46397b5804d47a36584ac5e11b4c7142b46e570ddbf3abe1775
 EBUILD shake-1.0.ebuild 498 BLAKE2B 2280b17b8d5694a072da97089757a61175a5db8a649b7522ae3c18e09ebb612a276b1e4e13e037bd90c45a9da89ceedc7dd11b2fe8f0c2d6ee766185a3d554a7 SHA512 50672a07c46e8e93a20e310c18f0a2ec07492811d5d2153d0f75c59a12f5c54c8d74c73cde7862f40e6ad89da96d0107d91976aadb32390b174afb1f057c3c78
-MISC metadata.xml 452 BLAKE2B 1a0a9c4e8df41600c72136c4df4182658d1aa1852ebca1c5d0ea3dc8d3ea81a533c8bfa4931955a565d084dbe3a70a8173f0a2995ad95f9ed47c2786f1de1186 SHA512 95fab203ab540b445036639bcc24ae4f7d18cd51a4f1a693c14a69ba5c1b561c77ab1e0585f2baf389a3f660c19a8a06f6b0cd5d748a52fc72fd842df99b2a3e
+MISC metadata.xml 452 BLAKE2B 35cc4a78292a66fef6fde49da121aab0efa3a3c308e087975ce1bc8641f21360511e2e386dedc39c4a9169dcbdd2e3a0f29f83df1d8cee9f7e069111c4a1e29b SHA512 4e9083d16f085b53df31a7c1f1aebbc24463ba40d41c38ed847055026aebcf947856ad50003a9995dd0ba81f080aa28f46b62220c736dd31f41d91da5d0ac272
diff --git a/sys-fs/shake/metadata.xml b/sys-fs/shake/metadata.xml
index 7e9e9a1984aa..546bc5d869c2 100644
--- a/sys-fs/shake/metadata.xml
+++ b/sys-fs/shake/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index c6344d977a70..cd277f9ad8ed 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,3 +1,3 @@
 DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7
 EBUILD simple-mtpfs-0.4.0.ebuild 613 BLAKE2B dcf466380e68d1fbaf22d9f0b402771511b2aaad81a34018675e2476e2d7c6029e6893e3289bb41cb26cf392a13b8a0de6e7f49ba1e3eff4c81393a3db011fb8 SHA512 3c30b37fdd28a0e35cea137c926cb90892ba800835678a36bb0cb59e4dbdb197c9978618201596a081e608bfe00a2ef8c41502233d4b55f34555abe759edac8b
-MISC metadata.xml 1002 BLAKE2B 146c014fef44cbca70892efa76c12f36a5f890742fcfc91801c995b9e7a78d4693a34fe7f1e1b708d2bc2d45e60ed7749904c10465de4d680e25456344644f9a SHA512 d5e83c61493b981f1871bc964e395877ac4adc6f75cca770140d364a9c1365f221dfe97f7e110338abea49afbc9313a5ca088dcb7899a18dc98386cb46c28430
+MISC metadata.xml 1032 BLAKE2B d968f2c981685a03edbfe9af2a07c74d2c0d0f99d4ace185bead7f63ff9787105230341a8a62d7a0b49e3ad92c139f3da7a8fd171be439e0814ae4f311cb9ef9 SHA512 131501924393f6d7532f9b99cede8f39787438cb753d31ec5eaf0e76cf4668a2ff6cb423f58f9cab21513b61011bccc6e310a2aa33b5e8f235bf7f236a29a3d9
diff --git a/sys-fs/simple-mtpfs/metadata.xml b/sys-fs/simple-mtpfs/metadata.xml
index 775fec66c3ba..642b01c38187 100644
--- a/sys-fs/simple-mtpfs/metadata.xml
+++ b/sys-fs/simple-mtpfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest
index ea881135a457..6ac9097cc188 100644
--- a/sys-fs/snapraid/Manifest
+++ b/sys-fs/snapraid/Manifest
@@ -2,4 +2,4 @@ DIST snapraid-11.4.tar.gz 742589 BLAKE2B 21c0976b6fcf792653fb0d2f223cd9b728e8850
 DIST snapraid-11.5.tar.gz 742480 BLAKE2B b0e66faccdacc0404b52f38061bc45b198cac5ce2fd2c465b8730a6e98f3e50569be70f5374f33a24cd2578b5c5e6f5db1070bbcd0e5ab269424ea52595aac9d SHA512 c0c8b6ebf6c1f057de618504d8f030158cbaf5135097f6c4fa320697eef9be447341e5c26fcab861c40c9995bcc4429dbb4d1fcdfd00090e6dfc7a1f6b501f7c
 EBUILD snapraid-11.4.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
 EBUILD snapraid-11.5.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
-MISC metadata.xml 502 BLAKE2B df99ef331bfd0b3180fb3ab31d46fd0a2673deeca91bdbdca8033c5a2b8c2931d489dca5fccb2103df1bc10ac7217f976808f43841cffbb756c1f757a6f99199 SHA512 f3cc7f7f8bcf1b7dc813a8cbf18c562771437628fecce4824aac5abc849741ec81dcbcaac2a1a5e44b3410741213167894b882697701fd66857985c900372851
+MISC metadata.xml 502 BLAKE2B fb2145464200d3a1571d6bfaa3ac6fb4e042f03e64d66ff913c50d35197c505a1ef149800f00df128fa5785b9109c833837fcb580a98262b20f56999f8365712 SHA512 2607e629a543ba60042e6d858a4bcce9d530e96e0a7202eafd0a812a4e260f58edb6b3e0fe525124f1da57b8640cef71ba1ea732dcd83a06731f53cfdcc3fad8
diff --git a/sys-fs/snapraid/metadata.xml b/sys-fs/snapraid/metadata.xml
index d15eab15b5ea..df1b476f9381 100644
--- a/sys-fs/snapraid/metadata.xml
+++ b/sys-fs/snapraid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest
index 09363e3a81d6..6db743361bc3 100644
--- a/sys-fs/tmsu/Manifest
+++ b/sys-fs/tmsu/Manifest
@@ -3,4 +3,4 @@ DIST tmsu-0.7.4.tar.gz 98631 BLAKE2B 4af013de08f43b6ee337259b394aafce0862d3f0811
 DIST tmsu-0.7.5.tar.gz 98766 BLAKE2B 45208c070a92ad2f5791e27437f86702b7ab95bd0d9a0e77a0daad0f3c416bf881e989fc73d064ef3d302d640d7c6f43b7afae475f31f45bcc7f051aa5805429 SHA512 6f89eb156d2be86650ab84847ca0ddea985cdddf35db5f5843632b6a54f88681584b6864e4a14bc36cf1949713e098067e6f8dda0242f27b6061720165f71be1
 EBUILD tmsu-0.7.4.ebuild 848 BLAKE2B 73ea7a0136d29c6c0e24cd576b96888b02ab8af284c7b2fb928d7af5188ed164211fd78236b5e21d223c19a0ccf65797d74c407f1d8c46b6c6fcd3a1181221ea SHA512 d70901fe4999ef13483af4ea2996c463c0a96acb522079748d13b04d613c1d902da271159d565b0971d1a649fc5e115070b81f0a57987ee3e0a1de846b37ad01
 EBUILD tmsu-0.7.5.ebuild 1311 BLAKE2B 7f194e69d004dfadb3e8f03adcf271fa70bfe6f6dccf4998273d4bdc0f336ef425251c5a454c5a914389b30d956299f87b31acd65d83a1fa4efd8c4f3cf7ce6a SHA512 d5c25be8c76acdbbe86be7570efda4cc439581f39009f7d8ec532f9e79fc2070262497416a256a6cc73f25d2c63e07b159fd6b9df2918020600e0d2648b97695
-MISC metadata.xml 689 BLAKE2B 6cbf6167ef4b57c783e261ddd28d80c3a0fe530b7c8e81e4629c34ab8990b3facc149e6a1498bfdf0558874cbc9ab567ca525abe33e8bf3b398248af98364872 SHA512 a360fbb29b7789f3fe5d43f6e25705d2ee5274903bd58b2dccb6d35bf81aec37af7c397e97a6613a846b68540562fd4143636ba0fef1408a9b0b37d98dcb57c4
+MISC metadata.xml 719 BLAKE2B f2b06b04676c7158916cf2f93a751d90c1f02c6257d7e464b1322cad4df78a2e08c375255225e550911a7d61096e7ee7709efbade3cd04f055af369973364c03 SHA512 6904d4f3499d4b85656b9c77eaf77ce623343baaf49de92c08241631af4f7aa6029a87c81d6378d679437f2051efc309e74c61f7a6eadb55640f21e19784d1fb
diff --git a/sys-fs/tmsu/metadata.xml b/sys-fs/tmsu/metadata.xml
index 2b3f5afc5065..4a005a7f6a36 100644
--- a/sys-fs/tmsu/metadata.xml
+++ b/sys-fs/tmsu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 6b7cef6a1b2e..311155487393 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -4,4 +4,4 @@ DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104ae
 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
 EBUILD udftools-2.2.ebuild 583 BLAKE2B 6d95826857e7e9de06d16b68a292d669a67f21a88c1959d1bae1d4cfa638fcb054e62860de019ac4b1bef918e29a659e68eb627574fee21aff62f2f2381a16ac SHA512 9eaac92d924ad075005141c321d1928a15c74970510435dc8f72c52722fcfa8a04ba26e8ec4478f98620f3ce71edb1e8efda1f97e72b38371113bd05cf64fccc
 EBUILD udftools-2.3.ebuild 588 BLAKE2B af0becf95d4bde20e2f5c713d4cd20e9a48f96de6a2938f6cee418095e9825b057fd92014cdaf30edb5d25308686c9dafb2a09297981fff62e20d6dac21484f0 SHA512 d07cb80c835f1d163654db9445f3b393432221ad0471e2c07eb4e7afc13749fd51d8a035e3bf922f215539e4791370d5e54bec74ee98941df168ac34e33bb5ce
-MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
+MISC metadata.xml 389 BLAKE2B eb4e50503c55d5ce92fdf396990d26db09c1d0939e6eef53fae3aeb41d1ee7c6a380375b276512d98e4f4bcb0072951bb2fdfbfc754a14473053f3c757a7de7d SHA512 5768e952497a158ffe84652016d7026f0cb9a2336d177e42e6f1a984ab38d3a1ae17498af6d11c210ca50a06b7a6cd1270a0bb4dfa82d5802512513be8d470a6
diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
index 67407dddd9c6..c12925849824 100644
--- a/sys-fs/udftools/metadata.xml
+++ b/sys-fs/udftools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index adec307a58d9..48ae0a54d1c3 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,7 +1,7 @@
 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
-DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
-EBUILD xfsprogs-5.10.0-r1.ebuild 2222 BLAKE2B 59967b933984faf7f6c136d5779932a1f33bd323e386779370bd8a870e80b19f2b5eee5506775e4483ed337ebc77d81078156694502ccb5529d2e9f015585125 SHA512 12abeebfe0b4a1f45b4b28299edffef33b04d83e1dcb275eab1a3bbd3c16eee1956930ace1fb490e5d3b8447c6e325ef654b385f059db1b902cd7181e40f82fa
-EBUILD xfsprogs-5.4.0-r1.ebuild 2848 BLAKE2B eb3bde0412e145bf9b247d41271f2cd1317de1085173a3fa76d02cba4884124d9de76505af4983d60b016e78b33a7000fae73082fa9576814517b12e4325bda2 SHA512 9348ffcf0249b7089c100e6e8c164fd35f967c6a9bcb4242321708c3e1d017c2597a9e3c88879fffdfbb62bab7d67b6eae56a83a5cd51e4fe90fa576f56c35fc
+DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
+EBUILD xfsprogs-5.10.0-r1.ebuild 2203 BLAKE2B a86d710a998e5731cdc93d48b96ccfc35cc5dd10810d14983d3f64d5e12d4f6c72775d180b981b2d902ef2e20c0e942146a01979f7f35c90336587fe8365eb95 SHA512 64fe3f8d7418ee31e6129fa4d4b0bbdf779b6ff4237d7232612a22e2b513ed968ef2ce3daf47013c48233e8e8d7488b43eb55062d5e2bd32ea65099972690a15
+EBUILD xfsprogs-5.11.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
index 8ef46ee1bf89..2e7069b810eb 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=sys-apps/util-linux-2.17.2
 	dev-libs/inih
 	icu? ( dev-libs/icu:= )
 	libedit? ( dev-libs/libedit )
-	!<sys-fs/xfsdump-3"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	nls? ( sys-devel/gettext )
diff --git a/sys-fs/xfsprogs/xfsprogs-5.11.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.11.0.ebuild
new file mode 100644
index 000000000000..030c8acbec7d
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.11.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu libedit nls"
+
+RDEPEND=">=sys-apps/util-linux-2.17.2
+	dev-libs/inih
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
deleted file mode 100644
index a17560e6bb88..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs systemd usr-ldscript
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="icu libedit nls readline"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	icu? ( dev-libs/icu:=[static-libs(+)] )
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	unset PLATFORM # if set in user env, this breaks configure
-
-	# Avoid automagic on libdevmapper, #709694
-	export ac_cv_search_dm_task_create=no
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-	)
-
-	if is-flagq -fno-lto ; then
-		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
-		myconf+=( --disable-lto )
-	else
-		if is-flagq -flto ; then
-			einfo "LTO forced via {C,CXX,F,FC}FLAGS"
-			myconf+=( --enable-lto )
-		elif use amd64 || use x86  ; then
-			# match upstream default
-			myconf+=( --enable-lto )
-		else
-			# LTO can cause problems on some architectures, bug 655638
-			myconf+=( --disable-lto )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	emake DIST_ROOT="${ED}" install-dev
-
-	gen_usr_ldscript -a handle
-}
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index e7e54fff0382..a43ea8178be1 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
 DIST xwmfs-0.86.tar.gz 195544 BLAKE2B 7dc5eb4d7acd585be70c43142b1a093aefecd69d8c51f6dee1741e88ab0c592d195678df107c28426d4eab18ae3d33b292cb0b8ab9c5ab557e1c81d3e557c492 SHA512 2f053c8e7322af39f46c85c46c11c5d215b7797d0ccb8340ba143371f3a5b171cac324936a0559fc3bd1cad0aed31c02576ad71b269052e3d01fb7b896bd1a81
 EBUILD xwmfs-0.86.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
-MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
+MISC metadata.xml 1423 BLAKE2B d3ec03ae8d330d0687a312e7eae7a122bdbe258e972590e19b7e73e3d5bee752ca41865944f129ee01a4464c44eadf12718bdbfde25dca185d1734c54b4d5c6a SHA512 9d82209a72e6e8983c92986d51b9b4e0a03dd78b5d535ce9e70887f1d83d7fc2354dad1e6ec0c56c9c15dbd38ad40e1b70ecc87083306ec7da956b134e5761dd
diff --git a/sys-fs/xwmfs/metadata.xml b/sys-fs/xwmfs/metadata.xml
index 8b58b472e953..2b1045b44f72 100644
--- a/sys-fs/xwmfs/metadata.xml
+++ b/sys-fs/xwmfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>matthias.gerstner@nefkom.net</email>
     <name>Matthias Gerstner</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c8934acff985..bbc263f69a8d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/bliss-initramfs/Manifest b/sys-kernel/bliss-initramfs/Manifest
index 06f301973d53..c2b47d588a09 100644
--- a/sys-kernel/bliss-initramfs/Manifest
+++ b/sys-kernel/bliss-initramfs/Manifest
@@ -2,4 +2,4 @@ DIST bliss-initramfs-8.1.0.tar.gz 34464 BLAKE2B 5cc4c547fa9fadc91b21f9e752242dd1
 DIST bliss-initramfs-9.3.0.tar.gz 28318 BLAKE2B c96a23030fc5e3ae168dbc6a4bd127eb9d6f19c0121a02351422062911274e16fe5911946942d7ef60b5eb692e679616901ac842f2af133631be894c9be36c1c SHA512 051652da42356ef601453088cc2af2c08dea5101dc922dbab966aec939717441ab31a3f6cc65599eabcd2628d156c5e22675703e48f862ed168f093f115c8dd0
 EBUILD bliss-initramfs-8.1.0-r1.ebuild 1940 BLAKE2B c72ddcf3b10c85a89ebfd95f75fda49c10d21042524ae102427579272e89e5db101229bae1777741a81534aff7d7d69afebfc79e0e33e98020858161d36dd449 SHA512 0bdb823fed04b20d3bb8c2e254a1ef9786e8f2849d08f3d810647dbdf16fa4ce089f1517c2bd1e5ead5b26f4350ce83e9a2edb4b6086dffc9509313efc61eec9
 EBUILD bliss-initramfs-9.3.0.ebuild 2068 BLAKE2B 106d8f9e857e7fb8ccf0e5715baa4181411a378d1c173597200e89b05eeea99265b410c75244acb61f4953fcbc34397e198381adae9783208c1e92921fae9102 SHA512 9f8fe42611e6e52b121a050181c6fd1c92f43191948bd7f5e59da289d3d1b7b26d6906ebe8f53cb234cb3e8d399786bd78fdfa540155d7a6cf7e141f5fc74bb8
-MISC metadata.xml 272 BLAKE2B 3789254de2afd41b115d2fa7c8ab479652372f0f47ee0058467f8e6cc023c622f7aa0839549e0419519a3ae84f832ed1e02e8dcb1303a29984bb4d623329c8bf SHA512 4f58f0628845a7029697b735ce0995ed5d64f2ebcd69870f78123280f8f725812b48f8b6c12a94f87f80b0ac88338fa1cfab0c364e4e6d4ca5c5159904b95ad4
+MISC metadata.xml 272 BLAKE2B 894a453b8c4ee102512b4c10c68ba5d4407b2aa9635c64d1a36294fb25d540b385bd72d5b95492d8b0fe0a6264f88f0259c214b861720d7279e2f778daeaa27a SHA512 7bba9717d8dfb8b61ccbf4a5fb801f5cf696847efa4b5057615e97fef64537de9897894ee04c69d6374ce353615c406d89434b87c86689ec532e02f6c0c45c02
diff --git a/sys-kernel/bliss-initramfs/metadata.xml b/sys-kernel/bliss-initramfs/metadata.xml
index 7cb74c4691c2..09d9f1f354e8 100644
--- a/sys-kernel/bliss-initramfs/metadata.xml
+++ b/sys-kernel/bliss-initramfs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <!--maintainer-needed-->
diff --git a/sys-kernel/bliss-kernel-bin/Manifest b/sys-kernel/bliss-kernel-bin/Manifest
index f5ecd38bb3a4..8875e6a421c0 100644
--- a/sys-kernel/bliss-kernel-bin/Manifest
+++ b/sys-kernel/bliss-kernel-bin/Manifest
@@ -2,4 +2,4 @@ DIST kernel-4.14.178-FC.01.tar.xz 96524864 BLAKE2B 21b526fc49ced62e1268e497ea0eb
 DIST kernel-5.4.51-FB.01.tar.xz 117299856 BLAKE2B 3677a667ba72d0d57db9643deb2325bf539ed56aaf903842973fd063982aa5e9ea4030892988f7efac5848d5f29f00053ceceaa305cec47e64112d59310a3186 SHA512 baeb2d0d46d69c1690d1a295ea41f00067fa28a80053fbe5fc8f52863fb16ac4becbb3199fb8568fdfbf9bc01c4925cd8fea7f4436f73f4028378ab1c3af2774
 EBUILD bliss-kernel-bin-4.14.178.ebuild 785 BLAKE2B 03b1c6ed6ce9aa588f8ac38935016b17de22d956d856b7fe8d7ae0d0ba6cd5fd8b761203b7d54674b6eb6b3b33f01646c2b92f75238496864d4fa0da4edeeffa SHA512 36977c444fa941709fd5054f3a76f0c17433852f574699d1b323e3be5f81653a47729ff9768012f193054a3362db32c15f9fb4211821f8c17dc454c03927f5b5
 EBUILD bliss-kernel-bin-5.4.51.ebuild 785 BLAKE2B 918ee89dc0136406f43d73ac21a2dab72d80bc52778993c0664690af08815fc41a3511fe47c169d516f95bca528de08d84bc149f35a6f020674bdf889fec51d4 SHA512 c9b822c19e32d2a814dc74144f5c3c404d361f08a3be118c5a7778e4c2bf004b025a6c449d3a7ba9d947bc855d3243c790f086bbe7d7cffbc24dd82dd7f4b6bd
-MISC metadata.xml 266 BLAKE2B 55c913c114e0c8e172ce57477263b0bf1ef844d10e5796e01418c50557abd651cd1770fbe850903f4b557e45e323315e4890f42ebc2ffab2b3e1187787b3c2c0 SHA512 1a2dc46dac3a8fd25d56eefbefeb0c9186bb6a9d7f78c863530117a86bd00fee6701213b47e0e4d4ee75caf399b2f894e5f9ed396212be2cf6471c0f3bf8f147
+MISC metadata.xml 266 BLAKE2B dda66d01e64ee82e1fab929036c56301ebb0d04362951d114ec79141eefc065a70181f5b1106de9b1af00dddfdabec79db049ff56cec55c31a133881dbb7373d SHA512 1b2f92cb5799caa15e63c618caf9664afc10540a120ffeb0e7e29cc09f09c8b2e5494e895eeab86353313e22fef1bdf85bcd6f75e0e77a57c1a3acdadb566234
diff --git a/sys-kernel/bliss-kernel-bin/metadata.xml b/sys-kernel/bliss-kernel-bin/metadata.xml
index 5c3f9d281df0..6ee797fd125e 100644
--- a/sys-kernel/bliss-kernel-bin/metadata.xml
+++ b/sys-kernel/bliss-kernel-bin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
     <!--maintainer-needed-->
     <use>
-        <flag name='initramfs'>Build initramfs along with the kernel.</flag>
+        <flag name="initramfs">Build initramfs along with the kernel.</flag>
     </use>
 </pkgmetadata>
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest
index cb1a904f02c5..2e5dd82a39fb 100644
--- a/sys-kernel/dracut-crypt-ssh/Manifest
+++ b/sys-kernel/dracut-crypt-ssh/Manifest
@@ -1,3 +1,3 @@
 DIST dracut-crypt-ssh-1.0.7.tar.gz 19561 BLAKE2B b778d03d792c5ebe0466de7474a6cc821445fe0cd3b216f395d3ea28a17cb4ed3aa6da4b7d6dee86e4481e2ac98d677e3410cd6581c4d8c01ab0ec9564504bf3 SHA512 2958a59c3ff615e89b7631224e248e7e931dd91c566e792b10dffe09b8bd2dfcf2c55eef4e974988f19320e0d732d3dfb14b61713445e1ff3a4a9868dfc4e966
 EBUILD dracut-crypt-ssh-1.0.7.ebuild 609 BLAKE2B 75e87317ff358fb7f69bb32bab96008e528388c3635a00fa4af401cb595fd0973d671ca59714fa0c24773c926e23b83f57835fb5b3f10d71f4a45b0f352e07f0 SHA512 94a3163e6b42b23045cdac2c131774dc2a0a1c670305add57a5f968a183e66fb623c39054155ebc2b9faadcdd17cc711ececa0c8594fa96cc5921c6383cca49b
-MISC metadata.xml 561 BLAKE2B 8993f242867c2bec744f989cf5000a5ef498e8abbb819972a8fd68562e22f491ab839613df49680e460a26d4fed3489b308b561556f6e0567f3f675da0c0f896 SHA512 ff8e4a72fcd40c9d34050ed21ee99e1cd17713e05f258d1aa9372c26d69803dfd6c30d994aa3c579dc1c7fa19450e7a77285874826da0f529263141502408fba
+MISC metadata.xml 591 BLAKE2B 0692ea96c881cef32452bd06d736c2579e2d1fec131a2b1a6a5981c6d52ca170b7146d1ac4fd947bb3bc425559724fd53f6039d177594e3c3b931355dd3cf661 SHA512 53f13afc2475a2ea9eff68b4c749bb4b15b88f2c97edda41ec2d12aeb720099171fa080ed4b4d20cc058d9ff8b1a9c034e771b9c6d623c46c8a5c5414cb54743
diff --git a/sys-kernel/dracut-crypt-ssh/metadata.xml b/sys-kernel/dracut-crypt-ssh/metadata.xml
index b5a52fe7a222..2a09bd74446f 100644
--- a/sys-kernel/dracut-crypt-ssh/metadata.xml
+++ b/sys-kernel/dracut-crypt-ssh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 98e6b420e482..fc76dbc42c5d 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,4 +16,4 @@ EBUILD dracut-050-r2.ebuild 5301 BLAKE2B a8a38a589a56786b5349d84157e21f1c3ad44f6
 EBUILD dracut-051-r1.ebuild 4759 BLAKE2B 55b4d986321be6bfd607dca41d72b865598e325703d85c32451a754e372ec4077b1bbe9962e0abfad21fbbb9d67679d3bc5c1df8228c025d2c9ac1f16f6afb25 SHA512 83b32490fd6812f02bdbd1ab86cea43a827f2eeea0c17316ca256ba185932301e5060981ea7bdaabddef3f15c466232257bce4cdd33cc047dd15901c547afdec
 EBUILD dracut-053.ebuild 4600 BLAKE2B 64e31d10c2c05b1d072b050ba4e7d0202147a1c6bbe04cde0dbb1e40a6cc56a52a1bb2912a2345eef7af8e8dcd5e02a6fb47f1e3f882cd69b8b37f767a5f7663 SHA512 e844f746001acd4303d6f4e85554a6027f4cb3a7bbcd86cbb03053403dde40519dc40347ffbc5de6ce7a199aae826071d744c721977c05dcbfd9581ac1f983f4
 EBUILD dracut-9999.ebuild 4710 BLAKE2B 7ff2a46054af9dbd440c74b91579fe6839f18791d3d40703e441f6f12af0beac89be4bd71682ebbfff80a6722010ba89f4676b1bf317963a037d73fb58e3d375 SHA512 0643638dc799298fbfb295bcc60a48e67853bc3a192e37055654136632b47b873ef8b0559cd9d0246150ebf350d55c3c867012644aaa8267235b981562169a5d
-MISC metadata.xml 464 BLAKE2B 4d72b4c7b89341be061e590d7e5814268d9dc864e025c50d683d23c5e08e5281726e62a268271dfa67f9fb28d6f7fbd108dfcccebbb82da3c142b62fac2042b6 SHA512 7f1778968983e231b4fb6a9bbafacf19f9ae66b98c44a4df2d032978ad9e630108868fd270659f9770d0bcc1c285da83f6d2e865ac4e3e354881f1763fdfcdaf
+MISC metadata.xml 478 BLAKE2B 28130c92964b57a250220a1f5792459c8c35f5308a9f6713f60cb0492175fb6f296a77535dcb59db47db5cc3e8c3a56e7828e28d3519610a119bac500b844f4f SHA512 75bd848d2f69e892d6d4623fb00d36ac5572f19ce89db246f668c3f15581c1bd74987988c46c6dc656bd1d75342d98a47b7af57e0f646c39572ccb1b398f6090
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index 39e56c08ac47..d8b0651a40c0 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -5,7 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f6963a3390e6..8aec394ba4d8 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -7,7 +7,7 @@ DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
-DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
+DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0
 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
 DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
@@ -17,11 +17,12 @@ DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da3
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
+DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e
+DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
 DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
@@ -50,7 +51,7 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
-DIST strace-5.10.tar.xz 1859688 BLAKE2B 45c40854c9af95395cb274fbfddc3d0084e77cc403ffe104f72ce7592800452776f5c19d03649cdd6705bccc7a0859364e470bdd5344f64af54b798fab50475e SHA512 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48
+DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
@@ -60,7 +61,7 @@ DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
-DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
+DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
@@ -70,5 +71,5 @@ DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd
 EBUILD genkernel-3.5.3.3.ebuild 4937 BLAKE2B 1aac344f671f5493855359059d3adfcaba9abe11018056fc8c226ffd69c69aa134fd9352e79adbfe5c3f756d0cfcc811c43974b4ca677c1a17db1dfb98f7f76e SHA512 5b797b3ab3fd7098c8a26e0275b956f85d2d6600ad4f02e0400cee7506846b425afd23ef8b98946999dd715b73d4df4d6196dd574b9563fcb38e03a675de9349
 EBUILD genkernel-4.0.10.ebuild 9571 BLAKE2B 73bb680ae2c85bd01cdf302406ec819258a06671283305f7a8d093c920c1540fceeec0ee386932c8cf04d37ff711d92c1bd8b94e879bfadca84d754d0d078f32 SHA512 5c3ba3e9eace4714c2ebec33193c7cf968876633daca708e1eddb6e94eca689aaae8242a3fcb68c78607cbd17d728a977e6dcac4287809c631eec6dd7ca932a7
 EBUILD genkernel-4.1.2-r3.ebuild 11100 BLAKE2B a15d63829f12d542d269a53a10bb1f6ce91c2345b00711cb04fc1dc6a9a531dbaaf18ccc5d5435c3faddcf5cc8f337ece306a431369990bd6a5ea132d2776456 SHA512 463129c98eac8f9e208c055a8cfdc4617fae3d4f08bbb1ba580b5e457c5896deb5fcc03f478c38b0621885b2e2f7fdba59027ed3e4f4f4f970c457ab3d41e065
-EBUILD genkernel-9999.ebuild 11055 BLAKE2B 25cfd074cd5794a9a266e9f91348f8dc73c1445a2c220a9c7ded45e563239fb04f0f03b77c339eacabfb4f3bcbc353bd38b4c7937504368cc5c3ce01ef987e38 SHA512 2082769941af674b40411bf1f5c51d45b854b8e1de0f11384f11d962fa63e6c6afabcf523fafbcffa35a055a0b1e004f72cfbcd8635fde2bb82c7ca076f7bce5
-MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
+EBUILD genkernel-9999.ebuild 11053 BLAKE2B d183f454d05930f22a086d48912c3075279e62acc02f2c9473471d45af26ff53abf97798f769b447f74a56e3de5464f7916288766b28bd9fe91a1d2caa3ee791 SHA512 f114daea41494dece4d7cee11e16e6d4fa5452b0865e94048ad4843afbb93e59c673713e56e5be16a6b8d0a70af2bee6b15f756d066348a0292292df5bbaa309
+MISC metadata.xml 637 BLAKE2B c2ab07375e789025a16008cad8253de5cdc09626b5f0b107e0f5187f9306c526816d4ba63e3737724855db3459190710434cb0984f2603b73619458ff65196fc SHA512 d2fadbfefd976cc9ae5c0fc66e184f050a1a8f208f777d8a51687a5a6bc171a46b010dfe055d69d41020ff1fea10b9ca54bd2d3e0414dfb8d0caa6317a05f66b
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 90eed2bb94e8..63ca226a8e6f 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -12,15 +12,15 @@ inherit bash-completion-r1
 # or add new patches!
 VERSION_BCACHE_TOOLS="1.0.8_p20141204"
 VERSION_BOOST="1.75.0"
-VERSION_BTRFS_PROGS="5.10.1"
+VERSION_BTRFS_PROGS="5.11"
 VERSION_BUSYBOX="1.33.0"
 VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.4"
+VERSION_CRYPTSETUP="2.3.5"
 VERSION_DMRAID="1.0.0.rc16-3"
 VERSION_DROPBEAR="2020.81"
 VERSION_EUDEV="3.2.10"
 VERSION_EXPAT="2.2.10"
-VERSION_E2FSPROGS="1.46.0"
+VERSION_E2FSPROGS="1.46.2"
 VERSION_FUSE="2.9.9"
 VERSION_GPG="1.4.23"
 VERSION_HWIDS="20201207"
@@ -34,11 +34,11 @@ VERSION_LVM="2.02.187"
 VERSION_LZO="2.10"
 VERSION_MDADM="4.1"
 VERSION_POPT="1.18"
-VERSION_STRACE="5.10"
+VERSION_STRACE="5.11"
 VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
 VERSION_UNIONFS_FUSE="2.0"
 VERSION_UTIL_LINUX="2.36.2"
-VERSION_XFSPROGS="5.10.0"
+VERSION_XFSPROGS="5.11.0"
 VERSION_XZ="5.2.5"
 VERSION_ZLIB="1.2.11"
 VERSION_ZSTD="1.4.9"
diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
index fca8c03fc36d..f0f17e763182 100644
--- a/sys-kernel/genkernel/metadata.xml
+++ b/sys-kernel/genkernel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e708ee4ade69..a0883fb8111d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-25.base.tar.xz 765788 BLAKE2B c86796b881ee8d4d471372dc405c4
 DIST genpatches-5.10-25.extras.tar.xz 1772 BLAKE2B deaff4896b8ce8ea5387ea49cde3e0e1aac77f16a1f8fbc673ec3a71a3c46fccf34d65177f00023345355f09adb3bfe33d52aa046686267efb924ea1fde757c1 SHA512 cba0da17f51de2b58c2f369f4eaec3f1f05c88c7e49a12deb392a0542a02337549eb7eb960d09873d1f7fdd1c7b07be7d2fb592d64272d3fb6957ec6e0974658
 DIST genpatches-5.10-26.base.tar.xz 780252 BLAKE2B d3da07e58183e25210b0a14dc5cdb4eaaa4e0ad6e6955f9e99ff06b6575af24d2710a63781fb7fb3c9f0b142c6198c0853c71ab63f3ea1ff07c4eb405fad4cb3 SHA512 c5d73387e6caa2140f1e5c48763132797d98abae0e64911f0bf1bece03440462ccc793a2ed4ae5916235b570aace12e9ba7b625cdaf71a9802956f0ad2836c1e
 DIST genpatches-5.10-26.extras.tar.xz 1772 BLAKE2B d6e02010a72510e5c18b80102f2383002acf45b645c34d35b31234d6da9ad7b38ed70837bfbb3563c9c3871121ec4638bdebeaaaf225b3f3c6d50dd30ba30547 SHA512 8e1c534b5160553f0fafe542953a3f229082cf541f744038831c2aba1cc061a8ba14713155cb98245ca99e62514619ab6969bd8f61c3886d65c65b67e410ff0a
+DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
+DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
 DIST genpatches-5.11-4.base.tar.xz 247120 BLAKE2B 64e8bb77aa399a797a9dd9726ba51a00ec43d850504680c52b9fe3ebc1277e1e2216a43719bd79b12e3267171f1031feab5adffc35bfffd87f91302b9f8714ee SHA512 9480fa377439c010f6aaae8c5ec6a512070cb30bb6171e31617dbb24ef54687d13bddf4768c5652d8e8c640d4c6b9c85fa0b434d8634d58154ee205db2c1cf28
@@ -18,6 +20,8 @@ DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af
 DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-104.base.tar.xz 3093716 BLAKE2B da8a9f572f4a22eb101a477ed2b2a81b0adaed65f1913c163b58dc958de661707733fb1e0d06e49ec342666ca0c212313d3a5fbca60c79779009b91361e23f42 SHA512 2ef214d2e4ea982c6702991519aaa183d6731f882fa59db5cc2d7832c7fcaf8de57dc2173f4a59922e5d90da2d046753b3eed609513c84c784c13d5be747303b
 DIST genpatches-5.4-104.extras.tar.xz 1768 BLAKE2B 7f335d61bd5f44cfa74ce2082259a48791ed90c21da4d05ff13c191adf1f658e68634c4cf9779274e6f775409695634ca40187754b0f9d50b406c26df26adbc4 SHA512 a8080605c59079063065d9bebc9d846ab8aab73f2f192f6c5becea2b51304a1e4d91e20d9aacd61f2cfa5b967bb8e30d620ddd60592017f308ad2f65ab7287a5
 DIST genpatches-5.4-105.base.tar.xz 3163684 BLAKE2B e11b77067fb714f827d68ca0773ae5f097a4234f89eb0ea5bb04ef6cbf39d416a676696a8a97e1473dbd36205b84e681f3b0e94dec8cdab5c111883a7f911285 SHA512 42217305887d22987bcc88565c02b4dfd864449c10726ce4e819c4b3fe8af6d2898fdd453ebfb95a45af90843000e219f5447def048ca52ac7c509219396c2cc
@@ -28,6 +32,8 @@ DIST genpatches-5.4-107.base.tar.xz 3190332 BLAKE2B 371004131cb2a5a6217378279a5f
 DIST genpatches-5.4-107.extras.tar.xz 1772 BLAKE2B 4f4aad8cde357553f2188e69623653e5c37e9551738a45b813eb4e4f2cd2acdf946fa9d68aedc31dcf3073c741a84b50a56b7c6e44773af747906c964d1b23c5 SHA512 d8fce09180d17a820a215bc6a1548ba39f407c8dc49d7859b7e9c6fb3ffc5ae1f0fbe3de11d95537582d8221c65bdc4d99abfa21cdd676aa75da0d254f414dad
 DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
 DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
+DIST genpatches-5.4-109.base.tar.xz 3231408 BLAKE2B 3823cb07dccb45ac11ca7c6cd19db8828f6048c18f66d81f232048fba774cdec93300f4a3fc60262a4a19436349626c1acb55a0e59b2b149816460a8dd38c8ea SHA512 4598f94943024e64ae95e56c0d34e71420c1ee1f38db7ba2028bd52b493469f0380e81952ecfb22dcde1d16fc0c182d27c2490d07a5d7232426b22cf03b0ea4b
+DIST genpatches-5.4-109.extras.tar.xz 1772 BLAKE2B a8a73fb000874269d37e9240600a2372213d026e74a1b5386ed688d9b35bc2535888a75aadc8760122f77d7b281cd859d3d2e0db31bb57078fa9abf4ceda705d SHA512 034f678e9d5b5e919e4e981e11d25187c97fc76cb787bc38fe1af3fdc6da6648d3e778c483cb1a57f862d69baa40ce5ebc1494bb945b95969985782bfed0044b
 DIST gentoo-kernel-5.10.17-1.amd64.xpak 64346939 BLAKE2B 3387154f735f5f6f50df4fd236c65a1f7c0b4c2257f637bca75d6569c5ac2f3d841828ee94b0072e3edfad947487157d9c42c3add280e97786947fbd305e851d SHA512 7572525cedbbce2d5a2478ab50afac686b01a213af110a570d514c6a7c439e5f5957fcd95c643db3ce1201c50944f64bbbb9a10a38f803cfcf7d3de1368847c2
 DIST gentoo-kernel-5.10.17-1.arm64.xpak 59606648 BLAKE2B 444e43a12a94310b00ed686d3225b61284207f93995bc75375d66435ba22cde42a1882fb1ff7479f1ed6ba369c509de11ba453a945f6608de83b1f121a5fb4e2 SHA512 998cc8342ab5e68f74a80ddf6f1fea68a618139492f5c078eb5c1619611f5635a0635ff362f9414c9518011868bd0f3bf12f110e5e5717e32c728e5f369a6b50
 DIST gentoo-kernel-5.10.17-1.x86.xpak 57292329 BLAKE2B 824b77875aa1336fff7b9f054f837904462c429b625a5085296dcaeee156c2d794242fb35d2d0fd20fb6e8230895bcb5a8b334f04b86034c0818bc0b740f8b66 SHA512 bde8d238b592f7aacf63f3b4464790d3df5901bc772850ec991957c849b634790665a2b9affd0484107017d909a45eb6634a0c345b73bd77274c3101432bacee
@@ -47,7 +53,10 @@ DIST gentoo-kernel-5.10.22-1.amd64.xpak 64085208 BLAKE2B 2ad4a5ac3391bf34c15a190
 DIST gentoo-kernel-5.10.22-1.arm64.xpak 59289046 BLAKE2B fdacceeb2cc5078438f65f6ef5a30669a3c5f20d66c68578265574af56afcf810625d321f6ee889fb31ac6e2ee6a9e92256dfde8d22364747667c94dc0d1e1b5 SHA512 e0af4c4e921621a342b901e2b8e1c2ca19817d5f412a106d2718afc8c967163a2068056cb29b0c8ae739bf77d29277a2fb493c028ca4477af59b68fff79e63da
 DIST gentoo-kernel-5.10.22-1.x86.xpak 57048115 BLAKE2B a07ef32fa35da33d9b5d56c66c18465e3ae89edb801763e87a2de543fdaa37722e063f64da42074baf42f26b990dfbf9e1e7d102943dc5edf791727d568d776f SHA512 f9f85ac08c1ca19715ecda74242ceaee600e2ae83aa6dfe5fa862dfceecfb0d1f16bdebbeb96bbf706555e717e4200a7de705017b62788f74bc16561d2372ac6
 DIST gentoo-kernel-5.10.23-1.amd64.xpak 64099761 BLAKE2B 68a9947ade38ee341527109c247e912693d3eab2c7df951ec811ef650709100672f2f839f142e35bb51225de327e22160d646a361df34edc7ce5dca6839575d4 SHA512 97b22fa157a093e0c0313dec79c9eaa68e794791b2a26bbd41b39ea89a93cbdaa9af61084d2cb5f48d0c86612c5093b7650884aac6668f599ddebdb2da00d937
+DIST gentoo-kernel-5.10.23-1.arm64.xpak 59366782 BLAKE2B 492c537807abf949818ff306096dc3b07e34c9406c4ecf56c34334c6c14d80fb5183fc95ea942d9a511800a0b6c3ae260405b1d8209585cbf6199b5e639a5987 SHA512 d28ca649f912a95ad997916707f2555c1552dca9b0abecae3ff0a8c6fb7daf08c996656e7b6489b1e7541a14d6a45bf05dde1b1302adea1da7f1cd0b0e19eb3e
 DIST gentoo-kernel-5.10.23-1.x86.xpak 57061009 BLAKE2B 6c8c05b418a6abdca512ee68af83c3dc7fb4e117b093cf228d90c1ac57c404983d4a0b8bc69c89d5e03087ac68ad2ae9d342fbaa9e1bebf150db4d169900f23d SHA512 24b155a996f36aeabffae4445ae6bfea2a665cfd149cc2fae95dae27b4e971775ac9b054ad2935c3932b1064e219a4594ebdeb3c441740fde09f3371d6f4c112
+DIST gentoo-kernel-5.10.24-1.amd64.xpak 64100066 BLAKE2B 0f18bedb448c5c0bd8165846a190278b9a96264b04a09be97fc51968fd74f66f29ea7ff845ac874748c1ac60c4c4a4aa4a72d7a273e84551fe09d870715407b9 SHA512 414a12ae14da6a81dd0dbdf80f05e511d686bdba7f5fffe5c754144f7dd9245368ee3a1673df16e996e80985b7f435613d888c5e5324d967dd622b9db03407fc
+DIST gentoo-kernel-5.10.24-1.x86.xpak 57056253 BLAKE2B 5925e7739cda2fd853d919a4681f28849afb9552acfd7cb91387828d6c7286ce9b1b32b93e55339311696e5bf62974a2a117c668221fca3ec062bf574569837f SHA512 395019c3a8d40eea18d92db2507386bd2202a8f13e25bb7a247724820a8f0ee854a05c6e999129556e894443b011928e80fa41612bef6a6c070035ecf11c749f
 DIST gentoo-kernel-5.11.2-1.amd64.xpak 64830406 BLAKE2B f9c5d0591a175e497e3ff9f9c12e855e0c7db90aaf28fef5bbc695604c5745e13e3cd16001eb75216c55868497954a58738a7eca2314f077548650ae27b73620 SHA512 9a05cf8ce3218ac7e6b880624cbdc67d7fa221f0440f920de70f883a33978df08297184eeeb7a5b3c420da34ba7cb9ebc38f11c9a4979cf5d8a5c7a33e82b85a
 DIST gentoo-kernel-5.11.2-1.arm64.xpak 59866719 BLAKE2B 5c8e59242ac3512488afbc1335845294f6ed6b5f7cf0674c4655689b4e93284b110295da479c14f3bd70111c5f652a2c7c641bd34b06f9d7b21bacdb3965b746 SHA512 978891967b1b2c59ca1d4e77bd7d622585532e39cdaceae087a72c6f72d57764cd9dcdcad918ddb1c2d92a42ddc9859baf532971a280cbbe7c4811acb7cc3f5c
 DIST gentoo-kernel-5.11.2-1.x86.xpak 57784553 BLAKE2B 452b7e2bca5f9c83345b14f8a3e9ca54bd18e2b6f89e9d165ee3b59de8b8cd46411858a08d58546cde72180bf78c596f1ab3d595c2e5e818e2df9722101cf0b2 SHA512 9620e721c8c0e474db8861400b3109a2b26af68aafbe94975030a45f620e7f7ca5f9837d8dedfca6e97d5b4cf458ba76d34eee790268ddbcc4677d2b06e220df
@@ -61,7 +70,10 @@ DIST gentoo-kernel-5.11.5-1.amd64.xpak 64924579 BLAKE2B b4484bb69d8355f63acecada
 DIST gentoo-kernel-5.11.5-1.arm64.xpak 59869818 BLAKE2B 26d4431d1e9e3dd58f1d352ab872cf2749d64ae768a114d42cf1bf3ac342c9792dfa19ccd1bf502ea26ee99a0bb00e75783b2958726d5073d8f69c3f66e29a9c SHA512 ea64669b86cb1a3c86f92016f8a9838eabf1328c9a996084c8e8226b736d526b7d246f42d24ff9d07d2d0606cc0db914251b7007caa74080a482c0bcdd4a0bc6
 DIST gentoo-kernel-5.11.5-1.x86.xpak 57891193 BLAKE2B f9f1eed75c7a81067994fe07a8305e5d70001c4ac969ae4d39d222960cf70c5fe5591db0a4e19fbaca9faa53e6dc1206158c0ad071cf3907761a61b00eedf098 SHA512 9494f10ae5a2ad3a0232e9eca5cb16647e4967f5ded3b45b5752f2e380b1c21437b9239d2fc7336cd84a246b488dc405e389c844263834a1feeea9257b2f8779
 DIST gentoo-kernel-5.11.6-1.amd64.xpak 64926961 BLAKE2B 3134919e40bd922dc334999c7b32d5810779c7833b2719ba0d5b2fb975afce70142faa3dd047c73f12384a74aa1eafd8e9900357feedb58dc8b074b563a61501 SHA512 fd4cfb53d2ca7c2a4869951c1dd9f32fe7878274d337b851b5dfd8fe3ab2bc7a0ec41164441ca49e0dbbde93dcfaa2969c1a60ae529b82c47ad7c1247be1b21c
+DIST gentoo-kernel-5.11.6-1.arm64.xpak 59948554 BLAKE2B bdc44a259d7c6a75a44e0d5606689eef1beae84fe9671cdb17e85eef35f059593d465b6538629c0713e3d2c3fd24bb5088339a43602525eb49187d839d5e6cc9 SHA512 60d7e099e605fb843e069d0bc217388e2f5aa847369cfbfa965f2fa81c5c34b6a47b02d9d0781aa55030d0138fff35c1062ae6198ff6625bcc49e7764ac7c823
 DIST gentoo-kernel-5.11.6-1.x86.xpak 57886583 BLAKE2B 6199bac90efa9c4d9db1b69151ddef53152406a8e8e3a67124dfef3abc4334ecfa387f70842c10751ff0b41efe9efdaa1aa0db675c86fb6b4f41f90ad597b3d4 SHA512 546185317fad3bac4e2908c9685b357cbdfd311ad4ff378b1d99c2b0212d4a5a68c8148efd48441647363d087d223a87ca2b7c8e6a4286513ca9eb9a74d44c72
+DIST gentoo-kernel-5.11.7-1.amd64.xpak 64458248 BLAKE2B 119a8440af915cd2b6040b6be0905614632bd6f99fd9f0d8cb3d3694e2a9720fd2b3623f5572441b570c1a46f1a3f49985a4c2f66107d327ad95761afcb6970d SHA512 4b03ee42ec8e25c286e85283026e3284509a689d1b91f1be3ec6312a8a85382a5718ca8f1c8708ec57118d2884bacf3d456c7448552390a98caefe16124afa4b
+DIST gentoo-kernel-5.11.7-1.x86.xpak 57450576 BLAKE2B bce3c47f76d16da2b6865a0f890d34ad6b4cc9fb0e129c7c458e1aa33e2110d8633d3279ce8b50e3d012acda8e219c574c9d952f98c2b773d0a8783224af5223 SHA512 76dcf77c7f46706c44f21e975cc96aa48037631ec4349e5dd15b9488fc28b299ddf75db2f2c2147f64a32eb37ed7682c553d0a6b9940a89c70e227a097d7f00b
 DIST gentoo-kernel-5.4.100-1.amd64.xpak 61080710 BLAKE2B 84b33a1aa252b0957eb90ddd792f001942589d7f65399a5b007a2c831d0a1fa3b879814a55e5cf8b1ad6166970d3ac89838f57a2c61cec6b7b136b55d5ea4c7b SHA512 98b3dfd31a2830ed49dfc7094e9f37a39e7fbef54b648b4840122f2b53b8e970fb9c75a653445753d8e4efbd723716b9c56b2f99214c79832f3e49de63b3efbe
 DIST gentoo-kernel-5.4.100-1.arm64.xpak 56394488 BLAKE2B b8ea7a56a087e98706099cc151b652dba2a40e2a39ae99670b0989ce2f11c133f07b53dda1a9749f946719ab8a5b97a57ee0a12fcf3d9a568b498859420eeef5 SHA512 549ada0acf8874d3254c8a586f5c4d0ed4f08a103aee74befae38fc47d10c716d86f3f133b8ee3c49e61fcacda2298b04b5fe96bf35917b0963f922fe424e96f
 DIST gentoo-kernel-5.4.100-1.x86.xpak 52912122 BLAKE2B 5f1a8f7ccf3f9df6a89650d62df903896cf0342b9cf6e0fc265e67a887aa9a0608d62b023d9641711a2d9196958ddfbddec4e19f5f731356f5bf3a74421145f9 SHA512 6d1e5089bb817cf9e7401bb1be0b1d1433caea884b8ba4208c973fc7bbd879b65b69ace8fe3cba05bcb6aae0607ff1be9a63da42642ec2c32fe5ff7adf6fef28
@@ -78,7 +90,10 @@ DIST gentoo-kernel-5.4.104-1.amd64.xpak 61168729 BLAKE2B f4035929ec0ae6f975b6a1f
 DIST gentoo-kernel-5.4.104-1.arm64.xpak 56426355 BLAKE2B bf76ddf35a3a1406299161ac32fdf233ed87273e840d4c3c72e0fff0769f7e6706bc38ea9fb0aff3ae728343cf3586c337862ef625034ff3572ddb4616f148ce SHA512 98cd8c677f763b41517a09e5d5d2fbbf18b8a30deb1ab0b4821f4486edcf29ad46c29a1caad34f1218a97a1fa60cdf7ac06614a7c5c47669d0209f6bf76d46af
 DIST gentoo-kernel-5.4.104-1.x86.xpak 52994991 BLAKE2B e96911371fea462e94128a7790b089a5e1357b74b30d9b649097c7b295d8534195f4f98579a07f151e068d0a05d92cd181ab824cea181cd927457d36c8f84a6c SHA512 0715b8858ffd473bc694ae0f8ff79eae13d6849226424d56d5c20657116732d49571ac9b5434674c8db3e5765761f3f03372e1d5decb15ed723b42053888a0e8
 DIST gentoo-kernel-5.4.105-1.amd64.xpak 61143714 BLAKE2B 7b404897b1da5790dae7990a35d1ce8b041989d958a9ac9eb974b2e7dfcb5ffac177d1055bf6a228530c35e7d5471a946f38650633d7ffb6a5a3a61c15b1bd0c SHA512 73502f24aa6de2b31002e37c638fdfe16ad990666c76221766240ddba7da2e902caa609a6bede8f0832bd7c14b56df440c210890c16c36194471b9b36403e7b1
+DIST gentoo-kernel-5.4.105-1.arm64.xpak 56446869 BLAKE2B d57f6477484329e5d04be009cd240902f1c259f584b6c522d52b993ad8fe02a7448f578bbd77a3079f3d616f51306f2d9774b813904e173b18f2c9726cb90c26 SHA512 927aba91a3debebdc61ad20be444681b701a3892f39f6db0bcf1cc8bf8d3dc989f6ddad3c8b49d17486bc217e90c24394f11a8119ba6ede01f8771b78b79edcf
 DIST gentoo-kernel-5.4.105-1.x86.xpak 52996400 BLAKE2B 13dd3bfb78f48560ca8716f0baa2d5c30c4505c95dae85c2c5b2e7b116da182945ce878a7b7e451a23ce528b8dfa222ca485271c4c040b7dad0befababb78e01 SHA512 0841f2fe7f0910952b880dd5652934a8aa64a7dcae56dfcbf4a97ac0647ef750645f1b83e161f2db1c351a909d6e7a60c6228ba129366adf6f036ed1390f3e18
+DIST gentoo-kernel-5.4.106-1.amd64.xpak 61146719 BLAKE2B eb8ae4d9042e3ad9e69a5fae488763964c257e7a78f3b08b8d7b8a313bcdb48e975c4116c9b8e68be42c45351e7035e6ab892e155600a0ac3560ae54f84f6170 SHA512 b823ec881b83f42e54e2b393ed5060d84a7dcf9b7ed3967dc43124a88548f834c3eab56a679b8277d3427e9e05601ea3b06e218fc9923b5aa39bac09774194e1
+DIST gentoo-kernel-5.4.106-1.x86.xpak 52989825 BLAKE2B fbcb31f68a1a03d1395e66c5491e35006ef642090d1c4b14892eb43d56b818663e40666ead8dcda0c0b7814739b41e3c4fa27c3d9a7ddee05a652f3560a1e3a2 SHA512 ad9c927f9b4311921de6c59706c84872a7d3955dbea393c11179504a730a1495981b473483e44ea204b003e6b8fd11b7bb6198c642b79191d39d04dc2878147d
 DIST gentoo-kernel-5.4.94-1.amd64.xpak 61075025 BLAKE2B 96f7d69735dacd618266d4220907d2e196d4a59f39fdb6c93e88299ecd26a503684bcfbe0a0dcc8c027c3e1b90fc7c066f0d0cb5e007efee859215c6a4b91807 SHA512 e786c30e4ac3e62f25cb6403105847c20b7673f0e9fee32f513854c6e739cce513409f136da9dfd8c366d74ffc4db00625dc5d6270623af56149e4dd05801c57
 DIST gentoo-kernel-5.4.94-1.arm64.xpak 56309818 BLAKE2B 50f9f4d7bfaee560860899a0a16805c0a805a9cd0b915a0dec3f654180db73cc73f3247ccc808842103fefabe9cbc0aa963aff8c649c0fe2d314a6ddf22a02ce SHA512 36ee8c73e76ac00ea6c26a5530d6dab91df46fcf2b5f072bbcc44d8bf8b7df710fa601584ee2707cb1c1bbfad9342e369a00926224a0527f1fd4588d01085508
 DIST gentoo-kernel-5.4.94-1.x86.xpak 52893412 BLAKE2B b694d25318a84dd4d458b3ad42193781a42853fef9bc21c7e0f3671b5d74b9358c3408bb478d669d57f3618bc433d29df02bed71d80abc7bb8e8814c6e08997d SHA512 c64d72334079b3650c37427ab38e72d9b0d946d93989a491224a936e59d4eb0e43046bf03d85487d41ae6dec43cf5c5dd8667d3e2c9cf7355ec9e95f61f096e2
@@ -104,7 +119,9 @@ EBUILD gentoo-kernel-bin-5.10.21-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bc
 EBUILD gentoo-kernel-bin-5.10.21.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
 EBUILD gentoo-kernel-bin-5.10.22-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bce8eb345246c5c98449385690d74b814d0713f6a1cfab5b3da82a07ee0dd0e993e0ed2f611fbb12887b0cf2649917183d428cbf43 SHA512 f219137e09aa4da8bea659dc8043f3a57a1c2a7b36d7df5172a670fac028592fe72c25e4fce9708a02888a25e662b02f3d6d3f4b5f4e29435ca75c33ebd2c755
 EBUILD gentoo-kernel-bin-5.10.22.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.10.23-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bce8eb345246c5c98449385690d74b814d0713f6a1cfab5b3da82a07ee0dd0e993e0ed2f611fbb12887b0cf2649917183d428cbf43 SHA512 f219137e09aa4da8bea659dc8043f3a57a1c2a7b36d7df5172a670fac028592fe72c25e4fce9708a02888a25e662b02f3d6d3f4b5f4e29435ca75c33ebd2c755
 EBUILD gentoo-kernel-bin-5.10.23.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.10.24.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
 EBUILD gentoo-kernel-bin-5.11.2-r1.ebuild 960 BLAKE2B 7449fa27c50d83cb7241a5c030aed0c9db9fe2641254a177344d820a0a0e575b83de3e31cdc2107f883379cd5ccb0661adb8b092b3102b4d25acbfc6b8c300f6 SHA512 9ca83566de4f064f1698bfcaaffc05fa38c3ae2b1487dd80a278aef89fa594744b1b8cdfb2a6782f700d33765b341bcb43a8e3beac7f1a72a6e4ee85f85549c7
 EBUILD gentoo-kernel-bin-5.11.2-r2.ebuild 2675 BLAKE2B 0f42c8286c0a677493ca6d6aebd51e9e418a20b1b808d9b3cd59bfc6f8a6c7042266e379147ee40b90d22ae092d762ffedb29ea12049a02f7414c3e867438121 SHA512 b4c30c19366ab4cda5786e34eeeec602feb7d1a4b59d2ccef437c313dbde3287ecca6c665ee9eea841b097ac6933102f0755bea51b72eb9245dffb44e0210b9e
 EBUILD gentoo-kernel-bin-5.11.2.ebuild 1092 BLAKE2B 196f9afe0e9526197030311792bbeecb5f80cf7e0b76370e997effb2f4592cfc1f22ed605078087d773dca1c4543adb8d2b85e43fa1c0233823c985e740ff6a9 SHA512 71d58684d881d78fdc00d74bef4ed679a58646bde3173fdd138bee3c0e0265bb12af0dabef020107bff3d4fe5c42119ea7d8d4e71e8c5dbc80568166471e92e4
@@ -114,7 +131,9 @@ EBUILD gentoo-kernel-bin-5.11.4-r1.ebuild 2541 BLAKE2B 69c1d51459d7e42055426072d
 EBUILD gentoo-kernel-bin-5.11.4.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.11.5-r1.ebuild 2541 BLAKE2B 69c1d51459d7e42055426072d98a8da3142d44143d9ef99c441b48ab4767e527cd092f1645d56397d8b5c95c48f073b99537ac08262086c287c2b60305268a7c SHA512 f3c50e8b5e6d2a05ab0d3b97637d083b532ff849e515d0ae3a1c92e4f3eba47054233876308ddcc1a72e63e9cb0a5762ae3b98a48b5245283d2dd7514b23d169
 EBUILD gentoo-kernel-bin-5.11.5.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.11.6-r1.ebuild 2541 BLAKE2B 69c1d51459d7e42055426072d98a8da3142d44143d9ef99c441b48ab4767e527cd092f1645d56397d8b5c95c48f073b99537ac08262086c287c2b60305268a7c SHA512 f3c50e8b5e6d2a05ab0d3b97637d083b532ff849e515d0ae3a1c92e4f3eba47054233876308ddcc1a72e63e9cb0a5762ae3b98a48b5245283d2dd7514b23d169
 EBUILD gentoo-kernel-bin-5.11.6.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.11.7.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.4.100-r1.ebuild 1414 BLAKE2B 302c99d5a8b257906feeab8f300da0f842307a8af759be317e32e5fc0930ca96905747c4e4fcfa78a2454c7a1e0aca9a02cc476ba7b0aecfc03fa2f9528a057f SHA512 38b3bf91391fd44b7af11feaa26f6537a55a793d05be47d7c4aaf03fe453f4afcc9501d0492c0262b9c0c86357da68569ca78da83d3874d8a71ef9930997b17e
 EBUILD gentoo-kernel-bin-5.4.100.ebuild 1293 BLAKE2B c12099f3cea4e909bb45b0387b6ae63a16fdcb5e14dfde9ab97a532c5d361480acdf7277e730ee629ed44c371a3ad582f629fc1d668416595b6a404704acd6fb SHA512 452d85bab90a81bafd7cd86560e59ffd32682f3c942a6a506fbeaa9061021e98ada32ac745b968325f8b170c764453d88ed9cbabbd079660d31bceb3c7966fb1
 EBUILD gentoo-kernel-bin-5.4.101-r1.ebuild 1414 BLAKE2B 302c99d5a8b257906feeab8f300da0f842307a8af759be317e32e5fc0930ca96905747c4e4fcfa78a2454c7a1e0aca9a02cc476ba7b0aecfc03fa2f9528a057f SHA512 38b3bf91391fd44b7af11feaa26f6537a55a793d05be47d7c4aaf03fe453f4afcc9501d0492c0262b9c0c86357da68569ca78da83d3874d8a71ef9930997b17e
@@ -126,11 +145,13 @@ EBUILD gentoo-kernel-bin-5.4.103-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bc
 EBUILD gentoo-kernel-bin-5.4.103.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
 EBUILD gentoo-kernel-bin-5.4.104-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bce8eb345246c5c98449385690d74b814d0713f6a1cfab5b3da82a07ee0dd0e993e0ed2f611fbb12887b0cf2649917183d428cbf43 SHA512 f219137e09aa4da8bea659dc8043f3a57a1c2a7b36d7df5172a670fac028592fe72c25e4fce9708a02888a25e662b02f3d6d3f4b5f4e29435ca75c33ebd2c755
 EBUILD gentoo-kernel-bin-5.4.104.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.4.105-r1.ebuild 2541 BLAKE2B b7bcd60011f61f4f3f2f06bce8eb345246c5c98449385690d74b814d0713f6a1cfab5b3da82a07ee0dd0e993e0ed2f611fbb12887b0cf2649917183d428cbf43 SHA512 f219137e09aa4da8bea659dc8043f3a57a1c2a7b36d7df5172a670fac028592fe72c25e4fce9708a02888a25e662b02f3d6d3f4b5f4e29435ca75c33ebd2c755
 EBUILD gentoo-kernel-bin-5.4.105.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.4.106.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
 EBUILD gentoo-kernel-bin-5.4.94-r1.ebuild 1413 BLAKE2B 27232c4838fc895ce77180bae7a5a3c91d336336db8ac03296d9465d0dd5bb66aa5e5279540f673b29f1f0924ccadbdd61814217ac05d7248a72939b87939c30 SHA512 fcb821e6ed5cb7cfe1668f3e6a4ef6f1be1d4f4254fbb5b3ee6ae6eb1d6fcb217dfbb92d7e89f9519a3dcd1d0897bc36759409be746ea9b0e8257bbaf923ac29
 EBUILD gentoo-kernel-bin-5.4.94.ebuild 1291 BLAKE2B 5505e80093b23cf6440f395ace05c31a5e4b8ddb10d73dceb4a664a742092feb4c76a3940b646b9f5afdde4006932391410da78eacdce5f93aeba97d32f549a1 SHA512 c4fc52e9767b6d989960394f8b36bd9b411ce3090dd6f9d004b1dc9403caddb8e071c33833d3101b9f76be819d1862bce38e84b15922ca13a196988c24f31b7c
 EBUILD gentoo-kernel-bin-5.4.97-r1.ebuild 1413 BLAKE2B 27232c4838fc895ce77180bae7a5a3c91d336336db8ac03296d9465d0dd5bb66aa5e5279540f673b29f1f0924ccadbdd61814217ac05d7248a72939b87939c30 SHA512 fcb821e6ed5cb7cfe1668f3e6a4ef6f1be1d4f4254fbb5b3ee6ae6eb1d6fcb217dfbb92d7e89f9519a3dcd1d0897bc36759409be746ea9b0e8257bbaf923ac29
 EBUILD gentoo-kernel-bin-5.4.97.ebuild 1292 BLAKE2B 4ec100c5f326989afc91965b371c7447e20cf52f4e435dc8ed85c1804ecb849fd6d564d42c0f408bf03e042204cbf6ccf33e32ba4c3ea810aa3a4bbbc57e43e8 SHA512 694b8e0e12c035e263d9156cfc9b452a2580fd7c3bc0fbf8dde0e99ce7ba8a35d651da7ec962cdee7559d43e45781adf27bd32b70c2cf7c146bcf26358986112
 EBUILD gentoo-kernel-bin-5.4.99-r1.ebuild 1414 BLAKE2B 302c99d5a8b257906feeab8f300da0f842307a8af759be317e32e5fc0930ca96905747c4e4fcfa78a2454c7a1e0aca9a02cc476ba7b0aecfc03fa2f9528a057f SHA512 38b3bf91391fd44b7af11feaa26f6537a55a793d05be47d7c4aaf03fe453f4afcc9501d0492c0262b9c0c86357da68569ca78da83d3874d8a71ef9930997b17e
 EBUILD gentoo-kernel-bin-5.4.99.ebuild 1293 BLAKE2B c12099f3cea4e909bb45b0387b6ae63a16fdcb5e14dfde9ab97a532c5d361480acdf7277e730ee629ed44c371a3ad582f629fc1d668416595b6a404704acd6fb SHA512 452d85bab90a81bafd7cd86560e59ffd32682f3c942a6a506fbeaa9061021e98ada32ac745b968325f8b170c764453d88ed9cbabbd079660d31bceb3c7966fb1
-MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
+MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.23-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.23-r1.ebuild
new file mode 100644
index 000000000000..18c02d4c0f39
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.23-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+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-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+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-${PV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.ebuild
new file mode 100644
index 000000000000..550411ea18c7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.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/~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.11.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6-r1.ebuild
new file mode 100644
index 000000000000..1d8f27f26279
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+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-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+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-${PV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
new file mode 100644
index 000000000000..e00d3ebb8dc1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.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/}-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.105-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105-r1.ebuild
new file mode 100644
index 000000000000..18c02d4c0f39
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+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-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+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-${PV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild
new file mode 100644
index 000000000000..550411ea18c7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.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/~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/metadata.xml b/sys-kernel/gentoo-kernel-bin/metadata.xml
index b0b959adbe61..ff8c39d21f36 100644
--- a/sys-kernel/gentoo-kernel-bin/metadata.xml
+++ b/sys-kernel/gentoo-kernel-bin/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Distribution Kernel Project</name>
 	</maintainer>
 	<use>
-		<flag name='initramfs'>Build initramfs along with the kernel.</flag>
+		<flag name="initramfs">Build initramfs along with the kernel.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 379128ee442c..22b37f7b3056 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.10-25.base.tar.xz 765788 BLAKE2B c86796b881ee8d4d471372dc405c4
 DIST genpatches-5.10-25.extras.tar.xz 1772 BLAKE2B deaff4896b8ce8ea5387ea49cde3e0e1aac77f16a1f8fbc673ec3a71a3c46fccf34d65177f00023345355f09adb3bfe33d52aa046686267efb924ea1fde757c1 SHA512 cba0da17f51de2b58c2f369f4eaec3f1f05c88c7e49a12deb392a0542a02337549eb7eb960d09873d1f7fdd1c7b07be7d2fb592d64272d3fb6957ec6e0974658
 DIST genpatches-5.10-26.base.tar.xz 780252 BLAKE2B d3da07e58183e25210b0a14dc5cdb4eaaa4e0ad6e6955f9e99ff06b6575af24d2710a63781fb7fb3c9f0b142c6198c0853c71ab63f3ea1ff07c4eb405fad4cb3 SHA512 c5d73387e6caa2140f1e5c48763132797d98abae0e64911f0bf1bece03440462ccc793a2ed4ae5916235b570aace12e9ba7b625cdaf71a9802956f0ad2836c1e
 DIST genpatches-5.10-26.extras.tar.xz 1772 BLAKE2B d6e02010a72510e5c18b80102f2383002acf45b645c34d35b31234d6da9ad7b38ed70837bfbb3563c9c3871121ec4638bdebeaaaf225b3f3c6d50dd30ba30547 SHA512 8e1c534b5160553f0fafe542953a3f229082cf541f744038831c2aba1cc061a8ba14713155cb98245ca99e62514619ab6969bd8f61c3886d65c65b67e410ff0a
+DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
+DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
 DIST genpatches-5.11-4.base.tar.xz 247120 BLAKE2B 64e8bb77aa399a797a9dd9726ba51a00ec43d850504680c52b9fe3ebc1277e1e2216a43719bd79b12e3267171f1031feab5adffc35bfffd87f91302b9f8714ee SHA512 9480fa377439c010f6aaae8c5ec6a512070cb30bb6171e31617dbb24ef54687d13bddf4768c5652d8e8c640d4c6b9c85fa0b434d8634d58154ee205db2c1cf28
@@ -22,6 +24,8 @@ DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af
 DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-101.base.tar.xz 3089116 BLAKE2B c6e716ab8d0e98d3b3b4c492d6a516ada65f5e77d375cb9164a080aabd94311c50a222135499eef9dcad3f80b29b831a3fe015c3006178651c2136620f9079c5 SHA512 1bdd6f8f23a6151298e2e2fec493c9a2e95a1a65f4a4b6ff95598f45d4fad783da2a596c05b5582ec3d82ed8d8aaf654706da768a1b248bdae37fb08481b3dc3
 DIST genpatches-5.4-101.extras.tar.xz 1768 BLAKE2B 44b92b9c288f4f10f499e5b6d2179b44ee3418890905341703901a71b703ff99e992d6e7424521e67d3b1f80e41286c2357187c66e9b1ae7c1feef430f0ed74a SHA512 e397f970bc3b68b91f059e4b4f2d6163f8416340096b16b040eed8a5242a001db37b0fe8c1fd2a54c73bf6121aa55efa1c362b7837e930b758bc3bd33f8dce09
 DIST genpatches-5.4-102.base.tar.xz 3090460 BLAKE2B fa17228e7cfebb2c128b73682cc97f9e96a1a3c4936f98b021ae3f21a1f6a1167c357db2570902ca554b6facf27d507a0d258c4a9e9898cacde502762306c2ca SHA512 e3b7b0826115a7f7c92f5509eafe25803ea943733a8be8404a333d54ac93c607704f742ab20576517a7ac6e5467a7dfc9c2a54205a10f3fcf4af9b2557a5da0d
@@ -36,6 +40,8 @@ DIST genpatches-5.4-107.base.tar.xz 3190332 BLAKE2B 371004131cb2a5a6217378279a5f
 DIST genpatches-5.4-107.extras.tar.xz 1772 BLAKE2B 4f4aad8cde357553f2188e69623653e5c37e9551738a45b813eb4e4f2cd2acdf946fa9d68aedc31dcf3073c741a84b50a56b7c6e44773af747906c964d1b23c5 SHA512 d8fce09180d17a820a215bc6a1548ba39f407c8dc49d7859b7e9c6fb3ffc5ae1f0fbe3de11d95537582d8221c65bdc4d99abfa21cdd676aa75da0d254f414dad
 DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
 DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
+DIST genpatches-5.4-109.base.tar.xz 3231408 BLAKE2B 3823cb07dccb45ac11ca7c6cd19db8828f6048c18f66d81f232048fba774cdec93300f4a3fc60262a4a19436349626c1acb55a0e59b2b149816460a8dd38c8ea SHA512 4598f94943024e64ae95e56c0d34e71420c1ee1f38db7ba2028bd52b493469f0380e81952ecfb22dcde1d16fc0c182d27c2490d07a5d7232426b22cf03b0ea4b
+DIST genpatches-5.4-109.extras.tar.xz 1772 BLAKE2B a8a73fb000874269d37e9240600a2372213d026e74a1b5386ed688d9b35bc2535888a75aadc8760122f77d7b281cd859d3d2e0db31bb57078fa9abf4ceda705d SHA512 034f678e9d5b5e919e4e981e11d25187c97fc76cb787bc38fe1af3fdc6da6648d3e778c483cb1a57f862d69baa40ce5ebc1494bb945b95969985782bfed0044b
 DIST genpatches-5.4-96.base.tar.xz 3031600 BLAKE2B 9ba35f7958842a1fd4c9a7e7d3666ea1339ee5fadde6b771b78f67a8bb27c07e8dad8498e9b85fa0bcfd641f5aef9641793a02061b03becd372ea86245820895 SHA512 3edea8a4fc2a29e0f989089633256b270589ad77a225f3cef6e414c5877de1be8a4d5d9da28bfa4fba848f33ee322c4f01befcdf384c9271c97c90e2e2d3ad39
 DIST genpatches-5.4-96.extras.tar.xz 1772 BLAKE2B f33c734139f65245694d3cb98712733a901e89c79d05fab03de42d82d6e45ed3ec41ab4e17f2cd20be2ec31d469cf02a5efc7bad93832c67d3ad0bbf147b07e6 SHA512 8b7d6d058906b9c9afb7addba0c3072d70758bd75ea2989787beab5a3a83725541b4084c34cbb1e90b6cc8bb323a002dfca7065cc88fc834891f04397caa645c
 DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f
@@ -45,15 +51,19 @@ DIST gentoo-kernel-config-5.10.7.tar.gz 1146 BLAKE2B f755581e9f3be3122e5f6e6fc13
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.11.1 225847 BLAKE2B 50e3db29a9afc3db3c35e3af173e89e2e8d3b573dd8af7c35584e3d0152211cbd5e6ddb749acb3d6d2caa54392a3f51e52b5394a5d032d43ed35861230b277d0 SHA512 6d0594658e205767599453d4d8695c37eabc065d6c17362c3775dd745f6ca62131d7c15126ec41a17e757d3ae2a0569cea6621a7ada4666a8f90e4414391b3dc
+DIST kernel-aarch64-fedora.config.5.11.7 225828 BLAKE2B 1f5d50514adb57195f2878e3c6c587705d90d5f888e2b1c84d5ca8aefa91c23cc70db34a12a23575cf3e91cd7779769ac5242a3a3ef38f72bf30f73bae2e009e SHA512 b43550dabeee5618664e298b56025ed33d9983e741f70dc190135028ab43e72226b9090da361c26a64938e5759ef80e6008b20a623093e830af45e877a71a77c
 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.1 208027 BLAKE2B b4183e8d1121aa8b3f65d0a4542b8ba0f507430ab4cf0004dd0e8b1e24b3be1783316b8bf6becb2002f7fbacc8236b640f533fc2e9dc5696e84d1627c3b0e9c4 SHA512 5b107e376ddef783ee6852ef67143a94340b37ab764ef3ee3c6642401883d314809c959c2025d976336923c115d21d6b39332aa1699c0f884d1faad1d9c3fa32
+DIST kernel-i686-fedora.config.5.11.7 207997 BLAKE2B da0d9cc56ec9a9ecd9c05b809313301538e902f94799f418c522fa55d97be9ef72b7c23fba15721cf355227adfd93a9d6d8537b84572d6da16c16e13e2cd4dbb SHA512 4c6dfb2efa2cf0d48792aa2f37c8f37b929524a93c534a1ba48effd4645fa3f064bc6b88a900533d8cd8ebd4bbac8f0f1faaba57d25d59005af2cf2608eb0c0b
 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.1 194870 BLAKE2B df6e5a0a789dc6d0c2fbec45820f5e19ec455388f02f04d88d7b3dd5081d2f11e89cfd0159b7a3885aaa029470e916743d59ec3f86756ff4182aa56552aa8476 SHA512 e170912e76e8980435df2a1387792d616490ededda4df681a90312f7fc8ce4065f1c9fd7559d746d8edc0fccfbd35b20fd5db294774f9db7f4635d898cd0dab1
+DIST kernel-ppc64le-fedora.config.5.11.7 194840 BLAKE2B 0fba17ad9a4272a19678beb007a07d30a1facd2e9af259e888b733129540e647378d21166ffbc459f2419b1b4fde7deb7e59db1f3c74aeef5b137424abe14bd2 SHA512 b77fc04281c049a312ac8135c4b60460b747c97299d1cd24c31a56aadcb8291b4c47ff3b87a427c47abbe8adea36216e6615a4715c6c7482b655de3b987b86a4
 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.1 208870 BLAKE2B 86e075a95cbc5d6c3cdecb0caf67e18f671ed663aee94b7d0688e25f111dfdf12d890e1f409df04446d18057b6fad8e0fc67adcde34ed581266d458d9c9cabbd SHA512 ab39c8b107471bdd492e6f9c2e181e85e44134b4a2934fedd2f454b9766a32aa2cef2cbf7ed83111e82ffd7794d4bf20f81d98b238751d505c13077abff2b543
+DIST kernel-x86_64-fedora.config.5.11.7 208840 BLAKE2B bead7ffcab503298371e61d37ccb0920e0ee3ba8d5dd019133e3d57bb8973cc2a13498a60c5e150b78f9d6af839a7010fbe89da1b0ecea97cab7036a5fc1aad0 SHA512 1777c0efba6c3c6108f094a5435169230b2a9ed496ab67d5f922054492a695a9f8eee95c2fe9651641c311cec49868a12a7c3614330d37f711ff795110c2c7e5
 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
@@ -65,18 +75,21 @@ EBUILD gentoo-kernel-5.10.20.ebuild 2591 BLAKE2B f60aedbd9e5c56bd3d1925a5afe2851
 EBUILD gentoo-kernel-5.10.21.ebuild 2654 BLAKE2B c0407b0c81a00c0d1c58d02f841090d24495e8f650d652bf0ddfbf6355ed0d0391c98d52b59d817ebe085f65b79a2ac5a708dcd3b91545b0fa374673f89b315e SHA512 1467b4e077c1ad8fe22707f7d2d565e021a088ecae49316c720fcc9e1c24091b633d7bc5335c11fd3ae0eb0f3ab54b58ec6b289041cdd505e2c4fc3b5d5a6460
 EBUILD gentoo-kernel-5.10.22.ebuild 2654 BLAKE2B c0407b0c81a00c0d1c58d02f841090d24495e8f650d652bf0ddfbf6355ed0d0391c98d52b59d817ebe085f65b79a2ac5a708dcd3b91545b0fa374673f89b315e SHA512 1467b4e077c1ad8fe22707f7d2d565e021a088ecae49316c720fcc9e1c24091b633d7bc5335c11fd3ae0eb0f3ab54b58ec6b289041cdd505e2c4fc3b5d5a6460
 EBUILD gentoo-kernel-5.10.23.ebuild 2654 BLAKE2B c0407b0c81a00c0d1c58d02f841090d24495e8f650d652bf0ddfbf6355ed0d0391c98d52b59d817ebe085f65b79a2ac5a708dcd3b91545b0fa374673f89b315e SHA512 1467b4e077c1ad8fe22707f7d2d565e021a088ecae49316c720fcc9e1c24091b633d7bc5335c11fd3ae0eb0f3ab54b58ec6b289041cdd505e2c4fc3b5d5a6460
+EBUILD gentoo-kernel-5.10.24.ebuild 2654 BLAKE2B c0407b0c81a00c0d1c58d02f841090d24495e8f650d652bf0ddfbf6355ed0d0391c98d52b59d817ebe085f65b79a2ac5a708dcd3b91545b0fa374673f89b315e SHA512 1467b4e077c1ad8fe22707f7d2d565e021a088ecae49316c720fcc9e1c24091b633d7bc5335c11fd3ae0eb0f3ab54b58ec6b289041cdd505e2c4fc3b5d5a6460
 EBUILD gentoo-kernel-5.11.2.ebuild 2590 BLAKE2B c4b2474b3aa266eb0854c146e4d49cdfd909aa35b6ec1e8080ae02f6b6bcc63122d62337b0e94f300ed2f75e64f2e05bec128ca87ac7b9e16cb2798f44204067 SHA512 af7bc24cd676c977f8a6968659abac815cb0480f2f5dc7b587ae388f21c60119e063380fd06a6562dd24222fdacb98350d8c1e4d0e7ade5cf03c435ebb2aef08
 EBUILD gentoo-kernel-5.11.3.ebuild 2590 BLAKE2B c4b2474b3aa266eb0854c146e4d49cdfd909aa35b6ec1e8080ae02f6b6bcc63122d62337b0e94f300ed2f75e64f2e05bec128ca87ac7b9e16cb2798f44204067 SHA512 af7bc24cd676c977f8a6968659abac815cb0480f2f5dc7b587ae388f21c60119e063380fd06a6562dd24222fdacb98350d8c1e4d0e7ade5cf03c435ebb2aef08
 EBUILD gentoo-kernel-5.11.4.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
 EBUILD gentoo-kernel-5.11.5.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
 EBUILD gentoo-kernel-5.11.6.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
+EBUILD gentoo-kernel-5.11.7.ebuild 2653 BLAKE2B f7cb9a644d76f3c6dace7cd70e8817b6b3456d845b65b6584dd06f8c3c20aa5dd72c5dcce742ed26fa7ffafe16ba73525603daa9177f4601efed6aae5f7e996a SHA512 b1c1c5da79f5480f4b054dfb21cfcf1df8fb2e721c5b5ee1c0e9fd4d5c51b3aa9e1236729063e96c286a738e95151dde579c83432770712342bc938779d0944e
 EBUILD gentoo-kernel-5.4.100.ebuild 2761 BLAKE2B 5372389797ccad85d86d0d5f85aeebc4252ec61de616952b11a38ab92e185a939c3d7d6ca33812644cef968d4c75da52335813f67ab88949231db9704ce59084 SHA512 e25f274c6049eb8f988fe55140b6cda58b314dea3519a875256cdd09d159ea4494f706449d6b14206d08fd9438eeedb8aad9ac3024c8f4b5d41f84e6aa48aa82
 EBUILD gentoo-kernel-5.4.101.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
 EBUILD gentoo-kernel-5.4.102.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
 EBUILD gentoo-kernel-5.4.103.ebuild 2822 BLAKE2B 748748ee40a9974a98b8fd81b1fc15266fb576075817f6dd5bf7de0a2d3e593faa5752be4271dacfbd9899d83172405e04afe19c34d989c461d92d7f3f6c923b SHA512 c5152be1402d813c86dc9383d458b0d442668d83224cde1dafd6e3fb91b9a11310e75f29b8acafbfe504a012b88fe7b66493f03e2bb70ab5b09980b9b284f1da
 EBUILD gentoo-kernel-5.4.104.ebuild 2822 BLAKE2B 748748ee40a9974a98b8fd81b1fc15266fb576075817f6dd5bf7de0a2d3e593faa5752be4271dacfbd9899d83172405e04afe19c34d989c461d92d7f3f6c923b SHA512 c5152be1402d813c86dc9383d458b0d442668d83224cde1dafd6e3fb91b9a11310e75f29b8acafbfe504a012b88fe7b66493f03e2bb70ab5b09980b9b284f1da
 EBUILD gentoo-kernel-5.4.105.ebuild 2822 BLAKE2B 748748ee40a9974a98b8fd81b1fc15266fb576075817f6dd5bf7de0a2d3e593faa5752be4271dacfbd9899d83172405e04afe19c34d989c461d92d7f3f6c923b SHA512 c5152be1402d813c86dc9383d458b0d442668d83224cde1dafd6e3fb91b9a11310e75f29b8acafbfe504a012b88fe7b66493f03e2bb70ab5b09980b9b284f1da
+EBUILD gentoo-kernel-5.4.106.ebuild 2822 BLAKE2B 748748ee40a9974a98b8fd81b1fc15266fb576075817f6dd5bf7de0a2d3e593faa5752be4271dacfbd9899d83172405e04afe19c34d989c461d92d7f3f6c923b SHA512 c5152be1402d813c86dc9383d458b0d442668d83224cde1dafd6e3fb91b9a11310e75f29b8acafbfe504a012b88fe7b66493f03e2bb70ab5b09980b9b284f1da
 EBUILD gentoo-kernel-5.4.94.ebuild 2755 BLAKE2B 499af207ca80ab31469a3c17f87fa1ae41c9a63ea6aebf209d3b7f158d0d1c7cc59cf0ab35ee80c576903ea0cf1a87fb45a8715de253ddb5e419007143ceb854 SHA512 65ee2c28a0166387dac04d0e02d6bc2e1b9dfe246aead3c63b4159d8ed167de7ac894d05828888047f66e422f088f5872dd288d316887c9572692d5481bc68cd
 EBUILD gentoo-kernel-5.4.97.ebuild 2756 BLAKE2B f2c9c563700784140f6d08a4ada0af51a06596d0df0aff031f5eb7a65651002c6548649b3955ffd3f43b1c9f98ad54b0bc01fbcece8488cacd3f5830b61894f8 SHA512 ef0fbdb20992df6fbc4e7aa4629055a00e22647bf32a17c22e3572ac2f93031d85e14f5c602dff1cee938d1d44d74202b1b3e5cc584f559c92cec8e00ae98e6e
 EBUILD gentoo-kernel-5.4.99.ebuild 2759 BLAKE2B f24519c76a3203db697d875eb0b0a0782d97cab05866b25bf42dfd25502d36d26477eb7bd86f4cf231c90d8adbdb244e487e88a52de862ef796077a672c618a8 SHA512 a43f194f27242f2cbe04076a0534742b5b5cfe3d5f6d6c2b72281e3a2e918a1b42c54bf753d9bf1bb22021d51e861933124e618ba8b700955789d0ded57f34ec
-MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
+MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild
new file mode 100644
index 000000000000..0bfad9481308
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
new file mode 100644
index 000000000000..3289e86dc48a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
@@ -0,0 +1,90 @@
+# 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.11.7
+CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
+GENTOO_CONFIG_VER=5.10.18
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild
new file mode 100644
index 000000000000..103fdd6ce9cc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.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##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+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/dwarves )"
+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/metadata.xml b/sys-kernel/gentoo-kernel/metadata.xml
index b0b959adbe61..ff8c39d21f36 100644
--- a/sys-kernel/gentoo-kernel/metadata.xml
+++ b/sys-kernel/gentoo-kernel/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Distribution Kernel Project</name>
 	</maintainer>
 	<use>
-		<flag name='initramfs'>Build initramfs along with the kernel.</flag>
+		<flag name="initramfs">Build initramfs along with the kernel.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 045a809bde91..e3813b0b46f1 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-4.14-234.extras.tar.xz 3340 BLAKE2B 8dcae3715ac4e3df1131d3fe8c00
 DIST genpatches-4.14-235.base.tar.xz 4920372 BLAKE2B d8678273148f35251d70314cbb509f74bd6386d99f5cc85086cafb548a7f606dfff51f2a8b725020f33826880b8cb6617d41c4a7e74f39c8c18ada13f60b966d SHA512 55e3465064c1f036103c969370bca44aac146a01baa72e1490d3abfe3fa3e4ddc65347d06e855f5eb8f12558be36aec3cf2a70bcf986a467c1b7a436bcc5ef44
 DIST genpatches-4.14-235.experimental.tar.xz 6088 BLAKE2B 3297a4f659d5647bd9f12373830f2aca51cb4f5dd89d02ea22011fcb13376f2b2d378d93ea345d10736555d1655db0b2a73f00c25396092cccec10805de9b36a SHA512 9014edd2c04abd5ccdf38019cac0d2bfba8a4e11ef94ce7aeb1003b08c438bf0f5a23c611ed7ea1ce873f6b5fcf1c541c935104a1425ea6a7300fe5b9779d8c4
 DIST genpatches-4.14-235.extras.tar.xz 3340 BLAKE2B 8e02bbae5fd943875ef68e9e2b6c8346b54982400bc225f7c8b28cd8596c1c6a25e636307b6a0703945bb4ce89e23aaae571ebf8b0180cd9feebe57ae4618565 SHA512 e185dcdb70174339ee15dd14d2ccbb6ad8157630f43f21e1354ca0f1ba079fee80b88f9d67a278e74c5e0cb1ffb339f1a343a36b91925bb54cea4bb43eef9d9e
+DIST genpatches-4.14-236.base.tar.xz 4936824 BLAKE2B 69e3cdfd71c5ee428b6fbcf9f44a1fb3835bdbed12fea222c08d329921ab666fa005b170e46f36bf6cddcb34c10b04c464ed096b318c4155047b65f747987fff SHA512 890a4d5443189b955e68a763a4b423bbe540f35e6a59cf91175a80f82567ea36f68cf7ec0064b1e61856f318268843f1295ee2b93b760759261b0b461a5f9e0a
+DIST genpatches-4.14-236.experimental.tar.xz 6088 BLAKE2B 2cca690993a643568449e6b401a40af91e2e5ed7f9a3e8be8324dacbf63e3fdb19f00776f036cd805b5d7c1ac96951de5440e799e09d720cbc0504f0bc216da2 SHA512 70504b4fe357d766d5e7585fcaaf106389669b0f3f8f7b20dc3ef803c82381d3009b853112245d4252b5422ddfb49c5501220167c6711d3c5064555bad5b9d2c
+DIST genpatches-4.14-236.extras.tar.xz 3340 BLAKE2B 0853feef964c97f2c67e3022b010e945ba9a35d82eb0da7825e9b113770aa4ac0611c08c8e9dcaa7782fdecb1fc45edbec9de7089ad93b9ded5007be297b9e92 SHA512 13da102d782e08313a9b61bceaddee42740615c314eefe8ac50439c3ad89c79cdb792fe3fa33280e56f0384f71ef445d593efe02ae7d7cd4f837af0c9ecf30c1
 DIST genpatches-4.19-159.base.tar.xz 4174792 BLAKE2B 1381a2531b6297e1f76af70107c08a3b7b304177b14a1407ffc41a5851a4249ec4adf5ed00539542c97a0c8dc0cffdb20c3681b9da17409cd9d4ac711b353dd8 SHA512 e75991fde39f093c77b4e7f16aca7b24be47e1e438df7a60a97e0db7aa14ae6c0ed868685da0979c10ce9064839adca84c76a6ec87c1fbe41eed7a20788ca776
 DIST genpatches-4.19-159.experimental.tar.xz 6980 BLAKE2B 62605b1fe8ad86233bdfb183df2019dc4d6c74243678f5aad08167ae67b8e0dc45be7a33cae59a9c30678c986c9066722dd32ff18ee572d9ee5f7f2f51caae20 SHA512 240ecdaecca79bf417b080f6ea3dd2cad113694d2f49ae7a9910e26250f381721dcac0804b3e983272a5ea66cc1455cf94c668442e98ce5938868fea1913050e
 DIST genpatches-4.19-159.extras.tar.xz 3312 BLAKE2B 480dfb15464c46ff0cad7447476ec66535c6b32ea9ca822ef7f8911b4db7d389c6bb1d1b80811107afb77e290fd4c887ac1786a95729c58673180324246d655e SHA512 8d55a3f9e1516e32e95719a5c9d5c1018bbcdd8f2412b138a46da1419252d9e088d2f1071a5c44dea969bbf4d93461c58edd17ca1b9ef835addb9bd065eda259
@@ -28,6 +31,9 @@ DIST genpatches-4.19-178.extras.tar.xz 3312 BLAKE2B e65a26a04ca8318a54c8413ca92f
 DIST genpatches-4.19-179.base.tar.xz 4446348 BLAKE2B b6e1f064caf83c5715477424a20a16c1c112f60dc72c1e0e0588aaffc2e70c882034103146365c380eddcb31fb915984c43fc45b6488775e9ed5e51a63c91921 SHA512 aedb8a0ca292b41bdfa7041bce3195d81768ecc99a05a5343efdadf65314f3274d03ed4c5f5bc5dc0f0e0df8730c634c69ea1b48b166df03e70adf6f5a2b52ed
 DIST genpatches-4.19-179.experimental.tar.xz 6980 BLAKE2B cf692787553caf93822089618c81786dbd4e642a6a929fea5c349cb57e69828d3f39d8253b2b75e4bed04bda81317332bcd8123620a44847fa1bed24a16120da SHA512 367d6fb2511261e19ece02e9638340d4c0349ba231789a8cf8aea5dd865106a8d047d059cea0e02283852840625cd3b24b8e1d051bf80409055b03e10de2ce4b
 DIST genpatches-4.19-179.extras.tar.xz 3316 BLAKE2B 75b71b0e25545e28c838276676b70fcd90ba73fb34a04303f834e897cf2561e8f1b18c08e3a56d058f9f62198f0c3a9c0fc0eae0c36fc3fa699f66b238eefc04 SHA512 7c1e1d92a547cbb5837ed729cd37cc1f2b4441b1aad5663c7cc08222c39f3f79f991bbacb999be701ea0c397a1955ac50d85f0e49541aa0bddeebc83ec4029d5
+DIST genpatches-4.19-180.base.tar.xz 4470844 BLAKE2B a99381d6319235d74a17d91207bddd4f046f9879a74178df487e8457736e3ed9b192fa7eb1c827419beec3793ebbe0d5c8bb4c77998b22beceb74e0113eff8f0 SHA512 acc8915bddd1d4ff10542f62ab1acd4300fbeef0195de072e5b51677c5e159bf80659c00a65a9bb34fa23b8c6862e4ed49ccd791f648fc149bc26c3ff13b493a
+DIST genpatches-4.19-180.experimental.tar.xz 6976 BLAKE2B 0bb65283954743363723510956b8fa33021f49fc95a56780fc87c58518c6fd3787fda7806a9625869316e6813e3013accbad328f5f5dddc64c3a842b7cdcfd29 SHA512 e58a2f21b20040f5171a624e628895b725db0bd91b9de71abb281e1fe602c64c96b3a03c3d2d2278aef2c1dd51ab12c18d84e0e2f013cd3c473c0446120e11bf
+DIST genpatches-4.19-180.extras.tar.xz 3316 BLAKE2B bcd6fd1084bbf9805a3878ab766ddc51ed2c80de8e973534f46465a3cdf91e5b4dac92c8d9d2041b4a633f6504b45c3397945483d45003ea91bbac2aa0230cd8 SHA512 c654c5dbba30f44ddacb2a95660467e90f959511544fef93d06569c3b2eb5cc458a530be268b7c4dd2eb2b1888336dd89d3aa89e9b664c1c3b0bc499c74ac41d
 DIST genpatches-4.4-248.base.tar.xz 3950896 BLAKE2B 86c1c74e41d3b450079492d26ffb773e9c78bd69e128869ad90938adb35e00efdc55f6ae2eaf5d163fbfbc592f6556d4cabcfdb83b7c874203fa02698986632f SHA512 266467cd2a82e51ba8d388540b260e86c058de48761c083e6a6c3dd37f7e2c6b2d4a3901b030e69d0eb7a5b13b323e141764ea79a9d5637d7a3568c6672218b6
 DIST genpatches-4.4-248.experimental.tar.xz 83320 BLAKE2B 1f30185954ad3247e5cded8074f4a28350116d3ce1006b717de63842d9cd5cbef8241ce29e3ec52aaeb0fcd08082502a722ad2b618a26778d2553d9999530c72 SHA512 e5b5401e6a47c34a5eb495f317f4db9aac2c43676e07798d385b947db179e41e6e462fa0ef577100ed21a8a7491e7387df77a8c1e7250ce45e887e65a9d1bcf0
 DIST genpatches-4.4-248.extras.tar.xz 1788 BLAKE2B 3526b5cc83cb4c9fef68c4613d23c44acdfe84e89b46a3d50df90b91536077ce76973993eb6469947150faa2302ac1739ee9824264903a80edf8c24f763b7553 SHA512 e7e63456442b7fc51b3f3c1aec0512e0598d6e85cf5e0a2ca2c2046e86f754932900dd59b4f5510cec2a782f4c806c5b979cea8b13ae2fe455604efb478ac985
@@ -43,6 +49,9 @@ DIST genpatches-4.4-262.extras.tar.xz 1788 BLAKE2B 93b88b9905ce9f955719a356afa7a
 DIST genpatches-4.4-263.base.tar.xz 4065128 BLAKE2B 14f2238b6ba09865755b256941fcf0f2120e8ffd22ad29810b1dde0f4d640609bc1433aaf13d9954b9e519fd41b75b56393516af38f44cadba444817d0673cc5 SHA512 a978a33a31ed39ba8540e1de47d51800d189a4db02130c0bf266e8a5ab0f5b854811e786d6dcd0ff020b6d11b5e55eb0aba1f84e6e877a4823bba60ca302f8a1
 DIST genpatches-4.4-263.experimental.tar.xz 83288 BLAKE2B daaf234e257e3e90b8583888f9ebad942e3ad63db60d9cf4fc44496940ae977fd2a73fa29b768146673279f9b692f825c6281cc4120940af86e8b79882e0bdd0 SHA512 dc3de40e3ca496e0eca2dd060ad996ea02595ce6201d4657490dc02099863cf8ba4f9db8861c7700d9f57da6bfead44e53d7a7e21026c13fa30e7232490d7f5e
 DIST genpatches-4.4-263.extras.tar.xz 1788 BLAKE2B 2d475cd181608b3a024230a4b54375c841b759fc14338a820b18c9b918c20f2d96cda11f5b273b8a4d188e444ca28a86a3fb6ba5844f9d30e337b6268d849cd5 SHA512 a64c4276a6e84905ccf46f296b046b1ca0d8463a4268939fa52d3068ae70edefb42a7d52fe9c70c40051c20fc623bc00037dcd03414a13d2f18b2e19d69ff6c3
+DIST genpatches-4.4-264.base.tar.xz 4089172 BLAKE2B aa4366e0a070958dae1678c2a3197405cc9e69032db059fefbd0280e76ca8a2908aeaf63733c58e673e03819e9afc4c5e2dab3d545ddc07e8f06aafd0d2e70a4 SHA512 8584aa723039c8aae17965c8294d27e841dd90043727389e671306fa922328dabee6522fcdcea9bbf08cfe0c42a4c6afb011039f0472b2b544299f664f413ec0
+DIST genpatches-4.4-264.experimental.tar.xz 83296 BLAKE2B 2011c2572f0c33b1631e25a607dfbc6adc80c1086c5aaf078ffcd0f9bdaa12b9119bc16964a06dbb648335616be0b34779f1837b200d733b000bc56b28a3cd06 SHA512 033d41065dae21c281767155178a6379b6007d11fd87ce73fbe37b94bfac659be5849a62889518b2cd8a467a700afeeecaaf329d0f7320273d272a8c47384935
+DIST genpatches-4.4-264.extras.tar.xz 1788 BLAKE2B 53d06b6e4eab4446712820a708f19917e814d5d27af35bce44366a2b876743cfbf6201e53ef1ed0fca727eead3d32f9e7adfcf3534b4f75642a539ca659cddf0 SHA512 aad837df94a98288b8aebe37fecdad6b6a717d6523a7cb450762d1a9993ffa0ffa2ff70c25c2e17cf64bed52762aa327a76bb4b6b9aa36ba62731afd25b01ee7
 DIST genpatches-4.9-250.base.tar.xz 4423652 BLAKE2B 028223b668bc00d1bfbd4bcdd5dd201f9fab0c9a4ce68f5e107c1de83320c88865826eca0f38b5aaf25c96e2d66a76f0d305b73bd659197898818515275d48f5 SHA512 f10dc4626b1863177d1dbc5e1283c8848b84e6ab10b3208291a0679a3023c5f7d34cfbcc6091f7fcdb71e34f02afba3e7685e24b1f38730c88197c621e41fe08
 DIST genpatches-4.9-250.experimental.tar.xz 106372 BLAKE2B 409a0fdfc2246e57f461abfea86f76694ee835215e0ed816e1c445c2e5bb3439ccd47414315f81e9cc791f7206b12ce45c9f46892e9152341194e15d0a44a090 SHA512 63f8d3e6dd777fbb8ed0dad1b67e0405926fdb0c1e40d3c9bae63494de87a3cdba37e41f20cbd7ed109eba6a933125bc6354814f5539c20c377be449cfac3b48
 DIST genpatches-4.9-250.extras.tar.xz 3340 BLAKE2B 14cb6c6993c772cc8fd2a4a63f7fce94d850a926c74ac954aebf66e3bbb5db1c20001c264056a8f49561d21e754048963464226d56a0c10eb03cb59384420487 SHA512 a1eac658ade3bc0ecd6c98d1e0fc82f006e75ad4147ba0f2facc58e647bef731098527ff77d1d817f7605c0acdf3dd3f536464953fa2af27c32eba2863065db5
@@ -58,6 +67,9 @@ DIST genpatches-4.9-264.extras.tar.xz 3340 BLAKE2B 9fed5c4fddc6e2f012e402e932e06
 DIST genpatches-4.9-265.base.tar.xz 4575580 BLAKE2B 132ae0fc112829aa5f78ed9e3f4edafe71e2b3aef0dd58963a07aab42c616f9b91e913e99b5f718d1c5c4e3c83047709460f954c12c898c0bd321753692742aa SHA512 19ba49e3aac72c2feef33a456fc6632a976770a157395815d1c998176d1dfd141be524081820fff95e4fd7b9a072745fdf2fefdb328cb36cf19e4468e1ed2a0e
 DIST genpatches-4.9-265.experimental.tar.xz 106392 BLAKE2B b1b0699625e6d6557d66429899c29e19b8d94c7fff6107f467f591524b875e0e5caa760123b2476b9504c7cadbba97e0a9d896448a654f713fb721da2c10e40a SHA512 c2ec184adb049c5b5af55bc3d6d0ebc65c51c68720d27d6416024b83a190d995ff30f540fe19273e95908bd0265056b4b4a78c73b3e90c8d4eb94417b3373715
 DIST genpatches-4.9-265.extras.tar.xz 3340 BLAKE2B 8b7750505f549696ebab5260afc52bfeb631a54086ca4a7c346dfca195df09b8aa97bf1fbab31f88079f9baf7b2072c1758ecf23a8d32aa5860c89cf4917ba5f SHA512 5f8ec5ff5b100532fe47c5f6998bce0a0594835c7196e8d8c061ec28a81c148238896c5650ce32fdb680195b8172fdb0655c30aef42c96ce84f25cb3e6f6b4bf
+DIST genpatches-4.9-266.base.tar.xz 4593704 BLAKE2B dfbd39d064c282e6584683ec293da5466f8a6eb9d17e0351a49f29aa0ac7b75f7c1c1a4e77ba5a4c0475333f72238dce0d4dbc748be972c5674c06732dfb0eba SHA512 c98200348bd665ace5b0903891b35bb30e3de07c4cb609f89974c326fda6679dac040306e91e99f22482f1aad6f258ad10aefffce7410752d1eef2b8e2186fc8
+DIST genpatches-4.9-266.experimental.tar.xz 106396 BLAKE2B efd61cf7144c57f6833ec94f1412b9ab7ad3ce62813c4156a36b6f978d512aa476769e1a167cfabf7b1284bad55cc0a2b215865eda841b952efdc968583b511d SHA512 c16a4818fc11cc994589322368e15a681a2bcdb23933410fe95ece70c8b72333b753f49c79ce9a3b95915163021c3da2532bcd6e24e7d4af1cc741ae6d6fcfcc
+DIST genpatches-4.9-266.extras.tar.xz 3340 BLAKE2B 2b0836a128289214a3bb8cc8620ce44df17edc006c85c953b38204fcecc4d7b4b8439aed8033bd5dd4fccf27b27db6da7c13f17e9031c5cc5cffa0ad28f1b3a2 SHA512 cc76e304f97f9221d14fbd3935a72cfdede02ee97b4c46561f6bd8d6fbd1a244bd1879756d0efb9c91b523975bdc46214fcf1ce0c024c6bd9e12b4b073f6bcf4
 DIST genpatches-5.10-23.base.tar.xz 721640 BLAKE2B ce1bc52582180682df3a74f5fb03f9646140fee1b90baf018121acec281c565880494725df08701a56f46e33717a06ce820d21917700e74c0d57d6306bc6cb79 SHA512 44b253cf5300b1c0561e92306b85ce7b51f926dba58325c439f6383504a5bde06401086b03e1ae23ec961b2ff78f5b9933c794a623c1f29be5452db64a61ca0c
 DIST genpatches-5.10-23.experimental.tar.xz 17832 BLAKE2B 08ffe0326c71da03be2b79ed5f853bebd390c72309a693288fe25072439e7366314632173c462fc4f05f9414895bd36714893e4920c27dbda7964f6f0fd87bd6 SHA512 c52a05515ea4b262d628893b2c7ee92a83f7212b08435e387235cf3d7075bb522915e18a295530b265d6f20bfd5d4484198cf6241b944a85e1bbf94dca92e8d0
 DIST genpatches-5.10-23.extras.tar.xz 1772 BLAKE2B 71ccb1fcdb038c28d8e35c5f93a3956cfd277df6cf9ee0b65a1984044bc032fc979066fb1f7cc103f3065d83b72ca2a5f6d7df76a163630127858827e1a34b6b SHA512 3854ebd16b7dc0fc3c2a5aa40bd74bdcc1be1597bd4196b488e40deeed5917c2df162c1b27079f38c3792b30de7f100e90bc9db42fcd12cdc9d3647e12c84182
@@ -70,6 +82,9 @@ DIST genpatches-5.10-25.extras.tar.xz 1772 BLAKE2B deaff4896b8ce8ea5387ea49cde3e
 DIST genpatches-5.10-26.base.tar.xz 780252 BLAKE2B d3da07e58183e25210b0a14dc5cdb4eaaa4e0ad6e6955f9e99ff06b6575af24d2710a63781fb7fb3c9f0b142c6198c0853c71ab63f3ea1ff07c4eb405fad4cb3 SHA512 c5d73387e6caa2140f1e5c48763132797d98abae0e64911f0bf1bece03440462ccc793a2ed4ae5916235b570aace12e9ba7b625cdaf71a9802956f0ad2836c1e
 DIST genpatches-5.10-26.experimental.tar.xz 17812 BLAKE2B 37a68871008d76143d14ad2ad016c68da80c48463fc7bb1d1e8bf67274fd118295686bb7dcd9b0c8cf492828d05917e8ee05ade6b813e8f64346329613c3580a SHA512 1839dd0c3621f001d9024eeb38435003032512971cc070626cc12fa30508c68a01c7ce68ff1895dc601556c2aa33c646e4be3e92536f02727be3f8717bb17958
 DIST genpatches-5.10-26.extras.tar.xz 1772 BLAKE2B d6e02010a72510e5c18b80102f2383002acf45b645c34d35b31234d6da9ad7b38ed70837bfbb3563c9c3871121ec4638bdebeaaaf225b3f3c6d50dd30ba30547 SHA512 8e1c534b5160553f0fafe542953a3f229082cf541f744038831c2aba1cc061a8ba14713155cb98245ca99e62514619ab6969bd8f61c3886d65c65b67e410ff0a
+DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
+DIST genpatches-5.10-27.experimental.tar.xz 17820 BLAKE2B 3f40cbb5088f808e0d1cb2520c4fd0cce9df35acbb88597f4331a540ce9c146321760abc2f36ba7838537007a024ea2912b4fb5a27bd0f999c1a595bc44fb599 SHA512 f9392abd6302860ec48db313389ec18233c445b0b0420dc4c135cfab8d7fc3c41e564885565b639de4445b5d8d596a1c019e60fd84b74f2f43782a27e534bd09
+DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.experimental.tar.xz 6092 BLAKE2B ac1c5aa031e99dd332c51c44c05e00460bf2d1244ab6e00179d81c941b58c97c9aef3b8dd14ebc87e3b00f2fb4a393172d17e38121898850452ec3377ce02b7c SHA512 248d5a585d8963a31e3951a0ecce5c6b0522c32df14505bb6d7ad4fa69a9e00eb4dd5c31e561f13f14dd3aeac50db9aa2c43ff8dcb10cb363eba5af386fe8788
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
@@ -85,6 +100,12 @@ DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea4
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.experimental.tar.xz 6440 BLAKE2B dd939c3f624cc84589cab0c3772c72d232038c32eb9a61f64d927a3e1f1de8a6af2c0dbff89ff542ff5332ecd4a7fe6e526db446373b63dc6591cfc801d94356 SHA512 c9a3702767bee74ab0ab13eb1ac65346ea8edc62feea5992a4b6a5ee564c15ffd4c3d21299f50d1996cf59ebce2fc03a15927398b2394428fc78cee3b6fc22d2
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
+DIST genpatches-5.11-8.base.tar.xz 399768 BLAKE2B 13df51c5a4bf35b2a87a0a5ab86f94f8d2cb012db34b6bbc2fab65f4901a8066f00303408aa864cc735bfdded7ee27bebe476533edb8758b6c86b38d770f26e1 SHA512 5a0ce9facca4f5fe2d2d469e424cb35d77630151dd67733260eb759c43a549d63bf597de515403ef3ae47e020540d3aacbe52c28301288a2a4079a43c9ec4566
+DIST genpatches-5.11-8.experimental.tar.xz 6440 BLAKE2B 1e519e0bf61ff2fa6bdb0e1284df5da05f659351c94a2bd333e213e01b78d7205fdb104e40a4acbb3389ff853f5f918509ddfece1b8c1c0c9ac8a581fe6410b2 SHA512 7b5992cd43406f3f49ff928d0d58424e5115cbd53fc545b505b1551c255be7814e96547407f626fee9c049da7da7d7114edea6ae83c13dadb6c448e6f563ebe9
+DIST genpatches-5.11-8.extras.tar.xz 1772 BLAKE2B 2181060dc6ef787a5bb82d614774a576218291f822c968321744d0d81ac0b07919f9980cfb9b2f858f4551c2d84f7db9f58d6d85158cdca90454a8f17674ac4a SHA512 b507ec60456d1e95a28a4a7710df7b7187030444d21d9f65b3f5429aefd6851c31b2395ff30c76d257ab86e766d5bf7604befd3c117b624f02a77aa04ddefd04
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.experimental.tar.xz 69292 BLAKE2B 57127ef336047d188691d72db4aba2a9c0a1016712d2e3f73ffaead6050b91575f9b35d0a26b408647d1ed6b5d2149d60b57cc5856e50382c8566a577102cfa6 SHA512 47ab02d21d542e9ac9a56682a7352af23ed90992c8961a6804fd04a366d94c2b128182f353ec0f5d9e3dd218b5dae3c280733b81b34c2a9bcbd360f8ac41e8a5
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-105.base.tar.xz 3163684 BLAKE2B e11b77067fb714f827d68ca0773ae5f097a4234f89eb0ea5bb04ef6cbf39d416a676696a8a97e1473dbd36205b84e681f3b0e94dec8cdab5c111883a7f911285 SHA512 42217305887d22987bcc88565c02b4dfd864449c10726ce4e819c4b3fe8af6d2898fdd453ebfb95a45af90843000e219f5447def048ca52ac7c509219396c2cc
 DIST genpatches-5.4-105.experimental.tar.xz 18080 BLAKE2B d4840bc3c5d8256cb89df166bbaa9f1ed419f275348a9b88ae0c5f738df95f01f44b049f43cd70aaf85b2b7a7513cfa4bedf18ec5cf5a89c987ee511fbc7886c SHA512 9decef34bb9a5c4727a0ebbcd2d3038693589d0314baa9cd5207409f88264cf5db26402067990fa601859bb2544b0f317696a71067eed7c99c10498d8e1687a1
 DIST genpatches-5.4-105.extras.tar.xz 1772 BLAKE2B 049452ce9e48c45954a6f71218b38ff1adfea0b3e60452039687e860485dbb1e302b8d18595d64b9f2c2e3bf26d65ee747b876cbdf531745a68381b4cbf417d1 SHA512 d5b6915fc19c20fef72bcdb26a82d7e74d6c8af627d4fb50923a380514c6e505e2acd2d106f3a020a6508864d6f10451713346aeaad5d2f40088c4f36103ed5d
@@ -97,6 +118,9 @@ DIST genpatches-5.4-107.extras.tar.xz 1772 BLAKE2B 4f4aad8cde357553f2188e6962365
 DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
 DIST genpatches-5.4-108.experimental.tar.xz 18076 BLAKE2B bd1ff9b5e8b63c616b875b1171ae3be512b64bdc27861e9542666fccb454bde8143fe94166d288ae881dc6ac00649c0dcc740491d1c503126b3c2e76b99834c4 SHA512 be56216af1fce7579f0bf0fdc0fff7616b673fc8e154092f0740289162767e3996542c947207318cf1243337958fc0ddfb1390eb952873bf9c6a3adfe17df022
 DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
+DIST genpatches-5.4-109.base.tar.xz 3231408 BLAKE2B 3823cb07dccb45ac11ca7c6cd19db8828f6048c18f66d81f232048fba774cdec93300f4a3fc60262a4a19436349626c1acb55a0e59b2b149816460a8dd38c8ea SHA512 4598f94943024e64ae95e56c0d34e71420c1ee1f38db7ba2028bd52b493469f0380e81952ecfb22dcde1d16fc0c182d27c2490d07a5d7232426b22cf03b0ea4b
+DIST genpatches-5.4-109.experimental.tar.xz 18084 BLAKE2B c2e7865f71a1207b0b79f7546df6769f42e7129fa51dfa95feb97093405363995f75b343cb42bf5c8167bf05591c6c354e6366760645db9a67b3733b2323baee SHA512 cea5e600449c659b8c339ab8365d49f8fe90cd67712643bd2008e69848c073320fd04e213e79cb83bbda995db0ec729aec018a005de0bcf92a81f4858b2df226
+DIST genpatches-5.4-109.extras.tar.xz 1772 BLAKE2B a8a73fb000874269d37e9240600a2372213d026e74a1b5386ed688d9b35bc2535888a75aadc8760122f77d7b281cd859d3d2e0db31bb57078fa9abf4ceda705d SHA512 034f678e9d5b5e919e4e981e11d25187c97fc76cb787bc38fe1af3fdc6da6648d3e778c483cb1a57f862d69baa40ce5ebc1494bb945b95969985782bfed0044b
 DIST genpatches-5.4-82.base.tar.xz 2792480 BLAKE2B 39960646116f5f85ee657a29557d8fd9e809ae9bc60aac349c91e7680f2a0565800ba37a478573098dbad41b686336a058985d2925e5046fa68eeaea8df25477 SHA512 6a76eebd7178e2ccc522477f53c36f74e6fd691f87c547dffa2602a516ad9a6a01f05c953e12bbe6ba9aa2ce34b176a6a081a22da40c7d86855e5dfc34098059
 DIST genpatches-5.4-82.experimental.tar.xz 6704 BLAKE2B 4dcaa6977e25a2d9327d043a15115eba34a802bfa80d532ff2ae3c1495a861d4a4a85ad102e69558d247ae9a0effbf4628e8963f435b949eeffd35f735ea49bc SHA512 4fba72e9efc3dd11fe934be4820703f2f8268c5479dcdae1183104a6b1c2c22715b4529d6e8a4f65d8e46d52b12ab47e3d2eee8dda038af5cac7b799263e84d2
 DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf43c268ccb494db9eb4c18f4f59219f1a5d79ef2a6f35caee87e3c423b0fff1ef94a6d6477e5074397f78e4bd23b9c40d95 SHA512 bdcc7eb08c1cdb599e69b254f55685f7beec83f256518d42c31d0df9a4e1c6376c184145ce47d28e0b688d2166e139445ef5f9f284e817ba9f37eaf812852a88
@@ -115,34 +139,42 @@ EBUILD gentoo-sources-4.14.221.ebuild 734 BLAKE2B aac2d6c8ff97a2ce4e437f20f4c9ab
 EBUILD gentoo-sources-4.14.223.ebuild 736 BLAKE2B 4cfcc4a7d55b5fc1ddee3139c39b820263a61659a363b0ffa78ab27da38f2b9e05d1be45db3bba1ebcfda17cfe9e8a120f3d898e701a5a08bdba115d35a2fe75 SHA512 1eef646697e951ad9b1400f5af1cf2eb36c678be9d4579a7f247f72c04198acc7e23fe57d6959f20f14efea0cbf217f1c8d18a2d8136fea3aece1f8f2311c40e
 EBUILD gentoo-sources-4.14.224.ebuild 736 BLAKE2B 96fb2a3ee911b034ae7fdba8c2ee6bd6cc003ce0026e44208f97f01bff54e4905893713615f4fb5abf62b863d029f10138ee50ca8a7c946560f1944e1ef59881 SHA512 3ac2946f22ccf54428876597d843bcd1eaa18f36a2188be599db11f925b5dcf05059004daa50c5f396ce570345f6037f502c096ee8a4840cbd27371f009b5ee9
 EBUILD gentoo-sources-4.14.225.ebuild 736 BLAKE2B ca32b45cc8bc8a42f354317a214be06eb5a7d12140eb4284268cf9afac6abc7700599bd3880d509d68ae7b293d39507e894c7bd6261376114ebd53c73cc349ed SHA512 2faabd6ee8d1e678d9cc6144cdae8598cd5af90ada168a3b8812f4b7766a44b493f0ac50702d85c83507277e9bdfe947f98f1e0b795d90e37f359f3cd0585e44
+EBUILD gentoo-sources-4.14.226.ebuild 736 BLAKE2B fa159440db967d90c316ebf6e8e6ea7db61c6250b0a29df83a1bc99866baaabc2041d6ae9af971799340547933c4ce4624239c1d4d7cb3ac6f52d61dd8cea342 SHA512 42a9c5ae55903310a27d972960ac83f2ce8b27ab8b85f075e6e407933319188eb178c4de6f042fbab27d0f58bcde33ff8d45332119c956011195a67fa84a0604
 EBUILD gentoo-sources-4.19.160.ebuild 730 BLAKE2B 0f6d5e2192b4e498e68810be15a45e11f771d15624188bba9f94fd2c202a369fbbb0065b4e281a498398a11db3909619401ed4be198ac93835e734c1d0f902c7 SHA512 f5c999c258e79f7405743ec86164d118f953cad09eabc5e7a63aac8c4a64590820842a060d87935f4ac39ef1068b80920758496e33e41727a846dcd9d253540e
 EBUILD gentoo-sources-4.19.175.ebuild 734 BLAKE2B 623bc78581394fe47d6f84aaabf2810a19b3b1bd1c433433d035d37f6ebfc62721d095cc985c401060c8981162f440efd40ed04448025c641284f953546526dc SHA512 75c1add0a0f0cef18b79922dc9ab73a576a338b1038c2e11a3020e5b085d52dca6192d3475b04df6d98c9897e2205d6747f7c863dd0079133b78734564b80a8f
 EBUILD gentoo-sources-4.19.178.ebuild 736 BLAKE2B 16097f53c86f08a8fedc0ce6f31b6ab95715f7624c80c4b243834994aa41bda06dce6f6ba955355fe0f51f004d4ea42113e08457c5f9eaca54140f6c05be92cc SHA512 fe5dfa62c1bc98f1e3d3545ae59d71bbb00b4fbd4dafea4e82604f1a8f4f9333d4b40e6488a9b6e88d65751187edf05f46d8fa2c6b0ce4873d8d54df1f42c7fe
 EBUILD gentoo-sources-4.19.179.ebuild 736 BLAKE2B 9fc6fc17d640add6ee3781e4bfc4b1081991ab8f6d15b0895ee4cea4c56f3da8548a67e53f62855c2ae4f03b0eddda1c7be048a19b1bef2d25e36ef783e0e8cb SHA512 1feeec3a4a54a0e800be4f577a3f5b5376c65ef16243a3610d091296de1b76645f2e937a0f37aecdf520c5b103b1e060bb91525731c6a92781cca7c37d46e365
 EBUILD gentoo-sources-4.19.180.ebuild 736 BLAKE2B ea2000c1a4e8fb32b695e1624d33c3af9cb522749afcd04b37670646f3b19cd3ecd9697b923672eba8fc73847edabcfe7154d240f95313972e9a28d6383fafcb SHA512 36a3f94391236acf48798f5d10cf86aca2dcabb1b8f157eceb5958efb396acd6f7da296b9047a842f75f2eebee060645e3421c365f3b547c3b366a0b30f0629c
+EBUILD gentoo-sources-4.19.181.ebuild 736 BLAKE2B dc79baf8ba9621fa5c1871f2afe81c5ddc8f704d34c556ef0fe683446c69ac2c7ff5def52530764d58489c0cea579bedf26db40323aa0ecf81f92418ecc6e98e SHA512 2f29d08cee84f53cf31e9215ceb36992c42fddea1352c9f0f3a91b4e150c4cb16dfaa6bbcd1b8f3c044ee27d7bdb2c55ef35addeb144a07d809d6f7c933a7d8e
 EBUILD gentoo-sources-4.4.246.ebuild 730 BLAKE2B 90022ff31a64beb6b5a457937937456482d283aff660e14dd96461d62289118bef3b95103f2c281efa509ccafde8cdd4939c9206a8fa75d7d0e75734c991e06d SHA512 425a1604fd2bd7da862dbf4b110083e5bfdaf391574dd32b3a990c7ed67d2634fa7a9dd34135ea3582e7aa8c27b201b314e5aa9bda7806de94421a235fe5cb7b
 EBUILD gentoo-sources-4.4.257.ebuild 734 BLAKE2B 2675e44c3141d2cbd5f36807639d3f74d90722dc4fd046687657c55a57d6a38cbb8e20a4181782742dbd6e1e09dc1bfe6c968c08569237b079740bb74ce974a9 SHA512 204369e6df1f2c15c6f27b2a87a75cac80ba5d2955ab0dd58e1b85658c7e1462598b53a5d1472f453cd45ece62139bd659bef5b306384ef8ae96b2f876de7ad2
 EBUILD gentoo-sources-4.4.259.ebuild 736 BLAKE2B 02c11a5dce7daaa76fab858dc48b91b42fd0b94bc1e6d440270fa8a7a52f8e7833cc0d190b5f9a323c9d10182ac7cf914a769bb277bb1ace3245b7d2c5bca25f SHA512 55c1692b1b45913b35da83e64803ea1a65771d08f2a8c50d58e673ccff2b2b8002d9cc60e6eb25a2272f28dd1dbd42f6e76909589c383d572df92d80b021da60
 EBUILD gentoo-sources-4.4.260.ebuild 736 BLAKE2B fb9681c63e640d9ed92fb7c12784357376e3c75af19950362335087f1b6ef1d6aa8430a0aa1e728f5a92377b38e188d7d2e28b4c82072279abc62eaf8e181507 SHA512 7e76abb268006a88bebe9d57dc3a358b1656c0b5cf707963bf1b92ed029e4d0de4b1fb58b352091c3929a2db426490af52a9a90574eb702d68c623533a0ae3ab
 EBUILD gentoo-sources-4.4.261.ebuild 736 BLAKE2B d0cc05f0da9ed99695d650d8a3bc58f9ea6a8b9a0b4c9698e22ed6a7353586f666e3c890a62bca3692ca848a0af0cf5ab16adf083b1673e547fbcd576cf09214 SHA512 853936180e5abd60086966abac40637e0ce19266aab3163dba7e58322eb3caecd02931c4d4466e63faadfb0a7067f86159a4fa6304bc3c0b13176d13bf13fa3b
+EBUILD gentoo-sources-4.4.262.ebuild 736 BLAKE2B 13afcefe059085662fac47a0fb9c286ff90fd6c9a5ec5c1a0414c71bf41f8c15766a2994b6c7c89610f63fb9ff1e66dd4e9cad2520d590fcad4e9859232b8fc2 SHA512 d698bb2c2514c3ffcdceaecf40f758a55118909c459c21dbc11d26c3b9600661a04700fe4a7d703d3cae3c0eee926d5a74103c85252093b8e943e1ac72c28f28
 EBUILD gentoo-sources-4.9.246.ebuild 731 BLAKE2B 1b290e2f27d5b166e1ee796cb50f2997def85ebccbf67f36665c2f7f82bc4339acd4915b4c9708bce2d1c1ab4d2a90d1ac134f45328745142d2e28ab9eaf8c13 SHA512 40a422d703a6fad87ef05174a77f50e795b55a2ce56ff4bd48b180f1bebe84c3749389aab4095ec452acb89518e5940e956174e866093724125ac0eb68859ef9
 EBUILD gentoo-sources-4.9.257.ebuild 734 BLAKE2B a6289691876cd3d4271e69ef30554b8c8c56bad9a25bc40f91dd145d099ee042568960a602a0dfc40678ecb01c9f20f1c6b7c24cb4bd385bbb0efa51d0c35736 SHA512 b1ca916f38d32174bcaea70ecf029767ffaee5c0a77b871ae403e4d2c5b10ca389caf0b7ef3462d380973af13432b7b077f3f44aaed137ae7a4c89cdb2eb77a8
 EBUILD gentoo-sources-4.9.259.ebuild 736 BLAKE2B d0cc05f0da9ed99695d650d8a3bc58f9ea6a8b9a0b4c9698e22ed6a7353586f666e3c890a62bca3692ca848a0af0cf5ab16adf083b1673e547fbcd576cf09214 SHA512 853936180e5abd60086966abac40637e0ce19266aab3163dba7e58322eb3caecd02931c4d4466e63faadfb0a7067f86159a4fa6304bc3c0b13176d13bf13fa3b
 EBUILD gentoo-sources-4.9.260.ebuild 736 BLAKE2B 13afcefe059085662fac47a0fb9c286ff90fd6c9a5ec5c1a0414c71bf41f8c15766a2994b6c7c89610f63fb9ff1e66dd4e9cad2520d590fcad4e9859232b8fc2 SHA512 d698bb2c2514c3ffcdceaecf40f758a55118909c459c21dbc11d26c3b9600661a04700fe4a7d703d3cae3c0eee926d5a74103c85252093b8e943e1ac72c28f28
 EBUILD gentoo-sources-4.9.261.ebuild 736 BLAKE2B 2a1de34cfa9db8550747f5d1de56463654fded2b9e5d64c1bfbd3806223a2e3431d4da928c812154a1a3ecf1c5185df667a69ca873f1b16aed03eb2a06282f19 SHA512 2a2a0ec78715bdf5ccfa99316bc51dc8a415e218cc75293edfda012096bf979447e11083a12bf9a916fe2643aac08d70a38702a1cc6ca823ee68df2ea8f10634
+EBUILD gentoo-sources-4.9.262.ebuild 736 BLAKE2B 16160ab70f7ab33b707e9cb2056684390fae03c4c39b9087f302f7e653bbfcb99abb95ab41200c703f1d0422ff83222b2a51fc1afe3741d4f43d899be82f1b23 SHA512 9204d0d9cbe7aa10d01aa07f10cae93527437bfce730167b9b3d9dd0a76e007f4bdf4939b1ded937e7b925bdb5f1eeb0ba695139a3fc7d1627dfbd2f0dd8fc1a
 EBUILD gentoo-sources-5.10.20.ebuild 742 BLAKE2B c5eed799dba9dd05f4ef88d1eb88c07e46795328589f758eb684e021941a33ec2f45d40dd7d4df19c936958b89c9faca54a47acae80691385ec50b8e130f2397 SHA512 cc1b3d8b7c2bc9ea88a9cdfe642f8c19673545bdbfee97f98519022dafed4f74c61361a93e7d94ec2e29562058e5bc378db67a7d9ae406fce197eb0eccdae3c9
 EBUILD gentoo-sources-5.10.21.ebuild 742 BLAKE2B 1f0900e3cf988818c20b340f3e254c77bf50695f590647251ad15076db1c71e35fd266358da0ef95a712d0020983048313a12f8e25d33137d9c421eb222e4772 SHA512 50d40dca1ea5d6bf33fbb17bf7a3d4e6cf324c418d7bea881ba1025ca4a2a0e2b51897f09ab1a21f81f16be2da0013d1dba696b55d695800a16f61a41490e69b
 EBUILD gentoo-sources-5.10.22.ebuild 742 BLAKE2B 28181ece1f4794457ba9063cf8d2198aea024be0e485f525f9c36ca1910fdd644d6a2add0f473ac76d03f7c9cccff00de7be39c7a3f48da0b43b71ef5b285f85 SHA512 2330be5f5b154f72a161480bda0dc7932c1e001b38e0f09ff1ee4821783ebb07e6e8762d74b18fedf2fc59ff181bf3af540bcdb79c8ef07ac549d70b58a24b28
 EBUILD gentoo-sources-5.10.23.ebuild 742 BLAKE2B 323484ece6b0c5529bc9c4c527cc6b95a86fb0dab58856cd7dfeee22cb534e7d8900cc952cc32686c2e005de367c32a654f9c7155784faf57bf61a46f594de64 SHA512 104f56f9ad60457a2af483796e215cee919987be4596dd3dd787fc130ceac256548d2941c5aed0ee0aa8175f2920d9711556b8af9326b6063c5ac4881b99c5d6
+EBUILD gentoo-sources-5.10.24.ebuild 742 BLAKE2B 573ad3143238e590acb0b65baa18c48566291c017741f1d116371543d4a91bc4342de454f393a94ac6e738a63e096fe295acb2515238f0d2ee11188bbd477f61 SHA512 b74799d8e57d8ebc6593fcc93c94aa932114f63485f0ddbdd8b7404f6bfa4ad6d7473741c5677ed62b563fa3dfcc30fc4146f148daeba9f4f61c4a54a9306146
 EBUILD gentoo-sources-5.11.2.ebuild 741 BLAKE2B 13c39d4121588e1eb4f810c40c44079e36f7831abb953f1b381cedb297f179096a6935ad3a1be13dfa2955ad233e716d74568e3b3fe4e3bbe8533856d1d9dd44 SHA512 740f502285d2c600a81d8ea51cdd877be85d480191dea6956d1c5a735d65c92d2126bf023bcd512cf849bf1027eade4efdd7c325d5c830b97d5b04679528ba59
 EBUILD gentoo-sources-5.11.3.ebuild 741 BLAKE2B 768d81f1d14b3fbd818745030a355177c89e901fac5b3b016fff6c719ef430298ff1f215fba9cc88521d38f70f41e3d83bc0fac1743d950ade9aa2150339c8be SHA512 ba1fbec8961170dbe522d56c0f2645a8b029f2700a0dfd808690808bb1bde75c3faf90e09d19fbf32e331a086829965ba6feba6895449629910d7f853978914c
 EBUILD gentoo-sources-5.11.4.ebuild 741 BLAKE2B a54555a526ed9d1d71c06bbda7e0d4b773ae59062546f900dbdd497befbdb1ee3effbcf248ed1937150cf42c78096aeb262ffaf77fe96921231cc343106df4bc SHA512 b232f171ab7308b6705ad7b5bab6214fd9f26b0de9641e5875a78246cf0b64d4f4a74937e8d1d18d1ef4da0d5994f2763fb462342ce401a8532a8b6644a27a70
 EBUILD gentoo-sources-5.11.5.ebuild 741 BLAKE2B b90925d645449a5f12006080c7661c2300c3fa0044379c96654b53f4a17be8a02315a699d4b5c692d902cc8e277ab45e0b8eefbc10d5ef65649197e5e16621bc SHA512 7b76108dc5f8cfd155d3d923906d22f611cbd2eeda27dff8865e9eead1ade3dd688e5dc97a007af45f8dc63db5ecdb104123978ca9b020b4f1a7807e54f34c3f
 EBUILD gentoo-sources-5.11.6.ebuild 741 BLAKE2B bdef5b26fab5342b4d0b0520e6cffe1fb786486b5d028fa9f7a71aff335bf0a9888a55d63661be9fc024a8938f6b83383b57441e91101d2b91b6922f28b1fd4b SHA512 8f0214f581887a2ef5a080fb011cf85ac9baab46c2b8fa15871b90f036a36fff099e839879805e9b4600c449e3cfc6cfafd766708b48a15a7a889792665d5e18
+EBUILD gentoo-sources-5.11.7-r1.ebuild 741 BLAKE2B dbb6301bac6b43e08f884c1aa6902bef8353d6c9e5e9f7222d76ebc3ea1d89f360b4b071925fac565141354f9a5fea6cdfe3961b19bce5fdcdc507e5b2445e36 SHA512 a15a14c2a712cbe3206c1cb11e6fc7e7ebb86e887cce0dba1872c597fd640fdde6bd73a56cb35bb161829b2195842f6c011844acdf6d3c4da5b487aa0358af3a
+EBUILD gentoo-sources-5.11.7.ebuild 741 BLAKE2B 13a5181db2a567cfc3612769bcadd2615cd2ce980fb5bd3b481782f47e767b850367ecafaf2a187159d74fbf17ca3c5ea97b443b9d0405c3bce3237a8d302937 SHA512 401691d121ded72ae783ce88a34ce90fb331c896543ff7c36adec17c9636815eb6047074d89847aa416d49f65d842bd0a1d593734bb3cb0554d9bf129e58be41
 EBUILD gentoo-sources-5.4.102.ebuild 736 BLAKE2B 6dfdddd1a7ec53ca8ac0a04621c5fa92257c0ce9d84a664a1c2302049aa88f6bafe134fa962f1ad20a532bda6cf2e6c9147c28143d063d8c4a8c957f425f11e7 SHA512 5df0f1a5e06ea232d7a1e7bb2c9ad2a8e94c53593db5fbcf2b03a4e84d74fad4417046fdb5977726aa893e0984c6a710ee20b387bdd75d9c7e02ade752b9c855
 EBUILD gentoo-sources-5.4.103.ebuild 736 BLAKE2B c0ef4a6d05b1391ef6d9ae0f0c9f59acc96fef63d7336aa77f2085d6dbcdeb30274a204e3767f10c6e96dedb0c2d7faced133a0c99664c49c6e8ee312be213aa SHA512 56c995460e636cf32d80f8de08d7db638cd15edaa08f017b8e233f0991bd27e06436fb01d1569dfd232f57d79281f7a4c98c98c957856ab4846b667a931acc14
 EBUILD gentoo-sources-5.4.104.ebuild 736 BLAKE2B 9c4b444b9a7ab4828df5719af96c623e10e2b90c3cde0524eb088afd552d62a9dbfe6d246e9b744c096d6953e6d58ae8634bf17a89766b2d8ab3e36b31e7192a SHA512 b10bbb1ec26480da5802a9748d065ee48cbe27bbec573b1b3fd367fd71d660d92ae18409f950e6594f8d30458bf5466fe1dc184fa2fa3f1f9b86789a033de148
 EBUILD gentoo-sources-5.4.105.ebuild 736 BLAKE2B 3c99457d6fc1be8c1b8b13b1de02435c92f1bbd60689d18844076d78b308cb9fb891450798ca17bc33b5d1289668436be0213953aaa8b230bfaa547c0f5244c5 SHA512 14a7fca053ebbffe89081280ffc4142bd8c2e41049974a943df0b37776a3aafbca4e17897e1a8cb55106c28d48b10e6d997f797346f776a99f0fe4d742c08299
+EBUILD gentoo-sources-5.4.106.ebuild 736 BLAKE2B 9276ae86d95f6ed2892771ba12c66d0b77d34c617f07e8f66528c7671c229a4ba07a251fdb994b5075d65d32f390a74ec4f8ee2698c19c34ef9ed5b9be58b221 SHA512 045d8986f715772bcd29793ab01351d43bcc2b9537d444c241fbd867b84e3175175c4ba73e6f33978a60f64bdd16d7e3c6469685465274453866b7181b7c2052
 EBUILD gentoo-sources-5.4.80-r1.ebuild 728 BLAKE2B b8508b181c50047c4706e7d4c2bf63dd38baa72549de0db0efd874644432e06e7b8d3b6f3fcb5d3e06f5b74d9b85bf2c799ca266718cef65ebc9799f3822de39 SHA512 69fc4f00ddebd7493c8481d8ef3e5f773356e49bb43b9093d33b5fe243945fd5870e33ba33f06aa9d7990a0d7f5e127165ef99510c202f032183a9bde51e29eb
 EBUILD gentoo-sources-5.4.97.ebuild 733 BLAKE2B 9d1b1a56dc1e61273732315898999f0583fc7a5785e088b7b34a0e1c822fb016476cee5bbb348c3b2bbdc4c8a139da26a3f2ab4d867431ff38ec678c0b86ce84 SHA512 0a7bfd516c978a4ce5500f39a354d6983bb544584bf5ca8a4f49d5426ea3fd379f03d3d4e2099d3c45fa6ab4709896bed5146fb126af3786e6ce1c524730c3af
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.226.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.226.ebuild
new file mode 100644
index 000000000000..1e0a26d3818c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.226.ebuild
@@ -0,0 +1,28 @@
+# 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="236"
+
+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.181.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.181.ebuild
new file mode 100644
index 000000000000..b85e7eb79387
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.181.ebuild
@@ -0,0 +1,28 @@
+# 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="180"
+
+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.262.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.262.ebuild
new file mode 100644
index 000000000000..7e67c0c6d09a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.262.ebuild
@@ -0,0 +1,28 @@
+# 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="264"
+
+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.262.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.262.ebuild
new file mode 100644
index 000000000000..8c4486c8a5b9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.262.ebuild
@@ -0,0 +1,28 @@
+# 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-5.10.24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild
new file mode 100644
index 000000000000..067633b0bc8d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild
@@ -0,0 +1,28 @@
+# 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="27"
+
+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.11.7-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild
new file mode 100644
index 000000000000..7af695b24846
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild
@@ -0,0 +1,28 @@
+# 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="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.11.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7.ebuild
new file mode 100644
index 000000000000..7857bbd871c5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.106.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.106.ebuild
new file mode 100644
index 000000000000..95fe19cd549b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.106.ebuild
@@ -0,0 +1,28 @@
+# 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="109"
+
+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 a5800df386f5..d25020c0be06 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,6 @@
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST patch-5.12-rc2.patch 38085886 BLAKE2B 936f291c72b0befa6daf3f3070247e94a2e5ac14857e5a4053f99b5b4edbf1093f47b01a4bfe2884bf1461f0f67873b48b3d352493909d4377a766a5b05702a3 SHA512 4f92e162d8869045dabf245ab3e1a1518291b9d7fd5c27039dc97c656a15da1445bc9786746ba186180898abe8edcb52bab6e122119762e283722b8be19b5254
+DIST patch-5.12-rc3.patch 38689504 BLAKE2B 25962d05cfd031ea45347f339da8dd206c38ee16c78fd5ff39edb564474b11d4321e450904f9db491f62bb6002e338ef3136327d656c028eaae6f8a3b9207229 SHA512 585a883af66641247e3a44ca56788dc5afe5a2f3a8bd0d9aaabba0324cbbbd4dffdad0d9bc65e30f77903c870985bfbfe1a3283cc709b92417f89d2c94ab8f16
 EBUILD git-sources-5.12_rc2.ebuild 1172 BLAKE2B 6c535e27b9d7483225a9c5b505a5ddd041ad3d74b3ff454c8a5e665b7b9f058126979c0033b8b49debe7b182ae5ed24e68c6b43744b9a50627b200d08cfaf57d SHA512 adc71a0be27ed6d0f8df16ed8e7e01dd528d636edf42d1a1168ad983d587fcf14179adf589cdc041dfaad6c8383e05bd439147792030425b2df0e4dd0d6fa4fc
+EBUILD git-sources-5.12_rc3.ebuild 1172 BLAKE2B 6c535e27b9d7483225a9c5b505a5ddd041ad3d74b3ff454c8a5e665b7b9f058126979c0033b8b49debe7b182ae5ed24e68c6b43744b9a50627b200d08cfaf57d SHA512 adc71a0be27ed6d0f8df16ed8e7e01dd528d636edf42d1a1168ad983d587fcf14179adf589cdc041dfaad6c8383e05bd439147792030425b2df0e4dd0d6fa4fc
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.12_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.12_rc3.ebuild
new file mode 100644
index 000000000000..841923d20fb6
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.12_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.11"
+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/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest
index b1f4fbe07887..d970f3607768 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,5 +1,7 @@
 DIST installkernel-gentoo-1.tar.gz 2308 BLAKE2B 94d30463445cca4ccea8b00c61dd9f9f89ea4d6f2185e5c1355145300b001fbb624d2e06c9707ecc79ddcab8609725c34239e00b5d80bff22b10a8bc28132916 SHA512 ce33b1958bcec4ed63f812b00471a49ecb88d0149a4e5ebd283b412cc3eafc647477bf84ad21c066ef2602ee06a24ece08fbac85cc815fae91b0bb43d8db8013
 DIST installkernel-gentoo-2.tar.gz 2339 BLAKE2B 0c9999a4688fac9d27774bc30b7529ed01d9598a73283bd508265a9c694921d7a7974d0d9cda2e0c52fe247b7cbce53918c7b3271fdd01beb150097be0905aec SHA512 157e5c525c7eee1aa79027b847eb938700197abad087ec25548f6cfde227720936d1512070549993d6db0bb51dcef1bf00156f2316b415fa00e001ce1828e471
+DIST installkernel-gentoo-3.tar.gz 2340 BLAKE2B fe5b09ce1423be506907ff68aca953fba0c991f1fe94f91bf537b5e38a606f0f2e541758bc627e244b4dbf5960c02d13dff66fe6e4126f9cc8ddf4b0ca5980b1 SHA512 9ae377e95dedd7af2b75a9a4b572e3417e6bea0eb12fc20b837db800d0fea5f97021aac59504074822382579423b2f19a473f6080816ae9b50610a5479488724
 EBUILD installkernel-gentoo-1.ebuild 705 BLAKE2B 1afeb35d535d8c65b6396a80eb5cd40f1b477e9a846b7c4cf7ad7c0afa455a9039615cf93407b1b3d206d056dfee20bbf96a7cc030f8a250e72d70c00e26c8d8 SHA512 5307de0bfb239b499fdd151b7f2be6f28f36cddbb9ba25e635e81503e5fb38bf85a5555ff063b84ba2ec83c8b16e71b506d7b749ae1c5859f9280e9590789b73
 EBUILD installkernel-gentoo-2.ebuild 981 BLAKE2B 89892c23292210408c69e7386cc32b8e4833980b033c9bf76303eb1b6775748bf42b4402ec3dc9080efbc7acdf5ba2a4c1f7c0cce8cbf1aab4e99f939b60d95a SHA512 5e54374c830532f4dc6ad57538ac2ca8da7c868b301ac46c3992e1e66f275a8c514482e08a1718163b5425b08188812e15eff667aa550c762088a27dce7ea7e1
+EBUILD installkernel-gentoo-3.ebuild 990 BLAKE2B f6cecb721e9070bc1b45accae07ac0a7d67f1c2419bc017f93fbc236169f0e175f88f992df1d65c552c671cede8fc763e9609737e2c7830880936d975fee2f46 SHA512 e1a70f39652ca6f230244e7f15fa1f7894096f68a93d3f3bdfde51658ae330fe8b52c6658d59e81872759997b0b405c0a52382f653593970ca57f5310cca0a0a
 MISC metadata.xml 266 BLAKE2B 07f7a78e2144dbbc8dec8ce2d19036d908f1cf520e6ea7b6b90c8b5e370a14421e80d502beb02a4622804afd56a2de75f4784eedea9af7f31bdd55db961ba223 SHA512 a9ab3d1f315fafca7adf0b5a6f34174154a483b289fec3f43f2b4f09ed0d7b1ebdf0b7068a96f0bc38a07460e42fc15bba02050ef17a1ed5ede8457d5fecd56a
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-3.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-3.ebuild
new file mode 100644
index 000000000000..42e07dd7a535
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="https://github.com/mgorny/installkernel-gentoo"
+SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+
+RDEPEND="
+	>=sys-apps/debianutils-4.9-r1
+	!<sys-apps/debianutils-4.9-r1[installkernel(+)]
+	!sys-kernel/installkernel-systemd-boot"
+
+src_install() {
+	into /
+	dosbin installkernel
+	doman installkernel.8
+	keepdir /etc/kernel/postinst.d
+}
+
+pkg_postinst() {
+	if has 1 ${REPLACING_VERSIONS}; then
+		ewarn "In v2, the initramfs filename has changed to initramfs*.img, to match"
+		ewarn "the default names used by dracut and genkernel-4.  If your bootloader"
+		ewarn "config uses the verbatim filename, please update it."
+	fi
+}
diff --git a/sys-kernel/kergen/Manifest b/sys-kernel/kergen/Manifest
index 142c8f4c3049..d8695bc8d0c5 100644
--- a/sys-kernel/kergen/Manifest
+++ b/sys-kernel/kergen/Manifest
@@ -1,3 +1,3 @@
 DIST kergen-0.1.5.tar.gz 165689 BLAKE2B 4e6f2a9f1682ed89cbf6f7600f49364cd45a25467ff18954186b8ebb9009a6ff911ccf926d787f998d393327ee4ec0958a958f3d9436bf2a33a29c2a8ecc7830 SHA512 b0f46d1d6da2c7662e486582c787cb88708244089600f1fd2f264afa8d0264fccde164cd12afab07956a8ddaee9c81ed33919ad3cb58c73f52934ca2f8b4495f
 EBUILD kergen-0.1.5.ebuild 414 BLAKE2B 8fd0f868a71294dc6899730812c1a2f309853c49203cd5908c70a6d0e8af20d5beb9e9b2032442dc60f6043d7a7134b01e4494362508e8742fda557f3289b44a SHA512 991815499cf3d4c3581dd5482d8d75d9fb6afb44d24ea523df8e5b7dce662435f6c84c45d3b506393cf1530878128823403ac35221678ac1e6593a14b43217c3
-MISC metadata.xml 464 BLAKE2B a2ca7309165f1a6e9cc237eb8e07a49a485539b0536932293cdb407e623148555f25cb5cdb47513b998c0f9a2180b51f673acde31edabb84b55a2d0229164d0f SHA512 8748028a40eb83217439908aa4d4d70472f6784c0cd1305ed249bd41238ef8f041377f218887a98d3411e8f375a7c8a170f8c6b41dc2ed70abaa1037e6e9da06
+MISC metadata.xml 494 BLAKE2B c80f0132296c2ceda00aac298f31804dd3bc06fcb2c3de096d2f4d72b15902512f08c850e4c844aabc171721e6eba6de75e4b5d4289fdd329847eb727019451f SHA512 64ee5db7bac86dcdf8720a7b85c52fcbef3e9c086c94a30b8d473dcd0078199ce477af8f889ad0a8cc7a474d2ac50112ea7bdc8c1f72f4fd7cff7377d33c6d8a
diff --git a/sys-kernel/kergen/metadata.xml b/sys-kernel/kergen/metadata.xml
index 83085da60e11..205073431f21 100644
--- a/sys-kernel/kergen/metadata.xml
+++ b/sys-kernel/kergen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 2ee6cc332559..78066c90884b 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,6 +8,7 @@ DIST linux-firmware-20200918.tar.xz 124581736 BLAKE2B 1541e1afcf52dfb03e89a1d296
 DIST linux-firmware-20201022.tar.xz 129328580 BLAKE2B 8845fa18aad56a1164a0ba63533bc44f728e0b6c207cf9c695bb432bbd33f3740f3d10958f2fd4cad9f45653751819b8e8eaab4b593f5aa0edaed3a246fbd6bc SHA512 d502000154483d4aa8274f851749c1da550f3e94152ae950c93b3577af72e8864b1884938b7b02c4ea832af4b3060bccea10fdee4cd1dd83cb3ca8edcbf2995e
 DIST linux-firmware-20201218.tar.xz 137880408 BLAKE2B 32839d61d743ade53aad7df0c87e90c28c9eff2e40e8072ebb283907c9a3800b7a0020a3c4ea2350f691ebd7ad9c5d71a1a83991c9099cd9b9bc5f9a908732c9 SHA512 9dfce57ad8d23939860d0b005cbbc80227c67e9739479473b1e36a5d32392df1d341eba3a85c0e243590841954dae298913e96168e72c68eeb3762dfd65a38b3
 DIST linux-firmware-20210208.tar.xz 146701492 BLAKE2B 49d39e9a6cf1ee1afc41c6317e680ab90937f0be437a940113b99504215fff7320a7442e3243d5831277dc6fbc043734461f32721b2f0a5dc12960162be6b2a4 SHA512 122673a9f4662a807667127fc88f85115063836b98283951cc46887cae43e1d6bc912b5b95bf50e1e896ff4b9197577e53705ccb259b614d29c3bae37a637b6d
+DIST linux-firmware-20210315.tar.xz 151454796 BLAKE2B aef09bf2043117c821c5e1460d02d50131e46c2c4257dd3816813089881791b876670990d774dc3e43060785f7303ef509cdec45b64f300ee1acba769bfdc5d1 SHA512 499f0cd746f700ac95f8ca9947d1fb402f3bc53dd5302101ce94f0510ee013b5fa3b8cb6316ace93e3bb2df0a25fb53eb8099acc45c9bec051aa92986e9d188f
 EBUILD linux-firmware-20200316.ebuild 9047 BLAKE2B e2cd08b8c4af18923abe94d91f6227a0f263108d61be820812fcec178f121a341da479a4f5923a2d91140b774595b035f6f05773eeeb038724894e3044dfc340 SHA512 47510d0b1c0850b945fe0c88476c3ca05cf6c1b2d5979d3e6973038bc99d37e48359c35c4c99bdd5db25bb7c80a741f1925feb707b77d5b1fd8d62abf7e7a959
 EBUILD linux-firmware-20200421.ebuild 9047 BLAKE2B e2cd08b8c4af18923abe94d91f6227a0f263108d61be820812fcec178f121a341da479a4f5923a2d91140b774595b035f6f05773eeeb038724894e3044dfc340 SHA512 47510d0b1c0850b945fe0c88476c3ca05cf6c1b2d5979d3e6973038bc99d37e48359c35c4c99bdd5db25bb7c80a741f1925feb707b77d5b1fd8d62abf7e7a959
 EBUILD linux-firmware-20200519.ebuild 9047 BLAKE2B e2cd08b8c4af18923abe94d91f6227a0f263108d61be820812fcec178f121a341da479a4f5923a2d91140b774595b035f6f05773eeeb038724894e3044dfc340 SHA512 47510d0b1c0850b945fe0c88476c3ca05cf6c1b2d5979d3e6973038bc99d37e48359c35c4c99bdd5db25bb7c80a741f1925feb707b77d5b1fd8d62abf7e7a959
@@ -18,5 +19,6 @@ EBUILD linux-firmware-20200918.ebuild 9047 BLAKE2B e2cd08b8c4af18923abe94d91f622
 EBUILD linux-firmware-20201022-r3.ebuild 9779 BLAKE2B c206c46b6547321b2af292522592f0250bed7b85171df0b149dffb701bbf042f6326dd1883434a515cc559d3a59a7e2b150c9bdf10ad3b9760c83e0ab0dda468 SHA512 b8dcbba946a601b1a0b5f7e68231db932c018f60ae477643255f0476ee3734c354695c533cd633737414a1ae137a9ad62e2ebe1a881f742a3e39e40063ba3e8e
 EBUILD linux-firmware-20201218.ebuild 9769 BLAKE2B 1be2273927a81e5219e1d3e6091f03c86e41cc96bb21ededdc06601b79d20ce220f0b54137013a13ab6c77c1dd5f14725537326e102a4407d96996ab4aa4416c SHA512 b936568365770641d2df47f845485ef69abb6be504c0b6ad698ec1dc6db549e635f63a4e72229204fe31156e4d889b76b43beb9c0d6c8d5e9b3419df0d8143f5
 EBUILD linux-firmware-20210208.ebuild 9769 BLAKE2B 1be2273927a81e5219e1d3e6091f03c86e41cc96bb21ededdc06601b79d20ce220f0b54137013a13ab6c77c1dd5f14725537326e102a4407d96996ab4aa4416c SHA512 b936568365770641d2df47f845485ef69abb6be504c0b6ad698ec1dc6db549e635f63a4e72229204fe31156e4d889b76b43beb9c0d6c8d5e9b3419df0d8143f5
+EBUILD linux-firmware-20210315.ebuild 9769 BLAKE2B 1be2273927a81e5219e1d3e6091f03c86e41cc96bb21ededdc06601b79d20ce220f0b54137013a13ab6c77c1dd5f14725537326e102a4407d96996ab4aa4416c SHA512 b936568365770641d2df47f845485ef69abb6be504c0b6ad698ec1dc6db549e635f63a4e72229204fe31156e4d889b76b43beb9c0d6c8d5e9b3419df0d8143f5
 EBUILD linux-firmware-99999999.ebuild 9769 BLAKE2B 1be2273927a81e5219e1d3e6091f03c86e41cc96bb21ededdc06601b79d20ce220f0b54137013a13ab6c77c1dd5f14725537326e102a4407d96996ab4aa4416c SHA512 b936568365770641d2df47f845485ef69abb6be504c0b6ad698ec1dc6db549e635f63a4e72229204fe31156e4d889b76b43beb9c0d6c8d5e9b3419df0d8143f5
 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild b/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild
new file mode 100644
index 000000000000..f735352e7f05
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit mount-boot savedconfig
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? (
+		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )"
+
+RESTRICT="strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl6050-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+QA_PREBUILT="*"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		copy-firmware.sh
+		WHENCE
+		README
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		atmsar11.fw
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		tr_smctr.bin
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		intelliport2.bin
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		3com/3C359.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			local files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+
+			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
+			find ! -type d -printf "%P\n" \
+				| grep -Fvx -f "${files_to_keep}" \
+				| xargs -d '\n' --no-run-if-empty rm -v
+
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				die "Find failed to print installed files"
+			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
+				# grep returns exit status 1 if no lines were selected
+				# which is the case when we want to keep all files
+				die "Grep failed to select files to keep"
+			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
+				die "Failed to remove files not listed in config"
+			fi
+		fi
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	popd &>/dev/null || die
+
+	if use initramfs ; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/metadata.xml b/sys-kernel/metadata.xml
index 16c8a6d318c6..6ca057c98821 100644
--- a/sys-kernel/metadata.xml
+++ b/sys-kernel/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria sys-kernel zawiera źródła jądra oraz związane z nimi narzędzia.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 9f363086502c..af732fd4b8a5 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -11,10 +11,12 @@ DIST pf-sources-5.10_p12.patch 5244822 BLAKE2B ca004890e20a07864e858bf1834265f12
 DIST pf-sources-5.11_p1.patch 2710131 BLAKE2B 67a3528d1c59f24af9f09bc669e736d41394041874e07ebaa68bba8393d98b6094f3c733f1f395cb0a816f418702934d7ac828fceabebcec187526ca378929f4 SHA512 0bc79a5eb093c0b072826098b78894d59bab2bb8107221c9727c4aebb839b2e4d066c2f4918614bfbf4e3af210a6d1852189303f9ebf338f2e5038f166d4dfb0
 DIST pf-sources-5.11_p2.patch 2720760 BLAKE2B db2ccb4449d6ed2d545c15ef82b99d581e462908ab2290b62119c09da93a7cf202e3a1792a1bf3afb6ae98f4c9f8ea34ef7ad7056206f3eac7daa8a7a9559f4a SHA512 1ab4748cac5a8a210a48543606c2c3e30e4528c819b4e7d7e29d992d4f9b14ae6e7219d7d96d090fc887d72887735e52dad9a8d396d775c8c32b80b01532a9ea
 DIST pf-sources-5.11_p3.patch 3932843 BLAKE2B 655d68a6cced89aeab7b71cb67d0469567201766f378371e0e6c933fb4ac48317e27c5a148dc70117550c4f09c2b8d4c7690f5f0d88754d80fe8ca9ab9bc2415 SHA512 3b1444baa42a737166c1ce7b40d616123b2df197f9f6fc3041fded977f760627603656fbb6f41c12ad008ec724d96ae81664bbaedda4f3759aec50cb5820776b
+DIST pf-sources-5.11_p4.patch 4443076 BLAKE2B 294d1eb3ec09de6c5d6011913a8d831185a424a85e3bc6d245bd3ef4fe6b50d8e2b64decf398c153435de0b24c2417a7076ae854424201ce61cfdbbdedf4565f SHA512 3a14d63039e1a3701493d17b164364ef3c9167333e16aa8202b2967eebfaab3bd0c233b1e09af44a190a86a1b5599ee339f9ae06298c77404e7f99c6f9f14df7
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
 EBUILD pf-sources-5.10_p12.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p1.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p2.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p3.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
+EBUILD pf-sources-5.11_p4.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.9_p7.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
new file mode 100644
index 000000000000..223e79a03a51
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 5c5c533667a0..885a4365e963 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,15 +3,19 @@ DIST gentoo-kernel-config-5.10.7.tar.gz 1146 BLAKE2B f755581e9f3be3122e5f6e6fc13
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.11.1 225847 BLAKE2B 50e3db29a9afc3db3c35e3af173e89e2e8d3b573dd8af7c35584e3d0152211cbd5e6ddb749acb3d6d2caa54392a3f51e52b5394a5d032d43ed35861230b277d0 SHA512 6d0594658e205767599453d4d8695c37eabc065d6c17362c3775dd745f6ca62131d7c15126ec41a17e757d3ae2a0569cea6621a7ada4666a8f90e4414391b3dc
+DIST kernel-aarch64-fedora.config.5.11.7 225828 BLAKE2B 1f5d50514adb57195f2878e3c6c587705d90d5f888e2b1c84d5ca8aefa91c23cc70db34a12a23575cf3e91cd7779769ac5242a3a3ef38f72bf30f73bae2e009e SHA512 b43550dabeee5618664e298b56025ed33d9983e741f70dc190135028ab43e72226b9090da361c26a64938e5759ef80e6008b20a623093e830af45e877a71a77c
 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.1 208027 BLAKE2B b4183e8d1121aa8b3f65d0a4542b8ba0f507430ab4cf0004dd0e8b1e24b3be1783316b8bf6becb2002f7fbacc8236b640f533fc2e9dc5696e84d1627c3b0e9c4 SHA512 5b107e376ddef783ee6852ef67143a94340b37ab764ef3ee3c6642401883d314809c959c2025d976336923c115d21d6b39332aa1699c0f884d1faad1d9c3fa32
+DIST kernel-i686-fedora.config.5.11.7 207997 BLAKE2B da0d9cc56ec9a9ecd9c05b809313301538e902f94799f418c522fa55d97be9ef72b7c23fba15721cf355227adfd93a9d6d8537b84572d6da16c16e13e2cd4dbb SHA512 4c6dfb2efa2cf0d48792aa2f37c8f37b929524a93c534a1ba48effd4645fa3f064bc6b88a900533d8cd8ebd4bbac8f0f1faaba57d25d59005af2cf2608eb0c0b
 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.1 194870 BLAKE2B df6e5a0a789dc6d0c2fbec45820f5e19ec455388f02f04d88d7b3dd5081d2f11e89cfd0159b7a3885aaa029470e916743d59ec3f86756ff4182aa56552aa8476 SHA512 e170912e76e8980435df2a1387792d616490ededda4df681a90312f7fc8ce4065f1c9fd7559d746d8edc0fccfbd35b20fd5db294774f9db7f4635d898cd0dab1
+DIST kernel-ppc64le-fedora.config.5.11.7 194840 BLAKE2B 0fba17ad9a4272a19678beb007a07d30a1facd2e9af259e888b733129540e647378d21166ffbc459f2419b1b4fde7deb7e59db1f3c74aeef5b137424abe14bd2 SHA512 b77fc04281c049a312ac8135c4b60460b747c97299d1cd24c31a56aadcb8291b4c47ff3b87a427c47abbe8adea36216e6615a4715c6c7482b655de3b987b86a4
 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.1 208870 BLAKE2B 86e075a95cbc5d6c3cdecb0caf67e18f671ed663aee94b7d0688e25f111dfdf12d890e1f409df04446d18057b6fad8e0fc67adcde34ed581266d458d9c9cabbd SHA512 ab39c8b107471bdd492e6f9c2e181e85e44134b4a2934fedd2f454b9766a32aa2cef2cbf7ed83111e82ffd7794d4bf20f81d98b238751d505c13077abff2b543
+DIST kernel-x86_64-fedora.config.5.11.7 208840 BLAKE2B bead7ffcab503298371e61d37ccb0920e0ee3ba8d5dd019133e3d57bb8973cc2a13498a60c5e150b78f9d6af839a7010fbe89da1b0ecea97cab7036a5fc1aad0 SHA512 1777c0efba6c3c6108f094a5435169230b2a9ed496ab67d5f922054492a695a9f8eee95c2fe9651641c311cec49868a12a7c3614330d37f711ff795110c2c7e5
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.17.tar.sign 991 BLAKE2B b3b2947df46c96771643ebb2248c83fb81b1ff6bca9191e3ede8e18cf06e5e26ec2c4e179fb1c14026cfddcb110447faeb28fcd7ad93779413353ac8335ef37c SHA512 8abaa8abe2475c0017f755836208c38007c419b832605e81c775d23aa4e23bb20cd5ca88d5a482b331560bb4d940eaf7db3c2a795f77d7b5bb0a39f86130c3a9
 DIST linux-5.10.17.tar.xz 116272648 BLAKE2B 7317e13e6262adf6d69f1192370be8eb2a31054a3626cf20e3e42d4f794f1f1767495c85cc891853a647c246828de31915090706fcdc514c7c563dbd5bbae4bf SHA512 2d8700ceee0c027597415de2b9fa478a651c6f5074b68d60609a4c46398ac5a854f9323fc07b187caca5294759bf99832d7496c4f4cca222240b07435b27bd60
@@ -27,6 +31,8 @@ DIST linux-5.10.22.tar.sign 991 BLAKE2B 9e4656b6815864fe046a59492902bee46d334f36
 DIST linux-5.10.22.tar.xz 116291148 BLAKE2B 15f6e14e133ef69a932a82b68aa50382d5dad54c593e6934f769306b1144ad526d185a3dce283bd7df3cc90053f31e129b7745a6c3d69ac50c3aafe03a950107 SHA512 0adcf5973674ceb648fe073f369c395c7e20b2b05ad9c3d27617a25b23f34aa3e2fb07f6ac3debc0199bbc971d31da4c8cff5daa923ebfc2ce31c16117fc5e48
 DIST linux-5.10.23.tar.sign 991 BLAKE2B 51fb739f5cfdf66803dea81a7f182218f63feddab036bca6b45029bed73ba1351cf133c15cb5e25e1d4beea91b4820e1d49d9de3761ea29dc3fefc29e285451a SHA512 338e71816452f4f1d4c180049941d7e7aec881617471b64e30450af686a093d9c155e79a92d2e038a7079414f52fc01a92aef01f18a16ca00020ba3a5d6fc7af
 DIST linux-5.10.23.tar.xz 116288840 BLAKE2B 0ab16813059bd2343bb5f96679e169f6efbde1c65a3beea08873b40812578e48f7969c321ab588dc7c88ee7b320ad2f9cdceb1fc3882d4ca705dd890732be51b SHA512 c5d51d9fedec04b0aac396cf3b22d133b305c1fb2a189aa512d0c42d4abf10feecdab4b8ddccc4c3b3a65a84f168d04f37fcc9bb65d7c794d20978e2ebb4faed
+DIST linux-5.10.24.tar.sign 991 BLAKE2B 4a095d90b5703f0df09dfa742e72238f5f9c56d153d412c6268e41631338ee6927ac6547768e0ae41b9ef471227456c6d7f951b214f6c3db439ac8a9c49851cc SHA512 fd5ce3e528688481e84081c7d88824140b8738a7c49a10f8f88b434624c8e94f95bb85b11ca9dc643cab3db99b0c47a0c0e5cba2e92559366acec97675cec548
+DIST linux-5.10.24.tar.xz 116299600 BLAKE2B 104be7cceeff8a0e89c8f9a15a8c31f269e8f15eb00b573edbbb555df4861a8105a1a5547e790c23f74d36d20d5dc3be91457869d3a3766fafe536262ea45405 SHA512 27a3bbe8f01e420381dfd8a69e89ea68ae26454113286ab5104ad11e687f3628ae886db2dd3112a916fc39d182fb6269c52caa2117c9a8d22ad7d21e247c0141
 DIST linux-5.11.2.tar.sign 989 BLAKE2B 404589119de8a0bff3e0feb77a54eb98add568470d4260767830ecb488fec415a0eb79a87eb6b19963b26a78ab8944d4041a38a80dc515f42f14350dcf825fcc SHA512 497f0c06d43cede60cb60816bac0cc22a3c7976bb71bb2f2aedced69c44561b842bae94cf51d5cd0ed506c1eb5b58c038bbf17049176f074cd0e7442eded4fdc
 DIST linux-5.11.2.tar.xz 117609344 BLAKE2B 62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc SHA512 16090ec6dea7a8c417ca7483b296902c9b55b423482ad8a881dffcaae76411806bc9502373efd6a51b0acefec3a44c19c5a7d42c5b76c1321183a4798a5959d3
 DIST linux-5.11.3.tar.sign 989 BLAKE2B 32a3eaf0cf1ca17fdd3d541def9a6cfb04d6b9fa701df737cb7713c7969a7452a5b8366751c6538f5171af7875382f2c3706d968f41ddca49a00a46b5f108dd0 SHA512 719150274d08392b51564ac35c45a6ba987ec329d69af28351a0f8842114ca30ecf23d025594ea3ed8280adfff7ca88754f850f512acd493059c71c98d9a7c13
@@ -37,6 +43,8 @@ DIST linux-5.11.5.tar.sign 989 BLAKE2B 7345a3b63a8226eb10e52c65e17babfad90b33fdb
 DIST linux-5.11.5.tar.xz 117630364 BLAKE2B 9e1f268251877d7508a11e9b7ecfafa50b20591c5f682287f453a28f1b1c06be46d8c8dcf8687542db28a9bd02a48a8496a393baffa072618228d78982f34027 SHA512 8c2a37358b07a5764c23e89d72c0ab68031af0bd9041ffbd4c95597f405fa6f50080d7e62669d55b3fee51e783a10b3548493d3f8171c6ec18cc12682108e97d
 DIST linux-5.11.6.tar.sign 989 BLAKE2B 67e8146202297bab466a41532c824b4aebd2a07fa72000509e50ed2afbe48481262a0be29904c9736a4b77277449b5558ad42aa5cb49007bf03b3416b6d09f8d SHA512 8211ae2c39ad7adc13d704c4a0afa7e7c145a445c49fce624e4c71cf247383be3643988b89b42b05b1cfbe693680ac67838217912d2016389b95a89d5b4d15da
 DIST linux-5.11.6.tar.xz 117637692 BLAKE2B c94885a274c835ce13e109aed4307831a1e57283c2e475dca1fc9c3c0cce97ad599e485b0413dabd182c5d48f9e5e30d071c3f9dcd0d6954e1affe0014279024 SHA512 52761568a81a4f2c8fa7e2ecd4a8d1b4657fc4fd9e31b3d0ba1d65a5ea968db16b0c77e4ae05ddef084f49f419899205b7658de1050b970670ba3111d9c49abb
+DIST linux-5.11.7.tar.sign 989 BLAKE2B 17f901de195cd073449eec6ddffd0de8ca917de6aa5a327a67a77b8880f75d05255661d3806be993afd825b4feac15339e5ec898b72e5ca186aa280a1d05e15e SHA512 38cb882e7f8256a3390886c529e93d755729f2a958739ea88b9cfa1bcdafa556cc2e0b9d5150d2d55edca6923dbe8b081c6dd7bb98689db85a96b3245d9d3310
+DIST linux-5.11.7.tar.xz 117629424 BLAKE2B a89e158b22c55858cb77d8ad71b6c7a31786973461ed04e09c87e7e59545b4ba5ad43f4d5bab7687d6b82565874ce06f2106f0842cf00a6e1c85cd9a1faaa218 SHA512 1cbbbc65b5ebeb49e3e3d08ba1739c11447cb089994551b559a94de7cb72b308161ba176ffbcf486ee89b0de5cc9460ff02af245ad4b19e104d8fe221a56550c
 DIST linux-5.4.100.tar.sign 991 BLAKE2B f1442b1523de568ed757ab3ba89d571b0c5d85a192718a85ec72736858c0025b09b0d22eee906d4300e41a8f24ab8d56eb0039ba0b46b63b049a16c8cd65153b SHA512 7e7e298917a6167aa9d3a61cd1423c5fad89fad06f66c1ac01277aba7000dcbb1558f978644558cc79b57d70b677016077f0f4cdc3eaa69e39cda75b0d5b18d7
 DIST linux-5.4.100.tar.xz 109081252 BLAKE2B 2647a326c55050c3f0340c2e7ce98761e8bc3d5900c74785eac779295ba6e84d99d65a2ba9ab575fb412bd5caf6db6d25b32ce9b10373cb3879de2cbafd861a0 SHA512 8483e34ac7ac59903d51ef2b5607fa2608a824d0f95548f3c8eeefe9a6b4be3bef44865df68960feacd02ed7bc8dbbb1625f0bb8e6626bbf096c2a0db474998a
 DIST linux-5.4.101.tar.sign 991 BLAKE2B f10908550c9ebe18dcc06839046ea215d5fa91cef48180836c2582a3200852dd005e39ff5ed6b203bc5ffb4098018fe2437d363ae84404370a9f40e8e92d446d SHA512 bcae0baa578b248d21b270106b5ba0b4ea23f383a24086ba04d7433c2df534ddac9f2373383407637cc3a8e81d14e3f5407dababc3b01333bbeafd36101e2f54
@@ -49,6 +57,8 @@ DIST linux-5.4.104.tar.sign 991 BLAKE2B 86d63b75caecb65842bb2685b5ed586fbfc104ff
 DIST linux-5.4.104.tar.xz 109085768 BLAKE2B 2b648464a2d36d60511966b9a3672768139d8e16373b7218f637aef558ee88825a0e582e44f9bef3333c7427169f1662296f494e6cebe0bb01aaba8e3804e918 SHA512 3bbe5e8c2142e52b124eb3fbda91516ac6e7d8b08eabd96a5660b00bb1cddcb80c1bc0f8d807681de58f6b0a986d1ac340066d37b0a92e612c700ae988aeeb2d
 DIST linux-5.4.105.tar.sign 991 BLAKE2B 797d4d2e1b23e740c45113aa82a138d0632dc7e99705aed8eb512cc180768f59fd7c3ddbc6a2e8d84b8b4b4c32004d8dda87e441d0e8425795823f841acc5f5d SHA512 efd7f79b89224bf0b48a088beb57caaef49373f4e79dddfbb87b6a3c7e7586674939b43f4af524ef1abb3c20617636392ce4b425df404f671638c80b5a8ee1dd
 DIST linux-5.4.105.tar.xz 109086968 BLAKE2B 5a575d3fc8e7f51eeb244194a7e947dd4bf72890d7a4b90aa77f49f1b7c6c9d79bb03d68275608820642af6513402dc26f2179941f311d6357b722983000c457 SHA512 423be7e90bf49a4afa7f6f3dc8a8bfa9a1691b73ccdc081bf5bcfe0612a084b8cb37acdab77a480629d786cf6d66d48cbed84d505bd27d6f4d815934010eafe7
+DIST linux-5.4.106.tar.sign 991 BLAKE2B 06dc3b61daa4e5073b0f0d0b51b3f11ba2e27b59466a1b76a9ba1ecdf7ba884271575060dea8944f56380cf7f53fa9b785b8036c10d33f783ef32607beaa93c8 SHA512 d699fdaa8a4cce5ebe29dff5d4261797e9aae682562cdebf7017c0f9cee63b4c900e1955d4481ddd2b0f547eb989c12462684dd64299257621be8fc0967716a2
+DIST linux-5.4.106.tar.xz 109095288 BLAKE2B 5ae482c8ce2307350c7e5128a3ee416e3cec847dfe85ec849fab90543476c7f5d6121d65142bedaeadf24b98932e113aeeb85ef2a54e5d0eb93b4b17b434d41e SHA512 2944ecc631be58c62db28ae7203458e5fe9619931dced8f7f2db3ff861db667476f4b20f7826368f0d676a2025e7de4c86ce18684160bf16280db746e5097097
 DIST linux-5.4.94.tar.sign 989 BLAKE2B 779a725d0164c98bf2ebc0590af693eebb6fe71837e0f8642b376fb0fa4bc893e8c2b52a16bd0c1cab7aaff4295f6bf31b8fdb7c2d95bd8601eac74925e2211f SHA512 85ec9c16642aac5640d0486ba704b787e2e4156fccdf80f4d538b4d6524c914b64e6ba1d52bdda15b3601faec643d6656fa2cf57976a9afaff5265f9dea840e0
 DIST linux-5.4.94.tar.xz 109082512 BLAKE2B fac6683453e41065760cbdd170ea4a5f72778e39807389d2f4c4dd9165dc1727a875ee26e6e440089ec2d8e8b4dca9fa1e1dc02a9b217cada700f9a118ae7613 SHA512 2d9f0feeb9ba6871d31c8a5e281c8e3eed99ce7da3af3be4f222db37f082374f852021a5117a994c8cc37681e5f335329c9e430e7edb835de801c901765a505b
 DIST linux-5.4.97.tar.sign 989 BLAKE2B 767058a0c491aa1435d5dcd25d5f26ed1dd283cbb903063d00020e2a5e7a2a965b7774df3fe4e5484bb1c76e906e9622057f60420d9dfe31a5305d85b15e2d1e SHA512 09fc4efaf777d12cfeb61e7d24651ca68461c108666be90bf216ee5586cabf47976d60451f8cbdb636ff3f3a4b66b84edfc0255b26d3589f918c22aa394dd76a
@@ -62,18 +72,21 @@ EBUILD vanilla-kernel-5.10.20.ebuild 2823 BLAKE2B 56ac7807af68bad4d36c3952cdfb34
 EBUILD vanilla-kernel-5.10.21.ebuild 2914 BLAKE2B c4d65362dea3b70e1aac209c92ad1d831b191ab73b64758d74347355f250f0e3c3eaf44098b8576d7dcbfd3284dac4383a91a1d8bfc6d59e0ce84ca8e7d04112 SHA512 265b54689f2c07f7bf4634bee43a17500ebdb7f5460900998a376d0a4ee564f2d0d8731733a491d01d9f9582869411ed5a0ab523ccbd943e350a68df0ecafc24
 EBUILD vanilla-kernel-5.10.22.ebuild 2914 BLAKE2B c4d65362dea3b70e1aac209c92ad1d831b191ab73b64758d74347355f250f0e3c3eaf44098b8576d7dcbfd3284dac4383a91a1d8bfc6d59e0ce84ca8e7d04112 SHA512 265b54689f2c07f7bf4634bee43a17500ebdb7f5460900998a376d0a4ee564f2d0d8731733a491d01d9f9582869411ed5a0ab523ccbd943e350a68df0ecafc24
 EBUILD vanilla-kernel-5.10.23.ebuild 2914 BLAKE2B c4d65362dea3b70e1aac209c92ad1d831b191ab73b64758d74347355f250f0e3c3eaf44098b8576d7dcbfd3284dac4383a91a1d8bfc6d59e0ce84ca8e7d04112 SHA512 265b54689f2c07f7bf4634bee43a17500ebdb7f5460900998a376d0a4ee564f2d0d8731733a491d01d9f9582869411ed5a0ab523ccbd943e350a68df0ecafc24
+EBUILD vanilla-kernel-5.10.24.ebuild 2914 BLAKE2B c4d65362dea3b70e1aac209c92ad1d831b191ab73b64758d74347355f250f0e3c3eaf44098b8576d7dcbfd3284dac4383a91a1d8bfc6d59e0ce84ca8e7d04112 SHA512 265b54689f2c07f7bf4634bee43a17500ebdb7f5460900998a376d0a4ee564f2d0d8731733a491d01d9f9582869411ed5a0ab523ccbd943e350a68df0ecafc24
 EBUILD vanilla-kernel-5.11.2.ebuild 2822 BLAKE2B 6d6781cd321f571dc5f8c8674821b9b76e83238538fc730d917190b77570676b38307c306a08c4bb7b70009a83aba3d802235e9df27b91d5804e711e3f995f35 SHA512 38a90c645bfc688311cbf6ccc8aa76ae4e9aafb5dc90c8154dd4576234c374feb05d7c6db9f4841ae5d4437948de67b15b71dbca747386e82703afd63cf77623
 EBUILD vanilla-kernel-5.11.3.ebuild 2822 BLAKE2B 6d6781cd321f571dc5f8c8674821b9b76e83238538fc730d917190b77570676b38307c306a08c4bb7b70009a83aba3d802235e9df27b91d5804e711e3f995f35 SHA512 38a90c645bfc688311cbf6ccc8aa76ae4e9aafb5dc90c8154dd4576234c374feb05d7c6db9f4841ae5d4437948de67b15b71dbca747386e82703afd63cf77623
 EBUILD vanilla-kernel-5.11.4.ebuild 2913 BLAKE2B 4e4e7e92b61c247ed443c6a6f0a5394caabf128b551a38591e8c289a751c7b6f5ff12d5d6615a79b75cd09c6848f53ad1e62610ac809e6909e7742b6f4afc401 SHA512 85bb74ec3e8ca04214e255174952f4c24fc8b2be595d0545d5f0cb6e2101838315985758cac18d4da4e61b805b1e34a4141bbb74bf5b2f2cf654ca285c1588d8
 EBUILD vanilla-kernel-5.11.5.ebuild 2913 BLAKE2B 4e4e7e92b61c247ed443c6a6f0a5394caabf128b551a38591e8c289a751c7b6f5ff12d5d6615a79b75cd09c6848f53ad1e62610ac809e6909e7742b6f4afc401 SHA512 85bb74ec3e8ca04214e255174952f4c24fc8b2be595d0545d5f0cb6e2101838315985758cac18d4da4e61b805b1e34a4141bbb74bf5b2f2cf654ca285c1588d8
 EBUILD vanilla-kernel-5.11.6.ebuild 2913 BLAKE2B 4e4e7e92b61c247ed443c6a6f0a5394caabf128b551a38591e8c289a751c7b6f5ff12d5d6615a79b75cd09c6848f53ad1e62610ac809e6909e7742b6f4afc401 SHA512 85bb74ec3e8ca04214e255174952f4c24fc8b2be595d0545d5f0cb6e2101838315985758cac18d4da4e61b805b1e34a4141bbb74bf5b2f2cf654ca285c1588d8
+EBUILD vanilla-kernel-5.11.7.ebuild 2913 BLAKE2B a81e712e128427b8838faacd606be2884f06fbadadf9c3b9c9acd7c79aa74b8390b86bd547a7630b5613be920297c77f4114be5427309afad36628cbf87914ae SHA512 8346bb0861c4489bdad47999f944aa3064f4a3820e4f5a3d385edded66a659eebdbaf7b62732d69b705a4a6fad35cdad17d0d1eb64393c0c8e347f98f2636cb6
 EBUILD vanilla-kernel-5.4.100.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.101.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.102.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.103.ebuild 3073 BLAKE2B fd4f6775a833317fa56d2e27486c3f1df4ce5286ba6a28e753ccc2aa71e058c1a761963cf99423e7e4d6d1e096f89bc15e2148d27546df2376e159e0b03b3a3f SHA512 894b14a28e76460040e1a72f7039680f0145c539565d2fbc6af103afef3fb5969bbabf5d1b8facccea99dc066d5926a37d3af471ae805c8ce8a415294b75f1c7
 EBUILD vanilla-kernel-5.4.104.ebuild 3073 BLAKE2B fd4f6775a833317fa56d2e27486c3f1df4ce5286ba6a28e753ccc2aa71e058c1a761963cf99423e7e4d6d1e096f89bc15e2148d27546df2376e159e0b03b3a3f SHA512 894b14a28e76460040e1a72f7039680f0145c539565d2fbc6af103afef3fb5969bbabf5d1b8facccea99dc066d5926a37d3af471ae805c8ce8a415294b75f1c7
 EBUILD vanilla-kernel-5.4.105.ebuild 3073 BLAKE2B fd4f6775a833317fa56d2e27486c3f1df4ce5286ba6a28e753ccc2aa71e058c1a761963cf99423e7e4d6d1e096f89bc15e2148d27546df2376e159e0b03b3a3f SHA512 894b14a28e76460040e1a72f7039680f0145c539565d2fbc6af103afef3fb5969bbabf5d1b8facccea99dc066d5926a37d3af471ae805c8ce8a415294b75f1c7
+EBUILD vanilla-kernel-5.4.106.ebuild 3073 BLAKE2B fd4f6775a833317fa56d2e27486c3f1df4ce5286ba6a28e753ccc2aa71e058c1a761963cf99423e7e4d6d1e096f89bc15e2148d27546df2376e159e0b03b3a3f SHA512 894b14a28e76460040e1a72f7039680f0145c539565d2fbc6af103afef3fb5969bbabf5d1b8facccea99dc066d5926a37d3af471ae805c8ce8a415294b75f1c7
 EBUILD vanilla-kernel-5.4.94.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.97.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.99.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
-MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
+MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/vanilla-kernel/metadata.xml b/sys-kernel/vanilla-kernel/metadata.xml
index b0b959adbe61..ff8c39d21f36 100644
--- a/sys-kernel/vanilla-kernel/metadata.xml
+++ b/sys-kernel/vanilla-kernel/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Distribution Kernel Project</name>
 	</maintainer>
 	<use>
-		<flag name='initramfs'>Build initramfs along with the kernel.</flag>
+		<flag name="initramfs">Build initramfs along with the kernel.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.24.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.24.ebuild
new file mode 100644
index 000000000000..fafae29a72c3
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.24.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+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/dwarves )
+	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.11.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.7.ebuild
new file mode 100644
index 000000000000..647cc29e2bc0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.7.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.11.7
+CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
+GENTOO_CONFIG_VER=5.10.18
+
+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/dwarves )
+	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.106.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.106.ebuild
new file mode 100644
index 000000000000..0a544ed36171
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.106.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+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/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index ac941de33091..5b8a6ee2b7c2 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ 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.225.xz 4173720 BLAKE2B 1eae1a743c0f122ae2332e8a73a7dd861d08ea32fedaf5f8c5f841d24492a9b1b3c439a3bc7bfae3c8122e6e8fc8f6ea6c6b8271f8d35dccb77eb0545e21b3ec SHA512 dae3290e3ae0490f7ade2e8843297925c33f0ba9920bba2da3ed5d2371c1521914882bd76b9080543d9d373535aeaf073d4c86b5f7f0ce47923363f5a77cdfca
-DIST patch-4.19.180.xz 3849348 BLAKE2B 5c3d4790f2309fcae5d1cb4e0595337e9b939bf72b161c5363a886c44fb50db2cf68c261e83fbac21cc52516a45fd28054279fcb90dd2f4b10d5d975987996fd SHA512 10ae76fb22e356abf3b6f5d7be3ac423c169f032f6127fc9c168797390268676f13c532b1e18ce6464b22e422f76eed93cbf4eddf32bbcebe9d0761d109ae083
-DIST patch-4.4.261.xz 3487976 BLAKE2B a67d0378db91ea9120f8503fbb0be787ae6e395635bd974f2f9c2400d0b100c236ac786a752fe21657f07b1abfcadeac22e78f323eb9019ca1b30c700a5a999f SHA512 ec25ad300c4cf4bf1d0e84bd806660130f52e17f5edc66c999d2c4046950cb99d7a404647fca695d757581295da90f5207cbe6c071f623596aefcf58b3548c4d
-DIST patch-4.9.261.xz 3895840 BLAKE2B 26bdd619edce731fa57a1baaef2faca9ae3345a398ff8fb6b2e05704d86d6027665de72f7feec93f25aea15619eef93072e2b912336d4da53ca8cfd5626af617 SHA512 47f705da1a0303baecef27bc1c264684a965c22ab2c5525b8db4472a7c1cd4936ade60b52feebaee85dc612c5ba687a551b54a205214f5ad8bfa3b76827622c7
-DIST patch-5.10.23.xz 749128 BLAKE2B a809820276c5fc30870584359452984cb4cf003d101978c2f6fc4e010d6b923d35bd0088ae668c808ffa27f8a7e94359bcfa5accdec5db23fd2f789d470bb7ca SHA512 5948883fbe4d0bdfc47d653882d5810196b102a3f6cfb138e2e5f9ab8936f11b04db7cbb5242da0555cbe43ca6f62a325fb067f892d3dac765953c2417acb1ae
-DIST patch-5.11.6.xz 304072 BLAKE2B a081369769bc28c83bae6c8b7ba7eea6e8f8ab784bdf66c7a85bbe9d9144d6cd7258edf7522c6e8ddafe87061be9ed0204aacc82373723d1e0d13d4b7e2962b4 SHA512 240a4aea2982963e96dd9a4714c7385dfaafb2adf8bcc8354038230e43cbf79fa244337aa4d40106cc8ecdf19cc069b4517ab5538a962b9a5126338de4813b7b
-DIST patch-5.4.105.xz 2712976 BLAKE2B b5e5bbbc97523949d5913a55a73e0859de556f7f6b9d598e700f5378583645fe2b1967a718ad1dd3697af1664793933e9e1e6bbe745f53a9c6474bcecf601cd2 SHA512 86e2338ca03b788dce7f8fb6dadc84e3f07fd4051a858e198abed8b68b70a1e63b4d8ceda1b3de721cb783b5078f085b1bff1ecc925d84cff84c8b856fcc5d32
-EBUILD vanilla-sources-4.14.225.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.19.180.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.4.261.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.9.261.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.10.23.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.11.6.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.4.105.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+DIST patch-4.14.226.xz 4185676 BLAKE2B e22d2eed7809b60bb7a2737b833e677b921df3daab800dd862e74c9afdc4490b3a65eaa024ec71b02c68575d8f8c8fb9cd05fcc49323df94e97a47a3607d3586 SHA512 ed54187a35668b82ab6eda764fcaec3abfa666dd9ee34c1c674fd531b75b82d8dc1b59ef548264380391916804e65207f5fd68885ff8d4b6fbdef367ec9ddd3f
+DIST patch-4.19.182.xz 3869504 BLAKE2B c01160e2f6e58f7378b1d951ed79c31244d6af1a91e26468b62b6e2698c01687b48a6675c9885ff8700a08157997c7deedb4194bccce8ce832a548a47b1d9907 SHA512 8382ea97a6c0e9e14ba55302ec174b71f64049758ae2b5cf54bb6a59e28a5fa169a85b1b0caa86e94ad5be218b181d5967decd354e69d1ca6cee47049d300909
+DIST patch-4.4.262.xz 3507548 BLAKE2B e741bd92dddb704fcf58c025abea92230f1511c1b6e751579d35e3228396e77364afb3e510fa7df62948b975719dd1839ec0e31d730b7aabbe26029a86276f34 SHA512 536edbe24ada5f1a96780312cc22cc5a88006a5bafc830126d540b2d6a83f170c8476aaa4ff26660d2b856e87e1816c1710318450aba6f64d601071f15f60908
+DIST patch-4.9.262.xz 3910380 BLAKE2B 3cca1ee84cd4afd6721e22c4dbb03c66f01bdd5b640f526fd333f57a6884727768038ca6af43f23b24c471d85174a6cacde4b63cb8ded59c03fdffaa1367e740 SHA512 9c2b16c5858c1c77ac454ff18b0e9d1ab1bc4395208f15ab5999bbbdf607f9310decb907cb4326592db29fbf4f3e56cf95731d17585c05e8ce38b40f2a6a97da
+DIST patch-5.10.25.xz 833288 BLAKE2B f022d986301e9adba779074a8fbd81faa8e9d09dce4e2baa70c263e0aa614c2d07598618aa49b5eafca1851520b023589050054829fd833af9d13a4a3a57a7a6 SHA512 bf73b47f1c2d5c3ec5dc6447b504abf026ef39ca6e4b81e5bc0c843cf3c12899893488d85ae67b68441c5c61b20b50e2e40866db6d30332e55b4826d64895272
+DIST patch-5.11.8.xz 401900 BLAKE2B 0f0a92236328844fd75fe536912195bcad5f7f3c9288b342b84a26702c500df312eb1183fe979cdc286d08dc82527a43d081b3acfe3bafb81a58fa0fd646a312 SHA512 44edcabf7894cbfd32191200fad810141f42cd3cf885a100ce37c796232f2217673c3e407c91132b9ee08741ccc9a53f882b6c86d0a606c4462830799c8f94fb
+DIST patch-5.4.107.xz 2753264 BLAKE2B 8b37dc0dd15223330a5894ddc1f65db6e166bf13ec41486c22a290f5ef045f5bae02b43acc2f61019d2de11faa53a7561878b44701b10e5074820388822410d8 SHA512 f470aef89892a79da7d87a3637859ba3b67ca3103f4be5e439fa5fa06a3aef2fe9a9b6d152556da92d2ae595ee8623bcd68b57bc65c4ec45c5500ae2c530dba0
+EBUILD vanilla-sources-4.14.226.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.19.182.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.4.262.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.9.262.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.10.25.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.11.8.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.4.107.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.225.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.226.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.225.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.226.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.180.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.182.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.180.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.182.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.261.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.262.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.261.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.262.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.261.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.262.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.261.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.262.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.23.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.25.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.23.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.25.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.11.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.11.8.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.11.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.11.8.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.105.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.107.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.105.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.107.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a6d0c2053617..0bcf90f2731e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 1771a4ae9b2e..2277a1135da4 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -9,9 +9,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4490 BLAKE2B 5bbce4ab70e2b1434698eae6a37c529c7ffa58ae90236c0ddef3023a00cf1bb6d3ed8b3ae767b81f0abb9759e33fb5e1d9e8f755505db72ceb9cc46f6cb1a179 SHA512 fda208adbbb4fa7e14d3a27956bce3a809c202ecf5eceb0fac956a0ec0879579f8f94f69172cd934481a98d84cdc36ea2fdc46b8ad906dbb48795673d2d7c4eb
 EBUILD compiler-rt-sanitizers-11.0.0.ebuild 5092 BLAKE2B 243f8ddf60558abf5d1ad9e6a1e31333769d1e0e33ff401c915b243297583de8f21be8ab15605a2744a981ff8cd0d1ba760aafc7bc13c43586a901b6050fd0a6 SHA512 04af5692fd79ba8fe51d69664d09f4c2ef2546559a5e5538363d22dbfb791e0f313ce289fdb56dcbfd116e399a3d34dab293a1f355acaf6700bb3003bd50e729
 EBUILD compiler-rt-sanitizers-11.0.1.ebuild 6080 BLAKE2B b276c7e47eea0a950ceb0aaac11beea427cc91e7c91adde1181fdf47e0aaa454ff9ede64ca3f9cf348a8e80336e916c26faf3c4318a42fc30d0a2f3856104c3a SHA512 75dc8e9bc49d82e5a1aeb2ff1b385095e9372200feeb8f3e0ffa2425f638ba89017b4a0262b57e6f24484ec39e35c3225def76f3330bada56cbcdffcbaf0e768
-EBUILD compiler-rt-sanitizers-11.1.0.ebuild 6084 BLAKE2B 3c3ae974c0f1e9fea3ea102c8108c11b906db7a318af1210ef0b13e3b34cd7352d8645edbb5346b6b8b4f814f28449b3d0d0bbd397717ef00701d73b2dac8130 SHA512 7a24a080c33fcf574906d10e332a3faedb94853bce6c667b9afa6a1b4b59164e014aa9cca533dac8fedb1c6a666eb3cff8ed8211b84f03666aa49ac1f4bcf542
+EBUILD compiler-rt-sanitizers-11.1.0.ebuild 6083 BLAKE2B 6ad663e46a03683f5b2be6b910418e40151e3205b62cd50d575d0bb8a3b74564b23e1f548dbcb9f99b3381bf1362f276581565e476ee590afed008c6ad198d60 SHA512 8e9dfa7b2058b47e91fd2f9e2dee036a7438df89017a26ce4a245630afe64409415285982db96889ed9a22e880c7b5cb205fb50eb682bcb72ddef680ff898fa2
 EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
 EBUILD compiler-rt-sanitizers-12.0.0_rc2.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
 EBUILD compiler-rt-sanitizers-12.0.0_rc3.ebuild 6003 BLAKE2B 90595ab86e646385cf823452958c3f052093d12990c310917d55cff9f22c4e5a93e905e6e6731f31f8643340ccea08b46bccdb77dc8ebe9bf94b5e6bf313d3e8 SHA512 a0e0d604a1b87d07c262bf6ecdce01d5a301f3a6cc0d2192ffc0af671851a74cd167bf0b653e246f2a2429a796c3b69ed4f02724a3070993c43afd15b626aa0c
 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
-MISC metadata.xml 1341 BLAKE2B d850193d6899816f33ec45aa714a9edcc04c668832a4148881ada810565cab45066e61d5b365b15ced7864220ce51cde31a559e4dadb83dc935955c9a68389ec SHA512 9fd1c971444f1d6dbd0b0559308a269385b0842767d97d3619b20b300569165cd807e52412d36d6ca9427a5fd5788ae5a19ef7d5c1b47cc73cc4eccf20b3fee7
+MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
index c877ae4241f1..726f400a85f7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +profile +xray"
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index a5d8a2f90b20..b1905bb2cb09 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -5,27 +5,27 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='clang'>Force building using installed clang (rather
+		<flag name="clang">Force building using installed clang (rather
 			than the default CC/CXX).</flag>
-		<flag name='libfuzzer'>Build fuzzing runtime.</flag>
-		<flag name='memprof'>Build memory profiler runtime.</flag>
-		<flag name='profile'>Build profiling runtime.</flag>
-		<flag name='sanitize'>Build sanitizer runtimes.</flag>
-		<flag name='xray'>Build XRay runtime.</flag>
+		<flag name="libfuzzer">Build fuzzing runtime.</flag>
+		<flag name="memprof">Build memory profiler runtime.</flag>
+		<flag name="profile">Build profiling runtime.</flag>
+		<flag name="sanitize">Build sanitizer runtimes.</flag>
+		<flag name="xray">Build XRay runtime.</flag>
 
-		<flag name='asan'>Build Address Sanitizer runtime.</flag>
-		<flag name='dfsan'>Build Data Flow Sanitizer runtime.</flag>
-		<flag name='lsan'>Build Leak Sanitizer runtime.</flag>
-		<flag name='msan'>Build Memory Sanitizer runtime.</flag>
-		<flag name='hwasan'>Build Hardware ASAN runtime.</flag>
-		<flag name='tsan'>Build Thread Sanitizer runtime.</flag>
-		<flag name='ubsan'>
+		<flag name="asan">Build Address Sanitizer runtime.</flag>
+		<flag name="dfsan">Build Data Flow Sanitizer runtime.</flag>
+		<flag name="lsan">Build Leak Sanitizer runtime.</flag>
+		<flag name="msan">Build Memory Sanitizer runtime.</flag>
+		<flag name="hwasan">Build Hardware ASAN runtime.</flag>
+		<flag name="tsan">Build Thread Sanitizer runtime.</flag>
+		<flag name="ubsan">
 			Build Undefined Behavior Sanitizer runtime.
 		</flag>
-		<flag name='safestack'>Build SafeStack runtime.</flag>
-		<flag name='cfi'>Build Control Flow Integrity runtime.</flag>
-		<flag name='scudo'>Build Scudo Hardened Allocator.</flag>
-		<flag name='shadowcallstack'>Build ShadowCallStack.</flag>
-		<flag name='gwp-asan'>Build GWP-ASAN runtime.</flag>
+		<flag name="safestack">Build SafeStack runtime.</flag>
+		<flag name="cfi">Build Control Flow Integrity runtime.</flag>
+		<flag name="scudo">Build Scudo Hardened Allocator.</flag>
+		<flag name="shadowcallstack">Build ShadowCallStack.</flag>
+		<flag name="gwp-asan">Build GWP-ASAN runtime.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 19db538b496a..b1676d08f9df 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,9 +9,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD compiler-rt-10.0.1.ebuild 2759 BLAKE2B ef75dd0b6d96bf2dfb562ac59bc6bbb8aebc69684dd3acf302b4700fad90fd80e62088b0c141aa23958ec7f06dafd01f6d5f451b4c995fb01541eb1a39dcb127 SHA512 51a5c6fcb385651f5d91d5985396f176fc7405fc4a95321a8ff896f8c22b922bfc987aaa5462a6be3df3ee2ac179633226e97955b4ffd486ec414a4e82e9470c
 EBUILD compiler-rt-11.0.0.ebuild 3541 BLAKE2B d9847d05f37311727267169e5798e2cf3af779a565776b273e0041434774cbcf9544a85fd5ceef555326f59a94ad2a1978581529689a6c46d160937dbd2d7b8f SHA512 940e19da15e1f9af55e978155152e3ee65216c16cbfd96b32a0ffee2df5f7bf1ab1e14b3f214df858b116aec810f9ddef9a5c21d11d3f33eb56ea16116d69e7f
 EBUILD compiler-rt-11.0.1.ebuild 3544 BLAKE2B c12af62e30475143bd86e5b87042003bb9d1dbf3918d566210c7593ab12168095bf9a0f16f185e613c33c48a101e209b55288015b0b8c45168cc3ac098d805ca SHA512 5464a523dd54dc9dddc1de15a657c1f07dad4ab64cc6bbdab13cbf315451614400730281bd3c7c6e64580d003ca57bf074c061cd224a5a6a32f19c2157b31c3f
-EBUILD compiler-rt-11.1.0.ebuild 3548 BLAKE2B c1f96cde71af8b605056e827c750c5dfe07382ecf494dca1f5d689fc3a8caff18d8ac595f6d47b7b9f9fec8e7cbba3ddcbb07176958ffacd541b314a3baad587 SHA512 bafd2287d7d07ef083e0aed54f76d8c82d7fa317a5432cb9e1ad8c05bbf78c6577178d42e278dafd92bb0f0803031c25038c0870a51008ca7b22a396ebbfde8a
+EBUILD compiler-rt-11.1.0.ebuild 3547 BLAKE2B fa31c4be8bf49c9c803659cebc09d3caf3390da23a73ae925f44bed2c1026e8e80ffc753f02a418280a97f1b89bd7d155255da4ad6e09dca487142151e7b518f SHA512 2b6f62b854fef02b14fb0bbfcb88f80cf6a8cd632ff111c0bd5912e9518e4a26778c7eb86567fee06bc98810986a703aa675a9c79739b5edc0805a6ec7d177b9
 EBUILD compiler-rt-12.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-12.0.0_rc2.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-12.0.0_rc3.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-13.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
-MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
+MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
index ed8d7713b352..2503f211925e 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/metadata.xml b/sys-libs/compiler-rt/metadata.xml
index 3b996021381a..f78b121d9105 100644
--- a/sys-libs/compiler-rt/metadata.xml
+++ b/sys-libs/compiler-rt/metadata.xml
@@ -5,7 +5,7 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='clang'>Force building using installed clang (rather
+		<flag name="clang">Force building using installed clang (rather
 			than the default CC/CXX).</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-libs/fts-standalone/Manifest b/sys-libs/fts-standalone/Manifest
index 3d41bf683913..16323f3e741c 100644
--- a/sys-libs/fts-standalone/Manifest
+++ b/sys-libs/fts-standalone/Manifest
@@ -2,4 +2,4 @@ DIST fts-0.2.tar.gz 339498 BLAKE2B 3800196fd67d03c5e732dec1cf6aeee85d417720c3e89
 DIST fts-standalone-1.2.7.tar.gz 19336 BLAKE2B 045cfc32dffd18b58093dfe578a029ca15083eec98812ea2849acf37fd2c8e7272840b15b4966201421624d96ba69208a36b58d5420cef2563c107cfae98ea93 SHA512 949f73b9406b06bd8712c721b4ec89afcb37d4eaef5666cccf3712242d3a57fc0acf3ca994934e0f57c1e92f40521a9370132a21eb6d1957415a83c76bf20feb
 EBUILD fts-standalone-0.2-r1.ebuild 529 BLAKE2B 827b54285e26354155bc0ddb7baea086642d192a5245c039f344b4004d98c32204c3688bf4f3a2e6c74ef5952200cb1bc246e84b7582812c4699399cb5b943f2 SHA512 8054bb5de4170dc8890b058713dd5ca56266e629c8a2e4e83fa17bbb572fa54eabc3050cbd32ebdf293bcb7de99d0e2ff6b9f935a3c5d0138de4ceed3f021917
 EBUILD fts-standalone-1.2.7.ebuild 739 BLAKE2B d5c775ccb42a8a803389897ca19ccc474dedb017cf7af17a4fa0fe94627b30a10bf4ba560f9217b58b0d342eb10130521b07aeb67a0d40ca9424444a756516de SHA512 1546100a8a6b394685188dd00100feeff9550777304cb32442fa6a6518061a6f486e1bef3d977ea7d97b9ec4d0dacfa06441d48d2f8658758693fbfb11f4ba62
-MISC metadata.xml 334 BLAKE2B b0cf07fe22c503cef4450546f0825c6e72df4e7b6fb85de9bc7d6e206e96efbb0f2d50391aa1fc3d5ffb6376aa290481253ca2ff8762bc1686b6057df9401d76 SHA512 f42362781a8bd718ddb3cc00aba96d8f7c5104a3dd0722cb189e827d2c0f7e78cec8d7dffbf3cf9ee82b5fba00330427486ae48247e3a2b3c0308e68d45702ab
+MISC metadata.xml 334 BLAKE2B a37098ad8340db9ffba8dbcc3831d0749059da31021e7a2115e29f461a6fbde4cdbf380e8e10dc17683931ee3eeae7d1b7877af9368f2df1edc3cf1b4810c4de SHA512 3e4a4dff13bfd8e0f1c034568703338706e172de89cec89e965b7b4b1e7f60ab776fc719f3904ffc7479d6c1f378998c7fdc234519934bd9442e3bbb3cfe44c5
diff --git a/sys-libs/fts-standalone/metadata.xml b/sys-libs/fts-standalone/metadata.xml
index f9ca28f3ecc6..568c8bd97d21 100644
--- a/sys-libs/fts-standalone/metadata.xml
+++ b/sys-libs/fts-standalone/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 9a112340d1cd..e2b6402523e4 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -5,9 +5,9 @@ AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1
 AUX libcap-2.45-build-system-fixes.patch 6618 BLAKE2B 0f18fbf2ba66b0b6131b4f1b9df1005ddeccda31ace7085104531cf57c09d7d2f7ed1aea489f9ef6f2d9701c80acae94265a08aa25951fc6fa95820d0441f789 SHA512 738090eaba52eed82bb8cbf1f3a9a440a1b2e409e875965f8499e78047faad21476e9be42e3707f968e3b5d633b0581b27e09f101b0e4de26abeaf58c7b45e33
 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80
 DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
-DIST libcap-2.47.tar.xz 131960 BLAKE2B 745bd3ba9819a1582880dff81d94ccf198fcf3f89d776ac0ce3055535e5370a0be57c5efdf7287f99ed50189af14ee46e90805d0a324f92d394211ffc6d7002d SHA512 cfa4aaa82b7dbb76e38cd207401603582343b14eb91d6df23e0ea6698d0ec0ab2b368fe0d08208a014a1b1a68d11316ecefa45c27983f9ad95e7b8184351fad8
 DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1
+DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
 EBUILD libcap-2.43.ebuild 2172 BLAKE2B 94abe1f5d3ebb812f67f7d1170c4f1fa9766b75526ac1a088bd8019b76c76695784b8d57f5740f0c684f8a3fe4440bf8b61f5eec3fbfdd1bd1eb7543fe8710f5 SHA512 7593c942c3650af81cbd905d97f5265efb53a16ac9bd9156eada840ea10c85e64de2464fbc4088306a73e3761a1606f8000e9a95e9ee36b15db741e33aa08612
-EBUILD libcap-2.47.ebuild 2211 BLAKE2B 039b339674c58e2ef751d351e1aee338a780b7c41a41733403a3930dede8e9dc40fe2ad2baacd64f95f980f62a788d84e6d96484dd71deb777787b22d4309b5f SHA512 527ae893595d258eee71fc88b9453c66397d006c97afe3e6e17e857bbc212f6e454c4ea41de09850004e20118f7975185c84a8e5f8ce7369113c56ff9c18af52
 EBUILD libcap-2.48.ebuild 2211 BLAKE2B 0fcb26a104e587f7eff0748d418adc37ed827740f1c0ae1e1047271683f69c1dd9a5079c5d6a1d68be0b7b31d4b4ad4ab22f42dc361076e6467c343bf4e19e7d SHA512 4db06e0129107b57def2ad8329b6b9c882408f8c51ec2359e54f936590585b6569f59219255bbc587083343e2bfede40c5faafb5ef04afda110d9d4caf927236
+EBUILD libcap-2.49.ebuild 2212 BLAKE2B 626c3af7ebdf8f55f5344ecaa8d7278a24cb5993eace8722ab4efcfa30772aa8618a0651d0a16ce7b2f1791ceab19319e37fd5314846502ae46ba01f7ecd3089 SHA512 e95d9c43b005e541699fc3ced59191dfedde0859dd849095493d5f73a41ab19cc02a5f7e4df3b6b05426e809970e521f2afbd663c54608956fe82473a916f0ed
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/libcap-2.47.ebuild b/sys-libs/libcap/libcap-2.47.ebuild
deleted file mode 100644
index e74b1a5547fc..000000000000
--- a/sys-libs/libcap/libcap-2.47.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 multilib multilib-minimal toolchain-funcs pam usr-ldscript
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-# it's available under either of the licenses
-LICENSE="|| ( 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="pam static-libs"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	${PDEPEND}
-	sys-kernel/linux-headers"
-
-# Requires test suite being run as root (via sudo)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.45-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.38-no_perl.patch
-	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
-	"${FILESDIR}"/${PN}-2.21-include.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG=no
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
-		rm -r "${ED}"/usr/$(get_libdir)/security || die
-	fi
-
-	if use pam; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-libs/libcap/libcap-2.49.ebuild b/sys-libs/libcap/libcap-2.49.ebuild
new file mode 100644
index 000000000000..72541ceffde4
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.49.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+# it's available under either of the licenses
+LICENSE="|| ( 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="pam static-libs"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	${PDEPEND}
+	sys-kernel/linux-headers"
+
+# Requires test suite being run as root (via sudo)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.48-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+	"${FILESDIR}"/${PN}-2.21-include.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG=no
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	gen_usr_ldscript -a psx
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
+	fi
+
+	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
+		rm -r "${ED}"/usr/$(get_libdir)/security || die
+	fi
+
+	if use pam ; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 05811a542559..3214d734ed8a 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -8,7 +8,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libcxx-10.0.1.ebuild 5966 BLAKE2B 230f37223e113c8f17020986b4fe65478d2bc65c5b4236f9709e556159e9118d0659172a59544b1767d9d55884549b51592d45fded05a91bf0e8762388c1baaf SHA512 4cf81cf1a0922d50c4357811169d4c2eda890ed6636fd2a0cee47c7181434bee76b36411ab487ef42d8179650d3c379336ad6c2ec1d18f109338e76d38e82f9d
 EBUILD libcxx-11.0.0.ebuild 6830 BLAKE2B a57ee66a8096c4456483bbb2a1d67a7e153dce97bdb7eb6a2d8e5ec5ac839d28c7c43f315f8399a5dc5bc157bd8b08cde156e1b3e962cfd05fe95dc6ca811929 SHA512 abaa0922a39380b3dffb65ea8a2c4774ae8c2fa561e9ceec30e70851779a13aedb2853bdf34c7586656dd389fb7b1e0c7dda9ac9de23ae52986b5392dd8ff12a
 EBUILD libcxx-11.0.1.ebuild 6831 BLAKE2B e1b3768dce61c69f4a4f4e7be022966b229e7cea11b1c24351a0c25a1ffe57ed8d4d04c20ce8811f39694849a52c20b980f664070482ffcbaa4e6b431fc8b414 SHA512 afb1ac8b1e5206c0b7988f9fc2644531b486840791beb8e997dfbd5c82a95cc3effab27fc28269d362d8c40873c1d0caf560c1e6a36880f6da72c28909f66802
-EBUILD libcxx-11.1.0.ebuild 6835 BLAKE2B f6d1949fe821d3038af20faa593e8e8f1f99495deb2d58a00670b0273debb5a1a51112cec6e5f4bd5cdd4f8796f18fdc6c5dea709b42c3fe4c0a340c79a11fba SHA512 d64fd24069e39f8e00cfcc463e7c31fde0c432d2bf282153063ff3aa0d2cf485be1fb649da73133f01b420532807b9623f5795e65cafefc3cd6731f2ac2f50a6
+EBUILD libcxx-11.1.0.ebuild 6834 BLAKE2B 159ae462f29a3a5c9776d9176de1bbba916171e47875053b3f472407ec20b6176bca9dcee6fbcbba493b91b78b5cb415f2805c79b3513c70885bdb75854fed81 SHA512 a051209facb4b7aad7ff115704bd7216d0d500c00d4072ddd598f91fc6eab5a85e28cfa3517628c48f4c58a409a4cb5a3db723997b7b6cdf7bf6116bfa80ac87
 EBUILD libcxx-12.0.0.9999.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
 EBUILD libcxx-12.0.0_rc2.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
 EBUILD libcxx-12.0.0_rc3.ebuild 7002 BLAKE2B c3277780ae78ff0e1ed5affae0b76b89b6bb5d9782edc535a2092541b9ab2a745b33c2535a8c75317320c61cf6ee57216f575195cbd21bba2c3c5967f541bc30 SHA512 169a0c2ccc298989f0b2495675c93a4d908de03c94c10b1bcc0a825a032c98f8d3ed5b4e854ad4c9d70d6c4384ba084134ba0dbb76a09e5a51dcc4b795501d70
diff --git a/sys-libs/libcxx/libcxx-11.1.0.ebuild b/sys-libs/libcxx/libcxx-11.1.0.ebuild
index 9414c15c0f46..26e9ff250d52 100644
--- a/sys-libs/libcxx/libcxx-11.1.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 7948f4162706..a2e0d9896a6c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e
 EBUILD libcxxabi-11.0.0.ebuild 3557 BLAKE2B 17ffd28ae4044bfa72830f1ee5614e2d89e8b3382c6fde88e6725bc5ef9bb374632c4abefa334931e8c2c52e232e0b4a74ea53be59d777acc3a80f33290ee499 SHA512 bf185e151c0926ccf5e87d30a4f42f1b4a6fbfe175c7cd40ce0f2abee0b2450d3fedf74366d786796ccb55193ad7ffdd01d9a9c6ee97529bf9f6dc7080ae6289
 EBUILD libcxxabi-11.0.1.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
-EBUILD libcxxabi-11.1.0.ebuild 3563 BLAKE2B b7114186df8da65e7c1297d41aec60b5bff2372ac319f15019f84eaa0f1459cf2788eccb01bbf75df383d50ced4e9e6722ac4d20abf69afcdb76d9c78c6cac9c SHA512 663e88359e06cd7d146b6f1bb43ea0235241b4f77cf559036ba0c1c6e4d99a9b0eda48a5146aafd798055f0a164e2eea21742593c405a7e54d852edd2e581ade
+EBUILD libcxxabi-11.1.0.ebuild 3562 BLAKE2B d9365f694b49f0bca2a0ca395e2ac88c85bb779a044885cfa606f02c69c54d85ba2e1a848bf9d21bce364adb1595b38c1734ef6ba59ed644232d68066e38003e SHA512 ecc2e706fc91193b0e5e87d39a4d53a96947bb9c623728be2705c3f3ba12618c39560460f8fe73e2d2adf9857b7e3c89bf59b541d236871107270b24b25578e8
 EBUILD libcxxabi-12.0.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 EBUILD libcxxabi-12.0.0_rc2.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 EBUILD libcxxabi-12.0.0_rc3.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
index 7ceb778be532..41331ecb05d2 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 3ba3dbf51ae6..94b3188c1850 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,9 +7,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591
 EBUILD libomp-11.0.0.ebuild 2900 BLAKE2B 8dd6c10719ec67cb10e15610cb99276e8e802994a19c3e3028e365458fc02cb2514cbb6032a1d62528776d31a023de81a08935f923520c1d4ec055e285aacf1b SHA512 855a5730ac4e786506ce70d92bf7c46e11531ef73e0a663e9512b9861e7bdf441113a484d1aa583313f6990bfc81e56eb536dcf8d81d95a8375a3073efca2ebc
 EBUILD libomp-11.0.1.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
-EBUILD libomp-11.1.0.ebuild 2906 BLAKE2B 532bba9092f082b646fbf7d22c929568e8e763d9ed23b23e5ec6691fe8b5188f359d592892fb2f35768354d722470f538a54285dbac0170e7589471a50d3d836 SHA512 541d34bdc48d88dc140aa7510e8696a2c139347ba5b99f7023582de2bdadfc8e69e204998890598a5fec09aa4c01429c57024fce4a35f9cda90b8961c1fc9afe
+EBUILD libomp-11.1.0.ebuild 2905 BLAKE2B 1a0e17f861b690031143fadc3f93c0a9def81e49b2c2786b085e921eb0ba93de7372a2a85ee1adbecc6ea877696e7912052e1b3ff78341b81e6e20f5e7a4c222 SHA512 c2365e3ed12b208478bb4ea064bd8899ebabbbc620877de074daed04678df9a4dc528be233a72ccdb26742da3c0c7f8460310991a37f56caae18e5cbae29356b
 EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 7e0c70445e2822d34c0f48f99debbe2f99e35601cfc3ce8e5d5a22888b29b6af5ca5090c66ebc7fb77990e2fdce37b958a2803d2a4be7e626359b48a7ad68c01 SHA512 8c7c35ed7c2d747d0d47a0d9588f2486a93852f31e7e1120688f41b09089e9507534fbae5d609b18bb28899de7dce2670ea1b87eb2e90cf06bbc116cac7daa22
 EBUILD libomp-12.0.0_rc2.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
 EBUILD libomp-12.0.0_rc3.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
 EBUILD libomp-13.0.0.9999.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
+MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-11.1.0.ebuild b/sys-libs/libomp/libomp-11.1.0.ebuild
index 80389c54aa07..351b5006feff 100644
--- a/sys-libs/libomp/libomp-11.1.0.ebuild
+++ b/sys-libs/libomp/libomp-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/metadata.xml b/sys-libs/libomp/metadata.xml
index 58df765860eb..fbce49e0d110 100644
--- a/sys-libs/libomp/metadata.xml
+++ b/sys-libs/libomp/metadata.xml
@@ -9,10 +9,10 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cuda'>Build CUDA offloading plugin (only with USE=offload)</flag>
-		<flag name='hwloc'>Enable CPU affinity support via hwloc</flag>
-		<flag name='offload'>Support offloading OpenMP using libomptarget</flag>
-		<flag name='ompt'>Enable OpenMP Tools Interface support</flag>
+		<flag name="cuda">Build CUDA offloading plugin (only with USE=offload)</flag>
+		<flag name="hwloc">Enable CPU affinity support via hwloc</flag>
+		<flag name="offload">Support offloading OpenMP using libomptarget</flag>
+		<flag name="ompt">Enable OpenMP Tools Interface support</flag>
 	</use>
 	<longdescription>The OpenMP subproject of LLVM is intended to contain all of the components required to build an executing OpenMP program that are outside the compiler itself.</longdescription>
 </pkgmetadata>
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 1cc5e804aade..a1540dfee604 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
 DIST libosinfo-1.8.0.tar.xz 273324 BLAKE2B 0d289df4eb1eb0f9793227b7925cfc37e253a4db0da5c420e7b058d4c060ae50a5609bd25f7d07822e0110e535561f675cf8eddbe6bce0875757f10ee30b2c22 SHA512 1d831443af9eea6a5ba1edccafcd47e56fc55e3cc43c0572044abc9c70c4eb8bbe0d95019d42bbdc3b680a2f52511863412ea9587c6eb553353b3802e94b2960
+DIST libosinfo-1.9.0.tar.xz 279376 BLAKE2B 9f231f022d80e96fc9b031ff8f16ea1e432e5e3ce079e384ad123043b89dd5e47ae119aec3052c8926965bf30c49b150f0ee727fb3b0e0391d393b1031aabeab SHA512 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
 EBUILD libosinfo-1.8.0-r1.ebuild 1517 BLAKE2B dddb734dbb4428417fa830d31f9e1bbc8f165d5d8a6d03ff8e929b3025a8106b1e7a2db2cc4191bbba2e0b77da85768a54a70fb85480569d9a2f772f63e4cc67 SHA512 541d1a76d09bd950909f4b754286095d48af5614e3552d56316272f846d8a5eefc5c8c5fa68d210be69f0c31fc3dfde226097b5dc747e378efef86e52c48d642
+EBUILD libosinfo-1.9.0.ebuild 1520 BLAKE2B b04063d0559ff79ae8c779afe4a9f3a745b28ba8ccb0e363228dddc5b99187559386a46f129dde7facb882a16f1339d8fb547135203131cb998a8ee0f422ab62 SHA512 619dbe2412b7dc5bb3b8a6fbfbe243e631c6e91cd8839b61a20d85061dd4fec518d5697534d03af54f92b735f3092abb6b8bdf408b51350dbabc436bceda9fff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
new file mode 100644
index 000000000000..b019a119ace7
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_feature introspection enable-introspection)
+		$(meson_use test enable-tests)
+		$(meson_feature vala enable-vala)
+		-Dwith-pci-ids-path=/usr/share/misc/pci.ids
+		-Dwith-usb-ids-path=/usr/share/misc/usb.ids
+	)
+	meson_src_configure
+}
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 02d5df7557e9..1fdcdd1c8723 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,4 +2,4 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e28009
 AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
 EBUILD libsmbios-2.4.3.ebuild 1788 BLAKE2B e4872329f12b1529e54d562aa55d18b8ec0a8d6e45bdd6104eba316f7e79057cb1a7a1e98791603f9a9c2bee26e0513762bf6e94a2a95904e8efcecd838082b9 SHA512 4c207f4bdd39d352d28d3312fd2e72dac8b4e4b434c3dd5bb96d93ecf12e1f377d8c96e4e4bfdd80a10bc9043df83bc30e23915cc936d75ff73da0d08e8109e7
-MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
+MISC metadata.xml 564 BLAKE2B 9692567feec851f92126289afe0b4117d9e397615dcbd265b73cf8883417739899b26bd9ee2fb6621c61e3c18262858fa78b7975edf4f87f7032356ccdd4c875 SHA512 68273bacd56e8af3314737d8bda5e09c8ce9c089e5d942b4a2afd86187f702d3d5fa9419db5042f660aaa8ab12d0eeb69cfa14c7fc26589e1b4a638dde83b92a
diff --git a/sys-libs/libsmbios/metadata.xml b/sys-libs/libsmbios/metadata.xml
index 5da9415b6118..426debbdad90 100644
--- a/sys-libs/libsmbios/metadata.xml
+++ b/sys-libs/libsmbios/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 39192d05dffd..3ccc25308f92 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -7,9 +7,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de
 EBUILD llvm-libunwind-11.0.0.ebuild 3207 BLAKE2B 38d6419d35871059220e6d43672454fd29a8155da65cd4a729679a01c8bf8a9c97078bd01256126370d2caf48f91bcc44b12c33a8f93f3a737b1128d09e684e7 SHA512 7d450f6dcbf347679c9ac33e8838d9f334bd000e971cdc4c0cd8cfdee0ffe5eee253172fa3c7418e0fa13d6e439e95cd8d816fb69aa2253510c9943486ac1638
 EBUILD llvm-libunwind-11.0.1.ebuild 3209 BLAKE2B 1d083ebb9be360918af9e89a9eaf98c84b6290414cb8870120d34d2c62c98369e942782a330d654bc80ff62817120dcf676288edabc22ead93b6e18c9d9b87ce SHA512 5c8ff80f595b24bf7cda3d724dba2946a47f57177db716246115c9865320bed3ca7bc8dd90547796d2baafce4036fecc4d7351d57ac925984c5b39ef4fb82e1b
-EBUILD llvm-libunwind-11.1.0.ebuild 3220 BLAKE2B 1a87780e778d92757362ee877add870e330ce263e9d8b997644d891497578ec5b18bf24972a86ef7dab4b09bcbcf3e70c9a38ef37789f9af76eadaa0616bf913 SHA512 55b3bbdd59be06c97ff920ef076d31b9f344fdcdd772378d34e87106480f77c2d88c1211c410b0a3985b718e47af753fc79213fd13d41d9dfb70a19aefdeeb0d
+EBUILD llvm-libunwind-11.1.0.ebuild 3219 BLAKE2B f0c036f8a6e3fdaa6f3d476a905cd65cb6442ddc1869b903c38c1866c836dd5c3581b8ffdcaef47fdd3633592eb984fde4b21856cf3a759c5269d181ade0c0a6 SHA512 ead13889ecd76740082f5ecb03308f7530f45a19a7ecdc96315d70b8c1c59d0b95af0de72ecceca775b3726b7a114cc5e8dca0918df9a2810b3c1916d6fed594
 EBUILD llvm-libunwind-12.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-12.0.0_rc2.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-12.0.0_rc3.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
-MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
+MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
index cc29dc8d0435..fe667842ccfa 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/metadata.xml b/sys-libs/llvm-libunwind/metadata.xml
index cfce3f1a81b3..d36a3f021769 100644
--- a/sys-libs/llvm-libunwind/metadata.xml
+++ b/sys-libs/llvm-libunwind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-libs/metadata.xml b/sys-libs/metadata.xml
index bb3bb995d357..1088337d85ff 100644
--- a/sys-libs/metadata.xml
+++ b/sys-libs/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria sys-libs zawiera biblioteki systemowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-libs/rpmatch-standalone/Manifest b/sys-libs/rpmatch-standalone/Manifest
index a342e1cf100c..bcba8edda8c5 100644
--- a/sys-libs/rpmatch-standalone/Manifest
+++ b/sys-libs/rpmatch-standalone/Manifest
@@ -1,3 +1,3 @@
 DIST rpmatch-standalone-1.0.tar.gz 3151 BLAKE2B e396d18bfb092aa59c70e81028ba889c1095c97b5f13bffbb4ae7b97a1ce63a6c536663304e4fdefaa06a22854dd5b986ff7238f0091b23bcd336cc6db0fca75 SHA512 9d8fc3be66f23b57793eccf62998d1c0ff8df24d8781d37ee99faf618cdceeda778132df2c75ace2ecd8aa6392bcdf15eaa9ce0acd657401af049ccf61fd5b14
 EBUILD rpmatch-standalone-1.0.ebuild 807 BLAKE2B 1b12d3c301190140ee79ded5e6cb1321ece98bb4358462357123ff1c5337f24e106e967862485bd2939af3e9330d9813bba1666002d59db96972f0f36dc533a8 SHA512 0a9f581b18be40bf695b880dece5e5365cece77e30fb5174d87502f9188f6e71e4c40137f3907290bf5d0d433f7cd4049471d05ce45a2d09159ab441a0c139d4
-MISC metadata.xml 338 BLAKE2B 9e5208f1306450844341cc5c0c69eae9646aeeb3fabdd001e77d848672913ce55d66892e16bb0d811701ee9f3812a57ca68a16687ef15f4b8bddcce7de4d7ed3 SHA512 ef9fe8a5c7f8e299969e6352b588f013c005941aabb0fe1488ce5d6f2a7bcf497ad7e682c1848c684906ded4539db4c83efd66dbca54978519ec65445e041383
+MISC metadata.xml 338 BLAKE2B 97c0a85d9e74b5b1b55d07e537d935f780492f93bf2e8db32de9aefe12b2e4e10962ee3cda8158e57670b770800f06f8bb1b39011f0c9f4db1e0658b272d761e SHA512 caac5ce1707e7b5eb7aa5ec655aa7dce6741bf4cc61fa8f09b0b6473c3301ea6be67930a3348c38f151879677f792ed5e714079369968aede2c0a04992843681
diff --git a/sys-libs/rpmatch-standalone/metadata.xml b/sys-libs/rpmatch-standalone/metadata.xml
index 4aa32e43cbee..67cf88841b35 100644
--- a/sys-libs/rpmatch-standalone/metadata.xml
+++ b/sys-libs/rpmatch-standalone/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
new file mode 100644
index 000000000000..6756eb8f98c9
--- /dev/null
+++ b/sys-libs/zlib-ng/Manifest
@@ -0,0 +1,3 @@
+DIST zlib-ng-2.0.1.tar.gz 697121 BLAKE2B c4e8c9602f9cf33746c842b2f100adad2fca2b3808691f73ca5b679bbac186a70bf575df731cf60797755275835a5839f4602e08e15faf16b216d4d6d99d4aeb SHA512 c3be0a29e07989353a41a07a4eb037efbc0de5a87f1a4fe338c97c0dc7145225bd1f1039cde4a440be3b54130e297153c5180d69a491b92bc8a69839a8c1a9e3
+EBUILD zlib-ng-2.0.1.ebuild 695 BLAKE2B 738b6ad23488631592fe8c1c0be99eb0d0b2e3963e3edf5c13eb39f2d9bf49322b6806264c0d74e6ccba6407c230d94f9cff6f2d04a296145b4f56985dc29256 SHA512 bd74daaa1d4e4216c79a12a7cb6e0dda502c43dc6e89c0e98c8df6d1e0efa9c2fa21e4632bdc7f7882ba3f4bd185d4abe0b6b39dfa190448c7ce2679713cade5
+MISC metadata.xml 420 BLAKE2B bcd9a2026fb660169b9d56d12c32b78160b18380939b4f44db319605c07c495849fe1cf33f208fd35920dad0aabe3c5d59df7d54685d022a8264d0d31f20bb8f SHA512 344b9daa07f6e11684358928c70b0469058d3d126af49a1be153395686ea87d3a889c9e9d234e44363d7e438dfc321be9d93278e299df0415f3ae8404cfe95e3
diff --git a/sys-libs/zlib-ng/metadata.xml b/sys-libs/zlib-ng/metadata.xml
new file mode 100644
index 000000000000..44db40fcc5ea
--- /dev/null
+++ b/sys-libs/zlib-ng/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>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag>
+</use>
+<upstream>
+	<remote-id type="github">zlib-ng/zlib-ng</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
new file mode 100644
index 000000000000..6c9d4fdc34fb
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id: 688f948c5f3067e775bfab5057e8047f467a9ca9 $
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ZLIB"
+SLOT="0"
+
+#KEYWORDS="~amd64 ~x86"
+IUSE="compat test"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	sed "/LIB_INSTALL_DIR/s@/lib\"@/$(get_libdir)\"@" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZLIB_COMPAT="$(usex compat)"
+		-DZLIB_ENABLE_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index e08436ba7a2b..be415421d055 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi/Manifest b/sys-power/acpi/Manifest
index 6c2f00c2f3a4..5e96d4429e8d 100644
--- a/sys-power/acpi/Manifest
+++ b/sys-power/acpi/Manifest
@@ -1,3 +1,3 @@
 DIST acpi-1.7.tar.gz 100501 BLAKE2B 0e98ceef0cd51fe5616f8209e4967010fed6e4d198549196b8321dfada499fa3bc220cf0c64b9c9c6dbbcdf80d2fb1428ee3b98f9bd56ef59b508cb8c06039f0 SHA512 e6c96707d651eb20aa4a4c76f78891154d576ccdfaef08b5eff6094b90b62a0e97f6e35a4a996dcc3b5f0b57ee2c60542f41832039c6cbdf853ff3d022c1b609
 EBUILD acpi-1.7-r1.ebuild 373 BLAKE2B 1d70333746ac637ccce072a4b8905c4371a071a66768d2c5583fedeb5422d522258a80609129fcd3b8747a1ee9579e1c7346c6db80e098872cacdbcfa86617ac SHA512 bd99e5e017715319ca4e88576fef746aaee7f18317987c126370b62ac9e8872cd12eb9023f4ac3cd43bf6b1449d433c2db4832694784597bea200cd7b1d282fc
-MISC metadata.xml 508 BLAKE2B 1e248a23a97eca4d520eda0506a064175cbf07ee2738cf2bfea48fb1b510ba92e233fc9058f6da2c8711a99bf7edd8f0b4f893123ee34cf54b5ea3fe74626d19 SHA512 a7f43d0a59067dd511b98c9ba7a15df76d448e3e83f8052ceeb917e8fd2bad256b9876fb0957b0ad75d5c96a2b2a350fb619ffc69489e86c7499b84f03ae3a16
+MISC metadata.xml 507 BLAKE2B 13c7af33a60058f1d9c9898526c627d4ad5b6ee2853897f24ed891b28351c5dd8c3bfa378f63f1ee6117d9de905af150623e308c95cea9e8679ce58256d34e2e SHA512 f0a47a1d026a5903578ecbe0642be6507263bc62b9f0beeebd30de42f011c7ab4542a4ba3fa5ec16cee702e111756919cd40a6620c222fd6e4685e8950d5f8dc
diff --git a/sys-power/acpi/metadata.xml b/sys-power/acpi/metadata.xml
index 8d20350fbfa8..700edee8f952 100644
--- a/sys-power/acpi/metadata.xml
+++ b/sys-power/acpi/metadata.xml
@@ -11,4 +11,3 @@
 		support ACPI suspending, only displays information about ACPI devices.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index bab12b51c299..b437a44e1939 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -4,4 +4,4 @@ AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
 EBUILD acpilight-1.2-r1.ebuild 1493 BLAKE2B 0f0338f8f615905cc32cf86989b8d22444083bb1ed54fffdc26f3643f15ba579e127510ad36ac627e3aeb971fee633fbc8d75d2663c8c85b3d1b9bc0cc3b72cf SHA512 b2ea18b03eca0c055931f3b27ce3a4c37e0e427ce616318b266779895cb600fef96b381899b419319e822cacf15a6b060689f4d0b2620d26f1c1ad0412d7ec63
 EBUILD acpilight-1.2-r2.ebuild 1570 BLAKE2B 3590c498247d7f4c6606e63a9611fc787ba46cd24060cab0a94f6f593ea036e3f415d7b36be4c230e5028bea65dbea29edc9cc1568dc13ee58428a81d0033467 SHA512 b3d32d4a2a7936b14c2a7cad1ff0ed5fab964b06a2944ed638888311671108ae066b090aa609ccdd4eaa3669413f55c59c3b0f9c9cd97ea6e2f70d4a2517a55b
-MISC metadata.xml 337 BLAKE2B ad7ecd612b078bad830f6f10efaca7f41b7b5ef1d290799ce4c2dbd5489076c5c0fc3500e0c64bc3f00f448f80a1eedb9737c967258bbea5e105a85d7e4b8749 SHA512 6f624eadeaad1f4a440a2663ac9672cd6a36dbb668d11bcdb621aa5ddb739632c8bc74bbbde9905adf023618a9432a26bfec4f6861f5e4ba6167a0c2658dacd0
+MISC metadata.xml 337 BLAKE2B 137496021eaa8a35ea8322f6880dd1726dc771a8e3133f8419bb8f79a554994abacd1c580983dda05aac08e4ce8b7521b9f9646358d235690d2dca5aced4c162 SHA512 64f73bb25c630a7666b3f2c0abd6502fd55042721c70e01d454eb5963ca87ba9b70cd686d5224bf4de38cd048b19a3441ddf2ef31f60134d25e853ef7ba32e21
diff --git a/sys-power/acpilight/metadata.xml b/sys-power/acpilight/metadata.xml
index 8d3a1b7e5808..0a3a90f6ea50 100644
--- a/sys-power/acpilight/metadata.xml
+++ b/sys-power/acpilight/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index fa6b425cad7a..7ae8f0d745de 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -9,4 +9,4 @@ DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
 EBUILD apcupsd-3.14.13.ebuild 3924 BLAKE2B 85dfef3e437613485b35d62f6987340d9dbeff63f0da334fae429e629e137e7648c3138f669e22f6a0975acac07d8d6517c75830835abbfe91a4cd6d41bdc7c5 SHA512 5197db78dd4be02b5e8ea8316d69e06fd065d2b43900be364faaf363712897888dcf5b8315c13d6d37fd1ba9f91ac7ce2f4625f99eab3183ba9f3233bb2fb8f1
 EBUILD apcupsd-3.14.14-r2.ebuild 4042 BLAKE2B 3c71cb4717d389d1d6ff192c9654df79c515efde571b62e7a58bbf3dcd270220fba0611cc85f258255d95f989006c9a3521e62030b9fe2780aa48ca344c03bdb SHA512 864ed6f867c2f289318bd7ac8a1f123758bedf76f729c5304d84cf4a56e46313dc83054e2081e18e8a71a303e9da68d1e239e13b61e1b092d6e40a28c3ea6c09
-MISC metadata.xml 1147 BLAKE2B 6a0413c0c55b0ee6d7a81f5fdaa564b39701a7b3f4fbacc1423305aa37a59f6ee504dc46bb52bcb8966f06bb7a8726f742c7157e379d167a9c84ab89e328fd0d SHA512 5b108c92859291038ae58e1c02d865a485635c95d8f198ab1131dd898863328ab5010d35ca27d186afad3c5f97da33544bf5e5fa9a6b0625b2873577b45d74d7
+MISC metadata.xml 1161 BLAKE2B 6ea52dc98c841f0f6e018f74addd11054ddedc635d0f153f5f629b6949eebc0833d3c5a7e27a584a0344dc48319de2cf85d0304dd03ba77927244654713a2488 SHA512 384db8369118c9d430e4baea4d65bef498ec4f198e0379581eac77f081fb34705ce5171fec4753beeaa5ae3c153fe98a91dbebbd04ce5c671172c7ba28d30dfe
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index 00da0f8dfcfe..896a3092f089 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>john.einar@gmail.com</email>
 		<name>John Einar Reitan</name>
 	</maintainer>
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 5f4637a403b4..61a4cdc1454f 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -4,4 +4,4 @@ AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776
 DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
 EBUILD bbswitch-0.8-r5.ebuild 1135 BLAKE2B ddb38409e9e6222deaf4fabe96b19ec744cfd8a7d6c94a8d3bd66996c1a6e87b19a69a2313a549fac3995743e0c9c38b9146eae7e07b79230a37588bedb056b0 SHA512 fde0d208777d494e3f8f8deacf5fc63185c16caaf2ff5e5f240faf51554b3ea08690275a208d2b4d248514050bb3a9e72a8ef9da167b57a5c932c296b68f188e
 EBUILD bbswitch-9999.ebuild 1137 BLAKE2B f76f3505d8f64c195dfe5cd9335ae9e49ccb1e8500f203899122016605505d37a84a03e202115a65d94855b93a34954d71d0344b81c9b3260d11347e0a63222f SHA512 32a0912adbca5994fb59ead90815d4b6c66fa2c6968a8f23d668a49e0d1b402a81481ffdf4c929ae6d62b4601e677ed99b21e80e5318cf5235a69f2782fa5c38
-MISC metadata.xml 966 BLAKE2B 096cb37170595f2e45b77f655a6b7ba536ca03eec125f079ec5b461e3cf32b0ca1abc3c8729ef115d578d1f22a4022f5b765c346a63b6c02a5395c453256e4af SHA512 0196cceb9865cffdf0bc640004d08782001cf914e4e2f300b84056edd11d4a94d04abb756dd11e07fd231ff7b4f920191038746486316438f5b2ea3432b2ba3f
+MISC metadata.xml 996 BLAKE2B 7b493e829b238fc1cc2c6bcc410ad671c09dbbaa250a4206c17d74e7f419d4bf60dffd227b2a01eb95d0adad135a41e0470790b8b366922d659f75dece51f55a SHA512 11d4290376c829bc57fd34515b4b4c08f6b275408fb94e5bf6c7fabb2d12b3ba16fcd28e027963934edf0e1997629044b9dec2cf5d14f80b12ca5f794c25634b
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 8ee153cee09c..3b9767d3dce2 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -13,11 +13,11 @@
 		<email>mva@gentoo.org</email>
 		<name>Vadim Misbakh-Soloviov</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-power/metadata.xml b/sys-power/metadata.xml
index c4863318d020..625d3186b17f 100644
--- a/sys-power/metadata.xml
+++ b/sys-power/metadata.xml
@@ -40,4 +40,3 @@
 		procesora.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index 06890d7abc86..7338df18a54e 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -4,4 +4,4 @@ DIST powerstat-0.02.22.tar.gz 59609 BLAKE2B bfb392a37fa5fe9f03360fcad3435c73b34a
 EBUILD powerstat-0.02.21.ebuild 542 BLAKE2B 0eb98edbb1850fad11328e79e704b6f86ce952943653831aab5fb09f5b9944b9f18c92e4b589b34f1214594566d0af0da29e2c119be1796499a529c3a85243f6 SHA512 61692e5b56403d6ec24f151255bb0ee9d6be024602bd3535825f1b647cf34d16da6d0357ae3a0c53b5ba7330b00d947ba728bced982a0611dcab6e8119ae241a
 EBUILD powerstat-0.02.22.ebuild 632 BLAKE2B e8f15c044440806558e577e8daa5016845998c73e7b59117cf987347c5baffb5fb91362415becffcf2dd4e9f282981747643cd4c2e23016680fbefe84b8504dd SHA512 6b1d5a42567efc032203a71d865334ae84007774753b0a94028aae21adf3bc0cf3c5a5a3bed95861fc25107a10427789c3d10b800b67bd7d66729e7682bf8264
 EBUILD powerstat-9999.ebuild 613 BLAKE2B 650b18e1d48b3eb859e73e10e36dda27ff87a39988f515ce0b003f4b4de16c6b674318e9dd1cf9a35890c7341f523a6692ecd4435e0322f61fb403bc11f2a835 SHA512 34b116b524169edddfef4d0a78a044bb26c9aa2486420e979cf98c5c8a6ad6ecb09279cac9c7b8822f3f6f21d112f7f108317bbebaa5a1b9ee3cbae3df179f7b
-MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
+MISC metadata.xml 888 BLAKE2B 937f0cb4c984f10cba7989d53e89c86eb12dcda65a50298e4f903b413f7ee15d16c1d2f79fb64333e0fe28aab1d451ff24f97c27fe0219895503978796e94463 SHA512 2ba0c3aa36a8adf15c8d06eead9fe78803f205140dbac10067035edeb65e3f95bf3084588346038f7c748ab3656b03967fc2c7f71b3aacfba1b4d256f24e7dd2
diff --git a/sys-power/powerstat/metadata.xml b/sys-power/powerstat/metadata.xml
index 7e75f57b5d80..9ed6df763159 100644
--- a/sys-power/powerstat/metadata.xml
+++ b/sys-power/powerstat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-power/tuxedo-cc-wmi/Manifest b/sys-power/tuxedo-cc-wmi/Manifest
index 8c339a7340f1..b35fd5f68dad 100644
--- a/sys-power/tuxedo-cc-wmi/Manifest
+++ b/sys-power/tuxedo-cc-wmi/Manifest
@@ -1,3 +1,3 @@
 DIST tuxedo-cc-wmi-0.1.4.tar.gz 25089 BLAKE2B f71eedeb02a301caf27ef12326cc9c163631788c5b991e980e78b618ff767ab4c0f6a609ebffefb3afa830b781e6043bdb85b9e4659927838c280d0aaa3b300c SHA512 a41faa7290859410eb8446dd02ee2bdf87a3085882f3fc6b968701bb14bab87bd6bcd4bf9839111c62eab8a8751f8c2cf378aa7297879f7781f73998199e5f27
 EBUILD tuxedo-cc-wmi-0.1.4-r1.ebuild 569 BLAKE2B 3974f0fb4364fb433e08462fed3ec19d40c25993a6076e293a3e0d56bfb3407c787492f2e76a4e47c60e9730d3ce5406203c22929eadd0ad44a42d51f70ffea5 SHA512 cf62cad568bfeaf5a322af17b0388f5c6a555ebbfb5266d6b38127709dfde9bdee3c6f9a39f8c305ad3039c3f3a485a6a8dcd666043417e04b0f723ef6777a9c
-MISC metadata.xml 257 BLAKE2B 509de9ecfaa2a50c6900b1ec69308a827823d04fcd54b77575b9b18b71b508bfeecb4be9e230324cadb1bc70674516d4e6744a0dd50ed0556fd71b7b2458f86e SHA512 5f02fa3554ba0e4203073be18f3962b6b6c4dec5b7bf36dcadd9de78827b31c766573268d6c9b092a4e7382557fe423fc31899cfe963ddbfae9ee6015c05c920
+MISC metadata.xml 256 BLAKE2B 2662d7faa80a4af3161e1c2b304d21fc61d49ff05013f4de1c4891ff4614296c42a7cd03d00b23fe32e8e10f27329effcd157bdee9f8582b3c4835ae1b410009 SHA512 e7731faf6b4148811f4d7598947e2800d8c298098a4493b17b902a9871266154813345e76edab8aa87c84fe2b0f73fcdcc13e140d36a12d00df166974a1cada7
diff --git a/sys-power/tuxedo-cc-wmi/metadata.xml b/sys-power/tuxedo-cc-wmi/metadata.xml
index e42604230c16..f6780aa3b751 100644
--- a/sys-power/tuxedo-cc-wmi/metadata.xml
+++ b/sys-power/tuxedo-cc-wmi/metadata.xml
@@ -6,4 +6,3 @@
     <name>Marc Schiffbauer</name>
   </maintainer>
 </pkgmetadata>
-
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index a3870c5fe525..d9947dec8330 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/bashtop/Manifest b/sys-process/bashtop/Manifest
index 3b23a2f555c2..23a483f39f46 100644
--- a/sys-process/bashtop/Manifest
+++ b/sys-process/bashtop/Manifest
@@ -1,3 +1,3 @@
 DIST bashtop-0.9.25.tar.gz 443776 BLAKE2B e778f7657a0502a47ed008d9a54514a7397fa3d2f04a3cac0f98faf67b0b183329f0a760121b0e1e7f7bc28a0ff37b43fe514a524eae81468c9cac573da249d2 SHA512 bd70c1e5b8876be38afe5987e60af0d59496532e6f0a87d2b3cd62c2a251fe627d0fac77e757f01979a6d20b43948860f0bcba4d8a1c54f8ef52d02ad4547a7f
 EBUILD bashtop-0.9.25.ebuild 730 BLAKE2B 0643ce0384b470f0d91bdd5854b09e0fc0c85d7e73532fabefaae80e0caee5abe1f3601e0d4386a8e52fc78d3761ab198e78d74fb3a3064f797ebf01f1cb27ee SHA512 9a57fe838be41ebffc679a4d4082c890c057d476dc4c1064cf55dd1f7abf468fcb066250026142724e1d0e2214510e8d44f35170340bb7659e4133c99c3fc223
-MISC metadata.xml 392 BLAKE2B 3ea08bf75063d80d8593c8f0c56612582f3f197aa812832abcf42537179ee9f7f79bd3847eb08ed38d8c41b721a94672fe5e5cf4fe9e6780bb5599ff37e1f630 SHA512 cc3b3fd52dd55e7cfea802f05e11a0ca1cbc26473daed400fc48e152a37631ea2a60bd958d4ea7d541303bb565fabb024e98b048e675d9f62b1bc21a2e63033d
+MISC metadata.xml 405 BLAKE2B 5d0a2aeab3de5243039205787bc8784cd83ff090a7f70b269b6fba7dffa0543008dcc1ea6d7866474dff97b7bc9346bd1e37c1937287be5045c0336376bac6e5 SHA512 28f20a2b221aa8960e26d49a2b2ecde74e46371b5ebedb9d946b1526442659193d791fa26db6f30da4de345c06676ed3e8f608aa8620b7d14d534c98814dddad
diff --git a/sys-process/bashtop/metadata.xml b/sys-process/bashtop/metadata.xml
index 27c5d47a6d32..7f31363d0548 100644
--- a/sys-process/bashtop/metadata.xml
+++ b/sys-process/bashtop/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-   <maintainer type="person">
+   <maintainer type="person" proxied="yes">
         <email>zshzero@protonmail.com</email>
         <name>Ashwin A Kumar</name>
    </maintainer>
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index b3a4447aacd9..76ee93065051 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -3,7 +3,10 @@ AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edb
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-1.5.5-autoconf270.patch 582 BLAKE2B 8bfc34dfa925abab58ac156845d848b4d714430c3cfed0a453b565e76e6462f3214acaa338bb9d36b72a1d3484d7daf16f5ea41d42ccb8cbca024394d3e85c00 SHA512 7a7f5496e68fd43c804a7b39e32e0b7cc07183c02cc60bea91cf949e9783d85cd8e8143b53e0a1341dbc8dc209c688a35ae04940b2ae953db723eae6f0962639
+AUX cronie-1.5.6-autoconf-2.70.patch 1303 BLAKE2B eae651f061c318c890e1854dd66d600fa301d0060ca200621ce5cd0fa654221cb75ed512921ddc0287e5c2708eb31b7bfd6dd10a75107f4048ac85cc143ec612 SHA512 bb3986249c9cf8d9456ce65925a77b8f25b99b8d7443b7cc09903efbd55702bbbcbc7f65ef7ab55a5bd2a6c62adeb4abf90d41ba946b82b7db9a4b122c834d50
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
+DIST cronie-1.5.6.tar.gz 148374 BLAKE2B d511ea49804bf8e1fb10bd43bd37c03594ca4836c79a25b6c8a3e29efe50c11d0ecb6252e4d45bb186c33e2034040c7fdf009d20c305a03198365aba93979fd1 SHA512 bfae9b03627256367c7cdecd8ee13a3625386ea01ffa318d6f2b2d9c3f8efd5e31572125fbf7efd6ade8a22e5cd69e36e915a4ca8f554b553478059bc8be3337
 EBUILD cronie-1.5.5-r1.ebuild 2602 BLAKE2B 67149bc5f6e388930042163ebb28b62e5d2dc6710283c635ad4bf036d7d0c08d6aafca69bbf92e62340313ae3dd0fdb3f0034e5c4f87e2f4c03a821ea2f23d53 SHA512 77b5a10e3ad99ecc1d555c429060979d2fc9e8d4310383ee426d33b6f100a206b3e2f13d89e01a1d607bf6703388f8baa9d395068c70bfa5e9654868285479f6
-MISC metadata.xml 891 BLAKE2B fe26178ef61d59391ea0ec3817c37bf3ca71b196ceb070244099a7cb1a34110c5c0d0903b682d08f1afc69ed2fd9a18aa9aaee21d61e22f388625dfa7a63a908 SHA512 91d9c91d6997261d59cff08c5c2724476d6709993debf0dbcf4abb38d2c99fe301e7d64ed759fd660e9774e81a8fb51e147a0a194ebe733ed6f9c80940ea7658
+EBUILD cronie-1.5.6.ebuild 2591 BLAKE2B b125c30b1623a190c0408a03c5de7a919552076ac4b290a7433768aa5a54af95ad827a3482f76fe9b79c8a41c04710a9f84500588335e87f0fa3e6dda510c49c SHA512 0dfe51d1ba61b20a91192342577a1bf133a054139db34304b5f90a2ad9b4de7cc795aea7096694cc8aa3a7fb1d1566f7d8bfd423c6b81df7d7deab8f857aae63
+MISC metadata.xml 813 BLAKE2B f6af6d92d0a7c0fa8f38574b969dde935bbfc791f05e55c90c21a12c82738c436daa3e40c75d800c683f5ddc9bda177d78218d6b897e00ed0355fe1447d950b9 SHA512 f45dc3cca0b355df94bc5b67aaea6d903440e47f317e8abe8b963a77f18477ac02fd7f21eb7a7cb168216e17f5783461dc9fc5a2e01dc7d408481c75cfc4740a
diff --git a/sys-process/cronie/cronie-1.5.6.ebuild b/sys-process/cronie/cronie-1.5.6.ebuild
new file mode 100644
index 000000000000..d676c18a563a
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools cron flag-o-matic pam systemd
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	acct-group/crontab
+	pam? ( sys-libs/pam )
+	anacron? (
+		!sys-process/anacron
+		!sys-process/systemd-cron
+		elibc_musl? ( sys-libs/obstack-standalone )
+		elibc_uclibc? ( sys-libs/obstack-standalone )
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/debianutils
+"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+	"${FILESDIR}/${PN}-1.5.6-autoconf-2.70.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
+
+	if use anacron ; then
+		if use elibc_musl || use elibc_uclibc ; then
+			append-cflags "-lobstack"
+		fi
+	fi
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+
+	if use pam ; then
+		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+	fi
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch b/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
new file mode 100644
index 000000000000..958047784c5f
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+From 44f6a0db3bac50deb11d15d3d847c41932afbfea Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:44:38 +0100
+Subject: [PATCH] configure.ac: Don't use AM_CONDITIONAL inside an if statement
+
+or else configure might break:
+
+  configure: error: conditional "NEED_OBSTACK" was never defined.
+  Usually this means the macro was only invoked conditionally.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c575dd..b578431 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,11 +260,11 @@ if test "$enable_anacron" != no; then
+ 	dnl obstack.h is part of GLIBC and may not be present on other systems,
+ 	dnl eg. musl and AIX. There, we static link in our own copy.
+ 	AC_CHECK_HEADER(obstack.h, [have_obstack=yes], [have_obstack=no], [])
+-	AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
+-	if test "$have_obstack" = no; then
+-		CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
+-	fi
+ fi
++AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
++AS_IF([test "$enable_anacron" != no && test "$have_obstack" = no], [
++	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
++])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-- 
+2.31.0
+
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index 091908ba8d48..a9981088401d 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -14,7 +14,6 @@
   </longdescription>
   <use>
     <flag name="anacron">Install the periodic anacron command scheduler.</flag>
-    <flag name="inotify">Enable inotify filesystem monitoring support.</flag>
   </use>
   <upstream>
     <remote-id type="github">cronie-crond/cronie</remote-id>
diff --git a/sys-process/dumb-init/Manifest b/sys-process/dumb-init/Manifest
index 59d3e20625be..85c454b32f65 100644
--- a/sys-process/dumb-init/Manifest
+++ b/sys-process/dumb-init/Manifest
@@ -1,5 +1,5 @@
-DIST dumb-init-1.2.0.tar.gz 23370 BLAKE2B 43bf4fb99090065310516a617fd507e1f32e3d210df09ac8d0d31736614e2a1bb248b399606493f86967759f3245b58018c4d832dcfa24267c29403b5aec43d2 SHA512 07f75771014c897b2e2f4de84b88ef5b829e19df81f6cbde0372a2f30ea78237af8e5cd6ab47b0a104606ea3b85c9883b86f777bc49bc428d52a32a4ff2ddad8
 DIST dumb-init-1.2.1.tar.gz 24472 BLAKE2B a2d18aca8e67f14a436ef5a23d5010339e803cadeeee5ec01145c9ddc0e000d2ec3f91b5342f57fb6ec63c174ac51e058ec14cc6d38dbe2d9a0fcad4a82ce4f9 SHA512 5a621caab17e322bf67f6b1eecfed7a0b4c59f2369f62745a7403343d0d01a800fb075b7579a51b5f68f404a0fb35220b937b7253d1e598dfd32d9360b84ddf4
-EBUILD dumb-init-1.2.0.ebuild 583 BLAKE2B 6f5e1c5dc4c618a097e3fc04428ddfaa1d98ca0f6398e82cc44ed5e1479ceaac85d812161dbcb018353642ada7b8c73bbc4f56beba6a3fd9ba9c7d2626366616 SHA512 ad0b3f50a3c0deab6bf875ec68f70a5e3787d32bef011ddfc84286bbc05cdf56e3ff46b5a5638211caabe432ace7e512c2069237b36d6271a74c2ea4221c8691
+DIST dumb-init-1.2.5.tar.gz 26199 BLAKE2B b5733bd12fa2c2ebf2357a531d34e4bf92c29eaa3729c0c03dd1754c2ad43ba9ffc321f6e471d523df355575763d01b74af1950aba0fc285b9520d8052b1b07a SHA512 b2822f8d80050edd03495acb74c3087a9d4bbadd0250ea0166d67799d4308a2e29e1f08c404c232a418c6f09cfdd8ccb4fed1b29395e1b670965b770b9f310cf
 EBUILD dumb-init-1.2.1.ebuild 636 BLAKE2B f39ddbc8e27ccedaa3d70ac5718bc3eaf4a2a6d811dc8e33640102c0a3c4470aea54e76b12bfba1f3619d8417cced6b6814efaa0c374b54e0cafbd00a7dc768d SHA512 a1a3b9ac0c0032c34e16808d653c8bbf00e2ec2b6c85c6490940dc29b9f2e1df1cbbf8cb0b5c28bd7030943873d4fe54d7d2494d6b76966277235e9418f87309
+EBUILD dumb-init-1.2.5.ebuild 633 BLAKE2B f860e41c834a32932c11a89d19ee2aac9bd57479253aae0dc244b5134cfc156ff218c2a54ba235983b2b211c9727bcff2f8ea4ddfa2280c9c9cd1d8d4d30c1b5 SHA512 c802682a858cd99f5d9f1870a3f8f48ed78f3790f7466bfe4bffb65f3cc8ef1534446a1dfebd71c79f911c7b83b95fef23e88768db70482209760ad6ae98c5ec
 MISC metadata.xml 370 BLAKE2B b7fc36b47b1559fcfda9f48837c34bd3be5e27c8060279ca07a9044efd9563a679e28ca9091cc593a0e1fa58f9377717d233784bc1d079cc0d2a2706ebea8e61 SHA512 9da1c5732139dcd56c6dded1ee2e95349d0a3f264e33029900b35e92e764640ca0eb973ce00555b57b4d06cafca6cfc63c5c9189942a7fba7d9bb8219201d217
diff --git a/sys-process/dumb-init/dumb-init-1.2.0.ebuild b/sys-process/dumb-init/dumb-init-1.2.0.ebuild
deleted file mode 100644
index 34d2910320b7..000000000000
--- a/sys-process/dumb-init/dumb-init-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A minimal init system for Linux containers"
-HOMEPAGE="https://github.com/Yelp/dumb-init"
-SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	use static && append-cflags -static
-	sed -e "s|^CFLAGS=.*|CFLAGS=-std=gnu99 ${CFLAGS}|" -i Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-}
diff --git a/sys-process/dumb-init/dumb-init-1.2.5.ebuild b/sys-process/dumb-init/dumb-init-1.2.5.ebuild
new file mode 100644
index 000000000000..7f2a1645a6e2
--- /dev/null
+++ b/sys-process/dumb-init/dumb-init-1.2.5.ebuild
@@ -0,0 +1,31 @@
+# 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="A minimal init system for Linux containers"
+HOMEPAGE="https://github.com/Yelp/dumb-init"
+SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+RESTRICT="test"
+
+src_prepare() {
+	default
+	use static && append-cflags -static
+	sed -e "s|^CFLAGS=.*|CFLAGS=-std=gnu99 ${CFLAGS}|" -i Makefile || die
+}
+
+src_compile() {
+	CC=$(tc-getCC) emake
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 6b8b5de2afd3..6bc35f8e0ac3 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,5 +1,3 @@
 DIST evisum-0.5.11.tar.xz 4363660 BLAKE2B 229acde8f8559bb6570236a511bf7685c5f47c33d39ae967fac693510bc1e164ddf1318a7c491f3bfc563f3ee51e541896480161e1e0e9e47742be0f9fa33a28 SHA512 d6d7c7d17ad231a68650e27718d578b698d48db0bbb796758fc6202b6928f02d1fe171570ebb46d527873d11cad221c568eabc2cdcdb3ebeca210c92f19d82ea
-DIST evisum-0.5.9.tar.xz 6928640 BLAKE2B 38c4f0c40fa4747004a891522be2744793bd8c8a6f28ed22961737f17aaf5ebe178c24ef1e19bb31e834c8cb3bd35c95499e1ce3e41371716c558a4596374153 SHA512 6fcea6f2a7a7cfdfc8eccf7cccb10bdf7abe4990f420fa1947d45a5e3f49411b0b37ccef8f53b57d5db4ec9bf0cb9f92369b8c2aaa9a545469b5f3316db609cc
-EBUILD evisum-0.5.11.ebuild 435 BLAKE2B 562103ca6a8ea69c2953b7fab3ac496e263e74ba86d417a209854393e4bc578c8ea8a64ee23328a76ecb5b7a2f57467486df12e0058e48a00324d9a60d7b2307 SHA512 1bba29edc8b7f6356e1e6f5a10daa85f6a5d76777d9817b95f47bca81448ac10e62bfcc4d006f5823f2b0cb2439b4908bb62236754f0876d67f84be08412b1bd
-EBUILD evisum-0.5.9.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b
+EBUILD evisum-0.5.11.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.5.11.ebuild b/sys-process/evisum/evisum-0.5.11.ebuild
index 27f90bd1e8dd..4a7b1c25a1ec 100644
--- a/sys-process/evisum/evisum-0.5.11.ebuild
+++ b/sys-process/evisum/evisum-0.5.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/efl"
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/evisum/evisum-0.5.9.ebuild b/sys-process/evisum/evisum-0.5.9.ebuild
deleted file mode 100644
index 4a7b1c25a1ec..000000000000
--- a/sys-process/evisum/evisum-0.5.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-DESCRIPTION="System and process monitor written with EFL"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/efl"
-RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/metadata.xml b/sys-process/metadata.xml
index 18512914adfd..b2eaf83acec8 100644
--- a/sys-process/metadata.xml
+++ b/sys-process/metadata.xml
@@ -44,4 +44,3 @@
 		Демоны 'cron' также относятся к данной категории.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index 422d4ed6a478..4676c3adddd2 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -6,4 +6,4 @@ EBUILD nmon-16g.ebuild 958 BLAKE2B 5086bd2d5d81c935022974c242b9de9fcb5126bb5f5d3
 EBUILD nmon-16i.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 EBUILD nmon-16j.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 EBUILD nmon-16m.ebuild 982 BLAKE2B d88ef3baa7bfc7830aa188d666af5da401603d6d1843c46c09e37b05bd7625a4825d8cd82dfa43c1d8c8ee34e1bf535d08d1dacf5deaaea9786b3a566d2b6484 SHA512 5fe6863a6dbf54b616d4515af9fba21955a48790498d83e3548a47d005450b55eafc2a4b442e03912e4964b305bd479d9a26572704e52e7753e1222c14968b0f
-MISC metadata.xml 433 BLAKE2B ac6a0efd845d02c926f079773da5d75dc7c2ad1c582637b1a711e6f4a23a4d3e9ca1a8257b4033402e23f2904ad55099c791146b00a7eef9eb6362bff015d326 SHA512 6c9688990c2c3b2b7e484b2e9366653f80e47af42c6c75ae6cac06bd98d6d4252a6ab782e0155c25417165da6cf2e4deec95c16384d712b8e6d97f6d19becbca
+MISC metadata.xml 447 BLAKE2B 180b02575186902ff2a329c61ef825c31fdee2f58653f8a7cb5e69fad53ffba96bb8a8dc04cc8acc83382ff1f0208c46d3fa436a26b4cef4478772fa3de81452 SHA512 888120a59bacab218df029d22938d0c090ca387d4cc727635df6238caf524a7c6d27c60208364b050ea876e7f6b3a6699da5b5b35becae00345169dc2ee17183
diff --git a/sys-process/nmon/metadata.xml b/sys-process/nmon/metadata.xml
index 2774e2ffd6a4..205cb1a80050 100644
--- a/sys-process/nmon/metadata.xml
+++ b/sys-process/nmon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
 	</maintainer>
diff --git a/sys-process/procenv/Manifest b/sys-process/procenv/Manifest
index 6e597c6df387..c751e624b442 100644
--- a/sys-process/procenv/Manifest
+++ b/sys-process/procenv/Manifest
@@ -1,4 +1,4 @@
 AUX procenv-0.45-flags.patch 282 BLAKE2B a3caa11121631a2676146ef7195e154743d99c970a4b5c2a8b5e5b90716c30b56fa830ae06e7f580e4854aefde64000a0d803995d2a23cc89e52b42a35e024ea SHA512 ef90b8659f63ffaa114244e9b02b345c721e26bdbd5181b6daf45eff9671c442cc94b853d3e66fef16b20614515d4ae0885662c8875b529aa552ccd345c1e41b
 DIST procenv-0.51.tar.gz 245663 BLAKE2B 1e7a0b9fddbe0c4f0aaf895ae1174f69c84d6b043794b5cd23f678dc5c762d892e49ce9b91c78c0fc3bd4cf4064e94c1c43758b4cdd596d6d289a929b3855043 SHA512 0f0b0fb4aceb4c6aaa4f2f4f8e139dfbcecbed2101ac4c44e4b1f85420fbf15967b9ebf8c3d2868260afc2957919f15a981ae49f0cf91c9f2c7ea05c96dc36fb
 EBUILD procenv-0.51.ebuild 593 BLAKE2B 24ee4dfd0adcd6a1250131a44a226ba5302a92cff31f4f66745955459452b3adb044653aed7277265e31ab9cbf6bf9dd37bba75e54e9f11230092e0771bed96b SHA512 1d34a4b839eaa15b0dd476cbbb2c0ef8c48f6dd40cebf86cf9e9ad6b99c3aca32bc5590983dc2d69f986866bea17b98cb5ec6eeedeafbd2006853bcf1d45483b
-MISC metadata.xml 301 BLAKE2B ab8bdfa1d7c4b178dfb31c3d1a0d9130d4256e8758469c437cab3e429da0b6b6684656167c7c06db7fcbbafb881c5524dad46733a7dd105af380aa7fccee36d3 SHA512 145749cc19e13518401cad08354679b58623525a7edda941dc79d0567fca0fae7543643d3cc3ec6f46f19de91b7f6a69fa8d0dc1c5423f08466fd7ae91523ca5
+MISC metadata.xml 301 BLAKE2B 55915c9fd9024b975636026705f97d259d835582ea1b33f55f79e7cc1b3240dd6a409c4202184e7d025905cfa7cfe10a2242a89d13ad263151203d59aff986ff SHA512 0f33c11623ef26eb9b138ac0a5f23a8c1f9cf92f8a4a629b416693c5c395e216b54eca42718d95fab835a962572ebc87385d6bf925a596ca19d98d68ee406328
diff --git a/sys-process/procenv/metadata.xml b/sys-process/procenv/metadata.xml
index 77fa0b7689b0..32492370acbc 100644
--- a/sys-process/procenv/metadata.xml
+++ b/sys-process/procenv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 9ffe46dcb284..dd91db3888a8 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,5 +1,7 @@
+AUX psmisc-23.4-fuser_regression_revert.patch 1577 BLAKE2B 89f346146ca2fb71bc5bee87f880abcc6e2e9c6b5c3e911fb806ced2a89ba096de6ce052bf238f1c8df948ec1fba5b979763fd2baa6e0a7b46ba977482f82501 SHA512 b129d3355a022b0bd743a06a4912b1ddea386af0d1551fadbe8155e1733ac03df3c795a4997759c4db6299196af3b49dfb2c9e6840dc33174ee1f4afe4ef9df7
 DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
 DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
 EBUILD psmisc-23.3-r1.ebuild 1150 BLAKE2B b3ef07952efb80a7e13a5683e23949e06db15ee298e029bae355438fc7a49a4fbc1a30c8bde47502715062d36181dcbbdb9f830af41a1afb11889f013faaf186 SHA512 bc76d36a24722841f9078fb5a72e41e5e0df3e9489524cba257ef02d1aecf50c281cc883c008834eff0b859f2841ee9f60b7661c64c390d7bc32525816f656d4
+EBUILD psmisc-23.4-r1.ebuild 1312 BLAKE2B 16ee0fd4d8e9359134efc632f888e1da7eaf32755d889e69440ea7b12de46949fb56f3016bba453ce8fd452104c6d238e7f7b7d5c48b879f6adbcc059846b5b2 SHA512 4774a5fbbaf16ac60c5b8ad5459883c50082200d04710424c52ae1203f2635bfd879ee689bf05aea09e14fbb02c80678075bbb3e4367b2d9cc9e2d30a6a3ed2e
 EBUILD psmisc-23.4.ebuild 1195 BLAKE2B 5924989ee1655fb9439e4718847c9171a8e011c0707db01519215f7c919d0c241a3e0e887d0fc6f5ecebfece77ae748430fd9379315ad02c6115ecd866fa33a1 SHA512 71f721429c81332cac93cd1ee5f3c7d0abc7bed54cd47c031056aff302f3eeee2ae937aa894bea76aa8da96409bf5d3a8cf79d9e9974598ff6bc8d668b087453
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
new file mode 100644
index 000000000000..59b2bfcef1de
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
@@ -0,0 +1,45 @@
+https://gitlab.com/psmisc/psmisc/-/issues/35
+
+diff --git a/ChangeLog b/ChangeLog
+index df45ae3..be20ca0 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -5,8 +5,6 @@ Changes in 23.4
+ 	* pstree: fix layout when using -C !24
+ 	* pstree: add time namespace !25
+ 	* pstree: Dynamically link to selinux and use attr
+-	* fuser: Get less confused about duplicate dev_id !10
+-	* fuser: Only check pathname on non-block devices !31
+ 
+ Changes in 23.3
+ ===============
+diff --git a/src/fuser.c b/src/fuser.c
+index 03e6237..f9d78db 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
+ 	struct stat st, lst;
+ 	char *dirpath;
+ 	char filepath[PATH_MAX];
+-	char real_filepath[PATH_MAX];
+ 
+ 	if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0)
+         return;
+@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
+ 			     dev_tmp = dev_tmp->next) {
+ 				if (thedev != dev_tmp->device)
+ 					continue;
+-
+-				/* check the paths match if it is not a block device */
+-				if (! S_ISBLK(dev_tmp->name->st.st_mode)) {
+-				    if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) {
+-					if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0)
+-					    continue;
+-				    } else {
+-					if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0)
+-					    continue;
+-				    }
+-				}
+ 				if (access == ACCESS_FILE
+ 				    && (lstat(filepath, &lst) == 0)
+ 				    && (lst.st_mode & S_IWUSR)) {
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
new file mode 100644
index 000000000000..7f5ad69fee46
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
+	>=sys-libs/ncurses-5.7-r7:0=
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	# https://gitlab.com/psmisc/psmisc/-/issues/35
+	"${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-harden-flags
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable selinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	use X || rm -f "${ED}"/usr/bin/pstree.x11
+
+	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
+	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
+
+	# fuser is needed by init.d scripts; use * wildcard for #458250
+	dodir /bin
+	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
+}
diff --git a/sys-process/rtirq/Manifest b/sys-process/rtirq/Manifest
index a1b917e0c6c6..34185899475c 100644
--- a/sys-process/rtirq/Manifest
+++ b/sys-process/rtirq/Manifest
@@ -4,4 +4,4 @@ DIST rtirq-20180209.tar.gz 12290 BLAKE2B 432bf6c931b753d4d9a5d7c50a35b0fb9b2161d
 DIST rtirq-20191121.tar.gz 12755 BLAKE2B 040e1b39b83dc27e542093a12830fa51c9786c2747962740c31e684235acab33275a40761fd87cd1307284c2b8e49362d4acb216000338bc0744dd0ca6b0144c SHA512 bb1ae0099e37220b13f91303e56e8ae7892964638c1000fd66b6ceb23925c8aa2ac0c629bbb799a59c1a8adb035c34c4b0bee31afe05fcc9f80cd94d5a84ddc1
 EBUILD rtirq-20180209.ebuild 902 BLAKE2B 0081b1bc8013e04ef1994fe26296988726a1c080d9f97c8f09218cbb19a14e85db92ac03d666129b0266656a4bea05f22147c1c65622e38aad678e9e7cf9ff75 SHA512 e56be7a09553cdc6b734c04a652f3ebe28196818ed21b3e12b9b1797f392b6f3e8da1cc55024cc9c999e273bb2bc663ed0f16715c34596b443d000e27cec7847
 EBUILD rtirq-20191121.ebuild 1514 BLAKE2B dfbe4a08e1b0498fcf85b6e83632217c2e7b72bb9c849cd4f042651a6e5e7c5d53ea0200d8e767d280219e15070e0f5cc4bc0f688f57f0ef52b999432e4210be SHA512 144245e13c0fd540f40fb95e80d99cfb2e0c95e6e77eebd23881fa834fe9738eb0a47a8cf1f2e50f3578342a080605e86a290508565aa8f9532bcccf08176d03
-MISC metadata.xml 364 BLAKE2B 82a4ff6369bd09fc564b3859321f4fb128220d757f0c264e117f9bcdea3bfaef07fd310b8f002bc0be124ef3213da4a65a10c9da4dfdcf1357e01f106bb7c531 SHA512 b48f5be0596960b981da7b959be826657d758add02761189955ce35d25abf5cb768f10995a6d3ab88fff7d1ea8a4a9666a0b2030d624aae4cd06a2ec2484ac8c
+MISC metadata.xml 394 BLAKE2B 3994d7b4d98a6cdaadc6938c16715b866ba0e729189066aa0e974d50c573e1124ce7f5b87d070495145b4b130990b7ff220d9bec9d990a7480676cd2da127289 SHA512 8c4f5d487c8d3dbac76d13c0b41589753477113e44b64b0f49c84f7e1b64c3276f736e94c6e6745047e4ddafbd047badc805a5bcbfac2abe0bd0354b0fc8517f
diff --git a/sys-process/rtirq/metadata.xml b/sys-process/rtirq/metadata.xml
index 039cf44c7038..8ecc21d1608c 100644
--- a/sys-process/rtirq/metadata.xml
+++ b/sys-process/rtirq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9e38652370b3..c210a95d5496 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index 36d9019dd6c5..fd39a138ef08 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-1.ebuild 554 BLAKE2B 655db3ab80f832ffc732c72cc530d6295a50d004f51730ca847c0d3b7bdcfddd5d902bb4e7600d8c4cadf97d1f3dedaa319c4c472ccb08ec1b7b56dd6100ff35 SHA512 0fd8f7204650195bdc0736730e4c6d43a9ef01f515139bd34eeed107b90c9111bea116a3f64788293f5df5b95cd38816439478605da5fea6ef92386c5aa73704
+EBUILD awk-1.ebuild 471 BLAKE2B 20b487d55648c93ac7fb682eb9040947bc8b8c2e10ce4960d0878e93a095f06628f1bc03219356dbfe4608438a582be4dd6c824c19233db0e7fab62d3f364d1a SHA512 a0b803e94d6a17a561932a2531d3cb92eedf7e88036dbad99393c1e01b2b802b878da96945c9d10b1e697f2394315e48ba12194cd31babaf686e3b72cc86e9e4
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index d577621d0876..226d14fd6130 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
@@ -13,5 +13,4 @@ RDEPEND="
 		sys-apps/mawk
 		sys-apps/nawk
 		sys-apps/busybox
-	)
-	!<sys-apps/gawk-4.0.1-r1" #before 4.0.1-r1 awk symlinks did belong to gawk #455696
+	)"
diff --git a/virtual/bitcoin-leveldb/Manifest b/virtual/bitcoin-leveldb/Manifest
index 8022bb3ac77b..c3569190e153 100644
--- a/virtual/bitcoin-leveldb/Manifest
+++ b/virtual/bitcoin-leveldb/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitcoin-leveldb-0-r2.ebuild 443 BLAKE2B b5ff9dc33a6b67cac18219e26ff61750a3e6ded41762a530ece26ba08aca3d29f4fbb5799224c1e1e40eda0f95526b6e9df1e98fc2c93d2bb4d08510bc43aab0 SHA512 40833441423f5f76d9b7f34b4970f6fd78911f582b9c9d05e8e19090cd7c40ea5918aa2c43c5133e4435cb63d19d9b95446b69f09892d235af23070081933b12
-MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
+MISC metadata.xml 404 BLAKE2B 562724169bdcba36f216d118b7b362c5f487880cbcaccf6fdabd3a0dbb6d0d21fdd13bd1eb5080139117328277565ffe9021507b0871ec07b048c531b9c55717 SHA512 8a78e509ece3294c6343fccd856537803407685d2aece1ccfeab336f8b0ea482ff38696d21f8d37bba3b0cf5bd2e6718736d6b5c3180c202f0a387e04fc507f1
diff --git a/virtual/bitcoin-leveldb/metadata.xml b/virtual/bitcoin-leveldb/metadata.xml
index 65db17a2078a..95e5c0e2b8fd 100644
--- a/virtual/bitcoin-leveldb/metadata.xml
+++ b/virtual/bitcoin-leveldb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index b5342478e6fb..03b8f6ff3a32 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -5,17 +5,20 @@ EBUILD dist-kernel-5.10.20.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace27
 EBUILD dist-kernel-5.10.21.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.22.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.23.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.24.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.2.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.3.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.4.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.5.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.6.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.11.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.4.100.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.101.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.102.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.103.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.104.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.105.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.106.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.94.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.97.ebuild 379 BLAKE2B 5bdd8cd80c892709cd3f63336849d64c9fdf77b471026a3496fbeb2fba158dee82d2ebebc978956727029648e502b3c9da242e76227817557bcc050a238cec4f SHA512 c72c9849666e1f3e505e3272b4ce72aba2a16df36e172e40e4e7dabd1a76cae847be5234639ddadab1da39a8805202dd2669addead1dcb9cb710b53d0e083a96
 EBUILD dist-kernel-5.4.99.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
diff --git a/virtual/dist-kernel/dist-kernel-5.10.24.ebuild b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.7.ebuild b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.106.ebuild b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/imap-c-client/Manifest b/virtual/imap-c-client/Manifest
index 83d1cc259e53..2cb911cf8482 100644
--- a/virtual/imap-c-client/Manifest
+++ b/virtual/imap-c-client/Manifest
@@ -1,3 +1,2 @@
-EBUILD imap-c-client-1.ebuild 320 BLAKE2B 03af888ca6c6a3a7fded05b35bb1d1382e06ab3329f68994f1cbc6d9507fb392923f455d81558d15cf6ba0209c6aa28a280314c801577c32bcd56832c6e0c0ea SHA512 2295f28b1bdf9b1adc9cce43e1943633ae1295bb8b7aba806483e0ddd0a061a667ad9f50b7ceb43b9e1082ab18494fb6d6d9e2921792ff320b236a0517be9f1f
 EBUILD imap-c-client-2.ebuild 349 BLAKE2B 8049b1b176a9616c4dad883db152eac329f2ed25c03a35defda8d382df25324174946df7891cd17c3f44b75987fa3dbe31b08ec92f27c60bd928cebb7bf80a04 SHA512 ef2bd6036a164418dbd74fe6e81d93159e0e11cb97cba24e1c2cacea535304a32f6180033b9efd93d674c88b56acebff38987673d4ae9b803313b632e5969eac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/imap-c-client/imap-c-client-1.ebuild b/virtual/imap-c-client/imap-c-client-1.ebuild
deleted file mode 100644
index 174e95c822f5..000000000000
--- a/virtual/imap-c-client/imap-c-client-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for IMAP c-client"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="ssl"
-
-RDEPEND=" || (	net-libs/c-client[ssl=]
-				net-mail/uw-imap[ssl=] )"
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index 6e861a2543e6..db6609daee89 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,4 +1,2 @@
-EBUILD mailx-1.ebuild 371 BLAKE2B 0d2880cfc9ea4287d6a91ab4dede4646734d51b307caa366211d3dd7a712b72d757e346becc89821075fd1c9d4ff71f0dc29f051ec757bc4c986008c6d45c833 SHA512 2eb3254181005a722732813091a19ef6b532872c4a8033d7b0fcb95de0fa256a8a624ca5283015adc6445736e7d0d7b0d1b50b6290a4e1faaa2b34409ae75d93
-EBUILD mailx-2.ebuild 403 BLAKE2B 25e2155c6c1fcd215beaedf51d1cae79524bbeca10b364d11be07753f18a5be07eb2fe7cb5d7c8eb60b4c8b8a92a701bfeccc22065e5d9b70e7ccdf48f40eae6 SHA512 7bd9db8355957d67aee293fe2970eb1a84a1300fb166393ee853f5c4e9ae95d788250677b982e9095062e637134fbc5ad36e2dcb0ee08947c35211fc200c772a
-EBUILD mailx-3.ebuild 382 BLAKE2B 938d2a22062f5157f1754a4afa9f1b323455c8fd082db71b591538ddf7334509afb5399899c083ad82bea5a4c5912cb9e7aa079d1885e9ce836190e1970a030c SHA512 533f3baf1cad9c4777da63377434f66745ddbc94b0a695b905ba658d209c918f1b9a04063733f3525cc3272a411627237580ef80255a16a1a40a4ca0bb37080b
+EBUILD mailx-3.ebuild 373 BLAKE2B 8d41adb87642c2d8e1d0fca8ec4fc4e57a383edaadcc8485723ef7d0e2c1901ac20bc201ff44a890160c4043633d8d717a2f526a66ce3a1d252a140381462694 SHA512 06cdadd845ce2d5df96bee2b1105adee35643d4304ea8df92258bb05fe0deb3afdee74d05c175ab7a557a994f9d23e48007c56667adf309dd48b17cf89aaeb79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
deleted file mode 100644
index 2bc1190cbc83..000000000000
--- a/virtual/mailx/mailx-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-RDEPEND="|| (	net-mail/mailutils
-				mail-client/mailx
-				mail-client/nail )"
diff --git a/virtual/mailx/mailx-2.ebuild b/virtual/mailx/mailx-2.ebuild
deleted file mode 100644
index 9224959c73ec..000000000000
--- a/virtual/mailx/mailx-2.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
-
-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"
-
-RDEPEND="|| (	net-mail/mailutils
-				mail-client/mailx
-				mail-client/s-nail
-				mail-client/nail )"
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
index fae580487e68..9d78949e9569 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| (	net-mail/mailutils
 				mail-client/mailx
diff --git a/virtual/pager/Manifest b/virtual/pager/Manifest
index 8da074500e40..42a9574d222b 100644
--- a/virtual/pager/Manifest
+++ b/virtual/pager/Manifest
@@ -1,2 +1,2 @@
 EBUILD pager-0.ebuild 491 BLAKE2B 1f99f395f91fc1a7f9298497301125093916dd801e8eabd5602b30f6ef3380d2fe2c1bbb5324da3ac88952ceec1422d71d26d9f7653e54f82be1bff1b70c04cb SHA512 e75d28af7e4d98194c0e4abaf5a76c77daf4d6e21c85c9404a7a460c86a94440a50853a878f1e0f903847dc8b024924ff0dfd092edd33c6e685119c5a6af0dfe
-MISC metadata.xml 247 BLAKE2B e2d3dcf7f17d64fc457b247ba79d43e31c3b446330ec26728166349b84823d05f75bc70af5f20ba7cd31e456cd0e977d6238b9c2b6cd1af89b816187d2a40247 SHA512 e581fec6a7b875e7a7bb136407d5afc40ac04b2bdf8f9b12d559204416ed110e54a6295a301c07b24d971db46839beb405ac97cea966602af01cc2d6ccf5345e
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/virtual/pager/metadata.xml b/virtual/pager/metadata.xml
index c6dd702ff515..0319eec4c8be 100644
--- a/virtual/pager/metadata.xml
+++ b/virtual/pager/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='person'>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 02f05fea6729..ef7752deba79 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/metadata.xml b/www-apache/metadata.xml
index 0e2da9ad654b..3718c9c835ee 100644
--- a/www-apache/metadata.xml
+++ b/www-apache/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria www-apache zawiera moduły serwera Apache.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-apache/mod_maxminddb/Manifest b/www-apache/mod_maxminddb/Manifest
index aeb92012146c..9a71665f80d5 100644
--- a/www-apache/mod_maxminddb/Manifest
+++ b/www-apache/mod_maxminddb/Manifest
@@ -1,4 +1,4 @@
 AUX 70_mod_maxminddb.conf 87 BLAKE2B b50eb32c9cbf88f63bd9b0d5d12d13a83d7a4cb87ff3ad96bbc06825aa2b144d9ae6c09f0abd2c4004ec7a88b9156ba6b5bf5b6fbf2ede947dae2f46a03c5b30 SHA512 e9137211ea71a52a1010cd022cc5bdc3ae967a02eeb5cbe8339239251f3d2fdb14aba03ba66dea1071f513947e26598cd228e455e92df5a41a5016e5112b5ea5
 DIST mod_maxminddb-1.2.0.tar.gz 101465 BLAKE2B a0f9673560851726e7e85b3c6a5ef3e9004854e79a72bb14446bd68eec59ed8befb3bc27d7e7f031c69708ab54984c9f7537e5d55616be9f7ef1b92e2de61ccd SHA512 739c3c9b136fd3ce784e0a81c82a26a188e7d07435c1381ba359b2e159a721d072cb04310f2ce2a38953a8918fec686025bac6c140048a1afc035c0b8e449483
 EBUILD mod_maxminddb-1.2.0.ebuild 903 BLAKE2B 48709b6a24cf6fda247bfcdcef912e8cdd03640fc4ecc529ea06f3b09ea989f697496b1f60574f1670685ed77bce9bbb92b25a083b1b25dd47cf30dae359f5d9 SHA512 c9b1ee3f42f7d3ed824d7dedb56c4dd016ad93aa40a03b2480009f4dd50f7ba2a4aad09c8b13c642f591d72ed10f4969b84e77412289e6656cec8801ba0a55d5
-MISC metadata.xml 483 BLAKE2B 72cbf0490ccad2edbbd3f100c788033971252a9e0d29e83ea27fe5965b3c1f6c76bb27ebabe75bb7bbd2d6a6d9c40039ac213bfaa8e1df9a4a17a901ee8c6e59 SHA512 4722e9eaaf1971a864884ab858f9c113a89e06d1fc8490c9a852285130b0ed9c708c5e039b7974f137d6b4019e581bd69c2fbaa9ebbc0451b5fd874227088d77
+MISC metadata.xml 478 BLAKE2B eb343d217210219d3e4594b214cfa631c067da7486446d14a00c7657f582e069d60bc83d1bc3ef49f880646572098d9ac25d33d24ce9526f435880e5a7ae8664 SHA512 c740baab7a72c04922e41569ac59f23bf3711b0ee948197c21fee94d96e72880f726f14d29b65c40e1b24b3f5c79915c0901124f6bb9d3803b6f8d483a09337f
diff --git a/www-apache/mod_maxminddb/metadata.xml b/www-apache/mod_maxminddb/metadata.xml
index 16b10cec63ed..913a2f72df61 100644
--- a/www-apache/mod_maxminddb/metadata.xml
+++ b/www-apache/mod_maxminddb/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
-		<description>Proxy</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">maxmind/mod_maxminddb</remote-id>
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5ede305c8890..f6735c313c09 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 8272558d2194..cb369b96b703 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
 EBUILD baikal-0.7.2.ebuild 1611 BLAKE2B e16c29f176061b80ef1fc1860678e2c61e5be960c3a12f45feaf0d15a07fe35c58354435d5ff357743baa40e819d66ef776e3cc546574ac07a0268b703adad1a SHA512 37f44fc2e1f437c16271e6f4e60ed457515dc49bce7dd29c891198c7fabadf75e6cd7d9865f5801ab3b56758f141b7a72758a5b072ab7c855ff3cd9b145b93bb
-MISC metadata.xml 349 BLAKE2B a8b9f92f4b9513002e278cc8c92e5f93f9b8ca559015dcd0b68ee502448cf199191ce5578a547cd2bc2427915086812c973259540edadc5cbb2cd9b27e5d3703 SHA512 66e1e1cb8795256df684760249778b4b10a596ede82616e2d763f8fa06a2a8343214b06d5c649179f320a1add5187ebd1f0ce1ae227c6c470cbabce8c66784f5
+MISC metadata.xml 349 BLAKE2B a3d71b84ca37d16a0e68f26da9430fdad07adaa99eec2f27ee689b0df0fed31a34f54ccc90d69c6d7c28ad46f69ad921cc1b8e66d3a0d0c12dc6fff59589e8f6 SHA512 870a76c71ecc870e06211cc066d1df300b7c9d529219e09c73f792a4a038d81a1444c35afa72ad14f52bdd4f38869387dd3543d3c9d4a82b18d4704236e575b1
diff --git a/www-apps/baikal/metadata.xml b/www-apps/baikal/metadata.xml
index ed5e0711323d..0e0cd415726b 100644
--- a/www-apps/baikal/metadata.xml
+++ b/www-apps/baikal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 3a1be1452041..32bf3ad03092 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -6,4 +6,4 @@ AUX postinstall-5.0.6-en.txt 1292 BLAKE2B deaa9f4c11ffff9f34e0beedbf83b47a568aca
 AUX postupgrade-5.0.6-en.txt 544 BLAKE2B 43b2aa5673de0994ebf33b7e2167e7e91a77cfb7f5b0dea5c04590bd5f97027cb733eaf1ec8b1f209fd2aec690719e383de460b4dbf42f5e18fa5f880010cfd4 SHA512 7f9a0aeda0c665c8027fd71b0a317863dfd1c0a705371de34bf77c31ae0da562a39b101379313a227d1883e5df74c99f16f8b91b69e050c749fc30c9499a0a33
 DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af SHA512 8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de
 EBUILD bugzilla-5.0.6-r1.ebuild 3642 BLAKE2B 260adde9d497721da8f83a69d577499d5b1baf476bdd37b3fd7f6ccbd5b631a2e902a5bb95d0dc1988a06b9d0a3cb1476a0ca98790e9b3dadf835b9cb8be0987 SHA512 de5901eda569d898836d2d644d7aec9fd31680b64c3b07e46c8581ea3730093d380d81eed6871fbedacb5885cbf229709f1ab9aff011bf0d9e4132afbbd0da79
-MISC metadata.xml 477 BLAKE2B 5b332f06a8d6164869f2f699a0550e5039ca099459d24c6fd56939c7d103d43ebbb39eba91caf8ee4f20bba7ac655a77a56dcd7db271cf107bc955daa66213ed SHA512 50a29d5231624acf829e0c6a9aa1cbe269c5d7d1318e0bff28ca73f8fc6a734fc00d0c0a7316bc292ae97b045075f683411c39018f9343536da0f42480602dd3
+MISC metadata.xml 507 BLAKE2B 7182d74082ee03aafdf0b670b79531c40ec1a649da8daf0cc9ce52ca83883dac5b4813d38d3ffc0abb077f8f1a9efee1909c299611b4c254b943eb700a5cfdf2 SHA512 f406ee3a7d5bad52cad61a3da69989ddf3098b9102a56ac22e0713f5bd8500a0e7d440b366ffd1ab8ee226c1e669f3b1f95274129c11b0e7ccf12e8e051dde71
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 0ca8941051bb..66aef25b3a9d 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 029bdce8146e..efb18333c21a 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -5,4 +5,4 @@ AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d593
 DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6
 EBUILD davical-1.1.9.3-r1.ebuild 1805 BLAKE2B f98a6c364a6115ac40ca3431109dd9da89c0a35e9ee085704f77e98c57fc9d87ec6a1bc17fc9a97fa6e36bed2c472c59779793b1a717f6e06fa736f005cc6fc5 SHA512 1dd143bfb68c539df3ed3ac71bcaec0a760af17ddb4d0efeb923bfe37ac4555ad32b68a63191f8aeaecd5fa7c8f4be22520d6b17a06b82e659d8859151775329
 EBUILD davical-1.1.9.3.ebuild 1736 BLAKE2B d10c9a3af1d34ef20912dfa4929ebc63fdf79f83c18d1d08fc4e7625d3b603416100bcfbd170c208c7bc4e33d621f71e9af4cdc41009b59b690f1eb639f39ef6 SHA512 250d2e292f9e4b074876ef8ae742272e4ffe502f0c711636dc6f756e8d8f8529c80e01c21d43bec3cc7171ac6f9033b8fd324068362cdb3e8ba680196bb10329
-MISC metadata.xml 488 BLAKE2B 415da89c18eca6883cead611be82292f6f3936c01e81db2166e0bdaf5d73dafb550546c0639da311e2f7685a98175212bfe9c9709ec2ff0fab7e00cbf39ed1fe SHA512 6d0e48e689eabd408efa8addab142c14a199ac62b16350f56fcd238f470094c108a56db1719961dc5a80d906102b069ee47e99aef64677cf765be0d79a754485
+MISC metadata.xml 518 BLAKE2B d2e83a8aad53a3f23a52d78aa62b8372f01969ff358a244755ada5a1bb8f1d4a3a3eff71c25644ff4001a92afbca8de757ca786ad677fae7bb8e846aaa0eeb1a SHA512 fe53751ebcf84e0185e4bed877b6b49c6dafdf61653d56087e6162b9415ee1d6d34837bde46f27485e75091eb21dbbeb13fd97dda3ca458014fad44980a93bb3
diff --git a/www-apps/davical/metadata.xml b/www-apps/davical/metadata.xml
index 086845c37489..0a228e84ec7d 100644
--- a/www-apps/davical/metadata.xml
+++ b/www-apps/davical/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>till2.schaefer@uni-dortmund.de</email>
 		<name>Till Schäfer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 4dc1fc23bc38..ac5bb90c0608 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -4,4 +4,4 @@ AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4
 DIST gitea-1.13.4.tar.gz 150805886 BLAKE2B c639043cc5afe6f35015b8c5d44f3b46222cf6c418d80f27257bd697d12f1315f126d9406c953047e4d595284649fac0c057fc6e96a210906e839aa76da05b3b SHA512 bfa740214f22fd4e74a236510a8ccafc6369c293e409260ccc598df835c8a7ef552713c6760f4bf4f1b8ba2321ff1e5c7686b010d7bb307da3ff9901147cbea5
 EBUILD gitea-1.13.4.ebuild 3459 BLAKE2B 4f0552782f2a6917127e9d0279dd01a586ae93edef050bd218fa9f71b5bf5259d3d60fc5b924b279add899aff3c722efb5a5f765367bf3439314663af2135600 SHA512 addc33481ada8a104d4f87926c4b7a0c4988f08370ce90b673b8827abb112acdbfc37c7c43bf42693101343f458f02bd23d82a1c2c05a6116846747c98a803c0
 EBUILD gitea-9999.ebuild 3262 BLAKE2B 05a9dd4cc6edbce16bdfc736a5c2cc6b945e8203accf4312a4c3512dc2df035c572388cdb83f4be865a932cfd0edc0e834242a96494757fce598c2360fd8b0bc SHA512 813be6bb8754cb882314aa813d10151a1dfef5d08e30e2b5316818f90192a1427804a1dbdc1e1b4e617353ffaa1d44db4bb3b1dad86b2293334861dcfe23213f
-MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
+MISC metadata.xml 669 BLAKE2B 081a892f3f74992c0bfba4da4ad2fcaa42e2331b787607f63f4b6df2b88f8955cd39e85fb380ac42260197c553fce553845659a2cb7ec868c19ab651406be2ac SHA512 4f13893712a51a03c829403f6a093763b7ef92094cb6e700a30a15006ab8aa7bcae090a4a478e544692adf09d34bf477fe7bc38943447bfec8e4dc122d8ab912
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index 666bf0ff6e3e..5066856c1a43 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 378c57f49334..bcc02b136587 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -17,4 +17,4 @@ EBUILD kibana-bin-7.10.2.ebuild 2341 BLAKE2B 01aa588dcc73058f0fd8ecbec786ff2b9e1
 EBUILD kibana-bin-7.8.1.ebuild 2585 BLAKE2B b152aa8fe53416ef91559212cb5d252b3a400fcfd7b150ff3aea74d1233a6521ce55a9fbdb47ae589ac91571bf054f80183ff77866877ce87b34e01c07183f78 SHA512 df76eb39f0b71060219f31870b586eb89ce0b6977a88bde7116dbf782510951ed4dcf9f887dea972caedaf3d33c244a09a7be280900b574249ab5fe830414cbe
 EBUILD kibana-bin-7.9.2.ebuild 2721 BLAKE2B 32d97c75fb84fa66d67275c8716933a97ee23fc740b8b056d11b0d3c540f9c32c46ff2d7d05dc286ea4c860661013b658a911cf260ec9a273d6b712255e6d8ad SHA512 77565eea714918199499115969a224d5bf2800f9ba70a30b0b5f9453af43a5886c1745e1f55b89cfe1375f43c0c89f32cc7168bf6f30aaa3b34fd06766ebae80
 EBUILD kibana-bin-7.9.3.ebuild 2721 BLAKE2B 32d97c75fb84fa66d67275c8716933a97ee23fc740b8b056d11b0d3c540f9c32c46ff2d7d05dc286ea4c860661013b658a911cf260ec9a273d6b712255e6d8ad SHA512 77565eea714918199499115969a224d5bf2800f9ba70a30b0b5f9453af43a5886c1745e1f55b89cfe1375f43c0c89f32cc7168bf6f30aaa3b34fd06766ebae80
-MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
+MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index f34744e2739b..f987ef25f2d8 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-apps/metadata.xml b/www-apps/metadata.xml
index b776a8dbb48a..f4f1d57112f9 100644
--- a/www-apps/metadata.xml
+++ b/www-apps/metadata.xml
@@ -38,4 +38,3 @@
 		Kategoria www-apps zawiera programy związane z przeglądaniem WWW.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index f3876c5ee1f6..15443d0ff1c0 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,4 +1,4 @@
 AUX prewikka-5.2.0-fix_siteconfig.patch 331 BLAKE2B 0aa3a6ce4d31067b1ce38976bfa6081527d760f0b5461494c36a9fccedba2fbf8bf44691090fea285d70c6743fa948708c32561beaea80758fc528bfd71b360d SHA512 9d7c48ffa8f225f6927961a94da2d69b011209c1c69fe98efb3d37343f7ad78774ac8d5b1a56b5831605800471117e34ec0ec49309385976a41557c3713702df
 DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
 EBUILD prewikka-5.2.0.ebuild 1381 BLAKE2B 292a983a0ccc08d6bc4fd196032e56fb291d16d03b88fb8a297a1d387490b3f011dc0a46f37620835e0c7330f31681afbaf2afaf7a98d1eb549db7670e61fc8d SHA512 4d1b2cec9b0f25e5a8e81dcd04a3f37961865c3af44f6cd3899313332b9c640b92047b506366ed9ca4f90e1f1102acfe5c71f9068299133c59e13913b6efbbc8
-MISC metadata.xml 789 BLAKE2B cd4566869293a5c7d48ec9ebe94116da4c1955242e7d09eb2cb9c71a4251d05c44ad1b11a26c70b5e2abadee72fe642dd4aa1a8bd354253126bcd546735aeea8 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e
+MISC metadata.xml 819 BLAKE2B f75ef42d3e0860f1871121b539a8682d8f468f73a573ab733fa97f23849bc66659320d09a309120b77e10461d6fab982ff9283862ff12285f6e1afcaf2babe79 SHA512 4d523b8607ab847cbe9fa07c83b3de21c60b74d8f98b5512821e56f5f547a8ef4ae50b4955b541abcde07bff39665967aa46884bc757f5bfc4ae1c6a14d8ccba
diff --git a/www-apps/prewikka/metadata.xml b/www-apps/prewikka/metadata.xml
index 6f2383f98070..7bfedff9852a 100644
--- a/www-apps/prewikka/metadata.xml
+++ b/www-apps/prewikka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>thomas.andrejak@gmail.com</email>
 		<name>Thomas Andrejak</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index d227700c1f57..bea4601e1275 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,7 +1,5 @@
 AUX radicale-r2.init.d 603 BLAKE2B 3eedaf633d51e18b82a50c304f64a7268afec75e89515eb10b45b891691ff39b5d84753c4b3ed71c5a5b017c65d2c8bd38a6a043e0570f2916d12856202c3b45 SHA512 053fb6d5e7cec094a55fc8e56df9787949fd4b6c09caa1855de91d0a78eba5cfaac1a77a81afc178f93a75a0e70732c2c43b7f378596877ab36240ca46df9b03
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
-DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
 DIST Radicale-2.1.12.tar.gz 109781 BLAKE2B 743eaeffab43f2efcfc798f84d00fee40a09609beeb555e3afe3c9f4c54d8e0ce3a7eba4c1e14d6702775ab7d156b085408ee968b0d53437982cf2ea7cb4653c SHA512 a708fb1269f7ba8c9e351e101f613a8adb18c12b1239b832ed9e0287476f30aa7ded30f9bc259da9c4b5f3aefe90bbf9980d0d08d98dd07b79cd19930b0e204c
-EBUILD radicale-2.1.11-r1.ebuild 2748 BLAKE2B 84e384cbd5642353c49cedeb5afe83cf1e8266a8f0e2f6373c7b610418f24f731e9c69ef888543068a0f22e7550421501cc28cb2f171fc6ac7ff65cc74b3563f SHA512 f0275d7248162b1d62494616a0c68ef557eb286448118ba571780ba42cb2ad12b1b311b83af30f2800acc2a413dcab4ba61513efa293364d2b347d27ab2b6986
 EBUILD radicale-2.1.12.ebuild 1699 BLAKE2B deb1498ddefb8721b76f6c29197a88cb481c65d1bdefcb820c134f5ed878daa7cdaf43914834159c6b7f09b699babaa219cab8fb6b98e5d3bd81c08d3450c1d1 SHA512 c330ec690019e617867a1a35cfda3cabfe8f51ed0f679858bb6615dd7e995bcb3c47e45e0fff2d8cc57d5f04ba1f74c45d4c69d8f0ce81db50bbfa210428a519
 MISC metadata.xml 402 BLAKE2B 34ccd25541195ef792928fb402fa30b78f46eb63248034f65f94b408c3b5b33fcc44ce51502fcfc83e6500f276d2e4120e67a51a4b885cdf6b3ca970d898fd25 SHA512 b4860c05199b13a09ecfdfa9fd941431f7b4d3e76ea8f63840bd1f5ea21774588b794af1c71ad139826248ee238bd6cd0382a3659e926142f5ee005a248243ee
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
deleted file mode 100644
index 691e1cde8aa3..000000000000
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 eutils user systemd
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="sys-apps/util-linux
-	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
-	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/${PN}
-
-pkg_pretend() {
-	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
-		eerror "It looks like you have a version 1 database in ${RDIR}."
-		eerror "You must convert this database to version 2 format before upgrading."
-		eerror "You may want to back up the old database before migrating."
-		eerror
-		eerror "If you have kept the Gentoo-default database configuration, this will work:"
-		eerror "1. Stop any running instance of Radicale."
-		eerror "2. Run \`radicale --export-storage ~/radicale-exported\`."
-		eerror "3. Run \`chown -R radicale: ~/radicale-exported\`"
-		eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`."
-		eerror "5. Install Radicale version 2."
-		eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`."
-		eerror
-		eerror "For more details, or if you are have a more complex configuration,"
-		eerror "please see the migration guide: https://radicale.org/1to2/"
-		eerror "If you do a custom migration, please ensure the database is cleaned out of"
-		eerror "${RDIR}, including the hidden .props file."
-		die
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${RDIR} ${PN}
-}
-
-python_install_all() {
-	rm README* || die
-
-	# init file
-	newinitd "${FILESDIR}"/radicale-r2.init.d radicale
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# directories
-	keepdir ${RDIR}
-	fowners ${PN}:${PN} ${RDIR}
-	fperms 0750 ${RDIR}
-
-	# config file
-	insinto /etc/${PN}
-	doins config logging
-
-	# fcgi and wsgi files
-	exeinto /usr/share/${PN}
-	doexe radicale.fcgi radicale.wsgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local _erdir="${EROOT%/}${RDIR}"
-
-	einfo "A sample WSGI script has been put into ${EROOT%/}/usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
-	then
-		ewarn "Unsafe file permissions detected on ${_erdir}. This probably comes"
-		ewarn "from an earlier version of this ebuild."
-		ewarn "To fix run:"
-		ewarn "  \`chown -R ${PN}:${PN} ${_erdir}\`"
-		ewarn "  \`chmod 0750 ${_erdir}\`"
-		ewarn "  \`chmod -R o= ${_erdir}\`"
-	fi
-}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 46b09611838d..97917fb78b8f 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -5,4 +5,4 @@ AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528eb
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
 DIST redmine-4.1.1.tar.gz 2712056 BLAKE2B 767964ca455fdea081d3d409e91903367190ccce08474dd6c3bba8a3a89b7efd3846dbe1dd09039620591807dc44926744218f5db28a59ddb2da326a3f3f5b1d SHA512 fe691318fe8464de197a49ac172ecfcd65047ca62273226f63549620475557cd27cf8e193355a665abef64fc0c9e59556b4732cdcaa8061746918b06a7afcf81
 EBUILD redmine-4.1.1-r1.ebuild 6736 BLAKE2B da7a3b459020d4258822d13d0c9a9d1073350b5a72db3c138f35f579e4716218446fc55045da0cf1f45a44d851306b4fd8d57f3cac4586c6ef1101a2818ae708 SHA512 62d863404c2a8b1636bf929c3ccf3d0b53158c50ee8ed7d0df7e769372569d0563ec6ea2a201923415ef7bb422a68fa40ff2483a2459adc3ea51cc45e466f4b1
-MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
+MISC metadata.xml 557 BLAKE2B 34d0ed361118b010c7e4ecfc2acd5de4efc28054e866de8c8d278c439877cdc4e5c4ac238085e5f403a947abd37932c4e0dad5df456d2808172136740983036a SHA512 05f799fdd307d371ae877b236aba94278ec939f67405573100d200f60c5344196b7555616cab136b11235382eb443801ba495f57ede4c36f2f913ec1020cd4ba
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index c8cda2384e9b..d7055c0af75e 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
   <email>azamat.hackimov@gmail.com</email>
   <name>Azamat H. Hackimov</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index 4b7e71141f7f..f74ccfb61a06 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,3 +1,3 @@
 DIST roundup-2.0.0.tar.gz 3495554 BLAKE2B 98b7cbfebe969411282ddf6b4bd7b94ea1efb7b1d929daf44ae5f30dc23c05cb327d0f4653b22a5594f7b198dd16a172c45568a15f8704b187cd4c355455ca9c SHA512 5adb0d96be260e70fe098fd37af27bd0abee38cb8fde4ba2e130d2caac7f64af86a3b0ab09de931a693dca8bfbe15c68444db343ccf718d9d25576d49c6d6cbf
-EBUILD roundup-2.0.0.ebuild 1431 BLAKE2B a8d89f2062b88ca5eb41ccf968531c2641c05909d23a7bc70437f33bd0b121cf0bd3943cfdfd600f35b429c91e538a99cdf5d3bb907b718f1fb6f76585694b17 SHA512 044c67863e935dd4d75184f0cd6dbdda7711d80e9a5c95cf2e9748586496f81b81b9e2ee542f1769de632088ea2f5dc98ce40bbfbfdc5afa7413205278721f87
+EBUILD roundup-2.0.0.ebuild 1490 BLAKE2B d2159d6b6a905dd3dea3d32660a3d9fd7e75ee4e58c2a7d83783780897fcf029e87ea14adf7b646d5d78fcca34826b2d92432da47cb93ab3147ec11acdaebc5f SHA512 e737399d5c181f8849c9a5e3b52c7d72993df65572a1ece70b9046a539c787980af1fb37b913285924d9814444433e9db14b633fa814a81f7653e1d6eaf03eb2
 MISC metadata.xml 858 BLAKE2B d2ad7fcf833fd7fd31c463c737d9b5c811c7dbe042afc8a39ba03dedbbb1f5b9eda13a1a14a6c39108005f4a4d7a5f7e4ebf31de7023338354dad1f919978b0f SHA512 fa11616c74a9a43934c356ad56e39ed99610bebca86a34c936400d9b59aab39336213a2df3248c7fdb8886ac6c9bfd4918322ea8d99111dd8a21014d5b549db7
diff --git a/www-apps/roundup/roundup-2.0.0.ebuild b/www-apps/roundup/roundup-2.0.0.ebuild
index f1857def1d4b..335af1be6ac9 100644
--- a/www-apps/roundup/roundup-2.0.0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 MY_P=${P/_/}
@@ -36,6 +37,8 @@ RDEPEND="${DEPEND}
 
 DOCS="CHANGES.txt doc/*.txt"
 
+distutils_enable_tests pytest
+
 python_install_all() {
 	distutils-r1_python_install_all
 	rm -r "${ED}"/usr/share/doc/${PN} || die
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
index e186eda4973c..41bffe021705 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -3,4 +3,4 @@ AUX webdav-1.1.conf 4450 BLAKE2B 29c7dcfdc623938d90a060e4e86d70d82bceb03aba95da7
 AUX webdavcgi-1.1.2-fix-unescaped-braces.patch 4681 BLAKE2B fcb31cbbbcb12aba3113693a603373301160997822be2172b02fafd0be97fea0c25a8bcad7196ffce08ea4f437c27a94f808822c49e4a12589dffac9cbe472f0 SHA512 4cc4bf31acd200365777d8b6ec3bdbc2325c81191a4f71308203a38cd0e918861c2432a50b3c11fdd04323ca3403f42541a3bc2aa6a6c1625fc841a836bf7606
 DIST webdavcgi-1.1.2.tar.gz 16844485 BLAKE2B 1a9f1b0b5b4520badaca1992ba51760a6a1b250edeb3debe6bdcb962fb43c3c660a837882bccfa645a466e967c726569113665ff3a3c0f4db88e573299a30582 SHA512 cddd8461bfb16b5d50a9a2bbe270d3b09e973e74d07b2f54a16473c48dbaaab7d561becf223405a03ef6ce45502bf9684e41dc8e9977b0af788d700693946826
 EBUILD webdavcgi-1.1.2.ebuild 6535 BLAKE2B 681db50e69128d224dfca6079236d1e1dbcbf9e90c61948546d7d7e7e5f18ea28a5478ed80ed471f14e39e697a49b2cc9490498464baa30a1b1aa7bbb0d2d5db SHA512 10ce76759f406c07308ef24438da31e856d31fe653f754189bc19e301be573cbd0a1d73ff6c56a45d417d657a7bd1ee2858c7ed60d8eae880a3cf73cb67787b5
-MISC metadata.xml 1040 BLAKE2B fb1efea181e0b46f16e8086c4e183af13f61d4113d9957cb3b9e8ded4894c13e8559989c543cc9bdd326083805d7357c64c8ffc80518ed8fe12945c947cefbb0 SHA512 af3c8574f9b2c376194b27190dd6e1acf2e7a1e01f1becf41b84de395d96e6a6c739ebfb969c772104c8bdac3de4a8e725ad95a10e8a40902595602692bdcddb
+MISC metadata.xml 1070 BLAKE2B 7c5fc55c4c0081137c62ffd7b1421f20e5a3795b2ddd5bbc38a31f17eb589be4bbc8974d283c8f725f5c748038d2030646068b83f18ac395c8b9e7398143247a SHA512 895c56f804b3c8f9b46e9fd638898e5fbbccd0790591460a946983da657fbaed83a7951755180e52a7dfc193ad764819fe827929463075d45e7839ca996cc011
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
index 15f6fb907c82..51bc5a1d9b97 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>c.affolter@purplehaze.ch</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 12809c72e284..26f5cbb7a677 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bc2b2e3ad03d..e55cd87f6016 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,11 +6,11 @@ AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bfcb26f7a5ff4ebe79cfc819b214ae05d0e986b9db561a99b4f9c7b4a8e4adf1c8ee966011bb0791ef11fc2be89b03b216 SHA512 6ef5be9e56b82c70d3d1a0596e74af3bab97ea82a8247b6d0ba736411779be10b17c7cd9ccd9eae5fac27af3907fd3b56e301e73011f58b2c4052bbc03390b1c
 DIST chromium-89.0.4389.72.tar.xz 890838884 BLAKE2B c84286128ad3563f0570815efb2fe190153e5ea4c2ea74a48a9d9b31614b3f88850ddfb74819a8b27d594f97071ef5c1f356d0419d4dd3bbc2003c636c3aa60b SHA512 b5e3693bc104ff857a2ef4de9b0a9265d44c26e5b94c44e5054bfa810c24dbb1933f1f4a626dda4d74ba6cb13fe5045c4ea9d7ea43e1b0e4057e01428d645fb7
-DIST chromium-89.0.4389.82.tar.xz 890793532 BLAKE2B 9d1861f548f5af67611b398b5e87812ff92cbb2069bb9480b3264febf5b916564a45cb0e4d9f2793dd4f0e0c355a24cc08ab138f4e2c786a8d933f4cdf707bc8 SHA512 41c85743ef92e04cb73d374934cf3efcf6e7ab1c12f11abaeb7687ca2dc365f7107d316aabb439cd9bc26cfdaca92e0a1a4a9d751a73c47218633f2a3253563f
+DIST chromium-89.0.4389.90.tar.xz 890844888 BLAKE2B 7e599e17f6ffae422d0eb268f2847d5611424971508656abe50d5a89475382ec10bb348441648fbdb939b8acc01fb64a70467595d6649b9e2f3309e59e27a875 SHA512 d95ea0cc42a792b68cb5ba9bd455c6e964ce06c15ac849a2d317cc1cb07940578ff5f7b73be775915fff2decf7dc8e230935e6b545743959ba1cdfc9ab904b4b
 DIST chromium-90-patchset-6.tar.xz 3828 BLAKE2B bbd1378868cf4d699ff097ea41226ff694d58468f8f93860f2d6cc60924f35fb1f0b17fcf5a916f04545171d1219b699072222f138240fd483c704874cfce178 SHA512 70321eb4e9fe27818d5e6ae3109d3871a870a7fb6886328dcc9fc8291ac72fc003d678aec7f9925afe0c5667c70ce9bca8f61434b11a331fc1a29d61ad7b59e3
 DIST chromium-90.0.4430.11.tar.xz 917713136 BLAKE2B 828a141a1a36904542b7a274db17b8c8917b37cad3ab7070568c83bd6084f42838ce673e24c3f4b2753068548983e490cdeacbb5501215176f7f32b18d686535 SHA512 3d08fc57a22014eb324b99e5b97c2a8c8c5ff4de038753f8fa1c3ab4b44a19c2ffb6dcbc554f78cb493cb0a9cbbc04ac148ef4bd8a0141e5dff04813913c08a4
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-89.0.4389.72.ebuild 28582 BLAKE2B 3b5cebf03795f305dcd9fcaa257d588a862a7cffa8e2e52edc8b36ac04f166df0973364f07c4a35a01bb34e0e0a522381f2881ce6dbcaf422e810ed7b58b42b8 SHA512 681ba54775487aefb3e24374bc3edf4e8059d9f53ede080e24682f064da9e2ae9cc63bacede98e7fdcf01f8e24c3aa566111262a453ad52be4ad55400097fe70
-EBUILD chromium-89.0.4389.82.ebuild 28642 BLAKE2B 8bbf37b9cbfb6b19e881b5505e5afda437c8ef21f65011370578482720f613af7d92914f94b7b5b92f611510b3d0c0f6c643137ed967463f42571f0c17e91300 SHA512 10950326c1ebe81ce1bf582265752ce54165c44674ec79266db57e6f9dc4236991a4b1ef5fc20a167af10adbaff35f4dfe3e3cb04d69db828fa1b619ce8851f4
+EBUILD chromium-89.0.4389.90.ebuild 28641 BLAKE2B 5e2a51a36d9652cfa16a536bd1bcef2425428f269a423e1b646c22e0c4f45014981a1af63a3c8a5dce9cbc524c42c4eaa7fa3fc385f595764f7414941201c67b SHA512 5fef231a5d3da753ba5fb2a3498ab9e2f27fe54c3c8975f52b962cb66c58ce4a948f3b36923f5bd20f0287c4a11051f97efe447a99fc272e06c19a1e1c37439a
 EBUILD chromium-90.0.4430.11.ebuild 29000 BLAKE2B 2bbb69a56283d97503cdc26f76c9a54fb242da7475a3cbc4bba3f5a6b328de8e09a398e1a473b4e344e63c62d9426ca5de908ce1791369332e8aed8b9f50dffe SHA512 812423b3c631d6d729ad85c4dad425ea7ae337850568ac3633541f9464318057ac0ca8e0a693007abeeb20d63c9b2ca248e0d323087725f4d6fac8f5dd457546
 MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee
diff --git a/www-client/chromium/chromium-89.0.4389.82.ebuild b/www-client/chromium/chromium-89.0.4389.82.ebuild
deleted file mode 100644
index b0fc7ed7d1d9..000000000000
--- a/www-client/chromium/chromium-89.0.4389.82.ebuild
+++ /dev/null
@@ -1,899 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="7"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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 +tcmalloc vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libxcb:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			dev-libs/libffi:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-			x11-libs/libxkbcommon:=
-		)
-	)
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	app-arch/unzip
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-10"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-10"
-	DEPEND+=" >=sys-libs/libcxx-10"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-68.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
-		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
-			die "Component build with tcmalloc requires FEATURES=-usersandbox."
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			if use component-build; then
-				die "Component build with clang requires fuzzer headers."
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-89-webcodecs-deps.patch"
-		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/harfbuzz-ng/utils
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/schema_org
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tint
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		tools/grit/third_party/six
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Disable Client ID and secrets as requested by
-	# Google. Feel free to contact chromium@gentoo.org for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-#	local google_default_client_id="329227923882.apps.googleusercontent.com"
-#	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-#	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-#	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	if use wayland || use headless; then
-		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-		myconf_gn+=" ozone_platform_headless=true"
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	else
-		myconf_gn+=" use_ozone=false"
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# https://bugs.gentoo.org/717456
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
-		elog "inside Chromium or add --enable-accelerated-video-decode"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-89.0.4389.90.ebuild b/www-client/chromium/chromium-89.0.4389.90.ebuild
new file mode 100644
index 000000000000..ce181c3daa71
--- /dev/null
+++ b/www-client/chromium/chromium-89.0.4389.90.ebuild
@@ -0,0 +1,899 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="7"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~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 +tcmalloc vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libxcb:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			dev-libs/libffi:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+			x11-libs/libxkbcommon:=
+		)
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-10"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-10"
+	DEPEND+=" >=sys-libs/libcxx-10"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-68.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-89-webcodecs-deps.patch"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/schema_org
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tint
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Disable Client ID and secrets as requested by
+	# Google. Feel free to contact chromium@gentoo.org for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+#	local google_default_client_id="329227923882.apps.googleusercontent.com"
+#	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+#	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+#	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	if use wayland || use headless; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" use_ozone=false"
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
+		elog "inside Chromium or add --enable-accelerated-video-decode"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index e12d64a9ab7c..69ddd75ac2ed 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -7,4 +7,4 @@ DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7e
 EBUILD dillo-3.0.5-r3.ebuild 1293 BLAKE2B 019a0535baead78934decc1e7840031d9147c95663804db672565825fdf02d8a26e6685eb3c36ad781defbd28ecf8537649ce96a0660ebbc4f5be26f43154703 SHA512 b670000f0b732c520a177c8dc047c6737edff432be389268094df54ab3cd3b7914272845d9a3d39ec49b8443adac54ca036eb047ad5d3665bdb7131e0749b68b
 EBUILD dillo-3.1_pre20181005.ebuild 1206 BLAKE2B 6ee03439127d10f70e4dfece3858ebd688d4a58af83b2e935a54f031c254c5e2716c2044cc1325cc38b431d6df56e7851d1ed8cc00c8d79868d8b04b20b24e0e SHA512 59b926338f5335d13bc72322216fd5169a7dd9a912470c70159188aabff5fb42cde86fa23047b69c1b1596a529fda3a480309f2b33b658663e47bec6df2d5c08
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
-MISC metadata.xml 233 BLAKE2B d3baff5d4b0f702f92f34d76482c438e2b95d5869adf3eea74503c0e550eab626b446337bf0eaa1af2bdffa5e4e27e23c91c44b682ddf980f67dc9cee8b9faba SHA512 00ec86e83fde2eaa63e5d2dc1fd97bb584f52226c64e2b0b0b312943f40524b8f20d16099e1431deec99faa6fd9aefc8f0cde37943813ab447943fac9d71b063
+MISC metadata.xml 233 BLAKE2B 3de3c3de175ca28e084160db38aa341bf4645b81b566c8fd2a4a7c7fe590f42b1621cabd3022e8ee05be6e7d05eb0d9c76557bc437aa06095480302cd9619e18 SHA512 fa4712f2016e6d008a8a4c7e47cae45d66a28e7c64ba7e67515c548e6048233aa0c55d2ff591a8dae5d3f861c0a758844b0c35e6a905db1c5d3a6b525cfc1271
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
index 2f8e87ae94ef..1c6c2d75044e 100644
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
-<flag name='xembed'>Enable X11 XEmbed support</flag>
+<flag name="xembed">Enable X11 XEmbed support</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 0588b5fe5783..e0485ea93e23 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,9 +1,6 @@
 AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b95da4a90782ce12ee4b524502852dade5a092c621c9bdc02f315721868237192028c85faceb13afb3d8633d6f1ccf29 SHA512 b40a69a53b48b957175dbab49566ecc73f1a9a77e7e4e1b824b4a5afcd08319842d6f530feeb2afa63e4854b7dd2e980933a481165c9d64289acf16d72f1bec9
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
-DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-EBUILD elinks-0.13.4-r1.ebuild 3769 BLAKE2B 35a57fd94719c9b0614a514679d4ad13b29ffee019b4da38cfd97af464587b2ae62e4f51f6ed32cfb8370bebde41685f0d8d1452110e4fe57998b74747112fe2 SHA512 4853f70c5c9bf7d4ba992df2fdb731804402b10aa632ec72765fa2cf130dad15e02ae6793871d73a57cec6bf4fee85a6caf2eb8414accc5a18f66d8fda5e7903
 EBUILD elinks-0.13.5-r100.ebuild 3851 BLAKE2B b0d0832e8095ccc0bd63ff01f4b81b3b326bd6e03ede9c59f413db562cdcdd8dd333920edfd971625dcc8142fb0d8e246c6bb58808caecbefea4171156aa7571 SHA512 163f78d5835b7e0334930843e13c4e3e4f5ffa29e50db261759347780d38f4a867579af6dbda3ca22b64d0e3f0b17dc4c13ba06c73a98034608f089d77953f34
-EBUILD elinks-0.13.5.ebuild 3778 BLAKE2B 128575eae55b2816a575763f662523f1e59a10c4fecad0d24aaa419d1ddb96201beabba15ae18162ca0b72dfe1aaab741e1de6c23a1472484549991ec40ff614 SHA512 f7db2d47da381ef20fc5ae8ab6dabed2675119c139fb0a303c86d35f9c21b3d9f5320f5035453a6732785433cd9fb7d5b5349f1d1eb89a95eb52e9beb253a64e
 EBUILD elinks-9999.ebuild 3691 BLAKE2B c6d5802932156b87ecc8437dedeb19ac8009f206c9d703d308b3be6a2fb0e730d16fb8576503eae27e65d039b956a7c935c91455d0ca332c91186ffa59e93725 SHA512 fe92141b88b2fbc82b43614b966e4ffddf5cca5665d5523a94117abbe7bb4dfd456ace2521c69036e8c057330bea285202b2e7752881fb85f107fa42d7faf50d
-MISC metadata.xml 897 BLAKE2B 1a2d64f8a35ee418538530d129957ec313e8085281f0fa1b8711b3b1b4f378e4b8c18eecb999256b542644cd0b93968f4fc0e8ea48a6daf85afdd073d4c12aec SHA512 74993b896b204fe46cb62c718426bc0421ad49e3591620806f49023ed3c6d24d49b243a2d4cbe18c9aa7ceb5f955caff1480fe8e8e5b1619fd39ca9f21d1a3cb
+MISC metadata.xml 927 BLAKE2B ea7f56a26c59b270a274dbd2475e16769f6d5650a7fb8427acc5b2f359f01e37c276b90946e365afa9e7c84278343fca93e55cb576dcca6848d0a9a8088c41f3 SHA512 345cb6385e1f03a494b0b2c77379032c0e28af1277091e17e0f823211d27d87c81b62063e382a8f19e9e635cb01b02cafab63f1154863031e7679dbbbf60921f
diff --git a/www-client/elinks/elinks-0.13.4-r1.ebuild b/www-client/elinks/elinks-0.13.4-r1.ebuild
deleted file mode 100644
index d837e86b910a..000000000000
--- a/www-client/elinks/elinks-0.13.4-r1.ebuild
+++ /dev/null
@@ -1,142 +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 autotools python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		gnutls? ( net-libs/gnutls:= )
-	)
-	tre? ( dev-libs/tre )
-	X? ( x11-libs/libX11 x11-libs/libXt )
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-	"${FILESDIR}"/${P}-ruby-gcc10.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		--without-spidermonkey
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		--with-luapkg=$(usev lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf+=( --with-gnutls )
-		else
-			myconf+=( --with-openssl="${EPREFIX}"/usr )
-		fi
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/elinks-0.13.5.ebuild b/www-client/elinks/elinks-0.13.5.ebuild
deleted file mode 100644
index a54ad8c4302e..000000000000
--- a/www-client/elinks/elinks-0.13.5.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-	libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		gnutls? ( net-libs/gnutls:= )
-	)
-	tre? ( dev-libs/tre )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		--without-spidermonkey
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		$(use_with lua luapkg lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_with zstd)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf+=( --with-gnutls )
-		else
-			myconf+=( --with-openssl="${EPREFIX}"/usr )
-		fi
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index f3fc1b6822c0..4c8db43a8ecb 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>felix.janda@posteo.de</email>
 		<name>Felix Janda</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 2eb4a2ebcbbe..84ed868e7c12 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_89.0.4389.72-1_amd64.deb 81415588 BLAKE2B 95df0883bd61ef70f1596ce95a56d84c8b9c91b1736a7e5ffdc8be5c41effe0244004dd316a07b0230dc6e4375de25796d45915df02464391e387857ca7985b4 SHA512 7a65563efc3706f6684b304316bfdd8cd4a6f82d21f746e447757ae39b0c909879da5f6ed5752e0c0d8f526b59726f915a4486054af93d14bfc72c611b910879
-EBUILD google-chrome-beta-89.0.4389.72.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-beta_90.0.4430.30-1_amd64.deb 77718380 BLAKE2B 97ebc6d01431583e610115b71585320043080897d97df86813cfe195f39b540e52641fd8a66608f2ebaa42e10a3ddae19d758d0c405525a2d8a766de68cdd8e3 SHA512 6830a81909b2dbaded8668470963bebfd9031fb88fde5abdaa0b62e15d1d2ccf5c89f8805a522bdd4952b5979d6b0b9f41ee3a1771eedec3929bc29aa69c2950
+EBUILD google-chrome-beta-90.0.4430.30.ebuild 2983 BLAKE2B 68b16e07ef56018d2200532a0df9584a1f7725f80f024c0047e03ae95eb8d6a548bb711dab8ec48aabbe933361451e9e61c9733840757e0e243fd0c62ac3c1a3 SHA512 6fb3bb43b49b23af87a32b0b1b815fd6195f11d4c013fbcf0cdf3af424bdd489bb60189f6f08763166a9d474956739f516fb7aaa936ac14addb09f6a2f2ecb1c
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-89.0.4389.72.ebuild b/www-client/google-chrome-beta/google-chrome-beta-89.0.4389.72.ebuild
deleted file mode 100644
index 320b2ef94a53..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-89.0.4389.72.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-IUSE="selinux"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/mesa[gbm]
-	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/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-misc/xdg-utils
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.30.ebuild b/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.30.ebuild
new file mode 100644
index 000000000000..0b6476f303a1
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.30.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+IUSE="selinux"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/mesa[gbm]
+	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/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 31a4243841a4..8a53c1c7b19e 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_90.0.4430.11-1_amd64.deb 78571060 BLAKE2B 92ebd4854d0be1212e12ef8bfeb79ea68b9eb952d8d941435c17e5fe07d41008d41d220c7153c7c5e4028d7d0c0e57cd45f262c68af8dceceaac99c56a5fc5c3 SHA512 19e57a6071c1c41ffd81a3ebcd9ffd26a470a661f024792cdd746a84662590d90e52edbd820a49b690436e5e2a2d4748578bbbeeb6907f58a381e620b3e03a32
-EBUILD google-chrome-unstable-90.0.4430.11.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-unstable_91.0.4449.6-1_amd64.deb 85346436 BLAKE2B 567abb574b5fea26925ed6bf028eccf14d8b3600cc4f5d6917b60b1e2ec53af10e43a2058a6c5a0a952442f59495a5c06439694ad8a3f96d7ee8391e76127b9a SHA512 c5c6ad70d099a582f9709d14e5985b5459b1e024c040dcf5e8d01e1ce9f9516252f813b64069c2f857f22885f7924999a7e7514959d3e804f9e99632c210d342
+EBUILD google-chrome-unstable-91.0.4449.6.ebuild 2983 BLAKE2B 68b16e07ef56018d2200532a0df9584a1f7725f80f024c0047e03ae95eb8d6a548bb711dab8ec48aabbe933361451e9e61c9733840757e0e243fd0c62ac3c1a3 SHA512 6fb3bb43b49b23af87a32b0b1b815fd6195f11d4c013fbcf0cdf3af424bdd489bb60189f6f08763166a9d474956739f516fb7aaa936ac14addb09f6a2f2ecb1c
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-90.0.4430.11.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-90.0.4430.11.ebuild
deleted file mode 100644
index 320b2ef94a53..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-90.0.4430.11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-IUSE="selinux"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/mesa[gbm]
-	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/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-misc/xdg-utils
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-91.0.4449.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-91.0.4449.6.ebuild
new file mode 100644
index 000000000000..0b6476f303a1
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-91.0.4449.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+IUSE="selinux"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/mesa[gbm]
+	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/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index cded8050dc16..60cf61e5d60b 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_89.0.4389.82-1_amd64.deb 75879440 BLAKE2B 90698f31b819e376e013ccb88b30cbf06062e0697e7c5c70c63823d439703beed9c27d6981b6c251bc87b996e8d806490df8a157c5e61648548dbaa9ce73f286 SHA512 c81bb1722d136c439e3dee578c84d43898dcfc029d664ebf58458afef0957fdc8cdbbae0391f0d9d74359f72b43588fb5144e02701e1b54fb82aa0fc1cda585d
-EBUILD google-chrome-89.0.4389.82.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-stable_89.0.4389.90-1_amd64.deb 75841728 BLAKE2B 1de16e3916e1dfe646d37327ec7c69417d40bf751e43d76a85f8e8f81e654669a994223a0f5c9a8bcbbe4abf3db2f50cbe4e2072742da3ae9aae855915098641 SHA512 768557218228c0129d478dd3da8d1a21c62002f0e2f1e533567dd50a2757a9de0ad141366a6927d0a4877d5f38be6dc3c246e4ec64e3113411bf90733ce477d1
+EBUILD google-chrome-89.0.4389.90.ebuild 2982 BLAKE2B 7069b95e4ec9f849dd700a9fc7ad44b1c14adedfb06abde617d632afd04d60eb2efd73e4ac9d05e1821c0f52460f4824980785ffb8d4927faed43601d9e03c99 SHA512 bd7e657a46c56fd83bff84f5b61aee40bcba7dec96f0bb7198a3ffc18bb108ffb31d0315647ed832cebb43e9650e7ee24e892a0dbaede5c3ba85b263aef4ec95
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-89.0.4389.82.ebuild b/www-client/google-chrome/google-chrome-89.0.4389.82.ebuild
deleted file mode 100644
index 320b2ef94a53..000000000000
--- a/www-client/google-chrome/google-chrome-89.0.4389.82.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-IUSE="selinux"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/mesa[gbm]
-	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/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-misc/xdg-utils
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild b/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild
new file mode 100644
index 000000000000..27569053bc68
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+IUSE="selinux"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/mesa[gbm]
+	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/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index ba6cca159ac5..2e09f43831d0 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,6 @@
 AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
+DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
 EBUILD links-2.21.ebuild 3491 BLAKE2B f95d934992e1f5ccc13d50b83a19cc1af845d6bc0813c595e4cc3b62cca05a632f556771bf9eb98eba7858c875059585f8bc5f491821359718fea17acf8cc7f2 SHA512 03615b9eda63f9a70fd52233a6d6634049e2bf909bf7d5f844b278571926cb5176fd2ae4c01a736a5aff559ade0ce6adf371ee9cf41553e779ec716ec5a7d371
+EBUILD links-2.22.ebuild 3445 BLAKE2B 0d19c955880f7351a188da6035862735cc4fa7c455c9f224561bc17271bba46c2fe291eb4a3f39ddd0f1c6caa8d391a0ad88cac26fd38101ae25393941723ef6 SHA512 c9fd02977465f4865345fb001661b139e13575cfa21febf8500a1a72eec26842b737468a6917426ffb599c6705176aed94c5359618b99a549176464b75c78590
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.22.ebuild b/www-client/links/links-2.22.ebuild
new file mode 100644
index 000000000000..bee0327268dd
--- /dev/null
+++ b/www-client/links/links-2.22.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )
+	X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/metadata.xml b/www-client/metadata.xml
index 2a25c55a7ed9..340db3cfad34 100644
--- a/www-client/metadata.xml
+++ b/www-client/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria www-client zawiera przeglądarki internetowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index ef665ce70285..f511b1956f76 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_90.0.796.0-1_amd64.deb 93188494 BLAKE2B 3049db63838884f9919b25a1325012bddfa936bab4d090f8f9df2d6b79afd5b83d315673e8f9b656280a7c71a408ca1d2049c4c12db2fc24086f8638daf47889 SHA512 d2705b7b557ff4fdc49bc10b79ca1d0a40bd486e961a373da7302be3cb060a6f1d9ac5142a60fca10ab2e45e18e0b28589497d833e72b2d4bac138e9cf275a3b
-DIST microsoft-edge-dev_90.0.803.0-1_amd64.deb 93498816 BLAKE2B 7388fba087c409411ff318cc7f893107a4bb196913a7aca73812b1792f76fae691e081766f076beca347baf49df2aadc7f3a09933ab0ab6e3972e82e9011ce80 SHA512 d3d873656e1f33abec8f555464dc7ada57ce7283fad855253beb763d20799d7d57249f99cd833e2826df2596aa717a94845721305f30475d63d2124e4329e6d8
-DIST microsoft-edge-dev_90.0.810.1-1_amd64.deb 94144640 BLAKE2B a60153f582a7fdd9692ac6ec53b0b435529e3bb72a618cccdcee10dd0f2220f5606466d5223e8d5a573cde68c4939be339d1e0d570df755274b78f5ead11a99e SHA512 71d0234fe9c7c8f82faa5ed401f491377ba154e33ffffa9818edd98d8b65fa57319fbb90a2fdefec630bc2ed1feacc2dce89d37b94f7f152ca1da5c7d47924ff
-EBUILD microsoft-edge-dev-90.0.796.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
-EBUILD microsoft-edge-dev-90.0.803.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
-EBUILD microsoft-edge-dev-90.0.810.1.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
+DIST microsoft-edge-dev_90.0.818.0-1_amd64.deb 94011664 BLAKE2B 66d2a4566b4897a4dbc71f15e50ba3b52af41034d0fce48b185901b1a892d9a7b974bacec35369a9be6b74b40d0ed05a0b4f24224ec349e29014f1b42e1ee9ee SHA512 d1a154e028805c0143bb32496a785eeefce5e27d99d435a56a0d44ad4c8064590feaf688d5f708ef8db9453f51837ff997b8419eca05a2f8519e91a93fbd4a39
+DIST microsoft-edge-dev_90.0.818.6-1_amd64.deb 93113886 BLAKE2B d311ec9ca8126c35b1ce0ee5cd0ee858d6eaf2e8374c6da9b680e8172ca3746351b53831f4b7c1b18e17288ba3b2dda9badc51dbdca560223862704c0bd5f72a SHA512 22020ebf3f7bddf43a886dc880b678a3e3047d926127041db2b3744b0a9bdaecdf6f90a5d295ec73f07088c9f21c8ca952c9f0f2f9604d62d7cc06cd66ddf695
+DIST microsoft-edge-dev_91.0.825.0-1_amd64.deb 94610646 BLAKE2B 645c6f0ea3c9cb3415ccb4c1c31750cc55dc0299314e424a521299c3b28795cad32bc394919e0fa4acb2abf39f40b26a8424b9eed7a1de95f8b9de64ab684791 SHA512 083494b1716bd4b76973941e0f02d3c2e63051e3911dbcc8b98e94d798f141b49fb86065ba8b3091f03b8120fa2d3e8daf596209ea39e50ad84be711b0232c98
+EBUILD microsoft-edge-dev-90.0.818.0.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
+EBUILD microsoft-edge-dev-90.0.818.6.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
+EBUILD microsoft-edge-dev-91.0.825.0.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild
deleted file mode 100644
index 8b9535ac7993..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/wget
-	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/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.803.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.803.0.ebuild
deleted file mode 100644
index 8b9535ac7993..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.803.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/wget
-	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/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.810.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.810.1.ebuild
deleted file mode 100644
index 8b9535ac7993..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.810.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/wget
-	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/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.0.ebuild
new file mode 100644
index 000000000000..07e3b73f875d
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	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/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.6.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.6.ebuild
new file mode 100644
index 000000000000..07e3b73f875d
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	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/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-91.0.825.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-91.0.825.0.ebuild
new file mode 100644
index 000000000000..07e3b73f875d
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-91.0.825.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	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/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ee7049226917..965d55950807 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -3,4 +3,4 @@ AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
 EBUILD netsurf-3.10-r4.ebuild 4547 BLAKE2B b1ee718e53e416e96e3793fc4dc5f04481a16788d4b20c64108b5be38a871d9c53934bcd40b4ef949303ff49a6568b7c4bebf038cc214169c22f193319d8e231 SHA512 f1c3dc0705437be92b1a309be9b7c6a1b29bab3fceff97c6057527964d53d2ea1e43b9626d50064ceb5e79438d73e0504f2aec4fcd759c98fa388a627dce0419
-MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
+MISC metadata.xml 1594 BLAKE2B 01a6ef77d9eb455529b4efa701164d93c10f4af5a1d79feca9892b9625c3988a480cb1503367fecd825fd821fd1a499f1c16fb86a3c992946515d78d5892c9f2 SHA512 dbd7833587afd3954214bc30fd3d550966c38303371b7be5aa94e8c1ec90effd05e5e118c488452d716202bddccc0993f11ec97d4109bdcf6f9cbeff89ac2737
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 4abc84a70da8..f4c5639651d3 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>philipp.ammann@posteo.de</email>
     <name>Philipp Ammann</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 966c2c4fffb5..c11bab560278 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,6 +1,4 @@
-DIST opera-beta_75.0.3969.14_amd64.deb 74649684 BLAKE2B 626b264c738c9cc44edad13ac4ef395cbdec89c6278fd9e7c9997c54bf0658d806cb068868dfa96fa65c52f04ba31f9a8ac0a241c5f55cf56f9248dbb9a25de4 SHA512 2322e0b78df9824aacd7a445b9633fefa58df49f94c59447f1b2279c512cbcbbfb3c005c7c8ca7bdc6eaa3a1ea968839887119ba66d80af6da4a6d9580571e6b
-DIST opera-beta_75.0.3969.35_amd64.deb 74668108 BLAKE2B b44cc245a0ed74ced5bf93de039abb6f5c3d9267308280bde6566c429bda4b5144b8efda05db2fdc5b62f46ad7e4a0cfb710613a935a74cb11ad152563b35a42 SHA512 8cd07ebb87bb58841c56ba8635e491aba3e97d8c2c271eff2af59fa8c0cc9a587ec2b9aabb962d6768e2e03f117c308b7caff2062b349cebc4edd7b788a521b5
+DIST opera-beta_75.0.3969.60_amd64.deb 74645452 BLAKE2B d6346b512e8a274248fe5c94cd964048455ef65da3a4f2b1bbd16d2d11ba0dbd14d1eb49e32b7588f445ce59d3b9843775ad78b736e7fcd73bb0e9847f74b280 SHA512 ca5c689d0978cd2177e14b35b445d70cd0d5ca81d3fb9b7ed468f762c7826924ea4216fc39df7af915268d75675c593c5099186f2c48e3d7bb807f890452c0ed
 DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
-EBUILD opera-beta-75.0.3969.14.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-beta-75.0.3969.35.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
+EBUILD opera-beta-75.0.3969.60.ebuild 3316 BLAKE2B b611c07f8321bd374b7df805b66f3075fa1211ee26d15a879cfcb651b828469db09a91499cf221e4c4a6e0e9a6ee262eb4ad75242513b2c526bfd4a651967d8c SHA512 125bc292210a23c56cca89d5567817f85eda4b07bcf809c38fbc5913569068175f123b6d2d023794bdc25e54694ec7e71f8cbc799d1117b860308c09e8952b90
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-beta/opera-beta-75.0.3969.14.ebuild b/www-client/opera-beta/opera-beta-75.0.3969.14.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-beta/opera-beta-75.0.3969.14.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-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 widevine"
-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
-	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
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-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
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	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-75.0.3969.35.ebuild b/www-client/opera-beta/opera-beta-75.0.3969.35.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-beta/opera-beta-75.0.3969.35.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-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 widevine"
-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
-	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
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-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
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	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-75.0.3969.60.ebuild b/www-client/opera-beta/opera-beta-75.0.3969.60.ebuild
new file mode 100644
index 000000000000..ae39d503ab91
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-75.0.3969.60.ebuild
@@ -0,0 +1,140 @@
+# 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="89.0.4381.8"
+
+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 widevine"
+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
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+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
+
+	# symlink widevine
+	rm "${OPERA_HOME}/resources/widevine_config.json" || die
+	if use widevine; then
+		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
+			"${OPERA_HOME}/resources/widevine_config.json" || die
+	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 3454333d7ff7..f44b893fc6e5 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,6 @@
-DIST opera-developer_75.0.3967.0_amd64.deb 74349124 BLAKE2B c61aa27ae9bf5174e8747c146d85b3ac32887a67106307dc2f195da2e693738359947a2c962ddaba23044ee55fa8c5fbbf8cac33e06b5d25272e87070d3d3202 SHA512 19bab0848e707181cd2d5e853f347f79afad1e10fbef83b09225e37a77069d246a292797f6018a550df7be59c350dacd06709e4807deb43211fb4bcbd50fd4a5
-DIST opera-developer_76.0.3974.0_amd64.deb 76398292 BLAKE2B cfb3a7d27cc84d43d8b3d7f867a787029dd462283e257201f467c86761e8da93a81ec46a1a98091800269bc1c99c9436e5a910a05a760de26ba08b9dd29dd029 SHA512 3a022e078409c64a4cae7a28b60bfc318c5c0036fae0f5ac712a62e096516fca62ef3c562d63a5d49f367462489b809472c9672be94d7eca9fa29a426c40efc3
-DIST opera-developer_76.0.3981.0_amd64.deb 76364604 BLAKE2B 00046ef7687c72809f4e7ee6098021a87562a7805a6afabdf571b5d03449a1843a3fa20185488272e78a58b40f65a8e6845506293c5e18cd0dfcf1e90160570b SHA512 9ece065f454d6af496590002853daf360d3b4251a43dcc7e58f96b0b9781579a545b31e6e2f1f5fd4c3978071619c767bca49ffd038959a77c66316b87d47285
-DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
-EBUILD opera-developer-75.0.3967.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-developer-76.0.3974.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-developer-76.0.3981.0.ebuild 3001 BLAKE2B ccd10e63388089ab731976a900aa4e1bf6c9b7eb84c04793fac57659d9c3161eb0e29b605496f990219a9396518cf5e89f90804996996900dbd955b9656054bc SHA512 324b1546cb7535e6c5a594b286b62beb5a6fcc40c3e402d233122eecee4932ba3dff03b7d0cb81654e3955e643f3e2424aa3ef9806fac653c4c4e6dfb471c3ff
-MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
+DIST opera-developer_76.0.3989.0_amd64.deb 76801908 BLAKE2B 7b901f44cf3b3d749666e3d358f636e02af1c9309119878407f4529f9444ba36cdd6d863475736b091773377e0243eae39523ccc5b4703cbc897adec3e5a3c24 SHA512 04390bb2fe3e7981943aaeb22311e615113902948c3d1346f5867eec8798e350369fc4edd47dd4c06dc5c8fe701de0118272be8de5dc93cb25c6b3133d3fef86
+DIST opera-developer_76.0.3995.0_amd64.deb 76750104 BLAKE2B b647d5b8d5b840f6ce6ca7b922d8ca187ffa971508c06566b173ec289859b2d14d7eb796bebdba820cf3b9674a5ddd09abe7a37e3bf654a96cdc3918ce377108 SHA512 27c1a34882ab10313d1560376b0abaf8ae5d8afed772da64230adf97d265aff93a2d373a7cee2bc1e6e8e1796a48cb2828a1864a49af21a8fa4fe42f28831a88
+DIST opera-ffmpeg-codecs-90.0.4412.3.tar.xz 1392160 BLAKE2B 61f32ac1ac3ec12f39324e1e91aef59f9693e36d19abeb92b223e7b95411d5b2a7c2e7ecac87c5a59d374a61bc2ea0f6b2738d01860a1df013d1111876acb888 SHA512 4f56c70bb6e57c978c4997f30473454ccf51308818bf9debadfa0fe4d68ce10c7e333fb49ae4152b355f442b06cfcfb4c0fa130db4de9937374dc5c589c56a70
+EBUILD opera-developer-76.0.3989.0.ebuild 3018 BLAKE2B 129d4792889815c112a42645f3dfd0e07287129ec9de674e6cf9236e9ff3a751089401768839ff0573a364862aee8054a7d9e97dcaf9a5588f7175f2d4571b9c SHA512 73a8e5051ed654cd8ef4a669eff91043d5ad463f3c409880bc158e028d136e9d91ef67bdc9da7d33f30fffd2206a7fa8246448cf14f0e641e077fc00bc8074e6
+EBUILD opera-developer-76.0.3995.0.ebuild 3018 BLAKE2B 129d4792889815c112a42645f3dfd0e07287129ec9de674e6cf9236e9ff3a751089401768839ff0573a364862aee8054a7d9e97dcaf9a5588f7175f2d4571b9c SHA512 73a8e5051ed654cd8ef4a669eff91043d5ad463f3c409880bc158e028d136e9d91ef67bdc9da7d33f30fffd2206a7fa8246448cf14f0e641e077fc00bc8074e6
+MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/metadata.xml b/www-client/opera-developer/metadata.xml
index 9862847b22e0..a7f6e93cbfdc 100644
--- a/www-client/opera-developer/metadata.xml
+++ b/www-client/opera-developer/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
-		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-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 widevine"
-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
-	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
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-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
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	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/opera-developer-76.0.3974.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3974.0.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-developer/opera-developer-76.0.3974.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-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 widevine"
-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
-	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
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-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
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	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/opera-developer-76.0.3981.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3981.0.ebuild
deleted file mode 100644
index af25075d5a39..000000000000
--- a/www-client/opera-developer/opera-developer-76.0.3981.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-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
-	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-developer/opera-developer-76.0.3989.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3989.0.ebuild
new file mode 100644
index 000000000000..9f85c468ae05
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-76.0.3989.0.ebuild
@@ -0,0 +1,132 @@
+# 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="90.0.4412.3"
+
+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-developer/opera-developer-76.0.3995.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3995.0.ebuild
new file mode 100644
index 000000000000..9f85c468ae05
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-76.0.3995.0.ebuild
@@ -0,0 +1,132 @@
+# 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="90.0.4412.3"
+
+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/Manifest b/www-client/opera/Manifest
index ee35a834d948..4a66c8a4da44 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d
-DIST opera-stable_74.0.3911.203_amd64.deb 72976108 BLAKE2B 02342ef4d291bdd512a78ac0d2ae5da63d11b2cc999f0acc6ffe1ba9c9fe30a292b644d5239dc7481c4dff6c995985c1e1ee6f760240ef402f2740ce0928473e SHA512 ecffd6bc62a9d1e411358990add1e63e5d2a85614e47fc41b6f24eef9689291906516e779e5b9510e213ebf988841d21a88d57112ad510d97e6f8bf6b9ef4d3a
-EBUILD opera-74.0.3911.203.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
+DIST opera-stable_74.0.3911.232_amd64.deb 72911904 BLAKE2B 8e803ba1d0aed25f0b99e0b4fd4c8695381e54c8af607fa16ba08079e8ebdedd0c8d01381985553318bf9856ac399a95ec2ca91c67a0cc2d6b5e2e1c087837e5 SHA512 91a8e7219efcc076ca822a0e4fc313812dad8381ed40fed2260a88c3365fa3ecf3d36a301b507721131c436fe97a1da56a59380fef26b34dbc4254f3b4284c22
+EBUILD opera-74.0.3911.232.ebuild 3316 BLAKE2B fca6be0f2575481673260bf3bcdc66eae746182c412cfb5d6c4842b465fe01057d1959de5ffaa9a70f38f7996057b6d94ac16d35681d81c03b22f234e803a6f7 SHA512 744aa83e96795474f5fb766fafb70e72a482a7e9eb244d98f998991fc7a0beef5b2906a87cfa0887c3012757d2f5822a3094c209334d3448dbb190e5e2b84760
 MISC metadata.xml 687 BLAKE2B ebfff0bde22208ffea6584bccc5dcbf3b8682cdb10e95b43150d872bef72c6e4325697adbcc659ea3376977a21aba1a90d9f9d71b30bdc1a5d850996116cda55 SHA512 43bd26c1b891583955107a111bf7e8d81619d03dc4cd0c67210909c8f26b3bac9112fc59e31d5c422c7464c8ac699107977c34b57a0f27585786ca1636d704cb
diff --git a/www-client/opera/opera-74.0.3911.203.ebuild b/www-client/opera/opera-74.0.3911.203.ebuild
deleted file mode 100644
index 2f9be6861f91..000000000000
--- a/www-client/opera/opera-74.0.3911.203.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="88.0.4324.27"
-
-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 widevine"
-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
-	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
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-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
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	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/opera-74.0.3911.232.ebuild b/www-client/opera/opera-74.0.3911.232.ebuild
new file mode 100644
index 000000000000..bc6b35c83815
--- /dev/null
+++ b/www-client/opera/opera-74.0.3911.232.ebuild
@@ -0,0 +1,140 @@
+# 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="88.0.4324.27"
+
+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 widevine"
+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
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+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
+
+	# symlink widevine
+	rm "${OPERA_HOME}/resources/widevine_config.json" || die
+	if use widevine; then
+		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
+			"${OPERA_HOME}/resources/widevine_config.json" || die
+	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/otter/Manifest b/www-client/otter/Manifest
index e442e1997286..45b955ff7e6b 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,8 +1,5 @@
-AUX otter-1.0.01-qtgui-5.15.0.patch 342 BLAKE2B f28197b1ccc6ed970594638228e1345cebdc50bb3db809fa0dfe8038b74f2e7ae89b3d7c2291e66089afc709bcc51d6cd6dc2f93dd902a893a2d0883358dd7a3 SHA512 6462158bd09f86867644a25a78579db7c7d6669b9c917f6c02fba817e3b69cf9e62038e8f0e6fab232af13b4f1a3649249ee6ba60601f9fcd28b004fa46c0f77
 AUX otter-1.0.01-webengine.patch 1062 BLAKE2B f3387e091afacf07c305e965c1d571658a49c924c484312cc89212d636fa3cfd8fde74477feab974def25ad93d2f01437d5c82896cac33ccddc879fdbaf41543 SHA512 cab5895aa92fa09415d4c60f75501a8e319dd24810319cc8ac50b872d153525b710ad32a9a5398a62fb9305653c21710b5dd181470938de339a547248bbb8bfb
-DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
 DIST otter-1.0.02.tar.gz 4940331 BLAKE2B 686547b4302e79e882c5c4967680992faf54b5330896207ae98b1633fa6eb2df70793bfd0c8da5c7b5b8be39c5b9528f32303f69026dcd43f12fd528923b9011 SHA512 5b142486298f2ef1f0613363c7a4de3340544ecd82406efc64225e78eb958337ea4045c0c44553fe3b29a0836bd5f6cdab37d615ebf98756108f9aa5473360a1
-EBUILD otter-1.0.01-r1.ebuild 1743 BLAKE2B febc145b4cd0a7839ceb21375750fb4ba6b7faf58101528ac02dc7e9a09bedb1762e5fce62093dcbbe6bf4b1c7139d8512a863d11995b3aee8d4d86f7d20f07b SHA512 30e09797cc1194a89bf165af51d2606b731477ee16d3b4fb37c421aa8b015801893853133453708d226d12c748789cd5390a29aaab9090451f681c948135ff31
 EBUILD otter-1.0.02.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
 EBUILD otter-9999.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
 MISC metadata.xml 258 BLAKE2B 08a65741cdd1898d88a1dafdac3ea04ed28d3ce096c31dc03b02668d5ea145f87f0b59c73afd556d07e68600ce0e843ee7a37309d447c08bdfc32ad773a0b559 SHA512 a85a366fc538dcadd861ef021552c19bac761bbe1e31f2177ec468278bb320ef2bd2850491e011e76ede92e89e5677672956d08de92e11a99f821799d969fc2e
diff --git a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch b/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
deleted file mode 100644
index ec60a4b2c42b..000000000000
--- a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/modules/windows/web/StartPageWidget.cpp
-+++ b/src/modules/windows/web/StartPageWidget.cpp
-@@ -41,6 +41,7 @@
- #include <QtGui/QGuiApplication>
- #include <QtGui/QMouseEvent>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QDesktopWidget>
- #include <QtWidgets/QGridLayout>
diff --git a/www-client/otter/otter-1.0.01-r1.ebuild b/www-client/otter/otter-1.0.01-r1.ebuild
deleted file mode 100644
index 2efa58e6f140..000000000000
--- a/www-client/otter/otter-1.0.01-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/"
-SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-	>=dev-qt/qtwebengine-5.9:5[widgets]
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.01-qtgui-5.15.0.patch
-	"${FILESDIR}"/${PN}-1.0.01-webengine.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_QTWEBENGINE=true
-		-DENABLE_QTWEBKIT=false
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 09eadcb2254f..068f77c49978 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,10 +1,4 @@
-DIST qutebrowser-1.14.0.tar.gz 4144761 BLAKE2B cc220990c119904c18932b7f240e428fd36baaf42a592f8fe15e9a1b1e5506cf82291ac0365fd43c75ffa78b403cbe35616f8bd5b362a686db389f5ab7a02345 SHA512 7330b685b5852c7700738bf1063121c6cb19b190143e4b98680563ae1a6ce7affaf9691db8c3a4e3686172be7da26ce841709dbc5d31a941326d7432c857cb25
-DIST qutebrowser-1.14.1.tar.gz 4161759 BLAKE2B 5ea4d032cb8137af1ac9add9fe85b7dc0b8d9c78c838bd91b09444035f3e433d7cfd75672fbaafc1eceb2a0e1bac8f54b8419a7ff0d7c3b272d588818194a260 SHA512 2902b1f320c80601195f0a87b4cd1ce6dac7e79df82df692b08d00f1f0be449fcc7d7a855f4fc2cc5773f3b2142f508b0dfc6612778c416401f1117acc081de8
-DIST qutebrowser-2.0.2.tar.gz 6190348 BLAKE2B 0646f7879c049f3c754c98d6929f2851507804cc95fe117cafbac8477203799afd9af5c8e6b97fd48a09dffcc17f41982b035a0459737e289f02ab34eef63f7e SHA512 523eb6a46e88fc3bea724867d92042e86f75948a660159e4bf7c21b98737dd67e05fd62840d3de06c5562c8e8833a2178cfd9fd620b95b7521d695044e08f5bd
 DIST qutebrowser-2.1.0.tar.gz 6246732 BLAKE2B 8765112265a3b0852ef4f55aae2e69e0d6d623d218ed40c54e0a5d7a76ac9ed83885fa83a3112419f1b01316c3ae06934e89f316d280c2ecfabf70966bde0ddb SHA512 eec5ebc8cd4ba530cccd8296320768a3824c4f0828c806523acd95762a3dc9a40019b22b9e9219b27d1078648b78f861c6f3792ccfe991c0bdd4b3b95a009c2e
-EBUILD qutebrowser-1.14.0.ebuild 2652 BLAKE2B d6eb715962a5b950bf3792283ed2b73ebbd445226b7d8c20cc503fe53d8790e49c76cab59326bca6c88caccfa70fb0ce987dd812a886666ae8d4b25f663f99cf SHA512 fe94792cb5e3ae5d7aab87e0fe6880460bdb34bd47036759ea0706d16c7354f2cdff915bc40ccfbbca5f051a61afb2918c876a89c66e0a9185d95ff7ee80e0df
-EBUILD qutebrowser-1.14.1.ebuild 2652 BLAKE2B 47d9f2630c392a4424fe2ef0138adc18df4e787d6be521bce773619f6374fd5020eae9f4544318e0d9afb3d5500988264af48849c1ced2878048051325afcf78 SHA512 c84c3664aa8ec6c2feba3f3a5331179e29afdfcde5b7c56f7b377ca8cfcee49390b644592d5e8be6adb48483293fd74ef32cb1ed398ae9ddfa5424d1fd883d0f
-EBUILD qutebrowser-2.0.2.ebuild 2749 BLAKE2B 4b8edf2b84f94236c092a1636ef92c7107222cecab1df4b56ebe521280263bdd78cef52db1c47a523a3c88c90804400780877ac1c548a074c0e2d4af7826bb94 SHA512 f1be68c4ceca42c51f24c2c9a6b9b712ba72c822b063e010d3385d83305f2bd5da11361ce5d35af8bc1416239b0f3e23a6a40c33fc64edb5aa7c36d1b4dbcc0a
 EBUILD qutebrowser-2.1.0.ebuild 2749 BLAKE2B 4b8edf2b84f94236c092a1636ef92c7107222cecab1df4b56ebe521280263bdd78cef52db1c47a523a3c88c90804400780877ac1c548a074c0e2d4af7826bb94 SHA512 f1be68c4ceca42c51f24c2c9a6b9b712ba72c822b063e010d3385d83305f2bd5da11361ce5d35af8bc1416239b0f3e23a6a40c33fc64edb5aa7c36d1b4dbcc0a
 EBUILD qutebrowser-9999.ebuild 2941 BLAKE2B dee8c19bf858809a1e5cde8afa8d4398c5c37bae0b55874b479d6724f08a931e952e98240e4d46db883029dd3f8cfb4a70f934f14aa38413ad0b6d436f1c0578 SHA512 63804c31cb48ce5d857d7833d15277fad73fe95b294a2de7379294380980707a56ddcbe92c1841383cb97b6d94451406c7955a87459d52d1d3dad8c056ed04d4
-MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
+MISC metadata.xml 742 BLAKE2B 3410b02e22887bb80f47c72888bbbe12505686aef9a83e7fa8c66fa01dcd16f0b60511c9cb9953aa087c89e62eac5845ea7db155014b978fed66c35ecefe8780 SHA512 22873bfafc2654f695eb90182c922ebd9465b3f7b3bbfca4199ef6684b65c3a28a8164a2045c823017cd6beab1ed65d00fc56904f6686bc98acca6145e80abe0
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 0e64656b39a6..c915949c2ca1 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/qutebrowser/qutebrowser-1.14.0.ebuild b/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
deleted file mode 100644
index f4cae8f3e6cc..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.7.1[${PYTHON_USEDEP}]
-	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		insinto /usr/share/qutebrowser/userscripts/
-		doins misc/userscripts/README.md
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      misc/userscripts/qute-lastpass \
-		      misc/userscripts/qute-pass \
-		      misc/userscripts/readability \
-		      misc/userscripts/readability-js \
-		      misc/userscripts/ripbang \
-		      misc/userscripts/rss \
-		      misc/userscripts/taskadd \
-		      misc/userscripts/tor_identity \
-		      misc/userscripts/view_in_mpv
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.14.1.ebuild b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
deleted file mode 100644
index 6fdb0a12878f..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		insinto /usr/share/qutebrowser/userscripts/
-		doins misc/userscripts/README.md
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      misc/userscripts/qute-lastpass \
-		      misc/userscripts/qute-pass \
-		      misc/userscripts/readability \
-		      misc/userscripts/readability-js \
-		      misc/userscripts/ripbang \
-		      misc/userscripts/rss \
-		      misc/userscripts/taskadd \
-		      misc/userscripts/tor_identity \
-		      misc/userscripts/view_in_mpv
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.0.2.ebuild b/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
deleted file mode 100644
index defe2baa7c46..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		insinto /usr/share/qutebrowser/userscripts/
-		doins misc/userscripts/README.md
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/add-nextcloud-bookmarks \
-		      misc/userscripts/add-nextcloud-cookbook \
-		      misc/userscripts/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/kodi \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qr \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      misc/userscripts/qute-lastpass \
-		      misc/userscripts/qute-pass \
-		      misc/userscripts/readability \
-		      misc/userscripts/readability-js \
-		      misc/userscripts/ripbang \
-		      misc/userscripts/rss \
-		      misc/userscripts/taskadd \
-		      misc/userscripts/tor_identity \
-		      misc/userscripts/view_in_mpv
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index d7b6df402d33..bd2f0709d574 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,6 @@
-AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a2657370e0e9698f7e6e0862fab4780d292e5bab1a336dbffcbcde730db7474f1e11b08e98b0c54ae19ea15a SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db
+AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
 AUX surf-9999-gentoo.patch 1147 BLAKE2B 4766afd176d300bcf26fc7730e60344b6461133cab976fc96b9afa1a99df6189085ecc802b308df653871866971ce078b586bda5f9c124c74d9b555377174b0e SHA512 d0a50f8b396b3989827e9c2fe20d0de58ba626a2f551aafc7a776ca545f1b76c548580a1f813bcef3fc2ec2d0fe60af76036a4d9d182955a7abcd44dc7185709
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1241 BLAKE2B 438aad0c8a8529f4042235f8490a7b980e922b3500afbc83e2d95d144bef9a46a786abe98d09c65a6a3f056458e78f96593933a25b10c5d3bff97b9587bba9f7 SHA512 c06d268dd882efd15ea7128a4e4966f0b1ffbd9c8da3ce180f1976a469d89566bc3a7dbcdb39dcb5769b4b9feefde46358cd79a99b58f79ccef4fdaeaf28ccc5
-MISC metadata.xml 347 BLAKE2B 8787a8c0af8355eee5eaa3538dd76b5a4c6deb6de8ef90c468e343fa5ee26eb0978394e3943c841566fc600ca62f4d7324cece0f486c7f912b60da48af790db6 SHA512 e4f1adf1f17bfd24d065e8869983ec556f3438b0fcaa806125dbc0d9848102edfdd2a7d5ceb5c73987f400bfa019024cf69d9fa7a57a047c95dd60044764efdb
+EBUILD surf-9999.ebuild 1331 BLAKE2B 0181a924a03247c3a60aece43b5029702162df785c208082df610f38b8d499ba33d4824b2b5f99985f7de45dcca68028fe7dd4d1b4037fcd9cfa978acd679af0 SHA512 ffefee4fe16bd708b8c09ffe590a39553a53266797a92509df108faf495a83f6da5e509bf8a8d743dd2a29bd5f4f836f87a93256a5e1a958c12ea3b807c3ba6c
+MISC metadata.xml 463 BLAKE2B 1c11d2d7ca09b28800b060f289acb8250669d30792765d89f5afe8372150efea49317db94bd0b8ba7a40fb46c38778cfe519d4081270dc77976650b9d99417db SHA512 22d63cb756b13ed0f054a91c9c202ea71aed493f9eb41344eb80ae8fd9d6c9effd1df5d636d50021be10afec6d2f67a4982cfdfd1acc43cdcc9a276ef4d420e6
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
index 07aa6568f55c..b0a7b5c8ef0f 100644
--- a/www-client/surf/files/surf-2.0-gentoo.patch
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -29,8 +29,8 @@
  CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
 -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS = -s ${LIBS}
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS = ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 5e4c14c17c06..52593948c041 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
+    <flag name="tabbed">Install surf-open.sh script for running surf in <pkg>x11-misc/tabbed</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 8670c83e868f..d6b737a623dc 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ EGIT_BRANCH="surf-webkit2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
+IUSE="tabbed"
 
 COMMON_DEPEND="
 	app-crypt/gcr[gtk]
@@ -33,6 +34,7 @@ RDEPEND="
 		x11-apps/xprop
 		x11-terms/st
 	)
+	tabbed? ( x11-misc/tabbed )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-gentoo.patch
@@ -62,5 +64,9 @@ src_prepare() {
 src_install() {
 	default
 
+	if use tabbed; then
+		dobin surf-open.sh
+	fi
+
 	save_config config.h
 }
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index a080f8854d1a..0a0cd1ce6e81 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -2,4 +2,4 @@ AUX uget-2.2.1-fno-common.patch 144 BLAKE2B 107c0876bd4c4813836c7d6a4a87ac1f14eb
 DIST uget-2.2.1.tar.gz 1006697 BLAKE2B 2580cbcbe12d3001ada252a46358c4bc357fbe2ca4e3433e13ad95efb8e99d567a194db024eaf2ba58246a35937a5262be62aac4ee24272421f531dc72eeab20 SHA512 b76e5240e42cd0aa5bc47eb1a9cff0a0d8cdea87995455d72cf925923321f492200896ad904960e7f7462eb9655284f5b295b8a779b42223fe73a098a143576f
 EBUILD uget-2.2.1.ebuild 1200 BLAKE2B 1977978ee1b39ca54e5e16bab66953f4cd341cc05fbec7cc37f833e659ea8ce6d04aca772328cef30eb8c89e2852363ca85de481b39ac558dbb55a0c6005f3a1 SHA512 ffea9fdc9b3b84bed13f16221f901841d8f108233abdb670c665b67b6421b0ae8387810b7c7c17a747000e849a8d4a7fd226c14db19b245875b1b5445c2707c4
 EBUILD uget-9999.ebuild 1128 BLAKE2B 690445c625407e1b8de293f8f405e9887825cd8072e0429bd6cbe2582660a90ce841450869576627bfebc5f0975fe19c211f3baf38c1d7f3571db23c2aa7e5df SHA512 9cfb2b8c9cd4361f2609aa02106748cc84bc24a7a5e4bdc8f9e52eb068c88451d6550fd5fdd17f6174742761383c606b69dd13631d1e7cb17f7e5942854823b1
-MISC metadata.xml 1122 BLAKE2B 09b2ce4fb6a0b65557c7e2564eb499f7da42fdfe2e48e046df182dd9b3418424391bf3011e69cee68534b568750f73e59a5886f46cfb0ac129d96426ce4d359e SHA512 7c4a793bfb36dedc7b07096f6ec3d82ee3196c350245c6d30bfab81b1ab56bc0934d62a3b1dd23972ede9eb4970bc9d9d605532d5305ba21c3d2f26fec526095
+MISC metadata.xml 1152 BLAKE2B c7052fde63644b09a7042e0da2add226f452c50564f9d37b1dd3c39f1be30e9a535e463b6efe15f15071e1f7bac4b7e168484bd033a5392ce252bbbbd12d7124 SHA512 a6d48e7b4fc805a7297635d0bd829b826e4fe382c51fb9ea7eee5cc85cf2ffaa2e7c1d4298ce2edd2ae5f5769857cab2ee699d5f0b260cb52e7d59e996a13777
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index 956185cc59a3..89f76e1f3559 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chn2guevara@gmail.com</email>
 		<name>Christian Segundo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index cdc2e0979fdc..7aaa60a94483 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,15 +2,15 @@ DIST vivaldi-snapshot_3.6.2165.32-1_amd64.deb 77537504 BLAKE2B 5104b2ca7878512af
 DIST vivaldi-snapshot_3.6.2165.32-1_arm64.deb 69777460 BLAKE2B 3bd957ecd1547d79183b955ecbc8aa6d53e9966c8f03810b5f40ac91b5752022f6c91111ab3680f220ba1f8ac1a7748f366a5b0a26ce528fa00cb1be87ec4b3a SHA512 98f2061f5f32be702e55927e58ef8af03bbb5f16c2d6fbd9f4959b9b9732313c3663f4b720243505fbff3f58677a06e49957754efb03fa28b02065edbe338682
 DIST vivaldi-snapshot_3.6.2165.32-1_armhf.deb 68597612 BLAKE2B de4c564394972fb9a85b02541adc67c0841b0b21c00367883527e383af80988969ab6a9c0abc64bb55a7ecad83a1b626f8a62ae383d7818e464f9aac1a3b78af SHA512 efa2a53144791e1bf42515932cc08b3308755feb797c00d64a283880b4c0e9d2aefaa0d7fd0d44eb3354e3bf289b0a087381af62202430dcf0fbae9e58c5a2d8
 DIST vivaldi-snapshot_3.6.2165.32-1_i386.deb 73641588 BLAKE2B 49c95c3d8cd90d1eb69b46df7e99cc5a267a6e0f1ea051e011f9e032fb130b4db63b542015192ebac72840aed11abb650d0b221b84b387cbf72ca4e1432d0bfd SHA512 5dda40708f005862ae214a87d14f5f88f3673615402f07fb1c3317d40cdfb922ace38d897ec3bf88a0975b3f95045cf4d7022a3a3e06fc8edf49c85e9990b68f
-DIST vivaldi-snapshot_3.7.2218.25-1_amd64.deb 78709784 BLAKE2B 9b014340c5cac95b0fe3e05b7aa070ea0ee642d9d7604d83c1cec1c95cde3f8c03d6f4c961d035c6674f118cc29fe380e6939d3b80619c404cab115985f655ca SHA512 e41a098169af40b0d75f9bbfdd405f86e3cb842e49cc5cfa3ba9579573633bf1a7e451b58492f82e162f55850148edaa5287f6d60645140f506fa9e074806fa6
-DIST vivaldi-snapshot_3.7.2218.25-1_arm64.deb 70823924 BLAKE2B 1b14ae98af1efef91b3b2df574d8195bbba1882c72930780b8b499af22eed6a6e08d21b6a294eeefea2c60c081e5f6285a7b90a3d5974d2e0bdfd8c5e07a131e SHA512 069a987094f4a58e679dffb183bfad0088d57ee1875feca6c7235cdebadd35bbd790e1189dce3163fa5380826adb230d5270f778429bd2f216a6ed81a24e9084
-DIST vivaldi-snapshot_3.7.2218.25-1_armhf.deb 69655016 BLAKE2B 104d1646799c24da61add66492c575b47f848df8c686cc95f5074523c668880c8c8ec2fb18407da843a33f0db68e81d69129e0a3820b297c96441b58a2ef835d SHA512 3f64fb39e650a11f9850b6e0a7ef66536e57b9c5a2f62ad8acfd11d4280d128d42aaf3991446e4a1dff20de84b81d45e417c6ce45e993f98462643d73a7a2207
-DIST vivaldi-snapshot_3.7.2218.25-1_i386.deb 75771152 BLAKE2B ff7d64d892409c29de8bd2bf79561dbb2091bfa436ac4a1d1bfbc479a61c107a5c6eaec85ffbc490389528f2211129159a993e90f342911f38a6f6d0e21c7ab8 SHA512 1f50ad5b3b8123e233c8f05dfec2aaac636c7d902411a241307bea3ce75f99027a2ce2b311ebcdc799cc2cd8cfc4287ac9e7b6fdc85896f7b3ea4d6b5351e913
-DIST vivaldi-snapshot_3.7.2218.3-1_amd64.deb 78724140 BLAKE2B 8f939c2723a7ae2e580cf9285c13d7434b62805fef26c494aceb4307aed1f51f4b6bc77203423ca464baf6b10029fb486afe805cfacb5bef35199db33106ee12 SHA512 6c4e6d16877441d3b5dc2945592cdd48f45217ca52fefb88d681296658ded86b670ae3e14b4d1b929e89e13e3b408df8aa12d2ceea8f3689d2383af21c87bd13
-DIST vivaldi-snapshot_3.7.2218.3-1_arm64.deb 70800716 BLAKE2B 579d53a12c6eefa8c69fda681876f9216a78cc960db6a9043065a698b0e26d0a2a7cf9ee52fc2cdfa0b19599f17aa9cfcab3ac94921899f771389a276f501713 SHA512 f0b59a3a96d463c78185aef41597b013b5c2c95583c51f0023d1af994bb643811318a606fdc2600df7e001740487dc942aceae4e8613103210277c2f38e0a7c7
-DIST vivaldi-snapshot_3.7.2218.3-1_armhf.deb 69635832 BLAKE2B 4b8ed5c5b7a454dc4def3c4c6ac7971b125c85bc6a6f8d0cbc2ac5b10df36623adf099f0fb54fb0cbe29859d582f62dc47eb247971b82ebc89ce229439332b35 SHA512 cb59e237239e70f3c317e27f76da7d087291d825b472041548dc0303f384fa4fbd2ccae7138377090207ad8ccce82706f123cb95d718a79b4a8c55a02a9d4566
-DIST vivaldi-snapshot_3.7.2218.3-1_i386.deb 75736164 BLAKE2B 02bec228bb256a910edf8567448603b6d5645146324fb48b75fa10995ac679393454cd2d17dda75e6d730e060e502fa45d1498468896e5dab650f6b4d89421de SHA512 e8aaf7fd1d2cff38fe3de69d27521f12519373d17323e75ed747c5313e3819ac8d2d1facd863c8590db8910870dc7477b42c9d5e1c95c78199c98b2c2fc535b4
+DIST vivaldi-snapshot_3.7.2218.29-1_amd64.deb 78735348 BLAKE2B eb3b21856be0dcfc1ad01de269f600f93e8095cb2da996bfa37d35823a72aae9ba46b3e5033f45886388c48afd1e1b3537afebf52a2e5d2ebb232df2fd8a5566 SHA512 7a17aa722d53322faedf350069663de1c986b999f898adf4cbad97fe8aab01eacd23f24886e1b834b222d142dd1aa90bc8ec5f673a30e954a9346807de9e77c4
+DIST vivaldi-snapshot_3.7.2218.29-1_arm64.deb 70812268 BLAKE2B f44684fa5f5b3a9119b65be6c8699802d0b7f89029aa6ea03303ea792778122fe7990f47a5d88c8ffdd451524ef64b80088177c1e0b4efba038d51a476e7ba81 SHA512 09d219d3af8e1b88363e3aa62cea43f0486af7d72033e84ee684f0f85bb43710d6815fa870cf8148923781a3d51b6fc8c99f395eafdf0ac9654043f73a02f26a
+DIST vivaldi-snapshot_3.7.2218.29-1_armhf.deb 69650632 BLAKE2B 1ceb86bb5cabd2e3d34edb6cc81c5c60806fbc68fbf9d29320475b725ec0311907b6e0666887436c0a0588c8db5c61f9ef3cd7c484a982215a0eed7aa30b4040 SHA512 19b6908611cdaa0455d758284f8804d764f5ecc48b5332001e9a80253fca21465764f3742937a857b6aea559e755a5090b9d466135f8ee0994afd0f39c2d4199
+DIST vivaldi-snapshot_3.7.2218.29-1_i386.deb 75769804 BLAKE2B fe57189c01492f707f484bf835cbb64f25fd7f4242b3143f3516c38a0f09223935e8dd12d63f8b10f7cc78a191da5181e3da67e002b12e2ea8cb89188e6601ca SHA512 ee0b55e187b0464e03af3cbef3e1fce4749a87726abcb89786ef000d6fc093cbfe8983f328cfed09d562ae235cf6439bf8c8a1482f97c61f966d7c1f368302c1
+DIST vivaldi-snapshot_3.7.2218.32-1_amd64.deb 78971276 BLAKE2B c49fb14c35154a098d01308d6457c3eaff83b2379127dc91f37e638408f4ca029e7cc7e8cbf8a0d27e776170aee81a3d7e140f2838763be401c7e73c285bb183 SHA512 fe03f436293d9c12bcc40f505228d5ff36972b86a40f4f7e179c9e63ceb554973a20be61b197d05c0dc37f9575461c005f3ebf75af6e79b9c0e5e5db4d713c21
+DIST vivaldi-snapshot_3.7.2218.32-1_arm64.deb 71047788 BLAKE2B e5e2ad9ce07d7b3a4f5a282ce7dfbb77c5d1f0190864505ebc1ecf0f9cee5e2f8591f5dcb6e1b569f10dc7b48caf3a6eeacc9d55305725821be3da38e03c1571 SHA512 2ac48ea9005754cc909380e1c75a0d5ac983d2789b99b8e4c9ba8e46361f55654fbfeed32810fea0dff15772b5ed5582af866a0401ee20215cb2cde8f144a91f
+DIST vivaldi-snapshot_3.7.2218.32-1_armhf.deb 69858324 BLAKE2B b79bfe59a1e1b1abea7a73ecf061a0857bb06097c965b36fa7853a09415ce3a766d4f454653479163b4e9c935650319200e49c5f10f733ed1177edcaac4b2dd9 SHA512 83b4eba29d8e62353bc913f543399856224f6085ec93279380d26391ae7e886a908353563d029904c861380c9286c5c97794fa3e8e903089b861dd47c034063c
+DIST vivaldi-snapshot_3.7.2218.32-1_i386.deb 76021972 BLAKE2B d554e1ddeff1f744f1d8ee7b2901332dde61e73be5b1e4565cf12aaf4f16b8ab549063d8606655a4b04d5e36b79b90367e5c3db4461c8480a8df3a629b00dd7a SHA512 4bb3d4191954493e9bee3b54b010d96d655938afed82933f242a27f2509347649d54a606fa68e310ccf9d48da2b8e348213f09dc6d158e1f0cd393ff88fd904e
 EBUILD vivaldi-snapshot-3.6.2165.32.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-EBUILD vivaldi-snapshot-3.7.2218.25.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
-EBUILD vivaldi-snapshot-3.7.2218.3.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
+EBUILD vivaldi-snapshot-3.7.2218.29.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
+EBUILD vivaldi-snapshot-3.7.2218.32.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
+MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/metadata.xml b/www-client/vivaldi-snapshot/metadata.xml
index 91c75704fe9c..d177249115d3 100644
--- a/www-client/vivaldi-snapshot/metadata.xml
+++ b/www-client/vivaldi-snapshot/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.25.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.29.ebuild
index beede0dd59ab..beede0dd59ab 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.25.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.29.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.3.ebuild
deleted file mode 100644
index e3d12da4e30f..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.32.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.32.ebuild
new file mode 100644
index 000000000000..beede0dd59ab
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.32.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f61183a6b564..4347ce9b081e 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-stable_3.6.2165.36-1_amd64.deb 77546152 BLAKE2B 92e7026902ce28666076499926261db6eaa6828c9fae077d1558192b6f66f60bef6d95c89310dbec874683c6d172484884c29e7fed020ee8ac2048634ad0eb2b SHA512 6e1698d78dadc383626133bc4a28add034bc4660906e5f26347396a57e03f68eb4d97c8e5db9e89393c044515f8f55bb3b6177117b7b2f3cc79586305d07a2e5
-DIST vivaldi-stable_3.6.2165.36-1_arm64.deb 69809548 BLAKE2B b95b4bc62639c46add743a2f8d66edbd2e6981bff3de7d7f3828ea82efe3295350a3eabb96a4a2cf41b45156c9b64f64b067208f73ca30c70dd716f5aebce12c SHA512 4131ae1567c863a0d30aba9f333cae0c81e01d29c034543a2092f74ee08df038351eadddfc95bb967319897d8b613e64240c10f9f588c0a73c3d57e88ed19ac3
-DIST vivaldi-stable_3.6.2165.36-1_armhf.deb 68623288 BLAKE2B e814f57cd530024a4a179764814c6bb73c6a876c5b98f9f117fa74d49f3157c95e980dd82529059c8e455cb47da3c56c8d311af820391b30891992807993a534 SHA512 d61851cc3897e974f4edeb81f401e6daf3b90fba7a4b10bf2a98eecac2068f0d3f469371dc2825cbd45afa5cf9931c26fa78fa6e658048cca8cdb93bca2df35c
-DIST vivaldi-stable_3.6.2165.36-1_i386.deb 74279848 BLAKE2B 4e3a6b4fe3ec3ffb904457794e86f8f7c22814be29a0d193cf2b8bef2b9f21aa2b8e52733f92c7491accd04ec472daf10d53b61ea2fe7692d22de5a6a58a8f38 SHA512 685802a1f6cfbec92b7bf7d0ca777b153c3192c0e1bd9f9b23fc4d32f2529b649353edf8c7b298f44be078c3f61f79203703d639458954ac4ee2e2a3d00a5ff7
 DIST vivaldi-stable_3.6.2165.40-1_amd64.deb 77600092 BLAKE2B 9a2f2ae41c16a2bd1b2cba006c80eb8357b6eb88a2dd2cae001752741fca7bf7e8956cc3d277e39f09b904af3fb81eb6ae55adb15af2808ad824898b7cfa80c5 SHA512 e17a14dbfebd283de980cc2b6ddaca8fe7fe76711087c2cde3dc7cacd0c58521f6edf7546891b81bed428965b86e9341d20f134c2fdd792b2d061ad2c3f7f575
 DIST vivaldi-stable_3.6.2165.40-1_arm64.deb 69850704 BLAKE2B c88641c0ea45771eecf2369f89f18b2991931ea67f545c93ae3426b5561613835132f5a285d5f267b2e0981c9ffb65402a0016ec29fdabf381e6a16abe06c9b6 SHA512 026c58ee3c34497f6c5f31cf96b9a202efdeb2713301d5699267ff8b8fb32618c6c70e685479862a9c223dcdc32a0ea024f7334c8a52e18c5ae8b66bb7fed97b
 DIST vivaldi-stable_3.6.2165.40-1_armhf.deb 68650992 BLAKE2B 932c8df157717d99d2cd7963217fc0ecfce87a2118448624eae410311b706af468c1d6f8c0baaa3f8b8d2513eaad92e26417ca10f5511f5f76cb6f5cc7835b7c SHA512 e319733feef35c6b506deb21a21e4f6ee46acfcc83788bfa91d10b723146c870ec5108e433c57bfba37a3ba84da2d4f876a066a17a8f180e61933968585aca17
 DIST vivaldi-stable_3.6.2165.40-1_i386.deb 74317284 BLAKE2B b3b7a2a675128fea0b576dc7ff2b08218ee6c9796bdfaca91e8302f6d0de63173e8ab7f2f39232ffdc020779061724cebf599fd6e29f7eb1bf9277a271d52d3a SHA512 5628ea1ebaaa8b8a647b3e07c27aade8f45d448e21b38f19d9fc3749dc919a20f09df111098b99f5e6ec11146557f8742d5b40d3fe23e5bc02c4204fee7392c5
-EBUILD vivaldi-3.6.2165.36.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
-EBUILD vivaldi-3.6.2165.40.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
+EBUILD vivaldi-3.6.2165.40.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
+MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index 91c75704fe9c..d177249115d3 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
deleted file mode 100644
index 8809e8c798d8..000000000000
--- a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
index e3d12da4e30f..8809e8c798d8 100644
--- a/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
+++ b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"
 
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 6b2a4310f893..923e345af92d 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index a18be6b1dc63..78484ea1837e 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,4 +1,4 @@
 AUX buku-4.5-hypothesis-fix.patch 17711 BLAKE2B fb5b57e25f36b15d8f3a48bb0291a657370d6d4c9f6df002a8bbf4a0e5af9b45cc2a53fb31e855b055775abf312aab2f752ed7621c9fca96163aecaa44a396bf SHA512 8489537c7c0c8ba81a4ca8e2b26e8a8a81f10f8b0f40c3481c55ce13abff1602ccc837351b00a4be6dad90e78820f144741753bf6f3ce39515a38c4a743e6d21
 DIST buku-4.5.tar.gz 488913 BLAKE2B 29ed93fa9af4503f72a711889fbf17d86bcde1bc1abbfc88242c4ebd18f1c1a57077781eebdd79d9d993078d2f5b5883c9a0ec4fee94e37c0e7bfb727c5154d0 SHA512 7bbb598d5c970e8e594d58c0a18f9b85245d4a214c01d64b537a5ccaadab32c964521046b90754c2f2c721bf816dc7f4438cfeff3a7e7eec75ce958cc41dfa7d
 EBUILD buku-4.5.ebuild 3019 BLAKE2B 92c4deb07a3dfaca4762f5a877173d7fbf0576be73a2e485b17d17fc8a4c748da68a9c27ca7e6c5e1fcd1238a02cdf47b7aad0982f50f02079d9bed96b650059 SHA512 39ae35d6b80e5838bb7eb8792d52437c5ca961514ef2f0644fba06a14b4ff839599caf7172e18e82e8240f17441f598b9710885251c807456975568f0f2f3bfe
-MISC metadata.xml 549 BLAKE2B e8e6d23f9281201f3c3cb3542567a79346516d2ee9b246758240a3d8e424da7b82325a8ccc3ec971d725fe38228042982a2625fa694960582ba017d87edaab6c SHA512 a73595c4209f304ae0ef397e47e94ea71d3ce516091a4183767454bf21f195556cb9c0eca370867ce430b4d06358ae0496f28f1c37a123abb2019052cbe331d5
+MISC metadata.xml 579 BLAKE2B 3a044a07f97593dd2299dad004db229527759be278ff3b77d7cc70d505d45edde843754e52070fe0dadecd0250db66aa3f0f71e964d1180f493d698285088a34 SHA512 e887a1de3487f512b1cb48e256749e91171c72a7626458c22dfdbad6da73afe2418e25242f1ae9b20b85a508145ee69ec95a61b3c20c6049c3c71291e16b6405
diff --git a/www-misc/buku/metadata.xml b/www-misc/buku/metadata.xml
index 78e2eccd3d48..2b9ba5676794 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index 7f2535ee1153..8009ba964f25 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,4 @@
 AUX 0.13-autotools-neon-version.patch 344 BLAKE2B ece27a25656cb54a5eac255994fdd757c98840a39c4c215c44bb1b548eb3b5583b04d0bbe2feecec5a05fc0283f8f5ce6903894ed3bb94e57e20e6df825e36ab SHA512 ffc549b2c676a124bbb5a4d9df5ffe3178ac7186dafbad0cbae85b6092b6e204c9ac15e054084efd5eb5bf74620cedeaa88924c02c1f0861e9c258bae7ff9012
 DIST litmus-0.13.tar.gz 467532 BLAKE2B 509951d2751e32917f920fd37720dab215b1b81e6450ee96c5adaad22efd06ce781b80cb6acb363dda9e62ed9e08c2bab1869d24a4fd70f5f7bc337f3e112af4 SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e
 EBUILD litmus-0.13.ebuild 1581 BLAKE2B 095b887d7de2924e30705b9931bbf74c5809f02f302ceaab7bf7b808ea1754d3250ce4947c651d9336c0cda4aba71550a18eb4dbe0672a001185d087d9b6c997 SHA512 00a5813b6c2c476b705c654081577e286ed54fe983f33a6a478db8b216c0893e5671e443c273481d0fbb3bb1ddc3a074a59d332072205489202b5a8d29bbeeba
-MISC metadata.xml 669 BLAKE2B 3ad98886cfd15316e0c93a0978510a39385dba76fd3a9780299cfeb87406fb145620435b2d7b0f6cac401eb979b77e72910ee81ea1ab68da57fad6401a4a7361 SHA512 a8685a079bfd09d61d5ad0c1e73b53c482f9408428f9de65abb9b6c35c23407d11d247f609b3b53c03cd21291d2bed6b02d943022084cf2e67262a53a403b619
+MISC metadata.xml 699 BLAKE2B 4ebf57beed16e1e270450d1a6e7e5fcd1ad88df90df9581194eeea20269a90aedd50f93e3efc50324baf29345d427889bbb608ed8d03863b5faafa625cfd771c SHA512 8f8957df4156b158444cd8afcb478fb882e1500cddd897d01dd3a353849e542abd9f8b10bdf200c80531537444c4590091ed375fa3c6f3d2a88a9c5080ebf517
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 0ca40bd7e0de..0f3a037b58ce 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-misc/metadata.xml b/www-misc/metadata.xml
index 811b23e1852c..36fc7680f279 100644
--- a/www-misc/metadata.xml
+++ b/www-misc/metadata.xml
@@ -35,4 +35,3 @@
 		Kategoria www-misc zawiera dodatkowe oprogramowanie związane z WWW.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 9895dabe912c..7f37a52c9803 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -3,4 +3,4 @@ DIST monitorix-3.12.0.tar.gz 348117 BLAKE2B 65f6e5a8ef4acba2e5dd015e3acab1c927a8
 DIST monitorix-3.13.1.tar.gz 364091 BLAKE2B 0e11d1df2d5cbc4a7ec7b448b24409411903370b5fc0f35f7395439b017d0ce27e3d86fe19db70939942165a9e4bf72583030fdcd1b9c0b5be484c1c71af021e SHA512 224ccedd608cda609ea161f62e11266c13f26536d7e3c50a3690ace693ed52c71422f2ef0acabb4e8d69551458a6af2c33e6b776b1dec73cbf621a7f40339573
 EBUILD monitorix-3.12.0.ebuild 2790 BLAKE2B be1f972e47615d7fcc9f225da6efea482e8390e5a5cf45bdbf3a1607b0aa7d64f0e04bd4c8fe1b774d910880b7dc51afa781d03aa573277670764e80ff06474f SHA512 786b7608dfe1ce3a0802461316ec64f64b46a9f72f067d1767446fd9f075e861c1e66c5b6a6c1a6fed0b2a37bddfe279e870a3785c5d0297d0f05c9636afc483
 EBUILD monitorix-3.13.1.ebuild 2311 BLAKE2B 9e840d3269e3c519dcc9393af4eb717579e289c14c12bcf7a6da5c511eb77f30f1895170d17333f52838a57632f7c825d34b4363877c15e3f45a80fe422697be SHA512 20c901143fb4bcd06f230dca57d37c169ecdd785bf7073bae3600b30768c50cd6a081e7c768bc502d2ebccd298c2dfb372a743a3742f9fb4227db6dc78a0c7f2
-MISC metadata.xml 456 BLAKE2B 8c25de0cdb102ae91def87ffd8722597b787de59402f14a1620649e38272d13ccba6fa1d97df4c587b0d145fef446e7b52b3200d176e30cb632c2702ef104c9e SHA512 1c6934a7ffa1f5cb38336a79dc886cbb0b193668316c4fd246dbee9a9dd071f2c30147163d0ebb97d7f4b9d52b9f048421a1babe85ba5ba7499ecd83f2f56b3c
+MISC metadata.xml 486 BLAKE2B 7c94f1d6a38beb17aac935fecf18677d03e2e5d022f0b1b9de344ffb0275869e26ae22bc5c1315643b973f750ce22392387afe636c568ae920b9230ab2f41b0e SHA512 435eb932b37370d190f8b8df5e527c7dda51e7fedd08eff9046e8cf92491ddb52e556d1b3a01e401b180413a96971d56fe2431ae04d76b013d5072506209d791
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index ef52832b4f06..82292777efb3 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dwosky@pm.me</email>
 		<name>Pedro Arizmendi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/www-misc/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
index fe896bcbeffd..bd38320dd2be 100644
--- a/www-misc/profile-sync-daemon/Manifest
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -7,4 +7,4 @@ EBUILD profile-sync-daemon-5.75.ebuild 853 BLAKE2B d38982d9c5527c0654803ef47845e
 EBUILD profile-sync-daemon-6.31.ebuild 782 BLAKE2B 9ac819f8a4f964d86bfb11f919c086ba77c6445f4f15ab095b3f2ac58373abf21f9df941ab4418cc928e5f0c601f996575db3a0401776743070d8a3d30187f29 SHA512 ac66b9cdb4d98afbaa3adc012a0acc282f2062ee6146d2cccc74bbb2c350f0650d7b8b34e55f7dbed66b9c4d50de4a53b138c97b210f527ff43d76705a0e9af4
 EBUILD profile-sync-daemon-6.35.ebuild 820 BLAKE2B 758a73e11a522f8e23454265a2f1eef530153def6433234db5f06ebacd5e2d0c9797a7675c9ba0865c34f1fb8ac1715ee4ed21f7b5ab74e30dacfe17dc0ae6e1 SHA512 4186f37ceb25b7f6b6ecdc33ff358ca1a6e9ac1e9c04be1696eac69b700bf0f65b3cb6532dd23785c290836922bb27b1b74574d2d60452ba59d2d03210d5cb6d
 EBUILD profile-sync-daemon-9999.ebuild 414 BLAKE2B 2d75908e1931749dd2c4681076ae33e01e05454a2817903f25ce5ddf591c1f2d28184271036d0d6073268a8e0c7faea5648416b9e594e10ff0f7c6ddd03b8612 SHA512 320f2c02f049c099bac9f319e8725b98b36e597357729e95ef70be6f42ccfef17fae32a7bb55826cf46bc72056b662af7573055dae67d1c725db0d7c020d233b
-MISC metadata.xml 454 BLAKE2B 6869a276397639246163d2a3e503b196390e3c52c00f8545ddd8d16257b93328bf14324b553b42fc17986cb9058ffc41325cf5f5c30da844aea41bac6212501e SHA512 7174ddac618332b4e0904a293c15a4b6ea2beb93e004ecdc454d2927958e2504df0e17069cc5577a8047e072b90bd6aa94af9634cb12ab075a31c9658efb81d6
+MISC metadata.xml 484 BLAKE2B f7df3c7b1757696973ea2238ab7b39f3ab9025e8d88b0d27264edee4cbf078707ff989d4a30f88771c3dd60440cfdde19775d84c4717f7d5fa2d580d8ee5c9bd SHA512 b72529d332ccd78cd0f82c60436602feb8dcc62c22f1b567e3aa05fee9b53cede4a2ba1c91bb289a1f0247268d9da77a5afd2a673d86112051c48f468e1b109e
diff --git a/www-misc/profile-sync-daemon/metadata.xml b/www-misc/profile-sync-daemon/metadata.xml
index aaa0192550e1..9e6ee3ce6504 100644
--- a/www-misc/profile-sync-daemon/metadata.xml
+++ b/www-misc/profile-sync-daemon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 9201d46af864..02c1d8c19a18 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -6,4 +6,4 @@ AUX vdradmind.service 236 BLAKE2B 605e037f32ab03877b7d33d4cf964cac1a453c2026a34c
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
 EBUILD vdradmin-am-3.6.10-r1.ebuild 4743 BLAKE2B ff14dfc328ba51233e916c447e7d48d6eeb950f5d52a631445b1df99969376ac2b254fd50b4260ccf8aa9b43de57cf118aa01c3dde9fb574f53dae14b9310b8a SHA512 4ee2e4c111a35d342d2cadfadf113ed4c78323b5861fad3ac1169ef092024f07db6d28bf770e94c9e8e981e9e0f215f28d98f129bd38cc2301a12e7176b22c3d
 EBUILD vdradmin-am-3.6.10-r2.ebuild 4757 BLAKE2B 30e79cd4044858596fa425eddf3658891b07037117563dee68ba536ac214a18a9e0ddf9d3ff58be5722e7ca97da4bdfef9ccffe81a777011cb964085df22b36b SHA512 f851a6898cfb8c410b1245e312476946770d20bbdfb9761742f0e2c6049732bd425c3b2630aa827073a5f928ffee361cbba3978b8ad20514be044b51d6d1614e
-MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
+MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
index cd73dfdd5965..e18be98ab718 100644
--- a/www-misc/vdradmin-am/metadata.xml
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 3fbf602934a1..eca3d03f99af 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 dbcb8d732b47..17fef34f3585 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_89.0.4389.72-1_amd64.deb 81415588 BLAKE2B 95df0883bd61ef70f1596ce95a56d84c8b9c91b1736a7e5ffdc8be5c41effe0244004dd316a07b0230dc6e4375de25796d45915df02464391e387857ca7985b4 SHA512 7a65563efc3706f6684b304316bfdd8cd4a6f82d21f746e447757ae39b0c909879da5f6ed5752e0c0d8f526b59726f915a4486054af93d14bfc72c611b910879
-DIST google-chrome-stable_89.0.4389.82-1_amd64.deb 75879440 BLAKE2B 90698f31b819e376e013ccb88b30cbf06062e0697e7c5c70c63823d439703beed9c27d6981b6c251bc87b996e8d806490df8a157c5e61648548dbaa9ce73f286 SHA512 c81bb1722d136c439e3dee578c84d43898dcfc029d664ebf58458afef0957fdc8cdbbae0391f0d9d74359f72b43588fb5144e02701e1b54fb82aa0fc1cda585d
-DIST google-chrome-unstable_90.0.4430.11-1_amd64.deb 78571060 BLAKE2B 92ebd4854d0be1212e12ef8bfeb79ea68b9eb952d8d941435c17e5fe07d41008d41d220c7153c7c5e4028d7d0c0e57cd45f262c68af8dceceaac99c56a5fc5c3 SHA512 19e57a6071c1c41ffd81a3ebcd9ffd26a470a661f024792cdd746a84662590d90e52edbd820a49b690436e5e2a2d4748578bbbeeb6907f58a381e620b3e03a32
-EBUILD chrome-binary-plugins-89.0.4389.72_beta.ebuild 1218 BLAKE2B d6a76ebceff287c195acc59cc4f34d773cba30eae060532fe384989411ea3359580a62e6d5dc70031d08ec08ed47cdecc5d504e68fc4cf8a7bae9375884181d6 SHA512 3af4586e45548aa383294318856685d343e7dd5d25770644486b51a40728668b4c70ee6f98df54ade863f5fa184b7569296d49a3d2085d6291a680648c138142
-EBUILD chrome-binary-plugins-89.0.4389.82.ebuild 1218 BLAKE2B d6a76ebceff287c195acc59cc4f34d773cba30eae060532fe384989411ea3359580a62e6d5dc70031d08ec08ed47cdecc5d504e68fc4cf8a7bae9375884181d6 SHA512 3af4586e45548aa383294318856685d343e7dd5d25770644486b51a40728668b4c70ee6f98df54ade863f5fa184b7569296d49a3d2085d6291a680648c138142
-EBUILD chrome-binary-plugins-90.0.4430.11_alpha.ebuild 1218 BLAKE2B d6a76ebceff287c195acc59cc4f34d773cba30eae060532fe384989411ea3359580a62e6d5dc70031d08ec08ed47cdecc5d504e68fc4cf8a7bae9375884181d6 SHA512 3af4586e45548aa383294318856685d343e7dd5d25770644486b51a40728668b4c70ee6f98df54ade863f5fa184b7569296d49a3d2085d6291a680648c138142
+DIST google-chrome-beta_90.0.4430.30-1_amd64.deb 77718380 BLAKE2B 97ebc6d01431583e610115b71585320043080897d97df86813cfe195f39b540e52641fd8a66608f2ebaa42e10a3ddae19d758d0c405525a2d8a766de68cdd8e3 SHA512 6830a81909b2dbaded8668470963bebfd9031fb88fde5abdaa0b62e15d1d2ccf5c89f8805a522bdd4952b5979d6b0b9f41ee3a1771eedec3929bc29aa69c2950
+DIST google-chrome-stable_89.0.4389.90-1_amd64.deb 75841728 BLAKE2B 1de16e3916e1dfe646d37327ec7c69417d40bf751e43d76a85f8e8f81e654669a994223a0f5c9a8bcbbe4abf3db2f50cbe4e2072742da3ae9aae855915098641 SHA512 768557218228c0129d478dd3da8d1a21c62002f0e2f1e533567dd50a2757a9de0ad141366a6927d0a4877d5f38be6dc3c246e4ec64e3113411bf90733ce477d1
+DIST google-chrome-unstable_91.0.4449.6-1_amd64.deb 85346436 BLAKE2B 567abb574b5fea26925ed6bf028eccf14d8b3600cc4f5d6917b60b1e2ec53af10e43a2058a6c5a0a952442f59495a5c06439694ad8a3f96d7ee8391e76127b9a SHA512 c5c6ad70d099a582f9709d14e5985b5459b1e024c040dcf5e8d01e1ce9f9516252f813b64069c2f857f22885f7924999a7e7514959d3e804f9e99632c210d342
+EBUILD chrome-binary-plugins-89.0.4389.90.ebuild 1171 BLAKE2B 7fad281b4108e801510a3263d3bbedc8d81f331ffb1aa3a9abb1327b4a59788605a70e8629dac3fca2973e39293c4266892cee4a142673a89c73f0ebea92ada9 SHA512 3bbd5278432eacfa6f0ffb8bb35cc67543ec707ac9d2e53553dfa5b311dc933f7bd63181cd9767ec1871e375152e93d18f7b08b8668582aeefc992a890a7f074
+EBUILD chrome-binary-plugins-90.0.4430.30_beta.ebuild 1172 BLAKE2B 0f9bcecd942dc14af2a491bd6dc44d89073215c5aecfd70db6969c11676292c95873ebad038449455e423da9ce6e60f5f00c5bc6a33c07220bd92af8f8809618 SHA512 65cd52e6c75e08105dbe70f238878ee6a1afccdf82126a6a097ed2a35f366435b041a6f530546e22167b7bd1e0b36ad9bf940c0937e80d92e0b99764850a5fbd
+EBUILD chrome-binary-plugins-91.0.4449.6_alpha.ebuild 1172 BLAKE2B 0f9bcecd942dc14af2a491bd6dc44d89073215c5aecfd70db6969c11676292c95873ebad038449455e423da9ce6e60f5f00c5bc6a33c07220bd92af8f8809618 SHA512 65cd52e6c75e08105dbe70f238878ee6a1afccdf82126a6a097ed2a35f366435b041a6f530546e22167b7bd1e0b36ad9bf940c0937e80d92e0b99764850a5fbd
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.72_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.72_beta.ebuild
deleted file mode 100644
index e86752b87207..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.72_beta.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		KEYWORDS="-* amd64"
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.82.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.82.ebuild
deleted file mode 100644
index e86752b87207..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.82.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		KEYWORDS="-* amd64"
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.90.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.90.ebuild
new file mode 100644
index 000000000000..2e17df9a1303
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.90.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.11_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.11_alpha.ebuild
deleted file mode 100644
index e86752b87207..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.11_alpha.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		KEYWORDS="-* ~amd64"
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		KEYWORDS="-* amd64"
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.30_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.30_beta.ebuild
new file mode 100644
index 000000000000..f301c0cb51d3
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.30_beta.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* ~amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4449.6_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4449.6_alpha.ebuild
new file mode 100644
index 000000000000..f301c0cb51d3
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4449.6_alpha.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* ~amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0b2ee05bb623..531d09dacd24 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index cd9bd78df03c..d30b8b5749fb 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -2,4 +2,4 @@ DIST adsf-1.4.3.tar.gz 171000 BLAKE2B 7e3a524957edfd56382c788e2c551ec693dcbcac2b
 DIST adsf-1.4.5.tar.gz 171986 BLAKE2B c8d2b732d5930b3ab2da9b016f1b1962c07fad85e740532f3e68102dc6f34c7033b6a4ad2beca88410fda03426d3eca12a85996c695f4a2208f4d5a62855f4c8 SHA512 eeca0b837999f66aaea7787b759c635a2eb6b7d19f6dfa92416fcce5bfe499e6b0c8f8c2515750801af90b7e4af9d5bacc257f0b303d4367134c5f4730a87484
 EBUILD adsf-1.4.3.ebuild 1092 BLAKE2B e28630172fd9b75c701ab328c7af735ade44da3065438fbfe6002af70295f0a3b7b068e4e500a687322dfb9278510f20b5ce174a5c1e76ce900499d18860fe21 SHA512 d800172b2ae21a70c1f0577d3a8a1f06b42db5bef619b110df007a07cc63024afb265069b0360eae1d412a9e1b44f316cc80db1964a5908e91e576aa4d2d8a4a
 EBUILD adsf-1.4.5.ebuild 1181 BLAKE2B 30fbb5eb7827ee81f9f7c48c062a82d87277cba3567913950c2efdde679bb52e6dbe6aaec982a913f481ba568139fcba70e43610aade9dcc2ffd4d5e3adb6f39 SHA512 a1837552c27d08cbe422a0d94446f3e67302f279dff03f27303d5387bcf2595c173d1fcbd1e89b55b387c1325dfa439d86d25a314e2f59839de922b7b24a97c9
-MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
+MISC metadata.xml 295 BLAKE2B 5c7bf4472bd9223c7d5b014f4480c2f7eca3156cbd6d837c8a521936a481055b39222bd29fa63b8dc18f4fcc3636c3e6a633b647c99790bd8abd575912d6790e SHA512 5cdbd0c0674c83fde3f6cde438f3c2c12a2f19d77ca2cdfa2a15baeb55d1dd7c830126ecc526b23ee080fb4fcd3d60d44a81c7b97e85cbc486641005c5c33fa2
diff --git a/www-servers/adsf/metadata.xml b/www-servers/adsf/metadata.xml
index 7dfd24dac19f..0ccdd7b636e9 100644
--- a/www-servers/adsf/metadata.xml
+++ b/www-servers/adsf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 3e76fc2a0799..28dbb6b4325b 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1358,4 +1358,4 @@ DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690
 EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
 EBUILD caddy-2.2.1.ebuild 53306 BLAKE2B bf403bb629f50929b50543a2b6392176ff7b74ccfa55ba00717fa96a4bb232774290562c59029802e40989a2aaa823406225378de693fecc11511efebc27cf83 SHA512 c5233747f3202e5335fb1c9466f587a8ac42e30f82383a4d98d48b9660b5225294aac1b03ed42afd9ccb45eed8a7050737b6e7fd5d6b439899bb0ed30faa04c4
 EBUILD caddy-2.2.3.ebuild 53306 BLAKE2B 09cc70698cc65d7276455d4dbddc5449f7a6bcd89da53f4a44546729793e196013b1ae24834d73c560a4b6b9cbc2353bc3d326e790c87c282412f17335d6fac5 SHA512 da8ed55b6465577f44812d340fb26360df69b14c18ce6650d8b1269187e00743b5c8e6e3c57d3d5555331c8bf20f8d4c90c65cc9d21fbecec796ef37172de85b
-MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
+MISC metadata.xml 243 BLAKE2B f07cc4f89b36187dd934e1ea6064700c6f915093360a104caa0a9083fe74342f6e926d89744f9e5d974e0d081084eeb59ee8efc9806b72b06fdacf28ab5a6b4a SHA512 7421b060f5581bd9efebb923fdfb339d3ebd0d155fa51055ecdfc7a11ea4fc1d68f875c13d1590fbff0be5183098535ddc373b7601af9c7a4961cfaa1c6ad4f4
diff --git a/www-servers/caddy/metadata.xml b/www-servers/caddy/metadata.xml
index 2472231237a4..2bb2d280d7e9 100644
--- a/www-servers/caddy/metadata.xml
+++ b/www-servers/caddy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index a1c2352c46d6..f1ab6b673cdf 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,3 +1,6 @@
+AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
+DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
 EBUILD gunicorn-20.0.4.ebuild 906 BLAKE2B 7b895c5e0ebe86439c7ee3f8cd3867a8758e4e4db4c46f27bdccf9cf8a1426fd608360fb9ddbd01e279384dac66cae45e07fefe3a0d728467305042c9cc0a1b9 SHA512 28e948172cdffed3cfbf7ee5746d4514e80c32583854522dbc07e6d1feda15330a99fc4d7f898afdae517e32d3627039a4a9ca028352d8e8400fa0185d57c3b2
+EBUILD gunicorn-20.1.0.ebuild 1304 BLAKE2B ccc3fd31910e8c6a7d94dae44700754ba4141b3af6321cbf84a51c52283c7205f033a7d9ea702a7300dca95080df3b0fa70cef2ca5aa1a30688412da327a7477 SHA512 70fc191a876713268c1606d45a55d67d2c8dc73913678377607f3eb8cc1a3d83010427970b767f966c74d3a73264522b939088a0e2c29fd140a44357d4587077
 MISC metadata.xml 820 BLAKE2B d0d69bf646aea74e6b85daee66e739857ff027050bf3085c6f56eadaaca90297825234477d0b4b9540646edf92d7b5daabe523336545e756b5d1a9d17e34c95c SHA512 fc0e570d92321b0255fecb3511fa313a3caa8686f7956438e18ccaff802b0ea0edccc9a196f356fd9d24370100edfae0470d0afdeafa6a7398330829d8a95644
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
new file mode 100644
index 000000000000..d04c300c2076
--- /dev/null
+++ b/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
@@ -0,0 +1,22 @@
+--- a/tests/workers/test_geventlet.py
++++ b/tests/workers/test_geventlet.py
+@@ -3,5 +3,8 @@
+ # This file is part of gunicorn released under the MIT license.
+ # See the NOTICE for more information.
+ 
++import pytest
++pytest.importorskip('eventlet')
++
+ def test_import():
+     __import__('gunicorn.workers.geventlet')
+--- a/tests/workers/test_ggevent.py
++++ b/tests/workers/test_ggevent.py
+@@ -3,5 +3,8 @@
+ # This file is part of gunicorn released under the MIT license.
+ # See the NOTICE for more information.
+ 
++import pytest
++pytest.importorskip('gevent')
++
+ def test_import():
+     __import__('gunicorn.workers.ggevent')
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
new file mode 100644
index 000000000000..cb38379151a0
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
+# Not on PyPI yet as of 2021-03-15
+SRC_URI="https://github.com/benoitc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT PSF-2 doc? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
+)
+
+DOCS=( README.rst )
+
+distutils_enable_sphinx 'docs/source' --no-autodoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Note that alternative worker types need additional packages to be installed:"
+	optfeature "eventlet-based greenlets workers" "dev-python/eventlet"
+	optfeature "gevent-based greenlets workers" "dev-python/gevent"
+	elog
+}
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 0915d9a99b09..2d927e7e2817 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -11,4 +11,4 @@ DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107
 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4
 EBUILD lighttpd-1.4.55-r100.ebuild 6978 BLAKE2B 349d99b2b1422cfb962124b02013b2af9f151442bc1da262e24c83855c4aa028d9701731a37be2fd9f66b4f45cfd226abfd34ad470b3d856c3e264a353a46550 SHA512 3cdbf07a0b2ca79283dd35db0b14029fc99b44ffaa9967412fb5c0021a5bcb2f77d653084961386553ba82bec1df5b680bb6b372d6ad556d067a4c376c642cd2
 EBUILD lighttpd-1.4.58.ebuild 7531 BLAKE2B 6e3a0fb9e4a7ce2dc1a8e6665d278cb20840f0826dcd0ff44b05fa3858b5462b640b290093f5650a5b3fbfd4e461464e593a448f13d7835a56297428a3283d87 SHA512 6e4c7986dd9fdd863e2f11377ef8869c18a2807431bcd2f71ff42839732bd664524249920d68c35958c324738344ec47daa28154f1de5627b3d92db914477682
-MISC metadata.xml 1688 BLAKE2B f6042bc167676e39c31d0e6dff0b6d502de63df9ae457e2665482a386d1ecc16033483496558bf3b814c128a2b79452e1d1376dc41a716c07b34436ce45f1412 SHA512 9d68b66e9ce74f262cabf0f6b02d9da4130292b0e0e701dea991b66771a84e5da4d07705e5bf5a2546026f5452ad7991c3f4e04d698a11c4a0fc473c388562cb
+MISC metadata.xml 1718 BLAKE2B 40b67e4fc9a9fad8cb7008b32e24a1d57149ecc78514ec3dbcb9d3df4cd865283c8a6685acf6037bfeb04b0f3b189a32fee0e0cf98955d99525bb4a5b417fb0d SHA512 442d7ee6fc749d065c01f2e6f798465ab001a504d1104726322d5fd539114301cef2562b4721df9d40305f547b81d28fdaa8d3abeb327c045065e1a7a3820616
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index b3d81e8d6245..bdade9103aaa 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>herb@hlmjr.com</email>
 		<name>Herb Miller Jr.</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-servers/metadata.xml b/www-servers/metadata.xml
index 565534f11f2b..3aaddd9c7579 100644
--- a/www-servers/metadata.xml
+++ b/www-servers/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria www-servers zawiera serwery stron WWW.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index ef0f020a1b6a..131a7a1f3cf8 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -3,4 +3,4 @@ AUX mongrel2-1.11.0-polarssl-platform-590512.patch 459 BLAKE2B 63917c58c7c29639d
 AUX systemtls.mak 4506 BLAKE2B 60a448a3f1ed77646003cacb8d5adcf34899532c00fd461a67337f2ded6cc7a6204f72a1b25b3787f692487e502eb313ee0bc7dafb04c902c81d82edfc8fe96b SHA512 9b1fc5bf23d60267d64c08e0f0956deee0c421b03556138f994822abdcb324702bde744559e6629488cb05669b3228078180cb4f30af8fa09c10bc110ce7e3e1
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
 EBUILD mongrel2-1.11.0-r1.ebuild 803 BLAKE2B cd5144b8dccfb451fcb1d1778525055cea3a976bf39c9ed77a14d90117d2e9416d5d897e8b36fac07ae6dbcf4cfdc6c895e67bed0f29d54addc9a66183ba2e90 SHA512 59555351b9be616ca5ec4b3a469f3223df91392ec3f158e63b491ad25284e07e683f2e78aee180e106c7637c775380b21137afabb10dd306ba06c3e7a31cfe85
-MISC metadata.xml 257 BLAKE2B adec48923f12ab0f7e9fc4595c967d05bb7c5ea8c5540c43b14786be2d16be4beb8f456cf39be77a1bae0ec23e28a9d4243b755c313f4b7ebc5a8e3e0bf25b5b SHA512 a62ddbc194ab32158cdffeb2994a1f86c3e60f64efc1bf17eee73e2897e53d7faf2dfeed90a9a9b2d89208ccd4c9848fbfb3658582ca3ec30764555ba259c3b7
+MISC metadata.xml 256 BLAKE2B 46b1738febd71b398d37ff29c65a3852bb520b84bf6ece85b1ebba4549ab49e190e98fb2a52c99ab3816034077b545d09502339b9358c5963cdf0d7851d79ddd SHA512 6988e6bbe794ff5efe6cca6193f2aaf3cbb58699de631998432f07153fd53adf4254d2d94f4fef10bdf1851ff05fbdd7e2729555060ca9aced7dfc5490b8fd3b
diff --git a/www-servers/mongrel2/metadata.xml b/www-servers/mongrel2/metadata.xml
index 985a4585129b..09b567c3a585 100644
--- a/www-servers/mongrel2/metadata.xml
+++ b/www-servers/mongrel2/metadata.xml
@@ -6,4 +6,3 @@
       <remote-id type="github">mongrel2/mongrel2</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 7685d2a5c890..76d23f97b30d 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -3,4 +3,4 @@ DIST nginx-unit-1.21.0.tar.gz 802826 BLAKE2B 9d0af079b84cd769b90d4735825765571a3
 DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
 EBUILD nginx-unit-1.21.0.ebuild 1978 BLAKE2B 20751bad9b41b74c52d48e206829526f14bccd4930a3ee3ae20a855621e8980ad65098942e4a1bd0fdab8a1273b4c897072f7d8f7adaee39b900f12d231c38c6 SHA512 6c2c5862500c70bab9c1377657bb5b5036892b3e13233eb5b89efc30d0f6d5654a75e32d03a0b65da0205582daecc35e74e7981237a093803066c159a36ab02b
 EBUILD nginx-unit-1.22.0.ebuild 1986 BLAKE2B 187d0eee467c1247383c25deab5183517880623051cda2e3315c751ce16909ca96e61d06cf7afc1486749ad0912ae754c93483e4362a8a9ef1ad41131563060f SHA512 c3a6511a72279714d0209f8270fb114812bf2dc173905a396b21209bdb23345e404d08d1909bc017eed19c04a3cbfd3e651eae5dbff7a8e181fed32af29a426e
-MISC metadata.xml 949 BLAKE2B 47faacf65d957c617419ef5183d99b77421bd45dd4499263eda7097fecc73633a085c05833e5b375e70865c4b12e6e02e224fdded5fed0e9eee19d44eb525e26 SHA512 c8073b3eea6233733ac01329aab48e51dd43fc6deb9c8ca8b482dbcb3df781069d750d0002f203309cebf64890d517b1ed900a9cda62e4a028fd2fd721a7f5c7
+MISC metadata.xml 979 BLAKE2B ddf33bc4fb2cf4b03aab115c50d8903947e7798f36ea07830d2cd9d7cbe19479c08bdc0cce3376297232731c6cfa83ee76577ffc5ed74a80891dbf69463821c8 SHA512 e4dd1b43188c2b7858c35ca9ed016d7b423179dc651af19c0c0f2b8dfb45103b20fcfd685b3ec21f8cf839c677f2548040f7c155fb984f0873750301b7cb6d63
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index 31019253313f..2145d93424ec 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-servers/sniproxy/Manifest b/www-servers/sniproxy/Manifest
index 28c9361f3026..cc5cebee7f03 100644
--- a/www-servers/sniproxy/Manifest
+++ b/www-servers/sniproxy/Manifest
@@ -2,4 +2,4 @@ AUX sniproxy-0.6.0-fno-common.patch 541 BLAKE2B cc1bb1edcb25bb12c5d5ac70088f38e6
 AUX sniproxy.init 493 BLAKE2B 4021f98063b76628abd60e52afc3cef2d6860c3fd639c21d0e2d4a62acc6fe7f505bc715c69116474748c122d031a8df1f101d0c13b80524980911a6010fe86f SHA512 6dc6ba017c18cc5c4b15b2085e95157c396c44b8d368b6ee28c559c9d4072460604afca3a20c46c639c5b095a3da65e3b2b15fc20d738e41651cc77615dd3ca0
 DIST sniproxy-0.6.0.tar.gz 78515 BLAKE2B 1ac8decc793e7b3d73d833bc392b3ef035bd2ba7d515c54ff46de16ee8897c0c5392929d5c7a22a131c1f017897cc6f8e9c50aff8164e4afbdc23155b804b613 SHA512 8a99573673bdd57e528c5781cb166d39c80daed699382b24c3fa18a6011d074a1d9e470fee404d24b4450cf067c9995125910b2941b5216d88d189a1d79ebf73
 EBUILD sniproxy-0.6.0-r1.ebuild 1603 BLAKE2B 722ccab3459ee93ca63d6152d95c99ff097b7ee4f7fbf64f3f292c99fd8d9fbb489f5e98bcc15c6ffe8ee08957e2c7930b0b469c8e4771f7d0fae9cc1114b78e SHA512 ae52cac6a2b16ba32d0cc873283e5cb9e284b4195d51d4c17665b20e2f21f91247eba0039cef92c407579ef9b174fee98346954177604dad02d087e8f6bb1ec3
-MISC metadata.xml 630 BLAKE2B ebf3d19da137583e30cd2d19d19280c8f18c9e05beb0dc6a35d7863687ff9d28c4ee473ff9fbd97a05dee4cdc96bcb6785f41a22911a00ddc4645c20fc18f655 SHA512 263e1b4f405a67f6e402cd842d95640664c9f961ee29c614022787be76a2d83b5dcb3c4e784bef4369424680bdf1888d440eeb0a195dd8dfa65132c137a2fb55
+MISC metadata.xml 660 BLAKE2B 804a27b9980201912756bb81390b9f7c8e99bf39a0009f80ddffd89b4b0cc63336f53581e4c213e0718bb54ebdfc2d5fecbaff9fd8aa56dcc14a6b435f9944f5 SHA512 47b773bc12c3a206c24f90c68b766d3a0c01d9bface2fa54c564d08a4dc4ad881e93c1bcfef569607d2c62ae6d8e9d87f138a0c054657a5ab942e1d04c77dd95
diff --git a/www-servers/sniproxy/metadata.xml b/www-servers/sniproxy/metadata.xml
index 9a5095f6d430..c7a3a8f240b2 100644
--- a/www-servers/sniproxy/metadata.xml
+++ b/www-servers/sniproxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fa83bf6f79ee..d27b231321be 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
 AUX tomcat-10.0.2-build.xml.patch 11108 BLAKE2B 9c8db2ed4008def42bcfdcfd99fbaf01df0725738b92245e9138b08dfbead625959afc5f3dbef0cb28e322076efc34a22b751ffe1cf3b8a99db4a507651c6362 SHA512 ed2fbacd4cda8e582dc316e9ff3f14686eb68b5851c2c2a0c3ce779c5394af5161fa40b821bd4fd10e1295ff13ae3adcc03d2f0d42604efe19b57790af648ba8
+AUX tomcat-10.0.4-build.xml.patch 11459 BLAKE2B 841a96b09280a8790cf5bff7718219027abf793d3bf2f93c72086ca709102775995d06a4eeadcfab297742f6c0e74ac74736407606074cf6106b5948a8359ace SHA512 54e0c3ad71afa28b14c1644438daa0df0d2e6b95b55fd83d8776b30bb6ed3f8735bc18d5a8d9da6c56323c297245a34c441e126e7d1e1d2deeb331c8c382ba30
 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
@@ -10,6 +11,7 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
+DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
 DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
 DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
@@ -21,6 +23,7 @@ DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
 EBUILD tomcat-10.0.2.ebuild 5902 BLAKE2B 45d8f8191815f6e668bf9c2d927d2490c3ab486455144364e188eb97196990f85b176394a95020dd7eb6dfc4828278ac9f282e9615080dbd49bff946d7c11845 SHA512 a756ac610ca78012ae828b5843b447753196eaba9e8f7a54726e2a78758d16989d6a1c5e84df71d2e35ad9d722b67ebc1da0abf256de31483facb98ed13a8465
+EBUILD tomcat-10.0.4.ebuild 5910 BLAKE2B 87e7a8d438deaaf68bd4d9bca40c5a44759de65f0cde4bd654a5a4b0e38377f488a52f2e49de687b5eecb1bf5a0cca1b95b941acbaeee17e67eb9f8667aadbcf SHA512 e2cccc425569fdc3218b1c96c89dad7f17f8e466482454e5666fef587750d463a972a70e4783edc59dd805f26983f4a8523b1d5fb8cb11cba7c120ca14fe76fb
 EBUILD tomcat-7.0.107.ebuild 4154 BLAKE2B 2020b3a15d3e33f4638f74511f6beb8d82db9f68fe920c95ec0efa24ebcfd5d5ec8dcc174ef4fc927063738c710931decf749ec442c948ef9c547b5bcabf22b2 SHA512 7f1e205ae31ec9b0bf98bb0ae86ab8f761314be5bc3fe25f07480c4e97f80c1eb148df3b6b484be2cf23c08df6207d034ca433404a90b0d0e422b9a0d9f9c249
 EBUILD tomcat-7.0.108.ebuild 4155 BLAKE2B e55024bdd35be24b2807229d4a659e3ced6a4211d3e6c586d045955b84aa38e066e208f5c3bfbeb2d9d87944a782adb1f36e65c237edffc32373897a48c9ef42 SHA512 5f9db59d6fb0e575a566c45aa84be258bd6838db909ab263180f288a57a047c75a74bba2103e05e6fc9090d6aef64215d7c011814f73cb408501b7541d9df4db
 EBUILD tomcat-8.5.61.ebuild 4734 BLAKE2B b790306d322cf975ada21309e946c6b95225e2f20d768f851f3954bee11a71a817b6a54ac43bfd4830fc4d5cdbdef54c07241ed90d52ea54c5b46d0d16d65295 SHA512 1e1fae7207883a473d6f37d0f80ee3bc108a295c95d93d136e3179cedf893c9709c488a43c649fef74c757b1c064589c677c5bbbc56b201c8ca71a12feeb869c
diff --git a/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
new file mode 100644
index 000000000000..a2c148719e29
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 8338af0..db9eec8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1034,6 +1034,7 @@
+       addOSGi="true" />
+ 
+     <!-- Servlet Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -1041,21 +1042,23 @@
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+       addOSGi="true" />
+-
++-->
+     <!-- EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+@@ -1168,10 +1171,10 @@
+       addOSGi="true" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
++      addOSGi="true" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1399,9 +1402,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1461,7 +1464,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
+     <local name="migration.jar.filename" />
+@@ -1472,7 +1475,7 @@
+         <exclude name="${migration-lib.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1515,7 +1518,7 @@
+ 
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1530,7 +1533,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1633,9 +1636,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -2209,11 +2214,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2244,6 +2250,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++<!--
+     <javadoc packagenames="jakarta.servlet.*"
+       excludepackagenames="jakarta.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2308,6 +2315,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="jakarta.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2370,13 +2378,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${osgi-annotations.jar}"/>
+       </classpath>
+       <link href="../annotationapi"/>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!--
+       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3150,7 +3162,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -3228,7 +3240,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3283,13 +3295,13 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+@@ -3411,7 +3423,7 @@ skip.installer property in build.properties" />
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3428,7 +3440,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3469,7 +3481,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3493,7 +3505,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3508,7 +3520,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3536,7 +3548,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3547,7 +3559,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3558,7 +3570,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3576,7 +3588,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+ 
+   <target name="ide-intellij"
+           depends="download-compile, download-test-compile"
+-          description="Creates project directory .idea for IntelliJ IDEA">
++          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+ 
+     <copy todir="${tomcat.home}/.idea">
+       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.4.ebuild b/www-servers/tomcat/tomcat-10.0.4.ebuild
new file mode 100644
index 000000000000..a397d6e6306c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.4.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/jakartaee-migration:0
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	virtual/jdk:1.8
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 58433f34ac1f..fda7248cded8 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 1263cab3b1ca..b2bce7bd5236 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,3 +1,4 @@
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
+EBUILD appres-1.0.5-r1.ebuild 413 BLAKE2B 354b9e46453ae39cff3e3e66ab7abc885078ee3e19ef3586ead633da7506aebee4d7a78220878d193e5d991d1f1aebabd3d958c2452ca863437b8f840c39809a SHA512 0b9d540cd558a7d44b01fac9fcde490dc22db2a28ea51de9c5aab55ec7faa6f6302d3e38d77bef2e7899b3cfe34b05bcfa13f9407e8315b317be3b54f9a955ba
 EBUILD appres-1.0.5.ebuild 390 BLAKE2B dd2777b0787ae95e36bf11b10924ad175f36573d84a8d326fcfd1de2030012ac56f66811664c8a3c60e2f631a2404ae25440ff5de069227ca5b51df946b80bc6 SHA512 defdbb32abc88776106c212722758e17d0941f7451def6d7907bc11b750b4a73b73efc6f5585b18cbd2ce24997cfdc748b059a772112734c73f9a29caf09a920
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.5-r1.ebuild b/x11-apps/appres/appres-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..cafaa058a220
--- /dev/null
+++ b/x11-apps/appres/appres-1.0.5-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="list X application resource database"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index d53c9bebd420..2b415f60a24c 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,4 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
+EBUILD bdftopcf-1.1-r1.ebuild 391 BLAKE2B 5977a9cb75123bba61efbfd0a979060ecdf57a673feceeafb65b8a172c3d2d01dc4094040647fb95e24b57198857bf17b52da3cd8a3ed197e02f887062d311c9 SHA512 457a3a887d7bd5e02d233f1d2d1fab59f63f457f5fa91d7d5ded36ea02da3f5cc992fd0a097f590f4d54cdf6de37df5db8078b92da14f9b54df999cb13a4e90c
 EBUILD bdftopcf-1.1.ebuild 392 BLAKE2B 2e42e1e81954bbc174ef03fdd550292b46d31f26e95abf6c40e840c58f7e62f90f3dffb0506256e45fbbaf9a614ac69a58e00ddbdb7b38f3c7262759d5c9fee1 SHA512 57bbaf70e61cecde5b1480a6033a2de6c9166649778470389170ee24f287d672a99a1fd2e8bd168d7d6217972c496353028edef8a248d1af88c531054eb6f415
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
new file mode 100644
index 000000000000..17246b803cad
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.1-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 xorg-3
+
+DESCRIPTION="X.Org bdftopcf application"
+
+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"
+
+DEPEND="x11-base/xorg-proto"
+RDEPEND=""
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index 3ecabc82ae54..fa64a394de47 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,3 +1,3 @@
 DIST beforelight-1.0.5.tar.bz2 119358 BLAKE2B ff4a0e0a28d3cc668611eaea8b181696986f92eb7236b336218d0392484738788db9c16e0eb6d16a106ba3b30d094be082c12da22c058a5a0afeeb76fcddb76e SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968
-EBUILD beforelight-1.0.5.ebuild 348 BLAKE2B 16b21b76e7107a2abec7b4126a108951dc092c283a15229fa53d2fa3c348f715f4eda5142e1f86f62dbc9ee08909c3854aca4a78fca5c78b90cba64063411f71 SHA512 15cbd40ddbd077b917cb0e7a671e5dbf0f3b4b012a733614eab53f73dc2845ae51e95985ecb25393a073e4a6606d9582bd742390d67ebb9cd75f0d6a932ebd17
+EBUILD beforelight-1.0.5.ebuild 344 BLAKE2B 76b349c867e402b3298a25e0bc45d414b0231dc75a7a33972c8f53aa2f99cc729bb8b475d6350c609342d0cd7d619c5650773bf147e1a275060acfe008fdd3fb SHA512 ce01df57580ac39084522f3d8306f0306a7d8525f781295273fd0f2e252b0dc3828654611a87eeb76f996fc9ddf6f5f4611326d818055a1ca3854f3dafb00f42
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
index f131ec93b6dc..78a3c0648acd 100644
--- a/x11-apps/beforelight/beforelight-1.0.5.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Sample implementation of screen saver"
+
 KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXt
 	x11-libs/libXaw"
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 121bcae19e6f..ad3724839b67 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,3 +1,4 @@
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
+EBUILD bitmap-1.0.9-r1.ebuild 392 BLAKE2B 8637f7a4f93ba5d2ade30fb92c4b87a9c6b41d5abda5a0f6f8be5e9811ae1dd601ab72952fdcb4390b371e65e811d495754fcfdce5b712d3c849fffb11ef2638 SHA512 2fcbaa00185276eb07cd1b9f13c26cccc2e6cf2d133060ebad3652f1acc724ea64f4311ff247dca3970d0279c372e7a125e86e34e2856352f1e2deca87683083
 EBUILD bitmap-1.0.9.ebuild 370 BLAKE2B 6c7cabf9c6ef53b576e65fe0c388700a5486298dab8d3ee6666583c2399bec7b557cd969a5eec9f1071aae4b46601dd8bc669083530c7f99e577bc85006829d3 SHA512 52352baec1b698b9d79640aa888113af2242145651a1d6df52f437110f17be934e9a262e2a1ca3e7a4e55724ef6b25d463af3c789cbbdc69319d6184c055cdaa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..37031344c529
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 3bfe74412a1e..251e77fe230c 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,3 +1,3 @@
 DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
-EBUILD editres-1.0.7.ebuild 361 BLAKE2B ac68542b65c5ee71605b52cd05e9a517cc6af8c5cbe1feb2bbe8657633eec8784d782d0676774d1c9c916b4a1aa3ce232b367a920cef6535bed9b78e8d5ab943 SHA512 c477c719f59ff2f82e711958e822e986cff9632585476e97fcf04a10c3afafcfc4f8b4650a1998dcd085dda05ac900aec3c0aa221f7ecd2a337fd0dd8c9fbbac
+EBUILD editres-1.0.7.ebuild 355 BLAKE2B f6b8b0784e0402937766ef7e53200c17f47de72b2b7e526e351b824dd28db82a9aa63bb0c9fa05341cd8a945c25bc0d5c08d75fdab6ee253be9d479f11196c1f SHA512 aa885b00e061253d9a14efb22ecbfde541756b8c4848acc997c4b89c0a36b156bf1ec91bc08e456049887d14621cfca918b33916f9452beae14a0d7b16290abd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
index 77eaba3af20a..3d918065d7f9 100644
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ b/x11-apps/editres/editres-1.0.7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXmu
 	x11-libs/libXaw"
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 8693f6aa9c5e..833533af6660 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,5 +1,5 @@
 DIST fonttosfnt-1.2.0.tar.bz2 145904 BLAKE2B b9b25076126dbd412d69f4c9698f937009f620b55a06f8c55b621add2ed6d638e0b91d3e716ed276089986c1a0140e2bf7aadef021c21ac24ac23c3347ee081c SHA512 a360bd8535beaef89afa6c0678a40f7c554e9d631e0fcb80bb1363ab72288e27a5e106521610f61c95b8101f79c7f02492a2068411b5f5b695de780d8a1c1b25
 DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7c871fed0c0f91c2e8064933d990f2b44f0163fa59f04f82b992a40be47e391eeeeae60a490412e361af9f10c445f9 SHA512 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
 EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
-EBUILD fonttosfnt-1.2.1.ebuild 359 BLAKE2B 40cbf6f1df154572ba4b13b0a1ed50b658a5bdc563fcb7d8da378494cb4c1b31faf8ed9cc7ecd32fea834f0f3c3fb7239d2cdcfc2c425cbeeff7fd7a08e148a4 SHA512 d8106ddb0114896ba4e1a49e60f97671d519a1ed561aa98727ca6458d48d178f9ec89349ca4529fb517166b14fa041a52fc68e5cc96817da97e69901537b8b46
+EBUILD fonttosfnt-1.2.1.ebuild 358 BLAKE2B ea01f5771ff9955f7fc87057408ef750b3a3c379e82a8c540a3cbd52dbd58ef1320c67b84e491465e49212b85da1a32a383a6ecbde2035cd10848c9eb192164a SHA512 7b316da0c68d4bb21895a12b813aef4f5b670feda63b2cd2803f0b6e5d7c61a33fd3e52d345bfadb4aa47f39778eae46fac5cac8ae407736d9072b929d029014
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
index c4569d861a5a..4245e106ef12 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index dcf4385c6c30..265a73946240 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
-EBUILD fslsfonts-1.0.5-r1.ebuild 306 BLAKE2B dc53b776adaf1d754dd6dd35bff01e7b88767181c5224c19d3ffb1c2878611d64e97c31c63d09ffbd569c2b8e92fe255ed829eff509532f80f5255a73062105c SHA512 fd79d21802ce5c86913e12a7478f32e3c02f4c0a93b4927bf0b2c2bbe879f5e4a05d96a4b52116fae1a4867d80d8c5f25df4b7bd153c653e91a32183241fe134
+EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index 32f8fbb3f0bc..208786d2e835 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="list fonts served by X font server"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libFS"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index db82619a062d..830f7b4f1cd4 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,3 +1,3 @@
 DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
-EBUILD fstobdf-1.0.6.ebuild 304 BLAKE2B 7758d228a19624edcdc9e813e8f9aa1fcbf7e5c62bdedebc42a28140875ce71ebf842d040a52f4d9eb332785908665d94606eec58396fa882de0444a9bd3f330 SHA512 a072748bfdcf8a2cc89a5010160ed9eb7c7fe3f619e8f7fa6d2ea5c98a6c7bd8daba67aab5b58d28fc0b9a8f35522b19d31ebcaeca17e8af166156a35703b759
+EBUILD fstobdf-1.0.6.ebuild 298 BLAKE2B 5ffbf7a947e8c8e6ce7aa3e7e1a72bc5b192ecca5681fc8d34859b6a10f978ab2206ac95225bf4168bd1f4c944c6cbfbda268327dd33da32fbce77fac7cf51df SHA512 4f3b43276bc32c423d119a4525c7445725f3a07355339e24f95c68f65e404d96e414b6e2c66ae1b30885799d38b760432b0f6afa494a97c4d043e41669a0b7b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index fc375467eb96..5638ad52e4fd 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="generate BDF font from X font server"
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 0b8233ca98d4..5a205c4d3509 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,3 +1,3 @@
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
-EBUILD ico-1.0.5.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
+EBUILD ico-1.0.5.ebuild 301 BLAKE2B f82eb2b8b3c0214a8287eeaae5b0f2e7d026254287395929a6ce6cfdf6599510d59ab6f4b69cc7651272fde31f1804df1d7ed9e5221c10152d52b903c503b5fd SHA512 9cd528c4ec19e012fea9e4fa61eef12494a73cfd8d75f8dc23c5f47da921cc26e471d0d1d1dec7f1cc16f84e6c0399ddaf1068e45aacf7d95aa3936f8de6e508
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
index 0c60e859472d..bbdf3fb6e6e1 100644
--- a/x11-apps/ico/ico-1.0.5.ebuild
+++ b/x11-apps/ico/ico-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
+
 KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/metadata.xml b/x11-apps/metadata.xml
index acb438fa4def..2ad9cf6b8e1e 100644
--- a/x11-apps/metadata.xml
+++ b/x11-apps/metadata.xml
@@ -24,4 +24,3 @@
 		parte de X.Org X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 47debb9d9560..927b5e4ccfe1 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,3 +1,3 @@
 DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
-EBUILD oclock-1.0.4.ebuild 373 BLAKE2B 4cd9468a09b40b337350c48dec5312720857ecb20b6429ce384a07391137c4fe88e050af83af617e77e458316c69b5ed0689dc5385b20e17f97e398e7334917e SHA512 a7208314058f577731a06d89d04accc71f18a2749bf590427476a5647f4a0b393f83fc265197f5cad54b5c3148f53b9574c78b4091e205124ba55e1dfab7283d
+EBUILD oclock-1.0.4.ebuild 368 BLAKE2B dc4327fac69c28638cff0fe94d3286ce5bc4a1218208756fbc467763cec2df3f06428fbb346cc5e838dbb5234f69f06c69c476ace1802d588ca60acc5ea8f41d SHA512 79187ea593324e3b9f7adcf46ec5b882c58f1f7785177ed554f8298efcf4b95bd8b1286ca53cf9c4e694ecf71126019bf17d6054d9c18aea9e8d2ee5a3a384af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/oclock/oclock-1.0.4.ebuild b/x11-apps/oclock/oclock-1.0.4.ebuild
index a9d5cb572755..5a42ee056ade 100644
--- a/x11-apps/oclock/oclock-1.0.4.ebuild
+++ b/x11-apps/oclock/oclock-1.0.4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="round X clock"
 
 KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 35276ee3c62a..776b2c665875 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
 DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
-EBUILD rstart-1.0.5-r1.ebuild 280 BLAKE2B d5056eb1cfb5a4f8ae0a038af8c7504d57a069a565500022abaacb9bae713b129066bb66ae679940298ded4443884a9a290db48500d3d55f12b4b9d132127c36 SHA512 d4bd3618d942b338215a298a6044e78364e31271546ebc0248f61554883be23012d4bd129e9df202e2dcd0d3320b9588225ac8e0ea416c4766b41e00e66aee6b
+EBUILD rstart-1.0.5-r1.ebuild 273 BLAKE2B 914e1fd0ab78cb4d4099e4dc08ffba52c1c9e7e9d67dbb0a2195f9a057320779897d269071208601a66a4e6f024ff109a6a44692c1a0e84e670f0181a3535c05 SHA512 638208dd8676e8f63953578bd845bff593abad42d4169c4fdd72bcd6d04eed9b2bbdba0eaccbe4fe1344a90d4e33eb422af05c61a545797dd831857fddd762be
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
index 327b30687d9b..ee7cbcde71e5 100644
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org rstart application"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND="${DEPEND}"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index eb1104b01aab..297f91f6182e 100644
--- a/x11-apps/scripts/Manifest
+++ b/x11-apps/scripts/Manifest
@@ -1,3 +1,3 @@
 DIST scripts-1.0.1.tar.bz2 72301 BLAKE2B 2765ea1be05fabbbbf874399bf2a32fd778e5c57a98ef6c5135206d125ce29b7a02f7622205638e5c3a35fadd12211d46ef60e6c60b970ec924ec0bf97769282 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226
-EBUILD scripts-1.0.1-r1.ebuild 468 BLAKE2B 0426e0271b394abc8aeb7b9c2ca71b2c750ae0c8b20367c6cb8be3f04d6e0c37ea9a988bc4c87316abc919427a005f7c8b21e0e857788c6e07e15b88bec336f1 SHA512 4ff979c5d352dbabb0a527184011d8af9776c8039a724748f57ec7372a0277006c5182a1a02e68687bff2fb3a191f2fa8bfa7ef5837cd2136d5fdba6dcb46a7c
+EBUILD scripts-1.0.1-r1.ebuild 459 BLAKE2B 5e3ea9e992ad209e1b2b6d120e8f0e3ccc67bc74225f070defb9ebd27f908b49dd9e5fbf655238ff952cc712b90d090d1049852522147b8f2a81b465371a91ca SHA512 de89605d59cb8e535a12d7c77dfd7015784945026cea5ddefd1fae49ffc5aa5394fc014d7d72c24403ff7d9fbca27403671d2c88f4a3999b00cae967dd5cbf9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
index 666d1a2b8801..fabcb457abf6 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="start an X program on a remote machine"
+
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	xorg-2_src_install
+	xorg-3_src_install
 
 	# Requires ksh, assumes hostname(1) is in /usr/bin
-	rm "${ED%/}"/usr/bin/xauth_switch_to_sun-des-1 || die
+	rm "${ED}"/usr/bin/xauth_switch_to_sun-des-1 || die
 }
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index 559341ba8636..a6182fd6e327 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,3 +1,3 @@
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
-EBUILD showfont-1.0.5.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
+EBUILD showfont-1.0.5.ebuild 273 BLAKE2B 9635b9757eabeec523ed1ed75e5078e23691024b1c1dc9b611d5a6d213166b88de625f6ec4f4e9601fa2b946bff9086e483dd5faef83eb7638f03966b0db287d SHA512 d153546ba7c0eafefd5fdaaebc79559e9612548e34db414aa1e0d657597b35ec1ee5f035752dde35d3671690ed90b9dffb75976941ff1bed020b33276810d6b1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
index 08e95071467c..a2c947085670 100644
--- a/x11-apps/showfont/showfont-1.0.5.ebuild
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="font dumper for X font server"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 4314dc8e1661..7006ca05e468 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,3 +1,4 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
+EBUILD smproxy-1.0.6-r1.ebuild 337 BLAKE2B 1bda74df12cf2f1640f55fa22302c66770d698ea0de0cb0c2ab5efab888482740d3bcd6fce0c34516de0c3c985c52d27431e5cb538f27903b129ab2d28dfb24f SHA512 4602212b08aae54af4648a63a27d9d58a5c20fd0d2a49058d01a17988d8d670c9362a5a5dcc3457d42093f0cfe156f1d4467662d289c9cf0792b8a88cbe0b9cc
 EBUILD smproxy-1.0.6.ebuild 315 BLAKE2B 0de031517e4a864abcbc1d78ffdf1030a6b1c715a52e4b10d47e046244463dfca3e1ea2ac671c5fb0e36cffaffed7a73f2a4f1ebb0f6ea68c86285725714bfbb SHA512 514338b38212aaf888c1ec0eb721fd65f80272cc249b7481140a3f2698f0b8feab787ccd7dc896929cdf2117e93b6e9189ab88ae182433fa35e3f1f9ef80eed9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..04ff1c27740e
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 8d1503efcc9a..3ec7defdc0cc 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,3 +1,3 @@
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
-EBUILD transset-1.0.2.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
+EBUILD transset-1.0.2.ebuild 295 BLAKE2B 01e1b8316369030c86a8e9bacde8dfd7c2bc859a16ff14cef1d5a17796b756459f22fe6a2f737017dd86c8ac1864d579da18c2466dffbb30f4c858d011c355b9 SHA512 b77962e76e53f71fa95d381c525a97e4356f9464f009a733c4b21ee5b8f416b4f94db887f72f82abe3268545ddab04f23b475ea3b0fcb578455147e5b9507191
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
index e94154a3ff15..18372fbb4b41 100644
--- a/x11-apps/transset/transset-1.0.2.ebuild
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="An utility for setting opacity property"
 
 LICENSE="SGI-B-2.0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 1a6cdb069fa5..051c17a66f3f 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,3 +1,3 @@
 DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
-EBUILD xclipboard-1.1.3.ebuild 378 BLAKE2B d98beecedcd4f1ba58bccd00a3f93eff532fecd4517f7a0ef6c92b235a37698051252e6a65d40cab698aa5868be508af5b950b554d2b43cbd2e89eb41d2089d3 SHA512 d5b5c7cac88561fffc37e0ec3b47305c42ef505b61cb437791626e2cc30256e3e8db8c15083866a97763ecdd98726eaa858469be525f0e064ddbfdbdbb879c05
+EBUILD xclipboard-1.1.3.ebuild 374 BLAKE2B 6e40ffedc8a81c49ce8953941548802716fdc79953f5fb76cdc434183d8fabb1652e680ac28d5aa307b0a482d302dff85be5cd86f1358b530452dab805a69236 SHA512 29687d418e81b54e582f6ed87d7595bf92f841bc917447d597f7d540e163191a0069cce24aa84b8b342c0f51223a18f8d747eef87abb35e7a12bb4a52d1053bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
index 7f469de7f513..d3e1001b82ea 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="interchange between cut buffer and selection"
+
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXaw
+
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libxkbfile
 	x11-libs/libXmu
 	>=x11-libs/libXt-1.1
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 3acb887a6d3a..1a17e922bcbd 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,3 +1,4 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
+EBUILD xcmsdb-1.0.5-r1.ebuild 364 BLAKE2B 1e400b1ef00ec1f471ce9a3e796cce4489d6173aa930b6a5977e0c76cd29545a475280b296083815df91fcff2319fd99070b8c7c7e7bd6c5286cf28c725fd6f8 SHA512 f956eb5b469bff415437acf83310d0348143094be0bac19c7aebdd432c6cf26b5b0c6f783297da36e924c3b1f84af4ba01824b03f152a840b6fdc7e14dc0909b
 EBUILD xcmsdb-1.0.5.ebuild 345 BLAKE2B a6ed488cdde48630833abd44f6772d44d268e840f1cdf90361927dbb04c08eae2dade2d058a2ef3cec33a07d310e224d7737ba441249add63d2d81e7cffadf36 SHA512 2a52b63147293a89c9c271548252a2c046f784ae0b2e09571b4c44b91897ea7bba975422cbb640f9f5547007cb386f7ecf52fa626012a738e4347ba386d919b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..0641e30abecb
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5-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 xorg-3
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 2aa4214e0a4b..f45ab879ff0f 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,4 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
+EBUILD xcursorgen-1.0.7-r1.ebuild 398 BLAKE2B e2538a20a46a88f473f9dcac2d2f3d80db363152a1fde1e99c0f1203ab36bd1cc3acc66c66f86279df7d09542bc0290eaf73bea71956998e08cf4cb016e0d883 SHA512 4eac51d7f841180b9c3b9ae891859b4cbfc3a03adf81a9badb8f8be49d4abc749065a4bfada24d7d956c059d63b6c91c550b7ce8acdc000bd4d24ad9caf0bf9a
 EBUILD xcursorgen-1.0.7.ebuild 375 BLAKE2B fbedac7900c723f04c0fcbfb61fcc8e668ef888dbf7a9f36e535c9c45fe855748df3477fe1b66f0200ce1bc51dc45748d2e905466bb9ad9e60c498ed7a0c6fac SHA512 e9ad2ce7da1d46a04705e46e3f31db70c69474cd9b57cbe3fe0d6fffe3ecc2dbf4586562cbe32e521c9a0629b7f55e1cc9d5f7f4646c7d7f46552cead4c7a727
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..b7046b906d08
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="create an X cursor file from a collection of PNG images"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcursor
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 3f9adb7ff850..87f8e47f896e 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,3 +1,3 @@
 DIST xdbedizzy-1.1.0.tar.bz2 110340 BLAKE2B 2245ee691441e72e22a71ce482d97f7a24c230fae23779f6a496f8f82f962e7a0875b136b2a2308ac3e4940835b129e7641bebc895be02e2d32fff890d42489f SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa
-EBUILD xdbedizzy-1.1.0.ebuild 322 BLAKE2B d60f6c38e58455bd95a73c67b8d7b46eb5b159af59742a0431745b5c10f9bd653cdf238cdbc12123b1f29a6ae09423711096446eeaef69297d15724ac93ba583 SHA512 4a94814a7c1489b3dc4adb6f26888056208cf5cb5f163d8b4f214c19a3de962a216029960d670ad97712821236a622c13439115c5058072f9316043c1235c844
+EBUILD xdbedizzy-1.1.0.ebuild 315 BLAKE2B 72e53a05ddd8001e93f69761c78b8434c79196e7ce3d43c12fbeafc1ab2f1d12fe135406f8dc52ca64bdfdfd3b6a99137fb8fc168b73cc789b4d3e2f51c0f213 SHA512 9394b5b7d17bf3a527caee090a5dddc9cbb4cf010f42f8fa5ebd3ddd2a5df301b7c4e8c79af1cb88926ac12642cc2a781691d7573109f011c396b76e06e8bf2c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index 8c5f6233c354..a274b1b04b3f 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xdbedizzy application"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libXext
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 0d28d733f4be..f153c562e363 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,3 +1,4 @@
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
+EBUILD xdpyinfo-1.3.2-r1.ebuild 778 BLAKE2B 8f9b9ea0b0e6027b114d4602376a38f79d41b26c187bb621f4a49fe03377b38c4850143160c2919168326a5f61dd3fc97247bc843a6128a757fadb6fa6ecae2f SHA512 b26dfa8a5edb6a9cb46c457098eb9348607683b69b4399a49ebd2bb49dc56c10befa34dc75ec59a4dae0c5882259097545dbfbb1b3b8a3d40288de3ad8fefa30
 EBUILD xdpyinfo-1.3.2.ebuild 771 BLAKE2B 73045fa25f9ea855e98174d9086594dbe737e476774ae9a18ee59de17698ebaf5e0e3dd7830207403530e809e1e21eacada3f4a3e3cb6ad39c91b1b724e66f1a SHA512 db2b6fb02243fd4aa98ac284e72780f1ff960ce5edb616fe67d327c8bdf7c8b2c94c6bdb3adc66acb76e02d1db132c75cf7520efec9fd63b7586515f3af06589
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..63f16db55f3a
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Display information utility for X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE="dga dmx xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	dga? ( x11-libs/libXxf86dga )
+	dmx? ( x11-libs/libdmx )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		"--without-xf86misc"
+		$(use_with dga)
+		$(use_with dmx)
+		$(use_with xinerama)
+	)
+
+}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 65b5d9919c5d..e72aa7b524b0 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,3 +1,4 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
+EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 7b59e791bb350cbf4099a3946c3aa79bca1ab03897757919f1492f600da525be3f988534eb8b0c4df626689655982b0f79502c5eae3bab33f9b8399bf3d8db7e SHA512 c272261235b43fa053e403709a2c9844bc99f3d444c340cf881055b605f72f894f9224164159f00cf0522d55ce4cd09cc86547673415680c6fca39f5eec542c9
 EBUILD xdriinfo-1.0.6.ebuild 488 BLAKE2B 7118a5e7ff9a2dd7e9425536447299cb8e8b77823ca8e423d31bbeb5f0a41b1f256f90b123fc3711e39122e13b854285eec92760f96d2011c82a8e6e1e376dca SHA512 938a89980c771e34926ae5efad21fcf9de3e778d55df68b29fce4d4016e69039775826cbdb6de702f58db198bf1762c1ec666551e11d93b5764a7242bc6dbc79
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..12d615ee4f87
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3 flag-o-matic
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	xorg-3_pkg_setup
+
+	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
+}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index 7bbd95fafdc0..27ea888567bf 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,3 +1,3 @@
 DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
-EBUILD xedit-1.2.2.ebuild 329 BLAKE2B 0e4160a783af7c161a2a045e40cf45aa61acf807dee6bebe61961a061d3a5433b35930c9b45231d9ccc2946ecfc60cc87a51389a20c17412694e49fd77da7a5a SHA512 995e12b5330e4d01171776307561ab070eefdc4295e2dfa9df57878640100aea8805d6cc60bda9241b3c9a01622e76090d98f6a1aa9e85467464ef2d4e98d440
+EBUILD xedit-1.2.2.ebuild 324 BLAKE2B 0f3b2f9a67f5ea5e7ae95554ef70f6ebbe406b73f9d02075908c0017a5c8a0d781a1138edd38ae6dc23c4ed6e1032693d567d1c70db92d5be5928cddd9a27d1f SHA512 c4ad52e58106cfdde4b9a9c2565b6ce3d748efecb507882ed5c3acf7b188330f4372ebe10b7950b0a89e58f2ad86c56bd76d823e5b215c6374727b72ad407d93
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
index e837afbc9fb6..a91671b39076 100644
--- a/x11-apps/xedit/xedit-1.2.2.ebuild
+++ b/x11-apps/xedit/xedit-1.2.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="simple text editor for X"
+
 KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 448fe1506cb7..86978223c3b4 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,3 @@
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.2.ebuild 452 BLAKE2B d64808f6da09c4c8157869431751edf17ababd41e461caf749a64747256f5967b2ac77205ec60148304752a2c4e33ad029bead786c843f4880828c4fdb5bacbd SHA512 fa98c557c99bf24c57f8c5e904c65c6f87d7f13047a1181d3a914ebd6d4952ef22d02e260e62b06fa65a7d36de9d5c86cda3d5f2915a1ed35ebe1d6e5d7f96c9
+EBUILD xeyes-1.1.2.ebuild 450 BLAKE2B 656e720004791543c7753549e3c2517e2b8b3ff23d7dc1ee1d511a3e3be88d20241c8291a80326114bc67f8a44cb4674626691522aec328e4c38fcd34391115b SHA512 fa05b8dccfb7a0946c122ff49a57be3f67084a46b1cc7b5121cb259b73e06b0332a159770fd5d7076963502f62d975835ae84096d5da4b8749d388c569be4804
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index 1630ff25ee18..770341c49443 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xeyes application"
+
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXrender"
 DEPEND="${RDEPEND}"
 
-XORG_CONFIGURE_OPTIONS="--with-xrender"
+XORG_CONFIGURE_OPTIONS=( --with-xrender )
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 20ea703a56c5..df23a9bf5553 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,4 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
+EBUILD xf86dga-1.0.3-r1.ebuild 370 BLAKE2B 2941132edb5cc114a25b67b17bb0ac3f57c6a08e51421b3dd25a0c5490a6630c4fc7d86ed85f98ac866a200b4e2f959f1faed71dd61115a76c2bd658d876e06f SHA512 beb29878c4798c1696299dc446ecb804c525c9b6f729cbefc1fffa2a0dc0d234dd211cb4b6aec3fce72efefa323b663217b911958c1986d3d2de94924cd51b8d
 EBUILD xf86dga-1.0.3.ebuild 369 BLAKE2B 93548c8513d4a09d28d7e3191397c0cbf98ea458db81bf40699811a4d4fcf636167dbdb026a3d9d932c81cb861f4dfaaee101219e841656100f7ce4d10c91730 SHA512 f6bd89b547d09776da6183b95a04b96042c9e75edfb816217021e94e30538506719b5d8ff402daee671d8feade1eb0014037131f76ddf50bee5161150552a00c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..edb4b7e8ca4f
--- /dev/null
+++ b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Test program for the XFree86-DGA extension"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	>=x11-libs/libXxf86dga-1.1"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index bf68c233286b..777bcfc9041d 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,3 +1,3 @@
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.6.ebuild 400 BLAKE2B db63b64ceec5059813fe94106f0e27eb1688be5197459b48fee7bfa065daedc877654bb9544fde65a2ac6f24f83ea6f4fe7bf531c2308c1348c30707d5511371 SHA512 b74d8ba1561e7389c0d4ba63893613460c5d04318236435ffaaeea19e2c5d8a1a12d2bd3a00a90f8b46b4626dbb9e07cdffbf12b043390ffdbedab450f6c27b3
+EBUILD xfontsel-1.0.6.ebuild 394 BLAKE2B 356c14e9f455dbefaa43cc9c2ac999a05b1ac9e1ce599337175ba32ce371a741e8dbc8798ba88b332008a80e715e6e041781e3a3005cdf1c7ad28f92c1f16263 SHA512 54220873efcd3637ec3c40535809439dacd6571972fd806ad2fa7a0a58ffc02ce5c001b5a97ee0426dbc972f809e8670ad4d62427340bd1b1e20a08494ed1d2c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
index d48b18533f97..74c543c2d071 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 80a1d986db32..a9298edecc5f 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,3 +1,4 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
+EBUILD xgamma-1.0.6-r1.ebuild 375 BLAKE2B bfe784ce754f36cad02e25167a06c37fe19d89920a0b3475cf0d17c9421bffd1b6980e392b43618dd300ee4af63e3e73ae10c18ac2432b99791a65976519c534 SHA512 22e14697fc9028901c758ee27eda50533f01fe7f8a9eee2f25c5dd6070a19abe968f43e76f684d6d74f259419e55dbf3c4f5d5f5b18f617846767868de94eb8f
 EBUILD xgamma-1.0.6.ebuild 375 BLAKE2B 0316bc444b1d541a3c0fefbda73c01a2ae6b5fc76ac0535b4887d43183640e33188683a34ba943c2d9823bf838b73b592605899e9558163dd87d3f1c63cf7c50 SHA512 0cf4db7a84d5c5f0622e1ae6bfc14611f32799e036f3c4dbe4f2221882363833d36ebcf284893fddb079fabb496e942bede4ce6f5131eb55a0cad02e3b7a4634
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..2cbd04c886d3
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXxf86vm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 693647ef1635..226d1dbd5fcf 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,3 +1,3 @@
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
-EBUILD xgc-1.0.5.ebuild 289 BLAKE2B a89b2b577bad5c753a825c772a04c0ffc72fc0b0d222689f2797a17ef4f8cfa6bd5b39d38d061961dcb3b0589f096ac74fc0199fd78a47fd6d6d7880498adffd SHA512 aec82a608763914633f923ba13ecb7e5fa0a523132141b97ece6e2f9ec89bada556b83cd869379e777a442ace8a62954247663401f0fc18d0fffd2f2b30e93c2
+EBUILD xgc-1.0.5.ebuild 284 BLAKE2B 9900bb11a8031b0d264101b94c471a687ac80e2cfb076dfb2240282ff2e75683260a538850b208d13b4d5ec31abba3bc560bdb5b987c6ac811953441ed9ce2c5 SHA512 20480f920022099036d88aef0503348674dd3343958c1a0e6d843ef697a90d580b5cc0f7b0b898c3da34e9b4712bf56585f08ff87319da288a2b653bf45f3449
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
index 9ae1d24edaa5..ccb06e5e8d79 100644
--- a/x11-apps/xgc/xgc-1.0.5.ebuild
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X graphics demo"
+
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index 213dc8bfe772..e7dd202f4247 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,3 +1,4 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
+EBUILD xkbevd-1.1.4-r1.ebuild 363 BLAKE2B d8c9ae2c37f55381b42a138d5efe78bfbfc7e38e61bb56bb21d9a7b3ab172a964c903875673092b9fc93735554f122db2a45d7be0b459f8aa77a91552842b6ef SHA512 75e6847b7a55c1d594e5bc1a126c156f3db0cceb9d4d5e37879472b50aa0cf336e169d21c8efd09fc8fde28470725aa0d9c670978e11758da38e551a8244b72a
 EBUILD xkbevd-1.1.4.ebuild 333 BLAKE2B b94579d74dc02be3ce26033a9d8cc3e47acb1603604f16909340695354191f3a559aea7004316afb86232d5c907d0146abdff8ff68079c959b7c77bd52b9c4c3 SHA512 41ccca25360d9658303cbac2740381c52434b322c5ab08b7fe5503e4f504a92a8797df5063cb4f6a829891b353b3748b93fe8dbd11d8ad3f37a96a259af1830a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..e897c00d87ac
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/bison"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 6ae82ab28b42..05d597a82ab7 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,4 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
+EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 353a7729087263f2065ec40751fc63b716ae999cd0ba2e1e28bd614fe5dbe2dee18f216189d95e9eb69c88f04ad9a320000d4a2046847ee399b93a528e08c804 SHA512 78764cdcdb942f992624057b9f77719a3acb34ccd04155735fd8d01f66bde384b5adfe09e1605e0c32805a4066613ae80256474d234d458aa8e9f5b2df86509c
 EBUILD xkbutils-1.0.4.ebuild 359 BLAKE2B a8f3c870330fb536a45fd8bbd19ccef2b13bdd39a1f11f0ebce2d247d80aaa6b20e2a0806c47b39100a63198ed94e6feeca5b7fb8cbd5756554e60eac9f65938 SHA512 f6b17791a4b3df16e1bbf47fed78f2572a42351faf82fc8087412c53c6b250d3eb5e6a92fef1cfcc9124d5173ec9ba69695fc9b8a59ffeee9af3b42a9d22756e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..f407430b8807
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbutils application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index f4b41a07024a..6f1e7db18bfd 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,3 +1,4 @@
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
+EBUILD xkill-1.0.5-r1.ebuild 381 BLAKE2B 2dd2cb156862617b010741fc702af3d543134a611a05a544b136ef445b2764b5e14cf0a5935d54dbfdeb1300ab831aa180ed39da57e3025ba9f6661fdcb5ebfe SHA512 8d6848005812bd7ff0745cf98395d8463f918c124491bff7bf1bb26192d1dffb59a8ffb08c4c24ffa122c0f01f14cf86085594819ebecc3d184a525f126ae8fd
 EBUILD xkill-1.0.5.ebuild 362 BLAKE2B 7aecfcf146503b9c185512b54a3ec1a571f2a825a1bfee8e24af71737fc1ded9237f7b93564a133e27323580eb6503fa5eba76fc885dd97db01ccc2eddc14ea8 SHA512 6c4b0c5f4a22bd8fc930d5ff8a564a6214e10e401e9faff4e7efcd0fbc64359cfbac21182aefcdd4fa2b6bb418fe1487fc4fe1ca342657124af67a3969186547
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.5-r1.ebuild b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..0539ad5a3749
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="kill a client by its X resource"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 39239849a791..76e2b8eb2d9a 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,3 @@
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.3.ebuild 381 BLAKE2B 484b989b923ff6cd1bed8cdfff0ed08b3863ba19a8e08adf4d249c51c4105372b28b01e9ffe5cad51187bcf25b26b3f38bcd63d23b94c48d07c2ca8f7d14bb97 SHA512 137a57fc380e8358e62d5dd162e40e2b2d14b8af58ba610a8b35bc1154bda3cf22a2ea2e9f75d0d8a3e5a9f22b890c12bc9a414ac33822b072acfaa98d28a98e
+EBUILD xload-1.1.3.ebuild 384 BLAKE2B d36bdd5aaf07e86d70ae188b45fbeaebb58c1785e1ad978cee3be2a7827d3131fa9b2200b1f3982895133a2fc62e80c99cfbaaabeca68d2cdeaa3c59f5910203 SHA512 038afcdd217fc5171b3de167631f0024097f5379a3986ec1e46184310ba9a5fdf75f2fa34137360654e4d384384d494f3eaa4da8270e4e2956a61a7790f7bfcc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index 942bfa2921ad..71c7c8fcbdd8 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="system load average display for X"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 71f135f4ced4..a9dcaf0c2d5c 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,3 +1,4 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
+EBUILD xlsclients-1.1.4-r1.ebuild 361 BLAKE2B 00f29d98e21190a6410ee5ff28fac2314c60929b913d4919f9b794afcfa98fd0193682e6ab7b83f0fec67db62e8db71ec9f3ffa00e393622016d0c822387c4d0 SHA512 70ae99a61af0becd1a928086de640527b85f6c58d7a674a23057603ebf3138a117af2ee59f9562098a8c0a6ee417c7d39b291ec9b80ce821b90bbbd655a023ba
 EBUILD xlsclients-1.1.4.ebuild 342 BLAKE2B d7e1a9b54a45dd100e674ff05571748a5f3c025ee39434db0e9f0842474dcf0b56caa5cde6faaa52c8937d6627f7d35e4ad1981adc5ce9c8be13ad8fe8a205c2 SHA512 0e7d7d8734ec0685171ebcd0360e7cf6ec24fe3aa351f5326fb53687877510e6e472923907f7144449c7e1b95b196e54094a3dea3031b08337f15f42bbed6c3e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..0219303ab804
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.7
+	>=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index b238ff0d9280..2289b4d0ed44 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
-EBUILD xlsfonts-1.0.6.ebuild 349 BLAKE2B 9b7ad77ebe8b1da276db7b11348cfaf831da4cfc8925bbe62730362286b8247b3525262e61b331d83ecf8e93cc19a8533b326d61d7fe5f86d35830207fbb8a01 SHA512 760e485d5e2d02b3e624e77fefecfca1556b78e0f194cbd7e9e9e6318a291e56e1333b403d17fe7ece2b9a3839aa676cae5dbf614b5288fa9043d1fb509cf59f
+EBUILD xlsfonts-1.0.6.ebuild 342 BLAKE2B 20701c1afe250fcdcfe2297991a1c4ea84c7b202c916e52a2927332dadd2223ea975bb62be0f1646cb6824bddc20d4fdde64e19cf49a195350b2d58e7fbdd8a2 SHA512 9aec01d9e19dce9618e1a50e6d7aefc80d25438e9f5cc1a7a50e6c1f4f9cd3205e6a035b46608ed88379ed12bc64527092536d3c16a70dcce56ac77fb3c53354
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
index 8ae47d4ad07c..32365ce3cf15 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
+
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index c78e8e03930f..399059e552f0 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,3 +1,3 @@
 DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
-EBUILD xmag-1.0.6.ebuild 331 BLAKE2B cb48a74486a10fd0c347c6236a7b85a50c440522fe541dfb42c2fdc1f7e412dd0bd1131a9ea4e6a41ce34f1dd7441ee046a945cc5a613e7aa27cdb414e705de8 SHA512 ad3cbb5f6134a6e18872224295ba868e8bffd0203034f076360c3141a779490da149c03e781f21a1174a047dc9f029adf02b96ea8d4177c953c613abf8277a71
+EBUILD xmag-1.0.6.ebuild 325 BLAKE2B cd8d45f91f7bf0bdb71d1e271706a0108c8792450975cf54c30b577624000c83a7e55e18089106bc2169cd1c79b30ff6e8cd21e14ab56a418aefac8d09a00981 SHA512 fecd2fcc9d1aa206ef66f34fd3b244ca2d10089f5c195446dd408f7b329078d681ef48ebc8717561dd0faadfd32ec1681ba40ec160dd0bf74ee0eba7b9436916
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
index 905fd30756ec..4f865e46ee3d 100644
--- a/x11-apps/xmag/xmag-1.0.6.ebuild
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xmag application"
 
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 6b53da118505..2a04f9d270ac 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,4 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
+EBUILD xpr-1.0.5-r1.ebuild 337 BLAKE2B 94304ee921c547e3a9e1a60da1ef7881080b3310a381494fa99f99cc7525a9dc811e324c0fe576ee551d60adb6926ff49ff759181b1b39eab18c9034131e6099 SHA512 c598fe74e69386cf2ebf65c7f913ec97a4ea0fe590cf87004ac6da7c6bb9f80d0334f88762fd2252d396cb8872f578509c6f89bc5f39f0300a3c1c1a5a434abc
 EBUILD xpr-1.0.5.ebuild 313 BLAKE2B fccbb36a3616243c56ceb67577c0895027e17c453ba3ffcb3b06b9d8ca7c05616316a18efa33d77f89c7b806a4bb629efa59d562946862ce53d2b5ed7fd0aa0c SHA512 e3492591a5dc0e648dfb355968532627daa40c8aa2c1bb60072cedbf36a5dea2921a8248d70b3eb3f0b8a1c43232902c9851dcb222a081ac15e3278cf41afd28
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5-r1.ebuild b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..b2a41d163976
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 355ec00b82b4..ef737c6e17d4 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,3 +1,4 @@
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
+EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B bf49ad0da8682c448ea852035d761baef9eed07470446819aa935e70892896e2e16cde48981b3c697ca247e1e8b26b75f144378aadc1bcc5c7e944e463ad9ce6 SHA512 2fb2e3aa334110e97da594b7cd4e2477147aaefc0cfa52aae4395e9b64599b60a7a7e24707e366b24d0c8d7ed75b43e5ab3f8612851678375f5f0fb83ce23306
 EBUILD xrefresh-1.0.6.ebuild 312 BLAKE2B a1da9e51bef49939635b4b8f60be789085c03df52770b4e8bb24d7a6232ec4c6bd318b92bad6344acf3480984facd81fd6da1a91106487fdfccbef1a28f56181 SHA512 b03eb1ef54333f5ce43b3a2ae0bb4015eb6bd55a3bd60cd72b588d3037a1ad012d82cbb70f70dba00d2e35a4725cf7d687737dcfd1a973d7143d67ebf004fdb6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..80fbc1b2cb1e
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.6-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 xorg-3
+
+DESCRIPTION="refresh all or part of an X screen"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 0d1b2aa22e76..caf222adb570 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,4 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
+EBUILD xset-1.2.4-r1.ebuild 491 BLAKE2B 7490ac510a33f670f894b800579fbc61bc09a8e2d3a415030a52d6d143f59b1f2cd4fa06e7367479429aa8bd4d69f177cc77c6cb5d16c0ab4c6749a123728520 SHA512 5b890242d4088ffd3ee8be256e774bb1e0289615c09933881c2f9b404b929e8712d69d86a8e503d6f8cd3f8b1e8e4b74f7923d61a4d37bac250d74fe11b7aa12
 EBUILD xset-1.2.4.ebuild 470 BLAKE2B 201e4d8bf88ebcf477164b789bedb3bb974eb972099d6cb7b3a70a60668f5db15923c4da0dba93885302158dec629bdea731b9fec042bf1b227f819df48acdda SHA512 7e8d940c96570aa96c43e1c8bf04434347fdb1dd280496781e8cbcf3ba1380ab5e6f6d0699168a14b21316b93a796c582ccd104465196360657136be24ef7e2a
 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
new file mode 100644
index 000000000000..3e4bc382f415
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xf86misc
+	--without-fontcache
+)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 25acdecacdb5..659bd091abcb 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,4 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
+EBUILD xsetroot-1.1.2-r1.ebuild 407 BLAKE2B e911774209086f3c35ca2c69c8f1d748a3088c9184955c5aba20254f2a2f05eb3952c0153c1977a6b195c686ce489bb85f864eb07c57d0b52b908bcef3c606a7 SHA512 7359eebc0545487e43c13987a9976b4b5044a3acd2c73f459e7bf2bc9e32a707a07add3a4bbb51097db54cced94b89299b442d30f423e9eebcb92c3eb64e646e
 EBUILD xsetroot-1.1.2.ebuild 384 BLAKE2B 3a22511b1f237133a80e616ebb529a5612622e2c12da4f0d33c5a38c2a23de9329a792ee9915a2b3a20174cc574badeb3e27d397c33259b5c019d8e4516a32ba SHA512 55b586e59c7e5d0bfbe582776460cf896c671d7a8e68dd0ae07e1ce612013bb9f051a7b2cfaac9a2270da33b7d533c0fd9fe688150a242c6cc1b2afb4f4df7bd
 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
new file mode 100644
index 000000000000..bb312bbff677
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXmu
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index e20b13453d90..2bf2ace07d8d 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,3 +1,3 @@
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
-EBUILD xvidtune-1.0.3.ebuild 382 BLAKE2B b6ea8b42094c80bf606d01597490acff27cb42be97232bb731c5d1780da0a34b06ab729deba4c176c6508bf1ff898047a3f4899b515660e3022547a347a33bd1 SHA512 435f0523f1961be8a084bc368710a7aa876c6adaf676484e8b696ae79d8de29ce0264c1d33d726b00c29997c24f60405af74f117b169543455b890e3b11c9d67
+EBUILD xvidtune-1.0.3.ebuild 379 BLAKE2B e381912454278004a28d93865db1294f910bdf32d8c352cc578a9cfd9ee7e5f5d6dcddf09c9674707fa89b4a6560982973d562c8986ba27e6d10abfe0ae18cdf SHA512 cbd52a7ae5ad14bb5f096b92f8f0ffcf100e42953e9639ac5311e63cd1093464ecd321be5f4c06b8b4422eee57477eb141ab8166d83c8f9c422af2a9b9b12b1e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index 3de262b8407d..0c03db335b35 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="video mode tuner for Xorg"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index c719144df17a..b90b18ba4738 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,3 +1,4 @@
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
+EBUILD xwd-1.0.7-r1.ebuild 363 BLAKE2B 6004748bac88f0e0e7a7b3ba0c2cf562d090016721ef2337bfed728deb3b8f5d2eabc35dc41b30d10d68cdcbabe22e7809d835af3a386e5b0aa1a76d10322448 SHA512 f88cb986f7d81447918b405a4898980af05b7538bd66cad813d8150a35f4e070f283512670fe6d7340b4f8d46ec69c67541fca3e01cabae7ab5edf0a5cdc32be
 EBUILD xwd-1.0.7.ebuild 439 BLAKE2B 9606f93395ad02373d8cee7d22a4e48e7a751f6f9399d4a067b04c5c0696d8062f94d809f95e66ad65aa6188fbb3a266597564a7ca4c6d14cb20f76869a4a419 SHA512 c1d749d3e6e6038e2dc7da6180992919d0bb1c16ba5514978a5febfd946dea483d33ae15bc1d1e80e66669bffd71dc0310abd65934c3a20f096b0ac7c920398f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.7-r1.ebuild b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..116dcac06fb2
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="dump an image of an X window"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 5f56fe88d734..9d627734fdfe 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,4 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
+EBUILD xwud-1.0.5-r1.ebuild 319 BLAKE2B effbf9a8f40839a3b505ed3a43268567311df3fc50197c311561ee871a1511df728cccfbe1ee48ec1703ff6cd43f705c7ac5d0aa5b487b28aeb8cbc138707edf SHA512 6a6b79b9bd097bf2f9521da2f221a2a855434e98bc1ca9eed199a936b0f61686b4fd65b346edadb8b72b6abfe3d3612c1dc3d01c041ebf39b0b7ff565c7ef5b7
 EBUILD xwud-1.0.5.ebuild 299 BLAKE2B 3e33caf41813fb6eb41b9c2348d21e3018bc294d4b31178fcc0fe4989c0dae05962fbd7059361e583afdb823f667e6dce11208f097e43718f2aea57c789c123f SHA512 7cd7aceca3304b6fcbb0c7b88a5a0e57f81415384f74df8df9311be846a77f0191e51040f870fab19e0b963ecb11ff248c7571af43a09afc4f1e08503452f156
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5-r1.ebuild b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..15db6db7c0f1
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="image displayer for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 1a83c83f8446..c95e88c6ea57 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/metadata.xml b/x11-base/metadata.xml
index 5293f86a7217..1b3cc8ab85ec 100644
--- a/x11-base/metadata.xml
+++ b/x11-base/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria x11-base zawiera podstawowe implementacje X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 329e63f5c0d1..fe08dae50f36 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/metadata.xml b/x11-drivers/metadata.xml
index 2357fd16f5cb..f025f7ccbf60 100644
--- a/x11-drivers/metadata.xml
+++ b/x11-drivers/metadata.xml
@@ -22,4 +22,3 @@
 		principal X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index d6ab763690f5..eba38fb78453 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 533 BLAKE2B 85f3853d45721cbf7f2a0a95dcb01cf7e76097a078c0947d25bab982b8ab05eceb09efde990b70c4ff096a841e226f7e3cfdfbc9e62c5acb4ed55851e57d5ee5 SHA512 90a450718a369965fbe0427cb524f70cf68d6c43befa2031aeb33ba316cb87d5771b805e57941152ca0787580043205242f169c64362c6426d2a65bff8702567
+EBUILD xf86-input-evdev-2.10.6.ebuild 530 BLAKE2B fead986a959a3b953841cce792c7de5852afbeac09fae4a250aa0d271020e4b21470b9d1ea0067eae50b5f9780992037f20b3872cd9bbbab9bc0edb2115d69f8 SHA512 334f11940fe299fa92c4d2eebeef9b31698d4ac599efac799673083bdda8326400fcac50475c3e1d64ce10866f820c98609c256e940616a00f9780bbae78e3c7
 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 c3d28955e86c..2bdf150ddc17 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
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info xorg-2
+EAPI=7
+
+inherit linux-info xorg-3
 
 DESCRIPTION="Generic Linux input driver"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.18[udev]
+RDEPEND="
+	>=x11-base/xorg-server-1.18[udev]
 	dev-libs/libevdev
 	sys-libs/mtdev
 	virtual/libudev:="
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-kernel/linux-headers-2.6
 	x11-base/xorg-proto"
 
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index 1424c5cfb178..e2ff7d282dfa 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
-EBUILD xf86-input-joystick-1.6.3.ebuild 448 BLAKE2B 81bdba0b3f39d058716640d46ae9e90010dfb33832de937d847a4cae924e73096c88fb1733c3eb07a1d11987673d07ccb65116edeaa41c7a8edc6bfc4a462c86 SHA512 e04e10f8d636a948f4d11c909988d7b82007203875a683916fd39a54c6b231a6dbfb140507ad3dae39c1b2812d16185f3a5d36d36984446bbe37837191507b78
+EBUILD xf86-input-joystick-1.6.3.ebuild 435 BLAKE2B 7a2b84da0d3556bb05319113a6fe5200b3ecccb34b160cfd1a659be865420baa874f2fea68aca7ae0ef65364a16ab0e03ca0583865d3b72cf0b3b2dd7e8d778f SHA512 b621e198991611ad8a70592a72af1d6e34f0b6961a0a8241b3650c94394a2f79fe1255f85d1da0b393399437c5da853f762a758617a670cdb81ac1f01b06f9e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index 34cdc10a84f3..ebf5a3965895 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for joystick input devices"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.10"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_install() {
-	xorg-2_src_install
+	xorg-3_src_install
+
 	insinto /usr/share/X11/xorg.conf.d
 	doins config/50-joystick-all.conf
 }
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 0e099df81315..95a9cdec5677 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-synaptics-1.9.0.tar.bz2 501814 BLAKE2B 7720136dba4e3cb76d21a9624e7e684bc09e22ebd0bc3b53fb170bbfebc29133dcfb471df326ac7b2eec1e4d3e2a3eeef56e57f649ddcc8f4d5e66eba9bd28e8 SHA512 71171ce59136b1c85764d412f9039d6252c94bb2ba44c8c6348aef6509d12219ea17a026440b0e18d26f4d7853d4ca5713eb2404d39deebb8be82886ad57bad4
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
-EBUILD xf86-input-synaptics-1.9.0.ebuild 818 BLAKE2B ddc270a8d1c4a813705dfefeaa5dfa65c1948667e780eef6589cd91b41334da39e360fae375610c6f0618b3c64e4c96b6b747b20098745518d62b6c215062622 SHA512 0f9da16f9ec81fe0902250884ebba5653054bc60c7f41d867d71797adc0af1fccecc02afa87e58d8761e56e271ff81df402f5d618d79cd3a551be3a47d8c4be5
-EBUILD xf86-input-synaptics-1.9.1.ebuild 824 BLAKE2B cf50f1f60d2db6f39583cb0d51ecde307b06257d4e44440a9d5bd8562a68005996ae3e0be7b67b0b6e110b114f553e746fabc4f27f8551f0de7c943d3ecf494b SHA512 47a51917484e430d7d78b97b1285db5aa9fe46ce0c8ac136b738fd4db764ed007445a0f4ee8f4dd8de2fdd922684e42b7d8d5eb5104c594ad6faab302841cf43
+EBUILD xf86-input-synaptics-1.9.1.ebuild 871 BLAKE2B c68816fdef5ae2a7bc096cc4a50baf058dd25e118ad276b81849600b7c8abbd2bf6fed518afb802d2e39c78f9974b904cb3cb8710e74dad16cc6a2cba39b80f4 SHA512 04b9a321ae06e1b20b1c907230db441a0eca5921bbafe9ed787b8ede1c9c5fbe224044e2de5b0bb192f930b40c087288b001f3cc5b73471ef53e0793dcccdf7e
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
deleted file mode 100644
index dd5bfaf3697d..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.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=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Synaptics touchpads"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="kernel_linux"
-
-RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
-	>=x11-base/xorg-server-1.14
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.37
-	x11-base/xorg-proto"
-
-DOCS=( "README" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
index e226bf3a1265..520fd89d20bd 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -1,35 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit linux-info xorg-2
+inherit linux-info xorg-3
 
 DESCRIPTION="Driver for Synaptics touchpads"
 
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="kernel_linux"
 
-RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
+RDEPEND="
 	>=x11-base/xorg-server-1.14
 	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
+	>=x11-libs/libXtst-1.1.0
+	kernel_linux? ( >=dev-libs/libevdev-0.4 )"
+DEPEND="
+	${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.37
 	x11-base/xorg-proto"
 
-DOCS=( "README" )
-
-pkg_pretend() {
+check_reqs() {
 	linux-info_pkg_setup
+
 	# Just a friendly warning
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
+		ewarn
 		ewarn "This driver requires event interface support in your kernel"
 		ewarn "  Device Drivers --->"
 		ewarn "    Input device support --->"
 		ewarn "      <*>     Event interface"
-		echo
+		ewarn
 	fi
 }
+
+pkg_pretend() {
+	check_reqs
+}
+
+pkg_setup() {
+	check_reqs
+}
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index 2df87de96d6d..672666f63ba2 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 517 BLAKE2B d96def911d53d97abc9a80eef56837e6100e870fa4b1503925af23ae1da1ac00e64f001ee8f504933bd2795bec4bbb295f7a147c946662ff47dcd573935437d3 SHA512 e178ae8060b25a4ce5593777bd360094d0850ff658bcfca464e71e2559e9ed24d831bed57e81fb39f052d32f31b3161b246982a6fcee29a78806f6333d9b437f
-EBUILD xf86-input-vmmouse-9999.ebuild 508 BLAKE2B 9c9cea76552985d31d1467e3e38b2341b18829d34c9103800ba7653bab53de176fe1fc16535a282c7546507c01496cfb66ffd7cedd1079a4a1039b5d293075d8 SHA512 4f89a2e60ec6c0862caaa0912889d07103cc45e8a291650722d87df256b014818ead6e1954292cc96974425362fc3c755fd711e44b785c42cbf3324df73cb0f4
+EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 526 BLAKE2B adb028b183206ec35c2c7a331992a5cf5de01d77db53afa71286935ae53940ba390e51da858934bf33221ac66ce49fcc339795d0ea2b1e49597543a2aed33df6 SHA512 fcb2c44bea9b51fccc7b2a8cd7376a686ccf0b7fe227200ef35eaf43ce61944d70f440fc3cac7b26b7baadc317234f23bb35dfc722f82f8fcfd0ce30d3d3da8c
+EBUILD xf86-input-vmmouse-9999.ebuild 504 BLAKE2B 1b97870364539d80eb3aa798439548ac6ed447a7b54017175d00836280010487b112498e8e82574859e31cf1ed9bf48bdf49880a559abb5ec1f380577bb764ef SHA512 71372b233d2c137099c83b6b4c36e8adbafb02820baf7aabf0f78e08c3d9b5c8d37c96b95eb49290c85ef7332d31fc760baeb7f1e0cb6aa6315213c42da23520
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
index 5729c0d5e63d..2e0a13029688 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
+
 KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		--with-hal-bin-dir=/punt
 		--with-hal-callouts-dir=/punt
 		--with-hal-fdi-dir=/punt
 		--with-udev-rules-dir=$(get_udevdir)/rules.d
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
 
 src_install() {
-	xorg-2_src_install
-	rm -rf "${ED}"/punt
+	xorg-3_src_install
+	rm -r "${ED}"/punt || die
 }
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
index 1a242a878474..6e59ab01e3c2 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
-KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		--with-hal-bin-dir=/punt
 		--with-hal-callouts-dir=/punt
 		--with-hal-fdi-dir=/punt
 		--with-udev-rules-dir=$(get_udevdir)/rules.d
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
 
 src_install() {
-	xorg-2_src_install
-	rm -rf "${ED}"/punt
+	xorg-3_src_install
+	rm -r "${ED}"/punt || die
 }
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index e4b1ae390768..9b0f987212f0 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
-EBUILD xf86-input-void-1.4.1.ebuild 328 BLAKE2B ca9c21c402fcd663cf2764b56357e83a4b849db3f4263ee3d288485ad071de442661456ef5a18eb05c86e4c28902c2c1715ccfdfb43943bffd8d876eefaec049 SHA512 1e8bd423ab96cf7966664ff6ef98c22ac32a895c34453fbab38dacd9327e75e1b18a91e823ffe275fac687d54e4cef7233fb44fbea9fe1ff8f9e7794624cb55d
+EBUILD xf86-input-void-1.4.1.ebuild 310 BLAKE2B 9092d507843f111ff7cc12bb2cf39fd0352a3705cae26d1d58592f8bb7a0661a09a241bf0c48136d575455eb55982b790410eb132b5ebb6a88d6201004f8b177 SHA512 9d81c2311ac958e5d9d8be03e4ce50db3e141ba07235eb3133c9db05e79550e3979c31caf616493381dfee03e7248ca17d40f17b1b940bbad83e1d29e8a4fab4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
index c01eaf9d4ceb..8a037ad91f84 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="null input driver"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.9.99.1"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index effaf67cf4d1..2f0583232e3c 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-ast-1.1.5.tar.bz2 339848 BLAKE2B 48ebb8f54307a467eb952ff57dce4cc9da11b627354c54e11426133dee029765390c8c61f0b724bfc66c2f86aa5938ddad49707847b50648d875dccf5c4be9fd SHA512 067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e
-EBUILD xf86-video-ast-1.1.5.ebuild 232 BLAKE2B 2c5d387a994ee7738cc1668523840b473308fe6ecd944f39c15683e1804b2d0d95c1d86e3e3d4d023ecd7655efc5ac2d73010d985b1475d9d700b2aacf738312 SHA512 ece1fce1781510fd5aceb45d914716490e9e9d1c1ea7087250bf06b571004fe699b526622bb121f1371651e9e2999bdd1161c596cfbccc67ec995e0966c5b203
+EBUILD xf86-video-ast-1.1.5.ebuild 225 BLAKE2B f7b3489d2cfc40d6e483fc097583bcd7c265aa3069036ed092347d2f1e52cc2285c9619c58657330e44cda1d59eee87ece4aa1e538da7fb1ab1e51c9ba40b549 SHA512 4e9744a59436ab4bb9f166f92d3f23fa263f0a8efbc9b18dbac36bc8b90b766d862a23d1b18f863f0988b59542db557027658f5f742f906f8b0031752492e51a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
index cd4ac3b9a303..4093c3e7fd2a 100644
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
 LICENSE="MIT"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index a47ca718d698..14d151e756e3 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
-EBUILD xf86-video-dummy-0.3.8.ebuild 460 BLAKE2B fe78fda2df3a00bb2d4bca5bdf398d8678fef03b47888c8139c6a4214b905d53bd6ab93937c5f65d3eeef84eeef33b387cd02bf3e05f6568d9717ea13c6d54bb SHA512 5d90ef45ed0b5a5bf2ad1b9e716870a054708211625aeb92792eaae3edcbc154e96d590468534cab5e68d812adfd1de2de86f975d304e84acdc1f634df93e48f
+EBUILD xf86-video-dummy-0.3.8.ebuild 468 BLAKE2B af26748a2154671dc1893b62721d2cc9ecf94c79120396ac9a2b941d2e8ac67bb7be607cd863a863e9c70636a2591efe3573053b132a9c267f299b32f44a1151 SHA512 f9373e6e6cdd2bb63c15446fa2d2ea69104627515a1a0da1769b3382f96ec227c179ae151793c1a165a501af419ee2193849ac74e99b415d62c28bfcbf5173ff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index 436ff4aaa8a9..93c6b8a3bb46 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for dummy cards"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dga"
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
+RDEPEND="x11-base/xorg-server"
+DEPEND="
+	${RDEPEND}
 	dga? ( x11-base/xorg-proto )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dga)
 	)
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest
index 398f3b25692d..8411b40c3bf0 100644
--- a/x11-drivers/xf86-video-glint/Manifest
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-glint-1.2.9.tar.bz2 419524 BLAKE2B 3ec8b4f3187832e1f2a624e578b07c2e9e6ac6a7c48cac4a67ee59f6c479995977e7f6cf903650c52c5e49c0ea321ddec78d0be4969c27584b8e9655b6a08ec4 SHA512 29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12
-EBUILD xf86-video-glint-1.2.9.ebuild 306 BLAKE2B f0fbb86c22c7785211a3df62ac90787108ae9a0404e60583e31cc57ffe6480666e2c5fea0a5d84b82b0a778243fc7c0a7a37f0120e77b24e536dd3f1e67c23cf SHA512 83ff26bd949753a9227d71d57174ad8bdf70a15b3b07c69ac7796c19132d68ef4a763ca2387f9c7565844d934b05a92b429fe98a9f76e2c40cb8e4201c31ac9d
+EBUILD xf86-video-glint-1.2.9.ebuild 291 BLAKE2B 9b9ab6fc6dd2e8ced03c7353d479b86c7939df03e68c66ca213cc81dfde8ff513b69804322c9d0fc8bfe281535405144a1c150dbcc0756f0674d452285b1cd14 SHA512 edb0566399b3a73e6805233b0c207527413f509bc1eb2dd08ab6ee473a491582a7571a617ec7c79bea816eba6f14b497bf9e19334935858102c05b76e0db4e8f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
index 33f3ddcb8b48..d4aaafdb386f 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="GLINT/Permedia video driver"
 
 KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
+RDEPEND="x11-base/xorg-server"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 697bcbcf84cf..a62a6d2bae79 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-mga-1.6.5.tar.bz2 478350 BLAKE2B 6446da393214921fd35802df387f200856c0900d42a81b28bbde55dbc453752c06f3ed7abf936b5fa693833d8a5f56767e440a37cd4b7035db0abb5736cf4020 SHA512 e1a624cb5d98796e9138bfc512b62d5130885140b1751c01f29a8eff96f66a2b57cb5abe23c1fa2b55188acabd6554c5897190a4e1aee1ec09245d53b88f69d8
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
-EBUILD xf86-video-mga-1.6.5.ebuild 346 BLAKE2B 8aaa92d90b991230aa4bfc944f28cfa17892a1dda0602daa0eaf4220fa2be8d517b7656bdd099b57d50edf86718b01d1f2c544b9b678fe7e0f3f9250b13b8412 SHA512 fa6d985d51e6e11615d1d3db8b225d154748e049d925b5e6d2fd2b04b9342523d4cb8428b401dee8152f5aa6698e22a71f34d8290137c4b3a8cd8c56090d8f12
-EBUILD xf86-video-mga-2.0.0.ebuild 346 BLAKE2B 8aaa92d90b991230aa4bfc944f28cfa17892a1dda0602daa0eaf4220fa2be8d517b7656bdd099b57d50edf86718b01d1f2c544b9b678fe7e0f3f9250b13b8412 SHA512 fa6d985d51e6e11615d1d3db8b225d154748e049d925b5e6d2fd2b04b9342523d4cb8428b401dee8152f5aa6698e22a71f34d8290137c4b3a8cd8c56090d8f12
+EBUILD xf86-video-mga-2.0.0.ebuild 358 BLAKE2B 35f5c82fa0bcee64c8ac20f77e817cba30cd47c697d6794926ad1c7a43c8816d09756350c43591421a84e9b40b005eb497ff36194f171c53290ed69960a92a42 SHA512 3ea4d412b272cb940048a9e704373a6d1f588c2dc9fb833ae1912cce8a5effb43894da10257ff92cae2c95e10680ad500d7de6cb71f4eafd9cb620f3ac72f61e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
deleted file mode 100644
index 812b0e9f2a9f..000000000000
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_DRI=dri
-inherit xorg-2
-
-DESCRIPTION="Matrox video driver"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
index 812b0e9f2a9f..4e6c85afff37 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=dri
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Matrox video driver"
 
@@ -11,6 +12,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
-	xorg-2_src_configure
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 6e34833f5343..15c416b55812 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-nouveau-1.0.16.tar.bz2 629404 BLAKE2B 519ae2ddc6f895648274e10fc3b5052896734e40251dcaf35a948be051711c14054573a08192ccf15002f3a8d1e6079c982c32cf8c58e2a288c0f146155020e8 SHA512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
 EBUILD xf86-video-nouveau-1.0.16.ebuild 616 BLAKE2B 3123d1d141ed0287b812f170c2a8e02e167b6f25a23c145870054e4bf4a3e35e1a0004ed66bf1c31d0a626cf5fe21a3000cd2c75cabcc417d3c6a92446303b86 SHA512 cf22557c666182ae9e8d954007b5f5eb23a7eb24deedf16fbfae1c89d98cbb4f66367fd6c2d3e8d7d6f26fce13a446ce8f6107fe2bb7f7541af184b28c282547
-EBUILD xf86-video-nouveau-1.0.17.ebuild 618 BLAKE2B 18fce987f45115101ad50303749ba9ca40a4812bdd8846c7690598de12258920fe70751a3eef9b9636867afcba9423a85cf00908d2e2ceea51408c3685042e3d SHA512 393df42f73ece27f6e5e1a8f482938d3327239001f89890e9bc61b37b0bc9a72f32f25b6861a159fb40e9b3fbe07e47665ad819b97dc75c041f9e94720a46aef
+EBUILD xf86-video-nouveau-1.0.17.ebuild 614 BLAKE2B 776d6d3895af1a6e611e3a3a20bee4e5c6500319648431d33b5e34a5f78240f7129112b1f0f8ae9896efe66dd418ebe55a9fda317589a0e75e25c9329fc9c4db SHA512 acd31548a831e3dde07c1e9e235464ac361f82341d5db4d01bf02728da7f015223e79bde3bfd62c7b5e5683bc21ce54198302de94f0b8cee57f95fa1d2ebdb16
 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 2c1883d6e115..25caf5a71cae 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
@@ -1,20 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI="always"
-inherit xorg-2
+inherit xorg-3
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau.git"
 	SRC_URI=""
 fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
+HOMEPAGE="
+	https://nouveau.freedesktop.org/wiki/
+	https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
 KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
 	>=x11-libs/libpciaccess-0.10
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index dc59eb63b123..b073c9dd8be9 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-nv-2.1.21.tar.bz2 424091 BLAKE2B 3ef69d23672c0d65d1117ec1c4906a47d34878ed20f7c07d044be3b9d74c848162d80fe9cc7a11797fd9f94dedcda3b5e76d8386f2b7208e432497ef50838422 SHA512 97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7
-EBUILD xf86-video-nv-2.1.21.ebuild 307 BLAKE2B 80226a8ec2f34080da2452351716fb3196f02e2baf8c8f76e3ac63c21745bf6c1f09a5be79e38a9db95d9c9e9385bfa5dc8502898ccdeca1853f9a180dec732a SHA512 cf5498802ba0457267db82575d7faf8fbfce2776a17f97cb686162e1c55e019f7a911725c728ba4922a100e7ef84de1ef992fe16db7ef792bd5e5fec3fe8d697
+EBUILD xf86-video-nv-2.1.21.ebuild 302 BLAKE2B 538281e3d3ee259c3bc36bac15fabffda573ea4ec92f3bc08b3dfaaaaafb04d24df247237125a82dc66c4dfb887ba0307318ee802c748f5d241761f7d9fe1b0c SHA512 662e5cddf7fdecf984c1123745fb4b675e02aa833aae952f88d471fc4badd3f017f5ae92bf2353b24ed97a28fd6e9416e4aea9b6b5a6fab3c8a9fa4a2ea2dc9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
index f96f675ae5ae..edac3c64b1e1 100644
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="Nvidia 2D only video driver"
 
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
 
-RDEPEND="x11-base/xorg-server
+RDEPEND="
+	x11-base/xorg-server
 	>=x11-libs/libpciaccess-0.10.7"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 2431faf353e7..25405d95a792 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-omap-0.4.5-null-dereference.patch 362 BLAKE2B e4ddeaedbf3ba964796529dc3638b9303e20324cc18e3ecc47022ce389f8020aa6a1abe1e9e29e45ab4f8454dd7faf9df74b4f76987ce81dacb1d3e7bba796df SHA512 092dcd4d19653d59d2409ca89bd2528de5e220cd9a88ff8e4080c4dd62adcf3e264ce5a3719571f1055cda59b7a0b6357d32916041c29b0c1c5725bf7565b42d
 DIST xf86-video-omap-0.4.5.tar.bz2 316765 BLAKE2B 981322d7e140c4948f3cc5ceb9a649f252c431b6755a0e201bde32c92a00bb2d0c0513fbd2638320100855c78e8c4897c5cbcff8527ef0ff045350a9e9ce505a SHA512 c8a21bf00d9ead73b5f66310f802d6071454132b69e20230d3b95635d8fb8351febf5c881640907eb36dd7aeec2d0823e45fb9955b1a9a32e3838ee717964ca2
-EBUILD xf86-video-omap-0.4.5.ebuild 357 BLAKE2B 063b3fd04d3568cc4ebcfd4629f985f8d97445e1eff0b3089934286f38bb410af68dfb9ad9451b46da3fd7649d91be009013c43d19fc9d21479a1e191e58c64f SHA512 bc1c0ce27c4778ee66bea1ad46efd7f0967ede49e8051976af5b07bdd481867e539101a4a806cd9db6a432ce4b97f9078938bbbef6027b93aec1f4f573d65f8a
+EBUILD xf86-video-omap-0.4.5.ebuild 359 BLAKE2B b065d49dba469e6d17653edcbab4f3053a7b5fc5bca0d79ab34305f5c8429cf9df8b4f25257a57be65e1a28648dd1fc0d97267277c9c872b9d0d802c54d4ddcd SHA512 3ed6f0b8864378cdcbb6ef86404970eb6a2bbcf09dfe33e4702e720f97db01d6ab0068c1436597c63d78e9f33af6038aec675abf1a87202c39bc7ea2797d936e
 MISC metadata.xml 346 BLAKE2B 3c0b53d970c838680c81200bb24ea623a37d98ce92009c9e9eeeea189e77db94870b9fe16715fdeb91e6bf9e2b9a7e5dff6e3525c15b40b7b9f64acce43955fe SHA512 c42c74ad99ba4bfca1c89aac3bf76ccb50ebba85130c5eb81294c45fbd5992d376f27ddc4f758eb79cf95f6406d98d27ea5c1b56f75c2723fc271dc02ce0ca58
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
index a28ec1b05d23..3e9d78bc3c15 100644
--- a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=always
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="OMAP video driver"
 
 KEYWORDS="arm"
 
-RDEPEND=">=x11-base/xorg-server-1.3
+RDEPEND="
+	>=x11-base/xorg-server-1.3
 	>=x11-libs/libdrm-2.4.36[video_cards_omap]"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.5-null-dereference.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.4.5-null-dereference.patch )
diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest
index ebe1182387db..6e2abbd60dd5 100644
--- a/x11-drivers/xf86-video-openchrome/Manifest
+++ b/x11-drivers/xf86-video-openchrome/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-openchrome-0.6.0-fno-common.patch 1298 BLAKE2B 605a1b1964b5b7baabc7650164fc6e8ef444d19fd437151d6dc0697c0349810d82b70cbb803c77cbb65f604bf7edfdc42b7790270d9f795d71f931e05b893623 SHA512 119b7bb83af9c8aec01f6b0b55d77ec1081680c21a4e0d0f9a01b0f0c34e9f9cb9a7c5fb97e64387e1f3e46445d930fa1f1921c5424cfdfc547dd497f16e43a8
 DIST xf86-video-openchrome-0.6.0.tar.bz2 537619 BLAKE2B 30d8ab246646bde41b1ce0fd48c133cb7c2c3cff7c7201daf7e4fcded7a3e47bdc28d739247fce69b17a0e7697b33af35e3f771496654920b275a5aacbe8fc6f SHA512 f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004
-EBUILD xf86-video-openchrome-0.6.0.ebuild 1212 BLAKE2B 7bf0313d3a7ea334cc17980076b6fcf59200167160b7c8860e91f84f2f40f7dd942e56050ac43a49144b41a523b965cbe3e3d956441926a561d6348602412540 SHA512 ae3e9967fb20bc5d8defebf670643206b74d61e1db4195d01d6440b9c57cbc5f0c2d32d660e45d75b7ab504db7aa118b247304f9cfd32a8d0e990bf93627b084
+EBUILD xf86-video-openchrome-0.6.0.ebuild 1188 BLAKE2B 81753d96af1c696f6bc74ac0e90ab8fbcd80952ec6e3c6ea7bcfb7c9b80df6fb6043e48c134f09a56f6509a4b0a371c1db50856d6562cfdcf17003b259baf560 SHA512 fdb27377ea94fb80590f44a0cf947d26397cdad6df5b76525ff6a1dda740f8572f696a9a2f56e8407abcf643b362c5d0509613fa9f1eada97036aa9628b136f8
 MISC metadata.xml 302 BLAKE2B 7a580d2b118b1768147df42d10928eeb618524c00a2865c3f4a4eaa3334c86e6d8714019553baa95a7c8cfc30aa7d685eaecf3913c856623392b2ec8e00de744 SHA512 43446377349f40ba3bf5ccd9648ea102a8cf1fa07bcf8ec1d1df3ef3dec994d11437a4cb1190901f0a7cda7fa1332de1642771be82e87b16063d69922e072754
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
index b2f2a36914b7..1219380c354b 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI="always"
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for VIA/S3G cards"
 HOMEPAGE="https://www.freedesktop.org/wiki/Openchrome/"
-LICENSE="MIT"
 
+LICENSE="MIT"
 KEYWORDS="amd64 x86"
 IUSE="debug viaregtool"
 
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	>=x11-base/xorg-server-1.9
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXv
 	x11-libs/libXvMC
-	x11-libs/libdrm
-"
-
-DOCS=( ChangeLog NEWS README )
+	x11-libs/libdrm"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXv"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)
 		$(use_enable debug xv-debug)
 		$(use_enable viaregtool)
 	)
-	xorg-2_src_configure
+	xorg-3_src_configure
 }
 
 pkg_postinst() {
-	xorg-2_pkg_postinst
+	xorg-3_pkg_postinst
 
 	elog "Supported chipsets:"
 	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index 2904fa5d48f0..34bdaf83274f 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-qxl-0.1.5.tar.bz2 508266 BLAKE2B ca0fd43830a393d9bb1f5a6ba306f26e07a0b90233fa44f3fbe7a5f21026f1bd6960254db9cd75d947b3c42f6cc8cd3b7cfd71afc2c0a74bd84c60eafcf7e150 SHA512 7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782
 DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
 EBUILD xf86-video-qxl-0.1.5.ebuild 436 BLAKE2B 19560c57f7a7aa0446525affce826b10931d24fa5fc00acd947f3311940740c5cd6037be4da99d090f3acaa9e8df739cf7184713896a285e87dc118ca28ffb4e SHA512 b8b20bcd2b06b36f8ac835a551da75b93e062e9a4aca66b20d5ff95ac2c56804d7bdb0e0bef1dbfb762da2aad404c3fab496532f2f9ea3a9daf15ad7e63fc82f
-EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 777 BLAKE2B 16875c547b93eba10675ed4179d78e914ad2c630b9957960946810ff6a8dd083eab9628f8c5824b02d53e87a8f6eaae6034adbc89bdb83d37e84d5cba1db3a81 SHA512 a795025178d99c1ba218bd30f09660bc8f93eedaaf2a7ce5fca43090bf0bbea46c0524a44b1963e1dd545a4232336a3f78bece2834204b100e9aa55870ce5f10
+EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 894 BLAKE2B 1d7cb3f013081e8d345839905538222514f35da8ceebfefd151a2e76fa44fdbc34482f2e6feada4ba8a30bc4cd20303d4542f5f9ab7cbafaaea9e4a70e88553f SHA512 e7429f6dcae6400582c712bf1dff926dd58ce03c8954f5d53d8219012163024b8c4835fb8af64ba3723d4cc1cb67ad55e88f556d401ec223f9760340b6b75e6d
 MISC metadata.xml 352 BLAKE2B a2a27dbaddd9dba3c583eabdc64716ee086b679cc72a18a0f11b5ed6e7ec73069116ebb3bb0389131e65012eec56c7a213ec5bf2e6d08d211fff8e916cf524db SHA512 89c8a1813c246441cfd95098c5ca6e8e84e0e5e96e5b05bb6a30f794861b2e4660f06cd2bf45c0929e0b5425163a67e318778c502682d17b74a91f979389ac3a
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
index d4f5d8c3a49e..e8e8ae5dc9bf 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit python-single-r1 xorg-3 autotools
+inherit autotools python-single-r1 xorg-3
 
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
 DESCRIPTION="QEMU QXL paravirt video driver"
-KEYWORDS="~amd64 ~x86"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+S="${WORKDIR}"
 
+KEYWORDS="~amd64 ~x86"
 IUSE="xspice"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/"
+REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	xspice? (
@@ -23,20 +22,25 @@ RDEPEND="
 	)
 	x11-base/xorg-server[-minimal]
 	>=x11-libs/libdrm-2.4.46"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=app-emulation/spice-protocol-0.12.0
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	python_fix_shebang scripts
+pkg_setup() {
+	use xspice && python-single-r1_pkg_setup
+}
 
+src_prepare() {
+	xorg-3_src_prepare
 	eautoreconf
 
-	xorg-3_src_prepare
+	use xspice && python_fix_shebang scripts
 }
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable xspice)
 	)
 	xorg-3_src_configure
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index a2fb94abd844..8bda69bc4518 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
-EBUILD xf86-video-r128-6.12.0.ebuild 502 BLAKE2B a49afeed66830e6ff2197ce2e393d3233a6143ea6438f24c866abac356c6fc2ac8db77dde11d2ae1459eb16411cc1d72626577af4cd7fe788bf1e5d57939bf56 SHA512 0d08e9de7d98b189134fd245eb80257c5cc663f249491cf1032d114d0835ed051b303e0e1781b818bdae7a17f551197bf2f799f5405b5a2d7f0ff02167106e13
+EBUILD xf86-video-r128-6.12.0.ebuild 492 BLAKE2B 611c5732c905f80b88fe9206c0f896fdbee53b1679c6ff5e3bb0c10fae89c46f0ba2321fad36f75d5948e5b17613bc91380fab195ca77cdea39b1741bb61c8fc SHA512 1fb1f1723bb1da87d616a65b2b364bda2f2aafa855c27d48c5037a1dae3eb1525913a9416c44ed850636df16188e6663d03956aa4b73e10c953124c07e970b60
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index 5d59f92a1cf6..51078786ca62 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=dri
 
-inherit flag-o-matic xorg-2
+inherit flag-o-matic xorg-3
 
 DESCRIPTION="ATI Rage128 video driver"
 
@@ -14,15 +15,12 @@ IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-}
-
 src_configure() {
 	# always use C11 semantics
 	append-cflags -std=gnu11
 
-	xorg-2_src_configure
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest
index 2ab5bba7cc08..4a1bf923f0f9 100644
--- a/x11-drivers/xf86-video-siliconmotion/Manifest
+++ b/x11-drivers/xf86-video-siliconmotion/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-siliconmotion-1.7.9.tar.bz2 416351 BLAKE2B 8832c4de662871b373fdd2a1ac395454bbcf3ab3ac81416aab23c9a282a18cf46be5d98aaaa15213f394d0d7ac8b407c39aa0b9e3692495e36ef800077ec3f19 SHA512 13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63
-EBUILD xf86-video-siliconmotion-1.7.9.ebuild 270 BLAKE2B 61add873071d87c2e3895812d23143671ab5e0d633287a63640fdd4d76e30190ddd491505a8bd75bcaa465a4da5e43251fb4a4f07f3290c47f1670059a735937 SHA512 426665c7c5a36c654e64c3a400cc2360c28b53dd5eb3c5e20e79aca72dbb914e84e7636e84c8d858b6bcf0916d87ca0111089c44b33a8b412640d2cfce6ca3e4
+EBUILD xf86-video-siliconmotion-1.7.9.ebuild 251 BLAKE2B 0d70653297b3adf446a69a6b25fb58cdb9d397c3527dcea77359221e003615641e8f165e48b19c95746aad7861bab4b91ba0afacc222382343b727b470b999d6 SHA512 8def3850299ae7d4f06ff46620e610a11564ed70e40c5580f05317a85a43e7e35471da2f777868b64638141053ca3d2886b608301c71b53baae239df2cd7af84
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
index 9a9a7cda10df..ab2e1341ccfa 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="Silicon Motion video driver"
 
 KEYWORDS="amd64 ~mips x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-vboxvideo/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest
index a2a9c9acda5a..9356c6ce8814 100644
--- a/x11-drivers/xf86-video-vboxvideo/Manifest
+++ b/x11-drivers/xf86-video-vboxvideo/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc
-EBUILD xf86-video-vboxvideo-1.0.0.ebuild 417 BLAKE2B 4fadd4142eec7b2aedf457f85fdd68e8093aede1c1cdf881418f9e03f28ec8362bd9d77803b29cf206d493f4bda28ffc46870333ca8f06fc26a4726037196cbf SHA512 822b7ddab3eadb610d897a8bc6aabaf0701ded5a5e6ff5ab4812f520966afe5635829eb86898ca25d5be4d4966d9f9b5523f8048c6308fce1d751d6dd7229655
+EBUILD xf86-video-vboxvideo-1.0.0.ebuild 407 BLAKE2B 9f9d2637526583e8d896dbee2da602501e5f7f20e56ce476d73726e791f02dc560c80aae01bba847810218a8043caf6963127d256963cd49118270779e2f7a7e SHA512 8439415c8accea11eeb4170eb20a834cc526b11912381cf8e1e51cab2e5223c2ad1546d619a3bfd4eaecc9faadcea6bb3bb2e15be42d98f1f36dc56a71179fd3
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
index 53894630f774..70d157477277 100644
--- a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
+++ b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-XORG_PACKAGE_NAME=xf86-video-vbox
+EAPI=7
 
-inherit xorg-2
+XORG_PACKAGE_NAME=xf86-video-vbox
+inherit xorg-3
 
 DESCRIPTION="VirtualBox guest video driver"
 
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	!x11-drivers/xf86-video-virtualbox
 	>=x11-base/xorg-server-1.8:=[-minimal]
 	x11-libs/libXcomposite
-	x11-libs/libpciaccess
-"
+	x11-libs/libpciaccess"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 519a32e1ecda..7a0d748419d5 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
-EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B bafcf5a3d209a1eebdbccafe24a7d5bb89f9d93d92ede252a0c80a6632998ae8bd1f4d7fd4e948d9d6d7b5a363396a1b9cd33a6829c3d049e9b1f8dfe10bbb01 SHA512 1312c212e6bcd30bb746c254a88350945ebc808731e77a59168302d27685317feeeaa0736e2a430bc9ede34c262095f1d55f6f68b49957d613b51852f5f7120f
+EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B 8bc8a6804a7d9114d7732189eb9aa3d22d9e03d47a2f98c1140cdca020331d656d259006551620f31491407d3fe4a44d0967ddf2440d052ab59f9fc8e08bf6ca SHA512 a570e0831e74b08bb29ad5fd1a7c88ebd4b662daa49ce48ba24bc542f1bdecf215604b75f21771165eaada4448d73fb1d16a653f23d418b765bdc5bf627fae10
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
index cfcb0e76de79..d08ada7668f2 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 XORG_DRI=always
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="VMware SVGA video driver"
+
 KEYWORDS="amd64 x86"
 IUSE="kernel_linux"
 
-RDEPEND="kernel_linux? (
+RDEPEND="
+	kernel_linux? (
 		x11-libs/libdrm[libkms,video_cards_vmware]
 		media-libs/mesa[xa]
 	)"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 94c73073ee73..1c8c638f3cfd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 28aa68ca8c97..6fe9a9b0c15c 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,5 +1,7 @@
 DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4
 DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c
+DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41 SHA512 1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3
 EBUILD c++-gtk-utils-2.0.34.ebuild 746 BLAKE2B dd431696a569a2ac39d9d8d4bf2a750bcffc2fdf7ea4f40e82d88c557a3f873eae4545fdb07c99a2155e07df9741639c8a1d07a8528c6da0740b096062bd723b SHA512 08807c989f800413730a0591b1803c6295a960619eb5af48f4deae7b1da70d9d6aa2358e8329e7e1ae2f080ca7fcbd3831d1f4dc91e1cdb93515482df9f30d8a
 EBUILD c++-gtk-utils-2.2.19.ebuild 746 BLAKE2B 7e03e1d22caa067619be45fe7551551f34969f64011b25170f432c00f621e6e63a2a82b703b73ac715b43db3c78468574f8f515118cc2c030a610d073cc4112f SHA512 680c25fc481028baf29f172274824cc5960c13fa0e5be9ebc5ea95cf6e3e9dac8bcdfdad329e9fdfd1494b5fdb26f2cbf709d1e4088c6b8f73cb7b0348ec88d8
-MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
+EBUILD c++-gtk-utils-2.2.20.ebuild 748 BLAKE2B 5614bd2c8872e1964c91ad5f1a5ae7686f2d4aec937bd8b9fdf5df7328ab795a313ec4bb4c08e7ab1d2a6cb3bc26f1ebf5be52452068c60fd69891436eef711f SHA512 7292990a733375947a06dc28f00b8a887e4e74204edd5bfb2a530179982b1f02767f52204ed82716a7db6645c8fbdd050cd1ef4c2692d21ea0f9a59650b58480
+MISC metadata.xml 435 BLAKE2B 361605abaf7edb08f9d13c55f070ab30f3fd5fd49668ac0010e87d32d338e485a78aa2136728ef5935bb1f01ad79ded96fa97005cd11517f6a5aa493b828e419 SHA512 250f66f08fa7b4644cae285f78156ede515132f443ed591843a1d1bfa3e8b8e3739de0085732341d6464d9dfd9663acbe047c337c1e4483d9a7185779eb374a4
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
new file mode 100644
index 000000000000..40a1c6ed5a62
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit virtualx
+
+DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	gtk? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-guile \
+		$(use_enable nls) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 9378e9d7e25b..4213bf121d9b 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
+		<changelog>http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index d3d4e099f166..be969714353c 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -2,5 +2,5 @@ AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc
 DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
 EBUILD colord-gtk-0.1.26.ebuild 1653 BLAKE2B c846669f9fbf6e1a563437112243ab6fe96cbb8524439f3dd788b825bfd0b15e15600399a43661b23291afbefb30d53035c65a953c66febd939ffd2561306212 SHA512 bf9c41a78a92e03e9e7f5570e9a3ca0a981b499a87a6d62bd31e6b8f8a4bc7066697fcbad4cd13712c9675fef547b776574e8f4182e495ae7afaaeda08dd7694
-EBUILD colord-gtk-0.2.0.ebuild 1307 BLAKE2B 2d1373246db219ccc8eafe4f9143540f59b13446a2f2f312b696b1842f09f291e57863144405a150a69ab4a70fcf6771bba946c4a65f40b3721bcafd33070c91 SHA512 3291fb6230c06b57d385eeb824f085f5894d5c9d4b1058c6322e78517eb1544cd5cb38c098cfc58cd26aafa3175893a9cc54ab63b0b1531b56f33f20d5b44486
+EBUILD colord-gtk-0.2.0.ebuild 1344 BLAKE2B fc88042c54130cedc36853cddd02445657e0bf35c2c47989768b004384dfcf03f234e66bd7844689ba3982fd476ff9ef6a1b9ef556ad5471ce74ab4b3aecc38a SHA512 3788fed631f85c9ca87c9bc7a8002259645658f357e2e9b67c9faf1cbd5629c8c51390ad39b5eb6061643b17eee086bf2d6ced925d69449058392f5ff3e392e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
index 20f2c5322418..4f5d8d29d964 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9
 	)
+	app-text/docbook-xsl-ns-stylesheets
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	vala? ( $(vala_depend) )
 "
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index bdae18d786ac..a76b775d7e01 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,3 @@
-AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 538 BLAKE2B 50f8f178e5b97c2c54636bfe82a89cfc2274d24d9671a554d3214a7800e7eccf0fe929bb71e737f85aa7f39a078eba4c0a8059d3c686af30347e4f6e60c25b0a SHA512 9de8fa442bc1de861dffb6ee378ccf323f189a1056a027a52aa444bf31dc174b818dd0dbe68af961c9d13cbafa3f6d82c658dc15b369e2e4d36278088eace953
 EBUILD fox-wrapper-3.ebuild 550 BLAKE2B 6b75fbb550f8f0c9da9c21619d55f0bf2dc51e4fdb575b0246e7bd3f1f6c419b5c00cb5250df6c4bee3303ba294658e297664e94b68a60fd5ced5a84d5351584 SHA512 d218ecbaec29a6018d00a666679e20ff98c41a512af88a85de5fe89af9f94729fe5512b69e71b14ff0cf67a3d05943b024f966c618f15493f17898eadbcc37d2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
deleted file mode 100644
index 19d09b5b9ca6..000000000000
--- a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
-#
-# Executes the correct fox-config version, based on the value of WANT_FOX.
-# All versions of fox after 1.0.x ship with a fox-config script
-#
-#
-# Stable branches first, in descending order, then unstable branches.
-# After a new stable branch, prepend the new version and bump (or remove)
-# the last unstable branch
-#
-vers="1.6 1.4 1.2 1.5"
-bindir=/usr/bin
-
-if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
-	echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
-	exit 1
-fi
-
-if [ -z "${WANT_FOX}" ] ; then
-	echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
-	echo "             WANT_FOX=\"1.2\" fox-config $@"
-	exit 1
-fi
-
-for v in ${vers} ; do
-	eval binary_${v/./_}="fox-${v}-config"
-done
-
-#
-# Check the WANT_FOX setting
-#
-for v in ${vers} x ; do
-	if [ "${v}" = "x" ] ; then
-		echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
-		echo "             Valid values of WANT_FOX are: ${vers// /, }"
-		exit 1
-	fi
-
-	if [ "${WANT_FOX}" = "${v}" ] ; then
-		binary="binary_${v/./_}"
-		binary="${!binary}"
-		break
-	fi
-done
-
-if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
-	echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
-	echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
-fi
-
-#
-# for further consistency
-#
-for v in ${vers} ; do
-	mybin="binary_${v/./_}"
-	if [ "${binary}" = "${!mybin}" ] ; then
-		export WANT_FOX="${v}"
-	fi
-done
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${bindir}/${binary}" ] ; then
-	echo "fox-wrapper: $binary is missing or not executable." >&2
-	echo "             Please try emerging the correct version of fox, i.e.:" >&2
-	echo "             emerge '=x11-libs/${binary/-config/}*'" >&2
-	exit 1
-fi
-
-"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
deleted file mode 100644
index eeb9dd5e6bac..000000000000
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/lib/misc
-	newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
-
-	dodir /usr/bin
-	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
-}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 71e8b8ac49f9..e297126d909b 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,7 +4,7 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
-EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
+EBUILD gtksourceview-2.10.5-r3.ebuild 1346 BLAKE2B a9864ca00a2efd783c093c4842c86b3d8aca608926cc2cf1dcd6cfa41cd924e7a01907738fef31e913f508e062907a4f2724c3ede9dec6565d086e3234675166 SHA512 eb3e6a72c29af22c5184e8cacba0c50fd0100b03c27afa264cdd2a6ddb2e4250af5ddcc2a92f81e715adfe70ff89f89dca6cb9217a0de02deb0977bbcc844245
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.6.1-r1.ebuild 1741 BLAKE2B f5867f5eb784c3bf19117a5e6556146ecbd30b5d011bb84006a0a30252111654b15b6393ff07b0bd387c770207b196d9c19ed101f6e8559638f4df3a9b90bc02 SHA512 a44dcb68b000b6346f2063181f92591f00f7b065c6d5868e3c9fc8c11abe194935e9ae2a1d575b49213f3374be7d0c1cfacb8942621097eaa796e3e4b5ecc403
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index fda495015019..85b4ce8dd568 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-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="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 890796959d5e..655a07be54a1 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.3.ebuild 710 BLAKE2B 45b1dd1c312dd246d37050cfd29a2798f7783a6ccd229551ba69cf2102fe04889442f797b6118d64c67108d8c7bde896de6456ae5bb94f7c21067e9ac84f075c SHA512 a02f3b95e6fbe0e9ffa9aa34e2db3d51ff49bacb6d672d6b63da9a86aa654f333f89e5d47019d537dfda9e9f295972e6494e746277f17bc9e3c1a46a287ddbb2
+EBUILD libXaw3d-1.6.3.ebuild 737 BLAKE2B e7a9946155da58edbb71fe21f9496bb66ea4159f2024d154dc8b532abb746c37be6fb864c2b4ab1340f12efd7055c7d2142e09fa24b69b444137ca5635eef0a2 SHA512 0d144618d3b9d602f17069693863802e2eff73547231ae87b1902c3e23ac574ba2aa158ca68e7d8e2877d284ca84123a9b1b4a103fe8b4afd96911a116037dcc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index 5d7c268e916a..0cc685fca9df 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
 	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
 		$(use_enable xpm multiplane-bitmaps)
 		--enable-arrow-scrollbars
 		--enable-gray-stipples
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 48ef2980b309..9f1f09a817c0 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
-EBUILD libXaw3dXft-1.6.2d.ebuild 711 BLAKE2B f7df8b1cb6dca60d4689a6435630d4da462f5360baf6f7baf80a98fa070e771dafb6734e95d725e04449f43284e73093b2e6fd3fb5f745200d2175bb9ae1ac67 SHA512 3b9b0fb21387b68f302425e102a7be10a214918ad3751affa5cdfccd462d729403dd95734ab7b3d4bde0e9be459278ff509bbd7358b0c2b4cd187450bce6ed46
+EBUILD libXaw3dXft-1.6.2d.ebuild 737 BLAKE2B 7588db2950c7574fb799a1c067ba2ee916a28d473e1dae53f2bd942e437a3565028b3beaccd63a6e4fad7ff13d4f7fdbf71260ee8cc8b26fabb6bfdddb8a7066 SHA512 b2cacfb2d2dc7975d8f5e16b6391a32100b515e656947faceb42203d1455f5e8eec7648515ccf13007bec2b2d2db7db6596a537945b783e01a97decc71038fe9
 MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
index 705b95f8aae6..3523c3b1a0bb 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Xaw3dXft library"
 HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
@@ -12,24 +12,25 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 KEYWORDS="amd64 x86"
 IUSE="unicode xpm"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXmu
 	x11-libs/libXt
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
 	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
 		$(usex xpm "--enable-multiplane-bitmaps" "")
 		--enable-arrow-scrollbars
 		--enable-gray-stipples
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 6907597300ef..9b0835b1b3a7 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
 EBUILD libXt-1.2.0.ebuild 842 BLAKE2B d2f36c5d474d7327e45a55aa42420cc7b7a738b0bf0fcf5bf7cf5af0512ad61af5f33fd9c4091ed3487b0d1447f4467451f6caa38beabd625f25352c2e3b647e SHA512 60131554510d1e9f4e2231cf3f36b544586f82fe51e6df4b2e01cb22666be91c1ea89d1101c95cd9cfc8bca940b7183db05d38f2c9a6f38de29781f1bc224df3
-EBUILD libXt-1.2.1.ebuild 846 BLAKE2B 3af9219fe92261e95a017a5e9261fda6f466fdb7e7b3ec9baf65a88372b7b77900c5fdc4b60a1885b491846f44e4a5fb29f4d863c173cf41e25dfe44e142a620 SHA512 dada038b6bbba7287bde40c7db0579e5640bedcc3223918e44f5a71a3e6179785dd49c6e078b6114a390e4cf025db1a58bf9c7e3554b28fdcf57e8d1de3dbfaf
+EBUILD libXt-1.2.1.ebuild 845 BLAKE2B c52ea791bab6c6de589cfb1bfb5fbdffc270bad98d072aa34152f8b6d276b5cdd5fd84453282172ac293e701be0a91805075dd1c7cf7641046d9cf4d069dbac8 SHA512 71f778c0db75b95f9b81071dc3c990353ac65982380d330d1d3082b6c7c6c61455cc55ac2ee6b2ec1bc36e357d9ea0d9a24c2994186d53045b0fdb1fde5aa364
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index bc29722b0110..7d5ece5a1669 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 08190f8ac09d..cbe94dc7aad0 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 338 BLAKE2B e2c39fd4bf3f59e2444684e4f2182f620ba677dd9119a260bbb3cee86a1bca56efa880653a75bb85ce5537ed5670c412579d02bd6e3a56a50db9f836de3d34aa SHA512 4dfb235121b6b877ad7cf29ca2a865717568a0cdbc969c54fadc4e47bc14a24b2801f6864f8273db6758fe116a18e5ed9da063110eaa4fb458f94500b810ff3c
+EBUILD libdmx-1.1.4.ebuild 333 BLAKE2B a80d3a224c2f411d8ed912aa4510c0f5f60a85c073b3e322a3293ba62bb968895015b9b590a94c426c9b62a31f12a11d1eb92d170d4f1f0ce29dea587fe7cba3 SHA512 07ee061e326ef680631206c0675b4670ba70565411096ad0662a0a4a3ac2a604152481e496a648c1025221d082dac7f84092429f1fd1b262c5520f1323de1d4d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 5cae09487b70..4af9be3851ce 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org dmx library"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-base/xorg-proto
+RDEPEND="
+	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 039fd1b0a72f..7f893852cc3d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e
 EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982
-EBUILD libdrm-2.4.104.ebuild 1991 BLAKE2B 3e3b76ae35974371ad6739ca42784403872b99b2d4676ca31aab2b47bbe67a177b9d8af486af82c10e63f3d474be7ee787c04bc728d8a22b56d09899aade3b64 SHA512 a9a7c95d55abd926286cf3b6cee0f995c56ae6802e5345a856512e2c057585b744396caecb848018999da1bcd275eba3a4c0f33629e65e0cbbeafdb8cec5e911
+EBUILD libdrm-2.4.104.ebuild 1990 BLAKE2B de8b78f087a73a4e61fbdf65ada32592221b833676d7cd3d92ff8ef5604b3f0297c2fc1015f3f357c3137e96d951c7f491d7bc72749e0b7ac0cc4f77198f0b1d SHA512 93f130e657f603433283a23840593eb92adda3e1f4d3bcc02a59a655cf78cce8fe5ab4046f7506b13af4ee1eebf522d4c8102e0d91513de3724d2437f189d958
 EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.104.ebuild b/x11-libs/libdrm/libdrm-2.4.104.ebuild
index 1aada9fbc7db..c060531ec02e 100644
--- a/x11-libs/libdrm/libdrm-2.4.104.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.104.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 946fa81c8398..7e9ad5b11a5a 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,5 +1,6 @@
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
+AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-extra-1.2.5.ebuild 2520 BLAKE2B d97fe8205b11a21c621712132a8e326ae745496bc07f636d5b1078155f648c96a51f914834ce71b0fd27bc37e8b6ae46c5fc40dc17ce37c39618da9405160c01 SHA512 4909f6e472342410f30d1867039f64ffd62963687fc4a01ae110d2ba464fba16e6d64bc0c5e159732804d6f427b3a0493eb64ed91ca17159002d94fc50b5dce9
+DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
 EBUILD libfm-extra-1.3.1.ebuild 2539 BLAKE2B b954e207f3f82911839f57a5104b630b970b0945359d0091d3f546f8d21717cfd268803f3155f1a15b37855eaf061b9b55ac6683c23e0cfc10e586c3287a598d SHA512 4a743ba0be2b59c439e96c219b50db2eb7fa701dc88a0577d7de54f275b250e74ab897172b8191ef95e13285b35f94449fc8c422b9dcc6ca7606fc82af9f7907
-MISC metadata.xml 375 BLAKE2B 20d31a26454ffe8d7cbc1ff2fb90a432ac77759199c4453db00564d89c1516284fa327e67d6eded951a41d54bdbc12fdcffd702b7c98acb0d2dad26a07c39ad8 SHA512 291808293b725eedc1adec419b27b1053295ccf43ebbbf791ee9591633730fb05ff7d2add4bb4de34ba7361717241bb48a477cab0da17fd544da6ebffb1afcc6
+EBUILD libfm-extra-1.3.2.ebuild 2241 BLAKE2B e9a2096d9d9229832b9819d492587aca66d01f7f27523ff9f1e5afbeaac5654c802dc928c2ca2d4d2cf3352aa5d9f4778bf3541ab8f26925f42d2e4377d10def SHA512 1c0c4fcb266ed0a0c8bafb68d2c86337430daa919fd087d0f5baaf43a3be5775d1f9076f2fa876d3345cca70092671bae88e6a2b75854d72dfc64a5962bee8ec
+MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
new file mode 100644
index 000000000000..fd9a0535a4c3
--- /dev/null
+++ b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
@@ -0,0 +1,59 @@
+From a5cabf67a7460ce27c73e66c9ac98481c6cd1db2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Mar 2021 09:44:40 +0100
+Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS, disable docs
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 8 ++------
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 427edae..f5fd4f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ NULL=
+ DIST_SUBDIRS = src po data
+ 
+ # a little trick against gtk-doc is here
+-SUBDIRS_DOCS = docs
++SUBDIRS_DOCS = 
+ 
+ EXTRA_DIST_DOCS = \
+ 	gtk-doc.make \
+diff --git a/configure.ac b/configure.ac
+index bf6b07f..2f331ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug,
+ )
+ if test "$enable_debug" = "yes"; then
+     # turn on debug and disable optimization
+-    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
++    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+     case "$CC" in
+     gcc*)
+         CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
+@@ -323,10 +323,6 @@ AC_CONFIG_FILES([
+     data/lxshortcut.1
+     data/ui/Makefile
+     po/Makefile.in
+-    docs/Makefile
+-    docs/reference/Makefile
+-    docs/reference/libfm/Makefile
+-    docs/reference/libfm/version.xml
+     libfm.pc
+     libfm-gtk.pc
+     libfm-gtk3.pc
+-- 
+2.30.2
+
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
deleted file mode 100644
index 69258a65c60e..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-}
-
-src_configure() {
-	econf --disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
new file mode 100644
index 000000000000..dd331530d905
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="libfm"
+MY_P="${MY_PN}-${PV/_/}"
+inherit autotools xdg
+
+DESCRIPTION="Library for file management"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+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"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_prepare() {
+	xdg_src_prepare
+
+	# disable unused translations. Bug #356029
+	cat <<-EOF >> po/POTFILES.in || die
+data/ui/app-chooser.ui
+data/ui/ask-rename.ui
+data/ui/exec-file.ui
+data/ui/file-prop.ui
+data/ui/preferred-apps.ui
+data/ui/progress.ui
+EOF
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-extra-only
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+		rm -r "${D}"/usr/include/${MY_PN} || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	# Resolve the symlink mess. Bug #439570
+	if [[ -d "${ROOT}"/usr/include/${MY_PN} ]]; then
+		rm -rf "${ROOT}"/usr/include/${MY_PN} || die
+	fi
+	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+		cd "${D}"/usr/include || die
+		ln -s --force ${MY_PN}-1.0 ${MY_PN} || die
+	fi
+}
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index c46e9eb9b836..4281b89a0888 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index b82ffa37e0a3..748d1eed2b4b 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,7 +1,7 @@
+AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-1.2.5.ebuild 3651 BLAKE2B 3a5a6b83cbc6449e57ee866aa27efaee76b027849a4e8bb4ea310f5b3e427e7689a4e925a657200c7f9d581164dcd24b601203a5e948b7f52c4a9a7f5a0e0b75 SHA512 de52c77cde4bb2b336e2470864d9a7e817b4e9194cd776981c8cdd181bb9e2d5c734f874b5e25d134ef67cc9ed2ce6ef053e56bed52b41415522f991b1debf9c
+DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
 EBUILD libfm-1.3.1.ebuild 3580 BLAKE2B f98125bf71279106353c324e618b9e9c0293b26960ef85c070702063aa683bb10689aff7fb6819ec08bfc0dcea8d7c0a812a0a9dbed7bc741f1ce7dfa23af644 SHA512 f7bb2cdf588eaa9e76f393028330a7933569b7308f65c48d7fe86c1c0e6f31c5155f17d6e27d98f2600ca41415ac6248e47c7d8e4dad3c38270289c392dd33a7
-EBUILD libfm-9999.ebuild 3384 BLAKE2B ad18db8685c9b695490b2f22423c8513b9cbc545f212d7218ed3ed4ba6bfb64e2ae22bc2332be70a4430fa315e11e6ae5f701556e1d7007a6898f0dbe867168b SHA512 cb7d45eabf3084fb530ab1dd359bf1c91391e9dc699f0423a210d28e69bdd3e93617156028dd982c25decb6968b495bc828eb56fdf44971f28741597265d0d7c
+EBUILD libfm-1.3.2.ebuild 3345 BLAKE2B 487b03ad1e84224c412d4a453563fcfa2d107cb0e0a2cb8fdec8de67cc971a79b0c13d00294c9cacee3bdd0efac642d6c57c447d94a1f8a89bc19c71f5411326 SHA512 3fbab2ddc7f25b09ea4603cf55509b7ff84d0ed84650b5c45912e7a8646002d676bd49018a0edf00b0071a839a0b61ba4a778a8c7c6adb0d5c444c43fcc7dc30
 MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62
diff --git a/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch
new file mode 100644
index 000000000000..3b5f2b5061ee
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch
@@ -0,0 +1,34 @@
+From 5db9cb19a2b33c89255b8d483f42d5fc647df2c9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Mar 2021 01:20:02 +0100
+Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bf6b07f..181eed7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug,
+ )
+ if test "$enable_debug" = "yes"; then
+     # turn on debug and disable optimization
+-    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
++    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+     case "$CC" in
+     gcc*)
+         CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
+-- 
+2.30.2
+
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
deleted file mode 100644
index a94b843ec8e5..000000000000
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}
-	udisks? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	# Fix use after free bug, see
-	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
-	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
-
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild
new file mode 100644
index 000000000000..8bb9a86de8f1
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.3.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV/_/}"
+inherit autotools vala xdg
+
+DESCRIPTION="Library for file management"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+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"
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+DEPEND="
+	>=dev-libs/glib-2.18:2
+	>=lxde-base/menu-cache-1.1.0-r1:=
+	~x11-libs/libfm-extra-${PV}
+	gtk? ( x11-libs/gtk+:3 )
+	udisks? ( dev-libs/dbus-glib )
+"
+RDEPEND="${DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' Makefile.am || die
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die
+	fi
+
+	# disable unused translations. Bug #356029
+	cat <<-EOF >> po/POTFILES.in || die
+data/ui/app-chooser.ui
+data/ui/ask-rename.ui
+data/ui/exec-file.ui
+data/ui/file-prop.ui
+data/ui/preferred-apps.ui
+data/ui/progress.ui
+EOF
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-html-dir=/usr/share/doc/${PF}/html
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable examples demo)
+		$(use_enable exif)
+		$(use_with gtk gtk 3)
+		$(use_enable udisks)
+		$(use_enable vala old-actions)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN} || die
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h || die
+	rm "${D}"/usr/$(get_libdir)/libfm-extra* || die
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	# Resolve the symlink mess. Bug #439570
+	if [[ -d "${ROOT}"/usr/include/${PN} ]]; then
+		rm -rf "${ROOT}"/usr/include/${PN} || die
+	fi
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include || die
+		ln -s --force ${PN}-1.0 ${PN} || die
+	fi
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
deleted file mode 100644
index 559e07188526..000000000000
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/lxde/${PN}"
-inherit autotools git-r3 vala xdg-utils
-
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-KEYWORDS=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	x11-libs/libfm-extra"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/glib-utils"
-
-DOCS=( AUTHORS TODO )
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	else
-		gtkdocize --copy || die
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	intltoolize --force --copy --automake || die
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest
index 09d5c0d7ce2c..cf598bb734d6 100644
--- a/x11-libs/libva-compat/Manifest
+++ b/x11-libs/libva-compat/Manifest
@@ -1,3 +1,3 @@
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
 EBUILD libva-compat-1.8.3.ebuild 1991 BLAKE2B 7e0a7b2fb5f958320a270794e593ad3ae6c0acf934b471feea3753d9e065f5ff1fc705a60480e8d0b6458e994deda7df8978dd063632f7d23647b10f26c352cc SHA512 6c8eea6b2f6d66c342eacf31b15d78941026e4a24df64663f8aacad339dd169aefe9f71d9c6455a2315beef74a1ffff78a86bad8111c531ebee9cc3cd181aa33
-MISC metadata.xml 439 BLAKE2B 39b4502d38eb5d2f055a484224930efa991aa5c60960fa62fc64c9662d804c6b9b40bea27089a1b42452376e0517751d5ef1bcc81c512fd2d90d720e43b5befd SHA512 d54a22cf550c696c0078182457f412c0d8dfdf59e6b9a119fdcd629f42e75ffab403cb93815e9b184c5b388ae12d3b1c053119273082f549e440104fe9b2ae5a
+MISC metadata.xml 439 BLAKE2B 57fb312f206c07e728f5b6c591c83abbb5e881a409fd91989190237d8e803835af48f1a9860bf0b41777d47a96574c1164ef25ddd7ab4b3afd59aba3ec864ea1 SHA512 18884fd14172886b365c30633a20b262d13c2a279613be573425f9a3e88bd33b901e86af7d95693b4684ad2fa93ad269dc914b3570ea82c12185adf80a6d270c
diff --git a/x11-libs/libva-compat/metadata.xml b/x11-libs/libva-compat/metadata.xml
index 39b6984b394d..99ca258afefe 100644
--- a/x11-libs/libva-compat/metadata.xml
+++ b/x11-libs/libva-compat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 6135e6787898..d7702b878d28 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,4 +1,4 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.4.1.ebuild 1312 BLAKE2B 2631a8b68421c285c1718c381b58f88367893b72894033f75230e7627a36a027af5fc4ab10088e5f91eb2f5e837b52e90b8f2fe272f895b97d30e603b3181238 SHA512 d1e5af4a00a0adf6c1bb04473d6bcf72144697e14f5e59c7b82cb5da855083084a3144e4974633c4d8ce2630fbf110a496e296ef82c8f78b035bf550772c7993
 EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
-MISC metadata.xml 348 BLAKE2B dcf3a9c208ab7377f3e6e8fdb8e790f894cff749b32f5cd2840a2bb25aaa74ddb5a6260c8fa7cc332b8d49d3ab51277658d8a7d7814200839f9bd64f0d09ffc2 SHA512 438300201f9bef74270eff620b64bde08d4ad5952acd18adae4e73c20ee364e133f19fa885332aa1e14ae9a874669057c6fed8a10536ce5f9b2bc6c949da5ee0
+MISC metadata.xml 348 BLAKE2B 26d40bdce3aadf9278d1095b72b2d8e97e9a1ae3d3d5801a1d421d73ac3b50445579be814471b908f36856a34f9aa62d8d58acc93d2f6a62f8d60b9e0805cfaf SHA512 2d12ec69c643cecb50f2d0542f8b4104e6719d8b2613c3f99c72ca24fe0df8f20eca1e2cf1b53f98f1046c9edcf44095ddd965074ff767a718395389a1015a24
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 7949b9ce5161..66f13678f5ff 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 073f8e945825..39db7630766a 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -8,4 +8,4 @@ EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
 EBUILD libva-intel-media-driver-9999.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
-MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f
+MISC metadata.xml 616 BLAKE2B e47d0c35b3aca0abfb57bbdc677e7e7f3bb45d92fa6af6d894291b370032e5d15d324aed4fc2752eb810b0f3603410eee91b20f368d64304e35cc5cbd827088f SHA512 3a546df85f009136e8e36c20c38ed61be10fb198cb1b443ef7b1ce3c43957aff2490e82fab0052f24067ff642ea8dc847770b08914721724b36db639ab24e53c
diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml
index dfe0d9d8141b..7c456c68af97 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>k2k@narod.ru</email>
 		<name>Evgeny Grin</name>
 	</maintainer>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 58e76080e3dc..2ddd2a7e2708 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -14,4 +14,4 @@ EBUILD libva-2.8.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3c
 EBUILD libva-2.9.0.ebuild 2203 BLAKE2B f17547730d5133eea144d8e6a582dc180284650cb47b1e76926644f9c95bba1d5b48caf21df4172f6d288157c056ed9a7b1a9ea1204279894d1b95f63666f891 SHA512 5e7a024dd37094c8c9726c5907a9feffbbb74a81693ba475b892d9377c0f52b9d58f78aa16b6781fa49b96529aa84473145f395ce975f77e047f8365416836ce
 EBUILD libva-2.9.1.ebuild 2536 BLAKE2B c454fcb746f256f118e638307e8e3214f6a9120b2843e1583b0f2ac46acf2c7a51bed11d2b047408bcc056e124837a385abb53b1ffc1a2c0b9d3782e271ff822 SHA512 9d6df49bb14d1cdf943cdf62a0a86a01f5a803099b4675f60327d92d5786f37d2fb643ea75e060daea44f12c5e38426d425955cbdb45afb2ead0f9d2f4fb29e3
 EBUILD libva-9999.ebuild 2547 BLAKE2B a5ad3a164861a344fa5ac0c2bfb0da1a2701b2e72e90366346f3ad2f12f3bad62d00354f66fc8e26ca792d2685969c778073eb426001ac8bfdc8fe01eb0641d9 SHA512 8eddaef78665a1e99f57e53bebaf538e11879b8d1d320d7dfabdc923fbc4a4d3dc81fa5a9d853b1137b5212c9f77889f8f875f242f95076799bc918d5a31d3d0
-MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
+MISC metadata.xml 469 BLAKE2B bb59d0877431717ea6a387c793e39c1d810204f04619b92a9496f8d6e0f42f4455a54aae850da47b25cd133f97a9444043b64e46f539279325b806092c503d04 SHA512 e7ea387d560ce5b8e1b51d26e14b6ff8173e726124fb6d4e437ba3108f8d8f4c587730d9581e7a5ad8c844da9a9243cedbcc1ad554c724b4b78c3c7d2b70d95e
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 7f3149fdd2bb..7c9953aceeac 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml
index 875590a5fe54..33f939ef9262 100644
--- a/x11-libs/metadata.xml
+++ b/x11-libs/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria x11-libs zawiera biblioteki powiązane z X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index 32010cac4f15..b204d5fb5ea0 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,5 +1,5 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
 DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366 SHA512 7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
-EBUILD spread-sheet-widget-0.3-r1.ebuild 472 BLAKE2B 64bf85bd487ad0d34e01b8f27abbe8690c67a3cf42edfe3ec5b22b57c700bd75213723b094d41dbb4085309fab262a0167dbea4f6c98db54313dbcd7fea47ae1 SHA512 7724b9fb842137f3c01a20c50d02095cb7d38f6a647d774605e16661bc7fb018d99a438c82914e69cd55e92feb1145517e00af6258b20ab1aa4f56383ae10ed6
-EBUILD spread-sheet-widget-0.6.ebuild 474 BLAKE2B 3cffa9ca357d614ff54d2d281c4a9043d6aa366c26c1dff6184532f671c87979bbd8a1c6a64516c34fecb396b9dc92324a79cbd49099a255a2e536f141acf409 SHA512 a26c6cb70cef9279c222d177f893ef4f70e6ae502edda28f0251baee79fe752ea423e9ba93c0297e7d6ecab8bfb073502fbf471a545d2fa9444fa15993c32ed6
+EBUILD spread-sheet-widget-0.3-r1.ebuild 479 BLAKE2B 0f39da86bd4a8edfd38e75bc2b448e9a7add3b33d433ab0e7887cd7047e4d255d3b63a040d59ab96eefa3f05b261b1782b70bc4e150e979dcd87f1ae90d213cd SHA512 9d3214012b40635fa03de29679898282f0f5919128e9cd77de5debdcec87b39f52ad9bfdf93911944f276184ff7ada6fae028a012cc89ab0283b75f748bc56f7
+EBUILD spread-sheet-widget-0.6.ebuild 481 BLAKE2B 7720c8ec7517e859100b22149c404cc1d320cfe5099e19f1ebe9e5803db29913201750a384835fd83be005088e82c572a2b52aaa67e1e7a562d4f8f8cdeaf3c9 SHA512 9dfeee13140caf1ec0e493e07fe7dbb01439e5881d0b6492fd507b8f1f644d201662ac8a3b5427f12f01858d8392c3b12237888cec9616a1134eccd71d892944
 MISC metadata.xml 783 BLAKE2B 352fc49d73a0037151ccb02d9d14d03a9f71eddbdf1add8e7b805cf398fbe7dae6d7a6bd985ef84bc34092f0fa4fb525d6cc4ad39f76cfb5944cf9897b68568f SHA512 9bc392c1064f078db2e1356c0736db3660339f81d20dbfa9039f01f0e8907c660285ed5a8c98b62feafe2e902351d52bdc2bc2c6538c5f7c1c8e79cf08e5df83
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
index 2558d389b354..0069e657f950 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="GNU Spread Sheet Widget"
 HOMEPAGE="https://www.gnu.org/software/ssw/"
-SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
index 87e31eee3ade..83ccfcaab678 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="GNU Spread Sheet Widget"
 HOMEPAGE="https://www.gnu.org/software/ssw/"
-SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index b23e82d2ca3f..14f11e1c9926 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -13,5 +13,5 @@ EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee44
 EBUILD vte-0.60.3.ebuild 2202 BLAKE2B dda1b10be7bd337e1e5159cd251315d51ae3fd17be6ff75f82402a462d7491313919f563b6bf5702f8e7ac2ea4d58cffb6834377ac35e22a573084ba77dfc152 SHA512 7caacb773b7f53d311899fcd6f56171e3e96d5be3c997304c6e870d95d11beaa2ce0b63d3d8876713798648621bc46bd7b491a7ad40845ceec929befec41bdf3
 EBUILD vte-0.62.1.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
 EBUILD vte-0.62.2.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
-EBUILD vte-0.62.3.ebuild 2210 BLAKE2B 186a255da6bfbd4f4ad690d7bdf1348f0f0d24c1c08996a76d862182e29355966a984356e61479486248b167f7593968ce125c45bd6918a931f5c57946f569c2 SHA512 0e4c140887750ac550186037a7e5810f3beca42a08abc5825feea1a93b3920cbd098a08232a46bc9a1c8adab13bf41697857af3b1070919ee94635b96e9c6019
+EBUILD vte-0.62.3.ebuild 2209 BLAKE2B b9cec5efffc2410b51376973b6aa0cd7370a2802f19c1732fcd364e44c2998ae78466e99e5d07152d198d6de20c076bdc533bd3eccdb8e5d8556fe80255cb936 SHA512 324540be5c39a7968e7db00894801ad8b2888b3cf6225de8e7cc934e9c410adc40a162c52f15bfa88ef2f05ca6ff82ac14e6bd8171018ce7daaeb025516b0149
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
index 269a295cb1d8..e6c46e0c1d64 100644
--- a/x11-libs/vte/vte-0.62.3.ebuild
+++ b/x11-libs/vte/vte-0.62.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 92d669e25690..bd2fd750fef9 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -2,4 +2,4 @@ DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c0
 DIST xapps-2.0.6.tar.gz 231023 BLAKE2B bc3907966c132c683e75769f8f45839d45229c77933ef861f58b03a21cca15a4f3dd610acb6a19fc16d35ddb189340cdef80704e78c89a3e49659a2f82be121e SHA512 bac6e105e2b1e237958fb610a9bd697a023c10a45131da7dee984532986022895414d81849f53bc0007c319c2139c6d39474e2e7fd9ce4e53365517f4ba4f012
 EBUILD xapps-1.8.9.ebuild 2159 BLAKE2B 15accf97f33c6fdc424b7f2bdadf3687d881ae03b459ba8bcb33dd199bde4580c8cf2617c5064f8a9aafcaa7d4f3524eb0ff02b4036f6b82eb333f0b9627bbd7 SHA512 65f7c1e45bc3dfaef4246ba025b55ab3601af36ff3e3d4dfcdda108fa4773f7a7a3acffec2a4797b503a001b5875b6b4ec04ce7914192d0bccbe826c2e603773
 EBUILD xapps-2.0.6.ebuild 2142 BLAKE2B b477ec01e1f7c69ad79d5079fb4b702016cdf0152eccff268f3325b9757f55d871b9b7c5d7dfc1b22d53fa69f9f59417802c4e7b24e8854f61bb8228dc179a7f SHA512 1792bc42eeb66d69267a2d55013a6b2115c8795ebd82f805e125c0e3a4fcf5fbcd7293de97c6f9f540c467acdfd357a8a933bfc16d45b9a633f9bb1367a89238
-MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
+MISC metadata.xml 621 BLAKE2B 63fd7221ebf1855af42a8ef0271608d308826118b6b4198b026773c0f936ea5bbf307639f9c8d93aa23eb98b7b35c8d632f18e425b7922cbcffc204ca8ea7869 SHA512 92b3b883df66a337d4e24b2cb6a935bb637c9bbe9fe1e10c61896431f98d044cefc1de28bdf20b17669cd9f33cb3e0c3bb69bb495bdd25778a5c2278f84c28e7
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index 24251f3f0eef..47303987d492 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index c7e2dae224b5..0939594061f8 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,5 +1,5 @@
 AUX xpa-2.1.18-include.patch 249 BLAKE2B 9ddd35eefbcf2c2e538c78dd71047cd31ec384b9d4c394c0bb15a24e20baeed5d65c392fa430364d5ddd24b599d760869cfd45a1e72726b2434e60b5bb00056f SHA512 341980f141b4587e9ab6825976c302ec3d831cdd761fc52be13fec9736045532b7ff10dc9969d7cd2dbe631ba2e5d35dcfbfca5700c13e6a678df1c27ff7a540
-AUX xpa-2.1.18-makefile.patch 3382 BLAKE2B fda26e82e3179838cc79d97e469b85a576e9b43419de58238950ddbd10c34294cb84fe70f29d2a5bb7387d7c6677abf4f9a5504a47f48aae2bfa73cac7abcb96 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392
+AUX xpa-2.1.18-makefile.patch 4292 BLAKE2B 544ca028d44c5bc22ca90fc70d67b115b980535dfa4c15434bda5a021c1d35fe79b2000d64c23387e2b4595f46378f473e23a5283125044e01232057fcb7eaba SHA512 a416774e5d5ac329bf896fb1ead760b9c201e9385f6167f712730b991ce7a5cbf0b9622b4878f252c1524733012fc846bd824741fd170a3f0b2a95342dcbfdf5
 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19
-EBUILD xpa-2.1.18.ebuild 1221 BLAKE2B b89ecc8ef83feaada40d2ba2f8f65f225ba4bef9ac1498903f926a850aafcb3479615d0e94409f4d2c7a3a801603318eff8296ad98930dc4a540de18d4f49232 SHA512 f9a3717b05a948de728505db02d44b98904ea8d5dd898f0b59272dea986ca26bc84f5cf325d4c34f88430732c6ab9380edf9d3cbd675b629073443221893dc3a
+EBUILD xpa-2.1.18.ebuild 1247 BLAKE2B 5677baca53d968378dd5f01940a59eff6209675dff1671d8bb7954d8309c300ea097bed7ff25bc3666935e26d773d94ebf34edda4ad27ef190f6468360b4b6b1 SHA512 12c70596aff631bc9bcd788010c7a13ff67aead7beca75a83e368cb946c3ce30352012cacad521d46db136e3e0aa6c9e82cbfc7fe76dc027937f8c2a823ff543
 MISC metadata.xml 1072 BLAKE2B 41e28666089a2ea7fb726abcbd92cacee49dce705d193be11e172bf90072429a8d97059682ca5d8d40fc8ad36431e07ad5c2421f6c3d77b6d7861ce3e58e7875 SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7
diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
index 34aeed5b39dd..1ceb29dbfcb2 100644
--- a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
+++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in	2016-12-19 19:21:28.566222982 +0000
-+++ b/Makefile.in	2016-12-19 19:23:23.795246443 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -28,6 +28,11 @@
  
  prefix =		@prefix@
@@ -37,24 +37,33 @@
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@
-@@ -177,7 +182,7 @@
+@@ -173,12 +178,12 @@
+ 
+ $(LIB):		$(LIBOBJS)
+ 		$(RM) $(LIB)
+-		ar crv $(LIB) $(LIBOBJS)
++		$(AR) crv $(LIB) $(LIBOBJS)
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
 -		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+-		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
- 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
++		(cd lib$(PACKAGE).tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -193,7 +198,7 @@
+ 		CC='$(CC)' CXX=$(CXX) \
+@@ -193,8 +198,8 @@
  		-lwsock32
  
  tclxpa:		$(LIB)
 -		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+-		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
- 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
++		(cd libtclxpa.tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
+ 		./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \
 @@ -275,7 +280,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -108,3 +117,26 @@
  		cp -p -R ./man/* $(DISTDIR)/man/.)
  
  release:	dist
+--- a/mklib
++++ b/mklib
+@@ -211,9 +211,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+ 
+@@ -248,7 +248,7 @@
+         elif [ $STATIC = 1 ] ; then
+             LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
+             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+-            LINK="ar"
++            LINK="${AR}"
+             OPTS="-ru"
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
index 623d26c31983..984f56d2241d 100644
--- a/x11-libs/xpa/xpa-2.1.18.ebuild
+++ b/x11-libs/xpa/xpa-2.1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Messaging system providing communication between programs"
 HOMEPAGE="https://github.com/ericmandel/xpa"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-lang/tcl:0=
@@ -26,12 +26,13 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
-		-i mklib || die
+	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" -i mklib || die
 	eautoconf
 }
 
 src_configure() {
+	tc-export AR CC
+
 	econf \
 		--enable-shared \
 		--enable-threaded-xpans \
@@ -47,11 +48,16 @@ src_compile() {
 src_install() {
 	dodir /usr/$(get_libdir)
 	emake INSTALL_ROOT="${D}" install
+
 	insinto /usr/$(get_libdir)/tclxpa
 	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+
+	mv "${ED}"/usr/$(get_libdir)/libtclxpa* \
 		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+
 	dodoc README
 	use doc && dodoc doc/*.pdf && dodoc doc/*.html
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+
+	# no static archives
+	rm "${ED}"/usr/$(get_libdir)/libxpa.a || die
 }
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
deleted file mode 100644
index 1a17ff0dc9bd..000000000000
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="OpenGL virtual desktop switching"
-HOMEPAGE="http://desk3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	>=media-libs/freetype-2
-	media-libs/freeglut
-	media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-missing-include.patch \
-		"${FILESDIR}"/${P}-gl_init.patch \
-		"${FILESDIR}"/${P}-Options_Options.patch
-
-	eautoreconf
-}
-
-pkg_postinst() {
-	echo
-	elog "This ebuild installed a configuration file called /etc/3ddesktop.conf"
-	elog "The default configuration makes a screenshot of the virtual desktops"
-	elog "every X seconds. This is non-optimal behavior."
-	elog
-	elog "To enable a more intelligent way of updating the virtual desktops,"
-	elog "execute the following:"
-	elog
-	elog "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
-	elog
-	elog "This will cause 3ddesktop to update the virtual desktop snapshots"
-	elog "only when a 3d desktop switch is required."
-}
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
index 199878c516f1..3db14eaad530 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	>=media-libs/freetype-2
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index b01051a06b6e..e5654554d641 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -4,6 +4,5 @@ AUX 3ddesktop-0.2.9-gcc4.patch 371 BLAKE2B 1932eda1b8881af868df28855b5ef9a6d6bb9
 AUX 3ddesktop-0.2.9-gl_init.patch 526 BLAKE2B 0a03e6e04fccc4f2f534ce893ccfe1fdbc12af45029636a45a489405b31f18ccde44d03b91ed7df896b60a143ba24a588119d003fb3094b15227200340dfaf1c SHA512 2f7ffdf022ec2eeb1b06933e09922de6856bfc4a4ee0fdb0a4ec2ba2623a8a50a0adaaa87cfec9f90ad24a1436051fdbcf340664f6458be26f119c4d05d4ce7e
 AUX 3ddesktop-0.2.9-missing-include.patch 189 BLAKE2B 7f03939469403fb175a998846707cf8b16fce8300ac4ecf764fbf9e91f647d8af882ddf5eec2e4c6f4420c719f43719c5c7c654f81a57a2f55e2091827c77cc7 SHA512 6ba19f2a760de39a38ad774b9a932d1fa1bca1193707bef5e269c16353df9b8a25cf6d6d3e39e2d3b354125f266a6bf553695b8a9f8475ee3ad247b3e60a4fde
 DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686
-EBUILD 3ddesktop-0.2.9-r1.ebuild 1401 BLAKE2B 29e9e0c14af1052ffa1e1168ebf29bc62b9441f7a5d627dbd6676a7131b76e1ac0a5a9b86ef2ff20a2d9863ef0e430cc2641e145f8d2c720506c8c22a6d3c5d1 SHA512 973c111336337d85b2172be8af48e0f7348a538f6ece36e2c58aad29960ffa8bf800c51ac8d5c28021b630b8db2b929ab677d6535b0c0a7ffda082ef148a7226
-EBUILD 3ddesktop-0.2.9-r2.ebuild 1404 BLAKE2B 738008785514fd7b83f14ef18b308a949d189bef344129fa147b8c62d14c5725dcf209f272ba4041481050fe0d0da235bf22c28c00ef1f4cdd1624cd9b195ed0 SHA512 34f1990f5e99465e7bb7e7d1f4dc60a7dae904cf0385dc06637dc1f15d1d0c681fdc98fb3b40de8b9903a0675935dadf02b72cc45aba464a72256fbbf8f03df7
+EBUILD 3ddesktop-0.2.9-r2.ebuild 1401 BLAKE2B 6e5841c65157288cd86a758c07263325e3628e1f62671297242accc26f0d78a56bd06fe92383bdb38180d8774f47e5d267ce7f5be4b0ed4a1850314376a4dc42 SHA512 2fd73d8085c762d157b5a99f2ca7e8e04e8a585434ba6b77548b8bbb0dedf83e8bec41b7dcbb1f1715abad4e6ac545176351d0ff87bee390dd23d42c5339fdd7
 MISC metadata.xml 624 BLAKE2B 84edac86cf43f84b298a8c2e74734f38abad81331971a1e343794f2fbc6111b74f3868bc5b489702cc09133d2408fb0c618b731296dcf4ec0b07f491cdcb1842 SHA512 d59884e855a755ca70d9800007b2c73d32f6607bda8bb9f56c12b0008e5f2bcd58f77580da039db6a1c4f43458922b0e7324c0459c8e8eb2fca8634f054a95b3
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e0420d870416..ed4bd14226db 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 55d04fc78e15..484b9f32fca6 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -5,4 +5,4 @@ DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294b
 DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
 DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
 EBUILD albert-0.17.2.ebuild 2797 BLAKE2B d1f12440c3a672c02daba3f2bdb54d54822e78b6dc80bd83b47f47614c5d52d864547853df123b80ceaf6afaabbf1f1ace0dc44cc4bfc585e7a8a689b4b5dfec SHA512 5caee7a51cae769f9acb510bc66d2dbfe310b3be02146c3b5b2cccd1786cea484c0daafa27b49d9829492459b70758a669748a9423f2694949eaf6a97a466549
-MISC metadata.xml 745 BLAKE2B 7b15716f944a6712c6aa1afe34307ca1bfa8587150df5e71d2af0b8fa96b95cea669c8e1b6c7af75667f44035869e8f8f7674837660c094bbd6e1e710940a095 SHA512 573c724bcc935bedca3beba49c89b214d54f690f4d56df73d90f9dae1a2f80f72cad75d4dc4a9166e33c71ececa571db016aa17170d3c6b864288eec9bc85a43
+MISC metadata.xml 775 BLAKE2B e5820e089d34902b23b8dc60338b236602c0e50be4d0d94b42410b2921b9711976146281e1e758f876038a3258f261128d31806df99e9680e0aa465c2d61c518 SHA512 55371969255cfea4e69ed92f31ab31607f249e3bacb6176afb6c0d61c75a866f3b788f5d9c076e787c89ff4c3cda71f07e981c995ce80496434442ad5f96547e
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index 4afe47b2ac84..515bdbf42baa 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index f87c31ae2664..0c01b72854e0 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -7,4 +7,4 @@ DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e
 EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
 EBUILD bumblebee-3.2.1_p20210112.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
 EBUILD bumblebee-9999.ebuild 2199 BLAKE2B e19016ca68387e551f0694b924217680f46752f81e6fa5126b14217c33f0dfe29b41fd7d8555ab05ef69a11c31aa94013f6d705538002d3daf80c4afad36b36d SHA512 a483f2303cba245bbcc94d8cf984e606539ad200d7db9bd53e36152719dc9f64038b2b4046ca7121d8db0af4f1b8400c1e006fffa17e0cd75c5dac7065555f9a
-MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
+MISC metadata.xml 1141 BLAKE2B 441886a10ea50d12e995e2de4dce097741958d7dd88396f670249dca04c9441371e46bb2a8b39351351d3e7039ad4ea6389c004a76d82ac792656c2e9349e49f SHA512 6d530cd8b214a7c5b9c2122bcd32e4f3fb2ecb8fb0411a0527a21c0683982d19916a4f4ba75bcbb23527192928f49b691a99f563d9d6f974208b3e9608abbc50
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 00460ee5c462..33a45f6774e3 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -9,11 +9,11 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/cairo-clock/Manifest b/x11-misc/cairo-clock/Manifest
index 504279a59409..d025e1f476e0 100644
--- a/x11-misc/cairo-clock/Manifest
+++ b/x11-misc/cairo-clock/Manifest
@@ -1,6 +1,5 @@
 AUX cairo-clock-0.3.4-desktop.patch 599 BLAKE2B 093c409f14c171246dba3f6ac7a39066af78271c3ec5b96f205d573f49cd1a40966509403f0cdfdff0e25a473fd116be18150cf4071996a6cb47f56d567a006e SHA512 f0dcf4dc5baed7969f7515bda571a6f40f8ed8a365c665d0553c73b0224c47c64626f37ccf3a543db88d4b3f494247c86a761bd2b68b8c33f581fe26867c3577
 AUX cairo-clock-0.3.4-linker.patch 617 BLAKE2B 1f7c5de0cb985da7f404754bf522f677ac6122761b4cc69fdd47684c1734080e16f0074cc4408c3291b2369b997f38603cb756a06b0bbd311dd1a697e7556dfc SHA512 7a5f4235fbde60a932e26fc8ad60dce20f2f64ee53a1ecc3ebc7437225432d7256d2edd6d7b2a10cff31fefd6a94329b7516ba4e6202aa4c8b6f857ea19e9a64
 DIST cairo-clock-0.3.4.tar.gz 832968 BLAKE2B 93d4acb621af05176cb19041872aeb0da563c3dc37a660c8b761a31f6bab2809d23b04bfbce88e904427430a5b80337b28a04ff1f20ae94759fd3a507a1c9cad SHA512 b26c3005d4e2b22dcaf6967b8892630f5fd44e366b7482f374ea6215ca8863cf1b3f489fe2279eab73dfd4aaed1793d753e84fe4c929d105a6e97cde6da6b628
-EBUILD cairo-clock-0.3.4-r1.ebuild 702 BLAKE2B 992e6a9934c213c22a9ae605ff15d5bf581d025d9ebaac8ffae77e73321db9eeb0df9f3341b9e9482495678da4d48fd9f10f8f5393565dd6a5c0224121a51fc8 SHA512 80a18e5f6319e60a5e977e162be90c32f93c3c83a0071dfe933a181e55db072aa7f2facc206b08c82d216f9f09dd6c557efddce8fa1c54a6b800d4166e90a9c9
-EBUILD cairo-clock-0.3.4-r2.ebuild 793 BLAKE2B d53d216d8b07ddd3948d1c59745298791f705169650ae1a306422a7b56920b31c613e8fd12e784ceb647d81289dded943da8a1c939971014bb66b96026a9256e SHA512 39212452d53d8faac82c2f306538e8e667d21ef540a270d1b5ade6ac8d9aee9562400af397b596fa279e56b5eecec3dc688a0274b90f2ef026666a140b7b639f
-MISC metadata.xml 355 BLAKE2B 5e1068bc4b2d05c9c2f228b1117cf74043e75692749c37d6304bb13b77fbc15472926e2c3f6fc374bf6b9b637c6920c61ec3697b8fbe94441adece973b065b47 SHA512 8d3c73cf909e4efbec6a89e44cb80dd5e6d13d0c15b4c5de5661ed5db8a6b775d6196cddfe4a53a63564578da7bf10bfec0638aa8afe884c836cf2c85da10641
+EBUILD cairo-clock-0.3.4-r2.ebuild 792 BLAKE2B 59cc29929bcbd3388bd398472ff92997ba026aa5fa2f3b8512600c40acc6454b13006e50b8f1747d04a423946a94c2eab101ec4db6336debf47232969a8f2b83 SHA512 14f8a51a6cf28a72aa92b2cfe277ad8f3bf0f8d9765a4e125e2bfaa03b759c4a9875ea6fd80e84aaa9523d48ce9d470d6f32cbef498c17d13cbd76173ba764da
+MISC metadata.xml 355 BLAKE2B dec08295b25f68c71d50b0617d7d0a25f44f5afe0847a4e39f38b3eda588baf011277cd2153537769bb90c6067dce8715ecc0f165d6852b8b721ec4712228034 SHA512 fff5def31156d399b59d0ec57a09d7cb85f3b9f7148dad1b5497f1b4bd018cf9f5ffcc3bb84145b5bcc86900c8e168e67f2a73dbf2df400bb79364511cc9f481
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
deleted file mode 100644
index 2f6adc645265..000000000000
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="An analog clock displaying the system-time"
-HOMEPAGE="https://launchpad.net/cairo-clock"
-SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.8
-	>=gnome-base/libglade-2.6
-	>=gnome-base/librsvg-2.14
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/pango-1.10
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-linker.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
index 675a9bf64b02..c0dfcca3fb9f 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-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
@@ -10,7 +10,7 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.8
diff --git a/x11-misc/cairo-clock/metadata.xml b/x11-misc/cairo-clock/metadata.xml
index 006499a6c366..37ddd308f71c 100644
--- a/x11-misc/cairo-clock/metadata.xml
+++ b/x11-misc/cairo-clock/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
index 835ae2be8fe9..b96f89317763 100644
--- a/x11-misc/clipmenu/Manifest
+++ b/x11-misc/clipmenu/Manifest
@@ -1,7 +1,3 @@
-DIST clipmenu-6.0.1.tar.gz 7219 BLAKE2B 85d61c34e3b964e0a39051a1443b1498fedab1f5b45c61f3a8b6c0a63058642ff4fcfabc7d4913893320b5196edac2c5a9ad5a84b71a9d2191a3e147283a816c SHA512 0c91ad3a873081a6f9abfcc7a4a9be7cbd4ca5017f447dac204042ae3f051c550111c73d9d06f1d2a7a6783cfda631154373a932ea40315e72907d52120d4801
-DIST clipmenu-6.1.0.tar.gz 8711 BLAKE2B a37f0f52343a4f22fdf4a37a57a2c715edd47aa1b77c90cf95f9af11a8107967eb24410ed43cee52ec5db5a1276c5e9bdf082668795f3054840b4f30e511ac55 SHA512 1392b08025b564dc17ca44e43847fdea85886b89fdd5426635c9c16d204610c6a9cc19297a20cdbc2eeef2c878adbfe994a2cfd05176457ca6fcbc75bc036acc
 DIST clipmenu-6.2.0.tar.gz 9019 BLAKE2B 2dddd900483656a38b2335f994a46302af797b0f47509b0bd2c1a302e1c27729cd80091a4c8bfd587844f7ee8c271742aea668910553d9a4c54595d18e4f1ec7 SHA512 adfd649a120264552e2c05314ae2ad039055308f77d620dbb3fc206e4244a6f1f2e5ed4a7e86fd547a78692aebaec1761528e10408d838f80def99959ef58295
-EBUILD clipmenu-6.0.1.ebuild 581 BLAKE2B 1dc46e286767a05c5c0defe74bab3d4fd403915df398b724da0d603eaca49731f52a17b203b3377c283d5e231713d308c274c330794258cf3c15252983857dc9 SHA512 a9a25ec760f995d863f06c21133bed83ec95e31e4547d34ff0eb67af7e851950c5f232a1c30ba4bcc4e629319898afdc65eb51a8a51fa5169d2299a0b0603ca9
-EBUILD clipmenu-6.1.0.ebuild 603 BLAKE2B fedce7c991689e9e6a9e0d4f1bd604241d309bd921499752705d1b116a90d2052de491ddb6bf44f343d92d56a3086f5ef086c710f5edd17046ff8657baa06649 SHA512 5b6fb72b91e1e439e9ed821bf795234a6362b2a5aca6f528e74e6c2f2a99a8bc37f8c7c946e3ad5337165a7d0f97922318a727ac7860e1ef5c64791ffc5d7f48
 EBUILD clipmenu-6.2.0.ebuild 614 BLAKE2B 718594186206d77759521efc9875707c76676a57fca57f2b0debf5a361f3f55a8bf71afb8898c6c4d16f6ee347c6d5e098fe96151df9fa9408763c6e5bc0834e SHA512 84fcbc2540e6de8411e307c2f1b0656de44a7ec12950a56e2e384774bd53de3addeb0913d742e3c6e8e259cc485228b2222036748f07f96ede0e6594e2b46f30
-MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
+MISC metadata.xml 394 BLAKE2B b030bac97ac485c2d183fb4b800d7ed04eae3c990083f6ce267f132ad2f5ea307fcc5a89f2c630d525708975b0a1616e33956da2e9464b70c6fdd1fda1f76f18 SHA512 d2e3e9ea41e3dcf8c92b888cb5c9e71885c59e52d22f638d716b0024990bba643216d179fd45eb731a67ce02f5f0cae46b0349226eded6d1a729c8e1f0c0d6f2
diff --git a/x11-misc/clipmenu/clipmenu-6.0.1.ebuild b/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
deleted file mode 100644
index 08751d666899..000000000000
--- a/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Clipboard management using dmenu"
-HOMEPAGE="https://github.com/cdown/clipmenu"
-SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-misc/clipnotify
-	x11-misc/dmenu
-	x11-misc/xsel
-"
-
-src_install() {
-	local binfile
-	for binfile in clipdel clipfsck clipmenu clipmenud; do
-		dobin ${binfile}
-	done
-
-	systemd_douserunit "init/clipmenud.service"
-}
diff --git a/x11-misc/clipmenu/clipmenu-6.1.0.ebuild b/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
deleted file mode 100644
index 47494c5e02a0..000000000000
--- a/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Clipboard management using dmenu"
-HOMEPAGE="https://github.com/cdown/clipmenu"
-SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-misc/clipnotify
-	x11-misc/dmenu
-	x11-misc/xsel
-"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local binfile
-	for binfile in clipdel clipfsck clipmenu clipmenud; do
-		dobin ${binfile}
-	done
-
-	systemd_douserunit "init/clipmenud.service"
-}
diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml
index b99ff18165e9..ccbf7172bfe8 100644
--- a/x11-misc/clipmenu/metadata.xml
+++ b/x11-misc/clipmenu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/clipnotify/Manifest b/x11-misc/clipnotify/Manifest
index 6ad226269a6a..d1c9786e37bf 100644
--- a/x11-misc/clipnotify/Manifest
+++ b/x11-misc/clipnotify/Manifest
@@ -1,3 +1,3 @@
 DIST clipnotify-1.0.2.tar.gz 1318 BLAKE2B a418a1a25f43c033fd6457eabe926b0ebf911b233f9dd1cf6ff7a8399ab2660083bec969aef1f44edd583ee2cd1d097b71e7014b620efcdcb8c544a63612a17b SHA512 52277099d9543e0f550de63ff2e15e3e7ba63ea38f3928006e2b570bb1bcdd3f2f09892bd4efecc1f36fb5131e0567c28c2b0597123c90b9f78ab6fbd02dfc49
 EBUILD clipnotify-1.0.2.ebuild 449 BLAKE2B efb981b756d179a92db594d2e863fa750a69ba7e877f8a86d7ddb361ae0594cf8d43b3b70d1d31401edf48d1108417ba435c3e12ea0f87805a714d5e8e611464 SHA512 9c76a4dd4426af219705ada77c76ed33b1386410c1add63096a6d5beaac16482c3832be1aa39ab0d050d9a63f481526bae8cdec410aba74cb7748c07cef511bf
-MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
+MISC metadata.xml 394 BLAKE2B b030bac97ac485c2d183fb4b800d7ed04eae3c990083f6ce267f132ad2f5ea307fcc5a89f2c630d525708975b0a1616e33956da2e9464b70c6fdd1fda1f76f18 SHA512 d2e3e9ea41e3dcf8c92b888cb5c9e71885c59e52d22f638d716b0024990bba643216d179fd45eb731a67ce02f5f0cae46b0349226eded6d1a729c8e1f0c0d6f2
diff --git a/x11-misc/clipnotify/metadata.xml b/x11-misc/clipnotify/metadata.xml
index b99ff18165e9..ccbf7172bfe8 100644
--- a/x11-misc/clipnotify/metadata.xml
+++ b/x11-misc/clipnotify/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 047c648436f8..8199c24b8a57 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,3 +1,3 @@
 DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
 EBUILD copyq-3.13.0.ebuild 1052 BLAKE2B dd57b2a42902f3f8320a14df65c153db481807cf938e17f922876464b39dc67b0ccfce67a15a3b62f201b80b4f89923de9ed57a06dd4085b991ecfba4ed0a1b0 SHA512 cedc36d6c41c9f6cacc970cdb84023deb125d8e27be00ca70f76d43ea32b4b71f7be2e46461886f89ee2de2437a8ccbe367cf618fa5bf06d548087b6a43b2310
-MISC metadata.xml 434 BLAKE2B 0afbd9651727180ed25c0334b1922dbce24fb11518f72f63de24f4b5c86ff736a046607506b3e4bb2d1ee6c8320f809e1d650f55e7f736b33926539a1d3e32f5 SHA512 28a4d5ee65431e263ca600caa712b0c19040c5d74a8b1130098ddf8abf75105840ab0bf41d0d00af0910e8b8f4345ddf8c9ee54b4a5f3d57f82cf8a9f53b9e2c
+MISC metadata.xml 464 BLAKE2B 35156f9e0dec5d0b959fe4b0aacdb96a4139c4ce03bb64d8eb011969d2620f02408bff3491fb3fe194558eb660407b9defa8c5ecf6cadca874c02192ac0a2ea5 SHA512 89b14e66892bade6ce93c265e6fff917f4ded25d8d76824ae2adef7d6ba078cce9cd3f4490ee95b9fe2199b53e998a470e56fc145e3d6cb0ce9aaa4d6fc07fd0
diff --git a/x11-misc/copyq/metadata.xml b/x11-misc/copyq/metadata.xml
index 53ad4c8b06ad..680030e25586 100644
--- a/x11-misc/copyq/metadata.xml
+++ b/x11-misc/copyq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>onigino@protonmail.com</email>
 		<name>Gino</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
index 24ee60331497..57686a839d6a 100644
--- a/x11-misc/dclock/Manifest
+++ b/x11-misc/dclock/Manifest
@@ -1,7 +1,4 @@
-AUX dclock-2.2.2_p4-include.patch 208 BLAKE2B 36fbc6fc69aa0f181631bc8c9646daa74f9f055821434623c860e68106b794a0e5285fddf23facf04dbe5ef10a4d67927cc51fad2cba25c9e31054b4d22dc159 SHA512 13ba3f68b18396a6c85f3354a42ea1aab204cb8b3753261117eb17b1bbc2f449cc44c6d70ebfee708863986c294e9c7134348e23c14a14cf4074705ec0bfc39b
 DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531
-DIST dclock_2.2.2-9.debian.tar.xz 15260 BLAKE2B dab41f4fe79d2ce6ef4effb466c3923c77a94bfaf4b6ca1dde5bd9b92e0d9ff9a5d89dd9b569f831e107bb62de691e24661609b61af84d1a64958de34304f9be SHA512 025d1d228930adb6e2b13226188b6c3d37aef59786f23826f301c7b22dabba5cfc24f76347fe2f199c239daea968cd043293bd60524110235855cb77c9e4d1f0
 DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c
-EBUILD dclock-2.2.2_p12.ebuild 1348 BLAKE2B 4bd8d31c1c779aa0a639ae7f34e3b0c911d89b1a9398fa3d904764919968f2f866a0ea18a4f05b4c9f2bba0ec900a3faf202bb07025e9748c1d73bf47ab3304d SHA512 79c56eb76b42930b29cf76f08e580b50c151b6af0e70295940a32a795e90638764ea27fc76db0acf5de98496331a5d1016febbaebfddba84a34239f8cf484be6
-EBUILD dclock-2.2.2_p9.ebuild 1308 BLAKE2B 9a1ee50a0e05741ef300d13ec264101e6da76a0ed97d2049e37f66d3eda6f3a7238aa6581d434859dacffdbf016c1055fc0570980888ce4d6e415d27f8c09952 SHA512 cfc3a68312f6273ddcbe1d61dd8c5d890674b68b2f9ba6c1ef0bcfa1cab8cbf789252e8d9a2c120079710c7c5903b45c2842c6a45a0f48e97ab6d61906e4ddfe
+EBUILD dclock-2.2.2_p12.ebuild 1345 BLAKE2B 5e464a78522008e35879249bfd4758772adf30c7588eb76b7977c24794d96e7ed63aec59036639a1adbec6c8db9a42e241b5b3063582c58273cd66733568ce47 SHA512 742b0d2991741030fe3aa5259632888e24416c5ea5ef7bdc12db73a69d830a5ad0dd84675689bf9e30121f7e73e5408c6e4fdaa1dbcce36d9db59ac629ada57d
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
index 23c19ae370cf..f716d8cf1f53 100644
--- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p12.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="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="xft"
 
 RDEPEND="
diff --git a/x11-misc/dclock/dclock-2.2.2_p9.ebuild b/x11-misc/dclock/dclock-2.2.2_p9.ebuild
deleted file mode 100644
index 748340c6f6ef..000000000000
--- a/x11-misc/dclock/dclock-2.2.2_p9.ebuild
+++ /dev/null
@@ -1,72 +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
-
-DESCRIPTION="Digital clock for the X window system"
-HOMEPAGE="https://packages.qa.debian.org/d/dclock.html"
-SRC_URI="
-	mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
-	mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="xft"
-
-RDEPEND="
-	xft? (
-		media-libs/freetype
-		x11-libs/libXft
-	)
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-	xft? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches
-	"${FILESDIR}"/${PN}-2.2.2_p4-include.patch
-)
-
-src_configure() {
-	if use xft; then
-		append-cppflags \
-			-DXFT_SUPPORT \
-			$( $(tc-getPKG_CONFIG) --cflags freetype2)
-	else
-		append-cppflags -UXFT_SUPPORT
-		sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die
-	fi
-
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install.man
-
-	insinto /usr/share/sounds
-	doins sounds/*
-
-	insinto /usr/share/X11/app-defaults
-	newins Dclock.ad DClock
-}
diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
deleted file mode 100644
index 223cd9f55279..000000000000
--- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dclock.c
-+++ b/dclock.c
-@@ -7,6 +7,7 @@
-  * manager: *Dclock.seconds: on
-  */
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
- #include <locale.h>
- #include <X11/Intrinsic.h>
- #include "Dclock.h"
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index 98865ad00a6d..6ccc45bde426 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,4 +1,4 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
 EBUILD devilspie-0.23-r2.ebuild 661 BLAKE2B 71800ca4f4c9f8fc06b9cfa844c2bf50a71ce9cd7f00846e77b36bfcf2f5c8451a0fee642de7f56dadf853cedf3e122c72639cdefce5745d8cb9a4738cfede9c SHA512 4c2d3f2e705fc14205ae471cacc1f7630f7daf09ebcaad25019a2d95579e004e280fd16c5c0ba4335d80392c139d33745e8ec4b9f2b92fd59f93b817d80ee463
 EBUILD devilspie-0.23.ebuild 966 BLAKE2B 2aff3525074fff8cc2cf32360b776072e24567f35a6529a97418ab27102c718b000fdf9b49b30ca5a94c30ac33520ddad808e96d4980e4bb14e76d37b8d893d8 SHA512 399161cbecec1da3d68ec0ec9981558569d0425431b96418b4764307557354c96965c15fd16a8df49e13d8d06681c3cef3ddb801d73988824350cecb91056395
-MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
+MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index d91810780a67..f65b774ed444 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 9241ff1b6ff1..c671c769ea12 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,4 +1,4 @@
 AUX devilspie2-0.43-lua-pkgconfig.patch 545 BLAKE2B a2a13bf92fae1569d9bcc66c48d73a4c73f1780027df6df4726322c7a6897af1b5686abd122c2f097d360ad0a76999da4cfdc3cd34ae97d0fa339a6b5cbdf91a SHA512 1ef8fc079e8e6196029f302a77aa284341262212eec61a965554b43dc93e8f44b2f8b9b244aef98e7bf290068255b109262b86684abe447a76a1cd311c4752f1
 DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
 EBUILD devilspie2-0.43-r100.ebuild 1019 BLAKE2B 76bc48bd30bfaac0871a3ea97f9fc42284a98d973a418cb8e7465dee375821540750f6c96df041bbe1fbb9b1816384db484a710431ed293cf4273ac5f5ccc2d8 SHA512 7224b2ff7c486b604af6a278b81c5eb34295fa34cef95f99ab547372143ad1fecd0f2b6535ef0206e36d2150d2f93cfa4016f772a6cb0c3017ce44cf7247a8fe
-MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
+MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index d91810780a67..f65b774ed444 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index d9da47f3ba93..1bcf25cf27e6 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -6,4 +6,4 @@ EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357
 EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
 EBUILD dunst-1.6.1.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
 EBUILD dunst-9999.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
-MISC metadata.xml 531 BLAKE2B ee3ea89d78c72a65107549b543efae51493efeae741cdfc4bb61e10db1d1a4ef43d61453d44a8b44fc5d366b7795f3b7e7e5736fff4f8f3d98e71b5fc1e4975d SHA512 e7d15adc2506bc87f631f7d90dd3fcc5e8cafd69287df6518d285b487841f3bda286fb3da3717340a271532749af7605dc07b8cb65340bc0f5b154150c2ec7b3
+MISC metadata.xml 561 BLAKE2B 5e945d9c374ed86d48f7f5b1efefb11c8b12dff0c73b903e283f24c84ed698d6213d6b38a741272572068919583e3c87dad0d7e8f5c70a63be760cb6453bd403 SHA512 85eb2d4acb0da5bb6375a86a41861f6998db6c4a7f9c15fc06531a15cc25528b1b690768f258730edc88533df06680acddc453d194374c52d431339c6014bf22
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index 1472d6311cad..d113c2479997 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index c495fab552d4..33bdf44afa36 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -4,4 +4,4 @@ DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667c
 DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9
 EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
 EBUILD dzen-0.9.5_p2.ebuild 1565 BLAKE2B ed3b0a8e0e9934437d97dda7f518d9556ae81f18e2fb2ff743cd867aeb33689fbea98bf7e5f4dda77fc671093ddf1882b1b064171dd654a76965ed00e5e8974e SHA512 474536e097bb7d03e70eaa709b798bb6deb36035a0361fbf903248f7b6a6fe02dd871575d24a7be1a9efee03dca4f28436b9e66622a1e2e71db25817d08406c2
-MISC metadata.xml 438 BLAKE2B f10ab9d9e7e3fd4009c0fc7c7daaf3b08fd0cbf4c53e463d4acf7a401a911dfebec71d62dd985b99a19d9123f9c60bb7338b170c8493cfc71e6fb943fbb415d5 SHA512 7698619d1e49251e7d82e6489e858c5543828a87d5439d3cfc6cb190ceb5754adfc4602a179fe63a2fe96a913887418f3987b52895132b9d78ec61fbadc72330
+MISC metadata.xml 468 BLAKE2B 132771e69a56bf54111dccc98115c990cf86a5afeb0b7e58a7c57df2335c85d31f06cef1b8b9e82b79da7001333dec21f17a5288f81e8ddc8f29b61e4462f9ec SHA512 f2f15df231fb32da4fddc300da705241c88eb81ac61aa9c3d25765838f11f3484d6f1c4d6de8c2a9a77e0ec47b7a5aadf9a73cca1d480d7ece9853d5deb46e28
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index d2e640d185c3..ae6e159abcf3 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 1c9d0d381d6e..ff19b8f4b853 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,6 +1,3 @@
-AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
-DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
 DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63
-EBUILD efax-gtk-3.2.14.ebuild 1199 BLAKE2B 36a88b655703d690310c5c4b37113bf2d164d9f55608461bdefe18d01a7d03bfac1ed1cebba69501a678c9a1f90390e649946d79c255eda3ac419f4a33cc06c9 SHA512 99fe4a109e775b8bb3a5c4afa688ad59a7dac7f136a29477db06dd7a92929d4d52f3ab397d72a9a8c4aa3501d7cc098a5dc67bc913e28227f88e585995eea240
-EBUILD efax-gtk-3.2.15.ebuild 1144 BLAKE2B aeb18760930539ad906618917327ef72332d5f068a8d3abe3de1602ceca6dfcadc05454b1af0d4c9cdf9f912ddc072332993a1b2b7232c4157f9f9d0f0bec582 SHA512 77b30769cc8bf783d8a7923e9d18c84a4ce4526dc827b9cbb8993a2374452598def6790fba3c71d9fef242ea00ffa2baf8c3b56d92c44c1460cd998c924bae87
+EBUILD efax-gtk-3.2.15.ebuild 1142 BLAKE2B 2f8b7d232971d21de801feb977cd43ced1e8525ca70fd1bce1a0cb3804b3d3e4a27d9070c90d0b350aa879050351852320b3bf5bf6b465ed26f8bfb67906517a SHA512 73c0467d91a2133292952139f48119c981e1b444658716f037a240a55839f4edd7dbc9ed916c61d6c9daa041df3f7c2a7765068a0f7edd250978d4a0156f6226
 MISC metadata.xml 354 BLAKE2B c4168be07b9ff9bb2a00459999ce4cd94ce8a0e2da7253df4c3a9c2ceed596e46e589d508dd4b561869ead4cda8c503a88de2256eec027e95be4191c7fc7aecd SHA512 6b32fac40a7eeabdbc54a4416d05fbe7d516b95056d00b4ecf5f707a667b53994fe519f653dbc2c00b48354698602c5b961684f9cfa67e1e6bc75faaabf3941f
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
deleted file mode 100644
index 776229b9a314..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.14.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
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.10
-	media-libs/tiff:0=
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:0[gtk]
-	x11-libs/gtk+:3
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.13-fno-common.patch
-)
-
-src_prepare() {
-	default
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Categories/s:Office;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# File collision with net-misc/efax wrt #401221
-	mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
-	mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
-	local spooldir="${EROOT}"/var/spool/fax
-	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
index 1f8dcfaca924..fd4111a4aa70 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.10
diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
deleted file mode 100644
index 4cfd79afd164..000000000000
--- a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/efax/efaxos.h
-+++ b/efax/efaxos.h
-@@ -11,10 +11,6 @@
- #define UNIXSIGS  SIGHUP, SIGQUIT, SIGIOT, SIGALRM
- #define CATCHSIGS ANSISIGS, UNIXSIGS
- 
--/* Bit order reversal table. */
--
--extern unsigned char normalbits [ ] ;
--
- typedef enum ttymodes		/* serial port modes:  */
- {
-     COMMAND,			/*   19200 8N1, no f/c, DTR high */
---- a/efax/efaxlib.h
-+++ b/efax/efaxlib.h
-@@ -208,7 +208,7 @@
- /* Bit reversal lookup tables (note that the `normalbits' array
-    is the one actually used for the bit reversal.  */
- 
--uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
- 
- void initbittab(void) ;
- 
---- a/efax/efaxlib.c
-+++ b/efax/efaxlib.c
-@@ -48,6 +48,8 @@
-   return n < 0 ;
- }
- 
-+uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+
- /* Provide dummy gettext() function if there is no internationalisation support */
- 
- #ifndef ENABLE_NLS
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index cbaad6314254..ffb0ea721f87 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -6,4 +6,4 @@ AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807
 AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
 EBUILD fbpanel-7.0-r2.ebuild 1580 BLAKE2B 8be6ddb7d12ae057af8e3f37f915a68723809eecb59371b4fecc856ca31f4716e0bc52fd23d3fd0bdddb2bfd1a09fcfb03e5b41476d41a9de4764a6a1eca7b2e SHA512 551d8468b929e40e09e9fc9dbdc0347cac2616b4b1c4918cdd5aa14a1a7c69ce2ea70d9202b6e7661a6aedd121abe894e893a17e4a9fa41896d749cc723bfe16
-MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
+MISC metadata.xml 421 BLAKE2B f33f57d552b2410bf7f1f8295755f1c8fc6822497693be9e9ce0a2a9748d24c3dfe98f64ed1380398fa18b6fc41a205805f06113d59639e13277a9561ebe8789 SHA512 1df1dae010dafca7f9799e447f1ed629207ae6e0b35f79d823cfcde4d52bfc87d376d7576108d69fe6c0d5ad10930dcb8aa31cbe7e2b71eae0c3a23ed4e8c059
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
index 725beec5cb42..2e82215a4205 100644
--- a/x11-misc/fbpanel/metadata.xml
+++ b/x11-misc/fbpanel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index eaa3f4d3f7e6..c2861c4c2483 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,5 +1,3 @@
-DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1
 DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f
-EBUILD gpaste-3.20.3.ebuild 1462 BLAKE2B 4c08db2d5cf05e824dd0e380b817a439d3b807daf5f6f800b33a3b5a996dd6c76b645eca63e018b1a9a1681c7a80b7e0da17fe45deeb34df3d64c1e658dedf25 SHA512 1579bc767610f4acb79fb6657a5723bc81a59713ab2251ff5e90bbbf11facd4ed992c06f9f817d154d382ab75e3e25c849ed676d42cd646095f8629f3479ec12
 EBUILD gpaste-3.36.3.ebuild 1663 BLAKE2B 86ead7cb8147cb3aa16f295d260a645f96b367a2e528c394208a019532b8ff362a99e342411c943ef071e0aad53f8673b1d72ce37208d1cd833a59c8639cec4c SHA512 da84e0add550cec51df0b45d983e8ae5d7491dc3fa77eab25efc4c09e60cce67713bac488997a7036e7f1627213b3c1b2501460744076c82d37059cd42ac8c6d
-MISC metadata.xml 404 BLAKE2B b3bee2faf7f5e7ebaa212dcf5926437b55877bd5d9a3988db09c78411f8f24eb4c60db56ca4ea021c064ede1079f33598e096f8e1e793abef0a5c0aef27b0e82 SHA512 fbd89391c9bf83754466bd2d2dc590d819292eb1e2aa29d3c66e22c32c599ad0ccbeef93ad706326c4aa0665c5ca4448cedf5485694ae076a1b3794e5f33b999
+MISC metadata.xml 354 BLAKE2B a879cbc23f45be989d325daf60fc744b1adf04eb2061488e0194b82f99fb5f0a4eb7bc384edceac7339a61bffa2261cd640af4ae3664e479de44858efa53b535 SHA512 98de20a15bc8bbb282957c7fa6a26a8e0993e5c019d65434e3cc03ce8c8293d2e8d10c75787999275cdf964f94a91a999a0d28765b3eda42cacb37e391cd1fba
diff --git a/x11-misc/gpaste/gpaste-3.20.3.ebuild b/x11-misc/gpaste/gpaste-3.20.3.ebuild
deleted file mode 100644
index 01387a0ecc27..000000000000
--- a/x11-misc/gpaste/gpaste-3.20.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.30"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils autotools gnome2-utils ltprune vala vcs-snapshot
-
-DESCRIPTION="Clipboard management system"
-HOMEPAGE="https://github.com/Keruspe/GPaste"
-SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+applet gnome vala"
-
-CDEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.48.0
-	sys-apps/dbus
-	>=x11-libs/gdk-pixbuf-2.34:2
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	x11-libs/libXi
-	gnome? (
-		gnome-base/gnome-control-center:2
-		media-libs/clutter
-		x11-libs/pango
-	)
-"
-RDEPEND="${CDEPEND}
-	gnome? (
-		gnome-base/gnome-shell
-	)
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	eautoreconf
-	intltoolize --force --automake || die "intltoolize error"
-	vala_src_prepare
-
-	if ! use gnome ; then
-		echo "" > data/control-center.mk || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable vala) \
-		$(use_enable applet) \
-		--disable-unity \
-		$(use_enable gnome gnome-shell-extension) \
-		--disable-static \
-		--disable-schemas-compile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml
index b673fd439b9f..a8c9b40ff58e 100644
--- a/x11-misc/gpaste/metadata.xml
+++ b/x11-misc/gpaste/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="applet">Enable gpaste-applet</flag>
 		<flag name="gnome">Enable proper gnome support and
 			enable gnome shell extension.</flag>
 	</use>
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index 553bc7bd7bd6..3772964aaff0 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,3 @@
-DIST gxmessage-2.20.4.tar.gz 274356 BLAKE2B f3325f870e63429934514d2e1bf3debd2827591e776c43213aae84543623484f912b61f7541e37622a28b1e4dfd5044f0b85e664cae2cb8610b3f77c32a9f4be SHA512 43891fc44d9125921150f9330c7ebafd9086866bde27a635ef0f6b30f2d2fa49b01dcd9a6bf65d6dcdec11de07748993057871c77387f51894c150550e3c160f
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
-EBUILD gxmessage-2.20.4.ebuild 672 BLAKE2B 344b10d688a284f7dd9e3d5deb38604b4430382661191a267c76186848fba6ce30f0d8a1e8d02281ef5e6dc3ea45663c74dc634a7125bb8aeb52f53e0099fe7f SHA512 6ec50529591320c38091991fa9f8f30ed7f5ad02339b85e84e81d52ffe7785cf11018dc355d65a4944048e8fac0d220f0e8acb09848a504fc15f383e26a849d9
-EBUILD gxmessage-3.4.3.ebuild 867 BLAKE2B f8b771ad4cd8490bbd3bcb6ebd8a19847bf8c57a80c25ef40e5df2a9e08958aaa3be06dc2597bfa6436e971bba042e440a8be97a56c65b958fdbc3fbe53bfcdc SHA512 e35a84714028debd44d59ce5e54305a90a556d12af2dcfd5257b7a3b4081e02331d79ced5029c9e179148f2f207f3edbd49f85fc6ff9eb32458a0b9966c59a3f
+EBUILD gxmessage-3.4.3.ebuild 735 BLAKE2B f67b1db25b3b31b6765c6cfca132d82805adeb8732585901d20aef0f688658a8af0c63eecbba911679828a6e66edeb387c6c3d88dd71975f7f141d9fb2b5f881 SHA512 ee6565a2b88a5fdcecd0d6138b15462bfc360615998d2cc2c85b7fceb88eb798eaaf2b0b7b2b7570ba63e160b569164a3413009ddd7e53ab9d42f6c058ea3160
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-2.20.4.ebuild b/x11-misc/gxmessage/gxmessage-2.20.4.ebuild
deleted file mode 100644
index e02454624a6c..000000000000
--- a/x11-misc/gxmessage/gxmessage-2.20.4.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
-inherit xdg-utils
-
-DESCRIPTION="A GTK+ based xmessage clone"
-HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.20:2
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc examples/*
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index 48f933861c53..1bc2df08afe8 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit gnome2-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="A GTK+ based xmessage clone"
-HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/
+	http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	x11-libs/pango
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.40.1
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
 
@@ -32,7 +35,3 @@ src_install() {
 	docinto examples
 	dodoc examples/*
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index b76843e16d1d..ee4700661f53 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-disable-bash-completion.patch 396 BLAKE2B 1ed07e8bc335117e4dcbf048efadea33306575f706bb88006cd5528158ff9ddcf373202fa4f5d007de69d5694c3521137d23ae108b825123f72858fa4f3d724a SHA512 b388bbaf394f791f052cfe3cda97f9c69b36fe30cee3954df27888585285abe22c6d21d8d2f611467583581d153d00f55477a3458b46d9b741662ace16a00d5c
 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
 EBUILD i3blocks-1.5-r1.ebuild 633 BLAKE2B 6f8faffed53680ba459deddd5153d5acb43602c57cb6fac17400c9b2373e5b153d48e997944925c68824f9f008c4256930e09d65171b8d897dd7ec05b0d77133 SHA512 0ccd2efd114bb3be218a094170647048c417811727ccddba89e489e3bcdc82db3249a2461080133b09309d37c11a570c5e647a1e3ae8cd86e1cec0caf4987b19
-MISC metadata.xml 517 BLAKE2B 815d06199e095adf685affa065ac859489993b5d50e375f55b1fd07bd3ca87b8ddb7f1430165a6a63cf61687af7f5b73528271ea5dfd89e42a5ac7f025c0512d SHA512 4a8a2b029c9c4af79740990325ae978989c0a7623b235951f657cf390ed40051931bfd6763d6887c49c9ee6f3c84c8bce3e51083a24cdcb04422bb056a71bb21
+MISC metadata.xml 547 BLAKE2B 468d8463913aa9725c081b2c046b41e993c6003e2c2fd062b4f7ae9f13d848dbdc17460d05760810827b91f16ea756d25a545a61ba23c1a8ff52985d3dae7141 SHA512 a57511c3d807d6b05eadd4c31130680ccd60663ff8924e31aa7539922ed7a7a8dc3f687e80b6a2cdb2b648351e4b399f079b407ced2af5f5970ddcf1157cff66
diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml
index fbf0521c46d6..a717e8561b8c 100644
--- a/x11-misc/i3blocks/metadata.xml
+++ b/x11-misc/i3blocks/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 5e4e9d04dc20..dd920994de3b 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,3 @@
 DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
 EBUILD i3lock-2.13.ebuild 693 BLAKE2B d52e903c7bdc80e8add5d608392da3ec29964c70edaee54fcd225f68884156482d0094586e57f4a9cbd6b4057fca9993c559579bad4e6cb52c49926972e1e44a SHA512 ad8a941ef22b74bb307ffc4347ce8a72be740104ad83eee449a252b4306491d6435f92fe4be8b46460fcd4cec47f47da944a3f1cc4982d9bef81362cdfa48c39
-MISC metadata.xml 357 BLAKE2B 40dcfc882fb8c7149a23b006e6348eafebeb9da6895bc1f55b17c4a19c165cf336a28cb4695db0b7a794023a8b5758a59aeeb67e9e92998b83844f5bb1db895a SHA512 565f596c3057c2fde857dab1bc064bc6c040372f8898f021079a5f52264de6958ab4604a0dec7392de2e53c3a7142d922e80dc6ae52ad5c68fef99700678b1cb
+MISC metadata.xml 371 BLAKE2B b04850aa939c05c9838378ab56466f245e894ca74e6fb1802adedccf19cd34aa07bed2a9ecc16b0ba7c1b0115f84439fea88f02d9ace78fd239d23d81d205e91 SHA512 2663582751542ae8c76f54017aafd7b34c8d37832a54367240c0c64f6e72dc96f41654328e4a1604776e244b49aa6c1b6e97ac1d68a1fcbf4911c19b0ae6c164
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index d6036a612f2b..0799e01923f3 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index e164828016fd..3dd31fab5be4 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,3 @@
 DIST kapow-1.5.10-src.tar.bz2 834452 BLAKE2B 0ca2eb71a13119689ba878b6981bb66d26565035441f0a02d20097becd19a539742b37989543d18db6438f5cdccfa1aed1c698a94a0287b3d0b0b316cb9bd8b4 SHA512 6aa47bcf7ccb0a4c3dba4d675786ed63bd27ef7b6ed4d62074ae8409fcc640574d264c9c4952f764792b8280f11cd3a736f46389db2239b68589595e4424e518
-DIST kapow-1.5.9-src.tar.bz2 834677 BLAKE2B ed02b76e8c764ccf7f9fb752322dad61113c82348bc4e75af2858136369423a02114b312637460cfa1127fa0389f50ea951aed5e69b3e90d276aa10ea7e52be2 SHA512 a026b2254835b4eb2d211bb8b56d68e6f07c07beb79e2b019d2ce108b6197e812222b5964f889fe31b856a0081107f3fca314684883b3eb3f778f6fe7cceb0b6
 EBUILD kapow-1.5.10.ebuild 1270 BLAKE2B dbff8e11691da3a4be61bcbcff2f915298d6347f99d16549532066ebf66d624ecd7575aff4352b17e1a81e37340a82e57a4e623d6a48d36dc948b8ef25a835c6 SHA512 a52acde6460502f80e7edb343b4e8733da258dbc91ae1e13987b83b86ccd066421a5c261cf24aca6477f224befd10d55dd0b263d31e223e161f4c76bfc7cbb71
-EBUILD kapow-1.5.9.ebuild 1270 BLAKE2B e1ebe6f085891173ca39f0173eaa089245633f90b31bc0eea507a6b825ba910b23a39d8facca6f264579419cf49b5fac5e647da47461cc03a097010c645516d7 SHA512 43aeacbb55847320bd466e12a04a86b967f3f0b5e3d9b303a765a2cb7284d2177f7f41aa7f17d606ec29332f82caf039b2ff38137d53da6c0a24636eb98865e2
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.9.ebuild b/x11-misc/kapow/kapow-1.5.9.ebuild
deleted file mode 100644
index 82f1e9777440..000000000000
--- a/x11-misc/kapow/kapow-1.5.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="https://gottcode.org/kapow/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-K_LANGS="
-	ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
-"
-for K_LANG in ${K_LANGS}; do
-	IUSE+=" l10n_${K_LANG/_/-}"
-done
-DOCS=( ChangeLog README )
-
-src_prepare() {
-	default
-
-	count() { echo ${#}; }
-	local lang_count=$(count ${K_LANGS})
-	local locale_count=$(count translations/${PN}_*.ts)
-	[[ ${lang_count} = ${locale_count} ]] \
-		|| die "Number of LANGS does not match number of locales"
-	unset count
-
-	local lang
-	for lang in ${K_LANGS}; do
-		if ! use l10n_${lang/_/-}; then
-			rm translations/${PN}_${lang}.* || die
-		fi
-	done
-}
-
-src_configure() {
-	eqmake5 kapow.pro PREFIX=/usr
-}
-
-src_install() {
-	export INSTALL_ROOT="${D}"
-	default
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 411610c889da..d76513e3c7c7 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -3,4 +3,4 @@ DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398
 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4
 EBUILD kdocker-5.2.ebuild 1023 BLAKE2B d6820c8191514cfeef8c0c73682a939cb3efec366d4404a923a50072264c721e6514adf6f9832c9c23598ffd65f28202c8317a06e7b29c627d4afd4df0040888 SHA512 4d7d54c4d3cd5ec9b74b29946dd53c89b296b89c0edc95cd4002a3fafa08b7dd3702ac34982366dc50ea6447bbcd43ae8dfc5fe23384ce0ef7e54247e3587598
 EBUILD kdocker-5.3.ebuild 1073 BLAKE2B 1979ffc81ae80841482d2d3f0f93caec50328d82da0720f003aebde1091fa29915d98454347ba73a41c9cbafad4de0e3b4debdd310810aaa14f0a98e465498aa SHA512 d34c62df4bc2aeef10d8a2d0d3a0e60d9bf87218494edffb934f54f471868970490a48f150ecad1c6235663354897e15db88ab3e2d42d31d75302515783e56ab
-MISC metadata.xml 513 BLAKE2B 74790e6c3a0503c7092152bc6b74850ef0c2ae5fedc71a1ac887775054b5965a8c13aace575792488ee443552d17a5f2f5732d92255600a00082911857c9541f SHA512 51f230ff4133f037ad1d92a18224004d27d0382efe842cd9c3d012f4589c611f9788d333c5bdd33936964aabcce4d96d790a4045b6a3cbbd37fd11597a3a5ea0
+MISC metadata.xml 543 BLAKE2B 29912337b2e8216eb62b67316e13d83f153397b5b18d88292744d185ba12c3e292c3207f86aca2d5264f9dc23651b4d7af8d836e8a666cc2562ae317bbc20a15 SHA512 f2279ff58fb8c3a8a93b4b93796c4c996726c3460f9da3fbfbff60edebf5981bf0a0e755e078aaf456a20756d16d99b5563fe60984ff75559a9381ca441fdf26
diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml
index 99f3bac21a25..cb90f106e4e7 100644
--- a/x11-misc/kdocker/metadata.xml
+++ b/x11-misc/kdocker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>realnc@gmail.com</email>
 		<name>Nikos Chantziaras</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 65e6e59da1e6..08a1270aaf9f 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -3,4 +3,4 @@ DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae72206649
 EBUILD libinput-gestures-2.48.ebuild 1334 BLAKE2B 150af52798fa9fad1d4446221852a2ee1062aa3acddd146d2448e3f33c39dbd17787ef888b12c22a05cf903c87da2a94bb7fb97154d811dcf5e728093d7a7276 SHA512 b030bc7acbe902bc53dc3c2934ccaea622defd5abb8c4d6bda381a10d5958cd9f8f036a628fb49c558d55b34479cff74f2728c3ebbdd99dd9c4bffdcfc0a4349
 EBUILD libinput-gestures-2.56.ebuild 1276 BLAKE2B e2fb273e83cb986067bd22fd7ec3f724ed6c3927fe4ff3e0695272320eb5ede76c547cea5e30fc79b3597ad0762cb66702bca6cb0a6ad080dff5b66ff0143531 SHA512 a3827dbfd3160c6b24bb3fc5fee9988ac1a30e82c7dc62580ac5798076862c9b18748d2688e90447c5be6fe7d7f50ad39aaf9ae3004af0bcea9a0aa42e731057
 EBUILD libinput-gestures-9999.ebuild 1276 BLAKE2B e2fb273e83cb986067bd22fd7ec3f724ed6c3927fe4ff3e0695272320eb5ede76c547cea5e30fc79b3597ad0762cb66702bca6cb0a6ad080dff5b66ff0143531 SHA512 a3827dbfd3160c6b24bb3fc5fee9988ac1a30e82c7dc62580ac5798076862c9b18748d2688e90447c5be6fe7d7f50ad39aaf9ae3004af0bcea9a0aa42e731057
-MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
+MISC metadata.xml 855 BLAKE2B 7bbc889af3d1c5a5c25a6309ff30bc6ed0c8100443314a790895650b36e700a026a387db3200b63ad10b06ee59bdffd8be806f05d4d2f99c360ff664e42fb5ec SHA512 e1489e05889680fc13506b81b3eaa933fcf1522dbd7ff02b9ac4a77c9e371a37ce4b61cd149c9dab7558c9c6da0dc25f7770d126bc830a358650faccc0285da7
diff --git a/x11-misc/libinput-gestures/metadata.xml b/x11-misc/libinput-gestures/metadata.xml
index 60f4aae4717f..8be992f51c37 100644
--- a/x11-misc/libinput-gestures/metadata.xml
+++ b/x11-misc/libinput-gestures/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest
index 58425ffdeb79..be2df2c837fd 100644
--- a/x11-misc/lightdm-mini-greeter/Manifest
+++ b/x11-misc/lightdm-mini-greeter/Manifest
@@ -6,4 +6,4 @@ EBUILD lightdm-mini-greeter-0.3.4.ebuild 586 BLAKE2B f9a8847e8b5a2a93fefc3100dbd
 EBUILD lightdm-mini-greeter-0.4.0.ebuild 586 BLAKE2B 45bc8be020848e4319012893c3753298f50613f31af48447b4054fede4c9192b380439761bdddbc6f219ca1fbcf53d9dcf82e6b7684cdd637de7327a3b53c072 SHA512 e21a9a3a865575fde2af6facb530c00ec0cc96272d5a15819acd24e3f14838e29110bc2f2bfe5bf28055b61900ff9f8c16087883ac4a55e52bede87587e059f8
 EBUILD lightdm-mini-greeter-0.5.0.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
 EBUILD lightdm-mini-greeter-0.5.1.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
-MISC metadata.xml 353 BLAKE2B 364a6904c6b871e3a331928070a8d65a75c04ca8646636cc7978abfa8fb69cc9286556e93a7cbafd793236f6a3e5ad45ace236df780710f3ff1624b7e81211c8 SHA512 346fabfe019f6c030e58de94c7de3e344aeabb9227f931f5d3067338a9cb795fff6ecddef18d2f6af97c2fcbcb0d5953f2984914841278bd5a8632983e5b7734
+MISC metadata.xml 349 BLAKE2B 751e1e579d8a99b91da75d26457be1363544e5819a0194fd5dce760bd62b6d2175a054e3ba15a338cf204f058eba7552724637cb75f4a928090cbdc2bbd41b48 SHA512 dab6dcea7a1c3baf5ac9f3bdc52d55cea5458f9a1b7a15b3d28cfed174a1cb038b13bcccc2608fee6abe0f0aff4ba75d6050195e7a75c188e655ce041b4d6199
diff --git a/x11-misc/lightdm-mini-greeter/metadata.xml b/x11-misc/lightdm-mini-greeter/metadata.xml
index 31c9c51c2562..5c058403734a 100644
--- a/x11-misc/lightdm-mini-greeter/metadata.xml
+++ b/x11-misc/lightdm-mini-greeter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-misc/lineak-defaultplugin/Manifest b/x11-misc/lineak-defaultplugin/Manifest
index d99ee10db282..85e6d2fd8e07 100644
--- a/x11-misc/lineak-defaultplugin/Manifest
+++ b/x11-misc/lineak-defaultplugin/Manifest
@@ -1,6 +1,5 @@
 AUX lineak-defaultplugin-0.9.0-gcc43.patch 242 BLAKE2B f630601afabd50b5d2da06660bae845835d4ffe4ffd2fcc2e51d95b4d36f41779eabf875c72abff4c036da241b3441d635ef6dbefda4652f195f68821938487e SHA512 897f29bfe02405f7881d6dfd4b4d91448943f917c3afee43b50b36449c0d84e0a76bc8b7867649c7728f0c22e58b6a9f951b81a1f05cb4df36fc51524affa5a4
 AUX lineak-defaultplugin-0.9.0-gcc47.patch 274 BLAKE2B d3446b668eed70721e87b43c0b10217e4d2520ae8b910df0086c93b5d8020fecc76d79164ec9567a61ae1e76362213aedcd6ca2069c5dfd1c5bb449a7f095d66 SHA512 1644ec0fe4c3546f427381359d65f25e1e6ad036b99d6909ac4cde11e95d4c97ded30109c751a652905e2f7299605ddcff29779e22f8b2b541fde1d7f9688cc0
 DIST lineak-defaultplugin-0.9.tar.gz 840704 BLAKE2B 37b060ea5b026b1a06992b7986a56a942d1d468d85e82444a4bb1a273e656ff80fddfbf4d53c6d3eddde9bf268f413dc0ce3eaa7a44a62534f533a286e67cf22 SHA512 f110eb42f8711b9fbd38652462d9b44f6f6851c4dc5cdb466b63bd09b8d3320e35d7de82626f2c9409bbf0f96d4f1e4ab2e9a82932452e50b403d343fca1ce4b
-EBUILD lineak-defaultplugin-0.9.0-r1.ebuild 854 BLAKE2B b22ef55d67d0a96d306b47ccdd324db2e6c0c2680d6e216e453f604a8d5512d8e95bc7d67d12f19273fe0cd4e35c4d64ee3f8c4314ec34899f6a85bd271f7ed3 SHA512 2427e1ecd75011f2c3a408f5f19eac5f928c3c031a2d431a407841fd4ddd91889eed891e914f8a048d6dc430f03bbb6dcda08c2926590ab3e83f75d7d919278e
-EBUILD lineak-defaultplugin-0.9.0-r2.ebuild 823 BLAKE2B d82c8f8893d9c850e68e15e222a0b2c8a39d4916b9ad0c16a1dfd88cf55742a02d79092493670b83662bd5119abf8f64d69577377a3451c2a25f032b095a9e1c SHA512 878083cbbe9e615284cea70146fe948bb412cbadbbe99d2cdfd1335b8db364b5de861d281deda7fa13434df46d36a6c63b4a80e9fded218525651f8abd5f9b45
+EBUILD lineak-defaultplugin-0.9.0-r2.ebuild 805 BLAKE2B 5aea99fbbb9daf25ca683db85f3246d7d26ab7caecfb7862cc2570733a155639fd0688ae0c6f541d84499cf638e9657f1edb807fa79874655cfa16cd1e326159 SHA512 10d3475a7ca40e5558da0b75acd35416f61da1a59870cd171e1b544f5919f1a8a6a2e6c295a8346d6e7931dd323a865cbf76928bafe3ec27e50781e8693b5518
 MISC metadata.xml 362 BLAKE2B 44ba7b6226e667f7980e291c2d547eecafa1cb02386e46980327c416c6b1139619bbb7dfeda83b2cc7761022ccf0b1fdd55cb75aa9ec5db614267c1b99d826db SHA512 a33c009438013270e90019cafb29f493fc54c64afe810c873f6c1767b543f08cc741a3d6ed83833ead57d8dbb2ea8b78188c4f5d0962709b8625bb053c19be82
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
deleted file mode 100644
index 454c50ad61e5..000000000000
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-MY_P=${P/.0/}
-
-DESCRIPTION="Mute/unmute and other macros for LINEAK"
-HOMEPAGE="http://lineak.sourceforge.net"
-SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	=x11-misc/lineakd-${PV}*
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' default_plugin/Makefile.in || die
-}
-
-src_configure() {
-	econf USER_LDFLAGS="${LDFLAGS}" $(use_enable debug)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
-		install
-	dodoc AUTHORS README
-}
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
index 16aac45e5d34..823e10812860 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib
 
 MY_P=${P/.0/}
 
 DESCRIPTION="Mute/unmute and other macros for LINEAK"
 HOMEPAGE="http://lineak.sourceforge.net"
 SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-RDEPEND="
-	=x11-misc/lineakd-${PV}*
-"
+RDEPEND="=x11-misc/lineakd-${PV}*"
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
-S=${WORKDIR}/${MY_P}
-DOCS=(
-	AUTHORS README
-)
+
+DOCS=( AUTHORS README )
+
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-gcc47.patch
@@ -40,6 +37,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable debug) \
-		--with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+		--with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \
 		USER_LDFLAGS="${LDFLAGS}"
 }
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
index a1b1ca29c44a..1a1a063114fa 100644
--- a/x11-misc/lineak-xosdplugin/Manifest
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -1,4 +1,4 @@
 AUX lineak-xosdplugin-0.9.0-gcc43.patch 260 BLAKE2B 388a7c6e3e89ec3d4ab779127df0a3f83dae83dda8ac60889a8a29189e82e6b41f9c324f076cd3df8da5e22bcba97e92aa7df4ad46dc4c44fe6c665fd7746435 SHA512 3f4d9c929ba3bc1c831bbea2fefa78229e73f9d2f863bbe0e0695eeff84eac6d5d162c6ad4fbf608811c169ec8e75c811623858196c907a59a652498f5cc9fae
 DIST lineak-xosdplugin-0.9.tar.gz 802367 BLAKE2B 76e9f0fd088a1323eb72deca02aa325a908b4308f2d76e10e33c57af7dc41823a6b5572ef861ba337af9b76d07d650b31539aba7d0a4815b19d2abba3ad0cf7c SHA512 5f38616a770dea9336e1af93c209ab1c5232d783e301d949e54ca44dc5b9dc462e8fad6448c6ffbb81d6494f5da91f507da2ed3835e62ecb6ef794f68b5f8009
-EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 789 BLAKE2B f04d6c162105071ffe37e63c963aca51116ba51736eb7409ada5afb7b81c7fb66e534892502f6bd817bfc712230402b1b47b401a8065983b5eaa2adc40c56300 SHA512 f32329e80162d0429974995e89100c69df8cfccd0b08b16dad818a7def67c3abf5870c45818734fdd5ba3c6d1a0d0ddde6687d0074316d82c2021cf72b3a2992
+EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 772 BLAKE2B bb420c38b5a26bf05999a6b829b176ffec5c3735168995336a45c0c0918d20d531f85f73cb4adbc3796f74be15b86c5fd981c16b0f6c123b6a819b32eaef3f18 SHA512 19b397bf116cb01c1348c518ad39c5724e4cb1aedcb923132c51b62e9b5bae803a816e85dbfea8958319e13c6a78116e4fcee3f92d48546081056e020bbb5a23
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
index 5499b6eedf13..5ad5aca6757c 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib
 
 MY_P=${P/.0/}
-
 DESCRIPTION="Xosd plugin for LINEAK"
 HOMEPAGE="http://lineak.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,11 +18,8 @@ DEPEND="
 	=x11-misc/lineakd-${PV}*
 	x11-libs/xosd
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 )
@@ -31,7 +27,7 @@ PATCHES=(
 src_configure() {
 	econf \
 		$(use_enable debug) \
-		--with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+		--with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \
 		--with-x
 }
 
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index 5bdef44bbe3f..41a0da3a6e6b 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,6 +1,5 @@
 AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba39c3241ef3f9957946c6e1b7c91e29a1cfb346721a2b59d8e2b87e58dd52bde6fe4c6d3fbc70d8c5b02d62bb96f6d82c64f11aac3e5b SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee
 AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407
 DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e
-EBUILD lineakd-0.9.0-r2.ebuild 1096 BLAKE2B 8a2fbcc812dae42e9a18caae1c57e9a0cc110cc0ca9e9244957085ac253764ace94209866b2834047f84e87ab1d2289973c4ec60b04a423feff5534eefdfcdf4 SHA512 1722f51bdd359a2530cf1e56617d6dda18cfef031b27d2abc3f8275c60350c388d802950460c2912cd9fde950957441cfd277deec130f9c5d9eb89f5f4e54957
-EBUILD lineakd-0.9.0-r3.ebuild 1169 BLAKE2B b9669bb05b0c0ae2cb7482073534f1485ca82169c6b011baf6df753f79345bf778222438a225ddbe3cd62cfadf3240cdd1546e29cf8f0fffb736d24032a1dacd SHA512 52a553c417d849f976f516d57466efaf805c6683caa199fdbd4d9ba6c48e75a4244334bfcaf9974dddd3fc02eab17222e2819eedb96daa7b1f24ff1dbb0d3e70
+EBUILD lineakd-0.9.0-r3.ebuild 1165 BLAKE2B 1cc57465ad3a65a99f3ecb543eddf186b31c58bd9d7a054e9544b370b46396ddd407410046756a3625c5ed38d4a46dab2400f3cddea4476d161bebc60bed6c4a SHA512 38c1e4a18b73ebcf39cbbc939e057ea1d6227d7499044445269a35d87ea4b488941c50cc5029e226d9f938fbbe9f836bd757fdcf63c2c10752aa588f7669e2c4
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
deleted file mode 100644
index b1d571e4369a..000000000000
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.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 multilib
-
-MY_P=${P/.0/}
-
-DESCRIPTION="Linux support for Easy Access and Internet Keyboards"
-HOMEPAGE="http://lineak.sourceforge.net"
-SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxkbfile
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--with-x \
-		--disable-static
-}
-
-src_install() {
-	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile
-
-	dodir /usr/share/man/man8
-
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS README TODO
-
-	keepdir /usr/$(get_libdir)/lineakd/plugins
-
-	insinto /etc/lineak
-	doins lineakd.conf.example lineakd.conf.kde.example
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
index 21a90c825f75..00a75e407fb0 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index b5303cb414bf..7abaacd57ae3 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,7 +1,4 @@
-AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
 AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f292e5919c093d492b2f87ce6ff595be15e57d4e8b92e417fcf8856ed8e7625a1eea337a361c321c0b6f87a23f462f5dc1a79d1756 SHA512 db92e8bde59afa52a3d38681deaab37642830964b717a4bb39134afc607d46f33d983f081e9b96848e63d7f7ea99a3ecdc8df7c0bc3dda5156c3e0d9f8bcaca0
-DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
 DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
-EBUILD menumaker-0.99.11.ebuild 1083 BLAKE2B e5123461019a41dc840748eab0cbcdf6d6ba7ca783054348bf0ff38f04501ebe6030b38efc2481ca50a66519f699dbce02adf4d8ce503d52e3874a0d70ed237e SHA512 15d038e1103322e1e86cfcc9bd21b5a00633f149d45d6e6f3c6153cb40b4d35e580e2cc4e76efa8d942878487cc278b6c35e1b5cca8257710abcf60f77f2c248
 EBUILD menumaker-0.99.12.ebuild 893 BLAKE2B 7056604320104a158ac866216548e7f4d74d385f5b04cebba13c8dc75b0eac706842a4ddb9f79df9f3718e5747f31d5e0b35935bfc42da7e49c6dfc06b6798cd SHA512 1a07ff69c1af53dc8fce9417d261e12a5c4a34cab82c704fec5e88a3371f7cb54bc7b475bfdc3fcd6ac45dcaea7c1a92692eb5de905b3e17d15fe5464a39bd17
-MISC metadata.xml 463 BLAKE2B d9fa2fb06c3c12064fccf263fcba9bdf6763c7d19e72fce75851694a978d18229a59dc6fb4e1d3744b094fca002bc115b9aa524460a43f8b806dbe3c5997194c SHA512 4963c8ee2ddbc9dd8ab2c6bc1a440e6eff3fb12278e0b281fc109ac4a90c1a283afce947068aa1bdc860f8a582296b7efefd753178a91c3694b86f1e6b799d12
+MISC metadata.xml 270 BLAKE2B fc16ae5dd7a1ce8280ce48ede6dc4604eff8234d44d7942c55b2da8fa4e7858e1697cc1bb6112de8091ef152dea2a2d78552a7381aa10b169beb6f460b2efd2c SHA512 d2a12e7e1d81c06c24660de56376cc73981ccf24a55c9f4966ccfcc9608ce590ff1c32bbc354bc77c0648f2af4caab57c80203823111a45a1538cfe09aa9ba3c
diff --git a/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch
deleted file mode 100644
index 73cf9b6ff80f..000000000000
--- a/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index b00b7bc..1c6f12b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,15 +1,53 @@
--ACLOCAL_AMFLAGS = -I m4
--
- SUBDIRS = doc
- 
- dist_bin_SCRIPTS = mmaker
- 
--nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/*
-+python_PYTHON = \
-+	Config.py \
-+	Keywords.py \
-+	Paths.py
-+
-+pythonMenuMakerdir = $(pythondir)/MenuMaker
-+pythonMenuMaker_PYTHON = \
-+	MenuMaker/BlackBox.py \
-+	MenuMaker/CLI.py \
-+	MenuMaker/Deskmenu.py \
-+	MenuMaker/FluxBox.py \
-+	MenuMaker/IceWM.py \
-+	MenuMaker/__init__.py \
-+	MenuMaker/OpenBox3.py \
-+	MenuMaker/PekWM.py \
-+	MenuMaker/WindowMaker.py \
-+	MenuMaker/xBox.py \
-+	MenuMaker/Xfce4.py
-+
-+pythonProphetdir = $(pythondir)/Prophet
-+pythonProphet_PYTHON = \
-+	Prophet/Categories.py \
-+	Prophet/__init__.py
-+
-+pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop
-+pythonProphetDesktop_PYTHON = \
-+	Prophet/Desktop/__init__.py
-+
-+pythonProphetLegacydir = $(pythondir)/Prophet/Legacy
-+pythonProphetLegacy_PYTHON = \
-+	Prophet/Legacy/Development.py \
-+	Prophet/Legacy/Editor.py \
-+	Prophet/Legacy/Emulator.py \
-+	Prophet/Legacy/Graphics.py \
-+	Prophet/Legacy/__init__.py \
-+	Prophet/Legacy/Multimedia.py \
-+	Prophet/Legacy/Network.py \
-+	Prophet/Legacy/Shell.py
- 
--install-exec-local :
--	echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
--	echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
--	echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
-+pythonProphetDebiandir = $(pythondir)/Prophet/Debian
-+pythonProphetDebian_PYTHON = \
-+	Prophet/Debian/__init__.py
- 
--install-data-local :
--	$(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
-+pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu
-+dist_pythonProphetDebianMenu_DATA = \
-+	Prophet/Debian/menu/debian-2.2r5 \
-+	Prophet/Debian/menu/debian-8.1 \
-+	Prophet/Debian/menu/ubuntu-5.04 \
-+	Prophet/Debian/menu/ubuntu-5.10
-diff --git a/configure.ac b/configure.ac
-index 248ffcb..1bde23b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.11)
- 
- AM_INIT_AUTOMAKE
- 
--#AZ_PYTHON_DEFAULT
-+AM_PATH_PYTHON
- 
--#AZ_PYTHON_WITH
--
--#if test -z "$PYTHON"; then
--#    AZ_PYTHON_PATH
--#fi
--
--#AZ_PYTHON_VERSION_ENSURE([2.7])
--
--#AZ_PYTHON_RUN
--
--AX_PYTHON
--
--AC_CONFIG_FILES([Makefile])
--AC_CONFIG_FILES([doc/Makefile])
--AC_CONFIG_FILES([Config.py])
-+AC_CONFIG_FILES([
-+	Makefile
-+	doc/Makefile
-+	Config.py
-+])
- 
- AC_OUTPUT
diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
deleted file mode 100644
index 9a121fbfd829..000000000000
--- a/x11-misc/menumaker/menumaker-0.99.11.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
-HOMEPAGE="http://menumaker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	configure() {
-		ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	compile() {
-		default
-		use doc && emake html
-	}
-	python_foreach_impl run_in_build_dir compile
-}
-
-src_install() {
-	compile() {
-		default
-		use doc && emake DESTDIR="${D}" install-html
-	}
-	python_foreach_impl run_in_build_dir compile
-	python_replicate_script "${ED}"/usr/bin/mmaker
-	einstalldocs
-}
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index 735d21bbe5bb..281b6021f57d 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/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">
-		<email>aklhfex@gmail.com</email>
-		<name>Chris Mayo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">menumaker</remote-id>
diff --git a/x11-misc/metadata.xml b/x11-misc/metadata.xml
index dfa319ee8104..1b3fff1dbe57 100644
--- a/x11-misc/metadata.xml
+++ b/x11-misc/metadata.xml
@@ -15,7 +15,7 @@
 	</longdescription>
 	<longdescription lang="ja">
 		x11-miscカテゴリーには他のカテゴリーに分類されなかった
-		多種多様なX11アプリケーションが含まれて>います。
+		多種多様なX11アプリケーションが含まれて&gt;います。
 	</longdescription>
 	<longdescription lang="nl">
 		De categorie x11-misc bevat allerlei X11-applicaties die niet in andere
@@ -40,4 +40,3 @@
 		z pozostałych kategorii.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 739d3b9b6a6c..bc2e40ef9d53 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,5 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1-r1.ebuild 1011 BLAKE2B 1cfbf2c337e02f78bcd8d0960d68fd00bd54af6d128b290417782f956d3b77a5b400f66a8caea5b814cdeff3a3ad204ac3ba3deefbb310481fb5d5a309a8dfe9 SHA512 998126f36b97b042eaffaa68c6d05a2983bfd5f31c48a5ae03621ed41583cbd6fe467aa569cc15c45fa029a7254c7f5b934a504d8bcabf29cdaec2ee6fc12cd9
-EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
-EBUILD nitrogen-99999.ebuild 951 BLAKE2B 593d5517c0a3cfdd367dbe884302708c9d63ad83b7c0cabceda61d2ec4a5fcc15f5aad86163bcb51e71a6603cd3630214826fcf9af66aac42fbc630d323c3f70 SHA512 dfb30c112a5bbf409ad322dc084ae9d0c6ec15e001b19c21735d1d416486528c7d7a47f1a767fd49e514789ee20e0e8f0acc3157495150a2eacd11647fd98acd
+EBUILD nitrogen-1.6.1-r1.ebuild 1019 BLAKE2B 8e65f90322651059c274b1eca6aff664f5f4dc587935726c00ddd97aed0ce6c43da437958dc137b4a4bb65ce128e46884a15e7dede426de2c8b9309bd9ec00dc SHA512 25177bb8eb9bb2de237e7e6cd42162215ee4811b6fa2215053d7cd7cbe893125e501fcaded779036a7d1a40985959fb084d9ff2fc0e1a3633f0c09b3b8ec8018
+EBUILD nitrogen-99999.ebuild 948 BLAKE2B 168dbbb5637c1f431f2445b60d418c9349c0113f8cccab5059f58d57f4e259876336730c7d7dd4cee0e347abb164c8e9456f0fa861a4114bb702c198bb67e4d3 SHA512 22b99582b6a06275f88539dd0bebabddb704bd3ba6ef12ebb0921e03a23505f4c514e57620089270f904817e41c6d3584b7ae3fa749b82ea1f00bc04d470b4de
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index 68f5dd2023f7..420044457248 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
@@ -10,9 +11,10 @@ SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=gnome-base/librsvg-2.20:2
@@ -21,7 +23,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )
 "
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
deleted file mode 100644
index aee77e158ce4..000000000000
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic xdg-utils
-
-DESCRIPTION="A background browser and setter for X"
-HOMEPAGE="http://projects.l3ib.org/nitrogen/"
-SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls xinerama"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-2.10:2.4
-	>=gnome-base/librsvg-2.20:2
-	>=x11-libs/gtk+-2.10:2
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/nitrogen/nitrogen-99999.ebuild b/x11-misc/nitrogen/nitrogen-99999.ebuild
index dec80fb27a1d..ce8061fea451 100644
--- a/x11-misc/nitrogen/nitrogen-99999.ebuild
+++ b/x11-misc/nitrogen/nitrogen-99999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic git-r3 xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
 HOMEPAGE="https://github.com/l3ib/nitrogen"
 EGIT_REPO_URI="https://github.com/l3ib/${PN}"
 
-IUSE="nls xinerama"
-KEYWORDS=""
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="nls xinerama"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=gnome-base/librsvg-2.20:2
 	>=x11-libs/gtk+-2.10:2
 	xinerama? ( x11-libs/libXinerama )
 "
-BDEPEND="
+DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )
 "
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
index a96f5cefbc79..703bbf5e7909 100644
--- a/x11-misc/numlockx/Manifest
+++ b/x11-misc/numlockx/Manifest
@@ -1,3 +1,3 @@
 DIST numlockx-1.2.tar.gz 82703 BLAKE2B e874671fca1991c541022859bae6606d550fed66b4f40ffdd1bc2cbd74ce65f8148845014d7290db7fe7a333aad526ec186197cca989bac2b519915aa374214f SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e
 EBUILD numlockx-1.2.ebuild 696 BLAKE2B 26c868db36e1525dd6a9e99689d607fc10cff48c0890a5c66fda8a4549130c6d8c201a367a4099a4341a8232eb5a617eb8db86fb40bd02fe30d8c4e97053fd8d SHA512 f68f6d1349220159fe60efd7ef3888be5632b9c024cdd8daa5082b3eb25e0be14d559ee74a834a703662018d2ea0c5d64e415584918a20c4c99ec7520dec4cce
-MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
+MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index d91810780a67..f65b774ed444 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index 83396248f9b0..5f6e65c0e9c3 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -1,4 +1,9 @@
 AUX openbox-menu-0.5.0-build.patch 2004 BLAKE2B 6284c4d0a8695b501de51014296d40e51b8af31f7ceba84af1ad7e091576703f7bd0325fb8ab741197565e92d66e2e225b4582111ac532b0e7245db352fe85a3 SHA512 52e425084837c1c198adbbb11b48ea59855ab5396159d45b01f55659bb2f506fd297ce4baebb544028df53063e8e9535129e049b47eff0f25917e81d20b93b97
+AUX openbox-menu-0.8.1-build.patch 636 BLAKE2B 3804a03977411ca5c92fc8e79707f78940456f3c6b301db119cb24169b73e2fd882354a5de0cd1a2142f5e96a156e47c4719f835ad6934af41c20ef6270e8e13 SHA512 89f8d578a4050bb492691a9c30bbce4bf7410e867e19fc9dcf2477a613cf12ee905a05dcecbda33330e5ef4cc47f5d27803cd8118bd46b4ca83e4d322d6ebb26
+AUX openbox-menu-0.8.1-gtk3.patch 2971 BLAKE2B c941e37ed9d3acf32704aceef12d55167c3a76904ed82af55668c3268abe8fb69e3f9513732b87f10de9c6ee24c3bbd825dd22f603ac1a0a88cb5169178a6c7c SHA512 d0d733c0f443f5024d12fd3194e5eae1eaf6b7a4afd16864912f8bd411a7ae74b7d744214805e3f4464e774e7e03c2d556db00c886a1b00254b5fcb50436bb12
+AUX openbox-menu-0.8.1-makefile.patch 3562 BLAKE2B 542a20fbda371b186a6130804f3b2ac8b5b07c4d11db662ac622699a59ac16fbd9e4a1e573d48a166f5950adbdea8d4f240482ae09610ed83433dbaf284109f0 SHA512 9ceb1a2d69e65625796431b34af9a1b58980293633dbe253ff103d2c3a97aca33984c66c2c85fea2c15fa16747d190d31642112c1c546bbee0b850341da61548
 DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2 SHA512 955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
+DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e SHA512 de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da
 EBUILD openbox-menu-0.8.0.ebuild 863 BLAKE2B 6307b21773b654f8361a5f50d368ea67dd73524add3ad924e852387a6d2ea686a43d2f5ec141131b2f4114f3f6154e5ab077174cd572c4f087de9c902f3eef1c SHA512 72e8228e4342dafc2d3f61f0e318c765e3c1687d31abab541fe8fb5c2045f9ac12cd4e7f19d921b1a5a8c98cacbec4b86b25534c58898ae4be9e4df86c354e3e
-MISC metadata.xml 674 BLAKE2B 018ec38449dd44d0817ecbea05843ea9f36baaa79f05013bfc53f558249aac211e8d71acaca85e60ba1ef6aaee8df80ac4d910fc72f51d05c9b682fc67a7bf05 SHA512 bfc261259c62793a0feb740063a18bfc675d7f13745aedea341c0af7cb7e6673ebfe866d3285ecfa17ed4b00ae97bbeccb442bca506fd2e9f78a7880e1db2ed2
+EBUILD openbox-menu-0.8.1.ebuild 916 BLAKE2B 1ecd7c4e6f68a8171fb627144093119e431f10bb39a030c10a77cac62b979eb264cd690b7630be414fcc1622c10691f6befb4d7ff12087cb615d7d845904f533 SHA512 6df34226328ff9527243ff8620f26f1bd935f95c4a62e7fc5974bca84b07f437ae003627f40b98b8ac73d8939587687019edc6f5ea1ccecb62147d77255baf4c
+MISC metadata.xml 604 BLAKE2B ff5d6c6d050fae1b99d870085b2d7a30bc5e1e883b054d24faaeea71eda55cd8ef9d2ac13836f127cba8e8497f41f8f91c3d9d35b00cbc242e01261a1fc1d13f SHA512 e9f551bab1b048cc6d9012983f346986619eac5a359e5e68db11b843cf1a52c91fdd738eff5f84efcd973b525a7063485ddd9fef783109f99606a7c52df09432
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch
new file mode 100644
index 000000000000..b1130c85d864
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch
@@ -0,0 +1,26 @@
+From e3989a504d9713d0de8b236b1f8d21c74d1fcd00 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Feb 2021 21:12:52 +0300
+Subject: [PATCH 1/2] Fix compilation
+
+icon_theme is needed in menu.c
+---
+ src/openbox-menu.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/openbox-menu.h b/src/openbox-menu.h
+index 88ab2bf..e3dee22 100644
+--- a/src/openbox-menu.h
++++ b/src/openbox-menu.h
+@@ -82,4 +82,8 @@ gboolean context_get_persistent (OB_Menu*);
+ 
+ void context_free(OB_Menu *);
+ 
++#ifdef WITH_ICONS
++extern GtkIconTheme *icon_theme;
++#endif
++
+ #endif // __OPENBOXMENU_APP__
+-- 
+2.26.2
+
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch
new file mode 100644
index 000000000000..6b16b8a0ff8d
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch
@@ -0,0 +1,91 @@
+From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001
+From: Fabrice THIROUX <fabrice.thiroux@net-c.com>
+Date: Sat, 13 Feb 2021 14:46:53 +0100
+Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable
+
+---
+ Makefile           |  4 ++--
+ src/menu.c         |  1 -
+ src/openbox-menu.h |  1 +
+ src/utils.c        | 16 ++++++----------
+ 4 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5d8af49..5e09ef2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
+-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
++LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache`
++CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache`
+ CC=gcc
+ #-DG_DISABLE_DEPRECATED
+ 
+diff --git a/src/menu.c b/src/menu.c
+index 5b7e8f8..3b752d9 100644
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -240,7 +240,6 @@ main (int argc, char **argv)
+ 
+ #ifdef WITH_ICONS
+ 	gtk_init (&argc, &argv);
+-	icon_theme = gtk_icon_theme_get_default ();
+ #endif
+ 
+ 	if ((ob_context = configure (argc, argv)) == NULL)
+diff --git a/src/openbox-menu.h b/src/openbox-menu.h
+index 7035e9d..f5a7bce 100644
+--- a/src/openbox-menu.h
++++ b/src/openbox-menu.h
+@@ -19,6 +19,7 @@
+ 
+ #ifndef __OPENBOXMENU_APP__
+ #define __OPENBOXMENU_APP__
++
+ #include <menu-cache.h>
+ 
+ #ifdef WITH_ICONS
+diff --git a/src/utils.c b/src/utils.c
+index 7a68316..2f4f95b 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -169,8 +169,6 @@ clean_exec (MenuCacheApp *app)
+ 
+ #if WITH_ICONS
+ 
+-extern GtkIconTheme *icon_theme;
+-
+ /****f* utils/item_icon_path
+  * OUTPUT
+  *   return the path for the themed icon if item.
+@@ -199,23 +197,21 @@ item_icon_path (MenuCacheItem *item)
+ 		if (g_path_is_absolute (name))
+ 			return g_strdup (name);
+ 
+-		/*  We remove the file extension as gtk_icon_theme_lookup_icon can't
+-		 *  lookup a theme icon for, ie, 'geany.png'. It has to be 'geany'.
+-		 */
+-		tmp_name = strndup (name, strrchr (name, '.') - name);
+ 	#ifdef WITH_SVG
+-		icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
++		icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+ 	#else
+-		icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
++		icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+ 	#endif
+ 		g_free (tmp_name);
+ 	}
+ 
++
++
+ 	if (!icon_info) /* 2nd fallback */
+-		icon_info = gtk_icon_theme_lookup_icon (icon_theme, "empty", 16, GTK_ICON_LOOKUP_NO_SVG);
++		icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), "empty", 16, GTK_ICON_LOOKUP_NO_SVG);
+ 
+ 	icon = g_strdup (gtk_icon_info_get_filename (icon_info));
+-	gtk_icon_info_free (icon_info);
++	g_object_unref (icon_info);
+ 
+ 	return icon;
+ }
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch
new file mode 100644
index 000000000000..a2848bf464bf
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch
@@ -0,0 +1,106 @@
+From fa18093783ec77102c304134626bf3b4ddc07ec8 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Feb 2021 21:47:47 +0300
+Subject: [PATCH 2/2] Update Makefile build
+
+Introduce CC and PKG_CONFIG variables that can be redefined by user.
+Added variables WITH_ICONS and WITH_SVG that can be also redefined by user.
+Misc enhancements to file globbing.
+
+* 2021-03-15 asturm: Fix BINDIR path, add DESTDIR, adapt to GTK3 change
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,19 +1,31 @@
+-LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache`
+-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache`
+-CC=gcc
++CC ?= gcc
++PKG_CONFIG ?= pkg-config
++
++CFLAGS ?= -O2 -g
++CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-3.0 libmenu-cache)
++LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-3.0 libmenu-cache)
++
+ #-DG_DISABLE_DEPRECATED
+ 
+-# Comment this line if you don't want icons to appear in menu
+-CFLAGS+=-DWITH_ICONS
+-# Uncomment this line if Openbox can display SVG icons
++# set to 0 to turn off icons in menus
++WITH_ICONS=1
++
++ifeq ($(WITH_ICONS),1)
++CFLAGS += -DWITH_ICONS
++endif
++
++# set to 0 to turn off svg icons in menus
+ # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
+-# CFLAGS+=-DWITH_SVG
++WITH_SVG=0
++
++ifeq ($(WITH_SVG),1)
++CFLAGS += -DWITH_SVG
++endif
+ 
+-prefix= /usr/local
+-DESTDIR ?= $(prefix)
+-BINDIR= ${DESTDIR}/bin
++prefix = /usr
++BINDIR = ${prefix}/bin
+ 
+-SRC= $(shell ls src/*.c 2> /dev/null)
++SRC= $(wildcard src/*.c)
+ OBJ= $(SRC:.c=.o)
+ 
+ all: $(OBJ) check openbox-menu
+@@ -25,15 +37,18 @@
+ openbox-menu: $(OBJ)
+ 	$(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
+ 
+-.PHONY: clean install doc changelog check xmllint
++.PHONY: clean install install-strip doc changelog check xmllint
+ 
+ clean:
+ 	@rm -f $(OBJ) $(TEST_OBJ) openbox-menu check
+ 	@rm -rf doc
+ 
+ install:
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
++
++install-strip:
+ 	@strip -s openbox-menu
+-	@install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
+ 
+ doc:
+ 	robodoc --src . --doc doc/ --multidoc --index --html --cmode
+
+diff --git a/README.md b/README.md
+--- a/README.md
++++ b/README.md
+@@ -6,17 +6,17 @@ Type `make` then, with superuser privileges, `make install` to install it. openb
+ 
+ ## Compile openbox-menu without icons ##
+ 
+-Openbox-menu shows icons before categories name and applications name (in fact, the menu and the icons are displayed by Openbox; Openbox-menu only outputs text content). You can remove icon support by editing the Makefile and commenting the following line (add a # in the begining)
++Openbox-menu shows icons before categories name and applications name (in fact, the menu and the icons are displayed by Openbox; Openbox-menu only outputs text content). You can enable icon support by running `make` with `WITH_ICONS=1` option (pass `WITH_ICONS=0` to disable it):
+ 
+->  CFLAGS+=-DWITH_ICONS
++>  make WITH_ICONS=1
+ 
+ If errors occur while compiling, remove gtk+-2.0 from lines above the one previously commented.
+ 
+ ## SVG support
+ 
+-Openbox can display SVG icons since version 3.5.1. SVG support in openbox-menu has to be activated in Makefile by uncommenting the following line
++Openbox can display SVG icons since version 3.5.1. SVG support in openbox-menu can be enabled by running `make` with `WITH_SVG=1` option (pass `WITH_SVG=0` to disable it):
+ 
+->  CFLAGS+=-DWITH_SVG
++>  make WITH_SVG=1
+ 
+ SVG suport will be activated by default in the future.
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index 1636af995109..374fcd14bd7e 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -10,8 +10,7 @@
 			<email>fabrice.thiroux@free.fr</email>
 			<name>Fabrice Thiroux</name>
 		</maintainer>
-		<doc lang="en">https://bitbucket.org/fabriceT/openbox-menu</doc>
-		<remote-id type="bitbucket">fabriceT/openbox-menu</remote-id>
+		<remote-id type="github">fabriceT/openbox-menu</remote-id>
 	</upstream>
 	<use>
 		<flag name="icons">Enable support for icons in menus</flag>
diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
new file mode 100644
index 000000000000..e49e6551b159
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Another dynamic menu generator for Openbox"
+HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html"
+SRC_URI="https://github.com/fabriceT/openbox-menu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+icons svg"
+REQUIRED_USE="svg? ( icons )"
+
+DEPEND="
+	dev-libs/glib:2
+	lxde-base/menu-cache
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	icons? ( x11-wm/openbox[imlib,svg?] )
+	!icons? ( x11-wm/openbox )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-gtk3.patch"
+	# downstream patches
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) \
+		WITH_ICONS=$(usex icons '1' '0') \
+		WITH_SVG=$(usex svg '1' '0')
+}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 146fc018b5f2..a6dbd6dd7fcd 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -2,4 +2,4 @@ DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a4
 DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
 EBUILD pcmanfm-qt-0.15.1.ebuild 1098 BLAKE2B a775a49e89656b9a857aa2095d3f770ff31a1df5591e6e69f0eb2308723449ec3e3dc7bba053fbab8074d63b1a821f3dfe1b8d1df0a869c6c9b58e3526d3295f SHA512 360c8d2adbfa632a5803ab2c1d00324a5b157322e64b4efaa050d6e51aed33fe355c7b81775731c7b4278397ea1e94eea8f5193577ac0f64804604f914e0ac2c
 EBUILD pcmanfm-qt-0.16.0.ebuild 1098 BLAKE2B 8e337b446f6c3c948a5cee463bffac0899bfc3f15006c52a97f5a2de0d07c6886a11c814e741b6312519e2a72ad823c108728a3f757772e1768baca186ffd350 SHA512 71288802c33d465ae74c1a9bef001a287ad8c7b2a4fd519c5811a1935a5226e482684d64c648a1f6df8cc8126908fcf133e4bf011d8037a74a6bec291685d8ee
-MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
+MISC metadata.xml 316 BLAKE2B bdf0d6e5b1f3c247fee5717c1aa5bf04bc87254e12fe1bbfef77d8479686585c2d9101b13c2c7b1ac00a4876f809271a59667bceb648c7c034500f529d919558 SHA512 d38170dda875860b80d34ffd83fe0daa56edd14dbc1dd06ab23a21a9f45f95971754299bd488ebc4cc328c0347dc9cdf2265964aab04759b908232d6aea441ea
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index f0e3eb36bf10..584a6089b6d8 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index d3976b313ef8..53b2a898b884 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,4 +1,5 @@
 DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
-EBUILD pcmanfm-1.3.1.ebuild 1564 BLAKE2B 37cdd89d9897c4823bd19ae43685ec96713b0a9b88020f3e0e9a78e42be1214df52bf6e8d64d9ea6f817219ac426dcee7a62140d633446770fab01f7f5d8f16a SHA512 1223075020295703c85b6f129bdd66e4432f036fad2ab2f6a4f6b4f2432c0453a0260cbb228b0a5005e8ff680e25992f738261e4cc8632ba2a8779bf141f5c00
-EBUILD pcmanfm-9999.ebuild 1748 BLAKE2B 17066821d0bb4851251f899edf72c69af1aee1882957b8b5c7a163dd9e0fd589df568ae88f694ec6f47042ad0f4768a89e6d4b4dbeb1371722eb56847eb0178c SHA512 8e60059b397d80d94ed62a38e8562bd714b328314c0ad9153d955f08b2cc7a49a99a31df3074ddb441f588f0a0495d94f8cbecc303c02d42487433d29cb177e4
+DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
+EBUILD pcmanfm-1.3.1-r1.ebuild 1553 BLAKE2B 1b599888961b16cd1c6b4657d2fee4f331635c7884e5c87a0d8cd004df51ece0efac488037cabf3a146ea828a32ab3b86666d6278120dc0808aa7ca4407f0f2e SHA512 579f75f205256765e2d26ff2ecd34136422e047fa2245bfe0634f06c8dfa451469367cb94df6a6839175421b4995c71b6bf8b5be2930f94628bad22914ffb027
+EBUILD pcmanfm-1.3.2.ebuild 1173 BLAKE2B 729cc032de3e83d6ef71759d8a06c50a82e3893502d5b09f9349f97ccd9a21d5a84146a22bbe07b870040faf9a8dc6d69261c2dc6986d27173542f03e504cbc6 SHA512 cd0954f34168f71d3f22134c9f9ac5932838aeef6a89e6b68a1a311a630007c15802ada0aead82b23c808d60f95d2fcd7bdfb08387a3bd7b842997b67c19a24b
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..8e05fa230b16
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
+is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
+te th tr tt_RU ug uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit l10n readme.gentoo-r1 xdg-utils
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	~x11-libs/libfm-${PV}:=[gtk]
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
deleted file mode 100644
index ff5411af3887..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.3.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
-
-PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
-is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
-te th tr tt_RU ug uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit eutils xdg-utils l10n readme.gentoo-r1
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	>=lxde-base/menu-cache-0.3.2
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
new file mode 100644
index 000000000000..a57bad0e46c0
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.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
+
+MY_P="${PN}-${PV/_/}"
+inherit xdg readme.gentoo-r1
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.18:2
+	>=lxde-base/menu-cache-1.1.0-r1
+	virtual/eject
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	>=x11-libs/libfm-${PV}:=[gtk]
+	x11-libs/libX11
+	x11-libs/pango
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		--with-gtk=3 \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
deleted file mode 100644
index 73fd47c92e65..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-9999.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
-
-PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
-is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
-te th tr tt_RU ug uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit autotools eutils xdg-utils l10n readme.gentoo-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	>=lxde-base/menu-cache-0.3.2
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index b556b711d1f2..0637cf0d3ed1 100644
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -1,8 +1,5 @@
 AUX piedock-1.6.1-signals.patch 173 BLAKE2B 396549f932aa01f54e6c72fa653a5758351118858fda7ca28de7e354e5430c402f93497e30267cf44c4cda059af489d097b6ce44f7f747f09ec873b3528ef31f SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe
 AUX piedock-1.6.9-freetype_pkgconfig.patch 1233 BLAKE2B 41b39f3014e0e6adf8ab8d95ef2d01ef296660859576b5e7563be33f438fb469ec4e5b32f51e2f03cf58e034eea210987dc4374b55f5e936039f8c7dfd8fe301 SHA512 63ccd116bfae7ebb1456b304ce1258850e4669a9a71f55a83625f7867e22e92892f8deb9ce81204137dc98326c6ff3faf252e126596eab2ec16c44c3b202ce31
-DIST piedock-1.6.6-gcc6.patch 134783 BLAKE2B 74774aae06a865f03405b5a4939089a2521ec6c41387a90517135e82d2efa80cc18ec081640c1277bd4e8218fec267b64731de9633a514923b80d34312927d3b SHA512 a9460400f4447fe8c38b2d994c083e7c564b32b9a2e77f0b3497ca0f704f6a650781c3e00b37d52bbc4e9c202b02dd6bb3dd442ab13ece173a7b18c0592379bc
-DIST piedock-1.6.6.tar.bz2 254634 BLAKE2B 51c347edaa3cfb556f233fcc62e11e030d3fd2a25ada4ddec5bee6fe16def9605ca80cc254f72aed4c9353502ffa4fab1461af3e6b067f51e6057e7d63c81507 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be
 DIST piedock-1.6.9.tar.gz 290491 BLAKE2B 492c56d106616323a7f661e3c5d016755bdb421668bfe5251811df62ab1243838380395888c3e874c211069c30fdc7ea9141c245e907fa4c2eeea6d0a583329e SHA512 1244cc26d47c39c27c583f24aedf3dcdf0d879003f96a7cb1b512255384f0d81bf7c07dafa1b21ae1e6762bb7b41158cd20740b12b83f2d49daf7f24fbc96b69
-EBUILD piedock-1.6.6-r1.ebuild 965 BLAKE2B 33ce8551e3868b64400a9677c0585ed58a13f822d3a4d67bbbc8d31a237d743446e8f423e3e705aa23f63619faf4e719efdc136aa4f1b86fe9915d29253207a5 SHA512 31188dec19bf29ada3048da86d71f7c54e4c3ebe9a1c2842aa9ca90315cc552835a6f2937ff5490bbab3e2d87adc30525b627d2c631dca8832d4eae8b1b044c7
-EBUILD piedock-1.6.9.ebuild 1091 BLAKE2B a191644c77021300fd9b3da558cb48b832c35c976c28445a7ac4968a15e3db2f73e76e8657b4cfa69c6474198fb3bd6dddbb50f9691fc1204e89e65d300b8b81 SHA512 4161fee6d1d92c88cf32e56482fe992bd157ee378ac16439394d6dc82b9ad1016a68a64bdd029ffdf8ad7dfc01966a33e4e65d53e2e3aa526de23e06e675532d
-MISC metadata.xml 370 BLAKE2B ca778052b35bf0b0d759da4e12fdd53bfa475cd10fc77aad1e67b691ef45e9812e3bbe5286e59126db0664a0c67bb2a2ac9dd8687a39f77e9bf38e516af03a8c SHA512 553d2223b932228026bd4d239de39ad2b27a68cd0a940b0522f1cee28f0d146358c9422baabf15f8948b1783b7559e217a0e90acf068775832c51c5caa48515c
+EBUILD piedock-1.6.9.ebuild 1093 BLAKE2B f6698110529ebdcbc14d8c5c934269981058da8a52222a14d8b76f06b4e06c37093ba3c2c6239bf742e24a7c762d6ed90e2c2a358b4d923aa28563828e4c161f SHA512 7d8f656c9c25eb31663bc27556fa7dfaf5d0f8757a21699b9bc5be9d3b98131a925e0254efca4d3bff3bdd19ac779988e088dbaae8a4eda60c1503c9faf7bf72
+MISC metadata.xml 370 BLAKE2B 1604cdf13cafb3477688c56749c56b3db3b55ca55b790f1e8d43058a102bac5d224ac744e266d6be8dc8f8d000707cad9b3da7e665a00094d93216792041a758 SHA512 7eb681c89b86e32793e7097fd1e2283314aa17f1445d68eb3e53ad6965fd8f38f5aa95e7c572de9e2ff7f27641325e2e2495fdf4dc0f532cd008e35b92571903
diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml
index 8d6384de1b01..25c19c65f950 100644
--- a/x11-misc/piedock/metadata.xml
+++ b/x11-misc/piedock/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/x11-misc/piedock/piedock-1.6.6-r1.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
deleted file mode 100644
index 26e1db0a646a..000000000000
--- a/x11-misc/piedock/piedock-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
-HOMEPAGE="http://markusfisch.de/PieDock"
-SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2
-	https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> ${P}-gcc6.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	media-libs/libpng:0=
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXrender
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-signals.patch
-	"${DISTDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable gtk) \
-		--disable-kde \
-		--bindir="${EPREFIX}"/usr/bin \
-		--enable-xft \
-		--enable-xmu \
-		--enable-xrender
-}
diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9.ebuild
index 8a2ea62a1509..2f6dc152253d 100644
--- a/x11-misc/piedock/piedock-1.6.9.ebuild
+++ b/x11-misc/piedock/piedock-1.6.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -10,15 +10,15 @@ HOMEPAGE="
 	http://markusfisch.de/PieDock
 	https://github.com/markusfisch/PieDock
 "
-SRC_URI="
-	https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/PieDock-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	media-libs/libpng:0=
 	x11-libs/libX11
@@ -32,8 +32,7 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 
@@ -42,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch
 )
 
-S="${WORKDIR}/PieDock-${PV}"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 8d3741c8041a..b2fce76fc41d 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -4,6 +4,6 @@ DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f
 DIST polybar-3.5.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
-EBUILD polybar-3.4.3.ebuild 1845 BLAKE2B fabf5fd39f2af2c9984736d89742f955243f6c1c2736e4fd9258a637a15816396b9b0b2fe2f130804e687a6bd9592bc7e44249e3f5f4361a0ec3c3cf56068edb SHA512 56d9a0d5766b19a3c1beff2a61fdd842443e6d71e3147055bcc89fd70515fa922810595f1fd225555468b8054153d544db593df66fde8dd65c60c17ac8139925
+EBUILD polybar-3.4.3.ebuild 1847 BLAKE2B b90f7c59488451a139ee333f8d2968d259fa8233c305a942240fd308a01a2fa4875231287c0c6322ccbe0ca4e192a9de7280c9c307bfcaf574a15e33ba149db5 SHA512 8566dbb9a57dc6661eae3b59dfbee440063427f9a485849f7ab94c6432698df73907bb0047b57116d94972a9e6dee64ec3ab5486ab017440c6a846746ab99354
 EBUILD polybar-3.5.5.ebuild 1913 BLAKE2B a836f322cc212bd9fd3eecceae17f084664c27470af84789c2fd963e4999ea9085f25914a9d944e6acb90f7c249fca13b2381fea9fa64c3dfef68699554f2230 SHA512 dccd5cb5885c065a0099ef24eaf88bf87ee6ba559d8f017c0dbf979c5a24e01a026bce635c130f17f7110bcdee530c434f299b7114f124951627579c27a6be1d
 MISC metadata.xml 690 BLAKE2B a67ba0ba7acc59f754a50d95fbde39c861a0253845f1bf965b82d3b7e9ebaa699ff12ea60ebb2018a6518d7b0fbd3baeed05ff7496d302932bfd11aa3077387d SHA512 16b3f3e709976ac75c8c45d8963d7224d34c36a452cc7beb18883b912abbc901336dc0d9576ccaeb94f4c28edef5bf951306aca4fce0ca163dfbb970d031d88e
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.4.3.ebuild
index 86a472786934..bb2d1dab4f8e 100644
--- a/x11-misc/polybar/polybar-3.4.3.ebuild
+++ b/x11-misc/polybar/polybar-3.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
 I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
 
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index 5d283c86d2a0..1ea0d3edb6cc 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,3 +1,3 @@
 DIST qcomicbook-0.9.1.tar.gz 739887 BLAKE2B c4072e849f173bc6014e1765adc18ac359e5508b5c6bb110782bb92c81fe7683911a68910976cba16263950d9ac9b9ad53de44c4cd692d0bd24374c38012ebbe SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d
 EBUILD qcomicbook-0.9.1.ebuild 1621 BLAKE2B b42a54d50841d54c6bc88a4ceddce1727ba5b8f3553dda6d8ee76a089452a7a2aa8428f1bdbdb3fea7c53d6a0a93de1387b4ccf53d2afc9d4fd35104b36aa20c SHA512 0851e70d9161b6c323e41d7a0909ebe1b1fbf1f60b41ae3db54541ee7a0775b8f3577577abe5d146a01662683c8e198ad68eaea2d8000f0e6182a1bf97e2a1f8
-MISC metadata.xml 469 BLAKE2B 09213bed780c0d2f966fb7ba16c052ad397999be2e6e238c8e915ebbbb938f3210409e2d7961c629ae0d8abb20efa99b2b833d2cd268e7239ead845294b8fc68 SHA512 4c8f85cb1afed375e4b2c19e873c2c70ca7c11f139305af70a2b8556230ddd17f52753b1302c8d5547b4922e35c1922fdc001e62b420645f1c36097ebf5e855b
+MISC metadata.xml 469 BLAKE2B 11613d3dd131dbbe025d0b8a72a98b6ea00e703129311bccafadfa33fb0bb812795bf8de26ccfb6fdb227db7c97cbdd0d09349eaa99bf6a7b85e6a9318e55039 SHA512 77530a25b63eab9ccef878c01440f72e1c6b96b0658b9973870d1174d1ac7c8f0a935120d7f60ba7e2bc292f4cd879be27a4488a2db41eeb39658067d346dab1
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
index eccf315497a7..90a67ec8bc08 100644
--- a/x11-misc/qcomicbook/metadata.xml
+++ b/x11-misc/qcomicbook/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 8f216d9464c7..95d7da9931ce 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -4,4 +4,4 @@ DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086
 DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046
 EBUILD qterm-0.7.1.ebuild 1255 BLAKE2B fedc1e24a115cac7d30f74520d28de368dfbf243d855789dda433f772d9992f8e2b96e371a8fbf4844d59ab46c837d5e1aa6848199962126bc16bbbe471cac8e SHA512 7b34ad4108b4091f329fa47e1f0c9da56fb43e2515d4669e472370c8556279bf35af0ce01815099ca486ef9e716e1d096728e03a0a2554ab416f0c25c207278f
 EBUILD qterm-0.7.3.ebuild 1232 BLAKE2B a6a50c25de78620c24210afe6d5d5f7daae19e0381fe7f2c35feb7c01520b3ab9d071642a4c5962fe4a46bb7296616cfadd989b5774236e21905a74140eba3d9 SHA512 43db3c5df8b8205c318c60f89480fd89b3a6d52ac8e749c0daf160da81bec4f096497cd4c80164fb5c1218c80230730037464ae387652f1397d63273e7fcff25
-MISC metadata.xml 360 BLAKE2B 8d292a4705a58ce03c68c3b7933414a5a1e5399258b8d6e4346098c948261d8dbfc2ebe5012c0e2c5a445cd93e4061c0322152d71ba73d8b6ebfc00a6b1935aa SHA512 e93913eefab59f5e1fb1478b5ac530c689b92bc27230d44dd98e233d75c2b8cd8a9e3f3f123dca0f6dbef1ceacb1fbdcfd13c34a0f8f96b09d348ce323334f62
+MISC metadata.xml 360 BLAKE2B aa8a69bc47493bd2bb95ce947345f7f23e01f8595698866eeed419b1de3bc05ba980f56ad578915e79842850d1dacb311cdf59c20290714326e1356315541e7e SHA512 086e4ef1c367f207c67c8d12394b109873ae4718f4b6e2d99700c0e9d8a5007ca7732517b895899b5dda45ae32d7ae19d51eca43682d9fe3ac5ab6df33dba634
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
index 59fe2d65e616..68686f6d0a85 100644
--- a/x11-misc/qterm/metadata.xml
+++ b/x11-misc/qterm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 86c5151aea21..c12aae8dcada 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -3,4 +3,4 @@ AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42eb
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
 EBUILD qtfm-99999.ebuild 1016 BLAKE2B 4c85b061cd9b00363ae50c83a2da79b81bf52e394a2d7e8e9f5d2cd47058992d1b8966805d35c458ad78bb14b53d9e52ac24a35f6604c1eb83c7cf98e82f53de SHA512 c68b2e850ccea6ef67be140bf10f87f4178ee4e73d022e33df680814e63ea2d4bf994a1a1a5a6e78f8dad553618de9c383b0898c88b02acc086e6a30cfd3fb40
-MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
+MISC metadata.xml 535 BLAKE2B 362bc6c8981224307f3cdbcf19a74d2e5ccc5ae3a4d978ccbf3a2c7788cd846a8edcd32554d37b182a2db7bb98270c4548663ff5bd35a05709b4251cec7e7384 SHA512 259069e928e22f7ffaec50608940576c7f0c4080440efbdcd17eb7b3dca852faee5f4ee786e31164e110ac5a63696ac51959108204064405ebfda6d0604ee91a
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 004b55d08e68..c4dbe1cf8755 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -10,7 +10,7 @@
 	<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
-<flag name='dbus'>Install the qtfm-tray removable device manager</flag>
-<flag name='shared'>Install the libQtFM shared library and headers</flag>
+<flag name="dbus">Install the qtfm-tray removable device manager</flag>
+<flag name="shared">Install the libQtFM shared library and headers</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/quitcount/Manifest b/x11-misc/quitcount/Manifest
index 9c6a2c844e43..9c0be1074d16 100644
--- a/x11-misc/quitcount/Manifest
+++ b/x11-misc/quitcount/Manifest
@@ -1,3 +1,3 @@
 DIST quitcount-3.1.3.tar.gz 403607 BLAKE2B 90f02961afa25f3df6ee81174828ed7a0e61403d91c048cf9d092f0a7c68f6530acd38ff1410d24a93046618773444adb4e3a903f1ac6400956973191ead6d2b SHA512 92e088b8272657f14e60d91589963cfcefe84ead9f4d90aa3a77ac9612fe216f558e0378788edde7680a3dba131021bf72129fbc1291eca83cd232490f486f9f
 EBUILD quitcount-3.1.3.ebuild 597 BLAKE2B 076a39fc92bae1eeb52da1bb6d9e88c5f4f94d65607913c5cffcf20ee1ddbe18148194fbb3bc95478ca3d493c04f5867776546ad5d1a0ea28ec771d1a7aea6ab SHA512 75284ba3b2bd4ab5d677e00b96f31ac6451c28eccecfe536579dfcd0b3fb94900eac0fe1b87a69e908e3fb48eb5233be086966ba4e5ce5d3f05972ca31223136
-MISC metadata.xml 443 BLAKE2B 6c5c178a955d2a5cb085da9285a57959725afe655bed921b64a45568f39e8ba8f3cefacf44b6258b6ef36a7bec0c99a95af2a0ed758eae9d46f75dbf0a88eb42 SHA512 bd5273a7c5e9a86c4e97987a25dccd842d9e375b5640612eb3d3c5e338562edf00dacee5e90b183f2b1124a6650824c439bdc4f3351db558afdf66d1d125fcd5
+MISC metadata.xml 473 BLAKE2B c0ba9be513f0fccea3d89d9570004f5ff6b6e4ff882bd76acc958dd07ca0236bd6a0bfced40da21530f122d3ef211cf5696a6756395934583196cdfc25cfafdf SHA512 ebf15cc8dd9fefcf9a0af2706c03e4b4130a07222a10006321ad27464a65b1d861956abcd58a4f8c280a99819615784168d616a8a43aeffe102f661df0159b7b
diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml
index f555183b2831..b229b8794b9e 100644
--- a/x11-misc/quitcount/metadata.xml
+++ b/x11-misc/quitcount/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>laurent@lamzi.com</email>
 		<name>Laurent Vivier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index eed530ba1c95..32f6b459e13e 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,3 +1,3 @@
 DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f
 EBUILD revelation-0.5.4-r1.ebuild 1166 BLAKE2B 9e8f83a6f6b4b8a60a1ea22cdb7eb53b579c71bd3d8ecb66649d6879ef06f799a91bb1f8b0240326bc8dea0debfbb5f6b8ceb01a184a88d9597272f429ee1139 SHA512 7379d19e249bf98f024987a791906f3c55d3c58a1d8981f1f134c23c9caa1f3c392b8205baa04fb091624b86a9b4c0286163ed0be90ec86caf39ed0fc8d1b0cd
-MISC metadata.xml 382 BLAKE2B 2a58c709cead6b58075460431af75fd8fa8f0e8f965efc62d13878b0ffe70ef9461adb3f980463241dda25c01adf0ec934087e6da16d05822597ddcf92f10b1a SHA512 c7a4a726b4d7ec5462bfd941673327380efb5fe0d32913f125e0df1820d9605facef16a2f766fbb4baa1fdf5000b1a31beea3a454e4dc7918ea387459d28c6c9
+MISC metadata.xml 412 BLAKE2B 5149be4529e8bf8baf206d108408782e4693f8fc81446948051c7f64e9d010813aa3f448c82b80ecc70a72d1be0d143944840a086f3a4ff105dc741889b64c65 SHA512 bc0157656d12b2485e4a6608c0d921f148d2b13e6633cb13fe08ed210f065b38b60b0e1d7bac8eb1d26a4882ef54f618b3ea5d86be3d8c62f6ee0148af3c909e
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
index 2a6c92d969d5..6dfdfb38359a 100644
--- a/x11-misc/revelation/metadata.xml
+++ b/x11-misc/revelation/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>misanthropos@gmx.net</email>
     <name>Richard Fröhning</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index 45f13314230f..d7567e2dff17 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -1,8 +1,4 @@
-DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c
-DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa363f416f0d111709541f2960f0f5ab31d0eb129000e7f82af3d46ce0a52918cfbfc00d14292a839a40a0986bb0 SHA512 a87523d3d64fbd53e431dba7da674a213fcfbdcaac25906a19bc83aa3feb14da479b702b39fd58ffeb04198ea0a5d52808f7c9c36495defc99c9c83df963e0b6
 DIST rofi-calc-2.0.0.tar.gz 1695125 BLAKE2B d76c304724b0f3326a8bd26ab2c7eaed5f77f3b6d07ddc97570a1fb28d56504d98ac9ab66411290cb548b760bd3231a729dfc470e748a8447e323d1b290f677c SHA512 298f9983dbd140f5aee5b3799b165500eae100f3f5744ba07914b962faf01661dee0f5f4c9c12a07a4e210b6115ac6fb377d9fa9a7e64ef5a19600e9f55cd478
-EBUILD rofi-calc-1.5.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
-EBUILD rofi-calc-1.6.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
 EBUILD rofi-calc-2.0.0.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
 EBUILD rofi-calc-9999.ebuild 467 BLAKE2B fc14f1346f9e5ee3a4199d3f346b0be73ba077311efa515abfef36cecaa6e4299949a6027a0de6190c8ecde529904abb76b2ba2afcf3a605a6433170f66faa34 SHA512 96a703783182f67fb241919b540a5ef2f961a2eed5db80118679bb47eac2c508b695fa1ec389ceaf964860ee9758f878546bf4303e667f9b03757d2289acf2a8
 MISC metadata.xml 266 BLAKE2B 81f9187791657d73f222a9fdb13afbec46a4a493590a18dace8fc39cf1a2a321fbebab3054aad72756a04c2d6104c08e83e4fc70ad0bf8a1a24a09673956a502 SHA512 f35ebacc5e0574848fd39e1eede846facb50015a0449cc0b37807caab44b7c46d28ac490aba2e80dcdaea1ae2eca7158b5894ce647b411661955f16cb69c9223
diff --git a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild b/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
deleted file mode 100644
index a267871cd50b..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-misc/rofi
-	>=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf -i
-}
diff --git a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild b/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
deleted file mode 100644
index a267871cd50b..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-misc/rofi
-	>=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf -i
-}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 7afa75927f1f..43f382c8c092 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,11 +1,7 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
-DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
-DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
-EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
-EBUILD rofi-1.6.0.ebuild 1127 BLAKE2B c279ac1a739c9dd30bbc1a87856e4f3b4e787a20f3f857d805a7775b2a7b363fb1a59d6f7fd7e8ab2ae904f57a8d98ed0d17201876426015ce2bd0de68ee0516 SHA512 c0cd9be17f855fcc119fd58e614aee41d1ab9b368de322f903652360bfa1ba7a166f47d2c3d09a655dec32edfbeafb5f85e0e1ae2484986524c982f3d6a6bc1a
-EBUILD rofi-1.6.1.ebuild 1222 BLAKE2B 10ec63a1d98f2fc8e304c250d6c30299572f4e46cbe293035e2d8be600aef226f00183ec2c1fa153c0e2c90cf0d55d15564c6e4a3cb54ddfbf5823d9a346e477 SHA512 0db1a92632c44ab92f97d05ea230de23d602b7870b15a7e5ab36c8d1aaf950d4ba05a8b776074d0dd458173bfb1c8d27c9c5faae8694459e306f86a03e6603bd
+EBUILD rofi-1.6.1.ebuild 1220 BLAKE2B 19ef083739612c9b4ad1e018c447f6e21131a74a278473d584523d9f2fdafa612b2e8b033126f2385d9d4166ad68b895b784919f10df49094cad83350d2f6437 SHA512 43401b44db501d72e76a5ae39bab30996dc5b4703d8286a3151e8e1781efd78b0a33785973b4e159d7f2e433dfadf68e099a6875da0adc22cb888186372e32c6
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
 MISC metadata.xml 475 BLAKE2B 6ca3375d564b137bf9e6b9f71dd725c5602a24e2184e420002c161681e314bb0ba4547e171e18e3f036637447001fd8af41e46f7f6b7ca9795020bdfacbd8a57 SHA512 0adff749d0effa8e97ebd8e00714c8f854bd5d71c07f7c83be79da5b80bb9910b06d14a7df7145d92b2aab2d905692c5b3b9481007bb47dc0b7f17f59ef781bf
diff --git a/x11-misc/rofi/rofi-1.5.4-r1.ebuild b/x11-misc/rofi/rofi-1.5.4-r1.ebuild
deleted file mode 100644
index 6d0d5474b2bf..000000000000
--- a/x11-misc/rofi/rofi-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test windowmode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.6.0.ebuild b/x11-misc/rofi/rofi-1.6.0.ebuild
deleted file mode 100644
index 2eed2dccd62c..000000000000
--- a/x11-misc/rofi/rofi-1.6.0.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 autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+drun test +windowmode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	virtual/jpeg
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable drun) \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
index 297c2f078d6b..c919a190ff0f 100644
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ b/x11-misc/rofi/rofi-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 762a8004d76c..dee077dfa818 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -4,4 +4,4 @@ AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71a
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
 EBUILD rss-glx-0.9.1-r2.ebuild 3889 BLAKE2B 683b3438bac0a26d25624a9a5a25af79cac0664258ae3ae63c9864b2f2a7863ce19840d8a6005c43f2c33bdf8c1e68dac31a60a470b797015a05d0627a539650 SHA512 59e7144e04ac084e85288d7dfedbdb78f2a7d34ef49cc15354c9f3a0d26620edef94460732e841ab2466583d5d22eebc3270e402ed16c6bf78cb999ba5f0f67d
-MISC metadata.xml 535 BLAKE2B c0dac8ef95340aa65fccd3b160ad6c281c2e6286aa8fda7d29f09a7fe4a51336a3d48bcc85d163253f84ff53c70daceaa6d8a4ab7c58e358e9d9c619a20deb23 SHA512 e9b3ee968ad5e87435f9ed27f22a2e6bb9540799b3df496126910e2f5abc8e9a6328cc8dbff217f5a9f86c96f1dba603f835a3bfc481a4eb88b999ee27eaee2e
+MISC metadata.xml 565 BLAKE2B 12058c9f2b265ad0871edf45d3432ee605ccecbf7b9c0f3dab5752dbaa061100203653ac01cf2bf251e3698163d542d133d6ceca26d2c7ddb3c1b885a3876c3f SHA512 acae3bfe457c4c171b9cb8458cfd455ed6e9d8b253dc3db659aa5d843e01fdfb68645911d34f200fc140bf2fcb9f19228d2ad169ad75dce5e2f9bc8f21f2f33e
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index a8d95d93452b..b89ea48fe4f8 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alex.miller@gmx.de</email>
 		<name>Alexander Miller</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index cad7c5c3692d..736c1abb87e8 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -4,4 +4,4 @@ DIST safeeyes-2.1.2.tar.gz 348431 BLAKE2B 03d51c435f62e00703aba4c1224a5a961b1a18
 EBUILD safeeyes-2.0.9-r2.ebuild 1061 BLAKE2B f1f2da8fd981b9bae189691a6f3da6313c2b70138f3282cc536e20e0e30d9953236b81a65d8fe0f823129c1a4306673b530571da5a7c3959387bf9983335c2b2 SHA512 e9e1d7fdb90c1be5640bfa0457dcab4fdf8069198d76c9d66ea3011004b7b9963023a9b4730d8cf96dd6b0b5bcecfac78cdd003b64a37446c6dd69207c484a08
 EBUILD safeeyes-2.1.1.ebuild 1100 BLAKE2B b2bea10c80ec9014257debd33a69caa149ccbb0b3243a8f59e183ab04deefedfe6cd41147af6aba636368e5b5f00dba7e268b044c7efc7ee46c567298fb8ce5f SHA512 c93e668802febe7d6ca873017ada4f096c852da76fd06cc7752d3c1eab76eb437d53df7e856dbfd870100ee2adaf12d042be4f36dfb7c1338bdaa4411e2bdce0
 EBUILD safeeyes-2.1.2.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
-MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
+MISC metadata.xml 346 BLAKE2B 3840a2a7a8d6855de3408976ad5a12f0570ff312861f96fdebeeb944f8578c0aa0cbb9ac0324ba30dc455dc4550ed2b7666279a65262be79ddc06adfa1131103 SHA512 3eacc25749a3311010821adbf6319cad682aaba64cf1c5c4eb5fc90d1558495326394001c22c9474100de2037dd6cb922f53fb4d51b056a0b35791051151af7e
diff --git a/x11-misc/safeeyes/metadata.xml b/x11-misc/safeeyes/metadata.xml
index 8ff45602e151..ec1f65fcf38d 100644
--- a/x11-misc/safeeyes/metadata.xml
+++ b/x11-misc/safeeyes/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index 11ade447a4d4..460a8d9e836c 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -3,4 +3,4 @@ DIST screenkey-1.4.tar.gz 83784 BLAKE2B 4d4264ff88fdd57b27709091c5bd79dba304f942
 EBUILD screenkey-1.3.ebuild 1104 BLAKE2B 37f0a3338b47cc1c7aa3de4d0b5cbf59cadf4c9d6d6e2f81c836bd6366b2188ed1ad2c033181a19e29a14175834351c57807128109465c9417e671aa5d11d05f SHA512 435b3263c4a47c1702482166ddb2d81397c507d5a8156a1c04f4a4689e0b4b9f18cd82eb369691a16596251e675639acfebfa62ad78cd1c4febd3c13ef1672d3
 EBUILD screenkey-1.4.ebuild 1104 BLAKE2B 96e5b97b366038df606b8784e9cb154a2ba7699491ea5601ce7a7aa660e9803851a3b16dbb9548d93b852e72a8b6f5b55109ded8189d1abb16a06e0fed357175 SHA512 1921cfd2c3b52ef3b773c037091bcd2a8ec2e3eb928a348e7f94b9cd0ecb9d10dd22cb70c27c7f1c9bb3f41be762f0a483f32c9e3599220cdae3b1c1734e040e
 EBUILD screenkey-9999.ebuild 1104 BLAKE2B 96e5b97b366038df606b8784e9cb154a2ba7699491ea5601ce7a7aa660e9803851a3b16dbb9548d93b852e72a8b6f5b55109ded8189d1abb16a06e0fed357175 SHA512 1921cfd2c3b52ef3b773c037091bcd2a8ec2e3eb928a348e7f94b9cd0ecb9d10dd22cb70c27c7f1c9bb3f41be762f0a483f32c9e3599220cdae3b1c1734e040e
-MISC metadata.xml 485 BLAKE2B b96ed029eddf5bdddce8f4ee4cc49288a2d431fc10fb61924a72cd21e6aeb193d2cec78eb2e1f8c17fb314cc59cdfca6c72d8502f60b14976ce4e8170c761380 SHA512 696850edfd3296358c41cf32127805b9cb555f7db03fef7f64a3fe6ea0838f06d565116355c3b5b0619adf9fe287b1860d153dfdafe008ab84ea77019df759b1
+MISC metadata.xml 499 BLAKE2B e598948777877529ec9a6b90f8f0a50b8de9e9cb33650bc68c44378f4cb87b088cf0c226ff9cbc3e737db390025f37da381a2a8cfdd4ebb3d505b9116a90ce97 SHA512 2fbe86e63c6dca8cd433799a078b749d920216126657483e70a4a7712726c8fc61079a70d66a7ecd7a0db3abd4960514b733a9206cea606189b03b33064dd005
diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml
index 738d0b8924c6..60a1e8abdc5b 100644
--- a/x11-misc/screenkey/metadata.xml
+++ b/x11-misc/screenkey/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 0b80a4f5bc4b..c1f33d83ec5d 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -2,4 +2,4 @@ DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
 EBUILD shutter-0.94.3_p20200621.ebuild 2344 BLAKE2B 8519e1ca1c0e45e8712ca98795bf24a65ea26482abd896d9c9fba923cee8c3a4363fe184c9ce68a759428dec94add0316c65ffadd14818352cf6302b2c11c7dc SHA512 1bbf7d90fc522878d9c9cb82bb9f83966e51be028adf8c1a7060d6e0619f9362b577314feb024583eed075c4a32b2a8b37476eb3e2f18dde51cd75fe51c2dde9
 EBUILD shutter-0.95.ebuild 2187 BLAKE2B dac0556dace5b2d8f710457a653012b39fc2c25f98bb69eca4e4b186dd4e094449313a5b96ef8830732e43e37ba5770ea51418a2db4135e1fdb8c9877ed555cb SHA512 b5ffbdd4d0812a28970e206dfc17674794870e81bdf536c8bdfbd67099f75a21ba94d00bf5d6bc72f66f6cef39a38d92afe882a3e574a7ce037c42a09c89982d
-MISC metadata.xml 373 BLAKE2B 1b254f3b91e248b37f243d85ca48527e68be76849f668d1918e57a454e1e9da0f899ea36805138e4c18164d91c44b6aaf6a75a46deb5b42af2aa2e1b17a679bf SHA512 9c42f1f7eea609dbd75eba9e5adf78b9f4f69a5966ad54de04cf355672357fe83f1a4f5d140d1701523d96279ca9c8c095dd796bf135a57339ef4d6939be615e
+MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index e863a6fabb22..eaf643ffbdfa 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest
index 35eaf5a32a9d..fda3a13a0791 100644
--- a/x11-misc/simpleswitcher/Manifest
+++ b/x11-misc/simpleswitcher/Manifest
@@ -1,6 +1,4 @@
-DIST simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz 16370 BLAKE2B 5bc23dcb26a99857c943b52b857f227043f3062337815f9d9f7feef05120abcdec31c3d756433e763b984cc8df506c9667954de200f19edff72a7a9efab9dbde SHA512 1c17e1858855d587a85a2ba2c0000ddc3e6da0e8bfdb6703de04a7bceaa575d2db0b8a032f3833c1f08c0ce413eaa1908fa62c6b6c98dba367668a7bceec467c
 DIST simpleswitcher-20191008-7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz 16400 BLAKE2B 5bf6efa685c6114cb8ad5ea491f683f25aa7c2ed84d5f3014de9c3eb4ef1934be232082190c3c7444acfebf902ba7e0aabf29604cd7abb9fa33c6fd024ef2b90 SHA512 b86eee41de3c0b92fe68f13b8691fd0a60a6ffbb73bfcf411c2898b3bb5b159bc4d36a09b651cba27d375ae2db99ce2e046b1dde8e9d93d8d5444b3b338c484c
-EBUILD simpleswitcher-20140219.ebuild 720 BLAKE2B 76d591f761556a0ceb92790b0bc274030f1c746fe4edd21a3a9eb1b193a72b8d79e10f284d0e66a7d4dcc70067133f06ed873f5b59543e15efdedeb0ad365b67 SHA512 ba2202e5f1587246c3976984bc8d2e6c6da4990601c53820dbb90ff5644fbd1a221195419ae95961d1efb0458da8fd627dc52acde5dfd9105f0cc5e31e0bd8e5
-EBUILD simpleswitcher-20191008.ebuild 677 BLAKE2B 3d7f777b44af674c090587aa4efda26df9506f900ece22bffbff6bd9c3f1faac0f307515b39b473e51a7b41961743e08460fddee6495c3866c0f3b8c4ca7ff9e SHA512 2f80704f638a0e7da69e6cab10e05d282e0e6f946f995fffa445a4cf3039617a1bef8be49eacdbc5596e217e6e6692f138de5e7fcd2023e593513b64a4b822e8
-EBUILD simpleswitcher-99999999.ebuild 550 BLAKE2B c4541ff14cfb3029134ce285d0d472e95da9d0e13e60102d8a670634c9856da6e852c1e9a5e102a21e00edd91643b958b3614c2b4e0af9187fe858e687df8232 SHA512 ddd8d681380e3e4f54e1719f0d0eb84bccdfdbe2500f452b91d6a064a32d34605e48d76171c50648d06f48b79bb5d93b77ca9bfef29a5ad9adf9f4402b537c79
-MISC metadata.xml 307 BLAKE2B e6baba19f9e851500948d66078b74d9f0d1aa06000b8fb13e4de54a43c5d1206a02033375e554995497dff2b431158788d1dd86dafa780a3fcd454ac7a14a8d4 SHA512 3f110a2d7c7a233ee80fd3d7cb3e5a315a04011fd13251d785cbcace59c5b5be3734d3c52eed2c4ad89454b21f3b039a89ae5d80e63735370f581d9e9b0478cb
+EBUILD simpleswitcher-20191008.ebuild 686 BLAKE2B 5557f8be698eef4562d969e47f7fc6182654ff8551398d7924ff82ea517c388ff02a80bcb474d65fd6609ee73902c37ffdc71cacb81816744f1ab35ebfec9341 SHA512 5bcbdb9425772fa842a244972ff53591fcd80ecdf274ed048005eaf2ac43b00863666d9c61077f8fdf8988835a1fe18b40204bb8c3dd4ac57891f920dee226fe
+EBUILD simpleswitcher-99999999.ebuild 545 BLAKE2B 8bdac9e32a479284ea13e5ec2db819d28717251709ec99369f0f5b3881d53b4fafd6bf191da988a38a3d19e003df3188644a0a702b61061663123680ffac987f SHA512 4a793bd57ba2e96ccaabf89701f3fcde07ffe41d251e4ad069e0bf9014dedc713bc3e086a9318256578d19d3513dc4ed183afc939df7a4ddfb6f82c8671b83d5
+MISC metadata.xml 307 BLAKE2B f56f8cae23b67580255ae8f4349157abf8f378af019085b2aba98814994fc5a512a74181f214d2d50a2708290721d4951456a8017666dea512a40ad0c2ab4e10 SHA512 02d8a3e0793b4213590c4f91c4d101e0702fd475292bf28b045b3d8cfc1cc94fc440e5d31247470a3c5208d8f36d23e86de82a176a61ebd03c427c3029079ce6
diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml
index ce653eb7e972..66fcf77b84af 100644
--- a/x11-misc/simpleswitcher/metadata.xml
+++ b/x11-misc/simpleswitcher/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>
 </maintainer>
 <upstream>
diff --git a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild
deleted file mode 100644
index 796d5806dbf1..000000000000
--- a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-SSHASH="cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a"
-DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
-HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
-SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXres
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S=${WORKDIR}/${PN}-${SSHASH}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
index e7051abca7cf..830edeee59d4 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 SSHASH="7230421aa2e3364e3b4620f1ea3760f8f810b1a5"
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
 HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
 SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
+S="${WORKDIR}/${PN}-${SSHASH}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXres
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S=${WORKDIR}/${PN}-${SSHASH}
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	tc-export CC
diff --git a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
index 24730fddec45..c4313820fcfd 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
@@ -10,18 +11,15 @@ EGIT_REPO_URI="https://github.com/seanpringle/simpleswitcher"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXres
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	tc-export CC
diff --git a/x11-misc/sisctrl/Manifest b/x11-misc/sisctrl/Manifest
index 956d9ce123fd..f7f721177494 100644
--- a/x11-misc/sisctrl/Manifest
+++ b/x11-misc/sisctrl/Manifest
@@ -1,5 +1,4 @@
 AUX sisctrl-0.0.20051202-no-xv.patch 301 BLAKE2B 14166dac99420663ee9912647b9ca0bdb9e80f91aa129b4dc3645c94f37530431159e9066b3bee638dbc2d37755bbe6f820c0865b13e7000995e65fb83ca450f SHA512 494efc2f8505a3af3b829e9f7b653ca674b3d7668fdf68fc5b587cf83421755303041bc9fc881226839bce39e324147516e06106bc2730aab43de9c559b61c96
 DIST sisctrl-0.0.20051202.tar.gz 666749 BLAKE2B 8e99581cd9708a17ed3d01934c3a70e660213df91cbbac71816eb16dd5c41da725d92fc66d336fdc88b61704d9e7259f77b3da2becf2d2ab901d72e71f1e8c9c SHA512 26fe6561c2c14ff6cf952b89b8089b4fbdbc0c142bbcbf1358afe610b219a05dcf4d0bc835365cd0cf13558fed142b8aa2a0aa91c4fec8f40f0fc82590feabd1
-EBUILD sisctrl-0.0.20051202-r1.ebuild 708 BLAKE2B 4c56492577ae28b3b3c8a19f89ab164e5745025af651257efdf32ca54314a90ae451ea29a745506c84e06315cddb336733e1b5b3329d229b14d1e93d67e92efd SHA512 8d2d39c04350ab0be0000dd717bd6f1daa7f8ecca013d1d9155d1015998fe6218bbdd96dc43ce82ff4d6b1e35565c98e21deb7b6612d0d0578640aa05c3802bd
-EBUILD sisctrl-0.0.20051202.ebuild 705 BLAKE2B c04e42d978bc4ad353f70a75008040425fa52b426ae64bbce79f4047d46e0efdb271397ff15f4f4f80c782ff982b777952473cde3152b8a6ef431fd2febae399 SHA512 c5eeb8bd504b7d78ca45b9b559c4f0810c15968cc9dc957db37e72d7cafe956c06a5509e5cdc2f746e7b7b30082dab8549d5ced84cfdef85cd3b055bac793c04
+EBUILD sisctrl-0.0.20051202-r1.ebuild 723 BLAKE2B 9bd3bf41adac8b91e60cb50d6587ced2944c5d4a870f9b23d8bbda9870f89994ed2ecbe6f2bdc35dcacd25b870ac61764855cc931d06ebd17cff356b988f3e68 SHA512 4f2b63bcefcbab61d88931bcf4da9d1abb6283beebe2c5d7ce688fdfbfd3f966b74c13b7415a04fb7df076180603c0dcffb66d2d99be10a6cc74ba1d72ac9372
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
index 53c9511c8cc6..072b2dfda9b1 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic
 
 DESCRIPTION="tool that allows you to tune SiS drivers from X"
@@ -10,8 +11,9 @@ SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:2
@@ -21,10 +23,11 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
-DOCS="AUTHORS ChangeLog NEWS README"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
 PATCHES=(
 	"${FILESDIR}"/${P}-no-xv.patch
 )
@@ -32,5 +35,5 @@ PATCHES=(
 src_configure() {
 	append-libs -lm
 	econf \
-		--with-xv-path="${EROOT}/usr/$(get_libdir)"
+		--with-xv-path="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
deleted file mode 100644
index c6a8cc504965..000000000000
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="tool that allows you to tune SiS drivers from X"
-HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl"
-SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	 x11-libs/gtk+:2
-	 x11-libs/libXrender
-	 x11-libs/libXv
-	 x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-xv.patch
-	sed -i -e 's,/X11R6,,g' configure || die
-	append-flags -lm
-}
diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest
index e41b14097eaa..6dda5b2fa02e 100644
--- a/x11-misc/splatmoji/Manifest
+++ b/x11-misc/splatmoji/Manifest
@@ -2,4 +2,4 @@ DIST splatmoji-1.1.1.tar.gz 4329965 BLAKE2B 6c9958bc8448d4e1c84358a7631d9b69c6d3
 DIST splatmoji-1.2.0.tar.gz 4331395 BLAKE2B 2a786aba2ffc652c16fa479c0c2f2cba9b54508b2567f9d0d4269b81f100a8d1abe81926e9eaa9fbd3eb84617806755c21abdfd56fcdb0e58efcacc7dc2f3260 SHA512 d4f906bd6aac862cf696d159dca0a0a3317912d16a79ed036b313817bfee03b89900975b6d2cd3e24ea907d3e9fe8ffa501164dc9fead1017d91bc4c545e96c9
 EBUILD splatmoji-1.1.1.ebuild 616 BLAKE2B 919cfcecdfc19dab68543e73c7061ecbd48b36f640142a85709b2a524ab3305143d166dbd3c1f7a022c5e1d384b7dd73962812785383fce890694d07500f92ed SHA512 0d29a163bafc867266f529adc4acbb0b8fffaa79796f29bc6c4aa4b7b481fa49f4306d6bf06e6987468e5136aeebc6ddd70ff871abc1929786b06c7012dcaa07
 EBUILD splatmoji-1.2.0.ebuild 877 BLAKE2B 4eec6f4811af9fc250c40ffa00fd32a7c9da5b8d06f3112bacd200fde68fcc5c3f5e3cd5844dbbc80db83c6efc5d7756b567dc76c3b68d86561b594add41aeb3 SHA512 2f0e7ebfd7d6cc1b851790648c812e0c17210b3cf22bd5f85dd9865db28810bf5cf8ad18ad16cb996920d177bc4218962a95cd7385a932a775e6e063dbaac570
-MISC metadata.xml 612 BLAKE2B ca9e33ad1b59ef01ed77aa8c09053544b1e184009bf499fa105ce7cf23d87baa2943b44549f27c77e02f2f4fd58dbfcbbf8412b06d6364df3d45404f256fc231 SHA512 8a2e21d68bb4e70b8899c91f2a47276808130f57037d91373356077643c653736639e72f24c2c6aba0f8154f3dfe636b9eedeb5b8d16108e767f066a89b1c21b
+MISC metadata.xml 642 BLAKE2B b7dc18a9cd6ec57c1b1368b6cafe959abbd1e8d2f888160193a6ad94ad4f6f14d425c5548a440dbdb60e2ca381fc6d3c011d68c961ccc6ca2d8514b328659d72 SHA512 ec0ac134545e93994b7a46f346fe4fb5cfde886b8f5580f0265b1e8198152aea880a6f008ff862b06809a68d68e07f45f8cd897792dc70b29fd1a0a637e52353
diff --git a/x11-misc/splatmoji/metadata.xml b/x11-misc/splatmoji/metadata.xml
index 8098c7e79c6b..9a21ddc9cc98 100644
--- a/x11-misc/splatmoji/metadata.xml
+++ b/x11-misc/splatmoji/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>william@ewpettersson.se</email>
 		<name>William Pettersson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy maintainers</name>
 	</maintainer>
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 9da7005d549d..440983f87ed1 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,6 +1,3 @@
-AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632
 DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
-DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
-EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B f8f8fac556180047074ce1669efdf1237d70cda815a2ee2fbd52bc06168030a9b572e84a47cd7d2aa84fdaf254cabe6aa29f81867b37d945f4d13fec754d9fdf SHA512 76850fbf0b33e739ba1633fe4548d4feb516034a61e22c0176461fecd10e0de1b082b22237ab25c02e03eb9f06c1a7ad795caaed58c0ce4fd82167691eaef043
-EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2
+EBUILD spnavcfg-0.3.1.ebuild 629 BLAKE2B 871087fae76d853b5b57b8826905903386d74cdcdf660b4ef265cea031df8d93594695731cbd5b17791c3aadcb32b3e20ae5eaa159f9fa46fbb334a8869eddac SHA512 dda9498dadf18a137eba689191be6e7fe6fc9ce92ec0683dc7335d515716a391901756dd535b9701c985f16fde53d448fde44342f20b78645bac74c3b22f1a15
 MISC metadata.xml 513 BLAKE2B 5730394269a90ee628138e0a865b15053c020dea720f442c4718baed6d6bcf7d2ba55f567085d730ccb04907c2019dcadfb2d226b53e2f91a8bd549e28ab6462 SHA512 4aee293da64f4e77b69be1c4c937787e3e1794d51ef22e3d37a5f6c20e6a3507d27c87b75495406429fdd98cd4ef3ed0d85ec9a7418c13b42422b61beb1b5a04
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
deleted file mode 100644
index d0ef0db6e711..000000000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e994e67a6a5c4722bdc8140528a4dd258c785402 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 18 Jan 2017 18:45:11 +0100
-Subject: [PATCH] Respect custom CFLAGS/LDFLAGS
-
-Based on spnavcfg-0.2.1-custom-flags.patch
----
- Makefile.in |  4 ++--
- configure   | 13 +++++++++++++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 06f23a6..296dd5d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,8 +7,8 @@ warn = -Wall
- CC = gcc
- SED = sed
- INSTALL = install
--CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
--LDFLAGS = `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
-+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
-+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
- 
- $(bin): $(obj)
- 	$(CC) -o $@ $(obj) $(LDFLAGS)
-diff --git a/configure b/configure
-index e211d92..0fed776 100755
---- a/configure
-+++ b/configure
-@@ -43,6 +43,12 @@ done
- echo "  prefix: $PREFIX"
- echo "  optimize for speed: $OPT"
- echo "  include debugging symbols: $DBG"
-+if [ -n "$CFLAGS" ]; then
-+	echo "  cflags: $CFLAGS"
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+	echo "  ldflags: $LDFLAGS"
-+fi
- echo
- 
- # create Makefile
-@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
- 	echo 'opt = -O3' >>Makefile
- fi
- 
-+if [ -n "$CFLAGS" ]; then
-+        echo "user_cflags = $CFLAGS" >>Makefile
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+	echo "user_ldflags = $LDFLAGS" >>Makefile
-+fi
-+
- cat "$srcdir/Makefile.in" >>Makefile
- 
- echo ''
--- 
-2.11.0
-
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
index 3f3ca2c51ac4..ae66b2298782 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="x11-libs/gtk+:2"
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
deleted file mode 100644
index 20345a3947af..000000000000
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GTK-based GUI to configure a space navigator device"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	app-misc/spacenavd[X]"
-
-PATCHES=( "${FILESDIR}"/${P}-custom-flags.patch )
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index f04b60f9066f..0757a1271b36 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -2,4 +2,4 @@ DIST stalonetray-0.8.3.tar.bz2 155276 BLAKE2B 68041239df7d3441f9abd279cec55ff11d
 DIST stalonetray-0.8.4.tar.gz 94614 BLAKE2B 4def696bbd580960f2d7fd84516658e4b4112b40989523840566d34dac71ba92e3adf021796059db919515cc978ac0c5d7783a4ed41aa9f82c8cbcfd00bc958b SHA512 3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b
 EBUILD stalonetray-0.8.3.ebuild 739 BLAKE2B 365dcb844b7dc3c4ef8c1f08820ffe8f053e85e571a9c8623846fa8d2d4c992fdc98363990662f4cb80e2a44a2272c53f016669c1df97b874a0fe4cadbcf6603 SHA512 f73ad0d89b6510e46aea2fa3c4bf2a65ca1ccfc099d2542badd7e313a0619a1558956bc006c6f7c02846ed20ca079b3ac0c215a7aa14c5c33071812ac7959a91
 EBUILD stalonetray-0.8.4.ebuild 852 BLAKE2B 27b96f95977d3d56b626c201e1eaefe42b23d7e1b73f37aa14fc9f5ee941ad802283fedc802207d934f1b1bb2aa4fc9b3854dfe13824c2411bafd0d62bc23163 SHA512 032c70b8aaa9ca28417a25a41cbdcfadd6dd0ea895b1f43ca8b198f8362f3d45bf615918b2f7ebd70a29194d78b083da081171ae369ef1de12c0b592c173ff64
-MISC metadata.xml 540 BLAKE2B 5b02c34af08f200811ec2ee2cde821e190b9b01eb2419a5e2dd89d6fe626919aaaa069c620445d58922fd717ff406f73ca86cf8a70d78abaab6cbd002162ebc8 SHA512 a02f795724207ba946ec1a2e989599624fb201c5e2ff691aa888b1615f2a26ae97ffb19247aade811dc1a0b0979ed1a016459b6f7df6078a0b4547a9be058c41
+MISC metadata.xml 570 BLAKE2B 2c10a263018b9d216bbca931cac168600df3323652affb15da1e865e2f494af3b236fb2223a2ffe807b5267418dfe300f8560fbfee975beef968678b79e71c25 SHA512 aa9050e86ecc47cd3e38c3c41035c7c41a3944beb5a2c449410d1a10c62e303c6748777aa16a69fe71b54c25ac23bce362cae0acfb15fc7e672e40fee2f520f0
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index c3b369f27a31..efe12b6a91e7 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
index c95557f254f4..bbcbee6b193b 100644
--- a/x11-misc/superswitcher/Manifest
+++ b/x11-misc/superswitcher/Manifest
@@ -2,4 +2,4 @@ AUX superswitcher-0.6-glib-single-include.patch 1031 BLAKE2B ee7eec43ebf740aad3a
 AUX superswitcher-0.6-wnck-workspace.patch 1934 BLAKE2B 5d252c5776363d739e6a490f53e232a9d57f63c31a2cc8d44a367771a6f051cd920a09987e0a2f9ef9dd1f8cd22410061c5ad1eb2c9b0dbda847ce3a9a31f6f5 SHA512 5800acd13ad6b4569762638d2d0c0186414987fbfccd14dff7fcadb4533209168317f7b2e36d718fc79787460d71b9ef22d676458f447b31ad91e1782d856347
 DIST superswitcher-0.6.tar.gz 183184 BLAKE2B c1f6abb573f34b6c2f823d66e2a7ebe0575b690823246705a7c37aa342e3776f1e2240791192af5b9544efb702925b81ec2c9f5a4ecbe868d11135224ba1d2de SHA512 7385c14537a81f3e78509ff7399e1caf84f46fae22ce844f70f7cd72c8865d3808af77229744443178da691dfbcf61cae908c2eb54ef1564c83473ed9ff6ae0b
 EBUILD superswitcher-0.6-r1.ebuild 909 BLAKE2B 1068d94fece9683b4af490468c936def9e17edea1575cece04cc2982084765e974cdc89aa62087c9eb82d8adf5838cf3690d362e413ad6c31efc121e7403dfc7 SHA512 995e85e53454a9e8da710bd1d181a70e2684ed1e42bfd8f05582ddecd6814de75895ba953d1627296208ec9c55ec3e64273a8d5cba2742ce4d1a28d6e6ac3d2e
-MISC metadata.xml 539 BLAKE2B f4f96ba130864cdfd8bdb28a64deea83ff954837bb002f3cb36229c8e05fb22c6f9f3ae984fd120c4f50aa204e53b68df17bf71e28a7ff565480ab8a7b678d2e SHA512 df4070bb1739fb2cb254bf113e8af8d16720371b7469be44f0be6e890680fc5d7ffb00ca60a20a1d0610805206e4c353ea68378b3278b1b6509a048cc5ad3993
+MISC metadata.xml 539 BLAKE2B ea00c513d117b24994a3fb2601737c2aad3ce3e77510fb933440021305b0a76e2fed9cbe2739268b197dc731d182055277d4f07572113f8160e1e49d2363bc26 SHA512 f4bd641770962c9f084460751b93cf88676dd04ec403013f638f1c441f6f70a9637e0e1a6e80b271e8d8a2d49640ed71f4cd362fb04bb7b4ed5fa4b3d544fa38
diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml
index 83036dcc7b43..496532cac021 100644
--- a/x11-misc/superswitcher/metadata.xml
+++ b/x11-misc/superswitcher/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>
 </maintainer>
 <longdescription lang="en">
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index c8a9f58020ee..1e3081aabe0d 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -3,5 +3,5 @@ AUX sux-1.0-xauth-and-home.patch 1677 BLAKE2B 873b36cfb2688ec0f5c78b78eecea08891
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
 DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3
 EBUILD sux-1.0-r4.ebuild 588 BLAKE2B cf275e279487c1340f0a291e44085a65229b21207a049bc05308e7bb5d60e604d9f6397cae1f0445ff3220593c1d6d6fc9cc15b4c45e931a1e1f036fcd590228 SHA512 d15931eaf95ffe014ea87d5b348dc7d0c4fd03b16a9bed22a7365b5a967c559ee8e7ad370f3513e529d4f8eca4e8485816e8a98b7d90e161e496e1264df506a5
-EBUILD sux-1.0.1.ebuild 586 BLAKE2B df4ab630e0fc04549878c7d67fde5839a09117ae38e8fae590e4193cd54da6c2e08f4aad07674b30e07089511dd476301aab3662ad9cdd42c1ea6cb3e4ea423f SHA512 1557f3485cdaa2ff3c3fd6528d4be242fb7068448723f402b7cadb46f22dcf484e9d6483a4dfb83d95e3d5304dae56fb93822df93fe9cd4d1b3fa4f745b372e7
+EBUILD sux-1.0.1.ebuild 582 BLAKE2B de74b0d7d3cac7826cd0c6ee4e4d22ebbb8bf81ec1b662ed39496865ee940513c18b3270cfa4c266121f498e088ea4a8fce10c4b15056b380905408605e30b04 SHA512 20d5f33579da34dc052adafeebaa0f230d92843c632ac5f1b55af6cb2cb6373350936d2e907efd9eafe2be7df3016ae869327c789739a55795297f870ce80685
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
index 9c84c56d3da9..6af851a19172 100644
--- a/x11-misc/sux/sux-1.0.1.ebuild
+++ b/x11-misc/sux/sux-1.0.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86"
 
 RDEPEND="x11-apps/xauth"
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/svkbd/Manifest b/x11-misc/svkbd/Manifest
index bb7ca68ab8a8..78addeb84966 100644
--- a/x11-misc/svkbd/Manifest
+++ b/x11-misc/svkbd/Manifest
@@ -1,5 +1,3 @@
 DIST svkbd-0.2.1.tar.gz 19476 BLAKE2B 8bb33195f82e0ce6c348d0526d8c07d75bbb44f96c133b44020037e312b04197b449cb2dbe586d0e7cd0dca022da1847cc472122a16b764787b46f4d14419b0d SHA512 c6b6f8e4cff4c8aa4ab5cc9369bacbfa226bee3cf7008351d9873a33a59751106b8cd21242c9d13ce463e68968a920459162bbd73173928acf68c067ac81e736
-DIST svkbd-0.2.tar.gz 19470 BLAKE2B 3b97cfe37439474a31f382f86706b47effab82a1ef5ba0a278e0e7241b304b2cd096c01d88a60fc8ed2c25fb4c019b3fbe18645378b4508f339e69739381f22f SHA512 320f212c21163bd143e468bc541f79bc290e695704db1f7912112b07e673b6cde9766768c1e153a88962a8385ff9ac6cb78c2da5ca8ffb1b57be5eac26d46553
-EBUILD svkbd-0.2.1.ebuild 886 BLAKE2B 0dc2d2e8165b9eeed559e01c33996583a5761c925e509f4566845c409c26bd06a605989fa6ee304787a8ce49419414e47a241601444bff649343d27c3cc30ffd SHA512 6cddd2d5278cd22f520bc5a390dd155ac5ef5f9e67cfd4d20b88f41246bf833068853d6d4b1198594eefae82e864e3a101440bd50f4af89b81ed2641d4069d7e
-EBUILD svkbd-0.2.ebuild 870 BLAKE2B 87e2cbf849bd5a8b2ed5a3c77e7303486747e475f87541cbb5990685b6f1be4250de473cc50210ab97d15496d90baf7f685455b28ef06ba36f45b6f0fbb31fb2 SHA512 5659c665a88fe7ea5aa72cc81470516e3ba3b3322cd36597a1a520ead73d5e7f794500643fb7491b3fb603a237af0af9787dd0f58795ec858faf0ed250169de3
+EBUILD svkbd-0.2.1-r1.ebuild 898 BLAKE2B b12f9f32bbc97b9554805bb8e32fee732c531b275d29aa8fb2bc7421da2189d1607e631a97b151bd7a79eba29047d82a14c10085f421af91aec1005a61f2530f SHA512 78b5cb227c31ad59a8fbacb6fd9b3cb3aa14de5927016fd6fe1b9decc414556995d1299e794804b13fbf7617f064c45beef279f8abc3afdb03251d6f21b4603f
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..8542e85bf182
--- /dev/null
+++ b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple Virtual Keyboard"
+HOMEPAGE="https://tools.suckless.org/x/svkbd/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	restore_config config.def.h
+
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile config.mk || die
+}
+
+src_compile() {
+	for i in layout*.h; do
+		i=${i/layout.}; i=${i/.h}
+		emake \
+			CC="$(tc-getCC)" \
+			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+			LAYOUT=${i}
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	dobin ${PN}-*
+
+	doman ${PN}.1
+
+	save_config config.def.h
+}
diff --git a/x11-misc/svkbd/svkbd-0.2.1.ebuild b/x11-misc/svkbd/svkbd-0.2.1.ebuild
deleted file mode 100644
index bf864ebe3875..000000000000
--- a/x11-misc/svkbd/svkbd-0.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Simple Virtual Keyboard"
-HOMEPAGE="https://tools.suckless.org/x/svkbd/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXtst
-"
-DEPEND="
-	${DEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-
-	restore_config config.def.h
-
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_compile() {
-	for i in layout*.h; do
-		i=${i/layout.}; i=${i/.h}
-		emake \
-			CC="$(tc-getCC)" \
-			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-			LAYOUT=${i}
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	dobin ${PN}-*
-
-	doman ${PN}.1
-
-	save_config config.def.h
-}
diff --git a/x11-misc/svkbd/svkbd-0.2.ebuild b/x11-misc/svkbd/svkbd-0.2.ebuild
deleted file mode 100644
index a6f135c3de90..000000000000
--- a/x11-misc/svkbd/svkbd-0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Simple Virtual Keyboard"
-HOMEPAGE="https://tools.suckless.org/x/svkbd/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXtst
-"
-DEPEND="
-	${DEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-
-	restore_config config.def.h
-
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_compile() {
-	for i in layout*.h; do
-		i=${i/layout.}; i=${i/.h}
-		emake \
-			CC="$(tc-getCC)" \
-			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-			LAYOUT=${i}
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	doman ${PN}.1
-
-	save_config config.def.h
-}
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index cf738c9f6a58..7d7895d6f3f9 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,5 +1,3 @@
-DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
 DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310
-EBUILD trayer-srg-1.1.7.ebuild 751 BLAKE2B ca5874b16f3a731b57227673e02877d726c0ab61a71c52877bbb03201c4fc3bb81103a433dc0efebe2c65721e05552f193befacedc98864a4214a921df76bc89 SHA512 99772b9da40ea7b900826842aed0423cc0196f1e7eb6b7c033cadc896e5751d29eb327384a923179f9e624ce57a03f1500c9164f13800c6e98ad09ec9a9838d7
-EBUILD trayer-srg-1.1.8.ebuild 753 BLAKE2B a3168f1b77ac80cde3aa9fc3fb3815c0693102851497c205ea057493c9fe3d1d39f5db0e19e1fb37667238b1047b9a1c48150b178790693c6a9c157b98ab5f7f SHA512 cb976fd7a951a3ca4f3903a452f99ed1ea72dd251bf98a6550be72b94d6358b63a5181c0b0a437291ec0173560d0d529ed1b844df09a9b65ff7aa0eaf6293f58
+EBUILD trayer-srg-1.1.8.ebuild 751 BLAKE2B c28bb22c25f7f8193003ae7a6a7651c6b9abbc22cba56da51861f1344c7a9626ed110bb7cb3753c502a0b330edec5771200f6c555de79725430b736b0a1bc57a SHA512 ebb0a9169a3119a715003c0b6a0edc79b5a4cfe5f4cb23ff073b46f1e990c472fda0cef02e8f9ae8f8f3ba4b2b038fb68eae206b5ae1190026b9637693e5a03d
 MISC metadata.xml 249 BLAKE2B b308f3f4e67b02a37d7df053cda2ce801a2e355f212a680126aa3338811fc6127838aaceaafe156f9afb871de57a301056dd9af8d0cccd32fdc79e2abce4b56f SHA512 a354c9b99e5ee4dbc44e534e5764479ab0f2cac37ce7d9699f0bd668653352c25c630be27239a3a1c3e3ae391891df7c3855e08dac224b510f0feff0c060ea4f
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
deleted file mode 100644
index 45e6091acf64..000000000000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg"
-SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${PN}-trayer-${PV}
-
-src_configure() {
-	# Custom configure script
-	./configure --prefix="${EPREFIX}" || die
-}
-
-src_compile() {
-	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
index 8a9b9e21d068..d8bdfca96e17 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 06b1d6987eea..eef1033c76ed 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -4,7 +4,5 @@ AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a8
 AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
-DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7
-EBUILD trayer-1.0-r3.ebuild 844 BLAKE2B 362597df72f4d78bdb9284b02477714292b90115eb95fe5581ed009328679762800653cd3daf345e4844ac814524ecb84e1d255183f801d085f26e6a95205add SHA512 cb43354e391789acc533667d1a0a7aa84b8f39ac2b21c1bbb2b59bb08a36036c18fbbe52ad07d6df87db8c2253063b943d22f4823044ebfff2a4a3c08751e5e5
-EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B 4f884781c6fb340c038ea7fe74a4e94f61c3acf9408bd0b93a727f03700e8c687c24d0f7b7cfecb25621abe4dedb9b682f9d75c9dc2eb3b5ed025f1338a74767 SHA512 efb873cbee285a6836ae301f560ae02a4da3ace31317f1f0bcbfb43d5601b4016a9b44a00e525d3c33e33ed307af243b63d2079021f379ccfdfc15452ff39946
+EBUILD trayer-1.0-r4.ebuild 1031 BLAKE2B cb8654a656fc521fbcf0d3822bd0b7d113d20310304a5bcaaa536ec00a3d13041845497fcf3149e5f0366d376d167c40ac94e280db36e0fed1300604b68199b1 SHA512 73a24316e600b74e0d9a87798c744e35705ad6f92f1b6d9e48edca1c9c4c1d1c854cf8082aae81a65e34f7817ca7b85d93ea3c75b7cc853c5061f4fdd0725a0d
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
deleted file mode 100644
index f130f5ec280a..000000000000
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
-HOMEPAGE="http://home.gna.org/fvwm-crystal/"
-SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
-	"${FILESDIR}"/${P}-dont-include-libXmu.patch
-	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
-}
-
-src_install() {
-	dobin trayer
-	doman trayer.1
-	einstalldocs
-}
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
index db168a56b03e..d83e08e8deda 100644
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index f48208f67fae..207330a74464 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,4 +1,4 @@
 DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
 EBUILD unclutter-xfixes-1.5-r2.ebuild 728 BLAKE2B 14909fcc62c7e3e4cf50b6aba2b774158519a30ebd57cf2f7814a4659a2d6b15dade0f73ce88974125d107030573d23bff4bdea34c7bdbfc7889ae57970b159e SHA512 1dc96d9e81d8c9a60ec597bcb86bfbbcfad53500016636375918b90ae66eb45c20efe22a19f089ffae482ab0caa296a14205ff4149de97079c786b8f61461c75
 EBUILD unclutter-xfixes-1.5.ebuild 596 BLAKE2B 41d1f95efdbb17ed54b50761df21021c20a863fc70eda72948f7e590690d608fc23284f7635aefa935d85abf4c767a01056ccb2cefbd569a82cb6492879e93f9 SHA512 1f6a8675b04a66a9c9355be297d4e90074071c3b1f2d854749074ca2dba4396fb3fa70a7623caca5243d67073be7601966ace08e0d467c243bcc756972665078
-MISC metadata.xml 455 BLAKE2B 90cb58bbee37289b4da917dc29b8b76b4c6de8a8b86050c32627af103f8808560f2e569a7f8795abe36ba0ad3f0e132b85c6bb948dac58ebf43b46c2ab0a3868 SHA512 2f74be1a739a0479bcc7223bac9ca84a651c911d544c2ed022845b634013a5fb12839f0782de59c61b504a0a4b3a69ad79365f8d4bdb9cca379fae2896ab3fcd
+MISC metadata.xml 485 BLAKE2B beda121958aa7220652868343c0149cf546f1ddaec6b89cf737d4c68c70a508db1ca7e351c33e1dcc0b83c063b0dbe60ced4a27b71e0507aaf2523e6bdc5fabb SHA512 5bbaa4e4f20bef7c6bd99fdc0af7683e50f8281a5ddcbe7b1598ab8ea78b1b1cb3d1e877f49fc4dd06e417111c32cd162f0e192d51ed5afe8874ad676b9c303e
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
index 08d4fdedaadc..981765a60f18 100644
--- a/x11-misc/unclutter-xfixes/metadata.xml
+++ b/x11-misc/unclutter-xfixes/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index f6508ab495fe..22cad3249473 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -7,4 +7,4 @@ DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e9
 EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
 EBUILD virtualgl-2.6.5.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
-MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
+MISC metadata.xml 870 BLAKE2B 535c3227a42afcefcfab99a41737afff1fbd0b35c8980ebcea6103b52465c43a61064a81e48c92349de90e15d150fdae0d772daa63c8d6597f0e336448920a68 SHA512 72837c96523aa69cfbdaa4c5e464a46c8e37170e58ec7e283df09849fbbe27502befc594913ab8b195f1f1f657b2957eda184a6c68220cc302244b737c969282
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 9262412c8f84..f00a92b3f612 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -9,11 +9,11 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 7709b1809c45..983cecbe5b8f 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -5,4 +5,4 @@ AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375b
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
 EBUILD wdm-1.28-r6.ebuild 988 BLAKE2B 42e455e0b4f7e0608eef95bc9db219b0e03a705e7ec81f7f4d9e5e460a09df33a7a403c67f05dc7b33f73ca16aecdc647d2415686722ed7bb115435437c2c84f SHA512 ba47ee3377bfdd322f8ee98392f19577d6995fb8a19774203e3caa1baa56cd5060744c1bf41bb9929a5e0f9016d63db77eebaa610f3c9b98b490250b4b59d8d9
 EBUILD wdm-1.28-r7.ebuild 1161 BLAKE2B 18d4fef0721d2b5ac7747795499c627a0b407a241d3ff556a033da82df248e2cc97891c22c709462f2a7ac2c5b843d4f63abcbb4436a1fb838f3e42a319b6181 SHA512 856c1faa33092f9111c215b2b10c4c55c8ddfcd0ffed3ef34c0bedaf6919b8a9dcb8a36e09620cd38d872be3ee5f148c54f6e0a0e630e2b3d67c4dd92f1c51fa
-MISC metadata.xml 241 BLAKE2B 971b1982f989fa94652f2545819185817501b44df93faf3584c6e763e6a2f02986af3e1e50832285a76305951f2c2ff6365963c8a703552d08f4e31f54a4881e SHA512 69338f79909dea3282489af1890b31cbab95afd2eb66a30c76a68f266ac3d4775403d0399ee417c13f6445ff5a10d4dc866bf270ca9936da41278bcd27ab7ba1
+MISC metadata.xml 241 BLAKE2B bdde4bb61a45207863d77d1814339d297364844b47037b79a5a79ed5b8411fe097e1d723afde1e53190c06cf759c248771223998868ee6fa317ed62af72472cd SHA512 03742aed329a7733e8f7f45543bafc439c1ff9a9d6c43e6df6d09474bb8f7a1b8cf10d58e3fcfe252f48ddf33543de8179ff2cb67ab59cf7a89ca1b864d19cff
diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml
index 433464f2afed..e95f80e67eb0 100644
--- a/x11-misc/wdm/metadata.xml
+++ b/x11-misc/wdm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index c18720d944a6..60a1df3e9a00 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
 EBUILD wmctrl-1.07-r2.ebuild 590 BLAKE2B 6171168a8a9b176fa96fcd2cd376f38ae7928d8ac5a3c665fcb29eb66dc156829ff67e7265611b71f25411af3e8b5f7823e6a86dc926b6d1becf2117f9e8b11a SHA512 4bf9e402e54260433781c4d54f280686398f8faa415c914c7965e43c190b0178437b8c5612a8d525cef52e36089ec9f74aa0bb07b399728d32b5bba7ef7b73da
-MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
+MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index d91810780a67..f65b774ed444 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index fc1b1afd2d20..440904a55296 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -7,4 +7,4 @@ AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r4.ebuild 2049 BLAKE2B 70251f73469627e347c411f9de285bb2691448251deac7029f7e6fa4f682d19ed8c07c17a8b51531a83e4baaeb5a2f93a7f63ec9ff8f83037ff53ef481af1a23 SHA512 0a95a6d066e96fddc25a5024ffdf1ff886d8e936dbac5e3924f15b3aa5921a76d347b7e5f9ffe06ab01fb397b1ae637049d85758e9db4a5c6ae496d4daf8fba2
-MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
+MISC metadata.xml 952 BLAKE2B 4ac05ec6aa72acea1a2eb3b8f5b6d2ae885d5dc9c53eceb352f9fdd24ef19d3f269acc438421a2d3b13a0b9e1dba92e05562b5017aee5f8409f1db4b9d424d7e SHA512 4860713eb293d1aa29342953129b92525fb0ef5b6cd5462f1e5a425c6d28bc70a5cb421f2755643ecb42921e574b6eefb932cef80a420458f25ed12211da1c8e
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 40fa3182ee05..0d0fddfd3dc2 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 3c6f782d0083..9a900e34e282 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,9 +1,7 @@
-AUX xaos-3.4-include.patch 216 BLAKE2B c5ca3147c1ba7a6a45ee46673666d48aff359cd9a15f037534411c4420302d18dd037bae9c25927ac0f885148401a8afebecf465d706b3073d520946c18408f8 SHA512 d3ce4cc8a792ca22e63043d89a427cf46be2dd7e3427aefd364dacb7e721782ed8aefa7eee338fb658d5a2f13704eafbcd03e18ae589186d1c1718ff808337c3
-AUX xaos-3.4-png.patch 328 BLAKE2B 372470e5b7f7cc3bdf7975487088729476163b10e2dc9f57b78802bb4032affeab64c0634011067d8b1f3ded559ae68248c00a953f2d903365401181a546aeee SHA512 90ab707e2a6ad6fec1467afe7ed0f6cb44e5ac965eece94642966010b871fb7b7ef71745485869c7a94c4ddd73b176284a3b6a66866e9539f1dfe9b1934ef26b
+AUX xaos-3.4-include.patch 143 BLAKE2B 8dcf1e4abb9b8acc2198a3ac6ff70a7900397c644c9712e4d1e5d5ab3bf9eafa6fa599b76e8a01c77495615c600b60068eb05de02da7dfd5409757086873fba1 SHA512 3d0caff1fef21b5b3c1184fcd926c4c410e226bc677a723585d9f3d56d5b5b7786104bd035790fc892c90243d531cfce243b7d7864556c0978f54fa31dd72c46
 AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311aa357fc59e280632d85ccfdf803ff3a232ab878fcef638506030077561406ed1d1152c8b960cd4528e1a5e1b098b39f SHA512 f1732cc5116f92893fc9e560e293e86df10901655dd12a2e6e81a90b13c216a613c5be60bce7adfc99ee21f5a6208c4f30a6730d1d5d3963e5efcba6d728c481
-AUX xaos-3.6-locale-dir.patch 346 BLAKE2B 9a025116efe60d643748e020bf0cc8801ccec96b46fb458b72fb1699cd37018f43645af311476c9dad5d91ff66acd8ca9df2407492436e814b7eb5708a3ba9af SHA512 c62b6c2b77bdb11bbd970f8f3d6ddc6844a86059918c7a54207a0e57bcd31e2f3feeb3c86f8ce58a3c9ee36939dbbe89ec5359d7fa0d5015dc6ad6cd8de24d6f
-AUX xaos-3.6-no-auto-strip.patch 1025 BLAKE2B 87256eb029905c6c9aed7080452c15677e0b98535252b1a6ddf344b7866980c27039c721ab711f462383ed4ecd7d07e55e122b34728822c289958ff0e812a9eb SHA512 6a89bb992e2e503576f18a069c6f67b42a92a3f88b958f4b8b54d6ffc309ff30914cbf36b73400449306cd2ce1f646e9745820206c0be5ca39d26bbc4e469c8c
+AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a064cf5555748fc7680b19b041db054a06616391a25e7fd9f37b0ae5a34bcb7773676d15d9222b4e416bc0fb704cf SHA512 79d1a738c709510dd36d4cbe17eb4376c212a81af2e08c45d292a182e9862f2f3e1f5075f488789f490d857f2b7eb76409d558caca93eb14914522f36f78d5cf
 DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 2161 BLAKE2B 7b8c33d496f869658a0c80c40dece6b1691e8aa363d281e9307593d1bdcf2f8bbca7ca15bb57aac791d0323f1dde9c37bee49aa82a1969a7781e3d6362b6b4a2 SHA512 68c1dc78483baafbffeec1cdf0268cc0b6bc0baf8e600b3efe1dafa49fd34c7caefef20922c9655b1c4595c96d36918b5555014c3c86c7e177cde90b2e8bcd98
+EBUILD xaos-3.6.ebuild 1875 BLAKE2B 0c2ab9399c4203dae8f744f117580b3fc81831fcccdf2c2e06c441c6572a99f59474f7e7001aaf6bb1006c0b208cda75c4692c745a3033d05ef91bbd09e915b4 SHA512 b013a5a86b3af90cb1065fa4dac2aaf8658d2a23098337d51b8bb04bb341253d00a01f8f0954b04966e533bb2cc1aa75b170a0516cddf5b01f6dec858a85ad8b
 MISC metadata.xml 766 BLAKE2B ca6be3fc4134359d4c6ea3eb8498b5235c87694bb76981747651c78b1fe00fa2d7d1c736910d3144101762fad9b26819df46af0270a4db5b0b39e623bef5eca5 SHA512 8e3ff6323fadbb15a6144c80bbbe33056072758dabb6e96e8b331f3327ea7e99b2a2c9b87b3532e70a1bd331b9d0e59be8b22c2fcad262eacf317c5b33647519
diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch
index 65f7b8c5630c..3659ccc35a88 100644
--- a/x11-misc/xaos/files/xaos-3.4-include.patch
+++ b/x11-misc/xaos/files/xaos-3.4-include.patch
@@ -1,5 +1,5 @@
---- src/util/thread.c.orig	2009-03-28 10:50:49.817619387 +0000
-+++ src/util/thread.c	2009-03-28 10:59:40.048185946 +0000
+--- a/src/util/thread.c
++++ b/src/util/thread.c
 @@ -1,3 +1,4 @@
 +#include <stdlib.h>
  #ifndef _plan9_
diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch
deleted file mode 100644
index 454f8acaa994..000000000000
--- a/x11-misc/xaos/files/xaos-3.4-png.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2009-03-28 09:50:18.764999182 +0000
-+++ configure.in	2009-03-28 09:49:18.685947638 +0000
-@@ -98,7 +98,7 @@
- AC_ARG_WITH(png,
-         [  --with-png=yes/no       enables/disables PNG saving support],[
- 	if test x$withval = xyes; then
--	  png=test
-+	  png=yes
- 	fi
- 	if test x$withval = xno; then
- 	  png=no
diff --git a/x11-misc/xaos/files/xaos-3.6-buildsystem.patch b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch
new file mode 100644
index 000000000000..6cdb38ce6405
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch
@@ -0,0 +1,86 @@
+--- a/configure.in
++++ b/configure.in
+@@ -11,7 +11,6 @@
+ 
+ AC_PROG_CC
+ AX_COMPILER_VENDOR
+-AX_CC_MAXOPT
+ 
+ dnl
+ dnl GNU gettext related things
+@@ -86,7 +85,7 @@
+ AC_ARG_WITH(png,
+         [  --with-png=yes/no       enables/disables PNG saving support],[
+ 	if test x$withval = xyes; then
+-	  png=test
++	  png=yes
+ 	fi
+ 	if test x$withval = xno; then
+ 	  png=no
+@@ -141,7 +140,7 @@
+ dnl Checks for programs.
+ 
+ DRIVERDIRS=""
+-LOCALEDIR="/usr/share/locale"
++LOCALEDIR="$prefix/share/locale"
+ DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
+ AC_PROG_INSTALL
+ 
+@@ -422,7 +421,7 @@
+ AC_SUBST(REALTOPDIR)
+ BINPATH="$REALTOPDIR/bin"
+ AC_SUBST(BINPATH)
+-AR="ar"
++AC_CHECK_TOOL([AR], [ar])
+ AC_SUBST(AR)
+ SRCPATH="$REALTOPDIR/src"
+ AC_SUBST(SRCPATH)
+@@ -450,7 +449,7 @@
+     echo "using GSL for complex numbers"
+     GSL_LIBS=`$GSL_CONFIG --libs`
+     GSL_CFLAGS=`$GSL_CONFIG --cflags`
+-    CFLAGS="$CFLAGS $GSL_CFLAGS -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL"
++    CFLAGS="$CFLAGS $GSL_CFLAGS -DSFFE_USING -DSFFE_CMPLX_GSL"
+     DRIVERLIBS="$DRIVERLIBS lib/libsffe.a"
+     ASM_CMPLX_O=""
+   fi 
+@@ -473,8 +472,6 @@
+   fi
+  fi
+  echo "------------------------------------------------------------"
+-else
+-	CFLAGS="$CFLAGS -fomit-frame-pointer"
+ fi
+ 
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -36,7 +36,7 @@
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
+ 	@INSTALL@ -d $(DESTDIR)$(bindir)
+ 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
+-	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
++	@INSTALL@ bin/xaos $(DESTDIR)$(bindir)
+ 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
+ 
+ 	@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
+@@ -49,7 +49,7 @@
+ 
+ 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
+ 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
+-	@INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
++	@INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
+ 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
+ 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
+ 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
+--- a/src/ui/ui-drv/gtk/Makefile.in
++++ b/src/ui/ui-drv/gtk/Makefile.in
+@@ -2,7 +2,7 @@
+ CFLAGS = @CFLAGS@
+ LIBS   = @LIBS@ -lm
+ LFLAGS = @LDFLAGS@
+-#AR     = @AR@
++AR     = @AR@
+ RANLIB = @RANLIB@
+ 
+ SRCS = ui_gtk.c 
diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
deleted file mode 100644
index 740f32d18985..000000000000
--- a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2014-06-09 10:54:18.459186718 -0700
-+++ configure.in	2014-06-09 10:56:47.472204763 -0700
-@@ -141,7 +141,7 @@
- dnl Checks for programs.
- 
- DRIVERDIRS=""
--LOCALEDIR="/usr/share/locale"
-+LOCALEDIR="$prefix/share/locale"
- DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
- AC_PROG_INSTALL
- 
diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
deleted file mode 100644
index ab6e6b56a9b8..000000000000
--- a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2014-06-09 10:42:00.574129368 -0700
-+++ Makefile.in	2014-06-09 10:43:04.035568767 -0700
-@@ -36,7 +36,7 @@
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
- 	@INSTALL@ -d $(DESTDIR)$(bindir)
- 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
--	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
-+	@INSTALL@ bin/xaos $(DESTDIR)$(bindir)
- 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
- 
- 	@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
-@@ -49,7 +49,7 @@
- 
- 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
- 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
--	@INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
-+	@INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
- 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
- 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
- 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index 8f8963c98d1b..b882b13e3fe1 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -1,51 +1,52 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils
+inherit autotools desktop
 
 DESCRIPTION="Very fast real-time fractal zoomer"
 HOMEPAGE="http://matek.hu/xaos/doku.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="aalib doc -gtk nls png svga threads X"
 
 RDEPEND="
-	sci-libs/gsl:0=
-	sys-libs/zlib:0=
-	aalib? ( media-libs/aalib:0= )
-	gtk? ( x11-libs/gtk+:2= )
-	nls? ( sys-devel/gettext )
+	sci-libs/gsl:=
+	sys-libs/zlib
+	aalib? ( media-libs/aalib )
+	gtk? ( x11-libs/gtk+:2 )
 	png? ( media-libs/libpng:0= )
-	X? ( x11-libs/libX11:0=
-		 x11-libs/libXext:0=
-		 x11-libs/libXxf86vm:0= )"
-
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+	)"
 DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( virtual/texi2dvi )
-	X? ( x11-base/xorg-proto )"
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-png.patch
+	"${FILESDIR}"/${PN}-3.6-buildsystem.patch
 	"${FILESDIR}"/${PN}-3.4-include.patch
 	"${FILESDIR}"/${PN}-3.5-build-fix-i686.patch
-	"${FILESDIR}"/${PN}-3.6-locale-dir.patch
-	"${FILESDIR}"/${PN}-3.6-no-auto-strip.patch
 )
 
 src_prepare() {
-	autotools-utils_src_prepare
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+
 	if use nls; then
-		if [[ "${LINGUAS+set}" == "set" ]]; then
+		if [[ ${LINGUAS+set} == set ]]; then
 			strip-linguas -i src/i18n
 			sed -i -e '/^ALL_LINGUAS=/d' configure || die
 			export ALL_LINGUAS="${LINGUAS}"
@@ -56,41 +57,36 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-sffe=yes
-		--with-gsl=yes
-		$(use_enable nls)
-		$(use_with png)
-		$(use_with aalib aa-driver)
-		$(use_with gtk gtk-driver)
-		$(use_with threads pthread)
-		$(use_with X x11-driver)
+	econf \
+		--with-sffe=yes \
+		--with-gsl=yes \
+		$(use_enable nls) \
+		$(use_with png) \
+		$(use_with aalib aa-driver) \
+		$(use_with gtk gtk-driver) \
+		$(use_with threads pthread) \
+		$(use_with X x11-driver) \
 		$(use_with X x)
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
+
 	if use doc; then
-		cd "${BUILD_DIR}"/doc
-		emake xaos.dvi
-		dvipdf xaos.dvi || die
-		cd "${BUILD_DIR}"/help
-		emake html
+		emake -C doc xaos.dvi
+		dvipdf doc/xaos.dvi || die
+
+		emake -C help html
+		rm -r help/rest || die
+		HTML_DOCS=( help/. )
 	fi
 }
 
 src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/xaos.pdf
-		dohtml -r help/*
-	fi
-	local driver="x11"
-	use gtk && driver="\"GTK+ Driver\""
-	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
-		xaos "Application;Education;Math;Graphics;"
+	default
+	use doc && dodoc xaos.pdf
+
+	make_desktop_entry "xaos -driver $(usex gtk '"GTK+ Driver"' x11)" "XaoS Fractal Zoomer" \
+		xaos "Education;Math;Graphics;"
 	doicon "${WORKDIR}"/${PN}.png
 }
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 290738fc6712..fe82248cc53f 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,12 +1,5 @@
 AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
-DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
-DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
-DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613
 DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a
-EBUILD xautolock-2.2_p5_p1-r1.ebuild 1276 BLAKE2B 085548a8d13cb2f19faa216864409a49a4cd46205a9dc0455977432ae3f8ff6fa3c9fef222853acfce3a6ba410a0d2d8a91e0f5cd67c445c29e73c980fe508e2 SHA512 8b842594fc91dc669d78d65cb091ec91c45e9172c94686d9e2c072b81d3024a1859d2cb03fb555872360969de15b91897c4fd27059f68ffa5930c12059f1b527
-EBUILD xautolock-2.2_p5_p1.ebuild 1411 BLAKE2B 50ba51c716e15d20309d3be25f030f21310b0d85e61e921e59e377806ee7d08d4fe56fbeea40044304bff1fb753052ffe6f1c0768f9c1623e5d67fc5f983e54f SHA512 9c09ce4bce65235afa3f44fa01eee830639131d6741b8d258f34844ae29c2d5e5be167377c92e419e0f0ecd5efcbfa2238f9d1fe4512d4253e624880235cf930
-EBUILD xautolock-2.2_p5_p2.ebuild 1038 BLAKE2B b58e78b0a320e36511e2b10fc8d86ab8f8018ebcfeb922646f99ae708ae67022cc9d84a6004f8385630899ed78034cf99a72901edcb9ad668ddb5efb35c7c76a SHA512 fcefc00b8d5f38a52af61ed3efc067409ac8f63fdf6f2fe21ddad43f907449d5bd6ab010cc1df542cd28b269d0b9a7005e6f21819f159bcd509c97ea33871de3
-EBUILD xautolock-2.2_p6.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
-EBUILD xautolock-2.2_p7.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
-MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
+EBUILD xautolock-2.2_p7.ebuild 1099 BLAKE2B 25e14281688c39a269d0aefb477c8c9f4bf191a5d1e2bd97501d476eff0945425417816137accb811bec25729c5ee7693693cb4366a90d454e03fa0fe67022d4 SHA512 b2a3c87f44e1afc69da6c4042679532655ad04ad9c2d8d491d7ad7b6702b45bb85a81a05870f39d883b77ebd07ac3c8448663891fe4106149a56282e835a8b75
+MISC metadata.xml 637 BLAKE2B 629cea827f88702a5dec0d030eb17c48d745ff1441485d16cf2975ca4658ad34c3f227859729c8ad663009956eb50ce0ddc803dfc4e3c9aaecb1cf3881803c3b SHA512 e2d71409624d3682285e323b72f67eabddf8724a6bd4c2563e98f60297431b364745c34411aaa9a63abf3be9c1c15bff6f4780fd1ce1ffee380efbb2ef94e0b2
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index b822c45366ac..509109f110cb 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -5,7 +5,7 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 If no user activity is detected after a set timeout, xautolock runs a program
 for you. If you want that program (with optional arguments) to be a screen
 locker, then one of these packages might fit your purpose:
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
deleted file mode 100644
index d9595592a63a..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
-	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
-	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
-	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
-	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
deleted file mode 100644
index 5cff11d974cd..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="
-	|| (
-		x11-misc/alock
-		x11-misc/i3lock
-		x11-misc/slim
-		x11-misc/slock
-		x11-misc/xlockmore
-		x11-misc/xtrlock
-	)
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-S=${WORKDIR}/${P/_p*}
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
-	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
-	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
-	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
-	"${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch
-)
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
deleted file mode 100644
index 6125ac05fb94..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p2.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 toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(ver_cut 4)"
-DEB_REV_MIN="$(ver_cut 6)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p6.ebuild b/x11-misc/xautolock/xautolock-2.2_p6.ebuild
deleted file mode 100644
index 1abba4868157..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p6.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
-inherit toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REVISION="$(ver_cut 4)"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	mv "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch{,.skip} || die
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index 1abba4868157..bfd5bdfe3a6c 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libXScrnSaver
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 0499b68ad2e6..b6d9cddeb191 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -3,4 +3,4 @@ DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d41
 DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
 EBUILD xbindkeys-1.8.6-r1.ebuild 701 BLAKE2B 1b72bc9693648a4eee6c6233b5ae8505f73fd3181c73436f77a8ba6a7797643e56fc34ebc6b23bedaf7011163616ad3c837d94a4b7f77c5141720fe34d4c701c SHA512 c9e3d967375a19566a3c89407105faaf2f28d85113c0c61f91a1f91c2f25f682ed3743e99c9913e6a4e2bfc675171a5858291a0a681a26caa9b68eaa8fa6c7bb
 EBUILD xbindkeys-1.8.7-r1.ebuild 687 BLAKE2B 9426e2cb06298cee3f8c23758eb396d4abe99679cbd3a8bed9e8cc50725d65a57a80b170daa5d9829ccc2fad8fc14610512c0adb5e137071d7f79c0a6fc1cd4b SHA512 298ac5d7baf674b5cdd3bba28c59a9e1bcf8b750443d8ccb6c60c7982d4f1bda9d44115b39b7d9942f9549451eebd7402ad935659906196b919ea131174086aa
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/x11-misc/xbindkeys/metadata.xml
+++ b/x11-misc/xbindkeys/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/xcape/Manifest b/x11-misc/xcape/Manifest
index 8d2c8400b57f..a6f4add4efeb 100644
--- a/x11-misc/xcape/Manifest
+++ b/x11-misc/xcape/Manifest
@@ -2,4 +2,4 @@ DIST xcape-1.1.tar.gz 18458 BLAKE2B b402f0a7dc21546c653e3e688f8a6ec1f6704426181d
 DIST xcape-1.2.tar.gz 18730 BLAKE2B 7e65d9d64d34f0500f524fe806c4d7d092c7670e1b78d0e7ea16860c4b268de0bfa732935eca45820a26be694e030cb6847b5910e0aad27974f4e9e74634c20c SHA512 5ae8502250a9ec55a4b0c5f7301c1597c652b76904261153b720362e3c5882e8db980c85396a2594f99ae2fb72ab7070c1b06c9432d54b7da84975ff45b25a79
 EBUILD xcape-1.1.ebuild 809 BLAKE2B 35151e620b9b34f47d2a88450435dd3896c10ca9b2226f9608b5928e07021464848c7ba783a149b1ab41f6894343a7a90bd61c5ef5c5353f939c6ec2f7ae41bb SHA512 9b6ab8a7bb34169e7b68f62da70ab9c0385610e52516fd9945a9eb4a39a99de49040d93d294f6f1b0cbdf9a18d9f7a4e3ae3f6761b38b437847be89bb9a5f15b
 EBUILD xcape-1.2.ebuild 823 BLAKE2B fa501878fc7720a37d067d05621b0074c25824cb98c89b29f12c6ab62f5993acb2d46a91b5a84bfa7bf89c0209859c3fdcac3cef9abe8240b8c567c72669703a SHA512 cc4c785ef595fc64ac059debdf57f832c7569745c8cfa6262b3bc47106d62e09469faa02fda5d37dbfd014876e7f7ee4a6aa62f947be85c945a8e35fdb7f1026
-MISC metadata.xml 468 BLAKE2B 0873dd878126bb5cd6e19eeffe351b304e713f01b05ac71bc743344c31a8428c4ed52ee92258e413325d2e8c89abc6c58f9405036f28f237c25126f02cd1a80e SHA512 44dfec11e036796198361e6833a4a59bdf2c04af447e3b4e5b2ea53a4d0e5d98695c9d2d72dc15d6c9c974be4a0c70a7aa7d4c99855dc958862c2c16a98fef50
+MISC metadata.xml 498 BLAKE2B e7aefb8d4fb844d564b699c5878532e6a7acfed0430b4aae64ae4471f636264878c76e8e3cc760a8b82da142bb5c30a430b3ccb4859ae271c46cb2aa2ca2335c SHA512 f099c8543548e47fbd863c1e8689ddeb60bb724d852f541538743fbe7f6fc0f9cad44c5611d274eb977ae026b03225b970cf040adf5719210bb3eaa4d5bfce02
diff --git a/x11-misc/xcape/metadata.xml b/x11-misc/xcape/metadata.xml
index 203afc385611..e7cfee5bef0c 100644
--- a/x11-misc/xcape/metadata.xml
+++ b/x11-misc/xcape/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aditsu@yahoo.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest
index 5e0df57a26b1..ec231ae38821 100644
--- a/x11-misc/xcave/Manifest
+++ b/x11-misc/xcave/Manifest
@@ -1,6 +1,3 @@
-AUX xcave-2.4.0-pkg-config.patch 201 BLAKE2B 0546786150f51852ecc3618a6f384de44b099837ece50393697273c374525deaf3c26aadfe5076aa4e91aa989756d1a3131aa68c5b3ac8e6f5f5411ad0cc19ed SHA512 c326bc4ac74ff764b7c77d17abc37ef03afe0fc2e20f7018cda242e49e767c2ccb1e05250f57a567c6b14a2069df6e57bc2bc87d0f4e8e031dfe8c14e3782f5f
-DIST xcave-2.4.0.tar.gz 817356 BLAKE2B 2a80eb20d484fe37ee5871e4bbf443fb87170adf8a02d4ebc059bcc4f907b2b4442a0b9858719e1c656d0293e55c470aba1bcf83c899ba079a2f201d93b84cb2 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4
 DIST xcave-2.5.1.tar.gz 786853 BLAKE2B e3b2290b01c16bff4dbe8d5167b4bed75fbe4225555e3ee3856115302329878550cbb4c35286c717eb46c3fd12b4d66323895cdbb292cc6f054360b53c3f9c1a SHA512 6095c06d75f7c5d87a6d0f1c4c3a52071ffc1912d60ba07c95d9b8d84f0027ba24476f941828c4eecf801d7ca7f0bc168ddd2d162b3e863fc31ee6b4c9144cd4
-EBUILD xcave-2.4.0.ebuild 752 BLAKE2B 4c0ac0c3cef59e0a98df06d099b50c06bf05cb7403414ea9ba048c860fbea072e87bd3ef5d5d35f8ad745cc30359a85c1fd6eeed66fe0cbd8fd30079bee9ae78 SHA512 f828e14ef719f72a52be2de76607b8c5abcb87b2a85e7775bb71b5e6597cf6c3a299e54421f487491d0119a146b2f82ea5ad517e1370e679eb85911d9d160537
-EBUILD xcave-2.5.1.ebuild 627 BLAKE2B fa3f56245fa802e538f64a800a88b0029f86a6d31c13ebf5fa5663fe7319e2b90621b3090f23e00e8781b250f2dd27255c43e100d1f00897d6f0277f11bae571 SHA512 0cb4191bb0718310974cbd6d4fcf6efdfde84c17985131a5bae1d63d8c9cc0ebddeb19020f280239a8a4c894b2e509d9c25254700a37f69f1fa1cc518abf7bda
+EBUILD xcave-2.5.1.ebuild 625 BLAKE2B e99083cb5640ddd915a526eed257464e0c7a274e88a61ffb5d644c50d9f04c7ba7d0062ae8cada885bebda9d8e1755ce2c108494e609f14c422a78a1b9eb8a14 SHA512 a65d3c8d43c1a766cba40517d4ce7265f51cba26be360ea12537902fde9ec7c40c65451e6690bd73e2aa8210e463080978bf0c55fcd05c90840096fcae5dc73a
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
deleted file mode 100644
index f0e331dccfe2..000000000000
--- a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,10 +49,6 @@
- 
- 
- 
--PKG_CHECK_MODULES(libxml-2.0, libxml-2.0)
--AC_SUBST(libxml-2.0_CFLAGS)
--AC_SUBST(libxml-2.0_LIBS)
--
- AC_OUTPUT([
- Makefile
- src/Makefile
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
deleted file mode 100644
index 96c74893f67f..000000000000
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="View and manage contents of your wine cellar"
-HOMEPAGE="http://xcave.free.fr/index-en.php"
-SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.0-pkg-config.patch
-)
-
-src_prepare() {
-	mkdir m4 || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
-src_install() {
-	default
-
-	rm -rv "${ED}"/usr/doc || die
-}
diff --git a/x11-misc/xcave/xcave-2.5.1.ebuild b/x11-misc/xcave/xcave-2.5.1.ebuild
index 21223817b379..bb21e3da7208 100644
--- a/x11-misc/xcave/xcave-2.5.1.ebuild
+++ b/x11-misc/xcave/xcave-2.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic
 
 DESCRIPTION="View and manage contents of your wine cellar"
@@ -18,9 +19,7 @@ RDEPEND="
 	gnome-base/libglade
 	x11-libs/gtk+:2
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 14dc2a82d5dc..166bdaacabee 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,7 +1,4 @@
-AUX xdesktopwaves-1.3-gentoo.patch 950 BLAKE2B 4c8101e7eb1b1bc7b4cfaa5fda8c9391c8eb1853480cbed0cd00994bf673fcf7c84e22c2d26386645eaac30645f2d6f89dc9ac52f7c82ee0358022f41eb3c8c6 SHA512 d1c643b697acccdf2172d2555e1cc6e0e7f860741b6c2c6e9c60b51d47772883b0c47a5a5ca6efc797f7e31e9e202c295e956b16038b8a926a485c6abdb91373
 AUX xdesktopwaves-1.4-gentoo.patch 1028 BLAKE2B 061d66954cf8cade631e954dfc39c16e6ce0d6be66787dd9aa84fb59a83a7865335f9e5ab95ed111f8f7764aecd4b7bbdaf53d4ae21e9acff82022e1788b5117 SHA512 f42d392daef8abaf25be0f420f0f365fe29f821732ffbabbeafa5836bb653ba28c1c45aa7b33060449d8c59f5a38752f6a2854fa5a33eb5115f427ce1254e094
-DIST xdesktopwaves-1.3.tar.gz 49302 BLAKE2B 96348d80ba71a179df09afbaa8f2fb79725e049203e9644769e5a41b7fa8a9cae06ef2002ac3062f317f84419ae2ef739e7a90142b9b06118f51754d295e70ed SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e
 DIST xdesktopwaves-1.4.tar.gz 50259 BLAKE2B 5512746c9a035878f50abfc35c088f2953c5a0decaab6e0fc3cd31e29e75d100430c36df5a0043f64222521e939797ad24b9147a66cf5ba20f7f4c22fc78767d SHA512 06ec5bea51737d066beccad57db63ef7e56e59c18bb7c1dcaf06f6691940ac32a32b7cd06d9e3f16ad472e3d793c391b072a753e0088ab71ae7304b20b2fa3ba
-EBUILD xdesktopwaves-1.3-r2.ebuild 952 BLAKE2B 37fd7a122bf3c4af5336c7827b9e1533992e766d7c3e9ff44a52e40865b9fb108c61f0c6fbfe30d0ce5deb92023bb322c4f4b7bb34f99502f44e1d174e1aaa34 SHA512 d1d6dacc91cf72b1a3ab091376c477e2b48a99ee7a67d57348ce6adb2f9618fe5e7c48635f5b279cab4ed36df10a7af4337dcbcd3e1489624bf978cdf8c1f316
-EBUILD xdesktopwaves-1.4.ebuild 767 BLAKE2B 7726ae9d255e86e890f2c87b3ff4d945481e1d33058b552111522ee49d5b40a67207fdee4bfb84669b2c26b5884603e6941b73d9e0247037f8b87473b0a9b404 SHA512 7db4c54893753cd9e0b75fd4eadf79f9453baf29de948bdf3d2e18477c715aca47253c60b551662e18b0453ac052bb49af6284611a04c4296427f71a5ff71bd3
+EBUILD xdesktopwaves-1.4.ebuild 764 BLAKE2B c16d443983be21ce27f2230b9963297f577ae6a29989cd43348915a442c8d983e7fb264ac4b4c17359b21578b8b068ca5dc836cb11ca125db9abb456d2d1ac31 SHA512 8a01fcef1fba7fc74426a256f9aabe63356574ac53212be3429ca18a47918eecd88e107f8f2c9e9ee955db945fb42520f888f7d17a95986ee0cecc7bcb7fddaa
 MISC metadata.xml 663 BLAKE2B 67655f76c1b276f5eceb77901fb479938a5ee591461f0f1e4a67315f8cc16fab52b52df5fdf4fcefdec0e277dbdf10cfc2d6ada8e740f69ce41fed05299c0d11 SHA512 e070ee728003491fe3537f9c8da175c576e3f21ddf42dea6c0476a849f1b0b93b30fe4407ec2a7dbe6df04219e90c0da2624ce9f709585d43517297223f2e202
diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
deleted file mode 100644
index 80e219edc6a8..000000000000
--- a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -11,14 +11,13 @@
- 
- #=========================== C compiler configuration ==========================
- 
--CC     = gcc
--CFLAGS = -I/usr/X11R6/include -O2
-+CFLAGS += $(shell pkg-config --cflags x11 xext)
- 
- #============================= Linker configuration ============================
- 
--LINK   = gcc
--LFLAGS = -L/usr/X11R6/lib
--LIBS   = -lm -lX11 -lXext
-+LINK   = $(CC)
-+LFLAGS = $(LDFLAGS)
-+LIBS   = -lm $(shell pkg-config --libs x11 xext)
- 
- #============================ Installer configuration ==========================
- 
---- a/xdwapi/Makefile
-+++ b/xdwapi/Makefile
-@@ -1,10 +1,9 @@
- # Makefile for the xdesktopwaves API and its demo program
- 
--CC     = gcc
--CFLAGS = -I/usr/X11R6/include -O2
--LINK   = gcc
--LFLAGS = -L/usr/X11R6/lib
--LIBS   = -lm -lX11
-+CFLAGS += $(shell pkg-config --cflags x11 xext)
-+LINK   = $(CC)
-+LFLAGS = $(LDFLAGS)
-+LIBS   = -lm $(shell pkg-config --libs x11 xext)
- 
- all: xdwapidemo
- 
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
deleted file mode 100644
index 2104e57383da..000000000000
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
-HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	tc-export CC
-	emake
-	emake -C xdwapi
-}
-
-src_install() {
-	dobin xdesktopwaves xdwapi/xdwapidemo
-	doman xdesktopwaves.1
-	insinto /usr/share/pixmaps
-	doins xdesktopwaves.xpm
-	make_desktop_entry xdesktopwaves
-	einstalldocs
-}
-
-pkg_preinst() {
-	elog "To see what xdesktopwaves is able to do, start it by running"
-	elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
-	elog "supported effects on your desktop"
-}
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
index 901b11eb7789..1e5d62650fd1 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.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
@@ -17,7 +17,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-gentoo.patch
diff --git a/x11-misc/xdialog/Manifest b/x11-misc/xdialog/Manifest
index e3452554f9d4..e62e5f1a5cf2 100644
--- a/x11-misc/xdialog/Manifest
+++ b/x11-misc/xdialog/Manifest
@@ -1,5 +1,5 @@
-AUX xdialog-2.3.1-install.patch 347 BLAKE2B 4635818c220dafd96ed2a9131d0639ebf47933b66dea33d618b94f797eaa33f055ae7daf73a515ffab598fdf0746da3c12e60f6ecaac1779837e38f06c988b2a SHA512 756aec03d9ee6ba0fa2f567d6c3db69916290a3b65474c2f1dd912d6f11095343c2d74a8ab60fc7d9d861165058e8ad8bbb8fc2827e663927e85747b9538ed05
-AUX xdialog-2.3.1-no-strip.patch 1449 BLAKE2B 30beb344c1ae3bb074bec78d334ad329ab6af8291639c40bdfa6ada510155120a7629fc4805c543af29c719f6f9ca80a2f158c4de98779e361351d4b14901528 SHA512 352ea269be3d48aaec50ff6ec49524da80a5df837ef13851646f0cf4d38e5901e639881b4106112b3d515f764042dce70f423d501ea1dda2493b4061dbba9ea6
+AUX xdialog-2.3.1-install.patch 352 BLAKE2B 75c9c6e7443ba0404e378d5a76d413d46930663840818a4b8a107ba1329647bd1adf90d19f01500212bbc60e7a213a9a22f177fb6742bd4499bc91cf3a8fb8b9 SHA512 fd89f4407c34b4850608248d707d9868a33c3d7bf5517b7f307410570322043c2cee8eaaa4afe9b12074fccf2205a7a127f7ab703732a0e086a5ee6f15c3c36d
+AUX xdialog-2.3.1-no-strip.patch 1385 BLAKE2B 5928f4989bb2d0e150790674d72ad11a97206f4370ad1049bce64ed71d8bfc504e214bda3fb76bc35ab2d5279ed4bcc02e29792526b3c649a49b5d6ef78eb59b SHA512 d210139d4e5b8fc4842f4fec4ebb7a9bc7d44a807d389d405b8c3c08b31f83a8b0f3fc6358e9cd858cf0fa2bc1f5e8d0c5f4fd23d63055c5cec0572e5e7ae23c
 DIST Xdialog-2.3.1.tar.bz2 457938 BLAKE2B d532bf9d25a349865baa3b9f484ca86d5bd7d946ca7e5b786f29eb65d297dafd9e58aa333ba671b836906d9620b900148d203be961d5ca3754977d01fc128fac SHA512 2a0f6e15297ae3ef54a41da1b1fe2ef376d28757d47433df2b8e9918cd4f95871a630b94ec544bd848e518df7f86934030a71bf0371a1466286bf7d912335525
-EBUILD xdialog-2.3.1.ebuild 919 BLAKE2B 5580d2b27d1be56e73223524f32bc7df1bc113de5f89c1f3d3581b741b855e0a8ed9d6dd68c291871555881d0306078bf09c81777a159badd9500d4ad4933565 SHA512 27f69db64fd717954e2ab394bb89b20ce8ab97289bc600bfa094fdea899b45460bfbe49597d729c4e96c493d46d35cc696320be1e20d517ef4eeb54e60d191b3
+EBUILD xdialog-2.3.1.ebuild 929 BLAKE2B 5e6d753f2561386d6318a2ccf9eb66a6b268b52abf9f9837d1a916de3577be77a5ef302aca15afaaeff86360f171efb38e225b98ad89d91c36ea119fa730873a SHA512 d4088304be09a6ae932412aea50bb0f8b8a4aae823afbecf516f3dd5250a726e3890b875f7fee504f070846f39aec0909aab500d5357f0d51c4d6719b9990dd4
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
index f5a02b099d92..8ca19e598a34 100644
--- a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
@@ -1,7 +1,7 @@
-http://bugs.gentoo.org/327353
+https://bugs.gentoo.org/327353
 
---- doc/Makefile.am
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -6,7 +6,7 @@
  
  CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
index a507f3f0cfbb..fea929d99fe4 100644
--- a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
@@ -1,6 +1,6 @@
-diff -Nru Xdialog-2.3.1.vanilla/configure.in Xdialog-2.3.1/configure.in
---- Xdialog-2.3.1.vanilla/configure.in	2009-02-11 09:54:10.000000000 +0000
-+++ Xdialog-2.3.1/configure.in	2009-02-11 09:59:28.000000000 +0000
+diff -Nru a/configure.in b/configure.in
+--- a/configure.in	2009-02-11 09:54:10.000000000 +0000
++++ b/configure.in	2009-02-11 09:59:28.000000000 +0000
 @@ -36,13 +36,8 @@
    CPPFLAGS="$CPPFLAGS -DUSE_GTK2"
    AC_MSG_RESULT(Compiling for GTK2)
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index 3be9830a8b33..e2052afacdc9 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="drop-in replacement for cdialog using GTK"
+DESCRIPTION="Drop-in replacement for cdialog using GTK"
 HOMEPAGE="http://xdialog.free.fr/"
 SRC_URI="http://${PN}.free.fr/Xdialog-${PV}.tar.bz2"
 
@@ -18,21 +18,20 @@ RDEPEND="
 	dev-libs/glib:2
 	>=x11-libs/gtk+-2.2:2
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
 S="${WORKDIR}/${P/x/X}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-{no-strip,install}.patch
-)
+DOCS=( AUTHORS BUGS ChangeLog README )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
+PATCHES=( "${FILESDIR}"/${P}-{no-strip,install}.patch )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -45,11 +44,9 @@ src_configure() {
 src_install() {
 	default
 
-	rm -rv "${D}"/usr/share/doc || die
-
-	dodoc AUTHORS BUGS ChangeLog README
-
-	use doc && dohtml -r doc/
+	rm -r "${D}"/usr/share/doc || die
+	use doc && local HTML_DOCS=( doc/. )
+	einstalldocs
 
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index 2ffc99cdc502..bb86b476e7f5 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,7 +1,5 @@
 AUX xdiskusage-1.52-flags-order.patch 1544 BLAKE2B c4a639648cc32e76ab3aa50e3733abe38ce34cd17bc183f6e4e0687b65930f9c50b07bbec58be5ba4ccf3625b027851bae4e7e299169b73c5096bbd5f8727932 SHA512 76d8910ecf96af79e2405dff1307e79343078dd125810b20024f5c6b82fc8d46dfea9ab0a332af3918f37801b1bd59501363dd3edc1cf79c583d1c59f2eef23d
 AUX xdiskusage-1.52-pathbuf.patch 334 BLAKE2B f37d93288cff512a198c05759f50570c09a9e358d93667737198909d3507204f48bd47b549d8393f327ab5fd84d90471968f1517aee4301336db35036a016812 SHA512 09687a437bb99d478de119a3c46398e272fbf0db5d0cd3391858e72b364cc54ea96cd5512789ed00f115fc0e9565eaa6471db3669b9169e39583131563b1c85c
-DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
 DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54
-EBUILD xdiskusage-1.51.ebuild 586 BLAKE2B 5ec139ccb463bf6bd0a6aee0764911cf5bc558cc953b5c17aeab83042288f974995d9c96ea68fe0eceacc1991c5e445b1d152667d47b86378db69fd1eb74a9b6 SHA512 aa6921eb15f6748483dbc3631c99c0c95a9b3133ec7188ebf9c13ace3c84ee15c3bb99b0c18d7193cac18b03f0ca91b6eaf16671cf7a26ed6bb28ab2eacb748c
-EBUILD xdiskusage-1.52.ebuild 682 BLAKE2B 3f42da0ef7c789aae94966e55e7b1301499e4e536fc5aad87f26d0c224c292fba784cc8fd8fc2e4c2831b4ce8190b421324a36a6b762570602b3a272b3f84249 SHA512 3a1ed3de6356ef1ce9fbac3fdaed4ed7cb82f78eeea528e8741dcc844c838f9e877178d1a293ebc669b9eb58f60d0a814ceb56a22c2fb092432f42f76d2c8380
+EBUILD xdiskusage-1.52.ebuild 680 BLAKE2B fa485687be3a10eff11eb8f7cd6978e7da84d4d050f2e0b9038565cc9ee64c6e835fb20a9e42e29ecb052586c1035764d4e16064a1794dd3df5c59f87f93228f SHA512 e0d5f7e1b6362c393ddd107fda4990ece46a294ed99e5b0020fd9b1767a9b3c53bb2991b743f86de9ec691bda2f3b08b6271329f2af4b4ead1a0826cd98a14a1
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
deleted file mode 100644
index 233643fc4012..000000000000
--- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="user-friendly program to show you what is using up all your disk space"
-HOMEPAGE="http://xdiskusage.sourceforge.net/"
-SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=x11-libs/fltk-1.3:1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags)" \
-		LDLIBS="$(fltk-config --ldflags)"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README
-}
diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
index 555166755fd6..d651d779077d 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3:1
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index c9e6947e30ed..1ea591b6049d 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,6 +1,3 @@
-AUX xfishtank-2.1-implicits.patch 1306 BLAKE2B fc02cbba3a86316fd660c1e6436f191a4f1ad22fad9e63958d2f4550796c759560c2d6073d3350518db4b35c3d10ae4c0caa0e0acfde4735dcfe22fba5029cc9 SHA512 a67297947eeb3ec2b2db59bbab0e802bfab80c4aed90b2db29a06333aee12074b039b91a0daac0eaa51b2c5f52e7a67a3b0bd84aff9fbf3d56fb3c4b03c1c7bb
-DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
-EBUILD xfishtank-2.1-r2.ebuild 723 BLAKE2B 2b7ed6c8a590f24229ba01f491c4297bc029d2268ec906f07e683d45304b8fd0741e949ec90fc754f7dd90deea90d1f0fe761c239c1fe144cefa7b30f86b3bd9 SHA512 35e2c231645b79c5172bd41922686a14b1e38a7647dfbf5e6a56196ca93bc5c94d85262d44478e7356fba7507cd0f10a359b4f10b99be8bd40a555e8d223db48
-EBUILD xfishtank-2.5.ebuild 708 BLAKE2B b5c84977e35a762fb2cdfd9eb56c3fc44e0bf89257fd46003fc1e1534c3592d516afeea7fe6e1a0a79656dffb98e032bd128edac41511c1fd5540957c8c9b5d8 SHA512 c2735ce248942ea289c32b601dc3d5f3914761ef71e8c2fe3a6cb87f3462c98751700154a49a144705370db7e1aaedd2436e18de477f0c5ef457fdc7aab03c5e
+EBUILD xfishtank-2.5.ebuild 704 BLAKE2B 9f33915ca44a3258b535a7bad9b51438f36150605f3fadf439210053ea3270c3cca616522e84715311db079604464c2f7ba439fe07f34c758e24294b59840840 SHA512 4a27e4f939600ebbe59a1bec25f2161f6cd9402e193c90e1d3fca92864db64897c40103f7703b1e29a1aa9573d38f1c99115a83dbc6d39dd363dd194728f66c8
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
deleted file mode 100644
index b00118631bee..000000000000
--- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/read.c
-+++ b/read.c
-@@ -1,5 +1,7 @@
- #include <X11/Xlib.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "compact.h"
- #include "medcut.h"
- 
---- a/medcut.c
-+++ b/medcut.c
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "medcut.h"
- 
- #define RED     0
---- a/xfish.c
-+++ b/xfish.c
-@@ -46,6 +46,9 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #ifdef sgi
- #define _BSD_SIGNALS
- #endif
-@@ -848,8 +850,8 @@
- 	struct colr_data colrs[256];
- 
- 	colormap = XDefaultColormap(Dpy, screen);
-
--	if (colormap == NULL)
-+	if (colormap == 0)
- 	{
- 		return;
- 	}
-@@ -1812,9 +1814,11 @@
- high_res_sleep(seconds)
-     double      seconds;
- {
--    int         fds = 0;
-+    fd_set      fds;
-     struct timeval timeout;
- 
-+    FD_ZERO(&fds);
-+
-     timeout.tv_sec = seconds;
-     timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
-     select(0, &fds, &fds, &fds, &timeout);
---- a/makeh.c
-+++ b/makeh.c
-@@ -1,6 +1,6 @@
--
-+#include <stdlib.h>
- #include <stdio.h>
--
-+#include <string.h>
- main()
- {
- 	FILE *fp;
---- a/gifread.c
-+++ b/gifread.c
-@@ -56,6 +56,8 @@
- 
- #include <X11/Xlib.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #if  defined(SYSV) || defined(SVR4)
- #include <string.h>
- #else	/* SYSV */
diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
deleted file mode 100644
index 3e5fbb14c7ea..000000000000
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${P}tp
-
-DESCRIPTION="Turns your root window into an aquarium"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-implicits.patch )
-
-src_compile() {
-	xmkmf || die
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" ${PN}
-}
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index c98482c9096f..7ef03d5d699d 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.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
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
 
 RDEPEND="
 	media-libs/imlib2[X]
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 3615b1e719bc..34feb906f064 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,4 +1,4 @@
 AUX xfractint-20.04p16-install-phase.patch 729 BLAKE2B 937aa26a6b0e4e4f9c5ef52677f47ed5fb0f7906f116da378b82020bc765c01cd488b1625d61f33324c4984ba2cb1c669b1fca95fc834a948bf22fe87977a0c4 SHA512 fab66eafe5b97b767e6e67f09bde79f3b984e0d40fcb4fff1e5002da5a47e052916b3ec6786921fa393e150ef47e78e286fc0dda58e4affdb2cc5989a58ef7e3
 DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
 EBUILD xfractint-20.04_p16.ebuild 671 BLAKE2B 537cf58481f902508d41458a71295c1c0fc44e7ed4d9c81343c7201a9a22e5280105bc6b39d6e02b4addee97c52c3713baa9e1020957a52e351d23015126e196 SHA512 0327cd8a0e1983ba9a2b176455e7d52c2a49d727cba1cb065aaedf2fa8445c3f95946b30e7b71b965b7c939b29d5b9a8b303526ca10e8210349f0834c2ac4735
-MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
+MISC metadata.xml 396 BLAKE2B f4d54b74d0c27850ec6dfe73836ce1076351c0a66a3fbd3e722cfb0a92a8b34cf119d2fcff76ee50d8461f65e31c73551f501188578ffaf22d5e0ef9368ac674 SHA512 3f9f680cfc596ac78bab88cf18bd679207028cbf53bec45e70349c9d43daaf995360c45bbee5e186bcfc95e72b7e40253d8b718feaaceff48f3ea4e55e141033
diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml
index bfbd225ab16b..6f5ee049dbc9 100644
--- a/x11-misc/xfractint/metadata.xml
+++ b/x11-misc/xfractint/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ddenoncin@gmail.com</email>
 		<name>David Denoncin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 3780fa105479..22688a295a2f 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -1,12 +1,6 @@
-AUX xkbd-0.8.15-fix-keysyms-search.patch 438 BLAKE2B 881880be1b72af0cd5ae7703a9c9cb98164bbf4ed7f79cc6145866489eeaabb0657439e32da88776e39ed7eb2c14e02c6ac5a6fccdfb329f81d7f921aaf3f00a SHA512 ae494c10df66179739a19a5f5a21ec7c00ab6674fff64042006958778d2fac9c2da9b5a9e945dcd654827850444121b0135a143b4b0e5783f6b420c767009505
-AUX xkbd-0.8.15-increase-delay.patch 770 BLAKE2B 1c96d074ba584cb74718a3ed80751b34b287d4e612e30cfd322c8d44d377fcb1a1b3e64f50c12240948b72d99c632fc342d02db3cf8072adb6435b6eea80e18b SHA512 49487d975134d2319d194b5d5110bd6d93b45f712129d1f6f05d00e6611403a9acd5a6a1183e371d56619a9d7456a00cfefded4aa21a63bdf3e1493a59085fcd
-AUX xkbd-0.8.16-desktop.patch 1172 BLAKE2B 994a60ce696aa09a8a8d5f61e39366ef0dd12970ab1ef8b5bf48a18a731a90713ea20335d7a4715d390e1ae865a99a4f02f4dca87a46d6794db6f49069327edc SHA512 26d4281cfc15a8aaadb0bd9ffc70df7c63b31abc54fd45ec0055abe37d7f960ac4d05056dabaca14bb33f19d34c5e293b4b0b45fe96b7d0078b73897d9ac388e
-AUX xkbd-0.8.16-fix-geometry.patch 1081 BLAKE2B bc0906cc6aa06256cd6c22a288cac1d51ca658871b8d2c014b3efa3fe4f3b2c99be38ee0503a37663a6fdf7d17b71d39e82490c6b84e6e3251990c265e02a9b7 SHA512 03c2fcc4a2d731ea3dc3bb9c596e9d867b01e09713c65f5614f37eb86c2e41edacd16ee67b67a01fb7fab9e2e9e936cfa9ab5bee214f3427710a88829a538899
 AUX xkbd-999999-evdev.patch 448 BLAKE2B 43c17e904bbf7e916355dbe97da70e20b1cd10771dd748d9082de4b61ea7deff6ddff8dcd9a9eac0904adf663f8212d0dd7cadf8ee0c01e6941ebb4460621aa8 SHA512 4e4812aa42325a4492d699452700595307c73b5e15fe9116aa6c6aab12fca943580cbc941ab2335750ed89871d1c7ee8fc578a1e1ab0c21f3479ae0426b4cd3f
 AUX xkbd-999999-xft.patch 797 BLAKE2B ce1eaa3b1d16baab6269927efe79ee19e611067465793e1ba2313cef28ca7fa55f2541c0714fb58f5157f7f5b9550daad6a3724bd2cae3fa3c2868c8b596507f SHA512 886d83b5653cbd1b49745a997fd9079a5bf6fd0f31b0c009e65ab26c0b43448b41fe58833d482bf099ecaf2529e71b488c37c3896bea47ec243786421fe79cb6
-DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a
 DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831
-EBUILD xkbd-0.8.16-r1.ebuild 811 BLAKE2B bd7732d840d253dea3899b3f3d33232c4cf74a2dfd87d25bbf4c00f7850239219903536697a2dc42ad4f9e050e7ade739de3af26b3d81dd9f111b2ee4e479498 SHA512 1f24a011cf05e651ca3e550e8fc693a8ab6e1bd2bc67740c9070bc20092dc3c11ac2acfeee7b1735583010b970fd1af30a61ad299790851ab7997e27387a85df
-EBUILD xkbd-0.8.18.ebuild 755 BLAKE2B 1a7a5ee2c928381eab31c9a30bdd16684deca8b0c2061ed8a54ef1be86d02b106e0456c3970321ba0dea873cc7f1bd27f2d51b9dcc473e53caf0919e334ab270 SHA512 de6c0e4d9f3db6e65e0f04c08c298333a22612c0b24792b226ccdf43d81b5f23c7c631dbed05dc0f15788debc3d68f893996acc113d234726f169ffd88cd91ae
+EBUILD xkbd-0.8.18.ebuild 753 BLAKE2B 917922173b6525232609828b0cbb7c9ec801e0ca9684ddcbb469e12301feb05df3ac390c8bc887cba09bb587bb426bd8372e0596a4ac5f7d68ac25a7c0f09607 SHA512 22b539a0d8b5f6e482fc08a5985a8609690b14b62032e46979171e1964f3d3d7b68f18d21fe35be43c95e43d1d912a8770b1a5eb01e8fa58e819e4a7713320d8
 EBUILD xkbd-999999.ebuild 1051 BLAKE2B 4fbba7618b97abf123f7cad735d4254e040ec55a6e830831105ec68d338c2273b2b5a2a4b6052e8099286125ea9bd2ee643fa518c0f88dc120f9d85240a7616a SHA512 38457f50b99e9da9b7425670f098aaaf8314711395fed68355fc28d88e712eea42bb2405547de72964db165a4a6f4bdb6e44efcb45d57796fccd2dc1576ce442
-MISC metadata.xml 528 BLAKE2B 7ed86e072723be552f3d67dd120908f1c08a804a96d2fca8d88af30bc714a5cb65e3d3677076c0b020a780b9b868a92f03d6a1b6bc4edab10f0820e9714c7099 SHA512 cb6cb76112b88837fb99dbc1d6c789edf4760ba64ba24dce5badf1d4bad4995dee19d9f2ff87fdddc608098b013ab31e20fd9cc145c633e9b4a603ea11d76758
+MISC metadata.xml 528 BLAKE2B 0abf3eaef00d50e38990d830da1b4e6efce0e0f16ed41f9efec6ed8373e53e55fa836897e75b38716d163fbfe43fc8d3db99dfe071e86450ab5c222dd64acb34 SHA512 4e2dbf91c09c3fa4b46ce4d6ad5d21bba4851113fc9ce06288985358a8e6086821f259407460d9f879fa5d2cb9c14f47956aa8ec4e947a271587bddbeaf49ec9
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
deleted file mode 100644
index ff30537add44..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/287075
-
---- a/src/libvirtkeys.c
-+++ b/src/libvirtkeys.c
-@@ -341,7 +341,7 @@
- 
- 	for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++)
- 	{
--		for (column = 0; ((column < keysymsPerKeycode) && !found); column++)
-+		for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++)
- 		{
- 			if (keymap[(keycode * keysymsPerKeycode + column)] == ks)
- 			{
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
deleted file mode 100644
index deadcd7cddb1..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
---- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in	2003-08-10 10:46:29.000000000 -0700
-+++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in	2008-03-23 02:52:52.000000000 -0700
-@@ -24,6 +24,7 @@
- 
- # button style, can be rounded ( default ), square or plain
- button_style square
-+repeat_delay 50
- 
- </global>
- #
-diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
---- xkbd-0.8.15/data/en_US.qwerty.xkbd.in	2002-11-28 03:46:04.000000000 -0800
-+++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in	2008-03-23 02:50:39.000000000 -0700
-@@ -26,6 +26,7 @@
- 
- # button style, can be rounded ( default ), square or plain
- # button_style plain
-+repeat_delay 50
- 
- </global>
- 
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
deleted file mode 100644
index 987270d1d398..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes following QA issues:
- * QA Notice: This package installs one or more .desktop files that do not
- * pass validation.
- * 
- * 	/usr/share/applications/inputmethods/xkbd.desktop: error: (will be fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
- * 	/usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "MB"; values extending the format should start with "X-"
- * 	/usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "Panel"; values extending the format should start with "X-"
- * 
---- a/xkbd.desktop	2003-09-29 20:29:35.000000000 +0300
-+++ b/xkbd.desktop	2017-02-16 16:23:40.927035269 +0200
-@@ -3,6 +3,6 @@
- Comment=Virtual Keyboard
- Exec=xkbd
- Type=Application
--Icon=xkbd.png
--Categories=Panel;Utility;MB
-+Icon=xkbd
-+Categories=Utility;Accessibility
- X-MB-INPUT-MECHANSIM=True
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
deleted file mode 100644
index d90824085ea4..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- xkbd-0.8.16/src/xkbd.c
-+++ xkbd-0.8.16/src/xkbd.c
-@@ -307,21 +307,22 @@
- 				0, BlackPixel(display, screen_num),
- 				WhitePixel(display, screen_num));
- 
-+      wret = DisplayWidth(display, screen_num);
-+      hret = DisplayHeight(display, screen_num)/4;
-+      xret = 0;
-+      yret = DisplayHeight(display, screen_num) - hret;
-+
-       // deactivate geometry for 0.8.16 release - mb
-       geometry = NULL;
-       if (geometry != NULL)
- 	{
--	  XParseGeometry(geometry, &xret, &yret, &wret, &hret );
--	}
--      else
--	{
--	  if (wm_type != WM_MATCHBOX)
--	    {
--	      wret = DisplayWidth(display, screen_num);
--	      hret = DisplayHeight(display, screen_num)/4;
--	      xret = 0;
--	      yret = DisplayHeight(display, screen_num) - hret;
--	    }
-+	  int flags;
-+
-+	  flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
-+	  if( flags & XNegative )
-+	      xret += DisplayWidth( display, screen_num ) - wret;
-+	  if( flags & YNegative )
-+	      yret += DisplayHeight( display, screen_num ) - hret;
- 	}
-       
-       /* check for user selected keyboard conf file */
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index b43c941bd068..bd8d54929bbc 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/metadata.xml
@@ -6,8 +6,8 @@
 <name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
-<flag name='evdev'>Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag>
-<flag name='xi'>Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag>
-<flag name='xrandr'>Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag>
+<flag name="evdev">Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag>
+<flag name="xi">Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag>
+<flag name="xrandr">Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
deleted file mode 100644
index d3c9125a799e..000000000000
--- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="onscreen soft keyboard for X11"
-HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd"
-SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXpm
-	media-libs/freetype
-	dev-libs/expat
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS )
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-geometry.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${PN}-0.8.15-increase-delay.patch
-	"${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug)
-}
diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild
index d7baae0ef8c1..062dfdd982f6 100644
--- a/x11-misc/xkbd/xkbd-0.8.18.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="debug +xft +xpm"
 
 RDEPEND="
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index 5eaabe28c962..b22a535b584c 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -1,9 +1,5 @@
 AUX xkbset-0.5-ldflags.patch 412 BLAKE2B f42d74ab24dd14348bdcddb83aa16ce732a9b912aa4b52283026ea55c2f546b76a89dd0d57f0c21495bab95b9b81b6ee8b9d080217bfc07ca88ac27c432a438f SHA512 594eb6ff7f812633d4e7c3e8ab1a90f3f71856556680ba3643d40eb75602a0e9b09cee129929f7d7aabc70d009f3b511c0fafb8dfe6943b4456b9da95a9eba39
 DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c
-DIST xkbset_0.5-5.1.diff.gz 3744 BLAKE2B 3294afd74ddfa81d18827ef388935113eeaa6b2b8abfff799b13cec04f76dda2b78be685991933f133f5eb2b8ebcea5dbba6f5e4429d8363c984aa5c6d22de77 SHA512 92c362653088d5249dc26959cc898d4f8882f77b410ae09bbb2f03972940ed64ee2864b6da3425692c5cfa2bfe3b34d8316f5d7aa619f25c6311ac7a91a8db4b
-DIST xkbset_0.5-6.debian.tar.xz 4028 BLAKE2B 5892ffc95e1926515cb98eaa40829f1f1d91009260e53d62834ce3fbc1bf99559ad5df9ff5b8a57cf7989579cbd351a7bb5481f7e284c9adaf954b2f20cb5d05 SHA512 c7d806406756785c77c12152a092c3f1245941682d063d503f3279d033a1adffa29c7b62723c720cdc03ebde882c134c494b30eda240211f899ceffbc874c366
 DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f
-EBUILD xkbset-0.5_p5_p1.ebuild 1159 BLAKE2B 77f938b9a6939606617ae7dd98099e7e83ed32fac38a3c648438ef7f6ceb63b5cf75126c890772c42b12858fccfed79c8237b274013b8718aae87b8f4a0def31 SHA512 0e6e53ff85335d789bf9dc12d6e731f8223598785b9a127b37ac0c131e965a77b239c00ef95c245f94f12159b95c4202ff0f73b36e6ce90e976aa0596b8106e6
-EBUILD xkbset-0.5_p6.ebuild 981 BLAKE2B 1a252f0c7b1c33ce5f46906d36e4aaf95a4c27171f6350266ac868e890c40f7d6dace0191393ad301d855f6467ba92645f7a2fa6a400e61f84b9c613eb77f7d2 SHA512 acd96bbb958d997a5ac8642e2706be3a57ced9a71eb9f3fd286327a9d44b016895300bfbc62692c18334055a765c04178f0a9b8afc79a05acddbc2f60d2345a1
 EBUILD xkbset-0.5_p7_p1.ebuild 914 BLAKE2B 4923482a4a06d6604257f670526d25f6c576dea75b283d29dcdf8e30434e832b7cd380dc0ba4ae917636a33ceabd615fc2ade57e8aa7b4845a30126aa9a17625 SHA512 87f29e3cdc4c96c4e840d31500dd69b4f3dd5c9fa64287739ff21da4dfd7066502d0a2edbacc18c3516a78f73422c251da21846c2edd229d63470d3217e56f08
 MISC metadata.xml 262 BLAKE2B cb551b0eb323441a2d47a1fcd705845286e4896a850de2618e61c39d971712de87a048d4f57709dce005a817e09b3bc70749e84020d0f9e64c78a74e2eb5e3e6 SHA512 1c3f56251e423f2f4ebd7fd3d9cc4d5b7d8373657df1787a2035712cce3593e569ec65cb9a60137df404ab014382ed8bf5aab13b91b766b7570ce7df687f77f0
diff --git a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
deleted file mode 100644
index 87d2b2816bdc..000000000000
--- a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs versionator
-
-DEBIAN_P_MAJOR=$(get_version_component_range 3)
-DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/}
-DEBIAN_P_MINOR=$(get_version_component_range 4)
-DEBIAN_P_MINOR=${DEBIAN_P_MINOR/p/}
-
-DESCRIPTION="User preference utility for XKB extensions for X"
-HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
-SRC_URI="
-	https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-CDEPEND="
-	x11-libs/libX11
-"
-DEPEND="
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	tk? ( dev-perl/Tk )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-ldflags.patch
-	"${WORKDIR}"/${PN}_${PV/_p*}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff
-	"${WORKDIR}"/${P/_p*/}/debian/patches/02_clarify_errors.dpatch
-)
-
-src_compile() {
-	emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
-}
-
-src_install() {
-	dobin xkbset
-	use tk && dobin xkbset-gui
-	doman xkbset.1
-	dodoc README TODO
-}
diff --git a/x11-misc/xkbset/xkbset-0.5_p6.ebuild b/x11-misc/xkbset/xkbset-0.5_p6.ebuild
deleted file mode 100644
index 7ac0f9aa012e..000000000000
--- a/x11-misc/xkbset/xkbset-0.5_p6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs versionator
-
-DEBIAN_P_MAJOR=$(get_version_component_range 3)
-DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/}
-
-DESCRIPTION="User preference utility for XKB extensions for X"
-HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
-SRC_URI="
-	https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.debian.tar.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-CDEPEND="
-	x11-libs/libX11
-"
-DEPEND="
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	tk? ( dev-perl/Tk )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-ldflags.patch
-	"${WORKDIR}"/debian/patches/02-clarify-errors.patch
-)
-
-src_compile() {
-	emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
-}
-
-src_install() {
-	dobin xkbset
-	use tk && dobin xkbset-gui
-	doman xkbset.1
-	dodoc README TODO
-}
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 15d7b34039a3..17640aec503e 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,7 +1,5 @@
 AUX xkeycaps-2.47-Imakefile.patch 595 BLAKE2B a4ecbb62eb308357b77a7633eb8c1eb0a8fe25d17e6e912e416120003996438b51684ab60cbe840c5be7b217ce0c283890f40a5c997b952d8d31ab23a4a58c5a SHA512 3412fd9db48460a97c5630a9641bbf147e905b5c5ce357627d6f65e669d044cfb88f271506767a26fd3a6791d5ffa06af85eeb7ebfdb932c20dfcd088c7b2307
-AUX xkeycaps-2.47-man.patch 639 BLAKE2B 4c554a83d65598544d2fb2853c523503b4be9a52d56a6a488aec933600fa39d2e050028ed907d0ea19bf1bf2898113a6c68c2b965c43840abd2dd905ccdfcd8e SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950
 DIST xkeycaps_2.47-7.debian.tar.xz 7268 BLAKE2B 86ddfd8b2ec8761b8e4a4c4de93fcfd0b88c018125c20f987bf5f47ea77edb5b996a3ed45c3fb2452c7647d6f1a3a2583bdd17f0442435d83afa3dbbc280d285 SHA512 85d72cbd4012299ab60ab700049862c1ab514c904acb8e3810fd7886cacb0712c3849fbc52dee499007d97ce8aa301a34d901120a46ba15a32151986121fbbbc
 DIST xkeycaps_2.47.orig.tar.gz 351418 BLAKE2B 0dfd53e6b7af6c14057e56071b70edf3479a55ab4e6ed9651cd5acec68c1db8096264dc8d5b578ccb62b331ad6f14ec8f1b8d0363b614d14b0ba9ce60492b55b SHA512 f5f5ecdf83c2bd86eb3d8b8a28b26af25a2dc9ff0a9c44091d8eb154d617b4373191a2e4479bb0e3025c023d6e5d785a088c64bc269c1c43431a3d2fc91c1a7e
-EBUILD xkeycaps-2.47-r2.ebuild 941 BLAKE2B 84e8a1fb682cc3f69cfe1baa0ef470c161c042a97c4e598e75ac15c24d72867961500258440c6505025ce3d7c9e6f95602a9925514f0d71165cda2fef222b3b5 SHA512 bf3255afbf8ff2f6013ef718fc3f1ecc08554a3604b6e1fc84ea0afa4533b1dc9f9e91a5c5da14c66fb5732f524fcba2f6a990f746cfbbb681a13f380b0fbd1a
-EBUILD xkeycaps-2.47_p7.ebuild 1163 BLAKE2B b768aafbf642620bdd60611a8bd13e9048274167a9d6337c60a5116e0efa49a9966ad88e3ac91801f8a6f46ae2b6a1b764446ed5272db6195d3261e27c15c1b3 SHA512 b953db51507308931a013bbc86abffc265ca0311b6a7aa6c02390daab224002c1a6aa7161037110e41c4060fc32981609e39945761ea7a257b89847328fefc37
+EBUILD xkeycaps-2.47_p7.ebuild 1159 BLAKE2B e84392a72f33cee70169569eef4cf742800d314686e4a319aeae2e3130424af228d133ecf33ba5d71e00bcf08ea2dc0589cd0e7c0aa4a585d7d86e727dc19006 SHA512 4e0ad808cafbbb2af63e61aa31575611f9c3fbbc62e6413f9a6597380ef2a30f8df8eb71afa95505a6777537c9473c4bd57bce8520a10be7b2c19faa722c3bf3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
deleted file mode 100644
index f68629ef3eaf..000000000000
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man
---- xkeycaps-2.47.orig/xkeycaps.man	2006-01-02 02:22:17.000000000 +0200
-+++ xkeycaps-2.47/xkeycaps.man	2008-12-07 22:51:38.000000000 +0200
-@@ -267,7 +267,7 @@
- the physical keys: it is immutable (unless you repaint your keyboard...)
- .TP 10
- .B \fIChord\fP
--This term refers to a set of two or more keys held down simultaniously (by
-+This term refers to a set of two or more keys held down simultaneously (by
- analogy with piano keyboards.)  All but one of the keys will generally be
- Modifier Keys.  Sometimes \fIConstellation\fP is used to mean the same thing.
- .TP 10
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
deleted file mode 100644
index 0c3b4ce21aa7..000000000000
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GUI frontend to xmodmap"
-HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/xbitmaps
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	>=sys-apps/sed-4"
-
-DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-Imakefile.patch
-	"${FILESDIR}"/${P}-man.patch
-)
-
-src_compile() {
-	xmkmf || die
-	sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
-		Makefile || die
-	emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index 646273eb1ed3..bef2b91b62d2 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.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="
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 85c963e28a6a..347591fad53a 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,12 +4,10 @@ AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b8732
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA10.tar.xz 1943664 BLAKE2B 2beecacb2e1f041b7a239b083191812ae3480475b97d2d74718515e692b42cc356bd70bdae5ae85858dedb678e0f1c696d3d339d705097d66ea13f3e2948c270 SHA512 734c33c17f0698210ac4bfe36535f1cfeb87fa0e3ce5aa93f7aa22558da22b067e3c347524d7301751725a702cacb0e1517ccd88ccc1a43cf317552fe4bd1cf0
-DIST xlockmore-5.66ALPHA11.tar.xz 2080280 BLAKE2B c6e5df805429f62979355304c28389ebca837791ce6bf4a4bc9193135cf0c0f520a4776404c62a75afb57a30c187084f2b81d783ec93d5c0896b4d88edc9ef23 SHA512 c69d6414dc5dd708b5f5cd2bcab7405d7779eb8c6dbaaef07ccb9ba74be805d32c07184b19893d95567fde05aa7bfd66c626c10f2085867905f3632a5b4edb3f
+DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
 DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2 SHA512 e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a
 EBUILD xlockmore-5.50-r1.ebuild 2232 BLAKE2B f50ff6c7eec489f9431266a9c02902b9cba3de6219b76e8452e13390b59513e3820f65cd2824cbb4eb87262d110a97fd66236d62e6389fb78a0823fee50d4afa SHA512 24a893bd0cdf66cecdc52de86cf167ba9117f5f5ccf8e26ae4279b4b2f229f4f7f0c850c46bee7b4fd1aa984988dbac38a1181e3f69b364d4a47a74d2ea11ead
-EBUILD xlockmore-5.65-r1.ebuild 2337 BLAKE2B eb0c1f0207c023987984afdcfb3c2a3efe044b9bfc6943006cf756a76c3aacdbd55c973c636542c3b163d5d9a9ba0bc019cccd26c5b37e2a265b75dfc64d5479 SHA512 1983b541ef21f02f439070fdf8bb6dd261fe61ad39c9548e1253a9013ae3e0566a9195f3326d91748b54c05b67547896e7a6b8ecc367bd3bba9ceaca3b9478b3
-EBUILD xlockmore-5.66_alpha10-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
-EBUILD xlockmore-5.66_alpha11-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
+EBUILD xlockmore-5.65-r1.ebuild 2332 BLAKE2B 1f07a0ebf63fb25e13ec01d5f4fd79bae60e49db9ac3eb3a99c2f917b251d9d3f10d351983217ad70add9a7c5fefd0e43ef612fd21cb14f1adb85e514fce9a9b SHA512 576c000839ecbcbae4b4cb31deaf3f864b334e7383041ed08054061de77cad5a74e98ed9943f0b80d6a9126feadc41a947be998aa736001770b4b4ebd892503e
+EBUILD xlockmore-5.66.ebuild 2493 BLAKE2B a9b8d9b8ffe060d0d5a9764fa3d09c184f0f08f8c1ec87c7c61d9309f32177abb4450383633f75beec921bd422f95e1ae3642963c08000df29e131d31e593865 SHA512 af7a90003c6a31fea53fb1494314a5ed8fc59da89738bcefca2fa6d694bb84ff72ea9779fe618ef6bdbb6332418815d7985493a06a735ba31f5da4de412fa827
 EBUILD xlockmore-5.66_alpha12-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
index bec091ad9f0f..d620594421d0 100644
--- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
 
 REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.66.ebuild b/x11-misc/xlockmore/xlockmore-5.66.ebuild
new file mode 100644
index 000000000000..e701a66751bd
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+S="${WORKDIR}/${P/_alpha/ALPHA}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	if use pam; then
+		pamd_mimic_system xlock auth
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha10-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha10-r1.ebuild
deleted file mode 100644
index 581e292289a9..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha10-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/XLOCKLIBPATHS="-L/d' \
-		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	if use pam; then
-		pamd_mimic_system xlock auth
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha11-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha11-r1.ebuild
deleted file mode 100644
index 581e292289a9..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha11-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/XLOCKLIBPATHS="-L/d' \
-		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	if use pam; then
-		pamd_mimic_system xlock auth
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index cb7f014b76c8..d0539acf8528 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,3 @@
-DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
-DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d
 DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
-EBUILD xpad-4.2.ebuild 564 BLAKE2B 5243929361e082677d52083d2b98966c9d7b0bf2b07ad76cd31964da4f8a58be84fb3c1abc9a57e49b02361750aca7ec83349483d14f84ef865a1afbc1876a57 SHA512 2bf52010d2ce0db9bff21ce820d1a0baf92a36b0a93749130b9db7fb98a533fd558deeda38f33ce4e67d9b24d408ced7766171ce86d889eeb0a5e948288b25c6
-EBUILD xpad-5.3.0.ebuild 725 BLAKE2B 90a1f6d04b3381e6185c26cda85968659356e5dd5ccf9af5ff503c146c5fb29d90d52c3e40a472bb1a189e30750d810668e329e1fd57ff67e186ee904b9850fa SHA512 a3ec988b92c9b8c0f386ed41a6bfb47cadea2bf9433b4b9f07692cc87b441ff6442131e79b02e689faa76bdafc6d8be5a448af593c5b18b22d5da2a842113c83
-EBUILD xpad-5.4.0.ebuild 725 BLAKE2B 9b2bcf6b240fe74691316ac29aa37b3d5c65a9ef003cab1533f3f7d5d9acaff3dfeeb291b5c08ee4471e8f08833757d70454419b928c21cbea2abbfce3c53fe5 SHA512 338a23e390478af407abff3d6d3226ba8474398be847d0d01f3aca63616005431e9afc4c9f11544fdc692ccc13839d6760d45b345140f0fba3f0a95fef428f8c
+EBUILD xpad-5.4.0.ebuild 722 BLAKE2B ba60e43eca4b0adf2fd399872610e42203f070f47c5d7f31c8b485b1ebc22a945ec30ada9f98f607ceb7250880d8e2bc0d46139f57b60bb2849d8a1bf55c141c SHA512 27e9013bb83d81e77bea0cc1352caaa8c63ce0915805cbe4e715b53901d25131ccaa62a0ba44113f3a4f75bb494051c7ed1fc5fcfc4270d33575b48737a69668
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild
deleted file mode 100644
index 3396c56dfc1c..000000000000
--- a/x11-misc/xpad/xpad-4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="a sticky note application for jotting down things to remember"
-HOMEPAGE="https://launchpad.net/xpad"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/gtk+-2.12:2
-	>=dev-libs/glib-2.38:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.31
-	virtual/pkgconfig
-	sys-devel/gettext
-"
diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild
deleted file mode 100644
index 7bf9ed46b966..000000000000
--- a/x11-misc/xpad/xpad-5.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="a sticky note application for jotting down things to remember"
-HOMEPAGE="https://launchpad.net/xpad"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	app-accessibility/at-spi2-atk
-	dev-libs/atk
-	sys-devel/gettext
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/gtksourceview:3.0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.31
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index 8f36edf945ac..56d33df01196 100644
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 05b5ab16e50e..e768dc9cff2e 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -2,4 +2,4 @@ DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e68
 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
 EBUILD xprintidle-2.1.ebuild 512 BLAKE2B 9c5cdd449e651e540626d6f0dadc0a405b0237c7c404456b93a2c09c7df188c987b3e2515991d77bfd25ab83a9a365bd7a2bae279873f3238c25d59cd52aa5e0 SHA512 ff01449cd64f7e82e211a3d46e04838104124bd63aca3d221cf09f67ad1c89fed04b583310f89681e06f5e6be2018bdc1d9cfd5481e6ed52eda5adab4ef10f42
-MISC metadata.xml 304 BLAKE2B fe9f1bed50a82bcefcf1ecdd2196e57f2176ec406b13d707a4bc6013930127a61b515e66ba382a2f6a9bb01a59f6cc4b6d757a0ea1ec988c0315eb5bedb5ffba SHA512 3f2adb57b1759967aefe91475feac1723efe2e29c86f1111635f9f1c1d909ab518a80e60666cb500247b6a66772067901a3513d1b01a39ad42cbe3044c96e875
+MISC metadata.xml 304 BLAKE2B 678c5c4d85e711c47669094f7fbddf5e4c69617c3997d80e3061a63e427343bcc0893f1e1ba3ca4d19d63d7285a06639372f23595fe7e8d3f238ce74127a2b0d SHA512 b7125566a214f7b9a814ecb114813c71e9b82469b8061f40b8fcbeefabb24372b30a02d918e184ce575832abc1829ac16e2f4d6e53fbbad51543834418829f30
diff --git a/x11-misc/xprintidle/metadata.xml b/x11-misc/xprintidle/metadata.xml
index 3216f3a00a5b..6cb31284c350 100644
--- a/x11-misc/xprintidle/metadata.xml
+++ b/x11-misc/xprintidle/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 8d078c724e07..4e190e3ad224 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,5 +1,4 @@
 AUX xscreensaver-app-2.3-configure.ac 484 BLAKE2B 3bc48e99a411b9742d3241a6d8007382367987c64b6f7358b3f021c390aab1f3c3f7958169a6e2c2d947a2fcc9312da75998dc66bf7b820a60ce734e0903b5ff SHA512 4093fb62a68f0831cf16ed69e2fd64434c0dc5381299d52743702e6992baf016a3161a7d120ddd5b3a7859f30c2e75e0e0b88d725e519b3a69130178ac0eb60d
 DIST XScreenSaver.App-2.3.tar.gz 47566 BLAKE2B 8ba867b8bd64885f7c0ed6b86adb52b2886f5b7f99c06b3993c2eca9d9ee09bf9edeaf04fe4eebe1d3d4d175acc6c00034cf3caad8c8d2318a6f671831f92a30 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290
-EBUILD xscreensaver-app-2.3-r3.ebuild 855 BLAKE2B 32c20f91e7766bfa891b9871f53135c042b30a6dbe9ed558dc4f13392b370c28b80126731c1e341b03863e55008c0cd0e9aa95420e97760fd478d55a11753f49 SHA512 d0d37f62648a09521f0e5e994f18cff63b821ad4bbf0eaeac15eac7b75dc88a4de379f94a641331e4b950aa3b1aef0bc54f49d7ca9c2c31262b3060d8f150b67
-EBUILD xscreensaver-app-2.3-r4.ebuild 864 BLAKE2B 99b2343bf86c4fa3ed634b11179037872603b6fab765b59e874a94649a92cf630fce6b4307a7b6e16088778952be4b1b58c29b66b8ebc07768478844b6c15a60 SHA512 570f5ab06a1b36dcbd591e2c08a47be0b208fca3f17d75f0c60d57a049c976edadd93662c3e96bf3253630f5ccfb09b02ea57e206b34544f55623805d949e560
+EBUILD xscreensaver-app-2.3-r4.ebuild 862 BLAKE2B cbc936ecab61abdee597ca87aafbab4d88c7b74b838dc18278ae87b67fcacd22fd4fc76419af9478e6384fd632dcbbfa7de14c0e5fd182bfbea08273a5c609c7 SHA512 b0cb0d99d357d9d5c3ec38766591256c06205e5067bd81985d54f263614eb51e587871332895f11820b4b5ca277b5853851691a65267cebb4c1f34c9f685ca51
 MISC metadata.xml 371 BLAKE2B 5f7abb08f7add4875f3976d7ca48d0dd3523a8ad25238c38ef8ccd1a0b40855a4b12292d077726de6ef5c6dccbcb128f653e461c0878ad6faf55184bd8f2a031 SHA512 86572bcaec2a3d22274e9b4cbadfbaf731082f5be3499b024338da625d29cae3deac7000f42a8582932f9f6791f1deff9c277d590180e5842934df281c289726
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
deleted file mode 100644
index a4de3213fff7..000000000000
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools toolchain-funcs
-
-MY_PN=${PN/-a/.A}
-MY_PN=${MY_PN/xs/XS}
-MY_PN=${MY_PN/s/S}
-
-DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
-HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	x11-libs/libdockapp
-	x11-libs/libX11
-"
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="
-	${CDEPEND}
-	x11-misc/xscreensaver
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	rm configure.in || die
-	cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	dobin ${MY_PN}
-	dodoc README NEWS ChangeLog TODO AUTHORS
-}
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
index 02dacca65c2a..9b0667e303b8 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	x11-libs/libdockapp
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f26408f7dad2..52625ad72633 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,6 +3,7 @@ AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b
 AUX xscreensaver-5.44-blurb-hndl-test-passwd.patch 247 BLAKE2B fb88708de900b90fdb846608cc0a08706c339792e10099e7873aef00b7c66a408dba71489d0938b59e619345c739e4f6a35a9c97b1ae83cfa040035df3499434 SHA512 bd7f0e3f670e99ad1297306c88e30ac9cc381adf2a54cfd52192c1f562293ebdfcf3e956990cd2f3d877a2ca0d2f5b13332de726304ef93510c5bd08ae39a819
 AUX xscreensaver-5.44-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 AUX xscreensaver-5.44-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
+AUX xscreensaver-5.45-configure.ac-sandbox.patch 4763 BLAKE2B ce28548f02c5e8c769d1c02329a15422bf172b8a4feaff09c2c36e706139949c1f9e21b797378bc492226d077e8f2679b8afb32c0e078c0a6acf98ca01d36cd4 SHA512 18bde1dd95775d8afbc6636900844cfd5b317e1e56aa42014c9a988815c1b544458d88e27018d53abfa9354ca816fc7b3a086a59ad61bf561a35fc2605ace109
 AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c84a40344b408d3261b60a9b6f4357070644ae5c2d6cf1f4f93229cbf5e66d0f893d71e5c6baa13d77b96d17d09d33 SHA512 6549885e1bf7515845c1e2f47ec211e2c948b22531e14a5cab0cf700863450d6bfff8b1cd385a8a083771c73591a5f65fbd9f1b4d0280cb08edeea31236aeca6
 AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c2813559bfb2ad1727db1295fb847dff0b4510a31b32b7982fa83f059e99f1c58f5cd12f84600e2183273417cb1e0e17843929a SHA512 94937b43f1f0ea1b72fa0ae95b967481702362b2b6f9aa4acbc7dfd2919c69d1cc302cbb9bb8a953da22b7eb29b3874a160cf741c7ff8f4c9b9942b8af7ba6d4
 AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
@@ -10,5 +11,5 @@ AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 EBUILD xscreensaver-5.44-r4.ebuild 3809 BLAKE2B 92f6ea9bc641d75c47dab18a4e0339f68f8ae9c3f621efb306a874155b5aefdd7a08f09edcd4c047972ed982df6ca432647c934d9ae2baf3d488e1c678c9cbd6 SHA512 c076b5263170f3ce709971a1a65468a475d9b5d511c28e41ec47c7b3fe8cec179cc4c0ed8f78a132ade7e23afcd08d685220adf78a3abc2321e4209f0de5a9c0
-EBUILD xscreensaver-5.45.ebuild 4045 BLAKE2B 1938ca789b249fd263bab0bd12475278bb2bbc9d573b0c917f73c81ab881b379d76c712e7829fe96b8eab2dd539b7aae3c5d26ec54d81801fc13c96f93e42ff2 SHA512 7126d2ed23fbd2d663a25d3f72bef297f059d672aeb63d67b0fd8468164da8e41ea73d69a01b859e0146560cda6cf9536483492989fe3c8af307e6dc03c7a85c
+EBUILD xscreensaver-5.45.ebuild 4098 BLAKE2B c314eae7be06b1b74159802c3319bda9556082054b6a7f034f8626110d066a77a119a8af22d4fc3c03f4a682e8a07efd8bebec4ab544c7280c81c5ecc1090cd5 SHA512 24bb4d979ba1c62aee12aa5551b668ebe288fdfde5a3d7d0d11171d0395bb65685baea9bc5437832afc8babdc768a97afbb00587a5370ef9a4eb60e0affbd82d
 MISC metadata.xml 789 BLAKE2B 9f4d6ec06c763d685b8c6006747fd6482ae5199c4eeeac8ba1bc13f34eaeb8d1dfd67ee0762edd0d4d0199759b26bddd077c07bafa7373f4e6c4069c893757ed SHA512 5f839da92e2f2564d22a93d14ae62b0fecb70be706b89ba2829196859cebd11cfe2d4745e34a33a767d5efe92135fc0fc9686c175dc2774278a3dc944ffa515a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
new file mode 100644
index 000000000000..cee3a30897f6
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
@@ -0,0 +1,146 @@
+From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 16 Mar 2021 00:55:54 +0100
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 115 ---------------------------------------------------
+ 1 file changed, 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 603b993..6ef2631 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
+ done
+ AC_MSG_RESULT($have_bitmap_fonts)
+ 
+-# In case we didn't guess the font directory properly, check RPMs and DEBs too.
+-if test $have_bitmap_fonts != yes ; then
+-  for r in 100dpi 75dpi ; do
+-    for f in xfonts-$r \
+-             xorg-x11-fonts-$r \
+-             xorg-x11-fonts-ISO8859-1-$r \
+-      ; do
+-      if test $have_bitmap_fonts != yes ; then
+-        AC_MSG_CHECKING(for $f)
+-        if ( rpm -q "$f"  2>&- >&- ) ||
+-           ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
+-          have_bitmap_fonts=yes
+-        fi
+-        AC_MSG_RESULT($have_bitmap_fonts)
+-      fi
+-    done
+-  done
+-fi
+-
+ 
+ ###############################################################################
+ #
+@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
+   fi
+ done
+ 
+-
+-# Now let's warn if there's a previous RPM version already installed.
+-# But don't bother with this test if we are currently *building* an RPM.
+-
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-        head -1`
+-  changequote([,])
+-
+-  if test \! -z "$rpmv" ; then
+-
+-    # M4 sucks!!
+-    changequote(A,B)
+-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-    rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-    rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-    changequote([,])
+-
+-    err=" (DIFFERS)"
+-    if test -z "$rpmbdir" ; then rpmbdir='???'
+-    elif test "$rpmbdir" != "${bindir}/"       ; then rpmbdir="$rpmbdir$err";fi
+-
+-    if test -z "$rpmhdir" ; then rpmhdir='???'
+-    elif test "$rpmhdir" != "${HACKDIR}/"      ; then rpmhdir="$rpmhdir$err";fi
+-
+-    if test -z "$rpmcdir" ; then rpmcdir='???'
+-    elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
+-
+-    if test -z "$rpmadir" ; then rpmadir='???'
+-    elif test "$rpmadir" != "${APPDEFAULTS}/"  ; then rpmadir="$rpmadir$err";fi
+-
+-    warning=no
+-    warnL "There is already an installed RPM of xscreensaver"
+-    warn2 "version \"$rpmv\" on this system."
+-    echo ""
+-    warn2 "It is currently installed in these directories:"
+-    echo ""
+-    warn2 "User programs: $rpmbdir$berr"
+-    warn2 "Screen savers: $rpmhdir$herr"
+-    warn2 "Configuration: $rpmcdir$cerr"
+-    warn2 "App Defaults:  $rpmadir$aerr"
+-  fi
+-fi
+-
+-# Also warn if there's a Debian package installed.
+-#
+-debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-debv=''
+-for dpkg in $debnames ; do
+-  if test -z "$debv"; then
+-    debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+-  fi
+-done
+-
+-if test \! -z "$debv" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
+-  debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+-  changequote([,])
+-
+-  err=" (DIFFERS)"
+-  if test -z "$debbdir" ; then debbdir='???'
+-  elif test "$debbdir" != "${bindir}/"        ; then debbdir="$debbdir$err"; fi
+-
+-  if test -z "$debhdir" ; then debhdir='???'
+-  elif test "$debhdir" != "${HACKDIR}/"       ; then debhdir="$debhdir$err"; fi
+-
+-  if test -z "$debcdir" ; then debcdir='???'
+-  elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
+-
+-  if test -z "$debadir" ; then debadir='???'
+-  elif test "$debadir" != "${APPDEFAULTS}/"   ; then debadir="$debadir$err"; fi
+-
+-  warning=no
+-  warnL "There is already an installed dpkg of xscreensaver"
+-  warn2 "version \"$debv\" on this system."
+-  echo ""
+-  warn2 "It is currently installed in these directories:"
+-  echo ""
+-  warn2 "User programs: $debbdir$berr"
+-  warn2 "Screen savers: $debhdir$herr"
+-  warn2 "Configuration: $debcdir$cerr"
+-  warn2 "App Defaults:  $debadir$aerr"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+-- 
+2.30.2
+
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
index 0cb931ea7de0..f54eda2fff69 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 870443a09e2e..8114f8c8fe57 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,6 +1,5 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r1.ebuild 688 BLAKE2B a4ee7b1d82efc147ba3348b8e75b94057619b0202ce4ff0b75142ed8e9d18e0d5c609def482ce295c8ed6564d2e6382bb18cc1099f99c645333a9bd233cdb274 SHA512 65a7f0d0566c8dd569faaa8f6e4526cec96d6f7917eed7d14dd5329c8d653f44a7987d2fb8b32fb84f147af95f8d947a362a8504e12671b2eee17cbf8ca86eda
-EBUILD xsetleds-0.1.3-r2.ebuild 730 BLAKE2B ee81de0d3ce760f04eefd6fa5ba60f585b4f31fd07ade86df7b4b2f19b9a3fbf5803690f91d7b8e3c2b988960abf8281f9db96ca287d16896c08f30e3a803c01 SHA512 cea531f0016ac1b2e760bf5f5f4a34dca858a08af9940794eea18bc49efa8c58cc30bd180e68c61d3760836be1da5eb5e7f6460e3076371de2b85cef0103bd4e
+EBUILD xsetleds-0.1.3-r2.ebuild 723 BLAKE2B 9e83d5c5fa743211851cfcbc4068d30fbac6df92f391ed1b8ac96f979afa77c2c626618a1d513b6602c14c16878fc7bc119d010a2cf0d27d0283a1338816d80a SHA512 3ed0de8a105352e5b11d2a6a779fc4032869648efa8cb4e65256fff49751658742976ee798041d7da3089abbe873778dce357e89f5f8503ba276510635ccaeac
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
deleted file mode 100644
index 6c0a7070272f..000000000000
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
-HOMEPAGE="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/"
-SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-assignment.patch \
-		"${FILESDIR}"/${P}-isalpha.patch
-	tc-export CC
-}
-
-DOCS=( AUTHORS ChangeLog README TODO )
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index cd140527393c..741d565b461c 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 2676c9718283..c94e638eae28 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,5 +1,4 @@
 AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1
 DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac
-EBUILD xsnap-1.5.15-r1.ebuild 1331 BLAKE2B c56655e4177ab76e08cd59d11b7e20625a9f980e5282d1d2934e7566e488afeb6a8050a270415d955e55cab4f8184cd276fe128ce912aaf1c91041807fe430c1 SHA512 b7030789a07943202a3e376b1b2b3fe4aca968b54c3c13dcee98334186b693dd18c229eaef49ee35fb4b8086050f25dbb73560be9b4074863d2344a67f20c48b
-EBUILD xsnap-1.5.15-r2.ebuild 1413 BLAKE2B 24d77de7831af6df8031e56abc05a8390466e01af4afda57ee59c2f034fb3afbd7681152ef6f9eb4fb425a6df202a886762dcc489cd4f905601e5246461a1857 SHA512 2a1d54b7a350377cbe5a278a257d4098ca5edb7c6bb5af2f7d889ecbc07101ee16075d44f2ed5ff6976867cb11b37d8da186c9709e16da56b85bce8a15d021ef
+EBUILD xsnap-1.5.15-r2.ebuild 1410 BLAKE2B 6b76cee5998400c708a740b84a9dbd0ce28f09aa56ab3dd7c1419d5c5512477e92fc4b1d6f53e7589d8bc1fbd2f0e2107f73824fba6561b59114ef900ff590fc SHA512 f2f6403a2a25c84e5147340a5e537505e3ede1b2dbd8497b99b97c765d7df399ba604ee9010e035d77da58b4212923acd75710cfb9130902457936e719948bef
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
deleted file mode 100644
index f8f3dd11c404..000000000000
--- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
-HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
-SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	media-libs/libpng:0
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXpm
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/rman
-	dev-lang/perl
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-DOCS=( AUTHORS Changelog README )
-PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|/usr/share/locale|$(LOCALEDIR)|g' \
-		-e 's|/usr/share/man/man1|$(MANDIR)|g' \
-		-e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \
-		-e '21s|.*|LOCALEDIR = /usr/share/locale|' \
-		Imakefile || die
-	sed -i \
-		-e '/^LOCALEDIR=/d' \
-		po/Makefile || die
-
-	xmkmf || die
-
-	sed -i \
-		-e '/ CC = /d' \
-		-e '/ LD = /d' \
-		-e '/ CDEBUGFLAGS = /d' \
-		-e '/ CCOPTIONS = /d' \
-		-e 's|CPP = cpp|CPP = $(CC)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
-}
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
index 920e4a2ffcc9..e28502a5b0ca 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-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
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-misc/xsr/Manifest b/x11-misc/xsr/Manifest
index e91b3c4a9e0e..ec3f9bd9317e 100644
--- a/x11-misc/xsr/Manifest
+++ b/x11-misc/xsr/Manifest
@@ -1,3 +1,3 @@
 DIST xsr-1.0.0.tar.gz 8028 BLAKE2B 828664cd47bd0ab5f7e31952ef2abb20d15463405d669ce323e33c57441ed0cc075b2bc957a80f813bc2a7dc9729bdd28e55ea60330160ee60d0aa3c839c0642 SHA512 0fd7326452a50d0493d30cd956ded07fc3eed551af31c042c0a8f0a9c3af69319719868cfc43fff8b542191b5b9c959894d3db13b15c4127e8ff6020a04f7f15
 EBUILD xsr-1.0.0.ebuild 522 BLAKE2B fd98f4accab20d82d4fc8c798ae9007e75075d1344a896bcf8a565485a2bc618d4e47252961a91cf1863a07ec2e07503b7fc91453504ba11695289309ed7b91a SHA512 06ddd1a4ffd54858323b798ecbb38ab2f49a28d2846311b2bbf3c419183368c2398e0171cd9d1db2d28f31f2e10f5fc3cca932f1cd022e46d3150439b4e9ac95
-MISC metadata.xml 1228 BLAKE2B 18cd9c9d0bf242bc21be1490f04aa97ea9fa224d820ab6290d0f318256adf3538ca87ec6f246ff1676c88e92f7f1a1e7fcb06f423ac606838444ddbff0d07b0f SHA512 39a98820d8d8202b5996733b970a0107d4cda3ed3911942196e9ec3454c0457bee8539fc1de1e25c5a41ed7175e13d4744732f1c9aa1ebce8e816a5c0cd8461a
+MISC metadata.xml 1258 BLAKE2B 03975870455f42ba4e2714912bc8529e3bcf6c2469baab0949332b792d133418104ede3cba309c5bcd0862890bcf9cbb5cfaf31fab0f787764e4167923adc123 SHA512 6db300ab91b006ae9b6407b8cb2d5d06bf594354e81d072cf30f7364ad7738ffd7e9b17c6389d972b60c1251be1851f409fc8231138cb60d0aaaec56560eb859
diff --git a/x11-misc/xsr/metadata.xml b/x11-misc/xsr/metadata.xml
index c2e7935c2eab..d3e447469675 100644
--- a/x11-misc/xsr/metadata.xml
+++ b/x11-misc/xsr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lezsakdomi1@gmail.com</email>
 		<name>Domonkos Lezsák</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-misc/xss-lock/Manifest b/x11-misc/xss-lock/Manifest
index 798e75f9ced6..4029ed9f5a24 100644
--- a/x11-misc/xss-lock/Manifest
+++ b/x11-misc/xss-lock/Manifest
@@ -1,3 +1,3 @@
 DIST xss-lock-0.3.0_p20140302.tar.bz2 12135 BLAKE2B 8a69a2a4cac43974569867d27c28f4c32f0dda27e97434eb420908bd481dfecafa3f9abdd18fe86a7e38ca9d4e37aacb73cc3c94d62f6cd2b3d55cd0cddd86fb SHA512 366e203487fd6983baa646e3b181df75b7401cf7236c0f756d8b7a92c2b9a610c08b326e4a152ccedcabb9733faa3aaebd5bc9f0e2de3f523bb339603e53b179
 EBUILD xss-lock-0.3.0_p20140302-r1.ebuild 674 BLAKE2B 565dda97b5fac76e897b6bea24bd706521cdc18d702109888f8781c77ec200d62d9eeda35c39bec7dfc8bbac78f1a9c0b350b51fb87039683e82556e4c2492b8 SHA512 dd7c783b44d559ca13541ad3ad98bedf8d8618bad630e75888970a35f99e2b6c08397fbb3e7437883efac60b8b0bf60f3a6c1e11c36d78fbed9e76fc408be804
-MISC metadata.xml 797 BLAKE2B 4cdec44c107400b61974dc54d58f80aace1b1f456c0949d98ebb74ced743677072f9324ae97c65defad602b626890195e5b7673d524fd03d049f0a7bc8c9913e SHA512 a21a4e52ea49b8049293fbc21dd5473d47269fe1938271cca0b756d3c23622c287c82ca014d3429df3e5ca0ae11672124c2229a1abe73da07d334d010c6ff75c
+MISC metadata.xml 827 BLAKE2B 62858804b505ed032d6ad2e3a6d8c7a41f6e7f0449350e89a4807358c6eaeb6d320355aff7287bfaa4acd72821fb0d92ea89026242fd8eb15edff96c7a087bf2 SHA512 8381766728a2c7e112e6b1863cc3dbcea2603233b78aeb0e7b9d79e6760f446be70c99526d7a341b2e448d6c2c7b0c99347d5e6ae6f67954aace9e6fd1ca38db
diff --git a/x11-misc/xss-lock/metadata.xml b/x11-misc/xss-lock/metadata.xml
index c43ea51ca322..dad3e419d7af 100644
--- a/x11-misc/xss-lock/metadata.xml
+++ b/x11-misc/xss-lock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/x11-misc/xteddy/Manifest b/x11-misc/xteddy/Manifest
index 87a661adcd13..7b42c1290375 100644
--- a/x11-misc/xteddy/Manifest
+++ b/x11-misc/xteddy/Manifest
@@ -1,4 +1,4 @@
 AUX xteddy-2.2-linking.patch 477 BLAKE2B 1537f00e5b94f58fce6dc0b0f4fdffd7caddc799fa5f1141504f0f02ded3c563176f569b97a5bfb15dc7c85c6d8f25562ab96abd0f863980cb445a5ecf9c9be1 SHA512 dbfa4207f6e77435b2bef95ae426107c5f397a31e8236a87b05bca86ecd39ce3797a380f4150fa5da3e2016c8ab78b44c6d8e34d69fb8e7619821c285f6c0704
 DIST xteddy-2.2.tar.gz 867005 BLAKE2B e0f701f715c8797d4fea0ac4286bba2412bbb593563d97e621d146f36f843e0e083c6ebdd9b27943482ec00c3e4d0f2c2a1d484ba2360e047eb1a9d92e69172c SHA512 e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b
-EBUILD xteddy-2.2.ebuild 713 BLAKE2B 81df26e399dbe378af6b535805ff1ff5941fd01ca822c0b5591d6dd83c37ddd4f40070c51593491647345cd07a40a356a7cc55092f564861355fcec4a8a2a027 SHA512 9e1f47ffeb837e25e30e1e09301988466705b7278e475e3f49babc1c76a247f1eddf493bcc06a1c7222f196dc9ccdcb5027343b9479d62ea631dd47ca76939ce
+EBUILD xteddy-2.2.ebuild 726 BLAKE2B d9c46767e4e353511658a64c22905574046667db0df69eca31483ca559563c8d07a1120e23fb39c1e9a4c5d230f50cc0a1b76da050cedf52794c67519bde8559 SHA512 8ca6906dfed6d7d1fbeaddb877cb2b12ab011352a3f0339b2a80b572a454e2014dbe9e27de6d39c1116c24822620c7c6faf0eb1dfea0f57ea147b7e2821d21b6
 MISC metadata.xml 600 BLAKE2B cbb9f02ca6677772acd013dbcbeb088906a932bd3c3bceaead60f72ff89ae9285d3a1039be43f7e2011a4c43bee5545a73bb76ab616a88ad7deeaeb0acc95a62 SHA512 cc4855cd461e4b8cd1eb20d9a59e0b3770b4324b5c550ddee23f181461195b1224e7a021a0c6d9ea7d192b010016ff0df987e09e32e2c6a62f67b19212307583
diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild
index 5924af617562..32e5717252ec 100644
--- a/x11-misc/xteddy/xteddy-2.2.ebuild
+++ b/x11-misc/xteddy/xteddy-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop"
 HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/"
@@ -16,14 +16,17 @@ IUSE=""
 RDEPEND="media-libs/imlib2[X,png]
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS README ChangeLog NEWS xteddy.README )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linking.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-linking.patch
+)
 
+src_prepare() {
+	default
 	# Fix paths in xtoys script wrt bug #404899
 	sed -i -e "s:/usr/games:/usr/bin:" xtoys || die
 	eautoreconf
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index 5bed8e910c47..9849305a46be 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,5 +1,3 @@
-DIST xtrlock_2.12.tar.xz 20620 BLAKE2B d40599f5fec67b8e89f1028dafc929a9b21d6ae1f6e094658d07859e7f74e4686d338e1e03393f9981a62030839969b57493a8655e225b963df8dc04cf6b62f6 SHA512 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36
 DIST xtrlock_2.13.tar.xz 21156 BLAKE2B 879c27936cf8058707cbdb2247e1044c8c5eadf74dcb2bcfd5ec8f4b2bab80da6859118e48943de97f7696e41456771bf274b03728a61f5ac6bef8b471192dce SHA512 656e1e77194b816b04260a88c8046b8ef25d6df0405de6fe1ee1dfb2ebfa528a329c1b67be70eaac5ce4ee6a4159d728d363bf8a59232941b76b1e6d14aa91aa
-EBUILD xtrlock-2.12.ebuild 712 BLAKE2B 5968bbe4c0c16a3a5c693a1a7db79077c2937839a5b7f2ad48c9cc0656d04ca61395708c3b2500ab2495f648864545529ad745ff8851b04ce50d1960a5659237 SHA512 9d521a618c686ca417c0c3727f7f278ba0e76c75bddf173124056af30340ceb0fb004a59b04d1307bd552d87bc9936a3bf947e585d98ed48e5ab252a4adc71b4
-EBUILD xtrlock-2.13.ebuild 715 BLAKE2B 7012bdad71fc2d45d5e5af693ff58e19c8714aefecae1d3618da544c91080249eec8c08e80e6214b23aa98e78d597ac5b503e6f77e61efb8a59cdfd66e60e62b SHA512 e4f32e61a12916eee11b64e6b4fbee0cc7a75c45de9535c5e2437931682e715ebc27a70525d5cbd81d4e1ad0fa9727b0d0957c3df296fadfd426990d434f7477
+EBUILD xtrlock-2.13.ebuild 712 BLAKE2B 1f587c37c929005f8e1e68800e2d744aaa37184f4e957d475fcbfed46d9326c5df8e485cd6c8168914aa94f1c10aec9957ff301df85caa41919db34ad301469a SHA512 ec8adb3db4eb76d2b490037f76c3663feae6b6eaa80f6ac9aaba29076b72767f4802ba792f3996c2f59a2cc38880d7da13449d7f2244821f95fd74c92992a988
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xtrlock/xtrlock-2.12.ebuild b/x11-misc/xtrlock/xtrlock-2.12.ebuild
deleted file mode 100644
index d7bea7933844..000000000000
--- a/x11-misc/xtrlock/xtrlock-2.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="A simplistic screen locking program for X"
-HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-src_compile() {
-	xmkmf || die
-	emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock
-}
-
-src_install() {
-	dobin xtrlock
-	chmod u+s "${D}"/usr/bin/xtrlock
-	newman xtrlock.man xtrlock.1
-	dodoc debian/changelog
-}
diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild
index 87544effb0d1..48d686600b3c 100644
--- a/x11-misc/xtrlock/xtrlock-2.13.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
index 018cd03c8563..70643860c66b 100644
--- a/x11-misc/xwit/Manifest
+++ b/x11-misc/xwit/Manifest
@@ -1,6 +1,4 @@
-DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46
 DIST xwit_3.4-16.debian.tar.xz 17840 BLAKE2B 05e772134c4c2c97c81b2367cdcbd73b21c5a4498a482b52dbbbc081426a623f242c3c77c73af3d6e6dbf46c1f1a7240b3677700006a691717402c309ccea644 SHA512 09086d375bb4c7b87c468a3ddad0ae62ad58e168c7875ea9e29bc37e599b193c7e8ff167ac471bb49f836b216876279430d03f462b62286130ed5c3ad0859263
 DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94
-EBUILD xwit-3.4_p15.ebuild 785 BLAKE2B f94c601e4d3eda61e1c743a22f230bcfd30a47536ec962ea31ec07c38af2c69fd340983106bf6adffd807108836b4bfa8fdad1ea13f2526beda02f300ab8d087 SHA512 b5db114caa9cda0568c25653da150d303099bcc403c11886d131d33aa7948c7ca80f7797f4acdb16fb266db5cd158fc161e77b0ccd70fa4fc4282a96df05dc12
-EBUILD xwit-3.4_p16.ebuild 795 BLAKE2B 5d4da652da13809638b305050c15c190825a6864ef26b8d439014d6f31d829bea7a1b1a2fab7d56ba183e80a6b953d6475d3ecd66f84edcc2176b9ff87fa577e SHA512 10566c593b0d3eb9860e12063457eb3896e24922101a912487b7f59d67453f569c6a0a261d96c625da45b4a87440a16c01a3faaf4681e0437a1780c8962cec5a
+EBUILD xwit-3.4_p16.ebuild 794 BLAKE2B de32c3ad7fcde3bc99fd2244e5dfc79212f9e4b21210be14358343f8a394482191d8e2cdbfc3633d0b10cead8e941b21dcdaa879ae27e2424ff547e4469ab906 SHA512 30d5deb2472738da4e222a994cdf4c283e47fa0b4cf411ae6bec463c3341d066495c4162730a81926bfd3fa8c81e1c9623e73e40d0faae1b31bf685871eaa5d6
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild
deleted file mode 100644
index 6f20325979dd..000000000000
--- a/x11-misc/xwit/xwit-3.4_p15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A collection of simple routines to call some of those X11 functions"
-HOMEPAGE="https://tracker.debian.org/pkg/xwit"
-SRC_URI="
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.gz
-"
-
-LICENSE="public-domain HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P/_p*/}.orig
-
-PATCHES=( "${WORKDIR}"/debian/patches )
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's|gcc|${CC}|g' \
-		Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin xwit
-	newman xwit.man xwit.1
-	einstalldocs
-}
diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild
index cc910e726870..5047e5de035c 100644
--- a/x11-misc/xwit/xwit-3.4_p16.ebuild
+++ b/x11-misc/xwit/xwit-3.4_p16.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="
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 6178558fa4b8..a215e9826e34 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -8,6 +8,5 @@ AUX svg-appdefaults.patch 777 BLAKE2B 5fb362d421569377f907a07446b437270e01b75acb
 AUX svg-flags.patch 7143 BLAKE2B bb05bf9e8ad16983dd82670283c7c8a7915f358556eebd065b7a70b66c54b6c9ec37475f192bdd49c7734d5fc84c15939512b7f484667cf3dcd49aa2fc6a94e1 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd
 DIST xxkb-1.11.1-src.tar.gz 38123 BLAKE2B eb7cce9a6e64cdcf1a75e375f81f43edd312f443294959fe7b169e5bad1fa107a2e8294edc3b13f1022055027fdae8d52aa5fddef57bbb9f283a63e369b93de6 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f
 DIST xxkb-flags.tar.bz2 2541 BLAKE2B cb8d181ea21dc29881450b2a12e381c72e98f70c225b25db53b183337436d30e300b34d983b060a8618b927afc7a43d10a015f841d4fba663a9856238904bff4 SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9
-EBUILD xxkb-1.11.1-r1.ebuild 1582 BLAKE2B 3f8bfaf93f73ffe8ce9ae6abb654ac5fdf4922bb26bfe4286ddc53fcb22fa7c3aafaf3ad76e73a8ba3d120bd0a625f271f60e50dfc9bedee9634e7e06ee16e13 SHA512 ad4bc6f8a1371abe4deb4ae5c5395705259f05cb907c50c37c7c4fc2f32e8aa4e29e3799392fabc6a6837e253c6fec8726ed2ade2c1d968dfa6456ddb59f985b
-EBUILD xxkb-1.11.1.ebuild 1542 BLAKE2B af8a2aafabbd0087e7b0981c27bcfe06a3eeebadc645672fa88bc3da6d47d8dba49f320b0e9de0e03d75bce8e846019b41fc52080b92ee9a340b47eac4ac8955 SHA512 e1601cb58f20c623717f8f16e7cf4b49521d22b9816359f8a2be7e77ee9e6e402e7ae7f75a66046ff7275b667c1649336ac348ebcd10c7a93019701540320886
+EBUILD xxkb-1.11.1-r1.ebuild 1606 BLAKE2B be081935ce92267e7127748dfc6297741379d985f2c05776eff2070877c163afc654f8a98001a3db853fad5b587a812ef29c0082fcc142a0dfb56f4bf1a8d1cb SHA512 56f2dcbe216ea5c82a9e073209e0b012c27f59ded3e6a79b717e6f88ca0917722256be103d4b2dcb95bdbadd2aff004e4a65c882dcbfde806af9a08eb6627644
 MISC metadata.xml 350 BLAKE2B e482660157076064a3b6b3b70613bc6c1ace83e27e46fd0152794de353617c7f357d6d01bb2b9c0b3cd4d52c0855bd9651474bdaaa10c1e530b26f3e4b27df4a SHA512 0261ca73c33500566a7d6763654df4f6db22c29dab3fbebb781ba63a082bb2dbcff454afc3bbe1a72b19563a34516ed8670f72853e15634dcbac4d7a728957fb
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index 3cc40778ed9f..bd8c8243f121 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
 HOMEPAGE="https://sourceforge.net/projects/xxkb/"
@@ -13,10 +14,11 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="svg"
 
 RDEPEND="
+	x11-libs/gdk-pixbuf-xlib
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXt
@@ -26,11 +28,11 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
-	svg? ( virtual/pkgconfig )
 	x11-misc/imake
+	svg? ( virtual/pkgconfig )
 "
 
 src_prepare() {
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
deleted file mode 100644
index 16f2f9b64abe..000000000000
--- a/x11-misc/xxkb/xxkb-1.11.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
-HOMEPAGE="https://sourceforge.net/projects/xxkb/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}-src.tar.gz
-	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
-"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="svg"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt
-	svg? (
-		dev-libs/glib:2
-		gnome-base/librsvg:2
-		x11-libs/gtk+:2
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	svg? ( virtual/pkgconfig )
-	x11-misc/imake
-"
-
-src_prepare() {
-	if use svg; then
-		mv "${WORKDIR}"/flags . || die
-		epatch "${FILESDIR}"/svg-flags.patch
-		epatch "${FILESDIR}"/svg-appdefaults.patch
-	fi
-
-	epatch "${FILESDIR}"/missing_init.patch
-}
-
-src_configure() {
-	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
-}
-
-src_compile() {
-	emake \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LIBRARIES="-lXext" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		PIXMAPDIR=/usr/share/xxkb \
-		PROJECTROOT=/usr
-}
-
-src_install() {
-	local myopts
-	if use svg; then
-		myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
-		flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
-	else
-		myopts="FOOBAR=buzz"
-	fi
-
-	emake "${myopts}"  DESTDIR="${D}" install
-	rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
-
-	emake DESTDIR="${D}" install.man
-
-	insinto /usr/share/xxkb
-	use svg || doins "${FILESDIR}"/*.xpm
-	dodoc README* CHANGES*
-}
diff --git a/x11-misc/yabar/Manifest b/x11-misc/yabar/Manifest
index 74e0dc775ad4..27a50e48e4ab 100644
--- a/x11-misc/yabar/Manifest
+++ b/x11-misc/yabar/Manifest
@@ -1,3 +1,3 @@
 DIST yabar-0.4.0_p20190316.tar.gz 892725 BLAKE2B eb14b06327533034756885c68ab03b1ff049c987d1dac6d083c553646cd178210429d9457c1067db3211fcb39e9814a260aed201dea4e6410544b9247c5dee93 SHA512 f93250605c5b56d64c7ec6a7e7faa6120cdc06191ddafb13822875fd98b1b7a1822d9b93b62c49c302b1d4bffb14a200feed937efb0b11711de7159ce83eb7c5
 EBUILD yabar-0.4.0_p20190316-r1.ebuild 1418 BLAKE2B 75318c1a07723401df7ba4355ec77559c121e31bcd3cace1f1674ea51d75c8090d4deb4f7b5043c3be407ae0cab162dfa9c4490a654fed0f638c699fd3d0a83c SHA512 081dee706cfca21fe4f4eb8da6816b0a088914e11f38ee46d350e34857459e4e37da0c30e9de02e92d4aea916c97a3f856b5164d0536f564de681642f2dcdef9
-MISC metadata.xml 585 BLAKE2B 4d79040e69737a752069c4fc672996c9121347e6813a6f4ec31202685968d1bca500cf428e0ce601f63570abf64dd23eba1fe625b31552602f29809a0776d9c0 SHA512 8974255efba23f15dd84b4a158b82bf2a958de54f09b4ec8a85021d771814fddc482447b1df366227224981d7bd12d13c50b0b1f80b57db83ba023f55c177a2b
+MISC metadata.xml 615 BLAKE2B 3dc5b58df07d1bbeae8ded1872c4f885b01f5a954df3bd3d376767d94b6f9019e3c2e614a747836ae90d29b0bfaf22c69d362ff653871a27a992ff0162e5832f SHA512 6f2edd92ffaf9ed2aefae92bbbfdba484062de7a23546e1ba180d1bc8d5e1aa53067998deb6d0638f6172577936cc1896b60e659149bfd614a4b2671b04bf213
diff --git a/x11-misc/yabar/metadata.xml b/x11-misc/yabar/metadata.xml
index e6d7b0c55687..07e04dd78200 100644
--- a/x11-misc/yabar/metadata.xml
+++ b/x11-misc/yabar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lillyjsm@gmail.com</email>
 		<name>Jake Lilly</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ce02d5cc34a5..4a1a5a6faa57 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 7bc98bbd426e..90e6acbd3d5a 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r1.ebuild 574 BLAKE2B 1321e15f74fba14b9d5ed9f10bc20e69a6dbc65b9ea4db2e4c54470c19436f8cd542ae67eb285c1b33c317b040d8fa96414b3955dbcc51063efee328030fb866 SHA512 a909005e9e3dca72be3c87176cb3ebdceaf497f758dd082a244903a29ea571a0e81acd373dd07fb2b68afb4dad9152f371ddcc45a66b6693c0e62ec5be77584f
-MISC metadata.xml 251 BLAKE2B 56b93d75989820d690eb681b917d29f689b06ba963a184f6231dc2c6832952b28800211f92f56da38261f260a98f7366e84929d99a8662e03a83abb6c4b4672c SHA512 cb7741f0e8e8f07e6264f62b224e166e1f3a1e7df00df62c5de94c211bf6b60b413b7bbdb1c5fccdd3596e53fc9eb56c6c0cbe0d680690c1bc0e31ff881ee47d
+MISC metadata.xml 251 BLAKE2B 1ef69175892b3226df6f337fc95f31092c8a6dc2083a5148f1021a52828714a0e955e01f469233a90a4ee5336f44fcf011ebbffca217feb093762baffb46ef05 SHA512 25476c66b93bd20c64afe269a31b1d49b337160f841aadc7873eaf1fdc739c480b3f3ea05462dd8a5aa79972472fb6c232e9c40fcd187a135d21bf144e21aa2c
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index c5f7e606b4ba..bb7b69dfead7 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
index d0b69bfd9de8..537340749b9c 100644
--- a/x11-plugins/gkrellm-cpupower/Manifest
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -1,3 +1,3 @@
 DIST gkrellm2-cpupower-0.2.tar.gz 14274 BLAKE2B 6ad0c0825743b3c37670e5b3f7390f601ee3ffc012cc658b0fbd72c4a195ec680eaef8a5dc8f9b72a17199a293865007fc60877addf7c811d9735116d600f934 SHA512 80cf86548c8329af41462cb5cdd0de67cfab05d8d9a7c3315fcc662e0b5e511ffc1f46d2eb3ccf13b9f1607c35860921658eb74970c241a4c56b74e32e4f779e
 EBUILD gkrellm-cpupower-0.2-r1.ebuild 927 BLAKE2B cfdbb89a487eaab3044d65b10a6758f82d1b4e03a773809b1fd8683d5962079625e7c622423a23154c310b3b2f8b1c4c85e00bc5d5be360a4887e3b339c2d73a SHA512 cc2c3506c11816a0b3b859e40dc89436b17cefa274363fbfb1a9f31e0eded98fb5c37a20b092e38084d191d27a6b3c534fb6207d279556bd63621c84465ee118
-MISC metadata.xml 352 BLAKE2B c00fb6aeda6be1b3c110acdad1e3cb929e7afcbc98aaceb67c0ad8f3f8080c9dff2aba553ad053e04d0b9eae73a8dd16767b448baecb638e885b3e399b38cded SHA512 3b888fd955af3995185f304f23db788f7513de23e63a370db1d708a360fa17e0e3a128042884707941f8e377ee6a70e40380c4ecf0212b61416985940a69c630
+MISC metadata.xml 352 BLAKE2B a1171f770083b1319c058c5cf8bc0bb843e3882a8e8f495394ecbd4fa045f08b4aed8a7693eb63cec85f1f4bbe09013a50078c68bd02a48507ab5835a4c3a58d SHA512 0a130d0a354be757e7b00330dbd1fccc3908f13ea9a24d6f51f389496aef94e8f7c8432d6b732592088d3fdf5d4fc6b773aa67cb8ba3de562d55a4a288736123
diff --git a/x11-plugins/gkrellm-cpupower/metadata.xml b/x11-plugins/gkrellm-cpupower/metadata.xml
index e8e271486d45..71a4a09d565e 100644
--- a/x11-plugins/gkrellm-cpupower/metadata.xml
+++ b/x11-plugins/gkrellm-cpupower/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
index c81d547862dd..a5bc20c1181a 100644
--- a/x11-plugins/lurch/Manifest
+++ b/x11-plugins/lurch/Manifest
@@ -6,4 +6,4 @@ DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae2
 DIST lurch-0.7.0.tar.gz 66885 BLAKE2B 1a3cc1dbfd8f999b677b23d02952a3c28c922d438cfe81a3bfd3a03cc49723fcc4d52a549bfc7ecb45616a0c939b0f78a39f73a4439bc5337d4da656e9d42b11 SHA512 082f85d25fbcb184b7b6d827e1e6bac073ad46064a144ca24245164558ca9e0cdfcdc4187ac3da5f8738e0476e759e67801d0fd24598b31e2d86053f8af576b6
 EBUILD lurch-0.6.8-r2.ebuild 2063 BLAKE2B 2742285436fab19c64317e57ea182e451966799a1724cf72e6b6977ef6d010f643e8ab32177cbeb0a69b96bfc8a37a16beea44b84b03e71fda61918853ea6edd SHA512 fdad83c1b8ee35ce10d87d1121c14e07661922095ddbbbc8529ec5692079d050f2de8f4481da6fbb309f963df8d692ee7d15507373244a9775a967df5b1d3690
 EBUILD lurch-0.7.0.ebuild 1221 BLAKE2B 143bd3bc6867957998c560f641f92e1bc8f30c4f24047ac6f00ef648b4f9f8e11be64bb074be9493f86f5d9f5f0088cc36fd5840c8e56b3480aeb49966cd4b5b SHA512 f77ec75ac4249a92257f20188206894504ded0db60e3626110d04f5686704311d60779113fecd84278b48341f2ae265c21045398d2894e43d7a649f65e635bdf
-MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-plugins/lurch/metadata.xml b/x11-plugins/lurch/metadata.xml
index ab886b7f0382..6d2298876faa 100644
--- a/x11-plugins/lurch/metadata.xml
+++ b/x11-plugins/lurch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/x11-plugins/metadata.xml b/x11-plugins/metadata.xml
index 5c4b98e8113d..da89fcedb716 100644
--- a/x11-plugins/metadata.xml
+++ b/x11-plugins/metadata.xml
@@ -35,4 +35,3 @@
 		Kategoria x11-plugins zawiera rozszerzenia dla aplikacji X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-plugins/pidgin-funyahoo-plusplus/Manifest b/x11-plugins/pidgin-funyahoo-plusplus/Manifest
index 589414f30ad6..d63ac661d114 100644
--- a/x11-plugins/pidgin-funyahoo-plusplus/Manifest
+++ b/x11-plugins/pidgin-funyahoo-plusplus/Manifest
@@ -1,2 +1,2 @@
 EBUILD pidgin-funyahoo-plusplus-9999.ebuild 415 BLAKE2B 138bed99d6ecd1bbb042d15a0bf18539a446937b312d5c7951d33fc09b0bafb42ba24822902fb943598615bc88b72e15b8f3e91a4909eae8139ec7f88dd06cd7 SHA512 0cf2673cd607246562ff572b8ea52a7e371aba669ac0dd668010f64df268fb4154b4e6214a309d6e58ac52357c0de30bc78f46034d16bb62e24ac86d09299ccf
-MISC metadata.xml 466 BLAKE2B cef671e43bc57aea226a99ddf081db41bd2f3d7c5ea76a352dcd3910fafd69d2f6c563b424ac903387f67bb85f33a3d65665c4a3d6aeab2c4609441025b5a842 SHA512 a7101be135df106c9a500a21a7ffc9e481cd03c6be13f6209f2f835069ba00f7d4bf66380abe99117e6c8df2aae0ba31b754bd11dc144d8a01dce44bbd95086e
+MISC metadata.xml 496 BLAKE2B c6e6a3a0bda73988e48e2f7f37a633467e26f46d3ed6997e68b580b029a9e039e2d1201f483dca18d636ae2e49cca290505d76b42b88e6758458946f02e9c71f SHA512 88efc1db3efffbc7892f475d36448ecfeac054638feafaf9bd9137716beb085208dd2c710b0f556f55d1c0b46f9323ba4020895267f00f92f91c64f1c09f89dc
diff --git a/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml b/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml
index 255ffd68061a..7a14b8e21d2f 100644
--- a/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml
+++ b/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>lori@icanhas.net</email>
     <name>Lori Jakab</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
index c9c94f798a40..dab6f0e78ad2 100644
--- a/x11-plugins/pidgin-gpg/Manifest
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
 EBUILD pidgin-gpg-0.9.3.ebuild 594 BLAKE2B 366b0e3d89843e0bd13cc41301ab394fe120940c7efa8ca96a6ad7bac6c54d474aa700c7e3d632ed55fcb8d0b4046150fa57c3e8584871ea7ae4461db384a05f SHA512 e0faf081310613b0ad471404d05b30004344a9ebcd6ea6fd3c9f0a6084f4002197ca1bb0addd9fe916d46d08d6653c9f04da3bfcd9cc874f9baa6549197f9223
-MISC metadata.xml 571 BLAKE2B e9b44d1044f832df7e7d051b6bcafe3bc982895192323aa728645da686f76ae8720f6c68230b62b7164b803a049422081143ad688040e9c7bc099d8cff6be361 SHA512 4227ccc4175c649cf27d528b2c6cca160c9ee267bdb916a006ea6c6c3631d2d460ffd35a48c72fef1e537c61dc3e77ab78b8cab4bc80b0afc065c91e1eac1869
+MISC metadata.xml 601 BLAKE2B a50fd4f65b5a35ced398de8cb427c1e8fb1969f9a594970b6178e4ba3b2e52bf1fffde004fe1bb51ab3a045a8acd0bd9e013e57608b9566aad942b27ecb1c8ec SHA512 b35e806fe2c3901cad3dda6adac3b6f76d45c23205e4cf1a4370d7501a3be11d4b7ea4825a9e802715caa8da416306dc09e075bf38fd8320435e0826b7928a71
diff --git a/x11-plugins/pidgin-gpg/metadata.xml b/x11-plugins/pidgin-gpg/metadata.xml
index 6ab00819a172..bf1aecd6bb5e 100644
--- a/x11-plugins/pidgin-gpg/metadata.xml
+++ b/x11-plugins/pidgin-gpg/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 35000709c48a..7e45275753cf 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -3,4 +3,4 @@ DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb7972949392955
 EBUILD pidgin-skypeweb-1.5.ebuild 658 BLAKE2B 4e608465edab12b481ebeab075d9cb9e5de9519c62856de3e2780abb06d302f1d91f4a259d162b7cdb0539ec93e26be57eb51c602e4bfabd09573d0463747552 SHA512 449de42850da9881b7451b5558efc50f3305808da197a30302c2bded746bb464134658f53bea3b54b4931444e6d1596fc25e375dc5a7ed8f4e8d103c2b2e1edb
 EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
 EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
-MISC metadata.xml 444 BLAKE2B 99319eb5979a7e51ff0699ae5c524c2eee61fcc6407a32c8e5323a1f029b1f9bf2c0f56508bd4bd18e59a70256d6e62f9e0c86973577496e7e990ba565c855da SHA512 dcaaa5cd9f80a414d5931e39228f85482a086f1a55d5b44933feedb0949c2277847df60400bb8cde6a57d3524f8b52f384b1eba5728e6aea523ee6161381f734
+MISC metadata.xml 474 BLAKE2B 05aefac276394efa2739064dd4d97db4cca210c8cf8dc6032516f8a0d8596b8fe872004e5dfd50c24b2e695cc50f67da54718e1d03fcc6301f758cfd255864d3 SHA512 9e69489e9875db0978a1ba735b8a653f94f9345e62eddce5930081fcf8b9bfee80c5c555dfa8ce85371e508841cdd0193c2221a5bfdd3cf830ef7a53a3836eac
diff --git a/x11-plugins/pidgin-skypeweb/metadata.xml b/x11-plugins/pidgin-skypeweb/metadata.xml
index 446ad7da00e9..38d6180e130c 100644
--- a/x11-plugins/pidgin-skypeweb/metadata.xml
+++ b/x11-plugins/pidgin-skypeweb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hoax@list.ru</email>
 		<name>Igor Mikeshin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index cf8d8b765f03..a6ba968d1641 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,3 +1,3 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
 EBUILD pidgin-window_merge-0.3.ebuild 703 BLAKE2B 3a58c80676252168eaa458902ce2dcf2cb18d5e6052778994ecaa7c1cb2b088774d53216258f3f65658c92c6786a199f35391520b3970fc3b0834ad871deda36 SHA512 d21a89d2586ba066c074d34445d3d9b570b8b9c3c2529f1865c1576f286289f31ea6be1a669f84a8943faaf37ae8b85f9268fc2748ffeab18187202e6d60b4f0
-MISC metadata.xml 333 BLAKE2B b458848f22eab0215a7dd163c7e5a274032cf3b0444b8de14c6f331978c143249ba2a68038a47d82ba4a5d89742491a5949be5aee4f140e1dc4e3cc866bedea9 SHA512 38298a8d49cc03e1f0f390d3d52cd4e7a87cc88b8b74b8a53835000b57a8e658f778dd3b97afe3015bfc2893d24632452bfc0b17734d95122464f071be5e5e35
+MISC metadata.xml 333 BLAKE2B 254ce7c009bb5e0034835e975d04ff077bbe0e24e6d226c0381a91a087ce16fcd815cd411db181a8b34463f903fc4afd624a7531c340c083ffe1982c20b6cd33 SHA512 9865a245036486f3b8a82077de63f67f7c37d73fc13c3b385103166610bd45e1d284d96b0358ca1fb84d7aaf15b111e12a59e6fdf3984ae9d0fb145b5e89871c
diff --git a/x11-plugins/pidgin-window_merge/metadata.xml b/x11-plugins/pidgin-window_merge/metadata.xml
index f248290784fe..62c054355ebc 100644
--- a/x11-plugins/pidgin-window_merge/metadata.xml
+++ b/x11-plugins/pidgin-window_merge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
index 6ce60e509158..40e3d2c81ead 100644
--- a/x11-plugins/purple-mattermost/Manifest
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -1,3 +1,3 @@
 DIST purple-mattermost-2.0.tar.gz 99301 BLAKE2B e4de82581238b399fc1d5e77abd3c6c925d36e6012c5da354eecc26364b2e671c106e867b387b10ca82553b2bc4b11fd9f448ff744295fb81a4419086afdae4c SHA512 5f192e5c8f07a28f4ce568e1f07b023c4edafd5eb938beb2067925f3addbb1f920ee9c1a8f46a1e5a46518d201c979e2cf8be17cb38e2f652a4f34921e151f7b
 EBUILD purple-mattermost-2.0.ebuild 549 BLAKE2B 468dc23bb52957149baa75a487bdd109f05fd2bb8d04eb73fcd3178053a7dfa46eea68aaecc7df608697764dcbad355c7358761034fba8f7a9a5b594503404cd SHA512 844ee8f419a66a877bed09e2247278eaea1d575e973daeaf8743b9d0f3d9e75863d8aba5167ae99b14c0eb533265aaae14e4e2c951d7215628641f7ef57afb09
-MISC metadata.xml 342 BLAKE2B 442792746b7c1a6892cc0d86d47b23c5299887244fa49e1cde4748f4c175d3a2d6e81f979c33f92c3c861b3fbeae6306ef304169da367dc44b6c73db9e3d8fe8 SHA512 ab1ddf1a079239ac490e856785f73650a4b3e32d3f24a798d771347645899b23799f0eee76df8363858fb2f13e23769f0cf552ba12a276ce9ea68aa50ceef0e4
+MISC metadata.xml 342 BLAKE2B 31814dce6358982abd70f783aefa9c24a7999e8aa27b89f4a411596e5ade78e11c92feacb3e590ea6bfa39c8ea0f03ab2e56f3a952a1267c4b77658bce7fa786 SHA512 3bfeef585f4054072a1aa6e012e527084f0a821eed57a74ed81258819e68d2800060751abff214ef90a27a21038b7a604f4c4e3cca5be3df6a64245e908daca8
diff --git a/x11-plugins/purple-mattermost/metadata.xml b/x11-plugins/purple-mattermost/metadata.xml
index 711617a4a147..8537e7ec4766 100644
--- a/x11-plugins/purple-mattermost/metadata.xml
+++ b/x11-plugins/purple-mattermost/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b8d37540e619..31317bd4fa80 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 6b6be6cff034..ae5424100a19 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -4,4 +4,4 @@ AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e
 AUX aterm-1.0.1-remove-streams.patch 1108 BLAKE2B df7ee9b3409127ab82dc110035baa2b91f4d785874febb615d6d864bc4e5561b371707c7acc25096f59a646468b83a0cba27d2270f57ab80564dcc8b541b50e2 SHA512 d0ee1e6edee1e4b936b4179d9673e78f7bc70266f6d576d88ae76c9e87f4ae939baeaf0d62ba2b19cb1195cc3f4e1e111608ed493d56de4531ffb11257d2967d
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
 EBUILD aterm-1.0.1-r4.ebuild 1938 BLAKE2B 5caa5b800459dcd5a976191d909e8dd04f917d219ed7b0b90494421a9af163f84fd2e06a821aeda7f60bd8adfed0aabce388534a7e4eea86c6bd42eba28a19eb SHA512 b202b7be0fe2b02748214fcc2b56034722feaeb91ac6f988af25b3e7a5691b236db8aa86c8128422c54107172f1d03092446e4e86ab10f5d25fc2200dc4a35d0
-MISC metadata.xml 643 BLAKE2B d1a621a0e1435528b11b8c990ef81836692c5f16526c78e2814c1568b0681ef02c2a988008c7c58b074ef8771ae95f840b5506447ad44cbf1617c16c5d09d80d SHA512 562485fc40c786d504d41805670a817811865aad74efb43fd210c3a9280d98f0e896410842c2881fcaa372771492e8a3af0167e8a15395351501981976f56700
+MISC metadata.xml 657 BLAKE2B 4b1fd5ff3e6f256aa54ee7381e2e698fe3328f49438efaacc0f7a5ac4075ec2aa6e1803f9385a8316050ac306eace807f54ad04b41af271c2aaca52d2679446f SHA512 ac7cfe7351d964605383175430cd3e850212b06eb02049f05833fa227bbad42a68e988de144548c8619bd2ee995ed613573facaad7866a4c799b3d604202773e
diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index 33527ab06bea..a5e1e444453d 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>imirkin@alum.mit.edu</email>
 		<name>Ilia Mirkin</name>
 	</maintainer>
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 62b0d298c46d..ef588c006cff 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -2,4 +2,4 @@ AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8d
 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
-MISC metadata.xml 531 BLAKE2B 146f191ac6a28b6b673f7eb9e86c748bd7bf7ce3cfd1e9150dd781bf46de711ef255e7497fef9c89261e571a35b5c829d3e197f31b28f8c501ea5bcd97d267af SHA512 1a30fbf43aa18e54129273bbc4b827e9ed905f47597bf3bfd7b6dce6f4719ec94f3e6d07a0a7fb1d560034c3c10b894b58c2fd8e200db4f7382c98e123b4f64b
+MISC metadata.xml 531 BLAKE2B d81956273548043e4d492692ece7db4e273244923c1764704c309be877b39824c0afdf418aeef7f7bb0f5a3ae8547cc158b49dd5d1f2994e42e0526e915aaba9 SHA512 27386a0206791a3e413504dda0eb8d4b78e709b1ec4c16a8db40bb62ce673bca48b84878b42770b02600f2550f591e3d5b8069a73a233c44e0ed218a2458abb7
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index f13e10f183d2..e63d8a17b1b1 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -10,7 +10,7 @@
     <remote-id type="pypi">guake</remote-id>
   </upstream>
   <use>
-    <flag name='utempter'>Include utmp management support
+    <flag name="utempter">Include utmp management support
       via <pkg>sys-libs/libutempter</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 6acacb55b511..4312b6ff8985 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,10 +1,6 @@
 AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 AUX kitty-terminfo-setup-9999.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
-DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
-DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-EBUILD kitty-terminfo-0.19.1.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
-EBUILD kitty-terminfo-0.19.2.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-9999.ebuild 916 BLAKE2B 641dba1eed986cc0538a48dd08a843cbad8f56c2a1b2e79eac96da4fb3c19b021f2a7f929973e1daba2c403488d7efd8f7bbbee5635667388a44b7dbcff62e72 SHA512 5fc25f2c189a05080de77604a9a1c36abda4381b7991bfdc39d17ce1000eea2ddf91480b30b66dba4732f4fa435a1c67e267f46e7a53217e1dcba5318842c9f1
-MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
+MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/metadata.xml b/x11-terms/kitty-terminfo/metadata.xml
index 2c9e05543121..c44f75410aaa 100644
--- a/x11-terms/kitty-terminfo/metadata.xml
+++ b/x11-terms/kitty-terminfo/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 506fdc9a8439..fac525968611 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,11 +4,7 @@ AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead
 AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
 AUX kitty-9999-flags.patch 1962 BLAKE2B a7a446af13b5234c95885a49d7f2f4638fc4839d3ebee0e5249143ec40d8cf5694a1a3826b9e399071a1fb976698fc3698e2e44f8f3827b15df2aaca7039a827 SHA512 b9062d052daa8aa5f403ae42d46b7528f69761b376d73431d9e835413e7ff99d82174208e503619f7c4cdeb47e1b4471dbd4926f3728ac9613387207fb20d23a
 AUX kitty-9999-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
-DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
-DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-EBUILD kitty-0.19.1.ebuild 2246 BLAKE2B 6f228b2425d71b4024a7997b8b464b5427c779b4a4806b004cc34f2ec0eaf7610336dbe427ceedd45d96f6df3e7a8f1d668e4dce2dac2b1117cebbcbbab30791 SHA512 e000ff8fa7e5990cf7788527c9b5f2a68931af195be86b7350a2698aff6134b3a7ffecf857f53b6d86adc400b8bdfa1b2e8824a1e4cd9d1ddae1deab12057c07
-EBUILD kitty-0.19.2.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-9999.ebuild 2175 BLAKE2B 0254a67fe27cea41a49cba4f60578b2ab75719362ebdd278900e6baaa67a356eb46554bfaaa08150604265ff51dd67a9a7ff25902e07ab0d9b3f620f34ec290a SHA512 216891bae1976c8c7a163a776efeb42906e8a5fda599f75505c24292e4f06561e48cbd6b7e39d7cf5aa6fcd7b0936e917b28c8fe06214a9394ad79930510174e
-MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
+MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty/kitty-0.19.1.ebuild b/x11-terms/kitty/kitty-0.19.1.ebuild
deleted file mode 100644
index 0647b5bfde8d..000000000000
--- a/x11-terms/kitty/kitty-0.19.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-1.5.0:=
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-terms/kitty-terminfo
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
-	media-libs/mesa[X]
-	sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		--update-check-interval=0 \
-		linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-	dobin linux-package/bin/kitty
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.19.2.ebuild b/x11-terms/kitty/kitty-0.19.2.ebuild
deleted file mode 100644
index 6fb2b8651431..000000000000
--- a/x11-terms/kitty/kitty-0.19.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-1.5.0:=
-	media-libs/lcms
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-terms/kitty-terminfo
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
-	media-libs/mesa[X]
-	sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		--update-check-interval=0 \
-		linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-	dobin linux-package/bin/kitty
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 2c9e05543121..c44f75410aaa 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/x11-terms/metadata.xml b/x11-terms/metadata.xml
index 7b2e8b135e7d..7faadc0007e9 100644
--- a/x11-terms/metadata.xml
+++ b/x11-terms/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria x11-terms zawiera emulatory terminala dla środowisk X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 7f1fc4a513b4..745cb8561277 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,3 @@
 DIST roxterm-3.9.4.tar.gz 527450 BLAKE2B 0041ce4a026eddd2b78c7e9aed650f21c5ed75903c7903ef79950e95a92045fdc951b23f199173846439b39712be72b0325fba5c2be92f95ee5a121b112977bb SHA512 42f48e56b2f8017fc3ec249ed1e6d42aadc171ab854f948a7b686c36d9b1c5202f7879dab66a04f2a4e0438b09ef0eed69da72eac0cf651c205d9b4724403759
 EBUILD roxterm-3.9.4.ebuild 715 BLAKE2B 9ac04ee7c100210b8f00fd89fe2b4914bf082a1cd0d724b3bea3f14219c7c9d4720d860c956bc9302bafc03b5f28a23500eb0fde28999a9f409e6494a14ead1f SHA512 9aff4e772d9946222353f7ce1a753abccf6bdc6ac823f4acd8d1d0242a909da40e3286ea2723c69ea03876a541fd0c1963f46d3614edcffefd9d184ea069e70a
-MISC metadata.xml 472 BLAKE2B 90826818bb97e1be487ba8f3a3563e06740b0dd133f9785af4f8d37659fe2db305934f72bd7120b19f28de4be7e29566a937e2f4b171b143098ad8063b462aea SHA512 ee65349209ec6c4c5755fea00a37a5f7c671c425bf7804727446b7a59e7069fdcb23e36234b48edaa539ee82ee78574611a174b085f4e9f8ad9532ce93673e6c
+MISC metadata.xml 502 BLAKE2B 89a0929e22225d296c848da1e2c97227a85fd7f057a354bf42f349f7c354d2716021da8373e56accd53ae2dd1786d0257fde37a6fa3c0f5a504f313e2f893ff5 SHA512 c4b048563a75e2d853d86674234f1a27cb59eef3848557243f5280a824dfe87b41abdbe1e5d91276410c41415a182c91a182b0cd9cee84c2df3b724e4418a00a
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index 7b589394216f..91b5e6407565 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ewoud+gentoo@kohlvanwijngaarden.nl</email>
 		<name>Ewoud Kohl van Wijngaarden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index c2b05cd88e09..6fe849754c03 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -5,4 +5,4 @@ DIST terminator-2.1.0.tar.gz 1030864 BLAKE2B 2fb92644b1e5a79f9f9d307e50889d8741e
 DIST terminator-2.1.0.tar.gz.asc 866 BLAKE2B de8580504665943677eff710418c587f9da1618f2a79c8af76f53c1dae1a5d458be6489e5fd4c8fc7cd89d87d38d7546b1932b9c9c4876a7c3fed3be8fcec930 SHA512 bc5562cf75bb4e890e98e3f3d52f385d357ad97ccca3584da3ea0e5b383f30558ca99808af20c3b5d479d98beed3e69a31a9fe43d289e55d949976843f09ae31
 EBUILD terminator-2.0.1.ebuild 1606 BLAKE2B 1b3272472d14dfd65ae31580ed3243b927dd9a725562676075d39b617a7922e1bd2a2e0acc77d64be76fd5d9359522aac24edf430f96c08cdf55e03f1e5fdb66 SHA512 19cdcb5c8ab1408283ff33263fcf6ac426c8458033cfb286b1484605940ae534476559c2d2259e38c84bcceee9f5972eeebd1ed200b38fac59505f600ef3941b
 EBUILD terminator-2.1.0.ebuild 1854 BLAKE2B 3da53742c988787fa4af97ad62e584f8aa2ecedf0d7c8c4c3fa0016804ee78cf624d1583b4437220e17552842a03681098c25cfd245abe3f3ba35551393a4fba SHA512 1e3d7efcf6d443c8cf1a88409df332b05f07f7e81170b7c7ff55720d7bd5bba946d097c4a4fd78c1f9600a7039fa433088637b4c8fe8503d923c36999bf88d5d
-MISC metadata.xml 828 BLAKE2B a77c4067e727d814842b41f529d5a1f90bfeab0ab4425bb071ccb9ab043d7c3a97ee8b6e7ac7dc596d0573c35e4c67c8903a284bc5924eac909b9a29eb703890 SHA512 8ecd094dd314e3174163a86d91f67bc01ab4b2047f9ecb8d11cb39525f1b35cdf142d0a73938813f905aec734281a5542eed94540106d829b903cd95ca0193a2
+MISC metadata.xml 858 BLAKE2B 27a8420382f3ed119d3c31bd628c2357d552f79c5361b76446a7ad093f2fca5fd0e9ec1f6b16ab6d2863264993eee52c25e7d1c468f2ec23d99e82d9df3362f3 SHA512 9c058afed38eee38a1bb793ed2a8c2253a729ccd79801365c7cb596aa3402e9e24bd04c71547aa93a550290e07b71c1f5c0f9d9bd41bf886c9935700f3a2d3d7
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index ee4d746c1c88..856d2f60671b 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 1b728ee4fb1d..74f84f035e1d 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -2,4 +2,4 @@ DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0
 DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
 EBUILD xfce4-terminal-0.8.10.ebuild 971 BLAKE2B a745e0515ca201130857a065673cd2da539612ca381e9eebdbf02eb2c3b39254abc526d27468d49beb60fa60066ac79b9d931553ab9d787f7929a6629962d767 SHA512 b832a59e037731dd5b53c306dfcfdc278c3e2484271189457f2c0b776e741ad48993e6bc433bef0eb63fe0a96db5ca16383dee349b402719fa9b98198b9e2493
 EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
-MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
+MISC metadata.xml 371 BLAKE2B 0a526c805b03c54f6c83949db4687cc24fb686352edee1f9e28200cd7011a48319bf80d590cffa5c3e3eee94b080ac8949b0dc1de2e80452d21396ed18f56459 SHA512 9791152a81ee8a73e7eaa1477c160b43d8e395813828932882f27cf2a4ac58996bef78c6995ca1f950bebeae8858eb08f23da55dd6547b94bf294b275c920005
diff --git a/x11-terms/xfce4-terminal/metadata.xml b/x11-terms/xfce4-terminal/metadata.xml
index 27885f2335d7..3657198b7f9a 100644
--- a/x11-terms/xfce4-terminal/metadata.xml
+++ b/x11-terms/xfce4-terminal/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='utempter'>Include utmp management support
+    <flag name="utempter">Include utmp management support
       via <pkg>sys-libs/libutempter</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 2ee27bf0389e..7823d7351a7c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/chameleon-xcursors/Manifest b/x11-themes/chameleon-xcursors/Manifest
index aa4ad0bd00a7..fccb383d983a 100644
--- a/x11-themes/chameleon-xcursors/Manifest
+++ b/x11-themes/chameleon-xcursors/Manifest
@@ -4,4 +4,4 @@ DIST Chameleon-Pearl-0.5.tar.bz2 1875789 BLAKE2B 2aef4e1fe456e7274c01cd3f8a02503
 DIST Chameleon-SkyBlue-0.5.tar.bz2 1959985 BLAKE2B 9c8e212155a36352ae50eeaa7a5d78bdeb2000a3d24fc3df424a037de9c7a45c482e74abf9765c3e32b84ecb948abe2fd40c6de82c5ecf1899b7862daaca5a57 SHA512 4fdbd7f3721ec5fc40ea38c29f9d884ec7f0250f3b58f58880c6b60c93e070e779e1268718246aa3709e48c4087e547deb8fa7a289f5c94d4ed36de48b7fff11
 DIST Chameleon-White-0.5.tar.bz2 1690839 BLAKE2B b8710672c0793c8af573d26d2dc242c07b0722e44341c724661e88b4a7858c81fd6e32c70928042e7be777944bd363a47ee5699ed054c37244e58cb3634c8709 SHA512 6b3c56e1ee8409fa711704d60371823ba080df050b52af89c233668d93e0c5a4278ae5642dee8f4e5794a63cde8dc471b33bc16c4edc95a428e29285f9088110
 EBUILD chameleon-xcursors-0.5-r1.ebuild 759 BLAKE2B d9f2a1516f9b5e93f29bf19dcf10a38e2361cddf787036cb9e3375aaa96586b9bcf62089149b6a2f6e48e5809b58729854ca865c6b5de3efe522f4bc7227b82f SHA512 1703e2e07a2e0d8d0d1bc3d97ce139faae0a5d5736cbc0de9f6330666014f7f33211eaea85d6fa5c61bdafd73773d6efe6abe493689bcb0eb5e29fa74bf6dd2b
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/chameleon-xcursors/metadata.xml
+++ b/x11-themes/chameleon-xcursors/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/e-flat-theme/Manifest b/x11-themes/e-flat-theme/Manifest
index 1cce29ecd306..7e90e72b2ffa 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,3 +1,5 @@
 DIST e-flat-theme-0_pre20210225.edj 45154749 BLAKE2B d87edfd408a05e852180b3a12a85e148cbc0005326a24bd5bf918ba57dd478daad677a2e81a1b8c396576d1e7b5c2ea1fff9722064aa68cad7cbf11862869cd3 SHA512 bbbf6c161eb764695e0eb572c6488a3c3abc0ec86511bdb99fdb43e8f74d59c12d562e877871e3aa8fd8076a56e20bc932cce9f5ad477a69f42ab84db829f612
+DIST e-flat-theme-0_pre20210315.edj 45126549 BLAKE2B 7daccefe83a24ba33714f0b76f4340024a4f98c6ed8e128fad9922e1eb7eab78efc0ddd553876afde192fe4a4b82abeadad2b9f91d808c8321da820f83a04a6a SHA512 8f024aaae1cc949a84bfee4b5b3486b2cd24b50ed05e96a0c8c0e2e958d1963d1007c2af4344ee9acfc91b71891a88a7a513cfd68f866bebffa323c29f3ac755
 EBUILD e-flat-theme-0_pre20210225.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
+EBUILD e-flat-theme-0_pre20210315.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20210315.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210315.ebuild
new file mode 100644
index 000000000000..d9b011896102
--- /dev/null
+++ b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210315.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A modern, flat theme for Enlightenment WM"
+HOMEPAGE="https://www.enlightenment.org/ https://phab.enlightenment.org/T6726"
+SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.edj"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+RDEPEND="x11-wm/enlightenment"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# doins doesn't allow installing straight from DISTDIR.
+	cp "${DISTDIR}"/${P}.edj . || die "Failed to prepare theme file."
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/elementary/themes/
+	newins ${P}.edj flat-0.edj
+}
+
+pkg_postinst() {
+	elog "You'll find e-flat-theme under System themes in theme selector."
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn ""
+		ewarn "You're updating flat-0 theme. Please reload Enlightenment"
+		ewarn "through Menu -> Enlightenment -> Restart, or by issuing"
+		ewarn "  enlightenment -restart"
+		ewarn ""
+	fi
+}
diff --git a/x11-themes/echo-icon-theme/Manifest b/x11-themes/echo-icon-theme/Manifest
index 15d9ae363b50..81995d7d6c5a 100644
--- a/x11-themes/echo-icon-theme/Manifest
+++ b/x11-themes/echo-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST echo-icon-theme-0.3.89.0_pre20081031.tar.bz2 4413037 BLAKE2B bec77afcad7fb615614bab66493a58df89b64e80faeb6678895780dfbb559008f4b54b263e4abe13e5865a3ae60b7d6bebfcd7c6acfd4396c8298563a86808bb SHA512 58214247ed967fe510212611c20c247242de02bc4b12f337a4f77e7043e30828486a58172ba8602d32a932726b462effed17323faa5aa8c2213c87505280b52f
 EBUILD echo-icon-theme-0.3.89.0_pre20081031.ebuild 432 BLAKE2B 9039745cc6085070ff480a5445bbe6bd7f4ed7e2f2dd51c01a6c0ff1f1e3a04b7d216464597eacf930107de4325634fc28ac905913321dd9a17386a7e6abeae0 SHA512 d6bec5e2a473704341c62709b916b70b0e138121208df7545081b407f937de34a8ca9c574b818ec3e1933b9ff73a14adecac17ccdb0236389544b7215a6d5867
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/echo-icon-theme/metadata.xml b/x11-themes/echo-icon-theme/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/echo-icon-theme/metadata.xml
+++ b/x11-themes/echo-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/faenza-icon-theme/Manifest b/x11-themes/faenza-icon-theme/Manifest
index f45f9a6aa06c..0af0f1e31a70 100644
--- a/x11-themes/faenza-icon-theme/Manifest
+++ b/x11-themes/faenza-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST faenza-icon-theme_1.3.1.tar.gz 24647057 BLAKE2B 3ca9dec15797ac196480d50c2fd2c81356db48ffdd5f42ba07d26841f05e66c18a9f3a7684907ee89f19ed65bb6998abfd455b61f787fa98c561f32403ec9fc4 SHA512 0c017ddbaa2dba485341d3bb1e321fafad026aafc893fa2519ddfd3fe0475fc8d011c99ce3de581c9b1c6aa7d250312673dda7c10bb12783db2d45816646ddc9
 EBUILD faenza-icon-theme-1.3.1-r1.ebuild 1133 BLAKE2B a77c3a92ba3b9e0b8469c1cf00f773faf1a51f56f0bf13c8f3fb8cb381e40d3c33d8527f7a07066c36c96293e085fd8e27eaa4d51e16d8dafc25db9afb3f3e87 SHA512 887ac4336d725c9210755cf51b366dd3c88156958b65899f4b10747b0868e71349933ba52581240695a8091194996616194201f9feef8c1335ad5eddeb105499
-MISC metadata.xml 462 BLAKE2B 012cd65a4c4bb2a5554f7e3773b401cc93ef2e5f699ff92595807753cd3c67ab0df4ec001a611f5517356d2c10bd7942514c18729809dc7e1466cd357bf6b387 SHA512 ba45b2b339534aa765f95cc0cce8b45a1d1a8e37b7d460d478454b7e610b905781133d44fcc68b176ba349affacb47141385e38b252c6a28caafdc89792c9d40
+MISC metadata.xml 492 BLAKE2B 30902f12c946042551cae8d2084d3c1817c9f16162fbb50f8e76d598270017146ef1f0e62682d5bd3ca1cfade9e04f1f2d69a4cb1c3faf66b30e1a84c7714f38 SHA512 fada6fe4a1a33073dae3dba155f86e6faa3bceccd306b1c5b05e98fceb41f5d773663f34a0d49d45ded85f58219df8802011a15ca7b66a37a0376f8233913ea2
diff --git a/x11-themes/faenza-icon-theme/metadata.xml b/x11-themes/faenza-icon-theme/metadata.xml
index 585a6d74632f..e29d5fe2fbff 100644
--- a/x11-themes/faenza-icon-theme/metadata.xml
+++ b/x11-themes/faenza-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index a569f2d9f0d8..064726c6d610 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm-crystal-3.6.5.tar.gz 5899049 BLAKE2B addd82dbbab9b457a94715a969a27ff6ef2be07cddd33a379dc4d5348c9565d3a19943828b068ec5ef5f6d032f51b77a1990316ee7b3e16e5dc98ddf32f98c7d SHA512 45cd99b83342e5e5f0de89edc92dbba3311efc7ef431d509490e3fd5b49420e94d1cef55865f45e731fd4c13172c6e2d26fbd10107cdb4a4f525379e17b94e6d
 EBUILD fvwm-crystal-3.6.5.ebuild 2479 BLAKE2B 869b8d37dcc17ee843ecdf79053fa9a08fbcce9e6d4b4c7ee5439e97018bc4fc454730195b5ff48c3d65a44a31b0dc5aab2b2661fd8057268cd55c544c61e26e SHA512 c30ac420f1c1c21776faa75dcd6b961efcb2708e098ee5859e646738440254cea723d22f5a9d627e5f53d2c1f1315e983a387e0e22da7974b2b95ee7580cd5f6
-MISC metadata.xml 1139 BLAKE2B af56bf2214314c067f3b6f913e882eb7951397d388dd3f51616a658c71100b7df8a8ba7eae451252ba146f3af5c69678d35a999b9390f8f8e5ff587d1d8842a7 SHA512 4e4ac9d975627fe48eaac181570c023fef881d573237bdc634bbfd6a4308d4e38e4636c8aa805e74a54f0a84c0a649f6db1dd7bb7dc5ea0bdd0b01d9c8fd2f87
+MISC metadata.xml 1169 BLAKE2B 7ba9219b2cbff1f6c9546bcc424f870b71aa8cf8031e31fe9823bf4967ac94bc75add8252d93006c9772cdef6fa230a7eb0ee6b43ea3dff6e3bccf05430ac546 SHA512 7e540d70b9608004d67fca3af153325ccd2217a898ff614e79b03838b48f4b0a69765a17e52b52e70ff08f237474382632d692e3ac1acd46b5d94979a2fb9ecd
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index 951da7f22cae..c77a6de33687 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>dominique.c.michel@gmail.com</email>
     <name>Dominique Michel</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/gargantuan-icon-theme/Manifest b/x11-themes/gargantuan-icon-theme/Manifest
index d942a1d82058..07df429775c2 100644
--- a/x11-themes/gargantuan-icon-theme/Manifest
+++ b/x11-themes/gargantuan-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST gargantuan-icon-theme-1.7.tar.bz2 15412944 BLAKE2B da561300bf5ca567a42cd7fbd04bc8ed5b2c7af3be47c7f79bb52ac4f449fe9f7283704fd1c6b3c94efe647b5fce427ab9683dcae75b50ffde82f6e18e55db61 SHA512 87fcc608fee2bc2295a6e73eca4944e402296c42aeb31e3f9a07e98b82bdd5239bc79d3765f728fcb45393b18d3ee1661576ec6131cd1c65b7082af276b3efe6
 EBUILD gargantuan-icon-theme-1.7.ebuild 536 BLAKE2B 9bef961c31605f481bd02ca797108e29f2919759a55ffc522c6135c37199514bcc964fb321e504b9f2d4bfa2fe9bcc6248f83d4d6f036d52dcc7eecdfb675cec SHA512 3bc347ae93849698035d651f5ca2c2da6eed608bcb7c3248b22d3af63c49cc7c36400aba61ecd75f5f63df4f8b78afce52f31c2d4588fb307eafe05f9960bc4b
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/gargantuan-icon-theme/metadata.xml b/x11-themes/gargantuan-icon-theme/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/gargantuan-icon-theme/metadata.xml
+++ b/x11-themes/gargantuan-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index 5a92f830a21d..9067004ba455 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
 EBUILD gentoo-xcursors-0.3.2.ebuild 1447 BLAKE2B 6711b8aba50bfeb7269ef4ef70183375393a45dab8b6fc70f4d14106c040d3a40134432e0e16bc720bce7a777996d28854b9b72cf72959301ae655156668b49f SHA512 143094cd4be1bb0c5e985fb7f7e13e69ecc1129ede6a48cfe9e9ed139023f650b6cfbeb9596378775db08ad27c71e85541f67fd3a071e68b3a63fe01d9ff0dff
-MISC metadata.xml 570 BLAKE2B 44e1850e98a52f0d92045055817daeb074503a98b129e100128300c9a2d76a14f4b6a7c2ac6814d205f51f068abf8441f6530832eee0952f83ee43d7bfab2c80 SHA512 bc9f910e1b3032dcc34fe011e921b0e8994095738f94cd4c99ee212ef492f5ab6b3827f2e67bd9b43f05125c133063bce70a315e2afa10a2d5896fad0801a511
+MISC metadata.xml 600 BLAKE2B 097e4e69694f16ada94402152ee9a91575425dc864a48aa71ebdf0cb6de6285dca9dd40dc1840bbbc71fef9ee9e1eb4418b9ce310545fd1afa3bb3c9fc4f9aeb SHA512 655d258f0224993d38c582377c9c3d6eb436533db197fa9f25936734c794e3104bc739eed4823ea775dd1e3cdc5cb6e5bc020a6eab4932cb8fc2d5db6c6bbe14
diff --git a/x11-themes/gentoo-xcursors/metadata.xml b/x11-themes/gentoo-xcursors/metadata.xml
index 2a3fff642485..5337cea475cd 100644
--- a/x11-themes/gentoo-xcursors/metadata.xml
+++ b/x11-themes/gentoo-xcursors/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny (tastytea) Gutbrod</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 7f33d502f6ab..fde2d8dc1180 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,3 +1,3 @@
 DIST greybird-3.22.14.tar.gz 283933 BLAKE2B 68f0b71dc71d260cf8f2a6971fac15ecedf345655309558c600848b531b3338ba3670c09c13182c24baa90f2fec24fdacc7498ee12bc1b1f00416bf12f68ac39 SHA512 766099b80eb81cfca07b52671e721ab281bb120ea252e369be2f83b6f38f1b7be5c0a2cc2d25b35f565063589e28982393f5c911b8c3ade608999339c93a490e
 EBUILD greybird-3.22.14.ebuild 775 BLAKE2B ddd39cb7f4b09694478916973516ec033622011970834b34d239d13922b823c5664d45be309764aca4a0f3cc9eb0142260f95a57e6289a66afd804e5bf11d881 SHA512 214ba180ec0781f23e0f7c4d8453c8ada7588787a6d31bbf64e9f2a9ac4b7886b5e6df7c868b99efcf677f9ee6b8e3ae4e6195ea22399b86b30103bef4c0b6ef
-MISC metadata.xml 600 BLAKE2B 8292b4bbe1cefd66b352383d9465596eff9caef4d06f51206773045e9c42f1b2bf67bac7c5737a99a216fb3532c43b604dc6bff8bf33b2badbf00c6ba6b76867 SHA512 215586945ec72802c2ad61a73550e259a9d360fc8ffd881321c4cc053201c29425de118bc92205c5e2b8944fe4cb1880acb395e36f7c04721801f022bf323d1c
+MISC metadata.xml 603 BLAKE2B 693742db014373336bf55cf57b7366c1e642ee4a5b6933495d4d44bd740def1e680ed5feee7664f2268e5869b0ab9971071e2c0c376013800fa458681661657a SHA512 7daadf572dca60c73cb5bd6bac4104677704839a7a609246984dce35e0f59cb7cba116cf0bd0c077f3312bcf6aae65df2a6ddb0bcc7ee82110358aa1e0168e7a
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 9efc6922bc5a..113d4b93c8da 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -8,7 +8,7 @@
   <longdescription>
     Greybird Xfce Desktop Suite. Contains the default Xubuntu theme for 
     gnome-shell, gtk-2, gtk-3, metacity, pantheon, unity and Xfce. Comes with 
-    light and dark variants (>=3.22.14).
+    light and dark variants (&gt;=3.22.14).
   </longdescription>
 <upstream>
 <remote-id type="github">shimmerproject/Greybird</remote-id>
diff --git a/x11-themes/kvantum/Manifest b/x11-themes/kvantum/Manifest
index ee9468e5e17f..4d94ac488e52 100644
--- a/x11-themes/kvantum/Manifest
+++ b/x11-themes/kvantum/Manifest
@@ -1,3 +1,3 @@
-DIST kvantum-0.18.0.tar.gz 2805017 BLAKE2B 6a73e751b91ed76aa0e2d21690aaf0cf0e2bf58b4aaca97157c34dadb059895b96e2a9172535636ac4cadbb946796553d324daa055a8749b8545818bf1611d3f SHA512 c53cdb298f7b98e2dc2cd041e5bce87baf238e4f0aabb030489fea97d8cc1cc455d0667966bbf2d6435f38d88164c0a428dcbc255afd6dbdd55a3ce277b90565
-EBUILD kvantum-0.18.0.ebuild 644 BLAKE2B 190868c65b09bcb923736bfb7249416bcc382e03410177d85587593d40d8541dcd660c5004dbd91419de48bca6d11554933068abc97b9b29b0310ba58dceccf8 SHA512 4ec46e97d71323c5ac091b296bcacdf973afd0a48b1f7f768bf532dd1bbc36840c10ef474f9019bb1409bd7bd91c2e6d581704f8ba2de1caf235a114af0bf9f8
+DIST kvantum-0.19.0.tar.gz 2825683 BLAKE2B ecd777993a8691cbea2239b0953580173c85a6de80a7e4a873209fef9c3a6d690c720064a9852b6c69aeb4331862ec1f1231c1b1e3f9d5d51680d200806e8324 SHA512 23de3c303565760c1bf1d7abe233441beb8d10e23e7cb44d0d65e9845efe5a2988325fb169278155d55442256ad5084b793d4aef5cbd2189007ddb0ec8a741ac
+EBUILD kvantum-0.19.0.ebuild 644 BLAKE2B 190868c65b09bcb923736bfb7249416bcc382e03410177d85587593d40d8541dcd660c5004dbd91419de48bca6d11554933068abc97b9b29b0310ba58dceccf8 SHA512 4ec46e97d71323c5ac091b296bcacdf973afd0a48b1f7f768bf532dd1bbc36840c10ef474f9019bb1409bd7bd91c2e6d581704f8ba2de1caf235a114af0bf9f8
 MISC metadata.xml 252 BLAKE2B 11c8366ef963cda3ae7aaf5fa07d085bf57b6a5e00fd8033ce6bee3bcdbc6cfb8d385b64b924b5e02cf4be79d34e137b8e525bbd2c9446dc1ec5eddbd3235329 SHA512 43db8b1cda45f79f3a14df2735f53b1a1b8ce9d9aa101fa1863454c24015f2e691b686bde15667988f82ce74e023504ea9ff76e0459df3f1ac5191e678141a39
diff --git a/x11-themes/kvantum/kvantum-0.18.0.ebuild b/x11-themes/kvantum/kvantum-0.19.0.ebuild
index d21a456792e9..d21a456792e9 100644
--- a/x11-themes/kvantum/kvantum-0.18.0.ebuild
+++ b/x11-themes/kvantum/kvantum-0.19.0.ebuild
diff --git a/x11-themes/metadata.xml b/x11-themes/metadata.xml
index d94be5cf7f68..f84ea9457c5b 100644
--- a/x11-themes/metadata.xml
+++ b/x11-themes/metadata.xml
@@ -15,7 +15,7 @@
 	</longdescription>
 	<longdescription lang="ja">
 		x11-themesカテゴリーにはX11アプリケーションで使う様々な
-		テーマとスタイルのパッケージが含まれて>います。
+		テーマとスタイルのパッケージが含まれて&gt;います。
 	</longdescription>
 	<longdescription lang="nl">
 		De x11-themes categorie bevat thema's en stijlen voor verschillende
diff --git a/x11-themes/nou-icon-theme/Manifest b/x11-themes/nou-icon-theme/Manifest
index a46d8bbccefd..4520692b1f0a 100644
--- a/x11-themes/nou-icon-theme/Manifest
+++ b/x11-themes/nou-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST Nou-090208.tar.bz2 1637004 BLAKE2B acef999b166af2072c4b948514e46f2feebf3573fcc5a013065bd82813c245583d3ae598f0316de3fa735eb431f67aab0c2a0a3936636927b309f3a7ea4a3257 SHA512 1dfa7a8667ec37f286e626c8ef11e312cf79bb8730fc73957c4938904d239a5d02bfa4a4f99a372d24cb0930e13370f424d0cbb4f6f1b86e625aa611c241c9d2
 EBUILD nou-icon-theme-09.02.08.ebuild 505 BLAKE2B 872936d669efe7086fa031b51de61a573da538fee6955db5a1c78dc71695bc166bfa771ff4c1ac4f75b6d04cdd28ed31f59ae4d47e0352dfa1da9d2cd411bc41 SHA512 d3aa3e8e1e09f5f4f0c5bd8a1b213248f2ed4451d5e2a309c8e60b35238d4f58e9fae41ff9a84ea39a86081a75f23e6f44cf2c9bfa96d5520c393fc452977a32
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/nou-icon-theme/metadata.xml b/x11-themes/nou-icon-theme/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/nou-icon-theme/metadata.xml
+++ b/x11-themes/nou-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index 68eb7a7ea2f7..cb6eb8813024 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -1,11 +1,5 @@
 DIST numix-icon-theme-circle-19.09.20.tar.gz 2193017 BLAKE2B 495f4b2c1cb74ac43d59515ed03d9b4032fe3453f37fb20bd09c24aa3e1037654967149372cdc3294f0d21b2ae5d95e43604864b7fd7520bb626ce58ec333769 SHA512 bc0e80953e646c305d8af9f2360389850f7f67b5bfc35501c137f07dbb99db146e4de6e2afaa711b8eafe83315ab5f392ce1276bd54a431516c21171da20a9ff
-DIST numix-icon-theme-circle-19.12.27.tar.gz 2206572 BLAKE2B 0e66af8abbff88f978d7be82b1f5cae73fe0b7c37bdc7d501179f2e922b2d8b599138eab54b299c5b6cff5c94675890363c5bacaded84c56eae053911aef0a96 SHA512 204b67d28a673314a61802cf9303cbc437410315e7e7d12000f155e2dc095e0ebf0003e62e8bf0046c972a03353a114119e00353144803398881e4714b3d5aa3
-DIST numix-icon-theme-circle-20.06.07.tar.gz 2281791 BLAKE2B b056ab28a78e4c91684abc7527d39c68950a143f7bd9d9db67132b0622657f5c4e7b80decddf7bf3102d389af082ebfdbf39797f2eb16f1364adb70fa2d78b9f SHA512 21eeb521d0ab1a921ce126d63689317fe1b8031e7d661cf530e07bd6b6e51547a4fab2292986b4bf9cef26812011e46a62646fef2344c0d7573e9fe9b93ee137
-DIST numix-icon-theme-circle-20.07.11.tar.gz 2309911 BLAKE2B feab9f36671de413b15ebfbb122435c0bb6e632373526372680722137e9e74f5312aecc95682a0edd8ee356d070762b35bddb99e2781013a88dacd60e2286abe SHA512 21550994b798387c9e93ecd6d7d73611744fd7bacc061306d0671e27d309608992d148081840f9857728dfa72aff4b288a6f0e57d34af727f29a0b6f89553560
 DIST numix-icon-theme-circle-20.09.19.tar.gz 2359130 BLAKE2B bae28a49db5cd748961d985db4bac9e783657b5caae8aea0a43437735e31fd80969af56b9e995a8076d058d77c32e64a855785c427c9504e68ac4afc82a0c7a9 SHA512 729401e79ff81a211494d4a595dc95e82aab115ffd02a6bd8b1df06556a0a8ebc2c0c72f298353ced2ed80adc1294d786fa79192d8621ad99549c3a736fa33ed
 EBUILD numix-icon-theme-circle-19.09.20.ebuild 483 BLAKE2B cf28c2317826c1dc751e9f2fc5e99fc6e3e2bedc13ce7c8694c8689a6a86f6b5a0218bf553203b8572a387779efff498712ece941e29ae823d381e56b594dcc4 SHA512 d270cbeb6260f1f3fc1af52b66bf49e96e6921c88352aa6e22c869cf7fa1f709ae78831efd40726c56358aa4951ef584ef17b953261d5650fe9d7aeb96901a9b
-EBUILD numix-icon-theme-circle-19.12.27.ebuild 485 BLAKE2B f21fe7a384ee169225bce445cb5c87c51522f58ae6992039188b5ed2d532333540a85c108e23bab72316ee9119e56d1434c4662d0c2632e95c62c523b7c537a0 SHA512 1916574368883312c1a73047bd4ec9abed09daaacf96b541c883c0c15ccd1adac39c56baf10a16034cbe08b939236b8dc9299a39084474495b98277990a6a2b1
-EBUILD numix-icon-theme-circle-20.06.07.ebuild 485 BLAKE2B f21fe7a384ee169225bce445cb5c87c51522f58ae6992039188b5ed2d532333540a85c108e23bab72316ee9119e56d1434c4662d0c2632e95c62c523b7c537a0 SHA512 1916574368883312c1a73047bd4ec9abed09daaacf96b541c883c0c15ccd1adac39c56baf10a16034cbe08b939236b8dc9299a39084474495b98277990a6a2b1
-EBUILD numix-icon-theme-circle-20.07.11.ebuild 485 BLAKE2B f21fe7a384ee169225bce445cb5c87c51522f58ae6992039188b5ed2d532333540a85c108e23bab72316ee9119e56d1434c4662d0c2632e95c62c523b7c537a0 SHA512 1916574368883312c1a73047bd4ec9abed09daaacf96b541c883c0c15ccd1adac39c56baf10a16034cbe08b939236b8dc9299a39084474495b98277990a6a2b1
 EBUILD numix-icon-theme-circle-20.09.19.ebuild 485 BLAKE2B f21fe7a384ee169225bce445cb5c87c51522f58ae6992039188b5ed2d532333540a85c108e23bab72316ee9119e56d1434c4662d0c2632e95c62c523b7c537a0 SHA512 1916574368883312c1a73047bd4ec9abed09daaacf96b541c883c0c15ccd1adac39c56baf10a16034cbe08b939236b8dc9299a39084474495b98277990a6a2b1
-MISC metadata.xml 476 BLAKE2B b5ba71de26105261806b6928186f728fd03e8b879b0ef97b22981936bd75ceaa0e66a710f459f52f2e1f483738a59630df06f145d03f05d485b7d6f0f680b836 SHA512 34cd0481df375227bb3a59489acde7487a6ef5b1d890fa67afd0aceef0cf66701552708b051c2a288bae80b1128c4b3455caeb664b7bdec88fa791ab3b975f1e
+MISC metadata.xml 506 BLAKE2B 8aa749df163e61280d016edb9c922dab5de890df5092c7e2294eb3ef48d12f7901476cfdcfe0788017ca7e1f9af24df3d4f89b589868a3e5bffa1072efbee952 SHA512 b43e5fbf10fde9c82b6fa380304653184b6eedda6daee19bbb6a14a8fbc5f0f9e32b43c52a81e4dcf4c4f28941f1441f9a782ba015116232b5dab6ab9ef62a10
diff --git a/x11-themes/numix-icon-theme-circle/metadata.xml b/x11-themes/numix-icon-theme-circle/metadata.xml
index a08577aa1ff6..3b71bfa513ee 100644
--- a/x11-themes/numix-icon-theme-circle/metadata.xml
+++ b/x11-themes/numix-icon-theme-circle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.12.27.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.12.27.ebuild
deleted file mode 100644
index ce2f2d549d8f..000000000000
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.12.27.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Icon theme from the Numix project"
-HOMEPAGE="https://github.com/numixproject"
-SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-themes/numix-icon-theme"
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Numix-Circle{,-Light}
-
-}
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild
deleted file mode 100644
index ce2f2d549d8f..000000000000
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Icon theme from the Numix project"
-HOMEPAGE="https://github.com/numixproject"
-SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-themes/numix-icon-theme"
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Numix-Circle{,-Light}
-
-}
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild
deleted file mode 100644
index ce2f2d549d8f..000000000000
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Icon theme from the Numix project"
-HOMEPAGE="https://github.com/numixproject"
-SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-themes/numix-icon-theme"
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Numix-Circle{,-Light}
-
-}
diff --git a/x11-themes/numix-icon-theme/Manifest b/x11-themes/numix-icon-theme/Manifest
index 4f715275362a..4af6968095c5 100644
--- a/x11-themes/numix-icon-theme/Manifest
+++ b/x11-themes/numix-icon-theme/Manifest
@@ -1,9 +1,5 @@
-DIST numix-icon-theme-18.07.17.tar.gz 4415673 BLAKE2B f2bd9342dfb914872df429edc756eebf457f2938cb9db28948bec308eb9cb533268103957a2cc3381948ba4cc1405c82f3cba225bc1f956304119fdde4503b4e SHA512 dd71dd5b05df9f00b9a3d066ce9ad44aa2959d0fae5083a2203d0562b774c0f7d25edf278a285a4e3813fb7d4346626fafc6c6d947cf9d510beb320839dbd757
 DIST numix-icon-theme-19.09.20.tar.gz 4410187 BLAKE2B 84c786784bf9099aca30f86eebea4931e2ab35e83531642ebf4394d23b5fb317d1f0d296b82e7db8d894936222f582a7012d510dd27bf9b91cf74ddf435e0dba SHA512 33887291c6322c3a78162c86e8d81b882c5483d00bd14ebd1238eb5aec800e8d2f8e5a01c24d96491dd569495242ea196995a130ec5a8957e10e9068ae252d1b
-DIST numix-icon-theme-20.03.20.tar.gz 4426810 BLAKE2B a2f31ccff9326cc96c7f77c2acdd8f2c24698d6331bff73afcb0a2c80277b0c58b9527e063987b44867d7fe6f1586b454f29d29b5de3b3d69f43c245c29a6986 SHA512 417f50a13fa60292abc17381678d482d2b1f6f0df2ca7e97dfd3070fa3a563adb5cdbb33ce9853c80fdb7a90abba61263d064f212655149df7fe4cdea751097e
 DIST numix-icon-theme-20.06.07.tar.gz 4431263 BLAKE2B 80f5220da0b0361ddaa27c178c0d1e75e34d970e6b25bd175a44b854c8e340e0cb37a5d6ac64aaa73d05b9570efdad0d40d268dc0a15836b41ec680e92a4ea13 SHA512 8ab26fe047d1ab7002a9cd1b21406c5565153dfd9fea7267945f8f9eeaac299b6b7601340c22d933c9e28c522cff300596aac6d589b0080d44746441d5494f6d
-EBUILD numix-icon-theme-18.07.17.ebuild 441 BLAKE2B 96ce5a02153d73d46a73e9ec0f76c30a29148aaf31190f2c55801596aa283a321ee1d619ace98992131303241b1a42e689d40865fdfe37b2a737770174e99557 SHA512 0c35a9591ac8f595ffbd451acc94bbfcf86864f3559384556607d1fdf38e6ece63b56865d59dbf419ae7cf81fb19c83b33d97509a017baf2e24cfc8775a96824
 EBUILD numix-icon-theme-19.09.20.ebuild 441 BLAKE2B 96ce5a02153d73d46a73e9ec0f76c30a29148aaf31190f2c55801596aa283a321ee1d619ace98992131303241b1a42e689d40865fdfe37b2a737770174e99557 SHA512 0c35a9591ac8f595ffbd451acc94bbfcf86864f3559384556607d1fdf38e6ece63b56865d59dbf419ae7cf81fb19c83b33d97509a017baf2e24cfc8775a96824
-EBUILD numix-icon-theme-20.03.20.ebuild 443 BLAKE2B 96ce3c4c3f98a52ca4b5ed34b69a950977866b436edf49d3325a9cff45af8e96c613e02f1793cf083b9232b8f66bcbec2678a46cc8c842de9ee4c5bf07c24b39 SHA512 02fc8554f477d9be98b35a70ed60aabad6dab4faf3074a70c703d2f0dc48b45b44eabcab7d5a12c0f5f8e89aad739cc94eaf0ed0a66f202d1024cb0aed887ff1
 EBUILD numix-icon-theme-20.06.07.ebuild 443 BLAKE2B 96ce3c4c3f98a52ca4b5ed34b69a950977866b436edf49d3325a9cff45af8e96c613e02f1793cf083b9232b8f66bcbec2678a46cc8c842de9ee4c5bf07c24b39 SHA512 02fc8554f477d9be98b35a70ed60aabad6dab4faf3074a70c703d2f0dc48b45b44eabcab7d5a12c0f5f8e89aad739cc94eaf0ed0a66f202d1024cb0aed887ff1
-MISC metadata.xml 471 BLAKE2B 0063e8f12fe8c798a05d48229f68ef701cbdb0b6ea1ae3935dd13e9d0c74a9fc64793f77fe20a4028dd49e853bc70bbd3034320c1bf47c382078fa12a0bd58ea SHA512 c2e9ec722a73d7f3b23c056e5cb3983bfc384cfa6249627dd45c2cc0bf5da85f276c15589391cc9229d22438210762f521a33ad31f31ac1003ab814cff5d8d0d
+MISC metadata.xml 501 BLAKE2B dbaa36904231e979f5be337b285505a156c630cea9a687a4288adf098f3c66f170fe0960c5d4634dd82a6a5161fd862388dc85dd716bcc2d2694ff72afb7975e SHA512 c759e0b28e484bd322530589ac91ecab18fc5f33ab2941237ac6efb77f0578c6ecbadebc61635d81d27d582b599772b425433027ef5d7ad17406d3d7d5aed41d
diff --git a/x11-themes/numix-icon-theme/metadata.xml b/x11-themes/numix-icon-theme/metadata.xml
index c6de63f06d43..348cdecd9134 100644
--- a/x11-themes/numix-icon-theme/metadata.xml
+++ b/x11-themes/numix-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>  
diff --git a/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild b/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild
deleted file mode 100644
index cc8d91bb36f0..000000000000
--- a/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="An official icon theme from the Numix Project"
-HOMEPAGE="https://github.com/numixproject"
-SRC_URI="https://github.com/numixproject/numix-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Numix{,-Light}
-}
diff --git a/x11-themes/numix-icon-theme/numix-icon-theme-20.03.20.ebuild b/x11-themes/numix-icon-theme/numix-icon-theme-20.03.20.ebuild
deleted file mode 100644
index 9ad960d6168b..000000000000
--- a/x11-themes/numix-icon-theme/numix-icon-theme-20.03.20.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="An official icon theme from the Numix Project"
-HOMEPAGE="https://github.com/numixproject"
-SRC_URI="https://github.com/numixproject/numix-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Numix{,-Light}
-}
diff --git a/x11-themes/nuovo-icon-theme/Manifest b/x11-themes/nuovo-icon-theme/Manifest
index 02b2c0f51f4c..ed9ea470b06b 100644
--- a/x11-themes/nuovo-icon-theme/Manifest
+++ b/x11-themes/nuovo-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST dlg-nuovo-0.5.tar.bz2 1023277 BLAKE2B 5bf04f70932b60b877e2b97296f5ac8251ee7ae9e5cfad62f70436c9b4b63f085fb99ac5f37e08c46e652717cee094f9373e551aadf86b838288abe8210e3c71 SHA512 ce331f362383a04d0620c11ae73875db246b78ea2c7a724a0f615c5c8715b6bad898af4e354e1720888043c355eec3857409486f0454f2c515b1d4cd634cb8c9
 EBUILD nuovo-icon-theme-0.5-r1.ebuild 495 BLAKE2B 50d888d6745f755cc56ae5a06c5495e30524270f8190506742c1baf657878608244e0daf0a714f7621fca9896e4f776c5271d6c79b40f4e0e25ff6ece921e03c SHA512 9e5ca56cce7f32bcff727b3b612ee850b01c57b800244fb401cd9d86eaf3b83dfca6f3f5dfe805f74d7a7e53973fb83f32271b9ece7caea3b8bed7e2209fac19
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/nuovo-icon-theme/metadata.xml b/x11-themes/nuovo-icon-theme/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/nuovo-icon-theme/metadata.xml
+++ b/x11-themes/nuovo-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index b53a5c16f69f..56192484cbc5 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,25 +1,7 @@
-DIST papirus-icon-theme-20191009.tar.gz 18636796 BLAKE2B cb1797468ffb1542fb6b732a0e54cf18b4158bf15ee0fd7f2c7616cba8568876bdfff0247fc1f311d15f064836d7a17916ac14887c3f4132983ebc7e75736668 SHA512 09d259783439721baf68bb5c65cc9cb51af148356e8c8c277ba2f45b5c96358f14defe1bb34db0281cb0cf77023ab54017e0d348de2910648a918a1638ae334f
-DIST papirus-icon-theme-20191101.tar.gz 20072061 BLAKE2B 457d47e16ce2c4465c8d23e46bbbc0753351442415be0a8293880d33909beb06b53d4ceb4e13eb2fb4fc1c453c0cc71bb313f7506deba3fec0f98cd47cf75150 SHA512 abbf3c6b248abd6945e7397ea53fe92e645d74918f6fa6f54e3701e560d75e94ac75c2e9d01d5bed7c989af8e14ea9dff4dba018956aaff43291d45fc7ab9e4d
-DIST papirus-icon-theme-20191201.tar.gz 20576688 BLAKE2B 50edc8609b37728ab70e8d5914c37b7860927e7123905546d52ce83a5b8a0bc5a706a536a9734a0fc875504c49b7036ab832f8f6b2587bb31b83213857651cfa SHA512 2faeeea2f0b3efe9b2f18783d5e081199295e03bda021243460daa28bde701b6f0aefb0fa6ba196bc32f44e4af72b7efadedbc377a56b315c2d1c3519c7934a1
-DIST papirus-icon-theme-20200102.tar.gz 21110348 BLAKE2B b52282b74cbe771212360e170cdb7be972b98a03e0b283078a58ef8838e95b64ba8e010c0eb97d8c9bc54e8a9e5152ea9768628e6acddb41b4e992da9eb521d1 SHA512 63e80ff061657bf6512d3906cae67d24221cdaea70002281fa91c4c8f127a504cac4e1a1afce0da9555ef917d30a390891c7f8d7f6c11064865819b88887a84f
-DIST papirus-icon-theme-20200201.tar.gz 21482791 BLAKE2B 5287e031505835465b85115d1a86e8af61b9e5947357654a3f00b768708bc6e49accbaa219b6b0889798153215cc072d7f8b1cd677fdfff113bf925968980e04 SHA512 07ed45eb409ed12f57657f058f9a5a03dec77679ed598dc8645536a614ecc5424c60be57f10de20ca72204d2a21152fdd62adadf2637bbfa1266d588c787d7e9
-DIST papirus-icon-theme-20200301.tar.gz 21896164 BLAKE2B fb2c11b3ebe893375283e7f95cc6e89a7c8b54f4b2d129a2517a2b4eb5f3c84da925ac399491e0739d16dd6c050c2969420f73dce7c9a2e83522ab7d63299b23 SHA512 8b9f0a9b0fdb676365d6b30af8ba8dee71ff433a4c4317151899f09614da3fc9764e5e9c48743cdf7c8fde6eea53a1d3ab37eb890f1486fc54ce328e6af9b348
 DIST papirus-icon-theme-20200405.tar.gz 22279244 BLAKE2B 756402258dcc356cde2c4822c979e93096de6fd827037a21839e67a6f6bf81da7c86cb311255a6018676941ad1659cb5206dc8f3d1bfd8f320381232b5a0528e SHA512 116aefea7049f7bdffee12fde8fa7088dfb4cd52f78bba617390700ba292b664dde32d30119f2929121988fa46244d452407b82f61f113b38810743c6db7e451
-DIST papirus-icon-theme-20200430.tar.gz 22659357 BLAKE2B 55c68d06375f1713650e908df8d2a47725d656dc12cb02117f5b49abf662d36c3397fc13f1b806899e14ccc1bb84643fbcf32d716c9254f2c69133c13904ac53 SHA512 5be8e68f3b0bff32c8c1c8c6fc4d4358a1fa18b9395cefbde4b6056fd38d1fb68f2cc555b5aa98e0399c24ddeb119d501b00098c459d43a734ae831b7df9624c
-DIST papirus-icon-theme-20200602.tar.gz 23108544 BLAKE2B fced236cd7318ad26df0ccbf0ad2800a8678265d2060746a17143b20193d6a96193de0950b77cb29df160757dae833755d6489286a0f4b52db4164e8158d0704 SHA512 c860efd6ab863cbeb7b5f0d3afb7e652bbd9daca9c5028b0c466d1930f7bacba137fce40220f858b2cff0ef575d1c9eb979d7ba1c79481d7dccdbd6a273953c0
-DIST papirus-icon-theme-20200702.tar.gz 23456769 BLAKE2B 4e4c9466c14a18231526c3a6db33cc35841a1e5787f03e186914f57f67ee19579e4822099e82fb9b295a6da393b1097110b7ef3b86737794fe0f5aa8c62de50d SHA512 ff2aa30bb70361f2952be203b3e3d00aae248726b5413a3a8e9ad7d6e7d0759e9bfd156cc65520175aba0e5436e9e58453ae0058d7d639d5c9a818e7f158761c
-DIST papirus-icon-theme-20200801.tar.gz 23673134 BLAKE2B 6562a6445008de3b465a8c1b7db9ba62d057ba9937058de5355482a063df3b93db5cdd3867ffee113b1c2a0152735ac0b0fdb0dfa46119e7ed31ef8ebcd0765a SHA512 fd8262b4b56c825f145db466c7237f29322c76f8ec10c59a9cb97315b4a6ae3667c6e6e4910a8165529e762c5420298949f5b283ee4d37ac14135be35cdbf993
 DIST papirus-icon-theme-20200901.tar.gz 24109177 BLAKE2B c30aefa8d056c4c8e86425b3ebca4720d01ca7b0853f33edfb382a280f347df5da75815b354549c96285478fd4e6bacf5469a4212047fe0ba14cc6d2d1b7e292 SHA512 0c1abdf58aeaff6aa8bce2b1db541377633e15282024f757d949adc4cf3e73d08b66b5188fa31530394cb804e88881b5a66c4d80772469d606cfc192c076224e
-EBUILD papirus-icon-theme-20191009.ebuild 639 BLAKE2B ef9a22646126e41e14a546df6026eb0debe8d5665e18a4954b78eadfe2b7e18778413806bdf376a96b0411bbcb3fccfe6c6eed43112a19a960cb971c1a3b4d1c SHA512 9b242cb7f2aef3725cb4a1b805111fe8440b039c8d824a74689c2594292e09fe03b41518950583fd7cbac095c87da1f7aa8cf38292bc319ae3f1476e764fab2d
-EBUILD papirus-icon-theme-20191101.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
-EBUILD papirus-icon-theme-20191201.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
-EBUILD papirus-icon-theme-20200102.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
-EBUILD papirus-icon-theme-20200201.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
-EBUILD papirus-icon-theme-20200301.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
+DIST papirus-icon-theme-20210302.tar.gz 26557577 BLAKE2B 6dfba45b97d466deffd23852694cec62c40035a7552c5424dbc84fb9e5755fc0ba97eab302947e45e408a3f36ce3d6eead4af9c335c066355398a4cf30c66085 SHA512 b8bba6a3f68b34da7f9e55ac19b37240d7dc0b1b7cb6523431d5e1ce08a90179e26beb621c8da4ff219d2c1e9ad390f8d0e6f413bc4296c15b1da872f09dfd26
 EBUILD papirus-icon-theme-20200405.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
-EBUILD papirus-icon-theme-20200430.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
-EBUILD papirus-icon-theme-20200602.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
-EBUILD papirus-icon-theme-20200702.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
-EBUILD papirus-icon-theme-20200801.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
-EBUILD papirus-icon-theme-20200901.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
-MISC metadata.xml 269 BLAKE2B 06e943162c232eb78ab968ab10bc76d6b70c8d9ead770109b51986382aa17b67e57cbb7fe8c13f6d8a39aebe0584722fa7f11d7ce1b5770c9f78c4025d99e355 SHA512 f4e81d988c1204f8629264435cb212e927e03823abdf291f5c2fa5862b9996f491ef6e28516b1b60a187f73d8c61dfa31ea954bc3ecf8c13c3ac5d84cd9975b3
+EBUILD papirus-icon-theme-20200901.ebuild 642 BLAKE2B 8308fbe6b5cf8e36ff8901f0f23e68e75a4b2ba5ced78edef8f7f8929da1a6572d439f83bbe493300036acb468efce0f2829b3592ce96770866284d779aef902 SHA512 b32c9cf25eac46d8b71448e86af8a847eb1c48e4fdd5934309897a74861be16fb7845d6587aca7afdf77a643035fbdda4da14e566f6435485227e0a92c5f521e
+EBUILD papirus-icon-theme-20210302.ebuild 514 BLAKE2B f2bbca3cfc276732e8179cf60066c21aa6e773a27f3ed718de0f3fa8f8861ce1e2a9863d34ffd6a4d051136ebc213951cd06c8620bc4bf2443d9d839c85a73b2 SHA512 2960e8ffc6e7303d3ae9296574a27e9bc1565d0846babe1bab8d1d9c7ca01c6bc9ba3e27e6e9d588f155c03fb0976acdbea54f0b848f1643dd4f1f2c36d70e3c
+MISC metadata.xml 525 BLAKE2B 3bbe9a86093c0fc70d0be5a031247101282292a5d1a29cb43a0dea77b85088e9e2ffc6b36e2be7c98f918f2936a871794291a96a32da4d3b282bf57c9bca77e6 SHA512 fb15793d3dd73fc5a03cb9316f82cf89460b064a0c11cbad00617ae6a6daa39e3442ef3884b4f10bfb72bf226e64118e76bc2651857938b2d88548969644947b
diff --git a/x11-themes/papirus-icon-theme/metadata.xml b/x11-themes/papirus-icon-theme/metadata.xml
index 4901bff90cb7..5f9b5d8b51da 100644
--- a/x11-themes/papirus-icon-theme/metadata.xml
+++ b/x11-themes/papirus-icon-theme/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-	<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
-</upstream>
+	<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/>
+	<upstream>
+		<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild
deleted file mode 100644
index 688a4a61f1dc..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild
deleted file mode 100644
index ffcaec181ce0..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191201.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191201.ebuild
deleted file mode 100644
index ffcaec181ce0..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191201.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200102.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200102.ebuild
deleted file mode 100644
index ffcaec181ce0..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200102.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild
deleted file mode 100644
index ffcaec181ce0..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200301.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200301.ebuild
deleted file mode 100644
index ffcaec181ce0..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200301.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200430.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200430.ebuild
deleted file mode 100644
index 72805a2a9317..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200430.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200602.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200602.ebuild
deleted file mode 100644
index 72805a2a9317..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200602.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild
deleted file mode 100644
index 72805a2a9317..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild
deleted file mode 100644
index 72805a2a9317..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="icon theme for Linux"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild
index 72805a2a9317..7cac75a850ac 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_compile() { :; }
 
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210302.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210302.ebuild
new file mode 100644
index 000000000000..cdc7ac948197
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210302.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Free and open source SVG icon theme"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
diff --git a/x11-themes/silver-xcursors/Manifest b/x11-themes/silver-xcursors/Manifest
index f8087c447d0d..1c94357742ff 100644
--- a/x11-themes/silver-xcursors/Manifest
+++ b/x11-themes/silver-xcursors/Manifest
@@ -1,5 +1,4 @@
 AUX README.gentoo 568 BLAKE2B 3ae63af300467ccc8061fc7bceb862bfdbda0ff14bc3ca5cf8c7f0ddb9dac0b838fc4fcf8e6293ee96e4887249a7d3455a7cb77419addf613322eb60f4a09f71 SHA512 09a4bf7b2d7a395167ea67ce95e6f6b63f98af495d437b84757d742b73371b64e48ef6fafd61c57cbb5075506322318285d42aa18c25b98b5cc35cea0e71205d
 DIST 5533-Silver-XCursors-3D-0.4.tar.bz2 756159 BLAKE2B 7d90a44a022512e685b592e6285786e5b4898df723cba9deb52100e66c76865b5d2ed07968901656fc5c1ef565c54f281138e9e6f323e94bcb6c1b7884c792c5 SHA512 b5b44a796d5d9341a0e92f8f4351b84eb3974d1908eb2fdb012c0490e4374404e3d33b35873f49c1f7ccd56bdced4fff14338319edabab7d11ddf31cb46fd245
-EBUILD silver-xcursors-0.4-r1.ebuild 658 BLAKE2B 5885092595ffef75684e4f2f53bd7e9d72adb3337ed45babf058904789c442c32bf0b2eea8a13fd681b5cb86120cc13fec82d7e57c4f0463de311fbbd1f2bee0 SHA512 6648bcb9d8f8ea94a83f152cfd5408f3fcab83a4ce9d37d815cfa0d03f0e11cbd24cab15ec9de1b22457615f5f94a087673e60acb0d9cff10b0712de67841e0a
-EBUILD silver-xcursors-0.4.ebuild 1378 BLAKE2B 41868403bb23f30e762dc38eb775a46ef85c8c6f93683ee02911cb8b1804cacd47bfcf6490b681bdb74355921b864d7365a0531f3c3bd73a4904d337063a2864 SHA512 856194ffd35e38f39b88f315160ba9773671fa67618dc5ba16e7df7a78f6679644996921355964ab3fcf2358532955b227d75870d6dbc116fb69a40eec9b8f17
+EBUILD silver-xcursors-0.4-r1.ebuild 651 BLAKE2B 2e3c114db15ea0f288f5e124dc98c4509d9e9459b74649c7266b5435ff8540a20ffe525e9068e3a03384a39d76817839143b32a3f4367ce8d626362201c18fcd SHA512 60d382e06f972d3119d2a81f2bea2ee8051a1841a1f558b4c95228f06a38fdbe1ed67e638fadcc553101e4522fab835e2915be04a231183d56bbf2514948a23f
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
index d66bdc73fbc2..5345336dffd5 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
 
 S="${WORKDIR}/${MY_P:5}"
 
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
deleted file mode 100644
index 6db853812b58..000000000000
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-MY_P="5533-Silver-XCursors-3D-${PV}"
-DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5533"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P:5}"
-
-DOC_CONTENTS="To use this set of cursors, edit or create the file ~/.Xdefaults
-and add the following line:
-Xcursor.theme: Silver
-
-You can change the size by adding a line like:
-Xcursor.size: 48
-
-Also, to globally use this set of mouse cursors edit the file:
-	  /usr/share/cursors/xorg-x11/default/index.theme
-and change the line:
-	Inherits=[current setting]
-to
-	Inherits=Silver
-
-Note this will be overruled by a user's ~/.Xdefaults file."
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11/Silver
-	doins -r Silver/cursors
-	einstalldocs
-
-	DISABLE_AUTOFORMATTING="yes"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	DISABLE_AUTOFORMATTING="yes"
-	readme.gentoo_print_elog
-
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option \"HWCursor\" \"false\""
-
-}
diff --git a/x11-themes/yasis-icon-theme/Manifest b/x11-themes/yasis-icon-theme/Manifest
index 53612070cecf..93ad0237e702 100644
--- a/x11-themes/yasis-icon-theme/Manifest
+++ b/x11-themes/yasis-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST yasis-0.4.2.tar.bz2 1008347 BLAKE2B b78c35920f6e7507304525019a1a4c9fac2ef73479a83095de6175aa6f49fd2533b9a8a7b50b038d395036a1936193ce3bcdfe82e7d700d00582b469c7c9f9b3 SHA512 f417b02adc8f8b4b5ac5447c2babc7a8a887b8bd6c15639221c303e2baf3d5743c8f4fcf4ea264fdae6e6b85f387b4c485b99559071ed81cd054f03533121416
 EBUILD yasis-icon-theme-0.4.2-r1.ebuild 469 BLAKE2B 599574b6ba9a86056a1c95fc760035d3cd2bcb786885f7f4a5af597eb9f6ded31f98bf08cdc5fdcb4c7b39bbbb36b7308a13e81ba44bd977efb6e98c6e13f25c SHA512 1802cbd65582025c9984a162e209339b612ce924139f5e79330a70d7d7ae9b2146b23056b250a01ffb1b4bc50cf6c3e4b61083e7952142a2c6d8a1d86b819f0e
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
diff --git a/x11-themes/yasis-icon-theme/metadata.xml b/x11-themes/yasis-icon-theme/metadata.xml
index 52c3f63cafa2..6d792b262e9b 100644
--- a/x11-themes/yasis-icon-theme/metadata.xml
+++ b/x11-themes/yasis-icon-theme/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gentoo@aisha.cc</email>
     <name>Aisha Tammy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-wm/2bwm/Manifest b/x11-wm/2bwm/Manifest
index 94ae75b9d36e..8c50a230670c 100644
--- a/x11-wm/2bwm/Manifest
+++ b/x11-wm/2bwm/Manifest
@@ -1,4 +1,4 @@
 DIST 2bwm-0.3.tar.gz 41032 BLAKE2B 41fb12dccef95221fc5b6cec1d6b740037e0842628aedea23d80980961a615a4e5cf32ee9bc6c57eec8a2e304560b5f54dec0f65462af602f70c467d8c4ebe83 SHA512 088a97e5245287890c72e2b0685f7348a4cc0fd49582893b7ce7a081f80a4d7454a3c0eadf4609589314351ded02fd8b75548019b782e797350ad5db5c939f92
 EBUILD 2bwm-0.3.ebuild 836 BLAKE2B 4da7aa68b4a5efd322b526633a38257f7f2038b3b9ee9561ea178c36faaeed1242ba918b7e075ac4cd3a5653cc9e183f0927d343cb1df1c329a53528dfc515ac SHA512 3779f3a5ee7f6e28b3ba06b5c82b15372f0b2a99d7b807e51d22648c21be6728c2cad4b195b6eec4f873f64fafd190d18e7e34ce3717be0df0f4042d9891d2a8
 EBUILD 2bwm-9999.ebuild 836 BLAKE2B 4da7aa68b4a5efd322b526633a38257f7f2038b3b9ee9561ea178c36faaeed1242ba918b7e075ac4cd3a5653cc9e183f0927d343cb1df1c329a53528dfc515ac SHA512 3779f3a5ee7f6e28b3ba06b5c82b15372f0b2a99d7b807e51d22648c21be6728c2cad4b195b6eec4f873f64fafd190d18e7e34ce3717be0df0f4042d9891d2a8
-MISC metadata.xml 436 BLAKE2B b4e8dc4feeb6be763f51a389a91c6bb66c34d3d40b988a639c2e57013a1a2f87e37c0c15f9b7e82ce2e8607277decde1ea19d9405952b5eb4e0c92d541b22261 SHA512 5155e429f8900e1f5dd1df78674e5055c72bb09636150ce5e573f2703db2fb3cf0032c30df1bdebac29f235746c3d923a408e9b2cab98569f2076a3873136707
+MISC metadata.xml 466 BLAKE2B e862891249626487a49f4204ab00b5615c93f818930d597da3b4c86c11856606e26680fce062bb1856e0e07d67ff6902b634002011f1c09e5919194b603ad358 SHA512 2d1a1b38aaff611a88e82fed4075aa9ed745c62de53bc1ce02a3dded6519cb317a1a78c1eef7752757c7db6dedd40258dec9d6b2ea2382c97d8c36f2ee47deab
diff --git a/x11-wm/2bwm/metadata.xml b/x11-wm/2bwm/metadata.xml
index 2ca6d1100cf5..0e0b643d7fa1 100644
--- a/x11-wm/2bwm/metadata.xml
+++ b/x11-wm/2bwm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lillyjsm@gmail.com</email>
 		<name>Jake Lilly</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index bfc80d4d9dd2..450a7f985eaf 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index d56755797dca..466260a8df14 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -4,4 +4,4 @@ DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a6850
 EBUILD cwm-6.6.ebuild 991 BLAKE2B 15c37babefff6ae195f523fad27d2c60955b3c2dbf9f2ca55c2b7829557d882cec5b14ffc9b6f1e08df584b4f0fd623d95690040074cffd2d633308056e231be SHA512 73dbeafd62bd02c8dc0e43b48954a88e0255066bc677fe5ae752274a5c0a4fc16fa566edaf2ab7e3b5e411328ab570a95c7ba4d1e1521e0afddf2a1375bcc0b7
 EBUILD cwm-6.7.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
 EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
-MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478
+MISC metadata.xml 470 BLAKE2B df4d7653307ae78a918255ac3a879949523fb158091e8dfdb326d08a051988cea45e66e836b855d69e009c1659d5961de480a74aebbbfec34c2b789a9414e95b SHA512 b3780375c576da8b92393ead07dd3d72dec00f144e45d3efcd95b271f3da84f33ea254c6d620fceae55fbfc448ec7297539065428846e198901908845b744485
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index 7fd942a5adbf..6586a263b155 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index c3e5f2acc9bf..8f844f301dd0 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -3,4 +3,4 @@ DIST evilwm-1.0.1.tar.gz 31468 BLAKE2B 64ee8c0e429c4eefd908a700e727845f2de1e7531
 DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb11aa755bd21a141ad66387a7e95106231277caff84579bfd61183a554427319c7d85ec20716c69fc3cd0968 SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d
 EBUILD evilwm-1.0.1-r1.ebuild 1221 BLAKE2B 306aacb8aa62d6714197febd6330a0a665329efb02fd8cddd2b479a2f28917dc8cfb89341b3164c0e3f108cdde20408ae67b9772e2833cc9eb92809273a712f8 SHA512 c556cf1863f411413adf27d93c8fbc38718cb4ca8ce9e82f2615a7ee02eef6e047867fd39f31b042345472443d6404f8bcb0eb7fd97264b4cd09c386b3d17baf
 EBUILD evilwm-1.1.1.ebuild 1116 BLAKE2B e9bea1716873f640641cf308013c04461b410ca13f974cdea94f73145f83c7cf8895919a204d15af4cd5dc8460e017d75561211b2df7c7b4f230e02de3ed8797 SHA512 52926c749e4adcfaeda8b2e4917c506f9400dcfcf1e49c24e63b7b6182825a4c98fe9596c47aae00b23b139d727a90a9dbb13b81cc262f99fa596ebf8cddfb0b
-MISC metadata.xml 629 BLAKE2B 8fdd2e1f8890c3f40133a3026b38e99ca807fbb861def884e574e5d3faef342fe39b65a8da91b0d0d5cd23a89f996cc47bd2113a40ecaf9996def58438922d24 SHA512 b4b8fd73b2ec512b1307265bbe7f5c4c67e8a78beedda86beecb9fd8cce164b776ccc75a586499c0a6cac7f31cb54908d767ad35bb427ae03390057c77727999
+MISC metadata.xml 659 BLAKE2B ed07353a86204aabb96e8c43786e31f08ef95b205fa1afcd0adf04c2c5ad6c82fa264044dfb60d466fabf1918d57bed1c8823a99c8b8eff2750ca1459226327c SHA512 79fe486ba49473739f665378545fa1e95e5916c08fede1829b47e23a142a65507b553736b881088cb9f00382cd6fd0ead25da32185ebd5c555d7b007fe384afb
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index 623c55d7f8c6..34d9cefab659 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index d2c3ee171851..c66f70f5de9c 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,8 +3,6 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
-DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.8-r2.ebuild 4107 BLAKE2B d068e2640a47f2e90c67eb517803a42b0fc86f7ade14a8cc9b41570e05af25d888ec3c25d66fc2a15bd5a2da2eaf3f641b927c978c06c2749dfb2676bf960985 SHA512 0a03e22394e6342a8b7bbfb76f84f150507efdb69959ecf536587b45e88d21d9acd991ce23256a442eb86fd3b09c441e8cb6d1be3d1134f80c47e43364150707
 EBUILD fvwm-2.6.9.ebuild 4104 BLAKE2B ec39f5ffa582099e828d193ef0c1ace8d855ad1fbc2ae241af9e6f383f381702fe0a4a5821034d0af4007b0d3a5130229996ca00ddae7db995dc0f17f3569ef9 SHA512 2454a4f684d60144d70d8a93109e4336a627c736dc3fe3f4e75f93353c1508117e5916be63a555465bb664430ad6720601a703b2e9ac469b9300c5105bf935c9
 MISC metadata.xml 707 BLAKE2B 6b51c0eccf9ca01664d552a5f2dca340bbabbbd4753fd2248923c3ed73df76279de6001790c188ed7ccf7c6d769648c8e271f8992492be215cd609f62aef461a SHA512 1be8383a2a6f0f4e4c4ae8728657783bbd7ed98d23bc35453eef5de18a898136ff92dc82e1acb431853f8cf42c8fea3fcb56efe5d448a6657bbe4b9258fa6086
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
deleted file mode 100644
index d479aafd388b..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,157 +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 desktop
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="https://www.fvwm.org/"
-SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FVWM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/libiconv
-	bidi? ( dev-libs/fribidi )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	stroke? ( dev-libs/libstroke )
-	svg? ( gnome-base/librsvg )
-	truetype? (
-		media-libs/fontconfig
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/Tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
-	rplay? ( media-sound/rplay )
-	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-libs/libxslt )
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Enables fast translucent menus; patch from fvwm-user mailing list.
-		eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
-		# Allow more mouse buttons, bug #411811
-		eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-	fi
-
-	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-
-	# Fix for Perl 5.28
-	eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-		--enable-iconv
-		--enable-package-subdirs
-		$(use_enable bidi)
-		$(use_enable debug debug-msgs)
-		$(use_enable debug command-log)
-		$(use_enable doc htmldoc)
-		$(use_enable nls)
-		$(use_enable perl perllib)
-		$(use_enable png)
-		$(use_with readline readline-library)
-		$(use_with rplay rplay-library)
-		$(use_with stroke stroke-library)
-		$(use_enable svg rsvg)
-		$(use_enable truetype xft)
-		$(use_enable xinerama)
-	)
-
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="maintainer-needed@gentoo.org"
-
-	# Recommended by upstream, reference ????
-	append-flags -fno-strict-aliasing
-
-	# Signed chars are required.
-	use ppc && append-flags -fsigned-char
-
-	use readline && myeconfargs+=( --without-termcap-library )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	make_session_desktop fvwm /usr/bin/fvwm
-
-	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
-	fi
-
-	if use perl; then
-		if ! use tk; then
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
-			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
-		fi
-	else
-		# Completely wipe it if ! use perl
-		rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# Utility for testing FVWM behaviour by creating a simple window with
-	# configurable hints.
-	if use debug; then
-		dobin "${S}"/tests/hints/hints_test
-		newdoc "${S}"/tests/hints/README README.hints
-	fi
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	dodoc docs/{COMMANDS,DEVELOPERS.md}
-
-	# README file for translucent menus patch.
-	if ! use vanilla; then
-		dodoc "${FILESDIR}"/README.translucency
-		ewarn "You are using a patched build, so, please, don't"
-		ewarn "report bugs at the fvwm-workers list unless you are"
-		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
-	fi
-}
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 368ec6308376..dc7bfe8c8a16 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -3,4 +3,4 @@ DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
 EBUILD herbstluftwm-0.9.1.ebuild 1055 BLAKE2B b3d76f81274b4019a10bfee919de68c5c52f391025514dbe0c6ffcadf84e50db7a5173e15d553c86dfd206b594483da32f383b866b81bbd14e58757536f5a769 SHA512 db8fb6e23a86b722c3ea779cffe2a13167330e8be46fc07e770d87361ba76ce4b51c4773966a8730da2f2182eb60605daf5a7a79c82056f872ba1012e97c4e97
 EBUILD herbstluftwm-9999.ebuild 1044 BLAKE2B e65193b1bd6c7b42ba0976b298dd8e2df2bbdf18fb5a623224a2184c897e70db2a14124729fa81753f6fd73105f3dc65711305a94d2de04d5140a127da08744d SHA512 94d9732c9805962a2144d9fa1ac9b4f136f7960cca790b3059a6aa2f76e157eba13ed291d113429e942e1858e8a90e40da76883b9ed5b964ee304e78f0b4e9a8
-MISC metadata.xml 535 BLAKE2B 0a0d6cc68bc3e5a21d1c561279947f2174ef91ba6d18c487720069928462379a6c4c23affa425236364b711a40f85faf98af78b5f28ea5148f9dcdb8795252f3 SHA512 34849ec9fe1cdd2a40af6c334844c648eb8d26fda26331618adb285d7c9ffa7360cbb07fd963e8a047ace524abee7b17085b38ae153a83c52127b1909b278b5c
+MISC metadata.xml 565 BLAKE2B 8a6246f89ec1a463c527d2daff5dc31ec574d6d41bc026255fe4a09e4fc5f1d7136df89364ed3bb6bf46a3848ad19f3737261481f4c217c2bf6004e0ad5072f9 SHA512 08a447578d4b0d98efc301024b182e4f1407040b4c37de73fab0e65990e834a38b3ea7dc17f15e96ea8bde5336d45d30d881f9169ccd461763d7d4fd8d098e99
diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 213c69357452..272d4aa6b4c7 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>flo@geekplace.eu</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 06fbb031539c..6c40eeb43df5 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -9,4 +9,4 @@ EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039
 EBUILD i3-4.19-r1.ebuild 2110 BLAKE2B 0078d8bb0fcb1e78bef247c29ef90f66474fb7d822efb5fca002827bb1d71de2a375a38671df84e3525bef8a73a0283c4b5b26f774379dae35cce2ea2c5b02d7 SHA512 97c3107d63ba0876bc830aba788317144ca32b4400efae541316db3ffad6fd2718762dd7abc733e9b45a4935654951b41c69399d7633b953da42a065149b66ae
 EBUILD i3-4.19.1.ebuild 2065 BLAKE2B 0f9ce66d98a51afeb39aa25a3a83a4eeaeccb6f1c80d9964c5ddda090c2a7be6883abd012e2b5cfdf78940acd77210648d1a90d50c6f909d0fd8d4e45ae19ebf SHA512 ef7fdd8536f8218806a9a23f17612e7f349f4fa325b8150fc8ac96dac2c5e1419f007b5d55491fc076fbe94cf0c10a36d8ce864b2088ccf19e60288c88a21db0
 EBUILD i3-9999.ebuild 2065 BLAKE2B 0f9ce66d98a51afeb39aa25a3a83a4eeaeccb6f1c80d9964c5ddda090c2a7be6883abd012e2b5cfdf78940acd77210648d1a90d50c6f909d0fd8d4e45ae19ebf SHA512 ef7fdd8536f8218806a9a23f17612e7f349f4fa325b8150fc8ac96dac2c5e1419f007b5d55491fc076fbe94cf0c10a36d8ce864b2088ccf19e60288c88a21db0
-MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
+MISC metadata.xml 484 BLAKE2B 596d482da71281b74bc30b3c9045f9a4cfce10e14ad5ac0fe3d81aa6868f0029098f60820ec1bfdeddd95648e2ea2d2f9caa0a231e597a97af389f874d9cb7da SHA512 d0ce95d82fcbce30709dce848d254b5d7b0aa55f333c3b51e974bc17b6ce1957a6a841415d06b8bd5ce8796a0ebe57a877230fa1b0a9b3158ad13666590cf930
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index a37f96f2741f..b9018b8fe410 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
 	</maintainer>
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 80d30f9ed473..d7676ae5c206 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,4 +3,4 @@ AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d34
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
-MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
+MISC metadata.xml 1981 BLAKE2B d1419a627e507752b0656e97a9d9189c490de18fa8e8eb0173b67003dfc17ffeaf7d643d6fb077aa2c44d7ed82ebcd2836379d8c4cf19538e46a46376b80e570 SHA512 90256620e79e215798328a5afafe0a0f39c05843f58920ec3ff7aa46ff7b3721c01a660aa5d9a32eac65227cf0893e1a1273fc879e7c18747365d4ed66d0fbc5
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml
index 9855a5e82816..7e9a1bcd0d55 100644
--- a/x11-wm/lumina/metadata.xml
+++ b/x11-wm/lumina/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>grozin@gentoo.org</email>
diff --git a/x11-wm/matwm2/Manifest b/x11-wm/matwm2/Manifest
index e7b010e24f31..44d1a6a7c161 100644
--- a/x11-wm/matwm2/Manifest
+++ b/x11-wm/matwm2/Manifest
@@ -2,4 +2,4 @@ AUX matwm2-0.1.2_pre3-destdir-fix.patch 1104 BLAKE2B 696ddba152f6283bf317d6edab9
 AUX matwm2.desktop 69 BLAKE2B 6eda01e92285ecb8e56e701c2d63995223274b31f140e5f30fc0b7f806bfbf0de2c7efc592e9aac2de56b2cb831deb145d4e4d424353e1515f48b98d2516dc83 SHA512 1308539065599bf807580868510ea772bc09b5e06c6cc184ece5faf100fb14cd424f47e030bc77d62525b7751c874e7313b73444b85ab07076f31bacdcf24e3e
 DIST matwm2-0.1.2_pre3.tar.gz 860231 BLAKE2B 5734798c1833a02783c9ff7ed52c2b0ef95d5c3b3edbc51a4e8440f45109b6f3e6cf85f64ce37c9dcbfff2e22843b7f57c23abcd2f5012ffa53fac0cbfbd766b SHA512 30c55c6090015432bf99853f136baebb5b4c1301d5f922dc933e0141caf18d6891a982bd89e22e065c146c0c5c570d0e8aebb7e4c708dddde9b0570b7ed5f9ba
 EBUILD matwm2-0.1.2_pre3-r1.ebuild 1392 BLAKE2B 0a9af7b79085d43f77f757232d92fb46528a3a7b75cd12edc9928fb09c4b099ebf9453f919089a26edaba604e077d0e0b12d8bb0c68fee427d381b2a3d682133 SHA512 4836810d974c4f3848c9ceaf4b219c37f11f4f54a93f3258431cd171bef2385cfb1600d5bc27242310a96d7f07861d83e6277b95f5e256482d95437e46ed776a
-MISC metadata.xml 244 BLAKE2B 68503e38f8ee5114829cb49fb095b161e21ac98a298e594b7210608817457be4819536b3c27862c7ffdce1e3c5fc5413c95406153a24d8da3d91f377f9d9eb14 SHA512 ab9836137510572de701a29e6c8f81e7ec496e1e6b29119b5bcf183e4f7e99b1c8790c123054abf8cecfb4e93d427a42e61b862590c9badee70ec4736ee82eef
+MISC metadata.xml 244 BLAKE2B d4098316159b0fd37c931c8581e9a0fdc69e3aa92573adcef0a3da13720961f4c6d377102887a437edb6e982718d9719046ddb8e1c0483e66bc27d8a47caa01e SHA512 a3a517a980ba62820e0afd3adbccd88470789a809861651cf324ab7b4486a0c25fab285e19ceb78290107410eca7acfa82959aadedf55e4d559894b5285aa0d6
diff --git a/x11-wm/matwm2/metadata.xml b/x11-wm/matwm2/metadata.xml
index ff23f35a28b1..3971befff8e0 100644
--- a/x11-wm/matwm2/metadata.xml
+++ b/x11-wm/matwm2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/x11-wm/metadata.xml b/x11-wm/metadata.xml
index 4e0a0d83bfbf..49957f81d826 100644
--- a/x11-wm/metadata.xml
+++ b/x11-wm/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria x11-wm zawiera menedżery okien dla środowisk X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 649ac0bad038..67df17a99496 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,6 @@
+AUX muffin-4.8.1-slibtool.patch 6241 BLAKE2B be4f0ed369f5f500201d4ae22238f67deff1e1e14cc4725c408253c3ce120dfe02b5f9c30ca6505cc3c6611af88daa3a74f6606f74923cb3c00c92ffd89d700e SHA512 85b986cfcdd0daa06cc5ee95cf23c6f0b2957080dc726fec840581227d154583f5a928157554830dad3c80cd87a82d1312d72c650c7764a1fe3e93fd5d37c9a4
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 EBUILD muffin-4.6.3.ebuild 2204 BLAKE2B a5c62fdb96cce1b9b3ba424c801caab4cec0fbc70abf42c8f425e56a6afc5fd27ddf9834a74b75d9ccfc908728b202da318afe6434f62ff2fbc873972bd3028d SHA512 1a3af4ecd5b38aba64ab9f7d802e615d8c8080b59577e51b9c1197d4863f257133a90af97f7bc1308d1d7958fa3ca365366201dd8e9c2036c676d6d8e32aee36
-EBUILD muffin-4.8.1.ebuild 2338 BLAKE2B 9f88d9f356e4cc3033836d2c659575b82f477fa178fb1dc473d445d1e6b7407441aa268e4a76a590f0a0709d4dad14668eeecc52a71cf199b3a32c3fb25b5682 SHA512 27d26ae3fea92ef20a89e7d9503d31a0c3128776292b31d5b80b3f510e566fc023565806d3753587594581de2f7aaa95ef6784a172a10d442c56a14ec01cfb8d
-MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
+EBUILD muffin-4.8.1.ebuild 2393 BLAKE2B a133ddfaf9af27c6c5dac92cc6b5664214cbe75c2299f724a6eeccc178391d0469664f5c2d54d955003f01e2f8139d6e56d256786bfd1ebcf794e3e4be2968e8 SHA512 c810f6f0aeacccb32f2b5d4e1dc512a455191832e2b4a19a4b693c71c7144f8608f71a088ce7a22ae5143c026ccbb8ad6c798697fe51563457b787f884e8611f
+MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
new file mode 100644
index 000000000000..65f70b22023d
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
@@ -0,0 +1,146 @@
+https://github.com/linuxmint/muffin/pull/577
+https://bugs.gentoo.org/767139
+
+From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:35 -0800
+Subject: [PATCH 1/2] build: Add missing libtool depedencies.
+
+This fixes the build with slibtool.
+---
+ clutter/clutter/Makefile.am | 18 +++++++++++++++---
+ src/Makefile.am             |  9 +++++++--
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
+index a6366f4f2..ecfa568b7 100644
+--- a/clutter/clutter/Makefile.am
++++ b/clutter/clutter/Makefile.am
+@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE
+ 
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
+ 	$(clutter_include_HEADERS) \
+ 	$(clutter_deprecated_HEADERS) \
+@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI
+ 
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_
+ 
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
+-ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9cb3af14e..37274a4bd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la
+ @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0
+ @META_GIR@_PACKAGES = gtk+-3.0
+ @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
+-@META_GIR@_LIBS = libmuffin.la
++@META_GIR@_LIBS = \
++	libmuffin.la \
++	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ @META_GIR@_FILES =				\
+ 	muffin-enum-types.h			\
+ 	$(libmuffininclude_base_headers)	\
+@@ -383,4 +388,4 @@ install-exec-local:
+ 	      { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \
+ 	    } \
+ 	  ) ; \
+-	done
+\ No newline at end of file
++	done
+
+From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:44 -0800
+Subject: [PATCH 2/2] build: Fix undefined references with slibtool.
+
+---
+ Makefile.am                        | 2 +-
+ src/Makefile.am                    | 2 +-
+ src/compositor/plugins/Makefile.am | 9 ++++++---
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cf8382b67..c5d589ff7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS=cogl clutter src po doc data
++SUBDIRS=cogl clutter src src/compositor/plugins po doc data
+ 
+ EXTRA_DIST = HACKING MAINTAINERS rationales.txt
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 37274a4bd..b75b1879f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ lib_LTLIBRARIES = libmuffin.la
+ 
+-SUBDIRS=wm-tester tools compositor/plugins
++SUBDIRS=wm-tester tools
+ 
+ NULL =
+ 
+diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
+index 09ab325a5..241b514c3 100644
+--- a/src/compositor/plugins/Makefile.am
++++ b/src/compositor/plugins/Makefile.am
+@@ -2,9 +2,9 @@
+ pkglibdir=@MUFFIN_PLUGIN_DIR@
+ 
+ AM_CPPFLAGS= \
+-  $(WARN_CFLAGS) \
++	$(WARN_CFLAGS) \
+ 	$(MUFFIN_CFLAGS) \
+-  -I$(top_builddir)/src						\
++	-I$(top_builddir)/src						\
+ 	-I$(top_srcdir)/src						\
+ 	-I$(top_srcdir)/cogl						\
+ 	-I$(top_builddir)/cogl						\
+@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
+ default_la_CFLAGS   = $(WARN_CFLAGS) -fPIC
+ default_la_SOURCES  = default.c
+ default_la_LDFLAGS  = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
+-default_la_LIBADD   = $(CLUTTER_LIBS)
++default_la_LIBADD   = \
++	$(CLUTTER_LIBS) \
++	$(top_builddir)/src/libmuffin.la \
++	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+ 
+ pkglib_LTLIBRARIES = default.la
+ 
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 4339a3ad386e..8c9ad1344809 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 28b45d8ec772..2e14e5cfece0 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.1-slibtool.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index b39a61f910cd..b5e2e164542c 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 2729 BLAKE2B 3aa288cf5e8f8a26d21e4ff8ab76280afdfb2e18f159edf80244d1c58527f5eb2475ea9e77eec6f0f9ec439d09c2bdf611917bc2eeaa013868bd05d7d75a15a7 SHA512 f5d19a8058390dd0b1dedbca10e794e0805a1112b893b63972fd5d9a1e477dd33825b6e982f7c0ddda0a02a7da20fec2158a3720b2846e7b7df8df062a5981c5
-EBUILD openbox-9999.ebuild 2736 BLAKE2B f9ced447b3c49bb9b396f2253df950922390b4e1ffae83b5d6cb1eea9b61be1f3e3d7e1746d96393af587a5204942f7de61ce57f71870dae5b85afa6f583d5d9 SHA512 8f1905f0e53584397e20183808681dd2cf0db99b823fb829cf697d2164127124549d35cfa13d7b532235f4840a453a51dcd8d527fb216d5fadbe0f4ed06777f2
+EBUILD openbox-3.6.1-r3.ebuild 2726 BLAKE2B ab6e257d7b26587ee55aae15916daa337202c759ff56de21adda9e05398ad454e3a14aeec02d5f78bcaaead9b5f325d84ecc801712eb863ca28fca85cf6e0d83 SHA512 48d17b4e9e73594c7e2b0b2f24303d5e908e7524bd9c4d33e75970d1f05a52192190ed7e035dd453045bed4aa2ccec10ddad2b700990d3ad68b637ff97aa455c
+EBUILD openbox-9999.ebuild 2733 BLAKE2B 27aa4985831c42d02302b822f5116dfa0c42f052420d858c7c9e469f2228b0f81bae74d3365fc8a1cb88d3cb7bfd39f6e7aa6c8e99046842ffb6f0952ce28e26 SHA512 595f05188de1d3239fcacd4eebcab66bd9fae7f6c322ba1f3ca7e5fca3867735fea6c7a9b6778344c3e52d1cc0845b46c0f936debb9cb3be1ec66eaa1f3e607a
 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 0737dc46d366..5a00c19811e0 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools python-single-r1
 
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/wiki/Main_Page"
 
 if [[ ${PV} == *9999* ]]; then
@@ -21,7 +21,7 @@ SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -51,8 +51,7 @@ RDEPEND="
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
@@ -62,6 +61,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+pkg_setup() {
+	use xdg && python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
@@ -71,25 +74,26 @@ src_unpack() {
 }
 
 src_prepare() {
-	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
 		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
+		m4/openbox.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
+	local myeconfargs=(
+		--disable-static
 		--with-x
+		$(use_enable debug)
+		$(use_enable imlib imlib2)
+		$(use_enable nls)
+		$(use_enable session session-management)
+		$(use_enable startup-notification)
+		$(use_enable svg librsvg)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -106,7 +110,7 @@ src_install() {
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	use static-libs || find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	if use xdg ; then
 		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
 	else
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 916dd0c62298..f608dddb2d71 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools python-single-r1
 
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/wiki/Main_Page"
 
 if [[ ${PV} == *9999* ]]; then
@@ -21,7 +21,7 @@ SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -51,8 +51,7 @@ RDEPEND="
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
@@ -62,6 +61,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+pkg_setup() {
+	use xdg && python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
@@ -71,25 +74,26 @@ src_unpack() {
 }
 
 src_prepare() {
-	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
 		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
+		m4/openbox.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
+	local myeconfargs=(
+		--disable-static
 		--with-x
+		$(use_enable debug)
+		$(use_enable imlib imlib2)
+		$(use_enable nls)
+		$(use_enable session session-management)
+		$(use_enable startup-notification)
+		$(use_enable svg librsvg)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -106,7 +110,7 @@ src_install() {
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	use static-libs || find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	if use xdg ; then
 		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
 	else
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 985fe8236d69..3672142234f8 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -2,4 +2,4 @@ DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fa
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
 EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
 EBUILD page-1.9.9-r3.ebuild 1331 BLAKE2B 13fefcb79f087ebd25c92e4ec6d0e35eb11e2250bb2d7ae18d8bf2dd3144a3a5dd0f9dee75ed3d5faebaed2280bf14c9f934a24e9d906d7678ea3aa9fcdd0336 SHA512 225dc789aa4eb83a97a6d2be3e83e180491ff82a8c889bffe8844abe2a5603d38be947ba47471a7eba5e541a03c051d543f9ea6a8be559f6d6ea435012588078
-MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
+MISC metadata.xml 528 BLAKE2B a501939dc2360b17c230b8356b261be94f2e5844c32ec6086f1f7dde2f8aac3a2ffd8226221acd0aaf6e44edebde3d64c618741c0ebbabcac0374ce5cb1cae4a SHA512 2d9525c2a5c2d98fb96d9c5ce5bcd68c1c7bc3ead9b66abff36656000b68d43771cbd204ded7302fbeab08c9bc62cf4793ff1eb66479522a63e464a42f68f9eb
diff --git a/x11-wm/page/metadata.xml b/x11-wm/page/metadata.xml
index e445535184ef..18f0e72c5a6c 100644
--- a/x11-wm/page/metadata.xml
+++ b/x11-wm/page/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>gschwind@gnu-log.net</email>
     <name>Benoit Gschwind</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index abacedb07b0f..521718d13147 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,4 +1,4 @@
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
 EBUILD pekwm-0.1.17-r2.ebuild 1835 BLAKE2B a2a208181d689d2ba907baa04f4cad5aceef27e18a7e3db14ababaf910043b52dcbab61f3326b3df2d5190ee1176afb5589f1b53483ccd7e1177038773cabe24 SHA512 737636067aff402698836f7fcbeed26f587565febfaaf25f09fd3c5a51919499cdc506da3332c250f6d9ba0a497da66317a8c1eb1c64f40fde0bb6a901225dda
-MISC metadata.xml 968 BLAKE2B 61ebb7661defcb80be3a193ea230be7d657503fe5a4885496fe58152bb63b323f6b94de08b8df52608b640ceba2155c5041a2e452558093571d0bce55b15fd8f SHA512 02042a7c09730767185d59cbd0152a0286d8c1e8c7d9bdcbbed6ed9856c576372dbd3f4375b389d32f207939bdf7a4e60db5804bad07e81d689b79668e77bcba
+MISC metadata.xml 998 BLAKE2B fd22ebf4bfca029c0af07a9de98fab0d88d34bd2b2e1ddfab28cec721f1b7364e036dcb8c2b35f578acc0eafa3ca546a8635d18ceb7bf36a838537e396f76731 SHA512 a1e7d13e9dfea0b932205628828747004315fc87748be67678129e07c12dd7df25acc38d8d9604464679c036a1fd30d021cdb60fe5de019da3c89e4f5e2661df
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 2b003ee6b95c..aa4415c0c533 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>linbug+gbz@posteo.org</email>
 		<name>Andreas Schlick</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 4d1558069448..efbfde7ed908 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/metadata.xml b/xfce-base/metadata.xml
index e644786f8d3f..8035fa4b3c13 100644
--- a/xfce-base/metadata.xml
+++ b/xfce-base/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria xfce-base zawiera podstawowe pakiety środowiska XFCE.
 	</longdescription>
 </catmetadata>
-
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index f1a7f4d76595..c2732ec9200e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -8,4 +8,4 @@ EBUILD thunar-4.16.3.ebuild 2073 BLAKE2B 7ac1810f6fdd307d26f7ac5e0d4e60e2766405a
 EBUILD thunar-4.16.4.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
 EBUILD thunar-4.16.5.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
 EBUILD thunar-4.17.0.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
-MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
+MISC metadata.xml 372 BLAKE2B 35cec7c8487a748045795a1a2467878a3ba2df30880256a0add3757f2785b01a09f2f30046f5f02b28434ca2c7d683a409e1a6e2461d1671bea8b9198b9e92ff SHA512 0e12c13eeae06f579b45cedd3b61a158958ae3d08f181e289dedaf04e69629de78f9a8baa0c9baa51f66285e8c6c82740dc2453fd655152d049d4412e9883a3a
diff --git a/xfce-base/thunar/metadata.xml b/xfce-base/thunar/metadata.xml
index d844c26059c6..1fda763fef6f 100644
--- a/xfce-base/thunar/metadata.xml
+++ b/xfce-base/thunar/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='trash-panel-plugin'>Build the trash status indicator plugin for
+    <flag name="trash-panel-plugin">Build the trash status indicator plugin for
       the XFCE panel</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 32110c61b7e9..88864586084f 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -2,4 +2,4 @@ DIST xfce4-panel-4.16.1.tar.bz2 1381003 BLAKE2B 103d1b60c13758ad5e3f139d3bc66923
 DIST xfce4-panel-4.16.2.tar.bz2 1381569 BLAKE2B d4b8455e31f942d0facfc0d90b14fb050142b3d8b3d0e61d5b687f973769e2888ea7f058c4f6a86f96dbd67329719ef49e72896774ac36591c2793847aa411ba SHA512 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d
 EBUILD xfce4-panel-4.16.1.ebuild 1524 BLAKE2B 6bff168a5b40c0dc7c61c455c80cdd17be3215e5e8645c56f080d50375a73bdd61c8d85be244251f1528f396336b1a397247a2a081cc741de1c95392a745e786 SHA512 bd93a9220fde1b4cd65d8d086074b373eaddadfe12f7d9d6d6907ad1a70a31b142a3a10fb3d8e843f306788b8ca36a536fc0efa57786345f0c39d7f05b1e62bc
 EBUILD xfce4-panel-4.16.2.ebuild 1529 BLAKE2B e05304f973f50adc97528efb98a6a161f64add9ef09953ce9ea015a36a0f70db0bf3f24e6bf8e045adc4ad82037983d4de0ef1afad8f1c3ee161ecb7fd1e1d65 SHA512 6b3fee88d609eae1b5d4aaf56f699453916b7be499cc7beb374c09186978084cd14c21bd439c8cdfa416b1109bce28642d872b407a451f58e05d19e830988741
-MISC metadata.xml 376 BLAKE2B 84b7637bb8b18e886b31631f243aa37c19508c4c3f5540e6f11dce05f49fd4a637e2098d43a6c57708a11b9d5520edad6d0a873712133b96e3f707f0660749a2 SHA512 a8dcec846dadd3d3b9c5555049b7d4a6ef1b7d4bcbc3f0ccebb8f92e2daa40ce443e47d3e850f47d30e2dc745804fb2a29f20b2441eaabc8cc9e62262cbaa0c7
+MISC metadata.xml 376 BLAKE2B 8e3bae72680451c622ad0c7594d756af6027e70fcc35e6f48fab7b63f511322034311ef496595c9edf301d668f4aeea3f8d6950e8db5555b3f90905d60aad8fb SHA512 75403270836578c8c7207777feac8b88b784976f3b887c472d29fdfb5bad7ad738eeae4ec0739a71993988f41378da1187b93b010cddc2d227a59ae9995f67a4
diff --git a/xfce-base/xfce4-panel/metadata.xml b/xfce-base/xfce4-panel/metadata.xml
index a510c7560491..3e33adf511ff 100644
--- a/xfce-base/xfce4-panel/metadata.xml
+++ b/xfce-base/xfce4-panel/metadata.xml
@@ -6,7 +6,7 @@
 		<name>XFCE Team</name>
 	</maintainer>
 	<use>
-		<flag name='dbusmenu'>
+		<flag name="dbusmenu">
 			Enable <pkg>dev-libs/libdbusmenu</pkg> integration
 			(in status notifier plugin)
 		</flag>
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 89a41b139377..59dc5db727b2 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/metadata.xml b/xfce-extra/metadata.xml
index 94dfb874be00..b8a10c78272e 100644
--- a/xfce-extra/metadata.xml
+++ b/xfce-extra/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria xfce-extra zawiera dodatkowe pakiety środowiska XFCE.
 	</longdescription>
 </catmetadata>
-
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 30cc4bd8895e..0f0e78f3eec7 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b
 DIST xfce4-hdaps-1.0.3.tar.xz 350936 BLAKE2B 37d80bafa831be68b55f66c029ec120b67ea1a21760291f05cf11587161b295698a5994df3abb9eaa2c3ff94af7b0f43a3cfd04cef31993d741918b4eb7e8f49 SHA512 9263a6d63b4e4cd9729a87ae5150d10a6ef3a2bde48b5a82334e948d884869ed2492953eaef4df08b6a2155454ef81af6b83e70f1436cfaca4f2fd8e39b5ac34
-EBUILD xfce4-hdaps-1.0.0.ebuild 812 BLAKE2B 7c1212db7794e5a5f274175110a51d0929f0a5c9782ff4e0bbac111e902a23948130aaef3684621724c07379ba0280c8169020cd9cb31f7e0f60feea54529159 SHA512 7ecd673d2ee4c3df5e61b62933c35f37bba522cc09236db0453bc12c99697dbc1106ca510650cec1793eab4e96d25785a53a2446e4f639642a990533c66ee413
-EBUILD xfce4-hdaps-1.0.3.ebuild 814 BLAKE2B c05848b59d3ba36a752c296d605dd16b1de0f9028b955e9461705d80b6c9f64380cf70900528a71a2d150b6b38841856514d3cb03ddf801a9c5c0e4fd30b69fe SHA512 2c068fcc61ee5b08abb13e45f01afbb68ec1270f9f61be917eedcc932bc6adfd423fb420533e5fbede32c001daaad414423b56ed82570062c240a9e79262df13
+EBUILD xfce4-hdaps-1.0.3.ebuild 812 BLAKE2B b5bc5aaca2268ae433885e84f3d5a155f74ad403e7f87b1ec2439ec94a7633dc52884b3cb03030260d959aed41d931fff7d7daf6e60038b4e3f5984bbc5ad198 SHA512 a4abc972c4e293658354b63d7dcc94ae9b886d3d4566563ab51b506ac6573915c5ce4cbd2f55d36281c4d471092f89346a54251baa25f0c8201de78ec2b641d3
 MISC metadata.xml 360 BLAKE2B b052657455cb7c1296e68df21944f2331439161ecbfd56b0633323cdb3afc82da8b5b66ad6ac862ef107643ea299b844a57f6f7faa50f83917a3dbae06c5ff4c SHA512 9b00df4ea0e92b1b12cfef2479bca9dc2742df3e8bb0bbfa1b633c3e3aaeeda5cee0add8cb64c30e13d82166a36bc3010dc91571c05d5d3d3c55973ac1981b23
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
deleted file mode 100644
index 01862e4cc199..000000000000
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Show the status of the IBM Hard Drive Active Protection System"
-HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.14
-	>=xfce-base/libxfce4util-4.14
-	>=xfce-base/xfce4-panel-4.14:="
-RDEPEND="${DEPEND}
-	app-laptop/hdapsd
-	app-laptop/tp_smapi"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
index 2c27674053ee..7fc7a5e90a57 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-util/intltool
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 58316a2193cc..318f8ab41510 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-power-manager-4.16.0.tar.bz2 1234968 BLAKE2B 0299bc293769411384b34c81c907f75ba6503db11f1636366a599938d37eda0843e1850c584c37186529c0c97eaca73bc5d488d4916087a42c5c5f68ae8787c8 SHA512 1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec
 EBUILD xfce4-power-manager-4.16.0.ebuild 1561 BLAKE2B 1b7e529266b37dfd65783c0226adb6608303c81117ecc2f9db0c817e7f946da3ef4a20b0c67e4e6338a1e6195f2c05146e50c91d69cfbff7686545db3da87454 SHA512 851864eba875fcca2f331a54afebecaa4147c8b4e45b1fa8971141e5260638809fd47309b4a874b766a6701f930636f55db752c376435f93d6118d92fdbb1a32
-MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
+MISC metadata.xml 360 BLAKE2B 3e592739933be299c09cecc119d3601bdeeab3840290e33471ab52bcd396cd3d880791ae1abdbd817ab1eeb18c4228b89c15bac935e13a954a50036b05c3488a SHA512 942ff8b76e4fc521d03565bf092ca433fd1ee0093a785d8cba514f671c32e712b83e1091564e626a55e49f947de1808ac58cb2b101008bf992345aa1be658508
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index 468e985aae47..fcf85424ad68 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='panel-plugin'>Build the power management plugin for
+    <flag name="panel-plugin">Build the power management plugin for
       the XFCE panel</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 4bd16517781b..d1d987601b08 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screensaver-4.16.0.tar.bz2 687978 BLAKE2B 1656027af61a50ab97fd3d5744f0ab5f1a81353c64a2fd935a6113dbe2fce5c4b2a22c5f81f15d06d09c3b292f82afa95ce34a07facb5fffef7e6fef712cae63 SHA512 5fa0381395b48fdfb5bdd9b4cafe1ec625d0b7fb9600d59c22c42fe0248fb4b99dd18a94045df3ecdc77635f7271676329c658f25003a9d8d6f9a9a66739dbe9
 EBUILD xfce4-screensaver-4.16.0.ebuild 1786 BLAKE2B cb7c011b60691ae0ddfedd916306f12fa62bd8cb63e260aaa00f3bc7149e0d2a2237cb480c17b89b8cee63571bcc5b4c2eec34b064f4ee7c8a36f3f42428c1c3 SHA512 db10a24b48b0b5a492884000e27d1b9b69a403cd18a6735f56bd2afe59ee644e48c11b8ee5a7e22bf2c30447639febe609aae36fd0ca430129135bd878f173bc
-MISC metadata.xml 291 BLAKE2B 533c3c70954a738e8b239f8ab6ce7b45702bf87d7151e8182ae6142cf8a1611c9d24ab4e6e95ad8d71606e802369536a669e313493e3527d6daa8d1e5a61ecdd SHA512 f86de2f82f08b0a0372ec018cdbebbf87e6c0e7e4f4e4c78c1cbeba0a2cc6ef26f17a8f84b85195961af8a690bf3eb2b45bf415be43e3d9a791e296d7f4a74e1
+MISC metadata.xml 291 BLAKE2B 846c735e060f88ab47a63eac0b8c6aeb2dea0b4c480eb6a524bee681984073a9aba951cd4b8b629c98d593bf30ff054da166b00c386e2b06becc63ae55ee8ff4 SHA512 c86bb02a44ed2f17785d14f69aae52cb67873fa21be792e57d20eb3a04770ff4c2275537a97b9c9e71ee630a5a1185b54093dcb47e1bff9114cdf7c9edb2ad94
diff --git a/xfce-extra/xfce4-screensaver/metadata.xml b/xfce-extra/xfce4-screensaver/metadata.xml
index 43b2b0675580..6c0b91d04d17 100644
--- a/xfce-extra/xfce4-screensaver/metadata.xml
+++ b/xfce-extra/xfce4-screensaver/metadata.xml
@@ -5,6 +5,6 @@
 		<email>xfce@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='locking'>Enable screen locking support</flag>
+		<flag name="locking">Enable screen locking support</flag>
 	</use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index eba1ad80ad69..3512db14c170 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-whiskermenu-plugin-2.5.3.tar.bz2 175578 BLAKE2B 8641506316cacff45d88db4817b5a7d949c7f31b0b2f6748b67c54e668852653f706891d62b0e52ded51c58d59f4ba853df137fa0bad548df54399b7b174b486 SHA512 b293bfeef07ae07d2b4654de7aee795ec7790b291094dbd2655a271f9ad7c7de739b2d4b8c97aee7db85bcdf116c2f1b1150e1875ec2ba2b8bf0ec9f13561ac5
 EBUILD xfce4-whiskermenu-plugin-2.5.3.ebuild 919 BLAKE2B 6065f34d10c8960a37718e9cf6b7ef5a9f43dbfd02b11a33aa7dbabf7ce15e7b9bb6864fe49c73b07c77a77d31956228e2324e9bae859c00e070184ec88a35dd SHA512 b7a9b0f6e53288de8f8cedf623583533fc0587dabee8f10e0b3b14965efe48493f87ecca12b4a0dba75276e5d48b68e0ed9ad8edc969de1c42aa61019da667fb
-MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
+MISC metadata.xml 2113 BLAKE2B 68f047fb63b7a2bfab087b7d3db96dfa2c2a4554cf01c8f4a56e269c25e7808219fedbb3589db6a7ac3fd396cae20287aab7e14570e17c47ea52cf413ced6a3b SHA512 c9e814a3b87946c6c09910e63ce9827fd7426423eccbb8f80cb6a36c26142fc5e9d30904589ef52b5b0fb82bd6f6326c854760886d0014069c427be8f29a7e1c
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
index 96b95c5cd53f..fde5621f18b7 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
+++ b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>christian.tietz@mailbox.org</email>
 		<name>Christian Tietz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index a547ca7a5273..84ec74ccf45a 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,7 +1,9 @@
 DIST xfdashboard-0.8.0.tar.bz2 3341109 BLAKE2B 8787bd5069d8c4781c1b728e051e344dab227c847faf0762595079556a206b61ba4e6e45cc967f0f7267b41125bee62ff5fdf05cbbc7b3663fa785ad1fdddc16 SHA512 3bbddf079f129c8f32b764f61c75cc4efac52dff752375bdafd5537ad9c9435a5b12ead51176a684fca8fdc24f5bf44d774d8d3d6eae6942b266e1d0e4e89d62
 DIST xfdashboard-0.8.1.tar.bz2 3365273 BLAKE2B 1ab93a684f680a813fa32ca0ef610835d17aa9a854fc114298762abf92ac82f49a026ce123dacd03966667ea64ff31b05396faf94db4ea5f4ffb63e8a8f1b016 SHA512 235b5e0c4b9fd58a8b0078e4a5432ed84366865d8db0a248d377a593d31304fe68d48138c1dd9408abc02ed59b24542d5debaee3288a5fa0bf080e84632bf2fb
 DIST xfdashboard-0.9.0.tar.bz2 3331542 BLAKE2B 2155035082fe9948ae6fbc484dd09fbf748183e09d62911e7b63348884ce6e0fdd5fdd5abbe32db93be8499fbf2ebe38c3e5c81c2a3dad828f944819b69b52c9 SHA512 f13a58c781349f9c9e1d027cebfcb2828a4c646eaf16743bb20342c5681f29248d6d6193991bd890a931bb5db2713d89c507a18f4c50c48fa68b239db9f52ca0
+DIST xfdashboard-0.9.1.tar.bz2 3341851 BLAKE2B 6e2c06b59798d578ecfee99c03be40b66377012d44d9fd463de8f92ed47ce7e44c390767ac87fe50f19b903dc5c34c698b547da30a392d8053f4674a53613f29 SHA512 676b138633b519d3af9bc9b7597a0d3f5464826b190076cc146bb7c739b275c56eb5c0b912fc7f700eb9de01e1457dec814790b4c3575ee9b675a31ad675f249
 EBUILD xfdashboard-0.8.0.ebuild 970 BLAKE2B 9fb26980d359fc3f2b4516f50e9be9491508614b6b724b9f73e20a3adfa8277228e8a82340061390eb98386ec8a526ee2987f42addc2f865fa89340dafa57d2e SHA512 0d18609b5468352be4ace3cce3593003c141532e60ef7bbce888e5e828af515614ce66f75f93f0202bd1bc7a875c22652672ec7d043806cf78ab5fbc8396872b
 EBUILD xfdashboard-0.8.1.ebuild 972 BLAKE2B 99387be39b24da3f830f9cbde0520f75bd46595758fe5285ada54fade9ad0a43f68d45c9f7cccb69e43dd8563a9a354149b3feb583ccd952bc97a5f6b9304206 SHA512 f71c08bbe00da1674137f83a5182ba551cb99e0957880d8aff4d5b178ce68c9c39ebeece538eecc12ff4d25bfd92da5e2a6a237c5d74d15c65bd52140ff56603
 EBUILD xfdashboard-0.9.0.ebuild 972 BLAKE2B 99387be39b24da3f830f9cbde0520f75bd46595758fe5285ada54fade9ad0a43f68d45c9f7cccb69e43dd8563a9a354149b3feb583ccd952bc97a5f6b9304206 SHA512 f71c08bbe00da1674137f83a5182ba551cb99e0957880d8aff4d5b178ce68c9c39ebeece538eecc12ff4d25bfd92da5e2a6a237c5d74d15c65bd52140ff56603
+EBUILD xfdashboard-0.9.1.ebuild 972 BLAKE2B 5146e0494dfd67a7b7097921275752dc4d0960ed6040b98991fba1ca80a9d344bf861384475a4d34eb6c860d42df9ecee8ecf8dbfebce3d989911cc8e1b52233 SHA512 41929be5dfefc7ac71fcf505daccea02ecd234542dea29485a1e891cd2eb66ffd953026a884e1f5c3136870f43872996b9964780277dc5be5085537f32134609
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild
new file mode 100644
index 000000000000..1d0bea1ef308
--- /dev/null
+++ b/xfce-extra/xfdashboard/xfdashboard-0.9.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 xdg-utils
+
+DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.2:3
+	>=media-libs/clutter-1.12:1.0=[gtk]
+	>=x11-libs/libwnck-3:3=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXdamage:=
+	x11-libs/libXinerama:=
+	>=xfce-base/garcon-0.2.0:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfconf-4.14:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}